2800 files changed, 129122 insertions, 215475 deletions

diff --git a/lib/Makefile b/lib/Makefile
index 9ddf3a0544..4b979fc28a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -19,39 +19,64 @@
 include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
-ERTS_SUB_DIRECTORIES = stdlib sasl kernel compiler
-OTHER_SUB_DIRECTORIES = tools test_server common_test runtime_tools \
-			inets xmerl edoc erl_docgen
+
+# These have to be built first
+ERTS_APPLICATIONS = stdlib sasl kernel compiler
+
+# Then these have to be build
+ERLANG_APPLICATIONS = tools test_server common_test runtime_tools \
+			inets parsetools
+
+# These are only build if -a is given to otp_build or make is used directly
+ALL_ERLANG_APPLICATIONS = xmerl edoc erl_docgen snmp otp_mibs erl_interface \
+		  asn1 jinterface \
+	          wx debugger reltool gs \
+	          ic mnesia crypto orber os_mon syntax_tools \
+	          public_key ssl observer odbc diameter \
+	          cosTransactions cosEvent cosTime cosNotification \
+	          cosProperty cosFileTransfer cosEventDomain et megaco webtool \
+		  eunit ssh typer percept eldap dialyzer hipe
+
 ifdef BUILD_ALL
-  OTHER_SUB_DIRECTORIES += \
-          snmp otp_mibs appmon erl_interface asn1 jinterface \
-          wx debugger reltool gs \
-          ic mnesia crypto orber os_mon parsetools syntax_tools \
-          pman public_key ssl toolbar tv observer odbc diameter \
-          cosTransactions cosEvent cosTime cosNotification \
-          cosProperty cosFileTransfer cosEventDomain et megaco webtool \
-	  eunit ssh typer percept eldap dialyzer hipe
-  EXTRA_FILE := $(wildcard EXTRA-APPLICATIONS)
-  EXTRA_APPLICATIONS := $(if $(EXTRA_FILE),$(shell cat $(EXTRA_FILE)))
+  ERLANG_APPLICATIONS += $(ALL_ERLANG_APPLICATIONS)
+
+# We use whildcard */ to figure out if there are any other applications
+# in here.
+  EXPECTED_APPLICATIONS := $(ERTS_APPLICATIONS) $(ERLANG_APPLICATIONS) \
+	autom4te.cache
+  EXTRA_APPLICATIONS += $(filter-out $(EXPECTED_APPLICATIONS),\
+				$(subst /,,$(wildcard */)))
 endif
 
-ifdef BOOTSTRAP
-  SUB_DIRECTORIES = \
-    kernel stdlib compiler
+ifdef BUILD_STATIC_LIBS
+  SUB_DIRECTORIES = asn1 crypto
 else
-  ifdef SECONDARY_BOOTSTRAP
-    SUB_DIRECTORIES = hipe parsetools asn1/src
+  ifdef BOOTSTRAP
+    SUB_DIRECTORIES = \
+      kernel stdlib compiler
   else
-    ifdef TERTIARY_BOOTSTRAP
-      SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx
-    else # Not bootstrap build
-      SUB_DIRECTORIES = $(ERTS_SUB_DIRECTORIES) \
-			$(OTHER_SUB_DIRECTORIES) \
-			$(EXTRA_APPLICATIONS)
+    ifdef SECONDARY_BOOTSTRAP
+      SUB_DIRECTORIES = hipe parsetools asn1/src
+    else
+      ifdef TERTIARY_BOOTSTRAP
+        SUB_DIRECTORIES = snmp sasl jinterface ic syntax_tools wx
+      else
+        ifdef DOC_BOOTSTRAP
+          SUB_DIRECTORIES = xmerl edoc erl_docgen
+        else # Not bootstrap build
+          SUB_DIRECTORIES = $(ERTS_APPLICATIONS) \
+			    $(ERLANG_APPLICATIONS) \
+			    $(EXTRA_APPLICATIONS)
+        endif
+      endif
     endif
   endif
 endif
 
+# Any applications listed in SKIP-APPLICATIONS should be skipped
+SKIP_FILE := $(wildcard SKIP-APPLICATIONS)
+SKIP_APPLICATIONS := $(if $(SKIP_FILE),$(shell cat $(SKIP_FILE)))
+SUB_DIRECTORIES := $(filter-out $(SKIP_APPLICATIONS),$(SUB_DIRECTORIES))
 
 # ----------------------------------------------------------------------
 include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/appmon/AUTHORS b/lib/appmon/AUTHORS
deleted file mode 100644
index b727dae36d..0000000000
--- a/lib/appmon/AUTHORS
+++ /dev/null
@@ -1,5 +0,0 @@
-Original Authors and Contributors:
-
-Peter Lundell
-Stefan Anbratt
-Gunilla Arendt
diff --git a/lib/appmon/BUGS_AND_FIXES b/lib/appmon/BUGS_AND_FIXES
deleted file mode 100644
index fdac7f34c5..0000000000
--- a/lib/appmon/BUGS_AND_FIXES
+++ /dev/null
@@ -1,5 +0,0 @@
-
-***) reverse the list of children for a process, to match the starting
-order.
-
-***) 
diff --git a/lib/appmon/doc/man3/.gitignore b/lib/appmon/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/appmon/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/appmon/doc/pdf/.gitignore b/lib/appmon/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/appmon/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/appmon/doc/src/Makefile b/lib/appmon/doc/src/Makefile
deleted file mode 100644
index 7c93abe6d8..0000000000
--- a/lib/appmon/doc/src/Makefile
+++ /dev/null
@@ -1,120 +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%
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(APPMON_VSN)
-APPLICATION=appmon
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = appmon.xml
-
-XML_PART_FILES = \
-	part.xml \
-	part_notes.xml
-
-XML_CHAPTER_FILES = \
-	appmon_chapter.xml \
-	notes.xml
-
-BOOK_FILES = book.xml
-
-XML_FILES = $(BOOK_FILES) $(XML_APPLICATION_FILES) $(XML_REF3_FILES) \
-            $(XML_PART_FILES) $(XML_CHAPTER_FILES) 
-
-GIF_FILES = \
-	app_win.gif \
-	listbox_win.gif \
-	main_win.gif \
-	pinfo_win.gif \
-	note.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 += 
-
-# ----------------------------------------------------
-# 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)
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~
-	rm -f $(JD_HTML) $(JD_PACK)
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt: 
-
-# ----------------------------------------------------
-# 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/appmon/doc/src/app_win.gif b/lib/appmon/doc/src/app_win.gif
deleted file mode 100644
index 06f21d04a9..0000000000
--- a/lib/appmon/doc/src/app_win.gif
+++ /dev/null
diff --git a/lib/appmon/doc/src/app_win.ps b/lib/appmon/doc/src/app_win.ps
deleted file mode 100644
index 73d4cad278..0000000000
--- a/lib/appmon/doc/src/app_win.ps
+++ /dev/null
@@ -1,680 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./app_win.tmp.eps)
-%%CreationDate: (Tue Jun 12 17:59:02 2001)
-%%BoundingBox: 0 46 300 384
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 46 300 384
-userdict begin
-%%BeginData:
-DisplayImage
-0 46
-300.000000 338.000000
-12
-382 431
-1
-0
-0
-16
-ffffff
-000000
-e8e3dc
-708090
-b03060
-d9d9d9
-b3b3b3
-7f7f7f
-a3a3a3
-828282
-000000
-000000
-000000
-000000
-000000
-000000
-04ff04ff04ff04de05000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500041a050c04d1050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000408
-050c04050500040a0500040a050104030505040105050401050104040501040305030403
-050104020501044a05010400050104000501040005010411050104050504040205010404
-050104050501040005010409050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000407050004020500040205000402
-050004050500040a05000409050304020501040205010400050104020501040005010404
-050104020501040105010402050204010501044a05010403050104000501041105010403
-050104040500040805010408050104080500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004080500040205000402
-050004020500040505000403050204030500040905000401050004020501040205010400
-050104020501040005020402050204010501040305010401050204010501040105010404
-050004000502040005020401050104020501040105030401050104000501040105010400
-050104060503040105010400050104060501040005010400050104000501040005010400
-050104020503040105010400050504020500040605000400050104010501040005010400
-050104000503040005010409050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000407050004020500040205000402
-050004050500040205040402050004080501040105010401050104020501040005010402
-050104000502040205020401050104030501040105010400050004000501040105010404
-050104010501040105010400050104020501040005010401050104000502040005010400
-050204000501040405010401050104000502040005010404050104000502040005010400
-050104000502040005010400050104010501040005040400050104020500040205010400
-050004000500040005010400050104000502040005060400050104080500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004080504040205000402050004050500040105060401050004080501040105010401
-050504010505040105030400050304010501040305010401050104000500040005010408
-050104010501040105010401050104000501040505010400050104010501040005010401
-050104040501040105010400050104010501040405010401050104000501040005010400
-050104010501040005010401050104000502040205010402050004010500040105000401
-050004000501040005010401050104000502040105010400050104090500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004070500040605000402050004050500040105060401050004080505040105010405
-050104050501040005000400050004000501040105010403050104010501040105020408
-050104010501040105010401050104000501040205040400050104010501040005010401
-050104040501040105010400050104010501040405010401050104000501040005010400
-050104010501040005050400050104030501040205000400050004020500040105000400
-050104000501040105010400050104020501040005010408050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000408
-050004060500040205000405050004010506040105000407050104030501040005010405
-050104050501040005020400050104010501040305010401050104010502040805010401
-050104010501040205020402050104010501040005010401050104000501040105010404
-050104010501040005010401050104040501040105010400050104000501040005010401
-050104000501040405010403050104020500040005000401050104000500040105010400
-050104010501040005010402050104000501040905000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040705000406
-050004020500040505000402050404020500040705010403050104000501040505010405
-050104010500040105010402050104010501040205010402050104010501040405010401
-050104010501040205020402050104010501040005020400050104000502040005010404
-050104010501040005010401050104040501040005020400050104000501040005020400
-050104000501040105010400050104030501040005000400050004010501040005010402
-050104000501040005020400050104020501040005010408050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000408
-050804020500040505000403050204030500040705010403050104000501040505010405
-050104010500040105010403050304030501040205010401050104040501040105010401
-050104030501040305020400050304000501040105010400050104060503040105010401
-050104050501040005010400050104000501040005010400050104020503040105010404
-050104020500040805010401050104000501040005010402050104000501040905000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-05000400050004070500040a050004050500040a050004530500040a0501040405010442
-050404200500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004080500040a050004050500040a050004520501040a
-050104040501046905000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-05000400050004000500040005000400050004070500040a05000405050c04510501040b
-050104040501046805000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-0500040005000400050004000500040005000408050c04e5050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-050004000500040005000400050004000500040005000400050004000500040005000400
-0500040005000400050004000500040005000400050004000500040005000400050004ff
-04ff04ff041303ff03ff03fb00ff00ff00fa0900000105ff05790901000105ff05790901
-000105ff05790901000105ff05790901000105ff05790901000105040104050401000503
-010205120102050b01000506010005ff051801000502010005090102050c090100010504
-0100050f01000511010005020100050a010005ff0520010005020100050b0100050c0901
-000105040100050601020505010005030102050a01000502010005010100050001010502
-0104050201020503010205020100050001010503010205ff050301000502010005020102
-050501000502010005000101050509010001050401000508010005050100050201000502
-010005090100050201000501010105010100050301000506010005020100050201000501
-010105010100050101000502010005ff0502010005020100050101000502010005040100
-050201010501010005040901000105040103050501000505010005020100050201000509
-010005020100050101000502010005030100050601000502010005020100050101000502
-01000501010005ff05060104050101000502010005040100050201000502010005040901
-000105040100050801000505010005020104050901000502010005010100050201000503
-010005060100050201000502010005010100050201000502010205ff0503010005020100
-050101040504010005020100050201000504090100010504010005080100050501000502
-0100050d0100050201000501010005020100050301000506010005020100050201000501
-0100050201000505010005ff050201000502010005010100050801000502010005020100
-050409010001050401000508010005050100050201000502010005090100050201000501
-010105010100050301000506010005020100050201000501010005020100050101000502
-010005ff0502010005020100050101000502010005040100050201010501010005040901
-000105040100050801000505010005030102050b01020502010005000101050501010504
-01000503010205020100050201000502010205ff05030100050201000502010205050100
-0502010005000101050509010001052f010005ff053e0100050809010001052f010005ff
-053e0100050809010001052f010005ff053e010005080901000105ff05790901000105ff
-05790901000105ff05790901000109ff097b000009ff097c02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02730800000008000000080000000800
-000008000000080000000800000008000000080000000800000008000000080000000800
-000008000000080000000800000008000000080000000800000008000000080000000800
-000008000000080000000800000008000000080000000800000008000000080000000800
-000008000000080000000800000008000000020900450209004502090045024700000800
-000008000000080000000800000008000000080000000800000008000000080000000800
-000008000000080000000800000008000000080000000800000008000000080000000800
-000008000000080000000800000008000000080000000800000008000000080000000800
-000008000000080000000800000008000000080000000800000008000209004409000209
-004409000209004409000247080000000842010002090001054109010209000105410901
-020900010541090102470000084201000800020900010541090102090001054109010209
-000105410901024708000000084201000209000105410901020900010541090102090001
-054109010247000008420100080002090001054109010209000105410901020900010541
-090102470800000008120104080b0101081c010002090001051301020514010005140901
-02090001050e0104052d0901020900010512010005020100050401000503010205030102
-051509010247000008150100080c0100081d010008000209000105120100050201000513
-0100051409010209000105100100052f0901020900010512010005010100050c01000505
-010005150901024708000000081401000803010008000101080401000804010208160100
-020900010512010005060102050201000500010105030101050001000514090102090001
-051001000503010005000101050301020503010205030102051209010209000105120100
-050001000504010205050100050501000515090102470000081501000803010108010100
-080101040801010008020100081401000800020900010513010005040100050201000501
-010105010100050101000501010105140901020900010510010005030101050101000501
-010005020100050101000502010005010100050201000511090102090001051201010507
-010005050100050501000515090102470800000008140100080301000802010008030100
-080301000802010008150100020900010514010105020100050201000501010005020100
-050101000502010005140901020900010510010005030100050901000501010005050100
-050201000511090102090001051201000500010005060100050501000505010005150901
-024700000815010008030100080201000803010008030100080201000814010008000209
-000105160100050101040501010005020100050101000502010005140901020900010510
-010005030100050601030501010005050104051109010209000105120100050101000505
-010005050100050501000515090102470800000008140100080301000802010008030100
-080301000802010008150100020900010512010005020100050101000505010005020100
-050101000502010005140901020900010510010005030100050501000502010005010100
-050501000515090102090001051201000501010005050100050501000505010005150901
-024700000815010008030100080201000803010008030100080201000814010008000209
-000105120100050201000501010005020100050101000502010005010100050101010514
-090102090001051001000503010005050100050201000501010005020100050101000502
-010005110901020900010512010005020100050401000505010005050100051509010247
-080000000812010408010100080201000803010008040102081601000209000105130102
-050301020502010005020100050201010500010005140901020900010510010005030100
-050601030502010205030102051209010209000105120100050201000504010005050100
-050501000515090102470000084201000800020900010541090102090001054109010209
-000105410901024708000000084201000209000105410901020900010541090102090001
-054109010247000008420100080002090001054109010209000105410901020900010541
-090102470800000008420100020900010541090102090001054109010209000105410901
-024700000842010008000209000105410901020900010541090102090001054109010247
-080000000842010002090001054109010209000105410901020900010541090102470000
-084201000800020900010541090102090001054109010209000105410901024708000000
-084201000209000105410901020900010541090102090001054109010247000008000100
-080001000800010008000100080001000800010008000100080001000800010008000100
-080001000800010008000100080001000800010008000100080001000800010008000100
-080001000800010008000100080001000800010008000100080001000800010008000100
-080001000800010008000100080001000800010008000100080002090001094302090001
-094302090001094302470800010008000100080001000800010008000100080001000800
-010008000100080001000800010008000100080001000800010008000100080001000800
-010008000100080001000800010008000100080001000800010008000100080001000800
-010008000100080001000800010008000100080001000800010008000100080001000800
-01000800010002090000094402090000094402090000094402ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff022901ff017d05ff05ff05ff05ff05ff05ff
-05ff05ff05ff05ff05ff05ff05ff056d02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02d5014902ff023301000647010002ff023301000647010002ff02330100
-0647010002ff023301000647010002ff02330100060e0103060701010603010306020103
-060601030610010002ff02330100060d0101060101010604010306020101060101010600
-0101060101010604010106010101060f010002ff02330100060d01010601010106060101
-060201010601010106000101060101010604010106010101060f010002ff02330100060a
-010106000101060101010606010106020101060101010600010106010101060401010601
-010106010101060b010002ff023301000608010206010101060101010606010106020101
-0601010106000101060101010604010106010101060201020609010002ff023301000607
-010106030101060101010606010106020101060101010600010106010101060401010601
-0101060401010608010002ff023301000608010206010101060101010606010106020101
-0601010106000101060101010604010106010101060201020609010002ff02330100060a
-010106000101060101010601010106020101060201010601010106000101060101010601
-0101060001010601010106010101060b010002ff02330100060e01030602010106020101
-060301030602010306020101060101030610010002ff023301000647010002ff02330100
-0647010002ff023301000647010002ff023301000647010002ff023301000647010002ff
-023301000647010002ff023301220701012402ff0256070102ff027b070102ff027b0701
-02ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b0701
-02ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b0701
-02ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b0701
-02ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b0701
-02ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b0701
-02ff027b070102ff0258014902ff023301000647010002ff023301000647010002ff0233
-01000647010002ff023301000647010002ff02330100060e010306070101060301030603
-0101060701030610010002ff02330100060d010106010101060401030602010106010101
-060001030606010106010101060f010002ff02330100060d010106010101060601010602
-010106010101060201010606010106010101060f010002ff02330100060a010106000101
-0601010106060101060201010601010106020101060601010601010106010101060b0100
-02ff02330100060801020601010106010101060601010602010106010101060201010606
-010106010101060201020609010002ff0233010006070101060301010601010106060101
-0602010106010101060201010606010106010101060401010608010002ff023301000608
-010206010101060101010606010106020101060101010602010106060101060101010602
-01020609010002ff02330100060a01010600010106010101060101010602010106020101
-060101010602010106030101060001010601010106010101060b010002ff02330100060e
-01030602010106020101060301030603010106030101060101030610010002ff02330100
-0647010002ff023301000647010002ff023301000647010002ff023301000647010002ff
-023301000647010002ff023301000647010002ff023301220701012402ff0256070102ff
-027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff
-027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff
-027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff
-027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff
-027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff
-027b070102ff027b070102ff027b070102ff0258014902ff023301000647010002ff0233
-01000647010002ff023301000647010002ff023301000647010002ff0233010006470100
-02ff023301000647010002ff023301000600010006000102060001020601010106020101
-060101030601010106000101060101010600010106090103060101010601010106000101
-060001010604010002ff0233010006000101060101010601010106000101060201010600
-010106010101060001020600010106000102060001010607010106010101060001010601
-010106000102060001010603010002ff0233010006000101060101010601010106010101
-060001010605010106000101060101010600010106010101060701020603010106010101
-06000101060101010603010002ff02330100060001010601010106010101060101010600
-010106020104060001010601010106000101060101010609010206010101060101010600
-0101060101010603010002ff023301000600010106010101060101010602010206020101
-0601010106000101060101010600010106010101060a0102060001010601010106000101
-060101010603010002ff0233010006000101060101010601010106020102060201010601
-010106000102060001010600010206000101060701010601010106000101060001020600
-0102060001010603010002ff023301000600010106010101060101010603010106030102
-060001030600010106010101060001010609010306020101060001010600010106000101
-0604010002ff02330100060e0100060a010106040101061901010607010002ff02330100
-060d0101060a010106040101061901010607010002ff02330100060c0101060b01010604
-010106040106060d01010607010002ff023301000647010002ff023301000647010002ff
-023301000647010002ff023301220701012402ff0256070102ff027b070102ff027b0701
-02ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b0701
-02ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b0701
-02ff0254074802ff0233074902ff023307010245070102ff023307010245070102ff0233
-07010245070102ff023307010245070102ff023307010245070102ff0233070102450701
-02ff023307010245070102ff023307010245070102ff023307010245070102ff02330701
-0245070102ff023307010245070102ff023307010245070102ff023307010245070102ff
-023307010245070102ff023307010245070102ff023307010245070102ff023307010245
-070102ff021e012d0212013b02ff02000100062b0100021201000639010002ff02000100
-062b0100021201000639010002ff02000100062b0100021201000639010002ff02000100
-062b0100021201000639010002ff02000100062b010002120100063201010604010002ff
-02000100062b010002120100063201010604010002ff0200010006000100060001020600
-010206010101060201010601010306010101060101010600010106000101060401000212
-010006010100060001020600010206010101060201010601010306010101060201010601
-01030601010106000101060101030603010002ff02000100060001010601010106010101
-060001010602010106000101060101010600010106010101060001020600010106030100
-021201000601010106010101060101010600010106020101060001010601010106000101
-0602010106000101060101010600010206000101060101010604010002ff020001000600
-010106010101060101010601010106000101060101020603010106010101060001010601
-010106030100021201000601010106010101060101010601010106000101060101010601
-0101060101010600010106010101060101010600010106010101060101010604010002ff
-020001000600010106010101060101010601010106000101060301020601010106010101
-060001010601010106030100021201000601010106010101060101010601010106000101
-060101050601010106000101060101050600010106010101060101010604010002ff0200
-010006000101060101010601010106020102060501020600010106010101060001010601
-010106030100021201000601010106010101060101010602010206020101060601020602
-01010604010106010101060101010604010002ff02000100060001010601010106010101
-060201020602010106010101060001010600010206000102060001010603010002120100
-060101010601010106010101060201020602010106010101060201020602010106010101
-060001010601010106010101060001000602010002ff0200010006000101060101010601
-010106030101060301030602010106000101060001010600010106040100021201000601
-010106010101060101010603010106030103060401000604010306010101060101010602
-01010603010002ff02000100060e0100061101010607010002120100060f010006280100
-02ff02000100060d0101061101010607010002120100060e01010628010002ff02000100
-060c0101061201010607010002120100060d01010629010002ff02000100062b01000212
-01000639010002ff02000100062b0100021201000639010002ff02000100062b01000212
-01000639010002ff02000114070101160212013b02ff0215070102ff027b070102ff027b
-070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b
-070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b070102ff027b
-070102ff025c074b02ff0230074c02ff023007010248070102ff023007010248070102ff
-023007010248070102ff023007010248070102ff023007010248070102ff023007010248
-070102ff023007010248070102ff023007010248070102ff023007010248070102ff0230
-07010248070102ff023007010248070102ff023007010248070102ff0230070102480701
-02ff023007010248070102ff023007010248070102ff023007010248070102ff02300701
-0248070102ff021001420212012d02f901000640010002120100062b010002f901000640
-010002120100062b010002f901000640010002120100062b010002f90100064001000212
-0100062b010002f901000640010002120100061401020613010002f90100064001000212
-0100061301010615010002f9010006020100060001020600010206010101060201010601
-010306020103060101010600010306020101060101030601010106000101060301000212
-010106000102060001020601010106020101060001030601010306010100060001020600
-01020603010002f901000602010106010101060101010600010106020101060001010601
-010106000101060101010600010606020101060001010601010106000104060301000212
-010206010101060101010600010106020101060101010601010106010101060001010601
-0101060101010602010002f9010006020101060101010601010106010101060001010601
-010206030101060101010600010206020101060001010601010106010101060001020605
-010002120102060101010601010106010101060001010602010106010102060301010601
-0101060101010602010002f9010006020101060101010601010106010101060001010603
-010206010105060001010603010106000101060101050600010106060100021201020601
-010106010101060101010600010106020101060301020601010106010101060101010602
-010002f90100060201010601010106010101060201020605010206000101060401010604
-010206020101060401010606010002120102060101010601010106020102060301010604
-01020600010106010101060101010602010002f901000602010106010101060101010602
-010206020101060101010600010106010101060001010604010206020101060101010600
-010106060100021201020601010106010101060201020603010106010101060101010600
-010106010101060101010602010002f90100060201010601010106010101060301010603
-010306020103060101010605010006040103060101010606010002120102060101010601
-01010603010106030101060201030601010106010101060101010602010002f901000610
-0100062e010002120100060d0100061c010002f90100060f0101062e010002120100060c
-0101061c010002f90100060e0101062f010002120100060b0101061d010002f901000640
-010002120100062b010002f901000640010002120100062b010002f90100064001000212
-0100062b010002f901420212012d02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff02ff
-02ff0236
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 46 300 384
-%%EOF
diff --git a/lib/appmon/doc/src/appmon.xml b/lib/appmon/doc/src/appmon.xml
deleted file mode 100644
index 6e04f8503f..0000000000
--- a/lib/appmon/doc/src/appmon.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1996</year>
-      <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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>appmon</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>appmon</module>
-  <modulesummary>A graphical node and application process tree viewer.</modulesummary>
-  <description>
-    <warning>
-      <p>
-	The Appmon application has been superseded by the Observer application.
-	Appmon will be removed in R16.
-      </p>
-    </warning>
-    <p>The application monitor Appmon is a graphical utility used to
-      supervise applications executing either locally or on remote nodes.
-      The process tree of an application can furthermore be monitored.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>start()</name>
-      <fsummary>Start Appmon.</fsummary>
-      <desc>
-        <p>Starts Appmon.</p>
-      </desc>
-    </func>
-    <func>
-      <name>stop()</name>
-      <fsummary>Stop Appmon.</fsummary>
-      <desc>
-        <p>Stops Appmon.</p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p>Appmon User's Guide</p>
-  </section>
-</erlref>
-
diff --git a/lib/appmon/doc/src/appmon_chapter.xml b/lib/appmon/doc/src/appmon_chapter.xml
deleted file mode 100644
index 7ce22caaad..0000000000
--- a/lib/appmon/doc/src/appmon_chapter.xml
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2000</year><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>Appmon</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>appmon_chapter.xml</file>
-  </header>
-
-  <section>
-    <title>Introduction</title>
-    <warning>
-      <p>
-	The Appmon application has been superseded by the Observer application.
-	Appmon will be removed in R16.
-      </p>
-    </warning>
-    <p>The application monitor Appmon is a graphical node and application viewer. The tool shows an overview of all applications on all known nodes, and it is possible to view the process tree for an application running on any of the nodes.</p>
-    <note>
-      <p>If the Appmon code is not available at a node, for example an
-        embedded node, this node is ignored by Appmon and is not shown
-        in the Appmon window.</p>
-    </note>
-  </section>
-
-  <section>
-    <title>Getting Started with Appmon</title>
-    <p>Start Appmon by calling <c><![CDATA[appmon:start()]]></c>. It will start the <seealso marker="#main_win">main window</seealso> showing a load meter and the applications running at the current node. By clicking on one of the applications a window showing the process tree of the application will be opened, the <seealso marker="#app_win">application window</seealso>.</p>
-    <p>The main window is equipped with a menubar from which it is possible to:</p>
-    <list type="bulleted">
-      <item>exit Appmon</item>
-      <item>perform some operations on the node</item>
-      <item>set how information should be displayed</item>
-      <item>select which node to show</item>
-      <item>open help (this document).</item>
-    </list>
-    <p>The application window shows the process tree for an application with each process displayed as a box. It is possible to view information about the processes, to send messages to them, and to trace and kill them.</p>
-  </section>
-
-  <section>
-    <title>The Main Window</title>
-    <marker id="main_win"></marker>
-    <p>The main window shows a load meter and all applications running at the displayed node. Select which node to display in the window by choosing the node name from the Nodes menu. It is also possible to run Appmon in a many-window mode where a new instance of the main window is opened for each node to be displayed.</p>
-    <image file="main_win.gif">
-      <icaption>The Main Window.</icaption>
-    </image>
-    <p>The load meter shows load measured as processor time, or as the length of the ready queue.</p>
-    <p>Every application running at the node is shown as a button. Clicking the button will open the application window showing the process tree for the application.</p>
-
-    <section>
-      <title>The File Menu</title>
-      <taglist>
-        <tag><em>Show List Box...</em></tag>
-        <item>This will open the <seealso marker="#listbox_win">listbox window</seealso> which lists all nodes and applications. This window can be more easy to use than the normal, graphical user interface when the system consists of a large number of nodes and/or applications.</item>
-        <tag><em>Close</em></tag>
-        <item>Close the window. If no other instance of the main window exists, Appmon will be stopped.</item>
-        <tag><em>Exit</em></tag>
-        <item>Stop Appmon.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Actions Menu</title>
-      <taglist>
-        <tag><em>Reboot</em></tag>
-        <item>Call <c><![CDATA[init:reboot()]]></c> at the currently displayed node. This will stop the node. If the <c><![CDATA[-heart]]></c> system flag was given, the heart program will try to reboot the system.</item>
-        <tag><em>Restart</em></tag>
-        <item>Call <c><![CDATA[init:restart()]]></c> at the currently displayed node. This will restart the node.</item>
-        <tag><em>Stop</em></tag>
-        <item>Call <c><![CDATA[init:stop()]]></c> at the currently displayed node. This will stop the node.</item>
-        <tag><em>Ping</em></tag>
-        <item>Call <c><![CDATA[net:ping(Node)]]></c> where <c><![CDATA[Node]]></c> is the currently displayed node. This can be useful when the connection to the node has been lost.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Options Menu</title>
-      <taglist>
-        <tag><em>One window/Many windows</em></tag>
-        <item>Select one of these radio button to run Appmon in one-window or many-window mode. In many-windows mode, a new instance of the main window is opened for each node to be displayed. The default value is one-window mode.</item>
-        <tag><em>Load: time/queue</em></tag>
-        <item>Select one of these radio buttons to either calculate load as processor time or as the length of the ready queue, which is the number of processes ready to execute. By default, the load is calculated as processor time.</item>
-        <tag><em>Load: progressive/linear</em></tag>
-        <item>Select one of these radio buttons to show load either according to a progressive or a linear scale. By default, the load is shown according to a progressive scale. </item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Nodes Menu</title>
-      <p>The Nodes menu contains all currently and previously known nodes,
-        where the Appmon code is available. Nodes where the Appmon code is
-        not available, for example embedded nodes, are ignored by Appmon and
-        are not shown.</p>
-      <p>Selecting a node from the Nodes menu will cause that node to be displayed in either the same window, or in a new window, depending on if Appmon is run in one-window or many-windows mode. If the connection to the node has been lost, this will be shown in the window.</p>
-    </section>
-
-    <section>
-      <title>The Help Menu</title>
-      <taglist>
-        <tag><em>Help</em></tag>
-        <item>Selecting Help from the Help menu will cause the HTML version of the Appmon User's Guide (this document) to be displayed. Currently this function requires Netscape to be up and running.</item>
-      </taglist>
-    </section>
-  </section>
-
-  <section>
-    <title>The Application Window</title>
-    <marker id="app_win"></marker>
-    <p>The application window shows the process tree for an application. The window title contains the application name and the node name. The window also contains a menubar and a toolbar.</p>
-    <p>The application window can be opened from the main window by clicking on the button denoting the application, or from the listbox window by selecting the application and clicking on the <em>Load</em> button.
-      </p>
-    <image file="app_win.gif">
-      <icaption>The Application Window.</icaption>
-    </image>
-    <p>The application can be shown either as a strict supervision tree, or as a process view with all linked processes. In supervision mode, the tree-gathering and -building algorithm assumes conformance to the OTP design principles.</p>
-
-    <section>
-      <title>The File Menu</title>
-      <taglist>
-        <tag><em>Close</em></tag>
-        <item>Close the application window.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Options Menu</title>
-      <taglist>
-        <tag><em>Refresh</em></tag>
-        <item>Refresh the application window.</item>
-        <tag><em>Sup. view/ Proc. view</em></tag>
-        <item>Select one of these radio buttons to show the application as a strict supervision tree, or as a process view with all linked processes. By default, the process view is used.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Toolbar</title>
-      <p>The toolbar consists of four buttons: <em>Info</em>, <em>Send</em>, <em>Trace</em> and <em>Kill</em>. First select one of these buttons and then select to which process the action should apply by clicking on a process in the process tree. By default <em>Info</em> is selected which means that clicking on a process, without selecting <em>Send</em>, <em>Trace</em> or <em>Kill</em> first, will open the <seealso marker="#pinfo_win">process information window</seealso>.</p>
-      <taglist>
-        <tag><em>Info</em></tag>
-        <item>Open the <seealso marker="#pinfo_win">process information window</seealso>, which displays the information about the process given by <c><![CDATA[process_info(Pid)]]></c>.</item>
-        <tag><em>Send</em></tag>
-        <item>Send a message to a process. A window is opened where the message can be specified. Click <em>Ok</em> to send the message or <em>Cancel</em> to cancel.</item>
-        <tag><em>Trace</em></tag>
-        <item>Switch on OTP tracing of a process. <c><![CDATA[sys:trace(Pid,true)]]></c> is called. Selecting <em>Trace</em> a second time for the same process will switch the tracing off instead.</item>
-        <tag><em>Kill</em></tag>
-        <item>Kill a process. <c><![CDATA[exit(Pid,kill)]]></c> is called.</item>
-      </taglist>
-    </section>
-  </section>
-
-  <section>
-    <title>The Listbox Window</title>
-    <marker id="listbox_win"></marker>
-    <p>The listbox window lists all nodes and applications. This window can be more easy to use than the normal, graphical user interface when the system consists of a large number of nodes and/or applications.</p>
-    <image file="listbox_win.gif">
-      <icaption>The Listbox Window.</icaption>
-    </image>
-    <p>The window contains three buttons:</p>
-    <taglist>
-      <tag><em>Load</em></tag>
-      <item>First selecting an application and then clicking the <em>Load</em> button will open the <seealso marker="#app_win">application window</seealso> for that application.</item>
-      <tag><em>Clear</em></tag>
-      <item>De-select any selected node or application name.</item>
-      <tag><em>Close</em></tag>
-      <item>Close the listbox window.</item>
-    </taglist>
-  </section>
-
-  <section>
-    <title>The Process Information Window</title>
-    <marker id="pinfo_win"></marker>
-    <p>The process information window shows information about different processes as given by <c><![CDATA[process_info(Pid)]]></c>.</p>
-    <image file="pinfo_win.gif">
-      <icaption>The Process Information Window.</icaption>
-    </image>
-
-    <section>
-      <title>The File Menu</title>
-      <taglist>
-        <tag><em>Close</em></tag>
-        <item>Close the process information window.</item>
-      </taglist>
-    </section>
-  </section>
-
-  <section>
-    <title>Using the Web Based version of Appmon</title>
-
-    <section>
-      <title>Introduction</title>
-      <p>The web based version of Appmon is an alternative version of 
-        Appmon. The main difference between the web based version of
-        Appmon and the original version of Appmon is that the web based
-        version of Appmon can monitor nodes and applications on nodes where
-        Appmon not is installed.</p>
-    </section>
-
-    <section>
-      <title>Start the Web Based version of Appmon</title>
-      <p>To start the web based user interface configure and start 
-        WebTool, see <em>WebTool User's Guide</em>. The web based 
-        version of Appmon is compatible with the browsers 
-        Netscape Navigator and Internet Explorer 4.0 and higher.</p>
-      <p>When WebTool is started, start the Web based version of Appmon via 
-        WebTool. If WebTool succeeded to start the web based version of Appmon 
-        a link named WebAppmon will appear in the topmost frame. Click on the link and
-        the main frame of the browser will show two frames.The left frame will 
-        show a combo box for node selection and a list of all applications on 
-        the currently selected node.   </p>
-      <p>In the left frame it is possible to:</p>
-      <list type="bulleted">
-        <item>Select which node to supervise.</item>
-        <item>Select an application to view its process tree.</item>
-        <item>Select an application to view its specification.</item>
-      </list>
-      <p>The right frame shows the selected information, either the application 
-        specification or the process tree and process information.</p>
-    </section>
-
-    <section>
-      <title>Selecting a Different Node</title>
-      <p>In the top of the left frame there is a combo box with all known 
-        nodes. The name of the node that is monitored is the node whose name 
-        is visible in the combo box. At startup the node on which the web 
-        based version of Appmon is running on will be monitored.</p>
-      <p>To change node, select another node in the combo box, and
-        the list of running applications will change to the applications
-        that runs on the selected node.</p>
-    </section>
-
-    <section>
-      <title>Viewing the Process Tree of an Application</title>
-      <p>To view the process tree of an application click on the application 
-        name in the list of applications. The process tree of the selected 
-        application will then appear in the right frame.</p>
-      <p>The processes in the process tree can have three different colors:</p>
-      <taglist>
-        <tag><em>Blue</em></tag>
-        <item>The relation to the process above in the process hierarchy 
-         is a primary relation. That means that the process above is the
-         only process that link to it or the process above is a supervisor. </item>
-        <tag><em>Red</em></tag>
-        <item>The relation to the process above in the process hierarchy is a secondary 
-         relation. This means that more than one process has a relation to it 
-         and the process above in the hierarchy is not a supervisor.</item>
-        <tag><em>Black</em></tag>
-        <item>The process isn't a regular process instead it's a Port. The name of 
-         the process will also begin with <em>Port:</em></item>
-      </taglist>
-      <p>If the process name begins with <em>Runs on another node:</em> The 
-        monitored application runs on more than one node and this process is 
-        the first process on a branch that runs on another node. </p>
-    </section>
-
-    <section>
-      <title>Viewing the Application Specification</title>
-      <p>After the application name in the list of applications there are a 
-        link named <em>Spec</em>, Click on this link and the application 
-        specification will appear in the right frame. The application 
-        specification is the data in the <em>.app</em> file of the selected
-        application. </p>
-    </section>
-
-    <section>
-      <title>Select Process View</title>
-      <p>In the top of the page that shows the process tree, there are three 
-        radio buttons for selecting which processes that shall be included 
-        in the process tree. The default mode is that all processes 
-        that one process in the application tree  has a relation to is 
-        included. It's possible to filter which of the processes 
-        in the process tree that will be included. To reduce the number 
-        of processes in the process tree select one of the radio buttons 
-        on the top of the page </p>
-      <taglist>
-        <tag><em>All processes</em></tag>
-        <item>All processes that at least one process in the application 
-         tree has a link to.</item>
-        <tag><em>Supervised processes</em></tag>
-        <item>All processes that are supervised by one of the supervisors in 
-         the application</item>
-        <tag><em>Supervisors only</em></tag>
-        <item>Only the processes that actually are supervisors in the 
-         applications supervision tree is included</item>
-      </taglist>
-    </section>
-
-    <section>
-      <marker id="proc_info"></marker>
-      <title>Process Information</title>
-      <p>To see more information about a specific process  click on the process
-        name and more information will be loaded under the application tree.</p>
-      <p>The Process information page shows information about a process as given 
-        by the <c><![CDATA[process_info(Pid)]]></c>, but formatted in a more human readable form.</p>
-    </section>
-
-    <section>
-      <title>Trace a process</title>
-      <p>If the link after the process name in the process tree is <em>start trace</em>
-        the process is not traced. If the link is <em>stop trace</em> then the process
-        id traced.</p>
-      <p>To toggle the trace flag for a process click on the link <em>start trace</em> or
-        <em>stop trace</em> after the process name in the process tree.</p>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/appmon/doc/src/book.xml b/lib/appmon/doc/src/book.xml
deleted file mode 100644
index df6d57c077..0000000000
--- a/lib/appmon/doc/src/book.xml
+++ /dev/null
@@ -1,47 +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>1997</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>appmon</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev>2.0</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>Appmon</pagetext>
-  <preamble>
-  </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/appmon/doc/src/fascicules.xml b/lib/appmon/doc/src/fascicules.xml
deleted file mode 100644
index 0678195e07..0000000000
--- a/lib/appmon/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/appmon/doc/src/listbox_win.gif b/lib/appmon/doc/src/listbox_win.gif
deleted file mode 100644
index 38258b7552..0000000000
--- a/lib/appmon/doc/src/listbox_win.gif
+++ /dev/null
diff --git a/lib/appmon/doc/src/listbox_win.ps b/lib/appmon/doc/src/listbox_win.ps
deleted file mode 100644
index 0f1e2eeda0..0000000000
--- a/lib/appmon/doc/src/listbox_win.ps
+++ /dev/null
@@ -1,741 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./listbox_win.tmp.eps)
-%%CreationDate: (Tue Jun 12 18:01:07 2001)
-%%BoundingBox: 0 85 200 356
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 85 200 356
-userdict begin
-%%BeginData:
-DisplayImage
-0 85
-200.000000 271.000000
-12
-325 441
-1
-0
-0
-8
-ffffff
-000000
-708090
-b03060
-d9d9d9
-808080
-c3c3c3
-000000
-03ff03ff03ff036704000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000300040003000400031a040c03cc0400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-0400030004000308040c03050400030a0400030a04010343040103240401031904010300
-0401030f040103010401031e040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003070400030204000302
-04000302040003050400030a040003090403034204010324040103190401031204010321
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003080400030204000302040003020400030504000303
-040203030400030904000301040003010401030004010301040103000401030104000300
-040203000402030204030301040103000401030204010304040103000401030204030302
-040103000401030104030302040303060403030104010300040103020401030004010305
-040303010401030004010301040103000401030104010300040103010403030204030301
-04030300040103010403030104010300040103020403030a040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003070400030204000302040003020400030504000302040403020400030804010301
-040103000402030004010300040203000401030004010301040103010401030004010301
-040103000402030004010301040103040402030004010300040103010401030004010300
-040203000401030104010300040103010401030404010301040103000402030004010300
-040103000402030404010301040103000402030004010300040203000401030004010300
-040103000401030104010300040103010401030104010301040103000401030104010300
-040203000401030004010301040103080400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030804040302
-040003020400030504000301040603010400030804010301040103000401030104010300
-040103010401030004010301040103010401030004010301040103000401030104010308
-04010301040103000401030104010300040103010401030004010301040103000402030b
-040103000401030104010300040103010401030804010300040103010401030004010301
-040103000401030004010300040103080401030104010301040103000401030104010300
-04010301040103000402030c040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003070400030604000302
-040003050400030104060301040003080405030004010301040103000401030104010300
-040103010401030104010300040103010401030004010301040103080401030104010300
-040103010401030004010301040103000405030204020306040403000401030104010300
-040103010401030504040300040103010401030004010301040103000401030004010300
-040103050404030104010301040103000401030104010300040103010401030204020309
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003080400030604000302040003050400030104060301
-040003070401030304030301040103000401030104010300040103010401030104010300
-040103010401030004010301040103080401030104010300040103010401030004010301
-040103000401030704020304040103010401030004010301040103000401030104010304
-040103010401030004010301040103000401030104010300040103000401030004010304
-040103010401030104010301040103000401030104010300040103010401030304020309
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003070400030604000302040003050400030204040302
-040003070401030304040300040103000402030004010300040103010401030104010300
-040103010401030004010301040103010401030404010301040103000401030104010300
-040103000402030004010301040103000401030104010304040103010401030004010301
-040103000401030004020304040103010401030004020300040103000402030004010300
-040103000401030004010301040103000401030104010301040103000402030004010301
-040103000401030104010300040103010401030804000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000308
-040803020400030504000303040203030400030704010303040303000401030104010300
-040103010401030104010301040103010403030104010301040103010401030404010301
-040103010403030204010300040103010403030204030306040203000403030104010301
-040103000401030504020300040303000401030104010300040103010401030004010301
-04030302040203000401030104010300040103010403030104010301040103010403030a
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003070400030a040003050400030a0400030f04010304
-0401036c040103040401033d040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003080400030a04000305
-0400030a0400030f040103040401036c040103040401033e040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003070400030a04000305040c030f040103040401036c040103040401033d04000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000308040c03e00400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000300040003000400030004000300040003ff03ff03a1
-02ff02ff028904ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff046b0512
-04ff043105110000047e05b0040105010606050006060001047e05af0000040105010605
-0000050006060001047e050104ac00010401050106050000050106050001047e050104ac
-00010401050106040001050106050001047e0501043301000430010004260100041d0001
-04010501060400010400050106040001047e050104040100040401000403010204020100
-0415010004040100040001000405010004060100040b010004030102040b0100040b0102
-0405010004120100041c000104010501060300010401050106040001047e050104040100
-040b010004020100041501000403010004020100040c010004120100040b0100040d0100
-04190100041c000104010501060300010402050106030001047e05010401010104000100
-040201020405010004020100040001010403010204020100040001010402010404010100
-0400010204020102040301010400010004010100040001010403010204050100040a0100
-04050102040501000403010204020100040201000402010204050100041b000104010501
-060200010403050106030001047e05010400010004010101040401000405010004020101
-040101000401010004020100040101010401010004030100040301000400010004000100
-04040100040201000401010104010101040101000404010004050100040a010004040100
-0402010004040100040501000402010004020100040101000402010004040100041b0001
-04010501060200010404050106020001047e050104000100040201000404010004050100
-040201000402010004010100040201000401010004070100040301000400010004000100
-040401000402010004020100040101000408010004050100040a01000408010004040100
-040501000402010004020100040101000402010004040100041b00010401050106010001
-0405050106020001047e0501040001000402010004040100040501000402010004020100
-040101040401010004070100040301000400010204040100040201000402010004010100
-0408010004050100040a0100040501030404010004050100040301000400010004020104
-04040100041b000104010501060100010406050106010001047e05010400010004020100
-040401000405010004020100040201000401010004050100040701000403010004080100
-0402010004020100040101000408010004050100040a0100040401000402010004040100
-0405010004030100040001000402010004080100041b0001040105010600000104070501
-06010001047e050104000100040101010404010004050100040201010401010004010100
-040201000401010004070100040401000401010004040100040201000401010104010100
-0408010004050100040b0100040301000402010004040100040501000404010004030100
-0402010004030100041c000104010501060000010408050106000001047e050104010101
-040001000404010004050100040201000400010104030102040201000408010104030101
-040501000403010104000100040101000408010004050100040b01000404010304040100
-04050100040401000404010204040100041c0001040105010001050b06000001047e0501
-0465010004260100041d0001040105010000050d0001047e050104ac000104010501060e
-0001047e050104ac0001040105010010047e050104ac000104010501000d05000001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104160101040001000402010004020100040201020402
-010004000101040201000400010104750001040105010001040a05010001047e05010416
-010004000100040001000401010004020100040101000402010004010101040101000401
-01010401010004740001040105010001040a05010001047e050104160100040001000400
-010004020100040101000405010004010100040201000401010004020100047400010401
-05010001040a05010001047e050104160100040001000400010004020100040101000402
-01030401010004020100040101000402010004740001040105010001040a05010001047e
-050104160100040001000400010004030100040001000401010004020100040101000402
-0100040101000402010004740001040105010001040a05010001047e0501041601000400
-010004000100040301010402010004020100040101010401010004010101040101000474
-0001040105010001040a05010001047e0501041601000400010004000100040401000403
-01030401010004000101040201000400010104750001040105010001040a05010001047e
-050104200100040901000405010004780001040105010001040a05010001047e0501041d
-010004000100040a01000405010004780001040105010001040a05010001047e0501041e
-0100040b01000405010004780001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e05010416010004220102046e00010401
-05010001040a05010001047e05010416010004240100046e0001040105010001040a0501
-0001047e0501041601000401010004030102040201000400010104020100040001010403
-010204050100046e0001040105010001040a05010001047e050104160100040001000403
-01000402010004010101040101000401010104010100040101000402010004040100046e
-0001040105010001040a05010001047e0501041601010404010004020100040101000405
-010004020100040101000402010004040100046e0001040105010001040a05010001047e
-050104160101040401040401010004050100040201000401010404040100046e00010401
-05010001040a05010001047e050104160100040001000403010004050100040501000402
-01000401010004080100046e0001040105010001040a05010001047e0501041601000401
-01000402010004020100040101000405010004020100040101000402010004040100046e
-0001040105010001040a05010001047e0501041601000402010004020102040201000405
-0100040201000402010204050100046e0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e0501042c0102047c0001040105010001040a05010001047e
-0501042e0100047c0001040105010001040a05010001047e050104170102040301020403
-010204050100047c0001040105010001040a05010001047e050104160100040201000401
-010004020100040101000402010004040100047c0001040105010001040a05010001047e
-050104160100040901000401010004080100047c0001040105010001040a05010001047e
-050104170102040301030402010204050100047c0001040105010001040a05010001047e
-0501041a010004010100040201000405010004040100047c0001040105010001040a0501
-0001047e050104160100040201000401010004020100040101000402010004040100047c
-0001040105010001040a05010001047e050104170102040301030402010204050100047c
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e0501043301000430010004260100041d0001040105010001
-040a05010001047e050104040100040f0100041501000404010004000100040501000406
-0100040b010004030102040b0100040b01020405010004120100041c0001040105010001
-040a05010001047e050104040100040f0100041501000403010004020100040c01000412
-0100040b0100040d010004190100041c0001040105010001040a05010001047e05010401
-010104000100040201020403010104000100040101000400010104030102040201000400
-010104020104040101000400010204020102040301010400010004010100040001010403
-010204050100040a01000405010204050100040301020402010004020100040201020405
-0100041b0001040105010001040a05010001047e05010400010004010101040101000402
-010004010100040101010401010104010100040101000402010004010101040101000403
-010004030100040001000400010004040100040201000401010104010101040101000404
-010004050100040a01000404010004020100040401000405010004020100040201000401
-01000402010004040100041b0001040105010001040a05010001047e0501040001000402
-010004010100040201000401010004020100040101000402010004010100040201000401
-010004070100040301000400010004000100040401000402010004020100040101000408
-010004050100040a01000408010004040100040501000402010004020100040101000402
-010004040100041b0001040105010001040a05010001047e050104000100040201000401
-010004020100040101000402010004010100040201000401010404010100040701000403
-010004000102040401000402010004020100040101000408010004050100040a01000405
-0103040401000405010004030100040001000402010404040100041b0001040105010001
-040a05010001047e05010400010004020100040101000402010004010100040201000401
-010004020100040101000405010004070100040301000408010004020100040201000401
-01000408010004050100040a010004040100040201000404010004050100040301000400
-01000402010004080100041b0001040105010001040a05010001047e0501040001000401
-010104010100040201000401010004010101040101010401010004010100040201000401
-010004070100040401000401010004040100040201000401010104010100040801000405
-0100040b0100040301000402010004040100040501000404010004030100040201000403
-0100041c0001040105010001040a05010001047e05010401010104000100040201020403
-010104000100040101000400010104030102040201000408010104030101040501000403
-010104000100040101000408010004050100040b01000404010304040100040501000404
-01000404010204040100041c0001040105010001040a05010001047e0501041201000451
-010004260100041d0001040105010001040a05010001047e0501040e0100040201000498
-0001040105010001040a05010001047e0501040f010204990001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e05010416
-010004220102046e0001040105010001040a05010001047e05010416010004240100046e
-0001040105010001040a05010001047e0501041601000401010004030102040201000400
-010104020100040001010403010204050100046e0001040105010001040a05010001047e
-050104160100040001000403010004020100040101010401010004010101040101000401
-01000402010004040100046e0001040105010001040a05010001047e0501041601010404
-010004020100040101000405010004020100040101000402010004040100046e00010401
-05010001040a05010001047e050104160101040401040401010004050100040201000401
-010404040100046e0001040105010001040a05010001047e050104160100040001000403
-01000405010004050100040201000401010004080100046e0001040105010001040a0501
-0001047e0501041601000401010004020100040201000401010004050100040201000401
-01000402010004040100046e0001040105010001040a05010001047e0501041601000402
-0100040201020402010004050100040201000402010204050100046e0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001047e050104ac00010401
-05010001040a05010001047e050104ac0001040105010001040a05010001047e050104ac
-0001040105010001040a05010001047e050104ac0001040105010001040a05010001047e
-050104ac0001040105010001040a05010001047e050104ac0001040105010001040a0501
-0001047e050104ac0001040105010001040a05010001047e050104ac0001040105010001
-040a05010001047e050104ac0001040105010001040a05010001040900630410050104ac
-0001040105010001040a050100010409006205000410050104ac0001040105010001040a
-0501000104090001045f05010410050104ac0001040105010001040a0501000104090001
-045f05010410050104ac0001040105010001040a0501000104090001045f050104100501
-04ac0001040105010001040a0501000104090001045f05010410050104ac000104010501
-0001040a0501000104090001045f05010410050104ac0001040105010001040a05010001
-04090001045f05010410050104ac0001040105010001040a0501000104090001045f0501
-0410050104ac0001040105010001040a0501000104090001042101000417010004230501
-0410050104ac0001040105010001040a0501000104090001042101000417010004230501
-0410050104ac0001040105010001040a0501000104090001042101000406010204030102
-0403010104000100042305010410050104ac0001040105010001040a0501000104090001
-042101000405010004020100040101000402010004010100040101010423050104100501
-04ac0001040105010001040a050100010409000104210100040501000402010004050100
-0401010004020100042305010410050104ac0001040105010001040a0501000104090001
-042101000405010004020100040201030401010004020100042305010410050104ac0001
-040105010001040a05010001040900010421010004050100040201000401010004020100
-0401010004020100042305010410050104ac0001040105010001040a0501000104090001
-042101000405010004020100040101000402010004010100040101010423050104100501
-04ac0001040105010001040a050100010409000104210104040201020403010304020101
-04000100042305010410050104ac0001040105010001040a0501000104090001045f0501
-0410050104ac0001040105010001040a0501000104090001045f05010410050104ac0001
-040105010001040a0501000104090001045f05010410050104ac0001040105010001040a
-0501000104090001045f05010410050104ac0001040105010001040a0501000104090001
-045f05010410050104ac0001040105010001040a0501000104090001045f050104100501
-04ac0001040105010001040a0501000104090001045f05010410050104ac000104010501
-0001040a0501000104090001045f05010410050104ac0001040105010001040a05010001
-04090001045f05010410050104ac0001040105010001040a0501000104090001045f0501
-0410050104ac0001040105010001040a050100010409000105610410050104ac00010401
-05010001040a050100010409000005620410050104ac0001040105010001040a05010001
-047e050104ac0001040105010001040a05010001047e050104ac0001040105010001040a
-05010001047e050104ac0001040105010001040a05010001047e050104ac000104010501
-0001040a05010001047e050104ac0001040105010001040a05010001047e050104ac0001
-040105010001040a05010001047e050104ac0001040105010001040a05010001047e0501
-04ac0001040105010001040a05010001047e050104ac0001040105010001040a05010001
-047e050104ac0001040105010001040a05010001040900630410050104ac000104010501
-0001040a050100010409006205000410050104ac0001040105010001040a050100010409
-0001045f05010410050104ac0001040105010001040a0501000104090001045f05010410
-050104ac0001040105010001040a0501000104090001045f05010410050104ac00010401
-05010001040a0501000104090001045f05010410050104ac0001040105010001040a0501
-000104090001045f05010410050104ac0001040105010001040a0501000104090001045f
-05010410050104ac0001040105010001040a0501000104090001045f05010410050104ac
-0001040105010001040a0501000104090001041e010204030102043605010410050104ac
-0001040105010001040a0501000104090001041d01000402010004040100043605010410
-050104ac0001040105010001040a0501000104090001041d010004020100040401000403
-0102040301020402010004000101042105010410050104ac0001040105010001040a0501
-000104090001041d01000408010004020100040201000401010004020100040101010401
-0100042005010410050104ac0001040105010001040a0501000104090001041d01000408
-010004020100040201000405010004010100042405010410050104ac0001040105010001
-040a0501000104090001041d010004080100040201040402010304010100042405010410
-050104ac0001040105010001040a0501000104090001041d010004020100040401000402
-0100040501000402010004010100042405010410050104ac0001040105010001040a0501
-000104090001041d01000402010004040100040201000402010004010100040201000401
-0100042405010410050104ac0001040105010001040a0501000104090001041e01020405
-0100040301020403010304010100042405010410050104ac0001040105010001040a0501
-000104090001045f05010410050104ac0001040105010001040a0501000104090001045f
-05010410050104ac0001040105010001040a0501000104090001045f05010410050104ac
-0001040105010001040a0501000104090001045f05010410050104ac0001040105010001
-040a0501000104090001045f05010410050104ac0001040105010001040a050100010409
-0001045f05010410050104ac0001040105010001040a0501000104090001045f05010410
-050104ac0001040105010001040a0501000104090001045f05010410050104ac00010401
-05010001040a0501000104090001045f05010410050104ac0001040105010001040a0501
-000104090001045f05010410050104ac0001040105010001040a05010001040900010561
-0410050104ac0001040105010001040a050100010409000005620410050104ac00010401
-05010001040a05010001047e050104ac0001040105010001050c0001047e050104ac0001
-040105010000050d0001047e050104ac000104010501060e0001047e050104ac00010401
-05010010047e050104ac0001040105010600000c05000001047e050104ac000104010501
-060000010408050106000001047e050104ac000104010501060100010407050106000001
-047e050104ac000104010501060100010406050106010001047e050104ac000104010501
-060200010405050106010001047e050104ac000104010501060200010404050106020001
-040900630410050104ac0001040105010603000104030501060200010409006205000410
-050104ac00010401050106030001040205010603000104090001045f05010410050104ac
-00010401050106040001040105010603000104090001045f05010410050104ac00010401
-050106040001040005010604000104090001045f05010410050104ac0001040105010605
-000005020604000104090001045f05010410050104ac0001040105010605000005010605
-000104090001045f05010410050100ae04010501060605010605000104090001045f0501
-0410050000af04010501060605000606000104090001045f050104c30501001004090001
-041e0102040301020436050104c30500001104090001041d010004020100040401000436
-0501040e05b804180001041d010004020100040401000403010204030102040301020421
-0501040e05b7000004180001041d01000408010004020100040201000401010004020100
-040101000402010004200501040e0501060d00000600009406000001060c000104180001
-041d010004080100040201000402010004010100040501000402010004200501040e0501
-060b0001050006000093050006000003060a000104180001041d01000408010004020100
-04020100040201020402010404200501040e050106090002050106000001049005010600
-00050608000104180001041d010004020100040401000402010004020100040501000401
-010004240501040e05010607000304000501060000010490050106000001040100030606
-000104180001041d01000402010004040100040201000402010004010100040201000401
-01000402010004200501040e050106050003040205010600000104900501060000010403
-00030604000104180001041e01020405010004030102040301020403010204210501040e
-05010603000304040501060000010490050106000001040500030602000104180001045f
-0501040e0501060100030406050106000001049005010600000104070003060000010418
-0001045f0501040e05050408050106000001049005010600000104080503000104180001
-045f0501040e050106010503040605010600000104900501060000010407050306000001
-04180001045f0501040e0501060305030404050106000001049005010600000104050503
-0602000104180001045f0501040e05010605050304020501060000010490050106000001
-040305030604000104180001045f0501040e050106070503040005010600000104900501
-06000001040105030606000104180001045f0501040e0501060905040600000104900501
-0600000105030608000104180001045f0501040e0501060b050206000001059206000001
-0501060a000104180001045f0501040e0501060d0500060000000593060000000500060c
-000104180001045f0501040e050100b6041800010561040e050000b704180000056204ff
-04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04bb
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 85 200 356
-%%EOF
diff --git a/lib/appmon/doc/src/main_win.gif b/lib/appmon/doc/src/main_win.gif
deleted file mode 100644
index 36d742e91e..0000000000
--- a/lib/appmon/doc/src/main_win.gif
+++ /dev/null
diff --git a/lib/appmon/doc/src/main_win.ps b/lib/appmon/doc/src/main_win.ps
deleted file mode 100644
index abb12d733b..0000000000
--- a/lib/appmon/doc/src/main_win.ps
+++ /dev/null
@@ -1,691 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./main_win.tmp.eps)
-%%CreationDate: (Tue Jun 12 17:57:00 2001)
-%%BoundingBox: 0 26 377 164
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 26 377 164
-userdict begin
-%%BeginData:
-DisplayImage
-0 26
-377.000000 138.000000
-12
-520 191
-1
-0
-0
-16
-ffffff
-000000
-708090
-b03060
-d9d9d9
-808080
-00ff00
-666666
-999999
-ececc5
-000000
-000000
-000000
-000000
-000000
-000000
-03ff03ff03ff03ff03ff0305040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400031b040c03e4040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000307040c03050400030a0400030a040103030405030104050301
-040103040401030304030303040103020401030b0403031e0401032c0401030004010300
-040103000401031104010305040403020401030404010305040103000401030904000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003080400030204000302
-04000302040003050400030a040003090403030204010302040103000401030204010300
-04010304040103020401030104010302040203010401030a040103010401034c04010303
-040103000401031104010303040103040400030804010308040103080400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003070400030204000302
-040003020400030504000303040203030400030904000301040003020401030204010300
-040103020401030004020302040203010401030304010301040203010401030104010305
-040103030401030004010302040103010403030104010300040303020401030004010301
-040303010401030104010301040103050403030104010300040103060401030004010300
-040103000401030004010300040103020403030104010300040503020400030604000300
-040103010401030004010300040103000403030004010309040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030804000302040003020400030204000305
-040003020404030204000308040103010401030104010302040103000401030204010300
-040203020402030104010303040103010401030004000300040103010401030504010303
-040103000401030204010300040103010401030004060302040103000401030004010301
-040103000401030104010301040103040401030104010300040203000401030404010300
-040203000401030004010300040203000401030004010301040103000404030004010302
-040003020401030004000300040003000401030004010300040203000406030004010308
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000307
-040403020400030204000305040003010406030104000308040103010401030104050301
-040503010403030004030301040103030401030104010300040003000401030904010303
-040103010401030004010301040103010401030004020302040103000401030104010300
-040103010401030104010300040103000401030504010301040103000401030104010304
-040103010401030004010300040103000401030104010300040103010401030004020302
-040103020400030104000301040003010400030004010300040103010401030004020301
-040103000401030904000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003080400030604000302040003050400030104060301040003080405030104010305
-040103050401030004000300040003000401030104010303040103010401030104020309
-040103030401030104010300040103010405030004010303040103000401030104010300
-040503010401030004010300040103050401030104010300040103010401030404010301
-040103000401030004010300040103010401030004050300040103030401030204000300
-040003020400030104000300040103000401030104010300040103020401030004010308
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000307
-040003060400030204000305040003010406030104000307040103030401030004010305
-040103050401030004020300040103010401030304010301040103010402030904010303
-040103020402030204010304040103040402030204010300040103050401030004010300
-040103050401030104010300040103010401030404010301040103000401030004010300
-040103010401030004010304040103030401030204000300040003010401030004000301
-040103000401030104010300040103020401030004010309040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030804000306040003020400030504000302
-040403020400030704010303040103000401030504010305040103010400030104010302
-040103010401030204010302040103010401030604010301040103030402030204010301
-040103000401030404020302040103000401030104010302040103010401030604010301
-040103000401030104010304040103000402030004010300040103000402030004010300
-040103010401030004010303040103000400030004000301040103000401030204010300
-040103000402030004010302040103000401030804000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030704080302040003050400030304020303
-040003070401030304010300040103050401030504010301040003010401030304030303
-040103020401030104010307040303050400030404030301040103050400030304010301
-040303030401030104010307040303010401030104010305040103000401030004010300
-040103000401030004010302040303010401030404010302040003080401030104010300
-040103000401030204010300040103090400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-0400030004000300040003080400030a040003050400030a040003be0404032004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000300040003000400030004000300040003070400030a
-040003050400030a040003e5040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003080400030a04000305040c03e404000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-0400030004000300040003000400030004000307040c03f8040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000300040003ff03ff03ff03ff032802ff02ff02ff02ff
-020f00ff00ff00ff00ff000e0500000104ff04ff04030501000104ff04ff040305010001
-04ff04ff04030501000104ff04ff04030501000104ff04ff040305010001040401040404
-01000403010204130100040c01000406010004200102040b010004060100041f01000402
-0100040c010004ff043601000402010004090102040c0501000104040100040f01000413
-0100040c01000427010004020100040a01000427010104010100040c010004ff04360100
-04020100040b0100040c0501000104040100040601020405010004030102040b01000400
-010004030102040201040402010204030102040201000400010104030102040a01000402
-01000401010004000101040201040402010204030102040201000400010104030102040a
-010104010100040201020403010104000100040201020403010204ff0429010004020100
-040201020405010004020100040001010405050100010404010004080100040501000402
-010004020100040a01000400010004020100040201000403010004060100040201000402
-010004010101040101000401010004020100040901000402010004010101040101000403
-010004060100040201000402010004010101040101000401010004020100040901000400
-010004000100040101000402010004010100040101010401010004020100040101000402
-010004ff0428010004020100040101000402010004040100040201010401010004040501
-00010404010304050100040501000402010004020100040a010004000100040201000407
-0100040601000402010004020100040101000402010004010100040d0100040201000401
-01000402010004030100040601000402010004020100040101000402010004010100040d
-010004000100040001000401010004020100040101000402010004010100040201000401
-010004ff042c010404010100040201000404010004020100040201000404050100010404
-010004080100040501000402010404090100040201000401010004070100040601000402
-010004020100040101000402010004020102040a01000402010004010100040201000403
-0100040601000402010004020100040101000402010004020102040a0100040101010401
-0100040201000401010004020100040101040402010204ff042901000402010004010104
-04040100040201000402010004040501000104040100040801000405010004020100040d
-010404010100040701000406010004020100040201000401010004020100040501000409
-010004020100040101000402010004030100040601000402010004020100040101000402
-010004050100040901000401010104010100040201000401010004020100040101000409
-010004ff0428010004020100040101000408010004020100040201000404050100010404
-010004080100040501000402010004020100040901000402010004010100040201000403
-010004060100040201000402010004010100040201000401010004020100040901000402
-010004010101040101000403010004060100040201000402010004010100040201000401
-010004020100040901000402010004010100040201000401010004010101040101000402
-0100040101000402010004ff042801000402010004010100040201000404010004020101
-0401010004040501000104040100040801000405010004030102040a0100040201000402
-0102040501010404010004030102040201000402010004020102040b0102040201000400
-0101040501010404010004030102040201000402010004020102040a0100040201000402
-01020403010104000100040201020403010204ff04290100040201000402010204050100
-04020100040001010405050100010468010004ff048f01000408050100010468010004ff
-048f01000408050100010468010004ff048f010004080501000104ff04ff040305010001
-04ff04ff04030501000104ff04ff04030501000105ff05ff0505000005ff05ff050604ff
-04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff
-04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff
-04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04cf01ff01ff
-010704ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff
-04ff044c01150400010104010100041a017204ff045d0100081201010400010104000101
-041a017204ff045d01000812010404010100041a017204ff045d01000812010104000101
-04010100041a017204ff045d0100081201010400010104010100041a017204ff045d0114
-04050100041a011909010100090101000901010009010111090101050904010209010104
-09010105090101000901011704ff045d0100081201000421011909010103090101000901
-0111090101030901010409000108090101080901011704ff045d01000812010004210116
-090101000901010009010100090101000901010009010102090301010901010009050102
-090001060900010009010101090101000901010009010100090301000901011704ff045d
-010008120100042101150901010009020100090101000901010009020100090101000901
-010109010100090401000901010209000102090101000900010009000100090101000901
-010009020100090601000901011704ff045d010008120100042101150901010109010100
-090101000901010009010101090101000901010109010100090201020901010209000101
-090001010900010109000100090101000901010109010100090201010901010009010117
-04ff045d0114042101150901010109010100090101000901010009010101090101000905
-010009010103090101020900010009000102090001010900010009010100090101010901
-010009010102090101000901011704ff045d010008120100042101150901010109010100
-090101000901010009010101090101000901010409010103090101020900010009000101
-090101000900010109010100090101010901010009010102090101000901011704ff045d
-010008120100042101150901010009020100090101000901010009020100090101000901
-010109010100090101030901010009000100090001010901010009010102090101000901
-01000902010009010102090101000901011704ff045d0100081201000421011609010100
-090101000901010009010100090101000901010209030101090101040901010209000108
-09010101090101000901010009010102090101000901011704ff045d0100081201000421
-013d0904012f04ff045d01140421017204ff045d0100081201000421017204ff045d0100
-081201000421017204ff045d0100081201000421017204ff045d01000812010004210172
-04ff045d01140421017204ff045d01000812010004ff04f201000812010004ff04f20100
-0812010004ff04f201000812010004ff04f2011404ff04f201000812010004ff04f20100
-0812010004ff04f201000812010004ff04f201000812010004ff04f201140444010004ff
-04ac0100081201000444010004ff04ac0100081201000444010004ff04ac010008120100
-0444010004ff04ac0100081201000444010004ff04ac01140444010004ff04ac01000812
-01000444010004ff04ac0100081201000444010004ff04ac0100081201000444010004ff
-04ac0100081201000444010004ff04ac01140444010004ff04ac01000812010004440100
-04ff04ac0100081201000444010004ff04ac0100081201000444010004ff04ac01000812
-01000444010004ff04ac01140444010004ff04ac0100081201000444010004ff04ac0100
-081201000444010004ff04ac0100081201000444010004ff04ac01000812010004440100
-04ff04ac0114044401a004ff040c01000812010004440100044e0100044e010004ff040c
-01000812010004440100044e0100044e010004ff040c01000812010004440100044e0100
-044e010004ff040c01000812010004440100044e0100044e010004ff040c011404440100
-044e0100044e010004ff040c01000812010004440100044e0100044e010004ff040c0100
-0812010004440100044e0100044e010004ff040c01000812010004440100044e0100044e
-010004ff040c01000812010004440100044e0100044e010004ff040c011404440100044e
-0100044e010004ff040c01000812010004440100044e0100044e010004ff040c01000812
-010004440100044e0100044e010004ff040c01000812010004440100044e0100044e0100
-04ff040c01000812010004440100044e0100044e010004ff040c011404440100044e0100
-044e010004ff040c01000812010004440100044e0100044e010004ff040c010008120100
-04440100044e0100044e010004ff040c01000812010004440100044e0100044e010004ff
-040c01000812010004210045040900450409004504ea0114042000450701040700450701
-04070045070104e901000812010004200001044307010407000104430701040700010443
-070104e901000812010004200001044307010407000104430701040700010443070104e9
-01000812010004200001044307010407000104430701040700010443070104e901000812
-010004200001044307010407000104430701040700010443070104e9011404200001040f
-0101041e01010410070104070001042a010104160701040700010443070104e901000612
-0101041f0001040f0101041e01010410070104070001042a010104160701040700010443
-070104e90100061201010403010204180001040f01010401010104010103040101010400
-010304000101040201030401010104100701040700010416010304020103040201030401
-01010416070104070001040d010004000102040001020401010104020101040101030401
-0101040001010401010104000101040f070104e901000612010104020101040001010417
-0001040f0101040001010401010104010101040001070400010104000101040101010400
-010104100701040700010415010104010101040001010401010104000101040101010400
-01010416070104070001040d010104010101040101010400010104020101040001010401
-010104000102040001010400010204000101040e070104e9010006120101040201010400
-010104170001040f01030402010104010101040001020401010104010101040001010401
-010104000101041007010407000104150102040701010400010204030101041607010407
-0001040d0101040101010401010104010101040001010405010104000101040101010400
-010104010101040e070104e901170401010204180001040f010304020105040001010402
-010104010101040001050400010104100701040700010417010204020104040201020401
-01010416070104070001040d010104010101040101010401010104000101040201040400
-0101040101010400010104010101040e070104e901010403010204010101040201030400
-01020402010004190001040f010104000101040101010404010104020101040101010400
-010104040101041007010407000104180102040001010401010104030102040001010416
-070104070001040d01010401010104010101040201020402010104010101040001010401
-01010400010104010101040e070104e90101040201010400010104000102040001010400
-010104210001040f01010401010104000101040101010400010104020101040101010400
-010104010101040001010410070104070001041501010401010104000101040101010400
-010104010101040001010416070104070001040d01010401010104010101040201020402
-01010401010104000102040001010400010204000101040e070104e90101040201010400
-010104000102040001010400010104210001040f01010402010104000103040101010402
-010104010101040101030401010104100701040700010416010304020102040001010400
-0103040101010416070104070001040d0101040101010401010104030101040301020400
-0103040001010401010104000101040f070104e901030401010204010102040101030421
-000104430701040700010443070104070001041b0100040a0101040401010412070104ea
-01020402010004030100040301000423000104430701040700010443070104070001041a
-0101040a0101040401010412070104ff041f000104430701040700010443070104070001
-04190101040b0101040401010412070104ff041f00010443070104070001044307010407
-00010443070104ff041f0001044307010407000104430701040700010443070104ff041f
-0000074604070000074604070000074604ff04200746040807460408074604ff04ff04ff
-04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff042c01ff
-01ff010704ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff
-04ff04ff0447
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 26 377 164
-%%EOF
diff --git a/lib/appmon/doc/src/note.gif b/lib/appmon/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/appmon/doc/src/note.gif
+++ /dev/null
diff --git a/lib/appmon/doc/src/notes.xml b/lib/appmon/doc/src/notes.xml
deleted file mode 100644
index 9987ca9278..0000000000
--- a/lib/appmon/doc/src/notes.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</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>Appmon Release Notes</title>
-    <prepared></prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the Appmon application.</p>
-
-<section><title>Appmon 2.1.14.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-        <item>
-          <p>
-	    The backend module appmon_info.erl is moved from appmon
-	    application to runtime_tools. This allows appmon to be
-	    run from a remote erlang node towards a target node which
-	    does not have appmon (and its dependencies) installed, as
-	    long as runtime_tools is installed there.</p>
-          <p>
-	    Own Id: OTP-10786</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Appmon 2.1.14.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The GS applications is now deprecated and will be
-	    removed in the R16 release. The following GS-based
-	    applications have been superseded by the Observer
-	    application and will removed in R16: Appmon, Pman,
-	    Tv.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-9907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Appmon 2.1.14</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Eliminate use of deprecated regexp module</p>
-          <p>
-	    Own Id: OTP-9810</p>
-        </item>
-        <item>
-          <p>
-	    Miscellaneous documentation build updates</p>
-          <p>
-	    Own Id: OTP-9813</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Appmon 2.1.13</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    An obsolete compiler directive for native code generation
-	    was removed from a source file.</p>
-          <p>
-	    Own Id: OTP-8839</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Appmon 2.1.12</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Warnings due to new autoimported BIFs removed</p>
-          <p>
-	    Own Id: OTP-8674 Aux Id: OTP-8579 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Appmon 2.1.11</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The documentation is now possible to build in an open
-	    source environment after a number of bugs are fixed and
-	    some features are added in the documentation build
-	    process. </p>
-	    <p>- The arity calculation is updated.</p>
-	    <p>- The module prefix used in the function names for
-	    bif's are removed in the generated links so the links
-	    will look like
-	    "http://www.erlang.org/doc/man/erlang.html#append_element-2"
-	    instead of
-	    "http://www.erlang.org/doc/man/erlang.html#erlang:append_element-2".</p>
-	    <p>- Enhanced the menu positioning in the html
-	    documentation when a new page is loaded.</p>
-	    <p>- A number of corrections in the generation of man
-	    pages (thanks to Sergei Golovan)</p>
-	    <p>- The legal notice is taken from the xml book file so
-	    OTP's build process can be used for non OTP
-	    applications.</p>
-          <p>
-	    Own Id: OTP-8343</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Appmon 2.1.10.2</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>Appmon 2.1.10.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>
-           Updated the application with new tags for automatic updates 
-           of copyright notices.
-          </p>
-          <p>Own Id: OTP-7851</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Appmon 2.1.9</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Fixed dialyzer warning in <c><![CDATA[appmon_info]]></c>.</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Appmon 2.1.8</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some dead code from the <c><![CDATA[appmon_info]]></c> and
-            <c><![CDATA[process_info]]></c> modules. Also rewritten large parts
-            of <c><![CDATA[process_info]]></c> to make it easier to read and more
-            efficient.</p>
-          <p>Own Id: OTP-6534</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Appmon 2.1.7</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Appmon now handles a process name containing the
-            character '@' correctly. (Thanks to Mikael Magnusson).</p>
-          <p>Own Id: OTP-6308</p>
-        </item>
-        <item>
-          <p>The "Send" button in the application window was broken,
-            it always failed (silently).</p>
-          <p>Own Id: OTP-6333</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Appmon 2.1.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Internal change only (using a private digraph instead of
-            a public one).</p>
-          <p>Own Id: OTP-5983</p>
-        </item>
-        <item>
-          <p>Notification windows are now centered over the parent
-            window (if possible).</p>
-          <p>Own Id: OTP-6010 Aux Id: OTP-5987</p>
-        </item>
-        <item>
-          <p>Removed some dead code from <c><![CDATA[appmon_info]]></c>,
-            discovered by Dialyzer.</p>
-          <p>Own Id: OTP-6040</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Appmon 2.1.5</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Eliminated 5 discrepancies found by Dialyzer in the
-            Appmon application.</p>
-          <p>Own Id: OTP-5633</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Appmon 2.1.4</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The graphic applications now search for HTML
-            documentation in the correct place.</p>
-          <p>Own Id: OTP-5381</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/appmon/doc/src/part.xml b/lib/appmon/doc/src/part.xml
deleted file mode 100644
index 017957946c..0000000000
--- a/lib/appmon/doc/src/part.xml
+++ /dev/null
@@ -1,37 +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>2000</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>Appmon User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The Application Monitor, <em>Appmon</em>, is a graphical utility used
-      to supervise applications executing either locally or on remote nodes.
-      The process tree of an application can furthermore be monitored.</p>
-  </description>
-  <xi:include href="appmon_chapter.xml"/>
-</part>
-
diff --git a/lib/appmon/doc/src/part_notes.xml b/lib/appmon/doc/src/part_notes.xml
deleted file mode 100644
index 8b19d57d64..0000000000
--- a/lib/appmon/doc/src/part_notes.xml
+++ /dev/null
@@ -1,39 +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>2004</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>Appmon Release Notes</title>
-    <prepared>Ingela Anderton Andin</prepared>
-    <docno></docno>
-    <date>2004-09-07</date>
-    <rev></rev>
-    <file>part_notes.sgml</file>
-  </header>
-  <description>
-    <p>The Application Monitor, <em>Appmon</em>, is a graphical utility
-      used to supervise applications executing either locally or on
-      remote nodes. The process tree of an application can furthermore
-      be monitored.</p>
-  </description>
-  <include file="notes"></include>
-</part>
-
diff --git a/lib/appmon/doc/src/pinfo_win.gif b/lib/appmon/doc/src/pinfo_win.gif
deleted file mode 100644
index fda0900436..0000000000
--- a/lib/appmon/doc/src/pinfo_win.gif
+++ /dev/null
diff --git a/lib/appmon/doc/src/pinfo_win.ps b/lib/appmon/doc/src/pinfo_win.ps
deleted file mode 100644
index d47d7d47a9..0000000000
--- a/lib/appmon/doc/src/pinfo_win.ps
+++ /dev/null
@@ -1,1353 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./pinfo_win.tmp.eps)
-%%CreationDate: (Tue Jun 12 18:01:56 2001)
-%%BoundingBox: 0 73 377 347
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 73 377 347
-userdict begin
-%%BeginData:
-DisplayImage
-0 73
-377.000000 274.000000
-12
-580 421
-1
-0
-0
-8
-ffffff
-000000
-708090
-b03060
-d9d9d9
-c3c3c3
-828282
-000000
-03ff03ff03ff03ff03ff035e040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400031a040c03c50400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000308040c03050400030a0400030a0401030304050301
-0405030104010304040103030403030304010302040103090405032d040103090402031e
-040103010401031704000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-0400030004000307040003020400030204000302040003050400030a0400030904030302
-040103020401030004010302040103000401030404010302040103010401030204020301
-04010309040103020401032c04010308040103200401031a040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000308040003020400030204000302
-040003050400030304020303040003090400030104000302040103020401030004010302
-040103000402030204020301040103030401030104020301040103010401030504010302
-040303000401030004030302040303020403030204030302040303060401030004010300
-040103010403030104030301040103000402030004020300040203020403030104030300
-0401030104030301040103000401030a0400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003070400030204000302040003020400030504000302
-040403020400030804010301040103010401030204010300040103020401030004020302
-040203010401030304010301040103000400030004010301040103050401030204080301
-040103000401030104010300040103010401030004010301040103000401030104010305
-040103000402030004010301040103010401030104010300040603010401030104010300
-040103010401030104010301040103000401030104010300040203000401030804000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030804040302
-040003020400030504000301040603010400030804010301040103010405030104050301
-040303000403030104010303040103010401030004000300040103090405030004020301
-040103010401030004010304040103010401030004020303040203080401030004010301
-040103010401030104010301040103000402030104010301040103010401030404010301
-040103010401030004010301040103000401030104010309040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000307040003060400030204000305
-040003010406030104000308040503010401030504010305040103000400030004000300
-040103010401030304010301040103010402030904010304040103020401030104010300
-040103040405030204020303040203060401030004010301040103010401030104010301
-040103000401030204010301040103010401030104040301040103010401030004010301
-040103000401030104010308040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000308040003060400030204000305040003010406030104000307
-040103030401030004010305040103050401030004020300040103010401030304010301
-040103010402030904010304040103020401030104010300040103040401030704020303
-040203050401030004010301040103010401030104010301040103000401030204010301
-040103010401030004010301040103010401030104010300040103010401030004010301
-040103090400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003070400030604000302040003050400030204040302040003070401030304010300
-040103050401030504010301040003010401030204010301040103020401030204010301
-040103050401030404010302040103010401030004010301040103000401030104010300
-040103010401030004010301040103050401030004010301040103010401030104010301
-040103000401030204010301040103010401030004010301040103010401030004020300
-040103010401030004010301040103080400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003080408030204000305040003030402030304000307
-040103030401030004010305040103050401030104000301040103030403030304010302
-040103010401030504010304040103030403030204030302040303020403030204030306
-040103000401030104010301040103020403030104010302040103010401030104010301
-040203000401030104010300040103010403030104010301040103090400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003070400030a04000305
-0400030a040003c504000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003080400030a040003050400030a040003c6040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-0400030004000300040003000400030004000300040003070400030a04000305040c03c5
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000308
-040c03d90400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003ff03ff03ff03ff039f02ff02ff02ff02ff028700ff00ff00ff00ff008606000001
-04ff04ff043f0601000104ff04ff043f0601000104ff04ff043f0601000104ff04ff043f
-0601000104ff04ff043f0601000104040104040401000403010204ff04ff042806010001
-04040100040f010004ff04ff0428060100010404010004060102040501000403010204ff
-04ff042106010001040401000408010004050100040201000402010004ff04ff04200601
-0001040401030405010004050100040201000402010004ff04ff04200601000104040100
-04080100040501000402010404ff04ff0420060100010404010004080100040501000402
-010004ff04ff042406010001040401000408010004050100040201000402010004ff04ff
-0420060100010404010004080100040501000403010204ff04ff04210601000104ff04ff
-043f0601000104ff04ff043f0601000104ff04ff043f0601000104ff04ff043f06010001
-04ff04ff043f0601000104ff04ff043f0601000106ff06ff0641000006ff06ff064204ff
-04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff0484061204ff04ff04300611
-0000040106ff06ff062c040106010506060005060001040106ff06ff062b000004010601
-0505000006000506000104010601040a0101045f0101047801010404010104ff04370001
-0401060105050000060105050001040106010409010004600100047c01000405010004ff
-043600010401060105040001060105050001040106010409010004060100040c01000404
-010004060100040a01020418010204030102040b0100042701020405010004020100040f
-0100040c01000404010004180104040301000405010004ff043600010401060105040001
-04000601050400010401060104090100041a010004140100041a010004050100040b0100
-04290100040901000423010004180100040701000405010004ff04360001040106010503
-000104010601050400010401060104090100040401020402010004000101040301020402
-0104040201020403010204050100040a0102040301020405010004050100040b01000403
-01000400010104020100040001010403010204030102040c010004030102040201000400
-0101040a0102040201000400010104030102040201040408010004000101040901000407
-01000405010004ff04360001040106010503000104020601050300010401060104090100
-040601000402010104010100040401000404010004060100040201000402010004040100
-040901000402010004010100040201000404010004050100040b01000403010104010100
-040101010401010004010100040201000401010004020100040b01000405010004020101
-04010100040b010004020101040101000404010004040100040a01010401010004080103
-040401000405010004ff0436000104010601050200010403060105030001040106010407
-010104070100040201000402010004040100040401000406010004060100040401000409
-010004090100040401000405010004090101040401000402010004010100040501000402
-010004010100040f0100040501000402010004020100040b010004020100040201000404
-010004040100040a010004020100040c0100040401010404010104ff0434000104010601
-050200010404060105020001040106010409010004060100040201000402010004040100
-0404010004060100040301030404010004090100040601030404010004050100040b0100
-040301000402010004010100040501000402010004010100040f01000405010004020100
-04020100040b010004020100040201000404010004040100040a010004020100040c0100
-040301000405010004ff0436000104010601050100010405060105020001040106010409
-010004060100040201000402010004040100040401000406010004020100040201000404
-01000409010004050100040201000404010004050100040b010004030100040201000401
-0100040501000402010004010100040f0100040501000402010004020100040b01000402
-0100040201000404010004040100040a0100040201000408010004020100040301000405
-010004ff0436000104010601050100010406060105010001040106010409010004060100
-040201000402010004040100040401000406010004020100040201000404010004090100
-040201000401010004020100040401000405010004040101040401000403010104010100
-0401010004050100040201000401010004020100040b0100040501000402010104010100
-040301010405010004020100040201000404010004040100040a01010401010004030101
-040201000402010004030100040501000405010104ff042e000104010601050000010407
-060105010001040106010409010004060100040201000402010004040100040501010404
-01000403010304040100040a010204030103040401000405010004040101040401000403
-010004000101040201000406010204030102040c01000405010004020100040001010404
-010104050100040201000402010004040100040501010408010004000101040401010403
-010204040100040501000405010104ff042e000104010601050000010408060105000001
-0401060104090100043301050420010004040100040301000419010504190100041d0105
-0401010004080100040b0100040501000406010004ff042e0001040106010001060b0500
-000104010601040a0101045601010406010104010100043701010426010004060101040a
-0101040401010405010104ff042f0001040106010000060d000104010601047001000460
-010004ff0454000104010601050e000104010601040a01010463010104ff04b500010401
-0601050e000104010601040901000467010004ff04b4000104010601050e000104010601
-04090100040c0100040c01000429010004040100040601000412010004ff04b400010401
-0601050e00010401060104090100040c0100040c0100042f0100041a010004ff04b40001
-04010601050e000104010601040901000404010204020104040201020402010404010100
-040201000402010204090100040201000402010204030102040201040402010204020100
-0400010104030101040001000403010004ff04b4000104010601050e0001040106010409
-010004030100040201000403010004030100040201000403010004030100040201000401
-010004020100040801000402010004010100040201000404010004040100040601000402
-01010401010004010100040101010403010004ff04b4000104010601050e000104010601
-0407010104040100040701000407010004030100040301000402010004010100040c0100
-040001000400010004050100040401000404010004060100040201000402010004010100
-040201000404010104ff04b2000104010601050e00010401060104090100040401020404
-010004040103040301000403010004020100040201020409010004000100040001000402
-0103040401000404010004060100040201000402010004010100040201000403010004ff
-04b4000104010601050e0001040106010409010004070100040301000403010004020100
-040301000403010004020100040501000408010004000100040001000401010004020100
-040401000404010004060100040201000402010004010100040201000403010004ff04b4
-000104010601050e00010401060104090100040301000402010004030100040301000402
-010004030100040301000401010104010100040201000403010104020100040001000400
-010004010100040201000404010004040100040601000402010004020100040101000401
-0101040301000405010104ff04ac000104010601050e0001040106010409010004040102
-040501010402010304040101040201010400010004020102040401010403010004000100
-040301030404010004050101040401000402010004020100040201010400010004030100
-0405010104ff04ac000104010601050e0001040106010409010004300100043001000403
-01000406010004ff04ac000104010601050e000104010601040a0101042c0101042d0100
-04020100040101010405010104ff04ad000104010601050e000104010601046a010204ff
-04ba000104010601050e000104010601040a01010486010104ff0492000104010601050e
-00010401060104090100048a010004ff0491000104010601050e00010401060104090100
-04660102041901010404010004ff0491000104010601050e000104010601040901000468
-010004180100040101000403010004ff0491000104010601050e00010401060104090100
-040301010400010004030102040301020403010204030102040301010400010004020102
-040a010104000100040101000402010004020102040201000402010004020102040c0100
-040301020402010004000101040a0100040101000403010004ff0491000104010601050e
-000104010601040901000403010004000100040001000401010004020100040101000402
-010004010100040201000401010004020100040101000401010104010100040201000408
-010004010101040101000402010004010100040201000401010004020100040101000402
-0100040b01000402010004020100040101010401010004090100040101000403010004ff
-0491000104010601050e0001040106010407010104040100040001000400010004010100
-040201000401010004050100040901000401010004020100040101000402010004080100
-040201000401010004020100040101000402010004010100040201000401010004020100
-040b01000402010004020100040101000402010004090100040101000404010104ff048f
-000104010601050e00010401060104090100040301000400010004000100040101040402
-010204030102040301030401010004020100040101040408010004020100040101000402
-010004010104040101000402010004010104040b01000402010404010100040201000409
-0100040101000403010004ff0491000104010601050e0001040106010409010004030100
-040001000400010004010100040901000405010004010100040201000401010004020100
-04010100040c010004020100040101000402010004010100040501000402010004010100
-040f010004020100040501000402010004090100040101000403010004ff049100010401
-0601050e0001040106010409010004030100040001000400010004010100040201000401
-010004020100040101000402010004010100040201000401010004010101040101000402
-010004080100040101010401010004010101040101000402010004010100040101010401
-010004020100040b01000402010004020100040101000402010004030101040301000401
-0100040301000405010104ff0489000104010601050e0001040106010409010004030100
-040001000400010004020102040301020403010204030103040201010400010004020102
-040a010104000100040201010400010004020102040301010400010004020102040c0100
-0403010204020100040201000403010104040101040401000405010104ff048900010401
-0601050e00010401060104090100042a01000407010504050100041c010504190100040b
-01000406010004ff0489000104010601050e000104010601040a01010424010004020100
-04130100043a0101040a01010405010104ff048a000104010601050e0001040106010432
-01020414010004ff04dc000104010601050e000104010601040a0101044e010104ff04ca
-000104010601050e0001040106010409010004430103040101030404010004ff04c90001
-04010601050e0001040106010409010004430100040701000404010004ff04c900010401
-0601050e0001040106010409010004430100040701000404010004ff04c9000104010601
-050e00010401060104090100040301010400010004030102040301020403010204030102
-04030101040001000402010204030102040a0100040701000404010004ff04c900010401
-0601050e0001040106010409010004030100040001000400010004010100040201000401
-010004020100040101000402010004010100040201000401010004010101040101000402
-0100040101000402010004090100040701000404010004ff04c9000104010601050e0001
-040106010407010104040100040001000400010004010100040201000401010004050100
-040901000401010004020100040101000402010004010100040d01000407010004050101
-04ff04c70001040106010010040106010409010004030100040001000400010004010104
-04020102040301020403010304010100040201000401010404020102040a010004070100
-0404010004ff04c9000104010601000d0600000104010601040901000403010004000100
-040001000401010004090100040501000401010004020100040101000402010004010100
-0409010004090100040701000404010004ff04c90001040106010001040a060100010401
-060104090100040301000400010004000100040101000402010004010100040201000401
-010004020100040101000402010004010100040101010401010004020100040101000402
-0100040301010403010004070100040401000405010104ff04c10001040106010001040a
-060100010401060104090100040301000400010004000100040201020403010204030102
-040301030402010104000100040201020403010204040101040301000407010004040100
-0405010104ff04c10001040106010001040a060100010401060104090100042a01000412
-01000403010304010103040401000406010004ff04c10001040106010001040a06010001
-04010601040a0101042401000402010004100101041101010405010104ff04c200010401
-06010001040a06010001040106010432010204ff04f20001040106010001040a06010001
-04010601040a01010478010104ff04a00001040106010001040a06010001040106010409
-0100042e01030405010004310100040601030404010004ff049f0001040106010001040a
-060100010401060104090100040401020405010004090100041401000407010004040101
-040b01000405010104030102040b010104020100040801000404010004ff049f00010401
-06010001040a060100010401060104090100040601000410010004140100040601000404
-010004010100040901010404010004010100040101000402010004090100040101000402
-0100040701000404010004ff049f0001040106010001040a060100010401060104090100
-04060100040301020402010004000101040201000401010004030102040a010004050100
-040501000401010004080100040001000404010004010100040501000409010004010100
-04030100040601000404010004ff049f0001040106010001040a06010001040106010409
-010004060100040501000402010104010100040101000400010004030100040201000409
-0100040401000406010004010100040a0100040401000401010004050100040901000401
-010004040100040501000404010004ff049f0001040106010001040a0601000104010601
-04070101040701000405010004020100040201000401010104040100040d010004030100
-0407010004010100040a0100040401000401010004030101040a01000401010004050100
-040401000405010104ff049d0001040106010001040a0601000104010601040901000406
-01000405010004020100040201000401010104050102040a010004040100040601000401
-0100040a0100040401000401010004050100040901000401010004040100040501000404
-010004ff049f0001040106010001040a0601000104010601040901000406010004050100
-040201000402010004010100040001000407010004090100040501000405010004010100
-040a01000404010004010100040501000409010004010100040301000406010004040100
-04ff049f0001040106010001040a06010001040106010409010004060100040501000402
-010004020100040101000401010004020100040201000403010104030100040601000404
-010004010100040301010404010004040100040101000401010004020100040301010403
-0100040101000402010004070100040401000405010104ff04970001040106010001040a
-060100010401060104090100040601000405010004020100040201000401010004020100
-040201020404010104030100040701000404010104040101040201040403010104030102
-04040101040401010402010004080100040401000405010104ff04970001040106010001
-040a06010001040106010409010004290100040301030405010004310100040601030404
-01000406010004ff04970001040106010001040a0601000104010601040a010104250101
-045001010405010104ff04980001040106010001040a060100010401060104ff04ff0428
-0001040106010001040a0601000104010601040a01010458010104ff0419010104a40001
-040106010001040a06010001040106010409010004510103040301000406010004040100
-04450100040a01030475010004310100040601030404010004a30001040106010001040a
-0601000104010601040901000407010004040100040b010004060100042d010004060100
-040601000403010204270100041b0100040a01000477010004040101040b010004050101
-04040100040c010104020100040801000404010004a30001040106010001040a06010001
-040106010409010004070100041101000435010004060100040501000403010004000100
-0400010004260100041a0100040b01000476010004040100040101000409010104040100
-0401010004020101040b01000401010004020100040701000404010004a3000104010601
-0001040a0601000104010601040901000404010104000100040201020403010204020104
-040201020403010204020100040001010403010204020100040001010402010004020100
-040901000406010004040100040401000400010004040102040201000400010104030102
-0403010204030102040201040402010204020100040001010403010204030100040c0100
-040401010400010004020100040201000402010204020100040201000401010004000101
-040901010400010004020100040201000402010204020100040001010402010004000101
-040a010204020100040201000401010004000101040a0100040501000401010004080100
-0400010004040100040101000401010004000100040b0100040101000403010004060100
-0404010004a30001040106010001040a0601000104010601040901000403010004010101
-040401000402010004020100040301000406010004020100040201000401010104010100
-0401010004020100040101010401010004010100040201000409010004060100040a0100
-040001000403010004020100040101010401010004010100040201000401010004020100
-040101000402010004030100040301000402010004010101040101000401010004020100
-041001000404010004000100040001000401010004020100040101000402010004010100
-040201000401010104010100040801000400010004000100040101000402010004010100
-040201000401010104010100040101010401010004080100040201000401010004020100
-0401010104010100040801000406010004010100040a0100040401000401010004030100
-040b01000401010004040100040501000404010004a30001040106010001040a06010001
-040106010407010104040100040201000404010004020100040701000406010004020100
-040201000401010004020100040501000401010004060100040101000409010004040101
-040c01020406010004010100040201000401010004050100040201000401010004070100
-040301000402010004010100040501000414010004040100040001000400010004020100
-040101000401010004050100040201000401010004020100040801000400010004000100
-040201000401010004050100040101000402010004010100040201000408010004050100
-040201000401010004020100040701000407010004010100040a01000404010004010100
-04030100040b01000401010004050100040401000405010104a10001040106010001040a
-060100010401060104090100040301000402010004040100040201000407010004060100
-040201000402010004010100040201000402010304010100040601000401010004090100
-04060100040c010004000100040201030401010004020100040101000405010404020102
-040401000403010004020100040101000406010204110100040401000400010004000100
-040201000401010004020102040201000402010004010100040201000408010004000100
-040001000402010004010100040201030401010004020100040101000402010004090102
-04020100040201000401010004020100040801000406010004010100040a010004040100
-0401010004030100040b01000401010004040100040501000404010004a3000104010601
-0001040a0601000104010601040901000403010004020100040401000402010004070100
-040601000402010004020100040101000402010004010100040201000401010004070100
-040001000409010004060100040c01000400010004010100040201000401010004020100
-040101000405010004090100040301000403010004020100040101000409010004100100
-040401000400010004000100040301000400010004050100040101000402010004010100
-040201000408010004000100040001000403010004000100040101000402010004010100
-040201000401010004020100040c01000401010004020100040101000402010004090100
-0405010004010100040a0100040401000401010004030100040b01000401010004030100
-040601000404010004a30001040106010001040a06010001040106010409010004030100
-040101010404010004020100040201000403010004060100040201000402010004010100
-0402010004010100040201000401010004070101040401010403010004060100040a0100
-040001000400010004010100040201000401010004020100040101000402010004010100
-040201000401010004020100040301000403010004020100040101000405010004020100
-040a01010403010004040100040001000400010004030101040201000402010004010100
-040101010401010104010100040301010402010004000100040001000403010104020100
-040201000401010104010100040101010401010004080100040201000401010004010101
-040101010401010004030101040401000404010004010100040301010404010004040100
-040101000403010004050101040301000401010004020100040701000404010004050101
-049b0001040106010001040a060100010401060104090100040401010400010004040100
-040301020405010104040100040301020402010004020100040201030401010004080100
-040401010403010004060100040b01020403010304010100040201000402010204030102
-0403010204050101040201020402010004060102040b0101040301000404010004000100
-040001000404010004030102040301010400010004010100040001010404010104020100
-0400010004000100040401000403010304010100040001010402010004000101040a0102
-040301010400010004010100040001010404010104050100040401010404010104020104
-0403010104020104040301010404010104020100040801000404010004050101049b0001
-040106010001040a06010001040106010409010004450100040501000403010304030100
-040c0100044c010004030103040b01000410010004080100040c01000409010004050100
-04040105040f0100040801000406010004310100040601030404010004060100049b0001
-040106010001040a0601000104010601040a0101044001000400010004040101040d0101
-0456010104110100040001000411010004060101040a010004000100040a010004050100
-041a0100040601010449010104050101049c0001040106010001040a0601000104010601
-044e0100048301000412010004140100040b010004050100041a010004f9000104010601
-0001040a0601000104010601046501010474010104ff04490001040106010001040a0601
-000104010601046401000406010004040100045a0100040b010004ff044b000104010601
-0001040a060100010401060104640100040601000403010204050100040c010004040100
-04060100040a0102041801020403010204050100040b010004220100040c010004040100
-040d01000404010004fe0001040106010001040a06010001040106010464010004050100
-0403010004000100040001000418010004140100041a01000405010004040100040c0100
-043601000413010004fe0001040106010001040a06010001040106010464010004040100
-040401000400010004040102040201000400010104030102040201040402010204030102
-04050100040a010204030102040501000405010004030100040d01000404010104000100
-040201020402010004000101040a01020402010004000101040301020402010404090102
-0402010404fc0001040106010001040a060100010401060104640100040a010004000100
-040601000402010104010100040401000404010004060100040201000402010004040100
-040901000402010004010100040201000404010004050100041201000403010004010101
-04010100040201000401010104010100040b010004020101040101000404010004040100
-040d01000404010004fe0001040106010001040a060100010401060104620101040c0102
-040501000402010004020100040401000404010004060100040601000404010004090100
-040901000404010004050100041001010404010004020100040101000402010004010100
-04020100040b010004020100040201000404010004040100040d01000404010004fe0001
-040106010001040a060100010401060104640100040c0100040001000404010004020100
-040201000404010004040100040601000403010304040100040901000406010304040100
-04050100041201000403010004020100040101040401010004020100040b010004020100
-040201000404010004040100040d01000404010004fe0001040106010001040a06010001
-0401060104640100040c0100040001000404010004020100040201000404010004040100
-040601000402010004020100040401000409010004050100040201000404010004050100
-041201000403010004020100040101000405010004020100040b01000402010004020100
-0404010004040100040d01000404010004fe0001040106010001040a0601000104010601
-04640100040a010004000100040001000404010004020100040201000404010004040100
-040601000402010004020100040401000409010004020100040101000402010004040100
-04050100040b010104040100040301000401010104010100040201000401010004020100
-040301010405010004020100040201000404010004040100040d01000404010004050101
-04f60001040106010001040a060100010401060104640100040b01020405010004020100
-040201000404010004050101040401000403010304040100040a01020403010304040100
-04050100040b010104040100040401010400010004020102040201000402010004030101
-0405010004020100040201000404010004050101040b0100040501010403010104f60001
-040106010001040a060100010401060104640100040c0100043301050427010004040100
-0407010004120100041d01050412010004f60001040106010001040a0601000104010601
-04650101046b0101040601010401010004020100041001010435010104f7000104010601
-0001040a060100010401060104e1010204ff04430001040106010001040a060100010401
-060104ff04ff04280001040106010001040a060100010401060104fd010304ff04260001
-040106010001040a060100010401060104fd010004ff04290001040106010001040a0601
-00010401060104fd010004ff04290001040106010001040a060100010401060104fd0100
-0405010104000100040201020402010004000101040a0102040301020402010004000101
-040201000402010004020102040201000400010104e10001040106010001040a06010001
-0401060104fd010004040100040101010401010004020100040101010401010004080100
-040201000401010004020100040101010401010004010100040201000401010004020100
-040101010401010004e00001040106010001040a060100010401060104fd010004040100
-040201000401010004020100040101000402010004080100040501000402010004010100
-040501000402010004010100040201000401010004e40001040106010001040a06010001
-0401060104fd010004040100040201000401010404010100040201000409010204020104
-040101000406010004000100040201040401010004e40001040106010001040a06010001
-0401060104fd01000404010004020100040101000405010004020100040c010004010100
-040501000406010004000100040201000405010004e40001040106010001040a06010001
-0401060104fd010004040100040101010401010004020100040101000402010004080100
-040201000401010004020100040101000407010004030100040201000401010004070101
-04da0001040106010001040a060100010401060104fd0100040501010400010004020102
-040201000402010004090102040301020402010004070100040401020402010004070101
-04da0001040106010001040a060100010401060104fd010304050100040e0105042e0100
-04da0001040106010001040a060100010401060104ff04030100040201000441010104db
-0001040106010001040a060100010401060104ff0404010204ff04200001040106010001
-040a060100010401060104ff04ff04280001040106010001040a060100010401060104ff
-040701000431010004ec0001040106010001040a060100010401060104ff040601000404
-0101040b01000405010104030102040b01010402010004eb0001040106010001040a0601
-00010401060104ff04050100040401000401010004090101040401000401010004010100
-0402010004090100040101000402010004ea0001040106010001040a0601000104010601
-04ff04040100040501000401010004080100040001000404010004010100040501000409
-0100040101000403010004e90001040106010001040a060100010401060104ff04030100
-0406010004010100040a0100040401000401010004050100040901000401010004040100
-04e80001040106010001040a060100010401060104ff040201000407010004010100040a
-0100040401000401010004030101040a0100040101000405010004e70001040106010001
-040a060100010401060104ff040301000406010004010100040a01000404010004010100
-0405010004090100040101000404010004e80001040106010001040a0601000104010601
-04ff040401000405010004010100040a0100040401000401010004050100040901000401
-01000403010004e90001040106010001040a060100010401060104ff0405010004040100
-040101000403010104040100040401000401010004010100040201000403010104030100
-04010100040201000406010104e10001040106010001040a060100010401060104ff0406
-010004040101040401010402010404030101040301020404010104040101040201000407
-010104e10001040106010001040a060100010401060104ff040701000431010004090100
-04e10001040106010001040a060100010401060104ff0443010104e20001040106010001
-040a060100010401060104ff04ff04280001040106010001040a060100010401060104ff
-04ff04280001040106010001040a060100010401060104ff040701000431010004ec0001
-040106010001040a060100010401060104ff0406010004040101040b0100040501010403
-0102040b01010402010004eb0001040106010001040a060100010401060104ff04050100
-040401000401010004090101040401000401010004010100040201000409010004010100
-0402010004ea0001040106010001040a060100010401060104ff04040100040501000401
-0100040801000400010004040100040101000405010004090100040101000403010004e9
-0001040106010001040a060100010401060104ff040301000406010004010100040a0100
-04040100040101000405010004090100040101000404010004e80001040106010001040a
-060100010401060104ff040201000407010004010100040a010004040100040101000403
-0101040a0100040101000405010004e70001040106010001040a060100010401060104ff
-040301000406010004010100040a01000404010004010100040501000409010004010100
-0404010004e80001040106010001040a060100010401060104ff04040100040501000401
-0100040a010004040100040101000405010004090100040101000403010004e900010401
-06010001040a060100010401060104ff0405010004040100040101000403010104040100
-040401000401010004010100040201000403010104030100040101000402010004060101
-04e10001040106010001040a060100010401060104ff0406010004040101040401010402
-010404030101040301020404010104040101040201000407010104e10001040106010001
-040a060100010401060104ff04070100043101000409010004e10001040106010001040a
-060100010401060104ff0443010104e20001040106010001040a060100010401060104ff
-04ff04280001040106010001040a060100010401060104ff040601010463010104b90001
-040106010001040a060100010401060104ff040501000467010004b80001040106010001
-040a060100010401060104ff0405010004040102041801020443010004b8000104010601
-0001040a060100010401060104ff0405010004060100041a01000443010004b800010401
-06010001040a060100010401060104ff0405010004060100040301020403010204030102
-040501000409010104000100040201000402010004020102040301020402010004000101
-04020100040201000402010204020100040001010404010004b80001040106010001040a
-060100010401060104ff0405010004060100040201000402010004010100040201000401
-010004020100040401000409010004000100040001000401010004020100040101000402
-010004010100040201000401010104010100040101000402010004010100040201000401
-0101040101000403010004b80001040106010001040a060100010401060104ff04030101
-040701000402010004020100040101000409010004040100040901000400010004000100
-040201000401010004010100040501000402010004010100040501000402010004010100
-04020100040101000408010104b60001040106010001040a060100010401060104ff0405
-010004060100040201000402010004010100040601030404010004090100040001000400
-010004020100040101000402010204020104040101000406010004000100040201040401
-01000407010004b80001040106010001040a060100010401060104ff0405010004060100
-040201000402010004010100040501000402010004040100040901000400010004000100
-040301000400010004050100040101000405010004060100040001000402010004050100
-0407010004b80001040106010001040a060100010401060104ff04050100040601000402
-010004020100040101000402010004010100040201000404010004040101040201000400
-010004000100040301010402010004020100040101000402010004010100040701000403
-01000402010004010100040701000405010104b00001040106010001040a060100010401
-060104ff0405010004060100040301020403010204030103040401000404010104020100
-040001000400010004040100040301020403010204020100040701000404010204020100
-040701000405010104b00001040106010001040a060100010401060104ff040501000429
-0100040c0100042e01000406010004b00001040106010001040a060100010401060104ff
-0406010104250101040a010004000100042d01010405010104b10001040106010001040a
-060100010401060104ff043c010004ea0001040106010001040a060100010401060104ff
-04ff04280001040106010001040a060100010401060104ff04ff04280001040106010001
-040a060100010401060104ff04ff04280001040106010001040a060100010401060104ff
-04ff04280001040106010001040a060100010401060104ff040301010400010004020100
-040201000402010204030102040201000400010104020100040201000402010204020100
-0400010104ef0001040106010001040a060100010401060104ff04030100040001000400
-010004010100040201000401010004020100040101000402010004010101040101000401
-0100040201000401010004020100040101010401010004ee0001040106010001040a0601
-00010401060104ff04030100040001000400010004020100040101000401010004050100
-0402010004010100040501000402010004010100040201000401010004f2000104010601
-0001040a060100010401060104ff04030100040001000400010004020100040101000402
-010204020104040101000406010004000100040201040401010004f20001040106010001
-040a060100010401060104ff040301000400010004000100040301000400010004050100
-04010100040501000406010004000100040201000405010004f20001040106010001040a
-060100010401060104ff0403010004000100040001000403010104020100040201000401
-01000402010004010100040701000403010004020100040101000407010104e800010401
-06010001040a060100010401060104ff0403010004000100040001000404010004030102
-04030102040201000407010004040102040201000407010104e80001040106010001040a
-060100010401060104ff040d0100042f010004e80001040106010001040a060100010401
-060104ff040a010004000100042e010104e90001040106010001040a0601000104010601
-04ff040b010004ff041b0001040106010001040a060100010401060104ff04ff04280001
-040106010001040a060100010401060104ff040401030401010304ff0419000104010601
-0001040a060100010401060104ff040401000407010004ff04190001040106010001040a
-060100010401060104ff040401000407010004ff04190001040106010001040a06010001
-0401060104ff040401000407010004ff04190001040106010001040a0601000104010601
-04ff040401000407010004ff04190001040106010001040a060100010401060104ff0404
-01000407010004ff04190001040106010001040a060100010401060104ff040401000407
-010004ff04190001040106010001040a060100010401060104ff040401000407010004ff
-04190001040106010001040a060100010401060104ff04040100040701000404010104ff
-04120001040106010001040a060100010401060104ff04040100040701000404010104ff
-04120001040106010001040a060100010401060104ff04040103040101030405010004ff
-04120001040106010001040a060100010401060104ff0412010104ff0413000104010601
-0001040a060100010401060104ff04ff04280001040106010001040a0601000104010601
-04ff0418010104040101040b010104f80001040106010001040a060100010401060104ff
-0404010304010103040201030404010004050100040301030404010004f7000104010601
-0001040a060100010401060104ff04040100040701000405010004040100040501000406
-01000404010004f70001040106010001040a060100010401060104ff0404010004070100
-040501000404010004050100040601000404010004f70001040106010001040a06010001
-0401060104ff0404010004070100040501000404010004050100040601000404010004f7
-0001040106010001040a060100010401060104ff04040100040701000405010004040100
-04050100040601000404010004f70001040106010001040a060100010401060104ff0404
-010004070100040501000405010104040101040401000405010104f50001040106010001
-040a060100010401060104ff040401000407010004050100040401000405010004060100
-0404010004f70001040106010001040a060100010401060104ff04040100040701000405
-01000404010004050100040601000404010004f70001040106010001040a060100010401
-060104ff0404010004070100040501000404010004050100040601000404010004050101
-04ef0001040106010001040a060100010401060104ff0404010004070100040501000404
-01000405010004060100040401000405010104ef0001040106010001040a060100010401
-060104ff0404010304010103040201030404010004050100040301030404010004060100
-04ef0001040106010001040a060100010401060104ff0418010104040101040b01010405
-010104f00001040106010001040a060100010401060104ff04ff04280001040106010001
-040a0601000104010601040a0101046a010104ff04ae0001040106010001040a06010001
-0401060104090100046e010004ff04ad0001040106010001040a06010001040106010409
-0100040501000430010004040100040d0101040901020412010004ff04ad000104010601
-0001040a0601000104010601040901000405010004360100040c0100040d010004120100
-04ff04ad0001040106010001040a06010001040106010409010004030104040101000400
-0101040301020402010004000101040a010204020100040201000402010204020104040a
-0100040401020405010004030102040301020404010004ff04ad0001040106010001040a
-060100010401060104090100040501000403010104010100040101000402010004010101
-04010100040801000402010004010100040201000404010004040100040a010404010100
-0402010004040100040201000402010004010100040201000403010004ff04ad00010401
-06010001040a060100010401060104070101040601000403010004090100040101000402
-0100040801000402010004020100040001000405010004040100040c0100040701000404
-01000402010004050100040201000404010104ff04ab0001040106010001040a06010001
-040106010409010004050100040301000406010304010100040201000408010404030100
-0406010004040100040c0100040401030404010004030102040201040403010004ff04ad
-0001040106010001040a0601000104010601040901000405010004030100040501000402
-010004010100040201000408010004060100040001000405010004040100040c01000403
-0100040201000404010004060100040101000407010004ff04ad0001040106010001040a
-060100010401060104090100040501000403010004050100040201000401010104010100
-040801000402010004010100040201000404010004040100040501010404010004030100
-040201000404010004020100040201000401010004020100040301000405010104ff04a5
-0001040106010001040a0601000104010601040901000406010104010100040601030401
-010004000101040a01020402010004020100040401000405010104030101040401000404
-0103040401000403010204030102040401000405010104ff04a50001040106010001040a
-060100010401060104090100041801000404010504200100042701000406010004ff04a5
-0001040106010001040a0601000104010601040a01010416010004290101042601010405
-010104ff04a60001040106010001040a06010001040106010423010004ff04ff04030001
-040106010001040a0601000104010601040a010104be010104ff045a0001040106010001
-040a06010001040106010409010004c2010004ff04590001040106010001040a06010001
-0401060104090100042d0100041701000402010204410100041701000402010204120100
-04ff04590001040106010001040a060100010401060104090100042d0100041701000404
-01000441010004170100040401000412010004ff04590001040106010001040a06010001
-040106010409010004040102040201000400010104020100040001010403010204020100
-040001010409010004000101040301020402010004000101040301010400010004040100
-040301020402010004000101040a01020402010004000101040201000400010104030102
-040201000400010104090100040001010403010204020100040001010403010104000100
-040401000403010204020100040001010404010004ff04590001040106010001040a0601
-000104010601040901000403010004020100040101010401010004010101040101000401
-010004020100040101010401010004080101040101000401010004020100040101010401
-010004010100040101010404010004020100040201000401010104010100040801000402
-010004010101040101000401010104010100040101000402010004010101040101000408
-010104010100040101000402010004010101040101000401010004010101040401000402
-01000402010004010101040101000403010004ff04590001040106010001040a06010001
-040106010407010104040100040201000401010004050100040501000402010004010100
-040c01000402010004050100040101000402010004010100040201000404010004020100
-0402010004010100040c0100040201000401010004050100040501000402010004010100
-040c01000402010004050100040101000402010004010100040201000404010004020100
-04020100040101000408010104ff04570001040106010001040a06010001040106010409
-0100040301040401010004050100040501000402010004010100040c0100040201000402
-010304010100040201000401010004020100040401000402010404010100040c01040401
-010004050100040501000402010004010100040c01000402010004020103040101000402
-010004010100040201000404010004020104040101000407010004ff0459000104010601
-0001040a0601000104010601040901000403010004050100040501000405010004020100
-04010100040c010004020100040101000402010004010100040201000401010004020100
-040401000402010004050100040c01000405010004050100040501000402010004010100
-040c01000402010004010100040201000401010004020100040101000402010004040100
-04020100040501000407010004ff04590001040106010001040a06010001040106010409
-010004030100040201000401010004050100040501000402010004010100040c01000402
-010004010100040201000401010004020100040101000401010104040100040201000402
-010004010100040701010402010004020100040101000405010004050100040201000401
-0100040c0100040201000401010004020100040101000402010004010100040101010404
-0100040201000402010004010100040701000405010104ff04510001040106010001040a
-0601000104010601040901000404010204020100040501000406010204020100040c0100
-040201000402010304010100040201000402010104000100040401000403010204020100
-040701010403010204020100040501000406010204020100040c01000402010004020103
-040101000402010004020101040001000404010004030102040201000407010004050101
-04ff04510001040106010001040a06010001040106010409010004250105043501000424
-0105043401000406010004ff04510001040106010001040a0601000104010601040a0101
-045d0101045e01010405010104ff04520001040106010001040a060100010401060104ff
-04ff04280001040106010001040a0601000104010601040a0101046a010104ff04ae0001
-040106010001040a060100010401060104090100046e010004ff04ad0001040106010001
-040a060100010401060104090100041401000413010004040100043501020404010004ff
-04ad0001040106010001040a060100010401060104090100042f01000437010004040100
-04ff04ad0001040106010001040a06010001040106010409010004030100040001010402
-010004000101040301020403010204020100040001010403010204020104040101000402
-010004080100040001010403010204020100040001010402010104000100040301020405
-01000404010004ff04ad0001040106010001040a06010001040106010409010004030101
-040101000401010104010100040401000402010004020100040101010401010004040100
-040401000403010004020100040801010401010004010100040201000401010104010100
-0401010004000100040001000401010004020100040401000404010004ff04ad00010401
-06010001040a060100010401060104070101040401000402010004010100040801000402
-010004020100040101000408010004040100040401000401010004080100040201000401
-0100040201000401010004050100040001000400010004050100040401000405010104ff
-04ab0001040106010001040a060100010401060104090100040301000402010004010100
-040801000402010004020100040101000408010004040100040401000401010004080100
-040201000401010004020100040101000405010004000100040001000402010304040100
-0404010004ff04ad0001040106010001040a060100010401060104090100040301000402
-010004010100040801000402010004020100040101000408010004040100040501000400
-010004080100040201000401010004020100040101000405010004000100040001000401
-010004020100040401000404010004ff04ad0001040106010001040a0601000104010601
-040901000403010104010100040101000408010004020100040201000401010004080100
-040401000405010104040101040201000402010004010100040201000401010004050100
-0400010004000100040101000402010004040100040401000405010104ff04a500010401
-06010001040a060100010401060104090100040301000400010104020100040801000403
-010204020100040801000405010104040100040401010402010004020100040201020402
-01000405010004000100040001000402010304040100040401000405010104ff04a50001
-040106010001040a060100010401060104090100040301000432010004050100042e0100
-0406010004ff04a50001040106010001040a0601000104010601040a010104010100042f
-01000400010004040101042d01010405010104ff04a60001040106010001040a06010001
-04010601040e01000430010004ff04e60001040106010001040a0601000104010601040a
-0101049b010104ff047d0001040106010001040a06010001040106010409010004620100
-043101000408010004ff047c0001040106010001040a060100010401060104090100042e
-0102041401000419010004040101040b01000405010104040101040b0101040201000407
-010004ff047c0001040106010001040a0601000104010601040901000430010004140100
-041801000404010004010100040901010404010004010100040201000401010004090100
-04010100040201000406010004ff047c0001040106010001040a06010001040106010409
-010004040101040001000401010004000101040301020402010004020100040101000400
-0101040c010004030102040301020403010104000100040201020402010004000101040a
-010004050100040101000408010004000100040401000401010004020100040101000409
-010004010100040301000405010004ff047c0001040106010001040a0601000104010601
-040901000403010004010101040101010401010004010100040201000401010004020100
-0401010104010100040b0100040201000402010004010100040201000401010004010101
-04010100040201000401010104010100040801000406010004010100040a010004040100
-0401010004020100040101000409010004010100040401000404010004ff047c00010401
-06010001040a060100010401060104070101040401000402010004010100040501000402
-010004010100040201000401010004020100040b01000402010004020100040501000401
-010004020100040101000402010004010100040b01000407010004010100040a01000404
-01000401010004020100040101000409010004010100040501000404010104ff047a0001
-040106010001040a06010001040106010409010004030100040201000401010004050100
-0402010004010100040201000401010004020100040b0100040201040402010304010100
-040201000401010404010100040c01000406010004010100040a01000404010004010100
-04020100040101000409010004010100040401000404010004ff047c0001040106010001
-040a06010001040106010409010004030100040201000401010004050100040201000401
-0100040201000401010004020100040b0100040201000405010004020100040101000402
-01000401010004050100040d01000405010004010100040a010004040100040101000402
-0100040101000409010004010100040301000405010004ff047c0001040106010001040a
-060100010401060104090100040301000401010104010100040501000402010004010100
-040101010401010104010100040b01000402010004020100040101000402010004010100
-040101010401010004020100040101000407010104040100040401000401010004030101
-040401000404010004010100040201000401010004030101040301000401010004020100
-040601000405010104ff04740001040106010001040a0601000104010601040901000404
-010104000100040101000406010204030101040001000401010004000101040c01000403
-010204030103040201010400010004020102040201000407010104050100040401010404
-0101040201040403010104040101040401010404010104020100040701000405010104ff
-04740001040106010001040a060100010401060104090100040701000416010004040105
-042e01000406010004310100040801000406010004ff04740001040106010001040a0601
-000104010601040a010104010100040201000416010004370101044201010405010104ff
-04750001040106010001040a0601000104010601040f01020417010004ff04fc00010401
-06010001040a0601000104010601040a0101045c010104ff04bc0001040106010001040a
-0601000104010601040901000460010004ff04bb0001040106010001040a060100010401
-06010409010004030100042b01000418010204030102040301020404010004ff04bb0001
-040106010001040a06010001040106010409010004030100044401000402010004010100
-0402010004010100040201000403010004ff04bb0001040106010001040a060100010401
-060104090100040301000400010104030102040301020402010004000101040a01020403
-01020402010404020102040d010004050100040501000403010004ff04bb000104010601
-0001040a0601000104010601040901000403010104010100040101000402010004010100
-040201000401010104010100040801000402010004040100040601000401010004020100
-040c010004050100040501000403010004ff04bb0001040106010001040a060100010401
-060104070101040401000402010004010100040201000405010004010100040201000408
-010004080100040501000402010004020100040b010004040101040401010405010104ff
-04b90001040106010001040a060100010401060104090100040301000402010004010104
-04020103040101000402010004090102040501000404010004030104040a010004070100
-040501000403010004ff04bb0001040106010001040a0601000104010601040901000403
-0100040201000401010004050100040201000401010004020100040c0100040401000403
-010004040100040d010004080100040501000403010004ff04bb0001040106010001040a
-060100010401060104090100040301000402010004010100040201000401010004020100
-040101010401010004080100040201000404010004020100040501000402010004030101
-0402010004050100040201000401010004020100040301000405010104ff04b300010401
-06010001040a060100010401060104090100040301000402010004020102040301030401
-010004000101040a01020405010004020104040201020404010104020104040201020403
-0102040401000405010104ff04b30001040106010001040a060100010401060104090100
-041801000404010504200100041901000406010004ff04b30001040106010001040a0601
-000104010601040a01010416010004290101041801010405010104ff04b4000104010601
-0001040a06010001040106010423010004ff04ff04030001040106010001040a06010001
-04010601040a0101045c010104ff04bc0001040106010001040a06010001040106010409
-01000460010004ff04bb0001040106010001040a060100010401060104090100040c0100
-041101000416010004190100040401020404010004ff04bb0001040106010001040a0601
-00010401060104090100040c0100041101000430010104030100040201000403010004ff
-04bb0001040106010001040a060100010401060104090100040401020402010404020102
-040301020402010004010100040a01020403010204020104040201020409010004000100
-040701000403010004ff04bb0001040106010001040a0601000104010601040901000403
-01000402010004030100040301000402010004010100040201000401010004000100040a
-01000402010004040100040601000401010004020100040a0100040701000403010004ff
-04bb0001040106010001040a060100010401060104070101040401000407010004070100
-0401010004050101040b010004080100040501000402010004020100040a010004060100
-0405010104ff04b90001040106010001040a060100010401060104090100040401020404
-0100040401030401010004050101040c0102040501000404010004030104040a01000405
-01000405010004ff04bb0001040106010001040a06010001040106010409010004070100
-040301000403010004020100040101000405010004000100040e01000404010004030100
-04040100040e0100040401000406010004ff04bb0001040106010001040a060100010401
-060104090100040301000402010004030100040301000402010004010100040201000401
-010004010100040901000402010004040100040201000405010004020100040301010404
-010004030100040701000405010104ff04b30001040106010001040a0601000104010601
-040901000404010204050101040201030402010204020100040201000409010204050100
-0402010404020102040401010402010404010104040301000405010104ff04b300010401
-06010001040a0601000104010601040901000425010504200100041201000406010004ff
-04b30001040106010001040a0601000104010601040a0101044801010411010104050101
-04ff04b40001040106010001040a060100010401060104ff04ff04280001040106010001
-040a0601000104010601040a0101045c010104ff04bc0001040106010001040a06010001
-04010601040901000460010004ff04bb0001040106010001040a06010001040106010409
-0100041501000411010004060100041f0102040401010404010004ff04bb000104010601
-0001040a0601000104010601040901000415010004110100042601000402010004020100
-040101000403010004ff04bb0001040106010001040a0601000104010601040901000403
-010004000101040301020403010104000100040101000402010004020102040201040402
-010204030102040201000400010104030102040d010004020100040101000403010004ff
-04bb0001040106010001040a060100010401060104090100040301010401010004010100
-040201000401010004010101040101000402010004010100040201000403010004060100
-040201000402010004010101040101000401010004020100040c01000402010004010100
-0403010004ff04bb0001040106010001040a060100010401060104070101040401000405
-010004020100040101000402010004010100040201000401010004070100040601000402
-010004020100040101000402010004010100040e010104030100040101000404010104ff
-04b90001040106010001040a060100010401060104090100040301000405010404010100
-040201000401010004020100040101000407010004060100040201000402010004010100
-0402010004020102040d010004020100040101000403010004ff04bb0001040106010001
-040a06010001040106010409010004030100040501000405010004020100040101000402
-01000401010004070100040601000402010004020100040101000402010004050100040c
-010004020100040101000403010004ff04bb0001040106010001040a0601000104010601
-040901000403010004050100040201000401010004010101040101000401010104010100
-040201000403010004060100040201000402010004010100040201000401010004020100
-0403010104020100040201000402010004010100040301000405010104ff04b300010401
-06010001040a060100010401060104090100040301000406010204030101040001000402
-010104000100040201020405010104040100040301020402010004020100040201020404
-01010403010204040101040401000405010104ff04b30001040106010001040a06010001
-0401060104090100044c0100041201000406010004ff04b30001040106010001040a0601
-000104010601040a010104480101041101010405010104ff04b40001040106010001040a
-060100010401060104ff04ff04280001040106010001040a0601000104010601040a0101
-04890101049401010404010104f10001040106010001040a060100010401060104090100
-048a010004980100040501000403010304e80001040106010001040a0601000104010601
-040901000418010004300102040301020412010004060100041901000406010104090102
-040301020436010104030100041901020402010404010104040201020402010404030100
-040501000406010004e80001040106010001040a06010001040106010409010004180100
-0432010004050100041201000421010004050100040d0100040501000435010004050100
-041801000402010004010100040501000405010004020100040101000407010004050100
-0406010004e80001040106010001040a0601000104010601040901000404010104000100
-040201020402010004000101040201000400010104030102040301010400010004020102
-040a01020403010204050100040501000403010204030102040201040402010204030102
-0402010004000101040b0100040501000403010004020100040401000405010004030102
-040201000402010004020102040301020402010004000101040a01020404010004030104
-040201020402010004000101040901000405010004050100040901000401010004070100
-040501000406010004e80001040106010001040a06010001040106010409010004030100
-040101010401010004020100040101010401010004010101040101000401010004020100
-040101000401010104010100040201000408010004020100040101000402010004040100
-040501000402010004020100040101000402010004030100040601000402010004020100
-0401010104010100040a0100040301040401010004020100040401000405010004020100
-040201000401010004020100040101000402010004010100040201000401010104010100
-040801000402010004010104040301000403010004020100040101010401010004080100
-0405010304020103040601000401010304040100040501000406010004e8000104010601
-0001040a0601000104010601040701010404010004020100040501000401010004050100
-040201000405010004010100040201000401010004020100040801000405010004020100
-040401000405010004020100040201000401010004070100040601000402010004020100
-040101000402010004080101040601000403010004020100040401000405010004020100
-040501000400010004000100040101000402010004010100040201000401010004020100
-040c01000403010004050100040301000402010004010100040c01030406010004050100
-040301010406010004040101040401010404010004e80001040106010001040a06010001
-040106010409010004030100040201000402010304010100040501000402010004020103
-040101000402010004010104040801000405010004020100040401000405010004020104
-04010100040701000406010004020100040201000401010004020100040a010004050100
-040301000402010004040100040501000403010204020100040001000400010004010104
-0401010404010100040201000409010304030100040501000403010404010100040c0100
-040201000405010004050100040501000405010004030100040501000406010004e80001
-040106010001040a06010001040106010409010004030100040201000401010004020100
-0401010004050100040201000401010004020100040101000402010004010100040c0100
-040501000402010004040100040501000402010004050100040701000406010004020100
-040201000401010004020100040a01000405010004030100040201000404010004050100
-040601000401010004000100040001000401010004050100040501000402010004080100
-0402010004030100040501000403010004050100040c0100040201000401010004020100
-040101000402010004050100040101000402010004030100040501000406010004e80001
-040106010001040a06010001040106010409010004030100040101010401010004020100
-040101000405010104010100040101000402010004010100040101010401010004020100
-040801000402010004010100040201000404010004050100040201000402010004010100
-040201000403010004060100040201000402010004010100040201000403010104040100
-040501000403010004010101040401000405010004020100040201000401010004000100
-040001000401010004020100040101000402010004010101040101000408010004020100
-040301000405010004030100040201000401010004070101040201000402010004010100
-040201000401010004020100040101000402010004010100040201000403010004050100
-0406010004e80001040106010001040a0601000104010601040901000404010104000100
-0402010304010100040501000400010104030103040201010400010004020102040a0102
-040301020405010004050100040301020403010204050101040401000403010204020100
-040201000403010104040100040501000404010104000100040401000405010004030102
-040301000400010004030102040301020402010004000101040a01030403010004060101
-040201020402010004070101040301020403010204030102040301020403010204040100
-040501000406010004e80001040106010001040a06010001040106010409010004070100
-0421010004070105044a010004040100043b010004040105042701000427010004050100
-0403010304e80001040106010001040a0601000104010601040a01010401010004020100
-041d01000402010004560101040601010439010004300101042601010404010104f10001
-040106010001040a0601000104010601040f0102041f0102049c010004ff045400010401
-06010001040a060100010401060104ff04ff04280001040106010001040a060100010401
-060104ff04ff04280001040106010001040a060100010401060104ff04ff042800010401
-06010001040a060100010401060104ff04ff04280001040106010001040a060100010401
-060104ff04ff04280001040106010001040a060100010401060104ff04ff042800010401
-06010001040a060100010401060104ff04ff04280001040106010001040a060100010401
-060104ff04ff04280001040106010001040a060100010401060104ff04ff042800010401
-06010001040a060100010401060104ff04ff04280001040106010001040a060100010401
-060104ff04ff04280001040106010001040a060100010401060104ff04ff042800010401
-06010001040a060100010401060104ff04ff04280001040106010001040a060100010401
-060104ff04ff04280001040106010001040a060100010401060104ff04ff042800010401
-06010001040a060100010401060104ff04ff04280001040106010001040a060100010401
-060104ff04ff04280001040106010001040a060100010401060104ff04ff042800010401
-06010001040a060100010401060104ff04ff04280001040106010001060c000104010601
-04ff04ff04280001040106010000060d00010401060104ff04ff0428000104010601050e
-00010401060104ff04ff042800010401060100100401060104ff04ff0428000104010601
-0500000c060000010401060104ff04ff0428000104010601050000010408060105000001
-0401060104ff04ff04280001040106010501000104070601050000010401060104ff04ff
-04280001040106010501000104060601050100010401060104ff04ff0428000104010601
-0502000104050601050100010401060104ff04ff04280001040106010502000104040601
-050200010401060104ff04ff042800010401060105030001040306010502000104010601
-04ff04ff04280001040106010503000104020601050300010401060104ff04ff04280001
-040106010504000104010601050300010401060104ff04ff042800010401060105040001
-04000601050400010401060104ff04ff0428000104010601050500000602050400010401
-060104ff04ff0428000104010601050500000601050500010401060100ff00ff002a0401
-060105060601050500010401060000ff00ff002b04010601050606000506000104ff04ff
-04300601001004ff04ff04300600001104ff04ff04ff04ff04ff04ff04ff04ff04ff04ff
-04ff04ff04ff0498010204ff04ff044001000401010004ff04ff043f0100040201000402
-010204020100040001010403010204ff04ff042a01000402010004010100040201000401
-010104010100040101000402010004ff04ff042901000402010004010100040201000401
-010004020100040101000402010004ff04ff042901000402010004010100040201000401
-0100040201000401010404ff04ff04290100040201000401010004020100040101000402
-01000401010004ff04ff042d010004010100040201000402010004010100040201000401
-01000402010004ff04ff042901020404010204020100040201000402010204ff04ff04ff
-04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04ff04c1
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 73 377 347
-%%EOF
diff --git a/lib/appmon/doc/src/ref_man.xml b/lib/appmon/doc/src/ref_man.xml
deleted file mode 100644
index ab9c3d5fdc..0000000000
--- a/lib/appmon/doc/src/ref_man.xml
+++ /dev/null
@@ -1,37 +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>1996</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>Appmon Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The Application Monitor, <em>Appmon</em>, is a graphical utility used
-      to supervise applications executing either locally or on remote nodes.
-      The process tree of an application can furthermore be monitored.</p>
-  </description>
-  <xi:include href="appmon.xml"/>
-</application>
-
diff --git a/lib/appmon/doc/src/warning.gif b/lib/appmon/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/appmon/doc/src/warning.gif
+++ /dev/null
diff --git a/lib/appmon/ebin/.gitignore b/lib/appmon/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/appmon/ebin/.gitignore
+++ /dev/null
diff --git a/lib/appmon/info b/lib/appmon/info
deleted file mode 100644
index c33a50d106..0000000000
--- a/lib/appmon/info
+++ /dev/null
@@ -1,5 +0,0 @@
-group: tools
-short: A utility used to supervise Applications executing on several
-short: Erlang nodes
-
-
diff --git a/lib/appmon/priv/Makefile b/lib/appmon/priv/Makefile
deleted file mode 100644
index 356fe9b842..0000000000
--- a/lib/appmon/priv/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# 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
-# 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 $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-include ../vsn.mk
-VSN = $(APPMON_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/appmon-$(VSN)
-
-#
-# Macros
-#
-HELP_FILES = \
-	appmon_help.txt
-
-TOOLBAR_FILES = \
-	appmon.tool \
-	appmon.gif \
-	start_info.html \
-	main_frame.html \
-	info_frames.html \
-	blank.html
-
-#
-# Rules
-#
-
-debug opt:
-
-docs:
-
-clean:
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(HELP_FILES) $(TOOLBAR_FILES) "$(RELSYSDIR)/priv"
-
-release_docs_spec:
-
-FORCE:
diff --git a/lib/appmon/priv/appmon.gif b/lib/appmon/priv/appmon.gif
deleted file mode 100644
index 583fcb8311..0000000000
--- a/lib/appmon/priv/appmon.gif
+++ /dev/null
diff --git a/lib/appmon/priv/appmon.tool b/lib/appmon/priv/appmon.tool
deleted file mode 100644
index 93a469c6a4..0000000000
--- a/lib/appmon/priv/appmon.tool
+++ /dev/null
@@ -1,24 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-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%
-{version,"1.2"}.
-[{config_func,{appmon_web,configData,[]}},
-{tool,"Appmon"},
- {start,{appmon,start,[]}},
- {icon,"appmon.gif"},
- {message,"Application Monitor"},
- {html,"../doc/html/index.html"}].
diff --git a/lib/appmon/priv/appmon_help.txt b/lib/appmon/priv/appmon_help.txt
deleted file mode 100644
index f1685be4d8..0000000000
--- a/lib/appmon/priv/appmon_help.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-		Help for the application monitor system
-		---------------------------------------
-
-
-
-
-
-	The monitor system has two types of windows, the node window
-	which opens when appmon:start() is evaluated, and the
-	application window which opens when an application in the node
-	window is clicked on. 
-
-	All nodes that are known to appmon is shown in the node
-	window, normally this is all Erlang nodes visible with the
-	nodes() command.
-
-
-The Node window
----------------
-
-	The node window monitors nodes. At the top there is a menubar
-	and below that, each known node is shown separated with a thin
-	line from the others. A node is represented by its name as
-	root of its application tree. The node name pictures the
-	application controller on that node. The name itself is a menu
-	where operations on the node can be performed (rebooting it
-	for instance). To the far left is a load meter (like those on
-	a tape deck) which measures the current load at the
-	node. Below the node name (the application controller) is a
-	tree with applications, clicking on these applications starts
-	the application monitor.
-
-
-	The top window menubar
-	----------------------
-
-	File:Quit	- Stop the monitor.
-
-	Options:
-	  Load: time	- Load is calculated (roughly) as processor time.
-	  Load: queue	- Load is calculated as the length of the ready 
-			  queue.
-	  Load: prog	- A progressive scale is used for load values.
-	  Load: linear	- A linear scale is used for load values.
-
-	Help		- Prints this message.
-
-
-	The application controller menu
-	-------------------------------
-	Reboot		- Reboot the node
-	Restart		- Restart the node
-	Stop		- Stop the node
-
-
-	The load meter
-	--------------
-
-	Load can be measured as processor time / elapsed time or as
-	the length of the runtime queue, depending on the setting in
-	the Options menu.
-
-
-The Application window
-----------------------
-
-	The application window monitors an application. It will
-	automaticly update the window every other second or so if
-	there are any changes in the process tree. At the top there is
-	a menubar followed by a toolbar and then the application
-	tree. Application trees come in two flavours: supervision
-	view, where a strict supervision tree is shown, and process
-	view, where all linked processes in the application is shown.
-
-
-	The application window menubar
-	------------------------------
-
-	File:Quit	- Quit the application window.
-
-	Options:Refresh - Update process information and refresh
-			  screen.
-
-	Options:Sup. view
-		- Show strict supervision tree only.
-
-	Options:Proc. view
-		- Show all linked processes.
-
-	Help	- Prints this message.
-
-
-	The application window toolbar
-	------------------------------
-
-	The application toolbar controls the actions of the mouse
-	pointer. Clicking on a process in the application window have
-	different meaning depending on which tool is selected. The
-	procedure is to first press a button (T for trace for example)
-	and then click on the process that should be traced.
-
-	Info - Process information is printed in the shell. This mode
-	is default and automaticly returned to after a mouse click.
-
-	Send - Send a message to the clicked process. A window will
-	pop up where the message can be written (and you can also
-	change the destination pid). Double clicking on this button
-	pops up a window where pid and message can be filled in.
-
-	Trace - Toggle trace on/off on the process. Note that not all
-	processes respond to the sys:trace call.
-
-	Kill - Send a non-trappable exit signal to the process.
-
-
-Technical Detail
-----------------
-
-	Files and distribution
-	----------------------
-
-	Appmon is a distributed program but all graphics is handled on
-	one node (the one it is started on) so GS need only to be
-	loaded on that single node. All real monitoring is done in a
-	single module (appmon_info) being run on each node which acts
-	as an information centre. The various windows (node and
-	application) then subscribe for information.
-
-	In summary: only the appmon_info module must be accessible by
-	the clients, the rest of the appmon files are only needed at
-	the server.
-
-	Trouble shooting
-	----------------
-
-	Q. Why doesn't all my nodes show up in the node window?
-
-	A 1. Are the nodes visible with the nodes() command in the
-	shell? If not you must do net:ping(NodeName) to add nodes to
-	the Erlang distribution.
-
-	A 2. Is the appmin_info module loadable at the missing
-	node(s)?
-
-	Q. Why doesn't the application window show my application
-	supervision structure?
-
-	A. Does your application have a real application master? It is
-	absolutely necessary that your top process behaves as a
-	supervisor should (a program is not supervised just because it
-	is started with application:start).
diff --git a/lib/appmon/priv/blank.html b/lib/appmon/priv/blank.html
deleted file mode 100644
index 44e86908a0..0000000000
--- a/lib/appmon/priv/blank.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<HEAD></HEAD>
-<BODY BGCOLOR="#FFFFFF">
-&nbsp;
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/lib/appmon/priv/info_frames.html b/lib/appmon/priv/info_frames.html
deleted file mode 100644
index 9320364883..0000000000
--- a/lib/appmon/priv/info_frames.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>WebAppmon </TITLE>
-</HEAD>
-<FRAMESET ROWS="85%,15%" BORDER="0">
-<FRAME NAME="main" SRC="./start_info.html">
-<FRAME NAME="proc_data" SRC="./blank.html">
-</FRAMESET> 
-</HTML>
\ No newline at end of file
diff --git a/lib/appmon/priv/main_frame.html b/lib/appmon/priv/main_frame.html
deleted file mode 100644
index 57e540a2c1..0000000000
--- a/lib/appmon/priv/main_frame.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>WebAppmon </TITLE>
-</HEAD>
-<FRAMESET COLS="15%,85%" >
-  <FRAME NAME="left" SRC="../../erl/appmon_web/node_info">
-  <FRAME NAME="base_frames" SRC="./info_frames.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/lib/appmon/priv/start_info.html b/lib/appmon/priv/start_info.html
deleted file mode 100644
index 580319beb1..0000000000
--- a/lib/appmon/priv/start_info.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<TABLE WIDTH=100% HEIGHT=100%>
-<TR VALIGN="middle">
-<TD ALIGN="center">
-
-<TABLE WIDTH="60%">
-<TR>
-<TD ALIGN="center">
-<FONT SIZE=6>Welcome to the Web based User Interface to Appmon
-</FONT></TD>
-</TR>
-
-<TR>
-<TD><BR><BR><BR><BR>
-</TD>
-</TR>
-
-<TR>
-<TD ALIGN="center">&nbsp;
-</TD>
-</TR>
-</TABLE>
-
-</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/lib/appmon/src/Makefile b/lib/appmon/src/Makefile
deleted file mode 100644
index c1620bc37a..0000000000
--- a/lib/appmon/src/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-#  %CopyrightBegin%
-#  
-#  Copyright Ericsson AB 1996-2013. All Rights Reserved.
-#  
-#  The 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 $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(APPMON_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/appmon-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-
-MODULES= \
-	appmon \
-	appmon_a \
-	appmon_dg \
-	appmon_place \
-	appmon_txt \
-	appmon_lb \
-	process_info \
-	appmon_web
-
-#	appmon_info \  Moved to runtime tools where it belongs
-
-
-HRL_FILES= appmon_dg.hrl
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES= $(MODULES:%=../ebin/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-
-APP_FILE= appmon.app
-APPUP_FILE= appmon.appup
-
-APP_SRC= $(APP_FILE).src
-APPUP_SRC= $(APPUP_FILE).src
-
-APP_TARGET= ../ebin/$(APP_FILE)
-APPUP_TARGET= ../ebin/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += +warn_obsolete_guard
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f core
-
-docs:
-
-# ----------------------------------------------------
-# Special Build Targets
-# ----------------------------------------------------
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-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"
-
-release_docs_spec:
-
diff --git a/lib/appmon/src/appmon.app.src b/lib/appmon/src/appmon.app.src
deleted file mode 100644
index aa6a08772e..0000000000
--- a/lib/appmon/src/appmon.app.src
+++ /dev/null
@@ -1,24 +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%
-{application, appmon,
- [{description, "DEVTOOLS  CXC 138 16"},
-  {vsn, "%VSN%"},
-  {modules, [appmon, appmon_a, appmon_dg, %% appmon_info, moved to runtime tools
-	     appmon_lb, appmon_place, appmon_txt,process_info,appmon_web]},
-  {registered,[appmon, appmon_info, appmon_txt,webappmon_server,proc_info]},
-  {applications, [kernel, stdlib]}]}.
diff --git a/lib/appmon/src/appmon.appup.src b/lib/appmon/src/appmon.appup.src
deleted file mode 100644
index 0d918b6081..0000000000
--- a/lib/appmon/src/appmon.appup.src
+++ /dev/null
@@ -1,18 +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%
-{"%VSN%",[],[]}.
diff --git a/lib/appmon/src/appmon.erl b/lib/appmon/src/appmon.erl
deleted file mode 100644
index ba98a24400..0000000000
--- a/lib/appmon/src/appmon.erl
+++ /dev/null
@@ -1,1081 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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(appmon).
--behaviour(gen_server).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,1}}]).
-
-%%%---------------------------------------------------------------------
-%%% Appmon main module.
-%%% Creates the main window and receives load and application
-%%% information from all connected nodes.
-%%%---------------------------------------------------------------------
-
-%% External exports
--export([start/0, stop/0]).
-
-%% gen_server callbacks
--export([init/1, handle_cast/2, handle_info/2, terminate/2]).
--export([handle_call/3, code_change/3]).        % not used
-
-%% Canvas button data
--record(canvasbutton, {text, ul, ll, rect, x, y, w, h}).
-
-%% Options - all the fields are GS radio buttons
--record(options, {single, many, time, queue, prog, linear}).
-
-%% Main window data
--record(win, {name,                             % atom() Monitored node
-	      window,                           % gsobj()
-	      wwindow,                          % int() Window width
-	      hwindow,                          % int() Window height
-	      options,                          % #options{}
-	      canvas,                           % gsobj()
-	      wcanvas,                          % int() Canvas width
-	      hcanvas,                          % int() Canvas height
-	      l1, l2,                           % gsobj() Canvas lines
-	      leds,                             % [gsobj()] Load meter
-	      nodelabel,                        % {gsobj(),gsobj()}
-	      appobjs=[],                       % [gsobj()] Buttons etc.
-	      nodemenu}).                       % gsobj() Node menu
-
-%% Node data
--record(mnode, {name,                           % atom() Node name
-		status,                         % alive | dead
-		pid,                            % pid()
-		apps,                           % [{Pid,App,Descr}]
-		load}).                         % {Old, New}
-
-%% Internal state data
--record(state, {gs,                             % pid()
-		wins=[],                        % [#win()] GUIs
-		window_mode,                    % single | many
-		load_mode1,                     % time | queue
-		load_mode2,                     % prog | linear
-		lbpid,                          % pid()
-		mnodes=[]}).                    % [#mnode{}] 
-
-%%%---------------------------------------------------------------------
-%%% External exports
-%%%---------------------------------------------------------------------
-
-start() ->
-     gen_server:start({local, appmon}, ?MODULE, [], []).
-
-stop() ->
-    gen_server:cast(appmon, stop).
-
-
-%%%---------------------------------------------------------------------
-%%% gen_server callbacks
-%%%---------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          ignore               |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-init([]) ->
-    process_flag(trap_exit, true),
-
-    %% Subscribe to {nodeup,Node} and {nodedown,Node} messages
-    net_kernel:monitor_nodes(true),
-    
-    LbPid = appmon_lb:start(self ()),
-
-    %% Check which remote nodes have appmon code available (OTP-4887)
-    NodesOk = lists:filter(fun(Node) -> check_node(Node) end, nodes()),
-    Nodes = [node()|NodesOk],
-
-    %% Start monitoring the existing nodes
-    MNodes = mk_mnodes(Nodes, LbPid),
-
-    %% Draw the main window
-    GS = gs:start([{kernel,true}]),
-    GUI = draw_win(GS, node()),
-
-    %% Update the Nodes menu with all known nodes
-    lists:foreach(fun(Node) ->
-			  display_addnode(GUI, Node)
-		  end,
-		  Nodes),
-
-    %% Mark the default options as selected in the Options menu
-    display_setopt(GUI, single),
-    display_setopt(GUI, time),
-    display_setopt(GUI, prog),
-
-    {ok, #state{gs=GS, wins=[GUI],
-		window_mode=single, load_mode1=time, load_mode2=prog,
-		lbpid=LbPid, mnodes=MNodes}}.
-
-check_node(Node) ->
-    case rpc:call(Node, code, which, [appmon]) of
-	File when is_list(File) ->
-	    true;
-	_ -> % non_existing (| cover_compiled)
-	    false
-    end.
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-handle_call(norequest, _From, State) ->
-    {reply, null, State}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-handle_cast(stop, State) ->
-    {stop, normal, State}.
-    
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-%% Load information from a node
-handle_info({delivery, _Serv, load, Node, Load}, State) ->
-    
-    %% Update node information
-    MNode = get_mnode(Node, State#state.mnodes),
-    MNode1 = MNode#mnode{load=Load},
-    MNodes = replace_mnode(Node, MNode1, State#state.mnodes),
-
-    %% If Node is currently displayed, update graphics
-    case get_win(Node, State#state.wins) of
-	{ok, GUI} ->
-	    display_load(GUI, Load);
-	false ->
-	    ignore
-    end,
-    
-    {noreply, State#state{mnodes=MNodes}};
-
-%% Application information from a node
-handle_info({delivery, _Serv, app_ctrl, Node, Apps}, State) ->
-    
-    %% Update node information
-    MNode = get_mnode(Node, State#state.mnodes),
-    MNode1 = MNode#mnode{apps=Apps},
-    MNodes = replace_mnode(Node, MNode1, State#state.mnodes),
-
-    %% If Node is currently displayed, update graphics
-    Wins = case get_win(Node, State#state.wins) of
-	       {ok, GUI} ->
-		   draw_clear(GUI),
-		   GUI1 = draw_apps(GUI, Apps),
-		   replace_win(Node, GUI1, State#state.wins);
-	       false ->
-		   State#state.wins
-	   end,
-    
-    appmon_lb:add_apps (State#state.lbpid, Apps, Node),
-    {noreply, State#state{wins=Wins, mnodes=MNodes}};
-
-handle_info({nodeup, Node}, State) ->
-
-    %% First, make sure appmon code is available at remode node,
-    %% or the node should be ignored (OTP-3591)
-    case check_node(Node) of
-	true ->
-
-	    %% If this is a previously unknown node, update window's
-	    %% 'Nodes' menu
-	    case get_mnode(Node, State#state.mnodes) of
-		false ->
-		    display_addnode(State#state.wins, Node);
-		_OldMnode ->
-		    ignore
-	    end,
-
-	    %% Update node information (=> state is automatically
-	    %% changed to 'alive')
-	    MNode = mk_mnode(Node, State#state.lbpid),
-	    MNodes = replace_mnode(Node, MNode, State#state.mnodes),
-
-	    %% If Node is currently displayed, update graphics
-	    case get_win(Node, State#state.wins) of
-		{ok, GUI} ->
-		    display_nodeup(GUI, Node);
-		false ->
-		    ignore
-	    end,
-
-	    appmon_lb:update_status(State#state.lbpid, Node, alive),
-	    {noreply, State#state{mnodes=MNodes}};
-
-	false ->
-	    {noreply, State}
-    end;
-
-handle_info({nodedown, Node}, State) ->
-    
-    %% If this is a previously unknown node, ignore the message.
-    %% (The situation occurs when failing to connect to another node).
-    %% Otherwise, update the node information.
-    case get_mnode(Node, State#state.mnodes) of
-	false ->
-	    {noreply, State};
-	MNode ->
-	    MNode1 = MNode#mnode{status=dead},
-	    MNodes = replace_mnode(Node, MNode1, State#state.mnodes),
-
-	    %% If Node is currently displayed, update graphics
-	    Wins = case get_win(Node, State#state.wins) of
-		       {ok, GUI} ->
-			   display_nodedown(GUI),
-			   GUI1 = draw_clear(GUI),
-			   replace_win(Node, GUI1, State#state.wins);
-		       false ->
-			   State#state.wins
-		   end,
-
-	    appmon_lb:remove_node(State#state.lbpid, Node),
-	    {noreply, State#state{wins=Wins, mnodes=MNodes}}
-    end;
-
-%% Application 'button' events
-handle_info({gs, _Obj, buttonpress, Data, _Arg}, State) ->
-    {canvasbutton, CBtn, _App} = Data,
-    press(CBtn),
-    {noreply, State};
-handle_info({gs, _Obj, buttonrelease, Data, [_,X,Y|_]}, State) ->
-    {canvasbutton, CBtn, {application, App, Node}} = Data,
-    release(CBtn),
-
-    %% Check that mouse button was released over the button!
-    L = CBtn#canvasbutton.x, R = L + CBtn#canvasbutton.w,
-    T = CBtn#canvasbutton.y, B = T + CBtn#canvasbutton.h,
-    if
-	X>L, X<R, Y>T, Y<B ->
-	    MNode = get_mnode(Node, State#state.mnodes),
-	    {value, {Pid, _App, _Descr}} =
-		lists:keysearch(App, 2, MNode#mnode.apps),
-	    appmon_a:start(Node, App, Pid);
-	true ->
-	    ignore
-    end,
-    {noreply, State};
-
-handle_info({gs, _Button, click, Data, _Arg}, State) ->
-    ThisNode = node(),
-    case Data of
-	
-	%% File menu item
-	listbox ->
-	    appmon_lb:open_win(State#state.lbpid,
-			       parse_nodes(State#state.mnodes)),
-	    {noreply, State};
-	{close, WinObj} ->
-	    {ok, GUI} = get_win2(WinObj, State#state.wins),
-	    gs:destroy(WinObj),
-
-	    %% Terminate if this was the only open window
-	    case remove_win(GUI#win.name, State#state.wins) of
-		[] ->
-		    {stop, normal, State};
-		Wins ->
-		    {noreply, State#state{wins=Wins}}
-	    end;
-	exit ->
-	    {stop, normal, State};
-
-	%% Actions menu item
-	{action, Action, WinObj} ->
-	    {ok, GUI} = get_win2(WinObj, State#state.wins),
-	    Node = GUI#win.name,
-
-	    if
-		Node==ThisNode ->
-		    case Action of
-			ping ->
-			    %% Ignore - makes no sense to ping yourself
-			    ignore;
-			_ -> % reboot | restart | stop
-			    apply(init, Action, [])
-		    end;
-
-		Node/=ThisNode ->
-		    case Action of
-			ping ->
-			    net_adm:ping(Node);
-			_ -> % reboot | restart | stop
-			    rpc:cast(Node, init, Action, [])
-		    end
-	    end,
-	    {noreply, State};
-
-	%% Options menu item
-	{window_mode, Mode} ->
-	    
-	    %% Update windows so they all show the same options
-	    lists:foreach(fun(GUI) ->
-				  display_setopt(GUI, Mode)
-			  end,
-			  State#state.wins),
-	    {noreply, State#state{window_mode=Mode}};
-	
-	{option, Tag, Option} ->
-	    
-	    %% Update windows so they all show the same options
-	    lists:foreach(fun(GUI) ->
-				  display_setopt(GUI, Tag)
-			  end,
-			  State#state.wins),
-
-	    %% Update all appmon_info processes about which kind of
-	    %% load data is desired
-	    lists:foreach(fun(MNode) ->
-				  appmon_info:load(MNode#mnode.pid,
-						   MNode#mnode.name,
-						   true,
-						   Option)
-			  end,
-			  State#state.mnodes),
-
-	    if
-		Tag==time; Tag==queue ->
-		    {noreply, State#state{load_mode1=Tag}};
-		Tag==prog; Tag==linear ->
-		    {noreply, State#state{load_mode2=Tag}}
-	    end;
-
-	%% Nodes menu item
-	{node, Node, WinObj} ->
-
-	    %% Check first if this window is already displayed
-	    case get_win(Node, State#state.wins) of
-		{ok, GUI} ->
-
-		    %% Node is already displayed, raise its window
-		    gs:config(GUI#win.window, raise),
-
-		    {noreply, State};
-
-		%% Node is not displayed
-		false ->
-
-		    %% Redraw existing window or create a new window
-		    %% depending on window mode
-		    case State#state.window_mode of
-
-			single ->
-			    {ok, GUI} =
-				get_win2(WinObj, State#state.wins),
-			    	    
-			    %% Clear window and correct the node name
-			    draw_clear(GUI),
-			    GUI1 = draw_nodename(GUI, Node),
-
-			    %% Update window with the correct node name
-			    %% and the applications running at the node
-			    MNode = get_mnode(Node, State#state.mnodes),
-			    GUI2 = case MNode#mnode.status of
-				       dead ->
-					   display_nodedown(GUI1),
-					   GUI1;
-				       alive ->
-					   display_nodeup(GUI1, Node),
-					   draw_apps(GUI1,
-						     MNode#mnode.apps)
-				   end,
-			    Wins = replace_win(GUI#win.name, GUI2,
-					       State#state.wins),
-
-			    {noreply, State#state{wins=Wins}};
-
-			many ->
-			    GUI = draw_win(State#state.gs, Node),
-
-			    %% Update Nodes menu with all known nodes -
-			    %% use MNodes to get them in the right order
-			    lists:foreach(fun(MNode) ->
-						  Name =
-						      MNode#mnode.name,
-						  display_addnode(GUI,
-								  Name)
-					  end,
-					  State#state.mnodes),
-
-			    %% Mark selected options in the Options menu
-			    display_setopt(GUI, many),
-			    display_setopt(GUI, State#state.load_mode1),
-			    display_setopt(GUI, State#state.load_mode2),
-
-			    %% Add the applications running at the node
-			    MNode = get_mnode(Node, State#state.mnodes),
-
-			    GUI1 = case MNode#mnode.status of
-				       dead ->
-					   display_nodedown(GUI),
-					   GUI;
-				       alive ->
-					   display_nodeup(GUI, Node),
-					   draw_apps(GUI,
-						     MNode#mnode.apps)
-				   end,
-			    Wins = [GUI1|State#state.wins],
-			    
-			    {noreply, State#state{wins=Wins}}
-		    end
-	    end;
-
-        %% Help menu = Help button
-	help ->
-	    HelpFile = filename:join([code:lib_dir(appmon),
-				     "doc", "html", "part_frame.html"]),
-	    case State#state.wins of
-		[Win] ->
-		    tool_utils:open_help(Win#win.window, HelpFile);
-		_ ->
-		    tool_utils:open_help(State#state.gs, HelpFile)
-	    end,
-	    {noreply, State};
-		
-	_Other ->
-	    {noreply, State}
-    end;
-handle_info({gs, WinObj, configure, _, [WWindow, HWindow|_]}, State) ->
-    {ok, GUI} = get_win2(WinObj, State#state.wins),
-    GUI1 = draw_resize(GUI, WWindow, HWindow),
-    display_scrollbar(GUI1),
-    Wins = replace_win(GUI#win.name, GUI1, State#state.wins),
-    {noreply, State#state{wins=Wins}};
-handle_info({gs, WinObj, destroy, _, _}, State) ->	% OTP-1179
-    {ok, GUI} = get_win2(WinObj, State#state.wins),
-
-    %% Terminate if this was the only open window
-    case remove_win(GUI#win.name, State#state.wins) of
-	[] ->
-	    {stop, normal, State};
-	Wins ->
-	    {noreply, State#state{wins=Wins}}
-    end;
-
-handle_info(stop, State) ->
-    {stop, normal, State};
-handle_info({'EXIT', Pid, Reason}, State) ->
-    case Reason of
-	shutdown ->
-	    %% Appmon is being asked to shut down, eg during reboot
-	    {stop, Reason, State};
-	_ ->
-	    case State#state.gs of
-		
-		%% GS exited, kill appmon
-		{0, Pid} ->
-		    {stop, normal, State};
-	
-		_ ->
-		    {noreply, State}
-	    end
-    end;
-handle_info(_Info, State) ->
-    {noreply, State}.
-	
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-terminate(_Reason, State) ->
-    bcast(State#state.mnodes, {kill}),
-    appmon_lb:stop(State#state.lbpid),
-    ok.
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Convert process state when code is changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-    
-
-%%%---------------------------------------------------------------------
-%%% Internal functions
-%%%---------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% MNode manipulating functions
-%%----------------------------------------------------------------------
-
-%% mk_mnodes(Nodes, LbPid) -> MNodes
-%%   Nodes -> [atom()]
-%%   LbPid -> pid()
-%%   MNodes -> [#mnode{}]
-mk_mnodes([Node|Nodes], LbPid) ->
-    [mk_mnode(Node, LbPid) | mk_mnodes(Nodes, LbPid)];
-mk_mnodes([], _LbPid) ->
-    [].
-
-mk_mnode(Node, LbPid) ->
-
-    %% Create an appmon process at the node
-    {ok, Pid} = appmon_info:start_link(Node, self(), []),
-    
-    appmon_lb:add_node(LbPid, Node),
-    appmon_info:load(Pid, Node, true, [{timeout,1000}]),
-    appmon_info:app_ctrl(Pid, Node, true, []),
-
-    #mnode{name=Node, status=alive, pid=Pid}.
-
-%% get_mnode(Node, MNodes) -> MNode | false
-%%   Node -> atom()
-%%   MNodes -> [#mnode{}]
-%%   MNode -> #mnode{}
-get_mnode(Node, MNodes) ->
-    case lists:keysearch(Node, #mnode.name, MNodes) of
-	{value, MNode} ->
-	    MNode;
-	false ->
-	    false
-    end.
-
-%% replace_mnode(Node, MNode, MNodes1) -> Mnodes2
-%%   Node -> atom()
-%%   MNode -> #mnode{}
-%%   MNodes1 -> MNodes2 -> [#mnode{}]
-%% Replaces, or adds if previously not included, the mnode with name
-%% Node in MNodes1 with MNode.
-replace_mnode(Node, MNode, [#mnode{name=Node} | MNodes]) ->
-    [MNode | MNodes];
-replace_mnode(Node, MNode, [MNode2 | MNodes]) ->
-    [MNode2 | replace_mnode(Node, MNode, MNodes)];
-replace_mnode(_Node, MNode, []) ->
-    [MNode].
-	
-
-%%----------------------------------------------------------------------
-%% GUI list manipulating functions
-%%----------------------------------------------------------------------
-
-%% get_win(Node, Wins) -> Win
-%%   Node -> atom()
-%%   Wins -> [#win{}]
-%%   Win -> #win{}
-get_win(Node, Wins) ->
-    case lists:keysearch(Node, #win.name, Wins) of
-	{value, Win} ->
-	    {ok, Win};
-	false ->
-	    false
-    end.
-
-%% get_win2(WinObj, Wins) -> Win
-%%   Window -> gsobj()
-%%   Wins -> [#win{}]
-%%   Win -> #win{}
-get_win2(WinObj, Wins) ->
-    case lists:keysearch(WinObj, #win.window, Wins) of
-	{value, Win} ->
-	    {ok, Win};
-	false ->
-	    false
-    end.
-
-%% replace_win(Node, Win, Wins) -> Wins2
-%%   Node -> atom()
-%%   Win -> #win{}
-%%   Wins -> Wins2 -> [#win{}]
-replace_win(Node, Win, Wins) ->
-    lists:keyreplace(Node, #win.name, Wins, Win).
-
-%% remove_win(Node, Wins) -> Wins2
-%%   Node -> atom()
-%%   Wins -> Wins2 -> [#win{}]
-remove_win(Node, Wins) ->
-    lists:keydelete(Node, #win.name, Wins).
-
-
-
-
-%%----------------------------------------------------------------------
-%% GUI manipulating functions
-%%----------------------------------------------------------------------
--define(PAD, 10).                         % Pad between objects
--define(PAD2, 4*?PAD).                    % Pad betw. node lbl and app
-
--define(hMENUBAR, 25).                    % Note: Hardwired in Tcl/Tk
-
--define(xNODELBL, 60).                    % Node label
--define(yNODELBL, 35).
--define(hNODELBL, 20).
-
--define(xMETER, 5).                       % Meter
--define(yMETER, ?yNODELBL).
--define(wMETER, 20).
--define(hMETER, ?hNODELBL + ?PAD + ?PAD2 + ?hBTN).
--define(LEDCOUNT, 16).
-
--define(xBTN, ?xNODELBL).                 % Application buttons
--define(yBTN, ?yNODELBL + ?hNODELBL + ?PAD + ?PAD2).
--define(wBTN, 70).                        % min width
--define(hBTN, 20).
-
--define(wCANVAS, 470 + ?wMETER + 3*?PAD). % Canvas
--define(hCANVAS, ?yNODELBL + ?hNODELBL + ?PAD + ?PAD2 + ?hBTN +	2*?PAD).
-
--define(wWIN, ?wCANVAS).                  % Window
--define(hWIN, ?hMENUBAR + ?hCANVAS).
-
-%%--Main window---------------------------------------------------------
-
-draw_win(GS, Node) ->
-
-    %% Main window
-    NodeStr = atom_to_list(Node),
-    Win = gs:create(window, GS, [{title,
-				  "APPMON: Overview on " ++ NodeStr},
-				 {width, ?wWIN}, {height, ?hWIN},
-				 {configure, true}]),
-    Canvas = gs:create(canvas, Win, [{x, 0}, {y, ?hMENUBAR},
-				     {width, ?wCANVAS},
-				     {height, ?hCANVAS}]),
-    L1 = gs:create(line, Canvas, [{coords,
-				   [{0,?yNODELBL-?PAD},
-				    {?wCANVAS,?yNODELBL-?PAD}]}]),
-    L2 = gs:create(line, Canvas, [{coords,
-				   [{0,?hCANVAS-?PAD},
-				    {?wCANVAS,?hCANVAS-?PAD}]}]),
-    
-    %% Standard buttons
-    MenuBar = gs:create(menubar, Win, [{height, ?hMENUBAR}]),
-
-    FileMenuBtn = gs:create(menubutton, MenuBar,
-			    [{label, {text,"File"}}]),
-    FileMenu = gs:create(menu, FileMenuBtn, []),
-    gs:create(menuitem, FileMenu, [{label, {text,"Show List Box..."}},
-				   {data, listbox}]),
-    gs:create(menuitem, FileMenu, [{label, {text, "Close"}},
-				   {data, {close, Win}}]),
-    gs:create(menuitem, FileMenu, [{itemtype, separator}]),
-    gs:create(menuitem, FileMenu, [{label, {text, "Exit"}},
-				   {data, exit}]),
-
-    ActionMenuBtn = gs:create(menubutton, MenuBar,
-			      [{label,{text,"Actions"}}]),
-    ActionMenu = gs:create(menu, ActionMenuBtn, []),
-    gs:create(menuitem, ActionMenu, [{label, {text,"Reboot"}},
-				     {data, {action, reboot, Win}}]),
-    gs:create(menuitem, ActionMenu, [{label, {text,"Restart"}},
-				     {data, {action, restart, Win}}]),
-    gs:create(menuitem, ActionMenu, [{label, {text,"Stop"}},
-				     {data, {action, stop, Win}}]),
-    gs:create(menuitem, ActionMenu, [{label, {text,"Ping"}},
-				     {data, {action, ping, Win}}]),
-
-    OptMenuBtn = gs:create(menubutton, MenuBar,
-			   [{label, {text,"Options"}}]),
-    OptMenu = gs:create(menu, OptMenuBtn, []),
-    G0 = now(), % Group identity unique per window!
-    SMI = gs:create(menuitem, OptMenu, [{label, {text,"One window"}},
-					{itemtype, radio}, {group, G0},
-					{data, {window_mode, single}}]),
-    MMI = gs:create(menuitem, OptMenu, [{label, {text,"Many windows"}},
-					{itemtype, radio}, {group, G0},
-					{data, {window_mode, many}}]),
-    gs:create(menuitem, OptMenu, [{itemtype, separator}]),
-    G1 = now(),
-    TMI = gs:create(menuitem, OptMenu, [{label, {text,"Load: time"}},
-					{itemtype, radio}, {group, G1},
-					{data,
-					 {option, time,
-					  [{load_method,time}]}}]),
-    QMI = gs:create(menuitem, OptMenu, [{label, {text,"Load: queue"}},
-					{itemtype, radio}, {group, G1},
-					{data,
-					 {option, queue,
-					  [{load_method,queue}]}}]),
-    G2 = now(),
-    PMI = gs:create(menuitem, OptMenu,
-		    [{label, {text,"Load: progressive"}},
-		     {itemtype, radio}, {group, G2},
-		     {data, {option, prog, [{load_scale,prog}]}}]),
-    LMI = gs:create(menuitem, OptMenu, [{label, {text,"Load: linear"}},
-					{itemtype, radio}, {group, G2},
-					{data,
-					 {option, linear,
-					  [{load_scale,linear}]}}]),
-
-    NodeMenuBtn = gs:create(menubutton, MenuBar,
-			    [{label, {text,"Nodes"}}]),
-    NodeMenu = gs:create(menu, NodeMenuBtn, []),
-
-    HelpMenuBtn = gs:create(menubutton, MenuBar,
-			    [{label, {text,"Help"}}, {side, right}]),
-    HelpMenu = gs:create(menu, HelpMenuBtn, []),
-    gs:create(menuitem, HelpMenu, [{label, {text,"Help"}},
-				   {data, help}]),
-
-    %% Meter
-    HLed = trunc((?hMETER)/(?LEDCOUNT)),
-    Leds = draw_leds(?LEDCOUNT, Canvas, ?yMETER, HLed, []),
-    leds_down(Leds, ?LEDCOUNT, 0),
-    gs:create(text, Canvas, [{coords,
-			      [{?xMETER, ?yMETER+HLed*?LEDCOUNT}]},
-			     {anchor, nw},
-			     {font, {screen,8}},
-			     {text, "Load"}]),
-    gs:create(text, Canvas, [{coords, [{?xMETER+?wMETER, ?yMETER}]},
-			     {anchor, nw},
-			     {font, {screen,8}},
-			     {text, "Hi"}]),
-    gs:create(text, Canvas, [{coords, [{?xMETER+?wMETER,
-					?yMETER+HLed*?LEDCOUNT}]},
-			     {anchor, w},
-			     {font, {screen,8}},
-			     {text, "Lo"}]),
-
-    %% Node label
-    WNodeLbl = 8*length(NodeStr)+10,
-    NLRect = gs:create(rectangle, Canvas,
-		       [{coords, [{?xNODELBL,?yNODELBL},
-				  {?xNODELBL+WNodeLbl,
-				   ?yNODELBL+?hNODELBL}]},
-			{fill, black}]),
-    Xc = ?xNODELBL + round(WNodeLbl/2),
-    Yc = ?yNODELBL + round(?hNODELBL/2),
-    NLText = gs:create(text, Canvas, [{text, NodeStr},
-				      {fg, {250,235,215}},
-				      {coords, [{Xc,Yc}]},
-				      {anchor, c}]),
-    NodeLbl = {NLRect, NLText},
-    
-    gs:config(Win, {map, true}),
-    #win{name=Node,
-	 window=Win, wwindow=?wWIN, hwindow=?hCANVAS,
-	 options=#options{single=SMI, many=MMI,
-			  time=TMI, queue=QMI, prog=PMI, linear=LMI},
-	 canvas=Canvas, wcanvas=?wCANVAS, hcanvas=?hCANVAS,
-	 l1=L1, l2=L2, leds=Leds, nodelabel=NodeLbl, nodemenu=NodeMenu}.
-
-draw_leds(N, Canvas, Y, HLed, Leds) when N>0 ->
-    Led = gs:create(rectangle, Canvas,
-		    [{coords,
-		      [{?xMETER,Y}, {?xMETER+?wMETER,Y+HLed}]}]),
-    draw_leds(N-1, Canvas, Y+HLed, HLed, [Led | Leds]);
-draw_leds(0, _Canvas, _Y, _HLed, Leds) ->
-    Leds.
-
-%%--Draw functions------------------------------------------------------
-%% Functions that modify the GUI and its data (win{})
-
-%% Display the node name in the window title
-%% (The name in the node label is changed by display_nodeup|nodedown)
-%% Used when a changing the node to display
-draw_nodename(GUI, Node) ->
-    NodeStr = atom_to_list(Node),
-    gs:config(GUI#win.window,
-	      {title, "APPMON: Overview on " ++ NodeStr}),
-    GUI#win{name=Node}.
-
-%% Resize the canvas (when the window has been resized)
-draw_resize(GUI, W, H) ->
-    Hc = H - ?hMENUBAR,
-    gs:config(GUI#win.canvas, [{width, W}, {height, Hc}]),
-    Yline1 = ?yNODELBL-?PAD,
-    Yline2 = ?hCANVAS-?PAD,
-    gs:config(GUI#win.l1, [{coords, [{0,Yline1},{W,Yline1}]}]),
-    gs:config(GUI#win.l2, [{coords, [{0,Yline2},{W,Yline2}]}]),
-    GUI#win{wwindow=W, hwindow=Hc}.
-
-%% Clear the GUI from applications and connecting lines
-draw_clear(GUI) ->
-    draw_clear2(GUI#win.appobjs),
-    gs:config(GUI#win.canvas, [{hscroll, false}]),
-    GUI#win{appobjs=[]}.
-draw_clear2([CBtn | AppObjs]) when is_record(CBtn, canvasbutton) ->
-    gs:destroy(CBtn#canvasbutton.text),
-    gs:destroy(CBtn#canvasbutton.ul),
-    gs:destroy(CBtn#canvasbutton.ll),
-    gs:destroy(CBtn#canvasbutton.rect),
-    draw_clear2(AppObjs);
-draw_clear2([GSObj | AppObjs]) ->
-    gs:destroy(GSObj),
-    draw_clear2(AppObjs);
-draw_clear2([]) ->
-    ignore.
-
-%% Display the applications, which are a list of tuples: {Pid,App,Descr}
-%% Display them in the reversed order to get them chronologically
-%% from left to right.
-draw_apps(GUI, Apps) ->
-    {AppObjs, WCanvas} = draw_apps(GUI, lists:reverse(Apps), ?xNODELBL,
-				   undefined, 0, []),
-    NewGUI = GUI#win{wcanvas=WCanvas, appobjs=AppObjs},
-    display_scrollbar(NewGUI),
-    NewGUI.
-
-draw_apps(GUI, [App | Apps], X, Lx0, N, GSObjs) ->
-
-    %% Some necessary data
-    {_Pid, AppName, _Descr} = App,
-    Text = atom_to_list(AppName),
-    Width = erlang:max(8*length(Text)+10, ?wBTN),
-
-    %% Connect the application to the node label with a line
-    %% Lx0 = leftmost X coordinate (above previous application button)
-    %% Lx = X coordinate, Ly1, Ly2 = top and bottom Y coordinates
-    Lx = X + trunc(Width/2),
-    Line = case N of
-	       %% First (leftmost application) - draw a vertical line
-	       %% between the node label and application button
-	       0 ->
-		   Ly1 = ?yNODELBL + ?hNODELBL +?PAD,
-		   Ly2 = Ly1 + ?PAD2,
-		   gs:create(line, GUI#win.canvas,
-			     [{coords, [{Lx, Ly1}, {Lx, Ly2}]}]);
-	       %% Nth application, N>1 - draw a horizontal line from
-	       %% line connecting to the previous application button,
-	       %% to above this application button, then vertically down
-	       %% to the application button
-	       _ ->
-		   Ly1 = ?yNODELBL + ?hNODELBL + ?PAD + ?PAD2/2,
-		   Ly2 = Ly1 + ?PAD2/2,
-		   gs:create(line, GUI#win.canvas,
-			     [{coords, [{Lx0, Ly1}, {Lx, Ly1},
-					{Lx, Ly2}]}])
-	   end,
-    
-    %% The application is represented using a 'canvasbutton'
-    Data = {application, AppName, GUI#win.name},
-    AppBtn = canvasbutton(GUI#win.canvas, Text, X, ?yBTN, Width, ?hBTN,
-			  Data),
-
-    draw_apps(GUI, Apps, X+Width+?PAD, Lx, N+1, [AppBtn, Line|GSObjs]);
-draw_apps(_GUI, [], X, _N, _Lx0, GSObjs) ->
-    {GSObjs, X}.
-
-%%--Display functions---------------------------------------------------
-%% Functions that modify the GUI but not its data
-
-%% Add a new node to the Nodes menu
-%% Used when a new node has connected
-display_addnode([GUI|GUIs], Node) ->
-    display_addnode(GUI, Node),
-    display_addnode(GUIs, Node);
-display_addnode([], _Node) ->
-    ignore;
-display_addnode(GUI, Node) ->
-    Txt = "Show " ++ atom_to_list(Node),
-    gs:create(menuitem, GUI#win.nodemenu,
-	      [{label, {text,Txt}},
-	       {data, {node, Node, GUI#win.window}}]).
-
-%% Show that a node has come back up
-display_nodeup(GUI, Node) ->
-    {Rect, Text} = GUI#win.nodelabel,
-
-    %% Check coordinates for the rectangle and compute the new width
-    [{L, T}, {_R, B}] = gs:read(Rect, coords),
-    NodeStr = atom_to_list(Node),
-    W = 8*length(NodeStr)+10,
-    
-    gs:config(Rect, [{coords, [{L, T}, {L+W, B}]}, {fill, black}]),
-    gs:config(Text, [{text, NodeStr}, {fg, {250,235,215}},
-		     {coords,
-		      [{L+round(W/2), T+round((?hNODELBL)/2)}]}]).
-
-%% Show that a node has gone down
-display_nodedown(GUI) ->
-    {Rect, Text} = GUI#win.nodelabel,
-    
-    [{L, T}, {_R, B}] = gs:read(Rect, coords),
-    gs:config(Rect, [{coords, [{L, T}, {L+114, B}]}, {fill, gray}]),
-    gs:config(Text, [{text, "No connection"}, {fg, black},
-		     {coords, [{L+57, T+round((?hNODELBL)/2)}]}]).
-
-%% Add/remove scrollbars as necessary
-display_scrollbar(GUI) ->
-
-    WWindow = GUI#win.wwindow,
-    HWindow = GUI#win.hwindow,
-    WCanvas = GUI#win.wcanvas,
-    HCanvas = GUI#win.hcanvas,
-    if
-	WCanvas>WWindow ->
-	    gs:config(GUI#win.canvas,
-		      [{hscroll, bottom},
-		       {scrollregion,{0,0,WCanvas,HCanvas}}]);
-	true ->
-	    gs:config(GUI#win.canvas, [{hscroll, false}])
-    end,
-    if
-	HCanvas>HWindow ->
-	    gs:config(GUI#win.canvas,
-		      [{vscroll, left},
-		       {scrollregion,{0,0,WCanvas,HCanvas}}]);
-					
-	true ->
-	    gs:config(GUI#win.canvas, [{vscroll, false}])
-    end.
-
-%% Select option radio buttons
-display_setopt(GUI, Option) ->
-    gs:config(radiobutton(GUI, Option), {select,true}).
-
-radiobutton(GUI, single) -> (GUI#win.options)#options.single;
-radiobutton(GUI, many) ->   (GUI#win.options)#options.many;
-radiobutton(GUI, time) ->   (GUI#win.options)#options.time;
-radiobutton(GUI, queue) ->  (GUI#win.options)#options.queue;
-radiobutton(GUI, prog) ->   (GUI#win.options)#options.prog;
-radiobutton(GUI, linear) -> (GUI#win.options)#options.linear.
-
-%% Display load
-%% Used when load information is received from the displayed node
--define(highloadfg, {255,99,71}).
--define(midloadfg, yellow).
--define(lowloadfg, green).
--define(highloadbg, {140,157,178}).
--define(midloadbg, ?highloadbg).
--define(lowloadbg, ?highloadbg).
-
-display_load(GUI, {Old, New}) ->
-    if
-	Old == New ->
-	    true;
-	Old > New ->
-	    leds_down(GUI#win.leds, Old, New);
-	true ->
-	    leds_up(GUI#win.leds, Old, New)
-    end.
-
-leds_down(_Leds, Old, New) when Old == New -> 
-    done;
-leds_down(Leds, Old, New) when Old > New -> 
-    reset_led(Leds, Old),
-    leds_down(Leds, Old-1, New).
-leds_up(_Leds, Old, New) when Old == New -> 
-    done;
-leds_up(Leds, Old, New) when Old < New -> 
-    set_led(Leds, Old),
-    leds_up(Leds, Old+1, New).
-
-led_on_col(N) when N > 13 -> ?highloadfg;
-led_on_col(N) when N > 9 -> ?midloadfg;
-led_on_col(_) -> ?lowloadfg.
-
-led_off_col(N) when N > 13 -> ?highloadbg;
-led_off_col(N) when N > 9 -> ?midloadbg;
-led_off_col(_) -> ?lowloadbg.
-
-reset_led(_Leds, 0) -> ok;
-reset_led(Leds, N) ->
-    gs:config(lists:nth(N, Leds), [{fill, led_off_col(N)}]).
-
-set_led(_Leds, 0) -> ok;
-set_led(Leds, N) ->
-    gs:config(lists:nth(N, Leds), [{fill, led_on_col(N)}]).
-
-%%----------------------------------------------------------------------
-%% Utilities
-%%----------------------------------------------------------------------
-
-bcast(MNodes, Msg) ->
-    lists:foreach(fun(MNode) ->
-			  case MNode#mnode.status of
-			      alive ->
-				  MNode#mnode.pid ! Msg;
-			      dead ->
-				  ignore
-			  end
-		  end,
-		  MNodes).
-
-%% parse_nodes(MNodes) -> NodeApps
-%%   MNodes -> [#mnode{}]
-%%   NodeApps -> [{Node, Status, Apps}]
-%%     Node -> atom()
-%%     Status -> alive | dead
-%%     Apps -> [{Pid, App}]
-%%       Pid -> pid()
-%%       App -> atom()
-parse_nodes(MNodes) ->
-    parse_nodes(MNodes, []).
-parse_nodes([MNode|MNodes], NodeApps) ->
-    Apps = parse_apps(MNode#mnode.apps, []),
-    parse_nodes(MNodes,
-		[{MNode#mnode.name,MNode#mnode.status,Apps}|NodeApps]);
-parse_nodes([], NodeApps) ->
-    NodeApps.
-    
-parse_apps([{Pid, App, _Descr}|Rest], Apps) ->
-    parse_apps(Rest, [{Pid, App}|Apps]);
-parse_apps([], Apps) ->
-    Apps.
-
-%%----------------------------------------------------------------------
-%% Canvas buttons
-%%----------------------------------------------------------------------
-
-canvasbutton(Canvas, Text, X, Y, W, H, Data) ->
-
-    %% Draw a rectangle (for event catching)
-    Rect = gs:create(rectangle, Canvas, [{coords, [{X,Y}, {X+W,Y+H}]},
-					 {fill, gs:read(Canvas, bg)},
-					 {buttonpress, true},
-					 {buttonrelease, true}]),
-    
-    %% Make the rectangle area look like a 3D button by using lines
-    Ul = gs:create(line, Canvas, [{coords, [{X,Y+H},{X,Y},{X+W,Y}]},
-				  {fg, white}, {width, 2}]),
-    Ll = gs:create(line, Canvas, [{coords, [{X,Y+H},{X+W,Y+H},{X+W,Y}]},
-				  {fg, {87,87,87}}, {width, 2}]),
-
-    %% Write the text in the middle
-    Xc = X + round(W/2),
-    Yc = Y + round(H/2),
-    T = gs:create(text, Canvas, [{text, Text}, {coords, [{Xc,Yc}]},
-				 {anchor, c},
-				 {buttonpress, true},
-				 {buttonrelease, true}]),
-
-    %% Create the canvasbutton object
-    CBtn = #canvasbutton{text=T, ul=Ul, ll=Ll, rect=Rect,
-			 x=X, y=Y, w=W, h=H},
-
-    %% Configure the data
-    gs:config(T, {data, {canvasbutton, CBtn, Data}}),
-    gs:config(Rect, {data, {canvasbutton, CBtn, Data}}),
-
-    CBtn.
-
-press(Canvasbutton) ->
-    gs:config(Canvasbutton#canvasbutton.ul, {fg, {87,87,87}}),
-    gs:config(Canvasbutton#canvasbutton.ll, {fg, white}).
-
-release(Canvasbutton) ->
-    gs:config(Canvasbutton#canvasbutton.ul, {fg, white}),
-    gs:config(Canvasbutton#canvasbutton.ll, {fg, {87,87,87}}).
diff --git a/lib/appmon/src/appmon_a.erl b/lib/appmon/src/appmon_a.erl
deleted file mode 100644
index 6838a7a275..0000000000
--- a/lib/appmon/src/appmon_a.erl
+++ /dev/null
@@ -1,1122 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(appmon_a).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,1}}]).
-
-%%----------------------------------------------------------------------
-%%
-%% Monitors an application, i.e its supervision tree.
-%%
-%%----------------------------------------------------------------------
-%%
-%%
-%%		INTRODUCTION
-%%		------------
-%%
-%%		This file contains a description of the files involved
-%%		and the communication between the appmon_a display
-%%		manager and the appmon_a2 information gatherer. Further
-%%		information on the placement algorithm can be found in
-%%		the place.erl file.
-%%
-%%
-%%		FILES
-%%		-----
-%%
-%%		The supervision tree graphical software consists of
-%%		the following files:
-%%
-%% appmon_a	Gen server driving the process display window.
-%%		Responsible for assigning gs identifiers to all 
-%%		processes and process link
-%% appmon_a2	The process information gathering routines. 
-%%		Works by following the process links from application 
-%%		master once every second
-%% dg		The process database is implemented as a shared 
-%%		digraph (see manual pages for digraph) and this is 
-%%		the routines handling this digraph. Since the digraph 
-%%		is shared appmon_a2 will put some info into it that the 
-%%		appmon_a later will modify. The structures used are 
-%%		described in dg.hrl
-%% place	Places a tree, decides the x and y coordinates (not 
-%%		necessarily corresponding to window coordinates) of 
-%%		processes (or vertices to be specific). Note that 
-%%		special routines are used to transform the possibly 
-%%		cyclic digraph into a strict tree before trying to 
-%%		place it.
-%%
-%%
-%%
-%%		IMPLEMENTATION DETAIL
-%%		---------------------
-%%
-%%		The appmon_a module will follow links between processes,
-%%		starting with the application master. A unique
-%%		reference is used to prevent infinite recursion. Note
-%%		that this process and link gathering is done in the
-%%		live digraph so that already known processes are
-%%		updated with the reference and new ones are added to
-%%		the digraph. After all processes and links have been
-%%		added or updated a search is made for those processes
-%%		and links that have an old reference. These are those
-%%		processes and links that are not present in the
-%%		application any more. Those are extracted from the
-%%		digraph and then deleted and the extracts are then
-%%		used (by appmon_a) to delete the appropriate gs
-%%		objects. The responsibilities of appmon_a is thus 1) add
-%%		all new processes and links to the digraph and 2) make
-%%		a list of all those objects from the digraph that have
-%%		been deleted.
-%%
-%%		When appmon_a2 has gathered all necessary information it
-%%		notifies the appmon_a display manager. Note that this is
-%%		implemented as a call (as opposed to a cast) to
-%%		prevent appmon_a2 from changing the digraph while appmon_a
-%%		uses it. appmon_a places all processes using the place
-%%		module. place will place the processes in the x y
-%%		planes, hopefully in a nice way, re-forming the
-%%		digraph during the process into a strict tree using
-%%		some simple heuristics, some links that makes the
-%%		graph cyclic will be considered secondary and later
-%%		coloured red. Note that the process links are not
-%%		placed since their coordinates are those of the
-%%		processes that they are links between. The place
-%%		module is only concerned at a fairly high level of
-%%		abstraction. Currently its x coordinates are used as
-%%		real coordinates while the y coordinates must be
-%%		scaled to correct values, thus the x plane is
-%%		continous and the y plane is disctrete.
-%%
-%%		Having placed processes the new ones are drawn on the
-%%		display along with all new process links, then all
-%%		processes and process links are moved to their
-%%		possibly new positions. The place module is not
-%%		sensitive to changes in position and therefore has no
-%%		concept of which nodes will have to be moved. hence
-%%		all nodes are moved (but most of them probably to the
-%%		same position as before)
-%%
-%%
-%%
-%%
-%%----------------------------------------------------------------------
-
-
-
--export([start/2, start/3, stop/0]).
-
-
--record(astate, {app, name, client, digraph}).
-
--import(lists, [foreach/2]).
-
-%% gen server stuff
--behaviour(gen_server).
--export([init/1, handle_cast/2, handle_info/2, terminate/2]).
--export([handle_call/3, code_change/3]).
-
-
--define(APPSPACE, 10).				% The space between apps
--define(NODEAREA_H, 90).			% The height of a node
--define(BUTTAREA_H, 80).			% The button area height
--define(APPBUTT_H, 20).				% Height of appl button
--define(EDITORW, 260).
-
--define(MAXWIDTH, 800).
--define(MINWIDTH, 382).
--define(MAXHEIGHT, 450).
--define(MINHEIGHT, 325).
-
--define(SUPVIEWTXT, "Sup. view").
--define(PROCVIEWTXT, "Proc. view").
--define(CLOSETXT, "Close").
--define(REFRESHTXT, "Refresh").
--define(SAVEOPTSTXT, "Save options").
--define(HELPTXT, "Help").
-
--define(CHARWIDTH, 7).				%Should use GS primitives
-
--define( darkkhaki, {189, 183, 107}).
--define( palegoldenrod, {238, 232, 170}).
--define( peachpuff4, {139, 119, 101}).
--define( red, red).
--define( darkgrey, {169, 169, 169}).
--define( lightgrey, {211, 211, 211}).
--define( royalblue, {65, 105, 225}).
--define( aquamarine4, {69, 139, 116}).
--define( palegreen4, {84, 139,  84}).
--define( darkseagreen, {105, 139, 105}).
--define( f_line_col, {150, 150, 255}).
-
-
--include("appmon_dg.hrl").
-
-
-%%------------------------------------------------------------
-%%------------------------------------------------------------
-
-
-start(NodeName, AppName) ->
-    gen_server:start_link(?MODULE, {NodeName, AppName, AppName}, []).
-
-start(NodeName, AppName, AppId) ->
-    gen_server:start_link(?MODULE, {NodeName, AppName, AppId}, []).
-
-
-stop() ->
-    ok.
-
-
-
-%%------------------------------------------------------------
-%% Public interface
-
-
-%%------------------------------------------------------------
-%% Administration
-
-%% AppName is the name of the application, usually an atom like sasl
-%% or kernel, AppId is the application pid or the application name,
-%% either goes.
-init({NodeName, AppName, AppId}) ->
-    process_flag(trap_exit, true),
-    {ok, Client} = appmon_info:start_link(NodeName, self(), []),
-    init_ref(),
-    init_foreign_places(),
-    DG = digraph:new([cyclic, private]),
-    State = #astate{app=AppId, name=AppName, client=Client, digraph=DG},
-    refresh(State),
-    setup_base_win(NodeName, AppName),
-    {ok, State}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-handle_call(norequest, _From, State) ->
-    {reply, null, State}.
-
-%%------------------------------------------------------------
-%% handle casts
-
-handle_cast({ping, _Node, _From}, State) ->
-    {noreply, State};
-handle_cast(_Other, State) ->
-    {noreply, State}.
-
-
-
-%%------------------------------------------------------------
-%% handle info
-
-handle_info({gs, _, click, _, [?CLOSETXT|_]}, State) ->
-    {stop, normal, State};
-handle_info({gs, _, destroy, _, _}, State) ->
-    {stop, normal, State};
-handle_info({gs, _, click, _, [?REFRESHTXT|_]}, State) ->
-    refresh(State),
-    {noreply, State};
-handle_info({gs, _, click, _, [?HELPTXT|_]}, State) ->
-    HelpFile = filename:join([code:lib_dir(appmon),
-			      "doc", "html", "part_frame.html"]),
-    tool_utils:open_help(win(), HelpFile),
-    {noreply, State};
-handle_info({gs, Id, click, {mode, Mode}, _}, State) ->
-    %%io:format("handle_info: Setting mode: ~p~n", [Mode]),
-    set_mode(Id, Mode),
-    {noreply, State};
-handle_info({gs, _, click, _, [?SUPVIEWTXT|_]}, State) ->
-    refresh(State, [{info_type, sup}]),
-    {noreply, State};
-handle_info({gs, _, click, _, [?PROCVIEWTXT|_]}, State) ->
-    refresh(State, [{info_type, link}]),
-    {noreply, State};
-handle_info({gs, Id, buttonpress, _,[1, X, Y|_]}, State) ->
-    %%io:format("Id clicked: ~p~n", [gs:read(Id, {find, {X, Y}})]),
-    catch find_pid(State, Id, X, Y),
-    set_default_mode(),
-    {noreply, State};
-handle_info({gs, Win, configure, _Data, [W, H|_]}, State) ->
-    case win() of Win -> user_driven_resize(W, H);
-	_-> ok
-    end,
-    {noreply, State};
-
-handle_info({delivery, _S, pinfo, _N, Res}, State) ->
-    appmon_txt:print(Res),
-    {noreply, State};
-handle_info({delivery, S, app, N, Res}, State) ->
-    {delivery, _Serv, app, _Name, {Root, Vs, Ls, SecLs}} = 
-	flush({delivery, S, app, N, Res}),
-    update2(Vs, Root, Ls, SecLs, State),
-    {noreply, State};
-
-handle_info({kill}, State) ->
-    {stop, normal, State};
-handle_info({state}, State) ->
-    {noreply, State};
-handle_info({'EXIT', _Pid, _Reason}, State) ->
-    {noreply, State};
-handle_info(_Other, State) ->
-    {noreply, State}.
-
-
-%% Refresh sets new options for the request and forces an update of
-%% the screen ant status.
-refresh(State) ->
-    refresh(State, []).
-refresh(State, Opts) ->
-    appmon_info:app(State#astate.client,
-		    State#astate.name, true, Opts).
-
-
-
-%% find_pid finds the pid of the clicked object. The scenario is that
-%% the user clicks on an item in his window, that ObjId is searched
-%% for among all nodes (vertices) and if found action is taken
-%% depending on the current mode (see handle_info)
-find_pid(State, Id, X, Y) ->
-    %% Try to manage both versions of GS, remove first case later.
-    ObjList = case gs:read(Id, {find, {X, Y}}) of
-		  {error, _} ->
-		      gs:read(Id, {hit, {X, Y}}); % Try new format
-		  Num when is_integer(Num) -> [Num];
-		  _Other -> []
-	      end,
-    DG = State#astate.digraph,
-    All = appmon_dg:get(all, DG),
-    find_pid2(ObjList, All, DG, State).
-
-find_pid2([Id | Ids], All, DG, State) ->
-    case search_for_pid(All, DG, Id) of
-	{ok, _KeyStr, Pid} ->
-	    handle_proc_press(mode(), Pid, State);
-	_ -> find_pid2(Ids, All, DG, State)
-    end;
-find_pid2([], _All, _DG, _State) -> ok.
-
-search_for_pid([V|Vs], DG, ObjId) ->
-    VD = appmon_dg:get(data, DG, V),
-    if  ObjId==VD#vdata.txt_obj ->
-	    {ok, V, VD#vdata.type};
-	true -> search_for_pid(Vs, DG, ObjId)
-    end;
-search_for_pid([], _DG, _ObjId) -> false.
-
-
-%%
-%% called when a process has been clicked on.
-%%
-handle_proc_press(info, Pid, State) -> 
-    appmon_info:pinfo(State#astate.client, Pid, true, 
-		      [{timeout, at_most_once}]);
-handle_proc_press(send, Pid, _State) -> 
-    {P, RawStr} = two_entries(winroot(), 250, 70,
-			      "Send", "To: ", "Msg: ", 
-			      pid_to_list(Pid), "", bg()),
-    Str = case lists:last(RawStr) of
-	       46 -> RawStr;
-	       _ -> RawStr++"."
-	   end,
-    case erl_scan:string(Str) of
-	{ok, Tokens, _} ->
-	    case erl_parse:parse_term(Tokens) of
-		{ok, Term} ->
-		    case catch list_to_pid(P) of
-			To when is_pid(To) -> To ! Term;
-			_ -> error
-		    end;
-		_Error -> error
-	    end;
-	_Error -> error
-    end;
-handle_proc_press(trace, Pid, _State) -> 
-    case trace_state(Pid) of
-	true ->
-	    io:format("Removing trace on ~p~n", [Pid]),
-	    sys:trace(Pid, false),
-	    set_trace_state(Pid, false);
-	_Other ->
-	    io:format("Putting trace on ~p~n", [Pid]),
-	    sys:trace(Pid, true, 1000),
-	    set_trace_state(Pid, true)
-    end;
-handle_proc_press(kill, Pid, _State) -> 
-    exit(Pid, kill).
-
-
-trace_state(Pid) -> get({trace_state, Pid}).
-set_trace_state(Pid, State) -> put({trace_state, Pid}, State).
-
-set_default_mode() ->
-    {Id, Mode} = get(default_mode),
-    case mode() of
-	Mode -> true;
-	_Other -> set_mode(Id, Mode)
-    end.
-set_default_mode(Id, Mode) ->
-    put(default_mode, {Id, Mode}),
-    select(Id),					%Dirty workaround
-    set_default_mode().
-
-set_mode(Id, Mode) ->
-    %%io:format("mode=~p~n", [Mode]),
-    set_mode(Mode),
-    deselect(),
-    select(Id).
-
-set_mode(Mode)	-> put(mode, Mode).
-mode()		-> get(mode).
-
-flush({delivery, S, A, N, R}) ->
-    receive
-	{delivery, S, A, N, R2} ->
-	    flush({delivery, S, A, N, R2})
-    after 0 ->
-	    {delivery, S, A, N, R}
-    end.
-
-
-%%------------------------------------------------------------
-%% Real stuff
-%% 
-update2(Vs, Root, Ls, SecLs, State) ->
-    DG = State#astate.digraph,
-    Ref = mk_ref(),
-    Added = add_procs(Vs, DG, Ref), 
-    AddedLs = add_links(Ls, DG, Ref, primary), 
-    AddedLs2 = add_links(SecLs, DG, Ref, secondary),
-    DelLs = del_links(appmon_dg:eget(all, DG), DG, Ref),
-    Dels = del_procs(appmon_dg:get(all, DG), DG, Ref),
-
-    LastX = appmon_place:place(DG, Root),
-    Width = lists:max(LastX),
-    Height = length(LastX),
-
-    %% Delete things from screen
-    del(Dels), del(DelLs),
-    
-    %% Add vertices to screen
-    foreach(fun(V) ->  draw_node(DG, V) end, Added),
-    
-    %% Add edges to screen
-    foreach(fun(E) ->  draw_edge(DG, E) end, AddedLs),
-    foreach(fun(E) ->  draw_edge(DG, E) end, AddedLs2),
-    
-    %% Move vertices on screen
-    foreach(fun(V) ->  move_vertex(DG, V) end, appmon_dg:get(all, DG)),
-
-    tree_driven_resize(Width, Height),
-
-    gs:config(win(), {map, true}),		%Make win visible
-    ok.
-
-%% Make an integer reference, could have used make_ref BIF but didn't
-mk_ref() -> put(reference, get(reference)+1).
-init_ref() -> put(reference, 0).
-
-
-%% Add processes (vertices) to digraph, use the string repr of pid as
-%% key in digraph.
-add_procs([{Pid, Str}|Vs], DG, Ref) ->
-    case appmon_dg:add(DG, Str, mk_vdata(Str, Pid, Ref), Ref) of
-	known	-> add_procs(Vs, DG, Ref);
-	updated -> add_procs(Vs, DG, Ref);
-	_	-> 
-	    case lists:member(32, Str) of
-		true -> 
-		    appmon_dg:set(x, DG, Str, foreign), % UNHOLY!
-		    add_procs(Vs, DG, Ref);	% Don't add foreign
-		_ -> [Str | add_procs(Vs, DG, Ref)]
-	    end
-    end;
-add_procs([], _DG, _Ref) -> [].
-
-
-%% Add links to digraph. NOTE that foreign links get a special weight
-%% and that no link is added if it goes to a process not in the set of
-%% vertices.
-%%
-%% OTP-1970: Check that linked-to processes really exist.
-%%
-add_links([{V1, V2}|Ls], DG, Ref, Weight) ->
-    L = case lists:member(32, V2) of
-	    true -> {V1, V2, foreign};
-	    _ ->    {V1, V2, Weight}
-	end,
-    case appmon_dg:get(data, DG, V2) of
-	false -> add_links(Ls, DG, Ref, Weight);
-	VD ->
-	    if  VD#vdata.ref == Ref ->		% OTP-1970
-		    case appmon_dg:eadd(DG, L, mk_edata(L, Ref), Ref) of
-			known -> add_links(Ls, DG, Ref, Weight);
-			updated -> add_links(Ls, DG, Ref, Weight);
-			_Other -> [L | add_links(Ls, DG, Ref, Weight)]
-		    end;
-		true ->
-		    add_links(Ls, DG, Ref, Weight)
-	    end
-    end;
-add_links([], _DG, _Ref, _Weight) -> [].
-
-%% Make an edge data structure
-mk_edata(_L, Ref) ->
-    #edata{ref=Ref}.
-
-%% Make a vertex data structure, note that pid can be either a pid or
-%% a port, we're not picky here.
-mk_vdata(P, Pid, Ref) ->
-    #vdata{ref=Ref, type=Pid, txt=P, width=width(P)}.
-width(Txt) -> ?CHARWIDTH*length(Txt)+10.	% Should use GS stuff instead
-
-
-%% Delete those processes that have the wrong reference from the
-%% digraph. Returns a list of deleted procs and their data (to be able
-%% to erase things on screen).
-del_procs([V|Vs], DG, Ref) ->
-    VD = appmon_dg:get(data, DG, V),
-    if  VD#vdata.ref /= Ref -> appmon_dg:del(DG, V),
-			       [{V, VD} | del_procs(Vs, DG, Ref)];
-	true -> del_procs(Vs, DG, Ref)
-    end;
-del_procs([], _DG, _Ref) -> [].
-
-
-%% Deletes links that have the wrong reference from the digraph, note
-%% that the weight of the edge is not considered here. Returns a list
-%% of deleted links and their data (to be able to erase things on
-%% screen).
-del_links([L | Ls], DG, Ref) ->
-    ED = appmon_dg:eget(data, DG, L),
-    if  ED#edata.ref /= Ref -> appmon_dg:edel(DG, L),
-			       [{L, ED} | del_links(Ls, DG, Ref)];
-	true -> del_links(Ls, DG, Ref)
-    end;
-del_links([], _DG, _Ref) -> [].
-
-%% Del deletes the GS objects of the list of should-be-deleted
-%% items. Returns nothing particular.
-del(L) ->
-    lists:foreach(fun({{V1, V2, Weight}, D}) when is_record(D, edata) ->
-			  if Weight== foreign ->
-				  dealloc_foreign({V1, V2, Weight});
-			     true -> ok end,
-			  destroy(D#edata.line);
-		     ({_I, D}) when is_record(D, vdata) ->
-			  destroy(D#vdata.sym_obj),
-			  destroy(D#vdata.txt_obj)
-		  end, L).
-
-
-move_vertex(DG, V) ->
-    VData = appmon_dg:get(data, DG, V),
-%%    io:format("Vertex ~p data: x:~p, oldx:~p, y:~p, oldy:~p offs:~p~n",
-%%	      [V, VData#vdata.x, VData#vdata.origx, 
-%%	       VData#vdata.y, VData#vdata.origy, offsetx()]),
-    if  VData#vdata.x == foreign -> ok;
-	true ->
-	    X = VData#vdata.x,
-	    Y = scaley(VData#vdata.y),
-	    OldX = VData#vdata.origx,
-	    OldY = scaley(VData#vdata.origy),
-	    if  X==OldX, Y==OldY -> true;
-		true ->
-		    %%io:format("Moving vertex: ~p~n", [V]),
-		    
-		    W = VData#vdata.width,
-		    {BoxC, TxtC} = calc_box_coords(X, Y, W),
-		    
-		    %% move the symbol and text
-		    gs:config(VData#vdata.sym_obj, [{coords, BoxC}]),
-		    gs:config(VData#vdata.txt_obj, [{coords, TxtC}]),
-		    foreach(fun(E) -> move_edge(DG, E) end, 
-			    appmon_dg:get(edges, DG, V))
-	    end
-    end.
-
-
-move_edge(DG, E) ->
-    {{V1, V2, Weight}, V1, V2, ED} = appmon_dg:eget(edge, DG, E),
-    VD1 = appmon_dg:get(data, DG, V1),
-    VD2 = appmon_dg:get(data, DG, V2),
-    Line = ED#edata.line,
-    move_line(DG, VD1, VD2, Line, Weight).
-move_line(DG, VD1, VD2, Line, Weight) when is_list(Line) ->
-    move_line(DG, VD1, VD2, hd(Line), Weight);
-move_line(_DG, VD1, VD2, Line, Weight) ->
-    Coords = calc_coords(VD1, VD2, Weight),
-    gs:config(Line, [{coords, Coords} | line_opts(Weight)]).
-
-%% Draw the vertex on the canvas
-draw_node(DG, V) ->
-    %%io:format("Drawing~n",[]),
-    Data = appmon_dg:get(data, DG, V),
-
-    X      = Data#vdata.x,
-    Y      = scaley(Data#vdata.y),
-
-    {Sym, Txt} = draw(rectangle, sup_col(), Data#vdata.txt, X, Y,
-		      Data#vdata.width),
-    
-    appmon_dg:av(DG, V, Data#vdata{sym_obj=Sym, txt_obj=Txt}),
-    true.
-
-%% Draws a symbol (rectangle for instance) on the canvas.
-draw(Symbol, Col, Txt, X, Y, W) ->
-    {BoxC, TxtC} = calc_box_coords(X, Y, W),
-    Box = gs:create(Symbol, canvas(), [{coords, BoxC}, {fill, Col}]),
-    
-    TxtObj = gs:create(text, canvas(), [{coords, TxtC},
-					{anchor, c},
-					%%{buttonpress, true},
-					{text, Txt}]),
-    {Box, TxtObj}.
-
-%% Returns {BoxCoords, TextCoords}
-calc_box_coords(X, Y, W) ->
-    {[{X, Y-radius()}, {X+W, Y+radius()}],   [{X+trunc(W/2), Y}]}.
-
-
-%% Draw a line on the canvas
-draw_edge(DG, E) ->
-    {V1, V2, Weight} = E,
-    Line = draw_line(DG, V1, V2, Weight),
-%%    io:format("Line: ~p~n", [Line]),
-    appmon_dg:eset(line, DG, E, Line).
-
-
-%% From is parent, To is child. If To is not a record then we are
-%% dealing with a link to a process on another node. Find a suitable
-%% place at the left margin and write the process name there and draw
-%% a line to it.
-%%
-draw_line(DG, From, To, foreign) ->
-    VD1 = appmon_dg:get(data, DG, From),
-    Y = find_foreign_place(VD1#vdata.y+0.5, foreign_places()),
-    add_foreign_place({From, To, foreign}, Y),
-%%    io:format("New Y: ~p~n", [Y]),
-    appmon_dg:set(x, DG, To, 0),
-    appmon_dg:set(y, DG, To, Y),
-    VD2 = appmon_dg:get(data, DG, To),
-    Coords = calc_coords(VD1, VD2, foreign),
-%%    io:format("Node coords: ~p~n", [Coords]),
-    L = gs:create(line, canvas(), [{coords, Coords} | line_opts(foreign)]),
-    T = gs:create(text, canvas(), [{coords, [{0, 5+scaley(Y)}]},
-				   {anchor, nw}, {fg, f_line_col()},
-%%				   {font, {screen, 10}}, 
-				   {text, To}]),
-    [L, T];
-
-draw_line(DG, From, To, Weight) ->
-    VD1 = appmon_dg:get(data, DG, From),
-    VD2 = appmon_dg:get(data, DG, To),
-    Coords = calc_coords(VD1, VD2, Weight),
-    gs:create(line, canvas(), [{coords, Coords} | line_opts(Weight)]).
-
-%%----------------------------------------------------------------------
-%%
-%% Line coordinate calculation
-%%
-%% Calculate coordinates for edges (links, lines). Primaries have a
-%% nice knee and secondaries are oriented differently. If weight is
-%% foreign then we will calculate a nice line to the left margin.
-%%
-calc_coords(From, To, foreign) ->
-    Y = scaley(To#vdata.y),
-    X1 = From#vdata.x+trunc(From#vdata.width/2),
-    Y1 = scaley(From#vdata.y)+radius(),
-    [{0, Y}, {X1-40, Y}, {X1, Y1}];
-calc_coords(From, To, primary) ->
-    X1 = From#vdata.x+trunc(From#vdata.width/2),
-    Y1 = scaley(From#vdata.y)+radius(),
-    
-    X2 = To#vdata.x+trunc(To#vdata.width/2),
-    Y2 = scaley(To#vdata.y)-radius(),
-    
-    Y3 = trunc((Y1+Y2)/2),
-    [{X1, Y1}, {X1, Y3}, {X2, Y3}, {X2, Y2}];
-
-calc_coords(V1, V2, _Weight) ->
-    Y1  = scaley(V1#vdata.y),
-    X1  = V1#vdata.x,
-    X1w = X1+V1#vdata.width,
-    Y2  = scaley(V2#vdata.y),
-    X2  = V2#vdata.x,
-    X2w = X2+V2#vdata.width,
-
-    if  Y1 == Y2 -> calc_u(X1, X1w, Y1, X2, X2w);
-	X1w < X2 -> calc_s(X1w, Y1, X2, Y2);
-	X2w < X1 -> calc_s(X1, Y1, X2w, Y2);
-	true ->
-	    D1 = abs(X1-X2), D2 = abs(X1w-X2w),
-	    if  D1 > D2 -> calc_rbrack(X1w, Y1, X2w, Y2);
-		true -> calc_lbrack(X1, Y1, X2, Y2)
-	    end
-    end.
-
-%% Calculates line coordinates that will go from bottom of one node to
-%% bottom of another on the same level. The line will form a nice "U".
-calc_u(X1, X1w, Y, X2, X2w) ->
-    X3 = trunc((X1+X1w)/2),
-    X4 = trunc((X2+X2w)/2),
-    Y2 = Y+radius(),
-    Y3 = Y2+20,
-    [{X3, Y2}, {X3, Y3}, {X4, Y3}, {X4, Y2}].
-
-%% Calculates line coordinates that will go from right (or left) side
-%% to right (or left) side, thus forming a "[" or a "]" (bracket).
-calc_rbrack(X1, Y1, X2, Y2) ->
-    X3 = 20 + if  X1 > X2 -> X1;
-		  true -> X2
-	      end,
-    [{X1, Y1}, {X3, Y1}, {X3, Y2}, {X2, Y2}].
-calc_lbrack(X1, Y1, X2, Y2) ->
-    X3 = -20 + if  X1 < X2 -> X1;
-		   true -> X2
-	      end,
-    [{X1, Y1}, {X3, Y1}, {X3, Y2}, {X2, Y2}].
-
-%% Calculates line coordinates that will form a nice "S"
-calc_s(X1, Y1, X2, Y2) ->
-    X3 = trunc((X1+X2)/2),
-    [{X1, Y1}, {X3, Y1}, {X3, Y2}, {X2, Y2}].
-
-
-%% Options for lines (edges, links)
-line_opts(foreign)	-> [{width, 2}, {smooth, true},  {fg, f_line_col()}];
-line_opts(primary)	-> [{width, 2}, {smooth, false}, {fg, line_col()}];
-line_opts(_)		-> [{width, 2}, {smooth, true}, {fg, sec_line_col()}].
-
-
-
-%%----------------------------------------------------------------------
-%%
-%% Handling of links to foreign processes
-%%
-%%----------------------------------------------------------------------
-dealloc_foreign(L) ->
-%%    io:format("deallocing foreign: ~p~n", [L]),
-    put(foreign_places, lists:keydelete(L, 1, foreign_places())).
-add_foreign_place(V, Y) ->
-%%    io:format("Adding foreign: ~p~n", [V]),
-    put(foreign_places, [{V, Y} | foreign_places()]).
-foreign_places() ->
-    get(foreign_places).
-init_foreign_places() ->
-    put(foreign_places, []).
-
-%% Find a good place for the foreign node
-find_foreign_place(StartY, L) ->
-    case lists:keysearch(StartY, 2, L) of
-	{value, _} -> find_foreign_place(StartY + 1, L);
-	_ -> StartY
-    end.
-    
-
-%%------------------------------------------------------------
-%%
-%% Graphical stuff
-%%
-
-setup_base_win(NodeName, AppName) ->
-    set_winroot(gs:start([{kernel,true}])),
-
-    W = ?MINWIDTH, H = ?MINHEIGHT,
-    
-    Name = "APPMON: " ++ atom_to_list(AppName) ++ " on " ++
-	atom_to_list(NodeName),
-
-    set_win(gs:create(window, winroot(), [{title, Name}, %%{bg, red},
-					  {x, 250}, {y, 100},
-					  {width, W}, {bg, win_col()},
-					  {height, H+?BUTTAREA_H}])),
-    %% standard buttons
-    mk_std_butts(win(), W),
-    set_canvas(gs:create(canvas, win(),[{x,0}, {y,?BUTTAREA_H}, 
-					{width, W}, {height, H}, 
-					{bg, bg()}, 
-					{buttonpress, true}])),
-    
-    set_old_win_size(width, gs:read(win(), width)),
-    set_old_win_size(height, gs:read(win(), height)),
-
-%%    gs:config(win(), {map, true}),		%Make win visible
-    ok.
-
-
-nice_line_coords(W, H) ->
-    [{0,H-10}, {W,H-10}].
-
-%%------------------------------
-%% Button stuff
-
-mk_butt_area(Win, W) ->
-    H = ?BUTTAREA_H,
-    F = gs:create(frame, Win,[{x,0}, {y,0}, %%{bg, frame_col()},
-			      {width,W}, {height,H}]),
-    C = gs:create(canvas,F,[{x,0}, {y,0}, {width, W}, {height, H-9}, 
-			    {bg, bg()}]),
-    L = gs:create(line,C,[{coords,nice_line_coords(W, H)}]),
-
-    MB = gs:create(menubar, Win, []),
-
-    FMB = gs:create(menubutton, MB, [{label, {text, "File"}}]),
-    FM = gs:create(menu, FMB, []),
-    gs:create(menuitem, FM, [{label, {text, ?CLOSETXT}}]),
-    
-    OMB = gs:create(menubutton, MB, [{label, {text, "Options"}}]),
-    OM = gs:create(menu, OMB, []),
-    gs:create(menuitem, OM, [{label, {text, ?REFRESHTXT}}]),
-    Group = now(),
-    gs:create(menuitem, OM, [{itemtype, separator}]),
-    gs:create(menuitem, OM, [{label, {text, ?SUPVIEWTXT}}, {itemtype, radio},
-			     {group, Group}]),
-    gs:create(menuitem, OM, [{label, {text, ?PROCVIEWTXT}}, {select, true}, 
-			     {group, Group}, {itemtype, radio}]),
-
-    HMB = gs:create(menubutton, MB, [{label, {text, "Help"}}, {side, right}]),
-    HM = gs:create(menu, HMB, []),
-    gs:create(menuitem, HM, [{label, {text, ?HELPTXT}}]),
-  
-    {F, C, L}.
-
-mk_std_butts(Win, W) ->
-    {F, C, L} = mk_butt_area(Win, W),
-    set_bframe(F), set_bcanvas(C), set_bline(L),
-
-    IButt = mk_mode_butt({text, "Info"}, {mode, info}, 10),
-    mk_mode_butt({text, "Send"}, {mode, send}, 90),
-    mk_mode_butt({text, "Trace"}, {mode, trace}, 170),
-    mk_mode_butt({text, "Kill"}, {mode, kill}, 250),
-
-    set_default_mode(IButt, info),
-    
-    true.
-
-select(Id) ->
-    gs:config(Id, {bg, sel_col()}),
-    set_selected(Id).
-
-deselect() ->
-    gs:config(selected(), {bg, de_sel_col()}).
-
-mk_mode_butt(Label, Data, X) ->
-    gs:create(button, bframe(), [{label, Label}, {x, X}, {y, 35},
-				 {data, Data}, {width, 70}, {height, 25}]).
-
-%%------------------------------------------------------------
-%% Graphical utilities
-
-mk_frame(P, X, Y, W, H, BG) ->
-    gs:create(frame, P, [{x, X}, {y, Y}, {width, W}, {height, H}, {bg, BG}]).
-    
-mk_butt(P, X, Y, W, H, Txt) ->
-    gs:create(button, P, [{x, X}, {y, Y}, {height, H}, {width, W}, 
-			  {label, {text, Txt}}]).
-
-mk_butt(P, X, Y, Txt) ->
-    mk_butt(P, X, Y, 70, 20, Txt).
-
-mk_label(P, X, Y, W, H, Txt, BG) ->
-    gs:create(label, P, [{x, X}, {y, Y}, {height, H}, {width, W}, 
-			 {label, {text, Txt}}, {bg, BG}]).
-
-mk_entry(P, X, Y, W, H, Txt, BG) ->
-    gs:create(entry, P, [{x, X}, {y, Y}, {height, H}, {width, W}, {text, Txt},
-			 {bg, BG}, {keypress, true}]).
-
-
-two_entries(Root, W, H, Name, LTxt1, LTxt2, StartTxt1, StartTxt2, BG) ->
-    Win = gs:create(window, Root, [{title, Name}, %%{bg, red},
-				   %%{x, X}, {y, Y},
-				   {width, W}, {bg, BG},
-				   {height, H}]),
-    F = mk_frame(Win, 0, 0, W, H, BG),
-
-    mk_label(F, 10, 10, 30, 20, LTxt1, BG),
-    mk_label(F, 10, 40, 30, 20, LTxt2, BG),
-
-    E1 = mk_entry(F, 40, 10, 120, 20, StartTxt1, BG),
-    E2 = mk_entry(F, 40, 40, 120, 20, StartTxt2, BG),
-
-    Ok = mk_butt(F, 170, 10, "Ok"),
-    Cn = mk_butt(F, 170, 40, "Cancel"),
-    gs:config(Win, {map, true}),
-
-    Ret = case catch two_entries_loop(E1, E2, Ok, Cn) of
-	      {P2, Msg} -> {P2, Msg};
-	      _Other ->
-		  false
-	  end,
-    gs:destroy(Win),
-    Ret.
-
-
-two_entries_loop(E1, E2, Ok, Cn) ->
-    receive
-	{gs, Ok, click, _, _} ->
-	    {gs:read(E1, text),
-	     gs:read(E2, text)};
-	{gs, E1, keypress, _, ['Return'|_]} ->
-	    {gs:read(E1, text),
-	     gs:read(E2, text)};
-	{gs, E2, keypress, _, ['Return'|_]} ->
-	    {gs:read(E1, text),
-	     gs:read(E2, text)};
-	{gs, _, keypress, _, _} ->
-	    two_entries_loop(E1, E2, Ok, Cn);
-	{gs, Cn, click, _, _} ->
-	    true
-    end.
-
-%%--------------------------------------------------------------------
-%%
-%% Resizing routines.
-%%
-%%	Resizing deals with a number of different interdependent
-%%	sizes. Top size is the window size. From window size all other
-%%	sizes are calculated, we call this the "leader" size. The
-%%	canvas is usually the same size as the window, except for the
-%%	row of buttons at the top of the windoww. The canvas is also
-%%	displaced when the tree is smaller than the minimum window
-%%	size.
-%%
-%%
-%%	Window size - the size of the outer window. Note that
-%%	provisions must be made for the button area at the top of the
-%%	window, this is called WinAdj. this is the only item taht
-%%	changes when the user manually resizes the window.
-%%
-%%	Canvas size - The size of the canvas, should be equal to
-%%	window size less the button area. Must be adjusted when the
-%%	window has been manually resized. The canvas also has a
-%%	scrollregion which must be maintained. Note that we could have
-%%	used the canvas size as "leading" size, but this did not work
-%%	since the canvas doesn't fill the complete window when the
-%%	tree is smaller than the window.
-%%
-%%	Tree size - The size of the tree. This may change whenever a
-%%	new tree is delivered from the info routine.
-%%
-%%	Dim - All these size adjustments are done in some dimension
-%%	(width or height).
-%%
-%%	Max, Min - The outmost window may not become larger than Max
-%%	size or smaller than Min size when resized by the tree
-%%	size. The user resizing is not restricted to these sizes.
-%%
-%% Scrollbars:
-%%
-%%	Scrollbars are used whenever necessary, whenever the tree size
-%%	is bigger than canvas size (in any dimension).
-%%
-%% Invariants:
-%%
-%%	The three sizes are not varied at the same time. When the
-%%	window is resized because of a new tree, then window and
-%%	canvas must be updated. When the user has resized, then only
-%%	the canvas must be changed (to fit in the window)
-%%
-%% Tree driven resize
-%%
-%%	This occurs when the tree has been updated. The window may
-%%	grow and shrink to fit the tree, but may not be smaller than
-%%	Min and not bigger than Max (scrollbars will be used instead)
-%%
-
-tree_driven_resize(TWidth, THeight) ->
-    gs:config(win(), {configure, false}),
-    Width = TWidth+20,
-    Height = scaley(THeight+1),
-    put({width, tree}, Width),
-    put({height, tree}, Height),
-    adjust_win(width, Width),
-    adjust_win(height, Height),
-    fit_tree_to_win(width, Width),
-    fit_tree_to_win(height, Height),
-    check_scroll_region(Width, Height, gs:read(canvas(), scrollregion)),
-    gs:config(win(), {configure, true}),
-    ok.
-
-
-%% Will adjust the window size to the tree size (given the max and min
-%% restrictions.
-adjust_win(Dim, TreeSize) ->
-    case get({Dim, user_resize}) of
-	true -> ok;
-	_ ->
-	    WinSize = gs:read(win(), Dim),%%get_dim(Dim, win()),
-	    case get_wanted_winsize(Dim, TreeSize) + winadj(Dim) of
-		WinSize -> ok;
-		NewSize -> 
-		    %%set(Dim, win(), NewSize+winadj(Dim))
-		    set_old_win_size(Dim, NewSize),
-		    gs:config(win(), {Dim, NewSize})
-	    end
-    end.
-
-get_wanted_winsize(Dim, Size) ->
-    Max = maxsize(Dim), Min = minsize(Dim),
-    if  Size > Max	-> Max;
-	Size < Min	-> Min;
-	true		-> Size
-    end.
-
-set_old_win_size(Dim, Size) -> put({Dim, winsize}, Size).
-old_win_size(Dim) -> get({Dim, winsize}).
-
-
-%%--------------------------------------------------------------------
-%%
-%% user_driven_resize
-%%
-%%	This is when the user drags the window to some size. This is
-%%	basically the same as a tree resize, only this time the window
-%%	itself must not be fiddled with. When the window has been
-%%	resized this way then normal tree driven resize is not allow
-%%	to alter the size in that dimension. User overrides.
-%%
-user_driven_resize(W, H) ->
-    gs:config(win(), {configure, false}),
-    check_user_resize(width, W),
-    check_user_resize(height, H),
-    check_scroll_region(get({width, tree}), get({height, tree}),
-			gs:read(canvas(), scrollregion)),
-    gs:config(win(), {configure, true}).
-
-check_user_resize(Dim, Size) ->
-    case old_win_size(Dim) of
-	Size -> false;
-	_ ->
-	    put({Dim, user_resize}, true),
-	    set_old_win_size(Dim, Size),
-	    fit_tree_to_win(Dim, get({Dim, tree}))
-    end.
-
-
-
-%%--------------------------------------------------------------------
-%%
-%% General resizing routines
-%%
-%% fit_tree_to_win - Will fit the canvas into a pre-sized window in
-%% one dimension.
-%%
-fit_tree_to_win(Dim, TreeSize) ->
-    Size = gs:read(win(), Dim) - winadj(Dim),
-    set_canvas_offset(Dim, Size, TreeSize),
-    set_button_width(Dim, Size),
-    if  TreeSize > Size ->
-	    gs:config(canvas(), {trans_dim2vh(Dim), trans_dim2enable(Dim)});
-	TreeSize < Size ->
-	    gs:config(canvas(), {trans_dim2vh(Dim), false});
-	true ->
-	    gs:config(canvas(), {trans_dim2vh(Dim), false})
-    end.
-
-
-%%------------------------------
-%% Set the canvas width and displacement in x.
-set_canvas_offset(height, Size, _) -> 
-    gs:config(canvas(), {height, Size});
-set_canvas_offset(width, Size, Size) -> 
-    gs:config(canvas(), [{x, 0}, {width, Size}]);
-set_canvas_offset(width, Size, TreeSize) when Size<TreeSize -> 
-    gs:config(canvas(), [{x, 0}, {width, Size}]);
-set_canvas_offset(width, Size, TreeSize) when Size>TreeSize-> 
-    Val = trunc((Size-TreeSize)/2),
-    gs:config(canvas(), [{x, Val}, {width, Size-Val}]).
-
-%%------------------------------
-%% Set the button area width
-set_button_width(height,_) -> ok;
-set_button_width(width, W) ->
-    gs:config(bcanvas(), [{width, W}]),
-    gs:config(bframe(), [{width, W}]),
-    gs:config(bline(), [{coords, nice_line_coords(W, ?BUTTAREA_H)}]).
-    
-
-%%------------------------------
-%% Update the scrollregion size if needed.
-check_scroll_region(W, H, {_, _, W, H}) -> ok;
-check_scroll_region(W, H, {_, _, _, _}) -> 
-    gs:config(canvas(), {scrollregion, {0, 0, W, H}}).
-
-
-%% Window sizing primitives
-winadj(width)	-> 0;
-winadj(height)	-> ?BUTTAREA_H.
-maxsize(width)	-> ?MAXWIDTH;
-maxsize(height)	-> ?MAXHEIGHT.
-minsize(width)	-> ?MINWIDTH;
-minsize(height)	-> ?MINHEIGHT.
-
-
-
-trans_dim2vh(width) -> hscroll;
-trans_dim2vh(height) -> vscroll.
-trans_dim2enable(width) -> bottom;
-trans_dim2enable(height) -> right.
-
-
-
-
-
-%%------------------------------------------------------------
-%% Global Window info
-
-winroot() ->		get(winroot).
-win() ->		get(win).
-canvas() ->		get(canvas).
-bframe() ->		get(bframe).
-bcanvas() ->		get(bcanvas).
-bline() ->              get(bline).
-set_winroot(X) ->	put(winroot, X).
-set_win(X) ->		put(win, X).
-set_canvas(X) ->	put(canvas, X).
-set_bframe(X) ->	put(bframe, X).
-set_bcanvas(X) ->	put(bcanvas, X).
-set_bline(X) ->		put(bline, X).
-
-sup_col()	-> ?darkkhaki.
-%%work_col()	-> ?orange.
-bg()		-> ?palegoldenrod.
-line_col()	-> ?peachpuff4. %% saddlebrown.darkgoldenrod
-f_line_col()	-> ?royalblue. %% saddlebrown.darkgoldenrod
-sec_line_col()	-> ?red.
-win_col()	-> bg(). %%darkolivegreen.
-
-sel_col()	-> ?darkgrey.
-de_sel_col()	-> ?lightgrey.
-set_selected(Id)-> put(selected, Id).
-selected()	-> get(selected).
-
-scaley(Y)	-> 55*Y.
-radius()	-> 10.
-
-destroy(undefined)	-> true;
-destroy(L) when is_list(L) -> lists:foreach(fun(X) -> destroy(X) end , L);	
-destroy(Win)		-> gs:destroy(Win).
-
diff --git a/lib/appmon/src/appmon_dg.erl b/lib/appmon/src/appmon_dg.erl
deleted file mode 100644
index f53defa946..0000000000
--- a/lib/appmon/src/appmon_dg.erl
+++ /dev/null
@@ -1,205 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-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%
-%%------------------------------------------------------------
-%%
-%% Digraph handling for process view GUI. Feeble attempt at data
-%% separation. Provides functional interface to the data structures
-%% vdata and edata, v for vertex and e for edge.
-%%
-%%------------------------------------------------------------
--module(appmon_dg).
-
--include("appmon_dg.hrl").
-
-%% Exports for vertices
--export([get/3, get/2, set/4, av/3, add/4, del/2, visited/3]).
-
-%% Exports for edges
--export([eget/2, eget/3, eset/4, eadd/4, edel/2, ae/3]).
-
-%% Exports for convenience
--export([print_dg/1]).
-
-
-%%------------------------------------------------------------
-
-
-eget(all, DG) ->
-    digraph:edges(DG).
-
-eget(data, DG, E) ->
-    case digraph:edge(DG, E) of
-	{_, _V1, _V2, Data} -> Data;
-	_Other    -> false
-    end;
-eget(edge, DG, {V1, V2}) ->
-    case digraph:edge(DG, {V1, V2}) of
-	{E, W1, W2, ED} -> {E, W1, W2, ED};
-	Other ->
-	    case digraph:edge(DG, {V2, V1}) of
-		{E, W1, W2, ED} -> {E, W1, W2, ED};
-		Other -> false
-	    end
-    end;
-
-%% Weight in edge name
-eget(edge, DG, {V1, V2, Weight}) ->
-    case digraph:edge(DG, {V1, V2, Weight}) of
-	{E, W1, W2, ED} -> {E, W1, W2, ED};
-	_Other -> false
-    end;
-eget(in, DG, V) ->
-    efilter(digraph:in_edges(DG, V)).
-
-efilter(Es) -> 
-    lists:filter(fun({_V1, _V2, primary}) -> true;
-		 (_E) -> false end,
-		 Es).
-
-eset(ref, DG, E, Ref) ->
-    {E2, _V1, _V2, D} = eget(edge, DG, E),
-    update_e(DG, E2, D#edata{ref=Ref});
-eset(line, DG, E, Line) ->
-    {E2, _V1, _V2, D} = eget(edge, DG, E),
-    update_e(DG, E2, D#edata{line=Line}).
-
-edel(DG, E) ->
-    digraph:del_edge(DG, E).
-
-eadd(DG, E, D, Ref) ->
-    case eget(edge, DG, E) of
-	{_, _, _, ED} when is_record(ED, edata), ED#edata.ref == Ref ->
-	    known;
-	{_, _, _, ED} when is_record(ED, edata), ED#edata.ref /= Ref ->
-	    update_e(DG, E, ED#edata{ref=Ref}),
-	    updated;
-	_Other ->
-	    ae(DG, E, D)
-    end.
-
-ae(DG, {V1, V2, Weight}, D) ->
-    digraph:add_edge(DG, {V1, V2, Weight}, V1, V2, D).
-
-update_e(DG, {V1, V2, Weight}, D) ->
-    digraph:del_edge(DG, {V1, V2, Weight}),
-    digraph:add_edge(DG, {V1, V2, Weight}, V1, V2, D).
-
-%% Filter destination vertex from a list of edges
-vfilter(Vs) ->
-    lists:map(fun({_V1, V2, _Weight}) -> V2;
-	      ({_V1, V2}) -> V2
-	     end, Vs).
-
-get(all, DG) ->
-    digraph:vertices(DG).
-
-get(data, DG, {V1, V2}) ->
-    case digraph:edge(DG, {V1, V2}) of
-	{_,_,_,Data} -> Data;
-	_Other    -> false
-    end;
-get(data, DG, V) ->
-    case digraph:vertex(DG, V) of
-	{_,Data} -> Data;
-	_Other    -> false
-    end;
-
-%% Return all children of vertex V (those which V has edges to)
-get(out, DG, V) ->
-    vfilter(efilter(digraph:out_edges(DG, V)));
-get(in, DG, V) ->
-    digraph:in_neighbours(DG, V);
-get(edges, DG, V) ->
-    digraph:edges(DG, V);
-get(w, DG, V) ->
-    Data = get(data, DG, V),
-    Data#vdata.width;
-get(x, DG, V) ->
-    Data = get(data, DG, V),
-    Data#vdata.x.
-
-set(type, DG, V, Type) ->
-    D = get(data, DG, V),
-    av(DG, V, D#vdata{type=Type});
-
-set(ref, DG, V, Ref) ->
-    D = get(data, DG, V),
-    av(DG, V, D#vdata{ref=Ref});
-
-set(y, DG, V, Y) ->
-    D = get(data, DG, V),
-    av(DG, V, D#vdata{y=Y});
-
-set(data, DG, V, D) when is_record(D, vdata)->
-    av(DG, V, D);
-
-set(x, DG, V, X) ->
-    D = get(data, DG, V),
-    if  D#vdata.x /= X -> 
-	    av(DG, V, D#vdata{x=X});
-	true -> true
-    end.
-
-visited(DG, {V1, V2}, Ref) ->			% for edge
-    D = eget(data, DG, {V1, V2}),
-    if  is_record(D, edata), D#edata.ref == Ref -> true;
-	true -> false
-    end;
-visited(DG, V, Ref) ->
-    D = get(data, DG, V),
-    if  is_record(D, vdata), D#vdata.ref == Ref -> true;
-	true -> false
-    end.
-
-add(DG, V, D, Ref) ->
-    case get(data, DG, V) of
-	D2 when is_record(D2, vdata), D2#vdata.ref==Ref -> 
-	    io:format("Ooops in ~p:add vertex~n", [?MODULE]),
-	    known;
-	D2 when is_record(D2, vdata) -> 
-	    %%io:format("~p touch vertex ~p~n", [self(), V]),
-	    set(ref, DG, V, Ref), 
-	    set(type, DG, V, D#vdata.type), 
-	    save_coords(DG, V),
-	    updated;
-	_Other -> 
-	    av(DG, V, D), added
-    end.
-
-save_coords(DG, V) ->
-    D = get(data, DG, V),
-    D2 = D#vdata{origx=D#vdata.x, origy=D#vdata.y},
-    av(DG, V, D2).
-
-del(DG, V) ->
-    digraph:del_vertex(DG, V).
-
-
-av(DG, V, D) ->
-    digraph:add_vertex(DG, V, D).
-
-print_dg(DG) ->
-    io:format("Vertices:~n", []),
-    lists:foreach(fun(V) -> io:format("  ~p ~p~n", 
-				      [V, get(data, DG, V)]) end,
-		  get(all, DG)),
-    io:format("Edges:~n", []),
-    lists:foreach(fun(V) -> io:format("  ~p ~p~n",
-				      [V, eget(edge, DG, V)]) end,
-		  eget(all, DG)),
-    true.
diff --git a/lib/appmon/src/appmon_dg.hrl b/lib/appmon/src/appmon_dg.hrl
deleted file mode 100644
index c3485cf1fd..0000000000
--- a/lib/appmon/src/appmon_dg.hrl
+++ /dev/null
@@ -1,45 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-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%
-
-
-
-%%
-%% The dg package record definitions
-%%
-%% This is the declarations of the datastructures used for the
-%% application monitoring software. All fields are reserved for the
-%% implementation except those stated otherwise
-%%
-
--record(vdata, {ref,				%
-		type,				%
-		x,				%
-		origx=-1,			%
-		y,				%
-		origy=-1,			%
-		txt="",				% Set by user
-		width=0,			% Set by user
-		sym_obj=undefined,		%
-		txt_obj}).			%
-
-
-
--record(edata, {ref,				%
-		line,				%
-		weight}).			%
-
diff --git a/lib/appmon/src/appmon_lb.erl b/lib/appmon/src/appmon_lb.erl
deleted file mode 100644
index 3ab6ce58e6..0000000000
--- a/lib/appmon/src/appmon_lb.erl
+++ /dev/null
@@ -1,696 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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%
-
-%%% Due to the fact that the application buttons in the appmon window
-%%% gets too small to read when the number of applications increases,
-%%% this listbox window has been created. 
-%%% Because of the limitations of GS a listbox was chosen to keep
-%%% the nodes and applications. When it's possible to scroll a frame I
-%%% think one should put in scrollbars in the appmon main window.
-%%% The listbox solution is too slow with lots of applications.
-%%%
-%%% In the listbox the nodes are shown with their applications beneith.
-%%% By double clicking on an application name, or a single click and
-%%% then pressing the load button, its application window is started.
-
--module(appmon_lb).
--compile([{nowarn_deprecated_function,{gs,button,3}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,listbox,3}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
--export ([
-	  start/1, 
-	  stop/1, 
-	  add_node/2,
-	  remove_node/2,
-	  add_apps/3,
-	  remove_app/3,
-	  open_win/2,
-	  update_status/3
-	 ]).
-
--export ([init/1]).
-
--define (LB_W, 200).                     % List box width
--define (LB_H, 400).                     % List box height
--define (BUTT_W, 100).
--define (WIN_W, ?LB_W + ?BUTT_W + 25).   % Window width
--define (WIN_H, ?LB_H + 20).             % Window height
-
-
-%%% #node{} 
-%%%
-%%% The record 'node' contains the name of the node, its status and 
-%%% the applications running on that node.
-%%%
-%%% node    ==  atom ()
-%%% status  ==  alive  ||  dead
-%%% apps    ==  [#app{}]
-%%%
-
--record (node, {node,             %% Name of the node
-		status = alive,
-		apps = []}). 
-
-%%% #app{}
-%%%
-%%% The record 'app' contains the name of the application and its pid
-%%%
-%%% app  ==  atom ()
-%%% pid  ==  pid ()
-%%%
-
--record (app, {app,
-		pid}).
-
-
-%%% #win{}
-%%%
-%%% The record 'win' contains the pid of the listbox window,
-%%% its x and y position, its width and height.
-%%%
-%%% pid     ==  win_closed  ||  pid ()
-%%% x       ==  integer ()
-%%% y       ==  integer ()
-%%% width   ==  integer ()
-%%% height  ==  integer ()
-%%%
-
--record (win, {pid = win_closed,
-	       x = 50, 
-	       y = 50,
-	       width = ?WIN_W,
-	       height = ?WIN_H}).
-
-
-
-%%% Every function in the interface is called with the pid 
-%%% of this recieve loop, called 'LbPid'.
-%%%
-
-
-%%% start  /1
-%%%
-%%% start returns the pid of the spawned receive loop or 
-%%% it will call exit/2 after a timeout.
-%%%
-%%% Pre:
-%%%    CallingPid  ==  pid ()
-%%%
-%%% Def:
-%%%    pid ()  ||  exit/2
-%%%
-
-start (CallingPid) ->
-    PidInit = spawn (?MODULE, init, [CallingPid]),
-
-    %% Wait for a initialization completion message from
-    %% the spawned process before returning its Pid.
-
-    receive
-	{initialization_complete, PidInit} ->
-	    PidInit
-    
-	    %% (Conditional) Failure to start within the time limit 
-	    %% will result in termination (Timeout may be infinite).
-
-    after
-	60000 ->
-	    exit (PidInit, kill),
-	    exit ({startup_timeout, ?MODULE})
-    end.
-
-
-
-%%% stop  /1
-%%%
-%%% stop exits the receive loop
-%%%
-%%% Post:
-%%%    exiting the receive loop
-%%%
-
-stop (LbPid) ->
-    call (LbPid, stop).
-
-
-
-%%% add_node  /2
-%%%
-%%% add_node adds the given node to the DB list.
-%%%
-%%% Pre:
-%%%    Node  ==  atom ()
-%%%
-%%% Post:
-%%%    Node is added to the DB list
-%%%
-
-add_node (LbPid, Node) ->
-    call (LbPid, {add_node, Node}).
-
-
-
-%%% remove_node  /2
-%%%
-%%% remove_node removes the given node from the DB list.
-%%%
-%%% Pre:
-%%%    Node  ==  atom ()
-%%%
-%%% Post:
-%%%    Node is removed from the DB list
-%%%
-
-remove_node (LbPid, Node) ->
-    call (LbPid, {remove_node, Node}).
-
-
-
-%%% add_apps  /3
-%%%
-%%% add_apps add the given applications to the given 
-%%% node in the DB list.
-%%%
-%%% Pre:
-%%%    Apps  ==  [App]
-%%%    App   ==  {Name, Pid}
-%%%    Name  ==  atom ()
-%%%    Pid   ==  pid ()
-%%%    Node  ==  atom ()
-%%%
-%%% Post:
-%%%    Node#node{apps = Apps}
-%%%
-
-add_apps (LbPid, Apps, Node) ->
-    call (LbPid, {add_apps, Apps, Node}).
-
-
-
-%%% remove_app  /3
-%%%
-%%% remove_app remove the given application from the 
-%%% given node in the DB list.
-%%%
-%%% Pre:
-%%%    App   ==  atom ()
-%%%    Node  ==  atom ()
-%%%
-%%% Def:
-%%%    Node#node{apps = OldApps - App}
-%%%
-
-remove_app (LbPid, App, Node) ->
-    call (LbPid, {remove_app, App, Node}).
-
-
-
-%%% open_win  /3
-%%%
-%%% open_win opens the listbox window with the given nodes
-%%% and their applications.
-%%%
-%%% Pre:
-%%%    Nodes_apps  ==  [{Node, Status, Apps}]
-%%%    Node        ==  atom ()
-%%%    Status      ==  alive  ||  dead
-%%%    Apps        ==  [App]
-%%%    App         ==  {AppName, AppPid}
-%%%    AppName     ==  atom ()
-%%%    AppPid      ==  pid ()
-%%%
-%%% Post:
-%%%    Window with listbox
-%%%
-
-open_win (LbPid, Nodes_apps) ->
-    call (LbPid, {open_win, Nodes_apps}).
-
-
-
-%%% update_status  /3
-%%%
-%%% update_status changes the status for the given node.
-%%%
-%%% Pre:
-%%%    Node    ==  atom ()
-%%%    Status  ==  alive  ||  dead
-%%%
-%%% Def:
-%%%    Node#node{status = Status}
-%%%
-
-update_status (LbPid, Node, Status) ->
-    call (LbPid, {update_status, Node, Status}).
-
-
-
-%%% call  /2
-%%%
-%%% call sends the given action to the listbox receive loop.
-%%%
-%%% Pre: 
-%%%    Action  ==  atom ()  ||  tuple ()
-%%%
-
-call (LbPid, Action) ->
-    LbPid ! Action. 
- 
-
-
-%%% init  /1
-%%%
-
-init (CallingPid) ->
-    CallingPid ! {initialization_complete, self ()},
-    loop (#win{}, []).
-
-
-
-%%% loop  /2
-%%%
-%%% loop is the recive loop for the listbox window process.
-%%%
-%%% Pre:
-%%%    Win   ==  #win{}
-%%%    Data  ==  [#node{}]
-%%%
-
-loop (Win, Data) ->
-    receive
-	{add_node, Node} ->
-	    NewData = add_node_1 (Node, Data),
-	    update (NewData, Win#win.pid),
-	    loop (Win, NewData);
-	
-	{remove_node, Node} ->
-	    NewData = dead_node (Node, Data),
-	    update (NewData, Win#win.pid),
-	    loop (Win, NewData);
-
-	{add_apps, Apps, Node} ->
-	    NewData = add_apps_1 (Apps, Node, Data),
-	    update (NewData, Win#win.pid),
-	    loop (Win, NewData);
-	
-	{remove_app, App, Node} ->
-	    NewData = remove_app_1 (App, Node, Data),
-	    update (NewData, Win#win.pid),
-	    loop (Win, NewData);
-	
-	{open_win, Nodes_apps} ->
-	    NewData = parse_data ([], Nodes_apps),
-	    NewWin = Win#win{pid = init_win ({Win#win.x, Win#win.y})},
-	    update (NewData, NewWin#win.pid),
-	    loop (NewWin, NewData);
-	    
-	{update_status, Node, Status} ->
-	    NewData = update_status_1 (Node, Status, Data),
-	    update (NewData, Win#win.pid),
-	    loop (Win, NewData);
-	
-	stop ->
-	    true;
-
-
-	{gs, _Id, destroy, _D, _Arg} -> 
-	    bye;
-
-	{gs, _Id, configure, _D, [W, H | _]} ->
-	    NewWin = configure (Win#win.pid, W, H),
-	    loop (NewWin, Data);
-
-	{gs, lb, doubleclick, _, _Txt} ->
-	    load_app (gs:read (lb, selection), Data),
-	    loop (Win, Data);
-	    
-	{gs, lb, click, _, _Txt} ->
-	    loop (Win, Data);
-
-	{gs, close, click, _D, _Arg} -> 
-	    case Win#win.pid of
-		win_closed ->
-		    true;
-		
-		_opened ->
-		    gs:destroy (Win#win.pid)
-	    end,
-	    loop (#win{}, Data);
-
-	{gs, load, click, _D, _Txt} ->
-	    load_app (gs:read (lb, selection), Data),
-	    loop (Win, Data);
-	
-	{gs, clear, click, _D, _Txt} ->
-	    gs:config (lb, {selection, clear}),
-	    loop (Win, Data);
-	
-
-	_ ->
-	    loop (Win, Data)
-    end.
-
-
-
-%%% init_win  /1
-%%%
-
-init_win ({X, Y}) ->
-    GS = gs:start (),
-
-    Win = gs:window (win, GS, [{x, X},
-			       {y, Y},
-			       {width, ?WIN_W},
-			       {height, ?WIN_H},
-			       {title,"Appmon: nodes and applications"},
-			       {configure, true}]),
-
-    gs:listbox (lb, Win, [{x, 5},
-			  {y, 10},
-			  {width, ?LB_W},
-			  {height, ?LB_H},
-			  {vscroll, right},
-			  {hscroll, bottom},
-			  {selectmode, single},
-			  {click, true},
-			  {doubleclick, true}]),
-
-    gs:button (load, Win, [{x, ?WIN_W - ?BUTT_W - 10},
-			    {y, ?WIN_H - 120},
-			    {width, ?BUTT_W},
-			    {label, {text, "Load"}}]),
-
-    gs:button (clear, Win, [{x, ?WIN_W - ?BUTT_W - 10},
-			    {y, ?WIN_H - 80},
-			    {width, ?BUTT_W},
-			    {label, {text, "Clear"}}]),
-
-    gs:button (close, Win, [{x, ?WIN_W - ?BUTT_W - 10},
-			   {y, ?WIN_H - 40},
-			   {width, ?BUTT_W},
-			   {label, {text, "Close"}}]),
-
-    gs:config (Win, {map, true}),
-    Win.
-
-
-			  			 
-%%% add_node_1  /2
-%%%
-%%% add_node adds the given node in the given window 
-%%% with its appications in a listbox.
-%%%
-
-add_node_1 (Node, []) ->
-    [new_node (Node)];
-
-add_node_1 (Node, [H | T]) ->
-    T1 = lists:keysort (#node.node, [new_node (Node) | T]),
-    [H | T1].
-
-
-
-%%% dead_node  /2
-%%%
-%%% dead_node returns a list with the given node's 
-%%% status changed to dead.
-%%%
-
-dead_node (Node, Data) ->
-    case lists:keysearch (Node, #node.node, Data) of
-	{value, Node_rec} ->
-	    L = Node_rec#node.apps,
-	    lists:keyreplace (Node, #node.node, 
-			      Data, new_node (Node, dead, L));
-	
-	_false ->
-	    Data
-    end.
-
-    
-
-
-
-%%% add_apps_1  /3
-%%%
-%%% add_apps_1 returns a list with the given application 
-%%% into the old list inserted.
-%%%
-
-add_apps_1 (Apps, Node, Data) ->
-    case lists:keysearch (Node, #node.node, Data) of
-	{value, _Node_rec} ->
-	    NewApps = parse_apps (Apps, []),
-	    lists:keyreplace (Node, #node.node, 
-			      Data, new_node (Node, NewApps));
-	
-	_false ->
-	    Data
-    end.
-
-
-
-%%% remove_app_1  /3
-%%%
-%%% remove_app_1 returns a list with the given application
-%%% removed from the old list.
-%%%
-
-remove_app_1 (App, Node, Data) ->
-    
-    case lists:keysearch (Node, #node.node, Data) of
-	{value, Node_rec} ->
-	    L = Node_rec#node.apps,
-	    L2 = lists:keydelete (App, #app.app, L),
-	    lists:keyreplace(Node, #node.node, Data, new_node(Node,L2));
-	
-	_false ->
-	    Data
-    end.
-
-
-
-%%% configure  /3
-%%%
-%%% configure returns a win record after the window has been
-%%% configured.
-%%%
-
-configure (WPid, W, H) ->
-    X = gs:read (WPid, x),
-    Y = gs:read (WPid, y),
-
-    gs:config (lb, [{width, W - ?BUTT_W - 25}, {height, H - 20}]),
-    gs:config (load, [{x, W - ?BUTT_W - 10}, {y, H - 120}]),
-    gs:config (clear, [{x, W - ?BUTT_W - 10}, {y, H - 80}]),
-    gs:config (close, [{x, W - ?BUTT_W - 10}, {y, H - 40}]),
-    
-    #win{pid = WPid, x = X, y = Y, width = W, height = H}.
-
-    
-
-
-
-%%% load_app  /2
-%%%
-%%% load_app opens the application window by calling 
-%%% the appmon_a module.
-%%%
-
-load_app ([], _Data) ->     %% no application chosen
-    ok;
-
-load_app ([Index], Data) ->
-    App = gs:read (lb, {get, Index}),
-    
-    case string:substr (App, 1, 3) of
-	"   " ->
-	    AppName = list_to_atom (string:substr (App, 4)),
-	    
-	    case get_node (AppName, Index, Data) of
-		no_node ->
-		    ok;
-
-		NodeName ->
-		    appmon_a:start (NodeName, AppName)
-	    end;
-
-	_ ->
-	    ok
-    end.
-
-
-
-%%% update_status_1  /3
-%%%
-%%% update_status_1 returns a list with the given 
-%%% node's status updated.
-%%%
-
-update_status_1 (Node, Status, Data) ->
-    case lists:keysearch (Node, #node.node, Data) of
-	{value, Node_rec} ->
-	    lists:keyreplace (Node, 
-			      #node.node, 
-			      Data, 
-			      new_node(Node,Status,Node_rec#node.apps));
-
-	_not_found ->
-	    Data
-    end.
-
-
-
-%%% update  /2
-%%%
-%%% update updates the listbox with new data.
-%%%
-
-update (_Data, win_closed) ->
-    true;
-
-update (Data, _Win) ->
-    gs:config (lb, clear),
-    lb_print (Data).
-
-
-
-%%% lb_print  /1
-%%%
-%%% lb_print prints the list into the listbox.
-%%%
-
-lb_print ([]) ->
-    ok;
-
-lb_print ([#node{node = Node, status = Status, apps = Apps} | T]) ->
-    Str = io_lib:format ("~p (~p)", [Node, Status]),
-    gs:config (lb, {add, Str}),
-
-    case Status of
-	alive ->
-	    lb_print_apps (Apps);
-
-	_dead ->
-	    gs:config (lb, {add, ""}),
-	    ok
-    end,
-
-    lb_print (T).
-
-
-
-%%% lb_print_apps  /1
-%%%
-%%% lb_print_apps prints the applications into the listbox.
-%%%
-
-lb_print_apps ([]) ->
-    ok;
-
-lb_print_apps ([#app{app = App} | T]) ->
-    Str = io_lib:format ("   ~p", [App]),
-    gs:config (lb, {add, Str}),
-    lb_print_apps (T).
-
-
-
-%%% new_node  /1, 2, 3
-%%%
-%%% new_node returna a new node record constructed 
-%%% with the given data
-%%%
-
-new_node (Node) ->
-    #node{node = Node}.
-
-new_node (Node, Apps) ->
-    #node{node = Node, apps = Apps}.
-
-new_node (Node, Status, Apps) ->
-    #node{node = Node, status = Status, apps = Apps}.
-
-
-
-%%% new_app  /2
-%%%
-%%% new_app returns a new application record 
-%%% constructed with the given data.
-%%%
-
-new_app (App, Pid) ->
-    #app{app = App, pid = Pid}.
-
-
-
-%%% parse_apps  /2
-%%%
-%%% parse_apps returns a list of application records.
-%%%
-
-parse_apps ([], [H | T]) ->
-    [H | lists:keysort (#app.app, T)];
-
-parse_apps ([App | T], L) ->
-    Pid = element (1, App),
-    Name = element (2, App),
-    parse_apps (T, [new_app (Name, Pid) | L]). 
-
-
-
-%%% get_node  /3
-%%%
-%%% get_node returns the node from the given list 
-%%% or else no_node if it doesn't exists.
-%%%
-
-get_node (_App, _Index, []) ->
-    no_node;
-
-get_node (App, Index, [Node | T]) ->
-    Length = length (Node#node.apps) + 1,
-
-    case Length < Index of
-	true ->
-	    get_node (App, Index - Length, T);
-
-	false ->
-	    Node#node.node
-    end.
-
-
-
-%%% parse_data  /2
-%%%
-%%% parse_data returns a list with node records.
-%%%
-
-parse_data (Data, []) ->
-    Data;
-
-parse_data (Data, [{Node, Status, Apps} | T]) ->
-    Apps_1 = parse_apps (Apps, []),
-    parse_data ([new_node (Node, Status, Apps_1) | Data], T).
-
-    
-
diff --git a/lib/appmon/src/appmon_place.erl b/lib/appmon/src/appmon_place.erl
deleted file mode 100644
index fe1e909d7c..0000000000
--- a/lib/appmon/src/appmon_place.erl
+++ /dev/null
@@ -1,192 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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%
-%%------------------------------------------------------------
-%%
-%% Places a Digraph in a tree-like manner. The vertices in the digraph
-%% is updated with x and y positions. The operation is not atomic. The
-%% digraph may be cyclic but edges must then have been labeled primary
-%% or secondary and the set of primary links must make up a non-cyclic
-%% graph (a tree).
-%%
-%%
-%%		IMPLEMENTATION DETAIL
-%%		---------------------
-%%
-%%		The placement algorithm is straightforward, place the
-%%		nodes in the vertical plane (y-plane) and then place
-%%		nodes in the horisontal plane (x-plane).
-%%
-%%		First all nodes are placed in the y (vertical) plane
-%%		by a standard traversing of the tree. We then place
-%%		the tree in the x (horisontal) plane. Each node is
-%%		placed in the middle of its children as far to the
-%%		left as possible, preferably at the left margin. Two
-%%		things can make a node not be placed at the left
-%%		margin and that is the case when a previous node has
-%%		been placed at the same vertical level as the node we
-%%		are trying to place (thus forcing a placement further
-%%		to the right), and the second case is when the middle
-%%		of the subtree of the node is not at the left margin
-%%		(which it only is when the subtree is empty). The
-%%		algorithm obviously depends on keeping track of the
-%%		rightmost positions at all depths, and this
-%%		information is also usefull when calculating the width
-%%		of the tree.
-%%
-%%
-%%
-%%------------------------------------------------------------
-
-
-
--module(appmon_place).
-
--export([place/2]).
-
--include("appmon_dg.hrl").
-
-
--import(lists, [foreach/2, foldl/3]).
-
-
-place(DG, Root) ->
-    case appmon_dg:get(data, DG, Root) of
-	false -> [0];
-	_Other -> 
-	    placey(DG, Root, 1),
-	    placex(DG, Root, [])
-    end.
-
-
-%%------------------------------------------------------------
-%%
-%%
-%%	Placing a graph in y plane
-%%	--------------------------
-%%
-%%	Place nodes in the graph in the y plane rather stupidly
-%%
-
-placey(DG, V, Y) ->
-    appmon_dg:set(y, DG, V, Y),
-    Y1 = Y+1,
-    foreach(fun(C) -> placey(DG, C, Y1) end, appmon_dg:get(out, DG, V)).
-
-
-
-
-%%------------------------------------------------------------
-%%
-%%
-%%	Place a tree in the x plane
-%%	---------------------------	
-%%
-%%	Place nodes in the tree in the x plane. The goal of the x
-%%	placement is to place all nodes as far to the left as possible
-%%	while maintaining a nice tree shape.
-%%
-%%	To place a node we must first place its children, the
-%%	intention is to place the current node in the middle and above
-%%	its children. The calc_mid function will place the node in the
-%%	middle of its children. If the node should be placed further
-%%	to the right than the middle of its children, then its
-%%	children are moved DeltaX positions to be balanced under the
-%%	node.  Thus at the end the node and its children form a nice
-%%	looking tree.
-%%
-%%	The function also maintains the 'rightmost x on each level'
-%%	list LastX by putting its own position on top of the list
-%%
-%%
-
-placex(DG, V, LastX) ->
-    Ch = appmon_dg:get(out, DG, V),
-    ChLX = foldl(fun(C, Accu) -> placex(DG, C, Accu) end,
-		 tll(LastX),
-		 Ch),
-    
-    Width	= appmon_dg:get(w, DG, V),
-    MyX		= calc_mid(DG, Width, Ch),
-    DeltaX	= calc_delta(MyX, hdd(LastX)+spacex()),
-
-    appmon_dg:set(x, DG, V, MyX),
-    move(DG, V, [MyX+Width | ChLX], DeltaX).
-
-
-%%------------------------------------------------------------
-%%
-%%
-%%	Move a subtree DeltaX positions to the right
-%%	--------------------------------------------
-%%
-%%	Used when moving children to balance under an already placed
-%%	parent. Note that the correct LastX depends on the ordering of
-%%	the children which must be the same as when the children were
-%%	first placed. It must be ensured that hdd(NewLastX) is the
-%%	same as hdd(NewLastX)+DeltaX. If the order of children is
-%%	preserved then so is hdd(LastX). Another solution would be to
-%%	set hdd(LastX) from the parent
-%%
-%%	Note the two base clauses, one for the no-children case and
-%%	one optimisation clause (unneccessary perhaps) for DeltaX==0
-%%
-
-move(_DG, _L, LastX, 0) -> LastX;
-move(DG, V, LastX, DeltaX) -> move2(DG, V, LastX, DeltaX).
-
-move2(DG, V, LastX, DeltaX) ->
-    NewX = appmon_dg:get(x, DG, V)+DeltaX,
-    appmon_dg:set(x, DG, V, NewX),
-    ChLX = foldl(fun(C, LX) -> move2(DG, C, LX, DeltaX) end,
-		 tll(LastX), 
-		 appmon_dg:get(out, DG, V)),
-    [erlang:max(NewX+appmon_dg:get(w, DG, V), hdd(LastX)) | ChLX].
-
-
-%%------------------------------------------------------------
-%%
-%%
-%%	Calculate the middle position of the children
-%%	---------------------------------------------
-%%
-%%	Calculates the mid x position for a list of children. This
-%%	position is later compared to the position dictated by LastX
-%%	in calc_delta.
-
-calc_mid(_DG, _Width, []) -> 0;
-calc_mid(DG, Width, ChList) ->
-    LeftMostX = appmon_dg:get(x, DG, hd(ChList)),
-    Z2 = lists:last(ChList),
-    RightMostX = appmon_dg:get(x, DG, Z2)+appmon_dg:get(w, DG, Z2),
-    trunc((LeftMostX+RightMostX)/2)-trunc(Width/2).
-
-calc_delta(Mid, Right) ->    
-    if  Right>Mid	-> Right-Mid;
-	true		-> 0
-    end.
-
-
-
-%% Special head and tail
-%% Handles empty list in a non-standard way
-tll([]) -> [];
-tll([_|T]) -> T.
-hdd([]) -> 0;
-hdd([H|_]) -> H.
-
-spacex() -> 20.					% Should be macro??
diff --git a/lib/appmon/src/appmon_txt.erl b/lib/appmon/src/appmon_txt.erl
deleted file mode 100644
index 056265af90..0000000000
--- a/lib/appmon/src/appmon_txt.erl
+++ /dev/null
@@ -1,307 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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%
-%%------------------------------------------------------------
-%%
-%% Simple text viewer
-%%
-%%------------------------------------------------------------
-
--module(appmon_txt).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,1}}]).
--export([start/0, start/1, print/1, fprint/1]).
-
-%% gen_server stuff
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2]).
-
--define(LOADTXT, "Load file").
--define(SAVETXT, "Save file").
--define(SAVEASTXT, "Save as").
--define(CLOSETXT, "Close").
--define(HELPTXT, "Help").
-
-%%------------------------------------------------------------
-%%
-%% start/0 starts an open text viewer that can be filled with
-%% whatever.
-%%
-%%------------------------------------------------------------
-start() ->
-    start([]).
-
-%%------------------------------------------------------------
-%%
-%% start(ListOfOptions) starts an open text viewer with options
-%%
-%% Options can be
-%% {file, FileName}	- insert contents of file
-%% locked		- the text cannot be edited
-%% {text, Text}		- insert text at startup
-%%
-%%------------------------------------------------------------
-start(Opts) ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, Opts, []).
-
-%% Start a text viewer if necessary
-print(Txt) ->
-    catch start(),
-    gen_server:call(?MODULE, {add_txt, Txt}),
-    ok.
-
-fprint(File) ->
-    catch start(),
-    gen_server:call(?MODULE, {add_file, File}),
-    ok.
-
-
-%%------------------------------------------------------------
-%% gen server admin
-
-init(Opts) ->
-    process_flag(trap_exit, true),
-    setup_base_win(),
-    default_status(),
-    setup_opts(Opts),
-    {ok, []}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-%%------------------------------------------------------------
-%% gen server stuff
-handle_call({add_txt, Txt}, _From, State) ->
-    do_insert_text(Txt),
-    scroll_to_last_line(),
-    {reply, ok, State};
-handle_call({add_file, FileName}, _From, State) ->
-    do_load_file(FileName),
-    {reply, ok, State};
-handle_call(_Request, _From, State) ->
-    {reply, ok, State}.
-handle_cast(_Request, State) ->
-    {noreply, State}.
-handle_info({gs, _, click, _, [?CLOSETXT|_]}, State) ->
-    {stop, normal, State};
-handle_info({gs, _, click, _, [?LOADTXT|_]}, State) ->
-    ui_load(),
-    {noreply, State};
-handle_info({gs, _, configure, _, [W, H | _]}, State) ->
-    resize(W, H),
-    {noreply, State};
-
-handle_info({gs, _, destroy, _, _}, State) ->
-    {stop, normal, State};
-handle_info(Request, State) ->
-    io:format("~p got info: ~p~n", [self(), Request]),
-    print_status("Not implemented"),
-    {noreply, State}.
-
-
-%%------------------------------------------------------------
-%% Handle options
-
-setup_opts([Opt|Opts]) -> 
-    setup_opt(Opt),
-    setup_opts(Opts);
-setup_opts([]) -> ok.
-
-setup_opt(Opt) ->
-    case Opt of
-	{file, FileName} ->
-	    do_load_file(FileName);
-	locked ->
-	    do_lock();
-	{text, Text} ->
-	    do_insert_text(Text);
-	_Other ->
-	    ok
-    end.
-
-do_load_file(FileName) ->
-    case catch i_load_file(FileName) of
-	ok ->
-	    default_status();
-	_Other -> 
-	    print_status(lists:append(["File not found: ", FileName]))
-    end.
-
-i_load_file(FileName) ->
-    {ok, Bin} = file:read_file(FileName),
-    L = binary_to_list(Bin),
-    i_do_clear(),
-    do_insert_text(L),
-    ok.
-
-ui_load() ->
-    Title = "Load file",
-    Files = get_file_list(),
-    case catch ui_list_dialog(Title, "File: ", Files) of
-	{ok, FileName} ->
-	    do_load_file(FileName);
-	_Other ->
-	    print_status("Load cancelled")
-    end.
-
-get_file_list() ->
-    case file:list_dir(".") of
-	{ok, FileList} -> lists:sort(FileList);
-	_Other -> []
-    end.
-
-do_insert_text(Text) ->
-    gs:config(editor(), {insert, {'end', Text}}),
-    ok.
-
-%% Scrolls editor to show the last rows
-scroll_to_last_line() ->
-    H = gs:read(editor(), size),
-    R = gs:read(editor(), height),
-    TopRow = H-R/15,
-    if  TopRow > 0 -> gs:config(editor(), {vscrollpos, TopRow});
-	true       -> gs:config(editor(), {vscrollpos, 0})
-	end,
-    ok.
-
-do_lock() ->    
-    gs:config(editor(), {enable, false}).
-
-i_do_clear() ->
-    gs:config(editor(), clear).
-
-%%------------------------------------------------------------
-%% Graphical stuff
-
-label_h() -> 20.
-menu_h() -> 29.
-
-setup_base_win() ->
-    H = 400, W=580,
-    LabelHeight=label_h(), MenuHeight=menu_h(),
-
-    F = gs:start([{kernel,true}]),
-    set_winroot(F),
-
-    Win = gs:create(window, F, [{width, W}, {height, H}, 
-				{title,"APPMON: Process Information"}]),
-
-    E = gs:create(editor, Win, [{x, 0}, {y, MenuHeight}, 
-				{width, W}, 
-				{height, H-MenuHeight-LabelHeight-1}, 
-				{vscroll, right}]),
-    set_editor(E),
-
-    L = gs:create(label, Win, [{x, 0}, {y, H-LabelHeight}, 
-			       {height,LabelHeight }, {width, W}, 
-			       {align, w}]),
-    set_status(L),
-    print_status("Loading"),
-
-    gs:config(Win, {map, true}),
-
-    MB = gs:create(menubar, Win, []),
-
-    FMB = gs:create(menubutton, MB, [{label, {text, "File"}}]),
-    FM = gs:create(menu, FMB, []),
-    gs:create(menuitem, FM, [{label, {text, ?CLOSETXT}}]),
-
-    gs:config(Win, {configure, true}),
-    ok.
-
-resize(W, H) ->
-    gs:config(editor(), [{width, W}, {height, H-label_h()-menu_h()}]),
-    gs:config(status(), [{y, H-label_h()}, {width, W}]),
-    ok.
-
-%%------------------------------------------------------------
-%% ui_list_dialog(
-%%
-%%	Traditional dialog with a list box and a selection field that
-%%	is updated from the list box.
-%%
-%%	Returns {ok, String} if successful and something else if not
-%%
-%%	Title - the name of the window
-%%	LeadText - the lead text on the selection field
-%%	List - a list of items that will be displayed in the list box
-%%
-%%------------------------------------------------------------
-
-ui_list_dialog(Title, LeadText, TxtList) ->
-    W = 200, H = 300,
-    
-    Win = gs:create(window, winroot(), [{title, Title}, 
-					{width, W},{height, H}]),
-    Ok = gs:create(button, Win, [{x, 10}, {y,10},
-				 {width, 50}, {height, 20},
-				 {label, {text, "Ok"}}]),
-    Cn = gs:create(button, Win, [{x, 70}, {y,10},
-				 {width, 50}, {height, 20},
-				 {label, {text, "Cancel"}}]),
-
-    gs:create(label, Win, [{x, 10}, {y, 50},
-			   {width, 60}, {height, 20},
-			   {label, {text, LeadText}}]),
-    Box = gs:create(entry, Win, [{x, 10}, {y, 70},
-				 {width, 160}, {height, 20},
-				 {keypress, true}]),
-    List = gs:create(listbox, Win, [{x, 10}, {y, 100}, {width, 180}, 
-				    {height, 190},
-				    {items, TxtList}, {vscroll, right},
-				    {hscroll, false}, {click, true},
-				    {doubleclick, true},
-				    {keypress, true}]),
-    gs:config(Win, {map, true}),
-
-    RetVal = ui_load_loop(Box, List, Ok, Cn),
-
-    gs:destroy(Win),
-    
-    RetVal.
-
-ui_load_loop(Box, List, Ok, Cn) ->    
-    receive
-	{gs, Box, keypress, _, ['Return'|_]} ->
-	    {ok, gs:read(Box, text)};
-	{gs, Box, keypress, _, _} ->
-	    ui_load_loop(Box, List, Ok, Cn);
-	{gs, Ok, click, _, _} ->
-	    {ok, gs:read(Box, text)};
-	{gs, List, doubleclick, _, [_Idx, Txt|_]} ->
-	    {ok, Txt};
-	{gs, List, click, _, [_Idx, Txt|_]} ->
-	    gs:config(Box, {text, Txt}),
-	    ui_load_loop(Box, List, Ok, Cn);
-	_Other -> 
-	    something_else
-    end.
-
-%% The status row at the bottom of the window
-set_status(Id) -> put(status_row, Id).
-status() -> get(status_row).
-print_status(Msg) -> gs:config(get(status_row), {label, {text, Msg}}).
-default_status() -> print_status("Done").
-
-set_editor(X) -> put(editor, X).
-editor() -> get(editor).
-
-winroot() -> get(winroot).
-set_winroot(X) -> put(winroot, X).
diff --git a/lib/appmon/src/appmon_web.erl b/lib/appmon/src/appmon_web.erl
deleted file mode 100644
index 048f7fa165..0000000000
--- a/lib/appmon/src/appmon_web.erl
+++ /dev/null
@@ -1,1031 +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%
-%%
-
-%%%---------------------------------------------------------------------
-%%% File    : webappmon.erl
-%%% Author  : Martin G. <[email protected]>
-%%% Purpose : Frontend to the webbased version of appmon.
-%%% Created : 24 Apr 2001 by Martin G. <[email protected]>
-%%%---------------------------------------------------------------------
-
--module(appmon_web).
-
-%% The functions that the user can call to interact with the genserver
--export([init/1,handle_call/3,handle_cast/2,handle_info/2]).
--export([terminate/2,code_change/3]).
-
--export([node_info/2,application_info/2,application_env/2]).
--export([proc_info/2,trace/2]).
--export([start/0,stop/0,start_link/0]).
-
-%% Export the function that returns the configuration data needed by
-%% webtool
--export([configData/0]).
-
--behaviour(gen_server).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Start the genserver                                                  %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-start_link()->
-    gen_server:start_link({local,webappmon_server},appmon_web,[],[]).
-start()->
-    gen_server:start({local,webappmon_server},appmon_web,[],[]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Stop the genserver                                                   %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-stop()->
-    gen_server:call(webappmon_server,stop,1000).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Get the page that shows the nodes and the apps on the sel node       %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-node_info(Env,Input)->
-    gen_server:call(webappmon_server,{node_data,Env,Input}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Get the application process tree                                     %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-application_info(Env,Input)->
-    gen_server:call(webappmon_server,{app_data,Env,Input}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Get the page that shows the data about the process                   %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-proc_info(Env,Input)->
-    gen_server:call(webappmon_server,{proc_data,Env,Input}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Get the spec on the app                                              %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
-application_env(Env,Input)->
-    gen_server:call(webappmon_server,{app_env,Env,Input}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Toggle the trace flag for the selected process                       %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-trace(Env,Input)->
-    gen_server:call(webappmon_server,{trace,Env,Input}).
-
-configData()->
-    {appmon,[{web_data,{"WebAppmon","/appmon/main_frame.html"}},
-	     	{alias,{"/appmon",code:priv_dir(appmon)}},
-		{alias,{erl_alias,"/erl",[appmon_web]}},
-		{start,{child,{backend,{process_info,start_link,[]},
-			       permanent,100,worker,[process_info]}}},
-	     {start,{child,{{local,webappmon_server},
-			    {appmon_web,start_link,[]},
-			    permanent,100,worker,[appmon_web]}}}
-	    ]}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                      %
-% Callback functions for the genserver                                 %
-%                                                                      %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-init(_Arg)->
-    {ok,[]}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Create the different pages                                           %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-handle_call({node_data,_Env,Input},_From,State)->
-    {reply,app_and_node_sel_page(Input),State};
-
-handle_call({app_data,_Env,Input},_From,State)->
-    {reply,process_tree_page(Input),State};
-
-handle_call({proc_data,_Env,Input},_From,State)->
-    {reply,process_specifickation_page(Input),State};
-
-handle_call({app_env,_Env,Input},_From,State)->
-    {reply,application_specifickation_page(Input),State};
-
-handle_call({trace,_Env,Input},_From,State)->
-    {reply,toggle_trace(Input),State}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Shutdown the genserver                                               %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-terminate(_,_State)->
-    ok.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Callback function currently not used ...                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-handle_cast(_,State)->
-    {noreply,State}.
-
-handle_info(_,State)->
-    {noreply,State}.
-
-code_change(_OldVsn,State,_Extra)->
-    {ok,State}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% Private functions to create the part of the sides that is common   %%
-%% to all sides                                                       %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create the Header for the page If we now the mimetype use that type%%
-%% otherwise use text                                                 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-header() ->
-    header("text/html").
-header(MimeType) ->
-    "Content-type: " ++ MimeType ++ "\r\n\r\n".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create the Htmlheader sett the title of the side to nothing if     %%
-%% we dont know the name of the side                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-html_header()->
-   html_header("").
-
-html_header(Part) ->    
-    "<HTML BGCOLOR=\"#FFFFFF\">\n" ++
-	"<HEAD>\n" ++
-	"<TITLE>Appmon " ++ Part ++  "</TITLE>\n" ++
-	"</HEAD>\n".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Close the Html tag and if neccessay add some clean upp             %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-html_end()->
-    "</HTML>".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% The functions that creates the whole pages by collecting           %%
-%% the necessary data                                                 %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Returns the page where the user see's which nodes and apps that    %%
-%% are availible for monitoring                                       %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-app_and_node_sel_page(Input)->
-    [header(),
-     html_header(),
-     node_body(httpd:parse_query(Input)),
-     html_end()].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Returns the process tree for the application whose name is         %%
-%% the first value in the Inputs key/value list                       %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-process_tree_page(Input)->
-    [header(),
-     html_header(),
-     application_javascript(httpd:parse_query(Input)),
-     application_body(httpd:parse_query(Input)),
-     html_end()].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Send trace on or off to the process thats pid is the third arg of  %%
-%% the inputs key/val list. Then it returns the process tree for the  %%
-%% the application that is the first key/val pair of input            %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-toggle_trace(Input)->
-   send_trace(httpd:parse_query(Input)),
-   [header(),
-    html_header(),
-     application_javascript(httpd:parse_query(Input)),
-     application_body(httpd:parse_query(Input)),
-    html_end()].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Creates the page that shows all information about the process that %%
-%% that is the first arg of th input key/val pairs                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-process_specifickation_page(Input)->
-    [header(),
-     html_header(),
-     process_body(httpd:parse_query(Input)),
-     html_end()].
-
-application_specifickation_page(Input)->
-    [header(),
-     html_header(),
-     application_env_body(httpd:parse_query(Input)),
-     html_end()].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The Private functions that do the job                              %%
-%% To build the the page that shows the applications                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Build the body of the side that shows the node name and            %%
-%% the application list                                               %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-node_body([{"node",Node}|_Rest])->
-    case  process_info:is_node(Node) of
-	{true,Controlled_node,Name} ->
-	    "<BODY BGCOLOR=\"#FFFFFF\">" ++
-		node_selections_javascripts() ++
-		node_selection(Controlled_node) ++
-		node_title() ++
-		application_tree(Controlled_node,Name) ++
-		"</BODY>";
-	       
-	{false,Server_node,Name} ->
-	    "<BODY BGCOLOR=\"#FFFFFF\">" ++
-		node_selections_javascripts() ++
-		node_selection(Server_node) ++
-		node_title() ++
-		application_tree(Server_node,Name) ++
-		"</BODY>"
-    end;
-
-node_body(_Whatever)->
-    node_body([{atom_to_list(node),atom_to_list(node())}]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Returns the javascript that sets a new node to monitor             %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-node_selections_javascripts()->
-    "<SCRIPT>
-      function node_selected()
-      {                                     
-         parent.frames.base_frames.location=\"../../appmon/start_info.html\"
-         window.location =\"./node_info?node=\" + " ++ 
-           "document.node_selection.nodes[document.node_selection.nodes.selectedIndex].value;
-      }
-      </SCRIPT>".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Insert the html code that shows the combobox where the user can    %%
-%% select another node to monitor                                     %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-node_selection(Node)->
-    " <FORM ACTION=\"./node_info\" NAME=node_selection>\n
-           <TABLE WIDTH=\"100%\" BORDER=\"0\">\n
-              <TR><TD ALIGN=\"center\">\n 
-                  <SELECT NAME=nodes onChange=\"node_selected()\">\n" ++
-	print_nodes(order_nodes(Node,process_info:get_nodes())) ++
-	"</SELECT>\n
-              </TD></TR>\n
-            </TABLE>\n
-          </FORM>".
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Add the node we are working with in the beginning of the list and  %%
-%% remove it from other places so its always the first in the listbox %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-order_nodes(Node,Node_list)->
-    [Node|lists:delete(Node,Node_list)].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Take the list of nodes and make it to a list of options to the     %%
-%% the combobox                                                       %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-print_nodes([])->
-    [];
-print_nodes([Node|Rest])->
-    "<OPTION value=\"" ++
-	atom_to_list(Node) ++
-	"\">" ++
-	atom_to_list(Node) ++
-	"\n" ++
-	print_nodes(Rest).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create the header of the node info page i.e. the name of the node  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-node_title()->
-   " <TABLE WIDTH=\"100%\" BORDER=\"0\">
-	<TR><TD ALIGN=\"center\"><FONT SIZE=5>Applications</FONT></TD></TR>
-    </TABLE>\n".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Build the body of the side that shows the node i.e the application %%
-%% list                                                               %%
-%% Node and Node_name are the same just different types               %%
-%% Node are the atom  Node_name the string of the node name           %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-application_tree(Node,Node_name)->
-    Fun=fun(Name)->
-		Name_str =atom_to_list(Name),
-		"<LI><A HREF=\"./application_info?name=" ++ Name_str  ++
-		    "&mode=all&node=" ++ Node_name ++
-		    "\" TARGET=main><B>" ++ Name_str ++
-		    "</B></A>" ++ print_space(15-length(Name_str),[]) ++
-		    "<A HREF=\"./application_env?name=" ++ Name_str ++
-		    "&node=" ++ Node_name ++
-		    "\" TARGET=\"main\"><FONT SIZE=2>spec</FONT></A></LI>\n" 
-	end,
-    "<UL>" ++ 
-	lists:map(Fun, (process_info:get_applications(Node))) ++
-	"</UL>" ++
-	"<FORM Name=reload>" ++
-	"<INPUT TYPE=\"button\" onClick=\"node_selected()\" 
-              VALUE=\"Reload\">\n" ++
-	"</FORM>" ++
-	"<!--<A HREF=\"../../appmon/application_help.html\" TARGET=main>Help</A>-->".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Print spaces between the application name and the spec link       %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-print_space(N,Space)when N >0 ->
-    print_space(N-1,"&nbsp;" ++ Space);
-print_space(_N,Space)->
-    Space.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The Private functions that do the job                              %%
-%% To build the the page that shows process in an application         %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%Generates the javascript that govern the look of the page that      %%
-%%the processes of an application                                     %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%Args is the list whit input args should be App Mode, Node
-application_javascript(Args)when length(Args)>=3 ->
-    Vars=
-	"<SCRIPT>
-            var proc;
-            var app=\"" ++ element(2,lists:nth(1,Args)) ++ "\";
-            var node=\"" ++ element(2,lists:nth(3,Args)) ++ "\";",
-    CommonFuncs=
-	" function reload_bottom_frame() 
-         {parent.proc_data.location.href=\"/appmon/blank.html\";}
-
-	 function show_process_info() 
-         {
-            if(proc.indexOf(\"#Port\")== -1)
-            {
-    	      if(proc.charAt(0)==\'<\')
-                 window.location=\"./proc_info?name=\" + proc + \"&node=\" + node  
-              else
-                {
-                  start=proc.indexOf(\"<\");
-                  endpoint=proc.lastIndexOf(\">\");
-                  window.location=\"./proc_info?name=\" + proc.slice(start,endpoint+1) + \"&node=\" + node  ;
-               }
-           }          
-        }
-
-        function trace()
-        {
-           if(proc.charAt(0)==\'<\')
-              window.location=\"./trace?name=\" + app +  \"&mode=\" + get_mode() +  \"&node=\" + node + \"&proc=\" +  proc;
-           else
-           {
-              start=proc.indexOf(\"<\");
-              endpoint=proc.lastIndexOf(\">\");
-              window.location=\"./trace?name=\" + app + \"&mode=\" + get_mode() + \"&node=\" + node + \"&proc=\" + 
-                 proc.slice(start,endpoint+1) ;
-           }         
-        
-       }
-   
-       function reload_page()\n
-       {
-          window.location=\"./application_info?name=\" + app + \"&mode=\" + get_mode() + \"&node=\" + node ; 
-       }
-       function get_mode()
-       {
-          for (i= 0; i < document.reload_form.mode.length; i++)
-          {
-             if (document.reload_form.mode[i].checked)
-                  return(document.reload_form.mode[i].value);
-          }
-          return(\"all\");
-       }",   
-    Vars++CommonFuncs++"</SCRIPT>";
-application_javascript(_)->
-    "<SCRIPT></SCRIPT>".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create the body i.e the process tree for the applications whose    %%
-%% name is the second arg in the first tuple                          %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%args is the list [{_,Appname},{_,Mode},{_Node}]
-application_body(Args) when is_list(Args),length(Args) >= 3 ->
-    App=element(2,lists:nth(1,Args)),
-    Mode=element(2,lists:nth(2,Args)),
-    Node=element(2,lists:nth(3,Args)),
-    "<BODY BGCOLOR=\"FFFFFF\" onLoad=reload_bottom_frame() >"
-	++ mode_selection(Mode) ++ 
-	selected_app_header(App,Node) ++ process_tree(App,Mode,Node)++ 
-	"</BODY>";
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% If the pattern above ain't match then something is wrong           %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-application_body(_Whatever)->
-    "Please use the links to the left".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create the part of the process tree page side where the user can   %%
-%% select the mode the view the tree in.                              %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-mode_selection(Mode)->
-    "<FORM NAME=\"reload_form\">\n" ++
-	"<TABLE>" ++
-	"<TR>\n" ++
-	"<!--<TD><INPUT TYPE=\"button\" NAME=\"refresh_but\" VALUE=\"Reload\" onClick=\"reload_page()\">
-         &nbsp;&nbsp;&nbsp;&nbsp;</TD>\n-->" ++
-	print_radio_buttons([{"all","All processes"},{"sup_child","Supervised processes"},
-	{"sup","Only supervisors"}],Mode) ++
-	"</TR>\n </TABLE>\n" ++
-	"</FORM>".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Print the radiobuttons. if the mode is the one the current         %%
-%% radiobutton represent set the one checked                          %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-print_radio_buttons([],_)->
-    [];
-print_radio_buttons([{Mode,Name}|Rest],Mode)->
-    "<TD><INPUT TYPE=\"radio\" NAME=\"mode\" CHECKED=\"true\" VALUE=\""++ 
-	Mode ++"\" onClick=\"reload_page()\">&nbsp;&nbsp;" ++Name ++
-	"</TD>\n" ++ print_radio_buttons(Rest,Mode);
-print_radio_buttons([{Mode1,Name}|Rest],Mode)->
-    "<TD><INPUT TYPE=\"radio\" NAME=\"mode\" VALUE=\""++ Mode1 ++
-	"\" onClick=\"reload_page()\">&nbsp;&nbsp;" ++ Name ++
-	"</TD>\n" ++
-	print_radio_buttons(Rest,Mode).
-       
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The part that shows the name of the application  that the process  %%
-%% tree represent                                                     %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-selected_app_header(App,Node)->
-    {Year,Mon,Day}=date(),
-    "<TABLE>
-        <TR> 
-          <TD>Node:</TD> 
-          <TD>" ++Node ++"</TD>
-        </TR>
-        <TR> 
-          <TD>Application:</TD> 
-          <TD>" ++App ++"</TD>
-        </TR>
-       <TR>  
-          <TD>Date:</TD> 
-          <TD>" ++ integer_to_list(Day) ++ "/" ++ 
-                 integer_to_list(Mon) ++"&nbsp;-&nbsp;"++ 
-                 integer_to_list(Year)  ++ 
-         "</TD> 
-        </TR>
-     </TABLE>
-     <TABLE WIDTH=100%>
-       <TR>
-         <TD>
-             <HR WIDTH=\"80%\">
-             <!--<FONT SIZE=4>Process tree</FONT>
-             <HR ALIGN=\"center\" WIDTH=\"80%\">-->
-         </TD>
-       </TR>
-     </TABLE>".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%get the process tree from process_info and build the nested         %%
-%% unordered list that represent the applications process tree        %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-process_tree(App,Mode,Node)->
-    case process_info:get_processes(list_to_atom(App),
-				    list_to_atom(Mode),
-				    list_to_atom(Node)) of
-	unknown->
-	    "Unknown application please update application tree";
-	{Tree,Traced_dict} ->
-	    "<UL>" ++
-		htmlify_tree(Tree,Traced_dict,1,Node,Mode,App) ++
-		"</UL>"
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Build each node in the tree and then build its children            %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-htmlify_tree({Pid,Childs,Childs2},Proc_tab,N,Node,Mode,App)->
-    case ets:lookup(Proc_tab,Pid) of
-	[] when N<3->
-	     print_pid(Pid,Node,Mode,App,notrace)++
-		htmlify_prim_child(Childs,Proc_tab,N+1,Node,Mode,App) ++
-		htmlify_sec_child(Childs2);
-	[_Traced]->
-	    print_pid(Pid,Node,Mode,App,"<FONT SIZE=2 COLOR=\"firebrick\">Stop Trace</FONT>")++
-		htmlify_prim_child(Childs,Proc_tab,N+1,Node,Mode,App) ++
-		htmlify_sec_child(Childs2);
-	[]-> 
-	    print_pid(Pid,Node,Mode,App,"<FONT SIZE=2>Start Trace</FONT>")++
-		htmlify_prim_child(Childs,Proc_tab,N+1,Node,Mode,App) ++
-		htmlify_sec_child(Childs2)	      	 
-    end.
-
-print_pid(Pid,Node,_Mode,_App,notrace)->
-    "<LI><A TARGET=\"proc_data\" STYLE=\"text-decoration:none; color:blue\" HREF=\"./proc_info?name=" ++ urlify_pid(Pid) ++ 
-	"&node="++ Node  ++" \" >"++ htmlify_pid(Pid,[])  ++ 
-	"</A>";
-
-print_pid([$P,$o,$r,$t|Rest],_Node,_Mode,_App,_TrMode)->
-    "<LI>" ++ htmlify_pid([$P,$o,$r,$t|Rest],[]);
-
-print_pid(Pid,Node,Mode,App,TrMode)->
-    "<LI><A TARGET=\"proc_data\" STYLE=\"text-decoration:none; color:blue\" HREF=\"./proc_info?name=" ++ 
-	urlify_pid(Pid) ++ "&node="++ Node  ++" \" >"++
-	htmlify_pid(Pid,[])  ++ "</A>"++ 
-	"&nbsp;&nbsp;&nbsp
-                <A HREF=\"./trace?app="++App++"&mode="++Mode++
-	"&node="++Node++"&proc="++urlify_pid(Pid)++"\">
-               "++TrMode++"</A>".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Change the '<' sign and the '>' sign to the html representation   %%
-%% of the sign                                                       %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-htmlify_pid([60|Pid],New)->
-    htmlify_pid(Pid,";tl&"++New);
-htmlify_pid([139|Pid],New)->
-    htmlify_pid(Pid,";tl&"++New);
-
-htmlify_pid([62|Pid],New)->
-    htmlify_pid(Pid,";tg&"++New);
-htmlify_pid([155|Pid],New)->
-    htmlify_pid(Pid,";tg&"++New);
-htmlify_pid([Chr|Pid],New)->
-    htmlify_pid(Pid,[Chr|New]);
-htmlify_pid([],New)->
-    lists:reverse(New).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Change the < and > sign to the representation of the signs in      %%
-%% the HTTP protocol                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-urlify_pid(Pid) ->
-    case re:run(Pid,"[<](.*)[>]",[{capture,all_but_first,list}]) of
-	{match,[PidStr]}->
-	    "%3C"++PidStr++"%3E";
-	_->
-	    Pid
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Change the < and > sign from the representation of the signs in    %%
-%% the HTTP protocol                                                  %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-unurlify_pid(Pid)->
-    unurlify_pid(Pid,[]).
-
-unurlify_pid([$%,$3,$C|Rest],New)->
-    unurlify_pid(Rest,[60|New]);
-
-unurlify_pid([$%,$3,$E|Rest],New)->
-    unurlify_pid(Rest,[62|New]);
-unurlify_pid([Chr|Rest],New)->
-    unurlify_pid(Rest,[Chr|New]);
-
-unurlify_pid([],New)->
-    lists:reverse(New).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Make html of the list of primary childs                            %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-htmlify_prim_child([],_Proc_tab,_N,_Node,_Mode,_App)->
-    [];
-
-htmlify_prim_child(Childs,Proc_tab,N,Node,Mode,App)->
-    Fun=fun(Child)->
-		htmlify_tree(Child,Proc_tab,N,Node,Mode,App)
-	end,
-    "<UL>\n" ++ lists:map(Fun,Childs) ++ "</UL>\n".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Make html of hte list whit sedondary childs, they has no childs    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-htmlify_sec_child([])->
-    [];
-
-htmlify_sec_child(Sec_child_list)->
-    Htmlify_child=fun(Pid1)->
-			  "<LI><FONT COLOR=\"#FF2222\">" ++ Pid1 ++
-			      "</FONT></LI>\n"
-		  end,
-    "<UL>" ++ lists:map(Htmlify_child,Sec_child_list) ++ "</UL>\n".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The Private functions that do the job                              %%
-%% To build the the page that shows process data                      %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The function that creates the collects the various part of         %%
-%% the side that shows information about a specific process,          %%
-%% Pid_name should be the list representation of a pid                %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-process_body(Args) when length(Args)==2->
-    Pid=element(2,lists:nth(1,Args)),
-    Node=element(2,lists:nth(2,Args)),
-    "<BODY BGCOLOR=\"#FFFFFF\">"  ++
-	process_information_table(Pid,Node) ++ "</BODY>";
-
-process_body(_)->
-    "<BODY BGCOLOR=\"#FFFFFF\">Please dont call this side manually</BODY>".
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create the table that shows the name of the pid to show extended   %%
-%% info about                                                         %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Get the table that shows the extended info about a process         %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-process_information_table(Pid_name,Node)->
-    PidID=unurlify_pid(Pid_name),
-    case catch list_to_pid(PidID) of
-	Pid when is_pid(Pid) -> 
-	    get_process_table(Pid,Node);
-	_Other ->
-	    io_lib:format("Not a process id ~s",[PidID])
-    end.
-	      
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Create the table that shoows the extended info about processes     %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-get_process_table(Pid,Node_name) when is_list(Node_name)->
-    Node=list_to_atom(Node_name),
-    get_process_table(Pid,Node);
-
-get_process_table(Pid,Node) when is_atom(Node)->
-    case lists:member(Node,[node()|nodes()]) of
-	true-> 
-	    Proc_data=process_info:get_process_data(Pid,Node),
-	    "<TABLE BORDER=1 >
-                <TR BGCOLOR=\"#8899AA\"><TD COLSPAN=6 ALIGN=\"center\" > 
-                       <FONT size=4> Process" ++
-		htmlify_pid(pid_to_list(Pid),[])  ++  "</FONT>
-               </TD></TR>" ++
-		   start_process_proc_data(Proc_data) ++
-		"</TABLE><BR><BR>";
-	_ ->
-	    "Please try again the Node dont exists"
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The process information is quite messy tidi it up by creating a    %%
-%% table that looks like key           val                            %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-start_process_proc_data(Proc_data)->
-    %%Pic out the special cases the links and the process dict
-    {Special,Usual}=split_proc_data(Proc_data),
-    Usual2=append_empty(Usual),
-    UsualProcData=process_proc_data(Usual2,0),
-    SpecProcData=process_proc_data(Special),
-    UsualProcData++SpecProcData.
-
-append_empty(List) when length(List) rem 2 == 0 ->
-    List;
-append_empty(List)->
-    append_empty(lists:append(List,[empty])).
-
-split_proc_data(Proc_data)->
-    Spec=lists:map(fun(Key)->
-			   case lists:keysearch(Key,1,Proc_data) of
-			       {value,Data}->
-				   Data;
-			       _ ->
-				   not_included
-			   end
-		   end,[links,dictionary,messages]),
-    Spec2=clear(Spec,[]),
-    Usual=lists:filter(fun({Key,_Val})->
-			       case Key of
-				   messages ->
-				       false;
-				   links ->
-				       false;
-				   dictionary ->
-				       false;
-				   _ ->
-				       true
-			       end
-		       end,Proc_data),
-    {Spec2,Usual}.
-		       
-clear([],New)->
-    New;
-clear([not_included|Spec],New)->
-    clear(Spec,New);
-clear([Other|Spec],New)->
-    clear(Spec,[Other|New]).
-
-process_proc_data(Data,3)->
-    "</TR>"++process_proc_data(Data,0);
-process_proc_data([],_N)->
-    [];
-process_proc_data(Data,0)->
-    "<TR>"++process_proc_data(Data,1);
-
-process_proc_data([empty|Data],N)->
-    "<TD>&nbsp;</TD><TD>&nbsp;</TD> "++process_proc_data(Data,N+1);
-
-process_proc_data([{current_function,MFA}|Rest],N)->
-    "<TD NOWRAP=true><FONT SIZE=3><B>Current function:</B></TD><TD><FONT SIZE=3>"++ 
-	io_lib:format("~p",[MFA]) ++"</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{error_handler,Mod}|Rest],N)->
-    "<TD NOWRAP=\"true\"><B><FONT SIZE=3>Error handler:</B></TD><TD><FONT SIZE=3>" 
-	++ atom_to_list(Mod)  ++ "</TD>\n" ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{group_leader,Grp}|Rest],N)->
-    "<TD NOWRAP=\"true\"><FONT SIZE=3><B>Group leader:</B></TD><TD><FONT SIZE=3>" ++ 
-	htmlify_pid(pid_to_list(Grp),[])  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{heap_size,Size}|Rest],N)->
-    "<TD NOWRAP=\"true\"><FONT SIZE=3><B>Heap size:</B></TD><TD><FONT SIZE=3>" 
-	  ++ integer_to_list(Size)  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{initial_call,MFA}|Rest],N)->
-    "<TD NOWRAP=\"true\"><FONT SIZE=3><B>Initial call:</B></TD><TD><FONT SIZE=3>"++ 
-         io_lib:format("~p",[MFA]) ++"</TD>\n " ++
-	process_proc_data(Rest,N+1);
-	
-process_proc_data([{message_queue_len,Size}|Rest],N)->
-    "<TD NOWRAP=\"true\"><FONT SIZE=3><B>Message queue length:</B></TD><TD><FONT SIZE=3>" ++
-	integer_to_list(Size)  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{priority,Level}|Rest],N)->
-    "<TD><FONT SIZE=3><B>Process priority:</B></TD><TD><FONT SIZE=3>" ++
-	atom_to_list(Level)  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{reductions,Number}|Rest],N)->
-    "<TD ><FONT SIZE=3><B>Number of executed reductions:</B></TD>
-         <TD><FONT SIZE=3>" ++ integer_to_list(Number)  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{registered_name,Name}|Rest],N)->
-    "<TD NOWRAP=\"true\"><FONT SIZE=3><B>Process Name:</B></TD><TD><FONT SIZE=3>" 
-	++ atom_to_list(Name)  ++ "</TD>\n" ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{stack_size,Size}|Rest],N)->
-    "<TD NOWRAP=\"true\"><FONT SIZE=3><B>Stack size:</B></TD><TD><FONT SIZE=3>" 
-	++ integer_to_list(Size)  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{status,Status}|Rest],N)->
-    "<TD NOWRAP=\"true\"><FONT SIZE=3><B>Process status:</B></TD><TD><FONT SIZE=3>" 
-	++ atom_to_list(Status)  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{trap_exit,Boolean}|Rest],N)->
-    "<TD NOWRAP=\"true\" ><FONT SIZE=3><B>Trap Exit:</B></TD><TD><FONT SIZE=3>" 
-	++ atom_to_list(Boolean)  ++ "</TD>\n " ++
-	process_proc_data(Rest,N+1);
-
-process_proc_data([{Key,Val}|Rest],N)->
-    "<TD NOWRAP=\"true\" ><FONT SIZE=3><B>" ++  io_lib:write(Key) ++
-	"</B></TD><TD><FONT SIZE=3>" ++ io_lib:write(Val)  ++
-	"</TD>\n " ++
-	process_proc_data(Rest,N). 
-
-process_proc_data([])->
-    [];
-process_proc_data([{links,List_of_pids}|Rest])->
-    "<TR><TD NOWRAP=\"true\"><FONT SIZE=3><B>Links:</B></TD><TD COLSPAN=5><FONT SIZE=3>"++ print_links(List_of_pids)  ++"</TD></TR>\n " ++
-	process_proc_data(Rest);
-
-process_proc_data([{messages,Queue}|Rest])->
-    "<TR><TD NOWRAP=\"true\"><FONT SIZE=3><B>Message Queue:</B></TD><TD COLSPAN=5><FONT SIZE=3>" ++ io_lib:write(Queue)  ++ "</TD></TR>\n " ++
-	process_proc_data(Rest);
-
-process_proc_data([{dictionary,Dict}|Rest])->
-    "<TR><TD NOWRAP=\"true\"><FONT SIZE=3><B>Process dictionary:</B></TD><TD COLSPAN=5><FONT SIZE=3>&nbsp;</TD></TR>\n " ++
-	get_dictionary_data(Dict) ++
-	process_proc_data(Rest).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% In the process info there are the links to other processes print   %%
-%% this pid                                                           %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-print_links(Pids)->
-    print_links(Pids,[]).
-			 
-print_links([],Links)->
-    htmlify_pid(Links,[]);
-
-print_links([Pid],Links) when is_pid(Pid) ->
-    print_links([],Links ++ pid_to_list(Pid));
-
-print_links([Pid],Links) when is_port(Pid) ->
-    print_links([],Links ++ erlang:port_to_list(Pid));
-
-print_links([Pid|Rest],Links) when is_pid(Pid) ->
-    print_links(Rest,Links ++ pid_to_list(Pid) ++ ", ");
-
-print_links([Pid|Rest],Links) when is_port(Pid) ->
-    print_links(Rest,Links ++ erlang:port_to_list(Pid) ++ ", ").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Fix the data in the process dictionary                             %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-get_dictionary_data([])->
-    [];
-
-get_dictionary_data([{Key,Val}|Dict])->
-    FormatedVal=add_space(htmlify_pid(lists:flatten(fix_type(Val)),[])),
-    "<TR><TD><FONT SIZE=3>" ++
-	htmlify_pid(lists:flatten(fix_type(Key)),[]) ++
-	"</TD><TD COLSPAN=5><FONT SIZE=3>" ++ 
-	FormatedVal++ "</TD></TR>\n" ++
-	get_dictionary_data(Dict).
-
-add_space(List)->
-    add_space(List,0,[]).
-add_space([],_Len,New) ->
-    lists:reverse(New);
-add_space([Char|Rest],Len,New)when Len<50 ->
-    add_space(Rest,Len+1,[Char|New]);
-
-add_space([$\,|Rest],_Len,New) ->
-    add_space(Rest,0,[$\ ,$,|New]);
-
-add_space([Char|Rest],Len,New) ->
-    add_space(Rest,Len+1,[Char|New]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Interpret the type of the data and make it to a list               %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-fix_type(Val) when is_atom(Val) ->
-    atom_to_list(Val);
-fix_type(Val) when is_float(Val) ->
-    float_to_list(Val);
-fix_type(Val) when is_integer(Val) ->
-    integer_to_list(Val);
-fix_type(Val) when is_list(Val) ->
-    case io_lib:printable_list(Val) of
-	true->
-	    case Val of
-		[]->
-		    io_lib:write(Val);
-		_->
-		    Val
-	    end;
-	_->
-	    io_lib:write(Val)
-    end;
-fix_type(Val) when is_pid(Val) ->
-    pid_to_list(Val);
-fix_type(Val) when is_port(Val) ->
-    erlang:port_to_list(Val);
-fix_type(Val) when is_tuple(Val) ->
-    io_lib:write(Val);
-fix_type(_Val) ->
-    [].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The Private functions that send the trace signal to the process    %%
-%% thats the 4 member of the Arg list                                 %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-send_trace(Args)when length(Args)>=4->
-    {_,Proc}=lists:nth(4,Args),
-    Pid2=unurlify_pid(Proc),
-    process_info:send_trace(Pid2);
- 
-send_trace(_Args)->
-    arg_error.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Private functions that prints the application environment          %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-application_env_body(Args)when length(Args)>=2 ->
-    App=element(2,lists:nth(1,Args)),
-    Node=element(2,lists:nth(2,Args)),
-    "<SCRIPT>
-       function reload_bottom_frame() 
-         {parent.proc_data.location.href=\"/appmon/blank.html\";}
-     </SCRIPT>
-    <BODY BGCOLOR=\"#FFFFFF\" onLoad=reload_bottom_frame()>"
-	++ application_env_table(App,Node) ++ "</BODY>";
-
-application_env_body(_)->
-    "<BODY BGCOLOR=\"#FFFFFF\">Please dont call this side manually</BODY>".
-
-application_env_table(App,Node)->
-    case process_info:get_application_keys(list_to_atom(App),
-					   list_to_atom(Node)) of
-	{ok,List}->
-	    "<TABLE BORDER=1>" ++ application_env_head(App,Node) ++
-		print_key_list(List,[]) ++ "</TABLE>";
-	_ ->
-	    "Please try again,something went wrong"
-    end.
-
-application_env_head(App,Node)->
-    "<TR BGCOLOR=\"#8899AA\"><TD ALIGN=\"center\" COLSPAN=3> 
-                <FONT SIZE=6>" ++ App ++ "@" ++ Node ++ "</FONT>\n
-           </TD></TR>
-           <TR><TD COLSPAN=3>&nbsp</TD></TR>
-          <TR BGCOLOR=\"#8899AA\">
-             <TD><B>Key</B></TD><TD><B>Val/Sec. key</B></TD><TD><B>Sec. Val</B></TD>
-         </TR>".
-
-print_key_list([],Result)->
-    Result;
-
-print_key_list([{application,Name}|Rest],Result)->
-    print_key_list(Rest,Result ++ print_key("Application name :",Name));
-
-print_key_list([{description,Desc}|Rest],Result)->
-    print_key_list(Rest,Result ++ print_key("Description :",Desc));
-
-print_key_list([{vsn,Ver}|Rest],Result)->
-    print_key_list(Rest,Result ++ print_key("Version :",Ver));
-
-print_key_list([{id,Id}|Rest],Result)->
-    print_key_list(Rest,Result ++ print_key("ID:",fix_type(Id)));
-
-print_key_list([{modules,Mods}|Rest],Result)->
-    print_key_list(Rest,Result ++ print_key("Modules:","&nbsp;") ++
-		   print_secondary_list(Mods,[]));
-
-print_key_list([{maxP,Max}|Rest],Result)->
-    print_key_list(Rest,Result ++
-		   print_key("Max nr of processes",fix_type(Max)));
-
-print_key_list([{maxT,Max}|Rest],Result)->
-    print_key_list(Rest,Result ++
-		   print_key("Max running sec:",fix_type(Max)));
-
-print_key_list([{registered,Names}|Rest],Result)->    
-    print_key_list(Rest,Result ++
-		   print_key("Registered names:","&nbsp;") ++
-		   print_secondary_list(Names,[]));
-
-print_key_list([{applications,Apps}|Rest],Result)->
-    print_key_list(Rest,Result ++ print_key("Depends on:","&nbsp") ++
-		   print_secondary_list(Apps,[]));
-
-print_key_list([{included_applications,Inc_apps}|Rest],Result)->
-    print_key_list(Rest,Result ++
-		   print_key("Included applications:",
-			     fix_type(Inc_apps)));
-
-print_key_list([{env,Env}|Rest],Result)->
-    print_key_list(Rest,Result ++
-		   print_key("Environment:",fix_type(Env)));
-
-print_key_list([{mod,Mod}|Rest],Result)->
-    print_key_list(Rest,Result ++
-		   print_key("Application callback mod:",
-			     fix_type(Mod)));
-
-print_key_list([{start_phases,Phase_arg}|Rest],Result)->
-    print_key_list(Rest,Result ++
-		   print_key("Application callback mod:",
-			     fix_type(Phase_arg)));
-
-print_key_list([_|Rest],Result)->
-    print_key_list(Rest,Result).
-
-print_key(Label,Val)->
-    "<TR>
-        <TD><B>" ++ Label ++ "</B></TD><TD>" ++ Val ++
-	"</TD><TD>&nbsp;</TD>
-    </TR>".
-
-print_key2(Label,Val)->
-    "<TR>
-        <TD>&nbsp;</TD><TD>" ++ Label ++ "</TD><TD>" ++ Val ++  "</TD>
-    </TR>".
-
-print_secondary_list([],Result)->
-    Result;
-print_secondary_list([{Mod,Ver}|Rest],Result) ->
-    print_secondary_list(Rest,Result ++
-			 print_key2(fix_type(Mod),fix_type(Ver)));
-
-print_secondary_list([Mod|Rest],Result) ->
-    print_secondary_list(Rest,Result ++
-			 print_key2(fix_type(Mod),"&nbsp;")).
diff --git a/lib/appmon/src/process_info.erl b/lib/appmon/src/process_info.erl
deleted file mode 100644
index e5d44ae50e..0000000000
--- a/lib/appmon/src/process_info.erl
+++ /dev/null
@@ -1,662 +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%
--module(process_info).
--behavior(gen_server).
-
--export([start/0, start_link/0, stop/0]).
--export([is_node/1, get_nodes/0,
-	 get_applications/1, get_application_keys/2,
-	 get_processes/3, get_process_data/2,
-	 send_trace/1]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
--record(data, {que=undef,
-	       procs=undef,
-	       links=undef,
-	       links2=undef}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% Functions to retrieve information about which application          %%
-%% at the node                                                        %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-start() ->
-    gen_server:start({local, proc_info}, process_info, [], []).
-
-start_link() ->
-    gen_server:start_link({local, proc_info}, process_info, [], []).
-
-stop() ->
-    gen_server:call(proc_info, stop, 1000).
-
-%% is_node(NodeS) -> {bool(), Node, NodeS2}
-%%   NodeS = NodeS2 = string()
-%%   Node = node()
-is_node(NodeS) ->
-    Node = list_to_atom(NodeS),
-    case lists:member(Node, [node()|nodes()]) of
-	true->
-	    {true, Node, NodeS};
-	false ->
-	    {false, node(), atom_to_list(node())}
-    end.
-
-%% get_nodes() -> [node()]
-get_nodes() ->
-    [node()|nodes()].
-
-%% get_applications(Node) -> [App]
-%%   Node = node()
-%%   App = atom()
-%% Returns the list of all applications with a supervision tree (that
-%% is, not library applications such as stdlib) at Node.
-get_applications(Node) ->
-    Info = rpc:call(Node, application, info, []),
-    {value, {running, Apps}} = lists:keysearch(running, 1, Info),
-    [App || {App, Pid} <- Apps, is_pid(Pid)].
-
-%% get_application_keys(App, Node) -> {ok, Keys} | {error, Reason}
-%%   Node = node()
-%%   App = atom()
-%%   Keys = [{Key, Val}]
-%%     Key = atom()
-%%     Val = term()
-%%   Reason = badapp | badrpc
-get_application_keys(App, Node) ->
-    case rpc:call(Node, application, get_all_key, [App]) of
-	{ok, Keys} ->
-	    {ok, Keys};
-	undefined ->
-	    {error, badapp};
-	{badrpc, _} ->
-	    {error, badrpc}
-    end.
-
-%% get_processes(App, Mode, Node) -> {Tree, Dict} | unknown
-%%   App = atom()
-%%   Mode = sup | sup_child | all
-%%   Node = node()
-get_processes(App, Mode, Node) ->
-    gen_server:call(proc_info, {get_processes, App, Mode, Node}).
-
-%% get_process_data(Pid, Node) -> ProcData
-%%   Pid = pid()
-%%   Node = node()
-%%   ProcData -- see erlang:process_info/1
-get_process_data(Pid, Node) ->
-    case rpc:call(Node, erlang, process_info, [Pid]) of
-	{badrpc, _} ->
-	    [{error,"Please try again"}];
-	Res ->
-	    Res
-    end.
-
-%% send_trace(PidL) -> void()
-send_trace(PidL) ->
-    gen_server:call(proc_info, {send_trace, PidL}).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%%  gen_server callbacks                                              %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-init([]) ->
-    {ok, ets:new(procs, [])}.
-
-handle_call({get_processes, App, Mode, Node}, _From, State) ->
-    case do_get_processes(App, Mode, Node) of
-	unknown ->
-	    {reply, unknown, State};
-	Tree ->
-	    {reply, {Tree, State}, State}
-    end;
-handle_call({send_trace, PidL}, _From, State) ->
-    do_send_trace(PidL, State),
-    {reply, ok, State};
-handle_call(stop, _From, State) ->
-    {stop, normal, ok, State}.
-
-handle_cast(_, State) ->
-    {noreply, State}.
-
-handle_info(_, State) ->
-    {noreply, State}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_, State, _) ->
-    {ok, State}.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%                                                                    %%
-%% Internal functions                                                 %%
-%%                                                                    %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% do_get_processes(App, Mode, Node) -> Tree | unknown
-%%   App = atom()
-%%   Mode = all | sup | sup_childs
-%%   Node = node()
-%%   Tree = term()
-do_get_processes(App, Mode, Node) ->
-    case rpc:call(Node, application_controller, get_master, [App]) of
-	Pid when is_pid(Pid) ->
-	    start_collecting_data(Pid, Mode, Node);
-	undefined ->
-	    unknown
-    end.
-
-%% Initiate the database, get the processes and the links.
-%% Then build lists and return them.
-start_collecting_data(Pid, Mode, Node) ->
-    Db = get_database(),
-    {Db2, Tree} = build_graph({master,Pid}, Db, Pid, Mode, Node),
-    delete_database(Db2),
-    Tree.
-
-get_database() ->
-    P = ets:new(procs,[]),
-    L = ets:new(link,[bag]),
-    L2 = ets:new(link2,[bag]),
-    Q = queue:new(),
-    ets:insert(P, {whereis(application_controller), crap}),
-    ets:insert(P, {whereis(gs), crap}),
-    #data{que=Q, procs=P, links=L, links2=L2}.
-
-delete_database(Db) ->
-    ets:delete(Db#data.procs),
-    ets:delete(Db#data.links),
-    ets:delete(Db#data.links2).
-
-%% The thought is
-%% 1. Get the processes that links to Pid.
-%%    Pid is the application master the first time.
-%% 2. Add the processes to the database and clear the list of children
-%%    from processes which for some resason not should be there.
-%% 3. Queue the children, so we later can se if they have any links.
-%% 4. Add links to the childrens.
-%% 5. When the whole tree is retreived remove the unnecessary processes
-%%    depending on the mode.
-%% 6. Take all links that point to the same pid and sort out
-%%    the primary and secondary relations.
-%%    If more than one process links to the same process, the relation
-%%    between a supervisor and a process is primary. The rest is
-%%    secondary, there is no different in real world just in logic
-%%    between a secondary and a primary relation.
-%% When all processes in the application is collected,
-%% fix secondary links and return the tree.
-build_graph(finish, Db, Grp, Mode, Node) ->
-    Db = fix_links(Db, Grp, Node), 
-    delete_unwanted(Db, Mode, Grp),
-    Tree = start_tree(Db, Node),
-    {Db, Tree};
-build_graph(Pid, Db, Grp, Mode, Node) ->
-    Children = get_children(Pid, Mode, Node),
-    Children2 = add_and_remove(Children, Pid, Db, Grp, Node),
-    Q2 = queue_children(Db#data.que, Children2),
-    add_children(Pid, Db, Children2, 1),
-    case queue:out(Q2) of
-	{empty, _}->
-	    build_graph(finish, Db, Grp, Mode, Node);
-	{{value,NPid}, Q3}->
-	    Db2 = Db#data{que=Q3},
-	    build_graph(NPid,Db2,Grp,Mode,Node)
-    end.
-
-%% Collect the processes which the current process has a link to
-%% Pid is now the application_master and the application master's
-%% child is the application supervisor but in reality there are two
-%% application master processes.
-%% Fix this by reordering the processes a little.
-get_children({master,Pid}, _Mode, Node) when is_pid(Pid) ->
-    %% Get the master pid
-    MPid = case application_master:get_child(Pid) of
-	       {Pid1, _App} -> Pid1;
-	       Pid1 -> Pid1
-	   end,
-    %% Get the second appplication master process and order them
-    %% correctly
-    case rpc:call(Node, erlang, process_info, [MPid,links]) of
-	{links, [H|T]} -> [H,MPid|T];
-	{links, []} -> MPid
-    end;
-get_children({Pid, _Name}, _Mode, Node) when is_pid(Pid),
-					   Node==node(Pid) ->
-    {links,Links} = rpc:call(Node, erlang, process_info, [Pid,links]),
-    Links;
-get_children(Pid, _Mode, Node) when is_pid(Pid), Node==node(Pid) ->
-    {links,Links} = rpc:call(Node, erlang, process_info, [Pid,links]),
-    Links;
-get_children(Pid, _Mode, Node) when is_pid(Pid), Node/=node(Pid) ->
-    [];
-get_children(Port, _Mode, _Node) when is_port(Port) ->
-    [].
-
-%% Add the links to the database.
-%% The first case -- when it is the application master process -- there
-%% is only one real child even though there are more links.
-add_children({master,Pid}, Db, [Child|_Rest], N) ->
-    add_child(Pid, Db, Child, N);
-add_children(_Pid, _Db, [], _N) ->
-    ok;
-add_children(Pid, Db, [Child|Rest], N) ->
-    add_child(Pid, Db, Child, N),
-    add_children(Pid, Db, Rest, N+1).
-
-add_child(Pid, Db, Child, N) ->
-    case ets:match_object(Db#data.links, {Pid,Child,'_'}) of
-	[] ->
-	    ets:insert(Db#data.links, {Pid,Child,N});
-	_ ->
-	    ok
-    end.
-
-%% Add the list of processes to the queue.
-queue_children(Queue, []) ->
-    Queue;
-queue_children(Queue, [H|T]) ->
-    Q = queue:in(H, Queue),
-    queue_children(Q, T).
-    
-%% The processess that we already has added to the database are
-%% not children to the current process, so we don't need to add them a
-%% second time. 
-remove_used_children([], _Db, New_list) ->
-    lists:reverse(New_list);
-remove_used_children([Child|Rest], Db, New) ->
-    case ets:lookup(Db#data.procs, Child) of
-	[] ->
-	    remove_used_children(Rest, Db, [Child|New]);
-	_ ->
-	    remove_used_children(Rest, Db, New)
-    end.
-
-%% Take the list of links and separate it into a list with ports and a
-%% list with pids.
-separate_ports([], Pids, Ports) ->
-    {Pids, Ports};
-separate_ports([Child|Rest], Pids, Ports) ->
-    if
-	is_port(Child) ->
-	    separate_ports(Rest, Pids, [Child|Ports]);
-	is_pid(Child) ->
-	    separate_ports(Rest, [Child|Pids], Ports)
-    end.
-
-%% Add the current pid to the ets table with processes and clear
-%% the list of children from processes that should not be there.
-%% In the first case, no children are used so it's not necessary.
-add_and_remove(Children, {master,Pid}, Db, _Grp, Node)
-  when is_pid(Pid), Node==node(Pid) ->
-    ets:insert(Db#data.procs, {Pid, {master,master}, controller}),
-    {_Pids,Ports} = separate_ports(Children, [], []),
-    Ports++Children;
-%% This clause is removable when using only link as retrieving mode  .
-add_and_remove(Children, {Pid,_Name}, Db, Grp, Node)
-  when is_pid(Pid), Node==node(Pid) ->
-    ets:insert(Db#data.procs, {Pid,
-			       rpc:call(Node,erlang,process_info,
-					[Pid,registered_name])}), 
-    {Pids, Ports} = separate_ports(Children, [], []),
-    Children1 = remove_used_children(Pids, Db, []),
-    Children2 = remove_others_children(Children1, Grp, Node),
-    Ports++Children2;
-add_and_remove(Children, Pid, Db, Grp, Node) when is_pid(Pid),
-						  Node==node(Pid) ->
-    ets:insert(Db#data.procs, {Pid,
-			       rpc:call(Node,erlang,process_info,
-					[Pid,registered_name])}), 
-    {Pids, Ports} = separate_ports(Children, [], []),
-    Children1 = remove_used_children(Pids, Db, []),
-    Children2 =remove_others_children(Children1, Grp, Node),
-    Ports++Children2;
-add_and_remove(_Children, Pid, _Db, _Grp, Node) when is_pid(Pid),
-						     Node/=node(Pid) ->
-    [];
-%% Take care of the ports, don't add them to the table with processes.
-add_and_remove(_Children, Pid, _Db, _Grp, _Node) when is_port(Pid) ->
-    [].
-
-%% Control that the application's group leader is the group leader of
-%% Pid
-group_leader_check({Pid,_Name}, Grp, Node) ->
-    group_leader_check(Pid, Grp, Node);
-group_leader_check(Pid, Grp, Node) ->
-    case rpc:call(Node, erlang, process_info, [Pid,group_leader]) of
-	{_Item, Grp} -> yes;
-	_ -> no
-    end.
-
-%% Take the list of children and remove the ones with anoother group
-%% leader.
-remove_others_children(Children, Grp, Node) ->
-    lists:filter(fun(Child) ->
-		   case group_leader_check(Child, Grp, Node) of
-		       yes -> true;
-		       no -> false
-		   end
-		 end,
-		 Children).
-
-%% Mark the processes in the procs table as either supervisor or worker.
-fix_links(Db, Leader, Node) ->
-    {Sup,_Work} = mark_supervisors_workers(Db, Leader, Node),
-    ets:match_delete(Db#data.procs, {'_',crap}),
-    [_Pid|Procs] = ets:tab2list(Db#data.procs),
-    N_links = get_n_links(Procs, Db#data.links, []),
-    N_links2 = take_sup_links(Sup, Db#data.links, N_links),
-    add_shared_links(N_links2, Db#data.links2),
-    Db.
-
-%% Add the links that point to the same child to the shared links table 
-add_shared_links(N_links, Links2) ->
-    Insert_fun = fun(Link) -> ets:insert(Links2, Link) end,
-    lists:map(fun(List) -> lists:map(Insert_fun, List) end, N_links).
-		    
-%% Take the list of links that point to the same children and remove
-%% the ones that are children to supervisors.
-%% The first argument is a list of the supervisors.
-%% N_links contains a list of list of links that points to the same
-%% child.
-take_sup_links([], _Db, N_links) ->
-    N_links;
-take_sup_links([H|Supervised], Links_table, N_links) ->
-   N_list_fun = fun(Link) ->
-			insert_sup_links(Link, H, Links_table)
-		end,
-    N_links2 = lists:map(fun(Link_list) ->
-				 lists:filter(N_list_fun,Link_list)
-			 end,
-			 N_links),
-    take_sup_links(Supervised, Links_table, N_links2).
-
-%% Insert the supervised links in the primary links list.
-%% This function should be used as a fun to the filter function in
-%% take_sup_links/3.
-insert_sup_links({From,To,N}, Sup, Links_table) ->
-    case From of
-	Sup -> 
-	    ets:insert(Links_table, {From,To,N}),
-	    false;
-	_ ->
-	    true
-    end.
-
-%% Get the links which points to the same children.
-get_n_links([], _Links, N_link) ->
-    N_link;
-get_n_links([{Pid,_,_}|Procs], Links, N_link) ->
-    case ets:match_object(Links, {'_',Pid,'_'}) of
-	L when length(L)>1 ->
-	    ets:match_delete(Links, {'_',Pid,'_'}),
-	    get_n_links(Procs, Links, [L|N_link]);
-	_L ->
-	    get_n_links(Procs, Links, N_link)
-    end;
-get_n_links([{Pid,_}|Procs], Links, N_link) ->
-    case ets:match_object(Links, {'_',Pid,'_'}) of
-	L when length(L)>1 ->
-	    ets:match_delete(Links, {'_',Pid,'_'}),
-	    get_n_links(Procs, Links, [L|N_link]);
-	_L ->
-	    get_n_links(Procs, Links, N_link)
-    end.
-
-%% Mark the processes that are in the supervisor tree as either worker
-%% or supervisor.
-mark_supervisors_workers(Db, Leader, Node) ->
-    %% Get the supervisors and workers.
-    {Sup_list, Worker_list} = get_by_supervisors1(Leader),
-    %% Update the supervisor pids.
-    lists:map(fun(Pid) ->
-		      ets:insert(Db#data.procs,
-				 {Pid,
-				  rpc:call(Node, erlang,process_info,
-					   [Pid,registered_name]),
-				  supervisor})
-	      end,
-	      Sup_list),
-    %% Update the worker pids.
-    lists:map(fun(Pid) ->
-		      ets:insert(Db#data.procs,
-				 {Pid,
-				  rpc:call(Node, erlang,process_info,
-					   [Pid,registered_name]),
-				  worker})
-	      end,
-	      Worker_list),
-    {lists:reverse(Sup_list), Worker_list}.
-
-%% The second way to retrieve the applications processes is to go by
-%% the supervision tree.
-get_by_supervisors1(Leader) ->
-    case application_master:get_child(Leader) of
-	{Pid, _Name}->
-	    get_by_supervisors([{namn,Pid,supervisor,list_of_mods}],
-			       [], []);
-	Pid ->
-	    get_by_supervisors([{namn,Pid,supervisor,list_of_mods}],
-			       [], [])
-    end.
-
-get_by_supervisors([], Sup, Work) ->
-    {Sup, Work};
-get_by_supervisors([{_,Pid,supervisor,_}|Rest], Sup, Work)
-  when is_pid(Pid) ->
-    Children = supervisor:which_children(Pid),
-    Children2 = lists:append(Children, Rest),
-    get_by_supervisors(Children2, [Pid|Sup], Work);
-get_by_supervisors([{_,Pid,_,_}|Rest], Sup, Work) when is_pid(Pid) ->
-    get_by_supervisors(Rest, Sup, [Pid|Work]);
-get_by_supervisors([_Whatever|Rest], Sup, Work) ->
-    get_by_supervisors(Rest, Sup, Work).
-
-%% Use pattern matching to select mode and delete the unneccesary pids
-delete_unwanted(Db, sup_child, App_pid) ->
-    delete_not_in_supervisor_tree(Db),
-    add_main_link(Db, App_pid),
-    Db;
-delete_unwanted(Db, all, _App_pid) ->
-    Db;
-delete_unwanted(Db, sup, App_pid) ->
-    delete_workers(Db),
-    delete_not_in_supervisor_tree(Db),
-    add_main_link(Db, App_pid),
-    Db.
-
-add_main_link(Db, App_pid) ->
-    case application_master:get_child(App_pid) of
-	{Pid, _Name} when is_pid(Pid) -> 
-	    ets:insert(Db#data.links, {App_pid,Pid,1});
-	Pid when is_pid(Pid) ->
-	    ets:insert(Db#data.links, {App_pid,Pid,1});
-	_ ->
-	    false
-    end.
-
-%% Delete the processes that are in the supervision tree but are
-%% workers, and their links.
-delete_workers(Db) ->
-    Pids = ets:match_object(Db#data.procs, {'_','_',worker}),
-    Pids2 =
-	lists:map(
-	  fun({Pid,_,_}) ->
-		  %% Remove the unwanted pids from the process table.
-		  ets:match_delete(Db#data.procs, {Pid,'_','_'}),
-		  %% Remove the links to and from the pid.
-		  ets:match_delete(Db#data.links, {Pid,'_','_'}),
-		  ets:match_delete(Db#data.links, {'_',Pid,'_'}),
-		  ets:match_delete(Db#data.links2, {Pid,'_','_'}),
-		  ets:match_delete(Db#data.links2, {'_',Pid,'_'})	
-	  end,
-	  Pids),
-    Pids2.
-
-%% Delete the processes that are not in the supervision tree.
-delete_not_in_supervisor_tree(Db) ->
-    Pids = ets:match_object(Db#data.procs,{'_','_'}),
-    Pids2 =
-	lists:map(
-	  fun({Pid,_}) ->
-		  %% Remove the unwanted from the process table.
-		  ets:match_delete(Db#data.procs, {Pid,'_'}),
-		  %% Remove the links to and from the pid.
-		  ets:match_delete(Db#data.links, {Pid,'_','_'}),
-		  ets:match_delete(Db#data.links, {'_',Pid,'_'}),
-		  ets:match_delete(Db#data.links2, {Pid,'_','_'}),
-		  ets:match_delete(Db#data.links2, {'_',Pid,'_'})
-	  end,
-	  Pids),
-    Pids2.
-
-%% Start generating the tree.
-start_tree(Db, Node) ->
-    case get_master(Db) of
-	no -> false;
-	Pid ->
-	    build_node(Pid, Db, Node)
-    end.
-
-%% Build a node and then it runs itself on every child to the current
-%% pid.
-build_node(Pid, Db, Node) when is_pid(Pid), Node==node(Pid) ->
-    Sort_fun = fun sort_order/2,
-    Fix_sec_name_fun = fun(Pid2) -> get_link_name(Pid2, Db) end,
-    Build_tree_fun = fun({_,Pid1,_}) -> build_node(Pid1,Db,Node) end,
-    Children = ets:match_object(Db#data.links, {Pid,'_','_'}),
-    Children1 = lists:sort(Sort_fun, Children),
-    Sec_children = ets:match_object(Db#data.links2, {Pid,'_','_'}),
-    {get_name(Pid,Db),
-     lists:map(Build_tree_fun,Children1),
-     lists:map(Fix_sec_name_fun,Sec_children)};
-build_node(Pid, _Db, Node) when is_pid(Pid), Node/=node(Pid) ->
-    {"Runs on another node:"++erlang:pid_to_list(Pid), [], []};
-build_node(Pid, _Db, _Node) when is_port(Pid) ->
-    {"Port :"++erlang:port_to_list(Pid), [], []}.
-
-%% Select the name of the pid from the database where we previosly
-%% added it.
-get_name(Pid, Db) ->    
-    case ets:lookup(Db#data.procs, Pid) of
-	[{_,{_,master},_}] -> pid_to_list(Pid);
-	[{_,{_,Name}}] -> atom_to_list(Name)++" : "++pid_to_list(Pid);
-	[{_,{_,Name},_}] -> atom_to_list(Name)++" : "++pid_to_list(Pid);
-	_ -> pid_to_list(Pid)
-    end.
-
-%% Select the name of the process which we have a link to.
-get_link_name({_,Pid,_}, Db) when is_pid(Pid) ->    
-    case ets:lookup(Db#data.procs, Pid) of
-	[{_,{_,Name}}] -> atom_to_list(Name)++" : "++pid_to_list(Pid);
-	[{_,{_,Name},_}] -> atom_to_list(Name)++" : "++pid_to_list(Pid);
-	_ -> pid_to_list(Pid)
-    end;
-get_link_name({_,Port,_}, _Db) when is_port(Port) ->    
-    "Port :"++" : ";
-get_link_name(_, _) ->
-    "".
-
-%% Sort the links in the order they where added, in ascending order.
-sort_order({_,_,N1}, {_,_,N2}) when N1>N2 -> true;
-sort_order(_N1, _N2) -> false.
-
-%% Select the pid of the application master.
-get_master(Db) ->
-    case ets:match_object(Db#data.procs,
-			  {'_',{master,master},controller}) of
-	[{Pid,_,_}|_Rest] -> Pid;
-	_ -> no
-    end.
-
-%% The main function to handle tracing.
-%% Checks if the process is in the table with traced processes. If so,
-%% it stops the trace, otherwise it starts the trace.
-do_send_trace(PidL, Traced_tab) ->
-    Pid = list_to_pid(PidL),
-    Key = get_key(Pid),
-    case catch ets:lookup(Traced_tab, Key) of
-	[] ->
-	    trace_process(Pid, Key, true, Traced_tab);
-	[_Object]->
-	    trace_process(Pid, Key, false, Traced_tab)
-    end,
-    filter_procs(Traced_tab, ets:tab2list(Traced_tab)).
-
-get_key(Pid) ->
-    Node = node(Pid),
-    case rpc:call(Node, erlang, process_info, [Pid,registered_name]) of
-	[] -> pid_to_list(Pid);
-	{registered_name, Name} ->
-	    atom_to_list(Name)++" : "++pid_to_list(Pid)
-    end.
-
-%% Tries to toggle the trace flag for the process.
-trace_process(Pid, Key, On_or_off, Procs_tab) ->
-    case rpc:call(node(Pid), sys, trace, [Pid,On_or_off,1000]) of
-	timeout ->
-	    Node = node(Pid),
-	    io:fwrite("timeout node= ~w, Pid= ~w mode= ~w ~n",
-		      [Node, Pid, On_or_off]);
-	{badrpc, _} ->
-	    Node = node(Pid),
-	    io:fwrite("badrpc node= ~w, Pid= ~w mode= ~w ~n",
-		      [Node, Pid, On_or_off]);
-	Res ->
-	    Node = node(Pid),
-	    io:fwrite("anymode ~w node= ~w, Pid= ~w mode= ~w ~n",
-		      [Res, Node, Pid,On_or_off]),
-	    case On_or_off of
-		true -> ets:insert(Procs_tab, {Key,On_or_off});
-		false -> ets:delete(Procs_tab, Key)
-	    end
-    end.
-
-%% Check if the processes in the ets table with traced processes
-%% are alive. If not, remove them.
-filter_procs(Tab, Tab_list) ->
-    lists:foreach(fun({Key,_Val}) -> is_alive(Key, Tab) end, Tab_list).
-
-is_alive(Key, Tab) ->
-    case get_pid(Key) of
-	nopid -> false;
-	Pid -> is_alive2(Pid, Key, Tab)
-    end.
-
-%% Key is either a pid in list form or Pidname:Pid in list form.
-get_pid(Key) ->
-    case catch list_to_pid(string:substr(Key,string:rchr(Key,$<))) of
-	Pid when is_pid(Pid) ->
-	    Pid;
-	_ ->
-	    nopid
-    end.
-
-is_alive2(Pid, Key, Tab) ->
-    case catch rpc:call(node(Pid), erlang, is_process_alive, [Pid]) of
-	true -> true;
-	false ->
-	    catch ets:delete(Tab, Key),
-	    ok
-    end.
diff --git a/lib/appmon/vsn.mk b/lib/appmon/vsn.mk
deleted file mode 100644
index 5585c5e1c2..0000000000
--- a/lib/appmon/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-APPMON_VSN = 2.1.14.2
diff --git a/lib/asn1/Makefile b/lib/asn1/Makefile
index 9c1b19605c..1bc303b73c 100644
--- a/lib/asn1/Makefile
+++ b/lib/asn1/Makefile
@@ -25,6 +25,8 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 #
 
 SUB_DIRECTORIES = src doc/src c_src
+static_lib: SUB_DIRECTORIES = c_src
+
 
 include vsn.mk
 VSN = $(ASN1_VSN)
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index 70238335c4..ded4b73d1b 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -46,12 +46,11 @@ else
 TYPEMARKER =
 endif
 
-EI_LIBDIR = $(ERL_TOP)/lib/erl_interface/obj$(TYPEMARKER)/$(TARGET)
-
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
 CFLAGS = $(DED_INCLUDES) $(EI_INCLUDES) $(DED_CFLAGS)
+STATIC_CFLAGS = $(DED_INCLUDES) $(EI_INCLUDES) $(DED_STATIC_CFLAGS)
 LDFLAGS += $(DED_LDFLAGS)
 
 # ----------------------------------------------------
@@ -59,18 +58,38 @@ LDFLAGS += $(DED_LDFLAGS)
 # ----------------------------------------------------
 
 NIF_OBJ_FILES = $(OBJDIR)/asn1_erl_nif.o
+NIF_STATIC_OBJ_FILES = $(OBJDIR)/asn1_erl_nif_static.o
 
-
+# Module and shared lib have to have same name of
+# static nifs to work
 ifeq ($(TARGET),win32)
-NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.dll
+NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1rt_nif.dll
+NIF_LIB_FILE = $(LIBDIR)/asn1rt_nif.lib
 CLIB_FLAGS =
 LN=cp
 else
-NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.so
+NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1rt_nif.so
+NIF_LIB_FILE = $(LIBDIR)/asn1rt_nif.a
 CLIB_FLAGS = -lc
 LN= ln -s
 endif
 
+ifeq ($(USING_VC),yes)
+AR_OUT=-out:
+AR_FLAGS=
+else
+AR_OUT=
+ifeq ($(V),0)
+AR_FLAGS=rc
+else
+AR_FLAGS=rcv
+endif
+endif
+
+ifndef RANLIB
+RANLIB=true
+endif
+
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
@@ -81,6 +100,8 @@ opt: $(NIF_SHARED_OBJ_FILE)
 
 debug: opt
 
+static_lib: $(NIF_LIB_FILE)
+
 clean:
 	rm -f core *~ 
 	rm -f $(LIBDIR)/*
@@ -96,6 +117,13 @@ docs:
 $(OBJDIR)/%.o: %.c
 	$(V_CC) -c $(CFLAGS) -O3 -o $@ $<
 
+$(OBJDIR)/%_static.o: %.c
+	$(V_CC) -c $(STATIC_CFLAGS) -O3 -o $@ $<
+
+$(NIF_LIB_FILE): $(NIF_STATIC_OBJ_FILES)
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(NIF_STATIC_OBJ_FILES)
+	$(V_RANLIB) $@
+
 $(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
 	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
 
diff --git a/lib/asn1/c_src/asn1_erl_nif.c b/lib/asn1/c_src/asn1_erl_nif.c
index b3dd312fed..0930010fda 100644
--- a/lib/asn1/c_src/asn1_erl_nif.c
+++ b/lib/asn1/c_src/asn1_erl_nif.c
@@ -57,54 +57,54 @@
 #define MASK(X,M) (X & M)
 
 /* PER COMPLETE */
-int per_complete(ErlNifBinary *, unsigned char *, int);
+static int per_complete(ErlNifBinary *, unsigned char *, int);
 
-int per_insert_octets(int, unsigned char **, unsigned char **, int *);
+static int per_insert_octets(int, unsigned char **, unsigned char **, int *);
 
-int per_insert_octets_except_unused(int, unsigned char **, unsigned char **,
+static int per_insert_octets_except_unused(int, unsigned char **, unsigned char **,
 	int *, int);
 
-int per_insert_octets_as_bits_exact_len(int, int, unsigned char **,
+static int per_insert_octets_as_bits_exact_len(int, int, unsigned char **,
 	unsigned char **, int *);
 
-int per_insert_octets_as_bits(int, unsigned char **, unsigned char **, int *);
+static int per_insert_octets_as_bits(int, unsigned char **, unsigned char **, int *);
 
-int per_pad_bits(int, unsigned char **, int *);
+static int per_pad_bits(int, unsigned char **, int *);
 
-int per_insert_least_sign_bits(int, unsigned char, unsigned char **, int *);
+static int per_insert_least_sign_bits(int, unsigned char, unsigned char **, int *);
 
-int per_insert_most_sign_bits(int, unsigned char, unsigned char **, int *);
+static int per_insert_most_sign_bits(int, unsigned char, unsigned char **, int *);
 
-int per_insert_bits_as_bits(int, int, unsigned char **, unsigned char **, int *);
+static int per_insert_bits_as_bits(int, int, unsigned char **, unsigned char **, int *);
 
-int per_insert_octets_unaligned(int, unsigned char **, unsigned char **, int);
+static int per_insert_octets_unaligned(int, unsigned char **, unsigned char **, int);
 
-int per_realloc_memory(ErlNifBinary *, int, unsigned char **);
+static int per_realloc_memory(ErlNifBinary *, int, unsigned char **);
 
 /* BER DECODE */
-int ber_decode_begin(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int,
+static int ber_decode_begin(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int,
 	unsigned int *);
 
-int ber_decode(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int *, int);
+static int ber_decode(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int *, int);
 
-int ber_decode_tag(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int, int *);
+static int ber_decode_tag(ErlNifEnv *, ERL_NIF_TERM *, unsigned char *, int, int *);
 
-int ber_decode_value(ErlNifEnv*, ERL_NIF_TERM *, unsigned char *, int *, int,
+static int ber_decode_value(ErlNifEnv*, ERL_NIF_TERM *, unsigned char *, int *, int,
 	int);
 
 /* BER ENCODE */
 typedef struct ber_encode_mem_chunk mem_chunk_t;
 
-int ber_encode(ErlNifEnv *, ERL_NIF_TERM , mem_chunk_t **, unsigned int *);
+static int ber_encode(ErlNifEnv *, ERL_NIF_TERM , mem_chunk_t **, unsigned int *);
 
-void ber_free_chunks(mem_chunk_t *chunk);
-mem_chunk_t *ber_new_chunk(unsigned int length);
-int ber_check_memory(mem_chunk_t **curr, unsigned int needed);
+static void ber_free_chunks(mem_chunk_t *chunk);
+static mem_chunk_t *ber_new_chunk(unsigned int length);
+static int ber_check_memory(mem_chunk_t **curr, unsigned int needed);
 
-int ber_encode_tag(ErlNifEnv *, ERL_NIF_TERM , unsigned int ,
+static int ber_encode_tag(ErlNifEnv *, ERL_NIF_TERM , unsigned int ,
 	mem_chunk_t **, unsigned int *);
 
-int ber_encode_length(size_t , mem_chunk_t **, unsigned int *);
+static int ber_encode_length(size_t , mem_chunk_t **, unsigned int *);
 
 /*
  *
@@ -113,7 +113,7 @@ int ber_encode_length(size_t , mem_chunk_t **, unsigned int *);
  *
  */
 
-int per_complete(ErlNifBinary *out_binary, unsigned char *in_buf,
+static int per_complete(ErlNifBinary *out_binary, unsigned char *in_buf,
 	int in_buf_len) {
     int counter = in_buf_len;
     /* counter keeps track of number of bytes left in the
@@ -489,7 +489,7 @@ int per_complete(ErlNifBinary *out_binary, unsigned char *in_buf,
     }
 }
 
-int per_realloc_memory(ErlNifBinary *binary, int amount, unsigned char **ptr) {
+static int per_realloc_memory(ErlNifBinary *binary, int amount, unsigned char **ptr) {
 
     int i = *ptr - binary->data;
 
@@ -502,7 +502,7 @@ int per_realloc_memory(ErlNifBinary *binary, int amount, unsigned char **ptr) {
     return ASN1_OK;
 }
 
-int per_insert_most_sign_bits(int no_bits, unsigned char val,
+static int per_insert_most_sign_bits(int no_bits, unsigned char val,
 	unsigned char **output_ptr, int *unused) {
     unsigned char *ptr = *output_ptr;
 
@@ -523,7 +523,7 @@ int per_insert_most_sign_bits(int no_bits, unsigned char val,
     return ASN1_OK;
 }
 
-int per_insert_least_sign_bits(int no_bits, unsigned char val,
+static int per_insert_least_sign_bits(int no_bits, unsigned char val,
 	unsigned char **output_ptr, int *unused) {
     unsigned char *ptr = *output_ptr;
     int ret = 0;
@@ -552,7 +552,7 @@ int per_insert_least_sign_bits(int no_bits, unsigned char val,
 /* per_pad_bits adds no_bits bits in the buffer that output_ptr
  points at.
  */
-int per_pad_bits(int no_bits, unsigned char **output_ptr, int *unused) {
+static int per_pad_bits(int no_bits, unsigned char **output_ptr, int *unused) {
     unsigned char *ptr = *output_ptr;
     int ret = 0;
 
@@ -575,7 +575,7 @@ int per_pad_bits(int no_bits, unsigned char **output_ptr, int *unused) {
  The unused parameter tells how many bits that are not set in the
  actual byte in the output buffer. If desired_no is more bits than the
  input buffer has in no_bytes bytes, then zero bits is padded.*/
-int per_insert_bits_as_bits(int desired_no, int no_bytes,
+static int per_insert_bits_as_bits(int desired_no, int no_bytes,
 	unsigned char **input_ptr, unsigned char **output_ptr, int *unused) {
     unsigned char *in_ptr = *input_ptr;
     unsigned char val;
@@ -615,7 +615,7 @@ int per_insert_bits_as_bits(int desired_no, int no_bytes,
 }
 
 /* per_insert_octets_as_bits_exact_len */
-int per_insert_octets_as_bits_exact_len(int desired_len, int in_buff_len,
+static int per_insert_octets_as_bits_exact_len(int desired_len, int in_buff_len,
 	unsigned char **in_ptr, unsigned char **ptr, int *unused) {
     int ret = 0;
     int ret2 = 0;
@@ -653,7 +653,7 @@ int per_insert_octets_as_bits_exact_len(int desired_len, int in_buff_len,
  otherwise the function returns ASN1_ERROR. The output buffer is concatenated
  without alignment.
  */
-int per_insert_octets_as_bits(int no_bytes, unsigned char **input_ptr,
+static int per_insert_octets_as_bits(int no_bytes, unsigned char **input_ptr,
 	unsigned char **output_ptr, int *unused) {
     unsigned char *in_ptr = *input_ptr;
     unsigned char *ptr = *output_ptr;
@@ -693,7 +693,7 @@ int per_insert_octets_as_bits(int no_bytes, unsigned char **input_ptr,
  into the output buffer, *output_ptr. Before the first byte is
  inserted the input buffer is aligned.
  */
-int per_insert_octets(int no_bytes, unsigned char **input_ptr,
+static int per_insert_octets(int no_bytes, unsigned char **input_ptr,
 	unsigned char **output_ptr, int *unused) {
     unsigned char *in_ptr = *input_ptr;
     unsigned char *ptr = *output_ptr;
@@ -718,7 +718,7 @@ int per_insert_octets(int no_bytes, unsigned char **input_ptr,
 /* per_insert_octets_unaligned inserts bytes from the input buffer, *input_ptr,
  into the output buffer, *output_ptr.No alignment is done.
  */
-int per_insert_octets_unaligned(int no_bytes, unsigned char **input_ptr,
+static int per_insert_octets_unaligned(int no_bytes, unsigned char **input_ptr,
 	unsigned char **output_ptr, int unused) {
     unsigned char *in_ptr = *input_ptr;
     unsigned char *ptr = *output_ptr;
@@ -742,7 +742,7 @@ int per_insert_octets_unaligned(int no_bytes, unsigned char **input_ptr,
     return no_bytes;
 }
 
-int per_insert_octets_except_unused(int no_bytes, unsigned char **input_ptr,
+static int per_insert_octets_except_unused(int no_bytes, unsigned char **input_ptr,
 	unsigned char **output_ptr, int *unused, int in_unused) {
     unsigned char *in_ptr = *input_ptr;
     unsigned char *ptr = *output_ptr;
@@ -835,7 +835,7 @@ int per_insert_octets_except_unused(int no_bytes, unsigned char **input_ptr,
  * is the empty binary.
  * If some error occured during the decoding of the in_buf an error is returned.
  */
-int ber_decode_begin(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
+static int ber_decode_begin(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
 	int in_buf_len, unsigned int *err_pos) {
     int maybe_ret;
     int ib_index = 0;
@@ -857,7 +857,7 @@ int ber_decode_begin(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
     return ASN1_OK;
 }
 
-int ber_decode(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
+static int ber_decode(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
 	int *ib_index, int in_buf_len) {
     int maybe_ret;
     int form;
@@ -889,7 +889,7 @@ int ber_decode(ErlNifEnv* env, ERL_NIF_TERM *term, unsigned char *in_buf,
  * decode_tag decodes the BER encoded tag in in_buf and creates an
  * nif term tag
  */
-int ber_decode_tag(ErlNifEnv* env, ERL_NIF_TERM *tag, unsigned char *in_buf,
+static int ber_decode_tag(ErlNifEnv* env, ERL_NIF_TERM *tag, unsigned char *in_buf,
 	int in_buf_len, int *ib_index) {
     int tag_no, tmp_tag, form;
 
@@ -936,7 +936,7 @@ int ber_decode_tag(ErlNifEnv* env, ERL_NIF_TERM *tag, unsigned char *in_buf,
  * in_buf and puts the value part in the decode_buf as an Erlang
  * nif term into value
  */
-int ber_decode_value(ErlNifEnv* env, ERL_NIF_TERM *value, unsigned char *in_buf,
+static int ber_decode_value(ErlNifEnv* env, ERL_NIF_TERM *value, unsigned char *in_buf,
 	int *ib_index, int form, int in_buf_len) {
     int maybe_ret;
     unsigned int len = 0;
@@ -1012,7 +1012,7 @@ struct ber_encode_mem_chunk {
     char *curr;
 };
 
-int ber_encode(ErlNifEnv *env, ERL_NIF_TERM term, mem_chunk_t **curr, unsigned int *count) {
+static int ber_encode(ErlNifEnv *env, ERL_NIF_TERM term, mem_chunk_t **curr, unsigned int *count) {
 
     const ERL_NIF_TERM *tv;
     unsigned int form;
@@ -1087,7 +1087,7 @@ int ber_encode(ErlNifEnv *env, ERL_NIF_TERM term, mem_chunk_t **curr, unsigned i
     return ASN1_OK;
 }
 
-int ber_encode_tag(ErlNifEnv *env, ERL_NIF_TERM tag, unsigned int form,
+static int ber_encode_tag(ErlNifEnv *env, ERL_NIF_TERM tag, unsigned int form,
 	mem_chunk_t **curr, unsigned int *count) {
     unsigned int class_tag_no, head_tag;
     if (!enif_get_uint(env, tag, &class_tag_no))
@@ -1122,7 +1122,7 @@ int ber_encode_tag(ErlNifEnv *env, ERL_NIF_TERM tag, unsigned int form,
     }
 }
 
-int ber_encode_length(size_t size, mem_chunk_t **curr, unsigned int *count) {
+static int ber_encode_length(size_t size, mem_chunk_t **curr, unsigned int *count) {
     if (size < 128) {
 	if (ber_check_memory(curr, 1u))
 	    return ASN1_ERROR;
@@ -1150,7 +1150,7 @@ int ber_encode_length(size_t size, mem_chunk_t **curr, unsigned int *count) {
     return ASN1_OK;
 }
 
-mem_chunk_t *ber_new_chunk(unsigned int length) {
+static mem_chunk_t *ber_new_chunk(unsigned int length) {
     mem_chunk_t *new = enif_alloc(sizeof(mem_chunk_t));
     if (new == NULL)
 	return NULL;
@@ -1165,7 +1165,7 @@ mem_chunk_t *ber_new_chunk(unsigned int length) {
     return new;
 }
 
-void ber_free_chunks(mem_chunk_t *chunk) {
+static void ber_free_chunks(mem_chunk_t *chunk) {
     mem_chunk_t *curr, *next = chunk;
     while (next != NULL) {
 	curr = next;
@@ -1175,7 +1175,7 @@ void ber_free_chunks(mem_chunk_t *chunk) {
     }
 }
 
-int ber_check_memory(mem_chunk_t **curr, unsigned int needed) {
+static int ber_check_memory(mem_chunk_t **curr, unsigned int needed) {
     mem_chunk_t *new;
     if ((*curr)->curr-needed >= (*curr)->top)
 	return ASN1_OK;
diff --git a/lib/asn1/doc/src/asn1_spec.xmlsrc b/lib/asn1/doc/src/asn1_spec.xmlsrc
index 07cba17816..9001aca65c 100644
--- a/lib/asn1/doc/src/asn1_spec.xmlsrc
+++ b/lib/asn1/doc/src/asn1_spec.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/asn1/doc/src/asn1_ug.xml b/lib/asn1/doc/src/asn1_ug.xml
index 362ca9330f..ee54fdffd7 100644
--- a/lib/asn1/doc/src/asn1_ug.xml
+++ b/lib/asn1/doc/src/asn1_ug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -205,16 +205,13 @@ ok
         is saved in the <c>People.asn1db</c> file, the
         generated Erlang code is compiled using the Erlang compiler and
         loaded into  the Erlang runtime system. Now there is a user interface
-        of encode/2 and decode/2 in the module People, which is invoked by:
+        for <c>encode/2</c> and <c>decode/2</c> in the module People,
+	which is invoked by:
                 <br></br>
 <c><![CDATA['People':encode(<Type name>,<Value>),]]></c>        <br></br>
 
         or        <br></br>
-<c><![CDATA['People':decode(<Type name>,<Value>),]]></c>        <br></br>
-
-        Alternatively one can use the <c><![CDATA[asn1rt:encode(<Module name> ,<Type name>,<Value>)]]></c> and <c><![CDATA[asn1rt:decode(< Module name>,<Type name>,<Value>)]]></c> calls.
-        However, they are not as efficient as the previous methods since they
-        result in an additional <c>apply/3</c> call.</p>
+<c><![CDATA['People':decode(<Type name>,<Value>),]]></c></p>
       <p>Assume there is a network
         application which receives instances of the  ASN.1 defined
         type Person,  modifies and sends them back again:</p>
@@ -241,16 +238,14 @@ receive
         encoding-rules. 
                 <br></br>
 The encoder and the decoder can also be run from
-        the shell. The following  dialogue with the shell illustrates
-        how the functions   
-        <c>asn1rt:encode/3</c> and <c>asn1rt:decode/3</c> are used.</p>
+        the shell.</p>
       <pre>
 2> <input>Rockstar = {'Person',"Some Name",roving,50}.</input>
 {'Person',"Some Name",roving,50}
-3> <input>{ok,Bin} = asn1rt:encode('People','Person',Rockstar).</input>
+3> <input>{ok,Bin} = 'People':encode('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>
+4> <input>{ok,Person} = 'People':decode('Person',Bin).</input>
 {ok,{'Person',"Some Name",roving,50}}
 5>      </pre>
     </section>
@@ -279,11 +274,8 @@ The encoder and the decoder can also be run from
           (including the compiler).</p>
       </item>
       <item>
-        <p>The module <c>asn1rt</c> which provides the run-time functions. 
-          However, it is preferable to use the generated <c>encode/2</c> and 
-          <c>decode/2</c> functions in each module, ie. 
-          Module:encode(Type,Value), in favor of the <c>asn1rt</c> 
-          interface.</p>
+        <p>The module <c>asn1rt_nif</c> which provides the run-time functions
+	for the ASN.1 decoder for the BER back-end.</p>
       </item>
     </list>
     <p>The reason for the division  of the interface into  compile-time 
@@ -384,25 +376,9 @@ asn1ct:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
 
     <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
-        <seealso marker="asn1rt"> the Asn1 Reference Manual</seealso>, the <c>asn1rt</c> module.</p>
-      <p>The generic run-time encode and decode functions can be invoked as below:</p>
-      <pre>
-asn1rt:encode('H323-MESSAGES','SomeChoiceType',{call,"octetstring"}).
-asn1rt:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
-      <p>Or, preferable like:</p>
-      <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</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
-        to load the nif separately by loading the <c>asn1rt_nif</c> module.</p>
+      <p>When an ASN.1 specification is compiled with the <c>ber</c>
+      option, the module <c>asn1rt_nif</c> module and the NIF library in
+      <c>asn1/priv_dir</c> will be needed at run-time.</p>
       <p>By invoking the function <c>info/0</c> in a generated module, one
         gets information about which compiler options were used.</p>
     </section>
@@ -414,8 +390,8 @@ asn1rt:decode('H323-MESSAGES','SomeChoiceType',Bytes).      </pre>
         a line number indicating where in the source file the error 
         was detected. If no errors are found, an Erlang ASN.1 module will
         be created as default.</p>
-      <p>The run-time encoders and decoders (in the <c>asn1rt</c> module) do
-        execute within a catch and returns <c>{ok, Data}</c> or
+      <p>The run-time encoders and decoders execute within a catch and
+      returns <c>{ok, Data}</c> or
         <c>{error, {asn1, Description}}</c> where
         <c>Description</c> is
         an Erlang term describing the error. </p>
@@ -653,7 +629,7 @@ Day1 = saturday,
 Bits1 ::= BIT STRING
 Bits2 ::= BIT STRING {foo(0),bar(1),gnu(2),gnome(3),punk(14)}
       </pre>
-      <p>There are five different notations available for representation of
+      <p>There are two notations available for representation of
         BIT STRING values in Erlang and as input to the encode functions.</p>
       <list type="ordered">
 	<item>A bitstring. By default, a BIT STRING with no
@@ -661,43 +637,10 @@ Bits2 ::= BIT STRING {foo(0),bar(1),gnu(2),gnome(3),punk(14)}
         <item>A list of atoms corresponding to atoms in the <c>NamedBitList</c> 
          in the BIT STRING definition. A BIT STRING with symbolic
 	 names will always be decoded to this format.</item>
-        <item>A list of binary digits (0 or 1). This format is always
-	  accepted as input to the encode functions. A BIT STRING will
-	  be decoded to this format if <em>legacy_bit_string</em> option
-	  has been given. <em>This format may be withdrawn in a future
-         release.</em>
-	</item>
-        <item>As <c>{Unused,Binary}</c> where <c>Unused</c> denotes how
-          many trailing zero-bits 0 to 7 that are unused in the least
-          significant byte in <c>Binary</c>. This format is always
-	  accepted as input to the encode functions. A BIT STRING will
-	  be decoded to this format if <em>compact_bit_string</em> has
-	  been given. <em>This format may be withdrawn in a future
-          release.</em>
-	</item>
-        <item>A hexadecimal number (or an integer). This format should be
-         avoided, since it is easy to misinterpret a <c>BIT STRING</c>
-         value in this format. <em>This format may be withdrawn in a future
-         release.</em>
-	</item>
       </list>
-      <note>
-        <p>It is recommended to either use the bitstring format (for
-	  BIT STRINGs with no symbolic names) or a list of symbolic
-	  names (for BIT STRINGs with symbolic names). The other formats
-	  should be avoided since they may be withdrawn in a future
-	  release.
-	</p>
-      </note>
+      <p>Example:</p>
       <pre>
 Bits1Val1 = &lt;&lt;0:1,1:1,0:1,1:1,1:1&gt;&gt;,
-Bits1Val2 = 16#1A,
-Bits1Val3 = {3,&lt;&lt;0:1,1:1,0:1,1:1,1:1,0:3&gt;&gt;},
-Bits1Val4 = [0,1,0,1,1]
-      </pre>
-      <p>Note that <c>Bits1Val1</c>, <c>Bits1Val2</c>, <c>Bits1Val3</c>,
-	and <c>Bits1Val1</c> denote the same value.</p>
-      <pre>
 Bits2Val1 = [gnu,punk],
 Bits2Val2 = &lt;&lt;2#1110:4&gt;&gt;,
 Bits2Val3 = [bar,gnu,gnome],
@@ -708,37 +651,60 @@ Bits2Val3 = [bar,gnu,gnome],
         2 and 14 are set to 1 and the rest set to 0. The symbolic values
         appear as a list of values. If a named value appears, which is not
         specified in the type definition, a run-time error will occur.</p>
-      <p>The compact notation equivalent to the empty BIT STRING is
-        <c><![CDATA[{0,<<>>}]]></c>, which in the other notations is
-	<c><![CDATA[<<>>]]></c>, <c>[]</c>, or
-        <c>0</c>.</p>
       <p>BIT STRINGS may also be sub-typed with, for example, a SIZE
         specification:</p>
       <pre>
 Bits3 ::= BIT STRING (SIZE(0..31))      </pre>
       <p>This means that no bit higher than 31 can ever be set.</p>
+
+      <section>
+	<title>Deprecated representations for BIT STRING</title>
+	<p>In addition to the representations described above, the
+	following deprecated representations are available if the
+	specification has been compiled with the
+	<c>legacy_erlang_types</c> option:</p>
+	<list type="ordered">
+	  <item>A list of binary digits (0 or 1). This format is
+	  accepted as input to the encode functions, and a BIT STRING
+	  will be decoded to this format if the
+	  <em>legacy_bit_string</em> option has been given.
+	  </item>
+	  <item>As <c>{Unused,Binary}</c> where <c>Unused</c> denotes
+	  how many trailing zero-bits 0 to 7 that are unused in the
+	  least significant byte in <c>Binary</c>. This format is
+	  accepted as input to the encode functions, and a <c>BIT
+	  STRING</c> will be decoded to this format if
+	  <em>compact_bit_string</em> has been given.
+	  </item>
+	  <item>A hexadecimal number (or an integer). This format
+	  should be avoided, since it is easy to misinterpret a BIT
+	  STRING value in this format.
+	  </item>
+	</list>
+      </section>
     </section>
 
     <section>
       <marker id="OCTET STRING"></marker>
       <title>OCTET STRING</title>
-      <p>The OCTET STRING is the simplest of all ASN.1 types The OCTET STRING
-        only moves or transfers e.g. binary files or other unstructured
-        information complying to two rules.
-        Firstly, the bytes consist of octets and secondly, encoding is 
-        not required.</p>
+      <p>The OCTET STRING is the simplest of all ASN.1 types. The
+      OCTET STRING only moves or transfers e.g. binary files or other
+      unstructured information complying to two rules.  Firstly, the
+      bytes consist of octets and secondly, encoding is not
+      required.</p>
       <p>It is possible to have the following ASN.1 type definitions:</p>
       <pre>
 O1 ::= OCTET STRING
 O2 ::= OCTET STRING (SIZE(28))      </pre>
       <p>With the following example assignments in Erlang:</p>
       <pre>
-O1Val = [17,13,19,20,0,0,255,254],
-O2Val = "must be exactly 28 chars....",      </pre>
-      <p>Observe that <c>O1Val</c> is assigned a series of numbers between 0 
-        and 255 i.e. octets.
-        <c>O2Val</c> is assigned using the string notation.
-        </p>
+O1Val = &lt;&lt;17,13,19,20,0,0,255,254&gt;&gt;,
+O2Val = &lt;&lt;"must be exactly 28 chars...."&gt;&gt;,</pre>
+       <p>By default, an OCTET STRING is always represented as
+       an Erlang binary. If the specification has been compiled with
+       the <c>legacy_erlang_types</c> option, the encode functions
+       will accept both lists and binaries, and the decode functions
+       will decode an OCTET STRING to a list.</p>
     </section>
 
     <section>
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index f04bac9fec..4d5a1a402a 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -42,6 +42,17 @@
       can be used in during development of applications which handles ASN.1
       data (encoded as BER or PER).</p>
       <note>
+	<p>By default in OTP 17, the representation of the BIT STRING
+	and OCTET STRING types as Erlang terms have changed. BIT
+	STRING values are now Erlang bitstrings and OCTET STRING values
+	are binaries.  For details see <seealso
+	marker="asn1_ug#BIT STRING">BIT STRING</seealso> and <seealso
+	marker="asn1_ug#OCTET STRING">OCTET STRING</seealso> in User's
+	Guide.</p>
+	<p>To revert to the old representation of the types, use the
+	<c>legacy_erlang_types</c> option.</p>
+      </note>
+      <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
@@ -50,7 +61,7 @@
 	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.
+	function always returns a binary.
 	The <c>encode/2</c> function for the BER back-end used to return
 	an iolist.</p>
       </note>
@@ -64,9 +75,9 @@
         <v>Asn1module = atom() | string()</v>
         <v>Options = [Option| OldOption]</v>
         <v>Option = ber | per | uper | der | compact_bit_string |
-	legacy_bit_string |
+	legacy_bit_string | legacy_erlang_types |
 	noobj | {n2n, EnumTypeName} |{outdir, Dir} | {i, IncludeDir} |
-	asn1config | undec_rest |
+	asn1config | undec_rest | no_ok_wrapper |
 	{macro_name_prefix, Prefix} | {record_name_prefix, Prefix} | verbose | warnings_as_errors</v>
         <v>OldOption = ber | per</v> 
         <v>Reason = term()</v>
@@ -163,6 +174,7 @@ File3.asn        </pre>
 		BIT STRING type section in the Users Guide
 	      </seealso>.
 	    </p>
+	    <p>This option implies the <c>legacy_erlang_types</c> option.</p>
 	  </item>
           <tag><c>legacy_bit_string</c></tag>
           <item>
@@ -175,8 +187,19 @@ File3.asn        </pre>
 	      <seealso marker="asn1_ug#BIT STRING">
 		BIT STRING type section in the Users Guide
 	      </seealso>.
+	      <p>This option implies the <c>legacy_erlang_types</c> option.</p>
 	    </p>
 	  </item>
+          <tag><c>legacy_erlang_types</c></tag>
+          <item>
+            <p>Use the same Erlang types to represent BIT STRING and
+            OCTET STRING as in R16. For details see <seealso
+            marker="asn1_ug#BIT STRING">BIT STRING</seealso> and
+            <seealso marker="asn1_ug#OCTET STRING">OCTET
+            STRING</seealso> in User's Guide.</p>
+	    <p><em>This option is not recommended for
+            new code.</em></p>
+	  </item>
           <tag><c>{n2n, EnumTypeName}</c></tag>
           <item>
             <p>
@@ -238,6 +261,13 @@ File3.asn        </pre>
               list or a binary. Earlier versions of the compiler ignored
               those following bytes.</p>
           </item>
+	  <tag><c>no_ok_wrapper</c></tag>
+	  <item>
+	    <p>If this option is given, the generated <c>encode/2</c>
+	    and <c>decode/2</c> functions will not wrap a successful
+	    return value in an <c>{ok,...}</c> tuple. If any error
+	    occurs, there will be an exception.</p>
+	  </item>
           <tag><c>{macro_name_prefix, Prefix}</c></tag>
           <item>
               <p>All macro names generated by the compiler are prefixed with
@@ -296,6 +326,8 @@ File3.asn        </pre>
           not always checked. Returns <c>{ok, Bytes}</c> if successful or
           <c>{error, Reason}</c> if an error occurred.
           </p>
+	<p>This function is deprecated.
+	Use <c>Module:encode(Type, Value)</c> instead.</p>
       </desc>
     </func>
     <func>
@@ -309,6 +341,8 @@ File3.asn        </pre>
       <desc>
         <p>Decodes <c>Type</c> from <c>Module</c> from the binary
           <c>Bytes</c>. Returns <c>{ok, Value}</c> if successful.</p>
+	<p>This function is deprecated.
+	Use <c>Module:decode(Type, Bytes)</c> instead.</p>
       </desc>
     </func>
     <func>
@@ -356,11 +390,11 @@ File3.asn        </pre>
           </item>
         </list>
 
-        <p>Schematically the following happens for each type in the module:
+        <p>Schematically the following happens for each type in the module:</p>
         <code type="none">
 {ok, Value} = asn1ct:value(Module, Type),
 {ok, Bytes} = asn1ct:encode(Module, Type, Value),
-{ok, Value} = asn1ct:decode(Module, Type, Bytes).</code></p>
+{ok, Value} = asn1ct:decode(Module, Type, Bytes).</code>
 
         <p>The <c>test</c> functions utilizes the <c>*.asn1db</c> files
           for all included modules. If they are located in a different
diff --git a/lib/asn1/doc/src/asn1rt.xml b/lib/asn1/doc/src/asn1rt.xml
index 2b1b108ab1..3cf56b01ca 100644
--- a/lib/asn1/doc/src/asn1rt.xml
+++ b/lib/asn1/doc/src/asn1rt.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -34,9 +34,12 @@
   <module>asn1rt</module>
   <modulesummary>ASN.1 runtime support functions</modulesummary>
   <description>
-    <p>This module is the interface module for the ASN.1 runtime support functions.
-      To encode and decode ASN.1 types in runtime the functions in this module
-      should be used.</p>
+    <warning>
+      <p>
+	All functions in this module are deprecated and will be
+	removed in a future release.
+      </p>
+    </warning>
   </description>
 
   <funcs>
@@ -52,6 +55,7 @@
       <desc>
         <p>Decodes <c>Type</c> from <c>Module</c> from the binary <c>Bytes</c>.
           Returns <c>{ok,Value}</c> if successful.</p>
+	<p>Use <c>Module:decode(Type, Bytes)</c> instead of this function.</p>
       </desc>
     </func>
 
@@ -65,16 +69,13 @@
         <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. 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>
+        <p>Encodes <c>Value</c> of <c>Type</c> defined in the ASN.1
+        module <c>Module</c>. Returns a binary 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>
+	<p>Use <c>Module:encode(Type, Value)</c> instead of this function.</p>
       </desc>
     </func>
 
@@ -90,6 +91,7 @@
         <p><c>info/1</c> returns the version of the asn1 compiler that was
           used to compile the module. It also returns the compiler options
           that was used.</p>
+	<p>Use <c>Module:info()</c> instead of this function.</p>
       </desc>
     </func>
 
@@ -106,6 +108,7 @@
           to a list of integers, where each integer represents one
           character as its unicode value. The function fails if the binary
           is not a properly encoded UTF8 string.</p>
+	<p>Use <seealso marker="stdlib:unicode#characters_to_list-1">unicode:characters_to_list/1</seealso> instead of this function.</p>
       </desc>
     </func>
 
@@ -121,6 +124,7 @@
         <p><c>utf8_list_to_binary/1</c> Transforms a list of integers,
           where each integer represents one character as its unicode
           value, to a UTF8 encoded binary.</p>
+	<p>Use <seealso marker="stdlib:unicode#characters_to_binary-1">unicode:characters_to_binary/1</seealso> instead of this function.</p>
       </desc>
     </func>
 
diff --git a/lib/asn1/doc/src/book.xml b/lib/asn1/doc/src/book.xml
index 718e6e7b17..2399267cb0 100644
--- a/lib/asn1/doc/src/book.xml
+++ b/lib/asn1/doc/src/book.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/asn1/doc/src/fascicules.xml b/lib/asn1/doc/src/fascicules.xml
index 2488e7b57e..837b4f57f4 100644
--- a/lib/asn1/doc/src/fascicules.xml
+++ b/lib/asn1/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 4b5bba742c..ff7962edd9 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,104 @@
   <p>This document describes the changes made to the asn1 application.</p>
 
 
+<section><title>Asn1 2.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The default value for a <c>BIT STRING</c> would not
+	    always be recognized, causing the encoding to be
+	    incorrect for the DER/PER/UPER encodings.</p>
+          <p>
+	    Own Id: OTP-11319</p>
+        </item>
+        <item>
+          <p>
+	    The <c>asn1</c> application would fail to build if the
+	    <c>.erlang</c> file printed something to standard output.</p>
+          <p>
+	    Own Id: OTP-11360</p>
+        </item>
+        <item>
+	    <p>An union of integer ranges in an INTEGER constraint
+	    could sometimes be interpreted as the intersection of the
+	    range.</p>
+          <p>
+	    Own Id: OTP-11411 Aux Id: seq12443 </p>
+        </item>
+        <item>
+          <p>
+	    Extensible, multiple single value constraints (such as
+	    <c>INTEGER (1|17, ...)</c>) would be incorrectly encoded.</p>
+          <p>
+	    Own Id: OTP-11415</p>
+        </item>
+        <item>
+          <p>
+	    The ASN.1 compiler would fail to compile a constraint
+	    with values given for for the extension part (such as
+	    <c>INTEGER (1..10, ..., 11..20)</c>).</p>
+          <p>
+	    Own Id: OTP-11504</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The new option '<c>no_ok_wrapper</c>' generates
+	    M:encode/2 and M:decode/2 functions that don't wrap the
+	    return value in an {ok,...} tuple.</p>
+          <p>
+	    Own Id: OTP-11314</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Asn1 2.0.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Open types greater than 16383 bytes will now be correctly
+	    encoded and decoded.</p>
+          <p>
+	    Own Id: OTP-11262 Aux Id: seq12386, OTP-11223 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p>For the PER and UPER formats, code generation
+	    especially for encoding has been improved.</p>
+	    <p>When encoding BIT STRINGs, values longer than the
+	    maximum size for the BIT STRING type would be truncated
+	    silently - they now cause an exception.</p>
+	    <p>Open types greater than 16383 bytes will now be
+	    correctly encoded and decoded.</p>
+	    <p>IMPORTANT NOTE: For ASN.1 specifications that depend
+	    on each other, such as the S1AP-* specifications, it is
+	    important to recompile all specifications (compiling some
+	    with this version of the compiler and some with an older
+	    version will not work).</p>
+          <p>
+	    Own Id: OTP-11300</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Asn1 2.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/doc/src/part.xml b/lib/asn1/doc/src/part.xml
index 19ee64b4a0..735ec2e616 100644
--- a/lib/asn1/doc/src/part.xml
+++ b/lib/asn1/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/asn1/doc/src/ref_man.xml b/lib/asn1/doc/src/ref_man.xml
index a0af1f5be3..0a0ed5416a 100644
--- a/lib/asn1/doc/src/ref_man.xml
+++ b/lib/asn1/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
index 33cd3cc4c3..500f4a1358 100644
--- a/lib/asn1/src/Makefile
+++ b/lib/asn1/src/Makefile
@@ -43,9 +43,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/asn1-$(VSN)
 
 EBIN = ../ebin
 
-EVAL_CT_MODULES = asn1ct_eval_ext \
-		  asn1ct_eval_per \
-		  asn1ct_eval_uper
+EVAL_CT_MODULES = asn1ct_eval_ext
 
 CT_MODULES= \
 	asn1ct \
@@ -55,7 +53,6 @@ CT_MODULES= \
 	asn1ct_func \
 	asn1ct_gen \
 	asn1ct_gen_per \
-	asn1ct_gen_per_rt2ct \
 	asn1ct_name \
 	asn1ct_constructed_per \
 	asn1ct_constructed_ber_bin_v2 \
@@ -138,7 +135,7 @@ $(EBIN)/asn1ct_func.$(EMULATOR): asn1ct_func.erl
 
 asn1ct_eval_%.erl: asn1ct_eval_%.funcs
 	$(gen_verbose)erl -pa $(EBIN) -noshell -noinput \
-	   -run prepare_templates gen_asn1ct_eval $< >$@
+	   -run prepare_templates gen_asn1ct_eval $<
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
@@ -183,7 +180,7 @@ RT_TEMPLATES_TARGET = $(RT_TEMPLATES:%=%.$(EMULATOR))
 
 asn1ct_rtt.erl: prepare_templates.$(EMULATOR) $(RT_TEMPLATES_TARGET)
 	$(gen_verbose)erl -noshell -noinput -run prepare_templates gen_asn1ct_rtt \
-           $(RT_TEMPLATES_TARGET) >asn1ct_rtt.erl
+           $(RT_TEMPLATES_TARGET)
 
 prepare_templates.$(EMULATOR): prepare_templates.erl
 	$(V_ERLC) prepare_templates.erl
diff --git a/lib/asn1/src/asn1.appup.src b/lib/asn1/src/asn1.appup.src
index 2d11eddfbf..e4b3508cc4 100644
--- a/lib/asn1/src/asn1.appup.src
+++ b/lib/asn1/src/asn1.appup.src
@@ -1,11 +1,21 @@
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
 {"%VSN%",
-% This version does not change anything of the runtime modules
-% Only changes in compile time modules and thus no need for upgrade on target
-[
- ],
- [ 
- ]}.
-
-
-
-
+ [{<<".*">>,[{restart_application, asn1}]}],
+ [{<<".*">>,[{restart_application, asn1}]}]
+}.
diff --git a/lib/asn1/src/asn1_db.erl b/lib/asn1/src/asn1_db.erl
index 869b36ddbd..48d9dd16d7 100644
--- a/lib/asn1/src/asn1_db.erl
+++ b/lib/asn1/src/asn1_db.erl
@@ -19,25 +19,37 @@
 %%
 -module(asn1_db).
 
--export([dbstart/1,dbnew/1,dbsave/2,dbput/3,dbget/2]).
+-export([dbstart/1,dbnew/2,dbload/1,dbload/3,dbsave/2,dbput/3,dbget/2]).
 -export([dbstop/0]).
 
 -record(state, {parent, monitor, includes, table}).
 
 %% Interface
-dbstart(Includes) ->
+dbstart(Includes0) ->
+    Includes = case Includes0 of
+		   [] -> ["."];
+		   [_|_] -> Includes0
+	       end,
     Parent = self(),
     undefined = get(?MODULE),			%Assertion.
     put(?MODULE, spawn_link(fun() -> init(Parent, Includes) end)),
     ok.
 
-dbnew(Module)              -> req({new, Module}).
+dbload(Module, Erule, Mtime) ->
+    req({load, Module, Erule, Mtime}).
+
+dbload(Module) ->
+    req({load, Module, any, {{0,0,0},{0,0,0}}}).
+
+dbnew(Module, Erule)       -> req({new, Module, Erule}).
 dbsave(OutFile, Module)    -> cast({save, OutFile, Module}).
 dbput(Module, K, V)        -> cast({set, Module, K, V}).
 dbget(Module, K)           -> req({get, Module, K}).
 dbstop()                   -> Resp = req(stop), erase(?MODULE), Resp.
 
 %% Internal functions
+-define(MAGIC_KEY, '__version_and_erule__').
+
 req(Request) ->
     DbPid = get(?MODULE),
     Ref = erlang:monitor(process,DbPid),
@@ -71,47 +83,57 @@ loop(#state{parent = Parent, monitor = MRef, table = Table,
             ets:insert(Modtab, {K2, V}),
             loop(State);
         {From, {get, Mod, K2}} ->
-            Result = case ets:lookup(Table, Mod) of
-                         []            -> opentab(Table, Mod, Includes);
-                         [{_, Modtab}] -> {ok, Modtab}
-                     end,
-            case Result of
-                {ok, Newtab} -> reply(From, lookup(Newtab, K2));
-                _Error       -> reply(From, undefined)
+	    %% XXX If there is no information for Mod, get_table/3
+	    %% will attempt to load information from an .asn1db
+	    %% file, without comparing its timestamp against the
+	    %% source file. This is known to happen when check_*
+	    %% functions for DER are generated, but it could possibly
+	    %% happen in other circumstances. Ideally, this issue should
+	    %% be rectified in some way, perhaps by ensuring that
+	    %% the module has been loaded (using dbload/4) prior
+	    %% to calling dbget/2.
+            case get_table(Table, Mod, Includes) of
+                {ok,Tab} -> reply(From, lookup(Tab, K2));
+                error -> reply(From, undefined)
             end,
             loop(State);
         {save, OutFile, Mod} ->
             [{_,Mtab}] = ets:lookup(Table, Mod),
             ok = ets:tab2file(Mtab, OutFile),
             loop(State);
-        {From, {new, Mod}} ->
+        {From, {new, Mod, Erule}} ->
             [] = ets:lookup(Table, Mod),	%Assertion.
             ModTableId = ets:new(list_to_atom(lists:concat(["asn1_",Mod])), []),
             ets:insert(Table, {Mod, ModTableId}),
+	    ets:insert(ModTableId, {?MAGIC_KEY, info(Erule)}),
             reply(From, ok),
             loop(State);
+	{From, {load, Mod, Erule, Mtime}} ->
+	    case ets:member(Table, Mod) of
+		true ->
+		    reply(From, ok);
+		false ->
+		    case load_table(Mod, Erule, Mtime, Includes) of
+			{ok, ModTableId} ->
+			    ets:insert(Table, {Mod, ModTableId}),
+			    reply(From, ok);
+			error ->
+			    reply(From, error)
+		    end
+	    end,
+	    loop(State);
         {From, stop} ->
             reply(From, stopped); %% Nothing to store
         {'DOWN', MRef, process, Parent, Reason} ->
             exit(Reason)
     end.
 
-opentab(Tab, Mod, []) ->
-    opentab(Tab, Mod, ["."]);
-opentab(Tab, Mod, Includes) ->
-    Base = lists:concat([Mod, ".asn1db"]),
-    opentab2(Tab, Base, Mod, Includes, ok).
-
-opentab2(_Tab, _Base, _Mod, [], Error) ->
-    Error;
-opentab2(Tab, Base, Mod, [Ih|It], _Error) ->
-    File = filename:join(Ih, Base),
-    case ets:file2tab(File) of
-        {ok, Modtab} ->
-            ets:insert(Tab, {Mod, Modtab}),
-            {ok, Modtab};
-        NewErr ->
-            opentab2(Tab, Base, Mod, It, NewErr)
+get_table(Table, Mod, Includes) ->
+    case ets:lookup(Table, Mod) of
+	[{Mod,Tab}] ->
+	    {ok,Tab};
+	[] ->
+	    load_table(Mod, any, {{0,0,0},{0,0,0}}, Includes)
     end.
 
 lookup(Tab, K) ->
@@ -119,3 +141,43 @@ lookup(Tab, K) ->
         []      -> undefined;
         [{K,V}] -> V
     end.
+
+info(Erule) ->
+    {asn1ct:vsn(),Erule}.
+
+load_table(Mod, Erule, Mtime, Includes) ->
+    Base = lists:concat([Mod, ".asn1db"]),
+    case path_find(Includes, Mtime, Base) of
+	error ->
+	    error;
+	{ok,ModTab} when Erule =:= any ->
+	    {ok,ModTab};
+	{ok,ModTab} ->
+	    Vsn = asn1ct:vsn(),
+	    case ets:lookup(ModTab, ?MAGIC_KEY) of
+		[{_,{Vsn,Erule}}] ->
+		    %% Correct version and encoding rule.
+		    {ok,ModTab};
+		_ ->
+		    %% Missing key or wrong version/encoding rule.
+		    ets:delete(ModTab),
+		    error
+	    end
+    end.
+
+path_find([H|T], Mtime, Base) ->
+    File = filename:join(H, Base),
+    case filelib:last_modified(File) of
+	0 ->
+	    path_find(T, Mtime, Base);
+	DbMtime when DbMtime >= Mtime ->
+	    case ets:file2tab(File) of
+		{ok,_}=Ret ->
+		    Ret;
+		_ ->
+		    path_find(T, Mtime, Base)
+	    end;
+	_ ->
+	    path_find(T, Mtime, Base)
+    end;
+path_find([], _, _) -> error.
diff --git a/lib/asn1/src/asn1ct.erl b/lib/asn1/src/asn1ct.erl
index 8e71a5697c..9ec43197bf 100644
--- a/lib/asn1/src/asn1ct.erl
+++ b/lib/asn1/src/asn1ct.erl
@@ -19,6 +19,10 @@
 %%
 %%
 -module(asn1ct).
+-deprecated([decode/3,encode/3]).
+-compile([{nowarn_deprecated_function,{asn1rt,decode,3}},
+	  {nowarn_deprecated_function,{asn1rt,encode,2}},
+	  {nowarn_deprecated_function,{asn1rt,encode,3}}]).
 
 %% Compile Time functions for ASN.1 (e.g ASN.1 compiler).
 
@@ -40,7 +44,7 @@
 	 maybe_rename_function/3,current_sindex/0,
 	 set_current_sindex/1,maybe_saved_sindex/2,
 	 parse_and_save/2,verbose/3,warning/3,warning/4,error/3]).
--export([get_bit_string_format/0]).
+-export([get_bit_string_format/0,use_legacy_types/0]).
 
 -include("asn1_records.hrl").
 -include_lib("stdlib/include/erl_compile.hrl").
@@ -333,8 +337,7 @@ print_structured_errors([_|_]=Errors) ->
 print_structured_errors(_) -> ok.
 
 compile1(File, #st{opts=Opts}=St0) ->
-    verbose("Erlang ASN.1 version ~p, compiling ~p~n", [?vsn,File], Opts),
-    verbose("Compiler Options: ~p~n", [Opts], Opts),
+    compiler_verbose(File, Opts),
     Passes = single_passes(),
     Base = filename:rootname(filename:basename(File)),
     OutFile = outfile(Base, "", Opts),
@@ -349,8 +352,7 @@ compile1(File, #st{opts=Opts}=St0) ->
 %% compile_set/3 merges and compiles a number of asn1 modules
 %% specified in a .set.asn file to one .erl file.
 compile_set(SetBase, Files, #st{opts=Opts}=St0) ->
-    verbose("Erlang ASN.1 version ~p compiling ~p ~n", [?vsn,Files], Opts),
-    verbose("Compiler Options: ~p~n",[Opts], Opts),
+    compiler_verbose(Files, Opts),
     OutFile = outfile(SetBase, "", Opts),
     DbFile = outfile(SetBase, "asn1db", Opts),
     InputModules = [begin
@@ -363,6 +365,11 @@ compile_set(SetBase, Files, #st{opts=Opts}=St0) ->
     Passes = set_passes(),
     run_passes(Passes, St).
 
+compiler_verbose(What, Opts) ->
+    verbose("Erlang ASN.1 compiler ~s\n", [?vsn], Opts),
+    verbose("Compiling: ~p\n", [What], Opts),
+    verbose("Options: ~p\n", [Opts], Opts).
+
 %% merge_modules/2 -> returns a module record where the typeorval lists are merged,
 %% the exports lists are merged, the imports lists are merged when the 
 %% elements come from other modules than the merge set, the tagdefault 
@@ -838,6 +845,7 @@ delete_double_of_symbol1([],Acc) ->
 generate({M,GenTOrV}, OutFile, EncodingRule, Options) ->
     debug_on(Options),
     setup_bit_string_format(Options),
+    setup_legacy_erlang_types(Options),
     put(encoding_options,Options),
     asn1ct_table:new(check_functions),
 
@@ -866,6 +874,31 @@ generate({M,GenTOrV}, OutFile, EncodingRule, Options) ->
     asn1ct_table:delete(check_functions),
     Result.
 
+setup_legacy_erlang_types(Opts) ->
+    F = case lists:member(legacy_erlang_types, Opts) of
+	    false ->
+		case get_bit_string_format() of
+		    bitstring ->
+			false;
+		    compact ->
+			legacy_forced_info(compact_bit_string),
+			true;
+		    legacy ->
+			legacy_forced_info(legacy_bit_string),
+			true
+		end;
+	    true ->
+		true
+	end,
+    put(use_legacy_erlang_types, F).
+
+legacy_forced_info(Opt) ->
+    io:format("Info: The option 'legacy_erlang_types' "
+	      "is implied by the '~s' option.\n", [Opt]).
+
+use_legacy_types() ->
+    get(use_legacy_erlang_types).
+
 setup_bit_string_format(Opts) ->
     Format = case {lists:member(compact_bit_string, Opts),
 		   lists:member(legacy_bit_string, Opts)} of
@@ -893,17 +926,23 @@ parse_and_save(Module,S) ->
     Options = S#state.options,
     SourceDir = S#state.sourcedir,
     Includes = [I || {i,I} <- Options],
+    Erule = S#state.erule,
     case get_input_file(Module, [SourceDir|Includes]) of
 	%% search for asn1 source
 	{file,SuffixedASN1source} ->
-	    case dbfile_uptodate(SuffixedASN1source,Options) of
-		false ->
-		    parse_and_save1(S, SuffixedASN1source, Options);
-		_ -> ok
+	    Mtime = filelib:last_modified(SuffixedASN1source),
+	    case asn1_db:dbload(Module, Erule, Mtime) of
+		ok -> ok;
+		error -> parse_and_save1(S, SuffixedASN1source, Options)
 	    end;
 	Err ->
-	    warning("could not do a consistency check of the ~p file: no asn1 source file was found.~n",
-		    [lists:concat([Module,".asn1db"])],Options),
+	    case asn1_db:dbload(Module) of
+		ok ->
+		    warning("could not do a consistency check of the ~p file: no asn1 source file was found.~n",
+			    [lists:concat([Module,".asn1db"])],Options);
+		error ->
+		    ok
+	    end,
 	    {error,{asn1,input_file_error,Err}}
     end.
 
@@ -929,48 +968,6 @@ get_input_file(Module,[I|Includes]) ->
 	    get_input_file(Module,Includes)
     end.
 
-dbfile_uptodate(File,Options) ->
-    EncodingRule = get_rule(Options),
-    Ext = filename:extension(File),
-    Base = filename:basename(File,Ext),
-    DbFile = outfile(Base,"asn1db",Options),
-    case file:read_file_info(DbFile) of
-	{error,enoent} ->
-	    false;
-	{ok,FileInfoDb} ->
-	    %% file exists, check date and finally encodingrule
-	    {ok,FileInfoAsn} = file:read_file_info(File),
-	    case FileInfoDb#file_info.mtime < FileInfoAsn#file_info.mtime of
-		true ->
-		    %% date of asn1 spec newer than db file
-		    false;
-		_ -> 
-		    %% date ok,check that same erule was used
-		    Obase = case lists:keysearch(outdir, 1, Options) of
-				{value, {outdir, Odir}} -> 
-				    Odir;
-				_NotFound -> ""
-			    end,
-		    BeamFileName = outfile(Base,"beam",Options),
-		    case file:read_file_info(BeamFileName) of
-			{ok,_} ->
-			    code:add_path(Obase),
-			    BeamFile = list_to_atom(Base),
-			    BeamInfo = (catch BeamFile:info()),
-			    case catch lists:keysearch(options,1,BeamInfo) of
-				{value,{options,OldOptions}} ->
-				    case get_rule(OldOptions) of
-					EncodingRule -> true;
-					_ -> false
-				    end;
-				_ -> false
-			    end;
-			_ -> false
-		    end
-	    end
-    end.
-
-
 input_file_type(Name,I) ->
    case input_file_type(Name) of
        {error,_} -> input_file_type2(filename:basename(Name),I);
@@ -1047,7 +1044,7 @@ get_file_list1(Stream,Dir,Includes,Acc) ->
     Ret = io:get_line(Stream,''),
     case Ret of
 	eof ->
-	    file:close(Stream),
+	    ok = file:close(Stream),
 	    lists:reverse(Acc);
 	FileName ->
 	    SuffixedNameList =
@@ -1108,6 +1105,7 @@ remove_asn_flags(Options) ->
 	  X /= optimize,
 	  X /= compact_bit_string,
 	  X /= legacy_bit_string,
+	  X /= legacy_erlang_types,
 	  X /= debug,
 	  X /= asn1config,
 	  X /= record_name_prefix].
@@ -1374,10 +1372,11 @@ get_value(Module, Type) ->
     end.
 
 check(Module, Includes) ->
-    case asn1_db:dbget(Module,'MODULE') of
-        undefined ->
-            {error, {file_not_found, lists:concat([Module, ".asn1db"])}};
-        M ->
+    case asn1_db:dbload(Module) of
+	error ->
+            {error,asn1db_missing_or_out_of_date};
+	ok ->
+	    M = asn1_db:dbget(Module, 'MODULE'),
             TypeOrVal =  M#module.typeorval,
             State = #state{mname = M#module.name,
                            module = M#module{typeorval=[]},
@@ -1931,8 +1930,9 @@ read_config_file(ModuleName) ->
 	    Includes = [I || {i,I} <- Options],
 	    read_config_file1(ModuleName,Includes);
 	{error,Reason} ->
-	    file:format_error(Reason),
-	    throw({error,{"error reading asn1 config file",Reason}})
+	    Error = "error reading asn1 config file: " ++
+		file:format_error(Reason),
+	    throw({error,Error})
     end.
 read_config_file1(ModuleName,[]) ->
     case filename:extension(ModuleName) of
@@ -1950,8 +1950,9 @@ read_config_file1(ModuleName,[H|T]) ->
 	{error,enoent} ->
 	    read_config_file1(ModuleName,T);
 	{error,Reason} ->
-	    file:format_error(Reason),
-	    throw({error,{"error reading asn1 config file",Reason}})
+	    Error = "error reading asn1 config file: " ++
+		file:format_error(Reason),
+	    throw({error,Error})
     end.
     
 get_config_info(CfgList,InfoType) ->
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index f94550b0a4..b9f2cb876a 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -1557,21 +1557,32 @@ check_objectdefn(S,Def,CDef) when is_record(CDef,classdef) ->
 	    exit({error,{objectdefn,Other}})
     end.
 
-check_defaultfields(S,Fields,ClassFields) ->
-    check_defaultfields(S,Fields,ClassFields,[]).
+check_defaultfields(S, Fields, ClassFields) ->
+    Present = ordsets:from_list([F || {F,_} <- Fields]),
+    Mandatory0 = get_mandatory_class_fields(ClassFields),
+    Mandatory = ordsets:from_list(Mandatory0),
+    All = ordsets:from_list([element(2, F) || F <- ClassFields]),
+    #state{type=T,tname=Obj} = S,
+    case ordsets:subtract(Present, All) of
+	[] ->
+	    ok;
+	[_|_]=Invalid ->
+	    throw(asn1_error(S, T, {invalid_fields,Invalid,Obj}))
+    end,
+    case ordsets:subtract(Mandatory, Present) of
+	[] ->
+	    check_defaultfields_1(S, Fields, ClassFields, []);
+	[_|_]=Missing ->
+	    throw(asn1_error(S, T, {missing_mandatory_fields,Missing,Obj}))
+    end.
 
-check_defaultfields(_S,[],_ClassFields,Acc) ->
+check_defaultfields_1(_S, [], _ClassFields, Acc) ->
     {object,defaultsyntax,lists:reverse(Acc)};
-check_defaultfields(S,[{FName,Spec}|Fields],ClassFields,Acc) ->
-    case lists:keysearch(FName,2,ClassFields) of
-	{value,CField} ->
-	    {NewField,RestFields} = 
-		convert_to_defaultfield(S,FName,[Spec|Fields],CField),
-	    check_defaultfields(S,RestFields,ClassFields,[NewField|Acc]);
-	_ ->
-	    throw({error,{asn1,{'unvalid field in object',FName}}})
-    end.
-%%    {object,defaultsyntax,Fields}.
+check_defaultfields_1(S, [{FName,Spec}|Fields], ClassFields, Acc) ->
+    CField = lists:keyfind(FName, 2, ClassFields),
+    {NewField,RestFields} =
+	convert_to_defaultfield(S, FName, [Spec|Fields], CField),
+    check_defaultfields_1(S, RestFields, ClassFields, [NewField|Acc]).
 
 convert_definedsyntax(_S,[],[],_ClassFields,Acc) ->
     lists:reverse(Acc);
@@ -1587,6 +1598,23 @@ convert_definedsyntax(S,Fields,WithSyntax,ClassFields,Acc) ->
 				  [MatchedField|Acc])
     end.
 
+get_mandatory_class_fields([{fixedtypevaluefield,Name,_,_,'MANDATORY'}|T]) ->
+    [Name|get_mandatory_class_fields(T)];
+get_mandatory_class_fields([{objectfield,Name,_,_,'MANDATORY'}|T]) ->
+    [Name|get_mandatory_class_fields(T)];
+get_mandatory_class_fields([{objectsetfield,Name,_,'MANDATORY'}|T]) ->
+    [Name|get_mandatory_class_fields(T)];
+get_mandatory_class_fields([{typefield,Name,'MANDATORY'}|T]) ->
+    [Name|get_mandatory_class_fields(T)];
+get_mandatory_class_fields([{variabletypevaluefield,Name,_,'MANDATORY'}|T]) ->
+    [Name|get_mandatory_class_fields(T)];
+get_mandatory_class_fields([{variabletypevaluesetfield,
+			     Name,_,'MANDATORY'}|T]) ->
+    [Name|get_mandatory_class_fields(T)];
+get_mandatory_class_fields([_|T]) ->
+    get_mandatory_class_fields(T);
+get_mandatory_class_fields([]) -> [].
+
 match_field(S,Fields,WithSyntax,ClassFields) ->
     match_field(S,Fields,WithSyntax,ClassFields,[]).
 
@@ -2436,7 +2464,7 @@ normalize_value(S0, Type, {'DEFAULT',Value}, NameList) ->
 	{'BIT STRING',CType,_} ->
 	    normalize_bitstring(S,Value,CType);
 	{'OCTET STRING',CType,_} ->
-	    normalize_octetstring(S,Value,CType);
+	    normalize_octetstring(S0, Value, CType);
 	{'NULL',_CType,_} ->
 	    %%normalize_null(Value);
 	    'NULL';
@@ -2506,89 +2534,66 @@ normalize_integer(S,Int=#'Externalvaluereference'{value=Name},Type) ->
 normalize_integer(_,Int,_) ->
     exit({'Unknown INTEGER value',Int}).
 
-normalize_bitstring(S,Value,Type)->
-    %% There are four different Erlang formats of BIT STRING:
-    %% 1 - a list of ones and zeros.
-    %% 2 - a list of atoms.
-    %% 3 - as an integer, for instance in hexadecimal form.
-    %% 4 - as a tuple {Unused, Binary} where Unused is an integer
-    %%   and tells how many bits of Binary are unused.
-    %% 
-    %% normalize_bitstring/3 transforms Value according to:
-    %% A to 3,
-    %% B to 1,
-    %% C to 1 or 3
-    %% D to 2,
-    %% Value can be on format:
-    %% A - {hstring, String}, where String is a hexadecimal string.
-    %% B - {bstring, String}, where String is a string on bit format
-    %% C - #'Externalvaluereference'{value=V}, where V is a defined value
-    %% D - list of #'Externalvaluereference', where each value component
-    %%     is an identifier corresponing to NamedBits in Type.
-    %% E - list of ones and zeros, if Value already is normalized.
+%% normalize_bitstring(S, Value, Type) -> bitstring()
+%%  Convert a literal value for a BIT STRING to an Erlang bit string.
+%%
+normalize_bitstring(S, Value, Type)->
     case Value of
 	{hstring,String} when is_list(String) ->
-	    hstring_to_int(String);
+	    hstring_to_bitstring(String);
 	{bstring,String} when is_list(String) ->
-	    bstring_to_bitlist(String);
-	Rec when is_record(Rec,'Externalvaluereference') ->
-	    get_normalized_value(S,Value,Type,
-				 fun normalize_bitstring/3,[]);
+	    bstring_to_bitstring(String);
+	#'Externalvaluereference'{} ->
+	    get_normalized_value(S, Value, Type,
+				 fun normalize_bitstring/3, []);
 	RecList when is_list(RecList) ->
-	    case Type of
-		NBL when is_list(NBL) ->
-		    F = fun(#'Externalvaluereference'{value=Name}) ->
-				case lists:keysearch(Name,1,NBL) of
-				    {value,{Name,_}} ->
-					Name;
-				    Other ->
-					throw({error,Other})
-				end;
-			   (I) when I =:= 1; I =:= 0 ->
-				I;
-			   (Other) ->
-				throw({error,Other})
-			end,
-		    case catch lists:map(F,RecList) of
-			{error,Reason} ->
-			    asn1ct:warning("default value not "
-					   "compatible with type definition ~p~n",
-					   [Reason],S,
-					   "default value not "
-					   "compatible with type definition"),
-			    Value;
-			NewList ->
-			    NewList
-		    end;
-		_ ->
+	    F = fun(#'Externalvaluereference'{value=Name}) ->
+			case lists:keymember(Name, 1, Type) of
+			    true -> Name;
+			    false -> throw({error,false})
+			end;
+		   (Name) when is_atom(Name) ->
+			%% Already normalized.
+			Name;
+		   (Other) ->
+			throw({error,Other})
+		end,
+	    try
+		lists:map(F, RecList)
+	    catch
+		throw:{error,Reason} ->
 		    asn1ct:warning("default value not "
 				   "compatible with type definition ~p~n",
-				   [RecList],S,
+				   [Reason],S,
 				   "default value not "
 				   "compatible with type definition"),
 		    Value
 	    end;
-	{Name,String} when is_atom(Name) ->
-	    normalize_bitstring(S,String,Type);
-	Other ->
-	    asn1ct:warning("illegal default value ~p~n",[Other],S,
-			   "illegal default value"),
-	    Value
+	Bs when is_bitstring(Bs) ->
+	    %% Already normalized.
+	    Bs
     end.
 
-hstring_to_int(L) when is_list(L) ->
-    hstring_to_int(L,0).
-hstring_to_int([H|T],Acc) when H >= $A, H =< $F ->
-    hstring_to_int(T,(Acc bsl 4) + (H - $A + 10) ) ;
-hstring_to_int([H|T],Acc) when H >= $0, H =< $9 ->
-    hstring_to_int(T,(Acc bsl 4) + (H - $0));
-hstring_to_int([],Acc) ->
-    Acc.
+hstring_to_binary(L) ->
+    byte_align(hstring_to_bitstring(L)).
 
-bstring_to_bitlist([H|T]) when H == $0; H == $1 ->
-    [H - $0 | bstring_to_bitlist(T)];
-bstring_to_bitlist([]) ->
-    [].
+bstring_to_binary(L) ->
+    byte_align(bstring_to_bitstring(L)).
+
+byte_align(Bs) ->
+    case bit_size(Bs) rem 8 of
+	0 -> Bs;
+	N -> <<Bs/bitstring,0:(8-N)>>
+    end.
+
+hstring_to_bitstring(L) ->
+    << <<(hex_to_int(D)):4>> || D <- L >>.
+
+bstring_to_bitstring(L) ->
+    << <<(D-$0):1>> || D <- L >>.
+
+hex_to_int(D) when $0 =< D, D =< $9 -> D - $0;
+hex_to_int(D) when $A =< D, D =< $F -> D - ($A - 10).
 
 %% normalize_octetstring/1 changes representation of input Value to a 
 %% list of octets.
@@ -2599,59 +2604,19 @@ bstring_to_bitlist([]) ->
 normalize_octetstring(S,Value,CType) ->
     case Value of
 	{bstring,String} ->
-	    bstring_to_octetlist(String);
+	    bstring_to_binary(String);
 	{hstring,String} ->
-	    hstring_to_octetlist(String);
+	    hstring_to_binary(String);
 	Rec when is_record(Rec,'Externalvaluereference') ->
 	    get_normalized_value(S,Value,CType,
 				 fun normalize_octetstring/3,[]);
 	{Name,String} when is_atom(Name) ->
 	    normalize_octetstring(S,String,CType);
-	List when is_list(List) ->
-	    %% check if list elements are valid octet values
-	    lists:map(fun([])-> ok;
-			 (H)when H > 255->
-			      asn1ct:warning("not legal octet value ~p in OCTET STRING, ~p~n",
-					     [H,List],S,
-					     "not legal octet value ~p in OCTET STRING");
-			 (_)-> ok
-		      end, List),
-	    List;
-	Other ->
-	    asn1ct:warning("unknown default value ~p~n",[Other],S,
-			   "unknown default value"),
-	    Value
+	_ ->
+	    Item = S#state.value,
+	    throw(asn1_error(S, Item, illegal_octet_string_value))
     end.
 
-
-bstring_to_octetlist([]) ->
-    [];
-bstring_to_octetlist([H|T]) when H == $0 ; H == $1 ->
-    bstring_to_octetlist(T,6,[(H - $0) bsl 7]).
-bstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H == $0; H == $1 ->
-    bstring_to_octetlist(T, 7, [0,Hacc + (H -$0)| Tacc]);
-bstring_to_octetlist([H|T],BSL,[Hacc|Tacc]) when H == $0; H == $1 ->
-    bstring_to_octetlist(T, BSL-1, [Hacc + ((H - $0) bsl BSL)| Tacc]);
-bstring_to_octetlist([],7,[0|Acc]) ->
-    lists:reverse(Acc);
-bstring_to_octetlist([],_,Acc) ->
-    lists:reverse(Acc).
-
-hstring_to_octetlist([]) ->
-    [];
-hstring_to_octetlist(L) ->
-    hstring_to_octetlist(L,4,[]).
-hstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H >= $A, H =< $F ->
-    hstring_to_octetlist(T,4,[Hacc + (H - $A + 10)|Tacc]);
-hstring_to_octetlist([H|T],BSL,Acc) when H >= $A, H =< $F ->
-    hstring_to_octetlist(T,0,[(H - $A + 10) bsl BSL|Acc]);
-hstring_to_octetlist([H|T],0,[Hacc|Tacc]) when H >= $0; H =< $9 ->
-    hstring_to_octetlist(T,4,[Hacc + (H - $0)|Tacc]);
-hstring_to_octetlist([H|T],BSL,Acc) when H >= $0; H =< $9 ->
-    hstring_to_octetlist(T,0,[(H - $0) bsl BSL|Acc]);
-hstring_to_octetlist([],_,Acc) ->
-    lists:reverse(Acc).
-
 normalize_objectidentifier(S, Value) ->
     {ok,Val} = validate_objectidentifier(S, o_id, Value, []),
     Val.
@@ -2666,16 +2631,19 @@ normalize_objectdescriptor(Value) ->
 normalize_real(Value) ->
     Value.
 
-normalize_enumerated(S, Id, {Base,Ext}) ->
+normalize_enumerated(S, Id0, NNL) ->
+    {Id,_} = lookup_enum_value(S, Id0, NNL),
+    Id.
+
+lookup_enum_value(S, Id, {Base,Ext}) ->
     %% Extensible ENUMERATED.
-    normalize_enumerated(S, Id, Base++Ext);
-normalize_enumerated(S, #'Externalvaluereference'{value=Id},
-		    NamedNumberList) ->
-    normalize_enumerated(S, Id, NamedNumberList);
-normalize_enumerated(S, Id, NamedNumberList) when is_atom(Id) ->
-    case lists:keymember(Id, 1, NamedNumberList) of
-	true ->
-	    Id;
+    lookup_enum_value(S, Id, Base++Ext);
+lookup_enum_value(S, #'Externalvaluereference'{value=Id}, NNL) ->
+    lookup_enum_value(S, Id, NNL);
+lookup_enum_value(S, Id, NNL) when is_atom(Id) ->
+    case lists:keyfind(Id, 1, NNL) of
+	{_,_}=Ret ->
+	    Ret;
 	false ->
 	    throw(asn1_error(S, S#state.value, {undefined,Id}))
     end.
@@ -3112,7 +3080,6 @@ check_type(S=#state{recordtopname=TopName},Type,Ts) when is_record(Ts,type) ->
 		Ct=maybe_illicit_implicit_tag(open_type,Tag),
 		TempNewDef#newt{type='ASN1_OPEN_TYPE',tag=Ct};
 	    'INTEGER' ->
-		check_integer(S,[],Constr),
 		TempNewDef#newt{tag=
 				merge_tags(Tag,?TAG_PRIMITIVE(?N_INTEGER))};
 
@@ -3810,8 +3777,9 @@ resolv_value(S,Val) ->
     resolv_value1(S,Id).
 
 resolv_value1(S, ERef = #'Externalvaluereference'{value=Name}) ->
-    case catch resolve_namednumber(S,S#state.type,Name) of
-	V when is_integer(V) -> V;
+    case catch resolve_namednumber(S, S#state.type, Name) of
+	V when is_integer(V) ->
+	    V;
 	_ ->
 	    case get_referenced_type(S,ERef) of
 		{Err,_Reason} when Err == error; Err == 'EXIT' ->
@@ -3864,21 +3832,20 @@ resolve_value_from_object(S,Object,FieldName) ->
     end.
 
 
-
 resolve_namednumber(S,#typedef{typespec=Type},Name) ->
     case Type#type.def of
 	{'ENUMERATED',NameList} ->
-	    NamedNumberList=check_enumerated(S,NameList,Type#type.constraint),
-	    N = normalize_enumerated(S,Name,NamedNumberList),
-	    {value,{_,V}} = lists:keysearch(N,1,NamedNumberList),
-	    V;
+	    resolve_namednumber_1(S, Name, NameList, Type);
 	{'INTEGER',NameList} ->
-	    NamedNumberList = check_enumerated(S,NameList,Type#type.constraint),
-	    {value,{_,V}} = lists:keysearch(Name,1,NamedNumberList),
-	    V;
+	    resolve_namednumber_1(S, Name, NameList, Type);
 	_ ->
 	    not_enumerated
     end.
+
+resolve_namednumber_1(S, Name, NameList, Type) ->
+    NamedNumberList = check_enumerated(S, NameList, Type#type.constraint),
+    {_,N} = lookup_enum_value(S, Name, NamedNumberList),
+    N.
     
 check_constraints(S,[{'ContainedSubtype',Type} | Rest], Acc) ->
     {RefMod,CTDef} = get_referenced_type(S,Type#type.def),
@@ -3959,9 +3926,9 @@ check_constraint(S,{simpletable,Type}) ->
 	#'Externaltypereference'{} ->
 	    ERef = check_externaltypereference(S,C),
 	    {simpletable,ERef#'Externaltypereference'.type};
-	#type{def=#'Externaltypereference'{type=T}} ->
-	    check_externaltypereference(S,C#type.def),
-	    {simpletable,T};
+	#type{def=#'Externaltypereference'{}=ExtTypeRef} ->
+	    ERef = check_externaltypereference(S, ExtTypeRef),
+	    {simpletable,ERef#'Externaltypereference'.type};
 	{valueset,#type{def=ERef=#'Externaltypereference'{}}} -> % this is an object set
 	    {_,TDef} = get_referenced_type(S,ERef),
 	    case TDef#typedef.typespec of 
@@ -4201,9 +4168,10 @@ constraint_union(S,C) when is_list(C) ->
 constraint_union(_S,C) ->
     [C].
 
-constraint_union1(S,[A={'ValueRange',_},union,B={'ValueRange',_}|Rest],Acc) ->
-    AunionB = constraint_union_vr([A,B]),
-    constraint_union1(S, AunionB++Rest, Acc);
+constraint_union1(S, [{'ValueRange',{Lb1,Ub1}},union,
+		      {'ValueRange',{Lb2,Ub2}}|Rest], Acc) ->
+    AunionB = {'ValueRange',{c_min(Lb1, Lb2),max(Ub1, Ub2)}},
+    constraint_union1(S,  [AunionB|Rest], Acc);
 constraint_union1(S,[A={'SingleValue',_},union,B={'SingleValue',_}|Rest],Acc) ->
     AunionB = constraint_union_sv(S,[A,B]),
     constraint_union1(S,Rest,Acc ++ AunionB);
@@ -4227,42 +4195,9 @@ constraint_union_sv(_S,SV) ->
 	[N] -> [{'SingleValue',N}];
 	L -> [{'SingleValue',L}]
     end.
-
-%% REMOVE????
-%%constraint_union(S,VR,'ValueRange') ->
-%%    constraint_union_vr(VR).
-
-%% constraint_union_vr(VR)
-%% VR = [{'ValueRange',{Lb,Ub}},...]
-%% Lb = 'MIN' | integer()
-%% Ub = 'MAX' | integer()
-%% Returns if possible only one ValueRange tuple with a range that
-%% is a union of all ranges in VR.
-constraint_union_vr(VR) ->
-    %% Sort VR by Lb in first hand and by Ub in second hand
-    Fun=fun({_,{'MIN',_B1}},{_,{A2,_B2}}) when is_integer(A2)->true;
-	   ({_,{A1,_B1}},{_,{'MAX',_B2}}) when is_integer(A1) -> true;
-	   ({_,{A1,_B1}},{_,{A2,_B2}}) when is_integer(A1),is_integer(A2),A1<A2 -> true;
-	   ({_,{A,B1}},{_,{A,B2}}) when B1=<B2->true;
-	   (_,_)->false end,
-    SortedVR = lists:usort(Fun,VR),
-    constraint_union_vr(SortedVR, []).
-
-constraint_union_vr([],Acc) ->
-    lists:reverse(Acc);
-constraint_union_vr([C|Rest],[]) ->
-    constraint_union_vr(Rest,[C]);
-constraint_union_vr([{_,{Lb,Ub2}}|Rest],[{_,{Lb,_Ub1}}|Acc]) -> %Ub2 > Ub1
-    constraint_union_vr(Rest,[{'ValueRange',{Lb,Ub2}}|Acc]);
-constraint_union_vr([{_,{_,Ub}}|Rest],A=[{_,{_,Ub}}|_Acc]) ->
-    constraint_union_vr(Rest,A);
-constraint_union_vr([{_,{Lb2,Ub2}}|Rest], [{_,{Lb1,Ub1}}|Acc])
-  when Ub1 =< Lb2, Ub1 < Ub2 ->
-    constraint_union_vr(Rest,[{'ValueRange',{Lb1,Ub2}}|Acc]);
-constraint_union_vr([{_,{_,Ub2}}|Rest],A=[{_,{_,Ub1}}|_Acc]) when Ub2=<Ub1->
-    constraint_union_vr(Rest,A);
-constraint_union_vr([VR|Rest],Acc) ->
-    constraint_union_vr(Rest,[VR|Acc]).
+c_min('MIN', _) -> 'MIN';
+c_min(_, 'MIN') -> 'MIN';
+c_min(A, B) -> min(A, B).
 
 union_sv_vr(_S,{'SingleValue',SV},VR) 
   when is_integer(SV) ->
@@ -6798,7 +6733,7 @@ merge_tags2([], Acc) ->
 storeindb(S,M) when is_record(M,module) ->
     TVlist = M#module.typeorval,
     NewM = M#module{typeorval=findtypes_and_values(TVlist)},
-    asn1_db:dbnew(NewM#module.name),
+    asn1_db:dbnew(NewM#module.name, S#state.erule),
     asn1_db:dbput(NewM#module.name,'MODULE',  NewM),
     Res = storeindb(#state{mname=NewM#module.name}, TVlist, []),
     include_default_class(S,NewM#module.name),
@@ -6867,11 +6802,24 @@ asn1_error(#state{mname=Where}, Item, Error) ->
 format_error({already_defined,Name,PrevLine}) ->
     io_lib:format("the name ~p has already been defined at line ~p",
 		  [Name,PrevLine]);
+format_error(illegal_octet_string_value) ->
+    "expecting a bstring or an hstring as value for an OCTET STRING";
+format_error({invalid_fields,Fields,Obj}) ->
+    io_lib:format("invalid ~s in ~p", [format_fields(Fields),Obj]);
+format_error({missing_mandatory_fields,Fields,Obj}) ->
+    io_lib:format("missing mandatory ~s in ~p",
+		  [format_fields(Fields),Obj]);
 format_error({undefined,Name}) ->
     io_lib:format("'~s' is referenced, but is not defined", [Name]);
 format_error(Other) ->
     io_lib:format("~p", [Other]).
 
+format_fields([F]) ->
+    io_lib:format("field &~s", [F]);
+format_fields([H|T]) ->
+    [io_lib:format("fields &~s", [H])|
+     [io_lib:format(", &~s", [F]) || F <- T]].
+
 error({_,{structured_error,_,_,_}=SE,_}) ->
     SE;
 error({export,Msg,#state{mname=Mname,type=Ref,tname=Typename}}) ->
diff --git a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
index 761faa53c5..a38da8bcc2 100644
--- a/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_constructed_ber_bin_v2.erl
@@ -122,8 +122,8 @@ gen_encode_sequence(Erules,Typename,D) when is_record(D,type) ->
 			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',
 								   AttrN])),
 			emit([ObjectEncode," = ",nl,
-			     "   ",{asis,ObjSetMod},":'getenc_",ObjSetName,
-			     "'(",{asis,UniqueFieldName},", ",nl]),
+			      "   ",{asis,ObjSetMod},":'getenc_",ObjSetName,
+			      "'("]),
 			ValueMatch = value_match(ValueIndex,
 						 lists:concat(["Cindex",N])),
 			emit([indent(35),ValueMatch,"),",nl]),
@@ -198,7 +198,7 @@ gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:new(tlv),
     asn1ct_name:new(v),
 
-    {DecObjInf,UniqueFName,ValueIndex} =
+    {DecObjInf,ValueIndex} =
 	case TableConsInfo of
 	    #simpletableattributes{objectsetname=ObjectSetRef,
 				   c_name=AttrN,
@@ -217,12 +217,12 @@ gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
 			%% relation from a component to another components
 			%% subtype component
 			{{AttrN,{deep,ObjectSetRef,UniqueFieldName,ValIndex}},
-			 UniqueFieldName,ValIndex};
+			 ValIndex};
 		    false ->
-			{{AttrN,ObjectSetRef},UniqueFieldName,ValIndex}
+			{{AttrN,ObjectSetRef},ValIndex}
 		end;
 	    _ ->
-		{false,false,false}
+		{false,false}
 	end,
     RecordName = lists:concat([get_record_name_prefix(),
 			       asn1ct_gen:list2rname(Typename)]),
@@ -246,7 +246,7 @@ gen_decode_sequence(Erules,Typename,D) when is_record(D,type) ->
 		    {ObjSetMod,ObjSetName} = ObjSetRef,
 		    emit([DecObj," =",nl,
 			  "   ",{asis,ObjSetMod},":'getdec_",ObjSetName,"'(",
-			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
+			  ValueMatch,"),",nl]),
 		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
 	    end,
 	    demit(["Result = "]), %dbg
@@ -357,7 +357,7 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:new(v),
 
 
-    {DecObjInf,UniqueFName,ValueIndex} =
+    {DecObjInf,ValueIndex} =
 	case TableConsInfo of
 %%	    {ObjectSetRef,AttrN,_N,UniqueFieldName} ->%% N is index of attribute that determines constraint
 	    #simpletableattributes{objectsetname=ObjectSetRef,
@@ -378,12 +378,12 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
 			%% relation from a component to another components
 			%% subtype component
 			{{AttrN,{deep,ObjectSetRef,UniqueFieldName,ValIndex}},
-			 UniqueFieldName,ValIndex};
+			 ValIndex};
 		    false ->
-			{{AttrN,ObjectSetRef},UniqueFieldName,ValIndex}
+			{{AttrN,ObjectSetRef},ValIndex}
 		end;
 	    _ ->
-		{false,false,false}
+		{false,false}
 	end,
 
     case CompList of
@@ -425,7 +425,7 @@ gen_decode_set(Erules,Typename,D) when is_record(D,type) ->
 		    {ObjSetMod,ObjSetName} = ObjSetRef,
 		    emit([DecObj," =",nl,
 			  "   ",{asis,ObjSetMod},":'getdec_",ObjSetName,"'(",
-			  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
+			  ValueMatch,"),",nl]),
 		    gen_dec_postponed_decs(DecObj,PostponedDecArgs)
 	    end,
 	    demit(["Result = "]), %dbg
@@ -577,6 +577,8 @@ gen_decode_choice(Erules,Typename,D) when is_record(D,type) ->
 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),
+    asn1ct_name:new(tmpBytes),
+    asn1ct_name:new(tmpLen),
     CindexPos =
 	case Order of
 	    undefined ->
@@ -706,8 +708,6 @@ emit_term_tlv('OPTIONAL',InnerType,DecObjInf) ->
     emit_term_tlv(opt_or_def,InnerType,DecObjInf);
 emit_term_tlv(Prop,{typefield,_},DecObjInf) ->
     emit_term_tlv(Prop,type_or_object_field,DecObjInf);
-emit_term_tlv(Prop,{objectfield,_,_},DecObjInf) ->
-    emit_term_tlv(Prop,type_or_object_field,DecObjInf);
 emit_term_tlv(opt_or_def,type_or_object_field,NotFalse) 
   when NotFalse /= false ->
     asn1ct_name:new(tmpterm),
@@ -789,6 +789,7 @@ gen_enc_choice2(Erules,TopType,[H1|T]) when is_record(H1,'ComponentType') ->
 						      componentrelation)} of
 	    {#'ObjectClassFieldType'{},{componentrelation,_,_}} ->
 		asn1ct_name:new(tmpBytes),
+		asn1ct_name:new(tmpLen),
 		asn1ct_name:new(encBytes),
 		asn1ct_name:new(encLen),
 		Emit = ["{",{curr,tmpBytes},", _} = "],
@@ -929,7 +930,6 @@ gen_enc_line(Erules,TopType,Cname,
   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);
 	_ ->
@@ -991,12 +991,8 @@ gen_enc_line(Erules,TopType,Cname,Type,Element,Indent,OptOrMand,Assign,EncObj)
 				  {call,ber,encode_open_type,
 				   [{curr,tmpBytes},{asis,Tag}]},nl]);
 			_ ->
-			    emit(["{",{next,tmpBytes},",",{curr,tmpLen},
-				  "} = ",
-				  {call,ber,encode_open_type,
-				   [{curr,tmpBytes},{asis,Tag}]},com,nl]),
-			    emit(IndDeep),
-			    emit(["{",{next,tmpBytes},", ",{curr,tmpLen},"}"])
+			    emit([{call,ber,encode_open_type,
+				   [{curr,tmpBytes},{asis,Tag}]}])
 		    end;
 		Err ->
 		    throw({asn1,{'internal error',Err}})
@@ -1159,7 +1155,8 @@ gen_dec_line(Erules,TopType,Cname,CTags,Type,OptOrMand,DecObjInf)  ->
 		
 		emit([indent(4),"_ ->",nl]),
 		case OptOrMand of
-		    {'DEFAULT', Def} ->
+		    {'DEFAULT', Def0} ->
+			Def = asn1ct_gen:conform_value(Type, Def0),
 			emit([indent(8),"{",{asis,Def},",",{prev,tlv},"}",nl]);
 		    'OPTIONAL' ->
 			emit([indent(8),"{ asn1_NOVALUE, ",{prev,tlv},"}",nl])
@@ -1213,22 +1210,18 @@ gen_dec_call({typefield,_},_,_,Cname,Type,BytesVar,Tag,_,_,_DecObjInf,OptOrMandC
 	(Type#type.def)#'ObjectClassFieldType'.fieldname,
     [{Cname,RefedFieldName,asn1ct_gen:mk_var(asn1ct_name:curr(term)),
       asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),Tag,OptOrMandComp}];
-gen_dec_call({objectfield,PrimFieldName,PFNList},_,_,Cname,_,BytesVar,Tag,_,_,_,OptOrMandComp) ->
-    call(decode_open_type, [BytesVar,{asis,Tag}]),
-    [{Cname,{PrimFieldName,PFNList},asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-      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}} ->
+	{Cname,{_,OSet,_UniqueFName,ValIndex}} ->
 	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
 	    ValueMatch = value_match(ValIndex,Term),
 	    {ObjSetMod,ObjSetName} = OSet,
 	    emit([",",nl,"ObjFun = ",{asis,ObjSetMod},":'getdec_",ObjSetName,
-		  "'(",{asis,UniqueFName},", ",ValueMatch,")"]);
+		  "'(",ValueMatch,")"]);
 	_ ->
 	    ok
     end,
diff --git a/lib/asn1/src/asn1ct_constructed_per.erl b/lib/asn1/src/asn1ct_constructed_per.erl
index d279e9697f..ed3f6f886e 100644
--- a/lib/asn1/src/asn1ct_constructed_per.erl
+++ b/lib/asn1/src/asn1ct_constructed_per.erl
@@ -43,10 +43,13 @@ gen_encode_set(Erules,TypeName,D) ->
 gen_encode_sequence(Erules,TypeName,D) ->
     gen_encode_constructed(Erules,TypeName,D).
 
-gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
+gen_encode_constructed(Erule, Typename, #type{}=D) ->
     asn1ct_name:start(),
-    asn1ct_name:new(term),
-    asn1ct_name:new(bytes),
+    Imm = gen_encode_constructed_imm(Erule, Typename, D),
+    asn1ct_imm:enc_cg(Imm, is_aligned(Erule)),
+    emit([".",nl]).
+
+gen_encode_constructed_imm(Erule, Typename, #type{}=D) ->
     {ExtAddGroup,TmpCompList,TableConsInfo} =
 	case D#type.def of
 	    #'SEQUENCE'{tablecinf=TCI,components=CL,extaddgroup=ExtAddGroup0} ->
@@ -65,74 +68,36 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 		       [Comp#'ComponentType'{textual_order=undefined}||
 			   Comp<-TmpCompList]
 	       end,
-    case Typename of
-	['EXTERNAL'] ->
-	    emit([{next,val}," = ",
-		  {call,ext,transform_to_EXTERNAL1990,
-		   [{curr,val}]},com,nl]),
-	    asn1ct_name:new(val);
-	_ ->
-	    ok
-    end,
-    case {Optionals = optionals(to_textual_order(CompList)),CompList,
-	  is_optimized(Erule)} of
-	{[],EmptyCL,_} when EmptyCL == {[],[],[]};EmptyCL == {[],[]};EmptyCL == [] -> 
-	    ok;
-	{[],_,_} ->
-	    emit([{next,val}," = ",{curr,val},",",nl]);
-	{_,_,true} ->
-	    gen_fixoptionals(Optionals),
-	    FixOpts = param_map(fun(Var) ->
-					{var,Var}
-				end,asn1ct_name:all(fixopt)),
-	    emit({"{",{next,val},",Opt} = {",{curr,val},",[",FixOpts,"]},",nl});
-	{_,_,false} ->
-	    asn1ct_func:need({Erule,fixoptionals,3}),
-	    Fixoptcall = ",Opt} = fixoptionals(",
-	    emit({"{",{next,val},Fixoptcall,
-		  {asis,Optionals},",",length(Optionals),
-		  ",",{curr,val},"),",nl})
-    end,
-    asn1ct_name:new(val),
+    ExternalImm =
+	case Typename of
+	    ['EXTERNAL'] ->
+		Next = asn1ct_gen:mk_var(asn1ct_name:next(val)),
+		Curr = asn1ct_gen:mk_var(asn1ct_name:curr(val)),
+		asn1ct_name:new(val),
+		[{call,ext,transform_to_EXTERNAL1990,[{var,Curr}],{var,Next}}];
+	    _ ->
+		[]
+	end,
+    Aligned = is_aligned(Erule),
+    Value0 = make_var(val),
+    Optionals = optionals(to_textual_order(CompList)),
+    ImmOptionals = [asn1ct_imm:per_enc_optional(Value0, Opt, Aligned) ||
+		       Opt <- Optionals],
     Ext = extensible_enc(CompList),
-    case Ext of
-	{ext,_,NumExt} when NumExt > 0 ->
-	    case extgroup_pos_and_length(CompList) of
-		{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,
-				      "[] -> setelement(",
-				      {asis,ExtActualGroupPos+1},",",
-				      {curr,val},",",
-				      "asn1_NOVALUE);",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 = ",
-		  {call,Erule,fixextensions,[{asis,Ext},{curr,val}]},
-		  com,nl]);
-	_ -> true
-    end,
-    EncObj =
+    ExtImm = case Ext of
+		 {ext,ExtPos,NumExt} when NumExt > 0 ->
+		     gen_encode_extaddgroup(CompList),
+		     Value = make_var(val),
+		     asn1ct_imm:per_enc_extensions(Value, ExtPos,
+						   NumExt, Aligned);
+		 _ ->
+		     []
+	     end,
+    {EncObj,ObjSetImm} =
 	case TableConsInfo of
 	    #simpletableattributes{usedclassfield=Used,
 				   uniqueclassfield=Unique} when Used /= Unique ->
-		false;
+		{false,[]};
 	    %% ObjectSet, name of the object set in constraints
 	    %% 
 	    %%{ObjectSet,AttrN,N,UniqueFieldName} -> %% N is index of attribute that determines constraint
@@ -141,24 +106,19 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 				   c_index=N,
 				   usedclassfield=UniqueFieldName,
 				   uniqueclassfield=UniqueFieldName,
-				   valueindex=ValueIndex
+				   valueindex=ValueIndex0
 				  } -> %% N is index of attribute that determines constraint
 		{Module,ObjSetName} = ObjectSet,
 		#typedef{typespec=#'ObjectSet'{gen=Gen}} =
 		    asn1_db:dbget(Module, ObjSetName),
 		case Gen of
 		    true ->
-			ObjectEncode = 
-			    asn1ct_gen:un_hyphen_var(lists:concat(['Obj',AttrN])),
-			El = make_element(N+1, asn1ct_gen:mk_var(asn1ct_name:curr(val))),
-			ValueMatch = value_match(ValueIndex, El),
-			emit([ObjectEncode," =",nl,
-			      "  ",{asis,Module},":'getenc_",ObjSetName,"'(",
-			      {asis,UniqueFieldName},", ",nl,
-			      "  ",ValueMatch,"),",nl]),
-			{AttrN,ObjectEncode};
+			ValueIndex = ValueIndex0 ++ [{N+1,top}],
+			Val = make_var(val),
+			{ObjSetImm0,Dst} = enc_dig_out_value(ValueIndex, Val),
+			{{AttrN,Dst},ObjSetImm0};
 		    false ->
-			false
+			{false,[]}
 		end;
 	    _  ->
 		case D#type.tablecinf of
@@ -166,34 +126,52 @@ gen_encode_constructed(Erule,Typename,D) when is_record(D,type) ->
 			%% when the simpletableattributes was at an outer
 			%% level and the objfun has been passed through the
 			%% function call
-			{"got objfun through args","ObjFun"};
+			{{"got objfun through args",{var,"ObjFun"}},[]};
 		    _ ->
-			false
+			{false,[]}
 		end
 	end,
-    emit({"[",nl}),
-    MaybeComma1 = 
+    ImmSetExt =
 	case Ext of
-	    {ext,_Pos,NumExt2} when NumExt2 > 0 -> 
-		call(Erule, setext, ["Extensions =/= []"]),
-		", ";
-	    {ext,_Pos,_} -> 
-		call(Erule, setext, ["false"]),
-		", ";
-	    _ -> 
-		""
-	end,
-    MaybeComma2 = 
-	case optionals(CompList) of
-	    [] -> MaybeComma1;
-	    _ -> 
-		emit(MaybeComma1),
-		emit("Opt"),
-		{",",nl}
+	    {ext,_Pos,NumExt2} when NumExt2 > 0 ->
+		asn1ct_imm:per_enc_extension_bit({var,"Extensions"}, Aligned);
+	    {ext,_Pos,_} ->
+		asn1ct_imm:per_enc_extension_bit([], Aligned);
+	    _ ->
+		[]
 	end,
-    gen_enc_components_call(Erule,Typename,CompList,MaybeComma2,EncObj,Ext),
-    emit({"].",nl}).
+    ImmBody = gen_enc_components_call(Erule, Typename, CompList, EncObj, Ext),
+    ExternalImm ++ ExtImm ++ ObjSetImm ++
+	asn1ct_imm:enc_append([ImmSetExt] ++ ImmOptionals ++ ImmBody).
+
+gen_encode_extaddgroup(CompList) ->
+    case extgroup_pos_and_length(CompList) of
+	{extgrouppos,[]} ->
+	    ok;
+	{extgrouppos,ExtGroupPosLenList} ->
+	    _ = [do_gen_encode_extaddgroup(G) || G <- ExtGroupPosLenList],
+	    ok
+    end.
 
+do_gen_encode_extaddgroup({ActualGroupPos,GroupVirtualPos,GroupLen}) ->
+    Val = asn1ct_gen:mk_var(asn1ct_name:curr(val)),
+    Elements = make_elements(GroupVirtualPos+1,
+			     Val,
+			     lists:seq(1, GroupLen)),
+    Expr = any_non_value(GroupVirtualPos+1, Val, GroupLen, ""),
+    emit([{next,val}," = case ",Expr," of",nl,
+	  "false -> setelement(",{asis,ActualGroupPos+1},", ",
+	  {curr,val},", asn1_NOVALUE);",nl,
+	  "true -> setelement(",{asis,ActualGroupPos+1},", ",
+	  {curr,val},", {extaddgroup,", Elements,"})",nl,
+	  "end,",nl]),
+    asn1ct_name:new(val).
+
+any_non_value(_, _, 0, _) ->
+    [];
+any_non_value(Pos, Val, N, Sep) ->
+    Sep ++ [make_element(Pos, Val)," =/= asn1_NOVALUE"] ++
+	any_non_value(Pos+1, Val, N-1, [" orelse",nl]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% generate decode function for SEQUENCE and SET
@@ -328,28 +306,29 @@ gen_dec_constructed_imm(Erule, Typename, #type{}=D) ->
     EmitComp = gen_dec_components_call(Erule, Typename, CompList,
 				       DecObjInf, Ext, length(Optionals)),
     EmitRest = fun({AccTerm,AccBytes}) ->
-		       gen_dec_constructed_imm_2(Typename, CompList,
+		       gen_dec_constructed_imm_2(Erule, Typename,
+						 CompList,
 						 ObjSetInfo,
 						 AccTerm, AccBytes)
 	       end,
     [EmitExt,EmitOpt|EmitComp++[{safe,EmitRest}]].
 
-gen_dec_constructed_imm_2(Typename, CompList,
+gen_dec_constructed_imm_2(Erule, Typename, CompList,
 			  ObjSetInfo, AccTerm, AccBytes) ->
-    {_,UniqueFName,ValueIndex} = ObjSetInfo,
+    {_,_UniqueFName,ValueIndex} = ObjSetInfo,
     case {AccTerm,AccBytes} of
 	{[],[]} ->
 	    ok;
 	{_,[]} ->
 	    ok;
 	{[{ObjSet,LeadingAttr,Term}],ListOfOpenTypes} ->
-	    DecObj = asn1ct_gen:un_hyphen_var(lists:concat(['DecObj',LeadingAttr,Term])),
-	    ValueMatch = value_match(ValueIndex,Term),
-	    {ObjSetMod,ObjSetName} = ObjSet,
-	    emit([DecObj," =",nl,
-		  "   ",{asis,ObjSetMod},":'getdec_",ObjSetName,"'(",
-		  {asis,UniqueFName},", ",ValueMatch,"),",nl]),
-	    gen_dec_listofopentypes(DecObj,ListOfOpenTypes,false)
+	    ValueMatch = value_match(ValueIndex, Term),
+	    _ = [begin
+		     gen_dec_open_type(Erule, ValueMatch, ObjSet,
+				       LeadingAttr, T),
+		     emit([com,nl])
+		 end || T <- ListOfOpenTypes],
+	    ok
     end,
     %% we don't return named lists any more   Cnames = mkcnamelist(CompList), 
     demit({"Result = "}), %dbg
@@ -423,67 +402,148 @@ to_textual_order(Cs) when is_list(Cs) ->
 to_textual_order(Cs) ->
     Cs.
 
-gen_dec_listofopentypes(_,[],_) ->
-    emit(nl);
-gen_dec_listofopentypes(DecObj,[{_Cname,{FirstPFN,PFNList},Term,TmpTerm,Prop}|Rest],_Update) ->
-
-    asn1ct_name:new(tmpterm),
-    asn1ct_name:new(reason),
-
-    emit([Term," = ",nl]),
+gen_dec_open_type(Erule, Val, {Xmod,Xtype}, LeadingAttr,
+		  {_,{Name,RestFieldNames},Term,TmpTerm,Prop}) ->
+    #typedef{typespec=ObjSet0} = asn1_db:dbget(Xmod, Xtype),
+    #'ObjectSet'{class=Class,set=ObjSet1} = ObjSet0,
+    #'Externaltypereference'{module=ClMod,type=ClType} = Class,
+    #classdef{typespec=ClassDef} = asn1_db:dbget(ClMod, ClType),
+    #objectclass{fields=ClassFields} = ClassDef,
+    Extensible = lists:member('EXTENSIONMARK', ObjSet1),
+    ObjSet2 = [{Key,fix_object_code(Name, Code, ClassFields)} ||
+		  {_,Key,Code} <- ObjSet1],
+    ObjSet = lists:sort([P || {_,B}=P <- ObjSet2, B =/= none]),
+    Key = erlang:md5(term_to_binary({decode,ObjSet,RestFieldNames,
+				     Prop,Extensible})),
+    Typename = [Name,ClType],
+    Gen = fun(_Fd, N) ->
+		  dec_objset_optional(N, Prop),
+		  dec_objset(Erule, N, ObjSet, RestFieldNames, Typename),
+		  dec_objset_default(N, Name, LeadingAttr, Extensible)
+	  end,
+    Prefix = lists:concat(["dec_os_",Name]),
+    F = asn1ct_func:call_gen(Prefix, Key, Gen),
+    emit([Term," = ",{asis,F},"(",TmpTerm,", ",Val,")"]).
+
+dec_objset_optional(N, {'DEFAULT',Val}) ->
+    dec_objset_optional_1(N, Val),
+    dec_objset_optional_1(N, asn1_DEFAULT);
+dec_objset_optional(N, 'OPTIONAL') ->
+    dec_objset_optional_1(N, asn1_NOVALUE);
+dec_objset_optional(_N, mandatory) -> ok.
+
+dec_objset_optional_1(N, Val) ->
+    emit([{asis,N},"(",{asis,Val},", _Id) ->",nl,
+	  {asis,Val},";",nl]).
+
+dec_objset(_Erule, _N, [], _, _) ->
+    ok;
+dec_objset(Erule, N, [Obj|Objs], RestFields, Cl) ->
+    dec_objset_1(Erule, N, Obj, RestFields, Cl),
+    emit([";",nl]),
+    dec_objset(Erule, N, Objs, RestFields, Cl).
+
+dec_objset_default(N, C, LeadingAttr, false) ->
+    emit([{asis,N},"(Bytes, Id) ->",nl,
+	  "exit({'Type not compatible with table constraint',"
+	  "{{component,",{asis,C},"},"
+	  "{value,Bytes},"
+	  "{unique_name_and_value,",{asis,LeadingAttr},",Id}}}).",nl,nl]);
+dec_objset_default(N, _, _, true) ->
+    emit([{asis,N},"(Bytes, Id) ->",nl|
+	  case asn1ct:use_legacy_types() of
+	      false ->
+		  ["{asn1_OPENTYPE,Bytes}.",nl,nl];
+	      true ->
+		  ["Bytes.",nl,nl]
+	  end]).
+
+dec_objset_1(Erule, N, {Id,Obj}, RestFields, Typename) ->
+    emit([{asis,N},"(Bytes, ",{asis,Id},") ->",nl]),
+    dec_objset_2(Erule, Obj, RestFields, Typename).
+
+dec_objset_2(Erule, Obj, RestFields0, Typename) ->
+    case Obj of
+	#typedef{name={primitive,bif},typespec=Type} ->
+	    Imm = asn1ct_gen_per:gen_dec_imm(Erule, Type),
+	    {Term,_} = asn1ct_imm:dec_slim_cg(Imm, 'Bytes'),
+	    emit([com,nl,Term]);
+	#typedef{name={constructed,bif},typespec=Def} ->
+	    InnerType = asn1ct_gen:get_inner(Def#type.def),
+	    case InnerType of
+		'CHOICE' ->
+		    asn1ct_name:start(),
+		    asn1ct_name:new(bytes),
+		    {'CHOICE',CompList} = Def#type.def,
+		    Ext = extensible_enc(CompList),
+		    emit(["{Result,_} = begin",nl]),
+		    gen_dec_choice(Erule, Typename, CompList, Ext),
+		    emit([nl,
+			  "end",com,nl,
+			  "Result"]);
+		'SET' ->
+		    Imm0 = gen_dec_constructed_imm(Erule, Typename, Def),
+		    Imm = opt_imm(Imm0),
+		    asn1ct_name:start(),
+		    emit(["{Result,_} = begin",nl]),
+		    emit_gen_dec_imm(Imm),
+		    emit([nl,
+			  "end",com,nl,
+			  "Result"]);
+		'SET OF' ->
+		    asn1ct_name:start(),
+		    do_gen_decode_sof(Erule, Typename, 'SET OF',
+				      Def, false);
+		'SEQUENCE' ->
+		    Imm0 = gen_dec_constructed_imm(Erule, Typename, Def),
+		    Imm = opt_imm(Imm0),
+		    asn1ct_name:start(),
+		    emit(["{Result,_} = begin",nl]),
+		    emit_gen_dec_imm(Imm),
+		    emit([nl,
+			  "end",com,nl,
+			  "Result"]);
+		'SEQUENCE OF' ->
+		    asn1ct_name:start(),
+		    do_gen_decode_sof(Erule, Typename, 'SEQUENCE OF',
+				      Def, false)
+	    end;
+	#typedef{name=Type} ->
+	    emit(["{Result,_} = ",{asis,enc_func("dec_", Type)},"(Bytes),",nl,
+		  "Result"]);
+	#'Externaltypereference'{module=Mod,type=Type} ->
+	    emit("{Term,_} = "),
+	    Func = enc_func("dec_", Type),
+	    case get(currmod) of
+		Mod ->
+		    emit([{asis,Func},"(Bytes)"]);
+		_ ->
+		    emit([{asis,Mod},":",{asis,Func},"(Bytes)"])
+	    end,
+	    emit([com,nl,
+		  "Term"]);
+	#'Externalvaluereference'{module=Mod,value=Value} ->
+	    case asn1_db:dbget(Mod, Value) of
+		#typedef{typespec=#'Object'{def=Def}} ->
+		    {object,_,Fields} = Def,
+		    [NextField|RestFields] = RestFields0,
+		    {NextField,Typedef} = lists:keyfind(NextField, 1, Fields),
+		    dec_objset_2(Erule, Typedef, RestFields, Typename)
+	    end
+    end.
 
-    N = case Prop of
-	    mandatory -> 0;
-	    'OPTIONAL' ->
-		emit_opt_or_mand_check(asn1_NOVALUE,TmpTerm),
-		6;
-	    {'DEFAULT',Val} ->
-		emit_opt_or_mand_check(Val,TmpTerm),
-		6
-	end,
+gen_encode_choice(Erule, TopType, D) ->
+    asn1ct_name:start(),
+    Imm = gen_encode_choice_imm(Erule, TopType, D),
+    asn1ct_imm:enc_cg(Imm, is_aligned(Erule)),
+    emit([".",nl]).
 
-    emit([indent(N+3),"case (catch ",DecObj,"(",
-	  {asis,FirstPFN},", ",TmpTerm,", telltype,",{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 Prop of
-	mandatory ->
-	    emit([indent(N+3),"end,",nl]);
-	_ ->
-	    emit([indent(N+3),"end",nl,
-		  indent(3),"end,",nl])
-    end,
-    gen_dec_listofopentypes(DecObj,Rest,true).
-
-
-emit_opt_or_mand_check(Val,Term) ->
-    emit([indent(3),"case ",Term," of",nl,
-	  indent(6),{asis,Val}," ->",{asis,Val},";",nl,
-	  indent(6),"_ ->",nl]).
-
-%% ENCODE GENERATOR FOR THE CHOICE TYPE *******
-%% assume Val = {Alternative,AltType}
-%% generate
-%%[
-%% ?RT_PER:set_choice(element(1,Val),Altnum,Altlist,ext),
-%%case element(1,Val) of
-%%    alt1 ->
-%%	encode_alt1(element(2,Val));
-%%    alt2 ->
-%%	encode_alt2(element(2,Val))
-%%end
-%%].
-
-gen_encode_choice(Erule,Typename,D) when is_record(D,type) ->
-    {'CHOICE',CompList} = D#type.def,
-    emit({"[",nl}),
+gen_encode_choice_imm(Erule, TopType, #type{def={'CHOICE',CompList}}) ->
     Ext = extensible_enc(CompList),
-    gen_enc_choice(Erule,Typename,CompList,Ext),
-    emit({nl,"].",nl}).
+    Aligned = is_aligned(Erule),
+    Cs = gen_enc_choice(Erule, TopType, CompList, Ext),
+    [{assign,{expr,"{ChoiceTag,ChoiceVal}"},"Val"}|
+     asn1ct_imm:per_enc_choice({var,"ChoiceTag"}, Cs, Aligned)].
 
 gen_decode_choice(Erules,Typename,D) when is_record(D,type) ->
     asn1ct_name:start(),
@@ -496,72 +556,50 @@ gen_decode_choice(Erules,Typename,D) when is_record(D,type) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Encode generator for SEQUENCE OF type
 
-
-gen_encode_sof(Erule,Typename,SeqOrSetOf,D) when is_record(D,type) ->
+gen_encode_sof(Erule, Typename, SeqOrSetOf, D) ->
     asn1ct_name:start(),
-    {_SeqOrSetOf,ComponentType} = D#type.def,
-    emit({"[",nl}),
-    SizeConstraint = asn1ct_imm:effective_constraint(bitstring,
-						     D#type.constraint),
-    ObjFun =
-	case D#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		", ObjFun";
-	    _->
-		""
-	end,
-    gen_encode_length(Erule, SizeConstraint),
-    emit({indent(3),"'enc_",asn1ct_gen:list2name(Typename),
-	      "_components'(Val",ObjFun,", [])"}),
-    emit({nl,"].",nl}),
-    gen_encode_sof_components(Erule, Typename, SeqOrSetOf, ComponentType).
-
-
-%% Logic copied from asn1_per_bin_rt2ct:encode_constrained_number
-gen_encode_length(per, {Lb,Ub}) when Ub =< 65535, Lb >= 0 ->
-    Range = Ub - Lb + 1,
-    V2 = ["(length(Val) - ",Lb,")"],
-    Encode = if
-		 Range  == 1 ->
-		     "[]";
-		 Range  == 2 ->
-		     {"[",V2,"]"};
-		 Range  =< 4 ->
-		     {"[10,2,",V2,"]"};
-		 Range  =< 8 ->
-		     {"[10,3,",V2,"]"};
-		 Range  =< 16 ->
-		     {"[10,4,",V2,"]"};
-		 Range  =< 32 ->
-		     {"[10,5,",V2,"]"};
-		 Range  =< 64 ->
-		     {"[10,6,",V2,"]"};
-		 Range  =< 128 ->
-		     {"[10,7,",V2,"]"};
-		 Range  =< 255 ->
-		     {"[10,8,",V2,"]"};
-		 Range  =< 256 ->
-		     {"[20,1,",V2,"]"};
-		 Range  =< 65536 ->
-		     {"[20,2,<<",V2,":16>>]"};
-		 true ->
-		     {call,per,encode_length,
-		      [{asis,{Lb,Ub}},"length(Val)"]}
-	     end,
-    emit({nl,Encode,",",nl});
-gen_encode_length(Erules, SizeConstraint) ->
-    emit([nl,indent(3),
-	  case SizeConstraint of
-	      no ->
-		  {call,Erules,encode_length,["length(Val)"]};
-	      _ ->
-		  {call,Erules,encode_length,
-		   [{asis,SizeConstraint},"length(Val)"]}
-	  end,
-	  com,nl]).
+    Imm = gen_encode_sof_imm(Erule, Typename, SeqOrSetOf, D),
+    asn1ct_imm:enc_cg(Imm, is_aligned(Erule)),
+    emit([".",nl,nl]).
 
-gen_decode_sof(Erules,Typename,SeqOrSetOf,D) when is_record(D,type) ->
+gen_encode_sof_imm(Erule, Typename, SeqOrSetOf, #type{}=D) ->
+    {_SeqOrSetOf,ComponentType} = D#type.def,
+    Aligned = is_aligned(Erule),
+    CompType = ComponentType#type.def,
+    Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf, CompType),
+    Conttype = asn1ct_gen:get_inner(CompType),
+    Currmod = get(currmod),
+    Imm0 = case asn1ct_gen:type(Conttype) of
+	       {primitive,bif} ->
+		   asn1ct_gen_per:gen_encode_prim_imm({var,"Comp"},
+						      ComponentType, Aligned);
+	       {constructed,bif} ->
+		   TypeName = [Constructed_Suffix|Typename],
+		   Enc = enc_func(asn1ct_gen:list2name(TypeName)),
+		   ObjArg = case D#type.tablecinf of
+				[{objfun,_}|_] -> [{var,"ObjFun"}];
+				_ -> []
+			    end,
+		   [{apply,{local,Enc,CompType},
+		     [{var,"Comp"}|ObjArg]}];
+	       #'Externaltypereference'{module=Currmod,type=Ename} ->
+		   [{apply,{local,enc_func(Ename),CompType},[{var,"Comp"}]}];
+	       #'Externaltypereference'{module=EMod,type=Ename} ->
+		   [{apply,{EMod,enc_func(Ename),CompType},[{var,"Comp"}]}];
+	       'ASN1_OPEN_TYPE' ->
+		   asn1ct_gen_per:gen_encode_prim_imm({var,"Comp"},
+						      #type{def='ASN1_OPEN_TYPE'},
+						      Aligned)
+	   end,
+    asn1ct_imm:per_enc_sof({var,"Val"}, D#type.constraint, 'Comp',
+			   Imm0, Aligned).
+
+gen_decode_sof(Erules, Typename, SeqOrSetOf, #type{}=D) ->
     asn1ct_name:start(),
+    do_gen_decode_sof(Erules, Typename, SeqOrSetOf, D, true),
+    emit([".",nl,nl]).
+
+do_gen_decode_sof(Erules, Typename, SeqOrSetOf, D, NeedRest) ->
     {_SeqOrSetOf,ComponentType} = D#type.def,
     SizeConstraint = asn1ct_imm:effective_constraint(bitstring,
 						     D#type.constraint),
@@ -573,10 +611,16 @@ gen_decode_sof(Erules,Typename,SeqOrSetOf,D) when is_record(D,type) ->
 		""
 	end,
     {Num,Buf} = gen_decode_length(SizeConstraint, Erules),
+    Key = erlang:md5(term_to_binary({Typename,SeqOrSetOf,
+				     ComponentType,NeedRest})),
+    Gen = fun(_Fd, Name) ->
+		  gen_decode_sof_components(Erules, Name,
+					    Typename, SeqOrSetOf,
+					    ComponentType, NeedRest)
+	  end,
+    F = asn1ct_func:call_gen("dec_components", Key, Gen),
     emit([",",nl,
-	  "'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(",Num,", ",Buf,ObjFun,", []).",nl,nl]),
-    gen_decode_sof_components(Erules, Typename, SeqOrSetOf, ComponentType).
+	  {asis,F},"(",Num,", ",Buf,ObjFun,", [])"]).
 
 is_aligned(per) -> true;
 is_aligned(uper) -> false.
@@ -586,7 +630,7 @@ gen_decode_length(Constraint, Erule) ->
     Imm = asn1ct_imm:per_dec_length(Constraint, true, is_aligned(Erule)),
     asn1ct_imm:dec_slim_cg(Imm, "Bytes").
 
-gen_encode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
+gen_decode_sof_components(Erule, Name, Typename, SeqOrSetOf, Cont, NeedRest) ->
     {ObjFun,ObjFun_Var} =
 	case Cont#type.tablecinf of
 	    [{objfun,_}|_R] ->
@@ -594,76 +638,38 @@ gen_encode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
 	    _ ->
 		{"",""}
 	end,
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'([]",
-	  ObjFun_Var,", Acc) -> lists:reverse(Acc);",nl,nl}),
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'([H|T]",
-	  ObjFun,", Acc) ->",nl}),
-    emit({"'enc_",asn1ct_gen:list2name(Typename),"_components'(T"}), 
-    emit({ObjFun,", ["}),
-    %% the component encoder
-    Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
-						       Cont#type.def),
-    
-    Conttype = asn1ct_gen:get_inner(Cont#type.def),
-    Currmod = get(currmod),
-    case asn1ct_gen:type(Conttype) of
-	{primitive,bif} ->
-	    asn1ct_gen_per:gen_encode_prim(Erule, Cont, "H");
-	{constructed,bif} ->
-	    NewTypename = [Constructed_Suffix|Typename],
-	    emit({"'enc_",asn1ct_gen:list2name(NewTypename),"'(H",
-		  ObjFun,")",nl,nl});
-	#'Externaltypereference'{module=Currmod,type=Ename} ->
-	    emit({"'enc_",Ename,"'(H)",nl,nl});
-	#'Externaltypereference'{module=EMod,type=EType} ->
-	    emit({"'",EMod,"':'enc_",EType,"'(H)",nl,nl});
-	'ASN1_OPEN_TYPE' ->
-	    asn1ct_gen_per:gen_encode_prim(Erule,
-					   #type{def='ASN1_OPEN_TYPE'},
-					   "H");
-	_ ->
-	    emit({"'enc_",Conttype,"'(H)",nl,nl})
+    case NeedRest of
+	false ->
+	    emit([{asis,Name},"(0, _Bytes",ObjFun_Var,", Acc) ->",nl,
+		  "lists:reverse(Acc);",nl]);
+	true ->
+	    emit([{asis,Name},"(0, Bytes",ObjFun_Var,", Acc) ->",nl,
+		  "{lists:reverse(Acc),Bytes};",nl])
     end,
-    emit({" | Acc]).",nl}).
-
-gen_decode_sof_components(Erule,Typename,SeqOrSetOf,Cont) ->
-    {ObjFun,ObjFun_Var} =
-	case Cont#type.tablecinf of
-	    [{objfun,_}|_R] ->
-		{", ObjFun",", _"};
-	    _ ->
-		{"",""}
-	end,
-    emit({"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(0, Bytes",ObjFun_Var,", Acc) ->",nl,
-	  indent(3),"{lists:reverse(Acc), Bytes};",nl}),
-    emit({"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(Num, Bytes",ObjFun,", Acc) ->",nl}),
-    emit({indent(3),"{Term,Remain} = "}),
+    emit([{asis,Name},"(Num, Bytes",ObjFun,", Acc) ->",nl,
+	  "{Term,Remain} = "]),
     Constructed_Suffix = asn1ct_gen:constructed_suffix(SeqOrSetOf,
 						       Cont#type.def),
     Conttype = asn1ct_gen:get_inner(Cont#type.def),
-    Ctgenmod = asn1ct_gen:ct_gen_module(Erule),
     case asn1ct_gen:type(Conttype) of
 	{primitive,bif} ->
-	    Ctgenmod:gen_dec_prim(Erule,Cont,"Bytes"),
+	    asn1ct_gen_per:gen_dec_prim(Erule, Cont, "Bytes"),
 	    emit({com,nl});
 	{constructed,bif} ->
 	    NewTypename = [Constructed_Suffix|Typename],
 	    emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-		  "'(Bytes, telltype",ObjFun,"),",nl});
+		  "'(Bytes",ObjFun,"),",nl});
 	#'Externaltypereference'{}=Etype ->
 	    asn1ct_gen_per:gen_dec_external(Etype, "Bytes"),
 	    emit([com,nl]);
 	'ASN1_OPEN_TYPE' ->
-	    Ctgenmod:gen_dec_prim(Erule,#type{def='ASN1_OPEN_TYPE'},
-				  "Bytes"),
+	    asn1ct_gen_per:gen_dec_prim(Erule, #type{def='ASN1_OPEN_TYPE'},
+					"Bytes"),
 	    emit({com,nl});
 	_ ->
-	    emit({"'dec_",Conttype,"'(Bytes,telltype),",nl})
+	    emit({"'dec_",Conttype,"'(Bytes),",nl})
     end,
-    emit({indent(3),"'dec_",asn1ct_gen:list2name(Typename),
-	  "_components'(Num-1, Remain",ObjFun,", [Term|Acc]).",nl}).
+    emit([{asis,Name},"(Num-1, Remain",ObjFun,", [Term|Acc]).",nl]).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -754,27 +760,6 @@ gen_dec_optionals(Optionals) ->
     end,
     {imm,Imm0,E}.
 
-gen_fixoptionals([{Pos,Def}|R]) ->
-    asn1ct_name:new(fixopt),
-    emit({{curr,fixopt}," = case element(",{asis,Pos},",",{curr,val},") of",nl,
-	  "asn1_DEFAULT -> 0;",nl,
-	  {asis,Def}," -> 0;",nl,
-	  "_ -> 1",nl,
-	  "end,",nl}),
-    gen_fixoptionals(R);
-gen_fixoptionals([Pos|R]) ->
-    gen_fixoptionals([{Pos,asn1_NOVALUE}|R]);
-gen_fixoptionals([]) ->
-    ok.
-
-    
-param_map(Fun, [H]) ->
-    [Fun(H)];
-param_map(Fun, [H|T]) ->
-    [Fun(H),","|param_map(Fun,T)].
-
-    
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Produce a list with positions (in the Value record) where
 %% there are optional components, start with 2 because first element
@@ -788,15 +773,15 @@ optionals({L1,Ext,L2}) ->
 optionals({L,_Ext}) -> optionals(L,[],2); 
 optionals(L) -> optionals(L,[],2).
 
-optionals([{'EXTENSIONMARK',_,_}|Rest],Acc,Pos) ->
-    optionals(Rest,Acc,Pos); % optionals in extension are currently not handled
-optionals([#'ComponentType'{prop='OPTIONAL'}|Rest],Acc,Pos) ->
-		 optionals(Rest,[Pos|Acc],Pos+1);
-optionals([#'ComponentType'{prop={'DEFAULT',Val}}|Rest],Acc,Pos) ->
-		 optionals(Rest,[{Pos,Val}|Acc],Pos+1);
-optionals([#'ComponentType'{}|Rest],Acc,Pos) ->
-		 optionals(Rest,Acc,Pos+1);
-optionals([],Acc,_) ->
+optionals([#'ComponentType'{prop='OPTIONAL'}|Rest], Acc, Pos) ->
+    optionals(Rest, [Pos|Acc], Pos+1);
+optionals([#'ComponentType'{typespec=T,prop={'DEFAULT',Val}}|Rest],
+	  Acc, Pos) ->
+    Vals = def_values(T, Val),
+    optionals(Rest, [{Pos,Vals}|Acc], Pos+1);
+optionals([#'ComponentType'{}|Rest], Acc, Pos) ->
+    optionals(Rest, Acc, Pos+1);
+optionals([], Acc, _) ->
     lists:reverse(Acc).
 
 %%%%%%%%%%%%%%%%%%%%%%
@@ -858,33 +843,32 @@ add_textual_order1(Cs,NumIn) ->
 		   end,
 		   NumIn,Cs).
 
-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) ->
+gen_enc_components_call(Erule,TopType,{Root,ExtList}, DynamicEnc,Ext) ->
+    gen_enc_components_call(Erule,TopType,{Root,ExtList,[]}, DynamicEnc,Ext);
+gen_enc_components_call(Erule,TopType,CL={Root,ExtList,Root2}, DynamicEnc,Ext) ->
     %% The type has extensionmarker
-    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,
+    {Imm0,Rpos} = gen_enc_components_call1(Erule,TopType,Root++Root2,1, DynamicEnc,noext,[]),
+    ExtImm = case Ext of
+		 {ext,_,ExtNum} when ExtNum > 0 ->
+		     [{var,"Extensions"}];
+		 _ ->
+		     []
+	     end,
     %handle extensions
     {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) ->
+    {Imm1,_} = gen_enc_components_call1(Erule,TopType,NewExtList,Rpos,DynamicEnc,Ext,[]),
+    Imm0 ++ [ExtImm|Imm1];
+gen_enc_components_call(Erule,TopType, CompList, DynamicEnc, Ext) ->
     %% The type has no extensionmarker
-    gen_enc_components_call1(Erule,TopType,CompList,1,MaybeComma,DynamicEnc,Ext).
+    {Imm,_} = gen_enc_components_call1(Erule,TopType,CompList,1,DynamicEnc,Ext,[]),
+    Imm.
 
 gen_enc_components_call1(Erule,TopType,
 			 [C=#'ComponentType'{name=Cname,typespec=Type,prop=Prop}|Rest],
 			 Tpos,
-			 MaybeComma, DynamicEnc, Ext) ->
+			 DynamicEnc, Ext, Acc) ->
 
-    put(component_type,{true,C}), 
-    %% information necessary in asn1ct_gen_per_rt2ct:gen_encode_prim
     TermNo =
 	case C#'ComponentType'.textual_order of
 	    undefined ->
@@ -892,90 +876,91 @@ gen_enc_components_call1(Erule,TopType,
 	    CanonicalNum ->
 		CanonicalNum
 	end,
-    emit(MaybeComma),
-    case Prop of
-	'OPTIONAL' ->
-	    gen_enc_component_optional(Erule,TopType,Cname,Type,TermNo,DynamicEnc,Ext);
-	{'DEFAULT',DefVal} ->
-	    gen_enc_component_default(Erule,TopType,Cname,Type,TermNo,DynamicEnc,Ext,DefVal);
+    Val = make_var(val),
+    {Imm0,Element} = asn1ct_imm:enc_element(TermNo+1, Val),
+    Imm1 = gen_enc_line_imm(Erule, TopType, Cname, Type, Element, DynamicEnc, Ext),
+    Category = case {Prop,Ext} of
+		   {'OPTIONAL',_} ->
+		       optional;
+		   {{'DEFAULT',DefVal},_} ->
+		       {default,DefVal};
+		   {_,{ext,ExtPos,_}} when Tpos >= ExtPos ->
+		       optional;
+		   {_,_} ->
+		       mandatory
+	       end,
+    Imm2 = case Category of
+	       mandatory ->
+		   Imm1;
+	       optional ->
+		   asn1ct_imm:enc_absent(Element, [asn1_NOVALUE], Imm1);
+	       {default,Def} ->
+		   DefValues = def_values(Type, Def),
+		   asn1ct_imm:enc_absent(Element, DefValues, Imm1)
+	   end,
+    Imm = case Imm2 of
+	      [] -> [];
+	      _ -> Imm0 ++ Imm2
+	  end,
+    gen_enc_components_call1(Erule, TopType, Rest, Tpos+1, DynamicEnc, Ext, [Imm|Acc]);
+gen_enc_components_call1(_Erule,_TopType,[],Pos,_,_, Acc) ->
+    ImmList = lists:reverse(Acc),
+    {ImmList,Pos}.
+
+def_values(#type{def=#'Externaltypereference'{module=Mod,type=Type}}, Def) ->
+    #typedef{typespec=T} = asn1_db:dbget(Mod, Type),
+    def_values(T, Def);
+def_values(#type{def={'BIT STRING',[]}}, Bs) when is_bitstring(Bs) ->
+    case asn1ct:use_legacy_types() of
+	false ->
+	    [asn1_DEFAULT,Bs];
+	true ->
+	    ListBs = [B || <<B:1>> <= Bs],
+	    IntBs = lists:foldl(fun(B, A) ->
+					(A bsl 1) bor B
+				end, 0, lists:reverse(ListBs)),
+	    Sz = bit_size(Bs),
+	    Compact = case 8 - Sz rem 8 of
+			  8 ->
+			      {0,Bs};
+			  Unused ->
+			      {Unused,<<Bs:Sz/bits,0:Unused>>}
+		      end,
+	    [asn1_DEFAULT,Bs,Compact,ListBs,IntBs]
+    end;
+def_values(#type{def={'BIT STRING',[_|_]=Ns}}, List) when is_list(List) ->
+    Bs = asn1ct_gen:named_bitstring_value(List, Ns),
+    As = case asn1ct:use_legacy_types() of
+	     false ->
+		 [List,Bs];
+	     true ->
+		 ListBs = [B || <<B:1>> <= Bs],
+		 IntBs = lists:foldl(fun(B, A) ->
+					     (A bsl 1) bor B
+				     end, 0, lists:reverse(ListBs)),
+		 [List,Bs,ListBs,IntBs]
+	 end,
+    {call,per_common,is_default_bitstring,As};
+def_values(#type{def={'INTEGER',Ns}}, Def) ->
+    [asn1_DEFAULT,Def|case lists:keyfind(Def, 2, Ns) of
+			  false -> [];
+			  {Val,Def} -> [Val]
+		      end];
+def_values(_, Def) ->
+    [asn1_DEFAULT,Def].
+
+gen_enc_line_imm(Erule, TopType, Cname, Type, Element, DynamicEnc, Ext) ->
+    Imm0 = gen_enc_line_imm_1(Erule, TopType, Cname, Type,
+			      Element, DynamicEnc),
+    Aligned = is_aligned(Erule),
+    case Ext of
+	{ext,_Ep2,_} ->
+	    asn1ct_imm:per_enc_open_type(Imm0, Aligned);
 	_ ->
-	    case Ext of
-		{ext,ExtPos,_} when Tpos >= ExtPos ->
-		    gen_enc_component_optional(Erule,TopType,Cname,Type,TermNo,DynamicEnc,Ext);
-		_ ->
-		    gen_enc_component_mandatory(Erule,TopType,Cname,Type,TermNo,DynamicEnc,Ext)
-	    end
-    end,
-
-    erase(component_type),
+	    Imm0
+    end.
 
-    case Rest of
-	[] ->
-	    Tpos+1;
-	_ ->
-	    emit({com,nl}),
-	    gen_enc_components_call1(Erule,TopType,Rest,Tpos+1,"",DynamicEnc,Ext)
-    end;
-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))),
-    emit({"case ",Element," of",nl}),
-%    emit({"asn1_DEFAULT -> [];",nl}),
-    emit({"DFLT when DFLT == asn1_DEFAULT; DFLT == ",{asis,DefaultVal}," -> [];",nl}),
-
-    asn1ct_name:new(tmpval),
-    emit({{curr,tmpval}," ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    emit({nl,"%% attribute number ",Pos," with type ",
-	      InnerType,nl}),
-    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    gen_enc_line(Erule,TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
-    emit({nl,"end"}).
-
-gen_enc_component_optional(Erule,TopType,Cname,
-			   Type=#type{def=#'SEQUENCE'{
-					extaddgroup=Number,
-					components=_ExtGroupCompList}},
-			   Pos,DynamicEnc,Ext) when is_integer(Number) ->
-
-    Element = make_element(Pos+1,asn1ct_gen:mk_var(asn1ct_name:curr(val))),
-    emit({"case ",Element," of",nl}),
-
-    emit({"asn1_NOVALUE -> [];",nl}),
-    asn1ct_name:new(tmpval),
-    emit({{curr,tmpval}," ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    emit({nl,"%% attribute number ",Pos," with type ",
-	      InnerType,nl}),
-    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    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))),
-    emit({"case ",Element," of",nl}),
-
-    emit({"asn1_NOVALUE -> [];",nl}),
-    asn1ct_name:new(tmpval),
-    emit({{curr,tmpval}," ->",nl}),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    emit({nl,"%% attribute number ",Pos," with type ",
-	      InnerType,nl}),
-    NextElement = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    gen_enc_line(Erule,TopType,Cname,Type,NextElement, Pos,DynamicEnc,Ext),
-    emit({nl,"end"}).
-
-gen_enc_component_mandatory(Erule,TopType,Cname,Type,Pos,DynamicEnc,Ext) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    emit({nl,"%% attribute number ",Pos," with type ",
-	      InnerType,nl}),
-    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))),
-    gen_enc_line(Erule,TopType,Cname,Type,Element, Pos,DynamicEnc,Ext);
-gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
+gen_enc_line_imm_1(Erule, TopType, Cname, Type, Element, DynamicEnc) ->
     Atype = 
 	case Type of
 	    #type{def=#'ObjectClassFieldType'{type=InnerType}} ->
@@ -983,81 +968,164 @@ gen_enc_line(Erule,TopType,Cname,Type,Element, _Pos,DynamicEnc,Ext) ->
 	    _  ->
 		asn1ct_gen:get_inner(Type#type.def)
 	end,
-
-    case Ext of
-	{ext,_Ep1,_} ->
-	    asn1ct_func:need({Erule,encode_open_type,1}),
-	    asn1ct_func:need({Erule,complete,1}),
-	    emit(["encode_open_type(complete("]);
-	_ -> true
-    end,
-
+    Aligned = is_aligned(Erule),
     case Atype of
 	{typefield,_} ->
-	    case DynamicEnc of
-		{_LeadingAttrName,Fun} ->
-		    case (Type#type.def)#'ObjectClassFieldType'.fieldname of
-			{Name,RestFieldNames} when is_atom(Name) ->
-			    asn1ct_func:need({Erule,complete,1}),
-			    asn1ct_func:need({Erule,encode_open_type,1}),
-			    emit({"encode_open_type(complete(",nl}),
-			    emit({"   ",Fun,"(",{asis,Name},", ",
-				  Element,", ",{asis,RestFieldNames},")))"});
-			Other ->
-			    throw({asn1,{'internal error',Other}})
-		    end
-	    end;
-	{objectfield,PrimFieldName1,PFNList} ->
-	    case DynamicEnc of
-		{_LeadingAttrName,Fun} ->
-		    asn1ct_func:need({Erule,complete,1}),
-		    asn1ct_func:need({Erule,encode_open_type,1}),
-		    emit({"encode_open_type("
-			  "complete(",nl}),
-		    emit({"   ",Fun,"(",{asis,PrimFieldName1},
-			  ", ",Element,", ",{asis,PFNList},")))"})
+	    {_LeadingAttrName,Fun} = DynamicEnc,
+	    case (Type#type.def)#'ObjectClassFieldType'.fieldname of
+		{Name,RestFieldNames} when is_atom(Name) ->
+		    Imm = enc_var_type_call(Erule, Name, RestFieldNames,
+					    Type, Fun, Element),
+		    asn1ct_imm:per_enc_open_type(Imm, Aligned)
 	    end;
 	_ ->
 	    CurrMod = get(currmod),
 	    case asn1ct_gen:type(Atype) of
-		#'Externaltypereference'{module=Mod,type=EType} when 
-		      (CurrMod==Mod) ->
-		    emit({"'enc_",EType,"'(",Element,")"});
+		#'Externaltypereference'{module=CurrMod,type=EType} ->
+		    [{apply,{local,enc_func(EType),Atype},[Element]}];
 		#'Externaltypereference'{module=Mod,type=EType} ->
-		    emit({"'",Mod,"':'enc_",
-			  EType,"'(",Element,")"});
+		    [{apply,{Mod,enc_func(EType),Atype},[Element]}];
 		{primitive,bif} ->
-		    asn1ct_gen_per:gen_encode_prim(Erule, Type, Element);
+		    asn1ct_gen_per:gen_encode_prim_imm(Element, Type, Aligned);
 		'ASN1_OPEN_TYPE' ->
 		    case Type#type.def of
 			#'ObjectClassFieldType'{type=OpenType} ->
-			    asn1ct_gen_per:gen_encode_prim(Erule,
-							   #type{def=OpenType},
-							   Element);
+			    asn1ct_gen_per:gen_encode_prim_imm(Element,
+							       #type{def=OpenType},
+							       Aligned);
 			_ ->
-			    asn1ct_gen_per:gen_encode_prim(Erule, Type,
-							   Element)
+			    asn1ct_gen_per:gen_encode_prim_imm(Element,
+							       Type,
+							       Aligned)
 		    end;
 		{constructed,bif} ->
 		    NewTypename = [Cname|TopType],
+		    Enc = enc_func(asn1ct_gen:list2name(NewTypename)),
 		    case {Type#type.tablecinf,DynamicEnc} of
 			{[{objfun,_}|_R],{_,EncFun}} ->
-			    emit({"'enc_",
-				  asn1ct_gen:list2name(NewTypename),
-				  "'(",Element,", ",EncFun,")"});
+			    [{apply,{local,Enc,Type},[Element,EncFun]}];
 			_ ->
-			    emit({"'enc_",
-				  asn1ct_gen:list2name(NewTypename),
-				  "'(",Element,")"})
+			    [{apply,{local,Enc,Type},[Element]}]
 		    end
 	    end
-    end,
-    case Ext of 
-	{ext,_Ep2,_} ->
-	    emit("))");
-	_ -> true
     end.
 
+enc_func(Type) ->
+    enc_func("enc_", Type).
+
+enc_func(Prefix, Name) ->
+    list_to_atom(lists:concat([Prefix,Name])).
+
+enc_var_type_call(Erule, Name, RestFieldNames,
+		  #type{tablecinf=TCI}, Fun, Val) ->
+    [{objfun,#'Externaltypereference'{module=Xmod,type=Xtype}}] = TCI,
+    #typedef{typespec=ObjSet0} = asn1_db:dbget(Xmod, Xtype),
+    #'ObjectSet'{class=Class,set=ObjSet1} = ObjSet0,
+    #'Externaltypereference'{module=ClMod,type=ClType} = Class,
+    #classdef{typespec=ClassDef} = asn1_db:dbget(ClMod, ClType),
+    #objectclass{fields=ClassFields} = ClassDef,
+    Extensible = lists:member('EXTENSIONMARK', ObjSet1),
+    ObjSet2 = [{Key,fix_object_code(Name, Code, ClassFields)} ||
+		  {_,Key,Code} <- ObjSet1],
+    ObjSet = lists:sort([P || {_,B}=P <- ObjSet2, B =/= none]),
+    Key = erlang:md5(term_to_binary({encode,ObjSet,RestFieldNames,Extensible})),
+    Imm = enc_objset_imm(Erule, Name, ObjSet, RestFieldNames, Extensible),
+    Lambda = {lambda,[{var,"Val"},{var,"Id"}],Imm},
+    Gen = fun(_Fd, N) ->
+		  Aligned = is_aligned(Erule),
+		  emit([{asis,N},"(Val, Id) ->",nl]),
+		  asn1ct_imm:enc_cg(Imm, Aligned),
+		  emit([".",nl])
+	  end,
+    Prefix = lists:concat(["enc_os_",Name]),
+    [{call_gen,Prefix,Key,Gen,Lambda,[Val,Fun]}].
+
+fix_object_code(Name, [{Name,B}|_], _ClassFields) ->
+    B;
+fix_object_code(Name, [_|T], ClassFields) ->
+    fix_object_code(Name, T, ClassFields);
+fix_object_code(Name, [], ClassFields) ->
+    case lists:keyfind(Name, 2, ClassFields) of
+	{typefield,Name,'OPTIONAL'} ->
+	    none;
+	{objectfield,Name,_,_,'OPTIONAL'} ->
+	    none;
+	{typefield,Name,{'DEFAULT',#type{}=Type}} ->
+	    InnerType = asn1ct_gen:get_inner(Type#type.def),
+	    case asn1ct_gen:type(InnerType) of
+		{primitive,bif} ->
+		    #typedef{name={primitive,bif},typespec=Type};
+		{constructed,bif} ->
+		    #typedef{name={constructed,bif},typespec=Type}
+	    end
+    end.
+
+enc_objset_imm(Erule, Component, ObjSet, RestFieldNames, Extensible) ->
+    Aligned = is_aligned(Erule),
+    E = {error,
+	 fun() ->
+		 emit(["exit({'Type not compatible with table constraint',"
+		       "{component,",{asis,Component},"},"
+		       "{value,Val},"
+		       "{unique_name_and_value,'_'}})",nl])
+	 end},
+    [{'cond',
+      [[{eq,{var,"Id"},Key}|
+	enc_obj(Erule, Obj, RestFieldNames, Aligned)] ||
+	  {Key,Obj} <- ObjSet] ++
+	  [['_',case Extensible of
+		    false ->
+			E;
+		    true ->
+			case asn1ct:use_legacy_types() of
+			    false ->
+				{call,per_common,open_type_to_binary,
+				 [{var,"Val"}]};
+			    true ->
+				{call,per_common,legacy_open_type_to_binary,
+				 [{var,"Val"}]}
+			end
+		end]]}].
+
+enc_obj(Erule, Obj, RestFieldNames0, Aligned) ->
+    case Obj of
+	#typedef{name={primitive,bif},typespec=Def} ->
+	    asn1ct_gen_per:gen_encode_prim_imm({var,"Val"}, Def, Aligned);
+	#typedef{name={constructed,bif},typespec=Def} ->
+	    InnerType = asn1ct_gen:get_inner(Def#type.def),
+	    case InnerType of
+		'CHOICE' ->
+		    gen_encode_choice_imm(Erule, name, Def);
+		'SET' ->
+		    gen_encode_constructed_imm(Erule, name, Def);
+		'SET OF' ->
+		    gen_encode_sof_imm(Erule, name, InnerType, Def);
+		'SEQUENCE' ->
+		    gen_encode_constructed_imm(Erule, name, Def);
+		'SEQUENCE OF' ->
+		    gen_encode_sof_imm(Erule, name, InnerType, Def)
+	    end;
+	#typedef{name=Type} ->
+	    [{apply,{local,enc_func(Type),Type},[{var,"Val"}]}];
+	#'Externalvaluereference'{module=Mod,value=Value} ->
+	    case asn1_db:dbget(Mod, Value) of
+		#typedef{typespec=#'Object'{def=Def}} ->
+		    {object,_,Fields} = Def,
+		    [NextField|RestFieldNames] = RestFieldNames0,
+		    {NextField,Typedef} = lists:keyfind(NextField, 1, Fields),
+		    enc_obj(Erule, Typedef, RestFieldNames, Aligned)
+	    end;
+	#'Externaltypereference'{module=Mod,type=Type} ->
+	    Func = enc_func(Type),
+	    case get(currmod) of
+		Mod ->
+		    [{apply,{local,Func,Obj},[{var,"Val"}]}];
+		_ ->
+		    [{apply,{Mod,Func,Obj},[{var,"Val"}]}]
+	    end
+    end.
+
+
 gen_dec_components_call(Erule, TopType, {Root,ExtList},
 			DecInfObj, Ext, NumberOfOptionals) ->
     gen_dec_components_call(Erule,TopType,{Root,ExtList,[]},
@@ -1163,14 +1231,6 @@ gen_dec_comp_call(Comp, Erule, TopType, Tpos, OptTable, DecInfObj,
 			emit(["{",{curr,tmpterm},", ",{next,bytes},"} = "]),
 			St
 		end;
-	%%{objectfield,_,_} when Ext == noext, Prop == mandatory ->
-	    {{objectfield,_,_},true} ->
-		fun(St) ->
-			asn1ct_name:new(term),
-			asn1ct_name:new(tmpterm),
-			emit(["{",{curr,tmpterm},", ",{next,bytes},"} = "]),
-			St
-		end;
 	_ ->
 	    case Type of
 		#type{def=#'SEQUENCE'{
@@ -1204,7 +1264,8 @@ gen_dec_comp_call(Comp, Erule, TopType, Tpos, OptTable, DecInfObj,
 
 comp_call_pre_post(noext, mandatory, _, _, _, _, _, _) ->
     {[],[]};
-comp_call_pre_post(noext, Prop, _, _, TextPos, OptTable, NumOptionals, Ext) ->
+comp_call_pre_post(noext, Prop, _, Type, TextPos,
+		   OptTable, NumOptionals, Ext) ->
     %% OPTIONAL or DEFAULT
     OptPos = get_optionality_pos(TextPos, OptTable),
     Element = case NumOptionals - OptPos of
@@ -1222,7 +1283,7 @@ comp_call_pre_post(noext, Prop, _, _, TextPos, OptTable, NumOptionals, Ext) ->
 	      emit([";",nl,
 		    "0 ->",nl,
 		    "{"]),
-	      gen_dec_component_no_val(Ext, Prop),
+	      gen_dec_component_no_val(Ext, Type, Prop),
 	      emit([",",{curr,bytes},"}",nl,
 		    "end"]),
 	      St
@@ -1244,10 +1305,10 @@ comp_call_pre_post({ext,_,_}, Prop, Pos, Type, _, _, _, Ext) ->
 			       components=ExtGroupCompList2}}
 		    when is_integer(Number2)->
 		      emit("{extAddGroup,"),
-		      gen_dec_extaddGroup_no_val(Ext, ExtGroupCompList2),
+		      gen_dec_extaddGroup_no_val(Ext, Type, ExtGroupCompList2),
 		      emit("}");
 		  _ ->
-		      gen_dec_component_no_val(Ext, Prop)
+		      gen_dec_component_no_val(Ext, Type, Prop)
 	      end,
 	      emit([",",{curr,bytes},"}",nl,
 		    "end"]),
@@ -1262,21 +1323,22 @@ is_mandatory_predef_tab_c(_, _, {"got objfun through args","ObjFun"}) ->
 is_mandatory_predef_tab_c(_,_,_) ->
     true.
 
-gen_dec_extaddGroup_no_val(Ext,[#'ComponentType'{prop=Prop}])->
-    gen_dec_component_no_val(Ext,Prop),
+gen_dec_extaddGroup_no_val(Ext, Type, [#'ComponentType'{prop=Prop}])->
+    gen_dec_component_no_val(Ext, Type, Prop),
     ok;
-gen_dec_extaddGroup_no_val(Ext,[#'ComponentType'{prop=Prop}|Rest])->
-    gen_dec_component_no_val(Ext,Prop),
-    emit({","}),
-    gen_dec_extaddGroup_no_val(Ext,Rest);
-gen_dec_extaddGroup_no_val(_, []) ->
+gen_dec_extaddGroup_no_val(Ext, Type, [#'ComponentType'{prop=Prop}|Rest])->
+    gen_dec_component_no_val(Ext, Type, Prop),
+    emit(","),
+    gen_dec_extaddGroup_no_val(Ext, Type, Rest);
+gen_dec_extaddGroup_no_val(_, _, []) ->
     ok.
 
-gen_dec_component_no_val(_,{'DEFAULT',DefVal}) ->
+gen_dec_component_no_val(_, Type, {'DEFAULT',DefVal0}) ->
+    DefVal = asn1ct_gen:conform_value(Type, DefVal0),
     emit([{asis,DefVal}]);
-gen_dec_component_no_val(_,'OPTIONAL') ->
+gen_dec_component_no_val(_, _, 'OPTIONAL') ->
     emit({"asn1_NOVALUE"});
-gen_dec_component_no_val({ext,_,_},mandatory) ->
+gen_dec_component_no_val({ext,_,_}, _, mandatory) ->
     emit({"asn1_NOVALUE"}).
     
 
@@ -1350,25 +1412,19 @@ gen_dec_line_special(Erule, {typefield,_}, _TopType, Comp,
 		false -> % This is in a choice with typefield components
 		    {Name,RestFieldNames} =
 			(Type#type.def)#'ObjectClassFieldType'.fieldname,
-
-		    asn1ct_name:new(reason),
 		    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
 		    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
 		    {TmpTerm,TempBuf} = asn1ct_imm:dec_slim_cg(Imm, BytesVar),
+		    emit([com,nl]),
+		    #type{tablecinf=[{objfun,
+				      #'Externaltypereference'{module=Xmod,
+							       type=Xtype}}]} =
+			Type,
+		    gen_dec_open_type(Erule, "ObjFun", {Xmod,Xtype},
+				      '_', {'_',{Name,RestFieldNames},
+					    'Result',TmpTerm,mandatory}),
 		    emit([com,nl,
-			  {next,bytes}," = ",TempBuf,com,nl,
-			  indent(2),"case (catch ObjFun(",
-			  {asis,Name},",",TmpTerm,",telltype,",
-			  {asis,RestFieldNames},")) of", nl]),
-		    emit([indent(4),"{'EXIT',",{curr,reason},"} ->",nl]),
-		    emit([indent(6),"exit({'Type not ",
-			  "compatible with table constraint', ",
-			  {curr,reason},"});",nl]),
-		    asn1ct_name:new(tmpterm),
-		    emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
-		    emit([indent(6),"{",{asis,Cname},", {",{curr,tmpterm},", ",
-			  {next,bytes},"}}",nl]),
-		    emit([indent(2),"end"]),
+			  "{",{asis,Cname},",{Result,",TempBuf,"}}"]),
 		    {[],PrevSt};
 		{"got objfun through args","ObjFun"} ->
 		    %% this is when the generated code gots the
@@ -1388,27 +1444,22 @@ gen_dec_line_special(Erule, {typefield,_}, _TopType, Comp,
 		    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
 		    asn1ct_imm:dec_code_gen(Imm, BytesVar),
 		    emit([com,nl]),
+		    #type{tablecinf=[{objfun,
+				      #'Externaltypereference'{module=Xmod,
+							       type=Xtype}}]} =
+			Type,
+		    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
+		    TmpTerm = asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
 		    if
 			Prop =:= mandatory ->
-			    emit([{curr,term}," =",nl,"      "]);
-			true ->
-			    emit(["     {"])
-		    end,
-		    emit(["case (catch ObjFun(",{asis,Name},",",
-			  {curr,tmpterm},",telltype,",
-			  {asis,RestFieldNames},")) of", nl]),
-		    emit(["    {'EXIT',",{curr,reason},"} ->",nl]),
-		    emit([indent(6),"exit({'Type not ",
-			  "compatible with table constraint', ",
-			  {curr,reason},"});",nl]),
-		    asn1ct_name:new(tmpterm),
-		    emit([indent(4),"{",{curr,tmpterm},", _} ->",nl]),
-		    emit([indent(6),{curr,tmpterm},nl]),
-		    emit([indent(2),"end"]),
-		    if
-			Prop =:= mandatory ->
-			    ok;
+			    gen_dec_open_type(Erule, "ObjFun", {Xmod,Xtype},
+					      '_', {'_',{Name,RestFieldNames},
+						    Term,TmpTerm,Prop});
 			true ->
+			    emit(["     {"]),
+			    gen_dec_open_type(Erule, "ObjFun", {Xmod,Xtype},
+					      '_', {'_',{Name,RestFieldNames},
+						    '_',TmpTerm,Prop}),
 			    emit([",",nl,{curr,tmpbytes},"}"])
 		    end,
 		    {[],PrevSt};
@@ -1425,19 +1476,6 @@ gen_dec_line_special(Erule, {typefield,_}, _TopType, Comp,
 		       Prop}],PrevSt}
 	    end
     end;
-gen_dec_line_special(Erule, {objectfield,PrimFieldName1,PFNList}, _TopType,
-		     Comp, _DecInfObj) ->
-    fun({_BytesVar,PrevSt}) ->
-	    Imm = asn1ct_imm:per_dec_open_type(is_aligned(Erule)),
-	    BytesVar = asn1ct_gen:mk_var(asn1ct_name:curr(bytes)),
-	    asn1ct_imm:dec_code_gen(Imm, BytesVar),
-	    #'ComponentType'{name=Cname,prop=Prop} = Comp,
-	    SaveBytes = [{Cname,{PrimFieldName1,PFNList},
-			  asn1ct_gen:mk_var(asn1ct_name:curr(term)),
-			  asn1ct_gen:mk_var(asn1ct_name:curr(tmpterm)),
-			  Prop}],
-	    {SaveBytes,PrevSt}
-    end;
 gen_dec_line_special(Erule, Atype, TopType, Comp, DecInfObj) ->
     case gen_dec_line_other(Erule, Atype, TopType, Comp) of
 	Fun when is_function(Fun, 1) ->
@@ -1458,14 +1496,11 @@ gen_dec_line_special(Erule, Atype, TopType, Comp, DecInfObj) ->
 gen_dec_line_dec_inf(Comp, DecInfObj) ->
     #'ComponentType'{name=Cname} = Comp,
     case DecInfObj of
-	{Cname,{_,OSet,UniqueFName,ValIndex}} ->
+	{Cname,{_,_OSet,_UniqueFName,ValIndex}} ->
 	    Term = asn1ct_gen:mk_var(asn1ct_name:curr(term)),
 	    ValueMatch = value_match(ValIndex,Term),
-	    {ObjSetMod,ObjSetName} = OSet,
 	    emit([",",nl,
-		  "ObjFun = ",{asis,ObjSetMod},
-		  ":'getdec_",ObjSetName,"'(",
-		  {asis,UniqueFName},", ",ValueMatch,")"]);
+		  "ObjFun = ",ValueMatch]);
 	_ ->
 	    ok
     end.
@@ -1492,86 +1527,67 @@ gen_dec_line_other(Erule, Atype, TopType, Comp) ->
 		[{objfun,_}|_R] ->
 		    fun(BytesVar) ->
 			    emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-				  "'(",BytesVar,", telltype, ObjFun)"})
+				  "'(",BytesVar,", ObjFun)"})
 		    end;
 		_ ->
 		    fun(BytesVar) ->
 			    emit({"'dec_",asn1ct_gen:list2name(NewTypename),
-				  "'(",BytesVar,", telltype)"})
+				  "'(",BytesVar,")"})
 		    end
 	    end
     end.
 
-gen_enc_choice(Erule,TopType,CompList,Ext) ->
-    gen_enc_choice_tag(Erule, CompList, [], Ext),
-    emit({com,nl}),
-    emit({"case element(1,Val) of",nl}),
-    gen_enc_choice2(Erule,TopType, CompList, Ext),
-    emit({nl,"end"}).
-
-gen_enc_choice_tag(Erule, {C1,C2}, _, _) ->
-    N1 = get_name_list(C1),
-    N2 = get_name_list(C2),
-    call(Erule,set_choice,
-	 ["element(1, Val)",
-	  {asis,{N1,N2}},
-	  {asis,{length(N1),length(N2)}}]);
-gen_enc_choice_tag(Erule, {C1,C2,C3}, _, _) ->
-    N1 = get_name_list(C1),
-    N2 = get_name_list(C2),
-    N3 = get_name_list(C3),
-    Root = N1 ++ N3,
-    call(Erule,set_choice,
-	 ["element(1, Val)",
-	  {asis,{Root,N2}},
-	  {asis,{length(Root),length(N2)}}]);
-gen_enc_choice_tag(Erule, C, _, _) ->
-    N = get_name_list(C),
-    call(Erule,set_choice,
-	 ["element(1, Val)",
-	  {asis,N},{asis,length(N)}]).
-
-get_name_list(L) ->
-    get_name_list(L,[]).
-
-get_name_list([#'ComponentType'{name=Name}|T], Acc) ->
-    get_name_list(T,[Name|Acc]);
-get_name_list([], Acc) ->
-    lists:reverse(Acc).
-
-
-gen_enc_choice2(Erule,TopType, {L1,L2}, Ext) ->
-    gen_enc_choice2(Erule, TopType, L1 ++ L2, 0, [], Ext);
-gen_enc_choice2(Erule, TopType, {L1,L2,L3}, Ext) ->
-    gen_enc_choice2(Erule, TopType, L1 ++ L3 ++ L2, 0, [], Ext);
-gen_enc_choice2(Erule,TopType, L, Ext) ->
-    gen_enc_choice2(Erule,TopType, L, 0, [], Ext).
+gen_enc_choice(Erule, TopType, {Root,Exts}, Ext) ->
+    Constr = choice_constraint(Root),
+    gen_enc_choices(Root, Erule, TopType, 0, Constr, Ext) ++
+	gen_enc_choices(Exts, Erule, TopType, 0, ext, Ext);
+gen_enc_choice(Erule, TopType, {Root,Exts,[]}, Ext) ->
+    gen_enc_choice(Erule, TopType, {Root,Exts}, Ext);
+gen_enc_choice(Erule, TopType, Root, Ext) when is_list(Root) ->
+    Constr = choice_constraint(Root),
+    gen_enc_choices(Root, Erule, TopType, 0, Constr, Ext).
+
+choice_constraint(L) ->
+    case length(L) of
+	0 -> [{'SingleValue',0}];
+	Len -> [{'ValueRange',{0,Len-1}}]
+    end.
 
-gen_enc_choice2(Erule, TopType, [H|T], Pos, Sep0, Ext) ->
+gen_enc_choices([H|T], Erule, TopType, Pos, Constr, Ext) ->
     #'ComponentType'{name=Cname,typespec=Type} = H,
+    Aligned = is_aligned(Erule),
     EncObj =
 	case asn1ct_gen:get_constraint(Type#type.constraint,
 				       componentrelation) of
 	    no -> 
 		case Type#type.tablecinf of
 		    [{objfun,_}|_] ->
-			{"got objfun through args","ObjFun"};
+			{"got objfun through args",{var,"ObjFun"}};
 		    _ ->
 			false
 		end;
 	    _ ->
-		{no_attr,"ObjFun"}
+		{no_attr,{var,"ObjFun"}}
 	end,
-    emit([Sep0,{asis,Cname}," ->",nl]),
-    DoExt = case Ext of
-		{ext,ExtPos,_} when Pos + 1 < ExtPos -> noext;
-		_ -> Ext
+    DoExt = case Constr of
+		ext -> Ext;
+		_ -> noext
 	    end,
-    gen_enc_line(Erule, TopType, Cname, Type, "element(2, Val)",
-		 Pos+1, EncObj, DoExt),
-    Sep = [";",nl],
-    gen_enc_choice2(Erule, TopType, T, Pos+1, Sep, Ext);
-gen_enc_choice2(_, _, [], _, _, _)  -> ok.
+    Tag = case {Ext,Constr} of
+	      {noext,_} ->
+		  asn1ct_imm:per_enc_integer(Pos, Constr, Aligned);
+	      {{ext,_,_},ext} ->
+		  [{put_bits,1,1,[1]}|
+		   asn1ct_imm:per_enc_small_number(Pos, Aligned)];
+	      {{ext,_,_},_} ->
+		  [{put_bits,0,1,[1]}|
+		   asn1ct_imm:per_enc_integer(Pos, Constr, Aligned)]
+	  end,
+    Body = gen_enc_line_imm(Erule, TopType, Cname, Type, {var,"ChoiceVal"},
+			    EncObj, DoExt),
+    Imm = Tag ++ Body,
+    [{Cname,Imm}|gen_enc_choices(T, Erule, TopType, Pos+1, Constr, Ext)];
+gen_enc_choices([], _, _, _, _, _)  -> [].
 
 %% Generate the code for CHOICE. If the CHOICE is extensible,
 %% the structure of the generated code is as follows:
@@ -1704,9 +1720,6 @@ gen_dec_choice2(Erule, TopType, [H0|T], Pos, Sep0, Pre) ->
     gen_dec_choice2(Erule, TopType, T, Pos+1, Sep, Pre);
 gen_dec_choice2(_, _, [], _, _, _)  -> ok.
 
-indent(N) ->
-    lists:duplicate(N,32). % 32 = space
-
 make_elements(I,Val,ExtCnames) ->
     make_elements(I,Val,ExtCnames,[]).
 
@@ -1720,7 +1733,7 @@ make_elements(_I,_,[],Acc) ->
     lists:reverse(Acc).
 
 make_element(I, Val) ->
-    io_lib:format("element(~w,~s)", [I,Val]).
+    lists:flatten(io_lib:format("element(~w, ~s)", [I,Val])).
 
 emit_extaddgroupTerms(VarSeries,[_]) ->
     asn1ct_name:new(VarSeries),
@@ -1788,5 +1801,12 @@ value_match1(Value,[],Acc,Depth) ->
 value_match1(Value,[{VI,_}|VIs],Acc,Depth) ->
     value_match1(Value,VIs,Acc++lists:concat(["element(",VI,","]),Depth+1).
 
-is_optimized(per) -> true;
-is_optimized(uper) -> false.
+enc_dig_out_value([], Value) ->
+    {[],Value};
+enc_dig_out_value([{N,_}|T], Value) ->
+    {Imm0,Dst0} = enc_dig_out_value(T, Value),
+    {Imm,Dst} = asn1ct_imm:enc_element(N, Dst0),
+    {Imm0++Imm,Dst}.
+
+make_var(Base) ->
+    {var,atom_to_list(asn1ct_gen:mk_var(asn1ct_name:curr(Base)))}.
diff --git a/lib/asn1/src/asn1ct_eval_per.funcs b/lib/asn1/src/asn1ct_eval_per.funcs
deleted file mode 100644
index a1ea5cd043..0000000000
--- a/lib/asn1/src/asn1ct_eval_per.funcs
+++ /dev/null
@@ -1,2 +0,0 @@
-{per,encode_constrained_number,2}.
-{per,encode_small_number,1}.
diff --git a/lib/asn1/src/asn1ct_eval_uper.funcs b/lib/asn1/src/asn1ct_eval_uper.funcs
deleted file mode 100644
index 884a486f40..0000000000
--- a/lib/asn1/src/asn1ct_eval_uper.funcs
+++ /dev/null
@@ -1,2 +0,0 @@
-{uper,encode_constrained_number,2}.
-{uper,encode_small_number,1}.
diff --git a/lib/asn1/src/asn1ct_func.erl b/lib/asn1/src/asn1ct_func.erl
index ab0dbcce8f..33f998722a 100644
--- a/lib/asn1/src/asn1ct_func.erl
+++ b/lib/asn1/src/asn1ct_func.erl
@@ -19,7 +19,7 @@
 %%
 
 -module(asn1ct_func).
--export([start_link/0,need/1,call/3,generate/1]).
+-export([start_link/0,need/1,call/3,call_gen/3,call_gen/4,generate/1]).
 -export([init/1,handle_call/3,handle_cast/2,terminate/2]).
 
 start_link() ->
@@ -28,15 +28,33 @@ start_link() ->
     ok.
 
 call(M, F, Args) ->
-    MFA = {M,F,length(Args)},
+    A = length(Args),
+    MFA = {M,F,A},
     need(MFA),
-    asn1ct_gen:emit([F,"(",call_args(Args, ""),")"]).
+    case M of
+	binary ->
+	    asn1ct_gen:emit(["binary:",F,"(",call_args(Args, ""),")"]);
+	_ ->
+	    asn1ct_gen:emit([F,"(",call_args(Args, ""),")"])
+    end.
 
+need({binary,_,_}) ->
+    ok;
+need({erlang,_,_}) ->
+    ok;
 need(MFA) ->
     asn1ct_rtt:assert_defined(MFA),
     cast({need,MFA}).
 
+call_gen(Prefix, Key, Gen, Args) when is_function(Gen, 2) ->
+    F = req({gen_func,Prefix,Key,Gen}),
+    asn1ct_gen:emit([{asis,F},"(",call_args(Args, ""),")"]).
+
+call_gen(Prefix, Key, Gen) when is_function(Gen, 2) ->
+    req({gen_func,Prefix,Key,Gen}).
+
 generate(Fd) ->
+    do_generate(Fd),
     Used0 = req(get_used),
     erase(?MODULE),
     Used = sofs:set(Used0, [mfa]),
@@ -53,10 +71,13 @@ cast(Req) ->
 
 %%% Internal functions.
 
--record(st, {used}).
+-record(st, {used,				%Used functions
+	     gen,				%Dynamically generated functions
+	     gc=1				%Counter for generated functions
+	    }).
 
 init([]) ->
-    St = #st{used=gb_sets:empty()},
+    St = #st{used=gb_sets:empty(),gen=gb_trees:empty()},
     {ok,St}.
 
 handle_cast({need,MFA}, #st{used=Used0}=St) ->
@@ -69,7 +90,20 @@ handle_cast({need,MFA}, #st{used=Used0}=St) ->
     end.
 
 handle_call(get_used, _From, #st{used=Used}=St) ->
-    {stop,normal,gb_sets:to_list(Used),St}.
+    {stop,normal,gb_sets:to_list(Used),St};
+handle_call(get_gen, _From, #st{gen=G0}=St) ->
+    {L,G} = do_get_gen(gb_trees:to_list(G0), [], []),
+    {reply,L,St#st{gen=gb_trees:from_orddict(G)}};
+handle_call({gen_func,Prefix,Key,GenFun}, _From, #st{gen=G0,gc=Gc0}=St) ->
+    case gb_trees:lookup(Key, G0) of
+	none ->
+	    Name = list_to_atom(Prefix ++ integer_to_list(Gc0)),
+	    Gc = Gc0 + 1,
+	    G = gb_trees:insert(Key, {Name,GenFun}, G0),
+	    {reply,Name,St#st{gen=G,gc=Gc}};
+	{value,{Name,_}} ->
+	    {reply,Name,St}
+    end.
 
 terminate(_, _) ->
     ok.
@@ -98,3 +132,22 @@ update_worklist([H|T], Used, Ws) ->
 	    update_worklist(T, Used, Ws)
     end;
 update_worklist([], _, Ws) -> Ws.
+
+do_get_gen([{_,{_,done}}=Keep|T], Gacc, Kacc) ->
+    do_get_gen(T, Gacc, [Keep|Kacc]);
+do_get_gen([{K,{Name,_}=V}|T], Gacc, Kacc) ->
+    do_get_gen(T, [V|Gacc], [{K,{Name,done}}|Kacc]);
+do_get_gen([], Gacc, Kacc) ->
+    {lists:sort(Gacc),lists:reverse(Kacc)}.
+
+do_generate(Fd) ->
+    case req(get_gen) of
+	[] ->
+	    ok;
+	[_|_]=Gen ->
+	    _ = [begin
+		     ok = file:write(Fd, "\n"),
+		     GenFun(Fd, Name)
+		 end || {Name,GenFun} <- Gen],
+	    do_generate(Fd)
+    end.
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 9095e145a3..4707e517b4 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -23,6 +23,7 @@
 
 -export([demit/1,
 	 emit/1,
+	 open_output_file/1,close_output_file/0,
 	 get_inner/1,type/1,def_to_tag/1,prim_bif/1,
 	 list2name/1,
 	 list2rname/1,
@@ -33,7 +34,9 @@
 	 insert_once/2,
 	 ct_gen_module/1,
 	 index2suffix/1,
-	 get_record_name_prefix/0]).
+	 get_record_name_prefix/0,
+	 conform_value/2,
+	 named_bitstring_value/2]).
 -export([pgen/5,
 	 mk_var/1, 
 	 un_hyphen_var/1]).
@@ -68,8 +71,7 @@ pgen_module(OutFile,Erules,Module,
     HrlGenerated = pgen_hrl(Erules,Module,TypeOrVal,Options,Indent),
     asn1ct_name:start(),
     ErlFile = lists:concat([OutFile,".erl"]),
-    Fid = fopen(ErlFile),
-    put(gen_file_out,Fid),
+    _ = open_output_file(ErlFile),
     asn1ct_func:start_link(),
     gen_head(Erules,Module,HrlGenerated),
     pgen_exports(Erules,Module,TypeOrVal),
@@ -83,8 +85,10 @@ pgen_module(OutFile,Erules,Module,
 	  "%%%",nl,
 	  "%%% Run-time functions.",nl,
 	  "%%%",nl]),
-    asn1ct_func:generate(Fid),
-    file:close(Fid),
+    Fd = get(gen_file_out),
+    asn1ct_func:generate(Fd),
+    close_output_file(),
+    _ = erase(outfile),
     asn1ct:verbose("--~p--~n",[{generated,ErlFile}],Options).
 
 
@@ -186,7 +190,7 @@ pgen_check_defaultval(Erules,Module) ->
 				  "********~n~n",[X]) 
 		end,
 	    lists:foreach(Fun,CheckObjects),
-	    file:close(IoDevice);
+	    ok = file:close(IoDevice);
 	_ -> ok
     end,
     gen_check_defaultval(Erules,Module,CheckObjects).
@@ -786,7 +790,8 @@ gen_decode_constructed(Erules,Typename,InnerType,D) when is_record(D,typedef) ->
 
 
 pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
-    emit(["-export([encoding_rule/0,bit_string_format/0]).",nl]),
+    emit(["-export([encoding_rule/0,bit_string_format/0,"
+	  "         legacy_erlang_types/0]).",nl]),
     case Types of
 	[] -> ok;
 	_ ->
@@ -798,7 +803,12 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
 		    gen_exports1(Types,"enc_",1)
 	    end,
 	    emit({"-export([",nl}),
-	    gen_exports1(Types,"dec_",2)
+	    case Erules of
+		ber ->
+		    gen_exports1(Types, "dec_", 2);
+		_ ->
+		    gen_exports1(Types, "dec_", 1)
+	    end
     end,
     case [X || {n2n,X} <- get(encoding_options)] of
 	[] -> ok;
@@ -819,10 +829,7 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
 	_ ->
 	    case erule(Erules) of
 		per ->
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"enc_",3),
-		    emit({"-export([",nl}),
-		    gen_exports1(Objects,"dec_",4);
+		    ok;
 		ber ->
 		    emit({"-export([",nl}),
 		    gen_exports1(Objects,"enc_",3),
@@ -833,10 +840,15 @@ pgen_exports(Erules,_Module,{Types,Values,_,_,Objects,ObjectSets}) ->
     case ObjectSets of
 	[] -> ok;
 	_ ->
-	    emit({"-export([",nl}),
-	    gen_exports1(ObjectSets,"getenc_",2),
-	    emit({"-export([",nl}),
-	    gen_exports1(ObjectSets,"getdec_",2)
+	    case erule(Erules) of
+		per ->
+		    ok;
+		ber ->
+		    emit({"-export([",nl}),
+		    gen_exports1(ObjectSets, "getenc_",1),
+		    emit({"-export([",nl}),
+		    gen_exports1(ObjectSets, "getdec_",1)
+	    end
     end,
     emit({"-export([info/0]).",nl}),
     gen_partial_inc_decode_exports(),
@@ -900,41 +912,45 @@ pgen_dispatcher(Erules,_Module,{[],_Values,_,_,_Objects,_ObjectSets}) ->
 pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
     emit(["-export([encode/2,decode/2]).",nl,nl]),
     gen_info_functions(Erules),
-    NoFinalPadding = lists:member(no_final_padding,get(encoding_options)),
-    {Call,BytesAsBinary} =
-	case Erules of
-	    per ->
-		asn1ct_func:need({Erules,complete,1}),
-		{["complete(encode_disp(Type, Data))"],"Bytes"};
-	    ber ->
-		{"encode_disp(Type,Data)","iolist_to_binary(Bytes)"};
-	    uper when NoFinalPadding == true ->
-		asn1ct_func:need({Erules,complete_NFP,1}),
-		{"complete_NFP(encode_disp(Type, Data))","Bytes"};
-	    uper ->
-		asn1ct_func:need({Erules,complete,1}),
-		{["complete(encode_disp(Type, Data))"],"Bytes"}
-	end,
-    emit(["encode(Type,Data) ->",nl,
-	  "case catch ",Call," of",nl,
-	  "  {'EXIT',{error,Reason}} ->",nl,
-	  "    {error,Reason};",nl,
-	  "  {'EXIT',Reason} ->",nl,
-	  "    {error,{asn1,Reason}};",nl,
-	  "  {Bytes,_Len} ->",nl,
-	  "    {ok,",BytesAsBinary,"};",nl,
-	  "  Bytes ->",nl,
-	  "    {ok,",BytesAsBinary,"}",nl,
-	  "end.",nl,nl]),
-
-    Return_rest = lists:member(undec_rest,get(encoding_options)),
+
+    Options = get(encoding_options),
+    NoFinalPadding = lists:member(no_final_padding, Options),
+    NoOkWrapper = proplists:get_bool(no_ok_wrapper, Options),
+
+    Call = case Erules of
+	       per ->
+		   asn1ct_func:need({Erules,complete,1}),
+		   "complete(encode_disp(Type, Data))";
+	       ber ->
+		   "iolist_to_binary(element(1, encode_disp(Type, Data)))";
+	       uper when NoFinalPadding == true ->
+		   asn1ct_func:need({Erules,complete_NFP,1}),
+		   "complete_NFP(encode_disp(Type, Data))";
+	       uper ->
+		   asn1ct_func:need({Erules,complete,1}),
+		   "complete(encode_disp(Type, Data))"
+	   end,
+
+    emit(["encode(Type, Data) ->",nl]),
+    case NoOkWrapper of
+	true ->
+	    emit(["  ",Call,"."]);
+	false ->
+	    emit(["try ",Call," of",nl,
+		  "  Bytes ->",nl,
+		  "    {ok,Bytes}",nl,
+		  try_catch()])
+    end,
+    emit([nl,nl]),
+
+    Return_rest = proplists:get_bool(undec_rest, Options),
     Data = case {Erules,Return_rest} of
 	       {ber,true} -> "Data0";
 	       _ -> "Data"
 	   end,
 
     emit(["decode(Type,",Data,") ->",nl]),
-    DecAnonymous =
+    DecWrap =
 	case {Erules,Return_rest} of
 	    {ber,false} ->
 		asn1ct_func:need({ber,ber_decode_nif,1}),
@@ -946,49 +962,26 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 	    _ ->
 		"Data"
 	end,
-    DecWrap = case Erules of
-		  ber ->
-		      DecAnonymous;
-		  _ -> "Data"
-	      end,
-	    
-    emit(["case catch decode_disp(Type,",DecWrap,") of",nl,
-	  "  {'EXIT',{error,Reason}} ->",nl,
-	  "    {error,Reason};",nl,
-	  "  {'EXIT',Reason} ->",nl,
-	  "    {error,{asn1,Reason}};",nl]),
-    case {Erules,Return_rest} of 
-	{ber,false} ->
-	    emit(["  Result ->",nl,
-		  "    {ok,Result}",nl]);
-	{ber,true} ->
-	    emit(["  Result ->",nl,
-		  "    {ok,Result,Rest}",nl]);
-	{_,false} ->
-	    emit(["  {X,_Rest} ->",nl,
-		  "    {ok,X};",nl,
-		  "  {X,_Rest,_Len} ->",nl,
-		  "    {ok,X}",nl]);
-	{per,true} ->
-	    emit(["  {X,{_,Rest}} ->",nl,
-		  "    {ok,X,Rest};",nl,
-		  "  {X,{_,Rest},_Len} ->",nl,
-		  "    {ok,X,Rest};",nl,
-		  "  {X,Rest} ->",nl,
-		  "    {ok,X,Rest};",nl,
-		  "  {X,Rest,_Len} ->",nl,
-		  "    {ok,X,Rest}",nl]);
-	{uper,true} ->
-	    emit(["  {X,{_,Rest}} ->",nl,
-		  "    {ok,X,Rest};",nl,
-		  "  {X,{_,Rest},_Len} ->",nl,
-		  "    {ok,X,Rest};",nl,
-		  "  {X,Rest} ->",nl,
-		  "    {ok,X,Rest};",nl,
-		  "  {X,Rest,_Len} ->",nl,
-		  "    {ok,X,Rest}",nl])
+    emit([case NoOkWrapper of
+	      false -> "try";
+	      true -> "case"
+	  end, " decode_disp(Type, ",DecWrap,") of",nl]),
+    case erule(Erules) of
+	ber ->
+	    emit(["  Result ->",nl]);
+	per ->
+	    emit(["  {Result,Rest} ->",nl])
+    end,
+    case Return_rest of
+	false -> result_line(NoOkWrapper, ["Result"]);
+	true ->  result_line(NoOkWrapper, ["Result","Rest"])
+    end,
+    case NoOkWrapper of
+	false ->
+	    emit([nl,try_catch(),nl,nl]);
+	true ->
+	    emit([nl,"end.",nl,nl])
     end,
-    emit(["end.",nl,nl]),
 
     gen_decode_partial_incomplete(Erules),
 
@@ -999,16 +992,40 @@ pgen_dispatcher(Erules,_Module,{Types,_Values,_,_,_Objects,_ObjectSets}) ->
 	    gen_partial_inc_dispatcher();
 	_PerOrPer_bin -> 
 	    gen_dispatcher(Types,"encode_disp","enc_",""),
-	    gen_dispatcher(Types,"decode_disp","dec_",",mandatory")
+	    gen_dispatcher(Types,"decode_disp","dec_","")
     end,
-    emit([nl]),
-    emit({nl,nl}).
+    emit([nl,nl]).
+
+result_line(NoOkWrapper, Items) ->
+    S = ["    "|case NoOkWrapper of
+		    false -> result_line_1(["ok"|Items]);
+		    true -> result_line_1(Items)
+		end],
+    emit(lists:flatten(S)).
+
+result_line_1([SingleItem]) ->
+    SingleItem;
+result_line_1(Items) ->
+    ["{",string:join(Items, ","),"}"].
+
+try_catch() ->
+    ["  catch",nl,
+     "    Class:Exception when Class =:= error; Class =:= exit ->",nl,
+     "      case Exception of",nl,
+     "        {error,Reason}=Error ->",nl,
+     "          Error;",nl,
+     "        Reason ->",nl,
+     "         {error,{asn1,Reason}}",nl,
+     "      end",nl,
+     "end."].
 
 gen_info_functions(Erules) ->
     emit(["encoding_rule() -> ",
 	  {asis,Erules},".",nl,nl,
 	  "bit_string_format() -> ",
-	  {asis,asn1ct:get_bit_string_format()},".",nl,nl]).
+	  {asis,asn1ct:get_bit_string_format()},".",nl,nl,
+	  "legacy_erlang_types() -> ",
+	  {asis,asn1ct:use_legacy_types()},".",nl,nl]).
 
 gen_decode_partial_incomplete(ber) ->
     case {asn1ct:read_config_data(partial_incomplete_decode),
@@ -1107,8 +1124,7 @@ pgen_info() ->
 
 open_hrl(OutFile,Module) ->
     File = lists:concat([OutFile,".hrl"]),
-    Fid = fopen(File),
-    put(gen_file_out,Fid),
+    _ = open_output_file(File),
     gen_hrlhead(Module).
 
 %% EMIT functions ************************
@@ -1181,15 +1197,19 @@ call_args([A|As], Sep) ->
     [Sep,do_emit(A)|call_args(As, ", ")];
 call_args([], _) -> [].
 
-fopen(F) ->
+open_output_file(F) ->
     case file:open(F, [write,raw,delayed_write]) of
-	{ok, Fd} -> 
+	{ok,Fd} ->
+	    put(gen_file_out, Fd),
 	    Fd;
 	{error, Reason} ->
 	    io:format("** Can't open file ~p ~n", [F]),
 	    exit({error,Reason})
     end.
 
+close_output_file() ->
+    ok = file:close(erase(gen_file_out)).
+
 pgen_hrl(Erules,Module,TypeOrVal,Options,_Indent) ->
     put(currmod,Module),
     {Types,Values,Ptypes,_,_,_} = TypeOrVal,
@@ -1212,8 +1232,7 @@ pgen_hrl(Erules,Module,TypeOrVal,Options,_Indent) ->
 	0 ->
 	    0;
 	Y ->
-	    Fid = get(gen_file_out),
-	    file:close(Fid),
+	    close_output_file(),
 	    asn1ct:verbose("--~p--~n",
 			   [{generated,lists:concat([get(outfile),".hrl"])}],
 			   Options),
@@ -1473,8 +1492,14 @@ gen_prim_check_call(PrimType, Default, Element, Type) ->
 		  end,
 	    check_call(check_int, [Default,Element,{asis,NNL}]);
 	'BIT STRING' ->
-	    {_,NBL} = Type#type.def,
-	    check_call(check_bitstring, [Default,Element,{asis,NBL}]);
+	    case Type#type.def of
+		{_,[]} ->
+		    check_call(check_bitstring,
+			       [Default,Element]);
+		{_,[_|_]=NBL} ->
+		    check_call(check_named_bitstring,
+			       [Default,Element,{asis,NBL}])
+	    end;
 	'OCTET STRING' ->
 	    check_call(check_octetstring, [Default,Element]);
 	'NULL' ->
@@ -1628,9 +1653,33 @@ unify_if_string(PrimType) ->
 	Other -> Other
     end.
 
-
-	
-	
+conform_value(#type{def={'BIT STRING',[]}}, Bs) ->
+    case asn1ct:get_bit_string_format() of
+	compact when is_binary(Bs) ->
+	    {0,Bs};
+	compact when is_bitstring(Bs) ->
+	    Sz = bit_size(Bs),
+	    Unused = 8 - bit_size(Bs),
+	    {Unused,<<Bs:Sz/bits,0:Unused>>};
+	legacy ->
+	    [B || <<B:1>> <= Bs];
+	bitstring when is_bitstring(Bs) ->
+	    Bs
+    end;
+conform_value(_, Value) -> Value.
+
+named_bitstring_value(List, Names) ->
+    Int = lists:foldl(fun(N, A) ->
+			      {N,Pos} = lists:keyfind(N, 1, Names),
+			      A bor (1 bsl Pos)
+		      end, 0, List),
+    named_bitstring_value_1(<<>>, Int).
+
+named_bitstring_value_1(Bs, 0) ->
+    Bs;
+named_bitstring_value_1(Bs, Int) ->
+    B = Int band 1,
+    named_bitstring_value_1(<<Bs/bitstring,B:1>>, Int bsr 1).
 
 get_inner(A) when is_atom(A) -> A;    
 get_inner(Ext) when is_record(Ext,'Externaltypereference') -> Ext;    
diff --git a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
index 8ab49aec2c..bea0ec8968 100644
--- a/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
+++ b/lib/asn1/src/asn1ct_gen_ber_bin_v2.erl
@@ -196,12 +196,42 @@ gen_encode_prim(_Erules, #type{}=D, DoTag, Value) ->
 	    emit(["case ",Value," of",nl]),
 	    emit_enc_enumerated_cases(NamedNumberList,DoTag);
 	'REAL' ->
-	    emit([{call,ber,encode_tags,
-		   [DoTag,{call,real_common,ber_encode_real,[Value]}]}]);
+	    asn1ct_name:new(realval),
+	    asn1ct_name:new(realsize),
+	    emit(["begin",nl,
+		  {curr,realval}," = ",
+		  {call,real_common,ber_encode_real,[Value]},com,nl,
+		  {curr,realsize}," = ",
+		  {call,erlang,byte_size,[{curr,realval}]},com,nl,
+		  {call,ber,encode_tags,
+		   [DoTag,{curr,realval},{curr,realsize}]},nl,
+		  "end"]);
+	{'BIT STRING',[]} ->
+	    case asn1ct:use_legacy_types() of
+		false when BitStringConstraint =:= [] ->
+		    call(encode_unnamed_bit_string, [Value,DoTag]);
+		false ->
+		    call(encode_unnamed_bit_string,
+			 [{asis,BitStringConstraint},Value,DoTag]);
+		true ->
+		    call(encode_bit_string,
+			 [{asis,BitStringConstraint},Value,
+			  {asis,[]},DoTag])
+	    end;
 	{'BIT STRING',NamedNumberList} ->
-	    call(encode_bit_string,
-		 [{asis,BitStringConstraint},Value,
-		  {asis,NamedNumberList},DoTag]);
+	    case asn1ct:use_legacy_types() of
+		false when BitStringConstraint =:= [] ->
+		    call(encode_named_bit_string,
+			 [Value,{asis,NamedNumberList},DoTag]);
+		false ->
+		    call(encode_named_bit_string,
+			 [{asis,BitStringConstraint},Value,
+			  {asis,NamedNumberList},DoTag]);
+		true ->
+		    call(encode_bit_string,
+			 [{asis,BitStringConstraint},Value,
+			  {asis,NamedNumberList},DoTag])
+	    end;
 	'NULL' ->
 	    call(encode_null, [Value,DoTag]);
 	'OBJECT IDENTIFIER' ->
@@ -463,7 +493,6 @@ gen_dec_prim(_Erules, Att, BytesVar, DoTag, _TagIn, _Form, _OptOrMand) ->
 		_ -> ""
 	    end,
     NewTypeName = case Typename of
-		      'OCTET STRING'    -> restricted_string;
 		      'NumericString'   -> restricted_string;
 		      'TeletexString'   -> restricted_string;
 		      'T61String'       -> restricted_string;
@@ -521,6 +550,19 @@ gen_dec_prim(_Erules, Att, BytesVar, DoTag, _TagIn, _Form, _OptOrMand) ->
 	'RELATIVE-OID' ->
 	    emit(["decode_relative_oid(",BytesVar,","]),
 	    need(decode_relative_oid, 2);
+	'OCTET STRING' ->
+	    F = case asn1ct:use_legacy_types() of
+		    false -> decode_octet_string;
+		    true -> decode_restricted_string
+		end,
+	    emit([{asis,F},"(",BytesVar,","]),
+	    case Constraint of
+		[] ->
+		    need(F, 2);
+		_ ->
+		    emit([{asis,Constraint},","]),
+		    need(F, 3)
+	    end;
 	restricted_string ->
 	    emit(["decode_restricted_string",AsBin,"(",BytesVar,","]),
 	    case Constraint of
@@ -637,9 +679,6 @@ gen_encode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
 % 	  ", Val, 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("Val"),
 		emit(["   {Val,0}"]),
@@ -672,9 +711,6 @@ gen_encode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
 %     emit(["'enc_",ObjName,"'(",{asis,Name},
 % 	  ", Val,[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},
@@ -807,9 +843,6 @@ gen_decode_objectfields(ClassName,[{typefield,Name,OptOrMand}|Rest],
 % 	  ", Bytes, 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(["   Bytes"]),
@@ -844,9 +877,6 @@ gen_decode_objectfields(ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
 % 	  ", Bytes,[H|T]) ->",nl]),
 %     emit_tlv_format("Bytes"),
     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},
@@ -1072,8 +1102,7 @@ gen_objset_enc(_,_,{unique,undefined},_,_,_,_,_) ->
 gen_objset_enc(Erules, ObjSetName, UniqueName,
 	       [{ObjName,Val,Fields}|T], ClName, ClFields,
 	       NthObj,Acc)->
-    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl]),
+    emit(["'getenc_",ObjSetName,"'(",{asis,Val},") ->",nl]),
     CurrMod = get(currmod),
     {InternalFunc,NewNthObj}=
 	case ObjName of
@@ -1095,13 +1124,11 @@ gen_objset_enc(Erules, ObjSetName, UniqueName,
 %% 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(_, Val, _RestPrimFieldName) ->",nl}),
-    emit({indent(6),"Len = case Val of",nl,indent(9),
-	  "Bin when is_binary(Bin) -> byte_size(Bin);",nl,indent(9),
- 	  "_ -> length(Val)",nl,indent(6),"end,"}),
-    emit({indent(6),"{Val,Len}",nl}),
-    emit({indent(3),"end.",nl,nl}),
+    emit(["'getenc_",ObjSetName,"'(_) ->",nl,
+	  indent(2),"fun(_, Val, _RestPrimFieldName) ->",nl]),
+    emit_enc_open_type(4),
+    emit([nl,
+	  indent(2),"end.",nl,nl]),
     Acc;
 gen_objset_enc(_, ObjSetName, UniqueName, [], _, _, _, Acc) ->
     emit_default_getenc(ObjSetName, UniqueName),
@@ -1113,7 +1140,7 @@ emit_ext_fun(EncDec,ModuleName,Name) ->
 	  Name,"'(T,V,O) end"]).
     
 emit_default_getenc(ObjSetName,UniqueName) ->
-    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},", ErrV) ->",nl]),
+    emit(["'getenc_",ObjSetName,"'(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
@@ -1163,13 +1190,8 @@ gen_inlined_enc_funs1(Fields, [{typefield,Name,_}|Rest], ObjSetName,
 		%% were no type in the table and we therefore generate
 		%% code that returns the input for application
 		%% treatment.
-		emit([indent(9),{asis,Name}," ->",nl,
-		      indent(12),"Len = case Val of",nl,
-		      indent(15),"Bin when is_binary(Bin) -> "
-		      "byte_size(Bin);",nl,
-		      indent(15),"_ -> length(Val)",nl,
-		      indent(12),"end,",nl,
-		      indent(12),"{Val,Len}"]),
+		emit([indent(9),{asis,Name}," ->",nl]),
+		emit_enc_open_type(11),
 		{Acc0,0}
 	end,
     gen_inlined_enc_funs1(Fields, Rest, ObjSetName, Sep, NthObj+NAdd, Acc);
@@ -1180,6 +1202,25 @@ gen_inlined_enc_funs1(_, [], _, _, NthObj, Acc) ->
 	  indent(3),"end"]),
     {Acc,NthObj}.
 
+emit_enc_open_type(I) ->
+    Indent = indent(I),
+    S = [Indent,          "case Val of",nl,
+	 Indent,indent(2),"{asn1_OPENTYPE,Bin} when is_binary(Bin) ->",nl,
+	 Indent,indent(4),"{Bin,byte_size(Bin)}"|
+	 case asn1ct:use_legacy_types() of
+	     false ->
+		 [nl,
+		  Indent,"end"];
+	     true ->
+		 [";",nl,
+		  Indent,indent(2),"Bin when is_binary(Bin) ->",nl,
+		  Indent,indent(4),"{Bin,byte_size(Bin)};",nl,
+		  Indent,indent(2),"_ ->",nl,
+		  Indent,indent(4),"{Val,length(Val)}",nl,
+		  Indent,          "end"]
+	 end],
+    emit(S).
+
 emit_inner_of_fun(TDef=#typedef{name={ExtMod,Name},typespec=Type},
 		  InternalDefFunName) ->
     OTag = Type#type.tag,
@@ -1240,8 +1281,7 @@ gen_objset_dec(_,_,{unique,undefined},_,_,_,_) ->
     ok;
 gen_objset_dec(Erules, ObjSName, UniqueName, [{ObjName,Val,Fields}|T],
 	       ClName, ClFields, NthObj)->
-    emit(["'getdec_",ObjSName,"'(",{asis,UniqueName},",",
-	  {asis,Val},") ->",nl]),
+    emit(["'getdec_",ObjSName,"'(",{asis,Val},") ->",nl]),
     CurrMod = get(currmod),
     NewNthObj=
 	case ObjName of
@@ -1262,16 +1302,11 @@ gen_objset_dec(Erules, ObjSName, UniqueName, [{ObjName,Val,Fields}|T],
 		   ClFields, NewNthObj);
 gen_objset_dec(_,ObjSetName,_UniqueName,['EXTENSIONMARK'],_ClName,
 	       _ClFields,_NthObj) ->
-    emit(["'getdec_",ObjSetName,"'(_, _) ->",nl]),
+    emit(["'getdec_",ObjSetName,"'(_) ->",nl]),
     emit([indent(2),"fun(_,Bytes, _RestPrimFieldName) ->",nl]),
-    
-    emit([indent(4),"case Bytes of",nl,
-	  indent(6),"Bin when is_binary(Bin) -> ",nl,
-	  indent(8),"Bin;",nl,
-	  indent(6),"_ ->",nl,
-	  indent(8),{call,ber,ber_encode,["Bytes"]},nl,
-	  indent(4),"end",nl]),
-    emit([indent(2),"end.",nl,nl]),
+    emit_dec_open_type(4),
+    emit([nl,
+	  indent(2),"end.",nl,nl]),
     ok;
 gen_objset_dec(_, ObjSetName, UniqueName, [], _, _, _) ->
     emit_default_getdec(ObjSetName, UniqueName),
@@ -1279,7 +1314,7 @@ gen_objset_dec(_, ObjSetName, UniqueName, [], _, _, _) ->
     ok.
 
 emit_default_getdec(ObjSetName,UniqueName) ->
-    emit(["'getdec_",ObjSetName,"'(",{asis,UniqueName},", ErrV) ->",nl]),
+    emit(["'getdec_",ObjSetName,"'(ErrV) ->",nl]),
     emit([indent(2), "fun(C,V,_) -> exit({{component,C},{value,V},{unique_name_and_value,",{asis,UniqueName},", ErrV}}) end"]).
 
 gen_inlined_dec_funs(Fields, ClFields, ObjSetName, NthObj) ->
@@ -1318,12 +1353,8 @@ gen_inlined_dec_funs1(Fields, [{typefield,Name,Prop}|Rest],
 		end,
 		0;
 	    false ->
-		emit([indent(9),{asis,Name}," ->",nl,
-		      indent(12),"Len = case Bytes of",nl,
-		      indent(15),"B when is_binary(B) -> byte_size(B);",nl,
-		      indent(15),"_ -> length(Bytes)",nl,
-		      indent(12),"end,",nl,
-		      indent(12),"{Bytes,[],Len}"]),
+		emit([indent(9),{asis,Name}," ->",nl]),
+		emit_dec_open_type(11),
 		0
     end,
     gen_inlined_dec_funs1(Fields, Rest, ObjSetName, Sep, NthObj+N);
@@ -1334,6 +1365,27 @@ gen_inlined_dec_funs1(_, [], _, _, NthObj) ->
 	  indent(3),"end"]),
     NthObj.
 
+emit_dec_open_type(I) ->
+    Indent = indent(I),
+    S = case asn1ct:use_legacy_types() of
+	    false ->
+		[Indent,          "case Bytes of",nl,
+		 Indent,indent(2),"Bin when is_binary(Bin) -> ",nl,
+		 Indent,indent(4),"{asn1_OPENTYPE,Bin};",nl,
+		 Indent,indent(2),"_ ->",nl,
+		 Indent,indent(4),"{asn1_OPENTYPE,",
+		 {call,ber,ber_encode,["Bytes"]},"}",nl,
+		 Indent,          "end"];
+	    true ->
+		[Indent,          "case Bytes of",nl,
+		 Indent,indent(2),"Bin when is_binary(Bin) -> ",nl,
+		 Indent,indent(4),"Bin;",nl,
+		 Indent,indent(2),"_ ->",nl,
+		 Indent,indent(4),{call,ber,ber_encode,["Bytes"]},nl,
+		 Indent,          "end"]
+	end,
+    emit(S).
+
 emit_inner_of_decfun(#typedef{name={ExtName,Name},typespec=Type},Prop,
 		     InternalDefFunName) ->
     OTag = Type#type.tag,
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl
index 69d9d51bf1..519ce9f054 100644
--- a/lib/asn1/src/asn1ct_gen_per.erl
+++ b/lib/asn1/src/asn1ct_gen_per.erl
@@ -26,7 +26,7 @@
 %-compile(export_all).
 
 -export([gen_dec_imm/2]).
--export([gen_dec_prim/3,gen_encode_prim/3]).
+-export([gen_dec_prim/3,gen_encode_prim_imm/3]).
 -export([gen_obj_code/3,gen_objectset_code/2]).
 -export([gen_decode/2, gen_decode/3]).
 -export([gen_encode/2, gen_encode/3]).
@@ -99,835 +99,122 @@ gen_encode_user(Erules,D) when is_record(D,typedef) ->
 
 
 gen_encode_prim(Erules, D) ->
-    Value = asn1ct_gen:mk_var(asn1ct_name:curr(val)),
+    Value = {var,atom_to_list(asn1ct_gen:mk_var(asn1ct_name:curr(val)))},
     gen_encode_prim(Erules, D, Value).
 
-gen_encode_prim(Erules, #type{def={'ENUMERATED',{N1,N2}}}, Value) ->
-    NewList = [{0,X} || {X,_} <- N1] ++ ['EXT_MARK'] ++
-	[{1,X} || {X,_} <- N2],
-    NewC = {0,length(N1)-1},
-    emit(["case ",Value," of",nl]),
-    emit_enc_enumerated_cases(Erules, NewC, NewList, 0);
-gen_encode_prim(Erules, #type{def={'ENUMERATED',NNL}}, Value) ->
-    NewList = [X || {X,_} <- NNL],
-    NewC = {0,length(NewList)-1},
-    emit(["case ",Value," of",nl]),
-    emit_enc_enumerated_cases(Erules, NewC, NewList, 0);
-gen_encode_prim(per=Erules, D, Value) ->
-    asn1ct_gen_per_rt2ct:gen_encode_prim(Erules, D, Value);
 gen_encode_prim(Erules, #type{}=D, Value) ->
-    Constraint = D#type.constraint,
-    SizeConstr = asn1ct_imm:effective_constraint(bitstring, Constraint),
-    Pa = case lists:keyfind('PermittedAlphabet', 1, Constraint) of
-	     false -> no;
-	     {_,Pa0} -> Pa0
-	 end,
-    case D#type.def of
+    Aligned = case Erules of
+		  uper -> false;
+		  per -> true
+	      end,
+    Imm = gen_encode_prim_imm(Value, D, Aligned),
+    asn1ct_imm:enc_cg(Imm, Aligned).
+
+gen_encode_prim_imm(Val, #type{def=Type0,constraint=Constraint}, Aligned) ->
+    case simplify_type(Type0) of
+	k_m_string ->
+	    Type = case Type0 of
+		       'GeneralizedTime' -> 'VisibleString';
+		       'UTCTime' -> 'VisibleString';
+		       _ -> Type0
+		   end,
+	    asn1ct_imm:per_enc_k_m_string(Val, Type, Constraint, Aligned);
+	restricted_string ->
+	    ToBinary = {erlang,iolist_to_binary},
+	    asn1ct_imm:per_enc_restricted_string(Val, ToBinary, Aligned);
+	{'ENUMERATED',NNL} ->
+	    asn1ct_imm:per_enc_enumerated(Val, NNL, Aligned);
 	'INTEGER' ->
-	    Args = [{asis,asn1ct_imm:effective_constraint(integer,Constraint)},
-		    Value],
-	    call(Erules, encode_integer, Args);
-	{'INTEGER',NamedNumberList} ->
-	    Args = [{asis,asn1ct_imm:effective_constraint(integer,Constraint)},
-		    Value,{asis,NamedNumberList}],
-	    call(Erules, encode_integer, Args);
+	    asn1ct_imm:per_enc_integer(Val, Constraint, Aligned);
+	{'INTEGER',NNL} ->
+	    asn1ct_imm:per_enc_integer(Val, NNL, Constraint, Aligned);
 	'REAL' ->
-	    emit_enc_real(Erules, Value);
-
-	{'BIT STRING',NamedNumberList} ->
-	    call(Erules, encode_bit_string,
-		 [{asis,SizeConstr},Value,
-		  {asis,NamedNumberList}]);
+	    ToBinary = {real_common,encode_real},
+	    asn1ct_imm:per_enc_restricted_string(Val, ToBinary, Aligned);
+	{'BIT STRING',NNL} ->
+	    case asn1ct:use_legacy_types() of
+		false ->
+		    asn1ct_imm:per_enc_bit_string(Val, NNL,
+						  Constraint, Aligned);
+		true ->
+		    asn1ct_imm:per_enc_legacy_bit_string(Val, NNL,
+							 Constraint, Aligned)
+	    end;
 	'NULL' ->
-	    emit("[]");
+	    asn1ct_imm:per_enc_null(Val, Aligned);
 	'OBJECT IDENTIFIER' ->
-	    call(Erules, encode_object_identifier, [Value]);
+	    ToBinary = {per_common,encode_oid},
+	    asn1ct_imm:per_enc_restricted_string(Val, ToBinary, Aligned);
 	'RELATIVE-OID' ->
-	    call(Erules, encode_relative_oid, [Value]);
-	'ObjectDescriptor' ->
-	    call(Erules, encode_ObjectDescriptor,
-		 [{asis,Constraint},Value]);
+	    ToBinary = {per_common,encode_relative_oid},
+	    asn1ct_imm:per_enc_restricted_string(Val, ToBinary, Aligned);
 	'BOOLEAN' ->
-	    call(Erules, encode_boolean, [Value]);
+	    asn1ct_imm:per_enc_boolean(Val, Aligned);
 	'OCTET STRING' ->
-	    case SizeConstr of
-		0 ->
-		    emit("[]");
-		no ->
-		    call(Erules, encode_octet_string, [Value]);
-		C ->
-		    call(Erules, encode_octet_string, [{asis,C},Value])
+	    case asn1ct:use_legacy_types() of
+		false ->
+		    asn1ct_imm:per_enc_octet_string(Val, Constraint, Aligned);
+		true ->
+		    asn1ct_imm:per_enc_legacy_octet_string(Val, Constraint,
+							   Aligned)
 	    end;
-	'NumericString' ->
-	    call(Erules, encode_NumericString, [{asis,SizeConstr},
-						{asis,Pa},Value]);
-	TString when TString == 'TeletexString';
-		     TString == 'T61String' ->
-	    call(Erules, encode_TeletexString, [{asis,Constraint},Value]);
-	'VideotexString' ->
-	    call(Erules, encode_VideotexString, [{asis,Constraint},Value]);
-	'UTCTime' ->
-	    call(Erules, encode_VisibleString, [{asis,SizeConstr},
-						{asis,Pa},Value]);
-	'GeneralizedTime' ->
-	    call(Erules, encode_VisibleString, [{asis,SizeConstr},
-						{asis,Pa},Value]);
-	'GraphicString' ->
-	    call(Erules, encode_GraphicString, [{asis,Constraint},Value]);
-	'VisibleString' ->
-	    call(Erules, encode_VisibleString, [{asis,SizeConstr},
-						{asis,Pa},Value]);
-	'GeneralString' ->
-	    call(Erules, encode_GeneralString, [{asis,Constraint},Value]);
-	'PrintableString' ->
-	    call(Erules, encode_PrintableString, [{asis,SizeConstr},
-						  {asis,Pa},Value]);
-	'IA5String' ->
-	    call(Erules, encode_IA5String, [{asis,SizeConstr},
-					    {asis,Pa},Value]);
-	'BMPString' ->
-	    call(Erules, encode_BMPString, [{asis,SizeConstr},
-					    {asis,Pa},Value]);
-	'UniversalString' ->
-	    call(Erules, encode_UniversalString, [{asis,SizeConstr},
-						  {asis,Pa},Value]);
-	'UTF8String' ->
-	    call(Erules, encode_UTF8String, [Value]);
 	'ASN1_OPEN_TYPE' ->
-	    NewValue = case Constraint of
-			   [#'Externaltypereference'{type=Tname}] ->
-			       asn1ct_func:need({Erules,complete,1}),
-			       io_lib:format(
-				 "complete(enc_~s(~s))",[Tname,Value]);
-			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
-			       asn1ct_func:need({Erules,complete,1}),
-			       io_lib:format(
-				 "complete(enc_~s(~s))",
-				 [Tname,Value]);
-			   _ ->
-			       io_lib:format("iolist_to_binary(~s)",
-					     [Value])
-		     end,
-	    call(Erules, encode_open_type, [NewValue])
-    end.
-
-emit_enc_real(Erules, Real) ->
-    asn1ct_name:new(tmpval),
-    asn1ct_name:new(tmplen),
-    emit(["begin",nl,
-	  "{",{curr,tmpval},com,{curr,tmplen},"} = ",
-	  {call,real_common,encode_real,[Real]},com,nl,
-	  "[",{call,Erules,encode_length,[{curr,tmplen}]},",",
-	  {curr,tmpval},"]",nl,
-	  "end"]).
-
-emit_enc_enumerated_cases(Erules, C, ['EXT_MARK'|T], _Count) ->
-    %% Reset enumeration counter.
-    emit_enc_enumerated_cases(Erules, C, T, 0);
-emit_enc_enumerated_cases(Erules, C, [H|T], Count) ->
-    emit_enc_enumerated_case(Erules, C, H, Count),
-    emit([";",nl]),
-    emit_enc_enumerated_cases(Erules, C, T, Count+1);
-emit_enc_enumerated_cases(_Erules, _, [], _Count) ->
-    emit(["EnumVal -> "
-	  "exit({error,{asn1,{enumerated_not_in_range, EnumVal}}})",nl,
-	  "end"]).
-    
-emit_enc_enumerated_case(Erules, C, {0,EnumName}, Count) ->
-    %% ENUMERATED with extensionmark; the value lies within then extension root
-    Enc = enc_ext_and_val(Erules, 0, encode_constrained_number, [C,Count]),
-    emit(["'",EnumName,"' -> ",{asis,Enc}]);
-emit_enc_enumerated_case(Erules, _C, {1,EnumName}, Count) ->
-    %% ENUMERATED with extensionmark; the value is higher than extension root
-    Enc = enc_ext_and_val(Erules, 1, encode_small_number, [Count]),
-    emit(["'",EnumName,"' -> ",{asis,Enc}]);
-emit_enc_enumerated_case(Erules, C, EnumName, Count) ->
-    %% ENUMERATED without extension
-    EvalMod = eval_module(Erules),
-    emit(["'",EnumName,"' -> ",
-	  {asis,EvalMod:encode_constrained_number(C, Count)}]).
-
-enc_ext_and_val(per, E, F, Args) ->
-    [E|apply(asn1ct_eval_per, F, Args)];
-enc_ext_and_val(uper, E, F, Args) ->
-    Bs = list_to_bitstring([apply(asn1ct_eval_uper, F, Args)]),
-    <<E:1,Bs/bitstring>>.
-
-
-%% 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=Mod,type=ClassName} = 
-	Def#'Object'.classname,
-    Class = asn1_db:dbget(Mod,ClassName),
-    {object,_,Fields} = Def#'Object'.def,
-    emit({nl,nl,nl,"%%================================"}),
-    emit({nl,"%%  ",ObjName}),
-    emit({nl,"%%================================",nl}),
-    EncConstructed =
-	gen_encode_objectfields(Erules, ClassName,get_class_fields(Class),
-				ObjName,Fields,[]),
-    emit(nl),
-    gen_encode_constr_type(Erules,EncConstructed),
-    emit(nl),
-    DecConstructed =
-	gen_decode_objectfields(Erules, ClassName, get_class_fields(Class),
-				ObjName, Fields, []),
-    emit(nl),
-    gen_decode_constr_type(Erules,DecConstructed),
-    emit(nl).
-
-
-gen_encode_objectfields(Erule, ClassName,
-			[{typefield,Name,OptOrMand}|Rest],
-			ObjName, ObjectFields, ConstrAcc) ->
-    EmitFuncClause = 
-	fun(V) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ",",V,",_RestPrimFieldName) ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val, _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("Val"),
-		case Erule of
-		    uper ->
-			emit("   Val");
-		    per ->
-			emit(["   if",nl,
-			      "     is_list(Val) ->",nl,
-			      "       NewVal = list_to_binary(Val),",nl,
-			      "       [20,byte_size(NewVal),NewVal];",nl,
-			      "     is_binary(Val) ->",nl,
-			      "       [20,byte_size(Val),Val]",nl,
-			      "   end"])
-		end,
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Val"),
-		gen_encode_default_call(Erule, ClassName, Name, DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Val"),
-		gen_encode_field_call(Erule, ObjName, Name, TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(Erule,ClassName,Rest,ObjName,ObjectFields,
-			    MaybeConstr++ConstrAcc);
-gen_encode_objectfields(Erule,ClassName,[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName,ObjectFields,ConstrAcc) ->
-    CurrentMod = get(currmod),
-    EmitFuncClause =
-	fun(Attrs) ->
-		emit(["'enc_",ObjName,"'(",{asis,Name},
-		      ",",Attrs,") ->",nl])
-	end,
-%     emit(["'enc_",ObjName,"'(",{asis,Name},
-% 	  ", Val,[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, [H|T]"),
-	    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"});
-	{{Name,#'Externalvaluereference'{module=M,value=TypeName}},_} ->
-	    EmitFuncClause(" Val, [H|T]"),
-	    emit({indent(3),"'",M,"':'enc_",TypeName,"'(H, Val, T)"});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Val,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'enc_",TypeName,
-			  "'(H, Val, T)"});
-		TypeName ->
-		    emit({indent(3),"'enc_",TypeName,"'(H, Val, T)"})
-	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_encode_objectfields(Erule,ClassName,Rest,ObjName,ObjectFields,ConstrAcc);
-gen_encode_objectfields(Erule,ClassName,[_C|Cs],O,OF,Acc) ->
-    gen_encode_objectfields(Erule,ClassName,Cs,O,OF,Acc);
-gen_encode_objectfields(_, _,[],_,_,Acc) ->
-    Acc.
-
-
-gen_encode_constr_type(Erules,[TypeDef|Rest]) when is_record(TypeDef,typedef) ->
-    case is_already_generated(enc,TypeDef#typedef.name) of
-	true -> ok;
-	_ ->
-%%	    FuncName = list_to_atom(lists:concat(["enc_",TypeDef#typedef.name])),
-	    FuncName = asn1ct_gen:list2rname(TypeDef#typedef.name ++ [enc]),
-	    emit(["'",FuncName,"'(Val) ->",nl]),
-	    Def = TypeDef#typedef.typespec,
-	    InnerType = asn1ct_gen:get_inner(Def#type.def),
-	    asn1ct_gen:gen_encode_constructed(Erules,TypeDef#typedef.name,
-					      InnerType,Def),
-	    gen_encode_constr_type(Erules,Rest)
-    end;
-gen_encode_constr_type(_,[]) ->
-    ok.
-
-gen_encode_field_call(_Erules, _ObjName, _FieldName,
-		      #'Externaltypereference'{module=M,type=T}) ->
-    CurrentMod = get(currmod),
-    if
-	M == CurrentMod ->
-	    emit({"   'enc_",T,"'(Val)"}),
-	    [];
-	true ->
-	    emit({"   '",M,"':'enc_",T,"'(Val)"}),
-	    []
-    end;
-gen_encode_field_call(Erules, ObjName, FieldName, Type) ->
-    Def = Type#typedef.typespec,
-    case Type#typedef.name of
-	{primitive,bif} -> 
-	    gen_encode_prim(Erules, Def, "Val"),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'enc_",ObjName,'_',FieldName,
-		  "'(Val)"}),
-%%	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	    [Type#typedef{name=[FieldName,ObjName]}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'enc_",TypeName,
-		  "'(Val)"}),
-	    [];
-	TypeName ->
-	    emit({"   'enc_",TypeName,"'(Val)"}),
-	    []
-    end.
-
-gen_encode_default_call(Erules, ClassName, FieldName, Type) ->
-    CurrentMod = get(currmod),
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-%%	    asn1ct_gen:gen_encode_constructed(Erules,Typename,InnerType,Type);
-	    emit(["   'enc_",ClassName,'_',FieldName,"'(Val)"]),
-%%	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-	    [#typedef{name=[FieldName,ClassName],
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_encode_prim(Erules, Type, "Val"),
-	    [];
-	#'Externaltypereference'{module=CurrentMod,type=Etype} ->
-	    emit(["   'enc_",Etype,"'(Val)",nl]),
-	    [];
-	#'Externaltypereference'{module=Emod,type=Etype} ->
-	    emit(["   '",Emod,"':'enc_",Etype,"'(Val)",nl]),
-	    []
-    end.
-    
-
-gen_decode_objectfields(Erules, ClassName,
-			[{typefield,Name,OptOrMand}|Rest],
-			ObjName, ObjectFields, ConstrAcc) ->
-    EmitFuncClause = 
-	fun(Bytes) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},",",Bytes,
-		      ",_,_RestPrimFieldName) ->",nl])
-	end,
-    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(["   {Bytes,[]}"]),
-		[];
-	    {false,{'DEFAULT',DefaultType}} ->
-		EmitFuncClause("Bytes"),
-		gen_decode_default_call(Erules, ClassName, Name, "Bytes",
-					DefaultType);
-	    {{Name,TypeSpec},_} ->
-		%% A specified field owerwrites any 'DEFAULT' or
-		%% 'OPTIONAL' field in the class
-		EmitFuncClause("Bytes"),
-		gen_decode_field_call(Erules, ObjName, Name, "Bytes", TypeSpec)
-	end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(Erules, ClassName, Rest, ObjName,
-			    ObjectFields, MaybeConstr++ConstrAcc);
-gen_decode_objectfields(Erules, ClassName,
-			[{objectfield,Name,_,_,OptOrMand}|Rest],
-			ObjName, ObjectFields, ConstrAcc) ->
-    CurrentMod = get(currmod),
-    EmitFuncClause =
-	fun(Attrs) ->
-		emit(["'dec_",ObjName,"'(",{asis,Name},
-		      ",",Attrs,") ->",nl])
-	end,
-%     emit(["'dec_",ObjName,"'(",{asis,Name},
-% 	  ", Bytes,_,[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,_,[H|T]"),
-	    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, telltype, T)"});
-	{{Name,#'Externalvaluereference'{module=M,value=TypeName}},_} ->
-	    EmitFuncClause("Bytes,_,[H|T]"),
-	    emit({indent(3),"'",M,"':'dec_",TypeName,
-		  "'(H, Bytes, telltype, T)"});
-	{{Name,TypeSpec},_} ->
-	    EmitFuncClause("Bytes,_,[H|T]"),
-	    case TypeSpec#typedef.name of
-		{ExtMod,TypeName} ->
-		    emit({indent(3),"'",ExtMod,"':'dec_",TypeName,
-			  "'(H, Bytes, telltype, T)"});
-		TypeName ->
-		    emit({indent(3),"'dec_",TypeName,"'(H, Bytes, telltype, T)"})
+	    case Constraint of
+		[#'Externaltypereference'{type=Tname}] ->
+		    EncFunc = enc_func(Tname),
+		    Imm = [{apply,{local,EncFunc,[]},[Val]}],
+		    asn1ct_imm:per_enc_open_type(Imm, Aligned);
+		[] ->
+		    Imm = [{call,erlang,iolist_to_binary,[Val]}],
+		    asn1ct_imm:per_enc_open_type(Imm, Aligned)
 	    end
-    end,
-    case more_genfields(Rest) of
-	true ->
-	    emit([";",nl]);
-	false ->
-	    emit([".",nl])
-    end,
-    gen_decode_objectfields(Erules, ClassName, Rest, ObjName,
-			    ObjectFields, ConstrAcc);
-gen_decode_objectfields(Erules, CN, [_C|Cs], O, OF, CAcc) ->
-    gen_decode_objectfields(Erules, CN, Cs, O, OF, CAcc);
-gen_decode_objectfields(_, _, [], _, _, CAcc) ->
-    CAcc.
-
-
-
-gen_decode_field_call(_Erules, _ObjName, _FieldName, Bytes,
-		      #'Externaltypereference'{}=Etype) ->
-    emit("   "),
-    gen_dec_external(Etype, Bytes),
-    [];
-gen_decode_field_call(Erules, ObjName, FieldName, Bytes, Type) ->
-    Def = Type#typedef.typespec,
-    case Type#typedef.name of
-	{primitive,bif} -> 
-	    gen_dec_prim(Erules, Def, Bytes),
-	    [];
-	{constructed,bif} ->
-	    emit({"   'dec_",ObjName,'_',FieldName,
-		  "'(",Bytes,",telltype)"}),
-%%	    [Type#typedef{name=list_to_atom(lists:concat([ObjName,'_',FieldName]))}];
-	    [Type#typedef{name=[FieldName,ObjName]}];
-	{ExtMod,TypeName} ->
-	    emit({"   '",ExtMod,"':'dec_",TypeName,
-		  "'(",Bytes,", telltype)"}),
-	    [];
-	TypeName ->
-	    emit({"   'dec_",TypeName,"'(",Bytes,", telltype)"}),
-	    []
     end.
 
-gen_decode_default_call(Erules, ClassName, FieldName, Bytes, Type) ->
-    InnerType = asn1ct_gen:get_inner(Type#type.def),
-    case asn1ct_gen:type(InnerType) of
-    	{constructed,bif} ->
-	    emit(["   'dec_",ClassName,'_',FieldName,"'(",Bytes,", telltype)"]),
-%%	    [#typedef{name=list_to_atom(lists:concat([ClassName,'_',FieldName])),
-	    [#typedef{name=[FieldName,ClassName],
-		      typespec=Type}];
-	{primitive,bif} ->
-	    gen_dec_prim(Erules, Type, Bytes),
-	    [];
-	#'Externaltypereference'{}=Etype ->
-	    asn1ct_gen_per:gen_dec_external(Etype, Bytes),
-	    []
+dec_func(Tname) ->
+    list_to_atom(lists:concat(["dec_",Tname])).
+
+enc_func(Tname) ->
+    list_to_atom(lists:concat(["enc_",Tname])).
+
+simplify_type(Type) ->
+    case Type of
+	'BMPString'       -> k_m_string;
+	'IA5String'       -> k_m_string;
+	'NumericString'   -> k_m_string;
+	'PrintableString' -> k_m_string;
+	'VisibleString'   -> k_m_string;
+	'UniversalString' -> k_m_string;
+	'GeneralizedTime' -> k_m_string;
+	'UTCTime'         -> k_m_string;
+	'TeletexString'   -> restricted_string;
+	'T61String'       -> restricted_string;
+	'VideotexString'  -> restricted_string;
+	'GraphicString'   -> restricted_string;
+	'GeneralString'   -> restricted_string;
+	'UTF8String'      -> restricted_string;
+	'ObjectDescriptor' -> restricted_string;
+	Other             -> Other
     end.
 
+%% Object code generating for encoding and decoding
+%% ------------------------------------------------
 
-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#typedef{name=asn1ct_gen:list2rname(TypeDef#typedef.name)})
-    end,
-    gen_decode_constr_type(Erules,Rest);
-gen_decode_constr_type(_,[]) ->
+gen_obj_code(_Erules, _Module, #typedef{}) ->
     ok.
 
-
-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(Erules,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(Erule, ObjSetName, UniqueName, [{ObjName,Val,Fields}|T],
-	       ClName, ClFields, NthObj, Acc)->
-    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},",",{asis,Val},
-	  ") ->",nl]),
-    CurrMod = get(currmod),
-    {InternalFunc,NewNthObj}=
-	case ObjName of
-	    {no_mod,no_name} ->
-		gen_inlined_enc_funs(Erule, Fields, ClFields,
-				     ObjSetName, NthObj);
-	    {CurrMod,Name} ->
-		emit({"    fun 'enc_",Name,"'/3"}),
-		{[],0};
-	    {ModName,Name} ->
-		emit_ext_encfun(ModName,Name),
-		{[],0};
-	    _Other ->
-		emit({"    fun 'enc_",ObjName,"'/3"}),
-		{[],0}
-	end,
-    emit({";",nl}),
-    gen_objset_enc(Erule, ObjSetName, UniqueName, T, ClName, ClFields,
-		   NewNthObj, InternalFunc ++ Acc);
-gen_objset_enc(uper, ObjSetName, _UniqueName, ['EXTENSIONMARK'],
-	       _ClName, _ClFields, _NthObj, Acc) ->
-    emit({"'getenc_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(_, Val, _) ->",nl}),
-    emit([indent(6),"Val",nl,
-	  indent(3),"end.",nl,nl]),
-    Acc;
-gen_objset_enc(per, ObjSetName, _UniqueName, ['EXTENSIONMARK'],
-	       _ClName, _ClFields, _NthObj, Acc) ->
-    emit(["'getenc_",ObjSetName,"'(_, _) ->",nl,
-	  indent(3),"fun(_, Val, _) ->",nl,
-	  indent(6),"BinVal = if",nl,
-	  indent(9),"is_list(Val) -> list_to_binary(Val);",nl,
-	  indent(9),"true -> Val",nl,
-	  indent(6),"end,",nl,
-	  indent(6),"Size = byte_size(BinVal),",nl,
-	  indent(6),"if",nl,
-	  indent(9),"Size < 256 ->",nl,
-	  indent(12),"[20,Size,BinVal];",nl,
-	  indent(9),"true ->",nl,
-	  indent(12),"[21,<<Size:16>>,Val]",nl,
-	  indent(6),"end",nl,
-	  indent(3),"end.",nl,nl]),
-    Acc;
-gen_objset_enc(_, ObjSetName, UniqueName, [], _, _, _, Acc) ->
-    emit_default_getenc(ObjSetName, UniqueName),
-    emit([".",nl,nl]),
-    Acc.
-
-emit_ext_encfun(ModuleName,Name) ->
-    emit([indent(4),"fun(T,V,O) -> '",ModuleName,"':'enc_",
-	  Name,"'(T,V,O) end"]).
-
-emit_default_getenc(ObjSetName,UniqueName) ->
-    emit(["'getenc_",ObjSetName,"'(",{asis,UniqueName},", ErrV) ->",nl]),
-    emit([indent(4),"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(Erule, Fields, [{typefield,_,_}|_]=T,
-		     ObjSetName, NthObj) ->
-    emit([indent(3),"fun(Type, Val, _) ->",nl,
-	  indent(6),"case Type of",nl]),
-    gen_inlined_enc_funs1(Erule, Fields, T, ObjSetName, [], NthObj, []);
-gen_inlined_enc_funs(Erule,Fields,[_H|Rest],ObjSetName,NthObj) ->
-    gen_inlined_enc_funs(Erule,Fields,Rest,ObjSetName,NthObj);
-gen_inlined_enc_funs(_,_,[],_,NthObj) ->
-    {[],NthObj}.
-
-gen_inlined_enc_funs1(Erule, Fields, [{typefield,Name,_}|Rest], ObjSetName,
-		      Sep0, NthObj, Acc0) ->
-    emit(Sep0),
-    Sep = [";",nl],
-    CurrentMod = get(currmod),
-    InternalDefFunName = asn1ct_gen:list2name([NthObj,Name,ObjSetName]),
-    {Acc,NAdd} =
-	case lists:keyfind(Name, 1, Fields) of
-	    {_,#type{}=Type} ->
-		{Ret,N} = emit_inner_of_fun(Erule, Type, InternalDefFunName),
-		{Ret++Acc0,N};
-	    {_,#typedef{}=Type} ->
-		emit([indent(9),{asis,Name}," ->",nl]),
-		{Ret,N} = emit_inner_of_fun(Erule, Type, InternalDefFunName),
-		{Ret++Acc0,N};
-	    {_,#'Externaltypereference'{module=CurrentMod,type=T}} ->
-		emit([indent(9),{asis,Name}," ->",nl,
-		      indent(12),"'enc_",T,"'(Val)"]),
-		{Acc0,0};
-	    {_,#'Externaltypereference'{module=M,type=T}} ->
-		emit([indent(9),{asis,Name}," ->",nl,
-		      indent(12),"'",M,"'",":'enc_",T,"'(Val)"]),
-		{Acc0,0};
-	    false when Erule =:= uper ->
-		emit([indent(9),{asis,Name}," ->",nl,
-		      indent(12),"Val",nl]),
-		{Acc0,0};
-	    false when Erule =:= per ->
-		emit([indent(9),{asis,Name}," ->",nl,
-		      indent(12),"Size = case Val of",nl,
-		      indent(15),"B when is_binary(B) -> size(B);",nl,
-		      indent(15),"_ -> length(Val)",nl,
-		      indent(12),"end,",nl,
-		      indent(12),"if",nl,
-		      indent(15),"Size < 256 -> [20,Size,Val];",nl,
-		      indent(15),"true -> [21,<<Size:16>>,Val]",nl,
-		      indent(12),"end"]),
-		{Acc0,0}
-	end,
-    gen_inlined_enc_funs1(Erule, Fields, Rest, ObjSetName, Sep,
-			  NthObj+NAdd, Acc);
-gen_inlined_enc_funs1(Erule, Fields, [_|T], ObjSetName, Sep, NthObj, Acc)->
-    gen_inlined_enc_funs1(Erule, Fields, T, ObjSetName, Sep, NthObj, Acc);
-gen_inlined_enc_funs1(_, _, [], _, _, NthObj, Acc) ->
-    emit([nl,indent(6),"end",nl,
-	  indent(3),"end"]),
-    {Acc,NthObj}.
-
-emit_inner_of_fun(Erule, #typedef{name={ExtMod,Name},typespec=Type}=TDef,
-		  InternalDefFunName) ->
-    case {ExtMod,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_encode_prim(Erule, Type, "Val"),
-	    {[],0};
-	{constructed,bif} ->
-	    emit([indent(12),"'enc_",
-		  InternalDefFunName,"'(Val)"]),
-	    {[TDef#typedef{name=InternalDefFunName}],1};
-	_ ->
-	    emit({indent(12),"'",ExtMod,"':'enc_",Name,"'(Val)"}),
-	    {[],0}
-    end;
-emit_inner_of_fun(_Erule, #typedef{name=Name}, _) ->
-    emit({indent(12),"'enc_",Name,"'(Val)"}),
-    {[],0};
-emit_inner_of_fun(Erule, #type{}=Type, _) ->
-    CurrMod = get(currmod),
-    case Type#type.def of
-	Def when is_atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_encode_prim(Erule, Type, "Val");
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'enc_",T,"'(Val)"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'enc_",
-		  T,"'(Val)"})
-    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(Erule, ObjSName, UniqueName, [{ObjName,Val,Fields}|T], 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(Erule, Fields, ClFields,
-				     ObjSName, NthObj);
-	    {CurrMod,Name} ->
-		emit(["    fun 'dec_",Name,"'/4"]),
-		NthObj;
-	    {ModName,Name} ->
-		emit_ext_decfun(ModName,Name),
-		NthObj;
-	    _Other ->
-		emit({"    fun 'dec_",ObjName,"'/4"}),
-		NthObj
-    end,
-    emit({";",nl}),
-    gen_objset_dec(Erule, ObjSName, UniqueName, T, ClName, ClFields, NewNthObj);
-gen_objset_dec(_Erule, ObjSetName, _UniqueName, ['EXTENSIONMARK'],
-	       _ClName, _ClFields, _NthObj) ->
-    emit({"'getdec_",ObjSetName,"'(_, _) ->",nl}),
-    emit({indent(3),"fun(Attr1, Bytes, _,_) ->",nl}),
-    emit({indent(6),"{Bytes,Attr1}",nl}),
-    emit({indent(3),"end.",nl,nl}),
-    ok;
-gen_objset_dec(_Erule, ObjSetName, UniqueName, [], _, _, _) ->
-    emit_default_getdec(ObjSetName, UniqueName),
-    emit([".",nl,nl]),
+gen_objectset_code(_Erules, _ObjSet) ->
     ok.
 
-emit_ext_decfun(ModuleName,Name) ->
-    emit([indent(3),"fun(T,V,O1,O2) -> '",ModuleName,"':'dec_",
-	  Name,"'(T,V,O1,O2) end"]).
-
-emit_default_getdec(ObjSetName,UniqueName) ->
-    emit(["'getdec_",ObjSetName,"'(",{asis,UniqueName},", ErrV) ->",nl]),
-    emit([indent(2), "fun(C,V,_,_) -> exit({{component,C},{value,V},{unique_name_and_value,",{asis,UniqueName},",ErrV}}) end"]).
-
-
-gen_inlined_dec_funs(Erule, Fields, List, ObjSetName, NthObj0) ->
-    emit([indent(3),"fun(Type, Val, _, _) ->",nl,
-	  indent(6),"case Type of",nl]),
-    NthObj = gen_inlined_dec_funs1(Erule, Fields, List,
-				   ObjSetName, "", NthObj0),
-    emit([nl,indent(6),"end",nl,
-	  indent(3),"end"]),
-    NthObj.
-
-gen_inlined_dec_funs1(Erule, Fields, [{typefield,Name,_}|Rest],
-		      ObjSetName, Sep0, NthObj) ->
-    InternalDefFunName = [NthObj,Name,ObjSetName],
-    emit(Sep0),
-    Sep = [";",nl],
-    N = case lists:keyfind(Name, 1, Fields) of
-	    {_,#type{}=Type} ->
-		emit_inner_of_decfun(Erule, Type, InternalDefFunName);
-	    {_,#typedef{}=Type} ->
-		emit([indent(9),{asis,Name}," ->",nl]),
-		emit_inner_of_decfun(Erule, Type, InternalDefFunName);
-	    {_,#'Externaltypereference'{}=Etype} ->
-		emit([indent(9),{asis,Name}," ->",nl,
-		      indent(12)]),
-		gen_dec_external(Etype, "Val"),
-		0;
-	    false ->
-		emit([indent(9),{asis,Name}," -> {Val,Type}"]),
-		0
-	end,
-    gen_inlined_dec_funs1(Erule, Fields, Rest, ObjSetName, Sep, NthObj+N);
-gen_inlined_dec_funs1(Erule, Fields, [_|Rest], ObjSetName, Sep, NthObj) ->
-    gen_inlined_dec_funs1(Erule, Fields, Rest, ObjSetName, Sep, NthObj);
-gen_inlined_dec_funs1(_, _, [], _, _, NthObj) -> NthObj.
-
-emit_inner_of_decfun(Erule, #typedef{name={ExtName,Name},typespec=Type},
-		     InternalDefFunName) ->
-    case {ExtName,Name} of
-	{primitive,bif} ->
-	    emit(indent(12)),
-	    gen_dec_prim(Erule, Type, "Val"),
-	    0;
-	{constructed,bif} ->
-	    emit({indent(12),"'dec_",
-		  asn1ct_gen:list2name(InternalDefFunName),"'(Val)"}),
-	    1;
-	_ ->
-	    emit({indent(12),"'",ExtName,"':'dec_",Name,"'(Val, telltype)"}),
-	    0
-    end;
-emit_inner_of_decfun(_Erule, #typedef{name=Name}, _) ->
-    emit({indent(12),"'dec_",Name,"'(Val, telltype)"}),
-    0;
-emit_inner_of_decfun(Erule, #type{}=Type, _) ->
-    CurrMod = get(currmod),
-    case Type#type.def of
-	Def when is_atom(Def) ->
-	    emit({indent(9),Def," ->",nl,indent(12)}),
-	    gen_dec_prim(Erule, Type, "Val");
-	#'Externaltypereference'{module=CurrMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),"'dec_",T,"'(Val)"});
-	#'Externaltypereference'{module=ExtMod,type=T} ->
-	    emit({indent(9),T," ->",nl,indent(12),ExtMod,":'dec_",
-		  T,"'(Val)"})
-    end,
-    0.
-
-
-gen_internal_funcs(_,[]) ->
-    ok;
-gen_internal_funcs(Erules,[TypeDef|Rest]) ->
-    gen_encode_user(Erules,TypeDef),
-    emit([nl,nl,"'dec_",TypeDef#typedef.name,"'(Bytes) ->",nl]),
-    gen_decode_user(Erules,TypeDef),
-    gen_internal_funcs(Erules,Rest).
-
-
-
 %% DECODING *****************************
 %%***************************************
 
-gen_decode(Erules,Type) when is_record(Type,typedef) ->
-    D = Type,
-    emit({nl,nl}),
-    emit({"'dec_",Type#typedef.name,"'(Bytes,_) ->",nl}),
+gen_decode(Erules, #typedef{}=Type) ->
+    DecFunc = dec_func(Type#typedef.name),
+    emit([nl,nl,{asis,DecFunc},"(Bytes) ->",nl]),
     dbdec(Type#typedef.name),
-    gen_decode_user(Erules,D).
+    gen_decode_user(Erules, Type).
 
 gen_decode(Erules,Tname,#'ComponentType'{name=Cname,typespec=Type}) ->
     NewTname = [Cname|Tname],
@@ -944,8 +231,9 @@ gen_decode(Erules,Typename,Type) when is_record(Type,type) ->
 		    _ ->
 			""
 		end,
-	    emit({nl,"'dec_",asn1ct_gen:list2name(Typename),
-		  "'(Bytes,_",ObjFun,") ->",nl}),
+	    emit([nl,
+		  {asis,dec_func(asn1ct_gen:list2name(Typename))},
+		  "(Bytes",ObjFun,") ->",nl]),
 	    dbdec(Typename),
 	    asn1ct_gen:gen_decode_constructed(Erules,Typename,InnerType,Type);
 	_ ->
@@ -982,8 +270,8 @@ gen_dec_external(Ext, BytesVar) ->
     #'Externaltypereference'{module=Mod,type=Type} = Ext,
     emit([case CurrMod of
 	      Mod -> [];
-	      _ -> ["'",Mod,"':"]
-	  end,"'dec_",Type,"'(",BytesVar,",telltype)"]).
+	      _ -> [{asis,Mod},":"]
+	  end,{asis,dec_func(Type)},"(",BytesVar,")"]).
 
 gen_dec_imm(Erule, #type{def=Name,constraint=C}) ->
     Aligned = case Erule of
@@ -1050,7 +338,10 @@ gen_dec_imm_1('GeneralizedTime', Constraint, Aligned) ->
 gen_dec_imm_1('OCTET STRING', Constraint, Aligned) ->
     SzConstr = asn1ct_imm:effective_constraint(bitstring, Constraint),
     Imm = asn1ct_imm:per_dec_octet_string(SzConstr, Aligned),
-    {convert,binary_to_list,Imm};
+    case asn1ct:use_legacy_types() of
+	false -> {convert,{binary,copy},Imm};
+	true -> {convert,binary_to_list,Imm}
+    end;
 gen_dec_imm_1('TeletexString', _Constraint, Aligned) ->
     gen_dec_restricted_string(Aligned);
 gen_dec_imm_1('T61String', _Constraint, Aligned) ->
@@ -1103,35 +394,6 @@ gen_dec_prim(Erule, Type, BytesVar) ->
     Imm = gen_dec_imm(Erule, Type),
     asn1ct_imm:dec_code_gen(Imm, BytesVar).
 
-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 PER the ExtensionAdditionGroup notation has significance for the encoding and decoding
 %% the components within the ExtensionAdditionGroup is treated in a similar way as if they
@@ -1170,11 +432,8 @@ imm_dec_open_type_1(Type, Aligned) ->
 		asn1ct_name:new(tmpval),
 		emit(["begin",nl,
 		      "{",{curr,tmpval},",_} = ",
-		      "dec_",Type,"(",OpenType,", mandatory),",nl,
+		      {asis,dec_func(Type)},"(",OpenType,"),",nl,
 		      "{",{curr,tmpval},com,Buf,"}",nl,
 		      "end"])
 	end,
     {call,D,asn1ct_imm:per_dec_open_type(Aligned)}.
-
-eval_module(per) -> asn1ct_eval_per;
-eval_module(uper) -> asn1ct_eval_uper.
diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
deleted file mode 100644
index 012d54e7a1..0000000000
--- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl
+++ /dev/null
@@ -1,461 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
-%%
-%% The 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_per_rt2ct).
-
-%% Handle encoding of primitives for aligned PER.
-
--include("asn1_records.hrl").
-
--export([gen_encode_prim/3]).
-
--import(asn1ct_gen, [emit/1,demit/1]).
--import(asn1ct_func, [call/3]).
-
-gen_encode_prim(Erules, #type{}=D, Value) ->
-    Constraint = D#type.constraint,
-    case D#type.def of
-	'INTEGER' ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    emit(["  %%INTEGER with effective constraint: ",
-		  {asis,EffectiveConstr},nl]),
-	    emit_enc_integer(Erules,EffectiveConstr,Value);
-	{'INTEGER',NamedNumberList} ->
-	    EffectiveConstr = effective_constraint(integer,Constraint),
-	    %% maybe an emit_enc_NNL_integer
-	    emit(["  %%INTEGER with effective constraint: ",
-		  {asis,EffectiveConstr},nl]),
-	    emit_enc_integer_NNL(Erules,EffectiveConstr,Value,NamedNumberList);
-	'REAL' ->
-	    emit_enc_real(Erules, Value);
-
-	{'BIT STRING',NamedNumberList} ->
-	    EffectiveC = effective_constraint(bitstring,Constraint),
-	    case EffectiveC of
-		0 ->
-		    emit({"[]"});
-		_ ->
-		    call(Erules, encode_bit_string,
-			 [{asis,EffectiveC},Value,
-			  {asis,NamedNumberList}])
-	    end;
-	'NULL' ->
-	    emit("[]");
-	'OBJECT IDENTIFIER' ->
-	    call(Erules, encode_object_identifier, [Value]);
-	'RELATIVE-OID' ->
-	    call(Erules, encode_relative_oid, [Value]);
-	'ObjectDescriptor' ->
-	    call(Erules, encode_ObjectDescriptor,
-		 [{asis,Constraint},Value]);
-	'BOOLEAN' ->
-	    emit({"case ",Value," of",nl,
-		  "  true -> [1];",nl,
-		  "  false -> [0];",nl,
-		  "  _ -> exit({error,{asn1,{encode_boolean,",Value,"}}})",nl,
-		  "end"});
-	'OCTET STRING' ->
-	    emit_enc_octet_string(Erules,Constraint,Value);
-
-	'NumericString' ->
-	    emit_enc_known_multiplier_string('NumericString',Constraint,Value);
-	TString when TString == 'TeletexString';
-		     TString == 'T61String' ->
-	    call(Erules, encode_TeletexString, [{asis,Constraint},Value]);
-	'VideotexString' ->
-	    call(Erules, encode_VideotexString, [{asis,Constraint},Value]);
-	'UTCTime' ->
-	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
-	'GeneralizedTime' ->
-	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
-	'GraphicString' ->
-	    call(Erules, encode_GraphicString, [{asis,Constraint},Value]);
-	'VisibleString' ->
-	    emit_enc_known_multiplier_string('VisibleString',Constraint,Value);
-	'GeneralString' ->
-	    call(Erules, encode_GeneralString, [{asis,Constraint},Value]);
-	'PrintableString' ->
-	    emit_enc_known_multiplier_string('PrintableString',Constraint,Value);
-	'IA5String' ->
-	    emit_enc_known_multiplier_string('IA5String',Constraint,Value);
-	'BMPString' ->
-	    emit_enc_known_multiplier_string('BMPString',Constraint,Value);
-	'UniversalString' ->
-	    emit_enc_known_multiplier_string('UniversalString',Constraint,Value);
-	'UTF8String' ->
-	    call(Erules, encode_UTF8String, [Value]);
-	'ASN1_OPEN_TYPE' ->
-	    NewValue = case Constraint of
-			   [#'Externaltypereference'{type=Tname}] ->
-			       asn1ct_func:need({Erules,complete,1}),
-			       io_lib:format(
-				 "complete(enc_~s(~s))",[Tname,Value]);
-			   [#type{def=#'Externaltypereference'{type=Tname}}] ->
-			       asn1ct_func:need({Erules,complete,1}),
-			       io_lib:format(
-				 "complete(enc_~s(~s))",
-				 [Tname,Value]);
-			   _ ->
-			       io_lib:format("iolist_to_binary(~s)",
-					     [Value])
-		     end,
-	    call(Erules, encode_open_type, [NewValue])
-    end.
-
-emit_enc_real(Erules, Real) ->
-    asn1ct_name:new(tmpval),
-    asn1ct_name:new(tmplen),
-    emit(["begin",nl,
-	  "{",{curr,tmpval},com,{curr,tmplen},"} = ",
-	  {call,real_common,encode_real,[Real]},com,nl,
-	  "[",{call,Erules,encode_length,[{curr,tmplen}]},",",nl,
-	  {call,Erules,octets_to_complete,
-	   [{curr,tmplen},{curr,tmpval}]},"]",nl,
-	  "end"]).
-
-emit_enc_known_multiplier_string(StringType,C,Value) ->
-    SizeC = effective_constraint(bitstring, C),
-    PAlphabC = get_constraint(C,'PermittedAlphabet'),
-    case {StringType,PAlphabC} of
-	{'UniversalString',{_,_}} ->
-	    exit({error,{asn1,{'not implemented',"UniversalString with "
-			       "PermittedAlphabet constraint"}}});
-	{'BMPString',{_,_}} ->
-	    exit({error,{asn1,{'not implemented',"BMPString with "
-			       "PermittedAlphabet constraint"}}});
-	_ -> ok
-    end,
-    NumBits = get_NumBits(C,StringType),
-    CharOutTab = get_CharOutTab(C,StringType),
-    %% NunBits and CharOutTab for chars_encode
-    emit_enc_k_m_string(SizeC, NumBits, CharOutTab, Value).
-
-emit_enc_k_m_string(0, _NumBits, _CharOutTab, _Value) ->
-    emit({"[]"});
-emit_enc_k_m_string(SizeC, NumBits, CharOutTab, Value) ->
-    call(per, encode_known_multiplier_string,
-	 [{asis,SizeC},NumBits,{asis,CharOutTab},Value]).
-
-
-%% copied from run time module
-
-get_CharOutTab(C, StringType) ->
-    case get_constraint(C,'PermittedAlphabet') of
-	{'SingleValue',Sv} ->
-	    get_CharTab2(C, StringType, hd(Sv), lists:max(Sv), Sv);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    {0,16#7F,notab};
-		'VisibleString' ->
-		    get_CharTab2(C, StringType, 16#20, 16#7F, notab);
-		'PrintableString' ->
-		    Chars = lists:sort(
-			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(C, StringType, hd(Chars),
-				 lists:max(Chars), Chars);
-		'NumericString' ->
-		    get_CharTab2(C, StringType, 16#20, $9, " 0123456789");
-		'UniversalString' ->
-		    {0,16#FFFFFFFF,notab};
-		'BMPString' ->
-		    {0,16#FFFF,notab}
-	    end
-    end.
-
-get_CharTab2(C, StringType, Min, Max, Chars) ->
-    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-    if
-	Max =< BitValMax ->
-	    {0,Max,notab};
-	true ->
-	    {Min,Max,create_char_tab(Min,Chars)}
-    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)].
-
-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.
-
-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).
-
-%% copied from run time module
-
-emit_enc_octet_string(Erules, Constraint, Value) ->
-    case effective_constraint(bitstring, Constraint) of
-	0 ->
-	    emit({"  []"});
-	1 ->
-	    asn1ct_name:new(tmpval),
-	    emit({"  begin",nl}),
-	    emit({"    [",{curr,tmpval},"] = ",Value,",",nl}),
-	    emit(["    [[10,8],",{curr,tmpval},"]",nl]),
-	    emit("  end");
-	2 ->
-	    asn1ct_name:new(tmpval),
-	    emit(["  begin",nl,
-		  "    ",{curr,tmpval}," = ",Value,",",nl,
-		  "    case length(",{curr,tmpval},") of",nl,
-		  "      2 ->",nl,
-		  "        [[45,16,2]|",{curr,tmpval},"];",nl,
-		  "      _ ->",nl,
-		  "        exit({error,{value_out_of_bounds,",
-		  {curr,tmpval},"}})",nl,
-		  "    end",nl,
-		  "  end"]);
-	Sv when is_integer(Sv), Sv < 256  ->
-	    asn1ct_name:new(tmpval),
-	    asn1ct_name:new(tmplen),
-	    emit(["  begin",nl,
-		  "    ",{curr,tmpval}," = ",Value,",",nl,
-		  "    case length(",{curr,tmpval},") of",nl,
-		  "      ",Sv,"=",{curr,tmplen}," ->",nl,
-		  "       [20,",{curr,tmplen},"|",{curr,tmpval},"];",nl,
-		  "      _ ->",nl,
-		  "       exit({error,{value_out_of_bounds,",
-		  {curr,tmpval},"}})",nl,
-		  "    end",nl,
-		  "  end"]);
-	Sv when is_integer(Sv),Sv =< 65535  ->
-	    asn1ct_name:new(tmpval),
-	    asn1ct_name:new(tmplen),
-	    emit(["  begin",nl,
-		  "    ",{curr,tmpval}," = ",Value,",",nl,
-		  "    case length(",{curr,tmpval},") of",nl,
-		  "      ",Sv,"=",{curr,tmplen}," ->",nl,
-		  "        [<<21,",{curr,tmplen},":16>>|",Value,"];",nl,
-		  "      _ ->",nl,
-		  "        exit({error,{value_out_of_bounds,",
-		  {curr,tmpval},"}})",nl,
-		  "    end",nl,
-		  "  end"]);
-	C ->
-	    call(Erules, encode_octet_string,
-		 [{asis,C},Value])
-    end.
-
-emit_enc_integer_case(Value) ->
-    case get(component_type) of
-	{true,#'ComponentType'{prop=Prop}} ->
-	    emit({"  begin",nl}),
-	    case Prop of
-		Opt when Opt=='OPTIONAL';
-			 is_tuple(Opt),element(1,Opt)=='DEFAULT' ->
-		    emit({"  case ",Value," of",nl}),
-		    ok;
-		_ ->
-		    emit({"  ",{curr,tmpval},"=",Value,",",nl}),
-		    emit({"  case ",{curr,tmpval}," of",nl}),
-		    asn1ct_name:new(tmpval)
-	    end;
-%	    asn1ct_name:new(tmpval);
-	_ ->
-	    emit({" case ",Value," of ",nl})
-    end.
-emit_enc_integer_end_case() ->    
-    case get(component_type) of
-	{true,_} ->
-	    emit({nl,"  end"}); % end of begin ... end
-	_ -> ok
-    end.
-
-
-emit_enc_integer_NNL(Erules,C,Value,NNL) ->
-    EncVal = enc_integer_NNL_cases(Value,NNL),
-    emit_enc_integer(Erules,C,EncVal).
-    
-enc_integer_NNL_cases(Value,NNL) ->
-    asn1ct_name:new(tmpval),
-    TmpVal = asn1ct_gen:mk_var(asn1ct_name:curr(tmpval)),
-    Cases=enc_integer_NNL_cases1(NNL),
-    lists:flatten(io_lib:format("(case ~s of "++Cases++
-		  "~s when is_atom(~s)->exit({error,{asn1,{namednumber,~s}}});_->~s end)",[Value,TmpVal,TmpVal,TmpVal,Value])).
-
-enc_integer_NNL_cases1([{NNo,No}|Rest]) ->
-    io_lib:format("~w->~w;",[NNo,No])++enc_integer_NNL_cases1(Rest);
-enc_integer_NNL_cases1([]) ->
-    "".
-
-emit_enc_integer(_Erule,[{'SingleValue',Int}],Value) ->
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),%    emit(["  case ",Value," of",nl]),
-    emit(["    ",Int," -> [];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
-	  nl," end",nl]),
-    emit_enc_integer_end_case();
-
-emit_enc_integer(_Erule,[{_,{Lb,Ub},_Range,{bits,NoBs}}],Value) -> % Range =< 255
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),
-    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
-	  {curr,tmpval},">=",Lb," ->",nl]),
-    emit(["      [10,",NoBs,",",{curr,tmpval},"- ",Lb,"];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",
-	  {curr,tmpval},"}})",nl,"  end",nl]),
-    emit_enc_integer_end_case();
-
-emit_enc_integer(_Erule,[{_,{Lb,Ub},Range,_}],Value) when Range =< 256 ->
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),
-    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
-	  {curr,tmpval},">=",Lb," ->",nl]),
-    emit(["      [20,1,",{curr,tmpval},"- ",Lb,"];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
-	  nl,"  end",nl]),
-    emit_enc_integer_end_case();
-
-emit_enc_integer(_Erule,[{_,{Lb,Ub},Range,_}],Value) when Range =< 65536 ->
-    asn1ct_name:new(tmpval),
-    emit_enc_integer_case(Value),
-    emit(["    ",{curr,tmpval}," when ",{curr,tmpval},"=<",Ub,",",
-	  {curr,tmpval},">=",Lb," ->",nl]),
-    emit(["      [20,2,<<(",{curr,tmpval},"- ",Lb,"):16>>];",nl]),
-    emit(["    ",{curr,tmpval}," ->",nl]),
-    emit(["      exit({error,{value_out_of_bounds,",{curr,tmpval},"}})",
-	  nl,"  end",nl]),
-    emit_enc_integer_end_case();
-
-emit_enc_integer(Erule, [{'ValueRange',{Lb,Ub}=VR}], Value)
-  when is_integer(Lb), is_integer(Ub) ->
-    call(Erule, encode_constrained_number, [{asis,VR},Value]);
-
-emit_enc_integer(Erule, C, Value) ->
-    call(Erule, encode_integer, [{asis,C},Value]).
-
-
-get_constraint([{Key,V}],Key) ->
-    V;
-get_constraint([],_) ->
-    no;
-get_constraint(C,Key) ->
-    case lists:keysearch(Key,1,C) of
-	false ->
-	    no;
-	{value,{_,V}} -> 
-	    V
-    end.
-
-%% effective_constraint(Type,C)
-%% Type = atom()
-%% C = [C1,...]
-%% C1 = {'SingleValue',SV} | {'ValueRange',VR} | {atom(),term()}
-%% SV = integer() | [integer(),...]
-%% VR = {Lb,Ub}
-%% Lb = 'MIN' | integer()
-%% Ub = 'MAX' | integer()
-%% Returns a single value if C only has a single value constraint, and no
-%% value range constraints, that constrains to a single value, otherwise 
-%% returns a value range that has the lower bound set to the lowest value 
-%% of all single values and lower bound values in C and the upper bound to
-%% the greatest value.
-effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension
-    [C]; %% [C|effective_constraint(integer,Rest)]; XXX what is possible ???
-effective_constraint(integer,C) ->
-    pre_encode(integer, asn1ct_imm:effective_constraint(integer, C));
-effective_constraint(bitstring,C) ->
-    asn1ct_imm:effective_constraint(bitstring, C).
-
-pre_encode(integer,[]) ->
-    [];
-pre_encode(integer,C=[{'SingleValue',_}]) ->
-    C;
-pre_encode(integer,C=[{'ValueRange',VR={Lb,Ub}}]) when is_integer(Lb),is_integer(Ub)->
-    Range = Ub-Lb+1,
-    if
-	Range =< 255 ->
-	    NoBits = no_bits(Range),
-	    [{'ValueRange',VR,Range,{bits,NoBits}}];
-	Range =< 256 ->
-	    [{'ValueRange',VR,Range,{octets,1}}];
-	Range =< 65536 ->
-	    [{'ValueRange',VR,Range,{octets,2}}];
-	true ->
-	    C
-    end;
-pre_encode(integer,C) ->
-    C.
-
-no_bits(2) -> 1;
-no_bits(N) when N=<4 -> 2;
-no_bits(N) when N=<8 -> 3;
-no_bits(N) when N=<16 -> 4;
-no_bits(N) when N=<32 -> 5;
-no_bits(N) when N=<64 -> 6;
-no_bits(N) when N=<128 -> 7;
-no_bits(N) when N=<255 -> 8.
diff --git a/lib/asn1/src/asn1ct_imm.erl b/lib/asn1/src/asn1ct_imm.erl
index bf362db843..fde39c674e 100644
--- a/lib/asn1/src/asn1ct_imm.erl
+++ b/lib/asn1/src/asn1ct_imm.erl
@@ -26,6 +26,20 @@
 	 per_dec_octet_string/2,per_dec_open_type/1,per_dec_real/1,
 	 per_dec_restricted_string/1]).
 -export([per_dec_constrained/3,per_dec_normally_small_number/1]).
+-export([per_enc_bit_string/4,per_enc_legacy_bit_string/4,
+	 per_enc_boolean/2,
+	 per_enc_choice/3,per_enc_enumerated/3,
+	 per_enc_integer/3,per_enc_integer/4,
+	 per_enc_null/2,
+	 per_enc_k_m_string/4,per_enc_octet_string/3,
+	 per_enc_legacy_octet_string/3,
+	 per_enc_open_type/2,
+	 per_enc_restricted_string/3,
+	 per_enc_small_number/2]).
+-export([per_enc_extension_bit/2,per_enc_extensions/4,per_enc_optional/3]).
+-export([per_enc_sof/5]).
+-export([enc_absent/3,enc_append/1,enc_element/2]).
+-export([enc_cg/2]).
 -export([optimize_alignment/1,optimize_alignment/2,
 	 dec_slim_cg/2,dec_code_gen/2]).
 -export([effective_constraint/2]).
@@ -115,29 +129,18 @@ per_dec_named_integer(Constraint, NamedList0, Aligned) ->
 per_dec_k_m_string(StringType, Constraint, Aligned) ->
     SzConstr = effective_constraint(bitstring, Constraint),
     N = string_num_bits(StringType, Constraint, Aligned),
-    %% X.691 (07/2002) 27.5.7 says if the upper bound times the number
-    %% of bits is greater than or equal to 16, then the bit field should
-    %% be aligned.
-    Imm = dec_string(SzConstr, N, Aligned, fun(_, Ub) -> Ub >= 16 end),
+    Imm = dec_string(SzConstr, N, Aligned, k_m_string),
     Chars = char_tab(Constraint, StringType, N),
     convert_string(N, Chars, Imm).
 
 per_dec_octet_string(Constraint, Aligned) ->
-    dec_string(Constraint, 8, Aligned,
-	       %% Aligned unless the size is fixed and =< 16.
-	       fun(Sv, Sv) -> Sv > 16;
-		  (_, _) -> true
-	       end).
+    dec_string(Constraint, 8, Aligned, 'OCTET STRING').
 
 per_dec_raw_bitstring(Constraint, Aligned) ->
-    dec_string(Constraint, 1, Aligned,
-	       fun(Sv, Sv) -> Sv > 16;
-		  (_, _) -> true
-	       end).
+    dec_string(Constraint, 1, Aligned, 'BIT STRING').
 
 per_dec_open_type(Aligned) ->
-    {get_bits,decode_unconstrained_length(true, Aligned),
-     [8,binary,{align,Aligned}]}.
+    dec_string(no, 8, Aligned, open_type).
 
 per_dec_real(Aligned) ->
     Dec = fun(V, Buf) ->
@@ -152,26 +155,325 @@ per_dec_restricted_string(Aligned) ->
     DecLen = decode_unconstrained_length(true, Aligned),
     {get_bits,DecLen,[8,binary]}.
 
+%%%
+%%% Encoding.
+%%%
+
+per_enc_bit_string(Val, [], Constraint0, Aligned) ->
+    {B,[[],Bits]} = mk_vars([], [bits]),
+    Constraint = effective_constraint(bitstring, Constraint0),
+    B ++ [{call,erlang,bit_size,[Val],Bits}|
+	  per_enc_length(Val, 1, Bits, Constraint, Aligned, 'BIT STRING')];
+per_enc_bit_string(Val0, NNL0, Constraint0, Aligned) ->
+    {B,[Val,Bs,Bits,Positions]} = mk_vars(Val0, [bs,bits,positions]),
+    NNL = lists:keysort(2, NNL0),
+    Constraint = effective_constraint(bitstring, Constraint0),
+    ExtraArgs = case constr_min_size(Constraint) of
+		    no -> [];
+		    Lb -> [Lb]
+		end,
+    ToBs = case ExtraArgs of
+	       [] ->
+		   {call,per_common,bs_drop_trailing_zeroes,[Val]};
+	       [Lower] ->
+		   {call,per_common,adjust_trailing_zeroes,[Val,Lower]}
+	   end,
+    B ++ [{'try',
+	   [bit_string_name2pos_fun(NNL, Val)],
+	   {Positions,
+	    [{call,per_common,bitstring_from_positions,
+	      [Positions|ExtraArgs]}]},
+	   [ToBs],Bs},
+	  {call,erlang,bit_size,[Bs],Bits}|
+	  per_enc_length(Bs, 1, Bits, Constraint, Aligned, 'BIT STRING')].
+
+per_enc_legacy_bit_string(Val0, [], Constraint0, Aligned) ->
+    {B,[Val,Bs,Bits]} = mk_vars(Val0, [bs,bits]),
+    Constraint = effective_constraint(bitstring, Constraint0),
+    ExtraArgs = case constr_min_size(Constraint) of
+		    no -> [];
+		    Lb -> [Lb]
+		end,
+    B ++ [{call,per_common,to_bitstring,[Val|ExtraArgs],Bs},
+	  {call,erlang,bit_size,[Bs],Bits}|
+	  per_enc_length(Bs, 1, Bits, Constraint, Aligned, 'BIT STRING')];
+per_enc_legacy_bit_string(Val0, NNL0, Constraint0, Aligned) ->
+    {B,[Val,Bs,Bits,Positions]} = mk_vars(Val0, [bs,bits,positions]),
+    NNL = lists:keysort(2, NNL0),
+    Constraint = effective_constraint(bitstring, Constraint0),
+    ExtraArgs = case constr_min_size(Constraint) of
+		    no -> [];
+		    Lb -> [Lb]
+		end,
+    B ++ [{'try',
+	   [bit_string_name2pos_fun(NNL, Val)],
+	   {Positions,
+	    [{call,per_common,bitstring_from_positions,
+	      [Positions|ExtraArgs]}]},
+	   [{call,per_common,to_named_bitstring,[Val|ExtraArgs]}],Bs},
+	  {call,erlang,bit_size,[Bs],Bits}|
+	  per_enc_length(Bs, 1, Bits, Constraint, Aligned, 'BIT STRING')].
+
+per_enc_boolean(Val0, _Aligned) ->
+    {B,[Val]} = mk_vars(Val0, []),
+    B++build_cond([[{eq,Val,false},{put_bits,0,1,[1]}],
+		   [{eq,Val,true},{put_bits,1,1,[1]}]]).
+
+per_enc_choice(Val0, Cs0, _Aligned) ->
+    {B,[Val]} = mk_vars(Val0, []),
+    Cs = [[{eq,Val,Tag}|opt_choice(Imm)] || {Tag,Imm} <- Cs0],
+    B++build_cond(Cs).
+
+per_enc_enumerated(Val0, {Root,Ext}, Aligned) ->
+    {B,[Val]} = mk_vars(Val0, []),
+    Constr = enumerated_constraint(Root),
+    RootCs = per_enc_enumerated_root(Root, [{put_bits,0,1,[1]}],
+				     Val, Constr, Aligned),
+    ExtCs = per_enc_enumerated_ext(Ext, Val, Aligned),
+    B++[{'cond',RootCs++ExtCs++enumerated_error(Val)}];
+per_enc_enumerated(Val0, Root, Aligned) ->
+    {B,[Val]} = mk_vars(Val0, []),
+    Constr = enumerated_constraint(Root),
+    Cs = per_enc_enumerated_root(Root, [], Val, Constr, Aligned),
+    B++[{'cond',Cs++enumerated_error(Val)}].
+
+enumerated_error(Val) ->
+    [['_',{error,Val}]].
+
+per_enc_integer(Val0, Constraint0, Aligned) ->
+    {B,[Val]} = mk_vars(Val0, []),
+    Constraint = effective_constraint(integer, Constraint0),
+    B ++ per_enc_integer_1(Val, Constraint, Aligned).
+
+per_enc_integer(Val0, NNL, Constraint0, Aligned) ->
+    {B,[Val]} = mk_vars(Val0, []),
+    Constraint = effective_constraint(integer, Constraint0),
+    Cs = [[{eq,Val,N}|per_enc_integer_1(V, Constraint, Aligned)] ||
+	     {N,V} <- NNL],
+    case per_enc_integer_1(Val, Constraint, Aligned) of
+	[{'cond',IntCs}] ->
+	    B ++ [{'cond',Cs++IntCs}];
+	Other ->
+	    B ++ [{'cond',Cs++[['_'|Other]]}]
+    end.
+
+per_enc_null(_Val, _Aligned) ->
+    [].
+
+per_enc_k_m_string(Val0, StringType, Constraint, Aligned) ->
+    {B,[Val,Bin,Len]} = mk_vars(Val0, [bin,len]),
+    SzConstraint = effective_constraint(bitstring, Constraint),
+    Unit = string_num_bits(StringType, Constraint, Aligned),
+    Chars0 = char_tab(Constraint, StringType, Unit),
+    Args = case enc_char_tab(Chars0) of
+	       notab -> [Val,Unit];
+	       Chars -> [Val,Unit,Chars]
+	   end,
+    Enc = case Unit of
+	      16 ->
+		  {call,per_common,encode_chars_16bit,[Val],Bin};
+	      32 ->
+		  {call,per_common,encode_big_chars,[Val],Bin};
+	      8 ->
+		  {call,erlang,list_to_binary,[Val],Bin};
+	      _ ->
+		  {call,per_common,encode_chars,Args,Bin}
+	  end,
+    case Unit of
+	8 ->
+	    B ++ [Enc,{call,erlang,byte_size,[Bin],Len}];
+	_ ->
+	    B ++ [{call,erlang,length,[Val],Len},Enc]
+    end ++ per_enc_length(Bin, Unit, Len, SzConstraint, Aligned, k_m_string).
+
+per_enc_open_type(Imm0, Aligned) ->
+    Imm = case Aligned of
+	      true ->
+		  %% Temporarily make the implicit 'align' done by
+		  %% complete/1 explicit to facilitate later
+		  %% optimizations: the absence of 'align' can be used
+		  %% as an indication that complete/1 can be replaced
+		  %% with a cheaper operation such as
+		  %% iolist_to_binary/1. The redundant 'align' will be
+		  %% optimized away later.
+		  Imm0 ++ [{put_bits,0,0,[1,align]}];
+	      false ->
+		  Imm0
+	  end,
+    {[],[[],Val,Len,Bin]} = mk_vars([], [output,len,bin]),
+    [{list,Imm,Val},
+     {call,enc_mod(Aligned),complete,[Val],Bin},
+     {call,erlang,byte_size,[Bin],Len}|
+     per_enc_length(Bin, 8, Len, Aligned)].
+
+per_enc_octet_string(Bin, Constraint0, Aligned) ->
+    {B,[[],Len]} = mk_vars([], [len]),
+    Constraint = effective_constraint(bitstring, Constraint0),
+    B ++ [{call,erlang,byte_size,[Bin],Len}|
+	  per_enc_length(Bin, 8, Len, Constraint, Aligned, 'OCTET STRING')].
+
+per_enc_legacy_octet_string(Val0, Constraint0, Aligned) ->
+    {B,[Val,Bin,Len]} = mk_vars(Val0, [bin,len]),
+    Constraint = effective_constraint(bitstring, Constraint0),
+    B ++ [{call,erlang,iolist_to_binary,[Val],Bin},
+	  {call,erlang,byte_size,[Bin],Len}|
+	  per_enc_length(Bin, 8, Len, Constraint, Aligned, 'OCTET STRING')].
+
+per_enc_restricted_string(Val0, {M,F}, Aligned) ->
+    {B,[Val,Bin,Len]} = mk_vars(Val0, [bin,len]),
+    B ++ [{call,M,F,[Val],Bin},
+	  {call,erlang,byte_size,[Bin],Len}|
+	  per_enc_length(Bin, 8, Len, Aligned)].
+
+per_enc_small_number(Val, Aligned) ->
+    build_cond([[{lt,Val,64},{put_bits,Val,7,[1]}],
+		['_',{put_bits,1,1,[1]}|
+		 per_enc_unsigned(Val, Aligned)]]).
+
+per_enc_extension_bit(Val0, _Aligned) ->
+    {B,[Val]} = mk_vars(Val0, []),
+    B++build_cond([[{eq,Val,[]},{put_bits,0,1,[1]}],
+		   ['_',{put_bits,1,1,[1]}]]).
+
+per_enc_extensions(Val0, Pos0, NumBits, Aligned) when NumBits > 0 ->
+    Pos = Pos0 + 1,
+    {B,[Val,Bitmap]} = mk_vars(Val0, [bitmap]),
+    Length = per_enc_small_length(NumBits, Aligned),
+    PutBits = case NumBits of
+		  1 -> [{put_bits,1,1,[1]}];
+		  _ -> [{put_bits,Bitmap,NumBits,[1]}]
+	      end,
+    B++[{call,per_common,extension_bitmap,[Val,Pos,Pos+NumBits],Bitmap},
+	{list,[{'cond',[[{eq,Bitmap,0}],
+			['_'|Length ++ PutBits]]}],
+	 {var,"Extensions"}}].
+
+per_enc_optional(Val0, {Pos,DefVals}, _Aligned) when is_integer(Pos),
+						     is_list(DefVals) ->
+    {B,Val} = enc_element(Pos, Val0),
+    Zero = {put_bits,0,1,[1]},
+    One = {put_bits,1,1,[1]},
+    B++[{'cond',
+	 [[{eq,Val,DefVal},Zero] || DefVal <- DefVals] ++ [['_',One]]}];
+per_enc_optional(Val0, {Pos,{call,M,F,A}}, _Aligned) when is_integer(Pos) ->
+    {B,Val} = enc_element(Pos, Val0),
+    {[],[[],Tmp]} = mk_vars([], [tmp]),
+    Zero = {put_bits,0,1,[1]},
+    One = {put_bits,1,1,[1]},
+    B++[{call,M,F,[Val|A],Tmp},
+	{'cond',
+	 [[{eq,Tmp,true},Zero],['_',One]]}];
+per_enc_optional(Val0, Pos, _Aligned) when is_integer(Pos) ->
+    {B,Val} = enc_element(Pos, Val0),
+    Zero = {put_bits,0,1,[1]},
+    One = {put_bits,1,1,[1]},
+    B++[{'cond',[[{eq,Val,asn1_NOVALUE},Zero],
+		 ['_',One]]}].
+
+per_enc_sof(Val0, Constraint, ElementVar, ElementImm, Aligned) ->
+    {B,[Val,Len]} = mk_vars(Val0, [len]),
+    SzConstraint = effective_constraint(bitstring, Constraint),
+    LenImm = enc_length(Len, SzConstraint, Aligned),
+    Lc0 = [{lc,ElementImm,{var,atom_to_list(ElementVar)},Val}],
+    Lc = opt_lc(Lc0, LenImm),
+    PreBlock = B ++ [{call,erlang,length,[Val],Len}],
+    case LenImm of
+	[{'cond',[[C|Action]]}] ->
+	    PreBlock ++ [{'cond',[[C|Action++Lc]]}];
+	[{sub,_,_,_}=Sub,{'cond',[[C|Action]]}] ->
+	    PreBlock ++
+		[Sub,{'cond',[[C|Action++Lc]]}];
+	EncLen ->
+	    PreBlock ++ EncLen ++ Lc
+    end.
+
+enc_absent(Val0, {call,M,F,A}, Body) ->
+    {B,[Var,Tmp]} = mk_vars(Val0, [tmp]),
+    B++[{call,M,F,[Var|A],Tmp},
+	{'cond',
+	 [[{eq,Tmp,true}],['_'|Body]]}];
+enc_absent(Val0, AbsVals, Body) when is_list(AbsVals) ->
+    {B,[Var]} = mk_vars(Val0, []),
+    Cs = [[{eq,Var,Aval}] || Aval <- AbsVals] ++ [['_'|Body]],
+    B++build_cond(Cs).
+
+enc_append([[]|T]) ->
+    enc_append(T);
+enc_append([[{put_bits,_,_,_}|_]=Pb|[Imm|T]=T0]) ->
+    case opt_choice(Pb++Imm) of
+	[{put_bits,_,_,_}|_] ->
+	    [{block,Pb}|enc_append(T0)];
+	Opt ->
+	    enc_append([Opt|T])
+    end;
+enc_append([Imm0|[Imm1|T]=T0]) ->
+    try combine_imms(Imm0, Imm1) of
+	Imm ->
+	    enc_append([Imm|T])
+    catch
+	throw:impossible ->
+	    [{block,Imm0}|enc_append(T0)]
+    end;
+enc_append([H|T]) ->
+    [{block,H}|enc_append(T)];
+enc_append([]) -> [].
+
+enc_element(N, Val0) ->
+    {[],[Val,Dst]} = mk_vars(Val0, [element]),
+    {[{call,erlang,element,[N,Val],Dst}],Dst}.
+
+enc_cg(Imm0, false) ->
+    Imm1 = enc_cse(Imm0),
+    Imm2 = enc_pre_cg(Imm1),
+    Imm = enc_opt(Imm2),
+    enc_cg(Imm);
+enc_cg(Imm0, true) ->
+    Imm1 = enc_cse(Imm0),
+    Imm2 = enc_hoist_align(Imm1),
+    Imm3 = enc_opt_al(Imm2),
+    Imm4 = per_fixup(Imm3),
+    Imm5 = enc_pre_cg(Imm4),
+    Imm = enc_opt(Imm5),
+    enc_cg(Imm).
 
 %%%
 %%% Local functions.
 %%%
 
-dec_string(Sv, U, Aligned0, AF) when is_integer(Sv) ->
+%% is_aligned(StringType, LowerBound, UpperBound) -> boolean()
+%%     StringType = 'OCTET STRING' | 'BIT STRING' | k_m_string
+%%     LowerBound = UpperBound = number of bits
+%%  Determine whether a string should be aligned in PER.
+
+is_aligned(T, Lb, Ub) when T =:= 'OCTET STRING'; T =:= 'BIT STRING' ->
+    %% OCTET STRINGs and BIT STRINGs are aligned to a byte boundary
+    %% unless the size is fixed and less than or equal to 16 bits.
+    Lb =/= Ub orelse Lb > 16;
+is_aligned(k_m_string, _Lb, Ub) ->
+    %% X.691 (07/2002) 27.5.7 says if the upper bound times the number
+    %% of bits is greater than or equal to 16, then the bit field should
+    %% be aligned.
+    Ub >= 16.
+
+%%%
+%%% Generating the intermediate format format for decoding.
+%%%
+
+dec_string(Sv, U, Aligned0, T) when is_integer(Sv) ->
     Bits = U*Sv,
-    Aligned = Aligned0 andalso AF(Bits, Bits),
+    Aligned = Aligned0 andalso is_aligned(T, Bits, Bits),
     {get_bits,Sv,[U,binary,{align,Aligned}]};
-dec_string({{Sv,Sv},[]}, U, Aligned, AF) ->
-    bit_case(dec_string(Sv, U, Aligned, AF),
-	     dec_string(no, U, Aligned, AF));
-dec_string({{_,_}=C,[]}, U, Aligned, AF) ->
-    bit_case(dec_string(C, U, Aligned, AF),
-	     dec_string(no, U, Aligned, AF));
-dec_string({Lb,Ub}, U, Aligned0, AF) ->
+dec_string({{Sv,Sv},[]}, U, Aligned, T) ->
+    bit_case(dec_string(Sv, U, Aligned, T),
+	     dec_string(no, U, Aligned, T));
+dec_string({{_,_}=C,[]}, U, Aligned, T) ->
+    bit_case(dec_string(C, U, Aligned, T),
+	     dec_string(no, U, Aligned, T));
+dec_string({Lb,Ub}, U, Aligned0, T) ->
     Len = per_dec_constrained(Lb, Ub, Aligned0),
-    Aligned = Aligned0 andalso AF(Lb*U, Ub*U),
+    Aligned = Aligned0 andalso is_aligned(T, Lb*U, Ub*U),
     {get_bits,Len,[U,binary,{align,Aligned}]};
-dec_string(_, U, Aligned, _AF) ->
+dec_string(_, U, Aligned, _T) ->
     Al = [{align,Aligned}],
     DecRest = fun(V, Buf) ->
 		      asn1ct_func:call(per_common,
@@ -608,6 +910,9 @@ dcg_list_outside([{call,Fun,{V,Buf},{Dst,DstBuf}}|T]) ->
     emit(["{",Dst,",",DstBuf,"}  = "]),
     Fun(V, Buf),
     iter_dcg_list_outside(T);
+dcg_list_outside([{convert,{M,F},V,Dst}|T]) ->
+    emit([Dst," = ",{asis,M},":",{asis,F},"(",V,")"]),
+    iter_dcg_list_outside(T);
 dcg_list_outside([{convert,Op,V,Dst}|T]) ->
     emit([Dst," = ",Op,"(",V,")"]),
     iter_dcg_list_outside(T);
@@ -692,6 +997,1680 @@ mk_dest(I) when is_integer(I) ->
     integer_to_list(I);
 mk_dest(S) -> S.
 
+%%%
+%%% Constructing the intermediate format for encoding.
+%%%
+
+split_off_nonbuilding(Imm) ->
+    lists:splitwith(fun is_nonbuilding/1, Imm).
+
+is_nonbuilding({assign,_,_}) -> true;
+is_nonbuilding({call,_,_,_,_}) -> true;
+is_nonbuilding({lc,_,_,_,_}) -> true;
+is_nonbuilding({set,_,_}) -> true;
+is_nonbuilding({list,_,_}) -> true;
+is_nonbuilding({sub,_,_,_}) -> true;
+is_nonbuilding({'try',_,_,_,_}) -> true;
+is_nonbuilding(_) -> false.
+
+mk_vars(Input0, Temps) ->
+    asn1ct_name:new(enc),
+    Curr = asn1ct_name:curr(enc),
+    [H|T] = atom_to_list(Curr),
+    Base = [H - ($a - $A)|T ++ "@"],
+    case Input0 of
+	{var,Name} when is_list(Name) ->
+	    {[],[Input0|mk_vars_1(Base, Temps)]};
+	[] ->
+	    {[],[Input0|mk_vars_1(Base, Temps)]};
+	_ when is_integer(Input0) ->
+	    {[],[Input0|mk_vars_1(Base, Temps)]}
+    end.
+
+mk_vars_1(Base, Vars) ->
+    [mk_var(Base, V) || V <- Vars].
+
+mk_var(Base, V) ->
+    {var,Base ++ atom_to_list(V)}.
+
+per_enc_integer_1(Val, [], Aligned) ->
+    [{'cond',[['_'|per_enc_unconstrained(Val, Aligned)]]}];
+per_enc_integer_1(Val, [{{'SingleValue',[_|_]=Svs}=Constr,[]}], Aligned) ->
+    %% An extensible constraint such as (1|17, ...).
+    %%
+    %% A subtle detail is that the extension root as described in the
+    %% ASN.1 spec should be used to determine whether a particular value
+    %% belongs to the extension root (as opposed to the effective
+    %% constraint, which will be used for the actual encoding).
+    %%
+    %% So for the example above, only the integers 1 and 17 should be
+    %% encoded as root values (extension bit = 0).
+
+    [{'ValueRange',{Lb,Ub}}] = effective_constraint(integer, [Constr]),
+    Root = [begin
+		{[],_,Put} = per_enc_constrained(Sv, Lb, Ub, Aligned),
+		[{eq,Val,Sv},{put_bits,0,1,[1]}|Put]
+	    end || Sv <- Svs],
+    Cs = Root ++ [['_',{put_bits,1,1,[1]}|
+		   per_enc_unconstrained(Val, Aligned)]],
+    build_cond(Cs);
+per_enc_integer_1(Val0, [{{_,_}=Constr,[]}], Aligned) ->
+    {Prefix,Check,Action} = per_enc_integer_2(Val0, Constr, Aligned),
+    Prefix++build_cond([[Check,{put_bits,0,1,[1]}|Action],
+			['_',{put_bits,1,1,[1]}|
+			 per_enc_unconstrained(Val0, Aligned)]]);
+per_enc_integer_1(Val0, [Constr], Aligned) ->
+    {Prefix,Check,Action} = per_enc_integer_2(Val0, Constr, Aligned),
+    Prefix++build_cond([[Check|Action],
+			['_',{error,Val0}]]).
+
+per_enc_integer_2(Val, {'SingleValue',Sv}, Aligned) when is_integer(Sv) ->
+    per_enc_constrained(Val, Sv, Sv, Aligned);
+per_enc_integer_2(Val0, {'ValueRange',{Lb,'MAX'}}, Aligned)
+  when is_integer(Lb) ->
+    {Prefix,Val} = sub_lb(Val0, Lb),
+    {Prefix,{ge,Val,0},per_enc_unsigned(Val, Aligned)};
+per_enc_integer_2(Val, {'ValueRange',{Lb,Ub}}, Aligned)
+  when is_integer(Lb), is_integer(Ub) ->
+    per_enc_constrained(Val, Lb, Ub, Aligned).
+
+per_enc_constrained(Val, Sv, Sv, _Aligned) ->
+    {[],{eq,Val,Sv},[]};
+per_enc_constrained(Val0, Lb, Ub, false) ->
+    {Prefix,Val} = sub_lb(Val0, Lb),
+    Range = Ub - Lb + 1,
+    NumBits = uper_num_bits(Range),
+    Check = {ult,Val,Range},
+    Put = [{put_bits,Val,NumBits,[1]}],
+    {Prefix,Check,Put};
+per_enc_constrained(Val0, Lb, Ub, true) ->
+    {Prefix,Val} = sub_lb(Val0, Lb),
+    Range = Ub - Lb + 1,
+    if
+	Range < 256 ->
+	    NumBits = per_num_bits(Range),
+	    Check = {ult,Val,Range},
+	    Put = [{put_bits,Val,NumBits,[1]}],
+	    {Prefix,Check,Put};
+	Range =:= 256 ->
+	    NumBits = 8,
+	    Check = {ult,Val,Range},
+	    Put = [{put_bits,Val,NumBits,[1,align]}],
+	    {Prefix,Check,Put};
+	Range =< 65536 ->
+	    Check = {ult,Val,Range},
+	    Put = [{put_bits,Val,16,[1,align]}],
+	    {Prefix,Check,Put};
+	true ->
+	    {var,VarBase} = Val,
+	    Bin = {var,VarBase++"@bin"},
+	    BinSize0 = {var,VarBase++"@bin_size0"},
+	    BinSize = {var,VarBase++"@bin_size"},
+	    Check = {ult,Val,Range},
+	    RangeOctsLen = byte_size(binary:encode_unsigned(Range - 1)),
+	    BitsNeeded = per_num_bits(RangeOctsLen),
+	    Enc = [{call,binary,encode_unsigned,[Val],Bin},
+		   {call,erlang,byte_size,[Bin],BinSize0},
+		   {sub,BinSize0,1,BinSize},
+		   {'cond',[['_',
+			     {put_bits,BinSize,BitsNeeded,[1]},
+			     {put_bits,Bin,binary,[8,align]}]]}],
+	    {Prefix,Check,Enc}
+    end.
+
+per_enc_unconstrained(Val, Aligned) ->
+    case Aligned of
+	false -> [];
+	true -> [{put_bits,0,0,[1,align]}]
+    end ++ [{call,per_common,encode_unconstrained_number,[Val]}].
+
+per_enc_unsigned(Val, Aligned) ->
+    case is_integer(Val) of
+	false ->
+	    {var,VarBase} = Val,
+	    Bin = {var,VarBase++"@bin"},
+	    BinSize = {var,VarBase++"@bin_size"},
+	    [{call,binary,encode_unsigned,[Val],Bin},
+	     {call,erlang,byte_size,[Bin],BinSize}|
+	     per_enc_length(Bin, 8, BinSize, Aligned)];
+	true ->
+	    Bin = binary:encode_unsigned(Val),
+	    Len = byte_size(Bin),
+	    per_enc_length(Bin, 8, Len, Aligned)
+    end.
+
+%% Encode a length field without any constraint.
+per_enc_length(Bin, Unit, Len, Aligned) ->
+    U = unit(1, Aligned),
+    PutBits = put_bits_binary(Bin, Unit, Aligned),
+    EncFragmented = {call,per_common,encode_fragmented,[Bin,Unit]},
+    Al = case Aligned of
+	     false -> [];
+	     true -> [{put_bits,0,0,[1,align]}]
+	 end,
+    build_cond([[{lt,Len,128},
+		 {put_bits,Len,8,U},PutBits],
+		[{lt,Len,16384},
+		 {put_bits,2,2,U},{put_bits,Len,14,[1]},PutBits],
+		['_'|Al++[EncFragmented]]]).
+
+per_enc_length(Bin, Unit, Len, no, Aligned, _Type) ->
+    per_enc_length(Bin, Unit, Len, Aligned);
+per_enc_length(Bin, Unit, Len, {{Lb,Ub},[]}, Aligned, Type) ->
+    {Prefix,Check,PutLen} = per_enc_constrained(Len, Lb, Ub, Aligned),
+    NoExt = {put_bits,0,1,[1]},
+    U = unit(Unit, Aligned, Type, Lb*Unit, Ub*Unit),
+    PutBits = [{put_bits,Bin,binary,U}],
+    [{'cond',ExtConds0}] = per_enc_length(Bin, Unit, Len, Aligned),
+    Ext = {put_bits,1,1,[1]},
+    ExtConds = prepend_to_cond(ExtConds0, Ext),
+    build_length_cond(Prefix, [[Check,NoExt|PutLen++PutBits]|ExtConds]);
+per_enc_length(Bin, Unit, Len, {Lb,Ub}, Aligned, Type)
+  when is_integer(Lb) ->
+    {Prefix,Check,PutLen} = per_enc_constrained(Len, Lb, Ub, Aligned),
+    U = unit(Unit, Aligned, Type, Lb*Unit, Ub*Unit),
+    PutBits = [{put_bits,Bin,binary,U}],
+    build_length_cond(Prefix, [[Check|PutLen++PutBits]]);
+per_enc_length(Bin, Unit0, Len, Sv, Aligned, Type) when is_integer(Sv) ->
+    NumBits = Sv*Unit0,
+    Unit = case NumBits rem 8 of
+	       0 ->
+		   %% Help out the alignment optimizer.
+		   8;
+	       _ ->
+		   Unit0
+	   end,
+    U = unit(Unit, Aligned, Type, NumBits, NumBits),
+    Pb = {put_bits,Bin,binary,U},
+    [{'cond',[[{eq,Len,Sv},Pb]]}].
+
+enc_length(Len, no, Aligned) ->
+    U = unit(1, Aligned),
+    build_cond([[{lt,Len,128},
+		 {put_bits,Len,8,U}],
+		[{lt,Len,16384},
+		 {put_bits,2,2,U},{put_bits,Len,14,[1]}]]);
+enc_length(Len, {{Lb,Ub},[]}, Aligned) ->
+    {Prefix,Check,PutLen} = per_enc_constrained(Len, Lb, Ub, Aligned),
+    NoExt = {put_bits,0,1,[1]},
+    [{'cond',ExtConds0}] = enc_length(Len, no, Aligned),
+    Ext = {put_bits,1,1,[1]},
+    ExtConds = prepend_to_cond(ExtConds0, Ext),
+    build_length_cond(Prefix, [[Check,NoExt|PutLen]|ExtConds]);
+enc_length(Len, {Lb,Ub}, Aligned) when is_integer(Lb) ->
+    {Prefix,Check,PutLen} = per_enc_constrained(Len, Lb, Ub, Aligned),
+    build_length_cond(Prefix, [[Check|PutLen]]);
+enc_length(Len, Sv, _Aligned) when is_integer(Sv) ->
+    [{'cond',[[{eq,Len,Sv}]]}].
+
+put_bits_binary(Bin, _Unit, Aligned) when is_binary(Bin) ->
+    Sz = byte_size(Bin),
+    <<Int:Sz/unit:8>> = Bin,
+    {put_bits,Int,8*Sz,unit(1, Aligned)};
+put_bits_binary(Bin, Unit, Aligned) ->
+    {put_bits,Bin,binary,unit(Unit, Aligned)}.
+
+sub_lb(Val, 0) ->
+    {[],Val};
+sub_lb({var,Var}=Val0, Lb) ->
+    Val = {var,Var++"@sub"},
+    {[{sub,Val0,Lb,Val}],Val};
+sub_lb(Val, Lb) when is_integer(Val) ->
+    {[],Val-Lb}.
+
+build_length_cond([{sub,Var0,Base,Var}]=Prefix, Cs) ->
+    %% Non-zero lower bound, such as: SIZE (50..200, ...)
+    Prefix++[{'cond',opt_length_nzlb(Cs, {Var0,Var,Base}, 0)}];
+build_length_cond([], Cs) ->
+    %% Zero lower bound, such as: SIZE (0..200, ...)
+    [{'cond',opt_length_zlb(Cs, 0)}].
+
+opt_length_zlb([[{ult,Var,Val}|Actions]|T], Ub) ->
+    %% Since the SIZE constraint is zero-based, Var
+    %% must be greater than zero, and we can use
+    %% the slightly cheaper signed less than operator.
+    opt_length_zlb([[{lt,Var,Val}|Actions]|T], Ub);
+opt_length_zlb([[{lt,_,Val}|_]=H|T], Ub) ->
+    if
+	Val =< Ub ->
+	    %% A previous test has already matched.
+	    opt_length_zlb(T, Ub);
+	true ->
+	    [H|opt_length_zlb(T, max(Ub, Val))]
+    end;
+opt_length_zlb([H|T], Ub) ->
+    [H|opt_length_zlb(T, Ub)];
+opt_length_zlb([], _) -> [].
+
+opt_length_nzlb([[{ult,Var,Val}|_]=H|T], {_,Var,Base}=St, _Ub) ->
+    [H|opt_length_nzlb(T, St, Base+Val)];
+opt_length_nzlb([[{lt,Var0,Val}|_]=H|T], {Var0,_,_}=St, Ub) ->
+    if
+	Val =< Ub ->
+	    %% A previous test has already matched.
+	    opt_length_nzlb(T, St, Ub);
+	true ->
+	    [H|opt_length_nzlb(T, St, Val)]
+    end;
+opt_length_nzlb([H|T], St, Ub) ->
+    [H|opt_length_nzlb(T, St, Ub)];
+opt_length_nzlb([], _, _) -> [].
+
+build_cond(Conds0) ->
+    case eval_cond(Conds0, gb_sets:empty()) of
+	[['_'|Actions]] ->
+	    Actions;
+	Conds ->
+	    [{'cond',Conds}]
+    end.
+
+eval_cond([['_',{'cond',Cs}]], Seen) ->
+    eval_cond(Cs, Seen);
+eval_cond([[Cond|Actions]=H|T], Seen0) ->
+    case gb_sets:is_element(Cond, Seen0) of
+	false ->
+	    Seen = gb_sets:insert(Cond, Seen0),
+	    case eval_cond_1(Cond) of
+		false ->
+		    eval_cond(T, Seen);
+		true ->
+		    [['_'|Actions]];
+		maybe ->
+		    [H|eval_cond(T, Seen)]
+	    end;
+	true ->
+	    eval_cond(T, Seen0)
+    end;
+eval_cond([], _) -> [].
+
+eval_cond_1({ult,I,N}) when is_integer(I), is_integer(N) ->
+    0 =< I andalso I < N;
+eval_cond_1({eq,[],[]}) ->
+    true;
+eval_cond_1({eq,I,N}) when is_integer(I), is_integer(N) ->
+    I =:= N;
+eval_cond_1({lt,I,N}) when is_integer(I), is_integer(N) ->
+    I < N;
+eval_cond_1(_) -> maybe.
+
+prepend_to_cond([H|T], Code) ->
+    [prepend_to_cond_1(H, Code)|prepend_to_cond(T, Code)];
+prepend_to_cond([], _) -> [].
+
+prepend_to_cond_1([Check|T], Code) ->
+    [Check,Code|T].
+
+enc_char_tab(notab) ->
+    notab;
+enc_char_tab(Tab0) ->
+    Tab = tuple_to_list(Tab0),
+    First = hd(Tab),
+    {First-1,list_to_tuple(enc_char_tab_1(Tab, First, 0))}.
+
+enc_char_tab_1([H|T], H, I) ->
+    [I|enc_char_tab_1(T, H+1, I+1)];
+enc_char_tab_1([_|_]=T, H, I) ->
+    [ill|enc_char_tab_1(T, H+1, I)];
+enc_char_tab_1([], _, _) -> [].
+
+enumerated_constraint([_]) ->
+    [{'SingleValue',0}];
+enumerated_constraint(Root) ->
+    [{'ValueRange',{0,length(Root)-1}}].
+
+per_enc_enumerated_root(NNL, Prefix, Val, Constr, Aligned) ->
+    per_enc_enumerated_root_1(NNL, Prefix, Val, Constr, Aligned, 0).
+
+per_enc_enumerated_root_1([{H,_}|T], Prefix, Val, Constr, Aligned, N) ->
+    [[{eq,Val,H}|Prefix++per_enc_integer_1(N, Constr, Aligned)]|
+     per_enc_enumerated_root_1(T, Prefix, Val, Constr, Aligned, N+1)];
+per_enc_enumerated_root_1([], _, _, _, _, _) -> [].
+
+per_enc_enumerated_ext(NNL, Val, Aligned) ->
+    per_enc_enumerated_ext_1(NNL, Val, Aligned, 0).
+
+per_enc_enumerated_ext_1([{H,_}|T], Val, Aligned, N) ->
+    [[{eq,Val,H},{put_bits,1,1,[1]}|per_enc_small_number(N, Aligned)]|
+     per_enc_enumerated_ext_1(T, Val, Aligned, N+1)];
+per_enc_enumerated_ext_1([], _, _, _) -> [].
+
+per_enc_small_length(Val0, Aligned) ->
+    {Sub,Val} = sub_lb(Val0, 1),
+    U = unit(1, Aligned),
+    Sub ++ build_cond([[{lt,Val,64},{put_bits,Val,7,[1]}],
+		       [{lt,Val0,128},{put_bits,1,1,[1]},
+			{put_bits,Val0,8,U}],
+		       ['_',{put_bits,1,1,[1]},
+			{put_bits,2,2,U},{put_bits,Val0,14,[1]}]]).
+
+constr_min_size(no) -> no;
+constr_min_size({{Lb,_},[]}) when is_integer(Lb) -> Lb;
+constr_min_size({Lb,_}) when is_integer(Lb) -> Lb;
+constr_min_size(Sv) when is_integer(Sv) -> Sv.
+
+enc_mod(false) -> uper;
+enc_mod(true) -> per.
+
+unit(U, false) -> [U];
+unit(U, true) -> [U,align].
+
+unit(U, Aligned, Type, Lb, Ub) ->
+    case Aligned andalso is_aligned(Type, Lb, Ub) of
+	true -> [U,align];
+	false -> [U]
+    end.
+
+opt_choice(Imm) ->
+    {Pb,T0} = lists:splitwith(fun({put_bits,V,_,_}) when is_integer(V) ->
+				      true;
+				 (_) ->
+				      false
+			      end, Imm),
+    try
+	{Prefix,T} = split_off_nonbuilding(T0),
+	Prefix ++ opt_choice_1(T, Pb)
+    catch
+	throw:impossible ->
+	    Imm
+    end.
+
+opt_choice_1([{'cond',Cs0}], Pb) ->
+    case Cs0 of
+	[[C|Act]] ->
+	    [{'cond',[[C|Pb++Act]]}];
+	[[C|Act],['_',{error,_}]=Error] ->
+	    [{'cond',[[C|Pb++Act],Error]}];
+	_ ->
+	    [{'cond',opt_choice_2(Cs0, Pb)}]
+    end;
+opt_choice_1(_, _) -> throw(impossible).
+
+opt_choice_2([[C|[{put_bits,_,_,_}|_]=Act]|T], Pb) ->
+    [[C|Pb++Act]|opt_choice_2(T, Pb)];
+opt_choice_2([[_,{error,_}]=H|T], Pb) ->
+    [H|opt_choice_2(T, Pb)];
+opt_choice_2([_|_], _) ->
+    throw(impossible);
+opt_choice_2([], _) -> [].
+
+%%%
+%%% Optimize list comprehensions (SEQUENCE OF/SET OF).
+%%%
+
+opt_lc([{lc,[{call,erlang,iolist_to_binary,[Var],Bin},
+	       {call,erlang,byte_size,[Bin],LenVar},
+	       {'cond',[[{eq,LenVar,Len},{put_bits,Bin,_,[_|Align]}]]}],
+	   Var,Val}]=Lc, LenImm) ->
+    %% Given a sequence of a fixed length string, such as
+    %% SEQUENCE OF OCTET STRING (SIZE (4)), attempt to rewrite to
+    %% a list comprehension that just checks the size, followed by
+    %% a conversion to binary:
+    %%
+    %%   _ = [if length(Comp) =:= 4; byte_size(Comp) =:= 4 -> [] end ||
+    %%           Comp <- Sof],
+    %%   [align|iolist_to_binary(Sof)]
+
+    CheckImm = [{'cond',[[{eq,{expr,"length("++mk_val(Var)++")"},Len}],
+			 [{eq,{expr,"byte_size("++mk_val(Var)++")"},Len}]]}],
+    Al = case Align of
+	     [] ->
+		 [];
+	     [align] ->
+		 [{put_bits,0,0,[1|Align]}]
+	 end,
+    case Al =:= [] orelse
+	is_end_aligned(LenImm) orelse
+	lb_is_nonzero(LenImm) of
+	false ->
+	    %% Not possible because an empty SEQUENCE OF would be
+	    %% improperly aligned. Example:
+	    %%
+	    %%    SEQUENCE (SIZE (0..3)) OF ...
+
+	    Lc;
+	true ->
+	    %% Examples:
+	    %%
+	    %% SEQUENCE (SIZE (1..4)) OF ...
+	    %%   (OK because there must be at least one element)
+	    %%
+	    %% SEQUENCE OF ...
+	    %%   (OK because the length field will force alignment)
+	    %%
+	    Al ++ [{lc,CheckImm,Var,Val,{var,"_"}},
+		   {call,erlang,iolist_to_binary,[Val]}]
+    end;
+opt_lc([{lc,ElementImm0,V,L}]=Lc, LenImm) ->
+    %% Attempt to hoist the alignment, putting after the length
+    %% and before the list comprehension:
+    %%
+    %%   [Length,
+    %%    align,
+    %%    [Encode(Comp) || Comp <- Sof]]
+    %%
+
+    case enc_opt_al_1(ElementImm0, 0) of
+	{ElementImm,0} ->
+	    case is_end_aligned(LenImm) orelse
+		(is_beginning_aligned(ElementImm0) andalso
+		 lb_is_nonzero(LenImm)) of
+		false ->
+		    %% Examples:
+		    %%
+		    %% SEQUENCE (SIZE (0..3)) OF OCTET STRING
+		    %%   (An empty SEQUENCE OF would be improperly aligned)
+		    %%
+		    %% SEQUENCE (SIZE (1..3)) OF OCTET STRING (SIZE (0..4))
+		    %%   (There would be an improper alignment before the
+		    %%   first element)
+
+		    Lc;
+		true ->
+		    %% Examples:
+		    %%
+		    %% SEQUENCE OF INTEGER
+		    %% SEQUENCE (SIZE (1..4)) OF INTEGER
+		    %% SEQUENCE (SIZE (1..4)) OF INTEGER (0..256)
+
+		    [{put_bits,0,0,[1,align]},{lc,ElementImm,V,L}]
+	    end;
+	_ ->
+	    %% Unknown alignment, no alignment, or not aligned at the end.
+	    %% Examples:
+	    %%
+	    %% SEQUENCE OF SomeConstructedType
+	    %% SEQUENCE OF INTEGER (0..15)
+
+	    Lc
+    end.
+
+is_beginning_aligned([{'cond',Cs}]) ->
+    lists:all(fun([_|Act]) -> is_beginning_aligned(Act) end, Cs);
+is_beginning_aligned([{error,_}|_]) -> true;
+is_beginning_aligned([{put_bits,_,_,U}|_]) ->
+    case U of
+	[_,align] -> true;
+	[_] -> false
+    end;
+is_beginning_aligned(Imm0) ->
+    case split_off_nonbuilding(Imm0) of
+	{[],_} -> false;
+	{[_|_],Imm} -> is_beginning_aligned(Imm)
+    end.
+
+is_end_aligned(Imm) ->
+    case enc_opt_al_1(Imm, unknown) of
+	{_,0} -> true;
+	{_,_} -> false
+    end.
+
+lb_is_nonzero([{sub,_,_,_}|_]) -> true;
+lb_is_nonzero(_) -> false.
+
+%%%
+%%% Attempt to combine two chunks of intermediate code.
+%%%
+
+combine_imms(ImmA0, ImmB0) ->
+    {Prefix0,ImmA} = split_off_nonbuilding(ImmA0),
+    {Prefix1,ImmB} = split_off_nonbuilding(ImmB0),
+    Prefix = Prefix0 ++ Prefix1,
+    Combined = do_combine(ImmA ++ ImmB, 3.0),
+    Prefix ++ Combined.
+
+do_combine([{error,_}=Imm|_], _Budget) ->
+    [Imm];
+do_combine([{'cond',Cs0}|T], Budget0) ->
+    Budget = debit(Budget0, num_clauses(Cs0, 0)),
+    Cs = [[C|do_combine(Act++T, Budget)] || [C|Act] <- Cs0],
+    [{'cond',Cs}];
+do_combine([{put_bits,V,_,_}|_]=L, Budget) when is_integer(V) ->
+    {Pb,T} = collect_put_bits(L),
+    do_combine_put_bits(Pb, T,Budget);
+do_combine(_, _) ->
+    throw(impossible).
+
+do_combine_put_bits(Pb, [], _Budget) ->
+    Pb;
+do_combine_put_bits(Pb, [{'cond',Cs0}|T], Budget) ->
+    Cs = [case Act of
+	      [{error,_}] ->
+		  [C|Act];
+	      _ ->
+		  [C|do_combine(Pb++Act, Budget)]
+	  end || [C|Act] <- Cs0],
+    do_combine([{'cond',Cs}|T], Budget);
+do_combine_put_bits(_, _, _) ->
+    throw(impossible).
+
+debit(Budget0, Alternatives) ->
+    case Budget0 - log2(Alternatives) of
+	Budget when Budget > 0.0 ->
+	    Budget;
+	_ ->
+	    throw(impossible)
+    end.
+
+num_clauses([[_,{error,_}]|T], N) ->
+    num_clauses(T, N);
+num_clauses([_|T], N) ->
+    num_clauses(T, N+1);
+num_clauses([], N) -> N.
+
+log2(N) ->
+    math:log(N) / math:log(2.0).
+
+collect_put_bits(Imm) ->
+    lists:splitwith(fun({put_bits,V,_,_}) when is_integer(V) -> true;
+		       (_) -> false
+		    end, Imm).
+
+%%%
+%%% Simple common subexpression elimination to avoid fetching
+%%% the same element twice.
+%%%
+
+enc_cse([{call,erlang,element,Args,V}=H|T]) ->
+    [H|enc_cse_1(T, Args, V)];
+enc_cse(Imm) -> Imm.
+
+enc_cse_1([{call,erlang,element,Args,Dst}|T], Args, V) ->
+    [{set,V,Dst}|enc_cse_1(T, Args, V)];
+enc_cse_1([{block,Bl}|T], Args, V) ->
+    [{block,enc_cse_1(Bl, Args, V)}|enc_cse_1(T, Args, V)];
+enc_cse_1([H|T], Args, V) ->
+    [H|enc_cse_1(T, Args, V)];
+enc_cse_1([], _, _) -> [].
+
+
+%%%
+%%% Pre-process the intermediate code to simplify code generation.
+%%%
+
+enc_pre_cg(Imm) ->
+    enc_pre_cg_1(Imm, outside_list, in_seq).
+
+enc_pre_cg_1([], _StL, _StB) ->
+    nil;
+enc_pre_cg_1([H], StL, StB) ->
+    enc_pre_cg_2(H, StL, StB);
+enc_pre_cg_1([H0|T0], StL, StB) ->
+    case is_nonbuilding(H0) of
+	true ->
+	    H = enc_pre_cg_nonbuilding(H0, StL),
+	    Seq = {seq,H,enc_pre_cg_1(T0, StL, in_seq)},
+	    case StB of
+		outside_seq -> {block,Seq};
+		in_seq -> Seq
+	    end;
+	false ->
+	    H = enc_pre_cg_2(H0, in_head, outside_seq),
+	    T = enc_pre_cg_1(T0, in_tail, outside_seq),
+	    enc_make_cons(H, T)
+    end.
+
+enc_pre_cg_2(align, StL, _StB) ->
+    case StL of
+	in_head -> align;
+	in_tail -> {cons,align,nil}
+    end;
+enc_pre_cg_2({apply,_,_}=Imm, _, _) ->
+    Imm;
+enc_pre_cg_2({block,Bl0}, StL, StB) ->
+    enc_pre_cg_1(Bl0, StL, StB);
+enc_pre_cg_2({call,_,_,_}=Imm, _, _) ->
+    Imm;
+enc_pre_cg_2({call_gen,_,_,_,_,_}=Imm, _, _) ->
+    Imm;
+enc_pre_cg_2({'cond',Cs0}, StL, _StB) ->
+    Cs = [{C,enc_pre_cg_1(Act, StL, outside_seq)} || [C|Act] <- Cs0],
+    {'cond',Cs};
+enc_pre_cg_2({error,_}=E, _, _) ->
+    E;
+enc_pre_cg_2({lc,B0,V,L}, StL, _StB) ->
+    B = enc_pre_cg_1(B0, StL, outside_seq),
+    {lc,B,V,L};
+enc_pre_cg_2({put_bits,V,8,[1]}, StL, _StB) ->
+    case StL of
+	in_head -> {integer,V};
+	in_tail -> {cons,{integer,V},nil};
+	outside_list -> {cons,{integer,V},nil}
+    end;
+enc_pre_cg_2({put_bits,V,binary,_}, _StL, _StB) ->
+    V;
+enc_pre_cg_2({put_bits,_,_,[_]}=PutBits, _StL, _StB) ->
+    {binary,[PutBits]};
+enc_pre_cg_2({var,_}=Imm, _, _) -> Imm.
+
+enc_make_cons({binary,H}, {binary,T}) ->
+    {binary,H++T};
+enc_make_cons({binary,H0}, {cons,{binary,H1},T}) ->
+    enc_make_cons({binary,H0++H1}, T);
+enc_make_cons({binary,H}, {cons,{integer,Int},T}) ->
+    enc_make_cons({binary,H++[{put_bits,Int,8,[1]}]}, T);
+enc_make_cons({integer,Int}, {binary,T}) ->
+    {binary,[{put_bits,Int,8,[1]}|T]};
+enc_make_cons({integer,Int}, {cons,{binary,H},T}) ->
+    enc_make_cons({binary,[{put_bits,Int,8,[1]}|H]}, T);
+enc_make_cons(H, T) ->
+    {cons,H,T}.
+
+enc_pre_cg_nonbuilding({lc,B0,Var,List,Dst}, StL) ->
+    B = enc_pre_cg_1(B0, StL, outside_seq),
+    {lc,B,Var,List,Dst};
+enc_pre_cg_nonbuilding({list,List0,Dst}, _StL) ->
+    List = enc_pre_cg_1(List0, outside_list, outside_seq),
+    {list,List,Dst};
+enc_pre_cg_nonbuilding({'try',Try0,{P,Succ0},Else0,Dst}, StL) ->
+    Try = enc_pre_cg_1(Try0, StL, outside_seq),
+    Succ = enc_pre_cg_1(Succ0, StL, outside_seq),
+    Else = enc_pre_cg_1(Else0, StL, outside_seq),
+    {'try',Try,{P,Succ},Else,Dst};
+enc_pre_cg_nonbuilding(Imm, _) -> Imm.
+
+%%%
+%%% Optimize calls to complete/1 and surrounding code. There are
+%%% several opportunities for optimizations.
+%%%
+%%% It may be possible to replace the call to complete/1 with
+%%% something cheaper (most important for the PER back-end which has
+%%% an expensive complete/1 implementation). If we can be sure that
+%%% complete/1 will be called with an iolist (no 'align' atoms or
+%%% bitstrings in the list), we can call iolist_to_binary/1
+%%% instead. If the list may include bitstrings, we can can call
+%%% list_to_bitstring/1 (note that list_to_bitstring/1 does not accept
+%%% a binary or bitstring, so we MUST be sure that we only pass it a
+%%% list).  If complete/1 is called with a binary, we can omit the
+%%% call altogether.
+%%%
+%%% A call to byte_size/1 that follows complete/1 can be eliminated
+%%% if the size of the binary produced by complete/1 can be determined
+%%% and is constant.
+%%%
+%%% The code that encodes the length descriptor (a 'cond' instruction)
+%%% for a binary produced by complete/1 can be simplified if the lower
+%%% and upper bounds for the size of the binary are known.
+%%%
+
+-record(ost,
+	{sym,
+	 t
+	}).
+
+enc_opt(Imm0) ->
+    {Imm,_} = enc_opt(Imm0, #ost{sym=gb_trees:empty()}),
+    Imm.
+
+enc_opt(align, St) ->
+    {align,St#ost{t=t_align({0,7})}};
+enc_opt({apply,What,As}, St) ->
+    {{apply,What,subst_list(As, St)},St#ost{t=t_any()}};
+enc_opt({assign,_,_}=Imm, St) ->
+    {Imm,St};
+enc_opt({binary,PutBits0}, St) ->
+    PutBits = [{put_bits,subst(V, St),Sz,F} ||
+		  {put_bits,V,Sz,F} <- PutBits0],
+    NumBits = lists:foldl(fun({put_bits,_,Bits,_}, Sum) ->
+				  Sum+Bits
+			  end, 0, PutBits),
+    {{binary,PutBits},St#ost{t=t_bitstring(NumBits)}};
+enc_opt({block,Bl0}, St0) ->
+    {Bl,St} = enc_opt(Bl0, St0),
+    {{block,Bl},St};
+enc_opt({call,binary,encode_unsigned,[Int],Bin}=Imm, St0) ->
+    Type = get_type(Int, St0),
+    St = case t_range(Type) of
+	     any ->
+		 set_type(Bin, t_binary(), St0);
+	     {Lb0,Ub0} ->
+		 Lb = bit_size(binary:encode_unsigned(Lb0)),
+		 Ub = bit_size(binary:encode_unsigned(Ub0)),
+		 set_type(Bin, t_binary({Lb,Ub}), St0)
+	 end,
+    {Imm,St};
+enc_opt({call,erlang,bit_size,[Bin],Dst}=Imm0, St0) ->
+    Type = get_type(Bin, St0),
+    case t_range(Type) of
+	any ->
+	    St1 = set_type(Bin, t_bitstring(), St0),
+	    St = propagate(Dst,
+			   fun(T, S) ->
+				   bit_size_propagate(Bin, T, S)
+			   end, St1),
+	    {Imm0,St};
+	{Lb,Ub}=Range ->
+	    St = set_type(Dst, t_integer(Range), St0),
+	    Imm = case Lb of
+		      Ub -> none;
+		      _ -> Imm0
+		  end,
+	    {Imm,St}
+    end;
+enc_opt({call,erlang,byte_size,[Bin],Dst}=Imm0, St0) ->
+    Type = get_type(Bin, St0),
+    case t_range(Type) of
+	any ->
+	    St1 = set_type(Bin, t_binary(), St0),
+	    St = propagate(Dst,
+			   fun(T, S) ->
+				   byte_size_propagate(Bin, T, S)
+			   end, St1),
+	    {Imm0,St};
+	{Lb0,Ub0} ->
+	    Lb = (Lb0+7) div 8,
+	    Ub = (Ub0+7) div 8,
+	    St = set_type(Dst, t_integer({Lb,Ub}), St0),
+	    Imm = case Lb of
+		      Ub -> none;
+		      _ -> Imm0
+		  end,
+	    {Imm,St}
+    end;
+enc_opt({call,erlang,iolist_to_binary,_}=Imm, St) ->
+    {Imm,St#ost{t=t_binary()}};
+enc_opt({call,erlang,length,[List],Dst}=Imm0, St0) ->
+    St1 = propagate(Dst,
+		    fun(T, S) ->
+			    length_propagate(List, T, S)
+		    end, St0),
+    {Imm0,St1};
+enc_opt({call,per,complete,[Data],Dst}, St0) ->
+    Type = get_type(Data, St0),
+    St = set_type(Dst, t_binary(t_range(Type)), St0),
+    case t_type(Type) of
+	binary ->
+	    {{set,Data,Dst},St};
+	bitlist ->
+	    %% We KNOW that list_to_bitstring/1 will construct
+	    %% a binary (the number of bits is divisible by 8)
+	    %% because per_enc_open_type/2 added an 'align' atom
+	    %% at the end. If that 'align' atom had not been
+	    %% optimized away, the type would have been 'align'
+	    %% instead of 'bitlist'.
+	    {{call,erlang,list_to_bitstring,[Data],Dst},St};
+	iolist ->
+	    {{call,erlang,iolist_to_binary,[Data],Dst},St};
+	nil ->
+	    Imm = {list,{binary,[{put_bits,0,8,[1]}]},Dst},
+	    enc_opt(Imm, St0);
+	_ ->
+	    {{call,per,complete,[Data],Dst},St}
+    end;
+enc_opt({call,uper,complete,[Data],Dst}, St0) ->
+    Type = get_type(Data, St0),
+    St = set_type(Dst, t_binary(t_range(Type)), St0),
+    case t_type(Type) of
+	binary ->
+	    {{set,Data,Dst},St0};
+	iolist ->
+	    {{call,erlang,iolist_to_binary,[Data],Dst},St};
+	nil ->
+	    Imm = {list,{binary,[{put_bits,0,8,[1]}]},Dst},
+	    enc_opt(Imm, St0);
+	_ ->
+	    %% 'bitlist' or 'any'.
+	    {{call,uper,complete,[Data],Dst},St}
+    end;
+enc_opt({call,per_common,encode_chars,[List,NumBits|_],Dst}=Imm, St0) ->
+    %% Note: Never used when NumBits =:= 8 (list_to_binary/1 will
+    %% be used instead).
+    St1 = set_type(Dst, t_bitstring(), St0),
+    St = propagate(List,
+		   fun(T, S) ->
+			   char_propagate(Dst, T, NumBits, S)
+		   end, St1),
+    {Imm,St};
+enc_opt({call,per_common,encode_chars_16bit,[List],Dst}=Imm, St0) ->
+    St1 = set_type(Dst, t_binary(), St0),
+    St = propagate(List,
+		   fun(T, S) ->
+			   char_propagate(Dst, T, 16, S)
+		   end, St1),
+    {Imm,St};
+enc_opt({call,per_common,encode_big_chars,[List],Dst}=Imm, St0) ->
+    St1 = set_type(Dst, t_binary(), St0),
+    St = propagate(List,
+		   fun(T, S) ->
+			   char_propagate(Dst, T, 32, S)
+		   end, St1),
+    {Imm,St};
+enc_opt({call,per_common,encode_fragmented,[_,Unit]}=Imm, St) ->
+    T = case Unit rem 8 of
+	    0 -> t_iolist();
+	    _ -> t_bitlist()
+	end,
+    {Imm,St#ost{t=T}};
+enc_opt({call,per_common,encode_unconstrained_number,_}=Imm, St) ->
+    {Imm,St#ost{t=t_iolist()}};
+enc_opt({call,per_common,bitstring_from_positions,_}=Imm, St) ->
+    {Imm,St#ost{t=t_bitstring()}};
+enc_opt({call,per_common,to_named_bitstring,_}=Imm, St) ->
+    {Imm,St#ost{t=t_bitstring()}};
+enc_opt({call,_,_,_}=Imm, St) ->
+    {Imm,St#ost{t=t_any()}};
+enc_opt({call,_,_,_,_}=Imm, St) ->
+    {Imm,St#ost{t=undefined}};
+enc_opt({call_gen,N,K,F,L,As}, St) ->
+    {{call_gen,N,K,F,L,subst(As, St)},St#ost{t=t_any()}};
+enc_opt({'cond',Cs0}, St0) ->
+    case enc_opt_cs(Cs0, St0) of
+	[{'_',Imm,Type}] ->
+	    {Imm,St0#ost{t=Type}};
+	[{Cond,Imm,Type0}|Cs1] ->
+	    {Cs,Type} = enc_opt_cond_1(Cs1, Type0, [{Cond,Imm}]),
+	    {{'cond',Cs},St0#ost{t=Type}}
+    end;
+enc_opt({cons,H0,T0}, St0) ->
+    {H,#ost{t=TypeH}=St1} = enc_opt(H0, St0),
+    {T,#ost{t=TypeT}=St} = enc_opt(T0, St1),
+    {{cons,H,T},St#ost{t=t_cons(TypeH, TypeT)}};
+enc_opt({error,_}=Imm, St) ->
+    {Imm,St#ost{t=t_any()}};
+enc_opt({integer,V}, St) ->
+    {{integer,subst(V, St)},St#ost{t=t_integer()}};
+enc_opt({lc,E0,B,C}, St) ->
+    {E,_} = enc_opt(E0, St),
+    {{lc,E,B,C},St#ost{t=t_any()}};
+enc_opt({lc,E0,B,C,Dst}, St) ->
+    {E,_} = enc_opt(E0, St),
+    {{lc,E,B,C,Dst},St#ost{t=undefined}};
+enc_opt({list,Imm0,Dst}, St0) ->
+    {Imm,#ost{t=Type}=St1} = enc_opt(Imm0, St0),
+    St = set_type(Dst, Type, St1),
+    {{list,Imm,Dst},St#ost{t=undefined}};
+enc_opt(nil, St) ->
+    {nil,St#ost{t=t_nil()}};
+enc_opt({seq,H0,T0}, St0) ->
+    {H,St1} = enc_opt(H0, St0),
+    {T,St} = enc_opt(T0, St1),
+    case {H,T} of
+	{none,_} ->
+	    {T,St};
+	{{list,Imm,Data},
+	 {seq,{call,per,complete,[Data],_},_}} ->
+	    %% Get rid of any explicit 'align' added by per_enc_open_type/2.
+	    {{seq,{list,remove_trailing_align(Imm),Data},T},St};
+	{_,_} ->
+	    {{seq,H,T},St}
+    end;
+enc_opt({set,_,_}=Imm, St) ->
+    {Imm,St#ost{t=undefined}};
+enc_opt({sub,Src0,Int,Dst}, St0) ->
+    Src = subst(Src0, St0),
+    Type = get_type(Src, St0),
+    St = case t_range(Type) of
+	     any ->
+		 propagate(Dst,
+			   fun(T, S) ->
+				   set_type(Src, t_add(T, Int), S)
+			   end,
+			   St0);
+	     {Lb,Ub} ->
+		 set_type(Dst, t_integer({Lb-Int,Ub-Int}), St0)
+	 end,
+    {{sub,Src,Int,Dst},St#ost{t=undefined}};
+enc_opt({'try',Try0,{P,Succ0},Else0,Dst}, St0) ->
+    {Try,_} = enc_opt(Try0, St0),
+    {Succ,_} = enc_opt(Succ0, St0),
+    {Else,_} = enc_opt(Else0, St0),
+    {{'try',Try,{P,Succ},Else,Dst},St0#ost{t=undefined}};
+enc_opt({var,_}=Imm, St) ->
+    Type = get_type(Imm, St),
+    {subst(Imm, St),St#ost{t=Type}}.
+
+remove_trailing_align({block,Bl}) ->
+    {block,remove_trailing_align(Bl)};
+remove_trailing_align({cons,H,{cons,align,nil}}) ->
+    H;
+remove_trailing_align({seq,H,T}) ->
+    {seq,H,remove_trailing_align(T)};
+remove_trailing_align(Imm) -> Imm.
+
+bit_size_propagate(Bin, Type, St) ->
+    case t_range(Type) of
+	any ->
+	    St;
+	{Lb,Ub} ->
+	    set_type(Bin, t_bitstring({Lb,Ub}), St)
+    end.
+
+byte_size_propagate(Bin, Type, St) ->
+    case t_range(Type) of
+	any ->
+	    St;
+	{Lb,Ub} ->
+	    set_type(Bin, t_binary({Lb*8,Ub*8}), St)
+    end.
+
+char_propagate(Dst, T, NumBits, St) ->
+    case t_range(T) of
+	any ->
+	    St;
+	{Sz,Sz} when Sz*NumBits rem 8 =:= 0 ->
+	    Bits = Sz*NumBits,
+	    set_type(Dst, t_binary({Bits,Bits}), St);
+	{Lb,Ub} ->
+	    Range = {Lb*NumBits,Ub*NumBits},
+	    case NumBits rem 8 of
+		0 ->
+		    set_type(Dst, t_binary(Range), St);
+		_ ->
+		    set_type(Dst, t_bitstring(Range), St)
+	    end
+    end.
+
+length_propagate(List, Type, St) ->
+    set_type(List, t_list(t_range(Type)), St).
+
+enc_opt_cond_1([{Cond,{error,_}=Imm,_}|T], St, Acc) ->
+    enc_opt_cond_1(T, St, [{Cond,Imm}|Acc]);
+enc_opt_cond_1([{Cond,Imm,Curr0}|T], Curr1, Acc) ->
+    Curr = t_join(Curr0, Curr1),
+    enc_opt_cond_1(T, Curr, [{Cond,Imm}|Acc]);
+enc_opt_cond_1([], St, Acc) ->
+    {lists:reverse(Acc),St}.
+
+enc_opt_cs([{Cond,Imm0}|T], St0) ->
+    case eo_eval_cond(Cond, St0) of
+	false ->
+	    enc_opt_cs(T, St0);
+	true ->
+	    {Imm,#ost{t=Type}} = enc_opt(Imm0, St0),
+	    [{'_',Imm,Type}];
+	maybe ->
+	    St = update_type_info(Cond, St0),
+	    {Imm,#ost{t=Type}} = enc_opt(Imm0, St),
+	    [{Cond,Imm,Type}|enc_opt_cs(T, St0)]
+    end;
+enc_opt_cs([], _) -> [].
+
+eo_eval_cond('_', _) ->
+    true;
+eo_eval_cond({Op,{var,_}=Var,Val}, St) ->
+    Type = get_type(Var, St),
+    case t_range(Type) of
+	any -> maybe;
+	{_,_}=Range -> eval_cond_range(Op, Range, Val)
+    end;
+eo_eval_cond({_Op,{expr,_},_Val}, _St) -> maybe.
+
+eval_cond_range(lt, {Lb,Ub}, Val) ->
+    if
+	Ub < Val -> true;
+	Val =< Lb -> false;
+	true -> maybe
+    end;
+eval_cond_range(_Op, _Range, _Val) -> maybe.
+
+update_type_info({ult,{var,_}=Var,Val}, St) ->
+    Int = t_integer({0,Val-1}),
+    Type = t_meet(get_type(Var, St), Int),
+    set_type(Var, Type, St);
+update_type_info({lt,{var,_}=Var,Val}, St) ->
+    Int = t_integer({0,Val-1}),
+    Type = t_meet(get_type(Var, St), Int),
+    set_type(Var, Type, St);
+update_type_info({eq,{var,_}=Var,Val}, St) when is_integer(Val) ->
+    Int = t_integer(Val),
+    Type = t_meet(get_type(Var, St), Int),
+    set_type(Var, Type, St);
+update_type_info({eq,_,_}, St) ->
+    St;
+update_type_info({ge,_,_}, St) -> St.
+
+subst_list(As, St) ->
+    [subst(A, St) || A <- As].
+
+subst({var,_}=Var, St) ->
+    Type = get_type(Var, St),
+    case t_type(Type) of
+	integer ->
+	    case t_range(Type) of
+		any -> Var;
+		{Val,Val} -> Val;
+		{_,_} -> Var
+	    end;
+	_ ->
+	    Var
+    end;
+subst(V, _St) -> V.
+
+set_type({var,Var}, {_,_}=Type, #ost{sym=Sym0}=St0) ->
+    Sym1 = gb_trees:enter(Var, Type, Sym0),
+    case gb_trees:lookup({propagate,Var}, Sym1) of
+	none ->
+	    St0#ost{sym=Sym1};
+	{value,Propagate} ->
+	    Sym = gb_trees:delete({propagate,Var}, Sym1),
+	    St = St0#ost{sym=Sym},
+	    Propagate(Type, St)
+    end.
+
+get_type({var,V}, #ost{sym=Sym}) ->
+    case gb_trees:lookup(V, Sym) of
+	none -> t_any();
+	{value,T} -> T
+    end.
+
+propagate({var,Var}, Propagate, #ost{sym=Sym0}=St) when is_function(Propagate, 2) ->
+    Sym = gb_trees:enter({propagate,Var}, Propagate, Sym0),
+    St#ost{sym=Sym}.
+
+%%%
+%%% A simple type system.
+%%%
+%%% Each type descriptions is a tuple {Type,Range}.
+%%% Type is one of the following atoms:
+%%%
+%%% Type name   Description
+%%% ---------   -----------
+%%% any         Anything.
+%%%
+%%% align       Basically iodata, but the list may contain bitstrings
+%%%             and the the atom 'align'. Can be passed to complete/1
+%%%             to construct a binary. Only used for aligned PER (per).
+%%%
+%%% bitstring   An Erlang bitstring.
+%%%
+%%% bitlist     A list that may be passed to list_to_bitstring/1 to
+%%%             construct a bitstring.
+%%%             NOTE: When analysing aligned PER (per), the number
+%%%             of bits in the bitlist is always divisible by 8 (if
+%%%             not, the type will be 'align' instead).
+%%%
+%%% binary      An Erlang binary (the number of bits is divisible by 8).
+%%%
+%%% iolist      An Erlang iolist.
+%%%
+%%% nil         []
+%%%
+%%% integer     An integer.
+%%%
+%%%
+%%% Range is one of:
+%%%
+%%%     any
+%%%     {LowerBound,UpperBound}
+%%%
+%%%
+
+t_align(Range) ->
+    {align,t__range(Range)}.
+
+t_any() ->
+    {any,any}.
+
+t_binary() ->
+    {binary,any}.
+
+t_binary(Range) ->
+    {binary,t__range(Range)}.
+
+t_bitlist() ->
+    {bitlist,any}.
+
+t_bitstring() ->
+    {bitstring,any}.
+
+t_bitstring(Range0) ->
+    case t__range(Range0) of
+	{Bits,Bits}=Range when Bits rem 8 =:= 0 ->
+	    {binary,Range};
+	Range ->
+	    {bitstring,Range}
+    end.
+
+t_add({integer,{Lb,Ub}}, N) ->
+    {integer,{Lb+N,Ub+N}}.
+
+t_cons({_,_}=T1, {_,_}=T2) ->
+    T = case {t__cons_type(T1),t__cons_type(T2)} of
+	    {_,any} -> any;
+	    {any,_} -> any;
+	    {align,_} -> align;
+	    {_,align} -> align;
+	    {binary,binary} -> iolist;
+	    {binary,bitstring} -> bitlist;
+	    {bitstring,binary} -> bitlist;
+	    {bitstring,bitstring} -> bitlist
+	end,
+    {T,t__cons_ranges(t__cons_range(T1), t__cons_range(T2))}.
+
+t_integer() ->
+    {integer,any}.
+
+t_integer(Range) ->
+    {integer,t__range(Range)}.
+
+t_iolist() ->
+    {iolist,any}.
+
+t_list(Range) ->
+    {list,t__range(Range)}.
+
+t_nil() ->
+    {nil,{0,0}}.
+
+t_meet({T1,Range1}, {T2,Range2}) ->
+    {t_meet_types(T1, T2),t_meet_ranges(Range1, Range2)}.
+
+t_meet_types(integer, integer) -> integer;
+t_meet_types(any, integer) -> integer.
+
+t_meet_ranges(any, Range) ->
+    Range;
+t_meet_ranges({Lb1,Ub1}, {Lb2,Ub2}) ->
+    if
+	Lb1 =< Ub2, Lb2 =< Ub1 ->
+	    {max(Lb1, Lb2),Ub1};
+	Lb2 =< Ub1, Lb1 =< Ub2 ->
+	    {max(Lb1, Lb2),Ub2}
+    end.
+
+t_join({T1,Range1}, {T2,Range2}) ->
+    T = t_join_types(lists:sort([T1,T2])),
+    Range = t_join_ranges(Range1, Range2),
+    {T,Range}.
+
+t_join_ranges({Lb1,Ub1}, {Lb2,Ub2}) ->
+    {min(Lb1, Lb2),max(Ub1, Ub2)};
+t_join_ranges(any, _) -> any;
+t_join_ranges(_, any) -> any.
+
+t_join_types([T,T]) -> T;
+t_join_types([align,any]) -> any;
+t_join_types([align,_]) -> align;
+t_join_types([any,_]) -> any;
+t_join_types([bitlist,bitstring]) -> any;
+t_join_types([bitlist,integer]) -> any;
+t_join_types([bitlist,iolist]) -> bitlist;
+t_join_types([bitlist,nil]) -> bitlist;
+t_join_types([binary,bitlist]) -> bitlist;
+t_join_types([binary,bitstring]) -> bitstring;
+t_join_types([binary,integer]) -> binary;
+t_join_types([binary,iolist]) -> iolist;
+t_join_types([binary,nil]) -> iolist;
+t_join_types([bitstring,integer]) -> any;
+t_join_types([bitstring,iolist]) -> any;
+t_join_types([bitstring,nil]) -> any;
+t_join_types([integer,_]) -> any;
+t_join_types([iolist,nil]) -> iolist.
+
+t_type({T,_}) -> T.
+
+t_range({_,Range}) -> Range.
+
+t__cons_type({align,_}) -> align;
+t__cons_type({any,_}) -> any;
+t__cons_type({binary,_}) -> binary;
+t__cons_type({bitstring,_}) -> bitstring;
+t__cons_type({bitlist,_}) -> bitstring;
+t__cons_type({integer,_}) -> binary;
+t__cons_type({iolist,_}) -> binary;
+t__cons_type({nil,_}) -> binary.
+
+t__cons_range({integer,_}) -> {8,8};
+t__cons_range({_,Range}) -> Range.
+
+t__cons_ranges({Lb1,Ub1}, {Lb2,Ub2}) ->
+    {Lb1+Lb2,Ub1+Ub2};
+t__cons_ranges(any, _) -> any;
+t__cons_ranges(_, any) -> any.
+
+t__range({Lb,Ub}=Range) when is_integer(Lb), is_integer(Ub) ->
+    Range;
+t__range(any) ->
+    any;
+t__range(Val) when is_integer(Val) ->
+    {Val,Val}.
+
+
+%%%
+%%% Code generation for encoding.
+%%%
+
+enc_cg({cons,_,_}=Cons) ->
+    enc_cg_cons(Cons);
+enc_cg({block,Imm}) ->
+    emit(["begin",nl]),
+    enc_cg(Imm),
+    emit([nl,
+	  "end"]);
+enc_cg({seq,First,Then}) ->
+    enc_cg(First),
+    emit([com,nl]),
+    enc_cg(Then);
+enc_cg(align) ->
+    emit(align);
+enc_cg({apply,F0,As0}) ->
+    As = enc_call_args(As0, ""),
+    case F0 of
+	{local,F,_} when is_atom(F) ->
+	    emit([{asis,F},"(",As,")"]);
+	{M,F,_} ->
+	    emit([{asis,M},":",{asis,F},"(",As,")"])
+    end;
+enc_cg({assign,Dst0,Expr}) ->
+    Dst = mk_val(Dst0),
+    emit([Dst," = ",Expr]);
+enc_cg({binary,PutBits}) ->
+    emit(["<<",enc_cg_put_bits(PutBits, ""),">>"]);
+enc_cg({call,M,F,As0}) ->
+    As = [mk_val(A) || A <- As0],
+    asn1ct_func:call(M, F, As);
+enc_cg({call,M,F,As0,Dst}) ->
+    As = [mk_val(A) || A <- As0],
+    emit([mk_val(Dst)," = "]),
+    asn1ct_func:call(M, F, As);
+enc_cg({call_gen,Prefix,Key,Gen,_,As0}) ->
+    As = [mk_val(A) || A <- As0],
+    asn1ct_func:call_gen(Prefix, Key, Gen, As);
+enc_cg({'cond',Cs}) ->
+    enc_cg_cond(Cs);
+enc_cg({error,Error}) when is_function(Error, 0) ->
+    Error();
+enc_cg({error,Var0}) ->
+    Var = mk_val(Var0),
+    emit(["exit({error,{asn1,{illegal_value,",Var,"}}})"]);
+enc_cg({integer,Int}) ->
+    emit(mk_val(Int));
+enc_cg({lc,Body,Var,List}) ->
+    emit("["),
+    enc_cg(Body),
+    emit([" || ",mk_val(Var)," <- ",mk_val(List),"]"]);
+enc_cg({lc,Body,Var,List,Dst}) ->
+    emit([mk_val(Dst)," = ["]),
+    enc_cg(Body),
+    emit([" || ",mk_val(Var)," <- ",mk_val(List),"]"]);
+enc_cg({list,List,Dst}) ->
+    emit([mk_val(Dst)," = "]),
+    enc_cg(List);
+enc_cg(nil) ->
+    emit("[]");
+enc_cg({sub,Src0,Int,Dst0}) ->
+    Src = mk_val(Src0),
+    Dst = mk_val(Dst0),
+    emit([Dst," = ",Src," - ",Int]);
+enc_cg({set,{var,Src},{var,Dst}}) ->
+    emit([Dst," = ",Src]);
+enc_cg({'try',Try,{P,Succ},Else,Dst}) ->
+    emit([mk_val(Dst)," = try "]),
+    enc_cg(Try),
+    emit([" of",nl,
+	  mk_val(P)," ->",nl]),
+    enc_cg(Succ),
+    emit([nl,
+	  "catch throw:invalid ->",nl]),
+    enc_cg(Else),
+    emit([nl,
+	  "end"]);
+enc_cg({var,V}) ->
+    emit(V).
+
+enc_cg_cons(Cons) ->
+    emit("["),
+    enc_cg_cons_1(Cons),
+    emit("]").
+
+enc_cg_cons_1({cons,H,{cons,_,_}=T}) ->
+    enc_cg(H),
+    emit([com,nl]),
+    enc_cg_cons_1(T);
+enc_cg_cons_1({cons,H,nil}) ->
+    enc_cg(H);
+enc_cg_cons_1({cons,H,T}) ->
+    enc_cg(H),
+    emit("|"),
+    enc_cg(T).
+
+enc_call_args([A|As], Sep) ->
+    [Sep,mk_val(A)|enc_call_args(As, ", ")];
+enc_call_args([], _) -> [].
+
+enc_cg_cond(Cs) ->
+    emit("if "),
+    enc_cg_cond(Cs, ""),
+    emit([nl,
+	  "end"]).
+
+enc_cg_cond([C|Cs], Sep) ->
+    emit(Sep),
+    enc_cg_cond_1(C),
+    enc_cg_cond(Cs, [";",nl]);
+enc_cg_cond([], _) -> ok.
+
+enc_cg_cond_1({Cond,Action}) ->
+    enc_cond_term(Cond),
+    emit([" ->",nl]),
+    enc_cg(Action).
+
+enc_cond_term('_') ->
+    emit("true");
+enc_cond_term({ult,Var0,Int}) ->
+    Var = mk_val(Var0),
+    N = uper_num_bits(Int),
+    case 1 bsl N of
+	Int ->
+	    emit([Var," bsr ",N," =:= 0"]);
+	_ ->
+	    emit(["0 =< ",Var,", ",Var," < ",Int])
+    end;
+enc_cond_term({eq,Var0,Term}) ->
+    Var = mk_val(Var0),
+    emit([Var," =:= ",{asis,Term}]);
+enc_cond_term({ge,Var0,Int}) ->
+    Var = mk_val(Var0),
+    emit([Var," >= ",Int]);
+enc_cond_term({lt,Var0,Int}) ->
+    Var = mk_val(Var0),
+    emit([Var," < ",Int]).
+
+enc_cg_put_bits([{put_bits,Val0,N,[1]}|T], Sep) ->
+    Val = mk_val(Val0),
+    [[Sep,Val,":",integer_to_list(N)]|enc_cg_put_bits(T, ",")];
+enc_cg_put_bits([], _) -> [].
+
+mk_val({var,Str}) -> Str;
+mk_val({expr,Str}) -> Str;
+mk_val(Int) when is_integer(Int) -> integer_to_list(Int);
+mk_val(Other) -> {asis,Other}.
+
+%%%
+%%% Generate a function that maps a name of a bit position
+%%%  to the bit position.
+%%%
+
+bit_string_name2pos_fun(NNL, Src) ->
+    {call_gen,"bit_string_name2pos_",NNL,
+     fun(Fd, Name) -> gen_name2pos(Fd, Name, NNL) end,[],[Src]}.
+
+gen_name2pos(Fd, Name, Names) ->
+    Cs0 = gen_name2pos_cs(Names, Name),
+    Cs = Cs0 ++ [bit_clause(Name),nil_clause(),invalid_clause()],
+    F = {function,1,Name,1,Cs},
+    file:write(Fd, [erl_pp:function(F)]).
+
+gen_name2pos_cs([{K,V}|T], Name) ->
+    P = [{cons,0,{atom,0,K},{var,0,'T'}}],
+    B = [{cons,0,{integer,0,V},{call,0,{atom,0,Name},[{var,0,'T'}]}}],
+    [{clause,0,P,[],B}|gen_name2pos_cs(T, Name)];
+gen_name2pos_cs([], _) -> [].
+
+bit_clause(Name) ->
+    VarT = {var,0,'T'},
+    VarPos = {var,0,'Pos'},
+    P = [{cons,0,{tuple,0,[{atom,0,bit},VarPos]},VarT}],
+    G = [[{call,0,{atom,0,is_integer},[VarPos]}]],
+    B = [{cons,0,VarPos,{call,0,{atom,0,Name},[VarT]}}],
+    {clause,0,P,G,B}.
+
+nil_clause() ->
+    P = B = [{nil,0}],
+    {clause,0,P,[],B}.
+
+invalid_clause() ->
+    P = [{var,0,'_'}],
+    B = [{call,0,{atom,0,throw},[{atom,0,invalid}]}],
+    {clause,0,P,[],B}.
+
+%%%
+%%% Hoist alignment to reduce the number of list elements in
+%%% encode. Fewer lists elements means faster traversal in
+%%% complete/{2,3}.
+%%%
+%%% For example, the following data sequence:
+%%%
+%%%   [align,<<1:1,0:1>>,[align,<<Len:16>>|Data]]
+%%%
+%%% can be rewritten to:
+%%%
+%%%   [align,<<1:1,0:1,0:6>>,[<<Len:16>>|Data]]
+%%%
+%%% The change from the literal <<1:1,0:1>> to <<1:1,0:1,0:6>>
+%%% comes for free, and we have eliminated one element of the
+%%% sub list.
+%%%
+%%% We must be careful not to rewrite:
+%%%
+%%%   [<<1:1,0:1>>,[align,<<Len:16>>|Data]]
+%%%
+%%% to:
+%%%
+%%%   [[<<1:1,0:1>>,align],[<<Len:16>>|Data]]
+%%%
+%%% because even though [<<1:0,0:1>>,align] is a literal and does
+%%% not add any additional construction cost, there is one more
+%%% sub list that needs to be traversed.
+%%%
+
+enc_hoist_align(Imm0) ->
+    Imm = enc_hoist_align_reverse(Imm0, []),
+    enc_hoist_align(Imm, false, []).
+
+enc_hoist_align_reverse([H|T], Acc) ->
+    case enc_opt_al_1([H], 0) of
+	{[H],_} ->
+	    enc_hoist_align_reverse(T, [H|Acc]);
+	{_,_} ->
+	    lists:reverse(T, [H,stop|Acc])
+    end;
+enc_hoist_align_reverse([], Acc) -> Acc.
+
+enc_hoist_align([stop|T], _Aligned, Acc) ->
+    lists:reverse(T, Acc);
+enc_hoist_align([{block,Bl0}|T], Aligned, Acc) ->
+    Bl = case Aligned of
+	     false -> Bl0;
+	     true -> enc_hoist_block(Bl0)
+	 end,
+    case is_beginning_aligned(Bl) of
+	false ->
+	    enc_hoist_align(T, false, [{block,Bl}|Acc]);
+	true ->
+	    enc_hoist_align(T, true, [{put_bits,0,0,[1,align]},
+				      {block,Bl}|Acc])
+    end;
+enc_hoist_align([H|T], _, Acc) ->
+    enc_hoist_align(T, false, [H|Acc]);
+enc_hoist_align([], _, Acc) -> Acc.
+
+enc_hoist_block(Bl) ->
+    try
+	enc_hoist_block_1(lists:reverse(Bl))
+    catch
+	throw:impossible ->
+	    Bl
+    end.
+
+enc_hoist_block_1([{'cond',Cs0}|T]) ->
+    Cs = [[C|enc_hoist_block_2(Act)] || [C|Act] <- Cs0],
+    H = {'cond',Cs},
+    lists:reverse(T, [H]);
+enc_hoist_block_1(_) ->
+    throw(impossible).
+
+enc_hoist_block_2([{'cond',_}|_]=L) ->
+    enc_hoist_block(L);
+enc_hoist_block_2([{error,_}]=L) ->
+    L;
+enc_hoist_block_2([]) ->
+    [{put_bits,0,0,[1,align]}];
+enc_hoist_block_2(L) ->
+    case lists:last(L) of
+	{put_bits,_,_,_} ->
+	    L ++ [{put_bits,0,0,[1,align]}];
+	_ ->
+	    throw(impossible)
+    end.
+
+%%%
+%%% Optimize alignment for encoding.
+%%%
+
+enc_opt_al(Imm0) ->
+    {Imm,_} = enc_opt_al_1(Imm0, unknown),
+    Imm.
+
+enc_opt_al_1([H0|T0], Al0) ->
+    {H,Al1} = enc_opt_al(H0, Al0),
+    {T,Al} = enc_opt_al_1(T0, Al1),
+    {H++T,Al};
+enc_opt_al_1([], Al) -> {[],Al}.
+
+enc_opt_al({assign,_,_}=Imm, Al) ->
+    {[Imm],Al};
+enc_opt_al({block,Bl0}, Al0) ->
+    {Bl,Al} = enc_opt_al_1(Bl0, Al0),
+    {[{block,Bl}],Al};
+enc_opt_al({call,erlang,iolist_to_binary,[_]}=Imm, Al) ->
+    {[Imm],Al};
+enc_opt_al({call,per_common,encode_fragmented,[_,U]}=Call, Al) ->
+    case U rem 8 of
+	0 -> {[Call],Al};
+	_ -> {[Call],unknown}
+    end;
+enc_opt_al({call,per_common,encode_unconstrained_number,[_]}=Call, _) ->
+    {[Call],0};
+enc_opt_al({call,_,_,_,_}=Call, Al) ->
+    {[Call],Al};
+enc_opt_al({'cond',Cs0}, Al0) ->
+    {Cs,Al} = enc_opt_al_cond(Cs0, Al0),
+    {[{'cond',Cs}],Al};
+enc_opt_al({error,_}=Imm, Al) ->
+    {[Imm],Al};
+enc_opt_al({list,Imm0,Dst}, Al) ->
+    Imm1 = enc_opt_hoist_align(Imm0),
+    {Imm,_} = enc_opt_al_1(Imm1, 0),
+    {[{list,Imm,Dst}],Al};
+enc_opt_al({put_bits,V,N,[U,align]}, Al0) when Al0 rem 8 =:= 0 ->
+    Al = if
+	     is_integer(N) -> N*U;
+	     N =:= binary, U rem 8 =:= 0 -> 0;
+	     true -> unknown
+	 end,
+    {[{put_bits,V,N,[U]}],Al};
+enc_opt_al({put_bits,V,binary,[U,align]}, Al0) when is_integer(Al0) ->
+    N = 8 - (Al0 rem 8),
+    Al = case U rem 8 of
+	     0 -> 0;
+	     _ -> unknown
+	 end,
+    {[{put_bits,0,N,[1]},{put_bits,V,binary,[U]}],Al};
+enc_opt_al({put_bits,V,N0,[U,align]}, Al0) when is_integer(N0), is_integer(Al0) ->
+    N = N0 + (8 - Al0 rem 8),
+    Al = N0*U,
+    {[{put_bits,V,N,[1]}],Al};
+enc_opt_al({put_bits,_,N,[U,align]}=PutBits, _) when is_integer(N) ->
+    {[PutBits],N*U};
+enc_opt_al({put_bits,_,binary,[U,align]}=PutBits, _) when U rem 8 =:= 0 ->
+    {[PutBits],0};
+enc_opt_al({put_bits,_,N,[U]}=PutBits, Al) when is_integer(N), is_integer(Al) ->
+    {[PutBits],Al+N*U};
+enc_opt_al({put_bits,_,binary,[U]}=PutBits, Al) when U rem 8 =:= 0 ->
+    {[PutBits],Al};
+enc_opt_al({set,_,_}=Imm, Al) ->
+    {[Imm],Al};
+enc_opt_al({sub,_,_,_}=Imm, Al) ->
+    {[Imm],Al};
+enc_opt_al({'try',_,_,_,_}=Imm, Al) ->
+    {[Imm],Al};
+enc_opt_al(Imm, _) ->
+    {[Imm],unknown}.
+
+enc_opt_al_cond(Cs0, Al0) ->
+    enc_opt_al_cond_1(Cs0, Al0, [], []).
+
+enc_opt_al_cond_1([['_',{error,_}]=C|Cs], Al, CAcc, AAcc) ->
+    enc_opt_al_cond_1(Cs, Al, [C|CAcc], AAcc);
+enc_opt_al_cond_1([[C|Act0]|Cs0], Al0, CAcc, AAcc) ->
+    {Act,Al1} = enc_opt_al_1(Act0, Al0),
+    Al = if
+	     Al1 =:= unknown -> Al1;
+	     true -> Al1 rem 8
+	 end,
+    enc_opt_al_cond_1(Cs0, Al0, [[C|Act]|CAcc], [Al|AAcc]);
+enc_opt_al_cond_1([], _, CAcc, AAcc) ->
+    Al = case lists:usort(AAcc) of
+	     [] -> unknown;
+	     [Al0] -> Al0;
+	     [_|_] -> unknown
+	 end,
+    {lists:reverse(CAcc),Al}.
+
+enc_opt_hoist_align([{'cond',Cs0},{put_bits,0,0,[1,align]}]=Imm) ->
+    try
+	Cs = [insert_align_last(C) || C <- Cs0],
+	[{'cond',Cs}]
+    catch
+	throw:impossible ->
+	    Imm
+    end;
+enc_opt_hoist_align(Imm) -> Imm.
+
+insert_align_last([_,{error,_}]=C) ->
+    C;
+insert_align_last([H|T]) ->
+    case lists:last(T) of
+	{put_bits,_,_,_} ->
+	    [H|T ++ [{put_bits,0,0,[1,align]}]];
+	_ ->
+	    throw(impossible)
+    end.
+
+%%%
+%%% For the aligned PER format, fix up the intermediate format
+%%% before code generation. Code generation will be somewhat
+%%% easier if 'align' appear as a separate instruction.
+%%%
+
+per_fixup([{apply,_,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{block,Block}|T]) ->
+    [{block,per_fixup(Block)}|per_fixup(T)];
+per_fixup([{'assign',_,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{'cond',Cs0}|T]) ->
+    Cs = [[C|per_fixup(Act)] || [C|Act] <- Cs0],
+    [{'cond',Cs}|per_fixup(T)];
+per_fixup([{call,_,_,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{call,_,_,_,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{call_gen,_,_,_,_,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{error,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{lc,B,V,L}|T]) ->
+    [{lc,per_fixup(B),V,L}|per_fixup(T)];
+per_fixup([{lc,B,V,L,Dst}|T]) ->
+    [{lc,per_fixup(B),V,L,Dst}|per_fixup(T)];
+per_fixup([{list,Imm,Dst}|T]) ->
+    [{list,per_fixup(Imm),Dst}|per_fixup(T)];
+per_fixup([{set,_,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{sub,_,_,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([{'try',Try0,{P,Succ0},Else0,Dst}|T]) ->
+    Try = per_fixup(Try0),
+    Succ = per_fixup(Succ0),
+    Else = per_fixup(Else0),
+    [{'try',Try,{P,Succ},Else,Dst}|per_fixup(T)];
+per_fixup([{put_bits,_,_,_}|_]=L) ->
+    fixup_put_bits(L);
+per_fixup([{var,_}=H|T]) ->
+    [H|per_fixup(T)];
+per_fixup([]) -> [].
+
+fixup_put_bits([{put_bits,0,0,[_,align]}|T]) ->
+    [align|fixup_put_bits(T)];
+fixup_put_bits([{put_bits,0,0,_}|T]) ->
+    fixup_put_bits(T);
+fixup_put_bits([{put_bits,V,N,[U,align]}|T]) ->
+    [align,{put_bits,V,N,[U]}|fixup_put_bits(T)];
+fixup_put_bits([{put_bits,_,_,_}=H|T]) ->
+    [H|fixup_put_bits(T)];
+fixup_put_bits(Other) -> per_fixup(Other).
+
 %% effective_constraint(Type,C)
 %% Type = atom()
 %% C = [C1,...]
@@ -705,8 +2684,10 @@ mk_dest(S) -> S.
 %% returns a value range that has the lower bound set to the lowest value
 %% of all single values and lower bound values in C and the upper bound to
 %% the greatest value.
-effective_constraint(integer,[C={{_,_},_}|_Rest]) -> % extension
-    [C];
+effective_constraint(integer, [{{_,_}=Root,_}|_Rest]) ->
+    %% Normalize extension. Note that any range given for the
+    %% extension should be ignored anyway.
+    [{Root,[]}];
 effective_constraint(integer, C) ->
     SVs = get_constraints(C, 'SingleValue'),
     SV = effective_constr('SingleValue', SVs),
diff --git a/lib/asn1/src/asn1ct_parser2.erl b/lib/asn1/src/asn1ct_parser2.erl
index 1abccc8626..283616b157 100644
--- a/lib/asn1/src/asn1ct_parser2.erl
+++ b/lib/asn1/src/asn1ct_parser2.erl
@@ -38,6 +38,7 @@ parse(Tokens) ->
 	    {error,{Reason,hd(Tokens)}};
 	{ModuleDefinition,Rest1} ->
 	    {Types,Rest2} = parse_AssignmentList(Rest1),
+	    clean_process_dictionary(),
 	    case Rest2 of
 		[{'END',_}|_Rest3] ->
 		    {ok,ModuleDefinition#module{typeorval = Types}};
@@ -48,6 +49,13 @@ parse(Tokens) ->
 	    end
     end.
 
+clean_process_dictionary() ->
+    Mod = erase(asn1_module),
+    _ = erase({Mod,imports}),
+    _ = erase(tagdefault),
+    _ = erase(extensiondefault),
+    ok.
+
 parse_ModuleDefinition([{typereference,L1,ModuleIdentifier}|Rest0]) ->
     put(asn1_module,ModuleIdentifier),
     {_DefinitiveIdentifier,Rest02} = 
diff --git a/lib/asn1/src/asn1ct_table.erl b/lib/asn1/src/asn1ct_table.erl
index a5eb6d0413..2eca80eda3 100644
--- a/lib/asn1/src/asn1ct_table.erl
+++ b/lib/asn1/src/asn1ct_table.erl
@@ -22,34 +22,25 @@
 %% Table abstraction module for ASN.1 compiler
 
 -export([new/1]).
--export([new/2]).
 -export([new_reuse/1]).
--export([new_reuse/2]).
 -export([exists/1]).
 -export([size/1]).
 -export([insert/2]).
 -export([lookup/2]).
 -export([match/2]).
 -export([to_list/1]).
--export([delete/1]). % TODO: Remove (since we run in a separate process)
+-export([delete/1]).
 
 
-%% Always creates a new table
-new(Table) -> new(Table, []).
-new(Table, Options) ->
-    TableId = case get(Table) of
-                undefined ->
-                    ets:new(Table, Options);
-                _  ->
-                    delete(Table),
-                    ets:new(Table, Options)
-              end,
+%% Always create a new table.
+new(Table) ->
+    undefined = get(Table),			%Assertion.
+    TableId = ets:new(Table, []),
     put(Table, TableId).
 
-%% Only create it if it doesn't exist yet
-new_reuse(Table) -> new_reuse(Table, []).
-new_reuse(Table, Options) ->
-    not exists(Table) andalso new(Table, Options).
+%% Only create it if it doesn't exist yet.
+new_reuse(Table) ->
+    not exists(Table) andalso new(Table).
 
 exists(Table) -> get(Table) =/= undefined.
 
@@ -63,14 +54,17 @@ match(Table, MatchSpec) -> ets:match(get(Table), MatchSpec).
 
 to_list(Table) -> ets:tab2list(get(Table)).
 
+%% Deleting tables is no longer strictly necessary since each compilation
+%% runs in separate process, but it will reduce memory consumption
+%% especially when many compilations are run in parallel.
+
 delete(Tables) when is_list(Tables) ->
     [delete(T) || T <- Tables],
     true;
 delete(Table) when is_atom(Table) ->
-    case get(Table) of
+    case erase(Table) of
         undefined ->
             true;
         TableId ->
-            ets:delete(TableId),
-            erase(Table)
+            ets:delete(TableId)
     end.
diff --git a/lib/asn1/src/asn1ct_tok.erl b/lib/asn1/src/asn1ct_tok.erl
index 85199c65ec..33f4379173 100644
--- a/lib/asn1/src/asn1ct_tok.erl
+++ b/lib/asn1/src/asn1ct_tok.erl
@@ -36,7 +36,7 @@ process(Stream,Lno,R) ->
     process(io:get_line(Stream, ''), Stream,Lno+1,R).
 
 process(eof, Stream,Lno,R) ->
-    file:close(Stream),
+    ok = file:close(Stream),
     lists:flatten(lists:reverse([{'$end',Lno}|R]));
 
 
diff --git a/lib/asn1/src/asn1ct_value.erl b/lib/asn1/src/asn1ct_value.erl
index ecdfa3f645..221cd991a7 100644
--- a/lib/asn1/src/asn1ct_value.erl
+++ b/lib/asn1/src/asn1ct_value.erl
@@ -18,6 +18,7 @@
 %%
 %%
 -module(asn1ct_value).
+-compile([{nowarn_deprecated_function,{asn1rt,utf8_list_to_binary,1}}]).
 
 %%  Generate Erlang values for ASN.1 types.
 %%  The value is randomized within it's constraints
@@ -32,11 +33,11 @@
 
 
 from_type(M,Typename) ->
-    case asn1_db:dbget(M,Typename) of
-	undefined -> 
+    case asn1_db:dbload(M) of
+	error ->
 	    {error,{not_found,{M,Typename}}};
-	Tdef when is_record(Tdef,typedef) ->
-	    Type = Tdef#typedef.typespec,
+	ok ->
+	    #typedef{typespec=Type} = asn1_db:dbget(M, Typename),
 	    from_type(M,[Typename],Type);
     Vdef when is_record(Vdef,valuedef) ->
         from_value(Vdef);
@@ -167,17 +168,16 @@ from_type_prim(M, D) ->
     case D#type.def of
 	'INTEGER' ->
 	    i_random(C);
-	{'INTEGER',NamedNumberList} ->
-	    NN = [X||{X,_} <- NamedNumberList],
-	    case NN of 
+	{'INTEGER',[_|_]=NNL} ->
+	    case C of
 		[] ->
-		    i_random(C);
+		    {N,_} = lists:nth(random(length(NNL)), NNL),
+		    N;
 		_ ->
-		    case C of
-			[] ->
-			    lists:nth(random(length(NN)),NN);
-			_ ->
-			    lists:nth((fun(0)->1;(X)->X end(i_random(C))),NN)
+		    V = i_random(C),
+		    case lists:keyfind(V, 2, NNL) of
+			false -> V;
+			{N,V} -> N
 		    end
 	    end;
 	Enum when is_tuple(Enum),element(1,Enum)=='ENUMERATED' ->
@@ -261,7 +261,11 @@ from_type_prim(M, D) ->
 	'BOOLEAN' ->
 	    true;
 	'OCTET STRING' ->
-	    adjust_list(size_random(C),c_string(C,"OCTET STRING"));
+	    S0 = adjust_list(size_random(C), c_string(C, "OCTET STRING")),
+	    case M:legacy_erlang_types() of
+		false -> list_to_binary(S0);
+		true -> S0
+	    end;
 	'NumericString' ->
 	    adjust_list(size_random(C),c_string(C,"0123456789"));
 	'TeletexString' ->
@@ -349,7 +353,7 @@ random_unnamed_bit_string(M, C) ->
 
 random(Upper) ->
     {A1,A2,A3} = erlang:now(),
-    random:seed(A1,A2,A3),
+    _ = random:seed(A1, A2, A3),
     random:uniform(Upper).
 
 size_random(C) ->
diff --git a/lib/asn1/src/asn1rt.erl b/lib/asn1/src/asn1rt.erl
index d18f81346a..ad8b879c38 100644
--- a/lib/asn1/src/asn1rt.erl
+++ b/lib/asn1/src/asn1rt.erl
@@ -18,14 +18,13 @@
 %%
 %%
 -module(asn1rt).
+-deprecated(module).
 
 %% Runtime functions for ASN.1 (i.e encode, decode)
 
 -export([encode/2,encode/3,decode/3,load_driver/0,unload_driver/0,info/1]).
 
 -export([utf8_binary_to_list/1,utf8_list_to_binary/1]).
-    
--deprecated([load_driver/0,unload_driver/0]).
 
 encode(Module,{Type,Term}) ->
     encode(Module,Type,Term).
diff --git a/lib/asn1/src/asn1rt_nif.erl b/lib/asn1/src/asn1rt_nif.erl
index c1879e3dcf..1a44f1a27c 100644
--- a/lib/asn1/src/asn1rt_nif.erl
+++ b/lib/asn1/src/asn1rt_nif.erl
@@ -30,7 +30,7 @@
 -define(ASN1_NIF_VSN,1).
 
 load_nif() ->
-    LibBaseName = "asn1_erl_nif",
+    LibBaseName = "asn1rt_nif",
     PrivDir = code:priv_dir(asn1),
     LibName = case erlang:system_info(build_type) of
 		  opt ->
diff --git a/lib/asn1/src/asn1rtt_ber.erl b/lib/asn1/src/asn1rtt_ber.erl
index b5429fe324..4bd814769f 100644
--- a/lib/asn1/src/asn1rtt_ber.erl
+++ b/lib/asn1/src/asn1rtt_ber.erl
@@ -22,14 +22,15 @@
 %% encoding / decoding of BER
 
 -export([ber_decode_nif/1,ber_decode_erlang/1,match_tags/2,ber_encode/1]).
--export([encode_tags/2,
-	 encode_tags/3,
+-export([encode_tags/3,
 	 skip_ExtensionAdditions/2]).
 -export([encode_boolean/2,decode_boolean/2,
 	 encode_integer/2,encode_integer/3,
 	 decode_integer/2,decode_integer/3,
 	 decode_named_integer/3,decode_named_integer/4,
 	 encode_enumerated/2,decode_enumerated/3,
+	 encode_unnamed_bit_string/2,encode_unnamed_bit_string/3,
+	 encode_named_bit_string/3,encode_named_bit_string/4,
 	 encode_bit_string/4,
 	 decode_named_bit_string/3,
 	 decode_compact_bit_string/3,
@@ -39,6 +40,7 @@
 	 encode_relative_oid/2,decode_relative_oid/2,
 	 encode_object_identifier/2,decode_object_identifier/2,
 	 encode_restricted_string/2,
+	 decode_octet_string/2,decode_octet_string/3,
 	 decode_restricted_string/2,decode_restricted_string/3,
 	 encode_universal_string/2,decode_universal_string/3,
 	 encode_UTF8_string/2,decode_UTF8_string/2,
@@ -781,6 +783,55 @@ decode_enumerated1(Val, NamedNumberList) ->
 	    {asn1_enum,Val}
     end.
 
+%%============================================================================
+%% Bitstring value, ITU_T X.690 Chapter 8.6
+%%
+%% encode bitstring value
+%%============================================================================
+
+encode_unnamed_bit_string(Bits, TagIn) ->
+    Unused = (8 - (bit_size(Bits) band 7)) band 7,
+    Bin = <<Unused,Bits/bitstring,0:Unused>>,
+    encode_tags(TagIn, Bin, byte_size(Bin)).
+
+encode_unnamed_bit_string(C, Bits, TagIn) ->
+    NumBits = bit_size(Bits),
+    Unused = (8 - (NumBits band 7)) band 7,
+    Bin = <<Unused,Bits/bitstring,0:Unused>>,
+    case C of
+	{_Min,Max} ->
+	    if
+		NumBits > Max ->
+		    exit({error,{asn1,
+				 {bitstring_length,
+				  {{was,NumBits},{maximum,Max}}}}});
+		true ->
+		    ok
+	    end;
+	Size ->
+	    if NumBits =< Size ->
+		    ok;
+	       true ->
+		    exit({error,{asn1,
+				 {bitstring_length,
+				  {{was,NumBits},{should_be,Size}}}}})
+	    end
+    end,
+    encode_tags(TagIn, Bin, byte_size(Bin)).
+
+encode_named_bit_string([H|_]=Bits, NamedBitList, TagIn) when is_atom(H) ->
+    encode_bit_string_named([], Bits, NamedBitList, TagIn);
+encode_named_bit_string([{bit,_}|_]=Bits, NamedBitList, TagIn) ->
+    encode_bit_string_named([], Bits, NamedBitList, TagIn);
+encode_named_bit_string(Bits, _NamedBitList, TagIn) when is_bitstring(Bits) ->
+    encode_unnamed_bit_string(Bits, TagIn).
+
+encode_named_bit_string(C, [H|_]=Bits, NamedBitList, TagIn) when is_atom(H) ->
+    encode_bit_string_named(C, Bits, NamedBitList, TagIn);
+encode_named_bit_string(C, [{bit,_}|_]=Bits, NamedBitList, TagIn) ->
+    encode_bit_string_named(C, Bits, NamedBitList, TagIn);
+encode_named_bit_string(C, Bits, _NamedBitList, TagIn) when is_bitstring(Bits) ->
+    encode_unnamed_bit_string(C, Bits, TagIn).
 
 %%============================================================================
 %% Bitstring value, ITU_T X.690 Chapter 8.6
@@ -1252,6 +1303,19 @@ encode_restricted_string(OctetList, TagIn) when is_list(OctetList) ->
     encode_tags(TagIn, OctetList, length(OctetList)).
 
 %%============================================================================
+%% decode OCTET STRING to binary
+%%============================================================================
+
+decode_octet_string(Tlv, TagsIn) ->
+    Bin = match_and_collect(Tlv, TagsIn),
+    binary:copy(Bin).
+
+decode_octet_string(Tlv, Range, TagsIn) ->
+    Bin0 = match_and_collect(Tlv, TagsIn),
+    Bin = binary:copy(Bin0),
+    check_restricted_string(Bin, byte_size(Bin), Range).
+
+%%============================================================================
 %% decode Numeric Printable Teletex Videotex Visible IA5 Graphic General strings
 %%============================================================================
 
diff --git a/lib/asn1/src/asn1rtt_check.erl b/lib/asn1/src/asn1rtt_check.erl
index e78b65a8fb..be4f9c8bff 100644
--- a/lib/asn1/src/asn1rtt_check.erl
+++ b/lib/asn1/src/asn1rtt_check.erl
@@ -20,7 +20,7 @@
 
 -export([check_bool/2,
 	 check_int/3,
-	 check_bitstring/3,
+	 check_bitstring/2,check_named_bitstring/3,
 	 check_octetstring/2,
 	 check_null/2,
 	 check_objectidentifier/2,
@@ -50,31 +50,54 @@ check_int(DefValue, Value, NNL) when is_atom(Value) ->
 check_int(DefaultValue, _Value, _) ->
     throw({error,DefaultValue}).
 
-%% Two equal lists or integers
-check_bitstring(_, asn1_DEFAULT, _) ->
+%% check_bitstring(Default, UserBitstring) -> true|false
+%%  Default = bitstring()
+%%  UserBitstring = integeger() | list(0|1) | {Unused,binary()} | bitstring()
+check_bitstring(_, asn1_DEFAULT) ->
     true;
-check_bitstring(V, V, _) ->
-    true;
-%% Default value as a list of 1 and 0 and user value as an integer
-check_bitstring(L=[H|T], Int, _) when is_integer(Int), is_integer(H) ->
-    case bit_list_to_int(L, length(T)) of
-	Int -> true;
-	_ -> throw({error,L,Int})
+check_bitstring(DefVal, {Unused,Binary}) ->
+    %% User value in compact format.
+    Sz = bit_size(Binary) - Unused,
+    <<Val:Sz/bitstring,_:Unused>> = Binary,
+    check_bitstring(DefVal, Val);
+check_bitstring(DefVal, Val) when is_bitstring(Val) ->
+    case Val =:= DefVal of
+	false -> throw(error);
+	true -> true
     end;
-%% Default value as an integer, val as list
-check_bitstring(Int, Val, NBL) when is_integer(Int), is_list(Val) ->
-    BL = int_to_bit_list(Int, [], length(Val)),
-    check_bitstring(BL, Val, NBL);
+check_bitstring(Def, Val) when is_list(Val) ->
+    check_bitstring_list(Def, Val);
+check_bitstring(Def, Val) when is_integer(Val) ->
+    check_bitstring_integer(Def, Val).
+
+check_bitstring_list(<<H:1,T1/bitstring>>, [H|T2]) ->
+    check_bitstring_list(T1, T2);
+check_bitstring_list(<<>>, []) ->
+    true;
+check_bitstring_list(_, _) ->
+    throw(error).
+
+check_bitstring_integer(<<H:1,T1/bitstring>>, Int) when H =:= Int band 1 ->
+    check_bitstring_integer(T1, Int bsr 1);
+check_bitstring_integer(<<>>, 0) ->
+    true;
+check_bitstring_integer(_, _) ->
+    throw(error).
+
+check_named_bitstring(_, asn1_DEFAULT, _) ->
+    true;
+check_named_bitstring(V, V, _) ->
+    true;
 %% Default value and user value as lists of ones and zeros
-check_bitstring(L1=[H1|_T1], L2=[H2|_T2], NBL=[_H|_T]) when is_integer(H1), is_integer(H2) ->
+check_named_bitstring(L1=[H1|_T1], L2=[H2|_T2], NBL=[_H|_T]) when is_integer(H1), is_integer(H2) ->
     L2new = remove_trailing_zeros(L2),
-    check_bitstring(L1, L2new, NBL);
+    check_named_bitstring(L1, L2new, NBL);
 %% Default value as a list of 1 and 0 and user value as a list of atoms
-check_bitstring(L1=[H1|_T1], L2=[H2|_T2], NBL) when is_integer(H1), is_atom(H2) ->
+check_named_bitstring(L1=[H1|_T1], L2=[H2|_T2], NBL) when is_integer(H1), is_atom(H2) ->
     L3 = bit_list_to_nbl(L1, NBL, 0, []),
-    check_bitstring(L3, L2, NBL);
+    check_named_bitstring(L3, L2, NBL);
 %% Both default value and user value as a list of atoms
-check_bitstring(L1=[H1|T1], L2=[H2|_T2], _)
+check_named_bitstring(L1=[H1|T1], L2=[H2|_T2], _)
   when is_atom(H1), is_atom(H2), length(L1) =:= length(L2) ->
     case lists:member(H1, L2) of
 	true ->
@@ -82,27 +105,29 @@ check_bitstring(L1=[H1|T1], L2=[H2|_T2], _)
 	false -> throw({error,L2})
     end;
 %% Default value as a list of atoms and user value as a list of 1 and 0
-check_bitstring(L1=[H1|_T1], L2=[H2|_T2], NBL) when is_atom(H1), is_integer(H2) ->
+check_named_bitstring(L1=[H1|_T1], L2=[H2|_T2], NBL) when is_atom(H1), is_integer(H2) ->
     L3 = bit_list_to_nbl(L2, NBL, 0, []),
-    check_bitstring(L1, L3, NBL);
+    check_named_bitstring(L1, L3, NBL);
 %% User value in compact format
-check_bitstring(DefVal,CBS={_,_}, NBL) ->
+check_named_bitstring(DefVal,CBS={_,_}, NBL) ->
     NewVal = cbs_to_bit_list(CBS),
-    check_bitstring(DefVal, NewVal, NBL);
-check_bitstring(DV, V, _) ->
+    check_named_bitstring(DefVal, NewVal, NBL);
+%% User value as a binary
+check_named_bitstring(DefVal, CBS, NBL) when is_binary(CBS) ->
+    NewVal = cbs_to_bit_list({0,CBS}),
+    check_named_bitstring(DefVal, NewVal, NBL);
+%% User value as a bitstring
+check_named_bitstring(DefVal, CBS, NBL) when is_bitstring(CBS) ->
+    BitSize = bit_size(CBS),
+    Unused = 8 - (BitSize band 7),
+    NewVal = cbs_to_bit_list({Unused,<<CBS:BitSize/bits,0:Unused>>}),
+    check_named_bitstring(DefVal, NewVal, NBL);
+check_named_bitstring(DV, V, _) ->
     throw({error,DV,V}).
 
-
-bit_list_to_int([0|Bs], ShL)->
-    bit_list_to_int(Bs, ShL-1) + 0;
-bit_list_to_int([1|Bs], ShL) ->
-    bit_list_to_int(Bs, ShL-1) + (1 bsl ShL);
-bit_list_to_int([], _) ->
-    0.
-
 int_to_bit_list(0, Acc, 0) ->
     Acc;
-int_to_bit_list(Int, Acc, Len) ->
+int_to_bit_list(Int, Acc, Len) when Len > 0 ->
     int_to_bit_list(Int bsr 1, [Int band 1|Acc], Len - 1).
 
 bit_list_to_nbl([0|T], NBL, Pos, Acc) ->
diff --git a/lib/asn1/src/asn1rtt_ext.erl b/lib/asn1/src/asn1rtt_ext.erl
index 46adb2007d..f3eee1cdd5 100644
--- a/lib/asn1/src/asn1rtt_ext.erl
+++ b/lib/asn1/src/asn1rtt_ext.erl
@@ -38,7 +38,7 @@ transform_to_EXTERNAL1990([{'context-negotiation',Context_negot}|Rest], Acc) ->
 transform_to_EXTERNAL1990([asn1_NOVALUE|Rest], Acc) ->
     transform_to_EXTERNAL1990(Rest, [asn1_NOVALUE|Acc]);
 transform_to_EXTERNAL1990([Data_val_desc,Data_value], Acc)
-  when is_list(Data_value)->
+    when is_list(Data_value); is_binary(Data_value) ->
     list_to_tuple(lists:reverse([{'octet-aligned',Data_value},
 				 Data_val_desc|Acc]));
 transform_to_EXTERNAL1990([Data_val_desc,Data_value], Acc)
diff --git a/lib/asn1/src/asn1rtt_per.erl b/lib/asn1/src/asn1rtt_per.erl
index 9f4b7500d8..672c84593c 100644
--- a/lib/asn1/src/asn1rtt_per.erl
+++ b/lib/asn1/src/asn1rtt_per.erl
@@ -18,62 +18,7 @@
 %%
 -module(asn1rtt_per).
 
--export([setext/1, fixextensions/2,
-	 skipextensions/3,
-	 set_choice/3,encode_integer/2,
-	 encode_small_number/1,
-	 encode_constrained_number/2,
-	 encode_length/1,
-	 encode_length/2,
-	 encode_bit_string/3,
-	 encode_object_identifier/1,
-	 encode_relative_oid/1,
-	 complete/1,
-	 encode_open_type/1,
-	 encode_GeneralString/2,
-	 encode_GraphicString/2,
-	 encode_TeletexString/2,
-	 encode_VideotexString/2,
-	 encode_ObjectDescriptor/2,
-	 encode_UTF8String/1,
-	 encode_octet_string/2,
-	 encode_known_multiplier_string/4,
-	 octets_to_complete/2]).
-
--define('16K',16384).
--define('32K',32768).
--define('64K',65536).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% setext(true|false) ->  CompleteList
-%%
-
-setext(false) ->
-    [0];
-setext(true) ->
-    [1].
-
-fixextensions({ext,ExtPos,ExtNum},Val) ->
-    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
-	0 -> [];
-	ExtBits ->
-	    [encode_small_length(ExtNum)|pre_complete_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).
+-export([skipextensions/3,complete/1]).
 
 skipextensions(Bytes0, Nr, ExtensionBitstr) when is_bitstring(ExtensionBitstr) ->
     Prev = Nr - 1,
@@ -95,270 +40,6 @@ align(BitStr) when is_bitstring(BitStr) ->
     <<_:AlignBits,Rest/binary>> = BitStr,
     Rest.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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 ->
-	    [0,				% the value is in the root set
-	     encode_constrained_number({0,Len1-1},N)];
-	N when is_integer(N) ->
-	    [0];	      % no encoding if only 0 or 1 alternative
-	false ->
-	    [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_constrained_number({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.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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(Val) ->
-    case byte_size(Val) of
-	Size when Size > 255 ->
-	    [encode_length(Size),21,<<Size:16>>,Val]; % octets implies align
-	Size ->
-	    [encode_length(Size),20,Size,Val]
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_integer(Constraint, Value) -> CompleteList
-%%
-encode_integer([{Rc,_Ec}],Val) when is_tuple(Rc) ->
-    try
-	[0|encode_integer([Rc], Val)]
-    catch
-	_:{error,{asn1,_}} ->
-	    [1|encode_unconstrained_number(Val)]
-    end;
-encode_integer([], Val) ->
-    encode_unconstrained_number(Val);
-%% The constraint is the effective constraint, and in this case is a number
-encode_integer([{'SingleValue',V}], V) ->
-    [];
-encode_integer([{'ValueRange',{Lb,Ub}=VR,Range,PreEnc}],Val)
-  when Val >= Lb, Ub >= Val ->
-    %% this case when NamedNumberList
-    encode_constrained_number(VR, Range, PreEnc, Val);
-encode_integer([{'ValueRange',{Lb,'MAX'}}], Val) when Lb =< Val ->
-    encode_semi_constrained_number(Lb, Val);
-encode_integer([{'ValueRange',{'MIN',_}}], Val) ->
-    encode_unconstrained_number(Val);
-encode_integer([{'ValueRange',VR={_Lb,_Ub}}], Val) ->
-    encode_constrained_number(VR, Val);
-encode_integer(_,Val) ->
-    exit({error,{asn1,{illegal_value,Val}}}).
-
-
-%% 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(Val) when Val < 64 ->
-    [10,7,Val];
-encode_small_number(Val) ->
-    [1|encode_semi_constrained_number(0, Val)].
-
-%% X.691:10.7 Encoding of a semi-constrained whole number
-encode_semi_constrained_number(Lb, Val) ->
-    Val2 = Val - Lb,
-    Oct = eint_positive(Val2),
-    Len = length(Oct),
-    if
-	Len < 128 ->
-	    [20,Len+1,Len|Oct];
-	Len < 256 ->
-	    [encode_length(Len),20,Len|Oct];
-	true ->
-	    [encode_length(Len),21,<<Len:16>>|Oct]
-    end.
-
-encode_constrained_number({Lb,_Ub},_Range,{bits,N},Val) ->
-    Val2 = Val-Lb,
-    [10,N,Val2];
-encode_constrained_number({Lb,_Ub},_Range,{octets,N},Val) when N < 256->
-    %% N is 8 or 16 (1 or 2 octets)
-    Val2 = Val-Lb,
-    [20,N,Val2];
-encode_constrained_number({Lb,_Ub},_Range,{octets,N},Val) -> % N>255
-    %% N is 8 or 16 (1 or 2 octets)
-    Val2 = Val-Lb,
-    [21,<<N:16>>,Val2];
-encode_constrained_number({Lb,_Ub},Range,_,Val) ->
-    Val2 = Val-Lb,
-    if
-	Range =< 16#1000000  -> % max 3 octets
-	    Octs = eint_positive(Val2),
-	    L = length(Octs),
-	    [encode_length({1,3},L),[20,L,Octs]];
-	Range =< 16#100000000  -> % max 4 octets
-	    Octs = eint_positive(Val2),
-	    L = length(Octs),
-	    [encode_length({1,4},L),[20,L,Octs]];
-	Range =< 16#10000000000  -> % max 5 octets
-	    Octs = eint_positive(Val2),
-	    L = length(Octs),
-	    [encode_length({1,5},L),[20,L,Octs]];
-	true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end.
-
-encode_constrained_number({Lb,Ub}, Val) when Val >= Lb, Ub >= Val ->
-    Range = Ub - Lb + 1,
-    Val2 = Val - Lb,
-    if
-	Range  == 1 -> [];
-	Range  == 2 ->
-	    [Val2];
-	Range  =< 4 ->
-	    [10,2,Val2];
-	Range  =< 8 ->
-	    [10,3,Val2];
-	Range  =< 16 ->
-	    [10,4,Val2];
-	Range  =< 32 ->
-	    [10,5,Val2];
-	Range  =< 64 ->
-	    [10,6,Val2];
-	Range  =< 128 ->
-	    [10,7,Val2];
-	Range  =< 255 ->
-	    [10,8,Val2];
-	Range  =< 256 ->
-	    [20,1,Val2];
-	Range  =< 65536 ->
-	    [20,2,<<Val2:16>>];
-	Range =< (1 bsl (255*8))  ->
-            Octs = binary:encode_unsigned(Val2),
-            RangeOcts = binary:encode_unsigned(Range - 1),
-            OctsLen = byte_size(Octs),
-            RangeOctsLen = byte_size(RangeOcts),
-            LengthBitsNeeded = minimum_bits(RangeOctsLen - 1),
-            [10,LengthBitsNeeded,OctsLen-1,20,OctsLen,Octs];
-	true  ->
-	    exit({not_supported,{integer_range,Range}})
-    end;
-encode_constrained_number({_,_},Val) ->
-    exit({error,{asn1,{illegal_value,Val}}}).
-
-%% 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) ->
-    Oct = if
-	      Val >= 0 ->
-		  eint(Val, []);
-	      true ->
-		  enint(Val, [])
-	  end,
-    Len = length(Oct),
-    if
-        Len < 128 ->
-            [20,Len + 1,Len|Oct];
-        Len < 256 ->
-            [20,Len + 2,<<2:2,Len:14>>|Oct];
-        true ->
-            [encode_length(Len),21,<<Len:16>>|Oct]
-    end.
-
-%% used for positive Values which don't need a sign bit
-%% returns a list
-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]).
-
-%% 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(Len) ->				% unconstrained
-    if
-	Len < 128 ->
-	    [20,1,Len];
-	Len < 16384 ->
-	    <<20,2,2:2,Len:14>>;
-	true  -> % should be able to endode length >= 16384 i.e. fragmented length
-	    exit({error,{asn1,{encode_length,{nyi,above_16k}}}})
-    end.
-
-encode_length({C,[]}, Len) ->
-    case C of
-	{Lb,Ub}=Vr when Lb =< Len, Len =< Ub ->
-	    [0|encode_constrained_number(Vr, Len)];
-	_ ->
-	    [1|encode_length(Len)]
-    end;
-encode_length(Len, Len) ->
-    [];
-encode_length(Vr, Len) ->
-    encode_constrained_number(Vr, Len).
-
-%% 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 ->
-    [10,7,Len-1];
-encode_small_length(Len) ->
-    [1,encode_length(Len)].
-
-
 decode_length(Buffer)  -> % un-constrained
     case align(Buffer) of
 	<<0:1,Oct:7,Rest/binary>> ->
@@ -370,511 +51,70 @@ decode_length(Buffer)  -> % un-constrained
 	    exit({error,{asn1,{decode_length,{nyi,above_16k}}}})
     end.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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, Bits, NamedBitList) when is_bitstring(Bits) ->
-    PadLen = (8 - (bit_size(Bits) band 7)) band 7,
-    Compact = {PadLen,<<Bits/bitstring,0:PadLen>>},
-    encode_bin_bit_string(C, Compact, NamedBitList);
-encode_bit_string(C, {Unused,BinBits}=Bin, 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);% consider the constraint
-
-encode_bit_string(C, BL=[{bit,_} | _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(Int, BitListValue, _)
-  when is_list(BitListValue),is_integer(Int),Int =< 16 ->
-    %% The type is constrained by a single value size constraint
-    %% range_check(Int,length(BitListValue)),
-    [40,Int,length(BitListValue),BitListValue];
-encode_bit_string(Int, BitListValue, _)
-  when is_list(BitListValue),is_integer(Int), Int =< 255 ->
-    %% The type is constrained by a single value size constraint
-    %% range_check(Int,length(BitListValue)),
-    [2,40,Int,length(BitListValue),BitListValue];
-encode_bit_string(Int, BitListValue, _)
-  when is_list(BitListValue),is_integer(Int), Int < ?'64K' ->
-    {Code,DesiredLength,Length} =
-	case length(BitListValue) of
-	    B1 when B1 > Int ->
-		exit({error,{'BIT_STRING_length_greater_than_SIZE',
-			     Int,BitListValue}});
-	    B1 when B1 =< 255,Int =< 255 ->
-		{40,Int,B1};
-	    B1 when B1 =< 255 ->
-		{42,<<Int:16>>,B1};
-	    B1 ->
-		{43,<<Int:16>>,<<B1:16>>}
-	end,
-    %% The type is constrained by a single value size constraint
-    [2,Code,DesiredLength,Length,BitListValue];
-encode_bit_string(no, BitListValue,[])
-  when is_list(BitListValue) ->
-    [encode_length(length(BitListValue)),
-     2|BitListValue];
-encode_bit_string({{Fix,Fix},Ext}, BitListValue,[])
-  when is_integer(Fix), is_list(Ext) ->
-    case length(BitListValue) of
-	Len when Len =< Fix ->
-	    [0|encode_bit_string(Fix, BitListValue, [])];
-	_ ->
-	    [1|encode_bit_string(no, BitListValue, [])]
-    end;
-encode_bit_string(C, BitListValue,[])
-  when is_list(BitListValue) ->
-    [encode_length(C, length(BitListValue)),
-     2|BitListValue];
-encode_bit_string(no, BitListValue,_NamedBitList)
-  when is_list(BitListValue) ->
-    %% this case with an unconstrained BIT STRING can be made more efficient
-    %% if the complete driver can take a special code so the length field
-    %% is encoded there.
-    NewBitLVal = lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
-					    lists:reverse(BitListValue))),
-    [encode_length(length(NewBitLVal)),2|NewBitLVal];
-encode_bit_string({{Fix,Fix},Ext}, BitListValue, NamedBitList)
-  when is_integer(Fix), is_list(Ext) ->
-    case length(BitListValue) of
-	Len when Len =< Fix ->
-	    [0|encode_bit_string(Fix, BitListValue, NamedBitList)];
-	_ ->
-	    [1|encode_bit_string(no, BitListValue, NamedBitList)]
-    end;
-encode_bit_string(C, BitListValue, _NamedBitList)
-  when is_list(BitListValue) ->			% C = {_,'MAX'}
-    NewBitLVal = bit_string_trailing_zeros(BitListValue, C),
-    [encode_length(C, length(NewBitLVal)),2|NewBitLVal];
-
-
-%% 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).
-
-bit_string_trailing_zeros(BitList,C) when is_integer(C) ->
-    bit_string_trailing_zeros1(BitList,C,C);
-bit_string_trailing_zeros(BitList,{Lb,Ub}) when is_integer(Lb) ->
-    bit_string_trailing_zeros1(BitList,Lb,Ub);
-bit_string_trailing_zeros(BitList,{{Lb,Ub},_}) when is_integer(Lb) ->
-    bit_string_trailing_zeros1(BitList,Lb,Ub);
-bit_string_trailing_zeros(BitList,_) ->
-    BitList.
-
-bit_string_trailing_zeros1(BitList,Lb,Ub) ->
-    case length(BitList) of
-	Lb -> BitList;
-	B when B < Lb -> BitList++lists:duplicate(Lb-B, 0);
-	D -> F = fun(L,LB,LB,_,_)->lists:reverse(L);
-		    ([0|R],L1,LB,UB,Fun)->Fun(R,L1-1,LB,UB,Fun);
-		    (L,L1,_,UB,_)when L1 =< UB -> lists:reverse(L);
-		    (_,_L1,_,_,_) ->exit({error,{list_length_BIT_STRING,
-						 BitList}}) end,
-	     F(lists:reverse(BitList),D,Lb,Ub,F)
-    end.
-
-%% 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, {Unused,BinBits}, _NamedBitList)
-  when is_integer(C),C=<16 ->
-    range_check(C, bit_size(BinBits) - Unused),
-    [45,C,byte_size(BinBits),BinBits];
-encode_bin_bit_string(C, {Unused,BinBits}, _NamedBitList)
-  when is_integer(C), C =< 255 ->
-    range_check(C, bit_size(BinBits) - Unused),
-    [2,45,C,byte_size(BinBits),BinBits];
-encode_bin_bit_string(C, {Unused,BinBits}, _NamedBitList)
-  when is_integer(C), C =< 65535 ->
-    range_check(C, bit_size(BinBits) - Unused),
-    case byte_size(BinBits) of
-	Size when Size =< 255 ->
-	    [2,46,<<C:16>>,Size,BinBits];
-	Size ->
-	    [2,47,<<C:16>>,<<Size:16>>,BinBits]
-    end;
-encode_bin_bit_string(C,UnusedAndBin={_,_},NamedBitList) ->
-    {Unused1,Bin1} =
-	%% removes all trailing bits if NamedBitList is not empty
-	remove_trailing_bin(NamedBitList,UnusedAndBin),
-    case C of
-	{Lb,Ub} when is_integer(Lb),is_integer(Ub) ->
-	    Size = byte_size(Bin1),
-	    [encode_length({Lb,Ub}, Size*8 - Unused1),
-	     2,octets_unused_to_complete(Unused1,Size,Bin1)];
-	no ->
-	    Size = byte_size(Bin1),
-	    [encode_length(Size*8 - Unused1),
-	     2|octets_unused_to_complete(Unused1, Size, Bin1)];
-	{{Fix,Fix},Ext} when is_integer(Fix),is_list(Ext) ->
-	    case byte_size(Bin1)*8 - Unused1 of
-		Size when Size =< Fix  ->
-		    [0|encode_bin_bit_string(Fix,UnusedAndBin,NamedBitList)];
-		_Size ->
-		    [1|encode_bin_bit_string(no,UnusedAndBin,NamedBitList)]
-	    end;
-	Sc ->
-	    Size = byte_size(Bin1),
-	    [encode_length(Sc, Size*8 - Unused1),
-	     2|octets_unused_to_complete(Unused1,Size,Bin1)]
-    end.
-
-range_check(C,C) when is_integer(C) ->
-    ok;
-range_check(C1,C2) when is_integer(C1) ->
-    exit({error,{asn1,{bit_string_out_of_range,{C1,C2}}}}).
-
-remove_trailing_bin([], {Unused,Bin}) ->
-    {Unused,Bin};
-remove_trailing_bin(_NamedNumberList,{_Unused,<<>>}) ->
-    {0,<<>>};
-remove_trailing_bin(NamedNumberList, {_Unused,Bin}) ->
-    Size = byte_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});
-	_ ->
-	    {Unused2,Bin}
-    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.
-
-
-%%%%%%%%%%%%%%%
-%%
-
-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:keyfind(Val, 1, NamedBitList) of
-	{_ValName, ValPos} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	false ->
-	    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([], _) ->
-    [].
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:16
-%% encode_octet_string(Constraint, Val)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-encode_octet_string({{Sv,Sv},Ext}=SZ, Val) when is_list(Ext), Sv =< 2 ->
-    Len = length(Val),
-    try
-        case encode_length(SZ, Len) of
-            [0|_]=EncLen ->
-                [EncLen,45,Sv*8,Sv,Val];
-            [_|_]=EncLen ->
-                [EncLen|octets_to_complete(Len, Val)]
-        end
-    catch
-	exit:{error,{asn1,{encode_length,_}}} ->
-	    encode_fragmented_octet_string(Val)
-    end;
-encode_octet_string({_,_}=SZ, Val) ->
-    Len = length(Val),
-    try
-	[encode_length(SZ, Len),2|octets_to_complete(Len, Val)]
-    catch
-	exit:{error,{asn1,{encode_length,_}}} ->
-	    encode_fragmented_octet_string(Val)
-    end;
-encode_octet_string(Sv, Val) when is_integer(Sv) ->
-    encode_fragmented_octet_string(Val);
-encode_octet_string(no, Val) ->
-    Len = length(Val),
-    try
-	[encode_length(Len),2|octets_to_complete(Len, Val)]
-    catch
-	exit:{error,{asn1,{encode_length,_}}} ->
-	    encode_fragmented_octet_string(Val)
-    end.
-
-encode_fragmented_octet_string(Val) ->
-    Bin = iolist_to_binary(Val),
-    efos_1(Bin).
-
-efos_1(<<B1:16#C000/binary,B2:16#4000/binary,T/binary>>) ->
-    [20,1,<<3:2,4:6>>,
-     octets_to_complete(16#C000, B1),
-     octets_to_complete(16#4000, B2)|efos_1(T)];
-efos_1(<<B:16#C000/binary,T/binary>>) ->
-    [20,1,<<3:2,3:6>>,octets_to_complete(16#C000, B)|efos_1(T)];
-efos_1(<<B:16#8000/binary,T/binary>>) ->
-    [20,1,<<3:2,2:6>>,octets_to_complete(16#8000, B)|efos_1(T)];
-efos_1(<<B:16#4000/binary,T/binary>>) ->
-    [20,1,<<3:2,1:6>>,octets_to_complete(16#4000, B)|efos_1(T)];
-efos_1(<<>>) ->
-    [20,1,0];
-efos_1(<<B/bitstring>>) ->
-    Len = byte_size(B),
-    [encode_length(Len)|octets_to_complete(Len, B)].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restricted char string types
-%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
-%% X.691:26 and X.680:34-36
-
-encode_restricted_string(Val) when is_list(Val)->
-    Len = length(Val),
-    [encode_length(Len)|octets_to_complete(Len, Val)].
-
-encode_known_multiplier_string(SizeC, NumBits, CharOutTab, Val) ->
-    Result = chars_encode2(Val, NumBits, CharOutTab),
-    case SizeC of
-	Ub when is_integer(Ub), Ub*NumBits < 16  ->
-	    Result;
-	Ub when is_integer(Ub) ->
-	    [2,Result];
-	{{_,Ub},Ext}=SZ when is_list(Ext) ->
-	    Len = length(Val),
-	    case encode_length(SZ, Len) of
-		[0|_]=EncLen when Ub*NumBits < 16 ->
-		    [EncLen,45,Len*NumBits,Len,Val];
-		[_|_]=EncLen ->
-		    [EncLen,2|Result]
-	    end;
-	{_,Ub}=Range ->
-	    [encode_length(Range, length(Val))|
-	     if
-		 Ub*NumBits < 16 -> Result;
-		 true -> [2|Result]
-	     end];
-	no  ->
-	    [encode_length(length(Val)),2,Result]
-    end.
-
-encode_GeneralString(_C,Val) ->
-    encode_restricted_string(Val).
-
-encode_GraphicString(_C,Val) ->
-    encode_restricted_string(Val).
-
-encode_ObjectDescriptor(_C,Val) ->
-    encode_restricted_string(Val).
-
-encode_TeletexString(_C,Val) -> % equivalent with T61String
-    encode_restricted_string(Val).
-
-encode_VideotexString(_C,Val) ->
-    encode_restricted_string(Val).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% chars_encode(C,StringType,Value) -> ValueList
-%%
-%% encodes chars according to the per rules taking the constraint
-%% PermittedAlphabet into account.
-%%
-%% This function only encodes the value part and NOT the length.
-
-chars_encode2([H|T],NumBits,T1={Min,Max,notab}) when  H =< Max, H >= Min ->
-    [pre_complete_bits(NumBits,H-Min)|chars_encode2(T,NumBits,T1)];
-chars_encode2([H|T],NumBits,T1={Min,Max,Tab}) when H =< Max, H >= Min ->
-    [pre_complete_bits(NumBits,exit_if_false(H,element(H-Min+1,Tab)))|
-     chars_encode2(T,NumBits,T1)];
-chars_encode2([{A,B,C,D}|T],NumBits,T1={Min,_Max,notab}) ->
-    %% no value range check here (ought to be, but very expensive)
-    [pre_complete_bits(NumBits,
-			       ((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min)|
-     chars_encode2(T,NumBits,T1)];
-chars_encode2([H={A,B,C,D}|T],NumBits,{Min,Max,Tab}) ->
-    %% no value range check here (ought to be, but very expensive)
-    [pre_complete_bits(NumBits,exit_if_false(H,element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab)))|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|_T],_NumBits,{_Min,_Max,_Tab}) ->
-    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.
-
-pre_complete_bits(NumBits,Val) when NumBits =< 8 ->
-    [10,NumBits,Val];
-pre_complete_bits(NumBits,Val) when NumBits =< 16 ->
-    [10,NumBits-8,Val bsr 8,10,8,(Val band 255)];
-pre_complete_bits(NumBits,Val) when NumBits =< 2040 -> % 255 * 8
-    Unused = (8 - (NumBits rem 8)) rem 8,
-    Len = NumBits + Unused,
-    [30,Unused,Len div 8,<<(Val bsl Unused):Len>>].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_UTF8String(Val) -> CompleteList
-%% Val -> <<utf8encoded binary>>
-%% CompleteList -> [apropriate codes and values for driver complete]
-%%
-encode_UTF8String(Val) when is_binary(Val) ->
-    Sz = byte_size(Val),
-    [encode_length(Sz),octets_to_complete(Sz, Val)];
-encode_UTF8String(Val) ->
-    encode_UTF8String(list_to_binary(Val)).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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(Val) ->
-    OctetList = e_object_identifier(Val),
-    Octets = list_to_binary(OctetList),
-    Sz = byte_size(Octets),
-    [encode_length(Sz),
-     octets_to_complete(Sz, Octets)].
-
-e_object_identifier({'OBJECT IDENTIFIER',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]].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_relative_oid(Val) -> CompleteList
-%% encode_relative_oid({Name,Val}) -> CompleteList
-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]),
-    Sz = byte_size(Octets),
-    [encode_length(Sz)|octets_to_complete(Sz, Octets)].
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% 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 asn1rt_nif:encode_per_complete(L) of
+complete(L0) ->
+    L = complete(L0, []),
+    case list_to_bitstring(L) of
 	<<>> -> <<0>>;
 	Bin -> Bin
     end.
 
-octets_to_complete(Len,Val) when Len < 256 ->
-    [20,Len,Val];
-octets_to_complete(Len,Val) ->
-    [21,<<Len:16>>,Val].
-
-octets_unused_to_complete(Unused,Len,Val) when Len < 256 ->
-    [30,Unused,Len,Val];
-octets_unused_to_complete(Unused,Len,Val) ->
-    [31,Unused,<<Len:16>>,Val].
+complete([], []) ->
+    [];
+complete([], [H|More]) ->
+    complete(H, More);
+complete([align|T], More) ->
+    complete(T, More);
+complete([[]|T], More) ->
+    complete(T, More);
+complete([[_|_]=H], More) ->
+    complete(H, More);
+complete([[_|_]=H|T], More) ->
+    complete(H, [T|More]);
+complete([H|T], More) when is_integer(H); is_binary(H) ->
+    [H|complete(T, More)];
+complete([H|T], More) ->
+    [H|complete(T, bit_size(H), More)];
+complete(Bin, More) when is_binary(Bin) ->
+    [Bin|complete([], More)];
+complete(Bin, More) ->
+    [Bin|complete([], bit_size(Bin), More)].
+
+complete([], Bits, []) ->
+    case Bits band 7 of
+	0 -> [];
+	N -> [<<0:(8-N)>>]
+    end;
+complete([], Bits, [H|More]) ->
+    complete(H, Bits, More);
+complete([align|T], Bits, More) ->
+    case Bits band 7 of
+	0 -> complete(T, More);
+	1 -> [<<0:7>>|complete(T, More)];
+	2 -> [<<0:6>>|complete(T, More)];
+	3 -> [<<0:5>>|complete(T, More)];
+	4 -> [<<0:4>>|complete(T, More)];
+	5 -> [<<0:3>>|complete(T, More)];
+	6 -> [<<0:2>>|complete(T, More)];
+	7 -> [<<0:1>>|complete(T, More)]
+    end;
+complete([[]|T], Bits, More) ->
+    complete(T, Bits, More);
+complete([[_|_]=H], Bits, More) ->
+    complete(H, Bits, More);
+complete([[_|_]=H|T], Bits, More) ->
+    complete(H, Bits, [T|More]);
+complete([H|T], Bits, More) when is_integer(H);
+				 is_binary(H) ->
+    [H|complete(T, Bits, More)];
+complete([H|T], Bits, More) ->
+    [H|complete(T, Bits+bit_size(H), More)];
+complete(Bin, Bits, More) when is_binary(Bin) ->
+    [Bin|complete([], Bits, More)];
+complete(Bin, Bits, More) ->
+    [Bin|complete([], Bits+bit_size(Bin), More)].
diff --git a/lib/asn1/src/asn1rtt_per_common.erl b/lib/asn1/src/asn1rtt_per_common.erl
index e7edc2b65f..71fec411a0 100644
--- a/lib/asn1/src/asn1rtt_per_common.erl
+++ b/lib/asn1/src/asn1rtt_per_common.erl
@@ -28,7 +28,19 @@
 	 decode_chars/2,decode_chars/3,
 	 decode_chars_16bit/1,
 	 decode_big_chars/2,
-	 decode_oid/1,decode_relative_oid/1]).
+	 decode_oid/1,decode_relative_oid/1,
+	 encode_chars/2,encode_chars/3,
+	 encode_chars_16bit/1,encode_big_chars/1,
+	 encode_fragmented/2,
+	 encode_oid/1,encode_relative_oid/1,
+	 encode_unconstrained_number/1,
+	 bitstring_from_positions/1,bitstring_from_positions/2,
+	 to_bitstring/1,to_bitstring/2,
+	 to_named_bitstring/1,to_named_bitstring/2,
+	 bs_drop_trailing_zeroes/1,adjust_trailing_zeroes/2,
+	 is_default_bitstring/3,is_default_bitstring/5,
+	 extension_bitmap/3,
+	 open_type_to_binary/1,legacy_open_type_to_binary/1]).
 
 -define('16K',16384).
 
@@ -90,6 +102,241 @@ decode_oid(Octets) ->
 decode_relative_oid(Octets) ->
     list_to_tuple(dec_subidentifiers(Octets, 0, [])).
 
+encode_chars(Val, NumBits) ->
+    << <<C:NumBits>> || C <- Val >>.
+
+encode_chars(Val, NumBits, {Lb,Tab}) ->
+    << <<(enc_char(C, Lb, Tab)):NumBits>> || C <- Val >>.
+
+encode_chars_16bit(Val) ->
+    L = [case C of
+	     {0,0,A,B} -> [A,B];
+	     C when is_integer(C) -> [0,C]
+	 end || C <- Val],
+    iolist_to_binary(L).
+
+encode_big_chars(Val) ->
+    L = [case C of
+	     {_,_,_,_} -> tuple_to_list(C);
+	     C when is_integer(C) -> [<<0,0,0>>,C]
+	 end || C <- Val],
+    iolist_to_binary(L).
+
+encode_fragmented(Bin, Unit) ->
+    encode_fragmented_1(Bin, Unit, 4).
+
+encode_oid(Val) when is_tuple(Val) ->
+    encode_oid(tuple_to_list(Val));
+encode_oid(Val) ->
+    iolist_to_binary(e_object_identifier(Val)).
+
+encode_relative_oid(Val) when is_tuple(Val) ->
+    encode_relative_oid(tuple_to_list(Val));
+encode_relative_oid(Val) when is_list(Val) ->
+    list_to_binary([e_object_element(X)||X <- Val]).
+
+encode_unconstrained_number(Val) when Val >= 0 ->
+    if
+	Val < 16#80 ->
+	    [1,Val];
+	Val < 16#100 ->
+	    [<<2,0>>,Val];
+	true ->
+	    case binary:encode_unsigned(Val) of
+		<<0:1,_/bitstring>>=Bin ->
+		    case byte_size(Bin) of
+			Sz when Sz < 128 ->
+			    [Sz,Bin];
+			Sz when Sz < 16384 ->
+			    [<<2:2,Sz:14>>,Bin]
+		    end;
+		<<1:1,_/bitstring>>=Bin ->
+		    case byte_size(Bin)+1 of
+			Sz when Sz < 128 ->
+			    [Sz,0,Bin];
+			Sz when Sz < 16384 ->
+			    [<<2:2,Sz:14,0:8>>,Bin]
+		    end
+	    end
+    end;
+encode_unconstrained_number(Val) ->
+    Oct = enint(Val, []),
+    Len = length(Oct),
+    if
+        Len < 128 ->
+            [Len|Oct];
+        Len < 16384 ->
+            [<<2:2,Len:14>>|Oct]
+    end.
+
+%% bitstring_from_positions([Position]) -> BitString
+%%  Given an unsorted list of bit positions (0..MAX), construct
+%%  a BIT STRING. The rightmost bit will always be a one.
+
+bitstring_from_positions([]) -> <<>>;
+bitstring_from_positions([_|_]=L0) ->
+    L1 = lists:sort(L0),
+    L = diff(L1, -1),
+    << <<1:(N+0)>> || N <- L >>.
+
+%% bitstring_from_positions([Position], Lb) -> BitString
+%%  Given an unsorted list of bit positions (0..MAX) and a lower bound
+%%  for the number of bits, construct BIT STRING (zero-padded on the
+%%  right side if needed).
+
+bitstring_from_positions(L0, Lb) ->
+    L1 = lists:sort(L0),
+    L = diff(L1, -1, Lb-1),
+    << <<B:(N+0)>> || {B,N} <- L >>.
+
+%% to_bitstring(Val) -> BitString
+%%    Val = BitString | {Unused,Binary} | [OneOrZero] | Integer
+%%  Given one of the possible representations for a BIT STRING,
+%%  return a bitstring (without adding or removing any zero bits
+%%  at the right end).
+
+to_bitstring({0,Bs}) when is_binary(Bs) ->
+    Bs;
+to_bitstring({Unused,Bs0}) when is_binary(Bs0) ->
+    Sz = bit_size(Bs0) - Unused,
+    <<Bs:Sz/bits,_/bits>> = Bs0,
+    Bs;
+to_bitstring(Bs) when is_bitstring(Bs) ->
+    Bs;
+to_bitstring(Int) when is_integer(Int), Int >= 0 ->
+    L = int_to_bitlist(Int),
+    << <<B:1>> || B <- L >>;
+to_bitstring(L) when is_list(L) ->
+    << <<B:1>> || B <- L >>.
+
+%% to_bitstring(Val, Lb) -> BitString
+%%    Val = BitString | {Unused,Binary} | [OneOrZero] | Integer
+%%    Lb = Integer
+%%  Given one of the possible representations for a BIT STRING
+%%  and the lower bound for the number of bits,
+%%  return a bitstring at least Lb bits long (padded with zeroes
+%%  if needed).
+
+to_bitstring({0,Bs}, Lb) when is_binary(Bs) ->
+    case bit_size(Bs) of
+	Sz when Sz < Lb ->
+	    <<Bs/bits,0:(Lb-Sz)>>;
+	_ ->
+	    Bs
+    end;
+to_bitstring({Unused,Bs0}, Lb) when is_binary(Bs0) ->
+    Sz = bit_size(Bs0) - Unused,
+    if
+	Sz < Lb ->
+	    <<Bs0:Sz/bits,0:(Lb-Sz)>>;
+	true ->
+	    <<Bs:Sz/bits,_/bits>> = Bs0,
+	    Bs
+    end;
+to_bitstring(Bs, Lb) when is_bitstring(Bs) ->
+    adjust_size(Bs, Lb);
+to_bitstring(Int, Lb) when is_integer(Int), Int >= 0 ->
+    L = int_to_bitlist(Int),
+    Bs = << <<B:1>> || B <- L >>,
+    adjust_size(Bs, Lb);
+to_bitstring(L, Lb) when is_list(L) ->
+    Bs = << <<B:1>> || B <- L >>,
+    adjust_size(Bs, Lb).
+
+%% to_named_bitstring(Val) -> BitString
+%%    Val = BitString | {Unused,Binary} | [OneOrZero] | Integer
+%%  Given one of the possible representations for a BIT STRING,
+%%  return a bitstring where any trailing zeroes have been stripped.
+
+to_named_bitstring(Val) ->
+    Bs = to_bitstring(Val),
+    bs_drop_trailing_zeroes(Bs).
+
+%% to_named_bitstring(Val, Lb) -> BitString
+%%    Val = BitString | {Unused,Binary} | [OneOrZero] | Integer
+%%    Lb = Integer
+%%  Given one of the possible representations for a BIT STRING
+%%  and the lower bound for the number of bits,
+%%  return a bitstring that is at least Lb bits long. There will
+%%  be zeroes at the right only if needed to reach the lower bound
+%%  for the number of bits.
+
+to_named_bitstring({0,Bs}, Lb) when is_binary(Bs) ->
+    adjust_trailing_zeroes(Bs, Lb);
+to_named_bitstring({Unused,Bs0}, Lb) when is_binary(Bs0) ->
+    Sz = bit_size(Bs0) - Unused,
+    <<Bs:Sz/bits,_/bits>> = Bs0,
+    adjust_trailing_zeroes(Bs, Lb);
+to_named_bitstring(Bs, Lb) when is_bitstring(Bs) ->
+    adjust_trailing_zeroes(Bs, Lb);
+to_named_bitstring(Val, Lb) ->
+    %% Obsolete representations: list or integer. Optimize
+    %% for correctness, not speed.
+    adjust_trailing_zeroes(to_bitstring(Val), Lb).
+
+is_default_bitstring(asn1_DEFAULT, _, _) ->
+    true;
+is_default_bitstring(Named, Named, _) ->
+    true;
+is_default_bitstring(Bs, _, Bs) ->
+    true;
+is_default_bitstring(Val, _, Def) when is_bitstring(Val) ->
+    Sz = bit_size(Def),
+    case Val of
+	<<Def:Sz/bitstring,T/bitstring>> ->
+	    NumZeroes = bit_size(T),
+	    case T of
+		<<0:NumZeroes>> -> true;
+		_ -> false
+	    end;
+	_ ->
+	    false
+    end.
+
+is_default_bitstring(asn1_DEFAULT, _, _, _, _) ->
+    true;
+is_default_bitstring({Unused,Bin}, V0, V1, V2, V3) when is_integer(Unused) ->
+    %% Convert compact bitstring to a bitstring.
+    Sz = bit_size(Bin) - Unused,
+    <<Bs:Sz/bitstring,_:Unused>> = Bin,
+    is_default_bitstring(Bs, V0, V1, V2, V3);
+is_default_bitstring(Named, Named, _, _, _) ->
+    true;
+is_default_bitstring(Bs, _, Bs, _, _) ->
+    true;
+is_default_bitstring(List, _, _, List, _) ->
+    true;
+is_default_bitstring(Int, _, _, _, Int) ->
+    true;
+is_default_bitstring(Val, _, Def, _, _) when is_bitstring(Val) ->
+    Sz = bit_size(Def),
+    case Val of
+	<<Def:Sz/bitstring,T/bitstring>> ->
+	    NumZeroes = bit_size(T),
+	    case T of
+		<<0:NumZeroes>> -> true;
+		_ -> false
+	    end;
+	_ ->
+	    false
+    end;
+is_default_bitstring(Val, _, _, List, _) when is_list(Val) ->
+    is_default_bitstring_list(List, Val);
+is_default_bitstring(_, _, _, _, _) -> false.
+
+extension_bitmap(Val, Pos, Limit) ->
+    extension_bitmap(Val, Pos, Limit, 0).
+
+open_type_to_binary({asn1_OPENTYPE,Bin}) when is_binary(Bin) ->
+    Bin.
+
+legacy_open_type_to_binary({asn1_OPENTYPE,Bin}) when is_binary(Bin) ->
+    Bin;
+legacy_open_type_to_binary(Bin) when is_binary(Bin) ->
+    Bin;
+legacy_open_type_to_binary(List) when is_list(List) ->
+    List.
+
 %%%
 %%% Internal functions.
 %%%
@@ -124,3 +371,161 @@ dec_subidentifiers([H|T], Av, Al) ->
     dec_subidentifiers(T, 0, [(Av bsl 7) bor H|Al]);
 dec_subidentifiers([], _Av, Al) ->
     lists:reverse(Al).
+
+enc_char(C0, Lb, Tab) ->
+    try	element(C0-Lb, Tab) of
+	ill ->
+	    illegal_char_error();
+	C ->
+	    C
+    catch
+	error:badarg ->
+	    illegal_char_error()
+    end.
+
+illegal_char_error() ->
+    error({error,{asn1,"value forbidden by FROM constraint"}}).
+
+encode_fragmented_1(Bin, Unit, N) ->
+    SegSz = Unit * N * ?'16K',
+    case Bin of
+	<<B:SegSz/bitstring,T/bitstring>> ->
+	    [<<3:2,N:6>>,B|encode_fragmented_1(T, Unit, N)];
+	_ when N > 1 ->
+	    encode_fragmented_1(Bin, Unit, N-1);
+	_ ->
+	    case bit_size(Bin) div Unit of
+		Len when Len < 128 ->
+		    [Len,Bin];
+		Len when Len < 16384 ->
+		    [<<2:2,Len:14>>,Bin]
+	    end
+    end.
+
+%% 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,
+    e_object_elements([Head|Tail], []);
+e_object_identifier([_,_|_Tail]=Oid) ->
+    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]].
+
+enint(-1, [B1|T]) when B1 > 127 ->
+    [B1|T];
+enint(N, Acc) ->
+    enint(N bsr 8, [N band 16#ff|Acc]).
+
+diff([H|T], Prev) ->
+    [H-Prev|diff(T, H)];
+diff([], _) -> [].
+
+diff([H|T], Prev, Last) ->
+    [{1,H-Prev}|diff(T, H, Last)];
+diff([], Prev, Last) when Last >= Prev ->
+    [{0,Last-Prev}];
+diff([], _, _) -> [].
+
+int_to_bitlist(0) -> [];
+int_to_bitlist(Int) -> [Int band 1|int_to_bitlist(Int bsr 1)].
+
+adjust_size(Bs, Lb) ->
+    case bit_size(Bs) of
+	Sz when Sz < Lb ->
+	    <<Bs:Sz/bits,0:(Lb-Sz)>>;
+	_ ->
+	    Bs
+    end.
+
+adjust_trailing_zeroes(Bs0, Lb) ->
+    case bit_size(Bs0) of
+	Sz when Sz < Lb ->
+	    %% Too short - pad with zeroes.
+	    <<Bs0:Sz/bits,0:(Lb-Sz)>>;
+	Lb ->
+	    %% Exactly the right size - nothing to do.
+	    Bs0;
+	_ ->
+	    %% Longer than the lower bound - drop trailing zeroes.
+	    <<_:Lb/bits,Tail/bits>> = Bs0,
+	    Sz = Lb + bit_size(bs_drop_trailing_zeroes(Tail)),
+	    <<Bs:Sz/bits,_/bits>> = Bs0,
+	    Bs
+    end.
+
+bs_drop_trailing_zeroes(Bs) ->
+    bs_drop_trailing_zeroes(Bs, bit_size(Bs)).
+
+bs_drop_trailing_zeroes(Bs, 0) ->
+    Bs;
+bs_drop_trailing_zeroes(Bs0, Sz0) when Sz0 < 8 ->
+    <<Byte:Sz0>> = Bs0,
+    Sz = Sz0 - ntz(Byte),
+    <<Bs:Sz/bits,_/bits>> = Bs0,
+    Bs;
+bs_drop_trailing_zeroes(Bs0, Sz0) ->
+    Sz1 = Sz0 - 8,
+    <<Bs1:Sz1/bits,Byte:8>> = Bs0,
+    case ntz(Byte) of
+	8 ->
+	    bs_drop_trailing_zeroes(Bs1, Sz1);
+	Ntz ->
+	    Sz = Sz0 - Ntz,
+	    <<Bs:Sz/bits,_:Ntz/bits>> = Bs0,
+	    Bs
+    end.
+
+%% ntz(Byte) -> Number of trailing zeroes.
+ntz(Byte) ->
+    %% The table was calculated like this:
+    %%   NTZ = fun (B, N, NTZ) when B band 1 =:= 0 -> NTZ(B bsr 1, N+1, NTZ); (_, N, _) -> N end.
+    %%   io:format("~w\n", [list_to_tuple([NTZ(B+256, 0, NTZ) || B <- lists:seq(0, 255)])]).
+    T = {8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
+	 4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0},
+    element(Byte+1, T).
+
+is_default_bitstring_list([H|Def], [H|Val]) ->
+    is_default_bitstring_list(Def, Val);
+is_default_bitstring_list([], []) ->
+    true;
+is_default_bitstring_list([], [_|_]=Val) ->
+    lists:all(fun(0) -> true;
+		 (_) -> false
+	      end, Val);
+is_default_bitstring_list(_, _) -> false.
+
+extension_bitmap(_Val, Pos, Limit, Acc) when Pos >= Limit ->
+    Acc;
+extension_bitmap(Val, Pos, Limit, Acc) ->
+    Bit = case element(Pos, Val) of
+	      asn1_NOVALUE -> 0;
+	      _ -> 1
+	  end,
+    extension_bitmap(Val, Pos+1, Limit, (Acc bsl 1) bor Bit).
diff --git a/lib/asn1/src/asn1rtt_real_common.erl b/lib/asn1/src/asn1rtt_real_common.erl
index 22a1f4c4dd..12ca165ecd 100644
--- a/lib/asn1/src/asn1rtt_real_common.erl
+++ b/lib/asn1/src/asn1rtt_real_common.erl
@@ -105,8 +105,7 @@ encode_real(_C, {Mantissa, Base, Exponent}) when Base =:= 2 ->
 		     true    -> list_to_binary(real_mininum_octets(-(Man))) % signbit keeps track of sign
 		  end,
     %%    ok = io:format("LenMask: ~w EOctets: ~w~nFirstOctet: ~w OctMantissa: ~w OctExpLen: ~w~n", [LenMask, EOctets, FirstOctet, OctMantissa, OctExpLen]),
-    Bin = <<FirstOctet/binary, EOctets/binary, OctMantissa/binary>>,
-    {Bin, size(Bin)};
+    <<FirstOctet/binary, EOctets/binary, OctMantissa/binary>>;
 encode_real(C, {Mantissa,Base,Exponent})
   when Base =:= 10, is_integer(Mantissa), is_integer(Exponent) ->
     %% always encode as NR3 due to DER on the format
@@ -176,8 +175,7 @@ encode_real_as_string(_C, Mantissa, Exponent)
 	end,
     ManBin = list_to_binary(TruncMant),
     NR3 = 3,
-    {<<NR3,ManBin/binary,$.,ExpBin/binary>>,
-     2 + byte_size(ManBin) + byte_size(ExpBin)}.
+    <<NR3,ManBin/binary,$.,ExpBin/binary>>.
 
 remove_trailing_zeros(IntStr) ->
     case lists:dropwhile(fun($0)-> true;
diff --git a/lib/asn1/src/asn1rtt_uper.erl b/lib/asn1/src/asn1rtt_uper.erl
index a5035c6660..68a89c70e1 100644
--- a/lib/asn1/src/asn1rtt_uper.erl
+++ b/lib/asn1/src/asn1rtt_uper.erl
@@ -19,95 +19,8 @@
 %%
 -module(asn1rtt_uper).
 
--export([setext/1, fixoptionals/3,
-	 fixextensions/2,
-	 skipextensions/3]).
--export([set_choice/3, encode_integer/2, encode_integer/3]).
--export([encode_small_number/1, encode_constrained_number/2,
-	 encode_boolean/1,
-	 encode_length/1, encode_length/2,
-	 encode_bit_string/3]).
--export([encode_octet_string/1,encode_octet_string/2,
-	 encode_relative_oid/1,
-	 encode_object_identifier/1,
-	 complete/1, complete_NFP/1]).
-
- -export([encode_open_type/1]).
-
- -export([encode_UniversalString/3,
-	 encode_PrintableString/3,
-	 encode_GeneralString/2,
-	 encode_GraphicString/2,
-	 encode_TeletexString/2,
-	 encode_VideotexString/2,
-	 encode_VisibleString/3,
-	 encode_UTF8String/1,
-	 encode_BMPString/3,
-	 encode_IA5String/3,
-	 encode_NumericString/3,
-	 encode_ObjectDescriptor/2
-	]).
-
--define('16K',16384).
--define('32K',32768).
--define('64K',65536).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% setext(true|false) ->  CompleteList
-%%
-
-setext(false) ->
-    <<0:1>>;
-setext(true) ->
-    <<1:1>>.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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>>};
-
-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.
-
-
-fixextensions({ext,ExtPos,ExtNum},Val) ->
-    case fixextensions(ExtPos,ExtNum+ExtPos,Val,0) of
-	0 -> [];
-	ExtBits ->
-	    [encode_small_length(ExtNum),<<ExtBits:ExtNum>>]
-    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).
+-export([skipextensions/3]).
+-export([complete/1, complete_NFP/1]).
 
 skipextensions(Bytes0, Nr, ExtensionBitstr) when is_bitstring(ExtensionBitstr) ->
     Prev = Nr - 1,
@@ -122,249 +35,6 @@ skipextensions(Bytes0, Nr, ExtensionBitstr) when is_bitstring(ExtensionBitstr) -
 	    Bytes0
     end.
 
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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 ->
-	    [<<0:1>>, % the value is in the root set
-	     encode_integer([{'ValueRange',{0,Len1-1}}],N)];
-	N when is_integer(N) ->
-	    <<0:1>>; % no encoding if only 0 or 1 alternative
-	false ->
-	    [<<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.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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(Val) ->
-    [encode_length(byte_size(Val)),Val].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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:keyfind(V, 1, NamedNumberList) of
-	{_,NewV} ->
-	    encode_integer(C, NewV);
-	false ->
-	    exit({error,{asn1,{namednumber,V}}})
-    end;
-encode_integer(C, V, _NamedNumberList) when is_integer(V) ->
-    encode_integer(C, V).
-
-encode_integer([{Rc,_Ec}],Val) when is_tuple(Rc) ->
-    try
-	[<<0:1>>,encode_integer([Rc], Val)]
-    catch
-	_:{error,{asn1,_}} ->
-	    [<<1:1>>,encode_unconstrained_number(Val)]
-    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'} when Lb =< Val ->
-	    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.
-
-%% 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(Val) when Val < 64 ->
-    <<Val:7>>;
-encode_small_number(Val) ->
-    [<<1:1>>|encode_semi_constrained_number(0, Val)].
-
-%% X.691:10.7 Encoding of a semi-constrained whole number
-encode_semi_constrained_number(Lb, Val) ->
-    %% encoding in minimum number of octets preceeded by a length
-    Val2 = Val - Lb,
-    Bin = eint_bin_positive(Val2),
-    Size = byte_size(Bin),
-    if
-	Size < 128 ->
-	    [<<Size>>,Bin];
-	Size < 16384 ->
-	    [<<2:2,Size:14>>,Bin];
-	true ->
-	    [encode_length(Size),Bin]
-    end.
-
-encode_constrained_number({Lb,Ub}, Val) when Val >= Lb, Ub >= Val ->
-    Range = Ub - Lb + 1,
-    Val2 = Val - Lb,
-    NumBits = num_bits(Range),
-    <<Val2:NumBits>>;
-encode_constrained_number(Range,Val) ->
-    exit({error,{asn1,{integer_range,Range,value,Val}}}).
-
-%% X.691:10.8 Encoding of an unconstrained whole number
-
-encode_unconstrained_number(Val) when Val >= 0 ->
-    Oct = eint_bin_2Cs(Val),
-    Len = byte_size(Oct),
-    if
-	Len < 128 ->
-	    [<<Len>>,Oct]; % equiv with encode_length(undefined,Len) but faster
-	Len < 16384 ->
-	    [<<2:2,Len:14>>,Oct];
-	true ->
-	    [encode_length(Len),<<Len:16>>,Oct]
-    end;
-encode_unconstrained_number(Val) -> % negative
-    Oct = enint(Val,[]),
-    Len = byte_size(Oct),
-    if
-	Len < 128 ->
-	    [<<Len>>,Oct]; % equiv with encode_length(undefined,Len) but faster
-	Len < 16384 ->
-	    [<<2:2,Len:14>>,Oct];
-	true ->
-	    [encode_length(Len),Oct]
-    end.
-
-
-eint_bin_2Cs(Int) ->
-    case eint_bin_positive(Int) of
-	<<B,_/binary>> = Bin when B > 16#7f ->
-	    <<0,Bin/binary>>;
-	Bin -> Bin
-    end.
-
-%% returns the integer as a binary
-eint_bin_positive(Val) when Val < 16#100  ->
-    <<Val>>;
-eint_bin_positive(Val) when Val < 16#10000 ->
-    <<Val:16>>;
-eint_bin_positive(Val) when Val < 16#1000000 ->
-    <<Val:24>>;
-eint_bin_positive(Val) when Val < 16#100000000 ->
-    <<Val:32>>;
-eint_bin_positive(Val) ->
-    list_to_binary([eint_bin_positive2(Val bsr 32),<<Val:32>>]).
-
-eint_bin_positive2(Val) when Val < 16#100  ->
-    <<Val>>;
-eint_bin_positive2(Val) when Val < 16#10000 ->
-    <<Val:16>>;
-eint_bin_positive2(Val) when Val < 16#1000000 ->
-    <<Val:24>>;
-eint_bin_positive2(Val) when Val < 16#100000000 ->
-    <<Val:32>>;
-eint_bin_positive2(Val) ->
-    [eint_bin_positive2(Val bsr 32),<<Val:32>>].
-
-
-
-
-enint(-1, [B1|T]) when B1 > 127 ->
-    list_to_binary([B1|T]);
-enint(N, Acc) ->
-    enint(N bsr 8, [N band 16#ff|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(Len) -> % un-constrained
-    if
-	Len < 128 ->
-	    <<Len>>;
-	Len < 16384 ->
-	    <<2:2,Len:14>>;
-	true  -> % should be able to endode length >= 16384
-	    error({error,{asn1,{encode_length,{nyi,above_16k}}}})
-    end.
-
-encode_length({C,[]}, Len) ->
-    case C of
-	{Lb,Ub}=Vr when Lb =< Len, Len =< Ub ->
-	    [<<0:1>>|encode_constrained_number(Vr, Len)];
-	_ ->
-	    [<<1:1>>|encode_length(Len)]
-    end;
-encode_length(Len, Len) ->
-    [];
-encode_length(Vr, Len) ->
-    encode_constrained_number(Vr, Len).
-
-
-%% 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 ->
-    <<(Len-1):7>>;
-encode_small_length(Len) ->
-    [<<1:1>>,encode_length(Len)].
-
-
 %% un-constrained
 decode_length(<<0:1,Oct:7,Rest/bitstring>>)  ->
     {Oct,Rest};
@@ -373,575 +43,20 @@ decode_length(<<2:2,Val:14,Rest/bitstring>>)  ->
 decode_length(<<3:2,_:14,_Rest/bitstring>>)  ->
     exit({error,{asn1,{decode_length,{nyi,above_16k}}}}).
 
-						% X.691:11
-encode_boolean(true) ->
-    <<1:1>>;
-encode_boolean(false) ->
-    <<0:1>>;
-encode_boolean(Val) ->
-    exit({error,{asn1,{encode_boolean,Val}}}).
-
-
-%%============================================================================
-%%============================================================================
-%% 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 are present
-
-
-%% when the value is a list of {Unused,BinBits}, where
-%% Unused = integer(),
-%% BinBits = binary().
-
-encode_bit_string(C, Bits, NamedBitList) when is_bitstring(Bits) ->
-    PadLen = (8 - (bit_size(Bits) band 7)) band 7,
-    Compact = {PadLen,<<Bits/bitstring,0:PadLen>>},
-    encode_bit_string(C, Compact, NamedBitList);
-encode_bit_string(C, {Unused,BinBits}=Bin, NamedBitList)
-  when is_integer(Unused), is_binary(BinBits) ->
-    encode_bin_bit_string(C, Bin, NamedBitList);
-
-encode_bit_string(C, BitListVal, NamedBitList) ->
-    encode_bit_string1(C, BitListVal, NamedBitList).
-
-%% when the value is a list of named bits
-encode_bit_string1(C, [FirstVal|_RestVal]=LoNB, NamedBitList)
-  when is_atom(FirstVal) ->
-    ToSetPos = get_all_bitposes(LoNB, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos, 0),
-    encode_bit_string1(C, BitList, NamedBitList);
-encode_bit_string1(C, [{bit,_No}|_RestVal]=BL, NamedBitList) ->
-    ToSetPos = get_all_bitposes(BL, NamedBitList, []),
-    BitList = make_and_set_list(ToSetPos, 0),
-    encode_bit_string1(C, BitList, NamedBitList);
-%% when the value is a list of ones and zeroes
-encode_bit_string1(Int, BitListValue, _)
-  when is_list(BitListValue), is_integer(Int) ->
-    %% The type is constrained by a single value size constraint
-    bit_list2bitstr(Int, BitListValue);
-encode_bit_string1(no, BitListValue, [])
-  when is_list(BitListValue) ->
-    Len = length(BitListValue),
-    [encode_length(Len),bit_list2bitstr(Len,BitListValue)];
-encode_bit_string1(C, BitListValue,[])
-  when is_list(BitListValue) ->
-    Len = length(BitListValue),
-    [encode_length(C, Len),bit_list2bitstr(Len,BitListValue)];
-encode_bit_string1(no, BitListValue,_NamedBitList)
-  when is_list(BitListValue) ->
-    NewBitLVal = lists:reverse(lists:dropwhile(fun(0)->true;(1)->false end,
-					    lists:reverse(BitListValue))),
-    Len = length(NewBitLVal),
-    [encode_length(Len),bit_list2bitstr(Len,NewBitLVal)];
-encode_bit_string1(C, BitListValue, _NamedBitList)
-  when is_list(BitListValue) ->% C = {_,'MAX'}
-    NewBitStr = bitstr_trailing_zeros(BitListValue, C),
-    [encode_length(C, bit_size(NewBitStr)),NewBitStr];
-
-
-%% when the value is an integer
-encode_bit_string1(C, IntegerVal, NamedBitList) when is_integer(IntegerVal)->
-    BitList = int_to_bitlist(IntegerVal),
-    encode_bit_string1(C, BitList, NamedBitList).
-
-bit_list2bitstr(Len,BitListValue) ->
-    case length(BitListValue) of
-	Len ->
-	    << <<B:1>> || B <- BitListValue>>;
-	L when L > Len -> % truncate
-	    <<(<< <<B:1>> || B <- BitListValue>>):Len/bitstring>>;
-	L -> % Len > L -> pad
-	    <<(<< <<B:1>> || B <- BitListValue>>)/bitstring,0:(Len-L)>>
-	end.
-
-adjust_trailing_zeros(Len, Bin) when Len =:= bit_size(Bin) ->
-    Bin;
-adjust_trailing_zeros(Len, Bin) when Len > bit_size(Bin) ->
-    <<Bin/bitstring,0:(Len-bit_size(Bin))>>;
-adjust_trailing_zeros(Len,Bin) ->
-    <<Bin:Len/bitstring>>.
-
-bitstr_trailing_zeros(BitList, C) when is_integer(C) ->
-    bitstr_trailing_zeros1(BitList, C, C);
-bitstr_trailing_zeros(BitList, {Lb,Ub}) when is_integer(Lb) ->
-    bitstr_trailing_zeros1(BitList,Lb,Ub);
-bitstr_trailing_zeros(BitList, {{Lb,Ub},_}) when is_integer(Lb) ->
-    bitstr_trailing_zeros1(BitList, Lb, Ub);
-bitstr_trailing_zeros(BitList, _) ->
-    bit_list2bitstr(length(BitList), BitList).
-
-bitstr_trailing_zeros1(BitList, Lb, Ub) ->
-    case length(BitList) of
-	Lb -> bit_list2bitstr(Lb, BitList);
-	B when B < Lb -> bit_list2bitstr(Lb, BitList);
-	D -> F = fun(L,LB,LB,_,_)->bit_list2bitstr(LB,lists:reverse(L));
-		    ([0|R],L1,LB,UB,Fun)->Fun(R,L1-1,LB,UB,Fun);
-		    (L,L1,_,UB,_)when L1 =< UB ->
-			 bit_list2bitstr(L1,lists:reverse(L));
-		    (_,_L1,_,_,_) ->exit({error,{list_length_BIT_STRING,
-						 BitList}}) end,
-	     F(lists:reverse(BitList),D,Lb,Ub,F)
-    end.
-
-%% 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, {_,BinBits}, _NamedBitList)
-  when is_integer(C), C =< 16 ->
-    adjust_trailing_zeros(C, BinBits);
-encode_bin_bit_string(C, {_Unused,BinBits}, _NamedBitList)
-  when is_integer(C) ->
-    adjust_trailing_zeros(C, BinBits);
-encode_bin_bit_string(C, {_,_}=UnusedAndBin, NamedBitList) ->
-    %% removes all trailing bits if NamedBitList is not empty
-    BitStr = remove_trailing_bin(NamedBitList, UnusedAndBin),
-    case C of
-	{Lb,Ub} when is_integer(Lb),is_integer(Ub) ->
-	    [encode_length({Lb,Ub},bit_size(BitStr)),BitStr];
-	no ->
-	    [encode_length(bit_size(BitStr)),BitStr];
-	Sc ->
-	    [encode_length(Sc,bit_size(BitStr)),BitStr]
-    end.
-
-
-remove_trailing_bin([], {Unused,Bin}) ->
-    BS = bit_size(Bin)-Unused,
-    <<BitStr:BS/bitstring,_:Unused>> = Bin,
-    BitStr;
-remove_trailing_bin(_NamedNumberList, {_Unused,<<>>}) ->
-    <<>>;
-remove_trailing_bin(NamedNumberList, {_Unused,Bin}) ->
-    Size = byte_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});
-	_ ->
-	    BS = bit_size(Bin) - Unused2,
-	    <<BitStr:BS/bitstring,_:Unused2>> = Bin,
-	    BitStr
-    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.
-
-
-%%%%%%%%%%%%%%%
-%%
-
-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:keyfind(Val, 1, NamedBitList) of
-	{_ValName, ValPos} ->
-	    get_all_bitposes(Rest, NamedBitList, [ValPos | Ack]);
-	false ->
-	    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([], _) ->
-    [].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% X.691:16
-%% encode_octet_string(Val)
-%% encode_octet_string(Constraint, Val)
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-encode_octet_string(Val) ->
-    try
-	[encode_length(length(Val)),list_to_binary(Val)]
-    catch
-	error:{error,{asn1,{encode_length,_}}} ->
-	    encode_fragmented_octet_string(Val)
-    end.
-
-encode_octet_string(C, Val) ->
-    case C of
-	{_,_}=VR  ->
-	    try
-		[encode_length(VR, length(Val)),list_to_binary(Val)]
-	    catch
-		error:{error,{asn1,{encode_length,_}}} ->
-		    encode_fragmented_octet_string(Val)
-	    end;
-	Sv when is_integer(Sv), Sv =:= length(Val) -> % fixed length
-	    list_to_binary(Val)
-    end.
-
-
-encode_fragmented_octet_string(Val) ->
-    Bin = list_to_binary(Val),
-    efos_1(Bin).
-
-efos_1(<<B:16#10000/binary,T/binary>>) ->
-    [<<3:2,4:6>>,B|efos_1(T)];
-efos_1(<<B:16#C000/binary,T/binary>>) ->
-    [<<3:2,3:6>>,B|efos_1(T)];
-efos_1(<<B:16#8000/binary,T/binary>>) ->
-    [<<3:2,2:6>>,B|efos_1(T)];
-efos_1(<<B:16#4000/binary,T/binary>>) ->
-    [<<3:2,1:6>>,B|efos_1(T)];
-efos_1(<<B/bitstring>>) ->
-    Len = byte_size(B),
-    [encode_length(Len),B].
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Restricted char string types
-%% (NumericString, PrintableString,VisibleString,IA5String,BMPString,UniversalString)
-%% X.691:26 and X.680:34-36
-%%encode_restricted_string('BMPString',Constraints,Extension,Val)
-
-
-encode_restricted_string(Val) when is_list(Val)->
-    [encode_length(length(Val)),list_to_binary(Val)].
-
-encode_known_multiplier_string(StringType, C, Pa, Val) ->
-    Result = chars_encode(Pa, StringType, Val),
-    case C of
-	Ub when is_integer(Ub) ->
-	    Result;
-	{_,_}=Range ->
-	    [encode_length(Range, length(Val)),Result];
-	no  ->
-	    [encode_length(length(Val)),Result]
-    end.
-
-encode_NumericString(C, Pa, Val) ->
-    encode_known_multiplier_string('NumericString', C, Pa, Val).
-
-encode_PrintableString(C, Pa, Val) ->
-    encode_known_multiplier_string('PrintableString', C, Pa, Val).
-
-encode_VisibleString(C, Pa, Val) -> % equivalent with ISO646String
-    encode_known_multiplier_string('VisibleString', C, Pa, Val).
-
-encode_IA5String(C, Pa, Val) ->
-    encode_known_multiplier_string('IA5String', C, Pa, Val).
-
-encode_BMPString(C, Pa, Val) ->
-    encode_known_multiplier_string('BMPString', C, Pa, Val).
-
-encode_UniversalString(C, Pa, Val) ->
-    encode_known_multiplier_string('UniversalString', C, Pa, Val).
-
-
-%% end of known-multiplier strings for which PER visible constraints are
-%% applied
-
-encode_GeneralString(_C,Val) ->
-    encode_restricted_string(Val).
-
-encode_GraphicString(_C,Val) ->
-    encode_restricted_string(Val).
-
-encode_ObjectDescriptor(_C,Val) ->
-    encode_restricted_string(Val).
-
-encode_TeletexString(_C,Val) -> % equivalent with T61String
-    encode_restricted_string(Val).
-
-encode_VideotexString(_C,Val) ->
-    encode_restricted_string(Val).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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(Pa, StringType, Value) ->
-    case {StringType,Pa} 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(Pa, StringType),
-				    get_CharOutTab(Pa, StringType)},
-	    chars_encode2(Value,NumBits,CharOutTab)
-    end.
-
-chars_encode2([H|T],NumBits,{Min,Max,notab}) when  H =< Max, H >= Min ->
-    [<<(H-Min):NumBits>>|chars_encode2(T,NumBits,{Min,Max,notab})];
-chars_encode2([H|T],NumBits,{Min,Max,Tab}) when H =< Max, H >= Min ->
-    Ch = exit_if_false(H,element(H-Min+1,Tab)),
-    [<<Ch:NumBits>>|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)
-    Ch = ((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,
-    [<<Ch:NumBits>>|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)
-    Ch = exit_if_false({A,B,C,D},element(((((((A bsl 8)+B) bsl 8)+C) bsl 8)+D)-Min,Tab)),
-    [<<Ch:NumBits>>|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(Pa, StringType) ->
-    case Pa of
-	{'SingleValue',Sv} ->
-	    charbits(length(Sv));
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    charbits(128); % 16#00..16#7F
-		'VisibleString' ->
-		    charbits(95); % 16#20..16#7E
-		'PrintableString' ->
-		    charbits(74); % [$\s,$',$(,$),$+,$,,$-,$.,$/,"0123456789",$:,$=,$?,$A..$Z,$a..$z
-		'NumericString' ->
-		    charbits(11); % $ ,"0123456789"
-		'UniversalString' ->
-		    32;
-		'BMPString' ->
-		    16
-	    end
-    end.
-
-get_CharOutTab(Pa, StringType) ->
-    case Pa of
-	{'SingleValue',Sv} ->
-	    get_CharTab2(Pa, StringType, hd(Sv), lists:max(Sv), Sv);
-	no ->
-	    case StringType of
-		'IA5String' ->
-		    {0,16#7F,notab};
-		'VisibleString' ->
-		    get_CharTab2(Pa, StringType, 16#20, 16#7F, notab);
-		'PrintableString' ->
-		    Chars = lists:sort(
-			      " '()+,-./0123456789:=?ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"),
-		    get_CharTab2(Pa, StringType, hd(Chars),
-				 lists:max(Chars), Chars);
-		'NumericString' ->
-		    get_CharTab2(Pa, StringType, 16#20, $9, " 0123456789");
-		'UniversalString' ->
-		    {0,16#FFFFFFFF,notab};
-		'BMPString' ->
-		    {0,16#FFFF,notab}
-	    end
-    end.
-
-get_CharTab2(C,StringType,Min,Max,Chars) ->
-    BitValMax = (1 bsl get_NumBits(C,StringType))-1,
-    if
-	Max =< BitValMax ->
-	    {0,Max,notab};
-	true ->
-	    {Min,Max,create_char_tab(Min,Chars)}
-    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)].
-
-%% See Table 20.3 in Dubuisson
-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).
-
-
-%% UTF8String
-encode_UTF8String(Val) when is_binary(Val) ->
-    [encode_length(byte_size(Val)),Val];
-encode_UTF8String(Val) ->
-    Bin = list_to_binary(Val),
-    encode_UTF8String(Bin).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% 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 -> [binary()|bitstring()|list()]
-%%
-encode_object_identifier(Val) ->
-    OctetList = e_object_identifier(Val),
-    Octets = list_to_binary(OctetList), % performs a flatten at the same time
-    [encode_length(byte_size(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(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]].
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% encode_relative_oid(Val) -> CompleteList
-%% encode_relative_oid({Name,Val}) -> CompleteList
-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(byte_size(Octets)),Octets].
-
-
-get_constraint([{Key,V}],Key) ->
-    V;
-get_constraint([],_Key) ->
-    no;
-get_constraint(C,Key) ->
-    case lists:keyfind(Key, 1, C) of
-	false ->
-	    no;
-	{_,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(InList) when is_list(InList) ->
-    case complete1(InList) of
+    case list_to_bitstring(InList) of
 	<<>> ->
 	    <<0>>;
 	Res ->
-	    case bit_size(Res) band 7 of
+	    Sz = bit_size(Res),
+	    case Sz band 7 of
 		0 -> Res;
-		Bits -> <<Res/bitstring,0:(8-Bits)>>
+		Bits -> <<Res:Sz/bitstring,0:(8-Bits)>>
 	end
     end;
 complete(Bin) when is_binary(Bin) ->
@@ -950,24 +65,12 @@ complete(Bin) when is_binary(Bin) ->
 	_ -> Bin
     end;
 complete(InList) when is_bitstring(InList) ->
-    PadLen = 8 - (bit_size(InList) band 7),
-    <<InList/bitstring,0:PadLen>>.
-
-complete1(L) when is_list(L) ->
-    list_to_bitstring(L).
+    Sz = bit_size(InList),
+    PadLen = 8 - (Sz band 7),
+    <<InList:Sz/bitstring,0:PadLen>>.
 
 %% Special version of complete that does not align the completed message.
 complete_NFP(InList) when is_list(InList) ->
     list_to_bitstring(InList);
 complete_NFP(InList) when is_bitstring(InList) ->
     InList.
-
-%% unaligned helpers
-
-%% 10.5.6 NOTE: If "range" satisfies the inequality 2^m < "range" =<
-%% 2^(m+1) then the number of bits = m + 1
-
-num_bits(N) -> num_bits(N, 1, 0).
-
-num_bits(N,T,B) when N =< T -> B;
-num_bits(N,T,B) -> num_bits(N, T bsl 1, B+1).
diff --git a/lib/asn1/src/prepare_templates.erl b/lib/asn1/src/prepare_templates.erl
index 83155b2e52..ccd15548d8 100644
--- a/lib/asn1/src/prepare_templates.erl
+++ b/lib/asn1/src/prepare_templates.erl
@@ -21,69 +21,77 @@
 -export([gen_asn1ct_rtt/1,gen_asn1ct_eval/1]).
 
 gen_asn1ct_rtt(Ms) ->
-    io:format("%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
+    {ok,Fd} = file:open("asn1ct_rtt.erl", [write]),
+    io:format(Fd,
+	      "%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
 	      "%%\n"
 	      "%% Input files:\n", [?MODULE]),
-    [io:put_chars(["%%  ",M,$\n]) || M <- Ms],
-    io:nl(),
-    io:put_chars("-module(asn1ct_rtt).\n"
+    [io:put_chars(Fd, ["%%  ",M,$\n]) || M <- Ms],
+    io:nl(Fd),
+    io:put_chars(Fd,
+		 "-module(asn1ct_rtt).\n"
 		 "-export([assert_defined/1,dependencies/1,code/0]).\n"
 		 "\n"),
     Forms = lists:sort(lists:append([abstract(M) || M <- Ms])),
     Exp = lists:sort(exports(Forms)),
-    defined(Exp),
-    io:nl(),
+    defined(Fd, Exp),
+    io:nl(Fd),
     Calls = calls(Forms),
     R = sofs:relation(Calls),
     Fam0 = sofs:relation_to_family(R),
     Fam = sofs:to_external(Fam0),
-    dependencies(Fam),
-    io:nl(),
+    dependencies(Fd, Fam),
+    io:nl(Fd),
     Funcs = [begin
 		 Bin = list_to_binary([$\n|erl_pp:function(Func)]),
 		 {{M,F,A},Bin}
 	     end || {M,{function,_,F,A,_}=Func} <- Forms],
-    io:format("code() ->\n~p.\n\n", [Funcs]),
+    io:format(Fd, "code() ->\n~p.\n\n", [Funcs]),
+    ok = file:close(Fd),
     halt(0).
 
 gen_asn1ct_eval([File]) ->
+    Output = filename:rootname(File, ".funcs") ++ ".erl",
+    {ok,Fd} = file:open(Output, [write]),
     {ok,Funcs} = file:consult(File),
     asn1ct_func:start_link(),
     [asn1ct_func:need(MFA) || MFA <- Funcs],
-    io:format("%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
+    io:format(Fd,
+	      "%% Generated by ~s. DO NOT EDIT THIS FILE.\n"
 	      "%%\n"
 	      "%% Input file: ~s\n\n", [?MODULE,File]),
-    io:format("-module(~s).\n", [filename:rootname(File)]),
-    gen_asn1ct_eval_exp(Funcs),
-    asn1ct_func:generate(group_leader()),
+    io:format(Fd, "-module(~s).\n", [filename:rootname(File)]),
+    gen_asn1ct_eval_exp(Fd, Funcs),
+    asn1ct_func:generate(Fd),
+    ok = file:close(Fd),
     halt(0).
 
-gen_asn1ct_eval_exp(Funcs) ->
-    io:put_chars("-export(["),
-    gen_asn1ct_eval_exp_1(Funcs, ""),
-    io:put_chars("]).\n").
+gen_asn1ct_eval_exp(Fd, Funcs) ->
+    io:put_chars(Fd, "-export(["),
+    gen_asn1ct_eval_exp_1(Fd, Funcs, ""),
+    io:put_chars(Fd, "]).\n").
 
-gen_asn1ct_eval_exp_1([{_,F,A}|T], Sep) ->
-    io:put_chars(Sep),
-    io:format("~p/~p", [F,A]),
-    gen_asn1ct_eval_exp_1(T, ",\n");
-gen_asn1ct_eval_exp_1([], _) -> ok.
+gen_asn1ct_eval_exp_1(Fd, [{_,F,A}|T], Sep) ->
+    io:put_chars(Fd, Sep),
+    io:format(Fd, "~p/~p", [F,A]),
+    gen_asn1ct_eval_exp_1(Fd, T, ",\n");
+gen_asn1ct_eval_exp_1(_, [], _) -> ok.
 
-defined([H|T]) ->
-    io:format("assert_defined(~p) -> ok", [H]),
+defined(Fd, [H|T]) ->
+    io:format(Fd, "assert_defined(~p) -> ok", [H]),
     case T of
 	[] ->
-	    io:put_chars(".\n");
+	    io:put_chars(Fd, ".\n");
 	[_|_] ->
-	    io:put_chars(";\n"),
-	    defined(T)
+	    io:put_chars(Fd, ";\n"),
+	    defined(Fd, T)
     end.
 
-dependencies([{K,V}|T]) ->
-    io:format("dependencies(~p) ->\n~p;\n", [K,V]),
-    dependencies(T);
-dependencies([]) ->
-    io:put_chars("dependencies(_) -> [].\n").
+dependencies(Fd, [{K,V}|T]) ->
+    io:format(Fd, "dependencies(~p) ->\n~p;\n", [K,V]),
+    dependencies(Fd, T);
+dependencies(Fd, []) ->
+    io:put_chars(Fd, "dependencies(_) -> [].\n").
 
 abstract(File) ->
     {ok,{M0,[{abstract_code,Abstract}]}} =
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 15b97df972..b1b08aa9f9 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -26,7 +26,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 MODULES= \
 	h323test \
-	choice_extension \
 	ber_decode_error \
 	testPrim \
 	testPrimStrings \
@@ -36,7 +35,6 @@ MODULES= \
 	testChoExtension \
 	testChoExternal \
 	testChoOptional \
-	testChoOptionalImplicitTag \
 	testChoRecursive \
 	testChoTypeRefCho \
 	testChoTypeRefPrim \
@@ -51,12 +49,12 @@ MODULES= \
 	testSeqOptional \
 	testSeq2738 \
 	testSeqPrim \
+	testSeqSetIndefinite \
 	testSeqTag \
 	testSeqTypeRefCho \
 	testSeqTypeRefPrim \
 	testSeqTypeRefSeq \
 	testSeqTypeRefSet \
-	testSeqIndefinite \
 	testSeqOf \
 	testSeqOfIndefinite \
 	testSeqOfCho \
@@ -72,7 +70,6 @@ MODULES= \
 	testSetTypeRefPrim \
 	testSetTypeRefSeq \
 	testSetTypeRefSet \
-	testSetIndefinite \
 	testChoiceIndefinite \
 	testSetOf \
 	testSetOfCho \
@@ -82,6 +79,7 @@ MODULES= \
 	testInfObjectClass \
 	testInfObj \
 	testParameterizedInfObj \
+	testFragmented \
 	testMergeCompile \
 	testMultipleLevels \
 	testDeepTConstr \
@@ -99,7 +97,6 @@ MODULES= \
 	test_special_decode_performance \
 	testTCAP \
 	testSSLspecs \
-	test_driver_load \
 	testSelectionTypes \
 	test_undecoded_rest \
 	testTcapsystem \
@@ -113,12 +110,9 @@ MODULES= \
 	asn1_test_lib \
 	asn1_app_test \
 	asn1_appup_test \
-	asn1_wrapper \
 	asn1_SUITE \
 	error_SUITE
 
-SUITE= asn1_SUITE.erl
-
 ERL_FILES= $(MODULES:%=%.erl)
 
 HRL_FILES= External.hrl
@@ -143,7 +137,7 @@ EBIN = .
 $(EMAKEFILE): $(ERL_FILES) $(HRL_FILES)
 	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERL_FILES) >$(EMAKEFILE)
 
-tests debug opt: $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) $(EMAKEFILE)
+tests debug opt: $(EMAKEFILE)
 
 clean:
 	rm -f core
@@ -160,7 +154,7 @@ 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) $(EMAKEFILE) $(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" *
diff --git a/lib/asn1/test/asn1_SUITE.erl b/lib/asn1/test/asn1_SUITE.erl
index f00b23a8b2..d438300596 100644
--- a/lib/asn1/test/asn1_SUITE.erl
+++ b/lib/asn1/test/asn1_SUITE.erl
@@ -67,10 +67,10 @@ groups() ->
 
      {parallel, parallel([]),
       [cover,
+       xref,
        {group, ber},
        % Uses 'P-Record', 'Constraints', 'MEDIA-GATEWAY-CONTROL'...
        {group, [], [parse,
-                    test_driver_load,
                     test_undecoded_rest,
                     specialized_decodes,
                     special_decode_performance,
@@ -83,38 +83,24 @@ groups() ->
        {group, [], [testPrim,
                     rtUI,
                     testPrimStrings,
-                    testInvokeMod,
                     per,
                     ber_other,
 		    der,
-                    h323test,
-                    per_GeneralString]},
+                    h323test]},
        testChoPrim,
        testChoExtension,
        testChoOptional,
-       testChoOptionalImplicitTag,
        testChoRecursive,
        testChoTypeRefCho,
        testChoTypeRefPrim,
        testChoTypeRefSeq,
        testChoTypeRefSet,
        testMultipleLevels,
-       testDef,
        testOpt,
        testSeqDefault,
        % Uses 'External'
-       {group, [], [testChoExternal,
-                    testPrimExternal,
-                    testSeqExtension,
-                    testSeqExternal,
-                    testSeqOfExternal,
-                    testSeqOfTag,
-                    testSeqTag,
-                    testSetExtension,
-                    testSetExternal,
-                    testSetOfExternal,
-                    testSetOfTag,
-                    testSetTag]},
+       {group, [], [testExternal,
+                    testSeqExtension]},
        testSeqOptional,
        testSeqPrim,
        testSeqTypeRefCho,
@@ -143,21 +129,20 @@ groups() ->
        % Uses 'Constructed'
        {group, [], [constructed,
                     ber_decode_error]},
-       % Uses 'SeqSetIndefinite'
-       {group, [], [testSeqIndefinite,
-                    testSetIndefinite]},
+       testSeqSetIndefinite,
        testChoiceIndefinite,
        per_open_type,
        testInfObjectClass,
        testParameterizedInfObj,
+       testFragmented,
        testMergeCompile,
        testobj,
        testDeepTConstr,
        testExport,
        testImport,
-       % Uses 'ParamBasic'
-       {group, [], [testParamBasic,
-                    testDER]},
+       testParamBasic,
+       testDER,
+       testDEFAULT,
        testMvrasn6,
        testContextSwitchingTypes,
        testOpenTypeImplicitTag,
@@ -186,8 +171,7 @@ groups() ->
      {performance, [],
       [testTimer_ber,
        testTimer_per,
-       testTimer_uper,
-       smp]}].
+       testTimer_uper]}].
 
 parallel(Options) ->
     case erlang:system_info(smp_support) andalso
@@ -284,13 +268,6 @@ replace_path(PathA, PathB) ->
 join(Rule, Opts) ->
     string:join([atom_to_list(Rule)|lists:map(fun atom_to_list/1, Opts)], "_").
 
-case_dir([], _Dir) ->
-    exit(no_case_dir);
-case_dir([{case_dir, _}|Config], Dir) ->
-    [{case_dir, Dir}|Config];
-case_dir([C|Config], Opt) ->
-    [C|case_dir(Config, Opt)].
-
 %%------------------------------------------------------------------------------
 %% Test cases
 %%------------------------------------------------------------------------------
@@ -319,7 +296,15 @@ cover(_) ->
 
 testPrim(Config) -> test(Config, fun testPrim/3).
 testPrim(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["Prim", "Real"], Config, [Rule|Opts]),
+    Files = ["Prim","Real"],
+    asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
+    do_test_prim(Rule, false),
+    asn1_test_lib:compile_all(Files, Config, [no_ok_wrapper,Rule|Opts]),
+    do_test_prim(Rule, true).
+
+do_test_prim(Rule, NoOkWrapper) ->
+    io:format("No ok wrapper: ~p\n", [NoOkWrapper]),
+    put(no_ok_wrapper, NoOkWrapper),
     testPrim:bool(Rule),
     testPrim:int(Rule),
     testPrim:enum(Rule),
@@ -340,37 +325,61 @@ testCompactBitString(Config, Rule, Opts) ->
 			  [Rule, compact_bit_string|Opts]),
     testCompactBitString:otp_4869(Rule).
 
-testPrimStrings(Config) -> test(Config, fun testPrimStrings/3).
+testPrimStrings(Config) ->
+    test(Config, fun testPrimStrings/3, [ber,{ber,[der]},per,uper]).
 testPrimStrings(Config, Rule, Opts) ->
+    LegacyOpts = [legacy_erlang_types|Opts],
+    asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
+			      [Rule|LegacyOpts]),
+    testPrimStrings_cases(Rule, LegacyOpts),
     asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config, [Rule|Opts]),
-    testPrimStrings_cases(Rule),
+    testPrimStrings_cases(Rule, Opts),
     asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
 			      [legacy_bit_string,Rule|Opts]),
-    testPrimStrings:bit_string(Rule),
+    testPrimStrings:bit_string(Rule, Opts),
     asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
 			      [compact_bit_string,Rule|Opts]),
-    testPrimStrings:bit_string(Rule),
+    testPrimStrings:bit_string(Rule, Opts),
     testPrimStrings:more_strings(Rule).
 
-testPrimStrings_cases(Rule) ->
-    testPrimStrings:bit_string(Rule),
+testPrimStrings_cases(Rule, Opts) ->
+    testPrimStrings:bit_string(Rule, Opts),
     testPrimStrings:octet_string(Rule),
     testPrimStrings:numeric_string(Rule),
     testPrimStrings:other_strings(Rule),
     testPrimStrings:universal_string(Rule),
     testPrimStrings:bmp_string(Rule),
     testPrimStrings:times(Rule),
-    testPrimStrings:utf8_string(Rule).
+    testPrimStrings:utf8_string(Rule),
+    testPrimStrings:fragmented(Rule).
 
-testPrimExternal(Config) -> test(Config, fun testPrimExternal/3).
-testPrimExternal(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "PrimExternal"], Config,
-                              [Rule|Opts]),
+testExternal(Config) -> test(Config, fun testExternal/3).
+testExternal(Config, Rule, Opts) ->
+    asn1_test_lib:compile_all(["External",
+			       "ChoExternal",
+			       "PrimExternal",
+			       "SeqExternal",
+			       "SeqOfExternal",
+			       "SeqOfTag",
+			       "SeqTag",
+			       "SetExtension",
+			       "SetExternal",
+			       "SetOfExternal",
+			       "SetOfTag",
+			       "SetTag"],
+			      Config, [Rule|Opts]),
+    testChoExternal:external(Rule),
     testPrimExternal:external(Rule),
-    asn1_test_lib:compile_all(["PrimStrings", "BitStr"], Config,
-			      [Rule|Opts]),
-    testPrimStrings_cases(Rule),
-    testPrimStrings:more_strings(Rule).
+    testSeqExternal:main(Rule),
+    testSeqOfExternal:main(Rule),
+    testSeqOfTag:main(Rule),
+    testSeqTag:main(Rule),
+    testSetExtension:main(Rule),
+    testSetExternal:main(Rule),
+    testSetOfExternal:main(Rule),
+    testSetOfTag:main(Rule),
+    testSetTag:main(Rule).
+
 
 testChoPrim(Config) -> test(Config, fun testChoPrim/3).
 testChoPrim(Config, Rule, Opts) ->
@@ -383,23 +392,11 @@ testChoExtension(Config, Rule, Opts) ->
     asn1_test_lib:compile("ChoExtension", Config, [Rule|Opts]),
     testChoExtension:extension(Rule).
 
-testChoExternal(Config) -> test(Config, fun testChoExternal/3).
-testChoExternal(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "ChoExternal"], Config, [Rule|Opts]),
-    testChoExternal:external(Rule).
-
 testChoOptional(Config) -> test(Config, fun testChoOptional/3).
 testChoOptional(Config, Rule, Opts) ->
-    asn1_test_lib:compile("ChoOptional", Config, [Rule|Opts]),
-    testChoOptional:optional(Rule).
-
-testChoOptionalImplicitTag(Config) ->
-    test(Config, fun testChoOptionalImplicitTag/3,
-	 [ber]).
-testChoOptionalImplicitTag(Config, Rule, Opts) ->
-    %% Only meaningful for ber & co
-    asn1_test_lib:compile("ChoOptionalImplicitTag", Config, [Rule|Opts]),
-    testChoOptionalImplicitTag:optional(Rule).
+    asn1_test_lib:compile_all(["ChoOptional",
+			       "ChoOptionalImplicitTag"], Config, [Rule|Opts]),
+    testChoOptional:run().
 
 testChoRecursive(Config) -> test(Config, fun testChoRecursive/3).
 testChoRecursive(Config, Rule, Opts) ->
@@ -436,6 +433,14 @@ testDef(Config, Rule, Opts) ->
     asn1_test_lib:compile("Def", Config, [Rule|Opts]),
     testDef:main(Rule).
 
+testDEFAULT(Config) ->
+    test(Config, fun testDEFAULT/3, [ber,{ber,[der]},per,uper]).
+testDEFAULT(Config, Rule, Opts) ->
+    asn1_test_lib:compile_all(["Def","Default"], Config,
+			      [legacy_erlang_types,Rule|Opts]),
+    testDef:main(Rule),
+    testSeqSetDefaultVal:main(Rule, Opts).
+
 testOpt(Config) -> test(Config, fun testOpt/3).
 testOpt(Config, Rule, Opts) ->
     asn1_test_lib:compile("Opt", Config, [Rule|Opts]),
@@ -452,7 +457,7 @@ testSeqDefault(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqDefault", Config, [Rule|Opts]),
     testSeqDefault:main(Rule).
 
-testSeqExtension(Config) -> test(Config, fun testSeqExtension/3).
+testSeqExtension(Config) -> test(Config, fun testSeqExtension/3, [ber,uper]).
 testSeqExtension(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(["External",
 			       "SeqExtension",
@@ -462,11 +467,6 @@ testSeqExtension(Config, Rule, Opts) ->
     DataDir = ?config(data_dir, Config),
     testSeqExtension:main(Rule, DataDir, [Rule|Opts]).
 
-testSeqExternal(Config) -> test(Config, fun testSeqExternal/3).
-testSeqExternal(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SeqExternal"], Config, [Rule|Opts]),
-    testSeqExternal:main(Rule).
-
 testSeqOptional(Config) -> test(Config, fun testSeqOptional/3).
 testSeqOptional(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqOptional", Config, [Rule|Opts]),
@@ -483,11 +483,6 @@ testSeq2738(Config, Rule, Opts) ->
     asn1_test_lib:compile("Seq2738", Config, [Rule|Opts]),
     testSeq2738:main(Rule).
 
-testSeqTag(Config) -> test(Config, fun testSeqTag/3).
-testSeqTag(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SeqTag"], Config, [Rule|Opts]),
-    testSeqTag:main(Rule).
-
 testSeqTypeRefCho(Config) -> test(Config, fun testSeqTypeRefCho/3).
 testSeqTypeRefCho(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqTypeRefCho", Config, [Rule|Opts]),
@@ -528,38 +523,17 @@ testSeqOfIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
     testSeqOfIndefinite:main().
 
-testSeqOfExternal(Config) -> test(Config, fun testSeqOfExternal/3).
-testSeqOfExternal(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SeqOfExternal"], Config,
-                              [Rule|Opts]),
-    testSeqOfExternal:main(Rule).
-
-testSeqOfTag(Config) -> test(Config, fun testSeqOfTag/3).
-testSeqOfTag(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SeqOfTag"], Config, [Rule|Opts]),
-    testSeqOfTag:main(Rule).
-
 testSetDefault(Config) -> test(Config, fun testSetDefault/3).
 testSetDefault(Config, Rule, Opts) ->
     asn1_test_lib:compile("SetDefault", Config, [Rule|Opts]),
     testSetDefault:main(Rule).
 
-testParamBasic(Config) -> test(Config, fun testParamBasic/3).
+testParamBasic(Config) ->
+    test(Config, fun testParamBasic/3, [ber,{ber,[der]},per,uper]).
 testParamBasic(Config, Rule, Opts) ->
     asn1_test_lib:compile("ParamBasic", Config, [Rule|Opts]),
     testParamBasic:main(Rule).
 
-testSetExtension(Config) -> test(Config, fun testSetExtension/3).
-testSetExtension(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SetExtension"], Config,
-                              [Rule|Opts]),
-    testSetExtension:main(Rule).
-
-testSetExternal(Config) -> test(Config, fun testSetExternal/3).
-testSetExternal(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SetExternal"], Config, [Rule|Opts]),
-    testSetExternal:main(Rule).
-
 testSetOptional(Config) -> test(Config, fun testSetOptional/3).
 testSetOptional(Config, Rule, Opts) ->
     asn1_test_lib:compile("SetOptional", Config, [Rule|Opts]),
@@ -571,11 +545,6 @@ testSetPrim(Config, Rule, Opts) ->
     asn1_test_lib:compile("SetPrim", Config, [Rule|Opts]),
     testSetPrim:main(Rule).
 
-testSetTag(Config) -> test(Config, fun testSetTag/3).
-testSetTag(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SetTag"], Config, [Rule|Opts]),
-    testSetTag:main(Rule).
-
 testSetTypeRefCho(Config) -> test(Config, fun testSetTypeRefCho/3).
 testSetTypeRefCho(Config, Rule, Opts) ->
     asn1_test_lib:compile("SetTypeRefCho", Config, [Rule|Opts]),
@@ -606,17 +575,6 @@ testSetOfCho(Config, Rule, Opts) ->
     asn1_test_lib:compile("SetOfCho", Config, [Rule|Opts]),
     testSetOfCho:main(Rule).
 
-testSetOfExternal(Config) -> test(Config, fun testSetOfExternal/3).
-testSetOfExternal(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SetOfExternal"], Config,
-                              [Rule|Opts]),
-    testSetOfExternal:main(Rule).
-
-testSetOfTag(Config) -> test(Config, fun testSetOfTag/3).
-testSetOfTag(Config, Rule, Opts) ->
-    asn1_test_lib:compile_all(["External", "SetOfTag"], Config, [Rule|Opts]),
-    testSetOfTag:main(Rule).
-
 c_syntax(Config) ->
     DataDir = ?config(data_dir, Config),
     [{error, _} = asn1ct:compile(filename:join(DataDir, F))
@@ -714,10 +672,7 @@ ber_optional(Config, Rule, Opts) ->
     V = {'S', {'A', 10, asn1_NOVALUE, asn1_NOVALUE},
               {'B', asn1_NOVALUE, asn1_NOVALUE, asn1_NOVALUE},
               {'C', asn1_NOVALUE, 111, asn1_NOVALUE}},
-    {ok, B} = asn1_wrapper:encode('SOpttest', 'S', V),
-    Bytes = lists:flatten(B),
-    V2 = asn1_wrapper:decode('SOpttest', 'S', Bytes),
-    V = element(2, V2).
+    asn1_test_lib:roundtrip('SOpttest', 'S', V).
 
 %% records used by test-case default
 -record('Def1', {bool0,
@@ -728,14 +683,16 @@ ber_optional(Config, Rule, Opts) ->
 default(Config) -> test(Config, fun default/3).
 default(Config, Rule, Opts) ->
     asn1_test_lib:compile("Def", Config, [Rule|Opts]),
-    {ok, Bytes1} = asn1_wrapper:encode('Def', 'Def1', #'Def1'{bool0 = true}),
-    {ok, {'Def1', true, false, false, false}} =
-        asn1_wrapper:decode('Def', 'Def1', lists:flatten(Bytes1)),
-
-    {ok, Bytes2} = asn1_wrapper:encode('Def', 'Def1', #'Def1'{bool0 = true,
-                                                              bool2 = false}),
-    {ok, {'Def1', true, false, false, false}} =
-        asn1_wrapper:decode('Def', 'Def1', lists:flatten(Bytes2)).
+    asn1_test_lib:roundtrip('Def',
+			    'Def1',
+			    #'Def1'{bool0=true},
+			    #'Def1'{bool0=true,bool1=false,
+				    bool2=false,bool3=false}),
+    asn1_test_lib:roundtrip('Def',
+			    'Def1',
+			    #'Def1'{bool0=true,bool2=false},
+			    #'Def1'{bool0=true,bool1=false,
+				    bool2=false,bool3=false}).
 
 value_test(Config) -> test(Config, fun value_test/3).
 value_test(Config, Rule, Opts) ->
@@ -747,12 +704,13 @@ constructed(Config) ->
     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}),
-    [40, 3, 1, 1, 0] = lists:flatten(B),
-    {ok, B1} = asn1_wrapper:encode('Constructed', 'S2', {'S2', false}),
-    [40, 5, 48, 3, 1, 1, 0] = lists:flatten(B1),
-    {ok, B2} = asn1_wrapper:encode('Constructed', 'I', 10),
-    [136, 1, 10] = lists:flatten(B2).
+    <<40,3,1,1,0>> =
+	asn1_test_lib:roundtrip_enc('Constructed', 'S', {'S',false}),
+    <<40,5,48,3,1,1,0>> =
+	asn1_test_lib:roundtrip_enc('Constructed', 'S2', {'S2',false}),
+    <<136,1,10>> =
+	asn1_test_lib:roundtrip_enc('Constructed', 'I', 10),
+    ok.
 
 ber_decode_error(Config) ->
     test(Config, fun ber_decode_error/3, [ber]).
@@ -767,14 +725,6 @@ h323test(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
     h323test:run(Rule).
 
-per_GeneralString(Config) ->
-    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_open_type(Config, Rule, Opts) ->
     asn1_test_lib:compile("OpenType", Config, [Rule|Opts]),
@@ -784,24 +734,17 @@ 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]).
-
-testSeqIndefinite(Config, Rule, Opts) ->
-    asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
-    testSeqIndefinite:main(Rule).
-
-
-testSetIndefinite(Config) ->
-    test(Config, fun testSetIndefinite/3, [ber]).
+    testConstraints:int_constraints(Rule),
+    case Rule of
+	ber -> ok;
+	_ -> testConstraints:refed_NNL_name(Rule)
+    end.
 
-testSetIndefinite(Config, Rule, Opts) ->
+testSeqSetIndefinite(Config) ->
+    test(Config, fun testSeqSetIndefinite/3, [ber]).
+testSeqSetIndefinite(Config, Rule, Opts) ->
     asn1_test_lib:compile("SeqSetIndefinite", Config, [Rule|Opts]),
-    testSetIndefinite:main(Rule).
-
+    testSeqSetIndefinite:main().
 
 testChoiceIndefinite(Config) ->
     test(Config, fun testChoiceIndefinite/3, [ber]).
@@ -828,7 +771,16 @@ testParameterizedInfObj(Config) ->
 testParameterizedInfObj(Config, Rule, Opts) ->
     Files = ["Param","Param2"],
     asn1_test_lib:compile_all(Files, Config, [Rule|Opts]),
-    testParameterizedInfObj:main(Config, Rule).
+    testParameterizedInfObj:main(Config, Rule),
+    asn1_test_lib:compile("Param", Config,
+			  [legacy_erlang_types,Rule|Opts]),
+    testParameterizedInfObj:param(Rule).
+
+testFragmented(Config) ->
+    test(Config, fun testFragmented/3).
+testFragmented(Config, Rule, Opts) ->
+    asn1_test_lib:compile("Fragmented", Config, [Rule|Opts]),
+    testFragmented:main(Rule).
 
 testMergeCompile(Config) -> test(Config, fun testMergeCompile/3).
 testMergeCompile(Config, Rule, Opts) ->
@@ -840,7 +792,8 @@ testMergeCompile(Config, Rule, Opts) ->
 
 testobj(Config) -> test(Config, fun testobj/3).
 testobj(Config, Rule, Opts) ->
-    asn1_test_lib:compile("RANAP", Config, [Rule|Opts]),
+    asn1_test_lib:compile("RANAP", Config, [legacy_erlang_types,
+					    Rule|Opts]),
     asn1_test_lib:compile_erlang("testobj", Config, []),
     ok = testobj:run(),
     ok = testParameterizedInfObj:ranap(Rule).
@@ -851,11 +804,6 @@ testDeepTConstr(Config, Rule, Opts) ->
                               [Rule|Opts]),
     testDeepTConstr:main(Rule).
 
-testInvokeMod(Config) -> test(Config, fun testInvokeMod/3).
-testInvokeMod(Config, Rule, Opts) ->
-    asn1_test_lib:compile("PrimStrings", Config, [Rule|Opts]),
-    {ok, _Result2} = 'PrimStrings':encode('Bs1', [1, 0, 1, 0]).
-
 testExport(Config) ->
     {error, _} =
 	asn1ct:compile(filename:join(?config(data_dir, Config),
@@ -872,7 +820,8 @@ testImport(Config, Rule, Opts) ->
 
 testMegaco(Config) -> test(Config, fun testMegaco/3).
 testMegaco(Config, Rule, Opts) ->
-    {ok, Module1, Module2} = testMegaco:compile(Config, Rule, Opts),
+    {ok, Module1, Module2} = testMegaco:compile(Config, Rule,
+						[legacy_erlang_types|Opts]),
     ok = testMegaco:main(Module1, Config),
     ok = testMegaco:main(Module2, Config).
 
@@ -911,7 +860,10 @@ duplicate_tags(Config) ->
 rtUI(Config) -> test(Config, fun rtUI/3).
 rtUI(Config, Rule, Opts) ->
     asn1_test_lib:compile("Prim", Config, [Rule|Opts]),
-    {ok, _} = asn1rt:info('Prim').
+    _ = 'Prim':info(),
+    Rule = 'Prim':encoding_rule(),
+    io:format("Default BIT STRING format: ~p\n",
+	      ['Prim':bit_string_format()]).
 
 testROSE(Config) -> test(Config, fun testROSE/3).
 testROSE(Config, Rule, Opts) ->
@@ -939,11 +891,7 @@ testDER(Config) ->
     test(Config, fun testDER/3, [ber]).
 testDER(Config, Rule, Opts) ->
     asn1_test_lib:compile("DERSpec", Config, [Rule, der|Opts]),
-    testDER:test(),
-    asn1_test_lib:compile("ParamBasic", Config, [Rule, der|Opts]),
-    testParamBasic:main(der),
-    asn1_test_lib:compile("Default", Config, [Rule, der|Opts]),
-    testSeqSetDefaultVal:main(Rule).
+    testDER:test().
 
 specialized_decodes(Config) ->
     test(Config, fun specialized_decodes/3, [ber]).
@@ -954,7 +902,8 @@ specialized_decodes(Config, Rule, Opts) ->
                                "PartialDecMyHTTP.asn",
                                "MEDIA-GATEWAY-CONTROL.asn",
                                "P-Record"],
-                              Config, [Rule, asn1config|Opts]),
+                              Config,
+			      [Rule,legacy_erlang_types,asn1config|Opts]),
     test_partial_incomplete_decode:test(Config),
     test_selective_decode:test().
 
@@ -965,13 +914,6 @@ special_decode_performance(Config, Rule, Opts) ->
     asn1_test_lib:compile_all(Files, Config, [Rule, asn1config|Opts]),
     test_special_decode_performance:go(all).
 
-
-test_driver_load(Config) ->
-    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]).
 
@@ -989,7 +931,7 @@ test_Defed_ObjectIdentifier(Config, Rule, Opts) ->
 testSelectionType(Config) -> test(Config, fun testSelectionType/3).
 testSelectionType(Config, Rule, Opts) ->
     asn1_test_lib:compile("SelectionType", Config, [Rule|Opts]),
-    {ok, _}  = testSelectionTypes:test().
+    testSelectionTypes:test().
 
 testSSLspecs(Config) ->
     test(Config, fun testSSLspecs/3, [ber]).
@@ -1006,10 +948,14 @@ testNortel(Config, Rule, Opts) ->
 
 test_undecoded_rest(Config) -> test(Config, fun test_undecoded_rest/3).
 test_undecoded_rest(Config, Rule, Opts) ->
+    do_test_undecoded_rest(Config, Rule, Opts),
+    do_test_undecoded_rest(Config, Rule, [no_ok_wrapper|Opts]),
+    do_test_undecoded_rest(Config, Rule, [undec_rest|Opts]),
+    do_test_undecoded_rest(Config, Rule, [no_ok_wrapper,undec_rest|Opts]).
+
+do_test_undecoded_rest(Config, Rule, Opts) ->
     asn1_test_lib:compile("P-Record", Config, [Rule|Opts]),
-    ok = test_undecoded_rest:test([], Config),
-    asn1_test_lib:compile("P-Record", Config, [Rule,undec_rest|Opts]),
-    test_undecoded_rest:test(undec_rest, Config).
+    test_undecoded_rest:test(Opts, Config).
 
 testTcapsystem(Config) ->
     test(Config, fun testTcapsystem/3).
@@ -1029,7 +975,20 @@ testS1AP(Config, Rule, Opts) ->
 	    "S1AP-IEs",
 	    "S1AP-PDU-Contents",
 	    "S1AP-PDU-Descriptions"],
-    asn1_test_lib:compile_all(S1AP, Config, [Rule|Opts]).
+    asn1_test_lib:compile_all(S1AP, Config, [Rule|Opts]),
+
+    %% OTP-7876.
+    case Rule of
+	per ->
+	    Enc = <<0,2,64,49,0,0,5,0,0,0,4,128,106,56,197,0,8,0,3,64,2,134,0,
+		    100,64,8,0,66,240,153,0,7,192,16,0,67,64,6,0,66,240,153,70,
+		    1,0,107,64,5,0,0,0,0,0>>,
+	    {ok,{initiatingMessage,_}} = 'S1AP-PDU-Descriptions':decode('S1AP-PDU', Enc);
+	uper ->
+	    ok;
+	ber ->
+	    ok
+    end.
 
 test_compile_options(Config) ->
     ok = test_compile_options:wrong_path(Config),
@@ -1061,24 +1020,39 @@ testX420(Config) ->
 	"sparc-sun-solaris2.10" ->
 	    {skip,"Too slow for an old Sparc"};
 	_ ->
-	    test(Config, fun testX420/3, [ber])
+	    Rule = ber,
+	    testX420:compile(Rule, [der], Config),
+	    ok = testX420:ticket7759(Rule, Config)
     end.
-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, 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 -> unaligned;
-                              _ -> aligned
-                          end),
-    asn1_test_lib:ticket_7708(Config, []),
-    asn1_test_lib:ticket_7763(Config).
+    test_x691:cases(Rule),
+
+    %% OTP-7708.
+    asn1_test_lib:compile("EUTRA-extract-55", Config,
+			  [legacy_erlang_types,Rule|Opts]),
+
+    %% OTP-7763.
+    Val = {'Seq',15,lists:duplicate(8, 0),[0],lists:duplicate(28, 0),15,true},
+    CompactVal = {'Seq',15,{0,<<0>>},{7,<<0>>},{4,<<0,0,0,0>>},15,true},
+    {ok,Bin} = 'EUTRA-extract-55':encode('Seq', Val),
+    {ok,Bin} = 'EUTRA-extract-55':encode('Seq', CompactVal),
+
+    %% OTP-7678.
+    asn1_test_lib:compile("UPERDefault", Config, [Rule|Opts]),
+    DefVal = 'UPERDefault':seq(),
+    {ok,DefBin} = 'UPERDefault':encode('Seq', DefVal),
+    {ok,DefVal} = 'UPERDefault':decode('Seq', DefBin),
+    case Rule of
+	uper -> <<0,6,0>> = DefBin;
+	_ -> ok
+    end,
+
+    ok.
 
 ticket_6143(Config) ->
     ok = test_compile_options:ticket_6143(Config).
@@ -1166,29 +1140,27 @@ END
     ok = asn1ct:compile(File, [{outdir, PrivDir}]).
 
 
-timer_compile(Config, Rule, Opts) ->
+timer_compile(Config, Rule) ->
     asn1_test_lib:compile_all(["H235-SECURITY-MESSAGES", "H323-MESSAGES"],
-                              Config, [Rule|Opts]).
+                              Config, [no_ok_wrapper,Rule]).
 
 testTimer_ber(Config) ->
-    timer_compile(Config,ber,[]),
-    testTimer:go(Config,ber).
+    timer_compile(Config, ber),
+    testTimer:go().
 
 testTimer_per(Config) ->
-    timer_compile(Config,per,[]),
-    testTimer:go(Config,per).
+    timer_compile(Config, per),
+    testTimer:go().
 
 testTimer_uper(Config) ->
-    timer_compile(Config,uper,[]),
-    {comment,_} = testTimer:go(Config,uper).
+    timer_compile(Config, uper),
+    testTimer:go().
 
 %% Test of multiple-line comment, OTP-8043
 testComment(suite) -> [];
 testComment(Config) ->
     asn1_test_lib:compile("Comment", Config, []),
-    {ok,Enc} = asn1_wrapper:encode('Comment','Seq',{'Seq',12,true}),
-    {ok,{'Seq',12,true}} = asn1_wrapper:decode('Comment','Seq',Enc),
-    ok.
+    asn1_test_lib:roundtrip('Comment', 'Seq', {'Seq',12,true}).
 
 testName2Number(suite) -> [];
 testName2Number(Config) ->
@@ -1224,76 +1196,67 @@ testName2Number(Config) ->
 
 ticket_7407(Config) ->
     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, no_final_padding]),
-    asn1_test_lib:ticket_7407_code(false).
-
-smp(suite) -> [];
-smp(Config)  ->
-    case erlang:system_info(smp_support) of
-        true ->
-            NumOfProcs = erlang:system_info(schedulers),
-            io:format("smp starting ~p workers\n",[NumOfProcs]),
-
-            Msg = {initiatingMessage, testNBAPsystem:cell_setup_req_msg()},
-            ok = testNBAPsystem:compile(Config, [per]),
-
-            enc_dec(NumOfProcs,Msg,2),
-
-            N = 10000,
-
-            {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]),
-            {Time3,ok} = timer:tc(?MODULE,enc_dec,[NumOfProcs,Msg, N]),
-
-            {Time3S,ok} = timer:tc(?MODULE,enc_dec,[1, Msg, NumOfProcs * N]),
-
-            {comment,lists:flatten(
-                       io_lib:format(
-                         "Encode/decode time parallell with ~p cores: ~p [microsecs]~n"
-                         "Encode/decode time sequential: ~p [microsecs]",
-                         [NumOfProcs,Time1+Time3,Time1S+Time3S]))};
-        false ->
-            {skipped,"No smp support"}
-    end.
-
-enc_dec(1, Msg, N) ->
-    worker_loop(N, Msg);
-enc_dec(NumOfProcs,Msg, N) ->
-    pforeach(fun(_) ->
-                     worker_loop(N, Msg)
-             end, [I || I <- lists:seq(1,NumOfProcs)]).
-
-worker_loop(0, _Msg) ->
-    ok;
-worker_loop(N, Msg) ->
-    {ok,B}=asn1_wrapper:encode('NBAP-PDU-Discriptions',
-                                     'NBAP-PDU',
-                                     Msg),
-    {ok,_Msg}=asn1_wrapper:decode('NBAP-PDU-Discriptions',
-                                        'NBAP-PDU',
-                                        B),
-    worker_loop(N - 1, Msg).
-
-
-pforeach(Fun, List) ->
-    pforeach(Fun, List, []).
-pforeach(Fun, [], [{Pid,Ref}|Pids]) ->
-    receive
-        {'DOWN', Ref, process, Pid, normal} ->
-            pforeach(Fun, [], Pids)
-    end;
-pforeach(Fun, [H|T], Pids) ->
-    Pid = spawn(fun() -> Fun(H) end),
-    Ref = erlang:monitor(process, Pid),
-    pforeach(Fun, T, [{Pid, Ref}|Pids]);
-pforeach(_Fun,[],[]) ->
+    ticket_7407_code(true),
+    asn1_test_lib:compile("EUTRA-extract-7407", Config, [uper,no_final_padding]),
+    ticket_7407_code(false).
+
+ticket_7407_code(FinalPadding) ->
+    Msg1 = {Type1,_} = eutra1(msg),
+    {ok,B1} = 'EUTRA-extract-7407':encode(Type1, Msg1),
+    B1 = eutra1(result, FinalPadding),
+
+    Msg2 = {Type2,_} = eutra2(msg),
+    {ok,B2} = 'EUTRA-extract-7407':encode(Type2, Msg2),
+    B2 = eutra2(result, FinalPadding),
     ok.
 
+eutra1(msg) ->
+    {'BCCH-BCH-Message',
+     {'MasterInformationBlock',<<2#0101:4>>,<<2#1010:4>>,
+      {'PHICH-Configuration',short,ffs},<<2#10100000>>}}.
+
+eutra1(result, true) ->
+    <<90,80,0>>;
+eutra1(result, false) ->
+    <<90,80,0:1>>.
+
+eutra2(msg) ->
+    {'BCCH-DL-SCH-Message',
+     {c1,
+      {systemInformation1,
+       {'SystemInformationBlockType1',
+	{'SystemInformationBlockType1_cellAccessRelatedInformation',
+	 [{'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',
+	   {'PLMN-Identity'},true},
+	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',
+	   {'PLMN-Identity'},false},
+	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',
+	   {'PLMN-Identity'},true}],
+	 {'TrackingAreaCode'},
+	 {'CellIdentity'},
+	 false,
+	 true,
+	 true,
+	 true
+	},
+	{'SystemInformationBlockType1_cellSelectionInfo',-50},
+	24,
+	[{'SystemInformationBlockType1_schedulinInformation_SEQOF',
+	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_si-MessageType'},
+	  ms320,
+	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_sib-MappingInfo'}}],
+	0
+       }
+      }
+     }
+    }.
+
+eutra2(result, true) ->
+%% 55 5C A5 E0
+    <<85,92,165,224>>;
+eutra2(result, false) ->
+    <<85,92,165,14:4>>.
+
 -record('InitiatingMessage',{procedureCode,criticality,value}).
 -record('Iu-ReleaseCommand',{first,second}).
 
@@ -1308,3 +1271,17 @@ ticket7904(Config) ->
 
     {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1),
     {ok,_} = 'RANAPextract1':encode('InitiatingMessage', Val1).
+
+xref(_Config) ->
+    xref:start(s),
+    xref:set_default(s, [{verbose,false},{warnings,false},{builtins,true}]),
+    Test = filename:dirname(code:which(?MODULE)),
+    {ok,_PMs} = xref:add_directory(s, Test),
+    UnusedExports = "X - XU - asn1_appup_test - asn1_app_test - \".*_SUITE\" : Mod",
+    case xref:q(s, UnusedExports) of
+	{ok,[]} ->
+	    ok;
+	{ok,[_|_]=Res} ->
+	    io:format("Exported, but unused: ~p\n", [Res]),
+	    ?t:fail()
+    end.
diff --git a/lib/asn1/test/asn1_SUITE_data/Constraints.py b/lib/asn1/test/asn1_SUITE_data/Constraints.py
index e4bc987e4c..c3b3aebd6d 100644
--- a/lib/asn1/test/asn1_SUITE_data/Constraints.py
+++ b/lib/asn1/test/asn1_SUITE_data/Constraints.py
@@ -16,6 +16,14 @@ SemiConstrained ::= INTEGER (100..MAX)
 NegSemiConstrained ::= INTEGER (-128..MAX)
 SemiConstrainedExt ::= INTEGER (42..MAX, ...)
 NegSemiConstrainedExt ::= INTEGER (-128..MAX, ...)
+-- Extensions --
+LongLongExt ::= INTEGER (0..18446744073709551615, ..., -5000..-1)
+Range256to65536Ext ::= INTEGER (256..65536, ..., 1000000..9000000)
+
+-- Union of single values
+Sv1 ::= INTEGER (2|3|17)
+Sv2 ::= INTEGER (2|3|17, ...)
+Sv3 ::= INTEGER {a(2),b(3),z(17)} (2|3|17, ...)
 
 -- Other constraints
 FixedSize ::= OCTET STRING (SIZE(10)) 
@@ -94,4 +102,44 @@ pdf OBJECT IDENTIFIER ::= {1,2,3,4,5}
 
 ShorterExt ::= IA5String (SIZE (5, ...))
 
+SeqOverlapping ::= SEQUENCE {
+    v Overlapping
+}
+
+SeqNonOverlapping ::= SEQUENCE {
+    v NonOverlapping
+}
+
+Overlapping ::= INTEGER (7280..7560 |
+7580..7680 |
+7910..8210 |
+8600..8940 |
+9250..9600 |
+14759..15109 |
+15250..15590 |
+18050..18800 |
+19300..19950 |
+21100..21700 |
+26200..26900 |
+18500..19900 |
+20100..20250 |
+21100..21700 |
+23000..24000 |
+24960..26900)
+
+-- The same intervals, but merged and sorted --
+NonOverlapping ::= INTEGER (7280..7560 |
+7580..7680 |
+7910..8210 |
+8600..8940 |
+9250..9600 |
+14759..15109 |
+15250..15590 |
+18050..19950 |
+20100..20250 |
+21100..21700 |
+23000..24000 |
+24960..26900)
+
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/Default.asn b/lib/asn1/test/asn1_SUITE_data/Default.asn
index 6604953c1f..168ce50bb2 100644
--- a/lib/asn1/test/asn1_SUITE_data/Default.asn
+++ b/lib/asn1/test/asn1_SUITE_data/Default.asn
@@ -21,7 +21,8 @@ SeqBS ::= SEQUENCE {
   a BIT STRING DEFAULT '1010110'B,
   b BIT STRING DEFAULT 'A8A'H,
   c BIT STRING {first(0),second(1),third(2)} DEFAULT {second},
-  d BIT STRING DEFAULT onelist
+  d BIT STRING DEFAULT onelist,
+  e BIT STRING DEFAULT '01011010'B
 }
 
 SetBS ::= SET {
diff --git a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1 b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
index 8dc5f3d7e1..74fa97e7aa 100644
--- a/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/EnumExt.asn1
@@ -18,6 +18,8 @@ Ext1 ::= ENUMERATED {
 	magenta(9)
 }
 
+SubExt1 ::= Ext1 ( blue | orange | black )
+
 Noext ::= ENUMERATED {
 	blue(0),
 	red(1),
diff --git a/lib/asn1/test/asn1_SUITE_data/Fragmented.asn1 b/lib/asn1/test/asn1_SUITE_data/Fragmented.asn1
new file mode 100644
index 0000000000..bfc939737f
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/Fragmented.asn1
@@ -0,0 +1,24 @@
+Fragmented DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+FUNCTION ::= CLASS {
+  &code INTEGER UNIQUE,
+  &b BOOLEAN,
+  &ArgumentType
+}
+
+SS ::= SEQUENCE OF OCTET STRING
+
+val1 FUNCTION ::= {
+  &code 1, &b FALSE, &ArgumentType SS
+}
+
+ObjSet FUNCTION ::= { val1 }
+
+PDU ::= SEQUENCE {
+  code FUNCTION.&code ({ObjSet}),
+  b FUNCTION.&b ({ObjSet}{@code}),
+  arg FUNCTION.&ArgumentType ({ObjSet}{@code})
+}
+
+END
diff --git a/lib/asn1/test/asn1_SUITE_data/InfObj.asn b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
index 53e5043cb7..880e81c3b1 100644
--- a/lib/asn1/test/asn1_SUITE_data/InfObj.asn
+++ b/lib/asn1/test/asn1_SUITE_data/InfObj.asn
@@ -202,7 +202,11 @@ constructed2 CONSTRUCTED-DEFAULT ::= { &id 2, &ok false }
 ConstructedDefaultSet CONSTRUCTED-DEFAULT ::= {
   constructed1 |
   constructed2 |
-  { &id 3, &Type BOOLEAN }
+  { &id 3, &Type BOOLEAN } |
+  { &id 4, &Type SET { a INTEGER, b BIT STRING } } |
+  { &id 5, &Type CHOICE { i INTEGER, b BIT STRING } } |
+  { &id 6, &Type SEQUENCE OF INTEGER (1..16) } |
+  { &id 7, &Type SET OF INTEGER (1..64) }
 }
 
 ConstructedPdu ::= SEQUENCE {
@@ -210,6 +214,47 @@ ConstructedPdu ::= SEQUENCE {
   content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
 }
 
+ConstructedSet ::= SET {
+  id [0] CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content [1] CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
+}
+
+-- Test OPTIONAL and DEFAULT
+
+OptionalInSeq ::= SEQUENCE {
+  id CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id}) OPTIONAL
+}
+
+DefaultInSeq ::= SEQUENCE {
+  id CONSTRUCTED-DEFAULT.&id ({ConstructedDefaultSet}),
+  content CONSTRUCTED-DEFAULT.&Type ({ConstructedDefaultSet}{@id})
+          DEFAULT BOOLEAN:TRUE
+}
+
+-- Test more than one optional typefield table constraint in a SEQUENCE.
+
+MULTIPLE-OPTIONALS ::= CLASS {
+   &id INTEGER UNIQUE,
+   &T1,
+   &T2,
+   &T3
+}
+
+multiple-optionals-1 MULTIPLE-OPTIONALS ::=
+   {&id 1, &T1 INTEGER, &T2 BOOLEAN, &T3 OCTET STRING}
+
+Multiple-Optionals-Set MULTIPLE-OPTIONALS ::= {
+   multiple-optionals-1
+}
+
+Multiple-Optionals ::= SEQUENCE {
+   id MULTIPLE-OPTIONALS.&id ({Multiple-Optionals-Set}),
+   t1 [0] MULTIPLE-OPTIONALS.&T1 ({Multiple-Optionals-Set}{@id}) OPTIONAL,
+   t2 [1] MULTIPLE-OPTIONALS.&T2 ({Multiple-Optionals-Set}{@id}) OPTIONAL,
+   t3 [2] MULTIPLE-OPTIONALS.&T3 ({Multiple-Optionals-Set}{@id}) OPTIONAL
+}
+
 END
 
 
diff --git a/lib/asn1/test/asn1_SUITE_data/Param.asn1 b/lib/asn1/test/asn1_SUITE_data/Param.asn1
index b2987a7885..4eff0da781 100644
--- a/lib/asn1/test/asn1_SUITE_data/Param.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/Param.asn1
@@ -88,6 +88,28 @@ POS2 {CONFIG-DATA:obj} ::= OCTET STRING (SIZE(obj.&minLevel .. obj.&maxLevel))
 
 OS2 ::= POS2 {config-data}
 
+--
+-- Test a CLASS without the user-friendly syntax.
+--
+
+CL ::= CLASS {
+  &code INTEGER UNIQUE,
+  &Data
+}
+
+P{T} ::= CHOICE { a INTEGER, b T }
+
+o1 CL ::= {
+   &code 42,
+   &Data P{BOOLEAN}
+}
+
+SetCL CL ::= { o1 }
+
+Scl ::= SEQUENCE {
+    code CL.&code ({SetCL}),
+    data CL.&Data ({SetCL}{@code})
+}
 
 END
 
diff --git a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1 b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
index 08e7f94ab6..a5b4c8a53d 100644
--- a/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/PrimStrings.asn1
@@ -46,7 +46,13 @@ BS256 ::= BIT STRING (SIZE (256))
 
 BS1024 ::= BIT STRING (SIZE (1024))
 
-  
+  BsDef1 ::= SEQUENCE {
+     s BIT STRING DEFAULT '101111'B
+  }
+
+  BsDef2 ::= SEQUENCE {
+     s BIT STRING DEFAULT 'DEADBEEF'H
+  }
 
   Os ::= OCTET STRING
   OsCon ::= [60] OCTET STRING
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
index 888dbe5dd7..670f827f5e 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqOf.asn1
@@ -31,7 +31,43 @@ Seq4 ::= SEQUENCE
   seq43 [43] SEQUENCE OF SeqIn DEFAULT {}
 }
 
+Seq5 ::= SEQUENCE {
+  b BOOLEAN,
+  s SEQUENCE SIZE (0..3) OF OCTET STRING (SIZE (0..3)),
+  -- If 's' is empty, 'magic' should not be aligned.
+  magic INTEGER (0..127)
+}
+
+Seq6 ::= SEQUENCE {
+  a SEQUENCE OF INTEGER (0..7),
+  b SEQUENCE (SIZE (0..7)) OF INTEGER (0..7),
+  -- 'magic' should never be aligned.
+  magic INTEGER (0..127)
+}
 
+Seq7 ::= SEQUENCE {
+  a SEQUENCE OF INTEGER (1..512),
+  b SEQUENCE (SIZE (0..255)) OF INTEGER (1..512),
+  i INTEGER
+}
+
+Seq8 ::= SEQUENCE {
+    sof SEQUENCE (SIZE (0..3)) OF OCTET STRING (SIZE (3)),
+    -- Not aligned here if the size of 'sof' is zero.
+    i INTEGER (0..127)
+}
+
+Seq9 ::= SEQUENCE {
+  b BOOLEAN,
+  s SEQUENCE SIZE (0..3) OF OCTET STRING (SIZE (0..3)),
+  magic INTEGER (0..127)
+}
+
+Seq10 ::= SEQUENCE {
+  b BOOLEAN,
+  s SEQUENCE SIZE (1..3) OF OCTET STRING (SIZE (0..3)),
+  magic INTEGER (0..127)
+}
 
 SeqIn ::= SEQUENCE 
 {
@@ -50,9 +86,6 @@ SeqCho ::= SEQUENCE OF CHOICE {bool BOOLEAN,
 
 SeqOfInt ::= SEQUENCE OF INTEGER
 
-
-
-
 SeqEmp ::= SEQUENCE 
 {
   seq1  SEQUENCE OF Empty DEFAULT {}
diff --git a/lib/asn1/test/asn1_SUITE_data/SeqPrim.asn1 b/lib/asn1/test/asn1_SUITE_data/SeqPrim.asn1
index 20c4126c0b..7068674647 100644
--- a/lib/asn1/test/asn1_SUITE_data/SeqPrim.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/SeqPrim.asn1
@@ -16,4 +16,11 @@ Seq ::=  SEQUENCE
 
 Empty ::= SEQUENCE {}
 
+Big ::= SEQUENCE {
+  ...,
+  os1 [1] OCTET STRING (SIZE (120..130)) OPTIONAL,
+  os2 [2] OCTET STRING (SIZE (128..256)) OPTIONAL,
+  os3 [3] OCTET STRING (SIZE (17000..30000)) OPTIONAL
+}
+
 END
diff --git a/lib/asn1/test/asn1_SUITE_data/TCAPPackage_msg.erl b/lib/asn1/test/asn1_SUITE_data/TCAPPackage_msg.erl
index 06eba8b6eb..0bf4425263 100644
--- a/lib/asn1/test/asn1_SUITE_data/TCAPPackage_msg.erl
+++ b/lib/asn1/test/asn1_SUITE_data/TCAPPackage_msg.erl
@@ -47,7 +47,7 @@ val('TransactionPDU') ->
 		      dialoguePortion=val('DialoguePortion'),
 		      componentPortion=val('ComponentSequence')};
 val('TransactionID') ->
-    "OCTET STRING";
+    <<"OCTET STRING">>;
 val('DialoguePortion') ->
     #'DialoguePortion'{version=val('ProtocolVersion'),
 		       applicationContext={integerApplicationId,12},
@@ -57,23 +57,23 @@ val('DialoguePortion') ->
 val('Confidentiality') ->
     #'Confidentiality'{confidentialityId={integerConfidentialityId,14}};
 val('ProtocolVersion') ->
-    "K";
+    <<"K">>;
 val('UserInformation') ->
     [val('EXTERNAL'),val('EXTERNAL')];
 val('EXTERNAL') ->
     #'EXTERNAL'{'direct-reference'={0,1,2},
-		encoding={'single-ASN1-type',[1,2,3,4]}};
+		encoding={'single-ASN1-type',<<1,2,3,4>>}};
 val('ComponentSequence') ->
     [val('ComponentPDU',1),val('ComponentPDU',2),val('ComponentPDU',3)];
 val('Invoke') ->
-    #'Invoke'{componentIDs="AB",
+    #'Invoke'{componentIDs = <<"AB">>,
 	      opcode={local,-2},
 	      parameter=running};
 val('ReturnResult') ->
-    #'ReturnResult'{componentID="C",
+    #'ReturnResult'{componentID = <<"C">>,
 		    parameter=[1,2,3,4]};
 val('ReturnError') ->
-    #'ReturnError'{componentID="D",
+    #'ReturnError'{componentID = <<"D">>,
 		   errorCode={local,21},
 		   parameter=true};
 val('Abort') ->
@@ -87,8 +87,8 @@ val(Type) ->
 check_result('PackageType',unidirectional,Res) ->
     {unidirectional,
      {'UniTransactionPDU',
-      "OCTET STRING",
-      {'DialoguePortion',"K",
+      <<"OCTET STRING">>,
+      {'DialoguePortion',<<"K">>,
        {integerApplicationId,12},
        [_,%{'EXTERNAL',{syntax,{0,1,2}},asn1_NOVALUE,OTVal},
 	_],%{'EXTERNAL',{syntax,{0,1,2}},asn1_NOVALUE,OTVal}],
@@ -96,14 +96,14 @@ check_result('PackageType',unidirectional,Res) ->
        {'Confidentiality',
 	{integerConfidentialityId,14}}},
       [{invokeLast,
-	{_,"AB",{local,-2},running}},
-       {returnResultLast,{_,"C",_}},
-       {returnError,{_,"D",{local,21},true}}]}} = Res,
+	{_,<<"AB">>,{local,-2},running}},
+       {returnResultLast,{_,<<"C">>,_}},
+       {returnError,{_,<<"D">>,{local,21},true}}]}} = Res,
     ok;
 %%    check_OT_val(OTVal);
 check_result('PackageType',abort,Res)->
-    {abort,{'Abort',"OCTET STRING",
-	    {'DialoguePortion',"K",
+    {abort,{'Abort',<<"OCTET STRING">>,
+	    {'DialoguePortion',<<"K">>,
 	     {integerApplicationId,12},
 	     [_,%{'EXTERNAL',{syntax,{0,1,2}},asn1_NOVALUE,OTVal},
 	      _],%{'EXTERNAL',{syntax,{0,1,2}},asn1_NOVALUE,OTVal}],
@@ -114,9 +114,9 @@ check_result('PackageType',abort,Res)->
     ok;
 %%    check_OT_val(OTVal);
 check_result('PackageType',response,Res) ->
-    {response,{'TransactionPDU',"OCTET STRING",
+    {response,{'TransactionPDU',<<"OCTET STRING">>,
 	       {'DialoguePortion',
-		"K",
+		<<"K">>,
 		{integerApplicationId,12},
 		[_,%{'EXTERNAL',{syntax,{0,1,2}},asn1_NOVALUE,OTVal},
 		 _],%{'EXTERNAL',{syntax,{0,1,2}},asn1_NOVALUE,OTVal}],
@@ -124,11 +124,11 @@ check_result('PackageType',response,Res) ->
 		{'Confidentiality',
 		 {integerConfidentialityId,14}}},
 	       [{invokeLast,
-		 {_,"AB",{local,-2},running}},
+		 {_,<<"AB">>,{local,-2},running}},
 		{returnResultLast,
-		 {_,"C",_}},
+		 {_,<<"C">>,_}},
 		{returnError,
-		 {_,"D",{local,21},true}}]}} = Res,
+		 {_,<<"D">>,{local,21},true}}]}} = Res,
     ok.
 %%    check_OT_val(OTVal).
 
diff --git a/lib/asn1/test/asn1_SUITE_data/TConstr.asn1 b/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
index e2e0a11dc4..b2b2de2f56 100644
--- a/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
+++ b/lib/asn1/test/asn1_SUITE_data/TConstr.asn1
@@ -58,6 +58,40 @@ Deeper ::= SEQUENCE {
   b  SEQUENCE {ba INTEGER, bb MYCLASS.&Type ({ObjectSet}{@a.s.ab})}
 }
 
+Seq3 ::= SEQUENCE {
+  a SEQUENCE {
+              aa INTEGER,
+	      ab MYCLASS.&id ({ObjectSet})
+    },
+  -- Multiple references from the same SEQUENCE...
+  b SEQUENCE {
+              ba MYCLASS.&Type ({ObjectSet}{@a.ab}),
+              bb MYCLASS.&Result ({ObjectSet}{@a.ab}),
+	      -- ... and references from multiple SEQUENCEs...
+	      bc SEQUENCE {
+	         bca MYCLASS.&Result ({ObjectSet}{@a.ab}),
+		 bcb MYCLASS.&Type ({ObjectSet}{@a.ab})
+              }
+    }
+}
+
+Seq3-Opt ::= SEQUENCE {
+  a SEQUENCE {
+              aa INTEGER,
+	      ab MYCLASS.&id ({ObjectSet})
+    },
+  -- Multiple references from the same SEQUENCE...
+  b SEQUENCE {
+              ba MYCLASS.&Type ({ObjectSet}{@a.ab}) OPTIONAL,
+              bb MYCLASS.&Result ({ObjectSet}{@a.ab}) OPTIONAL,
+	      -- ... and references from multiple SEQUENCEs...
+	      bc SEQUENCE {
+	         bca MYCLASS.&Result ({ObjectSet}{@a.ab}),
+		 bcb MYCLASS.&Type ({ObjectSet}{@a.ab})
+              } OPTIONAL
+    }
+}
+
 -- following from Peter's definitions
 
 
diff --git a/lib/asn1/test/asn1_SUITE_data/UPERDefault.asn b/lib/asn1/test/asn1_SUITE_data/UPERDefault.asn
new file mode 100644
index 0000000000..7b81a0e09f
--- /dev/null
+++ b/lib/asn1/test/asn1_SUITE_data/UPERDefault.asn
@@ -0,0 +1,18 @@
+UPERDefault DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+-- OTP-7681
+Int ::= INTEGER (0..32767)
+
+Seq ::= SEQUENCE {
+  a Int,
+  b INTEGER (-27..27) DEFAULT 0, -- OTP-7678
+  c INTEGER OPTIONAL
+}
+
+seq Seq ::=
+{a 12,
+ b 0}
+
+END
\ No newline at end of file
diff --git a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
index 8e21e6ca84..a1e563f6be 100644
--- a/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
+++ b/lib/asn1/test/asn1_SUITE_data/extensionAdditionGroup.erl
@@ -67,8 +67,8 @@ run3(Erule) ->
         asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
         asn1_NOVALUE,asn1_NOVALUE},
        asn1_NOVALUE,
-       [[80,66,0,5,10,0,5,0,24,11,7,84,54,33,0,1,1,0,0,0,1,39,5,66,127,0,0,1],
-        []],
+       [<<80,66,0,5,10,0,5,0,24,11,7,84,54,33,0,1,1,0,0,0,1,39,5,66,127,0,0,1>>,
+        <<>>],
        {'RRC-RadioResourceConfigDedicated',
         [{'RRC-SRB-ToAddMod',1,
           {explicitValue,
diff --git a/lib/asn1/test/asn1_appup_test.erl b/lib/asn1/test/asn1_appup_test.erl
index a2c1423eda..7391959645 100644
--- a/lib/asn1/test/asn1_appup_test.erl
+++ b/lib/asn1/test/asn1_appup_test.erl
@@ -21,8 +21,8 @@
 %% Purpose: Verify the application specifics of the asn1 application
 %%----------------------------------------------------------------------
 -module(asn1_appup_test).
--compile({no_auto_import,[error/1]}).
 -compile(export_all).
+-include_lib("common_test/include/ct.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -44,16 +44,9 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(suite) -> [];
 init_per_suite(doc) -> [];
 init_per_suite(Config) when is_list(Config) ->
-    AppFile   = file_name(asn1, ".app"),
-    AppupFile = file_name(asn1, ".appup"),
-    [{app_file, AppFile}, {appup_file, AppupFile}|Config].
+    Config.
     
 
-file_name(App, Ext) ->
-    LibDir = code:lib_dir(App),
-    filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
-
-
 end_per_suite(suite) -> [];
 end_per_suite(doc) -> [];
 end_per_suite(Config) when is_list(Config) ->
@@ -62,349 +55,7 @@ end_per_suite(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup(suite) ->
-    [];
-appup(doc) ->
-    "perform a simple check of the appup file";
+appup() ->
+    [{doc, "perform a simple check of the asn1 appup file"}].
 appup(Config) when is_list(Config) ->
-    AppupFile = key1search(appup_file, Config),
-    AppFile   = key1search(app_file, Config),
-    Modules   = modules(AppFile),
-    check_appup(AppupFile, Modules).
-
-modules(File) ->
-    case file:consult(File) of
-        {ok, [{application,asn1,Info}]} ->
-            case lists:keysearch(modules,1,Info) of
-                {value, {modules, Modules}} ->
-                    Modules;
-                false ->
-                    fail({bad_appinfo, Info})
-            end;
-        Error ->
-            fail({bad_appfile, Error})
-    end.
-
-    
-check_appup(AppupFile, Modules) ->
-    case file:consult(AppupFile) of
-	{ok, [{V, UpFrom, DownTo}]} ->
-	    io:format("V= ~p, UpFrom= ~p, DownTo= ~p, Modules= ~p~n",
-		      [V, UpFrom, DownTo, Modules]),
-	    check_appup(V, UpFrom, DownTo, Modules);
-	Else ->
-	    fail({bad_appupfile, Else})
-    end.
-
-
-check_appup(V, UpFrom, DownTo, Modules) ->
-    check_version(V),
-    check_depends(up,   UpFrom, Modules),
-    check_depends(down, DownTo, Modules),
-    ok.
-
-
-check_depends(_, [], _) ->
-    ok;
-check_depends(UpDown, [Dep|Deps], Modules) ->
-    check_depend(UpDown, Dep, Modules),
-    check_depends(UpDown, Deps, Modules).
-
-
-check_depend(up,I={add_application,_App},Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instruction:       ~p"
-      "~n   Modules: ~p", [up,I , Modules]),
-    ok;
-check_depend(down,I={remove_application,_App},Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instruction:       ~p"
-      "~n   Modules: ~p", [down,I , Modules]),
-    ok;
-check_depend(UpDown, {V, Instructions}, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   V:       ~p"
-      "~n   Modules: ~p", [UpDown, V, Modules]),
-    check_version(V),
-    case check_instructions(UpDown, 
-			    Instructions, Instructions, [], [], Modules) of
-	{_Good, []} ->
-	    ok;
-	{_, Bad} ->
-	    fail({bad_instructions, Bad, UpDown})
-    end.
-
-
-check_instructions(_, [], _, Good, Bad, _) ->
-    {lists:reverse(Good), lists:reverse(Bad)};
-check_instructions(UpDown, [Instr|Instrs], AllInstr, Good, Bad, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instr: ~p", [UpDown,Instr]),
-    case (catch check_instruction(UpDown, Instr, AllInstr, Modules)) of
-        ok ->
-            check_instructions(UpDown, Instrs, AllInstr, 
-			       [Instr|Good], Bad, Modules);
-        {error, Reason} ->
-	    d("check_instructions(~w) -> bad instruction: "
-	      "~n   Reason: ~p", [UpDown,Reason]),
-            check_instructions(UpDown, Instrs, AllInstr, Good, 
-                               [{Instr, Reason}|Bad], Modules)
-    end.
-
-%% A new module is added
-check_instruction(up, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when up-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    check_module(Module, Modules);
-
-%% An old module is re-added
-check_instruction(down, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when down-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    ok;
-	ok ->
-	    error({existing_readded_module, Module})
-    end;
-
-%% Removing a module on upgrade: 
-%% - the module has been removed from the app-file.
-%% - check that no module depends on this (removed) module
-check_instruction(up, {remove, {Module, Pre, Post}}, _, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
-    d("check_instruction -> entry when up-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    check_purge(Pre),
-	    check_purge(Post);
-	ok ->
-	    error({existing_removed_module, Module})
-    end;
-
-%% Removing a module on downgrade: the module exist
-%% in the app-file.
-check_instruction(down, {remove, {Module, Pre, Post}}, AllInstr, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
-    d("check_instruction -> entry when down-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	ok ->
-	    check_purge(Pre),
-	    check_purge(Post),
-	    check_no_remove_depends(Module, AllInstr);
-	{error, {unknown_module, Module, Modules}} ->
-	    error({nonexisting_removed_module, Module})
-    end;
-
-check_instruction(_, {load_module, Module, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
-    d("check_instruction -> entry when load_module instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {update, Module, Change, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
-    d("check_instruction -> entry when update instruction with"
-      "~n   Module: ~p"
-      "~n   Change: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Change, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_change(Change),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {apply, {Module, Function, Args}}, 
-		  _AllInstr, Modules) 
-  when is_atom(Module), is_atom(Function), is_list(Args) ->
-    d("check_instruction -> entry when apply instruction with"
-      "~n   Module: ~p"
-      "~n   Function: ~p"
-      "~n   Args:    ~p", [Module, Function, Args]),
-    check_module(Module, Modules),
-    check_apply(Module,Function,Args);
-
-check_instruction(_, Instr, _AllInstr, _Modules) ->
-    d("check_instruction -> entry when unknown instruction with"
-      "~n   Instr: ~p", [Instr]),
-    error({error, {unknown_instruction, Instr}}).
-
-
-%% If Module X depends on Module Y, then module Y must have an update
-%% instruction of some sort (otherwise the depend is faulty).
-updated_modules([], Modules) ->
-    d("update_modules -> entry when done with"
-      "~n   Modules: ~p", [Modules]),
-    Modules;
-updated_modules([Instr|Instrs], Modules) ->
-    d("update_modules -> entry with"
-      "~n   Instr:   ~p"
-      "~n   Modules: ~p", [Instr,Modules]),
-    Module = instruction_module(Instr),
-    d("update_modules -> Module: ~p", [Module]),
-    updated_modules(Instrs, [Module|Modules]).
-    
-instruction_module({add_module, Module}) ->
-    Module;
-instruction_module({remove, {Module, _, _}}) ->
-    Module;
-instruction_module({load_module, Module, _, _, _}) ->
-    Module;
-instruction_module({update, Module, _, _, _, _}) ->
-    Module;
-instruction_module({apply, {Module, _, _}}) ->
-    Module;
-instruction_module(Instr) ->
-    d("instruction_module -> entry when unknown instruction with"
-      "~n   Instr: ~p", [Instr]),
-    error({error, {unknown_instruction, Instr}}).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-check_version(V) when is_list(V) ->
-    ok;
-check_version(V) ->
-    error({bad_version, V}).
-
-
-check_module(M, Modules) when is_atom(M) ->
-    case lists:member(M,Modules) of
-        true ->
-            ok;
-        false ->
-            error({unknown_module, M, Modules})
-    end;
-check_module(M, _) ->
-    error({bad_module, M}).
-
-check_apply(Module,Function,Args) ->
-    case (catch Module:module_info()) of
-	Info when is_list(Info) ->
-	    check_exported(Function,Args,Info);
-	{'EXIT',{undef,_}} ->
-	    error({not_existing_module,Module})
-    end.
-
-check_exported(Function,Args,Info) ->
-    case lists:keysearch(exports,1,Info) of
-	{value,{exports,FunList}} ->
-	    case lists:keysearch(Function,1,FunList) of
-		{value,{_,Arity}} when Arity==length(Args) ->
-		    ok;
-		_ ->
-		    error({not_exported_function,Function,length(Args)})
-	    end;
-	_ ->
-	    error({bad_export,Info})
-    end.
-
-check_module_depend(M, [], _) when is_atom(M) ->
-    d("check_module_depend -> entry with"
-      "~n   M: ~p", [M]),    
-    ok;
-check_module_depend(M, Deps, Modules) when is_atom(M), is_list(Deps) ->
-    d("check_module_depend -> entry with"
-      "~n   M: ~p"
-      "~n   Deps: ~p"
-      "~n   Modules: ~p", [M, Deps, Modules]),    
-    case [Dep || Dep <- Deps, lists:member(Dep, Modules) == false] of
-        [] ->
-            ok;
-        Unknown ->
-            error({unknown_depend_modules, Unknown})
-    end;
-check_module_depend(_M, D, _Modules) ->
-    d("check_module_depend -> entry when bad depend with"
-      "~n   D: ~p", [D]),    
-    error({bad_depend, D}).
-
-
-check_no_remove_depends(_Module, []) ->
-    ok;
-check_no_remove_depends(Module, [Instr|Instrs]) ->
-    check_no_remove_depend(Module, Instr),
-    check_no_remove_depends(Module, Instrs).
-
-check_no_remove_depend(Module, {load_module, Mod, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, load_module, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(Module, {update, Mod, _Change, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, update, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(_, _) ->
-    ok.
-    
-
-check_change(soft) ->
-    ok;
-check_change({advanced, _Something}) ->
-    ok;
-check_change(Change) ->
-    error({bad_change, Change}).
-
-
-check_purge(soft_purge) ->
-    ok;
-check_purge(brutal_purge) ->
-    ok;
-check_purge(Purge) ->
-    error({bad_purge, Purge}).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-error(Reason) ->
-    throw({error, Reason}).
-
-fail(Reason) ->
-    exit({suite_failed, Reason}).
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
-	    fail({not_found, Key, L});
-	{value, {Key, Value}} ->
-	    Value
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-d(F, A) ->
-    d(false, F, A).
-
-d(true, F, A) ->
-    io:format(F ++ "~n", A);
-d(_, _, _) ->
-    ok.
-
-    
+    ok = ?t:appup_test(asn1).
diff --git a/lib/asn1/test/asn1_test_lib.erl b/lib/asn1/test/asn1_test_lib.erl
index 60b2b2b42e..417380159e 100644
--- a/lib/asn1/test/asn1_test_lib.erl
+++ b/lib/asn1/test/asn1_test_lib.erl
@@ -19,13 +19,9 @@
 %%
 -module(asn1_test_lib).
 
--export([compile/3]).
--export([compile_all/3]).
--export([compile_erlang/3]).
--export([hex_to_bin/1]).
-
--export([ticket_7407_compile/2,ticket_7407_code/1, ticket_7678/2,
-         ticket_7708/2, ticket_7763/1, ticket_7876/3]).
+-export([compile/3,compile_all/3,compile_erlang/3,
+	 hex_to_bin/1,
+	 roundtrip/3,roundtrip/4,roundtrip_enc/3,roundtrip_enc/4]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -40,15 +36,7 @@ compile_all(Files, Config, Options) ->
 
 compile_file(File, Options) ->
     try
-        ok = asn1ct:compile(File, [warnings_as_errors|Options]),
-        case should_load(File, Options) of
-            false ->
-                ok;
-            {module, Module} ->
-                code:purge(Module),
-                {module, Module} = code:load_file(Module),
-		code:purge(Module)
-        end
+        ok = asn1ct:compile(File, [warnings_as_errors|Options])
     catch
         Class:Reason ->
 	    ct:print("Failed to compile ~s\n", [File]),
@@ -65,153 +53,26 @@ compile_erlang(Mod, Config, Options) ->
 hex_to_bin(S) ->
     << <<(hex2num(C)):4>> || C <- S, C =/= $\s >>.
 
-%%%
-%%% Internal functions.
-%%%
+roundtrip(Mod, Type, Value) ->
+    roundtrip(Mod, Type, Value, Value).
 
-should_load(File, Options) ->
-    case lists:member(abs, Options) of
-	true ->
-	    false;
-	false ->
-	    {module,list_to_atom(strip_extension(filename:basename(File)))}
-    end.
+roundtrip(Mod, Type, Value, ExpectedValue) ->
+    {ok,Encoded} = Mod:encode(Type, Value),
+    {ok,ExpectedValue} = Mod:decode(Type, Encoded),
+    ok.
 
-strip_extension(File) ->
-    strip_extension(File, filename:extension(File)).
+roundtrip_enc(Mod, Type, Value) ->
+    roundtrip_enc(Mod, Type, Value, Value).
 
-strip_extension(File, "") ->
-    File;
-strip_extension(File, Ext) when Ext == ".asn"; Ext == ".set"; Ext == ".asn1"->
-    strip_extension(filename:rootname(File));
-strip_extension(File, _Ext) ->
-    File.
+roundtrip_enc(Mod, Type, Value, ExpectedValue) ->
+    {ok,Encoded} = Mod:encode(Type, Value),
+    {ok,ExpectedValue} = Mod:decode(Type, Encoded),
+    Encoded.
+
+%%%
+%%% Internal functions.
+%%%
 
 hex2num(C) when $0 =< C, C =< $9 -> C - $0;
 hex2num(C) when $A =< C, C =< $F -> C - $A + 10;
 hex2num(C) when $a =< C, C =< $f -> C - $a + 10.
-
-ticket_7407_compile(Config,Option) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-7407",
-			      [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, {outdir,OutDir}]++Option).
-    
-
-ticket_7407_code(FinalPadding) ->
-    Msg1 = {Type1,_} = eutra1(msg),
-    ?line {ok,B1} = 'EUTRA-extract-7407':encode(Type1,Msg1),
-    ?line B1 = eutra1(result,FinalPadding),
-    
-    Msg2 = {Type2,_} = eutra2(msg),
-    ?line {ok,B2} = 'EUTRA-extract-7407':encode(Type2,Msg2),
-    ?line B2 = eutra2(result,FinalPadding),
-    ok.
-
-eutra1(msg) ->
-    {'BCCH-BCH-Message',{'MasterInformationBlock',[0,1,0,1],[1,0,1,0],{'PHICH-Configuration',short,ffs},[1,0,1,0,0,0,0,0]}}.
-eutra1(result,true) ->
-    <<90,80,0>>;
-eutra1(result,false) ->
-    <<90,80,0:1>>.
-
-eutra2(msg) ->
-    {'BCCH-DL-SCH-Message',
-     {c1,
-      {systemInformation1,
-       {'SystemInformationBlockType1',
-	{'SystemInformationBlockType1_cellAccessRelatedInformation',
-	 [{'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},true},
-	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},false},
-	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},true}],
-	 {'TrackingAreaCode'},
-	 {'CellIdentity'},
-	 false,
-	 true,
-	 true,
-	 true
-	},
-	{'SystemInformationBlockType1_cellSelectionInfo',-50},
-	24,
-	[{'SystemInformationBlockType1_schedulinInformation_SEQOF',
-	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_si-MessageType'},
-	  ms320,
-	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_sib-MappingInfo'}}],
-	0
-       }
-      }
-     }
-    }.
-eutra2(result,true) ->
-%% 55 5C A5 E0
-    <<85,92,165,224>>;
-eutra2(result,false) ->
-    <<85,92,165,14:4>>.
-
-
-
-ticket_7678(Config, Option) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "UPERDefault",
-			      [uper, {outdir,OutDir}]++Option),
-    
-    ?line Val = 'UPERDefault':seq(),
-    ?line {ok,<<0,6,0>>} = 'UPERDefault':encode('Seq',Val),
-    ?line {ok,Val} = 'UPERDefault':decode('Seq',<<0,6,0>>),
-    ok.
-
-
-ticket_7763(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "EUTRA-extract-55",
-			      [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,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),
-
-    ?line Bin = CompactBin,
-
-    io:format("CompactBin:~n~p~nBin:~n~p~nCompactBin == Bin is ~p~n",[CompactBin,Bin,CompactBin == Bin]).
-    
-
-ticket_7876(Config,Erule,Options) ->
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-
-    ?line ok = asn1ct:compile(DataDir ++ "S1AP-CommonDataTypes",
-			      [Erule,{outdir,OutDir}|Options]),
-    ?line ok = asn1ct:compile(DataDir ++ "S1AP-Constants",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-Containers",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-IEs",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-PDU-Contents",
-			      [Erule,{outdir,OutDir}|Options]),
-?line ok = asn1ct:compile(DataDir ++ "S1AP-PDU-Descriptions",
-			      [Erule,{outdir,OutDir}|Options]),
-
-    ticket_7876_encdec(Erule),
-    ok.
-
-ticket_7876_encdec(per) ->
-    ?line {ok,{initiatingMessage,_}} = 'S1AP-PDU-Descriptions':decode('S1AP-PDU', [0,2,64,49,0,0,5,0,0,0,4,128,106,56,197,0,8,0,3,64,2,134,0,100,64,8,0,66,240,153,0,7,192,16,0,67,64,6,0,66,240,153,70,1,0,107,64,5,0,0,0,0,0]);
-ticket_7876_encdec(_) ->
-    ?line {ok,{initiatingMessage,_}} = 'S1AP-PDU-Descriptions':decode('S1AP-PDU', <<0,2,64,49,0,0,5,0,0,0,4,128,106,56,197,0,8,0,3,64,2,134,0,100,64,8,0,66,240,153,0,7,192,16,0,67,64,6,0,66,240,153,70,1,0,107,64,5,0,0,0,0,0>>).
diff --git a/lib/asn1/test/asn1_wrapper.erl b/lib/asn1/test/asn1_wrapper.erl
deleted file mode 100644
index ac194fe38b..0000000000
--- a/lib/asn1/test/asn1_wrapper.erl
+++ /dev/null
@@ -1,49 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
-%%
-%% The 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(asn1_wrapper).
--author('kenneth@bilbo').
-
--compile(export_all).
-%%-export([Function/Arity, ...]).
-
-
-encode(Module,Type,Value) ->
-    case asn1rt:encode(Module,Type,Value) of
-	{ok,X} when is_binary(X) ->
-	    {ok, binary_to_list(X)};
-	{ok,X} ->
-	    {ok, binary_to_list(list_to_binary(X))};
-	Error ->
-	    Error
-    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(per) ->
-    per;
-erule(uper) ->
-    per.
-
-
diff --git a/lib/asn1/test/ber_decode_error.erl b/lib/asn1/test/ber_decode_error.erl
index 1c4b4c6894..8be92292ee 100644
--- a/lib/asn1/test/ber_decode_error.erl
+++ b/lib/asn1/test/ber_decode_error.erl
@@ -22,15 +22,15 @@
 -export([run/1]).
 
 run([]) ->
-    {ok,B}  = asn1_wrapper:encode('Constructed','S3',{'S3',17}),
-    [T,L|V] = lists:flatten(B),
-    Bytes = [T,L+3|V] ++ [2,1,3],
-    case asn1_wrapper:decode('Constructed','S3',Bytes) of
+    {ok,B}  = 'Constructed':encode('S3', {'S3',17}),
+    [T,L|V] = binary_to_list(B),
+    Bytes = list_to_binary([T,L+3|V] ++ [2,1,3]),
+    case 'Constructed':decode('S3', Bytes) of
 	{error,{asn1,{unexpected,_}}} -> ok
     end,
 
     %% Unexpected bytes must be accepted if there is an extensionmark
-    {ok,{'S3ext',17}} = asn1_wrapper:decode('Constructed','S3ext',Bytes),
+    {ok,{'S3ext',17}} = 'Constructed':decode('S3ext', Bytes),
 
     %% Truncated tag.
     {error,{asn1,{invalid_tag,_}}} =
diff --git a/lib/asn1/test/choice_extension.erl b/lib/asn1/test/choice_extension.erl
deleted file mode 100644
index 85e0936ebf..0000000000
--- a/lib/asn1/test/choice_extension.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-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(choice_extension).
-
--export([run/0, compile/3]).
-
--include_lib("test_server/include/test_server.hrl").
-
-compile(Config,Rules,Options) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line ok = asn1ct:compile(DataDir ++ "ChoExtension",[Rules,{outdir,OutDir}]++Options).
-
-run() ->
-    Val = {str,"abc"},
-    ?line {ok,B} = asn1_wrapper:encode('ChoExtension','ChoExt4',Val),
-    ?line {ok,Val} = asn1_wrapper:decode('ChoExtension','ChoExt4',lists:flatten(B)),
-    ok.
diff --git a/lib/asn1/test/error_SUITE.erl b/lib/asn1/test/error_SUITE.erl
index a94a6d95a0..930b44cea6 100644
--- a/lib/asn1/test/error_SUITE.erl
+++ b/lib/asn1/test/error_SUITE.erl
@@ -19,7 +19,7 @@
 
 -module(error_SUITE).
 -export([suite/0,all/0,groups/0,
-	 already_defined/1,enumerated/1]).
+	 already_defined/1,enumerated/1,objects/1,values/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -29,8 +29,11 @@ all() ->
     [{group,p}].
 
 groups() ->
-    [{p,parallel(),[already_defined,
-		    enumerated]}].
+    [{p,parallel(),
+      [already_defined,
+       enumerated,
+       objects,
+       values]}].
 
 parallel() ->
     case erlang:system_info(schedulers) > 1 of
@@ -95,6 +98,67 @@ enumerated(Config) ->
     } = run(P, Config),
     ok.
 
+objects(Config) ->
+    M = 'Objects',
+    P = {M,
+	 <<"Objects DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n"
+	   "  obj1 CL ::= { &wrong 42 }\n"
+	   "  obj2 CL ::= { &wrong 1, &Wrong INTEGER }\n"
+	   "  obj3 CL ::= { &Data OCTET STRING }\n"
+	   "  obj4 SMALL ::= { &code 42 }\n"
+	   "  InvalidSet CL ::= { obj1 }\n"
+
+	   "  CL ::= CLASS {\n"
+	   "    &code INTEGER UNIQUE,\n"
+	   "    &enum ENUMERATED { a, b, c},\n"
+	   "    &Data,\n"
+	   "    &object CL,\n"
+	   "    &Set CL,\n"
+	   "    &vartypevalue &Data,\n"
+	   "    &VarTypeValue &Data\n"
+	   "  }\n"
+
+	   "  SMALL ::= CLASS {\n"
+	   "    &code INTEGER UNIQUE,\n"
+           "    &i INTEGER\n"
+           "  }\n"
+	   "END\n">>},
+    {error,
+     [
+      {structured_error,{M,2},asn1ct_check,
+       {invalid_fields,[wrong],obj1}},
+      {structured_error,{M,3},asn1ct_check,
+       {invalid_fields,['Wrong',wrong],obj2}},
+      {structured_error,{M,4},asn1ct_check,
+       {missing_mandatory_fields,['Set','VarTypeValue',code,
+				  enum,object,vartypevalue],obj3}},
+      {structured_error,{M,5},asn1ct_check,
+       {missing_mandatory_fields,[i],obj4}},
+      {structured_error,{M,6},asn1ct_check,
+       {invalid_fields,[wrong],'InvalidSet'}}
+     ]
+    } = run(P, Config),
+    ok.
+
+values(Config) ->
+    M = 'Values',
+    P = {M,
+	 <<"Values DEFINITIONS AUTOMATIC TAGS ::= BEGIN\n"
+	   "  os1 OCTET STRING ::= \"abc\"\n"
+	   "  os2 OCTET STRING ::= 42\n"
+	   "  os3 OCTET STRING ::= { 1, 3 }\n"
+	   "END\n">>},
+    {error,
+     [
+      {structured_error,{M,2},asn1ct_check,
+       illegal_octet_string_value},
+      {structured_error,{M,3},asn1ct_check,
+       illegal_octet_string_value},
+      {structured_error,{M,4},asn1ct_check,
+       illegal_octet_string_value}
+     ]
+    } = run(P, Config),
+    ok.
 
 
 run({Mod,Spec}, Config) ->
diff --git a/lib/asn1/test/h323test.erl b/lib/asn1/test/h323test.erl
index 426ae16994..7577928493 100644
--- a/lib/asn1/test/h323test.erl
+++ b/lib/asn1/test/h323test.erl
@@ -26,44 +26,62 @@ run(per)     -> run();
 run(_Rules)  -> ok.
 
 run() ->
-    alerting(),
-    connect(),
+    roundtrip('H323-UserInformation', alerting_val(), alerting_enc()),
+    roundtrip('H323-UserInformation', connect_val(), connect_enc()),
+    general_string(),
     ok.
 
-dec_alerting() ->
-    Cs = "0380060008914a0002020120110000000000000000000000000000000000",
-    ByteList = hexstr2bytes(Cs),
-    asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
+alerting_val() ->
+    {'H323-UserInformation',
+     {'H323-UU-PDU',
+      {alerting,
+       {'Alerting-UUIE',
+	{0,0,8,2250,0,2},
+	{'EndpointType',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+	 asn1_NOVALUE,asn1_NOVALUE,
+	 {'TerminalInfo',asn1_NOVALUE},
+	 false,false},
+	asn1_NOVALUE,
+	{'CallIdentifier',<<0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>},
+	asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}},
+      asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+     asn1_NOVALUE}.
 
-enc_alerting(V) ->
-    asn1_wrapper:encode('H323-MESSAGES','H323-UserInformation',V).
+alerting_enc() ->
+    "0380060008914a0002020120110000000000000000000000000000000000".
 
-alerting() ->
-    {ok,V} = dec_alerting(),
-    {ok,B} = enc_alerting(V),
-    ByteList = lists:flatten(B),
-    {ok,V} = asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
+connect_val() ->
+    {'H323-UserInformation',
+     {'H323-UU-PDU',
+      {connect,
+       {'Connect-UUIE',
+	{0,0,8,2250,0,2},
+	{ipAddress,
+	 {'TransportAddress_ipAddress',<<136,225,41,58>>,1187}},
+	{'EndpointType',asn1_NOVALUE,
+	 {'VendorIdentifier',
+	  {'H221NonStandard',181,0,21324},
+	  <<77,105,99,114,111,115,111,102,116,174,32,78,101,116,
+	   77,101,100,116,105,110,103,174,0>>,
+	  <<51,46,48,0>>},
+	 asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+	 {'TerminalInfo',asn1_NOVALUE},
+	 false,false},
+	<<22,137,237,197,191,35,211,17,140,45,0,192,79,75,28,208>>,
+	{'CallIdentifier',<<0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>},
+	asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}},
+      asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE},
+     asn1_NOVALUE}.
 
+connect_enc() ->
+    "02c0060008914a00020088e1293a04a322c0b500534c164d6963726f736f6674ae204e65744d656474696e67ae0003332e3000001689edc5bf23d3118c2d00c04f4b1cd00900110000000000000000000000000000000000".
 
-dec_connect() ->
-    Cs = "02c0060008914a00020088e1293a04a322c0b500534c164d6963726f736f6674ae204e65744d656474696e67ae0003332e3000001689edc5bf23d3118c2d00c04f4b1cd00900110000000000000000000000000000000000",
-    ByteList = hexstr2bytes(Cs),
-    asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
+general_string() ->
+    Type = 'MultimediaSystemControlMessage',
+    UI = <<109,64,1,57>>,
+    {ok, _V} = 'MULTIMEDIA-SYSTEM-CONTROL':decode(Type, UI).
 
-enc_connect(V) ->
-    asn1_wrapper:encode('H323-MESSAGES','H323-UserInformation',V).
-
-connect() ->
-    {ok,V} = dec_connect(),
-    {ok,B} = enc_connect(V),
-    ByteList = lists:flatten(B),
-    {ok,V} = asn1_wrapper:decode('H323-MESSAGES','H323-UserInformation',ByteList).
-
-hexstr2bytes([D1,D2|T]) ->
-    [dig2num(D1)*16+dig2num(D2)|hexstr2bytes(T)];
-hexstr2bytes([]) ->
-    [].
-
-dig2num(D) when D >= $0, D =< $9 -> D - $0;
-dig2num(D) when D >= $a, D =< $f -> 10 + D - $a;
-dig2num(D) when D >= $A, D =< $F -> 10 + D - $A.
+roundtrip(T, V, HexString) ->
+    Enc = asn1_test_lib:hex_to_bin(HexString),
+    Enc = asn1_test_lib:roundtrip_enc('H323-MESSAGES', T, V),
+    ok.
diff --git a/lib/asn1/test/pem_performance.erl b/lib/asn1/test/pem_performance.erl
deleted file mode 100644
index 87b8cbd61d..0000000000
--- a/lib/asn1/test/pem_performance.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%% %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([cert_pem/0]).
--module([dsa_pem/0]).
-
-cert_pem() ->
-    'OTP-PUB-KEY':decode('Certificate',<<48,130,3,184,48,130,3,33,160,3,2,1,2,2,1,1,48,13,6,9,42,134,72,134,247,13,1,1,5,5,0,48,129,131,49,14,48,12,6,3,85,4,3,19,5,111,116,112,67,65,49,19,48,17,6,3,85,4,11,19,10,69,114,108,97,110,103,32,79,84,80,49,20,48,18,6,3,85,4,10,19,11,69,114,105,99,115,115,111,110,32,65,66,49,11,48,9,6,3,85,4,6,19,2,83,69,49,18,48,16,6,3,85,4,7,19,9,83,116,111,99,107,104,111,108,109,49,37,48,35,6,9,42,134,72,134,247,13,1,9,1,22,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,30,23,13,48,56,48,49,48,57,48,56,50,57,51,48,90,23,13,49,55,49,49,49,55,48,56,50,57,51,48,90,48,129,132,49,15,48,13,6,3,85,4,3,19,6,99,108,105,101,110,116,49,19,48,17,6,3,85,4,11,19,10,69,114,108,97,110,103,32,79,84,80,49,20,48,18,6,3,85,4,10,19,11,69,114,105,99,115,115,111,110,32,65,66,49,11,48,9,6,3,85,4,6,19,2,83,69,49,18,48,16,6,3,85,4,7,19,9,83,116,111,99,107,104,111,108,109,49,37,48,35,6,9,42,134,72,134,247,13,1,9,1,22,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,129,159,48,13,6,9,42,134,72,134,247,13,1,1,1,5,0,3,129,141,0,48,129,137,2,129,129,0,245,56,68,254,220,239,193,190,63,221,182,60,67,77,121,163,214,136,137,183,139,8,166,30,100,27,45,17,126,58,15,173,151,218,75,224,148,14,22,164,10,100,186,183,104,175,197,97,96,182,146,150,106,129,140,100,194,106,90,62,133,233,155,46,155,33,101,220,83,193,182,232,240,99,253,249,114,8,159,172,143,77,179,132,229,205,29,110,185,233,224,52,25,149,249,100,80,229,199,125,23,106,146,233,159,26,13,8,161,206,221,43,240,149,42,45,194,190,85,6,235,152,220,219,160,32,144,67,2,3,1,0,1,163,130,1,55,48,130,1,51,48,9,6,3,85,29,19,4,2,48,0,48,11,6,3,85,29,15,4,4,3,2,5,224,48,29,6,3,85,29,14,4,22,4,20,26,59,44,5,72,211,158,214,23,34,30,241,125,27,123,115,93,163,231,120,48,129,179,6,3,85,29,35,4,129,171,48,129,168,128,20,6,171,128,52,58,164,184,118,178,189,157,46,40,229,109,145,222,125,1,155,161,129,140,164,129,137,48,129,134,49,17,48,15,6,3,85,4,3,19,8,101,114,108,97,110,103,67,65,49,19,48,17,6,3,85,4,11,19,10,69,114,108,97,110,103,32,79,84,80,49,20,48,18,6,3,85,4,10,19,11,69,114,105,99,115,115,111,110,32,65,66,49,18,48,16,6,3,85,4,7,19,9,83,116,111,99,107,104,111,108,109,49,11,48,9,6,3,85,4,6,19,2,83,69,49,37,48,35,6,9,42,134,72,134,247,13,1,9,1,22,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,130,1,1,48,33,6,3,85,29,17,4,26,48,24,129,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,33,6,3,85,29,18,4,26,48,24,129,22,112,101,116,101,114,64,101,114,105,120,46,101,114,105,99,115,115,111,110,46,115,101,48,13,6,9,42,134,72,134,247,13,1,1,5,5,0,3,129,129,0,93,11,112,227,121,15,121,179,247,135,110,216,17,197,84,18,149,166,147,142,190,178,0,209,190,0,142,233,144,100,194,205,220,182,73,204,108,42,95,23,48,63,4,120,239,42,194,25,184,35,117,107,96,229,18,45,76,122,125,40,171,210,132,50,146,178,160,55,17,35,255,208,114,30,47,55,185,154,155,165,204,180,14,143,20,234,6,234,201,225,72,235,5,87,61,255,250,23,217,1,144,246,98,221,223,102,49,168,177,13,70,241,26,27,254,251,217,14,244,18,242,197,151,50,186,214,15,42>>).
-
-dsa_pem() ->
-    'OTP-PUB-KEY':decode('DSAPrivateKey',<<48,130,1,187,2,1,0,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13,2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135,2,20,89,128,159,14,187,249,182,172,15,88,162,110,211,71,179,209,29,125,217,38>>),
-    'OTP-PUB-KEY':decode('SubjectPublicKeyInfo',<<48,130,1,183,48,130,1,44,6,7,42,134,72,206,56,4,1,48,130,1,31,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13,3,129,132,0,2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135>>),
-    'OTP-PUB-KEY':decode('DSAParams',<<48,130,1,31,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13>>),
-    'OTP-PUB-KEY':decode('DSAPublicKey',<<2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135>>),
-    'OTP-PUB-KEY':encode('DSAParams',{params,{'Dss-Parms',129000451850199666185842362389296595317127259539517666765336291347244303954511451744518587442120964433734460998523119938005801396466878889993179871123036311260456172022864663021425348874648247531097042575063545128239655736096045972718934778583429973433661785691086624069991876932064334822608460064613803976593,1216700114794736143432235288305776850295620488937,104420402274523493329542694749036577763086597934731674202966304958550599470165597750883637440049774107540742087494301536297571301945349213110548764383811017178451900599240379681904765817950545426764751538502808499880604633364255316249231153053427235538288687666086821781456733226598288985591031656134573747213}}),
-    'OTP-PUB-KEY':encode(
-      'SubjectPublicKeyInfo',
-      {'SubjectPublicKeyInfo',
-       {'AlgorithmIdentifier',
-        {1,2,840,10040,4,1},
-        <<48,130,1,31,2,129,129,0,183,179,230,217,37,99,144,157,21,228,204,162,207,61,246,144,58,139,139,184,184,43,108,206,0,115,173,208,100,233,201,121,21,90,179,119,53,140,25,52,34,202,121,211,164,107,43,56,68,162,159,51,244,232,138,126,164,109,121,89,237,142,57,28,32,188,44,67,253,111,121,104,40,141,211,255,140,118,37,234,150,201,155,160,16,17,51,59,26,249,41,129,16,211,119,128,95,254,182,235,132,0,92,206,93,77,106,217,201,132,203,4,75,201,246,204,216,162,1,84,79,211,10,21,152,195,103,145,2,21,0,213,30,184,86,247,16,247,69,192,241,35,138,84,57,140,3,71,65,206,233,2,129,129,0,148,179,24,63,74,91,128,25,96,29,5,78,223,246,175,0,121,86,54,178,42,231,98,241,147,180,157,60,149,160,50,243,227,76,175,89,234,203,252,242,76,108,9,204,157,182,59,206,227,127,99,215,42,156,194,78,116,25,7,62,243,169,45,5,101,179,247,127,199,144,135,103,23,42,154,125,231,248,154,101,175,155,101,42,232,41,80,41,47,128,208,11,31,106,63,12,202,207,135,80,200,136,250,171,31,118,52,91,200,138,112,111,179,23,214,123,21,118,194,179,0,185,217,52,197,182,236,13>>},
-       {0,
-        <<2,129,128,124,66,0,111,121,139,142,209,95,136,95,237,177,150,248,252,49,135,117,100,155,232,138,244,132,89,40,5,70,125,202,96,78,239,76,37,125,149,82,64,107,54,227,73,25,180,227,41,0,234,73,47,80,242,242,129,250,61,68,62,39,38,156,193,146,40,241,247,106,215,223,202,194,110,130,62,186,90,18,28,196,174,99,47,193,61,130,100,150,25,248,115,164,231,153,99,46,69,66,139,33,187,51,49,35,219,234,29,44,172,166,247,42,16,177,187,9,162,81,243,33,26,100,46,78,57,203,135>>}}).
diff --git a/lib/asn1/test/testChoExtension.erl b/lib/asn1/test/testChoExtension.erl
index c6a07646c2..09e19ceebb 100644
--- a/lib/asn1/test/testChoExtension.erl
+++ b/lib/asn1/test/testChoExtension.erl
@@ -31,16 +31,13 @@ extension(_Rules) ->
     %% A trick to encode with another compatible CHOICE type to test reception
     %% extension alternative
 
-    {ok,Bytes2x} = asn1_wrapper:encode('ChoExtension','ChoExt1x',{str,"abc"}),
-    {ok,Val2x} =
-	asn1_wrapper:decode('ChoExtension','ChoExt1',lists:flatten(Bytes2x)),
-    io:format("Choice extension alternative = ~p~n",[Val2x]),
+    roundtrip('ChoExt1x', {str,<<"abc">>}),
 
     roundtrip('ChoExt2', {bool,true}),
     roundtrip('ChoExt2', {int,33}),
     roundtrip('ChoExt3', {bool,true}),
     roundtrip('ChoExt3', {int,33}),
-    roundtrip('ChoExt4', {str,"abc"}),
+    roundtrip('ChoExt4', {str,<<"abc">>}),
 
     roundtrip('ChoEmptyRoot', {bool,false}),
     roundtrip('ChoEmptyRoot', {bool,true}),
@@ -51,6 +48,4 @@ extension(_Rules) ->
 
 
 roundtrip(Type, Value) ->
-    {ok,Encoded} = 'ChoExtension':encode(Type, Value),
-    {ok,Value} = 'ChoExtension':decode(Type, Encoded),
-    ok.
+    asn1_test_lib:roundtrip('ChoExtension', Type, Value).
diff --git a/lib/asn1/test/testChoExternal.erl b/lib/asn1/test/testChoExternal.erl
index 5fdee48add..0914d54f33 100644
--- a/lib/asn1/test/testChoExternal.erl
+++ b/lib/asn1/test/testChoExternal.erl
@@ -18,25 +18,11 @@
 %%
 %%
 -module(testChoExternal).
-
-
--export([compile/3]).
 -export([external/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 -include("External.hrl").
 
-
-
-compile(Config, Rules, Optimize) ->
-    DataDir = ?config(data_dir, Config),
-    CaseDir = ?config(case_dir, Config),
-    true = code:add_patha(CaseDir),
-    ok = asn1ct:compile(DataDir ++ "ChoExternal",
-                        [Rules, {outdir, CaseDir}] ++ Optimize).
-
-
-
 external(_Rules) ->
     roundtrip('ChoXCho', {boolCho,true}),
     roundtrip('ChoXCho', {intCho,77}),
@@ -45,20 +31,18 @@ external(_Rules) ->
     roundtrip('ChoXBool', {xboolImp,true}),
     roundtrip('ChoXBool', {xboolExp,true}),
 
-    roundtrip('NT', {os,"kalle"}),
-    roundtrip('Exp', {os,"kalle"}),
-    roundtrip('NTNT', {os,"kalle"}),
-    roundtrip('NTExp', {os,"kalle"}),
-    roundtrip('ExpNT', {os,"kalle"}),
-    roundtrip('ExpExp', {os,"kalle"}),
-    roundtrip('XNTNT', {os,"kalle"}),
-    roundtrip('XNTExp', {os,"kalle"}),
-    roundtrip('XExpNT', {os,"kalle"}),
-    roundtrip('XExpExp', {os,"kalle"}),
+    roundtrip('NT', {os,<<"kalle">>}),
+    roundtrip('Exp', {os,<<"kalle">>}),
+    roundtrip('NTNT', {os,<<"kalle">>}),
+    roundtrip('NTExp', {os,<<"kalle">>}),
+    roundtrip('ExpNT', {os,<<"kalle">>}),
+    roundtrip('ExpExp', {os,<<"kalle">>}),
+    roundtrip('XNTNT', {os,<<"kalle">>}),
+    roundtrip('XNTExp', {os,<<"kalle">>}),
+    roundtrip('XExpNT', {os,<<"kalle">>}),
+    roundtrip('XExpExp', {os,<<"kalle">>}),
     
     ok.
 
 roundtrip(Type, Value) ->
-    {ok,Encoded} = 'ChoExternal':encode(Type, Value),
-    {ok,Value} = 'ChoExternal':decode(Type, Encoded),
-    ok.
+    asn1_test_lib:roundtrip('ChoExternal', Type, Value).
diff --git a/lib/asn1/test/testChoOptional.erl b/lib/asn1/test/testChoOptional.erl
index cbb8134e51..71a7346e3f 100644
--- a/lib/asn1/test/testChoOptional.erl
+++ b/lib/asn1/test/testChoOptional.erl
@@ -18,83 +18,34 @@
 %%
 %%
 -module(testChoOptional).
+-export([run/0]).
 
--export([optional/1]).
+-record('Seq1', {bool, int = asn1_NOVALUE, cho = asn1_NOVALUE}).
+-record('Seq2', {int = asn1_NOVALUE, cho = asn1_NOVALUE, bool}).
+-record('Seq3', {cho = asn1_NOVALUE, int = asn1_NOVALUE, bool}).
 
-%-include("ChoOptional.hrl").
--include_lib("test_server/include/test_server.hrl").
--include("External.hrl").
+run() ->
+    roundtrip('Seq1', #'Seq1'{bool=true,int=asn1_NOVALUE,cho=asn1_NOVALUE}),
+    roundtrip('Seq1', #'Seq1'{bool=true,int=233,cho=asn1_NOVALUE}),
+    roundtrip('Seq1', #'Seq1'{bool=true,int=asn1_NOVALUE,
+			      cho={vsCho,"Vs Str"}}),
+    roundtrip('Seq1', #'Seq1'{bool=true,int=asn1_NOVALUE,
+			      cho={ocStrCho,<<"Oct Str">>}}),
+    roundtrip('Seq2', #'Seq2'{int=asn1_NOVALUE,cho=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq2', #'Seq2'{int=233,cho=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq2', #'Seq2'{int=asn1_NOVALUE,cho={vsCho,"Vs Str"},bool=true}),
+    roundtrip('Seq2', #'Seq2'{int=asn1_NOVALUE,cho={ocStrCho,<<"Oct Str">>},
+			      bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho=asn1_NOVALUE,int=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho=asn1_NOVALUE,int=233,bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho={vsCho,"Vs Str"},int=asn1_NOVALUE,bool=true}),
+    roundtrip('Seq3', #'Seq3'{cho={ocStrCho,<<"Oct Str">>},
+			      int=asn1_NOVALUE,bool=true}),
+    ok.
 
--record('Seq1',{bool, int = asn1_NOVALUE, cho = asn1_NOVALUE}).
--record('Seq2',{int = asn1_NOVALUE, cho = asn1_NOVALUE, bool}).
--record('Seq3',{cho = asn1_NOVALUE, int = asn1_NOVALUE, bool}).
+roundtrip(Type, Value) ->
+    roundtrip('ChoOptional', Type, Value),
+    roundtrip('ChoOptionalImplicitTag', Type, Value).
 
-optional(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq1',true,233,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,{vsCho,"Vs Str"}}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('ChoOptional','Seq1',#'Seq1'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,{ocStrCho,"Oct Str"}}} = 
-	asn1_wrapper:decode('ChoOptional','Seq1',lists:flatten(Bytes14)),
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq2',233,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,{vsCho,"Vs Str"},true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = 
-	asn1_wrapper:encode('ChoOptional','Seq2',#'Seq2'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,{ocStrCho,"Oct Str"},true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq2',lists:flatten(Bytes24)),
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true}),
-    ?line {ok,{'Seq3',asn1_NOVALUE,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq3',asn1_NOVALUE,233,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq3',{vsCho,"Vs Str"},asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = 
-	asn1_wrapper:encode('ChoOptional','Seq3',#'Seq3'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq3',{ocStrCho,"Oct Str"},asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptional','Seq3',lists:flatten(Bytes34)),
-    
-    
-    
-    ok.
+roundtrip(Mod, Type, Value) ->
+    asn1_test_lib:roundtrip(Mod, Type, Value).
diff --git a/lib/asn1/test/testChoOptionalImplicitTag.erl b/lib/asn1/test/testChoOptionalImplicitTag.erl
deleted file mode 100644
index efe335cabd..0000000000
--- a/lib/asn1/test/testChoOptionalImplicitTag.erl
+++ /dev/null
@@ -1,101 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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(testChoOptionalImplicitTag).
-
-
--export([optional/1]).
-
-%-include("ChoOptional.hrl").
--include_lib("test_server/include/test_server.hrl").
--include("External.hrl").
-
--record('Seq1',{bool, int = asn1_NOVALUE, cho = asn1_NOVALUE}).
--record('Seq2',{int = asn1_NOVALUE, cho = asn1_NOVALUE, bool}).
--record('Seq3',{cho = asn1_NOVALUE, int = asn1_NOVALUE, bool}).
-
-optional(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq1',#'Seq1'{bool = true}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq1',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq1',#'Seq1'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq1',true,233,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq1',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq1',#'Seq1'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,{vsCho,"Vs Str"}}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq1',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('ChoOptionalImplicitTag','Seq1',#'Seq1'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq1',true,asn1_NOVALUE,{ocStrCho,"Oct Str"}}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq1',lists:flatten(Bytes14)),
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq2',#'Seq2'{bool = true}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq2',#'Seq2'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq2',233,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq2',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq2',#'Seq2'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,{vsCho,"Vs Str"},true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq2',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = 
-	asn1_wrapper:encode('ChoOptionalImplicitTag','Seq2',#'Seq2'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq2',asn1_NOVALUE,{ocStrCho,"Oct Str"},true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq2',lists:flatten(Bytes24)),
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq3',#'Seq3'{bool = true}),
-    ?line {ok,{'Seq3',asn1_NOVALUE,asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq3',#'Seq3'{bool = true,
-								    int = 233}),
-    ?line {ok,{'Seq3',asn1_NOVALUE,233,true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq3',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('ChoOptionalImplicitTag','Seq3',#'Seq3'{bool = true,
-								    cho = {vsCho,"Vs Str"}}),
-    ?line {ok,{'Seq3',{vsCho,"Vs Str"},asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq3',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = 
-	asn1_wrapper:encode('ChoOptionalImplicitTag','Seq3',#'Seq3'{bool = true,
-						   cho = {ocStrCho,"Oct Str"}}),
-    ?line {ok,{'Seq3',{ocStrCho,"Oct Str"},asn1_NOVALUE,true}} = 
-	asn1_wrapper:decode('ChoOptionalImplicitTag','Seq3',lists:flatten(Bytes34)),
-    
-    
-    
-    ok.
diff --git a/lib/asn1/test/testChoPrim.erl b/lib/asn1/test/testChoPrim.erl
index 936a38f76c..4665de6989 100644
--- a/lib/asn1/test/testChoPrim.erl
+++ b/lib/asn1/test/testChoPrim.erl
@@ -25,80 +25,44 @@
 -include_lib("test_server/include/test_server.hrl").
 
 bool(Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoPrim','ChoCon',{bool0,true}),
-    ?line {ok,{bool0,true}} = asn1_wrapper:decode('ChoPrim','ChoCon',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoPrim','ChoCon',{bool1,true}),
-    ?line {ok,{bool1,true}} = asn1_wrapper:decode('ChoPrim','ChoCon',lists:flatten(Bytes12)),
-
-    ?line {ok,Bytes13} = asn1_wrapper:encode('ChoPrim','ChoCon',{int2,233}),
-    ?line {ok,{int2,233}} = asn1_wrapper:decode('ChoPrim','ChoCon',lists:flatten(Bytes13)),
-
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber ->
-		  ?line {error,{asn1,{invalid_choice_type,wrong}}} = 
-		      case catch asn1_wrapper:encode('ChoPrim','ChoCon',{wrong,233}) of 
-			  X1 -> X1 end,
-		  ?line {error,{asn1,{invalid_choice_tag,_WrongTag}}} = 
-		      case catch asn1_wrapper:decode('ChoPrim','ChoCon',[131,2,0,233]) of 
-			  X2 -> X2 end,
-		  ok;
-
-	      per ->
-		  ok
-	  end,
-
+    roundtrip('ChoCon', {bool0,true}),
+    roundtrip('ChoCon', {bool1,true}),
+    roundtrip('ChoCon', {int2,233}),
+    case Rules of
+	ber ->
+	    {error,{asn1,{invalid_choice_type,wrong}}} =
+		(catch 'ChoPrim':encode('ChoCon', {wrong,233})),
+	    {error,{asn1,{invalid_choice_tag,_WrongTag}}} =
+		(catch 'ChoPrim':decode('ChoCon', <<131,2,0,233>>));
+	per ->
+	    ok;
+	uper ->
+	    ok
+    end,
     ok.
 
-
-
 int(Rules) ->
-
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoPrim','ChoExp',{int10,1}),
-    ?line {ok,{int10,first}} = asn1_wrapper:decode('ChoPrim','ChoExp',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoPrim','ChoExp',{int10,first}),
-    ?line {ok,{int10,first}} = asn1_wrapper:decode('ChoPrim','ChoExp',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoPrim','ChoExp',{int10,last}),
-    ?line {ok,{int10,last}} = asn1_wrapper:decode('ChoPrim','ChoExp',lists:flatten(Bytes23)),
-
-    ?line {ok,Bytes24} = asn1_wrapper:encode('ChoPrim','ChoExp',{bool11,true}),
-    ?line {ok,{bool11,true}} = asn1_wrapper:decode('ChoPrim','ChoExp',lists:flatten(Bytes24)),
-
-
-    ?line {ok,Bytes26} = asn1_wrapper:encode('ChoPrim','ChoExp',{enum12,one}),
-    ?line {ok,{enum12,one}} = asn1_wrapper:decode('ChoPrim','ChoExp',lists:flatten(Bytes26)),
-
-    ?line {ok,Bytes25} = asn1_wrapper:encode('ChoPrim','ChoExp',{bool11,true}),
-    ?line {ok,{bool11,true}} = 
-	asn1_wrapper:decode('ChoPrim','ChoExp',lists:flatten(Bytes25)),
-    
-    ?line {error,{asn1,_}} = 
-	case catch asn1_wrapper:encode('ChoPrim','ChoExp',{enum12,four}) of 
-	    X3 -> X3 end,
-    
-    ?line {error,{asn1,_}} = 
-	case catch asn1_wrapper:encode('ChoPrim','ChoExp',{wrong,233}) of 
-	    X4 -> io:format("error reason = ~p~n",[X4]), X4 end,
-		  
-    ?line case asn1_wrapper:erule(Rules) of
-	      ber ->
-		  ?line {error,{asn1,_}} = 
-		      case catch asn1_wrapper:decode('ChoPrim','ChoExp',[107,3,2,1,1]) of 
-			  X5 -> X5 end,
-		  ok;
-
-	      per ->
-		  ok
-	  end,
+    roundtrip('ChoExp', {int10,1}, {int10,first}),
+    roundtrip('ChoExp', {int10,first}),
+    roundtrip('ChoExp', {int10,last}),
+    roundtrip('ChoExp', {bool11,true}),
+    roundtrip('ChoExp', {enum12,one}),
+    roundtrip('ChoExp', {bool11,true}),
+
+    {error,{asn1,_}} = (catch 'ChoPrim':encode('ChoExp', {enum12,four})),
+    {error,{asn1,_}} = (catch 'ChoPrim':encode('ChoExp', {wrong,233})),
+    case Rules of
+	ber ->
+	    {error,{asn1,_}} = (catch 'ChoPrim':decode('ChoExp', <<107,3,2,1,1>>));
+	per ->
+	    ok;
+	uper ->
+	    ok
+    end,
     ok.
 
+roundtrip(Type, Value) ->
+    roundtrip(Type, Value, Value).
 
-
-
-
-
-
-
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('ChoPrim', Type, Value, ExpectedValue).
diff --git a/lib/asn1/test/testChoRecursive.erl b/lib/asn1/test/testChoRecursive.erl
index ee26d124a9..ccd60c2897 100644
--- a/lib/asn1/test/testChoRecursive.erl
+++ b/lib/asn1/test/testChoRecursive.erl
@@ -31,18 +31,16 @@ recursive(_Rules) ->
     roundtrip('ChoRec',
 	      {something,
 	       #'ChoRec_something'{a = 77,
-				   b = "some octets here",
+				   b = <<"some octets here">>,
 				   c = {nothing,'NULL'}}}),
     roundtrip('ChoRec', {nothing,'NULL'}),
     roundtrip('ChoRec2',
 	      {something,
 	       #'ChoRec2_something'{a = 77,
-				    b = "some octets here",
+				    b = <<"some octets here">>,
 				    c = {nothing,'NULL'}}}),
     roundtrip('ChoRec2', {nothing,'NULL'}),
     ok.
 
 roundtrip(Type, Value) ->
-    {ok,Encoded} = 'ChoRecursive':encode(Type, Value),
-    {ok,Value} = 'ChoRecursive':decode(Type, Encoded),
-    ok.
+    asn1_test_lib:roundtrip('ChoRecursive', Type, Value).
diff --git a/lib/asn1/test/testChoTypeRefCho.erl b/lib/asn1/test/testChoTypeRefCho.erl
index 9bd732f462..636c301403 100644
--- a/lib/asn1/test/testChoTypeRefCho.erl
+++ b/lib/asn1/test/testChoTypeRefCho.erl
@@ -24,43 +24,15 @@
 -include_lib("test_server/include/test_server.hrl").
 
 choice(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoTypeRefCho','ChoTRcho',{choCho,{choInt,88}}),
-    ?line {ok,{choCho,{choInt,88}}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoTRcho',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('ChoTypeRefCho','ChoTRcho',{choChoE,{choInt,88}}),
-    ?line {ok,{choChoE,{choInt,88}}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoTRcho',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('ChoTypeRefCho','ChoTRcho',{'choCho-E',{choInt,88}}),
-    ?line {ok,{'choCho-E',{choInt,88}}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoTRcho',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = asn1_wrapper:encode('ChoTypeRefCho','ChoTRcho',{'choChoE-E',{choInt,88}}),
-    ?line {ok,{'choChoE-E',{choInt,88}}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoTRcho',lists:flatten(Bytes14)),
-    
-    
-
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoTypeRefCho','ChoChoInline',{bool1,true}),
-    ?line {ok,{bool1,true}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoChoInline',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoTypeRefCho','ChoChoInline',{'choCho',{bool,true}}),
-    ?line {ok,{'choCho',{bool,true}}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoChoInline',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoTypeRefCho','ChoChoInline',{'choCho',{octStr,"kk"}}),
-    ?line {ok,{'choCho',{octStr,"kk"}}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoChoInline',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = asn1_wrapper:encode('ChoTypeRefCho','ChoChoInline',{'choCho',{int,55}}),
-    ?line {ok,{'choCho',{int,55}}} = 
-	asn1_wrapper:decode('ChoTypeRefCho','ChoChoInline',lists:flatten(Bytes24)),
-    
-    
-    
-    
-    
+    roundtrip('ChoTRcho', {choCho,{choInt,88}}),
+    roundtrip('ChoTRcho', {choChoE,{choInt,88}}),
+    roundtrip('ChoTRcho', {'choCho-E',{choInt,88}}),
+    roundtrip('ChoTRcho', {'choChoE-E',{choInt,88}}),
+    roundtrip('ChoChoInline', {bool1,true}),
+    roundtrip('ChoChoInline', {choCho,{bool,true}}),
+    roundtrip('ChoChoInline', {choCho,{octStr,<<"kk">>}}),
+    roundtrip('ChoChoInline', {choCho,{int,55}}),
     ok.
+
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('ChoTypeRefCho', Type, Value).
diff --git a/lib/asn1/test/testChoTypeRefPrim.erl b/lib/asn1/test/testChoTypeRefPrim.erl
index edef6192fe..747baeddd8 100644
--- a/lib/asn1/test/testChoTypeRefPrim.erl
+++ b/lib/asn1/test/testChoTypeRefPrim.erl
@@ -24,60 +24,20 @@
 -include_lib("test_server/include/test_server.hrl").
 
 prim(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR',{bool,true}),
-    ?line {ok,{bool,true}} = asn1_wrapper:decode('ChoTypeRefPrim','ChoTR',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('ChoTypeRefPrim','ChoTR',{octStr,[11,12,13,14,15,16,17]}),
-    ?line {ok,{octStr,[11,12,13,14,15,16,17]}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR',{int,233}),
-    ?line {ok,{int,233}} = asn1_wrapper:decode('ChoTypeRefPrim','ChoTR',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('ChoTypeRefPrim','ChoTR',{octStr,"Stringing in the rain"}),
-    ?line {ok,{octStr,"Stringing in the rain"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR',lists:flatten(Bytes14)),
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStr',"A string"}),
-    ?line {ok,{'octStr',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStrI',"A string"}),
-    ?line {ok,{'octStrI',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStrE',"A string"}),
-    ?line {ok,{'octStrE',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStr-I',"A string"}),
-    ?line {ok,{'octStr-I',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes24)),
-    
-    ?line {ok,Bytes25} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStrI-I',"A string"}),
-    ?line {ok,{'octStrI-I',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes25)),
-    
-    ?line {ok,Bytes26} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStrE-I',"A string"}),
-    ?line {ok,{'octStrE-I',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes26)),
-    
-    ?line {ok,Bytes27} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStr-E',"A string"}),
-    ?line {ok,{'octStr-E',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes27)),
-    
-    ?line {ok,Bytes28} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStrI-E',"A string"}),
-    ?line {ok,{'octStrI-E',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes28)),
-    
-    ?line {ok,Bytes29} = asn1_wrapper:encode('ChoTypeRefPrim','ChoTR2',{'octStrE-E',"A string"}),
-    ?line {ok,{'octStrE-E',"A string"}} = 
-	asn1_wrapper:decode('ChoTypeRefPrim','ChoTR2',lists:flatten(Bytes29)),
-    
-    
+    roundtrip('ChoTR', {bool,true}),
+    roundtrip('ChoTR', {octStr,<<11,12,13,14,15,16,17>>}),
+    roundtrip('ChoTR', {int,233}),
+    roundtrip('ChoTR', {octStr,<<"Stringing in the rain">>}),
+    roundtrip('ChoTR2', {octStr,<<"A string">>}),
+    roundtrip('ChoTR2', {octStrI,<<"A string">>}),
+    roundtrip('ChoTR2', {octStrE,<<"A string">>}),
+    roundtrip('ChoTR2', {'octStr-I',<<"A string">>}),
+    roundtrip('ChoTR2', {'octStrI-I',<<"A string">>}),
+    roundtrip('ChoTR2', {'octStrE-I',<<"A string">>}),
+    roundtrip('ChoTR2', {'octStr-E',<<"A string">>}),
+    roundtrip('ChoTR2', {'octStrI-E',<<"A string">>}),
+    roundtrip('ChoTR2', {'octStrE-E',<<"A string">>}),
     ok.
+
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('ChoTypeRefPrim', Type, Value).
diff --git a/lib/asn1/test/testChoTypeRefSeq.erl b/lib/asn1/test/testChoTypeRefSeq.erl
index bf2b66c73e..91d0b45e89 100644
--- a/lib/asn1/test/testChoTypeRefSeq.erl
+++ b/lib/asn1/test/testChoTypeRefSeq.erl
@@ -23,82 +23,30 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--record('ChoSeq',{seqInt, seqOs}).
--record('ChoSeqImp',{seqInt, seqOs}).
--record('ChoSeqExp',{seqInt, seqOs}).
+-record('ChoSeq', {seqInt, seqOs}).
+-record('ChoSeqImp', {seqInt, seqOs}).
+-record('ChoSeqExp', {seqInt, seqOs}).
 
 seq(_Rules) ->
-    
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {choSeq,#'ChoSeq'{seqInt = 88,
-					seqOs = "A string"}}),
-    ?line {ok,{choSeq,{'ChoSeq',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes1)),
-    
-    
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {choSeqI,#'ChoSeq'{seqInt = 88,
-					 seqOs = "A string"}}),
-    ?line {ok,{choSeqI,{'ChoSeq',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes2)),
-    
-    
-    ?line {ok,Bytes3} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {choSeqE,#'ChoSeq'{seqInt = 88,
-					 seqOs = "A string"}}),
-    ?line {ok,{choSeqE,{'ChoSeq',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes3)),
-    
-    
-    ?line {ok,Bytes4} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {'choSeq-I',#'ChoSeqImp'{seqInt = 88,
-					       seqOs = "A string"}}),
-    ?line {ok,{'choSeq-I',{'ChoSeqImp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes4)),
-    
-    
-    ?line {ok,Bytes5} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {'choSeqI-I',#'ChoSeqImp'{seqInt = 88,
-						seqOs = "A string"}}),
-    ?line {ok,{'choSeqI-I',{'ChoSeqImp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes5)),
-    
-    
-    ?line {ok,Bytes6} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {'choSeqE-I',#'ChoSeqImp'{seqInt = 88,
-						seqOs = "A string"}}),
-    ?line {ok,{'choSeqE-I',{'ChoSeqImp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes6)),
-    
-    
-    ?line {ok,Bytes7} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {'choSeq-E',#'ChoSeqExp'{seqInt = 88,
-					       seqOs = "A string"}}),
-    ?line {ok,{'choSeq-E',{'ChoSeqExp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes7)),
-    
-    
-    ?line {ok,Bytes8} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {'choSeqI-E',#'ChoSeqExp'{seqInt = 88,
-						seqOs = "A string"}}),
-    ?line {ok,{'choSeqI-E',{'ChoSeqExp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes8)),
-    
-    
-    ?line {ok,Bytes9} = 
-	asn1_wrapper:encode('ChoTypeRefSeq','ChoTRseq',
-		      {'choSeqE-E',#'ChoSeqExp'{seqInt = 88,
-						seqOs = "A string"}}),
-    ?line {ok,{'choSeqE-E',{'ChoSeqExp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSeq','ChoTRseq',lists:flatten(Bytes9)),
-    
-    
+    roundtrip('ChoTRseq', {choSeq,#'ChoSeq'{seqInt=88,
+					    seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {choSeqI,#'ChoSeq'{seqInt=88,
+					     seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {choSeqE,#'ChoSeq'{seqInt=88,
+					     seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {'choSeq-I',#'ChoSeqImp'{seqInt=88,
+						   seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {'choSeqI-I',#'ChoSeqImp'{seqInt=88,
+						    seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {'choSeqE-I',#'ChoSeqImp'{seqInt=88,
+						    seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {'choSeq-E',#'ChoSeqExp'{seqInt=88,
+						   seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {'choSeqI-E',#'ChoSeqExp'{seqInt=88,
+						    seqOs = <<"A string">>}}),
+    roundtrip('ChoTRseq', {'choSeqE-E',#'ChoSeqExp'{seqInt=88,
+						    seqOs = <<"A string">>}}),
     ok.
+
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('ChoTypeRefSeq', Type, Value).
diff --git a/lib/asn1/test/testChoTypeRefSet.erl b/lib/asn1/test/testChoTypeRefSet.erl
index 8a3e8bdbb0..bd9068b53e 100644
--- a/lib/asn1/test/testChoTypeRefSet.erl
+++ b/lib/asn1/test/testChoTypeRefSet.erl
@@ -23,83 +23,30 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--record('ChoSet',{setInt, setOs}).
--record('ChoSetImp',{setInt, setOs}).
--record('ChoSetExp',{setInt, setOs}).
+-record('ChoSet', {setInt, setOs}).
+-record('ChoSetImp', {setInt, setOs}).
+-record('ChoSetExp', {setInt, setOs}).
 
 set(_Rules) ->
-
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {choSet,#'ChoSet'{setInt = 88,
-					setOs = "A string"}}),
-    ?line {ok,{choSet,{'ChoSet',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes1)),
-    
-    
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {choSetI,#'ChoSet'{setInt = 88,
-					 setOs = "A string"}}),
-    ?line {ok,{choSetI,{'ChoSet',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes2)),
-    
-    
-    ?line {ok,Bytes3} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {choSetE,#'ChoSet'{setInt = 88,
-					 setOs = "A string"}}),
-    ?line {ok,{choSetE,{'ChoSet',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes3)),
-    
-    
-    ?line {ok,Bytes4} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {'choSet-I',#'ChoSetImp'{setInt = 88,
-					       setOs = "A string"}}),
-    ?line {ok,{'choSet-I',{'ChoSetImp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes4)),
-    
-    
-    ?line {ok,Bytes5} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {'choSetI-I',#'ChoSetImp'{setInt = 88,
-						setOs = "A string"}}),
-    ?line {ok,{'choSetI-I',{'ChoSetImp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes5)),
-    
-    
-    ?line {ok,Bytes6} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {'choSetE-I',#'ChoSetImp'{setInt = 88,
-						setOs = "A string"}}),
-    ?line {ok,{'choSetE-I',{'ChoSetImp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes6)),
-    
-    
-    ?line {ok,Bytes7} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {'choSet-E',#'ChoSetExp'{setInt = 88,
-					       setOs = "A string"}}),
-    ?line {ok,{'choSet-E',{'ChoSetExp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes7)),
-    
-    
-    ?line {ok,Bytes8} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {'choSetI-E',#'ChoSetExp'{setInt = 88,
-						setOs = "A string"}}),
-    ?line {ok,{'choSetI-E',{'ChoSetExp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes8)),
-    
-    
-    ?line {ok,Bytes9} = 
-	asn1_wrapper:encode('ChoTypeRefSet','ChoTRset',
-		      {'choSetE-E',#'ChoSetExp'{setInt = 88,
-						setOs = "A string"}}),
-    ?line {ok,{'choSetE-E',{'ChoSetExp',88,"A string"}}} = 
-	asn1_wrapper:decode('ChoTypeRefSet','ChoTRset',lists:flatten(Bytes9)),
-    
-    
-    
+    roundtrip('ChoTRset', {choSet,#'ChoSet'{setInt=88,
+					    setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {choSetI,#'ChoSet'{setInt=88,
+					     setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {choSetE,#'ChoSet'{setInt=88,
+					     setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {'choSet-I',#'ChoSetImp'{setInt=88,
+						   setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {'choSetI-I',#'ChoSetImp'{setInt=88,
+						    setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {'choSetE-I',#'ChoSetImp'{setInt=88,
+						    setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {'choSet-E',#'ChoSetExp'{setInt=88,
+						   setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {'choSetI-E',#'ChoSetExp'{setInt=88,
+						    setOs = <<"A string">>}}),
+    roundtrip('ChoTRset', {'choSetE-E',#'ChoSetExp'{setInt=88,
+						    setOs = <<"A string">>}}),
     ok.
+
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('ChoTypeRefSet', Type, Value).
diff --git a/lib/asn1/test/testChoiceIndefinite.erl b/lib/asn1/test/testChoiceIndefinite.erl
index b5832c985a..87910cf6ec 100644
--- a/lib/asn1/test/testChoiceIndefinite.erl
+++ b/lib/asn1/test/testChoiceIndefinite.erl
@@ -32,6 +32,6 @@ main(ber) ->
     Bi = [48,128,160,128,128,1,11,0,0,129,1,12,0,0],
     %% the value which is encoded
     V = {'Seq',{ca,11},12},
-    ?line {ok,V} = asn1_wrapper:decode('ChoiceIndef','Seq',B),
-    ?line {ok,V} = asn1_wrapper:decode('ChoiceIndef','Seq',Bi),
+    {ok,V} = 'ChoiceIndef':decode('Seq', B),
+    {ok,V} = 'ChoiceIndef':decode('Seq', Bi),
     ok.
diff --git a/lib/asn1/test/testConstraints.erl b/lib/asn1/test/testConstraints.erl
index 03a09492af..3ccf883bd6 100644
--- a/lib/asn1/test/testConstraints.erl
+++ b/lib/asn1/test/testConstraints.erl
@@ -70,6 +70,8 @@ int_constraints(Rules) ->
     %%==========================================================
     LastNumWithoutLengthEncoding = 65536,
     roundtrip('Range256to65536', LastNumWithoutLengthEncoding),
+    roundtrip('Range256to65536Ext', LastNumWithoutLengthEncoding),
+    roundtrip('Range256to65536Ext', 42),
 
     FirstNumWithLengthEncoding = 65537,
     roundtrip('LargeConstraints', 'RangeMax', FirstNumWithLengthEncoding),
@@ -95,6 +97,8 @@ int_constraints(Rules) ->
     %% Random number within longlong range
     LongLong = 12672809400538808320,
     roundtrip('LongLong', LongLong),
+    roundtrip('LongLongExt', LongLong),
+    roundtrip('LongLongExt', -10000),
 
     %%==========================================================
     %%  Constraint Combinations (Duboisson p. 285)
@@ -122,6 +126,42 @@ int_constraints(Rules) ->
     range_error(Rules, 'X1', 21),
 
     %%==========================================================
+    %%  Union of single values
+    %%  Sv1 ::= INTEGER (2|3|17)
+    %%  Sv2 ::= INTEGER (2|3|17, ...)
+    %%  Sv3 ::= INTEGER {a(2),b(3),z(17)} (2|3|17, ...)
+    %%==========================================================
+
+    range_error(Rules, 'Sv1', 1),
+    range_error(Rules, 'Sv1', 18),
+    roundtrip('Sv1', 2),
+    roundtrip('Sv1', 3),
+    roundtrip('Sv1', 7),
+
+    %% Encoded as root
+    v_roundtrip(Rules, 'Sv2', 2),
+    v_roundtrip(Rules, 'Sv2', 3),
+    v_roundtrip(Rules, 'Sv2', 17),
+
+    %% Encoded as extension
+    v_roundtrip(Rules, 'Sv2', 1),
+    v_roundtrip(Rules, 'Sv2', 4),
+    v_roundtrip(Rules, 'Sv2', 18),
+
+    %% Encoded as root
+    v_roundtrip(Rules, 'Sv3', a),
+    v_roundtrip(Rules, 'Sv3', b),
+    v_roundtrip(Rules, 'Sv3', z),
+    v_roundtrip(Rules, 'Sv3', 2, a),
+    v_roundtrip(Rules, 'Sv3', 3, b),
+    v_roundtrip(Rules, 'Sv3', 17, z),
+
+    %% Encoded as extension
+    v_roundtrip(Rules, 'Sv3', 1),
+    v_roundtrip(Rules, 'Sv3', 4),
+    v_roundtrip(Rules, 'Sv3', 18),
+
+    %%==========================================================
     %%  SemiConstrained
     %%==========================================================
 
@@ -168,20 +208,29 @@ int_constraints(Rules) ->
     %%  More SIZE Constraints
     %%==========================================================
 
-    roundtrip('FixedSize', "0123456789"),
-    roundtrip('FixedSize2', "0123456789"),
-    roundtrip('FixedSize2', "0123456789abcdefghij"),
+    roundtrip('FixedSize', <<"0123456789">>),
+    roundtrip('FixedSize2', <<"0123456789">>),
+    roundtrip('FixedSize2', <<"0123456789abcdefghij">>),
 
     range_error(Rules, 'FixedSize', "short"),
     range_error(Rules, 'FixedSize2', "short"),
 
-    [roundtrip('VariableSize', lists:seq($A, $A+L-1)) ||
+    [roundtrip('VariableSize', list_to_binary(lists:seq($A, $A+L-1))) ||
 	L <- lists:seq(1, 10)],
 
     roundtrip_enc('ShorterExt', "a", shorter_ext(Rules, "a")),
     roundtrip('ShorterExt', "abcde"),
     roundtrip('ShorterExt', "abcdef"),
 
+    %%==========================================================
+    %%  Unions of INTEGER constraints
+    %%==========================================================
+    seq_roundtrip(Rules, 'SeqOverlapping', 'SeqNonOverlapping', 7580),
+    seq_roundtrip(Rules, 'SeqOverlapping', 'SeqNonOverlapping', 9600),
+    seq_roundtrip(Rules, 'SeqOverlapping', 'SeqNonOverlapping', 18050),
+    seq_roundtrip(Rules, 'SeqOverlapping', 'SeqNonOverlapping', 19000),
+    seq_roundtrip(Rules, 'SeqOverlapping', 'SeqNonOverlapping', 26900),
+
     ok.
 
 %% PER: Ensure that if the lower bound is Lb, Lb+16#80 is encoded
@@ -197,33 +246,54 @@ v(per, 'SemiConstrainedExt', 42+128) -> "000180";
 v(uper, 'SemiConstrainedExt', 42+128) -> "00C000";
 v(ber, 'NegSemiConstrainedExt', 0) -> "020100";
 v(per, 'NegSemiConstrainedExt', 0) -> "000180";
-v(uper, 'NegSemiConstrainedExt', 0) -> "00C000".
+v(uper, 'NegSemiConstrainedExt', 0) -> "00C000";
+v(ber, 'Sv2', 1) -> "020101";
+v(per, 'Sv2', 1) -> "800101";
+v(uper, 'Sv2', 1) -> "808080";
+v(ber, 'Sv2', 2) -> "020102";
+v(per, 'Sv2', 2) -> "00";
+v(uper, 'Sv2', 2) -> "00";
+v(ber, 'Sv2', 3) -> "020103";
+v(per, 'Sv2', 3) -> "08";
+v(uper, 'Sv2', 3) -> "08";
+v(ber, 'Sv2', 4) -> "020104";
+v(per, 'Sv2', 4) -> "800104";
+v(uper, 'Sv2', 4) -> "808200";
+v(ber, 'Sv2', 17) -> "020111";
+v(per, 'Sv2', 17) -> "78";
+v(uper, 'Sv2', 17) -> "78";
+v(ber, 'Sv2', 18) -> "020112";
+v(per, 'Sv2', 18) -> "800112";
+v(uper, 'Sv2', 18) -> "808900";
+v(Rule, 'Sv3', a) -> v(Rule, 'Sv2', 2);
+v(Rule, 'Sv3', b) -> v(Rule, 'Sv2', 3);
+v(Rule, 'Sv3', z) -> v(Rule, 'Sv2', 17);
+v(Rule, 'Sv3', Val) when is_integer(Val) -> v(Rule, 'Sv2', Val).
 
 shorter_ext(per, "a") -> <<16#80,16#01,16#61>>;
 shorter_ext(uper, "a") -> <<16#80,16#E1>>;
 shorter_ext(ber, _) -> none.
 
 refed_NNL_name(_Erule) ->
-    ?line {ok,_} = asn1_wrapper:encode('Constraints','AnotherThing',fred),
-    ?line {error,_Reason} = 
-	asn1_wrapper:encode('Constraints','AnotherThing',fred3).
+    roundtrip('AnotherThing', fred),
+    {error,_Reason} = 'Constraints':encode('AnotherThing', fred3).
 
 v_roundtrip(Erule, Type, Value) ->
     Encoded = asn1_test_lib:hex_to_bin(v(Erule, Type, Value)),
     Encoded = roundtrip('Constraints', Type, Value).
 
+v_roundtrip(Erule, Type, Value, Expected) ->
+    Encoded = asn1_test_lib:hex_to_bin(v(Erule, Type, Value)),
+    Encoded = asn1_test_lib:roundtrip_enc('Constraints', Type, Value, Expected).
+
 roundtrip(Type, Value) ->
     roundtrip('Constraints', Type, Value).
 
 roundtrip(Module, Type, Value) ->
-    {ok,Encoded} = Module:encode(Type, Value),
-    {ok,Value} = Module:decode(Type, Encoded),
-    Encoded.
+    asn1_test_lib:roundtrip_enc(Module, Type, Value).
 
 roundtrip_enc(Type, Value, Enc) ->
-    Module = 'Constraints',
-    {ok,Encoded} = Module:encode(Type, Value),
-    {ok,Value} = Module:decode(Type, Encoded),
+    Encoded = asn1_test_lib:roundtrip_enc('Constraints', Type, Value),
     case Enc of
 	none -> ok;
 	Encoded -> ok
@@ -240,3 +310,12 @@ range_error(Per, Type, Value) when Per =:= per; Per =:= uper ->
     %% on encode.
     {error,_} = 'Constraints':encode(Type, Value),
     ok.
+
+seq_roundtrip(Rules, Seq1, Seq2, Val) ->
+    Enc = roundtrip(Seq1, {Seq1,Val}),
+    case Rules of
+	ber ->
+	    roundtrip(Seq2, {Seq2,Val});
+	_ ->
+	    roundtrip_enc(Seq2, {Seq2,Val}, Enc)
+    end.
diff --git a/lib/asn1/test/testContextSwitchingTypes.erl b/lib/asn1/test/testContextSwitchingTypes.erl
index 40dbe25015..bdd6883dac 100644
--- a/lib/asn1/test/testContextSwitchingTypes.erl
+++ b/lib/asn1/test/testContextSwitchingTypes.erl
@@ -24,31 +24,21 @@
 -include_lib("test_server/include/test_server.hrl").
 
 test(Config) ->
-    ?line ValT = 'ContextSwitchingTypes':'val1-T'(),
-    ?line {ok,Bytes1} =
-	asn1_wrapper:encode('ContextSwitchingTypes','T',ValT),
-    ?line {ok,Result1} = 
-	asn1_wrapper:decode('ContextSwitchingTypes','T',Bytes1),
-    ?line ok = check_EXTERNAL(Result1),
-    ?line {ok,ValT2} = asn1ct:value('ContextSwitchingTypes','T',
-                                    [{i, ?config(case_dir, Config)}]),
-    ?line {ok,Bytes1_2} =
-	asn1_wrapper:encode('ContextSwitchingTypes','T',ValT2),
-    ?line {ok,Result1_2} = 
-	asn1_wrapper:decode('ContextSwitchingTypes','T',Bytes1_2),
-    ?line ok = check_EXTERNAL(Result1_2),
+    ValT = 'ContextSwitchingTypes':'val1-T'(),
+    check_EXTERNAL(enc_dec('T', ValT)),
 
-    ?line ValEP = 'ContextSwitchingTypes':'val1-EP'(),
-    ?line {ok,Bytes2} =
-	asn1_wrapper:encode('ContextSwitchingTypes','EP',ValEP),
-    ?line {ok,_Result2} = 
-	asn1_wrapper:decode('ContextSwitchingTypes','EP',Bytes2),
+    {ok,ValT2} = asn1ct:value('ContextSwitchingTypes', 'T',
+			      [{i,?config(case_dir, Config)}]),
+    check_EXTERNAL(enc_dec('T', ValT2)),
 
-    ?line ValCS = 'ContextSwitchingTypes':'val1-CS'(),
-    ?line {ok,Bytes3} =
-	asn1_wrapper:encode('ContextSwitchingTypes','CS',ValCS),
-    ?line {ok,_Result3} = 
-	asn1_wrapper:decode('ContextSwitchingTypes','CS',Bytes3).
+    ValEP = 'ContextSwitchingTypes':'val1-EP'(),
+    ValEPDec = enc_dec('EP', ValEP),
+    io:format("~p\n~p\n", [ValEP,ValEPDec]),
+
+    ValCS = 'ContextSwitchingTypes':'val1-CS'(),
+    ValCSDec = enc_dec('EP', ValCS),
+    io:format("~p\n~p\n", [ValCS,ValCSDec]),
+    ok.
 
 
 check_EXTERNAL({'EXTERNAL',Identif,DVD,DV})->
@@ -85,3 +75,9 @@ check_object_identifier(Tuple) when is_tuple(Tuple) ->
 	       not is_integer(E)] of
 	[] -> ok
     end.
+
+enc_dec(T, V0) ->
+    M = 'ContextSwitchingTypes',
+    {ok,Enc} = M:encode(T, V0),
+    {ok,V} = M:decode(T, Enc),
+    V.
diff --git a/lib/asn1/test/testDER.erl b/lib/asn1/test/testDER.erl
index 395116bd34..3f74a16797 100644
--- a/lib/asn1/test/testDER.erl
+++ b/lib/asn1/test/testDER.erl
@@ -25,26 +25,24 @@
 
 test() ->
     Val = {'Set',12,{version,214},true},
-    ?line {ok,Bin}=asn1_wrapper:encode('DERSpec','Set',Val),          
-    ?line ok = match_value('Set',Bin),
-    ?line {ok,{'Set',12,{version,214},true}} =
-	asn1_wrapper:decode('DERSpec','Set',Bin),
+    roundtrip_enc('Set', Val, <<49,12,1,1,255,2,2,0,214,161,3,2,1,12>>),
     
-    ValSof = [{version,12},{message,"PrintableString"},{message,"Print"},{version,11}],
-    ?line {ok,BSof} = asn1_wrapper:encode('DERSpec','SetOf',ValSof),
-    ?line ok = match_value('SetOf',BSof),
-    ?line {ok,[{version,11},{version,12},{message,"Print"},{message,"PrintableString"}]} = asn1_wrapper:decode('DERSpec','SetOf',BSof),
+    ValSof = [{version,12},{message,"PrintableString"},
+	      {message,"Print"},{version,11}],
+    ValSofSorted = [{version,11},{version,12},
+		    {message,"Print"},{message,"PrintableString"}],
+    roundtrip_enc('SetOf', ValSof, ValSofSorted,
+		  <<49,30,2,1,11,2,1,12,19,5,80,114,105,110,116,19,15,80,
+		    114,105,110,116,97,98,108,101,83,116,114,105,110,103>>),
 
     ValSO = [{'Seq2',1,true},{'Seq2',120000,false},{'Seq2',3,true}],
-    ?line {ok,SOB} =  asn1_wrapper:encode('DERSpec','SO',ValSO),
-    ?line {ok,ValSO} = asn1_wrapper:decode('DERSpec','SO',SOB).
+    roundtrip('SO', ValSO).
 
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('DERSpec', T, V).
 
-match_value('Set',<<49,12,1,1,255,2,2,0,214,161,3,2,1,12>>) ->
-    ok;
-match_value('Set',[49,12,1,1,255,2,2,0,214,161,3,2,1,12]) ->
-    ok;
-match_value('SetOf',<<49,30,2,1,11,2,1,12,19,5,80,114,105,110,116,19,15,80,114,105,110,116,97,98,108,101,83,116,114,105,110,103>>) -> ok;
-match_value('SetOf',[49,30,2,1,11,2,1,12,19,5,80,114,105,110,116,19,15,80,114,105,110,116,97,98,108,101,83,116,114,105,110,103]) -> ok;
-match_value(_,B) ->
-    {error,B}.
+roundtrip_enc(T, V, Enc) ->
+    Enc = asn1_test_lib:roundtrip_enc('DERSpec', T, V).
+
+roundtrip_enc(T, V, Expected, Enc) ->
+    Enc = asn1_test_lib:roundtrip_enc('DERSpec', T, V, Expected).
diff --git a/lib/asn1/test/testDeepTConstr.erl b/lib/asn1/test/testDeepTConstr.erl
index f17dedc043..880f15e91a 100644
--- a/lib/asn1/test/testDeepTConstr.erl
+++ b/lib/asn1/test/testDeepTConstr.erl
@@ -40,8 +40,7 @@ main(_Erule) ->
 	      {any,"DK"},
 	      {final,"NO"}]}},
 
-    {ok,Bytes1} = 'TConstrChoice':encode('FilterItem', Val1),
-    {error,Reason} = asn1_wrapper:decode('TConstrChoice','FilterItem',Bytes1),
+    Reason = must_fail('TConstrChoice', 'FilterItem', Val1),
     io:format("Reason: ~p~n~n",[Reason]),
     {ok,Bytes2} = 'TConstrChoice':encode('FilterItem', Val2),
     {ok,Res} = 'TConstrChoice':decode('FilterItem', Bytes2),
@@ -70,10 +69,33 @@ main(_Erule) ->
 	       {'Deeper_a',12,
 		{'Deeper_a_s',{2,4},42}},
 	       {'Deeper_b',13,{'Type-object1',14,true}}}),
+
+    roundtrip('TConstr', 'Seq3',
+	      {'Seq3',
+	       {'Seq3_a',42,'TConstr':'id-object1'()},
+	       {'Seq3_b',
+		{'Type-object1',-777,true},
+		12345,
+		{'Seq3_b_bc',12345789,{'Type-object1',-999,true}}}}),
+    roundtrip('TConstr', 'Seq3-Opt',
+	      {'Seq3-Opt',
+	       {'Seq3-Opt_a',42,'TConstr':'id-object1'()},
+	       {'Seq3-Opt_b',
+		{'Type-object1',-777,true},
+		12345,
+		{'Seq3-Opt_b_bc',12345789,{'Type-object1',-999,true}}}}),
     ok.
 
 
 roundtrip(M, T, V) ->
-    {ok,E} = M:encode(T, V),
-    {ok,V} = M:decode(T, E),
-    ok.
+    asn1_test_lib:roundtrip(M, T, V).
+
+%% Either encoding or decoding must fail.
+must_fail(M, T, V) ->
+    case M:encode(T, V) of
+	{ok,E} ->
+	    {error,Reason} = M:decode(T, E),
+	    Reason;
+	{error,Reason} ->
+	    Reason
+    end.
diff --git a/lib/asn1/test/testDef.erl b/lib/asn1/test/testDef.erl
index 48f0015008..b8df3c4f8b 100644
--- a/lib/asn1/test/testDef.erl
+++ b/lib/asn1/test/testDef.erl
@@ -37,81 +37,45 @@
 		bool33 = asn1_DEFAULT}).
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,
-							    bool1 = true,
-							    bool2 = true,
-							    bool3 = true}),
-    ?line {ok,{'Def1',true,true,true,true}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true}),
-    ?line {ok,{'Def1',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = true,
-							    bool2 = false}),
-    ?line {ok,{'Def1',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = asn1_wrapper:encode('Def','Def1',#'Def1'{bool0 = false,
-							    bool3 = false}),
-    ?line {ok,{'Def1',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def1',lists:flatten(Bytes14)),
-    
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = false,
-							    bool11 = false,
-							    bool12 = false,
-							    bool13 = false}),
-    ?line {ok,{'Def2',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = true,
-							    bool13 = false}),
-    ?line {ok,{'Def2',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = true,
-							    bool11 = false,
-							    bool13 = false}),
-    ?line {ok,{'Def2',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = asn1_wrapper:encode('Def','Def2',#'Def2'{bool10 = false,
-							    bool12 = false,
-							    bool13 = false}),
-    ?line {ok,{'Def2',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def2',lists:flatten(Bytes24)),
-    
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool30 = false,
-							    bool31 = false,
-							    bool32 = false,
-							    bool33 = false}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('Def','Def3',#'Def3'{}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool30 = true}),
-    ?line {ok,{'Def3',true,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool32 = false}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes34)),
-    
-    ?line {ok,Bytes35} = asn1_wrapper:encode('Def','Def3',#'Def3'{bool33 = false}),
-    ?line {ok,{'Def3',false,false,false,false}} = 
-	asn1_wrapper:decode('Def','Def3',lists:flatten(Bytes35)),
-    
-    
-    
+    roundtrip('Def1', #'Def1'{bool0=true,bool1=true,bool2=true,bool3=true}),
+    roundtrip('Def1',
+	      #'Def1'{bool0=true},
+	      #'Def1'{bool0=true,bool1=false,bool2=false,bool3=false}),
+    roundtrip('Def1',
+	      #'Def1'{bool0=true,bool2=false},
+	      #'Def1'{bool0=true,bool1=false,bool2=false,bool3=false}),
+    roundtrip('Def1',
+	      #'Def1'{bool0=false,bool3=false},
+	      #'Def1'{bool0=false,bool1=false,bool2=false,bool3=false}),
+
+    roundtrip('Def2', #'Def2'{bool10=false,bool11=false,bool12=false,bool13=false}),
+    roundtrip('Def2',
+	      #'Def2'{bool10=true,bool13=false},
+	      #'Def2'{bool10=true,bool11=false,bool12=false,bool13=false}),
+    roundtrip('Def2',
+	      #'Def2'{bool10=true,bool11=false,bool13=false},
+	      #'Def2'{bool10=true,bool11=false,bool12=false,bool13=false}),
+    roundtrip('Def2',
+	      #'Def2'{bool10=false,bool12=false,bool13=false},
+	      #'Def2'{bool10=false,bool11=false,bool12=false,bool13=false}),
+
+    roundtrip('Def3', #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{},
+	      #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{bool30=true},
+	      #'Def3'{bool30=true,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{bool32=false},
+	      #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Def3',
+	      #'Def3'{bool33=false},
+	      #'Def3'{bool30=false,bool31=false,bool32=false,bool33=false}),
     ok.
+
+roundtrip(Type, Value) ->
+    roundtrip(Type, Value, Value).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('Def', Type, Value, ExpectedValue).
diff --git a/lib/asn1/test/testDoubleEllipses.erl b/lib/asn1/test/testDoubleEllipses.erl
index 1032156b91..4e8972cdfc 100644
--- a/lib/asn1/test/testDoubleEllipses.erl
+++ b/lib/asn1/test/testDoubleEllipses.erl
@@ -34,67 +34,27 @@
 -record('SetAltV2',{a,d,b,e,h,i,c,f,g}).
 
 main(_Rules) ->
-    %% SEQUENCE
-    ?line {ok,Bytes} = 
-	asn1_wrapper:encode('DoubleEllipses','Seq',#'Seq'{a = 10,c = true}),
-    ?line {ok,#'SeqV2'{a=10,b = asn1_NOVALUE, c = true}} = 
-	asn1_wrapper:decode('DoubleEllipses','SeqV2',Bytes),
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('DoubleEllipses','SeqV2',
-			    #'SeqV2'{a=10,b = false, c = true}),
-    ?line {ok,#'Seq'{a = 10, c = true}} =
-	asn1_wrapper:decode('DoubleEllipses','Seq',Bytes2),
+    roundtrip('Seq', #'Seq'{a=10,c=true}),
+    roundtrip('SeqV2', #'SeqV2'{a=10,b=false,c=true}),
+    roundtrip('SeqAlt',
+	      #'SeqAlt'{a=10,d=12,b = <<2#1010:4>>,
+			e=true,c=false,f=14,g=16}),
+    roundtrip('SeqAltV2',
+	      #'SeqAltV2'{a=10,d=12,
+			  b = <<2#1010:4>>,
+			  e=true,h="PS",i=13,c=false,f=14,g=16}),
     
-    ?line {ok,Bytes3} =
-	asn1_wrapper:encode('DoubleEllipses','SeqAlt',
-			    #'SeqAlt'{a = 10, d = 12, 
-				      b = [1,0,1,0], e = true,
-				      c = false, f = 14, g = 16}),
-    ?line {ok,#'SeqAltV2'{a = 10, d = 12, 
-			  b = <<2#1010:4>>, e = true,
-			  h = asn1_NOVALUE, i = asn1_NOVALUE,
-			  c = false, f = 14, g = 16}} =
-	asn1_wrapper:decode('DoubleEllipses','SeqAltV2',Bytes3),
-    ?line {ok,Bytes4} =
-	asn1_wrapper:encode('DoubleEllipses','SeqAltV2',
-			    #'SeqAltV2'{a = 10, d = 12, 
-				      b = [1,0,1,0], e = true,
-				      h = "PS", i = 13,
-				      c = false, f = 14, g = 16}),
-     ?line {ok,#'SeqAlt'{a = 10, d = 12, 
-			 b = <<2#1010:4>>, e = true,
-			 c = false, f = 14, g = 16}} =
-	asn1_wrapper:decode('DoubleEllipses','SeqAlt',Bytes4),
-    
-    %% SET
-    ?line {ok,Bytes5} = 
-	asn1_wrapper:encode('DoubleEllipses','Set',#'Set'{a = 10,c = true}),
-    ?line {ok,#'SetV2'{a=10,b = asn1_NOVALUE, c = true}} = 
-	asn1_wrapper:decode('DoubleEllipses','SetV2',Bytes5),
-    ?line {ok,Bytes6} = 
-	asn1_wrapper:encode('DoubleEllipses','SetV2',
-			    #'SetV2'{a=10,b = false, c = true}),
-    ?line {ok,#'Set'{a = 10, c = true}} =
-	asn1_wrapper:decode('DoubleEllipses','Set',Bytes6),
-    
-    ?line {ok,Bytes7} =
-	asn1_wrapper:encode('DoubleEllipses','SetAlt',
-			    #'SetAlt'{a = 10, d = 12, 
-				      b = [1,0,1,0], e = true,
-				      c = false, f = 14, g = 16}),
-    ?line {ok,#'SetAltV2'{a = 10, d = 12, 
-			  b = <<2#1010:4>>, e = true,
-			  h = asn1_NOVALUE, i = asn1_NOVALUE,
-			  c = false, f = 14, g = 16}} =
-	asn1_wrapper:decode('DoubleEllipses','SetAltV2',Bytes7),
-    ?line {ok,Bytes8} =
-	asn1_wrapper:encode('DoubleEllipses','SetAltV2',
-			    #'SetAltV2'{a = 10, d = 12, 
-				      b = [1,0,1,0], e = true,
-				      h = "PS", i = 13,
-				      c = false, f = 14, g = 16}),
-     ?line {ok,#'SetAlt'{a = 10, d = 12, 
-			 b = <<2#1010:4>>, e = true,
-			 c = false, f = 14, g = 16}} =
-	asn1_wrapper:decode('DoubleEllipses','SetAlt',Bytes8),
+    roundtrip('Set', #'Set'{a=10,c=true}),
+    roundtrip('SetV2', #'SetV2'{a=10,b=false,c=true}),
+    roundtrip('SetAlt',
+	      #'SetAlt'{a=10,d=12,
+			b = <<2#1010:4>>,
+			e=true,c=false,f=14,g=16}),
+    roundtrip('SetAltV2',
+	      #'SetAltV2'{a=10,d=12,
+			  b = <<2#1010:4>>,
+			  e=true,h="PS",i=13,c=false,f=14,g=16}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('DoubleEllipses', T, V).
diff --git a/lib/asn1/test/testEnumExt.erl b/lib/asn1/test/testEnumExt.erl
index cbc13ee6da..878518be11 100644
--- a/lib/asn1/test/testEnumExt.erl
+++ b/lib/asn1/test/testEnumExt.erl
@@ -33,7 +33,7 @@ main(Rule) when Rule =:= per; Rule =:= uper ->
     %% ENUMERATED with extensionmark (value is an extensionvalue)
     Or = roundtrip('Ext1', orange),
     %% unknown extensionvalue
-    {ok,{asn1_enum,0}} = asn1_wrapper:decode('EnumExt','Ext',Or),
+    {ok,{asn1_enum,0}} = 'EnumExt':decode('Ext', Or),
 
     %% ENUMERATED no extensionmark 
     B64 = <<64>>,
@@ -45,12 +45,12 @@ main(ber) ->
     roundtrip('Ext', red),
 
     %% value is an extensionvalue
-    {ok,Bytes1_1} = asn1_wrapper:encode('EnumExt','Ext1',orange),
-    {ok,{asn1_enum,7}} = asn1_wrapper:decode('EnumExt','Ext',lists:flatten(Bytes1_1)),
+    {ok,Bytes1_1} = 'EnumExt':encode('Ext1', orange),
+    {ok,{asn1_enum,7}} = 'EnumExt':decode('Ext', Bytes1_1),
 
     %% ENUMERATED no extensionmark
     roundtrip('Noext', red),
-    ?line {error,{asn1,_}} = (catch asn1_wrapper:encode('EnumExt','Noext',orange)),
+    {error,{asn1,_}} = (catch 'EnumExt':encode('Noext', orange)),
     
     %% ENUMERATED with atom 'com'
     roundtrip('Globalstate', preop),
@@ -59,6 +59,10 @@ main(ber) ->
     common(ber).
 
 common(Erule) ->
+    roundtrip('SubExt1', blue),
+    roundtrip('SubExt1', orange),
+    roundtrip('SubExt1', black),
+
     roundtrip('Seq', {'Seq',blue,42}),
     roundtrip('Seq', {'Seq',red,42}),
     roundtrip('Seq', {'Seq',green,42}),
@@ -77,9 +81,7 @@ common(Erule) ->
     ok.
 
 roundtrip(Type, Value) ->
-    {ok,Encoded} = 'EnumExt':encode(Type, Value),
-    {ok,Value} = 'EnumExt':decode(Type, Encoded),
-    Encoded.
+    asn1_test_lib:roundtrip_enc('EnumExt', Type, Value).
 
 v_roundtrip(Erule, Type, Value) ->
     Encoded = roundtrip(Type, Value),
diff --git a/lib/asn1/test/testFragmented.erl b/lib/asn1/test/testFragmented.erl
new file mode 100644
index 0000000000..35b21f90a9
--- /dev/null
+++ b/lib/asn1/test/testFragmented.erl
@@ -0,0 +1,40 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(testFragmented).
+
+-export([main/1]).
+
+main(_Erule) ->
+    roundtrip('PDU', {'PDU',1,false,[<<"abc">>,<<"def">>]}),
+    B256 = lists:seq(0, 255),
+    K1 = lists:duplicate(4, B256),
+    K8 = iolist_to_binary(lists:duplicate(8, K1)),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8,K8,K8,
+				     K8,K8,K8,K8,K8,K8]}),
+    roundtrip('PDU', {'PDU',1,false,[K8,K8,K8,K8,K8,K8,K8,K8,
+				     K8,K8,K8,K8,K8,K8,K8,K8]}),
+    ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('Fragmented', T, V).
diff --git a/lib/asn1/test/testINSTANCE_OF.erl b/lib/asn1/test/testINSTANCE_OF.erl
index ce411beb92..c855ca3c06 100644
--- a/lib/asn1/test/testINSTANCE_OF.erl
+++ b/lib/asn1/test/testINSTANCE_OF.erl
@@ -18,46 +18,23 @@
 %%
 %%
 -module(testINSTANCE_OF).
-
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-main(Erule) ->
+main(_Erule) ->
+    Int = roundtrip('Int', 3),
 
-    ?line {ok,Integer} = asn1_wrapper:encode('INSTANCEOF','Int',3),
-    Int = list_to_binary(Integer),
     ValotherName = {otherName,{'INSTANCE OF',{2,4},Int}},
+    _ = roundtrip('GeneralName', ValotherName),
+
     VallastName1 = {lastName,{'GeneralName_lastName',{2,4},12}},
+    _ = roundtrip('GeneralName', VallastName1),
+
     VallastName2 = {lastName,{'GeneralName_lastName',{2,3,4},
 			      {'Seq',12,true}}},
-    ?line {ok,BytesoN}=
-	asn1_wrapper:encode('INSTANCEOF','GeneralName',ValotherName),
-    ?line {ok,Res1={otherName,_}} = 
-	asn1_wrapper:decode('INSTANCEOF','GeneralName',BytesoN),
-    ?line ok = test_encdec(Erule,Int,Res1),
-
-    ?line {ok,ByteslN1}=
-	asn1_wrapper:encode('INSTANCEOF','GeneralName',VallastName1),
-    ?line {ok,Res2={lastName,_}} = 
-	asn1_wrapper:decode('INSTANCEOF','GeneralName',ByteslN1),
-    ?line test_encdec(Erule,Res2),
-
-    ?line {ok,ByteslN2}=
-	asn1_wrapper:encode('INSTANCEOF','GeneralName',VallastName2),
-    ?line {ok,Res3={lastName,_}} = 
-	asn1_wrapper:decode('INSTANCEOF','GeneralName',ByteslN2),
-    ?line test_encdec(Erule,Res3).
-
-test_encdec(_Erule,Int,{otherName,{'INSTANCE OF',{2,4},Int}}) ->
-    ok;
-test_encdec(Erule,Int,R={otherName,{'INSTANCE OF',{2,4},_Int2}}) ->
-    {error,{Erule,Int,R}}.
+    _ = roundtrip('GeneralName', VallastName2),
+    ok.
 
-test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,4},12}}) ->
-    ok;
-test_encdec(_Erule,{lastName,{'GeneralName_lastName',{2,3,4},
-			     {'Seq',12,true}}}) ->
-    ok;
-test_encdec(Erule,Res) ->
-    {error,{Erule,Res}}.
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip_enc('INSTANCEOF', T, V).
diff --git a/lib/asn1/test/testInfObj.erl b/lib/asn1/test/testInfObj.erl
index c7b19a0cbb..311595cfda 100644
--- a/lib/asn1/test/testInfObj.erl
+++ b/lib/asn1/test/testInfObj.erl
@@ -49,7 +49,7 @@ main(_Erule) ->
     roundtrip('RANAPextract1', 'InitiatingMessage2', Val3),
 
     roundtrip('InfObj', 'MyPdu', {'MyPdu',42,12,false,"string"}),
-    roundtrip('InfObj', 'MyPdu', {'MyPdu',{'Seq',1023,"hello"},
+    roundtrip('InfObj', 'MyPdu', {'MyPdu',{'Seq',1023,<<"hello">>},
 				  42,true,"longer string"}),
     roundtrip('InfObj', 'MyPdu', {'MyPdu',"75712346",43,true,"string"}),
 
@@ -59,13 +59,71 @@ main(_Erule) ->
 	      {'ConstructedPdu',2,{'CONSTRUCTED-DEFAULT_Type',999,false}}),
     roundtrip('InfObj', 'ConstructedPdu',
 	      {'ConstructedPdu',3,true}),
+    {'ConstructedPdu',4,{_,42,<<13:7>>}} =
+	enc_dec('InfObj', 'ConstructedPdu',
+		{'ConstructedPdu',4,{'',42,<<13:7>>}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',5,{i,-250138}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',5,{b,<<13456:15>>}}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',6,[]}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',6,[10,7,16,1,5,13,12]}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',7,[]}),
+    roundtrip('InfObj', 'ConstructedPdu',
+	      {'ConstructedPdu',7,[64,1,19,17,35]}),
+
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',1,{'CONSTRUCTED-DEFAULT_Type',-2001,true}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',2,{'CONSTRUCTED-DEFAULT_Type',999,false}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',3,true}),
+    {'ConstructedSet',4,{_,42,<<13:7>>}} =
+	enc_dec('InfObj', 'ConstructedSet',
+		{'ConstructedSet',4,{'',42,<<13:7>>}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',5,{i,-250138}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',5,{b,<<13456:15>>}}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',6,[]}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',6,[10,7,16,1,5,13,12]}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',7,[]}),
+    roundtrip('InfObj', 'ConstructedSet',
+	      {'ConstructedSet',7,[64,1,19,17,35]}),
 
     roundtrip('InfObj', 'Seq2',
 	      {'Seq2',42,[true,false,false,true],
-	       [false,true,false]}).
+	       [false,true,false]}),
+
+    roundtrip('InfObj', 'OptionalInSeq', {'OptionalInSeq',3,true}),
+    roundtrip('InfObj', 'OptionalInSeq', {'OptionalInSeq',3,asn1_NOVALUE}),
 
+    roundtrip('InfObj', 'DefaultInSeq', {'DefaultInSeq',3,false}),
+    roundtrip('InfObj', 'DefaultInSeq', {'DefaultInSeq',3,true}),
+    {'DefaultInSeq',3,true} =
+	enc_dec('InfObj', 'DefaultInSeq', {'DefaultInSeq',3,asn1_DEFAULT}),
+
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,42,true,<<"abc">>}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,asn1_NOVALUE,true,<<"abc">>}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,42,asn1_NOVALUE,<<"abc">>}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,42,true,asn1_NOVALUE}),
+    roundtrip('InfObj', 'Multiple-Optionals',
+	      {'Multiple-Optionals',1,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}).
 
 roundtrip(M, T, V) ->
-    {ok,Enc} = M:encode(T, V),
+    asn1_test_lib:roundtrip(M, T, V).
+
+enc_dec(M, T, V0) ->
+    {ok,Enc} = M:encode(T, V0),
     {ok,V} = M:decode(T, Enc),
-    ok.
+    V.
diff --git a/lib/asn1/test/testInfObjectClass.erl b/lib/asn1/test/testInfObjectClass.erl
index 98408502c6..c36c05a2ea 100644
--- a/lib/asn1/test/testInfObjectClass.erl
+++ b/lib/asn1/test/testInfObjectClass.erl
@@ -29,24 +29,22 @@ main(Rule) ->
     %% this test is added for OTP-4591, to test that elements in decoded
     %% value has terms in right order.
     Val = {'Seq',12,13,2},
-    ?line {ok,Bytes}= asn1_wrapper:encode('InfClass','Seq',Val),
-    ?line {ok,Val} = asn1_wrapper:decode('InfClass','Seq',Bytes),
+    roundtrip('Seq', Val),
     
     %% OTP-5783
-    ?line {error,{asn1,{'Type not compatible with table constraint',
-			{component,'ArgumentType'},
-			{value,_},_}}} = asn1_wrapper:encode('InfClass','Seq',
-						      {'Seq',12,13,1}),
+    {error,{asn1,{'Type not compatible with table constraint',
+		  {component,'ArgumentType'},
+		  {value,_},_}}} = 'InfClass':encode('Seq', {'Seq',12,13,1}),
     Bytes2 = case Rule of
 		 ber ->
 		     <<48,9,2,1,12,2,1,11,2,1,1>>;
 		 _ ->
-		 <<1,12,1,11,1,1>>
+		     <<1,12,1,11,1,1>>
 	     end,
-    ?line {error,{asn1,{'Type not compatible with table constraint',
-			{{component,_},
-			 {value,_B},_}}}} = 
-	asn1_wrapper:decode('InfClass','Seq',Bytes2).
+    {error,{asn1,{'Type not compatible with table constraint',
+		  {{component,_},
+		   {value,_B},_}}}} = 'InfClass':decode('Seq', Bytes2),
+    ok.
 
-
-    
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('InfClass', T, V).
diff --git a/lib/asn1/test/testMegaco.erl b/lib/asn1/test/testMegaco.erl
index f4edcebb7e..644042b484 100644
--- a/lib/asn1/test/testMegaco.erl
+++ b/lib/asn1/test/testMegaco.erl
@@ -20,165 +20,28 @@
 
 -module(testMegaco).
 
--export([compile/3,main/2,msg11/0]).
+-export([compile/3,main/2]).
 
 -include_lib("test_server/include/test_server.hrl").
--define(MID, {ip4Address, #'IP4Address'{address = [124, 124, 124, 222],
-                                            portNumber = 55555}}).
--define(A4444, ["11111111"]).
 
--record('MegacoMessage',
-        {
-          authHeader = asn1_NOVALUE,
-          mess
-         }).
-
--record('Message',
-        {
-          version, 
-          mId, 
-          messageBody
-         }). % with extension mark
-
--record('IP4Address',
-        {
-          address,
-          portNumber = asn1_NOVALUE
-         }).
-
--record('TransactionRequest',
-        {
-          transactionId, 
-          actions = []
-         }). % with extension mark
-
--record('ActionRequest',
-        {
-          contextId, 
-          contextRequest = asn1_NOVALUE, 
-          contextAttrAuditReq = asn1_NOVALUE, 
-          commandRequests = []
-         }).
-
--record('CommandRequest',
-        {
-          command, 
-          optional = asn1_NOVALUE, 
-          wildcardReturn = asn1_NOVALUE
-         }). % with extension mark
-
--record('NotifyRequest',
-        {
-          terminationID, 
-          observedEventsDescriptor, 
-          errorDescriptor = asn1_NOVALUE
-         }). % with extension mark
-
--record('ObservedEventsDescriptor',
-        {
-          requestId, 
-          observedEventLst = []
-         }).
-
--record('ObservedEvent',
-        {
-          eventName, 
-          streamID = asn1_NOVALUE, 
-          eventParList = [], 
-          timeNotation = asn1_NOVALUE
-         }). % with extension mark
-
--record('EventParameter',
-        {
-          eventParameterName, 
-          value
-         }).
-
--record('TimeNotation',
-        {
-          date, 
-          time
-         }).
-
--record(megaco_term_id, {contains_wildcards = ["f"], id}).
-
-
-compile(_Config,ber,[optimize]) ->
-    {ok,no_module,no_module};
-compile(_Config,per,[optimize]) ->
-    {ok,no_module,no_module};
-compile(Config,Erule,Options) ->
+compile(Config, Erule, Options) ->
     asn1_test_lib:compile("MEDIA-GATEWAY-CONTROL.asn", Config, [Erule|Options]),
     asn1_test_lib:compile("OLD-MEDIA-GATEWAY-CONTROL.asn", Config, [Erule|Options]),
     {ok,'OLD-MEDIA-GATEWAY-CONTROL','MEDIA-GATEWAY-CONTROL'}.
 
-
 main(no_module,_) -> ok;
 main('OLD-MEDIA-GATEWAY-CONTROL',Config) ->
-%    Msg = msg11(),
     CaseDir = ?config(case_dir, Config),
     {ok,Msg} = asn1ct:value('OLD-MEDIA-GATEWAY-CONTROL','MegacoMessage',
                             [{i, CaseDir}]),
-    ?line {ok,Bytes} = asn1_wrapper:encode('OLD-MEDIA-GATEWAY-CONTROL',
-					   'MegacoMessage',Msg),
-    ?line {ok,Msg} = asn1_wrapper:decode('OLD-MEDIA-GATEWAY-CONTROL',
-					 'MegacoMessage',
-					 Bytes),
+    asn1_test_lib:roundtrip('OLD-MEDIA-GATEWAY-CONTROL', 'MegacoMessage', Msg),
     ok;
-main(Mod='MEDIA-GATEWAY-CONTROL',Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    io:format("DataDir:~p~n",[DataDir]),
-    ?line {ok,FilenameList} = file:list_dir(filename:join([DataDir,
-							   megacomessages])),
-    %% remove any junk files that may be in the megacomessage directory
-    Pred = fun(X) ->
-		   case lists:reverse(X) of
-		       [$l,$a,$v,$.|_R] ->true;
-		       _ -> false
-		   end
-	   end,
-    MegacoMsgFilenameList = lists:filter(Pred,FilenameList),
-
-    Fun = fun(F) ->
-                  M = read_msg(filename:join([DataDir,megacomessages,F])),
-		  {ok,B} = asn1_wrapper:encode(Mod,element(1,M),M),
-		  {ok,M} = asn1_wrapper:decode(Mod,element(1,M),B)
-	  end,
-    ?line lists:foreach(Fun,MegacoMsgFilenameList),
-    ok.
-
-read_msg(File) ->
-    case file:read_file(File) of
-        {ok,Bin} ->
-            binary_to_term(Bin);
-        _ -> 
-	    io:format("couldn't read file ~p~n",[File])
-    end.
-
-
-request(Mid, TransId, ContextId, CmdReq) when is_list(CmdReq) ->
-    Actions = [#'ActionRequest'{contextId = ContextId,
-                                commandRequests = CmdReq}],
-    Req = {transactions,
-           [{transactionRequest,
-             #'TransactionRequest'{transactionId = TransId,
-                                   actions = Actions}}]},
-    #'MegacoMessage'{mess = #'Message'{version = 1,
-                                       mId = Mid,
-                                       messageBody = Req}}.
-
-msg11() ->
-    TimeStamp = #'TimeNotation'{date = "19990729",
-                                time = "22012001"},
-    Parm = #'EventParameter'{eventParameterName = "ds",
-                             value = "916135551212"},
-
-    Event = #'ObservedEvent'{eventName = "ddce",
-                             timeNotation = TimeStamp,
-                             eventParList = [Parm]},
-    Desc = #'ObservedEventsDescriptor'{requestId = 2223,
-                                       observedEventLst = [Event]},
-    NotifyReq = #'NotifyRequest'{terminationID = [#megaco_term_id{id = ?A4444}],
-                                 observedEventsDescriptor = Desc},
-    CmdReq = #'CommandRequest'{command = {notifyReq, NotifyReq}},
-    request(?MID, 10002, 0, [CmdReq]).
+main('MEDIA-GATEWAY-CONTROL'=Mod, Config) ->
+    DataDir = ?config(data_dir, Config),
+    Files = filelib:wildcard(filename:join([DataDir,megacomessages,"*.val"])),
+    lists:foreach(fun(File) ->
+			  {ok,Bin} = file:read_file(File),
+			  V = binary_to_term(Bin),
+			  T = element(1, V),
+			  asn1_test_lib:roundtrip(Mod, T, V)
+		  end, Files).
diff --git a/lib/asn1/test/testMergeCompile.erl b/lib/asn1/test/testMergeCompile.erl
index 8ef7ba3458..b21897cfc2 100644
--- a/lib/asn1/test/testMergeCompile.erl
+++ b/lib/asn1/test/testMergeCompile.erl
@@ -30,42 +30,36 @@
 main(Erule) ->
     %% test of module MS.set.asn that tests OTP-4492: different tagdefault in 
     %% modules and types  with same name in modules
-    ?line MSVal = {'Type4M2',8,true,three,"OCTET STRING"},
-    ?line {ok,MSBytes} = asn1_wrapper:encode('MS','Type4M2',MSVal),
-    ?line {ok,MSVal} = asn1_wrapper:decode('MS','Type4M2',MSBytes),
-    
+    MSVal = {'Type4M2',8,true,three,<<"OCTET STRING">>},
+    asn1_test_lib:roundtrip('MS', 'Type4M2', MSVal),
 
     %% test of RANAP.set.asn1
-    ?line _PIEVal = [{'ProtocolIE-Field',4,ignore,{'Cause',{radioNetwork,{'CauseRadioNetwork','rab-pre-empted'}}}}],
     PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
-    ?line _PEVal = [{'ProtocolExtensionField',[0]}],
-%%    ?line EncVal = asn1rt_per_v1:encode_integer([],100),
-    ?line EncVal = 
+    EncVal0 =
 	case Erule of
 	    per -> 
 		<<1,100>>;
 	    uper ->
 		<<1,100>>;
 	    ber ->
-		[2,1,1]
+		<<2,1,1>>
 	end,
-    ?line PEVal2 = [{dummy,1,ignore,EncVal},{dummy,2,reject,EncVal}],
-    ?line Val2 = 
+    EncVal = {asn1_OPENTYPE,EncVal0},
+    PEVal2 = [{'ProtocolExtensionField',1,ignore,EncVal},
+	      {'ProtocolExtensionField',2,reject,EncVal}],
+    Val2 =
 	#'InitiatingMessage'{procedureCode=1,
 			     criticality=ignore,
 			     value=#'Iu-ReleaseCommand'{protocolIEs=PIEVal2,
 							protocolExtensions=asn1_NOVALUE}},
     
-    ?line {ok,Bytes2} = asn1_wrapper:encode('RANAPSET','InitiatingMessage',Val2),
-    ?line {ok,_Ret2} = asn1_wrapper:decode('RANAPSET','InitiatingMessage',Bytes2),
-    
-    ?line Val3 = 
+    asn1_test_lib:roundtrip('RANAPSET', 'InitiatingMessage', Val2),
+    Val3 =
 	#'InitiatingMessage'{procedureCode=1,
 			     criticality=ignore,
 			     value=#'Iu-ReleaseCommand'{protocolIEs=PIEVal2,
 							protocolExtensions=PEVal2}},
-    ?line {ok,Bytes3} = asn1_wrapper:encode('RANAPSET','InitiatingMessage',Val3),
-    ?line {ok,_Ret3} = asn1_wrapper:decode('RANAPSET','InitiatingMessage',Bytes3).
+    asn1_test_lib:roundtrip('RANAPSET', 'InitiatingMessage', Val3).
 
 
 mvrasn(Erule) ->
@@ -83,78 +77,106 @@ mvrasn(Erule) ->
     ?line ok = test(mvrasn6,'InsertSubscriberDataArg').
 
 test(isd)->
-    EncPdu = [48,128,129,7,145,148,113,50,1,0,241,131,1,0,176,128,5,0,161,128,48,22,2,1,1,144,2,241,33,145,4,0,1,2,3,146,3,36,131,16,148,2,1,42,48,35,2,1,2,144,2,241,33,145,4,255,255,255,255,146,3,37,147,18,147,0,148,13,7,67,79,77,80,65,78,89,4,67,79,77,53,48,28,2,1,3,144,2,241,33,146,3,26,98,31,148,14,9,67,79,77,80,65,78,89,49,50,3,67,79,77,0,0,0,0,152,1,2,0,0],
-    
-    ?line {ok,_} = asn1_wrapper:decode('Mvrasn4',
-				'InsertSubscriberDataArg',
-				EncPdu),
+    EncPdu = <<48,128,129,7,145,148,113,50,1,0,241,131,1,0,176,128,5,0,
+	       161,128,48,22,2,1,1,144,2,241,33,145,4,0,1,2,3,146,3,36,
+	       131,16,148,2,1,42,48,35,2,1,2,144,2,241,33,145,4,255,255,
+	       255,255,146,3,37,147,18,147,0,148,13,7,67,79,77,80,65,78,
+	       89,4,67,79,77,53,48,28,2,1,3,144,2,241,33,146,3,26,98,31,
+	       148,14,9,67,79,77,80,65,78,89,49,50,3,67,79,77,0,0,0,0,
+	       152,1,2,0,0>>,
+    {ok,_} = 'Mvrasn4':decode('InsertSubscriberDataArg', EncPdu),
     ok;
 
 % 
 % Problems with indefinite length encoding !!!
 % 
 test(isd2)->
-    EncPdu = [48, 128, 128, 8, 98, 2, 50, 1, 0, 0, 0, 241, 176, 128, 161, 128, 48, 128, 2, 1, 1, 144, 2, 241, 33, 145, 4, 255, 23, 12, 1, 146, 3, 9, 17, 1, 147, 0, 148, 13, 7, 67, 79, 77, 80, 65, 78, 89, 4, 67, 79, 77, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    
-    ?line {ok,_DecPdu} = asn1_wrapper:decode('Mvrasn4',
-				'InsertSubscriberDataArg',
-				EncPdu),
-
+    EncPdu = <<48,128,128,8,98,2,50,1,0,0,0,241,176,128,161,128,48,128,2,1,1,144,
+	       2,241,33,145,4,255,23,12,1,146,3,9,17,1,147,0,148,13,7,67,79,77,80,
+	       65,78,89,4,67,79,77,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
+    {ok,_DecPdu} = 'Mvrasn4':decode('InsertSubscriberDataArg', EncPdu),
     ok;
 
 % 
 % Is doing fine, although there is indefinite encoding used... !!!
 % 
 test(dsd)->
-    EncPdu = [48, 128, 128, 8, 98, 2, 50, 1, 0, 0, 0, 241, 170, 2, 5, 0, 0, 0, 0, 0],
-    
-    ?line {ok,_DecPdu} = asn1_wrapper:decode('Mvrasn4',
-				'DeleteSubscriberDataArg',
-				EncPdu),
-
+    EncPdu = <<48,128,128,8,98,2,50,1,0,0,0,241,170,2,5,0,0,0,0,0>>,
+    {ok,_DecPdu} = 'Mvrasn4':decode('DeleteSubscriberDataArg', EncPdu),
     ok;
 
 %
 % Is doing fine !!!
 % 
 test(ul_res)->
-    EncPdu = [48, 9, 4, 7, 145, 148, 113, 66, 16, 17, 241],
-    
-    ?line {ok,_DecPdu} = asn1_wrapper:decode('Mvrasn4',
-				'UpdateGprsLocationRes',
-				EncPdu),
-
+    EncPdu = <<48,9,4,7,145,148,113,66,16,17,241>>,
+    {ok,_DecPdu} = 'Mvrasn4':decode('UpdateGprsLocationRes', EncPdu),
     ok;
 
 test(seqofseq) ->
-    {ok,_V} = asn1_wrapper:decode('Mvrasn4',
-				 'SentParameters',
-				 [48,129,190,161,128,4,16,176,197,182,68,41,243,188,205,123,13,9,145,206,200,144,102,4,4,176,197,182,68,4,8,41,243,188,205,123,13,9,145,0,0,161,128,4,16,39,0,3,117,35,189,130,21,42,104,49,194,212,24,151,234,4,4,39,0,3,117,4,8,35,189,130,21,42,104,49,194,0,0,161,128,4,16,62,207,166,59,71,29,37,97,120,25,132,80,144,251,161,123,4,4,62,207,166,59,4,8,71,29,37,97,120,25,132,80,0,0,161,128,4,16,95,183,173,151,17,76,148,146,248,102,127,215,102,224,39,60,4,4,95,183,173,151,4,8,17,76,148,146,248,102,127,215,0,0,161,128,4,16,41,198,247,157,117,190,203,170,91,146,88,91,223,220,188,16,4,4,41,198,247,157,4,8,117,190,203,170,91,146,88,91,0,0]),
+    EncPdu = <<48,129,190,161,128,4,16,176,197,182,68,41,243,188,205,123,13,
+	       9,145,206,200,144,102,4,4,176,197,182,68,4,8,41,243,188,205,
+	       123,13,9,145,0,0,161,128,4,16,39,0,3,117,35,189,130,21,42,104,
+	       49,194,212,24,151,234,4,4,39,0,3,117,4,8,35,189,130,21,42,104,
+	       49,194,0,0,161,128,4,16,62,207,166,59,71,29,37,97,120,25,132,
+	       80,144,251,161,123,4,4,62,207,166,59,4,8,71,29,37,97,120,25,
+	       132,80,0,0,161,128,4,16,95,183,173,151,17,76,148,146,248,102,
+	       127,215,102,224,39,60,4,4,95,183,173,151,4,8,17,76,148,146,248,
+	       102,127,215,0,0,161,128,4,16,41,198,247,157,117,190,203,170,91,
+	       146,88,91,223,220,188,16,4,4,41,198,247,157,4,8,117,190,203,170,91,146,88,91,0,0>>,
+    {ok,_V} = 'Mvrasn4':decode('SentParameters', EncPdu),
     ok;
 
 test('InsertSubscriberDataArg') ->
-    {ok,_V} =
-	asn1_wrapper:decode('Mvrasn4','InsertSubscriberDataArg',
-			    [16#30,16#80,16#81,16#07,16#91,16#94,
-			     16#71,16#92,16#00,16#35,16#80,16#83,
-			     16#01,16#00,16#A6,16#06,16#04,16#01,
-			     16#21,16#04,16#01,16#22,16#B0,16#80,
-			     16#05,16#00,16#A1,16#80,16#30,16#1A,
-			     16#02,16#01,16#01,16#90,16#02,16#F1,
-			     16#21,16#92,16#03,16#0D,16#92,16#1F,
-			     16#94,16#0C,16#03,16#53,16#49,16#4D,
-			     16#03,16#47,16#53,16#4E,16#03,16#4C,
-			     16#4B,16#50,16#00,16#00,16#00,16#00,
-			     16#98,16#01,16#00,16#00,16#00]),
+    EncPdu = <<16#30,16#80,16#81,16#07,16#91,16#94,
+	       16#71,16#92,16#00,16#35,16#80,16#83,
+	       16#01,16#00,16#A6,16#06,16#04,16#01,
+	       16#21,16#04,16#01,16#22,16#B0,16#80,
+	       16#05,16#00,16#A1,16#80,16#30,16#1A,
+	       16#02,16#01,16#01,16#90,16#02,16#F1,
+	       16#21,16#92,16#03,16#0D,16#92,16#1F,
+	       16#94,16#0C,16#03,16#53,16#49,16#4D,
+	       16#03,16#47,16#53,16#4E,16#03,16#4C,
+	       16#4B,16#50,16#00,16#00,16#00,16#00,
+	       16#98,16#01,16#00,16#00,16#00>>,
+    {ok,_V} = 'Mvrasn4':decode('InsertSubscriberDataArg', EncPdu),
     ok.
 
 test(mvrasn6,'InsertSubscriberDataArg') ->
-    Val = {'InsertSubscriberDataArg',"IMSI","Address","C",serviceGranted,["abc","cde"],["tele","serv","ice"],asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,{'NAEA-PreferredCI',"NCC",asn1_NOVALUE},{'GPRSSubscriptionData','NULL',[{'PDP-Context',49,"PT","PDP-Address","QoS",'NULL',"APN",asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}],asn1_NOVALUE},'NULL',onlyMSC,{'LSAInformation','NULL',accessOutsideLSAsAllowed,[{'LSAData',"LSA","L",'NULL',asn1_NOVALUE},{'LSAData',"LSA","L",'NULL',asn1_NOVALUE}],asn1_NOVALUE},'NULL',{'LCSInformation',["Addr","ess","string"],[{'LCS-PrivacyClass',"S","ExtSS",notifyLocationAllowed,[{'ExternalClient',{'LCSClientExternalID',"Addr",asn1_NOVALUE},asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}],[broadcastService,anonymousLocation,targetMSsubscribedService],asn1_NOVALUE}],asn1_NOVALUE},100,"age",{'MC-SS-Info',"S","ExtSS",5,4,asn1_NOVALUE},"C",{'SGSN-CAMEL-SubscriptionInfo',{'GPRS-CSI',[{'GPRS-CamelTDPData',attach,13,"Addr",continueTransaction,asn1_NOVALUE}],11,asn1_NOVALUE,'NULL','NULL'},{'SMS-CSI',[{'SMS-CAMEL-TDP-DataList','sms-CollectedInfo',13,"Addr",continueTransaction,asn1_NOVALUE}],11,asn1_NOVALUE,'NULL','NULL'},asn1_NOVALUE},"ON"},
-
-    {ok,Bytes}=
-	asn1_wrapper:encode('Mvrasn6','InsertSubscriberDataArg',Val),
-    
-    {ok,_Res} =
-	asn1_wrapper:decode('Mvrasn6','InsertSubscriberDataArg',Bytes),
-    
+    Val = {'InsertSubscriberDataArg',<<"IMSI">>,<<"Address">>,<<"C">>,
+	   serviceGranted,[<<"abc">>,<<"cde">>],
+	   [<<"tele">>,<<"serv">>,<<"ice">>],
+	   asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+	   asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,
+	   {'NAEA-PreferredCI',<<"NCC">>,asn1_NOVALUE},
+	   {'GPRSSubscriptionData','NULL',
+	    [{'PDP-Context',49,<<"PT">>,<<"PDP-Address">>,<<"QoS">>,
+	      'NULL',<<"APN">>,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}],
+	    asn1_NOVALUE},'NULL',onlyMSC,
+	   {'LSAInformation','NULL',accessOutsideLSAsAllowed,
+	    [{'LSAData',<<"LSA">>,<<"L">>,'NULL',asn1_NOVALUE},
+	     {'LSAData',<<"LSA">>,<<"L">>,'NULL',asn1_NOVALUE}],
+	    asn1_NOVALUE},'NULL',
+	   {'LCSInformation',[<<"Addr">>,<<"ess">>,<<"string">>],
+	    [{'LCS-PrivacyClass',<<"S">>,<<"ExtSS">>,notifyLocationAllowed,
+	      [{'ExternalClient',
+		{'LCSClientExternalID',<<"Addr">>,asn1_NOVALUE},
+		asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}],
+	      [broadcastService,anonymousLocation,targetMSsubscribedService],
+	      asn1_NOVALUE}],asn1_NOVALUE},
+	   100,<<"age">>,
+	   {'MC-SS-Info',<<"S">>,<<"ExtSS">>,5,4,asn1_NOVALUE},
+	   <<"C">>,
+	   {'SGSN-CAMEL-SubscriptionInfo',
+	    {'GPRS-CSI',
+	     [{'GPRS-CamelTDPData',attach,13,<<"Addr">>,
+	       continueTransaction,asn1_NOVALUE}],
+	     11,asn1_NOVALUE,'NULL','NULL'},
+	    {'SMS-CSI',
+	     [{'SMS-CAMEL-TDP-Data','sms-CollectedInfo',
+	       13,<<"Addr">>,continueTransaction,asn1_NOVALUE}],
+	     11,asn1_NOVALUE,'NULL','NULL'},
+	    asn1_NOVALUE},
+	   <<"ON">>},
+    asn1_test_lib:roundtrip('Mvrasn6', 'InsertSubscriberDataArg', Val),
     ok.
diff --git a/lib/asn1/test/testNBAPsystem.erl b/lib/asn1/test/testNBAPsystem.erl
index 0f4459f5b2..57cb483374 100644
--- a/lib/asn1/test/testNBAPsystem.erl
+++ b/lib/asn1/test/testNBAPsystem.erl
@@ -19,7 +19,7 @@
 %%
 -module(testNBAPsystem).
 
--export([compile/2,test/2,cell_setup_req_msg/0]).
+-export([compile/2,test/2]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -96,23 +96,16 @@ test(_Erule,Config) ->
 
 ticket_5812(Config) ->
     ?line Msg = v_5812(),
-    ?line {ok,B2} = asn1_wrapper:encode('NBAP-PDU-Discriptions',
-				  'NBAP-PDU',
-				  Msg),
+    {ok,B2} = 'NBAP-PDU-Discriptions':encode('NBAP-PDU', Msg),
     V = <<0,28,74,0,3,48,0,0,1,0,123,64,41,0,0,0,126,64,35,95,208,2,89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,145,0,1,205,0,0,0,0,2,98,64,1,128>>,
     ?line ok = compare(V,B2),
-    ?line {ok,Msg2} = asn1_wrapper:decode('NBAP-PDU-Discriptions',
-				  'NBAP-PDU',B2),
+    {ok,Msg2} = 'NBAP-PDU-Discriptions':decode('NBAP-PDU', B2),
     ?line ok = check_record_names(Msg2,Config).
 
 enc_audit_req_msg() ->
     Msg = {initiatingMessage, audit_req_msg()},
-    ?line {ok,B}=asn1_wrapper:encode('NBAP-PDU-Discriptions',
-				     'NBAP-PDU',
-				     Msg),
-    ?line {ok,_Msg}=asn1_wrapper:decode('NBAP-PDU-Discriptions',
-				     'NBAP-PDU',
-				     B),
+    {ok,B} = 'NBAP-PDU-Discriptions':encode('NBAP-PDU', Msg),
+    {ok,_Msg} = 'NBAP-PDU-Discriptions':decode('NBAP-PDU', B),
     ?line {initiatingMessage,
 	   #'InitiatingMessage'{value=#'AuditRequest'{protocolIEs=[{_,114,ignore,_}],
 						      protocolExtensions = asn1_NOVALUE}}} = _Msg,
@@ -121,12 +114,8 @@ enc_audit_req_msg() ->
     
 cell_setup_req_msg_test() ->
     Msg = {initiatingMessage, cell_setup_req_msg()},
-    ?line {ok,B}=asn1_wrapper:encode('NBAP-PDU-Discriptions',
-				     'NBAP-PDU',
-				     Msg),
-    ?line {ok,_Msg}=asn1_wrapper:decode('NBAP-PDU-Discriptions',
-				     'NBAP-PDU',
-				     B),
+    {ok,B} = 'NBAP-PDU-Discriptions':encode('NBAP-PDU', Msg),
+    {ok,_Msg} = 'NBAP-PDU-Discriptions':decode('NBAP-PDU', B),
     io:format("Msg: ~P~n~n_Msg: ~P~n",[Msg,15,_Msg,15]),
     ok.
     
diff --git a/lib/asn1/test/testOpenTypeImplicitTag.erl b/lib/asn1/test/testOpenTypeImplicitTag.erl
index a37d8004ef..0fbf70d037 100644
--- a/lib/asn1/test/testOpenTypeImplicitTag.erl
+++ b/lib/asn1/test/testOpenTypeImplicitTag.erl
@@ -24,18 +24,9 @@
 -include_lib("test_server/include/test_server.hrl").
 
 main(_Rules) ->
-
-    ?line {ok,Bytes1} = 
-	asn1_wrapper:encode('OpenTypeImplicitTag','Seq',
-			    {'Seq',[1,1,255],[1,1,255],12,[1,1,255]}),
-    ?line {ok,{'Seq',_,_,12,_}} = 
-	asn1_wrapper:decode('OpenTypeImplicitTag','Seq',
-			    lists:flatten(Bytes1)),
-
-    ?line {ok,Bytes2} = 
-	asn1_wrapper:encode('OpenTypeImplicitTag','Seq',
-			    {'Seq',[1,1,255],asn1_NOVALUE,12,[1,1,255]}),
-    ?line {ok,{'Seq',_,asn1_NOVALUE,12,_}} = 
-	asn1_wrapper:decode('OpenTypeImplicitTag','Seq',
-			    lists:flatten(Bytes2)),
+    roundtrip('Seq', {'Seq',<<1,1,255>>,<<1,1,255>>,12,<<1,1,255>>}),
+    roundtrip('Seq', {'Seq',<<1,1,255>>,asn1_NOVALUE,12,<<1,1,255>>}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('OpenTypeImplicitTag', T, V).
diff --git a/lib/asn1/test/testOpt.erl b/lib/asn1/test/testOpt.erl
index a1ad8099b5..a6dcccad15 100644
--- a/lib/asn1/test/testOpt.erl
+++ b/lib/asn1/test/testOpt.erl
@@ -18,8 +18,6 @@
 %%
 %%
 -module(testOpt).
-
--export([compile/2]).
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -39,92 +37,29 @@
 		bool32 = asn1_NOVALUE, 
 		bool33 = asn1_NOVALUE}).
 
-
-compile(Config,Rules) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line ok = asn1ct:compile(DataDir ++ "Opt",[Rules,{outdir,OutDir}]).
-
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('Opt','Opt1',#'Opt1'{bool0 = true,
-							 bool1 = true,
-							 bool2 = true,
-							 bool3 = true}),    
-    ?line {ok,{'Opt1',true,true,true,true}} = 
-	asn1_wrapper:decode('Opt','Opt1',lists:flatten(Bytes11)),
+    roundtrip('Opt1', #'Opt1'{bool0=true,bool1=true,bool2=true,bool3=true}),
+    roundtrip('Opt1', #'Opt1'{bool0=true,bool1=asn1_NOVALUE,bool2=asn1_NOVALUE,
+        bool3=asn1_NOVALUE}),
+    roundtrip('Opt1', #'Opt1'{bool0=true,bool1=asn1_NOVALUE,bool2=false,bool3=asn1_NOVALUE}),
+    roundtrip('Opt1', #'Opt1'{bool0=false,bool1=asn1_NOVALUE,bool2=asn1_NOVALUE,bool3=false}),
 
-    ?line {ok,Bytes12} = asn1_wrapper:encode('Opt','Opt1',#'Opt1'{bool0 = true}),
-    ?line {ok,{'Opt1',true,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('Opt','Opt1',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('Opt','Opt1',#'Opt1'{bool0 = true,
-							 bool2 = false}),
-    ?line {ok,{'Opt1',true,asn1_NOVALUE,false,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('Opt','Opt1',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = asn1_wrapper:encode('Opt','Opt1',#'Opt1'{bool0 = false,
-							  bool3 = false}),
-    ?line {ok,{'Opt1',false,asn1_NOVALUE,asn1_NOVALUE,false}} = 
-	asn1_wrapper:decode('Opt','Opt1',lists:flatten(Bytes14)),
-    
-    
-    
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('Opt','Opt2',#'Opt2'{bool10 = false,
-							  bool11 = false,
-							  bool12 = false,
-							  bool13 = false}),
-    ?line {ok,{'Opt2',false,false,false,false}} = 
-	asn1_wrapper:decode('Opt','Opt2',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('Opt','Opt2',#'Opt2'{bool10 = true,
-							  bool13 = false}),
-    ?line {ok,{'Opt2',true,asn1_NOVALUE,asn1_NOVALUE,false}} = 
-	asn1_wrapper:decode('Opt','Opt2',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = asn1_wrapper:encode('Opt','Opt2',#'Opt2'{bool10 = true,
-							  bool11 = false,
-							  bool13 = false}),
-    ?line {ok,{'Opt2',true,false,asn1_NOVALUE,false}} = 
-	asn1_wrapper:decode('Opt','Opt2',lists:flatten(Bytes23)),
-    
-    ?line {ok,Bytes24} = asn1_wrapper:encode('Opt','Opt2',#'Opt2'{bool10 = false,
-							  bool12 = false,
-							  bool13 = false}),
-    ?line {ok,{'Opt2',false,asn1_NOVALUE,false,false}} = 
-	asn1_wrapper:decode('Opt','Opt2',lists:flatten(Bytes24)),
-    
-    
-    
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('Opt','Opt3',#'Opt3'{bool30 = false,
-							  bool31 = false,
-							  bool32 = false,
-							  bool33 = false}),
-    ?line {ok,{'Opt3',false,false,false,false}} = 
-	asn1_wrapper:decode('Opt','Opt3',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('Opt','Opt3',#'Opt3'{}),
-    ?line {ok,{'Opt3',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('Opt','Opt3',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('Opt','Opt3',#'Opt3'{bool30 = true}),
-    ?line {ok,{'Opt3',true,asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('Opt','Opt3',lists:flatten(Bytes33)),
-    
-    ?line {ok,Bytes34} = asn1_wrapper:encode('Opt','Opt3',#'Opt3'{bool32 = false}),
-    ?line {ok,{'Opt3',asn1_NOVALUE,asn1_NOVALUE,false,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('Opt','Opt3',lists:flatten(Bytes34)),
-    
-    ?line {ok,Bytes35} = asn1_wrapper:encode('Opt','Opt3',#'Opt3'{bool33 = false}),
-    ?line {ok,{'Opt3',asn1_NOVALUE,asn1_NOVALUE,asn1_NOVALUE,false}} = 
-	asn1_wrapper:decode('Opt','Opt3',lists:flatten(Bytes35)),
-    
-    
-    
+    roundtrip('Opt2', #'Opt2'{bool10=false,bool11=false,bool12=false,bool13=false}),
+    roundtrip('Opt2', #'Opt2'{bool10=true,bool11=asn1_NOVALUE,bool12=asn1_NOVALUE,
+        bool13=false}),
+    roundtrip('Opt2', #'Opt2'{bool10=true,bool11=false,bool12=asn1_NOVALUE,bool13=false}),
+    roundtrip('Opt2', #'Opt2'{bool10=false,bool11=asn1_NOVALUE,bool12=false,bool13=false}),
+
+    roundtrip('Opt3', #'Opt3'{bool30=false,bool31=false,bool32=false,bool33=false}),
+    roundtrip('Opt3', #'Opt3'{bool30=asn1_NOVALUE,bool31=asn1_NOVALUE,bool32=asn1_NOVALUE,
+        bool33=asn1_NOVALUE}),
+    roundtrip('Opt3', #'Opt3'{bool30=true,bool31=asn1_NOVALUE,bool32=asn1_NOVALUE,
+        bool33=asn1_NOVALUE}),
+    roundtrip('Opt3', #'Opt3'{bool30=asn1_NOVALUE,bool31=asn1_NOVALUE,bool32=false,
+        bool33=asn1_NOVALUE}),
+    roundtrip('Opt3', #'Opt3'{bool30=asn1_NOVALUE,bool31=asn1_NOVALUE,bool32=asn1_NOVALUE,
+        bool33=false}),
     ok.
+
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('Opt', Type, Value).
diff --git a/lib/asn1/test/testParamBasic.erl b/lib/asn1/test/testParamBasic.erl
index a10468d592..3db89ca174 100644
--- a/lib/asn1/test/testParamBasic.erl
+++ b/lib/asn1/test/testParamBasic.erl
@@ -29,53 +29,27 @@
 -record('T22',{number, string}).
 
 main(Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('ParamBasic','T11',
-			    #'T11'{number = 11,
-				   string = "hello"}),
-    ?line {ok,{'T11',11,"hello"}} =
-	asn1_wrapper:decode('ParamBasic','T11',Bytes11),
-	    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('ParamBasic','T12',
-			    #'T12'{number = 11,
-				   string = <<2#10101:5>>}),
-    {ok,{'T12',11,<<2#10101:5>>}} =
-	asn1_wrapper:decode('ParamBasic','T12',Bytes12),
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('ParamBasic','T21',
-			    #'T21'{number = 11,
-				   string = "hello"}),
-    ?line {ok,{'T21',11,"hello"}} =
-	asn1_wrapper:decode('ParamBasic','T21',Bytes13),
-	    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('ParamBasic','T22',
-			    #'T22'{number = 11,
-				   string = <<2#10101:5>>}),
-    {ok,{'T22',11,<<2#10101:5>>}} =
-	asn1_wrapper:decode('ParamBasic','T22',Bytes14),
-
+    roundtrip('T11', #'T11'{number=11,string="hello"}),
+    roundtrip('T12', #'T12'{number=11,string = <<21:5>>}),
+    roundtrip('T21', #'T21'{number=11,string="hello"}),
+    roundtrip('T22', #'T22'{number=11,string = <<21:5>>}),
     case Rules of
 	der ->
-
-	    ?line {ok,[48,3,128,1,11]} = 
-		asn1_wrapper:encode('ParamBasic','T11',
-				    #'T11'{number = 11,
-					   string = "hej"}),
-	    ?line {ok,{'T11',11,"hej"}} =
-		asn1_wrapper:decode('ParamBasic','T11',[48,3,128,1,11]),
-	    
-	    ?line {ok,[48,3,128,1,11]} = 
-		asn1_wrapper:encode('ParamBasic','T12',
-				    #'T12'{number = 11,
-					   string = [1,0,1,0]}),
-	    
-	    ?line {ok,{'T12',11,[1,0,1,0]}} =
-		asn1_wrapper:decode('ParamBasic','T12',[48,3,128,1,11]);
+	    <<48,3,128,1,11>> =
+		roundtrip_enc('T11', #'T11'{number=11,string="hej"}),
+	    <<48,3,128,1,11>> =
+		roundtrip_enc('T12',
+			      #'T12'{number=11,string=[1,0,1,0]},
+			      #'T12'{number=11,string = <<10:4>>});
 	_ -> ok
     end,
-	    
     ok.
+
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('ParamBasic', Type, Value).
+
+roundtrip_enc(Type, Value) ->
+    asn1_test_lib:roundtrip_enc('ParamBasic', Type, Value).
+
+roundtrip_enc(Type, Value, Expected) ->
+    asn1_test_lib:roundtrip_enc('ParamBasic', Type, Value, Expected).
diff --git a/lib/asn1/test/testParameterizedInfObj.erl b/lib/asn1/test/testParameterizedInfObj.erl
index 1dfa52f401..2fe900792d 100644
--- a/lib/asn1/test/testParameterizedInfObj.erl
+++ b/lib/asn1/test/testParameterizedInfObj.erl
@@ -20,7 +20,7 @@
 
 -module(testParameterizedInfObj).
 
--export([main/2,ranap/1]).
+-export([main/2,param/1,ranap/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -36,58 +36,64 @@ main(Config, Erule) ->
     param2(Config, Erule).
 
 param(Erule) ->
-    PERVal = #'AllocationOrRetentionPriority'
-      {priorityLevel = true,
-       iE_Extensions = 
-       [#'ProtocolExtensionField'{id=14,
-				  criticality=reject,
-				  extensionValue=open_type(Erule,[0])},
-	#'ProtocolExtensionField'{id=2,
-				  criticality=ignore,
-				  extensionValue=open_type(Erule,[1])}]},
-    BERVal = #'AllocationOrRetentionPriority'
-      {priorityLevel = true,
-       iE_Extensions = 
-       [#'ProtocolExtensionField'{id=14,
-				  criticality=reject,
-				  extensionValue=[2,1,0]},
-	#'ProtocolExtensionField'{id=2,
-				  criticality=ignore,
-				  extensionValue=[2,1,1]}]},
-    ?line {ok,Bytes1} = 
-	case asn1_wrapper:erule(Erule) of
-	    per ->
-		asn1_wrapper:encode('Param','AllocationOrRetentionPriority',
-				    PERVal);
-	    _ ->
-		asn1_wrapper:encode('Param','AllocationOrRetentionPriority',
-				    BERVal)
-	end,
-
-    ?line {ok,{'AllocationOrRetentionPriority',true,[_R1,_R2]}} =
-	asn1_wrapper:decode('Param','AllocationOrRetentionPriority',Bytes1),
+    Exts0 = case Erule of
+		ber ->
+		    %% As implemented, the open type must contain
+		    %% valid BER-encoded data.
+		    [{14,<<2,1,0>>},{2,<<2,1,0>>}];
+		_ ->
+		    %% The PER decoder will not look inside the open type.
+		    [{14,<<0>>},{2,<<"anything goes">>}]
+	    end,
+    case 'Param':legacy_erlang_types() of
+	false ->
+	    Exts = [#'ProtocolExtensionField'{id=Id,
+					      criticality=reject,
+					      extensionValue={asn1_OPENTYPE,
+							      Eval}} ||
+		       {Id,Eval} <- Exts0],
+	    aor_roundtrip(Exts);
+	true ->
+	    Exts = [#'ProtocolExtensionField'{id=Id,
+					      criticality=reject,
+					      extensionValue=Eval} ||
+		       {Id,Eval} <- Exts0],
+	    aor_roundtrip(Exts)
+    end,
 
     %% test code for OTP-4242, ValueFromObject
 
-    case asn1_wrapper:erule(Erule) of
+    case Erule of
 	ber ->
-	    ?line {ok,_Val3} = asn1_wrapper:decode('Param','OS1',[4,2,1,2]),
-	    ?line {error,_Reason1} = 
-		asn1_wrapper:decode('Param','OS1',[4,4,1,2,3,4]),
-	    ?line {error,_Reason2} = 
-		asn1_wrapper:decode('Param','OS2',[4,4,1,2,3,4]),
-	    ?line {ok,_Val4} = asn1_wrapper:decode('Param','OS1',[4,2,1,2]);
-	per ->
-	    ?line {ok,Bytes3} =
-		asn1_wrapper:encode('Param','OS1',[1,2]),
-	    ?line {ok,[1,2]} =
-		asn1_wrapper:decode('Param','OS1',Bytes3),
-	    ?line {error,_Reason3} =
-		asn1_wrapper:encode('Param','OS1',[1,2,3,4])
+	    {ok,_Val3} = 'Param':decode('OS1', [4,2,1,2]),
+	    {error,_Reason1} = 'Param':decode('OS1',[4,4,1,2,3,4]),
+	    {error,_Reason2} = 'Param':decode('OS2',[4,4,1,2,3,4]),
+	    {ok,_Val4} = 'Param':decode('OS1',[4,2,1,2]);
+	_ ->					%per/uper
+	    case 'Param':legacy_erlang_types() of
+		false ->
+		    roundtrip('OS1', <<1,2>>),
+		    {error,_Reason3} = 'Param':encode('OS1', <<1,2,3,4>>);
+		true ->
+		    ok
+	    end
     end,
 
+    roundtrip('Scl', {'Scl',42,{a,9738654}}),
+    roundtrip('Scl', {'Scl',42,{b,false}}),
+    roundtrip('Scl', {'Scl',42,{b,true}}),
+
     ok.
 
+aor_roundtrip(Exts) ->
+    Val = #'AllocationOrRetentionPriority'{priorityLevel = true,
+					   iE_Extensions = Exts},
+    roundtrip('AllocationOrRetentionPriority', Val).
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('Param', T, V).
+
+
 ranap(_Erule) ->    
     PIEVal2 = [{'ProtocolIE-Field',4,ignore,{radioNetwork,'rab-pre-empted'}}],
     ?line Val2 = 
@@ -96,24 +102,19 @@ ranap(_Erule) ->
 			     value=#'Iu-ReleaseCommand'{protocolIEs=PIEVal2,
 							protocolExtensions=asn1_NOVALUE}},
     
-    ?line {ok,Bytes2} = asn1_wrapper:encode('RANAP','InitiatingMessage',Val2),
-    ?line {ok,_Ret2} = asn1_wrapper:decode('RANAP','InitiatingMessage',Bytes2),
+    {ok,Bytes2} = 'RANAP':encode('InitiatingMessage', Val2),
+    {ok,_Ret2} = 'RANAP':decode('InitiatingMessage', Bytes2),
     
     ok.
 
-open_type(uper,Val) when is_list(Val) ->
-    list_to_binary(Val);
-open_type(_,Val) ->
-    Val.
-
 param2(Config, Erule) ->
     roundtrip2('HandoverRequired',
 	       {'HandoverRequired',
-		[{'ProtocolIE-Field',1,"ABC"},
+		[{'ProtocolIE-Field',1,<<"ABC">>},
 		 {'ProtocolIE-Field',2,577799}]}),
     Enc = roundtrip2('HandoverRequired',
 		     {'HandoverRequired',
-		      [{'ProtocolIE-Field',1,"ABC"},
+		      [{'ProtocolIE-Field',1,<<"ABC">>},
 		       {'ProtocolIE-Field',2,-42},
 		       {'ProtocolIE-Field',100,533},
 		       {'ProtocolIE-Field',101,true}]}),
@@ -134,22 +135,22 @@ param2(Config, Erule) ->
 			[{i,DataDir},{outdir,CaseDir},Erule]),
 
     %% Decompile extended data.
-    {ok,{'HandoverRequired',[{'ProtocolIE-Field',1,"ABC"},
+    {ok,{'HandoverRequired',[{'ProtocolIE-Field',1,<<"ABC">>},
 			     {'ProtocolIE-Field',2,-42},
-			     {'ProtocolIE-Field',100,Open100},
-			     {'ProtocolIE-Field',101,Open101}]}} =
-	asn1_wrapper:decode('Param2', 'HandoverRequired', Enc),
+			     {'ProtocolIE-Field',100,
+			      {asn1_OPENTYPE,Open100}},
+			     {'ProtocolIE-Field',101,
+			      {asn1_OPENTYPE,Open101}}]}} =
+	'Param2':decode('HandoverRequired', Enc),
     true = is_binary(Open100),
     true = is_binary(Open101),
 
     %% Test single root.
     roundtrip2('SingleRoot',
-	       {'SingleRoot',[{'ProtocolIE-Field',1,"ABC"},
+	       {'SingleRoot',[{'ProtocolIE-Field',1,<<"ABC">>},
 			      {'ProtocolIE-Field',2,9999}]}),
     ok.
 
 
 roundtrip2(T, V) ->
-    {ok,Enc} = asn1_wrapper:encode('Param2', T, V),
-    {ok,V} = asn1_wrapper:decode('Param2', T, Enc),
-    Enc.
+    asn1_test_lib:roundtrip_enc('Param2', T, V).
diff --git a/lib/asn1/test/testPrim.erl b/lib/asn1/test/testPrim.erl
index a6e68a9fe0..e07379e634 100644
--- a/lib/asn1/test/testPrim.erl
+++ b/lib/asn1/test/testPrim.erl
@@ -36,8 +36,7 @@ bool(Rules) ->
     case Rules of
 	ber ->
 	    [begin
-		 {error,{asn1,{encode_boolean,517}}} =
-		     (catch 'Prim':encode(T, 517))
+		 {error,{asn1,{encode_boolean,517}}} = enc_error(T, 517)
 	     end || T <- Types],
 	    ok;
 	_ ->
@@ -90,12 +89,12 @@ enum(Rules) ->
 
     roundtrip('Enum', monday),
     roundtrip('Enum', thursday),
-    {error,{asn1,{_,4}}} = (catch 'Prim':encode('Enum', 4)),
+    {error,{asn1,{_,4}}} = enc_error('Enum', 4),
 
     case Rules of
 	Per when Per =:= per; Per =:= uper ->
-	    {ok,<<0>>} = 'Prim':encode('SingleEnumVal', true),
-	    {ok,<<0>>} = 'Prim':encode('SingleEnumValExt', true);
+	    <<0>> = roundtrip('SingleEnumVal', true),
+	    <<0>> = roundtrip('SingleEnumValExt', true);
 	ber ->
 	    ok
     end,
@@ -128,15 +127,36 @@ null(_Rules) ->
     %%==========================================================
     %% Null ::= NULL
     %%==========================================================
-
-    {ok,Bytes1} = asn1_wrapper:encode('Prim','Null',monday),
-    {ok,'NULL'} = asn1_wrapper:decode('Prim','Null',lists:flatten(Bytes1)),
+    roundtrip('Null', monday, 'NULL'),
     ok.
 
 roundtrip(T, V) ->
-    {ok,E} = 'Prim':encode(T, V),
-    {ok,V} = 'Prim':decode(T, E),
-    E.
+    roundtrip(T, V, V).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    case get(no_ok_wrapper) of
+	false ->
+	    asn1_test_lib:roundtrip_enc('Prim', Type, Value, ExpectedValue);
+	true ->
+	    M = 'Prim',
+	    Enc = M:encode(Type, Value),
+	    ExpectedValue = M:decode(Type, Enc),
+	    Enc
+    end.
+
+enc_error(T, V) ->
+    case get(no_ok_wrapper) of
+	false ->
+	    'Prim':encode(T, V);
+	true ->
+	    try 'Prim':encode(T, V) of
+		_ ->
+		    ?t:fail()
+	    catch
+		_:Reason ->
+		    Reason
+	    end
+    end.
 
 real(_Rules) ->
     %%==========================================================
@@ -144,67 +164,45 @@ real(_Rules) ->
     %%==========================================================
     
     %% Base 2
-    ?line {ok,Bytes1} = asn1_wrapper:encode('Real','AngleInRadians',{1,2,1}),
-    ?line {ok,{1,2,1}} = asn1_wrapper:decode('Real','AngleInRadians',Bytes1),
-
-    ?line {ok,Bytes2} = asn1_wrapper:encode('Real','AngleInRadians',{129,2,1}),
-    ?line {ok,{129,2,1}} = asn1_wrapper:decode('Real','AngleInRadians',Bytes2),
-
-    ?line {ok,Bytes3} = asn1_wrapper:encode('Real','AngleInRadians',{128,2,1}),
-    ?line {ok,{1,2,8}} = asn1_wrapper:decode('Real','AngleInRadians',Bytes3),
-
-    ?line {ok,Bytes4} = asn1_wrapper:encode('Real','AngleInRadians',{128,2,-7}),
-    ?line {ok,{1,2,0}} = asn1_wrapper:decode('Real','AngleInRadians',Bytes4),
-
-    ?line {ok,Bytes5} = asn1_wrapper:encode('Real','AngleInRadians',{16#f1f1f1,2,128}),
-    ?line {ok,{16#f1f1f1,2,128}} = asn1_wrapper:decode('Real','AngleInRadians',Bytes5),
+    real_roundtrip('AngleInRadians', {1,2,1}),
+    real_roundtrip('AngleInRadians', {129,2,1}),
+    real_roundtrip('AngleInRadians', {128,2,1}, {1,2,8}),
+    real_roundtrip('AngleInRadians', {128,2,-7}, {1,2,0}),
+    real_roundtrip('AngleInRadians', {16#f1f1f1,2,128}),
 
     %% Base 10, tuple format
-    ?line {ok,Bytes6} = asn1_wrapper:encode('Real','AngleInRadians',{1,10,1}),
-    ?line {ok,"1.E1"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes6),
-    
-    ?line {ok,Bytes7} = asn1_wrapper:encode('Real','AngleInRadians',{100,10,1}),
-    ?line {ok,"1.E3"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes7),
-
-    ?line {ok,Bytes8} = asn1_wrapper:encode('Real','AngleInRadians',{-100,10,1}),
-    ?line {ok,"-1.E3"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes8),
-
-    ?line {ok,Bytes9} = asn1_wrapper:encode('Real','AngleInRadians',{00002,10,1}),
-    ?line {ok,"2.E1"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes9),
-
-    ?line {ok,Bytes10} = asn1_wrapper:encode('Real','AngleInRadians',{123000,10,0}),
-    ?line {ok,"123.E3"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes10),
-
-    ?line {ok,Bytes11} = asn1_wrapper:encode('Real','AngleInRadians',{123456789,10,123456789}),
-    ?line {ok,"123456789.E123456789"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes11),
-
-    ?line {ok,Bytes12} = asn1_wrapper:encode('Real','AngleInRadians',{-12345,10,-12345}),
-    ?line {ok,"-12345.E-12345"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes12),
+    real_roundtrip('AngleInRadians', {1,10,1}, "1.E1"),
+    real_roundtrip('AngleInRadians', {100,10,1}, "1.E3"),
+    real_roundtrip('AngleInRadians', {-100,10,1}, "-1.E3"),
+    real_roundtrip('AngleInRadians', {2,10,1}, "2.E1"),
+    real_roundtrip('AngleInRadians', {123000,10,0}, "123.E3"),
+    real_roundtrip('AngleInRadians', {123456789,10,123456789},
+		   "123456789.E123456789" ),
+    real_roundtrip('AngleInRadians', {-12345,10,-12345}, "-12345.E-12345"),
 
     %% Base 10, string format NR3
-    
-    ?line {ok,Bytes13} = asn1_wrapper:encode('Real','AngleInRadians',"123.123E123"),
-    ?line {ok,"123123.E120"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes13),
-
-    ?line {ok,Bytes14} = asn1_wrapper:encode('Real','AngleInRadians',"0.0E0"),
-    ?line {ok,"0.E+0"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes14),
 
-    ?line {ok,Bytes15} = asn1_wrapper:encode('Real','AngleInRadians',"0.0123"),
-    ?line {ok,"123.E-4"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes15),
+    real_roundtrip('AngleInRadians', "123.123E123", "123123.E120"),
+    real_roundtrip('AngleInRadians', "0.0E0", "0.E+0"),
+    real_roundtrip('AngleInRadians', "0.0123", "123.E-4"),
+    real_roundtrip('AngleInRadians', "0", "0.E+0"),
+    real_roundtrip('AngleInRadians', "-123.45", "-12345.E-2"),
+    real_roundtrip('AngleInRadians', "123456789E123456789",
+		   "123456789.E123456789"),
+    real_roundtrip('AngleInRadians', "01.000E1", "1.E1"),
+    real_roundtrip('AngleInRadians', "120.0001", "1200001.E-4"),
 
-    ?line {ok,Bytes16} = asn1_wrapper:encode('Real','AngleInRadians',"0"),
-    ?line {ok,"0.E+0"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes16),
-    
-    ?line {ok,Bytes17} = asn1_wrapper:encode('Real','AngleInRadians',"-123.45"),
-    ?line {ok,"-12345.E-2"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes17),
-
-    ?line {ok,Bytes18} = 
-	asn1_wrapper:encode('Real','AngleInRadians',"123456789E123456789"),
-    ?line {ok,"123456789.E123456789"} = 
-	asn1_wrapper:decode('Real','AngleInRadians',Bytes18),
+    ok.
 
-    ?line {ok,Bytes19} = asn1_wrapper:encode('Real','AngleInRadians',"01.000E1"),
-    ?line {ok,"1.E1"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes19),
+real_roundtrip(T, V) ->
+    real_roundtrip(T, V, V).
 
-    ?line {ok,Bytes20} = asn1_wrapper:encode('Real','AngleInRadians',"120.0001"),
-    ?line {ok,"1200001.E-4"} = asn1_wrapper:decode('Real','AngleInRadians',Bytes20).
+real_roundtrip(Type, Value, ExpectedValue) ->
+    case get(no_ok_wrapper) of
+	false ->
+	    asn1_test_lib:roundtrip('Real', Type, Value, ExpectedValue);
+	true ->
+	    M = 'Real',
+	    ExpectedValue = M:decode(Type, M:encode(Type, Value)),
+	    ok
+    end.
diff --git a/lib/asn1/test/testPrimExternal.erl b/lib/asn1/test/testPrimExternal.erl
index 65c3c3a31a..a03760976d 100644
--- a/lib/asn1/test/testPrimExternal.erl
+++ b/lib/asn1/test/testPrimExternal.erl
@@ -24,84 +24,27 @@
 -include_lib("test_server/include/test_server.hrl").
 
 external(_Rules) ->
-    
-
-    ?line {ok,Bytes10} = asn1_wrapper:encode('PrimExternal','NT',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','NT',lists:flatten(Bytes10)),
-    
-    ?line {ok,Bytes11} = asn1_wrapper:encode('PrimExternal','Imp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','Imp',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('PrimExternal','Exp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','Exp',lists:flatten(Bytes12)),
-    
-
-    ?line {ok,Bytes13} = asn1_wrapper:encode('PrimExternal','NTNT',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','NTNT',lists:flatten(Bytes13)),
-    
-    ?line {ok,Bytes14} = asn1_wrapper:encode('PrimExternal','NTImp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','NTImp',lists:flatten(Bytes14)),
-    
-    ?line {ok,Bytes15} = asn1_wrapper:encode('PrimExternal','NTExp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','NTExp',lists:flatten(Bytes15)),
-    
-
-    ?line {ok,Bytes16} = asn1_wrapper:encode('PrimExternal','ImpNT',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','ImpNT',lists:flatten(Bytes16)),
-    
-    ?line {ok,Bytes17} = asn1_wrapper:encode('PrimExternal','ImpImp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','ImpImp',lists:flatten(Bytes17)),
-    
-    ?line {ok,Bytes18} = asn1_wrapper:encode('PrimExternal','ImpExp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','ImpExp',lists:flatten(Bytes18)),
-    
-
-    ?line {ok,Bytes19} = asn1_wrapper:encode('PrimExternal','ExpNT',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','ExpNT',lists:flatten(Bytes19)),
-    
-    ?line {ok,Bytes20} = asn1_wrapper:encode('PrimExternal','ExpImp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','ExpImp',lists:flatten(Bytes20)),
-    
-    ?line {ok,Bytes21} = asn1_wrapper:encode('PrimExternal','ExpExp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','ExpExp',lists:flatten(Bytes21)),
-    
-
-
-
-    
-    ?line {ok,Bytes31} = asn1_wrapper:encode('PrimExternal','XNTNT',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XNTNT',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('PrimExternal','XNTImp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XNTImp',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = asn1_wrapper:encode('PrimExternal','XNTExp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XNTExp',lists:flatten(Bytes33)),
-    
-
-    ?line {ok,Bytes34} = asn1_wrapper:encode('PrimExternal','XImpNT',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XImpNT',lists:flatten(Bytes34)),
-    
-    ?line {ok,Bytes35} = asn1_wrapper:encode('PrimExternal','XImpImp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XImpImp',lists:flatten(Bytes35)),
-    
-    ?line {ok,Bytes36} = asn1_wrapper:encode('PrimExternal','XImpExp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XImpExp',lists:flatten(Bytes36)),
-    
-
-    ?line {ok,Bytes37} = asn1_wrapper:encode('PrimExternal','XExpNT',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XExpNT',lists:flatten(Bytes37)),
-    
-    ?line {ok,Bytes38} = asn1_wrapper:encode('PrimExternal','XExpImp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XExpImp',lists:flatten(Bytes38)),
-    
-    ?line {ok,Bytes39} = asn1_wrapper:encode('PrimExternal','XExpExp',"kalle"),
-    ?line {ok,"kalle"} = asn1_wrapper:decode('PrimExternal','XExpExp',lists:flatten(Bytes39)),
-    
-
-
-
-    
-
-
-ok.
+    Types = ['NT',
+	     'Imp',
+	     'Exp',
+	     'NTNT',
+	     'NTImp',
+	     'NTExp',
+	     'ImpNT',
+	     'ImpImp',
+	     'ImpExp',
+	     'ExpNT',
+	     'ExpImp',
+	     'ExpExp',
+	     'XNTNT',
+	     'XNTImp',
+	     'XNTExp',
+	     'XImpNT',
+	     'XImpImp',
+	     'XImpExp',
+	     'XExpNT',
+	     'XExpImp',
+	     'XExpExp'],
+    _ = [asn1_test_lib:roundtrip('PrimExternal', T, <<"kalle">>) ||
+	    T <- Types],
+    ok.
diff --git a/lib/asn1/test/testPrimStrings.erl b/lib/asn1/test/testPrimStrings.erl
index e2322c92a9..155d6f6ff5 100644
--- a/lib/asn1/test/testPrimStrings.erl
+++ b/lib/asn1/test/testPrimStrings.erl
@@ -18,8 +18,10 @@
 %%
 %%
 -module(testPrimStrings).
+-compile([{nowarn_deprecated_function,{asn1rt,utf8_list_to_binary,1}},
+	  {nowarn_deprecated_function,{asn1rt,utf8_binary_to_list,1}}]).
 
--export([bit_string/1]).
+-export([bit_string/2]).
 -export([octet_string/1]).
 -export([numeric_string/1]).
 -export([other_strings/1]).
@@ -28,42 +30,91 @@
 -export([bmp_string/1]).
 -export([times/1]).
 -export([utf8_string/1]).
+-export([fragmented/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-bit_string(Rules) ->
+fragmented(Rules) ->
+    Lens = fragmented_lengths(),
+    case 'PrimStrings':legacy_erlang_types() of
+	false -> fragmented_octet_string(Rules, Lens);
+	true -> ok
+    end,
+    fragmented_strings(Lens).
+
+fragmented_strings(Lens) ->
+    Types = ['Ns','Ps','Ps11','Vis','IA5'],
+    [fragmented_strings(Len, Types) || Len <- Lens],
+    ok.
+
+fragmented_strings(Len, Types) ->
+    Str = make_ns_value(Len),
+    [roundtrip(Type, Str) || Type <- Types],
+    ok.
+
+make_ns_value(0) -> [];
+make_ns_value(N) -> [($0 - 1) + random:uniform(10)|make_ns_value(N-1)].
+
+fragmented_lengths() ->
+    K16 = 1 bsl 14,
+    K32 = K16 + K16,
+    K48 = K32 + K16,
+    K64 = K48 + K16,
+    [0,1,14,15,16,17,127,128,
+     K16-1,K16,K16+1,K16+(1 bsl 7)-1,K16+(1 bsl 7),K16+(1 bsl 7)+1,
+     K32-1,K32,K32+1,K32+(1 bsl 7)-1,K32+(1 bsl 7),K32+(1 bsl 7)+1,
+     K48-1,K48,K48+1,K48+(1 bsl 7)-1,K48+(1 bsl 7),K48+(1 bsl 7)+1,
+     K64-1,K64,K64+1,K64+(1 bsl 7)-1,K64+(1 bsl 7),K64+(1 bsl 7)+1,
+     K64+K16-1,K64+K16,K64+K16+1].
+
+bit_string(Rules, Opts) ->
     
     %%==========================================================
     %% Bs1 ::= BIT STRING
     %%==========================================================
 
-    bs_roundtrip('Bs1', 0, <<>>),
-    bs_roundtrip('Bs1', 4, <<1:3>>),
-    bs_roundtrip('Bs1', 15, <<15:4>>),
-    bs_roundtrip('Bs1', 255, <<255:8>>),
+    bs_roundtrip('Bs1', <<>>),
+    bs_roundtrip('Bs1', <<1:3>>),
+    bs_roundtrip('Bs1', <<15:4>>),
+    bs_roundtrip('Bs1', <<2#010010:6>>),
+    bs_roundtrip('Bs1', <<2#11111111:8>>),
+    bs_roundtrip('Bs1', <<2#100000000:9>>),
+    bs_roundtrip('Bs1', <<2#100000001:9>>),
+    bs_roundtrip('Bs1', <<2#001111011:9>>),
+    bs_roundtrip('Bs1', <<2#0100101111100010011:19>>),
 
-    bs_roundtrip('Bs1', 256, [0,0,0,0,0,0,0,0,1]),
-    bs_roundtrip('Bs1', 257, [1,0,0,0,0,0,0,0,1]),
-    bs_roundtrip('Bs1', 444, [0,0,1,1,1,1,0,1,1]),
-    
-    {ok,Enc1} = 'PrimStrings':encode('Bs1', 12345678901234567890),
-    {ok,_} = 'PrimStrings':decode('Bs1', Enc1),
+    case 'PrimStrings':legacy_erlang_types() of
+	false ->
+	    ok;
+	true ->
+	    {ok,Enc1} = 'PrimStrings':encode('Bs1', 12345678901234567890),
+	    {ok,_} = 'PrimStrings':decode('Bs1', Enc1)
+    end,
 
-    bs_roundtrip('Bs1', [1,1,1,1,1,1,1,1]),
-    bs_roundtrip('Bs1', [0,1,0,0,1,0]),
-    bs_roundtrip('Bs1', [1,0,0,0,0,0,0,0,0]),
-    bs_roundtrip('Bs1', [0,1,0,0,1,0,1,1,1,1,1,0,0,0,1,0,0,1,1]),
-    
-    case Rules of
-	ber ->
+
+    case {Rules,Opts} of
+	{ber,[legacy_erlang_types]} ->
 	    bs_decode('Bs1', <<35,8,3,2,0,73,3,2,4,32>>,
 		      [0,1,0,0,1,0,0,1,0,0,1,0]),
 	    bs_decode('Bs1', <<35,9,3,2,0,234,3,3,7,156,0>>,
 		      [1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]),
 	    bs_decode('Bs1', <<35,128,3,2,0,234,3,3,7,156,0,0,0>>,
 		      [1,1,1,0,1,0,1,0,1,0,0,1,1,1,0,0,0]);
-	_ ->
-	    ok
+	{ber,[]} ->
+	    %% XXX
+	    ok;
+	{_,_} ->
+	    %% DER, PER, UPER
+	    consistent_def_enc('BsDef1',
+			       [2#111101,
+				[1,0,1,1,1,1],
+				{2,<<2#101111:6,0:2>>},
+				<<2#101111:6>>]),
+	    consistent_def_enc('BsDef2',
+			       [[1,1,0,1, 1,1,1,0, 1,0,1,0, 1,1,0,1,
+				 1,0,1,1, 1,1,1,0, 1,1,1,0, 1,1,1,1],
+				{0,<<16#DEADBEEF:4/unit:8>>},
+				<<16#DEADBEEF:4/unit:8>>])
     end,
 
     
@@ -72,30 +123,39 @@ bit_string(Rules) ->
     %%==========================================================
     
     roundtrip('Bs2', [mo,tu,fr]),
-    roundtrip('Bs2', [0,1,1,0,0,1,0], [mo,tu,fr]),
+    bs_roundtrip('Bs2', <<2#0110010:7>>, [mo,tu,fr]),
+    bs_roundtrip('Bs2', <<2#0110011:7>>, [mo,tu,fr,sa]),
 
     %%==========================================================
     %% Bs3 ::= BIT STRING {su(0), mo(1), tu(2), we(3), th(4), fr(5), sa(6) } (SIZE (1..7))
     %%==========================================================
     
     roundtrip('Bs3', [mo,tu,fr]),
-    bs_roundtrip('Bs3', [0,1,1,0,0,1,0], [mo,tu,fr]),
+    bs_roundtrip('Bs3', <<2#0110010:7>>, [mo,tu,fr]),
+    bs_roundtrip('Bs3', <<2#0110010:7>>, [mo,tu,fr]),
+    bs_roundtrip('Bs2', <<2#0110011:7>>, [mo,tu,fr,sa]),
+    bs_roundtrip('Bs3', <<2#011001:6>>, [mo,tu,fr]),
+    bs_roundtrip('Bs3', <<2#11:2>>, [su,mo]),
 
     %%==========================================================
     %% Bs7 ::= BIT STRING (SIZE (24))
     %%==========================================================
 
-    bs_roundtrip('Bs7', 53245,
-		 [1,0,1,1,1,1,1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0]),
-    bs_roundtrip('Bs7', [1,0,1,0],
-		 [1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]),
+    bs_roundtrip('Bs7', <<23563:24>>),
+    case 'PrimStrings':legacy_erlang_types() of
+	false ->
+%%	    {error,_} = 'PrimStrings':encode('Bs7', <<2#1010:4>>);
+	    ok;
+	true ->
+	    ok
+    end,
     
     %%==========================================================
     %% BsPri ::= [PRIVATE 61] BIT STRING
     %%==========================================================
     
-    bs_roundtrip('BsPri', 45, [1,0,1,1,0,1]),
-    bs_roundtrip('BsPri', 211, [1,1,0,0,1,0,1,1]),
+    bs_roundtrip('BsPri', <<2#101101:6>>),
+    bs_roundtrip('BsPri', <<2#11001011:8>>),
     
     case Rules of
 	ber ->
@@ -116,8 +176,8 @@ bit_string(Rules) ->
     %% BsExpPri ::= [PRIVATE 61] EXPLICIT BIT STRING
     %%==========================================================
     
-    bs_roundtrip('BsExpPri', 45, [1,0,1,1,0,1]),
-    bs_roundtrip('BsExpPri', 211, [1,1,0,0,1,0,1,1]),
+    bs_roundtrip('BsExpPri', <<2#101101:6>>),
+    bs_roundtrip('BsExpPri', <<2#11001011:8>>),
     
     case Rules of
 	ber ->
@@ -138,14 +198,14 @@ bit_string(Rules) ->
     %%    veteran(2), collegeGraduate(3)}, test case for OTP-5710
     %%==========================================================
     
-    {ok,Bytes54} = 'BitStr':encode('PersonalStatus', []),
+    {ok,Bytes54} = 'BitStr':encode('PersonalStatus', <<>>),
     {ok,[]} = 'BitStr':decode('PersonalStatus', Bytes54),
     
     %%==========================================================
     %% BS5932 ::= BIT STRING (SIZE (5..MAX))
     %% test case for OTP-5932
     %%==========================================================
-    bs_roundtrip('BSMAX', [1,0,1,0,1]),
+    bs_roundtrip('BSMAX', <<2#10101:5>>),
     case Rules of
 	ber ->
 	    {error,_} = 'PrimStrings':encode('BSMAX', [1,0,1]);
@@ -159,45 +219,68 @@ bit_string(Rules) ->
     %% BS1024 ::= BIT STRING (SIZE (1024))
     %% test case for OTP-7602
     %%==========================================================
-    BSmaker =
-	fun(_F,S,S,_,Acc) -> 
-		Acc;
-	   (F,Ix,S,{A,B},Acc) -> 
-		F(F,Ix+1,S,{B,A},[A|Acc]) 
-	end,
-    
-    BSList255 = BSmaker(BSmaker,0,255,{1,0},[]),
-    bs_roundtrip('BS255', BSList255),
-    BSList256 = BSmaker(BSmaker,0,256,{1,0},[]),
-    bs_roundtrip('BS256', BSList256),
-    BSList1024 = BSmaker(BSmaker,0,1024,{1,0},[]),
-    bs_roundtrip('BS1024', BSList1024),
 
-    bs_roundtrip('TransportLayerAddress', [0,1,1,0]),
+    bs_roundtrip('BS255', random_bits(255)),
+    bs_roundtrip('BS256', random_bits(256)),
+    bs_roundtrip('BS1024', random_bits(1024)),
+
+    bs_roundtrip('TransportLayerAddress', <<2#0110:4>>),
 
     case Rules of
 	ber -> ok;
 	_ -> per_bs_strings()
     end.
 
+random_bits(N) ->
+    Seed = integer_to_list(erlang:phash2(erlang:now())),
+    random_bits(<<>>, N, Seed).
+
+random_bits(Bin, N, Seed) ->
+    RandomBits = erlang:md5(Seed),
+    Bits = bit_size(RandomBits),
+    if
+	Bits < N ->
+	    random_bits(<<Bin/bitstring,RandomBits/bitstring>>,
+			N-Bits, RandomBits);
+	true ->
+	    <<LastBits:N/bitstring,_/bitstring>> = RandomBits,
+	    <<Bin/bitstring,LastBits/bitstring>>
+    end.
+
+consistent_def_enc(Type, Vs0) ->
+    M = 'PrimStrings',
+    {ok,Enc} = M:encode(Type, {Type,asn1_DEFAULT}),
+    {ok,Val} = M:decode(Type, Enc),
+
+    %% Ensure that the value has the correct format.
+    case {M:bit_string_format(),Val} of
+	{bitstring,{_,Bs}} when is_bitstring(Bs) -> ok;
+	{compact,{_,{Unused,Bin}}} when is_integer(Unused),
+					is_binary(Bin) -> ok;
+	{legacy,{_,Bs}} when is_list(Bs) -> ok
+    end,
+
+    %% If this is not the legacy format, only bitstrings are
+    %% allowed.
+    Vs = case M:legacy_erlang_types() of
+	     false -> [V || V <- Vs0, is_bitstring(V)];
+	     true -> Vs0
+	 end,
+
+    %% All values should be recognized and encoded as the
+    %% the default value (i.e. not encoded at all).
+    _ = [{ok,Enc} = M:encode(Type, {Type,V}) || V <- Vs],
+    ok.
+
 %% The PER encoding rules requires that a BIT STRING with
 %% named positions should never have any trailing zeroes
 %% (except to reach the minimum number of bits as given by
 %% a SIZE constraint).
 
 per_bs_strings() ->
-    bs_roundtrip('Bs3', [0,0,1,0,0,0,0], [tu]),
     bs_roundtrip('Bs3', <<2#0010000:7>>, [tu]),
-    bs_roundtrip('Bs3', {1,<<2#00100000:8>>}, [tu]),
-
-    bs_roundtrip('Bs4', [0,1,1,0,0,1,0], [mo,tu,fr]),
     bs_roundtrip('Bs4', <<2#0110010:7>>, [mo,tu,fr]),
-    bs_roundtrip('Bs4', {1,<<2#01100100:8>>}, [mo,tu,fr]),
-
-    bs_roundtrip('Bs4', [0,1,1,0,0,0,0], [mo,tu]),
     bs_roundtrip('Bs4', <<2#011:3,0:32>>, [mo,tu]),
-    bs_roundtrip('Bs4', {5,<<2#011:3,0:32,0:5>>}, [mo,tu]),
-
     [per_trailing_zeroes(B) || B <- lists:seq(0, 255)],
     ok.
 
@@ -213,10 +296,6 @@ per_trailing_zeroes(Byte) ->
 		     {bit,LastBitPos} -> LastBitPos+1
 		 end,
 
-    %% List of zeroes and ones.
-    named_roundtrip(L, Pos, ExpectedSz),
-    named_roundtrip(L++[0,0,0,0,0], Pos, ExpectedSz),
-
     %% Bitstrings.
     Bs = << <<B:1>> || B <- L >>,
     Sz = bit_size(Bs),
@@ -224,14 +303,22 @@ per_trailing_zeroes(Byte) ->
     Bin = <<Bs:Sz/bits,0:16,0:7>>,
     named_roundtrip(Bin, Pos, ExpectedSz),
 
-    %% Compact bitstring.
-    named_roundtrip({7,Bin}, Pos, ExpectedSz),
+    case 'PrimStrings':legacy_erlang_types() of
+	false ->
+	    ok;
+	true ->
+	    %% List of zeroes and ones.
+	    named_roundtrip(L, Pos, ExpectedSz),
+	    named_roundtrip(L++[0,0,0,0,0], Pos, ExpectedSz),
 
-    %% Integer bitstring (obsolete).
-    IntBs = intlist_to_integer(L, 0, 0),
-    named_roundtrip(IntBs, Pos, ExpectedSz),
+	    %% Compact bitstring.
+	    named_roundtrip({7,Bin}, Pos, ExpectedSz),
 
-    ok.
+	    %% Integer bitstring (obsolete).
+	    IntBs = intlist_to_integer(L, 0, 0),
+	    named_roundtrip(IntBs, Pos, ExpectedSz),
+	    ok
+    end.
 
 make_bit_list(0) -> [];
 make_bit_list(B) -> [B band 1|make_bit_list(B bsr 1)].
@@ -265,76 +352,65 @@ octet_string(Rules) ->
     %% Os ::= OCTET STRING
     %%==========================================================
 
+    Legacy = 'PrimStrings':legacy_erlang_types(),
     case Rules of
-	ber ->
-	    {ok,"Jones"} =
+	ber when not Legacy ->
+	    {ok,<<"Jones">>} =
 		'PrimStrings':decode('Os', <<4,5,16#4A,16#6F,16#6E,16#65,16#73>>),
-	    {ok,"Jones"} =
+	    {ok,<<"Jones">>} =
 		'PrimStrings':decode('Os', <<36,9,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73>>),
-	    {ok,"Jones"} =
+	    {ok,<<"Jones">>} =
 		'PrimStrings':decode('Os', <<36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0>>),
 	    ok;
 	_ ->
 	    ok
     end,
 
-    roundtrip('Os', [47,23,99,255,1]),
-    roundtrip('OsCon', [47,23,99,255,1]),
-    roundtrip('OsPri', [47,23,99,255,1]),
-    roundtrip('OsApp', [47,23,99,255,1]),
+    os_roundtrip('Os', <<47,23,99,255,1>>),
+    os_roundtrip('OsCon', <<47,23,99,255,1>>),
+    os_roundtrip('OsPri', <<47,23,99,255,1>>),
+    os_roundtrip('OsApp', <<47,23,99,255,1>>),
 
-    roundtrip('OsExpCon', [47,23,99,255,1]),
-    roundtrip('OsExpPri', [47,23,99,255,1]),
-    roundtrip('OsExpApp', [47,23,99,255,1]),
+    os_roundtrip('OsExpCon', <<47,23,99,255,1>>),
+    os_roundtrip('OsExpPri', <<47,23,99,255,1>>),
+    os_roundtrip('OsExpApp', <<47,23,99,255,1>>),
 
-    roundtrip('Os', []),
-    roundtrip('OsApp', []),
-    roundtrip('OsExpApp',[]),
+    os_roundtrip('Os', <<>>),
+    os_roundtrip('OsApp', <<>>),
+    os_roundtrip('OsExpApp', <<>>),
     
-    OsR = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890",
+    OsR = <<"12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890">>,
 
-    roundtrip('Os', OsR),
-    roundtrip('OsCon', OsR),
-    roundtrip('OsExpApp', OsR),
+    os_roundtrip('Os', OsR),
+    os_roundtrip('OsCon', OsR),
+    os_roundtrip('OsExpApp', OsR),
 
 
     case Rules of
-	ber ->
-	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,7,4,5,16#4A,16#6F,16#6E,16#65,16#73>>),
-	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,11,36,9,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73>>),
-	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,13,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0>>),
-	    {ok,"Jones"} = 'PrimStrings':decode('OsExpApp', <<127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0>>),
-	    {ok,"JonesJones"} = 'PrimStrings':decode('OsExpApp', <<127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0>>),
+	ber when not Legacy ->
+	    {ok,<<"Jones">>} = 'PrimStrings':decode('OsExpApp', <<127,62,7,4,5,16#4A,16#6F,16#6E,16#65,16#73>>),
+	    {ok,<<"Jones">>} = 'PrimStrings':decode('OsExpApp', <<127,62,11,36,9,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73>>),
+	    {ok,<<"Jones">>} = 'PrimStrings':decode('OsExpApp', <<127,62,13,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0>>),
+	    {ok,<<"Jones">>} = 'PrimStrings':decode('OsExpApp', <<127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0>>),
+	    {ok,<<"JonesJones">>} = 'PrimStrings':decode('OsExpApp', <<127,62,128,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,36,128,4,3,16#4A,16#6F,16#6E,4,2,16#65,16#73,0,0,0,0>>),
 	    ok;
-
-	_->
+	_ ->
 	    ok
     end,
 
-    fragmented_octet_string(Rules),
-
     S255 = lists:seq(1, 255),
-    Strings = {type,true,"","1","12","345",true,
-	       S255,[$a|S255],[$a,$b|S255],397},
-    p_roundtrip('OsFixedStrings', Strings),
-    p_roundtrip('OsFixedStringsExt', Strings),
-    p_roundtrip('OsVarStringsExt', Strings),
+    Strings = {type,true,<<"">>,<<"1">>,<<"12">>,<<"345">>,true,
+	       list_to_binary(S255),list_to_binary([$a|S255]),
+	       list_to_binary([$a,$b|S255]),397},
+    p_os_roundtrip('OsFixedStrings', Strings),
+    p_os_roundtrip('OsFixedStringsExt', Strings),
+    p_os_roundtrip('OsVarStringsExt', Strings),
     ShortenedStrings = shorten_by_two(Strings),
-    p_roundtrip('OsFixedStringsExt', ShortenedStrings),
-    p_roundtrip('OsVarStringsExt', ShortenedStrings),
+    p_os_roundtrip('OsFixedStringsExt', ShortenedStrings),
+    p_os_roundtrip('OsVarStringsExt', ShortenedStrings),
     ok.
 
-fragmented_octet_string(Erules) ->
-    K16 = 1 bsl 14,
-    K32 = K16 + K16,
-    K48 = K32 + K16,
-    K64 = K48 + K16,
-    Lens = [0,1,14,15,16,17,127,128,
-	    K16-1,K16,K16+1,K16+(1 bsl 7)-1,K16+(1 bsl 7),K16+(1 bsl 7)+1,
-	    K32-1,K32,K32+1,K32+(1 bsl 7)-1,K32+(1 bsl 7),K32+(1 bsl 7)+1,
-	    K48-1,K48,K48+1,K48+(1 bsl 7)-1,K48+(1 bsl 7),K48+(1 bsl 7)+1,
-	    K64-1,K64,K64+1,K64+(1 bsl 7)-1,K64+(1 bsl 7),K64+(1 bsl 7)+1,
-	    K64+K16-1,K64+K16,K64+K16+1],
+fragmented_octet_string(Erules, Lens) ->
     Types = ['Os','OsFrag','OsFragExt'],
     [fragmented_octet_string(Erules, Types, L) || L <- Lens],
     fragmented_octet_string(Erules, ['FixedOs65536'], 65536),
@@ -360,13 +436,14 @@ fragmented_octet_string(Erules, Types, L) ->
     ok.
 
 enc_frag(Erules, Type, Value) ->
-    {ok,Encoded} = 'PrimStrings':encode(Type, Value),
+    M = 'PrimStrings',
+    {ok,Encoded} = M:encode(Type, Value),
     case Erules of
 	ber ->
 	    Encoded;
 	_ ->
 	    %% Validate encoding with our own encoder.
-	    Encoded = enc_frag_1(<<>>, list_to_binary(Value))
+	    Encoded = enc_frag_1(<<>>, Value)
     end.
 
 enc_frag_1(Res, Bin0) ->
@@ -385,12 +462,12 @@ enc_frag_1(Res, Bin0) ->
     end.
 
 make_value(L) ->
-    make_value(L, 0, []).
+    make_value(L, 0, <<>>).
 
 make_value(0, _, Acc) ->
     Acc;
 make_value(N, Byte, Acc) when Byte =< 255 ->
-    make_value(N-1, Byte+7, [Byte|Acc]);
+    make_value(N-1, Byte+7, <<Acc/binary,Byte:8>>);
 make_value(N, Byte, Acc) ->
     make_value(N, Byte band 16#FF, Acc).
 
@@ -688,36 +765,96 @@ utf8_string(_Rules) ->
 shorten_by_two(Tuple) ->
     L = [case E of
 	     [_,_|T] -> T;
+	     <<_:16,T/binary>> -> T;
 	     _ -> E
 	 end || E <- tuple_to_list(Tuple)],
     list_to_tuple(L).
 
+p_os_roundtrip(Type, Value0) ->
+    Value = setelement(1, Value0, Type),
+    p_os_roundtrip_1(Type, Value).
+
+p_os_roundtrip_1(Type, Value) ->
+    M = 'PrimStrings',
+    case M:legacy_erlang_types() of
+	false ->
+	    asn1_test_lib:roundtrip(M, Type, Value);
+	true ->
+	    {ok,Encoded} = M:encode(Type, Value),
+	    Es0 = tuple_to_list(Value),
+	    Es1 = [if
+		       is_binary(E) -> binary_to_list(E);
+		       true -> E
+		   end || E <- Es0],
+	    ListValue = list_to_tuple(Es1),
+	    {ok,Encoded} = M:encode(Type, ListValue),
+	    {ok,ListValue} = M:decode(Type, Encoded)
+    end.
+
 p_roundtrip(Type, Value0) ->
     Value = setelement(1, Value0, Type),
     roundtrip(Type, Value).
 
 roundtrip(Type, Value) ->
-    {ok,Encoded} = 'PrimStrings':encode(Type, Value),
-    {ok,Value} = 'PrimStrings':decode(Type, Encoded),
-    ok.
+    roundtrip(Type, Value, Value).
 
 roundtrip(Type, Value, Expected) ->
-    {ok,Encoded} = 'PrimStrings':encode(Type, Value),
-    {ok,Expected} = 'PrimStrings':decode(Type, Encoded),
-    ok.
+    asn1_test_lib:roundtrip('PrimStrings', Type, Value, Expected).
 
 bs_roundtrip(Type, Value) ->
     bs_roundtrip(Type, Value, Value).
 
-bs_roundtrip(Type, Value, Expected) ->
+os_roundtrip(Type, Bin) when is_binary(Bin) ->
     M = 'PrimStrings',
-    {ok,Encoded} = M:encode(Type, Value),
-    {ok,Encoded} = M:encode(Type, Expected),
-    case M:decode(Type, Encoded) of
-	{ok,Expected} ->
-	    ok;
-	{ok,Other} ->
-	    Expected = convert(Other, Expected)
+    case M:legacy_erlang_types() of
+	false ->
+	    asn1_test_lib:roundtrip(M, Type, Bin);
+	true ->
+	    {ok,Encoded} = M:encode(Type, Bin),
+	    List = binary_to_list(Bin),
+	    {ok,Encoded} = M:encode(Type, List),
+	    {ok,List} = M:decode(Type, Encoded)
+    end.
+
+bs_roundtrip(Type, Value, Expected) when is_bitstring(Value) ->
+    M = 'PrimStrings',
+    case M:legacy_erlang_types() of
+	false ->
+	    asn1_test_lib:roundtrip(M, Type, Value, Expected);
+	true ->
+	    {ok,Encoded} = M:encode(Type, Value),
+	    BitList = [B || <<B:1>> <= Value],
+	    {ok,Encoded} = M:encode(Type, BitList),
+	    case BitList of
+		[] ->
+		    {ok,Encoded} = M:encode(Type, 0);
+		[_|_] ->
+		    case lists:last(BitList) of
+			1 ->
+			    Int = lists:foldr(fun(B, A) ->
+						      (A bsl 1) bor B
+					      end, 0, BitList),
+			    {ok,Encoded} = M:encode(Type, Int);
+			0 ->
+			    %% This BIT STRING cannot be represented
+			    %% as an integer.
+			    ok
+		    end
+	    end,
+	    Compact = case bit_size(Value) of
+			  Bits when Bits rem 8 =:= 0 ->
+			      {0,Value};
+			  Bits ->
+			      Unused = 8 - Bits rem 8,
+			      {Unused,<<Value:Bits/bitstring,0:Unused>>}
+		      end,
+	    {ok,Encoded} = M:encode(Type, Compact),
+	    case M:decode(Type, Encoded) of
+		{ok,Expected} ->
+		    ok;
+		{ok,Other} ->
+		    Expected = convert(Other, Expected)
+	    end
     end.
 
 bs_decode(Type, Encoded, Expected) ->
diff --git a/lib/asn1/test/testSelectionTypes.erl b/lib/asn1/test/testSelectionTypes.erl
index 6d1641388f..6d060321da 100644
--- a/lib/asn1/test/testSelectionTypes.erl
+++ b/lib/asn1/test/testSelectionTypes.erl
@@ -18,19 +18,16 @@
 %%
 %%
 -module(testSelectionTypes).
-
 -export([test/0]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 test() ->
     Val = ["PrintableString","PrintableString","PrintableString"],
-    ?line {ok,Bin}=asn1_wrapper:encode('SelectionType','MendeleyevTable',Val),          
-    ?line {ok,Val} = asn1_wrapper:decode('SelectionType','MendeleyevTable',Bin),
-
-    ?line Val2 = ['SelectionType':einsteinium()],
-    ?line ["Es"] = Val2,
-    
-    ?line {ok,Bin2}=asn1_wrapper:encode('SelectionType','MendeleyevTable',Val2),          
-    ?line {ok,Val2} = asn1_wrapper:decode('SelectionType','MendeleyevTable',Bin2).
+    ["Es"] = Val2 = ['SelectionType':einsteinium()],
+    roundtrip('MendeleyevTable', Val),
+    roundtrip('MendeleyevTable', Val2),
+    ok.
 
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SelectionType', T, V).
diff --git a/lib/asn1/test/testSeq2738.erl b/lib/asn1/test/testSeq2738.erl
index cddfe4b311..9c059f2fc9 100644
--- a/lib/asn1/test/testSeq2738.erl
+++ b/lib/asn1/test/testSeq2738.erl
@@ -18,27 +18,16 @@
 %%
 %%
 -module(testSeq2738).
-
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-%-record('SeqOpt',{int, opt = asn1_NOVALUE}).
 -record('SeqOptFake',{int, opt = asn1_NOVALUE}).
-%-record('OptSeq',{int=17}).
 -record('OptSeqFake',{bool = false}).
 
-
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes} = 
-	asn1_wrapper:encode('Seq2738','SeqOptFake',
-		      #'SeqOptFake'{int = 10,
-				opt = #'OptSeqFake'{}}),
-    ?line {ok,#'SeqOptFake'{int=10,opt=#'OptSeqFake'{bool=false}}} = 
-	asn1_wrapper:decode('Seq2738','SeqOptFake',lists:flatten(Bytes)),
-    ?line {error,_} = 
-	asn1_wrapper:decode('Seq2738','SeqOpt',lists:flatten(Bytes)),
+    Enc = asn1_test_lib:roundtrip_enc('Seq2738',
+				      'SeqOptFake',
+				      #'SeqOptFake'{int=10,opt=#'OptSeqFake'{}}),
+    {error,_} = 'Seq2738':decode('SeqOpt', Enc),
     ok.
diff --git a/lib/asn1/test/testSeqDefault.erl b/lib/asn1/test/testSeqDefault.erl
index a772b749bd..22c1b7ee3a 100644
--- a/lib/asn1/test/testSeqDefault.erl
+++ b/lib/asn1/test/testSeqDefault.erl
@@ -33,148 +33,64 @@
 -record('SeqDef3',{bool3 = asn1_DEFAULT, seq3 = asn1_DEFAULT, int3 = asn1_DEFAULT}).
 -record('SeqDef3Imp',{bool3 = asn1_DEFAULT, seq3 = asn1_DEFAULT, int3 = asn1_DEFAULT}).
 -record('SeqDef3Exp',{bool3 = asn1_DEFAULT, seq3 = asn1_DEFAULT, int3 = asn1_DEFAULT}).
--record('SeqIn',{boolIn, intIn}).
+-record('SeqIn',{boolIn = asn1_NOVALUE, intIn = 12}).
 
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef1',#'SeqDef1'{bool1 = true,
-							int1 = 15,
-							seq1 = #'SeqIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SeqDef1',true,15,{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('SeqDefault','SeqDef1',#'SeqDef1'{int1 = 15}), 
-    ?line {ok,{'SeqDef1',true,15,{'SeqIn',asn1_NOVALUE,12}}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef1',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef2',#'SeqDef2'{bool2 = true,
-							int2 = 15,
-							seq2 = #'SeqIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SeqDef2',{'SeqIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('SeqDefault','SeqDef2',#'SeqDef2'{int2 = 15}), 
-    ?line {ok,{'SeqDef2',{'SeqIn',asn1_NOVALUE,12},true,15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef2',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef3',#'SeqDef3'{bool3 = true,
-							int3 = 15,
-							seq3 = #'SeqIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SeqDef3',true,{'SeqIn',true,66},15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('SeqDefault','SeqDef3',#'SeqDef3'{int3 = 15}), 
-    ?line {ok,{'SeqDef3',true,{'SeqIn',asn1_NOVALUE,12},15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef3',lists:flatten(Bytes32)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef1Imp',#'SeqDef1Imp'{bool1 = true,
-							      int1 = 15,
-							      seq1 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqDef1Imp',true,15,{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef1Imp',lists:flatten(Bytes41)),
-    
-    
-    ?line {ok,Bytes42} = asn1_wrapper:encode('SeqDefault','SeqDef1Imp',#'SeqDef1Imp'{int1 = 15}), 
-    ?line {ok,{'SeqDef1Imp',true,15,{'SeqIn',asn1_NOVALUE,12}}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef1Imp',lists:flatten(Bytes42)),
-    
-    
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef2Imp',#'SeqDef2Imp'{bool2 = true,
-							      int2 = 15,
-							      seq2 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqDef2Imp',{'SeqIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef2Imp',lists:flatten(Bytes51)),
-    
-    
-    ?line {ok,Bytes52} = asn1_wrapper:encode('SeqDefault','SeqDef2Imp',#'SeqDef2Imp'{int2 = 15}), 
-    ?line {ok,{'SeqDef2Imp',{'SeqIn',asn1_NOVALUE,12},true,15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef2Imp',lists:flatten(Bytes52)),
-    
-    
-    
-    ?line {ok,Bytes61} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef3Imp',#'SeqDef3Imp'{bool3 = true,
-							      int3 = 15,
-							      seq3 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqDef3Imp',true,{'SeqIn',true,66},15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef3Imp',lists:flatten(Bytes61)),
-    
-    
-    ?line {ok,Bytes62} = asn1_wrapper:encode('SeqDefault','SeqDef3Imp',#'SeqDef3Imp'{int3 = 15}), 
-    ?line {ok,{'SeqDef3Imp',true,{'SeqIn',asn1_NOVALUE,12},15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef3Imp',lists:flatten(Bytes62)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes71} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef1Exp',#'SeqDef1Exp'{bool1 = true,
-							      int1 = 15,
-							      seq1 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqDef1Exp',true,15,{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef1Exp',lists:flatten(Bytes71)),
-    
-    
-    ?line {ok,Bytes72} = asn1_wrapper:encode('SeqDefault','SeqDef1Exp',#'SeqDef1Exp'{int1 = 15}), 
-    ?line {ok,{'SeqDef1Exp',true,15,{'SeqIn',asn1_NOVALUE,12}}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef1Exp',lists:flatten(Bytes72)),
-    
-    
-    ?line {ok,Bytes81} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef2Exp',#'SeqDef2Exp'{bool2 = true,
-							      int2 = 15,
-							      seq2 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqDef2Exp',{'SeqIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef2Exp',lists:flatten(Bytes81)),
-    
-    
-    ?line {ok,Bytes82} = asn1_wrapper:encode('SeqDefault','SeqDef2Exp',#'SeqDef2Exp'{int2 = 15,
-									       bool2 = true}), 
-    ?line {ok,{'SeqDef2Exp',{'SeqIn',asn1_NOVALUE,12},true,15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef2Exp',lists:flatten(Bytes82)),
-    
-    
-    
-    ?line {ok,Bytes91} = 
-	asn1_wrapper:encode('SeqDefault','SeqDef3Exp',#'SeqDef3Exp'{bool3 = true,
-							      int3 = 15,
-							      seq3 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqDef3Exp',true,{'SeqIn',true,66},15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef3Exp',lists:flatten(Bytes91)),
-    
-    
-    ?line {ok,Bytes92} = asn1_wrapper:encode('SeqDefault','SeqDef3Exp',#'SeqDef3Exp'{int3 = 15}), 
-    ?line {ok,{'SeqDef3Exp',true,{'SeqIn',asn1_NOVALUE,12},15}} = 
-	asn1_wrapper:decode('SeqDefault','SeqDef3Exp',lists:flatten(Bytes92)),
-    
-    
-    
-    
+    roundtrip('SeqDef1', #'SeqDef1'{bool1=true,int1=15,seq1=#'SeqIn'{boolIn=true,intIn=66}}),
+    roundtrip('SeqDef1',
+	      #'SeqDef1'{bool1=asn1_DEFAULT,int1=15,seq1=asn1_DEFAULT},
+	      #'SeqDef1'{bool1=true,int1=15,seq1=#'SeqIn'{}}),
+
+    roundtrip('SeqDef2', #'SeqDef2'{seq2=#'SeqIn'{boolIn=true,intIn=66},bool2=true,int2=15}),
+    roundtrip('SeqDef2',
+	      #'SeqDef2'{seq2=asn1_DEFAULT,bool2=asn1_DEFAULT,int2=15},
+	      #'SeqDef2'{seq2=#'SeqIn'{},bool2=true,int2=15}),
+
+    roundtrip('SeqDef3', #'SeqDef3'{bool3=true,seq3=#'SeqIn'{boolIn=true,intIn=66},int3=15}),
+    roundtrip('SeqDef3',
+	      #'SeqDef3'{bool3=asn1_DEFAULT,seq3=asn1_DEFAULT,int3=15},
+	      #'SeqDef3'{bool3=true,seq3=#'SeqIn'{},int3=15}),
+
+    roundtrip('SeqDef1Imp', #'SeqDef1Imp'{bool1=true,int1=15,
+              seq1=#'SeqIn'{boolIn=true,intIn=66}}),
+    roundtrip('SeqDef1Imp',
+	      #'SeqDef1Imp'{bool1=asn1_DEFAULT,int1=15,seq1=asn1_DEFAULT},
+	      #'SeqDef1Imp'{bool1=true,int1=15,seq1=#'SeqIn'{}}),
+
+    roundtrip('SeqDef2Imp', #'SeqDef2Imp'{seq2=#'SeqIn'{boolIn=true,intIn=66},
+					  bool2=true,int2=15}),
+    roundtrip('SeqDef2Imp',
+	      #'SeqDef2Imp'{seq2=asn1_DEFAULT,bool2=asn1_DEFAULT,int2=15},
+	      #'SeqDef2Imp'{seq2=#'SeqIn'{},bool2=true,int2=15}),
+
+    roundtrip('SeqDef3Imp',
+	      #'SeqDef3Imp'{bool3=true,seq3=#'SeqIn'{boolIn=true,intIn=66},int3=15}),
+    roundtrip('SeqDef3Imp',
+	      #'SeqDef3Imp'{bool3=asn1_DEFAULT,seq3=asn1_DEFAULT,int3=15},
+	      #'SeqDef3Imp'{bool3=true,seq3=#'SeqIn'{},int3=15}),
+
+    roundtrip('SeqDef1Exp',
+	      #'SeqDef1Exp'{bool1=true,int1=15,seq1=#'SeqIn'{boolIn=true,intIn=66}}),
+    roundtrip('SeqDef1Exp',
+	      #'SeqDef1Exp'{bool1=asn1_DEFAULT,int1=15,seq1=asn1_DEFAULT},
+	      #'SeqDef1Exp'{bool1=true,int1=15,seq1=#'SeqIn'{}}),
+
+    roundtrip('SeqDef2Exp', #'SeqDef2Exp'{seq2=#'SeqIn'{boolIn=true,intIn=66},
+              bool2=true,int2=15}),
+    roundtrip('SeqDef2Exp',
+	      #'SeqDef2Exp'{seq2=asn1_DEFAULT,bool2=true,int2=15},
+	      #'SeqDef2Exp'{seq2=#'SeqIn'{},bool2=true,int2=15}),
+
+    roundtrip('SeqDef3Exp',
+	      #'SeqDef3Exp'{bool3=true,seq3=#'SeqIn'{boolIn=true,intIn=66},int3=15}),
+    roundtrip('SeqDef3Exp',
+	      #'SeqDef3Exp'{bool3=asn1_DEFAULT,seq3=asn1_DEFAULT,int3=15},
+	      #'SeqDef3Exp'{bool3=true,seq3=#'SeqIn'{},int3=15}),
     ok.
+
+roundtrip(Type, Value) ->
+    roundtrip(Type, Value, Value).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SeqDefault', Type, Value, ExpectedValue).
diff --git a/lib/asn1/test/testSeqExtension.erl b/lib/asn1/test/testSeqExtension.erl
index b996634996..c16e9fcd4c 100644
--- a/lib/asn1/test/testSeqExtension.erl
+++ b/lib/asn1/test/testSeqExtension.erl
@@ -44,7 +44,7 @@ main(Erule, DataDir, Opts) ->
     roundtrip('SeqExt4', #'SeqExt4'{bool=true,int=12345}),
     roundtrip('SeqExt4', #'SeqExt4'{bool=false,int=123456}),
 
-    roundtrip('SeqExt5', #'SeqExt5'{name="Arne",shoesize=47}),
+    roundtrip('SeqExt5', #'SeqExt5'{name = <<"Arne">>,shoesize=47}),
 
     %% Encode a value with this version of the specification.
     BigInt = 128638468966,
@@ -52,7 +52,7 @@ main(Erule, DataDir, Opts) ->
 			   s2=#'SeqExt2'{bool=true,int=2345},
 			   s3=#'SeqExt3'{bool=false,int=17},
 			   s4=#'SeqExt4'{bool=true,int=38739739},
-			   s5=#'SeqExt5'{name="Arne",shoesize=47},
+			   s5=#'SeqExt5'{name = <<"Arne">>,shoesize=47},
 			   s6=#'SeqExt6'{i1=531,i2=601,i3=999,
 					 i4=777,i5=11953,
 					 i6=13553,i7=77777},
@@ -108,18 +108,14 @@ main(Erule, DataDir, Opts) ->
     ok.
 
 roundtrip(Type, Value) ->
-    {ok,Encoded} = 'SeqExtension':encode(Type, Value),
-    {ok,Value} = 'SeqExtension':decode(Type, Encoded),
-    ok.
+    asn1_test_lib:roundtrip('SeqExtension', Type, Value).
 
 v_roundtrip2(Erule, Type, Value) ->
     Encoded = asn1_test_lib:hex_to_bin(v(Erule, Type)),
     Encoded = roundtrip2(Type, Value).
 
 roundtrip2(Type, Value) ->
-    {ok,Encoded} = 'SeqExtension2':encode(Type, Value),
-    {ok,Value} = 'SeqExtension2':decode(Type, Encoded),
-    Encoded.
+    asn1_test_lib:roundtrip_enc('SeqExtension2', Type, Value).
 
 v(ber, 'SeqExt66') ->  "30049F41 017D";
 v(per, 'SeqExt66') ->  "C0420000 00000000 00004001 FA";
diff --git a/lib/asn1/test/testSeqExternal.erl b/lib/asn1/test/testSeqExternal.erl
index b89b98d3fa..0b1d305054 100644
--- a/lib/asn1/test/testSeqExternal.erl
+++ b/lib/asn1/test/testSeqExternal.erl
@@ -20,121 +20,38 @@
 -module(testSeqExternal).
 
 -include("External.hrl").
--export([compile/3]).
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-
 -record('SeqXSet1',{set, bool, int}).
 -record('SeqXSet2',{bool, set, int}).
 -record('SeqXSet3',{bool, int, set}).
-%-record('NT',{os, bool}).
-%-record('Imp',{os, bool}).
-%-record('Exp',{os, bool}).
-
-
-compile(Config,Rules,Options) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line ok = asn1ct:compile(DataDir ++ "SeqExternal",
-			      [Rules,{outdir,OutDir}]++Options).
-
-
 
 main(_Rules) ->
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqExternal','XNTNT',#'XSeqNT'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqNT',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XNTNT',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqExternal','XImpNT',#'XSeqNT'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqNT',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XImpNT',lists:flatten(Bytes12)),
-
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqExternal','XExpNT',#'XSeqNT'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqNT',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XExpNT',lists:flatten(Bytes13)),
-
-    
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqExternal','XNTImp',#'XSeqImp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqImp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XNTImp',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqExternal','XImpImp',#'XSeqImp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqImp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XImpImp',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SeqExternal','XExpImp',#'XSeqImp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqImp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XExpImp',lists:flatten(Bytes23)),
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqExternal','XNTExp',#'XSeqExp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqExp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XNTExp',lists:flatten(Bytes31)),
-
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SeqExternal','XImpExp',#'XSeqExp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqExp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XImpExp',lists:flatten(Bytes32)),
-
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SeqExternal','XExpExp',#'XSeqExp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSeqExp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SeqExternal','XExpExp',lists:flatten(Bytes33)),
-
-
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqExternal','SeqXSet1',
-		      #'SeqXSet1'{bool = true, 
-				  int = 66,
-				  set = #'XSet1'{bool1 = true, 
-						 int1 = 77,
-						 set1 = #'XSetIn'{boolIn = false, 
-								  intIn = 88}}}),
-    ?line {ok,{'SeqXSet1',{'XSet1',true,77,{'XSetIn',false,88}},true,66}} = 
-	asn1_wrapper:decode('SeqExternal','SeqXSet1',lists:flatten(Bytes41)),
-
-
-
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SeqExternal','SeqXSet2',
-		      #'SeqXSet2'{bool = true, 
-				  int = 66,
-				  set = #'XSet1'{bool1 = true, 
-						 int1 = 77,
-						 set1 = #'XSetIn'{boolIn = false, 
-								  intIn = 88}}}),
-    ?line {ok,{'SeqXSet2',true,{'XSet1',true,77,{'XSetIn',false,88}},66}} = 
-	asn1_wrapper:decode('SeqExternal','SeqXSet2',lists:flatten(Bytes42)),
-
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SeqExternal','SeqXSet3',
-		      #'SeqXSet3'{bool = true, 
-				  int = 66,
-				  set = #'XSet1'{bool1 = true, 
-						 int1 = 77,
-						 set1 = #'XSetIn'{boolIn = false, 
-								  intIn = 88}}}),
-    ?line {ok,{'SeqXSet3',true,66,{'XSet1',true,77,{'XSetIn',false,88}}}} = 
-	asn1_wrapper:decode('SeqExternal','SeqXSet3',lists:flatten(Bytes43)),
-
-
-    
-
+    roundtrip('XNTNT', #'XSeqNT'{os = <<"kalle">>,bool=true}),
+    roundtrip('XImpNT', #'XSeqNT'{os = <<"kalle">>,bool=true}),
+    roundtrip('XExpNT', #'XSeqNT'{os = <<"kalle">>,bool=true}),
+    roundtrip('XNTImp', #'XSeqImp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XImpImp', #'XSeqImp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XExpImp', #'XSeqImp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XNTExp', #'XSeqExp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XImpExp', #'XSeqExp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XExpExp', #'XSeqExp'{os = <<"kalle">>,bool=true}),
+    roundtrip('SeqXSet1',
+	      #'SeqXSet1'{set=#'XSet1'{bool1=true,int1=77,
+				       set1=#'XSetIn'{boolIn=false,intIn=88}},
+			  bool=true,int=66}),
+    roundtrip('SeqXSet2',
+	      #'SeqXSet2'{bool=true,
+			  set=#'XSet1'{bool1=true,int1=77,
+				       set1=#'XSetIn'{boolIn=false,intIn=88}},
+			  int=66}),
+    roundtrip('SeqXSet3',
+	      #'SeqXSet3'{bool=true,int=66,
+			  set=#'XSet1'{bool1=true,int1=77,
+				       set1=#'XSetIn'{boolIn=false,intIn=88}}}),
     ok.
 
-
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqExternal', T, V).
diff --git a/lib/asn1/test/testSeqIndefinite.erl b/lib/asn1/test/testSeqIndefinite.erl
deleted file mode 100644
index c7b8aba523..0000000000
--- a/lib/asn1/test/testSeqIndefinite.erl
+++ /dev/null
@@ -1,48 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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(testSeqIndefinite).
-
--export([main/1]).
-
--include_lib("test_server/include/test_server.hrl").
-
-main(per) -> ok;
-main(ber) ->
-    
-    %% normal encoding
-    B = [48,20,1,1,255,48,9,1,1,255,2,4,251,35,238,194,2,4,251,55,236,161],
-    %% indefinite length encoding
-    Bi = [48,22,1,1,255,48,128,1,1,255,2,4,251,35,238,194,0,0,2,4,251,55,236,161],
-    %% the value which is encoded
-    V = {'SeqS3',true,{'SeqS3_seqS3',true,-81531198},-80221023},
-    ?line {ok,V} = asn1_wrapper:decode('SeqSetIndefinite','SeqS3',B),
-    ?line {ok,V} = asn1_wrapper:decode('SeqSetIndefinite','SeqS3',Bi),
-
-    %% normal encoding but with unknown extension component
-    _Be = [48,23,1,1,255,48,12,1,1,255,2,4,251,35,238,194,1,1,255,2,4,251,55,236,161],
-    %% indefinite length encoding but with unknown extension component
-    _Bei = [48,25,1,1,255,48,128,1,1,255,2,4,251,35,238,194,1,1,255,0,0,2,4,251,55,236,161],
-
-    ?line {ok,V} = asn1_wrapper:decode('SeqSetIndefinite','SeqS3',B),
-    ?line {ok,V} = asn1_wrapper:decode('SeqSetIndefinite','SeqS3',Bi),
-    ok.
-
-
-
diff --git a/lib/asn1/test/testSeqOf.erl b/lib/asn1/test/testSeqOf.erl
index db537b1478..25059d6052 100644
--- a/lib/asn1/test/testSeqOf.erl
+++ b/lib/asn1/test/testSeqOf.erl
@@ -83,6 +83,32 @@ main(_Rules) ->
     roundtrip('Seq4', #'Seq4'{seq43=SeqIn3},
 	      #'Seq4'{seq41=[],seq42=[],
 		      seq43=SeqIn3}),
+
+    roundtrip('Seq5', {'Seq5',true,[],77}),
+    roundtrip('Seq5', {'Seq5',true,[<<"">>],77}),
+    roundtrip('Seq5', {'Seq5',true,[<<"a">>],77}),
+    roundtrip('Seq5', {'Seq5',true,[<<"ab">>],77}),
+    roundtrip('Seq5', {'Seq5',true,[<<"abc">>],77}),
+
+    roundtrip('Seq6', {'Seq6',[],[],101}),
+    roundtrip('Seq6', {'Seq6',[],[7],101}),
+    roundtrip('Seq6', {'Seq6',[],[1,7],101}),
+    roundtrip('Seq6', {'Seq6',[1],[],101}),
+    roundtrip('Seq6', {'Seq6',[2],[7],101}),
+    roundtrip('Seq6', {'Seq6',[3],[1,7],101}),
+
+    roundtrip('Seq8', {'Seq8',[],37}),
+
+    roundtrip('Seq9', {'Seq9',true,[],97}),
+    roundtrip('Seq9', {'Seq9',true,[<<"">>],97}),
+    roundtrip('Seq9', {'Seq9',true,[<<"x">>],97}),
+    roundtrip('Seq9', {'Seq9',true,[<<"xy">>],97}),
+    roundtrip('Seq9', {'Seq9',true,[<<"xyz">>],97}),
+
+    roundtrip('Seq10', {'Seq10',true,[<<"">>],97}),
+    roundtrip('Seq10', {'Seq10',true,[<<"a">>],97}),
+    roundtrip('Seq10', {'Seq10',true,[<<"a">>,<<"b">>],97}),
+    roundtrip('Seq10', {'Seq10',true,[<<"a">>,<<"b">>,<<"c">>],97}),
     
     roundtrip('SeqEmp', #'SeqEmp'{seq1=[#'Empty'{}]}),
 
@@ -123,15 +149,9 @@ roundtrip(T, V) ->
     roundtrip(T, V, V).
 
 roundtrip(Type, Val, Expected) ->
-    M = 'SeqOf',
-    {ok,Enc} = M:encode(Type, Val),
-    {ok,Expected} = M:decode(Type, Enc),
-    ok.
+    asn1_test_lib:roundtrip('SeqOf', Type, Val, Expected).
 
 xroundtrip(T1, T2, Val) ->
-    M = 'XSeqOf',
-    {ok,Enc} = M:encode(T1, Val),
-    {ok,Enc} = M:encode(T2, Val),
-    {ok,Val} = M:decode(T1, Enc),
-    {ok,Val} = M:decode(T2, Enc),
+    Enc = asn1_test_lib:roundtrip_enc('XSeqOf', T1, Val),
+    Enc = asn1_test_lib:roundtrip_enc('XSeqOf', T2, Val),
     ok.
diff --git a/lib/asn1/test/testSeqOfCho.erl b/lib/asn1/test/testSeqOfCho.erl
index 5b83c8bf21..f749845bb9 100644
--- a/lib/asn1/test/testSeqOfCho.erl
+++ b/lib/asn1/test/testSeqOfCho.erl
@@ -31,117 +31,45 @@
 -record('SeqOfChoEmbOpt_SEQOF',{bool1, int1, seq1 = asn1_NOVALUE}).
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoDef',#'SeqChoDef'{bool1 = true,
-							  int1 = 17}),
-    ?line {ok,{'SeqChoDef',true,17,[]}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoDef',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoDef',#'SeqChoDef'{bool1 = true,
-							  int1 = 17,
-							  seq1 = [{boolIn,true},
-								  {intIn,25}]}),
-    ?line {ok,{'SeqChoDef',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoDef',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes15} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoOpt',#'SeqChoOpt'{bool1 = true,
-							  int1 = 17}),
-    ?line {ok,{'SeqChoOpt',true,17,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoOpt',lists:flatten(Bytes15)),
-    
-    
-    ?line {ok,Bytes16} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoOpt',#'SeqChoOpt'{bool1 = true,
-							  int1 = 17,
-							  seq1 = [{boolIn,true},
-								  {intIn,25}]}),
-    ?line {ok,{'SeqChoOpt',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoOpt',lists:flatten(Bytes16)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoEmbDef',#'SeqChoEmbDef'{bool1 = true,
-								int1 = 17}),
-    ?line {ok,{'SeqChoEmbDef',true,17,[]}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoEmbDef',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoEmbDef',#'SeqChoEmbDef'{bool1 = true,
-								int1 = 17,
-								seq1 = [{boolIn,true},
-									{intIn,25}]}),
-    ?line {ok,{'SeqChoEmbDef',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoEmbDef',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes25} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoEmbOpt',#'SeqChoEmbOpt'{bool1 = true,
-								int1 = 17}),
-    ?line {ok,{'SeqChoEmbOpt',true,17,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoEmbOpt',lists:flatten(Bytes25)),
-    
-    
-    ?line {ok,Bytes26} = 
-	asn1_wrapper:encode('SeqOfCho','SeqChoEmbOpt',#'SeqChoEmbOpt'{bool1 = true,
-								int1 = 17,
-								seq1 = [{boolIn,true},
-									{intIn,25}]}),
-    ?line {ok,{'SeqChoEmbOpt',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SeqOfCho','SeqChoEmbOpt',lists:flatten(Bytes26)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqOfCho','SeqOfChoEmbDef',[#'SeqOfChoEmbDef_SEQOF'{bool1 = true,
-									   int1 = 17}]),
-    ?line {ok,[{'SeqOfChoEmbDef_SEQOF',true,17,[]}]} = 
-	asn1_wrapper:decode('SeqOfCho','SeqOfChoEmbDef',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SeqOfCho','SeqOfChoEmbDef',
-		      [#'SeqOfChoEmbDef_SEQOF'{bool1 = true,
-					       int1 = 17,
-					       seq1 = [{boolIn,true},
-						       {intIn,25}]}]),
-    ?line {ok,[{'SeqOfChoEmbDef_SEQOF',true,17,[{boolIn,true},{intIn,25}]}]} = 
-	asn1_wrapper:decode('SeqOfCho','SeqOfChoEmbDef',lists:flatten(Bytes32)),
-    
-    
-    
-    ?line {ok,Bytes35} = 
-	asn1_wrapper:encode('SeqOfCho','SeqOfChoEmbOpt',[#'SeqOfChoEmbOpt_SEQOF'{bool1 = true,
-									   int1 = 17}]),
-    ?line {ok,[{'SeqOfChoEmbOpt_SEQOF',true,17,asn1_NOVALUE}]} = 
-	asn1_wrapper:decode('SeqOfCho','SeqOfChoEmbOpt',lists:flatten(Bytes35)),
-    
-    
-    ?line {ok,Bytes36} = 
-	asn1_wrapper:encode('SeqOfCho','SeqOfChoEmbOpt',
-		      [#'SeqOfChoEmbOpt_SEQOF'{bool1 = true,
-					       int1 = 17,
-					       seq1 = [{boolIn,true},
-						       {intIn,25}]}]),
-    ?line {ok,[{'SeqOfChoEmbOpt_SEQOF',true,17,[{boolIn,true},{intIn,25}]}]} = 
-	asn1_wrapper:decode('SeqOfCho','SeqOfChoEmbOpt',lists:flatten(Bytes36)),
-    
-    
-    
-    
+    roundtrip('SeqChoDef',
+	      #'SeqChoDef'{bool1=true,int1=17,seq1=asn1_DEFAULT},
+	      #'SeqChoDef'{bool1=true,int1=17,seq1=[]}),
+    roundtrip('SeqChoDef',
+	      #'SeqChoDef'{bool1=true,int1=17,
+			   seq1=[{boolIn,true},{intIn,25}]}),
+    roundtrip('SeqChoOpt',
+	      #'SeqChoOpt'{bool1=true,int1=17,seq1=asn1_NOVALUE}),
+    roundtrip('SeqChoOpt',
+	      #'SeqChoOpt'{bool1=true,int1=17,
+			   seq1=[{boolIn,true},{intIn,25}]}),
+
+    roundtrip('SeqChoEmbDef',
+	      #'SeqChoEmbDef'{bool1=true,int1=17,seq1=asn1_DEFAULT},
+	      #'SeqChoEmbDef'{bool1=true,int1=17,seq1=[]}),
+    roundtrip('SeqChoEmbDef',
+	      #'SeqChoEmbDef'{bool1=true,int1=17,
+			      seq1=[{boolIn,true},{intIn,25}]}),
+    roundtrip('SeqChoEmbOpt',
+	      #'SeqChoEmbOpt'{bool1=true,int1=17,seq1=asn1_NOVALUE}),
+    roundtrip('SeqChoEmbOpt',
+	      #'SeqChoEmbOpt'{bool1=true,int1=17,
+			      seq1=[{boolIn,true},{intIn,25}]}),
+
+    roundtrip('SeqOfChoEmbDef',
+	      [#'SeqOfChoEmbDef_SEQOF'{bool1=true,int1=17,seq1=asn1_DEFAULT}],
+	      [#'SeqOfChoEmbDef_SEQOF'{bool1=true,int1=17,seq1=[]}]),
+    roundtrip('SeqOfChoEmbDef',
+	      [#'SeqOfChoEmbDef_SEQOF'{bool1=true,int1=17,
+				       seq1=[{boolIn,true},{intIn,25}]}]),
+    roundtrip('SeqOfChoEmbOpt',
+	      [#'SeqOfChoEmbOpt_SEQOF'{bool1=true,int1=17,seq1=asn1_NOVALUE}]),
+    roundtrip('SeqOfChoEmbOpt',
+	      [#'SeqOfChoEmbOpt_SEQOF'{bool1=true,int1=17,
+				       seq1=[{boolIn,true},{intIn,25}]}]),
     ok.
 
+roundtrip(Type, Value) ->
+    roundtrip(Type, Value, Value).
 
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SeqOfCho', Type, Value, ExpectedValue).
diff --git a/lib/asn1/test/testSeqOfExternal.erl b/lib/asn1/test/testSeqOfExternal.erl
index 4c4c9e2b0f..38b9f0ce7c 100644
--- a/lib/asn1/test/testSeqOfExternal.erl
+++ b/lib/asn1/test/testSeqOfExternal.erl
@@ -18,9 +18,6 @@
 %%
 %%
 -module(testSeqOfExternal).
-
-
--export([compile/3]).
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -30,142 +27,62 @@
 -record('Imp',{os, bool}).
 -record('Exp',{os, bool}).
 
-
-
-compile(Config,Rules,Options) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line ok = asn1ct:compile(DataDir ++ "SeqOfExternal",[Rules,{outdir,OutDir}]++Options).
-
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqOfExternal','NTNT',[#'NT'{bool = true, os = "kalle"},
-					      #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','NTNT',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqOfExternal','ImpNT',[#'NT'{bool = true, os = "kalle"},
-					       #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ImpNT',lists:flatten(Bytes12)),
-
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqOfExternal','ExpNT',[#'NT'{bool = true, os = "kalle"},
-					       #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ExpNT',lists:flatten(Bytes13)),
-
-    
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqOfExternal','NTImp',[#'Imp'{bool = true, os = "kalle"},
-					       #'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','NTImp',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqOfExternal','ImpImp',[#'Imp'{bool = true, os = "kalle"},
-						#'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ImpImp',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SeqOfExternal','ExpImp',[#'Imp'{bool = true, os = "kalle"},
-						#'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ExpImp',lists:flatten(Bytes23)),
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqOfExternal','NTExp',[#'Exp'{bool = true, os = "kalle"},
-					       #'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','NTExp',lists:flatten(Bytes31)),
-
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SeqOfExternal','ImpExp',[#'Exp'{bool = true, os = "kalle"},
-						#'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ImpExp',lists:flatten(Bytes32)),
-
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SeqOfExternal','ExpExp',[#'Exp'{bool = true, os = "kalle"},
-						#'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','ExpExp',lists:flatten(Bytes33)),
-
-
-
-
-
-
-
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqOfExternal','XNTNT',[#'XSeqNT'{bool = true, os = "kalle"},
-					       #'XSeqNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XNTNT',lists:flatten(Bytes41)),
-
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SeqOfExternal','XImpNT',[#'XSeqNT'{bool = true, os = "kalle"},
-						#'XSeqNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XImpNT',lists:flatten(Bytes42)),
-
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SeqOfExternal','XExpNT',[#'XSeqNT'{bool = true, os = "kalle"},
-						#'XSeqNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XExpNT',lists:flatten(Bytes43)),
-
-    
-
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SeqOfExternal','XNTImp',[#'XSeqImp'{bool = true, os = "kalle"},
-						#'XSeqImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XNTImp',lists:flatten(Bytes51)),
-
-    ?line {ok,Bytes52} = 
-	asn1_wrapper:encode('SeqOfExternal','XImpImp',[#'XSeqImp'{bool = true, os = "kalle"},
-						 #'XSeqImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XImpImp',lists:flatten(Bytes52)),
-
-    ?line {ok,Bytes53} = 
-	asn1_wrapper:encode('SeqOfExternal','XExpImp',[#'XSeqImp'{bool = true, os = "kalle"},
-						 #'XSeqImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XExpImp',lists:flatten(Bytes53)),
-
-
-    
-    ?line {ok,Bytes61} = 
-	asn1_wrapper:encode('SeqOfExternal','XNTExp',[#'XSeqExp'{bool = true, os = "kalle"},
-						#'XSeqExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XNTExp',lists:flatten(Bytes61)),
-
-    ?line {ok,Bytes62} = 
-	asn1_wrapper:encode('SeqOfExternal','XImpExp',[#'XSeqExp'{bool = true, os = "kalle"},
-						 #'XSeqExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XImpExp',lists:flatten(Bytes62)),
-
-    ?line {ok,Bytes63} = 
-	asn1_wrapper:encode('SeqOfExternal','XExpExp',[#'XSeqExp'{bool = true, os = "kalle"},
-						 #'XSeqExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SeqOfExternal','XExpExp',lists:flatten(Bytes63)),
-
-
-    
-    
+    roundtrip('NTNT',
+	      [#'NT'{os = <<"kalle">>,bool=true},
+	       #'NT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ImpNT',
+	      [#'NT'{os = <<"kalle">>,bool=true},
+	       #'NT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ExpNT',
+	      [#'NT'{os = <<"kalle">>,bool=true},
+	       #'NT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('NTImp',
+	      [#'Imp'{os = <<"kalle">>,bool=true},
+	       #'Imp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ImpImp',
+	      [#'Imp'{os = <<"kalle">>,bool=true},
+	       #'Imp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ExpImp',
+	      [#'Imp'{os = <<"kalle">>,bool=true},
+	       #'Imp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('NTExp',
+	      [#'Exp'{os = <<"kalle">>,bool=true},
+	       #'Exp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ImpExp',
+	      [#'Exp'{os = <<"kalle">>,bool=true},
+	       #'Exp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ExpExp',
+	      [#'Exp'{os = <<"kalle">>,bool=true},
+	       #'Exp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XNTNT',
+	      [#'XSeqNT'{os = <<"kalle">>,bool=true},
+	       #'XSeqNT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XImpNT',
+	      [#'XSeqNT'{os = <<"kalle">>,bool=true},
+	       #'XSeqNT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XExpNT',
+	      [#'XSeqNT'{os = <<"kalle">>,bool=true},
+	       #'XSeqNT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XNTImp',
+	      [#'XSeqImp'{os = <<"kalle">>,bool=true},
+	       #'XSeqImp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XImpImp',
+	      [#'XSeqImp'{os = <<"kalle">>,bool=true},
+	       #'XSeqImp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XExpImp',
+	      [#'XSeqImp'{os = <<"kalle">>,bool=true},
+	       #'XSeqImp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XNTExp',
+	      [#'XSeqExp'{os = <<"kalle">>,bool=true},
+	       #'XSeqExp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XImpExp',
+	      [#'XSeqExp'{os = <<"kalle">>,bool=true},
+	       #'XSeqExp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XExpExp',
+	      [#'XSeqExp'{os = <<"kalle">>,bool=true},
+	       #'XSeqExp'{os = <<"kalle">>,bool=true}]),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqOfExternal', T, V).
diff --git a/lib/asn1/test/testSeqOfIndefinite.erl b/lib/asn1/test/testSeqOfIndefinite.erl
index 01ef36e0b4..b771405d84 100644
--- a/lib/asn1/test/testSeqOfIndefinite.erl
+++ b/lib/asn1/test/testSeqOfIndefinite.erl
@@ -33,60 +33,53 @@ main() ->
     ?line ok = test('InsertSubscriberDataArg'). % OTP-4232
 
 test(isd)->
-    EncPdu = [48,128,129,7,145,148,113,50,1,0,241,131,1,0,176,128,5,0,161,128,48,22,2,1,1,144,2,241,33,145,4,0,1,2,3,146,3,36,131,16,148,2,1,42,48,35,2,1,2,144,2,241,33,145,4,255,255,255,255,146,3,37,147,18,147,0,148,13,7,67,79,77,80,65,78,89,4,67,79,77,53,48,28,2,1,3,144,2,241,33,146,3,26,98,31,148,14,9,67,79,77,80,65,78,89,49,50,3,67,79,77,0,0,0,0,152,1,2,0,0],
-    
-    ?line {ok,_} = asn1_wrapper:decode('Mvrasn-11-4',
-				'InsertSubscriberDataArg',
-				EncPdu),
+    EncPdu = <<48,128,129,7,145,148,113,50,1,0,241,131,1,0,176,128,5,0,
+	       161,128,48,22,2,1,1,144,2,241,33,145,4,0,1,2,3,146,3,36,
+	       131,16,148,2,1,42,48,35,2,1,2,144,2,241,33,145,4,255,255,
+	       255,255,146,3,37,147,18,147,0,148,13,7,67,79,77,80,65,78,
+	       89,4,67,79,77,53,48,28,2,1,3,144,2,241,33,146,3,26,98,31,
+	       148,14,9,67,79,77,80,65,78,89,49,50,3,67,79,77,0,0,0,0,
+	       152,1,2,0,0>>,
+    {ok,_} = 'Mvrasn-11-4':decode('InsertSubscriberDataArg', EncPdu),
     ok;
 
 % 
 % Problems with indefinite length encoding !!!
 % 
 test(isd2)->
-    EncPdu = [48, 128, 128, 8, 98, 2, 50, 1, 0, 0, 0, 241, 176, 128, 161, 128, 48, 128, 2, 1, 1, 144, 2, 241, 33, 145, 4, 255, 23, 12, 1, 146, 3, 9, 17, 1, 147, 0, 148, 13, 7, 67, 79, 77, 80, 65, 78, 89, 4, 67, 79, 77, 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-    
-    ?line {ok,_DecPdu} = asn1_wrapper:decode('Mvrasn-11-4',
-				'InsertSubscriberDataArg',
-				EncPdu),
-
+    EncPdu = <<48,128,128,8,98,2,50,1,0,0,0,241,176,128,161,128,48,128,2,1,1,144,
+	       2,241,33,145,4,255,23,12,1,146,3,9,17,1,147,0,148,13,7,67,79,77,80,
+	       65,78,89,4,67,79,77,53,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0>>,
+    {ok,_DecPdu} = 'Mvrasn-11-4':decode('InsertSubscriberDataArg', EncPdu),
     ok;
 
 % 
 % Is doing fine, although there is indefinite encoding used... !!!
 % 
 test(dsd)->
-    EncPdu = [48, 128, 128, 8, 98, 2, 50, 1, 0, 0, 0, 241, 170, 2, 5, 0, 0, 0, 0, 0],
-    
-    ?line {ok,_DecPdu} = asn1_wrapper:decode('Mvrasn-11-4',
-				'DeleteSubscriberDataArg',
-				EncPdu),
-
+    EncPdu = <<48,128,128,8,98,2,50,1,0,0,0,241,170,2,5,0,0,0,0,0>>,
+    {ok,_DecPdu} = 'Mvrasn-11-4':decode('DeleteSubscriberDataArg', EncPdu),
     ok;
 
 %
 % Is doing fine !!!
 % 
 test(ul_res)->
-    EncPdu = [48, 9, 4, 7, 145, 148, 113, 66, 16, 17, 241],
-    
-    ?line {ok,_DecPdu} = asn1_wrapper:decode('Mvrasn-11-4',
-				'UpdateGprsLocationRes',
-				EncPdu),
-
+    EncPdu = <<48,9,4,7,145,148,113,66,16,17,241>>,
+    {ok,_DecPdu} = 'Mvrasn-11-4':decode('UpdateGprsLocationRes', EncPdu),
     ok;
 
 test(prim) ->
-    ?line {ok,Bytes} = asn1_wrapper:encode('SeqOf','SeqOfInt',[10,20,30]),
-    ?line [Tag,_Len|Ints] = lists:flatten(Bytes),
-    ?line {ok,[10,20,30]} = 
-	asn1_wrapper:decode('SeqOf','SeqOfInt',[Tag,128|Ints] ++ [0,0]),
+    Bytes = asn1_test_lib:roundtrip_enc('SeqOf', 'SeqOfInt', [10,20,30]),
+    <<Tag,_Len,Ints/binary>> = Bytes,
+    {ok,[10,20,30]} =
+	'SeqOf':decode('SeqOfInt', <<Tag,128,Ints/binary,0,0>>),
     ok;
 
 test(seqofseq) ->
-    {ok,_V} = asn1_wrapper:decode('Mvrasn-DataTypes-1',
-                 'SentParameters',
-                 [48,
+    {ok,_V} = 'Mvrasn-DataTypes-1':decode(
+		 'SentParameters',
+		  [48,
                   129,
                   190,
                   161,
@@ -281,17 +274,16 @@ test(seqofseq) ->
                   0]),
     ok;
 test('InsertSubscriberDataArg') ->
-    {ok,_V} =
-	asn1_wrapper:decode('Mvrasn-11-4','InsertSubscriberDataArg',
-			    [16#30,16#80,16#81,16#07,16#91,16#94,
-			     16#71,16#92,16#00,16#35,16#80,16#83,
-			     16#01,16#00,16#A6,16#06,16#04,16#01,
-			     16#21,16#04,16#01,16#22,16#B0,16#80,
-			     16#05,16#00,16#A1,16#80,16#30,16#1A,
-			     16#02,16#01,16#01,16#90,16#02,16#F1,
-			     16#21,16#92,16#03,16#0D,16#92,16#1F,
-			     16#94,16#0C,16#03,16#53,16#49,16#4D,
-			     16#03,16#47,16#53,16#4E,16#03,16#4C,
-			     16#4B,16#50,16#00,16#00,16#00,16#00,
-			     16#98,16#01,16#00,16#00,16#00]),
+    EncPdu = <<16#30,16#80,16#81,16#07,16#91,16#94,
+	       16#71,16#92,16#00,16#35,16#80,16#83,
+	       16#01,16#00,16#A6,16#06,16#04,16#01,
+	       16#21,16#04,16#01,16#22,16#B0,16#80,
+	       16#05,16#00,16#A1,16#80,16#30,16#1A,
+	       16#02,16#01,16#01,16#90,16#02,16#F1,
+	       16#21,16#92,16#03,16#0D,16#92,16#1F,
+	       16#94,16#0C,16#03,16#53,16#49,16#4D,
+	       16#03,16#47,16#53,16#4E,16#03,16#4C,
+	       16#4B,16#50,16#00,16#00,16#00,16#00,
+	       16#98,16#01,16#00,16#00,16#00>>,
+    {ok,_V} = 'Mvrasn-11-4':decode('InsertSubscriberDataArg', EncPdu),
     ok.
diff --git a/lib/asn1/test/testSeqOfTag.erl b/lib/asn1/test/testSeqOfTag.erl
index 2359df0c59..f66e29e91d 100644
--- a/lib/asn1/test/testSeqOfTag.erl
+++ b/lib/asn1/test/testSeqOfTag.erl
@@ -44,145 +44,48 @@
 -record('Exp',{os, bool}).
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagNt',
-		      #'SeqTagNt'{nt = [#'NT'{bool = true, os = "kalle"},
-					#'NT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagNt',
-	       [{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagNt',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagNtI',
-		      #'SeqTagNtI'{imp = [#'Imp'{bool = true, os = "kalle"},
-					  #'Imp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagNtI',
-	       [{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagNtI',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagNtE',
-		      #'SeqTagNtE'{exp = [#'Exp'{bool = true, os = "kalle"},
-					  #'Exp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagNtE',
-	       [{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagNtE',lists:flatten(Bytes13)),
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagI',
-		      #'SeqTagI'{nt = [#'NT'{bool = true, os = "kalle"},
-				       #'NT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagI',
-	       [{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagI',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagII',
-		      #'SeqTagII'{imp = [#'Imp'{bool = true, os = "kalle"},
-					 #'Imp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagII',
-	       [{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagII',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagIE',
-		      #'SeqTagIE'{exp = [#'Exp'{bool = true, os = "kalle"},
-					 #'Exp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagIE',
-	       [{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagIE',lists:flatten(Bytes23)),
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagE',
-		      #'SeqTagE'{nt = [#'NT'{bool = true, os = "kalle"},
-				       #'NT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagE',
-	       [{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagE',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagEI',
-		      #'SeqTagEI'{imp = [#'Imp'{bool = true, os = "kalle"},
-					 #'Imp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagEI',
-	       [{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagEI',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagEE',
-		      #'SeqTagEE'{exp = [#'Exp'{bool = true, os = "kalle"},
-					 #'Exp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagEE',
-	       [{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagEE',lists:flatten(Bytes33)),
-    
-    
-    
-    
+    roundtrip('SeqTagNt', #'SeqTagNt'{nt=[#'NT'{os = <<"kalle">>,bool=true},
+					  #'NT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagNtI', #'SeqTagNtI'{imp=[#'Imp'{os = <<"kalle">>,bool=true},
+					     #'Imp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagNtE', #'SeqTagNtE'{exp=[#'Exp'{os = <<"kalle">>,bool=true},
+					     #'Exp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagI', #'SeqTagI'{nt=[#'NT'{os = <<"kalle">>,bool=true},
+					#'NT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagII', #'SeqTagII'{imp=[#'Imp'{os = <<"kalle">>,bool=true},
+					   #'Imp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagIE', #'SeqTagIE'{exp=[#'Exp'{os = <<"kalle">>,bool=true},
+					   #'Exp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagE', #'SeqTagE'{nt=[#'NT'{os = <<"kalle">>,bool=true},
+					#'NT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagEI', #'SeqTagEI'{imp=[#'Imp'{os = <<"kalle">>,bool=true},
+					   #'Imp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagEE', #'SeqTagEE'{exp=[#'Exp'{os = <<"kalle">>,bool=true},
+					   #'Exp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagXNt',
+	      #'SeqTagXNt'{xnt=[#'XSeqNT'{os = <<"kalle">>,bool=true},
+				#'XSeqNT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagXI',
+	      #'SeqTagXI'{ximp=[#'XSeqImp'{os = <<"kalle">>,bool=true},
+				#'XSeqImp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagXE',
+	      #'SeqTagXE'{xexp=[#'XSeqExp'{os = <<"kalle">>,bool=true},
+				#'XSeqExp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagImpX',
+	      #'SeqTagImpX'{xnt=[#'XSeqNT'{os = <<"kalle">>,bool=true},
+				 #'XSeqNT'{os = <<"kalle">>,bool=true}],
+			    ximp=[#'XSeqImp'{os = <<"kalle">>,bool=true},
+				  #'XSeqImp'{os = <<"kalle">>,bool=true}],
+			    xexp=[#'XSeqExp'{os = <<"kalle">>,bool=true},
+				  #'XSeqExp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SeqTagExpX',
+	      #'SeqTagExpX'{xnt=[#'XSeqNT'{os = <<"kalle">>,bool=true},
+				 #'XSeqNT'{os = <<"kalle">>,bool=true}],
+			    ximp=[#'XSeqImp'{os = <<"kalle">>,bool=true},
+				  #'XSeqImp'{os = <<"kalle">>,bool=true}],
+			    xexp=[#'XSeqExp'{os = <<"kalle">>,bool=true},
+				  #'XSeqExp'{os = <<"kalle">>,bool=true}]}),
+    ok.
 
-
-
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagXNt',
-		      #'SeqTagXNt'{xnt = [#'XSeqNT'{bool = true, os = "kalle"},
-					  #'XSeqNT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagXNt',
-	       [{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagXNt',lists:flatten(Bytes41)),
-    
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagXI',
-		      #'SeqTagXI'{ximp = [#'XSeqImp'{bool = true, os = "kalle"},
-					  #'XSeqImp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagXI',
-	       [{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagXI',lists:flatten(Bytes42)),
-    
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagXE',
-		      #'SeqTagXE'{xexp = [#'XSeqExp'{bool = true, os = "kalle"},
-					  #'XSeqExp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagXE',
-	       [{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagXE',lists:flatten(Bytes43)),
-        
-    
-
-
-    
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagImpX',
-		      #'SeqTagImpX'{xnt = [#'XSeqNT'{bool = true, os = "kalle"},
-					   #'XSeqNT'{bool = true, os = "kalle"}],
-				    ximp = [#'XSeqImp'{bool = true, os = "kalle"},
-					    #'XSeqImp'{bool = true, os = "kalle"}],
-				    xexp = [#'XSeqExp'{bool = true, os = "kalle"},
-					    #'XSeqExp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagImpX',
-	       [{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}], 
-	       [{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}],
-	       [{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagImpX',lists:flatten(Bytes51)),
-    
-
-
-    ?line {ok,Bytes52} = 
-	asn1_wrapper:encode('SeqOfTag','SeqTagExpX',
-		      #'SeqTagExpX'{xnt = [#'XSeqNT'{bool = true, os = "kalle"},
-					   #'XSeqNT'{bool = true, os = "kalle"}],
-				    ximp = [#'XSeqImp'{bool = true, os = "kalle"},
-					    #'XSeqImp'{bool = true, os = "kalle"}],
-				    xexp = [#'XSeqExp'{bool = true, os = "kalle"},
-					    #'XSeqExp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SeqTagExpX',
-	       [{'XSeqNT',[107,97,108,108,101],true},{'XSeqNT',[107,97,108,108,101],true}], 
-	       [{'XSeqImp',[107,97,108,108,101],true},{'XSeqImp',[107,97,108,108,101],true}],
-	       [{'XSeqExp',[107,97,108,108,101],true},{'XSeqExp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SeqOfTag','SeqTagExpX',lists:flatten(Bytes52)),
-    
-ok.
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqOfTag', T, V).
diff --git a/lib/asn1/test/testSeqOptional.erl b/lib/asn1/test/testSeqOptional.erl
index 8013f3c685..c9478105a4 100644
--- a/lib/asn1/test/testSeqOptional.erl
+++ b/lib/asn1/test/testSeqOptional.erl
@@ -37,159 +37,48 @@
 -record('SeqChoOpt',{int, cho = asn1_NOVALUE}).
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt1',#'SeqOpt1'{bool1 = true,
-							int1 = 15,
-							seq1 = #'SeqIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SeqOpt1',true,15,{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('SeqOptional','SeqOpt1',#'SeqOpt1'{int1 = 15}), 
-    ?line {ok,{'SeqOpt1',asn1_NOVALUE,15,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt1',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt2',#'SeqOpt2'{bool2 = true,
-							int2 = 15,
-							seq2 = #'SeqIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SeqOpt2',{'SeqIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('SeqOptional','SeqOpt2',#'SeqOpt2'{int2 = 15,
-									  bool2 = true}), 
-    ?line {ok,{'SeqOpt2',asn1_NOVALUE,true,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt2',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt3',#'SeqOpt3'{bool3 = true,
-							int3 = 15,
-							seq3 = #'SeqIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SeqOpt3',true,{'SeqIn',true,66},15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('SeqOptional','SeqOpt3',#'SeqOpt3'{int3 = 15}), 
-    ?line {ok,{'SeqOpt3',asn1_NOVALUE,asn1_NOVALUE,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt3',lists:flatten(Bytes32)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt1Imp',#'SeqOpt1Imp'{bool1 = true,
-							      int1 = 15,
-							      seq1 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqOpt1Imp',true,15,{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt1Imp',lists:flatten(Bytes41)),
-    
-    
-    ?line {ok,Bytes42} = asn1_wrapper:encode('SeqOptional','SeqOpt1Imp',#'SeqOpt1Imp'{int1 = 15}), 
-    ?line {ok,{'SeqOpt1Imp',asn1_NOVALUE,15,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt1Imp',lists:flatten(Bytes42)),
-    
-    
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt2Imp',#'SeqOpt2Imp'{bool2 = true,
-							      int2 = 15,
-							      seq2 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqOpt2Imp',{'SeqIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt2Imp',lists:flatten(Bytes51)),
-    
-    
-    ?line {ok,Bytes52} = asn1_wrapper:encode('SeqOptional','SeqOpt2Imp',#'SeqOpt2Imp'{int2 = 15,
-									        bool2 = true}), 
-    ?line {ok,{'SeqOpt2Imp',asn1_NOVALUE,true,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt2Imp',lists:flatten(Bytes52)),
-    
-    
-    
-    ?line {ok,Bytes61} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt3Imp',#'SeqOpt3Imp'{bool3 = true,
-							      int3 = 15,
-							      seq3 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqOpt3Imp',true,{'SeqIn',true,66},15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt3Imp',lists:flatten(Bytes61)),
-    
-    
-    ?line {ok,Bytes62} = asn1_wrapper:encode('SeqOptional','SeqOpt3Imp',#'SeqOpt3Imp'{int3 = 15}), 
-    ?line {ok,{'SeqOpt3Imp',asn1_NOVALUE,asn1_NOVALUE,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt3Imp',lists:flatten(Bytes62)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes71} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt1Exp',#'SeqOpt1Exp'{bool1 = true,
-							      int1 = 15,
-							      seq1 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqOpt1Exp',true,15,{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt1Exp',lists:flatten(Bytes71)),
-    
-    
-    ?line {ok,Bytes72} = asn1_wrapper:encode('SeqOptional','SeqOpt1Exp',#'SeqOpt1Exp'{int1 = 15}), 
-    ?line {ok,{'SeqOpt1Exp',asn1_NOVALUE,15,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt1Exp',lists:flatten(Bytes72)),
-    
-    
-    ?line {ok,Bytes81} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt2Exp',#'SeqOpt2Exp'{bool2 = true,
-							      int2 = 15,
-							      seq2 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqOpt2Exp',{'SeqIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt2Exp',lists:flatten(Bytes81)),
-    
-    
-    ?line {ok,Bytes82} = asn1_wrapper:encode('SeqOptional','SeqOpt2Exp',#'SeqOpt2Exp'{int2 = 15,
-									       bool2 = true}), 
-    ?line {ok,{'SeqOpt2Exp',asn1_NOVALUE,true,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt2Exp',lists:flatten(Bytes82)),
-    
-    
-    
-    ?line {ok,Bytes91} = 
-	asn1_wrapper:encode('SeqOptional','SeqOpt3Exp',#'SeqOpt3Exp'{bool3 = true,
-							      int3 = 15,
-							      seq3 = #'SeqIn'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqOpt3Exp',true,{'SeqIn',true,66},15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt3Exp',lists:flatten(Bytes91)),
-    
-    
-    ?line {ok,Bytes92} = asn1_wrapper:encode('SeqOptional','SeqOpt3Exp',#'SeqOpt3Exp'{int3 = 15}), 
-    ?line {ok,{'SeqOpt3Exp',asn1_NOVALUE,asn1_NOVALUE,15}} = 
-	asn1_wrapper:decode('SeqOptional','SeqOpt3Exp',lists:flatten(Bytes92)),
-    
-    
-    
-    ?line {ok,Bytes101} = 
-	asn1_wrapper:encode('SeqOptional','SeqChoOpt',#'SeqChoOpt'{int = 15,
-							     cho = {boolC,true}}), 
-    ?line {ok,{'SeqChoOpt',15,{boolC,true}}} = 
-	asn1_wrapper:decode('SeqOptional','SeqChoOpt',lists:flatten(Bytes101)),
-    
-    
-    ?line {ok,Bytes102} = asn1_wrapper:encode('SeqOptional','SeqChoOpt',#'SeqChoOpt'{int = 15}), 
-    ?line {ok,{'SeqChoOpt',15,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SeqOptional','SeqChoOpt',lists:flatten(Bytes102)),
-    
-    
-    
-    
+    roundtrip('SeqOpt1', #'SeqOpt1'{bool1=true,int1=15,
+				    seq1=#'SeqIn'{boolIn=true,intIn=66}}),
+    roundtrip('SeqOpt1', #'SeqOpt1'{bool1=asn1_NOVALUE,
+				    int1=15,seq1=asn1_NOVALUE}),
+    roundtrip('SeqOpt2', #'SeqOpt2'{seq2=#'SeqIn'{boolIn=true,intIn=66},
+				    bool2=true,int2=15}),
+    roundtrip('SeqOpt2', #'SeqOpt2'{seq2=asn1_NOVALUE,bool2=true,int2=15}),
+    roundtrip('SeqOpt3', #'SeqOpt3'{bool3=true,
+				    seq3=#'SeqIn'{boolIn=true,
+						  intIn=66},int3=15}),
+    roundtrip('SeqOpt3', #'SeqOpt3'{bool3=asn1_NOVALUE,
+				    seq3=asn1_NOVALUE,int3=15}),
+    roundtrip('SeqOpt1Imp', #'SeqOpt1Imp'{bool1=true,int1=15,
+              seq1=#'SeqIn'{boolIn=true,intIn=66}}),
+    roundtrip('SeqOpt1Imp', #'SeqOpt1Imp'{bool1=asn1_NOVALUE,
+					  int1=15,seq1=asn1_NOVALUE}),
+    roundtrip('SeqOpt2Imp', #'SeqOpt2Imp'{seq2=#'SeqIn'{boolIn=true,intIn=66},
+					  bool2=true,int2=15}),
+    roundtrip('SeqOpt2Imp', #'SeqOpt2Imp'{seq2=asn1_NOVALUE,
+					  bool2=true,int2=15}),
+    roundtrip('SeqOpt3Imp', #'SeqOpt3Imp'{bool3=true,
+					  seq3=#'SeqIn'{boolIn=true,intIn=66},
+					  int3=15}),
+    roundtrip('SeqOpt3Imp', #'SeqOpt3Imp'{bool3=asn1_NOVALUE,
+					  seq3=asn1_NOVALUE,int3=15}),
+    roundtrip('SeqOpt1Exp', #'SeqOpt1Exp'{bool1=true,int1=15,
+					  seq1=#'SeqIn'{boolIn=true,
+							intIn=66}}),
+    roundtrip('SeqOpt1Exp', #'SeqOpt1Exp'{bool1=asn1_NOVALUE,
+					  int1=15,seq1=asn1_NOVALUE}),
+    roundtrip('SeqOpt2Exp', #'SeqOpt2Exp'{seq2=#'SeqIn'{boolIn=true,intIn=66},
+					  bool2=true,int2=15}),
+    roundtrip('SeqOpt2Exp', #'SeqOpt2Exp'{seq2=asn1_NOVALUE,
+					  bool2=true,int2=15}),
+    roundtrip('SeqOpt3Exp', #'SeqOpt3Exp'{bool3=true,
+					  seq3=#'SeqIn'{boolIn=true,intIn=66},
+					  int3=15}),
+    roundtrip('SeqOpt3Exp', #'SeqOpt3Exp'{bool3=asn1_NOVALUE,
+					  seq3=asn1_NOVALUE,int3=15}),
+    roundtrip('SeqChoOpt', #'SeqChoOpt'{int=15,cho={boolC,true}}),
+    roundtrip('SeqChoOpt', #'SeqChoOpt'{int=15,cho=asn1_NOVALUE}),
     ok.
+
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('SeqOptional', Type, Value).
diff --git a/lib/asn1/test/testSeqPrim.erl b/lib/asn1/test/testSeqPrim.erl
index c2451a7cd1..7f3ef86ac5 100644
--- a/lib/asn1/test/testSeqPrim.erl
+++ b/lib/asn1/test/testSeqPrim.erl
@@ -25,60 +25,21 @@
 
 -record('Seq',{bool, boolCon, boolPri, boolApp, boolExpCon, boolExpPri, boolExpApp}).
 -record('Empty',{}).
+-record('Big', {os1,os2,os3}).
 
 main(_Rules) ->
-    
-    
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqPrim','Seq',#'Seq'{bool = true,
-					       boolCon = true,
-					       boolPri = true,
-					       boolApp = true,
-					       boolExpCon = true,
-					       boolExpPri = true,
-					       boolExpApp = true}),
-    ?line {ok,{'Seq',true,true,true,true,true,true,true}} = 
-	asn1_wrapper:decode('SeqPrim','Seq',lists:flatten(Bytes11)),
-    
-    
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqPrim','Seq',#'Seq'{bool = false,
-					       boolCon = false,
-					       boolPri = false,
-					       boolApp = false,
-					       boolExpCon = false,
-					       boolExpPri = false,
-					       boolExpApp = false}),
-    ?line {ok,{'Seq',false,false,false,false,false,false,false}} = 
-	asn1_wrapper:decode('SeqPrim','Seq',lists:flatten(Bytes12)),
-    
-    
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqPrim','Seq',#'Seq'{bool = false,
-					       boolCon = true,
-					       boolPri = false,
-					       boolApp = true,
-					       boolExpCon = false,
-					       boolExpPri = true,
-					       boolExpApp = false}),
-    ?line {ok,{'Seq',false,true,false,true,false,true,false}} = 
-	asn1_wrapper:decode('SeqPrim','Seq',lists:flatten(Bytes13)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqPrim','Empty',#'Empty'{}),
-    ?line {ok,{'Empty'}} = 
-	asn1_wrapper:decode('SeqPrim','Empty',lists:flatten(Bytes21)),
-
-
-
+    roundtrip('Seq', #'Seq'{bool=true,boolCon=true,boolPri=true,boolApp=true,
+			    boolExpCon=true,boolExpPri=true,boolExpApp=true}),
+    roundtrip('Seq', #'Seq'{bool=false,boolCon=false,boolPri=false,
+			    boolApp=false,boolExpCon=false,
+			    boolExpPri=false,boolExpApp=false}),
+    roundtrip('Seq', #'Seq'{bool=false,boolCon=true,boolPri=false,boolApp=true,
+			    boolExpCon=false,boolExpPri=true,boolExpApp=false}),
+    roundtrip('Empty', #'Empty'{}),
+    roundtrip('Big', #'Big'{os1=list_to_binary(lists:duplicate(120, 16#A5)),
+			    os2=list_to_binary(lists:duplicate(128, 16#A7)),
+			    os3=list_to_binary(lists:duplicate(17777, 16#F5))}),
     ok.
 
+roundtrip(Type, Value) ->
+    asn1_test_lib:roundtrip('SeqPrim', Type, Value).
diff --git a/lib/asn1/test/testSeqSetDefaultVal.erl b/lib/asn1/test/testSeqSetDefaultVal.erl
index bd6c9428e2..79992a0a94 100644
--- a/lib/asn1/test/testSeqSetDefaultVal.erl
+++ b/lib/asn1/test/testSeqSetDefaultVal.erl
@@ -18,10 +18,9 @@
 %%
 %%
 -module(testSeqSetDefaultVal).
+-export([main/2]).
 
 -include("External.hrl").
--export([main/1]).
-
 -include_lib("test_server/include/test_server.hrl").
 
 -record('SeqInts',{a = asn1_DEFAULT, 
@@ -35,7 +34,8 @@
 -record('SeqBS',{a = asn1_DEFAULT, 
 		 b = asn1_DEFAULT, 
 		 c = asn1_DEFAULT,
-		 d = asn1_DEFAULT}).
+		 d = asn1_DEFAULT,
+		 e = asn1_DEFAULT}).
 -record('SetBS',{a = asn1_DEFAULT, 
 		 b = asn1_DEFAULT, 
 		 c = asn1_DEFAULT,
@@ -94,243 +94,361 @@
 -record('S4_b',{ba = asn1_DEFAULT, 
 		bb = asn1_DEFAULT}).
 
-main(_Rules) ->
-    
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','SeqInts',#'SeqInts'{}),
-    ?line {ok,[48,0]} =
-	asn1_wrapper:encode('Default','SeqInts',#'SeqInts'{a=1,b=-1,c=three,
-							   d=1}),
-    ?line {ok,{'SeqInts',1,-1,3,1}} = 
-	asn1_wrapper:decode('Default','SeqInts',[48,0]),
-    
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','SetInts',#'SetInts'{}),
-    ?line {ok,[49,0]} =
-	asn1_wrapper:encode('Default','SetInts',#'SetInts'{a=1,b=-1,c=three,
-							   d=1}),
-    ?line {ok,{'SetInts',1,-1,3,1}} = 
-	asn1_wrapper:decode('Default','SetInts',[49,0]),
-    
-    
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','SeqBS',
-			    #'SeqBS'{a=2#1010110,
-				     b=16#A8A,
-				     c=[second],
-				     d=[1,0,0,1]}),
-
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','SeqBS',
-			    #'SeqBS'{a=[1,0,1,0,1,1,0],
-				     b=[1,0,1,0,1,0,0,0,1,0,1,0],
-				     c={5,<<64>>},
-				     d=9}),
-
-    ?line {ok,[48,3,131,1,0]} = 
-	asn1_wrapper:encode('Default','SeqBS',
-			    #'SeqBS'{a=[1,0,1,0,1,1,0],
-				     b=[1,0,1,0,1,0,0,0,1,0,1,0],
-				     c={5,<<64>>},
-				     d=0}),
-
-    {ok,{'SeqBS',[1,0,1,0,1,1,0],2698,[second],<<>>}} =
-	asn1_wrapper:decode('Default','SeqBS',[48,3,131,1,0]),
-
-    ?line {ok,{'SeqBS',[1,0,1,0,1,1,0],2698,[second],[1,0,0,1]}} =
-	asn1_wrapper:decode('Default','SeqBS',[48,0]),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','SetBS',
-			    #'SetBS'{a=2#1010110,
-				     b=16#A8A,
-				     c=[second],
-				     d=[1,0,0,1]}),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','SetBS',
-			    #'SetBS'{a=[1,0,1,0,1,1,0],
-				     b=[1,0,1,0,1,0,0,0,1,0,1,0],
-				     c={5,<<64>>},
-				     d=9}),
-
-    ?line {ok,[49,3,131,1,0]} = 
-	asn1_wrapper:encode('Default','SetBS',
-			    #'SetBS'{a=[1,0,1,0,1,1,0],
-				     b=[1,0,1,0,1,0,0,0,1,0,1,0],
-				     c={5,<<64>>},
-				     d=0}),
-
-    {ok,{'SetBS',[1,0,1,0,1,1,0],2698,[second],<<>>}} =
-	asn1_wrapper:decode('Default','SetBS',[49,3,131,1,0]),
-
-    ?line {ok,{'SetBS',[1,0,1,0,1,1,0],2698,[second],[1,0,0,1]}} =
-	asn1_wrapper:decode('Default','SetBS',[49,0]),
-
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','SeqOS',
-			    #'SeqOS'{a=[172],
-				     b=[16#A8,16#A0],
-				     c='NULL'}),
-
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','SeqOS',
-			    #'SeqOS'{a=2#10101100,
-				     b=16#A8A0,
-				     c='NULL'}),
-
-    ?line {ok,{'SeqOS',[172],[16#A8,16#A0],'NULL'}} =
-	asn1_wrapper:decode('Default','SeqOS',[48,0]),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','SetOS',
-			    #'SetOS'{a=[172],
-				     b=[16#A8,16#A0],
-				     c='NULL'}),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','SetOS',
-			    #'SetOS'{a=2#10101100,
-				     b=16#A8A0,
-				     c='NULL'}),
-
-    ?line {ok,{'SetOS',[172],[16#A8,16#A0],'NULL'}} =
-	asn1_wrapper:decode('Default','SetOS',[49,0]),
-
-    ?line {ok,[48,0]} =
-	asn1_wrapper:encode('Default','SeqOI',
-			    #'SeqOI'{a={1,2,14,15},
-				     b={iso,'member-body',250,3,4},
-				     c={iso,standard,8571,2,250,4}}),
-    
-    ?line {ok,{'SeqOI',{1,2,14,15},{1,2,250,3,4},{1,0,8571,2,250,4}}} =
-	asn1_wrapper:decode('Default','SeqOI',[48,0]),
-
-    ?line {ok,[49,0]} =
-	asn1_wrapper:encode('Default','SetOI',
-			    #'SetOI'{a={1,2,14,15},
-				     b={iso,'member-body',250,3,4},
-				     c={iso,standard,8571,2,250,4}}),
-    
-    ?line {ok,{'SetOI',{1,2,14,15},{1,2,250,3,4},{1,0,8571,2,250,4}}} =
-	asn1_wrapper:decode('Default','SetOI',[49,0]),
-    
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','SeqEnum',#'SeqEnum'{a=b4,b=b2}),
-
-    ?line {ok,{'SeqEnum',b4,b2}} =
-	asn1_wrapper:decode('Default','SeqEnum',[48,0]),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','SetEnum',#'SetEnum'{a=b4,b=b2}),
-
-    ?line {ok,{'SetEnum',b4,b2}} =
-	asn1_wrapper:decode('Default','SetEnum',[49,0]),
-    
-    ?line {ok,[48,0]} =
-	asn1_wrapper:encode('Default','SeqIntBool',
-			    #'SeqIntBool'{a=#'SeqIntBool_a'{aa=12,ab=13},
-					  b=#'S2'{a=14,b=true},
-					  c=#'S2'{a=15,b=false}}),
-    
-    ?line {ok,[48,0]} =
-	asn1_wrapper:encode('Default','SeqIntBool',
-			    #'SeqIntBool'{}),
-
-    ?line {ok,{'SeqIntBool',{'SeqIntBool_a',12,13},
-	       {'S2',14,true},{'S2',15,false}}} =
-	asn1_wrapper:decode('Default','SeqIntBool',[48,0]),
-
-    ?line {ok,[49,0]} =
-	asn1_wrapper:encode('Default','SetIntBool',
-			    #'SetIntBool'{a=#'SetIntBool_a'{aa=12,ab=13},
-					  b=#'S2'{a=14,b=true},
-					  c=#'S2'{a=15,b=false}}),
-    
-    ?line {ok,[49,0]} =
-	asn1_wrapper:encode('Default','SetIntBool',
-			    #'SetIntBool'{}),
-
-    ?line {ok,{'SetIntBool',{'SetIntBool_a',12,13},
-	       {'S2',14,true},{'S2',15,false}}} =
-	asn1_wrapper:decode('Default','SetIntBool',[49,0]),
-    
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','SeqStrings',
-			    #'SeqStrings'{a="123456789",
-					  b1="abcdef",
-					  b2={0,13},
-					  b3={"First line",{0,13},"Second line"},
-					  c="Printable string",
-					  d={0,0,1,14}}),
- 
-    ?line {ok,{'SeqStrings',"123456789","abcdef",[0,13],
-	       ["First line",[0,13],"Second line"],"Printable string",
-	       [0,0,1,14]}} = 
-	asn1_wrapper:decode('Default','SeqStrings',[48,0]),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','SetStrings',
-			    #'SetStrings'{a="123456789",
-					  b1="abcdef",
-					  b2={0,13},
-					  b3={"First line",{0,13},"Second line"},
-					  c="Printable string",
-					  d={0,0,1,14}}),
- 
-    ?line {ok,{'SetStrings',"123456789","abcdef",[0,13],
-	       ["First line",[0,13],"Second line"],"Printable string",
-	       [0,0,1,14]}} = 
-	asn1_wrapper:decode('Default','SetStrings',[49,0]),
-
-
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','S1',
-			    #'S1'{a=#'S1_a'{aa=1,
-					    ab=#'S2'{a=2,b=true}},
-				  b=#'S4'{a=#'S2'{a=2,b=true},
-					  b=#'S4_b'{ba=true,
-						    bb=5}}}),
-
-    ?line {ok,{'S1',{'S1_a',1,{'S2',2,true}},
-	       {'S4',{'S2',2,true},{'S4_b',true,5}}}} =
-	asn1_wrapper:decode('Default','S1',[48,0]),
-
-    ?line {ok,[48,3,129,1,255]} =
-	asn1_wrapper:encode('Default','S2',
-			    #'S2'{a=1,b=true}),
-
-    ?line {ok,[48,0]} =
-	asn1_wrapper:encode('Default','S3',
-			    #'S3'{a=[11,12,13],
-				  b=[{a,11},{b,true},{c,13}],
-				  c=[1,2,3,4],
-				  d=[#'S2'{a=20,b=true},#'S2'{a=30,b=false}]}),
-
-    ?line {ok,[48,0]} =
-	asn1_wrapper:encode('Default','S3',
-			    #'S3'{a=[11,13,12],
-				  b=[{b,true},{a,11},{c,13}],
-				  c=[3,4,1,2],
-				  d=[#'S2'{a=30,b=false},#'S2'{a=20,b=true}]}),
-
-    ?line {ok,[48,0]} = asn1_wrapper:encode('Default','S3',#'S3'{}),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','S3set',
-			    #'S3set'{a=[{c,#'S2'{a=3,b=true}},
-					{b,17},{a,false}],
-				     b=[1,2,3,4]}),
-
-    ?line {ok,[49,0]} = 
-	asn1_wrapper:encode('Default','S3set',
-			    #'S3set'{a=[{b,17},{c,#'S2'{a=3,b=true}},
-					{a,false}],
-				     b=[1,3,4,2]}),
-
-    ?line {ok,[49,0]} = asn1_wrapper:encode('Default','S3set',#'S3set'{}),
-    
-    ?line {ok,[48,0]} = 
-	asn1_wrapper:encode('Default','S4',#'S4'{a={'S2',1,asn1_NOVALUE},
-						 b=#'S4_b'{ba=true,bb=0}}),
+main(ber, []) ->
+    %% Nothing to test because plain BER will only use
+    %% default values when explicitly told to do so by
+    %% asn1_DEFAULT.
+    ok;
+main(Rule, Opts) ->
+    %% DER, PER, UPER. These encodings should not encode
+    %% values that are equal to the default value.
+
+    case {Rule,Opts} of
+	{ber,[der]} ->
+	    der();
+	{_,_} ->
+	    ok
+    end,
+
+    Ts = [{#'SeqInts'{},
+	   [{#'SeqInts'.c,
+	     [asn1_DEFAULT,
+	      three,
+	      3]}]},
+
+	  {#'SeqBS'{},
+	   [{#'SeqBS'.a,
+	     [asn1_DEFAULT,
+	      2#0110101,
+	      [1,0,1,0,1,1,0],
+	      {1,<<16#AC>>},
+	      <<1:1,0:1,1:1,0:1,1:1,1:1,0:1>>]},
+	    {#'SeqBS'.b,
+	     [asn1_DEFAULT,
+	      2#10100010101,
+	      [1,0,1,0,1,0,0,0,1,0,1,0],
+	      {4,<<16#A8,16#A0>>},
+	      <<16#A8:8,16#A:4>>]},
+	    {#'SeqBS'.c,
+	     [asn1_DEFAULT,
+	      [second],
+	      [0,1],
+	      {6,<<0:1,1:1,0:6>>},
+	      <<1:2>>]},
+	    {#'SeqBS'.c,			%Zeroes on the right
+	     [asn1_DEFAULT,
+	      [second],
+	      [0,1,0,0,0],
+	      {4,<<0:1,1:1,0:6>>},
+	      <<1:2,0:17>>]},
+	    {#'SeqBS'.d,
+	     [asn1_DEFAULT,
+	      2#1001,
+	      [1,0,0,1],
+	      {4,<<2#1001:4,0:4>>},
+	      <<2#1001:4>>]},
+	    {#'SeqBS'.e,
+	     [asn1_DEFAULT,
+	      [0,1,0,1,1,0,1,0],
+	      {0,<<2#01011010:8>>},
+	      <<2#01011010:8>>]},
+	    %% Not EQUAL to DEFAULT.
+	    {#'SeqBS'.b,
+	     [[1,1,0],				%Not equal to DEFAULT
+	      {5,<<6:3,0:5>>},
+	      <<6:3>>]}
+	   ]},
+
+	  {#'SeqOS'{},
+	   [{#'SeqOS'.a,
+	     [asn1_DEFAULT,
+	      <<172>>]}]},
+
+	  {#'SeqOI'{},
+	   [{#'SeqOI'.a,
+	     [asn1_DEFAULT,
+	      {1,2,14,15}]},
+	    {#'SeqOI'.b,
+	     [asn1_DEFAULT,
+%%	      {iso,'member-body',250,3,4},
+	      {1,2,250,3,4}]},
+	    {#'SeqOI'.c,
+	     [asn1_DEFAULT,
+%%	      {iso,standard,8571,2,250,4},
+	      {1,0,8571,2,250,4}]}]}
+	 ],
+    io:format("~p\n", [Ts]),
+    R0 = [[consistency(Rec, Pos, Vs) || {Pos,Vs} <- Fs] || {Rec,Fs} <- Ts],
+    case lists:flatten(R0) of
+	[] ->
+	    ok;
+	[_|_]=R ->
+	    io:format("~p\n", [R]),
+	    ?t:fail()
+    end.
+
+consistency(Rec0, Pos, [V|Vs]) ->
+    T = element(1, Rec0),
+    Rec = setelement(Pos, Rec0, V),
+    {ok,Enc} = 'Default':encode(T, Rec),
+    {ok,_SmokeTest} = 'Default':decode(T, Enc),
+    consistency_1(Vs, Rec0, Pos, Enc).
+
+consistency_1([V|Vs], Rec0, Pos, Enc) ->
+    Rec = setelement(Pos, Rec0, V),
+    case 'Default':encode(element(1, Rec), Rec) of
+	{ok,Enc} ->
+	    consistency_1(Vs, Rec0, Pos, Enc);
+	{ok,WrongEnc} ->
+	    [{Rec,{wrong,WrongEnc},{should_be,Enc}}|
+	     consistency_1(Vs, Rec0, Pos, Enc)]
+    end;
+consistency_1([], _, _, _) -> [].
+
+der() ->
+    io:put_chars("Peforming DER-specific tests..."),
+    roundtrip(<<48,0>>,
+	      'SeqInts',
+	      #'SeqInts'{a=asn1_DEFAULT,b=asn1_DEFAULT,
+			 c=asn1_DEFAULT,d=asn1_DEFAULT},
+	      #'SeqInts'{a=1,b=-1,c=3,d=1}),
+    roundtrip(<<48,0>>,
+	      'SeqInts',
+	      #'SeqInts'{a=1,b=-1,c=three,d=1},
+	      #'SeqInts'{a=1,b=-1,c=3,d=1}),
+
+    roundtrip(<<49,0>>,
+	      'SetInts',
+	      #'SetInts'{a=asn1_DEFAULT,b=asn1_DEFAULT,
+			 c=asn1_DEFAULT,d=asn1_DEFAULT},
+	      #'SetInts'{a=1,b=-1,c=3,d=1}),
+    roundtrip(<<49,0>>,
+	      'SetInts',
+	      #'SetInts'{a=1,b=-1,c=three,d=1},
+	      #'SetInts'{a=1,b=-1,c=3,d=1}),
+
+
+    roundtrip(<<48,0>>,
+	      'SeqBS',
+	      #'SeqBS'{a=2#0110101,
+		       b=2#010100010101,
+		       c=[second],
+		       d=[1,0,0,1]},
+	      #'SeqBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<2#1001:4>>,
+		       e = <<2#01011010:8>>}),
+    roundtrip(<<48,0>>,
+	      'SeqBS',
+	      #'SeqBS'{a=[1,0,1,0,1,1,0],
+		       b=[1,0,1,0,1,0,0,0,1,0,1,0],
+		       c={5,<<64>>},
+		       d=2#1001},
+	      #'SeqBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<2#1001:4>>,
+		       e = <<2#01011010:8>>}),
+    roundtrip(<<48,3,131,1,0>>,
+	      'SeqBS',
+	      #'SeqBS'{a=[1,0,1,0,1,1,0],
+		       b=[1,0,1,0,1,0,0,0,1,0,1,0],
+		       c={5,<<64>>},
+		       d=0},
+	      #'SeqBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<>>,
+		       e = <<2#01011010:8>>}),
+    roundtrip(<<48,3,131,1,0>>,
+	      'SeqBS',
+	      #'SeqBS'{a = <<1:1,0:1,1:1,0:1,1:1,1:1,0:1>>,
+		       b = <<1:1,0:1,1:1,0:1,1:1,0:1,0:1,0:1,1:1,0:1,1:1,0:1>>,
+		       c = <<2:3>>,
+		       d=0,
+		       e = <<16#5A:8>>},
+	      #'SeqBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<>>,
+		       e = <<2#01011010:8>>}),
+
+    %% None of the default values are used.
+    roundtrip(<<48,19,128,2,7,128,129,2,5,64,130,2,5,32,131,1,0,132,2,5,224>>,
+	      'SeqBS',
+	      #'SeqBS'{a = <<1:1>>,
+		       b = {5,<<64>>},
+		       c = [third],
+		       d = 0,
+		       e = <<7:3>>},
+	      #'SeqBS'{a = <<1:1>>,
+		       b = <<2:3>>,
+		       c = [third],
+		       d = <<>>,
+		       e = <<7:3>>}),
+
+    roundtrip(<<49,0>>,
+	      'SetBS',
+	      #'SetBS'{a=2#0110101,
+		       b=2#010100010101,
+		       c=[second],
+		       d=[1,0,0,1]},
+	      #'SetBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<2#1001:4>>}),
+    roundtrip(<<49,0>>,
+	      'SetBS',
+	      #'SetBS'{a=[1,0,1,0,1,1,0],
+		       b=[1,0,1,0,1,0,0,0,1,0,1,0],
+		       c={5,<<64>>},
+		       d=9},
+	      #'SetBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<2#1001:4>>}),
+    roundtrip(<<49,3,131,1,0>>,
+	      'SetBS',
+	      #'SetBS'{a=[1,0,1,0,1,1,0],
+		       b=[1,0,1,0,1,0,0,0,1,0,1,0],
+		       c={5,<<64>>},
+		       d=0},
+	      #'SetBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<>>}),
+    roundtrip(<<49,3,131,1,0>>,
+	      'SetBS',
+	      #'SetBS'{a = <<1:1,0:1,1:1,0:1,1:1,1:1,0:1>>,
+		       b = <<1:1,0:1,1:1,0:1,1:1,0:1,0:1,0:1,1:1,0:1,1:1,0:1>>,
+		       c = <<2:3>>,
+		       d=0},
+	      #'SetBS'{a = <<2#1010110:7>>, b = <<16#A8A:12>>,
+		       c=[second], d = <<>>}),
+
+    roundtrip(<<48,0>>, 'SeqOS',
+	      #'SeqOS'{a = <<172>>,b = <<16#A8,16#A0>>,c='NULL'}),
+
+    roundtrip(<<49,0>>, 'SetOS',
+	      #'SetOS'{a = <<172>>,b = <<16#A8,16#A0>>,c='NULL'}),
+
+    roundtrip(<<48,0>>,
+	      'SeqOI',
+	      #'SeqOI'{a={1,2,14,15},
+		       b={iso,'member-body',250,3,4},
+		       c={iso,standard,8571,2,250,4}},
+	      #'SeqOI'{a={1,2,14,15},
+		       b={1,2,250,3,4},
+		       c={1,0,8571,2,250,4}}),
+
+    roundtrip(<<49,0>>,
+	      'SetOI',
+	      #'SetOI'{a={1,2,14,15},
+		       b={iso,'member-body',250,3,4},
+		       c={iso,standard,8571,2,250,4}},
+	      #'SetOI'{a={1,2,14,15},
+		       b={1,2,250,3,4},
+		       c={1,0,8571,2,250,4}}),
+
+    roundtrip(<<48,0>>, 'SeqEnum', #'SeqEnum'{a=b4,b=b2}),
+    roundtrip(<<49,0>>, 'SetEnum', #'SetEnum'{a=b4,b=b2}),
+
+    roundtrip(<<48,0>>,
+	      'SeqIntBool',
+	      #'SeqIntBool'{a=#'SeqIntBool_a'{aa=12,ab=13},
+			    b=#'S2'{a=14,b=true},
+			    c=#'S2'{a=15,b=false}}),
+    roundtrip(<<48,0>>,
+	      'SeqIntBool',
+	      #'SeqIntBool'{a=asn1_DEFAULT,b=asn1_DEFAULT,c=asn1_DEFAULT},
+	      #'SeqIntBool'{a=#'SeqIntBool_a'{aa=12,ab=13},
+			    b=#'S2'{a=14,b=true},
+			    c=#'S2'{a=15,b=false}}),
+
+    roundtrip(<<49,0>>,
+	      'SetIntBool',
+	      #'SetIntBool'{a=#'SetIntBool_a'{aa=12,ab=13},
+			    b=#'S2'{a=14,b=true},
+			    c=#'S2'{a=15,b=false}}),
+    roundtrip(<<49,0>>,
+	      'SetIntBool',
+	      #'SetIntBool'{a=asn1_DEFAULT,b=asn1_DEFAULT,c=asn1_DEFAULT},
+	      #'SetIntBool'{a=#'SetIntBool_a'{aa=12,ab=13},
+			    b=#'S2'{a=14,b=true},
+			    c=#'S2'{a=15,b=false}}),
+
+    roundtrip(<<48,0>>,
+	      'SeqStrings',
+	      #'SeqStrings'{a="123456789",b1="abcdef",
+			    b2={0,13},
+			    b3={"First line",{0,13},"Second line"},
+			    c="Printable string",
+			    d={0,0,1,14}},
+	      #'SeqStrings'{a="123456789",b1="abcdef",
+			    b2=[0,13],
+			    b3=["First line",[0,13],"Second line"],
+			    c="Printable string",
+			    d=[0,0,1,14]}),
+
+    roundtrip(<<49,0>>,
+	      'SetStrings',
+	      #'SetStrings'{a="123456789",b1="abcdef",
+			    b2={0,13},
+			    b3={"First line",{0,13},"Second line"},
+			    c="Printable string",
+			    d={0,0,1,14}},
+	      #'SetStrings'{a="123456789",b1="abcdef",
+			    b2=[0,13],
+			    b3=["First line",[0,13],"Second line"],
+			    c="Printable string",
+			    d=[0,0,1,14]}),
+
+    roundtrip(<<48,0>>,
+	      'S1',
+	      #'S1'{a=#'S1_a'{aa=1,ab=#'S2'{a=2,b=true}},
+		    b=#'S4'{a=#'S2'{a=2,b=true},b=#'S4_b'{ba=true,bb=5}}}),
+
+    roundtrip(<<48,3,129,1,255>>, 'S2', #'S2'{a=1,b=true}),
+
+    roundtrip(<<48,0>>,
+	      'S3',
+	      #'S3'{a="\v\f\r",
+		    b=[{a,11},{b,true},{c,13}],
+		    c=[1,2,3,4],
+		    d=[#'S2'{a=20,b=true},#'S2'{a=30,b=false}]}),
+    roundtrip(<<48,0>>,
+	      'S3',
+	      #'S3'{a=[11,13,12],
+		    b=[{b,true},{a,11},{c,13}],
+		    c=[3,4,1,2],
+		    d=[#'S2'{a=30,b=false},#'S2'{a=20,b=true}]},
+	      #'S3'{a=[11,12,13],
+		    b=[{a,11},{b,true},{c,13}],
+		    c=[1,2,3,4],
+		    d=[#'S2'{a=20,b=true},#'S2'{a=30,b=false}]}),
+    roundtrip(<<48,0>>,
+	      'S3',
+	      #'S3'{a=asn1_DEFAULT,b=asn1_DEFAULT,
+		    c=asn1_DEFAULT,d=asn1_DEFAULT},
+	      #'S3'{a=[11,12,13],
+		    b=[{a,11},{b,true},{c,13}],
+		    c=[1,2,3,4],
+		    d=[#'S2'{a=20,b=true},#'S2'{a=30,b=false}]}),
+
+    roundtrip(<<49,0>>,
+	      'S3set',
+	      #'S3set'{a=[{c,#'S2'{a=3,b=true}},{b,17},{a,false}],
+		       b=[1,2,3,4]}),
+    roundtrip(<<49,0>>,
+	      'S3set',
+	      #'S3set'{a=[{b,17},{c,#'S2'{a=3,b=true}},{a,false}],
+		       b=[1,3,4,2]},
+	      #'S3set'{a=[{c,#'S2'{a=3,b=true}},{b,17},{a,false}],
+		       b=[1,2,3,4]}),
+    roundtrip(<<49,0>>,
+	      'S3set',
+	      #'S3set'{a=asn1_DEFAULT,b=asn1_DEFAULT},
+	      #'S3set'{a=[{c,#'S2'{a=3,b=true}},{b,17},{a,false}],
+		       b=[1,2,3,4]}),
+
+    roundtrip(<<48,0>>,
+	      'S4',
+	      #'S4'{a=#'S2'{a=1,b=asn1_NOVALUE},b=#'S4_b'{ba=true,bb=0}},
+	      #'S4'{a=#'S2'{a=1,b=asn1_NOVALUE},b=#'S4_b'{ba=true,bb=0}}),
+
+    ok.
+
+roundtrip(Encoded, Type, Value) ->
+    roundtrip(Encoded, Type, Value, Value).
+
+roundtrip(Encoded, Type, Value, ExpectedValue) ->
+    Encoded = asn1_test_lib:roundtrip_enc('Default', Type,
+					  Value, ExpectedValue),
     ok.
diff --git a/lib/asn1/test/testSeqSetIndefinite.erl b/lib/asn1/test/testSeqSetIndefinite.erl
new file mode 100644
index 0000000000..6becf84e77
--- /dev/null
+++ b/lib/asn1/test/testSeqSetIndefinite.erl
@@ -0,0 +1,52 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(testSeqSetIndefinite).
+-export([main/0]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+main() ->
+    seq_indefinite(),
+    set_indefinite().
+
+seq_indefinite() ->
+    %% normal encoding
+    B = <<48,20,1,1,255,48,9,1,1,255,2,4,251,35,238,194,2,4,251,55,236,161>>,
+    %% indefinite length encoding
+    Bi = <<48,22,1,1,255,48,128,1,1,255,2,4,251,35,238,194,0,0,2,4,251,55,236,161>>,
+    %% the value which is encoded
+    V = {'SeqS3',true,{'SeqS3_seqS3',true,-81531198},-80221023},
+    {ok,V} = 'SeqSetIndefinite':decode('SeqS3', B),
+    {ok,V} = 'SeqSetIndefinite':decode('SeqS3', Bi),
+
+    ok.
+
+set_indefinite() ->
+    %% normal encoding
+    B = <<49,20,1,1,255,49,9,1,1,255,2,4,251,35,238,194,2,4,251,55,236,161>>,
+    %% indefinite length encoding
+    Bi = <<49,22,1,1,255,49,128,1,1,255,2,4,251,35,238,194,0,0,2,4,251,55,236,161>>,
+
+    %% the value which is encoded
+    V = {'SetS3',true,{'SetS3_setS3',true,-81531198},-80221023},
+    {ok,V} = 'SeqSetIndefinite':decode('SetS3', B),
+    {ok,V} = 'SeqSetIndefinite':decode('SetS3', Bi),
+
+    ok.
diff --git a/lib/asn1/test/testSeqTag.erl b/lib/asn1/test/testSeqTag.erl
index 9fdaae35dd..6bacca6808 100644
--- a/lib/asn1/test/testSeqTag.erl
+++ b/lib/asn1/test/testSeqTag.erl
@@ -35,69 +35,25 @@
 -record('Exp',{os, bool}).
 
 main(_Rules) ->
-    
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqTag','SeqTag',#'SeqTag'{nt = #'NT'{bool = true, os = "kalle"},
-						  imp = #'Imp'{bool = true, os = "kalle"},
-						  exp = #'Exp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SeqTag',{'NT',"kalle",true},{'Imp',"kalle",true},{'Exp',"kalle",true}}} = 
-	asn1_wrapper:decode('SeqTag','SeqTag',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqTag','SeqTagImp',#'SeqTagImp'{nt = #'NT'{bool = true, os = "kalle"},
-							imp = #'Imp'{bool = true, os = "kalle"},
-							exp = #'Exp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SeqTagImp',{'NT',"kalle",true},{'Imp',"kalle",true},{'Exp',"kalle",true}}} = 
-	asn1_wrapper:decode('SeqTag','SeqTagImp',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqTag','SeqTagExp',#'SeqTagExp'{nt = #'NT'{bool = true, os = "kalle"},
-							imp = #'Imp'{bool = true, os = "kalle"},
-							exp = #'Exp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SeqTagExp',{'NT',"kalle",true},{'Imp',"kalle",true},{'Exp',"kalle",true}}} = 
-	asn1_wrapper:decode('SeqTag','SeqTagExp',lists:flatten(Bytes13)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqTag','SeqTagX',
-		      #'SeqTagX'{xnt = #'XSeqNT'{bool = true, os = "kalle"},
-				 ximp = #'XSeqImp'{bool = true, os = "kalle"},
-				 xexp = #'XSeqExp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SeqTagX',{'XSeqNT',"kalle",true},
-	       {'XSeqImp',"kalle",true},
-	       {'XSeqExp',"kalle",true}}} = 
-	asn1_wrapper:decode('SeqTag','SeqTagX',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqTag','SeqTagImpX',
-		      #'SeqTagImpX'{xnt = #'XSeqNT'{bool = true, os = "kalle"},
-				    ximp = #'XSeqImp'{bool = true, os = "kalle"},
-				    xexp = #'XSeqExp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SeqTagImpX',{'XSeqNT',"kalle",true},
-	       {'XSeqImp',"kalle",true},
-	       {'XSeqExp',"kalle",true}}} = 
-	asn1_wrapper:decode('SeqTag','SeqTagImpX',lists:flatten(Bytes22)),
-    
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SeqTag','SeqTagExpX',
-		      #'SeqTagExpX'{xnt = #'XSeqNT'{bool = true, os = "kalle"},
-				    ximp = #'XSeqImp'{bool = true, os = "kalle"},
-				    xexp = #'XSeqExp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SeqTagExpX',{'XSeqNT',"kalle",true},
-	       {'XSeqImp',"kalle",true},
-	       {'XSeqExp',"kalle",true}}} = 
-	asn1_wrapper:decode('SeqTag','SeqTagExpX',lists:flatten(Bytes23)),
-    
-    
-    
-    
-    
+    roundtrip('SeqTag', #'SeqTag'{nt=#'NT'{os = <<"kalle">>,bool=true},
+				  imp=#'Imp'{os = <<"kalle">>,bool=true},
+				  exp=#'Exp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SeqTagImp', #'SeqTagImp'{nt=#'NT'{os = <<"kalle">>,bool=true},
+					imp=#'Imp'{os = <<"kalle">>,bool=true},
+					exp=#'Exp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SeqTagExp', #'SeqTagExp'{nt=#'NT'{os = <<"kalle">>,bool=true},
+					imp=#'Imp'{os = <<"kalle">>,bool=true},
+					exp=#'Exp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SeqTagX', #'SeqTagX'{xnt=#'XSeqNT'{os = <<"kalle">>,bool=true},
+				    ximp=#'XSeqImp'{os = <<"kalle">>,bool=true},
+				    xexp=#'XSeqExp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SeqTagImpX', #'SeqTagImpX'{xnt=#'XSeqNT'{os = <<"kalle">>,bool=true},
+					  ximp=#'XSeqImp'{os = <<"kalle">>,bool=true},
+					  xexp=#'XSeqExp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SeqTagExpX', #'SeqTagExpX'{xnt=#'XSeqNT'{os = <<"kalle">>,bool=true},
+					  ximp=#'XSeqImp'{os = <<"kalle">>,bool=true},
+					  xexp=#'XSeqExp'{os = <<"kalle">>,bool=true}}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqTag', T, V).
diff --git a/lib/asn1/test/testSeqTypeRefCho.erl b/lib/asn1/test/testSeqTypeRefCho.erl
index 4b9eac7034..1a921c6f38 100644
--- a/lib/asn1/test/testSeqTypeRefCho.erl
+++ b/lib/asn1/test/testSeqTypeRefCho.erl
@@ -27,17 +27,12 @@
 -record('SeqTRcho',{seqCho, seqChoE, 'seqCho-E', 'seqChoE-E'}).
 
 main(_Rules) ->
-    
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqTypeRefCho','SeqTRcho',
-		      #'SeqTRcho'{'seqCho' = {choOs,"A string 1"},
-				  'seqChoE' = {choOs,"A string 3"},
-				  'seqCho-E' = {choOs,"A string 7"},
-				  'seqChoE-E' = {choOs,"A string 9"}}),
-    ?line {ok,{'SeqTRcho',{choOs,"A string 1"},{choOs,"A string 3"},{choOs,"A string 7"},{choOs,"A string 9"}}} = 
-	asn1_wrapper:decode('SeqTypeRefCho','SeqTRcho',lists:flatten(Bytes11)),
-
-
-
+    roundtrip('SeqTRcho',
+	      #'SeqTRcho'{'seqCho' = {choOs,<<"A string 1">>},
+			  'seqChoE' = {choOs,<<"A string 3">>},
+			  'seqCho-E' = {choOs,<<"A string 7">>},
+			  'seqChoE-E' = {choOs,<<"A string 9">>}}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqTypeRefCho', T, V).
diff --git a/lib/asn1/test/testSeqTypeRefPrim.erl b/lib/asn1/test/testSeqTypeRefPrim.erl
index 7d4c2acc0e..d66d1ebcfe 100644
--- a/lib/asn1/test/testSeqTypeRefPrim.erl
+++ b/lib/asn1/test/testSeqTypeRefPrim.erl
@@ -18,40 +18,24 @@
 %%
 %%
 -module(testSeqTypeRefPrim).
-
--export([compile/3]).
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 -record('SeqTR',{octStr, octStrI, octStrE, 'octStr-I', 'octStrI-I', 'octStrE-I', 'octStr-E', 'octStrI-E', 'octStrE-E'}).
 
-
-compile(Config,Rules,Options) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line ok = asn1ct:compile(DataDir ++ "SeqTypeRefPrim",[Rules,{outdir,OutDir}]++Options).
-
-
-
 main(_Rules) ->
-
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqTypeRefPrim','SeqTR',#'SeqTR'{'octStr' = "A string 1",
-						       'octStrI' = "A string 2",
-						       'octStrE' = "A string 3",
-						       'octStr-I' = "A string 4",
-						       'octStrI-I' = "A string 5",
-						       'octStrE-I' = "A string 6",
-						       'octStr-E' = "A string 7",
-						       'octStrI-E' = "A string 8",
-						       'octStrE-E' = "A string 9"}) ,
-    ?line {ok,{'SeqTR',"A string 1","A string 2","A string 3","A string 4","A string 5","A string 6","A string 7","A string 8","A string 9"}} = 
-	asn1_wrapper:decode('SeqTypeRefPrim','SeqTR',lists:flatten(Bytes11)),
-
-
-
+    roundtrip('SeqTR',
+	      #'SeqTR'{'octStr' = <<"A string 1">>,
+		       'octStrI' = <<"A string 2">>,
+		       'octStrE' = <<"A string 3">>,
+		       'octStr-I' = <<"A string 4">>,
+		       'octStrI-I' = <<"A string 5">>,
+		       'octStrE-I' = <<"A string 6">>,
+		       'octStr-E' = <<"A string 7">>,
+		       'octStrI-E' = <<"A string 8">>,
+		       'octStrE-E' = <<"A string 9">>}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqTypeRefPrim', T, V).
diff --git a/lib/asn1/test/testSeqTypeRefSeq.erl b/lib/asn1/test/testSeqTypeRefSeq.erl
index 57ec6c19b1..3288511f0a 100644
--- a/lib/asn1/test/testSeqTypeRefSeq.erl
+++ b/lib/asn1/test/testSeqTypeRefSeq.erl
@@ -44,133 +44,43 @@
 -record('SeqSeqExp',{seqInt, seqOs}).
 
 
-
 main(_Rules) ->
-    
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','Seq1',#'Seq1'{bool1 = true,
-						     int1 = 15,
-						     seq1 = #'SeqIn'{boolIn = true,
-								     intIn = 66}}), 
-    ?line {ok,{'Seq1',true,15,{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','Seq1',lists:flatten(Bytes11)),
-    
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','Seq2',#'Seq2'{seq2 = #'SeqIn'{boolIn = true,
-								     intIn = 66},
-						     bool2 = true,
-						     int2 = 15}),    
-    ?line {ok,{'Seq2',{'SeqIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','Seq2',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','Seq3',#'Seq3'{bool3 = true,
-						     seq3 = #'SeqIn'{boolIn = true,
-								     intIn = 66},
-						     int3 = 15}),    
-    ?line {ok,{'Seq3',true,{'SeqIn',true,66},15}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','Seq3',lists:flatten(Bytes13)),
-    
-    
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','Seq4',#'Seq4'{seq41 = #'SeqIn'{boolIn = true,
-								      intIn = 66},
-						     seq42 = #'SeqIn'{boolIn = true,
-								      intIn = 66},
-						     seq43 = #'SeqIn'{boolIn = true,
-								      intIn = 66}}),    
-    ?line {ok,{'Seq4',{'SeqIn',true,66},{'SeqIn',true,66},{'SeqIn',true,66}}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','Seq4',lists:flatten(Bytes14)),
-    
-    
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','SeqS1',#'SeqS1'{boolS1 = true,
-						       intS1 = 15,
-						       seqS1 = #'SeqS1_seqS1'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SeqS1',true,15,{'SeqS1_seqS1',true,66}}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','SeqS1',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','SeqS2',#'SeqS2'{seqS2 = #'SeqS2_seqS2'{boolIn = true,
-									      intIn = 66},
-						       boolS2 = true,
-						       intS2 = 15}),    
-    ?line {ok,{'SeqS2',{'SeqS2_seqS2',true,66},true,15}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','SeqS2',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','SeqS3',#'SeqS3'{boolS3 = true,
-						       seqS3 = #'SeqS3_seqS3'{boolIn = true,
-									      intIn = 66},
-						       intS3 = 15}),    
-    ?line {ok,{'SeqS3',true,{'SeqS3_seqS3',true,66},15}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','SeqS3',lists:flatten(Bytes23)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','SeqSTag',#'SeqSTag'{seqS1 = #'SeqSTag_seqS1'{b1 = true,
-										    i1 = 11},
-							   seqS2 = #'SeqSTag_seqS2'{b2 = true,
-										    i2 = 22},
-							   seqS3 = #'SeqSTag_seqS3'{b3 = true,
-										    i3 = 33}}),    
-    ?line {ok,{'SeqSTag',{'SeqSTag_seqS1',true,11},
-	       {'SeqSTag_seqS2',true,22},
-	       {'SeqSTag_seqS3',true,33}}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','SeqSTag',lists:flatten(Bytes31)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqTypeRefSeq','SeqTRseq',
-		      #'SeqTRseq'{'seqSeq' = #'SeqSeq'{seqOs = "A1",
-						       seqInt = 2},
-				  'seqSeqI' = #'SeqSeq'{seqOs = "A2",
-							seqInt = 2},
-				  'seqSeqE' = #'SeqSeq'{seqOs = "A3",
-							seqInt = 2},
-				  'seqSeq-I' = #'SeqSeqImp'{seqOs = "A4",
-							    seqInt = 2},
-				  'seqSeqI-I' = #'SeqSeqImp'{seqOs = "A5",
-							     seqInt = 2},
-				  'seqSeqE-I' = #'SeqSeqImp'{seqOs = "A6",
-							     seqInt = 2},
-				  'seqSeq-E' = #'SeqSeqExp'{seqOs = "A7",
-							    seqInt = 2},
-				  'seqSeqI-E' = #'SeqSeqExp'{seqOs = "A8",
-							     seqInt = 2},
-				  'seqSeqE-E' = #'SeqSeqExp'{seqOs = "A9",
-							     seqInt = 2}}),
-    ?line {ok,{'SeqTRseq',{'SeqSeq',2,"A1"},
-      {'SeqSeq',2,"A2"},
-      {'SeqSeq',2,"A3"},
-      {'SeqSeqImp',2,"A4"},
-      {'SeqSeqImp',2,"A5"},
-      {'SeqSeqImp',2,"A6"},
-      {'SeqSeqExp',2,"A7"},
-      {'SeqSeqExp',2,"A8"},
-      {'SeqSeqExp',2,"A9"}}} = 
-	asn1_wrapper:decode('SeqTypeRefSeq','SeqTRseq',lists:flatten(Bytes41)),
-    
+    roundtrip('Seq1',
+	      #'Seq1'{bool1=true,int1=15,
+		      seq1=#'SeqIn'{boolIn=true,intIn=66}}),
+    roundtrip('Seq2',
+	      #'Seq2'{seq2=#'SeqIn'{boolIn=true,intIn=66},
+		      bool2=true,int2=15}),
+    roundtrip('Seq3',
+	      #'Seq3'{bool3=true,seq3=#'SeqIn'{boolIn=true,intIn=66},int3=15}),
+    roundtrip('Seq4',
+	      #'Seq4'{seq41=#'SeqIn'{boolIn=true,intIn=66},
+		      seq42=#'SeqIn'{boolIn=true,intIn=66},
+		      seq43=#'SeqIn'{boolIn=true,intIn=66}}),
+    roundtrip('SeqS1',
+	      #'SeqS1'{boolS1=true,intS1=15,
+		       seqS1=#'SeqS1_seqS1'{boolIn=true,intIn=66}}),
+    roundtrip('SeqS2',
+	      #'SeqS2'{seqS2=#'SeqS2_seqS2'{boolIn=true,intIn=66},
+		       boolS2=true,intS2=15}),
+    roundtrip('SeqS3',
+	      #'SeqS3'{boolS3=true,seqS3=#'SeqS3_seqS3'{boolIn=true,intIn=66},
+		       intS3=15}),
+    roundtrip('SeqSTag',
+	      #'SeqSTag'{seqS1=#'SeqSTag_seqS1'{b1=true,i1=11},
+			 seqS2=#'SeqSTag_seqS2'{b2=true,i2=22},
+			 seqS3=#'SeqSTag_seqS3'{b3=true,i3=33}}),
+    roundtrip('SeqTRseq',
+	      #'SeqTRseq'{seqSeq=#'SeqSeq'{seqInt=2,seqOs = <<"A1">>},
+			  seqSeqI=#'SeqSeq'{seqInt=2,seqOs = <<"A2">>},
+			  seqSeqE=#'SeqSeq'{seqInt=2,seqOs = <<"A3">>},
+			  'seqSeq-I'=#'SeqSeqImp'{seqInt=2,seqOs = <<"A4">>},
+			  'seqSeqI-I'=#'SeqSeqImp'{seqInt=2,seqOs = <<"A5">>},
+			  'seqSeqE-I'=#'SeqSeqImp'{seqInt=2,seqOs = <<"A6">>},
+			  'seqSeq-E'=#'SeqSeqExp'{seqInt=2,seqOs = <<"A7">>},
+			  'seqSeqI-E'=#'SeqSeqExp'{seqInt=2,seqOs = <<"A8">>},
+			  'seqSeqE-E'=#'SeqSeqExp'{seqInt=2,seqOs = <<"A9">>}}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqTypeRefSeq', T, V).
diff --git a/lib/asn1/test/testSeqTypeRefSet.erl b/lib/asn1/test/testSeqTypeRefSet.erl
index c06a0e7a2b..d73423284b 100644
--- a/lib/asn1/test/testSeqTypeRefSet.erl
+++ b/lib/asn1/test/testSeqTypeRefSet.erl
@@ -31,36 +31,17 @@
 
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SeqTypeRefSet','SeqTRset',
-		      #'SeqTRset'{'seqSet' = #'SeqSet'{setOs = "A1",
-						       setInt = 2},
-				  'seqSetI' = #'SeqSet'{setOs = "A2",
-							setInt = 2},
-				  'seqSetE' = #'SeqSet'{setOs = "A3",
-							setInt = 2},
-				  'seqSet-I' = #'SeqSetImp'{setOs = "A4",
-							    setInt = 2},
-				  'seqSetI-I' = #'SeqSetImp'{setOs = "A5",
-							     setInt = 2},
-				  'seqSetE-I' = #'SeqSetImp'{setOs = "A6",
-							     setInt = 2},
-				  'seqSet-E' = #'SeqSetExp'{setOs = "A7",
-							    setInt = 2},
-				  'seqSetI-E' = #'SeqSetExp'{setOs = "A8",
-							     setInt = 2},
-				  'seqSetE-E' = #'SeqSetExp'{setOs = "A9",
-							     setInt = 2}}),
-    ?line {ok,{'SeqTRset',{'SeqSet',2,"A1"},
-	       {'SeqSet',2,"A2"},
-	       {'SeqSet',2,"A3"},
-	       {'SeqSetImp',2,"A4"},
-	       {'SeqSetImp',2,"A5"},
-	       {'SeqSetImp',2,"A6"},
-	       {'SeqSetExp',2,"A7"},
-	       {'SeqSetExp',2,"A8"},
-	       {'SeqSetExp',2,"A9"}}} = 
-	asn1_wrapper:decode('SeqTypeRefSet','SeqTRset',lists:flatten(Bytes41)),
-    
+    roundtrip('SeqTRset',
+	      #'SeqTRset'{seqSet=#'SeqSet'{setInt=2,setOs = <<"A1">>},
+			  seqSetI=#'SeqSet'{setInt=2,setOs = <<"A2">>},
+			  seqSetE=#'SeqSet'{setInt=2,setOs = <<"A3">>},
+			  'seqSet-I'=#'SeqSetImp'{setInt=2,setOs = <<"A4">>},
+			  'seqSetI-I'=#'SeqSetImp'{setInt=2,setOs = <<"A5">>},
+			  'seqSetE-I'=#'SeqSetImp'{setInt=2,setOs = <<"A6">>},
+			  'seqSet-E'=#'SeqSetExp'{setInt=2,setOs = <<"A7">>},
+			  'seqSetI-E'=#'SeqSetExp'{setInt=2,setOs = <<"A8">>},
+			  'seqSetE-E'=#'SeqSetExp'{setInt=2,setOs = <<"A9">>}}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqTypeRefSet', T, V).
diff --git a/lib/asn1/test/testSetDefault.erl b/lib/asn1/test/testSetDefault.erl
index 8aa205e0f0..055dc6cecf 100644
--- a/lib/asn1/test/testSetDefault.erl
+++ b/lib/asn1/test/testSetDefault.erl
@@ -26,58 +26,34 @@
 -record('SetDef1',{bool1 = asn1_DEFAULT, int1, set1 = asn1_DEFAULT}).
 -record('SetDef2',{set2 = asn1_DEFAULT, bool2, int2}).
 -record('SetDef3',{bool3 = asn1_DEFAULT, set3 = asn1_DEFAULT, int3 = asn1_DEFAULT}).
--record('SetIn',{boolIn, intIn}).
+-record('SetIn', {boolIn = asn1_NOVALUE, intIn = 12}).
 
 
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetDefault','SetDef1',#'SetDef1'{bool1 = true,
-							int1 = 15,
-							set1 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetDef1',true,15,{'SetIn',true,66}}} = 
-	asn1_wrapper:decode('SetDefault','SetDef1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = asn1_wrapper:encode('SetDefault','SetDef1',#'SetDef1'{int1 = 15}), 
-    ?line {ok,{'SetDef1',true,15,{'SetIn',asn1_NOVALUE,12}}} = 
-	asn1_wrapper:decode('SetDefault','SetDef1',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetDefault','SetDef2',#'SetDef2'{bool2 = true,
-							int2 = 15,
-							set2 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetDef2',{'SetIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = asn1_wrapper:encode('SetDefault','SetDef2',#'SetDef2'{bool2 = true,
-									 int2 = 15}), 
-    ?line {ok,{'SetDef2',{'SetIn',asn1_NOVALUE,12},true,15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef2',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetDefault','SetDef3',#'SetDef3'{bool3 = true,
-							int3 = 15,
-							set3 = #'SetIn'{boolIn = true,
-									intIn = 66}}), 
-    ?line {ok,{'SetDef3',true,{'SetIn',true,66},15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = asn1_wrapper:encode('SetDefault','SetDef3',#'SetDef3'{int3 = 15}), 
-    ?line {ok,{'SetDef3',true,{'SetIn',asn1_NOVALUE,12},15}} = 
-	asn1_wrapper:decode('SetDefault','SetDef3',lists:flatten(Bytes32)),
-    
-    
-    
-    
+    roundtrip('SetDef1',
+	      #'SetDef1'{bool1=true,int1=15,
+			 set1=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetDef1',
+	      #'SetDef1'{bool1=asn1_DEFAULT,int1=15,set1=asn1_DEFAULT},
+	      #'SetDef1'{bool1=true,int1=15,set1=#'SetIn'{}}),
 
-    
-    
+    roundtrip('SetDef2',
+	      #'SetDef2'{set2=#'SetIn'{boolIn=true,intIn=66},
+			 bool2=true,int2=15}),
+    roundtrip('SetDef2',
+	      #'SetDef2'{set2=asn1_DEFAULT,bool2=true,int2=15},
+	      #'SetDef2'{set2=#'SetIn'{},bool2=true,int2=15}),
+
+    roundtrip('SetDef3',
+	      #'SetDef3'{bool3=true,set3=#'SetIn'{boolIn=true,intIn=66},
+			 int3=15}),
+    roundtrip('SetDef3',
+	      #'SetDef3'{bool3=asn1_DEFAULT,set3=asn1_DEFAULT,int3=15},
+	      #'SetDef3'{bool3=true,set3=#'SetIn'{},int3=15}),
     ok.
+
+roundtrip(Type, Value) ->
+    roundtrip(Type, Value, Value).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SetDefault', Type, Value, ExpectedValue).
diff --git a/lib/asn1/test/testSetExtension.erl b/lib/asn1/test/testSetExtension.erl
index c7fb3b42c4..4e2463326b 100644
--- a/lib/asn1/test/testSetExtension.erl
+++ b/lib/asn1/test/testSetExtension.erl
@@ -18,10 +18,7 @@
 %%
 %%
 -module(testSetExtension).
-
-
 -include("External.hrl").
--export([compile/3]).
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -31,76 +28,20 @@
 -record('SetExt3',{bool, int}).
 -record('SetExt4',{bool, int}).
 
-
-compile(Config,Rules,Options) ->
-
-    ?line DataDir = ?config(data_dir,Config),
-    ?line OutDir = ?config(priv_dir,Config),
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-    ?line ok = asn1ct:compile(DataDir ++ "SetExtension",
-			      [Rules,{outdir,OutDir}]++Options).
-
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetExtension','SetExt1',#'SetExt1'{}), 
-    ?line {ok,{'SetExt1'}} = 
-	asn1_wrapper:decode('SetExtension','SetExt1',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetExtension','SetExt2',#'SetExt2'{bool = true,int = 99}), 
-    ?line {ok,{'SetExt2',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt2',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetExtension','SetExt2',#'SetExt2'{int = 99,bool = true}), 
-    ?line {ok,{'SetExt2',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt2',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetExtension','SetExt3',#'SetExt3'{bool = true,int = 99}), 
-    ?line {ok,{'SetExt3',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt3',lists:flatten(Bytes31)),
-
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetExtension','SetExt3',#'SetExt3'{int = 99,bool = true}), 
-    ?line {ok,{'SetExt3',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt3',lists:flatten(Bytes32)),
-
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SetExtension','SetExt4',#'SetExt4'{bool = true,int = 99}), 
-    ?line {ok,{'SetExt4',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt4',lists:flatten(Bytes41)),
-
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SetExtension','SetExt4',#'SetExt4'{int = 99,bool = true}), 
-    ?line {ok,{'SetExt4',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt4',lists:flatten(Bytes42)),
-
-
-    %% Test of extension , needs to be improved and extended
-    
-     ?line {ok,BytesX11} = 
-	asn1_wrapper:encode('SetExtension','SetExt1',#'SetExt1'{}), 
-    ?line {ok,{'SetExt1'}} = 
-	asn1_wrapper:decode('SetExtension','SetExt1',lists:flatten(BytesX11)),
-
-    ?line {ok,BytesX21} = 
-	asn1_wrapper:encode('SetExtension','SetExt2',#'SetExt2'{bool = true,int = 99}), 
-    ?line {ok,{'SetExt2',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt2',lists:flatten(BytesX21)),
-
-    ?line {ok,BytesX22} = 
-	asn1_wrapper:encode('SetExtension','SetExt2',#'SetExt2'{int = 99,bool = true}), 
-    ?line {ok,{'SetExt2',true,99}} = 
-	asn1_wrapper:decode('SetExtension','SetExt2',lists:flatten(BytesX22)),
-
-   
-    
-     
-
+    roundtrip('SetExt1', #'SetExt1'{}),
+    roundtrip('SetExt2', #'SetExt2'{bool=true,int=99}),
+    roundtrip('SetExt2', #'SetExt2'{bool=true,int=99}),
+    roundtrip('SetExt3', #'SetExt3'{bool=true,int=99}),
+    roundtrip('SetExt3', #'SetExt3'{bool=true,int=99}),
+    roundtrip('SetExt4', #'SetExt4'{bool=true,int=99}),
+    roundtrip('SetExt4', #'SetExt4'{bool=true,int=99}),
+    roundtrip('SetExt1', #'SetExt1'{}),
+    roundtrip('SetExt2', #'SetExt2'{bool=true,int=99}),
+    roundtrip('SetExt2', #'SetExt2'{bool=true,int=99}),
     ok.
 
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetExtension', T, V).
+
 
diff --git a/lib/asn1/test/testSetExternal.erl b/lib/asn1/test/testSetExternal.erl
index 30cddcacfb..626adc5822 100644
--- a/lib/asn1/test/testSetExternal.erl
+++ b/lib/asn1/test/testSetExternal.erl
@@ -18,111 +18,36 @@
 %%
 %%
 -module(testSetExternal).
-
--include("External.hrl").
 -export([main/1]).
 
+-include("External.hrl").
 -include_lib("test_server/include/test_server.hrl").
 
-
 -record('SetXSeq1',{seq, bool, int}).
 -record('SetXSeq2',{bool, seq, int}).
 -record('SetXSeq3',{bool, int, seq}).
-%-record('NT',{os, bool}).
-%-record('Imp',{os, bool}).
-%-record('Exp',{os, bool}).
 
 main(_Rules) ->
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetExternal','XNTNT',#'XSetNT'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetNT',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XNTNT',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetExternal','XImpNT',#'XSetNT'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetNT',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XImpNT',lists:flatten(Bytes12)),
-
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetExternal','XExpNT',#'XSetNT'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetNT',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XExpNT',lists:flatten(Bytes13)),
-
-    
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetExternal','XNTImp',#'XSetImp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetImp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XNTImp',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetExternal','XImpImp',#'XSetImp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetImp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XImpImp',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SetExternal','XExpImp',#'XSetImp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetImp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XExpImp',lists:flatten(Bytes23)),
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetExternal','XNTExp',#'XSetExp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetExp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XNTExp',lists:flatten(Bytes31)),
-
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetExternal','XImpExp',#'XSetExp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetExp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XImpExp',lists:flatten(Bytes32)),
-
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SetExternal','XExpExp',#'XSetExp'{bool = true, os = "kalle"}),
-    ?line {ok,{'XSetExp',[107,97,108,108,101],true}} = 
-	asn1_wrapper:decode('SetExternal','XExpExp',lists:flatten(Bytes33)),
-
-
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SetExternal','SetXSeq1',
-		      #'SetXSeq1'{bool = true, 
-				  int = 66,
-				  seq = #'XSeq1'{bool1 = true, 
-						 int1 = 77,
-						 seq1 = #'XSeqIn'{boolIn = false, 
-								  intIn = 88}}}),
-    ?line {ok,{'SetXSeq1',{'XSeq1',true,77,{'XSeqIn',false,88}},true,66}} = 
-	asn1_wrapper:decode('SetExternal','SetXSeq1',lists:flatten(Bytes41)),
-
-
-
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SetExternal','SetXSeq2',
-		      #'SetXSeq2'{bool = true, 
-				  int = 66,
-				  seq = #'XSeq1'{bool1 = true, 
-						 int1 = 77,
-						 seq1 = #'XSeqIn'{boolIn = false, 
-								  intIn = 88}}}),
-    ?line {ok,{'SetXSeq2',true,{'XSeq1',true,77,{'XSeqIn',false,88}},66}} = 
-	asn1_wrapper:decode('SetExternal','SetXSeq2',lists:flatten(Bytes42)),
-
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SetExternal','SetXSeq3',
-		      #'SetXSeq3'{bool = true, 
-				  int = 66,
-				  seq = #'XSeq1'{bool1 = true, 
-						 int1 = 77,
-						 seq1 = #'XSeqIn'{boolIn = false, 
-								  intIn = 88}}}),
-    ?line {ok,{'SetXSeq3',true,66,{'XSeq1',true,77,{'XSeqIn',false,88}}}} = 
-	asn1_wrapper:decode('SetExternal','SetXSeq3',lists:flatten(Bytes43)),
-
-
-    
-
+    roundtrip('XNTNT', #'XSetNT'{os = <<"kalle">>,bool=true}),
+    roundtrip('XImpNT', #'XSetNT'{os = <<"kalle">>,bool=true}),
+    roundtrip('XExpNT', #'XSetNT'{os = <<"kalle">>,bool=true}),
+    roundtrip('XNTImp', #'XSetImp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XImpImp', #'XSetImp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XExpImp', #'XSetImp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XNTExp', #'XSetExp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XImpExp', #'XSetExp'{os = <<"kalle">>,bool=true}),
+    roundtrip('XExpExp', #'XSetExp'{os = <<"kalle">>,bool=true}),
+    roundtrip('SetXSeq1', #'SetXSeq1'{seq=#'XSeq1'{bool1=true,int1=77,
+						   seq1=#'XSeqIn'{boolIn=false,intIn=88}},
+				      bool=true,int=66}),
+    roundtrip('SetXSeq2', #'SetXSeq2'{bool=true,
+				      seq=#'XSeq1'{bool1=true,int1=77,
+						   seq1=#'XSeqIn'{boolIn=false,intIn=88}},
+				      int=66}),
+    roundtrip('SetXSeq3', #'SetXSeq3'{bool=true,int=66,
+				      seq=#'XSeq1'{bool1=true,int1=77,
+						   seq1=#'XSeqIn'{boolIn=false,intIn=88}}}),
     ok.
 
-
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetExternal', T, V).
diff --git a/lib/asn1/test/testSetIndefinite.erl b/lib/asn1/test/testSetIndefinite.erl
deleted file mode 100644
index 73006da62b..0000000000
--- a/lib/asn1/test/testSetIndefinite.erl
+++ /dev/null
@@ -1,41 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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(testSetIndefinite).
-
--export([main/1]).
-
--include_lib("test_server/include/test_server.hrl").
-
-
-main(per) -> ok;
-main(ber) ->
-    
-    %% normal encoding
-    B = [49,20,1,1,255,49,9,1,1,255,2,4,251,35,238,194,2,4,251,55,236,161],
-    %% indefinite length encoding
-    Bi = [49,22,1,1,255,49,128,1,1,255,2,4,251,35,238,194,0,0,2,4,251,55,236,161],
-    %% the value which is encoded
-    V = {'SetS3',true,{'SetS3_setS3',true,-81531198},-80221023},
-    ?line {ok,V} = asn1_wrapper:decode('SeqSetIndefinite','SetS3',B),
-    ?line {ok,V} = asn1_wrapper:decode('SeqSetIndefinite','SetS3',Bi),
-    ok.
-
-
-
diff --git a/lib/asn1/test/testSetOf.erl b/lib/asn1/test/testSetOf.erl
index 08723fb468..0f82a14625 100644
--- a/lib/asn1/test/testSetOf.erl
+++ b/lib/asn1/test/testSetOf.erl
@@ -28,198 +28,108 @@
 -record('Set3',{bool3, set3 = asn1_DEFAULT, int3}).
 -record('Set4',{set41 = asn1_DEFAULT, set42 = asn1_DEFAULT, set43 = asn1_DEFAULT}).
 -record('SetIn',{boolIn, intIn}).
-%-record('SetCho',{bool1, int1, set1 = asn1_DEFAULT}).
-%-record('SetChoInline',{bool1, int1, set1 = asn1_DEFAULT}).
-%-record('SetChoOfInline_SETOF',{bool1, int1, set1 = asn1_DEFAULT}).
 -record('SetEmp',{set1}).
 -record('Empty',{}).
 
 
 
 main(_Rules) ->
+    roundtrip('Set1',
+	      #'Set1'{bool1=true,int1=17,set1=asn1_DEFAULT},
+	      #'Set1'{bool1=true,int1=17,set1=[]}),
+    roundtrip('Set1',
+	      #'Set1'{bool1=true,int1=17,
+		      set1=[#'SetIn'{boolIn=true,intIn=25}]}),
+    roundtrip('Set1', #'Set1'{bool1=true,int1=17,
+			      set1=[#'SetIn'{boolIn=true,intIn=25},
+				    #'SetIn'{boolIn=false,intIn=125},
+				    #'SetIn'{boolIn=false,intIn=225}]}),
+
+    roundtrip('Set2',
+	      #'Set2'{set2=asn1_DEFAULT,bool2=true,int2=17},
+	      #'Set2'{set2=[],bool2=true,int2=17}),
+    roundtrip('Set2',
+	      #'Set2'{set2=[#'SetIn'{boolIn=true,intIn=25}],
+		      bool2=true,int2=17}),
+    roundtrip('Set2',
+	      #'Set2'{set2=[#'SetIn'{boolIn=true,intIn=25},
+			    #'SetIn'{boolIn=false,intIn=125},
+			    #'SetIn'{boolIn=false,intIn=225}],
+		      bool2=true,int2=17}),
+
+    roundtrip('Set3',
+	      #'Set3'{bool3=true,set3=asn1_DEFAULT,int3=17},
+	      #'Set3'{bool3=true,set3=[],int3=17}),
+    roundtrip('Set3',
+	      #'Set3'{bool3=true,set3=[#'SetIn'{boolIn=true,intIn=25}],
+		      int3=17}),
+    roundtrip('Set3',
+	      #'Set3'{bool3=true,
+		      set3=[#'SetIn'{boolIn=true,intIn=25},
+			    #'SetIn'{boolIn=false,intIn=125},
+			    #'SetIn'{boolIn=false,intIn=225}],
+		      int3=17}),
+
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,set42=asn1_DEFAULT,
+		      set43=asn1_DEFAULT},
+	      #'Set4'{set41=[],set42=[],set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25}],
+		      set42=asn1_DEFAULT,set43=asn1_DEFAULT},
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25}],
+		      set42=[],set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set42=asn1_DEFAULT,set43=asn1_DEFAULT},
+	      #'Set4'{set41=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set42=[],set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,
+		      set42=[#'SetIn'{boolIn=true,intIn=25}],
+		      set43=asn1_DEFAULT},
+	      #'Set4'{set41=[],
+		      set42=[#'SetIn'{boolIn=true,intIn=25}],
+		      set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,
+		      set42=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set43=asn1_DEFAULT},
+	      #'Set4'{set41=[],
+		      set42=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}],
+		      set43=[]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,set42=asn1_DEFAULT,
+		      set43=[#'SetIn'{boolIn=true,intIn=25}]},
+	      #'Set4'{set41=[],set42=[],
+		      set43=[#'SetIn'{boolIn=true,intIn=25}]}),
+    roundtrip('Set4',
+	      #'Set4'{set41=asn1_DEFAULT,set42=asn1_DEFAULT,
+		      set43=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}]},
+	      #'Set4'{set41=[],set42=[],
+		      set43=[#'SetIn'{boolIn=true,intIn=25},
+			     #'SetIn'{boolIn=false,intIn=125},
+			     #'SetIn'{boolIn=false,intIn=225}]}),
+
+    roundtrip('SetOs', [<<"First">>,<<"Second">>,<<"Third">>]),
+    roundtrip('SetOsImp', [<<"First">>,<<"Second">>,<<"Third">>]),
+    roundtrip('SetOsExp', [<<"First">>,<<"Second">>,<<"Third">>]),
+    roundtrip('SetEmp', #'SetEmp'{set1=[#'Empty'{}]}),
 
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetOf','Set1',#'Set1'{bool1 = true,
-					     int1 = 17}),
-    ?line {ok,{'Set1',true,17,[]}} = 
-	asn1_wrapper:decode('SetOf','Set1',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetOf','Set1',#'Set1'{bool1 = true,
-					     int1 = 17,
-					     set1 = [#'SetIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Set1',true,17,[{'SetIn',true,25}]}} = 
-	asn1_wrapper:decode('SetOf','Set1',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetOf','Set1',#'Set1'{bool1 = true,
-					     int1 = 17,
-					     set1 = [#'SetIn'{boolIn = true,
-							      intIn = 25},
-						     #'SetIn'{boolIn = false,
-							      intIn = 125},
-						     #'SetIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Set1',true,17,[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}]}} = 
-	asn1_wrapper:decode('SetOf','Set1',lists:flatten(Bytes13)),
-
-
-
-
-
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetOf','Set2',#'Set2'{bool2 = true,
-					     int2 = 17}),
-    
-    ?line {ok,{'Set2',[],true,17}} = 
-	asn1_wrapper:decode('SetOf','Set2',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetOf','Set2',#'Set2'{bool2 = true,
-					     int2 = 17,
-					     set2 = [#'SetIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Set2',[{'SetIn',true,25}],true,17}} = 
-	asn1_wrapper:decode('SetOf','Set2',lists:flatten(Bytes22)),
-    
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SetOf','Set2',#'Set2'{bool2 = true,
-					     int2 = 17,
-					     set2 = [#'SetIn'{boolIn = true,
-							      intIn = 25},
-						     #'SetIn'{boolIn = false,
-							      intIn = 125},
-						     #'SetIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Set2',[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],true,17}} = 
-	asn1_wrapper:decode('SetOf','Set2',lists:flatten(Bytes23)),
-    
-    
-
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetOf','Set3',#'Set3'{bool3 = true,
-					     int3 = 17}),
-    ?line {ok,{'Set3',true,[],17}} = 
-	asn1_wrapper:decode('SetOf','Set3',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetOf','Set3',#'Set3'{bool3 = true,
-					     int3 = 17,
-					     set3 = [#'SetIn'{boolIn = true,
-							      intIn = 25}]}),
-    ?line {ok,{'Set3',true,[{'SetIn',true,25}],17}} = 
-	asn1_wrapper:decode('SetOf','Set3',lists:flatten(Bytes32)),
-    
-    
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SetOf','Set3',#'Set3'{bool3 = true,
-					     int3 = 17,
-					     set3 = [#'SetIn'{boolIn = true,
-							      intIn = 25},
-						     #'SetIn'{boolIn = false,
-							      intIn = 125},
-						     #'SetIn'{boolIn = false,
-							      intIn = 225}]}),
-    ?line {ok,{'Set3',true,[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],17}} = 
-	asn1_wrapper:decode('SetOf','Set3',lists:flatten(Bytes33)),
-    
-  
-
-
-
-  
-    
-    ?line {ok,Bytes41} = asn1_wrapper:encode('SetOf','Set4',#'Set4'{}),
-    ?line {ok,{'Set4',[],[],[]}} = asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes41)),
-        
-    
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set41 = [#'SetIn'{boolIn = true,
-							       intIn = 25}]}),
-    ?line {ok,{'Set4',[{'SetIn',true,25}],[],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes42)),
-    
-    
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set41 = [#'SetIn'{boolIn = true,
-							       intIn = 25},
-						      #'SetIn'{boolIn = false,
-							       intIn = 125},
-						      #'SetIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Set4',[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],[],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes43)),
-    
-    
-    ?line {ok,Bytes44} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set42 = [#'SetIn'{boolIn = true,
-								       intIn = 25}]}),
-    ?line {ok,{'Set4',[],[{'SetIn',true,25}],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes44)),
-    
-    
-    ?line {ok,Bytes45} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set42 = [#'SetIn'{boolIn = true,
-							       intIn = 25},
-						      #'SetIn'{boolIn = false,
-							       intIn = 125},
-						      #'SetIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Set4',[],[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}],[]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes45)),
-    
-    
-    ?line {ok,Bytes46} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set43 = [#'SetIn'{boolIn = true,
-							       intIn = 25}]}),
-    ?line {ok,{'Set4',[],[],[{'SetIn',true,25}]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes46)),
-    
-    
-    ?line {ok,Bytes47} = 
-	asn1_wrapper:encode('SetOf','Set4',#'Set4'{set43 = [#'SetIn'{boolIn = true,
-							       intIn = 25},
-						      #'SetIn'{boolIn = false,
-							       intIn = 125},
-						      #'SetIn'{boolIn = false,
-							       intIn = 225}]}),
-    ?line {ok,{'Set4',[],[],[{'SetIn',true,25},{'SetIn',false,125},{'SetIn',false,225}]}} = 
-	asn1_wrapper:decode('SetOf','Set4',lists:flatten(Bytes47)),
-    
-
-
-
-    ?line {ok,Bytes51} = asn1_wrapper:encode('SetOf','SetOs',["First","Second","Third"]),
-    ?line {ok,["First","Second","Third"]} = 
-	asn1_wrapper:decode('SetOf','SetOs',lists:flatten(Bytes51)),
-     
-    ?line {ok,Bytes52} = asn1_wrapper:encode('SetOf','SetOsImp',["First","Second","Third"]),
-    ?line {ok,["First","Second","Third"]} = 
-	asn1_wrapper:decode('SetOf','SetOsImp',lists:flatten(Bytes52)),
-     
-    ?line {ok,Bytes53} = asn1_wrapper:encode('SetOf','SetOsExp',["First","Second","Third"]),
-    ?line {ok,["First","Second","Third"]} = 
-	asn1_wrapper:decode('SetOf','SetOsExp',lists:flatten(Bytes53)),
-     
-
-
-
-
-
-    
-    ?line {ok,Bytes71} = asn1_wrapper:encode('SetOf','SetEmp',#'SetEmp'{set1 = [#'Empty'{}]}),
-    ?line {ok,{'SetEmp',[{'Empty'}]}} = asn1_wrapper:decode('SetOf','SetEmp',lists:flatten(Bytes71)),
-     
     ok.
 
+roundtrip(T, V) ->
+    roundtrip(T, V, V).
+
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SetOf', Type, Value, ExpectedValue).
diff --git a/lib/asn1/test/testSetOfCho.erl b/lib/asn1/test/testSetOfCho.erl
index c89bf9596e..09c075e468 100644
--- a/lib/asn1/test/testSetOfCho.erl
+++ b/lib/asn1/test/testSetOfCho.erl
@@ -30,120 +30,46 @@
 -record('SetOfChoEmbDef_SETOF',{bool1, int1, set1 = asn1_DEFAULT}).
 -record('SetOfChoEmbOpt_SETOF',{bool1, int1, set1 = asn1_NOVALUE}).
 
+main(_Rules) ->
+    roundtrip('SetChoDef',
+	      #'SetChoDef'{bool1=true,int1=17,set1=asn1_DEFAULT},
+	      #'SetChoDef'{bool1=true,int1=17,set1=[]}),
+    roundtrip('SetChoDef',
+	      #'SetChoDef'{bool1=true,int1=17,set1=[{boolIn,true},{intIn,25}]}),
+    roundtrip('SetChoOpt',
+	      #'SetChoOpt'{bool1=true,int1=17,set1=asn1_NOVALUE}),
+    roundtrip('SetChoOpt',
+	      #'SetChoOpt'{bool1=true,int1=17,set1=[{boolIn,true},{intIn,25}]}),
 
+    roundtrip('SetChoEmbDef',
+	      #'SetChoEmbDef'{bool1=true,int1=17,set1=asn1_DEFAULT},
+	      #'SetChoEmbDef'{bool1=true,int1=17,set1=[]}),
+    roundtrip('SetChoEmbDef',
+	      #'SetChoEmbDef'{bool1=true,int1=17,
+			      set1=[{boolIn,true},{intIn,25}]}),
+    roundtrip('SetChoEmbOpt',
+	      #'SetChoEmbOpt'{bool1=true,int1=17,set1=asn1_NOVALUE}),
+    roundtrip('SetChoEmbOpt',
+	      #'SetChoEmbOpt'{bool1=true,int1=17,
+			      set1=[{boolIn,true},{intIn,25}]}),
+
+    roundtrip('SetOfChoEmbDef',
+	      [#'SetOfChoEmbDef_SETOF'{bool1=true,int1=17,set1=asn1_DEFAULT}],
+	      [#'SetOfChoEmbDef_SETOF'{bool1=true,int1=17,set1=[]}]),
+    roundtrip('SetOfChoEmbDef',
+	      [#'SetOfChoEmbDef_SETOF'{bool1=true,int1=17,
+				       set1=[{boolIn,true},{intIn,25}]}]),
+
+    roundtrip('SetOfChoEmbOpt',
+	      [#'SetOfChoEmbOpt_SETOF'{bool1=true,int1=17,set1=asn1_NOVALUE}]),
+    roundtrip('SetOfChoEmbOpt',
+	      [#'SetOfChoEmbOpt_SETOF'{bool1=true,int1=17,
+				       set1=[{boolIn,true},{intIn,25}]}]),
 
-main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetOfCho','SetChoDef',#'SetChoDef'{bool1 = true,
-							  int1 = 17}),
-    ?line {ok,{'SetChoDef',true,17,[]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoDef',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetOfCho','SetChoDef',#'SetChoDef'{bool1 = true,
-							  int1 = 17,
-							  set1 = [{boolIn,true},
-								  {intIn,25}]}),
-    ?line {ok,{'SetChoDef',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoDef',lists:flatten(Bytes12)),
-    
-    
-    
-    ?line {ok,Bytes15} = 
-	asn1_wrapper:encode('SetOfCho','SetChoOpt',#'SetChoOpt'{bool1 = true,
-							  int1 = 17}),
-    ?line {ok,{'SetChoOpt',true,17,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoOpt',lists:flatten(Bytes15)),
-    
-    
-    ?line {ok,Bytes16} = 
-	asn1_wrapper:encode('SetOfCho','SetChoOpt',#'SetChoOpt'{bool1 = true,
-							  int1 = 17,
-							  set1 = [{boolIn,true},
-								  {intIn,25}]}),
-    ?line {ok,{'SetChoOpt',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoOpt',lists:flatten(Bytes16)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbDef',#'SetChoEmbDef'{bool1 = true,
-								int1 = 17}),
-    ?line {ok,{'SetChoEmbDef',true,17,[]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbDef',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbDef',#'SetChoEmbDef'{bool1 = true,
-								int1 = 17,
-								set1 = [{boolIn,true},
-									{intIn,25}]}),
-    ?line {ok,{'SetChoEmbDef',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbDef',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes25} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbOpt',#'SetChoEmbOpt'{bool1 = true,
-								int1 = 17}),
-    ?line {ok,{'SetChoEmbOpt',true,17,asn1_NOVALUE}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbOpt',lists:flatten(Bytes25)),
-    
-    
-    ?line {ok,Bytes26} = 
-	asn1_wrapper:encode('SetOfCho','SetChoEmbOpt',#'SetChoEmbOpt'{bool1 = true,
-								int1 = 17,
-								set1 = [{boolIn,true},
-									{intIn,25}]}),
-    ?line {ok,{'SetChoEmbOpt',true,17,[{boolIn,true},{intIn,25}]}} = 
-	asn1_wrapper:decode('SetOfCho','SetChoEmbOpt',lists:flatten(Bytes26)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbDef',[#'SetOfChoEmbDef_SETOF'{bool1 = true,
-									   int1 = 17}]),
-    ?line {ok,[{'SetOfChoEmbDef_SETOF',true,17,[]}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbDef',lists:flatten(Bytes31)),
-    
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbDef',
-		      [#'SetOfChoEmbDef_SETOF'{bool1 = true,
-					       int1 = 17,
-					       set1 = [{boolIn,true},
-						       {intIn,25}]}]),
-    ?line {ok,[{'SetOfChoEmbDef_SETOF',true,17,[{boolIn,true},{intIn,25}]}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbDef',lists:flatten(Bytes32)),
-    
-    
-    
-    ?line {ok,Bytes35} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbOpt',[#'SetOfChoEmbOpt_SETOF'{bool1 = true,
-									   int1 = 17}]),
-    ?line {ok,[{'SetOfChoEmbOpt_SETOF',true,17,asn1_NOVALUE}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbOpt',lists:flatten(Bytes35)),
-    
-    
-    ?line {ok,Bytes36} = 
-	asn1_wrapper:encode('SetOfCho','SetOfChoEmbOpt',
-		      [#'SetOfChoEmbOpt_SETOF'{bool1 = true,
-					       int1 = 17,
-					       set1 = [{boolIn,true},
-						       {intIn,25}]}]),
-    ?line {ok,[{'SetOfChoEmbOpt_SETOF',true,17,[{boolIn,true},{intIn,25}]}]} = 
-	asn1_wrapper:decode('SetOfCho','SetOfChoEmbOpt',lists:flatten(Bytes36)),
-    
-    
-    
-    
     ok.
 
+roundtrip(T, V) ->
+    roundtrip(T, V, V).
 
+roundtrip(Type, Value, ExpectedValue) ->
+    asn1_test_lib:roundtrip('SetOfCho', Type, Value, ExpectedValue).
diff --git a/lib/asn1/test/testSetOfExternal.erl b/lib/asn1/test/testSetOfExternal.erl
index 6b280a2595..cc5fe10710 100644
--- a/lib/asn1/test/testSetOfExternal.erl
+++ b/lib/asn1/test/testSetOfExternal.erl
@@ -18,8 +18,6 @@
 %%
 %%
 -module(testSetOfExternal).
-
-
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -29,133 +27,44 @@
 -record('Imp',{os, bool}).
 -record('Exp',{os, bool}).
 
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetOfExternal','NTNT',[#'NT'{bool = true, os = "kalle"},
-					      #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','NTNT',lists:flatten(Bytes11)),
-
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetOfExternal','ImpNT',[#'NT'{bool = true, os = "kalle"},
-					       #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','ImpNT',lists:flatten(Bytes12)),
-
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetOfExternal','ExpNT',[#'NT'{bool = true, os = "kalle"},
-					       #'NT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','ExpNT',lists:flatten(Bytes13)),
-
-    
-
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetOfExternal','NTImp',[#'Imp'{bool = true, os = "kalle"},
-					       #'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','NTImp',lists:flatten(Bytes21)),
-
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetOfExternal','ImpImp',[#'Imp'{bool = true, os = "kalle"},
-						#'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','ImpImp',lists:flatten(Bytes22)),
-
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SetOfExternal','ExpImp',[#'Imp'{bool = true, os = "kalle"},
-						#'Imp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','ExpImp',lists:flatten(Bytes23)),
-
-
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetOfExternal','NTExp',[#'Exp'{bool = true, os = "kalle"},
-					       #'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','NTExp',lists:flatten(Bytes31)),
-
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetOfExternal','ImpExp',[#'Exp'{bool = true, os = "kalle"},
-						#'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','ImpExp',lists:flatten(Bytes32)),
-
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SetOfExternal','ExpExp',[#'Exp'{bool = true, os = "kalle"},
-						#'Exp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','ExpExp',lists:flatten(Bytes33)),
-
-
-
-
-
-
-
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SetOfExternal','XNTNT',[#'XSetNT'{bool = true, os = "kalle"},
-					       #'XSetNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetNT',[107,97,108,108,101],true},{'XSetNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XNTNT',lists:flatten(Bytes41)),
-
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SetOfExternal','XImpNT',[#'XSetNT'{bool = true, os = "kalle"},
-						#'XSetNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetNT',[107,97,108,108,101],true},{'XSetNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XImpNT',lists:flatten(Bytes42)),
-
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SetOfExternal','XExpNT',[#'XSetNT'{bool = true, os = "kalle"},
-						#'XSetNT'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetNT',[107,97,108,108,101],true},{'XSetNT',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XExpNT',lists:flatten(Bytes43)),
-
-    
-
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SetOfExternal','XNTImp',[#'XSetImp'{bool = true, os = "kalle"},
-						#'XSetImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetImp',[107,97,108,108,101],true},{'XSetImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XNTImp',lists:flatten(Bytes51)),
-
-    ?line {ok,Bytes52} = 
-	asn1_wrapper:encode('SetOfExternal','XImpImp',[#'XSetImp'{bool = true, os = "kalle"},
-						 #'XSetImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetImp',[107,97,108,108,101],true},{'XSetImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XImpImp',lists:flatten(Bytes52)),
-
-    ?line {ok,Bytes53} = 
-	asn1_wrapper:encode('SetOfExternal','XExpImp',[#'XSetImp'{bool = true, os = "kalle"},
-						 #'XSetImp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetImp',[107,97,108,108,101],true},{'XSetImp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XExpImp',lists:flatten(Bytes53)),
-
-
-    
-    ?line {ok,Bytes61} = 
-	asn1_wrapper:encode('SetOfExternal','XNTExp',[#'XSetExp'{bool = true, os = "kalle"},
-						#'XSetExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetExp',[107,97,108,108,101],true},{'XSetExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XNTExp',lists:flatten(Bytes61)),
-
-    ?line {ok,Bytes62} = 
-	asn1_wrapper:encode('SetOfExternal','XImpExp',[#'XSetExp'{bool = true, os = "kalle"},
-						 #'XSetExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetExp',[107,97,108,108,101],true},{'XSetExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XImpExp',lists:flatten(Bytes62)),
-
-    ?line {ok,Bytes63} = 
-	asn1_wrapper:encode('SetOfExternal','XExpExp',[#'XSetExp'{bool = true, os = "kalle"},
-						 #'XSetExp'{bool = true, os = "kalle"}]),
-    ?line {ok,[{'XSetExp',[107,97,108,108,101],true},{'XSetExp',[107,97,108,108,101],true}]} = 
-	asn1_wrapper:decode('SetOfExternal','XExpExp',lists:flatten(Bytes63)),
-
-
-    
-    
+    roundtrip('NTNT', [#'NT'{os = <<"kalle">>,bool=true},
+		       #'NT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ImpNT', [#'NT'{os = <<"kalle">>,bool=true},
+			#'NT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ExpNT', [#'NT'{os = <<"kalle">>,bool=true},
+			#'NT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('NTImp', [#'Imp'{os = <<"kalle">>,bool=true},
+			#'Imp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ImpImp', [#'Imp'{os = <<"kalle">>,bool=true},
+			 #'Imp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ExpImp', [#'Imp'{os = <<"kalle">>,bool=true},
+			 #'Imp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('NTExp', [#'Exp'{os = <<"kalle">>,bool=true},
+			#'Exp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ImpExp', [#'Exp'{os = <<"kalle">>,bool=true},
+			 #'Exp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('ExpExp', [#'Exp'{os = <<"kalle">>,bool=true},
+			 #'Exp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XNTNT', [#'XSetNT'{os = <<"kalle">>,bool=true},
+			#'XSetNT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XImpNT', [#'XSetNT'{os = <<"kalle">>,bool=true},
+			 #'XSetNT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XExpNT', [#'XSetNT'{os = <<"kalle">>,bool=true},
+			 #'XSetNT'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XNTImp', [#'XSetImp'{os = <<"kalle">>,bool=true},
+			 #'XSetImp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XImpImp', [#'XSetImp'{os = <<"kalle">>,bool=true},
+			  #'XSetImp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XExpImp', [#'XSetImp'{os = <<"kalle">>,bool=true},
+			  #'XSetImp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XNTExp', [#'XSetExp'{os = <<"kalle">>,bool=true},
+			 #'XSetExp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XImpExp', [#'XSetExp'{os = <<"kalle">>,bool=true},
+			  #'XSetExp'{os = <<"kalle">>,bool=true}]),
+    roundtrip('XExpExp', [#'XSetExp'{os = <<"kalle">>,bool=true},
+			  #'XSetExp'{os = <<"kalle">>,bool=true}]),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetOfExternal', T, V).
diff --git a/lib/asn1/test/testSetOfTag.erl b/lib/asn1/test/testSetOfTag.erl
index 2c7a2f5473..0d656f05a6 100644
--- a/lib/asn1/test/testSetOfTag.erl
+++ b/lib/asn1/test/testSetOfTag.erl
@@ -18,14 +18,11 @@
 %%
 %%
 -module(testSetOfTag).
-
-
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 -include("External.hrl").
 
-
 -record('SetTagNt',{nt}).
 -record('SetTagNtI',{imp}).
 -record('SetTagNtE',{exp}).
@@ -44,148 +41,44 @@
 -record('Imp',{os, bool}).
 -record('Exp',{os, bool}).
 
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetOfTag','SetTagNt',
-		      #'SetTagNt'{nt = [#'NT'{bool = true, os = "kalle"},
-					#'NT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagNt',
-	       [{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagNt',lists:flatten(Bytes11)),
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetOfTag','SetTagNtI',
-		      #'SetTagNtI'{imp = [#'Imp'{bool = true, os = "kalle"},
-					  #'Imp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagNtI',
-	       [{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagNtI',lists:flatten(Bytes12)),
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetOfTag','SetTagNtE',
-		      #'SetTagNtE'{exp = [#'Exp'{bool = true, os = "kalle"},
-					  #'Exp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagNtE',
-	       [{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagNtE',lists:flatten(Bytes13)),
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetOfTag','SetTagI',
-		      #'SetTagI'{nt = [#'NT'{bool = true, os = "kalle"},
-				       #'NT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagI',
-	       [{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagI',lists:flatten(Bytes21)),
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetOfTag','SetTagII',
-		      #'SetTagII'{imp = [#'Imp'{bool = true, os = "kalle"},
-					 #'Imp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagII',
-	       [{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagII',lists:flatten(Bytes22)),
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SetOfTag','SetTagIE',
-		      #'SetTagIE'{exp = [#'Exp'{bool = true, os = "kalle"},
-					 #'Exp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagIE',
-	       [{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagIE',lists:flatten(Bytes23)),
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetOfTag','SetTagE',
-		      #'SetTagE'{nt = [#'NT'{bool = true, os = "kalle"},
-				       #'NT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagE',
-	       [{'NT',[107,97,108,108,101],true},{'NT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagE',lists:flatten(Bytes31)),
-    
-    ?line {ok,Bytes32} = 
-	asn1_wrapper:encode('SetOfTag','SetTagEI',
-		      #'SetTagEI'{imp = [#'Imp'{bool = true, os = "kalle"},
-					 #'Imp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagEI',
-	       [{'Imp',[107,97,108,108,101],true},{'Imp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagEI',lists:flatten(Bytes32)),
-    
-    ?line {ok,Bytes33} = 
-	asn1_wrapper:encode('SetOfTag','SetTagEE',
-		      #'SetTagEE'{exp = [#'Exp'{bool = true, os = "kalle"},
-					 #'Exp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagEE',
-	       [{'Exp',[107,97,108,108,101],true},{'Exp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagEE',lists:flatten(Bytes33)),
-    
-    
-    
-    
-
-
-
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SetOfTag','SetTagXNt',
-		      #'SetTagXNt'{xnt = [#'XSetNT'{bool = true, os = "kalle"},
-					  #'XSetNT'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagXNt',
-	       [{'XSetNT',[107,97,108,108,101],true},{'XSetNT',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagXNt',lists:flatten(Bytes41)),
-    
-    ?line {ok,Bytes42} = 
-	asn1_wrapper:encode('SetOfTag','SetTagXI',
-		      #'SetTagXI'{ximp = [#'XSetImp'{bool = true, os = "kalle"},
-					  #'XSetImp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagXI',
-	       [{'XSetImp',[107,97,108,108,101],true},{'XSetImp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagXI',lists:flatten(Bytes42)),
-    
-    ?line {ok,Bytes43} = 
-	asn1_wrapper:encode('SetOfTag','SetTagXE',
-		      #'SetTagXE'{xexp = [#'XSetExp'{bool = true, os = "kalle"},
-					  #'XSetExp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagXE',
-	       [{'XSetExp',[107,97,108,108,101],true},{'XSetExp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagXE',lists:flatten(Bytes43)),
-        
-    
-
-
-    
-    ?line {ok,Bytes51} = 
-	asn1_wrapper:encode('SetOfTag','SetTagImpX',
-		      #'SetTagImpX'{xnt = [#'XSetNT'{bool = true, os = "kalle"},
-					   #'XSetNT'{bool = true, os = "kalle"}],
-				    ximp = [#'XSetImp'{bool = true, os = "kalle"},
-					    #'XSetImp'{bool = true, os = "kalle"}],
-				    xexp = [#'XSetExp'{bool = true, os = "kalle"},
-					    #'XSetExp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagImpX',
-	       [{'XSetNT',[107,97,108,108,101],true},{'XSetNT',[107,97,108,108,101],true}], 
-	       [{'XSetImp',[107,97,108,108,101],true},{'XSetImp',[107,97,108,108,101],true}],
-	       [{'XSetExp',[107,97,108,108,101],true},{'XSetExp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagImpX',lists:flatten(Bytes51)),
-    
-
-
-    ?line {ok,Bytes52} = 
-	asn1_wrapper:encode('SetOfTag','SetTagExpX',
-		      #'SetTagExpX'{xnt = [#'XSetNT'{bool = true, os = "kalle"},
-					   #'XSetNT'{bool = true, os = "kalle"}],
-				    ximp = [#'XSetImp'{bool = true, os = "kalle"},
-					    #'XSetImp'{bool = true, os = "kalle"}],
-				    xexp = [#'XSetExp'{bool = true, os = "kalle"},
-					    #'XSetExp'{bool = true, os = "kalle"}]}),
-    ?line {ok,{'SetTagExpX',
-	       [{'XSetNT',[107,97,108,108,101],true},{'XSetNT',[107,97,108,108,101],true}], 
-	       [{'XSetImp',[107,97,108,108,101],true},{'XSetImp',[107,97,108,108,101],true}],
-	       [{'XSetExp',[107,97,108,108,101],true},{'XSetExp',[107,97,108,108,101],true}]}} = 
-	asn1_wrapper:decode('SetOfTag','SetTagExpX',lists:flatten(Bytes52)),
-    
+    roundtrip('SetTagNt', #'SetTagNt'{nt=[#'NT'{os = <<"kalle">>,bool=true},
+					  #'NT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagNtI', #'SetTagNtI'{imp=[#'Imp'{os = <<"kalle">>,bool=true},
+					     #'Imp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagNtE', #'SetTagNtE'{exp=[#'Exp'{os = <<"kalle">>,bool=true},
+					     #'Exp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagI', #'SetTagI'{nt=[#'NT'{os = <<"kalle">>,bool=true},
+					#'NT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagII', #'SetTagII'{imp=[#'Imp'{os = <<"kalle">>,bool=true},
+					   #'Imp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagIE', #'SetTagIE'{exp=[#'Exp'{os = <<"kalle">>,bool=true},
+					   #'Exp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagE', #'SetTagE'{nt=[#'NT'{os = <<"kalle">>,bool=true},
+					#'NT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagEI', #'SetTagEI'{imp=[#'Imp'{os = <<"kalle">>,bool=true},
+					   #'Imp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagEE', #'SetTagEE'{exp=[#'Exp'{os = <<"kalle">>,bool=true},
+					   #'Exp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagXNt', #'SetTagXNt'{xnt=[#'XSetNT'{os = <<"kalle">>,bool=true},
+					     #'XSetNT'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagXI', #'SetTagXI'{ximp=[#'XSetImp'{os = <<"kalle">>,bool=true},
+					    #'XSetImp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagXE', #'SetTagXE'{xexp=[#'XSetExp'{os = <<"kalle">>,bool=true},
+					    #'XSetExp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagImpX', #'SetTagImpX'{xnt=[#'XSetNT'{os = <<"kalle">>,bool=true},
+					       #'XSetNT'{os = <<"kalle">>,bool=true}],
+					  ximp=[#'XSetImp'{os = <<"kalle">>,bool=true},
+						#'XSetImp'{os = <<"kalle">>,bool=true}],
+					  xexp=[#'XSetExp'{os = <<"kalle">>,bool=true},
+						#'XSetExp'{os = <<"kalle">>,bool=true}]}),
+    roundtrip('SetTagExpX', #'SetTagExpX'{xnt=[#'XSetNT'{os = <<"kalle">>,bool=true},
+					       #'XSetNT'{os = <<"kalle">>,bool=true}],
+					  ximp=[#'XSetImp'{os = <<"kalle">>,bool=true},
+						#'XSetImp'{os = <<"kalle">>,bool=true}],
+					  xexp=[#'XSetExp'{os = <<"kalle">>,bool=true},
+						#'XSetExp'{os = <<"kalle">>,bool=true}]}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetOfTag', T, V).
diff --git a/lib/asn1/test/testSetOptional.erl b/lib/asn1/test/testSetOptional.erl
index bb43ff0a96..eb095fd480 100644
--- a/lib/asn1/test/testSetOptional.erl
+++ b/lib/asn1/test/testSetOptional.erl
@@ -93,6 +93,4 @@ ticket_7533(_) ->
     ok.
 
 roundtrip(Type, Value) ->
-    {ok,Encoded} = 'SetOptional':encode(Type, Value),
-    {ok,Value} = 'SetOptional':decode(Type, Encoded),
-    ok.
+    asn1_test_lib:roundtrip('SetOptional', Type, Value).
diff --git a/lib/asn1/test/testSetPrim.erl b/lib/asn1/test/testSetPrim.erl
index 3234b65135..f417f343a7 100644
--- a/lib/asn1/test/testSetPrim.erl
+++ b/lib/asn1/test/testSetPrim.erl
@@ -27,59 +27,17 @@
 -record('Empty',{}).
 
 main(_Rules) ->
-    
-    
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetPrim','Set',#'Set'{bool = true,
-					       boolCon = true,
-					       boolPri = true,
-					       boolApp = true,
-					       boolExpCon = true,
-					       boolExpPri = true,
-					       boolExpApp = true}),
-    ?line {ok,{'Set',true,true,true,true,true,true,true}} = 
-	asn1_wrapper:decode('SetPrim','Set',lists:flatten(Bytes11)),
-    
-    
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetPrim','Set',#'Set'{bool = false,
-					       boolCon = false,
-					       boolPri = false,
-					       boolApp = false,
-					       boolExpCon = false,
-					       boolExpPri = false,
-					       boolExpApp = false}),
-    ?line {ok,{'Set',false,false,false,false,false,false,false}} = 
-	asn1_wrapper:decode('SetPrim','Set',lists:flatten(Bytes12)),
-    
-    
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetPrim','Set',#'Set'{bool = false,
-					       boolCon = true,
-					       boolPri = false,
-					       boolApp = true,
-					       boolExpCon = false,
-					       boolExpPri = true,
-					       boolExpApp = false}),
-    ?line {ok,{'Set',false,true,false,true,false,true,false}} = 
-	asn1_wrapper:decode('SetPrim','Set',lists:flatten(Bytes13)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetPrim','Empty',#'Empty'{}),
-    ?line {ok,{'Empty'}} = 
-	asn1_wrapper:decode('SetPrim','Empty',lists:flatten(Bytes21)),
-
-
-
+    roundtrip('Set',
+	      #'Set'{bool=true,boolCon=true,boolPri=true,boolApp=true,
+		     boolExpCon=true,boolExpPri=true,boolExpApp=true}),
+    roundtrip('Set',
+	      #'Set'{bool=false,boolCon=false,boolPri=false,boolApp=false,
+		     boolExpCon=false,boolExpPri=false,boolExpApp=false}),
+    roundtrip('Set',
+	      #'Set'{bool=false,boolCon=true,boolPri=false,boolApp=true,
+		     boolExpCon=false,boolExpPri=true,boolExpApp=false}),
+    roundtrip('Empty', #'Empty'{}),
     ok.
 
-
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetPrim', T, V).
diff --git a/lib/asn1/test/testSetTag.erl b/lib/asn1/test/testSetTag.erl
index 8b9364d603..fa1d84f50d 100644
--- a/lib/asn1/test/testSetTag.erl
+++ b/lib/asn1/test/testSetTag.erl
@@ -18,7 +18,6 @@
 %%
 %%
 -module(testSetTag).
-
 -export([main/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -35,69 +34,25 @@
 -record('Exp',{os, bool}).
 
 main(_Rules) ->
-    
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetTag','SetTag',#'SetTag'{nt = #'NT'{bool = true, os = "kalle"},
-						  imp = #'Imp'{bool = true, os = "kalle"},
-						  exp = #'Exp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SetTag',{'NT',"kalle",true},{'Imp',"kalle",true},{'Exp',"kalle",true}}} = 
-	asn1_wrapper:decode('SetTag','SetTag',lists:flatten(Bytes11)),
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetTag','SetTagImp',#'SetTagImp'{nt = #'NT'{bool = true, os = "kalle"},
-							imp = #'Imp'{bool = true, os = "kalle"},
-							exp = #'Exp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SetTagImp',{'NT',"kalle",true},{'Imp',"kalle",true},{'Exp',"kalle",true}}} = 
-	asn1_wrapper:decode('SetTag','SetTagImp',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetTag','SetTagExp',#'SetTagExp'{nt = #'NT'{bool = true, os = "kalle"},
-							imp = #'Imp'{bool = true, os = "kalle"},
-							exp = #'Exp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SetTagExp',{'NT',"kalle",true},{'Imp',"kalle",true},{'Exp',"kalle",true}}} = 
-	asn1_wrapper:decode('SetTag','SetTagExp',lists:flatten(Bytes13)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetTag','SetTagX',
-		      #'SetTagX'{xnt = #'XSetNT'{bool = true, os = "kalle"},
-				 ximp = #'XSetImp'{bool = true, os = "kalle"},
-				 xexp = #'XSetExp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SetTagX',{'XSetNT',"kalle",true},
-	       {'XSetImp',"kalle",true},
-	       {'XSetExp',"kalle",true}}} = 
-	asn1_wrapper:decode('SetTag','SetTagX',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetTag','SetTagImpX',
-		      #'SetTagImpX'{xnt = #'XSetNT'{bool = true, os = "kalle"},
-				    ximp = #'XSetImp'{bool = true, os = "kalle"},
-				    xexp = #'XSetExp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SetTagImpX',{'XSetNT',"kalle",true},
-	       {'XSetImp',"kalle",true},
-	       {'XSetExp',"kalle",true}}} = 
-	asn1_wrapper:decode('SetTag','SetTagImpX',lists:flatten(Bytes22)),
-    
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SetTag','SetTagExpX',
-		      #'SetTagExpX'{xnt = #'XSetNT'{bool = true, os = "kalle"},
-				    ximp = #'XSetImp'{bool = true, os = "kalle"},
-				    xexp = #'XSetExp'{bool = true, os = "kalle"}}),
-    ?line {ok,{'SetTagExpX',{'XSetNT',"kalle",true},
-	       {'XSetImp',"kalle",true},
-	       {'XSetExp',"kalle",true}}} = 
-	asn1_wrapper:decode('SetTag','SetTagExpX',lists:flatten(Bytes23)),
-    
-    
-    
-    
-    
+    roundtrip('SetTag', #'SetTag'{nt=#'NT'{os = <<"kalle">>,bool=true},
+				  imp=#'Imp'{os = <<"kalle">>,bool=true},
+				  exp=#'Exp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SetTagImp', #'SetTagImp'{nt=#'NT'{os = <<"kalle">>,bool=true},
+					imp=#'Imp'{os = <<"kalle">>,bool=true},
+					exp=#'Exp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SetTagExp', #'SetTagExp'{nt=#'NT'{os = <<"kalle">>,bool=true},
+					imp=#'Imp'{os = <<"kalle">>,bool=true},
+					exp=#'Exp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SetTagX', #'SetTagX'{xnt=#'XSetNT'{os = <<"kalle">>,bool=true},
+				    ximp=#'XSetImp'{os = <<"kalle">>,bool=true},
+				    xexp=#'XSetExp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SetTagImpX', #'SetTagImpX'{xnt=#'XSetNT'{os = <<"kalle">>,bool=true},
+					  ximp=#'XSetImp'{os = <<"kalle">>,bool=true},
+					  xexp=#'XSetExp'{os = <<"kalle">>,bool=true}}),
+    roundtrip('SetTagExpX', #'SetTagExpX'{xnt=#'XSetNT'{os = <<"kalle">>,bool=true},
+					  ximp=#'XSetImp'{os = <<"kalle">>,bool=true},
+					  xexp=#'XSetExp'{os = <<"kalle">>,bool=true}}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetTag', T, V).
diff --git a/lib/asn1/test/testSetTypeRefCho.erl b/lib/asn1/test/testSetTypeRefCho.erl
index a0989926c7..97bbd557e0 100644
--- a/lib/asn1/test/testSetTypeRefCho.erl
+++ b/lib/asn1/test/testSetTypeRefCho.erl
@@ -28,17 +28,12 @@
 
 
 main(_Rules) ->
-    
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetTypeRefCho','SetTRcho',
-		      #'SetTRcho'{'setCho' = {choOs,"A string 1"},
-				  'setChoE' = {choOs,"A string 3"},
-				  'setCho-E' = {choOs,"A string 7"},
-				  'setChoE-E' = {choOs,"A string 9"}}),
-    ?line {ok,{'SetTRcho',{choOs,"A string 1"},{choOs,"A string 3"},{choOs,"A string 7"},{choOs,"A string 9"}}} = 
-	asn1_wrapper:decode('SetTypeRefCho','SetTRcho',lists:flatten(Bytes11)),
-
-
-
+    roundtrip('SetTRcho',
+	      #'SetTRcho'{'setCho' = {choOs,<<"A string 1">>},
+			  'setChoE' = {choOs,<<"A string 3">>},
+			  'setCho-E' = {choOs,<<"A string 7">>},
+			  'setChoE-E' = {choOs,<<"A string 9">>}}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetTypeRefCho', T, V).
diff --git a/lib/asn1/test/testSetTypeRefPrim.erl b/lib/asn1/test/testSetTypeRefPrim.erl
index 9c7fbd803e..d441fb789d 100644
--- a/lib/asn1/test/testSetTypeRefPrim.erl
+++ b/lib/asn1/test/testSetTypeRefPrim.erl
@@ -27,21 +27,17 @@
 
 
 main(_Rules) ->
-
-
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetTypeRefPrim','SetTR',#'SetTR'{'octStr' = "A string 1",
-						       'octStrI' = "A string 2",
-						       'octStrE' = "A string 3",
-						       'octStr-I' = "A string 4",
-						       'octStrI-I' = "A string 5",
-						       'octStrE-I' = "A string 6",
-						       'octStr-E' = "A string 7",
-						       'octStrI-E' = "A string 8",
-						       'octStrE-E' = "A string 9"}),
-    ?line {ok,{'SetTR',"A string 1","A string 2","A string 3","A string 4","A string 5","A string 6","A string 7","A string 8","A string 9"}} = 
-	asn1_wrapper:decode('SetTypeRefPrim','SetTR',lists:flatten(Bytes11)),
-
-
-
+    roundtrip('SetTR',
+	      #'SetTR'{'octStr' = <<"A string 1">>,
+		       'octStrI' = <<"A string 2">>,
+		       'octStrE' = <<"A string 3">>,
+		       'octStr-I' = <<"A string 4">>,
+		       'octStrI-I' = <<"A string 5">>,
+		       'octStrE-I' = <<"A string 6">>,
+		       'octStr-E' = <<"A string 7">>,
+		       'octStrI-E' = <<"A string 8">>,
+		       'octStrE-E' = <<"A string 9">>}),
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetTypeRefPrim', T, V).
diff --git a/lib/asn1/test/testSetTypeRefSeq.erl b/lib/asn1/test/testSetTypeRefSeq.erl
index a3ef4b188d..a2b5f5745e 100644
--- a/lib/asn1/test/testSetTypeRefSeq.erl
+++ b/lib/asn1/test/testSetTypeRefSeq.erl
@@ -28,39 +28,27 @@
 -record('SetSeqImp',{seqInt, seqOs}).
 -record('SetSeqExp',{seqInt, seqOs}).
 
-
-
 main(_Rules) ->
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SetTypeRefSeq','SetTRseq',
-		      #'SetTRseq'{'setSeq' = #'SetSeq'{seqOs = "A1",
+    roundtrip('SetTRseq',
+		      #'SetTRseq'{'setSeq' = #'SetSeq'{seqOs = <<"A1">>,
 						       seqInt = 2},
-				  'setSeqI' = #'SetSeq'{seqOs = "A2",
+				  'setSeqI' = #'SetSeq'{seqOs = <<"A2">>,
 							seqInt = 2},
-				  'setSeqE' = #'SetSeq'{seqOs = "A3",
+				  'setSeqE' = #'SetSeq'{seqOs = <<"A3">>,
 							seqInt = 2},
-				  'setSeq-I' = #'SetSeqImp'{seqOs = "A4",
+				  'setSeq-I' = #'SetSeqImp'{seqOs = <<"A4">>,
 							    seqInt = 2},
-				  'setSeqI-I' = #'SetSeqImp'{seqOs = "A5",
+				  'setSeqI-I' = #'SetSeqImp'{seqOs = <<"A5">>,
 							     seqInt = 2},
-				  'setSeqE-I' = #'SetSeqImp'{seqOs = "A6",
+				  'setSeqE-I' = #'SetSeqImp'{seqOs = <<"A6">>,
 							     seqInt = 2},
-				  'setSeq-E' = #'SetSeqExp'{seqOs = "A7",
+				  'setSeq-E' = #'SetSeqExp'{seqOs = <<"A7">>,
 							    seqInt = 2},
-				  'setSeqI-E' = #'SetSeqExp'{seqOs = "A8",
+				  'setSeqI-E' = #'SetSeqExp'{seqOs = <<"A8">>,
 							     seqInt = 2},
-				  'setSeqE-E' = #'SetSeqExp'{seqOs = "A9",
+				  'setSeqE-E' = #'SetSeqExp'{seqOs = <<"A9">>,
 							     seqInt = 2}}),
-    ?line {ok,{'SetTRseq',{'SetSeq',2,"A1"},
-	       {'SetSeq',2,"A2"},
-	       {'SetSeq',2,"A3"},
-	       {'SetSeqImp',2,"A4"},
-	       {'SetSeqImp',2,"A5"},
-	       {'SetSeqImp',2,"A6"},
-	       {'SetSeqExp',2,"A7"},
-	       {'SetSeqExp',2,"A8"},
-	       {'SetSeqExp',2,"A9"}}} = 
-	asn1_wrapper:decode('SetTypeRefSeq','SetTRseq',lists:flatten(Bytes41)),
-    
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetTypeRefSeq', T, V).
diff --git a/lib/asn1/test/testSetTypeRefSet.erl b/lib/asn1/test/testSetTypeRefSet.erl
index ce77316ef8..80a6be58c9 100644
--- a/lib/asn1/test/testSetTypeRefSet.erl
+++ b/lib/asn1/test/testSetTypeRefSet.erl
@@ -46,131 +46,42 @@
 
 
 main(_Rules) ->
-    
-    
-    ?line {ok,Bytes11} = 
-	asn1_wrapper:encode('SetTypeRefSet','Set1',#'Set1'{bool1 = true,
-						     int1 = 15,
-						     set1 = #'SetIn'{boolIn = true,
-								     intIn = 66}}), 
-    ?line {ok,{'Set1',true,15,{'SetIn',true,66}}} = 
-	asn1_wrapper:decode('SetTypeRefSet','Set1',lists:flatten(Bytes11)),
-    
-    
-    
-    ?line {ok,Bytes12} = 
-	asn1_wrapper:encode('SetTypeRefSet','Set2',#'Set2'{set2 = #'SetIn'{boolIn = true,
-								     intIn = 66},
-						     bool2 = true,
-						     int2 = 15}),    
-    ?line {ok,{'Set2',{'SetIn',true,66},true,15}} = 
-	asn1_wrapper:decode('SetTypeRefSet','Set2',lists:flatten(Bytes12)),
-    
-    
-    ?line {ok,Bytes13} = 
-	asn1_wrapper:encode('SetTypeRefSet','Set3',#'Set3'{bool3 = true,
-						     set3 = #'SetIn'{boolIn = true,
-								     intIn = 66},
-						     int3 = 15}),    
-    ?line {ok,{'Set3',true,{'SetIn',true,66},15}} = 
-	asn1_wrapper:decode('SetTypeRefSet','Set3',lists:flatten(Bytes13)),
-    
-    
-    
-    ?line {ok,Bytes14} = 
-	asn1_wrapper:encode('SetTypeRefSet','Set4',#'Set4'{set41 = #'SetIn'{boolIn = true,
-								      intIn = 66},
-						     set42 = #'SetIn'{boolIn = true,
-								      intIn = 66},
-						     set43 = #'SetIn'{boolIn = true,
-								      intIn = 66}}),    
-    ?line {ok,{'Set4',{'SetIn',true,66},{'SetIn',true,66},{'SetIn',true,66}}} = 
-	asn1_wrapper:decode('SetTypeRefSet','Set4',lists:flatten(Bytes14)),
-    
-    
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes21} = 
-	asn1_wrapper:encode('SetTypeRefSet','SetS1',#'SetS1'{boolS1 = true,
-						       intS1 = 15,
-						       setS1 = #'SetS1_setS1'{boolIn = true,
-									      intIn = 66}}), 
-    ?line {ok,{'SetS1',true,15,{'SetS1_setS1',true,66}}} = 
-	asn1_wrapper:decode('SetTypeRefSet','SetS1',lists:flatten(Bytes21)),
-    
-    
-    ?line {ok,Bytes22} = 
-	asn1_wrapper:encode('SetTypeRefSet','SetS2',#'SetS2'{setS2 = #'SetS2_setS2'{boolIn = true,
-									      intIn = 66},
-						       boolS2 = true,
-						       intS2 = 15}),    
-    ?line {ok,{'SetS2',{'SetS2_setS2',true,66},true,15}} = 
-	asn1_wrapper:decode('SetTypeRefSet','SetS2',lists:flatten(Bytes22)),
-    
-    
-    
-    ?line {ok,Bytes23} = 
-	asn1_wrapper:encode('SetTypeRefSet','SetS3',#'SetS3'{boolS3 = true,
-						       setS3 = #'SetS3_setS3'{boolIn = true,
-									      intIn = 66},
-						       intS3 = 15}),    
-    ?line {ok,{'SetS3',true,{'SetS3_setS3',true,66},15}} = 
-	asn1_wrapper:decode('SetTypeRefSet','SetS3',lists:flatten(Bytes23)),
-    
-    
-    
-    
-    
-    
-    ?line {ok,Bytes31} = 
-	asn1_wrapper:encode('SetTypeRefSet','SetSTag',#'SetSTag'{setS1 = #'SetSTag_setS1'{b1 = true,
-										    i1 = 11},
-							   setS2 = #'SetSTag_setS2'{b2 = true,
-										    i2 = 22},
-							   setS3 = #'SetSTag_setS3'{b3 = true,
-										    i3 = 33}}),    
-    ?line {ok,{'SetSTag',{'SetSTag_setS1',true,11},
-	       {'SetSTag_setS2',true,22},
-	       {'SetSTag_setS3',true,33}}} = 
-	asn1_wrapper:decode('SetTypeRefSet','SetSTag',lists:flatten(Bytes31)),
-    
-    
-    
-    
-    
-    ?line {ok,Bytes41} = 
-	asn1_wrapper:encode('SetTypeRefSet','SetTRset',
-		      #'SetTRset'{'setSet' = #'SetSet'{setOs = "A1",
-						       setInt = 2},
-				  'setSetI' = #'SetSet'{setOs = "A2",
-							setInt = 2},
-				  'setSetE' = #'SetSet'{setOs = "A3",
-							setInt = 2},
-				  'setSet-I' = #'SetSetImp'{setOs = "A4",
-							    setInt = 2},
-				  'setSetI-I' = #'SetSetImp'{setOs = "A5",
-							     setInt = 2},
-				  'setSetE-I' = #'SetSetImp'{setOs = "A6",
-							     setInt = 2},
-				  'setSet-E' = #'SetSetExp'{setOs = "A7",
-							    setInt = 2},
-				  'setSetI-E' = #'SetSetExp'{setOs = "A8",
-							     setInt = 2},
-				  'setSetE-E' = #'SetSetExp'{setOs = "A9",
-							     setInt = 2}}),
-    ?line {ok,{'SetTRset',{'SetSet',2,"A1"},
-      {'SetSet',2,"A2"},
-      {'SetSet',2,"A3"},
-      {'SetSetImp',2,"A4"},
-      {'SetSetImp',2,"A5"},
-      {'SetSetImp',2,"A6"},
-      {'SetSetExp',2,"A7"},
-      {'SetSetExp',2,"A8"},
-      {'SetSetExp',2,"A9"}}} = 
-	asn1_wrapper:decode('SetTypeRefSet','SetTRset',lists:flatten(Bytes41)),
+    roundtrip('Set1',
+	      #'Set1'{bool1=true,int1=15,set1=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('Set2',
+	      #'Set2'{set2=#'SetIn'{boolIn=true,intIn=66},bool2=true,int2=15}),
+    roundtrip('Set3',
+	      #'Set3'{bool3=true,set3=#'SetIn'{boolIn=true,intIn=66},int3=15}),
+    roundtrip('Set4',
+	      #'Set4'{set41=#'SetIn'{boolIn=true,intIn=66},
+		      set42=#'SetIn'{boolIn=true,intIn=66},
+		      set43=#'SetIn'{boolIn=true,intIn=66}}),
+    roundtrip('SetS1',
+	      #'SetS1'{boolS1=true,intS1=15,
+		       setS1=#'SetS1_setS1'{boolIn=true,intIn=66}}),
+    roundtrip('SetS2',
+	      #'SetS2'{setS2=#'SetS2_setS2'{boolIn=true,intIn=66},
+		       boolS2=true,intS2=15}),
+    roundtrip('SetS3',
+	      #'SetS3'{boolS3=true,
+		       setS3=#'SetS3_setS3'{boolIn=true,intIn=66},
+		       intS3=15}),
+    roundtrip('SetSTag',
+	      #'SetSTag'{setS1=#'SetSTag_setS1'{b1=true,i1=11},
+			 setS2=#'SetSTag_setS2'{b2=true,i2=22},
+			 setS3=#'SetSTag_setS3'{b3=true,i3=33}}),
+    roundtrip('SetTRset',
+	      #'SetTRset'{setSet=#'SetSet'{setInt=2,setOs = <<"A1">>},
+			  setSetI=#'SetSet'{setInt=2,setOs = <<"A2">>},
+			  setSetE=#'SetSet'{setInt=2,setOs = <<"A3">>},
+			  'setSet-I'=#'SetSetImp'{setInt=2,setOs = <<"A4">>},
+			  'setSetI-I'=#'SetSetImp'{setInt=2,setOs = <<"A5">>},
+			  'setSetE-I'=#'SetSetImp'{setInt=2,setOs = <<"A6">>},
+			  'setSet-E'=#'SetSetExp'{setInt=2,setOs = <<"A7">>},
+			  'setSetI-E'=#'SetSetExp'{setInt=2,setOs = <<"A8">>},
+			  'setSetE-E'=#'SetSetExp'{setInt=2,setOs = <<"A9">>}}),
     
     ok.
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SetTypeRefSet', T, V).
diff --git a/lib/asn1/test/testTCAP.erl b/lib/asn1/test/testTCAP.erl
index aba13c94de..17511dc2b7 100644
--- a/lib/asn1/test/testTCAP.erl
+++ b/lib/asn1/test/testTCAP.erl
@@ -40,25 +40,26 @@ compile_asn1config(Config, Options) ->
 test(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)),
+    {ok,_Res} = 'TCAPMessages-simple':decode('MessageType',
+					     val_OTP_4798(Erule)),
+
     %% testing OTP-4799, absent optional open type
-    ?line {ok,_Res2} = asn1_wrapper:decode('TCAPMessages-simple','MessageType',val_OTP_4799(Erule)),
+    {ok,_Res2} = 'TCAPMessages-simple':decode('MessageType',
+					      val_OTP_4799(Erule)),
+
     %% testing vance shipley's problems. Parameterized object sets.
     ?line Val3 = 'TCAPPackage_msg':val('PackageType',unidirectional),
-    ?line {ok,Bytes3} = asn1_wrapper:encode('TCAPPackage','PackageType',Val3),
-    ?line {ok,Res3} = asn1_wrapper:decode('TCAPPackage','PackageType',Bytes3),
+    Res3 = enc_dec('PackageType', Val3),
     ?line ok = 'TCAPPackage_msg':check_result('PackageType',unidirectional,Res3),
 %%    ?line io:format("Res3:~n~p~n~n",[Res3]),
     
     ?line Val4 = 'TCAPPackage_msg':val('PackageType',abort),
-    ?line {ok,Bytes4} = asn1_wrapper:encode('TCAPPackage','PackageType',Val4),
-    ?line {ok,Res4} = asn1_wrapper:decode('TCAPPackage','PackageType',Bytes4),
+    Res4 = enc_dec('PackageType', Val4),
     ?line ok = 'TCAPPackage_msg':check_result('PackageType',abort,Res4),
 %%    ?line io:format("Res4:~n~p~n~n",[Res4]),
 
     ?line Val5 = 'TCAPPackage_msg':val('PackageType',response),
-    ?line {ok,Bytes5} = asn1_wrapper:encode('TCAPPackage','PackageType',Val5),
-    ?line {ok,Res5} = asn1_wrapper:decode('TCAPPackage','PackageType',Bytes5),
+    Res5 = enc_dec('PackageType', Val5),
     ?line ok = 'TCAPPackage_msg':check_result('PackageType',response,Res5).
 %%    ?line io:format("Res5:~n~p~n~n",[Res5]).
 
@@ -73,21 +74,26 @@ val_OTP_4799(_) ->
     <<100,16,73,4,41,182,36,0,108,8,163,6,2,1,29,2,1,27>>.
 
 test_asn1config() ->
-    ?line Val = 'TCAPPackage_msg':val('PackageType',queryWithPerm),
-    ?line {ok,B} = asn1_wrapper:encode('TCAPPackage','PackageType',Val),
-    ?line {ok,ExMsg}='TCAPPackage':decode_PackageType(list_to_binary(B)),
-    ?line {_,{_,_,_,{Key,ExVal}}}=ExMsg,
-    ?line {ok,_Parts}='TCAPPackage':decode_part(Key,ExVal),
+    Val = 'TCAPPackage_msg':val('PackageType', queryWithPerm),
+    {ok,B} = 'TCAPPackage':encode('PackageType', Val),
+    {ok,ExMsg}='TCAPPackage':decode_PackageType(B),
+    {_,{_,_,_,{Key,ExVal}}} = ExMsg,
+    {ok,_Parts} = 'TCAPPackage':decode_part(Key, ExVal),
     
-    ?line Val2 = 'TCAPPackage_msg':val('TransactionPDU'),
-    ?line {ok,B2} = 'TCAPPackage':encode('TransactionPDU',Val2),
-    {ok,ExMsg2}='TCAPPackage':decode_TransactionPDU(B2),
-    ?line {_,_,_,{Key2,ExVal2}}=ExMsg2,
-    ?line {ok,_Parts2}='TCAPPackage':decode_part(Key2,ExVal2),
+    Val2 = 'TCAPPackage_msg':val('TransactionPDU'),
+    {ok,B2} = 'TCAPPackage':encode('TransactionPDU', Val2),
+    {ok,ExMsg2} = 'TCAPPackage':decode_TransactionPDU(B2),
+    {_,_,_,{Key2,ExVal2}} = ExMsg2,
+    {ok,_Parts2} = 'TCAPPackage':decode_part(Key2, ExVal2),
 
-    ?line Val3 = 'TCAPPackage_msg':val('PackageType',response),
-    ?line {ok,B3} = asn1_wrapper:encode('TCAPPackage','PackageType',Val3),
-    ?line {ok,ExMsg3}='TCAPPackage':decode_PackageType(list_to_binary(B3)),
-    ?line {_,{_,_,_,{Key3,ExVal3}}}=ExMsg3,
-    ?line {ok,_Parts3}='TCAPPackage':decode_part(Key3,ExVal3).
+    Val3 = 'TCAPPackage_msg':val('PackageType', response),
+    {ok,B3} = 'TCAPPackage':encode('PackageType', Val3),
+    {ok,ExMsg3} = 'TCAPPackage':decode_PackageType(B3),
+    {_,{_,_,_,{Key3,ExVal3}}} = ExMsg3,
+    {ok,_Parts3}='TCAPPackage':decode_part(Key3, ExVal3).
     
+enc_dec(T, V0) ->
+    M = 'TCAPPackage',
+    {ok,Enc} = M:encode(T, V0),
+    {ok,V} = M:decode(T, Enc),
+    V.
diff --git a/lib/asn1/test/testTimer.erl b/lib/asn1/test/testTimer.erl
index cd7ceb5630..89bc2b463d 100644
--- a/lib/asn1/test/testTimer.erl
+++ b/lib/asn1/test/testTimer.erl
@@ -18,166 +18,141 @@
 %%
 %%
 -module(testTimer).
-
--compile(export_all).
-%%-export([Function/Arity, ...]).
+-export([go/0]).
 
 -include_lib("test_server/include/test_server.hrl").
 
 -define(times, 5000).
 
 val() ->
-    _Value = {'H323-UserInformation',{'H323-UU-PDU',
-                            {callProceeding,
-                                {'CallProceeding-UUIE',
-                                    {0,8,222},
-                                    {'EndpointType',
-                                        {'NonStandardParameter',
-                                            {object,{0,9,237}},
-                                            "O"},
-                                        {'VendorIdentifier',
-                                            {'H221NonStandard',62,63,16282},
-                                            "OC",
-                                            "OC"},
-                                        {'GatekeeperInfo',
-                                            {'NonStandardParameter',
-                                                {object,{0,10,260}},
-                                                "O"}},
-                                        {'GatewayInfo',
-                                            [{h320,
-                                                 {'H320Caps',
-                                                     {'NonStandardParameter',
-                                                         {object,{0,11,282}},
-                                                         "O"},
-                                                     [{'DataRate',
-                                                          {'NonStandardParameter',
-                                                              {object,
-                                                                  {0,11,295}},
-                                                              "O"},
-                                                          1290470518,
-                                                          78}],
-                                                     [{'SupportedPrefix',
-                                                          {'NonStandardParameter',
-                                                              {object,
-                                                                  {0,12,312}},
-                                                              "O"},
-                                                          {'h323-ID',"BM"}}]}}], 
-                                            {'NonStandardParameter',
-                                                {object,{0,13,326}},
-                                                "O"}},
-                                        {'McuInfo',
-                                            {'NonStandardParameter',
-                                                {object,{1,13,340,340}},
-                                                "OC"}},
-                                        {'TerminalInfo',
-                                            {'NonStandardParameter',
-                                                {object,{1,14,353,354}},
-                                                "OC"}},
-                                        true,
-                                        true},
-                                    {ipxAddress,
-                                        {'TransportAddress_ipxAddress',
-                                            "OCTET ",
-                                            "OCTE",
-                                            "OC"}},
-                                    {'CallIdentifier',"OCTET STRINGOCTE"},
-                                    {noSecurity,'NULL'},
-                                    [{'ClearToken',
-                                         1667517741,
-                                         "BM",
-                                         {'DHset',[1],[1],[1]},
-                                         "OCTET STR",
-                                         -26430296,
-                                         {'TypedCertificate',
-                                             {1,16,405,406},
-                                             "OC"},
-                                         "BMP",
-                                         {'NonStandardParameter',
-                                             {1,16,414,415},
-                                             "OC"}},
-                                     {'ClearToken',
-                                         1817656756,
-                                         "BMP",
-                                         {'DHset',[1],[1],[1]},
-                                         "OCTET STRI",
-                                         -16356110,
-                                         {'TypedCertificate',
-                                             {1,17,442,443},
-                                             "OC"},
-                                         "BMP",
-                                         {'NonStandardParameter',
-                                             {1,18,452,452},
-                                             "OC"}}],
-                                    [{cryptoGKPwdEncr,
-                                         {'CryptoH323Token_cryptoGKPwdEncr',
-                                             {1,18,467,467},
-                                             {'Params',-7477016,"OCTET ST"},
-                                             "OC"}},
-                                     {cryptoGKPwdEncr,
-                                         {'CryptoH323Token_cryptoGKPwdEncr',
-                                             {1,19,486,486},
-                                             {'Params',-2404513,"OCTET ST"},
-                                             []}}],
-                                    []}},
-                            {'NonStandardParameter',{object,{0,3,84}},[]},
-                            [],
-                            true,
-                            [],
-                            []},
-                        {'H323-UserInformation_user-data',24,"O"}}.
+    {'H323-UserInformation',{'H323-UU-PDU',
+			     {callProceeding,
+			      {'CallProceeding-UUIE',
+			       {0,8,222},
+			       {'EndpointType',
+				{'NonStandardParameter',
+				 {object,{0,9,237}},
+				 <<"O">>},
+				{'VendorIdentifier',
+				 {'H221NonStandard',62,63,16282},
+				 <<"OC">>,
+				 <<"OC">>},
+				{'GatekeeperInfo',
+				 {'NonStandardParameter',
+				  {object,{0,10,260}},
+				  <<"O">>}},
+				{'GatewayInfo',
+				 [{h320,
+				   {'H320Caps',
+				    {'NonStandardParameter',
+				     {object,{0,11,282}},
+				     <<"O">>},
+				    [{'DataRate',
+				      {'NonStandardParameter',
+				       {object,
+					{0,11,295}},
+				       <<"O">>},
+				      1290470518,
+				      78}],
+				    [{'SupportedPrefix',
+				      {'NonStandardParameter',
+				       {object,
+					{0,12,312}},
+				       <<"O">>},
+				      {'h323-ID',"BM"}}]}}],
+				 {'NonStandardParameter',
+				  {object,{0,13,326}},
+				  <<"O">>}},
+				{'McuInfo',
+				 {'NonStandardParameter',
+				  {object,{1,13,340,340}},
+				  <<"OC">>}},
+				{'TerminalInfo',
+				 {'NonStandardParameter',
+				  {object,{1,14,353,354}},
+				  <<"OC">>}},
+				true,
+				true},
+			       {ipxAddress,
+				{'TransportAddress_ipxAddress',
+				 <<"OCTET ">>,
+				 <<"OCTE">>,
+				 <<"OC">>}},
+			       {'CallIdentifier',<<"OCTET STRINGOCTE">>},
+			       {noSecurity,'NULL'},
+			       [{'ClearToken',
+				 1667517741,
+				 "BM",
+				 {'DHset',<<1:1>>,<<1:1>>,<<1:1>>},
+				 <<"OCTET STR">>,
+				 -26430296,
+				 {'TypedCertificate',
+				  {1,16,405,406},
+				  <<"OC">>},
+				 "BMP",
+				 {'NonStandardParameter',
+				  {1,16,414,415},
+				  <<"OC">>}},
+				{'ClearToken',
+				 1817656756,
+				 "BMP",
+				 {'DHset',<<1:1>>,<<1:1>>,<<1:1>>},
+				 <<"OCTET STRI">>,
+				 -16356110,
+				 {'TypedCertificate',
+				  {1,17,442,443},
+				  <<"OC">>},
+				 "BMP",
+				 {'NonStandardParameter',
+				  {1,18,452,452},
+				  <<"OC">>}}],
+			       [{cryptoGKPwdEncr,
+				 {'CryptoH323Token_cryptoGKPwdEncr',
+				  {1,18,467,467},
+				  {'Params',-7477016,<<"OCTET ST">>},
+				  <<"OC">>}},
+				{cryptoGKPwdEncr,
+				 {'CryptoH323Token_cryptoGKPwdEncr',
+				  {1,19,486,486},
+				  {'Params',-2404513,<<"OCTET ST">>},
+				  <<>>}}],
+			       []}},
+			     {'NonStandardParameter',{object,{0,3,84}},<<>>},
+			     [],
+			     true,
+			     [],
+			     []},
+     {'H323-UserInformation_user-data',24,<<"O">>}}.
     
 
-go(Config,Enc) ->
-    ?line true = code:add_patha(?config(priv_dir,Config)),
-
+go() ->
     Module = 'H323-MESSAGES',
     Type = 'H323-UserInformation',
     Value = val(),
-    {ok,Bytes} = asn1rt:encode(Module,Type,Value),
-
-    CompileOptions = compile_options(),
-    
-    ?line {ValWr, done} = timer:tc(?MODULE, encode, [?times, Module, Type, Value]),
-    ?line io:format("ASN1 encode ~p: ~p micro~n", [CompileOptions, ValWr / ?times]),
+    Bytes = Module:encode(Type, Value),
+    Value = Module:decode(Type, Bytes),
 
-    ?line done = decode(2,Module,Type,Bytes,Enc),
+    {ValWr,done} = timer:tc(fun() -> encode(?times, Module, Type, Value) end),
+    io:format("ASN.1 encoding: ~p micro~n", [ValWr / ?times]),
 
-    ?line {ValRead, done} = timer:tc(?MODULE, decode, [?times, Module, 
-						 Type, Bytes,Enc]),
-    ?line io:format("ASN1 decode ~p: ~p micro~n", [CompileOptions, ValRead /?times]),
+    done = decode(2, Module, Type, Bytes),
 
+    {ValRead,done} = timer:tc(fun() -> decode(?times, Module, Type, Bytes) end),
+    io:format("ASN.1 decoding: ~p micro~n", [ValRead /?times]),
 
-    ?line Comment = "encode: "++integer_to_list(round(ValWr/?times))++
-	" micro, decode: "++integer_to_list(round(ValRead /?times))++
-	" micro.  " ++ CompileOptions,
+    Comment = "encode: "++integer_to_list(round(ValWr/?times)) ++
+	" micro, decode: "++integer_to_list(round(ValRead /?times)) ++
+	" micro. [" ++ atom_to_list(Module:encoding_rule()) ++ "]",
     {comment,Comment}.
 
 encode(0, _Module,_Type,_Value) ->
     done;
 encode(N, Module,Type,Value) ->
-    ?line {ok,B} = asn1rt:encode(Module,Type,Value),
-    _B2 = if 
-             is_list(B) -> list_to_binary(B);
-             true -> B
-         end,
-    encode(N-1, Module,Type,Value).
+    Module:encode(Type, Value),
+    encode(N-1, Module, Type, Value).
 
-decode(0, _Module,_Type,_Value,_Erule) ->
+decode(0, _Module, _Type, _Value) ->
     done;
-decode(N, Module,Type,Value,Erule) ->
-    {ok,_B} = asn1rt:decode(Module,Type,Value),
-    decode(N-1, Module,Type,Value,Erule).
-
-compile_options() ->
-    {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.
-    
+decode(N, Module, Type, Value) ->
+    Module:decode(Type, Value),
+    decode(N-1, Module, Type, Value).
diff --git a/lib/asn1/test/testTypeValueNotation.erl b/lib/asn1/test/testTypeValueNotation.erl
index 61d69edd0e..2b5f3f74c1 100644
--- a/lib/asn1/test/testTypeValueNotation.erl
+++ b/lib/asn1/test/testTypeValueNotation.erl
@@ -24,13 +24,15 @@
 -record('Seq', {octstr, int, bool, enum, bitstr, null, oid, vstr}).
 
 main(_Rule, _Option) ->
-    Value1 = #'Seq'{octstr = [1, 2, 3, 4],
-                    int = 12,
-                    bool = true,
-                    enum = a,
-                    bitstr = <<2#1010:4>>,
-                    null = 'NULL',
-                    oid = {1, 2, 55},
-                    vstr = "Hello World"},
-    {ok, Bytes} = asn1_wrapper:encode('SeqTypeRefPrim', 'Seq', Value1),
-    {ok, Value1} = asn1_wrapper:decode('SeqTypeRefPrim', 'Seq', Bytes).
+    Value = #'Seq'{octstr = <<1,2,3,4>>,
+		   int = 12,
+		   bool = true,
+		   enum = a,
+		   bitstr = <<2#1010:4>>,
+		   null = 'NULL',
+		   oid = {1, 2, 55},
+		   vstr = "Hello World"},
+    roundtrip('Seq', Value).
+
+roundtrip(T, V) ->
+    asn1_test_lib:roundtrip('SeqTypeRefPrim', T, V).
diff --git a/lib/asn1/test/testWSParamClass.erl b/lib/asn1/test/testWSParamClass.erl
index ae67ca8b81..66ba56a6d8 100644
--- a/lib/asn1/test/testWSParamClass.erl
+++ b/lib/asn1/test/testWSParamClass.erl
@@ -11,7 +11,4 @@ main(_) ->
     ok.
 
 roundtrip(Data) ->
-    IF = 'InformationFramework',
-    {ok,Enc} = asn1_wrapper:encode(IF, 'Attribute', Data),
-    {ok,Data} = IF:decode('Attribute', Enc),
-    ok.
+    asn1_test_lib:roundtrip('InformationFramework', 'Attribute', Data).
diff --git a/lib/asn1/test/testX420.erl b/lib/asn1/test/testX420.erl
index 70bdb0640d..4ddc55dc16 100644
--- a/lib/asn1/test/testX420.erl
+++ b/lib/asn1/test/testX420.erl
@@ -27,21 +27,11 @@
 
 
 compile(Erule, Options, Config) ->
-    Specs = specs(),
-    99 = length(Specs),
-    ok = compile_loop(Erule,Specs,Options,Config).
-
-compile_loop(_Erule, [], _Options, _Config) ->
-    ok;
-compile_loop(Erule, [Spec|Specs], Options, Config)
-  when Erule =:= ber; Erule =:= per ->
+    Specs0 = specs(),
+    99 = length(Specs0),
     CaseDir = ?config(case_dir, Config),
-    asn1_test_lib:compile(filename:join([x420, Spec]), Config,
-                          [Erule, {i, CaseDir} | Options]),
-    compile_loop(Erule, Specs, Options, Config);
-compile_loop(_Erule, _Specs, _Options, _Config) ->
-    ok.
-
+    Specs = [filename:join(x420, Spec) || Spec <- Specs0],
+    asn1_test_lib:compile_all(Specs, Config, [Erule,{i,CaseDir}|Options]).
 
 specs() ->
     ["ACSE-1", "AuthenticationFramework", "BasicAccessControl",
@@ -93,9 +83,9 @@ specs() ->
 ticket7759(_Erule,_Config) ->
     Encoded = encoded_msg(),
     io:format("Testing ticket7759 ...~n",[]),
-    ?line {ok, ContentInfo} = asn1_wrapper:decode('PKCS7','ContentInfo',Encoded),
-    ?line {'ContentInfo',_Id,PKCS7_content} = ContentInfo,
-    ?line {ok,_} = asn1_wrapper:decode('PKCS7','SignedData',PKCS7_content),
+    {ok, ContentInfo} = 'PKCS7':decode('ContentInfo',Encoded),
+    {'ContentInfo',_Id,PKCS7_content} = ContentInfo,
+    {ok,_} = 'PKCS7':decode('SignedData',PKCS7_content),
     ok.
 
 
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 179299c78d..7f358e863c 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -123,7 +123,7 @@ verbose(Config) when is_list(Config) ->
     ?line ok = asn1ct:compile(Asn1File, [{i,DataDir},{outdir,OutDir},noobj,verbose]),
     ?line test_server:capture_stop(),
     ?line [Line0|_] = test_server:capture_get(),
-    ?line true = lists:prefix("Erlang ASN.1 version", Line0),
+    ?line true = lists:prefix("Erlang ASN.1 compiler", Line0),
 
     %% Test non-verbose compile
     ?line test_server:capture_start(),
diff --git a/lib/asn1/test/test_driver_load.erl b/lib/asn1/test/test_driver_load.erl
deleted file mode 100644
index e0e6602046..0000000000
--- a/lib/asn1/test/test_driver_load.erl
+++ /dev/null
@@ -1,45 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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_driver_load).
-
--export([test/1,encode/0]).
-
--include_lib("test_server/include/test_server.hrl").
-
-
-test(0) ->
-    ok;
-test(N) ->
-    spawn(?MODULE,encode,[]),
-    test(N-1).
-
-encode() ->
-    ?line Msg = msg(),
-    ?line {ok,_}=asn1_wrapper:encode('P-Record','PersonnelRecord',Msg),
-    ok.
-
-msg() ->
-    {'PersonnelRecord',{'Name',"John","P","Smith"},
-     "Director",
-     51,
-     "19710917",
-     {'Name',"Mary","T","Smith"},
-     [{'ChildInformation',{'Name',"Ralph","T","Smith"},"19571111"},{'ChildInformation',{'Name',"Susan","B","Jones"},"19590717"}]}.
-    
diff --git a/lib/asn1/test/test_modified_x420.erl b/lib/asn1/test/test_modified_x420.erl
index a525fd6ae1..0df72a1831 100644
--- a/lib/asn1/test/test_modified_x420.erl
+++ b/lib/asn1/test/test_modified_x420.erl
@@ -26,8 +26,9 @@ test(Config) ->
     DataDir = ?config(data_dir,Config),
 
     Der = read_pem(filename:join([DataDir,modified_x420,"p7_signed_data.pem"])),
-    {ok,{_,_,SignedData}} = asn1_wrapper:decode('PKCS7', 'ContentInfo', Der),
-    {ok,_} = asn1_wrapper:decode('PKCS7', 'SignedData', SignedData).
+    {ok,{_,_,SignedData}} = 'PKCS7':decode( 'ContentInfo', Der),
+    {ok,_} = 'PKCS7':decode('SignedData', SignedData),
+    ok.
 
 read_pem(File) ->    
     {ok,Bin} = file:read_file(File),
diff --git a/lib/asn1/test/test_partial_incomplete_decode.erl b/lib/asn1/test/test_partial_incomplete_decode.erl
index 8ede06938d..4a8a4cd74c 100644
--- a/lib/asn1/test/test_partial_incomplete_decode.erl
+++ b/lib/asn1/test/test_partial_incomplete_decode.erl
@@ -25,84 +25,57 @@
 
 test(Config) ->
     FMsg = msg('F'),
-    ?line {ok,Bytes} = asn1_wrapper:encode('PartialDecSeq','F',FMsg),
-    ?line {ok,_} = asn1_wrapper:decode('PartialDecSeq','F',Bytes),
-    ?line {ok,IncFMsg} =
-	'PartialDecSeq':decode_F_fb_incomplete(list_to_binary(Bytes)),
-    ?line decode_parts('F',IncFMsg),
+    Bytes1 = roundtrip('PartialDecSeq', 'F', FMsg),
+    {ok,IncFMsg} = 'PartialDecSeq':decode_F_fb_incomplete(Bytes1),
+    decode_parts('F', IncFMsg),
+    {ok,IncF2Msg} = 'PartialDecSeq':decode_F_fb_exclusive2(Bytes1),
+    decode_parts('F2', IncF2Msg),
     
     DMsg = msg('D'),
-    ?line {ok,Bytes2} = asn1_wrapper:encode('PartialDecSeq','D',DMsg),
-    ?line {ok,_} = asn1_wrapper:decode('PartialDecSeq','D',Bytes2),
-    ?line {ok,IncDMsg} =
-	'PartialDecSeq':decode_D_incomplete(list_to_binary(Bytes2)),
-    ?line decode_parts('D',IncDMsg),
-    
-    ?line {ok,IncF2Msg} =
-	'PartialDecSeq':decode_F_fb_exclusive2(list_to_binary(Bytes)),
-    ?line decode_parts('F2',IncF2Msg),
+    Bytes2 = roundtrip('PartialDecSeq', 'D', DMsg),
+    {ok,IncDMsg} = 'PartialDecSeq':decode_D_incomplete(Bytes2),
+    decode_parts('D', IncDMsg),
 
     F3Msg = msg('F3'),
-    ?line {ok,BytesF3} = asn1_wrapper:encode('PartialDecSeq','F',F3Msg),
-    ?line {ok,_} = asn1_wrapper:decode('PartialDecSeq','F',BytesF3),
-    ?line {ok,IncF3Msg} =
-	'PartialDecSeq':decode_F_fb_exclusive3(list_to_binary(BytesF3)),
-    ?line decode_parts('F3',IncF3Msg),
-
-
-    AMsg =msg('A'),
-    ?line {ok,Bytes3} = asn1_wrapper:encode('PartialDecSeq2','A',AMsg),
-    ?line {ok,_} = asn1_wrapper:decode('PartialDecSeq2','A',Bytes3),
-    ?line {ok,IncFMsg3} =
-	'PartialDecSeq2':decode_A_c_b_incomplete(list_to_binary(Bytes3)),
-    ?line decode_parts('A',IncFMsg3),
+    BytesF3 = roundtrip('PartialDecSeq', 'F', F3Msg),
+    {ok,IncF3Msg} = 'PartialDecSeq':decode_F_fb_exclusive3(BytesF3),
+    decode_parts('F3', IncF3Msg),
+
+    AMsg = msg('A'),
+    Bytes3 = roundtrip('PartialDecSeq2', 'A', AMsg),
+    {ok,IncFMsg3} = 'PartialDecSeq2':decode_A_c_b_incomplete(Bytes3),
+    decode_parts('A', IncFMsg3),
     
     MyHTTPMsg = msg('GetRequest'),
-    ?line {ok,Bytes4} = asn1_wrapper:encode('PartialDecMyHTTP',
-					    'GetRequest',MyHTTPMsg),
-    ?line {ok,_} = asn1_wrapper:decode('PartialDecMyHTTP','GetRequest',
-				       Bytes4),
-    ?line {ok,IncFMsg4} =
-	'PartialDecMyHTTP':decode_GetRequest_incomplete(list_to_binary(Bytes4)),
-    ?line decode_parts('GetRequest',IncFMsg4),
+    Bytes4 = roundtrip('PartialDecMyHTTP', 'GetRequest', MyHTTPMsg),
+    {ok,IncFMsg4} = 'PartialDecMyHTTP':decode_GetRequest_incomplete(Bytes4),
+    decode_parts('GetRequest', IncFMsg4),
     
     MsgS1_1 = msg('S1_1'),
-    ?line {ok,Bytes5} = asn1_wrapper:encode('PartialDecSeq3','S1',MsgS1_1),
-    ?line {ok,_} = asn1_wrapper:decode('PartialDecSeq3','S1',Bytes5),
-    ?line {ok,IncFMsg5} =
-	'PartialDecSeq3':decode_S1_incomplete(list_to_binary(Bytes5)),
-    ?line decode_parts('S1_1',IncFMsg5),
+    Bytes5 = roundtrip('PartialDecSeq3', 'S1', MsgS1_1),
+    {ok,IncFMsg5} = 'PartialDecSeq3':decode_S1_incomplete(Bytes5),
+    decode_parts('S1_1', IncFMsg5),
 
     MsgS1_2 = msg('S1_2'),
-    ?line {ok,Bytes6} = asn1_wrapper:encode('PartialDecSeq3','S1',MsgS1_2),
-    ?line {ok,IncFMsg6} =
-	'PartialDecSeq3':decode_S1_incomplete(list_to_binary(Bytes6)),
-    ?line ok = decode_parts('S1_2',IncFMsg6),
+    Bytes6 = roundtrip('PartialDecSeq3', 'S1', MsgS1_2),
+    {ok,IncFMsg6} = 'PartialDecSeq3':decode_S1_incomplete(Bytes6),
+    decode_parts('S1_2', IncFMsg6),
 
     %% test of MEDIA-GATEWAY-CONTROL
     test_megaco(Config),
     ok.
 
 test_megaco(Config) ->
-    ?line DataDir = ?config(data_dir,Config),
-    Mod='MEDIA-GATEWAY-CONTROL',
-    ?line {ok,FilenameList} = file:list_dir(filename:join([DataDir,
-							   megacomessages])),
-    %% remove any junk files that may be in the megacomessage directory
-    Pred = fun(X) ->
-		   case lists:reverse(X) of
-		       [$l,$a,$v,$.|_R] ->true;
-		       _ -> false
-		   end
-	   end,
-    MegacoMsgFilenameList = lists:filter(Pred,FilenameList),
-    Fun = fun(F) ->
-                  M = read_msg(filename:join([DataDir,megacomessages,F])),
-		  ?line {ok,B} = asn1_wrapper:encode(Mod,element(1,M),M),
-		  ?line exclusive_decode(list_to_binary(B),F)
-	  end,
-    ?line lists:foreach(Fun,MegacoMsgFilenameList),
-    ok.
+    DataDir = ?config(data_dir, Config),
+    Files = filelib:wildcard(filename:join([DataDir,megacomessages,"*.val"])),
+    Mod = 'MEDIA-GATEWAY-CONTROL',
+    lists:foreach(fun(File) ->
+			  {ok,Bin} = file:read_file(File),
+			  V = binary_to_term(Bin),
+			  T = element(1, V),
+			  Enc = roundtrip(Mod, T, V),
+			  exclusive_decode(Enc, File)
+		  end, Files).
 
 exclusive_decode(Bin,F) ->
     Mod='MEDIA-GATEWAY-CONTROL',
@@ -113,15 +86,6 @@ exclusive_decode(Bin,F) ->
     ?line {ok,_} = Mod:decode_part(MsgMBodyKey,MsgMBody),
     ok.
 
-
-read_msg(File) ->
-    case file:read_file(File) of
-        {ok,Bin} ->
-            binary_to_term(Bin);
-        _ -> 
-	    io:format("couldn't read file ~p~n",[File])
-    end.
-
 decode_parts('F',PartDecMsg) ->
     ?line {fb,{'E',35,{NameE_b,ListBinE_b},false,{NameE_d,BinE_d}}} = PartDecMsg,
     ?line {ok,[{'D',3,true}|_]} = 'PartialDecSeq':decode_part(NameE_b,ListBinE_b),
@@ -200,7 +164,10 @@ msg('A') ->
     {'A',12,{c,{'S',true,false}},{b,{'A_c_b',false,false}}};
 
 msg('GetRequest') ->
-    {'GetRequest',true,false,{'AcceptTypes',[1,1,1,1],["hell","othe","reho","peyo","uare","fine"]},"IamfineThankYOu"};
+    {'GetRequest',true,false,
+     {'AcceptTypes',[html,'plain-text',gif,jpeg],
+      ["hell","othe","reho","peyo","uare","fine"]},
+     "IamfineThankYOu"};
 
 msg('S1_1') ->
     {'S1',14,msg('S2'),msg('C1_a'),msg('SO1')};
@@ -213,10 +180,13 @@ msg('C1_a') ->
 msg('C1_b') ->
     {b,{'C1_b',11,true,msg('S4')}};
 msg('S3') ->
-    {'S3',10,"PrintableString","OCTETSTRING",[1,1,1,1]};
+    {'S3',10,"PrintableString","OCTETSTRING",[one,two,three,four]};
 msg('S4') ->
     {'S4',msg('Name'),"MSc"};
 msg('SO1') ->
     [msg('Name'),msg('Name'),msg('Name')];
 msg('Name') ->
     {'Name',"Hans","HCA","Andersen"}.
+
+roundtrip(M, T, V) ->
+    asn1_test_lib:roundtrip_enc(M, T, V).
diff --git a/lib/asn1/test/test_selective_decode.erl b/lib/asn1/test/test_selective_decode.erl
index ebe1296cf3..f42f24e0e3 100644
--- a/lib/asn1/test/test_selective_decode.erl
+++ b/lib/asn1/test/test_selective_decode.erl
@@ -18,39 +18,39 @@
 %%
 %%
 -module(test_selective_decode).
-
 -export([test/0]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-
 test() ->
     FMsg = msg('F'),
-    ?line {ok,Bytes} = asn1_wrapper:encode('PartialDecSeq','F',FMsg),
-    ?line {ok,3} =
-	'PartialDecSeq':selected_decode_F1(list_to_binary(Bytes)),
-    ?line {ok,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}]} = 'PartialDecSeq':selected_decode_F2(list_to_binary(Bytes)),
-    ?line {ok,{'D',3,true}} = 'PartialDecSeq':selected_decode_F3(list_to_binary(Bytes)),
-
-    ?line {ok,17} = 'PartialDecSeq':selected_decode_F4(list_to_binary(Bytes)),
+    Bytes = roundtrip('PartialDecSeq', 'F', FMsg),
+    {ok,3} = 'PartialDecSeq':selected_decode_F1(Bytes),
+    {ok,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},
+	 {'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},
+	 {'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}]} =
+	'PartialDecSeq':selected_decode_F2(Bytes),
+    {ok,{'D',3,true}} = 'PartialDecSeq':selected_decode_F3(Bytes),
+    {ok,17} = 'PartialDecSeq':selected_decode_F4(Bytes),
     
     EMsg = msg('E'),
-    ?line {ok,Bytes2} = asn1_wrapper:encode('PartialDecSeq','E',EMsg),
-    ?line {ok,14} = 'PartialDecSeq':selected_decode_E1(list_to_binary(Bytes2)),
+    Bytes2 = roundtrip('PartialDecSeq', 'E', EMsg),
+    {ok,14} = 'PartialDecSeq':selected_decode_E1(Bytes2),
+
     MGCMsg = msg('M-G-C'),
-    ?line {ok,Bytes3} = asn1_wrapper:encode('MEDIA-GATEWAY-CONTROL',
-					    'MegacoMessage',MGCMsg),
-    ?line {ok,1} = 'MEDIA-GATEWAY-CONTROL':decode_MegacoMessage_selective(list_to_binary(Bytes3)),
+    Bytes3 = roundtrip('MEDIA-GATEWAY-CONTROL', 'MegacoMessage', MGCMsg),
+    {ok,1} = 'MEDIA-GATEWAY-CONTROL':decode_MegacoMessage_selective(Bytes3),
 
     PRecMsg = {'PersonnelRecord',{'Name',"Sven","S","Svensson"},
 	       "manager",123,"20000202",{'Name',"Inga","K","Svensson"},
 	       asn1_DEFAULT},
-    ?line {ok,Bytes4} = asn1_wrapper:encode('P-Record','PersonnelRecord',
-					    PRecMsg),
-    ?line {ok,_} = 'P-Record':sel_dec(list_to_binary(Bytes4)),
-    ok.
-
+    PRecMsgDec = {'PersonnelRecord',{'Name',"Sven","S","Svensson"},
+		  "manager",123,"20000202",{'Name',"Inga","K","Svensson"},
+		  []},
+    Bytes4 = roundtrip('P-Record', 'PersonnelRecord', PRecMsg, PRecMsgDec),
+    {ok,_} = 'P-Record':sel_dec(Bytes4),
 
+    ok.
     
 msg('F') ->
     {fb,{'E',35,[{'D',3,true},{'D',4,false},{'D',5,true},{'D',6,true},{'D',7,false},{'D',8,true},{'D',9,true},{'D',10,false},{'D',11,true},{'D',12,true},{'D',13,false},{'D',14,true}],false,{da,[{'A',16,{'D',17,true}}]}}};
@@ -60,3 +60,10 @@ msg('E') ->
 
 msg('M-G-C') ->
     {'MegacoMessage',asn1_NOVALUE,{'Message',1,{ip4Address,{'IP4Address',[125,125,125,111],55555}},{transactions,[{transactionReply,{'TransactionReply',50007,asn1_NOVALUE,{actionReplies,[{'ActionReply',0,asn1_NOVALUE,asn1_NOVALUE,[{auditValueReply,{auditResult,{'AuditResult',{'TerminationID',[],[255,255,255]},[{mediaDescriptor,{'MediaDescriptor',asn1_NOVALUE,{multiStream,[{'StreamDescriptor',1,{'StreamParms',{'LocalControlDescriptor',sendRecv,asn1_NOVALUE,asn1_NOVALUE,[{'PropertyParm',[0,11,0,7],[[52,48]],asn1_NOVALUE}]},{'LocalRemoteDescriptor',[[{'PropertyParm',[0,0,176,1],[[48]],asn1_NOVALUE},{'PropertyParm',[0,0,176,8],[[73,78,32,73,80,52,32,49,50,53,46,49,50,53,46,49,50,53,46,49,49,49]],asn1_NOVALUE},{'PropertyParm',[0,0,176,15],[[97,117,100,105,111,32,49,49,49,49,32,82,84,80,47,65,86,80,32,32,52]],asn1_NOVALUE},{'PropertyParm',[0,0,176,12],[[112,116,105,109,101,58,51,48]],asn1_NOVALUE}]]},{'LocalRemoteDescriptor',[[{'PropertyParm',[0,0,176,1],[[48]],asn1_NOVALUE},{'PropertyParm',[0,0,176,8],[[73,78,32,73,80,52,32,49,50,52,46,49,50,52,46,49,50,52,46,50,50,50]],asn1_NOVALUE},{'PropertyParm',[0,0,176,15],[[97,117,100,105,111,32,50,50,50,50,32,82,84,80,47,65,86,80,32,32,52]],asn1_NOVALUE},{'PropertyParm',[0,0,176,12],[[112,116,105,109,101,58,51,48]],asn1_NOVALUE}]]}}}]}}},{packagesDescriptor,[{'PackagesItem',[0,11],1},{'PackagesItem',[0,11],1}]},{statisticsDescriptor,[{'StatisticsParameter',[0,12,0,4],[[49,50,48,48]]},{'StatisticsParameter',[0,11,0,2],[[54,50,51,48,48]]},{'StatisticsParameter',[0,12,0,5],[[55,48,48]]},{'StatisticsParameter',[0,11,0,3],[[52,53,49,48,48]]},{'StatisticsParameter',[0,12,0,6],[[48,46,50]]},{'StatisticsParameter',[0,12,0,7],[[50,48]]},{'StatisticsParameter',[0,12,0,8],[[52,48]]}]}]}}}]}]}}}]}}}.
+
+
+roundtrip(M, T, V) ->
+    asn1_test_lib:roundtrip_enc(M, T, V).
+
+roundtrip(M, T, V, E) ->
+    asn1_test_lib:roundtrip_enc(M, T, V, E).
diff --git a/lib/asn1/test/test_special_decode_performance.erl b/lib/asn1/test/test_special_decode_performance.erl
index 7dfab1f25a..0f52ae4cd2 100644
--- a/lib/asn1/test/test_special_decode_performance.erl
+++ b/lib/asn1/test/test_special_decode_performance.erl
@@ -19,7 +19,7 @@
 %%
 -module(test_special_decode_performance).
 
--export([go/1,loop2/4,loop1/5]).
+-export([go/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -49,7 +49,7 @@ go1(_,_,[],_,_,AccTime) ->
 %% go1 for common decode
 go1(common,Mod,_,Bin,N,_) ->
     ?line TT=get_top_type(Mod),
-    ?line {Time,Result}=timer:tc(?MODULE,loop1,[Mod,decode,TT,Bin,N]),
+    {Time,Result} = timer:tc(fun() -> loop1(Mod, decode, TT, Bin, N) end),
     case Result of
 	{ok,_R1} ->
 	    io:format("common Decode ~p:decode, ~p times on time ~p~n",
@@ -59,7 +59,7 @@ go1(common,Mod,_,Bin,N,_) ->
     end,
     Time;
 go1(Dec,Mod,[F|Fs],Bin,N,AccTime) ->
-    ?line {Time,Result}=timer:tc(?MODULE,loop2,[Mod,F,Bin,N]),
+    {Time,Result}=timer:tc(fun() -> loop2(Mod, F, Bin, N) end),
     case Result of
 	{ok,_R1} ->
 	    io:format("~p Decode ~p:~p, ~p times on time ~p~n",[Dec,Mod,F,N,Time]);
diff --git a/lib/asn1/test/test_undecoded_rest.erl b/lib/asn1/test/test_undecoded_rest.erl
index 36fd26ed59..91e614d38a 100644
--- a/lib/asn1/test/test_undecoded_rest.erl
+++ b/lib/asn1/test/test_undecoded_rest.erl
@@ -26,28 +26,42 @@
 
 %% testing OTP-5104
 
-test(Opt, Config) ->
-    {ok, Msg} = asn1ct:value('P-Record', 'PersonnelRecord',
-                             [{i, ?config(case_dir, Config)}]),
-    {ok, Bytes} = asn1_wrapper:encode('P-Record', 'PersonnelRecord', Msg),
-    Bytes2 = if  is_list(Bytes) ->
-                     Bytes ++ [55, 55, 55];
-                 is_binary(Bytes) ->
-                     iolist_to_binary([Bytes, <<55, 55, 55>>])
-             end,
-    case Opt of
-        undec_rest ->
-            {ok, Msg, R} = asn1_wrapper:decode('P-Record', 'PersonnelRecord',
-                                               Bytes2),
+test(Opts, Config) ->
+    {ok,Msg} = asn1ct:value('P-Record', 'PersonnelRecord',
+			    [{i,?config(case_dir, Config)}]),
+    Bytes0 = encode(Opts, 'PersonnelRecord', Msg),
+    Bytes1 = iolist_to_binary([Bytes0, <<55,55,55>>]),
+    case proplists:get_bool(undec_rest, Opts) of
+	true ->
+            {Msg,R} = decode(Opts, 'PersonnelRecord', Bytes1),
             case R of
-                <<55, 55, 55>> -> ok;
-                [55, 55, 55] -> ok;
+                <<55,55,55>> ->
+		    ok;
                 BStr when is_bitstring(BStr) ->
                     PadLen = (8 - (bit_size(BStr) rem 8)) rem 8,
-                    <<0, 55, 55, 55>> = <<0:PadLen, BStr/bitstring>>
+                    <<0,55,55,55>> = <<0:PadLen, BStr/bitstring>>
             end;
-        _ ->
-            {ok, Msg} = asn1_wrapper:decode('P-Record', 'PersonnelRecord',
-                                            Bytes2)
+        false ->
+            Msg = decode(Opts, 'PersonnelRecord', Bytes1)
     end,
     ok.
+
+encode(Opts, T, V) ->
+    M = 'P-Record',
+    case proplists:get_bool(no_ok_wrapper, Opts) of
+	false ->
+	    {ok,Enc} = M:encode(T, V),
+	    Enc;
+	true ->
+	    Enc = M:encode(T, V),
+	    true = is_binary(Enc),
+	    Enc
+    end.
+
+decode(Opts, T, E) ->
+    M = 'P-Record',
+    case {proplists:get_bool(no_ok_wrapper, Opts),M:decode(T, E)} of
+	{false,{ok,Val}} -> Val;
+	{false,{ok,Val,Rest}} -> {Val,Rest};
+	{true,Result} -> Result
+    end.
diff --git a/lib/asn1/test/test_x691.erl b/lib/asn1/test/test_x691.erl
index dcfa211d80..9b141e2389 100644
--- a/lib/asn1/test/test_x691.erl
+++ b/lib/asn1/test/test_x691.erl
@@ -18,50 +18,25 @@
 %%
 %%
 -module(test_x691).
-
--export([cases/2]).
+-export([cases/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
-cases(Erule,Variant) ->
-    MsgA1 = a1(),
-    ?line {ok,B1} = asn1_wrapper:encode('P-RecordA1','PersonnelRecord',MsgA1),
-    ?line {ok,MsgA1} = asn1_wrapper:decode('P-RecordA1','PersonnelRecord',B1),
-    io:format("compare_format(~p,B1) ->~p~nencval(a1,~p,binary) ->~p~n",
-	      [Erule,
-	       compare_format(Erule,B1),
-	       Variant,
-	       encval(a1,Variant,binary)]),
-    ?line true = (compare_format(Erule,B1) == encval(a1,Variant,binary)),
-    
-    MsgA2 = a2(),
-    ?line {ok,B2} = asn1_wrapper:encode('P-RecordA2','PersonnelRecord',MsgA2),
-    ?line {ok,MsgA2} = asn1_wrapper:decode('P-RecordA2','PersonnelRecord',B2),
-    io:format("compare_format(~p,B2) ->~p~nencval(a2,~p,binary) ->~p~n",
-	      [Erule,
-	       compare_format(Erule,B2),
-	       Variant,
-	       encval(a2,Variant,binary)]),
-    ?line true = (compare_format(Erule,B2) == encval(a2,Variant,binary)),
-
-    MsgA3 = a3(),
-    ?line {ok,B3} = asn1_wrapper:encode('P-RecordA3','PersonnelRecord',MsgA3),
-    ?line {ok,MsgA3} = asn1_wrapper:decode('P-RecordA3','PersonnelRecord',B3),
-    io:format("compare_format(~p,B3) ->~p~nencval(a3,~p,binary) ->~p~n",
-	      [Erule,
-	       compare_format(Erule,B3),
-	       Variant,
-	       encval(a3,Variant,binary)]),
-    ?line true = (compare_format(Erule,B3) == encval(a3,Variant,binary)).
-
-compare_format(Erule,Val) when is_list(Val) ->
-    compare_format(Erule,list_to_binary(Val));
-%% compare_format(per,Val) ->
-%%     binary_to_list(Val);
-compare_format(_,Val) ->
-    Val.
-
-a1() ->
+cases(Erule) ->
+    _ = [begin
+	     Mod = module(Name),
+	     Msg = msg(Name),
+	     Hex = encval(Name, Erule),
+	     Enc = asn1_test_lib:hex_to_bin(Hex),
+	     Enc = asn1_test_lib:roundtrip_enc(Mod, 'PersonnelRecord', Msg)
+	 end || Name <- [a1,a2,a3]],
+    ok.
+
+module(a1) -> 'P-RecordA1';
+module(a2) -> 'P-RecordA2';
+module(a3) -> 'P-RecordA3'.
+
+msg(a1) ->
     {'PersonnelRecord', 
      {'Name',"John", "P", "Smith"}, 
       "Director",
@@ -73,12 +48,10 @@ a1() ->
 	"19571111"}, 
        {'ChildInformation',
 	{'Name', "Susan", "B", "Jones"}, 
-	"19590717"}]}.
-
-a2() ->
-    a1().
-
-a3() ->
+	"19590717"}]};
+msg(a2) ->
+    msg(a1);
+msg(a3) ->
     {'PersonnelRecord',
      {'Name',"John", "P", "Smith"},
      "Director",
@@ -94,119 +67,15 @@ a3() ->
        "19590717",
        female}]}.
 
-encval(An,Variant,Encoding) when Encoding == hex; Encoding == binary ->
-    Msg = encval(An,Variant),
-    encoding(Encoding,Msg).
-
-encval(a1,aligned) ->
+encval(a1, per) ->
     "80044A6F 686E0150 05536D69 74680133 08446972 6563746F 72083139 37313039 3137044D 61727901 5405536D 69746802 0552616C 70680154 05536D69 74680831 39353731 31313105 53757361 6E014205 4A6F6E65 73083139 35393037 3137";
-encval(a1,unaligned) ->
+encval(a1, uper) ->
     "824ADFA3 700D005A 7B74F4D0 02661113 4F2CB8FA 6FE410C5 CB762C1C B16E0937 0F2F2035 0169EDD3 D340102D 2C3B3868 01A80B4F 6E9E9A02 18B96ADD 8B162C41 69F5E787 700C2059 5BF765E6 10C5CB57 2C1BB16E";
-encval(a2,aligned) ->
+encval(a2, per) ->
     "864A6F68 6E501053 6D697468 01330844 69726563 746F7219 7109170C 4D617279 5410536D 69746802 1052616C 70685410 536D6974 68195711 11105375 73616E42 104A6F6E 65731959 0717";
-encval(a2,unaligned) ->
+encval(a2, uper) ->
     "865D51D2 888A5125 F1809984 44D3CB2E 3E9BF90C B8848B86 7396E8A8 8A5125F1 81089B93 D71AA229 4497C632 AE222222 985CE521 885D54C1 70CAC838 B8";
-encval(a3,aligned) ->
+encval(a3, per) ->
     "40C04A6F 686E5008 536D6974 68000033 08446972 6563746F 72001971 0917034D 61727954 08536D69 74680100 52616C70 68540853 6D697468 00195711 11820053 7573616E 42084A6F 6E657300 19590717 010140";
-encval(a3,unaligned) ->
+encval(a3, uper) ->
     "40CBAA3A 5108A512 5F180330 889A7965 C7D37F20 CB8848B8 19CE5BA2 A114A24B E3011372 7AE35422 94497C61 95711118 22985CE5 21842EAA 60B832B2 0E2E0202 80".
-
-encoding(binary,Msg) ->
-    list_to_binary(bin(Msg));
-encoding(hex,Msg) ->
-    hex(Msg).
-
-bin(Msg) ->
-    HexList = hex(Msg),
-    Fun = fun([H1,H2|Rest],F) -> [(H1 bsl 4) + H2|F(Rest,F)];([],_) -> [] end,
-    Fun(HexList,Fun).
-
-hex(Msg) ->
-    [to_hex(X)||X <- Msg,X /= $ ].
-
-to_hex(I) when I >= $0, I =< $9 ->
-    I-48;
-to_hex(C) when C >= $A,C =< $F ->
-    C - 55.
-
-%% ex('EUTRA','BCCH-DL-SCH-Message',1) ->
-%%     {'BCCH-DL-SCH-Message',
-%%      {c1,
-%%       {systemInformation1,
-%%        {'SystemInformationBlockType1',
-%% 	{'SystemInformationBlockType1_cellAccessRelatedInformation',
-%% 	 [{'SystemInformationBlockType1_cellAccessRelatedInformation_SOF',
-%% 	   {'PLMN-Identity'},
-%% 	   true},
-%% 	  {'SystemInformationBlockType1_cellAccessRelatedInformation_SOF',
-%% 	   {'PLMN-Identity'},
-%% 	   false},
-%% 	  {'SystemInformationBlockType1_cellAccessRelatedInformation_SOF',
-%% 	   {'PLMN-Identity'},
-%% 	   true}],
-%% 	 {'TrackingAreaCode'},
-%% 	 {'CellIdentity'},
-%% 	 false,
-%% 	 true,
-%% 	 true,
-%% 	 true},
-%% 	{'SystemInformationBlockType1_cellSelectionInfo',
-%% 	 -50},
-%% 	24,
-%% 	[{'SystemInformationBlockType1_schedulinInformation_SOF',
-%% 	  {'SystemInformationBlockType1_schedulinInformation_SOF_si-MessageType'},
-%% 	  ms320,
-%% 	  {'SystemInformationBlockType1_schedulinInformation_SOF_sib-MappingInfo'}
-%% 	 }],
-%% 	0
-%% 	}
-%%        }
-%%       }
-%%      }.
-
-%% eutra1(msg) ->
-%%     {'BCCH-BCH-Message',{'MasterInformationBlock',[0,1,0,1],[1,0,1,0],{'PHICH-Configuration',short,ffs},[1,0,1,0,0,0,0,0]}};
-%% eutra1(result) ->
-%%     <<90,80,0>>.
-
-%% eutra2(msg) ->
-%%     {'BCCH-DL-SCH-Message',
-%%      {c1,
-%%       {systemInformation1,
-%%        {'SystemInformationBlockType1',
-%% 	{'SystemInformationBlockType1_cellAccessRelatedInformation',
-%% 	 [{'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},true},
-%% 	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},false},
-%% 	  {'SystemInformationBlockType1_cellAccessRelatedInformation_plmn-IdentityList_SEQOF',{'PLMN-Identity'},true}],
-%% 	 {'TrackingAreaCode'},
-%% 	 {'CellIdentity'},
-%% 	 false,
-%% 	 true,
-%% 	 true,
-%% 	 true
-%% 	},
-%% 	{'SystemInformationBlockType1_cellSelectionInfo',-50},
-%% 	24,
-%% 	[{'SystemInformationBlockType1_schedulinInformation_SEQOF',
-%% 	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_si-MessageType'},
-%% 	  ms320,
-%% 	  {'SystemInformationBlockType1_schedulinInformation_SEQOF_sib-MappingInfo'}}],
-%% 	0
-%%        }
-%%       }
-%%      }
-%%     };
-%% eutra2(result) ->
-%% %% 55 5C A5 E0
-%%     <<85,92,165,224>>.
-
-
-
-%% compare([H|T1],[H|T2],Acc) ->
-%%     compare(T1,T2,[H|Acc]);
-%% compare([],[],_Acc) ->
-%%     ok;
-%% compare(L1,L2,Acc) ->
-%%     {miss_match,L1,L2,lists:reverse(Acc)}.
-
-
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index b75de179dc..153c64ebdd 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 = 2.0.2
+ASN1_VSN = 2.0.4
diff --git a/lib/common_test/doc/src/basics_chapter.xml b/lib/common_test/doc/src/basics_chapter.xml
index ff6ea6c557..12c6143a1a 100644
--- a/lib/common_test/doc/src/basics_chapter.xml
+++ b/lib/common_test/doc/src/basics_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/book.xml b/lib/common_test/doc/src/book.xml
index 2c48664b26..f3f28999d7 100644
--- a/lib/common_test/doc/src/book.xml
+++ b/lib/common_test/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 151159ad69..ea4522c40b 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -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><seealso marker="#Module:groups-0">groups/0</seealso></c>).
+	  an atom, is the name of the group (defined in <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
 	  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><seealso marker="#Module:groups-0">groups/0</seealso></c>).
+	  properties in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
 	  (With value <c>default</c>, the group definition properties
 	  will be used).</p>
 	
@@ -186,8 +186,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><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
+	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). 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
@@ -203,11 +203,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><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</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><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -266,7 +266,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><seealso marker="#Module:init_per_suite-1">init_per_suite/1</seealso></c>.
+	  <seealso marker="#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>.
 	  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>
@@ -313,13 +313,13 @@
 	  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><seealso marker="#Module:group-1">group/1</seealso></c> override
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso> override
 	  properties with the same key that have been previously set by
-	  <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
+	  <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  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
+	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). 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
@@ -334,11 +334,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><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</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><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -371,7 +371,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><seealso marker="#Module:groups-0">groups/0</seealso></c>). The
+	    group, as specified in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>). 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>
@@ -400,10 +400,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><seealso marker="#Module:init_per_group-2">init_per_group/2</seealso></c>.
+	    It is meant to be used for cleaning up after <seealso marker="#Module:init_per_group-2"><c>init_per_group/2</c></seealso>.
 	    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><seealso marker="#Module:end_per_group-2">end_per_group/2</seealso></c> for the group on the level above. The status will also
+	    <seealso marker="#Module:end_per_group-2"><c>end_per_group/2</c></seealso> 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>
 
@@ -454,7 +454,7 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p> This function is called after each test case, and can be used
-	    to clean up after <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c> and the test case.
+	    to clean up after <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso> 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
@@ -496,15 +496,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><seealso marker="#Module:Testcase-0">Testcase/0</seealso></c> override
+	  Properties set by <seealso marker="#Module:Testcase-0"><c>Testcase/0</c></seealso> override
 	  properties that have been previously set for the test case
-	  by <c><seealso marker="#Module:group-1">group/1</seealso></c> or <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
+	  by <seealso marker="#Module:group-1"><c>group/1</c></seealso> or <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</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><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
+	  <c>timetrap_timeout</c>. <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso> 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
@@ -518,15 +518,15 @@
 	  configuration files, the test case is skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
 	<p>If <c>timetrap</c> and/or <c>require</c> is not set, the
-	  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>
+	  default values specified by <seealso marker="#Module:suite-0"><c>suite/0</c></seealso> (or
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso>) 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><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>.</p>
 	
 	<p>Other tuples than the ones defined will simply be ignored.</p>
 
@@ -554,7 +554,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><seealso marker="ct#fail-1">ct:fail/1/2</seealso></c>
+	  function causes a runtime error, or call <seealso marker="ct#fail-1"><c>ct:fail/1/2</c></seealso>
 	  (which also causes the test case process to terminate).</p>
 	
 	<p>Elements from the <c>Config</c> list can e.g. be read
@@ -582,7 +582,7 @@
 	  Test Cases and Suites</seealso> in the User's Guide.</p>
       </desc>
     </func>
-    
+     
   </funcs>
 
 </erlref>
diff --git a/lib/common_test/doc/src/config_file_chapter.xml b/lib/common_test/doc/src/config_file_chapter.xml
index d90adf8d7b..d3068db17b 100644
--- a/lib/common_test/doc/src/config_file_chapter.xml
+++ b/lib/common_test/doc/src/config_file_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -80,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><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which can be called from a test case
+    <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> 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
@@ -90,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><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which are described in the
+    arguments to <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> 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.
@@ -103,7 +103,7 @@
         (or test case) and improve readability.</item>
     </list>
     <p>To read the value of a config variable, use the function
-    <c><seealso marker="ct#get_config-1">get_config/1/2/3</seealso></c>
+    <seealso marker="ct#get_config-1"><c>get_config/1/2/3</c></seealso>
     which is also described in the reference
     manual for <seealso marker="ct">ct</seealso>.</p>
     <p>Example:</p>
@@ -121,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><seealso marker="ct#get_config-3">ct:get_config/3</seealso></c>
+      want to access all possible values, you may use the <seealso marker="ct#get_config-3"><c>ct:get_config/3</c></seealso>
       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 
@@ -133,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><seealso marker="ct#encrypt_config_file-2">ct:encrypt_config_file/2/3</seealso></c> to have Common Test encrypt a
+      <p>Call <seealso marker="ct#encrypt_config_file-2"><c>ct:encrypt_config_file/2/3</c></seealso> 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
@@ -142,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><seealso marker="ct#decrypt_config_file-2">ct:decrypt_config_file/2/3</seealso></c>, for recreating the original text
+      <seealso marker="ct#decrypt_config_file-2"><c>ct:decrypt_config_file/2/3</c></seealso>, for recreating the original text
       files.</p> 
 
       <p>Please see the <seealso marker="ct">ct</seealso> reference manual for
@@ -152,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><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>
+      by means of the support functions in e.g. <seealso marker="ct_ssh"><c>ct_ssh</c></seealso>, <seealso marker="ct_ftp"><c>ct_ftp</c></seealso>,
+      and <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>:</p>
     <list>
       <item>Using a configuration target name (an alias) as reference.</item>
       <item>Using the configuration variable as reference.</item>
diff --git a/lib/common_test/doc/src/cover_chapter.xml b/lib/common_test/doc/src/cover_chapter.xml
index 736486350b..a215c8c2f3 100644
--- a/lib/common_test/doc/src/cover_chapter.xml
+++ b/lib/common_test/doc/src/cover_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -94,7 +94,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><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, by adding a <c>{cover,CoverSpec}</c>
+      call to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, 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 
@@ -102,8 +102,8 @@
       specifications</seealso>).</p>
   </section>
 
-  <marker id="cover_stop"></marker>
   <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
@@ -120,8 +120,8 @@
 
     <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
+      Opts argument to <seealso
+      marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, or by adding
       a <c>cover_stop</c> term in your test specification (see chapter
       about <seealso
       marker="run_test_chapter#test_specifications">test
@@ -189,8 +189,8 @@
        specification file for Common Test).</p>
   </section>
 
-  <marker id="cross_cover"/>
   <section>
+  <marker id="cross_cover"/>
     <title>Cross cover analysis</title>
     <p>The cross cover mechanism allows cover analysis of modules
     across multiple tests. It is useful if some code, e.g. a library
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index b3e713c77f..859ff9df14 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -485,8 +485,9 @@
               NewCTHState</name>
       <fsummary>Called after the CTH scope ends</fsummary>
       <type>
-	<v>TestcaseName = end_per_suite | init_per_group | 
-                          end_per_group | atom()</v>
+	<v>TestcaseName = end_per_suite | {init_per_group,GroupName} | 
+                          {end_per_group,GroupName} | atom()</v>
+	<v>GroupName = atom()</v>
 	<v>Reason = {tc_auto_skip | tc_user_skip, term()}</v>
 	<v>CTHState = NewCTHState = term()</v>
       </type>
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index fe871eb516..60cd9be918 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><seealso marker="ct#get_config-1">ct:get_config/1/2/3</seealso></c> (as explained in the
+	by calling <seealso marker="ct#get_config-1"><c>ct:get_config/1/2/3</c></seealso> (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><seealso marker="ct#require-1">ct:require/1/2</seealso></c> function. Note that the latter can also be used
+	or the <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> 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,13 +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
+  <note><p>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>
+  the correct action.</p></note>
 	
     </section>
     
@@ -301,9 +301,9 @@ post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
   %% Do nothing if tc does not crash.
   {Return, CTHState}.</code>
 
-      <note>Recovering from a testcase failure using CTHs should only be done as
+      <note><p>Recovering from a testcase failure using CTHs should only be done as
 	a last resort. If used wrongly it could become very difficult to 
-	determine which tests pass or fail in a test run</note>
+	determine which tests pass or fail in a test run</p></note>
   
     </section>
 
@@ -322,6 +322,34 @@ post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
 
   </section>
 
+  <marker id="synchronizing"/>
+  <section>
+    <title>Synchronizing external user applications with Common Test</title>
+    <p>CTHs can be used to synchronize test runs with external user applications.
+    The init function may e.g. start and/or communicate with an application that
+    has the purpose of preparing the SUT for an upcoming test run, or maybe
+    initialize a database for saving test data to during the test run. The
+    terminate function may similarly order such an application to reset the SUT
+    after the test run, and/or tell the application to finish active sessions
+    and terminate.
+    Any system error- or progress reports generated during the init- or
+    termination stage will be saved in the 
+    <seealso marker="run_test_chapter#pre_post_test_io_log">Pre-
+    and post test I/O log</seealso>. (This is also true for any printouts made
+    with <c>ct:log/2</c> and <c>ct:pal/2</c>).</p>
+    <p>In order to ensure that Common Test doesn't start executing tests, or
+    closes its log files and shuts down, before the external application
+    is ready for it, Common Test may be synchronized with the application. 
+    During startup and shutdown, Common Test can be suspended, simply by
+    having a CTH evaluate a <c>receive</c> expression in the init- or terminate
+    function. The macros <c>?CT_HOOK_INIT_PROCESS</c> (the process executing the hook
+    init function) and <c>?CT_HOOK_TERMINATE_PROCESS</c> (the process executing
+    the hook terminate function), each specifies the name of the correct Common Test
+    process to send a message to in order to return from the <c>receive</c>.
+    These macros are defined in <c>ct.hrl</c>.
+    </p>
+  </section>
+
   <marker id="example"/>
   <section>
      <title>Example CTH</title>
diff --git a/lib/common_test/doc/src/ct_master_chapter.xml b/lib/common_test/doc/src/ct_master_chapter.xml
index 9e848e99bb..37a0805055 100644
--- a/lib/common_test/doc/src/ct_master_chapter.xml
+++ b/lib/common_test/doc/src/ct_master_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2012</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -220,6 +220,7 @@
 
     <p>The default <seealso marker="ct_slave">ct_slave</seealso> callback module,
       which is part of the Common Test application, has the following features:
+    </p>
     <list>
      <item>Starting Erlang target nodes on local or remote hosts
        (ssh is used for communication).
@@ -237,7 +238,6 @@
         Functions can be given as a list of {Module, Function, Arguments} tuples.
      </item>
     </list>
-    </p>
     <p>Note that it is possible to specify an <c>eval</c> term for the node as well
     as <c>startup_functions</c> in the <c>node_start</c> options list. In this
     case first the node will be started, then the <c>startup_functions</c> are
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index c87c765ae7..39259b092a 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE comref SYSTEM "comref.dtd">
 
 <comref>
@@ -36,8 +36,6 @@
     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
@@ -48,7 +46,7 @@
     particular mode.</p>
 
   <p>There is an interface function that corresponds to this program,
-    called <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, for starting Common Test from the Erlang
+    called <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, for starting Common Test from the Erlang
     shell (or an Erlang program). Please see the <c>ct</c> man page for
     details.</p>
 
@@ -83,9 +81,9 @@
     <p>it prints all valid start flags to stdout.</p>
   </description>
 
-  <marker id="ct_run"></marker>
 
   <section>
+  <marker id="ct_run"></marker>
     <title>Run tests from command line</title>
     <pre>
 	ct_run [-dir TestDir1 TestDir2 .. TestDirN] |
diff --git a/lib/common_test/doc/src/dependencies_chapter.xml b/lib/common_test/doc/src/dependencies_chapter.xml
index 8aad552285..e6c7025b12 100644
--- a/lib/common_test/doc/src/dependencies_chapter.xml
+++ b/lib/common_test/doc/src/dependencies_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index 10a9b52d39..47d0ba59fb 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2012</year>
+      <year>2006</year><year>2013</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><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), where the
+    start flag (<c>ct_run</c>) or option (<seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), 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><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> in the reference manual):</p>
+      definition (see also <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> in the reference manual):</p>
 
     <pre>
     {event_handler,EventHandlers}
@@ -193,7 +193,8 @@
         <p><c>GroupName = unknown | atom()</c>, name of the group 
 	      (unknown if init- or end function times out).</p>
         <p><c>GroupProperties = list()</c>, list of execution properties for the group.</p>
-        <p><c>Result = ok | {skipped,SkipReason} | {failed,FailReason}</c>, the result.</p>
+        <p><c>Result = ok | {auto_skipped,SkipReason} | {skipped,SkipReason} | {failed,FailReason}</c>,
+	  the result.</p>
 	<marker id="skipreason"/>
         <p><c>SkipReason = {require_failed,RequireInfo} | 
 	                   {require_failed_in_suite0,RequireInfo} | 
@@ -224,10 +225,13 @@
 	<c>end_per_testcase</c> for the case failed.
 	</p></item>
 
+      <item>
 	<marker id="tc_auto_skip"></marker>
-      <item><c>#event{name = tc_auto_skip, data = {Suite,Func,Reason}}</c>
+        <c>#event{name = tc_auto_skip, data = {Suite,Func,Reason}}</c>
         <p><c>Suite = atom()</c>, the name of the suite.</p>
-        <p><c>Func = atom()</c>, the name of the test case or configuration function.</p>
+        <p><c>Func = atom() | {end_per_group,GroupName}</c>, the name of the test case
+	  or configuration function.</p>
+        <p><c>GroupName = atom()</c>, name of the group.</p>
         <p><c>Reason = {failed,FailReason} |
 	               {require_failed_in_suite0,RequireInfo}</c>, 
 	      reason for auto skipping <c>Func</c>.</p>
@@ -251,10 +255,13 @@
 	the <c>tc_done</c> event.
 	</p></item>
 	
+      <item>
 	<marker id="tc_user_skip"></marker>
-      <item><c>#event{name = tc_user_skip, data = {Suite,TestCase,Comment}}</c>
-        <p><c>Suite = atom()</c>, name of the suite.</p>
-        <p><c>TestCase = atom()</c>, name of the test case.</p>
+        <c>#event{name = tc_user_skip, data = {Suite,Func,Comment}}</c>
+        <p><c>Suite = atom()</c>, the name of the suite.</p>
+        <p><c>Func = atom() | {end_per_group,GroupName}</c>, the name of the test case
+	  or configuration function.</p>
+        <p><c>GroupName = atom()</c>, name of the group.</p>
         <p><c>Comment = string()</c>, reason for skipping the test case.</p>
         <p>This event specifies that a test case has been skipped by the user. 
 	It is only ever received if the skip was declared in a test specification. 
@@ -308,7 +315,7 @@
     manager can look like.</p>
 
     <note><p>To ensure that printouts to standard out (or printouts made with
-    <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
+    <seealso marker="ct#log-2"><c>ct:log/2/3</c></seealso> or <seealso marker="ct:pal-2"><c>ct:pal/2/3</c></seealso>) 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 2333f92989..36781d152c 100644
--- a/lib/common_test/doc/src/example_chapter.xml
+++ b/lib/common_test/doc/src/example_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/fascicules.xml b/lib/common_test/doc/src/fascicules.xml
index 38df4a1709..c4a28a699a 100644
--- a/lib/common_test/doc/src/fascicules.xml
+++ b/lib/common_test/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/common_test/doc/src/getting_started_chapter.xml b/lib/common_test/doc/src/getting_started_chapter.xml
index 3cf04bb1a2..445c731d01 100644
--- a/lib/common_test/doc/src/getting_started_chapter.xml
+++ b/lib/common_test/doc/src/getting_started_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2012</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -61,13 +61,11 @@
     <title>Test case execution</title>
     <p>Execution of test cases is handled this way:</p>
     
-    <p>
     <image file="tc_execution.gif">
       <icaption>
 	Successful vs unsuccessful test case execution.
       </icaption>
     </image>
-    </p>
 
     <p>For each test case that Common Test is told to execute, it spawns a
       dedicated process on which the test case function in question starts
@@ -90,7 +88,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><seealso marker="ct#fail-1">ct:fail/1,2</seealso></c> help function). A succesful execution is
+      through the <seealso marker="ct#fail-1"><c>ct:fail/1,2</c></seealso> help function). A succesful execution is
       indicated by means of a normal return from the test case function.
     </p>
     </section>
@@ -100,13 +98,15 @@
     <p>As you've seen in the basics chapter, the test suite module implements
       <seealso marker="common_test">callback functions</seealso>
       (mandatory or optional) for various purposes, e.g:
+    </p>
       <list>
 	<item>Init/end configuration function for the test suite</item>
 	<item>Init/end configuration function for a test case</item>
 	<item>Init/end configuration function for a test case group</item>
 	<item>Test cases</item>
       </list>
-      The configuration functions are optional and if you don't need them for
+    <p> 
+     The configuration functions are optional and if you don't need them for
       your test, a test suite with one simple test case could look like this:
     </p>
     <pre>
@@ -136,13 +136,11 @@
       "lower level"). The data flow looks like this:
     </p>
 
-    <p>
     <image file="config.gif">
       <icaption>
 	Config data flow in the suite.
       </icaption>
     </image>
-    </p>
 
     <p>
       Here's an example of a test suite which uses configuration functions
@@ -203,13 +201,11 @@
       shows the log file structure:
     </p>
 
-    <p>
     <image file="html_logs.gif">
       <icaption>
 	HTML log file structure.
       </icaption>
     </image>
-    </p>
   </section>
 
   <section>
diff --git a/lib/common_test/doc/src/install_chapter.xml b/lib/common_test/doc/src/install_chapter.xml
index 89c497962d..7f8c606324 100644
--- a/lib/common_test/doc/src/install_chapter.xml
+++ b/lib/common_test/doc/src/install_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -56,13 +56,13 @@
       shell script version run_test, however, this script needs to be
       generated first, according to the instructions below.</p>
 
-    <p><note>Before reading on, please note that since Common Test version
+    <note><p>Before reading on, please note that since Common Test version
 	1.5, the run_test shell script is no longer required for starting
 	tests with Common Test from the OS command line. The ct_run
 	program (descibed above) is the new recommended command line interface
 	for Common Test. The shell script exists mainly for legacy reasons and
 	may not be updated in future releases of Common Test. It may even be removed.
-    </note></p>
+    </p></note>
 
     <p>Optional step to generate a shell script for starting Common Test:</p>
     <p>To generate the run_test shell script, navigate to the
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 2d6bcc0d8b..f10d5f85bf 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -32,6 +32,219 @@
     <file>notes.xml</file>
     </header>
 
+<section><title>Common_Test 1.7.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Return values from group and testcase info functions are
+	    now properly checked, and associated test cases are auto
+	    skipped if a return value is invalid.</p>
+          <p>
+	    Own Id: OTP-10631 Aux Id: kunagi-345 [256] </p>
+        </item>
+        <item>
+	    <p>The way Common Test handles skipping of test cases has
+	    been updated. In previous versions, returning
+	    <c>{skip,Reason}</c> from a configuration function (such
+	    as init_per_suite or init_per_group), resulted in all
+	    affected test cases getting skipped with status
+	    <c>auto_skipped</c>. This was inappropriate, since this
+	    status is supposed to be used to inform that Common Test
+	    has taken the initiative to skip something (e.g. a test
+	    case group if init_per_group failed). Therefore, in this
+	    version of Common Test, whenever the user skips a suite,
+	    group, or individual test case (by means of a
+	    configuration function or test specification term), the
+	    affected test cases get the status <c>user_skipped</c>
+	    instead.</p> <p>This update has meant a few changes that
+	    may affect Common Test users in various ways: <list>
+	    <item>The test results and statistics will be affected,
+	    which is important to know when running regression tests
+	    and comparing results to previous test runs.</item>
+	    <item>Users that read or parse the textual log file
+	    <c>suite.log</c> will notice that an auto skipped
+	    function is now reported as <c>auto_skipped</c> rather
+	    than <c>skipped</c> as before.</item> <item>When
+	    <c>require</c> fails in an info function (such as suite/0
+	    or group/1), all affected configuration functions and
+	    test cases are marked as <c>auto_skipped</c>.</item>
+	    <item>If Common Test detects an error in the test suite
+	    (such as e.g. an invalid all/0 function), all affected
+	    configuration functions and test cases are marked as
+	    <c>auto_skipped</c>.</item> <item>If a repeated test run
+	    session reaches a deadline with <c>force_stop</c>
+	    enabled, all remaining test cases are marked as
+	    <c>auto_skipped</c> rather than <c>user_skipped</c> as
+	    before.</item> <item>The event messages that Common Test
+	    generates during test runs have been affected by this
+	    update. For details see OTP-11524.</item> </list> </p>
+          <p>
+	    Own Id: OTP-11305 Aux Id: OTP-11524 </p>
+        </item>
+        <item>
+          <p>
+	    Returning {skip, Reason} from a pre_end_per_group/3 user
+	    hook function would result in an exit in the Common Test
+	    cth_log_redirect hook. This problem has been solved.</p>
+          <p>
+	    Own Id: OTP-11409 Aux Id: seq12446 </p>
+        </item>
+        <item>
+          <p>
+	    When the netconf server did not respond to the
+	    close-session request, the call to
+	    ct_netconfc:close_session/2 would hang forever waiting
+	    for the netconf client to terminate. This has been
+	    corrected. The client will now always terminate (and take
+	    down the connection) if the close-session request times
+	    out.</p>
+          <p>
+	    Own Id: OTP-11478</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix cth_log_redirect.erl to fulfill gen_event behaviour.
+	    Thanks to Roberto Aloi.</p>
+          <p>
+	    Own Id: OTP-11401</p>
+        </item>
+        <item>
+          <p>
+	    The first argument of the CT hook callback function
+	    <c>on_tc_skip/3</c> has been modified. When this function
+	    is called for <c>init_per_group</c> or
+	    <c>end_per_group</c>, the value of the first argument is
+	    now <c>{init_per_group,GroupName}</c> or
+	    <c>{end_per_group,GroupName}</c>.</p>
+          <p>
+	    Own Id: OTP-11523</p>
+        </item>
+        <item>
+	    <p>The following modifications have been made to the
+	    event messages that Common Test sends during test
+	    execution: <list> <item>For the <c>tc_auto_skip</c>
+	    event, the value of the <c>Func</c> element has changed
+	    from <c>end_per_group</c> to
+	    <c>{end_per_group,GroupName}</c>.</item> <item>When
+	    <c>require</c> fails in an info function, such as suite/0
+	    or group/1, the init configuration function is now
+	    reported as <c>auto_skipped</c> intead of <c>skipped</c>,
+	    with the <c>tc_done</c> event.</item> <item>When
+	    <c>require</c> fails in an info function because of a
+	    configuration name already in use, the <c>tc_done</c>
+	    event now reports the error with a tuple (of size 2)
+	    tagged <c>failed</c> instead of <c>skipped</c>.</item>
+	    </list> Please see the Event Handling chapter in the
+	    Common Test User's Guide for reference. </p>
+          <p>
+	    Own Id: OTP-11524 Aux Id: OTP-11305 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Common_Test 1.7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Documentation is added for ct_netconfc:send and
+	    ct_netconfc:send_rpc.</p>
+          <p>
+	    Own Id: OTP-11132</p>
+        </item>
+        <item>
+          <p>
+	    ct_netconfc:create_subscription only allowed one XML
+	    element inside the 'filter' element. According to RFC5277
+	    it should be allowed to add any number of elements inside
+	    the filter, so this is now corrected.</p>
+          <p>
+	    Own Id: OTP-11166</p>
+        </item>
+        <item>
+          <p>
+	    The error handler installed by the Common Test hook
+	    cth_log_redirect did not respond to init:stop/1/2. This
+	    has been corrected.</p>
+          <p>
+	    Own Id: OTP-11175 Aux Id: seq12356 </p>
+        </item>
+        <item>
+          <p>
+	    Calling ct:pal/2 or ct:print/2 when Common Test was not
+	    running, would cause an exit. This has been changed and
+	    the string is now simply printed to stdout instead.</p>
+          <p>
+	    Own Id: OTP-11176</p>
+        </item>
+        <item>
+          <p>
+	    Fixed problem with the cth_log_redirect hook making calls
+	    to an undefined function in ct_logs.</p>
+          <p>
+	    Own Id: OTP-11238</p>
+        </item>
+        <item>
+          <p>
+	    When running tests with the 'repeat' option, the Common
+	    Test utility process did not always terminate quickly
+	    enough after a test run, causing the start of the next
+	    run to fail. A monitor is now used to ensure termination
+	    of the utility process after each test run.</p>
+          <p>
+	    Own Id: OTP-11244 Aux Id: seq12396 </p>
+        </item>
+        <item>
+          <p>
+	    Test Server installed an error handler (test_server_h)
+	    only to be able to write the name of the current test
+	    case to stdout whenever it received an error- or progress
+	    report. This functionality was not useful and has been
+	    removed. The built-in Common Test hook, cth_log_redirect,
+	    has instead been improved to now also tag all error- and
+	    progress reports in the log with suite-, group-, and/or
+	    test case name.</p>
+          <p>
+	    Own Id: OTP-11263 Aux Id: seq12251 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new log, the "Pre- and Post Test I/O Log", has been
+	    introduced, which makes it possible to capture error- and
+	    progress reports, as well as printouts made with ct:log/2
+	    and ct:pal/2, before and after a test run. (Some minor
+	    improvements of the logging system have been made at the
+	    same time). Links to the new log are found on the Common
+	    Test Framework Log page. The Common Test User's Guide has
+	    been updated with information about the new log and also
+	    with a new section on how to synchronize external
+	    applications with Common Test by means of the CT Hook
+	    init and terminate functions.</p>
+          <p>
+	    Own Id: OTP-11272</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.7.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/doc/src/notes_history.xml b/lib/common_test/doc/src/notes_history.xml
index e4085d5431..34ac4fd15b 100644
--- a/lib/common_test/doc/src/notes_history.xml
+++ b/lib/common_test/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/part.xml b/lib/common_test/doc/src/part.xml
index a74185221d..fe73918975 100644
--- a/lib/common_test/doc/src/part.xml
+++ b/lib/common_test/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/part_notes.xml b/lib/common_test/doc/src/part_notes.xml
index 506677a7a5..13ca499196 100644
--- a/lib/common_test/doc/src/part_notes.xml
+++ b/lib/common_test/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/part_notes_history.xml b/lib/common_test/doc/src/part_notes_history.xml
index e658810e7a..f995a70b7f 100644
--- a/lib/common_test/doc/src/part_notes_history.xml
+++ b/lib/common_test/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/ref_man.xml b/lib/common_test/doc/src/ref_man.xml
index 6fede88434..2f5c892e60 100644
--- a/lib/common_test/doc/src/ref_man.xml
+++ b/lib/common_test/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index afaed29626..a4a77ee400 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -21,7 +21,7 @@
 
     </legalnotice>
 
-    <title>Running Tests</title>
+    <title>Running Tests and Analyzing Results</title>
     <prepared>Peter Andersson, Kenneth Lundin</prepared>
     <docno></docno>
     <date></date>
@@ -105,8 +105,8 @@
       RPC from a remote node.</p>
   </section>
 
-  <marker id="ct_run"></marker>
   <section>
+  <marker id="ct_run"></marker>
     <title>Running tests from the OS command line</title>
     
     <p>The <c>ct_run</c> program can be used for running tests from
@@ -205,17 +205,17 @@
     <p>The <c>ct_run</c> program sets the exit status before shutting down. The following values
       are defined:</p>
     <list>
-      <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>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
+    <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>For more information about the <c>ct_run</c> program, see the
-      <seealso marker="ct_run#top">Reference Manual</seealso> and the
+      <seealso marker="ct_run">Reference Manual</seealso> and the
       <seealso marker="install_chapter#general">Installation</seealso> chapter.
     </p>
   </section>
@@ -225,15 +225,15 @@
     
     <p>Common Test provides an Erlang API for running tests. The main (and most
       flexible) function for specifying and executing tests is called
-      <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>.
+      <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>.
       This function takes the same start parameters as
-      the <c><seealso marker="run_test_chapter#ct_run">ct_run</seealso></c>
+      the <seealso marker="run_test_chapter#ct_run"><c>ct_run</c></seealso>
       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><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> specified as:</p>
+      <p>is with <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> specified as:</p>
       <p><c>1> ct:run_test([{suite,"./my_SUITE"},{logdir,"./results"}]).</c></p>
 
       <p>The function returns the test result, represented by the tuple:
@@ -245,7 +245,7 @@
 	<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>,
+	  <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>,
 	  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
@@ -260,19 +260,19 @@
 	  <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,
+	  <seealso marker="ct#break-1"><c>ct:break/1/2</c></seealso> and
+	  <seealso marker="ct#continue-0"><c>ct:continue/0/1</c></seealso> 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>,
+        <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>,
         please see the
-        <c><seealso marker="ct#run_test-1">ct</seealso></c> manual page.</p>    
+        <seealso marker="ct#run_test-1"><c>ct</c></seealso> manual page.</p>    
   </section>
   
-  <marker id="group_execution"></marker>
    <section>
+    <marker id="group_execution"></marker>
     <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>,
@@ -442,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><seealso marker="ct#install-1">ct:install/1</seealso></c> to install any configuration
+      manually and call <seealso marker="ct#install-1"><c>ct:install/1</c></seealso> to install any configuration
       data you might need (use <c>[]</c> as argument otherwise), then
-      call <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> to start Common Test. If you use
+      call <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> 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:
@@ -463,8 +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><seealso marker="ct#require-1">
-      ct:require/1/2</seealso></c>. This is
+      data must first be required with <seealso marker="ct#require-1"><c>
+      ct:require/1/2</c></seealso>. 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
@@ -491,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><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
+      automated test run with <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), call the function
+      <seealso marker="ct#stop_interactive-0"><c>ct:stop_interactive/0</c></seealso>. This shuts down the
       running <c>ct</c> application. Associations between
       configuration names and data created with <c>require</c> are 
-      consequently deleted. <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> will get you
+      consequently deleted. <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> will get you
       back into interactive mode, but the previous state is not restored.</p>
   </section>
 
@@ -503,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><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, it is possible
+       <c>{step,Opts}</c> option to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, 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>
@@ -527,17 +527,17 @@
        with <c>dir</c>.</p>       
   </section>
 
-  <marker id="test_specifications"></marker>
   <section>
+  <marker id="test_specifications"></marker>
     <title>Test Specifications</title>
     <section>
 	<title>General description</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 are normally declared in one or more text files
-	(see <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), but
+	(see <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), 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>).
+	<seealso marker="ct#run_testspec-1"><c>ct:run_testspec/1</c></seealso>).
 	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
@@ -989,7 +989,7 @@
 	  <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><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> is used
+	  If <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> 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>
@@ -999,7 +999,7 @@
     <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>
+      <seealso marker="run_test_chapter#ct_run"><c>ct_run</c></seealso>
       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
@@ -1087,18 +1087,18 @@
       </list>
       
       <p>On the test run index page there is a link to the Common Test
-	Framework log file in which information about imported
-	configuration data and general test progress is written. This
-	log file is useful to get snapshot information about the test
-	run during execution. It can also be very helpful when
-	analyzing test results or debugging test suites.</p>
+        Framework Log file in which information about imported
+        configuration data and general test progress is written. This
+        log file is useful to get snapshot information about the test
+        run during execution. It can also be very helpful when
+        analyzing test results or debugging test suites.</p>
 
       <p>On the test run index page it is noted if a test has missing
         suites (i.e. suites that Common Test has failed to
         compile). Names of the missing suites can be found in the
-        Common Test Framework log file.</p>
+        Common Test Framework Log file.</p>
 
-      <p>The major logfile shows a detailed report of the test run. It
+      <p>The major log file shows a detailed report of the test run. It
         includes test suite and test case names, execution time, the 
 	exact reason for failures etc. The information is available in both
 	a file with textual and with HTML representation. The HTML file shows a 
@@ -1172,6 +1172,40 @@
 	    <url href="http://tablesorter.com">tablesorter</url> plugin, with customized sorting
 	    functions, for this implementation.</p>
 	</section>
+
+	<section>
+	  <title>The Unexpected I/O Log</title>
+	  <p>On the test suites overview page you find a link to the Unexpected I/O Log.
+	  In this log, Common Test saves printouts made with
+	  <c>ct:log/2</c> and <c>ct:pal/2</c>, as well as captured system error- and
+	  progress reports, that cannot be associated with particular test cases and
+	  therefore cannot be written to individual test case log files. This happens e.g.
+	  if a log printout is made from an external process (not a test case process),
+	  or if an error- or progress report comes in, during a short interval while Common
+	  Test is not executing a test case or configuration function, <em>or</em> while
+	  Common Test is currently executing a parallell test case group.</p>
+	</section>
+
+	<section>
+	  <marker id="pre_post_test_io_log"></marker>
+	  <title>The Pre- and Post Test I/O Log</title>
+	  <p>On the Common Test Framework Log page you find links to the so called
+	  Pre- and Post Test I/O Log. In this log, Common Test saves printouts made with
+	  <c>ct:log/2</c> and <c>ct:pal/2</c>, as well as captured system error-
+	  and progress reports, that take place before - and after - the actual test run.
+	  Examples of this are printouts from a CT hook init- or terminate function, or
+	  progress reports generated when an OTP application is started from a CT hook
+	  init function. Another example is an error report generated due to
+	  a failure when an external application is stopped from a CT hook terminate function.
+	  All information in these examples ends up in the Pre- and Post Test I/O Log.
+	  For more information on how to synchronize test runs with external user
+	  applications, please see the
+	  <seealso marker="ct_hooks_chapter#synchronizing">Synchronizing</seealso>
+	  section in the Common Test Hooks chapter.</p>
+	  <p>Note that logging to file with <c>ct:log/2</c> or <c>ct:pal/2</c>
+	  only works when Common Test is running. Printouts with <c>ct:pal/2</c>
+	  are however always displayed on screen.</p>
+	</section>
       </section>
   
       <section>
diff --git a/lib/common_test/doc/src/test_structure_chapter.xml b/lib/common_test/doc/src/test_structure_chapter.xml
index b9ca59135d..3c9e159436 100644
--- a/lib/common_test/doc/src/test_structure_chapter.xml
+++ b/lib/common_test/doc/src/test_structure_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2010</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/why_test_chapter.xml b/lib/common_test/doc/src/why_test_chapter.xml
index 95ff614f87..db94c6a6cb 100644
--- a/lib/common_test/doc/src/why_test_chapter.xml
+++ b/lib/common_test/doc/src/why_test_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index cc8d913994..055fb90641 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -129,8 +129,8 @@
     </p>
   </section>
 
-  <marker id="per_testcase"/>
   <section>
+  <marker id="per_testcase"/>
     <title>Init and end per test case</title>
 
     <p>Each test suite module can contain the optional configuration functions
@@ -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><seealso marker="ct#abort_current_testcase-1">ct:abort_current_testcase/1</seealso></c>,
+      test case terminates due to a call to <seealso marker="ct#abort_current_testcase-1"><c>ct:abort_current_testcase/1</c></seealso>,
       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,8 +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 <c><seealso marker="ct#get_config-1">
-	ct:get_config/1/2</seealso></c>). The Config argument
+	configuration files (using <seealso marker="ct#get_config-1"><c>
+	ct:get_config/1/2</c></seealso>). 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 
@@ -303,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><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>
+	    data can be retrieved at any time using the <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>
 	    utility function.
 	  </p>
 	</item>
@@ -348,8 +348,8 @@
       </taglist>
 
 	<p>See the <seealso marker="config_file_chapter#require_config_data">Config files</seealso>
-	  chapter and the <c><seealso marker="ct#require-1">
-	  ct:require/1/2</seealso></c> function in the
+	  chapter and the <seealso marker="ct#require-1"><c>
+	  ct:require/1/2</c></seealso> function in the
 	   <seealso marker="ct">ct</seealso> reference manual for more information about
 	   <c>require</c>.</p>
 
@@ -826,14 +826,16 @@
       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><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> function, or
+      <c>ct_run</c> program, the <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> function, or
       as test specification term). There are three possible values
       for this option:
+     </p>
       <list>
 	<item><c>auto_per_run</c></item>
 	<item><c>auto_per_tc</c></item>
 	<item><c>manual_per_tc</c></item>
       </list>
+     <p>
       The first value indicates the default priv_dir behaviour, i.e.
       one private directory created per test run. The two latter
       values tell Common Test to generate a unique test directory name
@@ -842,7 +844,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><seealso marker="ct#make_priv_dir-0">ct:make_priv_dir/0</seealso></c>.
+      It does this by calling the function <seealso marker="ct#make_priv_dir-0"><c>ct:make_priv_dir/0</c></seealso>.
       </p>
 
       <note><p>You should not depend on current working directory for
@@ -890,7 +892,7 @@
     
     <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><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c>. This function cancels the current timetrap
+    <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso>. This function cancels the current timetrap
     and starts a new one (that stays active until timeout, or end of the
     current function).</p>
     
@@ -903,12 +905,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><seealso marker="ct#sleep-1">ct:sleep/1</seealso></c>
+    <c>scale_timetraps</c> is enabled), the function <seealso marker="ct#sleep-1"><c>ct:sleep/1</c></seealso>
     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><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c> function. Examples:</p>
+    well as argument to the <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso> 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>
diff --git a/lib/common_test/include/ct.hrl b/lib/common_test/include/ct.hrl
index bde2709ad1..44cc33f01e 100644
--- a/lib/common_test/include/ct.hrl
+++ b/lib/common_test/include/ct.hrl
@@ -32,3 +32,7 @@
 -define(STD_VERBOSITY, 50 ).
 -define(HI_VERBOSITY,  75 ).
 -define(MAX_VERBOSITY, 100).
+
+%% name of process executing the CT Hook init and terminate function
+-define(CT_HOOK_INIT_PROCESS, ct_util_server).
+-define(CT_HOOK_TERMINATE_PROCESS, ct_util_server).
diff --git a/lib/common_test/src/common_test.appup.src b/lib/common_test/src/common_test.appup.src
index 0fbe5f23f7..4dfd9f1b0d 100644
--- a/lib/common_test/src/common_test.appup.src
+++ b/lib/common_test/src/common_test.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
\ No newline at end of file
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, common_test}]}],
+ [{<<".*">>,[{restart_application, common_test}]}]
+}.
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index ac08a3e0ad..d733df27dc 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -30,80 +30,88 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
 
--record(state, {group_leader,logs=[]}).
+-record(state, {logs=[], default_gl}).
 
 -define(WIDTH,80).
 
 %%%-----------------------------------------------------------------
 %%% Callbacks
-init({GL,Logs}) ->
-    open_files(Logs,#state{group_leader=GL}).
+init({GL,ConnLogs}) ->
+    open_files(GL,ConnLogs,#state{default_gl=GL}).
 
-open_files([{ConnMod,{LogType,Logs}}|T],State) ->
-    case do_open_files(Logs,[]) of
+open_files(GL,[{ConnMod,{LogType,LogFiles}}|T],State=#state{logs=Logs}) ->
+    case do_open_files(LogFiles,[]) of
 	{ok,Fds} ->
-	    open_files(T,State#state{logs=[{ConnMod,{LogType,Fds}} |
-					   State#state.logs]});
+	    ConnInfo = proplists:get_value(GL,Logs,[]),
+	    Logs1 = [{GL,[{ConnMod,{LogType,Fds}}|ConnInfo]} | 
+		     proplists:delete(GL,Logs)],
+	    open_files(GL,T,State#state{logs=Logs1});
 	Error ->
 	    Error
     end;
-open_files([],State) ->
+open_files(_GL,[],State) ->
     {ok,State}.
 
-
-do_open_files([{Tag,File}|Logs],Acc) ->
-    case file:open(File, [write,{encoding,utf8}]) of
+do_open_files([{Tag,File}|LogFiles],Acc) ->
+    case file:open(File, [write,append,{encoding,utf8}]) of
 	{ok,Fd} ->
-	    do_open_files(Logs,[{Tag,Fd}|Acc]);
+	    do_open_files(LogFiles,[{Tag,Fd}|Acc]);
 	{error,Reason} ->
 	    {error,{could_not_open_log,File,Reason}}
     end;
 do_open_files([],Acc) ->
     {ok,lists:reverse(Acc)}.
 
+handle_event({info_report,_,{From,update,{GL,ConnLogs}}},
+	     State) when node(GL) == node() ->
+    Result = open_files(GL,ConnLogs,State),
+    From ! {updated,GL},
+    Result;
 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),
+handle_event({_Type,GL,{Pid,{ct_connection,Mod,Action,ConnName},Report}},
+	     State) ->
+    Info = conn_info(Pid,#conn_log{name=ConnName,action=Action,module=Mod}),
+    write_report(now(),Info,Report,GL,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),
+handle_event({_Type,GL,{Pid,Info=#conn_log{},Report}}, State) ->
+    write_report(now(),conn_info(Pid,Info),Report,GL,State),
     {ok, State};
-handle_event({error_report,_,{Pid,_,[{ct_connection,ConnName}|R]}},State) ->
+handle_event({error_report,GL,{Pid,_,[{ct_connection,ConnName}|R]}}, State) ->
     %% Error reports from connection
-    write_error(now(),conn_info(Pid,#conn_log{name=ConnName}),R,State),
+    write_error(now(),conn_info(Pid,#conn_log{name=ConnName}),R,GL,State),
     {ok, State};
-handle_event(_, State) ->
+handle_event(_What, State) ->
     {ok, State}.
 
-handle_info(_, State) ->
+handle_info(_What, State) ->
     {ok, State}.
 
 handle_call(_Query, State) ->
     {ok, {error, bad_query}, State}.
 
 terminate(_,#state{logs=Logs}) ->
-    [file:close(Fd) || {_,{_,Fds}} <- Logs, {_,Fd} <- Fds],
+    lists:foreach(
+      fun({_GL,ConnLogs}) ->
+	      [file:close(Fd) || {_,{_,Fds}} <- ConnLogs, {_,Fd} <- Fds]
+      end, Logs),
     ok.
 
 
 %%%-----------------------------------------------------------------
 %%% Writing reports
-write_report(Time,#conn_log{module=ConnMod}=Info,Data,State) ->
-    {LogType,Fd} = get_log(Info,State),
+write_report(_Time,#conn_log{header=false,module=ConnMod}=Info,Data,GL,State) ->
+    {LogType,Fd} = get_log(Info,GL,State),
+    io:format(Fd,"~n~ts",[format_data(ConnMod,LogType,Data)]);
+
+write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) ->
+    {LogType,Fd} = get_log(Info,GL,State),
     io:format(Fd,"~n~ts~ts~ts",[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
+write_error(Time,#conn_log{module=ConnMod}=Info,Report,GL,State) ->
+    case get_log(Info,GL,State) of
 	{html,_} ->
 	    %% The error will anyway be written in the html log by the
 	    %% sasl error handler, so don't write it again.
@@ -115,14 +123,19 @@ write_error(Time,#conn_log{module=ConnMod}=Info,Report,State) ->
 		       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)};
+get_log(Info,GL,State) ->
+    case proplists:get_value(GL,State#state.logs) of
 	undefined ->
-	    {html,State#state.group_leader}
+	    {html,State#state.default_gl};
+	ConnLogs ->
+	    case proplists:get_value(Info#conn_log.module,ConnLogs) of
+		{html,_} ->
+		    {html,GL};
+		{LogType,Fds} ->
+		    {LogType,get_fd(Info,Fds)};
+		undefined ->
+		    {html,GL}
+	    end
     end.
 
 get_fd(#conn_log{name=undefined},Fds) ->
@@ -191,17 +204,27 @@ pretty_head({{{Y,Mo,D},{H,Mi,S}},MicroS},ConnMod,Text0) ->
 		   micro2milli(MicroS)]).
 
 pretty_title(#conn_log{client=Client}=Info) ->
-    io_lib:format("= Client ~w  ~s  Server ~ts ",
-		  [Client,actionstr(Info),serverstr(Info)]).
+    case actionstr(Info) of
+	{no_server,Action} ->
+	    io_lib:format("= Client ~w ~s ",[Client,Action]);
+	Action ->
+	    io_lib:format("= Client ~w ~s ~ts ",[Client,Action,
+						 serverstr(Info)])
+    end.
 
 actionstr(#conn_log{action=send}) -> "----->";
+actionstr(#conn_log{action=cmd}) -> "----->";
 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={undefined,_}}) ->
+    io_lib:format("server",[]);
 serverstr(#conn_log{name=undefined,address=Address}) ->
     io_lib:format("~p",[Address]);
+serverstr(#conn_log{name=Alias,address={undefined,_}}) ->
+    io_lib:format("~w",[Alias]);
 serverstr(#conn_log{name=Alias,address=Address}) ->
     io_lib:format("~w(~p)",[Alias,Address]).
 
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 276f902b05..580588fbd2 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -69,13 +69,13 @@ init_tc(Mod,Func,Config) ->
 	andalso Func=/=end_per_group
 	andalso ct_util:get_testdata(skip_rest) of
 	true ->
-	    {skip,"Repeated test stopped by force_stop option"};
+	    {auto_skip,"Repeated test stopped by force_stop option"};
 	_ ->
 	    case ct_util:get_testdata(curr_tc) of
 		{Suite,{suite0_failed,{require,Reason}}} ->
-		    {skip,{require_failed_in_suite0,Reason}};
+		    {auto_skip,{require_failed_in_suite0,Reason}};
 		{Suite,{suite0_failed,_}=Failure} ->
-		    {skip,Failure};
+		    {fail,Failure};
 		_ ->
 		    ct_util:update_testdata(curr_tc,
 					    fun(undefined) ->
@@ -103,7 +103,7 @@ init_tc(Mod,Func,Config) ->
 			    end,
 			    init_tc1(Mod,Suite,Func,Config);
 			{failed,Seq,BadFunc} ->
-			    {skip,{sequence_failed,Seq,BadFunc}}
+			    {auto_skip,{sequence_failed,Seq,BadFunc}}
 		    end
 	    end
     end.	    
@@ -115,9 +115,9 @@ init_tc1(?MODULE,_,error_in_suite,[Config0]) when is_list(Config0) ->
 			   data={?MODULE,error_in_suite}}),
     case ?val(error, Config0) of
 	undefined ->
-	    {skip,"unknown_error_in_suite"};
+	    {fail,"unknown_error_in_suite"};
 	Reason ->
-	    {skip,Reason}
+	    {fail,Reason}
     end;
 
 init_tc1(Mod,Suite,Func,[Config0]) when is_list(Config0) ->
@@ -159,22 +159,28 @@ init_tc1(Mod,Suite,Func,[Config0]) when is_list(Config0) ->
        true ->
 	    ct_config:delete_default_config(testcase)
     end,
+    Initialize = fun() -> 
+			 ct_logs:init_tc(false),
+			 ct_event:notify(#event{name=tc_start,
+						node=node(),
+						data={Mod,FuncSpec}})
+		 end,
     case add_defaults(Mod,Func,AllGroups) of
 	Error = {suite0_failed,_} ->
-	    ct_logs:init_tc(false),
-	    ct_event:notify(#event{name=tc_start,
-				   node=node(),
-				   data={Mod,FuncSpec}}),
+	    Initialize(),
 	    ct_util:set_testdata({curr_tc,{Suite,Error}}),
 	    {error,Error};
+	Error = {group0_failed,_} ->
+	    Initialize(),
+	    {auto_skip,Error};
+	Error = {testcase0_failed,_} ->
+	    Initialize(),
+	    {auto_skip,Error};
 	{SuiteInfo,MergeResult} ->
 	    case MergeResult of
 		{error,Reason} ->
-		    ct_logs:init_tc(false),
-		    ct_event:notify(#event{name=tc_start,
-					   node=node(),
-					   data={Mod,FuncSpec}}),
-		    {skip,Reason};
+		    Initialize(),
+		    {fail,Reason};
 		_ ->
 		    init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config)
 	    end
@@ -222,11 +228,11 @@ init_tc2(Mod,Suite,Func,SuiteInfo,MergeResult,Config) ->
 	{suite0_failed,Reason} ->
 	    ct_util:set_testdata({curr_tc,{Mod,{suite0_failed,
 						{require,Reason}}}}),
-	    {skip,{require_failed_in_suite0,Reason}};
+	    {auto_skip,{require_failed_in_suite0,Reason}};
 	{error,Reason} ->
 	    {auto_skip,{require_failed,Reason}};
 	{'EXIT',Reason} ->
-	    {auto_skip,Reason};
+	    {fail,Reason};
 	{ok,PostInitHook,Config1} ->
 	    case get('$test_server_framework_test') of
 		undefined ->
@@ -272,6 +278,8 @@ add_defaults(Mod,Func, GroupPath) ->
 	    SuiteInfo = merge_with_suite_defaults(Suite,[]),
 	    SuiteInfoNoCTH = [I || I <- SuiteInfo, element(1,I) =/= ct_hooks],
 	    case add_defaults1(Mod,Func, GroupPath, SuiteInfoNoCTH) of
+		Error = {group0_failed,_} -> Error;
+		Error = {testcase0_failed,_} -> Error;
 		Error = {error,_} -> {SuiteInfo,Error};
 		MergedInfo -> {SuiteInfo,MergedInfo}
 	    end;
@@ -292,13 +300,16 @@ add_defaults(Mod,Func, GroupPath) ->
 					   element(1,I) =/= ct_hooks],
 		    case add_defaults1(Mod,Func, GroupPath,
 				       SuiteInfoNoCTH) of
+			Error = {group0_failed,_} -> Error;
+			Error = {testcase0_failed,_} -> Error;
 			Error = {error,_} -> {SuiteInfo1,Error};
 			MergedInfo -> {SuiteInfo1,MergedInfo}
 		    end;
 		false ->
 		    ErrStr = io_lib:format("~n*** ERROR *** "
 					   "Invalid return value from "
-					   "~w:suite/0: ~p~n", [Suite,SuiteInfo]),
+					   "~w:suite/0: ~p~n",
+					   [Suite,SuiteInfo]),
 		    io:format(ErrStr, []),
 		    io:format(user, ErrStr, []),
 		    {suite0_failed,bad_return_value}
@@ -318,36 +329,69 @@ add_defaults1(Mod,Func, GroupPath, SuiteInfo) ->
     %%     [LevelXGroupInfo, LevelX-1GroupInfo, ..., TopLevelGroupInfo]
     GroupPathInfo =  
 	lists:map(fun(GroupProps) ->
-			  Name = ?val(name, GroupProps),
-			  case catch Suite:group(Name) of
-			      GrInfo when is_list(GrInfo) -> GrInfo;
-			      _ -> []
+			  case ?val(name, GroupProps) of
+			      undefined ->
+				  [];
+			      Name ->
+				  case catch Suite:group(Name) of
+				      GrInfo when is_list(GrInfo) -> GrInfo;
+				      {'EXIT',{undef,_}} -> [];
+				      BadGr0 -> {error,BadGr0,Name}
+				  end
 			  end
 		  end, GroupPath),
-    Args = if Func == init_per_group ; Func == end_per_group ->
-		   [?val(name, hd(GroupPath))];
-	      true ->
-		   []
-	   end,
-    TestCaseInfo =
-	case catch apply(Mod,Func,Args) of
-	    TCInfo when is_list(TCInfo) -> TCInfo;
-	    _ -> []
-	end,
-    %% let test case info (also for all config funcs) override group info,
-    %% and lower level group info override higher level info
-    TCAndGroupInfo = [TestCaseInfo | remove_info_in_prev(TestCaseInfo,
-							 GroupPathInfo)],
-    %% find and save require terms found in suite info
-    SuiteReqs = 
-	[SDDef || SDDef <- SuiteInfo,
-		  ((require == element(1,SDDef)) or
-		   (default_config == element(1,SDDef)))],
-    case check_for_clashes(TestCaseInfo, GroupPathInfo, SuiteReqs) of
-	[] ->
-	    add_defaults2(Mod,Func, TCAndGroupInfo,SuiteInfo,SuiteReqs);
-	Clashes ->
-	    {error,{config_name_already_in_use,Clashes}}
+    case lists:keysearch(error, 1, GroupPathInfo) of
+	{value,{error,BadGr0Val,GrName}} ->
+	    Gr0ErrStr = io_lib:format("~n*** ERROR *** "
+				      "Invalid return value from "
+				      "~w:group(~w): ~p~n",
+				      [Mod,GrName,BadGr0Val]),
+	    io:format(Gr0ErrStr, []),
+	    io:format(user, Gr0ErrStr, []),
+	    {group0_failed,bad_return_value};
+	_ ->
+	    Args = if Func == init_per_group ; Func == end_per_group ->
+			   [?val(name, hd(GroupPath))];
+		      true ->
+			   []
+		   end,
+	    TestCaseInfo =
+		case catch apply(Mod,Func,Args) of
+		    TCInfo when is_list(TCInfo) -> TCInfo;
+		    {'EXIT',{undef,_}} -> [];
+		    BadTC0 -> {error,BadTC0}
+		end,
+	    
+	    case TestCaseInfo of
+		{error,BadTC0Val} ->
+		    TC0ErrStr = io_lib:format("~n*** ERROR *** "
+					      "Invalid return value from "
+					      "~w:~w/0: ~p~n",
+					      [Mod,Func,BadTC0Val]),
+		    io:format(TC0ErrStr, []),
+		    io:format(user, TC0ErrStr, []),
+		    {testcase0_failed,bad_return_value};
+		_ ->
+		    %% let test case info (also for all config funcs) override
+		    %% group info, and lower level group info override higher
+		    %% level info
+		    TCAndGroupInfo =
+			[TestCaseInfo | remove_info_in_prev(TestCaseInfo,
+							    GroupPathInfo)],
+		    %% find and save require terms found in suite info
+		    SuiteReqs = 
+			[SDDef || SDDef <- SuiteInfo,
+				  ((require == element(1,SDDef))
+				   or (default_config == element(1,SDDef)))],
+		    case check_for_clashes(TestCaseInfo, GroupPathInfo,
+					   SuiteReqs) of
+			[] ->
+			    add_defaults2(Mod,Func, TCAndGroupInfo,
+					  SuiteInfo,SuiteReqs);
+			Clashes ->
+			    {error,{config_name_already_in_use,Clashes}}
+		    end
+	    end
     end.
 
 get_suite_name(?MODULE, [Cfg|_]) when is_list(Cfg), Cfg /= [] ->
@@ -621,31 +665,34 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 		   _ -> Func
 	       end,
 
-    case get('$test_server_framework_test') of
-	undefined ->
-	    {FinalResult,FinalNotify} =
-		case ct_hooks:end_tc(
-		       Suite, FuncSpec, Args, Result, Return) of
-		    '$ct_no_change' ->
-			{ok,Result};
-		    FinalResult1 ->
-			{FinalResult1,FinalResult1}
-		end,
-	    %% send sync notification so that event handlers may print
-	    %% in the log file before it gets closed
-	    ct_event:sync_notify(#event{name=tc_done,
-					node=node(),
-					data={Mod,FuncSpec,
-					      tag_cth(FinalNotify)}});
-	Fun ->
-	    %% send sync notification so that event handlers may print
-	    %% in the log file before it gets closed
-	    ct_event:sync_notify(#event{name=tc_done,
-					node=node(),
-					data={Mod,FuncSpec,tag(Result)}}),
-	    FinalResult = Fun(end_tc, Return)
-    end,    
-    
+    {Result1,FinalNotify} =
+	case ct_hooks:end_tc(
+	       Suite, FuncSpec, Args, Result, Return) of
+	    '$ct_no_change' ->
+		{ok,Result};
+	    HookResult ->
+		{HookResult,HookResult}
+	end,
+    FinalResult =
+	case get('$test_server_framework_test') of
+	    undefined ->
+		%% send sync notification so that event handlers may print
+		%% in the log file before it gets closed
+		ct_event:sync_notify(#event{name=tc_done,
+					    node=node(),
+					    data={Mod,FuncSpec,
+						  tag_cth(FinalNotify)}}),
+		Result1;
+	    Fun ->
+		%% send sync notification so that event handlers may print
+		%% in the log file before it gets closed
+		ct_event:sync_notify(#event{name=tc_done,
+					    node=node(),
+					    data={Mod,FuncSpec,
+						  tag(FinalNotify)}}),
+		Fun(end_tc, Return)
+	end,    
+
     case FuncSpec of
 	{_,GroupName,_Props} ->
 	    if Func == end_per_group ->
@@ -683,12 +730,17 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 		     (undefined) ->
 			  undefined;
 		     (Unexpected) ->
-			  exit({error,{reset_curr_tc,{Mod,Func},Unexpected}})
+			  {error,{reset_curr_tc,{Mod,Func},Unexpected}}
 		  end,
-    ct_util:update_testdata(curr_tc,ClearCurrTC),
+    case ct_util:update_testdata(curr_tc, ClearCurrTC) of
+	{error,_} = ClearError ->
+	    exit(ClearError);
+	_ ->
+	    ok
+    end,
 
     case FinalResult of
-	{skip,{sequence_failed,_,_}} ->
+	{auto_skip,{sequence_failed,_,_}} ->
 	    %% ct_logs:init_tc is never called for a skipped test case
 	    %% in a failing sequence, so neither should end_tc	    
 	    ok;
@@ -711,8 +763,13 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 %% {error,Reason} | {skip,Reason} | {timetrap_timeout,TVal} | 
 %% {testcase_aborted,Reason} | testcase_aborted_or_killed | 
 %% {'EXIT',Reason} | Other (ignored return value, e.g. 'ok')
-tag({STag,Reason}) when STag == skip; STag == skipped -> 
-    {skipped,Reason};
+tag({STag,Reason}) when STag == skip; STag == skipped ->
+    case Reason of
+	{failed,{_,init_per_testcase,_}} -> {auto_skipped,Reason};
+	_ -> {skipped,Reason}
+    end;
+tag({auto_skip,Reason}) ->
+    {auto_skipped,Reason};
 tag(E = {ETag,_}) when ETag == error; ETag == 'EXIT'; 
                        ETag == timetrap_timeout;
                        ETag == testcase_aborted -> 
@@ -722,13 +779,20 @@ tag(E = testcase_aborted_or_killed) ->
 tag(Other) ->
     Other.
 
+tag_cth({skipped,Reason={failed,{_,init_per_testcase,_}}}) ->
+    {auto_skipped,Reason};
 tag_cth({STag,Reason}) when STag == skip; STag == skipped -> 
-    {skipped,Reason};
-tag_cth({fail, Reason}) ->
-    {failed, {error,Reason}};
+    case Reason of
+	{failed,{_,init_per_testcase,_}} -> {auto_skipped,Reason};
+	_ -> {skipped,Reason}
+    end;
+tag_cth({auto_skip,Reason}) ->
+    {auto_skipped,Reason};
+tag_cth({fail,Reason}) ->
+    {failed,{error,Reason}};
 tag_cth(E = {ETag,_}) when ETag == error; ETag == 'EXIT'; 
-                       ETag == timetrap_timeout;
-                       ETag == testcase_aborted -> 
+			   ETag == timetrap_timeout;
+			   ETag == testcase_aborted -> 
     {failed,E};
 tag_cth(E = testcase_aborted_or_killed) ->
     {failed,E};
@@ -1229,6 +1293,8 @@ report(What,Data) ->
 		    ct_hooks:on_tc_skip(tc_auto_skip, Data);
 		{skipped,_} ->
 		    ct_hooks:on_tc_skip(tc_user_skip, Data);
+		{auto_skipped,_} ->
+		    ct_hooks:on_tc_skip(tc_auto_skip, Data);
 		_Else ->
 		    ok
 	    end,
@@ -1253,31 +1319,54 @@ report(What,Data) ->
 		    add_to_stats(auto_skipped);
 		{_,{skipped,_}} ->
 		    add_to_stats(user_skipped);
+		{_,{auto_skipped,_}} ->
+		    add_to_stats(auto_skipped);
 		{_,{SkipOrFail,_Reason}} ->
 		    add_to_stats(SkipOrFail)
 	    end;
-	tc_user_skip ->	    
-	    %% test case specified as skipped in testspec
-	    %% Data = {Suite,Case,Comment}
+	tc_user_skip ->
+	    %% test case or config function specified as skipped in testspec,
+	    %% or init config func for suite/group has returned {skip,Reason}
+	    %% Data = {Suite,Case,Comment} | 
+	    %%        {Suite,{GroupConfigFunc,GroupName},Comment} 
+	    {Func,Data1} = case Data of
+			       {Suite,{ConfigFunc,undefined},Cmt} ->
+				   {ConfigFunc,{Suite,ConfigFunc,Cmt}};
+			       {_,{ConfigFunc,_},_} -> {ConfigFunc,Data};
+			       {_,Case,_} -> {Case,Data}
+			   end,
+
 	    ct_event:sync_notify(#event{name=tc_user_skip,
 					node=node(),
-					data=Data}),
-	    ct_hooks:on_tc_skip(What, Data),
-	    add_to_stats(user_skipped);
-	tc_auto_skip ->
-	    %% test case skipped because of error in init_per_suite
-	    %% Data = {Suite,Case,Comment}
-
-	    {_Suite,Case,_Result} = Data,
+					data=Data1}),
+	    ct_hooks:on_tc_skip(What, Data1),
 
+	    if Func /= init_per_suite, Func /= init_per_group,
+	       Func /= end_per_suite, Func /= end_per_group ->
+		    add_to_stats(user_skipped);
+	       true ->
+		    ok
+	    end;
+	tc_auto_skip ->
+	    %% test case skipped because of error in config function, or
+	    %% config function skipped because of error in info function
+	    %% Data = {Suite,Case,Comment} |
+	    %%        {Suite,{GroupConfigFunc,GroupName},Comment} 
+	    {Func,Data1} = case Data of
+			       {Suite,{ConfigFunc,undefined},Cmt} ->
+				   {ConfigFunc,{Suite,ConfigFunc,Cmt}};
+			       {_,{ConfigFunc,_},_} -> {ConfigFunc,Data};
+			       {_,Case,_} -> {Case,Data}
+			   end,
 	    %% this test case does not have a log, so printouts
 	    %% from event handlers should end up in the main log
 	    ct_event:sync_notify(#event{name=tc_auto_skip,
 					node=node(),
-					data=Data}),
-	    ct_hooks:on_tc_skip(What, Data),
-	    if Case /= end_per_suite, 
-	       Case /= end_per_group ->
+					data=Data1}),
+	    ct_hooks:on_tc_skip(What, Data1),
+
+	    if Func /= end_per_suite, 
+	       Func /= end_per_group ->
 		    add_to_stats(auto_skipped);
 	       true -> 
 		    ok
@@ -1328,7 +1417,7 @@ warn(_What) ->
     true.
 
 %%%-----------------------------------------------------------------
-%%% @spec add_data_dir(File0) -> File1
+%%% @spec add_data_dir(File0, Config) -> File1
 add_data_dir(File,Config) when is_atom(File) ->
     add_data_dir(atom_to_list(File),Config);
 
diff --git a/lib/common_test/src/ct_gen_conn.erl b/lib/common_test/src/ct_gen_conn.erl
index a5b736136f..078d6b1a44 100644
--- a/lib/common_test/src/ct_gen_conn.erl
+++ b/lib/common_test/src/ct_gen_conn.erl
@@ -29,6 +29,13 @@
 -export([start/4, stop/1, get_conn_pid/1]).
 -export([call/2, call/3, return/2, do_within_time/2]).
 
+%%----------------------------------------------------------------------
+%% Exported types
+%%----------------------------------------------------------------------
+-export_type([server_id/0,
+	      target_name/0,
+	      key_or_name/0]).
+
 -ifdef(debug).
 -define(dbg,true).
 -else.
@@ -47,6 +54,18 @@
 		  cb_state,
 		  ct_util_server}).
 
+%%------------------------------------------------------------------
+%% Type declarations
+%%------------------------------------------------------------------
+-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().
+
+
 %%%-----------------------------------------------------------------
 %%% @spec start(Address,InitData,CallbackMod,Opts) ->
 %%%                                     {ok,Handle} | {error,Reason}
diff --git a/lib/common_test/src/ct_hooks.erl b/lib/common_test/src/ct_hooks.erl
index 3d87a82e24..e845e9e908 100644
--- a/lib/common_test/src/ct_hooks.erl
+++ b/lib/common_test/src/ct_hooks.erl
@@ -50,9 +50,8 @@
 -spec init(State :: term()) -> ok |
 			       {fail, Reason :: term()}.
 init(Opts) ->
-    call(get_new_hooks(Opts, undefined) ++ get_builtin_hooks(Opts),
+    call(get_builtin_hooks(Opts) ++ get_new_hooks(Opts, undefined),
 	 ok, init, []).
-		      
 
 %% @doc Called after all suites are done.
 -spec terminate(Hooks :: term()) ->
@@ -276,8 +275,10 @@ get_new_hooks(Config, Fun) ->
 		end, get_new_hooks(Config)).
 
 get_new_hooks(Config) when is_list(Config) ->
-    lists:flatmap(fun({?config_name, HookConfigs}) ->
+    lists:flatmap(fun({?config_name, HookConfigs}) when is_list(HookConfigs) ->
 			  HookConfigs;
+		     ({?config_name, HookConfig}) when is_atom(HookConfig) ->
+			  [HookConfig];
 		     (_) ->
 			  []
 		  end, Config);
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index f5355bfefe..a4ad65c0a4 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -61,6 +61,7 @@
 -define(index_name, "index.html").
 -define(totals_name, "totals.info").
 -define(log_cache_name, "ct_log_cache").
+-define(misc_io_log, "misc_io.log.html").
 
 -define(table_color1,"#ADD8E6").
 -define(table_color2,"#E4F0FE").
@@ -75,7 +76,7 @@
 		    tests = []}).
 
 %%%-----------------------------------------------------------------
-%%% @spec init(Mode) -> Result
+%%% @spec init(Mode, Verbosity) -> Result
 %%%   Mode = normal | interactive
 %%%   Result = {StartTime,LogDir}
 %%%   StartTime = term()
@@ -446,6 +447,8 @@ tc_print(Category,Importance,Format,Args) ->
 		   ct_util:get_verbosity('$unspecified');
 	       {error,bad_invocation} ->
 		   ?MAX_VERBOSITY;
+	       {error,_Failure} ->
+		   ?MAX_VERBOSITY;
 	       Val ->
 		   Val
 	   end,
@@ -521,7 +524,7 @@ int_footer() ->
 div_header(Class) ->
     div_header(Class,"User").
 div_header(Class,Printer) ->
-    "<div class=\"" ++ atom_to_list(Class) ++ "\"><b>*** " ++ Printer ++
+    "\n<div class=\"" ++ atom_to_list(Class) ++ "\"><b>*** " ++ Printer ++
     " " ++ log_timestamp(now()) ++ " ***</b>".
 div_footer() ->
     "</div>".
@@ -615,6 +618,34 @@ logger(Parent, Mode, Verbosity) ->
 		    end
 	    end
     end,
+
+    test_server_io:start_link(),
+    MiscIoName = filename:join(Dir, ?misc_io_log),
+    {ok,MiscIoFd} = file:open(MiscIoName,
+			      [write,{encoding,utf8}]),
+    test_server_io:set_fd(unexpected_io, MiscIoFd),
+
+    {MiscIoHeader,MiscIoFooter} =
+	case get_ts_html_wrapper("Pre/post-test I/O log", Dir, false,
+				 Dir, undefined, utf8) of
+	    {basic_html,UH,UF} ->
+		{UH,UF};
+	    {xhtml,UH,UF} ->
+		{UH,UF}
+	end,
+    io:put_chars(MiscIoFd,
+		 [MiscIoHeader,
+		  "<a name=\"pretest\"></a>\n",
+		  xhtml("<br>\n<h2>Pre-test Log</h2>",
+			"<br />\n<h3>PRE-TEST LOG</h3>"),
+		  "\n<pre>\n"]),
+    MiscIoDivider =
+	"\n<a name=\"posttest\"></a>\n"++
+	xhtml("</pre>\n<br><h2>Post-test Log</h2>\n<pre>\n",
+	      "</pre>\n<br />\n<h3>POST-TEST LOG</h3>\n<pre>\n"),
+    ct_util:set_testdata_async({misc_io_log,{filename:absname(MiscIoName),
+					     MiscIoDivider,MiscIoFooter}}),
+
     ct_event:notify(#event{name=start_logging,node=node(),
 			   data=AbsDir}),
     make_all_runs_index(start),
@@ -625,7 +656,7 @@ logger(Parent, Mode, Verbosity) ->
     end,
     file:set_cwd(Dir),
     make_last_run_index(Time),
-    CtLogFd = open_ctlog(),
+    CtLogFd = open_ctlog(?misc_io_log),
     io:format(CtLogFd,int_header()++int_footer(),
 	      [log_timestamp(now()),"Common Test Logger started"]),
     Parent ! {started,self(),{Time,filename:absname("")}},
@@ -690,14 +721,15 @@ logger_loop(State) ->
 				false ->
 				    %% Group leader is dead, so write to the
 				    %% CtLog or unexpected_io log instead
-				    unexpected_io(Pid,Category,List,State),
+				    unexpected_io(Pid,Category,Importance,
+						  List,State),
 				    logger_loop(State)			    
 			    end;
 			{ct_log,_Fd,TCGLs} ->
 			    %% If category is ct_internal then write
 			    %% to ct_log, else write to unexpected_io
 			    %% log
-			    unexpected_io(Pid,Category,List,State),
+			    unexpected_io(Pid,Category,Importance,List,State),
 			    logger_loop(State#logger_state{
 					  tc_groupleaders = TCGLs})
 		    end;
@@ -798,7 +830,7 @@ print_to_log(sync, FromPid, Category, TCGL, List, State) ->
 	    IoFun = create_io_fun(FromPid, State),
 	    io:format(TCGL,"~ts", [lists:foldl(IoFun, [], List)]);
        true ->
-	    unexpected_io(FromPid,Category,List,State)
+	    unexpected_io(FromPid,Category,?MAX_IMPORTANCE,List,State)
     end,
     State;
 
@@ -814,7 +846,8 @@ print_to_log(async, FromPid, Category, TCGL, List, State) ->
 		end;
 	   true ->
 		fun() ->
-			unexpected_io(FromPid,Category,List,State)
+			unexpected_io(FromPid,Category,?MAX_IMPORTANCE,
+				      List,State)
 		end
 	end,
     case State#logger_state.async_print_jobs of
@@ -918,7 +951,7 @@ set_evmgr_gl(GL) ->
 	EvMgrPid -> group_leader(GL,EvMgrPid)
     end.
 
-open_ctlog() ->
+open_ctlog(MiscIoName) ->
     {ok,Fd} = file:open(?ct_log_name,[write,{encoding,utf8}]),
     io:format(Fd, header("Common Test Framework Log", {[],[1,2],[]}), []),
     case file:consult(ct_run:variables_file_name("../")) of
@@ -933,10 +966,21 @@ open_ctlog() ->
 		      "No configuration found for test!!\n",
 		      [Variables,Reason])
     end,
+    io:format(Fd, 
+	      xhtml("<br><br><h2>Pre/post-test I/O Log</h2>\n",
+		    "<br /><br />\n<h4>PRE/POST TEST I/O LOG</h4>\n"), []),    
+    io:format(Fd,
+	      "\n<ul>\n"
+	      "<li><a href=\"~ts#pretest\">"
+	      "View I/O logged before the test run</a></li>\n"
+	      "<li><a href=\"~ts#posttest\">"
+	      "View I/O logged after the test run</a></li>\n</ul>\n",
+	      [MiscIoName,MiscIoName]),
+
     print_style(Fd,undefined),
     io:format(Fd, 
-	      xhtml("<br><br><h2>Progress Log</h2>\n<pre>\n",
-		    "<br /><br /><h4>PROGRESS LOG</h4>\n<pre>\n"), []),
+	      xhtml("<br><h2>Progress Log</h2>\n<pre>\n",
+		    "<br />\n<h4>PROGRESS LOG</h4>\n<pre>\n"), []),
     Fd.
 
 print_style(Fd,undefined) ->
@@ -1205,7 +1249,8 @@ make_one_index_entry1(SuiteName, Link, Label, Success, Fail, UserSkip, AutoSkip,
 		 integer_to_list(NotBuilt),"</a></td>\n"]
 	end,
     FailStr =
-	if Fail > 0 ->  
+	if (Fail > 0) or (NotBuilt > 0) or
+	   ((Success+Fail+UserSkip+AutoSkip) == 0) ->  
 		["<font color=\"red\">",
 		 integer_to_list(Fail),"</font>"];
 	   true ->
@@ -1860,7 +1905,8 @@ runentry(Dir, undefined, _) ->
 runentry(Dir, Totals={Node,Label,Logs,
 		      {TotSucc,TotFail,UserSkip,AutoSkip,NotBuilt}}, Index) ->
     TotFailStr =
-	if TotFail > 0 ->  
+	if (TotFail > 0) or (NotBuilt > 0) or
+	   ((TotSucc+TotFail+UserSkip+AutoSkip) == 0) ->
 		["<font color=\"red\">",
 		 integer_to_list(TotFail),"</font>"];
 	   true ->
@@ -2852,6 +2898,9 @@ make_relative1(DirTs, CwdTs) ->
 %%% @doc
 %%%
 get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding) ->
+    get_ts_html_wrapper(TestName, undefined, PrintLabel, Cwd, TableCols, Encoding).
+
+get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) ->
     TestName1 = if is_list(TestName) ->
 			lists:flatten(TestName);
 		   true ->
@@ -2872,7 +2921,12 @@ get_ts_html_wrapper(TestName, PrintLabel, Cwd, TableCols, Encoding) ->
 		end
 	end,
     CTPath = code:lib_dir(common_test),
-    {ok,CtLogdir} = get_log_dir(true),
+
+    {ok,CtLogdir} =
+	if Logdir == undefined -> get_log_dir(true);
+	   true -> {ok,Logdir}
+	end,
+
     AllRuns = make_relative(filename:join(filename:dirname(CtLogdir),
 					  ?all_runs_name), Cwd),
     TestIndex = make_relative(filename:join(filename:dirname(CtLogdir),
@@ -3066,10 +3120,12 @@ html_encoding(latin1) ->
 html_encoding(utf8) ->
     "utf-8".
 
-unexpected_io(Pid,ct_internal,List,#logger_state{ct_log_fd=Fd}=State) ->
+unexpected_io(Pid,ct_internal,_Importance,List,State) ->
     IoFun = create_io_fun(Pid,State),
-    io:format(Fd, "~ts", [lists:foldl(IoFun, [], List)]);
-unexpected_io(Pid,_Category,List,State) ->
+    io:format(State#logger_state.ct_log_fd, "~ts",
+	      [lists:foldl(IoFun, [], List)]);
+unexpected_io(Pid,_Category,_Importance,List,State) ->
     IoFun = create_io_fun(Pid,State),
     Data = io_lib:format("~ts", [lists:foldl(IoFun, [], List)]),
-    test_server_io:print_unexpected(Data).
+    test_server_io:print_unexpected(Data),
+    ok.
diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index e094ee877a..35920ec1dc 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -212,11 +212,7 @@
 %%----------------------------------------------------------------------
 %% Exported types
 %%----------------------------------------------------------------------
--export_type([hook_options/0,
-	      conn_mod/0,
-	      log_type/0,
-	      key_or_name/0,
-	      notification/0]).
+-export_type([notification/0]).
 
 %%----------------------------------------------------------------------
 %% Internal exports
@@ -247,7 +243,11 @@
 
 -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))))).
+	(?is_simple_xml(F)
+	 orelse (F==[])
+	 orelse (is_list(F) andalso ?is_simple_xml(hd(F))))).
+-define(is_simple_xml(Xml),
+	(is_atom(Xml) orelse (is_tuple(Xml) andalso is_atom(element(1,Xml))))).
 -define(is_string(S), (is_list(S) andalso is_integer(hd(S)))).
 
 %%----------------------------------------------------------------------
@@ -288,19 +288,11 @@
 %%----------------------------------------------------------------------
 %% Type declarations
 %%----------------------------------------------------------------------
--type client() :: handle() | server_id() | target_name().
+-type client() :: handle() | ct_gen_conn:server_id() | ct_gen_conn: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.
 
@@ -322,14 +314,7 @@
 %% 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()} |
@@ -380,7 +365,7 @@ open(Options) ->
 
 %%----------------------------------------------------------------------
 -spec open(KeyOrName, ExtraOptions) -> Result when
-      KeyOrName :: key_or_name(),
+      KeyOrName :: ct_gen_conn:key_or_name(),
       ExtraOptions :: options(),
       Result :: {ok,handle()} | {error,error_reason()}.
 %% @doc Open a named netconf session and exchange `hello' messages.
@@ -457,7 +442,7 @@ only_open(Options) ->
 
 %%----------------------------------------------------------------------
 -spec only_open(KeyOrName,ExtraOptions) -> Result when
-      KeyOrName :: key_or_name(),
+      KeyOrName :: ct_gen_conn:key_or_name(),
       ExtraOptions :: options(),
       Result :: {ok,handle()} | {error,error_reason()}.
 %% @doc Open a name netconf session, but don't send `hello'.
@@ -540,22 +525,51 @@ get_capabilities(Client) ->
 get_capabilities(Client, Timeout) ->
     call(Client, get_capabilities, Timeout).
 
-%% @private
+%%----------------------------------------------------------------------
+%% @spec send(Client, SimpleXml) -> Result
+%% @equiv send(Client, SimpleXml, infinity)
 send(Client, SimpleXml) ->
     send(Client, SimpleXml, ?DEFAULT_TIMEOUT).
-%% @private
+
+%%----------------------------------------------------------------------
+-spec send(Client, SimpleXml, Timeout) -> Result when
+      Client :: client(),
+      SimpleXml :: simple_xml(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Send an XML document to the server.
+%%
+%% The given XML document is sent as is to the server. This function
+%% can be used for sending XML documents that can not be expressed by
+%% other interface functions in this module.
 send(Client, SimpleXml, Timeout) ->
     call(Client,{send, Timeout, SimpleXml}).
 
-%% @private
+%%----------------------------------------------------------------------
+%% @spec send_rpc(Client, SimpleXml) -> Result
+%% @equiv send_rpc(Client, SimpleXml, infinity)
 send_rpc(Client, SimpleXml) ->
     send_rpc(Client, SimpleXml, ?DEFAULT_TIMEOUT).
-%% @private
+
+%%----------------------------------------------------------------------
+-spec send_rpc(Client, SimpleXml, Timeout) -> Result when
+      Client :: client(),
+      SimpleXml :: simple_xml(),
+      Timeout :: timeout(),
+      Result :: ok | {error,error_reason()}.
+%% @doc Send a Netconf <code>rpc</code> request to the server.
+%%
+%% The given XML document is wrapped in a valid Netconf
+%% <code>rpc</code> request and sent to the server. The
+%% <code>message-id</code> and namespace attributes are added to the
+%% <code>rpc</code> element.
+%%
+%% This function can be used for sending <code>rpc</code> requests
+%% that can not be expressed by other interface functions in this
+%% module.
 send_rpc(Client, SimpleXml, Timeout) ->
     call(Client,{send_rpc, SimpleXml, Timeout}).
 
-
-
 %%----------------------------------------------------------------------
 %% @spec lock(Client, Target) -> Result
 %% @equiv lock(Client, Target, infinity)
@@ -761,7 +775,7 @@ create_subscription(Client,Timeout)
   when ?is_timeout(Timeout) ->
     create_subscription(Client,?DEFAULT_STREAM,Timeout);
 create_subscription(Client,Stream)
-  when is_list(Stream) ->
+  when ?is_string(Stream) ->
     create_subscription(Client,Stream,?DEFAULT_TIMEOUT);
 create_subscription(Client,Filter)
   when ?is_filter(Filter) ->
@@ -769,14 +783,14 @@ create_subscription(Client,Filter)
 			?DEFAULT_TIMEOUT).
 
 create_subscription(Client,Stream,Timeout)
-  when is_list(Stream) andalso
+  when ?is_string(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) ->
+  when ?is_string(StartTime) andalso
+       ?is_string(StopTime) ->
     create_subscription(Client,?DEFAULT_STREAM,StartTime,StopTime,
 			?DEFAULT_TIMEOUT);
 create_subscription(Client,Filter,Timeout)
@@ -784,28 +798,28 @@ create_subscription(Client,Filter,Timeout)
        ?is_timeout(Timeout) ->
     create_subscription(Client,?DEFAULT_STREAM,Filter,Timeout);
 create_subscription(Client,Stream,Filter)
-  when is_list(Stream) andalso
+  when ?is_string(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
+  when ?is_string(StartTime) andalso
+       ?is_string(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) ->
+  when ?is_string(Stream) andalso
+       ?is_string(StartTime) andalso
+       ?is_string(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) ->
+       ?is_string(StartTime) andalso
+       ?is_string(StopTime) ->
     create_subscription(Client,?DEFAULT_STREAM,Filter,
 			StartTime,StopTime,?DEFAULT_TIMEOUT);
 create_subscription(Client,Stream,Filter,Timeout)
-  when is_list(Stream) andalso
+  when ?is_string(Stream) andalso
        ?is_filter(Filter) andalso
        ?is_timeout(Timeout) ->
     call(Client,{send_rpc_op,{create_subscription,self()},
@@ -813,18 +827,18 @@ create_subscription(Client,Stream,Filter,Timeout)
 		 Timeout}).
 
 create_subscription(Client,Stream,StartTime,StopTime,Timeout)
-  when is_list(Stream) andalso
-       is_list(StartTime) andalso
-       is_list(StopTime) andalso
+  when ?is_string(Stream) andalso
+       ?is_string(StartTime) andalso
+       ?is_string(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
+  when ?is_string(Stream) andalso
        ?is_filter(Filter) andalso
-       is_list(StartTime) andalso
-       is_list(StopTime) ->
+       ?is_string(StartTime) andalso
+       ?is_string(StopTime) ->
     create_subscription(Client,Stream,Filter,StartTime,StopTime,?DEFAULT_TIMEOUT).
 
 %%----------------------------------------------------------------------
@@ -832,7 +846,7 @@ create_subscription(Client,Stream,Filter,StartTime,StopTime)
 				 Result when
       Client :: client(),
       Stream :: stream_name(),
-      Filter :: simple_xml(),
+      Filter :: simple_xml() | [simple_xml()],
       StartTime :: xs_datetime(),
       StopTime :: xs_datetime(),
       Timeout :: timeout(),
@@ -855,8 +869,7 @@ create_subscription(Client,Stream,Filter,StartTime,StopTime)
 %%   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>
+%%   parameters will be sent.</dd>
 %%
 %%   <dt>StartTime:</dt>
 %%   <dd>An optional parameter used to trigger the replay feature and
@@ -1097,10 +1110,14 @@ handle_msg({Ref,timeout},
     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} =
+    {value,#pending{op=Op,caller=Caller},Pending1} =
 	lists:keytake(Ref,#pending.ref,Pending),
     ct_gen_conn:return(Caller,{error,timeout}),
-    {noreply,State#state{pending=Pending1}}.
+    R = case Op of
+	    close_session -> stop;
+	    _ -> noreply
+	end,
+    {R,State#state{pending=Pending1}}.
 
 %% @private
 %% Called by ct_util_server to close registered connections before terminate.
@@ -1241,8 +1258,10 @@ filter(undefined) ->
     [];
 filter({xpath,Filter}) when ?is_string(Filter) ->
     [{filter,[{type,"xpath"},{select, Filter}],[]}];
+filter(Filter) when is_list(Filter) ->
+    [{filter,[{type,"subtree"}],Filter}];
 filter(Filter) ->
-    [{filter,[{type,"subtree"}],[Filter]}].
+    filter([Filter]).
 
 maybe_element(_,undefined) ->
     [];
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 266ca73417..7c797be03e 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -1883,7 +1883,7 @@ verify_suites(TestSuites) ->
 								  atom_to_list(
 								    Suite)),
 						io:format(user,
-							  "Suite ~w not found"
+							  "Suite ~w not found "
 							  "in directory ~ts~n",
 							  [Suite,TestDir]),
 						{Found,[{DS,[Name]}|NotFound]}
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index 4092d33bc0..b4d82a53cf 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -17,51 +17,147 @@
 %% %CopyrightEnd%
 %%
 
-%%% @doc Common Test specific layer on top of telnet client ct_telnet_client.erl
-%%%
-%%% <p>Use this module to set up telnet connections, send commands and
-%%% perform string matching on the result.
-%%% See the <c>unix_telnet</c> manual page for information about how to use 
-%%% ct_telnet, and configure connections, specifically for unix hosts.</p>
-%%% <p>The following default values are defined in ct_telnet:</p>
-%%% <pre>
-%%% Connection timeout = 10 sec (time to wait for connection)
-%%% Command timeout = 10 sec (time to wait for a command to return)
-%%% Max no of reconnection attempts = 3
-%%% Reconnection interval = 5 sek (time to wait in between reconnection attempts)
-%%% Keep alive = true (will send NOP to the server every 10 sec if connection is idle)</pre>
-%%% <p>These parameters can be altered by the user with the following
-%%% configuration term:</p>
-%%% <pre>
-%%% {telnet_settings, [{connect_timeout,Millisec},
-%%%                    {command_timeout,Millisec},
-%%%                    {reconnection_attempts,N},
-%%%                    {reconnection_interval,Millisec},
-%%%                    {keep_alive,Bool}]}.</pre>
-%%% <p><code>Millisec = integer(), N = integer()</code></p>
-%%% <p>Enter the <code>telnet_settings</code> term in a configuration 
-%%% file included in the test and ct_telnet will retrieve the information
-%%% automatically. Note that <c>keep_alive</c> may be specified per connection if
-%%% required. See <c>unix_telnet</c> for details.</p></doc>
-
-%%% @type connection_type() = telnet | ts1 | ts2
-
-%%% @type connection() = handle() |
-%%% {ct:target_name(),connection_type()} | ct:target_name()
-
-%%% @type handle() = ct_gen_conn:handle(). Handle for a
-%%% specific telnet connection.
-
-%%% @type prompt_regexp() = string(). A regular expression which
-%%% matches all possible prompts for a specific type of target. The
-%%% regexp must not have any groups i.e. when matching, re:run/3 shall
-%%% return a list with one single element.
-%%%
-%%% @see unix_telnet
+%% @doc Common Test specific layer on top of telnet client `ct_telnet_client.erl'
+%%
+%% <p>Use this module to set up telnet connections, send commands and
+%% perform string matching on the result.
+%% See the `unix_telnet' manual page for information about how to use 
+%% `ct_telnet', and configure connections, specifically for unix hosts.</p>
+%% <p>The following default values are defined in `ct_telnet':</p>
+%% <pre>
+%% Connection timeout = 10 sec (time to wait for connection)
+%% Command timeout = 10 sec (time to wait for a command to return)
+%% Max no of reconnection attempts = 3
+%% Reconnection interval = 5 sek (time to wait in between reconnection attempts)
+%% Keep alive = true (will send NOP to the server every 10 sec if connection is idle)</pre>
+%% <p>These parameters can be altered by the user with the following
+%% configuration term:</p>
+%% <pre>
+%% {telnet_settings, [{connect_timeout,Millisec},
+%%                    {command_timeout,Millisec},
+%%                    {reconnection_attempts,N},
+%%                    {reconnection_interval,Millisec},
+%%                    {keep_alive,Bool}]}.</pre>
+%% <p><code>Millisec = integer(), N = integer()</code></p>
+%% <p>Enter the <code>telnet_settings</code> term in a configuration 
+%% file included in the test and ct_telnet will retrieve the information
+%% automatically. Note that `keep_alive' may be specified per connection if
+%% required. See `unix_telnet' for details.</p>
+%%
+%% == Logging ==
+%%
+%% `ct_telnet' can be configured to uses the `error_logger' for logging telnet
+%% 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()}]}]}].
+%%'''
+%%
+%% `conn_mod()' is the name of the common_test module implementing
+%% the connection protocol, i.e. `ct_telnet'.
+%%
+%% The hook option `log_type' specifies the type of logging:
+%%
+%% <dl>
+%%   <dt>`raw'</dt>
+%%   <dd>The sent and received telnet 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>`html (default)'</dt>
+%%   <dd>The sent and received telnet traffic is pretty printed
+%%   directly in the test case HTML log.</dd>
+%%
+%%   <dt>`silent'</dt>
+%%   <dd>Telnet traffic is not logged.</dd>
+%% </dl>
+%%
+%% By default, all telnet 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
+%% (see the `open' function below).
+%%
+%% 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_telnet,[{log_type,raw},
+%%                           {hosts,[key_or_name()]}]}]}
+%% '''
+%%
+%% <b>Note</b> that hook options specified in a configuration file
+%% will overwrite any hardcoded hook options in the test suite.
+%%
+%% === Logging example 1 ===
+%%
+%% The following `ct_hooks' statement will cause raw printing of
+%% telnet traffic to separate logs for the connections named
+%% `server1' and `server2'. Any other connections will be logged
+%% to default telnet log.
+%%
+%% ```
+%% suite() ->
+%%    [{ct_hooks, [{cth_conn_log, [{ct_telnet,[{log_type,raw}},
+%%                                             {hosts,[server1,server2]}]}
+%%                                ]}]}].
+%%'''
+%%
+%% === Logging example 2 ===
+%%
+%% The following configuration file will cause raw logging of all
+%% telnet traffic into one single text file.
+%%
+%% ```
+%% {ct_conn_log,[{ct_telnet,[{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 telnet connections into the test case
+%% HTML log.
+%%
+%% <b>Note</b> that if the `cth_conn_log' hook is not added, telnet
+%% traffic is still logged in the test case HTML log file (on the legacy
+%% `ct_telnet' format).
+%% @end
 
--module(ct_telnet).
+%% @type connection_type() = telnet | ts1 | ts2
+
+%% @type connection() = handle() |
+%% {ct:target_name(),connection_type()} | ct:target_name()
 
--compile(export_all).
+%% @type handle() = ct_gen_conn:handle(). Handle for a
+%% specific telnet connection.
+
+%% @type prompt_regexp() = string(). A regular expression which
+%% matches all possible prompts for a specific type of target. The
+%% regexp must not have any groups i.e. when matching, re:run/3 shall
+%% return a list with one single element.
+%%
+%% @see unix_telnet
+
+-module(ct_telnet).
 
 -export([open/1, open/2, open/3, open/4, close/1]).
 -export([cmd/2, cmd/3, cmdf/3, cmdf/4, get_data/1, 
@@ -71,10 +167,9 @@
 -export([init/3,handle_msg/2,reconnect/2,terminate/2]).
 
 %% Tool internals
--export([silent_teln_expect/5, teln_receive_until_prompt/3,
-	 start_log/1, log/3, cont_log/2, end_log/0,
-	 try_start_log/1, try_log/3, try_cont_log/2, try_end_log/0]).
-
+-export([silent_teln_expect/6, teln_receive_until_prompt/3,
+	 format_data/2]).
+-export([start_gen_log/1, end_gen_log/0, log/3, log/4]).
 
 -define(RECONNS,3).
 -define(RECONN_TIMEOUT,5000).
@@ -83,12 +178,14 @@
 
 -include("ct_util.hrl").
 
--record(state,{teln_pid,
+-record(state,{host,
+	       port,
+	       teln_pid,
 	       prx,
-	       type,
 	       buffer=[],
 	       prompt=false,
 	       name,
+	       type,
 	       target_mod,
 	       keep_alive,
 	       extra,
@@ -160,8 +257,7 @@ open(KeyOrName,ConnType,TargetMod) ->
 open(KeyOrName,ConnType,TargetMod,Extra) ->
     case ct:get_config({KeyOrName,ConnType}) of
 	undefined ->
-	    log(heading(open,{KeyOrName,ConnType}),"Failed: ~p",
-		[{not_available,KeyOrName}]),
+	    log(undefined,open,"Failed: ~p",[{not_available,KeyOrName}]),
 	    {error,{not_available,KeyOrName,ConnType}};
 	Addr ->
 	    Addr1 =
@@ -183,8 +279,8 @@ open(KeyOrName,ConnType,TargetMod,Extra) ->
 			end;
 		    Bool -> Bool
 		end,
-	    log(heading(open,{KeyOrName,ConnType}),
-		"Opening connection to: ~p",[Addr1]),
+	    log(undefined,open,"Connecting to ~p(~p)",
+		[KeyOrName,Addr1]),
 	    ct_gen_conn:start(KeyOrName,full_addr(Addr1,ConnType),
 			      {TargetMod,KeepAlive,Extra},?MODULE)
     end.
@@ -202,7 +298,7 @@ open(KeyOrName,ConnType,TargetMod,Extra) ->
 close(Connection) ->
     case get_handle(Connection) of
 	{ok,Pid} ->
-	    log("ct_telnet:close","Handle: ~w",[Pid]),
+	    log(undefined,close,"Connection closed, handle: ~w",[Pid]),
 	    case ct_gen_conn:stop(Pid) of
 		{error,{process_down,Pid,noproc}} ->
 		    {error,already_closed};
@@ -408,9 +504,20 @@ init(Name,{Ip,Port,Type},{TargetMod,KeepAlive,Extra}) ->
 	     Settings ->
 		 set_telnet_defaults(Settings,#state{})				    
 	 end,
-    case catch TargetMod:connect(Ip,Port,S0#state.conn_to,KeepAlive,Extra) of
+    case catch TargetMod:connect(Name,Ip,Port,S0#state.conn_to,
+				 KeepAlive,Extra) of
 	{ok,TelnPid} ->
-	    log(heading(init,{Name,Type}), 
+	    put({ct_telnet_pid2name,TelnPid},Name),
+	    S1 = S0#state{host=Ip,
+			  port=Port,
+			  teln_pid=TelnPid,
+			  name=Name,
+			  type=type(Type),
+			  target_mod=TargetMod,
+			  keep_alive=KeepAlive,
+			  extra=Extra,
+			  prx=TargetMod:get_prompt_regexp()},
+	    log(S1,open,
 		"Opened telnet connection\n"
 		"IP: ~p\n"
 		"Port: ~p\n"
@@ -419,15 +526,9 @@ init(Name,{Ip,Port,Type},{TargetMod,KeepAlive,Extra}) ->
 		"Reconnection interval: ~p\n"
 		"Connection timeout: ~p\n"
 		"Keep alive: ~w",
-		[Ip,Port,S0#state.com_to,S0#state.reconns,
-		 S0#state.reconn_int,S0#state.conn_to,KeepAlive]),
-	    {ok,TelnPid,S0#state{teln_pid=TelnPid,
-				 type=type(Type),
-				 name={Name,Type},
-				 target_mod=TargetMod,
-				 keep_alive=KeepAlive,
-				 extra=Extra,
-				 prx=TargetMod:get_prompt_regexp()}};
+		[Ip,Port,S1#state.com_to,S1#state.reconns,
+		 S1#state.reconn_int,S1#state.conn_to,KeepAlive]),
+	    {ok,TelnPid,S1};
 	{'EXIT',Reason} ->
 	    {error,Reason};
 	Error ->
@@ -448,27 +549,31 @@ set_telnet_defaults([{reconnection_interval,RInt}|Ss],S) ->
 set_telnet_defaults([{keep_alive,_}|Ss],S) ->
     set_telnet_defaults(Ss,S);
 set_telnet_defaults([Unknown|Ss],S) ->
-    log(heading(set_telnet_defaults,{telnet_settings,Unknown}),
-	"Bad element in telnet_settings: ~p",[Unknown]),
+    force_log(S,error,
+	      "Bad element in telnet_settings: ~p",[Unknown]),
     set_telnet_defaults(Ss,S);
 set_telnet_defaults([],S) ->
     S.
 
 %% @hidden
 handle_msg({cmd,Cmd,Timeout},State) ->
-    try_start_log(heading(cmd,State#state.name)),
-    try_cont_log("Cmd: ~p", [Cmd]),
-    debug_cont_log("Throwing Buffer:",[]),
+    start_gen_log(heading(cmd,State#state.name)),
+    log(State,cmd,"Cmd: ~p",[Cmd]),
+
+    debug_cont_gen_log("Throwing Buffer:",[]),
     debug_log_lines(State#state.buffer),
+
     case {State#state.type,State#state.prompt} of
 	{ts,_} -> 
-	    silent_teln_expect(State#state.teln_pid,
+	    silent_teln_expect(State#state.name,
+			       State#state.teln_pid,
 			       State#state.buffer,
 			       prompt,
 			       State#state.prx,
 			       [{timeout,2000}]);
 	{ip,false} -> 
-	    silent_teln_expect(State#state.teln_pid,
+	    silent_teln_expect(State#state.name,
+			       State#state.teln_pid,
 			       State#state.buffer,
 			       prompt,
 			       State#state.prx,
@@ -482,29 +587,36 @@ handle_msg({cmd,Cmd,Timeout},State) ->
     {Return,NewBuffer,Prompt} = 
 	case teln_cmd(State#state.teln_pid, Cmd, State#state.prx, TO) of
 	    {ok,Data,_PromptType,Rest} ->
-		try_cont_log("Return: ~p", [{ok,Data}]),
+		log(State,recv,"Return: ~p",[{ok,Data}]),
 		{{ok,Data},Rest,true};
 	    Error ->
-		Retry = {retry,{Error,State#state.name,State#state.teln_pid,
+		Retry = {retry,{Error,
+				{State#state.name,
+				 State#state.type},
+				State#state.teln_pid,
 				{cmd,Cmd,TO}}},
-		try_cont_log("Return: ~p", [Error]),
+		log(State,recv,"Return: ~p",[Error]),
 		{Retry,[],false}
 	end,
-    try_end_log(),
+    end_gen_log(),
     {Return,State#state{buffer=NewBuffer,prompt=Prompt}};
 handle_msg({send,Cmd},State) ->
-    try_log(heading(send,State#state.name),"Cmd: ~p",[Cmd]),
-    debug_cont_log("Throwing Buffer:",[]),
+    log(State,send,"Cmd: ~p",[Cmd]),
+
+    debug_cont_gen_log("Throwing Buffer:",[]),
     debug_log_lines(State#state.buffer),
+
     case {State#state.type,State#state.prompt} of
 	{ts,_} -> 
-	    silent_teln_expect(State#state.teln_pid,
+	    silent_teln_expect(State#state.name,
+			       State#state.teln_pid,
 			       State#state.buffer,
 			       prompt,
 			       State#state.prx,
 			       [{timeout,2000}]);
 	{ip,false} -> 
-	    silent_teln_expect(State#state.teln_pid,
+	    silent_teln_expect(State#state.name,
+			       State#state.teln_pid,
 			       State#state.buffer,
 			       prompt,
 			       State#state.prx,
@@ -515,19 +627,21 @@ handle_msg({send,Cmd},State) ->
     ct_telnet_client:send_data(State#state.teln_pid,Cmd),
     {ok,State#state{buffer=[],prompt=false}};
 handle_msg(get_data,State) ->
-    try_start_log(heading(get_data,State#state.name)),
+    start_gen_log(heading(get_data,State#state.name)),
+    log(State,cmd,"Reading data...",[]),
     {ok,Data,Buffer} = teln_get_all_data(State#state.teln_pid,
 					 State#state.prx,
 					 State#state.buffer,
 					 [],[]),
-    try_cont_log("Return: ~p",[{ok,Data}]),
-    try_end_log(),
+    log(State,recv,"Return: ~p",[{ok,Data}]),
+    end_gen_log(),
     {{ok,Data},State#state{buffer=Buffer}};
 handle_msg({expect,Pattern,Opts},State) ->
-    try_start_log(heading(expect,State#state.name)),
-    try_cont_log("Expect: ~p\nOpts=~p\n",[Pattern,Opts]),
+    start_gen_log(heading(expect,State#state.name)),
+    log(State,expect,"Expect: ~p\nOpts = ~p\n",[Pattern,Opts]),
     {Return,NewBuffer,Prompt} = 
-	case teln_expect(State#state.teln_pid,
+	case teln_expect(State#state.name,
+			 State#state.teln_pid,
 			 State#state.buffer,
 			 Pattern,
 			 State#state.prx,
@@ -536,22 +650,23 @@ handle_msg({expect,Pattern,Opts},State) ->
 		P = check_if_prompt_was_reached(Data,[]),
 		{{ok,Data},Rest,P};
 	    {ok,Data,HaltReason,Rest} ->
-		force_cont_log("HaltReason: ~p",
-			       [HaltReason]),
+		force_log(State,expect,"HaltReason: ~p",[HaltReason]),
 		P = check_if_prompt_was_reached(Data,HaltReason),
 		{{ok,Data,HaltReason},Rest,P};
 	    {error,Reason,Rest} ->
-		force_cont_log("Expect failed\n~p",[{error,Reason}]),
+		force_log(State,expect,"Expect failed\n~p",[{error,Reason}]),
 		P = check_if_prompt_was_reached([],Reason),
 		{{error,Reason},Rest,P};
 	    {error,Reason} ->
-		force_cont_log("Expect failed\n~p",[{error,Reason}]),
+		force_log(State,expect,"Expect failed\n~p",[{error,Reason}]),
 		P = check_if_prompt_was_reached([],Reason),
 		{{error,Reason},[],P}
 	end,
-    try_end_log(),
+    end_gen_log(),
     Return1 = case Return of
-		  {error,_} -> {retry,{Return,State#state.name,
+		  {error,_} -> {retry,{Return,
+				       {State#state.name,
+					State#state.type},
 				       State#state.teln_pid,
 				       {expect,Pattern,Opts}}};
 		  _ -> Return
@@ -562,18 +677,20 @@ handle_msg({expect,Pattern,Opts},State) ->
 %% @hidden
 reconnect({Ip,Port,_Type},State) ->
     reconnect(Ip,Port,State#state.reconns,State).
-reconnect(Ip,Port,N,State=#state{target_mod=TargetMod,
+reconnect(Ip,Port,N,State=#state{name=Name,
+				 target_mod=TargetMod,
 				 keep_alive=KeepAlive,
 				 extra=Extra,
 				 conn_to=ConnTo,
 				 reconn_int=ReconnInt}) ->
-    case TargetMod:connect(Ip,Port,ConnTo,KeepAlive,Extra) of
-	{ok, NewPid} ->
+    case TargetMod:connect(Name,Ip,Port,ConnTo,KeepAlive,Extra) of
+	{ok,NewPid} ->
+	    put({ct_telnet_pid2name,NewPid},Name),
 	    {ok, NewPid, State#state{teln_pid=NewPid}};
 	Error when N==0 ->
 	    Error;
 	_Error ->
-	    log("Reconnect failed!","Retries left: ~w",[N]),
+	    log(State,reconnect,"Reconnect failed!","Retries left: ~w",[N]),
 	    timer:sleep(ReconnInt),
 	    reconnect(Ip,Port,N-1,State)
     end.
@@ -581,11 +698,9 @@ reconnect(Ip,Port,N,State=#state{target_mod=TargetMod,
 
 %% @hidden
 terminate(TelnPid,State) ->
-    log(heading(terminate,State#state.name),
-	"Closing telnet connection.\nId: ~w",
-	[TelnPid]),
-    ct_telnet_client:close(TelnPid).
-
+    Result = ct_telnet_client:close(TelnPid),
+    log(State,close,"Telnet connection for ~w closed.",[TelnPid]),
+    Result.
 
 %%%=================================================================
 %%% Internal function
@@ -637,79 +752,109 @@ check_if_prompt_was_reached(Data,_) when is_list(Data) ->
 check_if_prompt_was_reached(_,_) ->
     false.
 
-%tc(Fun) ->
-%    Before = erlang:now(),
-%    Val = Fun(),
-%    After = erlang:now(),
-%    {now_diff(After, Before), Val}.
-%now_diff({A2, B2, C2}, {A1, B1, C1}) ->
-%    ((A2-A1)*1000000 + B2-B1)*1000000 + C2-C1.
-
-heading(Function,Name) ->
-    io_lib:format("~w:~w ~p",[?MODULE,Function,Name]).
-
-%%% @hidden
-%% Functions for regular (unconditional) logging, to be
-%% used during connect, reconnect, disconnect etc.
-log(Heading,Str,Args) ->
-    ct_gen_conn:log(Heading,Str,Args).
-%%% @hidden
-start_log(Heading) -> 
-    ct_gen_conn:start_log(Heading).
-cont_log(Str,Args) -> 
-    ct_gen_conn:cont_log(Str,Args).
-end_log() -> 
-    ct_gen_conn:end_log().
-
-%%% @hidden
-%% Functions for conditional logging, to be used by
-%% cmd, send, receive, expect etc (this output may be 
-%% silenced by user).
-try_start_log(Heading) -> 
-    do_try_log(start_log,[Heading]).
-%%% @hidden
-try_end_log() -> 
-    do_try_log(end_log,[]).
-
-%%% @hidden
-try_log(Heading,Str,Args) ->
-    do_try_log(log,[Heading,Str,Args]).
-
-%%% @hidden
-try_cont_log(Str,Args) -> 
-    do_try_log(cont_log,[Str,Args]).
-
 %%% @hidden
-do_try_log(Func,Args) ->
-    %% check if output is suppressed
-    case ct_util:is_silenced(telnet) of
-	true ->
+%% Functions for logging ct_telnet reports and telnet data 
+
+heading(Action,undefined) ->
+    io_lib:format("~w ~w",[?MODULE,Action]);
+heading(Action,Name) ->
+    io_lib:format("~w ~w for ~p",[?MODULE,Action,Name]).
+
+force_log(State,Action,String,Args) ->
+    log(State,Action,String,Args,true).
+
+log(State,Action,String,Args) when is_record(State, state) ->
+    log(State,Action,String,Args,false);
+log(Name,Action,String,Args) when is_atom(Name) ->
+    log(#state{name=Name},Action,String,Args,false);
+log(TelnPid,Action,String,Args) when is_pid(TelnPid) ->
+    log(#state{teln_pid=TelnPid},Action,String,Args,false).
+
+log(undefined,String,Args) ->
+    log(#state{},undefined,String,Args,false);
+log(Name,String,Args) when is_atom(Name) ->
+    log(#state{name=Name},undefined,String,Args,false);
+log(TelnPid,String,Args) when is_pid(TelnPid) ->
+    log(#state{teln_pid=TelnPid},undefined,String,Args).
+
+log(#state{name=Name,teln_pid=TelnPid,host=Host,port=Port},
+    Action,String,Args,ForcePrint) ->
+    Name1 = if Name == undefined -> get({ct_telnet_pid2name,TelnPid});
+	       true              -> Name
+	    end,
+    Silent = get(silent),
+    case ct_util:get_testdata({cth_conn_log,?MODULE}) of
+	Result when Result /= undefined, Result /= silent, Silent /= true ->
+	    {PrintHeader,PreBR} = if Action==undefined ->
+					  {false,""};
+				     true ->
+					  {true,"\n"}
+				  end,
+	    error_logger:info_report(#conn_log{header=PrintHeader,
+					       client=self(),
+					       conn_pid=TelnPid,
+					       address={Host,Port},
+					       name=Name1,
+					       action=Action,
+					       module=?MODULE},
+				     {PreBR++String,Args});
+	Result when Result /= undefined ->
 	    ok;
-	false ->
-	    apply(ct_gen_conn,Func,Args)
+	_ when Action == open; Action == close; Action == reconnect;
+	       Action == info; Action == error ->
+	    ct_gen_conn:log(heading(Action,Name1),String,Args);
+	_ when ForcePrint == false ->
+	    case ct_util:is_silenced(telnet) of
+		true  ->
+		    ok;
+		false ->
+		    ct_gen_conn:cont_log(String,Args)
+	    end;
+	_ when ForcePrint == true ->
+	    case ct_util:is_silenced(telnet) of
+		true ->
+		    %% call log/3 now instead of cont_log/2 since 
+		    %% start_gen_log/1 will not have been previously called
+		    ct_gen_conn:log(heading(Action,Name1),String,Args);
+		false ->
+		    ct_gen_conn:cont_log(String,Args)
+	    end
     end.
 
-%%% @hidden
-%% Functions that will force printout even if ct_telnet
-%% output has been silenced, to be used for error printouts.
-force_cont_log(Str,Args) ->
-    case ct_util:is_silenced(telnet) of
-	true ->
-	    %% call log/3 now instead of cont_log/2 since 
-	    %% start_log/1 will not have been previously called
-	    log("ct_telnet info",Str,Args);
-	false ->
-	    cont_log(Str,Args)
+start_gen_log(Heading) ->
+    case ct_util:get_testdata({cth_conn_log,?MODULE}) of
+	undefined ->
+	    %% check if output is suppressed
+	    case ct_util:is_silenced(telnet) of
+		true  -> ok;
+		false -> ct_gen_conn:start_log(Heading)
+	    end;
+	_ ->
+	    ok
+    end.
+
+end_gen_log() -> 
+    case ct_util:get_testdata({cth_conn_log,?MODULE}) of
+	undefined ->
+	    %% check if output is suppressed
+	    case ct_util:is_silenced(telnet) of
+		true  -> ok;
+		false -> ct_gen_conn:end_log()
+	    end;
+	_ ->
+	    ok
     end.
 
 %%% @hidden
 %% Debug printouts.
-debug_cont_log(Str,Args) ->
+debug_cont_gen_log(Str,Args) ->
     Old = put(silent,true),
-    cont_log(Str,Args),
+    ct_gen_conn:cont_log(Str,Args),
     put(silent,Old).
 
-
+%% Log callback - called from the error handler process
+format_data(_How,{String,Args}) ->
+    io_lib:format(String,Args).
 
 %%%=================================================================
 %%% Abstraction layer on top of ct_telnet_client.erl
@@ -717,7 +862,6 @@ teln_cmd(Pid,Cmd,Prx,Timeout) ->
     ct_telnet_client:send_data(Pid,Cmd),
     teln_receive_until_prompt(Pid,Prx,Timeout).
 
-
 teln_get_all_data(Pid,Prx,Data,Acc,LastLine) ->
     case check_for_prompt(Prx,lists:reverse(LastLine) ++ Data) of
 	{prompt,Lines,_PromptType,Rest} ->
@@ -746,11 +890,9 @@ teln_get_all_data(Pid,Prx,Data,Acc,LastLine) ->
 %% @doc Externally the silent_teln_expect function shall only be used
 %% by the TargetModule, i.e. the target specific module which
 %% implements connect/2 and get_prompt_regexp/0.
-silent_teln_expect(Pid,Data,Pattern,Prx,Opts) ->
+silent_teln_expect(Name,Pid,Data,Pattern,Prx,Opts) ->
     Old = put(silent,true),
-    try_cont_log("silent_teln_expect/5, Pattern = ~p",[Pattern]),
-    Result = teln_expect(Pid,Data,Pattern,Prx,Opts),
-    try_cont_log("silent_teln_expect -> ~p\n",[Result]),
+    Result = teln_expect(Name,Pid,Data,Pattern,Prx,Opts),
     put(silent,Old),
     Result.
 
@@ -766,7 +908,7 @@ silent_teln_expect(Pid,Data,Pattern,Prx,Opts) ->
 %% condition is fullfilled.
 %% 3b) Repeat (sequence): 2) is repeated either N times or until a
 %% halt condition is fullfilled.
-teln_expect(Pid,Data,Pattern0,Prx,Opts) ->
+teln_expect(Name,Pid,Data,Pattern0,Prx,Opts) ->
     HaltPatterns =
 	case get_ignore_prompt(Opts) of
 	    true ->
@@ -790,7 +932,7 @@ teln_expect(Pid,Data,Pattern0,Prx,Opts) ->
     
     case get_repeat(Opts) of
 	false ->
-	    case teln_expect1(Data,Pattern,[],EO) of
+	    case teln_expect1(Name,Pid,Data,Pattern,[],EO) of
 		{ok,Matched,Rest} ->
 		    {ok,Matched,Rest};
 		{halt,Why,Rest} ->
@@ -800,7 +942,7 @@ teln_expect(Pid,Data,Pattern0,Prx,Opts) ->
 	    end;
 	N ->
 	    EO1 = EO#eo{repeat=N},
-	    repeat_expect(Data,Pattern,[],EO1)
+	    repeat_expect(Name,Pid,Data,Pattern,[],EO1)
     end.
 
 convert_pattern(Pattern,Seq) 
@@ -855,23 +997,27 @@ get_prompt_check(Opts) ->
 
 %% Repeat either single or sequence. All match results are accumulated
 %% and returned when a halt condition is fulllfilled.
-repeat_expect(Rest,_Pattern,Acc,#eo{repeat=0}) ->
+repeat_expect(_Name,_Pid,Rest,_Pattern,Acc,#eo{repeat=0}) ->
     {ok,lists:reverse(Acc),done,Rest};
-repeat_expect(Data,Pattern,Acc,EO) ->
-    case teln_expect1(Data,Pattern,[],EO) of
+repeat_expect(Name,Pid,Data,Pattern,Acc,EO) ->
+    case teln_expect1(Name,Pid,Data,Pattern,[],EO) of
 	{ok,Matched,Rest} ->
 	    EO1 = EO#eo{repeat=EO#eo.repeat-1},
-	    repeat_expect(Rest,Pattern,[Matched|Acc],EO1);
+	    repeat_expect(Name,Pid,Rest,Pattern,[Matched|Acc],EO1);
 	{halt,Why,Rest} ->
 	    {ok,lists:reverse(Acc),Why,Rest};
 	{error,Reason} ->
 	    {error,Reason}
     end.
 
-teln_expect1(Data,Pattern,Acc,EO) ->
+teln_expect1(Name,Pid,Data,Pattern,Acc,EO) ->
     ExpectFun = case EO#eo.seq of
-		    true -> fun() -> seq_expect(Data,Pattern,Acc,EO) end;
-		    false -> fun() -> one_expect(Data,Pattern,EO) end
+		    true -> fun() ->
+				    seq_expect(Name,Pid,Data,Pattern,Acc,EO)
+			    end;
+		    false -> fun() ->
+				     one_expect(Name,Pid,Data,Pattern,EO)
+			     end
 		end,
     case ExpectFun() of
 	{match,Match,Rest} ->
@@ -890,10 +1036,10 @@ teln_expect1(Data,Pattern,Acc,EO) ->
 		    case NotFinished of
 			{nomatch,Rest} ->
 			    %% One expect
-			    teln_expect1(Rest++Data1,Pattern,[],EO);
+			    teln_expect1(Name,Pid,Rest++Data1,Pattern,[],EO);
 			{continue,Patterns1,Acc1,Rest} ->
 			    %% Sequence
-			    teln_expect1(Rest++Data1,Patterns1,Acc1,EO)
+			    teln_expect1(Name,Pid,Rest++Data1,Patterns1,Acc1,EO)
 		    end
 	    end
     end.
@@ -913,47 +1059,45 @@ get_data1(Pid) ->
 %% lines and each line is matched against each pattern.
 
 %% one_expect: split data chunk at prompts
-one_expect(Data,Pattern,EO) when EO#eo.prompt_check==false ->
+one_expect(Name,Pid,Data,Pattern,EO) when EO#eo.prompt_check==false ->
 %    io:format("Raw Data ~p Pattern ~p EO ~p ",[Data,Pattern,EO]),
-    one_expect1(Data,Pattern,[],EO#eo{found_prompt=false});
-one_expect(Data,Pattern,EO) ->
+    one_expect1(Name,Pid,Data,Pattern,[],EO#eo{found_prompt=false});
+one_expect(Name,Pid,Data,Pattern,EO) ->
     case match_prompt(Data,EO#eo.prx) of
 	{prompt,UptoPrompt,PromptType,Rest} ->
 	    case Pattern of 
 		[Prompt] when Prompt==prompt; Prompt=={prompt,PromptType} ->
 		    %% Only searching for prompt
-		    log_lines(UptoPrompt),
-		    try_cont_log("<b>PROMPT:</b> ~ts", [PromptType]),
+		    log_lines(Name,Pid,UptoPrompt),
+		    log(name_or_pid(Name,Pid),"PROMPT: ~ts",[PromptType]),
 		    {match,{prompt,PromptType},Rest};
 		[{prompt,_OtherPromptType}] ->
 		    %% Only searching for one specific prompt, not thisone
-		    log_lines(UptoPrompt),
+		    log_lines(Name,Pid,UptoPrompt),
 		    {nomatch,Rest};
 		_ ->
-		    one_expect1(UptoPrompt,Pattern,Rest,
+		    one_expect1(Name,Pid,UptoPrompt,Pattern,Rest,
 				EO#eo{found_prompt=PromptType})
 	    end;
 	noprompt ->
 	    case Pattern of
 		[Prompt] when Prompt==prompt; element(1,Prompt)==prompt ->
 		    %% Only searching for prompt
-		    LastLine = log_lines_not_last(Data),
+		    LastLine = log_lines_not_last(Name,Pid,Data),
 		    {nomatch,LastLine};
 		_ ->
-		    one_expect1(Data,Pattern,[],EO#eo{found_prompt=false})
+		    one_expect1(Name,Pid,Data,Pattern,[],
+				EO#eo{found_prompt=false})
 	    end
     end.
 
-remove_zero(List) ->
-    [Ch || Ch <- List, Ch=/=0, Ch=/=13].
-
 %% one_expect1: split data chunk at lines
-one_expect1(Data,Pattern,Rest,EO) ->
-    case match_lines(Data,Pattern,EO) of
+one_expect1(Name,Pid,Data,Pattern,Rest,EO) ->
+    case match_lines(Name,Pid,Data,Pattern,EO) of
 	{match,Match,MatchRest} ->
 	    {match,Match,MatchRest++Rest};
 	{nomatch,prompt} ->
-	    one_expect(Rest,Pattern,EO);
+	    one_expect(Name,Pid,Rest,Pattern,EO);
 	{nomatch,NoMatchRest} ->
 	    {nomatch,NoMatchRest++Rest};
 	{halt,Why,HaltRest} ->
@@ -970,77 +1114,77 @@ one_expect1(Data,Pattern,Rest,EO) ->
 %% searching for the next pattern in the list.
 
 %% seq_expect: Split data chunk at prompts
-seq_expect(Data,[],Acc,_EO) ->
+seq_expect(_Name,_Pid,Data,[],Acc,_EO) ->
     {match,lists:reverse(Acc),Data};
-seq_expect([],Patterns,Acc,_EO) ->
+seq_expect(_Name,_Pid,[],Patterns,Acc,_EO) ->
     {continue,Patterns,lists:reverse(Acc),[]};
-seq_expect(Data,Patterns,Acc,EO) when EO#eo.prompt_check==false ->
-    seq_expect1(Data,Patterns,Acc,[],EO#eo{found_prompt=false});
-seq_expect(Data,Patterns,Acc,EO) ->
+seq_expect(Name,Pid,Data,Patterns,Acc,EO) when EO#eo.prompt_check==false ->
+    seq_expect1(Name,Pid,Data,Patterns,Acc,[],EO#eo{found_prompt=false});
+seq_expect(Name,Pid,Data,Patterns,Acc,EO) ->
     case match_prompt(Data,EO#eo.prx) of
 	{prompt,UptoPrompt,PromptType,Rest} ->
-	    seq_expect1(UptoPrompt,Patterns,Acc,Rest,
+	    seq_expect1(Name,Pid,UptoPrompt,Patterns,Acc,Rest,
 			EO#eo{found_prompt=PromptType});
 	noprompt ->
-	    seq_expect1(Data,Patterns,Acc,[],EO#eo{found_prompt=false})
+	    seq_expect1(Name,Pid,Data,Patterns,Acc,[],EO#eo{found_prompt=false})
     end.
 
 %% seq_expect1: For one prompt-chunk, match each pattern - line by
 %% line if it is other than the prompt we are seaching for.
-seq_expect1(Data,[prompt|Patterns],Acc,Rest,EO) ->
+seq_expect1(Name,Pid,Data,[prompt|Patterns],Acc,Rest,EO) ->
     case EO#eo.found_prompt of
 	false ->
-	    LastLine = log_lines_not_last(Data),
+	    LastLine = log_lines_not_last(Name,Pid,Data),
 	    %% Rest==[] because no prompt is found
 	    {continue,[prompt|Patterns],Acc,LastLine};
 	PromptType ->
-	    log_lines(Data),
-	    try_cont_log("<b>PROMPT:</b> ~ts", [PromptType]),
-	    seq_expect(Rest,Patterns,[{prompt,PromptType}|Acc],EO)
+	    log_lines(Name,Pid,Data),
+	    log(name_or_pid(Name,Pid),"PROMPT: ~ts",[PromptType]),
+	    seq_expect(Name,Pid,Rest,Patterns,[{prompt,PromptType}|Acc],EO)
     end;
-seq_expect1(Data,[{prompt,PromptType}|Patterns],Acc,Rest,EO) ->
+seq_expect1(Name,Pid,Data,[{prompt,PromptType}|Patterns],Acc,Rest,EO) ->
     case EO#eo.found_prompt of
 	false ->
-	    LastLine = log_lines_not_last(Data),
+	    LastLine = log_lines_not_last(Name,Pid,Data),
 	    %% Rest==[] because no prompt is found
 	    {continue,[{prompt,PromptType}|Patterns],Acc,LastLine};
 	PromptType ->
-	    log_lines(Data),
-	    try_cont_log("<b>PROMPT:</b> ~ts", [PromptType]),
-	    seq_expect(Rest,Patterns,[{prompt,PromptType}|Acc],EO);
+	    log_lines(Name,Pid,Data),
+	    log(name_or_pid(Name,Pid),"PROMPT: ~ts", [PromptType]),
+	    seq_expect(Name,Pid,Rest,Patterns,[{prompt,PromptType}|Acc],EO);
 	_OtherPromptType ->
-	    log_lines(Data),
-	    seq_expect(Rest,[{prompt,PromptType}|Patterns],Acc,EO)
+	    log_lines(Name,Pid,Data),
+	    seq_expect(Name,Pid,Rest,[{prompt,PromptType}|Patterns],Acc,EO)
     end;
-seq_expect1(Data,[Pattern|Patterns],Acc,Rest,EO) ->
-    case match_lines(Data,[Pattern],EO) of
+seq_expect1(Name,Pid,Data,[Pattern|Patterns],Acc,Rest,EO) ->
+    case match_lines(Name,Pid,Data,[Pattern],EO) of
 	{match,Match,MatchRest} ->
-	    seq_expect1(MatchRest,Patterns,[Match|Acc],Rest,EO);
+	    seq_expect1(Name,Pid,MatchRest,Patterns,[Match|Acc],Rest,EO);
 	{nomatch,prompt} ->
-	    seq_expect(Rest,[Pattern|Patterns],Acc,EO);
+	    seq_expect(Name,Pid,Rest,[Pattern|Patterns],Acc,EO);
 	{nomatch,NoMatchRest} when Rest==[] ->
 	    %% The data did not end with a prompt
 	    {continue,[Pattern|Patterns],Acc,NoMatchRest};
 	{halt,Why,HaltRest} ->
 	    {halt,Why,HaltRest++Rest}
     end;
-seq_expect1(Data,[],Acc,Rest,_EO) ->
+seq_expect1(_Name,_Pid,Data,[],Acc,Rest,_EO) ->
     {match,lists:reverse(Acc),Data++Rest}.
 
 %% Split prompt-chunk at lines
-match_lines(Data,Patterns,EO) ->
+match_lines(Name,Pid,Data,Patterns,EO) ->
     FoundPrompt = EO#eo.found_prompt,
     case one_line(Data,[]) of
 	{noline,Rest} when FoundPrompt=/=false ->
 	    %% This is the line including the prompt
-	    case match_line(Rest,Patterns,FoundPrompt,EO) of
+	    case match_line(Name,Pid,Rest,Patterns,FoundPrompt,EO) of
 		nomatch ->
 		    {nomatch,prompt};
 		{Tag,Match} ->
 		    {Tag,Match,[]}
 	    end;
 	{noline,Rest} when EO#eo.prompt_check==false ->
-	    case match_line(Rest,Patterns,false,EO) of
+	    case match_line(Name,Pid,Rest,Patterns,false,EO) of
 		nomatch ->
 		    {nomatch,Rest};
 		{Tag,Match} ->
@@ -1049,9 +1193,9 @@ match_lines(Data,Patterns,EO) ->
 	{noline,Rest} ->
 	    {nomatch,Rest};
 	{Line,Rest} ->
-	    case match_line(Line,Patterns,false,EO) of
+	    case match_line(Name,Pid,Line,Patterns,false,EO) of
 		nomatch ->
-		    match_lines(Rest,Patterns,EO);
+		    match_lines(Name,Pid,Rest,Patterns,EO);
 		{Tag,Match} ->
 		    {Tag,Match,Rest}
 	    end
@@ -1059,43 +1203,43 @@ match_lines(Data,Patterns,EO) ->
     
 
 %% For one line, match each pattern
-match_line(Line,Patterns,FoundPrompt,EO) ->
-    match_line(Line,Patterns,FoundPrompt,EO,match).
-
-match_line(Line,[prompt|Patterns],false,EO,RetTag) ->
-    match_line(Line,Patterns,false,EO,RetTag);
-match_line(Line,[prompt|_Patterns],FoundPrompt,_EO,RetTag) ->
-    try_cont_log("       ~ts", [Line]),
-    try_cont_log("<b>PROMPT:</b> ~ts", [FoundPrompt]),
+match_line(Name,Pid,Line,Patterns,FoundPrompt,EO) ->
+    match_line(Name,Pid,Line,Patterns,FoundPrompt,EO,match).
+
+match_line(Name,Pid,Line,[prompt|Patterns],false,EO,RetTag) ->
+    match_line(Name,Pid,Line,Patterns,false,EO,RetTag);
+match_line(Name,Pid,Line,[prompt|_Patterns],FoundPrompt,_EO,RetTag) ->
+    log(name_or_pid(Name,Pid),"       ~ts",[Line]),
+    log(name_or_pid(Name,Pid),"PROMPT: ~ts",[FoundPrompt]),
     {RetTag,{prompt,FoundPrompt}};
-match_line(Line,[{prompt,PromptType}|_Patterns],FoundPrompt,_EO,RetTag) 
+match_line(Name,Pid,Line,[{prompt,PromptType}|_Patterns],FoundPrompt,_EO,RetTag) 
   when PromptType==FoundPrompt ->
-    try_cont_log("       ~ts", [Line]),
-    try_cont_log("<b>PROMPT:</b> ~ts", [FoundPrompt]),
+    log(name_or_pid(Name,Pid),"       ~ts",[Line]),
+    log(name_or_pid(Name,Pid),"PROMPT: ~ts",[FoundPrompt]),
     {RetTag,{prompt,FoundPrompt}};
-match_line(Line,[{prompt,PromptType}|Patterns],FoundPrompt,EO,RetTag) 
+match_line(Name,Pid,Line,[{prompt,PromptType}|Patterns],FoundPrompt,EO,RetTag) 
   when PromptType=/=FoundPrompt ->
-    match_line(Line,Patterns,FoundPrompt,EO,RetTag);
-match_line(Line,[{Tag,Pattern}|Patterns],FoundPrompt,EO,RetTag) ->
+    match_line(Name,Pid,Line,Patterns,FoundPrompt,EO,RetTag);
+match_line(Name,Pid,Line,[{Tag,Pattern}|Patterns],FoundPrompt,EO,RetTag) ->
     case re:run(Line,Pattern,[{capture,all,list}]) of
 	nomatch ->
-	    match_line(Line,Patterns,FoundPrompt,EO,RetTag);
+	    match_line(Name,Pid,Line,Patterns,FoundPrompt,EO,RetTag);
 	{match,Match} ->
-	    try_cont_log("<b>MATCH:</b> ~ts", [Line]),
+	    log(name_or_pid(Name,Pid),"MATCH: ~ts",[Line]),
 	    {RetTag,{Tag,Match}}
     end;
-match_line(Line,[Pattern|Patterns],FoundPrompt,EO,RetTag) ->
+match_line(Name,Pid,Line,[Pattern|Patterns],FoundPrompt,EO,RetTag) ->
     case re:run(Line,Pattern,[{capture,all,list}]) of
 	nomatch ->
-	    match_line(Line,Patterns,FoundPrompt,EO,RetTag);
+	    match_line(Name,Pid,Line,Patterns,FoundPrompt,EO,RetTag);
 	{match,Match} ->
-	    try_cont_log("<b>MATCH:</b> ~ts", [Line]),
+	    log(name_or_pid(Name,Pid),"MATCH: ~ts",[Line]),
 	    {RetTag,Match}
     end;
-match_line(Line,[],FoundPrompt,EO,match) ->
-    match_line(Line,EO#eo.haltpatterns,FoundPrompt,EO,halt);
-match_line(Line,[],_FoundPrompt,_EO,halt) ->
-    try_cont_log("       ~ts", [Line]),
+match_line(Name,Pid,Line,[],FoundPrompt,EO,match) ->
+    match_line(Name,Pid,Line,EO#eo.haltpatterns,FoundPrompt,EO,halt);
+match_line(Name,Pid,Line,[],_FoundPrompt,_EO,halt) ->
+    log(name_or_pid(Name,Pid),"       ~ts",[Line]),
     nomatch.
 
 one_line([$\n|Rest],Line) ->
@@ -1111,26 +1255,29 @@ one_line([],Line) ->
 
 debug_log_lines(String) ->
     Old = put(silent,true),
-    log_lines(String),
+    log_lines(undefined,undefined,String),
     put(silent,Old).
 
-log_lines(String) ->
-    case log_lines_not_last(String) of
+log_lines(Name,Pid,String) ->
+    case log_lines_not_last(Name,Pid,String) of
 	[] ->
 	    ok;
 	LastLine ->
-	    try_cont_log("       ~ts", [LastLine])
+	    log(name_or_pid(Name,Pid),"       ~ts",[LastLine])
     end.
 
-log_lines_not_last(String) ->
+log_lines_not_last(Name,Pid,String) ->
     case add_tabs(String,[],[]) of
 	{[],LastLine} ->
 	    LastLine;
 	{String1,LastLine} ->
-	    try_cont_log("~ts",[String1]),
+	    log(name_or_pid(Name,Pid),"~ts",[String1]),
 	    LastLine
     end.
 
+name_or_pid(undefined,Pid) -> Pid;
+name_or_pid(Name,_) -> Name.
+
 add_tabs([0|Rest],Acc,LastLine) ->
     add_tabs(Rest,Acc,LastLine);
 add_tabs([$\r|Rest],Acc,LastLine) ->
@@ -1145,8 +1292,6 @@ add_tabs([],[],LastLine) ->
     {[],lists:reverse(LastLine)}.
 
 
-
-
 %%% @hidden
 teln_receive_until_prompt(Pid,Prx,Timeout) ->
     Fun = fun() -> teln_receive_until_prompt(Pid,Prx,[],[]) end,
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 68e76c2396..f5eb3a72f0 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -77,6 +77,8 @@
 -record(suite_data, {key,name,value}).
 
 %%%-----------------------------------------------------------------
+start() ->
+    start(normal, ".", ?default_verbosity).
 %%% @spec start(Mode) -> Pid | exit(Error)
 %%%       Mode = normal | interactive
 %%%       Pid = pid()
@@ -91,9 +93,6 @@
 %%% <code>ct_util_server</code>.</p>
 %%%
 %%% @see ct
-start() ->
-    start(normal, ".", ?default_verbosity).
-
 start(LogDir) when is_list(LogDir) ->
     start(normal, LogDir, ?default_verbosity);
 start(Mode) ->
@@ -187,6 +186,7 @@ do_start(Parent, Mode, LogDir, Verbosity) ->
 	false ->
 	    ok
     end,
+
     {StartTime,TestLogDir} = ct_logs:init(Mode, Verbosity),
 
     ct_event:notify(#event{name=test_start,
@@ -198,12 +198,26 @@ do_start(Parent, Mode, LogDir, Verbosity) ->
 	ok ->
 	    Parent ! {self(),started};
 	{fail,CTHReason} ->
-	    ct_logs:tc_print('Suite Callback',CTHReason,[]),
+	    ErrorInfo = if is_atom(CTHReason) ->
+				io_lib:format("{~p,~p}",
+					      [CTHReason,
+					       erlang:get_stacktrace()]);
+			   true ->
+				CTHReason
+			end,
+	    ct_logs:tc_print('Suite Callback',ErrorInfo,[]),
 	    self() ! {{stop,{self(),{user_error,CTHReason}}},
 		      {Parent,make_ref()}}
     catch
 	_:CTHReason ->
-	    ct_logs:tc_print('Suite Callback',CTHReason,[]),
+	    ErrorInfo = if is_atom(CTHReason) ->
+				io_lib:format("{~p,~p}",
+					      [CTHReason,
+					       erlang:get_stacktrace()]);
+			   true ->
+				CTHReason
+			end,
+	    ct_logs:tc_print('Suite Callback',ErrorInfo,[]),
 	    self() ! {{stop,{self(),{user_error,CTHReason}}},
 		      {Parent,make_ref()}}
     end,
@@ -286,14 +300,23 @@ get_start_dir() ->
 %% handle verbosity outside ct_util_server (let the client read
 %% the verbosity table) to avoid possible deadlock situations
 set_verbosity(Elem = {_Category,_Level}) ->
-    ets:insert(?verbosity_table, Elem),
-    ok.
+    try ets:insert(?verbosity_table, Elem) of
+	_ ->
+	    ok
+    catch
+	_:Reason ->
+	    {error,Reason}
+    end.
+	
 get_verbosity(Category) ->
-    case ets:lookup(?verbosity_table, Category) of
+    try ets:lookup(?verbosity_table, Category) of
 	[{Category,Level}] -> 
 	    Level;
 	_ ->
 	    undefined
+    catch
+	_:Reason ->
+	    {error,Reason}
     end.
 
 loop(Mode,TestData,StartDir) ->
@@ -358,9 +381,18 @@ loop(Mode,TestData,StartDir) ->
 	    TestData1 =
 		case lists:keysearch(Key,1,TestData) of
 		    {value,{Key,Val}} ->
-			NewVal = Fun(Val),
-			return(From,NewVal),
-			[{Key,NewVal}|lists:keydelete(Key,1,TestData)];
+			try Fun(Val) of
+			    '$delete' ->
+				return(From,deleted),
+				lists:keydelete(Key,1,TestData);
+			    NewVal ->
+				return(From,NewVal),
+				[{Key,NewVal}|lists:keydelete(Key,1,TestData)]
+			catch
+			    _:Error ->
+				return(From,{error,Error}),
+				TestData
+			end;
 		    _ ->
 			case lists:member(create,Opts) of
 			    true ->
@@ -383,19 +415,38 @@ loop(Mode,TestData,StartDir) ->
 	    return(From,StartDir),
 	    loop(From,TestData,StartDir);
 	{{stop,Info},From} ->
+	    test_server_io:reset_state(),
+	    {MiscIoName,MiscIoDivider,MiscIoFooter} =
+		proplists:get_value(misc_io_log,TestData),
+	    {ok,MiscIoFd} = file:open(MiscIoName,
+				      [append,{encoding,utf8}]),
+	    io:put_chars(MiscIoFd, MiscIoDivider),
+	    test_server_io:set_fd(unexpected_io, MiscIoFd),
+
 	    Time = calendar:local_time(),
 	    ct_event:sync_notify(#event{name=test_done,
 					node=node(),
 					data=Time}),
-	    Callbacks = ets:lookup_element(?suite_table,
-					   ct_hooks,
-					   #suite_data.value),
+	    Callbacks =
+		try ets:lookup_element(?suite_table,
+				       ct_hooks,
+				       #suite_data.value) of
+		    CTHMods -> CTHMods
+		catch
+		    %% this is because ct_util failed in init
+		    error:badarg -> []
+		end,
 	    ct_hooks:terminate(Callbacks),
 	    close_connections(ets:tab2list(?conn_table)),
 	    ets:delete(?conn_table),
 	    ets:delete(?board_table),
 	    ets:delete(?suite_table),
 	    ets:delete(?verbosity_table),
+
+	    io:put_chars(MiscIoFd, "\n</pre>\n"++MiscIoFooter),
+	    test_server_io:stop([unexpected_io]),
+	    test_server_io:finish(),
+
 	    ct_logs:close(Info, StartDir),
 	    ct_event:stop(),
 	    ct_config:stop(),
@@ -670,8 +721,14 @@ reset_silent_connections() ->
 %%% @see ct
 stop(Info) ->
     case whereis(ct_util_server) of
-	undefined -> ok;
-	_ -> call({stop,Info})
+	undefined -> 
+	    ok;
+	CtUtilPid ->
+	    Ref = monitor(process, CtUtilPid),
+	    call({stop,Info}),
+	    receive
+		{'DOWN',Ref,_,_,_} -> ok
+	    end
     end.
 
 %%%-----------------------------------------------------------------
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl
index 7c01e17c36..a82d58cc42 100644
--- a/lib/common_test/src/ct_util.hrl
+++ b/lib/common_test/src/ct_util.hrl
@@ -79,4 +79,10 @@
 -define(tablesorter_script, "jquery.tablesorter.min.js").
 
 %% Logging information for error handler
--record(conn_log, {client, name, address, action, module}).
+-record(conn_log, {header=true,
+		   client,
+		   name,
+		   address,
+		   conn_pid,
+		   action,
+		   module}).
diff --git a/lib/common_test/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl
index 644594e34d..a731c8054c 100644
--- a/lib/common_test/src/cth_conn_log.erl
+++ b/lib/common_test/src/cth_conn_log.erl
@@ -56,11 +56,29 @@
 	 pre_init_per_testcase/3,
 	 post_end_per_testcase/4]).
 
+%%----------------------------------------------------------------------
+%% Exported types
+%%----------------------------------------------------------------------
+-export_type([hook_options/0,
+	      log_type/0,
+	      conn_mod/0]).
+
+%%----------------------------------------------------------------------
+%% Type declarations
+%%----------------------------------------------------------------------
+-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,[ct_gen_conn:key_or_name()]}.
+-type log_type() :: raw | pretty | html | silent.
+-type conn_mod() :: ct_netconfc | ct_telnet.
+%%----------------------------------------------------------------------
+
 -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()]}}]}.
+      HookOpts :: hook_options(),
+      Result :: {ok,[{conn_mod(),
+		      {log_type(),[ct_gen_conn:key_or_name()]}}]}.
 init(_Id, HookOpts) ->
     ConfOpts = ct:get_config(ct_conn_log,[]),
     {ok,merge_log_info(ConfOpts,HookOpts)}.
@@ -86,7 +104,8 @@ get_log_opts(Opts) ->
 pre_init_per_testcase(TestCase,Config,CthState) ->
     Logs =
 	lists:map(
-	  fun({ConnMod,{LogType,Hosts}}) ->
+	  fun({ConnMod,{LogType,Hosts}}) ->		  
+		  ct_util:set_testdata({{?MODULE,ConnMod},LogType}),
 		  case LogType of
 		      LogType when LogType==raw; LogType==pretty ->
 			  Dir = ?config(priv_dir,Config),
@@ -117,9 +136,44 @@ pre_init_per_testcase(TestCase,Config,CthState) ->
 		  end
 	  end,
 	  CthState),
-    error_logger:add_report_handler(ct_conn_log_h,{group_leader(),Logs}),
+
+    GL = group_leader(),
+    Update =
+	fun(Init) when Init == undefined; Init == [] ->
+		error_logger:add_report_handler(ct_conn_log_h,{GL,Logs}),
+		[TestCase];
+	   (PrevUsers) ->
+		error_logger:info_report(update,{GL,Logs}),
+		receive
+		    {updated,GL} ->
+			[TestCase|PrevUsers]
+		after
+		    5000 ->
+			{error,no_response}
+		end
+	end,
+    ct_util:update_testdata(?MODULE, Update, [create]),
     {Config,CthState}.
 
-post_end_per_testcase(_TestCase,_Config,Return,CthState) ->
-    error_logger:delete_report_handler(ct_conn_log_h),
+post_end_per_testcase(TestCase,_Config,Return,CthState) ->
+    Update =
+	fun(PrevUsers) ->
+		case lists:delete(TestCase, PrevUsers) of
+		    [] ->
+			'$delete';
+		    PrevUsers1 ->
+			PrevUsers1
+		end
+	end,
+    case ct_util:update_testdata(?MODULE, Update) of
+	deleted ->
+	    [ct_util:delete_testdata({?MODULE,ConnMod}) ||
+		{ConnMod,_} <- CthState],
+	    error_logger:delete_report_handler(ct_conn_log_h);
+	{error,no_response} ->
+	    exit({?MODULE,no_response_from_logger});
+	_PrevUsers ->
+	    ok
+    end,
     {Return,CthState}.
+
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 958b7a94c7..61700a2032 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -25,16 +25,31 @@
 
 
 %% CTH Callbacks
--export([id/1, init/2, post_init_per_group/4, pre_end_per_group/3,
-	 post_end_per_testcase/4]).
+-export([id/1, init/2,
+	 pre_init_per_suite/3, pre_end_per_suite/3, post_end_per_suite/4,
+	 pre_init_per_group/3, post_init_per_group/4,
+	 pre_end_per_group/3, post_end_per_group/4,
+	 pre_init_per_testcase/3, post_end_per_testcase/4]).
 
 %% Event handler Callbacks
 -export([init/1,
 	 handle_event/2, handle_call/2, handle_info/2,
-	 terminate/1]).
+	 terminate/1, terminate/2, code_change/3]).
+
+%% Other
+-export([handle_remote_events/1]).
 
 -include("ct.hrl").
 
+-behaviour(gen_event).
+
+-record(eh_state, {log_func,
+		   curr_suite,
+		   curr_group,
+		   curr_func,
+		   parallel_tcs = false,
+		   handle_remote_events = false}).
+
 id(_Opts) ->
     ?MODULE.
 
@@ -42,36 +57,62 @@ init(?MODULE, _Opts) ->
     error_logger:add_report_handler(?MODULE),
     tc_log_async.
 
-post_init_per_group(Group, Config, Result, tc_log_async) ->
+pre_init_per_suite(Suite, Config, State) ->
+    set_curr_func({Suite,init_per_suite}, Config),
+    {Config, State}.
+
+pre_end_per_suite(Suite, Config, State) ->
+    set_curr_func({Suite,end_per_suite}, Config),
+    {Config, State}.
+
+post_end_per_suite(_Suite, Config, Return, State) ->
+    set_curr_func(undefined, Config),
+    {Return, State}.
+
+pre_init_per_group(Group, Config, State) ->
+    set_curr_func({group,Group,init_per_group}, Config),
+    {Config, State}.
+
+post_init_per_group(Group, Config, Result, tc_log_async) when is_list(Config) ->
     case lists:member(parallel,proplists:get_value(
 				 tc_group_properties,Config,[])) of
 	true ->
-	    {Result, {set_log_func(ct_log),Group}};
+	    {Result, {set_log_func(tc_log),Group}};
 	false ->
 	    {Result, tc_log_async}
     end;
 post_init_per_group(_Group, _Config, Result, State) ->
     {Result, State}.
 
+pre_init_per_testcase(TC, Config, State) ->
+    set_curr_func(TC, Config),
+    {Config, 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, 300000),
     {Result, State}.
 
-pre_end_per_group(Group, Config, {ct_log, Group}) ->
+pre_end_per_group(Group, Config, {tc_log, Group}) ->
+    set_curr_func({group,Group,end_per_group}, Config),
     {Config, set_log_func(tc_log_async)};
-pre_end_per_group(_Group, Config, State) ->
+pre_end_per_group(Group, Config, State) ->
+    set_curr_func({group,Group,end_per_group}, Config),
     {Config, State}.
 
+post_end_per_group(_Group, Config, Return, State) ->
+    set_curr_func({group,undefined}, Config),
+    {Return, State}.
 
 %% Copied and modified from sasl_report_tty_h.erl
 init(_Type) ->
-    {ok, tc_log_async}.
+    {ok, #eh_state{log_func = tc_log_async}}.
 
-handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() ->
+handle_event({_Type,GL,_Msg}, #eh_state{handle_remote_events = false} = State)
+  when node(GL) /= node() ->
     {ok, State};
-handle_event(Event, LogFunc) ->
+handle_event(Event, #eh_state{log_func = LogFunc} = State) ->
     case lists:keyfind(sasl, 1, application:which_applications()) of
 	false ->
 	    sasl_not_started;
@@ -80,7 +121,8 @@ handle_event(Event, LogFunc) ->
 	    SReport = sasl_report:format_report(group_leader(), ErrLogType,
 						tag_event(Event)),
 	    if is_list(SReport) ->
-		    ct_logs:LogFunc(sasl, ?STD_IMPORTANCE, "System", SReport, []);
+		    SaslHeader = format_header(State),
+		    ct_logs:LogFunc(sasl, ?STD_IMPORTANCE, SaslHeader, SReport, []);
 	       true -> %% Report is an atom if no logging is to be done
 		    ignore
 	    end
@@ -88,27 +130,122 @@ handle_event(Event, LogFunc) ->
     EReport = error_logger_tty_h:write_event(
 		tag_event(Event),io_lib),
     if is_list(EReport) ->
-	    ct_logs:LogFunc(error_logger, ?STD_IMPORTANCE, "System", EReport, []);
+	    ErrHeader = format_header(State),
+	    ct_logs:LogFunc(error_logger, ?STD_IMPORTANCE, ErrHeader, EReport, []);
        true -> %% Report is an atom if no logging is to be done
 	    ignore
     end,
-    {ok, LogFunc}.
-
+    {ok, State}.
+
+handle_info({'EXIT',User,killed}, State) ->
+    case whereis(user) of
+	%% init:stop/1/2 has been called, let's finish!
+	undefined ->
+	    remove_handler;
+	User ->
+	    remove_handler;
+	_ ->
+	    {ok,State}
+    end;
 
-handle_info(_,State) -> {ok, State}.
+handle_info(_, State) -> 
+    {ok,State}.
 
 handle_call(flush,State) ->
     {ok, ok, State};
-handle_call({set_logfunc,NewLogFunc},_) ->
-    {ok, NewLogFunc, NewLogFunc};
-handle_call(_Query, _State) -> {error, bad_query}.
 
-terminate(_State) ->
+handle_call({set_curr_func,{group,Group,Conf},Config},
+	    State) when is_list(Config) ->
+    Parallel = case proplists:get_value(tc_group_properties, Config) of
+		   undefined -> false;
+		   Props -> lists:member(parallel, Props)
+	       end,
+    {ok, ok, State#eh_state{curr_group = Group,
+			    curr_func = Conf,
+			    parallel_tcs = Parallel}};
+handle_call({set_curr_func,{group,Group,Conf},_SkipOrFail}, State) ->
+    {ok, ok, State#eh_state{curr_group = Group,
+			    curr_func = Conf,
+			    parallel_tcs = false}};
+handle_call({set_curr_func,{group,undefined},_Config}, State) ->
+    {ok, ok, State#eh_state{curr_group = undefined,
+			    curr_func = undefined,
+			    parallel_tcs = false}};
+handle_call({set_curr_func,{Suite,Conf},_Config}, State) ->
+    {ok, ok, State#eh_state{curr_suite = Suite,
+			    curr_func = Conf,
+			    parallel_tcs = false}};
+handle_call({set_curr_func,undefined,_Config}, State) ->
+    {ok, ok, State#eh_state{curr_suite = undefined,
+			    curr_func = undefined,
+			    parallel_tcs = false}};
+handle_call({set_curr_func,TC,_Config}, State) ->
+    {ok, ok, State#eh_state{curr_func = TC}};
+
+handle_call({set_logfunc,NewLogFunc}, State) ->
+    {ok, NewLogFunc, State#eh_state{log_func = NewLogFunc}};
+
+handle_call({handle_remote_events,Bool}, State) ->
+    {ok, ok, State#eh_state{handle_remote_events = Bool}};
+
+handle_call(_Query, _State) ->
+    {error, bad_query}.
+
+terminate(_) ->
     error_logger:delete_report_handler(?MODULE),
     [].
 
+terminate(_Arg, _State) ->
+    ok.
+
 tag_event(Event) ->
     {calendar:local_time(), Event}.
 
+set_curr_func(CurrFunc, Config) ->
+    gen_event:call(error_logger, ?MODULE, {set_curr_func, CurrFunc, Config}).
+
 set_log_func(Func) ->
     gen_event:call(error_logger, ?MODULE, {set_logfunc, Func}).
+
+handle_remote_events(Bool) ->
+    gen_event:call(error_logger, ?MODULE, {handle_remote_events, Bool}).
+
+%%%-----------------------------------------------------------------
+
+format_header(#eh_state{curr_suite = undefined,
+			curr_group = undefined,
+			curr_func = undefined}) ->
+    io_lib:format("System report", []);
+
+format_header(#eh_state{curr_suite = Suite,
+			curr_group = undefined,
+			curr_func = undefined}) ->
+    io_lib:format("System report during ~w", [Suite]);
+
+format_header(#eh_state{curr_suite = Suite,
+			curr_group = undefined,
+			curr_func = TcOrConf}) ->
+    io_lib:format("System report during ~w:~w/1",
+		  [Suite,TcOrConf]);
+
+format_header(#eh_state{curr_suite = Suite,
+			curr_group = Group,
+			curr_func = Conf}) when Conf == init_per_group;
+						Conf == end_per_group ->
+    io_lib:format("System report during ~w:~w/2 for ~w",
+		  [Suite,Conf,Group]);
+
+format_header(#eh_state{curr_suite = Suite,
+			curr_group = Group,
+			parallel_tcs = true}) ->
+    io_lib:format("System report during ~w in ~w",
+		  [Group,Suite]);
+
+format_header(#eh_state{curr_suite = Suite,
+			curr_group = Group,
+			curr_func = TC}) ->
+    io_lib:format("System report during ~w:~w/1 in ~w",
+		  [Suite,TC,Group]).
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
diff --git a/lib/common_test/src/cth_surefire.erl b/lib/common_test/src/cth_surefire.erl
index 1a38b6584b..7ed2018bdf 100644
--- a/lib/common_test/src/cth_surefire.erl
+++ b/lib/common_test/src/cth_surefire.erl
@@ -138,6 +138,9 @@ on_tc_fail(_TC, Res, State) ->
 		  {fail,lists:flatten(io_lib:format("~p",[Res]))} },
     State#state{ test_cases = [NewTC | tl(TCs)]}.
 
+on_tc_skip({ConfigFunc,_GrName},{Type,_Reason} = Res, State0)
+  when Type == tc_auto_skip; Type == tc_user_skip ->
+    on_tc_skip(ConfigFunc, Res, State0);
 on_tc_skip(Tc,{Type,_Reason} = Res, State0) when Type == tc_auto_skip ->
     TcStr = atom_to_list(Tc),
     State =
@@ -330,5 +333,7 @@ count_tcs([#testcase{result={fail,_}}|TCs],Ok,F,S) ->
     count_tcs(TCs,Ok,F+1,S);
 count_tcs([#testcase{result={skipped,_}}|TCs],Ok,F,S) ->
     count_tcs(TCs,Ok,F,S+1);
+count_tcs([#testcase{result={auto_skipped,_}}|TCs],Ok,F,S) ->
+    count_tcs(TCs,Ok,F,S+1);
 count_tcs([],Ok,F,S) ->
     {Ok+F+S,F,S}.
diff --git a/lib/common_test/src/unix_telnet.erl b/lib/common_test/src/unix_telnet.erl
index 88199b07d0..e049c3bf39 100644
--- a/lib/common_test/src/unix_telnet.erl
+++ b/lib/common_test/src/unix_telnet.erl
@@ -54,8 +54,8 @@
 -compile(export_all).
 
 %% Callbacks for ct_telnet.erl
--export([connect/5,get_prompt_regexp/0]).
--import(ct_telnet,[start_log/1,cont_log/2,end_log/0]).
+-export([connect/6,get_prompt_regexp/0]).
+-import(ct_telnet,[start_gen_log/1,log/4,end_gen_log/0]).
 
 -define(username,"login: ").
 -define(password,"Password: ").
@@ -76,7 +76,9 @@ get_prompt_regexp() ->
 
 %%%-----------------------------------------------------------------
 %%% @hidden
-%%% @spec connect(Ip,Port,Timeout,KeepAlive,Extra) -> {ok,Handle} | {error,Reason}
+%%% @spec connect(ConnName,Ip,Port,Timeout,KeepAlive,Extra) -> 
+%%%   {ok,Handle} | {error,Reason}
+%%%      ConnName = ct:target_name()
 %%%      Ip = string() | {integer(),integer(),integer(),integer()}
 %%%      Port = integer()
 %%%      Timeout = integer()
@@ -89,59 +91,70 @@ get_prompt_regexp() ->
 %%% @doc Callback for ct_telnet.erl.
 %%%
 %%% <p>Setup telnet connection to a UNIX host.</p>
-connect(Ip,Port,Timeout,KeepAlive,Extra) ->
+connect(ConnName,Ip,Port,Timeout,KeepAlive,Extra) ->
     case Extra of
 	{Username,Password} -> 
-	    connect1(Ip,Port,Timeout,KeepAlive,Username,Password);
-	Name ->
-	    case get_username_and_password(Name) of
+	    connect1(ConnName,Ip,Port,Timeout,KeepAlive,
+		     Username,Password);
+	KeyOrName ->
+	    case get_username_and_password(KeyOrName) of
 		{ok,{Username,Password}} ->
-		    connect1(Ip,Port,Timeout,KeepAlive,Username,Password);
+		    connect1(ConnName,Ip,Port,Timeout,KeepAlive,
+			     Username,Password);
 		Error ->
 		    Error
 	    end
     end.
 
-connect1(Ip,Port,Timeout,KeepAlive,Username,Password) ->
-    start_log("unix_telnet:connect"),
+connect1(Name,Ip,Port,Timeout,KeepAlive,Username,Password) ->
+    start_gen_log("unix_telnet connect"),
     Result = 
 	case ct_telnet_client:open(Ip,Port,Timeout,KeepAlive) of
 	    {ok,Pid} ->
-		case ct_telnet:silent_teln_expect(Pid,[],[prompt],?prx,[]) of
+		case ct_telnet:silent_teln_expect(Name,Pid,[],
+						  [prompt],?prx,[]) of
 		    {ok,{prompt,?username},_} ->
+			log(Name,send,"Logging in to ~p:~p", [Ip,Port]),
 			ok = ct_telnet_client:send_data(Pid,Username),
-			cont_log("Username: ~ts",[Username]),
-			case ct_telnet:silent_teln_expect(Pid,[],prompt,?prx,[]) of
+			log(Name,send,"Username: ~ts",[Username]),
+			case ct_telnet:silent_teln_expect(Name,Pid,[],
+							  prompt,?prx,[]) of
 			    {ok,{prompt,?password},_} ->
 				ok = ct_telnet_client:send_data(Pid,Password),
 				Stars = lists:duplicate(length(Password),$*),
-				cont_log("Password: ~s",[Stars]),
+				log(Name,send,"Password: ~s",[Stars]),
 				ok = ct_telnet_client:send_data(Pid,""),
-				case ct_telnet:silent_teln_expect(Pid,[],prompt,
+				case ct_telnet:silent_teln_expect(Name,Pid,[],
+								  prompt,
 								  ?prx,[]) of
 				    {ok,{prompt,Prompt},_} 
-				    when Prompt=/=?username, Prompt=/=?password ->
+				    when Prompt=/=?username,
+					 Prompt=/=?password ->
 					{ok,Pid};
 				    Error ->
-					cont_log("Password failed\n~p\n",
-						 [Error]),
+					log(Name,recv,"Password failed\n~p\n",
+					    [Error]),
 					{error,Error}
 				end;
 			    Error ->
-				cont_log("Login failed\n~p\n",[Error]),
+				log(Name,recv,"Login to ~p:~p failed\n~p\n",[Ip,Port,Error]),
 				{error,Error}
 			end;
 		    {ok,[{prompt,_OtherPrompt1},{prompt,_OtherPrompt2}],_} ->
 			{ok,Pid};
 		    Error ->
-			cont_log("Did not get expected prompt\n~p\n",[Error]),
+			log(Name,error,
+			    "Did not get expected prompt from ~p:~p\n~p\n",
+			    [Ip,Port,Error]),
 			{error,Error}
 		end;
 	    Error ->
-		cont_log("Could not open telnet connection\n~p\n",[Error]),
+		log(Name,error,
+		    "Could not open telnet connection to ~p:~p\n~p\n",
+		    [Ip,Port,Error]),
 		Error
 	end,
-    end_log(),
+    end_gen_log(),
     Result.
 
 get_username_and_password(Name) ->
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 9d2edcd653..085f19d023 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -51,6 +51,7 @@ MODULES= \
 	ct_master_SUITE \
 	ct_misc_1_SUITE \
 	ct_hooks_SUITE \
+	ct_pre_post_test_io_SUITE \
 	ct_netconfc_SUITE \
 	ct_basic_html_SUITE \
 	ct_auto_compile_SUITE \
diff --git a/lib/common_test/test/common_test.cover b/lib/common_test/test/common_test.cover
index 3aa49623e7..87d00c420f 100644
--- a/lib/common_test/test/common_test.cover
+++ b/lib/common_test/test/common_test.cover
@@ -4,7 +4,6 @@
 				  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/ct_config_SUITE.erl b/lib/common_test/test/ct_config_SUITE.erl
index d92be9ec6e..284f836517 100644
--- a/lib/common_test/test/ct_config_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE.erl
@@ -234,25 +234,25 @@ expected_events(config_static_SUITE)->
      ?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}}),
+	   {failed,{error,{config_name_already_in_use,[x1]}}},{4,1,{0,0}}),
+     ?sok(test_default_tclocal,{5,1,{0,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}}),
+	   {failed,{error,{config_name_already_in_use,[alias,x1]}}},{5,2,{0,0}}),
+     ?sok(test_alias_tclocal,{6,2,{0,0}}),
+     ?sok(test_get_config_undefined,{7,2,{0,0}}),
+     ?sok(test_require_subvals,{8,2,{0,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}}),
+	   {auto_skipped,{require_failed,
+			  {not_available,{gen_cfg,[a,b,c,d]}}}},{8,2,{0,1}}),
+     ?sok(test_require_deep_config,{9,2,{0,1}}),
+     ?sok(test_shadow_all,{10,2,{0,1}}),
+     ?sok(test_element,{11,2,{0,1}}),
+     ?sok(test_shadow_all_element,{12,2,{0,1}}),
+     ?sok(test_internal_deep,{13,2,{0,1}}),
+     ?sok(test_alias_tclocal_nested,{14,2,{0,1}}),
+     ?sok(test_alias_tclocal_nested_backward_compat,{15,2,{0,1}}),
+     ?sok(test_alias_tclocal_nested_backward_compat_subvals,{16,2,{0,1}}),
+     ?sok(test_config_same_name_already_in_use,{17,2,{0,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'}},
diff --git a/lib/common_test/test/ct_config_info_SUITE.erl b/lib/common_test/test/ct_config_info_SUITE.erl
index 10fe8286dd..8f2f0eb75f 100644
--- a/lib/common_test/test/ct_config_info_SUITE.erl
+++ b/lib/common_test/test/ct_config_info_SUITE.erl
@@ -127,7 +127,7 @@ test_events(config_info) ->
 		    {failed,{timetrap_timeout,350}}}},
       {?eh,tc_auto_skip,{config_info_1_SUITE,t11,
 	{failed,{config_info_1_SUITE,init_per_group,{timetrap_timeout,350}}}}},
-      {?eh,tc_auto_skip,{config_info_1_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{config_info_1_SUITE,{end_per_group,g1},
 			 {failed,{config_info_1_SUITE,init_per_group,
 				  {timetrap_timeout,350}}}}}],
 
@@ -145,12 +145,12 @@ test_events(config_info) ->
        {?eh,tc_auto_skip,{config_info_1_SUITE,t41,
 	 {failed,{config_info_1_SUITE,init_per_group,
 		  {timetrap_timeout,400}}}}},
-       {?eh,tc_auto_skip,{config_info_1_SUITE,end_per_group,
+       {?eh,tc_auto_skip,{config_info_1_SUITE,{end_per_group,g4},
 	 {failed,{config_info_1_SUITE,init_per_group,
 		  {timetrap_timeout,400}}}}}],
       {?eh,tc_start,{config_info_1_SUITE,t31}},
       {?eh,tc_done,{config_info_1_SUITE,t31,
-		    {skipped,{failed,{config_info_1_SUITE,init_per_testcase,
+		    {auto_skipped,{failed,{config_info_1_SUITE,init_per_testcase,
 				      {timetrap_timeout,250}}}}}},
       {?eh,tc_start,{config_info_1_SUITE,t32}},
       {?eh,tc_done,{config_info_1_SUITE,t32,
diff --git a/lib/common_test/test/ct_error_SUITE.erl b/lib/common_test/test/ct_error_SUITE.erl
index 3881ced17d..194e7d42ae 100644
--- a/lib/common_test/test/ct_error_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE.erl
@@ -66,7 +66,7 @@ all() ->
     [cfg_error, lib_error, no_compile, timetrap_end_conf,
      timetrap_normal, timetrap_extended, timetrap_parallel,
      timetrap_fun, timetrap_fun_group, misc_errors,
-     config_restored].
+     config_restored, config_func_errors].
 
 groups() -> 
     [].
@@ -310,6 +310,25 @@ config_restored(Config) when is_list(Config) ->
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
+%%%
+config_func_errors(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "error/test/config_func_error_1_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite}],
+			 Config),
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+    
+    ct_test_support:log_events(config_func_errors,
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+    
+    TestEvents = events_to_check(config_func_errors),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+   
+
+%%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 
@@ -323,8 +342,6 @@ setup(Test, Config) ->
 
 reformat(Events, EH) ->
     ct_test_support:reformat(Events, EH).
-						%reformat(Events, _EH) ->
-						%    Events.
 
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
@@ -465,7 +482,7 @@ test_events(cfg_error) ->
 		 {'EXIT',{init_per_group_fails,g1}}}}}},
       {?eh,test_stats,{4,0,{0,11}}},
       {?eh,tc_auto_skip,
-       {cfg_error_8_SUITE,end_per_group,
+       {cfg_error_8_SUITE,{end_per_group,g1},
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{init_per_group_fails,g1}}}}}}],
 
@@ -476,7 +493,7 @@ test_events(cfg_error) ->
 			 {failed,{cfg_error_8_SUITE,init_per_group,
 				  {timetrap_timeout,2000}}}}},
       {?eh,test_stats,{4,0,{0,12}}},
-      {?eh,tc_auto_skip,{cfg_error_8_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{cfg_error_8_SUITE,{end_per_group,g2},
 			 {failed,{cfg_error_8_SUITE,init_per_group,
 				  {timetrap_timeout,2000}}}}}],
 
@@ -490,7 +507,7 @@ test_events(cfg_error) ->
 		 {'EXIT',{{badmatch,42},'_'}}}}}},
       {?eh,test_stats,{4,0,{0,13}}},
       {?eh,tc_auto_skip,
-       {cfg_error_8_SUITE,end_per_group,
+       {cfg_error_8_SUITE,{end_per_group,g3},
 	{failed,{cfg_error_8_SUITE,init_per_group,
 		 {'EXIT',{{badmatch,42},'_'}}}}}}],
 
@@ -516,7 +533,7 @@ test_events(cfg_error) ->
 		  {'EXIT',{sub_group_failed,g6}}}}}},
        {?eh,test_stats,{6,0,{0,14}}},
        {?eh,tc_auto_skip,
-	{cfg_error_8_SUITE,end_per_group,
+	{cfg_error_8_SUITE,{end_per_group,g6},
 	 {failed,{cfg_error_8_SUITE,init_per_group,
 		  {'EXIT',{sub_group_failed,g6}}}}}}],
       {?eh,tc_start,{cfg_error_8_SUITE,tc3}},
@@ -550,23 +567,23 @@ test_events(cfg_error) ->
      {?eh,tc_done,{cfg_error_9_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc1,
-		   {skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,
-				     {tc1_should_be_skipped,'_'}}}}}},
+		   {auto_skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,
+					  {tc1_should_be_skipped,'_'}}}}}},
      {?eh,test_stats,{9,0,{0,15}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc2,
-		   {skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,
-				     {timetrap_timeout,2000}}}}}},
+		   {auto_skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,
+					  {timetrap_timeout,2000}}}}}},
      {?eh,test_stats,{9,0,{0,16}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc3}},
      {?eh,tc_done,{cfg_error_9_SUITE,tc3,
-		   {skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,
-				     {{badmatch,undefined},'_'}}}}}},
+		   {auto_skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,
+					  {{badmatch,undefined},'_'}}}}}},
      {?eh,test_stats,{9,0,{0,17}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc4}},
      {?eh,tc_done,
       {cfg_error_9_SUITE,tc4,
-       {skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,bad_return}}}}},
+       {auto_skipped,{failed,{cfg_error_9_SUITE,init_per_testcase,bad_return}}}}},
      {?eh,test_stats,{9,0,{0,18}}},
      {?eh,tc_start,{cfg_error_9_SUITE,tc5}},
      {?eh,tc_done,
@@ -622,41 +639,41 @@ test_events(cfg_error) ->
      {?eh,tc_done,{cfg_error_11_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_11_SUITE,tc1}},
      {?eh,tc_done, {cfg_error_11_SUITE,tc1,
-		    {skipped,{config_name_already_in_use,[dummy_alias]}}}},
-     {?eh,test_stats,{12,6,{1,19}}},
+		    {failed,{error,{config_name_already_in_use,[dummy_alias]}}}}},
+     {?eh,test_stats,{12,7,{0,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_11_SUITE,tc2,ok}},
-     {?eh,test_stats,{13,6,{1,19}}},
+     {?eh,test_stats,{13,7,{0,19}}},
      {?eh,tc_start,{cfg_error_11_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_11_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc1}},
      {?eh,tc_done,{ct_framework,init_tc,{framework_error,{timetrap,500}}}},
-     {?eh,test_stats,{13,7,{1,19}}},
+     {?eh,test_stats,{13,8,{0,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc2}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc2,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{14,7,{1,19}}},
+     {?eh,test_stats,{14,8,{0,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc3}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc3,ok}},
-     {?eh,test_stats,{15,7,{1,19}}},
+     {?eh,test_stats,{15,8,{0,19}}},
      {?eh,tc_start,{cfg_error_12_SUITE,tc4}},
      {?eh,tc_done,{cfg_error_12_SUITE,tc4,{failed,
 					   {cfg_error_12_SUITE,end_per_testcase,
 					    {timetrap_timeout,500}}}}},
-     {?eh,test_stats,{16,7,{1,19}}},
+     {?eh,test_stats,{16,8,{0,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_13_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_13_SUITE,tc1,ok}},
-     {?eh,test_stats,{17,7,{1,19}}},
+     {?eh,test_stats,{17,8,{0,19}}},
      {?eh,tc_start,{cfg_error_13_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_13_SUITE,end_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,init_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{cfg_error_14_SUITE,tc1}},
      {?eh,tc_done,{cfg_error_14_SUITE,tc1,ok}},
-     {?eh,test_stats,{18,7,{1,19}}},
+     {?eh,test_stats,{18,8,{0,19}}},
      {?eh,tc_start,{cfg_error_14_SUITE,end_per_suite}},
      {?eh,tc_done,{cfg_error_14_SUITE,end_per_suite,
 		   {comment,
@@ -1102,7 +1119,7 @@ test_events(timetrap_fun_group) ->
 			 {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,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{end_per_group,g4},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}}],
 
@@ -1117,7 +1134,7 @@ test_events(timetrap_fun_group) ->
 			 {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,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{end_per_group,g5},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {user_timetrap_error,{kaboom,'_'}}}}}}],
 
@@ -1132,7 +1149,7 @@ test_events(timetrap_fun_group) ->
 			 {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,
+      {?eh,tc_auto_skip,{timetrap_8_SUITE,{end_per_group,g6},
 			 {failed,{timetrap_8_SUITE,init_per_group,
 				  {timetrap_timeout,'_'}}}}}],
 
@@ -1285,7 +1302,7 @@ test_events(timetrap_fun_group) ->
 			  {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,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{end_per_group,pg4},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}}]},
 
@@ -1301,7 +1318,7 @@ test_events(timetrap_fun_group) ->
 			  {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,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{end_per_group,pg5},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {user_timetrap_error,{kaboom,'_'}}}}}}]},
 
@@ -1317,7 +1334,7 @@ test_events(timetrap_fun_group) ->
 			  {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,
+       {?eh,tc_auto_skip,{timetrap_8_SUITE,{end_per_group,pg6},
 			  {failed,{timetrap_8_SUITE,init_per_group,
 				   {timetrap_timeout,'_'}}}}}]},
 
@@ -1498,4 +1515,42 @@ test_events(config_restored) ->
      {?eh,tc_done,{config_restored_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
+    ];
+
+test_events(config_func_errors) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{config_func_error_1_SUITE,init_per_suite}},
+     {?eh,tc_done,{config_func_error_1_SUITE,init_per_suite,ok}},
+
+     {?eh,tc_start,{config_func_error_1_SUITE,exit_in_iptc}},
+     {?eh,tc_done,{config_func_error_1_SUITE,exit_in_iptc,'_'}},
+     {?eh,test_stats,{0,1,{0,0}}},
+
+     {?eh,tc_start,{config_func_error_1_SUITE,exit_in_eptc}},
+     {?eh,tc_done,{config_func_error_1_SUITE,exit_in_eptc,'_'}},
+     {?eh,test_stats,{0,2,{0,0}}},
+
+     [{?eh,tc_start,{config_func_error_1_SUITE,{init_per_group,g1,[]}}},
+      {?eh,tc_done,{config_func_error_1_SUITE,{init_per_group,g1,[]},ok}},
+      {?eh,tc_start,{config_func_error_1_SUITE,exit_in_iptc}},
+      {?eh,tc_done,{config_func_error_1_SUITE,exit_in_iptc,'_'}},
+      {?eh,test_stats,{0,3,{0,0}}},
+      {?eh,tc_start,{config_func_error_1_SUITE,{end_per_group,g1,[]}}},
+      {?eh,tc_done,{config_func_error_1_SUITE,{end_per_group,g1,[]},ok}}],
+
+     [{?eh,tc_start,{config_func_error_1_SUITE,{init_per_group,g2,[]}}},
+      {?eh,tc_done,{config_func_error_1_SUITE,{init_per_group,g2,[]},ok}},
+      {?eh,tc_start,{config_func_error_1_SUITE,exit_in_eptc}},
+      {?eh,tc_done,{config_func_error_1_SUITE,exit_in_eptc,'_'}},
+      {?eh,test_stats,{0,4,{0,0}}},
+      {?eh,tc_start,{config_func_error_1_SUITE,{end_per_group,g2,[]}}},
+      {?eh,tc_done,{config_func_error_1_SUITE,{end_per_group,g2,[]},ok}}],
+
+     {?eh,tc_start,{config_func_error_1_SUITE,end_per_suite}},
+     {?eh,tc_done,{config_func_error_1_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
     ].
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/config_func_error_1_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/config_func_error_1_SUITE.erl
new file mode 100644
index 0000000000..f1025213dc
--- /dev/null
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/config_func_error_1_SUITE.erl
@@ -0,0 +1,138 @@
+%%
+%% %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(config_func_error_1_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,5}}].
+
+%%--------------------------------------------------------------------
+%% 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(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+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()
+%%--------------------------------------------------------------------
+bad_proc(Config) ->    
+    ct:pal("Bye bye from ~p", [self()]),
+    %% this call will either generate an exit immediately
+    %% or return a fun to be executed here
+    ErrorFun = ct_test_support:random_error(Config),
+    ct:log("Calling error fun now...", []),
+    ErrorFun(),
+    ct:sleep(10000),
+    ok.
+
+init_per_testcase(exit_in_iptc, Config) ->
+    spawn_link(?MODULE, bad_proc, [Config]),
+    ct:sleep(10000),
+    Config;
+init_per_testcase(_, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(exit_in_eptc, Config) ->
+    spawn_link(?MODULE, bad_proc, [Config]),
+    ct:sleep(10000),
+    ok;
+end_per_testcase(_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() ->
+    [{g1, [], [exit_in_iptc]},
+     {g2, [], [exit_in_eptc]}].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() -> 
+    [exit_in_iptc,
+     exit_in_eptc,
+     {group, g1},
+     {group, g2}].
+
+exit_in_iptc(_) ->
+    ok.
+
+exit_in_eptc(_) ->
+    ok.
+
diff --git a/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl b/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl
index 8fcd35e0a4..1d08ce167b 100644
--- a/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl
+++ b/lib/common_test/test/ct_gen_conn_SUITE_data/proto.erl
@@ -1,10 +1,21 @@
-%%% @author Peter Andersson <[email protected]>
-%%% @copyright (C) 2013, Peter Andersson
-%%% @doc
-%%%
-%%% @end
-%%% Created : 24 May 2013 by Peter Andersson <[email protected]>
-
+%%
+%% %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(proto).
 
 -compile(export_all).
diff --git a/lib/common_test/test/ct_group_info_SUITE.erl b/lib/common_test/test/ct_group_info_SUITE.erl
index c56fa952e8..e7bc5baaa1 100644
--- a/lib/common_test/test/ct_group_info_SUITE.erl
+++ b/lib/common_test/test/ct_group_info_SUITE.erl
@@ -269,13 +269,19 @@ test_events(timetrap_all) ->
       {?eh,tc_done,{group_timetrap_1_SUITE,{end_per_group,g10,[]},ok}}],
 
      [{?eh,tc_start,{group_timetrap_1_SUITE,{init_per_group,g11,[]}}},
-      {?eh,tc_done,{group_timetrap_1_SUITE,{init_per_group,g11,[]},ok}},
-      {?eh,tc_done,{group_timetrap_1_SUITE,t111,{failed,{timetrap_timeout,1000}}}},
-      {?eh,test_stats,{0,14,{0,0}}},
-      {?eh,tc_start,{group_timetrap_1_SUITE,{end_per_group,g11,[]}}},
-      {?eh,tc_done,{group_timetrap_1_SUITE,{end_per_group,g11,[]},ok}}],
-
+      {?eh,tc_done,{group_timetrap_1_SUITE,
+		    {init_per_group,g11,[]},
+		    {auto_skipped,{group0_failed,bad_return_value}}}},
+      {?eh,tc_auto_skip,
+       {group_timetrap_1_SUITE,t111,{group0_failed,bad_return_value}}},
+      {?eh,test_stats,{0,13,{0,1}}},
+      {?eh,tc_auto_skip,{group_timetrap_1_SUITE,
+			 {end_per_group,g11},
+			 {group0_failed,bad_return_value}}}],
+
+     {?eh,tc_start,{group_timetrap_1_SUITE,end_per_suite}},
      {?eh,tc_done,{group_timetrap_1_SUITE,end_per_suite,ok}},
+
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
@@ -422,13 +428,15 @@ test_events(timetrap_all_no_ips) ->
       {?eh,tc_done,{group_timetrap_2_SUITE,{end_per_group,g10,[]},ok}}],
 
      [{?eh,tc_start,{group_timetrap_2_SUITE,{init_per_group,g11,[]}}},
-      {?eh,tc_done,{group_timetrap_2_SUITE,{init_per_group,g11,[]},ok}},
-      {?eh,tc_done,{group_timetrap_2_SUITE,t111,{failed,{timetrap_timeout,1000}}}},
-      {?eh,test_stats,{0,14,{0,0}}},
-      {?eh,tc_start,{group_timetrap_2_SUITE,{end_per_group,g11,[]}}},
-      {?eh,tc_done,{group_timetrap_2_SUITE,{end_per_group,g11,[]},ok}}],
-
-     {?eh,test_done,{'DEF','STOP_TIME'}},
+      {?eh,tc_done,{group_timetrap_2_SUITE,
+		    {init_per_group,g11,[]},
+		    {auto_skipped,{group0_failed,bad_return_value}}}},
+      {?eh,tc_auto_skip,{group_timetrap_2_SUITE,t111,
+			 {group0_failed,bad_return_value}}},
+      {?eh,test_stats,{0,13,{0,1}}},
+      {?eh,tc_auto_skip,{group_timetrap_2_SUITE,
+			 {end_per_group,g11},
+			 {group0_failed,bad_return_value}}}],
      {?eh,stop_logging,[]}
     ];
 
@@ -501,11 +509,13 @@ test_events(timetrap_all_no_ipg) ->
       {?eh,tc_done,{ct_framework,{end_per_group,g10,[{suite,group_timetrap_3_SUITE}]},ok}}],
 
      [{?eh,tc_start,{ct_framework,{init_per_group,g11,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{init_per_group,g11,[{suite,group_timetrap_3_SUITE}]},ok}},
-      {?eh,tc_done,{group_timetrap_3_SUITE,t111,{failed,{timetrap_timeout,1000}}}},
-      {?eh,test_stats,{0,14,{0,0}}},
-      {?eh,tc_start,{ct_framework,{end_per_group,g11,[{suite,group_timetrap_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{end_per_group,g11,[{suite,group_timetrap_3_SUITE}]},ok}}],
+      {?eh,tc_done,{ct_framework,
+		    {init_per_group,g11,[{suite,group_timetrap_3_SUITE}]},
+		    {auto_skipped,{group0_failed,bad_return_value}}}},
+      {?eh,tc_auto_skip,{group_timetrap_3_SUITE,t111,{group0_failed,bad_return_value}}},
+      {?eh,test_stats,{0,13,{0,1}}},
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g11},
+			 {group0_failed,bad_return_value}}}],
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
@@ -539,11 +549,13 @@ test_events(require) ->
 
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g4,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,{init_per_group,g4,[]},
-	{skipped,{require_failed,{name_in_use,common2_alias,common2}}}}},
+		    {auto_skipped,{require_failed,
+				   {name_in_use,common2_alias,common2}}}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,t41,
-			  {require_failed,{name_in_use,common2_alias,common2}}}},
+			  {require_failed,
+			   {name_in_use,common2_alias,common2}}}},
       {?eh,test_stats,{4,0,{0,1}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{end_per_group,g4},
 	{require_failed,{name_in_use,common2_alias,common2}}}}],
 
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g5,[]}}},
@@ -566,16 +578,18 @@ test_events(require) ->
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g8,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,
 		    {init_per_group,g8,[]},
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,
+				   {not_available,non_existing}}}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,t81,
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{end_per_group,g8},
 			 {require_failed,{not_available,non_existing}}}}],
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g9,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,{init_per_group,g9,[]},ok}},
       {?eh,tc_done,{group_require_1_SUITE,t91,
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,
+				   {not_available,non_existing}}}}},
       {?eh,test_stats,{8,0,{0,3}}},
       {?eh,tc_start,{group_require_1_SUITE,{end_per_group,g9,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,{end_per_group,g9,[]},ok}}],
@@ -587,12 +601,16 @@ test_events(require) ->
       {?eh,tc_done,{group_require_1_SUITE,{end_per_group,g10,[]},ok}}],
 
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g11,[]}}},
-      {?eh,tc_done,{group_require_1_SUITE,{init_per_group,g11,[]},ok}},
-      {?eh,tc_done,{group_require_1_SUITE,t111,ok}},
-      {?eh,test_stats,{10,0,{0,3}}},
-      {?eh,tc_start,{group_require_1_SUITE,{end_per_group,g11,[]}}},
-      {?eh,tc_done,{group_require_1_SUITE,{end_per_group,g11,[]},ok}}],
-
+      {?eh,tc_done,{group_require_1_SUITE,
+		    {init_per_group,g11,[]},
+		    {auto_skipped,{group0_failed,bad_return_value}}}},
+      {?eh,tc_auto_skip,{group_require_1_SUITE,t111,
+			 {group0_failed,bad_return_value}}},
+      {?eh,test_stats,{9,0,{0,4}}},
+      {?eh,tc_auto_skip,{group_require_1_SUITE,
+			 {end_per_group,g11},
+			 {group0_failed,bad_return_value}}}],
+     
      {?eh,tc_done,{group_require_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
@@ -627,11 +645,11 @@ test_events(require_default) ->
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g4,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,
 		    {init_per_group,g4,[]},
-		    {skipped,{require_failed,{not_available,common3}}}}},
+		    {auto_skipped,{require_failed,{not_available,common3}}}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,t41,
 			 {require_failed,{not_available,common3}}}},
       {?eh,test_stats,{4,0,{0,1}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{end_per_group,g4},
 			 {require_failed,{not_available,common3}}}}],
 
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g5,[]}}},
@@ -654,17 +672,19 @@ test_events(require_default) ->
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g8,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,
 		    {init_per_group,g8,[]},
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,
+				   {not_available,non_existing}}}}},
       {?eh,tc_auto_skip,{group_require_1_SUITE,t81,
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
-      {?eh,tc_auto_skip,{group_require_1_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{group_require_1_SUITE,{end_per_group,g8},
 			 {require_failed,{not_available,non_existing}}}}],
 
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g9,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,{init_per_group,g9,[]},ok}},
       {?eh,tc_done,{group_require_1_SUITE,t91,
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,
+				   {not_available,non_existing}}}}},
       {?eh,test_stats,{8,0,{0,3}}},
       {?eh,tc_start,{group_require_1_SUITE,{end_per_group,g9,[]}}},
       {?eh,tc_done,{group_require_1_SUITE,{end_per_group,g9,[]},ok}}],
@@ -676,11 +696,15 @@ test_events(require_default) ->
       {?eh,tc_done,{group_require_1_SUITE,{end_per_group,g10,[]},ok}}],
 
      [{?eh,tc_start,{group_require_1_SUITE,{init_per_group,g11,[]}}},
-      {?eh,tc_done,{group_require_1_SUITE,{init_per_group,g11,[]},ok}},
-      {?eh,tc_done,{group_require_1_SUITE,t111,ok}},
-      {?eh,test_stats,{10,0,{0,3}}},
-      {?eh,tc_start,{group_require_1_SUITE,{end_per_group,g11,[]}}},
-      {?eh,tc_done,{group_require_1_SUITE,{end_per_group,g11,[]},ok}}],
+      {?eh,tc_done,{group_require_1_SUITE,
+		    {init_per_group,g11,[]},
+		    {auto_skipped,{group0_failed,bad_return_value}}}},
+      {?eh,tc_auto_skip,{group_require_1_SUITE,t111,
+			 {group0_failed,bad_return_value}}},
+      {?eh,test_stats,{9,0,{0,4}}},
+      {?eh,tc_auto_skip,{group_require_1_SUITE,
+			 {end_per_group,g11},
+			 {group0_failed,bad_return_value}}}],
 
      {?eh,tc_done,{group_require_1_SUITE,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
@@ -714,11 +738,12 @@ test_events(require_no_ips) ->
 
      [{?eh,tc_start,{group_require_2_SUITE,{init_per_group,g4,[]}}},
       {?eh,tc_done,{group_require_2_SUITE,{init_per_group,g4,[]},
-	{skipped,{require_failed,{name_in_use,common2_alias,common2}}}}},
+		    {auto_skipped,{require_failed,
+				   {name_in_use,common2_alias,common2}}}}},
       {?eh,tc_auto_skip,{group_require_2_SUITE,t41,
 			  {require_failed,{name_in_use,common2_alias,common2}}}},
       {?eh,test_stats,{4,0,{0,1}}},
-      {?eh,tc_auto_skip,{group_require_2_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{group_require_2_SUITE,{end_per_group,g4},
 			 {require_failed,{name_in_use,common2_alias,common2}}}}],
 
      [{?eh,tc_start,{group_require_2_SUITE,{init_per_group,g5,[]}}},
@@ -741,16 +766,18 @@ test_events(require_no_ips) ->
      [{?eh,tc_start,{group_require_2_SUITE,{init_per_group,g8,[]}}},
       {?eh,tc_done,{group_require_2_SUITE,
 		    {init_per_group,g8,[]},
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,
+				   {not_available,non_existing}}}}},
       {?eh,tc_auto_skip,{group_require_2_SUITE,t81,
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
-      {?eh,tc_auto_skip,{group_require_2_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{group_require_2_SUITE,{end_per_group,g8},
 			 {require_failed,{not_available,non_existing}}}}],
      [{?eh,tc_start,{group_require_2_SUITE,{init_per_group,g9,[]}}},
       {?eh,tc_done,{group_require_2_SUITE,{init_per_group,g9,[]},ok}},
       {?eh,tc_done,{group_require_2_SUITE,t91,
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,
+				   {not_available,non_existing}}}}},
       {?eh,test_stats,{8,0,{0,3}}},
       {?eh,tc_start,{group_require_2_SUITE,{end_per_group,g9,[]}}},
       {?eh,tc_done,{group_require_2_SUITE,{end_per_group,g9,[]},ok}}],
@@ -760,13 +787,17 @@ test_events(require_no_ips) ->
       {?eh,tc_done,{group_require_2_SUITE,t101,ok}},
       {?eh,tc_start,{group_require_2_SUITE,{end_per_group,g10,[]}}},
       {?eh,tc_done,{group_require_2_SUITE,{end_per_group,g10,[]},ok}}],
-
+     
      [{?eh,tc_start,{group_require_2_SUITE,{init_per_group,g11,[]}}},
-      {?eh,tc_done,{group_require_2_SUITE,{init_per_group,g11,[]},ok}},
-      {?eh,tc_done,{group_require_2_SUITE,t111,ok}},
-      {?eh,test_stats,{10,0,{0,3}}},
-      {?eh,tc_start,{group_require_2_SUITE,{end_per_group,g11,[]}}},
-      {?eh,tc_done,{group_require_2_SUITE,{end_per_group,g11,[]},ok}}],
+      {?eh,tc_done,{group_require_2_SUITE,
+		    {init_per_group,g11,[]},
+		    {auto_skipped,{group0_failed,bad_return_value}}}},
+      {?eh,tc_auto_skip,{group_require_2_SUITE,t111,
+			 {group0_failed,bad_return_value}}},
+      {?eh,test_stats,{9,0,{0,4}}},
+      {?eh,tc_auto_skip,{group_require_2_SUITE,
+			 {end_per_group,g11},
+			 {group0_failed,bad_return_value}}}],
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
@@ -799,11 +830,11 @@ test_events(require_no_ipg) ->
 
      [{?eh,tc_start,{ct_framework,{init_per_group,g4,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{init_per_group,g4,[{suite,group_require_3_SUITE}]},
-	{skipped,{require_failed,{name_in_use,common2_alias,common2}}}}},
+		    {auto_skipped,{require_failed,{name_in_use,common2_alias,common2}}}}},
       {?eh,tc_auto_skip,{group_require_3_SUITE,t41,
 			 {require_failed,{name_in_use,common2_alias,common2}}}},
       {?eh,test_stats,{4,0,{0,1}}},
-      {?eh,tc_auto_skip,{ct_framework,end_per_group,
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g4},
 			 {require_failed,{name_in_use,common2_alias,common2}}}}],
 
      [{?eh,tc_start,{ct_framework,{init_per_group,g5,[{suite,group_require_3_SUITE}]}}},
@@ -825,16 +856,16 @@ test_events(require_no_ipg) ->
 
      [{?eh,tc_start,{ct_framework,{init_per_group,g8,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{init_per_group,g8,[{suite,group_require_3_SUITE}]},
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,{not_available,non_existing}}}}},
       {?eh,tc_auto_skip,{group_require_3_SUITE,t81,
 			 {require_failed,{not_available,non_existing}}}},
       {?eh,test_stats,{8,0,{0,2}}},
-      {?eh,tc_auto_skip,{ct_framework,end_per_group,
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g8},
 			 {require_failed,{not_available,non_existing}}}}],
      [{?eh,tc_start,{ct_framework,{init_per_group,g9,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{init_per_group,g9,[{suite,group_require_3_SUITE}]},ok}},
       {?eh,tc_done,{group_require_3_SUITE,t91,
-		    {skipped,{require_failed,{not_available,non_existing}}}}},
+		    {auto_skipped,{require_failed,{not_available,non_existing}}}}},
       {?eh,test_stats,{8,0,{0,3}}},
       {?eh,tc_start,{ct_framework,{end_per_group,g9,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{end_per_group,g9,[{suite,group_require_3_SUITE}]},ok}}],
@@ -844,13 +875,14 @@ test_events(require_no_ipg) ->
       {?eh,tc_done,{group_require_3_SUITE,t101,ok}},
       {?eh,tc_start,{ct_framework,{end_per_group,g10,[{suite,group_require_3_SUITE}]}}},
       {?eh,tc_done,{ct_framework,{end_per_group,g10,[{suite,group_require_3_SUITE}]},ok}}],
-
+     
      [{?eh,tc_start,{ct_framework,{init_per_group,g11,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{init_per_group,g11,[{suite,group_require_3_SUITE}]},ok}},
-      {?eh,tc_done,{group_require_3_SUITE,t111,ok}},
-      {?eh,test_stats,{10,0,{0,3}}},
-      {?eh,tc_start,{ct_framework,{end_per_group,g11,[{suite,group_require_3_SUITE}]}}},
-      {?eh,tc_done,{ct_framework,{end_per_group,g11,[{suite,group_require_3_SUITE}]},ok}}],
+      {?eh,tc_done,{ct_framework,{init_per_group,g11,[{suite,group_require_3_SUITE}]},
+		    {auto_skipped,{group0_failed,bad_return_value}}}},
+      {?eh,tc_auto_skip,{group_require_3_SUITE,t111,{group0_failed,bad_return_value}}},
+      {?eh,test_stats,{9,0,{0,4}}},
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g11},
+			 {group0_failed,bad_return_value}}}],
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
diff --git a/lib/common_test/test/ct_groups_test_2_SUITE.erl b/lib/common_test/test/ct_groups_test_2_SUITE.erl
index 1b2ad12e2f..8b0de98709 100644
--- a/lib/common_test/test/ct_groups_test_2_SUITE.erl
+++ b/lib/common_test/test/ct_groups_test_2_SUITE.erl
@@ -171,16 +171,20 @@ test_events(missing_conf) ->
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
      {?eh,start_info,{1,1,2}},
-     {?eh,tc_start,{ct_framework,{init_per_group,group1,[]}}},
-     {?eh,tc_done,{ct_framework,{init_per_group,group1,[]},ok}},
+     {?eh,tc_start,{ct_framework,{init_per_group,group1,
+				  [{suite,missing_conf_SUITE}]}}},
+     {?eh,tc_done,{ct_framework,{init_per_group,group1,
+				 [{suite,missing_conf_SUITE}]},ok}},
      {?eh,tc_start,{missing_conf_SUITE,tc1}},
      {?eh,tc_done,{missing_conf_SUITE,tc1,ok}},
      {?eh,test_stats,{1,0,{0,0}}},
      {?eh,tc_start,{missing_conf_SUITE,tc2}},
      {?eh,tc_done,{missing_conf_SUITE,tc2,ok}},
      {?eh,test_stats,{2,0,{0,0}}},
-     {?eh,tc_start,{ct_framework,{end_per_group,group1,[]}}},
-     {?eh,tc_done,{ct_framework,{end_per_group,group1,[]},ok}},
+     {?eh,tc_start,{ct_framework,{end_per_group,group1,
+				  [{suite,missing_conf_SUITE}]}}},
+     {?eh,tc_done,{ct_framework,{end_per_group,group1,
+				 [{suite,missing_conf_SUITE}]},ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ];
diff --git a/lib/common_test/test/ct_hooks_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE.erl
index 796a0832d7..b5855da9df 100644
--- a/lib/common_test/test/ct_hooks_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE.erl
@@ -80,11 +80,11 @@ all(suite) ->
        scope_per_suite_state_cth, scope_per_group_state_cth, 
        scope_suite_state_cth,
        fail_pre_suite_cth, double_fail_pre_suite_cth,
-       fail_post_suite_cth, skip_pre_suite_cth,
+       fail_post_suite_cth, skip_pre_suite_cth, skip_pre_end_cth,
        skip_post_suite_cth, recover_post_suite_cth, update_config_cth,
        state_update_cth, options_cth, same_id_cth, 
        fail_n_skip_with_minimal_cth, prio_cth, no_config,
-       data_dir
+       data_dir, cth_log
       ]
     ).
 
@@ -181,6 +181,10 @@ skip_pre_suite_cth(Config) when is_list(Config) ->
     do_test(skip_pre_suite_cth, "ct_cth_empty_SUITE.erl",
 	    [skip_pre_suite_cth],Config).
 
+skip_pre_end_cth(Config) when is_list(Config) ->
+    do_test(skip_pre_end_cth, "ct_scope_per_group_cth_SUITE.erl",
+	    [skip_pre_end_cth],Config).
+
 skip_post_suite_cth(Config) when is_list(Config) ->
     do_test(skip_post_suite_cth, "ct_cth_empty_SUITE.erl",
 	    [skip_post_suite_cth],Config).
@@ -222,7 +226,32 @@ data_dir(Config) when is_list(Config) ->
     do_test(data_dir, "ct_data_dir_SUITE.erl",
 	    [verify_data_dir_cth],Config).
 
-    
+cth_log(Config) when is_list(Config) ->    
+    %% test that cth_log_redirect writes properly to
+    %% unexpected I/O log
+    StartOpts = do_test(cth_log, "cth_log_SUITE.erl", [], Config),
+    Logdir = proplists:get_value(logdir, StartOpts),
+    UnexpIoLogs =
+	filelib:wildcard(
+	  filename:join(Logdir,
+			"ct_run*/cth.tests*/run*/unexpected_io.log.html")),
+    lists:foreach(
+      fun(UnexpIoLog) ->
+	      {ok,Bin} = file:read_file(UnexpIoLog),
+	      Ts = string:tokens(binary_to_list(Bin),[$\n]),
+	      Matches = lists:foldl(fun([$=,$E,$R,$R,$O,$R|_],  N) ->
+					    N+1;
+				       ([$L,$o,$g,$g,$e,$r|_],  N) ->
+					    N+1;
+				       (_, N) -> N
+				    end, 0, Ts),
+	      ct:pal("~p matches in ~tp", [Matches,UnexpIoLog]),
+	      if Matches > 10 -> ok;
+		 true -> exit({no_unexpected_io_found,UnexpIoLog})
+	      end
+      end, UnexpIoLogs),
+    ok.
+
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -251,7 +280,8 @@ do_test(Tag, SuiteWildCard, CTHs, Config, Res, EC) ->
 			       Opts),
 
     TestEvents = events_to_check(Tag, EC),
-    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+    ok = ct_test_support:verify_events(TestEvents, Events, Config),
+    Opts.
 
 setup(Test, Config) ->
     Opts0 = ct_test_support:get_opts(Config),
@@ -723,17 +753,53 @@ test_events(skip_pre_suite_cth) ->
      {?eh,cth,{'_',on_tc_skip,
 	       [init_per_suite,{tc_user_skip,{skipped,"Test skip"}},[]]}},
 
-     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,test_case,"Test skip"}},
-     {?eh,cth,{'_',on_tc_skip,[test_case,{tc_auto_skip,"Test skip"},[]]}},
+     {?eh,tc_user_skip,{ct_cth_empty_SUITE,test_case,"Test skip"}},
+     {?eh,cth,{'_',on_tc_skip,[test_case,{tc_user_skip,"Test skip"},[]]}},
      
-     {?eh,tc_auto_skip, {ct_cth_empty_SUITE, end_per_suite,"Test skip"}},
-     {?eh,cth,{'_',on_tc_skip,[end_per_suite,{tc_auto_skip,"Test skip"},[]]}},
+     {?eh,tc_user_skip, {ct_cth_empty_SUITE, end_per_suite,"Test skip"}},
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,cth, {'_',terminate,[[]]}},
      {?eh,stop_logging,[]}
     ];
 
+test_events(skip_pre_end_cth) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{ct_scope_per_group_cth_SUITE,init_per_suite}},
+     {?eh,tc_done,{ct_scope_per_group_cth_SUITE,init_per_suite,ok}},
+     
+     [{?eh,tc_start,{ct_scope_per_group_cth_SUITE,{init_per_group,group1,[]}}},
+      {?eh,cth,{'_',id,[[]]}},
+      {?eh,cth,{'_',init,['_',[]]}},
+      {?eh,cth,{'_',post_init_per_group,[group1,'$proplist','$proplist',[]]}},
+      {?eh,tc_done,{ct_scope_per_group_cth_SUITE,{init_per_group,group1,[]},ok}},
+      
+      {?eh,tc_start,{ct_scope_per_group_cth_SUITE,test_case}},
+      {?eh,cth,{'_',pre_init_per_testcase,[test_case,'$proplist',[]]}},
+      {?eh,cth,{'_',post_end_per_testcase,[test_case,'$proplist',ok,[]]}},
+      {?eh,tc_done,{ct_scope_per_group_cth_SUITE,test_case,ok}},
+      
+      {?eh,tc_start,{ct_scope_per_group_cth_SUITE,{end_per_group,group1,[]}}},
+      {?eh,cth,{'_',pre_end_per_group,[group1,'$proplist',[]]}},
+      {?eh,cth,{'_',post_end_per_group,[group1,'$proplist','_',[]]}},
+      {?eh,tc_done,{ct_scope_per_group_cth_SUITE,{end_per_group,group1,[]},
+		    {skipped,"Test skip"}}}],
+      {?eh,cth,{'_',on_tc_skip,[end_per_group,
+				{tc_user_skip,{skipped,"Test skip"}},
+				[]]}},
+     {?eh,tc_start,{ct_scope_per_group_cth_SUITE,end_per_suite}},
+     {?eh,tc_done,{ct_scope_per_group_cth_SUITE,end_per_suite,
+		   {skipped,"Test skip"}}},
+     {?eh,cth,{'_',on_tc_skip,[end_per_suite,
+			       {tc_user_skip,{skipped,"Test skip"}},
+			       []]}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,cth,{'_',terminate,[[]]}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(skip_post_suite_cth) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
@@ -747,11 +813,10 @@ test_events(skip_post_suite_cth) ->
      {?eh,cth,{'_',on_tc_skip,
 	       [init_per_suite,{tc_user_skip,{skipped,"Test skip"}},[]]}},
 
-     {?eh,tc_auto_skip,{ct_cth_empty_SUITE,test_case,"Test skip"}},
-     {?eh,cth,{'_',on_tc_skip,[test_case,{tc_auto_skip,"Test skip"},[]]}},
+     {?eh,tc_user_skip,{ct_cth_empty_SUITE,test_case,"Test skip"}},
+     {?eh,cth,{'_',on_tc_skip,[test_case,{tc_user_skip,"Test skip"},[]]}},
      
-     {?eh,tc_auto_skip, {ct_cth_empty_SUITE, end_per_suite,"Test skip"}},
-     {?eh,cth,{'_',on_tc_skip,[end_per_suite,{tc_auto_skip,"Test skip"},[]]}},
+     {?eh,tc_user_skip, {ct_cth_empty_SUITE, end_per_suite,"Test skip"}},
      
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,cth,{'_',terminate,[[]]}},
@@ -1187,6 +1252,27 @@ test_events(data_dir) ->
      {?eh,stop_logging,[]}
     ];
 
+test_events(cth_log) ->
+    [{?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,tc_start,{cth_log_SUITE,init_per_suite}},
+
+     {parallel,
+      [{?eh,tc_start,{ct_framework,{init_per_group,g1,
+				    [{suite,cth_log_SUITE},parallel]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g1,
+				   [{suite,cth_log_SUITE},parallel]},ok}},
+       {?eh,test_stats,{30,0,{0,0}}},
+       {?eh,tc_start,{ct_framework,{end_per_group,g1,
+				    [{suite,cth_log_SUITE},parallel]}}},
+       {?eh,tc_done,{ct_framework,{end_per_group,g1,
+				   [{suite,cth_log_SUITE},parallel]},ok}}]},
+       
+     {?eh,tc_done,{cth_log_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ];
+
 test_events(ok) ->
     ok.
 
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
new file mode 100644
index 0000000000..18dd07e87e
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/cth_log_SUITE.erl
@@ -0,0 +1,124 @@
+%%
+%% %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%
+%%
+
+-module(cth_log_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) ->
+    Gen = spawn(fun() -> gen() end),
+    [{gen,Gen}|Config].
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(Config) ->
+    Gen = proplists:get_value(gen, Config),
+    exit(Gen, kill),
+    timer:sleep(100),
+    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,{repeat,10}],[tc1,tc2,tc3]}].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [{group,g1}].
+
+tc1(_) ->
+    ct:sleep(100),
+    ok.
+tc2(_) ->
+    ct:sleep(100),
+    ok.
+tc3(_) ->
+    ct:sleep(100),
+    ok.
+
+%%%-----------------------------------------------------------------
+
+gen() ->
+    gen_loop(1).
+
+gen_loop(N) ->
+    ct:log("Logger iteration: ~p", [N]),
+    error_logger:error_report(N),
+    ct:sleep(200),
+    gen_loop(N+1).
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl
new file mode 100644
index 0000000000..ece4eb2247
--- /dev/null
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/skip_pre_end_cth.erl
@@ -0,0 +1,74 @@
+%%

+%% %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%

+%%

+

+

+-module(skip_pre_end_cth).

+

+

+-include_lib("common_test/src/ct_util.hrl").

+-include_lib("common_test/include/ct_event.hrl").

+

+

+%% CT Hooks

+-compile(export_all).

+

+init(Id, Opts) ->

+    empty_cth:init(Id, Opts).

+    

+

+pre_init_per_suite(Suite, Config, State) ->

+    empty_cth:pre_init_per_suite(Suite,Config,State).

+

+post_init_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_init_per_suite(Suite,Config,Return,State).

+

+pre_end_per_suite(Suite,Config,State) ->

+    empty_cth:pre_end_per_suite(Suite,Config,State),

+    {{skip, "Test skip"}, State}.

+

+post_end_per_suite(Suite,Config,Return,State) ->

+    empty_cth:post_end_per_suite(Suite,Config,Return,State).

+

+pre_init_per_group(Group,Config,State) ->

+    empty_cth:pre_init_per_group(Group,Config,State).

+

+post_init_per_group(Group,Config,Return,State) ->

+    empty_cth:post_init_per_group(Group,Config,Return,State).

+

+pre_end_per_group(Group,Config,State) ->

+    empty_cth:pre_end_per_group(Group,Config,State),

+    {{skip, "Test skip"}, State}.

+

+post_end_per_group(Group,Config,Return,State) ->

+    empty_cth:post_end_per_group(Group,Config,Return,State).

+

+pre_init_per_testcase(TC,Config,State) ->

+    empty_cth:pre_init_per_testcase(TC,Config,State).

+

+post_end_per_testcase(TC,Config,Return,State) ->

+    empty_cth:post_end_per_testcase(TC,Config,Return,State).

+

+on_tc_fail(TC, Reason, State) ->

+    empty_cth:on_tc_fail(TC,Reason,State).

+

+on_tc_skip(TC, Reason, State) ->

+    empty_cth:on_tc_skip(TC,Reason,State).

+

+terminate(State) ->

+    empty_cth:terminate(State).

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
index 0535eb924b..2bcfeeec0c 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -84,7 +84,9 @@ all() ->
 	     no_host,
 	     no_port,
 	     invalid_opt,
+	     timeout_close_session,
 	     get,
+	     timeout_get,
 	     get_xpath,
 	     get_config,
 	     get_config_xpath,
@@ -143,11 +145,10 @@ init_per_suite(Config) ->
     end.
 
 end_per_suite(Config) ->
-    PrivDir = ?config(priv_dir, Config),
     ?NS:stop(?config(server,Config)),
     ssh:stop(),
     crypto:stop(),
-    remove_id_keys(PrivDir),
+    remove_id_keys(Config),
     Config.
 
 hello(Config) ->
@@ -344,6 +345,15 @@ invalid_opt(Config) ->
     {error,{invalid_option,{some_other_opt,true}}} = ct_netconfc:open(Opts2),
     ok.
 
+timeout_close_session(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect('close-session'),
+    true = erlang:is_process_alive(Client),
+    {error,timeout} = ct_netconfc:close_session(Client,1000),
+    false = erlang:is_process_alive(Client),
+    ok.
+
 get(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
@@ -354,6 +364,15 @@ get(Config) ->
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
+timeout_get(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect('get'),
+    {error,timeout} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]},1000),
+    ?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),
@@ -698,7 +717,7 @@ timeout_receive_chunked_data(Config) ->
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
-%% Same as receive_chunked_data, but timeout waiting for last part.
+%% Same as receive_chunked_data, but close while waiting for last part.
 close_while_waiting_for_chunked_data(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
@@ -886,6 +905,19 @@ create_subscription(Config) ->
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client8),
 
+    %% Multiple filters
+    {ok,Client9} = open_success(DataDir),
+    ?NS:expect_reply({'create-subscription',[stream,filter]},ok),
+    MultiFilters = [{event,[{xmlns,"http://my.namespaces.com/event"}],
+		     [{eventClass,["fault"]},
+		      {severity,["critical"]}]},
+		    {event,[{xmlns,"http://my.namespaces.com/event"}],
+		     [{eventClass,["fault"]},
+		      {severity,["major"]}]}],
+    ?ok = ct_netconfc:create_subscription(Client9,MultiFilters),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client9),
+
     ok.
 
 receive_event(Config) ->
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 09217f60a3..fb0734d48e 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -98,8 +98,9 @@ start(Dir) ->
 
 %% Stop the netconf server
 stop(Pid) ->
-    Pid ! {stop,self()},
-    receive stopped -> ok end.
+    Ref = erlang:monitor(process,Pid),
+    Pid ! stop,
+    receive {'DOWN',Ref,process,Pid,_} -> ok end.
 
 %% Set the session id for the hello message.
 %% If this is not called prior to starting the session, no hello
@@ -177,9 +178,9 @@ init_server(Dir) ->
 
 loop(Daemon) ->
     receive
-	{stop,From} ->
+	stop ->
 	    ssh:stop_daemon(Daemon),
-	    From ! stopped;
+	    ok;
 	{table_trans,Fun,Args,From} ->
 	    %% Simple transaction mechanism for ets table
 	    R = apply(Fun,Args),
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
new file mode 100644
index 0000000000..5de1ecc2bd
--- /dev/null
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE.erl
@@ -0,0 +1,255 @@
+%%
+%% %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_pre_post_test_io_SUITE
+%%%
+%%% Description:
+%%%
+%%% Test that ct:log/2 printouts and error/progress reports that happen
+%%% before or after the test run are saved in the pre/post test IO log.
+%%%-------------------------------------------------------------------
+-module(ct_pre_post_test_io_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) ->
+    DataDir = ?config(data_dir, Config),
+    CTH = filename:join(DataDir, "cth_ctrl.erl"),
+    ct:pal("Compiling ~p: ~p",
+	   [CTH,compile:file(CTH,[{outdir,DataDir},debug_info])]),
+    ct_test_support:init_per_suite([{path_dirs,[DataDir]},
+				    {start_sasl,true} | Config]).
+
+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() ->
+    [
+     pre_post_io
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+pre_post_io(Config) ->
+    TC = pre_post_io,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "dummy_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},{ct_hooks,[cth_ctrl]}],
+			 Config),
+    
+    %%!--------------------------------------------------------------------
+    %%! Note that error reports will not start showing up in the pre-test
+    %%! io log until handle_remote_events has been set to true (see below).
+    %%! The reason is that the error logger has its group leader on the
+    %%! test_server node (not the ct node) and cth_log_redirect ignores
+    %%! events with remote destination until told otherwise.
+    %%!--------------------------------------------------------------------
+
+    spawn(fun() ->
+		  ct:pal("CONTROLLER: Started!", []),
+		  %% --- test run 1 ---
+		  timer:sleep(3000),
+		  ct:pal("CONTROLLER: Handle remote events = true", []),
+		  ok = ct_test_support:ct_rpc({cth_log_redirect,
+					       handle_remote_events,
+					       [true]}, Config),
+		  timer:sleep(2000),
+		  ct:pal("CONTROLLER: Proceeding with test run #1!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  timer:sleep(6000),
+		  ct:pal("CONTROLLER: Proceeding with shutdown #1!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  %% --- test run 2 ---
+		  timer:sleep(3000),
+		  ct:pal("CONTROLLER: Handle remote events = true", []),
+		  ok = ct_test_support:ct_rpc({cth_log_redirect,
+					       handle_remote_events,
+					       [true]}, Config),
+		  timer:sleep(2000),
+		  ct:pal("CONTROLLER: Proceeding with test run #2!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config),
+		  timer:sleep(6000),
+		  ct:pal("CONTROLLER: Proceeding with shutdown #2!", []),
+		  ok = ct_test_support:ct_rpc({cth_ctrl,proceed,[]}, Config)
+	  end),
+    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),
+    
+    LogDirs = lists:flatmap(fun({_EH,#event{name=start_logging,data=Dir}}) ->
+				    [Dir];
+			       (_) ->
+				    []
+			    end, Events),
+    PrePostIoFiles =
+	[filename:join(LogDir, "misc_io.log.html") || LogDir <- LogDirs],
+    lists:foreach(
+      fun(PrePostIoFile) ->
+	      ct:log("Reading Pre/Post Test IO Log file: ~ts", [PrePostIoFile]),
+	      {ok,Bin} = file:read_file(PrePostIoFile),
+	      Ts = string:tokens(binary_to_list(Bin),[$\n]),
+	      PrePostIOEntries =
+		  lists:foldl(fun([$L,$o,$g,$g,$e,$r|_],
+				  {pre,PreLogN,PreErrN,0,0}) ->
+				      {pre,PreLogN+1,PreErrN,0,0};
+				 ([$=,$E,$R,$R,$O,$R|_],
+				  {pre,PreLogN,PreErrN,0,0}) ->
+				      {pre,PreLogN,PreErrN+1,0,0};
+				 ([_,_,_,_,$P,$O,$S,$T,$-,$T,$E,$S,$T|_],
+				  {pre,PreLogN,PreErrN,0,0}) ->
+				      {post,PreLogN,PreErrN,0,0};
+				 ([$L,$o,$g,$g,$e,$r|_],
+				  {post,PreLogN,PreErrN,PostLogN,PostErrN}) ->
+				      {post,PreLogN,PreErrN,PostLogN+1,PostErrN};
+				 ([$=,$E,$R,$R,$O,$R|_],
+				  {post,PreLogN,PreErrN,PostLogN,PostErrN}) ->
+				      {post,PreLogN,PreErrN,PostLogN,PostErrN+1};
+				 (_, Counters) ->
+				      Counters
+			      end, {pre,0,0,0,0}, Ts),
+	      [_|Counters] = tuple_to_list(PrePostIOEntries),
+	      ct:log("Entries in the Pre/Post Test IO Log: ~p", [Counters]),
+	      case [C || C <- Counters, C < 2] of
+		  [] ->
+		      ok;
+		  _ ->
+		      exit("Not enough entries in the Pre/Post Test IO Log!")
+	      end
+      end, PrePostIoFiles), 
+
+    UnexpIoFiles =
+	[filelib:wildcard(
+	   filename:join(LogDir,
+			 "*dummy_SUITE.logs/run.*/"
+			 "unexpected_io.log.html")) || LogDir <- LogDirs],
+    lists:foreach(
+      fun(UnexpIoFile) ->
+	      ct:log("Reading Unexpected IO Log file: ~ts", [UnexpIoFile]),
+	      {ok,Bin} = file:read_file(UnexpIoFile),
+	      Ts = string:tokens(binary_to_list(Bin),[$\n]),
+	      UnexpIOEntries =
+		  lists:foldl(fun([$L,$o,$g,$g,$e,$r|_], [LogN,ErrN]) ->
+				      [LogN+1,ErrN];
+				 ([$=,$E,$R,$R,$O,$R|_], [LogN,ErrN]) ->
+				      [LogN,ErrN+1];
+				 (_, Counters) -> Counters
+			      end, [0,0], Ts),
+	      ct:log("Entries in the Unexpected IO Log: ~p", [UnexpIOEntries]),
+	      case [N || N <- UnexpIOEntries, N < 2] of
+		  [] ->
+		      ok;
+		  _ ->
+		      exit("Not enough entries in the Unexpected IO Log!")
+	      end
+      end, UnexpIoFiles),
+    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(pre_post_io) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,7}},
+     {?eh,tc_start,{dummy_SUITE,init_per_suite}},
+     {?eh,tc_done,{dummy_SUITE,init_per_suite,ok}},
+     {parallel,
+      [{?eh,tc_start,{dummy_SUITE,{init_per_group,g1,[parallel]}}},
+       {?eh,tc_done,
+	{dummy_SUITE,{init_per_group,g1,[parallel]},ok}},
+       {?eh,tc_start,{dummy_SUITE,tc1}},
+       {?eh,tc_start,{dummy_SUITE,tc2}},
+       {?eh,tc_start,{dummy_SUITE,tc3}},
+       {?eh,tc_done,{dummy_SUITE,tc2,ok}},
+       {?eh,tc_done,{dummy_SUITE,tc1,ok}},
+       {?eh,tc_done,{dummy_SUITE,tc3,ok}},
+       {?eh,test_stats,{1,0,{0,0}}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,test_stats,{3,0,{0,0}}},
+       {?eh,tc_start,{dummy_SUITE,{end_per_group,g1,[parallel]}}},
+       {?eh,tc_done,{dummy_SUITE,{end_per_group,g1,[parallel]},ok}}]},
+     {?eh,tc_start,{dummy_SUITE,tc1}},
+     {?eh,tc_done,{dummy_SUITE,tc1,ok}},
+     {?eh,test_stats,{4,0,{0,0}}},
+     {?eh,tc_start,{dummy_SUITE,tc2}},
+     {?eh,tc_done,{dummy_SUITE,tc2,ok}},
+     {?eh,test_stats,{5,0,{0,0}}},
+     [{?eh,tc_start,{dummy_SUITE,{init_per_group,g2,[]}}},
+      {?eh,tc_done,{dummy_SUITE,{init_per_group,g2,[]},ok}},
+      {?eh,tc_start,{dummy_SUITE,tc4}},
+      {?eh,tc_done,{dummy_SUITE,tc4,ok}},
+      {?eh,test_stats,{6,0,{0,0}}},
+      {?eh,tc_start,{dummy_SUITE,tc5}},
+      {?eh,tc_done,{dummy_SUITE,tc5,ok}},
+      {?eh,test_stats,{7,0,{0,0}}},
+      {?eh,tc_start,{dummy_SUITE,{end_per_group,g2,[]}}},
+      {?eh,tc_done,{dummy_SUITE,{end_per_group,g2,[]},ok}}],
+     {?eh,tc_start,{dummy_SUITE,end_per_suite}},
+     {?eh,tc_done,{dummy_SUITE,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}].
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
new file mode 100644
index 0000000000..2ba991fc61
--- /dev/null
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/cth_ctrl.erl
@@ -0,0 +1,108 @@
+%%
+%% %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(cth_ctrl).
+
+-export([proceed/0,
+	 init/2, terminate/1]).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+proceed() ->
+    ?MODULE ! proceed,
+    ok.
+
+%%--------------------------------------------------------------------
+%% Hook functions
+%%--------------------------------------------------------------------
+init(_Id, _Opts) ->
+    case lists:keyfind(sasl, 1, application:which_applications()) of
+	false ->
+	    exit(sasl_not_started);
+	_Else ->
+	    ok
+    end,
+    WhoAmI = self(),
+    WhoAmI = whereis(?CT_HOOK_INIT_PROCESS),
+    DispPid = spawn_link(fun() -> dispatcher(WhoAmI) end),
+    register(?MODULE, DispPid),
+    ct:pal("~n~n+++ Startup of ~w on ~p finished, "
+	   "call ~w:proceed() to run tests...~n",
+	   [?MODULE,node(),?MODULE]),
+    start_external_logger(cth_logger),
+    receive
+	{?MODULE,proceed} -> ok
+    after
+	10000 ->
+	    ok
+    end,
+    {ok,[],ct_last}.
+
+terminate(_State) ->
+    WhoAmI = whereis(?CT_HOOK_TERMINATE_PROCESS),
+    WhoAmI = self(),
+    ct:pal("~n~n+++ Tests finished, call ~w:proceed() to shut down...~n",
+	   [?MODULE]),
+    receive
+	{?MODULE,proceed} -> ok
+    after
+       10000 ->
+	    ok
+    end,
+    stop_external_logger(cth_logger),
+    stop_dispatcher(),
+    ok.
+
+%%%===================================================================
+%%% Internal functions
+%%%===================================================================
+
+start_external_logger(Name) ->
+    case whereis(Name) of
+	undefined -> ok;
+	Pid -> exit(Pid, kill)
+    end,
+    spawn(fun() -> init_logger(Name) end).
+
+stop_external_logger(Name) ->
+    catch exit(whereis(Name), kill).
+
+init_logger(Name) ->
+    register(Name, self()),
+    logger_loop(1).
+
+logger_loop(N) ->
+    ct:log("Logger iteration: ~p", [N]),
+    error_logger:error_report(N),
+    timer:sleep(250),
+    logger_loop(N+1).
+
+%%%-----------------------------------------------------------------
+
+dispatcher(SendTo) ->
+    receive Msg -> SendTo ! {?MODULE,Msg} end,
+    dispatcher(SendTo).
+
+stop_dispatcher() ->
+    catch exit(whereis(?MODULE), kill).
+	    
+
diff --git a/lib/common_test/test/ct_pre_post_test_io_SUITE_data/dummy_SUITE.erl b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/dummy_SUITE.erl
new file mode 100644
index 0000000000..ac9c4efd31
--- /dev/null
+++ b/lib/common_test/test/ct_pre_post_test_io_SUITE_data/dummy_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%
+%%
+-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) ->
+    ct:sleep(500),
+    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]},
+     {g2,[],[tc4,tc5]}].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [{group,g1},tc1,tc2,{group,g2}].
+
+tc1(_C) ->
+    ok.
+tc2(_C) ->
+    ok.
+tc3(_C) ->
+    ok.
+tc4(_C) ->
+    ok.
+tc5(_C) ->
+    ok.
diff --git a/lib/common_test/test/ct_repeat_1_SUITE.erl b/lib/common_test/test/ct_repeat_1_SUITE.erl
index 090002d0c2..98eaa28763 100644
--- a/lib/common_test/test/ct_repeat_1_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_1_SUITE.erl
@@ -229,7 +229,7 @@ test_events(repeat_cs_and_grs) ->
 			  {failed,{repeat_1_SUITE,init_per_group,
 				   {'EXIT',fails_on_purpose}}}}},
        {?eh,test_stats,{3,1,{0,1}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			  {failed,{repeat_1_SUITE,init_per_group,
 				   {'EXIT',fails_on_purpose}}}}}],
       {?eh,test_stats,{4,1,{0,1}}},
@@ -251,7 +251,7 @@ test_events(repeat_cs_and_grs) ->
 			  {failed,{repeat_1_SUITE,init_per_group,
 				   {'EXIT',fails_on_purpose}}}}},
        {?eh,test_stats,{7,2,{0,2}}},
-       {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+       {?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			  {failed,{repeat_1_SUITE,init_per_group,
 				   {'EXIT',fails_on_purpose}}}}}],
       {?eh,test_stats,{8,2,{0,2}}},
@@ -311,7 +311,7 @@ test_events(repeat_seq) ->
 		      {init_per_group,gr_fail_init,[]},
 		      {failed,{error,fails_on_purpose}}}},
 	{?eh,test_stats,{7,2,{0,5}}},
-	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			   {failed,
 			    {repeat_1_SUITE,init_per_group,
 			     {'EXIT',fails_on_purpose}}}}}],
@@ -410,7 +410,7 @@ test_events(repeat_gr_until_any_ok) ->
 		      {init_per_group,gr_fail_init,[]},
 		      {failed,{error,fails_on_purpose}}}},
 	{?eh,test_stats,{1,1,{0,1}}},
-	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',fails_on_purpose}}}}}],
        {?eh,test_stats,{1,2,{0,1}}},
@@ -452,7 +452,7 @@ test_events(repeat_gr_until_any_ok) ->
 		      {init_per_group,gr_fail_init,[]},
 		      {failed,{error,fails_on_purpose}}}},
          {?eh,test_stats,{5,6,{0,3}}},
-         {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+         {?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			    {failed,{repeat_1_SUITE,init_per_group,
 				     {'EXIT',fails_on_purpose}}}}}],
        {?eh,tc_done,{repeat_1_SUITE,
@@ -469,7 +469,7 @@ test_events(repeat_gr_until_any_ok) ->
 		       {init_per_group,gr_fail_init,[]},
 		       {failed,{error,fails_on_purpose}}}},
 	 {?eh,test_stats,{7,7,{0,4}}},
-	 {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	 {?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			    {failed,{repeat_1_SUITE,init_per_group,
 				     {'EXIT',fails_on_purpose}}}}}],
        {?eh,tc_done,{repeat_1_SUITE,
@@ -770,7 +770,7 @@ test_events(repeat_gr_until_any_fail) ->
                        {'EXIT',failing_this_time}}}}},
        {?eh,test_stats,{14,0,{0,1}}},
        {?eh,tc_auto_skip,
-           {repeat_1_SUITE,end_per_group,
+           {repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init},
                {failed,
                    {repeat_1_SUITE,init_per_group,
                        {'EXIT',failing_this_time}}}}}],
@@ -967,7 +967,7 @@ test_events(repeat_gr_until_all_ok) ->
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',failing_this_time}}}}},
 	{?eh,test_stats,{7,1,{0,1}}},
-	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init_then_ok},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',failing_this_time}}}}}],
        {?eh,tc_done,{repeat_1_SUITE,tc_ok_1,ok}},
@@ -1083,7 +1083,7 @@ test_events(repeat_gr_until_all_fail) ->
 		      {init_per_group,gr_fail_init,[]},
 		      {failed,{error,fails_on_purpose}}}},
 	{?eh,test_stats,{0,1,{0,1}}},
-	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',fails_on_purpose}}}}}],
        {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,ok}},
@@ -1102,7 +1102,7 @@ test_events(repeat_gr_until_all_fail) ->
 		      {init_per_group,gr_fail_init,[]},
 		      {failed,{error,fails_on_purpose}}}},
         {?eh,test_stats,{2,2,{0,2}}},
-        {?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+        {?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_fail_init},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',fails_on_purpose}}}}}],
        {?eh,tc_done,{repeat_1_SUITE,tc_ok_then_fail_1,
@@ -1134,7 +1134,7 @@ test_events(repeat_gr_until_all_fail) ->
 		      {init_per_group,gr_ok_then_fail_init,[]},
 		      {failed,{error,failing_this_time}}}},
 	{?eh,test_stats,{4,4,{0,3}}},
-	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',failing_this_time}}}}}],
        {?eh,tc_start,{repeat_1_SUITE,tc_fail_1}},
@@ -1293,7 +1293,7 @@ test_events(repeat_seq_until_any_fail) ->
 		      {init_per_group,gr_ok_then_fail_init,[]},
 		      {failed,{error,failing_this_time}}}},
 	{?eh,test_stats,{24,1,{0,5}}},
-	{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init},
 			   {failed,{repeat_1_SUITE,init_per_group,
 				    {'EXIT',failing_this_time}}}}}],
        {?eh,tc_auto_skip,{repeat_1_SUITE,tc_ok_1,
@@ -1516,7 +1516,7 @@ test_events(repeat_shuffled_seq_until_any_fail) ->
 		      {init_per_group,repeat_shuffled_seq_until_any_fail_5,
 		       [{shuffle,'_'},{repeat_until_any_fail,2},
 			sequence]},ok}},
-	[{?eh,tc_auto_skip,{repeat_1_SUITE,end_per_group,
+	[{?eh,tc_auto_skip,{repeat_1_SUITE,{end_per_group,gr_ok_then_fail_init},
 			    {failed,{repeat_1_SUITE,init_per_group,
 				     {'EXIT',failing_this_time}}}}}],
 	{?eh,tc_start,{repeat_1_SUITE,
diff --git a/lib/common_test/test/ct_repeat_testrun_SUITE.erl b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
index 35d67a10f2..bb2aba2c5a 100644
--- a/lib/common_test/test/ct_repeat_testrun_SUITE.erl
+++ b/lib/common_test/test/ct_repeat_testrun_SUITE.erl
@@ -36,7 +36,7 @@
 
 -define(eh, ct_test_support_eh).
 -define(skip_reason, "Repeated test stopped by force_stop option").
--define(skipped, {skipped, ?skip_reason}).
+-define(skipped, {auto_skipped, ?skip_reason}).
 
 
 %% Timers used in this test.
@@ -78,7 +78,7 @@ init_per_suite(Config0) ->
     {1,0,{0,0}} = ct_test_support:run(ct,run_test,[Opts2],Config),
 
     %% Time the shortest testcase to use for offset
-    {T0,{1,0,{0,0}}} = timer:tc(ct_test_support,run,[ct,run_test,[Opts1],Config]),
+    {_T0,{1,0,{0,0}}} = timer:tc(ct_test_support,run,[ct,run_test,[Opts1],Config]),
 
     %% -2 is to ensure we hit inside the target test case and not after
 %    T = round(T0/1000000)-2,
@@ -222,7 +222,7 @@ until_force_stop_skip_rest_group(Config) when is_list(Config) ->
 	fun() ->
 		[_] = ct_test_support:run_ct_run_test(
 			Opts++[{until,until_str(?t3,1,Config)}],Config),
-		0 = ct_test_support:run_ct_script_start(
+		1 = ct_test_support:run_ct_script_start(
 		      Opts++[{until,until_str(?t3,1,Config)}],Config)
 	end,
     ok = execute(ExecuteFun,
@@ -341,19 +341,18 @@ skip_first_tc1(Suite) ->
      {?eh,tc_done,{Suite,tc1,ok}},
      {?eh,test_stats,{'_',0,{0,0}}},
      {?eh,tc_done,{Suite,tc2,?skipped}},
-     {?eh,test_stats,{'_',0,{1,0}}},
+     {?eh,test_stats,{'_',0,{0,1}}},
      {?eh,tc_done,{Suite,{init_per_group,g,[]},?skipped}},
      {?eh,tc_auto_skip,{Suite,tc1,?skip_reason}},
-     {?eh,test_stats,{'_',0,{1,1}}},
+     {?eh,test_stats,{'_',0,{0,2}}},
      {?eh,tc_auto_skip,{Suite,tc2,?skip_reason}},
-     {?eh,test_stats,{'_',0,{1,2}}},
-     {?eh,tc_auto_skip,{Suite,end_per_group,?skip_reason}},
+     {?eh,test_stats,{'_',0,{0,3}}},
+     {?eh,tc_auto_skip,{Suite,{end_per_group,g},?skip_reason}},
      {?eh,tc_done,{Suite,tc2,?skipped}},
-     {?eh,test_stats,{'_',0,{2,2}}},
+     {?eh,test_stats,{'_',0,{0,4}}},
      {?eh,tc_start,{Suite,end_per_suite}},
      {?eh,tc_done,{Suite,end_per_suite,ok}}].
 
-
 skip_tc1_in_group(Suite) ->
     [{?eh,tc_start,{Suite,init_per_suite}},
      {?eh,tc_done,{Suite,init_per_suite,ok}},
@@ -369,10 +368,10 @@ skip_tc1_in_group(Suite) ->
       {?eh,tc_done,{Suite,tc1,ok}},
       {?eh,test_stats,{'_',0,{0,0}}},
       {?eh,tc_done,{Suite,tc2,?skipped}},
-      {?eh,test_stats,{'_',0,{1,0}}},
+      {?eh,test_stats,{'_',0,{0,1}}},
       {?eh,tc_start,{Suite,{end_per_group,g,[]}}},
       {?eh,tc_done,{Suite,{end_per_group,g,[]},ok}}],
      {?eh,tc_done,{Suite,tc2,?skipped}},
-     {?eh,test_stats,{'_',0,{2,0}}},
+     {?eh,test_stats,{'_',0,{0,2}}},
      {?eh,tc_start,{Suite,end_per_suite}},
      {?eh,tc_done,{Suite,end_per_suite,ok}}].
diff --git a/lib/common_test/test/ct_sequence_1_SUITE.erl b/lib/common_test/test/ct_sequence_1_SUITE.erl
index 5facf90656..8c87236838 100644
--- a/lib/common_test/test/ct_sequence_1_SUITE.erl
+++ b/lib/common_test/test/ct_sequence_1_SUITE.erl
@@ -212,7 +212,7 @@ test_events(subgroup_init_fail) ->
 			  {failed,{subgroups_1_SUITE,init_per_group,
 				   {'EXIT',init_per_group_fails_on_purpose}}}}},
        {?eh,test_stats,{0,0,{0,1}}},
-       {?eh,tc_auto_skip,{subgroups_1_SUITE,end_per_group,
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,{end_per_group,fail_init},
              {failed,{subgroups_1_SUITE,init_per_group,
 		      {'EXIT',init_per_group_fails_on_purpose}}}}}],
       {?eh,tc_auto_skip,{subgroups_1_SUITE,ok_tc,{group_result,fail_init,failed}}},
@@ -294,7 +294,7 @@ test_events(case_after_subgroup_fail_init) ->
 			   {subgroups_1_SUITE,init_per_group,
 			    {'EXIT',init_per_group_fails_on_purpose}}}}},
        {?eh,test_stats,{0,0,{0,1}}},
-       {?eh,tc_auto_skip,{subgroups_1_SUITE,end_per_group,
+       {?eh,tc_auto_skip,{subgroups_1_SUITE,{end_per_group,fail_init},
 			  {failed,
 			   {subgroups_1_SUITE,init_per_group,
 			    {'EXIT',init_per_group_fails_on_purpose}}}}}],
diff --git a/lib/common_test/test/ct_skip_SUITE.erl b/lib/common_test/test/ct_skip_SUITE.erl
index b8be55f43a..b0a6c839a2 100644
--- a/lib/common_test/test/ct_skip_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE.erl
@@ -59,7 +59,7 @@ end_per_testcase(TestCase, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [auto_skip, user_skip].
+    [auto_skip, user_skip, testspec_skip].
 
 groups() -> 
     [].
@@ -91,7 +91,8 @@ auto_skip(Config) when is_list(Config) ->
 	      Join(DataDir, "auto_skip_8_SUITE"),
 	      Join(DataDir, "auto_skip_9_SUITE"),
 	      Join(DataDir, "auto_skip_10_SUITE"),
-	      Join(DataDir, "auto_skip_11_SUITE")
+	      Join(DataDir, "auto_skip_11_SUITE"),
+	      Join(DataDir, "auto_skip_12_SUITE")
 	     ],
 
     {Opts,ERPid} = setup({suite,Suites}, Config),
@@ -116,7 +117,8 @@ user_skip(Config) when is_list(Config) ->
 	      Join(DataDir, "user_skip_2_SUITE"),	      
 	      Join(DataDir, "user_skip_3_SUITE"),
 	      Join(DataDir, "user_skip_4_SUITE"),
-	      Join(DataDir, "user_skip_5_SUITE")],
+	      Join(DataDir, "user_skip_5_SUITE"),
+	      Join(DataDir, "user_skip_6_SUITE")],
 
     {Opts,ERPid} = setup({suite,Suites}, Config),
     ok = ct_test_support:run(Opts, Config),
@@ -131,8 +133,56 @@ user_skip(Config) when is_list(Config) ->
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
 
 %%%-----------------------------------------------------------------
+%%% 
+testspec_skip(Config) when is_list(Config) ->
+    TestDir = filename:join(?config(data_dir, Config),
+			    filename:join("skip", "test")),
+    TestSpec1 = [{suites, TestDir, user_skip_7_SUITE},
+		 {skip_cases, TestDir, user_skip_7_SUITE, [tc1,tc3], "SKIPPED"}],
+
+    TestSpec2 = [{suites, TestDir, user_skip_7_SUITE},
+		 {skip_groups, TestDir, user_skip_7_SUITE, ptop1, "SKIPPED"}],
+
+    TestSpec3 = [{suites, TestDir, user_skip_7_SUITE},
+		 {skip_groups, TestDir, user_skip_7_SUITE, psub1, "SKIPPED"}],
+
+    TestSpec4 = [{suites, TestDir, user_skip_7_SUITE},
+		 {skip_suites, TestDir, user_skip_7_SUITE, "SKIPPED"}],
+
+    TestSpec5 = [{groups, TestDir, user_skip_6_SUITE, ptop1},
+		 {skip_groups, TestDir, user_skip_6_SUITE, psub1, "SKIPPED"}],
+
+    {Opts,ERPid} = setup_testspec([{ts1,TestSpec1},
+				   {ts2,TestSpec2},
+				   {ts3,TestSpec3},
+				   {ts4,TestSpec4},
+				   {ts5,TestSpec5}], Config),
+
+    ok = ct_test_support:run(Opts, Config),
+
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(testspec_skip, 
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(testspec_skip),
+    ok = ct_test_support:verify_events(TestEvents, Events, Config).
+
+%%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
+setup_testspec(TestSpecs, Config) ->
+    SpecFiles =
+	[begin SpecFile = filename:join(?config(priv_dir, Config),
+					atom_to_list(SpecName)++".spec"),
+	       {ok,Dev} = file:open(SpecFile, [write]),
+	       [io:format(Dev, "~p.~n", [Term]) || Term <- TestSpec],
+	       file:close(Dev),
+	       SpecFile
+	 end || {SpecName,TestSpec} <- TestSpecs],
+    setup({spec,SpecFiles}, Config).
 
 setup(Test, Config) ->
     Opts0 = ct_test_support:get_opts(Config),
@@ -163,7 +213,7 @@ test_events(auto_skip) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{11,11,34}},
+     {?eh,start_info,{12,12,43}},
 
      {?eh,tc_start,{auto_skip_1_SUITE,init_per_suite}},
      {?eh,tc_done,
@@ -196,8 +246,8 @@ test_events(auto_skip) ->
      {?eh,tc_start,{auto_skip_3_SUITE,tc1}},
      {?eh,tc_done,
       {auto_skip_3_SUITE,tc1,
-       {skipped,{failed,{auto_skip_3_SUITE,init_per_testcase,
-			 {{init_per_testcase,tc1,failed},'_'}}}}}},
+       {auto_skipped,{failed,{auto_skip_3_SUITE,init_per_testcase,
+			      {'init_per_testcase for tc1 failed','_'}}}}}},
      {?eh,test_stats,{0,0,{0,4}}},
      {?eh,tc_start,{auto_skip_3_SUITE,tc2}},
      {?eh,tc_done,{auto_skip_3_SUITE,tc2,ok}},
@@ -209,7 +259,7 @@ test_events(auto_skip) ->
      {?eh,tc_done,{auto_skip_4_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{auto_skip_4_SUITE,tc1}},
      {?eh,tc_done,{auto_skip_4_SUITE,tc1,
-		   {skipped,{failed,{auto_skip_4_SUITE,init_per_testcase,
+		   {auto_skipped,{failed,{auto_skip_4_SUITE,init_per_testcase,
 				     {timetrap_timeout,1000}}}}}},
      {?eh,test_stats,{1,0,{0,5}}},     
      {?eh,tc_start,{auto_skip_4_SUITE,tc2}},
@@ -232,8 +282,9 @@ test_events(auto_skip) ->
 				       {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,7}}},
       {?eh,tc_auto_skip,
-       {auto_skip_5_SUITE,end_per_group,{failed,{auto_skip_5_SUITE,init_per_group,
-						 {'EXIT',{group,g1,failed}}}}}}],
+       {auto_skip_5_SUITE,{end_per_group,g1},
+	{failed,{auto_skip_5_SUITE,init_per_group,
+		 {'EXIT',{group,g1,failed}}}}}}],
 
      {?eh,tc_start,{auto_skip_5_SUITE,end_per_suite}},
      {?eh,tc_done,{auto_skip_5_SUITE,end_per_suite,ok}},
@@ -260,8 +311,9 @@ test_events(auto_skip) ->
 				       {'EXIT',{group,g1,failed}}}}}},
       {?eh,test_stats,{2,0,{0,11}}},
       {?eh,tc_auto_skip,
-       {auto_skip_6_SUITE,end_per_group,{failed,{auto_skip_6_SUITE,init_per_group,
-						 {'EXIT',{group,g1,failed}}}}}}],
+       {auto_skip_6_SUITE,{end_per_group,g1},
+	{failed,{auto_skip_6_SUITE,init_per_group,
+		 {'EXIT',{group,g1,failed}}}}}}],
 
      [{?eh,tc_start,{auto_skip_6_SUITE,{init_per_group,g3,[]}}},
       {?eh,tc_done,{auto_skip_6_SUITE,{init_per_group,g3,[]},ok}},
@@ -280,8 +332,9 @@ test_events(auto_skip) ->
 					{'EXIT',{group,g4,failed}}}}}},
        {?eh,test_stats,{3,0,{0,13}}},
        {?eh,tc_auto_skip,
-	{auto_skip_6_SUITE,end_per_group,{failed,{auto_skip_6_SUITE,init_per_group,
-						  {'EXIT',{group,g4,failed}}}}}}],
+	{auto_skip_6_SUITE,{end_per_group,g4},
+	 {failed,{auto_skip_6_SUITE,init_per_group,
+		  {'EXIT',{group,g4,failed}}}}}}],
       {?eh,tc_start,{auto_skip_6_SUITE,tc2}},
       {?eh,tc_done,{auto_skip_6_SUITE,tc2,ok}},
       {?eh,test_stats,{4,0,{0,13}}},
@@ -320,7 +373,7 @@ test_events(auto_skip) ->
      {?eh,test_stats,{5,0,{0,17}}},
      {?eh,tc_start,{auto_skip_9_SUITE,tc2}},
      {?eh,tc_done,{auto_skip_9_SUITE,tc2,
-		   {skipped,{failed,{auto_skip_9_SUITE,init_per_testcase,bad_return}}}}},
+		   {auto_skipped,{failed,{auto_skip_9_SUITE,init_per_testcase,bad_return}}}}},
      {?eh,test_stats,{5,0,{0,18}}},
 
      [{?eh,tc_start,{auto_skip_9_SUITE,{init_per_group,g1,[]}}},
@@ -343,7 +396,7 @@ test_events(auto_skip) ->
       {?eh,tc_done,{auto_skip_9_SUITE,{init_per_group,g3,[]},ok}},
       {?eh,tc_start,{auto_skip_9_SUITE,tc5}},
       {?eh,tc_done,{auto_skip_9_SUITE,tc5,
-		    {skipped,{failed,{auto_skip_9_SUITE,init_per_testcase,bad_return}}}}},
+		    {auto_skipped,{failed,{auto_skip_9_SUITE,init_per_testcase,bad_return}}}}},
       {?eh,test_stats,{7,0,{0,19}}},
       {?eh,tc_start,{auto_skip_9_SUITE,{end_per_group,g3,[]}}},
       {?eh,tc_done,{auto_skip_9_SUITE,{end_per_group,g3,[]},ok}}],
@@ -363,7 +416,7 @@ test_events(auto_skip) ->
 	 {?eh,tc_start,{auto_skip_9_SUITE,tc8}},
 	 {?eh,tc_done,
 	  {auto_skip_9_SUITE,tc8,
-	   {skipped,{failed,{auto_skip_9_SUITE,init_per_testcase,
+	   {auto_skipped,{failed,{auto_skip_9_SUITE,init_per_testcase,
 			     {{badmatch,undefined},'_'}}}}}},
 	 {?eh,tc_start,
 	  {auto_skip_9_SUITE,{end_per_group,g5,[parallel]}}},
@@ -383,26 +436,26 @@ test_events(auto_skip) ->
 
      {?eh,tc_start,{auto_skip_10_SUITE,init_per_suite}},
      {?eh,tc_done,{auto_skip_10_SUITE,init_per_suite,
-		   {skipped,
-		    {require_failed_in_suite0,
-		     {not_available,undefined_config_variable}}}}},
-     {?eh,tc_auto_skip,
-      {auto_skip_10_SUITE,tc1,
-       {require_failed_in_suite0,{not_available,undefined_config_variable}}}},
+		   {auto_skipped,{require_failed_in_suite0,
+				  {not_available,undefined_config_variable}}}}},
+     {?eh,tc_auto_skip,{auto_skip_10_SUITE,tc1,
+			{require_failed_in_suite0,
+			 {not_available,undefined_config_variable}}}},
      {?eh,test_stats,{9,0,{0,21}}},
-     {?eh,tc_auto_skip,
-      {auto_skip_10_SUITE,tc2,
-       {require_failed_in_suite0,{not_available,undefined_config_variable}}}},
+     {?eh,tc_auto_skip,{auto_skip_10_SUITE,tc2,
+			{require_failed_in_suite0,
+			 {not_available,undefined_config_variable}}}},
      {?eh,test_stats,{9,0,{0,22}}},
-     {?eh,tc_auto_skip,
-      {auto_skip_10_SUITE,end_per_suite,
-       {require_failed_in_suite0,{not_available,undefined_config_variable}}}},
+     {?eh,tc_auto_skip,{auto_skip_10_SUITE,end_per_suite,
+			{require_failed_in_suite0,
+			 {not_available,undefined_config_variable}}}},
 
      {?eh,tc_start,{auto_skip_11_SUITE,init_per_suite}},
      {?eh,tc_done,{auto_skip_11_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{auto_skip_11_SUITE,tc1}},
      {?eh,tc_done,{auto_skip_11_SUITE,tc1,
-		   {skipped,{require_failed,{not_available,undefined_config_variable}}}}},
+		   {auto_skipped,{require_failed,
+				  {not_available,undefined_config_variable}}}}},
      {?eh,test_stats,{9,0,{0,23}}},
      {?eh,tc_start,{auto_skip_11_SUITE,tc2}},
      {?eh,tc_done,{auto_skip_11_SUITE,tc2,ok}},
@@ -421,7 +474,8 @@ test_events(auto_skip) ->
 	 {?eh,tc_start,{auto_skip_11_SUITE,tc3}},
 	 {?eh,tc_done,
 	  {auto_skip_11_SUITE,tc3,
-	   {skipped,{require_failed,{not_available,undefined_config_variable}}}}},
+	   {auto_skipped,{require_failed,
+			  {not_available,undefined_config_variable}}}}},
 	 {?eh,test_stats,{10,0,{0,24}}},
 	 {?eh,tc_start,
 	  {auto_skip_11_SUITE,{end_per_group,g2,[parallel]}}},
@@ -434,6 +488,75 @@ test_events(auto_skip) ->
 
      {?eh,tc_start,{auto_skip_11_SUITE,end_per_suite}},
      {?eh,tc_done,{auto_skip_11_SUITE,end_per_suite,ok}},
+     
+     {?eh,tc_start,{auto_skip_12_SUITE,init_per_suite}},
+     {?eh,tc_done,{auto_skip_12_SUITE,init_per_suite,ok}},
+
+     [{?eh,tc_start,{ct_framework,{init_per_group,g1,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g1,
+				  [{suite,auto_skip_12_SUITE}]},
+		    {auto_skipped,
+		     {require_failed,{not_available,unknown_variable_g1}}}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc1,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,25}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc2,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,26}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,27}}},
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g1},
+			 {require_failed,{not_available,unknown_variable_g1}}}}],
+     
+     [{?eh,tc_start,{ct_framework,{init_per_group,g1,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g1,
+				  [{suite,auto_skip_12_SUITE}]},
+		    {auto_skipped,
+		     {require_failed,{not_available,unknown_variable_g1}}}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc1,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,28}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc2,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,29}}},
+      {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
+			 {require_failed,{not_available,unknown_variable_g1}}}},
+      {?eh,test_stats,{10,0,{0,30}}},
+      {?eh,tc_auto_skip,{ct_framework,{end_per_group,g1},
+			 {require_failed,{not_available,unknown_variable_g1}}}}],
+
+     [{?eh,tc_start,{ct_framework,{init_per_group,g3,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{init_per_group,g3,
+				  [{suite,auto_skip_12_SUITE}]},ok}},
+      {?eh,tc_start,{auto_skip_12_SUITE,tc1}},
+      {?eh,tc_done,{auto_skip_12_SUITE,tc1,ok}},
+      {?eh,test_stats,{11,0,{0,30}}},
+      {?eh,tc_start,{auto_skip_12_SUITE,tc2}},
+      {?eh,tc_done,{auto_skip_12_SUITE,tc2,ok}},
+      {?eh,test_stats,{12,0,{0,30}}},
+      [{?eh,tc_start,{ct_framework,{init_per_group,g4,
+				    [{suite,auto_skip_12_SUITE}]}}},
+       {?eh,tc_done,{ct_framework,{init_per_group,g4,
+				   [{suite,auto_skip_12_SUITE}]},
+		     {auto_skipped,
+		      {require_failed,{not_available,unknown_variable_g4}}}}},
+       {?eh,tc_auto_skip,{auto_skip_12_SUITE,tc3,
+			  {require_failed,{not_available,unknown_variable_g4}}}},
+       {?eh,test_stats,{12,0,{0,31}}},
+       {?eh,tc_auto_skip,{ct_framework,{end_per_group,g4},
+			  {require_failed,{not_available,unknown_variable_g4}}}}],
+
+      {?eh,tc_start,{ct_framework,{end_per_group,g3,
+				   [{suite,auto_skip_12_SUITE}]}}},
+      {?eh,tc_done,{ct_framework,{end_per_group,g3,
+				  [{suite,auto_skip_12_SUITE}]},ok}}],
+
+     {?eh,tc_start,{auto_skip_12_SUITE,end_per_suite}},
+     {?eh,tc_done,{auto_skip_12_SUITE,end_per_suite,ok}},
 
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
@@ -442,46 +565,46 @@ test_events(auto_skip) ->
 test_events(user_skip) ->
     [{?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{5,5,27}},
+     {?eh,start_info,{6,6,35}},
 
      {?eh,tc_start,{user_skip_1_SUITE,init_per_suite}},
      {?eh,tc_done,
       {user_skip_1_SUITE,init_per_suite,{skipped,"Whole suite skipped"}}},
-     {?eh,tc_auto_skip,
+     {?eh,tc_user_skip,
       {user_skip_1_SUITE,tc1,"Whole suite skipped"}},
-     {?eh,test_stats,{0,0,{0,1}}},
-     {?eh,tc_auto_skip,
+     {?eh,test_stats,{0,0,{1,0}}},
+     {?eh,tc_user_skip,
       {user_skip_1_SUITE,tc2,"Whole suite skipped"}},
-     {?eh,test_stats,{0,0,{0,2}}},
-     {?eh,tc_auto_skip,
+     {?eh,test_stats,{0,0,{2,0}}},
+     {?eh,tc_user_skip,
       {user_skip_1_SUITE,tc3,"Whole suite skipped"}},
-     {?eh,test_stats,{0,0,{0,3}}},
-     {?eh,tc_auto_skip,
+     {?eh,test_stats,{0,0,{3,0}}},
+     {?eh,tc_user_skip,
       {user_skip_1_SUITE,tc4,"Whole suite skipped"}},
-     {?eh,test_stats,{0,0,{0,4}}},
-     {?eh,tc_auto_skip,
+     {?eh,test_stats,{0,0,{4,0}}},
+     {?eh,tc_user_skip,
       {user_skip_1_SUITE,end_per_suite,"Whole suite skipped"}},
 
      {?eh,tc_start,{user_skip_2_SUITE,init_per_suite}},
      {?eh,tc_done,{user_skip_2_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{user_skip_2_SUITE,tc1}},
      {?eh,tc_done,{user_skip_2_SUITE,tc1,{skipped,{tc1,skipped}}}},
-     {?eh,test_stats,{0,0,{1,4}}},
+     {?eh,test_stats,{0,0,{5,0}}},
 
      [{?eh,tc_start,{user_skip_2_SUITE,{init_per_group,g1,[]}}},
       {?eh,tc_done,{user_skip_2_SUITE,{init_per_group,g1,[]},ok}},
       {?eh,tc_start,{user_skip_2_SUITE,tc2}},
       {?eh,tc_done,{user_skip_2_SUITE,tc2,ok}},
-      {?eh,test_stats,{1,0,{1,4}}},
+      {?eh,test_stats,{1,0,{5,0}}},
       {?eh,tc_start,{user_skip_2_SUITE,tc3}},
       {?eh,tc_done,{user_skip_2_SUITE,tc3,{skipped,{tc3,skipped}}}},
-      {?eh,test_stats,{1,0,{2,4}}},
+      {?eh,test_stats,{1,0,{6,0}}},
       {?eh,tc_start,{user_skip_2_SUITE,{end_per_group,g1,[]}}},
       {?eh,tc_done,{user_skip_2_SUITE,{end_per_group,g1,[]},ok}}],
 
      {?eh,tc_start,{user_skip_2_SUITE,tc4}},
      {?eh,tc_done,{user_skip_2_SUITE,tc4,ok}},
-     {?eh,test_stats,{2,0,{2,4}}},
+     {?eh,test_stats,{2,0,{6,0}}},
      {?eh,tc_start,{user_skip_2_SUITE,end_per_suite}},
      {?eh,tc_done,{user_skip_2_SUITE,end_per_suite,ok}},
 
@@ -489,16 +612,16 @@ test_events(user_skip) ->
      {?eh,tc_done,{user_skip_3_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{user_skip_3_SUITE,tc1}},
      {?eh,tc_done,{user_skip_3_SUITE,tc1,{skipped,"Test case skipped"}}},
-     {?eh,test_stats,{2,0,{3,4}}},
+     {?eh,test_stats,{2,0,{7,0}}},
 
      [{?eh,tc_start,{user_skip_3_SUITE,{init_per_group,g1,[]}}},
       {?eh,tc_done,{user_skip_3_SUITE,{init_per_group,g1,[]},ok}},
       {?eh,tc_start,{user_skip_3_SUITE,tc2}},
       {?eh,tc_done,{user_skip_3_SUITE,tc2,ok}},
-      {?eh,test_stats,{3,0,{3,4}}},
+      {?eh,test_stats,{3,0,{7,0}}},
       {?eh,tc_start,{user_skip_3_SUITE,tc3}},
       {?eh,tc_done,{user_skip_3_SUITE,tc3,{skipped,"Test case skipped"}}},
-      {?eh,test_stats,{3,0,{4,4}}},
+      {?eh,test_stats,{3,0,{8,0}}},
       {?eh,tc_start,{user_skip_3_SUITE,{end_per_group,g1,[]}}},
       {?eh,tc_done,{user_skip_3_SUITE,{end_per_group,g1,[]},ok}}],
 
@@ -506,7 +629,7 @@ test_events(user_skip) ->
      {?eh,tc_done,{user_skip_3_SUITE,tc4,
 		   {skipped,{proc_info,{{current_function,{user_skip_3_SUITE,tc4,1}},
 					{initial_call,{erlang,apply,2}}}}}}},
-     {?eh,test_stats,{3,0,{5,4}}},
+     {?eh,test_stats,{3,0,{9,0}}},
      {?eh,tc_start,{user_skip_3_SUITE,end_per_suite}},
      {?eh,tc_done,{user_skip_3_SUITE,end_per_suite,ok}},
 
@@ -515,63 +638,219 @@ test_events(user_skip) ->
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g1,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g1,[]},{skipped,"Group skipped"}}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,tc1,"Group skipped"}},   
-      {?eh,test_stats,{3,0,{5,5}}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,tc2,"Group skipped"}},
-      {?eh,test_stats,{3,0,{5,6}}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,end_per_group,"Group skipped"}}],
+      {?eh,tc_user_skip,{user_skip_4_SUITE,tc1,"Group skipped"}},   
+      {?eh,test_stats,{3,0,{10,0}}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,tc2,"Group skipped"}},
+      {?eh,test_stats,{3,0,{11,0}}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g1},"Group skipped"}}],
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g2,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g2,[]},ok}},
       {?eh,tc_start,{user_skip_4_SUITE,tc3}},
       {?eh,tc_done,{user_skip_4_SUITE,tc3,ok}},
-      {?eh,test_stats,{4,0,{5,6}}},
+      {?eh,test_stats,{4,0,{11,0}}},
       {?eh,tc_start,{user_skip_4_SUITE,tc4}},
       {?eh,tc_done,{user_skip_4_SUITE,tc4,ok}},
-      {?eh,test_stats,{5,0,{5,6}}},
+      {?eh,test_stats,{5,0,{11,0}}},
       {?eh,tc_start,{user_skip_4_SUITE,{end_per_group,g2,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{end_per_group,g2,[]},ok}}],
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g3,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g3,[]},{skipped,"Group skipped"}}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,tc5,"Group skipped"}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,tc6,"Group skipped"}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,tc7,"Group skipped"}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,tc8,"Group skipped"}},
-      {?eh,test_stats,{5,0,{5,10}}},
-      {?eh,tc_auto_skip,{user_skip_4_SUITE,end_per_group,"Group skipped"}}],
+      {?eh,tc_user_skip,{user_skip_4_SUITE,tc5,"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,tc6,"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,tc7,"Group skipped"}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,tc8,"Group skipped"}},
+      {?eh,test_stats,{5,0,{15,0}}},
+      {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g3},"Group skipped"}}],
 
      [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g5,[]}}},
       {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g5,[]},ok}},
       {?eh,tc_start,{user_skip_4_SUITE,tc9}},
       {?eh,tc_done,{user_skip_4_SUITE,tc9,ok}},
-      {?eh,test_stats,{6,0,{5,10}}},
+      {?eh,test_stats,{6,0,{15,0}}},
       [{?eh,tc_start,{user_skip_4_SUITE,{init_per_group,g6,[]}}},
        {?eh,tc_done,{user_skip_4_SUITE,{init_per_group,g6,[]},{skipped,"Group skipped"}}},
-       {?eh,tc_auto_skip,{user_skip_4_SUITE,tc10,"Group skipped"}},
-       {?eh,test_stats,{6,0,{5,11}}},
-       {?eh,tc_auto_skip,{user_skip_4_SUITE,tc11,"Group skipped"}},
-       {?eh,test_stats,{6,0,{5,12}}},
-       {?eh,tc_auto_skip,{user_skip_4_SUITE,end_per_group,"Group skipped"}}],
+       {?eh,tc_user_skip,{user_skip_4_SUITE,tc10,"Group skipped"}},
+       {?eh,test_stats,{6,0,{16,0}}},
+       {?eh,tc_user_skip,{user_skip_4_SUITE,tc11,"Group skipped"}},
+       {?eh,test_stats,{6,0,{17,0}}},
+       {?eh,tc_user_skip,{user_skip_4_SUITE,{end_per_group,g6},"Group skipped"}}],
        {?eh,tc_start,{user_skip_4_SUITE,{end_per_group,g5,[]}}},
        {?eh,tc_done,{user_skip_4_SUITE,{end_per_group,g5,[]},ok}}],
 
      {?eh,tc_start,{user_skip_4_SUITE,end_per_suite}},
      {?eh,tc_done,{user_skip_4_SUITE,end_per_suite,ok}},
 
-         {ct_test_support_eh,tc_start,{user_skip_5_SUITE,init_per_suite}},
+     {?eh,tc_start,{user_skip_5_SUITE,init_per_suite}},
      {?eh,tc_done,{user_skip_5_SUITE,init_per_suite,
 		   {skipped,{bad,'Whole suite skipped'}}}},
-     {?eh,tc_auto_skip,{user_skip_5_SUITE,tc1,{bad,'Whole suite skipped'}}},
-     {?eh,test_stats,{6,0,{5,13}}},
-     {?eh,tc_auto_skip,{user_skip_5_SUITE,tc2,{bad,'Whole suite skipped'}}},
-     {?eh,test_stats,{6,0,{5,14}}},
-     {?eh,tc_auto_skip,{user_skip_5_SUITE,tc3,{bad,'Whole suite skipped'}}},
-     {?eh,test_stats,{6,0,{5,15}}},
-     {?eh,tc_auto_skip,{user_skip_5_SUITE,tc4,{bad,'Whole suite skipped'}}},
-     {?eh,test_stats,{6,0,{5,16}}},
-     {?eh,tc_auto_skip,{user_skip_5_SUITE,end_per_suite,{bad,'Whole suite skipped'}}},
+     {?eh,tc_user_skip,{user_skip_5_SUITE,tc1,{bad,'Whole suite skipped'}}},
+     {?eh,test_stats,{6,0,{18,0}}},
+     {?eh,tc_user_skip,{user_skip_5_SUITE,tc2,{bad,'Whole suite skipped'}}},
+     {?eh,test_stats,{6,0,{19,0}}},
+     {?eh,tc_user_skip,{user_skip_5_SUITE,tc3,{bad,'Whole suite skipped'}}},
+     {?eh,test_stats,{6,0,{20,0}}},
+     {?eh,tc_user_skip,{user_skip_5_SUITE,tc4,{bad,'Whole suite skipped'}}},
+     {?eh,test_stats,{6,0,{21,0}}},
+     {?eh,tc_user_skip,{user_skip_5_SUITE,end_per_suite,{bad,'Whole suite skipped'}}},
+     
+     {parallel,
+      [{?eh,tc_start,{user_skip_6_SUITE,{init_per_group,ptop1,[parallel]}}},
+       {?eh,tc_done,{user_skip_6_SUITE,
+		     {init_per_group,ptop1,[parallel]},
+		     {skipped,"Top group skipped"}}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc1,"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc2,"Top group skipped"}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,{end_per_group,ptop1},
+			  "Top group skipped"}}]},
+      
+     {parallel,
+      [{?eh,tc_start,{user_skip_6_SUITE,{init_per_group,ptop2,[parallel]}}},
+       {?eh,tc_done,{user_skip_6_SUITE,{init_per_group,ptop2,[parallel]},ok}},
+       {?eh,tc_start,{user_skip_6_SUITE,tc1}},
+       {?eh,tc_done,{user_skip_6_SUITE,tc1,ok}},
+       
+       {parallel,
+	[{?eh,tc_start,{user_skip_6_SUITE,{init_per_group,psub2,[parallel]}}},
+	 {?eh,tc_done,{user_skip_6_SUITE,
+		       {init_per_group,psub2,[parallel]},
+		       {skipped,"Sub group skipped"}}},
+	 {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"Sub group skipped"}},
+	 {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"Sub group skipped"}},
+	 {?eh,tc_user_skip,{user_skip_6_SUITE,{end_per_group,psub2},
+			    "Sub group skipped"}}]},
+       
+       {?eh,tc_start,{user_skip_6_SUITE,tc2}},
+       {?eh,tc_done,{user_skip_6_SUITE,tc2,ok}},
+       {?eh,test_stats,{8,0,{27,0}}},
+       {?eh,tc_start,{user_skip_6_SUITE,{end_per_group,ptop2,[parallel]}}},
+       {?eh,tc_done,{user_skip_6_SUITE,{end_per_group,ptop2,[parallel]},ok}}]},
+       
+       {?eh,test_done,{'DEF','STOP_TIME'}},
+       {?eh,stop_logging,[]}
+    ];
+
+test_events(testspec_skip) ->
+    [
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+     {parallel,
+      [{?eh,tc_start,
+	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]}}},
+       {?eh,tc_done,
+	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]},ok}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,tc1,"SKIPPED"}},
+       {?eh,test_stats,{0,0,{1,0}}},
+       {parallel,
+	[{?eh,tc_start,
+          {user_skip_7_SUITE,{init_per_group,psub1,[parallel]}}},
+	 {?eh,tc_done,
+          {user_skip_7_SUITE,{init_per_group,psub1,[parallel]},ok}},
+	 {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
+	 {?eh,tc_start,{user_skip_7_SUITE,tc4}},
+	 {?eh,tc_done,{user_skip_7_SUITE,tc4,ok}},
+	 {?eh,test_stats,{1,0,{2,0}}},
+	 {?eh,tc_start,
+	  {user_skip_7_SUITE,{end_per_group,psub1,[parallel]}}},
+	 {?eh,tc_done,
+          {user_skip_7_SUITE,{end_per_group,psub1,[parallel]},ok}}]},
+       {?eh,tc_start,{user_skip_7_SUITE,tc2}},
+       {?eh,tc_done,{user_skip_7_SUITE,tc2,ok}},
+       {?eh,test_stats,{2,0,{2,0}}},
+       {?eh,tc_start,
+	{user_skip_7_SUITE,{end_per_group,ptop1,[parallel]}}},
+       {?eh,tc_done,
+	{user_skip_7_SUITE,{end_per_group,ptop1,[parallel]},ok}}]},
+     {?eh,tc_start,{ct_framework,end_per_suite}},
+     {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]},
+     
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{init_per_group,ptop1},"SKIPPED"}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,tc1,"SKIPPED"}},
+     {?eh,test_stats,{0,0,{1,0}}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
+     {?eh,test_stats,{0,0,{2,0}}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,tc4,"SKIPPED"}},
+     {?eh,test_stats,{0,0,{3,0}}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,tc2,"SKIPPED"}},
+     {?eh,test_stats,{0,0,{4,0}}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,{end_per_group,ptop1},"SKIPPED"}},
+     {?eh,tc_start,{ct_framework,end_per_suite}},
+     {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]},
      
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+     {parallel,
+      [{?eh,tc_start,
+	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]}}},
+       {?eh,tc_done,
+	{user_skip_7_SUITE,{init_per_group,ptop1,[parallel]},ok}},
+       {?eh,tc_user_skip,
+	{user_skip_7_SUITE,{init_per_group,psub1},"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,tc3,"SKIPPED"}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,tc4,"SKIPPED"}},
+       {?eh,test_stats,{0,0,{2,0}}},
+       {?eh,tc_user_skip,{user_skip_7_SUITE,{end_per_group,psub1},"SKIPPED"}},
+       {?eh,tc_start,{user_skip_7_SUITE,tc1}},
+       {?eh,tc_done,{user_skip_7_SUITE,tc1,ok}},
+       {?eh,tc_start,{user_skip_7_SUITE,tc2}},
+       {?eh,tc_done,{user_skip_7_SUITE,tc2,ok}},
+       {?eh,test_stats,{2,0,{2,0}}},
+       {?eh,tc_start,{user_skip_7_SUITE,{end_per_group,ptop1,[parallel]}}},
+       {?eh,tc_done,{user_skip_7_SUITE,{end_per_group,ptop1,[parallel]},ok}}]},
+     {?eh,tc_start,{ct_framework,end_per_suite}},
+     {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]},
+
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,0}},
+     {?eh,tc_user_skip,{user_skip_7_SUITE,all,"SKIPPED"}},
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]},
+
+     {?eh,start_logging,{'DEF','RUNDIR'}},
+     {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
+     {?eh,start_info,{1,1,4}},
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+     {parallel,
+      [{?eh,tc_start,{user_skip_6_SUITE,{init_per_group,ptop1,[parallel]}}},
+       {?eh,tc_done,{user_skip_6_SUITE,
+		     {init_per_group,ptop1,[parallel]},
+		     {skipped,"Top group skipped"}}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc1,"Top group skipped"}},
+       {?eh,test_stats,{0,0,{1,0}}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc3,"SKIPPED"}},
+       {?eh,test_stats,{0,0,{2,0}}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc4,"SKIPPED"}},
+       {?eh,test_stats,{0,0,{3,0}}},
+       {?eh,tc_user_skip,{user_skip_6_SUITE,tc2,"Top group skipped"}},
+       {?eh,test_stats,{0,0,{4,0}}},
+       {?eh,tc_user_skip,
+	{user_skip_6_SUITE,{end_per_group,ptop1},"Top group skipped"}}]},
+     {?eh,tc_start,{ct_framework,end_per_suite}},
+     {?eh,tc_done,{ct_framework,end_per_suite,ok}},
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ].
+
+
diff --git a/lib/common_test/test/ct_skip_SUITE_data/skip/test/auto_skip_12_SUITE.erl b/lib/common_test/test/ct_skip_SUITE_data/skip/test/auto_skip_12_SUITE.erl
new file mode 100644
index 0000000000..a168afd386
--- /dev/null
+++ b/lib/common_test/test/ct_skip_SUITE_data/skip/test/auto_skip_12_SUITE.erl
@@ -0,0 +1,121 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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(auto_skip_12_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% 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: group(Name) -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+group(g1) ->
+    [{require,unknown_variable_g1}];
+group(g4) ->
+    [{require,unknown_variable_g4}];
+group(_) ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_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() ->
+    [{g1,[],[tc1,tc2,{g2,[],[tc3]}]},
+     {g1,[],[tc1,tc2,{g2,[],[tc3]}]},
+     {g3,[],[tc1,tc2,{g4,[],[tc3]}]}].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() -> 
+    [{group,g1},
+     {group,g3}].
+
+%%--------------------------------------------------------------------
+%% Function: TestCase(Config0) ->
+%%               ok | exit() | {skip,Reason} | {comment,Comment} |
+%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% Comment = term()
+%%--------------------------------------------------------------------
+tc1(_Config) -> 
+    ok.
+
+tc2(_Config) -> 
+    ok.
+
+tc3(_Config) ->
+    ok.
diff --git a/lib/common_test/test/ct_skip_SUITE_data/skip/test/auto_skip_3_SUITE.erl b/lib/common_test/test/ct_skip_SUITE_data/skip/test/auto_skip_3_SUITE.erl
index cb64cb76c5..4ef9f50514 100644
--- a/lib/common_test/test/ct_skip_SUITE_data/skip/test/auto_skip_3_SUITE.erl
+++ b/lib/common_test/test/ct_skip_SUITE_data/skip/test/auto_skip_3_SUITE.erl
@@ -72,7 +72,7 @@ end_per_group(_GroupName, _Config) ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 init_per_testcase(tc1, _Config) ->
-    exit({init_per_testcase,tc1,failed});
+    exit('init_per_testcase for tc1 failed');
 init_per_testcase(_TestCase, Config) ->
     Config.
 
diff --git a/lib/common_test/test/ct_skip_SUITE_data/skip/test/user_skip_6_SUITE.erl b/lib/common_test/test/ct_skip_SUITE_data/skip/test/user_skip_6_SUITE.erl
new file mode 100644
index 0000000000..5f0e5db6f2
--- /dev/null
+++ b/lib/common_test/test/ct_skip_SUITE_data/skip/test/user_skip_6_SUITE.erl
@@ -0,0 +1,118 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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(user_skip_6_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(ptop1, Config) ->
+    {skip,"Top group skipped"};
+init_per_group(psub2, Config) ->
+    {skip,"Sub group skipped"};
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+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(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_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() ->
+    [{ptop1,[parallel],[tc1,{psub1,[parallel],[tc3,tc4]},tc2]},
+     {ptop2,[parallel],[tc1,{psub2,[parallel],[tc3,tc4]},tc2]}].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() -> 
+    [{group,ptop1},{group,ptop2}].
+
+%%--------------------------------------------------------------------
+%% Function: TestCase(Config0) ->
+%%               ok | exit() | {skip,Reason} | {comment,Comment} |
+%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% Comment = term()
+%%--------------------------------------------------------------------
+tc1(_) ->
+    ok.
+
+tc2(_) ->
+    ok.
+
+tc3(_) ->
+    ok.
+
+tc4(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_skip_SUITE_data/skip/test/user_skip_7_SUITE.erl b/lib/common_test/test/ct_skip_SUITE_data/skip/test/user_skip_7_SUITE.erl
new file mode 100644
index 0000000000..82ce536a79
--- /dev/null
+++ b/lib/common_test/test/ct_skip_SUITE_data/skip/test/user_skip_7_SUITE.erl
@@ -0,0 +1,113 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-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(user_skip_7_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%% Info = [tuple()]
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,30}}].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+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(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%%--------------------------------------------------------------------
+end_per_testcase(_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() ->
+    [{ptop1,[parallel],[tc1,{psub1,[parallel],[tc3,tc4]},tc2]}].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%%--------------------------------------------------------------------
+all() -> 
+    [{group,ptop1}].
+
+%%--------------------------------------------------------------------
+%% Function: TestCase(Config0) ->
+%%               ok | exit() | {skip,Reason} | {comment,Comment} |
+%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% Comment = term()
+%%--------------------------------------------------------------------
+tc1(_) ->
+    ok.
+
+tc2(_) ->
+    ok.
+
+tc3(_) ->
+    ok.
+
+tc4(_) ->
+    ok.
diff --git a/lib/common_test/test/ct_surefire_SUITE.erl b/lib/common_test/test/ct_surefire_SUITE.erl
index b86b47f0a2..c5e44682b0 100644
--- a/lib/common_test/test/ct_surefire_SUITE.erl
+++ b/lib/common_test/test/ct_surefire_SUITE.erl
@@ -182,7 +182,7 @@ test_events(_) ->
      {?eh,test_stats,{1,1,{1,0}}},
      {?eh,tc_start,{surefire_SUITE,tc_autoskip_require}},
      {?eh,tc_done,{surefire_SUITE,tc_autoskip_require,
-		   {skipped,{require_failed,'_'}}}},
+		   {auto_skipped,{require_failed,'_'}}}},
      {?eh,test_stats,{1,1,{1,1}}},
      [{?eh,tc_start,{surefire_SUITE,{init_per_group,g,[]}}},
       {?eh,tc_done,{surefire_SUITE,{init_per_group,g,[]},ok}},
@@ -198,7 +198,7 @@ test_events(_) ->
       {?eh,test_stats,{2,2,{2,1}}},
       {?eh,tc_start,{surefire_SUITE,tc_autoskip_require}},
       {?eh,tc_done,{surefire_SUITE,tc_autoskip_require,
-		    {skipped,{require_failed,'_'}}}},
+		    {auto_skipped,{require_failed,'_'}}}},
       {?eh,test_stats,{2,2,{2,2}}},
       {?eh,tc_start,{surefire_SUITE,{end_per_group,g,[]}}},
       {?eh,tc_done,{surefire_SUITE,{end_per_group,g,[]},ok}}],
@@ -210,7 +210,7 @@ test_events(_) ->
 			  {surefire_SUITE,init_per_group,
 			   {'EXIT',all_cases_should_be_skipped}}}}},
       {?eh,test_stats,{2,2,{2,3}}},
-      {?eh,tc_auto_skip,{surefire_SUITE,end_per_group,
+      {?eh,tc_auto_skip,{surefire_SUITE,{end_per_group,g_fail},
 			 {failed,
 			  {surefire_SUITE,init_per_group,
 			   {'EXIT',all_cases_should_be_skipped}}}}}],
@@ -328,6 +328,7 @@ events_to_result([]) ->
 
 result(ok) ->[];
 result({skipped,_}) -> [s];
+result({auto_skipped,_}) -> [s];
 result({failed,_}) -> [f].
 
 %% Using the expected events' last test_stats element to produce the
diff --git a/lib/common_test/test/ct_telnet_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE.erl
index e2ee207754..acce4eca14 100644
--- a/lib/common_test/test/ct_telnet_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE.erl
@@ -46,6 +46,26 @@
 %% instance, the tests need to be performed on a separate node (or
 %% there will be clashes with logging processes etc).
 %%--------------------------------------------------------------------
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+groups() ->
+    [{legacy, [], [unix_telnet,own_server,timetrap]},
+     {raw,    [], [unix_telnet,own_server,timetrap]},
+     {html,   [], [unix_telnet,own_server]},
+     {silent, [], [unix_telnet,own_server]}].
+
+all() ->
+    [
+     {group,legacy},
+     {group,raw},
+     {group,html},
+     {group,silent}
+    ].
+
+%%--------------------------------------------------------------------
+%% CONFIG FUNCTIONS
+%%--------------------------------------------------------------------
+
 init_per_suite(Config) ->
     ct_test_support:init_per_suite(Config).
 
@@ -67,14 +87,6 @@ end_per_testcase(TestCase, Config) ->
     end,
     ct_test_support:end_per_testcase(TestCase, Config).
 
-suite() -> [{ct_hooks,[ts_install_cth]}].
-
-all() ->
-    [
-     unix_telnet,
-     own_server,
-     timetrap
-    ].
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -82,27 +94,43 @@ all() ->
 
 %%%-----------------------------------------------------------------
 %%%
-unix_telnet(Config) when is_list(Config) ->
-    all_tests_in_suite(unix_telnet,"ct_telnet_basic_SUITE","telnet.cfg",Config).
+unix_telnet(Config) ->
+    CfgFile = "telnet.unix_telnet." ++
+	atom_to_list(groupname(Config)) ++ ".cfg",
+    all_tests_in_suite(unix_telnet,"ct_telnet_basic_SUITE",CfgFile,Config).
 
 own_server(Config) ->
+    CfgFile = "telnet.own_server." ++
+	atom_to_list(groupname(Config)) ++ ".cfg",
     all_tests_in_suite(own_server,"ct_telnet_own_server_SUITE",
-		       "telnet2.cfg",Config).
+		       CfgFile,Config).
 
 timetrap(Config) ->
+    CfgFile = "telnet.timetrap." ++
+	atom_to_list(groupname(Config)) ++ ".cfg",
     all_tests_in_suite(timetrap,"ct_telnet_timetrap_SUITE",
-		       "telnet3.cfg",Config).
+		       CfgFile,Config).
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 
+groupname(Config) ->
+    case proplists:get_value(tc_group_properties, Config) of
+	undefined ->
+	    undefined;
+	TGP ->
+	    proplists:get_value(name, TGP)
+    end.
+
 all_tests_in_suite(TestCase, SuiteName, CfgFileName, Config) ->
+    PrivDir = ?config(priv_dir, Config),
     DataDir = ?config(data_dir, Config),
     Suite = filename:join(DataDir, SuiteName),
-    CfgFile = filename:join(DataDir, CfgFileName),
-    Cfg = telnet_config(TestCase),
-    ok = file:write_file(CfgFile, io_lib:write(Cfg) ++ "."),
+    CfgFile = filename:join(PrivDir, CfgFileName),
+    Cfg = telnet_config(TestCase, groupname(Config)),
+    Txt = lists:flatten([lists:flatten(io_lib:write(C))++".\n" || C <- Cfg]),
+    ok = file:write_file(CfgFile, Txt),
     {Opts,ERPid} = setup([{suite,Suite},
 			  {label,TestCase},
 			  {config,CfgFile}],
@@ -132,15 +160,36 @@ execute(Name, Opts, ERPid, Config) ->
 reformat(Events, EH) ->
     ct_test_support:reformat(Events, EH).
 
-
-telnet_config(unix_telnet) ->
-    {unix, ct:get_config(unix)};
-telnet_config(_) ->
-    {unix,[{telnet,"localhost"},
-	   {port, ?erl_telnet_server_port},
-	   {username,?erl_telnet_server_user},
-	   {password,?erl_telnet_server_pwd},
-	   {keep_alive,true}]}.
+telnet_config(_, undefined) ->
+    [];
+telnet_config(unix_telnet, legacy) ->
+    [{unix, ct:get_config(unix)},
+     {ct_conn_log,[]}];
+%% LogType same as GroupName
+telnet_config(unix_telnet, LogType) ->
+    [{unix, ct:get_config(unix)},
+     {ct_conn_log,
+      [{ct_telnet,[{log_type,LogType},
+		   {hosts,[telnet_server_conn1,
+			   telnet_server_conn2,
+			   telnet_server_conn3,
+			   telnet_server_conn4]}]}]}];
+telnet_config(_, LogType) ->
+    [{unix,[{telnet,"localhost"},
+	    {port, ?erl_telnet_server_port},
+	    {username,?erl_telnet_server_user},
+	    {password,?erl_telnet_server_pwd},
+	    {keep_alive,true}]} |
+     if LogType == legacy -> 
+	     [{ct_conn_log,[]}];
+	true ->
+	     [{ct_conn_log,
+	       [{ct_telnet,[{log_type,LogType},
+			    {hosts,[telnet_server_conn1,
+				    telnet_server_conn2,
+				    telnet_server_conn3,
+				    telnet_server_conn4]}]}]}]
+     end].
 
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
@@ -159,14 +208,39 @@ events_to_check(timetrap,_Config) ->
 all_cases(Suite,Config) ->
     {module,_} = code:load_abs(filename:join(?config(data_dir,Config),
 					     Suite)),
-    TCs = Suite:all(),
+    GroupsAndTCs = Suite:all(),
+
+    Terms =
+	lists:flatmap(
+	  fun({group,G}) ->
+		  {value,{G,Props,GTCs}} =
+		      lists:keysearch(G,1,Suite:groups()),
+		  GTCs1 = [[{?eh,tc_start,{Suite,GTC}},
+			    {?eh,tc_done,{Suite,GTC,ok}}] ||
+			      GTC <- GTCs],
+		  GEvs = [{?eh,tc_start,{Suite,{init_per_group,G,Props}}},
+			  {?eh,tc_done,{Suite,{init_per_group,G,Props},ok}} |
+			  GTCs1] ++
+		         [{?eh,tc_start,{Suite,{end_per_group,G,Props}}},
+			  {?eh,tc_done,{Suite,{end_per_group,G,Props},ok}}],
+		  case lists:member(parallel, Props) of
+		      true -> [{parallel,GEvs}];
+		      false -> GEvs
+		  end;
+	     (TC) ->
+		  [{?eh,tc_done,{Suite,TC,ok}}]
+	  end, GroupsAndTCs),
+    
     code:purge(Suite),
     code:delete(Suite),
 
+    FlatTerms = lists:flatten(Terms),
+
+    ct:log("Verifying with terms:~n~p", [FlatTerms]),
+
     OneTest =
-	[{?eh,start_logging,{'DEF','RUNDIR'}}] ++
-	[{?eh,tc_done,{Suite,TC,ok}} || TC <- TCs] ++
-	[{?eh,stop_logging,[]}],
+	[{?eh,start_logging,{'DEF','RUNDIR'}} |
+	 FlatTerms] ++ [{?eh,stop_logging,[]}],
 
     %% 2 tests (ct:run_test + script_start) is default
     OneTest ++ OneTest.
diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_basic_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_basic_SUITE.erl
index 914b95f9cf..80616af064 100644
--- a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_basic_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_basic_SUITE.erl
@@ -5,45 +5,101 @@
 
 -include_lib("common_test/include/ct.hrl").
 
+-define(no_of_sessions, 4).
+-define(conn_name(N), (list_to_atom("telnet_server_conn"++integer_to_list(N)))).
+-define(get_n(Cfg), (proplists:get_value(n, Cfg))).
+	       
 %%--------------------------------------------------------------------
 %% TEST SERVER CALLBACK FUNCTIONS
 %%--------------------------------------------------------------------
 
+suite() -> [
+	    {require,ct_conn_log},
+ 	    {ct_hooks, [{cth_conn_log,[]}]}
+	   ].
+
+operations() -> 
+    [start_stop, send_and_get, expect, already_closed, 
+     cmd, sendf, close_wrong_type].
+
+mult_case(_Case, 0) ->
+    [];
+mult_case(Case, N) ->
+    [list_to_atom(atom_to_list(Case)++integer_to_list(N)) | 
+     mult_case(Case, N-1)].
+
+groups() -> 
+    [{single_connection,[],operations()},
+     {multiple_connections,[parallel],
+      lists:reverse(mult_case(sessions,?no_of_sessions))}].
+
+all() ->
+    [{group,single_connection},
+     {group,multiple_connections}].
+
 init_per_suite(Config) ->
+    ct:pal("Will use these log hook options: ~p",
+	   [ct:get_config(ct_conn_log,[])]),
     Config.
 
 end_per_suite(_Config) ->
     ok.
 
+init_per_group(Group, Config) ->
+    if Group == single_connection ->
+	    ct:require(?conn_name(1),{unix,[telnet]});
+       true ->
+	    ok
+    end,
+    [{n,1} | Config].
 
-suite() -> [{require,telnet_temp,{unix,[telnet]}}].
+end_per_group(_GroupName, Config) ->
+    Config.
 
-all() -> 
-    [start_stop, send_and_get, expect, already_closed, 
-     cmd, sendf, close_wrong_type].
+init_per_testcase(Case, Config) when (Case == sessions1) or
+				     (Case == sessions2) or
+				     (Case == sessions3) or
+				     (Case == sessions4) ->
+    N = lists:last(atom_to_list(Case))-48,
+    ct:log("Using connection ~w for session ~w on ~w",
+	   [?conn_name(N),N,self()]),
+    ct:require(?conn_name(N),{unix,[telnet]}),
+    [{n,N} | proplists:delete(n,Config)];
+init_per_testcase(Case, Config) ->
+    ct:log("Testcase ~w using connection ~w",
+	   [Case,?conn_name(?get_n(Config))]),
+    Config.
 
-groups() -> 
-    [].
+end_per_testcase(_Case, _) ->
+    ok.
 
-init_per_group(_GroupName, Config) ->
-    Config.
+%%%-----------------------------------------------------------------
+%%% TEST CASES
 
-end_per_group(_GroupName, Config) ->
-    Config.
+sessions(Config) ->
+    [apply(?MODULE,Op,[Config]) || Op <- operations()],
+    ok.
+
+sessions1(Config) -> sessions(Config).
+sessions2(Config) -> sessions(Config).
+sessions3(Config) -> sessions(Config).
+sessions4(Config) -> sessions(Config).
 
-start_stop(_Config) ->
-    {ok, Handle} = ct_telnet:open(telnet_temp),
+start_stop(Config) ->
+    ct:log("Opening ~w...", [?conn_name(?get_n(Config))]),
+    {ok, Handle} = ct_telnet:open(?conn_name(?get_n(Config))),
     ok = ct_telnet:close(Handle),
     ok.
-send_and_get(_) ->
-    {ok, Handle} = ct_telnet:open(telnet_temp),
+
+send_and_get(Config) ->
+    {ok, Handle} = ct_telnet:open(?conn_name(?get_n(Config))),
     ok = ct_telnet:send(Handle, "ayt"),
     {ok, _Data} = ct_telnet:get_data(Handle),
     ok = ct_telnet:close(Handle),
     ok.
     
-expect(_) ->
-    {ok, Handle} = ct_telnet:open(telnet_temp),
+expect(Config) ->
+    {ok, Handle} = ct_telnet:open(?conn_name(?get_n(Config))),
     ok = ct_telnet:send(Handle, "echo ayt"),
     ok = case ct_telnet:expect(Handle, ["ayt"]) of
 	     {ok, _} ->
@@ -54,21 +110,21 @@ expect(_) ->
     ok = ct_telnet:close(Handle),
     ok.
 
-already_closed(_) ->
-    {ok, Handle} = ct_telnet:open(telnet_temp),
+already_closed(Config) ->
+    {ok, Handle} = ct_telnet:open(?conn_name(?get_n(Config))),
     ok = ct_telnet:close(Handle),
     {error, already_closed} = ct_telnet:close(Handle),
     ok.
 
-cmd(_) ->
-    {ok, Handle} = ct_telnet:open(telnet_temp),
+cmd(Config) ->
+    {ok, Handle} = ct_telnet:open(?conn_name(?get_n(Config))),
     {ok, _} = ct_telnet:cmd(Handle, "display"),
     {ok, _} = ct_telnet:cmdf(Handle, "~s ~s", ["set", "bsasdel"]),
     ok = ct_telnet:close(Handle),
     ok.
 
-sendf(_) ->
-    {ok, Handle} = ct_telnet:open(telnet_temp),
+sendf(Config) ->
+    {ok, Handle} = ct_telnet:open(?conn_name(?get_n(Config))),
     ok = ct_telnet:sendf(Handle, "~s", ["ayt"]),
     ok = ct_telnet:close(Handle),
     ok.
@@ -76,3 +132,8 @@ sendf(_) ->
 close_wrong_type(_) ->
     {error, _} = ct_telnet:close(whatever),
     ok.
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCS
+
+	    
diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
index 3f7c0d68bf..8d142e85a8 100644
--- a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl
@@ -8,14 +8,12 @@
 %% TEST SERVER CALLBACK FUNCTIONS
 %%--------------------------------------------------------------------
 
-init_per_suite(Config) ->
-    Config.
-
-end_per_suite(_Config) ->
-    ok.
-
-
-suite() -> [{require,erl_telnet_server,{unix,[telnet]}}].
+suite() ->
+    [
+     {require,telnet_server_conn1,{unix,[telnet]}},
+     {require,ct_conn_log},
+     {ct_hooks, [{cth_conn_log,[]}]}
+    ].
 
 all() ->
     [expect,
@@ -35,6 +33,14 @@ all() ->
 groups() ->
     [].
 
+init_per_suite(Config) ->
+    ct:pal("Will use these log hook options: ~p",
+	   [ct:get_config(ct_conn_log,[])]),
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
     Config.
 
@@ -43,7 +49,7 @@ end_per_group(_GroupName, Config) ->
 
 %% Simple expect
 expect(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo ayt"),
     {ok,["ayt"]} = ct_telnet:expect(Handle, ["ayt"]),
     ok = ct_telnet:close(Handle),
@@ -51,7 +57,7 @@ expect(_) ->
 
 %% Expect with repeat option
 expect_repeat(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_ml xy xy"),
     {ok,[["xy"],["xy"]],done} = ct_telnet:expect(Handle, ["xy"],[{repeat,2}]),
     ok = ct_telnet:close(Handle),
@@ -59,7 +65,7 @@ expect_repeat(_) ->
 
 %% Expect with sequence option
 expect_sequence(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_ml ab cd ef"),
     {ok,[["ab"],["cd"],["ef"]]} = ct_telnet:expect(Handle,
 						   [["ab"],["cd"],["ef"]],
@@ -70,7 +76,7 @@ expect_sequence(_) ->
 %% Check that expect returns when a prompt is found, even if pattern
 %% is not matched.
 expect_error_prompt(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo xxx> yyy"),
     {error,{prompt,"> "}} = ct_telnet:expect(Handle, ["yyy"]),
     ok = ct_telnet:close(Handle),
@@ -80,7 +86,7 @@ expect_error_prompt(_) ->
 %% expected pattern is received - as long as not newline or prompt is
 %% received it will not match.
 expect_error_timeout(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_no_prompt xxx"),
     {error,timeout} = ct_telnet:expect(Handle, ["xxx"], [{timeout,1000}]),
     ok = ct_telnet:close(Handle),
@@ -89,7 +95,7 @@ expect_error_timeout(_) ->
 %% expect with ignore_prompt option should not return even if a prompt
 %% is found. The pattern after the prompt (here "> ") can be matched.
 ignore_prompt(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo xxx> yyy"),
     {ok,["yyy"]} = ct_telnet:expect(Handle, ["yyy"], [ignore_prompt]),
     ok = ct_telnet:close(Handle),
@@ -97,7 +103,7 @@ ignore_prompt(_) ->
 
 %% expect with ignore_prompt and repeat options.
 ignore_prompt_repeat(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_ml yyy> yyy>"),
     {ok,[["yyy"],["yyy"]],done} = ct_telnet:expect(Handle, ["yyy"],
 						   [{repeat,2},
@@ -107,7 +113,7 @@ ignore_prompt_repeat(_) ->
 
 %% expect with ignore_prompt and sequence options.
 ignore_prompt_sequence(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_ml xxx> yyy> zzz> "),
     {ok,[["xxx"],["yyy"],["zzz"]]} = ct_telnet:expect(Handle,
 						      [["xxx"],["yyy"],["zzz"]],
@@ -121,7 +127,7 @@ ignore_prompt_sequence(_) ->
 %% As for expect without the ignore_prompt option, it a newline or a
 %% prompt is required in order for the pattern to match.
 ignore_prompt_timeout(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo xxx"),
     {error,timeout} = ct_telnet:expect(Handle, ["yyy"], [ignore_prompt,
 							 {timeout,1000}]),
@@ -140,7 +146,7 @@ ignore_prompt_timeout(_) ->
 %% no_prompt_check option shall match pattern both when prompt is sent
 %% and when it is not.
 no_prompt_check(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo xxx"),
     {ok,["xxx"]} = ct_telnet:expect(Handle, ["xxx"], [no_prompt_check]),
     ok = ct_telnet:send(Handle, "echo_no_prompt yyy"),
@@ -150,7 +156,7 @@ no_prompt_check(_) ->
 
 %% no_prompt_check and repeat options
 no_prompt_check_repeat(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_ml xxx xxx"),
     {ok,[["xxx"],["xxx"]],done} = ct_telnet:expect(Handle,["xxx"],
 						   [{repeat,2},
@@ -164,7 +170,7 @@ no_prompt_check_repeat(_) ->
 
 %% no_prompt_check and sequence options
 no_prompt_check_sequence(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo_ml_no_prompt ab cd ef"),
     {ok,[["ab"],["cd"],["ef"]]} = ct_telnet:expect(Handle,
 						   [["ab"],["cd"],["ef"]],
@@ -176,7 +182,7 @@ no_prompt_check_sequence(_) ->
 %% Check that expect returns after idle timeout when no_prompt_check
 %% option is used.
 no_prompt_check_timeout(_) ->
-    {ok, Handle} = ct_telnet:open(erl_telnet_server),
+    {ok, Handle} = ct_telnet:open(telnet_server_conn1),
     ok = ct_telnet:send(Handle, "echo xxx"),
     {error,timeout} = ct_telnet:expect(Handle, ["yyy"], [no_prompt_check,
 							 {timeout,1000}]),
diff --git a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_timetrap_SUITE.erl b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_timetrap_SUITE.erl
index f274fb9112..c45a4f0984 100644
--- a/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_timetrap_SUITE.erl
+++ b/lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_timetrap_SUITE.erl
@@ -4,7 +4,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 
--define(name,erl_telnet_server).
+-define(name, telnet_server_conn1).
 
 %%--------------------------------------------------------------------
 %% TEST SERVER CALLBACK FUNCTIONS
@@ -17,6 +17,8 @@ end_per_suite(_Config) ->
     ok.
 
 suite() -> [{require,?name,{unix,[telnet]}},
+	    {require,ct_conn_log},
+ 	    {ct_hooks, [{cth_conn_log,[]}]},
 	    {timetrap,{seconds,7}}].
 
 all() ->
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
index 8e4852369d..9882fa980c 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE.erl
@@ -65,12 +65,12 @@ groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
+
 
-     
 
 %%--------------------------------------------------------------------
 %% TEST CASES
@@ -104,7 +104,7 @@ ts_if_1(Config) when is_list(Config) ->
 
     TestEvents = events_to_check(ts_if_1),
     ok = ct_test_support:verify_events(TestEvents, Events, Config).
-        
+
 
 %%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
@@ -112,17 +112,17 @@ ts_if_1(Config) when is_list(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 ++ [Test,{event_handler,{?eh,EvHArgs}}],
+						%    Level = ?config(trace_level, Config),
+						%    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+						%    Opts = Opts0 ++ [Test,{event_handler,{?eh,EvHArgs}}],
     Opts = [Test | Opts0],
     ERPid = ct_test_support:start_event_receiver(Config),
     {Opts,ERPid}.
 
 reformat(Events, EH) ->
     ct_test_support:reformat(Events, EH).
-%reformat(Events, _EH) ->
-%    Events.
+						%reformat(Events, _EH) ->
+						%    Events.
 
 %%%-----------------------------------------------------------------
 %%% TEST EVENTS
@@ -140,14 +140,15 @@ test_events(ts_if_1) ->
     [
      {?eh,start_logging,{'DEF','RUNDIR'}},
      {?eh,test_start,{'DEF',{'START_TIME','LOGDIR'}}},
-     {?eh,start_info,{10,6,26}},
+     {?eh,start_info,{10,8,25}},
+
      {?eh,tc_start,{ts_if_1_SUITE,init_per_suite}},
      {?eh,tc_done,{ts_if_1_SUITE,init_per_suite,ok}},
      {?eh,tc_start,{ts_if_1_SUITE,tc1}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc1,{skipped,
-				      {failed,
-				       {ts_if_1_SUITE,init_per_testcase,
-					{timetrap_timeout,2000}}}}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc1,
+		   {auto_skipped,
+		    {failed,
+		     {ts_if_1_SUITE,init_per_testcase,{timetrap_timeout,2000}}}}}},
      {?eh,test_stats,{0,0,{0,1}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc2}},
      {?eh,tc_done,{ts_if_1_SUITE,tc2,
@@ -159,115 +160,162 @@ test_events(ts_if_1) ->
      {?eh,tc_start,{ts_if_1_SUITE,tc4}},
      {?eh,tc_done,{ts_if_1_SUITE,tc4,{failed,{error,failed_on_purpose}}}},
      {?eh,test_stats,{1,2,{0,1}}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc5,{skipped,{sequence_failed,seq1,tc4}}}},
-     {?eh,test_stats,{1,2,{1,1}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc5,{auto_skipped,{sequence_failed,seq1,tc4}}}},
+     {?eh,test_stats,{1,2,{0,2}}},
 
      [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,seq2,[sequence]}}},
       {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,seq2,[sequence]},ok}},
       {?eh,tc_start,{ts_if_1_SUITE,tc4}},
       {?eh,tc_done,{ts_if_1_SUITE,tc4,{failed,{error,failed_on_purpose}}}},
-      {?eh,test_stats,{1,3,{1,1}}},
+      {?eh,test_stats,{1,3,{0,2}}},
       {?eh,tc_auto_skip,{ts_if_1_SUITE,tc5,{failed,{ts_if_1_SUITE,tc4}}}},
-      {?eh,test_stats,{1,3,{1,2}}},
+      {?eh,test_stats,{1,3,{0,3}}},
       {?eh,tc_start,{ts_if_1_SUITE,{end_per_group,seq2,[sequence]}}},
       {?eh,tc_done,{ts_if_1_SUITE,{end_per_group,seq2,[sequence]},ok}}],
 
      {?eh,tc_start,{ts_if_1_SUITE,tc6}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc6,{skipped,{require_failed,{not_available,void}}}}},
-     {?eh,test_stats,{1,3,{1,3}}},
-     {?eh,tc_start,{ts_if_1_SUITE,tc7}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc7,ok}},
-     {?eh,test_stats,{2,3,{1,3}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc6,{auto_skipped,{require_failed,
+						    {not_available,void}}}}},
+     {?eh,test_stats,{1,3,{0,4}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc7,{auto_skipped,
+				      {testcase0_failed,bad_return_value}}}},
+     {?eh,test_stats,{1,3,{0,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc8}},
      {?eh,tc_done,{ts_if_1_SUITE,tc8,{skipped,"tc8 skipped"}}},
-     {?eh,test_stats,{2,3,{2,3}}},
+     {?eh,test_stats,{1,3,{1,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc9}},
      {?eh,tc_done,{ts_if_1_SUITE,tc9,{skipped,'tc9 skipped'}}},
-     {?eh,test_stats,{2,3,{3,3}}},
+     {?eh,test_stats,{1,3,{2,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc10}},
-     {?eh,tc_done,{ts_if_1_SUITE,tc10,{failed,{error,{function_clause,'_'}}}}},
-     {?eh,test_stats,{2,4,{3,3}}},
+     {?eh,tc_done,{ts_if_1_SUITE,tc10,
+		   {failed,{error,{function_clause,'_'}}}}},
+     {?eh,test_stats,{1,4,{2,5}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc11}},
      {?eh,tc_done,{ts_if_1_SUITE,tc11,
-		   {skipped,{failed,{ts_if_1_SUITE,init_per_testcase,bad_return}}}}},
-     {?eh,test_stats,{2,4,{3,4}}},
+		   {auto_skipped,
+		    {failed,{ts_if_1_SUITE,init_per_testcase,bad_return}}}}},
+     {?eh,test_stats,{1,4,{2,6}}},
 
      [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g1,[]}}},
-      {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g1,[]},{skipped,g1_got_skipped}}},
-      {?eh,tc_auto_skip,{ts_if_1_SUITE,gtc1,g1_got_skipped}},
-      {?eh,test_stats,{2,4,{3,5}}},
-      {?eh,tc_auto_skip,{ts_if_1_SUITE,end_per_group,g1_got_skipped}}],
-
+      {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g1,[]},
+		    {skipped,g1_got_skipped}}},
+      {?eh,tc_user_skip,{ts_if_1_SUITE,gtc1,g1_got_skipped}},
+      {?eh,test_stats,{1,4,{3,6}}},
+      {?eh,tc_user_skip,{ts_if_1_SUITE,{end_per_group,g1},g1_got_skipped}}],
+     
      {parallel,
       [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g2,[parallel]}}},
        {?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g2,[parallel]},ok}},
        [{?eh,tc_start,{ts_if_1_SUITE,{init_per_group,g3,[]}}},
-	{?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g3,[]},{skipped,g3_got_skipped}}},
-	{?eh,tc_auto_skip,{ts_if_1_SUITE,gtc2,g3_got_skipped}},
-	{?eh,test_stats,{2,4,{3,6}}},
-	{?eh,tc_auto_skip,{ts_if_1_SUITE,end_per_group,g3_got_skipped}}],
+    	{?eh,tc_done,{ts_if_1_SUITE,{init_per_group,g3,[]},{skipped,g3_got_skipped}}},
+    	{?eh,tc_user_skip,{ts_if_1_SUITE,gtc2,g3_got_skipped}},
+    	{?eh,test_stats,{1,4,{4,6}}},
+    	{?eh,tc_user_skip,{ts_if_1_SUITE,{end_per_group,g3},g3_got_skipped}}],
        {?eh,tc_start,{ts_if_1_SUITE,{end_per_group,g2,[parallel]}}},
        {?eh,tc_done,{ts_if_1_SUITE,{end_per_group,g2,[parallel]},ok}}]},
 
      {?eh,tc_start,{ts_if_1_SUITE,tc12}},
      {?eh,tc_done,{ts_if_1_SUITE,tc12,{failed,{testcase_aborted,'stopping tc12'}}}},
-     {?eh,test_stats,{2,5,{3,6}}},
+     {?eh,test_stats,{1,5,{4,6}}},
      {?eh,tc_start,{ts_if_1_SUITE,tc13}},
      {?eh,tc_done,{ts_if_1_SUITE,tc13,ok}},
-     {?eh,test_stats,{3,5,{3,6}}},
+     {?eh,test_stats,{2,5,{4,6}}},
      {?eh,tc_start,{ts_if_1_SUITE,end_per_suite}},
      {?eh,tc_done,{ts_if_1_SUITE,end_per_suite,ok}},
 
+
      {?eh,tc_start,{ts_if_2_SUITE,init_per_suite}},
-     {?eh,tc_done,{ts_if_2_SUITE,init_per_suite,
-		   {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
-     {?eh,tc_auto_skip,{ts_if_2_SUITE,my_test_case,
-			{failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
-     {?eh,test_stats,{3,5,{3,7}}},
-     {?eh,tc_auto_skip,{ts_if_2_SUITE,end_per_suite,
-			{failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+     {?eh,tc_done,
+      {ts_if_2_SUITE,init_per_suite,
+       {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+     {?eh,tc_auto_skip,
+      {ts_if_2_SUITE,my_test_case,
+       {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+     {?eh,test_stats,{2,5,{4,7}}},
+     {?eh,tc_auto_skip,
+      {ts_if_2_SUITE,end_per_suite,
+       {failed,{error,{suite0_failed,{exited,suite0_goes_boom}}}}}},
+
 
      {?eh,tc_start,{ct_framework,error_in_suite}},
-     {?eh,test_stats,{3,5,{4,7}}},
+     {?eh,test_stats,{2,6,{4,7}}},
+
 
      {?eh,tc_start,{ct_framework,error_in_suite}},
-     {?eh,test_stats,{3,5,{5,7}}},
+     {?eh,test_stats,{2,7,{4,7}}},
+
 
      {?eh,tc_start,{ts_if_5_SUITE,init_per_suite}},
      {?eh,tc_done,{ts_if_5_SUITE,init_per_suite,
-		   {skipped,{require_failed_in_suite0,{not_available,undef_variable}}}}},
-     {?eh,tc_auto_skip,{ts_if_5_SUITE,my_test_case,
-			{require_failed_in_suite0,{not_available,undef_variable}}}},
-     {?eh,test_stats,{3,5,{5,8}}},
-     {?eh,tc_auto_skip,{ts_if_5_SUITE,end_per_suite,
-			{require_failed_in_suite0,{not_available,undef_variable}}}},
+		   {auto_skipped,
+		    {require_failed_in_suite0,{not_available,undef_variable}}}}},
+     {?eh,tc_auto_skip,
+      {ts_if_5_SUITE,my_test_case,
+       {require_failed_in_suite0,{not_available,undef_variable}}}},
+     {?eh,test_stats,{2,7,{4,8}}},
+     {?eh,tc_auto_skip,
+      {ts_if_5_SUITE,end_per_suite,
+       {require_failed_in_suite0,{not_available,undef_variable}}}},
 
+     
      {?eh,tc_start,{ct_framework,init_per_suite}},
      {?eh,tc_done,{ct_framework,init_per_suite,
 		   {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
-     {?eh,tc_auto_skip,{ts_if_6_SUITE,tc1,
-			{failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
-     {?eh,test_stats,{3,5,{5,9}}},
+     {?eh,tc_auto_skip,
+      {ts_if_6_SUITE,tc1,
+       {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
+     {?eh,test_stats,{2,7,{4,9}}},
+     {?eh,tc_auto_skip,
+      {ct_framework,end_per_suite,
+       {failed,{error,{suite0_failed,{exited,suite0_byebye}}}}}},
 
-     {?eh,tc_start,{ts_if_7_SUITE,tc1}},
-     {?eh,tc_done,{ts_if_7_SUITE,tc1,ok}},
-     {?eh,test_stats,{4,5,{5,9}}},
 
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
+     {?eh,tc_done,
+      {ts_if_7_SUITE,tc1,{auto_skipped,{testcase0_failed,bad_return_value}}}},
+     {?eh,test_stats,{2,7,{4,10}}},
+     {?eh,tc_done,{ts_if_7_SUITE,
+		   {init_per_group,g1,[]},
+		   {auto_skipped,{group0_failed,bad_return_value}}}},
+     {?eh,tc_auto_skip,
+      {ts_if_7_SUITE,tc2,{group0_failed,bad_return_value}}},
+     {?eh,test_stats,{2,7,{4,11}}},
+     {?eh,tc_auto_skip,
+      {ts_if_7_SUITE,{end_per_group,g1},{group0_failed,bad_return_value}}},
+     
+     [{?eh,tc_start,{ts_if_7_SUITE,{init_per_group,g2,[]}}},
+      {?eh,tc_done,{ts_if_7_SUITE,{init_per_group,g2,[]},ok}},
+      {?eh,tc_done,{ts_if_7_SUITE,tc2,
+		    {auto_skipped,{testcase0_failed,bad_return_value}}}},
+      {?eh,test_stats,{2,7,{4,12}}},
+      {?eh,tc_start,{ts_if_7_SUITE,{end_per_group,g2,[]}}},
+      {?eh,tc_done,{ts_if_7_SUITE,{end_per_group,g2,[]},ok}}],
+     
+     {?eh,tc_start,{ct_framework,end_per_suite}},
+     {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+     
+     
+     {?eh,tc_start,{ct_framework,init_per_suite}},
+     {?eh,tc_done,{ct_framework,init_per_suite,ok}},
      {?eh,tc_start,{ts_if_8_SUITE,tc1}},
      {?eh,tc_done,{ts_if_8_SUITE,tc1,{failed,{error,failed_on_purpose}}}},
-     {?eh,test_stats,{4,6,{5,9}}},
-
+     {?eh,test_stats,{2,8,{4,12}}},
+     {?eh,tc_start,{ct_framework,end_per_suite}},
+     {?eh,tc_done,{ct_framework,end_per_suite,ok}},
+     
+     
      {?eh,tc_user_skip,{skipped_by_spec_1_SUITE,all,"should be skipped"}},
-     {?eh,test_stats,{4,6,{6,9}}},
-
+     {?eh,test_stats,{2,8,{5,12}}},
      {?eh,tc_start,{skipped_by_spec_2_SUITE,init_per_suite}},
      {?eh,tc_done,{skipped_by_spec_2_SUITE,init_per_suite,ok}},
      {?eh,tc_user_skip,{skipped_by_spec_2_SUITE,tc1,"should be skipped"}},
-     {?eh,test_stats,{4,6,{7,9}}},
+     {?eh,test_stats,{2,8,{6,12}}},
      {?eh,tc_start,{skipped_by_spec_2_SUITE,end_per_suite}},
      {?eh,tc_done,{skipped_by_spec_2_SUITE,end_per_suite,ok}},
-
+     
      {?eh,test_done,{'DEF','STOP_TIME'}},
      {?eh,stop_logging,[]}
     ].
 
+
diff --git a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl
index a2254848d0..20e04c464b 100644
--- a/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl
+++ b/lib/common_test/test/ct_test_server_if_1_SUITE_data/test_server_if/test/ts_if_7_SUITE.erl
@@ -73,7 +73,8 @@ end_per_testcase(_TestCase, _Config) ->
 %% N = integer() | forever
 %%--------------------------------------------------------------------
 groups() ->
-    [].
+    [{g1,[],[tc2]},
+     {g2,[],[tc2]}].
 
 %%--------------------------------------------------------------------
 %% Function: all() -> GroupsAndTestCases | {skip,Reason}
@@ -83,7 +84,12 @@ groups() ->
 %% Reason = term()
 %%--------------------------------------------------------------------
 all() -> 
-    [tc1].
+    [tc1,{group,g1},{group,g2}].
+
+group(g1) ->
+    exit(g1_byebye);
+group(_) ->
+    [].
 
 tc1() ->
     exit(tc1_byebye).
@@ -91,3 +97,9 @@ tc1() ->
 tc1(_) ->
     done.
 
+tc2() ->
+    exit(tc2_byebye).
+
+tc2(_) ->
+    done.
+
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 6bcac12326..2e2b45d59f 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -36,7 +36,11 @@
 	 verify_events/3, verify_events/4, reformat/2, log_events/4,
 	 join_abs_dirs/2]).
 
--export([ct_test_halt/1]).
+-export([start_slave/3, slave_stop/1]).
+
+-export([ct_test_halt/1, ct_rpc/2]).
+
+-export([random_error/1]).
 
 -include_lib("kernel/include/file.hrl").
 
@@ -63,13 +67,16 @@ init_per_suite(Config, Level) ->
 	_ ->
 	    ok
     end,
-    
     start_slave(Config, Level).
 
-start_slave(Config,Level) ->
+start_slave(Config, Level) ->
+    start_slave(ct, Config, Level).
+
+start_slave(NodeName, Config, Level) ->
     [_,Host] = string:tokens(atom_to_list(node()), "@"),
-    test_server:format(0, "Trying to start ~s~n", ["ct@"++Host]),
-    case slave:start(Host, ct, []) of
+    test_server:format(0, "Trying to start ~s~n",
+		       [atom_to_list(NodeName)++"@"++Host]),
+    case slave:start(Host, NodeName, []) of
 	{error,Reason} ->
 	    test_server:fail(Reason);
 	{ok,CTNode} ->
@@ -77,7 +84,7 @@ start_slave(Config,Level) ->
 	    IsCover = test_server:is_cover(),
 	    if IsCover ->
 		    cover:start(CTNode);
-	       true->
+	       true ->
 		    ok
 	    end,
 
@@ -97,7 +104,14 @@ start_slave(Config,Level) ->
 	    test_server:format(Level, "Dirs added to code path (on ~w):~n",
 			       [CTNode]),
 	    [io:format("~s~n", [D]) || D <- PathDirs],
-
+	    
+	    case proplists:get_value(start_sasl, Config) of
+		true ->
+		    rpc:call(CTNode, application, start, [sasl]),
+		    test_server:format(Level, "SASL started on ~w~n", [CTNode]);
+		_ ->
+		    ok
+	    end,
 	    TraceFile = filename:join(DataDir, "ct.trace"),
 	    case file:read_file_info(TraceFile) of
 		{ok,_} -> 
@@ -372,6 +386,65 @@ wait_for_ct_stop(Retries, CTNode) ->
     end.
 
 %%%-----------------------------------------------------------------
+%%% ct_rpc/1
+ct_rpc({M,F,A}, Config) ->
+    CTNode = proplists:get_value(ct_node, Config),
+    Level = proplists:get_value(trace_level, Config),
+    test_server:format(Level, "~nCalling ~w:~w(~p) on ~p...",
+		       [M,F,A, CTNode]),
+    rpc:call(CTNode, M, F, A).
+
+
+%%%-----------------------------------------------------------------
+%%% random_error/1
+random_error(Config) when is_list(Config) ->
+    random:seed(now()),
+    Gen = fun(0,_) -> ok; (N,Fun) -> Fun(N-1, Fun) end,
+    Gen(random:uniform(100), Gen),
+
+    ErrorTypes = ['BADMATCH','BADARG','CASE_CLAUSE','FUNCTION_CLAUSE',
+		  'EXIT','THROW','UNDEF'],
+    Type = lists:nth(random:uniform(length(ErrorTypes)), ErrorTypes),
+    Where = case random:uniform(2) of
+		1 ->
+		    io:format("ct_test_support *returning* error of type ~w",
+			      [Type]),
+		    tc;
+		2 ->
+		    io:format("ct_test_support *generating* error of type ~w",
+			      [Type]),
+		    lib
+	    end,
+    ErrorFun =
+	fun() ->
+		case Type of
+		    'BADMATCH' ->
+			ok = proplists:get_value(undefined, Config);
+		    'BADARG' ->
+			size(proplists:get_value(priv_dir, Config));
+		    'FUNCTION_CLAUSE' ->
+			random_error(x);
+		    'EXIT' ->
+			spawn_link(fun() ->
+					   undef_proc ! hello,
+					   ok
+				   end);
+		    'THROW' ->
+			PrivDir = proplists:get_value(priv_dir, Config),
+			if is_list(PrivDir) -> throw(generated_throw) end;
+		    'UNDEF' ->
+			apply(?MODULE, random_error, [])
+		end
+	end,
+    %% either call the fun here or return it to the caller (to be
+    %% executed in a test case instead)
+    case Where of
+	tc -> ErrorFun;
+	lib -> ErrorFun()
+    end.
+    
+
+%%%-----------------------------------------------------------------
 %%% EVENT HANDLING
 
 handle_event(EH, Event) ->
@@ -669,8 +742,10 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 				  test_server:format("Found ~p!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
-		     %% end_per_group auto skipped
-		     (TEv={TEH,tc_auto_skip,{M,end_per_group,R}}, {Done,RemEvs,_RemSize}) ->
+		     %% end_per_group auto- or user skipped
+		     (TEv={TEH,AutoOrUserSkip,{M,end_per_group,R}}, {Done,RemEvs,_RemSize})
+			when AutoOrUserSkip == tc_auto_skip;
+			     AutoOrUserSkip == tc_user_skip ->
 			  RemEvs1 = 
 			      lists:dropwhile(
 				fun({EH,#event{name=tc_auto_skip,
@@ -681,10 +756,18 @@ locate({parallel,TEvs}, Node, Evs, Config) ->
 					    match -> false;
 					    _ -> true
 					end;
+				   ({EH,#event{name=tc_user_skip,
+					       node=EvNode,
+					       data={Mod,end_per_group,Reason}}}) when
+				   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 ->
-					exit({tc_auto_skip_not_found,TEv});
+					exit({tc_auto_or_user_skip_not_found,TEv});
 				   (_) ->
 					true
 				end, RemEvs),
@@ -902,8 +985,10 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 				  test_server:format("Found ~p!", [TEv]),
 				  {Done,RemEvs2,length(RemEvs2)}
 			  end;
-		     %% end_per_group auto skipped
-		     (TEv={TEH,tc_auto_skip,{M,end_per_group,R}}, {Done,RemEvs,_RemSize}) ->
+		     %% end_per_group auto-or user skipped
+		     (TEv={TEH,AutoOrUserSkip,{M,end_per_group,R}}, {Done,RemEvs,_RemSize})
+			when AutoOrUserSkip == tc_auto_skip;
+			     AutoOrUserSkip == tc_user_skip ->
 			  RemEvs1 = 
 			      lists:dropwhile(
 				fun({EH,#event{name=tc_auto_skip,
@@ -911,6 +996,11 @@ locate({shuffle,TEvs}, Node, Evs, Config) ->
 					       data={Mod,end_per_group,Reason}}}) when
 				   EH == TEH, EvNode == Node, Mod == M, Reason == R ->
 					false;
+				   ({EH,#event{name=tc_user_skip,
+					       node=EvNode,
+					       data={Mod,end_per_group,Reason}}}) when
+				   EH == TEH, EvNode == Node, Mod == M, Reason == R ->
+					false;
 				   ({EH,#event{name=stop_logging,
 					       node=EvNode,data=_}}) when
 					  EH == TEH, EvNode == Node ->
@@ -1155,6 +1245,9 @@ log_events1([E={_EH,tc_done,{_M,{end_per_group,_GrName,Props},_R}} | Evs], Dev,
 log_events1([E={_EH,tc_auto_skip,{_M,end_per_group,_Reason}} | Evs], Dev, Ind) ->
     io:format(Dev, "~s~p],~n", [Ind,E]),
     log_events1(Evs, Dev, Ind--" ");
+log_events1([E={_EH,tc_user_skip,{_M,end_per_group,_Reason}} | Evs], Dev, Ind) ->
+    io:format(Dev, "~s~p],~n", [Ind,E]),
+    log_events1(Evs, Dev, Ind--" ");
 log_events1([E], Dev, Ind) ->
     io:format(Dev, "~s~p~n].~n", [Ind,E]),
     ok;
diff --git a/lib/common_test/test/ct_testspec_1_SUITE.erl b/lib/common_test/test/ct_testspec_1_SUITE.erl
index 6a4a4acd80..187b5e6d3a 100644
--- a/lib/common_test/test/ct_testspec_1_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_1_SUITE.erl
@@ -760,16 +760,42 @@ test_events(all_groups) ->
 test_events(skip_all_groups) ->
     [
      {?eh,start_logging,'_'},
+     {?eh,start_info,{1,1,12}},
      {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1a},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1a},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
      {?eh,test_stats,{0,0,{1,0}}},
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1b},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
      {?eh,test_stats,{0,0,{2,0}}},
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_2},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1a},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1b},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
      {?eh,test_stats,{0,0,{3,0}}},
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_4},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
      {?eh,test_stats,{0,0,{4,0}}},
-     {?eh,tc_done,{groups_11_SUITE,end_per_suite,'_'}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1b},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_2},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_2a,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{5,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_3a,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{6,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_3b,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{7,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_2b,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{8,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_2},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_4},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_5a,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{9,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_7a,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{10,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_7b,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{11,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_5b,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{12,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_4},"SKIPPED!"}},
+     {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
@@ -788,21 +814,35 @@ test_events(group) ->
  
 test_events(skip_group) ->
     [
-     {?eh,start_logging,'_'},
-     {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
-     
-     {?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
-     {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
-     {?eh,tc_start,{groups_11_SUITE,testcase_1b}},
-     {?eh,test_stats,{2,0,{0,0}}},
-     {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},'_'}},
-     
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1b},"SKIPPED!"}},
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_2},"SKIPPED!"}},
-     %%! But not test_group_7 since it's a sub-group!
-     {?eh,test_stats,{2,0,{2,0}}},
-     {negative,{?eh,tc_user_skip,'_'},{?eh,stop_logging,'_'}}
-    ];
+      {?eh,start_logging,'_'},
+      {?eh,start_info,{1,1,8}},
+      {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
+      [{?eh,tc_start,{groups_11_SUITE,{init_per_group,test_group_1a,[]}}},
+       {?eh,tc_done,{groups_11_SUITE,{init_per_group,test_group_1a,[]},ok}},
+       {?eh,tc_start,{groups_11_SUITE,testcase_1a}},
+       {?eh,tc_start,{groups_11_SUITE,testcase_1b}},
+       {?eh,test_stats,{2,0,{0,0}}},
+       {?eh,tc_start,{groups_11_SUITE,{end_per_group,test_group_1a,[]}}},
+       {?eh,tc_done,{groups_11_SUITE,{end_per_group,test_group_1a,[]},ok}}],
+      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1b},
+			 "SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+      {?eh,test_stats,{2,0,{2,0}}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1b},
+			 "SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_2},
+			 "SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,testcase_2a,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,testcase_3a,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,testcase_3b,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_11_SUITE,testcase_2b,"SKIPPED!"}},
+      {?eh,test_stats,{2,0,{6,0}}},
+      {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_2},
+			 "SKIPPED!"}},
+      {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
+      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
+     ];
 
 test_events(group_all_testcases) ->
     [
@@ -820,11 +860,23 @@ test_events(group_all_testcases) ->
 test_events(skip_group_all_testcases) ->
     [
      {?eh,start_logging,'_'},
+     {?eh,start_info,{1,1,4}},
      {?eh,tc_start,{groups_11_SUITE,init_per_suite}},
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1a},"SKIPPED!"}},
-     {?eh,tc_user_skip, {groups_11_SUITE,{group,test_group_1b},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1a},
+			"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
      {?eh,test_stats,{0,0,{2,0}}},
-     {?eh,tc_start,{groups_11_SUITE,end_per_suite}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1a},
+			"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{init_per_group,test_group_1b},
+			"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_11_SUITE,testcase_1b,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{4,0}}},
+     {?eh,tc_user_skip,{groups_11_SUITE,{end_per_group,test_group_1b},
+			"SKIPPED!"}},
+     {?eh,tc_done,{groups_11_SUITE,end_per_suite,init}},
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
@@ -934,7 +986,7 @@ test_events(subgroup) ->
     [
      {?eh,start_logging,'_'},
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
-
+     
      {parallel, 
       [{?eh,tc_start,
 	{groups_12_SUITE,{init_per_group,test_group_2,[parallel]}}},
@@ -962,36 +1014,58 @@ test_events(subgroup) ->
 test_events(skip_subgroup) ->
     [
      {?eh,start_logging,'_'},
+     {?eh,start_info,{1,1,6}},
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
 
-     [{?eh,tc_start,
-       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+     [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
+
       {parallel,
-       [{?eh,tc_start,
-	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]}}},
-	{?eh,tc_done,
-	 {groups_12_SUITE,{init_per_group,test_group_5,[parallel]},ok}},
-	{parallel,
-	 [{?eh,tc_start,
-	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]}}},
-	  {?eh,tc_done,
-	   {groups_12_SUITE,{init_per_group,test_group_6,[parallel]},ok}},
-	  [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_7,'_'}}},
-	   {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_7,'_'}}}],
-	  {?eh,tc_user_skip,
-	   {groups_12_SUITE,{group,test_group_8},"SKIPPED!"}},
-	  {?eh,tc_start,
-	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]}}},
-	  {?eh,tc_done,
-	   {groups_12_SUITE,{end_per_group,test_group_6,[parallel]},ok}}
-	 ]},
-	{?eh,tc_start,
-	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]}}},
-	{?eh,tc_done,
-	 {groups_12_SUITE,{end_per_group,test_group_5,[parallel]},ok}}]},
-      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}}],
+       [{?eh,tc_start,{groups_12_SUITE,
+		       {init_per_group,test_group_5,[parallel]}}},
+       	{?eh,tc_done,{groups_12_SUITE,
+       		      {init_per_group,test_group_5,[parallel]},ok}},
+
+      	{parallel,
+      	 [{?eh,tc_start,{groups_12_SUITE,
+      			 {init_per_group,test_group_6,[parallel]}}},
+      	  {?eh,tc_done,{groups_12_SUITE,
+      			{init_per_group,test_group_6,[parallel]},ok}},
+
+      	  [{?eh,tc_start,{groups_12_SUITE,
+      			  {init_per_group,test_group_7,[sequence]}}},
+      	   {?eh,tc_done,{groups_12_SUITE,
+      			 {init_per_group,test_group_7,[sequence]},ok}},
+           {?eh,tc_done,{groups_12_SUITE,testcase_7a,ok}},
+           {?eh,tc_done,{groups_12_SUITE,testcase_7b,ok}},
+      	   {?eh,tc_start,{groups_12_SUITE,
+      			  {end_per_group,test_group_7,[sequence]}}},
+      	   {?eh,tc_done,{groups_12_SUITE,
+      			 {end_per_group,test_group_7,[sequence]},ok}}],
+
+      	  {?eh,tc_user_skip,{groups_12_SUITE,
+      			     {init_per_group,test_group_8},"SKIPPED!"}},
+      	  {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
+      	  {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
+      	  {?eh,tc_user_skip,{groups_12_SUITE,
+      			     {end_per_group,test_group_8},"SKIPPED!"}},
+
+      	  {?eh,tc_start,{groups_12_SUITE,
+      			 {end_per_group,test_group_6,[parallel]}}},
+      	  {?eh,tc_done,{groups_12_SUITE,
+      			{end_per_group,test_group_6,[parallel]},ok}}]},
+
+       	{?eh,test_stats,{4,0,{2,0}}},
+       	{?eh,tc_start,{groups_12_SUITE,
+       		       {end_per_group,test_group_5,[parallel]}}},
+       	{?eh,tc_done,{groups_12_SUITE,
+       		      {end_per_group,test_group_5,[parallel]},ok}}]},
 
-     {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
+      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}},
+      {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}],
+
+     {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
+     {?eh,tc_done,{groups_12_SUITE,end_per_suite,init}},
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
@@ -1066,17 +1140,26 @@ test_events(subgroup_all_testcases) ->
 test_events(skip_subgroup_all_testcases) ->
     [
      {?eh,start_logging,'_'},
+     {?eh,start_info,{1,1,6}},
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
-
-     [{?eh,tc_start,
-       {groups_12_SUITE,{init_per_group,test_group_4,[]}}},
-      {?eh,tc_done,
-       {groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
-      {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_5},"SKIPPED!"}},
-      {?eh,tc_start,{groups_12_SUITE,{end_per_group,test_group_4,[]}}},
-      {?eh,tc_done,{groups_12_SUITE,{end_per_group,test_group_4,[]},ok}}
-     ],
-
+     [{?eh,tc_start,{groups_12_SUITE,{init_per_group,test_group_4,[]}}},
+      {?eh,tc_done,{groups_12_SUITE,{init_per_group,test_group_4,[]},ok}},
+      {?eh,tc_user_skip,{groups_12_SUITE,
+			 {init_per_group,test_group_5},"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,testcase_5a,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,testcase_7a,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,testcase_7b,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
+      {?eh,tc_user_skip,{groups_12_SUITE,testcase_5b,"SKIPPED!"}},
+      {?eh,test_stats,{0,0,{6,0}}},
+      {?eh,tc_user_skip,{groups_12_SUITE,
+			 {end_per_group,test_group_5},"SKIPPED!"}},
+      {?eh,tc_start,{groups_12_SUITE,
+		     {end_per_group,test_group_4,[]}}},
+      {?eh,tc_done,{groups_12_SUITE,
+		    {end_per_group,test_group_4,[]},ok}}],
+     {?eh,tc_start,{groups_12_SUITE,end_per_suite}},
      {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
@@ -1194,13 +1277,30 @@ test_events(skip_subgroup_testcase) ->
 test_events(sub_skipped_by_top) ->
     [
      {?eh,start_logging,'_'},
+     {?eh,start_info,{1,1,12}},
      {?eh,tc_start,{groups_12_SUITE,init_per_suite}},
-
-     {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_4},"SKIPPED!"}},
-     {?eh,tc_user_skip,{groups_12_SUITE,{group,test_group_4},"SKIPPED!"}},
-
+     {?eh,tc_user_skip,{groups_12_SUITE,{init_per_group,test_group_4},
+			"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,
+			{end_per_group,test_group_4},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,
+			{init_per_group,test_group_4},"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7a,"SKIPPED!"}},     
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_7b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8a,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_8b,"SKIPPED!"}},
+     {?eh,tc_user_skip,{groups_12_SUITE,testcase_5b,"SKIPPED!"}},
+     {?eh,test_stats,{0,0,{12,0}}},
+     {?eh,tc_user_skip,{groups_12_SUITE,
+			{end_per_group,test_group_4},"SKIPPED!"}},
      {?eh,tc_done,{groups_12_SUITE,end_per_suite,'_'}},
-
      {negative,{?eh,tc_start,'_'},{?eh,stop_logging,'_'}}
     ];
 
diff --git a/lib/common_test/test/ct_testspec_3_SUITE.erl b/lib/common_test/test/ct_testspec_3_SUITE.erl
index 5fa187e5b4..9f8ca84e45 100644
--- a/lib/common_test/test/ct_testspec_3_SUITE.erl
+++ b/lib/common_test/test/ct_testspec_3_SUITE.erl
@@ -1539,7 +1539,7 @@ flat_spec1_events() ->
      {?eh,test_stats,{1,2,{0,0}}},
      {?eh,tc_start,{t11_SUITE,autoskip_tc}},
      {?eh,tc_done,
-      {t11_SUITE,autoskip_tc,{skipped,
+      {t11_SUITE,autoskip_tc,{auto_skipped,
 			      {failed,
 			       {t11_SUITE,init_per_testcase,
 				{kaboom,'_'}}}}}},
@@ -1562,7 +1562,7 @@ flat_spec1_events() ->
      {?eh,test_stats,{2,4,{1,1}}},
      {?eh,tc_start,{t21_SUITE,autoskip_tc}},
      {?eh,tc_done,
-      {t21_SUITE,autoskip_tc,{skipped,
+      {t21_SUITE,autoskip_tc,{auto_skipped,
 			      {failed,
 			       {t21_SUITE,init_per_testcase,
 				{kaboom,'_'}}}}}},
@@ -1589,7 +1589,7 @@ flat_spec2_events() ->
      {?eh,test_stats,{1,2,{0,0}}},
      {?eh,tc_start,{t12_SUITE,autoskip_tc}},
      {?eh,tc_done,
-      {t12_SUITE,autoskip_tc,{skipped,
+      {t12_SUITE,autoskip_tc,{auto_skipped,
 			      {failed,
 			       {t12_SUITE,init_per_testcase,
 				{kaboom,'_'}}}}}},
@@ -1612,7 +1612,7 @@ flat_spec2_events() ->
      {?eh,test_stats,{2,4,{1,1}}},
      {?eh,tc_start,{t12_SUITE,autoskip_tc}},
      {?eh,tc_done,
-      {t12_SUITE,autoskip_tc,{skipped,
+      {t12_SUITE,autoskip_tc,{auto_skipped,
 			      {failed,
 			       {t12_SUITE,init_per_testcase,
 				{kaboom,'_'}}}}}},
@@ -1635,7 +1635,7 @@ flat_spec2_events() ->
      {?eh,test_stats,{3,6,{2,2}}},
      {?eh,tc_start,{t22_SUITE,autoskip_tc}},
      {?eh,tc_done,
-      {t22_SUITE,autoskip_tc,{skipped,
+      {t22_SUITE,autoskip_tc,{auto_skipped,
 			      {failed,
 			       {t22_SUITE,init_per_testcase,
 				{kaboom,'_'}}}}}},
diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl
index 32488b1db9..1aa71953ec 100644
--- a/lib/common_test/test/ct_verbosity_SUITE.erl
+++ b/lib/common_test/test/ct_verbosity_SUITE.erl
@@ -53,9 +53,19 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     ct_test_support:end_per_suite(Config).
 
+init_per_testcase(no_crashing, Config) ->
+    Opts = ct_test_support:start_slave(ctX, Config, 50),
+    XNode = proplists:get_value(ct_node, Opts),
+    ct:pal("Node ~p started!", [XNode]),
+    [{xnode,XNode} | Config];
 init_per_testcase(TestCase, Config) ->
     ct_test_support:init_per_testcase(TestCase, Config).
 
+end_per_testcase(no_crashing, Config) ->
+    XNode = proplists:get_value(xnode, Config),
+    ct_test_support:slave_stop(XNode),
+    ct:pal("Node ~p stopped!", [XNode]),
+    ok;
 end_per_testcase(TestCase, Config) ->
     ct_test_support:end_per_testcase(TestCase, Config).
 
@@ -72,7 +82,8 @@ all() ->
      combine_categories,
      testspec_only,
      merge_with_testspec,
-     possible_deadlock
+     possible_deadlock,
+     no_crashing
     ].
 
 %%--------------------------------------------------------------------
@@ -189,6 +200,19 @@ possible_deadlock(Config) ->
     
 
 %%%-----------------------------------------------------------------
+%%%
+no_crashing(Config) ->
+    XNode = proplists:get_value(xnode, Config),
+    ok = rpc:call(XNode, ct, print, ["hello",[]]),
+    ok = rpc:call(XNode, ct, pal, ["hello",[]]),
+    ok = rpc:call(XNode, ct, log, ["hello",[]]),
+    Data = io_lib:format("hello", []),
+    {badrpc,{'EXIT',{noproc,_}}} =
+	(catch rpc:call(XNode, test_server_io, print_unexpected, [Data])),
+    ok.	
+
+
+%%%-----------------------------------------------------------------
 %%% HELP FUNCTIONS
 %%%-----------------------------------------------------------------
 
diff --git a/lib/common_test/test/telnet_server.erl b/lib/common_test/test/telnet_server.erl
index 31884aa182..1760100d8e 100644
--- a/lib/common_test/test/telnet_server.erl
+++ b/lib/common_test/test/telnet_server.erl
@@ -64,18 +64,19 @@ accept(#state{listen=LSock}=State) ->
 	{Acceptor,Sock} when is_port(Sock) ->
 	    case init_client(State#state{client=Sock}) of
 		stopped ->
-		    io:format("telnet_server stopped\n"),
+		    io:format("[telnet_server] telnet_server stopped\n"),
 		    ok;
 		R ->
-		    io:format("connection to client closed with reason ~p~n",[R]),
+		    io:format("[telnet_server] connection to client" 
+			      "closed with reason ~p~n",[R]),
 		    accept(State)
 	    end;
 	{Acceptor,closed} ->
-	    io:format("listen socket closed unexpectedly, "
+	    io:format("[telnet_server] listen socket closed unexpectedly, "
 		      "terminating telnet_server\n"),
 	    ok;
 	stop  ->
-	    io:format("telnet_server stopped\n"),
+	    io:format("[telnet_server] telnet_server stopped\n"),
 	    ok
     end.
 
@@ -188,7 +189,7 @@ do_handle_data(_Data,State) ->
 check_user(User,State) ->
     case lists:keyfind(User,1,State#state.users) of
 	{User,Pwd} ->
-	   dbg("user ok\n"),
+	    dbg("user ok\n"),
 	    send("Password: ",State),
 	    {ok,State#state{authorized={user,Pwd}}};
 	false ->
@@ -223,6 +224,6 @@ get_line([],_) ->
     false.
 
 dbg(_F) ->
-    io:format(_F).
+    dbg(_F,[]).
 dbg(_F,_A) ->
-    io:format(_F,_A).
+    io:format("[telnet_server] "++_F,_A).
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index d60b4ba675..568405b110 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.7.2
+COMMON_TEST_VSN = 1.7.4
diff --git a/lib/compiler/doc/src/book.xml b/lib/compiler/doc/src/book.xml
index fc56a837d5..45b49fe46d 100644
--- a/lib/compiler/doc/src/book.xml
+++ b/lib/compiler/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index ddaae2655d..c66c8ea4bf 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -350,12 +350,18 @@ module.beam: module.erl \
               parsed code before the code is checked for errors.</p>
           </item>
 
-	  <tag><c>asm</c></tag>
+	  <tag><c>from_asm</c></tag>
           <item>
             <p>The input file is expected to be assembler code (default
 	      file suffix ".S"). Note that the format of assembler files
-              is not documented, and may change between releases - this
-              option is primarily for internal debugging use.</p>
+              is not documented, and may change between releases.</p>
+          </item>
+
+	  <tag><c>from_core</c></tag>
+          <item>
+            <p>The input file is expected to be core code (default
+	      file suffix ".core"). Note that the format of core files
+              is not documented, and may change between releases.</p>
           </item>
 
           <tag><c>no_strict_record_tests</c></tag>
@@ -402,6 +408,11 @@ module.beam: module.erl \
 	  <code>-compile({no_auto_import,[error/1]}).</code>
 	  </item>
 
+          <tag><c>no_auto_import</c></tag>
+          <item>
+            <p>Do not auto import any functions from the module <c>erlang</c>.</p>
+          </item>
+
           <tag><c>no_line_info</c></tag>
 
           <item>
@@ -859,6 +870,10 @@ pi() -> 3.1416.
 {ErrorLine, Module, ErrorDescriptor}
     </code>
 
+    <p><c>ErrorLine</c> will be the atom <c>none</c> if the error does
+    not correspond to a specific line (e.g. if the source file does
+    not exist).</p>
+
     <p>A string describing the error is obtained with the following
       call:</p>
     <code>
diff --git a/lib/compiler/doc/src/fascicules.xml b/lib/compiler/doc/src/fascicules.xml
index 43090b4aed..fadd37eefb 100644
--- a/lib/compiler/doc/src/fascicules.xml
+++ b/lib/compiler/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 33b32a3dce..cb39b28d3d 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,95 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 4.9.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Typo fix ambigous -&gt; ambiguous. Thanks to Leo Correa.</p>
+          <p>
+	    Own Id: OTP-11455</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Lift 'after' blocks to zeroary functions. Thanks to
+	    Anthony Ramine.</p>
+          <p>
+	    Own Id: OTP-11267</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Compiler 4.9.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Expressions such as <c>'B = is_integer(V), if B and B
+	    -&gt; ok end'</c> would crash the compiler.</p>
+          <p>
+	    Own Id: OTP-11240</p>
+        </item>
+        <item>
+          <p>
+	    <c>compile:file2/2</c> with the option
+	    <c>report_errors</c> could return ErrorInfo tuples with
+	    only two elements, while the documentation says that the
+	    ErrorInfo tuple always has three elements. Also updated
+	    the documentation to add that the first element may be
+	    '<c>none</c>' if no line number is applicable.</p>
+          <p>
+	    Own Id: OTP-11304 Aux Id: seq12412 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix matching of floating point middle-endian machines.
+	    Thanks to Johannes Weissl.</p>
+          <p>
+	    Own Id: OTP-11201</p>
+        </item>
+        <item>
+          <p>
+	    Restrict inlining of local fun references. Thanks to
+	    Anthony Ramine.</p>
+          <p>
+	    Own Id: OTP-11211</p>
+        </item>
+        <item>
+          <p>
+	    Silence a misleading warning with some comprehensions.
+	    Thanks to Anthony Ramine.</p>
+          <p>
+	    Own Id: OTP-11212</p>
+        </item>
+        <item>
+          <p>
+	    Forbid returning a match context in beam_validator.
+	    Thanks to Anthony Ramine.</p>
+          <p>
+	    Own Id: OTP-11247</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 4.9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -96,7 +185,7 @@
         <item>
           <p>
 	    Forbid multiple values in Core Erlang sequence arguments.
-	    Thanks to Jos� Valim and Anthony Ramine.</p>
+	    Thanks to José Valim and Anthony Ramine.</p>
           <p>
 	    Own Id: OTP-10818</p>
         </item>
@@ -195,7 +284,7 @@
           <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>
+	    <c>module_info(compile)</c> (Thanks to José Valim)</p>
           <p>
 	    Own Id: OTP-10150</p>
         </item>
@@ -307,7 +396,7 @@
         <item>
           <p>
 	    Fix typo in `compile' doc: unmatched parenthesis (Thanks
-	    to Ricardo Catalinas Jim�nez)</p>
+	    to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-9919</p>
         </item>
@@ -808,7 +897,7 @@
 	    (Thanks to Paul Fisher.)</p>
 	    <p>Using filter expressions containing <c>andalso</c> or
 	    <c>orelse</c> in a list comprehension could cause a
-	    compiler crash. (Thanks to Martin Engstr�m.)</p>
+	    compiler crash. (Thanks to Martin Engström.)</p>
           <p>
 	    Own Id: OTP-8054</p>
         </item>
diff --git a/lib/compiler/doc/src/notes_history.xml b/lib/compiler/doc/src/notes_history.xml
index db0dc2f683..9e8934f416 100644
--- a/lib/compiler/doc/src/notes_history.xml
+++ b/lib/compiler/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/compiler/doc/src/part_notes.xml b/lib/compiler/doc/src/part_notes.xml
index e730e3f7e2..0c1fdd567d 100644
--- a/lib/compiler/doc/src/part_notes.xml
+++ b/lib/compiler/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/compiler/doc/src/part_notes_history.xml b/lib/compiler/doc/src/part_notes_history.xml
index 12366f0006..a4909f156e 100644
--- a/lib/compiler/doc/src/part_notes_history.xml
+++ b/lib/compiler/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/compiler/doc/src/ref_man.xml b/lib/compiler/doc/src/ref_man.xml
index 74fe45aa77..6478ad4b11 100644
--- a/lib/compiler/doc/src/ref_man.xml
+++ b/lib/compiler/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/compiler/src/beam_a.erl b/lib/compiler/src/beam_a.erl
index c590c5e35b..fe4f473846 100644
--- a/lib/compiler/src/beam_a.erl
+++ b/lib/compiler/src/beam_a.erl
@@ -88,6 +88,12 @@ 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({put_map_assoc,Fail,S,D,R,L}) ->
+    {put_map,Fail,assoc,S,D,R,L};
+rename_instr({put_map_exact,Fail,S,D,R,L}) ->
+    {put_map,Fail,exact,S,D,R,L};
+rename_instr({test,has_map_fields,Fail,Src,{list,List}}) ->
+    {test,has_map_fields,Fail,[Src|List]};
 rename_instr({select_val=I,Reg,Fail,{list,List}}) ->
     {select,I,Reg,Fail,List};
 rename_instr({select_tuple_arity=I,Reg,Fail,{list,List}}) ->
diff --git a/lib/compiler/src/beam_asm.erl b/lib/compiler/src/beam_asm.erl
index 112b087f3c..f8cf178d2e 100644
--- a/lib/compiler/src/beam_asm.erl
+++ b/lib/compiler/src/beam_asm.erl
@@ -324,6 +324,8 @@ make_op({gc_bif,Bif,Fail,Live,Args,Dest}, Dict) ->
     encode_op(BifOp, [Fail,Live,{extfunc,erlang,Bif,Arity}|Args++[Dest]],Dict);
 make_op({bs_add=Op,Fail,[Src1,Src2,Unit],Dest}, Dict) ->
     encode_op(Op, [Fail,Src1,Src2,Unit,Dest], Dict);
+make_op({test,Cond,Fail,Src,{list,_}=Ops}, Dict) ->
+    encode_op(Cond, [Fail,Src,Ops], Dict);
 make_op({test,Cond,Fail,Ops}, Dict) when is_list(Ops) ->
     encode_op(Cond, [Fail|Ops], Dict);
 make_op({test,Cond,Fail,Live,[Op|Ops],Dst}, Dict) when is_list(Ops) ->
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index cf5244e1ce..7a30c68593 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -123,15 +123,24 @@ is_last_bool([], _) -> false.
 collect_block(Is) ->
     collect_block(Is, []).
 
+collect_block([{allocate,N,R}|Is0], Acc) ->
+    {Inits,Is} = lists:splitwith(fun ({init,{y,_}}) -> true;
+                                     (_) -> false
+                                 end, Is0),
+    collect_block(Is, [{set,[],[],{alloc,R,{nozero,N,0,Inits}}}|Acc]);
 collect_block([{allocate_zero,Ns,R},{test_heap,Nh,R}|Is], Acc) ->
-    collect_block(Is, [{set,[],[],{alloc,R,{no_opt,Ns,Nh,[]}}}|Acc]);
+    collect_block(Is, [{set,[],[],{alloc,R,{zero,Ns,Nh,[]}}}|Acc]);
 collect_block([I|Is]=Is0, Acc) ->
     case collect(I) of
 	error -> {reverse(Acc),Is0};
 	Instr -> collect_block(Is, [Instr|Acc])
     end.
 
+collect({allocate,N,R})      -> {set,[],[],{alloc,R,{nozero,N,0,[]}}};
 collect({allocate_zero,N,R}) -> {set,[],[],{alloc,R,{zero,N,0,[]}}};
+collect({allocate_heap,Ns,Nh,R}) -> {set,[],[],{alloc,R,{nozero,Ns,Nh,[]}}};
+collect({allocate_heap_zero,Ns,Nh,R}) -> {set,[],[],{alloc,R,{zero,Ns,Nh,[]}}};
+collect({init,D})            -> {set,[D],[],init};
 collect({test_heap,N,R})     -> {set,[],[],{alloc,R,{nozero,nostack,N,[]}}};
 collect({bif,N,F,As,D})      -> {set,[D],As,{bif,N,F}};
 collect({gc_bif,N,F,R,As,D}) -> {set,[D],As,{alloc,R,{gc_bif,N,F}}};
@@ -143,7 +152,15 @@ collect({get_tuple_element,S,I,D}) -> {set,[D],[S],{get_tuple_element,I}};
 collect({set_tuple_element,S,D,I}) -> {set,[],[S,D],{set_tuple_element,I}};
 collect({get_list,S,D1,D2})  -> {set,[D1,D2],[S],get_list};
 collect(remove_message)      -> {set,[],[],remove_message};
+collect({put_map,F,Op,S,D,R,{list,Puts}}) ->
+    {set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}};
+collect({get_map_elements,F,S,{list,Gets}}) ->
+    {set,Gets,[S],{get_map_elements,F}};
 collect({'catch',R,L})       -> {set,[R],[],{'catch',L}};
+collect(fclearerror)         -> {set,[],[],fclearerror};
+collect({fcheckerror,{f,0}}) -> {set,[],[],fcheckerror};
+collect({fmove,S,D})         -> {set,[D],[S],fmove};
+collect({fconv,S,D})         -> {set,[D],[S],fconv};
 collect(_)                   -> error.
 
 %% embed_lines([Instruction]) -> [Instruction]
@@ -223,6 +240,7 @@ move_allocates_2(Alloc, [], Acc) ->
 
 alloc_may_pass({set,_,_,{alloc,_,_}}) -> false;
 alloc_may_pass({set,_,_,{set_tuple_element,_}}) -> false;
+alloc_may_pass({set,_,_,{get_map_elements,_}}) -> false;
 alloc_may_pass({set,_,_,put_list}) -> false;
 alloc_may_pass({set,_,_,put}) -> false;
 alloc_may_pass({set,_,_,_}) -> true.
@@ -273,7 +291,11 @@ opt_moves([X0,Y0], Is0) ->
 	not_possible -> {[X,Y0],Is2};
 	{X,_} -> {[X,Y0],Is2};
 	{Y,Is} -> {[X,Y],Is}
-    end.
+    end;
+opt_moves(Ds, Is) ->
+    %% multiple destinations -> pass through
+    {Ds,Is}.
+
 
 %% opt_move(Dest, [Instruction]) -> {UpdatedDest,[Instruction]} | not_possible
 %%  If there is a {move,Dest,FinalDest} instruction
@@ -370,6 +392,7 @@ gen_init(Fs, Regs, Y, Acc) ->
 
 init_yreg([{set,_,_,{bif,_,_}}|_], Reg) -> Reg;
 init_yreg([{set,_,_,{alloc,_,{gc_bif,_,_}}}|_], Reg) -> Reg;
+init_yreg([{set,_,_,{alloc,_,{put_map,_,_}}}|_], Reg) -> Reg;
 init_yreg([{set,Ds,_,_}|Is], Reg) -> init_yreg(Is, add_yregs(Ds, Reg));
 init_yreg(_Is, Reg) -> Reg.
 
diff --git a/lib/compiler/src/beam_bool.erl b/lib/compiler/src/beam_bool.erl
index cf5455dfde..124abd13c1 100644
--- a/lib/compiler/src/beam_bool.erl
+++ b/lib/compiler/src/beam_bool.erl
@@ -425,6 +425,9 @@ bopt_tree([], Forest, Pre) ->
 safe_bool_op(N, Ar) ->
     erl_internal:new_type_test(N, Ar) orelse erl_internal:comp_op(N, Ar).
 
+bopt_bool_args([V0,V0], Forest0) ->
+    {V,Forest} = bopt_bool_arg(V0, Forest0),
+    {[V,V],Forest};
 bopt_bool_args(As, Forest) ->
     mapfoldl(fun bopt_bool_arg/2, Forest, As).
 
diff --git a/lib/compiler/src/beam_bsm.erl b/lib/compiler/src/beam_bsm.erl
index fdfcb08125..d54c2a9fde 100644
--- a/lib/compiler/src/beam_bsm.erl
+++ b/lib/compiler/src/beam_bsm.erl
@@ -209,6 +209,7 @@ btb_reaches_match_2([{call,Arity,{f,Lbl}}|Is], Regs, D) ->
 btb_reaches_match_2([{apply,Arity}|Is], Regs, D) ->
     btb_call(Arity+2, apply, Regs, Is, D);
 btb_reaches_match_2([{call_fun,Live}=I|Is], Regs, D) ->
+    btb_ensure_not_used([{x,Live}], I, Regs),
     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);
diff --git a/lib/compiler/src/beam_clean.erl b/lib/compiler/src/beam_clean.erl
index e208ffec1f..b653998252 100644
--- a/lib/compiler/src/beam_clean.erl
+++ b/lib/compiler/src/beam_clean.erl
@@ -86,7 +86,7 @@ add_to_work_list(F, {Fs,Used}=Sets) ->
 	false -> {[F|Fs],sets:add_element(F, Used)}
     end.
 
-
+
 %%%
 %%% Coalesce adjacent labels. Renumber all labels to eliminate gaps.
 %%% This cleanup will slightly reduce file size and slightly speed up loading.
@@ -234,6 +234,36 @@ 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([{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([{put_map=I,{f,Lbl},Op,Src,Dst,Live,List}|Is], Acc, D)
+  when Lbl =/= 0 ->
+    replace(Is, [{I,{f,label(Lbl, D)},Op,Src,Dst,Live,List}|Acc], D);
+replace([{get_map_elements=I,{f,Lbl},Src,List}|Is], Acc, D) when Lbl =/= 0 ->
+    replace(Is, [{I,{f,label(Lbl, D)},Src,List}|Acc], D);
 replace([I|Is], Acc, D) ->
     replace(Is, [I|Acc], D);
 replace([], Acc, _) -> Acc.
diff --git a/lib/compiler/src/beam_dict.erl b/lib/compiler/src/beam_dict.erl
index 212b9fb03a..ea51673fa3 100644
--- a/lib/compiler/src/beam_dict.erl
+++ b/lib/compiler/src/beam_dict.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2014. All Rights Reserved.
 %% 
 %% The 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,16 +29,24 @@
 
 -type label() :: non_neg_integer().
 
+-type index() :: non_neg_integer().
+
+-type atom_tab()   :: gb_trees:tree(atom(), index()).
+-type import_tab() :: gb_trees:tree(mfa(), index()).
+-type fname_tab()  :: gb_trees:tree(Name :: term(), index()).
+-type line_tab()   :: gb_trees:tree({Fname :: index(), Line :: term()}, index()).
+-type literal_tab() :: dict:dict(Literal :: term(), index()).
+
 -record(asm,
-	{atoms = gb_trees:empty()   :: gb_tree(),      	%{Atom,Index}
+	{atoms = gb_trees:empty()   :: atom_tab(),
 	 exports = []		    :: [{label(), arity(), label()}],
 	 locals = []		    :: [{label(), arity(), label()}],
-	 imports = gb_trees:empty() :: gb_tree(),      	%{{M,F,A},Index}
+	 imports = gb_trees:empty() :: import_tab(),
 	 strings = <<>>		    :: binary(),	%String pool
 	 lambdas = [],				%[{...}]
-	 literals = dict:new()	    :: dict(),	%Format: {Literal,Number}
-	 fnames = gb_trees:empty()  :: gb_tree(),       %{Name,Index}
-	 lines = gb_trees:empty()   :: gb_tree(),	%{{Fname,Line},Index}
+	 literals = dict:new()	    :: literal_tab(),
+	 fnames = gb_trees:empty()  :: fname_tab(),
+	 lines = gb_trees:empty()   :: line_tab(),
 	 num_lines = 0		    :: non_neg_integer(), %Number of line instructions
 	 next_import = 0	    :: non_neg_integer(),
 	 string_offset = 0	    :: non_neg_integer(),
diff --git a/lib/compiler/src/beam_disasm.erl b/lib/compiler/src/beam_disasm.erl
index 1a8bbcee22..4bdfe4e0c2 100644
--- a/lib/compiler/src/beam_disasm.erl
+++ b/lib/compiler/src/beam_disasm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %%
 %% The 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 @@
 
 %%-----------------------------------------------------------------------
 
--type literals()     :: 'none' | gb_tree().
+-type index()        :: non_neg_integer().
+-type literals()     :: 'none' | gb_trees:tree(index(), term()).
 -type symbolic_tag() :: 'a' | 'f' | 'h' | 'i' | 'u' | 'x' | 'y' | 'z'.
 -type disasm_tag()   :: symbolic_tag() | 'fr' | 'atom' | 'float' | 'literal'.
 -type disasm_term()  :: 'nil' | {disasm_tag(), _}.
@@ -216,7 +217,8 @@ optional_chunk(F, ChunkTag) ->
 %%-----------------------------------------------------------------------
 
 -type l_info() :: {non_neg_integer(), {_,_,_,_,_,_}}.
--spec beam_disasm_lambdas('none' | binary(), gb_tree()) -> 'none' | [l_info()].
+-spec beam_disasm_lambdas('none' | binary(), gb_trees:tree(index(), _)) ->
+        'none' | [l_info()].
 
 beam_disasm_lambdas(none, _) -> none;
 beam_disasm_lambdas(<<_:32,Tab/binary>>, Atoms) ->
@@ -365,6 +367,14 @@ disasm_instr(B, Bs, Atoms, Literals) ->
 	    disasm_select_inst(select_val, Bs, Atoms, Literals);
 	select_tuple_arity ->
 	    disasm_select_inst(select_tuple_arity, Bs, Atoms, Literals);
+	put_map_assoc ->
+	    disasm_map_inst(put_map_assoc, Arity, Bs, Atoms, Literals);
+	put_map_exact ->
+	    disasm_map_inst(put_map_exact, Arity, Bs, Atoms, Literals);
+	get_map_elements ->
+	    disasm_map_inst(get_map_elements, Arity, Bs, Atoms, Literals);
+	has_map_fields ->
+	    disasm_map_inst(has_map_fields, Arity, Bs, Atoms, Literals);
 	_ ->
 	    try decode_n_args(Arity, Bs, Atoms, Literals) of
 		{Args, RestBs} ->
@@ -395,6 +405,16 @@ disasm_select_inst(Inst, Bs, Atoms, Literals) ->
     {List, RestBs} = decode_n_args(Len, Bs4, Atoms, Literals),
     {{Inst, [X,F,{Z,U,List}]}, RestBs}.
 
+disasm_map_inst(Inst, Arity, Bs0, Atoms, Literals) ->
+    {Args0,Bs1} = decode_n_args(Arity, Bs0, Atoms, Literals),
+    %% no droplast ..
+    [Z|Args1]  = lists:reverse(Args0),
+    Args       = lists:reverse(Args1),
+    {U, Bs2}   = decode_arg(Bs1, Atoms, Literals),
+    {u, Len}   = U,
+    {List, RestBs} = decode_n_args(Len, Bs2, Atoms, Literals),
+    {{Inst, Args ++ [{Z,U,List}]}, RestBs}.
+
 %%-----------------------------------------------------------------------
 %% decode_arg([Byte]) -> {Arg, [Byte]}
 %%
@@ -417,11 +437,12 @@ decode_arg([B|Bs]) ->
 	    decode_int(Tag, B, Bs)
     end.
 
--spec decode_arg([byte(),...], gb_tree(), literals()) -> {disasm_term(), [byte()]}.
+-spec decode_arg([byte(),...], gb_trees:tree(index(), _), literals()) ->
+        {disasm_term(), [byte()]}.
 
 decode_arg([B|Bs0], Atoms, Literals) ->
     Tag = decode_tag(B band 2#111),
-    ?NO_DEBUG('Tag = ~p, B = ~p, Bs = ~p~n', [Tag, B, Bs]),
+    ?NO_DEBUG('Tag = ~p, B = ~p, Bs = ~p~n', [Tag, B, Bs0]),
     case Tag of
 	z ->
 	    decode_z_tagged(Tag, B, Bs0, Literals);
@@ -1119,6 +1140,33 @@ resolve_inst({line,[Index]},_,_,_) ->
     {line,resolve_arg(Index)};
 
 %%
+%% 17.0
+%%
+resolve_inst({put_map_assoc,Args},_,_,_) ->
+    [FLbl,Src,Dst,{u,N},{{z,1},{u,_Len},List0}] = Args,
+    List = resolve_args(List0),
+    {put_map_assoc,FLbl,Src,Dst,N,{list,List}};
+
+resolve_inst({put_map_exact,Args},_,_,_) ->
+    [FLbl,Src,Dst,{u,N},{{z,1},{u,_Len},List0}] = Args,
+    List = resolve_args(List0),
+    {put_map_exact,FLbl,Src,Dst,N,{list,List}};
+
+resolve_inst({is_map,Args0},_,_,_) ->
+    [FLbl|Args] = resolve_args(Args0),
+    {test, is_map, FLbl, Args};
+
+resolve_inst({has_map_fields,Args0},_,_,_) ->
+    [FLbl,Src,{{z,1},{u,_Len},List0}] = Args0,
+    List = resolve_args(List0),
+    {test,has_map_fields,FLbl,Src,{list,List}};
+
+resolve_inst({get_map_elements,Args0},_,_,_) ->
+    [FLbl,Src,{{z,1},{u,_Len},List0}] = Args0,
+    List = resolve_args(List0),
+    {get_map_elements,FLbl,Src,{list,List}};
+
+%%
 %% Catches instructions that are not yet handled.
 %%
 resolve_inst(X,_,_,_) -> ?exit({resolve_inst,X}).
diff --git a/lib/compiler/src/beam_except.erl b/lib/compiler/src/beam_except.erl
index e5ec1bd904..d261809765 100644
--- a/lib/compiler/src/beam_except.erl
+++ b/lib/compiler/src/beam_except.erl
@@ -131,9 +131,13 @@ translate_exception(_, _, _, _) -> no.
 
 fix_block(Is, 0) ->
     reverse(Is);
-fix_block(Is0, Words) ->
-    [{set,[],[],{alloc,Live,{F1,F2,Needed,F3}}}|Is] = reverse(Is0),
-    [{set,[],[],{alloc,Live,{F1,F2,Needed-Words,F3}}}|Is].
+fix_block(Is, Words) ->
+    fix_block_1(reverse(Is), Words).
+
+fix_block_1([{set,[],[],{alloc,Live,{F1,F2,Needed,F3}}}|Is], Words) ->
+    [{set,[],[],{alloc,Live,{F1,F2,Needed-Words,F3}}}|Is];
+fix_block_1([I|Is], Words) ->
+    [I|fix_block_1(Is, Words)].
 
 dig_out_block_fc([{set,[],[],{alloc,Live,_}}|Bl]) ->
     case dig_out_fc(Bl, Live-1, nil) of
diff --git a/lib/compiler/src/beam_flatten.erl b/lib/compiler/src/beam_flatten.erl
index 25428c0c10..46835bece1 100644
--- a/lib/compiler/src/beam_flatten.erl
+++ b/lib/compiler/src/beam_flatten.erl
@@ -51,6 +51,7 @@ norm_block([], Acc) -> Acc.
     
 norm({set,[D],As,{bif,N,F}})      -> {bif,N,F,As,D};
 norm({set,[D],As,{alloc,R,{gc_bif,N,F}}}) -> {gc_bif,N,F,R,As,D};
+norm({set,[D],[],init})           -> {init,D};
 norm({set,[D],[S],move})          -> {move,S,D};
 norm({set,[D],[S],fmove})         -> {fmove,S,D};
 norm({set,[D],[S],fconv})         -> {fconv,S,D};
@@ -60,6 +61,10 @@ norm({set,[],[S],put})            -> {put,S};
 norm({set,[D],[S],{get_tuple_element,I}}) -> {get_tuple_element,S,I,D};
 norm({set,[],[S,D],{set_tuple_element,I}}) -> {set_tuple_element,S,D,I};
 norm({set,[D1,D2],[S],get_list})          -> {get_list,S,D1,D2};
+norm({set,[D],[S|Puts],{alloc,R,{put_map,Op,F}}}) ->
+    {put_map,F,Op,S,D,R,{list,Puts}};
+norm({set,Gets,[S],{get_map_elements,F}}) ->
+    {get_map_elements,F,S,{list,Gets}};
 norm({set,[],[],remove_message})   -> remove_message;
 norm({set,[],[],fclearerror}) -> fclearerror;
 norm({set,[],[],fcheckerror}) -> {fcheckerror,{f,0}}.
diff --git a/lib/compiler/src/beam_jump.erl b/lib/compiler/src/beam_jump.erl
index b29a3565e4..0fc8d45c80 100644
--- a/lib/compiler/src/beam_jump.erl
+++ b/lib/compiler/src/beam_jump.erl
@@ -202,19 +202,19 @@ is_label(_) -> false.
 move(Is) ->
     move_1(Is, [], []).
 
-move_1([I|Is], End0, Acc0) ->
+move_1([I|Is], Ends, Acc0) ->
     case is_exit_instruction(I) of
 	false ->
-	    move_1(Is, End0, [I|Acc0]);
+	    move_1(Is, Ends, [I|Acc0]);
 	true ->
-	    case extract_seq(Acc0, [I|End0]) of
+	    case extract_seq(Acc0, [I]) of
 		no ->
-		    move_1(Is, End0, [I|Acc0]);
+		    move_1(Is, Ends, [I|Acc0]);
 		{yes,End,Acc} ->
-		    move_1(Is, End, Acc)
+		    move_1(Is, [End|Ends], Acc)
 	    end
     end;
-move_1([], End, Acc) -> reverse(Acc, End).
+move_1([], Ends, Acc) -> reverse(Acc, lists:append(reverse(Ends))).
 
 extract_seq([{line,_}=Line|Is], Acc) ->
     extract_seq(Is, [Line|Acc]);
@@ -527,6 +527,10 @@ ulbl({bs_init,Lbl,_,_,_,_}, Used) ->
     mark_used(Lbl, Used);
 ulbl({bs_put,Lbl,_,_}, Used) ->
     mark_used(Lbl, Used);
+ulbl({put_map,Lbl,_Op,_Src,_Dst,_Live,_List}, Used) ->
+    mark_used(Lbl, Used);
+ulbl({get_map_elements,Lbl,_Src,_List}, Used) ->
+    mark_used(Lbl, Used);
 ulbl(_, Used) -> Used.
 
 mark_used({f,0}, Used) -> Used;
diff --git a/lib/compiler/src/beam_split.erl b/lib/compiler/src/beam_split.erl
index cacaaebffe..688bba9a94 100644
--- a/lib/compiler/src/beam_split.erl
+++ b/lib/compiler/src/beam_split.erl
@@ -49,6 +49,13 @@ split_block([{set,[R],As,{bif,N,{f,Lbl}=Fail}}|Is], Bl, Acc) when Lbl =/= 0 ->
 split_block([{set,[R],As,{alloc,Live,{gc_bif,N,{f,Lbl}=Fail}}}|Is], Bl, Acc)
   when Lbl =/= 0 ->
     split_block(Is, [], [{gc_bif,N,Fail,Live,As,R}|make_block(Bl, Acc)]);
+split_block([{set,[D],[S|Puts],{alloc,R,{put_map,Op,{f,Lbl}=Fail}}}|Is],
+	    Bl, Acc) when Lbl =/= 0 ->
+    split_block(Is, [], [{put_map,Fail,Op,S,D,R,{list,Puts}}|
+			 make_block(Bl, Acc)]);
+split_block([{set,Gets,[S],{get_map_elements,{f,Lbl}=Fail}}|Is], Bl, Acc)
+  when Lbl =/= 0 ->
+    split_block(Is, [], [{get_map_elements,Fail,S,{list,Gets}}|make_block(Bl, Acc)]);
 split_block([{set,[R],[],{'catch',L}}|Is], Bl, Acc) ->
     split_block(Is, [], [{'catch',R,L}|make_block(Bl, Acc)]);
 split_block([{set,[],[],{line,_}=Line}|Is], Bl, Acc) ->
diff --git a/lib/compiler/src/beam_type.erl b/lib/compiler/src/beam_type.erl
index 3b51216a6c..58c0f765ae 100644
--- a/lib/compiler/src/beam_type.erl
+++ b/lib/compiler/src/beam_type.erl
@@ -142,6 +142,12 @@ simplify_float(Is0, Ts0) ->
 	throw:not_possible -> not_possible
     end.
 
+simplify_float_1([{set,[],[],fclearerror}|Is], Ts, Rs, Acc) ->
+    simplify_float_1(Is, Ts, Rs, clearerror(Acc));
+simplify_float_1([{set,[],[],fcheckerror}|Is], Ts, Rs, Acc) ->
+    simplify_float_1(Is, Ts, Rs, checkerror(Acc));
+simplify_float_1([{set,[{fr,_}],_,_}=I|Is], Ts, Rs, Acc) ->
+    simplify_float_1(Is, Ts, Rs, [I|Acc]);
 simplify_float_1([{set,[D0],[A0],{alloc,_,{gc_bif,'-',{f,0}}}}=I|Is]=Is0,
 		 Ts0, Rs0, Acc0) ->
     case tdb_find(A0, Ts0) of
@@ -600,7 +606,7 @@ checkerror_1([], OrigIs) -> OrigIs.
 
 checkerror_2(OrigIs) -> [{set,[],[],fcheckerror}|OrigIs].
 
-
+
 %%% Routines for maintaining a type database.  The type database 
 %%% associates type information with registers.
 %%%
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index e9911fefd9..27034aecce 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -152,6 +152,7 @@ bif_to_test(is_function, [_]=Ops, Fail) -> {test,is_function,Fail,Ops};
 bif_to_test(is_function, [_,_]=Ops, Fail) -> {test,is_function2,Fail,Ops};
 bif_to_test(is_integer,  [_]=Ops, Fail) -> {test,is_integer,Fail,Ops};
 bif_to_test(is_list,     [_]=Ops, Fail) -> {test,is_list,Fail,Ops};
+bif_to_test(is_map,      [_]=Ops, Fail) -> {test,is_map,Fail,Ops};
 bif_to_test(is_number,   [_]=Ops, Fail) -> {test,is_number,Fail,Ops};
 bif_to_test(is_pid,      [_]=Ops, Fail) -> {test,is_pid,Fail,Ops};
 bif_to_test(is_port,     [_]=Ops, Fail) -> {test,is_port,Fail,Ops};
@@ -184,6 +185,7 @@ is_pure_test({test,is_lt,_,[_,_]}) -> true;
 is_pure_test({test,is_nil,_,[_]}) -> true;
 is_pure_test({test,is_nonempty_list,_,[_]}) -> true;
 is_pure_test({test,test_arity,_,[_,_]}) -> true;
+is_pure_test({test,has_map_fields,_,[_,{list,_}]}) -> true;
 is_pure_test({test,Op,_,Ops}) -> 
     erl_internal:new_type_test(Op, length(Ops)).
 
@@ -759,6 +761,12 @@ live_opt([{allocate,_,Live}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Live), D, [I|Acc]);
 live_opt([{allocate_heap,_,_,Live}=I|Is], _, D, Acc) ->
     live_opt(Is, live_call(Live), D, [I|Acc]);
+live_opt([{'%',_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{recv_set,_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
+live_opt([{recv_mark,_}=I|Is], Regs, D, Acc) ->
+    live_opt(Is, Regs, D, [I|Acc]);
 
 live_opt([], _, _, Acc) -> Acc.
 
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index eb72290306..9d5563d13b 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -213,9 +213,12 @@ validate_error_1(Error, Module, Name, Ar) ->
     {{Module,Name,Ar},
      {internal_error,'_',{Error,erlang:get_stacktrace()}}}.
 
+-type index() :: non_neg_integer().
+-type reg_tab() :: gb_trees:tree(index(), 'none' | {'value', _}).
+
 -record(st,				%Emulation state
-	{x=init_regs(0, term)        :: gb_tree(),	%x register info.
-	 y=init_regs(0, initialized) :: gb_tree(),	%y register info.
+	{x=init_regs(0, term)        :: reg_tab(),%x register info.
+	 y=init_regs(0, initialized) :: reg_tab(),%y register info.
 	 f=init_fregs(),                %
 	 numy=none,			%Number of y registers.
 	 h=0,				%Available heap size.
@@ -227,11 +230,16 @@ validate_error_1(Error, Module, Name, Ar) ->
 	 setelem=false			%Previous instruction was setelement/3.
 	}).
 
+-type label()        :: integer().
+-type label_set()    :: gb_sets:set(label()).
+-type branched_tab() :: gb_trees:tree(label(), #st{}).
+-type ft_tab()       :: gb_trees:tree().
+
 -record(vst,				%Validator state
 	{current=none              :: #st{} | 'none',	%Current state
-	 branched=gb_trees:empty() :: gb_tree(),	%States at jumps
-	 labels=gb_sets:empty()    :: gb_set(),		%All defined labels
-	 ft=gb_trees:empty()       :: gb_tree()         %Some other functions
+	 branched=gb_trees:empty() :: branched_tab(),	%States at jumps
+	 labels=gb_sets:empty()    :: label_set(),	%All defined labels
+	 ft=gb_trees:empty()       :: ft_tab()          %Some other functions
 	 		% in the module (those that start with bs_start_match2).
 	}).
 
@@ -530,7 +538,7 @@ valfun_2(I, #vst{current=#st{ct=[[Fail]|_]}}=Vst) when is_integer(Fail) ->
     %% Update branched state
     valfun_3(I, branch_state(Fail, Vst));
 valfun_2(_, _) ->
-    error(ambigous_catch_try_state).
+    error(ambiguous_catch_try_state).
 
 %% Handle the remaining floating point instructions here.
 %% Floating point.
@@ -574,6 +582,7 @@ valfun_4({apply,Live}, Vst) ->
 valfun_4({apply_last,Live,_}, Vst) ->
     tail_call(apply, Live+2, Vst);
 valfun_4({call_fun,Live}, Vst) ->
+    validate_src([{x,Live}], Vst),
     call('fun', Live+1, Vst);
 valfun_4({call,Live,Func}, Vst) ->
     call(Func, Live, Vst);
@@ -628,6 +637,7 @@ valfun_4({gc_bif,Op,{f,Fail},Live,Src,Dst}, #vst{current=St0}=Vst0) ->
     Type = bif_type(Op, Src, Vst),
     set_type_reg(Type, Dst, Vst);
 valfun_4(return, #vst{current=#st{numy=none}}=Vst) ->
+    assert_term({x,0}, Vst),
     kill_state(Vst);
 valfun_4(return, #vst{current=#st{numy=NumY}}) ->
     error({stack_frame,NumY});
@@ -768,6 +778,10 @@ valfun_4({test,is_nonempty_list,{f,Lbl},[Cons]}, Vst) ->
 valfun_4({test,test_arity,{f,Lbl},[Tuple,Sz]}, Vst) when is_integer(Sz) ->
     assert_type(tuple, Tuple, Vst),
     set_type_reg({tuple,Sz}, Tuple, branch_state(Lbl, Vst));
+valfun_4({test,has_map_fields,{f,Lbl},Src,{list,List}}, Vst) ->
+    validate_src([Src], Vst),
+    assert_strict_literal_termorder(List),
+    branch_state(Lbl, Vst);
 valfun_4({test,_Op,{f,Lbl},Src}, Vst) ->
     validate_src(Src, Vst),
     branch_state(Lbl, Vst);
@@ -864,9 +878,38 @@ valfun_4({bs_final,{f,Fail},Dst}, Vst0) ->
 valfun_4({bs_final2,Src,Dst}, Vst0) ->
     assert_term(Src, Vst0),
     set_type_reg(binary, Dst, Vst0);
+%% Map instructions.
+valfun_4({put_map_assoc,{f,Fail},Src,Dst,Live,{list,List}}, Vst) ->
+    verify_put_map(Fail, Src, Dst, Live, List, Vst);
+valfun_4({put_map_exact,{f,Fail},Src,Dst,Live,{list,List}}, Vst) ->
+    verify_put_map(Fail, Src, Dst, Live, List, Vst);
+valfun_4({get_map_elements,{f,Fail},Src,{list,List}}, Vst) ->
+    verify_get_map(Fail, Src, List, Vst);
 valfun_4(_, _) ->
     error(unknown_instruction).
 
+verify_get_map(Fail, Src, List, Vst0) ->
+    assert_term(Src, Vst0),
+    Vst1 = branch_state(Fail, Vst0),
+    Lits = mmap(fun(L,_R) -> [L] end, List),
+    assert_strict_literal_termorder(Lits),
+    verify_get_map_pair(List,Vst0,Vst1).
+
+verify_get_map_pair([],_,Vst) -> Vst;
+verify_get_map_pair([Src,Dst|Vs],Vst0,Vsti) ->
+    assert_term(Src, Vst0),
+    verify_get_map_pair(Vs,Vst0,set_type_reg(term,Dst,Vsti)).
+
+verify_put_map(Fail, Src, Dst, Live, List, Vst0) ->
+    verify_live(Live, Vst0),
+    verify_y_init(Vst0),
+    foreach(fun (Term) -> assert_term(Term, Vst0) end, List),
+    assert_term(Src, Vst0),
+    Vst1 = heap_alloc(0, Vst0),
+    Vst2 = branch_state(Fail, Vst1),
+    Vst = prune_x_regs(Live, Vst2),
+    set_type_reg(term, Dst, Vst).
+
 %%
 %% Common code for validating bs_get* instructions.
 %%
@@ -887,7 +930,7 @@ validate_bs_skip_utf(Fail, Ctx, Live, Vst0) ->
     branch_state(Fail, Vst).
 
 %%
-%% Special state handling for setelement/3 and the set_tuple_element/3 instruction.
+%% Special state handling for setelement/3 and set_tuple_element/3 instructions.
 %% A possibility for garbage collection must not occur between setelement/3 and
 %% set_tuple_element/3.
 %%
@@ -1077,6 +1120,39 @@ assert_freg_set({fr,Fr}=Freg, #vst{current=#st{f=Fregs}})
     end;
 assert_freg_set(Fr, _) -> error({bad_source,Fr}).
 
+%%% Maps
+
+%% ensure that a list of literals has a strict
+%% ascending term order (also meaning unique literals)
+assert_strict_literal_termorder(Ls) ->
+    Vs = lists:map(fun (L) -> get_literal(L) end, Ls),
+    case check_strict_value_termorder(Vs) of
+	true ->  ok;
+	false -> error({not_strict_order, Ls})
+    end.
+
+%% usage:
+%% mmap(fun(A,B) -> [{A,B}] end, [1,2,3,4]),
+%% [{1,2},{3,4}]
+
+mmap(F,List) ->
+    {arity,Ar} = erlang:fun_info(F,arity),
+    mmap(F,Ar,List).
+mmap(_F,_,[]) -> [];
+mmap(F,Ar,List) ->
+    {Hd,Tl} = lists:split(Ar,List),
+    apply(F,Hd) ++ mmap(F,Ar,Tl).
+
+check_strict_value_termorder([]) -> true;
+check_strict_value_termorder([_]) -> true;
+check_strict_value_termorder([V1,V2]) ->
+    erts_internal:cmp_term(V1,V2) < 0;
+check_strict_value_termorder([V1,V2|Vs]) ->
+    case erts_internal:cmp_term(V1,V2) < 0 of
+	true -> check_strict_value_termorder([V2|Vs]);
+	false -> false
+    end.
+
 %%%
 %%% Binary matching.
 %%%
@@ -1312,6 +1388,7 @@ assert_term(Src, Vst) ->
 %% number		Integer or Float of unknown value
 %%
 
+
 assert_type(WantedType, Term, Vst) ->
     assert_type(WantedType, get_term_type(Term, Vst)).
 
@@ -1327,7 +1404,6 @@ assert_type({tuple_element,I}, {tuple,Sz})
 assert_type(Needed, Actual) ->
     error({bad_type,{needed,Needed},{actual,Actual}}).
 
-
 %% upgrade_tuple_type(NewTupleType, OldType) -> TupleType.
 %%  upgrade_tuple_type/2 is used when linear code finds out more and
 %%  more information about a tuple type, so that the type gets more
@@ -1408,6 +1484,15 @@ get_term_type_1({y,Y}=Reg, #vst{current=#st{y=Ys}}) when is_integer(Y) ->
 get_term_type_1(Src, _) -> error({bad_source,Src}).
 
 
+%% get_literal(Src) -> literal_value().
+get_literal(nil) -> [];
+get_literal({atom,A}) when is_atom(A) -> A;
+get_literal({float,F}) when is_float(F) -> F;
+get_literal({integer,I}) when is_integer(I) -> I;
+get_literal({literal,L}) -> L;
+get_literal(T) -> error({not_literal,T}).
+
+
 branch_arities([], _, #vst{}=Vst) -> Vst;
 branch_arities([Sz,{f,L}|T], Tuple, #vst{current=St}=Vst0) 
   when is_integer(Sz) ->
diff --git a/lib/compiler/src/beam_z.erl b/lib/compiler/src/beam_z.erl
index 8c6b0c916d..c2a6ef604e 100644
--- a/lib/compiler/src/beam_z.erl
+++ b/lib/compiler/src/beam_z.erl
@@ -74,6 +74,22 @@ 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({put_map,Fail,assoc,S,D,R,L}) ->
+    {put_map_assoc,Fail,S,D,R,L};
+undo_rename({put_map,Fail,exact,S,D,R,L}) ->
+    {put_map_exact,Fail,S,D,R,L};
+undo_rename({test,has_map_fields,Fail,[Src|List]}) ->
+    {test,has_map_fields,Fail,Src,{list,[to_typed_literal(V)||V<-List]}};
+undo_rename({get_map_elements,Fail,Src,{list, List}}) ->
+    {get_map_elements,Fail,Src,{list,[to_typed_literal(V)||V<-List]}};
 undo_rename({select,I,Reg,Fail,List}) ->
     {I,Reg,Fail,{list,List}};
 undo_rename(I) -> I.
+
+%% to_typed_literal(Arg)
+%% transform Arg to specific literal i.e. float | integer | atom if applicable
+to_typed_literal({literal, V}) when is_float(V) -> {float, V};
+to_typed_literal({literal, V}) when is_atom(V) -> {atom, V};
+to_typed_literal({literal, V}) when is_integer(V) -> {integer, V};
+to_typed_literal({literal, []}) -> nil;
+to_typed_literal(V) -> V.
diff --git a/lib/compiler/src/cerl.erl b/lib/compiler/src/cerl.erl
index 4b74d60e9f..3c121f3b04 100644
--- a/lib/compiler/src/cerl.erl
+++ b/lib/compiler/src/cerl.erl
@@ -120,7 +120,17 @@
 	 update_c_bitstr/5, update_c_bitstr/6, ann_c_bitstr/5,
 	 ann_c_bitstr/6, is_c_bitstr/1, bitstr_val/1, bitstr_size/1,
 	 bitstr_bitsize/1, bitstr_unit/1, bitstr_type/1,
-	 bitstr_flags/1]).
+	 bitstr_flags/1,
+
+	 %% keep map exports here for now
+	 map_es/1,
+	 map_val/1,
+	 update_c_map/3,
+	 ann_c_map/3,
+	 map_pair_op/1,map_pair_key/1,map_pair_val/1,
+	 update_c_map_pair/4,
+	 ann_c_map_pair/4
+     ]).
 
 -export_type([c_binary/0, c_call/0, c_clause/0, c_cons/0, c_fun/0, c_literal/0,
               c_module/0, c_tuple/0, c_values/0, c_var/0, cerl/0, var_name/0]).
@@ -145,6 +155,8 @@
 -type c_let()     :: #c_let{}.
 -type c_letrec()  :: #c_letrec{}.
 -type c_literal() :: #c_literal{}.
+-type c_map()     :: #c_map{}.
+-type c_map_pair() :: #c_map_pair{}.
 -type c_module()  :: #c_module{}.
 -type c_primop()  :: #c_primop{}.
 -type c_receive() :: #c_receive{}.
@@ -155,9 +167,10 @@
 -type c_var()     :: #c_var{}.
 
 -type cerl() :: c_alias()  | c_apply()  | c_binary()  | c_bitstr()
-              | c_call()   | c_case()   | c_catch()   | c_clause() | c_cons()
+              | c_call()   | c_case()   | c_catch()   | c_clause()  | c_cons()
               | c_fun()    | c_let()    | c_letrec()  | c_literal()
-              | c_module() | c_primop() | c_receive() | c_seq()
+	      | c_map()    | c_map_pair()
+	      | c_module() | c_primop() | c_receive() | c_seq()
               | c_try()    | c_tuple()  | c_values()  | c_var().
 
 %% =====================================================================
@@ -250,8 +263,8 @@
 
 -type ctype() :: 'alias'   | 'apply'  | 'binary' | 'bitrst'  | 'call'  | 'case'
                | 'catch'   | 'clause' | 'cons'   | 'fun'     | 'let'  | 'letrec'
-               | 'literal' | 'module' | 'primop' | 'receive' | 'seq'   | 'try' 
-               | 'tuple'   | 'values' |  'var'.
+               | 'literal' | 'map'    | 'module' | 'primop'  | 'receive' | 'seq'
+	       | 'try'     | 'tuple'  | 'values' |  'var'.
 
 -spec type(cerl()) -> ctype().
 
@@ -268,6 +281,8 @@ type(#c_fun{}) -> 'fun';
 type(#c_let{}) -> 'let';
 type(#c_letrec{}) -> letrec;
 type(#c_literal{}) -> literal;
+type(#c_map{}) -> map;
+type(#c_map_pair{}) -> map_pair;
 type(#c_module{}) -> module;
 type(#c_primop{}) -> primop;
 type(#c_receive{}) -> 'receive';
@@ -1558,6 +1573,38 @@ ann_make_list(_, [], Node) ->
 
 
 %% ---------------------------------------------------------------------
+%% maps
+
+-spec map_es(c_map()) -> [cerl()].
+
+map_es(#c_map{es = Es}) ->
+    Es.
+
+-spec map_val(c_map()) -> cerl().
+map_val(#c_map{var = M}) ->
+    M.
+
+ann_c_map(As,M,Es) ->
+    #c_map{var=M,es = Es, anno = As }.
+
+update_c_map(Old,M,Es) ->
+    #c_map{var=M, es = Es, anno = get_ann(Old)}.
+
+map_pair_key(#c_map_pair{key=K}) -> K.
+map_pair_val(#c_map_pair{val=V}) -> V.
+map_pair_op(#c_map_pair{op=Op}) -> Op.
+
+-spec ann_c_map_pair([term()], cerl(), cerl(), cerl()) ->
+        c_map_pair().
+
+ann_c_map_pair(As,Op,K,V) ->
+    #c_map_pair{op=Op, key = K, val=V, anno = As}.
+
+update_c_map_pair(Old,Op,K,V) ->
+    #c_map_pair{op=Op, key=K, val=V, anno = get_ann(Old)}.
+
+
+%% ---------------------------------------------------------------------
 
 %% @spec c_tuple(Elements::[cerl()]) -> cerl()
 %%
@@ -2945,6 +2992,10 @@ pat_vars(Node, Vs) ->
 	    pat_vars(cons_hd(Node), pat_vars(cons_tl(Node), Vs));
 	tuple ->
 	    pat_list_vars(tuple_es(Node), Vs);
+	map ->
+	    pat_list_vars(map_es(Node), Vs);
+	map_pair ->
+	    pat_list_vars([map_pair_op(Node),map_pair_key(Node),map_pair_val(Node)],Vs);
 	binary ->
 	    pat_list_vars(binary_segments(Node), Vs);
 	bitstr ->
@@ -3803,7 +3854,6 @@ data_type(#c_cons{}) ->
 data_type(#c_tuple{}) ->
     tuple.
 
-
 %% @spec data_es(Node::cerl()) -> [cerl()]
 %%
 %% @doc Returns the list of subtrees of a data constructor node. If
@@ -3835,7 +3885,6 @@ data_es(#c_cons{hd = H, tl = T}) ->
 data_es(#c_tuple{es = Es}) ->
     Es.
 
-
 %% @spec data_arity(Node::cerl()) -> integer()
 %%
 %% @doc Returns the number of subtrees of a data constructor
@@ -3892,7 +3941,6 @@ ann_make_data(As, {atomic, V}, []) -> #c_literal{val = V, anno = As};
 ann_make_data(As, cons, [H, T]) -> ann_c_cons(As, H, T);
 ann_make_data(As, tuple, Es) -> ann_c_tuple(As, Es).
 
-
 %% @spec update_data(Old::cerl(), Type::dtype(),
 %%                   Elements::[cerl()]) -> cerl()
 %% @see make_data/2
@@ -4022,6 +4070,10 @@ subtrees(T) ->
 		    [[cons_hd(T)], [cons_tl(T)]];
 		tuple ->
 		    [tuple_es(T)];
+		map ->
+		    [map_es(T)];
+		map_pair ->
+		    [[map_pair_op(T)],[map_pair_key(T)],[map_pair_val(T)]];
 		'let' ->
 		    [let_vars(T), [let_arg(T)], [let_body(T)]];
 		seq ->
diff --git a/lib/compiler/src/cerl_inline.erl b/lib/compiler/src/cerl_inline.erl
index 2e7554c1ff..44293bb8ce 100644
--- a/lib/compiler/src/cerl_inline.erl
+++ b/lib/compiler/src/cerl_inline.erl
@@ -52,7 +52,7 @@
 	       clause_pats/1, clause_vars/1, concrete/1, cons_hd/1,
 	       cons_tl/1, data_arity/1, data_es/1, data_type/1,
 	       fun_body/1, fun_vars/1, get_ann/1, int_val/1,
-	       is_c_atom/1, is_c_cons/1, is_c_fun/1, is_c_int/1,
+	       is_c_atom/1, is_c_cons/1, is_c_fname/1, is_c_int/1,
 	       is_c_list/1, is_c_seq/1, is_c_tuple/1, is_c_var/1,
 	       is_data/1, is_literal/1, is_literal_term/1, let_arg/1,
 	       let_body/1, let_vars/1, letrec_body/1, letrec_defs/1,
@@ -63,7 +63,11 @@
 	       receive_clauses/1, receive_timeout/1, seq_arg/1,
 	       seq_body/1, set_ann/2, try_arg/1, try_body/1, try_vars/1,
 	       try_evars/1, try_handler/1, tuple_es/1, tuple_arity/1,
-	       type/1, values_es/1, var_name/1]).
+	       type/1, values_es/1, var_name/1,
+	       map_val/1, map_es/1, update_c_map/3,
+	       update_c_map_pair/4,
+	       map_pair_op/1, map_pair_key/1, map_pair_val/1
+	   ]).
 
 -import(lists, [foldl/3, foldr/3, mapfoldl/3, reverse/1]).
 
@@ -128,6 +132,8 @@ weight(call) -> 3;      % Assume remote-calls as efficient as `apply'.
 weight(primop) -> 2;    % Assume more efficient than `apply'.
 weight(binary) -> 4;    % Initialisation base cost.
 weight(bitstr) -> 3;    % Coding/decoding a value; like a primop.
+weight(map) -> 4;       % Initialisation base cost.
+weight(map_pair) -> 3;  % Coding/decoding a value; like a primop.
 weight(module) -> 1.    % Like a letrec with a constant body
 
 %% These "reference" structures are used for variables and function
@@ -333,6 +339,8 @@ i(E, Ctxt, Ren, Env, S0) ->
                     i_catch(E, Ctxt, Ren, Env, S);
 		binary ->
 		    i_binary(E, Ren, Env, S);
+		map ->
+		    i_map(E, Ctxt, Ren, Env, S);
                 module ->
                     i_module(E, Ctxt, Ren, Env, S)
             end
@@ -1324,6 +1332,25 @@ i_bitstr(E, Ren, Env, S) ->
     S3 = count_size(weight(bitstr), S2),
     {update_c_bitstr(E, Val, Size, Unit, Type, Flags), S3}.
 
+i_map(E, Ctx, Ren, Env, S) ->
+    %% Visit the segments for value.
+    {M1, S1} = i(map_val(E), value, Ren, Env, S),
+    {Es, S2} = mapfoldl(fun (E, S) ->
+		i_map_pair(E, Ctx, Ren, Env, S)
+	end, S1, map_es(E)),
+    S3 = count_size(weight(map), S2),
+    {update_c_map(E, M1,Es), S3}.
+
+i_map_pair(E, Ctx, Ren, Env, S) ->
+    %% It is not necessary to visit the Op and Key fields,
+    %% since these are always literals.
+    {Val, S1} = i(map_pair_val(E), Ctx, Ren, Env, S),
+    Op = map_pair_op(E),
+    Key = map_pair_key(E),
+    S2 = count_size(weight(map_pair), S1),
+    {update_c_map_pair(E, Op, Key, Val), S2}.
+
+
 %% This is a simplified version of `i_pattern', for lists of parameter
 %% variables only. It does not modify the state.
 
@@ -1383,6 +1410,16 @@ i_pattern(E, Ren, Env, Ren0, Env0, S) ->
 				S, binary_segments(E)),
 	    S2 = count_size(weight(binary), S1),
 	    {update_c_binary(E, Es), S2};
+	map ->
+	    %% map patterns should not have vals
+	    M = map_val(E),
+
+	    {Es, S1} = mapfoldl(fun (E, S) ->
+			i_map_pair_pattern(E, Ren, Env, Ren0, Env0, S)
+		end,
+		S, map_es(E)),
+	    S2 = count_size(weight(map), S1),
+	    {update_c_map(E, M, Es), S2};
 	_ ->
 	    case is_literal(E) of
 		true ->
@@ -1416,6 +1453,15 @@ i_bitstr_pattern(E, Ren, Env, Ren0, Env0, S) ->
     S3 = count_size(weight(bitstr), S2),
     {update_c_bitstr(E, Val, Size, Unit, Type, Flags), S3}.
 
+i_map_pair_pattern(E, Ren, Env, Ren0, Env0, S) ->
+    %% It is not necessary to visit the Op it is always a literal.
+    %% Same goes for Key
+    {Val, S1} = i_pattern(map_pair_val(E), Ren, Env, Ren0, Env0, S),
+    Op = map_pair_op(E), %% should be 'exact' literal
+    Key  = map_pair_key(E),
+    S2 = count_size(weight(map_pair), S1),
+    {update_c_map_pair(E, Op, Key, Val), S2}.
+
 
 %% ---------------------------------------------------------------------
 %% Other central inlining functions
@@ -1578,7 +1624,7 @@ make_let_binding_1(R, E, S) ->
 %%  completely.
 
 copy(R, Opnd, E, Ctxt, Env, S) ->
-    case is_c_var(E) of
+    case is_c_var(E) andalso not is_c_fname(E) of
         true ->
 	    %% The operand reduces to another variable - get its
 	    %% ref-structure and attempt to propagate further.
@@ -1628,12 +1674,12 @@ copy_var(R, Ctxt, Env, S) ->
     end.
 
 copy_1(R, Opnd, E, Ctxt, Env, S) ->
-    %% Fun-expression (lambdas) are a bit special; they are copyable,
-    %% but should preferably not be duplicated, so they should not be
-    %% copy propagated except into application contexts, where they can
-    %% be inlined.
-    case is_c_fun(E) of
-        true ->
+    case type(E) of
+        'fun' ->
+            %% Fun-expression (lambdas) are a bit special; they are copyable,
+            %% but should preferably not be duplicated, so they should not be
+            %% copy propagated except into application contexts, where they can
+            %% be inlined.
             case Ctxt of
                 #app{} ->
                     %% First test if the operand is "outer-pending"; if
@@ -1649,7 +1695,28 @@ copy_1(R, Opnd, E, Ctxt, Env, S) ->
                 _ ->
                     residualize_var(R, S)
             end;
-        false ->
+        var ->
+            %% Variables at this point only refer to local functions; they are
+            %% copyable but can't appear in guards, so they should not be
+            %% copy propagated except into application contexts, where they can
+            %% be inlined.
+            case Ctxt of
+                #app{} ->
+                    %% First test if the operand is "outer-pending"; if
+                    %% so, don't inline.
+                    case st__test_outer_pending(Opnd#opnd.loc, S) of
+                        false ->
+                            R1 = env__get(var_name(E), Opnd#opnd.env),
+                            copy_var(R1, Ctxt, Env, S);
+                        true ->
+                            %% Cyclic reference forced inlining to stop
+                            %% (avoiding infinite unfolding).
+                            residualize_var(R, S)
+                    end;
+                _ ->
+                    residualize_var(R, S)
+            end;
+        _ ->
             %% We have no other cases to handle here
             residualize_var(R, S)
     end.
diff --git a/lib/compiler/src/cerl_trees.erl b/lib/compiler/src/cerl_trees.erl
index 1e3755025f..2ebeab243f 100644
--- a/lib/compiler/src/cerl_trees.erl
+++ b/lib/compiler/src/cerl_trees.erl
@@ -55,7 +55,15 @@
 	       update_c_let/4, update_c_letrec/3, update_c_module/5,
 	       update_c_primop/3, update_c_receive/4, update_c_seq/3,
 	       update_c_try/6, update_c_tuple/2, update_c_tuple_skel/2,
-	       update_c_values/2, values_es/1, var_name/1]).
+	       update_c_values/2, values_es/1, var_name/1,
+
+	       map_val/1, map_es/1,
+	       ann_c_map/3,
+	       update_c_map/3,
+	       map_pair_key/1,map_pair_val/1,map_pair_op/1,
+	       ann_c_map_pair/4,
+	       update_c_map_pair/4
+	   ]).
 
 
 %% ---------------------------------------------------------------------
@@ -129,6 +137,12 @@ map_1(F, T) ->
 			       map(F, cons_tl(T)));
  	tuple ->
 	    update_c_tuple_skel(T, map_list(F, tuple_es(T)));
+ 	map ->
+	    update_c_map(T, map(F,map_val(T)), map_list(F, map_es(T)));
+	map_pair ->
+	    update_c_map_pair(T, map(F, map_pair_op(T)),
+                                 map(F, map_pair_key(T)),
+                                 map(F, map_pair_val(T)));
  	'let' ->
 	    update_c_let(T, map_list(F, let_vars(T)),
 			 map(F, let_arg(T)),
@@ -235,6 +249,14 @@ fold_1(F, S, T) ->
 	    fold(F, fold(F, S, cons_hd(T)), cons_tl(T));
 	tuple ->
 	    fold_list(F, S, tuple_es(T));
+	map ->
+	    fold_list(F, S, map_es(T));
+	map_pair ->
+	    fold(F,
+		fold(F,
+		    fold(F, S, map_pair_op(T)),
+		    map_pair_key(T)),
+		map_pair_val(T));
  	'let' ->
 	    fold(F, fold(F, fold_list(F, S, let_vars(T)),
 			 let_arg(T)),
@@ -349,6 +371,15 @@ mapfold(F, S0, T) ->
  	tuple ->
 	    {Ts, S1} = mapfold_list(F, S0, tuple_es(T)),
 	    F(update_c_tuple_skel(T, Ts), S1);
+	map ->
+	    {M , S1} = mapfold(F, S0, map_val(T)),
+	    {Ts, S2} = mapfold_list(F, S1, map_es(T)),
+	    F(update_c_map(T, M, Ts), S2);
+	map_pair ->
+	    {Op,  S1} = mapfold(F, S0, map_pair_op(T)),
+	    {Key, S2} = mapfold(F, S1, map_pair_key(T)),
+	    {Val, S3} = mapfold(F, S2, map_pair_val(T)),
+	    F(update_c_map_pair(T,Op,Key,Val), S3);
  	'let' ->
 	    {Vs, S1} = mapfold_list(F, S0, let_vars(T)),
 	    {A, S2} = mapfold(F, S1, let_arg(T)),
@@ -488,6 +519,10 @@ variables(T, S) ->
 			  variables(cons_tl(T), S));
 	tuple ->
 	    vars_in_list(tuple_es(T), S);
+	map ->
+	    vars_in_list(map_es(T), S);
+	map_pair ->
+	    vars_in_list([map_pair_op(T),map_pair_key(T), map_pair_val(T)], S);
 	'let' ->
 	    Vs = variables(let_body(T), S),
 	    Vs1 = var_list_names(let_vars(T)),
@@ -688,6 +723,17 @@ label(T, N, Env) ->
 	    {Ts, N1} = label_list(tuple_es(T), N, Env),
 	    {As, N2} = label_ann(T, N1),
 	    {ann_c_tuple_skel(As, Ts), N2};
+ 	map ->
+	    {M,  N1} = label(map_val(T), N, Env),
+	    {Ts, N2} = label_list(map_es(T), N1, Env),
+	    {As, N3} = label_ann(T, N2),
+	    {ann_c_map(As, M, Ts), N3};
+	map_pair ->
+	    {Op,  N1} = label(map_pair_op(T), N, Env),
+	    {Val, N2} = label(map_pair_key(T), N1, Env),
+	    {Key, N3} = label(map_pair_val(T), N2, Env),
+	    {As,  N4} = label_ann(T, N3),
+	    {ann_c_map_pair(As,Op,Key,Val), N4};
  	'let' ->
 	    {A, N1} = label(let_arg(T), N, Env),
 	    {Vs, N2, Env1} = label_vars(let_vars(T), N1, Env),
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 2ca403de54..e79fe41f9b 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -41,7 +41,8 @@
 
 -type option() :: atom() | {atom(), term()} | {'d', atom(), term()}.
 
--type err_info() :: {erl_scan:line(), module(), term()}. %% ErrorDescriptor
+-type err_info() :: {erl_scan:line() | 'none',
+		     module(), term()}. %% ErrorDescriptor
 -type errors()   :: [{file:filename(), [err_info()]}].
 -type warnings() :: [{file:filename(), [err_info()]}].
 -type mod_ret()  :: {'ok', module()}
@@ -229,12 +230,25 @@ format_error({undef_parse_transform,M}) ->
 format_error({core_transform,M,R}) ->
     io_lib:format("error in core transform '~s': ~tp", [M, R]);
 format_error({crash,Pass,Reason}) ->
-    io_lib:format("internal error in ~p;\ncrash reason: ~tp", [Pass,Reason]);
+    io_lib:format("internal error in ~p;\ncrash reason: ~ts", [Pass,format_error_reason(Reason)]);
 format_error({bad_return,Pass,Reason}) ->
-    io_lib:format("internal error in ~p;\nbad return value: ~tp", [Pass,Reason]);
+    io_lib:format("internal error in ~p;\nbad return value: ~ts", [Pass,format_error_reason(Reason)]);
 format_error({module_name,Mod,Filename}) ->
-    io_lib:format("Module name '~s' does not match file name '~ts'",
-		  [Mod,Filename]).
+    io_lib:format("Module name '~s' does not match file name '~ts'", [Mod,Filename]).
+
+format_error_reason({Reason, Stack}) when is_list(Stack) ->
+    StackFun = fun
+	(escript, run,      2) -> true;
+	(escript, start,    1) -> true;
+	(init,    start_it, 1) -> true;
+	(init,    start_em, 1) -> true;
+	(_Mod, _Fun, _Arity)   -> false
+    end,
+    FormatFun = fun (Term, _) -> io_lib:format("~tp", [Term]) end,
+    [io_lib:format("~tp", [Reason]),"\n\n",
+     lib:format_stacktrace(1, erlang:get_stacktrace(), StackFun, FormatFun)];
+format_error_reason(Reason) ->
+    io_lib:format("~tp", [Reason]).
 
 %% The compile state record.
 -record(compile, {filename="" :: file:filename(),
@@ -416,6 +430,10 @@ pass(from_core) ->
 pass(from_asm) ->
     {".S",[?pass(beam_consult_asm)|asm_passes()]};
 pass(asm) ->
+    %% TODO: remove 'asm' in R18
+    io:format("compile:file/2 option 'asm' has been deprecated and will be "
+	      "removed in R18.~n"
+	      "Use 'from_asm' instead.~n"),
     pass(from_asm);
 pass(from_beam) ->
     {".beam",[?pass(read_beam_file)|binary_passes()]};
@@ -605,9 +623,11 @@ core_passes() ->
        [{core_old_inliner,fun test_old_inliner/1,fun core_old_inliner/1},
 	{iff,doldinline,{listing,"oldinline"}},
 	?pass(core_fold_module),
+	{iff,dcorefold,{listing,"corefold"}},
 	{core_inline_module,fun test_core_inliner/1,fun core_inline_module/1},
 	{iff,dinline,{listing,"inline"}},
-	{core_fold_after_inline,fun test_core_inliner/1,fun core_fold_module/1},
+        {core_fold_after_inlining,fun test_any_inliner/1,
+         fun core_fold_module_after_inlining/1},
 	?pass(core_transforms)]},
        {iff,dcopt,{listing,"copt"}},
        {iff,'to_core',{done,"core"}}]}
@@ -1129,6 +1149,12 @@ core_fold_module(#compile{code=Code0,options=Opts,warnings=Warns}=St) ->
     {ok,Code,Ws} = sys_core_fold:module(Code0, Opts),
     {ok,St#compile{code=Code,warnings=Warns ++ Ws}}.
 
+core_fold_module_after_inlining(#compile{code=Code0,options=Opts}=St) ->
+    %% Inlining may produce code that generates spurious warnings.
+    %% Ignore all warnings.
+    {ok,Code,_Ws} = sys_core_fold:module(Code0, Opts),
+    {ok,St#compile{code=Code}}.
+
 test_old_inliner(#compile{options=Opts}) ->
     %% The point of this test is to avoid loading the old inliner
     %% if we know that it will not be used.
@@ -1147,6 +1173,9 @@ test_core_inliner(#compile{options=Opts}) ->
 		end, Opts)
     end.
 
+test_any_inliner(St) ->
+    test_old_inliner(St) orelse test_core_inliner(St).
+
 core_old_inliner(#compile{code=Code0,options=Opts}=St) ->
     {ok,Code} = sys_core_inline:module(Code0, Opts),
     {ok,St#compile{code=Code}}.
@@ -1290,10 +1319,10 @@ native_compile_1(St) ->
 	{error,R} ->
 	    case IgnoreErrors of
 		true ->
-		    Ws = [{St#compile.ifile,[{?MODULE,{native,R}}]}],
+		    Ws = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
 		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
 		false ->
-		    Es = [{St#compile.ifile,[{?MODULE,{native,R}}]}],
+		    Es = [{St#compile.ifile,[{none,?MODULE,{native,R}}]}],
 		    {error,St#compile{errors=St#compile.errors ++ Es}}
 	    end
     catch
@@ -1302,7 +1331,7 @@ native_compile_1(St) ->
 	    case IgnoreErrors of
 		true ->
 		    Ws = [{St#compile.ifile,
-			   [{?MODULE,{native_crash,R,Stk}}]}],
+			   [{none,?MODULE,{native_crash,R,Stk}}]}],
 		    {ok,St#compile{warnings=St#compile.warnings ++ Ws}};
 		false ->
 		    erlang:raise(Class, R, Stk)
@@ -1349,7 +1378,7 @@ save_binary(#compile{module=Mod,ofile=Outfile,
 		    save_binary_1(St);
 		_ ->
 		    Es = [{St#compile.ofile,
-			   [{?MODULE,{module_name,Mod,Base}}]}],
+			   [{none,?MODULE,{module_name,Mod,Base}}]}],
 		    {error,St#compile{errors=St#compile.errors ++ Es}}
 	    end
     end.
@@ -1363,20 +1392,20 @@ save_binary_1(St) ->
 		ok ->
 		    {ok,St};
 		{error,RenameError} ->
-		    Es0 = [{Ofile,[{?MODULE,{rename,Tfile,Ofile,
-					     RenameError}}]}],
+		    Es0 = [{Ofile,[{none,?MODULE,{rename,Tfile,Ofile,
+						  RenameError}}]}],
 		    Es = case file:delete(Tfile) of
 			     ok -> Es0;
 			     {error,DeleteError} ->
 				 Es0 ++
 				     [{Ofile,
-				       [{?MODULE,{delete_temp,Tfile,
-						  DeleteError}}]}]
+				       [{none,?MODULE,{delete_temp,Tfile,
+						       DeleteError}}]}]
 			 end,
 		    {error,St#compile{errors=St#compile.errors ++ Es}}
 	    end;
 	{error,_Error} ->
-	    Es = [{Tfile,[{compile,write_error}]}],
+	    Es = [{Tfile,[{none,compile,write_error}]}],
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
     end.
 
@@ -1419,6 +1448,9 @@ report_warnings(#compile{options=Opts,warnings=Ws0}) ->
 	false -> ok
     end.
 
+format_message(F, P, [{none,Mod,E}|Es]) ->
+    M = {none,io_lib:format("~ts: ~s~ts\n", [F,P,Mod:format_error(E)])},
+    [M|format_message(F, P, Es)];
 format_message(F, P, [{{Line,Column}=Loc,Mod,E}|Es]) ->
     M = {{F,Loc},io_lib:format("~ts:~w:~w ~s~ts\n",
                                 [F,Line,Column,P,Mod:format_error(E)])},
@@ -1428,12 +1460,17 @@ format_message(F, P, [{Line,Mod,E}|Es]) ->
                                 [F,Line,P,Mod:format_error(E)])},
     [M|format_message(F, P, Es)];
 format_message(F, P, [{Mod,E}|Es]) ->
+    %% Not documented and not expected to be used any more, but
+    %% keep a while just in case.
     M = {none,io_lib:format("~ts: ~s~ts\n", [F,P,Mod:format_error(E)])},
     [M|format_message(F, P, Es)];
 format_message(_, _, []) -> [].
 
 %% list_errors(File, ErrorDescriptors) -> ok
 
+list_errors(F, [{none,Mod,E}|Es]) ->
+    io:fwrite("~ts: ~ts\n", [F,Mod:format_error(E)]),
+    list_errors(F, Es);
 list_errors(F, [{{Line,Column},Mod,E}|Es]) ->
     io:fwrite("~ts:~w:~w: ~ts\n", [F,Line,Column,Mod:format_error(E)]),
     list_errors(F, Es);
@@ -1441,6 +1478,8 @@ list_errors(F, [{Line,Mod,E}|Es]) ->
     io:fwrite("~ts:~w: ~ts\n", [F,Line,Mod:format_error(E)]),
     list_errors(F, Es);
 list_errors(F, [{Mod,E}|Es]) ->
+    %% Not documented and not expected to be used any more, but
+    %% keep a while just in case.
     io:fwrite("~ts: ~ts\n", [F,Mod:format_error(E)]),
     list_errors(F, Es);
 list_errors(_F, []) -> ok.
@@ -1545,7 +1584,7 @@ restore_expand_module([F|Fs]) ->
     [F|restore_expand_module(Fs)];
 restore_expand_module([]) -> [].
 
-
+
 -spec options() -> 'ok'.
 
 options() ->
@@ -1582,7 +1621,7 @@ help([_|T]) ->
 help(_) ->
     ok.
 
-
+
 %% compile(AbsFileName, Outfilename, Options)
 %%   Compile entry point for erl_compile.
 
@@ -1602,7 +1641,7 @@ compile_beam(File0, _OutFile, Opts) ->
 
 compile_asm(File0, _OutFile, Opts) ->
     File = shorten_filename(File0),
-    case file(File, [asm|make_erl_options(Opts)]) of
+    case file(File, [from_asm|make_erl_options(Opts)]) of
 	{ok,_Mod} -> ok;
 	Other -> Other
     end.
diff --git a/lib/compiler/src/compiler.appup.src b/lib/compiler/src/compiler.appup.src
index 54a63833e6..fe273b269c 100644
--- a/lib/compiler/src/compiler.appup.src
+++ b/lib/compiler/src/compiler.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, compiler}]}],
+ [{<<".*">>,[{restart_application, compiler}]}]
+}.
diff --git a/lib/compiler/src/core_lib.erl b/lib/compiler/src/core_lib.erl
index 824be9ff7f..ed181e3baa 100644
--- a/lib/compiler/src/core_lib.erl
+++ b/lib/compiler/src/core_lib.erl
@@ -105,6 +105,10 @@ vu_expr(V, #c_cons{hd=H,tl=T}) ->
     vu_expr(V, H) orelse vu_expr(V, T);
 vu_expr(V, #c_tuple{es=Es}) ->
     vu_expr_list(V, Es);
+vu_expr(V, #c_map{var=M,es=Es}) ->
+    vu_expr(V, M) orelse vu_expr_list(V, Es);
+vu_expr(V, #c_map_pair{key=Key,val=Val}) ->
+    vu_expr_list(V, [Key,Val]);
 vu_expr(V, #c_binary{segments=Ss}) ->
     vu_seg_list(V, Ss);
 vu_expr(V, #c_fun{vars=Vs,body=B}) ->
diff --git a/lib/compiler/src/core_lint.erl b/lib/compiler/src/core_lint.erl
index 1e8983f594..36165245a6 100644
--- a/lib/compiler/src/core_lint.erl
+++ b/lib/compiler/src/core_lint.erl
@@ -68,7 +68,7 @@
                   | {'undefined_function', fa(), fa()}
                   | {'tail_segment_not_at_end', fa()}.
 
--type error()    :: {module(), err_desc()}.
+-type error()    :: {'none', module(), err_desc()}.
 -type warning()  :: {module(), term()}.
 
 %%-----------------------------------------------------------------------
@@ -162,7 +162,7 @@ return_status(St) ->
 %% add_warning(ErrorDescriptor, State) -> State'
 %%  Note that we don't use line numbers here.
 
-add_error(E, St) -> St#lint{errors=[{?MODULE,E}|St#lint.errors]}.
+add_error(E, St) -> St#lint{errors=[{none,?MODULE,E}|St#lint.errors]}.
 
 %%add_warning(W, St) -> St#lint{warnings=[{none,core_lint,W}|St#lint.warnings]}.
 
@@ -254,6 +254,10 @@ gexpr(#c_cons{hd=H,tl=T}, Def, _Rt, St) ->
     gexpr_list([H,T], Def, St);
 gexpr(#c_tuple{es=Es}, Def, _Rt, St) ->
     gexpr_list(Es, Def, St);
+gexpr(#c_map{es=Es}, Def, _Rt, St) ->
+    gexpr_list(Es, Def, St);
+gexpr(#c_map_pair{key=K,val=V}, Def, _Rt, St) ->
+    gexpr_list([K,V], Def, St);
 gexpr(#c_binary{segments=Ss}, Def, _Rt, St) ->
     gbitstr_list(Ss, Def, St);
 gexpr(#c_seq{arg=Arg,body=B}, Def, Rt, St0) ->
@@ -278,6 +282,7 @@ gexpr(#c_case{arg=Arg,clauses=Cs}, Def, Rt, St0) ->
     St1 = gbody(Arg, Def, PatCount, St0),
     clauses(Cs, Def, PatCount, Rt, St1);
 gexpr(_Core, _, _, St) ->
+    %%io:fwrite("clint gexpr: ~p~n", [_Core]),
     add_error({illegal_guard,St#lint.func}, St).
 
 %% gexpr_list([Expr], Defined, State) -> State.
@@ -303,6 +308,10 @@ expr(#c_cons{hd=H,tl=T}, Def, _Rt, St) ->
     expr_list([H,T], Def, St);
 expr(#c_tuple{es=Es}, Def, _Rt, St) ->
     expr_list(Es, Def, St);
+expr(#c_map{es=Es}, Def, _Rt, St) ->
+    expr_list(Es, Def, St);
+expr(#c_map_pair{key=K,val=V},Def,_Rt,St) ->
+    expr_list([K,V],Def,St);
 expr(#c_binary{segments=Ss}, Def, _Rt, St) ->
     bitstr_list(Ss, Def, St);
 expr(#c_fun{vars=Vs,body=B}, Def, Rt, St0) ->
@@ -355,7 +364,7 @@ expr(#c_try{arg=A,vars=Vs,body=B,evars=Evs,handler=H}, Def, Rt, St0) ->
     {Ens,St5} = variable_list(Evs, St4),
     body(H, union(Ens, Def), Rt, St5);
 expr(_Other, _, _, St) ->
-    %%io:fwrite("clint: ~p~n", [_Other]),
+    %%io:fwrite("clint expr: ~p~n", [_Other]),
     add_error({illegal_expr,St#lint.func}, St).
 
 %% expr_list([Expr], Defined, State) -> State.
@@ -454,13 +463,19 @@ pattern(#c_cons{hd=H,tl=T}, Def, Ps, St) ->
     pattern_list([H,T], Def, Ps, St);
 pattern(#c_tuple{es=Es}, Def, Ps, St) ->
     pattern_list(Es, Def, Ps, St);
+pattern(#c_map{es=Es}, Def, Ps, St) ->
+    pattern_list(Es, Def, Ps, St);
+pattern(#c_map_pair{op=#c_literal{val=exact},key=K,val=V},Def,Ps,St) ->
+    pattern_list([K,V],Def,Ps,St);
 pattern(#c_binary{segments=Ss}, Def, Ps, St0) ->
     St = pat_bin_tail_check(Ss, St0),
     pat_bin(Ss, Def, Ps, St);
 pattern(#c_alias{var=V,pat=P}, Def, Ps, St0) ->
     {Vvs,St1} = variable(V, Ps, St0),
     pattern(P, Def, union(Vvs, Ps), St1);
-pattern(_, _, Ps, St) -> {Ps,add_error({not_pattern,St#lint.func}, St)}.
+pattern(_Other, _, Ps, St) ->
+    %%io:fwrite("clint pattern: ~p~n", [_Other]),
+    {Ps,add_error({not_pattern,St#lint.func}, St)}.
 
 pat_var(N, _Def, Ps, St) ->
     case is_element(N, Ps) of
diff --git a/lib/compiler/src/core_parse.hrl b/lib/compiler/src/core_parse.hrl
index 0b8f4d8895..d54715ef59 100644
--- a/lib/compiler/src/core_parse.hrl
+++ b/lib/compiler/src/core_parse.hrl
@@ -96,3 +96,12 @@
 -record(c_values, {anno=[], es}).	% es :: [Tree]
 
 -record(c_var, {anno=[], name :: cerl:var_name()}).
+
+-record(c_map_pair, {anno=[],
+	             op :: #c_literal{val::'assoc'} | #c_literal{val::'exact'},
+		     key,
+		     val}).
+
+-record(c_map, {anno=[],
+		var=#c_literal{val=[]} :: #c_var{} | #c_literal{},
+		es :: [#c_map_pair{}]}).
diff --git a/lib/compiler/src/core_parse.yrl b/lib/compiler/src/core_parse.yrl
index 4e98a8c2da..b8db0f683a 100644
--- a/lib/compiler/src/core_parse.yrl
+++ b/lib/compiler/src/core_parse.yrl
@@ -21,6 +21,8 @@
 %% Have explicit productions for annotated phrases named anno_XXX.
 %% This just does an XXX and adds the annotation.
 
+Expect 1.
+
 Nonterminals
 
 module_definition module_export module_attribute module_defs
@@ -44,6 +46,9 @@ receive_expr timeout try_expr
 sequence catch_expr
 variable clause clause_pattern
 
+map_expr map_pairs map_pair map_pair_assoc map_pair_exact
+map_pattern map_pair_patterns map_pair_pattern
+
 annotation anno_fun anno_expression anno_expressions
 anno_variable anno_variables anno_pattern anno_patterns
 anno_function_name
@@ -53,7 +58,7 @@ Terminals
 
 %% Separators
 
-'(' ')' '{' '}' '[' ']' '|' ',' '->' '=' '/' '<' '>' ':' '-|' '#'
+'(' ')' '{' '}' '[' ']' '|' ',' '->' '=' '/' '<' '>' ':' '-|' '#' '~' '::'
 
 %% Keywords (atoms are assumed to always be single-quoted).
 
@@ -166,6 +171,7 @@ anno_patterns -> anno_pattern : ['$1'].
 
 other_pattern -> atomic_pattern : '$1'.
 other_pattern -> tuple_pattern : '$1'.
+other_pattern -> map_pattern : '$1'.
 other_pattern -> cons_pattern : '$1'.
 other_pattern -> binary_pattern : '$1'.
 other_pattern -> anno_variable '=' anno_pattern :
@@ -176,6 +182,16 @@ atomic_pattern -> atomic_literal : '$1'.
 tuple_pattern -> '{' '}' : c_tuple([]).
 tuple_pattern -> '{' anno_patterns '}' : c_tuple('$2').
 
+map_pattern -> '~' '{' '}' '~' : #c_map{es=[]}.
+map_pattern -> '~' '{' map_pair_patterns '}' '~' :
+		   #c_map{es=lists:sort('$3')}.
+
+map_pair_patterns -> map_pair_pattern : ['$1'].
+map_pair_patterns -> map_pair_pattern ',' map_pair_patterns : ['$1' | '$3'].
+
+map_pair_pattern -> '~' '<' anno_pattern ',' anno_pattern '>' :
+			#c_map_pair{op=#c_literal{val=exact},key='$3',val='$5'}.
+
 cons_pattern -> '[' anno_pattern tail_pattern :
 		    #c_cons{hd='$2',tl='$3'}.
 
@@ -240,6 +256,7 @@ single_expression -> primop_expr : '$1'.
 single_expression -> try_expr : '$1'.
 single_expression -> sequence : '$1'.
 single_expression -> catch_expr : '$1'.
+single_expression -> map_expr : '$1'.
 
 literal -> atomic_literal : '$1'.
 literal -> tuple_literal : '$1'.
@@ -267,6 +284,22 @@ tail_literal -> ',' literal tail_literal : #c_cons{hd='$2',tl='$3'}.
 tuple -> '{' '}' : c_tuple([]).
 tuple -> '{' anno_expressions '}' : c_tuple('$2').
 
+map_expr -> '~' '{' '}' '~' : #c_map{es=[]}.
+map_expr -> '~' '{' map_pairs  '}' '~' : #c_map{es='$3'}.
+map_expr -> variable '~' '{' '}' '~' : #c_map{var='$1',es=[]}.
+map_expr -> variable '~' '{' map_pairs  '}' '~' : #c_map{var='$1',es='$4'}.
+
+map_pairs -> map_pair : ['$1'].
+map_pairs -> map_pair ',' map_pairs : ['$1' | '$3'].
+
+map_pair -> map_pair_assoc : '$1'.
+map_pair -> map_pair_exact : '$1'.
+
+map_pair_assoc -> '::' '<' anno_expression ',' anno_expression'>' :
+		#c_map_pair{op=#c_literal{val=assoc},key='$3',val='$5'}.
+map_pair_exact -> '~' '<' anno_expression ',' anno_expression'>' :
+		#c_map_pair{op=#c_literal{val=exact},key='$3',val='$5'}.
+
 cons -> '[' anno_expression tail : c_cons('$2', '$3').
 
 tail -> ']' : #c_literal{val=[]}.
@@ -381,3 +414,5 @@ Erlang code.
 
 tok_val(T) -> element(3, T).
 tok_line(T) -> element(2, T).
+
+%% vim: syntax=erlang
diff --git a/lib/compiler/src/core_pp.erl b/lib/compiler/src/core_pp.erl
index 1f91a52be3..faa26ec6df 100644
--- a/lib/compiler/src/core_pp.erl
+++ b/lib/compiler/src/core_pp.erl
@@ -161,6 +161,27 @@ format_1(#c_tuple{es=Es}, Ctxt) ->
      format_hseq(Es, ",", add_indent(Ctxt, 1), fun format/2),
      $}
     ];
+format_1(#c_map{var=#c_var{}=Var,es=Es}, Ctxt) ->
+    [format_1(Var, Ctxt),
+     "~{",
+     format_hseq(Es, ",", add_indent(Ctxt, 1), fun format/2),
+     "}~"
+    ];
+format_1(#c_map{es=Es}, Ctxt) ->
+    ["~{",
+     format_hseq(Es, ",", add_indent(Ctxt, 1), fun format/2),
+     "}~"
+    ];
+format_1(#c_map_pair{op=#c_literal{val=assoc},key=K,val=V}, Ctxt) ->
+    ["::<",
+     format_hseq([K,V], ",", add_indent(Ctxt, 1), fun format/2),
+     ">"
+    ];
+format_1(#c_map_pair{op=#c_literal{val=exact},key=K,val=V}, Ctxt) ->
+    ["~<",
+     format_hseq([K,V], ",", add_indent(Ctxt, 1), fun format/2),
+     ">"
+    ];
 format_1(#c_cons{hd=H,tl=T}, Ctxt) ->
     Txt = ["["|format(H, add_indent(Ctxt, 1))],
     [Txt|format_list_tail(T, add_indent(Ctxt, width(Txt, Ctxt)))];
diff --git a/lib/compiler/src/core_scan.erl b/lib/compiler/src/core_scan.erl
index 0ca2f57dde..b7799b373a 100644
--- a/lib/compiler/src/core_scan.erl
+++ b/lib/compiler/src/core_scan.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
 %% 
 %% The 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,7 +95,7 @@ format_error(Other) -> io_lib:write(Other).
 
 string_thing($') -> "atom";    %' stupid emacs
 string_thing($") -> "string".  %" stupid emacs
-
+
 %% Re-entrant pre-scanner.
 %%
 %% If the input list of characters is insufficient to build a term the
@@ -214,7 +213,7 @@ pre_comment(eof, Sofar, Pos) ->
 
 pre_error(E, Epos, Pos) ->
     {error,{Epos,core_scan,E}, Pos}.
-
+
 %% scan(CharList, StartPos)
 %%  This takes a list of characters and tries to tokenise them.
 %%
@@ -272,6 +271,8 @@ scan1("->" ++ Cs, Toks, Pos) ->
     scan1(Cs, [{'->',Pos}|Toks], Pos);
 scan1("-|" ++ Cs, Toks, Pos) ->
     scan1(Cs, [{'-|',Pos}|Toks], Pos);
+scan1("::" ++ Cs, Toks, Pos) ->
+    scan1(Cs, [{'::',Pos}|Toks], Pos);
 scan1([C|Cs], Toks, Pos) ->				%Punctuation character
     P = list_to_atom([C]),
     scan1(Cs, [{P,Pos}|Toks], Pos);
diff --git a/lib/compiler/src/genop.tab b/lib/compiler/src/genop.tab
index 75ac91907a..7d6bf56ccb 100644..100755
--- a/lib/compiler/src/genop.tab
+++ b/lib/compiler/src/genop.tab
@@ -23,45 +23,148 @@ BEAM_FORMAT_NUMBER=0
 # arity or semantics, the format number above must be bumped.
 #
 
+## @spec label Lbl
+## @doc Specify a module local label.
+##      Label gives this code address a name (Lbl) and marks the start of
+##      a basic block.
 1: label/1
+
+## @spec func_info M F A
+## @doc Define a function M:F/A
 2: func_info/3
+
 3: int_code_end/0
 
 #
 # Function and BIF calls.
 #
+
+## @spec call Arity Label
+## @doc Call the function at Label.
+##      Save the next instruction as the return address in the CP register.
 4: call/2
+
+## @spec call_last Arity Label Dellocate
+## @doc Deallocate and do a tail recursive call to the function at Label.
+##      Do not update the CP register.
+##      Before the call deallocate Deallocate words of stack.
 5: call_last/3
+
+## @spec call_only Arity Label
+## @doc Do a tail recursive call to the function at Label.
+##      Do not update the CP register.
 6: call_only/2
 
+## @spec call_ext Arity Destination
+## @doc Call the function of arity Arity pointed to by Destination.
+##      Save the next instruction as the return address in the CP register.
 7: call_ext/2
+
+## @spec call_ext_last Arity Destination Deallocate
+## @doc Deallocate and do a tail call to function of arity Arity
+##      pointed to by Destination.
+##      Do not update the CP register.
+##      Deallocate Deallocate words from the stack before the call.
 8: call_ext_last/3
 
+## @spec bif0 Bif Reg
+## @doc Call the bif Bif and store the result in Reg.
 9: bif0/2
+
+## @spec bif1 Lbl Bif Arg Reg
+## @doc Call the bif Bif with the argument Arg, and store the result in Reg.
+##      On failure jump to Lbl.
 10: bif1/4
+
+## @spec bif2 Lbl Bif Arg1 Arg2 Reg
+## @doc Call the bif Bif with the arguments Arg1 and Arg2,
+##      and store the result in Reg.
+##      On failure jump to Lbl.
 11: bif2/5
 
 #
 # Allocating, deallocating and returning.
 #
+
+## @spec allocate StackNeed Live
+## @doc Allocate space for StackNeed words on the stack. If a GC is needed
+##      during allocation there are Live number of live X registers.
+##      Also save the continuation pointer (CP) on the stack.
 12: allocate/2
+
+## @spec allocate_heap StackNeed HeapNeed Live
+## @doc Allocate space for StackNeed words on the stack and ensure there is
+##      space for HeapNeed words on the heap. If a GC is needed
+##      save Live number of X registers.
+##      Also save the continuation pointer (CP) on the stack.
 13: allocate_heap/3
+
+## @spec allocate_zero StackNeed Live
+## @doc Allocate space for StackNeed words on the stack. If a GC is needed
+##      during allocation there are Live number of live X registers.
+##      Clear the new stack words. (By writing NIL.)
+##      Also save the continuation pointer (CP) on the stack.
 14: allocate_zero/2
+
+## @spec allocate_heap_zero StackNeed HeapNeed Live
+## @doc Allocate space for StackNeed words on the stack and HeapNeed words
+##      on the heap. If a GC is needed
+##      during allocation there are Live number of live X registers.
+##      Clear the new stack words. (By writing NIL.)
+##      Also save the continuation pointer (CP) on the stack.
 15: allocate_heap_zero/3
+
+## @spec test_heap HeapNeed Live
+## @doc Ensure there is space for HeapNeed words on the heap. If a GC is needed
+##      save Live number of X registers.
 16: test_heap/2
+
+## @spec init N
+## @doc  Clear the Nth stack word. (By writing NIL.)
 17: init/1
+
+## @spec deallocate N
+## @doc  Restore the continuation pointer (CP) from the stack and deallocate
+##       N+1 words from the stack (the + 1 is for the CP).
 18: deallocate/1
+
+## @spec return
+## @doc  Return to the address in the continuation pointer (CP).
 19: return/0
 
 #
 # Sending & receiving.
 #
+## @spec send
+## @doc  Send argument in x(0) as a message to the destination process in x(0).
+##       The message in x(1) ends up as the result of the send in x(0).
 20: send/0
+
+## @spec remove_message
+## @doc  Unlink the current message from the message queue and store a
+##       pointer to the message in x(0). Remove any timeout.
 21: remove_message/0
+
+## @spec timeout
+## @doc  Reset the save point of the mailbox and clear the timeout flag.
 22: timeout/0
+
+## @spec loop_rec Label Source
+## @doc  Loop over the message queue, if it is empty jump to Label.
 23: loop_rec/2
+
+## @spec loop_rec_end Label
+## @doc  Advance the save pointer to the next message and jump back to Label.
 24: loop_rec_end/1
+
+## @spec wait Label
+## @doc  Suspend the processes and set the entry point to the beginning of the
+##       receive loop at Label.
 25: wait/1
+
+## @spec wait_timeout Lable Time
+## @doc  Sets up a timeout of Time milllisecons and saves the address of the
+##       following instruction as the entry point if the timeout triggers.
 26: wait_timeout/2
 
 #
@@ -83,36 +186,106 @@ BEAM_FORMAT_NUMBER=0
 #
 # Comparision operators.
 #
+
+## @spec is_lt Lbl Arg1 Arg2
+## @doc Compare two terms and jump to Lbl if Arg1 is not less than Arg2.
 39: is_lt/3
+
+## @spec is_ge Lbl Arg1 Arg2
+## @doc Compare two terms and jump to Lbl if Arg1 is less than Arg2.
 40: is_ge/3
+
+## @spec is_eq Lbl Arg1 Arg2
+## @doc Compare two terms and jump to Lbl if Arg1 is not (numerically) equal to Arg2.
 41: is_eq/3
+
+## @spec is_ne Lbl Arg1 Arg2
+## @doc Compare two terms and jump to Lbl if Arg1 is (numerically) equal to Arg2.
 42: is_ne/3
+
+## @spec is_eq_exact Lbl Arg1 Arg2
+## @doc Compare two terms and jump to Lbl if Arg1 is not exactly equal to Arg2.
 43: is_eq_exact/3
+
+## @spec is_ne_exact Lbl Arg1 Arg2
+## @doc Compare two terms and jump to Lbl if Arg1 is exactly equal to Arg2.
 44: is_ne_exact/3
 
 #
 # Type tests.
 #
+
+## @spec is_integer Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not an integer.
 45: is_integer/2
+
+## @spec is_float Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a float.
 46: is_float/2
+
+## @spec is_number Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a number.
 47: is_number/2
+
+## @spec is_atom Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not an atom.
 48: is_atom/2
+
+## @spec is_pid Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a pid.
 49: is_pid/2
+
+## @spec is_reference Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a reference.
 50: is_reference/2
+
+## @spec is_port Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a port.
 51: is_port/2
+
+## @spec is_nil Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not nil.
 52: is_nil/2
+
+## @spec is_binary Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a binary.
 53: is_binary/2
+
 54: -is_constant/2
+
+## @spec is_list Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a cons or nil.
 55: is_list/2
+
+## @spec is_nonempty_list Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a cons.
 56: is_nonempty_list/2
+
+## @spec is_tuple Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a tuple.
 57: is_tuple/2
+
+## @spec test_arity Lbl Arg1 Arity
+## @doc Test the arity of (the tuple in) Arg1 and jump
+## to Lbl if it is not equal to Arity.
 58: test_arity/3
 
 #
 # Indexing & jumping.
 #
+
+## @spec select_val Arg FailLabel Destinations
+## @doc Jump to the destination label corresponding to Arg
+##      in the Destinations list, if no arity matches, jump to FailLabel.
 59: select_val/3
+
+## @spec select_tuple_arity Tuple FailLabel Destinations
+## @doc Check the arity of the tuple Tuple and jump to the corresponding
+##      destination label, if no arity matches, jump to FailLabel.
 60: select_tuple_arity/3
+
+## @spec jump Label
+## @doc Jump to Label.
 61: jump/1
 
 #
@@ -124,9 +297,26 @@ BEAM_FORMAT_NUMBER=0
 #
 # Moving, extracting, modifying.
 #
+
+## @spec move Source Destination
+## @doc Move the source Source (a literal or a register) to
+##      the destination register Destination.
 64: move/2
+
+## @spec get_list  Source Head Tail
+## @doc  Get the head and tail (or car and cdr) parts of a list
+##       (a cons cell) from Source and put them into the registers
+##       Head and Tail.
 65: get_list/3
+
+## @spec get_tuple_element Source Element Destination
+## @doc  Get element number Element from the tuple in Source and put
+##       it in the destination register Destination.
 66: get_tuple_element/3
+
+## @spec set_tuple_element NewElement Tuple Position
+## @doc  Update the element at postition Position of the tuple Tuple
+##       with the new element NewElement.
 67: set_tuple_element/3
 
 #
@@ -147,13 +337,26 @@ BEAM_FORMAT_NUMBER=0
 #
 # 'fun' support.
 #
+## @spec call_fun Arity
+## @doc Call a fun of arity Arity. Assume arguments in
+##      registers x(0) to x(Arity-1) and that the fun is in x(Arity).
+##      Save the next instruction as the return address in the CP register.
 75: call_fun/1
+
 76: -make_fun/3
+
+## @spec is_function Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a
+##      function (i.e. fun or closure).
 77: is_function/2
 
 #
 # Late additions to R5.
 #
+
+## @spec call_ext_only Arity Label
+##      Do a tail recursive call to the function at Label.
+##      Do not update the CP register.
 78: call_ext_only/2
 
 #
@@ -212,9 +415,14 @@ BEAM_FORMAT_NUMBER=0
 111: bs_add/5
 112: apply/1
 113: apply_last/2
+## @spec is_boolean Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a Boolean.
 114: is_boolean/2
 
 # New instructions in R10B-6.
+## @spec is_function2 Lbl Arg1 Arity
+## @doc Test the type of Arg1 and jump to Lbl if it is not a
+##      function of arity Arity.
 115: is_function2/3
 
 # New bit syntax matching in R11B.
@@ -229,7 +437,20 @@ BEAM_FORMAT_NUMBER=0
 123: bs_restore2/2
 
 # New GC bifs introduced in R11B.
+
+## @spec gc_bif1 Lbl Live Bif Arg Reg
+## @doc Call the bif Bif with the argument Arg, and store the result in Reg.
+##      On failure jump to Lbl.
+##      Do a garbage collection if necessary to allocate space on the heap
+##      for the result (saving Live number of X registers).
 124: gc_bif1/5
+
+## @spec gc_bif2 Lbl Live Bif Arg1 Arg2 Reg
+## @doc Call the bif Bif with the arguments Arg1 and Arg2,
+##      and store the result in Reg.
+##      On failure jump to Lbl.
+##      Do a garbage collection if necessary to allocate space on the heap
+##      for the result (saving Live number of X registers).
 125: gc_bif2/6
 
 # Experimental new bit_level bifs introduced in R11B.
@@ -241,6 +462,8 @@ BEAM_FORMAT_NUMBER=0
 128: -put_literal/2
 
 # R11B-5
+## @spec is_bitstr Lbl Arg1
+## @doc Test the type of Arg1 and jump to Lbl if it is not a bit string.
 129: is_bitstr/2
 
 # R12B
@@ -250,7 +473,12 @@ BEAM_FORMAT_NUMBER=0
 133: bs_init_writable/0
 134: bs_append/8
 135: bs_private_append/6
+
+## @spec trim N Remaining
+## @doc Reduce the stack usage by N words,
+##      keeping the CP on the top of the stack.
 136: trim/2
+
 137: bs_init_bits/6
 
 # R12B-5
@@ -277,10 +505,34 @@ BEAM_FORMAT_NUMBER=0
 
 # R14A
 
+## @spec recv_mark Label
+## @doc  Save the end of the message queue and the address of
+##       the label Label so that a recv_set instruction can start
+##       scanning the inbox from this position.
 150: recv_mark/1
+
+## @spec recv_set Label
+## @doc Check that the saved mark points to Label and set the
+##      save pointer in the message queue to the last position
+##      of the message queue saved by the recv_mark instruction.
 151: recv_set/1
+
+## @spec gc_bif3 Lbl Live Bif Arg1 Arg2 Arg3 Reg
+## @doc Call the bif Bif with the arguments Arg1, Arg2 and Arg3,
+##      and store the result in Reg.
+##      On failure jump to Lbl.
+##      Do a garbage collection if necessary to allocate space on the heap
+##      for the result (saving Live number of X registers).
 152: gc_bif3/7
 
 # R15A
 
 153: line/1
+
+# R17
+
+154: put_map_assoc/5
+155: put_map_exact/5
+156: is_map/2
+157: has_map_fields/3
+158: get_map_elements/3
diff --git a/lib/compiler/src/rec_env.erl b/lib/compiler/src/rec_env.erl
index 31a1f8b0b7..555a331bd7 100644
--- a/lib/compiler/src/rec_env.erl
+++ b/lib/compiler/src/rec_env.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %%
 %% The 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,6 +72,7 @@ test_1({custom, F} = Type, N, Env) when is_integer(N), N > 0 ->
 test_1(_,0, Env) ->
     Env.
 -endif.
+%%@clear
 
 
 %% Representation:
@@ -95,7 +96,7 @@ test_1(_,0, Env) ->
 %% =====================================================================
 %% @type environment(). An abstract environment.
 
--type mapping()     :: {'map', dict()} | {'rec', dict(), dict()}.
+-type mapping()     :: {'map', dict:dict()} | {'rec', dict:dict(), dict:dict()}.
 -type environment() :: [mapping(),...].
 
 %% =====================================================================
diff --git a/lib/compiler/src/sys_core_dsetel.erl b/lib/compiler/src/sys_core_dsetel.erl
index f6696992b9..60d83763f8 100644
--- a/lib/compiler/src/sys_core_dsetel.erl
+++ b/lib/compiler/src/sys_core_dsetel.erl
@@ -102,6 +102,13 @@ visit(Env, #c_literal{}=R) ->
 visit(Env0, #c_tuple{es=Es0}=R) ->
     {Es1,Env1} = visit_list(Env0, Es0),
     {R#c_tuple{es=Es1}, Env1};
+visit(Env0, #c_map{es=Es0}=R) ->
+    {Es1,Env1} = visit_list(Env0, Es0),
+    {R#c_map{es=Es1}, Env1};
+visit(Env0, #c_map_pair{key=K0,val=V0}=R) ->
+    {K,Env1} = visit(Env0, K0),
+    {V,Env2} = visit(Env1, V0),
+    {R#c_map_pair{key=K,val=V}, Env2};
 visit(Env0, #c_cons{hd=H0,tl=T0}=R) ->
     {H1,Env1} = visit(Env0, H0),
     {T1,Env2} = visit(Env1, T0),
@@ -212,6 +219,11 @@ visit_pat(Env0, #c_var{name=V}, Vs) ->
     {[V|Vs], dict:store(V, 0, Env0)};
 visit_pat(Env0, #c_tuple{es=Es}, Vs) ->
     visit_pats(Es, Env0, Vs);
+visit_pat(Env0, #c_map{es=Es}, Vs) ->
+    visit_pats(Es, Env0, Vs);
+visit_pat(Env0, #c_map_pair{op=#c_literal{val=exact},key=V,val=K}, Vs0) ->
+    {Vs1, Env1} = visit_pat(Env0, V, Vs0),
+    visit_pat(Env1, K, Vs1);
 visit_pat(Env0, #c_cons{hd=H,tl=T}, Vs0) ->
     {Vs1, Env1} = visit_pat(Env0, H, Vs0),
     visit_pat(Env1, T, Vs1);
diff --git a/lib/compiler/src/sys_core_fold.erl b/lib/compiler/src/sys_core_fold.erl
index cda3f7d81e..eb9c302334 100644
--- a/lib/compiler/src/sys_core_fold.erl
+++ b/lib/compiler/src/sys_core_fold.erl
@@ -70,7 +70,7 @@
 -export([module/2,format_error/1]).
 
 -import(lists, [map/2,foldl/3,foldr/3,mapfoldl/3,all/2,any/2,
-		reverse/1,reverse/2,member/2,nth/2,flatten/1]).
+		reverse/1,reverse/2,member/2,nth/2,flatten/1,unzip/1]).
 
 -import(cerl, [ann_c_cons/3,ann_c_tuple/2]).
 
@@ -246,6 +246,16 @@ expr(#c_tuple{anno=Anno,es=Es0}=Tuple, Ctxt, Sub) ->
 	value ->
 	    ann_c_tuple(Anno, Es)
     end;
+expr(#c_map{var=V0,es=Es0}=Map, Ctxt, Sub) ->
+    Es = pair_list(Es0, Ctxt, Sub),
+    case Ctxt of
+	effect ->
+	    add_warning(Map, useless_building),
+	    expr(make_effect_seq(Es, Sub), Ctxt, Sub);
+	value ->
+	    V = expr(V0, Ctxt, Sub),
+	    Map#c_map{var=V,es=Es}
+    end;
 expr(#c_binary{segments=Ss}=Bin0, Ctxt, Sub) ->
     %% Warn for useless building, but always build the binary
     %% anyway to preserve a possible exception.
@@ -295,6 +305,10 @@ expr(#c_let{}=Let, Ctxt, Sub) ->
 	    %% Now recursively re-process the new expression.
 	    expr(Expr, Ctxt, sub_new_preserve_types(Sub))
     end;
+expr(#c_letrec{body=#c_var{}}=Letrec, effect, _Sub) ->
+    %% This is named fun in an 'effect' context. Warn and ignore.
+    add_warning(Letrec, useless_building),
+    void();
 expr(#c_letrec{defs=Fs0,body=B0}=Letrec, Ctxt, Sub) ->
     Fs1 = map(fun ({Name,Fb}) ->
 		      {Name,expr(Fb, {letrec,Ctxt}, Sub)}
@@ -302,18 +316,54 @@ expr(#c_letrec{defs=Fs0,body=B0}=Letrec, Ctxt, Sub) ->
     B1 = body(B0, value, Sub),
     Letrec#c_letrec{defs=Fs1,body=B1};
 expr(#c_case{}=Case0, Ctxt, Sub) ->
+    %% Ideally, the compiler should only emit warnings when there is
+    %% a real mistake in the code being compiled. We use the follow
+    %% heuristics in an attempt to approach that ideal:
+    %%
+    %% * If the guard for a clause always fails, we will emit a
+    %%   warning.
+    %%
+    %% * If a case expression is a literal, we will emit no warnings
+    %%   for clauses that will not match or for clauses that are
+    %%   shadowed after a clause that will always match. That means
+    %%   that code such as:
+    %%
+    %%      case ?DEBUG of
+    %%         false -> ok;
+    %%         true -> ...
+    %%      end
+    %%
+    %%   (where ?DEBUG expands to either 'true' or 'false') will not
+    %%   produce any warnings.
+    %%
+    %% * If the case expression is not literal, warnings will be
+    %%   emitted for every clause that don't match and for all
+    %%   clauses following a clause that will always match.
+    %%
+    %% * If no clause will ever match, there will be a warning
+    %%   (in addition to any warnings that may have been emitted
+    %%   according to the rules above).
+    %%
     case opt_bool_case(Case0) of
 	#c_case{arg=Arg0,clauses=Cs0}=Case1 ->
 	    Arg1 = body(Arg0, value, Sub),
-	    {Arg2,Cs1} = case_opt(Arg1, Cs0),
-	    Cs2 = clauses(Arg2, Cs1, Case1, Ctxt, Sub),
-	    Case = eval_case(Case1#c_case{arg=Arg2,clauses=Cs2}, Sub),
-	    bsm_an(Case);
+	    LitExpr = cerl:is_literal(Arg1),
+	    {Arg2,Cs1} = case_opt(Arg1, Cs0, Sub),
+	    Cs2 = clauses(Arg2, Cs1, Ctxt, Sub, LitExpr),
+	    Case = Case1#c_case{arg=Arg2,clauses=Cs2},
+	    warn_no_clause_match(Case1, Case),
+	    Expr = eval_case(Case, Sub),
+            case move_case_into_arg(Case, Sub) of
+                impossible ->
+                    bsm_an(Expr);
+                Other ->
+                    expr(Other, Ctxt, sub_new_preserve_types(Sub))
+            end;
 	Other ->
 	    expr(Other, Ctxt, Sub)
     end;
 expr(#c_receive{clauses=Cs0,timeout=T0,action=A0}=Recv, Ctxt, Sub) ->
-    Cs1 = clauses(#c_var{name='_'}, Cs0, Recv, Ctxt, Sub), %This is all we know
+    Cs1 = clauses(#c_var{name='_'}, Cs0, Ctxt, Sub, false),
     T1 = expr(T0, value, Sub),
     A1 = body(A0, Ctxt, Sub),
     Recv#c_receive{clauses=Cs1,timeout=T1,action=A1};
@@ -377,6 +427,16 @@ expr(#c_try{anno=A,arg=E0,vars=Vs0,body=B0,evars=Evs0,handler=H0}=Try, _, Sub0)
 expr_list(Es, Ctxt, Sub) ->
     [expr(E, Ctxt, Sub) || E <- Es].
 
+pair_list(Es, Ctxt, Sub) ->
+    [pair(E, Ctxt, Sub) || E <- Es].
+
+pair(#c_map_pair{key=K,val=V}, effect, Sub) ->
+    make_effect_seq([K,V], Sub);
+pair(#c_map_pair{key=K0,val=V0}=Pair, value=Ctxt, Sub) ->
+    K = expr(K0, Ctxt, Sub),
+    V = expr(V0, Ctxt, Sub),
+    Pair#c_map_pair{key=K,val=V}.
+
 bitstr_list(Es, Sub) ->
     [bitstr(E, Sub) || E <- Es].
 
@@ -547,6 +607,14 @@ eval_binary_1([#c_bitstr{val=#c_literal{val=Val},size=#c_literal{val=Sz},
 	error:_ ->
 	    throw(impossible)
     end;
+eval_binary_1([#c_bitstr{val=#c_literal{},size=#c_literal{},
+			 unit=#c_literal{},type=#c_literal{},
+			 flags=#c_cons{}=Flags}=Bitstr|Ss], Acc0) ->
+    case cerl:fold_literal(Flags) of
+	#c_literal{} = Flags1 ->
+	    eval_binary_1([Bitstr#c_bitstr{flags=Flags1}|Ss], Acc0);
+	_ -> throw(impossible)
+    end;
 eval_binary_1([], Acc) -> Acc;
 eval_binary_1(_, _) -> throw(impossible).
 
@@ -646,7 +714,7 @@ useless_call(effect, #c_call{anno=Anno,
 useless_call(_, _) -> no.
 
 %% make_effect_seq([Expr], Sub) -> #c_seq{}|void()
-%%  Convert a list of epressions evaluated in effect context to a chain of
+%%  Convert a list of expressions evaluated in effect context to a chain of
 %%  #c_seq{}. The body in the innermost #c_seq{} will be void().
 %%  Anything that will not have any effect will be thrown away.
 
@@ -1452,14 +1520,14 @@ let_subst_list([], [], _) -> {[],[],[]}.
 
 %%pattern(Pat, Sub) -> pattern(Pat, Sub, Sub).
 
-pattern(#c_var{name=V0}=Pat, Isub, Osub) ->
+pattern(#c_var{}=Pat, Isub, Osub) ->
     case sub_is_val(Pat, Isub) of
 	true ->
 	    V1 = make_var_name(),
 	    Pat1 = #c_var{name=V1},
 	    {Pat1,sub_set_var(Pat, Pat1, scope_add([V1], Osub))};
 	false ->
-	    {Pat,sub_del_var(Pat, scope_add([V0], Osub))}
+	    {Pat,sub_del_var(Pat, Osub)}
     end;
 pattern(#c_literal{}=Pat, _, Osub) -> {Pat,Osub};
 pattern(#c_cons{anno=Anno,hd=H0,tl=T0}, Isub, Osub0) ->
@@ -1469,6 +1537,9 @@ pattern(#c_cons{anno=Anno,hd=H0,tl=T0}, Isub, Osub0) ->
 pattern(#c_tuple{anno=Anno,es=Es0}, Isub, Osub0) ->
     {Es1,Osub1} = pattern_list(Es0, Isub, Osub0),
     {ann_c_tuple(Anno, Es1),Osub1};
+pattern(#c_map{anno=Anno,es=Es0}=Map, Isub, Osub0) ->
+    {Es1,Osub1} = map_pair_pattern_list(Es0, Isub, Osub0),
+    {Map#c_map{anno=Anno,es=Es1},Osub1};
 pattern(#c_binary{segments=V0}=Pat, Isub, Osub0) ->
     {V1,Osub1} = bin_pattern_list(V0, Isub, Osub0),
     {Pat#c_binary{segments=V1},Osub1};
@@ -1478,6 +1549,23 @@ pattern(#c_alias{var=V0,pat=P0}=Pat, Isub, Osub0) ->
     Osub = update_types(V1, [P1], Osub2),
     {Pat#c_alias{var=V1,pat=P1},Osub}.
 
+map_pair_pattern_list(Ps0, Isub, Osub0) ->
+    {Ps,{_,Osub}} = mapfoldl(fun map_pair_pattern/2, {Isub,Osub0}, Ps0),
+    {Ps,Osub}.
+
+map_pair_pattern(#c_map_pair{op=#c_literal{val=exact},key=K0,val=V0}=Pair,{Isub,Osub0}) ->
+    {K,Osub1} = case cerl:type(K0) of
+	binary ->
+	    K1 = eval_binary(K0),
+	    case cerl:type(K1) of
+		literal -> {K1,Osub0};
+		_ -> pattern(K0,Isub,Osub0)
+	    end;
+	_ -> pattern(K0,Isub,Osub0)
+    end,
+    {V,Osub} = pattern(V0,Isub,Osub1),
+    {Pair#c_map_pair{key=K,val=V},{Isub,Osub}}.
+
 bin_pattern_list(Ps0, Isub, Osub0) ->
     {Ps,{_,Osub}} = mapfoldl(fun bin_pattern/2, {Isub,Osub0}, Ps0),
     {Ps,Osub}.
@@ -1522,6 +1610,9 @@ is_subst(_) -> false.
 %%  chains so we never have to search more than once.  Use orddict so
 %%  we know the format.
 %%
+%%  In addition to the list of substitutions, we also keep track of
+%%  all variable currently live (the scope).
+%%
 %%  sub_subst_scope/1 adds dummy substitutions for all variables
 %%  in the scope in order to force renaming if variables in the
 %%  scope occurs as pattern variables.
@@ -1548,8 +1639,17 @@ sub_set_name(V, Val, #sub{v=S,s=Scope,t=Tdb0}=Sub) ->
     Tdb = copy_type(V, Val, Tdb1),
     Sub#sub{v=orddict:store(V, Val, S),s=gb_sets:add(V, Scope),t=Tdb}.
 
-sub_del_var(#c_var{name=V}, #sub{v=S,t=Tdb}=Sub) ->
-    Sub#sub{v=orddict:erase(V, S),t=kill_types(V, Tdb)}.
+sub_del_var(#c_var{name=V}, #sub{v=S,s=Scope,t=Tdb}=Sub) ->
+    %% Profiling shows that for programs with many record operations,
+    %% sub_del_var/2 is a bottleneck. Since the scope contains all
+    %% variables that are live, we know that V cannot be present in S
+    %% if it is not in the scope.
+    case gb_sets:is_member(V, Scope) of
+	false ->
+	    Sub#sub{s=gb_sets:insert(V, Scope)};
+	true ->
+	    Sub#sub{v=orddict:erase(V, S),t=kill_types(V, Tdb)}
+    end.
 
 sub_subst_var(#c_var{name=V}, Val, #sub{v=S0}) ->
     %% Fold chained substitutions.
@@ -1559,47 +1659,50 @@ sub_subst_scope(#sub{v=S0,s=Scope}=Sub) ->
     S = [{-1,#c_var{name=Sv}} || Sv <- gb_sets:to_list(Scope)]++S0,
     Sub#sub{v=S}.
 
-sub_is_val(#c_var{name=V}, #sub{v=S}) ->
-    v_is_value(V, S).
-
-v_is_value(Var, Sub) ->
-    any(fun ({_,#c_var{name=Val}}) when Val =:= Var -> true;
-	    (_) -> false
-	end, Sub).
-
-%% clauses(E, [Clause], TopLevel, Context, Sub) -> [Clause].
-%%  Trim the clauses by removing all clauses AFTER the first one which
-%%  is guaranteed to match.  Also remove all trivially false clauses.
-
-clauses(E, Cs0, TopLevel, Ctxt, Sub) ->
-    Cs = clauses_1(E, Cs0, Ctxt, Sub),
-
-    %% Here we want to warn if no clauses whatsoever will ever
-    %% match, because that is probably a mistake.
-    case all(fun is_compiler_generated/1, Cs) andalso
-	any(fun(C) -> not is_compiler_generated(C) end, Cs0) of
+sub_is_val(#c_var{name=V}, #sub{v=S,s=Scope}) ->
+    %% When the bottleneck in sub_del_var/2 was eliminated, this
+    %% became the new bottleneck. Since the scope contains all
+    %% live variables, a variable V can only be the target for
+    %% a substitution if it is in the scope.
+    gb_sets:is_member(V, Scope) andalso v_is_value(V, S).
+
+v_is_value(Var, [{_,#c_var{name=Var}}|_]) -> true;
+v_is_value(Var, [_|T]) -> v_is_value(Var, T);
+v_is_value(_, []) -> false.
+
+%% warn_no_clause_match(CaseOrig, CaseOpt) -> ok
+%%  Generate a warning if none of the user-specified clauses
+%%  will match.
+
+warn_no_clause_match(CaseOrig, CaseOpt) ->
+    OrigCs = cerl:case_clauses(CaseOrig),
+    OptCs = cerl:case_clauses(CaseOpt),
+    case any(fun(C) -> not is_compiler_generated(C) end, OrigCs) andalso
+	all(fun is_compiler_generated/1, OptCs) of
 	true ->
 	    %% The original list of clauses did contain at least one
 	    %% user-specified clause, but none of them will match.
 	    %% That is probably a mistake.
-	    add_warning(TopLevel, no_clause_match);
+	    add_warning(CaseOrig, no_clause_match);
 	false ->
 	    %% Either there were user-specified clauses left in
 	    %% the transformed clauses, or else none of the original
 	    %% clauses were user-specified to begin with (as in 'andalso').
 	    ok
-    end,
+    end.
 
-    Cs.
+%% clauses(E, [Clause], TopLevel, Context, Sub) -> [Clause].
+%%  Trim the clauses by removing all clauses AFTER the first one which
+%%  is guaranteed to match.  Also remove all trivially false clauses.
 
-clauses_1(E, [C0|Cs], Ctxt, Sub) ->
+clauses(E, [C0|Cs], Ctxt, Sub, LitExpr) ->
     #c_clause{pats=Ps,guard=G} = C1 = clause(C0, E, Ctxt, Sub),
     %%ok = io:fwrite("~w: ~p~n", [?LINE,{E,Ps}]),
     case {will_match(E, Ps),will_succeed(G)} of
 	{yes,yes} ->
-	    Line = get_line(core_lib:get_anno(C1)),
-	    case core_lib:is_literal(E) of
+	    case LitExpr of
 		false ->
+		    Line = get_line(core_lib:get_anno(C1)),
 		    shadow_warning(Cs, Line);
 		true ->
 		    %% If the case expression is a literal,
@@ -1608,15 +1711,13 @@ clauses_1(E, [C0|Cs], Ctxt, Sub) ->
 		    ok
 	    end,
 	    [C1];				%Skip the rest
-	{no,_Suc} ->
-	    clauses_1(E, Cs, Ctxt, Sub);	%Skip this clause
-	{_Mat,no} ->
+	{_Mat,no} ->				%Guard fails.
 	    add_warning(C1, nomatch_guard),
-	    clauses_1(E, Cs, Ctxt, Sub);	%Skip this clause
+	    clauses(E, Cs, Ctxt, Sub, LitExpr);	%Skip this clause
 	{_Mat,_Suc} ->
-	    [C1|clauses_1(E, Cs, Ctxt, Sub)]
+	    [C1|clauses(E, Cs, Ctxt, Sub, LitExpr)]
     end;
-clauses_1(_, [], _, _) -> [].
+clauses(_, [], _, _, _) -> [].
 
 shadow_warning([C|Cs], none) ->
     add_warning(C, nomatch_shadow),
@@ -1634,69 +1735,18 @@ will_succeed(#c_literal{val=true}) -> yes;
 will_succeed(#c_literal{val=false}) -> no;
 will_succeed(_Guard) -> maybe.
 
-%% will_match(Expr, [Pattern]) -> yes | maybe | no.
-%%  Test if we know whether a match will succeed/fail or just don't
-%%  know.  Be conservative.
+%% will_match(Expr, [Pattern]) -> yes | maybe.
+%%  We KNOW that this function is only used after optimizations
+%%  in case_opt/4. Therefore clauses that can definitely not match
+%%  have already been pruned.
 
 will_match(#c_values{es=Es}, Ps) ->
-    will_match_list(Es, Ps, yes);
+    will_match_1(cerl_clauses:match_list(Ps, Es));
 will_match(E, [P]) ->
-    will_match_1(E, P).
-
-will_match_1(_E, #c_var{}) -> yes;		%Will always match
-will_match_1(E, #c_alias{pat=P}) ->		%Pattern decides
-    will_match_1(E, P);
-will_match_1(#c_var{}, _P) -> maybe;
-will_match_1(#c_tuple{es=Es}, #c_tuple{es=Ps}) ->
-    will_match_list(Es, Ps, yes);
-will_match_1(#c_literal{val=Lit}, P) ->
-    will_match_lit(Lit, P);
-will_match_1(_, _) -> maybe.
-
-will_match_list([E|Es], [P|Ps], M) ->
-    case will_match_1(E, P) of
-	yes -> will_match_list(Es, Ps, M);
-	maybe -> will_match_list(Es, Ps, maybe);
-	no -> no
-    end;
-will_match_list([], [], M) -> M.
-
-will_match_lit(Cons, #c_cons{hd=Hp,tl=Tp}) ->
-    case Cons of
-	[H|T] ->
-	    case will_match_lit(H, Hp) of
-		yes -> will_match_lit(T, Tp);
-		Other -> Other
-	    end;
-	_ ->
-	    no
-    end;
-will_match_lit(Tuple, #c_tuple{es=Es}) ->
-    case is_tuple(Tuple) andalso tuple_size(Tuple) =:= length(Es) of
-	true -> will_match_lit_list(tuple_to_list(Tuple), Es);
-	false -> no
-    end;
-will_match_lit(Bin, #c_binary{}) ->
-    case is_bitstring(Bin) of
-	true -> maybe;
-	false -> no
-    end;
-will_match_lit(_, #c_var{}) ->
-    yes;
-will_match_lit(Lit, #c_alias{pat=P}) ->
-    will_match_lit(Lit, P);
-will_match_lit(Lit1, #c_literal{val=Lit2}) ->
-    case Lit1 =:= Lit2 of
-	true -> yes;
-	false -> no
-    end.
+    will_match_1(cerl_clauses:match(P, E)).
 
-will_match_lit_list([H|T], [P|Ps]) ->
-    case will_match_lit(H, P) of
-	yes -> will_match_lit_list(T, Ps);
-	Other -> Other
-    end;
-will_match_lit_list([], []) -> yes.
+will_match_1({false,_}) -> maybe;
+will_match_1({true,_}) -> yes.
 
 %% opt_bool_case(CoreExpr) - CoreExpr'.
 %%  Do various optimizations to case statement that has a
@@ -1895,166 +1945,274 @@ opt_bool_case_guard(Arg, [#c_clause{pats=[#c_literal{val=false}]}=Fc,Tc]) ->
 %%  last clause is guaranteed to match so if there is only one clause
 %%  with a pattern containing only variables then rewrite to a let.
 
-eval_case(#c_case{arg=#c_var{name=V},
-		  clauses=[#c_clause{pats=[P],guard=G,body=B}|_]}=Case,
-	  #sub{t=Tdb}=Sub) ->
-    case orddict:find(V, Tdb) of
-	{ok,Type} ->
-	    case {will_match_type(P, Type),will_succeed(G)} of
-		{yes,yes} ->
-		    {Ps,Es} = remove_non_vars(P, Type),
-		    expr(#c_let{vars=Ps,arg=#c_values{es=Es},body=B},
-			 sub_new(Sub));
-		{_,_} ->
-		    eval_case_1(Case, Sub)
-	    end;
-	error -> eval_case_1(Case, Sub)
-    end;
-eval_case(Case, Sub) -> eval_case_1(Case, Sub).
-
-eval_case_1(#c_case{arg=E,clauses=[#c_clause{pats=Ps,body=B}]}=Case, Sub) ->
-    case is_var_pat(Ps) of
-	true -> expr(#c_let{vars=Ps,arg=E,body=B}, sub_new(Sub));
-	false -> eval_case_2(E, Ps, B, Case)
-    end;
-eval_case_1(Case, _) -> Case.
-
-eval_case_2(E, [P], B, Case) ->
-    %% Recall that there is only one clause and that it is guaranteed to match.
-    %%   If E and P are literals, they must be the same literal and the body
-    %% can be used directly as there are no variables that need to be bound.
-    %%   Otherwise, P could be an alias meaning that two or more variables
-    %% would be bound to E. We don't bother to optimize that case as it
-    %% is rather uncommon.
-    case core_lib:is_literal(E) andalso core_lib:is_literal(P) of
-	false -> Case;
-	true -> B
-    end;
-eval_case_2(_, _, _, Case) -> Case.
-
-is_var_pat(Ps) ->
-    all(fun (#c_var{}) -> true;
-	    (_Pat) -> false
-	end, Ps).
-
-will_match_type(#c_tuple{es=Es}, #c_tuple{es=Ps}) ->
-    will_match_list_type(Es, Ps);
-will_match_type(#c_literal{val=Atom}, #c_literal{val=Atom}) -> yes;
-will_match_type(#c_var{}, #c_var{}) -> yes;
-will_match_type(#c_var{}, #c_alias{}) -> yes;
-will_match_type(_, _) -> no.
-
-will_match_list_type([E|Es], [P|Ps]) ->
-    case will_match_type(E, P) of
-	yes -> will_match_list_type(Es, Ps);
-	no -> no
-    end;
-will_match_list_type([], []) -> yes;
-will_match_list_type(_, _) -> no.		%Different length
-
-remove_non_vars(Ps0, Es0) ->
-    {Ps,Es} = remove_non_vars(Ps0, Es0, [], []),
-    {reverse(Ps),reverse(Es)}.
-
-remove_non_vars(#c_tuple{es=Ps}, #c_tuple{es=Es}, Pacc, Eacc) ->
-    remove_non_vars_list(Ps, Es, Pacc, Eacc);
-remove_non_vars(#c_var{}=Var, #c_alias{var=Evar}, Pacc, Eacc) ->
-    {[Var|Pacc],[Evar|Eacc]};
-remove_non_vars(#c_var{}=Var, #c_var{}=Evar, Pacc, Eacc) ->
-    {[Var|Pacc],[Evar|Eacc]};
-remove_non_vars(P, E, Pacc, Eacc) ->
-    true = core_lib:is_literal(P) andalso core_lib:is_literal(E), %Assertion.
-    {Pacc,Eacc}.
-
-remove_non_vars_list([P|Ps], [E|Es], Pacc0, Eacc0) ->
-    {Pacc,Eacc} = remove_non_vars(P, E, Pacc0, Eacc0),
-    remove_non_vars_list(Ps, Es, Pacc, Eacc);
-remove_non_vars_list([], [], Pacc, Eacc) ->
-    {Pacc,Eacc}.
+eval_case(#c_case{arg=E,clauses=[#c_clause{pats=Ps0,
+					   guard=#c_literal{val=true},
+					   body=B}]}=Case, Sub) ->
+    Es = case cerl:is_c_values(E) of
+	     true -> cerl:values_es(E);
+	     false -> [E]
+	 end,
+    %% Consider:
+    %%
+    %%   case SomeSideEffect() of
+    %%      X=Y -> ...
+    %%   end
+    %%
+    %% We must not rewrite it to:
+    %%
+    %%   let <X,Y> = <SomeSideEffect(),SomeSideEffect()> in ...
+    %%
+    %% because SomeSideEffect() would be evaluated twice.
+    %%
+    %% Instead we must evaluate the case expression in an outer let
+    %% like this:
+    %%
+    %%   let NewVar = SomeSideEffect() in
+    %%       let <X,Y> = <NewVar,NewVar> in ...
+    %%
+    Vs = make_vars([], length(Es)),
+    case cerl_clauses:match_list(Ps0, Vs) of
+	{false,_} ->
+	    %% This can only happen if the Core Erlang code is
+	    %% handwritten or generated by another code generator
+	    %% than v3_core. Assuming that the Core Erlang program
+	    %% is correct, the clause will always match at run-time.
+	    Case;
+	{true,Bs} ->
+	    {Ps,As} = unzip(Bs),
+	    InnerLet = cerl:c_let(Ps, core_lib:make_values(As), B),
+	    Let = cerl:c_let(Vs, E, InnerLet),
+	    expr(Let, sub_new(Sub))
+    end;
+eval_case(Case, _) -> Case.
 
 %% case_opt(CaseArg, [Clause]) -> {CaseArg,[Clause]}.
-%%  Try and optimise case by avoid building a tuple in
-%%  the case expression. Instead of building a tuple
-%%  in the case expression, combine the elements into
-%%  multiple "values". If a clause refers to the tuple
-%%  in the case expression (that was not built), introduce
-%%  a let into the guard and/or body to build the tuple.
+%%  Try and optimise a case by avoid building tuples or lists
+%%  in the case expression. Instead combine the variable parts
+%%  of the case expression to multiple "values". If a clause
+%%  refers to the constructed term in the case expression (which
+%%  was not built), introduce a let into the guard and/or body to
+%%  build the term.
 %%
-%%     case {Expr1,Expr2} of		 case <Expr1,Expr2> of
-%%         {P1,P2} -> ...		     <P1,P2> -> ...
+%%     case {ok,[Expr1,Expr2]} of	case <Expr1,Expr2> of
+%%         {ok,[P1,P2]} -> ...		    <P1,P2> -> ...
 %%          .  	       	       	  ==>        .
 %%          .				     .
 %%          .				     .
-%%         Var ->                            <Var1,Var2> ->
-%%             ... Var ...                      let <Var> = {Var1,Var2}
-%%                                                  in ... Var ...
+%%         Var ->                           <Var1,Var2> ->
+%%             ... Var ...                     let <Var> = {ok,[Var1,Var2]}
+%%                                                 in ... Var ...
 %%          .                                 .
 %%          .                                 .
 %%          .				      .
-%%     end.				 end.
+%%     end.				end.
 %%
-case_opt(#c_tuple{anno=A,es=Es}, Cs0) ->
-    Cs1 = case_opt_cs(Cs0, length(Es)),
-    {core_lib:set_anno(core_lib:make_values(Es), A),Cs1};
-case_opt(Arg, Cs) -> {Arg,Cs}.
-
-case_opt_cs([#c_clause{pats=Ps0,guard=G,body=B}=C|Cs], Arity) ->
-    case case_tuple_pat(Ps0, Arity) of
-	{ok,Ps1,Avs} ->
-	    Flet = fun ({V,Pat}, Body) -> letify(V, Pat, Body) end,
-	    [C#c_clause{pats=Ps1,
-			guard=foldl(Flet, G, Avs),
-			body=foldl(Flet, B, Avs)}|case_opt_cs(Cs, Arity)];
-	error ->				%Can't match
-	    add_warning(C, nomatch_clause_type),
-	    case_opt_cs(Cs, Arity)
+case_opt(Arg, Cs0, Sub) ->
+    Cs1 = [{cerl:clause_pats(C),C,[],[]} || C <- Cs0],
+    Args0 = case cerl:is_c_values(Arg) of
+		false -> [Arg];
+		true -> cerl:values_es(Arg)
+	    end,
+    LitExpr = cerl:is_literal(Arg),
+    {Args,Cs2} = case_opt_args(Args0, Cs1, Sub, LitExpr, []),
+    Cs = [cerl:update_c_clause(C,
+			       reverse(Ps),
+			       letify(Bs, cerl:clause_guard(C)),
+			       letify(Bs, cerl:clause_body(C))) ||
+	     {[],C,Ps,Bs} <- Cs2],
+    {core_lib:make_values(Args),Cs}.
+
+case_opt_args([A0|As0], Cs0, Sub, LitExpr, Acc) ->
+    case case_opt_arg(A0, Sub, Cs0, LitExpr) of
+	error ->
+	    %% Nothing to be done. Move on to the next argument.
+	    Cs = [{Ps,C,[P|PsAcc],Bs} || {[P|Ps],C,PsAcc,Bs} <- Cs0],
+	    case_opt_args(As0, Cs, Sub, LitExpr, [A0|Acc]);
+	{ok,As1,Cs} ->
+	    %% The argument was either expanded (from tuple/list) or
+	    %% removed (literal).
+	    case_opt_args(As1++As0, Cs, Sub, LitExpr, Acc)
+    end;
+case_opt_args([], Cs, _Sub, _LitExpr, Acc) ->
+    {reverse(Acc),Cs}.
+
+%% case_opt_arg(Expr, Sub, Clauses0, LitExpr) ->
+%%         {ok,Args,Clauses} | error
+%%  Try to expand one argument to several arguments (if tuple/list)
+%%  or to remove a literal argument.
+%%
+case_opt_arg(E0, Sub, Cs, LitExpr) ->
+    E = maybe_replace_var(E0, Sub),
+    case cerl:is_data(E) of
+	false ->
+	    error;
+	true ->
+	    case cerl:data_type(E) of
+		{atomic,_} ->
+		    case_opt_lit(E, Cs, LitExpr);
+		_ ->
+		    case_opt_data(E, Cs, LitExpr)
+	    end
+    end.
+
+%% maybe_replace_var(Expr0, Sub) -> Expr
+%%  If Expr0 is a variable that has been previously matched and
+%%  is known to be a tuple, return the tuple instead. Otherwise
+%%  return Expr0 unchanged.
+%%
+maybe_replace_var(E, Sub) ->
+    case cerl:is_c_var(E) of
+	false -> E;
+	true -> maybe_replace_var_1(E, Sub)
+    end.
+
+maybe_replace_var_1(E, #sub{t=Tdb}) ->
+    case orddict:find(cerl:var_name(E), Tdb) of
+	{ok,T0} ->
+	    case cerl:is_c_tuple(T0) of
+		false ->
+		    E;
+		true ->
+		    cerl_trees:map(fun(C) ->
+					   case cerl:is_c_alias(C) of
+					       false -> C;
+					       true -> cerl:alias_pat(C)
+					   end
+				   end, T0)
+	    end;
+	error ->
+	    E
+    end.
+
+%% case_opt_lit(Literal, Clauses0, LitExpr) ->
+%%           {ok,[],Clauses} | error
+%%  The current part of the case expression is a literal. That
+%%  means that we will know at compile-time whether a clause
+%%  will match, and we can remove the corresponding pattern from
+%%  each clause.
+%%
+%%  The only complication is if the literal is a binary. Binary
+%%  pattern matching is tricky, so we will give up in that case.
+
+case_opt_lit(Lit, Cs0, LitExpr) ->
+    try case_opt_lit_1(Cs0, Lit, LitExpr) of
+	Cs ->
+	    {ok,[],Cs}
+    catch
+	throw:impossible ->
+	    error
+    end.
+
+case_opt_lit_1([{[P|Ps],C,PsAcc,Bs0}|Cs], E, LitExpr) ->
+    case cerl_clauses:match(P, E) of
+	none ->
+	    %% The pattern will not match the literal. Remove the clause.
+	    %% Unless the entire case expression is a literal, also
+	    %% emit a warning.
+	    case LitExpr of
+		false -> add_warning(C, nomatch_clause_type);
+		true -> ok
+	    end,
+	    case_opt_lit_1(Cs, E, LitExpr);
+	{true,Bs} ->
+	    %% The pattern matches the literal. Remove the pattern
+	    %% and update the bindings.
+	    [{Ps,C,PsAcc,Bs++Bs0}|case_opt_lit_1(Cs, E, LitExpr)];
+	{false,_} ->
+	    %% Binary literal and pattern. We are not sure whether
+	    %% the pattern will match.
+	    throw(impossible)
     end;
-case_opt_cs([], _) -> [].
+case_opt_lit_1([], _, _) -> [].
+
+%% case_opt_data(Expr, Clauses0, LitExpr) -> {ok,Exprs,Clauses}
 
-%% case_tuple_pat([Pattern], Arity) -> {ok,[Pattern],[{AliasVar,Pat}]} | error.
+case_opt_data(E, Cs0, LitExpr) ->
+    Es = cerl:data_es(E),
+    Cs = case_opt_data_1(Cs0, Es,
+			 {cerl:data_type(E),cerl:data_arity(E)},
+			 LitExpr),
+    {ok,Es,Cs}.
+
+case_opt_data_1([{[P|Ps0],C,PsAcc,Bs0}|Cs], Es, TypeSig, LitExpr) ->
+    case case_data_pat(P, TypeSig) of
+	{ok,Ps1,Bs1} ->
+	    [{Ps1++Ps0,C,PsAcc,Bs1++Bs0}|
+	     case_opt_data_1(Cs, Es, TypeSig,LitExpr)];
+	error ->
+	    case LitExpr of
+		false -> add_warning(C, nomatch_clause_type);
+		true -> ok
+	    end,
+	    case_opt_data_1(Cs, Es, TypeSig, LitExpr)
+    end;
+case_opt_data_1([], _, _, _) -> [].
+
+%% case_data_pat(Pattern, Type, Arity) -> {ok,[Pattern],[{AliasVar,Pat}]} | error.
+
+case_data_pat(P, TypeSig) ->
+    case cerl:is_data(P) of
+	false ->
+	    case_data_pat_var(P, TypeSig);
+	true ->
+	    case {cerl:data_type(P),cerl:data_arity(P)} of
+		TypeSig ->
+		    {ok,cerl:data_es(P),[]};
+		{_,_} ->
+		    error
+	    end
+    end.
 
-case_tuple_pat([#c_tuple{es=Ps}], Arity) when length(Ps) =:= Arity ->
-    {ok,Ps,[]};
-case_tuple_pat([#c_literal{val=T}], Arity) when tuple_size(T) =:= Arity ->
-    Ps = [#c_literal{val=E} || E <- tuple_to_list(T)],
-    {ok,Ps,[]};
-case_tuple_pat([#c_var{anno=Anno0}=V], Arity) ->
-    Vars = make_vars(Anno0, 1, Arity),
+%% case_data_pat_var(Pattern, {DataType,ArityType}) ->
+%%          {ok,[Pattern],[{AliasVar,Pat}]}
 
+case_data_pat_var(P, {Type,Arity}=TypeSig) ->
     %% If the entire case statement is evaluated in an effect
     %% context (e.g. "case {A,B} of ... end, ok"), there will
     %% be a warning that a term is constructed but never used.
-    %% To avoid that warning, we must annotate the tuple as
-    %% compiler generated.
-
-    Anno = [compiler_generated|Anno0],
-    {ok,Vars,[{V,#c_tuple{anno=Anno,es=Vars}}]};
-case_tuple_pat([#c_alias{var=V,pat=P}], Arity) ->
-    case case_tuple_pat([P], Arity) of
-	{ok,Ps,Avs} ->
-	    Anno0 = core_lib:get_anno(P),
-	    Anno = [compiler_generated|Anno0],
-	    {ok,Ps,[{V,#c_tuple{anno=Anno,es=unalias_pat_list(Ps)}}|Avs]};
-	error ->
+    %% To avoid that warning, we must annotate the data
+    %% constructor as compiler generated.
+    Ann = [compiler_generated|cerl:get_ann(P)],
+    case cerl:type(P) of
+	var ->
+	    Vars = make_vars(cerl:get_ann(P), Arity),
+	    {ok,Vars,[{P,cerl:ann_make_data(Ann, Type, Vars)}]};
+	alias ->
+	    V = cerl:alias_var(P),
+	    Apat = cerl:alias_pat(P),
+	    case case_data_pat(Apat, TypeSig) of
+		{ok,Ps,Bs} ->
+		    {ok,Ps,[{V,cerl:ann_make_data(Ann, Type, unalias_pat_list(Ps))}|Bs]};
+		error ->
+		    error
+	    end;
+	_ ->
 	    error
-    end;
-case_tuple_pat(_, _) -> error.
+    end.
 
 %% unalias_pat(Pattern) -> Pattern.
 %%  Remove all the aliases in a pattern but using the alias variables
 %%  instead of the values.  We KNOW they will be bound.
 
-unalias_pat(#c_alias{var=V}) -> V;
-unalias_pat(#c_cons{anno=Anno,hd=H0,tl=T0}) ->
-    H1 = unalias_pat(H0),
-    T1 = unalias_pat(T0),
-    ann_c_cons(Anno, H1, T1);
-unalias_pat(#c_tuple{anno=Anno,es=Ps}) ->
-    ann_c_tuple(Anno, unalias_pat_list(Ps));
-unalias_pat(Atomic) -> Atomic.
+unalias_pat(P) ->
+    case cerl:is_c_alias(P) of
+	true ->
+	    cerl:alias_var(P);
+	false ->
+	    case cerl:is_data(P) of
+		false ->
+		    P;
+		true ->
+		    Es = unalias_pat_list(cerl:data_es(P)),
+		    cerl:update_data(P, cerl:data_type(P), Es)
+	    end
+    end.
 
 unalias_pat_list(Ps) -> [unalias_pat(P) || P <- Ps].
 
+make_vars(A, Max) ->
+    make_vars(A, 1, Max).
+
 make_vars(A, I, Max) when I =< Max ->
     [make_var(A)|make_vars(A, I+1, Max)];
 make_vars(_, _, _) -> [].
@@ -2067,6 +2225,11 @@ make_var_name() ->
     put(new_var_num, N+1),
     list_to_atom("fol"++integer_to_list(N)).
 
+letify(Bs, Body) ->
+    foldr(fun({V,Val}, B) ->
+		  letify(V, Val, B)
+	  end, Body, Bs).
+
 letify(#c_var{name=Vname}=Var, Val, Body) ->
     case core_lib:is_var_used(Vname, Body) of
 	true ->
@@ -2087,7 +2250,7 @@ opt_case_in_let_0([#c_var{name=V}], Arg,
 	    case is_simple_case_arg(Arg) andalso
 		not core_lib:is_var_used(V, Case#c_case{arg=#c_literal{val=nil}}) of
 		true ->
-		    opt_bool_case(Case#c_case{arg=Arg});
+		    expr(opt_bool_case(Case#c_case{arg=Arg,clauses=Cs}), sub_new());
 		false ->
 		    Let
 	    end;
@@ -2342,6 +2505,25 @@ move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
 	    Case#c_case{arg=Cexpr,clauses=[Ca,Cb]};
 	{_,_,_} -> impossible
     end;
+move_let_into_expr(#c_let{vars=Lvs0,body=Lbody0}=Let,
+		   #c_seq{arg=Sarg0,body=Sbody0}=Seq, Sub0) ->
+    %%
+    %% let <Lvars> = do <Seq-arg>
+    %%                  <Seq-body>
+    %% in <Let-body>
+    %%
+    %%       ==>
+    %%
+    %% do <Seq-arg>
+    %%    let <Lvars> = <Seq-body>
+    %%    in <Let-body>
+    %%
+    Sarg = body(Sarg0, Sub0),
+    Sbody1 = body(Sbody0, Sub0),
+    {Lvs,Sbody,Sub} = let_substs(Lvs0, Sbody1, Sub0),
+    Lbody = body(Lbody0, Sub),
+    Seq#c_seq{arg=Sarg,body=Let#c_let{vars=Lvs,arg=core_lib:make_values(Sbody),
+				      body=Lbody}};
 move_let_into_expr(_Let, _Expr, _Sub) -> impossible.
 
 is_failing_clause(#c_clause{body=B}) ->
@@ -2429,6 +2611,77 @@ opt_simple_let_2(Let, Vs0, Arg0, Body, value, Sub) ->
 	      value, Sub)
     end.
 
+move_case_into_arg(#c_case{arg=#c_let{vars=OuterVars0,arg=OuterArg,
+                                      body=InnerArg0}=Outer,
+                           clauses=InnerClauses}=Inner, Sub) ->
+    %%
+    %% case let <OuterVars> = <OuterArg> in <InnerArg> of
+    %%     <InnerClauses>
+    %% end
+    %%
+    %%       ==>
+    %%
+    %% let <OuterVars> = <OuterArg>
+    %% in case <InnerArg> of <InnerClauses> end
+    %%
+    ScopeSub0 = sub_subst_scope(Sub#sub{t=[]}),
+    {OuterVars,ScopeSub} = pattern_list(OuterVars0, ScopeSub0),
+    InnerArg = body(InnerArg0, ScopeSub),
+    Outer#c_let{vars=OuterVars,arg=OuterArg,
+                body=Inner#c_case{arg=InnerArg,clauses=InnerClauses}};
+move_case_into_arg(#c_case{arg=#c_case{arg=OuterArg,
+                                       clauses=[OuterCa0,OuterCb]}=Outer,
+                           clauses=InnerClauses}=Inner0, Sub) ->
+    case is_failing_clause(OuterCb) of
+        true ->
+            #c_clause{pats=OuterPats0,guard=OuterGuard0,
+                      body=InnerArg0} = OuterCa0,
+            %%
+            %% case case <OuterArg> of
+            %%          <OuterPats> when <OuterGuard> -> <InnerArg>
+            %%          <OuterCb>
+            %%          ...
+            %%      end of
+            %%     <InnerClauses>
+            %% end
+            %%
+            %%       ==>
+            %%
+            %% case <OuterArg> of
+            %%     <OuterPats> when <OuterGuard> ->
+            %%         case <InnerArg> of <InnerClauses> end
+            %%     <OuterCb>
+            %% end
+            %%
+            ScopeSub0 = sub_subst_scope(Sub#sub{t=[]}),
+            {OuterPats,ScopeSub} = pattern_list(OuterPats0, ScopeSub0),
+            OuterGuard = guard(OuterGuard0, ScopeSub),
+            InnerArg = body(InnerArg0, ScopeSub),
+            Inner = Inner0#c_case{arg=InnerArg,clauses=InnerClauses},
+            OuterCa = OuterCa0#c_clause{pats=OuterPats,guard=OuterGuard,
+                                        body=Inner},
+            Outer#c_case{arg=OuterArg,
+                         clauses=[OuterCa,OuterCb]};
+        false ->
+            impossible
+    end;
+move_case_into_arg(#c_case{arg=#c_seq{arg=OuterArg,body=InnerArg}=Outer,
+                           clauses=InnerClauses}=Inner, _Sub) ->
+    %%
+    %% case do <OuterArg> <InnerArg> of
+    %%     <InnerClauses>
+    %% end
+    %%
+    %%       ==>
+    %%
+    %% do <OuterArg>
+    %%    case <InnerArg> of <InerClauses> end
+    %%
+    Outer#c_seq{arg=OuterArg,
+                body=Inner#c_case{arg=InnerArg,clauses=InnerClauses}};
+move_case_into_arg(_, _) ->
+    impossible.
+
 %% In guards only, rewrite a case in a let argument like
 %%
 %%    let <Var> = case <> of
diff --git a/lib/compiler/src/sys_pre_expand.erl b/lib/compiler/src/sys_pre_expand.erl
index 7d918a55ed..9998043013 100644
--- a/lib/compiler/src/sys_pre_expand.erl
+++ b/lib/compiler/src/sys_pre_expand.erl
@@ -228,6 +228,13 @@ pattern({cons,Line,H,T}, St0) ->
 pattern({tuple,Line,Ps}, St0) ->
     {TPs,St1} = pattern_list(Ps, St0),
     {{tuple,Line,TPs},St1};
+pattern({map,Line,Ps}, St0) ->
+    {TPs,St1} = pattern_list(Ps, St0),
+    {{map,Line,TPs},St1};
+pattern({map_field_exact,Line,K0,V0}, St0) ->
+    {K,St1} = pattern(K0, St0),
+    {V,St2} = pattern(V0, St1),
+    {{map_field_exact,Line,K,V},St2};
 %%pattern({struct,Line,Tag,Ps}, St0) ->
 %%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|TPs]},TPsvs,St1};
@@ -321,6 +328,20 @@ expr({tuple,Line,Es0}, St0) ->
 %%expr({struct,Line,Tag,Es0}, Vs, St0) ->
 %%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
 %%    {{tuple,Line,[{atom,Line,Tag}|Es1]},Esvs,Esus,St1};
+expr({map,Line,Es0}, St0) ->
+    {Es1,St1} = expr_list(Es0, St0),
+    {{map,Line,Es1},St1};
+expr({map,Line,Var,Es0}, St0) ->
+    {Es1,St1} = expr_list(Es0, St0),
+    {{map,Line,Var,Es1},St1};
+expr({map_field_assoc,Line,K0,V0}, St0) ->
+    {K,St1} = expr(K0, St0),
+    {V,St2} = expr(V0, St1),
+    {{map_field_assoc,Line,K,V},St2};
+expr({map_field_exact,Line,K0,V0}, St0) ->
+    {K,St1} = expr(K0, St0),
+    {V,St2} = expr(V0, St1),
+    {{map_field_exact,Line,K,V},St2};
 expr({bin,Line,Es0}, St0) ->
     {Es1,St1} = expr_bin(Es0, St0),
     {{bin,Line,Es1},St1};
@@ -344,6 +365,8 @@ expr({'receive',Line,Cs0,To0,ToEs0}, St0) ->
     {{'receive',Line,Cs,To,ToEs},St3};
 expr({'fun',Line,Body}, St) ->
     fun_tq(Line, Body, St);
+expr({named_fun,Line,Name,Cs}, St) ->
+    fun_tq(Line, Cs, St, Name);
 expr({call,Line,{atom,La,N}=Atom,As0}, St0) ->
     {As,St1} = expr_list(As0, St0),
     Ar = length(As),
@@ -475,6 +498,11 @@ fun_tq(Lf, {clauses,Cs0}, St0) ->
     Index = Uniq = 0,
     {{'fun',Lf,{clauses,Cs1},{Index,Uniq,Fname}},St2}.
 
+fun_tq(Line, Cs0, St0, Name) ->
+    {Cs1,St1} = fun_clauses(Cs0, St0),
+    {Fname,St2} = new_fun_name(St1, Name),
+    {{named_fun,Line,Name,Cs1,{0,0,Fname}},St2}.
+
 fun_clauses([{clause,L,H0,G0,B0}|Cs0], St0) ->
     {H,St1} = head(H0, St0),
     {G,St2} = guard(G0, St1),
@@ -485,9 +513,12 @@ fun_clauses([], St) -> {[],St}.
 
 %% new_fun_name(State) -> {FunName,State}.
 
-new_fun_name(#expand{func=F,arity=A,fcount=I}=St) ->
+new_fun_name(St) ->
+    new_fun_name(St, 'fun').
+
+new_fun_name(#expand{func=F,arity=A,fcount=I}=St, FName) ->
     Name = "-" ++ atom_to_list(F) ++ "/" ++ integer_to_list(A)
-        ++ "-fun-" ++ integer_to_list(I) ++ "-",
+        ++ "-" ++ atom_to_list(FName) ++ "-" ++ integer_to_list(I) ++ "-",
     {list_to_atom(Name),St#expand{fcount=I+1}}.
 
 %% pattern_bin([Element], State) -> {[Element],[Variable],[UsedVar],State}.
diff --git a/lib/compiler/src/v3_codegen.erl b/lib/compiler/src/v3_codegen.erl
index 6a13495523..e00ee1f3ad 100644
--- a/lib/compiler/src/v3_codegen.erl
+++ b/lib/compiler/src/v3_codegen.erl
@@ -210,6 +210,8 @@ need_heap_0([], H, Acc) ->
 
 need_heap_1(#l{ke={set,_,{binary,_}},i=I}, H) ->
     {need_heap_need(I, H),0};
+need_heap_1(#l{ke={set,_,{map,_,_}},i=I}, H) ->
+    {need_heap_need(I, H),0};
 need_heap_1(#l{ke={set,_,Val}}, H) ->
     %% Just pass through adding to needed heap.
     {[],H + case Val of
@@ -453,8 +455,11 @@ basic_block([Le|Les], Acc) ->
 	    end;
 	no_block -> {reverse(Acc, [Le]),Les}
     end.
+
+%% sets that may garbage collect are not allowed in basic blocks.
 	
 collect_block({set,_,{binary,_}})    -> no_block;
+collect_block({set,_,{map,_,_,_}})   -> no_block;
 collect_block({set,_,_})             -> include;
 collect_block({call,{var,_}=Var,As,_Rs}) -> {block_end,As++[Var]};
 collect_block({call,Func,As,_Rs})   -> {block_end,As++func_vars(Func)};
@@ -594,14 +599,13 @@ top_level_block(Keis, Bef, MaxRegs, _St) ->
 %%   number to the outer catch, which is wrong.
 
 turn_yregs(0, Tp, _) -> Tp;
-turn_yregs(El, Tp, MaxY) when element(1, element(El, Tp)) =:= yy ->
-    turn_yregs(El-1, setelement(El, Tp, {y,MaxY-element(2, element(El, Tp))}), MaxY);
-turn_yregs(El, Tp, MaxY) when is_list(element(El, Tp)) ->
-    New = map(fun ({yy,YY}) -> {y,MaxY-YY};
-		  (Other) -> Other end, element(El, Tp)),
-    turn_yregs(El-1, setelement(El, Tp, New), MaxY);
 turn_yregs(El, Tp, MaxY) ->
-    turn_yregs(El-1, Tp, MaxY).
+    turn_yregs(El-1,setelement(El,Tp,turn_yreg(element(El,Tp),MaxY)),MaxY).
+
+turn_yreg({yy,YY},MaxY) -> {y,MaxY-YY};
+turn_yreg({list,Ls},MaxY) -> {list, turn_yreg(Ls,MaxY)};
+turn_yreg(Ts,MaxY) when is_list(Ts) -> [turn_yreg(T,MaxY)||T<-Ts];
+turn_yreg(Other,_MaxY) -> Other.
 
 %% select_cg(Sclause, V, TypeFail, ValueFail, StackReg, State) ->
 %%      {Is,StackReg,State}.
@@ -623,6 +627,8 @@ select_cg(#l{ke={type_clause,bin_int,S}}, {var,V}, Tf, _Vf, Bef, St) ->
     select_bin_segs(S, V, Tf, Bef, St);
 select_cg(#l{ke={type_clause,bin_end,[S]}}, {var,V}, Tf, _Vf, Bef, St) ->
     select_bin_end(S, V, Tf, Bef, St);
+select_cg(#l{ke={type_clause,map,S}}, {var,V}, Tf, Vf, Bef, St) ->
+    select_map(S, V, Tf, Vf, Bef, St);
 select_cg(#l{ke={type_clause,Type,Scs}}, {var,V}, Tf, Vf, Bef, St0) ->
     {Vis,{Aft,St1}} =
 	mapfoldl(fun (S, {Int,Sta}) ->
@@ -637,6 +643,10 @@ select_val_cg(tuple, R, [Arity,{f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
     [{test,is_tuple,{f,Tf},[R]},{test,test_arity,{f,Vf},[R,Arity]}|Sis];
 select_val_cg(tuple, R, Vls, Tf, Vf, Sis) ->
     [{test,is_tuple,{f,Tf},[R]},{select_tuple_arity,R,{f,Vf},{list,Vls}}|Sis];
+select_val_cg(map, R, [_Val,{f,Lbl}], Fail, Fail, [{label,Lbl}|Sis]) ->
+    [{test,is_map,{f,Fail},[R]}|Sis];
+select_val_cg(map, R, [_Val,{f,Lbl}|_], Tf, _Vf, [{label,Lbl}|Sis]) ->
+    [{test,is_map,{f,Tf},[R]}|Sis];
 select_val_cg(Type, R, [Val, {f,Lbl}], Fail, Fail, [{label,Lbl}|Sis]) ->
     [{test,is_eq_exact,{f,Fail},[R,{Type,Val}]}|Sis];
 select_val_cg(Type, R, [Val, {f,Lbl}], Tf, Vf, [{label,Lbl}|Sis]) ->
@@ -915,6 +925,53 @@ select_extract_tuple(Src, Vs, I, Vdb, Bef, St) ->
     {Es,{Aft,_}} = flatmapfoldl(F, {Bef,0}, Vs),
     {Es,Aft,St}.
 
+select_map(Scs, V, Tf, Vf, Bef, St0) ->
+    Reg = fetch_var(V, Bef),
+    {Is,Aft,St1} =
+	match_fmf(fun(#l{ke={val_clause,{map,_,Es},B},i=I,vdb=Vdb}, Fail, St1) ->
+			  select_map_val(V, Es, B, Fail, I, Vdb, Bef, St1)
+		  end, Vf, St0, Scs),
+    {[{test,is_map,{f,Tf},[Reg]}|Is],Aft,St1}.
+
+select_map_val(V, Es, B, Fail, I, Vdb, Bef, St0) ->
+    {Eis,Int,St1} = select_extract_map(V, Es, Fail, I, Vdb, Bef, St0),
+    {Bis,Aft,St2} = match_cg(B, Fail, Int, St1),
+    {Eis++Bis,Aft,St2}.
+
+select_extract_map(_, [], _, _, _, Bef, St) -> {[],Bef,St};
+select_extract_map(Src, Vs, Fail, I, Vdb, Bef, St) ->
+    %% First split the instruction flow
+    %% We want one set of each
+    %% 1) has_map_fields (no target registers)
+    %% 2) get_map_elements (with target registers)
+    %% Assume keys are term-sorted
+    Rsrc = fetch_var(Src, Bef),
+
+    {{HasKs,GetVs},Aft} = lists:foldr(fun
+	    ({map_pair,Key,{var,V}},{{HasKsi,GetVsi},Int0}) ->
+		case vdb_find(V, Vdb) of
+		    {V,_,L} when L =< I ->
+			{{[Key|HasKsi],GetVsi},Int0};
+		    _Other ->
+			Reg1 = put_reg(V, Int0#sr.reg),
+			Int1 = Int0#sr{reg=Reg1},
+			{{HasKsi,[Key,fetch_reg(V, Reg1)|GetVsi]},Int1}
+		end
+	end, {{[],[]},Bef}, Vs),
+
+    Code = case {HasKs,GetVs} of
+	{[],[]} -> {[],Aft,St};
+	{HasKs,[]} ->
+	    [{test,has_map_fields,{f,Fail},Rsrc,{list,HasKs}}];
+	{[],GetVs} ->
+	    [{get_map_elements,   {f,Fail},Rsrc,{list,GetVs}}];
+	{HasKs,GetVs} ->
+	    [{test,has_map_fields,{f,Fail},Rsrc,{list,HasKs}},
+	     {get_map_elements,   {f,Fail},Rsrc,{list,GetVs}}]
+    end,
+    {Code, Aft, St}.
+
+
 select_extract_cons(Src, [{var,Hd}, {var,Tl}], I, Vdb, Bef, St) ->
     {Es,Aft} = case {vdb_find(Hd, Vdb), vdb_find(Tl, Vdb)} of
 		   {{_,_,Lhd}, {_,_,Ltl}} when Lhd =< I, Ltl =< I ->
@@ -1408,7 +1465,7 @@ catch_cg(C, {var,R}, Le, Vdb, Bef, St0) ->
 %%  annotation must reflect this and make sure that the return
 %%  variable is allocated first.
 %%
-%%  put_list for constructing a cons is an atomic instruction
+%%  put_list and put_map are atomic instructions, both of
 %%  which can safely resuse one of the source registers as target.
 
 set_cg([{var,R}], {cons,Es}, Le, Vdb, Bef, St) ->
@@ -1448,6 +1505,35 @@ set_cg([{var,R}], {binary,Segs}, Le, Vdb, Bef,
     %% 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}], {map,Op,Map,Es}, Le, Vdb, Bef,
+       #cg{in_catch=InCatch,bfail=Bfail}=St) ->
+
+    Fail = {f,Bfail},
+    {Sis,Int0} =
+	case InCatch of
+	    true -> adjust_stack(Bef, Le#l.i, Le#l.i+1, Vdb);
+	    false -> {[],Bef}
+	end,
+    SrcReg = cg_reg_arg(Map,Int0),
+    Line = line(Le#l.a),
+
+    %% The instruction needs to store keys in term sorted order
+    %% All keys has to be unique here
+    Pairs = map_pair_strip_and_termsort(Es),
+
+    %% fetch registers for values to be put into the map
+    List = flatmap(fun({K,V}) -> [K,cg_reg_arg(V,Int0)] end, Pairs),
+
+    Live = max_reg(Bef#sr.reg),
+    Int1 = Int0#sr{reg=put_reg(R, Int0#sr.reg)},
+    Aft = clear_dead(Int1, Le#l.i, Vdb),
+    Target = fetch_reg(R, Int1#sr.reg),
+
+    I = case Op of
+	assoc -> put_map_assoc;
+	exact -> put_map_exact
+    end,
+    {Sis++[Line]++[{I,Fail,SrcReg,Target,Live,{list,List}}],Aft,St};
 set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
     %% Find a place for the return register first.
     Int = Bef#sr{reg=put_reg(R, Bef#sr.reg)},
@@ -1460,16 +1546,24 @@ set_cg([{var,R}], Con, Le, Vdb, Bef, St) ->
 	  end,
     {Ais,clear_dead(Int, Le#l.i, Vdb),St}.
 
+map_pair_strip_and_termsort(Es) ->
+    %% format in
+    %%    [{map_pair,K,V}]
+    %% where K is for example {integer, 1} and we want to sort on 1.
+    Ls = [{K,V}||{_,K,V}<-Es],
+    lists:sort(fun({{_,A},_},{{_,B},_}) -> erts_internal:cmp_term(A,B) < 0 end, Ls).
+
 %%%
 %%% Code generation for constructing binaries.
 %%%
 
 cg_binary([{bs_put_binary,Fail,{atom,all},U,_Flags,Src}|PutCode],
 	  Target, Temp, Fail, MaxRegs, Anno) ->
+    Line = line(Anno),
     Live = cg_live(Target, MaxRegs),
     SzCode = cg_bitstr_size(PutCode, Target, Temp, Fail, Live),
     BinFlags = {field_flags,[]},
-    Code = SzCode ++
+    Code = [Line|SzCode] ++
 	[case member(single_use, Anno) of
 	     true ->
 		 {bs_private_append,Fail,Target,U,Src,BinFlags,Target};
@@ -1930,7 +2024,7 @@ load_vars(Vs, Regs) ->
     foldl(fun ({var,V}, Rs) -> put_reg(V, Rs) end, Regs, Vs).
 
 %% put_reg(Val, Regs) -> Regs.
-%% find_reg(Val, Regs) -> ok{r{R}} | error.
+%% find_reg(Val, Regs) -> {ok,r{R}} | error.
 %% fetch_reg(Val, Regs) -> r{R}.
 %%  Functions to interface the registers.
 
diff --git a/lib/compiler/src/v3_core.erl b/lib/compiler/src/v3_core.erl
index d6fdcb2b21..a50b46bd7b 100644
--- a/lib/compiler/src/v3_core.erl
+++ b/lib/compiler/src/v3_core.erl
@@ -74,7 +74,7 @@
 -export([module/2,format_error/1]).
 
 -import(lists, [reverse/1,reverse/2,map/2,member/2,foldl/3,foldr/3,mapfoldl/3,
-		splitwith/2,keyfind/3,sort/1,foreach/2]).
+		splitwith/2,keyfind/3,sort/1,foreach/2,droplast/1,last/1]).
 -import(ordsets, [add_element/2,del_element/2,is_element/2,
 		  union/1,union/2,intersection/2,subtract/2]).
 -import(cerl, [ann_c_cons/3,ann_c_cons_skel/3,ann_c_tuple/2,c_tuple/1]).
@@ -92,7 +92,7 @@
 -record(icase,     {anno=#a{},args,clauses,fc}).
 -record(icatch,    {anno=#a{},body}).
 -record(iclause,   {anno=#a{},pats,pguard=[],guard,body}).
--record(ifun,      {anno=#a{},id,vars,clauses,fc}).
+-record(ifun,      {anno=#a{},id,vars,clauses,fc,name=unnamed}).
 -record(iletrec,   {anno=#a{},defs,body}).
 -record(imatch,    {anno=#a{},pat,guard=[],arg,fc}).
 -record(iprimop,   {anno=#a{},name,args}).
@@ -101,6 +101,8 @@
 -record(ireceive2, {anno=#a{},clauses,timeout,action}).
 -record(iset,      {anno=#a{},var,arg}).
 -record(itry,      {anno=#a{},args,vars,body,evars,handler}).
+-record(ifilter,   {anno=#a{},arg}).
+-record(igen,      {anno=#a{},acc_pat,acc_guard,skip_pat,tail,tail_pat,arg}).
 
 -type iapply()    :: #iapply{}.
 -type ibinary()   :: #ibinary{}.
@@ -117,10 +119,13 @@
 -type ireceive2() :: #ireceive2{}.
 -type iset()      :: #iset{}.
 -type itry()      :: #itry{}.
+-type ifilter()   :: #ifilter{}.
+-type igen()      :: #igen{}.
 
 -type i() :: iapply()   | ibinary()   | icall()     | icase()  | icatch()
            | iclause()  | ifun()      | iletrec()   | imatch() | iprimop()
-           | iprotect() | ireceive1() | ireceive2() | iset()   | itry().
+           | iprotect() | ireceive1() | ireceive2() | iset()   | itry()
+           | ifilter()  | igen().
 
 -type warning() :: {file:filename(), [{integer(), module(), term()}]}.
 
@@ -226,13 +231,13 @@ guard(Gs0, St0) ->
 			Gt1 = guard_tests(Gt0),
 			L = element(2, Gt1),
 			{op,L,'or',Gt1,Rhs}
-		end, guard_tests(last(Gs0)), first(Gs0)),
+		end, guard_tests(last(Gs0)), droplast(Gs0)),
     {Gs,St} = gexpr_top(Gs1, St0#core{in_guard=true}),
     {Gs,St#core{in_guard=false}}.
     
 guard_tests(Gs) ->
     L = element(2, hd(Gs)),
-    {protect,L,foldr(fun (G, Rhs) -> {op,L,'and',G,Rhs} end, last(Gs), first(Gs))}.
+    {protect,L,foldr(fun (G, Rhs) -> {op,L,'and',G,Rhs} end, last(Gs), droplast(Gs))}.
 
 %% gexpr_top(Expr, State) -> {Cexpr,State}.
 %%  Generate an internal core expression of a guard test.  Explicitly
@@ -479,14 +484,26 @@ expr({cons,L,H0,T0}, St0) ->
     {T1,Tps,St2} = safe(T0, St1),
     A = lineno_anno(L, St2),
     {ann_c_cons(A, H1, T1),Hps ++ Tps,St2};
-expr({lc,L,E,Qs}, St) ->
-    lc_tq(L, E, Qs, #c_literal{anno=lineno_anno(L, St),val=[]}, St);
+expr({lc,L,E,Qs0}, St0) ->
+    {Qs1,St1} = preprocess_quals(L, Qs0, St0),
+    lc_tq(L, E, Qs1, #c_literal{anno=lineno_anno(L, St1),val=[]}, St1);
 expr({bc,L,E,Qs}, St) ->
     bc_tq(L, E, Qs, {nil,L}, St);
 expr({tuple,L,Es0}, St0) ->
     {Es1,Eps,St1} = safe_list(Es0, St0),
     A = lineno_anno(L, St1),
     {ann_c_tuple(A, Es1),Eps,St1};
+expr({map,L,Es0}, St0) ->
+    % erl_lint should make sure only #{ K => V } are allowed
+    % in map construction.
+    {Es1,Eps,St1} = map_pair_list(Es0, St0),
+    A = lineno_anno(L, St1),
+    {#c_map{anno=A,es=Es1},Eps,St1};
+expr({map,L,M0,Es0}, St0) ->
+    {M1,Mps,St1} = safe(M0, St0),
+    {Es1,Eps,St2} = map_pair_list(Es0, St1),
+    A = lineno_anno(L, St2),
+    {#c_map{anno=A,var=M1,es=Es1},Mps++Eps,St2};
 expr({bin,L,Es0}, St0) ->
     try expr_bin(Es0, lineno_anno(L, St0), St0) of
 	{_,_,_}=Res -> Res
@@ -502,7 +519,7 @@ expr({bin,L,Es0}, St0) ->
     end;
 expr({block,_,Es0}, St0) ->
     %% Inline the block directly.
-    {Es1,St1} = exprs(first(Es0), St0),
+    {Es1,St1} = exprs(droplast(Es0), St0),
     {E1,Eps,St2} = expr(last(Es0), St1),
     {E1,Es1 ++ Eps,St2};
 expr({'if',L,Cs0}, St0) ->
@@ -553,16 +570,23 @@ expr({'try',L,Es0,[],[],As0}, St0) ->
     %% 'try ... after ... end'
     {Es1,St1} = exprs(Es0, St0),
     {As1,St2} = exprs(As0, St1),
-    {Evs,Hs0,St3} = try_after(As1, St2),
-    %% We must kill the id for any funs in the duplicated after body,
-    %% to avoid getting two local functions having the same name.
-    Hs = kill_id_anns(Hs0),
+    {Name,St3} = new_fun_name("after", St2),
     {V,St4} = new_var(St3),		% (must not exist in As1)
-    %% TODO: this duplicates the 'after'-code; should lift to function.
-    Lanno = lineno_anno(L, St4),
-    {#itry{anno=#a{anno=Lanno},args=Es1,vars=[V],body=As1++[V],
-	   evars=Evs,handler=Hs},
-     [],St4};
+    LA = lineno_anno(L, St4),
+    Lanno = #a{anno=LA},
+    Fc = function_clause([], LA, {Name,0}),
+    Fun = #ifun{anno=Lanno,id=[],vars=[],
+		clauses=[#iclause{anno=Lanno,pats=[],
+				  guard=[#c_literal{val=true}],
+				  body=As1}],
+		fc=Fc},
+    App = #iapply{anno=#a{anno=[compiler_generated|LA]},
+		  op=#c_var{anno=LA,name={Name,0}},args=[]},
+    {Evs,Hs,St5} = try_after([App], St4),
+    Try = #itry{anno=Lanno,args=Es1,vars=[V],body=[App,V],evars=Evs,handler=Hs},
+    Letrec = #iletrec{anno=Lanno,defs=[{{Name,0},Fun}],
+		      body=[Try]},
+    {Letrec,[],St5};
 expr({'try',L,Es,Cs,Ecs,As}, St0) ->
     %% 'try ... [of ...] [catch ...] after ... end'
     expr({'try',L,[{'try',L,Es,Cs,Ecs,[]}],[],[],As}, St0);
@@ -581,7 +605,11 @@ expr({'fun',L,{function,M,F,A}}, St0) ->
 	    name=#c_literal{val=make_fun},
 	    args=As},Aps,St1};
 expr({'fun',L,{clauses,Cs},Id}, St) ->
-    fun_tq(Id, Cs, L, St);
+    fun_tq(Id, Cs, L, St, unnamed);
+expr({named_fun,L,'_',Cs,Id}, St) ->
+    fun_tq(Id, Cs, L, St, unnamed);
+expr({named_fun,L,Name,Cs,{Index,Uniq,_Fname}}, St) ->
+    fun_tq({Index,Uniq,Name}, Cs, L, St, {named, Name});
 expr({call,L,{remote,_,M,F},As0}, #core{wanted=Wanted}=St0) ->
     {[M1,F1|As1],Aps,St1} = safe_list([M,F|As0], St0),
     Lanno = lineno_anno(L, St1),
@@ -625,7 +653,7 @@ expr({match,L,P0,E0}, St0) ->
 	Other when not is_atom(Other) ->
 	    {#imatch{anno=#a{anno=Lanno},pat=P2,arg=E2,fc=Fc},Eps,St4}
     end;
-expr({op,_,'++',{lc,Llc,E,Qs},More}, St0) ->
+expr({op,_,'++',{lc,Llc,E,Qs0},More}, St0) ->
     %% Optimise '++' here because of the list comprehension algorithm.
     %%
     %% To avoid achieving quadratic complexity if there is a chain of
@@ -633,7 +661,8 @@ expr({op,_,'++',{lc,Llc,E,Qs},More}, St0) ->
     %% evaluation of More now. Evaluating More here could also reduce the
     %% number variables in the environment for letrec.
     {Mc,Mps,St1} = safe(More, St0),
-    {Y,Yps,St} = lc_tq(Llc, E, Qs, Mc, St1),
+    {Qs,St2} = preprocess_quals(Llc, Qs0, St1),
+    {Y,Yps,St} = lc_tq(Llc, E, Qs, Mc, St2),
     {Y,Mps++Yps,St};
 expr({op,L,'andalso',E1,E2}, St0) ->
     {#c_var{name=V0},St} = new_var(L, St0),
@@ -684,6 +713,21 @@ make_bool_switch_guard(L, E, V, T, F) ->
       {clause,NegL,[V],[],[V]}
      ]}.
 
+map_pair_list(Es, St) ->
+    foldr(fun
+	    ({map_field_assoc,L,K0,V0}, {Ces,Esp,St0}) ->
+		{K,Ep0,St1} = safe(K0, St0),
+		{V,Ep1,St2} = safe(V0, St1),
+		A = lineno_anno(L, St2),
+		Pair = #c_map_pair{op=#c_literal{val=assoc},anno=A,key=K,val=V},
+		{[Pair|Ces],Ep0 ++ Ep1 ++ Esp,St2};
+	    ({map_field_exact,L,K0,V0}, {Ces,Esp,St0}) ->
+		{K,Ep0,St1} = safe(K0, St0),
+		{V,Ep1,St2} = safe(V0, St1),
+		A = lineno_anno(L, St2),
+		Pair = #c_map_pair{op=#c_literal{val=exact},anno=A,key=K,val=V},
+		{[Pair|Ces],Ep0 ++ Ep1 ++ Esp,St2}
+	end, {[],[],St}, Es).
 
 %% try_exception([ExcpClause], St) -> {[ExcpVar],Handler,St}.
 
@@ -836,9 +880,9 @@ bitstr({bin_element,_,E0,Size0,[Type,{unit,Unit}|Flags]}, St0) ->
 	       flags=#c_literal{val=Flags}},
      Eps ++ Eps2,St2}.
 
-%% fun_tq(Id, [Clauses], Line, State) -> {Fun,[PreExp],State}.
+%% fun_tq(Id, [Clauses], Line, State, NameInfo) -> {Fun,[PreExp],State}.
 
-fun_tq({_,_,Name}=Id, Cs0, L, St0) ->
+fun_tq({_,_,Name}=Id, Cs0, L, St0, NameInfo) ->
     Arity = clause_arity(hd(Cs0)),
     {Cs1,St1} = clauses(Cs0, St0),
     {Args,St2} = new_vars(Arity, St1),
@@ -847,137 +891,50 @@ fun_tq({_,_,Name}=Id, Cs0, L, St0) ->
     Fc = function_clause(Ps, Anno, {Name,Arity}),
     Fun = #ifun{anno=#a{anno=Anno},
 		id=[{id,Id}],				%We KNOW!
-		vars=Args,clauses=Cs1,fc=Fc},
+		vars=Args,clauses=Cs1,fc=Fc,name=NameInfo},
     {Fun,[],St3}.
 
 %% lc_tq(Line, Exp, [Qualifier], Mc, State) -> {LetRec,[PreExp],State}.
 %%  This TQ from Simon PJ pp 127-138.  
-%%  This gets a bit messy as we must transform all directly here.  We
-%%  recognise guard tests and try to fold them together and join to a
-%%  preceding generators, this should give us better and more compact
-%%  code.
 
-lc_tq(Line, E, [{generate,Lg,P,G}|Qs0], Mc, St0) ->
-    {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
+lc_tq(Line, E, [#igen{anno=GAnno,acc_pat=AccPat,acc_guard=AccGuard,
+                      skip_pat=SkipPat,tail=Tail,tail_pat=TailPat,
+                      arg={Pre,Arg}}|Qs], Mc, St0) ->
     {Name,St1} = new_fun_name("lc", St0),
-    {Head,St2} = new_var(St1),
-    {Tname,St3} = new_var_name(St2),
-    LA = lineno_anno(Line, St3),
-    LAnno = #a{anno=LA},
-    Tail = #c_var{anno=LA,name=Tname},
-    {Arg,St4} = new_var(St3),
-    {Nc,[],St5} = expr({call,Lg,{atom,Lg,Name},[{var,Lg,Tname}]}, St4),
-    {Guardc,St6} = lc_guard_tests(Gs, St5),	%These are always flat!
-    {Lc,Lps,St7} = lc_tq(Line, E, Qs1, Nc, St6),
-    {Pc,St8} = list_gen_pattern(P, Line, St7),
-    {Gc,Gps,St9} = safe(G, St8),		%Will be a function argument!
-    Fc = function_clause([Arg], LA, {Name,1}),
-
-    %% Avoid constructing a default clause if the list comprehension
-    %% only has a variable as generator and there are no guard
-    %% tests. In other words, if the comprehension is equivalent to
-    %% lists:map/2.
-    Cs0 = case {Guardc, Pc} of
-	      {[], #c_var{}} ->
-		  [#iclause{anno=LAnno,
-			    pats=[#c_literal{anno=LA,val=[]}],guard=[],
-			    body=[Mc]}];
-	      _ ->
-		  [#iclause{anno=#a{anno=[compiler_generated|LA]},
-			    pats=[ann_c_cons(LA, Head, Tail)],
-			    guard=[],
-			    body=[Nc]},
-		   #iclause{anno=LAnno,
-			    pats=[#c_literal{anno=LA,val=[]}],guard=[],
-			    body=[Mc]}]
-	  end,
-    Cs = case Pc of
-	     nomatch -> Cs0;
-	     _ ->
-		 [#iclause{anno=LAnno,
-			   pats=[ann_c_cons(LA, Pc, Tail)],
-			   guard=Guardc,
-			   body=Lps ++ [Lc]}|Cs0]
-	 end,
-    Fun = #ifun{anno=LAnno,id=[],vars=[Arg],clauses=Cs,fc=Fc},
-    {#iletrec{anno=LAnno,defs=[{{Name,1},Fun}],
-	      body=Gps ++ [#iapply{anno=LAnno,
-				   op=#c_var{anno=LA,name={Name,1}},
-				   args=[Gc]}]},
-     [],St9};
-lc_tq(Line, E, [{b_generate,Lg,P,G}|Qs0], Mc, St0) ->
-    {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
-    {Name,St1} = new_fun_name("blc", St0),
     LA = lineno_anno(Line, St1),
     LAnno = #a{anno=LA},
-    HeadBinPattern = pattern(P, St1),
-    #c_binary{segments=Ps0} = HeadBinPattern,
-    {Ps,Tail,St2} = append_tail_segment(Ps0, St1),
-    {EPs,St3} = emasculate_segments(Ps, St2),
-    Pattern = HeadBinPattern#c_binary{segments=Ps},
-    EPattern = HeadBinPattern#c_binary{segments=EPs},
-    {Arg,St4} = new_var(St3),
-    {Guardc,St5} = lc_guard_tests(Gs, St4),	%These are always flat!
-    Tname = Tail#c_var.name,
-    {Nc,[],St6} = expr({call,Lg,{atom,Lg,Name},[{var,Lg,Tname}]}, St5),
-    {Bc,Bps,St7} = lc_tq(Line, E, Qs1, Nc, St6),
-    {Gc,Gps,St10} = safe(G, St7),		%Will be a function argument!
-    Fc = function_clause([Arg], LA, {Name,1}),
-    {TailSegList,_,St} = append_tail_segment([], St10),
-    Cs = [#iclause{anno=#a{anno=[compiler_generated|LA]},
-		   pats=[Pattern],
-		   guard=Guardc,
-		   body=Bps ++ [Bc]},
-	  #iclause{anno=#a{anno=[compiler_generated|LA]},
-		   pats=[EPattern],
-		   guard=[],
-		   body=[#iapply{anno=LAnno,
-				 op=#c_var{anno=LA,name={Name,1}},
-				 args=[Tail]}]},
-	  #iclause{anno=LAnno,
-		   pats=[#c_binary{anno=LA,segments=TailSegList}],guard=[],
-		   body=[Mc]}],
-    Fun = #ifun{anno=LAnno,id=[],vars=[Arg],clauses=Cs,fc=Fc},
-    {#iletrec{anno=LAnno,defs=[{{Name,1},Fun}],
-	      body=Gps ++ [#iapply{anno=LAnno,
-				   op=#c_var{anno=LA,name={Name,1}},
-				   args=[Gc]}]},
-     [],St};
-lc_tq(Line, E, [Fil0|Qs0], Mc, St0) ->
-    %% Special case sequences guard tests.
-    LA = lineno_anno(element(2, Fil0), St0),
-    LAnno = #a{anno=LA},
-    case is_guard_test(Fil0) of
-	true ->
-	    {Gs0,Qs1} = splitwith(fun is_guard_test/1, Qs0),
-	    {Lc,Lps,St1} = lc_tq(Line, E, Qs1, Mc, St0),
-	    {Gs,St2} = lc_guard_tests([Fil0|Gs0], St1), %These are always flat!
-	    {#icase{anno=LAnno,
-		    args=[],
-		    clauses=[#iclause{anno=LAnno,pats=[],
-				      guard=Gs,body=Lps ++ [Lc]}],
-		    fc=#iclause{anno=LAnno,pats=[],guard=[],body=[Mc]}},
-	     [],St2};
-	false ->
-	    {Lc,Lps,St1} = lc_tq(Line, E, Qs0, Mc, St0),
-	    {Fpat,St2} = new_var(St1),
-	    Fc = fail_clause([Fpat], LA,
-			     c_tuple([#c_literal{val=case_clause},Fpat])),
-	    %% Do a novars little optimisation here.
-	    {Filc,Fps,St3} = novars(Fil0, St2),
-	    {#icase{anno=LAnno,
-		    args=[Filc],
-		    clauses=[#iclause{anno=LAnno,
-				      pats=[#c_literal{anno=LA,val=true}],
-				      guard=[],
-				      body=Lps ++ [Lc]},
-			     #iclause{anno=LAnno#a{anno=[compiler_generated|LA]},
-				      pats=[#c_literal{anno=LA,val=false}],
-				      guard=[],
-				      body=[Mc]}],
-		    fc=Fc},
-	     Fps,St3}
-    end;
+    F = #c_var{anno=LA,name={Name,1}},
+    Nc = #iapply{anno=GAnno,op=F,args=[Tail]},
+    {Var,St2} = new_var(St1),
+    Fc = function_clause([Var], LA, {Name,1}),
+    TailClause = #iclause{anno=LAnno,pats=[TailPat],guard=[],body=[Mc]},
+    Cs0 = case {AccPat,AccGuard} of
+              {SkipPat,[]} ->
+                  %% Skip and accumulator patterns are the same and there is
+                  %% no guard, no need to generate a skip clause.
+                  [TailClause];
+              _ ->
+                  [#iclause{anno=#a{anno=[compiler_generated|LA]},
+                            pats=[SkipPat],guard=[],body=[Nc]},
+                   TailClause]
+          end,
+    {Cs,St4} = case AccPat of
+                   nomatch ->
+                       %% The accumulator pattern never matches, no need
+                       %% for an accumulator clause.
+                       {Cs0,St2};
+                   _ ->
+                       {Lc,Lps,St3} = lc_tq(Line, E, Qs, Nc, St2),
+                       {[#iclause{anno=LAnno,pats=[AccPat],guard=AccGuard,
+                                  body=Lps ++ [Lc]}|Cs0],
+                        St3}
+               end,
+    Fun = #ifun{anno=LAnno,id=[],vars=[Var],clauses=Cs,fc=Fc},
+    {#iletrec{anno=LAnno#a{anno=[list_comprehension|LA]},defs=[{{Name,1},Fun}],
+              body=Pre ++ [#iapply{anno=LAnno,op=F,args=[Arg]}]},
+     [],St4};
+lc_tq(Line, E, [#ifilter{}=Filter|Qs], Mc, St) ->
+    filter_tq(Line, E, Filter, Mc, St, Qs, fun lc_tq/5);
 lc_tq(Line, E0, [], Mc0, St0) ->
     {H1,Hps,St1} = safe(E0, St0),
     {T1,Tps,St} = force_safe(Mc0, St1),
@@ -987,142 +944,60 @@ lc_tq(Line, E0, [], Mc0, St0) ->
 
 %% bc_tq(Line, Exp, [Qualifier], More, State) -> {LetRec,[PreExp],State}.
 %%  This TQ from Gustafsson ERLANG'05.  
-%%  This gets a bit messy as we must transform all directly here.  We
-%%  recognise guard tests and try to fold them together and join to a
-%%  preceding generators, this should give us better and more compact
-%%  code.
 %%  More could be transformed before calling bc_tq.
 
-bc_tq(Line, Exp, Qualifiers, _, St0) ->
+bc_tq(Line, Exp, Qs0, _, St0) ->
     {BinVar,St1} = new_var(St0),
-    {Sz,SzPre,St2} = bc_initial_size(Exp, Qualifiers, St1),
-    {E,BcPre,St} = bc_tq1(Line, Exp, Qualifiers, BinVar, St2),
+    {Sz,SzPre,St2} = bc_initial_size(Exp, Qs0, St1),
+    {Qs,St3} = preprocess_quals(Line, Qs0, St2),
+    {E,BcPre,St} = bc_tq1(Line, Exp, Qs, BinVar, St3),
     Pre = SzPre ++
 	[#iset{var=BinVar,
 	       arg=#iprimop{name=#c_literal{val=bs_init_writable},
 			    args=[Sz]}}] ++ BcPre,
     {E,Pre,St}.
 
-bc_tq1(Line, E, [{generate,Lg,P,G}|Qs0], AccExpr, St0) ->
-    {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
-    {Name,St1} = new_fun_name("lbc", St0),
-    LA = lineno_anno(Line, St1),
-    {[Head,Tail,AccVar],St2} = new_vars(LA, 3, St1),
-    LAnno = #a{anno=LA},
-    {Arg,St3} = new_var(St2),
-    NewMore = {call,Lg,{atom,Lg,Name},[{var,Lg,Tail#c_var.name},
-				       {var,Lg,AccVar#c_var.name}]},
-    {Guardc,St4} = lc_guard_tests(Gs, St3),	%These are always flat!
-    {Lc,Lps,St5} = bc_tq1(Line, E, Qs1, AccVar, St4),
-    {Nc,Nps,St6} = expr(NewMore, St5),
-    {Pc,St7} = list_gen_pattern(P, Line, St6),
-    {Gc,Gps,St8} = safe(G, St7),		%Will be a function argument!
-    Fc = function_clause([Arg,AccVar], LA, {Name,2}),
-    Cs0 = case {Guardc, Pc} of
-	      {[], #c_var{}} ->
-		  [#iclause{anno=LAnno,
-			    pats=[#c_literal{anno=LA,val=[]},AccVar],guard=[],
-			    body=[AccVar]}];
-	      _ ->
-		  [#iclause{anno=#a{anno=[compiler_generated|LA]},
-			    pats=[ann_c_cons(LA, Head, Tail),AccVar],
-			    guard=[],
-			    body=Nps ++ [Nc]},
-		   #iclause{anno=LAnno,
-			    pats=[#c_literal{anno=LA,val=[]},AccVar],guard=[],
-			    body=[AccVar]}]
-	  end,
-    Cs = case Pc of
-	     nomatch -> Cs0;
-	     _ ->
-		 Body = Lps ++ Nps ++ [#iset{var=AccVar,arg=Lc},Nc],
-		 [#iclause{anno=LAnno,
-			   pats=[ann_c_cons(LA,Pc,Tail),AccVar],
-			   guard=Guardc,
-			   body=Body}|Cs0]
-	 end,
-    Fun = #ifun{anno=LAnno,id=[],vars=[Arg,AccVar],clauses=Cs,fc=Fc},
-    {#iletrec{anno=LAnno,defs=[{{Name,2},Fun}],
-	      body=Gps ++ [#iapply{anno=LAnno,
-				   op=#c_var{anno=LA,name={Name,2}},
-				   args=[Gc,AccExpr]}]},
-     [],St8};
-bc_tq1(Line, E, [{b_generate,Lg,P,G}|Qs0], AccExpr, St0) ->
-    {Gs,Qs1} =  splitwith(fun is_guard_test/1, Qs0),
+bc_tq1(Line, E, [#igen{anno=GAnno,acc_pat=AccPat,acc_guard=AccGuard,
+                       skip_pat=SkipPat,tail=Tail,tail_pat=TailPat,
+                       arg={Pre,Arg}}|Qs], Mc, St0) ->
     {Name,St1} = new_fun_name("lbc", St0),
     LA = lineno_anno(Line, St1),
-    {AccVar,St2} = new_var(LA, St1),
     LAnno = #a{anno=LA},
-    HeadBinPattern = pattern(P, St2),
-    #c_binary{segments=Ps0} = HeadBinPattern,
-    {Ps,Tail,St3} = append_tail_segment(Ps0, St2),
-    {EPs,St4} = emasculate_segments(Ps, St3),
-    Pattern = HeadBinPattern#c_binary{segments=Ps},
-    EPattern = HeadBinPattern#c_binary{segments=EPs},
-    {Arg,St5} = new_var(St4),
-    NewMore = {call,Lg,{atom,Lg,Name},[{var,Lg,Tail#c_var.name},
-				       {var,Lg,AccVar#c_var.name}]},
-    {Guardc,St6} = lc_guard_tests(Gs, St5),	%These are always flat!
-    {Bc,Bps,St7} = bc_tq1(Line, E, Qs1, AccVar, St6),
-    {Nc,Nps,St8} = expr(NewMore, St7),
-    {Gc,Gps,St9} = safe(G, St8),	 %Will be a function argument!
-    Fc = function_clause([Arg,AccVar], LA, {Name,2}),
-    Body = Bps ++ Nps ++ [#iset{var=AccVar,arg=Bc},Nc],
-    {TailSegList,_,St} = append_tail_segment([], St9),
-    Cs = [#iclause{anno=LAnno,
-		   pats=[Pattern,AccVar],
-		   guard=Guardc,
-		   body=Body},
-	  #iclause{anno=#a{anno=[compiler_generated|LA]},
-		   pats=[EPattern,AccVar],
-		   guard=[],
-		   body=Nps ++ [Nc]},
-	  #iclause{anno=LAnno,
-		   pats=[#c_binary{anno=LA,segments=TailSegList},AccVar],
-		   guard=[],
-		   body=[AccVar]}],
-    Fun = #ifun{anno=LAnno,id=[],vars=[Arg,AccVar],clauses=Cs,fc=Fc},
-    {#iletrec{anno=LAnno,defs=[{{Name,2},Fun}],
-	      body=Gps ++ [#iapply{anno=LAnno,
-				   op=#c_var{anno=LA,name={Name,2}},
-				   args=[Gc,AccExpr]}]},
-     [],St};
-bc_tq1(Line, E, [Fil0|Qs0], AccVar, St0) ->
-    %% Special case sequences guard tests.
-    LA = lineno_anno(element(2, Fil0), St0),
-    LAnno = #a{anno=LA},
-    case is_guard_test(Fil0) of
-	true ->
-	    {Gs0,Qs1} = splitwith(fun is_guard_test/1, Qs0),
-	    {Bc,Bps,St1} = bc_tq1(Line, E, Qs1, AccVar, St0),
-	    {Gs,St} = lc_guard_tests([Fil0|Gs0], St1), %These are always flat!
-	    {#icase{anno=LAnno,
-		    args=[],
-		    clauses=[#iclause{anno=LAnno,
-				      pats=[],
-				      guard=Gs,body=Bps ++ [Bc]}],
-		    fc=#iclause{anno=LAnno,pats=[],guard=[],body=[AccVar]}},
-	     [],St};
-	false ->
-	    {Bc,Bps,St1} = bc_tq1(Line, E, Qs0, AccVar, St0),
-	    {Fpat,St2} = new_var(St1),
-	    Fc = fail_clause([Fpat], LA,
-			     c_tuple([#c_literal{val=case_clause},Fpat])),
-	    %% Do a novars little optimisation here.
-	    {Filc,Fps,St} = novars(Fil0, St2),
-	    {#icase{anno=LAnno,
-		    args=[Filc],
-		    clauses=[#iclause{anno=LAnno,
-				      pats=[#c_literal{anno=LA,val=true}],
-				      guard=[],
-				      body=Bps ++ [Bc]},
-			     #iclause{anno=LAnno#a{anno=[compiler_generated|LA]},
-				      pats=[#c_literal{anno=LA,val=false}],
-				      guard=[],
-				      body=[AccVar]}],
-		    fc=Fc},
-	     Fps,St}
-    end;
+    {Vars=[_,AccVar],St2} = new_vars(LA, 2, St1),
+    F = #c_var{anno=LA,name={Name,2}},
+    Nc = #iapply{anno=GAnno,op=F,args=[Tail,AccVar]},
+    Fc = function_clause(Vars, LA, {Name,2}),
+    TailClause = #iclause{anno=LAnno,pats=[TailPat,AccVar],guard=[],
+                          body=[AccVar]},
+    Cs0 = case {AccPat,AccGuard} of
+              {SkipPat,[]} ->
+                  %% Skip and accumulator patterns are the same and there is
+                  %% no guard, no need to generate a skip clause.
+                  [TailClause];
+              _ ->
+                  [#iclause{anno=#a{anno=[compiler_generated|LA]},
+                            pats=[SkipPat,AccVar],guard=[],body=[Nc]},
+                   TailClause]
+          end,
+    {Cs,St4} = case AccPat of
+                   nomatch ->
+                       %% The accumulator pattern never matches, no need
+                       %% for an accumulator clause.
+                       {Cs0,St2};
+                   _ ->
+                       {Bc,Bps,St3} = bc_tq1(Line, E, Qs, AccVar, St2),
+                       Body = Bps ++ [#iset{var=AccVar,arg=Bc},Nc],
+                       {[#iclause{anno=LAnno,
+                                  pats=[AccPat,AccVar],guard=AccGuard,
+                                  body=Body}|Cs0],
+                        St3}
+               end,
+    Fun = #ifun{anno=LAnno,id=[],vars=Vars,clauses=Cs,fc=Fc},
+    {#iletrec{anno=LAnno#a{anno=[list_comprehension|LA]},defs=[{{Name,2},Fun}],
+              body=Pre ++ [#iapply{anno=LAnno,op=F,args=[Arg,Mc]}]},
+     [],St4};
+bc_tq1(Line, E, [#ifilter{}=Filter|Qs], Mc, St) ->
+    filter_tq(Line, E, Filter, Mc, St, Qs, fun bc_tq1/5);
 bc_tq1(_, {bin,Bl,Elements}, [], AccVar, St0) ->
     {E,Pre,St} = expr({bin,Bl,[{bin_element,Bl,
 				{var,Bl,AccVar#c_var.name},
@@ -1130,31 +1005,154 @@ bc_tq1(_, {bin,Bl,Elements}, [], AccVar, St0) ->
 				[binary,{unit,1}]}|Elements]}, St0),
     #a{anno=A} = Anno0 = get_anno(E),
     Anno = Anno0#a{anno=[compiler_generated,single_use|A]},
-    %%Anno = Anno0#a{anno=[compiler_generated|A]},
     {set_anno(E, Anno),Pre,St}.
 
-append_tail_segment(Segs, St) ->
-    app_tail_seg(Segs, St, []).
-
-app_tail_seg([#c_bitstr{val=Var0,size=#c_literal{val=all}}=Seg0]=L,
-	     St0, Acc) ->
-    case Var0 of
-	#c_var{name='_'} ->
-	    {Var,St} = new_var(St0),
-	    Seg = Seg0#c_bitstr{val=Var},
-	    {reverse(Acc, [Seg]),Var,St};
-	#c_var{} ->
-	    {reverse(Acc, L),Var0,St0}
+%% filter_tq(Line, Expr, Filter, Mc, State, [Qualifier], TqFun) ->
+%%     {Case,[PreExpr],State}.
+%%  Transform an intermediate comprehension filter to its intermediate case
+%%  representation.
+
+filter_tq(Line, E, #ifilter{anno=#a{anno=LA}=LAnno,arg={Pre,Arg}},
+          Mc, St0, Qs, TqFun) ->
+    %% The filter is an expression, it is compiled to a case of degree 1 with
+    %% 3 clauses, one accumulating, one skipping and the final one throwing
+    %% {case_clause,Value} where Value is the result of the filter and is not a
+    %% boolean.
+    {Lc,Lps,St1} = TqFun(Line, E, Qs, Mc, St0),
+    {FailPat,St2} = new_var(St1),
+    Fc = fail_clause([FailPat], LA,
+                     c_tuple([#c_literal{val=case_clause},FailPat])),
+    {#icase{anno=LAnno#a{anno=[list_comprehension|LA]},args=[Arg],
+            clauses=[#iclause{anno=LAnno,
+                              pats=[#c_literal{val=true}],guard=[],
+                              body=Lps ++ [Lc]},
+                     #iclause{anno=LAnno#a{anno=[compiler_generated|LA]},
+                              pats=[#c_literal{val=false}],guard=[],
+                              body=[Mc]}],
+            fc=Fc},
+     Pre,St2};
+filter_tq(Line, E, #ifilter{anno=#a{anno=LA}=LAnno,arg=Guard},
+          Mc, St0, Qs, TqFun) when is_list(Guard) ->
+    %% Otherwise it is a guard, compiled to a case of degree 0 with 2 clauses,
+    %% the first matches if the guard succeeds and the comprehension continues
+    %% or the second one is selected and the current element is skipped.
+    {Lc,Lps,St1} = TqFun(Line, E, Qs, Mc, St0),
+    {#icase{anno=LAnno#a{anno=[list_comprehension|LA]},args=[],
+            clauses=[#iclause{anno=LAnno,pats=[],guard=Guard,body=Lps ++ [Lc]}],
+            fc=#iclause{anno=LAnno#a{anno=[compiler_generated|LA]},
+                        pats=[],guard=[],body=[Mc]}},
+     [],St1}.
+
+%% preprocess_quals(Line, [Qualifier], State) -> {[Qualifier'],State}.
+%%  Preprocess a list of Erlang qualifiers into its intermediate representation,
+%%  represented as a list of #igen{} and #ifilter{} records. We recognise guard
+%%  tests and try to fold them together and join to a preceding generators, this
+%%  should give us better and more compact code.
+
+preprocess_quals(Line, Qs, St) ->
+    preprocess_quals(Line, Qs, St, []).
+
+preprocess_quals(Line, [Q|Qs0], St0, Acc) ->
+    case is_generator(Q) of
+        true ->
+            {Gs,Qs} = splitwith(fun is_guard_test/1, Qs0),
+            {Gen,St} = generator(Line, Q, Gs, St0),
+            preprocess_quals(Line, Qs, St, [Gen|Acc]);
+        false ->
+            LAnno = #a{anno=lineno_anno(get_anno(Q), St0)},
+            case is_guard_test(Q) of
+                true ->
+                    %% When a filter is a guard test, its argument in the
+                    %% #ifilter{} record is a list as returned by
+                    %% lc_guard_tests/2.
+                    {Gs,Qs} = splitwith(fun is_guard_test/1, Qs0),
+                    {Cg,St} = lc_guard_tests([Q|Gs], St0),
+                    Filter = #ifilter{anno=LAnno,arg=Cg},
+                    preprocess_quals(Line, Qs, St, [Filter|Acc]);
+                false ->
+                    %% Otherwise, it is a pair {Pre,Arg} as in a generator
+                    %% input.
+                    {Ce,Pre,St} = novars(Q, St0),
+                    Filter = #ifilter{anno=LAnno,arg={Pre,Ce}},
+                    preprocess_quals(Line, Qs0, St, [Filter|Acc])
+            end
     end;
-app_tail_seg([H|T], St, Acc) ->
-    app_tail_seg(T, St, [H|Acc]);
-app_tail_seg([], St0, Acc) ->
+preprocess_quals(_, [], St, Acc) ->
+    {reverse(Acc),St}.
+
+is_generator({generate,_,_,_}) -> true;
+is_generator({b_generate,_,_,_}) -> true;
+is_generator(_) -> false.
+
+%%
+%% Generators are abstracted as sextuplets:
+%%  - acc_pat is the accumulator pattern, e.g. [Pat|Tail] for Pat <- Expr.
+%%  - acc_guard is the list of guards immediately following the current
+%%    generator in the qualifier list input.
+%%  - skip_pat is the skip pattern, e.g. <<X,_:X,Tail/bitstring>> for
+%%    <<X,1:X>> <= Expr.
+%%  - tail is the variable used in AccPat and SkipPat bound to the rest of the
+%%    generator input.
+%%  - tail_pat is the tail pattern, respectively [] and <<_/bitstring>> for list
+%%    and bit string generators.
+%%  - arg is a pair {Pre,Arg} where Pre is the list of expressions to be
+%%    inserted before the comprehension function and Arg is the expression
+%%    that it should be passed.
+%%
+
+%% generator(Line, Generator, Guard, State) -> {Generator',State}.
+%%  Transform a given generator into its #igen{} representation.
+
+generator(Line, {generate,Lg,P0,E}, Gs, St0) ->
+    LA = lineno_anno(Line, St0),
+    GA = lineno_anno(Lg, St0),
+    {Head,St1} = list_gen_pattern(P0, Line, St0),
+    {[Tail,Skip],St2} = new_vars(2, St1),
+    {Cg,St3} = lc_guard_tests(Gs, St2),
+    {AccPat,SkipPat} = case Head of
+                           #c_var{} ->
+                               %% If the generator pattern is a variable, the
+                               %% pattern from the accumulator clause can be
+                               %% reused in the skip one. lc_tq and bc_tq1 takes
+                               %% care of dismissing the latter in that case.
+                               Cons = ann_c_cons(LA, Head, Tail),
+                               {Cons,Cons};
+                           nomatch ->
+                               %% If it never matches, there is no need for
+                               %% an accumulator clause.
+                               {nomatch,ann_c_cons(LA, Skip, Tail)};
+                           _ ->
+                               {ann_c_cons(LA, Head, Tail),
+                                ann_c_cons(LA, Skip, Tail)}
+                       end,
+    {Ce,Pre,St4} = safe(E, St3),
+    Gen = #igen{anno=#a{anno=GA},acc_pat=AccPat,acc_guard=Cg,skip_pat=SkipPat,
+                tail=Tail,tail_pat=#c_literal{anno=LA,val=[]},arg={Pre,Ce}},
+    {Gen,St4};
+generator(Line, {b_generate,Lg,P,E}, Gs, St0) ->
+    LA = lineno_anno(Line, St0),
+    GA = lineno_anno(Lg, St0),
+    Cp = #c_binary{segments=Segs} = pattern(P, St0),
+    %% The function append_tail_segment/2 keeps variable patterns as-is, making
+    %% it possible to have the same skip clause removal as with list generators.
+    {AccSegs,Tail,TailSeg,St1} = append_tail_segment(Segs, St0),
+    AccPat = Cp#c_binary{segments=AccSegs},
+    {Cg,St2} = lc_guard_tests(Gs, St1),
+    {SkipSegs,St3} = emasculate_segments(AccSegs, St2),
+    SkipPat = Cp#c_binary{segments=SkipSegs},
+    {Ce,Pre,St4} = safe(E, St3),
+    Gen = #igen{anno=#a{anno=GA},acc_pat=AccPat,acc_guard=Cg,skip_pat=SkipPat,
+                tail=Tail,tail_pat=#c_binary{anno=LA,segments=[TailSeg]},
+                arg={Pre,Ce}},
+    {Gen,St4}.
+
+append_tail_segment(Segs, St0) ->
     {Var,St} = new_var(St0),
     Tail = #c_bitstr{val=Var,size=#c_literal{val=all},
 		     unit=#c_literal{val=1},
 		     type=#c_literal{val=binary},
 		     flags=#c_literal{val=[unsigned,big]}},
-    {reverse(Acc, [Tail]),Var,St}.
+    {Segs++[Tail],Var,Tail,St}.
 
 emasculate_segments(Segs, St) ->
     emasculate_segments(Segs, St, []).
@@ -1165,7 +1163,7 @@ emasculate_segments([B|Rest], St0, Acc) ->
     {Var,St1} = new_var(St0),
     emasculate_segments(Rest, St1, [B#c_bitstr{val=Var}|Acc]);
 emasculate_segments([], St, Acc) ->
-    {lists:reverse(Acc),St}.
+    {reverse(Acc),St}.
 
 lc_guard_tests([], St) -> {[],St};
 lc_guard_tests(Gs0, St0) ->
@@ -1480,6 +1478,8 @@ pattern({cons,L,H,T}, St) ->
     ann_c_cons(lineno_anno(L, St), pattern(H, St), pattern(T, St));
 pattern({tuple,L,Ps}, St) ->
     ann_c_tuple(lineno_anno(L, St), pattern_list(Ps, St));
+pattern({map,L,Ps}, St) ->
+    #c_map{anno=lineno_anno(L, St), es=pattern_map_pairs(Ps, St)};
 pattern({bin,L,Ps}, St) ->
     %% We don't create a #ibinary record here, since there is
     %% no need to hold any used/new annotations in a pattern.
@@ -1487,6 +1487,61 @@ pattern({bin,L,Ps}, St) ->
 pattern({match,_,P1,P2}, St) ->
     pat_alias(pattern(P1, St), pattern(P2, St)).
 
+%% pattern_map_pairs([MapFieldExact],State) -> [#c_map_pairs{}]
+pattern_map_pairs(Ps, St) ->
+    %% check literal key uniqueness (dict is needed)
+    %% pattern all pairs
+    {CMapPairs, Kdb} = lists:mapfoldl(fun
+	    (P,Kdbi) ->
+		#c_map_pair{key=Ck,val=Cv} = CMapPair = pattern_map_pair(P,St),
+		K = core_lib:literal_value(Ck),
+		case dict:find(K,Kdbi) of
+		    {ok, Vs} ->
+			{CMapPair, dict:store(K,[Cv|Vs],Kdbi)};
+		    _ ->
+			{CMapPair, dict:store(K,[Cv],Kdbi)}
+		end
+	end, dict:new(), Ps),
+    pattern_alias_map_pairs(CMapPairs,Kdb,dict:new(),St).
+
+pattern_alias_map_pairs([],_,_,_) -> [];
+pattern_alias_map_pairs([#c_map_pair{key=Ck}=Pair|Pairs],Kdb,Kset,St) ->
+    %% alias same keys if needed
+    K = core_lib:literal_value(Ck),
+    case dict:find(K,Kset) of
+	{ok,processed} ->
+	    pattern_alias_map_pairs(Pairs,Kdb,Kset,St);
+	_ ->
+	    Cvs = dict:fetch(K,Kdb),
+	    Cv = pattern_alias_map_pair_patterns(Cvs),
+	    Kset1 = dict:store(K, processed, Kset),
+	    [Pair#c_map_pair{val=Cv}|pattern_alias_map_pairs(Pairs,Kdb,Kset1,St)]
+    end.
+
+pattern_alias_map_pair_patterns([Cv]) -> Cv;
+pattern_alias_map_pair_patterns([Cv1,Cv2|Cvs]) ->
+    pattern_alias_map_pair_patterns([pat_alias(Cv1,Cv2)|Cvs]).
+
+pattern_map_pair({map_field_exact,L,K,V}, St) ->
+    %% FIXME: Better way to construct literals? or missing case
+    %% {Key,_,_} = expr(K, St),
+    Key = case K of
+	{bin,L,Es0} ->
+	    case constant_bin(Es0) of
+		error ->
+		    throw(badmatch);
+		Bin ->
+		    #c_literal{anno=lineno_anno(L,St),val=Bin}
+	    end;
+	_ ->
+	    pattern(K,St)
+    end,
+    #c_map_pair{anno=lineno_anno(L, St),
+                op=#c_literal{val=exact},
+		key=Key,
+		val=pattern(V, St)}.
+
+
 %% pat_bin([BinElement], State) -> [BinSeg].
 
 pat_bin(Ps, St) -> [pat_segment(P, St) || P <- Ps].
@@ -1544,15 +1599,6 @@ pat_alias_list(_, _) -> throw(nomatch).
 
 pattern_list(Ps, St) -> [pattern(P, St) || P <- Ps].
 
-%% first([A]) -> [A].
-%% last([A]) -> A.
-
-first([_]) -> [];
-first([H|T]) -> [H|first(T)].
-
-last([L]) -> L;
-last([_|T]) -> last(T).
-
 %% make_vars([Name]) -> [{Var,Name}].
 
 make_vars(Vs) -> [ #c_var{name=V} || V <- Vs ].
@@ -1635,13 +1681,13 @@ uclause(#iclause{anno=Anno,pats=Ps0,guard=G0,body=B0}, Pks, Ks0, St0) ->
 uguard([], [], _, St) -> {[],St};
 uguard(Pg, [], Ks, St) ->
     %% No guard, so fold together equality tests.
-    uguard(first(Pg), [last(Pg)], Ks, St);
+    uguard(droplast(Pg), [last(Pg)], Ks, St);
 uguard(Pg, Gs0, Ks, St0) ->
     %% Gs0 must contain at least one element here.
     {Gs3,St5} = foldr(fun (T, {Gs1,St1}) ->
 			      {L,St2} = new_var(St1),
 			      {R,St3} = new_var(St2),
-			      {[#iset{var=L,arg=T}] ++ first(Gs1) ++
+			      {[#iset{var=L,arg=T}] ++ droplast(Gs1) ++
 			       [#iset{var=R,arg=last(Gs1)},
 				#icall{anno=#a{}, %Must have an #a{}
 				       module=#c_literal{val=erlang},
@@ -1718,13 +1764,18 @@ uexpr(#icase{anno=A,args=As0,clauses=Cs0,fc=Fc0}, Ks, St0) ->
     Used = union(used_in_any(As1), used_in_any(Cs1)),
     New = new_in_all(Cs1),
     {#icase{anno=A#a{us=Used,ns=New},args=As1,clauses=Cs1,fc=Fc1},St3};
-uexpr(#ifun{anno=A,id=Id,vars=As,clauses=Cs0,fc=Fc0}, Ks0, St0) ->
+uexpr(#ifun{anno=A0,id=Id,vars=As,clauses=Cs0,fc=Fc0,name=Name}, Ks0, St0) ->
     Avs = lit_list_vars(As),
-    Ks1 = union(Avs, Ks0),
-    {Cs1,St1} = ufun_clauses(Cs0, Ks1, St0),
-    {Fc1,St2} = ufun_clause(Fc0, Ks1, St1),
-    Used = subtract(intersection(used_in_any(Cs1), Ks0), Avs),
-    {#ifun{anno=A#a{us=Used,ns=[]},id=Id,vars=As,clauses=Cs1,fc=Fc1},St2};
+    Ks1 = case Name of
+              unnamed -> Ks0;
+              {named,FName} -> union(subtract([FName], Avs), Ks0)
+          end,
+    Ks2 = union(Avs, Ks1),
+    {Cs1,St1} = ufun_clauses(Cs0, Ks2, St0),
+    {Fc1,St2} = ufun_clause(Fc0, Ks2, St1),
+    Used = subtract(intersection(used_in_any(Cs1), Ks1), Avs),
+    A1 = A0#a{us=Used,ns=[]},
+    {#ifun{anno=A1,id=Id,vars=As,clauses=Cs1,fc=Fc1,name=Name},St2};
 uexpr(#iapply{anno=A,op=Op,args=As}, _, St) ->
     Used = union(lit_vars(Op), lit_list_vars(As)),
     {#iapply{anno=A#a{us=Used},op=Op,args=As},St};
@@ -1820,6 +1871,12 @@ upattern(#c_cons{hd=H0,tl=T0}=Cons, Ks, St0) ->
 upattern(#c_tuple{es=Es0}=Tuple, Ks, St0) ->
     {Es1,Esg,Esv,Eus,St1} = upattern_list(Es0, Ks, St0),
     {Tuple#c_tuple{es=Es1},Esg,Esv,Eus,St1};
+upattern(#c_map{es=Es0}=Map, Ks, St0) ->
+    {Es1,Esg,Esv,Eus,St1} = upattern_list(Es0, Ks, St0),
+    {Map#c_map{es=Es1},Esg,Esv,Eus,St1};
+upattern(#c_map_pair{op=#c_literal{val=exact},val=V0}=MapPair, Ks, St0) ->
+    {V,Vg,Vv,Vu,St1} = upattern(V0, Ks, St0),
+    {MapPair#c_map_pair{val=V},Vg,Vv,Vu,St1};
 upattern(#c_binary{segments=Es0}=Bin, Ks, St0) ->
     {Es1,Esg,Esv,Eus,St1} = upat_bin(Es0, Ks, St0),
     {Bin#c_binary{segments=Es1},Esg,Esv,Eus,St1};
@@ -1910,7 +1967,7 @@ new_in_all([Le|Les]) ->
     foldl(fun (L, Ns) -> intersection((get_anno(L))#a.ns, Ns) end,
 	  (get_anno(Le))#a.ns, Les);
 new_in_all([]) -> [].
-
+
 %% The AfterVars are the variables which are used afterwards.  We need
 %% this to work out which variables are actually exported and used
 %% from case/receive.  In subblocks/clauses the AfterVars of the block
@@ -2019,15 +2076,25 @@ cexpr(#itry{anno=A,args=La,vars=Vs,body=Lb,evars=Evs,handler=Lh}, As, St0) ->
 cexpr(#icatch{anno=A,body=Les}, _As, St0) ->
     {Ces,_Us1,St1} = cexprs(Les, [], St0),	%Never export!
     {#c_catch{body=Ces},[],A#a.us,St1};
-cexpr(#ifun{anno=A,id=Id,vars=Args,clauses=Lcs,fc=Lfc}, _As, St0) ->
-    {Ccs,St1} = cclauses(Lcs, [], St0),		%NEVER export!
-    {Cfc,St2} = cclause(Lfc, [], St1),
-    Anno = A#a.anno,
-    {#c_fun{anno=Id++Anno,vars=Args,
-	    body=#c_case{anno=Anno,
-			 arg=set_anno(core_lib:make_values(Args), Anno),
-			 clauses=Ccs ++ [Cfc]}},
-     [],A#a.us,St2};
+cexpr(#ifun{name=unnamed}=Fun, As, St0) ->
+    cfun(Fun, As, St0);
+cexpr(#ifun{anno=#a{us=Us0}=A0,name={named,Name},fc=#iclause{pats=Ps}}=Fun0,
+      As, St0) ->
+    case is_element(Name, Us0) of
+        false ->
+            cfun(Fun0, As, St0);
+        true ->
+            A1 = A0#a{us=del_element(Name, Us0)},
+            Fun1 = Fun0#ifun{anno=A1},
+            {#c_fun{body=Body}=CFun0,[],Us1,St1} = cfun(Fun1, As, St0),
+            RecVar = #c_var{name={Name,length(Ps)}},
+            Let = #c_let{vars=[#c_var{name=Name}],arg=RecVar,body=Body},
+            CFun1 = CFun0#c_fun{body=Let},
+            Letrec = #c_letrec{anno=A0#a.anno,
+			       defs=[{RecVar,CFun1}],
+                               body=RecVar},
+            {Letrec,[],Us1,St1}
+    end;
 cexpr(#iapply{anno=A,op=Op,args=Args}, _As, St) ->
     {#c_apply{anno=A#a.anno,op=Op,args=Args},[],A#a.us,St};
 cexpr(#icall{anno=A,module=Mod,name=Name,args=Args}, _As, St) ->
@@ -2054,23 +2121,15 @@ cexpr(Lit, _As, St) ->
     %%Vs = lit_vars(Lit),
     {set_anno(Lit, Anno#a.anno),[],Vs,St}.
 
-%% Kill the id annotations for any fun inside the expression.
-%% Necessary when duplicating code in try ... after.
-
-kill_id_anns(#ifun{clauses=Cs0}=Fun) ->
-    Cs = kill_id_anns(Cs0),
-    Fun#ifun{clauses=Cs,id=[]};
-kill_id_anns(#a{}=A) ->
-    %% Optimization: Don't waste time searching for funs inside annotations.
-    A;
-kill_id_anns([H|T]) ->
-    [kill_id_anns(H)|kill_id_anns(T)];
-kill_id_anns([]) -> [];
-kill_id_anns(Tuple) when is_tuple(Tuple) ->
-    L0 = tuple_to_list(Tuple),
-    L = kill_id_anns(L0),
-    list_to_tuple(L);
-kill_id_anns(Other) -> Other.
+cfun(#ifun{anno=A,id=Id,vars=Args,clauses=Lcs,fc=Lfc}, _As, St0) ->
+    {Ccs,St1} = cclauses(Lcs, [], St0),     %NEVER export!
+    {Cfc,St2} = cclause(Lfc, [], St1),
+    Anno = A#a.anno,
+    {#c_fun{anno=Id++Anno,vars=Args,
+            body=#c_case{anno=Anno,
+                         arg=set_anno(core_lib:make_values(Args), Anno),
+                         clauses=Ccs ++ [Cfc]}},
+     [],A#a.us,St2}.
 
 %% lit_vars(Literal) -> [Var].
 
@@ -2148,6 +2207,9 @@ is_simple(#c_literal{}) -> true;
 is_simple(#c_cons{hd=H,tl=T}) ->
     is_simple(H) andalso is_simple(T);
 is_simple(#c_tuple{es=Es}) -> is_simple_list(Es);
+is_simple(#c_map{es=Es}) -> is_simple_list(Es);
+is_simple(#c_map_pair{key=K,val=V}) ->
+    is_simple(K) andalso is_simple(V);
 is_simple(_) -> false.
 
 -spec is_simple_list([cerl:cerl()]) -> boolean().
diff --git a/lib/compiler/src/v3_kernel.erl b/lib/compiler/src/v3_kernel.erl
index 5f1c108f7c..5675572092 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,partition/2]).
+		keymember/3,keyfind/3,partition/2,droplast/1,last/1]).
 -import(ordsets, [add_element/2,del_element/2,union/2,union/1,subtract/2]).
 -import(cerl, [c_tuple/1]).
 
@@ -160,8 +160,8 @@ function({#c_var{name={F,Arity}=FA},Body}, St0) ->
 	    io:fwrite("Function: ~w/~w\n", [F,Arity]),
 	    erlang:raise(Class, Error, Stack)
     end.
-	
-
+
+
 %% body(Cexpr, Sub, State) -> {Kexpr,[PreKepxr],State}.
 %%  Do the main sequence of a body.  A body ends in an atomic value or
 %%  values.  Must check if vector first so do expr.
@@ -272,6 +272,9 @@ expr(#c_cons{anno=A,hd=Ch,tl=Ct}, Sub, St0) ->
 expr(#c_tuple{anno=A,es=Ces}, Sub, St0) ->
     {Kes,Ep,St1} = atomic_list(Ces, Sub, St0),
     {#k_tuple{anno=A,es=Kes},Ep,St1};
+expr(#c_map{anno=A,var=Var0,es=Ces}, Sub, St0) ->
+    {Var,[],St1} = expr(Var0, Sub, St0),
+    map_split_pairs(A, Var, Ces, Sub, St1);
 expr(#c_binary{anno=A,segments=Cv}, Sub, St0) ->
     try atomic_bin(Cv, Sub, St0) of
 	{Kv,Ep,St1} ->
@@ -347,7 +350,7 @@ expr(#c_case{arg=Ca,clauses=Ccs}, Sub, St0) ->
     {Kvs,Pv,St2} = match_vars(Ka, St1),		%Must have variables here!
     {Km,St3} = kmatch(Kvs, Ccs, Sub, St2),
     Match = flatten_seq(build_match(Kvs, Km)),
-    {last(Match),Pa ++ Pv ++ first(Match),St3};
+    {last(Match),Pa ++ Pv ++ droplast(Match),St3};
 expr(#c_receive{anno=A,clauses=Ccs0,timeout=Ce,action=Ca}, Sub, St0) ->
     {Ke,Pe,St1} = atomic(Ce, Sub, St0),		%Force this to be atomic!
     {Rvar,St2} = new_var(St1),
@@ -493,6 +496,71 @@ translate_match_fail_1(Anno, As, Sub, #kern{ff=FF}) ->
 translate_fc(Args) ->
     [#c_literal{val=function_clause},make_list(Args)].
 
+map_split_pairs(A, Var, Ces, Sub, St0) ->
+    %% two steps
+    %% 1. force variables
+    %% 2. remove multiples
+    Pairs0 = [{Op,K,V} || #c_map_pair{op=#c_literal{val=Op},key=K,val=V} <- Ces],
+    {Pairs,Esp,St1} = foldr(fun
+	    ({Op,K0,V0}, {Ops,Espi,Sti0}) when Op =:= assoc; Op =:= exact ->
+		{K,[],Sti1} = expr(K0, Sub, Sti0),
+		{V,Ep,Sti2} = atomic(V0, Sub, Sti1),
+		{[{Op,K,V}|Ops],Ep ++ Espi,Sti2}
+	end, {[],[],St0}, Pairs0),
+
+    case map_group_pairs(Pairs) of
+	{Assoc,[]} ->
+	    Kes = [#k_map_pair{key=K,val=V}||{_,{assoc,K,V}} <- Assoc],
+	    {#k_map{anno=A,op=assoc,var=Var,es=Kes},Esp,St1};
+	{[],Exact} ->
+	    Kes = [#k_map_pair{key=K,val=V}||{_,{exact,K,V}} <- Exact],
+	    {#k_map{anno=A,op=exact,var=Var,es=Kes},Esp,St1};
+	{Assoc,Exact} ->
+	    Kes1 = [#k_map_pair{key=K,val=V}||{_,{assoc,K,V}} <- Assoc],
+	    {Mvar,Em,St2} = force_atomic(#k_map{anno=A,op=assoc,var=Var,es=Kes1},St1),
+	    Kes2 = [#k_map_pair{key=K,val=V}||{_,{exact,K,V}} <- Exact],
+	    {#k_map{anno=A,op=exact,var=Mvar,es=Kes2},Em ++ Esp,St2}
+
+    end.
+
+%% Group map by Assoc operations and Exact operations
+
+map_group_pairs(Es) ->
+    Groups = dict:to_list(map_group_pairs(Es,dict:new())),
+    partition(fun({_,{Op,_,_}}) -> Op =:= assoc end, Groups).
+
+map_group_pairs([{assoc,K,V}|Es0],Used0) ->
+    Used1 = case map_key_is_used(K,Used0) of
+	{ok, {assoc,_,_}} -> map_key_set_used(K,{assoc,K,V},Used0);
+	{ok, {exact,_,_}} -> map_key_set_used(K,{exact,K,V},Used0);
+	_                 -> map_key_set_used(K,{assoc,K,V},Used0)
+    end,
+    map_group_pairs(Es0,Used1);
+map_group_pairs([{exact,K,V}|Es0],Used0) ->
+    Used1 = case map_key_is_used(K,Used0) of
+	{ok, {assoc,_,_}} -> map_key_set_used(K,{assoc,K,V},Used0);
+	{ok, {exact,_,_}} -> map_key_set_used(K,{exact,K,V},Used0);
+	_                 -> map_key_set_used(K,{exact,K,V},Used0)
+    end,
+    map_group_pairs(Es0,Used1);
+map_group_pairs([],Used) ->
+    Used.
+
+map_key_set_used(K,How,Used) ->
+    dict:store(map_key_clean(K),How,Used).
+
+map_key_is_used(K,Used) ->
+    dict:find(map_key_clean(K),Used).
+
+%% Be explicit instead of using set_kanno(K,[])
+map_key_clean(#k_literal{val=V}) -> {k_literal,V};
+map_key_clean(#k_int{val=V})     -> {k_int,V};
+map_key_clean(#k_float{val=V})   -> {k_float,V};
+map_key_clean(#k_atom{val=V})    -> {k_atom,V};
+map_key_clean(#k_nil{})          -> k_nil;
+map_key_clean(#k_var{name=V})    -> {k_var,V}.
+
+
 %% call_type(Module, Function, Arity) -> call | bif | apply | error.
 %%  Classify the call.
 call_type(#c_literal{val=M}, #c_literal{val=F}, Ar) when is_atom(M), is_atom(F) ->
@@ -648,6 +716,9 @@ pattern(#c_cons{anno=A,hd=Ch,tl=Ct}, Isub, Osub0, St0) ->
 pattern(#c_tuple{anno=A,es=Ces}, Isub, Osub0, St0) ->
     {Kes,Osub1,St1} = pattern_list(Ces, Isub, Osub0, St0),
     {#k_tuple{anno=A,es=Kes},Osub1,St1};
+pattern(#c_map{anno=A,es=Ces}, Isub, Osub0, St0) ->
+    {Kes,Osub1,St1} = pattern_map_pairs(Ces, Isub, Osub0, St0),
+    {#k_map{anno=A,op=exact,es=Kes},Osub1,St1};
 pattern(#c_binary{anno=A,segments=Cv}, Isub, Osub0, St0) ->
     {Kv,Osub1,St1} = pattern_bin(Cv, Isub, Osub0, St0),
     {#k_binary{anno=A,segs=Kv},Osub1,St1};
@@ -662,6 +733,25 @@ flatten_alias(#c_alias{var=V,pat=P}) ->
     {[V|Vs],Pat};
 flatten_alias(Pat) -> {[],Pat}.
 
+pattern_map_pairs(Ces0, Isub, Osub0, St0) ->
+    %% It is assumed that all core keys are literals
+    %% It is later assumed that these keys are term sorted
+    %% so we need to sort them here
+    Ces1 = lists:sort(fun
+	    (#c_map_pair{key=CkA},#c_map_pair{key=CkB}) ->
+		A = core_lib:literal_value(CkA),
+		B = core_lib:literal_value(CkB),
+		erts_internal:cmp_term(A,B) < 0
+	end, Ces0),
+    %% pattern the pair keys and values as normal
+    {Kes,{Osub1,St1}} = lists:mapfoldl(fun
+	    (#c_map_pair{anno=A,key=Ck,val=Cv},{Osubi0,Sti0}) ->
+		{Kk,Osubi1,Sti1} = pattern(Ck, Isub, Osubi0, Sti0),
+		{Kv,Osubi2,Sti2} = pattern(Cv, Isub, Osubi1, Sti1),
+		{#k_map_pair{anno=A,key=Kk,val=Kv},{Osubi2,Sti2}}
+	end, {Osub0, St0}, Ces1),
+    {Kes,Osub1,St1}.
+
 pattern_bin(Es, Isub, Osub0, St0) ->
     {Kbin,{_,Osub},St} = pattern_bin_1(Es, Isub, Osub0, St0),
     {Kbin,Osub,St}.
@@ -826,15 +916,6 @@ foldr2(Fun, Acc0, [E1|L1], [E2|L2]) ->
     foldr2(Fun, Acc1, L1, L2);
 foldr2(_, Acc, [], []) -> Acc.
 
-%% first([A]) -> [A].
-%% last([A]) -> A.
-
-last([L]) -> L;
-last([_|T]) -> last(T).
-
-first([_]) -> [];
-first([H|T]) -> [H|first(T)].
-
 %% This code implements the algorithm for an optimizing compiler for
 %% pattern matching given "The Implementation of Functional
 %% Programming Languages" by Simon Peyton Jones. The code is much
@@ -1015,7 +1096,8 @@ match_con_1([U|_Us] = L, Cs, Def, St0) ->
     %% Extract clauses for different constructors (types).
     %%ok = io:format("match_con ~p~n", [Cs]),
     Ttcs = select_types([k_binary], Cs) ++ select_bin_con(Cs) ++
-	select_types([k_cons,k_tuple,k_atom,k_float,k_int,k_nil,k_literal], Cs),
+	select_types([k_cons,k_tuple,k_map,k_atom,k_float,k_int,
+		      k_nil,k_literal], Cs),
     %%ok = io:format("ttcs = ~p~n", [Ttcs]),
     {Scs,St1} =
 	mapfoldl(fun ({T,Tcs}, St) ->
@@ -1251,10 +1333,9 @@ group_value(k_cons, Cs) -> [Cs];		%These are single valued
 group_value(k_nil, Cs) -> [Cs];
 group_value(k_binary, Cs) -> [Cs];
 group_value(k_bin_end, Cs) -> [Cs];
-group_value(k_bin_seg, Cs) ->
-    group_bin_seg(Cs);
-group_value(k_bin_int, Cs) ->
-    [Cs];
+group_value(k_bin_seg, Cs) -> group_bin_seg(Cs);
+group_value(k_bin_int, Cs) -> [Cs];
+group_value(k_map, Cs) -> group_map(Cs);
 group_value(_, Cs) ->
     %% group_value(Cs).
     Cd = foldl(fun (C, Gcs0) -> dict:append(clause_val(C), C, Gcs0) end,
@@ -1267,6 +1348,12 @@ group_bin_seg([C1|Cs]) ->
     [[C1|More]|group_bin_seg(Rest)];
 group_bin_seg([]) -> [].
 
+group_map([C1|Cs]) ->
+    V1 = clause_val(C1),
+    {More,Rest} = splitwith(fun (C) -> clause_val(C) =:= V1 end, Cs),
+    [[C1|More]|group_map(Rest)];
+group_map([]) -> [].
+
 %% Profiling shows that this quadratic implementation account for a big amount
 %% of the execution time if there are many values.
 % group_value([C|Cs]) ->
@@ -1315,6 +1402,13 @@ get_match(#k_bin_int{}=BinInt, St0) ->
 get_match(#k_tuple{es=Es}, St0) ->
     {Mes,St1} = new_vars(length(Es), St0),
     {#k_tuple{es=Mes},Mes,St1};
+get_match(#k_map{op=exact,es=Es0}, St0) ->
+    {Mes,St1} = new_vars(length(Es0), St0),
+    {Es,_} = mapfoldl(fun
+	    (#k_map_pair{}=Pair, [V|Vs]) ->
+		{Pair#k_map_pair{val=V},Vs}
+	end, Mes, Es0),
+    {#k_map{op=exact,es=Es},Mes,St1};
 get_match(M, St) ->
     {M,[],St}.
 
@@ -1331,7 +1425,11 @@ new_clauses(Cs0, U, St) ->
 				     [S,N|As];
 				 #k_bin_int{next=N} ->
 				     [N|As];
-				 _Other -> As
+				 #k_map{op=exact,es=Es} ->
+				     Vals = [V || #k_map_pair{val=V} <- Es],
+				     Vals ++ As;
+				 _Other ->
+				     As
 			     end,
 		      Vs = arg_alias(Arg),
 		      Osub1 = foldl(fun (#k_var{name=V}, Acc) ->
@@ -1406,6 +1504,7 @@ arg_con(Arg) ->
 	#k_nil{} -> k_nil;
 	#k_cons{} -> k_cons; 
 	#k_tuple{} -> k_tuple;
+	#k_map{} -> k_map;
 	#k_binary{} -> k_binary;
 	#k_bin_end{} -> k_bin_end;
 	#k_bin_seg{} -> k_bin_seg;
@@ -1426,9 +1525,17 @@ arg_val(Arg, C) ->
 		    {#k_var{name=get_vsub(V, Isub)},U,T,Fs};
 		_ ->
 		    {set_kanno(S, []),U,T,Fs}
-	    end
+	    end;
+	#k_map{op=exact,es=Es} ->
+	    Keys = [begin
+			#k_map_pair{key=#k_literal{val=Key}} = Pair,
+			Key
+		    end || Pair <- Es],
+	    %% multiple keys may have the same name
+	    %% do not use ordsets
+	    lists:sort(fun(A,B) -> erts_internal:cmp_term(A,B) < 0 end, Keys)
     end.
-
+
 %% ubody_used_vars(Expr, State) -> [UsedVar]
 %%  Return all used variables for the body sequence. Much more
 %%  efficient than using ubody/3 if the body contains nested letrecs.
@@ -1795,6 +1902,10 @@ lit_vars(#k_atom{}) -> [];
 lit_vars(#k_nil{}) -> [];
 lit_vars(#k_cons{hd=H,tl=T}) ->
     union(lit_vars(H), lit_vars(T));
+lit_vars(#k_map{var=Var,es=Es}) ->
+    lit_list_vars([Var|Es]);
+lit_vars(#k_map_pair{key=K,val=V}) ->
+    union(lit_vars(K), lit_vars(V));
 lit_vars(#k_binary{segs=V}) -> lit_vars(V);
 lit_vars(#k_bin_end{}) -> [];
 lit_vars(#k_bin_seg{size=Size,seg=S,next=N}) ->
@@ -1830,7 +1941,11 @@ pat_vars(#k_bin_int{size=Size}) ->
     {U,[]};
 pat_vars(#k_bin_end{}) -> {[],[]};
 pat_vars(#k_tuple{es=Es}) ->
-    pat_list_vars(Es).
+    pat_list_vars(Es);
+pat_vars(#k_map{es=Es}) ->
+    pat_list_vars(Es);
+pat_vars(#k_map_pair{val=V}) ->
+    pat_vars(V).
 
 pat_list_vars(Ps) ->
     foldl(fun (P, {Used0,New0}) ->
@@ -1875,7 +1990,7 @@ format_error(bad_segment_size) ->
 
 add_warning(none, Term, Anno, #kern{ws=Ws}=St) ->
     File = get_file(Anno),
-    St#kern{ws=[{File,[{?MODULE,Term}]}|Ws]};
+    St#kern{ws=[{File,[{none,?MODULE,Term}]}|Ws]};
 add_warning(Line, Term, Anno, #kern{ws=Ws}=St) ->
     File = get_file(Anno),
     St#kern{ws=[{File,[{Line,?MODULE,Term}]}|Ws]}.
diff --git a/lib/compiler/src/v3_kernel.hrl b/lib/compiler/src/v3_kernel.hrl
index fb8baf398b..ab66445f73 100644
--- a/lib/compiler/src/v3_kernel.hrl
+++ b/lib/compiler/src/v3_kernel.hrl
@@ -38,6 +38,8 @@
 -record(k_nil, {anno=[]}).
 
 -record(k_tuple, {anno=[],es}).
+-record(k_map, {anno=[],var,op,es}).
+-record(k_map_pair, {anno=[],key,val}).
 -record(k_cons, {anno=[],hd,tl}).
 -record(k_binary, {anno=[],segs}).
 -record(k_bin_seg, {anno=[],size,unit,type,flags,seg,next}).
diff --git a/lib/compiler/src/v3_kernel_pp.erl b/lib/compiler/src/v3_kernel_pp.erl
index e363a5387a..b4e486f97c 100644
--- a/lib/compiler/src/v3_kernel_pp.erl
+++ b/lib/compiler/src/v3_kernel_pp.erl
@@ -104,6 +104,24 @@ format_1(#k_tuple{es=Es}, Ctxt) ->
      format_hseq(Es, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
      $}
     ];
+format_1(#k_map{var=#k_var{}=Var,es=Es}, Ctxt) ->
+    [$~,${,
+     format_hseq(Es, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
+     " | ",format_1(Var, Ctxt),
+     $},$~
+    ];
+format_1(#k_map{op=assoc,es=Es}, Ctxt) ->
+    ["~{",
+     format_hseq(Es, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
+     "}~"
+    ];
+format_1(#k_map{es=Es}, Ctxt) ->
+    ["::{",
+     format_hseq(Es, ",", ctxt_bump_indent(Ctxt, 1), fun format/2),
+     "}::"
+    ];
+format_1(#k_map_pair{key=K,val=V}, Ctxt) ->
+    ["<",format(K, Ctxt),",",format(V, Ctxt),">"];
 format_1(#k_binary{segs=S}, Ctxt) ->
     ["#<",format(S, ctxt_bump_indent(Ctxt, 2)),">#"];
 format_1(#k_bin_seg{next=Next}=S, Ctxt) ->
diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl
index 2cc3493570..c4f54a7970 100644
--- a/lib/compiler/src/v3_life.erl
+++ b/lib/compiler/src/v3_life.erl
@@ -323,7 +323,9 @@ type(k_tuple) -> tuple;
 type(k_binary) -> binary;
 type(k_bin_seg) -> bin_seg;
 type(k_bin_int) -> bin_int;
-type(k_bin_end) -> bin_end.
+type(k_bin_end) -> bin_end;
+type(k_map) -> map;
+type(k_map_pair) -> map_pair.
 
 %% variable(Klit) -> Lit.
 %% var_list([Klit]) -> [Lit].
@@ -365,6 +367,10 @@ literal(#k_bin_end{}, Ctxt) ->
     {bin_end,Ctxt};
 literal(#k_tuple{es=Es}, Ctxt) ->
     {tuple,literal_list(Es, Ctxt)};
+literal(#k_map{op=Op,var=Var,es=Es}, Ctxt) ->
+    {map,Op,literal(Var, Ctxt),literal_list(Es, Ctxt)};
+literal(#k_map_pair{key=K,val=V}, Ctxt) ->
+    {map_pair,literal(K, Ctxt),literal(V, Ctxt)};
 literal(#k_literal{val=V}, _Ctxt) ->
     {literal,V}.
 
@@ -393,7 +399,11 @@ literal2(#k_bin_int{size=S,unit=U,flags=Fs,val=Int,next=N}, Ctxt) ->
 literal2(#k_bin_end{}, Ctxt) ->
     {bin_end,Ctxt};
 literal2(#k_tuple{es=Es}, Ctxt) ->
-    {tuple,literal_list2(Es, Ctxt)}.
+    {tuple,literal_list2(Es, Ctxt)};
+literal2(#k_map{op=Op,es=Es}, Ctxt) ->
+    {map,Op,literal_list2(Es, Ctxt)};
+literal2(#k_map_pair{key=K,val=V}, Ctxt) ->
+    {map_pair,literal2(K, Ctxt),literal2(V, Ctxt)}.
 
 literal_list2(Ks, Ctxt) ->
     [literal2(K, Ctxt) || K <- Ks].
diff --git a/lib/compiler/test/Makefile b/lib/compiler/test/Makefile
index 51b3064589..0b56a49cd6 100644
--- a/lib/compiler/test/Makefile
+++ b/lib/compiler/test/Makefile
@@ -26,6 +26,7 @@ MODULES= \
 	guard_SUITE \
 	inline_SUITE \
 	lc_SUITE \
+	map_SUITE \
 	match_SUITE \
 	misc_SUITE \
 	num_bif_SUITE \
@@ -47,6 +48,7 @@ NO_OPT= \
 	fun \
 	guard \
 	lc \
+	map \
 	match \
 	misc \
 	num_bif \
@@ -67,6 +69,7 @@ INLINE= \
 	fun \
 	guard \
 	lc \
+	map \
 	match \
 	misc \
 	num_bif \
diff --git a/lib/compiler/test/andor_SUITE.erl b/lib/compiler/test/andor_SUITE.erl
index 4ffbe07e32..7bef0aa27c 100644
--- a/lib/compiler/test/andor_SUITE.erl
+++ b/lib/compiler/test/andor_SUITE.erl
@@ -194,6 +194,9 @@ t_andalso(Config) when is_list(Config) ->
     ?line false = id(false) andalso not id(glurf),
     ?line false = false andalso not id(glurf),
 
+    true = begin (X1 = true) andalso X1, X1 end,
+    false = false = begin (X2 = false) andalso X2, X2 end,
+
     ok.
 
 t_orelse(Config) when is_list(Config) ->
@@ -224,6 +227,9 @@ t_orelse(Config) when is_list(Config) ->
     ?line true = id(true) orelse not id(glurf),
     ?line true = true orelse not id(glurf),
 
+    true = begin (X1 = true) orelse X1, X1 end,
+    false = begin (X2 = false) orelse X2, X2 end,
+
     ok.
 
 t_andalso_1({X,Y}) ->
diff --git a/lib/compiler/test/beam_except_SUITE.erl b/lib/compiler/test/beam_except_SUITE.erl
index bf67eedd5f..d088863c5c 100644
--- a/lib/compiler/test/beam_except_SUITE.erl
+++ b/lib/compiler/test/beam_except_SUITE.erl
@@ -57,6 +57,11 @@ coverage(_) ->
 
     {'EXIT',{undef,[{erlang,error,[a,b,c],_}|_]}} =
 	(catch erlang:error(a, b, c)),
+
+    {'EXIT',{badarith,[{?MODULE,bar,1,[File,{line,9}]}|_]}} =
+	(catch bar(x)),
+    {'EXIT',{{case_clause,{1}},[{?MODULE,bar,1,[File,{line,9}]}|_]}} =
+	(catch bar(0)),
     ok.
 
 -file("fake.erl", 1).
@@ -65,3 +70,8 @@ fc(a) ->	                                %Line 2
 fc(L) when length(L) > 2 ->			%Line 4
     %% Not the same as a "real" function_clause error.
     error(function_clause, [L]).		%Line 6
+%% Would crash the compiler.
+bar(X) ->					%Line 8
+    case {X+1} of				%Line 9
+	1 -> ok					%Line 10
+    end.					%Line 11
diff --git a/lib/compiler/test/beam_validator_SUITE.erl b/lib/compiler/test/beam_validator_SUITE.erl
index bc1a9e2b3b..626f89ba7a 100644
--- a/lib/compiler/test/beam_validator_SUITE.erl
+++ b/lib/compiler/test/beam_validator_SUITE.erl
@@ -28,7 +28,7 @@
 	 overwrite_catchtag/1,overwrite_trytag/1,accessing_tags/1,bad_catch_try/1,
 	 cons_guard/1,
 	 freg_range/1,freg_uninit/1,freg_state/1,
-	 bin_match/1,bin_aligned/1,bad_dsetel/1,
+	 bin_match/1,bad_bin_match/1,bin_aligned/1,bad_dsetel/1,
 	 state_after_fault_in_catch/1,no_exception_in_catch/1,
 	 undef_label/1,illegal_instruction/1,failing_gc_guard_bif/1]).
 	 
@@ -56,7 +56,7 @@ groups() ->
        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,
+       freg_state,bin_match,bad_bin_match,bin_aligned,bad_dsetel,
        state_after_fault_in_catch,no_exception_in_catch,
        undef_label,illegal_instruction,failing_gc_guard_bif]}].
 
@@ -317,6 +317,11 @@ bin_match(Config) when is_list(Config) ->
 	 {{t,x,1},{{bs_restore,1},16,{no_save_point,1}}}] = Errors,
     ok.
 
+bad_bin_match(Config) when is_list(Config) ->
+	[{{t,t,1},{return,5,{match_context,{x,0}}}}] =
+		do_val(bad_bin_match, Config),
+	ok.
+
 bin_aligned(Config) when is_list(Config) ->
     Errors = do_val(bin_aligned, Config),
     ?line
diff --git a/lib/compiler/test/beam_validator_SUITE_data/bad_bin_match.S b/lib/compiler/test/beam_validator_SUITE_data/bad_bin_match.S
new file mode 100644
index 0000000000..a60ca1e89a
--- /dev/null
+++ b/lib/compiler/test/beam_validator_SUITE_data/bad_bin_match.S
@@ -0,0 +1,15 @@
+{module, bad_bin_match}.  %% version = 0
+
+{exports, [{t,1}]}.
+
+{attributes, []}.
+
+{labels, 3}.
+
+
+{function, t, 1, 2}.
+  {label,1}.
+    {func_info,{atom,t},{atom,t},1}.
+  {label,2}.
+    {test,bs_start_match2,{f,1},1,[{x,0},0],{x,0}}.
+    return.
diff --git a/lib/compiler/test/bs_bincomp_SUITE.erl b/lib/compiler/test/bs_bincomp_SUITE.erl
index f6d8b1c532..4450405695 100644
--- a/lib/compiler/test/bs_bincomp_SUITE.erl
+++ b/lib/compiler/test/bs_bincomp_SUITE.erl
@@ -25,7 +25,7 @@
 	 init_per_group/2,end_per_group/2,
 	 byte_aligned/1,bit_aligned/1,extended_byte_aligned/1,
 	 extended_bit_aligned/1,mixed/1,filters/1,trim_coverage/1,
-	 nomatch/1,sizes/1,tail/1]).
+	 nomatch/1,sizes/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -35,7 +35,7 @@ all() ->
     test_lib:recompile(?MODULE),
     [byte_aligned, bit_aligned, extended_byte_aligned,
      extended_bit_aligned, mixed, filters, trim_coverage,
-     nomatch, sizes, tail].
+     nomatch, sizes].
 
 groups() -> 
     [].
@@ -290,40 +290,6 @@ sizes(Config) when is_list(Config) ->
     ?line cs_end(),
     ok.
 
-tail(Config) when is_list(Config) ->
-    ?line [] = tail_1(<<0:7>>),
-    ?line [0] = tail_1(<<0>>),
-    ?line [0] = tail_1(<<0:12>>),
-    ?line [0,0] = tail_1(<<0:20>>),
-
-    ?line [] = tail_2(<<0:7>>),
-    ?line [42] = tail_2(<<0>>),
-    ?line [] = tail_2(<<0:12>>),
-    ?line [42,42] = tail_2(<<0,1>>),
-
-    ?line <<>> = tail_3(<<0:7>>),
-    ?line <<42>> = tail_3(<<0>>),
-    ?line <<42>> = tail_3(<<0:12>>),
-    ?line <<42,42>> = tail_3(<<0:20>>),
-
-    ?line [] = tail_4(<<0:15>>),
-    ?line [7] = tail_4(<<7,8>>),
-    ?line [9] = tail_4(<<9,17:12>>),
-    ok.
-
-tail_1(Bits) ->
-    [X || <<X:8/integer, _/bits>> <= Bits].
-
-tail_2(Bits) ->
-    [42 || <<_:8/integer, _/bytes>> <= Bits].
-
-tail_3(Bits) ->
-    << <<42>> || <<_:8/integer, _/bits>> <= Bits >>.
-
-tail_4(Bits) ->
-    [X || <<X:8/integer, Tail/bits>> <= Bits, bit_size(Tail) >= 8].
-
-
 cs_init() ->
     erts_debug:set_internal_state(available_internal_state, true),
     ok.
diff --git a/lib/compiler/test/bs_construct_SUITE.erl b/lib/compiler/test/bs_construct_SUITE.erl
index 4ea5235bb6..ce39de2a82 100644
--- a/lib/compiler/test/bs_construct_SUITE.erl
+++ b/lib/compiler/test/bs_construct_SUITE.erl
@@ -319,6 +319,8 @@ in_guard(Config) when is_list(Config) ->
     ?line 1 = in_guard_1(<<16#74ad:16>>, 16#e95, 5),
     ?line 2 = in_guard_1(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
     ?line 3 = in_guard_1(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
+    ?line 3 = in_guard_1(<<16#FBCD:14,3/float,3:2>>, 16#FBCD, 3),
+    ?line 3 = in_guard_1(<<16#FBCD:14,(2 bsl 226)/float,3:2>>, 16#FBCD, 2 bsl 226),
     ?line nope = in_guard_1(<<1>>, 42, b),
     ?line nope = in_guard_1(<<1>>, a, b),
     ?line nope = in_guard_1(<<1,2>>, 1, 1),
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
index 9f15845d33..149b9bbb8f 100644
--- a/lib/compiler/test/bs_match_SUITE.erl
+++ b/lib/compiler/test/bs_match_SUITE.erl
@@ -34,7 +34,7 @@
 	 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,matched_out_size/1,follow_fail_branch/1,
-	 no_partition/1]).
+	 no_partition/1,calling_a_binary/1]).
 
 -export([coverage_id/1,coverage_external_ignore/2]).
 
@@ -59,7 +59,7 @@ groups() ->
        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,
-       no_partition]}].
+       no_partition,calling_a_binary]}].
 
 
 init_per_suite(Config) ->
@@ -1178,6 +1178,17 @@ no_partition_2([], a5) ->
 no_partition_2(42.0, a6) ->
     six.
 
+calling_a_binary(Config) when is_list(Config) ->
+    [] = call_binary(<<>>, []),
+    {'EXIT',{badarg,_}} = (catch call_binary(<<1>>, [])),
+    {'EXIT',{badarg,_}} = (catch call_binary(<<1,2,3>>, [])),
+    ok.
+
+call_binary(<<>>, Acc) ->
+    Acc;
+call_binary(<<H,T/bits>>, Acc) ->
+    T(<<Acc/binary,H>>).
+
 check(F, R) ->
     R = F().
 
diff --git a/lib/compiler/test/compilation_SUITE.erl b/lib/compiler/test/compilation_SUITE.erl
index 8e7b7292cc..f7b1dbdddf 100644
--- a/lib/compiler/test/compilation_SUITE.erl
+++ b/lib/compiler/test/compilation_SUITE.erl
@@ -50,7 +50,7 @@ groups() ->
        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,
+       string_table,otp_8949_a,otp_8949_b,split_cases,
        beam_utils_liveopt]}].
 
 init_per_suite(Config) ->
@@ -196,7 +196,7 @@ redundant_case_1(_) -> d.
 failure(Module, Conf) ->
     ?line Src = filename:join(?config(data_dir, Conf), atom_to_list(Module)),
     ?line Out = ?config(priv_dir,Conf),
-    ?line io:format("Compiling: ~s\n", [Src]),
+    ?line io:format("Compiling: ~ts\n", [Src]),
     ?line CompRc = compile:file(Src, [{outdir,Out},return,time]),
     ?line io:format("Result: ~p\n",[CompRc]),
     ?line case CompRc of
@@ -278,6 +278,16 @@ try_it(StartNode, Module, Conf) ->
     ?line ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
     ?line test_server:timetrap_cancel(LastDog),
 
+    AsmDog = test_server:timetrap(test_server:minutes(10)),
+    io:format("Compiling (from assembly): ~s\n", [Src]),
+    {ok,_} = compile:file(Src, [to_asm,{outdir,Out},report|OtherOpts]),
+    Asm = filename:join(Out, lists:concat([Module, ".S"])),
+    CompRc3 = compile:file(Asm, [from_asm,{outdir,Out},report|OtherOpts]),
+    io:format("Result: ~p\n",[CompRc3]),
+    {ok,_} = CompRc3,
+    ok = rpc:call(Node, ?MODULE, load_and_call, [Out, Module]),
+    test_server:timetrap_cancel(AsmDog),
+
     case StartNode of
 	false -> ok;
 	true -> ?line test_server:stop_node(Node)
@@ -466,8 +476,8 @@ self_compile_node(CompilerDir, OutDir, Version, Opts) ->
     ok.
 
 compile_compiler(Files, OutDir, Version, InlineOpts) ->
-    io:format("~s", [code:which(compile)]),
-    io:format("Compiling ~s into ~s", [Version,OutDir]),
+    io:format("~ts", [code:which(compile)]),
+    io:format("Compiling ~s into ~ts", [Version,OutDir]),
     Opts = [report,
 	    bin_opt_info,
 	    {outdir,OutDir},
@@ -630,13 +640,13 @@ string_table(Config) when is_list(Config) ->
     ok.
 
 otp_8949_a(Config) when is_list(Config) ->
-    value = otp_8949_a(),
+    value = do_otp_8949_a(),
     ok.
 
 -record(cs, {exs,keys = [],flags = 1}).
 -record(exs, {children = []}).
 
-otp_8949_a() ->
+do_otp_8949_a() ->
     case id([#cs{}]) of
         [#cs{}=Cs] ->
             SomeVar = id(value),
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl
index 97777568b6..8cb7d1b55b 100644
--- a/lib/compiler/test/compile_SUITE.erl
+++ b/lib/compiler/test/compile_SUITE.erl
@@ -24,7 +24,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,
+	 app_test/1,appup_test/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, encrypted_abstr/1,
@@ -42,7 +42,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [app_test, file_1, forms_2, module_mismatch, big_file, outdir,
+    [app_test, appup_test, file_1, forms_2, module_mismatch, big_file, outdir,
      binary, makedep, cond_and_ifdef, listings, listings_big,
      other_output, encrypted_abstr,
      {group, bad_record_use}, strict_record,
@@ -71,6 +71,10 @@ end_per_group(_GroupName, Config) ->
 app_test(Config) when is_list(Config) ->
     ?line ?t:app_test(compiler).
 
+%% Test that the Application upgrade file has no `basic' errors.";
+appup_test(Config) when is_list(Config) ->
+    ok = ?t:appup_test(compiler).
+
 %% Tests that we can compile and run a simple Erlang program,
 %% using compile:file/1.
 
@@ -139,8 +143,8 @@ forms_2(Config) when is_list(Config) ->
 module_mismatch(Config) when is_list(Config) ->
     ?line DataDir = ?config(data_dir, Config),
     ?line File = filename:join(DataDir, "wrong_module_name.erl"),
-    ?line {error,[{"wrong_module_name.beam",
-		   [{compile,{module_name,arne,"wrong_module_name"}}]}],
+    {error,[{"wrong_module_name.beam",
+	     [{none,compile,{module_name,arne,"wrong_module_name"}}]}],
 	   []} = compile:file(File, [return]),
     ?line error = compile:file(File, [report]),
 
@@ -286,57 +290,67 @@ cond_and_ifdef(Config) when is_list(Config) ->
     ok.
 
 listings(Config) when is_list(Config) ->
-    ?line Dog = test_server:timetrap(test_server:minutes(8)),
-    ?line DataDir = ?config(data_dir, Config),
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Simple = filename:join(DataDir, simple),
-    ?line TargetDir = filename:join(PrivDir, listings),
-    ?line ok = file:make_dir(TargetDir),
+    Dog = test_server:timetrap(test_server:minutes(8)),
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+    ok = do_file_listings(DataDir, PrivDir, [
+	    "simple",
+	    "small",
+	    "small_maps"
+	]),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+do_file_listings(_, _, []) -> ok;
+do_file_listings(DataDir, PrivDir, [File|Files]) ->
+    Simple = filename:join(DataDir, File),
+    TargetDir = filename:join(PrivDir, listings),
+    ok = file:make_dir(TargetDir),
 
     %% Test all dedicated listing options.
-    ?line do_listing(Simple, TargetDir, 'S'),
-    ?line do_listing(Simple, TargetDir, 'E'),
-    ?line do_listing(Simple, TargetDir, 'P'),
-    ?line do_listing(Simple, TargetDir, dpp, ".pp"),
-    ?line do_listing(Simple, TargetDir, dabstr, ".abstr"),
-    ?line do_listing(Simple, TargetDir, dexp, ".expand"),
-    ?line do_listing(Simple, TargetDir, dcore, ".core"),
-    ?line do_listing(Simple, TargetDir, doldinline, ".oldinline"),
-    ?line do_listing(Simple, TargetDir, dinline, ".inline"),
-    ?line do_listing(Simple, TargetDir, dcore, ".core"),
-    ?line do_listing(Simple, TargetDir, dcopt, ".copt"),
-    ?line do_listing(Simple, TargetDir, dsetel, ".dsetel"),
-    ?line do_listing(Simple, TargetDir, dkern, ".kernel"),
-    ?line do_listing(Simple, TargetDir, dlife, ".life"),
-    ?line do_listing(Simple, TargetDir, dcg, ".codegen"),
-    ?line do_listing(Simple, TargetDir, dblk, ".block"),
-    ?line do_listing(Simple, TargetDir, dbool, ".bool"),
-    ?line do_listing(Simple, TargetDir, dtype, ".type"),
-    ?line do_listing(Simple, TargetDir, ddead, ".dead"),
-    ?line do_listing(Simple, TargetDir, djmp, ".jump"),
-    ?line do_listing(Simple, TargetDir, dclean, ".clean"),
-    ?line do_listing(Simple, TargetDir, dpeep, ".peep"),
-    ?line do_listing(Simple, TargetDir, dopt, ".optimize"),
+    do_listing(Simple, TargetDir, 'S'),
+    do_listing(Simple, TargetDir, 'E'),
+    do_listing(Simple, TargetDir, 'P'),
+    do_listing(Simple, TargetDir, dpp, ".pp"),
+    do_listing(Simple, TargetDir, dabstr, ".abstr"),
+    do_listing(Simple, TargetDir, dexp, ".expand"),
+    do_listing(Simple, TargetDir, dcore, ".core"),
+    do_listing(Simple, TargetDir, doldinline, ".oldinline"),
+    do_listing(Simple, TargetDir, dinline, ".inline"),
+    do_listing(Simple, TargetDir, dcore, ".core"),
+    do_listing(Simple, TargetDir, dcopt, ".copt"),
+    do_listing(Simple, TargetDir, dsetel, ".dsetel"),
+    do_listing(Simple, TargetDir, dkern, ".kernel"),
+    do_listing(Simple, TargetDir, dlife, ".life"),
+    do_listing(Simple, TargetDir, dcg, ".codegen"),
+    do_listing(Simple, TargetDir, dblk, ".block"),
+    do_listing(Simple, TargetDir, dbool, ".bool"),
+    do_listing(Simple, TargetDir, dtype, ".type"),
+    do_listing(Simple, TargetDir, ddead, ".dead"),
+    do_listing(Simple, TargetDir, djmp, ".jump"),
+    do_listing(Simple, TargetDir, dclean, ".clean"),
+    do_listing(Simple, TargetDir, dpeep, ".peep"),
+    do_listing(Simple, TargetDir, dopt, ".optimize"),
 
     %% First clean up.
-    ?line Listings = filename:join(PrivDir, listings),
-    ?line lists:foreach(fun(F) -> ok = file:delete(F) end,
-			filelib:wildcard(filename:join(Listings, "*"))),
+    Listings = filename:join(PrivDir, listings),
+    lists:foreach(fun(F) -> ok = file:delete(F) end,
+	filelib:wildcard(filename:join(Listings, "*"))),
 
     %% Test options that produce a listing file if 'binary' is not given.
-    ?line do_listing(Simple, TargetDir, to_pp, ".P"),
-    ?line do_listing(Simple, TargetDir, to_exp, ".E"),
-    ?line do_listing(Simple, TargetDir, to_core0, ".core"),
-    ?line ok = file:delete(filename:join(Listings, "simple.core")),
-    ?line do_listing(Simple, TargetDir, to_core, ".core"),
-    ?line do_listing(Simple, TargetDir, to_kernel, ".kernel"),
+    do_listing(Simple, TargetDir, to_pp, ".P"),
+    do_listing(Simple, TargetDir, to_exp, ".E"),
+    do_listing(Simple, TargetDir, to_core0, ".core"),
+    ok = file:delete(filename:join(Listings, File ++ ".core")),
+    do_listing(Simple, TargetDir, to_core, ".core"),
+    do_listing(Simple, TargetDir, to_kernel, ".kernel"),
 
     %% Final clean up.
-    ?line lists:foreach(fun(F) -> ok = file:delete(F) end,
-			filelib:wildcard(filename:join(Listings, "*"))),
-    ?line ok = file:del_dir(Listings),
-    ?line test_server:timetrap_cancel(Dog),
-    ok.
+    lists:foreach(fun(F) -> ok = file:delete(F) end,
+	filelib:wildcard(filename:join(Listings, "*"))),
+    ok = file:del_dir(Listings),
+
+    do_file_listings(DataDir,PrivDir,Files).
 
 listings_big(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(10)),
@@ -415,11 +429,11 @@ encrypted_abstr(Config) when is_list(Config) ->
     ?line {Simple,Target} = files(Config, "encrypted_abstr"),
 
     Res = case has_crypto() of
-	      no ->
+	      false ->
 		  %% No crypto.
 		  ?line encrypted_abstr_no_crypto(Simple, Target),
 		  {comment,"The crypto application is missing or broken"};
-	      yes ->
+	      true ->
 		  %% Simulate not having crypto by removing
 		  %% the crypto application from the path.
 		  ?line OldPath = code:get_path(),
@@ -511,6 +525,7 @@ write_crypt_file(Contents0) ->
     ok = file:write_file(".erlang.crypt", Contents).
 
 encrypted_abstr_no_crypto(Simple, Target) ->
+    io:format("simpe: ~p~n", [Simple]),
     ?line TargetDir = filename:dirname(Target),
     ?line Key = "ablurf123BX#$;3",
     ?line error = compile:file(Simple,
@@ -525,11 +540,11 @@ verify_abstract(Target) ->
 has_crypto() ->
     try
 	crypto:start(),
-	crypto:info(),
+	<<_,_,_,_,_>> = crypto:rand_bytes(5),
 	crypto:stop(),
-	yes
+	true
     catch
-	error:_ -> no
+	error:_ -> false
     end.
 
 install_crypto_key(Key) ->
@@ -769,8 +784,8 @@ do_core({M,A}, Outdir) ->
 	    error
     end.
 
-%% Compile to Beam assembly language (.S) and the try to
-%% run .S throught the compiler again.
+%% Compile to Beam assembly language (.S) and then try to
+%% run .S through the compiler again.
 
 asm(Config) when is_list(Config) ->
     ?line Dog = test_server:timetrap(test_server:minutes(20)),
@@ -791,10 +806,10 @@ do_asm(Beam, Outdir) ->
     try
 	{ok,M,Asm} = compile:forms(A, ['S']),
 	AsmFile = filename:join(Outdir, atom_to_list(M)++".S"),
-	{ok,Fd} = file:open(AsmFile, [write]),
+	{ok,Fd} = file:open(AsmFile, [write,{encoding,utf8}]),
 	beam_listing:module(Fd, Asm),
 	ok = file:close(Fd),
-	case compile:file(AsmFile, [from_asm,no_postopt,binary,report]) of
+	case compile:file(AsmFile, [from_asm,binary,report]) of
 	    {ok,M,_} ->
 		ok = file:delete(AsmFile);
 	    Other ->
diff --git a/lib/compiler/test/compile_SUITE_data/small.erl b/lib/compiler/test/compile_SUITE_data/small.erl
new file mode 100644
index 0000000000..37cd270e50
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/small.erl
@@ -0,0 +1,48 @@
+-module(small).
+
+-export([go/0,go/2]).
+
+
+-small_attribute({value,3}).
+
+go() -> go(3, 3.0).
+go(A,B) ->
+    V1 = A + B,
+    V2 = A * B,
+    V3 = V1 / V2,
+    V4 = V3 / 0.3,
+    V5 = V1 + V2 + V3 + V4,
+    try
+	R = call(<<"wazzup">>, A),
+	{A,B,V5,R,t(),recv()}
+    catch
+	C:E ->
+	    {error, C, E}
+    end.
+
+-spec call(binary(), term()) -> binary().
+
+call(<<"wa", B/binary>>,V) when is_integer(V) -> B;
+call(B,_) -> B.
+
+t() ->
+    <<23:32, V:14, _:2, B/binary>> = id(<<"wazzup world">>),
+    {V,B}.
+
+recv() ->
+    F = fun() ->
+	    receive
+		1 -> ok;
+		2 -> ok;
+		3 -> ok;
+		a -> ok;
+		_ -> none
+	    after 0 -> tmo
+	    end
+    end,
+    tmo = F(),
+    ok.
+
+
+id(I) -> I.
+
diff --git a/lib/compiler/test/compile_SUITE_data/small_maps.erl b/lib/compiler/test/compile_SUITE_data/small_maps.erl
new file mode 100644
index 0000000000..a17a136a7d
--- /dev/null
+++ b/lib/compiler/test/compile_SUITE_data/small_maps.erl
@@ -0,0 +1,16 @@
+-module(small_maps).
+
+-export([go/0,go/1]).
+
+go() ->
+    go(1337).
+
+go(V0) ->
+    M0 = #{ a => 1, val => V0},
+    V1 = get_val(M0),
+    M1 = M0#{ val := [V0,V1] },
+    {some_val,[1337,{some_val,1337}]} = get_val(M1),
+    ok.
+
+get_val(#{ "wazzup" := _, val := V}) -> V;
+get_val(#{ val := V }) -> {some_val, V}.
diff --git a/lib/compiler/test/core_SUITE.erl b/lib/compiler/test/core_SUITE.erl
index a40dc32d59..aa222c48de 100644
--- a/lib/compiler/test/core_SUITE.erl
+++ b/lib/compiler/test/core_SUITE.erl
@@ -23,7 +23,8 @@
 	 init_per_testcase/2,end_per_testcase/2,
 	 dehydrated_itracer/1,nested_tries/1,
 	 seq_in_guard/1,make_effect_seq/1,eval_is_boolean/1,
-	 unsafe_case/1,nomatch_shadow/1,reversed_annos/1]).
+	 unsafe_case/1,nomatch_shadow/1,reversed_annos/1,
+	 map_core_test/1,eval_case/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -48,7 +49,9 @@ all() ->
 groups() -> 
     [{p,test_lib:parallel(),
       [dehydrated_itracer,nested_tries,seq_in_guard,make_effect_seq,
-       eval_is_boolean,unsafe_case,nomatch_shadow,reversed_annos]}].
+       eval_is_boolean,unsafe_case,nomatch_shadow,reversed_annos,
+       map_core_test,eval_case
+   ]}].
 
 
 init_per_suite(Config) ->
@@ -72,6 +75,8 @@ end_per_group(_GroupName, Config) ->
 ?comp(unsafe_case).
 ?comp(nomatch_shadow).
 ?comp(reversed_annos).
+?comp(map_core_test).
+?comp(eval_case).
 
 try_it(Mod, Conf) ->
     Src = filename:join(?config(data_dir, Conf), atom_to_list(Mod)),
diff --git a/lib/compiler/test/core_SUITE_data/eval_case.core b/lib/compiler/test/core_SUITE_data/eval_case.core
new file mode 100644
index 0000000000..f2776e2b1f
--- /dev/null
+++ b/lib/compiler/test/core_SUITE_data/eval_case.core
@@ -0,0 +1,34 @@
+module 'eval_case' ['eval_case'/0]
+    attributes []
+'eval_case'/0 =
+    fun () ->
+	case <> of
+	  <> when 'true' ->
+	      case apply 'do_case'/0() of
+		<'ok'> when 'true' ->
+		    'ok'
+		( <_cor0> when 'true' ->
+		      primop 'match_fail'
+			  ({'badmatch',_cor0})
+		  -| ['compiler_generated'] )
+	      end
+	  ( <> when 'true' ->
+		( primop 'match_fail'
+		      ({'function_clause'})
+		  -| [{'function_name',{'eval_case',0}}] )
+	    -| ['compiler_generated'] )
+	end
+'do_case'/0 =
+    fun () ->
+        case let <_cor0> =
+	     apply 'id'/1(42)
+                  in  let <_cor1> =
+		      call 'erlang':'+'
+			  (_cor0, 7)
+		  in {'x',_cor1} of
+	     <{'x',49}> when 'true' ->
+	          'ok'
+        end
+'id'/1 =
+    fun (_cor0) -> _cor0
+end
diff --git a/lib/compiler/test/core_SUITE_data/map_core_test.core b/lib/compiler/test/core_SUITE_data/map_core_test.core
new file mode 100644
index 0000000000..7ece8a8bbd
--- /dev/null
+++ b/lib/compiler/test/core_SUITE_data/map_core_test.core
@@ -0,0 +1,95 @@
+module 'map_core_test' ['map_core_test'/0,
+			'module_info'/0,
+			'module_info'/1]
+    attributes []
+'map_core_test'/0 =
+    %% Line 14
+    fun () ->
+	let <_cor0> =
+	    %% Line 15
+	    ~{::<'check','ok'>,::<1337,#{#<104>(8,1,'integer',['unsigned'|['big']]),
+				      #<101>(8,1,'integer',['unsigned'|['big']]),
+				      #<108>(8,1,'integer',['unsigned'|['big']]),
+				      #<108>(8,1,'integer',['unsigned'|['big']]),
+				      #<111>(8,1,'integer',['unsigned'|['big']])}#>,::<'val',0>}~
+	in  let <M> =
+		%% Line 15
+		apply 'id'/1
+		    (_cor0)
+	    in  let <_cor2> =
+		    %% Line 16
+		    apply 'id'/1
+			([1|[2|[3|[4|[5|[6]]]]]])
+		in  %% Line 16
+		    case apply 'call'/2
+			     (M, _cor2) of
+		      <~{~<1337,#{#<104>(8,1,'integer',['unsigned'|['big']]),
+				#<101>(8,1,'integer',['unsigned'|['big']]),
+				#<108>(8,1,'integer',['unsigned'|['big']]),
+				#<108>(8,1,'integer',['unsigned'|['big']]),
+				#<111>(8,1,'integer',['unsigned'|['big']]),
+				#<32>(8,1,'integer',['unsigned'|['big']]),
+				#<49>(8,1,'integer',['unsigned'|['big']]),
+				#<32>(8,1,'integer',['unsigned'|['big']]),
+				#<50>(8,1,'integer',['unsigned'|['big']]),
+				#<32>(8,1,'integer',['unsigned'|['big']]),
+				#<51>(8,1,'integer',['unsigned'|['big']]),
+				#<32>(8,1,'integer',['unsigned'|['big']]),
+				#<52>(8,1,'integer',['unsigned'|['big']]),
+				#<32>(8,1,'integer',['unsigned'|['big']]),
+				#<53>(8,1,'integer',['unsigned'|['big']]),
+				#<32>(8,1,'integer',['unsigned'|['big']]),
+				#<54>(8,1,'integer',['unsigned'|['big']])}#>,~<'check','ok'>,~<'val',21>}~> when 'true' ->
+			  %% Line 17
+			  'ok'
+		      ( <_cor3> when 'true' ->
+			    primop 'match_fail'
+				({'badmatch',_cor3})
+			-| ['compiler_generated'] )
+		    end
+'call'/2 =
+    %% Line 20
+    fun (_cor1,_cor0) ->
+	case <_cor1,_cor0> of
+	  <M = ~{~<1337,Bin>,~<'check',_cor8>,~<'val',Val>}~,[V|Vs]> when 'true' ->
+	      let <_cor3> =
+		  %% Line 21
+		  call 'erlang':'+'
+		      (V, 48)
+	      in  let <_cor4> =
+		      %% Line 21
+		      #{#<Bin>('all',8,'binary',['unsigned'|['big']]),
+			#<32>(8,1,'integer',['unsigned'|['big']]),
+			#<_cor3>(8,1,'integer',['unsigned'|['big']])}#
+		  in  let <_cor2> =
+			  %% Line 21
+			  call 'erlang':'+'
+			      (Val, V)
+		      in  let <_cor5> =
+			      %% Line 21
+			      M~{~<1337,_cor4>,~<'val',_cor2>}~
+			  in  %% Line 21
+			      apply 'call'/2
+				  (_cor5, Vs)
+	  %% Line 22
+	  <M,[]> when 'true' ->
+	      M
+	  ( <_cor7,_cor6> when 'true' ->
+		( primop 'match_fail'
+		      ({'function_clause',_cor7,_cor6})
+		  -| [{'function_name',{'call',2}}] )
+	    -| ['compiler_generated'] )
+	end
+'id'/1 =
+    %% Line 24
+    fun (_cor0) ->
+	_cor0
+'module_info'/0 =
+    fun () ->
+	call 'erlang':'get_module_info'
+	    ('map_core_test')
+'module_info'/1 =
+    fun (_cor0) ->
+	call 'erlang':'get_module_info'
+	    ('map_core_test', _cor0)
+end
\ No newline at end of file
diff --git a/lib/compiler/test/core_fold_SUITE.erl b/lib/compiler/test/core_fold_SUITE.erl
index abc9ab6a72..8151dc1b16 100644
--- a/lib/compiler/test/core_fold_SUITE.erl
+++ b/lib/compiler/test/core_fold_SUITE.erl
@@ -22,7 +22,8 @@
 	 init_per_group/2,end_per_group/2,
 	 t_element/1,setelement/1,t_length/1,append/1,t_apply/1,bifs/1,
 	 eq/1,nested_call_in_case/1,guard_try_catch/1,coverage/1,
-	 unused_multiple_values_error/1,unused_multiple_values/1]).
+	 unused_multiple_values_error/1,unused_multiple_values/1,
+	 multiple_aliases/1]).
 
 -export([foo/0,foo/1,foo/2,foo/3]).
 
@@ -38,7 +39,8 @@ groups() ->
     [{p,test_lib:parallel(),
       [t_element,setelement,t_length,append,t_apply,bifs,
        eq,nested_call_in_case,guard_try_catch,coverage,
-       unused_multiple_values_error,unused_multiple_values]}].
+       unused_multiple_values_error,unused_multiple_values,
+       multiple_aliases]}].
 
 
 init_per_suite(Config) ->
@@ -249,6 +251,12 @@ coverage(Config) when is_list(Config) ->
     case list_to_pid("<0.42.0>") of
 	Pid when is_pid(Pid) -> ok
     end,
+
+    %% Cover the non-variable case in bsm_do_an/4.
+    ok = bsm_an_inlined(<<1>>, Config),
+    error = bsm_an_inlined(<<1,2,3>>, Config),
+    error = bsm_an_inlined([], Config),
+
     ok.
 
 cover_will_match_list_type(A) ->
@@ -290,7 +298,8 @@ cover_is_safe_bool_expr(X) ->
 	    false
     end.
 
-id(I) -> I.
+bsm_an_inlined(<<_:8>>, _) -> ok;
+bsm_an_inlined(_, _) -> error.
 
 unused_multiple_values_error(Config) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
@@ -299,7 +308,7 @@ unused_multiple_values_error(Config) when is_list(Config) ->
     Opts = [no_copt,clint,return,from_core,{outdir,PrivDir}
 	   |test_lib:opt_opts(?MODULE)],
     {error,[{unused_multiple_values_error,
-        [{core_lint,{return_mismatch,{hello,1}}}]}],
+	     [{none,core_lint,{return_mismatch,{hello,1}}}]}],
      []} = c:c(Core, Opts),
     ok.
 
@@ -329,3 +338,31 @@ do_something(I) ->
     put(unused_multiple_values,
 	[I|get(unused_multiple_values)]),
     I.
+
+
+%% Make sure that multiple aliases does not cause
+%% the case expression to be evaluated twice.
+multiple_aliases(Config) when is_list(Config) ->
+    do_ma(fun() ->
+		  X = Y = run_once(),
+		  {X,Y}
+	  end, {ok,ok}),
+    do_ma(fun() ->
+		  case {true,run_once()} of
+		      {true=A=B,ok=X=Y} ->
+			  {A,B,X,Y}
+		  end
+	  end, {true,true,ok,ok}),
+    ok.
+
+do_ma(Fun, Expected) when is_function(Fun, 0) ->
+    Expected = Fun(),
+    ran_once = erase(run_once),
+    ok.
+
+run_once() ->
+    undefined = put(run_once, ran_once),
+    ok.
+
+
+id(I) -> I.
diff --git a/lib/compiler/test/error_SUITE.erl b/lib/compiler/test/error_SUITE.erl
index 859c4571ea..5cdf429a5f 100644
--- a/lib/compiler/test/error_SUITE.erl
+++ b/lib/compiler/test/error_SUITE.erl
@@ -23,7 +23,7 @@
 -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,
-	 transforms/1]).
+	 transforms/1,forbidden_maps/1]).
 
 %% Used by transforms/1 test case.
 -export([parse_transform/2]).
@@ -36,7 +36,7 @@ all() ->
 
 groups() -> 
     [{p,test_lib:parallel(),
-      [head_mismatch_line,warnings_as_errors,bif_clashes,transforms]}].
+      [head_mismatch_line,warnings_as_errors,bif_clashes,transforms,forbidden_maps]}].
 
 init_per_suite(Config) ->
     Config.
@@ -240,6 +240,21 @@ parse_transform(_, _) ->
     error(too_bad).
 
 
+forbidden_maps(Config) when is_list(Config) ->
+    Ts1 = [{map_illegal_use_of_pattern,
+	   <<"
+              -export([t/0]).
+              t() ->
+                 V = 32,
+                 #{<<\"hi\",V,\"all\">> := 1} = id(#{<<\"hi all\">> => 1}).
+              id(I) -> I.
+             ">>,
+	    [return],
+	    {error,[{5,erl_lint,{illegal_map_key_variable,'V'}}], []}}],
+    [] = run2(Config, Ts1),
+    ok.
+
+
 run(Config, Tests) ->
     ?line File = test_filename(Config),
     run(Tests, File, dont_write_beam).
diff --git a/lib/compiler/test/fun_SUITE.erl b/lib/compiler/test/fun_SUITE.erl
index 6067ee8e06..e35692efd1 100644
--- a/lib/compiler/test/fun_SUITE.erl
+++ b/lib/compiler/test/fun_SUITE.erl
@@ -21,7 +21,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 test1/1,overwritten_fun/1,otp_7202/1,bif_fun/1,
-	 external/1]).
+	 external/1,eep37/1]).
 
 %% Internal export.
 -export([call_me/1]).
@@ -32,7 +32,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     test_lib:recompile(?MODULE),
-    [test1,overwritten_fun,otp_7202,bif_fun,external].
+    [test1,overwritten_fun,otp_7202,bif_fun,external,eep37].
 
 groups() -> 
     [].
@@ -197,5 +197,14 @@ external(Config) when is_list(Config) ->
 call_me(I) ->
     {ok,I}.
 
+eep37(Config) when is_list(Config) ->
+    F = fun Fact(N) when N > 0 -> N * Fact(N - 1); Fact(0) -> 1 end,
+    Add = fun _(N) -> N + 1 end,
+    UnusedName = fun BlackAdder(N) -> N + 42 end,
+    720 = F(6),
+    10 = Add(9),
+    50 = UnusedName(8),
+    ok.
+
 id(I) ->
     I.
diff --git a/lib/compiler/test/guard_SUITE.erl b/lib/compiler/test/guard_SUITE.erl
index 5656d23090..a0a9bb7ddd 100644
--- a/lib/compiler/test/guard_SUITE.erl
+++ b/lib/compiler/test/guard_SUITE.erl
@@ -813,8 +813,16 @@ and_guard(Config) when is_list(Config) ->
 
     ?line ok = relprod({'Set',a,b}, {'Set',a,b}),
     
+    ok = and_same_var(42),
+    {'EXIT',{if_clause,_}} = (catch and_same_var(x)),
     ok.
 
+and_same_var(V) ->
+    B = is_integer(V),
+    if
+	B or B -> ok
+    end.
+
 relprod(R1, R2) when (erlang:size(R1) =:= 3) and (erlang:element(1,R1) =:= 'Set'), (erlang:size(R2) =:= 3) and (erlang:element(1,R2) =:= 'Set') ->
     ok.
 
diff --git a/lib/compiler/test/inline_SUITE.erl b/lib/compiler/test/inline_SUITE.erl
index d9b92766e4..47851e680b 100644
--- a/lib/compiler/test/inline_SUITE.erl
+++ b/lib/compiler/test/inline_SUITE.erl
@@ -36,8 +36,8 @@ all() ->
 
 groups() -> 
     [{p,test_lib:parallel(),
-      [attribute,bsdecode,bsdes,barnes2,decode1,smith,
-       itracer,pseudoknot,comma_splitter,lists,really_inlined,otp_7223,
+      [attribute,bsdecode,bsdes,barnes2,decode1,smith,fname,
+       itracer,pseudoknot,maps_inline_test,comma_splitter,lists,really_inlined,otp_7223,
        coverage]}].
 
 init_per_suite(Config) ->
@@ -84,6 +84,8 @@ attribute(Config) when is_list(Config) ->
 ?comp(itracer).
 ?comp(pseudoknot).
 ?comp(comma_splitter).
+?comp(fname).
+?comp(maps_inline_test).
 
 try_inline(Mod, Config) ->
     Node = ?config(testing_node, Config),
diff --git a/lib/toolbar/src/toolbar.appup.src b/lib/compiler/test/inline_SUITE_data/fname.erl
index 7a435e9b22..7ad4446bf3 100644
--- a/lib/toolbar/src/toolbar.appup.src
+++ b/lib/compiler/test/inline_SUITE_data/fname.erl
@@ -1,19 +1,29 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
 %% The 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%
 %%
-{"%VSN%",[],[]}.
+-module(fname).
+-export([?MODULE/0]).
+
+?MODULE() ->
+    F = fun bar/1,
+    G = lists:last([(fun (X) when F =:= X -> X end)]),
+    F = G(F),
+    ok.
+
+bar(X) ->
+    X.
diff --git a/lib/compiler/test/inline_SUITE_data/maps_inline_test.erl b/lib/compiler/test/inline_SUITE_data/maps_inline_test.erl
new file mode 100644
index 0000000000..d9762e2647
--- /dev/null
+++ b/lib/compiler/test/inline_SUITE_data/maps_inline_test.erl
@@ -0,0 +1,70 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% 
+%% The 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(maps_inline_test).
+
+-export([?MODULE/0]).
+
+?MODULE() ->
+    21 = mval(#{val => 1}) +
+	 mval(#{val => 2}) +
+	 mval(#{val => 3}) +
+	 mval(#{val => 4}) +
+	 mval(#{val => 5}) +
+	 mval(#{val => 6}),
+
+    21 = gval(#{id => 1}) +
+	 gval(#{id => 2}) +
+	 gval(#{id => 3}) +
+	 gval(#{id => 4}) +
+	 gval(#{id => 5}) +
+	 gval(#{id => 6}),
+
+    21 = sval(#{id => 1}) +
+	 sval(#{id => 2}) +
+	 sval(#{id => 3}) +
+	 sval(#{id => 4}) +
+	 sval(#{id => 5}) +
+	 sval(#{id => 6}),
+
+    M = #{v => 1, m => #{v => 21, m => #{v => 7, m => 13}}},
+
+    42 = decompose(M).
+
+% switch key orders
+decompose(#{ m := M, v := V}) when is_map(M) ->
+    V + decompose(M);
+decompose(#{ v := V, m := M}) -> V + M.
+
+
+mval(#{val := V}) -> V.
+
+sval(#{id := 1}) -> 6;
+sval(#{id := 2}) -> 5;
+sval(#{id := 3}) -> 4;
+sval(#{id := 4}) -> 3;
+sval(#{id := 5}) -> 2;
+sval(#{id := 6}) -> 1.
+
+gval(M) when is_map(M) andalso M =:= #{ id => 1} -> 1;
+gval(M) when is_map(M) andalso M =:= #{ id => 2} -> 4;
+gval(M) when is_map(M) andalso M =:= #{ id => 3} -> 2;
+gval(M) when is_map(M) andalso M =:= #{ id => 4} -> 5;
+gval(M) when is_map(M) andalso M =:= #{ id => 5} -> 3;
+gval(M) when is_map(M) andalso M =:= #{ id => 6} -> 6.
diff --git a/lib/compiler/test/map_SUITE.erl b/lib/compiler/test/map_SUITE.erl
new file mode 100644
index 0000000000..b4baef461b
--- /dev/null
+++ b/lib/compiler/test/map_SUITE.erl
@@ -0,0 +1,534 @@
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% 
+%% The 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(map_SUITE).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	init_per_group/2,end_per_group/2
+    ]).
+
+-export([
+	t_build_and_match_literals/1,
+	t_update_literals/1,t_match_and_update_literals/1,
+	t_update_map_expressions/1,
+	t_update_assoc/1,t_update_exact/1,
+	t_guard_bifs/1, t_guard_sequence/1, t_guard_update/1,
+	t_guard_receive/1, t_guard_fun/1,
+	t_list_comprehension/1,
+	t_map_sort_literals/1,
+	t_map_size/1,
+	t_build_and_match_aliasing/1,
+
+	%% warnings
+	t_warn_useless_build/1,
+	t_warn_pair_key_overloaded/1,
+
+	%% not covered in 17.0-rc1
+	t_build_and_match_over_alloc/1,
+	t_build_and_match_empty_val/1,
+	t_build_and_match_val/1,
+
+	%% errors in 17.0-rc1
+	t_update_values/1
+    ]).
+
+suite() -> [].
+
+all() -> [
+	t_build_and_match_literals,
+	t_update_literals, t_match_and_update_literals,
+	t_update_map_expressions,
+	t_update_assoc,t_update_exact,
+	t_guard_bifs, t_guard_sequence, t_guard_update,
+	t_guard_receive,t_guard_fun, t_list_comprehension,
+	t_map_sort_literals,
+	t_map_size,
+	t_build_and_match_aliasing,
+
+	%% warnings
+	t_warn_useless_build,
+	t_warn_pair_key_overloaded,
+
+	%% not covered in 17.0-rc1
+	t_build_and_match_over_alloc,
+	t_build_and_match_empty_val,
+	t_build_and_match_val,
+
+	%% errors in 17.0-rc1
+	t_update_values
+    ].
+
+groups() -> [].
+
+init_per_suite(Config) -> Config.
+end_per_suite(_Config) -> ok.
+
+init_per_group(_GroupName, Config) -> Config.
+end_per_group(_GroupName, Config) -> Config.
+
+%% tests
+
+t_build_and_match_literals(Config) when is_list(Config) ->
+    #{} = id(#{}),
+    #{1:=a} = id(#{1=>a}),
+    #{1:=a,2:=b} = id(#{1=>a,2=>b}),
+    #{1:=a,2:=b,3:="c"} = id(#{1=>a,2=>b,3=>"c"}),
+    #{1:=a,2:=b,3:="c","4":="d"} = id(#{1=>a,2=>b,3=>"c","4"=>"d"}),
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>} =
+	id(#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>}),
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>,{"6",7}:="f"} =
+	id(#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>,{"6",7}=>"f"}),
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>,{"6",7}:="f",8:=g} =
+	id(#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>,{"6",7}=>"f",8=>g}),
+
+    #{<<"hi all">> := 1} = id(#{<<"hi",32,"all">> => 1}),
+
+    #{a:=X,a:=X=3,b:=4} = id(#{a=>3,b=>4}), % weird but ok =)
+
+    #{ a:=#{ b:=#{c := third, b:=second}}, b:=first} =
+	id(#{ b=>first, a=>#{ b=>#{c => third, b=> second}}}),
+
+    M = #{ map_1=>#{ map_2=>#{value_3 => third}, value_2=> second}, value_1=>first},
+    M = #{ map_1:=#{ map_2:=#{value_3 := third}, value_2:= second}, value_1:=first} =
+	 id(#{ map_1=>#{ map_2=>#{value_3 => third}, value_2=> second}, value_1=>first}),
+
+    %% error case
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3,x:=2} = id(#{x=>3}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=2} = id(#{x=>3}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = id({a,b,c}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = id(#{y=>3}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = id(#{x=>"three"}))),
+    ok.
+
+t_build_and_match_aliasing(Config) when is_list(Config) ->
+    M1 = id(#{a=>1,b=>2,c=>3,d=>4}),
+    #{c:=C1=_=_=C2} = M1,
+    true = C1 =:= C2,
+    #{a:=A,a:=A,a:=A,b:=B,b:=B} = M1,
+    #{a:=A,a:=A,a:=A,b:=B,b:=B,b:=2} = M1,
+    #{a:=A=1,a:=A,a:=A,b:=B=2,b:=B,b:=2} = M1,
+    #{c:=C1, c:=_, c:=3, c:=_, c:=C2} = M1,
+    #{c:=C=_=3=_=C} = M1,
+
+    M2 = id(#{"a"=>1,"b"=>2,"c"=>3,"d"=>4}),
+    #{"a":=A2,"a":=A2,"a":=A2,"b":=B2,"b":=B2,"b":=2} = M2,
+    #{"a":=_,"a":=_,"a":=_,"b":=_,"b":=_,"b":=2} = M2,
+    ok.
+
+t_map_size(Config) when is_list(Config) ->
+    0 = map_size(id(#{})),
+    1 = map_size(id(#{a=>1})),
+    1 = map_size(id(#{a=>"wat"})),
+    2 = map_size(id(#{a=>1, b=>2})),
+    3 = map_size(id(#{a=>1, b=>2, b=>"3","33"=><<"n">>})),
+
+    true = map_is_size(#{a=>1}, 1),
+    true = map_is_size(#{a=>1, a=>2}, 1),
+    M = #{ "a" => 1, "b" => 2},
+    true  = map_is_size(M, 2),
+    false = map_is_size(M, 3),
+    true  = map_is_size(M#{ "a" => 2}, 2),
+    false = map_is_size(M#{ "c" => 2}, 2),
+
+    %% Error cases.
+    {'EXIT',{badarg,_}} = (catch map_size([])),
+    {'EXIT',{badarg,_}} = (catch map_size(<<1,2,3>>)),
+    {'EXIT',{badarg,_}} = (catch map_size(1)),
+    ok.
+
+map_is_size(M,N) when map_size(M) =:= N -> true;
+map_is_size(_,_) -> false.
+
+% test map updates without matching
+t_update_literals(Config) when is_list(Config) ->
+    Map = #{x=>1,y=>2,z=>3,q=>4},
+    #{x:="d",q:="4"} = loop_update_literals_x_q(Map, [
+		{"a","1"},{"b","2"},{"c","3"},{"d","4"}
+	]),
+    ok.
+
+loop_update_literals_x_q(Map, []) -> Map;
+loop_update_literals_x_q(Map, [{X,Q}|Vs]) ->
+    loop_update_literals_x_q(Map#{q=>Q,x=>X},Vs).
+
+% test map updates with matching
+t_match_and_update_literals(Config) when is_list(Config) ->
+    Map = #{x=>0,y=>"untouched",z=>"also untouched",q=>1},
+    #{x:=16,q:=21,y:="untouched",z:="also untouched"} = loop_match_and_update_literals_x_q(Map, [
+	    {1,2},{3,4},{5,6},{7,8}
+	]),
+    M0 = id(#{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	    4 => number, 18446744073709551629 => wat}),
+    M1 = id(#{}),
+    M2 = M1#{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+    M0 = M2,
+
+    #{ 4 := another_number, int := 3 } = M2#{ 4 => another_number },
+    ok.
+
+loop_match_and_update_literals_x_q(Map, []) -> Map;
+loop_match_and_update_literals_x_q(#{q:=Q0,x:=X0} = Map, [{X,Q}|Vs]) ->
+    loop_match_and_update_literals_x_q(Map#{q=>Q0+Q,x=>X0+X},Vs).
+
+
+t_update_map_expressions(Config) when is_list(Config) ->
+    M = maps:new(),
+    #{ a := 1 } = M#{a => 1},
+
+    #{ b := 2 } = (maps:new())#{ b => 2 },
+
+    #{ a :=42, b:=42, c:=42 } = (maps:from_list([{a,1},{b,2},{c,3}]))#{ a := 42, b := 42, c := 42 },
+    #{ "a" :=1, "b":=42, "c":=42 } = (maps:from_list([{"a",1},{"b",2}]))#{ "b" := 42, "c" => 42 },
+
+    %% Test need to be in a fun.
+    %% This tests that let expr optimisation in sys_core_fold
+    %% covers maps correctly.
+    F = fun() ->
+	    M0 = id(#{ "a" => [1,2,3] }),
+	    #{ "a" := _ } = M0,
+	    M0#{ "a" := b }
+    end,
+
+    #{ "a" := b } = F(),
+
+    %% Error cases, FIXME: should be 'badmap'?
+    {'EXIT',{badarg,_}} = (catch (id(<<>>))#{ a := 42, b => 2 }),
+    {'EXIT',{badarg,_}} = (catch (id([]))#{ a := 42, b => 2 }),
+    ok.
+
+
+t_update_assoc(Config) when is_list(Config) ->
+    M0 = id(#{1=>a,2=>b,3.0=>c,4=>d,5=>e}),
+
+    M1 = M0#{1=>42,2=>100,4=>[a,b,c]},
+    #{1:=42,2:=100,3.0:=c,4:=[a,b,c],5:=e} = M1,
+    #{1:=42,2:=b,4:=d,5:=e,2.0:=100,3.0:=c,4.0:=[a,b,c]} = M0#{1.0=>float,1:=42,2.0=>wrong,2.0=>100,4.0=>[a,b,c]},
+
+    M2 = M0#{3.0=>new},
+    #{1:=a,2:=b,3.0:=new,4:=d,5:=e} = M2,
+    M2 = M0#{3.0:=wrong,3.0=>new},
+
+    %% Errors cases.
+    BadMap = id(badmap),
+    {'EXIT',{badarg,_}} = (catch BadMap#{nonexisting=>val}),
+
+    ok.
+
+t_update_exact(Config) when is_list(Config) ->
+    M0 = id(#{1=>a,2=>b,3.0=>c,4=>d,5=>e}),
+
+    M1 = M0#{1:=42,2:=100,4:=[a,b,c]},
+    #{1:=42,2:=100,3.0:=c,4:=[a,b,c],5:=e} = M1,
+    M1 = M0#{1:=wrong,1=>42,2=>wrong,2:=100,4:=[a,b,c]},
+
+    M2 = M0#{3.0:=new},
+    #{1:=a,2:=b,3.0:=new,4:=d,5:=e} = M2,
+    M2 = M0#{3.0=>wrong,3.0:=new},
+    true = M2 =/= M0#{3=>right,3.0:=new},
+    #{ 3 := right, 3.0 := new } = M0#{3=>right,3.0:=new},
+
+    M3 = id(#{ 1 => val}),
+    #{1 := update2,1.0 := new_val4} = M3#{
+	1.0 => new_val1, 1 := update, 1=> update3,
+	1 := update2, 1.0 := new_val2, 1.0 => new_val3,
+	1.0 => new_val4 },
+
+    %% Errors cases.
+    {'EXIT',{badarg,_}} = (catch ((id(nil))#{ a := b })),
+    {'EXIT',{badarg,_}} = (catch M0#{nonexisting:=val}),
+    {'EXIT',{badarg,_}} = (catch M0#{1.0:=v,1.0=>v2}),
+    {'EXIT',{badarg,_}} = (catch M0#{42.0:=v,42:=v2}),
+    {'EXIT',{badarg,_}} = (catch M0#{42=>v1,42.0:=v2,42:=v3}),
+    ok.
+
+t_update_values(Config) when is_list(Config) ->
+    V0 = id(1337),
+    M0 = #{ a => 1, val => V0},
+    V1 = get_val(M0),
+    M1 = M0#{ val := [V0,V1], "wazzup" => 42 },
+    [1337, {some_val, 1337}] = get_val(M1),
+
+    N = 110,
+    List = [{[I,1,2,3,I],{1,2,3,"wat",I}}|| I <- lists:seq(1,N)],
+
+    {_,_,#{val2 := {1,2,3,"wat",N}, val1 := [N,1,2,3,N]}} = lists:foldl(fun
+	    ({V2,V3},{Old2,Old3,Mi}) ->
+		ok = check_val(Mi,Old2,Old3),
+		#{ val1 := Old2, val2 := Old3 } = Mi,
+		{V2,V3, Mi#{ val1 := id(V2), val2 := V1, val2 => id(V3)}}
+	end, {none, none, #{val1=>none,val2=>none}},List),
+    ok.
+
+check_val(#{val1:=V1, val2:=V2},V1,V2) -> ok.
+
+get_val(#{ "wazzup" := _, val := V}) -> V;
+get_val(#{ val := V }) -> {some_val, V}.
+
+t_guard_bifs(Config) when is_list(Config) ->
+    true   = map_guard_head(#{a=>1}),
+    false  = map_guard_head([]),
+    true   = map_guard_body(#{a=>1}),
+    false  = map_guard_body({}),
+    true   = map_guard_pattern(#{a=>1, <<"hi">> => "hi" }),
+    false  = map_guard_pattern("list"),
+    ok.
+
+map_guard_head(M) when is_map(M) -> true;
+map_guard_head(_) -> false.
+
+map_guard_body(M) -> is_map(M).
+
+map_guard_pattern(#{}) -> true;
+map_guard_pattern(_)   -> false.
+
+t_guard_sequence(Config) when is_list(Config) ->
+	{1, "a"} = map_guard_sequence_1(#{seq=>1,val=>id("a")}),
+	{2, "b"} = map_guard_sequence_1(#{seq=>2,val=>id("b")}),
+	{3, "c"} = map_guard_sequence_1(#{seq=>3,val=>id("c")}),
+	{4, "d"} = map_guard_sequence_1(#{seq=>4,val=>id("d")}),
+	{5, "e"} = map_guard_sequence_1(#{seq=>5,val=>id("e")}),
+
+	{1,M1}       = map_guard_sequence_2(M1 = id(#{a=>3})),
+	{2,M2}       = map_guard_sequence_2(M2 = id(#{a=>4, b=>4})),
+	{3,gg,M3}    = map_guard_sequence_2(M3 = id(#{a=>gg, b=>4})),
+	{4,sc,sc,M4} = map_guard_sequence_2(M4 = id(#{a=>sc, b=>3, c=>sc2})),
+	{5,kk,kk,M5} = map_guard_sequence_2(M5 = id(#{a=>kk, b=>other, c=>sc2})),
+	
+	%% error case
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(#{seq=>6,val=>id("e")})),
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(#{b=>5})),
+	ok.
+
+map_guard_sequence_1(#{seq:=1=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=2=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=3=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=4=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=5=Seq, val:=Val}) -> {Seq,Val}.
+
+map_guard_sequence_2(#{ a:=3 }=M) -> {1, M};
+map_guard_sequence_2(#{ a:=4 }=M) -> {2, M};
+map_guard_sequence_2(#{ a:=X, a:=X, b:=4 }=M) -> {3,X,M};
+map_guard_sequence_2(#{ a:=X, a:=Y, b:=3 }=M) when X =:= Y -> {4,X,Y,M};
+map_guard_sequence_2(#{ a:=X, a:=Y }=M) when X =:= Y -> {5,X,Y,M}.
+
+
+t_guard_update(Config) when is_list(Config) ->
+    error  = map_guard_update(#{},#{}),
+    first  = map_guard_update(#{}, #{x=>first}),
+    second = map_guard_update(#{y=>old}, #{x=>second,y=>old}),
+    third  = map_guard_update(#{x=>old,y=>old}, #{x=>third,y=>old}),
+    ok.
+
+map_guard_update(M1, M2) when M1#{x=>first}  =:= M2 -> first;
+map_guard_update(M1, M2) when M1#{x=>second} =:= M2 -> second;
+map_guard_update(M1, M2) when M1#{x:=third}  =:= M2 -> third;
+map_guard_update(_, _) -> error.
+
+t_guard_receive(Config) when is_list(Config) ->
+    M0  = #{ id => 0 },
+    Pid = spawn_link(fun() -> guard_receive_loop() end),
+    Big = 36893488147419103229,
+    B1  = <<"some text">>,
+    B2  = <<"was appended">>,
+    B3  = <<B1/binary, B2/binary>>,
+
+    #{id:=1, res:=Big} = M1 = call(Pid, M0#{op=>sub,in=>{1 bsl 65, 3}}),
+    #{id:=2, res:=26}  = M2 = call(Pid, M1#{op=>idiv,in=>{53,2}}),
+    #{id:=3, res:=832} = M3 = call(Pid, M2#{op=>imul,in=>{26,32}}),
+    #{id:=4, res:=4}   = M4 = call(Pid, M3#{op=>add,in=>{1,3}}),
+    #{id:=5, res:=Big} = M5 = call(Pid, M4#{op=>sub,in=>{1 bsl 65, 3}}),
+    #{id:=6, res:=B3}  = M6 = call(Pid, M5#{op=>"append",in=>{B1,B2}}),
+    #{id:=7, res:=4}   = _  = call(Pid, M6#{op=>add,in=>{1,3}}),
+
+
+    %% update old maps and check id update
+    #{id:=2, res:=B3} = call(Pid, M1#{op=>"append",in=>{B1,B2}}),
+    #{id:=5, res:=99} = call(Pid, M4#{op=>add,in=>{33, 66}}),
+
+    %% cleanup
+    done = call(Pid, done),
+    ok.
+
+call(Pid, M) ->
+    Pid ! {self(), M}, receive {Pid, Res} -> Res end.
+
+guard_receive_loop() ->
+    receive
+	{Pid, #{ id:=Id, op:="append", in:={X,Y}}=M} when is_binary(X), is_binary(Y) ->
+	    Pid ! {self(), M#{ id=>Id+1, res=><<X/binary,Y/binary>>}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=add, in:={X,Y}}} ->
+	    Pid ! {self(), #{ id=>Id+1, res=>X+Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=sub,  in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X-Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=idiv, in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X div Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=imul, in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X * Y}},
+	    guard_receive_loop();
+	{Pid, done} ->
+	    Pid ! {self(), done};
+	{Pid, Other} ->
+	    Pid ! {error, Other},
+	    guard_receive_loop()
+    end.
+
+
+t_list_comprehension(Config) when is_list(Config) ->
+    [#{k:=1},#{k:=2},#{k:=3}] = [#{k=>I} || I <- [1,2,3]],
+    ok.
+
+t_guard_fun(Config) when is_list(Config) ->
+    F1 = fun
+	    (#{s:=v,v:=V})     -> {v,V};
+	    (#{s:=t,v:={V,V}}) -> {t,V};
+	    (#{s:=l,v:=[V,V]}) -> {l,V}
+    end,
+    
+    F2 = fun
+	    (#{s:=T,v:={V,V}}) -> {T,V};
+	    (#{s:=T,v:=[V,V]}) -> {T,V};
+	    (#{s:=T,v:=V})     -> {T,V}
+    end,
+    V = <<"hi">>,
+
+    {v,V} = F1(#{s=>v,v=>V}),
+    {t,V} = F1(#{s=>t,v=>{V,V}}),
+    {l,V} = F1(#{s=>l,v=>[V,V]}),
+
+    {v,V} = F2(#{s=>v,v=>V}),
+    {t,V} = F2(#{s=>t,v=>{V,V}}),
+    {l,V} = F2(#{s=>l,v=>[V,V]}),
+
+    %% error case
+    case (catch F1(#{s=>none,v=>none})) of
+	{'EXIT', {function_clause,[{?MODULE,_,[#{s:=none,v:=none}],_}|_]}} -> ok;
+	{'EXIT', {{case_clause,_},_}} -> {comment,inlined};
+	Other ->
+	    test_server:fail({no_match, Other})
+    end.
+
+
+t_map_sort_literals(Config) when is_list(Config) ->
+    % test relation
+
+    %% size order
+    true  = #{ a => 1, b => 2} < id(#{ a => 1, b => 1, c => 1}),
+    true  = #{ b => 1, a => 1} < id(#{ c => 1, a => 1, b => 1}),
+    false = #{ c => 1, b => 1, a => 1} < id(#{ c => 1, a => 1}),
+
+    %% key order
+    true  = id(#{ a => 1 }) < id(#{ b => 1}),
+    false = id(#{ b => 1 }) < id(#{ a => 1}),
+    true  = id(#{ a => 1, b => 1, c => 1 }) < id(#{ b => 1, c => 1, d => 1}),
+    true  = id(#{ b => 1, c => 1, d => 1 }) > id(#{ a => 1, b => 1, c => 1}),
+    true  = id(#{ c => 1, b => 1, a => 1 }) < id(#{ b => 1, c => 1, d => 1}),
+    true  = id(#{ "a" => 1 }) < id(#{ <<"a">> => 1}),
+    false = id(#{ <<"a">> => 1 }) < id(#{ "a" => 1}),
+    false = id(#{ 1 => 1 }) < id(#{ 1.0 => 1}),
+    false = id(#{ 1.0 => 1 }) < id(#{ 1 => 1}),
+
+    %% value order
+    true  = id(#{ a => 1 }) < id(#{ a => 2}),
+    false = id(#{ a => 2 }) < id(#{ a => 1}),
+    false = id(#{ a => 2, b => 1 }) < id(#{ a => 1, b => 3}),
+    true  = id(#{ a => 1, b => 1 }) < id(#{ a => 1, b => 3}),
+
+    true  = id(#{ "a" => "hi", b => 134 }) == id(#{ b => 134,"a" => "hi"}),
+
+    %% lists:sort
+
+    SortVs = [#{"a"=>1},#{a=>2},#{1=>3},#{<<"a">>=>4}],
+    [#{1:=ok},#{a:=ok},#{"a":=ok},#{<<"a">>:=ok}] = lists:sort([#{"a"=>ok},#{a=>ok},#{1=>ok},#{<<"a">>=>ok}]),
+    [#{1:=3},#{a:=2},#{"a":=1},#{<<"a">>:=4}] = lists:sort(SortVs),
+    [#{1:=3},#{a:=2},#{"a":=1},#{<<"a">>:=4}] = lists:sort(lists:reverse(SortVs)),
+
+    ok.
+
+t_warn_pair_key_overloaded(Config) when is_list(Config) ->
+    #{ "hi1" := 42 } = id(#{ "hi1" => 1, "hi1" => 42 }),
+
+    #{ "hi1" := 1337, "hi2" := [2], "hi3" := 3 } = id(#{
+	    "hi1" => erlang:atom_to_binary(?MODULE,utf8),
+	    "hi1" => erlang:binary_to_atom(<<"wazzup">>,utf8),
+	    "hi1" => erlang:binary_to_float(<<"3.1416">>),
+	    "hi1" => erlang:float_to_binary(3.1416),
+	    "hi2" => erlang:pid_to_list(self()),
+	    "hi3" => erlang:float_to_binary(3.1416),
+	    "hi2" => lists:subtract([1,2],[1]),
+	    "hi3" => +3,
+	    "hi1" => erlang:min(1,2),
+	    "hi1" => erlang:hash({1,2},35),
+	    "hi1" => erlang:phash({1,2},33),
+	    "hi1" => erlang:phash2({1,2},34),
+	    "hi1" => erlang:integer_to_binary(1337),
+	    "hi1" => erlang:binary_to_integer(<<"1337">>),
+	    "hi4" => erlang:float_to_binary(3.1416)
+	}),
+    ok.
+
+t_warn_useless_build(Config) when is_list(Config) ->
+    [#{ a => id(I)} || I <- [1,2,3]],
+    ok.
+
+t_build_and_match_over_alloc(Config) when is_list(Config) ->
+    Ls = id([1,2,3]),
+    V0 = [a|Ls],
+    M0 = id(#{ "a" => V0 }),
+    #{ "a" := V1 } = M0,
+    V2 = id([c|Ls]),
+    M2 = id(#{ "a" => V2 }),
+    #{ "a" := V3 } = M2,
+    {[a,1,2,3],[c,1,2,3]} = id({V1,V3}),
+    ok.
+
+t_build_and_match_empty_val(Config) when is_list(Config) ->
+    F = fun(#{ "hi":=_,{1,2}:=_,1337:=_}) -> ok end,
+    ok = F(id(#{"hi"=>ok,{1,2}=>ok,1337=>ok})),
+
+    %% error case
+    case (catch (F(id(#{"hi"=>ok})))) of
+	{'EXIT',{function_clause,_}} -> ok;
+	{'EXIT', {{case_clause,_},_}} -> {comment,inlined};
+	Other ->
+	    test_server:fail({no_match, Other})
+    end.
+
+t_build_and_match_val(Config) when is_list(Config) ->
+    F = fun
+	(#{ "hi" := first,  v := V}) -> {1,V};
+	(#{ "hi" := second, v := V}) -> {2,V}
+    end,
+
+
+    {1,"hello"}  = F(id(#{"hi"=>first,v=>"hello"})),
+    {2,"second"} = F(id(#{"hi"=>second,v=>"second"})),
+
+    %% error case
+    case (catch (F(id(#{"hi"=>ok})))) of
+	{'EXIT',{function_clause,_}} -> ok;
+	{'EXIT', {{case_clause,_},_}} -> {comment,inlined};
+	Other ->
+	    test_server:fail({no_match, Other})
+    end.
+
+
+%% Use this function to avoid compile-time evaluation of an expression.
+id(I) -> I.
diff --git a/lib/compiler/test/warnings_SUITE.erl b/lib/compiler/test/warnings_SUITE.erl
index f00bfe663b..16d15a59e5 100644
--- a/lib/compiler/test/warnings_SUITE.erl
+++ b/lib/compiler/test/warnings_SUITE.erl
@@ -37,7 +37,7 @@
 
 -export([pattern/1,pattern2/1,pattern3/1,pattern4/1,
 	 guard/1,bad_arith/1,bool_cases/1,bad_apply/1,
-         files/1,effect/1,bin_opt_info/1,bin_construction/1]).
+         files/1,effect/1,bin_opt_info/1,bin_construction/1, comprehensions/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(2)).
@@ -61,7 +61,7 @@ groups() ->
     [{p,test_lib:parallel(),
       [pattern,pattern2,pattern3,pattern4,guard,
        bad_arith,bool_cases,bad_apply,files,effect,
-       bin_opt_info,bin_construction]}].
+       bin_opt_info,bin_construction,comprehensions]}].
 
 init_per_suite(Config) ->
     Config.
@@ -117,6 +117,7 @@ pattern2(Config) when is_list(Config) ->
 	   Source,
 	   [nowarn_unused_vars],
 	   {warnings,[{2,sys_core_fold,{nomatch_shadow,1}},
+		      {4,sys_core_fold,no_clause_match},
 		      {5,sys_core_fold,nomatch_clause_type},
 		      {6,sys_core_fold,nomatch_clause_type}]}}],
     ?line [] = run(Config, Ts),
@@ -389,6 +390,10 @@ effect(Config) when is_list(Config) ->
               	    <<X:8>>;
               	unused_fun ->
               	    fun() -> {ok,X} end;
+		unused_named_fun ->
+		    fun F(0) -> 1;
+                        F(N) -> N*F(N-1)
+                    end;
               	unused_atom ->
               	    ignore;				%no warning
               	unused_nil ->
@@ -483,8 +488,9 @@ effect(Config) when is_list(Config) ->
 		      {22,sys_core_fold,{no_effect,{erlang,is_integer,1}}},
 		      {24,sys_core_fold,useless_building},
 		      {26,sys_core_fold,useless_building},
-		      {32,sys_core_fold,{no_effect,{erlang,'=:=',2}}},
-		      {34,sys_core_fold,{no_effect,{erlang,get_cookie,0}}}]}}],
+		      {28,sys_core_fold,useless_building},
+		      {36,sys_core_fold,{no_effect,{erlang,'=:=',2}}},
+		      {38,sys_core_fold,{no_effect,{erlang,get_cookie,0}}}]}}],
     ?line [] = run(Config, Ts),
     ok.
 
@@ -536,6 +542,16 @@ bin_construction(Config) when is_list(Config) ->
     
     ok.
 
+comprehensions(Config) when is_list(Config) ->
+    Ts = [{tautologic_guards,
+           <<"
+             f() -> [ true || true ].
+             g() -> << <<1>> || true >>.
+           ">>,
+           [], []}],
+    run(Config, Ts),
+    ok.
+
 %%%
 %%% End of test cases.
 %%%
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index 1c6f49d89b..cbdf57f177 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 4.9.2
+COMPILER_VSN = 4.9.4
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
index c599a92ff1..73456845fc 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
index 2318ccb6d2..4cf079ce09 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ConsumerAdmin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
index 4495fd4450..cdbcd0e146 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_EventChannel.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
index 4cd20ad185..420e4b289c 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
index 830c06a87c..8dbf7804ac 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPullSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
index 2c451acd9c..2c448f1f54 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
index 9030c0e735..d3b548636a 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_ProxyPushSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml b/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
index e68b0854d8..7a2d874aab 100644
--- a/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
+++ b/lib/cosEvent/doc/src/CosEventChannelAdmin_SupplierAdmin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/book.xml b/lib/cosEvent/doc/src/book.xml
index 68e26be0ea..1b025351f8 100644
--- a/lib/cosEvent/doc/src/book.xml
+++ b/lib/cosEvent/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/ch_contents.xml b/lib/cosEvent/doc/src/ch_contents.xml
index 943e00b967..e65c7e53bc 100644
--- a/lib/cosEvent/doc/src/ch_contents.xml
+++ b/lib/cosEvent/doc/src/ch_contents.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/ch_event_service.xml b/lib/cosEvent/doc/src/ch_event_service.xml
index c65f6767ad..5148b77ab1 100644
--- a/lib/cosEvent/doc/src/ch_event_service.xml
+++ b/lib/cosEvent/doc/src/ch_event_service.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/ch_introduction.xml b/lib/cosEvent/doc/src/ch_introduction.xml
index 101c3e1212..01ce5c4231 100644
--- a/lib/cosEvent/doc/src/ch_introduction.xml
+++ b/lib/cosEvent/doc/src/ch_introduction.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/cosEventApp.xml b/lib/cosEvent/doc/src/cosEventApp.xml
index 55ea790203..3b9a38ea93 100644
--- a/lib/cosEvent/doc/src/cosEventApp.xml
+++ b/lib/cosEvent/doc/src/cosEventApp.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2001</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/fascicules.xml b/lib/cosEvent/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/cosEvent/doc/src/fascicules.xml
+++ b/lib/cosEvent/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/cosEvent/doc/src/notes.xml b/lib/cosEvent/doc/src/notes.xml
index ba986792c5..df05f5634e 100644
--- a/lib/cosEvent/doc/src/notes.xml
+++ b/lib/cosEvent/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/cosEvent/doc/src/part.xml b/lib/cosEvent/doc/src/part.xml
index a17821cadc..a21579bc0a 100644
--- a/lib/cosEvent/doc/src/part.xml
+++ b/lib/cosEvent/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/part_notes.xml b/lib/cosEvent/doc/src/part_notes.xml
index 92324ce227..d9a5e610c6 100644
--- a/lib/cosEvent/doc/src/part_notes.xml
+++ b/lib/cosEvent/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEvent/doc/src/ref_man.xml b/lib/cosEvent/doc/src/ref_man.xml
index 7088c2ef92..26dbf2b2ef 100644
--- a/lib/cosEvent/doc/src/ref_man.xml
+++ b/lib/cosEvent/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml
index 60f26dda96..fba39e5bd2 100644
--- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml
+++ b/lib/cosEventDomain/doc/src/CosEventDomainAdmin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomain.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomain.xml
index 4941f8652c..12ab034f8f 100644
--- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomain.xml
+++ b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomain.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml
index 5eff7038d9..16d297ddab 100644
--- a/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml
+++ b/lib/cosEventDomain/doc/src/CosEventDomainAdmin_EventDomainFactory.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2001</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/book.xml b/lib/cosEventDomain/doc/src/book.xml
index 3a36704355..8023ac8755 100644
--- a/lib/cosEventDomain/doc/src/book.xml
+++ b/lib/cosEventDomain/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/ch_QoS.xml b/lib/cosEventDomain/doc/src/ch_QoS.xml
index 232cc4021a..ff46824074 100644
--- a/lib/cosEventDomain/doc/src/ch_QoS.xml
+++ b/lib/cosEventDomain/doc/src/ch_QoS.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/ch_contents.xml b/lib/cosEventDomain/doc/src/ch_contents.xml
index bdb951566f..8de9aa06d2 100644
--- a/lib/cosEventDomain/doc/src/ch_contents.xml
+++ b/lib/cosEventDomain/doc/src/ch_contents.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/ch_event_domain_service.xml b/lib/cosEventDomain/doc/src/ch_event_domain_service.xml
index 39ac915b38..af08182bf5 100644
--- a/lib/cosEventDomain/doc/src/ch_event_domain_service.xml
+++ b/lib/cosEventDomain/doc/src/ch_event_domain_service.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/ch_introduction.xml b/lib/cosEventDomain/doc/src/ch_introduction.xml
index 8a85fc052f..68048a5caa 100644
--- a/lib/cosEventDomain/doc/src/ch_introduction.xml
+++ b/lib/cosEventDomain/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/cosEventDomainApp.xml b/lib/cosEventDomain/doc/src/cosEventDomainApp.xml
index e7704b90b5..ff444c75d6 100644
--- a/lib/cosEventDomain/doc/src/cosEventDomainApp.xml
+++ b/lib/cosEventDomain/doc/src/cosEventDomainApp.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2001</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/fascicules.xml b/lib/cosEventDomain/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/cosEventDomain/doc/src/fascicules.xml
+++ b/lib/cosEventDomain/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml
index 565b501148..f88d101a69 100644
--- a/lib/cosEventDomain/doc/src/notes.xml
+++ b/lib/cosEventDomain/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/cosEventDomain/doc/src/part.xml b/lib/cosEventDomain/doc/src/part.xml
index 720a4d3feb..20d6a8539b 100644
--- a/lib/cosEventDomain/doc/src/part.xml
+++ b/lib/cosEventDomain/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/part_notes.xml b/lib/cosEventDomain/doc/src/part_notes.xml
index 0979d6e491..88fe24a5ae 100644
--- a/lib/cosEventDomain/doc/src/part_notes.xml
+++ b/lib/cosEventDomain/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosEventDomain/doc/src/ref_man.xml b/lib/cosEventDomain/doc/src/ref_man.xml
index ddb836e1d6..cee6394af2 100644
--- a/lib/cosEventDomain/doc/src/ref_man.xml
+++ b/lib/cosEventDomain/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_Directory.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_Directory.xml
index 7c68768aa9..991ce19f58 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_Directory.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_Directory.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
index 8b317049e2..252d14cf5e 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileIterator.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileIterator.xml
index 80cbd1f448..01a9671ba5 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileIterator.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileIterator.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
index 918f0bf9f7..0c69eb3687 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_VirtualFileSystem.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_VirtualFileSystem.xml
index 7bb6e8d356..4c898e5459 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_VirtualFileSystem.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_VirtualFileSystem.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/book.xml b/lib/cosFileTransfer/doc/src/book.xml
index aaa14f7d69..c34dd92390 100644
--- a/lib/cosFileTransfer/doc/src/book.xml
+++ b/lib/cosFileTransfer/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/ch_contents.xml b/lib/cosFileTransfer/doc/src/ch_contents.xml
index 70094beb2d..c75b0db2c5 100644
--- a/lib/cosFileTransfer/doc/src/ch_contents.xml
+++ b/lib/cosFileTransfer/doc/src/ch_contents.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/ch_example.xml b/lib/cosFileTransfer/doc/src/ch_example.xml
index 8d16371836..ad0d94f76b 100644
--- a/lib/cosFileTransfer/doc/src/ch_example.xml
+++ b/lib/cosFileTransfer/doc/src/ch_example.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/ch_install.xml b/lib/cosFileTransfer/doc/src/ch_install.xml
index 068dceb733..d125d331c5 100644
--- a/lib/cosFileTransfer/doc/src/ch_install.xml
+++ b/lib/cosFileTransfer/doc/src/ch_install.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/ch_introduction.xml b/lib/cosFileTransfer/doc/src/ch_introduction.xml
index d81269aba4..0c92d0db20 100644
--- a/lib/cosFileTransfer/doc/src/ch_introduction.xml
+++ b/lib/cosFileTransfer/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/ch_system.xml b/lib/cosFileTransfer/doc/src/ch_system.xml
index 51a8ac86cd..986728a614 100644
--- a/lib/cosFileTransfer/doc/src/ch_system.xml
+++ b/lib/cosFileTransfer/doc/src/ch_system.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/cosFileTransferApp.xml b/lib/cosFileTransfer/doc/src/cosFileTransferApp.xml
index e27bffd44d..ab968f168f 100644
--- a/lib/cosFileTransfer/doc/src/cosFileTransferApp.xml
+++ b/lib/cosFileTransfer/doc/src/cosFileTransferApp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/fascicules.xml b/lib/cosFileTransfer/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/cosFileTransfer/doc/src/fascicules.xml
+++ b/lib/cosFileTransfer/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/cosFileTransfer/doc/src/notes.xml b/lib/cosFileTransfer/doc/src/notes.xml
index d68a52655a..5cca5e307b 100644
--- a/lib/cosFileTransfer/doc/src/notes.xml
+++ b/lib/cosFileTransfer/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/cosFileTransfer/doc/src/part.xml b/lib/cosFileTransfer/doc/src/part.xml
index 78e4063927..0170bb3e31 100644
--- a/lib/cosFileTransfer/doc/src/part.xml
+++ b/lib/cosFileTransfer/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/part_notes.xml b/lib/cosFileTransfer/doc/src/part_notes.xml
index f3819bd4be..cc93603331 100644
--- a/lib/cosFileTransfer/doc/src/part_notes.xml
+++ b/lib/cosFileTransfer/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosFileTransfer/doc/src/ref_man.xml b/lib/cosFileTransfer/doc/src/ref_man.xml
index 088ec49a29..29e190b8e7 100644
--- a/lib/cosFileTransfer/doc/src/ref_man.xml
+++ b/lib/cosFileTransfer/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotification.xml b/lib/cosNotification/doc/src/CosNotification.xml
index cd965bc46b..d3003ee538 100644
--- a/lib/cosNotification/doc/src/CosNotification.xml
+++ b/lib/cosNotification/doc/src/CosNotification.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotification_AdminPropertiesAdmin.xml b/lib/cosNotification/doc/src/CosNotification_AdminPropertiesAdmin.xml
index 46c3921b66..be2314ea84 100644
--- a/lib/cosNotification/doc/src/CosNotification_AdminPropertiesAdmin.xml
+++ b/lib/cosNotification/doc/src/CosNotification_AdminPropertiesAdmin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotification_QoSAdmin.xml b/lib/cosNotification/doc/src/CosNotification_QoSAdmin.xml
index b7c19f664b..7dede0ebb8 100644
--- a/lib/cosNotification/doc/src/CosNotification_QoSAdmin.xml
+++ b/lib/cosNotification/doc/src/CosNotification_QoSAdmin.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ConsumerAdmin.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ConsumerAdmin.xml
index 96ccdf1d29..c31bc8668c 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ConsumerAdmin.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ConsumerAdmin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannel.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannel.xml
index 1682cf9968..f242cd5a30 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannel.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannel.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannelFactory.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannelFactory.xml
index 64e0e4dad8..487cc8365e 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannelFactory.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_EventChannelFactory.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyConsumer.xml
index 7ba74547bb..8655704239 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyConsumer.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullConsumer.xml
index d8344e004a..fca52d25b9 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullConsumer.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullSupplier.xml
index cc2c17a3ca..938614dd24 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullSupplier.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPullSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushConsumer.xml
index 30ba264f74..aeac8754b6 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushConsumer.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushSupplier.xml
index d5079a5ae7..fbece27728 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushSupplier.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxyPushSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxySupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxySupplier.xml
index bdd9213a8b..ee9d34e556 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxySupplier.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_ProxySupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml
index 86796a2643..02aaff133e 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml
index c30217362a..d1534f0766 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPullSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml
index 3f3e187486..9400f771b0 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushConsumer.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml
index f85f33de01..0aa08faa7f 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SequenceProxyPushSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml
index 09546d9584..a4a8f91f00 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml
index d171851014..f779820977 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPullSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml
index a055a0ab36..a9ebdca27e 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushConsumer.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml
index f03322b819..0d5df4800b 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_StructuredProxyPushSupplier.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SupplierAdmin.xml b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SupplierAdmin.xml
index 5c7408040d..70ee36e18f 100644
--- a/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SupplierAdmin.xml
+++ b/lib/cosNotification/doc/src/CosNotifyChannelAdmin_SupplierAdmin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyComm_NotifyPublish.xml b/lib/cosNotification/doc/src/CosNotifyComm_NotifyPublish.xml
index 2ea19a2dfb..403359d08f 100644
--- a/lib/cosNotification/doc/src/CosNotifyComm_NotifyPublish.xml
+++ b/lib/cosNotification/doc/src/CosNotifyComm_NotifyPublish.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyComm_NotifySubscribe.xml b/lib/cosNotification/doc/src/CosNotifyComm_NotifySubscribe.xml
index 97b15d958a..e2cdb49a15 100644
--- a/lib/cosNotification/doc/src/CosNotifyComm_NotifySubscribe.xml
+++ b/lib/cosNotification/doc/src/CosNotifyComm_NotifySubscribe.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_Filter.xml b/lib/cosNotification/doc/src/CosNotifyFilter_Filter.xml
index dd894f2fea..09740b0d1b 100644
--- a/lib/cosNotification/doc/src/CosNotifyFilter_Filter.xml
+++ b/lib/cosNotification/doc/src/CosNotifyFilter_Filter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_FilterAdmin.xml b/lib/cosNotification/doc/src/CosNotifyFilter_FilterAdmin.xml
index 9e0fe693d4..e4afb9b6c7 100644
--- a/lib/cosNotification/doc/src/CosNotifyFilter_FilterAdmin.xml
+++ b/lib/cosNotification/doc/src/CosNotifyFilter_FilterAdmin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_FilterFactory.xml b/lib/cosNotification/doc/src/CosNotifyFilter_FilterFactory.xml
index 886b5b4729..04fdf9d7eb 100644
--- a/lib/cosNotification/doc/src/CosNotifyFilter_FilterFactory.xml
+++ b/lib/cosNotification/doc/src/CosNotifyFilter_FilterFactory.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/CosNotifyFilter_MappingFilter.xml b/lib/cosNotification/doc/src/CosNotifyFilter_MappingFilter.xml
index f5c6a75f3e..72720f21ea 100644
--- a/lib/cosNotification/doc/src/CosNotifyFilter_MappingFilter.xml
+++ b/lib/cosNotification/doc/src/CosNotifyFilter_MappingFilter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/book.xml b/lib/cosNotification/doc/src/book.xml
index fe311ee57c..da21f23f7f 100644
--- a/lib/cosNotification/doc/src/book.xml
+++ b/lib/cosNotification/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ch_BNF.xml b/lib/cosNotification/doc/src/ch_BNF.xml
index f658f606d3..127069dff3 100644
--- a/lib/cosNotification/doc/src/ch_BNF.xml
+++ b/lib/cosNotification/doc/src/ch_BNF.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ch_QoS.xml b/lib/cosNotification/doc/src/ch_QoS.xml
index fbc8622a62..2ed35f8d68 100644
--- a/lib/cosNotification/doc/src/ch_QoS.xml
+++ b/lib/cosNotification/doc/src/ch_QoS.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ch_contents.xml b/lib/cosNotification/doc/src/ch_contents.xml
index e5505951bf..dc94a067ef 100644
--- a/lib/cosNotification/doc/src/ch_contents.xml
+++ b/lib/cosNotification/doc/src/ch_contents.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ch_example.xml b/lib/cosNotification/doc/src/ch_example.xml
index 14c0e5c6fd..2710acc04d 100644
--- a/lib/cosNotification/doc/src/ch_example.xml
+++ b/lib/cosNotification/doc/src/ch_example.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ch_install.xml b/lib/cosNotification/doc/src/ch_install.xml
index 3463815bc5..4b10ea5ffa 100644
--- a/lib/cosNotification/doc/src/ch_install.xml
+++ b/lib/cosNotification/doc/src/ch_install.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ch_introduction.xml b/lib/cosNotification/doc/src/ch_introduction.xml
index 63e4a58bd5..82a4a2d66f 100644
--- a/lib/cosNotification/doc/src/ch_introduction.xml
+++ b/lib/cosNotification/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ch_system.xml b/lib/cosNotification/doc/src/ch_system.xml
index 126bba5f0b..2efda9e5cd 100644
--- a/lib/cosNotification/doc/src/ch_system.xml
+++ b/lib/cosNotification/doc/src/ch_system.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/cosNotificationApp.xml b/lib/cosNotification/doc/src/cosNotificationApp.xml
index 08bac7f810..a11de06a11 100644
--- a/lib/cosNotification/doc/src/cosNotificationApp.xml
+++ b/lib/cosNotification/doc/src/cosNotificationApp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/fascicules.xml b/lib/cosNotification/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/cosNotification/doc/src/fascicules.xml
+++ b/lib/cosNotification/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/cosNotification/doc/src/notes.xml b/lib/cosNotification/doc/src/notes.xml
index 2d126271a9..b700e0984c 100644
--- a/lib/cosNotification/doc/src/notes.xml
+++ b/lib/cosNotification/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/cosNotification/doc/src/part.xml b/lib/cosNotification/doc/src/part.xml
index 06ae875c01..99770639c0 100644
--- a/lib/cosNotification/doc/src/part.xml
+++ b/lib/cosNotification/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/part_notes.xml b/lib/cosNotification/doc/src/part_notes.xml
index af262c3d0e..83fadb868e 100644
--- a/lib/cosNotification/doc/src/part_notes.xml
+++ b/lib/cosNotification/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosNotification/doc/src/ref_man.xml b/lib/cosNotification/doc/src/ref_man.xml
index 1cf77c3c7f..0e729be80a 100644
--- a/lib/cosNotification/doc/src/ref_man.xml
+++ b/lib/cosNotification/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertiesIterator.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertiesIterator.xml
index 623e121715..925b63e657 100644
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertiesIterator.xml
+++ b/lib/cosProperty/doc/src/CosPropertyService_PropertiesIterator.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertyNamesIterator.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertyNamesIterator.xml
index 9cb5e8f489..758af6396c 100644
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertyNamesIterator.xml
+++ b/lib/cosProperty/doc/src/CosPropertyService_PropertyNamesIterator.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySet.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySet.xml
index f9a7c9ca97..1babf7776b 100644
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySet.xml
+++ b/lib/cosProperty/doc/src/CosPropertyService_PropertySet.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDef.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySetDef.xml
index 2dbfd05ba8..78629d6702 100644
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDef.xml
+++ b/lib/cosProperty/doc/src/CosPropertyService_PropertySetDef.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDefFactory.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySetDefFactory.xml
index a009e70f68..607cb791ae 100644
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySetDefFactory.xml
+++ b/lib/cosProperty/doc/src/CosPropertyService_PropertySetDefFactory.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/CosPropertyService_PropertySetFactory.xml b/lib/cosProperty/doc/src/CosPropertyService_PropertySetFactory.xml
index 62ee2bda4f..e9761181e2 100644
--- a/lib/cosProperty/doc/src/CosPropertyService_PropertySetFactory.xml
+++ b/lib/cosProperty/doc/src/CosPropertyService_PropertySetFactory.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/book.xml b/lib/cosProperty/doc/src/book.xml
index f3ba9a5bcd..4d249a3753 100644
--- a/lib/cosProperty/doc/src/book.xml
+++ b/lib/cosProperty/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/ch_contents.xml b/lib/cosProperty/doc/src/ch_contents.xml
index 9b8a39cfb3..80eee4affe 100644
--- a/lib/cosProperty/doc/src/ch_contents.xml
+++ b/lib/cosProperty/doc/src/ch_contents.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/ch_example.xml b/lib/cosProperty/doc/src/ch_example.xml
index 3b5c6160fb..fab5cfaa5f 100644
--- a/lib/cosProperty/doc/src/ch_example.xml
+++ b/lib/cosProperty/doc/src/ch_example.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/ch_install.xml b/lib/cosProperty/doc/src/ch_install.xml
index 33324a0ce6..c7f1734b94 100644
--- a/lib/cosProperty/doc/src/ch_install.xml
+++ b/lib/cosProperty/doc/src/ch_install.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/ch_introduction.xml b/lib/cosProperty/doc/src/ch_introduction.xml
index 1f8731113a..f2064785c5 100644
--- a/lib/cosProperty/doc/src/ch_introduction.xml
+++ b/lib/cosProperty/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/cosProperty.xml b/lib/cosProperty/doc/src/cosProperty.xml
index 4dbbbad794..67116292d5 100644
--- a/lib/cosProperty/doc/src/cosProperty.xml
+++ b/lib/cosProperty/doc/src/cosProperty.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/fascicules.xml b/lib/cosProperty/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/cosProperty/doc/src/fascicules.xml
+++ b/lib/cosProperty/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
index eaf1100c4e..22b1a73d29 100644
--- a/lib/cosProperty/doc/src/notes.xml
+++ b/lib/cosProperty/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/cosProperty/doc/src/part.xml b/lib/cosProperty/doc/src/part.xml
index 210dad6920..c726c68e8b 100644
--- a/lib/cosProperty/doc/src/part.xml
+++ b/lib/cosProperty/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/part_notes.xml b/lib/cosProperty/doc/src/part_notes.xml
index 4e02ff4e55..74a1641e67 100644
--- a/lib/cosProperty/doc/src/part_notes.xml
+++ b/lib/cosProperty/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosProperty/doc/src/ref_man.xml b/lib/cosProperty/doc/src/ref_man.xml
index f69904e42f..9a1fd13758 100644
--- a/lib/cosProperty/doc/src/ref_man.xml
+++ b/lib/cosProperty/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/CosTime_TIO.xml b/lib/cosTime/doc/src/CosTime_TIO.xml
index 7b955c64e3..edc3324e0f 100644
--- a/lib/cosTime/doc/src/CosTime_TIO.xml
+++ b/lib/cosTime/doc/src/CosTime_TIO.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/CosTime_TimeService.xml b/lib/cosTime/doc/src/CosTime_TimeService.xml
index 66cfb694e6..a432f6ba10 100644
--- a/lib/cosTime/doc/src/CosTime_TimeService.xml
+++ b/lib/cosTime/doc/src/CosTime_TimeService.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/CosTime_UTO.xml b/lib/cosTime/doc/src/CosTime_UTO.xml
index 26e6eef978..9c29f8552d 100644
--- a/lib/cosTime/doc/src/CosTime_UTO.xml
+++ b/lib/cosTime/doc/src/CosTime_UTO.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml b/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml
index 2adf318674..8ce741334f 100644
--- a/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml
+++ b/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml b/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml
index 80f5fd1466..b1c1c5400d 100644
--- a/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml
+++ b/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/book.xml b/lib/cosTime/doc/src/book.xml
index f9d27f8d0b..b6c332d469 100644
--- a/lib/cosTime/doc/src/book.xml
+++ b/lib/cosTime/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/ch_contents.xml b/lib/cosTime/doc/src/ch_contents.xml
index 1e223f24fc..78d148eaaf 100644
--- a/lib/cosTime/doc/src/ch_contents.xml
+++ b/lib/cosTime/doc/src/ch_contents.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/ch_example.xml b/lib/cosTime/doc/src/ch_example.xml
index 9664331726..f0196cd465 100644
--- a/lib/cosTime/doc/src/ch_example.xml
+++ b/lib/cosTime/doc/src/ch_example.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/ch_install.xml b/lib/cosTime/doc/src/ch_install.xml
index fe2b25c2f6..e4a8476fcf 100644
--- a/lib/cosTime/doc/src/ch_install.xml
+++ b/lib/cosTime/doc/src/ch_install.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/ch_introduction.xml b/lib/cosTime/doc/src/ch_introduction.xml
index ca23168089..d6de5df38c 100644
--- a/lib/cosTime/doc/src/ch_introduction.xml
+++ b/lib/cosTime/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/cosTime.xml b/lib/cosTime/doc/src/cosTime.xml
index 978e048d48..dfb2c68602 100644
--- a/lib/cosTime/doc/src/cosTime.xml
+++ b/lib/cosTime/doc/src/cosTime.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/fascicules.xml b/lib/cosTime/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/cosTime/doc/src/fascicules.xml
+++ b/lib/cosTime/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/cosTime/doc/src/notes.xml b/lib/cosTime/doc/src/notes.xml
index f468f8aa53..c1d000a5ff 100644
--- a/lib/cosTime/doc/src/notes.xml
+++ b/lib/cosTime/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/cosTime/doc/src/part.xml b/lib/cosTime/doc/src/part.xml
index fe6a50c18d..cae3232e8d 100644
--- a/lib/cosTime/doc/src/part.xml
+++ b/lib/cosTime/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/part_notes.xml b/lib/cosTime/doc/src/part_notes.xml
index 3f45a11ea7..b0667abb38 100644
--- a/lib/cosTime/doc/src/part_notes.xml
+++ b/lib/cosTime/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTime/doc/src/ref_man.xml b/lib/cosTime/doc/src/ref_man.xml
index 18de68a4c3..1f4fb06c2c 100644
--- a/lib/cosTime/doc/src/ref_man.xml
+++ b/lib/cosTime/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Control.xml b/lib/cosTransactions/doc/src/CosTransactions_Control.xml
index 39cffa1889..998821c5d8 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_Control.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_Control.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Coordinator.xml b/lib/cosTransactions/doc/src/CosTransactions_Coordinator.xml
index e172951e4e..4b76ae19b8 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_Coordinator.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_Coordinator.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_RecoveryCoordinator.xml b/lib/cosTransactions/doc/src/CosTransactions_RecoveryCoordinator.xml
index 0222f3be86..339adac638 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_RecoveryCoordinator.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_RecoveryCoordinator.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Resource.xml b/lib/cosTransactions/doc/src/CosTransactions_Resource.xml
index 1f091a5092..cee0829710 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_Resource.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_Resource.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_SubtransactionAwareResource.xml b/lib/cosTransactions/doc/src/CosTransactions_SubtransactionAwareResource.xml
index 5878b41360..12115036bc 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_SubtransactionAwareResource.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_SubtransactionAwareResource.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Synchronization.xml b/lib/cosTransactions/doc/src/CosTransactions_Synchronization.xml
index cca0396e33..89a0eb97c4 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_Synchronization.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_Synchronization.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_Terminator.xml b/lib/cosTransactions/doc/src/CosTransactions_Terminator.xml
index c4457bcaa7..6f35235114 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_Terminator.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_Terminator.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_TransactionFactory.xml b/lib/cosTransactions/doc/src/CosTransactions_TransactionFactory.xml
index 7e93aa2964..e2e5b63bca 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_TransactionFactory.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_TransactionFactory.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/CosTransactions_TransactionalObject.xml b/lib/cosTransactions/doc/src/CosTransactions_TransactionalObject.xml
index 0e836f5818..a249a89c71 100644
--- a/lib/cosTransactions/doc/src/CosTransactions_TransactionalObject.xml
+++ b/lib/cosTransactions/doc/src/CosTransactions_TransactionalObject.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/book.xml b/lib/cosTransactions/doc/src/book.xml
index 785cf387c0..460b7cce9a 100644
--- a/lib/cosTransactions/doc/src/book.xml
+++ b/lib/cosTransactions/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/ch_contents.xml b/lib/cosTransactions/doc/src/ch_contents.xml
index 21cefda955..bf11e0137e 100644
--- a/lib/cosTransactions/doc/src/ch_contents.xml
+++ b/lib/cosTransactions/doc/src/ch_contents.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/ch_example.xml b/lib/cosTransactions/doc/src/ch_example.xml
index 026bfc467e..64fdf7293f 100644
--- a/lib/cosTransactions/doc/src/ch_example.xml
+++ b/lib/cosTransactions/doc/src/ch_example.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/ch_install.xml b/lib/cosTransactions/doc/src/ch_install.xml
index d4b64d3987..0de5db539b 100644
--- a/lib/cosTransactions/doc/src/ch_install.xml
+++ b/lib/cosTransactions/doc/src/ch_install.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/ch_introduction.xml b/lib/cosTransactions/doc/src/ch_introduction.xml
index b0e58c5528..7edd2a57d5 100644
--- a/lib/cosTransactions/doc/src/ch_introduction.xml
+++ b/lib/cosTransactions/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/ch_skeletons.xml b/lib/cosTransactions/doc/src/ch_skeletons.xml
index a6dd41f929..451db4ae70 100644
--- a/lib/cosTransactions/doc/src/ch_skeletons.xml
+++ b/lib/cosTransactions/doc/src/ch_skeletons.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/cosTransactions.xml b/lib/cosTransactions/doc/src/cosTransactions.xml
index f93004641f..9b1bc5c428 100644
--- a/lib/cosTransactions/doc/src/cosTransactions.xml
+++ b/lib/cosTransactions/doc/src/cosTransactions.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/fascicules.xml b/lib/cosTransactions/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/cosTransactions/doc/src/fascicules.xml
+++ b/lib/cosTransactions/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/cosTransactions/doc/src/notes.xml b/lib/cosTransactions/doc/src/notes.xml
index e375338a8f..eab402aee8 100644
--- a/lib/cosTransactions/doc/src/notes.xml
+++ b/lib/cosTransactions/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/cosTransactions/doc/src/part.xml b/lib/cosTransactions/doc/src/part.xml
index b5a8397525..a5331ceb05 100644
--- a/lib/cosTransactions/doc/src/part.xml
+++ b/lib/cosTransactions/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/part_notes.xml b/lib/cosTransactions/doc/src/part_notes.xml
index 16e1968093..8ccf52b17c 100644
--- a/lib/cosTransactions/doc/src/part_notes.xml
+++ b/lib/cosTransactions/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/cosTransactions/doc/src/ref_man.xml b/lib/cosTransactions/doc/src/ref_man.xml
index b662f30b28..663ccb06bc 100644
--- a/lib/cosTransactions/doc/src/ref_man.xml
+++ b/lib/cosTransactions/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile
index 13eebea6a9..2adcfd7f31 100644
--- a/lib/crypto/Makefile
+++ b/lib/crypto/Makefile
@@ -24,6 +24,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 #
 
 SUB_DIRECTORIES = src c_src doc/src
+static_lib: SUB_DIRECTORIES = c_src
 
 include vsn.mk
 VSN = $(CRYPTO_VSN)
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
index a20ddff05c..124d088056 100644
--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
@@ -70,6 +70,10 @@ RELSYSDIR = $(RELEASE_PATH)/lib/crypto-$(VSN)
 CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o
 CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o
 NIF_MAKEFILE = $(PRIVDIR)/Makefile
+CRYPTO_STATIC_OBJS = $(OBJDIR)/crypto_static$(TYPEMARKER).o\
+	$(OBJDIR)/crypto_callback_static$(TYPEMARKER).o
+
+NIF_ARCHIVE = $(LIBDIR)/crypto$(TYPEMARKER).a
 
 ifeq ($(findstring win32,$(TARGET)), win32)
 NIF_LIB = $(LIBDIR)/crypto$(TYPEMARKER).dll
@@ -97,7 +101,24 @@ CALLBACK_OBJS =
 CALLBACK_LIB =
 endif
 
+ifeq ($(USING_VC),yes)
+AR_OUT=-out:
+AR_FLAGS=
+else
+AR_OUT=
+ifeq ($(V),0)
+AR_FLAGS=rc
+else
+AR_FLAGS=rcv
+endif
+endif
+
+ifndef RANLIB
+RANLIB=true
+endif
+
 ALL_CFLAGS = $(TYPE_FLAGS) $(EXTRA_FLAGS) $(INCLUDES)
+ALL_STATIC_CFLAGS = $(DED_STATIC_CFLAGS) $(INCLUDES)
 
 # ----------------------------------------------------
 # Targets
@@ -107,6 +128,8 @@ _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
 debug opt valgrind: $(NIF_LIB) $(CALLBACK_LIB)
 
+static_lib: $(NIF_ARCHIVE)
+
 $(OBJDIR)/%$(TYPEMARKER).o: %.c
 	$(V_at)$(INSTALL_DIR) $(OBJDIR)
 	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
@@ -115,6 +138,14 @@ $(LIBDIR)/crypto$(TYPEMARKER).so: $(CRYPTO_OBJS)
 	$(V_at)$(INSTALL_DIR) $(LIBDIR)
 	$(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CRYPTO_LINK_LIB)
 
+$(OBJDIR)/%_static$(TYPEMARKER).o: %.c
+	$(V_at)$(INSTALL_DIR) $(OBJDIR)
+	$(V_CC) -c -o $@ $(ALL_STATIC_CFLAGS) $<
+
+$(LIBDIR)/crypto$(TYPEMARKER).a: $(CRYPTO_STATIC_OBJS)
+	$(V_AR) $(AR_FLAGS) $(AR_OUT)$@ $(CRYPTO_STATIC_OBJS)
+	$(V_RANLIB) $@
+
 $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRYPTO_OBJS)
 	$(V_at)$(INSTALL_DIR) $(LIBDIR)
 	$(V_LD) $(LDFLAGS) -o $@  $(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) $(CRYPTO_OBJS) -l$(SSL_CRYPTO_LIBNAME) -l$(SSL_SSL_LIBNAME)
@@ -145,8 +176,11 @@ else
 	rm -f $(LIBDIR)/crypto_callback.valgrind.so
 endif
 	rm -f $(OBJDIR)/crypto.o
+	rm -f $(OBJDIR)/crypto_static.o
 	rm -f $(OBJDIR)/crypto.debug.o
+	rm -f $(OBJDIR)/crypto_static.debug.o
 	rm -f $(OBJDIR)/crypto.valgrind.o
+	rm -f $(OBJDIR)/crypto_static.valgrind.o
 	rm -f $(OBJDIR)/crypto_callback.o
 	rm -f $(OBJDIR)/crypto_callback.debug.o
 	rm -f $(OBJDIR)/crypto_callback.valgrind.o
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 35de3dbf0c..2e1a21178f 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -1,7 +1,7 @@
 /* 
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2010-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2010-2014. All Rights Reserved.
  *
  * The 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,12 +81,18 @@
 # define HAVE_EC
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= 0x0090803fL
+# define HAVE_AES_IGE
+#endif
+
 #if defined(HAVE_EC)
 #include <openssl/ec.h>
 #include <openssl/ecdh.h>
 #include <openssl/ecdsa.h>
 #endif
 
+
+
 #ifdef VALGRIND
     #  include <valgrind/memcheck.h>
 
@@ -221,6 +227,7 @@ static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
 static ERL_NIF_TERM dss_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM aes_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rc4_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM rc4_set_key(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -242,8 +249,6 @@ static ERL_NIF_TERM bf_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 static ERL_NIF_TERM bf_ecb_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM blowfish_ofb64_encrypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
-static ERL_NIF_TERM ec_key_to_term_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
-static ERL_NIF_TERM term_to_ec_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM ecdsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 static ERL_NIF_TERM ecdsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
@@ -251,7 +256,7 @@ static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF
 
 
 /* helpers */
-static void init_algorithms_types(void);
+static void init_algorithms_types(ErlNifEnv*);
 static void init_digest_types(ErlNifEnv* env);
 static void hmac_md5(unsigned char *key, int klen,
 		     unsigned char *dbuf, int dlen, 
@@ -351,6 +356,7 @@ static ErlNifFunc nif_funcs[] = {
     {"dss_verify_nif", 4, dss_verify_nif},
     {"rsa_verify_nif", 4, rsa_verify_nif},
     {"aes_cbc_crypt", 4, aes_cbc_crypt},
+    {"aes_ige_crypt_nif", 4, aes_ige_crypt_nif},
     {"do_exor", 2, do_exor},
     {"rc4_encrypt", 2, rc4_encrypt},
     {"rc4_set_key", 1, rc4_set_key},
@@ -372,111 +378,12 @@ static ErlNifFunc nif_funcs[] = {
     {"bf_ecb_crypt", 3, bf_ecb_crypt},
     {"blowfish_ofb64_encrypt", 3, blowfish_ofb64_encrypt},
 
-    {"ec_key_to_term_nif", 1, ec_key_to_term_nif},
-    {"term_to_ec_key_nif", 3, term_to_ec_key_nif},
     {"ec_key_generate", 1, ec_key_generate},
-    {"ecdsa_sign_nif", 3, ecdsa_sign_nif},
-    {"ecdsa_verify_nif", 4, ecdsa_verify_nif},
-    {"ecdh_compute_key_nif", 2, ecdh_compute_key_nif}
-};
-
-#if defined(HAVE_EC)
-struct nid_map {
-    char *name;
-    int nid;
-    ERL_NIF_TERM atom;
-};
-
-static struct nid_map ec_curves[] = {
-    /* prime field curves */
-    /* secg curves */
-    { "secp112r1", NID_secp112r1 },
-    { "secp112r2", NID_secp112r2 },
-    { "secp128r1", NID_secp128r1 },
-    { "secp128r2", NID_secp128r2 },
-    { "secp160k1", NID_secp160k1 },
-    { "secp160r1", NID_secp160r1 },
-    { "secp160r2", NID_secp160r2 },
-    /* SECG secp192r1 is the same as X9.62 prime192v1 */
-    { "secp192r1", NID_X9_62_prime192v1 },
-    { "secp192k1", NID_secp192k1 },
-    { "secp224k1", NID_secp224k1 },
-    { "secp224r1", NID_secp224r1 },
-    { "secp256k1", NID_secp256k1 },
-    /* SECG secp256r1 is the same as X9.62 prime256v1 */
-    { "secp256r1", NID_X9_62_prime256v1 },
-    { "secp384r1", NID_secp384r1 },
-    { "secp521r1", NID_secp521r1 },
-    /* X9.62 curves */
-    { "prime192v1", NID_X9_62_prime192v1 },
-    { "prime192v2", NID_X9_62_prime192v2 },
-    { "prime192v3", NID_X9_62_prime192v3 },
-    { "prime239v1", NID_X9_62_prime239v1 },
-    { "prime239v2", NID_X9_62_prime239v2 },
-    { "prime239v3", NID_X9_62_prime239v3 },
-    { "prime256v1", NID_X9_62_prime256v1 },
-    /* characteristic two field curves */
-    /* NIST/SECG curves */
-    { "sect113r1", NID_sect113r1 },
-    { "sect113r2", NID_sect113r2 },
-    { "sect131r1", NID_sect131r1 },
-    { "sect131r2", NID_sect131r2 },
-    { "sect163k1", NID_sect163k1 },
-    { "sect163r1", NID_sect163r1 },
-    { "sect163r2", NID_sect163r2 },
-    { "sect193r1", NID_sect193r1 },
-    { "sect193r2", NID_sect193r2 },
-    { "sect233k1", NID_sect233k1 },
-    { "sect233r1", NID_sect233r1 },
-    { "sect239k1", NID_sect239k1 },
-    { "sect283k1", NID_sect283k1 },
-    { "sect283r1", NID_sect283r1 },
-    { "sect409k1", NID_sect409k1 },
-    { "sect409r1", NID_sect409r1 },
-    { "sect571k1", NID_sect571k1 },
-    { "sect571r1", NID_sect571r1 },
-    /* X9.62 curves */
-    { "c2pnb163v1", NID_X9_62_c2pnb163v1 },
-    { "c2pnb163v2", NID_X9_62_c2pnb163v2 },
-    { "c2pnb163v3", NID_X9_62_c2pnb163v3 },
-    { "c2pnb176v1", NID_X9_62_c2pnb176v1 },
-    { "c2tnb191v1", NID_X9_62_c2tnb191v1 },
-    { "c2tnb191v2", NID_X9_62_c2tnb191v2 },
-    { "c2tnb191v3", NID_X9_62_c2tnb191v3 },
-    { "c2pnb208w1", NID_X9_62_c2pnb208w1 },
-    { "c2tnb239v1", NID_X9_62_c2tnb239v1 },
-    { "c2tnb239v2", NID_X9_62_c2tnb239v2 },
-    { "c2tnb239v3", NID_X9_62_c2tnb239v3 },
-    { "c2pnb272w1", NID_X9_62_c2pnb272w1 },
-    { "c2pnb304w1", NID_X9_62_c2pnb304w1 },
-    { "c2tnb359v1", NID_X9_62_c2tnb359v1 },
-    { "c2pnb368w1", NID_X9_62_c2pnb368w1 },
-    { "c2tnb431r1", NID_X9_62_c2tnb431r1 },
-    /* the WAP/WTLS curves
-     * [unlike SECG, spec has its own OIDs for curves from X9.62] */
-    { "wtls1", NID_wap_wsg_idm_ecid_wtls1 },
-    { "wtls3", NID_wap_wsg_idm_ecid_wtls3 },
-    { "wtls4", NID_wap_wsg_idm_ecid_wtls4 },
-    { "wtls5", NID_wap_wsg_idm_ecid_wtls5 },
-    { "wtls6", NID_wap_wsg_idm_ecid_wtls6 },
-    { "wtls7", NID_wap_wsg_idm_ecid_wtls7 },
-    { "wtls8", NID_wap_wsg_idm_ecid_wtls8 },
-    { "wtls9", NID_wap_wsg_idm_ecid_wtls9 },
-    { "wtls10", NID_wap_wsg_idm_ecid_wtls10 },
-    { "wtls11", NID_wap_wsg_idm_ecid_wtls11 },
-    { "wtls12", NID_wap_wsg_idm_ecid_wtls12 },
-    /* IPSec curves */
-    { "ipsec3", NID_ipsec3 },
-    { "ipsec4", NID_ipsec4 }
+    {"ecdsa_sign_nif", 4, ecdsa_sign_nif},
+    {"ecdsa_verify_nif", 5, ecdsa_verify_nif},
+    {"ecdh_compute_key_nif", 3, ecdh_compute_key_nif}
 };
 
-#define EC_CURVES_CNT (sizeof(ec_curves)/sizeof(struct nid_map))
-
-struct nif_ec_key {
-    EC_KEY *key;
-};
-#endif
-
 ERL_NIF_INIT(crypto,nif_funcs,load,NULL,upgrade,unload)
 
 
@@ -528,19 +435,24 @@ static ERL_NIF_TERM atom_none;
 static ERL_NIF_TERM atom_notsup;
 static ERL_NIF_TERM atom_digest;
 
-static ERL_NIF_TERM atom_ec;
-
 #if defined(HAVE_EC)
+static ERL_NIF_TERM atom_ec;
 static ERL_NIF_TERM atom_prime_field;
 static ERL_NIF_TERM atom_characteristic_two_field;
 static ERL_NIF_TERM atom_tpbasis;
 static ERL_NIF_TERM atom_ppbasis;
 static ERL_NIF_TERM atom_onbasis;
-
-static ErlNifResourceType* res_type_ec_key;
-static void ec_key_dtor(ErlNifEnv* env, void* obj);
 #endif
 
+static ErlNifResourceType* hmac_context_rtype;
+struct hmac_context
+{
+    ErlNifMutex* mtx;
+    int alive;
+    HMAC_CTX ctx;
+};
+static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context*);
+
 /*
 #define PRINTF_ERR0(FMT) enif_fprintf(stderr, FMT "\n")
 #define PRINTF_ERR1(FMT, A1) enif_fprintf(stderr, FMT "\n", A1)
@@ -549,16 +461,20 @@ static void ec_key_dtor(ErlNifEnv* env, void* obj);
 #define PRINTF_ERR1(FMT,A1)
 
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
-static int change_basename(char* buf, int bufsz, const char* newfile)
+static int change_basename(ErlNifBinary* bin, char* buf, int bufsz, const char* newfile)
 {
-    char* p = strrchr(buf, '/');
-    p = (p == NULL) ? buf : p + 1;
+    int i;
     
-    if ((p - buf) + strlen(newfile) >= bufsz) {
+    for (i = bin->size; i > 0; i--) {
+	if (bin->data[i-1] == '/')
+	    break;
+    }
+    if (i + strlen(newfile) >= bufsz) {
 	PRINTF_ERR0("CRYPTO: lib name too long");
 	return 0;
     }
-    strcpy(p, newfile);
+    memcpy(buf, bin->data, i);
+    strcpy(buf+i, newfile);
     return 1;
 }
 
@@ -570,7 +486,6 @@ static void error_handler(void* null, const char* errstr)
 
 static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
 {
-    int i;
     ErlNifSysInfo sys_info;
     get_crypto_callbacks_t* funcp;
     struct crypto_callbacks* ccb;
@@ -578,25 +493,28 @@ static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
     int tpl_arity;
     const ERL_NIF_TERM* tpl_array;
     int vernum;
+    ErlNifBinary lib_bin;
     char lib_buf[1000];
 
-    /* load_info: {201, "/full/path/of/this/library"} */
+    /* load_info: {301, <<"/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) {
+	|| vernum != 301
+	|| !enif_inspect_binary(env, tpl_array[1], &lib_bin)) {
 
 	PRINTF_ERR1("CRYPTO: Invalid load_info '%T'", load_info);
 	return 0;
     }
 
-#if defined(HAVE_EC)
-    res_type_ec_key = enif_open_resource_type(env,NULL,"crypto.EC_KEY",
-					      ec_key_dtor,
-					      ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
-					      NULL);
-#endif
+    hmac_context_rtype = enif_open_resource_type(env, NULL, "hmac_context",
+						 (ErlNifResourceDtor*) hmac_context_dtor,
+						 ERL_NIF_RT_CREATE|ERL_NIF_RT_TAKEOVER,
+						 NULL);
+    if (!hmac_context_rtype) {
+	PRINTF_ERR0("CRYPTO: Could not open resource type 'hmac_context'");
+	return 0;
+    }
 
     if (library_refc > 0) {
 	/* Repeated loading of this library (module upgrade).
@@ -638,18 +556,15 @@ static int init(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_tpbasis = enif_make_atom(env,"tpbasis");
     atom_ppbasis = enif_make_atom(env,"ppbasis");
     atom_onbasis = enif_make_atom(env,"onbasis");
-
-    for (i = 0; i < EC_CURVES_CNT; i++)
-	    ec_curves[i].atom =  enif_make_atom(env,ec_curves[i].name);
 #endif
 
     init_digest_types(env);
-    init_algorithms_types();
+    init_algorithms_types(env);
 
 #ifdef HAVE_DYNAMIC_CRYPTO_LIB
     {
 	void* handle;
-	if (!change_basename(lib_buf, sizeof(lib_buf), "crypto_callback")) {
+	if (!change_basename(&lib_bin, lib_buf, sizeof(lib_buf), "crypto_callback")) {
 	    return 0;
 	}
 	if (!(handle = enif_dlopen(lib_buf, &error_handler, NULL))) {
@@ -725,36 +640,61 @@ static void unload(ErlNifEnv* env, void* priv_data)
     --library_refc;
 }
 
-static int algos_cnt;
-static ERL_NIF_TERM algos[9];   /* increase when extending the list */
+static int algo_hash_cnt;
+static ERL_NIF_TERM algo_hash[8];   /* increase when extending the list */
+static int algo_pubkey_cnt;
+static ERL_NIF_TERM algo_pubkey[3]; /* increase when extending the list */
+static int algo_cipher_cnt;
+static ERL_NIF_TERM algo_cipher[2]; /* increase when extending the list */
 
-static void init_algorithms_types(void)
+static void init_algorithms_types(ErlNifEnv* env)
 {
-    algos_cnt = 0;
-    algos[algos_cnt++] = atom_md4;
-    algos[algos_cnt++] = atom_md5;
-    algos[algos_cnt++] = atom_sha;
-    algos[algos_cnt++] = atom_ripemd160;
+    algo_hash_cnt = 0;
+    algo_hash[algo_hash_cnt++] = atom_md4;
+    algo_hash[algo_hash_cnt++] = atom_md5;
+    algo_hash[algo_hash_cnt++] = atom_sha;
+    algo_hash[algo_hash_cnt++] = atom_ripemd160;
 #ifdef HAVE_SHA224
-    algos[algos_cnt++] = atom_sha224;
+    algo_hash[algo_hash_cnt++] = atom_sha224;
 #endif
 #ifdef HAVE_SHA256
-    algos[algos_cnt++] = atom_sha256;
+    algo_hash[algo_hash_cnt++] = atom_sha256;
 #endif
 #ifdef HAVE_SHA384
-    algos[algos_cnt++] = atom_sha384;
+    algo_hash[algo_hash_cnt++] = atom_sha384;
 #endif
 #ifdef HAVE_SHA512
-    algos[algos_cnt++] = atom_sha512;
+    algo_hash[algo_hash_cnt++] = atom_sha512;
 #endif
+
+    algo_pubkey_cnt = 0;
 #if defined(HAVE_EC)
-    algos[algos_cnt++] = atom_ec;
+#if !defined(OPENSSL_NO_EC2M)
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env,"ec_gf2m");
+#endif
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env,"ecdsa");
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env,"ecdh");
+#endif
+
+    algo_cipher_cnt = 0;
+#ifdef HAVE_DES_ede3_cfb_encrypt
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env, "des3_cbf");
+#endif
+#ifdef HAVE_AES_IGE
+    algo_cipher[algo_cipher_cnt++] = enif_make_atom(env,"aes_ige256");
 #endif
+
+    ASSERT(algo_hash_cnt <= sizeof(algo_hash)/sizeof(ERL_NIF_TERM));
+    ASSERT(algo_pubkey_cnt <= sizeof(algo_pubkey)/sizeof(ERL_NIF_TERM));
+    ASSERT(algo_cipher_cnt <= sizeof(algo_cipher)/sizeof(ERL_NIF_TERM));
 }
 
 static ERL_NIF_TERM algorithms(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
-    return enif_make_list_from_array(env, algos, algos_cnt);
+    return enif_make_tuple3(env,
+			    enif_make_list_from_array(env, algo_hash, algo_hash_cnt),
+			    enif_make_list_from_array(env, algo_pubkey, algo_pubkey_cnt),
+			    enif_make_list_from_array(env, algo_cipher, algo_cipher_cnt));
 }
 
 static ERL_NIF_TERM info_lib(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
@@ -1358,11 +1298,19 @@ static ERL_NIF_TERM sha512_mac_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 #endif
 }
 
+static void hmac_context_dtor(ErlNifEnv* env, struct hmac_context *obj)
+{
+    if (obj->alive) {
+	HMAC_CTX_cleanup(&obj->ctx);
+	obj->alive = 0;
+    }
+    enif_mutex_destroy(obj->mtx);
+}
+
 static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Type, Key) */
     ErlNifBinary key;
-    ERL_NIF_TERM ret;
-    unsigned char * ctx_buf;
+    struct hmac_context* obj;
     const EVP_MD *md;
     
     if (argv[0] == atom_sha) md = EVP_sha1();
@@ -1387,60 +1335,63 @@ static ERL_NIF_TERM hmac_init(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[
 	return enif_make_badarg(env);
     }
 
-    ctx_buf = enif_make_new_binary(env, sizeof(HMAC_CTX), &ret);
-    HMAC_CTX_init((HMAC_CTX *) ctx_buf);
-    HMAC_Init((HMAC_CTX *) ctx_buf, key.data, key.size, md);
+    obj = enif_alloc_resource(hmac_context_rtype, sizeof(struct hmac_context));
+    obj->mtx = enif_mutex_create("crypto.hmac");
+    obj->alive = 1;
+    HMAC_CTX_init(&obj->ctx);
+    HMAC_Init(&obj->ctx, key.data, key.size, md);
 
-    return ret;
+    return enif_make_resource(env, obj);
 }
 
 static ERL_NIF_TERM hmac_update(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Context, Data) */
-    ErlNifBinary context, data;
-    ERL_NIF_TERM ret;
-    unsigned char * ctx_buf;
+    ErlNifBinary data;
+    struct hmac_context* obj;
     
-    if (!enif_inspect_binary(env, argv[0], &context)
-        || !enif_inspect_iolist_as_binary(env, argv[1], &data)
-        || context.size != sizeof(HMAC_CTX)) {
+    if (!enif_get_resource(env, argv[0], hmac_context_rtype, (void**)&obj)
+	|| !enif_inspect_iolist_as_binary(env, argv[1], &data)) {
+	return enif_make_badarg(env);
+    }
+    enif_mutex_lock(obj->mtx);
+    if (!obj->alive) {
+	enif_mutex_unlock(obj->mtx);
 	return enif_make_badarg(env);
     }
+    HMAC_Update(&obj->ctx, data.data, data.size);
+    enif_mutex_unlock(obj->mtx);
 
-    ctx_buf = enif_make_new_binary(env, sizeof(HMAC_CTX), &ret);
-    memcpy(ctx_buf, context.data, context.size);
-    HMAC_Update((HMAC_CTX *)ctx_buf, data.data, data.size);
     CONSUME_REDS(env,data);
-
-    return ret;
+    return argv[0];
 }
 
 static ERL_NIF_TERM hmac_final(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Context) or (Context, HashLen) */
-    ErlNifBinary context;
     ERL_NIF_TERM ret;
-    HMAC_CTX ctx;
+    struct hmac_context* obj;
     unsigned char mac_buf[EVP_MAX_MD_SIZE];
     unsigned char * mac_bin;
     unsigned int req_len = 0;
     unsigned int mac_len;
     
-    if (!enif_inspect_binary(env, argv[0], &context)) {
-	return enif_make_badarg(env);
-    }
-    if (argc == 2 && !enif_get_uint(env, argv[1], &req_len)) {
+    if (!enif_get_resource(env,argv[0],hmac_context_rtype, (void**)&obj)
+	|| (argc == 2 && !enif_get_uint(env, argv[1], &req_len))) {
 	return enif_make_badarg(env);
     }
 
-    if (context.size != sizeof(ctx)) {
-        return enif_make_badarg(env);
+    enif_mutex_lock(obj->mtx);
+    if (!obj->alive) {
+	enif_mutex_unlock(obj->mtx);
+	return enif_make_badarg(env);
     }
-    memcpy(&ctx, context.data, context.size);
     
-    HMAC_Final(&ctx, mac_buf, &mac_len);
-    HMAC_CTX_cleanup(&ctx);
+    HMAC_Final(&obj->ctx, mac_buf, &mac_len);
+    HMAC_CTX_cleanup(&obj->ctx);
+    obj->alive = 0;
+    enif_mutex_unlock(obj->mtx);
 
     if (argc == 2 && req_len < mac_len) { 
-        // Only truncate to req_len bytes if asked.
+        /* Only truncate to req_len bytes if asked. */
         mac_len = req_len;
     }
     mac_bin = enif_make_new_binary(env, mac_len, &ret);
@@ -1805,7 +1756,7 @@ static ERL_NIF_TERM rand_uniform_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
 
 static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Base,Exponent,Modulo,bin_hdr) */
-    BIGNUM *bn_base=NULL, *bn_exponent=NULL, *bn_modulo, *bn_result;
+    BIGNUM *bn_base=NULL, *bn_exponent=NULL, *bn_modulo=NULL, *bn_result;
     BN_CTX *bn_ctx;
     unsigned char* ptr;
     unsigned dlen;      
@@ -1820,6 +1771,7 @@ static ERL_NIF_TERM mod_exp_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM arg
 
 	if (bn_base) BN_free(bn_base);
 	if (bn_exponent) BN_free(bn_exponent);
+	if (bn_modulo) BN_free(bn_modulo);
 	return enif_make_badarg(env);
     }
     bn_result = BN_new();
@@ -2106,6 +2058,45 @@ static ERL_NIF_TERM aes_cbc_crypt(ErlNifEnv* env, int argc, const ERL_NIF_TERM a
     return ret;
 }
 
+static ERL_NIF_TERM aes_ige_crypt_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{/* (Key, IVec, Data, IsEncrypt) */
+#ifdef HAVE_AES_IGE
+    ErlNifBinary key_bin, ivec_bin, data_bin;
+    AES_KEY aes_key;
+    unsigned char ivec[32];
+    int i;
+    unsigned char* ret_ptr;
+    ERL_NIF_TERM ret;
+
+    if (!enif_inspect_iolist_as_binary(env, argv[0], &key_bin)
+       || (key_bin.size != 16 && key_bin.size != 32)
+       || !enif_inspect_binary(env, argv[1], &ivec_bin)
+       || ivec_bin.size != 32
+       || !enif_inspect_iolist_as_binary(env, argv[2], &data_bin)
+       || data_bin.size % 16 != 0) {
+
+       return enif_make_badarg(env);
+    }
+
+    if (argv[3] == atom_true) {
+       i = AES_ENCRYPT;
+       AES_set_encrypt_key(key_bin.data, key_bin.size*8, &aes_key);
+    }
+    else {
+       i = AES_DECRYPT;
+       AES_set_decrypt_key(key_bin.data, key_bin.size*8, &aes_key);
+    }
+
+    ret_ptr = enif_make_new_binary(env, data_bin.size, &ret);
+    memcpy(ivec, ivec_bin.data, 32); /* writable copy */
+    AES_ige_encrypt(data_bin.data, ret_ptr, data_bin.size, &aes_key, ivec, i);
+    CONSUME_REDS(env,data_bin);
+    return ret;
+#else
+    return atom_notsup;
+#endif
+}
+
 static ERL_NIF_TERM do_exor(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Data1, Data2) */
     ErlNifBinary d1, d2;
@@ -2616,7 +2607,7 @@ static ERL_NIF_TERM dh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 static ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {/* (Multiplier, Verifier, Generator, Exponent, Prime) */
     BIGNUM *bn_verifier = NULL;
-    BIGNUM *bn_exponent, *bn_generator, *bn_prime, *bn_multiplier, *bn_result;
+    BIGNUM *bn_exponent = NULL, *bn_generator = NULL, *bn_prime = NULL, *bn_multiplier = NULL, *bn_result;
     BN_CTX *bn_ctx;
     unsigned char* ptr;
     unsigned dlen;
@@ -2629,9 +2620,9 @@ static ERL_NIF_TERM srp_value_B_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 	|| !get_bn_from_bin(env, argv[4], &bn_prime)) {
 	if (bn_multiplier) BN_free(bn_multiplier);
 	if (bn_verifier) BN_free(bn_verifier);
-	if (bn_verifier) BN_free(bn_generator);
-	if (bn_verifier) BN_free(bn_exponent);
-	if (bn_verifier) BN_free(bn_prime);
+	if (bn_generator) BN_free(bn_generator);
+	if (bn_exponent) BN_free(bn_exponent);
+	if (bn_prime) BN_free(bn_prime);
 	return enif_make_badarg(env);
     }
 
@@ -2674,8 +2665,9 @@ static ERL_NIF_TERM srp_user_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_
         <premaster secret> = (B - (k * g^x)) ^ (a + (u * x)) % N
 */
     BIGNUM *bn_exponent = NULL, *bn_a = NULL;
-    BIGNUM *bn_u, *bn_multiplier, *bn_exp2, *bn_base,
-	*bn_prime, *bn_generator, *bn_B, *bn_result;
+    BIGNUM *bn_u = NULL, *bn_multiplier = NULL, *bn_exp2,
+        *bn_base, *bn_prime = NULL, *bn_generator = NULL,
+        *bn_B = NULL, *bn_result;
     BN_CTX *bn_ctx;
     unsigned char* ptr;
     unsigned dlen;
@@ -2754,7 +2746,7 @@ static ERL_NIF_TERM srp_host_secret_nif(ErlNifEnv* env, int argc, const ERL_NIF_
         <premaster secret> = (A * v^u) ^ b % N
 */
     BIGNUM *bn_b = NULL, *bn_verifier = NULL;
-    BIGNUM *bn_prime, *bn_A, *bn_u, *bn_base, *bn_result;
+    BIGNUM *bn_prime = NULL, *bn_A = NULL, *bn_u = NULL, *bn_base, *bn_result;
     BN_CTX *bn_ctx;
     unsigned char* ptr;
     unsigned dlen;
@@ -2902,21 +2894,9 @@ static ERL_NIF_TERM blowfish_ofb64_encrypt(ErlNifEnv* env, int argc, const ERL_N
 }
 
 #if defined(HAVE_EC)
-static int term2curve_id(ERL_NIF_TERM nid)
-{
-    int i;
-
-    for (i = 0; i < EC_CURVES_CNT; i++)
-	if (ec_curves[i].atom == nid)
-	    return ec_curves[i].nid;
-
-    return 0;
-}
-
 static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
 {
     EC_KEY *key = NULL;
-    int nid = 0;
     int c_arity = -1;
     const ERL_NIF_TERM* curve;
     ErlNifBinary seed;
@@ -2928,18 +2908,12 @@ static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
     EC_GROUP *group = NULL;
     EC_POINT *point = NULL;
 
-    if (enif_is_atom(env, curve_arg)) {
-	nid = term2curve_id(curve_arg);
-	if (nid == 0)
-	    return NULL;
-	key = EC_KEY_new_by_curve_name(nid);
-    }
-    else if (enif_is_tuple(env, curve_arg)
-	     && enif_get_tuple(env,curve_arg,&c_arity,&curve)
-	     && c_arity == 5
-	     && get_bn_from_bin(env, curve[3], &bn_order)
-	     && (curve[4] != atom_none && get_bn_from_bin(env, curve[4], &cofactor))) {
-	//* {Field, Prime, Point, Order, CoFactor} = Curve */
+    /* {Field, Prime, Point, Order, CoFactor} = Curve */
+    if (enif_is_tuple(env, curve_arg)
+	&& enif_get_tuple(env,curve_arg,&c_arity,&curve)
+	&& c_arity == 5
+	&& get_bn_from_bin(env, curve[3], &bn_order)
+	&& (curve[4] != atom_none && get_bn_from_bin(env, curve[4], &cofactor))) {
 
 	int f_arity = -1;
 	const ERL_NIF_TERM* field;
@@ -2973,6 +2947,8 @@ static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
 	    /* create the EC_GROUP structure */
 	    group = EC_GROUP_new_curve_GFp(p, a, b, NULL);
 
+#if !defined(OPENSSL_NO_EC2M)
+
 	} else if (f_arity == 3 && field[0] == atom_characteristic_two_field) {
 	    /* {characteristic_two_field, M, Basis} */
 
@@ -3031,6 +3007,7 @@ static EC_KEY* ec_key_new(ErlNifEnv* env, ERL_NIF_TERM curve_arg)
 		goto out_err;
 
 	    group = EC_GROUP_new_curve_GF2m(p, a, b, NULL);
+#endif
 	} else
 	    goto out_err;
 
@@ -3093,7 +3070,7 @@ static ERL_NIF_TERM bn2term(ErlNifEnv* env, const BIGNUM *bn)
     dlen = BN_num_bytes(bn);
     ptr = enif_make_new_binary(env, dlen, &ret);
     BN_bn2bin(bn, ptr);
-
+    ERL_VALGRIND_MAKE_MEM_DEFINED(ptr, dlen);
     return ret;
 }
 
@@ -3116,39 +3093,10 @@ static ERL_NIF_TERM point2term(ErlNifEnv* env,
 	enif_release_binary(&bin);
 	return enif_make_badarg(env);
     }
-
+    ERL_VALGRIND_MAKE_MEM_DEFINED(bin.data, bin.size);
     return enif_make_binary(env, &bin);
 }
-#endif
-
-static ERL_NIF_TERM ec_key_to_term_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{
-#if defined(HAVE_EC)
-    struct nif_ec_key *obj;
-    const EC_GROUP *group;
-    const EC_POINT *public_key;
-    const BIGNUM *priv_key = NULL;
-    ERL_NIF_TERM pub_key = atom_undefined;
-
-    if (!enif_get_resource(env, argv[0], res_type_ec_key, (void **)&obj))
-	    return enif_make_badarg(env);
-
-    group = EC_KEY_get0_group(obj->key);
-    public_key = EC_KEY_get0_public_key(obj->key);
-    priv_key = EC_KEY_get0_private_key(obj->key);
-
-    if (group) {
-	if (public_key)
-	    pub_key = point2term(env, group, public_key, EC_KEY_get_conv_form(obj->key));
-    }
-
-    return enif_make_tuple2(env, pub_key, bn2term(env, priv_key));
-#else
-    return atom_notsup;
-#endif
-}
 
-#if defined(HAVE_EC)
 static int term2point(ErlNifEnv* env, ERL_NIF_TERM term,
 		      EC_GROUP *group, EC_POINT **pptr)
 {
@@ -3176,24 +3124,22 @@ static int term2point(ErlNifEnv* env, ERL_NIF_TERM term,
 
     return ret;
 }
-#endif
 
-static ERL_NIF_TERM term_to_ec_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+static int get_ec_key(ErlNifEnv* env,
+		      ERL_NIF_TERM curve, ERL_NIF_TERM priv, ERL_NIF_TERM pub,
+		      EC_KEY** res)
 {
-#if defined(HAVE_EC)
-    ERL_NIF_TERM ret;
     EC_KEY *key = NULL;
     BIGNUM *priv_key = NULL;
     EC_POINT *pub_key = NULL;
-    struct nif_ec_key *obj;
     EC_GROUP *group = NULL;
 
-    if (!(argv[1] == atom_undefined || get_bn_from_bin(env, argv[1], &priv_key))
-	|| !(argv[2] == atom_undefined || enif_is_binary(env, argv[2]))) {
+    if (!(priv == atom_undefined || get_bn_from_bin(env, priv, &priv_key))
+	|| !(pub == atom_undefined || enif_is_binary(env, pub))) {
 	goto out_err;
     }
 
-    key = ec_key_new(env, argv[0]);
+    key = ec_key_new(env, curve);
 
     if (!key) {
 	goto out_err;
@@ -3202,12 +3148,12 @@ static ERL_NIF_TERM term_to_ec_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
     if (!group)
 	group = EC_GROUP_dup(EC_KEY_get0_group(key));
 
-    if (term2point(env, argv[2], group, &pub_key)) {
+    if (term2point(env, pub, group, &pub_key)) {
 	    if (!EC_KEY_set_public_key(key, pub_key)) {
 		    goto out_err;
 	    }
     }
-    if (argv[1] != atom_undefined
+    if (priv != atom_undefined
 	&& !BN_is_zero(priv_key)) {
 	    if (!EC_KEY_set_private_key(key, priv_key))
 		    goto out_err;
@@ -3226,19 +3172,11 @@ static ERL_NIF_TERM term_to_ec_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_T
 	    }
     }
 
-    obj = enif_alloc_resource(res_type_ec_key, sizeof(struct nif_ec_key));
-    if (!obj)
-	goto out_err;
-
-    obj->key = key;
-    ret = enif_make_resource(env, obj);
-    enif_release_resource(obj);
-
     goto out;
 
 out_err:
     if (key) EC_KEY_free(key);
-    ret = enif_make_badarg(env);
+    key = NULL;
 
 out:
     /* some OpenSSL structures are mem-dup'ed into the key,
@@ -3246,11 +3184,12 @@ out:
     if (priv_key) BN_clear_free(priv_key);
     if (pub_key) EC_POINT_free(pub_key);
     if (group) EC_GROUP_free(group);
-    return ret;
-#else
-    return atom_notsup;
-#endif
+    if (!key)
+	return 0;
+    *res = key;
+    return 1;
 }
+#endif /* HAVE_EC */
 
 static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
@@ -3258,14 +3197,21 @@ static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM
     EC_KEY *key = ec_key_new(env, argv[0]);
 
     if (key && EC_KEY_generate_key(key)) {
-	ERL_NIF_TERM term;
-	struct nif_ec_key *obj = enif_alloc_resource(res_type_ec_key, sizeof(struct nif_ec_key));
-	if (!obj)
-	    return atom_error;
-	obj->key = key;
-	term = enif_make_resource(env, obj);
-	enif_release_resource(obj);
-	return term;
+	const EC_GROUP *group;
+	const EC_POINT *public_key;
+	ERL_NIF_TERM priv_key;
+	ERL_NIF_TERM pub_key = atom_undefined;
+
+	group = EC_KEY_get0_group(key);
+	public_key = EC_KEY_get0_public_key(key);
+
+	if (group && public_key) {
+	    pub_key = point2term(env, group, public_key,
+				 EC_KEY_get_conv_form(key));
+	}
+	priv_key = bn2term(env, EC_KEY_get0_private_key(key));
+	EC_KEY_free(key);
+	return enif_make_tuple2(env, pub_key, priv_key);
     }
     else
 	return enif_make_badarg(env);
@@ -3274,21 +3220,13 @@ static ERL_NIF_TERM ec_key_generate(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 #endif
 }
 
-#if defined(HAVE_EC)
-static void ec_key_dtor(ErlNifEnv* env, void* obj)
-{
-    struct nif_ec_key *key = (struct nif_ec_key*) obj;
-    EC_KEY_free(key->key);
-}
-#endif
-
 static ERL_NIF_TERM ecdsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data|{digest,Digest}, Key) */
+{/* (Type, Data|{digest,Digest}, Curve, Key) */
 #if defined(HAVE_EC)
     ErlNifBinary data_bin, ret_bin;
     unsigned char hmacbuf[SHA_DIGEST_LENGTH];
     unsigned int dsa_s_len;
-    struct nif_ec_key *obj;
+    EC_KEY* key = NULL;
     int i;
     const ERL_NIF_TERM* tpl_terms;
     int tpl_arity;
@@ -3303,30 +3241,32 @@ static ERL_NIF_TERM ecdsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 	return atom_notsup;
     }
 
-    if (!enif_get_resource(env, argv[2], res_type_ec_key, (void **)&obj))
-	return enif_make_badarg(env);
+    if (!get_ec_key(env, argv[2], argv[3], atom_undefined, &key))
+      goto badarg;
 
     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);
+	    goto badarg;
 	}
 	digest = data_bin.data;
     }
     else {
 	if (!enif_inspect_binary(env,argv[1],&data_bin)) {
-	    return enif_make_badarg(env);
+	    goto badarg;
 	}
 	digest = hmacbuf;
 	digp->funcp(data_bin.data, data_bin.size, digest);
     }
 
-    enif_alloc_binary(ECDSA_size(obj->key), &ret_bin);
+    enif_alloc_binary(ECDSA_size(key), &ret_bin);
 
     i = ECDSA_sign(digp->NID_type, digest, digp->len,
-		   ret_bin.data, &dsa_s_len, obj->key);
+		   ret_bin.data, &dsa_s_len, key);
+
+    EC_KEY_free(key);
     if (i) {
 	if (dsa_s_len != ret_bin.size) {
 	    enif_realloc_binary(&ret_bin, dsa_s_len);
@@ -3337,18 +3277,23 @@ static ERL_NIF_TERM ecdsa_sign_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM
 	enif_release_binary(&ret_bin);
 	return atom_error;
     }
+
+badarg:
+    if (key)
+	EC_KEY_free(key);
+    return enif_make_badarg(env);
 #else
     return atom_notsup;
 #endif
 }
 
 static ERL_NIF_TERM ecdsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
-{/* (Type, Data|{digest,Digest}, Signature, Key) */
+{/* (Type, Data|{digest,Digest}, Signature, Curve, Key) */
 #if defined(HAVE_EC)
     ErlNifBinary data_bin, sign_bin;
     unsigned char hmacbuf[SHA512_LEN];
     int i;
-    struct nif_ec_key *obj;
+    EC_KEY* key = NULL;
     const ERL_NIF_TERM type = argv[0];
     const ERL_NIF_TERM* tpl_terms;
     int tpl_arity;
@@ -3364,15 +3309,15 @@ static ERL_NIF_TERM ecdsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
     }
 
     if (!enif_inspect_binary(env, argv[2], &sign_bin)
-	|| !enif_get_resource(env, argv[3], res_type_ec_key, (void **)&obj))
-	return enif_make_badarg(env);
+	|| !get_ec_key(env, argv[3], atom_undefined, argv[4], &key))
+	goto badarg;
 
     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);
+	    goto badarg;
 	}
 	digest = data_bin.data;
     }
@@ -3381,13 +3326,20 @@ static ERL_NIF_TERM ecdsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
 	digp->funcp(data_bin.data, data_bin.size, digest);
     }
     else {
-	return enif_make_badarg(env);
+	goto badarg;
     }
 
     i = ECDSA_verify(digp->NID_type, digest, digp->len,
-		     sign_bin.data, sign_bin.size, obj->key);
+		     sign_bin.data, sign_bin.size, key);
+
+    EC_KEY_free(key);
 
     return (i==1 ? atom_true : atom_false);
+
+badarg:
+    if (key)
+	EC_KEY_free(key);
+    return enif_make_badarg(env);
 #else
     return atom_notsup;
 #endif
@@ -3398,24 +3350,24 @@ static ERL_NIF_TERM ecdsa_verify_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER
   (_OthersPublicKey, _MyEC_Point)
 */
 static ERL_NIF_TERM ecdh_compute_key_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+/* (OtherPublicKey, Curve, My) */
 {
 #if defined(HAVE_EC)
     ERL_NIF_TERM ret;
     unsigned char *p;
-    struct nif_ec_key *other_key;
+    EC_KEY* key = NULL;
     int field_size = 0;
     int i;
-
     EC_GROUP *group;
     const BIGNUM *priv_key;
     EC_POINT *my_ecpoint;
     EC_KEY *other_ecdh = NULL;
 
-    if (!enif_get_resource(env, argv[1], res_type_ec_key, (void **)&other_key))
+    if (!get_ec_key(env, argv[1], argv[2], atom_undefined, &key))
 	return enif_make_badarg(env);
 
-    group    = EC_GROUP_dup(EC_KEY_get0_group(other_key->key));
-    priv_key = EC_KEY_get0_private_key(other_key->key);
+    group    = EC_GROUP_dup(EC_KEY_get0_group(key));
+    priv_key = EC_KEY_get0_private_key(key);
 
     if (!term2point(env, argv[0], group, &my_ecpoint)) {
 	goto out_err;
@@ -3439,6 +3391,7 @@ out:
     if (group) EC_GROUP_free(group);
     if (my_ecpoint) EC_POINT_free(my_ecpoint);
     if (other_ecdh) EC_KEY_free(other_ecdh);
+    if (key) EC_KEY_free(key);
 
     return ret;
 
diff --git a/lib/crypto/c_src/crypto_callback.c b/lib/crypto/c_src/crypto_callback.c
index 81106b4cc2..a08dcec463 100644
--- a/lib/crypto/c_src/crypto_callback.c
+++ b/lib/crypto/c_src/crypto_callback.c
@@ -1,7 +1,7 @@
 /* 
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2012. All Rights Reserved.
+ * Copyright Ericsson AB 2014. All Rights Reserved.
  *
  * The 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,6 +17,7 @@
  * %CopyrightEnd%
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <openssl/opensslconf.h>
 
@@ -51,13 +52,28 @@ DLLEXPORT struct crypto_callbacks* get_crypto_callbacks(int nlocks);
 
 static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */
 
+static void nomem(size_t size, const char* op)
+{
+    fprintf(stderr, "Out of memory abort. Crypto failed to %s %zu bytes.\r\n",
+	    op, size);
+    abort();
+}
+
 static void* crypto_alloc(size_t size)
 {
-    return enif_alloc(size);
+    void *ret = enif_alloc(size);
+
+    if (!ret && size)
+	nomem(size, "allocate");
+    return ret;
 }
 static void* crypto_realloc(void* ptr, size_t size)
 {
-    return enif_realloc(ptr, size);
+    void* ret = enif_realloc(ptr, size);
+
+    if (!ret && size)
+	nomem(size, "reallocate");
+    return ret;
 }
 static void crypto_free(void* ptr)
 {
diff --git a/lib/crypto/doc/src/book.xml b/lib/crypto/doc/src/book.xml
index f07208482c..c477791bf2 100644
--- a/lib/crypto/doc/src/book.xml
+++ b/lib/crypto/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 99d167bfa9..c95827c371 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2013</year>
+      <year>1999</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -99,7 +99,9 @@
 
     <p><code>ecdh_private() = key_value() </code></p>
 
-    <p><code>ecdh_params() =  ec_named_curve() |
+    <p><code>ecdh_params() =  ec_named_curve() | ec_explicit_curve()</code></p>
+
+    <p><code>ec_explicit_curve() =
     {ec_field(), Prime :: key_value(), Point :: key_value(), Order :: integer(), CoFactor :: none | integer()} </code></p>
 
     <p><code>ec_field() = {prime_field, Prime :: integer()} |
@@ -114,11 +116,19 @@
       secp192k1| secp160r2| secp128r2| secp128r1| sect233r1| sect233k1| sect193r2| sect193r1|
       sect131r2| sect131r1| sect283r1| sect283k1| sect163r2| secp256k1| secp160k1| secp160r1|
       secp112r2| secp112r1| sect113r2| sect113r1| sect239k1| sect163r1| sect163k1| secp256r1|
-      secp192r1 </code></p>
+      secp192r1|
+      brainpoolP160r1| brainpoolP160t1| brainpoolP192r1| brainpoolP192t1| brainpoolP224r1|
+      brainpoolP224t1| brainpoolP256r1| brainpoolP256t1| brainpoolP320r1| brainpoolP320t1|
+      brainpoolP384r1| brainpoolP384t1| brainpoolP512r1| brainpoolP512t1
+    </code>
+    Note that the <em>sect</em> curves are GF2m (characteristic two) curves and are only supported if the
+    underlying OpenSSL has support for them.
+    See also <seealso marker="#supports-0">crypto:supports/0</seealso>
+    </p>
 
      <p><code>stream_cipher() = rc4 | aes_ctr </code></p>
 
-     <p><code>block_cipher() =  aes_cbc128 | aes_cfb128 | blowfish_cbc |
+     <p><code>block_cipher() =  aes_cbc128 | aes_cfb128 | aes_ige256 | blowfish_cbc |
      blowfish_cfb64 | des_cbc | des_cfb | des3_cbc | des3_cbf
      | des_ede3 | rc2_cbc </code></p>
 
@@ -142,9 +152,12 @@
      Note that both md4 and md5 are recommended only for compatibility with existing applications.
      </p>
      <p><code> cipher_algorithms() = des_cbc | des_cfb |  des3_cbc | des3_cbf | des_ede3 |
-     blowfish_cbc | blowfish_cfb64 | aes_cbc128 | aes_cfb128| aes_cbc256 | rc2_cbc | aes_ctr| rc4  </code> </p>
-     <p><code> public_key_algorithms() =   rsa |dss | ecdsa | dh | ecdh </code> </p>
-     
+     blowfish_cbc | blowfish_cfb64 | aes_cbc128 | aes_cfb128| aes_cbc256 | aes_ige256 | rc2_cbc | aes_ctr| rc4  </code> </p>
+     <p><code> public_key_algorithms() =   rsa |dss | ecdsa | dh | ecdh | ec_gf2m</code>
+     Note that ec_gf2m is not strictly a public key algorithm, but a restriction on what curves are supported
+     with ecdsa and ecdh.
+     </p>
+
  </section>
 
   <funcs>
@@ -159,8 +172,9 @@
       </type>
       <desc>
         <p>Encrypt <c>PlainText</c>according to <c>Type</c> block cipher.
-	<c>IVec</c> is an arbitrary initializing vector.
-         </p>
+	<c>IVec</c> is an arbitrary initializing vector.</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>
 
@@ -175,8 +189,9 @@
       </type>
       <desc>
         <p>Decrypt <c>CipherText</c>according to <c>Type</c> block cipher.
-	<c>IVec</c> is an arbitrary initializing vector.
-         </p>
+	<c>IVec</c> is an arbitrary initializing vector.</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>
     
@@ -351,7 +366,11 @@
 	or to one of the functions <seealso marker="#hmac_final-1">hmac_final</seealso> and
 	<seealso marker="#hmac_final_n-2">hmac_final_n</seealso>
 	</p>
-
+	<warning><p>Do not use a <c>Context</c> as argument in more than one
+	call to	hmac_update or hmac_final. The semantics of reusing old contexts
+	in any way is undefined and could even crash the VM in earlier releases.
+	The reason for this limitation is a lack of support in the underlying
+	OpenSSL	API.</p></warning>
       </desc>
     </func>
 
@@ -437,17 +456,17 @@
     </func>
 
     <func>
-      <name>private_decrypt(Type, ChipherText, PrivateKey, Padding) -> PlainText</name>
-      <fsummary>Decrypts ChipherText using the private Key.</fsummary>
+      <name>private_decrypt(Type, CipherText, PrivateKey, Padding) -> PlainText</name>
+      <fsummary>Decrypts CipherText using the private Key.</fsummary>
       <type>
 	<v>Type = rsa</v>
-	<v>ChipherText = binary()</v>
+	<v>CipherText = binary()</v>
 	<v>PrivateKey = rsa_private()</v>
 	<v>Padding = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding | rsa_no_padding</v>
         <v>PlainText = binary()</v>
       </type>
       <desc>
-	<p>Decrypts the <c>ChipherText</c>, encrypted with
+	<p>Decrypts the <c>CipherText</c>, encrypted with
 	<seealso marker="#public_encrypt-4">public_encrypt/4</seealso> (or equivalent function)
 	  using the <c>PrivateKey</c>, and returns the
 	  plaintext (message digest). This is a low level signature  verification operation
@@ -458,7 +477,7 @@
     </func>
     
     <func>
-      <name>private_encrypt(Type, PlainText, PrivateKey, Padding) -> ChipherText</name>
+      <name>private_encrypt(Type, PlainText, PrivateKey, Padding) -> CipherText</name>
       <fsummary>Encrypts PlainText using the private Key.</fsummary>
       <type>
 	<v>Type = rsa</v>
@@ -469,7 +488,7 @@
 	used, where N is public modulus of the RSA key.</d>
 	<v>PrivateKey = rsa_private()</v>
 	<v>Padding = rsa_pkcs1_padding | rsa_no_padding</v>
-        <v>ChipherText = binary()</v>
+        <v>CipherText = binary()</v>
       </type>
       <desc>
 	<p>Encrypts the <c>PlainText</c> using the <c>PrivateKey</c>
@@ -481,17 +500,17 @@
       </desc>
     </func>
     <func>
-      <name>public_decrypt(Type, ChipherText, PublicKey, Padding) -> PlainText</name>
-      <fsummary>Decrypts ChipherText using the public Key.</fsummary>
+      <name>public_decrypt(Type, CipherText, PublicKey, Padding) -> PlainText</name>
+      <fsummary>Decrypts CipherText using the public Key.</fsummary>
       <type>
 	<v>Type = rsa</v>
-	<v>ChipherText = binary()</v>
+	<v>CipherText = binary()</v>
 	<v>PublicKey =  rsa_public() </v>
 	<v>Padding = rsa_pkcs1_padding | rsa_no_padding</v>
         <v>PlainText = binary()</v>
       </type>
       <desc>
-	<p>Decrypts the <c>ChipherText</c>, encrypted with
+	<p>Decrypts the <c>CipherText</c>, encrypted with
 	<seealso marker="#private_encrypt-4">private_encrypt/4</seealso>(or equivalent function)
 	  using the <c>PrivateKey</c>, and returns the
 	  plaintext (message digest). This is a low level signature verification operation
@@ -502,7 +521,7 @@
     </func>
 
     <func>
-      <name>public_encrypt(Type, PlainText, PublicKey, Padding) -> ChipherText</name>
+      <name>public_encrypt(Type, PlainText, PublicKey, Padding) -> CipherText</name>
       <fsummary>Encrypts PlainText using the public Key.</fsummary>
       <type>
 	<v>Type = rsa</v>
@@ -513,7 +532,7 @@
 	used, where N is public modulus of the RSA key.</d>
 	<v>PublicKey = rsa_public()</v>
 	<v>Padding = rsa_pkcs1_padding | rsa_pkcs1_oaep_padding | rsa_no_padding</v>
-        <v>ChipherText = binary()</v>
+        <v>CipherText = binary()</v>
       </type>
       <desc>
 	<p>Encrypts the <c>PlainText</c> (message digest) using the <c>PublicKey</c>
@@ -678,7 +697,29 @@
       </desc>
     </func>
 
-    
+    <func>
+      <name>ec_curves() -> EllipticCurveList </name>
+      <fsummary>Provide a list of available named elliptic curves.</fsummary>
+      <type>
+      <v>EllipticCurveList = [ec_named_curve()]</v>
+      </type>
+      <desc>
+        <p>Can be used to determine which named elliptic curves are supported.</p>
+      </desc>
+    </func>
+
+    <func>
+      <name>ec_curve(NamedCurve) -> EllipticCurve </name>
+      <fsummary>Get the defining parameters of a elliptic curve.</fsummary>
+      <type>
+      <v>NamedCurve = ec_named_curve()</v>
+      <v>EllipticCurve = ec_explicit_curve()</v>
+      </type>
+      <desc>
+        <p>Return the defining parameters of a elliptic curve.</p>
+      </desc>
+    </func>
+
   <func>
       <name>verify(Algorithm, DigestType, Msg, Signature, Key) -> boolean()</name>
       <fsummary>Verifies a digital signature.</fsummary>
diff --git a/lib/crypto/doc/src/fascicules.xml b/lib/crypto/doc/src/fascicules.xml
index 8fc250bc75..cbc266cd30 100644
--- a/lib/crypto/doc/src/fascicules.xml
+++ b/lib/crypto/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/crypto/doc/src/insidecover.xml b/lib/crypto/doc/src/insidecover.xml
index e7407b8052..bf2427afdf 100644
--- a/lib/crypto/doc/src/insidecover.xml
+++ b/lib/crypto/doc/src/insidecover.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE bookinsidecover SYSTEM "bookinsidecover.dtd">
 
 <bookinsidecover>
diff --git a/lib/crypto/doc/src/licenses.xml b/lib/crypto/doc/src/licenses.xml
index 0b791acfa2..1c77d1f115 100644
--- a/lib/crypto/doc/src/licenses.xml
+++ b/lib/crypto/doc/src/licenses.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 09ecc97ef7..53249479f1 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,38 @@
   </header>
   <p>This document describes the changes made to the Crypto application.</p>
 
+<section><title>Crypto 3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix uninitialized pointers in crypto (Thanks to Anthony
+	    Ramine)</p>
+          <p>
+	    Own Id: OTP-11510</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Crypto 3.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Refactor ecdsa cipher to simplify code and improve
+	    performance.</p>
+          <p>
+	    Own Id: OTP-11320</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 3.0</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/crypto/doc/src/ref_man.xml b/lib/crypto/doc/src/ref_man.xml
index f801221c81..d14ff053c9 100644
--- a/lib/crypto/doc/src/ref_man.xml
+++ b/lib/crypto/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/doc/src/release_notes.xml b/lib/crypto/doc/src/release_notes.xml
index 0a84ca1c15..4f9d448ad1 100644
--- a/lib/crypto/doc/src/release_notes.xml
+++ b/lib/crypto/doc/src/release_notes.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/doc/src/usersguide.xml b/lib/crypto/doc/src/usersguide.xml
index dc5bf520a9..e6fd291974 100644
--- a/lib/crypto/doc/src/usersguide.xml
+++ b/lib/crypto/doc/src/usersguide.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
index 574c2076f2..c185c159e5 100644
--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1999-2013. All Rights Reserved.
+# Copyright Ericsson AB 1999-2014. All Rights Reserved.
 #
 # The 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,10 +35,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/crypto-$(VSN)
 # ----------------------------------------------------
 
 MODULES= \
-	crypto_app \
 	crypto \
-	crypto_server \
-	crypto_sup
+	crypto_ec_curves
 
 HRL_FILES= 
 
diff --git a/lib/crypto/src/crypto.app.src b/lib/crypto/src/crypto.app.src
index 5548b6a1b5..d3084ff336 100644
--- a/lib/crypto/src/crypto.app.src
+++ b/lib/crypto/src/crypto.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The 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,15 +17,12 @@
 %% %CopyrightEnd%
 %%
 {application, crypto,
-   [{description, "CRYPTO version 2"},
+   [{description, "CRYPTO"},
     {vsn, "%VSN%"},
     {modules, [crypto,
-	       crypto_app,
-	       crypto_sup,
-	       crypto_server]},
-    {registered, [crypto_sup, crypto_server]},
+	       crypto_ec_curves]},
+    {registered, []},
     {applications, [kernel, stdlib]},
-    {env, []},
-    {mod, {crypto_app, []}}]}.
+    {env, []}]}.
 
 
diff --git a/lib/crypto/src/crypto.appup.src b/lib/crypto/src/crypto.appup.src
index 5b4ce5acee..42816773c1 100644
--- a/lib/crypto/src/crypto.appup.src
+++ b/lib/crypto/src/crypto.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %% 
 %% The 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,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
 {"%VSN%",
- [
-  {<<"2\\.*">>,  [{restart_application, crypto}]}		
-  {<<"1\\.*">>,  [{restart_application, crypto}]}
- ],
- [
-  {<<"2\\.*">>,  [{restart_application, crypto}]}	
-  {<<"1\\.*">>,  [{restart_application, crypto}]}
- ]}.
+ [{<<".*">>,[{restart_application, crypto}]}],
+ [{<<".*">>,[{restart_application, crypto}]}]
+}.
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index a093b45410..d953bd3bca 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -34,6 +34,7 @@
 -export([public_encrypt/4, private_decrypt/4]).
 -export([private_encrypt/4, public_decrypt/4]).
 -export([dh_generate_parameters/2, dh_check/1]). %% Testing see
+-export([ec_curve/1, ec_curves/0]).
 
 %% DEPRECATED
 %% Replaced by hash_*
@@ -183,7 +184,7 @@
 %%-type ec_key() :: {Curve :: ec_curve(), PrivKey :: binary() | undefined, PubKey :: ec_point() | undefined}.
 
 -on_load(on_load/0).
--define(CRYPTO_NIF_VSN,201).
+-define(CRYPTO_NIF_VSN,301).
 
 -define(nif_stub,nif_stub_error(?LINE)).
 nif_stub_error(Line) ->
@@ -204,20 +205,13 @@ stop() ->
     application:stop(crypto).
 
 supports()->
-    Algs = algorithms(),
-    PubKeyAlgs = 
-	case lists:member(ec, Algs) of
-	    true ->
-		{public_keys, [rsa, dss, ecdsa, dh, srp, ecdh]};
-	    false ->
-		{public_keys, [rsa, dss, dh, srp]}
-	end,
-    [{hashs, Algs -- [ec]},
-     {ciphers, [des_cbc, des_cfb,  des3_cbc, des3_cbf, des_ede3, blowfish_cbc,
+    {Hashs, PubKeys, Ciphers} = algorithms(),
+
+    [{hashs, Hashs},
+     {ciphers, [des_cbc, des_cfb, des3_cbc, des_ede3, blowfish_cbc,
 		blowfish_cfb64, blowfish_ofb64, blowfish_ecb, aes_cbc128, aes_cfb128,
-		aes_cbc256, rc2_cbc, aes_ctr, rc4
-	       ]},
-     PubKeyAlgs
+		aes_cbc256, rc2_cbc, aes_ctr, rc4] ++ Ciphers},
+     {public_keys, [rsa, dss, dh, srp] ++ PubKeys}
     ].
 
 info_lib() -> ?nif_stub.
@@ -309,13 +303,16 @@ block_encrypt(aes_cbc128, Key, Ivec, Data) ->
     aes_cbc_128_encrypt(Key, Ivec, Data);
 block_encrypt(aes_cbc256, Key, Ivec, Data) ->
     aes_cbc_256_encrypt(Key, Ivec, Data);
+block_encrypt(aes_ige256, Key, Ivec, Data) ->
+    aes_ige_256_encrypt(Key, Ivec, Data);
 block_encrypt(aes_cfb128, Key, Ivec, Data) ->
     aes_cfb_128_encrypt(Key, Ivec, Data);
 block_encrypt(rc2_cbc, Key, Ivec, Data) ->
     rc2_cbc_encrypt(Key, Ivec, Data).
 
 -spec block_decrypt(des_cbc | des_cfb | des3_cbc | des3_cbf | des_ede3 | blowfish_cbc |
-	      blowfish_cfb64 | blowfish_ofb64  | aes_cbc128 | aes_cbc256 | aes_cfb128 | rc2_cbc,
+	      blowfish_cfb64 | blowfish_ofb64  | aes_cbc128 | aes_cbc256 | aes_ige256 |
+          aes_cfb128 | rc2_cbc,
 	      Key::iodata(), Ivec::binary(), Data::iodata()) -> binary().
 
 block_decrypt(des_cbc, Key, Ivec, Data) ->
@@ -338,6 +335,8 @@ block_decrypt(aes_cbc128, Key, Ivec, Data) ->
     aes_cbc_128_decrypt(Key, Ivec, Data);
 block_decrypt(aes_cbc256, Key, Ivec, Data) ->
     aes_cbc_256_decrypt(Key, Ivec, Data);
+block_decrypt(aes_ige256, Key, Ivec, Data) ->
+    aes_ige_256_decrypt(Key, Ivec, Data);
 block_decrypt(aes_cfb128, Key, Ivec, Data) ->
     aes_cfb_128_decrypt(Key, Ivec, Data);
 block_decrypt(rc2_cbc, Key, Ivec, Data) ->
@@ -357,14 +356,16 @@ block_decrypt(des_ecb, Key, Data) ->
 block_decrypt(blowfish_ecb, Key, Data) ->
     blowfish_ecb_decrypt(Key, Data).
 
--spec next_iv(des_cbc | des3_cbc | aes_cbc, Data::iodata()) -> binary().
+-spec next_iv(des_cbc | des3_cbc | aes_cbc | aes_ige, Data::iodata()) -> binary().
 
 next_iv(des_cbc, Data) ->
     des_cbc_ivec(Data);
 next_iv(des3_cbc, Data) ->
     des_cbc_ivec(Data);
 next_iv(aes_cbc, Data) ->
-    aes_cbc_ivec(Data).
+    aes_cbc_ivec(Data);
+next_iv(aes_ige, Data) ->
+    aes_ige_ivec(Data).
 
 -spec next_iv(des_cfb, Data::iodata(), Ivec::binary()) -> binary().
 
@@ -455,7 +456,7 @@ verify(rsa, Type, DataOrDigest, Signature, Key) ->
 	Bool -> Bool
     end;
 verify(ecdsa, Type, DataOrDigest, Signature, [Key, Curve]) ->
-    case ecdsa_verify_nif(Type, DataOrDigest, Signature, term_to_ec_key(Curve, undefined, Key)) of
+    case ecdsa_verify_nif(Type, DataOrDigest, Signature, nif_curve_params(Curve), ensure_int_as_bin(Key)) of
 	notsup -> erlang:error(notsup);
 	Bool -> Bool
     end.
@@ -474,7 +475,7 @@ sign(dss, Type, DataOrDigest, Key) ->
 	Sign -> Sign
     end;
 sign(ecdsa, Type, DataOrDigest, [Key, Curve]) ->
-    case ecdsa_sign_nif(Type, DataOrDigest, term_to_ec_key(Curve, Key, undefined)) of
+    case ecdsa_sign_nif(Type, DataOrDigest, nif_curve_params(Curve), ensure_int_as_bin(Key)) of
 	error -> erlang:error(badkey, [Type,DataOrDigest,Key]);
 	Sign -> Sign
     end.
@@ -557,7 +558,7 @@ generate_key(srp, {user, [Generator, Prime, Version]}, PrivateArg)
     user_srp_gen_key(Private, Generator, Prime);
 
 generate_key(ecdh, Curve, undefined) ->
-    ec_key_to_term_nif(ec_key_generate(Curve)).
+    ec_key_generate(nif_curve_params(Curve)).
 
 
 compute_key(dh, OthersPublicKey, MyPrivateKey, DHParameters) ->
@@ -599,7 +600,8 @@ compute_key(srp, UserPublic, {HostPublic, HostPrivate},
 
 compute_key(ecdh, Others, My, Curve) ->
     ecdh_compute_key_nif(ensure_int_as_bin(Others),
-			 term_to_ec_key(Curve,My,undefined)).
+			 nif_curve_params(Curve),
+			 ensure_int_as_bin(My)).
 
 
 random_bytes(N) ->
@@ -639,7 +641,7 @@ on_load() ->
 		      end
 	      end,
     Lib = filename:join([PrivDir, "lib", LibName]),
-    Status = case erlang:load_nif(Lib, {?CRYPTO_NIF_VSN,Lib}) of
+    Status = case erlang:load_nif(Lib, {?CRYPTO_NIF_VSN,path2bin(Lib)}) of
 		 ok -> ok;
 		 {error, {load_failed, _}}=Error1 ->
 		     ArchLibDir =
@@ -651,7 +653,7 @@ on_load() ->
 			 [] -> Error1;
 			 _ ->
 			     ArchLib = filename:join([ArchLibDir, LibName]),
-			     erlang:load_nif(ArchLib, {?CRYPTO_NIF_VSN,ArchLib})
+			     erlang:load_nif(ArchLib, {?CRYPTO_NIF_VSN,path2bin(ArchLib)})
 		     end;
 		 Error1 -> Error1
 	     end,
@@ -662,6 +664,14 @@ on_load() ->
 				   "OpenSSL might not be installed on this system.~n",[E,Str]),
 	    Status
     end.
+
+path2bin(Path) when is_list(Path) ->
+    Encoding = file:native_name_encoding(),
+    case unicode:characters_to_binary(Path,Encoding,Encoding) of
+	Bin when is_binary(Bin) ->
+	    Bin
+    end.
+
 %%--------------------------------------------------------------------
 %%% Internal functions (some internal API functions are part of the deprecated API)
 %%--------------------------------------------------------------------
@@ -1254,6 +1264,41 @@ aes_cbc_ivec(Data) when is_list(Data) ->
     aes_cbc_ivec(list_to_binary(Data)).
 
 
+%%
+%% AES - with 256 bit key in infinite garble extension mode (IGE)
+%%
+
+-spec aes_ige_256_decrypt(iodata(), binary(), iodata()) ->
+                 binary().
+
+aes_ige_256_encrypt(Key, IVec, Data) ->
+    aes_ige_crypt(Key, IVec, Data, true).
+
+aes_ige_256_decrypt(Key, IVec, Data) ->
+    aes_ige_crypt(Key, IVec, Data, false).
+
+aes_ige_crypt(Key, IVec, Data, IsEncrypt) ->
+    case aes_ige_crypt_nif(Key,IVec,Data,IsEncrypt) of
+	notsup -> erlang:error(notsup);
+	Bin -> Bin
+    end.
+
+aes_ige_crypt_nif(_Key, _IVec, _Data, _IsEncrypt) -> ?nif_stub.
+
+%%
+%% aes_ige_ivec(Data) -> binary()
+%%
+%% Returns the IVec to be used in the next iteration of
+%% aes_ige_*_[encrypt|decrypt].
+%% IVec size: 32 bytes
+%%
+aes_ige_ivec(Data) when is_binary(Data) ->
+    {_, IVec} = split_binary(Data, size(Data) - 32),
+    IVec;
+aes_ige_ivec(Data) when is_list(Data) ->
+    aes_ige_ivec(list_to_binary(Data)).
+
+
 %% Stream ciphers --------------------------------------------------------------------
 
 stream_crypt(Fun, State, Data, Size, MaxByts, []) when Size =< MaxByts ->
@@ -1399,11 +1444,11 @@ srp_value_B_nif(_Multiplier, _Verifier, _Generator, _Exponent, _Prime) -> ?nif_s
 %% Digital signatures  --------------------------------------------------------------------
 rsa_sign_nif(_Type,_Data,_Key) -> ?nif_stub.
 dss_sign_nif(_Type,_Data,_Key) -> ?nif_stub.
-ecdsa_sign_nif(_Type, _DataOrDigest, _Key) -> ?nif_stub.
+ecdsa_sign_nif(_Type, _DataOrDigest, _Curve, _Key) -> ?nif_stub.
 
 dss_verify_nif(_Type, _Data, _Signature, _Key) -> ?nif_stub.
 rsa_verify_nif(_Type, _Data, _Signature, _Key) -> ?nif_stub.
-ecdsa_verify_nif(_Type, _DataOrDigest, _Signature, _Key) -> ?nif_stub.
+ecdsa_verify_nif(_Type, _DataOrDigest, _Signature, _Curve, _Key) -> ?nif_stub.
 
 %% Public Keys  --------------------------------------------------------------------
 %% DH Diffie-Hellman functions
@@ -1456,31 +1501,29 @@ dh_compute_key_nif(_OthersPublicKey, _MyPrivateKey, _DHParameters) -> ?nif_stub.
 
 ec_key_generate(_Key) -> ?nif_stub.
 
-ecdh_compute_key_nif(_Others, _My) -> ?nif_stub.
+ecdh_compute_key_nif(_Others, _Curve, _My) -> ?nif_stub.
+
+ec_curves() ->
+    crypto_ec_curves:curves().
+
+ec_curve(X) ->
+    crypto_ec_curves:curve(X).
 
 %%
 %% EC
 %%
-ec_key_to_term_nif(_Key) -> ?nif_stub.
 
 term_to_nif_prime({prime_field, Prime}) ->
-    {prime_field, int_to_bin(Prime)};
+    {prime_field, ensure_int_as_bin(Prime)};
 term_to_nif_prime(PrimeField) ->
     PrimeField.
 term_to_nif_curve({A, B, Seed}) ->
     {ensure_int_as_bin(A), ensure_int_as_bin(B), Seed}.
-term_to_nif_curve_parameters({PrimeField, Curve, BasePoint, Order, CoFactor}) ->
-    {term_to_nif_prime(PrimeField), term_to_nif_curve(Curve), ensure_int_as_bin(BasePoint), int_to_bin(Order), int_to_bin(CoFactor)};
-term_to_nif_curve_parameters(Curve) when is_atom(Curve) ->
+nif_curve_params({PrimeField, Curve, BasePoint, Order, CoFactor}) ->
+    {term_to_nif_prime(PrimeField), term_to_nif_curve(Curve), ensure_int_as_bin(BasePoint), ensure_int_as_bin(Order), ensure_int_as_bin(CoFactor)};
+nif_curve_params(Curve) when is_atom(Curve) ->
     %% named curve
-    Curve.
-
-term_to_ec_key(Curve, PrivKey, PubKey) ->
-    term_to_ec_key_nif(term_to_nif_curve_parameters(Curve),
-		       ensure_int_as_bin(PrivKey),
-		       ensure_int_as_bin(PubKey)).
-
-term_to_ec_key_nif(_Curve, _PrivKey, _PubKey) -> ?nif_stub.
+    crypto_ec_curves:curve(Curve).
 
 
 %% MISC --------------------------------------------------------------------
diff --git a/lib/crypto/src/crypto_app.erl b/lib/crypto/src/crypto_app.erl
deleted file mode 100644
index f1ea1406e4..0000000000
--- a/lib/crypto/src/crypto_app.erl
+++ /dev/null
@@ -1,39 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-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 : Application master for CRYPTO.
-
--module(crypto_app).
-
--behaviour(application).
-
--export([start/2, stop/1]).
-
-%% start/2(Type, StartArgs) -> {ok, Pid} | {ok, Pid, State} | 
-%%                             {error, Reason}
-%%
-start(_Type, _StartArgs) ->
-    crypto_sup:start_link().
-
-%% stop(State) -> void()
-%%
-stop(_State) ->
-    ok.
-
-
diff --git a/lib/crypto/src/crypto_ec_curves.erl b/lib/crypto/src/crypto_ec_curves.erl
new file mode 100644
index 0000000000..fe17643d96
--- /dev/null
+++ b/lib/crypto/src/crypto_ec_curves.erl
@@ -0,0 +1,1215 @@
+-module(crypto_ec_curves).
+
+-export([curve/1, curves/0]).
+
+curves() ->
+    CryptoSupport = crypto:supports(),
+    HasGF2m = proplists:get_bool(ec_gf2m,  proplists:get_value(public_keys, CryptoSupport)),
+    prime_curves() ++ characteristic_two_curves(HasGF2m).
+
+
+prime_curves() ->
+    [secp112r1,secp112r2,secp128r1,secp128r2,secp160k1,secp160r1,secp160r2,
+     secp192r1,secp192k1,secp224k1,secp224r1,secp256k1,secp256r1,secp384r1,
+     secp521r1,prime192v1,prime192v2,prime192v3,prime239v1,prime239v2,prime239v3,
+     prime256v1,wtls6,wtls7,wtls8,wtls9,wtls12,
+     brainpoolP160r1,brainpoolP160t1,brainpoolP192r1,brainpoolP192t1,
+     brainpoolP224r1,brainpoolP224t1,brainpoolP256r1,brainpoolP256t1,
+     brainpoolP320r1,brainpoolP320t1,brainpoolP384r1,brainpoolP384t1,
+     brainpoolP512r1,brainpoolP512t1].
+
+characteristic_two_curves(true) ->
+    [sect113r1,sect113r2,sect131r1,sect131r2,sect163k1,sect163r1,
+     sect163r2,sect193r1,sect193r2,sect233k1,sect233r1,sect239k1,sect283k1,
+     sect283r1,sect409k1,sect409r1,sect571k1,sect571r1,c2pnb163v1,c2pnb163v2,
+     c2pnb163v3,c2pnb176v1,c2tnb191v1,c2tnb191v2,c2tnb191v3,c2pnb208w1,c2tnb239v1,
+     c2tnb239v2,c2tnb239v3,c2pnb272w1,c2pnb304w1,c2tnb359v1,c2pnb368w1,c2tnb431r1,
+     wtls1,wtls3,wtls4,wtls5,wtls10,wtls11,ipsec3,ipsec4];
+characteristic_two_curves(_) ->
+    [].
+
+curve(secp112r1) ->
+    {
+     {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>},                                        %% Prime
+     {<<16#DB7C2ABF62E35E668076BEAD2088:112>>,                                                      %% A
+      <<16#659EF8BA043916EEDE8911702B22:112>>,                                                      %% B
+      <<16#00F50B028E4D696E676875615175290472783FB1:160>>},                                         %% Seed
+      <<16#04:8,
+        16#09487239995A5EE76B55F9C2F098:112,                                                        %% X(p0)
+        16#A89CE5AF8724C0A23E0E0FF77500:112>>,                                                      %% Y(p0)
+      <<16#DB7C2ABF62E35E7628DFAC6561C5:112>>,                                                      %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp112r2) ->
+    {
+     {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>},                                        %% Prime
+     {<<16#6127C24C05F38A0AAAF65C0EF02C:112>>,                                                      %% A
+      <<16#51DEF1815DB5ED74FCC34C85D709:112>>,                                                      %% B
+      <<16#002757A1114D696E6768756151755316C05E0BD4:160>>},                                         %% Seed
+      <<16#04:8,
+        16#4BA30AB5E892B4E1649DD0928643:112,                                                        %% X(p0)
+        16#ADCD46F5882E3747DEF36E956E97:112>>,                                                      %% Y(p0)
+      <<16#36DF0AAFD8B8D7597CA10520D04B:112>>,                                                      %% Order
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp128r1) ->
+    {
+     {prime_field, <<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF:128>>},                                    %% Prime
+     {<<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC:128>>,                                                  %% A
+      <<16#E87579C11079F43DD824993C2CEE5ED3:128>>,                                                  %% B
+      <<16#000E0D4D696E6768756151750CC03A4473D03679:160>>},                                         %% Seed
+      <<16#04:8,
+        16#161FF7528B899B2D0C28607CA52C5B86:128,                                                    %% X(p0)
+        16#CF5AC8395BAFEB13C02DA292DDED7A83:128>>,                                                  %% Y(p0)
+      <<16#FFFFFFFE0000000075A30D1B9038A115:128>>,                                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp128r2) ->
+    {
+     {prime_field, <<16#FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF:128>>},                                    %% Prime
+     {<<16#D6031998D1B3BBFEBF59CC9BBFF9AEE1:128>>,                                                  %% A
+      <<16#5EEEFCA380D02919DC2C6558BB6D8A5D:128>>,                                                  %% B
+      <<16#004D696E67687561517512D8F03431FCE63B88F4:160>>},                                         %% Seed
+      <<16#04:8,
+        16#7B6AA5D85E572983E6FB32A7CDEBC140:128,                                                    %% X(p0)
+        16#27B6916A894D3AEE7106FE805FC34B44:128>>,                                                  %% Y(p0)
+      <<16#3FFFFFFF7FFFFFFFBE0024720613B5A3:128>>,                                                  %% Order
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp160k1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>},                            %% Prime
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#07:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#3B4C382CE37AA192A4019E763036F4F5DD4D7EBB:160,                                            %% X(p0)
+        16#938CF935318FDCED6BC28286531733C3F03C4FEE:160>>,                                          %% Y(p0)
+      <<16#0100000000000000000001B8FA16DFAB9ACA16B6B3:168>>,                                        %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp160r1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF:160>>},                            %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC:160>>,                                          %% A
+      <<16#1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45:160>>,                                          %% B
+      <<16#1053CDE42C14D696E67687561517533BF3F83345:160>>},                                         %% Seed
+      <<16#04:8,
+        16#4A96B5688EF573284664698968C38BB913CBFC82:160,                                            %% X(p0)
+        16#23A628553168947D59DCC912042351377AC5FB32:160>>,                                          %% Y(p0)
+      <<16#0100000000000000000001F4C8F927AED3CA752257:168>>,                                        %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp160r2) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>},                            %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70:160>>,                                          %% A
+      <<16#B4E134D3FB59EB8BAB57274904664D5AF50388BA:160>>,                                          %% B
+      <<16#B99B99B099B323E02709A4D696E6768756151751:160>>},                                         %% Seed
+      <<16#04:8,
+        16#52DCB034293A117E1F4FF11B30F7199D3144CE6D:160,                                            %% X(p0)
+        16#FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E:160>>,                                          %% Y(p0)
+      <<16#0100000000000000000000351EE786A818F3A1A16B:168>>,                                        %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp192r1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>},                    %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>,                                  %% A
+      <<16#64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1:192>>,                                  %% B
+      <<16#3045AE6FC8422F64ED579528D38120EAE12196D5:160>>},                                         %% Seed
+      <<16#04:8,
+        16#188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012:192,                                    %% X(p0)
+        16#07192B95FFC8DA78631011ED6B24CDD573F977A11E794811:192>>,                                  %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831:192>>,                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp192k1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37:192>>},                    %% Prime
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#03:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D:192,                                    %% X(p0)
+        16#9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D:192>>,                                  %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D:192>>,                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp224k1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D:224>>},            %% Prime
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#05:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C:224,                            %% X(p0)
+        16#7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5:224>>,                          %% Y(p0)
+      <<16#010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7:232>>,                        %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp224r1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001:224>>},            %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE:224>>,                          %% A
+      <<16#B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4:224>>,                          %% B
+      <<16#BD71344799D5C7FCDC45B59FA3B9AB8F6A948BC5:160>>},                                         %% Seed
+      <<16#04:8,
+        16#B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21:224,                            %% X(p0)
+        16#BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34:224>>,                          %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D:224>>,                          %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp256k1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F:256>>},    %% Prime
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#07:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798:256,                    %% X(p0)
+        16#483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8:256>>,                  %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141:256>>,                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp256r1) ->
+    {
+     {prime_field, <<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF:256>>},    %% Prime
+     {<<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC:256>>,                  %% A
+      <<16#5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B:256>>,                  %% B
+      <<16#C49D360886E704936A6678E1139D26B7819F7E90:160>>},                                         %% Seed
+      <<16#04:8,
+        16#6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296:256,                    %% X(p0)
+        16#4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5:256>>,                  %% Y(p0)
+      <<16#FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551:256>>,                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp384r1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE:256,       %% Prime
+                     16#FFFFFFFF0000000000000000FFFFFFFF:128>>},
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE:256,                    %% A
+        16#FFFFFFFF0000000000000000FFFFFFFC:128>>,
+      <<16#B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875A:256,                    %% B
+        16#C656398D8A2ED19D2A85C8EDD3EC2AEF:128>>,
+      <<16#A335926AA319A27A1D00896A6773A4827ACDAC73:160>>},                                         %% Seed
+      <<16#04:8,
+        16#AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A38:256,                    %% X(p0)
+        16#5502F25DBF55296C3A545E3872760AB7:128,
+        16#3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C0:256,                    %% Y(p0)
+        16#0A60B1CE1D7E819D7A431D7C90EA0E5F:128>>,
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF:256,                    %% Order
+        16#581A0DB248B0A77AECEC196ACCC52973:128>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(secp521r1) ->
+    {
+     {prime_field, <<16#01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256,       %% Prime
+                     16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256,
+                     16#FFFF:16>>},
+     {<<16#01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256,                    %% A
+        16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256,
+        16#FFFC:16>>,
+      <<16#51953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109:256,                    %% B
+        16#E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F:256,
+        16#00:8>>,
+      <<16#D09E8800291CB85396CC6717393284AAA0DA64BA:160>>},                                         %% Seed
+      <<16#04:8,
+        16#00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D:256,                    %% X(p0)
+        16#3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5:256,
+        16#BD66:16,
+        16#011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E:256,                    %% Y(p0)
+        16#662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD1:256,
+        16#6650:16>>,
+      <<16#01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256,                    %% Order
+        16#FFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E9138:256,
+        16#6409:16>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(prime192v1) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>},                    %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>,                                  %% A
+      <<16#64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1:192>>,                                  %% B
+      <<16#3045AE6FC8422F64ED579528D38120EAE12196D5:160>>},                                         %% Seed
+      <<16#04:8,
+        16#188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012:192,                                    %% X(p0)
+        16#07192B95FFC8DA78631011ED6B24CDD573F977A11E794811:192>>,                                  %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831:192>>,                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(prime192v2) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>},                    %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>,                                  %% A
+      <<16#CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953:192>>,                                  %% B
+      <<16#31A92EE2029FD10D901B113E990710F0D21AC6B6:160>>},                                         %% Seed
+      <<16#04:8,
+        16#EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A:192,                                    %% X(p0)
+        16#6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15:192>>,                                  %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31:192>>,                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(prime192v3) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF:192>>},                    %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC:192>>,                                  %% A
+      <<16#22123DC2395A05CAA7423DAECCC94760A7D462256BD56916:192>>,                                  %% B
+      <<16#C469684435DEB378C4B65CA9591E2A5763059A2E:160>>},                                         %% Seed
+      <<16#04:8,
+        16#7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896:192,                                    %% X(p0)
+        16#38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0:192>>,                                  %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13:192>>,                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(prime239v1) ->
+    {
+     {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>},        %% Prime
+     {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>,                      %% A
+      <<16#6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A:240>>,                      %% B
+      <<16#E43BB460F0B80CC0C0B075798E948060F8321B7D:160>>},                                         %% Seed
+      <<16#04:8,
+        16#0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF:240,                        %% X(p0)
+        16#7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE:240>>,                      %% Y(p0)
+      <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B:240>>,                      %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(prime239v2) ->
+    {
+     {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>},        %% Prime
+     {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>,                      %% A
+      <<16#617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C:240>>,                      %% B
+      <<16#E8B4011604095303CA3B8099982BE09FCB9AE616:160>>},                                         %% Seed
+      <<16#04:8,
+        16#38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7:240,                        %% X(p0)
+        16#5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA:240>>,                      %% Y(p0)
+      <<16#7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063:240>>,                      %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(prime239v3) ->
+    {
+     {prime_field, <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF:240>>},        %% Prime
+     {<<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC:240>>,                      %% A
+      <<16#255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E:240>>,                      %% B
+      <<16#7D7374168FFE3471B60A857686A19475D3BFA2FF:160>>},                                         %% Seed
+      <<16#04:8,
+        16#6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A:240,                        %% X(p0)
+        16#1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3:240>>,                      %% Y(p0)
+      <<16#7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551:240>>,                      %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(prime256v1) ->
+    {
+     {prime_field, <<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF:256>>},    %% Prime
+     {<<16#FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC:256>>,                  %% A
+      <<16#5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B:256>>,                  %% B
+      <<16#C49D360886E704936A6678E1139D26B7819F7E90:160>>},                                         %% Seed
+      <<16#04:8,
+        16#6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296:256,                    %% X(p0)
+        16#4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5:256>>,                  %% Y(p0)
+      <<16#FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551:256>>,                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect113r1) ->
+    {
+     {characteristic_two_field, 113, {tpbasis,9}},
+     {<<16#3088250CA6E7C7FE649CE85820F7:112>>,                                                      %% A
+      <<16#E8BEE4D3E2260744188BE0E9C723:112>>,                                                      %% B
+      <<16#10E723AB14D696E6768756151756FEBF8FCB49A9:160>>},                                         %% Seed
+      <<16#04:8,
+        16#009D73616F35F4AB1407D73562C10F:120,                                                      %% X(p0)
+        16#00A52830277958EE84D1315ED31886:120>>,                                                    %% Y(p0)
+      <<16#0100000000000000D9CCEC8A39E56F:120>>,                                                    %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect113r2) ->
+    {
+     {characteristic_two_field, 113, {tpbasis,9}},
+     {<<16#689918DBEC7E5A0DD6DFC0AA55C7:112>>,                                                      %% A
+      <<16#95E9A9EC9B297BD4BF36E059184F:112>>,                                                      %% B
+      <<16#10C0FB15760860DEF1EEF4D696E676875615175D:160>>},                                         %% Seed
+      <<16#04:8,
+        16#01A57A6A7B26CA5EF52FCDB8164797:120,                                                      %% X(p0)
+        16#00B3ADC94ED1FE674C06E695BABA1D:120>>,                                                    %% Y(p0)
+      <<16#010000000000000108789B2496AF93:120>>,                                                    %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect131r1) ->
+    {
+     {characteristic_two_field, 131, {ppbasis,2,3,8}},
+     {<<16#07A11B09A76B562144418FF3FF8C2570B8:136>>,                                                %% A
+      <<16#0217C05610884B63B9C6C7291678F9D341:136>>,                                                %% B
+      <<16#4D696E676875615175985BD3ADBADA21B43A97E2:160>>},                                         %% Seed
+      <<16#04:8,
+        16#0081BAF91FDF9833C40F9C181343638399:136,                                                  %% X(p0)
+        16#078C6E7EA38C001F73C8134B1B4EF9E150:136>>,                                                %% Y(p0)
+      <<16#0400000000000000023123953A9464B54D:136>>,                                                %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect131r2) ->
+    {
+     {characteristic_two_field, 131, {ppbasis,2,3,8}},
+     {<<16#03E5A88919D7CAFCBF415F07C2176573B2:136>>,                                                %% A
+      <<16#04B8266A46C55657AC734CE38F018F2192:136>>,                                                %% B
+      <<16#985BD3ADBAD4D696E676875615175A21B43A97E3:160>>},                                         %% Seed
+      <<16#04:8,
+        16#0356DCD8F2F95031AD652D23951BB366A8:136,                                                  %% X(p0)
+        16#0648F06D867940A5366D9E265DE9EB240F:136>>,                                                %% Y(p0)
+      <<16#0400000000000000016954A233049BA98F:136>>,                                                %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect163k1) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,3,6,7}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8:168,                                          %% X(p0)
+        16#0289070FB05D38FF58321F2E800536D538CCDAA3D9:168>>,                                        %% Y(p0)
+      <<16#04000000000000000000020108A2E0CC0D99F8A5EF:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect163r1) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,3,6,7}},
+     {<<16#07B6882CAAEFA84F9554FF8428BD88E246D2782AE2:168>>,                                        %% A
+      <<16#0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9:168>>,                                        %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#0369979697AB43897789566789567F787A7876A654:168,                                          %% X(p0)
+        16#00435EDB42EFAFB2989D51FEFCE3C80988F41FF883:168>>,                                        %% Y(p0)
+      <<16#03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect163r2) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,3,6,7}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#020A601907B8C953CA1481EB10512F78744A3205FD:168>>,                                        %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#03F0EBA16286A2D57EA0991168D4994637E8343E36:168,                                          %% X(p0)
+        16#00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1:168>>,                                        %% Y(p0)
+      <<16#040000000000000000000292FE77E70C12A4234C33:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect193r1) ->
+    {
+     {characteristic_two_field, 193, {tpbasis,15}},
+     {<<16#17858FEB7A98975169E171F77B4087DE098AC8A911DF7B01:192>>,                                  %% A
+      <<16#FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814:192>>,                                  %% B
+      <<16#103FAEC74D696E676875615175777FC5B191EF30:160>>},                                         %% Seed
+      <<16#04:8,
+        16#01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1:200,                                  %% X(p0)
+        16#0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05:200>>,                                %% Y(p0)
+      <<16#01000000000000000000000000C7F34A778F443ACC920EBA49:200>>,                                %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect193r2) ->
+    {
+     {characteristic_two_field, 193, {tpbasis,15}},
+     {<<16#0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B:200>>,                                %% A
+      <<16#C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE:192>>,                                  %% B
+      <<16#10B7B4D696E676875615175137C8A16FD0DA2211:160>>},                                         %% Seed
+      <<16#04:8,
+        16#00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F:200,                                  %% X(p0)
+        16#01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C:200>>,                                %% Y(p0)
+      <<16#010000000000000000000000015AAB561B005413CCD4EE99D5:200>>,                                %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect233k1) ->
+    {
+     {characteristic_two_field, 233, {tpbasis,74}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126:240,                        %% X(p0)
+        16#01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3:240>>,                      %% Y(p0)
+      <<16#8000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF:232>>,                        %% Order
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect233r1) ->
+    {
+     {characteristic_two_field, 233, {tpbasis,74}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#66647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD:232>>,                        %% B
+      <<16#74D59FF07F6B413D0EA14B344B20A2DB049B50C3:160>>},                                         %% Seed
+      <<16#04:8,
+        16#00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B:240,                        %% X(p0)
+        16#01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052:240>>,                      %% Y(p0)
+      <<16#01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7:240>>,                      %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect239k1) ->
+    {
+     {characteristic_two_field, 239, {tpbasis,158}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC:240,                        %% X(p0)
+        16#76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA:240>>,                      %% Y(p0)
+      <<16#2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5:240>>,                      %% Order
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect283k1) ->
+    {
+     {characteristic_two_field, 283, {ppbasis,5,7,12}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC24:256,                    %% X(p0)
+        16#58492836:32,
+        16#01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E341161:256,                    %% Y(p0)
+        16#77DD2259:32>>,
+      <<16#01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E06:256,                    %% Order
+        16#1E163C61:32>>,
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect283r1) ->
+    {
+     {characteristic_two_field, 283, {ppbasis,5,7,12}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E31:256,                    %% B
+        16#3B79A2F5:32>>,
+      <<16#77E2B07370EB0F832A6DD5B62DFC88CD06BB84BE:160>>},                                         %% Seed
+      <<16#04:8,
+        16#05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD:256,                    %% X(p0)
+        16#86B12053:32,
+        16#03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45:256,                    %% Y(p0)
+        16#BE8112F4:32>>,
+      <<16#03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7C:256,                    %% Order
+        16#EFADB307:32>>,
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect409k1) ->
+    {
+     {characteristic_two_field, 409, {tpbasis,87}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2:256,                    %% X(p0)
+        16#C460189EB5AAAA62EE222EB1B35540CFE9023746:160,
+        16#01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3:256,                    %% Y(p0)
+        16#DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B:160>>,
+      <<16#7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20:256,                    %% Order
+        16#400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF:152>>,
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect409r1) ->
+    {
+     {characteristic_two_field, 409, {tpbasis,87}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#21A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9:256,                    %% B
+        16#A197B272822F6CD57A55AA4F50AE317B13545F:152>>,
+      <<16#4099B5A457F9D69F79213D094C4BCD4D4262210B:160>>},                                         %% Seed
+      <<16#04:8,
+        16#015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703:256,                    %% X(p0)
+        16#DC255A868A1180515603AEAB60794E54BB7996A7:160,
+        16#0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F:256,                    %% Y(p0)
+        16#38514F1FDF4B4F40D2181B3681C364BA0273C706:160>>,
+      <<16#010000000000000000000000000000000000000000000000000001E2AAD6A612:256,                    %% Order
+        16#F33307BE5FA47C3C9E052F838164CD37D9A21173:160>>,
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect571k1) ->
+    {
+     {characteristic_two_field, 571, {ppbasis,2,5,10}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA4:256,                    %% X(p0)
+        16#4370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7:256,
+        16#E2945283A01C8972:64,
+        16#0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C:256,                    %% Y(p0)
+        16#9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F6:256,
+        16#01CD4C143EF1C7A3:64>>,
+      <<16#0200000000000000000000000000000000000000000000000000000000000000:256,                    %% Order
+        16#00000000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB4:256,
+        16#5CFE778F637C1001:64>>,
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(sect571r1) ->
+    {
+     {characteristic_two_field, 571, {ppbasis,2,5,10}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD:256,                    %% B
+        16#84FFABBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C:256,
+        16#7FFEFF7F2955727A:64>>,
+      <<16#2AA058F73A0E33AB486B0F610410C53A7F132310:160>>},                                         %% Seed
+      <<16#04:8,
+        16#0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABD:256,                    %% X(p0)
+        16#BDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927:256,
+        16#E1E7769C8EEC2D19:64,
+        16#037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A6:256,                    %% Y(p0)
+        16#84423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C:256,
+        16#1A4827AF1B8AC15B:64>>,
+      <<16#03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:256,                    %% Order
+        16#FFFFFFFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E:256,
+        16#8382E9BB2FE84E47:64>>,
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2pnb163v1) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,1,2,8}},
+     {<<16#072546B5435234A422E0789675F432C89435DE5242:168>>,                                        %% A
+      <<16#C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9:160>>,                                          %% B
+      <<16#D2C0FB15760860DEF1EEF4D696E6768756151754:160>>},                                         %% Seed
+      <<16#04:8,
+        16#07AF69989546103D79329FCC3D74880F33BBE803CB:168,                                          %% X(p0)
+        16#01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F:168>>,                                        %% Y(p0)
+      <<16#0400000000000000000001E60FC8821CC74DAEAFC1:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2pnb163v2) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,1,2,8}},
+     {<<16#0108B39E77C4B108BED981ED0E890E117C511CF072:168>>,                                        %% A
+      <<16#0667ACEB38AF4E488C407433FFAE4F1C811638DF20:168>>,                                        %% B
+      <<16#53814C050D44D696E67687561517580CA4E29FFD:160>>},                                         %% Seed
+      <<16#04:8,
+        16#0024266E4EB5106D0A964D92C4860E2671DB9B6CC5:168,                                          %% X(p0)
+        16#079F684DDF6684C5CD258B3890021B2386DFD19FC5:168>>,                                        %% Y(p0)
+      <<16#03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2pnb163v3) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,1,2,8}},
+     {<<16#07A526C63D3E25A256A007699F5447E32AE456B50E:168>>,                                        %% A
+      <<16#03F7061798EB99E238FD6F1BF95B48FEEB4854252B:168>>,                                        %% B
+      <<16#50CBF1D95CA94D696E676875615175F16A36A3B8:160>>},                                         %% Seed
+      <<16#04:8,
+        16#02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB:168,                                          %% X(p0)
+        16#05B935590C155E17EA48EB3FF3718B893DF59A05D0:168>>,                                        %% Y(p0)
+      <<16#03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2pnb176v1) ->
+    {
+     {characteristic_two_field, 176, {ppbasis,1,2,43}},
+     {<<16#E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B:176>>,                                      %% A
+      <<16#5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2:176>>,                                      %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#8D16C2866798B600F9F08BB4A8E860F3298CE04A5798:176,                                        %% X(p0)
+        16#6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C:176>>,                                      %% Y(p0)
+      <<16#010092537397ECA4F6145799D62B0A19CE06FE26AD:168>>,                                        %% Order
+      <<16#FF6E:16>>                                                                                %% CoFactor
+    };
+
+curve(c2tnb191v1) ->
+    {
+     {characteristic_two_field, 191, {tpbasis,9}},
+     {<<16#2866537B676752636A68F56554E12640276B649EF7526267:192>>,                                  %% A
+      <<16#2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC:192>>,                                  %% B
+      <<16#4E13CA542744D696E67687561517552F279A8C84:160>>},                                         %% Seed
+      <<16#04:8,
+        16#36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D:192,                                    %% X(p0)
+        16#765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB:192>>,                                  %% Y(p0)
+      <<16#40000000000000000000000004A20E90C39067C893BBB9A5:192>>,                                  %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2tnb191v2) ->
+    {
+     {characteristic_two_field, 191, {tpbasis,9}},
+     {<<16#401028774D7777C7B7666D1366EA432071274F89FF01E718:192>>,                                  %% A
+      <<16#0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01:192>>,                                  %% B
+      <<16#0871EF2FEF24D696E6768756151758BEE0D95C15:160>>},                                         %% Seed
+      <<16#04:8,
+        16#3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10:192,                                    %% X(p0)
+        16#17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A:192>>,                                  %% Y(p0)
+      <<16#20000000000000000000000050508CB89F652824E06B8173:192>>,                                  %% Order
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2tnb191v3) ->
+    {
+     {characteristic_two_field, 191, {tpbasis,9}},
+     {<<16#6C01074756099122221056911C77D77E77A777E7E7E77FCB:192>>,                                  %% A
+      <<16#71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8:192>>,                                  %% B
+      <<16#E053512DC684D696E676875615175067AE786D1F:160>>},                                         %% Seed
+      <<16#04:8,
+        16#375D4CE24FDE434489DE8746E71786015009E66E38A926DD:192,                                    %% X(p0)
+        16#545A39176196575D985999366E6AD34CE0A77CD7127B06BE:192>>,                                  %% Y(p0)
+      <<16#155555555555555555555555610C0B196812BFB6288A3EA3:192>>,                                  %% Order
+      <<16#06:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2pnb208w1) ->
+    {
+     {characteristic_two_field, 208, {ppbasis,1,2,83}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E:208>>,                              %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A:208,                                %% X(p0)
+        16#0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3:208>>,                              %% Y(p0)
+      <<16#0101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D:200>>,                                %% Order
+      <<16#FE48:16>>                                                                                %% CoFactor
+    };
+
+curve(c2tnb239v1) ->
+    {
+     {characteristic_two_field, 239, {tpbasis,36}},
+     {<<16#32010857077C5431123A46B808906756F543423E8D27877578125778AC76:240>>,                      %% A
+      <<16#790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16:240>>,                      %% B
+      <<16#D34B9A4D696E676875615175CA71B920BFEFB05D:160>>},                                         %% Seed
+      <<16#04:8,
+        16#57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D:240,                        %% X(p0)
+        16#61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305:240>>,                      %% Y(p0)
+      <<16#2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447:240>>,                      %% Order
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2tnb239v2) ->
+    {
+     {characteristic_two_field, 239, {tpbasis,36}},
+     {<<16#4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F:240>>,                      %% A
+      <<16#5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B:240>>,                      %% B
+      <<16#2AA6982FDFA4D696E676875615175D266727277D:160>>},                                         %% Seed
+      <<16#04:8,
+        16#28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205:240,                        %% X(p0)
+        16#5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833:240>>,                      %% Y(p0)
+      <<16#1555555555555555555555555555553C6F2885259C31E3FCDF154624522D:240>>,                      %% Order
+      <<16#06:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2tnb239v3) ->
+    {
+     {characteristic_two_field, 239, {tpbasis,36}},
+     {<<16#01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F:240>>,                      %% A
+      <<16#6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40:240>>,                      %% B
+      <<16#9E076F4D696E676875615175E11E9FDD77F92041:160>>},                                         %% Seed
+      <<16#04:8,
+        16#70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92:240,                        %% X(p0)
+        16#2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461:240>>,                      %% Y(p0)
+      <<16#0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF:240>>,                      %% Order
+      <<16#0A:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2pnb272w1) ->
+    {
+     {characteristic_two_field, 272, {ppbasis,1,3,56}},
+     {<<16#91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586:256,                    %% A
+        16#FB20:16>>,
+      <<16#7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E5:256,                    %% B
+        16#40F7:16>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171:256,                    %% X(p0)
+        16#DD8D:16,
+        16#10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE:256,                    %% Y(p0)
+        16#9D23:16>>,
+      <<16#0100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E6295:256,                    %% Order
+        16#21:8>>,
+      <<16#FF06:16>>                                                                                %% CoFactor
+    };
+
+curve(c2pnb304w1) ->
+    {
+     {characteristic_two_field, 304, {ppbasis,1,2,11}},
+     {<<16#FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C128807836:256,                    %% A
+        16#5A0396C8E681:48>>,
+      <<16#BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C1403960:256,                    %% B
+        16#1E55827340BE:48>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A:256,                    %% X(p0)
+        16#644F740A2614:48,
+        16#E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B54:256,                    %% Y(p0)
+        16#9FDC1B92C03B:48>>,
+      <<16#0101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899:256,                    %% Order
+        16#164443051D:40>>,
+      <<16#FE2E:16>>                                                                                %% CoFactor
+    };
+
+curve(c2tnb359v1) ->
+    {
+     {characteristic_two_field, 359, {tpbasis,68}},
+     {<<16#5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223:256,                    %% A
+        16#A5E05656FB549016A96656A557:104>>,
+      <<16#2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626:256,                    %% B
+        16#089687742B6329E70680231988:104>>,
+      <<16#2B354920B724D696E67687561517585BA1332DC6:160>>},                                         %% Seed
+      <<16#04:8,
+        16#3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6B:256,                    %% X(p0)
+        16#DCDE98E8E707C07A2239B1B097:104,
+        16#53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868:256,                    %% Y(p0)
+        16#FE57E4AE2DE211305A407104BD:104>>,
+      <<16#01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20:256,                    %% Order
+        16#A7EB964FE7719E74F490758D3B:104>>,
+      <<16#4C:8>>                                                                                   %% CoFactor
+    };
+
+curve(c2pnb368w1) ->
+    {
+     {characteristic_two_field, 368, {ppbasis,1,2,85}},
+     {<<16#E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C5:256,                    %% A
+        16#76D62F0AB7519CCD2A1A906AE30D:112>>,
+      <<16#FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1:256,                    %% B
+        16#C2112D84D164F444F8F74786046A:112>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22:256,                    %% X(p0)
+        16#E7E789E927BE216F02E1FB136A5F:112,
+        16#7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87C:256,                    %% Y(p0)
+        16#D1855ADAA81E2A0750B80FDA2310:112>>,
+      <<16#010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87:256,                    %% Order
+        16#E909AE40A6F131E9CFCE5BD967:104>>,
+      <<16#FF70:16>>                                                                                %% CoFactor
+    };
+
+curve(c2tnb431r1) ->
+    {
+     {characteristic_two_field, 431, {tpbasis,120}},
+     {<<16#1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF6:256,                    %% A
+        16#20B0EB9906D0957F6C6FEACD615468DF104DE296CD8F:176>>,
+      <<16#10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A:256,                    %% B
+        16#919B626D4E50A8DD731B107A9962381FB5D807BF2618:176>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658:256,                    %% X(p0)
+        16#EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7:176,
+        16#20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F:256,                    %% Y(p0)
+        16#3E8F6ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760:176>>,
+      <<16#0340340340340340340340340340340340340340340340340340340323C313FA:256,                    %% Order
+        16#B50589703B5EC68D3587FEC60D161CC149C1AD4A91:168>>,
+      <<16#2760:16>>                                                                                %% CoFactor
+    };
+
+curve(wtls1) ->
+    {
+     {characteristic_two_field, 113, {tpbasis,9}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#01667979A40BA497E5D5C270780617:120,                                                      %% X(p0)
+        16#00F44B4AF1ECC2630E08785CEBCC15:120>>,                                                    %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFDBF91AF6DEA73:112>>,                                                      %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls3) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,3,6,7}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8:168,                                          %% X(p0)
+        16#0289070FB05D38FF58321F2E800536D538CCDAA3D9:168>>,                                        %% Y(p0)
+      <<16#04000000000000000000020108A2E0CC0D99F8A5EF:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls4) ->
+    {
+     {characteristic_two_field, 113, {tpbasis,9}},
+     {<<16#3088250CA6E7C7FE649CE85820F7:112>>,                                                      %% A
+      <<16#E8BEE4D3E2260744188BE0E9C723:112>>,                                                      %% B
+      <<16#10E723AB14D696E6768756151756FEBF8FCB49A9:160>>},                                         %% Seed
+      <<16#04:8,
+        16#009D73616F35F4AB1407D73562C10F:120,                                                      %% X(p0)
+        16#00A52830277958EE84D1315ED31886:120>>,                                                    %% Y(p0)
+      <<16#0100000000000000D9CCEC8A39E56F:120>>,                                                    %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls5) ->
+    {
+     {characteristic_two_field, 163, {ppbasis,1,2,8}},
+     {<<16#072546B5435234A422E0789675F432C89435DE5242:168>>,                                        %% A
+      <<16#C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9:160>>,                                          %% B
+      <<16#D2C0FB15760860DEF1EEF4D696E6768756151754:160>>},                                         %% Seed
+      <<16#04:8,
+        16#07AF69989546103D79329FCC3D74880F33BBE803CB:168,                                          %% X(p0)
+        16#01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F:168>>,                                        %% Y(p0)
+      <<16#0400000000000000000001E60FC8821CC74DAEAFC1:168>>,                                        %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls6) ->
+    {
+     {prime_field, <<16#DB7C2ABF62E35E668076BEAD208B:112>>},                                        %% Prime
+     {<<16#DB7C2ABF62E35E668076BEAD2088:112>>,                                                      %% A
+      <<16#659EF8BA043916EEDE8911702B22:112>>,                                                      %% B
+      <<16#00F50B028E4D696E676875615175290472783FB1:160>>},                                         %% Seed
+      <<16#04:8,
+        16#09487239995A5EE76B55F9C2F098:112,                                                        %% X(p0)
+        16#A89CE5AF8724C0A23E0E0FF77500:112>>,                                                      %% Y(p0)
+      <<16#DB7C2ABF62E35E7628DFAC6561C5:112>>,                                                      %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls7) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73:160>>},                            %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70:160>>,                                          %% A
+      <<16#B4E134D3FB59EB8BAB57274904664D5AF50388BA:160>>,                                          %% B
+      <<16#B99B99B099B323E02709A4D696E6768756151751:160>>},                                         %% Seed
+      <<16#04:8,
+        16#52DCB034293A117E1F4FF11B30F7199D3144CE6D:160,                                            %% X(p0)
+        16#FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E:160>>,                                          %% Y(p0)
+      <<16#0100000000000000000000351EE786A818F3A1A16B:168>>,                                        %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls8) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFDE7:112>>},                                        %% Prime
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#03:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#0000000000000000000000000001:112,                                                        %% X(p0)
+        16#0000000000000000000000000002:112>>,                                                      %% Y(p0)
+      <<16#0100000000000001ECEA551AD837E9:120>>,                                                    %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls9) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F:160>>},                            %% Prime
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#03:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#0000000000000000000000000000000000000001:160,                                            %% X(p0)
+        16#0000000000000000000000000000000000000002:160>>,                                          %% Y(p0)
+      <<16#0100000000000000000001CDC98AE0E2DE574ABF33:168>>,                                        %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls10) ->
+    {
+     {characteristic_two_field, 233, {tpbasis,74}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#01:8>>,                                                                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126:240,                        %% X(p0)
+        16#01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3:240>>,                      %% Y(p0)
+      <<16#8000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF:232>>,                        %% Order
+      <<16#04:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls11) ->
+    {
+     {characteristic_two_field, 233, {tpbasis,74}},
+     {<<16#01:8>>,                                                                                  %% A
+      <<16#66647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD:232>>,                        %% B
+      <<16#74D59FF07F6B413D0EA14B344B20A2DB049B50C3:160>>},                                         %% Seed
+      <<16#04:8,
+        16#00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B:240,                        %% X(p0)
+        16#01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052:240>>,                      %% Y(p0)
+      <<16#01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7:240>>,                      %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(wtls12) ->
+    {
+     {prime_field, <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001:224>>},            %% Prime
+     {<<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE:224>>,                          %% A
+      <<16#B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4:224>>,                          %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21:224,                            %% X(p0)
+        16#BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34:224>>,                          %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D:224>>,                          %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(ipsec3) ->
+    {
+     {characteristic_two_field, 155, {tpbasis,62}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#07338F:24>>,                                                                             %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#000000000000000000000000000000000000007B:160,                                            %% X(p0)
+        16#00000000000000000000000000000000000001C8:160>>,                                          %% Y(p0)
+      <<16#02AAAAAAAAAAAAAAAAAAC7F3C7881BD0868FA86C:160>>,                                          %% Order
+      <<16#03:8>>                                                                                   %% CoFactor
+    };
+
+curve(ipsec4) ->
+    {
+     {characteristic_two_field, 185, {tpbasis,69}},
+     {<<16#00:8>>,                                                                                  %% A
+      <<16#1EE9:16>>,                                                                               %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#000000000000000000000000000000000000000000000018:192,                                    %% X(p0)
+        16#00000000000000000000000000000000000000000000000D:192>>,                                  %% Y(p0)
+      <<16#FFFFFFFFFFFFFFFFFFFFFFEDF97C44DB9F2420BAFCA75E:184>>,                                    %% Order
+      <<16#02:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP160r1) ->
+    {
+     {prime_field, <<16#E95E4A5F737059DC60DFC7AD95B3D8139515620F:160>>},                            %% Prime
+     {<<16#340E7BE2A280EB74E2BE61BADA745D97E8F7C300:160>>,                                          %% A
+      <<16#1E589A8595423412134FAA2DBDEC95C8D8675E58:160>>,                                          %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3:160,                                            %% X(p0)
+        16#1667CB477A1A8EC338F94741669C976316DA6321:160>>,                                          %% Y(p0)
+      <<16#E95E4A5F737059DC60DF5991D45029409E60FC09:160>>,                                          %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP160t1) ->
+    {
+     {prime_field, <<16#E95E4A5F737059DC60DFC7AD95B3D8139515620F:160>>},                            %% Prime
+     {<<16#E95E4A5F737059DC60DFC7AD95B3D8139515620C:160>>,                                          %% A
+      <<16#7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380:160>>,                                          %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#B199B13B9B34EFC1397E64BAEB05ACC265FF2378:160,                                            %% X(p0)
+        16#ADD6718B7C7C1961F0991B842443772152C9E0AD:160>>,                                          %% Y(p0)
+      <<16#E95E4A5F737059DC60DF5991D45029409E60FC09:160>>,                                          %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP192r1) ->
+    {
+     {prime_field, <<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297:192>>},                    %% Prime
+     {<<16#6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF:192>>,                                  %% A
+      <<16#469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9:192>>,                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6:192,                                    %% X(p0)
+        16#14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F:192>>,                                  %% Y(p0)
+      <<16#C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1:192>>,                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP192t1) ->
+    {
+     {prime_field, <<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297:192>>},                    %% Prime
+     {<<16#C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294:192>>,                                  %% A
+      <<16#13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79:192>>,                                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#3AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129:192,                                    %% X(p0)
+        16#097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9:192>>,                                  %% Y(p0)
+      <<16#C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1:192>>,                                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP224r1) ->
+    {
+     {prime_field, <<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF:224>>},            %% Prime
+     {<<16#68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43:224>>,                          %% A
+      <<16#2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B:224>>,                          %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D:224,                            %% X(p0)
+        16#58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD:224>>,                          %% Y(p0)
+      <<16#D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F:224>>,                          %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP224t1) ->
+    {
+     {prime_field, <<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF:224>>},            %% Prime
+     {<<16#D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC:224>>,                          %% A
+      <<16#4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D:224>>,                          %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#6AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D580:224,                            %% X(p0)
+        16#0374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C:224>>,                          %% Y(p0)
+      <<16#D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F:224>>,                          %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP256r1) ->
+    {
+     {prime_field, <<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377:256>>},    %% Prime
+     {<<16#7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9:256>>,                  %% A
+      <<16#26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6:256>>,                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262:256,                    %% X(p0)
+        16#547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997:256>>,                  %% Y(p0)
+      <<16#A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7:256>>,                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP256t1) ->
+    {
+     {prime_field, <<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377:256>>},    %% Prime
+     {<<16#A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374:256>>,                  %% A
+      <<16#662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04:256>>,                  %% B
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F4:256,                    %% X(p0)
+        16#2D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE:256>>,                  %% Y(p0)
+      <<16#A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7:256>>,                  %% Order
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP320r1) ->
+    {
+     {prime_field, <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28:256,       %% Prime
+                     16#FCD412B1F1B32E27:64>>},
+     {<<16#3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F4:256,                    %% A
+        16#92F375A97D860EB4:64>>,
+      <<16#520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD88453981:256,                    %% B
+        16#6F5EB4AC8FB1F1A6:64>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C7:256,                    %% X(p0)
+        16#10AF8D0D39E20611:64,
+        16#14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7:256,                    %% Y(p0)
+        16#D35245D1692E8EE1:64>>,
+      <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E9:256,                    %% Order
+        16#8691555B44C59311:64>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP320t1) ->
+    {
+     {prime_field, <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28:256,       %% Prime
+                     16#FCD412B1F1B32E27:64>>},
+     {<<16#D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28:256,                    %% A
+        16#FCD412B1F1B32E24:64>>,
+      <<16#A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CE:256,                    %% B
+        16#B5B4FEF422340353:64>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF:256,                    %% X(p0)
+        16#3357F624A21BED52:64,
+        16#63BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B:256,                    %% Y(p0)
+        16#1B9BC0455FB0D2C3:64>>,
+      <<16#D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E9:256,                    %% Order
+        16#8691555B44C59311:64>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP384r1) ->
+    {
+     {prime_field, <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123:256,       %% Prime
+                     16#ACD3A729901D1A71874700133107EC53:128>>},
+     {<<16#7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F:256,                    %% A
+        16#8AA5814A503AD4EB04A8C7DD22CE2826:128>>,
+      <<16#04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D5:256,                    %% B
+        16#7CB4390295DBC9943AB78696FA504C11:128>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8:256,                    %% X(p0)
+        16#E826E03436D646AAEF87B2E247D4AF1E:128,
+        16#8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF9912928:256,                    %% Y(p0)
+        16#0E4646217791811142820341263C5315:128>>,
+      <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7:256,                    %% Order
+        16#CF3AB6AF6B7FC3103B883202E9046565:128>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP384t1) ->
+    {
+     {prime_field, <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123:256,       %% Prime
+                     16#ACD3A729901D1A71874700133107EC53:128>>},
+     {<<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123:256,                    %% A
+        16#ACD3A729901D1A71874700133107EC50:128>>,
+      <<16#7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D:256,                    %% B
+        16#2074AA263B88805CED70355A33B471EE:128>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#18DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFF:256,                    %% X(p0)
+        16#C4FF191B946A5F54D8D0AA2F418808CC:128,
+        16#25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE:256,                    %% Y(p0)
+        16#469408584DC2B2912675BF5B9E582928:128>>,
+      <<16#8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7:256,                    %% Order
+        16#CF3AB6AF6B7FC3103B883202E9046565:128>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP512r1) ->
+    {
+     {prime_field, <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330871:256,       %% Prime
+                     16#7D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3:256>>},
+     {<<16#7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC:256,                    %% A
+        16#2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA:256>>,
+      <<16#3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A7:256,                    %% B
+        16#2BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723:256>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098E:256,                    %% X(p0)
+        16#FF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822:256,
+        16#7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111:256,                    %% Y(p0)
+        16#B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892:256>>,
+      <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870:256,                    %% Order
+        16#553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069:256>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    };
+
+curve(brainpoolP512t1) ->
+    {
+     {prime_field, <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330871:256,       %% Prime
+                     16#7D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3:256>>},
+     {<<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330871:256,                    %% A
+        16#7D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0:256>>,
+      <<16#7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A6:256,                    %% B
+        16#2BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E:256>>,
+      none},                                                                                        %% Seed
+      <<16#04:8,
+        16#640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D:256,                    %% X(p0)
+        16#82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA:256,
+        16#5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9:256,                    %% Y(p0)
+        16#D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332:256>>,
+      <<16#AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870:256,                    %% Order
+        16#553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069:256>>,
+      <<16#01:8>>                                                                                   %% CoFactor
+    }.
diff --git a/lib/crypto/src/crypto_server.erl b/lib/crypto/src/crypto_server.erl
deleted file mode 100644
index 89650a9f06..0000000000
--- a/lib/crypto/src/crypto_server.erl
+++ /dev/null
@@ -1,68 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1999-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: Provide cryptographic algorithms.
-
--module(crypto_server).
-
--behaviour(gen_server).
-
--export([start_link/0]).
-
-%% Internal exports, call-back functions.
--export([init/1,handle_call/3,handle_cast/2,handle_info/2,code_change/3,
-	 terminate/2]).
-
-
-%%% --------------------------------------------------------
-%%% Interface Functions. 
-%%% --------------------------------------------------------
-
-start_link() ->
-    gen_server:start_link({local, crypto_server}, crypto_server, [], []).
-
-init([]) ->
-    {ok,[]}.
-
-
-
-%%% --------------------------------------------------------
-%%% The call-back functions.
-%%% --------------------------------------------------------
-
-handle_call(_, _, State) ->
-    {noreply, State}.
-
-handle_cast(_, State) ->
-    {noreply, State}.
-
-handle_info(_, State) ->
-    {noreply, State}.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-terminate(_Reason, _State) ->
-    [].
-
-
-
-
-
-    
diff --git a/lib/crypto/src/crypto_sup.erl b/lib/crypto/src/crypto_sup.erl
deleted file mode 100644
index 8ef58777ab..0000000000
--- a/lib/crypto/src/crypto_sup.erl
+++ /dev/null
@@ -1,39 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1999-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: Main supervisor in CRYPTO application.
-
--module(crypto_sup).
-
--behaviour(supervisor).
-
--export([start_link/0, init/1]).
-
-start_link() ->
-    supervisor:start_link({local, crypto_sup}, crypto_sup, []).
-
-
-%% init([])
-%% Returns: {ok,  {SupFlags,  [ChildSpec]}}
-%%
-init([]) ->
-    Child = {crypto_server, {crypto_server, start_link, []},
-	      permanent, 2000, worker, [crypto_server]},
-    {ok, {{one_for_all, 10, 3600}, [Child]}}.
-
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 58aaa78d28..8efd962283 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -30,6 +30,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [app,
+     appup,
      {group, md4},
      {group, md5},
      {group, ripemd160},
@@ -56,6 +57,7 @@ all() ->
      {group, aes_cbc128},
      {group, aes_cfb128},
      {group, aes_cbc256},
+     {group, aes_ige256},
      {group, rc2_cbc},
      {group, rc4}, 
      {group, aes_ctr},
@@ -90,6 +92,7 @@ groups() ->
      {aes_cbc128,[], [block]},
      {aes_cfb128,[], [block]},
      {aes_cbc256,[], [block]},
+     {aes_ige256,[], [block]},
      {blowfish_cbc, [], [block]},
      {blowfish_ecb, [], [block]},
      {blowfish_cfb64, [], [block]},
@@ -140,10 +143,16 @@ app() ->
 app(Config) when is_list(Config) ->
     ok = ?t:app_test(crypto).
 %%--------------------------------------------------------------------
+appup() ->
+    [{doc, "Test that the crypto appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(crypto).
+%%--------------------------------------------------------------------
 hash() ->
     [{doc, "Test all different hash functions"}].
 hash(Config) when is_list(Config) ->
-    {Type, Msgs, Digests} = proplists:get_value(hash, Config),
+    {Type, MsgsLE, Digests} = proplists:get_value(hash, Config),
+    Msgs = lazy_eval(MsgsLE),
     [LongMsg | _] = lists:reverse(Msgs),
     Inc = iolistify(LongMsg),
     [IncrDigest | _] = lists:reverse(Digests),
@@ -154,7 +163,8 @@ hash(Config) when is_list(Config) ->
 hmac() ->
      [{doc, "Test all different hmac functions"}].
 hmac(Config) when is_list(Config) ->
-    {Type, Keys, Data, Expected} = proplists:get_value(hmac, Config),
+    {Type, Keys, DataLE, Expected} = proplists:get_value(hmac, Config),
+    Data = lazy_eval(DataLE),
     hmac(Type, Keys, Data, Expected),
     hmac(Type, lists:map(fun iolistify/1, Keys), lists:map(fun iolistify/1, Data), Expected),
     hmac_increment(Type).
@@ -171,7 +181,8 @@ block(Config) when is_list(Config) ->
 stream() ->
       [{doc, "Test stream ciphers"}].
 stream(Config) when is_list(Config) ->
-    Streams = proplists:get_value(stream, Config),
+    Streams = lazy_eval(proplists:get_value(stream, Config)),
+
     lists:foreach(fun stream_cipher/1, Streams),
     lists:foreach(fun stream_cipher/1, stream_iolistify(Streams)),
     lists:foreach(fun stream_cipher_incment/1, stream_iolistify(Streams)).
@@ -432,7 +443,7 @@ do_generate_compute({dh, P, G}) ->
     SharedSecret = crypto:compute_key(dh, UserPub, HostPriv, [P, G]).
     
 do_compute({ecdh = Type, Pub, Priv, Curve, SharedSecret}) ->
-    Secret = crypto:bytes_to_integer(crypto:compute_key(Type, Pub, Priv, Curve)),
+    Secret = crypto:compute_key(Type, Pub, Priv, Curve),
      case Secret of
 	 SharedSecret ->
 	     ok;
@@ -440,6 +451,9 @@ do_compute({ecdh = Type, Pub, Priv, Curve, SharedSecret}) ->
 	     ct:fail({{crypto, compute_key, [Type, Pub, Priv, Curve]}, {expected, SharedSecret}, {got, Other}})
      end.
 
+hexstr2point(X, Y) ->
+    <<4:8, (hexstr2bin(X))/binary, (hexstr2bin(Y))/binary>>.
+
 hexstr2bin(S) ->
     list_to_binary(hexstr2list(S)).
 
@@ -663,7 +677,7 @@ group_config(srp, Config) ->
     GenerateCompute = [srp3(), srp6(), srp6a()],
     [{generate_compute, GenerateCompute} | Config];
 group_config(ecdh, Config) ->
-    Compute = [ecdh()],
+    Compute = ecdh(),
     [{compute, Compute} | Config];
 group_config(dh, Config) ->
     GenerateCompute = [dh()],
@@ -692,6 +706,9 @@ group_config(aes_cbc128, Config) ->
 group_config(aes_cbc256, Config) ->
     Block = aes_cbc256(),
     [{block, Block} | Config];
+group_config(aes_ige256, Config) ->
+    Block = aes_ige256(),
+    [{block, Block} | Config];
 group_config(aes_cfb128, Config) ->
     Block = aes_cfb128(),
     [{block, Block} | Config];
@@ -795,7 +812,15 @@ rfc_4634_sha512_digests() ->
      hexstr2bin("8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA17299AEADB6889018501D289E4900F7E4331B99DEC4B5433AC7D329EEB6DD26545E96E55B874BE909")].
 
 long_msg() ->
-    lists:duplicate(1000000, $a).
+    fun() -> lists:duplicate(1000000, $a) end.
+
+%% Building huge terms (like long_msg/0) in init_per_group seems to cause
+%% test_server crash with 'no_answer_from_tc_supervisor' sometimes on some
+%% machines. Therefore lazy evaluation when test case has started.
+lazy_eval(F) when is_function(F) -> F();
+lazy_eval(Lst)  when is_list(Lst) -> lists:map(fun lazy_eval/1, Lst);
+lazy_eval(Tpl) when is_tuple(Tpl) -> list_to_tuple(lists:map(fun lazy_eval/1, tuple_to_list(Tpl)));
+lazy_eval(Term) -> Term.
 
 long_sha_digest() ->
     hexstr2bin("34aa973c" "d4c4daa4" "f61eeb2b" "dbad2731" "6534016f").
@@ -1106,6 +1131,25 @@ aes_cbc256() ->
        hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
      ].
 
+aes_ige256() ->
+    [{aes_ige256,
+      hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+      hexstr2bin("000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F"),
+      hexstr2bin("6bc1bee22e409f96e93d7e117393172a")},
+      {aes_ige256,
+       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+       hexstr2bin("4D0F9E735749215C05CB20DA00F7814B77D33F8A668BEBBAC1739AB20302D4FE"),
+       hexstr2bin("ae2d8a571e03ac9c9eb76fac45af8e51")},
+      {aes_ige256,
+       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+       hexstr2bin("2A5569424DAE1ACEABDEEA108DB4606AE21A9227CAB5F55BF52535CFA2B34717"),
+       hexstr2bin("30c81c46a35ce411e5fbc1191a0a52ef")},
+      {aes_ige256,
+       hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
+       hexstr2bin("15D5A583D2D668E518E683D9BDF1B6D0E0C3B1E5D5C1D51E964822E1ADE88DFA"),
+       hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")}
+     ].
+
 aes_cfb128() -> 
     [{aes_cfb128,
       hexstr2bin("2b7e151628aed2a6abf7158809cf4f3c"), 
@@ -1245,7 +1289,7 @@ blowfish_ofb64() ->
 rc4() ->
     [{rc4, <<"apaapa">>, <<"Yo baby yo">>},
      {rc4, <<"apaapa">>, list_to_binary(lists:seq(0, 255))},
-     {rc4, <<"apaapa">>, lists:duplicate(1000000, $a)}
+     {rc4, <<"apaapa">>, long_msg()}
     ].
 
 aes_ctr() ->
@@ -1293,7 +1337,7 @@ aes_ctr() ->
 
        {aes_ctr,  hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"),
 	hexstr2bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff"),
-	lists:duplicate(1000000, $a)}
+	long_msg()}
     ].
 
 rsa_plain() ->
@@ -1463,9 +1507,89 @@ srp(ClientPrivate, Generator, Prime, Version, Verifier, ServerPublic, ServerPriv
      {host, [Verifier, Prime, Version, Scrambler]},
      SessionKey}.
 ecdh() ->
-    {ecdh, 10053111454769593468622878414300213417816614162107065345116848162553478019161427871683337786549966,
-     1373339791687564785573162818422814591820885704654,
-     secp160r1, 990333295438215762119481641129490894973766052278}.
+    %% http://csrc.nist.gov/groups/STM/cavp/
+    [{ecdh, hexstr2point("42ea6dd9969dd2a61fea1aac7f8e98edcc896c6e55857cc0", "dfbe5d7c61fac88b11811bde328e8a0d12bf01a9d204b523"),
+            hexstr2bin("f17d3fea367b74d340851ca4270dcb24c271f445bed9d527"),
+            secp192r1,
+            hexstr2bin("803d8ab2e5b6e6fca715737c3a82f7ce3c783124f6d51cd0")},
+     {ecdh, hexstr2point("deb5712fa027ac8d2f22c455ccb73a91e17b6512b5e030e7", "7e2690a02cc9b28708431a29fb54b87b1f0c14e011ac2125"),
+            hexstr2bin("56e853349d96fe4c442448dacb7cf92bb7a95dcf574a9bd5"),
+            secp192r1,
+            hexstr2bin("c208847568b98835d7312cef1f97f7aa298283152313c29d")},
+     {ecdh, hexstr2point("af33cd0629bc7e996320a3f40368f74de8704fa37b8fab69abaae280", "882092ccbba7930f419a8a4f9bb16978bbc3838729992559a6f2e2d7"),
+            hexstr2bin("8346a60fc6f293ca5a0d2af68ba71d1dd389e5e40837942df3e43cbd"),
+            secp224r1,
+            hexstr2bin("7d96f9a3bd3c05cf5cc37feb8b9d5209d5c2597464dec3e9983743e8")},
+     {ecdh, hexstr2point("13bfcd4f8e9442393cab8fb46b9f0566c226b22b37076976f0617a46", "eeb2427529b288c63c2f8963c1e473df2fca6caa90d52e2f8db56dd4"),
+            hexstr2bin("043cb216f4b72cdf7629d63720a54aee0c99eb32d74477dac0c2f73d"),
+            secp224r1,
+            hexstr2bin("ee93ce06b89ff72009e858c68eb708e7bc79ee0300f73bed69bbca09")},
+     {ecdh, hexstr2point("700c48f77f56584c5cc632ca65640db91b6bacce3a4df6b42ce7cc838833d287", "db71e509e3fd9b060ddb20ba5c51dcc5948d46fbf640dfe0441782cab85fa4ac"),
+            hexstr2bin("7d7dc5f71eb29ddaf80d6214632eeae03d9058af1fb6d22ed80badb62bc1a534"),
+            secp256r1,
+            hexstr2bin("46fc62106420ff012e54a434fbdd2d25ccc5852060561e68040dd7778997bd7b")},
+     {ecdh, hexstr2point("809f04289c64348c01515eb03d5ce7ac1a8cb9498f5caa50197e58d43a86a7ae", "b29d84e811197f25eba8f5194092cb6ff440e26d4421011372461f579271cda3"),
+            hexstr2bin("38f65d6dce47676044d58ce5139582d568f64bb16098d179dbab07741dd5caf5"),
+            secp256r1,
+            hexstr2bin("057d636096cb80b67a8c038c890e887d1adfa4195e9b3ce241c8a778c59cda67")},
+     {ecdh, hexstr2point("a7c76b970c3b5fe8b05d2838ae04ab47697b9eaf52e764592efda27fe7513272734466b400091adbf2d68c58e0c50066", "ac68f19f2e1cb879aed43a9969b91a0839c4c38a49749b661efedf243451915ed0905a32b060992b468c64766fc8437a"),
+            hexstr2bin("3cc3122a68f0d95027ad38c067916ba0eb8c38894d22e1b15618b6818a661774ad463b205da88cf699ab4d43c9cf98a1"),
+            secp384r1,
+            hexstr2bin("5f9d29dc5e31a163060356213669c8ce132e22f57c9a04f40ba7fcead493b457e5621e766c40a2e3d4d6a04b25e533f1")},
+     {ecdh, hexstr2point("30f43fcf2b6b00de53f624f1543090681839717d53c7c955d1d69efaf0349b7363acb447240101cbb3af6641ce4b88e0", "25e46c0c54f0162a77efcc27b6ea792002ae2ba82714299c860857a68153ab62e525ec0530d81b5aa15897981e858757"),
+            hexstr2bin("92860c21bde06165f8e900c687f8ef0a05d14f290b3f07d8b3a8cc6404366e5d5119cd6d03fb12dc58e89f13df9cd783"),
+            secp384r1,
+            hexstr2bin("a23742a2c267d7425fda94b93f93bbcc24791ac51cd8fd501a238d40812f4cbfc59aac9520d758cf789c76300c69d2ff")},
+     {ecdh, hexstr2point("00685a48e86c79f0f0875f7bc18d25eb5fc8c0b07e5da4f4370f3a9490340854334b1e1b87fa395464c60626124a4e70d0f785601d37c09870ebf176666877a2046d", "01ba52c56fc8776d9e8f5db4f0cc27636d0b741bbe05400697942e80b739884a83bde99e0f6716939e632bc8986fa18dccd443a348b6c3e522497955a4f3c302f676"),
+            hexstr2bin("017eecc07ab4b329068fba65e56a1f8890aa935e57134ae0ffcce802735151f4eac6564f6ee9974c5e6887a1fefee5743ae2241bfeb95d5ce31ddcb6f9edb4d6fc47"),
+            secp521r1,
+            hexstr2bin("005fc70477c3e63bc3954bd0df3ea0d1f41ee21746ed95fc5e1fdf90930d5e136672d72cc770742d1711c3c3a4c334a0ad9759436a4d3c5bf6e74b9578fac148c831")},
+     {ecdh, hexstr2point("01df277c152108349bc34d539ee0cf06b24f5d3500677b4445453ccc21409453aafb8a72a0be9ebe54d12270aa51b3ab7f316aa5e74a951c5e53f74cd95fc29aee7a", "013d52f33a9f3c14384d1587fa8abe7aed74bc33749ad9c570b471776422c7d4505d9b0a96b3bfac041e4c6a6990ae7f700e5b4a6640229112deafa0cd8bb0d089b0"),
+            hexstr2bin("00816f19c1fb10ef94d4a1d81c156ec3d1de08b66761f03f06ee4bb9dcebbbfe1eaa1ed49a6a990838d8ed318c14d74cc872f95d05d07ad50f621ceb620cd905cfb8"),
+            secp521r1,
+            hexstr2bin("000b3920ac830ade812c8f96805da2236e002acbbf13596a9ab254d44d0e91b6255ebf1229f366fb5a05c5884ef46032c26d42189273ca4efa4c3db6bd12a6853759")},
+
+     %% RFC-6954, Appendix A
+     {ecdh, hexstr2point("A9C21A569759DA95E0387041184261440327AFE33141CA04B82DC92E",
+			 "98A0F75FBBF61D8E58AE5511B2BCDBE8E549B31E37069A2825F590C1"),
+            hexstr2bin("6060552303899E2140715816C45B57D9B42204FB6A5BF5BEAC10DB00"),
+            brainpoolP224r1,
+            hexstr2bin("1A4BFE705445120C8E3E026699054104510D119757B74D5FE2462C66")},
+     {ecdh, hexstr2point("034A56C550FF88056144E6DD56070F54B0135976B5BF77827313F36B",
+			 "75165AD99347DC86CAAB1CBB579E198EAF88DC35F927B358AA683681"),
+            hexstr2bin("39F155483CEE191FBECFE9C81D8AB1A03CDA6790E7184ACE44BCA161"),
+            brainpoolP224r1,
+            hexstr2bin("1A4BFE705445120C8E3E026699054104510D119757B74D5FE2462C66")},
+     {ecdh, hexstr2point("44106E913F92BC02A1705D9953A8414DB95E1AAA49E81D9E85F929A8E3100BE5",
+			 "8AB4846F11CACCB73CE49CBDD120F5A900A69FD32C272223F789EF10EB089BDC"),
+            hexstr2bin("55E40BC41E37E3E2AD25C3C6654511FFA8474A91A0032087593852D3E7D76BD3"),
+            brainpoolP256r1,
+            hexstr2bin("89AFC39D41D3B327814B80940B042590F96556EC91E6AE7939BCE31F3A18BF2B")},
+     {ecdh, hexstr2point("8D2D688C6CF93E1160AD04CC4429117DC2C41825E1E9FCA0ADDD34E6F1B39F7B",
+			 "990C57520812BE512641E47034832106BC7D3E8DD0E4C7F1136D7006547CEC6A"),
+            hexstr2bin("81DB1EE100150FF2EA338D708271BE38300CB54241D79950F77B063039804F1D"),
+            brainpoolP256r1,
+            hexstr2bin("89AFC39D41D3B327814B80940B042590F96556EC91E6AE7939BCE31F3A18BF2B")},
+     {ecdh, hexstr2point("68B665DD91C195800650CDD363C625F4E742E8134667B767B1B476793588F885AB698C852D4A6E77A252D6380FCAF068",
+			 "55BC91A39C9EC01DEE36017B7D673A931236D2F1F5C83942D049E3FA20607493E0D038FF2FD30C2AB67D15C85F7FAA59"),
+            hexstr2bin("032640BC6003C59260F7250C3DB58CE647F98E1260ACCE4ACDA3DD869F74E01F8BA5E0324309DB6A9831497ABAC96670"),
+            brainpoolP384r1,
+            hexstr2bin("0BD9D3A7EA0B3D519D09D8E48D0785FB744A6B355E6304BC51C229FBBCE239BBADF6403715C35D4FB2A5444F575D4F42")},
+     {ecdh, hexstr2point("4D44326F269A597A5B58BBA565DA5556ED7FD9A8A9EB76C25F46DB69D19DC8CE6AD18E404B15738B2086DF37E71D1EB4",
+			 "62D692136DE56CBE93BF5FA3188EF58BC8A3A0EC6C1E151A21038A42E9185329B5B275903D192F8D4E1F32FE9CC78C48"),
+            hexstr2bin("1E20F5E048A5886F1F157C74E91BDE2B98C8B52D58E5003D57053FC4B0BD65D6F15EB5D1EE1610DF870795143627D042"),
+            brainpoolP384r1,
+            hexstr2bin("0BD9D3A7EA0B3D519D09D8E48D0785FB744A6B355E6304BC51C229FBBCE239BBADF6403715C35D4FB2A5444F575D4F42")},
+     {ecdh, hexstr2point("0A420517E406AAC0ACDCE90FCD71487718D3B953EFD7FBEC5F7F27E28C6149999397E91E029E06457DB2D3E640668B392C2A7E737A7F0BF04436D11640FD09FD",
+			 "72E6882E8DB28AAD36237CD25D580DB23783961C8DC52DFA2EC138AD472A0FCEF3887CF62B623B2A87DE5C588301EA3E5FC269B373B60724F5E82A6AD147FDE7"),
+            hexstr2bin("230E18E1BCC88A362FA54E4EA3902009292F7F8033624FD471B5D8ACE49D12CFABBC19963DAB8E2F1EBA00BFFB29E4D72D13F2224562F405CB80503666B25429"),
+            brainpoolP512r1,
+            hexstr2bin("A7927098655F1F9976FA50A9D566865DC530331846381C87256BAF3226244B76D36403C024D7BBF0AA0803EAFF405D3D24F11A9B5C0BEF679FE1454B21C4CD1F")},
+     {ecdh, hexstr2point("9D45F66DE5D67E2E6DB6E93A59CE0BB48106097FF78A081DE781CDB31FCE8CCBAAEA8DD4320C4119F1E9CD437A2EAB3731FA9668AB268D871DEDA55A5473199F",
+			 "2FDC313095BCDD5FB3A91636F07A959C8E86B5636A1E930E8396049CB481961D365CC11453A06C719835475B12CB52FC3C383BCE35E27EF194512B71876285FA"),
+            hexstr2bin("16302FF0DBBB5A8D733DAB7141C1B45ACBC8715939677F6A56850A38BD87BD59B09E80279609FF333EB9D4C061231FB26F92EEB04982A5F1D1764CAD57665422"),
+            brainpoolP512r1,
+            hexstr2bin("A7927098655F1F9976FA50A9D566865DC530331846381C87256BAF3226244B76D36403C024D7BBF0AA0803EAFF405D3D24F11A9B5C0BEF679FE1454B21C4CD1F")}].
 
 dh() ->
     {dh, 0087761979513264537414556992123116644042638206717762626089877284926656954974893442000747478454809111207351620687968672207938731607963470779396984752680274820156266685080223616226905101126463253150237669547023934604953898814222890239130021414026118792251620881355456432549881723310342870016961804255746630219, 2}.
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index d5d7c8a128..98c071cf87 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 3.0
+CRYPTO_VSN = 3.2
diff --git a/lib/debugger/doc/src/book.xml b/lib/debugger/doc/src/book.xml
index b8440eed2b..82ae6b5b94 100644
--- a/lib/debugger/doc/src/book.xml
+++ b/lib/debugger/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/debugger/doc/src/debugger.xml b/lib/debugger/doc/src/debugger.xml
index 479c4271b0..a04dce92d2 100644
--- a/lib/debugger/doc/src/debugger.xml
+++ b/lib/debugger/doc/src/debugger.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/debugger/doc/src/debugger_chapter.xml b/lib/debugger/doc/src/debugger_chapter.xml
index d309b839a4..99b6d07355 100644
--- a/lib/debugger/doc/src/debugger_chapter.xml
+++ b/lib/debugger/doc/src/debugger_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/debugger/doc/src/fascicules.xml b/lib/debugger/doc/src/fascicules.xml
index 1b9d6bc94d..154c8a3b6d 100644
--- a/lib/debugger/doc/src/fascicules.xml
+++ b/lib/debugger/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/debugger/doc/src/i.xml b/lib/debugger/doc/src/i.xml
index 9560b43665..fb7641c30e 100644
--- a/lib/debugger/doc/src/i.xml
+++ b/lib/debugger/doc/src/i.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/debugger/doc/src/int.xml b/lib/debugger/doc/src/int.xml
index 0794685f34..3a5886ceb9 100644
--- a/lib/debugger/doc/src/int.xml
+++ b/lib/debugger/doc/src/int.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
index aef7ef8619..a3543a1e11 100644
--- a/lib/debugger/doc/src/notes.xml
+++ b/lib/debugger/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -32,6 +32,22 @@
   <p>This document describes the changes made to the Debugger
     application.</p>
 
+<section><title>Debugger 3.2.12</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix matching of floating point middle-endian machines.
+	    Thanks to Johannes Weissl.</p>
+          <p>
+	    Own Id: OTP-11201</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 3.2.11</title>
 
     <section><title>Improvements and New Features</title>
@@ -84,7 +100,7 @@
         <item>
           <p>
 	    Fix Debugger settings dialog due to changed behavior in
-	    wxFileDialog (Thanks to H�kan Mattsson)</p>
+	    wxFileDialog (Thanks to Håkan Mattsson)</p>
           <p>
 	    Own Id: OTP-10621</p>
         </item>
@@ -126,7 +142,7 @@
         <item>
           <p>
 	    Fixed disappearing breakpoints bug, reported by Ricardo
-	    Catalinas Jim�nez.</p>
+	    Catalinas Jiménez.</p>
           <p>
 	    Own Id: OTP-9950</p>
         </item>
@@ -147,7 +163,7 @@
 	    occurrences of "Ok" to "OK" in the code, variable names
 	    and strings. This improves the consistency of the code
 	    and follows the GTK UI where "OK" is always used.(Thanks
-	    to Ricardo Catalinas Jim�nez)</p>
+	    to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-9699</p>
         </item>
diff --git a/lib/debugger/doc/src/part.xml b/lib/debugger/doc/src/part.xml
index b5646235d4..0c90feab66 100644
--- a/lib/debugger/doc/src/part.xml
+++ b/lib/debugger/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/debugger/doc/src/ref_man.xml b/lib/debugger/doc/src/ref_man.xml
index 62bef83646..9ecc1f8879 100644
--- a/lib/debugger/doc/src/ref_man.xml
+++ b/lib/debugger/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/debugger/priv/erlang_bug.png b/lib/debugger/priv/erlang_bug.png
index 87c8279654..200f531484 100644
--- a/lib/debugger/priv/erlang_bug.png
+++ b/lib/debugger/priv/erlang_bug.png
diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
index 85754da219..90189dd297 100644
--- a/lib/debugger/src/Makefile
+++ b/lib/debugger/src/Makefile
@@ -45,20 +45,6 @@ MODULES= \
 	dbg_iload \
 	dbg_iserver \
 	dbg_istk \
-	dbg_ui_break \
-	dbg_ui_break_win \
-	dbg_ui_edit \
-	dbg_ui_edit_win \
-	dbg_ui_filedialog_win \
-	dbg_ui_interpret \
-	dbg_ui_mon \
-	dbg_ui_mon_win \
-	dbg_ui_settings \
-	dbg_ui_trace \
-	dbg_ui_trace_win \
-	dbg_ui_view \
-	dbg_ui_win \
-	dbg_ui_winman \
 	dbg_wx_break \
 	dbg_wx_break_win \
 	dbg_wx_code \
diff --git a/lib/debugger/src/dbg_icmd.erl b/lib/debugger/src/dbg_icmd.erl
index b230efaa7a..b1bf4ebecc 100644
--- a/lib/debugger/src/dbg_icmd.erl
+++ b/lib/debugger/src/dbg_icmd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -399,7 +399,7 @@ eval_restricted({From,_Mod,Cmd,SP}, Bs) ->
 
 eval_nonrestricted({From,Mod,Cmd,SP}, Bs, #ieval{level=Le}) when SP < Le->
     %% Evaluate in stack
-    eval_restricted({From, Mod, Cmd, SP}, Bs),
+    _ = eval_restricted({From, Mod, Cmd, SP}, Bs),
     Bs;
 eval_nonrestricted({From, _Mod, Cmd, _SP}, Bs, 
 		   #ieval{level=Le,module=M,line=Line}=Ieval) ->
@@ -465,7 +465,8 @@ tell_attached(Msg) ->
     case get(attached) of
 	undefined -> ignore;
 	AttPid ->
-	    AttPid ! {self(), Msg}
+	    AttPid ! {self(), Msg},
+            ignore
     end.
 
 %%====================================================================
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl
index f4b6d488a5..1d36aae8ee 100644
--- a/lib/debugger/src/dbg_ieval.erl
+++ b/lib/debugger/src/dbg_ieval.erl
@@ -204,7 +204,8 @@ meta(Int, Debugged, M, F, As) ->
 		%% If it's a fun we're evaluating, show a text
 		%% representation of the fun and its arguments,
 		%% not dbg_ieval:eval_fun(...)
-		{dbg_ieval, eval_fun} ->
+		{dbg_ieval, EvalFun} when EvalFun =:= eval_fun;
+					  EvalFun =:= eval_named_fun ->
 		    {Mx, Fx} = lists:last(As),
 		    {Mx, Fx, lists:nth(2, As)};
 		_ ->
@@ -432,7 +433,8 @@ eval_function(Mod, Name, As, Bs, Called, Ieval0, Lc) ->
 
 do_eval_function(Mod, Fun, As0, Bs0, _, Ieval0) when is_function(Fun);
 						    Mod =:= ?MODULE,
-						    Fun =:= eval_fun ->
+						    Fun =:= eval_fun orelse
+						    Fun =:= eval_named_fun ->
     #ieval{level=Le,line=Li,top=Top} = Ieval0,
     case lambda(Fun, As0) of
 	{[{clause,Fc,_,_,_}|_]=Cs,Module,Name,As,Bs} ->
@@ -487,13 +489,29 @@ lambda(eval_fun, [Cs,As,Bs,{Mod,Name}=F]) ->
 	true -> 
 	    {error,{badarity,{F,As}}}
     end;
+lambda(eval_named_fun, [Cs,As,Bs0,FName,RF,{Mod,Name}=F]) ->
+    %% Fun defined in interpreted code, called from outside
+    if
+	length(element(3,hd(Cs))) =:= length(As) ->
+	    db_ref(Mod),  %% Adds ref between module and process
+	    Bs1 = add_binding(FName, RF, Bs0),
+	    {Cs,Mod,Name,As,Bs1};
+	true ->
+	    {error,{badarity,{F,As}}}
+    end;
 lambda(Fun, As) when is_function(Fun) ->
     %% Fun called from within interpreted code...
     case erlang:fun_info(Fun, module) of
 
 	%% ... and the fun was defined in interpreted code
 	{module, ?MODULE} ->
-	    {env, [{Mod,Name},Bs,Cs]} = erlang:fun_info(Fun, env),
+	    {Mod,Name,Bs, Cs} =
+		case erlang:fun_info(Fun, env) of
+		    {env,[{{M,F},Bs0,Cs0}]} ->
+		        {M,F,Bs0, Cs0};
+		    {env,[{{M,F},Bs0,Cs0,FName}]} ->
+		        {M,F,add_binding(FName, Fun, Bs0), Cs0}
+		end,
 	    {arity, Arity} = erlang:fun_info(Fun, arity),
 	    if 
 		length(As) =:= Arity ->
@@ -636,6 +654,21 @@ expr({tuple,Line,Es0}, Bs0, Ieval) ->
     {Vs,Bs} = eval_list(Es0, Bs0, Ieval#ieval{line=Line}),
     {value,list_to_tuple(Vs),Bs};
 
+%% Map
+expr({map,Line,Fs0}, Bs0, Ieval) ->
+    {Fs,Bs} = eval_map_fields(Fs0, Bs0, Ieval#ieval{line=Line,top=false}),
+    Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi) end,
+                        #{}, Fs),
+    {value,Value,Bs};
+expr({map,Line,E0,Fs0}, Bs0, Ieval0) ->
+    Ieval = Ieval0#ieval{line=Line,top=false},
+    {value,E,Bs1} = expr(E0, Bs0, Ieval),
+    {Fs,Bs2} = eval_map_fields(Fs0, Bs1, Ieval),
+    Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi);
+                            ({map_exact,K,V}, Mi) -> maps:update(K,V,Mi) end,
+                        E, Fs),
+    {value,Value,Bs2};
+
 %% A block of statements
 expr({block,Line,Es},Bs,Ieval) ->
     seq(Es, Bs, Ieval#ieval{line=Line});
@@ -694,23 +727,25 @@ expr({'if',Line,Cs}, Bs, Ieval) ->
     if_clauses(Cs, Bs, Ieval#ieval{line=Line});
 
 %% Andalso/orelse
-expr({'andalso',Line,E1,E2}, Bs, Ieval) ->
-    case expr(E1, Bs, Ieval#ieval{line=Line, top=false}) of
-	{value,false,_}=Res ->
-	    Res;
-	{value,true,_} -> 
-	    expr(E2, Bs, Ieval#ieval{line=Line, top=false});
-	{value,Val,Bs} ->
-	    exception(error, {badarg,Val}, Bs, Ieval)
+expr({'andalso',Line,E1,E2}, Bs0, Ieval) ->
+    case expr(E1, Bs0, Ieval#ieval{line=Line, top=false}) of
+        {value,false,_}=Res ->
+           Res;
+        {value,true,Bs} ->
+            {value,Val,_} = expr(E2, Bs, Ieval#ieval{line=Line, top=false}),
+            {value,Val,Bs};
+        {value,Val,Bs} ->
+            exception(error, {badarg,Val}, Bs, Ieval)
     end;
-expr({'orelse',Line,E1,E2}, Bs, Ieval) ->
-    case expr(E1, Bs, Ieval#ieval{line=Line, top=false}) of
-	{value,true,_}=Res ->
-	    Res;
-	{value,false,_} ->
-	    expr(E2, Bs, Ieval#ieval{line=Line, top=false});
-	{value,Val,_} ->
-	    exception(error, {badarg,Val}, Bs, Ieval)
+expr({'orelse',Line,E1,E2}, Bs0, Ieval) ->
+    case expr(E1, Bs0, Ieval#ieval{line=Line, top=false}) of
+        {value,true,_}=Res ->
+           Res;
+        {value,false,Bs} ->
+            {value,Val,_} = expr(E2, Bs, Ieval#ieval{line=Line, top=false}),
+            {value,Val,Bs};
+        {value,Val,Bs} ->
+            exception(error, {badarg,Val}, Bs, Ieval)
     end;
 
 %% Matching expression
@@ -727,50 +762,121 @@ expr({match,Line,Lhs,Rhs0}, Bs0, Ieval0) ->
 %% Construct a fun
 expr({make_fun,Line,Name,Cs}, Bs, #ieval{module=Module}=Ieval) ->
     Arity = length(element(3,hd(Cs))),
-    Info = {Module,Name},
+    Info = {{Module,Name},Bs,Cs},
     Fun = 
 	case Arity of
-	    0 -> fun() -> eval_fun(Cs, [], Bs, Info) end;
-	    1 -> fun(A) -> eval_fun(Cs, [A], Bs,Info) end;
-	    2 -> fun(A,B) -> eval_fun(Cs, [A,B], Bs,Info) end;
-	    3 -> fun(A,B,C) -> eval_fun(Cs, [A,B,C], Bs,Info) end;
-	    4 -> fun(A,B,C,D) -> eval_fun(Cs, [A,B,C,D], Bs,Info) end;
-	    5 -> fun(A,B,C,D,E) -> eval_fun(Cs, [A,B,C,D,E], Bs,Info) end;
-	    6 -> fun(A,B,C,D,E,F) -> eval_fun(Cs, [A,B,C,D,E,F], Bs,Info) end;
+	    0 -> fun() -> eval_fun([], Info) end;
+	    1 -> fun(A) -> eval_fun([A], Info) end;
+	    2 -> fun(A,B) -> eval_fun([A,B], Info) end;
+	    3 -> fun(A,B,C) -> eval_fun([A,B,C], Info) end;
+	    4 -> fun(A,B,C,D) -> eval_fun([A,B,C,D], Info) end;
+	    5 -> fun(A,B,C,D,E) -> eval_fun([A,B,C,D,E], Info) end;
+	    6 -> fun(A,B,C,D,E,F) -> eval_fun([A,B,C,D,E,F], Info) end;
 	    7 -> fun(A,B,C,D,E,F,G) -> 
-			 eval_fun(Cs, [A,B,C,D,E,F,G], Bs,Info) end;
+			 eval_fun([A,B,C,D,E,F,G], Info) end;
 	    8 -> fun(A,B,C,D,E,F,G,H) -> 
-			 eval_fun(Cs, [A,B,C,D,E,F,G,H], Bs,Info) end;
+			 eval_fun([A,B,C,D,E,F,G,H], Info) end;
 	    9 -> fun(A,B,C,D,E,F,G,H,I) -> 
-			 eval_fun(Cs, [A,B,C,D,E,F,G,H,I], Bs,Info) end;
+			 eval_fun([A,B,C,D,E,F,G,H,I], Info) end;
 	    10 -> fun(A,B,C,D,E,F,G,H,I,J) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J], Info) end;
 	    11 -> fun(A,B,C,D,E,F,G,H,I,J,K) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K], Info) end;
 	    12 -> fun(A,B,C,D,E,F,G,H,I,J,K,L) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L], Info) end;
 	    13 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M], Info) end;
 	    14 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N], Info) end;
 	    15 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O], Info) end;
 	    16 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P], Info) end;
 	    17 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q], Info) end;
 	    18 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R], Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R], Info) end;
 	    19 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S) -> 
-		     	  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S],Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S],Info) end;
 	    20 -> fun(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T) -> 
-			  eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T],Bs,Info) end;
+			  eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T],Info) end;
 	    _Other ->
 		exception(error, {'argument_limit',{'fun',Cs}}, Bs,
 			  Ieval#ieval{line=Line})
 	end,
     {value,Fun,Bs};
 
+%% Construct a fun
+expr({make_named_fun,Line,Name,FName,Cs}, Bs, #ieval{module=Module}=Ieval) ->
+    Arity = length(element(3,hd(Cs))),
+    Info = {{Module,Name},Bs,Cs,FName},
+    Fun =
+	case Arity of
+	    0 -> fun RF() -> eval_named_fun([], RF, Info) end;
+	    1 -> fun RF(A) -> eval_named_fun([A], RF, Info) end;
+	    2 -> fun RF(A,B) ->
+			 eval_named_fun([A,B], RF, Info) end;
+	    3 -> fun RF(A,B,C) ->
+			 eval_named_fun([A,B,C], RF, Info) end;
+	    4 -> fun RF(A,B,C,D) ->
+			 eval_named_fun([A,B,C,D], RF, Info) end;
+	    5 -> fun RF(A,B,C,D,E) ->
+			 eval_named_fun([A,B,C,D,E],
+					RF, Info) end;
+	    6 -> fun RF(A,B,C,D,E,F) ->
+			 eval_named_fun([A,B,C,D,E,F],
+					RF, Info) end;
+	    7 -> fun RF(A,B,C,D,E,F,G) ->
+			 eval_named_fun([A,B,C,D,E,F,G],
+					RF, Info) end;
+	    8 -> fun RF(A,B,C,D,E,F,G,H) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H],
+					RF, Info) end;
+	    9 -> fun RF(A,B,C,D,E,F,G,H,I) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I],
+					RF, Info) end;
+	    10 -> fun RF(A,B,C,D,E,F,G,H,I,J) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J],
+					RF, Info) end;
+	    11 -> fun RF(A,B,C,D,E,F,G,H,I,J,K) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K],
+					RF, Info) end;
+	    12 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L],
+					RF, Info) end;
+	    13 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M],
+					RF, Info) end;
+	    14 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N],
+					RF, Info) end;
+	    15 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O],
+					RF, Info) end;
+	    16 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P],
+					RF, Info) end;
+	    17 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q],
+					RF, Info) end;
+	    18 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,
+					     R],
+					RF, Info) end;
+	    19 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,
+					     R,S],
+					RF, Info) end;
+	    20 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T) ->
+			 eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,
+					     R,S,T],
+					RF, Info) end;
+	    _Other ->
+		exception(error, {'argument_limit',{named_fun,FName,Cs}}, Bs,
+			  Ieval#ieval{line=Line})
+	end,
+    {value,Fun,Bs};
+
 %% Construct an external fun.
 expr({make_ext_fun,Line,MFA0}, Bs0, Ieval0) ->
     {[M,F,A],Bs} = eval_list(MFA0, Bs0, Ieval0),
@@ -960,9 +1066,13 @@ expr(E, _Bs, _Ieval) ->
     erlang:error({'NYI',E}).
 
 %% Interpreted fun() called from uninterpreted module, recurse
-eval_fun(Cs, As, Bs, Info) ->
+eval_fun(As, {Info,Bs,Cs}) ->
     dbg_debugged:eval(?MODULE, eval_fun, [Cs,As,Bs,Info]).
 
+%% Interpreted named fun() called from uninterpreted module, recurse
+eval_named_fun(As, RF, {Info,Bs,Cs,FName}) ->
+    dbg_debugged:eval(?MODULE, eval_named_fun, [Cs,As,Bs,FName,RF,Info]).
+
 %% eval_lc(Expr,[Qualifier],Bindings,IevalState) ->
 %%	{value,Value,Bindings}.
 %% This is evaluating list comprehensions "straight out of the book".
@@ -1032,7 +1142,7 @@ eval_generate([V|Rest], P, Bs0, CompFun, Ieval) ->
     case catch match1(P, V, erl_eval:new_bindings(), Bs0) of
 	{match,Bsn} ->
 	    Bs2 = add_bindings(Bsn, Bs0),
-            CompFun(Bs2) ++ eval_generate(Rest, P, Bs2, CompFun, Ieval);
+            CompFun(Bs2) ++ eval_generate(Rest, P, Bs0, CompFun, Ieval);
 	nomatch -> 
 	    eval_generate(Rest, P, Bs0, CompFun, Ieval)
 	end;
@@ -1373,6 +1483,19 @@ guard_expr({cons,_,H0,T0}, Bs) ->
 guard_expr({tuple,_,Es0}, Bs) ->
     {values,Es} = guard_exprs(Es0, Bs),
     {value,list_to_tuple(Es)};
+guard_expr({map,_,Fs0}, Bs) ->
+    Fs = eval_map_fields_guard(Fs0, Bs),
+    Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi) end,
+                        #{}, Fs),
+    {value,Value};
+guard_expr({map,_,E0,Fs0}, Bs) ->
+    {value,E} = guard_expr(E0, Bs),
+    Fs = eval_map_fields_guard(Fs0, Bs),
+    Value = lists:foldl(fun ({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi);
+                            ({map_exact,K,V}, Mi) -> maps:update(K,V,Mi) end,
+                        E, Fs),
+    io:format("~p~n", [{E,Value}]),
+    {value,Value};
 guard_expr({bin,_,Flds}, Bs) ->
     {value,V,_Bs} = 
 	eval_bits:expr_grp(Flds, Bs,
@@ -1382,6 +1505,37 @@ guard_expr({bin,_,Flds}, Bs) ->
 			   end, [], false),
     {value,V}.
 
+
+%% eval_map_fields([Field], Bindings, IEvalState) ->
+%%  {[{map_assoc | map_exact,Key,Value}],Bindings}
+
+eval_map_fields(Fs, Bs, Ieval) ->
+    eval_map_fields(Fs, Bs, Ieval, fun expr/3).
+
+eval_map_fields_guard(Fs0, Bs) ->
+    {Fs,_} = eval_map_fields(Fs0, Bs, #ieval{},
+                             fun (G0, Bs0, _) ->
+                            {value,G} = guard_expr(G0, Bs0),
+                            {value,G,Bs0}
+                    end),
+    Fs.
+
+eval_map_fields(Fs, Bs, Ieval, F) ->
+    eval_map_fields(Fs, Bs, Ieval, F, []).
+
+eval_map_fields([{map_field_assoc,Line,K0,V0}|Fs], Bs0, Ieval0, F, Acc) ->
+    Ieval = Ieval0#ieval{line=Line},
+    {value,K,Bs1} = F(K0, Bs0, Ieval),
+    {value,V,Bs2} = F(V0, Bs1, Ieval),
+    eval_map_fields(Fs, Bs2, Ieval0, F, [{map_assoc,K,V}|Acc]);
+eval_map_fields([{map_field_exact,Line,K0,V0}|Fs], Bs0, Ieval0, F, Acc) ->
+    Ieval = Ieval0#ieval{line=Line},
+    {value,K,Bs1} = F(K0, Bs0, Ieval),
+    {value,V,Bs2} = F(V0, Bs1, Ieval),
+    eval_map_fields(Fs, Bs2, Ieval0, F, [{map_exact,K,V}|Acc]);
+eval_map_fields([], Bs, _Ieval, _F, Acc) ->
+    {lists:reverse(Acc),Bs}.
+
 %% match(Pattern,Term,Bs) -> {match,Bs} | nomatch
 match(Pat, Term, Bs) ->
     try match1(Pat, Term, Bs, Bs)
@@ -1411,6 +1565,8 @@ match1({cons,_,H,T}, [H1|T1], Bs0, BBs) ->
 match1({tuple,_,Elts}, Tuple, Bs, BBs) 
   when length(Elts) =:= tuple_size(Tuple) ->
     match_tuple(Elts, Tuple, 1, Bs, BBs);
+match1({map,_,Fields}, Map, Bs, BBs) when is_map(Map) ->
+    match_map(Fields, Map, Bs, BBs);
 match1({bin,_,Fs}, B, Bs0, BBs) when is_bitstring(B) ->
     try eval_bits:match_bits(Fs, B, Bs0, BBs,
 			     match_fun(BBs),
@@ -1434,6 +1590,17 @@ match_tuple([E|Es], Tuple, I, Bs0, BBs) ->
 match_tuple([], _, _, Bs, _BBs) ->
     {match,Bs}.
 
+match_map([{map_field_exact,_,K0,Pat}|Fs], Map, Bs0, BBs) ->
+    {value,K,BBs} = expr(K0, BBs, #ieval{}),
+    case maps:find(K, Map) of
+        {ok,Value} ->
+            {match,Bs} = match1(Pat, Value, Bs0, BBs),
+            match_map(Fs, Map, Bs, BBs);
+        error -> throw(nomatch)
+    end;
+match_map([], _, Bs, _BBs) ->
+    {match,Bs}.
+
 head_match([Par|Pars], [Arg|Args], Bs0, BBs) ->
     try match1(Par, Arg, Bs0, BBs) of
 	{match,Bs} -> head_match(Pars, Args, Bs, BBs)
diff --git a/lib/debugger/src/dbg_iload.erl b/lib/debugger/src/dbg_iload.erl
index 3c95ef8068..266cf239dd 100644
--- a/lib/debugger/src/dbg_iload.erl
+++ b/lib/debugger/src/dbg_iload.erl
@@ -194,6 +194,11 @@ pattern({cons,Line,H0,T0}) ->
 pattern({tuple,Line,Ps0}) ->
     Ps1 = pattern_list(Ps0),
     {tuple,Line,Ps1};
+pattern({map,Line,Fs0}) ->
+    Fs1 = lists:map(fun ({map_field_exact,L,K,V}) ->
+                            {map_field_exact,L,expr(K, false),pattern(V)}
+                    end, Fs0),
+    {map,Line,Fs1};
 pattern({op,_,'-',{integer,Line,I}}) ->
     {value,Line,-I};
 pattern({op,_,'+',{integer,Line,I}}) ->
@@ -262,6 +267,8 @@ guard_test({string,Line,_}) -> {value,Line,false};
 guard_test({nil,Line}) -> {value,Line,false};
 guard_test({cons,Line,_,_}) -> {value,Line,false};
 guard_test({tuple,Line,_}) -> {value,Line,false};
+guard_test({map,Line,_}) -> {value,Line,false};
+guard_test({map,Line,_,_}) -> {value,Line,false};
 guard_test({bin,Line,_}) ->  {value,Line,false}.
 
 gexpr({var,Line,V}) -> {var,Line,V};
@@ -279,6 +286,13 @@ gexpr({cons,Line,H0,T0}) ->
 gexpr({tuple,Line,Es0}) ->
     Es1 = gexpr_list(Es0),
     {tuple,Line,Es1};
+gexpr({map,Line,Fs0}) ->
+    Fs1 = map_fields(Fs0, fun gexpr/1),
+    {map,Line,Fs1};
+gexpr({map,Line,E0,Fs0}) ->
+    E1 = gexpr(E0),
+    Fs1 = map_fields(Fs0, fun gexpr/1),
+    {map,Line,E1,Fs1};
 gexpr({bin,Line,Flds0}) ->
     Flds = gexpr_list(Flds0),
     {bin,Line,Flds};
@@ -341,6 +355,13 @@ expr({cons,Line,H0,T0}, _Lc) ->
 expr({tuple,Line,Es0}, _Lc) ->
     Es1 = expr_list(Es0),
     {tuple,Line,Es1};
+expr({map,Line,Fs0}, _Lc) ->
+    Fs1 = map_fields(Fs0),
+    {map,Line,Fs1};
+expr({map,Line,E0,Fs0}, _Lc) ->
+    E1 = expr(E0, false),
+    Fs1 = map_fields(Fs0),
+    {map,Line,E1,Fs1};
 expr({block,Line,Es0}, Lc) ->
     %% Unfold block into a sequence.
     Es1 = exprs(Es0, Lc),
@@ -369,6 +390,9 @@ expr({'fun',Line,{function,F,A},{_Index,_OldUniq,Name}}, _Lc) ->
     As = new_vars(A, Line),
     Cs = [{clause,Line,As,[],[{local_call,Line,F,As,true}]}],
     {make_fun,Line,Name,Cs};
+expr({named_fun,Line,FName,Cs0,{_,_,Name}}, _Lc) when is_atom(Name) ->
+    Cs = fun_clauses(Cs0),
+    {make_named_fun,Line,Name,FName,Cs};
 expr({'fun',Line,{function,{atom,_,M},{atom,_,F},{integer,_,A}}}, _Lc)
   when 0 =< A, A =< 255 ->
     %% New format in R15 for fun M:F/A (literal values).
@@ -433,7 +457,7 @@ expr({lc,Line,E0,Gs0}, _Lc) ->			%R8.
 		       ({b_generate,L,P0,Qs}) -> %R12.
 			   {b_generate,L,expr(P0, false),expr(Qs, false)};
 		       (Expr) ->
-			   case is_guard(Expr) of
+			   case erl_lint:is_guard_test(Expr) of
 			       true -> {guard,guard([[Expr]])};
 			       false -> expr(Expr, false)
 			   end
@@ -445,7 +469,7 @@ expr({bc,Line,E0,Gs0}, _Lc) ->			%R12.
 		       ({b_generate,L,P0,Qs}) -> %R12.
 			   {b_generate,L,expr(P0, false),expr(Qs, false)};
 		       (Expr) ->
-			   case is_guard(Expr) of
+			   case erl_lint:is_guard_test(Expr) of
 			       true -> {guard,guard([[Expr]])};
 			       false -> expr(Expr, false)
 			   end
@@ -488,42 +512,6 @@ expr({bin_element,Line,Expr,Size,Type}, _Lc) ->
 expr(Other, _Lc) ->
     exit({?MODULE,{unknown_expr,Other}}).
 
-%% is_guard(Expression) -> true | false.
-%%  Test if a general expression is a guard test or guard BIF.
-%%  Cannot use erl_lint here as sys_pre_expand has transformed source.
-
-is_guard({op,_,Op,L,R}) ->
-    erl_internal:comp_op(Op, 2) andalso is_gexpr_list([L,R]);
-is_guard({call,_,{remote,_,{atom,_,erlang},{atom,_,Test}},As}) ->
-    Arity = length(As),
-    (erl_internal:guard_bif(Test, Arity) orelse
-     erl_internal:old_type_test(Test, Arity)) andalso is_gexpr_list(As);
-is_guard({atom,_,true}) -> true;
-is_guard(_) -> false.
-
-is_gexpr({var,_,_}) -> true;
-is_gexpr({atom,_,_}) -> true;
-is_gexpr({integer,_,_}) -> true;
-is_gexpr({char,_,_}) -> true;
-is_gexpr({float,_,_}) -> true;
-is_gexpr({string,_,_}) -> true;
-is_gexpr({nil,_}) -> true;
-is_gexpr({cons,_,H,T}) -> is_gexpr_list([H,T]);
-is_gexpr({tuple,_,Es}) -> is_gexpr_list(Es);
-is_gexpr({call,_,{remote,_,{atom,_,erlang},{atom,_,F}},As}) ->
-    Ar = length(As),
-    case erl_internal:guard_bif(F, Ar) of
-	true -> is_gexpr_list(As);
-	false -> erl_internal:arith_op(F, Ar) andalso is_gexpr_list(As)
-    end;
-is_gexpr({op,_,Op,A}) ->
-    erl_internal:arith_op(Op, 1) andalso is_gexpr(A);
-is_gexpr({op,_,Op,A1,A2}) ->
-    erl_internal:arith_op(Op, 2) andalso is_gexpr_list([A1,A2]);
-is_gexpr(_) -> false.
-
-is_gexpr_list(Es) -> lists:all(fun (E) -> is_gexpr(E) end, Es).
-
 consify([A|As]) -> 
     {cons,0,A,consify(As)};
 consify([]) -> {value,0,[]}.
@@ -547,6 +535,15 @@ fun_clauses([{clause,L,H,G,B}|Cs]) ->
     [{clause,L,head(H),guard(G),exprs(B, true)}|fun_clauses(Cs)];
 fun_clauses([]) -> [].
 
+map_fields(Fs) ->
+    map_fields(Fs, fun (E) -> expr(E, false) end).
+
+map_fields([{map_field_assoc,L,N,V}|Fs], F) ->
+    [{map_field_assoc,L,F(N),F(V)}|map_fields(Fs)];
+map_fields([{map_field_exact,L,N,V}|Fs], F) ->
+    [{map_field_exact,L,F(N),F(V)}|map_fields(Fs)];
+map_fields([], _) -> [].
+
 %% new_var_name() -> VarName.
 
 new_var_name() ->
diff --git a/lib/debugger/src/dbg_ui_break.erl b/lib/debugger/src/dbg_ui_break.erl
deleted file mode 100644
index 8b9a236ce7..0000000000
--- a/lib/debugger/src/dbg_ui_break.erl
+++ /dev/null
@@ -1,98 +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(dbg_ui_break).
-
-%% External exports
--export([start/3, start/4, start/5]).
-
-%% Internal exports
--export([init/5]).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start(GS, Pos, Type)
-%% start(GS, Pos, Type, Module, Line)
-%%   GS = graphics system identifier
-%%   Pos = {X, Y}
-%%     X = Y = integer()
-%%   Type =  line | conditional | function
-%%   Module = atom()
-%%   Line = integer()
-%%--------------------------------------------------------------------
-start(GS, Pos, Type) ->
-    start(GS, Pos, Type, "", "").
-start(GS, Pos, Type, Mod) ->
-    start(GS, Pos, Type, Mod, "").
-start(GS, Pos, Type, Mod, Line) ->
-    spawn_link(?MODULE, init, [GS, Pos, Type, Mod, Line]).
-
-
-%%====================================================================
-%% Internal exports
-%%====================================================================
-
-init(GS, Pos, Type, Mod, Line) ->
-    Win = dbg_ui_break_win:create_win(GS, Pos, Type, Mod, Line),
-    if
-	Type==function, is_atom(Mod) ->
-	    Win2 = gui_cmd({module, Mod}, Win),
-	    loop(Win2);
-	true ->
-	    loop(Win)
-    end.
-
-loop(Win) ->
-    receive
-
-	%% From the GUI
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent)==gs ->
-	    Cmd = dbg_ui_break_win:handle_event(GuiEvent, Win),
-	    Win2 = gui_cmd(Cmd, Win),
-	    loop(Win2)
-    end.
-
-gui_cmd(ignore, Win) ->
-    Win;
-gui_cmd(stopped, _Win) ->
-    exit(normal);
-gui_cmd({win, Win2}, _Win) ->
-    Win2;
-gui_cmd({module, Mod}, Win) ->
-    Funcs = int:functions(Mod),
-    dbg_ui_break_win:update_functions(Win, Funcs);
-gui_cmd({break, DataL, Action}, _Win) ->
-    Fun =
-	fun(Data) ->
-		case Data of
-		    [Mod, Line] ->
-			int:break(Mod, Line),
-			int:action_at_break(Mod, Line, Action);
-		    [Mod, Line, CMod, CFunc] ->
-			int:break(Mod, Line),
-			int:test_at_break(Mod, Line, {CMod, CFunc}),
-			int:action_at_break(Mod, Line, Action);
-		    [Mod, Func, Arity] ->
-			int:break_in(Mod, Func, Arity)
-		end
-	end,
-    lists:foreach(Fun, DataL),
-    exit(normal).
diff --git a/lib/debugger/src/dbg_ui_break_win.erl b/lib/debugger/src/dbg_ui_break_win.erl
deleted file mode 100644
index 11d810ccab..0000000000
--- a/lib/debugger/src/dbg_ui_break_win.erl
+++ /dev/null
@@ -1,314 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(dbg_ui_break_win).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,entry,2}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,listbox,2}},
-          {nowarn_deprecated_function,{gs,menu,2}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,radiobutton,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
-%% External exports
--export([create_win/5,
-	 update_functions/2,
-	 handle_event/2]).
-
--record(winInfo, {type,            % line | conditional | function
-		  win,             % gsobj()
-		  packer,          % gsobj() | undefined
-		  entries,         % [{atom|integer, GSobj()}]
-		  trigger,         % enable | disable | delete
-		  ok,              % gsobj()
-		  cancel,          % gsobj()
-		  listbox,         % gsobj()
-		  funcs=[]         % [[Name, Arity]]
-		 }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% create_win(GS, Pos, Type, Mod, Line) -> #winInfo{}
-%%   GS = graphics system identifier
-%%   Pos = {X, Y}
-%%     X = Y = integer()
-%%   Type =  line | conditional | function
-%%   Mod = atom() | ""
-%%   Line = integer() | ""
-%%--------------------------------------------------------------------
-create_win(GS, {X, Y}, function, Mod, _Line) ->
-    Pad = 8,
-    W = 230,
-
-    Font = dbg_ui_win:font(normal),
-
-    %% Window
-    Win = gs:window(GS, [{title, "Function Break"}, {x, X}, {y, Y},
-			 {destroy, true}, {configure, true},
-			 {keypress, true}, {data, window}]),
-
-    %% Frame
-    Frm = gs:frame(Win, [{x, 0}, {y, 0}, {width, W}, {height, 190},
-			 {packer_x, [{fixed, 70}, {stretch, 1, W-80},
-				     {fixed, 10}]},
-			 {packer_y, [{fixed, 10}, {fixed, 30},
-				     {stretch, 1, 100}, {fixed, 40}]}]),
-
-    %% Create input field (label+entry)
-    gs:label(Frm, [{label, {text,"Module:"}}, {font, Font}, {align, e},
-		   {pack_x, 1}, {pack_y, 2}]),
-    Ent = gs:entry(Frm, [{text, Mod},
-			 {pack_x, 2}, {pack_y, 2},
-			 {keypress, true}, {setfocus, true},
-			 {buttonpress, true}]),
-    Entries = [{Ent, atom}],
-
-    %% Create a listbox containing the functions of the module
-    gs:label(Frm, [{label, {text,"Function:"}}, {font, Font}, {align, ne},
-		   {pack_x, 1}, {pack_y, 3}]),
-    Lb = gs:listbox(Frm, [{bw, 2}, {relief, ridge}, {vscroll, right},
-			  {pack_x, 2}, {pack_y, 3},
-			  {selectmode, multiple}]),
-
-    %% Add OK and Cancel buttons
-    {Wbtn, Hbtn} = dbg_ui_win:min_size(["OK","Cancel"], 70, 30),
-    Bot = gs:frame(Frm, [{pack_x, {1, 3}}, {pack_y, 4}]),
-    OK = gs:button(Bot, [{x, Pad}, {y, Pad},
-			 {width, Wbtn}, {height, Hbtn},
-			 {label, {text,"OK"}}, {font, Font}]),
-    Cancel = gs:button(Bot, [{x, W-Pad-Wbtn}, {y, Pad},
-			     {width, Wbtn}, {height, Hbtn},
-			     {label, {text,"Cancel"}}, {font, Font}]),
-
-    Wfrm = gs:read(Frm, width), Hfrm = gs:read(Frm, height),
-    gs:config(Win, [{width, Wfrm}, {height, Hfrm}, {map, true}]),
-    #winInfo{type=function, win=Win,
-	     packer=Frm, entries=Entries, trigger=enable,
-	     ok=OK, cancel=Cancel, listbox=Lb, funcs=[]};
-create_win(GS, {X, Y}, Type, Mod, Line) ->
-    Pad = 8,
-    W = 230,
-
-    Font = dbg_ui_win:font(normal),
-
-    %% Window
-    Title = case Type of
-		line -> "Line Break";
-		conditional -> "Conditional Break"
-	    end,
-    Win = gs:window(GS, [{title, Title}, {x, X}, {y, Y},
-			 {destroy, true}]),
-
-    %% Create input fields (label+entry)
-    {Wlbl, Hlbl} = dbg_ui_win:min_size(["C-Function:"], 10, 30),
-    Went = W-Wlbl-2*Pad,
-    Labels = case Type of
-		 line ->
-		     [{atom,"Module:",Mod}, {integer,"Line:",Line}];
-		 conditional ->
-		     [{atom,"Module:",Mod}, {integer,"Line:",Line},
-		      {atom,"C-Module:",""}, {atom,"C-Function:",""}]
-	     end,
-    Fun = fun({DataType, Label, Default}, Yin) ->
-		  gs:create(label, Win, [{x, Pad}, {y, Yin},
-					 {width,Wlbl}, {height,Hlbl},
-					 {label, {text,Label}},
-					 {font, Font}, {align, e}]),
-		  Ent = gs:create(entry, Win, [{x, Pad+Wlbl}, {y, Yin},
-					       {width, Went},
-					       {height, Hlbl},
-					       {text, Default},
-					       {keypress, true}]),
-		  {{Ent, DataType}, Yin+Hlbl}
-	  end,
-    {Entries, Yacc} = lists:mapfoldl(Fun, Pad, Labels),
-    {First, _DataType} = hd(Entries),
-    gs:config(First, [{buttonpress, true}, {setfocus, true}]),
-
-    %% Add 'trigger action' buttons
-    {Wlbl2, Hlbl2} = dbg_ui_win:min_size(["Trigger Action"], 100, 20),
-    Wfrm = Wlbl2+8, Hfrm = Hlbl2*4+4,
-    Grp = erlang:now(),
-    Frm = gs:frame(Win, [{x, W/2-Wfrm/2-2}, {y, Yacc+Pad-2},
-			 {width, Wfrm}, {height, Hfrm}, {bw, 2}]),
-    gs:label(Frm, [{label, {text, "Trigger Action"}}, {font, Font},
-		   {x, 2}, {y, 0}, {width, Wlbl2}, {height, Hlbl2}]),
-    gs:radiobutton(Frm, [{label, {text, "Enable"}}, {font, Font},
-			 {x, 10}, {y, Hlbl2},
-			 {width, Wlbl2-10}, {height, Hlbl2},
-			 {align, w}, {group, Grp},
-			 {data, {trigger, enable}},
-			 {select, true}]),
-    gs:radiobutton(Frm, [{label, {text, "Disable"}}, {font, Font},
-			 {x, 10}, {y, Hlbl2*2},
-			 {width, Wlbl2-10}, {height, Hlbl2},
-			 {align, w}, {group, Grp},
-			 {data, {trigger, disable}}]),
-    gs:radiobutton(Frm, [{label, {text, "Delete"}}, {font, Font},
-			 {x, 10}, {y, Hlbl2*3},
-			 {width, Wlbl2-10}, {height, Hlbl2},
-			 {align, w}, {group, Grp},
-			 {data, {trigger, delete}}]),
-
-    %% Add OK and Cancel buttons
-    {Wbtn, Hbtn} = dbg_ui_win:min_size(["OK","Cancel"], 70, 30),
-    Ybtn = Yacc + Pad + Hfrm + Pad,
-    OK = gs:button(Win, [{x, Pad}, {y, Ybtn},
-			 {width, Wbtn}, {height, Hbtn},
-			 {label, {text,"OK"}}, {font, Font}]),
-    gs:button(Win, [{x, W-Pad-Wbtn}, {y, Ybtn},
-		    {width, Wbtn}, {height, Hbtn},
-		    {label, {text,"Cancel"}}, {font, Font}]),
-
-    Hwin = Ybtn + Hbtn + Pad,
-    gs:config(Win, [{width, W}, {height, Hwin}, {map, true}]),
-
-    #winInfo{type=Type, win=Win,
-	     entries=Entries, trigger=enable, ok=OK}.
-
-%%--------------------------------------------------------------------
-%% update_functions(WinInfo, Funcs) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Funcs = [{Name, Arity}]
-%%     Name = atom()
-%%     Arity = integer()
-%%--------------------------------------------------------------------
-update_functions(WinInfo, Funcs) ->
-    Items = lists:map(fun([N, A]) -> io_lib:format("~p/~p", [N, A]) end,
-		      Funcs),
-    gs:config(WinInfo#winInfo.listbox, [{items, Items},
-					{setfocus, true}]),
-    WinInfo#winInfo{funcs=Funcs}.
-
-%%--------------------------------------------------------------------
-%% handle_event(GSEvent, WinInfo) -> Command
-%% GSEvent = {gs, Id, Event, Data, Arg}
-%% WinInfo = #winInfo{}
-%% Command = ignore
-%%         | stopped
-%%         | {win, WinInfo}
-%%         | {module, Mod}
-%%         | {break, [[Mod, Line]], Action}
-%%         | {break, [[Mod, Line, CMod, CFunc]], Action}
-%%         | {break, [[Mod, Func, Arity]], Action}
-%%--------------------------------------------------------------------
-handle_event({gs, _Id, destroy, _Data, _Arg}, _WinInfo) ->
-    stopped;
-handle_event({gs, _Id, configure, _Data, [W, H|_]}, WinInfo) ->
-    gs:config(WinInfo#winInfo.packer, [{width, W-10}, {height, H-10}]),
-    gs:config(WinInfo#winInfo.cancel, [{x, W-80}]),
-    ignore;
-handle_event({gs, Ent, buttonpress, _,[N,X0,Y0|_]}, WinInfo) when N>1 ->
-    %% Right (middle) mouse button click in module entry, display a
-    %% menu containing all interpreted modules
-    Mods = int:interpreted(),
-    X = gs:read(Ent, x) + X0,
-    Y = gs:read(Ent, y) + Y0,
-    Menu = gs:menu(WinInfo#winInfo.win, [{post_at,{X,Y}}]),
-    lists:foreach(fun(Mod) ->
-			  gs:menuitem(Menu, [{label,{text,Mod}},
-					     {data,{module,Mod}}])
-		  end,
-		  Mods),
-    ignore;
-handle_event({gs, LB, keypress, window, [Key|_]}, WinInfo) ->
-    %% Used for functional break window, since listboxes for some
-    %% reason doesn't generate keypress events
-    if
-	Key/='Tab', Key/='Return' ->
-	    ignore;
-	true ->
-	    handle_event({gs, LB, click, listbox, ["OK"]}, WinInfo)
-    end;
-handle_event({gs, Ent, keypress, Data, [Key|_]}, WinInfo) ->
-    case WinInfo#winInfo.type of
-	function when Key/='Tab', Key/='Return' ->
-	    case gs:read(WinInfo#winInfo.listbox, items) of
-		[] -> ignore;
-		_Items ->
-		    gs:config(WinInfo#winInfo.listbox, clear),
-		    {win, WinInfo#winInfo{funcs=[]}}
-	    end;
-	function -> % 'Return' | 'Tab' pressed in Module entry
-	    case check_input(WinInfo#winInfo.entries) of
-		error -> ignore;
-		[Mod] -> {module, Mod}
-	    end;
-	_Type when Key=='Tab'; Key=='Return' ->
-	    case next_entry(Ent, WinInfo#winInfo.entries) of
-		last ->
-		    gs:config(WinInfo#winInfo.ok, flash),
-		    handle_event({gs, Ent, click, Data, ["OK"]}, WinInfo);
-		Next ->
-		    gs:config(Next, {setfocus, true}),
-		    ignore
-	    end;
-	_Type -> ignore
-    end;
-handle_event({gs, _Id, click, _Data, ["OK"|_]}, WinInfo) ->
-    case check_input(WinInfo#winInfo.entries) of
-	error -> ignore;
-	Data when WinInfo#winInfo.type/=function ->
-	    {break, [Data], WinInfo#winInfo.trigger};
-	[Mod] -> % Function break window
-	    case gs:read(WinInfo#winInfo.listbox, selection) of
-		[] ->
-		    {module, Mod};
-		IndexL ->
-		    Funcs = WinInfo#winInfo.funcs,
-		    Breaks =
-			[[Mod|lists:nth(Index+1, Funcs)] || Index <- IndexL],
-		    {break, Breaks, enable}
-	    end
-    end;
-handle_event({gs, _Id, click, _Data, ["Cancel"|_]}, _WinInfo) ->
-    stopped;
-handle_event({gs, _Id, click, {trigger,Trigger}, _Arg}, WinInfo) ->
-    {win, WinInfo#winInfo{trigger=Trigger}};
-handle_event({gs, _Id, click, {module, Mod}, _Arg}, WinInfo) ->
-    {Ent, _DataType} = hd(WinInfo#winInfo.entries),
-    gs:config(Ent, {insert,{0,Mod}}),
-    ignore;
-handle_event(_GSEvent, _WinInfo) ->
-    ignore.
-
-check_input(Entries) ->
-    check_input(Entries, []).
-check_input([{Entry, Type} | Entries], Data) ->
-    Str = gs:read(Entry, text),
-    case erl_scan:string(Str) of
-	{ok, [{Type, _Line, Val}], _EndLine} ->
-	    check_input(Entries, [Val|Data]);
-	_Error -> error
-    end;
-check_input([], Data) -> lists:reverse(Data).
-
-next_entry(Entry, [{Entry, _Type}]) ->
-    last;
-next_entry(Entry, [{Entry, _Type1}, {Next, _Type2}|_]) ->
-    Next;
-next_entry(Entry, [_|Entries]) ->
-    next_entry(Entry, Entries).
diff --git a/lib/debugger/src/dbg_ui_edit.erl b/lib/debugger/src/dbg_ui_edit.erl
deleted file mode 100644
index 390e6acdb4..0000000000
--- a/lib/debugger/src/dbg_ui_edit.erl
+++ /dev/null
@@ -1,91 +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(dbg_ui_edit).
-
-%% External exports
--export([start/5]).
-
-%% Internal exports
--export([init/6]).
-
--record(state, {win,    % term() Edit dialog window data
-		pid,    % pid() Parent
-		prompt  % atom()
-	       }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start(GS, Pos, Title, Prompt, {Type, Value})
-%%   GS = graphics system identifier
-%%   Pos = {X, Y}
-%%     X = Y = integer()
-%%   Title = string()
-%%   Prompt = atom()
-%%   Type = term | atom | float | integer | string
-%%   Value = term()
-%%--------------------------------------------------------------------
-start(GS, Pos, Title, Prompt, Edit) ->
-    case dbg_ui_winman:is_started(Title) of
-	true -> ignore;
-	false ->
-	    spawn(?MODULE, init, [self(), GS, Pos, Title, Prompt, Edit])
-    end.
-
-
-%%====================================================================
-%% Internal exports
-%%====================================================================
-
-init(Pid, GS, Pos, Title, Prompt, Edit) ->
-
-    %% Create edit dialog window
-    Win = dbg_ui_edit_win:create_win(GS, Pos, Title, Prompt, Edit),
-    Window = dbg_ui_edit_win:get_window(Win),
-    dbg_ui_winman:insert(Title, Window),
-    State = #state{win=Win, pid=Pid, prompt=Prompt},
-
-    loop(State).
-
-loop(State) ->
-    receive
-
-	%% From the GUI
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent)==gs ->
-	    Cmd = dbg_ui_edit_win:handle_event(GuiEvent,
-						    State#state.win),
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the dbg_ui_winman process (Debugger window manager)
-	{dbg_ui_winman, update_windows_menu, _Data} ->
-	    loop(State);
-	{dbg_ui_winman, destroy} ->
-	    exit(normal)
-    end.
-
-gui_cmd(ignore, State) ->
-    State;
-gui_cmd(stopped, _State) ->
-    exit(normal);
-gui_cmd({edit, Value}, State) ->
-    State#state.pid ! {dbg_ui_edit, State#state.prompt, Value},
-    exit(normal).
diff --git a/lib/debugger/src/dbg_ui_edit_win.erl b/lib/debugger/src/dbg_ui_edit_win.erl
deleted file mode 100644
index 2e9a685b57..0000000000
--- a/lib/debugger/src/dbg_ui_edit_win.erl
+++ /dev/null
@@ -1,128 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(dbg_ui_edit_win).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,entry,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
-%% External exports
--export([create_win/5, get_window/1,
-	 handle_event/2]).
-
--record(winInfo, {window,   % gsobj()
-		  entry,    % gsobj()
-		  button,   % gsobj()
-		  type      % atom()
-		 }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% create_win(GS, Pos, Title, Prompt, {Type, Value}) -> #winInfo{}
-%%   GS = graphics system identifier
-%%   Pos = {X, Y}
-%%     X = Y = integer()
-%%   Title = string()
-%%   Prompt = atom()
-%%   Type = term | atom | float | integer | string
-%%   Value = term()
-%%--------------------------------------------------------------------
-create_win(GS, {X, Y}, Title, Prompt, {Type, Value}) ->
-    Pad=8,
-
-    Font = dbg_ui_win:font(normal),
-
-    %% Window
-    Win = gs:window(GS, [{title, Title}, {x, X}, {y, Y},
-			 {destroy, true}]),
-
-    %% Label
-    {Wlbl, Hlbl} = dbg_ui_win:min_size([Prompt], 50, 30),
-    gs:label(Win, [{x, Pad}, {y, Pad}, {width, Wlbl}, {height, Hlbl},
-		   {align, e}, {label, {text, Prompt}}, {font, Font}]),
-
-
-    %% Entry
-    {Went, _Hent} = dbg_ui_win:min_size([Value], 100, 20),
-    Ent = gs:entry(Win, [{x, Pad+Wlbl}, {y, Pad},
-			 {width, Went}, {height, Hlbl},
-			 {text, Value},
-			 {keypress, true}]),
-
-    %% OK and Cancel buttons
-    W = Pad + Wlbl + Went + Pad,
-    {Wbtn, Hbtn} = dbg_ui_win:min_size(["Cancel"], 70, 30),
-    Ybtn = Pad + Hlbl + Pad,
-    Btn = gs:button(Win, [{x, Pad}, {y, Ybtn},
-			  {width, Wbtn}, {height, Hbtn},
-			  {label, {text,"OK"}}, {font, Font}]),
-    gs:button(Win, [{x, W-Pad-Wbtn}, {y, Ybtn},
-		    {width, Wbtn}, {height, Hbtn},
-		    {label, {text,"Cancel"}}, {font, Font}]),
-
-    H = Ybtn + Hbtn + Pad,
-    gs:config(Win, [{width, W}, {height, H}, {map, true}]),
-
-    #winInfo{window=Win, entry=Ent, button=Btn, type=Type}.
-
-%%--------------------------------------------------------------------
-%% get_window(WinInfo) -> Window
-%%   WinInfo = #winInfo{}
-%%   Window = gsobj()
-%%--------------------------------------------------------------------
-get_window(WinInfo) ->
-    WinInfo#winInfo.window.
-
-%%--------------------------------------------------------------------
-%% handle_event(GSEvent, WinInfo) -> Command
-%% GSEvent = {gs, Id, Event, Data, Arg}
-%% WinInfo = #winInfo{}
-%% Command = ignore
-%%         | stopped
-%%         | {edit, Value}
-%%--------------------------------------------------------------------
-handle_event({gs, _Id, destroy, _Data, _Arg}, _WinInfo) ->
-    stopped;
-handle_event({gs, Id, keypress, Data, ['Return'|_]}, WinInfo) ->
-    gs:config(WinInfo#winInfo.button, flash),
-    handle_event({gs, Id, click, Data, ["OK"]}, WinInfo);
-handle_event({gs, _Id, click, _Data, ["OK"|_]}, WinInfo) ->
-    Ent = WinInfo#winInfo.entry,
-    Str = gs:read(Ent, text),
-    Type = WinInfo#winInfo.type,
-    case erl_scan:string(Str) of
-	{ok, Tokens, _EndLine} when Type==term ->
-	    case erl_parse:parse_term(Tokens++[{dot, 1}]) of
-		{ok, Value} -> {edit, Value};
-		_Error -> ignore
-	    end;
-	{ok, [{Type, _Line, Value}], _EndLine} when Type/=term ->
-	    {edit, Value};
-	_ ->
-	    ignore
-    end;
-handle_event({gs, _Id, click, _Data, ["Cancel"|_]}, _WinInfo) ->
-    stopped;
-handle_event(_GSEvent, _WinInfo) ->
-    ignore.
diff --git a/lib/debugger/src/dbg_ui_filedialog_win.erl b/lib/debugger/src/dbg_ui_filedialog_win.erl
deleted file mode 100644
index 52dc2012f3..0000000000
--- a/lib/debugger/src/dbg_ui_filedialog_win.erl
+++ /dev/null
@@ -1,340 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(dbg_ui_filedialog_win).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,entry,3}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,listbox,3}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
-%% External exports
--export([create_win/6, create_win/7, get_window/1,
-	 tag/2,
-	 handle_event/2]).
-
--record(winInfo, {window,        % gsobj()
-		  extra,         % fun()
-		  cwd,           % string()
-		  pattern        % string()
-		 }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% create_win(GS, Title, Pos, Mode, Filter, Extra)
-%% create_win(GS, Title, Pos, Mode, Filter, Extra, FileName) -> #winInfo{}
-%%   GS  = term()
-%%   Title = string()
-%%   Pos = {X,Y}
-%%   Mode = normal | multiselect
-%%   Filter = string() File name that may include * symbols.
-%%   Extra = fun(File) -> {true, tag} | true | {error, term()}
-%%   FileName = string() Suggested file name when saving
-%%--------------------------------------------------------------------
-create_win(GS, Title, {X,Y}, Mode, Filter, Extra) ->
-    create_win(GS, Title, {X,Y}, Mode, Filter, Extra, null).
-create_win(GS, Title, {X,Y}, Mode, Filter, Extra, FileName) ->
-    Pad = 8,
-    Wlb = 480, Hlb = 130,
-
-    Font = dbg_ui_win:font(normal),
-
-    {Wlbl, Hlbl} = dbg_ui_win:min_size(["Directories"], 80, 20),
-    {Wbtn, Hbtn} = dbg_ui_win:min_size(["Filter","Cancel"], 70, 30),
-
-    %% Window
-    Win = gs:window(GS, [{title,Title}, {x, X}, {y,Y}, {destroy,true}]),
-
-    %% 'Filter' label and entry (for selecting directory)
-    gs:label(Win, [{label, {text,"Filter"}}, {font, Font}, {align, sw},
-		   {x, Pad+2}, {y, Pad}, {width,Wlbl}, {height,Hlbl}]),
-    gs:entry('Filter', Win, [{x, Pad}, {y, Pad+Hlbl},
-			     {width, Wlb}, {height, Hbtn},
-			     {keypress, true}]),
-
-    %% Listboxes (showing directories and files)
-    Xmid = Pad + Wlb/2,
-    Y2 = Pad + Hlbl + Hbtn + Pad,
-    gs:label(Win, [{label, {text,"Directories"}},
-		   {font, Font}, {align, sw},
-		   {x, Pad+2}, {y, Y2},
-		   {width, Wlbl}, {height, Hlbl}]),
-    gs:label(Win, [{label, {text,"Files"}},
-		   {font, Font}, {align, sw},
-		   {x, Xmid+Pad/2+2}, {y, Y2},
-		   {width, Wlbl}, {height, Hlbl}]),
-    gs:listbox('Dirs', Win, [{x, Pad}, {y, Y2+Hlbl},
-			     {width, Wlb/2-Pad/2}, {height, Hlb},
-			     {vscroll, right},
-			     {click, true}, {doubleclick, true}]),
-    gs:listbox('Files', Win, [{x, Xmid+Pad/2}, {y, Y2+Hlbl},
-			      {width, Wlb/2-Pad/2}, {height, Hlb},
-			      {vscroll, right},
-			      {click, true}, {doubleclick, true}]),
-
-    %% 'Selection' label and entry (for selecting file)
-    Y3 = Y2 + Hlbl + Hlb,
-    gs:label(Win, [{label, {text,"Selection"}}, {font,Font}, {align,sw},
-		   {x, Pad+2}, {y, Y3}, {width, Wlbl}, {height, Hlbl}]),
-    gs:entry('Selection', Win, [{x, Pad}, {y, Y3+Hlbl},
-				{width, Wlb}, {height, Hbtn},
-				{keypress, true}]),
-
-    %% Buttons
-    Y4 = Y3 + Hlbl + Hbtn + Pad,
-    Wb = Wlb - Wbtn,
-    Opts = [{y, Y4}, {width, Wbtn}, {height, Hbtn}, {font, Font}],
-    case Mode of
-	normal ->
-	    gs:button(Win, [{label, {text,"OK"}}, {x, Pad},
-			    {data, select} | Opts]),
-	    gs:button(Win, [{label, {text,"Filter"}}, {x, Wlb/2-Wbtn/2},
-			    {data, filter} | Opts]),
-	    gs:button(Win, [{label, {text,"Cancel"}}, {x, Pad+Wb},
-			    {data, done} | Opts]);
-	multiselect ->
-	    gs:button(Win, [{label, {text,"Choose"}}, {x, Pad},
-			    {data, select} | Opts]),
-	    gs:button(Win, [{label, {text,"All"}}, {x, Pad+Wb/3},
-			    {data, multiselect} | Opts]),
-	    gs:button(Win, [{label, {text,"Filter"}}, {x, Pad+2*Wb/3},
-			    {data, filter} | Opts]),
-	    gs:button(Win, [{label, {text,"Done"}}, {x, Pad+Wb},
-			    {data, done} | Opts])
-    end,
-
-    %% Insert contents
-    {ok, Home} = file:get_cwd(),
-    {Cwd, Pattern} = update_win(Filter, Extra, Home),
-    if
-	is_list(FileName) ->
-	    gs:config('Selection', {text, filename:join(Cwd,FileName)});
-	true -> ignore
-    end,
-
-    Wwin = Pad + Wlb + Pad,
-    Hwin = Y4 + Hbtn + Pad,
-    gs:config(Win, [{width, Wwin}, {height, Hwin}, {map, true}]),
-
-    #winInfo{window=Win, extra=Extra, cwd=Cwd, pattern=Pattern}.
-
-%%--------------------------------------------------------------------
-%% get_window(WinInfo) -> Window
-%%   WinInfo = #winInfo{}
-%%   Window = gsobj()
-%%--------------------------------------------------------------------
-get_window(WinInfo) ->
-    WinInfo#winInfo.window.
-
-%%--------------------------------------------------------------------
-%% tag(WinInfo, File)
-%%   WinInfo = #winInfo{}
-%%   File = string()
-%%--------------------------------------------------------------------
-tag(WinInfo, File0) ->
-    File = relfile(WinInfo#winInfo.cwd, File0),
-    case member(File, gs:read('Files', items)) of
-	{true, Index} -> gs:config('Files', {change, {Index, tag(File)}});
-	false -> ignore
-    end.
-
-tag(Str) -> [$*|Str].
-untag([$*|Str]) -> Str;
-untag([$(|Str]) -> [$)|Rts] = lists:reverse(Str),lists:reverse(Rts);
-untag(Str) -> Str.
-
-member(E, L) ->        member(E, L, 0).
-member(E, [E|_], I) -> {true, I};
-member(E, [_|T], I) -> member(E, T, I+1);
-member(_E, [], _I) ->  false.
-
-%%--------------------------------------------------------------------
-%% handle_event(GSEvent, WinInfo) -> Command
-%%   GSEvent = {gs, Id, Event, Data, Arg}
-%%   WinInfo = #winInfo{}
-%%   Command = ignore
-%%           | {stopped, Dir}
-%%           | {win, WinInfo}
-%%           | {select, File} | {multiselect, Dir, FileNames}
-%%--------------------------------------------------------------------
-handle_event({gs, _Id, destroy, _Data, _Args}, WinInfo) ->
-    {stopped, WinInfo#winInfo.cwd};
-
-handle_event({gs, 'Filter', keypress, _Data, ['Return'|_]}, WinInfo) ->
-    handle_event({gs, null, click, filter, null}, WinInfo);
-handle_event({gs, 'Selection', keypress, _Data, ['Return'|_]}, WinInfo) ->
-    handle_event({gs, null, click, select, null}, WinInfo);
-
-handle_event({gs, 'Dirs', click, _Data, [0,"..",true|_]}, WinInfo) ->
-    Filter = filename:join(filename:dirname(WinInfo#winInfo.cwd),
-			   WinInfo#winInfo.pattern),
-    gs:config('Filter', {text, Filter}),
-    ignore;
-handle_event({gs, 'Dirs', click, _Data, [_Index,Str,true|_]}, WinInfo) ->
-    Filter = filename:join([WinInfo#winInfo.cwd, Str,
-			    WinInfo#winInfo.pattern]),
-    gs:config('Filter', {text, Filter}),
-    ignore;
-handle_event({gs, 'Dirs', doubleclick, _Data, _Arg}, WinInfo) ->
-    handle_event({gs, null, click, filter, null}, WinInfo);
-
-handle_event({gs, 'Files', click, _Data, [_Index,Str,true|_]}, WinInfo) ->
-    Selection = filename:join(WinInfo#winInfo.cwd, untag(Str)),
-    gs:config('Selection', {text, Selection}),
-    ignore;
-handle_event({gs, 'Files', doubleclick, _Data, _Arg}, WinInfo) ->
-    handle_event({gs, null, click, select, null}, WinInfo);
-  
-handle_event({gs, _Id, click, select, _Arg}, _WinInfo) ->
-    {select, gs:read('Selection', text)};
-handle_event({gs, _Id, click, multiselect, _Arg}, WinInfo) ->
-    Files = [untag(File) || File <- gs:read('Files', items)],
-    {multiselect, WinInfo#winInfo.cwd, Files};
-handle_event({gs, _Id, click, filter, _Arg}, WinInfo) ->
-    {Cwd, Pattern} = update_win(gs:read('Filter', text),
-				WinInfo#winInfo.extra,
-				WinInfo#winInfo.cwd),
-    {win, WinInfo#winInfo{cwd=Cwd, pattern=Pattern}};
-handle_event({gs, _Id, click, done, _Arg}, WinInfo) ->
-    {stopped, WinInfo#winInfo.cwd};
-    
-handle_event(_GSEvent, _WinInfo) ->
-    ignore.
-
-%%====================================================================
-%% Internal functions
-%%====================================================================
-
-update_win(Filter, ExtraFilter, Prev) ->
-    {Res, {Filter2, Cwd, FilePattern}} = check_filter(Filter, Prev),
-
-    Dirs = [".." | get_subdirs(Cwd)],
-
-    gs:config('Filter', {text, Filter2}),
-    gs:config('Dirs', {items, Dirs}),
-    gs:config('Selection', {text, Cwd}),
-
-    case Res of
-	ok ->
-	    Matching = lists:sort(filelib:wildcard(Filter2, erl_prim_loader)),
-	    Files = extra_filter(Matching, Cwd, ExtraFilter),
-	    gs:config('Files', {items, Files});
-	error ->
-	    gs:config('Files', beep)
-    end,
-
-    {Cwd, FilePattern}.
-
-%% check_filter(Filter, Prev) -> {ok, Res} | {error, Res}
-%%   Res = {Filter, Cwd, FilePattern}
-%%   Filter = Prev = Cwd = FilePattern = string()
-check_filter(Filter0, Prev) ->
-    Filter = case filename:pathtype(Filter0) of
-		 absolute -> Filter0;
-		 _Relative -> filename:absname(Filter0, Prev)
-	     end,
-    Comps = filename:split(Filter),
-    Last = lists:last(Comps),
-    FilePattern = case is_pattern(Last) of
-		      true -> Last;
-		      false -> "*"
-		  end,
-    {Cwd, Rest} = max_existing(Comps),
-    case Rest of
-	[] ->
-	    %% Filter = existing file or directory
-	    Res = case filelib:is_dir(Filter, erl_prim_loader) of
-		      true -> {filename:join(Filter, "*"), Filter, "*"};
-		      false -> {Filter, filename:dirname(Filter),
-				filename:basename(Filter)}
-		  end,
-	    {ok, Res};
-	[FilePattern] ->
-	    %% Filter = existing dir and valid pattern
-	    {ok, {Filter, Cwd, FilePattern}}; 
-	Comps ->
-	    %% Filter = garbage
-	    {error, {Prev, Prev, "*"}};
-	[Name|_Names] ->
-	    %% Filter = existing dir ++ pattern or non-existing file/dir
-	    case is_pattern(Name) of
-		true -> {ok, {Filter, Cwd, FilePattern}};
-		false -> {error, {Cwd, Cwd, ""}}
-	    end
-    end.
-
-max_existing([Name | Names]) ->
-    case filelib:is_file(Name, erl_prim_loader) of
-	true -> max_existing(Name, Names);
-	false -> {[], [Name | Names]}
-    end.
-max_existing(Dir, [Name | Names]) ->
-    Dir2 = filename:join(Dir, Name),
-    case filelib:is_file(Dir2, erl_prim_loader) of
-	true when Names =:= [] -> {Dir2, []};
-	true -> max_existing(Dir2, Names);
-	false -> {Dir, [Name | Names]}
-    end.
-
-is_pattern(Str) ->
-    lists:member($*, Str).
-
-extra_filter([File|Files], Dir, Fun) ->
-    case Fun(File) of
-	true ->
-	    [relfile(Dir, File) | extra_filter(Files, Dir, Fun)];
-	{true,tag} ->
-	    [[$*|relfile(Dir,File)] | extra_filter(Files, Dir, Fun)];
-	{true,disable} ->
-	    [[$(|relfile(Dir,File)]++[$)] | extra_filter(Files, Dir, Fun)];
-	{error, _Reason} -> extra_filter(Files, Dir, Fun)
-    end;
-extra_filter([], _Dir, _Fun) -> [].
-
-get_subdirs(Dir) ->
-    case erl_prim_loader:list_dir(Dir) of
-	{ok, FileNames} ->
-	    X = [FN || FN <- FileNames,
-		       filelib:is_dir(filename:join(Dir, FN), erl_prim_loader)],
-	    lists:sort(X);
-	_Error ->
-	    []
-    end.
-
-%% Return the "remainder" of a file name relative a dir name, examples:
-%%   relfile("/home/gunilla", "/home/gunilla/m.erl") -> "m.erl"
-%%   relfile("/home/gunilla/dir", "/home/gunilla/dir/m.erl") -> "dir/m.erl"
-%%   relfile("/home/gunilla", "/home/arne/m.erl") -> "/home/arne/m.erl"
-relfile(Dir, File) ->
-    case compare(Dir, File) of
-	error -> File;
-	RelFile -> RelFile
-    end.
-
-compare([_|Dir], [_|File]) ->
-    compare(Dir, File);
-compare([], [$/|File]) ->
-    File;
-compare(_, _) ->
-    error.
diff --git a/lib/debugger/src/dbg_ui_interpret.erl b/lib/debugger/src/dbg_ui_interpret.erl
deleted file mode 100644
index 73392d40cb..0000000000
--- a/lib/debugger/src/dbg_ui_interpret.erl
+++ /dev/null
@@ -1,161 +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(dbg_ui_interpret).
-
--include_lib("kernel/include/file.hrl").
-
-%% External exports
--export([start/4]).
-
-%% Internal exports
--export([init/6]).
-
--record(state, {gs,      % term() Graphics system id
-		win,     % term() Interpret dialog window data
-		monitor, % pid() Monitor pid
-		mode     % local | global
-	       }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start(GS, Pos, Dir, Mode)
-%%   GS  = Graphics system id
-%%   Dir = string()
-%%   Pos = {X,Y}
-%%   Mode = local | global
-%%--------------------------------------------------------------------
-start(GS, Pos, Dir, Mode) ->
-    Title = "Interpret Dialog",
-    case dbg_ui_winman:is_started(Title) of
-	true -> ignore;
-	false ->
-	    spawn(?MODULE, init, [self(), GS, Pos, Title, Dir, Mode])
-    end.
-
-%%====================================================================
-%% Internal exports
-%%====================================================================
-
-init(Monitor, GS, Pos, Title, Dir, Mode) ->
-    Filter = filename:join(Dir, "*.erl"),
-    Extra = fun(File) ->
-		    case int:interpretable(File) of
-			true ->
-			    ModS = filename:basename(File, ".erl"),
-			    Mod = list_to_atom(ModS),
-			    case int:file(Mod) of
-				File -> {true, tag};
-				_ -> true % {error,not_loaded} | File2
-			    end;
-			_Error -> {true,disable}
-		    end
-	    end,
-			
-    %% Create interpret dialog window
-    Win = dbg_ui_filedialog_win:create_win(GS, Title, Pos, multiselect,
-					   Filter, Extra),
-    Window = dbg_ui_filedialog_win:get_window(Win),
-    dbg_ui_winman:insert(Title, Window),
-
-    State = #state{gs=GS, win=Win, monitor=Monitor, mode=Mode},
-    loop(State).
-
-
-%%====================================================================
-%% Main loop and message handling
-%%====================================================================
-
-loop(State) ->
-    receive
-
-	%% From the GUI
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent)==gs ->
-	    Cmd = dbg_ui_filedialog_win:handle_event(GuiEvent,
-						    State#state.win),
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the dbg_ui_winman process (Debugger window manager)
-	{dbg_ui_winman, update_windows_menu, _Data} ->
-	    loop(State);
-	{dbg_ui_winman, destroy} ->
-	    exit(normal)
-    end.
-
-gui_cmd(ignore, State) ->
-    State;
-gui_cmd({stopped, Dir}, State) ->	
-    State#state.monitor ! {dbg_ui_interpret, Dir},
-    exit(normal);
-gui_cmd({win, Win}, State) ->
-    State#state{win=Win};
-gui_cmd({select, File}, State) ->
-    Res = case State#state.mode of
-	      local -> int:i(File);
-	      global -> int:ni(File)
-	  end,
-
-    case Res of
-	%% Interpretation succeeded, tag the file name
-	{module, _Mod} ->
-	    dbg_ui_filedialog_win:tag(State#state.win, File);
-
-	%% Interpretation failed
-	error ->
-	    Error = format_error(int:interpretable(File)),
-	    Msg = ["Error when interpreting:", File, Error],
-	    Window = dbg_ui_filedialog_win:get_window(State#state.win),
-	    tool_utils:notify(Window, Msg)
-    end,
-    State;
-gui_cmd({multiselect, Dir, FileNames}, State) ->
-    interpret_all(State, Dir, FileNames),
-    State.
-
-interpret_all(State, Dir, [File0|Files]) ->
-    File = filename:join(Dir, File0),
-    Res = case State#state.mode of
-	      local -> int:i(File);
-	      global -> int:ni(File)
-	  end,
-    case Res of
-	{module, _Mod} ->
-	    dbg_ui_filedialog_win:tag(State#state.win, File),
-	    interpret_all(State, Dir, Files);
-	error ->
-	    Window = dbg_ui_filedialog_win:get_window(State#state.win),
-	    Error = format_error(int:interpretable(File)),
-	    Msg = ["Error when interpreting:", File, Error,
-		   "OK to continue?"],
-	    case tool_utils:confirm(Window, Msg) of
-		ok -> interpret_all(State, Dir, Files);
-		cancel -> true
-	    end
-    end;
-interpret_all(_State, _Dir, []) ->
-    true.
-
-format_error({error,no_beam}) -> "No BEAM file";
-format_error({error,no_debug_info}) -> "No debug_info in BEAM file";
-format_error({error,badarg}) -> "File does not exist";
-format_error({error,{app,App}}) ->
-    "Cannot interpret "++atom_to_list(App)++" modules".
diff --git a/lib/debugger/src/dbg_ui_mon.erl b/lib/debugger/src/dbg_ui_mon.erl
deleted file mode 100644
index 82fe210968..0000000000
--- a/lib/debugger/src/dbg_ui_mon.erl
+++ /dev/null
@@ -1,738 +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(dbg_ui_mon).
-
--include_lib("kernel/include/file.hrl").
-
-%% External exports
--export([start/2, stop/0]).
-
--define(TRACEWIN, ['Button Area', 'Evaluator Area', 'Bindings Area']).
--define(BACKTRACE, 100).
-
--record(pinfo, {pid,       % pid()
-		status     % break | exit | idle | running | waiting
-	       }).
-
--record(state, {mode,      % local | global
-		starter,   % bool() 'true' if int was started by me
-
-		gs,        % term() Graphics system id
-		win,       % term() Monitor window data
-		focus,     % undefined | #pinfo{} Process in focus
-		coords,    % {X,Y} Mouse pointer position
-
-		intdir,    % string() Default dir
-		pinfos,    % [#pinfo{}] Debugged processes
-
-		tracewin,  % [Area] Areas shown in trace window
-		backtrace, % integer() Number of call frames to fetch
-
-		attach,    % false | {Flags, Function}
-
-		sfile,     % default | string() Settings file
-		changed    % boolean() Settings have been changed
-	       }). 
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start(Mode, SFile) -> {ok, Pid} | {error, Reason}
-%%   Mode = local | global
-%%   SFile = string() | default  Settings file
-%%   Pid = pid()
-%%   Reason = {already_started,Pid} | term()
-%%--------------------------------------------------------------------
-start(Mode, SFile) ->
-    case whereis(?MODULE) of
-	undefined ->
-	    CallingPid = self(),
-	    Pid = spawn(fun () -> init(CallingPid, Mode, SFile) end),
-	    receive
-		{initialization_complete, Pid} ->
-		    {ok, Pid};
-		Error ->
-		    Error
-	    end;
-
-	Pid ->
-            {error, {already_started,Pid}}
-    end.
-
-%%--------------------------------------------------------------------
-%% stop() -> ok
-%%--------------------------------------------------------------------
-stop() ->
-    case whereis(?MODULE) of
-	undefined ->
-	    ok;
-	Pid ->
-	    Flag = process_flag(trap_exit, true),
-	    link(Pid),
-	    Pid ! stop,
-	    receive
-		{'EXIT', Pid, stop} ->
-		    process_flag(trap_exit, Flag),
-		    ok
-	    end
-    end.
-
-
-%%====================================================================
-%% Initialization
-%%====================================================================
-
-init(CallingPid, Mode, SFile) ->
-    register(?MODULE, self()),
-
-    %% Graphics system
-    case catch dbg_ui_mon_win:init() of
-	{'EXIT', Reason} ->
-	    CallingPid ! {error, Reason};
-	GS ->
-	    init2(CallingPid, Mode, SFile, GS)
-    end.
-
-init2(CallingPid, Mode, SFile, GS) ->
-
-    %% Start Int if necessary and subscribe to information from it
-    Bool = case int:start() of
-	       {ok, _Int} -> true;
-	       {error, {already_started, _Int}} -> false
-	   end,
-    int:subscribe(),
-
-    %% Start other necessary stuff
-    dbg_ui_winman:start(), % Debugger window manager
-
-    %% Create monitor window
-    Title = "Monitor",
-    Win = dbg_ui_mon_win:create_win(GS, Title, menus()),
-    Window = dbg_ui_mon_win:get_window(Win),
-    dbg_ui_winman:insert(Title, Window),
-
-    %% Initial process state
-    State1 = #state{mode    = Mode,
-		    starter = Bool,
-
-		    gs      = GS,
-		    win     = Win,
-		    focus   = undefined,
-		    coords  = {0,0},
-
-		    intdir  = element(2, file:get_cwd()),
-		    pinfos  = [],
-
-		    sfile   = SFile,
-		    changed = false
-		   },
-
-    State2 = init_options(?TRACEWIN,            % Trace Window
-			  int:auto_attach(),    % Auto Attach
-			  int:stack_trace(),    % Stack Trace
-			  ?BACKTRACE,           % Back Trace Size
-			  State1),
-
-    State3 = init_contents(int:interpreted(),   % Modules
-			   int:all_breaks(),    % Breakpoints
-			   int:snapshot(),      % Processes
-			   State2),
-
-    %% Disable/enable functionality according to process in focus (none)
-    gui_enable_functions(State3#state.focus),
-
-    CallingPid ! {initialization_complete, self()},
-
-    if
-	SFile =:= default ->
-	    loop(State3);
-	true ->
-	    loop(load_settings(SFile, State3))
-    end.
-
-init_options(TraceWin, AutoAttach, StackTrace, BackTrace, State) ->
-    lists:foreach(fun(Area) ->
-			  dbg_ui_mon_win:select(Area, true)
-		  end,
-		  TraceWin),
-
-    case AutoAttach of
-	false -> ignore;
-	{Flags, _Function} ->
-	    dbg_ui_mon_win:show_option(State#state.win,
-				       auto_attach, Flags),
-	    lists:foreach(fun(Flag) ->
-				  dbg_ui_mon_win:select(map(Flag), true)
-			  end,
-			  Flags)
-    end,
-
-    dbg_ui_mon_win:show_option(State#state.win,
-			       stack_trace, StackTrace),
-    dbg_ui_mon_win:select(map(StackTrace), true),
-
-    dbg_ui_mon_win:show_option(State#state.win, back_trace, BackTrace),
-
-    State#state{tracewin=TraceWin, backtrace=BackTrace}.
-
-init_contents(Mods, Breaks, Processes, State) ->
-    Win2 =
-        lists:foldl(fun(Mod, Win) ->
-			    dbg_ui_mon_win:add_module(Win,'Module',Mod)
-		    end,
-		    State#state.win,
-		    Mods),
-
-    Win3 = 
-        lists:foldl(fun(Break, Win) ->
-			    dbg_ui_mon_win:add_break(Win,'Break',Break)
-		    end,
-		    Win2,
-		    Breaks),
-
-    lists:foldl(fun(PidTuple, State0) ->
-			int_cmd({new_process, PidTuple}, State0)
-		end,
-		State#state{win=Win3},
-		Processes).
-
-
-%%====================================================================
-%% Main loop and message handling
-%%====================================================================
-
-loop(State) ->
-    receive
-
-	stop ->
-	    gui_cmd(stopped, State);
-
-	%% From the GUI
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent) =:= gs ->
-	    Cmd = dbg_ui_mon_win:handle_event(GuiEvent,State#state.win),
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the interpreter process
-	{int, Cmd} ->
-	    State2 = int_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the dbg_ui_interpret process
-	{dbg_ui_interpret, Dir} ->
-	    loop(State#state{intdir=Dir});
-
-	%% From the dbg_ui_edit process
-	{dbg_ui_edit, 'Backtrace:', BackTrace}  ->
-	    dbg_ui_mon_win:show_option(State#state.win,
-				       back_trace, BackTrace),
-	    loop(State#state{backtrace=BackTrace});
-
-	%% From the dbg_ui_settings process
-	{dbg_ui_settings, SFile, Action} ->
-	    State2 = case Action of
-			 load -> load_settings(SFile, State);
-			 save -> save_settings(SFile, State)
-		     end,
-	    loop(State2);
-
-	%% From the dbg_ui_winman process (Debugger window manager)
-	{dbg_ui_winman, update_windows_menu, Data} ->
-	    dbg_ui_winman:update_windows_menu(Data),
-	    loop(State)
-    end.
-
-%%--Commands from the GUI---------------------------------------------
-%% Act upon a command from the GUI. In most cases, it is only necessary
-%% to call a relevant int-function. int will then report when the action
-%% has been taken.
-
-gui_cmd(ignore, State) ->
-    State;
-gui_cmd(stopped, State) ->
-    if
-	State#state.starter =:= true -> int:stop();
-	true -> int:auto_attach(false)
-    end,
-    exit(stop);
-gui_cmd({coords, Coords}, State) ->
-    State#state{coords=Coords};
-
-gui_cmd({shortcut, Key}, State) ->
-    case shortcut(Key) of
-	{always, Cmd} -> gui_cmd(Cmd, State);
-	{if_enabled, Cmd} ->
-	    case dbg_ui_mon_win:is_enabled(Cmd) of
-		true -> gui_cmd(Cmd, State);
-		false -> State
-	    end;
-	false -> State
-    end;
-
-%% File Menu
-gui_cmd('Load Settings...', State) ->
-    Window = dbg_ui_mon_win:get_window(State#state.win),
-    dbg_ui_settings:start(Window, State#state.coords,
-			  load, State#state.sfile),
-    State;
-gui_cmd('Save Settings...', State) ->
-    Window = dbg_ui_mon_win:get_window(State#state.win),
-    dbg_ui_settings:start(Window, State#state.coords,
-			  save, State#state.sfile),
-    State;
-gui_cmd('Exit', State) ->
-    gui_cmd(stopped, State);
-
-%% Edit Menu
-gui_cmd('Refresh', State) ->
-    int:clear(),
-    Win = dbg_ui_mon_win:clear_processes(State#state.win),
-    gui_enable_functions(undefined),
-    State2 = State#state{win=Win, focus=undefined, pinfos=[]},
-    lists:foldl(fun(PidTuple, S) ->
-			int_cmd({new_process,PidTuple}, S)
-		end,
-		State2,
-		int:snapshot());
-gui_cmd('Kill All', State) ->
-    lists:foreach(fun(PInfo) ->
-			  case PInfo#pinfo.status of
-			      exit -> ignore;
-			      _Status -> exit(PInfo#pinfo.pid, kill)
-			  end
-		  end,
-		  State#state.pinfos),
-    State;
-
-%% Module Menu
-gui_cmd('Interpret...', State) ->
-    dbg_ui_interpret:start(State#state.gs, State#state.coords,
-			   State#state.intdir, State#state.mode),
-    State;
-gui_cmd('Delete All Modules', State) ->
-    lists:foreach(fun(Mod) -> int:nn(Mod) end, int:interpreted()),
-    State;
-gui_cmd({module, Mod, What}, State) ->
-    case What of
-	delete -> int:nn(Mod);
-	view -> dbg_ui_view:start(State#state.gs, Mod)
-    end,
-    State;
-
-%% Process Menu
-gui_cmd('Step', State) ->
-    int:step((State#state.focus)#pinfo.pid),
-    State;
-gui_cmd('Next', State) ->
-    int:next((State#state.focus)#pinfo.pid),
-    State;
-gui_cmd('Continue', State) ->
-    int:continue((State#state.focus)#pinfo.pid),
-    State;
-gui_cmd('Finish ', State) ->
-    int:finish((State#state.focus)#pinfo.pid),
-    State;
-gui_cmd('Attach', State) ->
-    Pid = (State#state.focus)#pinfo.pid,
-    case dbg_ui_winman:is_started(dbg_ui_trace:title(Pid)) of
-	true -> ignore;
-	false -> int:attach(Pid, trace_function(State))
-    end,
-    State;
-gui_cmd('Kill', State) ->
-    exit((State#state.focus)#pinfo.pid, kill),
-    State;
-
-%% Break Menu
-gui_cmd('Line Break...', State) ->
-    dbg_ui_break:start(State#state.gs, State#state.coords, line),
-    State;
-gui_cmd('Conditional Break...', State) ->
-    dbg_ui_break:start(State#state.gs, State#state.coords, conditional),
-    State;
-gui_cmd('Function Break...', State) ->
-    dbg_ui_break:start(State#state.gs, State#state.coords, function),
-    State;
-gui_cmd('Enable All', State) ->
-    Breaks = int:all_breaks(),
-    lists:foreach(fun ({{Mod, Line}, _Options}) ->
-			  int:enable_break(Mod, Line)
-		  end,
-		  Breaks),
-    State;
-gui_cmd('Disable All', State) ->
-    Breaks = int:all_breaks(),
-    lists:foreach(fun ({{Mod, Line}, _Options}) ->
-			  int:disable_break(Mod, Line)
-		  end,
-		  Breaks),
-    State;
-gui_cmd('Delete All', State) ->
-    int:no_break(),
-    State;
-gui_cmd({break, {Mod, Line}, What}, State) ->
-    case What of
-	delete -> int:delete_break(Mod, Line);
-	{status, inactive} -> int:disable_break(Mod, Line);
-	{status, active} -> int:enable_break(Mod, Line);
-	{trigger, Action} -> int:action_at_break(Mod, Line, Action)
-    end,
-    State;
-
-%% Options Commands
-gui_cmd({'Trace Window', TraceWin}, State) ->
-    State2 = State#state{tracewin=TraceWin},
-    case State#state.attach of
-	false -> ignore;
-	{Flags, {dbg_ui_trace, start, StartFlags}} ->
-	    case trace_function(State2) of
-		{_, _, StartFlags} -> ignore;
-		NewFunction -> % {_, _, NewStartFlags}
-		    int:auto_attach(Flags, NewFunction)
-	    end;
-	_AutoAttach -> ignore
-    end,
-    State2;
-gui_cmd({'Auto Attach', When}, State) ->
-    if
-	When =:= [] -> int:auto_attach(false);
-	true ->
-	    Flags = [map(Name) || Name <- When],
-	    int:auto_attach(Flags, trace_function(State))
-    end,
-    State;
-gui_cmd({'Stack Trace', [Name]}, State) ->
-    int:stack_trace(map(Name)),
-    State;
-gui_cmd('Back Trace Size...', State) ->
-    dbg_ui_edit:start(State#state.gs, State#state.coords, "Backtrace",
-		      'Backtrace:', {integer, State#state.backtrace}),
-    State;
-
-%% Help Menu
-gui_cmd('Debugger', State) ->
-    HelpFile = filename:join([code:lib_dir(debugger), "doc", "html", "index.html"]),
-    Window = dbg_ui_mon_win:get_window(State#state.win),
-    tool_utils:open_help(Window, HelpFile),
-    State;
-
-gui_cmd({focus, Pid, Win}, State) ->
-    {value, PInfo} =
-	lists:keysearch(Pid, #pinfo.pid, State#state.pinfos),
-    gui_enable_functions(PInfo),
-    State#state{win=Win, focus=PInfo};
-gui_cmd(default, State) ->
-    case lists:member('Attach', menus(enabled, State#state.focus)) of
-	true -> gui_cmd('Attach', State);
-	false -> State
-    end.
-
-%%--Commands from the interpreter-------------------------------------
-
-int_cmd({interpret, Mod}, State) ->
-    Win = dbg_ui_mon_win:add_module(State#state.win, 'Module', Mod),
-    State#state{win=Win};
-int_cmd({no_interpret, Mod}, State) ->
-    Win = dbg_ui_mon_win:delete_module(State#state.win, Mod),
-    State#state{win=Win};
-
-int_cmd({new_process, {Pid, Function, Status, Info}}, State) ->
-
-    %% Create record with information about the process
-    Name = registered_name(Pid),
-    PInfo = #pinfo{pid=Pid, status=Status},
-
-    %% Update window
-    Win = dbg_ui_mon_win:add_process(State#state.win,
-				     Pid, Name, Function, Status, Info),
-
-    %% Store process information
-    PInfos = State#state.pinfos ++ [PInfo],
-    State#state{win=Win, pinfos=PInfos};
-int_cmd({new_status, Pid, Status, Info}, State) ->
-
-    %% Find stored information about the process
-    PInfos = State#state.pinfos,
-    {value, PInfo} = lists:keysearch(Pid, #pinfo.pid, PInfos),
-
-    %% Update process information
-    PInfo2 = PInfo#pinfo{status=Status},
-    PInfos2 = lists:keyreplace(Pid, #pinfo.pid, PInfos, PInfo2),
-    State2 = State#state{pinfos=PInfos2},
-
-    %% Update window
-    dbg_ui_mon_win:update_process(State2#state.win, Pid, Status, Info),
-    case State2#state.focus of
-	#pinfo{pid=Pid} ->
-	    gui_enable_functions(PInfo2),
-	    State2#state{focus=PInfo2};
-	_ ->
-	    State2
-    end;
-
-int_cmd({new_break, Break}, State) ->
-    Win = dbg_ui_mon_win:add_break(State#state.win, 'Break', Break),
-    State#state{win=Win};
-int_cmd({delete_break, Point}, State) ->
-    Win = dbg_ui_mon_win:delete_break(State#state.win, Point),
-    State#state{win=Win};
-int_cmd({break_options, Break}, State) ->
-    dbg_ui_mon_win:update_break(State#state.win, Break),
-    State;
-int_cmd(no_break, State) ->
-    Win = dbg_ui_mon_win:clear_breaks(State#state.win),
-    State#state{win=Win};
-int_cmd({no_break, Mod}, State) ->
-    Win = dbg_ui_mon_win:clear_breaks(State#state.win, Mod),
-    State#state{win=Win};
-
-int_cmd({auto_attach, AutoAttach}, State) ->
-    OnFlags = case AutoAttach of
-		  false -> [];
-		  {Flags, _Function} -> Flags
-	      end,
-    OffFlags = [init, exit, break] -- OnFlags,
-    dbg_ui_mon_win:show_option(State#state.win, auto_attach, OnFlags),
-    lists:foreach(fun(Flag) ->
-			  dbg_ui_mon_win:select(map(Flag), true)
-		  end,
-		  OnFlags),
-    lists:foreach(fun(Flag) ->
-			  dbg_ui_mon_win:select(map(Flag), false)
-		  end,
-		  OffFlags),
-    State#state{attach=AutoAttach};
-int_cmd({stack_trace, Flag}, State) ->
-    dbg_ui_mon_win:show_option(State#state.win, stack_trace, Flag),
-    dbg_ui_mon_win:select(map(Flag), true),
-    State.
-
-
-%%====================================================================
-%% GUI auxiliary functions
-%%====================================================================
-
-menus() ->
-    [{'File', [{'Load Settings...', 0},
-	       {'Save Settings...', 2},
-	       separator,
-	       {'Exit', 0}]},
-     {'Edit', [{'Refresh', no},
-	       {'Kill All', no}]},
-     {'Module', [{'Interpret...', 0},
-		 {'Delete All Modules', no},
-		 separator]},
-     {'Process', [{'Step', 0},
-		  {'Next', 0},
-		  {'Continue', 0},
-		  {'Finish ', 0},
-		  separator,
-		  {'Attach', 0},
-		  {'Kill', no}]},
-     {'Break', [{'Line Break...', 5},
-		{'Conditional Break...', no},
-		{'Function Break...', no},
-		separator,
-		{'Enable All', no},
-		{'Disable All', no},
-		{'Delete All', 0},
-		separator]},
-     {'Options', [{'Trace Window', no, cascade,
-		   [{'Button Area', no, check},
-		    {'Evaluator Area', no, check},
-		    {'Bindings Area', no, check},
-		    {'Trace Area', no, check}]},
-		  {'Auto Attach', no, cascade,
-		   [{'First Call', no, check},
-		    {'On Break', no, check},
-		    {'On Exit', no, check}]},
-		  {'Stack Trace', no, cascade,
-		   [{'Stack On, Tail', no, radio},
-		    {'Stack On, No Tail', no, radio},
-		    {'Stack Off', no, radio}]},
-		  {'Back Trace Size...', no}]},
-     {'Help', [{'Debugger', no}]}].
-
-menus(enabled,  undefined) ->
-    [];
-menus(disabled, undefined) ->
-    ['Step','Next','Continue','Finish ','Attach','Kill'];
-menus(enabled,  #pinfo{status=exit}) ->
-    ['Attach'];
-menus(disabled, #pinfo{status=exit}) ->
-    ['Step','Next','Continue','Finish ','Kill'];
-menus(enabled,  #pinfo{status=break}) ->
-    ['Step','Next','Continue','Finish ','Attach','Kill'];
-menus(disabled, #pinfo{status=break}) ->
-    [];
-menus(enabled,  _PInfo) ->
-    ['Attach','Kill'];
-menus(disabled, _PInfo) ->
-    ['Step','Next','Continue','Finish '].
-
-shortcut(l) -> {always, 'Load Settings...'};
-shortcut(v) -> {always, 'Save Settings...'};
-shortcut(e) -> {always, 'Exit'};
-
-shortcut(i) -> {always, 'Interpret...'};
-
-shortcut(s) -> {if_enabled, 'Step'};
-shortcut(n) -> {if_enabled, 'Next'};
-shortcut(c) -> {if_enabled, 'Continue'};
-shortcut(f) -> {if_enabled, 'Finish '};
-shortcut(a) -> {if_enabled, 'Attach'};
-
-shortcut(b) -> {always, 'Line Break...'};
-shortcut(d) -> {always, 'Delete All'};
-
-shortcut(_) -> false.
-
-%% Enable/disable functionality depending on the state of the process
-%% currently in Focus
-gui_enable_functions(PInfo) ->
-    Enabled = menus(enabled, PInfo),
-    Disabled = menus(disabled, PInfo),
-    dbg_ui_mon_win:enable(Enabled, true),
-    dbg_ui_mon_win:enable(Disabled, false).
-
-%% Map values used by int to/from GUI names
-map('First Call')        -> init;               % Auto attach
-map('On Exit')           -> exit;
-map('On Break')          -> break;
-map(init)                -> 'First Call';
-map(exit)                -> 'On Exit';
-map(break)               -> 'On Break';
-
-map('Stack On, Tail')    -> all;               % Stack trace
-map('Stack On, No Tail') -> no_tail;
-map('Stack Off')         -> false;
-map(all)                 -> 'Stack On, Tail';
-map(true)                -> 'Stack On, Tail';
-map(no_tail)             -> 'Stack On, No Tail';
-map(false)               -> 'Stack Off'.
-
-
-%%====================================================================
-%% Debugger settings
-%%====================================================================
-
-load_settings(SFile, State) ->
-    case file:read_file(SFile) of
-	{ok, Binary} ->
-	    case catch binary_to_term(Binary) of
-		{debugger_settings, Settings} ->
-		    load_settings2(Settings,
-				   State#state{sfile=SFile,
-					       changed=false});
-		_Error -> State
-	    end;
-	{error, _Reason} -> State
-    end.
-
-load_settings2(Settings, State) ->
-    {TraceWin, AutoAttach, StackTrace, BackTrace, Files, Breaks} =
-	Settings,
-
-    TraceWinAll = ['Button Area', 'Evaluator Area', 'Bindings Area',
-		   'Trace Area'],
-    lists:foreach(fun(Area) -> dbg_ui_mon_win:select(Area, true) end,
-		  TraceWin),
-    lists:foreach(fun(Area) -> dbg_ui_mon_win:select(Area, false) end,
-		  TraceWinAll--TraceWin),
-
-    case AutoAttach of
-	false -> int:auto_attach(false);
-	{Flags, Function} -> int:auto_attach(Flags, Function)
-    end,
-
-    int:stack_trace(StackTrace),
-
-    dbg_ui_mon_win:show_option(State#state.win, back_trace, BackTrace),
-
-    case State#state.mode of
-	local -> lists:foreach(fun(File) -> int:i(File) end, Files);
-	global -> lists:foreach(fun(File) -> int:ni(File) end, Files)
-    end,
-    lists:foreach(fun(Break) ->
-			  {{Mod, Line}, [Status, Action, _, Cond]} =
-			      Break,
-			  int:break(Mod, Line),
-			  if
-			      Status =:= inactive ->
-				  int:disable_break(Mod, Line);
-			      true -> ignore
-			  end,
-			  if
-			      Action/=enable ->
-				  int:action_at_break(Mod,Line,Action);
-			      true -> ignore
-			  end,
-			  case Cond of
-			      CFunction when is_tuple(CFunction) ->
-				  int:test_at_break(Mod,Line,CFunction);
-			      null -> ignore
-			  end
-		  end,
-		  Breaks),
-
-    State#state{tracewin=TraceWin, backtrace=BackTrace}.
-
-save_settings(SFile, State) ->
-    Settings = {State#state.tracewin,
-		int:auto_attach(),
-		int:stack_trace(),
-		State#state.backtrace,
-		[int:file(Mod) || Mod <- int:interpreted()],
-		int:all_breaks()},
-    Binary = term_to_binary({debugger_settings, Settings}),
-    case file:write_file(SFile, Binary) of
-	ok ->
-	    State#state{sfile=SFile, changed=false};
-	{error, _Reason} ->
-	    State
-    end.
-
-
-%%====================================================================
-%% Other internal functions
-%%====================================================================
-
-registered_name(Pid) ->
-    %% Yield in order to give Pid more time to register its name
-    timer:sleep(200),
-
-    Node = node(Pid),
-    if
-	Node =:= node() ->
-	    case erlang:process_info(Pid, registered_name) of
-		{registered_name, Name} -> Name;
-		_ -> undefined
-	    end;
-	true ->
-	    case rpc:call(Node,erlang,process_info,
-			  [Pid,registered_name]) of
-		{registered_name, Name} -> Name;
-		_ -> undefined
-	    end
-    end.
-
-trace_function(State) ->
-    {dbg_ui_trace, start, [State#state.tracewin,State#state.backtrace]}.
diff --git a/lib/debugger/src/dbg_ui_mon_win.erl b/lib/debugger/src/dbg_ui_mon_win.erl
deleted file mode 100644
index 8655c7697a..0000000000
--- a/lib/debugger/src/dbg_ui_mon_win.erl
+++ /dev/null
@@ -1,573 +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%
-%%
--module(dbg_ui_mon_win).
--compile([{nowarn_deprecated_function,{gs,checkbutton,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,grid,2}},
-          {nowarn_deprecated_function,{gs,gridline,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,listbox,2}},
-          {nowarn_deprecated_function,{gs,menu,2}},
-          {nowarn_deprecated_function,{gs,menubar,2}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
-%% External exports
--export([init/0]).
--export([create_win/3, get_window/1,
-	 show_option/3,
-	 enable/2, is_enabled/1, select/2,
-	 add_module/3, delete_module/2,
-	 add_process/6, update_process/4, clear_processes/1,
-	 add_break/3, update_break/2, delete_break/2,
-	 clear_breaks/1, clear_breaks/2,
-	 handle_event/2
-	]).
-
--define(default_rows,50).
-
--record(moduleInfo, {module, menubtn}).
--record(procInfo, {pid, row}).
--record(breakInfo, {point, status, break}).
--record(winInfo, {window,       % gsobj()
-		  grid,         % gsobj()
-		  row,          % int() Last row in grid
-
-		  focus,        % int() Selected row in grid
-
-		  modules=[],   % [#moduleInfo{}] Known modules
-		  processes=[], % [#procInfo{}] Known processes
-		  breaks=[],    % [#breakInfo{}] Known breakpoints
-
-		  listbox,      % gsobj() Listinng known modules
-
-		  %% Auto attach buttons
-		  fbutton,      % gsobj()
-		  bbutton,      % gsobj()
-		  ebutton,      % gsobj()
-		  selected=[],  % ['First Call'|'On Break'|'On Exit']
-
-		  slabel,       % showing Stack Trace option
-		  blabel        % showing Back Trace Size
-		 }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-init() ->
-    dbg_ui_win:init().
-
-%%--------------------------------------------------------------------
-%% create_win(GS, Title, Menus) -> #winInfo{}
-%%   GS = gsobj()
-%%   Title = string()
-%%   Menus = [menu()]  See dbg_ui_win.erl
-%%--------------------------------------------------------------------
-
--define(PAD, 5).
--define(Wf, 150).
--define(Wg, 770).
--define(W, 800).
--define(H, 390).
-
-create_win(GS, Title, Menus) ->
-    Win = gs:window(GS, [{title, Title},
-			 {width, ?W}, {height, ?H},
-			 {configure,true}, {destroy,true},
-			 {keypress,true}, {motion,true}]),
-
-    MenuBar = gs:menubar(Win, []),
-    dbg_ui_win:create_menus(MenuBar, Menus),
-    dbg_ui_winman:windows_menu(MenuBar),
-
-    Font = dbg_ui_win:font(normal),
-
-    Frame = gs:frame(Win, [{x, ?PAD}, {y, 30},
-			   {width, ?Wf}, {height, ?H}]),
-    Hlb = 200,
-    Listbox = gs:listbox(Frame, [{x, 0}, {y, 0},
-				 {width, ?Wf}, {height, Hlb},
-				 {data, listbox},
-				 {doubleclick, true},
-				 {items, []}]),
-    gs:label(Frame, [{x, 0}, {y, Hlb}, {width, ?Wf}, {height, 20},
-		     {align, w},
-		     {label, {text, "Auto Attach:"}}, {font, Font}]),
-    Fbtn = gs:checkbutton(Frame, [{x, 0}, {y, Hlb+20},
-				  {width, ?Wf}, {height, 20},
-				  {label, {text, 'First Call'}},
-				  {align, w}, {font, Font},
-				  {data, autoattach}]),
-    Bbtn = gs:checkbutton(Frame, [{x, 0}, {y, Hlb+40},
-				  {width, ?Wf}, {height, 20},
-				  {label, {text, 'On Break'}},
-				  {align, w}, {font, Font},
-				  {data, autoattach}]),
-    Ebtn = gs:checkbutton(Frame, [{x, 0}, {y, Hlb+60},
-				  {width, ?Wf}, {height, 20},
-				  {label, {text, 'On Exit'}},
-				  {align, w}, {font, Font},
-				  {data, autoattach}]),
-    SLabel = gs:label(Frame, [{x, 0}, {y, Hlb+80},
-			      {width, ?Wf}, {height, 40},
-			      {font, Font}, {align, w}]),
-    BLabel = gs:label(Frame, [{x, 0}, {y, Hlb+120},
-			      {width, ?Wf}, {height, 40},
-			      {font, Font}, {align, w}]),
-
-    Grid = gs:grid(Win, [{x, 2*?PAD+?Wf}, {y, 30},
-			 {width, ?W-(2*?PAD+?Wf)}, {height, ?H-30},
-			 {bg, grey}, {fg, black},
-			 {vscroll, right}, {hscroll, bottom},
-			 calc_columnwidths(?Wg),
-			 {rows, {1,?default_rows}}]),
-    gs:gridline(Grid, [{row, 1}, {bw, 5}, {fg, blue},
-		       {font, Font},
-		       {text, {1,"Pid"}}, {text, {2,"Initial Call"}},
-		       {text, {3,"Name"}}, {text, {4,"Status"}},
-		       {text, {5,"Information"}}]),
-
-    gs:config(Win, {map, true}),
-    #winInfo{window=Win, grid=Grid, row=1, focus=0,
-	     listbox=Listbox,
-	     fbutton=Fbtn, bbutton=Bbtn, ebutton=Ebtn,
-	     slabel=SLabel, blabel=BLabel}.
-
-%%--------------------------------------------------------------------
-%% get_window(WinInfo) -> Window
-%%   WinInfo = #winInfo{}
-%%   Window = gsobj()
-%%--------------------------------------------------------------------
-get_window(WinInfo) ->
-    WinInfo#winInfo.window.
-
-%%--------------------------------------------------------------------
-%% show_option(WinInfo, Option, Value) -> void()
-%%   WinInfo = #winInfo{}
-%%   Option = auto_attach | stack_trace | back_trace
-%%   Value = [Flag]                          % Option==auto_attach
-%%             Flag = init | break | exit
-%%         | true | all | no_tail | false    % Option==stack_trace
-%%         | int()                           % Option==back_trace
-%%--------------------------------------------------------------------
-show_option(WinInfo, Option, Value) ->
-    case Option of
-
-	auto_attach ->
-	    lists:foreach(fun (Button) ->
-				  gs:config(Button, {select, false})
-			  end,
-			  option_buttons(WinInfo, [init, break, exit])),
-	    lists:foreach(fun (Button) ->
-				  gs:config(Button, {select, true})
-			  end,
-			  option_buttons(WinInfo, Value));
-
-	stack_trace ->
-	    Text = case Value of
-		       all ->     "Stack Trace:\n On (with tail)";
-		       true ->    "Stack Trace:\n On (with tail)";
-		       no_tail -> "Stack Trace:\n On (no tail)";
-		       false ->   "Stack Trace:\n Off"
-		   end,
-	    gs:config(WinInfo#winInfo.slabel, {label, {text, Text}});
-
-	back_trace ->
-	    Text = "Back Trace Size:\n " ++ integer_to_list(Value),
-	    gs:config(WinInfo#winInfo.blabel, {label, {text, Text}})
-    end.
-
-option_buttons(WinInfo, [init|Flags]) ->
-    [WinInfo#winInfo.fbutton|option_buttons(WinInfo, Flags)];
-option_buttons(WinInfo, [break|Flags]) ->
-    [WinInfo#winInfo.bbutton|option_buttons(WinInfo, Flags)];
-option_buttons(WinInfo, [exit|Flags]) ->
-    [WinInfo#winInfo.ebutton|option_buttons(WinInfo, Flags)];
-option_buttons(_WinInfo, []) ->
-    [].
-
-%%--------------------------------------------------------------------
-%% enable([MenuItem], Bool)
-%% is_enabled(MenuItem) -> Bool
-%%   MenuItem = atom()
-%%   Bool = boolean()
-%%--------------------------------------------------------------------
-enable(MenuItems, Bool) ->
-    lists:foreach(fun(MenuItem) ->
-			  gs:config(MenuItem, {enable, Bool})
-		  end,
-		  MenuItems).
-
-is_enabled(MenuItem) ->
-    gs:read(MenuItem, enable).
-
-%%--------------------------------------------------------------------
-%% select(MenuItem, Bool)
-%%   MenuItem = atom()
-%%   Bool = boolean()
-%%--------------------------------------------------------------------
-select(MenuItem, Bool) ->
-    dbg_ui_win:select(MenuItem, Bool).
-
-%%--------------------------------------------------------------------
-%% add_module(WinInfo, Name, Mod) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Name = atom()
-%%   Mod = atom()
-%%--------------------------------------------------------------------
-add_module(WinInfo, Menu, Mod) ->
-    Modules = WinInfo#winInfo.modules,
-    case lists:keymember(Mod, #moduleInfo.module, Modules) of
-	false ->
-	    %% Create a menu for the module
-	    Font = dbg_ui_win:font(normal),
-	    MenuBtn = gs:menuitem(Menu, [{label, {text,Mod}},
-					 {font, Font},
-					 {itemtype, cascade}]),
-	    SubMenu = gs:menu(MenuBtn, []),
-	    gs:menuitem(SubMenu, [{label, {text,"View"}},
-				  {font, Font},
-				  {data, {module,Mod,view}}]),
-	    gs:menuitem(SubMenu, [{label, {text,"Delete"}},
-				  {font, Font},
-				  {data, {module,Mod,delete}}]),
-
-	    %% Add the module to the listbox
-	    gs:config(WinInfo#winInfo.listbox, {add, Mod}),
-
-	    ModInfo = #moduleInfo{module=Mod, menubtn=MenuBtn},
-	    WinInfo#winInfo{modules=[ModInfo | Modules]};
-	true -> WinInfo
-    end.
-    
-%%--------------------------------------------------------------------
-%% delete_module(WinInfo, Mod) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Mod = atom()
-%%--------------------------------------------------------------------
-delete_module(WinInfo, Mod) ->
-    {value, ModInfo} = lists:keysearch(Mod, #moduleInfo.module,
-				       WinInfo#winInfo.modules),
-    gs:destroy(ModInfo#moduleInfo.menubtn),
-    delete_module(WinInfo#winInfo.listbox, atom_to_list(Mod), 0),
-    WinInfo#winInfo{modules=lists:keydelete(Mod, #moduleInfo.module,
-					    WinInfo#winInfo.modules)}.
-
-delete_module(Listbox, ModS, Index) ->
-    case gs:read(Listbox, {get, Index}) of
-	ModS ->
-	    gs:config(Listbox, {del, Index});
-	_OtherModS ->
-	    delete_module(Listbox, ModS, Index+1)
-    end.
-
-%%--------------------------------------------------------------------
-%% add_process(WinInfo, Pid, Name, Function, Status, Info) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Pid = pid()
-%%   Name = undefined | atom()
-%%   Function = {Mod, Func, Args}
-%%   Status = idle | running | break | exit
-%%   Info = {} | term()
-%%--------------------------------------------------------------------
-add_process(WinInfo, Pid, Name, {Mod,Func,Args}, Status, Info) ->
-    Grid = WinInfo#winInfo.grid,
-    Row = (WinInfo#winInfo.row)+1,
-    GridLine = case gs:read(Grid, {obj_at_row, Row}) of
-		   undefined ->
-		       if Row>?default_rows ->
-			       gs:config(Grid,[{rows,{1,Row}}]);
-			  true -> ok
-		       end,
-		       gs:gridline(Grid,[{row,Row}, {bw,5}, {fg,black},
-					 {font,dbg_ui_win:font(normal)},
-					 {click, true},
-					 {doubleclick, true}]);
-		   GSObj ->
-		       GSObj
-	       end,
-    Name2 = case Name of undefined -> ""; _ -> Name end,
-    FuncS = io_lib:format("~w:~w/~w", [Mod, Func, length(Args)]),
-    Info2 = case Info of {} -> ""; _ -> Info end,
-    Options = [{text, {1,Pid}}, {text, {2,FuncS}}, {text, {3,Name2}},
-	       {text, {4,Status}}, {text, {5,Info2}},
-	       {data, {gridline, Pid}}],
-    gs:config(GridLine, Options),
-
-    ProcInfo = #procInfo{pid=Pid, row=Row},
-    WinInfo#winInfo{processes=[ProcInfo|WinInfo#winInfo.processes],
-		    row=Row}.
-
-%%--------------------------------------------------------------------
-%% update_process(WinInfo, Pid, Status, Info)
-%%   WinInfo = #winInfo{}
-%%   Pid = pid()
-%%   Status = idle | running | break | exit
-%%   Info = {} | term()
-%%--------------------------------------------------------------------
-update_process(WinInfo, Pid, Status, Info) ->
-    {value, ProcInfo} = lists:keysearch(Pid, #procInfo.pid,
-					WinInfo#winInfo.processes),
-
-    Grid = WinInfo#winInfo.grid,
-    GridLine = gs:read(Grid, {obj_at_row, ProcInfo#procInfo.row}),
-    
-    Info2 = case Info of {} -> ""; _ -> Info end,
-    gs:config(GridLine, [{text, {4,Status}}, {text, {5,Info2}}]).
-
-%%--------------------------------------------------------------------
-%% clear_processes(WinInfo) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%--------------------------------------------------------------------
-clear_processes(WinInfo) ->
-    Grid = WinInfo#winInfo.grid,
-    Max = WinInfo#winInfo.row,
-    clear_processes(Grid, 2, Max),
-    gs:config(Grid,[{rows,{1,?default_rows}}]),
-    WinInfo#winInfo{row=1, focus=0, processes=[]}.
-
-clear_processes(Grid, Row, Max) when Row=<Max ->
-    GridLine = gs:read(Grid, {obj_at_row, Row}),
-    case gs:read(GridLine,{text,4}) of
-	"exit" -> 
-	    Pid = list_to_pid(gs:read(GridLine,{text,1})),
-	    dbg_ui_winman:clear_process(dbg_ui_trace:title(Pid));
-	_ -> 
-	    ok
-    end,
-	    
-    Options = [{fg, black},
-	       {{text,1}, ""}, {{text,2},""}, {{text,3},""},
-	       {{text,4}, ""}, {{text,5},""},
-	       {data, []}],
-    gs:config(GridLine, Options),
-    clear_processes(Grid, Row+1, Max);
-clear_processes(_Grid, Row, Max) when Row>Max ->
-    done.
-
-%%--------------------------------------------------------------------
-%% add_break(WinInfo, Name, {Point, Options}) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Name = atom()
-%%   Point = {Mod, Line}
-%%   Options = [Status, Action, Mods, Cond]
-%%     Status = active | inactive
-%%     Action = enable | disable | delete
-%%     Mods = null (not used)
-%%     Cond = null | {Mod, Func}
-%%--------------------------------------------------------------------
-add_break(WinInfo, Menu, {Point, Options}) ->
-    Break = dbg_ui_win:add_break(Menu, Point),
-    dbg_ui_win:update_break(Break, Options),
-    BreakInfo = #breakInfo{point=Point, break=Break},
-    WinInfo#winInfo{breaks=[BreakInfo|WinInfo#winInfo.breaks]}.
-
-%%--------------------------------------------------------------------
-%% update_break(WinInfo, {Point, Options})
-%%   WinInfo = #winInfo{}
-%%   Point = {Mod, Line}
-%%   Options = [Status, Action, Mods, Cond]
-%%     Status = active | inactive
-%%     Action = enable | disable | delete
-%%     Mods = null (not used)
-%%     Cond = null | {Mod, Func}
-%%--------------------------------------------------------------------
-update_break(WinInfo, {Point, Options}) ->
-    {value, BreakInfo} = lists:keysearch(Point, #breakInfo.point,
-					 WinInfo#winInfo.breaks),
-    dbg_ui_win:update_break(BreakInfo#breakInfo.break, Options).
-
-%%--------------------------------------------------------------------
-%% delete_break(WinInfo, Point) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Point = {Mod, Line}
-%%--------------------------------------------------------------------
-delete_break(WinInfo, Point) ->
-    {value, BreakInfo} = lists:keysearch(Point, #breakInfo.point,
-					 WinInfo#winInfo.breaks),
-    dbg_ui_win:delete_break(BreakInfo#breakInfo.break),
-    WinInfo#winInfo{breaks=lists:keydelete(Point, #breakInfo.point,
-					   WinInfo#winInfo.breaks)}.
-
-%%--------------------------------------------------------------------
-%% clear_breaks(WinInfo) -> WinInfo
-%% clear_breaks(WinInfo, Mod) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%--------------------------------------------------------------------
-clear_breaks(WinInfo) ->
-    lists:foreach(fun(BreakInfo) ->
-			  dbg_ui_win:delete_break(BreakInfo#breakInfo.break)
-		  end,
-		  WinInfo#winInfo.breaks),
-    WinInfo#winInfo{breaks=[]}.
-clear_breaks(WinInfo, Mod) ->
-    Fun =
-	fun(BreakInfo) ->
-		case BreakInfo#breakInfo.point of
-		    {Mod, _Line} ->
-			dbg_ui_win:delete_break(BreakInfo#breakInfo.break),
-			false;
-		    _ -> true
-		end
-	end,
-    Breaks = lists:filter(Fun, WinInfo#winInfo.breaks),
-    WinInfo#winInfo{breaks=Breaks}.
-    
-%%--------------------------------------------------------------------
-%% handle_event(GSEvent, WinInfo) -> Command
-%%   GSEvent = {gs, Id, Event, Data, Arg}
-%%   WinInfo = #winInfo{}
-%%   Command = ignore
-%%           | stopped
-%%           | {coords, {X,Y}}
-%%
-%%           | {shortcut, Key}
-%%           | MenuItem | {Menu, [MenuItem]}
-%%               MenuItem = Menu = atom()
-%%           | {break, Point, What}
-%%               What = delete | {status, Status} | {trigger, Trigger}
-%%           | {module, Mod, What}
-%%               What = view | delete
-%%
-%%           | {focus, Pid, WinInfo}
-%%           | default
-%%--------------------------------------------------------------------
-%% Window events
-handle_event({gs, _Id, configure, _Data, [W, H |_]}, WinInfo) ->
-    configure(WinInfo, {W, H}),
-    ignore;
-handle_event({gs, _Id, destroy, _Data, _Arg}, _WinInfo) ->
-    stopped;
-handle_event({gs, _Id, motion, _Data, [X,Y]}, WinInfo) ->
-    {LastX, LastY} = dbg_ui_win:motion(X, Y),
-    Win = WinInfo#winInfo.window,
-    {coords, {gs:read(Win, x)+LastX-5, gs:read(Win, y)+LastY-5}};
-
-%% Menus and keyboard shortcuts
-handle_event({gs, _Id, keypress, _Data, [Key,_,_,1]}, _WinInfo) when
-  Key/='Up', Key/='Down', Key/=p, Key/=n ->
-    {shortcut, Key};
-handle_event({gs, _Id, click, {dbg_ui_winman, Win}, _Arg}, _WinInfo) ->
-    dbg_ui_winman:raise(Win),
-    ignore;
-handle_event({gs, _Id, click, {menuitem, Name}, _Arg}, _WinInfo) ->
-    Name;
-handle_event({gs, _Id, click, {menu, Menu}, _Arg}, _WinInfo) ->
-    Names = dbg_ui_win:selected(Menu),
-    {Menu, Names};
-handle_event({gs, _Id, click, {break, Point, What}, _Arg}, _WinInfo) ->
-    {break, Point, What};
-handle_event({gs, _Id, click, {module, Mod, What}, _Arg}, _WinInfo) ->
-    {module, Mod, What};
-
-%% Listbox
-handle_event({gs, _Id, doubleclick, listbox, [_Index, ModS|_]}, _WI) ->
-    {module, list_to_atom(ModS), view};
-
-%% Auto attach buttons
-handle_event({gs, _Id, click, autoattach, _Arg}, WinInfo) ->
-    Names = lists:foldl(fun (Button, NamesAcc) ->
-				case gs:read(Button, select) of
-				    true ->
-					{text, Name} =
-					    gs:read(Button, label),
-					[list_to_atom(Name)|NamesAcc];
-				    false ->
-					NamesAcc
-				end
-			end,
-			[],
-			[WinInfo#winInfo.ebutton,
-			 WinInfo#winInfo.bbutton,
-			 WinInfo#winInfo.fbutton]),
-    {'Auto Attach', Names};
-
-%% Process grid
-handle_event({gs, _Id, keypress, _Data, [Key|_]}, WinInfo) when
-  Key =:= 'Up'; Key =:= 'Down' ->
-    Dir = if Key =:= 'Up' -> up; Key =:= 'Down' -> down end,
-    Row = move(WinInfo, Dir),
-    if Row>1 ->
-	    WinInfo2 = highlight(WinInfo, Row),
-	    #procInfo{pid=Pid} =
-		lists:keyfind(Row, #procInfo.row, WinInfo#winInfo.processes),
-	    {focus, Pid, WinInfo2};
-       true ->
-	    ignore
-    end;
-handle_event({gs, _Id, click, {gridline, Pid}, [_Col,Row|_]}, WinInfo) ->
-    WinInfo2 = highlight(WinInfo, Row),
-    {focus, Pid, WinInfo2};
-handle_event({gs, _Id, doubleclick, _Data, _Arg}, _WinInfo) ->
-    default;
-
-handle_event(_GSEvent, _WinInfo) ->
-    ignore.
-
-move(WinInfo, Dir) ->
-    Row = WinInfo#winInfo.focus,
-    Last = WinInfo#winInfo.row,
-    if
-	Dir =:= up, Row > 1 -> Row-1;
-	Dir =:= down, Row < Last -> Row+1;
-	true -> Row
-    end.
-
-highlight(WinInfo, Row) ->
-    Grid = WinInfo#winInfo.grid,
-    case WinInfo#winInfo.focus of
-	0 -> ignore;
-	Focus ->
-	    GridLine1 = gs:read(Grid, {obj_at_row, Focus}),
-	    gs:config(GridLine1, {fg, black})
-    end,
-    GridLine2 = gs:read(Grid, {obj_at_row, Row}),
-    gs:config(GridLine2, {fg, white}),
-    WinInfo#winInfo{focus=Row}.
-
-%%====================================================================
-%% Internal functions
-%%====================================================================
-
-configure(WinInfo, {W, H}) ->
-    Grid = WinInfo#winInfo.grid,
-    NewW = W - (2*?PAD+?Wf),
-    Dx = NewW - gs:read(Grid, width),
-    Dy = H-42 - gs:read(Grid, height),
-    if
-	(Dx+Dy) =/= 0 ->
-	    gs:config(Grid, [{width, NewW}, {height, H-30}]),
-	    Cols = calc_columnwidths(NewW),
-	    gs:config(Grid, Cols);
-	true ->
-	    ok
-    end.
-
-calc_columnwidths(Width) ->
-    W = if
-	    Width =< ?Wg -> ?Wg;
-	    true -> Width
-	end,
-    First = [round(X) || X <- [0.13*W, 0.27*W, 0.18*W, 0.18*W]],
-    Last = W - lists:sum(First) - 30,
-    {columnwidths, First++[Last]}.
diff --git a/lib/debugger/src/dbg_ui_settings.erl b/lib/debugger/src/dbg_ui_settings.erl
deleted file mode 100644
index fcfd67966f..0000000000
--- a/lib/debugger/src/dbg_ui_settings.erl
+++ /dev/null
@@ -1,162 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-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(dbg_ui_settings).
-
--include_lib("kernel/include/file.hrl").
-
-%% External exports
--export([start/4]).
-
-%% Internal exports
--export([init/6]).
-
-%% OTP-6011 What's denoted gs="Graphics system id" is now in fact
-%% the object id of the monitor window.
--record(state, {gs,      % term() Graphics system id
-		win,     % term() Settings dialog window data
-		monitor, % pid()  Monitor pid
-		action   % load | save
-	       }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start(GS, Pos, Action, SFile)
-%%   GS  = Graphics system id
-%%   Pos = {X,Y}
-%%   Action = load | save
-%%   SFile = default | string()
-%%--------------------------------------------------------------------
-start(GS, Pos, Action, SFile) ->
-    Title = case Action of
-		load -> "Load Settings Dialog";
-		save -> "Save Settings Dialog"
-	    end,
-    case dbg_ui_winman:is_started(Title) of
-	true -> ignore;
-	false ->
-	    spawn(?MODULE, init, [self(), GS, Pos, Title, Action, SFile])
-    end.
-
-%%====================================================================
-%% Internal exports
-%%====================================================================
-
-init(Monitor, GS, Pos, Title, Action, SFile) ->
-    {SDir, SFileName} =
-	if
-	    %% If settings are saved for the first time, and to
-	    %% the default directory HOME/erlang.tools/debugger,
-	    %% make sure the directory exists, or create it if
-	    %% desired and possible
-	    SFile==default -> {default_settings_dir(GS), "NoName.state"};
-	    true -> {filename:dirname(SFile), filename:basename(SFile)}
-	end,
-		    
-    Filter = filename:join(SDir, "*.state"),
-    Extra = fun(_File) -> true end,
-			
-    %% Create window
-    Win = case Action of
-	      load ->
-		  dbg_ui_filedialog_win:create_win(GS, Title, Pos, normal,
-						   Filter, Extra);
-	      save ->
-		  dbg_ui_filedialog_win:create_win(GS, Title, Pos, normal,
-						   Filter, Extra, SFileName)
-	  end,
-    Window = dbg_ui_filedialog_win:get_window(Win),
-    dbg_ui_winman:insert(Title, Window),
-
-    State = #state{gs=GS, win=Win, monitor=Monitor, action=Action},
-    loop(State).
-
-
-%%====================================================================
-%% Main loop and message handling
-%%====================================================================
-
-loop(State) ->
-    receive
-
-	%% From the GUI
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent)==gs ->
-	    Cmd = dbg_ui_filedialog_win:handle_event(GuiEvent,
-						     State#state.win),
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the dbg_ui_winman process (Debugger window manager)
-	{dbg_ui_winman, update_windows_menu, _Data} ->
-	    loop(State);
-	{dbg_ui_winman, destroy} ->
-	    exit(normal)
-    end.
-
-gui_cmd(ignore, State) ->
-    State;
-gui_cmd({stopped, _Dir}, _State) ->	
-    exit(normal);
-gui_cmd({win, Win}, State) ->
-    State#state{win=Win};
-gui_cmd({select, File}, State) ->
-    State#state.monitor ! {dbg_ui_settings, File, State#state.action},
-    exit(normal).
-
-
-%%====================================================================
-%% Internal functions
-%%====================================================================
-
-default_settings_dir(GS) ->
-    {ok, [[Home]]} = init:get_argument(home),
-    DefDir = filename:join([Home, ".erlang_tools", "debugger"]),
-
-    case filelib:is_dir(DefDir) of
-	true -> DefDir;
-	false ->
-	    {ok, CWD} = file:get_cwd(),
-	    
-	    Msg = ["Default directory", DefDir, "does not exist.",
-		   "Click OK to create it or",
-		   "Cancel to use other directory."],
-	    case tool_utils:confirm(GS, Msg) of
-		ok ->
-		    ToolsDir = filename:dirname(DefDir),
-		    case filelib:is_dir(ToolsDir) of
-			true ->
-			    case file:make_dir(DefDir) of
-				ok -> DefDir;
-				_Error -> CWD
-			    end;
-			false ->
-			    case file:make_dir(ToolsDir) of
-				ok ->
-				    case file:make_dir(DefDir) of
-					ok -> DefDir;
-					_Error -> CWD
-				    end;
-				_Error -> CWD
-			    end
-		    end;
-		cancel -> CWD
-	    end
-    end.
diff --git a/lib/debugger/src/dbg_ui_trace.erl b/lib/debugger/src/dbg_ui_trace.erl
deleted file mode 100644
index 3e1fb2dcae..0000000000
--- a/lib/debugger/src/dbg_ui_trace.erl
+++ /dev/null
@@ -1,814 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
-%% 
-%% The 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(dbg_ui_trace).
-
-%% External exports
--export([start/1, start/3]).
--export([title/1]).
-
--define(TRACEWIN, ['Button Area', 'Evaluator Area', 'Bindings Area']).
--define(BACKTRACE, 100).
-
--record(state, {gs,            % term() Graphics system id
-		win,           % term() Attach process window data
-		coords,        % {X,Y} Mouse point position
-
-		pid,           % pid() Debugged process
-		meta,          % pid() Meta process
-		status,        % {Status,Mod,Line} | {exit,Where,Reason}
-		               %   Status = init | idle | break
-		               %      | wait_break | wait_running
-		               %      | running
-                               % Where={Mod,Line} | null
-
-		cm,            % atom() | undefined Current module
-		cm_obsolete=false, % boolean() Curr mod needs reloading
-
-		stack,         % {Cur,Max}
-
-		trace,         % boolean()
-		stack_trace,   % all | no_tail | false
-		backtrace      % integer() #call frames to fetch
-	       }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start(Pid)
-%% start(Pid, TraceWin, BackTrace)
-%%   Pid = pid()
-%%   TraceWin = [WinArea]
-%%     WinArea = 'Button|Evaluator|Bindings|Trace Area'
-%%   Backtrace = integer()
-%%--------------------------------------------------------------------
-start(Pid) -> % Used by debugger:quick/3 (no monitor)
-    start(Pid, ?TRACEWIN, ?BACKTRACE).
-start(Pid, TraceWin, BackTrace) ->
-    case {whereis(dbg_wx_mon), whereis(dbg_ui_mon)} of
-	{undefined, undefined} ->
-	    case which_gui() of
-		gs ->
-		    start2(Pid, TraceWin, BackTrace);
-		wx ->
-		    dbg_wx_trace:start(Pid, TraceWin, BackTrace)
-	    end;
-	{undefined, Monitor} when is_pid(Monitor) ->
-	    start2(Pid, TraceWin, BackTrace);
-	{Monitor, _} when is_pid(Monitor) ->
-	    dbg_wx_trace:start(Pid, TraceWin, BackTrace)
-    end.
-
-start2(Pid, TraceWin, BackTrace) ->
-    %% Inform int about my existence and get the meta pid back
-    case int:attached(Pid) of
-	{ok, Meta} ->
-	    init(Pid, Meta, TraceWin, BackTrace);
-	error ->
-	    ignore
-    end.
-
-which_gui() ->
-    try
-	wx:new(),
-	wx:destroy(),
-	wx
-    catch _:_ ->
-	    gs
-    end.
-
-%%--------------------------------------------------------------------
-%% title(Pid) -> string()
-%% By exporting this function, dbg_ui_mon may check with dbg_ui_winman
-%% if there already is an attach window for a given pid and thus avoid
-%% spawning processes unnecessarily.
-%%--------------------------------------------------------------------
-title(Pid) ->
-    "Attach Process " ++ pid_to_list(Pid).
-
-
-%%====================================================================
-%% Main loop and message handling
-%%====================================================================
-
-init(Pid, Meta, TraceWin, BackTrace) ->
-
-    %% Start necessary stuff
-    GS = dbg_ui_trace_win:init(),               % Graphics system
-
-    %% Create attach process window
-    Title = title(Pid),
-    Win = dbg_ui_trace_win:create_win(GS, Title, TraceWin, menus()),
-    Window = dbg_ui_trace_win:get_window(Win),
-    dbg_ui_winman:insert(Title, Window),
-
-    %% Initial process state
-    State1 = #state{gs=GS, win=Win, coords={0,0}, pid=Pid, meta=Meta,
-		    status={idle,null,null},
-		    stack={1,1}},
-
-    State2 = init_options(TraceWin,
-			  int:stack_trace(),    % Stack Trace
-			  BackTrace,            % Back trace size
-			  State1),
-
-    State3 = init_contents(int:all_breaks(),    % Breakpoints
-			   State2),
-
-    int:meta(Meta, trace, State3#state.trace),
-
-    gui_enable_updown(stack_trace, {1,1}),
-    gui_enable_btrace(false, false),
-    dbg_ui_trace_win:display(idle),
-
-    loop(State3).
-
-init_options(TraceWin, StackTrace, BackTrace, State) ->
-    lists:foreach(fun(Area) -> dbg_ui_trace_win:select(Area, true) end,
-		  TraceWin),
-
-    Trace = lists:member('Trace Area', TraceWin),
-
-    dbg_ui_trace_win:select(map(StackTrace), true),
-
-    %% Backtrace size is (currently) not shown in window
-
-    State#state{trace=Trace,stack_trace=StackTrace,backtrace=BackTrace}.
-
-init_contents(Breaks, State) ->
-    Win =
-	lists:foldl(fun(Break, Win) ->
-			    dbg_ui_trace_win:add_break(Win,
-						       'Break',Break)
-		    end,
-		    State#state.win,
-		    Breaks),
-
-    State#state{win=Win}.
-
-loop(#state{meta=Meta} = State) ->
-    receive
-
-	%% From the GUI main window
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent)==gs ->
-	    Cmd =
-		dbg_ui_trace_win:handle_event(GuiEvent,State#state.win),
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the GUI help windows
-	{gui, Cmd} ->
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the interpreter
-	{int, Cmd} ->
-	    State2 = int_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the meta process
-	{Meta, Cmd} ->
-	    State2 = meta_cmd(Cmd, State),
-	    loop(State2);
-	{NewMeta, {exit_at, Where, Reason, Cur}} ->
-	    State2 = meta_cmd({exit_at, Where, Reason, Cur},
-			      State#state{meta=NewMeta}),
-	    loop(State2);
-
-	%% From the dbg_ui_edit process
-	{dbg_ui_edit, 'Backtrace:', BackTrace}  ->
-	    loop(State#state{backtrace=BackTrace});
-	{dbg_ui_edit, Var, Val} ->
-	    Cmd = atom_to_list(Var)++"="++io_lib:format("~p", [Val]),
-	    State2 = gui_cmd({user_command, lists:flatten(Cmd)}, State),
-	    loop(State2);
-
-	%% From the dbg_ui_winman process (Debugger window manager)
-	{dbg_ui_winman, update_windows_menu, Data} ->
-	    dbg_ui_winman:update_windows_menu(Data),
-	    loop(State);
-	{dbg_ui_winman, destroy} ->
-	    exit(stop)
-    end.
-
-%%--Commands from the GUI---------------------------------------------
-
-gui_cmd(ignore, State) ->
-    State;
-gui_cmd({win, Win}, State) ->
-    State#state{win=Win};
-gui_cmd(stopped, _State) ->
-    exit(stop);
-gui_cmd({coords, Coords}, State) ->
-    State#state{coords=Coords};
-
-gui_cmd({shortcut, Key}, State) ->
-    case shortcut(Key) of
-	{always, Cmd} -> gui_cmd(Cmd, State);
-	{if_enabled, Cmd} ->
-	    case dbg_ui_trace_win:is_enabled(Cmd) of
-		true -> gui_cmd(Cmd, State);
-		false -> State
-	    end;
-	false -> State
-    end;
-
-%% File menu
-gui_cmd('Close', State) ->
-    gui_cmd(stopped, State);
-
-%% Edit menu
-gui_cmd('Go To Line...', State) ->
-    %% Will result in message handled below: {gui, {gotoline, Line}}
-    dbg_ui_trace_win:helpwin(gotoline, State#state.win,
-			      State#state.gs, State#state.coords),
-    State;
-gui_cmd({gotoline, Line}, State) ->
-    Win = dbg_ui_trace_win:select_line(State#state.win, Line),
-    State#state{win=Win};
-gui_cmd('Search...', State) ->
-    dbg_ui_trace_win:helpwin(search, State#state.win,
-			     State#state.gs, State#state.coords),
-    State;
-
-%% Process menu
-gui_cmd('Step', State) ->
-    int:meta(State#state.meta, step),
-    State;
-gui_cmd('Next', State) ->
-    int:meta(State#state.meta, next),
-    State;
-gui_cmd('Continue', State) ->
-    int:meta(State#state.meta, continue),
-    {Status, Mod, Line} = State#state.status,
-    if
-	Status==wait_break ->
-	    Win = dbg_ui_trace_win:unmark_line(State#state.win),
-	    gui_enable_functions(wait_running),
-	    State#state{win=Win, status={wait_running,Mod,Line}};
-	true ->
-	    dbg_ui_trace_win:enable(['Stop'], true),
-	    dbg_ui_trace_win:enable(['Continue'], false),
-	    State
-    end;
-gui_cmd('Finish', State) ->
-    int:meta(State#state.meta, finish),
-    State;
-gui_cmd('Skip', State) ->
-    int:meta(State#state.meta, skip),
-    State;
-gui_cmd('Time Out', State) ->
-    int:meta(State#state.meta, timeout),
-    State;
-gui_cmd('Stop', State) ->
-    int:meta(State#state.meta, stop),
-    {Status, Mod, Line} = State#state.status,
-    if
-	Status==wait_running ->
-	    Win = dbg_ui_trace_win:mark_line(State#state.win, Line,
-					     break),
-	    gui_enable_functions(wait_break),
-	    gui_enable_updown(State#state.stack_trace,
-			      State#state.stack),
-	    gui_enable_btrace(State#state.trace,
-			      State#state.stack_trace),
-	    dbg_ui_trace_win:display({wait, Mod, Line}),
-	    State#state{win=Win, status={wait_break,Mod,Line}};
-	true ->
-	    dbg_ui_trace_win:enable(['Stop'], false),
-	    dbg_ui_trace_win:enable(['Continue'], true),
-	    State
-    end;
-gui_cmd('Where', State) ->
-    {_Cur, Max} = State#state.stack,
-    Stack = {Max, Max},
-    {_Status, Mod, Line} = State#state.status,
-    Win = gui_show_module(State#state.win, Mod, Line,
-			  State#state.cm, State#state.pid, break),
-    gui_update_bindings(State#state.meta),
-    gui_enable_updown(State#state.stack_trace, Stack),
-    dbg_ui_trace_win:display(State#state.status),
-    State#state{win=Win, cm=Mod, stack=Stack};
-
-gui_cmd('Kill', State) ->
-    exit(State#state.pid, kill),
-    State;
-gui_cmd('Messages', State) ->
-    case int:meta(State#state.meta, messages) of
-	[] ->
-	    dbg_ui_trace_win:eval_output("< No Messages!\n", bold);
-	Messages ->
-	    dbg_ui_trace_win:eval_output("< --- Current Messages ---\n",
-					 bold),
-	    lists:foldl(
-	      fun(Msg, N) ->
-		      Str1 = io_lib:format(" ~w:", [N]),
-		      dbg_ui_trace_win:eval_output(Str1, bold),
-		      Str2 = io_lib:format(" ~ts~n",[io_lib:print(Msg)]),
-		      dbg_ui_trace_win:eval_output(Str2, normal),
-		      N+1
-	      end,
-	      1,
-	      Messages)
-    end,
-    State;
-gui_cmd('Back Trace', State) ->
-    dbg_ui_trace_win:trace_output("\nBACK TRACE\n----------\n"),
-    lists:foreach(
-      fun({Le, {Mod,Func,Args}}) ->
-	      Str = io_lib:format("~p > ~p:~p~p~n",
-				  [Le, Mod, Func, Args]),
-	      dbg_ui_trace_win:trace_output(Str);
-	 ({Le, {Fun,Args}}) ->
-	      Str = io_lib:format("~p > ~p~p~n", [Le, Fun, Args]),
-	      dbg_ui_trace_win:trace_output(Str);
-	 (_) -> ignore
-      end,
-      int:meta(State#state.meta, backtrace, State#state.backtrace)),
-    dbg_ui_trace_win:trace_output("\n"),
-    State;
-gui_cmd('Up', State) ->
-    {Cur, Max} = State#state.stack,
-    case int:meta(State#state.meta, stack_frame, {up, Cur}) of
-	{New, {undefined,-1}, _Bs} -> % call from non-interpreted code
-	    Stack = {New, Max},
-	    Win = dbg_ui_trace_win:show_no_code(State#state.win),
-	    dbg_ui_trace_win:update_bindings([]),
-	    gui_enable_updown(State#state.stack_trace, Stack),
-	    dbg_ui_trace_win:display({New,null,null}),
-	    State#state{win=Win, cm=null, stack=Stack};
-
-	{New, {Mod,Line}, Bs} ->
-	    Stack = {New, Max},
-	    Win = gui_show_module(State#state.win, Mod, Line,
-				  State#state.cm, State#state.pid,
-				  where),
-	    dbg_ui_trace_win:update_bindings(Bs),
-	    gui_enable_updown(State#state.stack_trace, Stack),
-	    dbg_ui_trace_win:display({New,Mod,Line}),
-	    State#state{win=Win, cm=Mod, stack=Stack};
-	top ->
-	    dbg_ui_trace_win:enable(['Up'], false),
-	    State
-    end;
-gui_cmd('Down', State) ->
-    {Cur, Max} = State#state.stack,
-    case int:meta(State#state.meta, stack_frame, {down, Cur}) of
-	{New, {undefined,-1}, _Bs} -> % call from non-interpreted code
-	    Stack = {New, Max},
-	    Win = dbg_ui_trace_win:show_no_code(State#state.win),
-	    dbg_ui_trace_win:update_bindings([]),
-	    gui_enable_updown(State#state.stack_trace, Stack),
-	    dbg_ui_trace_win:display({New,null,null}),
-	    State#state{win=Win, cm=null, stack=Stack};
-
-	{New, {Mod,Line}, Bs} ->
-	    Stack = {New, Max},
-	    Win = gui_show_module(State#state.win, Mod, Line,
-				  State#state.cm, State#state.pid,
-				  where),
-	    dbg_ui_trace_win:update_bindings(Bs),
-	    gui_enable_updown(State#state.stack_trace, Stack),
-	    dbg_ui_trace_win:display({New,Mod,Line}),
-	    State#state{win=Win, cm=Mod, stack=Stack};
-
-	bottom ->
-	    gui_cmd('Where', State)
-    end;
-
-%% Break menu
-gui_cmd('Line Break...', State) ->
-    add_break(State#state.gs, State#state.coords, line,
-	      State#state.cm,
-	      dbg_ui_trace_win:selected_line(State#state.win)),
-    State;
-gui_cmd('Conditional Break...', State) ->
-    add_break(State#state.gs, State#state.coords, conditional,
-	      State#state.cm,
-	      dbg_ui_trace_win:selected_line(State#state.win)),
-    State;
-gui_cmd('Function Break...', State) ->
-    add_break(State#state.gs, State#state.coords, function,
-	      State#state.cm, undefined),
-    State;
-gui_cmd('Enable All', State) ->
-    Breaks = int:all_breaks(),
-    ThisMod = State#state.cm,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
-			  int:enable_break(Mod, Line);
-		      (_Break) ->
-			  ignore
-		  end,
-		  Breaks),
-    State;
-gui_cmd('Disable All', State) ->
-    Breaks = int:all_breaks(),
-    ThisMod = State#state.cm,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
-			  int:disable_break(Mod, Line);
-		      (_Break) ->
-			  ignore
-		  end,
-		  Breaks),
-    State;
-gui_cmd('Delete All', State) ->
-    int:no_break(State#state.cm),
-    State;
-gui_cmd({break, {Mod, Line}, What}, State) ->
-    case What of
-	add -> int:break(Mod, Line);
-	delete -> int:delete_break(Mod, Line);
-	{status, inactive} -> int:disable_break(Mod, Line);
-	{status, active} -> int:enable_break(Mod, Line);
-	{trigger, Action} -> int:action_at_break(Mod, Line, Action)
-    end,
-    State;
-
-%% Options menu
-gui_cmd({'Trace Window', TraceWin}, State) ->
-    Trace = lists:member('Trace Area', TraceWin),
-    int:meta(State#state.meta, trace, Trace),
-    Win = dbg_ui_trace_win:configure(State#state.win, TraceWin),
-    {Status,_,_} = State#state.status,
-    if
-	Status==break; Status==wait_break ->
-	    gui_enable_btrace(Trace, State#state.stack_trace);
-	true -> ignore
-    end,
-    State#state{win=Win, trace=Trace};
-gui_cmd({'Stack Trace', [Name]}, State) ->
-    int:meta(State#state.meta, stack_trace, map(Name)),
-    {Status,_,_} = State#state.status,
-    if
-	Status==break; Status==wait_break ->
-	    gui_enable_btrace(State#state.trace, map(Name));
-	true -> ignore
-    end,
-    State;
-gui_cmd('Back Trace Size...', State) ->
-    dbg_ui_edit:start(State#state.gs, State#state.coords, "Backtrace",
-		      'Backtrace:', {integer, State#state.backtrace}),
-    State;
-
-%% Help menu
-gui_cmd('Debugger', State) ->
-    Window = dbg_ui_trace_win:get_window(State#state.win),
-    HelpFile = filename:join([code:lib_dir(debugger),
-			      "doc", "html", "part_frame.html"]),
-    tool_utils:open_help(Window, HelpFile),
-    State;
-
-gui_cmd({user_command, Cmd}, State) ->
-    {Status, _Mod, _Line} = State#state.status,
-    if
-	Status==break;
-	Status==wait_break;
-	Status==wait_running ->
-	    Cm = State#state.cm,
-	    Arg = case State#state.stack of
-		      {Cur, Max} when Cur<Max -> {Cm, Cmd, Cur};
-		      _Stack -> {Cm, Cmd}
-		  end,
-
-	    %% Reply will be received as {Meta, {eval_rsp, Res}}
-	    int:meta(State#state.meta, eval, Arg);
-	true ->
-	    Str = "Commands not allowed",
-	    dbg_ui_trace_win:eval_output([$<,Str,10], normal)
-    end,
-    State;
-
-gui_cmd({edit, {Var, Val}}, State) ->
-    dbg_ui_edit:start(State#state.gs, State#state.coords,
-		      "Edit variable", Var, {term, Val}),
-    State.
-
-add_break(GS, Coords, Type, undefined, _Line) ->
-    dbg_ui_break:start(GS, Coords, Type);
-add_break(GS, Coords, Type, Mod, undefined) ->
-    dbg_ui_break:start(GS, Coords, Type, Mod);
-add_break(GS, Coords, Type, Mod, Line) ->
-    dbg_ui_break:start(GS, Coords, Type, Mod, Line).
-
-%%--Commands from the interpreter-------------------------------------
-
-int_cmd({interpret, Mod}, State) ->
-    if
-	Mod==State#state.cm ->
-	    State#state{cm_obsolete=true};
-	true ->
-	    State
-    end;
-int_cmd({no_interpret, Mod}, State) ->
-    if
-	Mod==State#state.cm ->
-	    State#state{cm_obsolete=true};
-	true ->
-	    Win = dbg_ui_trace_win:remove_code(State#state.win, Mod),
-	    State#state{win=Win}
-    end;
-
-int_cmd({new_break, Break}, State) ->
-    Win = dbg_ui_trace_win:add_break(State#state.win, 'Break', Break),
-    State#state{win=Win};
-int_cmd({delete_break, Point}, State) ->
-    Win = dbg_ui_trace_win:delete_break(State#state.win, Point),
-    State#state{win=Win};
-int_cmd({break_options, Break}, State) ->
-    Win = dbg_ui_trace_win:update_break(State#state.win, Break),
-    State#state{win=Win};
-int_cmd(no_break, State) ->
-    Win = dbg_ui_trace_win:clear_breaks(State#state.win),
-    State#state{win=Win};
-int_cmd({no_break, Mod}, State) ->
-    Win = dbg_ui_trace_win:clear_breaks(State#state.win, Mod),
-    State#state{win=Win}.
-
-%%--Commands from the meta process------------------------------------
-
-%% Message received when first attached to a living process
-%% '_Trace' is a boolean indicating if the process is traced or not --
-%% ignore this as we already have ordered tracing or not depending on if
-%% the Trace Area is shown or not.
-meta_cmd({attached, Mod, Line, _Trace}, State) ->
-    Win = if
-	      Mod/=undefined ->
-		  gui_enable_functions(init),
-		  gui_show_module(State#state.win, Mod, Line,
-				  State#state.cm, State#state.pid,
-				  break);
-	      true -> State#state.win
-	  end,
-    State#state{win=Win, status={init,Mod,Line}, cm=Mod};
-
-%% Message received when returning to interpreted code
-meta_cmd({re_entry, dbg_ieval, eval_fun}, State) ->
-    State;
-meta_cmd({re_entry, Mod, _Func}, State) ->
-    Obs = State#state.cm_obsolete,
-    case State#state.cm of
-	Mod when Obs==true ->
-	    Win = gui_load_module(State#state.win, Mod,State#state.pid),
-	    State#state{win=Win, cm_obsolete=false};
-	Mod -> State;
-	Cm ->
-	    Win = gui_show_module(State#state.win, Mod, 0,
-				  Cm, State#state.pid, break),
-	    State#state{win=Win, cm=Mod}
-    end;
-
-%% Message received when attached to a terminated process
-meta_cmd({exit_at, null, Reason, Cur}, State) ->
-    Stack = {Cur, Cur},
-    gui_enable_functions(exit),
-    gui_enable_updown(false, Stack),
-    dbg_ui_trace_win:display({exit, null, Reason}),
-    State#state{status={exit,null,Reason}, stack=Stack};
-meta_cmd({exit_at, {Mod,Line}, Reason, Cur}, State) ->
-    Stack = {Cur+1, Cur+1},
-    Win = gui_show_module(State#state.win, Mod, Line,
-			  State#state.cm, State#state.pid, break),
-    gui_enable_functions(exit),
-    gui_enable_updown(State#state.stack_trace, Stack),
-    gui_enable_btrace(State#state.trace, State#state.stack_trace),
-    gui_update_bindings(State#state.meta),
-    dbg_ui_trace_win:display({exit, {Mod,Line}, Reason}),
-    State#state{win=Win, cm=Mod,status={exit,{Mod,Line},Reason},
-		stack=Stack};
-
-meta_cmd({break_at, Mod, Line, Cur}, State) ->
-    Stack = {Cur,Cur},
-    Win = gui_show_module(State#state.win, Mod, Line,
-			  State#state.cm, State#state.pid, break),
-    gui_enable_functions(break),
-    gui_enable_updown(State#state.stack_trace, Stack),
-    gui_enable_btrace(State#state.trace, State#state.stack_trace),
-    gui_update_bindings(State#state.meta),
-    dbg_ui_trace_win:display({break, Mod, Line}),
-    State#state{win=Win, cm=Mod, status={break,Mod,Line}, stack=Stack};
-meta_cmd({func_at, Mod, Line, Cur}, State) ->
-    Stack = {Cur,Cur},
-    Win = gui_show_module(State#state.win, Mod, Line,
-			  State#state.cm, State#state.pid, where),
-    gui_enable_functions(idle),
-    dbg_ui_trace_win:display(idle),
-    State#state{win=Win, cm=Mod, status={idle,Mod,Line}, stack=Stack};
-meta_cmd({wait_at, Mod, Line, Cur}, #state{status={Status,_,_}}=State)
-  when Status/=init, Status/=break ->
-    Stack = {Cur,Cur},
-    gui_enable_functions(wait_running),
-    dbg_ui_trace_win:display({wait,Mod,Line}),
-    State#state{status={wait_running,Mod,Line}, stack=Stack};
-meta_cmd({wait_at, Mod, Line, Cur}, State) ->
-    Stack = {Cur,Cur},
-    Win = gui_show_module(State#state.win, Mod, Line,
-			  State#state.cm, State#state.pid, break),
-    gui_enable_functions(wait_break),
-    gui_enable_updown(State#state.stack_trace, Stack),
-    gui_enable_btrace(State#state.trace, State#state.stack_trace),
-    gui_update_bindings(State#state.meta),
-    dbg_ui_trace_win:display({wait, Mod, Line}),
-    State#state{win=Win, cm=Mod, status={wait_break,Mod,Line},
-		stack=Stack};
-meta_cmd({wait_after_at, Mod, Line, Sp}, State) ->
-    meta_cmd({wait_at, Mod, Line, Sp}, State);
-meta_cmd(running, State) ->
-    Win = dbg_ui_trace_win:unmark_line(State#state.win),
-    gui_enable_functions(running),
-    dbg_ui_trace_win:update_bindings([]),
-    dbg_ui_trace_win:display({running, State#state.cm}),
-    State#state{win=Win, status={running,null,null}};
-
-meta_cmd(idle, State) ->
-    Win = dbg_ui_trace_win:show_no_code(State#state.win),
-    gui_enable_functions(idle),
-    dbg_ui_trace_win:update_bindings([]),
-    dbg_ui_trace_win:display(idle),
-    State#state{win=Win, status={idle,null,null}, cm=undefined};
-
-%% Message about changed trace option can be ignored, the change must
-%% have been ordered by this process. (In theory, the change could have
-%% been ordered by another attached process. The Debugger, though,
-%% allows max one attached process per debugged process).
-meta_cmd({trace, _Bool}, State) ->
-    State;
-
-meta_cmd({stack_trace, Flag}, State) ->
-    dbg_ui_trace_win:select(map(Flag), true),
-    gui_enable_updown(Flag, State#state.stack),
-    {Status,_,_} = State#state.status,
-    if
-	Status==break; Status==wait_break ->
-	    gui_enable_btrace(State#state.trace, Flag);
-	true -> ignore
-    end,
-    State#state{stack_trace=Flag};
-
-meta_cmd({trace_output, Str}, State) ->
-    dbg_ui_trace_win:trace_output(Str),
-    State;
-
-%% Reply on a user command
-meta_cmd({eval_rsp, Res}, State) ->
-    Str = io_lib:print(Res),
-    dbg_ui_trace_win:eval_output([$<,Str,10], normal),
-    State.
-
-
-%%====================================================================
-%% GUI auxiliary functions
-%%====================================================================
-
-menus() ->
-    [{'File', [{'Close', no}]},
-     {'Edit', [{'Go To Line...', no},
-	       {'Search...', no}]},
-     {'Process', [{'Step', 0},
-		  {'Next', 0},
-		  {'Continue', 0},
-		  {'Finish', 0},
-		  {'Skip', no},
-		  {'Time Out', no},
-		  {'Stop', no},
-		  separator,
-		  {'Kill', no},
-		  separator,
-		  {'Messages', 0},
-		  {'Back Trace', no},
-		  separator,
-		  {'Where', 0},
-		  {'Up', no},
-		  {'Down', no}]},
-     {'Break', [{'Line Break...', 5},
-		{'Conditional Break...', no},
-		{'Function Break...', no},
-		separator,
-		{'Enable All', no},
-		{'Disable All', no},
-		{'Delete All', 0},
-		separator]},
-     {'Options', [{'Trace Window', no, cascade,
-		   [{'Button Area', no, check},
-		    {'Evaluator Area', no, check},
-		    {'Bindings Area', no, check},
-		    {'Trace Area', no, check}]},
-		  {'Stack Trace', no, cascade,
-		   [{'Stack On, Tail', no, radio},
-		    {'Stack On, No Tail', no, radio},
-		    {'Stack Off', no, radio}]},
-		  {'Back Trace Size...', no}]},
-     {'Help', [{'Debugger', no}]}].
-
-%% enable(Status) -> [MenuItem]
-%%   Status = init  % when first message from Meta has arrived
-%%          | idle | break | exit | wait_break | wait_running | running
-enable(init) -> [];
-enable(idle) -> ['Stop','Kill'];
-enable(break) -> ['Step','Next','Continue','Finish','Skip',
-		  'Kill','Messages'];
-enable(exit) -> [];
-enable(wait_break) -> ['Continue','Time Out','Kill'];
-enable(wait_running) -> ['Stop','Kill'];
-enable(running) -> ['Stop','Kill'].
-
-all_buttons() ->
-    ['Step','Next','Continue','Finish','Skip','Time Out','Stop',
-     'Kill','Messages','Back Trace','Where','Up','Down'].
-
-shortcut(s) -> {if_enabled, 'Step'};
-shortcut(n) -> {if_enabled, 'Next'};
-shortcut(c) -> {if_enabled, 'Continue'};
-shortcut(f) -> {if_enabled, 'Finish'};
-shortcut(m) -> {if_enabled, 'Messages'};
-shortcut(w) -> {if_enabled, 'Where'};
-
-shortcut(b) -> {always, 'Line Break...'};
-shortcut(d) -> {always, 'Delete All'};
-
-shortcut(_) -> false.
-
-map('Stack On, Tail')    -> all;               % Stack trace
-map('Stack On, No Tail') -> no_tail;
-map('Stack Off')         -> false;
-map(all)                 -> 'Stack On, Tail';
-map(true)                -> 'Stack On, Tail';
-map(no_tail)             -> 'Stack On, No Tail';
-map(false)               -> 'Stack Off'.
-
-
-%% gui_show_module(Win, Mod, Line, Cm, Pid, How) -> Win
-%% gui_show_module(Win, {Mod,Line}, _Reason, Cm, Pid, How) -> Win
-%%   How = where | break
-%% Show contents of a module in code area
-gui_show_module(Win, {Mod,Line}, _Reason, Cm, Pid, How) ->
-    gui_show_module(Win, Mod, Line, Cm, Pid, How);
-gui_show_module(Win, Mod, Line, Mod, _Pid, How) ->
-    dbg_ui_trace_win:mark_line(Win, Line, How);
-gui_show_module(Win, Mod, Line, _Cm, Pid, How) ->
-    Win2 = case dbg_ui_trace_win:is_shown(Win, Mod) of
-	       {true, Win3} -> Win3;
-	       false -> gui_load_module(Win, Mod, Pid)
-	   end,
-    dbg_ui_trace_win:mark_line(Win2, Line, How).
-
-gui_load_module(Win, Mod, Pid) ->
-    dbg_ui_trace_win:display({text, "Loading module..."}),
-    Contents = int:contents(Mod, Pid),
-    Win2 = dbg_ui_trace_win:show_code(Win, Mod, Contents),
-    dbg_ui_trace_win:display({text, ""}),
-    Win2.
-
-gui_update_bindings(Meta) ->
-    Bs = int:meta(Meta, bindings, nostack),
-    dbg_ui_trace_win:update_bindings(Bs).
-
-gui_enable_functions(Status) ->
-    Enable = enable(Status),
-    Disable = all_buttons() -- Enable,
-    dbg_ui_trace_win:enable(Disable, false),
-    dbg_ui_trace_win:enable(Enable, true).
-
-gui_enable_updown(Flag, Stack) ->
-    {Enable, Disable} =
-	if
-	    Flag==false -> {[], ['Up', 'Down']};
-	    true ->
-		case Stack of
-		    {1,1} -> {[], ['Up', 'Down']};
-		    {2,2} -> {[], ['Up', 'Down']};
-		    {Max,Max} -> {['Up'], ['Down']};
-		    {2,_Max} -> {['Down'], ['Up']};
-		    {_Cur,_Max} -> {['Up', 'Down'], []}
-		end
-	end,
-    dbg_ui_trace_win:enable(Enable, true),
-    dbg_ui_trace_win:enable(Disable, false),
-    if
-	Enable==[] -> dbg_ui_trace_win:enable(['Where'], false);
-	true -> dbg_ui_trace_win:enable(['Where'], true)
-    end.
-
-gui_enable_btrace(Trace, StackTrace) ->
-    Bool = if
-	       Trace==false -> false;
-	       StackTrace==false -> false;
-	       true -> true
-	   end,
-    dbg_ui_trace_win:enable(['Back Trace'], Bool).
diff --git a/lib/debugger/src/dbg_ui_trace_win.erl b/lib/debugger/src/dbg_ui_trace_win.erl
deleted file mode 100644
index beb3fbd71e..0000000000
--- a/lib/debugger/src/dbg_ui_trace_win.erl
+++ /dev/null
@@ -1,1595 +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%
-%%
--module(dbg_ui_trace_win).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,button,3}},
-          {nowarn_deprecated_function,{gs,checkbutton,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,4}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,editor,2}},
-          {nowarn_deprecated_function,{gs,editor,3}},
-          {nowarn_deprecated_function,{gs,entry,2}},
-          {nowarn_deprecated_function,{gs,entry,3}},
-          {nowarn_deprecated_function,{gs,frame,3}},
-          {nowarn_deprecated_function,{gs,grid,3}},
-          {nowarn_deprecated_function,{gs,gridline,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,label,3}},
-          {nowarn_deprecated_function,{gs,menubar,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,window,2}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-%% External exports
--export([init/0]).
--export([create_win/4, get_window/1,
-	 configure/2,
-	 enable/2, is_enabled/1, select/2,
-	 add_break/3, update_break/2, delete_break/2,
-	 clear_breaks/1, clear_breaks/2,
-	 display/1,                                   % Help messages
-	 is_shown/2,                                  % Code area
-	 show_code/3, show_no_code/1, remove_code/2,      
-	 mark_line/3, unmark_line/1,
-	 select_line/2, selected_line/1,
-	 eval_output/2,                               % Evaluator area
-	 update_bindings/1,                           % Bindings area
-	 trace_output/1,                              % Trace area
-	 handle_event/2
-	]).
--export([helpwin/4,                                   % Help windows
-	 helpwin/5]).
-
--record(breakInfo, {point, status, break}).
--record(winInfo, {window,          % gsobj()
-		  size,            % {W, H}
-		  flags,           % {F,F,F,F} F = open|close
-
-		  marked_line=0,   % integer() Current line
-		  selected_line=0, % integer() Selected line
-
-		  breaks=[],       % [#breakInfo{}] Known breakpoints
-
-		  editor,          % {Mod, Editor}  Visible code editor
-		  editors=[]       % [{Mod,Editor}] Code editors
-		 }).
-
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% init() -> GS
-%%   GS = term()
-%%--------------------------------------------------------------------
-init() ->
-    dbg_ui_win:init().
-
-%%--------------------------------------------------------------------
-%% create_win(GS, Title, TraceWin, Menus) -> #winInfo{}
-%%  GS = gsobj()
-%%  Title = string()
-%%  TraceWin = [WinArea]
-%%    WinArea = 'Button|Evaluator|Bindings|Trace Area'
-%%  Menus = [menu()]  See dbg_ui_win.erl
-%%--------------------------------------------------------------------
-create_win(GS, Title, TraceWin, Menus) ->
-    Bu = flip(lists:member('Button Area', TraceWin)),
-    Ev = flip(lists:member('Evaluator Area', TraceWin)),
-    Bi = flip(lists:member('Bindings Area', TraceWin)),
-    Tr = flip(lists:member('Trace Area', TraceWin)),
-    
-    Win = gs:window(trace_window, GS, [{title, Title},
-				       {width, 550},
-				       {configure,true}, {destroy,true},
-				       {keypress,true}, {motion,true}]),
-
-    MenuBar = gs:menubar(Win, []),
-    dbg_ui_win:create_menus(MenuBar, Menus),
-    dbg_ui_winman:windows_menu(MenuBar),
-
-    FrameOpts = [{anchor,nw}, {relief,raised}, {bw,2}, {keypress,true}],
-    Editor = code_area(2, 25, FrameOpts, Win),
-    button_area(Bu, 2, 235, FrameOpts, Win),
-    eval_area({Ev,Bi}, 2, 265, FrameOpts, Win),
-    bind_area({Ev,Bi}, 300, 265, FrameOpts, Win),
-    trace_area(Tr, 2, 475, FrameOpts, Win),
-
-    Flags = {Bu, Ev, Bi, Tr},
-    resizebar(rb1(Flags), 'RB1',   2, 225, 710,  10, Win),
-    resizebar(rb2(Flags), 'RB2',   2, 465, 710,  10, Win),
-    resizebar(rb3(Flags), 'RB3', 290, 265,  10, 200, Win),
-    config_v(),
-    config_h(),
-    
-    gs:config(Win,{height,
-		   25 +
-		   gs:read('CodeArea', height) +
-		   gs:read('RB1', height) +
-		   gs:read('ButtonArea', height) +
-		   erlang:max(gs:read('EvalArea', height),
-		       gs:read('BindArea', height)) +
-		   gs:read('RB2', height) +
-		   gs:read('TraceArea', height)}),
-    
-    gs:config(Win, {map, true}),
-    #winInfo{window=Win, size={gs:read(Win,width), gs:read(Win,height)},
-	     flags=Flags,
-	     editor={'$top', Editor}, editors=[{'$top', Editor}]}.
-
-flip(true) -> open;
-flip(false) -> close.
-    
-%%--------------------------------------------------------------------
-%% get_window(WinInfo) -> Window
-%%   WinInfo = #winInfo{}
-%%   Window = gsobj()
-%%--------------------------------------------------------------------
-get_window(WinInfo) ->
-    WinInfo#winInfo.window.
-
-%%--------------------------------------------------------------------
-%% configure(WinInfo, TraceWin) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%  TraceWin = [WinArea]
-%%    WinArea = 'Button|Evaluator|Bindings|Trace Area'
-%% Window areas should be opened or closed.
-%%--------------------------------------------------------------------
-configure(WinInfo, TraceWin) ->
-    {Bu1, Ev1, Bi1, Tr1} = OldFlags = WinInfo#winInfo.flags,
-    Bu2 = flip(lists:member('Button Area', TraceWin)),
-    Ev2 = flip(lists:member('Evaluator Area', TraceWin)),
-    Bi2 = flip(lists:member('Bindings Area', TraceWin)),
-    Tr2 = flip(lists:member('Trace Area', TraceWin)),
-    NewFlags = {Bu2, Ev2, Bi2, Tr2},
-
-    Win = WinInfo#winInfo.window,
-    W = gs:read(Win, width),
-    H = gs:read(Win, height),
-
-    H2 = if
-	     Bu1 =:= close, Bu2 =:= open ->
-		 resize_button_area(open, width, W-4),
-		 gs:config('ButtonArea', {height, 30}),
-		 H+30;
-	     Bu1 =:= open, Bu2 =:= close ->
-		 gs:config('ButtonArea', [{width, 0}, {height, 0}]),
-		 H-30;
-	     true -> H
-	 end,
-    H3 = if
-	     Ev1 =:= close, Ev2 =:= open, Bi1 =:= open ->
-		 Wnew1 = round((W-10-4)/2), % W = window/2 - rb - pads
-		 Hbi1 = gs:read('BindArea', height), % H = bind area h
-		 resize_eval_area(open, width, Wnew1),
-		 resize_eval_area(open, height, Hbi1),
-		 gs:config('RB3', {width, 10}),
-		 gs:config('RB3', {height, Hbi1}),
-		 resize_bind_area(open, width,
-				  Wnew1-gs:read('BindArea', width)),
-		 H2;
-	     Ev1 =:= close, Ev2 =:= open, Bi1 =:= close ->
-		 resize_eval_area(open, width, W-4),
-		 resize_eval_area(open, height, 200),
-		 H2+200;
-	     Ev1 =:= open, Ev2 =:= close, Bi1 =:= open ->
-		 gs:config('EvalArea', [{width,0}, {height,0}]),
-		 gs:config('RB3', [{width, 0}, {height, 0}]),
-		 Wnew2 = W-4,
-		 resize_bind_area(open, width,
-				  Wnew2-gs:read('BindArea', width)),
-		 H2;
-	     Ev1 =:= open, Ev2 =:= close, Bi1 =:= close ->
-		 Hs1 = gs:read('EvalArea', height),
-		 gs:config('EvalArea', [{width, 0}, {height, 0}]),
-		 H2-Hs1;
-	     true -> H2
-	 end,
-    H4 = if
-	     Bi1 =:= close, Bi2 =:= open, Ev2 =:= open ->
-		 Wnew3 = round((W-10-4)/2), % W = window/2 - rb - pads
-		 Hs2 = gs:read('EvalArea', height), % H = eval area h
-		 resize_bind_area(open, width, Wnew3),
-		 resize_bind_area(open, height, Hs2),
-		 gs:config('RB3', [{width,10},{height,Hs2}]),
-		 resize_eval_area(open, width,
-				  Wnew3-gs:read('EvalArea', width)),
-		 H3;
-	     Bi1 =:= close, Bi2 =:= open, Ev2 =:= close ->
-		 resize_bind_area(open, width, W-4),
-		 resize_bind_area(open, height, 200),
-		 H3+200;
-	     Bi1 =:= open, Bi2 =:= close, Ev2 =:= open ->
-		 gs:config('BindArea', [{width, 0}, {height, 0}]),
-		 gs:config('RB3', [{width, 0}, {height, 0}]),
-		 Wnew4 = W-4,
-		 resize_eval_area(open, width,
-				  Wnew4-gs:read('EvalArea', width)),
-		 H3;
-	     Bi1 =:= open, Bi2 =:= close, Ev2 =:= close ->
-		 Hbi2 = gs:read('BindArea', height),
-		 gs:config('BindArea', [{width, 0}, {height, 0}]),
-		 H3-Hbi2;
-	     true -> H3
-	 end,
-    H5 = if
-	     Tr1 =:= close, Tr2 =:= open ->
-		 resize_trace_area(open, width, W-4),
-		 resize_trace_area(open, height, 200),
-		 H4+200;
-	     Tr1 =:= open, Tr2 =:= close ->
-		 Hf = gs:read('TraceArea', height),
-		 gs:config('TraceArea', [{width, 0}, {height, 0}]),
-		 H4-Hf;
-	     true -> H4
-	 end,
-    gs:config(Win, {height, H5}),
-
-    RB1old = rb1(OldFlags), RB1new = rb1(NewFlags),
-    if
-	RB1old =:= close, RB1new =:= open ->
-	    gs:config('RB1', [{width, W-4}, {height, 10}]),
-	    gs:config(Win, {height, gs:read(Win, height)+10});
-	RB1old =:= open, RB1new =:= close ->
-	    gs:config('RB1', [{width, 0}, {height, 0}, lower]),
-	    gs:config(Win, {height, gs:read(Win, height)-10});
-	true -> ignore
-    end,
-
-    RB2old = rb2(OldFlags), RB2new = rb2(NewFlags),
-    if
-	RB2old =:= close, RB2new =:= open ->
-	    gs:config('RB2', [{width, W-4}, {height, 10}]),
-	    gs:config(Win, {height,gs:read(Win, height)+10});
-	RB2old =:= open, RB2new =:= close ->
-	    gs:config('RB2', [{width, 0}, {height, 0}, lower]),
-	    gs:config(Win, {height, gs:read(Win, height)-10});
-	true -> ignore
-    end,
-    config_v(),
-    config_h(),
-
-    flush_configure(),
-    
-    WinInfo#winInfo{size={gs:read(Win, width), gs:read(Win, height)},
-		    flags=NewFlags}.
-
-flush_configure() ->
-    receive
-	{gs, _Id, configure, _Data, _Arg} ->
-	    flush_configure()
-    after 100 ->
-	    true
-    end.
-
-%%--------------------------------------------------------------------
-%% enable([MenuItem], Bool)
-%% is_enabled(MenuItem) -> Bool
-%%   MenuItem = atom()
-%%   Bool = boolean()
-%%--------------------------------------------------------------------
-enable(MenuItems, Bool) ->
-    lists:foreach(fun(MenuItem) ->
-			  gs:config(MenuItem, {enable, Bool}),
-			  case is_button(MenuItem) of
-			      {true, Button} ->
-				  gs:config(Button, {enable, Bool});
-			      false -> ignore
-			  end
-		  end,
-		  MenuItems).
-
-is_enabled(MenuItem) ->
-    gs:read(MenuItem, enable).
-
-%%--------------------------------------------------------------------
-%% select(MenuItem, Bool)
-%%   MenuItem = atom()
-%%   Bool = boolean()
-%%--------------------------------------------------------------------
-select(MenuItem, Bool) ->
-    dbg_ui_win:select(MenuItem, Bool).
-
-%%--------------------------------------------------------------------
-%% add_break(WinInfo, Name, {Point, Options}) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Name = atom() Menu name
-%%   Point = {Mod, Line}
-%%   Options = [Status, Action, Mods, Cond]
-%%     Status = active | inactive
-%%     Action = enable | disable | delete
-%%     Mods = null (not used)
-%%     Cond = null | {Mod, Func}
-%%--------------------------------------------------------------------
-add_break(WinInfo, Menu, {{Mod,Line},[Status|_Options]}=Break) ->
-    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
-	{Mod, Editor} ->
-	    add_break_to_code(Editor, Line, Status);
-	false -> ignore
-    end,
-    add_break_to_menu(WinInfo, Menu, Break).
-
-add_break_to_code(Editor, Line, Status) ->
-    Color = if Status =:= active -> red; Status =:= inactive -> blue end,
-    config_editor(Editor, [{overwrite,{{Line,0},"-@-  "}},
-			   {fg,{{{Line,0},{Line,lineend}}, Color}}]).
-
-add_break_to_menu(WinInfo, Menu, {Point, [Status|_Options]=Options}) ->
-    Break = dbg_ui_win:add_break(Menu, Point),
-    dbg_ui_win:update_break(Break, Options),
-    BreakInfo = #breakInfo{point=Point, status=Status, break=Break},
-    WinInfo#winInfo{breaks=[BreakInfo|WinInfo#winInfo.breaks]}.
-
-%%--------------------------------------------------------------------
-%% update_break(WinInfo, {Point, Options}) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Point = {Mod, Line}
-%%   Options = [Status, Action, Mods, Cond]
-%%     Status = active | inactive
-%%     Action = enable | disable | delete
-%%     Mods = null (not used)
-%%     Cond = null | {Mod, Func}
-%%--------------------------------------------------------------------
-update_break(WinInfo, {{Mod,Line},[Status|_Options]}=Break) ->
-    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
-	{Mod, Editor} ->
-	    add_break_to_code(Editor, Line, Status);
-	false -> ignore
-    end,
-    update_break_in_menu(WinInfo, Break).
-
-update_break_in_menu(WinInfo, {Point, [Status|_Options]=Options}) ->
-    {value, BreakInfo} = lists:keysearch(Point, #breakInfo.point,
-					 WinInfo#winInfo.breaks),
-    dbg_ui_win:update_break(BreakInfo#breakInfo.break, Options),
-    BreakInfo2 = BreakInfo#breakInfo{status=Status},
-    WinInfo#winInfo{breaks=lists:keyreplace(Point, #breakInfo.point,
-					    WinInfo#winInfo.breaks,
-					    BreakInfo2)}.
-
-%%--------------------------------------------------------------------
-%% delete_break(WinInfo, Point) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Point = {Mod, Line}
-%%--------------------------------------------------------------------
-delete_break(WinInfo, {Mod,Line}=Point) ->
-    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
-	{Mod, Editor} -> delete_break_from_code(Editor, Line);
-	false -> ignore
-    end,
-    delete_break_from_menu(WinInfo, Point).
-
-delete_break_from_code(Editor, Line) ->
-    Prefix = string:substr(integer_to_list(Line)++":   ", 1, 5),
-    config_editor(Editor, [{overwrite,{{Line,0},Prefix}},
-			   {fg,{{{Line,0},{Line,lineend}}, black}}]).
-
-delete_break_from_menu(WinInfo, Point) ->
-    {value, BreakInfo} = lists:keysearch(Point, #breakInfo.point,
-					 WinInfo#winInfo.breaks),
-    dbg_ui_win:delete_break(BreakInfo#breakInfo.break),
-    WinInfo#winInfo{breaks=lists:keydelete(Point, #breakInfo.point,
-					   WinInfo#winInfo.breaks)}.
-
-%%--------------------------------------------------------------------
-%% clear_breaks(WinInfo) -> WinInfo
-%% clear_breaks(WinInfo, Mod) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%--------------------------------------------------------------------
-clear_breaks(WinInfo) ->
-    clear_breaks(WinInfo, all).
-clear_breaks(WinInfo, Mod) ->
-    Remove = if
-		 Mod =:= all -> WinInfo#winInfo.breaks;
-		 true ->
-		     lists:filter(fun(#breakInfo{point={Mod2,_L}}) ->
-					  if
-					      Mod2 =:= Mod -> true;
-					      true -> false
-					  end
-				  end,
-				  WinInfo#winInfo.breaks)
-	     end,
-    lists:foreach(fun(#breakInfo{point=Point}) ->
-			  delete_break(WinInfo, Point)
-		  end,
-		  Remove),
-    Remain = WinInfo#winInfo.breaks -- Remove,
-    WinInfo#winInfo{breaks=Remain}.
-
-%%--------------------------------------------------------------------
-%% display(Arg)
-%%   Arg = idle | {Status,Mod,Line} | {running,Mod}
-%%       | {exit,Where,Reason} | {text,Text}
-%%     Status = break | wait | Level
-%%       Level = int()
-%%     Mod = atom()
-%%     Line = integer()
-%%     Where = {Mod,Line} | null
-%%     Reason = term()
-%%     Text = string()
-%%--------------------------------------------------------------------
-display(Arg) ->
-    Str = case Arg of
-	      idle -> "State: uninterpreted";
-	      {exit, {Mod,Line}, Reason} ->
-		  gs:config(trace_window, raise),
-		  io_lib:format("State: EXITED [~w.erl/~w], Reason:~w",
-				[Mod, Line, Reason]);
-	      {exit, null, Reason} ->
-		  gs:config(trace_window, raise),
-		  io_lib:format("State: EXITED [uninterpreted], "
-				"Reason:~w", [Reason]);
-	      {Level, null, _Line} when is_integer(Level) ->
-		  io_lib:format("*** Call level #~w "
-				"(in non-interpreted code)",
-				[Level]);
-	      {Level, Mod, Line} when is_integer(Level) ->
-		  io_lib:format("*** Call level #~w [~w.erl/~w]",
-				[Level, Mod, Line]);
-	      {Status, Mod, Line} ->
-		  What = case Status of
-			     wait -> 'receive';
-			     _ -> Status
-			 end,
-		  io_lib:format("State: ~w [~w.erl/~w]",
-				[What, Mod, Line]);
-	      {running, Mod} ->
-		  io_lib:format("State: running [~w.erl]", [Mod]);
-	      {text, Text}  -> Text
-	  end,
-    gs:config(info_window, {label,{text,lists:flatten(Str)}}).
-
-%%--------------------------------------------------------------------
-%% is_shown(WinInfo, Mod) -> {true, WinInfo} | false
-%% show_code(WinInfo, Mod, Contents) -> WinInfo
-%% show_no_code(WinInfo) -> WinInfo
-%% remove_code(WinInfo, Mod) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Mod = atom()
-%%   Contents = string()
-%% Note: remove_code/2 should not be used for currently shown module.
-%%--------------------------------------------------------------------
-is_shown(WinInfo, Mod) ->
-    case lists:keyfind(Mod, 1, WinInfo#winInfo.editors) of
-	{Mod, Editor} ->
-	    gs:config(Editor, raise),
-	    {true, WinInfo#winInfo{editor={Mod, Editor}}};
-	false -> false
-    end.
-
-show_code(WinInfo, Mod, Contents) ->
-    Editors = WinInfo#winInfo.editors,
-    {Flag, Editor} = case lists:keyfind(Mod, 1, Editors) of
-			 {Mod, Ed} -> {existing, Ed};
-			 false -> {new, code_editor()}
-		     end,
-    %% Insert code and update breakpoints, if any
-    config_editor(Editor, [raise, clear]),
-    show_code(Editor, Contents),
-    lists:foreach(fun(BreakInfo) ->
-			  case BreakInfo#breakInfo.point of
-			      {Mod2, Line} when Mod2 =:= Mod ->
-				  Status = BreakInfo#breakInfo.status,
-				  add_break_to_code(Editor, Line,Status);
-			      _Point -> ignore
-			  end
-		  end,
-		  WinInfo#winInfo.breaks),
-    case Flag of
-	existing ->
-	    WinInfo#winInfo{editor={Mod, Editor}};
-	new ->
-	    WinInfo#winInfo{editor={Mod, Editor},
-			    editors=[{Mod, Editor} | Editors]}
-    end.
-	
-show_code(Editor, Text) when length(Text) > 1500 ->
-    %% Add some text at a time so that other processes may get scheduled
-    Str = string:sub_string(Text, 1, 1500),
-    config_editor(Editor, {insert,{'end', Str}}),
-    show_code(Editor, string:sub_string(Text, 1501));
-show_code(Editor, Text) ->
-    config_editor(Editor, {insert,{'end',Text}}).
-
-show_no_code(WinInfo) ->
-    {'$top', Editor} = lists:keyfind('$top', 1, WinInfo#winInfo.editors),
-    gs:config(Editor, raise),
-    WinInfo#winInfo{editor={'$top', Editor}}.
-
-remove_code(WinInfo, Mod) ->
-    Editors = WinInfo#winInfo.editors,
-    case lists:keyfind(Mod, 1, Editors) of
-	{Mod, Editor} ->
-	    gs:destroy(Editor),
-	    WinInfo#winInfo{editors=lists:keydelete(Mod, 1, Editors)};
-	false ->
-	    WinInfo
-    end.
-
-%%--------------------------------------------------------------------
-%% mark_line(WinInfo, Line, How) -> WinInfo
-%%   WinInfo = #winInfo{}
-%%   Line = integer()
-%%   How = break | where
-%% Mark the code line where the process is executing.
-%%--------------------------------------------------------------------
-mark_line(WinInfo, Line, How) ->
-    {_Mod, Editor} = WinInfo#winInfo.editor,
-    mark_line2(Editor, WinInfo#winInfo.marked_line, false),
-    mark_line2(Editor, Line, How),
-    if
-	Line =/= 0 -> config_editor(Editor, {vscrollpos, Line-5});
-	true -> ignore
-    end,
-    WinInfo#winInfo{marked_line=Line}.
-
-unmark_line(WinInfo) ->
-    mark_line(WinInfo, 0, false).
-
-mark_line2(Editor, Line, How) ->
-    Prefix = case How of
-		 break -> "-->";
-		 where -> ">>>";
-		 false -> "   "
-	     end,
-    Font = if
-	       How =:= false -> dbg_ui_win:font(normal);
-	       true -> dbg_ui_win:font(bold)
-	   end,
-    config_editor(Editor, [{overwrite, {{Line,5}, Prefix}},
-			   {font_style,
-			    {{{Line,0},{Line,lineend}}, Font}}]).
-
-%%--------------------------------------------------------------------
-%% select_line(WinInfo, Line) -> WinInfo
-%% selected_line(WinInfo) -> undefined | Line
-%%   WinInfo = #winInfo{}
-%%   Line = integer()
-%% Select/unselect a line (unselect if Line=0).
-%%--------------------------------------------------------------------
-select_line(WinInfo, Line) ->
-    {_Mod, Editor} = WinInfo#winInfo.editor,
-
-    %% Since 'Line' may be specified by the user in the 'Go To Line'
-    %% help window, it must be checked that it is correct
-    Size = gs:read(Editor, size),
-    if
-	Line =:= 0 ->
-	    select_line(Editor, WinInfo#winInfo.selected_line, false),
-	    WinInfo#winInfo{selected_line=0};
-	Line < Size ->
-	    select_line(Editor, Line, true),
-	    config_editor(Editor, {vscrollpos, Line-5}),
-	    WinInfo#winInfo{selected_line=Line};
-	true ->
-	    WinInfo
-    end.
-
-select_line(Editor, Line, true) ->
-    config_editor(Editor, {selection, {{Line,0}, {Line,lineend}}});
-select_line(Editor, _Line, false) ->
-    config_editor(Editor, {selection, {{1,0}, {1,0}}}).
-
-selected_line(WinInfo) ->
-    case WinInfo#winInfo.selected_line of
-	0 -> undefined;
-	Line -> Line
-    end.
-
-%%--------------------------------------------------------------------
-%% eval_output(Str, Face)
-%%   Str = string()
-%%   Face = normal | bold
-%%--------------------------------------------------------------------
-eval_output(Text, Face) ->
-    Y1 = gs:read('EvalEditor', size),
-    config_editor('EvalEditor', {insert,{'end',Text}}),
-    Y2 = gs:read('EvalEditor', size),
-
-    Font = dbg_ui_win:font(Face),
-    config_editor('EvalEditor',
-		  [{font_style, {{{Y1,0},{Y2,lineend}}, Font}},
-		   {vscrollpos,Y2}]).
-
-%%--------------------------------------------------------------------
-%% update_bindings(Bs)
-%%   Bs = [{Var,Val}]
-%%--------------------------------------------------------------------
-update_bindings(Bs) ->
-    gs:config('BindGrid', {rows, {1,length(Bs)+1}}),
-    Font = dbg_ui_win:font(normal),
-    Last =
-	lists:foldl(fun({Var, Val}, Row) ->
-			    Opts = [{text, {1,atom_to_list(Var)}},
-				    {text, {2,io_lib:format("~P",
-							    [Val, 4])}},
-				    {doubleclick, true},
-				    {data, {binding,{Var,Val}}}],
-			    case gs:read('BindGrid',{obj_at_row,Row}) of
-				undefined ->
-				    gs:gridline('BindGrid',
-						[{row, Row},
-						 {height, 14},
-						 {font, Font} | Opts]);
-				GridLine ->
-				    gs:config(GridLine, Opts)
-			    end,
-			    Row+1
-		    end,
-		    2,
-		    Bs),
-    delete_gridlines(Last).
-
-delete_gridlines(Row) -> 
-    case gs:read('BindGrid', {obj_at_row, Row}) of
-	undefined -> true;
-	GridLine ->
-	    gs:destroy(GridLine),
-	    delete_gridlines(Row+1)
-    end.
-
-%%--------------------------------------------------------------------
-%% trace_output(Str)
-%%   Str = string()
-%%--------------------------------------------------------------------
-trace_output(Str) ->
-    Font = dbg_ui_win:font(normal),
-    config_editor('TraceEditor',
-		  [{insert, {'end',Str}},
-		   {fg, {{{1,0},'end'},black}},
-		   {font_style, {{{1,0},'end'},Font}}]),
-    Max = gs:read('TraceEditor', size),
-    config_editor('TraceEditor', {vscrollpos, Max}).
-    
-%%--------------------------------------------------------------------
-%% handle_event(GSEvent, WinInfo) -> Command
-%%   GSEvent = {gs, Id, Event, Data, Arg}
-%%   WinInfo = #winInfo{}
-%%   Command = ignore
-%%           | {win, WinInfo}
-%%           | stopped
-%%           | {coords, {X,Y}}
-%%
-%%           | {shortcut, Key}
-%%           | MenuItem | {Menu, [MenuItem]}
-%%               MenuItem = Menu = atom()
-%%           | {break, Point, What}
-%%               What = add | delete | {status,Status} |{trigger,Trigger}
-%%           | {module, Mod, view}
-%%
-%%           | {user_command, Cmd}
-%%
-%%           | {edit, {Var, Val}}
-%%--------------------------------------------------------------------
-%% Window events
-handle_event({gs, _Id, configure, _Data, [W, H|_]}, WinInfo) ->
-    case WinInfo#winInfo.size of
-	{W, H} -> ignore;
-	_Size ->
-	    configure(WinInfo, W, H),
-	    {win, WinInfo#winInfo{size={W, H}}}
-    end;
-handle_event({gs, _Id, destroy, _Data, _Arg}, _WinInfo) ->
-    stopped;
-handle_event({gs, _Id, motion, _Data, [X,Y]}, WinInfo) ->
-    {LastX, LastY} = dbg_ui_win:motion(X, Y),
-    Win = WinInfo#winInfo.window,
-    {coords, {gs:read(Win, x)+LastX-5, gs:read(Win, y)+LastY-5}};
-handle_event({gs, RB, buttonpress, resizebar, _Arg}, WinInfo) ->
-    resize(WinInfo, RB), % Resize window contents
-    ignore;
-
-%% Menus, buttons and keyboard shortcuts
-handle_event({gs, _Id, keypress, _Data, [Key,_,_,1]}, _WinInfo) ->
-    {shortcut, Key};
-handle_event({gs, _Id, click, {dbg_ui_winman, Win}, _Arg}, _WinInfo) ->
-    dbg_ui_winman:raise(Win),
-    ignore;
-handle_event({gs, _Id, click, {menuitem, Name}, _Arg}, _WinInfo) ->
-    Name;
-handle_event({gs, _Id, click, {menu, Menu}, _Arg}, _WinInfo) ->
-    Names = dbg_ui_win:selected(Menu),
-    {Menu, Names};
-handle_event({gs, _Id, click, {break, Point, What}, _Arg}, _WinInfo) ->
-    {break, Point, What};
-handle_event({gs, _Id, click, {module, Mod, view}, _Arg}, _WinInfo) ->
-    {module, Mod, view};
-
-%% Code area
-handle_event({gs, Editor, buttonpress, code_editor, _Arg}, WinInfo) ->
-    {Row, _Col} = gs:read(Editor, insertpos),
-    Again = receive
-		{gs, Editor, buttonpress, code_editor, _} ->
-		    gs:read(Editor, insertpos)
-	    after 500 ->
-		    false
-	    end,
-    case Again of
-	{Row, _} ->
-	    {Mod, _Editor} = WinInfo#winInfo.editor,
-	    Point = {Mod, Row},
-	    case lists:keymember(Point, #breakInfo.point,
-				 WinInfo#winInfo.breaks) of
-		false -> {break, Point, add};
-		true  -> {break, Point, delete}
-	    end;
-	{Row2, _} ->
-	    select_line(Editor, Row2, true),
-	    {win, WinInfo#winInfo{selected_line=Row2}};
-	false ->
-	    select_line(Editor, Row, true),
-	    {win, WinInfo#winInfo{selected_line=Row}}
-    end;
-
-%% Button area
-handle_event({gs, _Id, click, {button, Name}, _Arg}, _WinInfo) ->
-    Name;
-
-%% Evaluator area
-handle_event({gs, 'EvalEntry', keypress, _Data, ['Return'|_]}, _WI) ->
-    Command = case gs:read('EvalEntry', text) of
-		  [10] ->
-		      eval_output("\n", normal),
-		      ignore;
-		  Cmd ->
-		      eval_output([$>, Cmd, 10], normal),
-		      {user_command, Cmd}
-	      end,
-    gs:config('EvalEntry', [{text,""}, {focus,false}]),
-    Command;
-
-%% Bindings area
-handle_event({gs, _Id, click, {binding, {Var, Val}}, _Arg}, _WinInfo) ->
-    Str = io_lib:format("< ~p = ~p~n", [Var, Val]),
-    eval_output(Str, bold),
-    ignore;
-handle_event({gs, _Id, doubleclick, {binding, B}, _Arg}, _WinInfo) ->
-    {edit, B};
-
-handle_event(_GSEvent, _WinInfo) ->
-    ignore.
-
-
-%%====================================================================
-%% Internal functions
-%%====================================================================
-
-%%--Code Area---------------------------------------------------------
-
-code_area(X, Y, FrameOpts, Win) ->
-    gs:frame('CodeArea', Win,
-	     [{x,X}, {y,Y}, {width,546}, {height,400} | FrameOpts]),
-    gs:label(info_window, 'CodeArea',
-	     [{label,{text,""}}, {font,dbg_ui_win:font(normal)},
-	      {x,5}, {y,10}, {width,406}, {height,15},
-	      {anchor,nw}, {align,w}]),
-    code_editor('CodeEditor', 536, 365).
-
-code_editor() ->
-    W = gs:read('CodeEditor', width),
-    H = gs:read('CodeEditor', height),
-    code_editor(null, W, H).
-
-code_editor(Name, W, H) ->
-    Editor = if
-		 Name =:= null -> gs:editor('CodeArea', []);
-		 true -> gs:editor(Name, 'CodeArea', [])
-	     end,
-    gs:config(Editor, [{x,5}, {y,30}, {width,W}, {height,H},
-		       {keypress,false}, {buttonpress,true}, 
-		       {data,code_editor}]),
-    config_editor(Editor, [{vscroll,right}, {hscroll,bottom}]),
-    Font = dbg_ui_win:font(normal),
-    config_editor(Editor, [{wrap,none}, {fg,{{{1,0},'end'},black}},
-			   {font, Font},
-			   {font_style, {{{1,0},'end'},Font}}]),
-    Editor.
-
-resize_code_area(WinInfo, Key, Diff) ->
-    gs:config('CodeArea', {Key,gs:read('CodeArea', Key)+Diff}),
-    case Key of
-	width ->
-	    gs:config(info_window, {Key,gs:read(info_window,Key)+Diff});
-	height -> ignore
-    end,
-
-    %% Resize all code editors
-    Value = gs:read('CodeEditor', Key)+Diff,
-    gs:config('CodeEditor', {Key,Value}),
-    Editors = WinInfo#winInfo.editors,
-    lists:foreach(fun({_Mod, Editor}) ->
-			  gs:config(Editor, {Key,Value})
-		  end,
-		  Editors).
-
-%%--Button Area-------------------------------------------------------
-
-buttons() ->
-    [{'Step','StepButton'}, {'Next','NextButton'},
-     {'Continue','ContinueButton'}, {'Finish','FinishButton'},
-     {'Where','WhereButton'}, {'Up','UpButton'}, {'Down','DownButton'}].
-
-is_button(Name) ->
-    case lists:keyfind(Name, 1, buttons()) of
-	{Name, Button} -> {true, Button};
-	false -> false
-    end.
-
-button_area(Bu, X, Y, FrameOpts, Win) ->
-    {W,H} = case Bu of
-		open -> {546,30};
-		close -> {0,0}
-	    end,
-    gs:frame('ButtonArea', Win,
-	     [{x,X}, {y,Y}, {width,W}, {height,H} | FrameOpts]),
-    Font = dbg_ui_win:font(normal),
-    lists:foldl(fun({Name, Button}, Xb) ->
-			gs:button(Button, 'ButtonArea',
-				  [{label, {text,Name}}, {font,Font},
-				   {x, Xb}, {y, 1},
-				   {width, 77}, {height, 24},
-				   {data, {button,Name}}]),
-			Xb+78
-		end,
-		1,
-		buttons()).
-
-resize_button_area(close, width, _Diff) ->
-    ignore;
-resize_button_area(open, width, Diff) ->
-    gs:config('ButtonArea', {width, gs:read('ButtonArea', width)+Diff}).
-
-%%--Evaluator Area----------------------------------------------------
-
-eval_area({Ev,Bi}, X, Y, FrameOpts, Win) ->
-    {W,H} = if
-		Ev =:= open -> {289,200};
-		true -> {0,0}
-	    end,
-    Font = dbg_ui_win:font(normal),
-    gs:frame('EvalArea', Win,
-	     [{x,X}, {y,Y}, {width,W}, {height,H} | FrameOpts]),
-    gs:label('EvalArea',
-	     [{label,{text,"Evaluator:"}}, {font, Font},
-	      {x,5}, {y,35}, {width,80}, {height,25},
-	      {anchor,sw}, {align,center}]),
-    gs:entry('EvalEntry', 'EvalArea',
-	     [{font, Font},
-	      {x,80}, {y,35}, {width,185}, {height,25},
-	      {anchor,sw}, {keypress,true}]),
-    gs:editor('EvalEditor', 'EvalArea',
-	      [{x,5}, {y,35}, {width, 280}, {height, 160},
-	       {keypress,false},
-	       {vscroll,right}, {hscroll,bottom},
-	       {wrap,none}, {fg,{{{1,0},'end'},black}},
-	       {font, Font},
-	       {font_style,{{{1,0},'end'},Font}}]),
-    gs:config('EvalEditor', {enable, false}),
-    if
-	Ev =:= open, Bi =:= close -> resize_eval_area(Ev, width, 257);
-	true -> ignore
-    end.
-
-resize_eval_area(close, _Key, _Diff) ->
-    ignore;
-resize_eval_area(open, Key, Diff) ->
-    New = gs:read('EvalArea', Key)+Diff,
-    gs:config('EvalArea', {Key,New}),
-    case Key of
-	width ->
-	    gs:config('EvalEntry', {width,New-104}),
-	    gs:config('EvalEditor', {width,New-9});
-	height ->
-	    gs:config('EvalEditor', {height,New-40})
-    end.
-
-%%--Bindings Area-----------------------------------------------------
-
-bind_area({Ev,Bi}, X, Y, FrameOpts, Win) ->
-    {W,H} = if
-		Bi =:= open -> {249,200};
-		true -> {0,0}
-	    end,
-    gs:frame('BindArea', Win,
-	     [{x,X}, {y,Y}, {width,W}, {height,H} | FrameOpts]),
-
-    Font = dbg_ui_win:font(bold),
-    gs:grid('BindGrid', 'BindArea',
-	    [{x,2}, {y,2}, {height,193}, {width,241},
-	     {fg,black}, {vscroll,right}, {hscroll,bottom},
-	     {font,Font},
-	     calc_columnwidths(241), {rows, {1,50}}]), 
-    gs:gridline('BindGrid',
-		[{row,1}, {height,14}, {fg,blue},
-		 {text,{1,"Name"}}, {text,{2,"Value"}}, {font,Font}]),
-    gs:config('BindGrid', {rows,{1,1}}),
-    if
-	Bi =:= open, Ev =:= close -> resize_bind_area(Bi, width, 297);
-	true -> ignore
-    end.
-
-resize_bind_area(close, _Key, _Diff) ->
-    ignore;
-resize_bind_area(open, Key, Diff) ->
-    New = gs:read('BindArea', Key)+Diff,
-    gs:config('BindArea', {Key,New}),
-    case Key of
-	width ->
-	    gs:config('BindGrid', {width,New-8}),
-	    Cols = calc_columnwidths(New-8),
-	    gs:config('BindGrid', Cols);
-	height ->
-	    gs:config('BindGrid', {height,New-7})
-    end.
-
-calc_columnwidths(Width) ->    
-    if Width =< 291 -> 
-	    {columnwidths,[90,198]};
-       true -> 
-	    S = (Width)/(90+198),
-	    {columnwidths,[round(90*S),round(198*S)]}
-    end.
-
-%%--Trace Area--------------------------------------------------------
-
-trace_area(Tr, X, Y, FrameOpts, Win) ->
-    {W,H} = case Tr of
-		open -> {546,200};
-		close -> {0,0}
-	    end,
-    gs:frame('TraceArea', Win,
-	     [{x,X}, {y,Y}, {width,W}, {height,H} | FrameOpts]),
-    Editor = gs:editor('TraceEditor', 'TraceArea',
-		       [{x,5}, {y,5}, {width,536}, {height,190},
-			{keypress,false}]),
-    Font = dbg_ui_win:font(normal),
-    config_editor(Editor,
-		  [{vscroll,right}, {hscroll,bottom},
-		   {wrap,none},{fg,{{{1,0},'end'},black}},
-		   {font, Font},
-		   {font_style,{{{1,0},'end'},Font}}]).
-
-resize_trace_area(close, _Key, _Diff) ->
-    ignore;
-resize_trace_area(open, Key, Diff) ->
-    New = gs:read('TraceArea', Key)+Diff,
-    gs:config('TraceArea', {Key,New}),
-    gs:config('TraceEditor', {Key,New-10}).
-
-%%--Editors-----------------------------------------------------------
-
-config_editor(Editor, Opts) ->
-    gs:config(Editor, {enable,true}),
-    gs:config(Editor, Opts),
-    gs:config(Editor, {enable,false}).
-
-%%--Resize Bars-------------------------------------------------------
-%% The resize bars are used to resize the areas within the window.
-
-%%--------------------------------------------------------------------
-%% resizebar(Flag, Name, X, Y, W, H, Obj) -> resizebar()
-%%   Flag = open | close
-%%   Name = atom()
-%%   X = Y = integer()  Coordinates relative to Obj
-%%   W = H = integer()  Width and height
-%%   Obj = gsobj()
-%% Creates a 'resize bar', a frame object over which the cursor will
-%% be of the 'resize' type.
-%%--------------------------------------------------------------------
-resizebar(Flag, Name, X, Y, W, H, Obj) ->
-    {W2,H2} = case Flag of
-		  open  -> {W,H};
-		  close -> {0,0}
-	      end,
-    gs:create(frame, Name, Obj, [{x,X}, {y,Y}, {width,W2}, {height,H2},
-				 {bw,2},
-				 {cursor,resize},
-				 {buttonpress,true}, {buttonrelease,true},
-				 {data,resizebar}]).
-
-rb1({_Bu,Ev,Bi,Tr}) ->
-    if
-	Ev =:= close, Bi =:= close, Tr =:= close -> close;
-	true -> open
-    end.
-    
-rb2({_Bu,Ev,Bi,Tr}) ->
-    if
-	Tr =:= open ->
-	    if
-		Ev =:= close, Bi =:= close -> close;
-		true -> open
-	    end;
-	true -> close
-    end.
-    
-rb3({_Bu,Ev,Bi,_Tr}) ->
-    if
-	Ev =:= open, Bi =:= open -> open;
-	true -> close
-    end.
-
-%%--Configuration-----------------------------------------------------
-%% Resize the window as well as its contents
-
-%%--------------------------------------------------------------------
-%% config_v()
-%% Reconfigure the window vertically.
-%%--------------------------------------------------------------------
-config_v() ->
-    Y1 = 25+gs:read('CodeArea', height),
-    gs:config('RB1', {y,Y1}),
-    
-    Y2 = Y1+gs:read('RB1', height),
-    gs:config('ButtonArea', {y,Y2}),
-    
-    Y3 = Y2+gs:read('ButtonArea', height),
-    gs:config('EvalArea', {y,Y3}),
-    gs:config('RB3', {y,Y3}),
-    gs:config('BindArea', {y,Y3}),
-    
-    Y4 = Y3 + erlang:max(gs:read('EvalArea', height),
-		  gs:read('BindArea', height)),
-    gs:config('RB2', {y,Y4}),
-    
-    Y5 = Y4 + gs:read('RB2', height),
-    gs:config('TraceArea', {y,Y5}).
-
-%%--------------------------------------------------------------------
-%% config_h()
-%% Reconfigure the window horizontally.
-%%--------------------------------------------------------------------
-config_h() ->
-    X1 = 2+gs:read('EvalArea', width),
-    gs:config('RB3', {x,X1}),
-    
-    X2 = X1+gs:read('RB3', width),
-    gs:config('BindArea', {x,X2}).
-
-%%--------------------------------------------------------------------
-%% configure(WinInfo, W, H)
-%% The window has been resized, now its contents must be resized too.
-%%--------------------------------------------------------------------
-configure(WinInfo, NewW, NewH) ->
-    {Bu,Ev,Bi,Tr} = Flags = WinInfo#winInfo.flags,
-    
-    OldW = gs:read('CodeArea', width)+4,
-    OldH = 25+gs:read('CodeArea', height)+
-	gs:read('RB1', height)+
-	gs:read('ButtonArea', height)+
-	erlang:max(gs:read('EvalArea', height), gs:read('BindArea', height))+
-	gs:read('RB2', height)+
-	gs:read('TraceArea', height),
-
-    %% Adjust width unless it is unchanged or less than minimum width
-    if
-	OldW =/= NewW ->
-	    {Dcode,Deval,Dbind} = configure_widths(OldW,NewW,Flags),
-	    resize_code_area(WinInfo, width, Dcode),
-	    case rb1(Flags) of
-		open ->
-		    gs:config('RB1', {width,gs:read('RB1',width)+Dcode});
-		close -> ignore
-	    end,
-	    resize_button_area(Bu, width, Dcode),
-	    resize_eval_area(Ev, width, Deval),
-	    resize_bind_area(Bi, width, Dbind),
-	    case rb2(Flags) of
-		open ->
-		    gs:config('RB2', {width,gs:read('RB2',width)+Dcode});
-		close -> ignore
-	    end,
-	    resize_trace_area(Tr, width, Dcode),
-	    config_h();
-	true -> ignore
-    end,
-    
-    %% Adjust height unless it is unchanged or less than minimum height
-    if
-	OldH =/= NewH ->
-	    {Dcode2,Deval2,Dtrace} = configure_heights(OldH,NewH,Flags),
-	    resize_code_area(WinInfo, height, Dcode2),
-	    resize_eval_area(Ev, height, Deval2),
-	    case rb3(Flags) of
-		open ->
-		    gs:config('RB3',
-			      {height,gs:read('RB3',height)+Deval2});
-		close -> ignore
-	    end,
-	    resize_bind_area(Bi, height, Deval2),
-	    resize_trace_area(Tr, height, Dtrace),
-	    config_v();
-	true -> ignore
-    end.
-
-%% Compute how much the width of each frame must be increased or
-%% decreased in order to adjust to the new window width.
-configure_widths(OldW, NewW, Flags) ->
-    {_Bu,Ev,Bi,_Tr} = Flags,
-
-    %% Difference between old and new width, considering min window width
-    Diff = abs(erlang:max(OldW,330)-erlang:max(NewW,330)),
-    
-    %% Check how much the frames can be resized in reality
-    Limits = if
-		 %% Window larger
-		 NewW > OldW ->
-		     if
-			 Ev =:= open, Bi =:= open -> {0,Diff,Diff};
-			 Ev =:= open -> {0,Diff,0};
-			 Bi =:= open -> {0,0,Diff};
-			 true -> {Diff,0,0}
-		     end;
-		 
-		 %% Window smaller; get difference between min size
-		 %% and current size
-		 OldW>NewW ->
-		     if
-			 Ev =:= open, Bi =:= open ->
-			     {0,
-			      gs:read('EvalArea',width)-204,
-			      gs:read('BindArea',width)-112};
-			 Ev =:= open -> {0,Diff,0};
-			 Bi =:= open -> {0,0,Diff};
-			 true -> {Diff,0,0}
-		     end
-	     end,
-    
-    case Limits of
-
-	%% No Shell or Bind frame, larger window
-	{T,0,0} when NewW > OldW -> {T,0,0};
-	
-	%% No Shell or Bind frame, smaller window
-	{T,0,0} when OldW > NewW -> {-T,0,0};
-
-	%% Window larger; divide Diff among the frames and return result
-	{_,Sf,B} when NewW > OldW ->
-	    {_,Sf2,B2} = divide([{0,0},{0,Sf},{0,B}],Diff),
-	    {Sf2+B2,Sf2,B2};
-
-	%% Window smaller; divide Diff among the frames and return
-	%% the inverted result (the frames should shrink)
-	{_,Sf,B} when OldW>NewW ->
-	    {_,Sf2,B2} = divide([{0,0},{0,Sf},{0,B}],Diff),
-	    {-(Sf2+B2),-Sf2,-B2}
-    end.
-
-%% Compute how much the height of each frame must be increased or
-%% decreased in order to adjust to the new window height.
-configure_heights(OldH, NewH, Flags) ->
-    {_Bu,Ev,Bi,Tr} = Flags,
-
-    %% Difference between old and new height, considering min win height
-    MinH = min_height(Flags),
-    Diff = abs(erlang:max(OldH,MinH)-erlang:max(NewH,MinH)),
-    
-    %% Check how much the frames can be resized in reality
-    {T,Sf,Ff} = if
-		  %% Window larger
-		  NewH > OldH ->
-		      {Diff,
-		       if
-			   Ev =:= close, Bi =:= close -> 0;
-			   true -> Diff
-		       end,
-		       if
-			   Tr =:= open -> Diff;
-			   true -> 0
-		       end};
-
-		  %% Window smaller; get difference between min size
-		  %% and current size
-		  OldH > NewH ->
-		      {gs:read('CodeArea',height)-100,
-		       if
-			   Ev =:= close, Bi =:= close -> 0;
-			   true ->
-			       if
-				   Ev =:= open ->
-				       gs:read('EvalArea',height)-100;
-				   Bi =:= open ->
-				       gs:read('BindArea',height)-100
-			       end
-		       end,
-		       if
-			   Tr =:= open -> gs:read('TraceArea',height)-100;
-			   true -> 0
-		       end}
-	      end,
-    
-    if
-	%% Window larger; divide Diff among the frames and return result
-	NewH>OldH -> divide([{0,T},{0,Sf},{0,Ff}],Diff);
-
-	%% Window smaller; divide Diff among the frames and return
-	%% the inverted result (the frames should shrink)
-	OldH>NewH ->
-	    {T2,Sf2,Ff2} = divide([{0,T},{0,Sf},{0,Ff}],Diff),
-	    {-T2,-Sf2,-Ff2}
-    end.
-
-%% Compute minimum window height
-min_height(Flags) ->
-    {Bu,S,Bi,F} = Flags,
-    H1 = 25 + 100 + 2, % Upper pad + Trace frame + lower pad
-    H2 = H1 + bu(Bu) + s_bi(S,Bi) + f(F),
-    H3 = case rb1(Flags) of
-	     open -> H2+10;
-	     close -> H2
-	 end,
-    H4 = case rb2(Flags) of
-	     open -> H3+10;
-	     close -> H3
-	 end,
-    H4.
-
-bu(close) -> 0;
-bu(open)  -> 30.
-
-s_bi(close,close) -> 0;
-s_bi(_,_) -> 100.
-
-f(close) -> 0;
-f(open)  -> 100.
-
-%% Try to distribute Diff as evenly as possible between E1, E2 and E3.
-divide([{T,T},{S,S},{F,F}], _Diff) ->
-    {T,S,F};
-divide(L, Diff) ->
-    [{T,Tmax},{S,Smax},{F,Fmax}] = L,
-
-    %% Count how many elements in L can still be filled
-    Rem = remaining(L),
-    
-    %% Divide Diff by Rem
-    D = Diff div Rem,
-
-    if
-	%% All of Diff has been distributed
-	D =:= 0 -> {T,S,F};
-	true ->
-	    %% For each element, try to add as much as possible of D
-	    {NewT,Dt} = divide2(D,T,Tmax),
-	    {NewS,Ds} = divide2(D,S,Smax),
-	    {NewF,Df} = divide2(D,F,Fmax),
-    
-	    %% Recur with a list of elements with new current values
-	    %% and decreased Diff
-	    divide([{NewT,Tmax},{NewS,Smax},{NewF,Fmax}],
-		   (Diff rem Rem)+Dt+Ds+Df)
-    end.
-
-%% Count the number of 'non-filled' elements in L, ie where Curr<Max.
-remaining([]) -> 0;
-remaining([{Max,Max}|T]) -> remaining(T);
-remaining([_H|T]) -> 1 + remaining(T).
-
-divide2(_Diff, Max, Max) -> {Max,0};
-divide2(Diff, Curr, Max) ->
-    New = Curr+Diff,
-    if
-	New>Max -> {Max,New-Max};
-	true -> {New,0}
-    end.
-
-%%--Resizing using resize bars----------------------------------------
-%% Motions event will move the ResizeBar accordingly in Win, when
-%% the mouse button is released, the window is reconfigured.
-
-resize(WinInfo, ResizeBar) ->		
-    
-    %% Get window dimensions
-    W = gs:read(WinInfo#winInfo.window, width),
-    H = gs:read(WinInfo#winInfo.window, height),
-    
-    %% Call resize loop with min and max for the resize bars derived
-    %% from the window dimensions
-    resizeloop(WinInfo, ResizeBar, null,
-	       rblimits('RB1',W,H),
-	       rblimits('RB2',W,H),
-	       rblimits('RB3',W,H)).
-
-resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3}) ->
-    receive
-	{gs,_,motion,_,[_,Y]} when RB =:= 'RB1', Y > Min1, Y < Max1 ->
-	    gs:config('RB1', {y,Y}),
-	    resizeloop(WI, RB, Y, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
-	{gs,_,motion,_,_} when RB =:= 'RB1' ->
-	    resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
-	
-	{gs,_,motion,_,[_,Y]} when RB =:= 'RB2', Y > Min2, Y < Max2 ->
-	    gs:config('RB2', {y,Y}),
-	    resizeloop(WI, RB, Y, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
-	{gs,_,motion,_,_} when RB =:= 'RB2' ->
-	    resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
-	 
-	{gs,_,motion,_,[X,_]} when RB =:= 'RB3', X > Min3, X < Max3 ->
-	    gs:config('RB3', {x,X}),
-	    resizeloop(WI, RB, X, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
-	{gs,_,motion,_,_} when RB =:= 'RB3' ->
-	    resizeloop(WI, RB, Prev, {Min1,Max1}, {Min2,Max2}, {Min3,Max3});
-	
-	{gs,_,buttonrelease,_,_} ->
-	    resize_win(WI, RB, Prev)
-    end.
-
-resize_win(_WinInfo, _RB, null) -> ignore;
-resize_win(WinInfo, 'RB1', Y) ->
-    {_Bu,S,Bi,F} = Flags = WinInfo#winInfo.flags,
-    H = gs:read('CodeArea', height),
-    Diff = H-(Y-25),
-
-    %% Resize Code, Evaluator and Binding areas
-    resize_code_area(WinInfo, height, -Diff),
-    if
-	S =:= close, Bi =:= close, F =:= open ->
-	    resize_trace_area(open, height, Diff);
-	true ->
-	    resize_eval_area(S, height, Diff),
-	    resize_bind_area(Bi, height, Diff)
-    end,
-
-    %% Resize vertical resize bar
-    case rb3(Flags) of
-	open -> gs:config('RB3', {height,gs:read('RB3',height)+Diff});
-	close -> ignore
-    end,
-    
-    %% Adjust the frames y coordinates
-    config_v();
-resize_win(WinInfo, 'RB2', Y) ->
-    {_Bu,S,Bi,F} = Flags = WinInfo#winInfo.flags,
-    Prev = gs:read('TraceArea',y),
-    Diff = Prev-(Y+10),
-    
-    %% Resize Trace, Evaluator and Binding areas
-    resize_trace_area(F, height, Diff),
-    resize_eval_area(S, height, -Diff),
-    resize_bind_area(Bi, height, -Diff),
-
-    %% Resize vertical resize bar
-    case rb3(Flags) of
-	open -> gs:config('RB3', {height,gs:read('RB3',height)-Diff});
-	close -> ignore
-    end,
-
-    %% Adjust the frames y coordinates
-    config_v();
-
-resize_win(WinInfo, 'RB3', X) ->
-    {_Bu,S,Bi,_F} = WinInfo#winInfo.flags,
-    Prev = gs:read('BindArea', x),
-    Diff = Prev-(X+10),
-    
-    %% Resize Binding and Trace areas
-    resize_bind_area(Bi, width, Diff),
-    resize_eval_area(S, width, -Diff),
-
-    %% Adjust the frames x coordinates
-    config_h().
-
-%% Given the window dimensions, return the limits for a  resize bar.
-rblimits('RB1',_W,H) ->
-    
-    %% Code frame should not have height <100
-    Min = 126,
-    
-    %% Max is decided by a minimum distance to 'RB2'
-    %% unless 'RB2' is invisible and 'CodeArea' is visible
-    %% (=> EvalFrame and BindFrame invisible) in which case
-    %% TraceFrame should not have height <100
-    RB2 = gs:read('RB2',height),
-    FF = gs:read('TraceArea',height),
-    Max = case RB2 of
-	      0 when FF =/= 0 ->
-		  H-112;
-	      _ ->
-		  Y = gs:read('RB2',y),
-		  erlang:max(Min,Y-140)
-	  end,
-    
-    {Min,Max};
-rblimits('RB2',_W,H) ->
-    %% TraceFrame should not have height < 100
-    Max = H-112,
-    %% Min is decided by a minimum distance to 'RB1'
-    Y = gs:read('RB1',y),
-    Min = erlang:min(Max,Y+140),
-    {Min,Max};
-
-rblimits('RB3',W,_H) ->
-    %% Neither CodeArea nor BindArea should occupy 
-    %% less than 1/3 of the total window width and EvalFrame should
-    %% be at least 289 pixels wide
-    {erlang:max(round(W/3),289),round(2*W/3)}.
-
-
-%%====================================================================
-%% 'Go To Line' and 'Search' help windows
-%%====================================================================
-
-helpwin(gotoline, WinInfo, GS, Coords) ->
-    spawn_link(?MODULE, helpwin, [gotoline, WinInfo, GS, Coords,self()]);
-helpwin(search, WinInfo, GS, Coords) ->
-    spawn_link(?MODULE, helpwin, [search, WinInfo, GS, Coords, self()]).
-
-helpwin(Type, WinInfo, GS, Coords, AttPid) ->
-    {_Mod, Editor} =  WinInfo#winInfo.editor,
-    Data = case Type of
-	       gotoline -> null;
-	       search ->
-		   {{1, 0}, false}
-	   end,
-    Win = helpwin(Type, GS, Coords),
-    helpwin_loop(Type, AttPid, Editor, Data, Win).
-
-helpwin_loop(Type, AttPid, Editor, Data, Win) ->
-    receive
-	{gs, _Id, destroy, _Data, _Arg} ->
-	    helpwin_stop(Type, AttPid, Editor, Data),
-	    true;
-
-	{gs, _Id, keypress, _Data, ['Return'|_]} ->
-	    gs:config(btn(Win), flash),
-	    Data2 = helpwin_action(Type, default,
-				   AttPid, Editor, Data, Win),
-	    helpwin_loop(Type, AttPid, Editor, Data2, Win);
-	{gs, _Id, keypress, _Data, _Arg} ->
-	    helpwin_loop(Type, AttPid, Editor, Data, Win);
-	
-	{gs, _Id, click, _Data, ["Clear"]} ->
-	    gs:config(ent(Win), {delete, {0,last}}),
-	    Data2 = helpwin_clear(Type, AttPid, Editor, Data, Win),
-	    helpwin_loop(Type, AttPid, Editor, Data2, Win);
-	{gs, _Id, click, _Data, ["Close"]} ->
-	    helpwin_stop(Type, AttPid, Editor, Data),
-	    true;
-	{gs, _Id, click, Action, _Arg} ->
-	    Data2 =
-		helpwin_action(Type, Action, AttPid, Editor, Data, Win),
-	    helpwin_loop(Type, AttPid, Editor, Data2, Win)
-    end.
-
-helpwin_stop(gotoline, _AttPid, _Editor, _Data) ->
-    ignore;
-helpwin_stop(search, _AttPid, Editor, {Pos, _CS}) ->
-    unmark_string(Editor, Pos).
-
-helpwin_clear(gotoline, _AttPid, _Editor, Data, _Win) ->
-    Data;
-helpwin_clear(search, _AttPid, Editor, {Pos, CS}, Win) ->
-    unmark_string(Editor, Pos),
-    gs:config(lbl(Win), {label, {text,""}}),
-    {{1, 0}, CS}.
-
-helpwin_action(gotoline, default, AttPid, _Editor, Data, Win) ->
-    case string:strip(gs:read(ent(Win), text)) of
-	"" -> ignore;
-	Str ->
-	    case catch list_to_integer(Str) of
-		{'EXIT', _Reason} -> ignore;
-		Line -> AttPid ! {gui, {gotoline, Line}}
-	    end
-    end,
-    Data;
-helpwin_action(search, case_sensitive, _AttPid, _Ed, {Pos, CS}, _Win) ->
-    Bool = if CS =:= true -> false; CS =:= false -> true end,
-    {Pos, Bool};
-helpwin_action(search, default, _AttPid, Editor, {Pos, CS}, Win) ->
-    gs:config(lbl(Win), {label, {text, ""}}),
-    unmark_string(Editor, Pos),
-    case gs:read(ent(Win), text) of
-	"" -> {Pos, CS};
-	Str ->
-	    gs:config(lbl(Win), {label, {text,"Searching..."}}),
-	    Str2 = lowercase(CS, Str),
-	    case search(Str2, Editor, gs:read(Editor, size), Pos, CS) of
-		{Row, Col} ->
-		    gs:config(lbl(Win), {label, {text,""}}),
-		    mark_string(Editor, {Row, Col}, Str),
-		    {{Row, Col}, CS};
-		not_found ->
-		    gs:config(lbl(Win), {label, {text,"Not found"}}),
-		    {Pos, CS}
-	    end
-    end.
-
-search(_Str, _Editor, Max, {Row, _Col}, _CS) when Row>Max ->
-    not_found;
-search(Str, Editor, Max, {Row, Col}, CS) ->
-    SearchIn = lowercase(CS, gs:read(Editor,
-				     {get,{{Row,Col+1},{Row,lineend}}})),
-    case string:str(SearchIn, Str) of
-	0 -> search(Str, Editor, Max, {Row+1, 0}, CS);
-	N -> {Row, Col+N}
-    end.
-
-lowercase(true, Str) -> Str;
-lowercase(false, Str) ->
-    [if Char >= $A, Char =< $Z -> Char+32;
-	true -> Char
-     end || Char <- Str].
-
-mark_string(Editor, {Row, Col}, Str) ->
-    Between = {{Row,Col}, {Row,Col+length(Str)}},
-    Font = dbg_ui_win:font(bold),
-    gs:config(Editor, [{vscrollpos, Row-5},
-		       {font_style, {Between, Font}},
-		       {fg, {Between, red}}]).
-
-unmark_string(Editor, {Row, Col}) ->
-    Between = {{Row,Col}, {Row,lineend}},
-    Font = dbg_ui_win:font(normal),
-    gs:config(Editor, [{vscrollpos, Row-5},
-		       {font_style, {Between, Font}},
-		       {fg, {Between, black}}]).
-
-helpwin(Type, GS, {X, Y}) ->
-    W = 200, Pad = 10, Wbtn = 50,
-
-    Title = case Type of search -> "Search"; gotoline -> "Go To Line" end,
-    Win = gs:window(GS, [{title, Title}, {x, X}, {y, Y}, {width, W},
-			 {destroy, true}]),
-    
-    Ent = gs:entry(Win, [{x, Pad}, {y, Pad}, {width, W-2*Pad},
-			 {keypress, true}]),
-    Hent = gs:read(Ent, height),
-
-    Font = dbg_ui_win:font(normal),
-
-    {Ybtn, Lbl} =
-	case Type of
-	    search ->
-		Ycb = Pad+Hent,
-		gs:checkbutton(Win, [{label, {text, "Case Sensitive"}},
-				     {font, Font},
-				     {align, w},
-				     {x, Pad}, {y, Ycb},
-				     {width, W-2*Pad}, {height, 15},
-				     {data, case_sensitive}]),
-		Ylbl = Ycb+15,
-		{Ylbl+Hent+Pad,
-		 gs:label(Win, [{x, Pad}, {y, Ylbl},
-				{width, W-2*Pad}, {height, Hent}])};
-	    gotoline -> {Pad+Hent+Pad, null}
-	end,
-
-    BtnLbl = case Type of search -> "Search"; gotoline -> "Go" end,
-    Btn = gs:button(Win, [{label, {text, BtnLbl}}, {font, Font},
-			  {x, W/2-3/2*Wbtn-Pad}, {y, Ybtn},
-			  {width, Wbtn}, {height, Hent},
-			  {data, default}]),
-    gs:button(Win, [{label, {text, "Clear"}}, {font, Font},
-		    {x, W/2-1/2*Wbtn}, {y, Ybtn},
-		    {width, Wbtn}, {height, Hent}]),
-    gs:button(Win, [{label, {text, "Close"}}, {font, Font},
-		    {x, W/2+1/2*Wbtn+Pad}, {y, Ybtn},
-		    {width, Wbtn}, {height, Hent}]),
-
-    H = Ybtn+Hent+Pad,
-    gs:config(Win, [{height, H}, {map, true}]),
-    {Ent, Lbl, Btn}.
-
-ent(Win) -> element(1, Win).
-lbl(Win) -> element(2, Win).
-btn(Win) -> element(3, Win).
diff --git a/lib/debugger/src/dbg_ui_view.erl b/lib/debugger/src/dbg_ui_view.erl
deleted file mode 100644
index be998f22ff..0000000000
--- a/lib/debugger/src/dbg_ui_view.erl
+++ /dev/null
@@ -1,255 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-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(dbg_ui_view).
-
-%% External exports
--export([start/2]).
-
--record(state, {gs,                % term() Graphics system id
-		win,               % term() Attach process window data
-		coords,            % {X,Y} Mouse point position
-		mod                % atom() Module
-	       }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start(GS, Mod)
-%%   Mod = atom()
-%%--------------------------------------------------------------------
-start(GS, Mod) ->
-    Title = "View Module " ++ atom_to_list(Mod),
-    case dbg_ui_winman:is_started(Title) of
-	true -> ignore;
-	false -> spawn(fun () -> init(GS, Mod, Title) end)
-    end.
-
--spec stop() -> no_return().
-stop() ->
-    exit(stop).
-
-%%====================================================================
-%% Main loop and message handling
-%%====================================================================
-
-init(GS, Mod, Title) ->
-    %% Subscribe to messages from the interpreter
-    int:subscribe(),
-
-    %% Create attach process window
-    Win1 = dbg_ui_trace_win:create_win(GS, Title, ['Code Area'], menus()),
-    Window = dbg_ui_trace_win:get_window(Win1),
-    dbg_ui_winman:insert(Title, Window),
-
-    Win2 = gui_load_module(Win1, Mod),
-    Win3 =
-	lists:foldl(fun(Break, Win) ->
-			    dbg_ui_trace_win:add_break(Win, 'Break', Break)
-		    end,
-		    Win2,
-		    int:all_breaks(Mod)),
-    
-    loop(#state{gs=GS, win=Win3, coords={0,0}, mod=Mod}).
-
-loop(State) ->
-    receive
-
-	%% From the GUI main window
-	GuiEvent when is_tuple(GuiEvent), element(1, GuiEvent)==gs ->
-	    Cmd = dbg_ui_trace_win:handle_event(GuiEvent, State#state.win),
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the GUI help windows
-	{gui, Cmd} ->
-	    State2 = gui_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the interpreter
-	{int, Cmd} ->
-	    State2 = int_cmd(Cmd, State),
-	    loop(State2);
-
-	%% From the dbg_ui_winman process (Debugger window manager)
-	{dbg_ui_winman, update_windows_menu, Data} ->
-	    dbg_ui_winman:update_windows_menu(Data),
-	    loop(State);
-	{dbg_ui_winman, destroy} ->
-	    stop();
-
-	%% Help window termination -- ignore
-	{'EXIT', _Pid, _Reason} ->
-	    loop(State)
-    end.
-
-%%--Commands from the GUI---------------------------------------------
-
-gui_cmd(ignore, State) ->
-    State;
-gui_cmd({win, Win}, State) ->
-    State#state{win=Win};
-gui_cmd(stopped, _State) ->
-    stop();
-gui_cmd({coords, Coords}, State) ->
-    State#state{coords=Coords};
-
-gui_cmd({shortcut, Key}, State) ->
-    case shortcut(Key) of
-	false -> State;
-	Cmd -> gui_cmd(Cmd, State)
-    end;
-
-%% File menu
-gui_cmd('Close', _State) ->
-    stop();
-
-%% Edit menu
-gui_cmd('Go To Line...', State) ->
-    %% Will result in message handled below: {gui, {gotoline, Line}}
-    dbg_ui_trace_win:helpwin(gotoline, State#state.win,
-			      State#state.gs, State#state.coords),
-    State;
-gui_cmd({gotoline, Line}, State) ->
-    Win = dbg_ui_trace_win:select_line(State#state.win, Line),
-    State#state{win=Win};
-gui_cmd('Search...', State) ->
-    dbg_ui_trace_win:helpwin(search, State#state.win,
-			     State#state.gs, State#state.coords),
-    State;
-
-%% Break menu
-gui_cmd('Line Break...', State) ->
-    add_break(State#state.gs, State#state.coords, line,
-	      State#state.mod,
-	      dbg_ui_trace_win:selected_line(State#state.win)),
-    State;
-gui_cmd('Conditional Break...', State) ->
-    add_break(State#state.gs, State#state.coords, conditional,
-	      State#state.mod,
-	      dbg_ui_trace_win:selected_line(State#state.win)),
-    State;
-gui_cmd('Function Break...', State) ->
-    add_break(State#state.gs, State#state.coords, function,
-	      State#state.mod, undefined),
-    State;
-gui_cmd('Enable All', State) ->
-    Breaks = int:all_breaks(),
-    ThisMod = State#state.mod,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
-			  int:enable_break(Mod, Line);
-		      (_Break) ->
-			  ignore
-		  end,
-		  Breaks),
-    State;
-gui_cmd('Disable All', State) ->
-    Breaks = int:all_breaks(),
-    ThisMod = State#state.mod,
-    lists:foreach(fun ({{Mod, Line}, _Options}) when Mod==ThisMod ->
-			  int:disable_break(Mod, Line);
-		      (_Break) ->
-			  ignore
-		  end,
-		  Breaks),
-    State;
-gui_cmd('Delete All', State) ->
-    int:no_break(State#state.mod),
-    State;
-gui_cmd({break, {Mod, Line}, What}, State) ->
-    case What of
-	add -> int:break(Mod, Line);
-	delete -> int:delete_break(Mod, Line);
-	{status, inactive} -> int:disable_break(Mod, Line);
-	{status, active} -> int:enable_break(Mod, Line);
-	{trigger, Action} -> int:action_at_break(Mod, Line, Action)
-    end,
-    State;
-
-%% Help menu
-gui_cmd('Debugger', State) ->
-    Window = dbg_ui_trace_win:get_window(State#state.win),
-    HelpFile = filename:join([code:lib_dir(debugger),
-			      "doc", "html", "part_frame.html"]),
-    tool_utils:open_help(Window, HelpFile),
-    State.
-
-add_break(GS, Coords, Type, undefined, _Line) ->
-    dbg_ui_break:start(GS, Coords, Type);
-add_break(GS, Coords, Type, Mod, undefined) ->
-    dbg_ui_break:start(GS, Coords, Type, Mod);
-add_break(GS, Coords, Type, Mod, Line) ->
-    dbg_ui_break:start(GS, Coords, Type, Mod, Line).
-
-%%--Commands from the interpreter-------------------------------------
-
-int_cmd({new_break, {{Mod,_Line},_Options}=Break}, #state{mod=Mod}=State) ->
-    Win = dbg_ui_trace_win:add_break(State#state.win, 'Break', Break),
-    State#state{win=Win};
-int_cmd({delete_break, {Mod,_Line}=Point}, #state{mod=Mod}=State) ->
-    Win = dbg_ui_trace_win:delete_break(State#state.win, Point),
-    State#state{win=Win};
-int_cmd({break_options, {{Mod,_Line},_Options}=Break}, #state{mod=Mod}=State) ->
-    Win = dbg_ui_trace_win:update_break(State#state.win, Break),
-    State#state{win=Win};
-int_cmd(no_break, State) ->
-    Win = dbg_ui_trace_win:clear_breaks(State#state.win),
-    State#state{win=Win};
-int_cmd({no_break, _Mod}, State) ->
-    Win = dbg_ui_trace_win:clear_breaks(State#state.win),
-    State#state{win=Win};
-int_cmd(_, State) ->
-    State.
-
-
-%%====================================================================
-%% GUI auxiliary functions
-%%====================================================================
-
-menus() ->
-    [{'File', [{'Close', 0}]},
-     {'Edit', [{'Go To Line...', 0},
-	       {'Search...', 0}]},
-     {'Break', [{'Line Break...', 5},
-		{'Conditional Break...', 13},
-		{'Function Break...', 0},
-		separator,
-		{'Enable All', no},
-		{'Disable All', no},
-		{'Delete All', 0},
-		separator]},
-     {'Help', [{'Debugger', no}]}].
-
-shortcut(c) -> 'Close';
-shortcut(g) -> 'Go To Line...';
-shortcut(s) -> 'Search...';
-shortcut(b) -> 'Line Break...';
-shortcut(r) -> 'Conditional Break...';
-shortcut(f) -> 'Function Break...';
-shortcut(d) -> 'Delete All';
-
-shortcut(_) -> false.
-
-gui_load_module(Win, Mod) ->
-    dbg_ui_trace_win:display({text, "Loading module..."}),
-    Contents = int:contents(Mod, any),
-    Win2 = dbg_ui_trace_win:show_code(Win, Mod, Contents),
-    dbg_ui_trace_win:display({text, ""}),
-    Win2.
diff --git a/lib/debugger/src/dbg_ui_win.erl b/lib/debugger/src/dbg_ui_win.erl
deleted file mode 100644
index 1c7a80a1c4..0000000000
--- a/lib/debugger/src/dbg_ui_win.erl
+++ /dev/null
@@ -1,281 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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(dbg_ui_win).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,menu,2}},
-          {nowarn_deprecated_function,{gs,menu,3}},
-          {nowarn_deprecated_function,{gs,menubutton,2}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,menuitem,3}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,1}}]).
-
-%% External exports
--export([init/0,
-	 font/1, min_size/3, min_size/4,
-	 create_menus/2, select/2, selected/1,
-	 add_break/2, update_break/2, delete_break/1,
-	 motion/2
-	]).
-
--record(break, {mb, smi, emi, dimi, demi}).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% init() -> GS
-%%   GS = term()
-%%--------------------------------------------------------------------
-init() ->
-    gs:start([{kernel, true}]).
-
-%%--------------------------------------------------------------------
-%% font(Style) -> Font
-%%   Style = normal | bold
-%% Select a suitable font. Defaults to {screen,12} and, if it does not
-%% exist, {courier,12}.
-%%--------------------------------------------------------------------
-font(Style) ->
-    GS = init(),
-    Style2 = if
-		 Style =:= normal -> [];
-		 true -> [Style]
-	     end,
-    case gs:read(GS, {choose_font, {screen,Style2,12}}) of
-	Font when element(1, Font) =:= screen ->
-	    Font;
-	_ ->
-	    gs:read(GS, {choose_font, {courier,Style2,12}})
-    end.
-
-%%--------------------------------------------------------------------
-%% min_size(Strings, MinW, MinH) -> {W, H}
-%% min_size(Font, Strings, MinW, MinH) -> {W, H}
-%%   Font = GS font - defaults to dbg_ui_win:font(normal)
-%%   Strings = [string()]
-%%   MinW = MinH = int()
-%%   W = H = int()
-%%--------------------------------------------------------------------
-min_size(Strings, MinW, MinH) ->
-    min_size(font(normal), Strings, MinW, MinH).
-
-min_size(Font, Strings, MinW, MinH) ->
-    GS = init(),
-    min_size(GS, Font, Strings, MinW, MinH).
-
-min_size(GS, Font, [String|Strings], MinW, MinH) ->
-    {W, H} = gs:read(GS, {font_wh, {Font, String}}),
-    min_size(GS, Font, Strings, erlang:max(MinW, W), erlang:max(MinH, H));
-min_size(_GS, _Font, [], W, H) ->
-    {W, H}.
-
-%%--------------------------------------------------------------------
-%% create_menus(MenuBar, [Menu])
-%%   MenuBar = gsobj()
-%%   Menu = {Name, [Item]}
-%%     Name = atom()
-%%     Item = {Name, N} | {Name, N, Type} | {Name, N, cascade, [Item]}
-%%          | separator
-%%       N = no | integer()
-%%       Type = check | radio
-%% Create the specified menus and menuitems.
-%%
-%% Normal menuitems are specified as {Name, N}. Generates the event:
-%%   {gs, _Id, click, {menuitem, Name}, _Arg}
-%%
-%% Check and radio menuitems are specified as {Name, N, check|radio}.
-%% They are assumed to be children to a cascade menuitem! (And all children
-%% to one cascade menuitem are assumed to be either check OR radio
-%% menuitems)!
-%% Selecting a check/radio menuitem generates the event:
-%%   {gs, _Id, click, {menu, Menu}, _Arg}
-%% where Menu is the name of the parent, the cascade menuitem.
-%% Use selected(Menu) to retrieve which check/radio menuitems are
-%% selected.
-%%--------------------------------------------------------------------
-create_menus(MenuBar, [{Title, Items}|Menus]) ->
-    Title2 = " "++(atom_to_list(Title))++" ",
-    MenuBtn = gs:menubutton(MenuBar, [{label, {text,Title2}},
-				      {font, font(normal)}]),
-    case Title of
-	'Help' -> gs:config(MenuBtn, {side, right});
-	_ -> ignore
-    end,
-    Menu = gs:menu(Title, MenuBtn, []),
-    create_items(Menu, Items, Title),
-    create_menus(MenuBar, Menus);
-create_menus(_MenuBar, []) ->
-    done.
-
-create_items(Menu, [Item|Items], Group) ->
-    create_item(Menu, Item, Group),
-    create_items(Menu, Items, Group);
-create_items(_Menu, [], _Group) ->
-    done.
-
-create_item(Menu, {Name, _N, cascade, Items}, _Group) ->
-    MenuBtn = gs:menuitem(Menu, [{label, {text,Name}},
-				 {font, font(normal)},
-				 {itemtype, cascade}]),
-    SubMenu = gs:menu(Name, MenuBtn, []),
-    create_items(SubMenu, Items, Name);
-create_item(Menu, separator, _Group) ->
-    gs:menuitem(Menu, [{itemtype, separator}]);
-create_item(Menu, MenuItem, Group) ->
-    Options = case MenuItem of
-		  {Name, N} ->
-		      [{data, {menuitem,Name}}];
-		  {Name, N, check} ->
-		      [{itemtype, check}, {data, {menu, Group}}];
-		  {Name, N, radio} ->
-		      [{itemtype, radio}, {data, {menu, Group}},
-		       {group, group(Group)}]
-	      end,
-    gs:menuitem(Name, Menu, [{label, {text,Name}},
-			     {font, font(normal)} | Options]),
-    if
-	is_integer(N) -> gs:config(Name, {underline, N});
-	true -> ignore
-    end.
-
-%% When grouping radio buttons, the group id must be an atom unique for
-%% each window.
-group(Group) ->
-    list_to_atom(atom_to_list(Group)++pid_to_list(self())).
-
-%%--------------------------------------------------------------------
-%% select(MenuItem, Bool)
-%%   MenuItem = atom()
-%%   Bool = boolean()
-%%--------------------------------------------------------------------
-select(MenuItem, Bool) ->
-    gs:config(MenuItem, {select, Bool}).
-
-%%--------------------------------------------------------------------
-%% selected(Menu) -> [Name]
-%%   Menu = Name = atom()
-%%--------------------------------------------------------------------
-selected(Menu) ->
-    Children = gs:read(Menu, children),
-    Selected = [gs:read(Child, select) || Child <- Children],
-    lists:map(fun(Child) ->
-		      {text, Name} = gs:read(Child, label),
-		      list_to_atom(Name)
-	      end,
-	      Selected).
-
-%%--------------------------------------------------------------------
-%% add_break(Name, Point) -> #break{}
-%%   Name = atom()
-%%   Point = {Mod, Line}
-%% The break will generate the following events:
-%%   {gs, _Id, click, {break, Point, Event}, _Arg}
-%%     Event = delete | {trigger, Action} | {status, Status}
-%%       Action = enable | disable | delete
-%%       Status = active | inactive
-%%--------------------------------------------------------------------
-add_break(Menu, Point) ->
-    Font = font(normal),
-
-    %% Create a name for the breakpoint
-    {Mod, Line} = Point,
-    Label = io_lib:format("~w ~5w", [Mod, Line]),
-
-    %% Create a menu for the breakpoint
-    MenuBtn = gs:menuitem(Menu, [{label, {text,Label}}, {font, Font},
-				 {itemtype, cascade}]),
-    SubMenu = gs:menu(MenuBtn, []),
-    SMI = gs:menuitem(SubMenu, [{data, {break,Point,null}}]),
-    gs:menuitem(SubMenu, [{label, {text,"Delete"}}, {font, Font},
-			  {data, {break,Point,delete}}]),
-    TriggerMenuBtn = gs:menuitem(SubMenu,
-				 [{label,{text,"Trigger Action"}},
-				  {font, Font},
-				  {itemtype, cascade}]),
-    TriggerMenu = gs:menu(TriggerMenuBtn, []),
-    Group = element(3, erlang:now()),
-    EMI = gs:menuitem(TriggerMenu, [{label, {text,"Enable"}},
-				    {font, Font},
-				    {itemtype, radio}, {group, Group},
-				    {data,
-				     {break,Point,{trigger,enable}}}]),
-    DiMI = gs:menuitem(TriggerMenu, [{label, {text,"Disable"}},
-				     {font, Font},
-				     {itemtype, radio}, {group, Group},
-				     {data,
-				      {break,Point,{trigger,disable}}}]),
-    DeMI = gs:menuitem(TriggerMenu, [{label, {text,"Delete"}},
-				     {font, Font},
-				     {itemtype, radio}, {group, Group},
-				     {data,
-				      {break,Point,{trigger,delete}}}]),
-
-    #break{mb=MenuBtn, smi=SMI, emi=EMI, dimi=DiMI, demi=DeMI}.
-
-%%--------------------------------------------------------------------
-%% update_break(Break, Options)
-%%   Break = #break{}
-%%   Options = [Status, Action, Mods, Cond]
-%%     Status = active | inactive
-%%     Action = enable | disable | delete
-%%     Mods = null (not used)
-%%     Cond = null | {Mod, Func}
-%%--------------------------------------------------------------------
-update_break(Break, Options) ->
-    [Status, Trigger|_] = Options,
-    {break, Point, _Status} = gs:read(Break#break.smi, data),
-    
-    {Label, Data} = case Status of
-			active ->
-			    {"Disable", {break,Point,{status,inactive}}};
-			inactive ->
-			    {"Enable", {break,Point,{status,active}}}
-		    end,
-    gs:config(Break#break.smi, [{label, {text,Label}},
-				{font, font(normal)},
-				{data, Data}]),
-
-    TriggerMI = case Trigger of
-		    enable -> Break#break.emi;
-		    disable -> Break#break.dimi;
-		    delete -> Break#break.demi
-		end,
-    gs:config(TriggerMI, {select, true}).
-
-%%--------------------------------------------------------------------
-%% delete_break(Break)
-%%   Break = #break{}
-%%--------------------------------------------------------------------
-delete_break(Break) ->
-    gs:destroy(Break#break.mb).
-
-%%--------------------------------------------------------------------
-%% motion(X, Y) -> {X, Y}
-%%   X = Y = integer()
-%%--------------------------------------------------------------------
-motion(X, Y) ->
-    receive
-	{gs, _Id, motion, _Data, [NX,NY]} ->
-	    motion(NX, NY)
-    after 0 ->
-	    {X, Y}
-    end.
diff --git a/lib/debugger/src/dbg_ui_winman.erl b/lib/debugger/src/dbg_ui_winman.erl
deleted file mode 100644
index b5433a202b..0000000000
--- a/lib/debugger/src/dbg_ui_winman.erl
+++ /dev/null
@@ -1,182 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(dbg_ui_winman).
--behaviour(gen_server).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,menu,3}},
-          {nowarn_deprecated_function,{gs,menubutton,3}},
-          {nowarn_deprecated_function,{gs,menuitem,3}}]).
-
-%% External exports
--export([start/0]).
--export([insert/2, is_started/1,
-	 clear_process/1,
-	 raise/1,
-	 windows_menu/1, update_windows_menu/1]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
--record(win, {owner,     % pid()
-	      title,     % string()
-	      win        % gsobj()
-	     }).
-
--record(state, {wins=[]  % [#win{}]
-	       }).
-
-%%====================================================================
-%% External exports
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% start()
-%%--------------------------------------------------------------------
-start() ->
-    gen_server:start({local,?MODULE}, ?MODULE, [], []).
-
-%%--------------------------------------------------------------------
-%% insert(Title, Win)
-%%   Title = string()
-%%   Win = gsobj()
-%%--------------------------------------------------------------------
-insert(Title, Win) ->
-    gen_server:cast(?MODULE, {insert, self(), Title, Win}).
-
-%%--------------------------------------------------------------------
-%% is_started(Title) -> true | false
-%%   Title = string()
-%%--------------------------------------------------------------------
-is_started(Title) ->
-    case gen_server:call(?MODULE, {is_started, Title}, infinity) of
-	{true, Win} ->
-	    raise(Win),
-	    true;
-	false ->
-	    false
-    end.
-
-%%--------------------------------------------------------------------
-%% clear_process(Title)
-%%   Title = string()
-%%--------------------------------------------------------------------
-clear_process(Title) ->
-    gen_server:cast(?MODULE, {clear_process, Title}).
-
-%%--------------------------------------------------------------------
-%% raise(Win)
-%%   Win = gsobj()
-%%--------------------------------------------------------------------
-raise(Win) ->
-    gs:config(Win, [raise, {iconify, false}, {setfocus, true}]).
-
-%%--------------------------------------------------------------------
-%% windows_menu(MenuBar)
-%%   MenuBar = gsobj()
-%%--------------------------------------------------------------------
-windows_menu(MenuBar) ->
-    gs:menubutton('WindowsMenuBtn', MenuBar,
-		  [{label,{text," Windows "}},
-		   {font, dbg_ui_win:font(normal)}]),
-    gs:menu('WindowsMenu', 'WindowsMenuBtn', []).
-
-%%--------------------------------------------------------------------
-%% update_windows_menu(Data)
-%%   Data = {New, Old}
-%%     New = Old = list()
-%%--------------------------------------------------------------------
-update_windows_menu([MonInfo|Infos]) ->
-    gs:destroy('WindowsMenu'),
-    gs:menu('WindowsMenu', 'WindowsMenuBtn', []),
-    menuitem(MonInfo),
-    gs:menuitem(separator, 'WindowsMenu', [{itemtype, separator}]),
-    lists:foreach(fun(Info) -> menuitem(Info) end, Infos).
-
-menuitem({Title, Win}) ->
-    gs:menuitem(Title, 'WindowsMenu', [{label, {text,Title}},
-				       {font, dbg_ui_win:font(normal)},
-				       {data, {dbg_ui_winman,Win}}]).
-
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-init(_Arg) ->
-    process_flag(trap_exit, true),
-    {ok, #state{}}.
-
-handle_call({is_started, Title}, _From, State) ->
-    Reply = case lists:keyfind(Title, #win.title, State#state.wins) of
-		false -> false;
-		Win -> {true, Win#win.win}
-	    end,
-    {reply, Reply, State}.
-
-handle_cast({insert, Pid, Title, Win}, State) ->
-    link(Pid),
-    Wins = State#state.wins ++ [#win{owner=Pid, title=Title, win=Win}],
-    inform_all(Wins),
-    {noreply, State#state{wins=Wins}};
-
-handle_cast({clear_process, Title}, State) ->
-    OldWins = State#state.wins,
-    Wins = case lists:keyfind(Title, #win.title, OldWins) of
-		 #win{owner=Pid} ->
-		   Msg = {dbg_ui_winman, destroy},
-		   Pid ! Msg,
-		   lists:keydelete(Title, #win.title, OldWins);
-	       false -> 
-		   OldWins
-    end,
-    {noreply, State#state{wins=Wins}}.
-
-handle_info({'EXIT', Pid, _Reason}, State) ->
-    [Mon | _Wins] = State#state.wins,
-    if
-	Pid =:= Mon#win.owner -> {stop, normal, State};
-	true ->
-	    Wins2 = lists:keydelete(Pid, #win.owner, State#state.wins),
-	    inform_all(Wins2),
-	    {noreply, State#state{wins=Wins2}}
-    end.
-
-terminate(_Reason, State) ->
-    delete_all(State#state.wins),
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-
-%%====================================================================
-%% Internal functions
-%%====================================================================
-
-inform_all(Wins) ->
-    Infos = lists:map(fun(#win{title=Title, win=Win}) -> {Title, Win} end,
-			  Wins),
-    Msg = {dbg_ui_winman, update_windows_menu, Infos},
-    lists:foreach(fun(#win{owner=Pid}) -> Pid ! Msg end, Wins).
-
-delete_all(Wins) ->
-    Msg = {dbg_ui_winman, destroy},
-    lists:foreach(fun(#win{owner=Pid}) -> Pid ! Msg end, Wins).
diff --git a/lib/debugger/src/dbg_wx_filedialog_win.erl b/lib/debugger/src/dbg_wx_filedialog_win.erl
index c8ecb7b5d4..ea34295067 100644
--- a/lib/debugger/src/dbg_wx_filedialog_win.erl
+++ b/lib/debugger/src/dbg_wx_filedialog_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -242,16 +242,13 @@ handle_event(#wx{event=#wxList{itemIndex=Index}},
 	    {noreply, State0}
     end;
 
-handle_event(#wx{event=#wxCommand{type=command_text_updated, cmdString=Wanted}}, 
+handle_event(#wx{event=#wxCommand{type=command_text_updated, cmdString=Wanted}},
 	     State = #state{ptext=Previous, completion=Comp}) ->
     case Previous =:= undefined orelse lists:prefix(Wanted, Previous) of
-	true -> 
-	    case Comp of
-		{Temp,_} -> wxWindow:destroy(Temp);
-		undefined -> ok
-	    end,
+	true ->
+	    destroy_completion(Comp),
 	    {noreply, State#state{ptext=Wanted,completion=undefined}};
-	false -> 
+	false ->
 	    {noreply, show_completion(Wanted, State)}
     end;
 
@@ -310,8 +307,7 @@ handle_event(#wx{event=#wxSize{size={Width,_}}}, State = #state{list=LC}) ->
 	     end),
     {noreply, State};
 	
-handle_event(Event,State) ->
-    io:format("~p Got ~p ~n",[self(), Event]),
+handle_event(_Event,State) ->
     {noreply, State}.
 
 handle_info(_Msg, State) ->
@@ -419,8 +415,9 @@ show_completion(Wanted, State = #state{text=TC, win=Win, list=LC, completion=Com
     end.
 
 destroy_completion(undefined) -> ok;
-destroy_completion({Window, _}) ->
+destroy_completion({Window, _LB}) ->
     Parent = wxWindow:getParent(Window),
+    wxWindow:hide(Window),
     wxWindow:destroy(Window),
     wxWindow:refresh(Parent).
 
diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl
index 4a01492cf5..4ab03985d3 100644
--- a/lib/debugger/src/dbg_wx_mon.erl
+++ b/lib/debugger/src/dbg_wx_mon.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -148,7 +148,7 @@ init2(CallingPid, Mode, SFile, GS) ->
 
 		    win     = Win,
 		    focus   = undefined,
-		    coords  = {20,20},
+		    coords  = {-1,-1},
 
 		    intdir  = element(2, file:get_cwd()),
 		    pinfos  = [],
diff --git a/lib/debugger/src/dbg_wx_mon_win.erl b/lib/debugger/src/dbg_wx_mon_win.erl
index a617f3e1e7..d94eb14937 100644
--- a/lib/debugger/src/dbg_wx_mon_win.erl
+++ b/lib/debugger/src/dbg_wx_mon_win.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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 @@
 -record(moduleInfo, {module, menubtn}).
 -record(procInfo, {pid, row}).
 -record(breakInfo, {point, status, break}).
--record(break, {mb, smi, emi, dimi, demi}).  %% BUGBUG defined in dbg_ui_win
+-record(break, {mb, smi, emi, dimi, demi}).
 -record(winInfo, {window,       % gsobj()
 		  grid,         % gsobj()
 		  row,          % int() Last row in grid
@@ -76,13 +76,6 @@
 init() ->
     dbg_wx_win:init().
 
-%%--------------------------------------------------------------------
-%% create_win(GS, Title, Menus) -> #winInfo{}
-%%   GS = gsobj()
-%%   Title = string()
-%%   Menus = [menu()]  See dbg_ui_win.erl
-%%--------------------------------------------------------------------
-
 -define(GRID,1000).
 
 -define(PAD, 5).
@@ -624,8 +617,6 @@ handle_event(#wx{userData=Data,
 	     _WinInfo) ->
     Data;
 handle_event(_Event, _WinInfo) ->
-%% FIXME
-    io:format("Ev: ~p~n",[_Event]),
     ignore.
 
 %%====================================================================
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl
index 7108b5a79a..4438466bb0 100644
--- a/lib/debugger/src/dbg_wx_trace.erl
+++ b/lib/debugger/src/dbg_wx_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %% 
 %% The 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,21 +71,10 @@ start(Pid, TraceWin, BackTrace) ->
     start(Pid, TraceWin, BackTrace, ?STRINGS).
 
 start(Pid, TraceWin, BackTrace, Strings) ->
-    case {whereis(dbg_wx_mon), whereis(dbg_ui_mon)} of
-	{undefined, undefined} ->
-	    case which_gui() of
-		gs ->
-		    dbg_ui_trace:start(Pid, TraceWin, BackTrace);
-		wx ->
-		    Parent = wx:new(),
-		    Env = wx:get_env(),
-		    start(Pid, Env, Parent, TraceWin, BackTrace, Strings)
-	    end;
-	{undefined, Monitor} when is_pid(Monitor) ->
-	    dbg_ui_trace:start(Pid, TraceWin, BackTrace);
-	{Monitor, _} when is_pid(Monitor) ->
+    case whereis(dbg_wx_mon) of
+	Monitor when is_pid(Monitor) ->
 	    Monitor ! {?MODULE, self(), get_env},
-	    receive 
+	    receive
 		{env, Monitor, Env, Parent} ->
 		    start(Pid, Env, Parent, TraceWin, BackTrace, Strings)
 	    end
@@ -110,15 +99,6 @@ start(Pid, Env, Parent, TraceWin, BackTrace, Strings) ->
 	    ignore
     end.
 
-which_gui() ->
-    try
-	wx:new(),
-	wx:destroy(),
-	wx
-    catch _:_ ->
-	    gs
-    end.
-
 %%--------------------------------------------------------------------
 %% title(Pid) -> string()
 %% By exporting this function, dbg_wx_mon may check with dbg_wx_winman
@@ -145,7 +125,7 @@ init(Pid, Parent, Meta, TraceWin, BackTrace, Strings) ->
     dbg_wx_winman:insert(Title, Window),
 
     %% Initial process state
-    State1 = #state{win=Win, coords={0,0}, pid=Pid, meta=Meta,
+    State1 = #state{win=Win, coords={-1,-1}, pid=Pid, meta=Meta,
 		    status={idle,null,null},
 		    stack={1,1}, strings=[str_on]},
 
diff --git a/lib/debugger/src/dbg_wx_view.erl b/lib/debugger/src/dbg_wx_view.erl
index 6242b9d0e0..fc7ffc0d56 100644
--- a/lib/debugger/src/dbg_wx_view.erl
+++ b/lib/debugger/src/dbg_wx_view.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %% 
 %% The 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,7 @@ init(GS, Env, Mod, Title) ->
 		    Win2,
 		    int:all_breaks(Mod)),
     
-    try loop(#state{gs=GS, win=Win3, coords={0,0}, mod=Mod}) 
+    try loop(#state{gs=GS, win=Win3, coords={-1,-1}, mod=Mod})
     catch _E:normal ->
 	    exit(normal);
 	  _E:_R ->
diff --git a/lib/debugger/src/debugger.app.src b/lib/debugger/src/debugger.app.src
index 807054c983..84fb98c94e 100644
--- a/lib/debugger/src/debugger.app.src
+++ b/lib/debugger/src/debugger.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %% 
 %% The 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,20 +27,6 @@
 	     dbg_iload,
 	     dbg_iserver,
 	     dbg_istk,
-	     dbg_ui_break,
-	     dbg_ui_break_win,
-	     dbg_ui_edit,
-	     dbg_ui_edit_win,
-	     dbg_ui_filedialog_win,
-	     dbg_ui_interpret,
-	     dbg_ui_mon,
-	     dbg_ui_mon_win,
-	     dbg_ui_settings,
-	     dbg_ui_trace,
-	     dbg_ui_trace_win,
-	     dbg_ui_view,
-	     dbg_ui_win,
-	     dbg_ui_winman,
 	     dbg_wx_break,
 	     dbg_wx_break_win,
 	     dbg_wx_code,
@@ -59,5 +45,5 @@
 	     i,
 	     int
 	    ]},
-  {registered, [dbg_iserver, dbg_ui_mon, dbg_ui_winman]},
-  {applications, [kernel, stdlib, gs]}]}.
+  {registered, [dbg_iserver, dbg_wx_mon, dbg_wx_winman]},
+  {applications, [kernel, stdlib]}]}.
diff --git a/lib/debugger/src/debugger.appup.src b/lib/debugger/src/debugger.appup.src
index 7a435e9b22..81d2fab05a 100644
--- a/lib/debugger/src/debugger.appup.src
+++ b/lib/debugger/src/debugger.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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,5 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-{"%VSN%",[],[]}.
+{"%VSN%",
+ [{<<".*">>,[{restart_application, debugger}]}],
+ [{<<".*">>,[{restart_application, debugger}]}]
+}.
diff --git a/lib/debugger/src/debugger.erl b/lib/debugger/src/debugger.erl
index b97091ee6b..8a2ac28df5 100644
--- a/lib/debugger/src/debugger.erl
+++ b/lib/debugger/src/debugger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %% 
 %% The 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,44 +32,44 @@
 %% --------
 %% Interface module.
 %%
-%% dbg_ui_winman
+%% dbg_wx_winman
 %% -------------
 %% Window manager, keeping track of open windows and Debugger
 %% processes.
 %%
-%% dbg_ui_mon, dbg_ui_mon_win
+%% dbg_wx_mon, dbg_wx_mon_win
 %% --------------------------
 %% Monitor window, main window of Debugger, displaying information
 %% about interpreted modules and debugged processes.
 %%
-%% dbg_ui_trace, dbg_ui_trace_win
+%% dbg_wx_trace, dbg_wx_trace_win
 %% ------------------------------
 %% Attach process window, showing the code executed by a debugged
 %% process and providing a GUI for stepping, inspecting variables etc.
 %%
-%% dbg_ui_break, dbg_ui_break_win
+%% dbg_wx_break, dbg_wx_break_win
 %% ------------------------------
 %% Help window for creating new breakpoints.
 %%
-%% dbg_ui_edit, dbg_ui_edit_win
+%% dbg_wx_edit, dbg_wx_edit_win
 %% --------------------------------------
 %% Help window for editing terms, used for setting backtrace size
 %% (i.e. how many stack frames to display in the attach process window)
 %% and changing variable values.
 %%
-%% dbg_ui_interpret, dbg_ui_filedialog_win
+%% dbg_wx_interpret, dbg_wx_filedialog_win
 %% --------------------------------------
 %% Help window for selecting modules to interpret.
 %%
-%% dbg_ui_settings, dbg_ui_filedialog_win
+%% dbg_wx_settings, dbg_wx_filedialog_win
 %% --------------------------------------
 %% Help window for saving and loading Debugger settings.
 %%
-%% dbg_ui_view
+%% dbg_wx_view
 %% -----------
-%% Help window for viewing interpreted modules (uses dbg_ui_trace_win).
+%% Help window for viewing interpreted modules (uses dbg_wx_trace_win).
 %%
-%% dbg_ui_win
+%% dbg_wx_win
 %% ----------
 %% GUI specific functionality used by more than one window type.
 %%
@@ -78,7 +78,7 @@ start() ->
     start(global, default, default).
 start(Mode) when Mode==local; Mode==global ->
     start(Mode, default, default);
-start(Gui) when Gui==gs; Gui==wx ->
+start(Gui) when Gui==wx ->
     start(global, default, Gui);
 start(SFile) when is_list(SFile), is_integer(hd(SFile)) ->
     start(global, SFile, default).
@@ -86,8 +86,6 @@ start(SFile) when is_list(SFile), is_integer(hd(SFile)) ->
 start(Mode, SFile) ->
     start(Mode, SFile, default).
 
-start(Mode, SFile, gs) ->
-    dbg_ui_mon:start(Mode, SFile);
 start(Mode, SFile, wx) ->
     dbg_wx_mon:start(Mode, SFile);
 start(Mode, SFile, default) ->
@@ -95,7 +93,7 @@ start(Mode, SFile, default) ->
     start(Mode, SFile, Gui).
 
 stop() ->
-    dbg_ui_mon:stop().
+    dbg_wx_mon:stop().
 
 quick(M, F, A) ->
     int:i(M),
@@ -104,15 +102,7 @@ quick(M, F, A) ->
 
 auto_attach(Flags) ->    
     case which_gui() of
-	gs -> int:auto_attach(Flags, {dbg_ui_trace, start, []});
 	wx -> int:auto_attach(Flags, {dbg_wx_trace, start, []})
     end.
 
-which_gui() ->
-    try
-	wx:new(),
-	wx:destroy(),
-	wx
-    catch _:_ ->
-	    gs
-    end.
+which_gui() -> wx.
diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl
index bdd671cff1..2755db64b8 100644
--- a/lib/debugger/src/int.erl
+++ b/lib/debugger/src/int.erl
@@ -630,14 +630,13 @@ find_beam(Mod, Src) ->
     File = filename:join(SrcDir, BeamFile),
     case is_file(File) of
 	true -> File;
-	false -> find_beam_1(Mod, BeamFile, SrcDir)
+	false -> find_beam_1(BeamFile, SrcDir)
     end.
 
-find_beam_1(Mod, BeamFile, SrcDir) ->
+find_beam_1(BeamFile, SrcDir) ->
     RootDir = filename:dirname(SrcDir),
     EbinDir = filename:join(RootDir, "ebin"),
     CodePath = [EbinDir | code:get_path()],
-    BeamFile = atom_to_list(Mod) ++ code:objfile_extension(),
     lists:foldl(fun(_, Beam) when is_list(Beam) -> Beam;
 		   (Dir, error) ->
 			File = filename:join(Dir, BeamFile),
diff --git a/lib/debugger/test/Makefile b/lib/debugger/test/Makefile
index 5aa290c61b..9a0ce14ecd 100644
--- a/lib/debugger/test/Makefile
+++ b/lib/debugger/test/Makefile
@@ -44,6 +44,7 @@ MODULES= \
 	fun_SUITE \
 	lc_SUITE \
 	line_number_SUITE \
+	map_SUITE \
 	record_SUITE \
 	trycatch_SUITE \
 	test_lib \
diff --git a/lib/debugger/test/bs_construct_SUITE.erl b/lib/debugger/test/bs_construct_SUITE.erl
index e0bda7eac8..8a6798c6ad 100644
--- a/lib/debugger/test/bs_construct_SUITE.erl
+++ b/lib/debugger/test/bs_construct_SUITE.erl
@@ -454,6 +454,8 @@ in_guard(Config) when is_list(Config) ->
     ?line 1 = in_guard(<<16#74ad:16>>, 16#e95, 5),
     ?line 2 = in_guard(<<16#3A,16#F7,"hello">>, 16#3AF7, <<"hello">>),
     ?line 3 = in_guard(<<16#FBCD:14,3.1415/float,3:2>>, 16#FBCD, 3.1415),
+    ?line 3 = in_guard(<<16#FBCD:14,3/float,3:2>>, 16#FBCD, 3),
+    ?line 3 = in_guard(<<16#FBCD:14,(2 bsl 226)/float,3:2>>, 16#FBCD, 2 bsl 226),
     nope = in_guard(<<1>>, 42, b),
     nope = in_guard(<<1>>, a, b),
     nope = in_guard(<<1,2>>, 1, 1),
@@ -645,19 +647,27 @@ make_sub_bin(Bin0) ->
 %% give the same result.
 
 dynamic(Config) when is_list(Config) ->
-    ?line dynamic_1(fun dynamic_big/5),
-    ?line dynamic_1(fun dynamic_little/5),
+    Ps = [spawn_monitor(fun() ->
+				dynamic_1(Fun)
+			end) || Fun <- [fun dynamic_big/5,
+					fun dynamic_little/5]],
+    [receive
+	 {'DOWN',Ref,process,Pid,normal} ->
+	     ok;
+	 {'DOWN',Ref,process,Pid,Exit} ->
+	     ?t:fail({Pid,Exit})
+     end || {Pid,Ref} <- Ps],
     ok.
 
 dynamic_1(Dynamic) ->
-    <<Lpad:128>> = erlang:md5([0]),
-    <<Rpad:128>> = erlang:md5([1]),
-    <<Int:128>> = erlang:md5([2]),
-    8385 = dynamic_2(0, {Int,Lpad,Rpad,Dynamic}, 0).
+    <<Lpad:64,_/binary>> = erlang:md5([0]),
+    <<Rpad:64,_/binary>> = erlang:md5([1]),
+    <<Int:64,_/binary>> = erlang:md5([2]),
+    2145 = dynamic_2(0, {Int,Lpad,Rpad,Dynamic}, 0).
 
-dynamic_2(129, _, Count) -> Count;
+dynamic_2(64+1, _, Count) -> Count;
 dynamic_2(Bef, Data, Count0) ->
-    Count = dynamic_3(Bef, 128-Bef, Data, Count0),
+    Count = dynamic_3(Bef, 64-Bef, Data, Count0),
     dynamic_2(Bef+1, Data, Count).
 
 dynamic_3(_, -1, _, Count) -> Count;
@@ -678,13 +688,13 @@ dynamic_big(Bef, N, Int, Lpad, Rpad) ->
     <<MaskedInt:N>> = NumBin,
 
     %% Construct the binary in two different ways.
-    Bin = id(<<Lpad:Bef,NumBin/bitstring,Rpad:(128-Bef-N)>>),
-    Bin = <<Lpad:Bef,Int:N,Rpad:(128-Bef-N)>>,
+    Bin = id(<<Lpad:Bef,NumBin/bitstring,Rpad:(64-Bef-N)>>),
+    Bin = <<Lpad:Bef,Int:N,Rpad:(64-Bef-N)>>,
 
     %% Further verify the result by matching.
     LpadMasked = Lpad band ((1 bsl Bef) - 1),
-    RpadMasked = Rpad band ((1 bsl (128-Bef-N)) - 1),
-    Rbits = (128-Bef-N),
+    RpadMasked = Rpad band ((1 bsl (64-Bef-N)) - 1),
+    Rbits = (64-Bef-N),
     <<LpadMasked:Bef,MaskedInt:N,RpadMasked:Rbits>> = id(Bin),
     ok.
 
@@ -694,13 +704,13 @@ dynamic_little(Bef, N, Int, Lpad, Rpad) ->
     <<MaskedInt:N/little>> = NumBin,
 
     %% Construct the binary in two different ways.
-    Bin = id(<<Lpad:Bef/little,NumBin/bitstring,Rpad:(128-Bef-N)/little>>),
-    Bin = <<Lpad:Bef/little,Int:N/little,Rpad:(128-Bef-N)/little>>,
+    Bin = id(<<Lpad:Bef/little,NumBin/bitstring,Rpad:(64-Bef-N)/little>>),
+    Bin = <<Lpad:Bef/little,Int:N/little,Rpad:(64-Bef-N)/little>>,
 
     %% Further verify the result by matching.
     LpadMasked = Lpad band ((1 bsl Bef) - 1),
-    RpadMasked = Rpad band ((1 bsl (128-Bef-N)) - 1),
-    Rbits = (128-Bef-N),
+    RpadMasked = Rpad band ((1 bsl (64-Bef-N)) - 1),
+    Rbits = (64-Bef-N),
     <<LpadMasked:Bef/little,MaskedInt:N/little,RpadMasked:Rbits/little>> = id(Bin),
     ok.
 
diff --git a/lib/debugger/test/bs_match_misc_SUITE.erl b/lib/debugger/test/bs_match_misc_SUITE.erl
index 6b66c45448..54fa9a59df 100644
--- a/lib/debugger/test/bs_match_misc_SUITE.erl
+++ b/lib/debugger/test/bs_match_misc_SUITE.erl
@@ -26,7 +26,7 @@
 	 kenneth/1,encode_binary/1,native/1,happi/1,
 	 size_var/1,wiger/1,x0_context/1,huge_float_field/1,
 	 writable_binary_matched/1,otp_7198/1,
-	 unordered_bindings/1]).
+	 unordered_bindings/1,float_middle_endian/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -36,7 +36,7 @@ all() ->
     [bound_var, bound_tail, t_float, little_float, sean,
      kenneth, encode_binary, native, happi, size_var, wiger,
      x0_context, huge_float_field, writable_binary_matched,
-     otp_7198, unordered_bindings].
+     otp_7198, unordered_bindings, float_middle_endian].
 
 groups() -> 
     [].
@@ -106,6 +106,13 @@ t_float(Config) when is_list(Config) ->
 
     ok.
 
+float_middle_endian(Config) when is_list(Config) ->
+    F = 9007199254740990.0, % turns to -NaN when word-swapped
+    ?line fcmp(F, match_float(<<F:64/float>>, 64, 0)),
+    ?line fcmp(F, match_float(<<1:1,F:64/float,127:7>>, 64, 1)),
+    ?line fcmp(F, match_float(<<1:13,F:64/float,127:3>>, 64, 13)),
+    ok.
+
 
 fcmp(F1, F2) when (F1 - F2) / F2 < 0.0000001 -> ok.
 
diff --git a/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/lists1.erl b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/lists1.erl
index 0214983c11..db84ee5fc8 100644
--- a/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/lists1.erl
+++ b/lib/debugger/test/dbg_ui_SUITE_data/manual_data/src/lists1.erl
@@ -236,7 +236,7 @@ flatlength([H|T], L) when list(H) ->
 flatlength([H|T], L) ->
     flatlength(T, L + 1);
 flatlength([], L) -> L.
-
+
 %% keymember(Key, Index, [Tuple])
 %% keysearch(Key, Index, [Tuple])
 %% keydelete(Key, Index, [Tuple])
@@ -298,7 +298,7 @@ keymap(Fun, ExtraArgs, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
     keymap(Fun, ExtraArgs, Index, Tail)];
 keymap( _, _ , _, []) -> [].
-
+
 %% all(Predicate, List)
 %% any(Predicate, List)
 %% map(Function, List)
diff --git a/lib/debugger/test/debugger_SUITE.erl b/lib/debugger/test/debugger_SUITE.erl
index 6f5442e97d..c74550be86 100644
--- a/lib/debugger/test/debugger_SUITE.erl
+++ b/lib/debugger/test/debugger_SUITE.erl
@@ -27,13 +27,13 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
-	 app_test/1,erts_debug/1,encrypted_debug_info/1,
+	 app_test/1,appup_test/1,erts_debug/1,encrypted_debug_info/1,
 	 no_abstract_code/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_test, erts_debug, no_abstract_code,
+    [app_test, appup_test, erts_debug, no_abstract_code,
      encrypted_debug_info].
 
 groups() -> 
@@ -64,6 +64,9 @@ app_test(Config) when is_list(Config) ->
     ?line ?t:app_test(debugger),
     ok.
 
+appup_test(Config) when is_list(Config) ->
+    ok = ?t:appup_test(debugger).
+
 erts_debug(Config) when is_list(Config) ->
     c:l(erts_debug),
     ok.
diff --git a/lib/debugger/test/erl_eval_SUITE.erl b/lib/debugger/test/erl_eval_SUITE.erl
index bb2669f450..ba60ed6fb3 100644
--- a/lib/debugger/test/erl_eval_SUITE.erl
+++ b/lib/debugger/test/erl_eval_SUITE.erl
@@ -39,7 +39,8 @@
          otp_8133/1,
          funs/1,
 	 try_catch/1,
-	 eval_expr_5/1]).
+	 eval_expr_5/1,
+         eep37/1]).
 
 %%
 %% Define to run outside of test server
@@ -63,6 +64,7 @@ config(priv_dir,_) ->
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 init_per_testcase(_Case, Config) ->
+    test_lib:interpret(?MODULE),
     ?line Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 end_per_testcase(_Case, Config) ->
@@ -78,7 +80,7 @@ all() ->
      pattern_expr, match_bin, guard_3, guard_4, lc,
      simple_cases, unary_plus, apply_atom, otp_5269,
      otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
-     otp_8133, funs, try_catch, eval_expr_5].
+     otp_8133, funs, try_catch, eval_expr_5, eep37].
 
 groups() -> 
     [].
@@ -1323,6 +1325,27 @@ eval_expr_5(Config) when is_list(Config) ->
 	    ok
     end.
 
+eep37(Config) when is_list(Config) ->
+    check(fun () -> (fun _(X) -> X end)(42) end,
+          "(fun _(X) -> X end)(42).",
+          42),
+    check(fun () -> (fun _Id(X) -> X end)(42) end,
+          "(fun _Id(X) -> X end)(42).", 42),
+    check(fun () -> is_function((fun Self() -> Self end)(), 0) end,
+          "is_function((fun Self() -> Self end)(), 0).",
+          true),
+    check(fun () ->
+                  F = fun Fact(N) when N > 0 ->
+                              N * Fact(N - 1);
+                          Fact(0) ->
+                              1
+                       end,
+                  F(6)
+          end,
+          "(fun Fact(N) when N > 0 -> N * Fact(N - 1); Fact(0) -> 1 end)(6).",
+          720),
+    ok.
+
 %% Check the string in different contexts: as is; in fun; from compiled code.
 check(F, String, Result) ->
     check1(F, String, Result),
diff --git a/lib/debugger/test/fun_SUITE.erl b/lib/debugger/test/fun_SUITE.erl
index a06cdc7165..8425f973e6 100644
--- a/lib/debugger/test/fun_SUITE.erl
+++ b/lib/debugger/test/fun_SUITE.erl
@@ -24,7 +24,7 @@
 	 init_per_testcase/2,end_per_testcase/2,
 	 init_per_suite/1,end_per_suite/1,
 	 good_call/1,bad_apply/1,bad_fun_call/1,badarity/1,
-	 ext_badarity/1,otp_6061/1,external/1]).
+	 ext_badarity/1,otp_6061/1,external/1,eep37/1]).
 
 %% Internal exports.
 -export([nothing/0,call_me/1]).
@@ -48,7 +48,7 @@ end_per_group(_GroupName, Config) ->
 
 cases() -> 
     [good_call, bad_apply, bad_fun_call, badarity,
-     ext_badarity, otp_6061, external].
+     ext_badarity, otp_6061, external, eep37].
 
 init_per_testcase(_Case, Config) ->
     test_lib:interpret(?MODULE),
@@ -288,5 +288,18 @@ external(Config) when is_list(Config) ->
 call_me(I) ->
     {ok,I}.
 
+eep37(Config) when is_list(Config) ->
+    F = fun Fact(N) when N > 0 -> N * Fact(N - 1); Fact(0) -> 1 end,
+    Add = fun _(N) -> N + 1 end,
+    UnusedName = fun BlackAdder(N) -> N + 42 end,
+    720 = F(6),
+    10 = Add(9),
+    50 = UnusedName(8),
+    [1,1,2,6,24,120] = lists:map(F, lists:seq(0, 5)),
+    {'EXIT',{{badarity,_},_}} = (catch lists:map(fun G() -> G() end, [1])),
+    {'EXIT',{{badarity,_},_}} = (catch F()),
+
+    ok.
+
 id(I) ->
     I.
diff --git a/lib/debugger/test/int_SUITE_data/lists1.erl b/lib/debugger/test/int_SUITE_data/lists1.erl
index 0214983c11..db84ee5fc8 100644
--- a/lib/debugger/test/int_SUITE_data/lists1.erl
+++ b/lib/debugger/test/int_SUITE_data/lists1.erl
@@ -236,7 +236,7 @@ flatlength([H|T], L) when list(H) ->
 flatlength([H|T], L) ->
     flatlength(T, L + 1);
 flatlength([], L) -> L.
-
+
 %% keymember(Key, Index, [Tuple])
 %% keysearch(Key, Index, [Tuple])
 %% keydelete(Key, Index, [Tuple])
@@ -298,7 +298,7 @@ keymap(Fun, ExtraArgs, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
     keymap(Fun, ExtraArgs, Index, Tail)];
 keymap( _, _ , _, []) -> [].
-
+
 %% all(Predicate, List)
 %% any(Predicate, List)
 %% map(Function, List)
diff --git a/lib/debugger/test/int_SUITE_data/my_lists.erl b/lib/debugger/test/int_SUITE_data/my_lists.erl
index 98eb4396e3..f9399b1085 100644
--- a/lib/debugger/test/int_SUITE_data/my_lists.erl
+++ b/lib/debugger/test/int_SUITE_data/my_lists.erl
@@ -237,7 +237,7 @@ flatlength([H|T], L) when list(H) ->
 flatlength([H|T], L) ->
     flatlength(T, L + 1);
 flatlength([], L) -> L.
-
+
 %% keymember(Key, Index, [Tuple])
 %% keysearch(Key, Index, [Tuple])
 %% keydelete(Key, Index, [Tuple])
@@ -299,7 +299,7 @@ keymap(Fun, ExtraArgs, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
     keymap(Fun, ExtraArgs, Index, Tail)];
 keymap( _, _ , _, []) -> [].
-
+
 %% all(Predicate, List)
 %% any(Predicate, List)
 %% map(Function, List)
@@ -698,7 +698,7 @@ flatlength_1([H|T], L) when list(H) ->
 flatlength_1([H|T], L) ->
     flatlength_1(T, L + 1);
 flatlength_1([], L) -> L.
-
+
 %% keymember(Key, Index, [Tuple])
 %% keysearch(Key, Index, [Tuple])
 %% keydelete(Key, Index, [Tuple])
@@ -760,7 +760,7 @@ keymap_1(Fun, ExtraArgs, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
     keymap_1(Fun, ExtraArgs, Index, Tail)];
 keymap_1( _, _ , _, []) -> [].
-
+
 %% all(Predicate, List)
 %% any(Predicate, List)
 %% map(Function, List)
@@ -1162,7 +1162,7 @@ flatlength_2([H|T], L) when list(H) ->
 flatlength_2([H|T], L) ->
     flatlength_2(T, L + 1);
 flatlength_2([], L) -> L.
-
+
 %% keymember_2(Key, Index, [Tuple])
 %% keysearch_2(Key, Index, [Tuple])
 %% keydelete_2(Key, Index, [Tuple])
@@ -1224,7 +1224,7 @@ keymap_2(Fun, ExtraArgs, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
     keymap_2(Fun, ExtraArgs, Index, Tail)];
 keymap_2( _, _ , _, []) -> [].
-
+
 %% all_2(Predicate, List)
 %% any_2(Predicate, List)
 %% map_2(Function, List)
@@ -1624,7 +1624,7 @@ flatlength_3([H|T], L) when list(H) ->
 flatlength_3([H|T], L) ->
     flatlength_3(T, L + 1);
 flatlength_3([], L) -> L.
-
+
 %% keymember_3(Key, Index, [Tuple])
 %% keysearch_3(Key, Index, [Tuple])
 %% keydelete_3(Key, Index, [Tuple])
@@ -1686,7 +1686,7 @@ keymap_3(Fun, ExtraArgs, Index, [Tup|Tail]) ->
    [setelement(Index, Tup, apply(Fun, [element(Index, Tup)|ExtraArgs]))|
     keymap_3(Fun, ExtraArgs, Index, Tail)];
 keymap_3( _, _ , _, []) -> [].
-
+
 %% all_3(Predicate, List)
 %% any_3(Predicate, List)
 %% map_3(Function, List)
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 c5c6a56363..ab485fd350 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
@@ -236,4 +236,8 @@ otp_8310() ->
         (catch {a, [X || X <- a]}),
     {'EXIT',{{bad_generator,b},_}} =
         (catch {a, << <<X>>  || << X >> <= b >>}),
+    true = begin (X1 = true) andalso X1, X1 end,
+    false = begin (X2 = false) andalso X2, X2 end,
+    true = begin (X3 = true) orelse X3, X3 end,
+    false = begin (X4 = false) orelse X4, X4 end,
     ok.
diff --git a/lib/debugger/test/map_SUITE.erl b/lib/debugger/test/map_SUITE.erl
new file mode 100644
index 0000000000..e9f4ea1fad
--- /dev/null
+++ b/lib/debugger/test/map_SUITE.erl
@@ -0,0 +1,1002 @@
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(map_SUITE).
+
+%% Copied from map_SUITE in erts.
+
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
+	init_per_group/2,end_per_group/2
+    ]).
+
+-export([
+	t_build_and_match_literals/1,
+	t_update_literals/1,t_match_and_update_literals/1,
+	t_update_map_expressions/1,
+	t_update_assoc/1,t_update_exact/1,
+	t_guard_bifs/1, t_guard_sequence/1, t_guard_update/1,
+	t_guard_receive/1, t_guard_fun/1,
+	t_list_comprehension/1,
+	t_map_sort_literals/1,
+	%t_size/1,
+	t_map_size/1,
+
+	%% Specific Map BIFs
+	t_bif_map_get/1,
+	t_bif_map_find/1,
+	t_bif_map_is_key/1,
+	t_bif_map_keys/1,
+	t_bif_map_merge/1,
+	t_bif_map_new/1,
+	t_bif_map_put/1,
+	t_bif_map_remove/1,
+	t_bif_map_update/1,
+	t_bif_map_values/1,
+	t_bif_map_to_list/1,
+	t_bif_map_from_list/1,
+
+	%% erlang
+	t_erlang_hash/1,
+	t_map_encode_decode/1,
+
+	%% maps module not bifs
+	t_maps_fold/1,
+	t_maps_map/1,
+	t_maps_size/1,
+	t_maps_without/1,
+
+	%% misc
+	t_pdict/1,
+	t_ets/1,
+	t_dets/1
+    ]).
+
+-include_lib("stdlib/include/ms_transform.hrl").
+
+suite() -> [].
+
+all() -> [
+	t_build_and_match_literals,
+	t_update_literals, t_match_and_update_literals,
+	t_update_map_expressions,
+	t_update_assoc,t_update_exact,
+	t_guard_bifs, t_guard_sequence, t_guard_update,
+	t_guard_receive,t_guard_fun, t_list_comprehension,
+	t_map_sort_literals,
+
+	%% Specific Map BIFs
+	t_bif_map_get,t_bif_map_find,t_bif_map_is_key,
+	t_bif_map_keys, t_bif_map_merge, t_bif_map_new,
+	t_bif_map_put,
+	t_bif_map_remove, t_bif_map_update,
+	t_bif_map_values,
+	t_bif_map_to_list, t_bif_map_from_list,
+
+	%% erlang
+	t_erlang_hash, t_map_encode_decode,
+	t_map_size,
+
+	%% maps module
+	t_maps_fold, t_maps_map,
+	t_maps_size, t_maps_without,
+
+
+        %% Other functions
+	t_pdict,
+	t_ets
+    ].
+
+groups() -> [].
+
+init_per_suite(Config) ->
+    test_lib:interpret(?MODULE),
+    Config.
+
+end_per_suite(_Config) -> ok.
+
+init_per_group(_GroupName, Config) -> Config.
+end_per_group(_GroupName, Config) -> Config.
+
+%% tests
+
+t_build_and_match_literals(Config) when is_list(Config) ->
+    #{} = id(#{}),
+    #{1:=a} = id(#{1=>a}),
+    #{1:=a,2:=b} = id(#{1=>a,2=>b}),
+    #{1:=a,2:=b,3:="c"} = id(#{1=>a,2=>b,3=>"c"}),
+    #{1:=a,2:=b,3:="c","4":="d"} = id(#{1=>a,2=>b,3=>"c","4"=>"d"}),
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>} =
+	id(#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>}),
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>,{"6",7}:="f"} =
+	id(#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>,{"6",7}=>"f"}),
+    #{1:=a,2:=b,3:="c","4":="d",<<"5">>:=<<"e">>,{"6",7}:="f",8:=g} =
+	id(#{1=>a,2=>b,3=>"c","4"=>"d",<<"5">>=><<"e">>,{"6",7}=>"f",8=>g}),
+
+    #{<<"hi all">> := 1} = id(#{<<"hi",32,"all">> => 1}),
+
+    #{a:=X,a:=X=3,b:=4} = id(#{a=>3,b=>4}), % weird but ok =)
+
+    #{ a:=#{ b:=#{c := third, b:=second}}, b:=first} =
+	id(#{ b=>first, a=>#{ b=>#{c => third, b=> second}}}),
+
+    M = #{ map_1=>#{ map_2=>#{value_3 => third}, value_2=> second}, value_1=>first},
+    M = #{ map_1:=#{ map_2:=#{value_3 := third}, value_2:= second}, value_1:=first} =
+	 id(#{ map_1=>#{ map_2=>#{value_3 => third}, value_2=> second}, value_1=>first}),
+
+    %% error case
+    %V = 32,
+    %{'EXIT',{{badmatch,_},_}} = (catch (#{<<"hi all">> => 1} = id(#{<<"hi",V,"all">> => 1}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3,x:=2} = id(#{x=>3}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=2} = id(#{x=>3}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = id({a,b,c}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = id(#{y=>3}))),
+    {'EXIT',{{badmatch,_},_}} = (catch (#{x:=3} = id(#{x=>"three"}))),
+    ok.
+
+
+%% Tests size(Map).
+%% not implemented, perhaps it shouldn't be either
+
+%t_size(Config) when is_list(Config) ->
+%    0 = size(#{}),
+%    1 = size(#{a=>1}),
+%    1 = size(#{a=>#{a=>1}}),
+%    2 = size(#{a=>1, b=>2}),
+%    3 = size(#{a=>1, b=>2, b=>"3"}),
+%    ok.
+
+t_map_size(Config) when is_list(Config) ->
+    0 = map_size(id(#{})),
+    1 = map_size(id(#{a=>1})),
+    1 = map_size(id(#{a=>"wat"})),
+    2 = map_size(id(#{a=>1, b=>2})),
+    3 = map_size(id(#{a=>1, b=>2, b=>"3","33"=><<"n">>})),
+
+    true = map_is_size(#{a=>1}, 1),
+    true = map_is_size(#{a=>1, a=>2}, 1),
+    M = #{ "a" => 1, "b" => 2},
+    true  = map_is_size(M, 2),
+    false = map_is_size(M, 3),
+    true  = map_is_size(M#{ "a" => 2}, 2),
+    false = map_is_size(M#{ "c" => 2}, 2),
+
+    %% Error cases.
+    {'EXIT',{badarg,_}} = (catch map_size([])),
+    {'EXIT',{badarg,_}} = (catch map_size(<<1,2,3>>)),
+    {'EXIT',{badarg,_}} = (catch map_size(1)),
+    ok.
+
+map_is_size(M,N) when map_size(M) =:= N -> true;
+map_is_size(_,_) -> false.
+
+% test map updates without matching
+t_update_literals(Config) when is_list(Config) ->
+    Map = #{x=>1,y=>2,z=>3,q=>4},
+    #{x:="d",q:="4"} = loop_update_literals_x_q(Map, [
+		{"a","1"},{"b","2"},{"c","3"},{"d","4"}
+	]),
+    ok.
+
+loop_update_literals_x_q(Map, []) -> Map;
+loop_update_literals_x_q(Map, [{X,Q}|Vs]) ->
+    loop_update_literals_x_q(Map#{q=>Q,x=>X},Vs).
+
+% test map updates with matching
+t_match_and_update_literals(Config) when is_list(Config) ->
+    Map = #{x=>0,y=>"untouched",z=>"also untouched",q=>1},
+    #{x:=16,q:=21,y:="untouched",z:="also untouched"} = loop_match_and_update_literals_x_q(Map, [
+	    {1,2},{3,4},{5,6},{7,8}
+	]),
+    M0 = id(#{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	    4 => number, 18446744073709551629 => wat}),
+    M1 = id(#{}),
+    M2 = M1#{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+    M0 = M2,
+
+    #{ 4 := another_number, int := 3 } = M2#{ 4 => another_number },
+    ok.
+
+loop_match_and_update_literals_x_q(Map, []) -> Map;
+loop_match_and_update_literals_x_q(#{q:=Q0,x:=X0} = Map, [{X,Q}|Vs]) ->
+    loop_match_and_update_literals_x_q(Map#{q=>Q0+Q,x=>X0+X},Vs).
+
+
+t_update_map_expressions(Config) when is_list(Config) ->
+    M = maps:new(),
+    #{ a := 1 } = M#{a => 1},
+
+    #{ b := 2 } = (maps:new())#{ b => 2 },
+
+    #{ a :=42, b:=42, c:=42 } = (maps:from_list([{a,1},{b,2},{c,3}]))#{ a := 42, b := 42, c := 42 },
+    #{ "a" :=1, "b":=42, "c":=42 } = (maps:from_list([{"a",1},{"b",2}]))#{ "b" := 42, "c" => 42 },
+
+    %% Error cases, FIXME: should be 'badmap'?
+    {'EXIT',{badarg,_}} = (catch (id(<<>>))#{ a := 42, b => 2 }),
+    {'EXIT',{badarg,_}} = (catch (id([]))#{ a := 42, b => 2 }),
+    ok.
+
+
+t_update_assoc(Config) when is_list(Config) ->
+    M0 = id(#{1=>a,2=>b,3.0=>c,4=>d,5=>e}),
+
+    M1 = M0#{1=>42,2=>100,4=>[a,b,c]},
+    #{1:=42,2:=100,3.0:=c,4:=[a,b,c],5:=e} = M1,
+    #{1:=42,2:=b,4:=d,5:=e,2.0:=100,3.0:=c,4.0:=[a,b,c]} = M0#{1.0=>float,1:=42,2.0=>wrong,2.0=>100,4.0=>[a,b,c]},
+
+    M2 = M0#{3.0=>new},
+    #{1:=a,2:=b,3.0:=new,4:=d,5:=e} = M2,
+    M2 = M0#{3.0:=wrong,3.0=>new},
+
+    %% Errors cases.
+    BadMap = id(badmap),
+    {'EXIT',{badarg,_}} = (catch BadMap#{nonexisting=>val}),
+
+    ok.
+
+t_update_exact(Config) when is_list(Config) ->
+    M0 = id(#{1=>a,2=>b,3.0=>c,4=>d,5=>e}),
+
+    M1 = M0#{1:=42,2:=100,4:=[a,b,c]},
+    #{1:=42,2:=100,3.0:=c,4:=[a,b,c],5:=e} = M1,
+    M1 = M0#{1:=wrong,1=>42,2=>wrong,2:=100,4:=[a,b,c]},
+
+    M2 = M0#{3.0:=new},
+    #{1:=a,2:=b,3.0:=new,4:=d,5:=e} = M2,
+    M2 = M0#{3.0=>wrong,3.0:=new},
+    %% M2 = M0#{3=>wrong,3.0:=new}, %% FIXME
+
+    %% Errors cases.
+    {'EXIT',{badarg,_}} = (catch M0#{nonexisting:=val}),
+    {'EXIT',{badarg,_}} = (catch M0#{1.0:=v,1.0=>v2}),
+    {'EXIT',{badarg,_}} = (catch M0#{42.0:=v,42:=v2}),
+    {'EXIT',{badarg,_}} = (catch M0#{42=>v1,42.0:=v2,42:=v3}),
+
+    ok.
+
+t_guard_bifs(Config) when is_list(Config) ->
+    true   = map_guard_head(#{a=>1}),
+    false  = map_guard_head([]),
+    true   = map_guard_body(#{a=>1}),
+    false  = map_guard_body({}),
+    true   = map_guard_pattern(#{a=>1, <<"hi">> => "hi" }),
+    false  = map_guard_pattern("list"),
+    ok.
+
+map_guard_head(M) when is_map(M) -> true;
+map_guard_head(_) -> false.
+
+map_guard_body(M) -> is_map(M).
+
+map_guard_pattern(#{}) -> true;
+map_guard_pattern(_)   -> false.
+
+t_guard_sequence(Config) when is_list(Config) ->
+	{1, "a"} = map_guard_sequence_1(#{seq=>1,val=>id("a")}),
+	{2, "b"} = map_guard_sequence_1(#{seq=>2,val=>id("b")}),
+	{3, "c"} = map_guard_sequence_1(#{seq=>3,val=>id("c")}),
+	{4, "d"} = map_guard_sequence_1(#{seq=>4,val=>id("d")}),
+	{5, "e"} = map_guard_sequence_1(#{seq=>5,val=>id("e")}),
+
+	{1,M1}       = map_guard_sequence_2(M1 = id(#{a=>3})),
+	{2,M2}       = map_guard_sequence_2(M2 = id(#{a=>4, b=>4})),
+	{3,gg,M3}    = map_guard_sequence_2(M3 = id(#{a=>gg, b=>4})),
+	{4,sc,sc,M4} = map_guard_sequence_2(M4 = id(#{a=>sc, b=>3, c=>sc2})),
+	{5,kk,kk,M5} = map_guard_sequence_2(M5 = id(#{a=>kk, b=>other, c=>sc2})),
+
+	%% error case
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_1(#{seq=>6,val=>id("e")})),
+	{'EXIT',{function_clause,_}} = (catch map_guard_sequence_2(#{b=>5})),
+	ok.
+
+map_guard_sequence_1(#{seq:=1=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=2=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=3=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=4=Seq, val:=Val}) -> {Seq,Val};
+map_guard_sequence_1(#{seq:=5=Seq, val:=Val}) -> {Seq,Val}.
+
+map_guard_sequence_2(#{ a:=3 }=M) -> {1, M};
+map_guard_sequence_2(#{ a:=4 }=M) -> {2, M};
+map_guard_sequence_2(#{ a:=X, a:=X, b:=4 }=M) -> {3,X,M};
+map_guard_sequence_2(#{ a:=X, a:=Y, b:=3 }=M) when X =:= Y -> {4,X,Y,M};
+map_guard_sequence_2(#{ a:=X, a:=Y }=M) when X =:= Y -> {5,X,Y,M}.
+
+
+t_guard_update(Config) when is_list(Config) ->
+    error  = map_guard_update(#{},#{}),
+    first  = map_guard_update(#{}, #{x=>first}),
+    second = map_guard_update(#{y=>old}, #{x=>second,y=>old}),
+    ok.
+
+map_guard_update(M1, M2) when M1#{x=>first}  =:= M2 -> first;
+map_guard_update(M1, M2) when M1#{x=>second} =:= M2 -> second;
+map_guard_update(_, _) -> error.
+
+t_guard_receive(Config) when is_list(Config) ->
+    M0  = #{ id => 0 },
+    Pid = spawn_link(fun() -> guard_receive_loop() end),
+    Big = 36893488147419103229,
+    B1  = <<"some text">>,
+    B2  = <<"was appended">>,
+    B3  = <<B1/binary, B2/binary>>,
+
+    #{id:=1, res:=Big} = M1 = call(Pid, M0#{op=>sub,in=>{1 bsl 65, 3}}),
+    #{id:=2, res:=26}  = M2 = call(Pid, M1#{op=>idiv,in=>{53,2}}),
+    #{id:=3, res:=832} = M3 = call(Pid, M2#{op=>imul,in=>{26,32}}),
+    #{id:=4, res:=4}   = M4 = call(Pid, M3#{op=>add,in=>{1,3}}),
+    #{id:=5, res:=Big} = M5 = call(Pid, M4#{op=>sub,in=>{1 bsl 65, 3}}),
+    #{id:=6, res:=B3}  = M6 = call(Pid, M5#{op=>"append",in=>{B1,B2}}),
+    #{id:=7, res:=4}   = _  = call(Pid, M6#{op=>add,in=>{1,3}}),
+
+
+    %% update old maps and check id update
+    #{id:=2, res:=B3} = call(Pid, M1#{op=>"append",in=>{B1,B2}}),
+    #{id:=5, res:=99} = call(Pid, M4#{op=>add,in=>{33, 66}}),
+
+    %% cleanup
+    done = call(Pid, done),
+    ok.
+
+call(Pid, M) ->
+    Pid ! {self(), M}, receive {Pid, Res} -> Res end.
+
+guard_receive_loop() ->
+    receive
+	{Pid, #{ id:=Id, op:="append", in:={X,Y}}=M} when is_binary(X), is_binary(Y) ->
+	    Pid ! {self(), M#{ id=>Id+1, res=><<X/binary,Y/binary>>}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=add, in:={X,Y}}} ->
+	    Pid ! {self(), #{ id=>Id+1, res=>X+Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=sub,  in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X-Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=idiv, in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X div Y}},
+	    guard_receive_loop();
+	{Pid, #{ id:=Id, op:=imul, in:={X,Y}}=M} ->
+	    Pid ! {self(), M#{ id=>Id+1, res=>X * Y}},
+	    guard_receive_loop();
+	{Pid, done} ->
+	    Pid ! {self(), done};
+	{Pid, Other} ->
+	    Pid ! {error, Other},
+	    guard_receive_loop()
+    end.
+
+
+t_list_comprehension(Config) when is_list(Config) ->
+    [#{k:=1},#{k:=2},#{k:=3}] = [#{k=>I} || I <- [1,2,3]],
+    ok.
+
+t_guard_fun(Config) when is_list(Config) ->
+    F1 = fun
+	    (#{s:=v,v:=V})     -> {v,V};
+	    (#{s:=t,v:={V,V}}) -> {t,V};
+	    (#{s:=l,v:=[V,V]}) -> {l,V}
+    end,
+
+    F2 = fun
+	    (#{s:=T,v:={V,V}}) -> {T,V};
+	    (#{s:=T,v:=[V,V]}) -> {T,V};
+	    (#{s:=T,v:=V})     -> {T,V}
+    end,
+    V = <<"hi">>,
+
+    {v,V} = F1(#{s=>v,v=>V}),
+    {t,V} = F1(#{s=>t,v=>{V,V}}),
+    {l,V} = F1(#{s=>l,v=>[V,V]}),
+
+    {v,V} = F2(#{s=>v,v=>V}),
+    {t,V} = F2(#{s=>t,v=>{V,V}}),
+    {l,V} = F2(#{s=>l,v=>[V,V]}),
+
+    %% error case
+    {'EXIT', {function_clause,[{?MODULE,_,[#{s:=none,v:=none}],_}|_]}} = (catch F1(#{s=>none,v=>none})),
+    ok.
+
+
+t_map_sort_literals(Config) when is_list(Config) ->
+    % test relation
+
+    %% size order
+    true  = #{ a => 1, b => 2} < id(#{ a => 1, b => 1, c => 1}),
+    true  = #{ b => 1, a => 1} < id(#{ c => 1, a => 1, b => 1}),
+    false = #{ c => 1, b => 1, a => 1} < id(#{ c => 1, a => 1}),
+
+    %% key order
+    true  = #{ a => 1 } < id(#{ b => 1}),
+    false = #{ b => 1 } < id(#{ a => 1}),
+    true  = #{ a => 1, b => 1, c => 1 } < id(#{ b => 1, c => 1, d => 1}),
+    true  = #{ b => 1, c => 1, d => 1 } > id(#{ a => 1, b => 1, c => 1}),
+    true  = #{ c => 1, b => 1, a => 1 } < id(#{ b => 1, c => 1, d => 1}),
+    true  = #{ "a" => 1 } < id(#{ <<"a">> => 1}),
+    false = #{ <<"a">> => 1 } < id(#{ "a" => 1}),
+    false = #{ 1 => 1 } < id(#{ 1.0 => 1}),
+    false = #{ 1.0 => 1 } < id(#{ 1 => 1}),
+
+    %% value order
+    true  = #{ a => 1 } < id(#{ a => 2}),
+    false = #{ a => 2 } < id(#{ a => 1}),
+    false = #{ a => 2, b => 1 } < id(#{ a => 1, b => 3}),
+    true  = #{ a => 1, b => 1 } < id(#{ a => 1, b => 3}),
+
+    true  = #{ "a" => "hi", b => 134 } == id(#{ b => 134,"a" => "hi"}),
+
+    %% lists:sort
+
+    SortVs = [#{"a"=>1},#{a=>2},#{1=>3},#{<<"a">>=>4}],
+    [#{1:=ok},#{a:=ok},#{"a":=ok},#{<<"a">>:=ok}] = lists:sort([#{"a"=>ok},#{a=>ok},#{1=>ok},#{<<"a">>=>ok}]),
+    [#{1:=3},#{a:=2},#{"a":=1},#{<<"a">>:=4}] = lists:sort(SortVs),
+    [#{1:=3},#{a:=2},#{"a":=1},#{<<"a">>:=4}] = lists:sort(lists:reverse(SortVs)),
+
+    ok.
+
+%% BIFs
+t_bif_map_get(Config) when is_list(Config) ->
+
+    1    = maps:get(a, #{ a=> 1}),
+    2    = maps:get(b, #{ a=> 1, b => 2}),
+    "hi" = maps:get("hello", #{ a=>1, "hello" => "hi"}),
+    "tuple hi" = maps:get({1,1.0}, #{ a=>a, {1,1.0} => "tuple hi"}),
+
+    M    = id(#{ k1=>"v1", <<"k2">> => <<"v3">> }),
+    "v4" = maps:get(<<"k2">>, M#{ <<"k2">> => "v4" }),
+
+    %% error case
+    {'EXIT',{badarg, [{maps,get,_,_}|_]}} = (catch maps:get(a,[])),
+    {'EXIT',{badarg, [{maps,get,_,_}|_]}} = (catch maps:get(a,<<>>)),
+    {'EXIT',{bad_key,[{maps,get,_,_}|_]}} = (catch maps:get({1,1}, #{{1,1.0} => "tuple"})),
+    {'EXIT',{bad_key,[{maps,get,_,_}|_]}} = (catch maps:get(a,#{})),
+    {'EXIT',{bad_key,[{maps,get,_,_}|_]}} = (catch maps:get(a,#{ b=>1, c=>2})),
+    ok.
+
+t_bif_map_find(Config) when is_list(Config) ->
+
+    {ok, 1}     = maps:find(a, #{ a=> 1}),
+    {ok, 2}     = maps:find(b, #{ a=> 1, b => 2}),
+    {ok, "int"} = maps:find(1, #{ 1   => "int"}),
+    {ok, "float"} = maps:find(1.0, #{ 1.0=> "float"}),
+
+    {ok, "hi"} = maps:find("hello", #{ a=>1, "hello" => "hi"}),
+    {ok, "tuple hi"} = maps:find({1,1.0}, #{ a=>a, {1,1.0} => "tuple hi"}),
+
+    M = id(#{ k1=>"v1", <<"k2">> => <<"v3">> }),
+    {ok, "v4"} = maps:find(<<"k2">>, M#{ <<"k2">> => "v4" }),
+
+    %% error case
+    error = maps:find(a,#{}),
+    error = maps:find(a,#{b=>1, c=>2}),
+    error = maps:find(1.0, #{ 1 => "int"}),
+    error = maps:find(1, #{ 1.0  => "float"}),
+    error = maps:find({1.0,1}, #{ a=>a, {1,1.0} => "tuple hi"}), % reverse types in tuple key
+
+
+    {'EXIT',{badarg,[{maps,find,_,_}|_]}} = (catch maps:find(a,id([]))),
+    {'EXIT',{badarg,[{maps,find,_,_}|_]}} = (catch maps:find(a,id(<<>>))),
+    ok.
+
+
+t_bif_map_is_key(Config) when is_list(Config) ->
+    M1 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>, 4 => number},
+
+    true  = maps:is_key("hi", M1),
+    true  = maps:is_key(int, M1),
+    true  = maps:is_key(<<"key">>, M1),
+    true  = maps:is_key(4, M1),
+
+    false = maps:is_key(5, M1),
+    false = maps:is_key(<<"key2">>, M1),
+    false = maps:is_key("h", M1),
+    false = maps:is_key("hello", M1),
+    false = maps:is_key(atom, M1),
+    false = maps:is_key(any, id(#{})),
+
+    false = maps:is_key("hi", maps:remove("hi", M1)),
+    true  = maps:is_key("hi", M1),
+    true  = maps:is_key(1, maps:put(1, "number", M1)),
+    false = maps:is_key(1.0, maps:put(1, "number", M1)),
+
+    %% error case
+    {'EXIT',{badarg,[{maps,is_key,_,_}|_]}} = (catch maps:is_key(a,id([]))),
+    {'EXIT',{badarg,[{maps,is_key,_,_}|_]}} = (catch maps:is_key(a,id(<<>>))),
+    ok.
+
+t_bif_map_keys(Config) when is_list(Config) ->
+    [] = maps:keys(#{}),
+
+    [1,2,3,4,5] = maps:keys(#{ 1 => a, 2 => b, 3 => c, 4 => d, 5 => e}),
+    [1,2,3,4,5] = maps:keys(#{ 4 => d, 5 => e, 1 => a, 2 => b, 3 => c}),
+
+    % values in key order: [4,int,"hi",<<"key">>]
+    M1 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>, 4 => number},
+    [4,int,"hi",<<"key">>] = maps:keys(M1),
+
+    %% error case
+    {'EXIT',{badarg,[{maps,keys,_,_}|_]}} = (catch maps:keys(1 bsl 65 + 3)),
+    {'EXIT',{badarg,[{maps,keys,_,_}|_]}} = (catch maps:keys(154)),
+    {'EXIT',{badarg,[{maps,keys,_,_}|_]}} = (catch maps:keys(atom)),
+    {'EXIT',{badarg,[{maps,keys,_,_}|_]}} = (catch maps:keys([])),
+    {'EXIT',{badarg,[{maps,keys,_,_}|_]}} = (catch maps:keys(<<>>)),
+    ok.
+
+t_bif_map_new(Config) when is_list(Config) ->
+    #{} = maps:new(),
+    0   = erlang:map_size(maps:new()),
+    ok.
+
+t_bif_map_merge(Config) when is_list(Config) ->
+    0   = erlang:map_size(maps:merge(#{},#{})),
+
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:merge(#{}, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:merge(M0, #{}),
+
+    M1 = #{ "hi" => "hello again", float => 3.3, {1,2} => "tuple", 4 => integer },
+
+    #{4 := number, 18446744073709551629 := wat, float := 3.3, int := 3,
+	{1,2} := "tuple", "hi" := "hello", <<"key">> := <<"value">>} = maps:merge(M1,M0),
+
+    #{4 := integer, 18446744073709551629 := wat, float := 3.3, int := 3,
+	{1,2} := "tuple", "hi" := "hello again", <<"key">> := <<"value">>} = maps:merge(M0,M1),
+
+    %% error case
+    {'EXIT',{badarg,[{maps,merge,_,_}|_]}} = (catch maps:merge((1 bsl 65 + 3), <<>>)),
+    {'EXIT',{badarg,[{maps,merge,_,_}|_]}} = (catch maps:merge(<<>>, id(#{ a => 1}))),
+    {'EXIT',{badarg,[{maps,merge,_,_}|_]}} = (catch maps:merge(id(#{ a => 2}), <<>> )),
+
+    ok.
+
+
+t_bif_map_put(Config) when is_list(Config) ->
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    M1 = #{ "hi" := "hello"} = maps:put("hi", "hello", #{}),
+
+    ["hi"]    = maps:keys(M1),
+    ["hello"] = maps:values(M1),
+
+    M2 = #{ int := 3 } = maps:put(int, 3, M1),
+
+    [int,"hi"]  = maps:keys(M2),
+    [3,"hello"] = maps:values(M2),
+
+    M3 = #{ <<"key">> := <<"value">> } = maps:put(<<"key">>, <<"value">>, M2),
+
+    [int,"hi",<<"key">>]    = maps:keys(M3),
+    [3,"hello",<<"value">>] = maps:values(M3),
+
+    M4 = #{ 18446744073709551629 := wat } = maps:put(18446744073709551629, wat, M3),
+
+    [18446744073709551629,int,"hi",<<"key">>] = maps:keys(M4),
+    [wat,3,"hello",<<"value">>]               = maps:values(M4),
+
+    M0 = #{ 4 := number } = M5 = maps:put(4, number, M4),
+
+    [4,18446744073709551629,int,"hi",<<"key">>] = maps:keys(M5),
+    [number,wat,3,"hello",<<"value">>]          = maps:values(M5),
+
+    M6 = #{ <<"key">> := <<"other value">> } = maps:put(<<"key">>, <<"other value">>, M5),
+
+    [4,18446744073709551629,int,"hi",<<"key">>] = maps:keys(M6),
+    [number,wat,3,"hello",<<"other value">>]    = maps:values(M6),
+
+    %% error case
+    {'EXIT',{badarg,[{maps,put,_,_}|_]}} = (catch maps:put(1,a,1 bsl 65 + 3)),
+    {'EXIT',{badarg,[{maps,put,_,_}|_]}} = (catch maps:put(1,a,154)),
+    {'EXIT',{badarg,[{maps,put,_,_}|_]}} = (catch maps:put(1,a,atom)),
+    {'EXIT',{badarg,[{maps,put,_,_}|_]}} = (catch maps:put(1,a,[])),
+    {'EXIT',{badarg,[{maps,put,_,_}|_]}} = (catch maps:put(1,a,<<>>)),
+     ok.
+
+t_bif_map_remove(Config) when is_list(Config) ->
+    0  = erlang:map_size(maps:remove(some_key, #{})),
+
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    M1 = maps:remove("hi", M0),
+    [4,18446744073709551629,int,<<"key">>] = maps:keys(M1),
+    [number,wat,3,<<"value">>]             = maps:values(M1),
+
+    M2 = maps:remove(int, M1),
+    [4,18446744073709551629,<<"key">>] = maps:keys(M2),
+    [number,wat,<<"value">>]           = maps:values(M2),
+
+    M3 = maps:remove(<<"key">>, M2),
+    [4,18446744073709551629] = maps:keys(M3),
+    [number,wat]             = maps:values(M3),
+
+    M4 = maps:remove(18446744073709551629, M3),
+    [4]      = maps:keys(M4),
+    [number] = maps:values(M4),
+
+    M5 = maps:remove(4, M4),
+    [] = maps:keys(M5),
+    [] = maps:values(M5),
+
+    M0 = maps:remove(5,M0),
+    M0 = maps:remove("hi there",M0),
+
+    #{ "hi" := "hello", int := 3, 4 := number} = maps:remove(18446744073709551629,maps:remove(<<"key">>,M0)),
+
+    %% error case
+    {'EXIT',{badarg,[{maps,remove,_,_}|_]}} = (catch maps:remove(a,1 bsl 65 + 3)),
+    {'EXIT',{badarg,[{maps,remove,_,_}|_]}} = (catch maps:remove(1,154)),
+    {'EXIT',{badarg,[{maps,remove,_,_}|_]}} = (catch maps:remove(a,atom)),
+    {'EXIT',{badarg,[{maps,remove,_,_}|_]}} = (catch maps:remove(1,[])),
+    {'EXIT',{badarg,[{maps,remove,_,_}|_]}} = (catch maps:remove(a,<<>>)),
+     ok.
+
+t_bif_map_update(Config) when is_list(Config) ->
+    M0 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>,
+	4 => number, 18446744073709551629 => wat},
+
+    #{ "hi" := "hello again", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:update("hi", "hello again", M0),
+
+    #{ "hi" := "hello", int := 1337, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wat} = maps:update(int, 1337, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"new value">>,
+	4 := number, 18446744073709551629 := wat} = maps:update(<<"key">>, <<"new value">>, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := integer, 18446744073709551629 := wat} = maps:update(4, integer, M0),
+
+    #{ "hi" := "hello", int := 3, <<"key">> := <<"value">>,
+	4 := number, 18446744073709551629 := wazzup} = maps:update(18446744073709551629, wazzup, M0),
+
+    %% error case
+    {'EXIT',{badarg,[{maps,update,_,_}|_]}} = (catch maps:update(1,none,{})),
+    {'EXIT',{badarg,[{maps,update,_,_}|_]}} = (catch maps:update(1,none,<<"value">>)),
+    {'EXIT',{badarg,[{maps,update,_,_}|_]}} = (catch maps:update(5,none,M0)),
+
+    ok.
+
+
+
+t_bif_map_values(Config) when is_list(Config) ->
+
+    [] = maps:values(#{}),
+
+    [a,b,c,d,e] = maps:values(#{ 1 => a, 2 => b, 3 => c, 4 => d, 5 => e}),
+    [a,b,c,d,e] = maps:values(#{ 4 => d, 5 => e, 1 => a, 2 => b, 3 => c}),
+
+    % values in key order: [4,int,"hi",<<"key">>]
+    M1 = #{ "hi" => "hello", int => 3, <<"key">> => <<"value">>, 4 => number},
+    M2 = M1#{ "hi" => "hello2", <<"key">> => <<"value2">> },
+    [number,3,"hello2",<<"value2">>] = maps:values(M2),
+    [number,3,"hello",<<"value">>]   = maps:values(M1),
+
+    %% error case
+    {'EXIT',{badarg,[{maps,values,_,_}|_]}} = (catch maps:values(1 bsl 65 + 3)),
+    {'EXIT',{badarg,[{maps,values,_,_}|_]}} = (catch maps:values(atom)),
+    {'EXIT',{badarg,[{maps,values,_,_}|_]}} = (catch maps:values([])),
+    {'EXIT',{badarg,[{maps,values,_,_}|_]}} = (catch maps:values(<<>>)),
+    ok.
+
+t_erlang_hash(Config) when is_list(Config) ->
+
+    ok = t_bif_erlang_phash2(),
+    ok = t_bif_erlang_phash(),
+    ok = t_bif_erlang_hash(),
+
+    ok.
+
+t_bif_erlang_phash2() ->
+
+    39679005 = erlang:phash2(#{}),
+    78942764 = erlang:phash2(#{ a => 1, "a" => 2, <<"a">> => 3, {a,b} => 4 }),
+    37338230 = erlang:phash2(#{ 1 => a, 2 => "a", 3 => <<"a">>, 4 => {a,b} }),
+    14363616 = erlang:phash2(#{ 1 => a }),
+    51612236 = erlang:phash2(#{ a => 1 }),
+
+    37468437 = erlang:phash2(#{{} => <<>>}),
+    44049159 = erlang:phash2(#{<<>> => {}}),
+
+    M0 = #{ a => 1, "key" => <<"value">> },
+    M1 = maps:remove("key",M0),
+    M2 = M1#{ "key" => <<"value">> },
+
+    118679416 = erlang:phash2(M0),
+    51612236  = erlang:phash2(M1),
+    118679416 = erlang:phash2(M2),
+    ok.
+
+t_bif_erlang_phash() ->
+    Sz = 1 bsl 32,
+    268440612  = erlang:phash(#{},Sz),
+    1196461908 = erlang:phash(#{ a => 1, "a" => 2, <<"a">> => 3, {a,b} => 4 },Sz),
+    3944426064 = erlang:phash(#{ 1 => a, 2 => "a", 3 => <<"a">>, 4 => {a,b} },Sz),
+    1394238263 = erlang:phash(#{ 1 => a },Sz),
+    4066388227 = erlang:phash(#{ a => 1 },Sz),
+
+    1578050717 = erlang:phash(#{{} => <<>>},Sz),
+    1578050717 = erlang:phash(#{<<>> => {}},Sz), % yep, broken
+
+    M0 = #{ a => 1, "key" => <<"value">> },
+    M1 = maps:remove("key",M0),
+    M2 = M1#{ "key" => <<"value">> },
+
+    3590546636 = erlang:phash(M0,Sz),
+    4066388227 = erlang:phash(M1,Sz),
+    3590546636 = erlang:phash(M2,Sz),
+    ok.
+
+t_bif_erlang_hash() ->
+    Sz = 1 bsl 27 - 1,
+    5158      = erlang:hash(#{},Sz),
+    71555838  = erlang:hash(#{ a => 1, "a" => 2, <<"a">> => 3, {a,b} => 4 },Sz),
+    5497225   = erlang:hash(#{ 1 => a, 2 => "a", 3 => <<"a">>, 4 => {a,b} },Sz),
+    126071654 = erlang:hash(#{ 1 => a },Sz),
+    126426236 = erlang:hash(#{ a => 1 },Sz),
+
+    101655720 = erlang:hash(#{{} => <<>>},Sz),
+    101655720 = erlang:hash(#{<<>> => {}},Sz), % yep, broken
+
+    M0 = #{ a => 1, "key" => <<"value">> },
+    M1 = maps:remove("key",M0),
+    M2 = M1#{ "key" => <<"value">> },
+
+    38260486  = erlang:hash(M0,Sz),
+    126426236 = erlang:hash(M1,Sz),
+    38260486  = erlang:hash(M2,Sz),
+    ok.
+
+
+t_map_encode_decode(Config) when is_list(Config) ->
+    <<131,116,0,0,0,0>> = erlang:term_to_binary(#{}),
+    Pairs = [
+	{a,b},{"key","values"},{<<"key">>,<<"value">>},
+	{1,b},{[atom,1],{<<"wat">>,1,2,3}},
+	{aa,"values"},
+	{1 bsl 64 + (1 bsl 50 - 1), sc1},
+	{99, sc2},
+	{1 bsl 65 + (1 bsl 51 - 1), sc3},
+	{88, sc4},
+	{1 bsl 66 + (1 bsl 52 - 1), sc5},
+	{77, sc6},
+	{1 bsl 67 + (1 bsl 53 - 1), sc3},
+	{75, sc6}, {-10,sc8},
+	{<<>>, sc9}, {3.14158, sc10},
+	{[3.14158], sc11}, {more_atoms, sc12},
+	{{more_tuples}, sc13}, {self(), sc14},
+	{{},{}},{[],[]}
+    ],
+    ok = map_encode_decode_and_match(Pairs,[],#{}),
+
+    %% check sorting
+
+    %% literally #{ b=>2, a=>1 } in the internal order
+    #{ a:=1, b:=2 } =
+	erlang:binary_to_term(<<131,116,0,0,0,2,100,0,1,98,100,0,1,97,97,2,97,1>>),
+
+
+    %% literally #{ "hi" => "value", a=>33, b=>55 } in the internal order
+    #{ a:=33, b:=55, "hi" := "value"} = erlang:binary_to_term(<<131,116,0,0,0,3,
+	107,0,2,104,105, % "hi" :: list()
+	100,0,1,97, % a :: atom()
+	100,0,1,98, % b :: atom()
+	107,0,5,118,97,108,117,101, % "value" :: list()
+	97,33, % 33 :: integer()
+	97,55  % 55 :: integer()
+	>>),
+
+
+    %% error cases
+    %% template: <<131,116,0,0,0,2,100,0,1,97,100,0,1,98,97,1,97,1>>
+    %% which is: #{ a=>1, b=>1 }
+
+    %% uniqueness violation
+    %% literally #{ a=>1, "hi"=>"value", a=>2 }
+    {'EXIT',{badarg,[{_,_,_,_}|_]}} = (catch
+	erlang:binary_to_term(<<131,116,0,0,0,3,100,0,1,97,107,0,2,104,105,100,0,1,97,97,1,107,0,5,118,97,108,117,101,97,2>>)),
+
+    %% bad size (too large)
+    {'EXIT',{badarg,[{_,_,_,_}|_]}} = (catch
+	erlang:binary_to_term(<<131,116,0,0,0,12,100,0,1,97,100,0,1,98,97,1,97,1>>)),
+
+    %% bad size (too small) .. should fail just truncate it .. weird.
+    %% possibly change external format so truncated will be #{a:=1}
+    #{ a:=b } =
+	erlang:binary_to_term(<<131,116,0,0,0,1,100,0,1,97,100,0,1,98,97,1,97,1>>),
+
+    ok.
+
+map_encode_decode_and_match([{K,V}|Pairs], EncodedPairs, M0) ->
+    M1 = maps:put(K,V,M0),
+    B0 = erlang:term_to_binary(M1),
+    Ls = lists:sort(fun(A,B) -> erts_internal:cmp_term(A,B) < 0 end, [{K, erlang:term_to_binary(K), erlang:term_to_binary(V)}|EncodedPairs]),
+    %% sort Ks and Vs according to term spec, then match it
+    ok = match_encoded_map(B0, length(Ls), [Kbin||{_,Kbin,_}<-Ls] ++ [Vbin||{_,_,Vbin}<-Ls]),
+    %% decode and match it
+    M1 = erlang:binary_to_term(B0),
+    map_encode_decode_and_match(Pairs,Ls,M1);
+map_encode_decode_and_match([],_,_) -> ok.
+
+match_encoded_map(<<131,116,Size:32,Encoded/binary>>,Size,Items) ->
+    match_encoded_map(Encoded,Items);
+match_encoded_map(_,_,_) -> no_match_size.
+
+match_encoded_map(<<>>,[]) -> ok;
+match_encoded_map(Bin,[<<131,Item/binary>>|Items]) ->
+    Size = erlang:byte_size(Item),
+    <<EncodedTerm:Size/binary, Bin1/binary>> = Bin,
+    EncodedTerm = Item, %% Asssert
+    match_encoded_map(Bin1,Items).
+
+
+t_bif_map_to_list(Config) when is_list(Config) ->
+    [] = maps:to_list(#{}),
+    [{a,1},{b,2}] = maps:to_list(#{a=>1,b=>2}),
+    [{a,1},{b,2},{c,3}] = maps:to_list(#{c=>3,a=>1,b=>2}),
+    [{a,1},{b,2},{g,3}] = maps:to_list(#{g=>3,a=>1,b=>2}),
+    [{a,1},{b,2},{g,3},{"c",4}] = maps:to_list(#{g=>3,a=>1,b=>2,"c"=>4}),
+    [{3,v2},{hi,v4},{{hi,3},v5},{"hi",v3},{<<"hi">>,v1}] = maps:to_list(#{
+	    <<"hi">>=>v1,3=>v2,"hi"=>v3,hi=>v4,{hi,3}=>v5}),
+
+    [{3,v7},{hi,v9},{{hi,3},v10},{"hi",v8},{<<"hi">>,v6}] = maps:to_list(#{
+	    <<"hi">>=>v1,3=>v2,"hi"=>v3,hi=>v4,{hi,3}=>v5,
+	    <<"hi">>=>v6,3=>v7,"hi"=>v8,hi=>v9,{hi,3}=>v10}),
+
+    %% error cases
+    {'EXIT', {badarg,_}} = (catch maps:to_list(id(a))),
+    {'EXIT', {badarg,_}} = (catch maps:to_list(id(42))),
+    ok.
+
+
+t_bif_map_from_list(Config) when is_list(Config) ->
+    #{} = maps:from_list([]),
+    A   = maps:from_list([]),
+    0   = erlang:map_size(A),
+
+    #{a:=1,b:=2}  = maps:from_list([{a,1},{b,2}]),
+    #{c:=3,a:=1,b:=2} = maps:from_list([{a,1},{b,2},{c,3}]),
+    #{g:=3,a:=1,b:=2} = maps:from_list([{a,1},{b,2},{g,3}]),
+
+    #{a:=2} = maps:from_list([{a,1},{a,3},{a,2}]),
+
+    #{ <<"hi">>:=v1,3:=v3,"hi":=v6,hi:=v4,{hi,3}:=v5} =
+	maps:from_list([{3,v3},{"hi",v6},{hi,v4},{{hi,3},v5},{<<"hi">>,v1}]),
+
+    #{<<"hi">>:=v6,3:=v8,"hi":=v11,hi:=v9,{hi,3}:=v10} =
+	maps:from_list([ {{hi,3},v3}, {"hi",v0},{3,v1}, {<<"hi">>,v4}, {hi,v2},
+	    {<<"hi">>,v6}, {{hi,3},v10},{"hi",v11}, {hi,v9}, {3,v8}]),
+
+    %% error cases
+    {'EXIT', {badarg,_}} = (catch maps:from_list(id([{a,b},b]))),
+    {'EXIT', {badarg,_}} = (catch maps:from_list(id([{a,b},{b,b,3}]))),
+    {'EXIT', {badarg,_}} = (catch maps:from_list(id([{a,b},<<>>]))),
+    {'EXIT', {badarg,_}} = (catch maps:from_list(id([{a,b}|{b,a}]))),
+    {'EXIT', {badarg,_}} = (catch maps:from_list(id(a))),
+    {'EXIT', {badarg,_}} = (catch maps:from_list(id(42))),
+    ok.
+
+%% Maps module, not BIFs
+t_maps_fold(_Config) ->
+    Vs = lists:seq(1,100),
+    M  = maps:from_list([{{k,I},{v,I}}||I<-Vs]),
+
+    %% fold
+    5050 = maps:fold(fun({k,_},{v,V},A) -> V + A end, 0, M),
+
+    ok.
+
+t_maps_map(_Config) ->
+    Vs = lists:seq(1,100),
+    M1 = maps:from_list([{I,I}||I<-Vs]),
+    M2 = maps:from_list([{I,{token,I}}||I<-Vs]),
+
+    M2 = maps:map(fun(_K,V) -> {token,V} end, M1),
+    ok.
+
+t_maps_size(_Config) ->
+    Vs = lists:seq(1,100),
+    lists:foldl(fun(I,M) ->
+		M1 = maps:put(I,I,M),
+		I  = maps:size(M1),
+		M1
+	end, #{}, Vs),
+    ok.
+
+
+t_maps_without(_Config) ->
+    Ki = [11,22,33,44,55,66,77,88,99],
+    M0 = maps:from_list([{{k,I},{v,I}}||I<-lists:seq(1,100)]),
+    M1 = maps:from_list([{{k,I},{v,I}}||I<-lists:seq(1,100) -- Ki]),
+    M1 = maps:without([{k,I}||I <- Ki],M0),
+    ok.
+
+
+%% MISC
+t_pdict(_Config) ->
+
+    put(#{ a => b, b => a},#{ c => d}),
+    put(get(#{ a => b, b => a}),1),
+    1 = get(#{ c => d}),
+    #{ c := d } = get(#{ a => b, b => a}).
+
+t_ets(_Config) ->
+
+    Tid = ets:new(map_table,[]),
+
+    [ets:insert(Tid,{maps:from_list([{I,-I}]),I}) || I <- lists:seq(1,100)],
+
+
+    [{#{ 2 := -2},2}] = ets:lookup(Tid,#{ 2 => -2 }),
+
+    %% Test equal
+    [3,4] = lists:sort(
+	      ets:select(Tid,[{{'$1','$2'},
+			       [{'or',{'==','$1',#{ 3 => -3 }},
+				 {'==','$1',#{ 4 => -4 }}}],
+			       ['$2']}])),
+    %% Test match
+    [30,50] = lists:sort(
+		ets:select(Tid,
+			   [{{#{ 30 => -30}, '$1'},[],['$1']},
+			    {{#{ 50 => -50}, '$1'},[],['$1']}]
+			  )),
+
+    ets:insert(Tid,{#{ a => b, b => c, c => a},transitivity}),
+
+    %% Test equal with map of different size
+    [] = ets:select(Tid,[{{'$1','_'},[{'==','$1',#{ b => c }}],['$_']}]),
+
+    %% Test match with map of different size
+    %[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => c },'_'},[],['$_']}]),
+
+    %%% Test match with don't care value
+    %[{#{ a := b },_}] = ets:select(Tid,[{{#{ b => '_' },'_'},[],['$_']}]),
+
+    %% Test is_map bif
+    101 = length(ets:select(Tid,[{'$1',[{is_map,{element,1,'$1'}}],['$1']}])),
+    ets:insert(Tid,{not_a_map,2}),
+    101 = length(ets:select(Tid,[{'$1',[{is_map,{element,1,'$1'}}],['$1']}])),
+    ets:insert(Tid,{{nope,a,tuple},2}),
+    101 = length(ets:select(Tid,[{'$1',[{is_map,{element,1,'$1'}}],['$1']}])),
+
+    %% Test map_size bif
+    [3] = ets:select(Tid,[{{'$1','_'},[{'==',{map_size,'$1'},3}],
+			   [{map_size,'$1'}]}]),
+
+    true = ets:delete(Tid,#{50 => -50}),
+    [] = ets:lookup(Tid,#{50 => -50}),
+
+    ets:delete(Tid),
+    ok.
+
+t_dets(_Config) ->
+    ok.
+
+getmsg(_Tracer) ->
+    receive V -> V after 100 -> timeout end.
+
+trace_collector(Msg,Parent) ->
+    io:format("~p~n",[Msg]),
+    Parent ! Msg,
+    Parent.
+
+%% Use this function to avoid compile-time evaluation of an expression.
+id(I) -> I.
diff --git a/lib/debugger/vsn.mk b/lib/debugger/vsn.mk
index c3e3579e2c..a245e26a55 100644
--- a/lib/debugger/vsn.mk
+++ b/lib/debugger/vsn.mk
@@ -1 +1 @@
-DEBUGGER_VSN = 3.2.11
+DEBUGGER_VSN = 3.2.12
diff --git a/lib/dialyzer/doc/manual.txt b/lib/dialyzer/doc/manual.txt
index d519ac960b..29c9518d84 100644
--- a/lib/dialyzer/doc/manual.txt
+++ b/lib/dialyzer/doc/manual.txt
@@ -125,7 +125,7 @@ The exit status of the command line version is:
 Usage: dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
 		[-pa dir]* [--plt plt] [--plts plt*] [-Ddefine]*
                 [-I include_dir]* [--output_plt file] [-Wwarn]*
-                [--src] [--gui | --wx] [files_or_dirs] [-r dirs]
+                [--src] [--gui] [files_or_dirs] [-r dirs]
                 [--apps applications] [-o outfile]
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
@@ -234,9 +234,7 @@ Options:
   --fullpath
       Display the full path names of files for which warnings are emitted.
    --gui
-       Use the gs-based GUI.
-   --wx
-       Use the wx-based GUI.
+       Use the GUI.
 
 Note:
   * denotes that multiple occurrences of these options are possible.
diff --git a/lib/dialyzer/doc/src/book.xml b/lib/dialyzer/doc/src/book.xml
index ec06427671..61b873fb5b 100644
--- a/lib/dialyzer/doc/src/book.xml
+++ b/lib/dialyzer/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/dialyzer/doc/src/dialyzer.xml b/lib/dialyzer/doc/src/dialyzer.xml
index 0ac96e8ac9..a92b890a80 100644
--- a/lib/dialyzer/doc/src/dialyzer.xml
+++ b/lib/dialyzer/doc/src/dialyzer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -67,7 +67,7 @@
        dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
 		[-pa dir]* [--plt plt] [--plts plt*] [-Ddefine]*
                 [-I include_dir]* [--output_plt file] [-Wwarn]*
-                [--src] [--gui | --wx] [files_or_dirs] [-r dirs]
+                [--src] [--gui] [files_or_dirs] [-r dirs]
                 [--apps applications] [-o outfile]
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
@@ -204,9 +204,7 @@
        <tag><c><![CDATA[--fullpath]]></c></tag>
        <item>Display the full path names of files for which warnings are emitted.</item>
        <tag><c><![CDATA[--gui]]></c></tag>
-       <item>Use the gs-based GUI.</item>
-       <tag><c><![CDATA[--wx]]></c></tag>
-       <item>Use the wx-based GUI.</item>
+       <item>Use the GUI.</item>
     </taglist>
     <note>
       <p>* denotes that multiple occurrences of these options are possible.</p>
@@ -231,7 +229,7 @@
        match.</item>
       <tag><c><![CDATA[-Wno_opaque]]></c></tag>
       <item>Suppress warnings for violations of opaqueness of data types.</item>
-      <tag><c><![CDATA[-Wno_behaviours]]></c>***</tag>
+      <tag><c><![CDATA[-Wno_behaviours]]></c></tag>
       <item>Suppress warnings about behaviour callbacks which drift from the
        published recommended interfaces.</item>
       <tag><c><![CDATA[-Wunmatched_returns]]></c>***</tag>
diff --git a/lib/dialyzer/doc/src/dialyzer_chapter.xml b/lib/dialyzer/doc/src/dialyzer_chapter.xml
index be75f1cc65..2626e19050 100644
--- a/lib/dialyzer/doc/src/dialyzer_chapter.xml
+++ b/lib/dialyzer/doc/src/dialyzer_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/dialyzer/doc/src/fascicules.xml b/lib/dialyzer/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/dialyzer/doc/src/fascicules.xml
+++ b/lib/dialyzer/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 70ebee678c..b61b1af1b0 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/dialyzer/doc/src/part.xml b/lib/dialyzer/doc/src/part.xml
index 564ef3a52f..83289206f9 100644
--- a/lib/dialyzer/doc/src/part.xml
+++ b/lib/dialyzer/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/dialyzer/doc/src/part_notes.xml b/lib/dialyzer/doc/src/part_notes.xml
index 992ee73daa..3798d25315 100644
--- a/lib/dialyzer/doc/src/part_notes.xml
+++ b/lib/dialyzer/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/dialyzer/doc/src/ref_man.xml b/lib/dialyzer/doc/src/ref_man.xml
index 7e5367b7c5..23e7b6f57d 100644
--- a/lib/dialyzer/doc/src/ref_man.xml
+++ b/lib/dialyzer/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
index bb2edd419a..d7265ba31a 100644
--- a/lib/dialyzer/src/Makefile
+++ b/lib/dialyzer/src/Makefile
@@ -57,7 +57,6 @@ MODULES =  \
 	dialyzer_dataflow \
 	dialyzer_dep \
 	dialyzer_explanation \
-	dialyzer_gui \
 	dialyzer_gui_wx \
 	dialyzer_options \
 	dialyzer_plt \
@@ -113,9 +112,6 @@ $(EBIN)/dialyzer_cl_parse.$(EMULATOR): dialyzer_cl_parse.erl ../vsn.mk
 $(EBIN)/dialyzer_plt.$(EMULATOR): dialyzer_plt.erl ../vsn.mk
 	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_plt.erl
 
-$(EBIN)/dialyzer_gui.$(EMULATOR): dialyzer_gui.erl ../vsn.mk
-	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_gui.erl
-
 $(EBIN)/dialyzer_gui_wx.$(EMULATOR): dialyzer_gui_wx.erl ../vsn.mk
 	$(erlc_verbose)erlc -W  $(ERL_COMPILE_FLAGS) -DVSN="\"v$(VSN)\"" -o$(EBIN) dialyzer_gui_wx.erl
 
@@ -140,7 +136,6 @@ $(EBIN)/dialyzer_contracts.beam: dialyzer.hrl
 $(EBIN)/dialyzer_dataflow.beam: dialyzer.hrl
 $(EBIN)/dialyzer_dep.beam: dialyzer.hrl
 $(EBIN)/dialyzer_explanation.beam: dialyzer.hrl
-$(EBIN)/dialyzer_gui.beam: dialyzer.hrl
 $(EBIN)/dialyzer_gui_wx.beam: dialyzer.hrl dialyzer_gui_wx.hrl
 $(EBIN)/dialyzer_options.beam: dialyzer.hrl
 $(EBIN)/dialyzer_plt.beam: dialyzer.hrl
diff --git a/lib/dialyzer/src/dialyzer.app.src b/lib/dialyzer/src/dialyzer.app.src
index 9222a28a77..0d048b607e 100644
--- a/lib/dialyzer/src/dialyzer.app.src
+++ b/lib/dialyzer/src/dialyzer.app.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,17 +29,19 @@
 	     dialyzer_cl_parse,
 	     dialyzer_codeserver,
 	     dialyzer_contracts,
+	     dialyzer_coordinator,
 	     dialyzer_dataflow,
 	     dialyzer_dep,
 	     dialyzer_explanation,
-	     dialyzer_gui,
 	     dialyzer_gui_wx,
 	     dialyzer_options,
 	     dialyzer_plt,
 	     dialyzer_races,
 	     dialyzer_succ_typings,
 	     dialyzer_typesig,
-	     dialyzer_utils]},
+	     dialyzer_utils,
+             dialyzer_timing,
+             dialyzer_worker]},
   {registered, []},
   {applications, [compiler, gs, hipe, kernel, stdlib, wx]},
   {env, []}]}.
diff --git a/lib/dialyzer/src/dialyzer.appup.src b/lib/dialyzer/src/dialyzer.appup.src
index 26d14ee8f4..1e293e407a 100644
--- a/lib/dialyzer/src/dialyzer.appup.src
+++ b/lib/dialyzer/src/dialyzer.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %% 
 %% The 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,6 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-
-{"%VSN%",[],[]}.
+{"%VSN%",
+ [{<<".*">>,[{restart_application, dialyzer}]}],
+ [{<<".*">>,[{restart_application, dialyzer}]}]
+}.
diff --git a/lib/dialyzer/src/dialyzer.erl b/lib/dialyzer/src/dialyzer.erl
index 822aa0826a..bb7e39dfda 100644
--- a/lib/dialyzer/src/dialyzer.erl
+++ b/lib/dialyzer/src/dialyzer.erl
@@ -62,18 +62,18 @@ plain_cl() ->
       cl_halt(cl_check_init(Opts), Opts);
     {plt_info, Opts} ->
       cl_halt(cl_print_plt_info(Opts), Opts);
-    {{gui, Type}, Opts} ->
+    {gui, Opts} ->
       try check_gui_options(Opts)
       catch throw:{dialyzer_error, Msg} -> cl_error(Msg)
       end,
       case Opts#options.check_plt of
 	true ->
 	  case cl_check_init(Opts#options{get_warnings = false}) of
-	    {ok, _} -> gui_halt(internal_gui(Type, Opts), Opts);
+	    {ok, _} -> gui_halt(internal_gui(Opts), Opts);
 	    {error, _} = Error -> cl_halt(Error, Opts)
 	  end;
 	false ->
-	  gui_halt(internal_gui(Type, Opts), Opts)
+	  gui_halt(internal_gui(Opts), Opts)
       end;
     {cl, Opts} ->
       case Opts#options.check_plt of
@@ -179,12 +179,9 @@ run(Opts) ->
       erlang:error({dialyzer_error, lists:flatten(ErrorMsg)})
   end.
 
-internal_gui(Type, OptsRecord) ->
+internal_gui(OptsRecord) ->
   F = fun() ->
-	  case Type of
-	    gs -> dialyzer_gui:start(OptsRecord);
-	    wx -> dialyzer_gui_wx:start(OptsRecord)
-	  end,
+	  dialyzer_gui_wx:start(OptsRecord),
 	  ?RET_NOTHING_SUSPICIOUS
       end,
   doit(F).
@@ -205,7 +202,7 @@ gui(Opts) ->
       case cl_check_init(OptsRecord) of
 	{ok, ?RET_NOTHING_SUSPICIOUS} ->
 	  F = fun() ->
-		  dialyzer_gui:start(OptsRecord)
+		  dialyzer_gui_wx:start(OptsRecord)
 	      end,
 	  case doit(F) of
 	    {ok, _} -> ok;
@@ -426,6 +423,9 @@ message_to_string({call_without_opaque, [M, F, Args, ExpectedTriples]}) ->
 message_to_string({opaque_eq, [Type, _Op, OpaqueType]}) ->
   io_lib:format("Attempt to test for equality between a term of type ~s"
 		" and a term of opaque type ~s\n", [Type, OpaqueType]);
+message_to_string({opaque_guard, [Arg1, Infix, Arg2, ArgNs]}) ->
+  io_lib:format("Guard test ~s ~s ~s contains ~s\n",
+		[Arg1, Infix, Arg2, form_positions(ArgNs)]);
 message_to_string({opaque_guard, [Guard, Args]}) ->
   io_lib:format("Guard test ~w~s breaks the opaqueness of its argument\n",
 		[Guard, Args]);
@@ -438,8 +438,16 @@ message_to_string({opaque_match, [Pat, OpaqueType, OpaqueTerm]}) ->
 message_to_string({opaque_neq, [Type, _Op, OpaqueType]}) ->
   io_lib:format("Attempt to test for inequality between a term of type ~s"
 		" and a term of opaque type ~s\n", [Type, OpaqueType]);
-message_to_string({opaque_type_test, [Fun, Opaque]}) ->
-  io_lib:format("The type test ~s(~s) breaks the opaqueness of the term ~s\n", [Fun, Opaque, Opaque]);
+message_to_string({opaque_type_test, [Fun, Args, Arg, ArgType]}) ->
+  io_lib:format("The type test ~s~s breaks the opaqueness of the term ~s~s\n",
+                [Fun, Args, Arg, ArgType]);
+message_to_string({opaque_size, [SizeType, Size]}) ->
+  io_lib:format("The size ~s breaks the opaqueness of ~s\n",
+                [SizeType, Size]);
+message_to_string({opaque_call, [M, F, Args, Culprit, OpaqueType]}) ->
+  io_lib:format("The call ~s:~s~s breaks the opaqueness of the term ~s :: ~s\n",
+                [M, F, Args, Culprit, OpaqueType]);
+
 %%----- Warnings for concurrency errors --------------------
 message_to_string({race_condition, [M, F, Args, Reason]}) ->
   io_lib:format("The call ~w:~w~s ~s\n", [M, F, Args, Reason]);
diff --git a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
index 0fbaf1d47c..2a633c5e37 100644
--- a/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_analysis_callgraph.erl
@@ -2,7 +2,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,8 @@
 	      one_file_result/0,
 	      compile_result/0]).
 
+-export_type([no_warn_unused/0]).
+
 -include("dialyzer.hrl").
 
 -record(analysis_state,
@@ -48,7 +50,7 @@
 	  defines        = []           :: [dial_define()],
 	  doc_plt                       :: dialyzer_plt:plt(),
 	  include_dirs   = []           :: [file:filename()],
-	  no_warn_unused                :: set(),
+	  no_warn_unused                :: no_warn_unused(),
 	  parent                        :: pid(),
 	  plt                           :: dialyzer_plt:plt(),
 	  start_from     = byte_code    :: start_from(),
@@ -59,6 +61,8 @@
 
 -record(server_state, {parent :: pid(), legal_warnings :: [dial_warn_tag()]}).
 
+-type no_warn_unused()  :: sets:set(mfa()).
+
 %%--------------------------------------------------------------------
 %% Main
 %%--------------------------------------------------------------------
@@ -168,7 +172,7 @@ analysis_start(Parent, Analysis) ->
       throw:{error, _ErrorMsg} = Error -> exit(Error)
     end,
   NewPlt0 = dialyzer_plt:insert_types(Plt, dialyzer_codeserver:get_records(NewCServer)),
-  ExpTypes =  dialyzer_codeserver:get_exported_types(NewCServer),
+  ExpTypes = dialyzer_codeserver:get_exported_types(NewCServer),
   NewPlt1 = dialyzer_plt:insert_exported_types(NewPlt0, ExpTypes),
   State0 = State#analysis_state{plt = NewPlt1},
   dump_callgraph(Callgraph, State0, Analysis),
@@ -423,11 +427,8 @@ abs_get_nowarn(Abs, M) ->
     false ->
       [{M, F, A} || {function, _, F, A, _} <- Abs]; % all functions
     true ->
-      OnLoad =
-	lists:flatten([{M, F, A} || {attribute, _, on_load, {F, A}} <- Abs]),
-      OnLoad ++ [{M, F, A} ||
-		  {nowarn_unused_function, FAs} <- Opts,
-		  {F, A} <- lists:flatten([FAs])]
+      [{M, F, A} || {nowarn_unused_function, FAs} <- Opts,
+                    {F, A} <- lists:flatten([FAs])]
   end.
 
 get_exported_types_from_core(Core) ->
diff --git a/lib/dialyzer/src/dialyzer_behaviours.erl b/lib/dialyzer/src/dialyzer_behaviours.erl
index 2b9a69ce77..1d458b49fc 100644
--- a/lib/dialyzer/src/dialyzer_behaviours.erl
+++ b/lib/dialyzer/src/dialyzer_behaviours.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,15 +40,17 @@
 
 -type behaviour() :: atom().
 
+-type rectab() :: erl_types:type_table().
+
 -record(state, {plt        :: dialyzer_plt:plt(),
 		codeserver :: dialyzer_codeserver:codeserver(),
 		filename   :: file:filename(),
 		behlines   :: [{behaviour(), non_neg_integer()}],
-		records    :: dict()}).
+		records    :: rectab()}).
 
 %%--------------------------------------------------------------------
 
--spec check_callbacks(module(), [{cerl:cerl(), cerl:cerl()}], dict(),
+-spec check_callbacks(module(), [{cerl:cerl(), cerl:cerl()}], rectab(),
 		      dialyzer_plt:plt(),
 		      dialyzer_codeserver:codeserver()) -> [dial_warning()].
 
diff --git a/lib/dialyzer/src/dialyzer_callgraph.erl b/lib/dialyzer/src/dialyzer_callgraph.erl
index b9ad3f857d..00b01fbd36 100644
--- a/lib/dialyzer/src/dialyzer_callgraph.erl
+++ b/lib/dialyzer/src/dialyzer_callgraph.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,7 @@
 	 is_escaping/2,
 	 is_self_rec/2,
 	 non_local_calls/1,
+	 lookup_letrec/2,
 	 lookup_rec_var/2,
 	 lookup_call_site/2,
 	 lookup_label/2,
@@ -63,14 +64,16 @@
          put_named_tables/2, put_public_tables/2, put_behaviour_api_calls/2,
 	 get_behaviour_api_calls/1, dispose_race_server/1, duplicate/1]).
 
--export_type([callgraph/0, mfa_or_funlbl/0, callgraph_edge/0]).
+-export_type([callgraph/0, mfa_or_funlbl/0, callgraph_edge/0, mod_deps/0]).
 
 -include("dialyzer.hrl").
 
 %%----------------------------------------------------------------------
 
 -type scc()	      :: [mfa_or_funlbl()].
--type mfa_calls()     :: [{mfa_or_funlbl(), mfa_or_funlbl()}].
+-type mfa_call()      :: {mfa_or_funlbl(), mfa_or_funlbl()}.
+-type mfa_calls()     :: [mfa_call()].
+-type mod_deps()      :: dict:dict(module(), [module()]).
 
 %%-----------------------------------------------------------------------------
 %% A callgraph is a directed graph where the nodes are functions and a
@@ -81,6 +84,8 @@
 %% 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.
+%% letrec_map	-  A dict mapping from letrec bound labels to function labels.
+%%		   Includes all functions.
 %% 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.
@@ -90,9 +95,10 @@
 %%		   whenever applicable.
 %%-----------------------------------------------------------------------------
 
--record(callgraph, {digraph        = digraph:new() :: digraph(),
+-record(callgraph, {digraph        = digraph:new() :: digraph:graph(),
 		    active_digraph                 :: active_digraph(),
                     esc	                           :: ets:tid(),
+                    letrec_map                     :: ets:tid(),
                     name_map	                   :: ets:tid(),
                     rev_name_map                   :: ets:tid(),
                     rec_var_map                    :: ets:tid(),
@@ -101,7 +107,7 @@
                     race_detection = false         :: boolean(),
 		    race_data_server = new_race_data_server() :: pid()}).
 
--record(race_data_state, {race_code     = dict:new() :: dict(),
+-record(race_data_state, {race_code     = dict:new() :: dict:dict(),
 			  public_tables = []         :: [label()],
 			  named_tables  = []         :: [string()],
 			  beh_api_calls = []         :: [{mfa(), mfa()}]}).
@@ -110,18 +116,19 @@
 
 -type callgraph() :: #callgraph{}.
 
--type active_digraph() :: {'d', digraph()} | {'e', ets:tid(), ets:tid()}.
+-type active_digraph() :: {'d', digraph:graph()} | {'e', ets:tid(), ets:tid()}.
 
 %%----------------------------------------------------------------------
 
 -spec new() -> callgraph().
 
 new() ->
-  [ETSEsc, ETSNameMap, ETSRevNameMap, ETSRecVarMap, ETSSelfRec, ETSCalls] =
+  [ETSEsc, ETSNameMap, ETSRevNameMap, ETSRecVarMap, ETSLetrecMap, 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_rec_var_map, callgraph_letrec_map, callgraph_self_rec, callgraph_calls]],
   #callgraph{esc            = ETSEsc,
+	     letrec_map     = ETSLetrecMap,
 	     name_map       = ETSNameMap,
 	     rev_name_map   = ETSRevNameMap,
 	     rec_var_map    = ETSRecVarMap,
@@ -144,6 +151,12 @@ lookup_rec_var(Label, #callgraph{rec_var_map = RecVarMap})
   when is_integer(Label) ->
   ets_lookup_dict(Label, RecVarMap).
 
+-spec lookup_letrec(label(), callgraph()) -> 'error' | {'ok', label()}.
+
+lookup_letrec(Label, #callgraph{letrec_map = LetrecMap})
+  when is_integer(Label) ->
+  ets_lookup_dict(Label, LetrecMap).
+
 -spec lookup_call_site(label(), callgraph()) -> 'error' | {'ok', [_]}. % XXX: refine
 
 lookup_call_site(Label, #callgraph{calls = Calls})
@@ -211,7 +224,10 @@ non_local_calls(#callgraph{digraph = DG}) ->
   Edges = digraph_edges(DG),
   find_non_local_calls(Edges, sets:new()).
 
--spec find_non_local_calls([{mfa_or_funlbl(), mfa_or_funlbl()}], set()) -> mfa_calls().
+-type call_tab() :: sets:set(mfa_call()).
+
+-spec find_non_local_calls([{mfa_or_funlbl(), mfa_or_funlbl()}], call_tab()) ->
+        mfa_calls().
 
 find_non_local_calls([{{M,_,_}, {M,_,_}}|Left], Set) ->
   find_non_local_calls(Left, Set);
@@ -256,7 +272,7 @@ get_required_by(SCC, #callgraph{active_digraph = {'d', DG}}) ->
 modules(#callgraph{digraph = DG}) ->
   ordsets:from_list([M || {M,_F,_A} <- digraph_vertices(DG)]).
 
--spec module_postorder(callgraph()) -> {[module()], {'d', digraph()}}.
+-spec module_postorder(callgraph()) -> {[module()], {'d', digraph:graph()}}.
 
 module_postorder(#callgraph{digraph = DG}) ->
   Edges = lists:foldl(fun edge_fold/2, sets:new(), digraph_edges(DG)),
@@ -276,7 +292,7 @@ edge_fold(_, Set) -> Set.
 
 
 %% The module deps of a module are modules that depend on the module
--spec module_deps(callgraph()) -> dict().
+-spec module_deps(callgraph()) -> mod_deps().
 
 module_deps(#callgraph{digraph = DG}) ->
   Edges = lists:foldl(fun edge_fold/2, sets:new(), digraph_edges(DG)),
@@ -290,7 +306,7 @@ module_deps(#callgraph{digraph = DG}) ->
   digraph_delete(MDG),
   dict:from_list(Deps).
 
--spec strip_module_deps(dict(), set()) -> dict().
+-spec strip_module_deps(mod_deps(), sets:set(module())) -> mod_deps().
 
 strip_module_deps(ModDeps, StripSet) ->
   FilterFun1 = fun(Val) -> not sets:is_element(Val, StripSet) end,
@@ -348,16 +364,18 @@ ets_lookup_set(Key, Table) ->
 
 scan_core_tree(Tree, #callgraph{calls = ETSCalls,
 				esc = ETSEsc,
+				letrec_map = ETSLetrecMap,
 				name_map = ETSNameMap,
 				rec_var_map = ETSRecVarMap,
 				rev_name_map = ETSRevNameMap,
 				self_rec = ETSSelfRec}) ->
   %% Build name map and recursion variable maps.
-  build_maps(Tree, ETSRecVarMap, ETSNameMap, ETSRevNameMap),
+  build_maps(Tree, ETSRecVarMap, ETSNameMap, ETSRevNameMap, ETSLetrecMap),
 
   %% First find the module-local dependencies.
-  {Deps0, EscapingFuns, Calls} = dialyzer_dep:analyze(Tree),
+  {Deps0, EscapingFuns, Calls, Letrecs} = dialyzer_dep:analyze(Tree),
   true = ets:insert(ETSCalls, dict:to_list(Calls)),
+  true = ets:insert(ETSLetrecMap, dict:to_list(Letrecs)),
   true = ets:insert(ETSEsc, [{E} || E <- EscapingFuns]),
 
   LabelEdges = get_edges_from_deps(Deps0),
@@ -394,7 +412,7 @@ scan_core_tree(Tree, #callgraph{calls = ETSCalls,
   NamedEdges3 = NewNamedEdges1 ++ NewNamedEdges2,
   {Names3, NamedEdges3}.
 
-build_maps(Tree, ETSRecVarMap, ETSNameMap, ETSRevNameMap) ->
+build_maps(Tree, ETSRecVarMap, ETSNameMap, ETSRevNameMap, ETSLetrecMap) ->
   %% We only care about the named (top level) functions. The anonymous
   %% functions will be analysed together with their parents. 
   Defs = cerl:module_defs(Tree),
@@ -406,6 +424,7 @@ build_maps(Tree, ETSRecVarMap, ETSNameMap, ETSRevNameMap) ->
 	MFA = {Mod, FunName, Arity},
 	FunLabel = get_label(Function),
 	VarLabel = get_label(Var),
+	true = ets:insert(ETSLetrecMap, {VarLabel, FunLabel}),
 	true = ets:insert(ETSNameMap, {FunLabel, MFA}),
 	true = ets:insert(ETSRevNameMap, {MFA, FunLabel}),
 	true = ets:insert(ETSRecVarMap, {VarLabel, MFA})
@@ -561,7 +580,7 @@ digraph_reaching_subgraph(Funs, DG) ->
 %% Races
 %%----------------------------------------------------------------------
 
--spec renew_race_info(callgraph(), dict(), [label()], [string()]) ->
+-spec renew_race_info(callgraph(), dict:dict(), [label()], [string()]) ->
         callgraph().
 
 renew_race_info(#callgraph{race_data_server = RaceDataServer} = CG,
@@ -627,7 +646,7 @@ duplicate(#callgraph{race_data_server = RaceDataServer} = Callgraph) ->
 dispose_race_server(#callgraph{race_data_server = RaceDataServer}) ->
   race_data_server_cast(stop, RaceDataServer).
 
--spec get_digraph(callgraph()) -> digraph().
+-spec get_digraph(callgraph()) -> digraph:graph().
 
 get_digraph(#callgraph{digraph = Digraph}) ->
   Digraph.
@@ -642,7 +661,7 @@ get_named_tables(#callgraph{race_data_server = RaceDataServer}) ->
 get_public_tables(#callgraph{race_data_server = RaceDataServer}) ->
   race_data_server_call(get_public_tables, RaceDataServer).
 
--spec get_race_code(callgraph()) -> dict().
+-spec get_race_code(callgraph()) -> dict:dict().
 
 get_race_code(#callgraph{race_data_server = RaceDataServer}) ->
   race_data_server_call(get_race_code, RaceDataServer).
@@ -663,12 +682,12 @@ 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().
+-spec put_digraph(digraph:graph(), callgraph()) -> callgraph().
 
 put_digraph(Digraph, Callgraph) ->
   Callgraph#callgraph{digraph = Digraph}.
 
--spec put_race_code(dict(), callgraph()) -> callgraph().
+-spec put_race_code(dict:dict(), callgraph()) -> callgraph().
 
 put_race_code(RaceCode, #callgraph{race_data_server = RaceDataServer} = CG) ->
   ok = race_data_server_cast({put_race_code, RaceCode}, RaceDataServer),
diff --git a/lib/dialyzer/src/dialyzer_cl.erl b/lib/dialyzer/src/dialyzer_cl.erl
index 365c0b36d4..3e68d64d53 100644
--- a/lib/dialyzer/src/dialyzer_cl.erl
+++ b/lib/dialyzer/src/dialyzer_cl.erl
@@ -2,7 +2,7 @@
 %%-------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,7 @@
 	 external_calls  = []             :: [mfa()],
          external_types  = []             :: [mfa()],
 	 legal_warnings  = ordsets:new()  :: [dial_warn_tag()],
-	 mod_deps        = dict:new()     :: dict(),
+	 mod_deps        = dict:new()     :: dialyzer_callgraph:mod_deps(),
 	 output          = standard_io	  :: io:device(),
 	 output_format   = formatted      :: format(),
 	 filename_opt    = basename       :: fopt(),
@@ -603,7 +603,7 @@ cl_loop(State, LogCache) ->
       Msg = failed_anal_msg(Reason, LogCache),
       cl_error(State, Msg);
     {'EXIT', BackendPid, Reason} when Reason =/= 'normal' ->
-      Msg = failed_anal_msg(io_lib:format("~P", [Reason, 12]), LogCache),
+      Msg = failed_anal_msg(io_lib:format("~p", [Reason]), LogCache),
       cl_error(State, Msg);
     _Other ->
       %% io:format("Received ~p\n", [_Other]),
@@ -613,7 +613,7 @@ cl_loop(State, LogCache) ->
 -spec failed_anal_msg(string(), [_]) -> nonempty_string().
 
 failed_anal_msg(Reason, LogCache) ->
-  Msg = "Analysis failed with error:\n" ++ Reason ++ "\n",
+  Msg = "Analysis failed with error:\n" ++ lists:flatten(Reason) ++ "\n",
   case LogCache =:= [] of
     true -> Msg;
     false ->
@@ -640,7 +640,7 @@ store_unknown_behaviours(#cl_state{unknown_behaviours = Behs} = St, Beh) ->
 -spec cl_error(string()) -> no_return().
 
 cl_error(Msg) ->
-  throw({dialyzer_error, Msg}).
+  throw({dialyzer_error, lists:flatten(Msg)}).
 
 -spec cl_error(#cl_state{}, string()) -> no_return().
 
@@ -650,7 +650,7 @@ cl_error(State, Msg) ->
     Outfile -> io:format(Outfile, "\n~s\n", [Msg])
   end,
   maybe_close_output_file(State),
-  throw({dialyzer_error, Msg}).
+  throw({dialyzer_error, lists:flatten(Msg)}).
 
 return_value(State = #cl_state{erlang_mode = ErlangMode,
 			       mod_deps = ModDeps,
diff --git a/lib/dialyzer/src/dialyzer_cl_parse.erl b/lib/dialyzer/src/dialyzer_cl_parse.erl
index 2ea3d3af5a..db27b2037d 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %%
 %% The 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,7 @@
 -type dial_cl_parse_ret() :: {'check_init', #options{}}
                            | {'plt_info', #options{}}
                            | {'cl', #options{}}
-                           | {{'gui', 'gs' | 'wx'}, #options{}}
+                           | {'gui', #options{}}
                            | {'error', string()}.
 
 -type deep_string() :: string() | [deep_string()].
@@ -193,12 +193,9 @@ cl(["--dump_callgraph", File|T]) ->
   put(dialyzer_callgraph_file, File),
   cl(T);
 cl(["--gui"|T]) ->
-  put(dialyzer_options_mode, {gui, gs}),
+  put(dialyzer_options_mode, gui),
   cl(T);
-cl(["--wx"|T]) ->
-  put(dialyzer_options_mode, {gui, wx}),
-  cl(T);
-cl(["--solver",Solver|T]) -> % not documented
+cl(["--solver", Solver|T]) -> % not documented
   append_var(dialyzer_solvers, [list_to_atom(Solver)]),
   cl(T);
 cl([H|_] = L) ->
@@ -217,7 +214,7 @@ cl([]) ->
 	{plt_info, cl_options()};
       false ->
 	case get(dialyzer_options_mode) of
-	  {gui, _} = GUI -> {GUI, common_options()};
+	  gui -> {gui, common_options()};
 	  cl ->
 	    case get(dialyzer_options_analysis_type) =:= plt_check of
 	      true  -> {check_init, cl_options()};
@@ -361,7 +358,7 @@ help_message() ->
   S = "Usage: dialyzer [--help] [--version] [--shell] [--quiet] [--verbose]
 		[-pa dir]* [--plt plt] [--plts plt*] [-Ddefine]*
                 [-I include_dir]* [--output_plt file] [-Wwarn]*
-                [--src] [--gui | --wx] [files_or_dirs] [-r dirs]
+                [--src] [--gui] [files_or_dirs] [-r dirs]
                 [--apps applications] [-o outfile]
 		[--build_plt] [--add_to_plt] [--remove_from_plt]
 		[--check_plt] [--no_check_plt] [--plt_info] [--get_warnings]
@@ -473,9 +470,7 @@ Options:
   --fullpath
       Display the full path names of files for which warnings are emitted.
   --gui
-      Use the gs-based GUI.
-  --wx
-      Use the wx-based GUI.
+      Use the GUI.
 
 Note:
   * denotes that multiple occurrences of these options are possible.
diff --git a/lib/dialyzer/src/dialyzer_codeserver.erl b/lib/dialyzer/src/dialyzer_codeserver.erl
index 216e06219c..aab3d6add6 100644
--- a/lib/dialyzer/src/dialyzer_codeserver.erl
+++ b/lib/dialyzer/src/dialyzer_codeserver.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,6 +64,12 @@
 -type dict_ets() :: ets:tid().
 -type  set_ets() :: ets:tid().
 
+-type types()         :: erl_types:type_table().
+-type mod_records()   :: dict:dict(module(), types()).
+
+-type contracts()     :: dict:dict(mfa(),dialyzer_contracts:file_contract()).
+-type mod_contracts() :: dict:dict(module(), contracts()).
+
 -record(codeserver, {next_core_label = 0 :: label(),
 		     code		 :: dict_ets(),
                      exported_types      :: set_ets(), % set(mfa())
@@ -160,12 +166,12 @@ insert(Mod, ModCode, CS) ->
   true = ets:insert(CS#codeserver.code, [ModEntry|Funs]),
   CS.
 
--spec get_temp_exported_types(codeserver()) -> set().
+-spec get_temp_exported_types(codeserver()) -> sets:set(mfa()).
 
 get_temp_exported_types(#codeserver{temp_exported_types = TempExpTypes}) ->
   ets_set_to_set(TempExpTypes).
 
--spec insert_temp_exported_types(set(), codeserver()) -> codeserver().
+-spec insert_temp_exported_types(sets:set(mfa()), codeserver()) -> codeserver().
 
 insert_temp_exported_types(Set, CS) ->
   TempExportedTypes = CS#codeserver.temp_exported_types,
@@ -183,17 +189,17 @@ insert_exports(List, #codeserver{exports = Exports} = CS) ->
 is_exported(MFA, #codeserver{exports = Exports}) ->
   ets_set_is_element(MFA, Exports).
 
--spec get_exported_types(codeserver()) -> set(). % set(mfa())
+-spec get_exported_types(codeserver()) -> sets:set(mfa()).
 
 get_exported_types(#codeserver{exported_types = ExpTypes}) ->
   ets_set_to_set(ExpTypes).
 
--spec get_exports(codeserver()) -> set().  % set(mfa())
+-spec get_exports(codeserver()) -> sets:set(mfa()).
 
 get_exports(#codeserver{exports = Exports}) ->
   ets_set_to_set(Exports).
 
--spec finalize_exported_types(set(), codeserver()) -> codeserver().
+-spec finalize_exported_types(sets:set(mfa()), codeserver()) -> codeserver().
 
 finalize_exported_types(Set, CS) ->
   ExportedTypes = ets_read_concurrent_table(dialyzer_codeserver_exported_types),
@@ -222,7 +228,7 @@ get_next_core_label(#codeserver{next_core_label = NCL}) ->
 set_next_core_label(NCL, CS) ->
   CS#codeserver{next_core_label = NCL}.
 
--spec lookup_mod_records(atom(), codeserver()) -> dict().
+-spec lookup_mod_records(atom(), codeserver()) -> types().
 
 lookup_mod_records(Mod, #codeserver{records = RecDict}) when is_atom(Mod) ->
   case ets_dict_find(Mod, RecDict) of
@@ -230,12 +236,12 @@ lookup_mod_records(Mod, #codeserver{records = RecDict}) when is_atom(Mod) ->
     {ok, Dict} -> Dict
   end.
 
--spec get_records(codeserver()) -> dict().
+-spec get_records(codeserver()) -> mod_records().
 
 get_records(#codeserver{records = RecDict}) ->
   ets_dict_to_dict(RecDict).
 
--spec store_temp_records(atom(), dict(), codeserver()) -> codeserver().
+-spec store_temp_records(module(), types(), codeserver()) -> codeserver().
 
 store_temp_records(Mod, Dict, #codeserver{temp_records = TempRecDict} = CS)
   when is_atom(Mod) ->
@@ -244,12 +250,12 @@ store_temp_records(Mod, Dict, #codeserver{temp_records = TempRecDict} = CS)
     false -> CS#codeserver{temp_records = ets_dict_store(Mod, Dict, TempRecDict)}
   end.
 
--spec get_temp_records(codeserver()) -> dict().
+-spec get_temp_records(codeserver()) -> mod_records().
 
 get_temp_records(#codeserver{temp_records = TempRecDict}) ->
   ets_dict_to_dict(TempRecDict).
 
--spec set_temp_records(dict(), codeserver()) -> codeserver().
+-spec set_temp_records(mod_records(), codeserver()) -> codeserver().
 
 set_temp_records(Dict, CS) ->
   true = ets:delete(CS#codeserver.temp_records),
@@ -257,7 +263,7 @@ set_temp_records(Dict, CS) ->
   true = ets_dict_store_dict(Dict, TempRecords),
   CS#codeserver{temp_records = TempRecords}.
 
--spec finalize_records(dict(), codeserver()) -> codeserver().
+-spec finalize_records(mod_records(), codeserver()) -> codeserver().
 
 finalize_records(Dict, CS) ->
   true = ets:delete(CS#codeserver.temp_records),
@@ -265,7 +271,7 @@ finalize_records(Dict, CS) ->
   true = ets_dict_store_dict(Dict, Records),
   CS#codeserver{records = Records, temp_records = clean}.
 
--spec lookup_mod_contracts(atom(), codeserver()) -> dict().
+-spec lookup_mod_contracts(atom(), codeserver()) -> contracts().
 
 lookup_mod_contracts(Mod, #codeserver{contracts = ContDict})
   when is_atom(Mod) ->
@@ -284,7 +290,7 @@ get_contract_pair(Key, ContDict) ->
 lookup_mfa_contract(MFA, #codeserver{contracts = ContDict}) ->
   ets_dict_find(MFA, ContDict).
 
--spec get_contracts(codeserver()) -> dict().
+-spec get_contracts(codeserver()) -> mod_contracts().
 
 get_contracts(#codeserver{contracts = ContDict}) ->
   ets_dict_to_dict(ContDict).
@@ -294,7 +300,7 @@ get_contracts(#codeserver{contracts = ContDict}) ->
 get_callbacks(#codeserver{callbacks = CallbDict}) ->
   ets:tab2list(CallbDict).
 
--spec store_temp_contracts(atom(), dict(), dict(), codeserver()) ->
+-spec store_temp_contracts(module(), contracts(), contracts(), codeserver()) ->
 	 codeserver().
 
 store_temp_contracts(Mod, SpecDict, CallbackDict,
@@ -313,13 +319,14 @@ store_temp_contracts(Mod, SpecDict, CallbackDict,
       CS1#codeserver{temp_callbacks = ets_dict_store(Mod, CallbackDict, Cb)}
   end.
 
--spec get_temp_contracts(codeserver()) -> {dict(), dict()}.
+-spec get_temp_contracts(codeserver()) -> {mod_contracts(), mod_contracts()}.
 
 get_temp_contracts(#codeserver{temp_contracts = TempContDict,
 			       temp_callbacks = TempCallDict}) ->
   {ets_dict_to_dict(TempContDict), ets_dict_to_dict(TempCallDict)}.
 
--spec finalize_contracts(dict(), dict(), codeserver()) -> codeserver().
+-spec finalize_contracts(mod_contracts(), mod_contracts(), codeserver()) ->
+                           codeserver().
 
 finalize_contracts(SpecDict, CallbackDict, CS)  ->
   Contracts = ets_read_concurrent_table(dialyzer_codeserver_contracts),
diff --git a/lib/dialyzer/src/dialyzer_contracts.erl b/lib/dialyzer/src/dialyzer_contracts.erl
index 332a326b0d..46eaeaa303 100644
--- a/lib/dialyzer/src/dialyzer_contracts.erl
+++ b/lib/dialyzer/src/dialyzer_contracts.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %%
 %% The 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,10 +21,10 @@
 -module(dialyzer_contracts).
 
 -export([check_contract/2,
-	 check_contracts/3,
+	 check_contracts/4,
 	 contracts_without_fun/3,
 	 contract_to_string/1,
-	 get_invalid_contract_warnings/3,
+	 get_invalid_contract_warnings/4,
 	 get_contract_args/1,
 	 get_contract_return/1,
 	 get_contract_return/2,
@@ -52,7 +52,7 @@
 %% to expand records and/or remote types that they might contain.
 %%-----------------------------------------------------------------------
 
--type tmp_contract_fun() :: fun((set(), dict()) -> contract_pair()).
+-type tmp_contract_fun() :: fun((sets:set(mfa()), types()) -> contract_pair()).
 
 -record(tmp_contract, {contract_funs = [] :: [tmp_contract_fun()],
 		       forms	     = [] :: [{_, _}]}).
@@ -160,17 +160,24 @@ process_contract_remote_types(CodeServer) ->
   dialyzer_codeserver:finalize_contracts(NewContractDict, NewCallbackDict,
 					 CodeServer).
 
+-type opaques() :: [erl_types:erl_type()] | 'universe'.
+-type opaques_fun() :: fun((module()) -> opaques()).
+
+-type fun_types() :: dict:dict(label(), erl_types:type_table()).
+
 -spec check_contracts([{mfa(), file_contract()}],
-		      dialyzer_callgraph:callgraph(), dict()) -> plt_contracts().
+		      dialyzer_callgraph:callgraph(), fun_types(),
+                      opaques_fun()) -> plt_contracts().
 
-check_contracts(Contracts, Callgraph, FunTypes) ->
+check_contracts(Contracts, Callgraph, FunTypes, FindOpaques) ->
   FoldFun =
     fun(Label, Type, NewContracts) ->
 	case dialyzer_callgraph:lookup_name(Label, Callgraph) of
 	  {ok, {M,F,A} = MFA} ->
 	    case orddict:find(MFA, Contracts) of
 	      {ok, {_FileLine, Contract}} ->
-		case check_contract(Contract, Type) of
+                Opaques = FindOpaques(M),
+		case check_contract(Contract, Type, Opaques) of
 		  ok ->
 		    case erl_bif_types:is_known(M, F, A) of
 		      true ->
@@ -192,7 +199,10 @@ check_contracts(Contracts, Callgraph, FunTypes) ->
 %% Checks all components of a contract
 -spec check_contract(#contract{}, erl_types:erl_type()) -> 'ok' | {'error', term()}.
 
-check_contract(#contract{contracts = Contracts}, SuccType) ->
+check_contract(Contract, SuccType) ->
+  check_contract(Contract, SuccType, 'universe').
+
+check_contract(#contract{contracts = Contracts}, SuccType, Opaques) ->
   try
     Contracts1 = [{Contract, insert_constraints(Constraints, dict:new())}
 		  || {Contract, Constraints} <- Contracts],
@@ -203,9 +213,9 @@ check_contract(#contract{contracts = Contracts}, SuccType) ->
       error ->
 	{error, {overlapping_contract, []}};
       ok ->
-	InfList = [erl_types:t_inf(Contract, SuccType, opaque)
+	InfList = [erl_types:t_inf(Contract, SuccType, Opaques)
 		   || Contract <- Contracts2],
-	case check_contract_inf_list(InfList, SuccType) of
+	case check_contract_inf_list(InfList, SuccType, Opaques) of
 	  {error, _} = Invalid -> Invalid;
 	  ok -> check_extraneous(Contracts2, SuccType)
 	end
@@ -217,7 +227,7 @@ check_contract(#contract{contracts = Contracts}, SuccType) ->
 check_domains([_]) -> ok;
 check_domains([Dom|Doms]) ->
   Fun = fun(D) ->
-	    erl_types:any_none_or_unit(erl_types:t_inf_lists(Dom, D, opaque))
+	    erl_types:any_none_or_unit(erl_types:t_inf_lists(Dom, D))
 	end,
   case lists:all(Fun, Doms) of
     true -> check_domains(Doms);
@@ -227,23 +237,23 @@ check_domains([Dom|Doms]) ->
 %% Allow a contract if one of the overloaded contracts is possible.
 %% We used to be more strict, e.g., all overloaded contracts had to be
 %% possible.
-check_contract_inf_list([FunType|Left], SuccType) ->
+check_contract_inf_list([FunType|Left], SuccType, Opaques) ->
   FunArgs = erl_types:t_fun_args(FunType),
   case lists:any(fun erl_types:t_is_none_or_unit/1, FunArgs) of
-    true -> check_contract_inf_list(Left, SuccType);
+    true -> check_contract_inf_list(Left, SuccType, Opaques);
     false ->
       STRange = erl_types:t_fun_range(SuccType),
       case erl_types:t_is_none_or_unit(STRange) of
 	true -> ok;
 	false ->
 	  Range = erl_types:t_fun_range(FunType),
-	  case erl_types:t_is_none(erl_types:t_inf(STRange, Range, opaque)) of
-	    true -> check_contract_inf_list(Left, SuccType);
+	  case erl_types:t_is_none(erl_types:t_inf(STRange, Range)) of
+	    true -> check_contract_inf_list(Left, SuccType, Opaques);
 	    false -> ok
 	  end
       end
   end;
-check_contract_inf_list([], _SuccType) ->
+check_contract_inf_list([], _SuccType, _Opaques) ->
   {error, invalid_contract}.
 
 check_extraneous([], _SuccType) -> ok;
@@ -259,7 +269,7 @@ check_extraneous_1(Contract, SuccType) ->
   STRng = erl_types:t_fun_range(SuccType),
   ?debug("CR = ~p\nSR = ~p\n", [CRngs, STRng]),
   case [CR || CR <- CRngs,
-              erl_types:t_is_none(erl_types:t_inf(CR, STRng, opaque))] of
+              erl_types:t_is_none(erl_types:t_inf(CR, STRng))] of
     [] ->
       CRngList = list_part(CRng),
       STRngList = list_part(STRng),
@@ -268,7 +278,7 @@ check_extraneous_1(Contract, SuccType) ->
         true ->
           CRngElements = erl_types:t_list_elements(CRngList),
           STRngElements = erl_types:t_list_elements(STRngList),
-          Inf = erl_types:t_inf(CRngElements, STRngElements, opaque),
+          Inf = erl_types:t_inf(CRngElements, STRngElements),
           case erl_types:t_is_none(Inf) of
             true -> {error, invalid_contract};
             false -> ok
@@ -278,13 +288,14 @@ check_extraneous_1(Contract, SuccType) ->
   end.
 
 list_part(Type) ->
-  erl_types:t_inf(erl_types:t_list(), Type, opaque).
+  erl_types:t_inf(erl_types:t_list(), Type).
 
 is_not_nil_list(Type) ->
   erl_types:t_is_list(Type) andalso not erl_types:t_is_nil(Type).
 
 %% This is the heart of the "range function"
--spec process_contracts([contract_pair()], [erl_types:erl_type()]) -> erl_types:erl_type().
+-spec process_contracts([contract_pair()], [erl_types:erl_type()]) ->
+                           erl_types:erl_type().
 
 process_contracts(OverContracts, Args) ->
   process_contracts(OverContracts, Args, erl_types:t_none()).
@@ -299,7 +310,8 @@ process_contracts([OverContract|Left], Args, AccRange) ->
 process_contracts([], _Args, AccRange) ->
   AccRange.
 
--spec process_contract(contract_pair(), [erl_types:erl_type()]) -> 'error' | {'ok', erl_types:erl_type()}.
+-spec process_contract(contract_pair(), [erl_types:erl_type()]) ->
+                          'error' | {'ok', erl_types:erl_type()}.
 
 process_contract({Contract, Constraints}, CallTypes0) ->
   CallTypesFun = erl_types:t_fun(CallTypes0, erl_types:t_any()),
@@ -335,8 +347,11 @@ solve_constraints(Contract, Call, Constraints) ->
   %%  ?debug("Inf: ~s\n", [erl_types:t_to_string(Inf)]),
   %%  erl_types:t_assign_variables_to_subtype(Contract, Inf).
 
+-type contracts() :: dict:dict(mfa(),dialyzer_contracts:file_contract()).
+
 %% Checks the contracts for functions that are not implemented
--spec contracts_without_fun(dict(), [_], dialyzer_callgraph:callgraph()) -> [dial_warning()].
+-spec contracts_without_fun(contracts(), [_], dialyzer_callgraph:callgraph()) ->
+        [dial_warning()].
 
 contracts_without_fun(Contracts, AllFuns0, Callgraph) ->
   AllFuns1 = [{dialyzer_callgraph:lookup_name(Label, Callgraph), Arity}
@@ -369,12 +384,15 @@ insert_constraints([{subtype, Type1, Type2}|Left], Dict) ->
   end;
 insert_constraints([], Dict) -> Dict.
 
--spec store_tmp_contract(mfa(), file_line(), [_], dict(), dict()) -> dict().
+-type types() :: erl_types:type_table().
+
+-spec store_tmp_contract(mfa(), file_line(), [_], contracts(), types()) ->
+        contracts().
 
 store_tmp_contract(MFA, FileLine, TypeSpec, SpecDict, RecordsDict) ->
   %% io:format("contract from form: ~p\n", [TypeSpec]),
   TmpContract = contract_from_form(TypeSpec, RecordsDict, FileLine),
-  %% io:format("contract: ~p\n", [Contract]),
+  %% io:format("contract: ~p\n", [TmpContract]),
   dict:store(MFA, {FileLine, TmpContract}, SpecDict).
 
 contract_from_form(Forms, RecDict, FileLine) ->
@@ -396,7 +414,8 @@ contract_from_form([{type, _, 'fun', [_, _]} = Form | Left], RecDict,
 	      throw({error, NewMsg})
 	  end,
 	NewType = erl_types:t_solve_remote(Type, ExpTypes, AllRecords),
-	{NewType, []}
+        NewTypeNoVars = erl_types:subst_all_vars_to_any(NewType),
+	{NewTypeNoVars, []}
     end,
   NewTypeAcc = [TypeFun | TypeAcc],
   NewFormAcc = [{Form, []} | FormAcc],
@@ -410,7 +429,8 @@ contract_from_form([{type, _L1, bounded_fun,
 	  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}
+        NewTypeNoVars = erl_types:subst_all_vars_to_any(NewType),
+	{NewTypeNoVars, Constr1}
     end,
   NewTypeAcc = [TypeFun | TypeAcc],
   NewFormAcc = [{Form, Constr} | FormAcc],
@@ -494,30 +514,35 @@ general_domain([], AccSig) ->
   AccSig1 = erl_types:subst_all_vars_to_any(AccSig),
   erl_types:t_fun_args(AccSig1).
 
--spec get_invalid_contract_warnings([module()], dialyzer_codeserver:codeserver(), dialyzer_plt:plt()) -> [dial_warning()].
+-spec get_invalid_contract_warnings([module()],
+                                    dialyzer_codeserver:codeserver(),
+                                    dialyzer_plt:plt(),
+                                    opaques_fun()) -> [dial_warning()].
 
-get_invalid_contract_warnings(Modules, CodeServer, Plt) ->
-  get_invalid_contract_warnings_modules(Modules, CodeServer, Plt, []).
+get_invalid_contract_warnings(Modules, CodeServer, Plt, FindOpaques) ->
+  get_invalid_contract_warnings_modules(Modules, CodeServer, Plt, FindOpaques, []).
 
-get_invalid_contract_warnings_modules([Mod|Mods], CodeServer, Plt, Acc) ->
+get_invalid_contract_warnings_modules([Mod|Mods], CodeServer, Plt, FindOpaques, Acc) ->
   Contracts1 = dialyzer_codeserver:lookup_mod_contracts(Mod, CodeServer),
   Contracts2 = dict:to_list(Contracts1),
   Records = dialyzer_codeserver:lookup_mod_records(Mod, CodeServer),
-  NewAcc = get_invalid_contract_warnings_funs(Contracts2, Plt, Records, Acc),
-  get_invalid_contract_warnings_modules(Mods, CodeServer, Plt, NewAcc);
-get_invalid_contract_warnings_modules([], _CodeServer, _Plt, Acc) ->
+  NewAcc = get_invalid_contract_warnings_funs(Contracts2, Plt, Records, FindOpaques, Acc),
+  get_invalid_contract_warnings_modules(Mods, CodeServer, Plt, FindOpaques, NewAcc);
+get_invalid_contract_warnings_modules([], _CodeServer, _Plt, _FindOpaques, Acc) ->
   Acc.
 
 get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract}}|Left],
-				   Plt, RecDict, Acc) ->
+				   Plt, RecDict, FindOpaques, Acc) ->
   case dialyzer_plt:lookup(Plt, MFA) of
     none ->
       %% This must be a contract for a non-available function. Just accept it.
-      get_invalid_contract_warnings_funs(Left, Plt, RecDict, Acc);
+      get_invalid_contract_warnings_funs(Left, Plt, RecDict, FindOpaques, Acc);
     {value, {Ret, Args}} ->
       Sig = erl_types:t_fun(Args, Ret),
+      {M, _F, _A} = MFA,
+      Opaques = FindOpaques(M),
       NewAcc =
-	case check_contract(Contract, Sig) of
+	case check_contract(Contract, Sig, Opaques) of
 	  {error, invalid_contract} ->
 	    [invalid_contract_warning(MFA, FileLine, Sig, RecDict)|Acc];
 	  {error, {overlapping_contract, []}} ->
@@ -551,7 +576,7 @@ get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract}}|Left],
 		BifArgs = erl_bif_types:arg_types(M, F, A),
 		BifRet = erl_bif_types:type(M, F, A),
 		BifSig = erl_types:t_fun(BifArgs, BifRet),
-		case check_contract(Contract, BifSig) of
+		case check_contract(Contract, BifSig, Opaques) of
 		  {error, _} ->
 		    [invalid_contract_warning(MFA, FileLine, BifSig, RecDict)
 		     |Acc];
@@ -564,9 +589,9 @@ get_invalid_contract_warnings_funs([{MFA, {FileLine, Contract}}|Left],
 				     RecDict, Acc)
 	    end
 	end,
-      get_invalid_contract_warnings_funs(Left, Plt, RecDict, NewAcc)
+      get_invalid_contract_warnings_funs(Left, Plt, RecDict, FindOpaques, NewAcc)
   end;
-get_invalid_contract_warnings_funs([], _Plt, _RecDict, Acc) ->
+get_invalid_contract_warnings_funs([], _Plt, _RecDict, _FindOpaques, Acc) ->
   Acc.
 
 invalid_contract_warning({M, F, A}, FileLine, SuccType, RecDict) ->
@@ -601,16 +626,23 @@ picky_contract_check(CSig0, Sig0, MFA, FileLine, Contract, RecDict, Acc) ->
   end.
 
 extra_contract_warning({M, F, A}, FileLine, Contract, CSig, Sig, RecDict) ->
-  SigString = lists:flatten(dialyzer_utils:format_sig(Sig, RecDict)),
-  ContractString0 = lists:flatten(dialyzer_utils:format_sig(CSig, RecDict)),
+  %% We do not want to depend upon erl_types:t_to_string() possibly
+  %% hiding the contents of opaque types.
+  SigUnopaque = erl_types:t_unopaque(Sig),
+  CSigUnopaque = erl_types:t_unopaque(CSig),
+  SigString0 =
+    lists:flatten(dialyzer_utils:format_sig(SigUnopaque, RecDict)),
+  ContractString0 =
+    lists:flatten(dialyzer_utils:format_sig(CSigUnopaque, RecDict)),
   %% The only difference is in record fields containing 'undefined' or not.
-  IsUndefRecordFieldsRelated = SigString =:= ContractString0,
+  IsUndefRecordFieldsRelated = SigString0 =:= ContractString0,
   {IsRemoteTypesRelated, SubtypeRelation} =
     is_remote_types_related(Contract, CSig, Sig, RecDict),
   case IsUndefRecordFieldsRelated orelse IsRemoteTypesRelated of
     true ->
       no_warning;
     false ->
+      SigString = lists:flatten(dialyzer_utils:format_sig(Sig, RecDict)),
       ContractString = contract_to_string(Contract),
       {Tag, Msg} =
 	case SubtypeRelation of
diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index 6956850f1a..692684cd99 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -2,7 +2,7 @@
 %%--------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -41,27 +41,37 @@
 
 -include("dialyzer.hrl").
 
+%%-import(helper, %% 'helper' could be any module doing sanity checks...
 -import(erl_types,
-	[any_none/1, t_any/0, t_atom/0, t_atom/1, t_atom_vals/1,
+        [t_inf/2, t_inf/3, t_inf_lists/2, t_inf_lists/3,
+         t_inf_lists/3, t_is_equal/2, t_is_subtype/2, t_subtract/2,
+         t_sup/1, t_sup/2]).
+
+-import(erl_types,
+	[any_none/1, t_any/0, t_atom/0, t_atom/1, t_atom_vals/1, t_atom_vals/2,
 	 t_binary/0, t_boolean/0,
 	 t_bitstr/0, t_bitstr/2, t_bitstr_concat/1, t_bitstr_match/2,
-	 t_cons/0, t_cons/2, t_cons_hd/1, t_cons_tl/1, t_contains_opaque/1,
+	 t_cons/0, t_cons/2, t_cons_hd/2, t_cons_tl/2,
+         t_contains_opaque/2,
 	 t_find_opaque_mismatch/2, t_float/0, t_from_range/2, t_from_term/1,
-	 t_fun/0, t_fun/2, t_fun_args/1, t_fun_range/1,
-	 t_inf/2, t_inf/3, t_inf_lists/2, t_inf_lists/3, t_inf_lists_masked/3,
-	 t_integer/0, t_integers/1,
-	 t_is_any/1, t_is_atom/1, t_is_atom/2, t_is_boolean/1, t_is_equal/2,
-	 t_is_integer/1, t_is_nil/1, t_is_none/1, t_is_none_or_unit/1,
-	 t_is_number/1, t_is_reference/1, t_is_pid/1, t_is_port/1,
-	 t_is_subtype/2, t_is_unit/1,
-	 t_limit/2, t_list/0, t_maybe_improper_list/0, t_module/0,
-	 t_none/0, t_non_neg_integer/0, t_number/0, t_number_vals/1,
-	 t_opaque_match_atom/2, t_opaque_match_record/2,
-	 t_opaque_matching_structure/2,
+	 t_fun/0, t_fun/2, t_fun_args/1, t_fun_args/2, t_fun_range/1,
+	 t_fun_range/2, t_integer/0, t_integers/1,
+	 t_is_any/1, t_is_atom/1, t_is_atom/2, t_is_any_atom/3,
+         t_is_boolean/2,
+	 t_is_integer/2, t_is_list/1,
+	 t_is_nil/2, t_is_none/1, t_is_none_or_unit/1,
+	 t_is_number/2, t_is_reference/2, t_is_pid/2, t_is_port/2,
+         t_is_unit/1,
+	 t_limit/2, t_list/0, t_list_elements/2,
+	 t_maybe_improper_list/0, t_module/0,
+	 t_none/0, t_non_neg_integer/0, t_number/0, t_number_vals/2,
 	 t_pid/0, t_port/0, t_product/1, t_reference/0,
-	 t_sup/1, t_sup/2, t_subtract/2, t_to_string/2, t_to_tlist/1,
-	 t_tuple/0, t_tuple/1, t_tuple_args/1, t_tuple_subtypes/1,
-	 t_unit/0, t_unopaque/1]).
+         t_to_string/2, t_to_tlist/1,
+	 t_tuple/0, t_tuple/1, t_tuple_args/1, t_tuple_args/2,
+         t_tuple_subtypes/2,
+	 t_unit/0, t_unopaque/2,
+	 t_map/1
+     ]).
 
 %%-define(DEBUG, true).
 %%-define(DEBUG_PP, true).
@@ -76,39 +86,53 @@
 
 %%--------------------------------------------------------------------
 
+-type type()      :: erl_types:erl_type().
+-type types()     :: erl_types:type_table().
+
 -define(no_arg, no_arg).
 
 -define(TYPE_LIMIT, 3).
 
 -record(state, {callgraph            :: dialyzer_callgraph:callgraph(),
-		envs                 :: dict(),
-		fun_tab		     :: dict(),
+		envs                 :: env_tab(),
+		fun_tab		     :: fun_tab(),
 		plt		     :: dialyzer_plt:plt(),
-		opaques              :: [erl_types:erl_type()],
+		opaques              :: [type()],
 		races = dialyzer_races:new() :: dialyzer_races:races(),
-		records = dict:new() :: dict(),
-		tree_map	     :: dict(),
+		records = dict:new() :: types(),
+		tree_map	     :: dict:dict(label(), cerl:cerl()),
 		warning_mode = false :: boolean(),
 		warnings = []        :: [dial_warning()],
-		work                 :: {[_], [_], set()},
+		work                 :: {[_], [_], sets:set()},
 		module               :: module()
                }).
 
--record(map, {dict = dict:new()   :: dict(),
-              subst = dict:new()  :: dict(),
+-record(map, {dict = dict:new()   :: type_tab(),
+              subst = dict:new()  :: subst_tab(),
               modified = []       :: [Key :: term()],
               modified_stack = [] :: [{[Key :: term()],reference()}],
               ref = undefined     :: reference() | undefined}).
 
+-type nowarn()    :: dialyzer_analysis_callgraph:no_warn_unused().
+-type env_tab()   :: dict:dict(label(), #map{}).
+-type fun_entry() :: {Args :: [type()], RetType :: type()}.
+-type fun_tab()   :: dict:dict('top' | label(),
+                             {'not_handled', fun_entry()} | fun_entry()).
+-type key()       :: label() | cerl:cerl().
+-type type_tab()  :: dict:dict(key(), type()).
+-type subst_tab() :: dict:dict(key(), cerl:cerl()).
+
 %% Exported Types
 
 -opaque state() :: #state{}.
 
 %%--------------------------------------------------------------------
 
+-type fun_types() :: dict:dict(label(), type()).
+
 -spec get_warnings(cerl:c_module(), dialyzer_plt:plt(),
-                   dialyzer_callgraph:callgraph(), dict(), set()) ->
-	{[dial_warning()], dict()}.
+                   dialyzer_callgraph:callgraph(), types(), nowarn()) ->
+	{[dial_warning()], fun_types()}.
 
 get_warnings(Tree, Plt, Callgraph, Records, NoWarnUnused) ->
   State1 = analyze_module(Tree, Plt, Callgraph, Records, true),
@@ -119,7 +143,8 @@ get_warnings(Tree, Plt, Callgraph, Records, NoWarnUnused) ->
   {State4#state.warnings, state__all_fun_types(State4)}.
 
 -spec get_fun_types(cerl:c_module(), dialyzer_plt:plt(),
-                    dialyzer_callgraph:callgraph(), dict()) -> dict().
+                    dialyzer_callgraph:callgraph(),
+                    types()) -> fun_types().
 
 get_fun_types(Tree, Plt, Callgraph, Records) ->
   State = analyze_module(Tree, Plt, Callgraph, Records, false),
@@ -204,7 +229,7 @@ analyze_loop(State) ->
 
 traverse(Tree, Map, State) ->
   ?debug("Handling ~p\n", [cerl:type(Tree)]),
-  %%debug_pp_map(Map),
+  %% debug_pp_map(Map),
   case cerl:type(Tree) of
     alias ->
       %% This only happens when checking for illegal record patterns
@@ -256,12 +281,7 @@ traverse(Tree, Map, State) ->
       case cerl:unfold_literal(Tree) of
 	Tree ->
 	  Type = literal_type(Tree),
-	  NewType =
-	    case erl_types:t_opaque_match_atom(Type, State#state.opaques) of
-	      [Opaque] -> Opaque;
-	      _ -> Type
-	    end,
-	  {State, Map, NewType};
+	  {State, Map, Type};
 	NewTree -> traverse(NewTree, Map, State)
       end;
     module ->
@@ -286,8 +306,12 @@ traverse(Tree, Map, State) ->
 	  SMA;
 	false ->
 	  State2 =
-	    case (t_is_any(ArgType) orelse t_is_simple(ArgType)
-		                    orelse is_call_to_send(Arg)) of
+	    case
+              t_is_any(ArgType)
+              orelse t_is_simple(ArgType, State)
+              orelse is_call_to_send(Arg)
+	      orelse is_lc_simple_list(Arg, ArgType, State)
+            of
 	      true -> % do not warn in these cases
 		State1;
 	      false ->
@@ -301,6 +325,10 @@ traverse(Tree, Map, State) ->
       handle_try(Tree, Map, State);
     tuple ->
       handle_tuple(Tree, Map, State);
+    map ->
+      handle_map(Tree, Map, State);
+    map_pair ->
+      handle_map_pair(Tree, Map, State);
     values ->
       Elements = cerl:values_es(Tree),
       {State1, Map1, EsType} = traverse_list(Elements, Map, State),
@@ -308,18 +336,10 @@ traverse(Tree, Map, State) ->
       {State1, Map1, Type};
     var ->
       ?debug("Looking up unknown variable: ~p\n", [Tree]),
-      case state__lookup_type_for_rec_var(Tree, State) of
+      case state__lookup_type_for_letrec(Tree, State) of
 	error ->
 	  LType = lookup_type(Tree, Map),
-	  Opaques = State#state.opaques,
-	  case t_opaque_match_record(LType, Opaques) of
-	    [Opaque] -> {State, Map, Opaque};
-	    _ ->
-	      case t_opaque_match_atom(LType, Opaques) of
-		[Opaque] -> {State, Map, Opaque};
-		_ -> {State, Map, LType}
-	      end
-	  end;
+          {State, Map, LType};
 	{ok, Type} -> {State, Map, Type}
       end;
     Other ->
@@ -367,7 +387,8 @@ handle_apply(Tree, Map, State) ->
 					  Tree, Msg),
 	      {State3, Map2, t_none()};
 	    false ->
-	      NewArgs = t_inf_lists(ArgTypes, t_fun_args(OpType1)),
+	      NewArgs = t_inf_lists(ArgTypes,
+                                    t_fun_args(OpType1, 'universe')),
 	      case any_none(NewArgs) of
 		true ->
 		  Msg = {fun_app_args,
@@ -378,7 +399,7 @@ handle_apply(Tree, Map, State) ->
 		  {State3, enter_type(Op, OpType1, Map2), t_none()};
 		false ->
 		  Map3 = enter_type_lists(Args, NewArgs, Map2),
-		  Range0 = t_fun_range(OpType1),
+		  Range0 = t_fun_range(OpType1, 'universe'),
 		  Range =
 		    case t_is_unit(Range0) of
 		      true  -> t_none();
@@ -423,83 +444,55 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
 	{M, F, A} = Fun,
 	case erl_bif_types:is_known(M, F, A) of
 	  true ->
-	    IsBIF = true,
 	    BArgs = erl_bif_types:arg_types(M, F, A),
 	    BRange =
 	      fun(FunArgs) ->
-		  ArgPos = erl_bif_types:structure_inspecting_args(M, F, A),
-		  NewFunArgs =
-		    case ArgPos =:= [] of
-		      true -> FunArgs;
-		      false -> % some positions need to be un-opaqued
-			N = length(FunArgs),
-			PFs = lists:zip(lists:seq(1, N), FunArgs),
-			[case ordsets:is_element(P, ArgPos) of
-			   true  -> erl_types:t_unopaque(FArg, Opaques);
-			   false -> FArg
-			 end || {P, FArg} <- PFs]
-		    end,
-		  erl_bif_types:type(M, F, A, NewFunArgs)
+		  erl_bif_types:type(M, F, A, FunArgs, Opaques)
 	      end,
 	    {BArgs, BRange};
-	  false -> IsBIF = false, GenSig
+          false ->
+            GenSig
 	end;
-      local -> IsBIF = false, GenSig
+      local -> GenSig
     end,
   {SigArgs, SigRange} =
-    %% if there is hard-coded or contract information with opaque types,
-    %% the checking for possible type violations needs to take place w.r.t.
-    %% this information and not w.r.t. the structure-based success typing.
-    case prefer_opaque_types(CArgs, BifArgs) of
-      true -> {AnyArgs, t_any()}; % effectively forgets the success typing
-      false ->
-	case Sig of
-	  {value, {SR, SA}} -> {SA, SR};
-	  none -> {AnyArgs, t_any()}
-	end
+    case Sig of
+      {value, {SR, SA}} -> {SA, SR};
+      none -> {AnyArgs, t_any()}
     end,
-  ArgModeMask = [case lists:member(Arg, Opaques) of
-                   true -> opaque;
-                   false -> structured
-                 end || Arg <- ArgTypes],
-  NewArgsSig = t_inf_lists_masked(SigArgs, ArgTypes, ArgModeMask),
-  NewArgsContract = t_inf_lists_masked(CArgs, ArgTypes, ArgModeMask),
-  NewArgsBif = t_inf_lists_masked(BifArgs, ArgTypes, ArgModeMask),
-  NewArgTypes0 = t_inf_lists_masked(NewArgsSig, NewArgsContract, ArgModeMask),
-  NewArgTypes = t_inf_lists_masked(NewArgTypes0, NewArgsBif, ArgModeMask),
-  BifRet = BifRange(NewArgTypes),
-  {TmpArgTypes, TmpArgsContract} =
-    case (TypeOfApply =:= remote) andalso (not IsBIF) of
-      true ->
-	List1 = lists:zip(CArgs, NewArgTypes),
-	List2 = lists:zip(CArgs, NewArgsContract),
-	{[erl_types:t_unopaque_on_mismatch(T1, T2, Opaques)
-	  || {T1, T2} <- List1],
-	 [erl_types:t_unopaque_on_mismatch(T1, T2, Opaques)
-	  || {T1, T2} <- List2]};
-      false  -> {NewArgTypes, NewArgsContract}
-    end,
-  ContrRet = CRange(TmpArgTypes),
-  RetMode =
-    case t_contains_opaque(ContrRet) orelse t_contains_opaque(BifRet) of
-      true  -> opaque;
-      false -> structured
-    end,
-  RetWithoutContr = t_inf(SigRange, BifRet, RetMode),
-  RetWithoutLocal = t_inf(ContrRet, RetWithoutContr, RetMode),
+
   ?debug("--------------------------------------------------------\n", []),
-  ?debug("Fun: ~p\n", [Fun]),
-  ?debug("Args: ~s\n", [erl_types:t_to_string(t_product(ArgTypes))]),
+  ?debug("Fun: ~p\n", [state__lookup_name(Fun, State)]),
+  ?debug("Module ~p\n", [State#state.module]),
+  ?debug("CArgs ~s\n", [erl_types:t_to_string(t_product(CArgs))]),
+  ?debug("ArgTypes ~s\n", [erl_types:t_to_string(t_product(ArgTypes))]),
+  ?debug("BifArgs ~p\n", [erl_types:t_to_string(t_product(BifArgs))]),
+
+  NewArgsSig = t_inf_lists(SigArgs, ArgTypes, Opaques),
+  ?debug("SigArgs ~s\n", [erl_types:t_to_string(t_product(SigArgs))]),
   ?debug("NewArgsSig: ~s\n", [erl_types:t_to_string(t_product(NewArgsSig))]),
+  NewArgsContract = t_inf_lists(CArgs, ArgTypes, Opaques),
   ?debug("NewArgsContract: ~s\n",
 	 [erl_types:t_to_string(t_product(NewArgsContract))]),
+  NewArgsBif = t_inf_lists(BifArgs, ArgTypes, Opaques),
   ?debug("NewArgsBif: ~s\n", [erl_types:t_to_string(t_product(NewArgsBif))]),
-  ?debug("NewArgTypes: ~s\n", [erl_types:t_to_string(t_product(NewArgTypes))]),
+  NewArgTypes0 = t_inf_lists(NewArgsSig, NewArgsContract),
+  NewArgTypes = t_inf_lists(NewArgTypes0, NewArgsBif, Opaques),
+  ?debug("NewArgTypes ~s\n", [erl_types:t_to_string(t_product(NewArgTypes))]),
+  ?debug("\n", []),
+
+  BifRet = BifRange(NewArgTypes),
+  ContrRet = CRange(NewArgTypes),
+  RetWithoutContr = t_inf(SigRange, BifRet),
+  RetWithoutLocal = t_inf(ContrRet, RetWithoutContr),
+
   ?debug("RetWithoutContr: ~s\n",[erl_types:t_to_string(RetWithoutContr)]),
   ?debug("RetWithoutLocal: ~s\n", [erl_types:t_to_string(RetWithoutLocal)]),
   ?debug("BifRet: ~s\n", [erl_types:t_to_string(BifRange(NewArgTypes))]),
-  ?debug("ContrRet: ~s\n", [erl_types:t_to_string(CRange(TmpArgTypes))]),
-  ?debug("SigRet: ~s\n", [erl_types:t_to_string(SigRange)]),
+  ?debug("SigRange: ~s\n", [erl_types:t_to_string(SigRange)]),
+  ?debug("ContrRet: ~s\n", [erl_types:t_to_string(CRange(NewArgTypes))]),
+  ?debug("LocalRet: ~s\n", [erl_types:t_to_string(LocalRet)]),
+
   State1 =
     case is_race_analysis_enabled(State) of
       true ->
@@ -513,6 +506,9 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
   FailedConj = any_none([RetWithoutLocal|NewArgTypes]),
   IsFailBif = t_is_none(BifRange(BifArgs)),
   IsFailSig = t_is_none(SigRange),
+  ?debug("FailedConj: ~p~n", [FailedConj]),
+  ?debug("IsFailBif: ~p~n", [IsFailBif]),
+  ?debug("IsFailSig: ~p~n", [IsFailSig]),
   State2 =
     case FailedConj andalso not (IsFailBif orelse IsFailSig) of
       true ->
@@ -532,14 +528,14 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
 	  false ->
 	    FailedSig = any_none(NewArgsSig),
 	    FailedContract =
-	      any_none([CRange(TmpArgsContract)|NewArgsContract]),
+	      any_none([CRange(NewArgsContract)|NewArgsContract]),
 	    FailedBif = any_none([BifRange(NewArgsBif)|NewArgsBif]),
 	    InfSig = t_inf(t_fun(SigArgs, SigRange),
-			   t_fun(BifArgs, BifRange(BifArgs))),
+                           t_fun(BifArgs, BifRange(BifArgs))),
 	    FailReason =
 	      apply_fail_reason(FailedSig, FailedBif, FailedContract),
 	    Msg = get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes, InfSig,
-				     Contr, CArgs, State1, FailReason),
+				     Contr, CArgs, State1, FailReason, Opaques),
 	    WarnType = case Msg of
 			 {call, _} -> ?WARN_FAILING_CALL;
 			 {apply, _} -> ?WARN_FAILING_CALL;
@@ -547,7 +543,8 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
 			 {call_without_opaque, _} -> ?WARN_OPAQUE;
 			 {opaque_type_test, _} -> ?WARN_OPAQUE
 		       end,
-	    state__add_warning(State1, WarnType, Tree, Msg)
+            Frc = {erlang, is_record, 3} =:= state__lookup_name(Fun, State),
+	    state__add_warning(State1, WarnType, Tree, Msg, Frc)
 	end;
       false -> State1
     end,
@@ -571,7 +568,7 @@ handle_apply_or_call([{TypeOfApply, {Fun, Sig, Contr, LocalRet}}|Left],
   TotalRet =
     case t_is_none(LocalRet) andalso t_is_unit(RetWithoutLocal) of
       true -> RetWithoutLocal;
-      false -> t_inf(RetWithoutLocal, LocalRet, opaque)
+      false -> t_inf(RetWithoutLocal, LocalRet)
     end,
   NewAccRet = t_sup(AccRet, TotalRet),
   ?debug("NewAccRet: ~s\n", [t_to_string(NewAccRet)]),
@@ -590,7 +587,7 @@ apply_fail_reason(FailedSig, FailedBif, FailedContract) ->
   end.
 
 get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes,
-		   Sig, Contract, ContrArgs, State, FailReason) ->
+		   Sig, Contract, ContrArgs, State, FailReason, Opaques) ->
   ArgStrings = format_args(Args, ArgTypes, State),
   ContractInfo =
     case Contract of
@@ -599,44 +596,52 @@ get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes,
 	 dialyzer_contracts:contract_to_string(C)};
       none -> {false, none}
     end,
-  EnumArgTypes =
-    case NewArgTypes of
-      [] -> [];
-      _ -> lists:zip(lists:seq(1, length(NewArgTypes)), NewArgTypes)
-    end,
+  EnumArgTypes = lists:zip(lists:seq(1, length(NewArgTypes)), NewArgTypes),
   ArgNs = [Arg || {Arg, Type} <- EnumArgTypes, t_is_none(Type)],
   case state__lookup_name(Fun, State) of
-    {M, F, _A} ->
-      case is_opaque_type_test_problem(Fun, NewArgTypes, State) of
-	true ->
-	  [Opaque] = NewArgTypes,
-	  {opaque_type_test, [atom_to_list(F), erl_types:t_to_string(Opaque)]};
-	false ->
+    {M, F, A} ->
+      case is_opaque_type_test_problem(Fun, Args, NewArgTypes, State) of
+	{yes, Arg, ArgType} ->
+	  {opaque_type_test, [atom_to_list(F), ArgStrings,
+                              format_arg(Arg), format_type(ArgType, State)]};
+	no ->
 	  SigArgs = t_fun_args(Sig),
-	  case is_opaque_related_problem(ArgNs, ArgTypes) of
-	    true ->  %% an opaque term is used where a structured term is expected
-	      ExpectedArgs =
-		case FailReason of
-		  only_sig -> SigArgs;
-		  _ -> ContrArgs
-		end,
-	      {call_with_opaque, [M, F, ArgStrings, ArgNs, ExpectedArgs]};
-	    false ->
-	      case is_opaque_related_problem(ArgNs, SigArgs) orelse
-		is_opaque_related_problem(ArgNs, ContrArgs) of
-		true ->  %% a structured term is used where an opaque is expected
-		  ExpectedTriples =
-		    case FailReason of
-		      only_sig -> expected_arg_triples(ArgNs, SigArgs, State);
-		      _ -> expected_arg_triples(ArgNs, ContrArgs, State)
-		    end,
-		  {call_without_opaque, [M, F, ArgStrings, ExpectedTriples]};
-		false -> %% there is a structured term clash in some argument
-		  {call, [M, F, ArgStrings,
-			  ArgNs, FailReason,
-			  format_sig_args(Sig, State),
-			  format_type(t_fun_range(Sig), State),
-			  ContractInfo]}
+          BadOpaque =
+            opaque_problems([SigArgs, ContrArgs], ArgTypes, Opaques, ArgNs),
+          %% In fact *both* 'call_with_opaque' and
+          %% 'call_without_opaque' are possible.
+          case lists:keyfind(decl, 1, BadOpaque) of
+            {decl, BadArgs} ->
+              %% a structured term is used where an opaque is expected
+              ExpectedTriples =
+                case FailReason of
+                  only_sig -> expected_arg_triples(BadArgs, SigArgs, State);
+                  _ -> expected_arg_triples(BadArgs, ContrArgs, State)
+                end,
+              {call_without_opaque, [M, F, ArgStrings, ExpectedTriples]};
+            false ->
+              case lists:keyfind(use, 1, BadOpaque) of
+                {use, BadArgs} ->
+                  %% an opaque term is used where a structured term is expected
+                  ExpectedArgs =
+                    case FailReason of
+                      only_sig -> SigArgs;
+                      _ -> ContrArgs
+                    end,
+                  {call_with_opaque, [M, F, ArgStrings, BadArgs, ExpectedArgs]};
+                false ->
+                  case
+                    erl_bif_types:opaque_args(M, F, A, ArgTypes, Opaques)
+                  of
+                    [] ->  %% there is a structured term clash in some argument
+                      {call, [M, F, ArgStrings,
+                              ArgNs, FailReason,
+                              format_sig_args(Sig, State),
+                              format_type(t_fun_range(Sig), State),
+                              ContractInfo]};
+                    Ns ->
+                      {call_with_opaque, [M, F, ArgStrings, Ns, ContrArgs]}
+                  end
 	      end
 	  end
       end;
@@ -648,31 +653,48 @@ get_apply_fail_msg(Fun, Args, ArgTypes, NewArgTypes,
 	       ContractInfo]}
   end.
 
-%% returns 'true' if we are running with opaque on (not checked yet),
-%% and there is either a contract or hard-coded type information with
-%% opaque types
-%% TODO: check that we are running with opaque types
-%% TODO: check the return type also
-prefer_opaque_types(CArgs, BifArgs) ->
-  t_contains_opaque(t_product(CArgs))
-    orelse t_contains_opaque(t_product(BifArgs)).
-
-is_opaque_related_problem(ArgNs, ArgTypes) ->
-  Fun = fun (N) -> erl_types:t_contains_opaque(lists:nth(N, ArgTypes)) end,
-  ArgNs =/= [] andalso lists:all(Fun, ArgNs).
-
-is_opaque_type_test_problem(Fun, ArgTypes, State) ->
+%% -> [{ElementI, [ArgN]}] where [ArgN] is a non-empty list of
+%% arguments containing unknown opaque types and Element is 1 or 2.
+opaque_problems(ContractOrSigList, ArgTypes, Opaques, ArgNs) ->
+  ArgElementList = find_unknown(ContractOrSigList, ArgTypes, Opaques, ArgNs),
+  F = fun(1) -> decl; (2) -> use end,
+  [{F(ElementI), lists:usort([ArgN || {ArgN, EI} <- ArgElementList,
+                                      EI =:= ElementI])} ||
+    ElementI <- lists:usort([EI || {_, EI} <- ArgElementList])].
+
+%% -> [{ArgN, ElementI}] where ElementI = 1 means there is an unknown
+%% opaque type in argument ArgN of the the contract/signature,
+%% and ElementI = 2 means that there is an unknown opaque type in
+%% argument ArgN of the the (current) argument types.
+find_unknown(ContractOrSigList, ArgTypes, Opaques, NoneArgNs) ->
+  ArgNs = lists:seq(1, length(ArgTypes)),
+  [{ArgN, ElementI} ||
+    ContractOrSig <- ContractOrSigList,
+    {E1, E2, ArgN} <- lists:zip3(ContractOrSig, ArgTypes, ArgNs),
+    lists:member(ArgN, NoneArgNs),
+    ElementI <- erl_types:t_find_unknown_opaque(E1, E2, Opaques)].
+
+is_opaque_type_test_problem(Fun, Args, ArgTypes, State) ->
   case Fun of
     {erlang, FN, 1} when FN =:= is_atom;      FN =:= is_boolean;
 			 FN =:= is_binary;    FN =:= is_bitstring;
 			 FN =:= is_float;     FN =:= is_function;
 			 FN =:= is_integer;   FN =:= is_list;
 			 FN =:= is_number;    FN =:= is_pid; FN =:= is_port;
-			 FN =:= is_reference; FN =:= is_tuple ->
-      [Type] = ArgTypes,
-      erl_types:t_is_opaque(Type) andalso
-	not lists:member(Type, State#state.opaques);
-    _ -> false
+			 FN =:= is_reference; FN =:= is_tuple;
+			 FN =:= is_map ->
+      type_test_opaque_arg(Args, ArgTypes, State#state.opaques);
+    {erlang, FN, 2} when FN =:= is_function ->
+      type_test_opaque_arg(Args, ArgTypes, State#state.opaques);
+    _ -> no
+  end.
+
+type_test_opaque_arg([], [], _Opaques) ->
+  no;
+type_test_opaque_arg([Arg|Args], [ArgType|ArgTypes], Opaques) ->
+  case erl_types:t_has_opaque_subtype(ArgType, Opaques) of
+    true -> {yes, Arg, ArgType};
+    false -> type_test_opaque_arg(Args, ArgTypes, Opaques)
   end.
 
 expected_arg_triples(ArgNs, ArgTypes, State) ->
@@ -683,47 +705,56 @@ expected_arg_triples(ArgNs, ArgTypes, State) ->
 
 add_bif_warnings({erlang, Op, 2}, [T1, T2] = Ts, Tree, State)
   when Op =:= '=:='; Op =:= '==' ->
-  Type1 = erl_types:t_unopaque(T1, State#state.opaques),
-  Type2 = erl_types:t_unopaque(T2, State#state.opaques),
-  Inf = t_inf(T1, T2),
-  Inf1 = t_inf(Type1, Type2),
-  case t_is_none(Inf) andalso t_is_none(Inf1) andalso(not any_none(Ts))
-    andalso (not is_int_float_eq_comp(T1, Op, T2)) of
+  Opaques = State#state.opaques,
+  Inf = t_inf(T1, T2, Opaques),
+  case
+    t_is_none(Inf) andalso (not any_none(Ts))
+    andalso (not is_int_float_eq_comp(T1, Op, T2, Opaques))
+  of
     true ->
-      Args = case erl_types:t_is_opaque(T1) of
-	       true  -> [format_type(T2, State), Op, format_type(T1, State)];
-	       false -> [format_type(T1, State), Op, format_type(T2, State)]
-	     end,
-      case any_opaque(Ts) of
-	true ->
-	  state__add_warning(State, ?WARN_OPAQUE, Tree, {opaque_eq, Args});
-	false ->
-	  state__add_warning(State, ?WARN_MATCHING, Tree, {exact_eq, Args})
+      %% Give priority to opaque warning (as usual).
+      case erl_types:t_find_unknown_opaque(T1, T2, Opaques) of
+        [] ->
+          Args = comp_format_args([], T1, Op, T2, State),
+          state__add_warning(State, ?WARN_MATCHING, Tree, {exact_eq, Args});
+        Ns ->
+          Args = comp_format_args(Ns, T1, Op, T2, State),
+	  state__add_warning(State, ?WARN_OPAQUE, Tree, {opaque_eq, Args})
       end;
     false ->
       State
   end;
 add_bif_warnings({erlang, Op, 2}, [T1, T2] = Ts, Tree, State)
   when Op =:= '=/='; Op =:= '/=' ->
-  Inf = t_inf(T1, T2),
-  case t_is_none(Inf) andalso (not any_none(Ts))
-    andalso (not is_int_float_eq_comp(T1, Op, T2)) andalso any_opaque(Ts) of
+  Opaques = State#state.opaques,
+  case
+    (not any_none(Ts))
+    andalso (not is_int_float_eq_comp(T1, Op, T2, Opaques))
+  of
     true ->
-      Args = case erl_types:t_is_opaque(T1) of
-	       true  -> [format_type(T2, State), Op, format_type(T1, State)];
-	       false -> [format_type(T1, State), Op, format_type(T2, State)]
-	     end,
-      state__add_warning(State, ?WARN_OPAQUE, Tree, {opaque_neq, Args});
+      case erl_types:t_find_unknown_opaque(T1, T2, Opaques) of
+        [] -> State;
+        Ns ->
+          Args = comp_format_args(Ns, T1, Op, T2, State),
+	  state__add_warning(State, ?WARN_OPAQUE, Tree, {opaque_neq, Args})
+      end;
     false ->
       State
   end;
 add_bif_warnings(_, _, _, State) ->
   State.
 
-is_int_float_eq_comp(T1, Op, T2) ->
+is_int_float_eq_comp(T1, Op, T2, Opaques) ->
   (Op =:= '==' orelse Op =:= '/=') andalso
-    ((erl_types:t_is_float(T1) andalso erl_types:t_is_integer(T2)) orelse
-     (erl_types:t_is_integer(T1) andalso erl_types:t_is_float(T2))).
+    ((erl_types:t_is_float(T1, Opaques)
+      andalso t_is_integer(T2, Opaques)) orelse
+     (t_is_integer(T1, Opaques)
+      andalso erl_types:t_is_float(T2, Opaques))).
+
+comp_format_args([1|_], T1, Op, T2, State) ->
+  [format_type(T2, State), Op, format_type(T1, State)];
+comp_format_args(_, T1, Op, T2, State) ->
+  [format_type(T1, State), Op, format_type(T2, State)].
 
 %%----------------------------------------
 
@@ -784,16 +815,27 @@ handle_bitstr(Tree, Map, State) ->
 	  {State3, Map2, t_none()};
 	false ->
 	  UnitVal = cerl:concrete(cerl:bitstr_unit(Tree)),
-	  Type =
-	    case t_number_vals(SizeType) of
-	      [OneSize] -> t_bitstr(0, OneSize * UnitVal);
-	      _ ->
-		MinSize = erl_types:number_min(SizeType),
-		t_bitstr(UnitVal, UnitVal * MinSize)
-	    end,
+          Opaques = State2#state.opaques,
+          NumberVals = t_number_vals(SizeType, Opaques),
+          {State3, Type} =
+            case t_contains_opaque(SizeType, Opaques) of
+              true ->
+                Msg = {opaque_size, [format_type(SizeType, State2),
+                                     format_cerl(Size)]},
+                {state__add_warning(State2, ?WARN_OPAQUE, Size, Msg),
+                 t_none()};
+              false ->
+                case NumberVals of
+                  [OneSize] -> {State2, t_bitstr(0, OneSize * UnitVal)};
+                  unknown -> {State2, t_bitstr()};
+                  _ ->
+                    MinSize = erl_types:number_min(SizeType, Opaques),
+                    {State2, t_bitstr(UnitVal, UnitVal * MinSize)}
+                end
+            end,
 	  Map3 = enter_type_lists([Val, Size, Tree],
 				  [ValType, SizeType, Type], Map2),
-	  {State2, Map3, Type}
+	  {State3, Map3, Type}
       end
   end.
 
@@ -805,34 +847,47 @@ handle_call(Tree, Map, State) ->
   Args = cerl:call_args(Tree),
   MFAList = [M, F|Args],
   {State1, Map1, [MType0, FType0|As]} = traverse_list(MFAList, Map, State),
-  %% Module and function names should be treated as *structured terms*
-  %% even if they happen to be identical to an atom (or tuple) which
-  %% is also involved in the definition of an opaque data type.
-  MType = t_inf(t_module(), t_unopaque(MType0)),
-  FType = t_inf(t_atom(), t_unopaque(FType0)),
+  Opaques = State#state.opaques,
+  MType = t_inf(t_module(), MType0, Opaques),
+  FType = t_inf(t_atom(), FType0, Opaques),
   Map2 = enter_type_lists([M, F], [MType, FType], Map1),
+  MOpaque = t_is_none(MType) andalso (not t_is_none(MType0)),
+  FOpaque = t_is_none(FType) andalso (not t_is_none(FType0)),
   case any_none([MType, FType|As]) of
     true ->
       State2 =
-	case t_is_none(MType) andalso (not t_is_none(MType0)) of
-	  true -> % This is a problem we just detected; not a known one
-	    MS = format_cerl(M),
-	    Msg = {app_call, [MS, format_cerl(F),
-			      format_args(Args, As, State1),
-			      MS, format_type(t_module(), State1),
-			      format_type(MType0, State1)]},
-	    state__add_warning(State1, ?WARN_FAILING_CALL, Tree, Msg);
-	  false ->
-	    case t_is_none(FType) andalso (not t_is_none(FType0)) of
-	      true ->
-		FS = format_cerl(F),
-		Msg = {app_call, [format_cerl(M), FS,
-				  format_args(Args, As, State1),
-				  FS, format_type(t_atom(), State1),
-				  format_type(FType0, State1)]},
-		state__add_warning(State1, ?WARN_FAILING_CALL, Tree, Msg);
-	      false -> State1
-	    end
+        if
+          MOpaque -> % This is a problem we just detected; not a known one
+            MS = format_cerl(M),
+            case t_is_none(t_inf(t_module(), MType0)) of
+              true ->
+                Msg = {app_call, [MS, format_cerl(F),
+                                  format_args(Args, As, State1),
+                                  MS, format_type(t_module(), State1),
+                                  format_type(MType0, State1)]},
+                state__add_warning(State1, ?WARN_FAILING_CALL, Tree, Msg);
+              false ->
+                Msg = {opaque_call, [MS, format_cerl(F),
+                                     format_args(Args, As, State1),
+                                     MS, format_type(MType0, State1)]},
+                state__add_warning(State1, ?WARN_FAILING_CALL, Tree, Msg)
+            end;
+          FOpaque ->
+            FS = format_cerl(F),
+            case t_is_none(t_inf(t_atom(), FType0)) of
+              true ->
+                Msg = {app_call, [format_cerl(M), FS,
+                                  format_args(Args, As, State1),
+                                  FS, format_type(t_atom(), State1),
+                                  format_type(FType0, State1)]},
+                state__add_warning(State1, ?WARN_FAILING_CALL, Tree, Msg);
+              false ->
+                Msg = {opaque_call, [format_cerl(M), FS,
+                                     format_args(Args, As, State1),
+                                     FS, format_type(FType0, State1)]},
+                state__add_warning(State1, ?WARN_FAILING_CALL, Tree, Msg)
+            end;
+          true -> State1
 	end,
       {State2, Map2, t_none()};
     false ->
@@ -874,7 +929,7 @@ handle_case(Tree, Map, State) ->
 	handle_clauses(Clauses, Arg, ArgType, ArgType, State2,
 		       [], Map2, [], []),
       Map3 = join_maps_end(MapList, Map2),
-      debug_pp_map(Map2),
+      debug_pp_map(Map3),
       {State3, Map3, Type}
   end.
 
@@ -886,7 +941,7 @@ handle_cons(Tree, Map, State) ->
   {State1, Map1, HdType} = traverse(Hd, Map, State),
   {State2, Map2, TlType} = traverse(Tl, Map1, State1),
   State3 =
-    case t_is_none(t_inf(TlType, t_list())) of
+    case t_is_none(t_inf(TlType, t_list(), State2#state.opaques)) of
       true ->
 	Msg = {improper_list_constr, [format_type(TlType, State2)]},
 	state__add_warning(State2, ?WARN_NON_PROPER_LIST, Tree, Msg);
@@ -979,8 +1034,9 @@ handle_receive(Tree, Map, State) ->
                    [], []),
   Map1 = join_maps(MapList, Map),
   {State3, Map2, TimeoutType} = traverse(Timeout, Map1, State2),
-  case (t_is_atom(TimeoutType) andalso
-	(t_atom_vals(TimeoutType) =:= ['infinity'])) of
+  Opaques = State3#state.opaques,
+  case (t_is_atom(TimeoutType, Opaques) andalso
+	(t_atom_vals(TimeoutType, Opaques) =:= ['infinity'])) of
     true ->
       {State3, Map2, ReceiveType};
     false ->
@@ -1023,6 +1079,19 @@ handle_try(Tree, Map, State) ->
 
 %%----------------------------------------
 
+handle_map(Tree,Map,State) ->
+    Pairs = cerl:map_es(Tree),
+    {State1, Map1, TypePairs} = traverse_list(Pairs,Map,State),
+    {State1, Map1, t_map(TypePairs)}.
+
+handle_map_pair(Tree,Map,State) ->
+  Key = cerl:map_pair_key(Tree),
+  Val = cerl:map_pair_val(Tree),
+  {State1, Map1, [K,V]} = traverse_list([Key,Val],Map,State),
+  {State1, Map1, {K,V}}.
+
+%%----------------------------------------
+
 handle_tuple(Tree, Map, State) ->
   Elements = cerl:tuple_es(Tree),
   {State1, Map1, EsType} = traverse_list(Elements, Map, State),
@@ -1031,55 +1100,46 @@ handle_tuple(Tree, Map, State) ->
     true ->
       {State1, Map1, t_none()};
     false ->
-      %% Let's find out if this is a record or opaque construction.
+      %% Let's find out if this is a record
       case Elements of
 	[Tag|Left] ->
 	  case cerl:is_c_atom(Tag) of
 	    true ->
 	      TagVal = cerl:atom_val(Tag),
-	      case t_opaque_match_record(TupleType, State1#state.opaques) of
-		[Opaque] ->
-		  RecStruct = t_opaque_matching_structure(TupleType, Opaque),
-		  RecFields = t_tuple_args(RecStruct),
-		  case bind_pat_vars(Elements, RecFields, [], Map1, State1) of
-		    {error, _, ErrorPat, ErrorType, _} ->
-		      Msg = {record_constr,
-			     [TagVal, format_patterns(ErrorPat),
-			      format_type(ErrorType, State1)]},
-		      State2 = state__add_warning(State1, ?WARN_MATCHING,
-						  Tree, Msg),
-		      {State2, Map1, t_none()};
-		    {Map2, _ETypes} ->
-		      {State1, Map2, Opaque}
-		  end;
-		_ ->
-		  case state__lookup_record(TagVal, length(Left), State1) of
-		    error -> {State1, Map1, TupleType};
-		    {ok, RecType} ->
-		      InfTupleType = t_inf(RecType, TupleType),
-		      case t_is_none(InfTupleType) of
-			true ->
-			  RecC = format_type(TupleType, State1),
-			  FieldDiffs = format_field_diffs(TupleType, State1),
-			  Msg = {record_constr, [RecC, FieldDiffs]},
-			  State2 = state__add_warning(State1, ?WARN_MATCHING,
-						      Tree, Msg),
-			  {State2, Map1, t_none()};
-			false ->
-			  case bind_pat_vars(Elements, t_tuple_args(RecType),
-					     [], Map1, State1) of
-			    {error, bind, ErrorPat, ErrorType, _} ->
-			      Msg = {record_constr,
-				     [TagVal, format_patterns(ErrorPat),
-				      format_type(ErrorType, State1)]},
-			      State2 = state__add_warning(State1, ?WARN_MATCHING,
-							  Tree, Msg),
-			      {State2, Map1, t_none()};
-			    {Map2, ETypes} ->
-			      {State1, Map2, t_tuple(ETypes)}
-			  end
-		      end
-		  end
+              case state__lookup_record(TagVal, length(Left), State1) of
+                error -> {State1, Map1, TupleType};
+                {ok, RecType} ->
+                  InfTupleType = t_inf(RecType, TupleType),
+                  case t_is_none(InfTupleType) of
+                    true ->
+                      RecC = format_type(TupleType, State1),
+                      FieldDiffs = format_field_diffs(TupleType, State1),
+                      Msg = {record_constr, [RecC, FieldDiffs]},
+                      State2 = state__add_warning(State1, ?WARN_MATCHING,
+                                                  Tree, Msg),
+                      {State2, Map1, t_none()};
+                    false ->
+                      case bind_pat_vars(Elements, t_tuple_args(RecType),
+                                         [], Map1, State1) of
+                        {error, bind, ErrorPat, ErrorType, _} ->
+                          Msg = {record_constr,
+                                 [TagVal, format_patterns(ErrorPat),
+                                  format_type(ErrorType, State1)]},
+                          State2 = state__add_warning(State1, ?WARN_MATCHING,
+                                                      Tree, Msg),
+                          {State2, Map1, t_none()};
+                        {error, opaque, ErrorPat, ErrorType, OpaqueType} ->
+                          Msg = {opaque_match,
+                                 [format_patterns(ErrorPat),
+                                  format_type(ErrorType, State1),
+                                  format_type(OpaqueType, State1)]},
+                          State2 = state__add_warning(State1, ?WARN_OPAQUE,
+                                                      Tree, Msg),
+                          {State2, Map1, t_none()};
+                        {Map2, ETypes} ->
+                          {State1, Map2, t_tuple(ETypes)}
+                      end
+                  end
 	      end;
 	    false ->
 	      {State1, Map1, t_tuple(EsType)}
@@ -1356,7 +1416,9 @@ bind_pat_vars_reverse(Pats, Types, Acc, Map, State) ->
   end.
 
 bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
-  ?debug("Binding pat: ~w to ~s\n", [cerl:type(Pat), format_type(Type, State)]),
+  ?debug("Binding pat: ~w to ~s\n", [cerl:type(Pat), format_type(Type, State)]
+),
+  Opaques = State#state.opaques,
   {NewMap, TypeOut} =
     case cerl:type(Pat) of
       alias ->
@@ -1372,9 +1434,15 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	case Rev of
 	  true -> {Map, t_bitstr()};
 	  false ->
-	    BinType = t_inf(t_bitstr(), Type),
+	    BinType = t_inf(t_bitstr(), Type, Opaques),
 	    case t_is_none(BinType) of
-	      true -> bind_error([Pat], Type, t_none(), bind);
+	      true ->
+                case t_find_opaque_mismatch(t_bitstr(), Type) of
+                  {ok, T1, T2}  ->
+                    bind_error([Pat], T1, T2, opaque);
+                  error ->
+                    bind_error([Pat], Type, t_none(), bind)
+                end;
 	      false ->
 		Segs = cerl:binary_segments(Pat),
 		{Map1, SegTypes} = bind_bin_segs(Segs, BinType, Map, State),
@@ -1382,29 +1450,27 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	    end
 	end;
       cons ->
-	Cons = t_inf(Type, t_cons()),
+	Cons = t_inf(Type, t_cons(), Opaques),
 	case t_is_none(Cons) of
 	  true ->
 	    bind_opaque_pats(t_cons(), Type, Pat, Map, State, Rev);
 	  false ->
 	    {Map1, [HdType, TlType]} =
 	      bind_pat_vars([cerl:cons_hd(Pat), cerl:cons_tl(Pat)],
-			    [t_cons_hd(Cons), t_cons_tl(Cons)],
+			    [t_cons_hd(Cons, Opaques),
+                             t_cons_tl(Cons, Opaques)],
 			    [], Map, State, Rev),
 	    {Map1, t_cons(HdType, TlType)}
 	end;
       literal ->
 	Literal = literal_type(Pat),
-	LiteralOrOpaque =
-	  case t_opaque_match_atom(Literal, State#state.opaques) of
-	    [Opaque] -> Opaque;
-	    _ -> Literal
-	  end,
-	case t_is_none(t_inf(LiteralOrOpaque, Type)) of
+	case t_is_none(t_inf(Literal, Type, Opaques)) of
 	  true ->
 	    bind_opaque_pats(Literal, Type, Pat, Map, State, Rev);
-	  false -> {Map, LiteralOrOpaque}
+	  false -> {Map, Literal}
 	end;
+      map ->
+	  {Map, t_map([])};
       tuple ->
 	Es = cerl:tuple_es(Pat),
 	{TypedRecord, Prototype} =
@@ -1419,27 +1485,28 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 		    {ok, Record} ->
 		      [_Head|AnyTail] = [t_any() || _ <- Es],
 		      UntypedRecord = t_tuple([t_atom(TagAtom)|AnyTail]),
-		      {not erl_types:t_is_equal(Record, UntypedRecord), Record}
+		      {not t_is_equal(Record, UntypedRecord), Record}
 		  end;
 		false -> {false, t_tuple(length(Es))}
 	      end
 	  end,
-	Tuple = t_inf(Prototype, Type),
+	Tuple = t_inf(Prototype, Type, Opaques),
 	case t_is_none(Tuple) of
 	  true ->
 	    bind_opaque_pats(Prototype, Type, Pat, Map, State, Rev);
 	  false ->
-	    SubTuples = t_tuple_subtypes(Tuple),
+	    SubTuples = t_tuple_subtypes(Tuple, Opaques),
 	    %% Need to call the top function to get the try-catch wrapper
             MapJ = join_maps_begin(Map),
 	    Results =
 	      case Rev of
 		true ->
-		  [bind_pat_vars_reverse(Es, t_tuple_args(SubTuple), [],
-					 MapJ, State)
+		  [bind_pat_vars_reverse(Es, t_tuple_args(SubTuple, Opaques),
+                                         [], MapJ, State)
 		   || SubTuple <- SubTuples];
 		false ->
-		  [bind_pat_vars(Es, t_tuple_args(SubTuple), [], MapJ, State)
+		  [bind_pat_vars(Es, t_tuple_args(SubTuple, Opaques), [],
+                                 MapJ, State)
 		   || SubTuple <- SubTuples]
 	      end,
 	    case lists:keyfind(opaque, 2, Results) of
@@ -1466,37 +1533,14 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 	  bind_pat_vars(Es, t_to_tlist(Type), [], Map, State, Rev),
 	{Map1, t_product(EsTypes)};
       var ->
-	Opaques = State#state.opaques,
 	VarType1 =
-	  case state__lookup_type_for_rec_var(Pat, State) of
-	    error ->
-	      LType = lookup_type(Pat, Map),
-	      case t_opaque_match_record(LType, Opaques) of
-		[Opaque] -> Opaque;
-		_ ->
-		  case t_opaque_match_atom(LType, Opaques) of
-		    [Opaque] -> Opaque;
-		    _ ->  LType
-		  end
-	      end;
+	  case state__lookup_type_for_letrec(Pat, State) of
+	    error -> lookup_type(Pat, Map);
 	    {ok, RecType} -> RecType
 	  end,
 	%% Must do inf when binding args to pats. Vars in pats are fresh.
-	VarType2 = t_inf(VarType1, Type),
-	VarType3 =
-	  case Opaques =/= [] of
-	    true ->
-	      case t_opaque_match_record(VarType2, Opaques) of
-		[OpaqueRec] -> OpaqueRec;
-		_ ->
-		  case t_opaque_match_atom(VarType2, Opaques) of
-		    [OpaqueAtom] -> OpaqueAtom;
-		    _ -> VarType2
-		  end
-	      end;
-	    false -> VarType2
-	  end,
-	case t_is_none(VarType3) of
+	VarType2 = t_inf(VarType1, Type, Opaques),
+	case t_is_none(VarType2) of
 	  true ->
 	    case t_find_opaque_mismatch(VarType1, Type) of
 	      {ok, T1, T2}  ->
@@ -1505,8 +1549,8 @@ bind_pat_vars([Pat|PatLeft], [Type|TypeLeft], Acc, Map, State, Rev) ->
 		bind_error([Pat], Type, t_none(), bind)
 	    end;
 	  false ->
-	    Map1 = enter_type(Pat, VarType3, Map),
-	    {Map1, VarType3}
+	    Map1 = enter_type(Pat, VarType2, Map),
+	    {Map1, VarType2}
 	end;
       _Other ->
 	%% Catch all is needed when binding args to pats
@@ -1529,7 +1573,8 @@ bind_bin_segs([Seg|Segs], BinType, Acc, Map, State) ->
       binary = SegType, [] = Segs, %% just an assert
       T = t_inf(t_bitstr(UnitVal, 0), BinType),
       {Map1, [Type]} = bind_pat_vars([Val], [T], [], Map, State, false),
-      bind_bin_segs(Segs, t_bitstr(0, 0), [Type|Acc], Map1, State);
+      Type1 = remove_local_opaque_types(Type, State#state.opaques),
+      bind_bin_segs(Segs, t_bitstr(0, 0), [Type1|Acc], Map1, State);
     utf -> % XXX: possibly can be strengthened
       true = lists:member(SegType, [utf8, utf16, utf32]),
       {Map1, [_]} = bind_pat_vars([Val], [t_integer()], [], Map, State, false),
@@ -1539,11 +1584,17 @@ bind_bin_segs([Seg|Segs], BinType, Acc, Map, State) ->
       Size = cerl:bitstr_size(Seg),
       {Map1, [SizeType]} =
 	bind_pat_vars([Size], [t_non_neg_integer()], [], Map, State, false),
+      Opaques = State#state.opaques,
+      NumberVals = t_number_vals(SizeType, Opaques),
+      case t_contains_opaque(SizeType, Opaques) of
+        true -> bind_error([Seg], SizeType, t_none(), opaque);
+        false -> ok
+      end,
       Type =
-	case t_number_vals(SizeType) of
+	case NumberVals of
 	  [OneSize] -> t_bitstr(0, UnitVal * OneSize);
-	  _ ->
-	    MinSize = erl_types:number_min(SizeType),
+	  _ -> % 'unknown' too
+	    MinSize = erl_types:number_min(SizeType, Opaques),
 	    t_bitstr(UnitVal, UnitVal * MinSize)
 	end,
       ValConstr =
@@ -1551,7 +1602,7 @@ bind_bin_segs([Seg|Segs], BinType, Acc, Map, State) ->
 	  binary -> Type; %% The same constraints as for the whole bitstr
 	  float -> t_float();
 	  integer ->
-	    case t_number_vals(SizeType) of
+	    case NumberVals of
 	      unknown -> t_integer();
 	      List ->
 		SizeVal = lists:max(List),
@@ -1579,7 +1630,7 @@ bind_error(Pats, Type, OpaqueType, Error) ->
 bind_opaque_pats(GenType, Type, Pat, Map, State, Rev) ->
   case t_find_opaque_mismatch(GenType, Type) of
     {ok, T1, T2}  ->
-      case lists:member(T2, State#state.opaques) of
+      case erl_types:is_opaque_type(T2, State#state.opaques) of
 	true ->
 	  NewType = erl_types:t_struct_from_opaque(Type, [T2]),
 	  {Map1, _} =
@@ -1630,6 +1681,8 @@ bind_guard(Guard, Map, Env, Eval, State) ->
       Es0 = cerl:tuple_es(Guard),
       {Map1, Es} = bind_guard_list(Es0, Map, Env, dont_know, State),
       {Map1, t_tuple(Es)};
+    map ->
+      {Map, t_map([])};
     'let' ->
       Arg = cerl:let_arg(Guard),
       [Var] = cerl:let_vars(Guard),
@@ -1700,19 +1753,9 @@ handle_guard_call(Guard, Map, Env, Eval, State) ->
 
 handle_guard_gen_fun({M, F, A}, Guard, Map, Env, Eval, State) ->
   Args = cerl:call_args(Guard),
-  {Map1, As0} = bind_guard_list(Args, Map, Env, dont_know, State),
-  MapFun = fun(Type) ->
-	       case lists:member(Type, State#state.opaques) of
-		 true -> erl_types:t_opaque_structure(Type);
-		 false -> Type
-	       end
-	   end,
-  As = lists:map(MapFun, As0),
-  Mode = case As =:= As0 of
-	   true -> structured;
-	   false -> opaque
-	 end,
-  BifRet = erl_bif_types:type(M, F, A, As),
+  {Map1, As} = bind_guard_list(Args, Map, Env, dont_know, State),
+  Opaques = State#state.opaques,
+  BifRet = erl_bif_types:type(M, F, A, As, Opaques),
   case t_is_none(BifRet) of
     true ->
       %% Is this an error-bif?
@@ -1721,11 +1764,8 @@ handle_guard_gen_fun({M, F, A}, Guard, Map, Env, Eval, State) ->
 	false -> signal_guard_fatal_fail(Eval, Guard, As, State)
       end;
     false ->
-      BifArgs = case erl_bif_types:arg_types(M, F, A) of
-		  unknown -> lists:duplicate(A, t_any());
-		  List -> List
-		end,
-      Map2 = enter_type_lists(Args, t_inf_lists(BifArgs, As0, Mode), Map1),
+      BifArgs = bif_args(M, F, A),
+      Map2 = enter_type_lists(Args, t_inf_lists(BifArgs, As, Opaques), Map1),
       Ret =
 	case Eval of
 	  pos -> t_inf(t_atom(true), BifRet);
@@ -1771,29 +1811,19 @@ bind_type_test(Eval, TypeTest, ArgType, State) ->
 	   is_reference -> t_reference();
 	   is_tuple -> t_tuple()
 	 end,
-  Mode = determine_mode(ArgType, State#state.opaques),
   case Eval of
     pos ->
-      Inf = t_inf(Type, ArgType, Mode),
+      Inf = t_inf(Type, ArgType, State#state.opaques),
       case t_is_none(Inf) of
 	true -> error;
 	false -> {ok, Inf, t_atom(true)}
       end;
     neg ->
-      case Mode of
-	opaque ->
-	  Struct = erl_types:t_opaque_structure(ArgType),
-	  case t_is_none(t_subtract(Struct, Type)) of
-	    true -> error;
-	    false  -> {ok, ArgType, t_atom(false)}
-	  end;
-	structured ->
-	  Sub = t_subtract(ArgType, Type),
-	  case t_is_none(Sub) of
-	    true -> error;
-	    false -> {ok, Sub, t_atom(false)}
-	  end
-	end;
+      Sub = t_subtract(ArgType, Type),
+      case t_is_none(Sub) of
+        true -> error;
+        false -> {ok, Sub, t_atom(false)}
+      end;
     dont_know ->
       {ok, ArgType, t_boolean()}
   end.
@@ -1802,9 +1832,10 @@ handle_guard_comp(Guard, Comp, Map, Env, Eval, State) ->
   Args = cerl:call_args(Guard),
   [Arg1, Arg2] = Args,
   {Map1, ArgTypes} = bind_guard_list(Args, Map, Env, dont_know, State),
+  Opaques = State#state.opaques,
   [Type1, Type2] = ArgTypes,
-  IsInt1 = t_is_integer(Type1),
-  IsInt2 = t_is_integer(Type2),
+  IsInt1 = t_is_integer(Type1, Opaques),
+  IsInt2 = t_is_integer(Type2, Opaques),
   case {cerl:type(Arg1), cerl:type(Arg2)} of
     {literal, literal} ->
       case erlang:Comp(cerl:concrete(Arg1), cerl:concrete(Arg2)) of
@@ -1817,12 +1848,13 @@ handle_guard_comp(Guard, Comp, Map, Env, Eval, State) ->
 	false when Eval =:= neg ->       {Map, t_atom(false)}
       end;
     {literal, var} when IsInt1 andalso IsInt2 andalso (Eval =:= pos) ->
-      case bind_comp_literal_var(Arg1, Arg2, Type2, Comp, Map1) of
+      case bind_comp_literal_var(Arg1, Arg2, Type2, Comp, Map1, Opaques) of
 	error -> signal_guard_fail(Eval, Guard, ArgTypes, State);
 	{ok, NewMap} -> {NewMap, t_atom(true)}
       end;
     {var, literal} when IsInt1 andalso IsInt2 andalso (Eval =:= pos) ->
-      case bind_comp_literal_var(Arg2, Arg1, Type1, invert_comp(Comp), Map1) of
+      case bind_comp_literal_var(Arg2, Arg1, Type1, invert_comp(Comp),
+                                 Map1, Opaques) of
 	error -> signal_guard_fail(Eval, Guard, ArgTypes, State);
 	{ok, NewMap} -> {NewMap, t_atom(true)}
       end;
@@ -1835,10 +1867,10 @@ invert_comp('<')  -> '>';
 invert_comp('>=') -> '=<';
 invert_comp('>')  -> '<'.
 
-bind_comp_literal_var(Lit, Var, VarType, CompOp, Map) ->
+bind_comp_literal_var(Lit, Var, VarType, CompOp, Map, Opaques) ->
   LitVal = cerl:concrete(Lit),
   NewVarType =
-    case t_number_vals(VarType) of
+    case t_number_vals(VarType, Opaques) of
       unknown ->
 	Range =
 	  case CompOp of
@@ -1847,7 +1879,7 @@ bind_comp_literal_var(Lit, Var, VarType, CompOp, Map) ->
 	    '>=' -> t_from_range(neg_inf, LitVal);
 	    '>'  -> t_from_range(neg_inf, LitVal - 1)
 	  end,
-	t_inf(Range, VarType);
+	t_inf(Range, VarType, Opaques);
       NumberVals ->
 	NewNumberVals = [X || X <- NumberVals, erlang:CompOp(LitVal, X)],
 	t_integers(NewNumberVals)
@@ -1861,17 +1893,18 @@ handle_guard_is_function(Guard, Map, Env, Eval, State) ->
   Args = cerl:call_args(Guard),
   {Map1, ArgTypes0} = bind_guard_list(Args, Map, Env, dont_know, State),
   [FunType0, ArityType0] = ArgTypes0,
-  ArityType = t_inf(ArityType0, t_integer()),
+  Opaques = State#state.opaques,
+  ArityType = t_inf(ArityType0, t_integer(), Opaques),
   case t_is_none(ArityType) of
     true -> signal_guard_fail(Eval, Guard, ArgTypes0, State);
     false ->
       FunTypeConstr =
-	case t_number_vals(ArityType) of
+	case t_number_vals(ArityType, State#state.opaques) of
 	  unknown -> t_fun();
 	  Vals ->
 	    t_sup([t_fun(lists:duplicate(X, t_any()), t_any()) || X <- Vals])
 	end,
-      FunType = t_inf(FunType0, FunTypeConstr),
+      FunType = t_inf(FunType0, FunTypeConstr, Opaques),
       case t_is_none(FunType) of
 	true ->
 	  case Eval of
@@ -1896,33 +1929,45 @@ handle_guard_is_record(Guard, Map, Env, Eval, State) ->
   Arity = cerl:int_val(Arity0),
   {Map1, RecType} = bind_guard(Rec, Map, Env, dont_know, State),
   ArityMin1 = Arity - 1,
-  TupleType =
-    case state__lookup_record(Tag, ArityMin1, State) of
-      error -> t_tuple([t_atom(Tag)|lists:duplicate(ArityMin1, t_any())]);
-      {ok, Prototype} -> Prototype
-    end,
-  Mode = determine_mode(RecType, State#state.opaques),
-  NewTupleType =
-    case t_opaque_match_record(TupleType, State#state.opaques) of
-      [Opaque] -> Opaque;
-      _ -> TupleType
-    end,
-  Type = t_inf(NewTupleType, RecType, Mode),
-  case t_is_none(Type) of
+  Opaques = State#state.opaques,
+  Tuple = t_tuple([t_atom(Tag)|lists:duplicate(ArityMin1, t_any())]),
+  case t_is_none(t_inf(Tuple, RecType, Opaques)) of
     true ->
-      case Eval of
-	pos -> signal_guard_fail(Eval, Guard,
-				 [RecType, t_from_term(Tag),
-				  t_from_term(Arity)],
-				 State);
-	neg -> {Map1, t_atom(false)};
-	dont_know -> {Map1, t_atom(false)}
+      case erl_types:t_has_opaque_subtype(RecType, Opaques) of
+        true ->
+          signal_guard_fail(Eval, Guard,
+                            [RecType, t_from_term(Tag),
+                             t_from_term(Arity)],
+                            State);
+        false ->
+          case Eval of
+            pos -> signal_guard_fail(Eval, Guard,
+                                     [RecType, t_from_term(Tag),
+                                      t_from_term(Arity)],
+                                     State);
+            neg -> {Map1, t_atom(false)};
+            dont_know -> {Map1, t_atom(false)}
+          end
       end;
     false ->
-      case Eval of
-	pos -> {enter_type(Rec, Type, Map1), t_atom(true)};
-	neg -> {Map1, t_atom(false)};
-	dont_know -> {Map1, t_boolean()}
+      TupleType =
+        case state__lookup_record(Tag, ArityMin1, State) of
+          error -> Tuple;
+          {ok, Prototype} -> Prototype
+        end,
+      Type = t_inf(TupleType, RecType, State#state.opaques),
+      case t_is_none(Type) of
+        true ->
+          %% No special handling of opaque errors.
+          FArgs = "record " ++ format_type(RecType, State),
+          Msg = {record_matching, [FArgs, Tag]},
+          throw({fail, {Guard, Msg}});
+        false ->
+          case Eval of
+            pos -> {enter_type(Rec, Type, Map1), t_atom(true)};
+            neg -> {Map1, t_atom(false)};
+            dont_know -> {Map1, t_boolean()}
+          end
       end
   end.
 
@@ -1975,14 +2020,24 @@ handle_guard_eq(Guard, Map, Env, Eval, State) ->
 bind_eq_guard(Guard, Arg1, Arg2, Map, Env, Eval, State) ->
   {Map1, Type1} = bind_guard(Arg1, Map, Env, dont_know, State),
   {Map2, Type2} = bind_guard(Arg2, Map1, Env, dont_know, State),
-  case (t_is_nil(Type1) orelse t_is_nil(Type2) orelse
-	t_is_atom(Type1) orelse t_is_atom(Type2)) of
+  Opaques = State#state.opaques,
+  case
+    t_is_nil(Type1, Opaques) orelse t_is_nil(Type2, Opaques)
+    orelse t_is_atom(Type1, Opaques) orelse t_is_atom(Type2, Opaques)
+  of
     true -> bind_eqeq_guard(Guard, Arg1, Arg2, Map, Env, Eval, State);
     false ->
-      case Eval of
-	pos -> {Map2, t_atom(true)};
-	neg -> {Map2, t_atom(false)};
-	dont_know -> {Map2, t_boolean()}
+      %% XXX. Is this test OK?
+      OpArgs = erl_types:t_find_unknown_opaque(Type1, Type2, Opaques),
+      case OpArgs =:= [] of
+        true ->
+          case Eval of
+            pos -> {Map2, t_atom(true)};
+            neg -> {Map2, t_atom(false)};
+            dont_know -> {Map2, t_boolean()}
+          end;
+        false ->
+          signal_guard_fail(Eval, Guard, [Type1, Type2], State)
       end
   end.
 
@@ -2021,44 +2076,52 @@ bind_eqeq_guard(Guard, Arg1, Arg2, Map, Env, Eval, State) ->
   {Map2, Type2} = bind_guard(Arg2, Map1, Env, dont_know, State),
   ?debug("Types are:~s =:= ~s\n", [t_to_string(Type1),
 				   t_to_string(Type2)]),
-  Inf = t_inf(Type1, Type2),
+  Opaques = State#state.opaques,
+  Inf = t_inf(Type1, Type2, Opaques),
   case t_is_none(Inf) of
     true ->
-      case Eval of
-	neg -> {Map2, t_atom(false)};
-	dont_know -> {Map2, t_atom(false)};
-	pos -> signal_guard_fail(Eval, Guard, [Type1, Type2], State)
+      OpArgs = erl_types:t_find_unknown_opaque(Type1, Type2, Opaques),
+      case OpArgs =:= [] of
+        true ->
+          case Eval of
+            neg -> {Map2, t_atom(false)};
+            dont_know -> {Map2, t_atom(false)};
+            pos -> signal_guard_fail(Eval, Guard, [Type1, Type2], State)
+          end;
+        false ->
+          signal_guard_fail(Eval, Guard, [Type1, Type2], State)
       end;
     false ->
       case Eval of
-	pos ->
-	  case {cerl:type(Arg1), cerl:type(Arg2)} of
-	    {var, var} ->
-	      Map3 = enter_subst(Arg1, Arg2, Map2),
-	      Map4 = enter_type(Arg2, Inf, Map3),
-	      {Map4, t_atom(true)};
-	    {var, _} ->
-	      Map3 = enter_type(Arg1, Inf, Map2),
-	      {Map3, t_atom(true)};
-	    {_, var} ->
-	      Map3 = enter_type(Arg2, Inf, Map2),
-	      {Map3, t_atom(true)};
-	    {_, _} ->
-	      {Map2, t_atom(true)}
-	  end;
-	neg ->
-	  {Map2, t_atom(false)};
-	dont_know ->
-	  {Map2, t_boolean()}
+        pos ->
+          case {cerl:type(Arg1), cerl:type(Arg2)} of
+            {var, var} ->
+              Map3 = enter_subst(Arg1, Arg2, Map2),
+              Map4 = enter_type(Arg2, Inf, Map3),
+              {Map4, t_atom(true)};
+            {var, _} ->
+              Map3 = enter_type(Arg1, Inf, Map2),
+              {Map3, t_atom(true)};
+            {_, var} ->
+              Map3 = enter_type(Arg2, Inf, Map2),
+              {Map3, t_atom(true)};
+            {_, _} ->
+              {Map2, t_atom(true)}
+          end;
+        neg ->
+          {Map2, t_atom(false)};
+        dont_know ->
+          {Map2, t_boolean()}
       end
   end.
 
 bind_eqeq_guard_lit_other(Guard, Arg1, Arg2, Map, Env, State) ->
   Eval = dont_know,
+  Opaques = State#state.opaques,
   case cerl:concrete(Arg1) of
     true ->
       {_, Type} = MT = bind_guard(Arg2, Map, Env, pos, State),
-      case t_is_atom(true, Type) of
+      case t_is_any_atom(true, Type, Opaques) of
 	true -> MT;
 	false ->
 	  {_, Type0} = bind_guard(Arg2, Map, Env, Eval, State),
@@ -2066,7 +2129,7 @@ bind_eqeq_guard_lit_other(Guard, Arg1, Arg2, Map, Env, State) ->
       end;
     false ->
       {Map1, Type} = bind_guard(Arg2, Map, Env, neg, State),
-      case t_is_atom(false, Type) of
+      case t_is_any_atom(false, Type, Opaques) of
 	true -> {Map1, t_atom(true)};
 	false ->
 	  {_, Type0} = bind_guard(Arg2, Map, Env, Eval, State),
@@ -2087,14 +2150,15 @@ bind_eqeq_guard_lit_other(Guard, Arg1, Arg2, Map, Env, State) ->
 
 handle_guard_and(Guard, Map, Env, Eval, State) ->
   [Arg1, Arg2] = cerl:call_args(Guard),
+  Opaques = State#state.opaques,
   case Eval of
     pos ->
       {Map1, Type1} = bind_guard(Arg1, Map, Env, Eval, State),
-      case t_is_atom(true, Type1) of
+      case t_is_any_atom(true, Type1, Opaques) of
 	false -> signal_guard_fail(Eval, Guard, [Type1, t_any()], State);
 	true ->
 	  {Map2, Type2} = bind_guard(Arg2, Map1, Env, Eval, State),
-	  case t_is_atom(true, Type2) of
+	  case t_is_any_atom(true, Type2, Opaques) of
 	    false -> signal_guard_fail(Eval, Guard, [Type1, Type2], State);
 	    true -> {Map2, t_atom(true)}
 	  end
@@ -2109,7 +2173,10 @@ handle_guard_and(Guard, Map, Env, Eval, State) ->
 	try bind_guard(Arg2, MapJ, Env, neg, State)
 	catch throw:{fail, _} -> bind_guard(Arg1, MapJ, Env, pos, State)
 	end,
-      case t_is_atom(false, Type1) orelse t_is_atom(false, Type2) of
+      case
+        t_is_any_atom(false, Type1, Opaques)
+        orelse t_is_any_atom(false, Type2, Opaques)
+      of
 	true -> {join_maps_end([Map1, Map2], MapJ), t_atom(false)};
 	false -> signal_guard_fail(Eval, Guard, [Type1, Type2], State)
       end;
@@ -2124,11 +2191,16 @@ handle_guard_and(Guard, Map, Env, Eval, State) ->
 	false ->
 	  NewMap = join_maps_end([Map1, Map2], MapJ),
 	  NewType =
-	    case {t_atom_vals(Bool1), t_atom_vals(Bool2)} of
+	    case {t_atom_vals(Bool1, Opaques), t_atom_vals(Bool2, Opaques)} of
 	      {['true'] , ['true'] } -> t_atom(true);
 	      {['false'], _        } -> t_atom(false);
 	      {_        , ['false']} -> t_atom(false);
+              {unknown  , _        } ->
+                signal_guard_fail(Eval, Guard, [Type1, Type2], State);
+              {_        , unknown  } ->
+                signal_guard_fail(Eval, Guard, [Type1, Type2], State);
 	      {_        , _        } -> t_boolean()
+
 	    end,
 	  {NewMap, NewType}
       end
@@ -2136,6 +2208,7 @@ handle_guard_and(Guard, Map, Env, Eval, State) ->
 
 handle_guard_or(Guard, Map, Env, Eval, State) ->
   [Arg1, Arg2] = cerl:call_args(Guard),
+  Opaques = State#state.opaques,
   case Eval of
     pos ->
       MapJ = join_maps_begin(Map),
@@ -2149,19 +2222,23 @@ handle_guard_or(Guard, Map, Env, Eval, State) ->
 	catch
 	  throw:{fail,_} -> bind_guard(Arg2, MapJ, Env, dont_know, State)
 	end,
-      case ((t_is_atom(true, Bool1) andalso t_is_boolean(Bool2))
-	    orelse
-	    (t_is_atom(true, Bool2) andalso t_is_boolean(Bool1))) of
+      case
+        ((t_is_any_atom(true, Bool1, Opaques)
+          andalso t_is_boolean(Bool2, Opaques))
+         orelse
+           (t_is_any_atom(true, Bool2, Opaques)
+            andalso t_is_boolean(Bool1, Opaques)))
+      of
 	true -> {join_maps_end([Map1, Map2], MapJ), t_atom(true)};
 	false -> signal_guard_fail(Eval, Guard, [Bool1, Bool2], State)
       end;
     neg ->
       {Map1, Type1} = bind_guard(Arg1, Map, Env, neg, State),
-      case t_is_atom(false, Type1) of
+      case t_is_any_atom(false, Type1, Opaques) of
 	false -> signal_guard_fail(Eval, Guard, [Type1, t_any()], State);
 	true ->
 	  {Map2, Type2} = bind_guard(Arg2, Map1, Env, neg, State),
-	  case t_is_atom(false, Type2) of
+	  case t_is_any_atom(false, Type2, Opaques) of
 	    false -> signal_guard_fail(Eval, Guard, [Type1, Type2], State);
 	    true -> {Map2, t_atom(false)}
 	  end
@@ -2177,10 +2254,14 @@ handle_guard_or(Guard, Map, Env, Eval, State) ->
 	false ->
 	  NewMap = join_maps_end([Map1, Map2], MapJ),
 	  NewType =
-	    case {t_atom_vals(Bool1), t_atom_vals(Bool2)} of
+	    case {t_atom_vals(Bool1, Opaques), t_atom_vals(Bool2, Opaques)} of
 	      {['false'], ['false']} -> t_atom(false);
 	      {['true'] , _        } -> t_atom(true);
 	      {_        , ['true'] } -> t_atom(true);
+              {unknown  , _        } ->
+                signal_guard_fail(Eval, Guard, [Type1, Type2], State);
+              {_        , unknown  } ->
+                signal_guard_fail(Eval, Guard, [Type1, Type2], State);
 	      {_        , _        } -> t_boolean()
 	    end,
 	  {NewMap, NewType}
@@ -2189,10 +2270,11 @@ handle_guard_or(Guard, Map, Env, Eval, State) ->
 
 handle_guard_not(Guard, Map, Env, Eval, State) ->
   [Arg] = cerl:call_args(Guard),
+  Opaques = State#state.opaques,
   case Eval of
     neg ->
       {Map1, Type} = bind_guard(Arg, Map, Env, pos, State),
-      case t_is_atom(true, Type) of
+      case t_is_any_atom(true, Type, Opaques) of
 	true -> {Map1, t_atom(false)};
 	false ->
 	  {_, Type0} = bind_guard(Arg, Map, Env, Eval, State),
@@ -2200,7 +2282,7 @@ handle_guard_not(Guard, Map, Env, Eval, State) ->
       end;
     pos ->
       {Map1, Type} = bind_guard(Arg, Map, Env, neg, State),
-      case t_is_atom(false, Type) of
+      case t_is_any_atom(false, Type, Opaques) of
 	true -> {Map1, t_atom(true)};
 	false ->
 	  {_, Type0} = bind_guard(Arg, Map, Env, Eval, State),
@@ -2212,10 +2294,11 @@ handle_guard_not(Guard, Map, Env, Eval, State) ->
       case t_is_none(Bool) of
 	true -> throw({fatal_fail, none});
 	false ->
-	  case t_atom_vals(Bool) of
+	  case t_atom_vals(Bool, Opaques) of
 	    ['true'] -> {Map1, t_atom(false)};
 	    ['false'] -> {Map1, t_atom(true)};
-	    [_, _] -> {Map1, Bool}
+	    [_, _] -> {Map1, Bool};
+            unknown -> signal_guard_fail(Eval, Guard, [Type], State)
 	  end
       end
   end.
@@ -2231,31 +2314,47 @@ bind_guard_list([], Map, _Env, _Eval, _State, Acc) ->
 
 -type eval() :: 'pos' | 'neg' | 'dont_know'.
 
--spec signal_guard_fail(eval(), cerl:c_call(), [erl_types:erl_type()],
+-spec signal_guard_fail(eval(), cerl:c_call(), [type()],
 			state()) -> no_return().
 
 signal_guard_fail(Eval, Guard, ArgTypes, State) ->
+  signal_guard_failure(Eval, Guard, ArgTypes, fail, State).
+
+-spec signal_guard_fatal_fail(eval(), cerl:c_call(), [erl_types:erl_type()],
+			      state()) -> no_return().
+
+signal_guard_fatal_fail(Eval, Guard, ArgTypes, State) ->
+  signal_guard_failure(Eval, Guard, ArgTypes, fatal_fail, State).
+
+signal_guard_failure(Eval, Guard, ArgTypes, Tag, State) ->
   Args = cerl:call_args(Guard),
   F = cerl:atom_val(cerl:call_name(Guard)),
-  MFA = {cerl:atom_val(cerl:call_module(Guard)), F, length(Args)},
-  Msg =
+  {M, F, A} = MFA = {cerl:atom_val(cerl:call_module(Guard)), F, length(Args)},
+  Opaques = State#state.opaques,
+  {Kind, XInfo} =
+    case erl_bif_types:opaque_args(M, F, A, ArgTypes, Opaques) of
+      [] ->
+        {case Eval of
+           neg -> neg_guard_fail;
+           pos -> guard_fail;
+           dont_know -> guard_fail
+         end,
+         []};
+      Ns -> {opaque_guard, [Ns]}
+    end,
+  FArgs =
     case is_infix_op(MFA) of
       true ->
 	[ArgType1, ArgType2] = ArgTypes,
 	[Arg1, Arg2] = Args,
-	Kind = 
-	  case Eval of
-	    neg -> neg_guard_fail;
-	    pos -> guard_fail;
-	    dont_know -> guard_fail
-	  end,
-	{Kind, [format_args_1([Arg1], [ArgType1], State),
-		atom_to_list(F),
-		format_args_1([Arg2], [ArgType2], State)]};
+	[format_args_1([Arg1], [ArgType1], State),
+         atom_to_list(F),
+         format_args_1([Arg2], [ArgType2], State)] ++ XInfo;
       false ->
-	mk_guard_msg(Eval, F, Args, ArgTypes, State)
+        [F, format_args(Args, ArgTypes, State)]
     end,
-  throw({fail, {Guard, Msg}}).
+  Msg = {Kind, FArgs},
+  throw({Tag, {Guard, Msg}}).
 
 is_infix_op({erlang, '=:=', 2}) -> true;
 is_infix_op({erlang, '==', 2}) -> true;
@@ -2268,25 +2367,10 @@ is_infix_op({erlang, '>=', 2}) -> true;
 is_infix_op({M, F, A}) when is_atom(M), is_atom(F),
 			    is_integer(A), 0 =< A, A =< 255 -> false.
 
--spec signal_guard_fatal_fail(eval(), cerl:c_call(), [erl_types:erl_type()],
-			      state()) -> no_return().
-
-signal_guard_fatal_fail(Eval, Guard, ArgTypes, State) ->
-  Args = cerl:call_args(Guard),
-  F = cerl:atom_val(cerl:call_name(Guard)),
-  Msg = mk_guard_msg(Eval, F, Args, ArgTypes, State),
-  throw({fatal_fail, {Guard, Msg}}).
-
-mk_guard_msg(Eval, F, Args, ArgTypes, State) ->
-  FArgs = [F, format_args(Args, ArgTypes, State)],
-  case any_has_opaque_subtype(ArgTypes) of
-    true -> {opaque_guard, FArgs};
-    false ->
-      case Eval of
-	neg -> {neg_guard_fail, FArgs};
-	pos -> {guard_fail, FArgs};
-	dont_know -> {guard_fail, FArgs}
-      end
+bif_args(M, F, A) ->
+  case erl_bif_types:arg_types(M, F, A) of
+    unknown -> lists:duplicate(A, t_any());
+    List -> List
   end.
 
 bind_guard_case_clauses(Arg, Clauses, Map0, Env, Eval, State) ->
@@ -2366,14 +2450,15 @@ bind_guard_case_clauses(GenArgType, GenMap, ArgExpr, [Clause|Left],
 	  end,
 	  {NewMap3, CType} = bind_guard(cerl:clause_body(Clause), NewMap2,
 					Env, Eval, State),
+          Opaques = State#state.opaques,
 	  case Eval of
 	    pos ->
-	      case t_is_atom(true, CType) of
+	      case t_is_any_atom(true, CType, Opaques) of
 		true -> ok;
 		false -> throw({fail, none})
 	      end;
 	    neg ->
-	      case t_is_atom(false, CType) of
+	      case t_is_any_atom(false, CType, Opaques) of
 		true -> ok;
 		false -> throw({fail, none})
 	      end;
@@ -2501,8 +2586,11 @@ enter_type(Key, Val, MS) ->
 	    error ->
 	      ?debug("Entering ~p :: ~s\n", [KeyLabel, t_to_string(Val)]),
 	      case dict:find(KeyLabel, Dict) of
-		{ok, Val} -> MS;
-		{ok, _OldVal} -> store_map(KeyLabel, Val, MS);
+		{ok, Value} ->
+                  case erl_types:t_is_equal(Val, Value) of
+                    true -> MS;
+                    false -> store_map(KeyLabel, Val, MS)
+                  end;
 		error -> store_map(KeyLabel, Val, MS)
 	      end
 	  end
@@ -2611,10 +2699,15 @@ get_label(L) when is_integer(L) ->
 get_label(T) ->
   cerl_trees:get_label(T).
 
-t_is_simple(ArgType) ->
-  t_is_atom(ArgType) orelse t_is_number(ArgType) orelse t_is_port(ArgType)
-    orelse t_is_pid(ArgType) orelse t_is_reference(ArgType)
-    orelse t_is_nil(ArgType).
+t_is_simple(ArgType, State) ->
+  Opaques = State#state.opaques,
+  t_is_atom(ArgType, Opaques) orelse t_is_number(ArgType, Opaques)
+    orelse t_is_port(ArgType, Opaques)
+    orelse t_is_pid(ArgType, Opaques) orelse t_is_reference(ArgType, Opaques)
+    orelse t_is_nil(ArgType, Opaques).
+
+remove_local_opaque_types(Type, Opaques) ->
+  t_unopaque(Type, Opaques).
 
 %% t_is_structured(ArgType) ->
 %%   case t_is_nil(ArgType) of
@@ -2638,11 +2731,12 @@ is_call_to_send(Tree) ->
 	andalso (Arity =:= 2)
   end.
 
-any_opaque(Ts) ->
-  lists:any(fun erl_types:t_is_opaque/1, Ts).
-
-any_has_opaque_subtype(Ts) ->
-  lists:any(fun erl_types:t_has_opaque_subtype/1, Ts).
+is_lc_simple_list(Tree, TreeType, State) ->
+  Opaques = State#state.opaques,
+  Ann = cerl:get_ann(Tree),
+  lists:member(list_comprehension, Ann)
+    andalso t_is_list(TreeType)
+    andalso t_is_simple(t_list_elements(TreeType, Opaques), State).
 
 filter_match_fail([Clause] = Cls) ->
   Body = cerl:clause_body(Clause),
@@ -2662,12 +2756,6 @@ filter_match_fail([]) ->
   %%      receive after 1 -> ok end
   [].
 
-determine_mode(Type, Opaques) ->
-  case lists:member(Type, Opaques) of
-    true  -> opaque;
-    false -> structured
-  end.
-
 %%% ===========================================================================
 %%%
 %%%  The State.
@@ -2679,7 +2767,7 @@ state__new(Callgraph, Tree, Plt, Module, Records) ->
     erl_types:t_opaque_from_records(Records),
   TreeMap = build_tree_map(Tree),
   Funs = dict:fetch_keys(TreeMap),
-  FunTab = init_fun_tab(Funs, dict:new(), TreeMap, Callgraph, Plt, Opaques),
+  FunTab = init_fun_tab(Funs, dict:new(), TreeMap, Callgraph, Plt),
   ExportedFuns =
     [Fun || Fun <- Funs--[top], dialyzer_callgraph:is_escaping(Fun, Callgraph)],
   Work = init_work(ExportedFuns),
@@ -2740,12 +2828,14 @@ state__add_warning(#state{warnings = Warnings, warning_mode = true} = State,
   case Force of
     true ->
       Warn = {Tag, {get_file(Ann), abs(get_line(Ann))}, Msg},
+      ?debug("MSG ~s\n", [dialyzer:format_warning(Warn)]),
       State#state{warnings = [Warn|Warnings]};
     false ->
       case is_compiler_generated(Ann) of
 	true -> State;
 	false ->
 	  Warn = {Tag, {get_file(Ann), get_line(Ann)}, Msg},
+          ?debug("MSG ~s\n", [dialyzer:format_warning(Warn)]),
 	  State#state{warnings = [Warn|Warnings]}
       end
   end.
@@ -2829,12 +2919,11 @@ state__get_warnings(#state{tree_map = TreeMap, fun_tab = FunTab,
 state__is_escaping(Fun, #state{callgraph = Callgraph}) ->
   dialyzer_callgraph:is_escaping(Fun, Callgraph).
 
-state__lookup_type_for_rec_var(Var, #state{callgraph = Callgraph} = State) ->
+state__lookup_type_for_letrec(Var, #state{callgraph = Callgraph} = State) ->
   Label = get_label(Var),
-  case dialyzer_callgraph:lookup_rec_var(Label, Callgraph) of
+  case dialyzer_callgraph:lookup_letrec(Label, Callgraph) of
     error -> error;
-    {ok, MFA} ->
-      {ok, FunLabel} = dialyzer_callgraph:lookup_label(MFA, Callgraph),
+    {ok, FunLabel} ->
       {ok, state__fun_type(FunLabel, State)}
   end.
 
@@ -2876,10 +2965,10 @@ build_tree_map(Tree) ->
     end,
   cerl_trees:fold(Fun, dict:new(), Tree).
 
-init_fun_tab([top|Left], Dict, TreeMap, Callgraph, Plt, Opaques) ->
+init_fun_tab([top|Left], Dict, TreeMap, Callgraph, Plt) ->
   NewDict = dict:store(top, {[], t_none()}, Dict),
-  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt, Opaques);
-init_fun_tab([Fun|Left], Dict, TreeMap, Callgraph, Plt, Opaques) ->
+  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt);
+init_fun_tab([Fun|Left], Dict, TreeMap, Callgraph, Plt) ->
   Arity = cerl:fun_arity(dict:fetch(Fun, TreeMap)),
   FunEntry =
     case dialyzer_callgraph:is_escaping(Fun, Callgraph) of
@@ -2896,8 +2985,8 @@ init_fun_tab([Fun|Left], Dict, TreeMap, Callgraph, Plt, Opaques) ->
       false -> {not_handled, {lists:duplicate(Arity, t_none()), t_unit()}}
     end,
   NewDict = dict:store(Fun, FunEntry, Dict),
-  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt, Opaques);
-init_fun_tab([], Dict, _TreeMap, _Callgraph, _Plt, _Opaques) ->
+  init_fun_tab(Left, NewDict, TreeMap, Callgraph, Plt);
+init_fun_tab([], Dict, _TreeMap, _Callgraph, _Plt) ->
   ?debug("DICT:~p\n",[dict:to_list(Dict)]),
   Dict.
 
@@ -2946,34 +3035,27 @@ state__update_fun_entry(Tree, ArgTypes, Out0,
     if Fun =:= top -> Out0;
        true ->
 	case lookup_fun_sig(Fun, CG, Plt) of
-	  {value, {SigRet, _}} -> t_inf(SigRet, Out0, opaque);
+	  {value, {SigRet, _}} -> t_inf(SigRet, Out0);
 	  none -> Out0
 	end
     end,
   Out = t_limit(Out1, ?TYPE_LIMIT),
-  case dict:find(Fun, FunTab) of
-    {ok, {ArgTypes, OldOut}} ->
-      case t_is_equal(OldOut, Out) of
-	true ->
-	  ?debug("Fixpoint for ~w: ~s\n",
-		 [state__lookup_name(Fun, State),
-		  t_to_string(t_fun(ArgTypes, Out))]),
-	  State;
-	false ->
-	  NewEntry = {ArgTypes, Out},
-	  ?debug("New Entry for ~w: ~s\n",
-		 [state__lookup_name(Fun, State),
-		  t_to_string(t_fun(ArgTypes, Out))]),
-	  NewFunTab = dict:store(Fun, NewEntry, FunTab),
-	  State1 = State#state{fun_tab = NewFunTab},
-	  state__add_work_from_fun(Tree, State1)
-      end;
-    {ok, {NewArgTypes, _OldOut}} ->
-      %% Can only happen in self-recursive functions. Only update the out type.
-      NewEntry = {NewArgTypes, Out},
+  {ok, {OldArgTypes, OldOut}} = dict:find(Fun, FunTab),
+  SameArgs = lists:all(fun({A, B}) -> erl_types:t_is_equal(A, B)
+                       end, lists:zip(OldArgTypes, ArgTypes)),
+  SameOut = t_is_equal(OldOut, Out),
+  if
+    SameArgs, SameOut ->
+      ?debug("Fixpoint for ~w: ~s\n",
+	     [state__lookup_name(Fun, State),
+	      t_to_string(t_fun(ArgTypes, Out))]),
+      State;
+    true ->
+      %% Can only happen in self-recursive functions.
+      NewEntry = {OldArgTypes, Out},
       ?debug("New Entry for ~w: ~s\n",
 	     [state__lookup_name(Fun, State),
-	      t_to_string(t_fun(NewArgTypes, Out))]),
+	      t_to_string(t_fun(OldArgTypes, Out))]),
       NewFunTab = dict:store(Fun, NewEntry, FunTab),
       State1 = State#state{fun_tab = NewFunTab},
       state__add_work_from_fun(Tree, State1)
@@ -2994,7 +3076,7 @@ state__add_work_from_fun(Tree, #state{callgraph = Callgraph,
 	  %% Must filter the result for results in this module.
 	  FilteredList = [L || {ok, L} <- LabelList, dict:is_key(L, TreeMap)],
 	  ?debug("~w: Will try to add:~w\n",
-		 [state__lookup_name(get_label(Tree), State), MFAList]),
+		 [state__lookup_name(Label, State), MFAList]),
 	  lists:foldl(fun(L, AccState) ->
 			  state__add_work(L, AccState)
 		      end, State, FilteredList)
@@ -3055,7 +3137,8 @@ forward_args(Fun, ArgTypes, #state{work = Work, fun_tab = FunTab} = State) ->
   case Fixpoint of
     true -> State;
     false ->
-      NewArgTypes = [t_sup(X, Y) || {X, Y} <- lists:zip(ArgTypes, OldArgTypes)],
+      NewArgTypes = [t_sup(X, Y) ||
+                      {X, Y} <- lists:zip(ArgTypes, OldArgTypes)],
       NewWork = add_work(Fun, Work),
       ?debug("~w: forwarding args ~s\n",
 	     [state__lookup_name(Fun, State),
@@ -3093,7 +3176,7 @@ state__get_callgraph(#state{callgraph = Callgraph}) ->
 state__get_races(#state{races = Races}) ->
   Races.
 
--spec state__get_records(state()) -> dict().
+-spec state__get_records(state()) -> types().
 
 state__get_records(#state{records = Records}) ->
   Records.
@@ -3192,7 +3275,7 @@ get_file([_|Tail]) -> get_file(Tail).
 is_compiler_generated(Ann) ->
   lists:member(compiler_generated, Ann) orelse (get_line(Ann) < 1).
 
--spec format_args([cerl:cerl()], [erl_types:erl_type()], state()) ->
+-spec format_args([cerl:cerl()], [type()], state()) ->
   nonempty_string().
 
 format_args([], [], _State) ->
@@ -3227,25 +3310,25 @@ format_arg(Arg) ->
       Default
   end.
 
--spec format_type(erl_types:erl_type(), state()) -> string().
+-spec format_type(type(), state()) -> string().
 
 format_type(Type, #state{records = R}) ->
   t_to_string(Type, R).
 
--spec format_field_diffs(erl_types:erl_type(), state()) -> string().
+-spec format_field_diffs(type(), state()) -> string().
 
 format_field_diffs(RecConstruction, #state{records = R}) ->
   erl_types:record_field_diffs_to_string(RecConstruction, R).
 
--spec format_sig_args(erl_types:erl_type(), state()) -> string().
+-spec format_sig_args(type(), state()) -> string().
 
-format_sig_args(Type, #state{records = R}) ->
-  SigArgs = t_fun_args(Type),
+format_sig_args(Type, #state{opaques = Opaques} = State) ->
+  SigArgs = t_fun_args(Type, Opaques),
   case SigArgs of
     [] -> "()";
     [SArg|SArgs] ->
-      lists:flatten("(" ++ t_to_string(SArg, R)
-		        ++ ["," ++ t_to_string(T, R) || T <- SArgs] ++ ")")
+      lists:flatten("(" ++ format_type(SArg, State)
+		        ++ ["," ++ format_type(T, State) || T <- SArgs] ++ ")")
     end.
 
 format_cerl(Tree) ->
diff --git a/lib/dialyzer/src/dialyzer_dep.erl b/lib/dialyzer/src/dialyzer_dep.erl
index febb65b766..f1ac41ff04 100644
--- a/lib/dialyzer/src/dialyzer_dep.erl
+++ b/lib/dialyzer/src/dialyzer_dep.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
-%% analyze(CoreTree) -> {Deps, Esc, Calls}.
+%% analyze(CoreTree) -> {Deps, Esc, Calls, Letrecs}.
 %%
 %% Deps =  a dict mapping labels of functions to an ordset of functions
 %%         it calls.
@@ -53,18 +53,24 @@
 %%         which the operation can refer to. If 'external' is part of
 %%         the set the operation can be externally defined.
 %%
+%% Letrecs = a dict mapping var labels to their recursive definition.
+%%           top-level letrecs are not included as they are handled
+%%           separatedly.
+%%
 
--spec analyze(cerl:c_module()) -> {dict(), ordset('external' | label()), dict()}.
+-spec analyze(cerl:c_module()) ->
+        {dict:dict(), ordset('external' | label()), dict:dict(), dict:dict()}.
 
 analyze(Tree) ->
   %% io:format("Handling ~w\n", [cerl:atom_val(cerl:module_name(Tree))]),
   {_, State} = traverse(Tree, map__new(), state__new(Tree), top),
   Esc = state__esc(State), 
-  %% Add dependency from 'external' to all escaping function
+  %% Add dependency from 'external' to all escaping functions
   State1 = state__add_deps(external, output(Esc), State),
   Deps = state__deps(State1),
   Calls = state__calls(State1),
-  {map__finalize(Deps), set__to_ordsets(Esc), map__finalize(Calls)}.
+  Letrecs = state__letrecs(State1),
+  {map__finalize(Deps), set__to_ordsets(Esc), map__finalize(Calls), Letrecs}.
 
 traverse(Tree, Out, State, CurrentFun) ->
   %% io:format("Type: ~w\n", [cerl:type(Tree)]),
@@ -131,9 +137,12 @@ traverse(Tree, Out, State, CurrentFun) ->
     letrec ->
       Defs = cerl:letrec_defs(Tree),
       Body = cerl:letrec_body(Tree),
+      State1 = lists:foldl(fun({ Var, Fun }, Acc) ->
+	state__add_letrecs(cerl_trees:get_label(Var), cerl_trees:get_label(Fun), Acc)
+      end, State, Defs),
       Out1 = bind_defs(Defs, Out),
-      State1 = traverse_defs(Defs, Out1, State, CurrentFun),
-      traverse(Body, Out1, State1, CurrentFun);
+      State2 = traverse_defs(Defs, Out1, State1, CurrentFun),
+      traverse(Body, Out1, State2, CurrentFun);
     literal ->
       {output(none), State};
     module ->
@@ -173,6 +182,15 @@ traverse(Tree, Out, State, CurrentFun) ->
       Args = cerl:tuple_es(Tree),
       {List, State1} = traverse_list(Args, Out, State, CurrentFun),
       {merge_outs(List), State1};
+    map ->
+      Args = cerl:map_es(Tree),
+      {List, State1} = traverse_list(Args, Out, State, CurrentFun),
+      {merge_outs(List), State1};
+    map_pair ->
+      Key = cerl:map_pair_key(Tree),
+      Val = cerl:map_pair_val(Tree),
+      {List, State1} = traverse_list([Key,Val], Out, State, CurrentFun),
+      {merge_outs(List), State1};
     values ->      
       traverse_list(cerl:values_es(Tree), Out, State, CurrentFun);
     var ->
@@ -291,7 +309,7 @@ primop(Tree, ArgFuns, State) ->
 %% Set
 %%
 
--record(set, {set :: set()}).
+-record(set, {set :: sets:set()}).
 
 set__singleton(Val) ->
   #set{set = sets:add_element(Val, sets:new())}.
@@ -460,18 +478,30 @@ all_vars(Tree, AccIn) ->
 
 -type local_set() :: 'none' | #set{}.
 
--record(state, {deps    :: dict(), 
+-record(state, {deps    :: dict:dict(),
 		esc     :: local_set(), 
-		call    :: dict(), 
-		arities :: dict()}).
+		call    :: dict:dict(),
+		arities :: dict:dict(),
+		letrecs :: dict:dict()}).
 
 state__new(Tree) ->
   Exports = set__from_list([X || X <- cerl:module_exports(Tree)]),
-  InitEsc = set__from_list([cerl_trees:get_label(Fun) 
-			    || {Var, Fun} <- cerl:module_defs(Tree),
-			       set__is_element(Var, Exports)]),
+  %% get the labels of all exported functions
+  ExpLs = [cerl_trees:get_label(Fun) || {Var, Fun} <- cerl:module_defs(Tree),
+					set__is_element(Var, Exports)],
+  %% make sure to also initiate an analysis from all functions called
+  %% from on_load attributes; in Core these exist as a list of {F,A} pairs
+  OnLoadFAs = lists:flatten([cerl:atom_val(Args)
+			     || {Attr, Args} <- cerl:module_attrs(Tree),
+				cerl:atom_val(Attr) =:= on_load]),
+  OnLoadLs = [cerl_trees:get_label(Fun)
+	      || {Var, Fun} <- cerl:module_defs(Tree),
+		 lists:member(cerl:var_name(Var), OnLoadFAs)],
+  %% init the escaping function labels to exported + called from on_load
+  InitEsc = set__from_list(OnLoadLs ++ ExpLs),
   Arities = cerl_trees:fold(fun find_arities/2, dict:new(), Tree),
-  #state{deps = map__new(), esc = InitEsc, call = map__new(), arities = Arities}.
+  #state{deps = map__new(), esc = InitEsc, call = map__new(),
+	 arities = Arities, letrecs = map__new()}.
 
 find_arities(Tree, AccMap) ->
   case cerl:is_c_fun(Tree) of
@@ -490,9 +520,15 @@ state__add_deps(From, #output{type = single, content=To},
   %% io:format("Adding deps from ~w to ~w\n", [From, set__to_ordsets(To)]),
   State#state{deps = map__add(From, To, Map)}.
 
+state__add_letrecs(Var, Fun, #state{letrecs = Map} = State) ->
+  State#state{letrecs = map__store(Var, Fun, Map)}.
+
 state__deps(#state{deps = Deps}) ->
   Deps.
 
+state__letrecs(#state{letrecs = Letrecs}) ->
+  Letrecs.
+
 state__add_esc(#output{content = none}, State) ->
   State;
 state__add_esc(#output{type = single, content = Set},
diff --git a/lib/dialyzer/src/dialyzer_gui.erl b/lib/dialyzer/src/dialyzer_gui.erl
deleted file mode 100644
index 97e5752577..0000000000
--- a/lib/dialyzer/src/dialyzer_gui.erl
+++ /dev/null
@@ -1,1381 +0,0 @@
-%% -*- erlang-indent-level: 2 -*-
-%%------------------------------------------------------------------------
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
-%% 
-%% The 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_gui.erl
-%%% Authors : Tobias Lindahl <[email protected]>
-%%%           Kostis Sagonas <[email protected]>
-%%% Description : The graphical user interface for the Dialyzer tool.
-%%%
-%%% Created : 27 Apr 2004 by Tobias Lindahl <[email protected]>
-%%%-----------------------------------------------------------------------
-
--module(dialyzer_gui).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,editor,2}},
-          {nowarn_deprecated_function,{gs,entry,2}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,listbox,2}},
-          {nowarn_deprecated_function,{gs,menu,2}},
-          {nowarn_deprecated_function,{gs,menubar,2}},
-          {nowarn_deprecated_function,{gs,menubutton,2}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,radiobutton,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,stop,0}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
--export([start/1]).
-
--include("dialyzer.hrl").
-
-%%------------------------------------------------------------------------
-
--define(DIALYZER_ERROR_TITLE,   "Dialyzer Error").
--define(DIALYZER_MESSAGE_TITLE, "Dialyzer Message").
-
-%%------------------------------------------------------------------------
-
--type gs_object() :: any().  %% XXX: should be imported from gs
-
--record(mode, {start_byte_code   :: gs_object(),
-	       start_src_code    :: gs_object()}).
-
--record(menu, {file_save_log     :: gs_object(),
-	       file_save_warn    :: gs_object(),
-	       file_quit         :: gs_object(),
-	       help_about        :: gs_object(),
-	       help_manual       :: gs_object(),
-	       help_warnings     :: gs_object(),
-	       opts_macros       :: gs_object(),
-	       opts_includes     :: gs_object(),
-	       plt_empty         :: gs_object(),
-	       plt_search_doc    :: gs_object(),
-	       plt_show_doc      :: gs_object(),
-	       warnings          :: gs_object()}).
-
--record(gui_state, {add_all      :: gs_object(),
-		    add_file     :: gs_object(),
-		    add_rec      :: gs_object(),
-		    chosen_box   :: gs_object(),
-		    analysis_pid :: pid(),
-		    del_file     :: gs_object(),
-		    doc_plt      :: dialyzer_plt:plt(),
-		    clear_chosen :: gs_object(),
-		    clear_log    :: gs_object(),
-		    clear_warn   :: gs_object(),
-		    init_plt     :: dialyzer_plt:plt(),
-		    dir_entry    :: gs_object(),
-		    file_box     :: gs_object(),
-		    file_wd      :: gs_object(),
-		    gs           :: gs_object(),
-		    log          :: gs_object(),
-		    menu         :: #menu{},
-		    mode         :: #mode{},
-		    options      :: #options{},
-		    packer       :: gs_object(),
-		    run          :: gs_object(),
-		    stop         :: gs_object(),
-		    top          :: gs_object(),
-		    warnings_box :: gs_object(),
-		    backend_pid  :: pid()}).
-	       
-%%------------------------------------------------------------------------
-
--spec start(#options{}) -> ?RET_NOTHING_SUSPICIOUS.
-
-start(#options{from = From, init_plts = InitPltFiles,
-               legal_warnings = LegalWarnings} = DialyzerOptions) ->
-  process_flag(trap_exit, true),
-
-  GS = gs:start(),
-  code:add_pathsa(["."]),
-  WH = [{width, 1000}, {height, 550}],
-  EmptySpace = {stretch, 1},
-
-  {ok, Host} = inet:gethostname(),
-  %% --------- Top Window --------------
-  TopWin = gs:window(GS, [{title, "Dialyzer " ++ ?VSN ++ " @ " ++ Host},
-			  {configure, true},
-			  {default, listbox, {bg, white}},
-			  {default, editor, {bg, white}},
-			  {default, entry, {bg, white}},
-			  {default, button, {font, {helvetica, bold, 12}}},
-			  {default, label, {font, {helvetica, bold, 12}}}
-			  |WH]),
-  Packer = gs:frame(TopWin, [{packer_x, [{stretch, 3},{fixed, 200},
-					 {stretch, 7}]},
-			     {packer_y, [{fixed, 25}, {fixed, 20},
-					 {stretch, 1, 50},
-					 {fixed, 25}, {fixed, 20},
-					 {stretch, 1, 50},
-					 {fixed, 25}]}]),
-
-  %% --------- Chosen box --------------
-  gs:label(Packer, [{label, {text, "Directories or modules to analyze"}}, 
-		    {height, 20}, {pack_xy, {1, 2}}]),
-  ChosenBox = gs:listbox(Packer, [{pack_xy, {1, 3}}, {vscroll, right},
-				  {selectmode, multiple}]),
-
-  %% --------- File box --------------
-  gs:label(Packer, [{label, {text, "File"}}, {height, 20}, {pack_xy, {1,5}}]),
-  FilePacker = gs:frame(Packer, [{packer_x, [{fixed, 30}, {stretch, 1, 100}]},
-				 {packer_y, [{fixed, 25}, {stretch, 1, 25}]},
-				 {pack_xy, {1, 6}}]),
-  gs:label(FilePacker, [{label, {text, "Dir:"}}, {pack_xy, {1, 1}}]),
-  DirEntry = gs:entry(FilePacker, [{height, 30}, {pack_xy, {2, 1}},
-				   {keypress, true}]),
-  File = gs:listbox(FilePacker, [{pack_x, {1,2}}, {pack_y, 2},
-				 {selectmode, multiple}, {doubleclick, true}, 
-				 {vscroll, right}]),
-
-  %% --------- Options --------------
-  gs:label(Packer, [{label, {text, "Analysis Options"}}, 
-		    {height, 20}, {pack_xy, {2, 2}}]),
-  ModePacker = gs:frame(Packer, [{packer_x, [{fixed, 75}, {fixed, 120}]},
-				 {packer_y, [{fixed, 20}, {fixed, 20},
-					     {fixed, 20},
-					     %% EmptySpace,
-					     {fixed, 20}, {fixed, 20}, 
-					     {fixed, 20}, EmptySpace]},
-				 {bw, 10}, {relief, flat},
-				 {default, {radiobutton, {align, w}}},
-				 {default, {label, {align, w}}},
-				 {pack_xy, {2, 3}}]),
-
-  %% Bytecode vs. Source code
-  gs:label(ModePacker, [{label, {text, "File Type:"}},
-			{height, 20}, {pack_xy, {1,1}}]),
-  {ByteSel, SrcSel} = case From of
-			byte_code -> {[{select, true}], []}; 
-			src_code -> {[], [{select, true}]}
-		      end,
-  ModeByteCode = gs:radiobutton(ModePacker,
-				ByteSel ++ [{group, start_from},
-					    {label, {text,"BeamFiles"}},
-					    {pack_xy, {2,1}}]),
-  ModeSrcCode = gs:radiobutton(ModePacker,
-			       SrcSel ++ [{group, start_from},
-					  {label, {text,"SourceFiles"}},
-					  {pack_xy, {2,2}}]),
-  Mode = #mode{start_byte_code = ModeByteCode,
-	       start_src_code = ModeSrcCode},
-
-  %% --------- Log box --------------
-  gs:label(Packer, [{label, {text, "Log"}}, {height, 20}, {pack_xy, {3,2}}]),
-  Log = gs:editor(Packer, [{pack_x, 3}, {pack_y, 3}, {enable, false},
-			   {font, {courier, 12}}, {vscroll, right},
-			   {wrap, word}]),
-
-  %% --------- Warnings box --------------
-  gs:label(Packer, [{label, {text, "Warnings"}},{height, 20},{pack_xy, {3,5}}]),
-  WarningsBox = gs:editor(Packer, [{pack_x, {2,3}}, {pack_y, 6},
-				   {enable, false},
-				   {font, {courier, 12}}, {vscroll, right},
-				   {wrap, word}]),
-
-  %% --------- Buttons --------------
-  ButtonPackerHighLeft = 
-    gs:frame(Packer, [{packer_x, [{fixed, 50}, {fixed, 65}, EmptySpace]},
-		      {pack_xy, {1,4}}]),
-  ButtonPackerHighRight = 
-    gs:frame(Packer, [{packer_x, [{fixed, 70}, {fixed, 70}, EmptySpace]},
-		      {pack_xy, {3,4}}]),
-  ButtonPackerLowLeft = 
-    gs:frame(Packer, [{packer_x, [{fixed, 50},
-				  {fixed, 60},
-				  {fixed, 110},
-				  EmptySpace]},
-		      {pack_xy, {1,7}}]),
-  ButtonPackerLowRight = 
-    gs:frame(Packer, [{packer_x, [{fixed, 100},
-				  {fixed, 70},
-				  EmptySpace,
-				  {fixed, 70},
-				  {fixed, 70}]}, 
-		      {pack_x, {2,3}}, {pack_y, 7}]),
-
-  WHButton = [{width, 60}, {height, 20}],
-  AddFile = gs:button(ButtonPackerLowLeft, [{pack_xy, {1, 1}}, 
-					    {label, {text,"Add"}}|WHButton]),
-  AddAll = gs:button(ButtonPackerLowLeft, [{pack_xy, {2, 1}}, 
-					   {label, {text,"Add All"}}|WHButton]),
-  AddRec = gs:button(ButtonPackerLowLeft, [{pack_xy, {3, 1}}, 
-                                           {label, {text,"Add Recursively"}}
-                                           |WHButton]),
-  DelFile = gs:button(ButtonPackerHighLeft, [{pack_xy, {1, 1}}, 
-					    {label, {text,"Delete"}}|WHButton]),
-  ClearChosen = gs:button(ButtonPackerHighLeft, [{pack_xy, {2, 1}},
-					         {label, {text,"Delete All"}}
-					         |WHButton]),
-  ClearLog = gs:button(ButtonPackerHighRight, [{pack_xy, {1, 1}}, 
-					       {label, {text,"Clear Log"}}
-					       |WHButton]),
-  ClearWarn = gs:button(ButtonPackerLowRight, [{pack_xy, {1, 1}}, 
-					       {label, {text,"Clear Warnings"}}
-					       |WHButton]),
-
-  Run = gs:button(ButtonPackerLowRight, [{pack_xy, {4, 1}},
-					 {label, {text,"Run"}}|WHButton]),
-  Stop = gs:button(ButtonPackerLowRight, [{pack_xy, {5, 1}}, {enable, false}, 
-					  {label, {text,"Stop"}}|WHButton]),
-
-  %% --------- Menu --------------  
-  MenuBar = gs:menubar(TopWin, []),
-
-  %% File Menu
-  MenuBarFile = gs:menubutton(MenuBar, [{label, {text, "File"}}]),
-  MenuFile = gs:menu(MenuBarFile, []),
-  MenuFileSaveWarn = gs:menuitem(MenuFile, [{label, {text, "Save Warnings"}}]),
-  MenuFileSaveLog = gs:menuitem(MenuFile, [{label, {text, "Save Log"}}]),
-  MenuFileQuit = gs:menuitem(MenuFile, [{label, {text, "Quit"}}]),
-
-  %% Warnings Menu
-  MenuBarWarn = gs:menubutton(MenuBar, [{label, {text, "Warnings"}}]),
-  MenuWarn = gs:menu(MenuBarWarn, []),
-  MenuWarnMatch = gs:menuitem(MenuWarn, [{label, {text, "Match failures"}}, 
-					 {itemtype, check}, {select, true}]),
-  MenuWarnFailingCall = gs:menuitem(MenuWarn, 
-				    [{label, {text, "Failing function calls"}},
-				     {itemtype, check}, {select, true}]),
-  MenuWarnFunApp = gs:menuitem(MenuWarn, [{label, 
-					   {text, "Bad fun applications"}},
-					  {itemtype, check}, {select, true}]),
-  MenuWarnOpaque = gs:menuitem(MenuWarn, [{label, 
-					   {text, "Opaqueness violations"}},
-					  {itemtype, check}, {select, true}]),
-  MenuWarnLists = gs:menuitem(MenuWarn,
-			      [{label, {text, "Improper list constructions"}}, 
-			       {itemtype, check}, {select, true}]),
-  MenuWarnNotCalled = gs:menuitem(MenuWarn, 
-				  [{label, {text, "Unused functions"}}, 
-				   {itemtype, check}, {select, true}]),
-  MenuWarnReturnOnlyExit = gs:menuitem(MenuWarn,
-				       [{label, 
-					 {text, "Error handling functions"}},
-					{itemtype, check}, {select, false}]),
-  MenuWarnReturnNoReturn = gs:menuitem(MenuWarn,
-				       [{label,
-					 {text, "Functions of no return"}},
-					{itemtype, check}, {select, true}]),  
-  MenuWarnCallNonExported = gs:menuitem(MenuWarn,
-					[{label, 
-					  {text, "Call to unexported function"}},
-					 {itemtype, check}, {select, true}]), 
-  MenuWarnRaceCondition = gs:menuitem(MenuWarn,
-				      [{label,
-                                        {text,"Possible race conditions"}},
-                                       {itemtype, check}, {select, false}]),
-  MenuWarnContractTypes = gs:menuitem(MenuWarn,
-				      [{label, {text, "Wrong contracts"}},
-				       {itemtype, check}, {select, true}]),
-  MenuWarnContractSyntax = gs:menuitem(MenuWarn,
-				       [{label,
-					 {text, "Wrong contract syntax"}},
-					{itemtype, check}, {select, true}]),
-  
-  %% PLT Menu
-  MenuBarPLT = gs:menubutton(MenuBar, [{label, {text,"PLT"}}]),
-  MenuPLT = gs:menu(MenuBarPLT, []),
-  MenuPLTEmpty = gs:menuitem(MenuPLT, [{label, {text, "Init with empty PLT"}},
-				       {itemtype, check}, {select, false}]),
-  MenuPLTShow = gs:menuitem(MenuPLT, [{label, {text, "Show contents"}}]),
-  MenuPLTSearch = gs:menuitem(MenuPLT, [{label, {text, "Search contents"}}]),
-
-  %% Options Menu
-  MenuBarOpts = gs:menubutton(MenuBar, [{label,{text,"Options"}}]),
-  MenuOpts = gs:menu(MenuBarOpts, []),
-  MenuOptsMacros = gs:menuitem(MenuOpts,
-			       [{label, {text, "Manage Macro Definitions"}}]),
-  MenuOptsIncludes = gs:menuitem(MenuOpts,
-				 [{label, {text, "Manage Include Directories"}}]),
-  
-  %% Help
-  MenuBarHelp = gs:menubutton(MenuBar, [{label, {text, "Help"}}, {side, right}]),
-  MenuHelp = gs:menu(MenuBarHelp, []),
-  MenuHelpManual = gs:menuitem(MenuHelp, [{label, {text, "Manual"}}]),
-  MenuHelpWarnings = gs:menuitem(MenuHelp, [{label, {text, "Warning Options"}}]),
-  MenuHelpAbout = gs:menuitem(MenuHelp, [{label, {text, "About"}}]),
-  
-  Warnings = [{?WARN_RETURN_NO_RETURN, MenuWarnReturnNoReturn},
-	      {?WARN_RETURN_ONLY_EXIT, MenuWarnReturnOnlyExit},
-	      {?WARN_NOT_CALLED, MenuWarnNotCalled},
-	      {?WARN_NON_PROPER_LIST, MenuWarnLists},
-	      {?WARN_FUN_APP, MenuWarnFunApp},
-	      {?WARN_MATCHING, MenuWarnMatch},
-	      {?WARN_OPAQUE, MenuWarnOpaque},
-	      {?WARN_FAILING_CALL, MenuWarnFailingCall},
-	      {?WARN_CALLGRAPH, MenuWarnCallNonExported},
-              {?WARN_RACE_CONDITION, MenuWarnRaceCondition},
-	      %% For contracts. 
-	      {?WARN_CONTRACT_TYPES, MenuWarnContractTypes},
-	      {?WARN_CONTRACT_SYNTAX, MenuWarnContractSyntax}
-	     ],
-
-  init_warnings(Warnings, LegalWarnings),
-
-  Menu = #menu{file_quit = MenuFileQuit,
-	       plt_empty = MenuPLTEmpty,
-	       help_manual = MenuHelpManual,
-	       help_about = MenuHelpAbout,
-	       help_warnings = MenuHelpWarnings,
-	       opts_macros = MenuOptsMacros,
-	       opts_includes = MenuOptsIncludes,
-	       plt_search_doc = MenuPLTSearch,
-	       plt_show_doc = MenuPLTShow,
-	       file_save_log = MenuFileSaveLog,
-	       file_save_warn = MenuFileSaveWarn,
-	       warnings = Warnings},
-
-  %% --------- Init --------------
-  gs:config(TopWin, [{map, true}]),
-  gs:config(Packer, WH),
-  {ok, CWD} = file:get_cwd(),
-  
-  InitPlt =
-    case InitPltFiles of
-      [] -> dialyzer_plt:new();
-      _ ->
-        Plts = [dialyzer_plt:from_file(F) || F <- InitPltFiles],
-        dialyzer_plt:merge_plts_or_report_conflicts(InitPltFiles, Plts)
-    end,
-
-  State = #gui_state{add_all = AddAll,
-		     add_file = AddFile,
-		     add_rec = AddRec,
-		     chosen_box = ChosenBox, 
-		     clear_chosen = ClearChosen, 
-		     clear_log = ClearLog, 
-		     clear_warn = ClearWarn, 
-		     del_file = DelFile, 
-		     doc_plt = dialyzer_plt:new(),
-		     dir_entry = DirEntry,
-		     file_box = File, 
-		     file_wd = CWD,
-		     gs = GS,
-		     init_plt = InitPlt,
-		     log = Log,
-		     menu = Menu,
-		     mode = Mode,
-		     options = DialyzerOptions,
-		     packer = Packer, 
-		     run = Run,
-		     stop = Stop,
-		     top = TopWin, 
-		     warnings_box = WarningsBox},
-  NewState = change_dir_or_add_file(State, "."),
-  gui_loop(NewState).
-
-%% ----------------------------------------------------------------
-%%
-%%  Main GUI Loop
-%%
-
--spec gui_loop(#gui_state{}) -> ?RET_NOTHING_SUSPICIOUS.
-
-gui_loop(#gui_state{add_all = AddAll, add_file = AddFile, add_rec = AddRec,
-		    backend_pid = BackendPid, chosen_box = ChosenBox,
-		    clear_chosen = ClearChosen, clear_log = ClearLog,
-		    clear_warn = ClearWarn, del_file = DelFile,
-		    dir_entry = DirEntry, file_box = File, log = Log,
-		    menu = Menu, packer = Packer, run = Run, stop = Stop,
-		    top = TopWin, warnings_box = Warn} = State) ->
-  %% --- Menu ---
-  Quit = Menu#menu.file_quit,
-  Manual = Menu#menu.help_manual,
-  Warnings = Menu#menu.help_warnings,
-  About = Menu#menu.help_about,
-  SaveLog = Menu#menu.file_save_log,
-  SaveWarn = Menu#menu.file_save_warn,
-  SearchPlt = Menu#menu.plt_search_doc,
-  ShowPlt = Menu#menu.plt_show_doc,
-  Macros = Menu#menu.opts_macros,
-  Includes = Menu#menu.opts_includes,
-  
-  receive
-    {gs, TopWin, configure, _Data, [W, H|_]} ->
-      gs:config(Packer, [{width, W}, {height, H}]),
-      gui_loop(State);
-    {gs, TopWin, destroy, _Data, _Args} ->
-      ?RET_NOTHING_SUSPICIOUS;
-    {gs, File, doubleclick, _, [_Id, Text|_]} ->
-      NewState = change_dir_or_add_file(State, Text),
-      gui_loop(NewState);
-    {gs, DirEntry, keypress, _, ['Return'|_]} ->
-      gs:config(TopWin, [{setfocus, true}]),
-      NewState = change_dir_absolute(State, gs:read(DirEntry, text)),
-      gui_loop(NewState);
-    {gs, DirEntry, keypress, _, _} ->
-      gui_loop(State);
-    %% ----- Buttons -----
-    {gs, AddFile, click, _, _} ->
-      handle_add_files(State),
-      gui_loop(State);
-    {gs, AddAll, click, _, _} ->
-      handle_add_all_click(State),
-      gui_loop(State);
-    {gs, AddRec, click, _, _} ->
-      handle_add_rec_click(State),
-      gui_loop(State);
-    {gs, DelFile, click, _, _} ->
-      handle_file_delete(State),
-      gui_loop(State);
-    {gs, ClearChosen, click, _, _} ->
-      gs:config(ChosenBox, [clear]),
-      gui_loop(State);
-    {gs, ClearLog, click, _, _} ->
-      Log = State#gui_state.log,
-      gs:config(Log, [{enable, true}]),
-      gs:config(Log, [clear]),
-      gs:config(Log, [{enable, false}]),
-      gui_loop(State);
-    {gs, ClearWarn, click, _, _} ->
-      Warn = State#gui_state.warnings_box,
-      gs:config(Warn, [{enable, true}]),
-      gs:config(Warn, [clear]),
-      gs:config(Warn, [{enable, false}]),
-      gui_loop(State);
-    {gs, Run, click, _, _} ->
-      NewState = start_analysis(State),
-      gui_loop(NewState);
-    {gs, Stop, click, _, _} ->
-      config_gui_stop(State),
-      BackendPid ! {self(), stop},
-      update_editor(Log, "\n***** Analysis stopped ****\n"),
-      gui_loop(State);
-    %% ----- Menu -----
-    {gs, Quit, click, _, _} ->
-      case maybe_quit(State) of
-	true -> ?RET_NOTHING_SUSPICIOUS;
-	false -> gui_loop(State)
-      end;
-    {gs, Manual, click, _, _} ->
-      spawn_link(fun() -> manual(State) end),
-      gui_loop(State);
-    {gs, Warnings, click, _, _} ->
-      spawn_link(fun() -> warnings(State) end),
-      gui_loop(State);
-    {gs, About, click, _, _} ->
-      spawn_link(fun() -> about(State) end),
-      gui_loop(State);
-    {gs, SaveLog, click, _, _} ->
-      save_log(State),
-      gui_loop(State);
-    {gs, SaveWarn, click, _, _} ->
-      save_warn(State),
-      gui_loop(State);
-    {gs, SearchPlt, click, _, _} ->
-      spawn_link(fun() -> search_doc_plt(State) end),
-      gui_loop(State);
-    {gs, ShowPlt, click, _, _} ->
-      spawn_link(fun() -> show_doc_plt(State) end),
-      gui_loop(State);
-    {gs, Macros, click, _, _} ->
-      Self = self(),
-      spawn_link(fun() -> macro_dialog(State, Self) end),
-      gui_loop(State);
-    {gs, Includes, click, _, _} ->
-      Self = self(),
-      spawn_link(fun() -> include_dialog(State, Self) end),
-      gui_loop(State);
-    {new_options, NewOptions} ->
-      NewState = State#gui_state{options = NewOptions},
-      gui_loop(NewState);
-    %% ----- Analysis -----
-    {BackendPid, ext_calls, ExtCalls} ->
-      Msg = io_lib:format("The following functions are called "
-			  "but type information about them is not available.\n"
-			  "The analysis might get more precise by including "
-			  "the modules containing these functions:\n\n\t~p\n", 
-			  [ExtCalls]),
-      free_editor(State, "Analysis done", Msg),
-      gui_loop(State);
-    {BackendPid, ext_types, ExtTypes} ->
-      Map = fun({M,F,A}) -> io_lib:format("~p:~p/~p",[M,F,A]) end,
-      ExtTypeString = string:join(lists:map(Map, ExtTypes), "\n"),
-      Msg = io_lib:format("The following remote types are being used "
-			  "but information about them is not available.\n"
-			  "The analysis might get more precise by including "
-			  "the modules containing these types and making sure "
-			  "that they are exported:\n~s\n", [ExtTypeString]),
-      free_editor(State, "Analysis done", Msg),
-      gui_loop(State);
-    {BackendPid, log, LogMsg} ->
-      update_editor(Log, LogMsg),
-      gui_loop(State);
-    {BackendPid, warnings, Warns} ->
-      SortedWarns = lists:keysort(2, Warns),  %% Sort on file/line
-      WarnList = [dialyzer:format_warning(W) || W <- SortedWarns],
-      update_editor(Warn, lists:flatten(WarnList)),
-      gui_loop(State);
-    {BackendPid, done, _NewPlt, NewDocPlt} ->
-      message(State, "Analysis done"),
-      config_gui_stop(State),
-      gui_loop(State#gui_state{doc_plt = NewDocPlt});
-    {'EXIT', BackendPid, {error, Reason}} ->
-      free_editor(State, ?DIALYZER_ERROR_TITLE, Reason),
-      config_gui_stop(State),
-      gui_loop(State);
-    {'EXIT', BackendPid, Reason} when Reason =/= 'normal' ->
-      free_editor(State, ?DIALYZER_ERROR_TITLE, io_lib:format("~p", [Reason])),
-      config_gui_stop(State),
-      gui_loop(State);
-    _Other ->
-      %% io:format("Received ~p\n", [Other]),
-      gui_loop(State)
-  end.
-
-%% ----------------------------------------------------------------
-%%
-%%  Main window actions
-%%
-
-%% ---- Adding and deleting files ----
-
-handle_add_all_click(#gui_state{chosen_box = ChosenBox, file_box = File, 
-				file_wd = FWD, mode = Mode}) ->
-  case gs:read(File, items) of
-    [] ->
-      ok;
-    Add0 ->
-      gs:config(File, [{selection, clear}]),
-      Add1 = ordsets:subtract(Add0, [".."]),
-      Add = ordsets:from_list([filename:join(FWD, X) || X <- Add1]),
-      case gs:read(Mode#mode.start_byte_code, select) of
-	true ->
-	  add_files(filter_mods(Add, ".beam"), ChosenBox, byte_code);
-	false ->
-	  add_files(filter_mods(Add, ".erl"), ChosenBox, src_code)
-      end  
-  end.
-
-all_subdirs(Dirs) ->
-  all_subdirs(Dirs, []).
-
-all_subdirs([Dir|T], Acc) ->
-  {ok, Files} = file:list_dir(Dir),
-  SubDirs = lists:zf(fun(F) ->
-                       SubDir = filename:join(Dir, F),
-                       case filelib:is_dir(SubDir) of
-                         true -> {true, SubDir};
-                         false -> false
-                       end
-                   end, Files),
-  NewAcc = ordsets:union(ordsets:from_list(SubDirs), Acc),
-  all_subdirs(T ++ SubDirs, NewAcc);
-all_subdirs([], Acc) ->
-  Acc.
-
-handle_add_rec_click(#gui_state{chosen_box = ChosenBox, file_box = File, 
-				file_wd = FWD, mode = Mode}) ->
-  case gs:read(File, selection) of
-    [] ->
-      ok;
-    List ->
-      gs:config(File, [{selection, clear}]),
-      Dirs1 = [gs:read(File, {get, X}) || X <- List],
-      Dirs2 = ordsets:from_list([filename:join(FWD, X) || X <- Dirs1]),
-      Dirs3 = ordsets:filter(fun(X) -> filelib:is_dir(X) end, Dirs2),
-      TargetDirs = ordsets:union(Dirs3, all_subdirs(Dirs3)),
-      {Code, Ext} = case gs:read(Mode#mode.start_byte_code, select) of
-		      true  -> {byte_code, ".beam"};
-		      false -> {src_code, ".erl"}
-		    end,
-      add_files(filter_mods(TargetDirs, Ext), ChosenBox, Code)
-  end.
-
-handle_add_files(#gui_state{chosen_box = ChosenBox, file_box = File, 
-			    file_wd = FWD, mode = Mode}) ->
-  case gs:read(File, selection) of
-    [] ->
-      ok;
-    List ->
-      gs:config(File, [{selection, clear}]),
-      Add0 = [gs:read(File, {get, X}) || X <- List],
-      Add = ordsets:from_list([filename:join(FWD, X) || X <- Add0]),
-      case gs:read(Mode#mode.start_byte_code, select) of
-	true -> 
-	  add_files(filter_mods(Add, ".beam"), ChosenBox, byte_code);
-	false ->
-	  add_files(filter_mods(Add, ".erl"), ChosenBox, src_code)
-      end
-  end.
-
-filter_mods(Mods, Extension) ->
-  Fun = fun(X) -> 
-	    filename:extension(X) =:= Extension
-	      orelse 
-		(filelib:is_dir(X) andalso
-		 contains_files(X, Extension))
-	end,
-  ordsets:filter(Fun, Mods).
-
-contains_files(Dir, Extension) ->
-  {ok, Files} = file:list_dir(Dir),
-  lists:any(fun(X) -> filename:extension(X) =:= Extension end, Files).
-
-add_files(Add, ChosenBox, Type) ->
-  Set = gs:read(ChosenBox, items),
-  Set1 = 
-    case Type of
-      byte_code -> filter_mods(Set, ".beam");
-      src_code -> filter_mods(Set, ".erl")
-    end,
-  Files = ordsets:union(Add, Set1),
-  gs:config(ChosenBox, [{items, Files}]),
-  ok.
-
-handle_file_delete(#gui_state{chosen_box = ChosenBox}) ->
-  List = gs:read(ChosenBox, selection),
-  lists:foreach(fun(X) -> gs:config(ChosenBox, [{del, X}]) end,
-		lists:reverse(lists:sort(List))).
-
-%% ---- Other ----
-
-change_dir_or_add_file(#gui_state{file_wd = FWD, mode = Mode, dir_entry = Dir,
-				  chosen_box = CBox, file_box = File} = State,
-		       Text) ->
-  NewWDorFile =
-    case Text of
-      ".." -> filename:join(butlast(filename:split(FWD)));
-      "." -> FWD;
-      _ -> filename:join(FWD, Text)
-    end,
-  case filelib:is_dir(NewWDorFile) of
-    true ->
-      gs:config(Dir, [{text, NewWDorFile}]),
-      {ok, List} = file:list_dir(NewWDorFile),
-      gs:config(File, [{items, [".."|lists:sort(List)]}]),
-      State#gui_state{file_wd = NewWDorFile};
-    false ->
-      case gs:read(Mode#mode.start_byte_code, select) of
-	true -> 
-	  case filter_mods([NewWDorFile], ".beam") of
-	    [] -> ok;
-	    RealFiles -> add_files(RealFiles, CBox, byte_code)
-	  end;
-	false -> 
-	  case filter_mods([NewWDorFile], ".erl") of
-	    [] -> ok;
-	    RealFiles -> add_files(RealFiles, CBox, src_code)
-	  end
-      end,
-      State
-  end.
-
-butlast([H1, H2 | T]) ->
-  [H1 | butlast([H2|T])];
-butlast([_]) ->
-  [];
-butlast([]) ->
-  ["/"].
-
-change_dir_absolute(#gui_state{file_wd = FWD, dir_entry = Dir,
-			       file_box = File} = State, 
-		    Text) ->
-  case filelib:is_dir(Text) of
-    true ->
-      WD = filename:join(FWD, Text),
-      gs:config(Dir, [{text, WD}]),
-      {ok, List} = file:list_dir(WD),
-      gs:config(File, [{items, [".."|lists:sort(List)]}]),
-      State#gui_state{file_wd = WD};
-    false ->
-      State
-  end.
-
-init_warnings([{Tag, GSItem}|Left], LegalWarnings) ->
-  Select = ordsets:is_element(Tag, LegalWarnings),
-  gs:config(GSItem, [{select, Select}]),
-  init_warnings(Left, LegalWarnings);
-init_warnings([], _LegalWarnings) ->
-  ok.
-
-config_gui_start(State) ->
-  Enabled = [{enable, true}],
-  Disabled = [{enable, false}],
-  gs:config(State#gui_state.stop, Enabled),
-  gs:config(State#gui_state.run, Disabled),
-  gs:config(State#gui_state.del_file, Disabled),
-  gs:config(State#gui_state.clear_chosen, Disabled),
-  gs:config(State#gui_state.add_file, Disabled),
-  gs:config(State#gui_state.add_all, Disabled),
-  gs:config(State#gui_state.add_rec, Disabled),
-  gs:config(State#gui_state.clear_warn, Disabled),
-  gs:config(State#gui_state.clear_log, Disabled),
-  Menu = State#gui_state.menu,
-  gs:config(Menu#menu.file_save_warn, Disabled),
-  gs:config(Menu#menu.file_save_log, Disabled),
-  gs:config(Menu#menu.opts_macros, Disabled),
-  gs:config(Menu#menu.opts_includes, Disabled),
-  gs:config(Menu#menu.plt_empty, Disabled),
-  gs:config(Menu#menu.plt_search_doc, Disabled),
-  gs:config(Menu#menu.plt_show_doc, Disabled),
-  Mode = State#gui_state.mode,
-  gs:config(Mode#mode.start_byte_code, Disabled),
-  gs:config(Mode#mode.start_src_code, Disabled).
-
-config_gui_stop(State) ->
-  Enabled = [{enable, true}],
-  Disabled = [{enable, false}],
-  gs:config(State#gui_state.stop, Disabled),
-  gs:config(State#gui_state.run, Enabled),
-  gs:config(State#gui_state.del_file, Enabled),
-  gs:config(State#gui_state.clear_chosen, Enabled),
-  gs:config(State#gui_state.add_file, Enabled),
-  gs:config(State#gui_state.add_all, Enabled),
-  gs:config(State#gui_state.add_rec, Enabled),
-  gs:config(State#gui_state.clear_warn, Enabled),
-  gs:config(State#gui_state.clear_log, Enabled),
-  Menu = State#gui_state.menu,
-  gs:config(Menu#menu.file_save_warn, Enabled),
-  gs:config(Menu#menu.file_save_log, Enabled),
-  gs:config(Menu#menu.opts_macros, Enabled),
-  gs:config(Menu#menu.opts_includes, Enabled),
-  gs:config(Menu#menu.plt_empty, Enabled),
-  gs:config(Menu#menu.plt_search_doc, Enabled),
-  gs:config(Menu#menu.plt_show_doc, Enabled),
-  Mode = State#gui_state.mode,
-  gs:config(Mode#mode.start_byte_code, Enabled),
-  gs:config(Mode#mode.start_src_code, Enabled).
-
-%% ----------------------------------------------------------------
-%%
-%%  Messages
-%%
-
-message(State, Message) ->
-  output_sms(State, ?DIALYZER_MESSAGE_TITLE, Message).
-
-error_sms(State, Message) ->
-  output_sms(State, ?DIALYZER_ERROR_TITLE, Message).
-
-%%
-%% This function is to be used *only* for small messages because lines
-%% are not wrapped and the created window has a limited area for text.
-%% For bigger messages, the function free_editor/3 is to be used.
-%%
-output_sms(#gui_state{gs = GS, top = TopWin}, Title, Message) ->
-  %% Lines = string:words(Message, $\n),
-  %% io:format("The message has ~w lines\n", [Lines]),
-  WH = [{width, 400}, {height, 100}],
-  MessageWin = gs:window(GS, [{title, Title},
-			      {default, button, {font, {helvetica, bold, 12}}}
-			      |WH]),
-  MessagePacker = gs:frame(MessageWin, [{packer_y, [{fixed, 75}, {fixed, 25}]},
-					{packer_x, [{fixed, 175},{fixed, 50},
-						    {fixed, 175}]}]),
-  gs:label(MessagePacker, [{pack_x, {1, 3}}, {pack_y, 1}, 
-			   {label, {text, Message}}]),
-  OK = gs:button(MessagePacker, [{label, {text, "OK"}}, {pack_xy, {2, 2}}]),
-  gs:config(MessageWin, [{map, true}]),
-  gs:config(MessagePacker, WH),
-  message_loop(OK, MessageWin, TopWin).
-
-message_loop(Ok, Win, TopWin) ->
-  receive
-    {gs, Ok, click, _, _} ->
-      gs:destroy(Win);
-    {gs, Win, destroy, _, _} ->
-      ok;
-    {gs, TopWin, destroy, _, _} ->
-      exit(normal);
-    {gs, _, _, _, _} ->
-      message_loop(Ok, Win, TopWin)
-  end.
-
-dialog(#gui_state{gs = GS, top = TopWin}, Message, OkLabel, CancelLabel) ->
-  WH = [{width, 400}, {height, 100}],
-  WHButton = [{width, 70}, {height, 20}],
-  DialogWin = gs:window(GS, [{title, "Dialyzer Message"},
-			     {default, button, {font, {helvetica, bold, 12}}}
-			     |WH]),
-  DialogPacker = gs:frame(DialogWin, [{packer_y, [{fixed, 75}, {fixed, 25}]},
-				      {packer_x, [{fixed, 150}, {fixed, 50},
-						  {fixed, 50}, {fixed, 150}]}]),
-  gs:label(DialogPacker, [{pack_x, {1,4}}, {pack_y, 1}, 
-			  {label, {text, Message}}]),
-  Ok = gs:button(DialogPacker, [{label, {text, OkLabel}}, 
-				{pack_xy, {2,2}}|WHButton]),
-  Cancel = gs:button(DialogPacker, [{label, {text, CancelLabel}}, 
-				    {pack_xy, {3,2}}|WHButton]),
-  gs:config(DialogWin, [{map, true}]),
-  gs:config(DialogPacker, WH),
-  dialog_loop(Ok, Cancel, DialogWin, TopWin).
-
-dialog_loop(Ok, Cancel, Win, TopWin) ->
-  receive
-    {gs, Ok, click, _, _} ->
-      gs:destroy(Win),
-      true;
-    {gs, Cancel, click, _, _} ->
-      gs:destroy(Win),
-      false;
-    {gs, Win, destroy, _, _} ->
-      false;
-    {gs, TopWin, destroy, _, _} ->
-      exit(normal);
-    {gs, _, _, _, _} ->
-      dialog_loop(Ok, Cancel, Win, TopWin)
-  end.
-
-maybe_quit(#gui_state{top = TopWin} = State) ->
-  case dialog(State, "Do you really want to quit?", "Yes", "No") of
-    true ->
-      flush(),
-      gs:destroy(TopWin),
-      gs:stop(),
-      true;
-    false ->
-      false
-  end.
-
-
-%% ----------------------------------------------------------------
-%%
-%%  Menu actions
-%%
-
-%% ---- Help Menu ----
-
-manual(State) ->
-  help_menu_common(State, "Dialyzer Manual", 500, "manual.txt", white).
-
-warnings(State) ->
-  help_menu_common(State, "Dialyzer Warnings", 500, "warnings.txt", white).
-
-about(State) ->
-  help_menu_common(State, "About Dialyzer", 160, "about.txt", yellow).
-
-help_menu_common(#gui_state{gs = GS, top = TopWin} = State,
-		 Title, Height, TxtFileName, BackGroundColor) ->
-  WH = [{width, 600}, {height, Height}],
-  Win = gs:window(GS, [{title, Title}, {configure, true},
-		       {default, editor, {bg, BackGroundColor}} | WH]),
-  EmptySpace = {stretch, 1},
-  Frame = gs:frame(Win, [{packer_x, [EmptySpace, {fixed, 60}, EmptySpace]}, 
-			 {packer_y, [EmptySpace, {fixed, 30}]} | WH]),
-  Editor = gs:editor(Frame, [{pack_x, {1, 3}}, {pack_y, 1},
-			     {font, {courier, 12}}, {vscroll, right},
-			     {wrap, word}]),
-  Button = gs:button(Frame, [{label, {text, "Ok"}}, {pack_xy, {2, 2}}]),
-  gs:config(Win, [{map, true}]),
-  gs:config(Frame, WH),
-  AboutFile = filename:join([code:lib_dir(dialyzer), "doc", TxtFileName]),
-  case gs:config(Editor, {load, AboutFile}) of
-    {error, Reason} ->
-      gs:destroy(Win),
-      error_sms(State, 
-		io_lib:format("Could not find doc/~s file!\n\n ~p", 
-			      [TxtFileName, Reason]));
-    ok ->
-      gs:config(Editor, [{enable, false}]),
-      show_info_loop(TopWin, Win, Frame, Button)
-  end.
-
-%% ---- File Menu ----
-
-save_log(#gui_state{file_wd = CWD, log = Log} = State) ->
-  {Win, Entry, OkButton, CancelButton} = file_box(State, "Save Log", CWD),
-  save_loop(State, OkButton, CancelButton, Entry, Win, Log).
-
-save_warn(#gui_state{file_wd = CWD, warnings_box = WBox} = State) ->
-  {Win, Entry, OkButton, CancelButton} = file_box(State, "Save Warnings", CWD),
-  save_loop(State, OkButton, CancelButton, Entry, Win, WBox).
-
-file_box(#gui_state{gs = GS}, Title, Default) ->
-  WH = [{width, 400}, {height, 75}],
-  Win = gs:window(GS, [{title, Title}|WH]),
-  Fix25 = {fixed, 27}, Fix75 = {fixed, 75},
-  WinPacker = gs:frame(Win, [{packer_y, [Fix25, Fix25, Fix25]},
-			     {packer_x, [Fix75, Fix75, Fix75, {fixed, 175}]}]),
-  gs:label(WinPacker, [{pack_xy, {1,2}}, {label, {text, "Enter file:"}}]),
-  Entry = gs:entry(WinPacker, [{pack_x, {2,4}}, {pack_y, 2}, {keypress, true}]),
-  OkButton = gs:button(WinPacker, [{label, {text, "Ok"}}, {pack_xy, {2,3}}]),
-  CancelButton = gs:button(WinPacker, [{label, {text, "Cancel"}}, 
-				       {pack_xy, {3,3}}]),
-  gs:config(Entry, [{text, Default}]),
-  gs:config(Win, [{map, true}]),
-  gs:config(WinPacker, WH),
-  {Win, Entry, OkButton, CancelButton}.
-
-save_loop(#gui_state{top = TopWin} = State,
-	  OkButton, CancelButton, Entry, Save, Editor) ->
-  receive
-    {gs, OkButton, click, _, _} ->
-      File = gs:read(Entry, text),
-      case gs:config(Editor, [{save, File}]) of
-	{error, _} ->
-	  error_sms(State, "Could not write to file:\n" ++ File),
-	  save_loop(State, OkButton, CancelButton, Entry, Save, Editor);
-	_ ->
-	  gs:destroy(Save)
-      end;
-    {gs, Entry, keypress, _, ['Return'|_]} ->
-      File = gs:read(Entry, text),
-      case gs:config(Editor, [{save, File}]) of
-	{error, _} ->
-	  error_sms(State, "Could not write to file:\n" ++ File),
-	  save_loop(State, OkButton, CancelButton, Entry, Save, Editor);
-	_ ->
-	  gs:destroy(Save)
-      end;
-    {gs, Entry, keypress, _, _} ->
-      save_loop(State, OkButton, CancelButton, Entry, Save, Editor);
-    {gs, CancelButton, click, _, _} ->
-      gs:destroy(Save);
-    {gs, TopWin, destroy, _, _} ->
-      exit(normal);
-    {gs, Save, destroy, _, _} ->
-      ok;
-    {gs, _, _, _, _} ->
-      save_loop(State, OkButton, CancelButton, Entry, Save, Editor)
-  end.
-
-%% ---- Plt Menu ----
-
-search_doc_plt(#gui_state{gs = GS, top = TopWin} = State) ->
-  WH = [{width, 400}, {height, 100}],
-  WHB = [{width, 120}, {height, 30}],
-  Title = io_lib:format("Search the PLT", []),
-  Win = gs:window(GS, [{title, Title}, {configure, true},
-		       {default, editor, {bg, white}} | WH]),
-  EmptySpace = {stretch, 1},
-  Frame = gs:frame(Win, [{packer_x, [EmptySpace, EmptySpace, EmptySpace]},
-			 {packer_y, [{fixed, 30}, {fixed, 30}, 
-				     EmptySpace, {fixed, 30}]} | WH]),
-  gs:label(Frame, [{pack_xy, {1,1}}, {label, {text, "Module"}}]),
-  ModEntry = gs:entry(Frame, [{pack_xy, {1,2}}]),
-  gs:label(Frame, [{pack_xy, {2,1}}, {label, {text, "Function"}}]),
-  FunEntry = gs:entry(Frame, [{pack_xy, {2,2}}]),
-  gs:label(Frame, [{pack_xy, {3,1}}, {label, {text, "Arity"}}]),
-  ArityEntry = gs:entry(Frame, [{pack_xy, {3,2}}]),
-  ButtonPacker = gs:frame(Frame, [{pack_xy, {2,4}}, 
-				  {packer_x, [{fixed, 60}, {fixed, 60}]},
-				  {packer_y, {fixed, 30}}]),
-  SearchButton = gs:button(ButtonPacker, [{label, {text, "Search"}}, 
-					  {pack_xy, {1,1}}]),
-  CancelButton = gs:button(ButtonPacker, [{label, {text, "Cancel"}}, 
-					  {pack_xy, {2,1}}]),
-  gs:config(Win, [{map, true}]),
-  gs:config(Frame, WH),
-  gs:config(ButtonPacker, WHB),
-  search_doc_plt_loop(State, CancelButton, SearchButton, ModEntry, 
-		      FunEntry, ArityEntry, Win, TopWin).
-
-search_doc_plt_loop(State, CancelButton, SearchButton, ModEntry, 
-		    FunEntry, ArityEntry, Win, TopWin) ->
-  receive
-    {gs, CancelButton, click, _, _} ->
-      gs:destroy(Win),
-      ok;
-    {gs, TopWin, destroy, _, _} ->
-      exit(normal);
-    {gs, SearchButton, click, _, _} ->
-      M = format_search(gs:read(ModEntry, text)),
-      F = format_search(gs:read(FunEntry, text)),
-      A = format_search(gs:read(ArityEntry, text)),
-      case dialyzer_plt:get_specs(State#gui_state.doc_plt, M, F, A) of
-	"" ->
-	  error_sms(State, "No such function"),
-	  search_doc_plt_loop(State, CancelButton, SearchButton, ModEntry, 
-			      FunEntry, ArityEntry, Win, TopWin);
-	NonEmptyString ->
-	  gs:destroy(Win),
-	  free_editor(State, "Content of PLT", NonEmptyString)
-      end
-  end.
-
-format_search([]) ->
-  '_';
-format_search(String) ->
-  try list_to_integer(String)
-  catch error:_ -> list_to_atom(String)
-  end.
-
-show_doc_plt(#gui_state{doc_plt = DocPLT} = State) ->
-  case dialyzer_plt:get_specs(DocPLT) of
-    "" -> error_sms(State, "No analysis has been made yet!\n");
-    NonEmptyString -> free_editor(State, "Content of PLT", NonEmptyString)
-  end.
-
-free_editor(#gui_state{gs = GS, top = TopWin}, Title, Contents0) ->
-  Contents = lists:flatten(Contents0),
-  Tokens = string:tokens(Contents, "\n"),
-  NofLines = length(Tokens),
-  LongestLine = lists:max([length(X) || X <- Tokens]),
-  Height0 = NofLines * 25 + 80,
-  Height = if Height0 > 500 -> 500; true -> Height0 end,
-  Width0 = LongestLine * 7 + 60,
-  Width = if Width0 > 800 -> 800; true -> Width0 end,
-  WH = [{width, Width}, {height, Height}],
-  Win = gs:window(GS, [{title, Title}, {configure, true},
-		       {default, editor, {bg, white}} | WH]),
-  EmptySpace = {stretch, 1},
-  Frame = gs:frame(Win, [{packer_x, [EmptySpace, {fixed, 60}, EmptySpace]},
-			 {packer_y, [EmptySpace, {fixed, 30}]}
-			 | WH]),
-  Editor = gs:editor(Frame, [{pack_x, {1,3}}, {pack_y, 1},
-			     {font, {courier, 12}}, {vscroll, right},
-			     {wrap, word}, {enable, true}]),
-  Button = gs:button(Frame, [{label, {text, "Ok"}}, {pack_xy, {2,2}}]),
-  gs:config(Editor, [{insert, {insert, Contents}}]),
-  gs:config(Editor, [{enable, false}]),
-  gs:config(Win, [{map, true}]),
-  gs:config(Frame, WH),
-  show_info_loop(TopWin, Win, Frame, Button).
-
-%% ---- Common ----
-
-show_info_loop(TopWin, Win, Frame, Button) ->
-  receive
-    {gs, Button, click, _, _} ->
-      gs:destroy(Win);
-    {gs, TopWin, destroy, _, _} ->
-      exit(normal);
-    {gs, Win, destroy, _, _} ->
-      ok;
-    {gs, Win, configure, _Data, [W, H|_]} ->
-      gs:config(Frame, [{width, W}, {height, H}]),
-      show_info_loop(TopWin, Win, Frame, Button)
-  end.
-
-include_dialog(#gui_state{gs = GS, options = Options}, Parent) ->
-  WH = [{width, 300}, {height, 400}],
-  Title = io_lib:format("Include Directories", []),
-  Win = gs:window(GS, [{title, Title}, {configure, true},
-		       {default, entry, {bg, white}}| WH]),
-  EmptySpace = {stretch, 1},
-  Frame = gs:frame(Win, [{packer_x, [EmptySpace]},
-			 {packer_y, [{fixed, 30}, {fixed, 30}, {fixed, 30},
-				     EmptySpace, {fixed, 30}, {fixed, 30}]}
-			 | WH]),
-  gs:label(Frame, [{pack_xy, {1,1}}, {label, {text, "Directory"}}]),
-  DirEntry = gs:entry(Frame, [{pack_xy, {1,2}}]),
-  ButtonPacker1 = gs:frame(Frame, [{pack_xy, {1,3}},
-				   {packer_x, [{fixed, 70}, {fixed, 70},
-					       EmptySpace]},
-				   {packer_y, {fixed, 30}}]),
-  AddButton = gs:button(ButtonPacker1, [{label, {text, "Add"}}, 
-					{pack_xy, {1,1}}]),
-  Dirs = [io_lib:format("~s", [X]) || X <- Options#options.include_dirs],
-  DirBox = gs:listbox(Frame, [{pack_xy, {1,4}}, {vscroll, right},
-			      {bg, white}, {configure, true},
-			      {selectmode, multiple}, {items, Dirs}]),
-  ButtonPacker2 = gs:frame(Frame, [{pack_xy, {1,5}},
-				   {packer_x, [{fixed, 60}, {fixed, 70},
-					       EmptySpace]},
-				   {packer_y, {fixed, 30}}]),
-  DeleteButton = gs:button(ButtonPacker2, [{label, {text, "Delete"}}, 
-					   {pack_xy, {1,1}}]),
-  DeleteAllButton = gs:button(ButtonPacker2, [{label, {text, "Delete All"}}, 
-					      {pack_xy, {2,1}}]),
-  ButtonPacker3 = gs:frame(Frame, [{pack_xy, {1,6}},
-				   {packer_x, [EmptySpace,
-					       {fixed, 60}, {fixed, 60}]},
-				   {packer_y, {fixed, 30}}]),
-  OkButton = gs:button(ButtonPacker3, [{label, {text, "Ok"}},
-				       {pack_xy, {2,1}}]),
-  CancelButton = gs:button(ButtonPacker3, [{label, {text, "Cancel"}},
-					   {pack_xy, {3,1}}]),
-  gs:config(Win, [{map, true}]),
-  gs:config(Frame, WH),
-  include_loop(Parent, Options, Frame, AddButton, DeleteAllButton, DeleteButton,
-	       DirBox, DirEntry, OkButton, CancelButton, Win).
-
-include_loop(Parent, Options, Frame, AddButton, DeleteAllButton, DeleteButton, 
-	     DirBox, DirEntry, OkButton, CancelButton, Win) ->
-  receive
-    {gs, CancelButton, click, _, _} ->
-      gs:destroy(Win),
-      ok;
-    {gs, OkButton, click, _, _} ->
-      gs:destroy(Win),
-      Parent ! {new_options, Options},
-      ok;
-    {gs, Win, configure, _Data, [W, H|_]} ->
-      gs:config(Frame, [{width, W}, {height, H}]),
-      include_loop(Parent, Options, Frame, AddButton, DeleteAllButton, 
-		   DeleteButton, DirBox, DirEntry, OkButton, CancelButton, Win);
-    {gs, AddButton, click, _, _} ->
-      Dirs = Options#options.include_dirs,
-      NewDirs =
-	case gs:read(DirEntry, text) of
-	  [] -> Dirs;
-	  Add -> [Add|Dirs]
-	end,
-      NewOptions = Options#options{include_dirs = NewDirs},
-      gs:config(DirBox, [{items, NewDirs}]),
-      include_loop(Parent, NewOptions, Frame, AddButton, DeleteAllButton, 
-		   DeleteButton, DirBox, DirEntry, OkButton, CancelButton, Win);
-    {gs, DeleteAllButton, click, _, _} ->
-      gs:config(DirBox, [clear]),
-      NewOptions = Options#options{include_dirs = []},      
-      include_loop(Parent, NewOptions, Frame, AddButton, DeleteAllButton, 
-		   DeleteButton, DirBox, DirEntry, OkButton, CancelButton, Win);
-    {gs, DeleteButton, click, _, _} ->
-      NewOptions =
-	case gs:read(DirBox, selection) of
-	  [] ->
-	    Options;
-	  List ->
-	    lists:foreach(fun(X) -> gs:config(DirBox, [{del, X}]) end,
-			  lists:sort(List)),
-	    NewDirs = gs:read(DirBox, items),
-	    Options#options{include_dirs = NewDirs}
-	end,
-      include_loop(Parent, NewOptions, Frame, AddButton, DeleteAllButton, 
-		   DeleteButton, DirBox, DirEntry, OkButton, CancelButton, Win);
-    {gs, Win, destroy, _, _} ->
-      ok
-  end.
-
-macro_dialog(#gui_state{gs = GS, options = Options}, Parent) ->
-  WH = [{width, 300}, {height, 400}],
-  Title = io_lib:format("Macro Definitions", []),
-  Win = gs:window(GS, [{title, Title}, {configure, true},
-		       {default, entry, {bg, white}}| WH]),
-  EmptySpace = {stretch, 1},
-  Frame = gs:frame(Win, [{packer_x, [EmptySpace, EmptySpace]},
-			 {packer_y, [{fixed, 30}, {fixed, 30}, {fixed, 30},
-				     EmptySpace, {fixed, 30}, {fixed, 30}]}
-			 | WH]),
-  gs:label(Frame, [{pack_xy, {1,1}}, {label, {text, "Macro"}}]),
-  MacroEntry = gs:entry(Frame, [{pack_xy, {1,2}}]),
-  gs:label(Frame, [{pack_xy, {2,1}}, {label, {text, "Term"}}]),
-  TermEntry = gs:entry(Frame, [{pack_xy, {2,2}}]),
-  ButtonPacker1 = gs:frame(Frame, [{pack_x, {1,2}}, {pack_y, 3}, 
-				   {packer_x, [{fixed, 70},{fixed, 70},
-					       EmptySpace]},
-				   {packer_y, {fixed, 30}}]),
-  AddButton = gs:button(ButtonPacker1, [{label, {text, "Add"}}, 
-					{pack_xy, {1,1}}]),
-  Macros = [io_lib:format("~p = ~p",[X,Y]) || {X,Y} <- Options#options.defines],
-  MacroBox = gs:listbox(Frame, [{pack_x, {1,2}}, {pack_y, 4}, {vscroll, right},
-				{bg, white}, {configure, true},
-				{selectmode, multiple},
-				{items, Macros}]),
-  ButtonPacker2 = gs:frame(Frame, [{pack_x, {1,2}}, {pack_y, 5}, 
-				   {packer_x, [{fixed, 60}, {fixed, 70},
-					       EmptySpace]},
-				   {packer_y, {fixed, 30}}]),
-  DeleteButton = gs:button(ButtonPacker2, [{label, {text, "Delete"}}, 
-					   {pack_xy, {1,1}}]),
-  DeleteAllButton = gs:button(ButtonPacker2, [{label, {text, "Delete All"}}, 
-					      {pack_xy, {2,1}}]),
-  ButtonPacker3 = gs:frame(Frame, [{pack_x, {1,2}}, {pack_y, 6}, 
-				   {packer_x, [EmptySpace,
-					       {fixed, 60}, {fixed, 60}]},
-				   {packer_y, {fixed, 30}}]),
-  OkButton = gs:button(ButtonPacker3, [{label, {text, "Ok"}},
-				       {pack_xy, {2,1}}]),
-  CancelButton = gs:button(ButtonPacker3, [{label, {text, "Cancel"}},
-					   {pack_xy, {3,1}}]),
-  gs:config(Win, [{map, true}]),
-  gs:config(Frame, WH),
-  macro_loop(Parent, Options, Frame, AddButton, DeleteAllButton, DeleteButton, 
-	     MacroBox, MacroEntry, TermEntry, OkButton, CancelButton, Win).
-
-macro_loop(Parent, Options, Frame, AddButton, DeleteAllButton, DeleteButton, 
-	   MacroBox, MacroEntry, TermEntry, OkButton, CancelButton, Win) ->
-  receive
-    {gs, CancelButton, click, _, _} ->
-      gs:destroy(Win),
-      ok;
-    {gs, OkButton, click, _, _} ->
-      gs:destroy(Win),
-      Parent ! {new_options, Options},
-      ok;
-    {gs, Win, configure, _Data, [W, H|_]} ->
-      gs:config(Frame, [{width, W}, {height, H}]),
-      macro_loop(Parent, Options, Frame, AddButton, DeleteAllButton, 
-		 DeleteButton, MacroBox, MacroEntry, TermEntry, OkButton, 
-		 CancelButton, Win);
-    {gs, AddButton, click, _, _} ->
-      Defines = Options#options.defines,
-      NewDefines = 
-	case gs:read(MacroEntry, text) of
-	  "" -> Defines;
-	  Macro ->
-	    Empty = [{text, ""}],
-	    case gs:read(TermEntry, text) of
-	      "" -> 
-		gs:config(MacroEntry, Empty),
-		orddict:store(list_to_atom(Macro), true, Defines);
-	      String ->
-		case parse(String) of
-		  {ok, Term} ->
-		    gs:config(MacroEntry, Empty),
-		    gs:config(TermEntry, Empty),
-		    orddict:store(list_to_atom(Macro), Term, Defines);
-		  {error, _Reason} ->
-		    Defines
-		end
-	    end
-	end,
-      NewOptions = Options#options{defines = NewDefines},		 
-      NewEntries = [io_lib:format("~p = ~p", [X, Y]) || {X, Y} <- NewDefines],
-      gs:config(MacroBox, [{items, NewEntries}]),
-      macro_loop(Parent, NewOptions, Frame, AddButton, DeleteAllButton, 
-		 DeleteButton, MacroBox, MacroEntry, TermEntry, OkButton, 
-		 CancelButton, Win);
-    {gs, DeleteAllButton, click, _, _} ->
-      gs:config(MacroBox, [clear]),
-      NewOptions = Options#options{defines = []},
-      macro_loop(Parent, NewOptions, Frame, AddButton, DeleteAllButton, 
-		 DeleteButton, MacroBox, MacroEntry, TermEntry, OkButton, 
-		 CancelButton, Win);
-    {gs, DeleteButton, click, _, _} ->
-      NewOptions =
-	case gs:read(MacroBox, selection) of
-	  [] ->
-	    Options;
-	  List ->
-	    gs:config(MacroBox, [{selection, clear}]),
-	    Fun = 
-	      fun(X) ->
-		  Val = gs:read(MacroBox, {get, X}),
-		  [MacroName|_] = re:split(Val, " ", [{return, list}]),
-		  list_to_atom(MacroName)
-	      end,
-	    Delete = [Fun(X) || X <- List],
-	    lists:foreach(fun(X) -> gs:config(MacroBox, [{del, X}]) end,
-			  lists:reverse(lists:sort(List))),
-	    Defines = Options#options.defines,
-	    NewDefines = lists:foldl(fun(X, Acc) -> 
-					 orddict:erase(X, Acc)
-				     end,
-				     Defines, Delete),
-	    Options#options{defines = NewDefines}
-	end,
-      macro_loop(Parent, NewOptions, Frame, AddButton, DeleteAllButton, 
-		 DeleteButton, MacroBox, MacroEntry, TermEntry, OkButton, 
-		 CancelButton, Win);
-    {gs, Win, destroy, _, _} ->
-      ok
-  end.
-
-parse(String) ->
-  case erl_scan:string(String ++ ".", 1) of
-    {ok, Ts, _} ->
-      case erl_parse:parse_exprs(Ts) of
-	{ok, [Expr]} ->	  
-	  try erl_parse:normalise(Expr)
-	  catch error:Reason -> {error, Reason}
-	  end;
-	{error, E} ->
-	  parse_error(E)
-      end;
-    {error, E, _} ->
-      parse_error(E)
-  end.
-
-parse_error(E) ->
-  S = io_lib:fwrite("Error parsing expression: ~P.", [E,15]),
-  {error, S}.
-
-%% ----------------------------------------------------------------
-%%
-%%  Run the analysis
-%%
-
-start_analysis(State) ->
-  Analysis = build_analysis_record(State),
-  case get_anal_files(State, Analysis#analysis.start_from) of
-    error ->
-      Msg = "You must choose one or more files or dirs\n"
-	"before starting the analysis!",
-      error_sms(State, Msg),
-      config_gui_stop(State),      
-      State;
-    {ok, Files} ->
-      Msg = "\n========== Starting Analysis ==========\n\n",
-      update_editor(State#gui_state.log, Msg),
-      NewAnalysis = Analysis#analysis{files = Files},
-      run_analysis(State, NewAnalysis)
-  end.
-
-build_analysis_record(#gui_state{mode = Mode, menu = Menu, options = Options,
-				 init_plt = InitPlt0}) ->
-  StartFrom =
-    case gs:read(Mode#mode.start_byte_code, select) of
-      true -> byte_code;
-      false -> src_code
-    end,
-  InitPlt =
-    case gs:read(Menu#menu.plt_empty, select) of
-      true -> dialyzer_plt:new();
-      false -> InitPlt0
-    end,
-  #analysis{defines = Options#options.defines,
-	    include_dirs = Options#options.include_dirs,
-	    plt = InitPlt,
-	    start_from = StartFrom,
-	    solvers = Options#options.solvers}.
-
-get_anal_files(#gui_state{chosen_box = ChosenBox}, StartFrom) ->
-  Files = gs:read(ChosenBox, items),
-  FilteredMods =
-    case StartFrom of
-      src_code -> filter_mods(Files, ".erl");
-      byte_code -> filter_mods(Files, ".beam")
-    end,
-  FilteredDirs = [X || X <- Files, filelib:is_dir(X)],
-  case ordsets:union(FilteredMods, FilteredDirs) of
-    [] -> error;
-    Set -> {ok, Set}
-  end.
-
-run_analysis(State, Analysis) ->
-  config_gui_start(State),
-  Self = self(),
-  NewAnalysis = Analysis#analysis{doc_plt = dialyzer_plt:new()},
-  LegalWarnings = find_legal_warnings(State),
-  Fun = 
-    fun() -> 
-	dialyzer_analysis_callgraph:start(Self, LegalWarnings, NewAnalysis)
-    end,
-  BackendPid = spawn_link(Fun),
-  State#gui_state{backend_pid = BackendPid}.
-
-find_legal_warnings(#gui_state{menu = #menu{warnings = Warnings}}) ->
-  ordsets:from_list([Tag || {Tag, GSItem} <- Warnings, 
-			    gs:read(GSItem, select) =:= true]).
-
-flush() ->
-  receive
-    _ -> flush()
-  after 
-    0 -> ok
-  end.
-
-update_editor(Editor, Msg) ->
-  gs:config(Editor, [{enable, true}]),
-  NofRows = gs:read(Editor, size),
-  gs:config(Editor, [{insertpos, 'end'}]),
-  gs:config(Editor, [{insert, {insert, Msg}}]),
-  NewNofRows = gs:read(Editor, size),
-  ScrollPos = gs:read(Editor, vscrollpos),
-  gs:config(Editor, [{vscrollpos, ScrollPos + NewNofRows - NofRows}]),
-  gs:config(Editor, [{enable, false}]).
diff --git a/lib/dialyzer/src/dialyzer_plt.erl b/lib/dialyzer/src/dialyzer_plt.erl
index 5f64099210..63798f44b1 100644
--- a/lib/dialyzer/src/dialyzer_plt.erl
+++ b/lib/dialyzer/src/dialyzer_plt.erl
@@ -2,7 +2,7 @@
 %%----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,7 +67,7 @@
 
 %%----------------------------------------------------------------------
 
--type mod_deps() :: dict().
+-type mod_deps() :: dialyzer_callgraph:mod_deps().
 
 -type deep_string() :: string() | [deep_string()].
 
@@ -80,11 +80,11 @@
 
 %%----------------------------------------------------------------------
 
--record(plt, {info           = table_new() :: dict(),
-	      types          = table_new() :: dict(),
-	      contracts      = table_new() :: dict(),
-	      callbacks      = table_new() :: dict(),
-              exported_types = sets:new()  :: set()}).
+-record(plt, {info           = table_new() :: dict:dict(),
+	      types          = table_new() :: dict:dict(),
+	      contracts      = table_new() :: dict:dict(),
+	      callbacks      = table_new() :: dict:dict(),
+              exported_types = sets:new()  :: sets:set()}).
 
 -record(mini_plt, {info      :: ets:tid(),
 		   contracts :: ets:tid(),
@@ -96,15 +96,15 @@
 -include("dialyzer.hrl").
 
 -type file_md5() :: {file:filename(), binary()}.
--type plt_info() :: {[file_md5()], dict()}.
+-type plt_info() :: {[file_md5()], dict:dict()}.
 
 -record(file_plt, {version = ""                :: string(),
 		   file_md5_list = []          :: [file_md5()],
-		   info = dict:new()           :: dict(),
-		   contracts = dict:new()      :: dict(),
-		   callbacks = dict:new()      :: dict(),
-		   types = dict:new()          :: dict(),
-                   exported_types = sets:new() :: set(),
+		   info = dict:new()           :: dict:dict(),
+		   contracts = dict:new()      :: dict:dict(),
+		   callbacks = dict:new()      :: dict:dict(),
+		   types = dict:new()          :: dict:dict(),
+                   exported_types = sets:new() :: sets:set(),
 		   mod_deps                    :: mod_deps(),
 		   implementation_md5 = []     :: [file_md5()]}).
 
@@ -184,22 +184,22 @@ lookup(Plt, Label) when is_integer(Label) ->
 lookup_1(#mini_plt{info = Info}, MFAorLabel) ->
   ets_table_lookup(Info, MFAorLabel).
 
--spec insert_types(plt(), dict()) -> plt().
+-spec insert_types(plt(), dict:dict()) -> plt().
 
 insert_types(PLT, Rec) ->
   PLT#plt{types = Rec}.
 
--spec insert_exported_types(plt(), set()) -> plt().
+-spec insert_exported_types(plt(), sets:set()) -> plt().
 
 insert_exported_types(PLT, Set) ->
   PLT#plt{exported_types = Set}.
 
--spec get_types(plt()) -> dict().
+-spec get_types(plt()) -> dict:dict().
 
 get_types(#plt{types = Types}) ->
   Types.
 
--spec get_exported_types(plt()) -> set().
+-spec get_exported_types(plt()) -> sets:set().
 
 get_exported_types(#plt{exported_types = ExpTypes}) ->
   ExpTypes.
@@ -211,7 +211,7 @@ get_exported_types(#plt{exported_types = ExpTypes}) ->
 lookup_module(#plt{info = Info}, M) when is_atom(M) ->
   table_lookup_module(Info, M).
 
--spec all_modules(plt()) -> set().
+-spec all_modules(plt()) -> sets:set().
 
 all_modules(#plt{info = Info, contracts = Cs}) ->
   sets:union(table_all_modules(Info), table_all_modules(Cs)).
diff --git a/lib/dialyzer/src/dialyzer_races.erl b/lib/dialyzer/src/dialyzer_races.erl
index 2aa8343bce..48fcde8014 100644
--- a/lib/dialyzer/src/dialyzer_races.erl
+++ b/lib/dialyzer/src/dialyzer_races.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,14 +98,14 @@
                      def_vars   :: [core_vars()],
                      arg_types  :: [erl_types:erl_type()],
                      call_vars  :: [core_vars()],
-                     var_map    :: dict()}).
+                     var_map    :: dict:dict()}).
 -record(dep_call,   {call_name  :: dep_calls(),
                      args       :: args(),
                      arg_types  :: [erl_types:erl_type()],
                      vars       :: [core_vars()],
                      state      :: _, %% XXX: recursive
                      file_line  :: file_line(),
-                     var_map    :: dict()}).
+                     var_map    :: dict:dict()}).
 -record(fun_call,   {caller     :: dialyzer_callgraph:mfa_or_funlbl(),
                      callee     :: dialyzer_callgraph:mfa_or_funlbl(),
                      arg_types  :: [erl_types:erl_type()],
@@ -114,7 +114,7 @@
                      arg        :: var_to_map1()}).
 -record(warn_call,  {call_name  :: warn_calls(),
                      args       :: args(),
-                     var_map    :: dict()}).
+                     var_map    :: dict:dict()}).
 
 -type case_tags()  :: 'beg_case' | #beg_clause{} | #end_clause{} | #end_case{}.
 -type code()       :: [#dep_call{} | #fun_call{} | #warn_call{} |
@@ -1565,7 +1565,7 @@ any_args(StrList) ->
       end
   end.
 
--spec bind_dict_vars(label(), label(), dict()) -> dict().
+-spec bind_dict_vars(label(), label(), dict:dict()) -> dict:dict().
 
 bind_dict_vars(Key, Label, RaceVarMap) ->
   case Key =:= Label of
@@ -1751,7 +1751,7 @@ compare_vars(Var1, Var2, RaceVarMap) when is_integer(Var1), is_integer(Var2) ->
 compare_vars(_Var1, _Var2, _RaceVarMap) ->
   false.
 
--spec compare_var_list(label_type(), [label_type()], dict()) -> boolean().
+-spec compare_var_list(label_type(), [label_type()], dict:dict()) -> boolean().
 
 compare_var_list(Var, VarList, RaceVarMap) ->
   lists:any(fun (V) -> compare_vars(Var, V, RaceVarMap) end, VarList).
@@ -1956,7 +1956,8 @@ mnesia_tuple_argtypes(TupleStr) ->
   [TupleStr2|_T] = string:tokens(TupleStr1, " ,"),
   lists:flatten(string:tokens(TupleStr2, " |")).
 
--spec race_var_map(var_to_map1(), var_to_map2(), dict(), op()) -> dict().
+-spec race_var_map(var_to_map1(), var_to_map2(), dict:dict(), op()) ->
+        dict:dict().
 
 race_var_map(Vars1, Vars2, RaceVarMap, Op) ->
   case Vars1 =:= ?no_arg orelse Vars1 =:= ?bypassed
diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl
index 84379642bf..ef9b00e203 100644
--- a/lib/dialyzer/src/dialyzer_succ_typings.erl
+++ b/lib/dialyzer/src/dialyzer_succ_typings.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,7 @@
 
 -record(st, {callgraph      :: dialyzer_callgraph:callgraph(),
 	     codeserver     :: dialyzer_codeserver:codeserver(),
-	     no_warn_unused :: set(),
+	     no_warn_unused :: sets:set(mfa()),
 	     parent = none  :: parent(),
 	     timing_server  :: dialyzer_timing:timing_server(),
              solvers        :: [solver()],
@@ -137,7 +137,7 @@ get_refined_success_typings(SCCs, #st{callgraph = Callgraph,
 
 -type doc_plt() :: 'undefined' | dialyzer_plt:plt().
 -spec get_warnings(dialyzer_callgraph:callgraph(), dialyzer_plt:plt(),
-		   doc_plt(), dialyzer_codeserver:codeserver(), set(),
+		   doc_plt(), dialyzer_codeserver:codeserver(), sets:set(mfa()),
 		   dialyzer_timing:timing_server(), [solver()], pid()) ->
 	 {[dial_warning()], dialyzer_plt:plt(), doc_plt()}.
 
@@ -149,8 +149,10 @@ get_warnings(Callgraph, Plt, DocPlt, Codeserver,
   NewState = InitState#st{no_warn_unused = NoWarnUnused},
   Mods = dialyzer_callgraph:modules(NewState#st.callgraph),
   MiniPlt = NewState#st.plt,
+  FindOpaques = lookup_and_find_opaques_fun(Codeserver),
   CWarns =
-    dialyzer_contracts:get_invalid_contract_warnings(Mods, Codeserver, MiniPlt),
+    dialyzer_contracts:get_invalid_contract_warnings(Mods, Codeserver,
+                                                     MiniPlt, FindOpaques),
   MiniDocPlt = dialyzer_plt:get_mini_plt(DocPlt),
   ModWarns =
     ?timing(TimingServer, "warning",
@@ -261,7 +263,16 @@ refine_one_module(M, {CodeServer, Callgraph, Plt, _Solvers}) ->
   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
+  Contracts1 = dialyzer_codeserver:lookup_mod_contracts(M, CodeServer),
+  Contracts = orddict:from_list(dict:to_list(Contracts1)),
+  FindOpaques = find_opaques_fun(Records),
+  DecoratedFunTypes =
+    decorate_succ_typings(Contracts, Callgraph, NewFunTypes, FindOpaques),
+  %% ?debug("NewFunTypes       ~p\n   ~n", [dict:to_list(NewFunTypes)]),
+  %% ?debug("refine DecoratedFunTypes ~p\n   ~n", [dict:to_list(DecoratedFunTypes)]),
+  debug_pp_functions("Refine", NewFunTypes, DecoratedFunTypes, Callgraph),
+
+  case reached_fixpoint(FunTypes, DecoratedFunTypes) of
     true -> [];
     {false, NotFixpoint} ->
       ?debug("Not fixpoint\n", []),
@@ -357,9 +368,16 @@ find_succ_types_for_scc(SCC, {Codeserver, Callgraph, Plt, Solvers}) ->
   AllFunSet = sets:from_list([X || {X, _} <- AllFuns]),
   FilteredFunTypes =
     dict:filter(fun(X, _) -> sets:is_element(X, AllFunSet) end, FunTypes),
+  FindOpaques = lookup_and_find_opaques_fun(Codeserver),
+  DecoratedFunTypes =
+    decorate_succ_typings(Contracts3, Callgraph, FilteredFunTypes, FindOpaques),
   %% Check contracts
   PltContracts =
-    dialyzer_contracts:check_contracts(Contracts3, Callgraph, FilteredFunTypes),
+    dialyzer_contracts:check_contracts(Contracts3, Callgraph,
+                                       DecoratedFunTypes, FindOpaques),
+  %% ?debug("FilteredFunTypes ~p\n   ~n", [dict:to_list(FilteredFunTypes)]),
+  %% ?debug("SCC DecoratedFunTypes ~p\n   ~n", [dict:to_list(DecoratedFunTypes)]),
+  debug_pp_functions("SCC", FilteredFunTypes, DecoratedFunTypes, Callgraph),
   ContractFixpoint =
     lists:all(fun({MFA, _C}) ->
 		  %% Check the non-deleted PLT
@@ -368,16 +386,47 @@ find_succ_types_for_scc(SCC, {Codeserver, Callgraph, Plt, Solvers}) ->
 		    {value, _} -> true
 		  end
 	      end, PltContracts),
-  Plt = insert_into_plt(FilteredFunTypes, Callgraph, Plt),
+  Plt = insert_into_plt(DecoratedFunTypes, Callgraph, Plt),
   Plt = dialyzer_plt:insert_contract_list(Plt, PltContracts),
   case (ContractFixpoint andalso 
-	reached_fixpoint_strict(PropTypes, FilteredFunTypes)) of
+	reached_fixpoint_strict(PropTypes, DecoratedFunTypes)) of
     true -> [];
     false ->
       ?debug("Not fixpoint for: ~w\n", [AllFuns]),
       [Fun || {Fun, _Arity} <- AllFuns]
   end.
 
+decorate_succ_typings(Contracts, Callgraph, FunTypes, FindOpaques) ->
+  F = fun(Label, Type) ->
+          case dialyzer_callgraph:lookup_name(Label, Callgraph) of
+            {ok, MFA} ->
+              case orddict:find(MFA, Contracts) of
+                {ok, {_FileLine, Contract}} ->
+                  Args = dialyzer_contracts:get_contract_args(Contract),
+                  Ret = dialyzer_contracts:get_contract_return(Contract),
+                  C = erl_types:t_fun(Args, Ret),
+                  {M, _, _} = MFA,
+                  Opaques = FindOpaques(M),
+                  erl_types:t_decorate_with_opaque(Type, C, Opaques);
+                error -> Type
+              end;
+            error -> Type
+          end
+      end,
+  dict:map(F, FunTypes).
+
+lookup_and_find_opaques_fun(Codeserver) ->
+  fun(Module) ->
+      Records = dialyzer_codeserver:lookup_mod_records(Module, Codeserver),
+      (find_opaques_fun(Records))(Module)
+  end.
+
+find_opaques_fun(Records) ->
+  fun(Module) ->
+      erl_types:module_builtin_opaques(Module) ++
+      erl_types:t_opaque_from_records(Records)
+  end.
+
 get_fun_types_from_plt(FunList, Callgraph, Plt) ->
   get_fun_types_from_plt(FunList, Callgraph, Plt, dict:new()).
 
@@ -443,9 +492,30 @@ debug_pp_succ_typings(SuccTypes) ->
    || {MFA, {contract, RetFun, ArgT}} <- SuccTypes],
   ?debug("\n", []),
   ok.
+
+debug_pp_functions(Header, FunTypes, DecoratedFunTypes, Callgraph) ->
+  ?debug("FunTypes (~s)\n", [Header]),
+  FTypes = lists:keysort(1, dict:to_list(FunTypes)),
+  DTypes = lists:keysort(1, dict:to_list(DecoratedFunTypes)),
+  Fun = fun({{Label, Type},{Label, DecoratedType}}) ->
+            Name = lookup_name(Label, Callgraph),
+            ?debug("~w (~w): ~s\n",
+                   [Name, Label, erl_types:t_to_string(Type)]),
+            case erl_types:t_is_equal(Type, DecoratedType) of
+              true -> ok;
+              false ->
+                ?debug("  With opaque types: ~s\n",
+                       [erl_types:t_to_string(DecoratedType)])
+            end
+        end,
+  lists:foreach(Fun, lists:zip(FTypes, DTypes)),
+  ?debug("\n", []).
 -else.
 debug_pp_succ_typings(_) ->
   ok.
+
+debug_pp_functions(_, _, _, _) ->
+  ok.
 -endif.
 
 lookup_name(F, CG) ->
diff --git a/lib/dialyzer/src/dialyzer_typesig.erl b/lib/dialyzer/src/dialyzer_typesig.erl
index a418a11e65..31ceaf5ac5 100644
--- a/lib/dialyzer/src/dialyzer_typesig.erl
+++ b/lib/dialyzer/src/dialyzer_typesig.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,29 +31,33 @@
 -export([analyze_scc/6]).
 -export([get_safe_underapprox/2]).
 
+%%-import(helper, %% 'helper' could be any module doing sanity checks...
+-import(erl_types,
+        [t_has_var/1, t_inf/2, t_is_equal/2, t_is_subtype/2,
+        t_subtract/2, t_subtract_list/2, t_sup/1, t_sup/2,t_unify/2]).
+
 -import(erl_types,
 	[t_any/0, t_atom/0, t_atom_vals/1,
 	 t_binary/0, t_bitstr/0, t_bitstr/2, t_bitstr_concat/1, t_boolean/0,
 	 t_collect_vars/1, t_cons/2, t_cons_hd/1, t_cons_tl/1,
 	 t_float/0, t_from_range/2, t_from_term/1,
 	 t_fun/0, t_fun/2, t_fun_args/1, t_fun_range/1,
-	 t_has_var/1,
-	 t_inf/2, t_inf/3, t_integer/0,
-	 t_is_any/1, t_is_atom/1, t_is_atom/2, t_is_cons/1, t_is_equal/2,
+         t_integer/0,
+	 t_is_any/1, t_is_atom/1, t_is_any_atom/2, t_is_cons/1,
 	 t_is_float/1, t_is_fun/1,
 	 t_is_integer/1, t_non_neg_integer/0,
 	 t_is_list/1, t_is_nil/1, t_is_none/1, t_is_number/1,
 
-	 t_is_subtype/2, t_limit/2, t_list/0, t_list/1,
+         t_limit/2, t_list/0, t_list/1,
 	 t_list_elements/1, t_nonempty_list/1, t_maybe_improper_list/0,
 	 t_module/0, t_number/0, t_number_vals/1,
-	 t_opaque_match_record/2, t_opaque_matching_structure/2,
-	 t_opaque_from_records/1,
 	 t_pid/0, t_port/0, t_product/1, t_reference/0,
-	 t_subst/2, t_subtract/2, t_subtract_list/2, t_sup/1, t_sup/2,
+	 t_subst/2,
 	 t_timeout/0, t_tuple/0, t_tuple/1,
-	 t_unify/3, t_var/1, t_var_name/1,
-	 t_none/0, t_unit/0]).
+         t_var/1, t_var_name/1,
+	 t_none/0, t_unit/0,
+	 t_map/1
+     ]).
 
 -include("dialyzer.hrl").
 
@@ -79,7 +83,7 @@
 			  list :: [constr()],
 			  deps :: [dep()],
                           masks :: [{dep(),[non_neg_integer()]}] |
-                                   {'d',dict()},
+                                   {'d',dict:dict(dep(), [non_neg_integer()])},
 			  id   :: {'list', dep()}}).
 
 -type constraint_list() :: #constraint_list{}.
@@ -90,26 +94,30 @@
 
 -type constr() :: constraint() | constraint_list() | constraint_ref().
 
--type typesig_scc()    :: [{mfa(), {cerl:c_var(), cerl:c_fun()}, dict()}].
+-type types() :: erl_types:type_table().
+
+-type typesig_scc()    :: [{mfa(), {cerl:c_var(), cerl:c_fun()}, types()}].
 -type typesig_funmap() :: [{type_var(), type_var()}]. %% Orddict
 
--type dict_or_ets() :: {'d', dict()} | {'e', ets:tid()}.
+-type prop_types() :: dict:dict(label(), types()).
+
+-type dict_or_ets() :: {'d', prop_types()} | {'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(),
+		fun_arities = dict:new()        :: dict:dict(type_var(), arity()),
 		in_match    = false             :: boolean(),
 		in_guard    = false             :: boolean(),
 		module                          :: module(),
-		name_map    = dict:new()        :: dict(),
+		name_map    = dict:new()        :: dict:dict(mfa(),
+                                                             cerl:c_fun()),
 		next_label  = 0                 :: label(),
-		self_rec                        :: erl_types:erl_type(),
+		self_rec                        :: 'false' | 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()],
+		records     = dict:new()        :: types(),
 		scc         = []                :: [type_var()],
 		mfas                            :: [tuple()],
                 solvers     = []                :: [solver()]
@@ -164,7 +172,7 @@
 
 -spec analyze_scc(typesig_scc(), label(),
 		  dialyzer_callgraph:callgraph(),
-		  dialyzer_plt:plt(), dict(), [solver()]) -> dict().
+		  dialyzer_plt:plt(), prop_types(), [solver()]) -> prop_types().
 
 analyze_scc(SCC, NextLabel, CallGraph, Plt, PropTypes, Solvers0) ->
   Solvers = solvers(Solvers0),
@@ -192,11 +200,10 @@ solvers(Solvers) -> Solvers.
 %%
 %% ============================================================================
 
-traverse_scc([{MFA, Def, Rec}|Left], DefSet, AccState) ->
+traverse_scc([{_MFA, Def, Rec}|Left], DefSet, AccState) ->
   TmpState1 = state__set_rec_dict(AccState, Rec),
-  TmpState2 = state__set_opaques(TmpState1, MFA),
   DummyLetrec = cerl:c_letrec([Def], cerl:c_atom(foo)),
-  {NewAccState, _} = traverse(DummyLetrec, DefSet, TmpState2),
+  {NewAccState, _} = traverse(DummyLetrec, DefSet, TmpState1),
   traverse_scc(Left, DefSet, NewAccState);
 traverse_scc([], _DefSet, AccState) ->
   AccState.
@@ -386,12 +393,7 @@ traverse(Tree, DefinedVars, State) ->
       case cerl:unfold_literal(Tree) of
 	Tree ->
 	  Type = t_from_term(cerl:concrete(Tree)),
-	  NewType =
-	    case erl_types:t_opaque_match_atom(Type, State#state.opaques) of
-	      [Opaque] -> Opaque;
-	      _ -> Type
-	    end,
-	  {State, NewType};
+	  {State, Type};
 	NewTree -> traverse(NewTree, DefinedVars, State)
       end;
     module ->
@@ -462,27 +464,21 @@ traverse(Tree, DefinedVars, State) ->
 	[Tag|Fields] ->
 	  case cerl:is_c_atom(Tag) of
 	    true ->
-	      %% Check if an opaque term is constructed.
-	      case t_opaque_match_record(TupleType, State#state.opaques) of
-		[Opaque] ->
-		  OpStruct = t_opaque_matching_structure(TupleType, Opaque),
-		  State3 = state__store_conj(TupleType, sub, OpStruct, State2),
-		  {State3, Opaque};
-		%% Check if a record is constructed.
-		_ ->
-		  Arity = length(Fields),
-		  Records = State2#state.records,
-		  case lookup_record(Records, cerl:atom_val(Tag), Arity) of
-		    error -> {State2, TupleType};
-		    {ok, RecType} ->
-		      State3 = state__store_conj(TupleType, sub, RecType, State2),
-		      {State3, TupleType}
-		  end
-	      end;
+              %% Check if a record is constructed.
+              Arity = length(Fields),
+              Records = State2#state.records,
+              case lookup_record(Records, cerl:atom_val(Tag), Arity) of
+                error -> {State2, TupleType};
+                {ok, RecType} ->
+                  State3 = state__store_conj(TupleType, sub, RecType, State2),
+                  {State3, TupleType}
+              end;
 	    false -> {State2, TupleType}
-	  end;
+          end;
 	[] -> {State2, TupleType}
       end;
+    map ->
+	{State, t_map([])};
     values ->
       %% We can get into trouble when unifying products that have the
       %% same element appearing several times. Handle these cases by
@@ -591,9 +587,13 @@ handle_try(Tree, DefinedVars, State) ->
   case state__is_in_guard(State) of
     true ->
       Conj1 = mk_conj_constraint_list([ArgBodyCs,
-				       mk_constraint(BodyVar, eq, TreeVar)]),
+				       mk_constraint(BodyVar,
+                                                     eq,
+                                                     TreeVar)]),
       Disj = mk_disj_constraint_list([Conj1,
-				      mk_constraint(HandlerVar, eq, TreeVar)]),
+				      mk_constraint(HandlerVar,
+                                                    eq,
+                                                    TreeVar)]),
       NewState1 = state__new_constraint_context(HandlerState),
       Conj2 = mk_conj_constraint_list([OldCs, Disj]),
       NewState2 = state__store_conj(Conj2, NewState1),
@@ -604,19 +604,27 @@ handle_try(Tree, DefinedVars, State) ->
 	  {false, false} ->
 	    Conj1 =
 	      mk_conj_constraint_list([ArgBodyCs,
-				       mk_constraint(TreeVar, eq, BodyVar)]),
+				       mk_constraint(TreeVar,
+                                                     eq,
+                                                     BodyVar)]),
 	    Conj2 =
 	      mk_conj_constraint_list([HandlerCs,
-				       mk_constraint(TreeVar, eq, HandlerVar)]),
+				       mk_constraint(TreeVar,
+                                                     eq,
+                                                     HandlerVar)]),
 	    Disj = mk_disj_constraint_list([Conj1, Conj2]),
 	    {Disj, TreeVar};
 	  {false, true} ->
 	    {mk_conj_constraint_list([ArgBodyCs,
-				      mk_constraint(TreeVar, eq, BodyVar)]),
+				      mk_constraint(TreeVar,
+                                                    eq,
+                                                    BodyVar)]),
 	     BodyVar};
 	  {true, false} ->
 	    {mk_conj_constraint_list([HandlerCs,
-				      mk_constraint(TreeVar, eq, HandlerVar)]),
+				      mk_constraint(TreeVar,
+                                                    eq,
+                                                    HandlerVar)]),
 	     HandlerVar};
 	  {true, true} ->
 	    ?debug("Throw failed\n", []),
@@ -668,10 +676,7 @@ handle_call(Call, DefinedVars, State) ->
 get_plt_constr(MFA, Dst, ArgVars, State) ->
   Plt = state__plt(State),
   PltRes = dialyzer_plt:lookup(Plt, MFA),
-  Opaques = State#state.opaques,
-  Module = State#state.module,
   SCCMFAs = State#state.mfas,
-  {FunModule, _, _} = MFA,
   Contract =
     case lists:member(MFA, SCCMFAs) of
       true -> none;
@@ -691,28 +696,24 @@ get_plt_constr(MFA, Dst, ArgVars, State) ->
 	  none ->
 	    {?mk_fun_var(fun(Map) ->
 			     ArgTypes = lookup_type_list(ArgVars, Map),
-			     dialyzer_contracts:get_contract_return(C, ArgTypes)
+                             get_contract_return(C, ArgTypes)
 			 end, ArgVars), GenArgs};
 	  {value, {PltRetType, PltArgTypes}} ->
 	    %% Need to combine the contract with the success typing.
 	    {?mk_fun_var(
 		fun(Map) ->
-		    ArgTypes0 = lookup_type_list(ArgVars, Map),
-		    ArgTypes = case FunModule =:= Module of
-				 false ->
-				   List = lists:zip(PltArgTypes, ArgTypes0),
-				   [erl_types:t_unopaque_on_mismatch(T1, T2, Opaques)
-				    || {T1, T2} <- List];
-				 true -> ArgTypes0
-			       end,
-		    CRet = dialyzer_contracts:get_contract_return(C, ArgTypes),
-		    t_inf(CRet, PltRetType, opaque)
+		    ArgTypes = lookup_type_list(ArgVars, Map),
+                    CRet = get_contract_return(C, ArgTypes),
+		    t_inf(CRet, PltRetType)
 		end, ArgVars),
-	     [t_inf(X, Y, opaque) || {X, Y} <- lists:zip(GenArgs, PltArgTypes)]}
+	     [t_inf(X, Y) || {X, Y} <- lists:zip(GenArgs, PltArgTypes)]}
 	end,
       state__store_conj_lists([Dst|ArgVars], sub, [RetType|ArgCs], State)
   end.
 
+get_contract_return(C, ArgTypes) ->
+  dialyzer_contracts:get_contract_return(C, ArgTypes).
+
 filter_match_fail([Clause] = Cls) ->
   Body = cerl:clause_body(Clause),
   case cerl:type(Body) of
@@ -1045,6 +1046,9 @@ get_safe_underapprox_1([Pat|Left], Acc, Map) ->
       {Ts, Map1} = get_safe_underapprox_1(Es, [], Map),
       Type = t_tuple(Ts),
       get_safe_underapprox_1(Left, [Type|Acc], Map1);
+    map ->
+      %% TODO: Can maybe do something here
+      throw(dont_know);
     values ->
       Es = cerl:values_es(Pat),
       {Ts, Map1} = get_safe_underapprox_1(Es, [], Map),
@@ -1086,7 +1090,7 @@ get_bif_constr({erlang, Op, 2}, Dst, Args = [Arg1, Arg2], _State)
   when Op =:= '+'; Op =:= '-'; Op =:= '*' ->
   ReturnType = ?mk_fun_var(fun(Map) ->
 			       TmpArgTypes = lookup_type_list(Args, Map),
-			       erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
+			       bif_return(erlang, Op, 2, TmpArgTypes)
 			   end, Args),
   ArgFun =
     fun(A, Pos) ->
@@ -1128,8 +1132,8 @@ get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State)
     fun(LocalArg1, LocalArg2, LocalOp) ->
 	fun(Map) ->
 	    DstType = lookup_type(Dst, Map),
-	    IsTrue = t_is_atom(true, DstType),
-	    IsFalse = t_is_atom(false, DstType),
+	    IsTrue = t_is_any_atom(true, DstType),
+	    IsFalse = t_is_any_atom(false, DstType),
 	    case IsTrue orelse IsFalse of
 	      true ->
 		Arg1Type = lookup_type(LocalArg1, Map),
@@ -1176,7 +1180,7 @@ get_bif_constr({erlang, Op, 2}, Dst, [Arg1, Arg2] = Args, _State)
   Arg2Var = ?mk_fun_var(Arg2Fun, DstArgs),
   DstVar = ?mk_fun_var(fun(Map) ->
 			   TmpArgTypes = lookup_type_list(Args, Map),
-			   erl_bif_types:type(erlang, Op, 2, TmpArgTypes)
+			   bif_return(erlang, Op, 2, TmpArgTypes)
 		       end, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstVar),
 			   mk_constraint(Arg1, sub, Arg1Var),
@@ -1218,7 +1222,7 @@ get_bif_constr({erlang, '++', 2}, Dst, [Hd, Tl] = Args, _State) ->
   ArgTypes = erl_bif_types:arg_types(erlang, '++', 2),
   ReturnType = ?mk_fun_var(fun(Map) ->
 			       TmpArgTypes = lookup_type_list(Args, Map),
-			       erl_bif_types:type(erlang, '++', 2, TmpArgTypes)
+			       bif_return(erlang, '++', 2, TmpArgTypes)
 			   end, Args),
   Cs = mk_constraints(Args, sub, ArgTypes),
   mk_conj_constraint_list([mk_constraint(Dst, sub, ReturnType),
@@ -1240,7 +1244,7 @@ get_bif_constr({erlang, is_function, 1}, Dst, [Arg], State) ->
 get_bif_constr({erlang, is_function, 2}, Dst, [Fun, Arity], _State) ->
   ArgFun = fun(Map) ->
 	       DstType = lookup_type(Dst, Map),
-	       case t_is_atom(true, DstType) of
+	       case t_is_any_atom(true, DstType) of
 		 true ->
 		   ArityType = lookup_type(Arity, Map),
 		   case t_number_vals(ArityType) of
@@ -1268,7 +1272,7 @@ get_bif_constr({erlang, is_reference, 1}, Dst, [Arg], State) ->
   get_bif_test_constr(Dst, Arg, t_reference(), State);
 get_bif_constr({erlang, is_record, 2}, Dst, [Var, Tag] = Args, _State) ->
   ArgFun = fun(Map) ->
-	       case t_is_atom(true, lookup_type(Dst, Map)) of
+	       case t_is_any_atom(true, lookup_type(Dst, Map)) of
 		 true -> t_tuple();
 		 false -> t_any()
 	       end
@@ -1276,7 +1280,7 @@ get_bif_constr({erlang, is_record, 2}, Dst, [Var, Tag] = Args, _State) ->
   ArgV = ?mk_fun_var(ArgFun, [Dst]),
   DstFun = fun(Map) ->
 	       TmpArgTypes = lookup_type_list(Args, Map),
-	       erl_bif_types:type(erlang, is_record, 2, TmpArgTypes)
+	       bif_return(erlang, is_record, 2, TmpArgTypes)
 	   end,
   DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
@@ -1285,10 +1289,9 @@ get_bif_constr({erlang, is_record, 2}, Dst, [Var, Tag] = Args, _State) ->
 get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
   %% TODO: Revise this to make it precise for Tag and Arity.
   Records = State#state.records,
-  AllOpaques = State#state.opaques,
   ArgFun =
     fun(Map) ->
-	case t_is_atom(true, lookup_type(Dst, Map)) of
+	case t_is_any_atom(true, lookup_type(Dst, Map)) of
 	  true ->
 	    ArityType = lookup_type(Arity, Map),
 	    case t_is_integer(ArityType) of
@@ -1304,10 +1307,7 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
 			  [TagVal] ->
 			    case lookup_record(Records, TagVal, ArityVal - 1) of
 			      {ok, Type} ->
-				case t_opaque_match_record(Type, AllOpaques) of
-				  [Opaque] -> Opaque;
-				  _ -> Type
-				end;
+                                Type;
 			      error -> GenRecord
 			    end;
 			  _ -> GenRecord
@@ -1323,38 +1323,9 @@ get_bif_constr({erlang, is_record, 3}, Dst, [Var, Tag, Arity] = Args, State) ->
     end,
   ArgV = ?mk_fun_var(ArgFun, [Tag, Arity, Dst]),
   DstFun = fun(Map) ->
-	       [TmpVar, TmpTag, TmpArity] = TmpArgTypes = lookup_type_list(Args, Map),
-	       TmpArgTypes2 =
-		 case lists:member(TmpVar, AllOpaques) of
-		   true ->
-		     case t_is_integer(TmpArity) of
-		       true ->
-			 case t_number_vals(TmpArity) of
-			   [TmpArityVal] ->
-			     case t_is_atom(TmpTag) of
-			       true ->
-				 case t_atom_vals(TmpTag) of
-				   [TmpTagVal] ->
-				     case lookup_record(Records, TmpTagVal,
-							TmpArityVal - 1) of
-				       {ok, TmpType} ->
-					 case t_is_none(t_inf(TmpType, TmpVar, opaque)) of
-					   true  -> TmpArgTypes;
-					   false -> [TmpType, TmpTag, TmpArity]
-					 end;
-				       error -> TmpArgTypes
-				     end;
-				   _ -> TmpArgTypes
-				 end;
-			       false -> TmpArgTypes
-			     end;
-			   _ -> TmpArgTypes
-			 end;
-		       false -> TmpArgTypes
-		     end;
-		   false -> TmpArgTypes
-		 end,
-	       erl_bif_types:type(erlang, is_record, 3, TmpArgTypes2)
+	       [TmpVar, TmpTag, TmpArity] = lookup_type_list(Args, Map),
+               TmpArgTypes = [TmpVar,TmpTag,TmpArity],
+	       bif_return(erlang, is_record, 3, TmpArgTypes)
 	   end,
   DstV = ?mk_fun_var(DstFun, Args),
   mk_conj_constraint_list([mk_constraint(Dst, sub, DstV),
@@ -1369,12 +1340,14 @@ get_bif_constr({erlang, 'and', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
   ArgFun = fun(Var) ->
 	       fun(Map) ->
 		   DstType = lookup_type(Dst, Map),
-		   case t_is_atom(true, DstType) of
+		   case t_is_any_atom(true, DstType) of
 		     true -> True;
 		     false ->
-		       case t_is_atom(false, DstType) of
+		       case t_is_any_atom(false, DstType) of
 			 true ->
-			   case t_is_atom(true, lookup_type(Var, Map)) of
+			   case
+                             t_is_any_atom(true, lookup_type(Var, Map))
+                           of
 			     true -> False;
 			     false -> t_boolean()
 			   end;
@@ -1386,15 +1359,15 @@ get_bif_constr({erlang, 'and', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	   end,
   DstFun = fun(Map) ->
 	       Arg1Type = lookup_type(Arg1, Map),
-	       case t_is_atom(false, Arg1Type) of
+	       case t_is_any_atom(false, Arg1Type) of
 		 true -> False;
 		 false ->
 		   Arg2Type = lookup_type(Arg2, Map),
-		   case t_is_atom(false, Arg2Type) of
+		   case t_is_any_atom(false, Arg2Type) of
 		     true -> False;
 		     false ->
-		       case (t_is_atom(true, Arg1Type)
-			     andalso t_is_atom(true, Arg2Type)) of
+		       case (t_is_any_atom(true, Arg1Type)
+			     andalso t_is_any_atom(true, Arg2Type)) of
 			 true -> True;
 			 false -> t_boolean()
 		       end
@@ -1413,12 +1386,14 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
   ArgFun = fun(Var) ->
 	       fun(Map) ->
 		   DstType = lookup_type(Dst, Map),
-		   case t_is_atom(false, DstType) of
+		   case t_is_any_atom(false, DstType) of
 		     true -> False;
 		     false ->
-		       case t_is_atom(true, DstType) of
+		       case t_is_any_atom(true, DstType) of
 			 true ->
-			   case t_is_atom(false, lookup_type(Var, Map)) of
+			   case
+                             t_is_any_atom(false, lookup_type(Var, Map))
+                           of
 			     true -> True;
 			     false -> t_boolean()
 			   end;
@@ -1430,15 +1405,15 @@ get_bif_constr({erlang, 'or', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	   end,
   DstFun = fun(Map) ->
 	       Arg1Type = lookup_type(Arg1, Map),
-	       case t_is_atom(true, Arg1Type) of
+	       case t_is_any_atom(true, Arg1Type) of
 		 true -> True;
 		 false ->
 		   Arg2Type = lookup_type(Arg2, Map),
-		   case t_is_atom(true, Arg2Type) of
+		   case t_is_any_atom(true, Arg2Type) of
 		     true -> True;
 		     false ->
-		       case (t_is_atom(false, Arg1Type)
-			     andalso t_is_atom(false, Arg2Type)) of
+		       case (t_is_any_atom(false, Arg1Type)
+			     andalso t_is_any_atom(false, Arg2Type)) of
 			 true -> False;
 			 false -> t_boolean()
 		       end
@@ -1465,10 +1440,10 @@ get_bif_constr({erlang, 'not', 1}, Dst, [Arg] = Args, _State) ->
   Fun = fun(Var) ->
 	    fun(Map) ->
 		Type = lookup_type(Var, Map),
-		case t_is_atom(true, Type) of
+		case t_is_any_atom(true, Type) of
 		  true -> False;
 		  false ->
-		    case t_is_atom(false, Type) of
+		    case t_is_any_atom(false, Type) of
 		      true -> True;
 		      false -> t_boolean()
 		    end
@@ -1485,10 +1460,10 @@ get_bif_constr({erlang, '=:=', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	fun(Map) ->
 	    DstType = lookup_type(Dst, Map),
 	    OtherVarType = lookup_type(OtherVar, Map),
-	    case t_is_atom(true, DstType) of
+	    case t_is_any_atom(true, DstType) of
 	      true -> OtherVarType;
 	      false ->
-		case t_is_atom(false, DstType) of
+		case t_is_any_atom(false, DstType) of
 		  true ->
 		    case is_singleton_type(OtherVarType) of
 		      true -> t_subtract(lookup_type(Self, Map), OtherVarType);
@@ -1518,7 +1493,7 @@ get_bif_constr({erlang, '=:=', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
   DstFun = fun(Map) ->
 	       TmpArgTypes = lookup_type_list(Args, Map),
-	       erl_bif_types:type(erlang, '==', 2, TmpArgTypes)
+	       bif_return(erlang, '==', 2, TmpArgTypes)
 	   end,
   ArgFun =
     fun(Var, Self) ->
@@ -1527,16 +1502,16 @@ get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 	    DstType = lookup_type(Dst, Map),
 	    case is_singleton_non_number_type(VarType) of
 	      true ->
-		case t_is_atom(true, DstType) of
+		case t_is_any_atom(true, DstType) of
 		  true -> VarType;
 		  false ->
-		    case t_is_atom(false, DstType) of
+		    case t_is_any_atom(false, DstType) of
 		      true -> t_subtract(lookup_type(Self, Map), VarType);
 		      false -> t_any()
 		    end
 		end;
 	      false ->
-		case t_is_atom(true, DstType) of
+		case t_is_any_atom(true, DstType) of
 		  true ->
 		    case t_is_number(VarType) of
 		      true -> t_number();
@@ -1560,18 +1535,14 @@ get_bif_constr({erlang, '==', 2}, Dst, [Arg1, Arg2] = Args, _State) ->
 			   mk_constraint(Arg1, sub, ArgV1),
 			   mk_constraint(Arg2, sub, ArgV2)]);
 get_bif_constr({erlang, element, 2} = _BIF, Dst, Args,
-               #state{cs = Constrs, opaques = Opaques}) ->
+               #state{cs = Constrs}) ->
   GenType = erl_bif_types:type(erlang, element, 2),
   case t_is_none(GenType) of
     true -> ?debug("Bif: ~w failed\n", [_BIF]), throw(error);
     false ->
       Fun = fun(Map) ->
-		[I, T] = ATs = lookup_type_list(Args, Map),
-		ATs2 = case lists:member(T, Opaques) of
-			 true -> [I, erl_types:t_opaque_structure(T)];
-			 false -> ATs
-		       end,
-		erl_bif_types:type(erlang, element, 2, ATs2)
+		ATs2 = lookup_type_list(Args, Map),
+		bif_return(erlang, element, 2, ATs2)
 	    end,
       ReturnType = ?mk_fun_var(Fun, Args),
       ArgTypes = erl_bif_types:arg_types(erlang, element, 2),
@@ -1583,22 +1554,14 @@ get_bif_constr({erlang, element, 2} = _BIF, Dst, Args,
         end,
       mk_conj_constraint_list([mk_constraint(Dst, sub, ReturnType)|NewCs])
   end;
-get_bif_constr({M, F, A} = _BIF, Dst, Args, State) ->
+get_bif_constr({M, F, A} = _BIF, Dst, Args, _State) ->
   GenType = erl_bif_types:type(M, F, A),
-  Opaques = State#state.opaques,
   case t_is_none(GenType) of
     true -> ?debug("Bif: ~w failed\n", [_BIF]), throw(error);
     false ->
-      UnopaqueFun =
-	fun(T) -> case lists:member(T, Opaques)  of
-		    true -> erl_types:t_unopaque(T, [T]);
-		    false -> T
-		  end
-	end,
       ReturnType = ?mk_fun_var(fun(Map) ->
-				  TmpArgTypes0 = lookup_type_list(Args, Map),
-				  TmpArgTypes = [UnopaqueFun(T) || T<- TmpArgTypes0],
-				  erl_bif_types:type(M, F, A, TmpArgTypes)
+                                  TmpArgTypes = lookup_type_list(Args, Map),
+                                  bif_return(M, F, A, TmpArgTypes)
 			      end, Args),
       case erl_bif_types:is_known(M, F, A) of
 	false ->
@@ -1616,12 +1579,12 @@ get_bif_constr({M, F, A} = _BIF, Dst, Args, State) ->
   end.
 
 eval_inv_arith('+', _Pos, Dst, Arg) ->
-  erl_bif_types:type(erlang, '-', 2, [Dst, Arg]);
+  bif_return(erlang, '-', 2, [Dst, Arg]);
 eval_inv_arith('*', _Pos, Dst, Arg) ->
   case t_number_vals(Arg) of
     [0] -> t_integer();
     _ ->
-      TmpRet = erl_bif_types:type(erlang, 'div', 2, [Dst, Arg]),
+      TmpRet = bif_return(erlang, 'div', 2, [Dst, Arg]),
       Zero = t_from_term(0),
       %% If 0 is not part of the result, it cannot be part of the argument.
       case t_is_subtype(Zero, Dst) of
@@ -1630,9 +1593,9 @@ eval_inv_arith('*', _Pos, Dst, Arg) ->
       end
   end;
 eval_inv_arith('-', 1, Dst, Arg) ->
-  erl_bif_types:type(erlang, '-', 2, [Arg, Dst]);
+  bif_return(erlang, '-', 2, [Arg, Dst]);
 eval_inv_arith('-', 2, Dst, Arg) ->
-  erl_bif_types:type(erlang, '+', 2, [Arg, Dst]).
+  bif_return(erlang, '+', 2, [Arg, Dst]).
 
 range_inc(neg_inf) -> neg_inf;
 range_inc(pos_inf) -> pos_inf;
@@ -1642,33 +1605,20 @@ range_dec(neg_inf) -> neg_inf;
 range_dec(pos_inf) -> pos_inf;
 range_dec(Int) when is_integer(Int) -> Int - 1.
 
-get_bif_test_constr(Dst, Arg, Type, State) ->
+get_bif_test_constr(Dst, Arg, Type, _State) ->
   ArgFun = fun(Map) ->
 	       DstType = lookup_type(Dst, Map),
-	       case t_is_atom(true, DstType) of
+	       case t_is_any_atom(true, DstType) of
 		 true -> Type;
 		 false -> t_any()
 	       end
 	   end,
   ArgV = ?mk_fun_var(ArgFun, [Dst]),
-  Opaques = State#state.opaques,
   DstFun = fun(Map) ->
 	       ArgType = lookup_type(Arg, Map),
 	       case t_is_none(t_inf(ArgType, Type)) of
 		 true ->
-		   case lists:member(ArgType, Opaques) of
-		     true ->
-		       OpaqueStruct = erl_types:t_opaque_structure(ArgType),
-		       case t_is_none(t_inf(OpaqueStruct, Type)) of
-			 true -> t_from_term(false);
-			 false ->
-			   case t_is_subtype(ArgType, Type) of
-			     true -> t_from_term(true);
-			     false -> t_boolean()
-			   end
-		       end;
-		     false ->  t_from_term(false)
-		   end;
+                   t_from_term(false);
 		 false ->
 		   case t_is_subtype(ArgType, Type) of
 		     true -> t_from_term(true);
@@ -1784,7 +1734,6 @@ minimize_state(#state{
 		  fun_arities = FunArities,
 		  self_rec    = SelfRec,
 		  prop_types  = {d, PropTypes},
-		  opaques     = Opaques,
                   solvers     = Solvers
 		 }) ->
   Opts = [{read_concurrency, true}],
@@ -1798,7 +1747,6 @@ minimize_state(#state{
      fun_arities = FunArities,
      self_rec    = SelfRec,
      prop_types  = {e, ETSPropTypes},
-     opaques     = Opaques,
      solvers     = Solvers
     }.
 
@@ -1947,7 +1895,7 @@ sane_maps(Map1, Map2, Keys, _S1, _S2) ->
 
 %% Solver v2
 
--record(v2_state, {constr_data = dict:new() :: dict(),
+-record(v2_state, {constr_data = dict:new() :: dict:dict(),
                    state :: #state{}}).
 
 v2_solve_ref(Fun, Map, State) ->
@@ -1956,8 +1904,7 @@ v2_solve_ref(Fun, Map, State) ->
   {ok, NewMap}.
 
 v2_solve(#constraint{}=C, Map, V2State) ->
-  State = V2State#v2_state.state,
-  case solve_one_c(C, Map, State#state.opaques) of
+  case solve_one_c(C, Map) of
     error ->
       report_failed_constraint(C, Map),
       {error, V2State};
@@ -2031,7 +1978,7 @@ v2_solve_self_recursive(Cs, Map, Id, RecType0, V2State0) ->
     {ok, NewMap, V2State, U} ->
       pp_map("recursive finished", NewMap),
       NewRecType = unsafe_lookup_type(Id, NewMap),
-      case t_is_equal(NewRecType, RecType0) of
+      case is_equal(NewRecType, RecType0) of
 	true ->
           {NewMap2, U1} = enter_var_type(RecVar, NewRecType, NewMap),
 	  {ok, NewMap2, V2State, lists:umerge(U, U1)};
@@ -2397,7 +2344,7 @@ solve_self_recursive(Cs, Map, MapDict, Id, RecType0, State) ->
     {ok, NewMapDict, NewMap} ->
       pp_map("NewMap", NewMap),
       NewRecType = unsafe_lookup_type(Id, NewMap),
-      case t_is_equal(NewRecType, RecType0) of
+      case is_equal(NewRecType, RecType0) of
 	true ->
 	  {ok, NewMapDict, enter_type(RecVar, NewRecType, NewMap)};
 	false ->
@@ -2447,7 +2394,7 @@ solve_cs([#constraint_list{} = C|Tail], Map, MapDict, State) ->
     {error, _NewMapDict} = Error -> Error
   end;
 solve_cs([#constraint{} = C|Tail], Map, MapDict, State) ->
-  case solve_one_c(C, Map, State#state.opaques) of
+  case solve_one_c(C, Map) of
     error ->
       report_failed_constraint(C, Map),
       {error, MapDict};
@@ -2457,10 +2404,10 @@ solve_cs([#constraint{} = C|Tail], Map, MapDict, State) ->
 solve_cs([], Map, MapDict, _State) ->
   {ok, MapDict, Map}.
 
-solve_one_c(#constraint{lhs = Lhs, rhs = Rhs, op = Op}, Map, Opaques) ->
+solve_one_c(#constraint{lhs = Lhs, rhs = Rhs, op = Op}, Map) ->
   LhsType = lookup_type(Lhs, Map),
   RhsType = lookup_type(Rhs, Map),
-  Inf = t_inf(LhsType, RhsType, opaque),
+  Inf = t_inf(LhsType, RhsType),
   ?debug("Solving: ~s :: ~s ~w ~s :: ~s\n\tInf: ~s\n",
 	 [format_type(Lhs), format_type(LhsType), Op,
 	  format_type(Rhs), format_type(RhsType), format_type(Inf)]),
@@ -2468,12 +2415,12 @@ solve_one_c(#constraint{lhs = Lhs, rhs = Rhs, op = Op}, Map, Opaques) ->
     true -> error;
     false ->
       case Op of
-	sub -> solve_subtype(Lhs, Inf, Map, Opaques);
+	sub -> solve_subtype(Lhs, Inf, Map);
 	eq ->
-	  case solve_subtype(Lhs, Inf, Map, Opaques) of
+	  case solve_subtype(Lhs, Inf, Map) of
 	    error -> error;
 	    {ok, {Map1, U1}} ->
-              case solve_subtype(Rhs, Inf, Map1, Opaques) of
+              case solve_subtype(Rhs, Inf, Map1) of
                 error -> error;
                 {ok, {Map2, U2}} -> {ok, {Map2, lists:umerge(U1, U2)}}
               end
@@ -2481,7 +2428,7 @@ solve_one_c(#constraint{lhs = Lhs, rhs = Rhs, op = Op}, Map, Opaques) ->
       end
   end.
 
-solve_subtype(Type, Inf, Map, Opaques) ->
+solve_subtype(Type, Inf, Map) ->
   %% case cerl:is_literal(Type) of
   %%   true ->
   %%     case t_is_subtype(t_from_term(cerl:concrete(Type)), Inf) of
@@ -2489,7 +2436,7 @@ solve_subtype(Type, Inf, Map, Opaques) ->
   %%	false -> error
   %%     end;
   %%   false ->
-      try t_unify(Type, Inf, Opaques) of
+      try t_unify(Type, Inf) of
 	{_, List} -> {ok, enter_type_list(List, Map)}
       catch
 	throw:{mismatch, _T1, _T2} ->
@@ -2540,7 +2487,7 @@ join_one_key(Key, [Map|Maps], Type) ->
     true -> Type;
     false ->
       NewType = lookup_type(Key, Map),
-      case t_is_equal(NewType, Type) of
+      case is_equal(NewType, Type) of
 	true  -> join_one_key(Key, Maps, Type);
 	false -> join_one_key(Key, Maps, t_sup(NewType, Type))
       end
@@ -2555,7 +2502,7 @@ maps_are_equal(Map1, Map2, Deps) ->
 maps_are_equal_1(Map1, Map2, [H|Tail]) ->
   T1 = lookup_type(H, Map1),
   T2 = lookup_type(H, Map2),
-  case t_is_equal(T1, T2) of
+  case is_equal(T1, T2) of
     true -> maps_are_equal_1(Map1, Map2, Tail);
     false ->
       ?debug("~w: ~s =/= ~s\n", [H, format_type(T1), format_type(T2)]),
@@ -2587,14 +2534,22 @@ prune_keys(Map1, Map2, Deps) ->
 
 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
+  %% Keep any() in the map if it is opaque:
+  case is_equal(Val, t_any()) of
     true ->
       erase_type(Key, Map);
     false ->
       LimitedVal = t_limit(Val, ?INTERNAL_TYPE_LIMIT),
+      case is_equal(LimitedVal, Val) of
+	true -> ok;
+	false -> ?debug("LimitedVal ~s\n", [format_type(LimitedVal)])
+      end,
       case dict:find(Key, Map) of
-	{ok, LimitedVal} -> Map;
-	{ok, _} -> map_store(Key, LimitedVal, Map);
+        {ok, Value} ->
+          case is_equal(Value, LimitedVal) of
+            true -> Map;
+            false -> map_store(Key, LimitedVal, Map)
+          end;
 	error -> map_store(Key, LimitedVal, Map)
       end
   end;
@@ -2681,7 +2636,10 @@ 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)).
+  is_equal(lookup_type(Key, Map1), lookup_type(Key, Map2)).
+
+is_equal(Type1, Type2) ->
+  t_is_equal(Type1, Type2).
 
 pp_map(_S, _Map) ->
   ?debug("\t~s: ~p\n",
@@ -2716,11 +2674,6 @@ new_state(SCC0, NextLabel, CallGraph, Plt, PropTypes, Solvers) ->
 state__set_rec_dict(State, RecDict) ->
   State#state{records = RecDict}.
 
-state__set_opaques(#state{records = RecDict} = State, {M, _F, _A}) ->
-  Opaques =
-    erl_types:module_builtin_opaques(M) ++ t_opaque_from_records(RecDict),
-  State#state{opaques = Opaques, module = M}.
-
 state__set_in_match(State, Bool) ->
   State#state{in_match = Bool}.
 
@@ -2760,7 +2713,8 @@ state__lookup_undef_var(Tree, #state{callgraph = CG, plt = Plt}) ->
     {ok, MFA} ->
       case dialyzer_plt:lookup(Plt, MFA) of
 	none -> error;
-	{value, {RetType, ArgTypes}} -> {ok, t_fun(ArgTypes, RetType)}
+	{value, {RetType, ArgTypes}} ->
+          {ok, t_fun(ArgTypes, RetType)}
       end
   end.
 
@@ -2897,7 +2851,7 @@ state__get_cs(Var, #state{cmap = {d, Dict}}) ->
   dict:fetch(Var, Dict).
 
 state__is_self_rec(Fun, #state{self_rec = SelfRec}) ->
-  Fun =:= SelfRec.
+  not (SelfRec =:= 'false') andalso is_equal(Fun, SelfRec).
 
 state__store_funs(Vars0, Funs0, #state{fun_map = Map} = State) ->
   debug_make_name_map(Vars0, Funs0),
@@ -2923,7 +2877,9 @@ state__finalize(State) ->
 %%
 %% ============================================================================
 
--spec mk_constraint(erl_types:erl_type(), constr_op(), fvar_or_type()) -> #constraint{}.
+-spec mk_constraint(erl_types:erl_type(),
+                    constr_op(),
+                    fvar_or_type()) -> #constraint{}.
 
 mk_constraint(Lhs, Op, Rhs) ->
   case t_is_any(Lhs) orelse constraint_opnd_is_any(Rhs) of
@@ -2934,9 +2890,9 @@ mk_constraint(Lhs, Op, Rhs) ->
       case Deps =:= [] of
 	true ->
 	  %% This constraint is constant. Solve it immediately.
-	  case solve_one_c(C, map_new(), []) of
+	  case solve_one_c(C, map_new()) of
 	    error -> throw(error);
-	    _ ->
+	    _R ->
 	      %% This is always true, keep it anyway for logistic reasons
 	      C
 	  end;
@@ -2944,10 +2900,13 @@ mk_constraint(Lhs, Op, Rhs) ->
 	  C
       end;
     true ->
-      C = mk_constraint_1(t_any(), Op, t_any()),
-      C#constraint{deps = []}
+      mk_constraint_any(Op)
   end.
 
+mk_constraint_any(Op) ->
+  C = mk_constraint_1(t_any(), Op, t_any()),
+  C#constraint{deps = []}.
+
 %% the following function is used so that we do not call
 %% erl_types:t_is_any/1 with a term other than an erl_type()
 -spec constraint_opnd_is_any(fvar_or_type()) -> boolean().
@@ -3002,7 +2961,8 @@ mk_constraint_1(Lhs, Op, Rhs) ->
   #constraint{lhs = Lhs, op = Op, rhs = Rhs}.
 
 mk_constraints([Lhs|LhsTail], Op, [Rhs|RhsTail]) ->
-  [mk_constraint(Lhs, Op, Rhs)|mk_constraints(LhsTail, Op, RhsTail)];
+  [mk_constraint(Lhs, Op, Rhs) |
+   mk_constraints(LhsTail, Op, RhsTail)];
 mk_constraints([], _Op, []) ->
   [].
 
@@ -3017,7 +2977,7 @@ mk_constraint_list(Type, List) ->
   Deps = calculate_deps(List2),
   case Deps =:= [] of
     true -> #constraint_list{type = conj,
-			     list = [mk_constraint(t_any(), eq, t_any())],
+			     list = [mk_constraint_any(eq)],
 			     deps = []};
     false -> #constraint_list{type = Type, list = List2, deps = Deps}
   end.
@@ -3236,6 +3196,9 @@ calculate_masks([], _I, L) ->
 %%
 %% ============================================================================
 
+bif_return(M, F, A, Xs) ->
+  erl_bif_types:type(M, F, A, Xs).
+
 is_singleton_non_number_type(Type) ->
   case t_is_number(Type) of
     true -> false;
@@ -3265,7 +3228,7 @@ is_singleton_type(Type) ->
 
 find_element(Args, Cs) ->
   [Pos, Tuple] = Args,
-  case erl_types:t_is_number(Pos) of
+  case t_is_number(Pos) of
     true ->
       case erl_types:t_number_vals(Pos) of
         'unknown' -> 'unknown';
@@ -3301,8 +3264,10 @@ find_constraint(Tuple, [_|Cs]) ->
 lookup_record(Records, Tag, Arity) ->
   case erl_types:lookup_record(Tag, Arity, Records) of
     {ok, Fields} ->
-      {ok, t_tuple([t_from_term(Tag)|
-		    [FieldType || {_FieldName, FieldType} <- Fields]])};
+      RecType =
+        t_tuple([t_from_term(Tag)|
+                 [FieldType || {_FieldName, FieldType} <- Fields]]),
+      {ok, RecType};
     error ->
       error
   end.
diff --git a/lib/dialyzer/src/dialyzer_utils.erl b/lib/dialyzer/src/dialyzer_utils.erl
index a4c4d37a0f..21183e3459 100644
--- a/lib/dialyzer/src/dialyzer_utils.erl
+++ b/lib/dialyzer/src/dialyzer_utils.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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,14 +164,14 @@ get_core_from_abstract_code(AbstrCode, Opts) ->
 %% ============================================================================
 
 -spec get_record_and_type_info(abstract_code()) ->
-	{'ok', dict()} | {'error', string()}.
+	{'ok', dict:dict()} | {'error', string()}.
 
 get_record_and_type_info(AbstractCode) ->
   Module = get_module(AbstractCode),
   get_record_and_type_info(AbstractCode, Module, dict:new()).
 
--spec get_record_and_type_info(abstract_code(), module(), dict()) ->
-	{'ok', dict()} | {'error', string()}.
+-spec get_record_and_type_info(abstract_code(), module(), dict:dict()) ->
+	{'ok', dict:dict()} | {'error', string()}.
 
 get_record_and_type_info(AbstractCode, Module, RecDict) ->
   get_record_and_type_info(AbstractCode, Module, [], RecDict).
@@ -304,7 +304,7 @@ process_record_remote_types(CServer) ->
   CServer1 = dialyzer_codeserver:finalize_records(NewRecords, CServer),
   dialyzer_codeserver:finalize_exported_types(TempExpTypes, CServer1).
 
--spec merge_records(dict(), dict()) -> dict().
+-spec merge_records(dict:dict(), dict:dict()) -> dict:dict().
 
 merge_records(NewRecords, OldRecords) ->
   dict:merge(fun(_Key, NewVal, _OldVal) -> NewVal end, NewRecords, OldRecords).
@@ -315,10 +315,10 @@ merge_records(NewRecords, OldRecords) ->
 %%
 %% ============================================================================
 
--type spec_dict()     :: dict().
--type callback_dict() :: dict().
+-type spec_dict()     :: dict:dict().
+-type callback_dict() :: dict:dict().
 
--spec get_spec_info(atom(), abstract_code(), dict()) ->
+-spec get_spec_info(atom(), abstract_code(), dict:dict()) ->
         {'ok', spec_dict(), callback_dict()} | {'error', string()}.
 
 get_spec_info(ModName, AbstractCode, RecordsDict) ->
@@ -383,7 +383,7 @@ get_spec_info([], SpecDict, CallbackDict, _RecordsDict, _ModName, _File) ->
 %%
 %% ============================================================================
 
--spec sets_filter([module()], set()) -> set().
+-spec sets_filter([module()], sets:set()) -> sets:set().
 
 sets_filter([], ExpTypes) ->
   ExpTypes;
@@ -434,7 +434,7 @@ format_errors([]) ->
 format_sig(Type) ->
   format_sig(Type, dict:new()).
 
--spec format_sig(erl_types:erl_type(), dict()) -> string().
+-spec format_sig(erl_types:erl_type(), dict:dict()) -> string().
 
 format_sig(Type, RecDict) ->
   "fun(" ++ Sig = lists:flatten(erl_types:t_to_string(Type, RecDict)),
@@ -450,11 +450,10 @@ flat_format(Fmt, Lst) ->
 %% Created     : 5 March 2007
 %%-------------------------------------------------------------------
 
+-spec pp_hook() -> fun((cerl:cerl(), _, _) -> term()).
 pp_hook() ->
   fun pp_hook/3.
 
--spec pp_hook() -> fun((cerl:cerl(), _, _) -> term()).
-
 pp_hook(Node, Ctxt, Cont) ->
   case cerl:type(Node) of
     binary ->
diff --git a/lib/dialyzer/test/Makefile b/lib/dialyzer/test/Makefile
index 9f8a3f1194..f43e04dd59 100644
--- a/lib/dialyzer/test/Makefile
+++ b/lib/dialyzer/test/Makefile
@@ -7,9 +7,11 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 AUXILIARY_FILES=\
 	dialyzer.spec\
+	dialyzer.cover\
 	dialyzer_test_constants.hrl\
 	dialyzer_common.erl\
 	file_utils.erl\
+	dialyzer_SUITE.erl\
 	plt_SUITE.erl
 
 # ----------------------------------------------------
diff --git a/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl b/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl
index 7eb4c6ec97..76da1fda70 100644
--- a/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl
+++ b/lib/dialyzer/test/behaviour_SUITE_data/src/custom_sup.erl
@@ -1,4 +1,3 @@
-%%% -*- coding: utf-8 -*-
 %%%
 %%% Dialyzer was giving a warning with this input because of a bug in the
 %%% substitution of remote types in specs. Remote types in the first element of
diff --git a/lib/dialyzer/test/dialyzer.cover b/lib/dialyzer/test/dialyzer.cover
new file mode 100644
index 0000000000..cc61ea1901
--- /dev/null
+++ b/lib/dialyzer/test/dialyzer.cover
@@ -0,0 +1,3 @@
+%% -*- erlang -*-
+{incl_app,dialyzer,details}.
+%{incl_mods,dialyzer,[erl_types,erl_bif_types]}.
diff --git a/lib/dialyzer/test/dialyzer_SUITE.erl b/lib/dialyzer/test/dialyzer_SUITE.erl
new file mode 100644
index 0000000000..1b62291a00
--- /dev/null
+++ b/lib/dialyzer/test/dialyzer_SUITE.erl
@@ -0,0 +1,77 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+
+%% Default timetrap timeout (set in init_per_testcase).
+-define(default_timeout, ?t:minutes(1)).
+-define(application, dialyzer).
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
+	 init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases must be exported.
+-export([app_test/1, appup_test/1]).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [app_test, appup_test].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+init_per_testcase(_Case, Config) ->
+    ?line Dog=test_server:timetrap(?default_timeout),
+    [{watchdog, Dog}|Config].
+end_per_testcase(_Case, Config) ->
+    Dog=?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    ok.
+
+%%%
+%%% Test cases starts here.
+%%%
+
+app_test(doc) ->
+    ["Test that the .app file does not contain any `basic' errors"];
+app_test(suite) ->
+    [];
+app_test(Config) when is_list(Config) ->
+    ?line ?t:app_test(dialyzer).
+
+%% Test that the .appup file does not contain any `basic' errors
+appup_test(Config) when is_list(Config) ->
+    ok = ?t:appup_test(dialyzer).
diff --git a/lib/dialyzer/test/file_utils.erl b/lib/dialyzer/test/file_utils.erl
index 36b368760c..e1314ec8de 100644
--- a/lib/dialyzer/test/file_utils.erl
+++ b/lib/dialyzer/test/file_utils.erl
@@ -106,7 +106,7 @@ lcs_fast(S1, S2) ->
 
 -spec lcs_fast([string()], [string()],
 	       pos_integer(), pos_integer(),
-	       non_neg_integer(), array()) -> {[string()], array()}.
+	       non_neg_integer(), array:array()) -> {[string()], array:array()}.
 
 lcs_fast([], _, _, _, _, Acc) ->
   {[], Acc};
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/array b/lib/dialyzer/test/opaque_SUITE_data/results/array
index b05d088a03..9921b61669 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/array
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/array
@@ -1,3 +1,3 @@
 
-array_use.erl:12: The type test is_tuple(array()) breaks the opaqueness of the term array()
-array_use.erl:9: The attempt to match a term of type array() against the pattern {'array', _, _, 'undefined', _} breaks the opaqueness of the term
+array_use.erl:12: The type test is_tuple(array:array(_)) breaks the opaqueness of the term array:array(_)
+array_use.erl:9: The attempt to match a term of type array:array(_) against the pattern {'array', _, _, 'undefined', _} breaks the opaqueness of the term
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/crash b/lib/dialyzer/test/opaque_SUITE_data/results/crash
index 1ddae5149f..69bdc00257 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/crash
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/crash
@@ -1,6 +1,6 @@
 
 crash_1.erl:45: Record construction #targetlist{list::[]} violates the declared type of field list::'undefined' | crash_1:target()
-crash_1.erl:48: The call crash_1:get_using_branch2(Branch::maybe_improper_list(),L::'undefined' | crash_1:target()) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+crash_1.erl:48: The call crash_1:get_using_branch2(Branch::maybe_improper_list(),L::'undefined' | crash_1:target()) will never return since it differs in the 2nd argument from the success typing arguments: (any(),maybe_improper_list())
 crash_1.erl:50: The pattern <_Branch, []> can never match the type <maybe_improper_list(),'undefined' | crash_1:target()>
 crash_1.erl:52: The pattern <Branch, [H = {'target', _, _} | _T]> can never match the type <maybe_improper_list(),'undefined' | crash_1:target()>
 crash_1.erl:54: The pattern <Branch, [{'target', _, _} | T]> can never match the type <maybe_improper_list(),'undefined' | crash_1:target()>
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/dict b/lib/dialyzer/test/opaque_SUITE_data/results/dict
index 5c6bf6a927..42f6663191 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/dict
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/dict
@@ -1,15 +1,15 @@
 
-dict_use.erl:41: The attempt to match a term of type dict() against the pattern 'gazonk' breaks the opaqueness of the term
-dict_use.erl:45: The attempt to match a term of type dict() against the pattern [] breaks the opaqueness of the term
-dict_use.erl:46: The attempt to match a term of type dict() against the pattern 42 breaks the opaqueness of the term
-dict_use.erl:51: The attempt to match a term of type dict() against the pattern [] breaks the opaqueness of the term
-dict_use.erl:52: The attempt to match a term of type dict() against the pattern 42 breaks the opaqueness of the term
-dict_use.erl:58: Attempt to test for equality between a term of type maybe_improper_list() and a term of opaque type dict()
-dict_use.erl:60: Attempt to test for inequality between a term of type atom() and a term of opaque type dict()
-dict_use.erl:64: Guard test length(D::dict()) breaks the opaqueness of its argument
-dict_use.erl:65: Guard test is_atom(D::dict()) breaks the opaqueness of its argument
-dict_use.erl:66: Guard test is_list(D::dict()) breaks the opaqueness of its argument
-dict_use.erl:70: The type test is_list(dict()) breaks the opaqueness of the term dict()
-dict_use.erl:73: The call dict:fetch('foo',[1 | 2 | 3,...]) does not have an opaque term of type dict() as 2nd argument
+dict_use.erl:41: The attempt to match a term of type dict:dict(_,_) against the pattern 'gazonk' breaks the opaqueness of the term
+dict_use.erl:45: The attempt to match a term of type dict:dict(_,_) against the pattern [] breaks the opaqueness of the term
+dict_use.erl:46: The attempt to match a term of type dict:dict(_,_) against the pattern 42 breaks the opaqueness of the term
+dict_use.erl:51: The attempt to match a term of type dict:dict(_,_) against the pattern [] breaks the opaqueness of the term
+dict_use.erl:52: The attempt to match a term of type dict:dict(_,_) against the pattern 42 breaks the opaqueness of the term
+dict_use.erl:58: Attempt to test for equality between a term of type maybe_improper_list() and a term of opaque type dict:dict(_,_)
+dict_use.erl:60: Attempt to test for inequality between a term of type atom() and a term of opaque type dict:dict(_,_)
+dict_use.erl:64: Guard test length(D::dict:dict(_,_)) breaks the opaqueness of its argument
+dict_use.erl:65: Guard test is_atom(D::dict:dict(_,_)) breaks the opaqueness of its argument
+dict_use.erl:66: Guard test is_list(D::dict:dict(_,_)) breaks the opaqueness of its argument
+dict_use.erl:70: The type test is_list(dict:dict(_,_)) breaks the opaqueness of the term dict:dict(_,_)
+dict_use.erl:73: The call dict:fetch('foo',[1 | 2 | 3,...]) does not have an opaque term of type dict:dict(_,_) as 2nd argument
 dict_use.erl:76: The call dict:merge(Fun::any(),42,[1 | 2,...]) does not have opaque terms as 2nd and 3rd arguments
-dict_use.erl:79: The call dict:store(42,'elli',{'dict',0,16,16,8,80,48,{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},{{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}) does not have an opaque term of type dict() as 3rd argument
+dict_use.erl:79: The call dict:store(42,'elli',{'dict',0,16,16,8,80,48,{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]},{{[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}}}) does not have an opaque term of type dict:dict(_,_) as 3rd argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/ets b/lib/dialyzer/test/opaque_SUITE_data/results/ets
index 5498ba1538..e11c7a8352 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/ets
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/ets
@@ -1,3 +1,4 @@
 
-ets_use.erl:12: Guard test is_integer(T::atom() | tid()) breaks the opaqueness of its argument
-ets_use.erl:7: Guard test is_integer(T::tid()) breaks the opaqueness of its argument
+ets_use.erl:12: Guard test is_integer(T::atom() | ets:tid()) breaks the opaqueness of its argument
+ets_use.erl:20: The type test is_integer(atom() | ets:tid()) breaks the opaqueness of the term atom() | ets:tid()
+ets_use.erl:7: Guard test is_integer(T::ets:tid()) breaks the opaqueness of its argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/ewgi b/lib/dialyzer/test/opaque_SUITE_data/results/ewgi
index 3c8cfb59f8..209f27b2f2 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/ewgi
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/ewgi
@@ -1,4 +1,4 @@
 
-ewgi_api.erl:55: The call gb_trees:to_list({non_neg_integer(),'nil' | {_,_,_,_}}) does not have an opaque term of type gb_tree() as 1st argument
-ewgi_testapp.erl:35: The call ewgi_testapp:htmlise_data("request_data",{non_neg_integer(),'nil' | {_,_,_,_}}) will never return since it differs in the 2nd argument from the success typing arguments: ([95 | 97 | 100 | 101 | 104 | 112 | 113 | 114 | 115 | 116 | 117,...],[{_,_}])
-ewgi_testapp.erl:43: The call gb_trees:to_list(T::{non_neg_integer(),'nil' | {_,_,_,_}}) does not have an opaque term of type gb_tree() as 1st argument
+ewgi_api.erl:55: The call gb_trees:to_list({non_neg_integer(),'nil' | {_,_,_,_}}) does not have an opaque term of type gb_trees:tree(_,_) as 1st argument
+ewgi_testapp.erl:35: The call ewgi_testapp:htmlise_data("request_data",{non_neg_integer(),'nil' | {_,_,_,_}}) does not have a term of type [{_,_}] | gb_trees:tree(_,_) (with opaque subterms) as 2nd argument
+ewgi_testapp.erl:43: The call gb_trees:to_list(T::{non_neg_integer(),'nil' | {_,_,_,_}}) does not have an opaque term of type gb_trees:tree(_,_) as 1st argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop1 b/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop1
index eb8f304905..ac5ef14041 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop1
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop1
@@ -2,4 +2,4 @@
 inf_loop1.erl:119: The pattern [{_, LNorms}] can never match the type []
 inf_loop1.erl:121: The pattern [{LinksA, LNormA}, {LinksB, LNormB}] can never match the type []
 inf_loop1.erl:129: The pattern [{_, Norm} | _] can never match the type []
-inf_loop1.erl:71: The call gb_trees:get(Edge::any(),Etab::array()) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+inf_loop1.erl:71: The call gb_trees:get(Edge::any(),Etab::array:array(_)) does not have an opaque term of type gb_trees:tree(_,_) as 2nd argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop2 b/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop2
new file mode 100644
index 0000000000..8cd2abe8cd
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/inf_loop2
@@ -0,0 +1,5 @@
+
+inf_loop2.erl:122: The pattern [{_, LNorms}] can never match the type []
+inf_loop2.erl:124: The pattern [{LinksA, LNormA}, {LinksB, LNormB}] can never match the type []
+inf_loop2.erl:132: The pattern [{_, Norm} | _] can never match the type []
+inf_loop2.erl:74: The call gb_trees:get(Edge::any(),Etab::array:array(_)) does not have an opaque term of type gb_trees:tree(_,_) as 2nd argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/int b/lib/dialyzer/test/opaque_SUITE_data/results/int
index 3ee4def34b..dc806fa12c 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/int
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/int
@@ -1,3 +1,3 @@
 
-int_adt.erl:28: Invalid type specification for function int_adt:add_f/2. The success typing is (number(),float()) -> number()
-int_adt.erl:32: Invalid type specification for function int_adt:div_f/2. The success typing is (number(),number()) -> float()
+int_adt.erl:28: Invalid type specification for function int_adt:add_f/2. The success typing is (number() | int_adt:int(),float()) -> number() | int_adt:int()
+int_adt.erl:32: Invalid type specification for function int_adt:div_f/2. The success typing is (number() | int_adt:int(),number() | int_adt:int()) -> float()
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/mixed_opaque b/lib/dialyzer/test/opaque_SUITE_data/results/mixed_opaque
index ab850b613e..0363be544d 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/mixed_opaque
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/mixed_opaque
@@ -1,2 +1,2 @@
 
-mixed_opaque_use.erl:31: The call mixed_opaque_rec_adt:get_a(Q::mixed_opaque_queue_adt:my_queue()) contains an opaque term as 1st argument when an opaque term of type mixed_opaque_rec_adt:rec() is expected
+mixed_opaque_use.erl:31: The call mixed_opaque_rec_adt:get_a(Q::mixed_opaque_queue_adt:my_queue()) does not have an opaque term of type mixed_opaque_rec_adt:rec() as 1st argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/modules b/lib/dialyzer/test/opaque_SUITE_data/results/modules
new file mode 100644
index 0000000000..f71334b9de
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/modules
@@ -0,0 +1,3 @@
+
+opaque_digraph.erl:353: Cons will produce an improper list since its 2nd argument is number()
+opaque_digraph.erl:365: Cons will produce an improper list since its 2nd argument is number()
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/my_queue b/lib/dialyzer/test/opaque_SUITE_data/results/my_queue
index 2860b91084..1f25a6f9c3 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/my_queue
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/my_queue
@@ -4,4 +4,4 @@ my_queue_use.erl:19: The call my_queue_adt:add(42,Q0::[]) does not have an opaqu
 my_queue_use.erl:24: The attempt to match a term of type my_queue_adt:my_queue() against the pattern [42 | Q2] breaks the opaqueness of the term
 my_queue_use.erl:30: Attempt to test for equality between a term of type [] and a term of opaque type my_queue_adt:my_queue()
 my_queue_use.erl:34: Cons will produce an improper list since its 2nd argument is my_queue_adt:my_queue()
-my_queue_use.erl:34: The call my_queue_adt:dequeue(nonempty_improper_list(42,my_queue_adt:my_queue())) does not have an opaque term of type my_queue_adt:my_queue() as 1st argument
+my_queue_use.erl:34: The call my_queue_adt:dequeue(nonempty_maybe_improper_list(42,my_queue_adt:my_queue())) does not have an opaque term of type my_queue_adt:my_queue() as 1st argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/opaque b/lib/dialyzer/test/opaque_SUITE_data/results/opaque
index ca76f57b54..5747f9061f 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/opaque
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/opaque
@@ -1,2 +1,3 @@
 
+opaque_bug3.erl:19: The pattern 'a' can never match the type #c{}
 opaque_bug4.erl:20: The attempt to match a term of type opaque_adt:abc() against the pattern 'a' breaks the opaqueness of the term
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/para b/lib/dialyzer/test/opaque_SUITE_data/results/para
new file mode 100644
index 0000000000..3aaa238de6
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/para
@@ -0,0 +1,21 @@
+
+para1.erl:18: The test para1:t(atom()) =:= para1:t(integer()) can never evaluate to 'true'
+para1.erl:23: The test para1:t(atom()) =:= para1:t() can never evaluate to 'true'
+para1.erl:28: The test para1:t() =:= para1:t(integer()) can never evaluate to 'true'
+para1.erl:33: The test {3,2} =:= {'a','b'} can never evaluate to 'true'
+para1.erl:38: Attempt to test for equality between a term of type para1_adt:t(integer()) and a term of opaque type para1_adt:t(atom())
+para1.erl:43: Attempt to test for equality between a term of type para1_adt:t() and a term of opaque type para1_adt:t(atom())
+para1.erl:48: Attempt to test for equality between a term of type para1_adt:t(integer()) and a term of opaque type para1_adt:t()
+para1.erl:53: The test {3,2} =:= {'a','b'} can never evaluate to 'true'
+para2.erl:103: Attempt to test for equality between a term of type para2_adt:circ({{integer(),integer()},{integer(),integer()}},{{integer(),integer()},{integer(),integer()}}) and a term of opaque type para2_adt:circ({{integer(),integer()},{integer(),integer()}})
+para2.erl:117: Attempt to test for equality between a term of type para2_adt:un(atom(),integer()) and a term of opaque type para2_adt:un(integer(),atom())
+para2.erl:31: The test 'a' =:= 'b' can never evaluate to 'true'
+para2.erl:61: Attempt to test for equality between a term of type para2_adt:c2() and a term of opaque type para2_adt:c1()
+para2.erl:66: The test 'a' =:= 'b' can never evaluate to 'true'
+para2.erl:88: The test para2:circ({{integer(),integer()},{integer(),integer()}}) =:= para2:circ({{integer(),integer()},{integer(),integer()}},{{integer(),integer()},{integer(),integer()}}) can never evaluate to 'true'
+para3.erl:28: Invalid type specification for function para3:ot2/0. The success typing is () -> 'foo'
+para3.erl:36: The pattern {{{17}}} can never match the type {{{{{{_,_,_,_,_}}}}}}
+para3.erl:55: Invalid type specification for function para3:t2/0. The success typing is () -> 'foo'
+para3.erl:65: The attempt to match a term of type {{{{{para3_adt:ot1(_,_,_,_,_)}}}}} against the pattern {{{{{17}}}}} breaks the opaqueness of para3_adt:ot1(_,_,_,_,_)
+para3.erl:68: The pattern {{{{17}}}} can never match the type {{{{{para3_adt:ot1(_,_,_,_,_)}}}}}
+para3.erl:74: Invalid type specification for function para3:exp_adt/0. The success typing is () -> 3
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/queue b/lib/dialyzer/test/opaque_SUITE_data/results/queue
index c3f04ea64d..5b3813c418 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/queue
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/queue
@@ -1,12 +1,11 @@
 
-queue_use.erl:18: The call queue:is_empty({[],[]}) does not have an opaque term of type queue() as 1st argument
-queue_use.erl:22: The call queue:in(42,Q0::{[],[]}) does not have an opaque term of type queue() as 2nd argument
-queue_use.erl:27: The attempt to match a term of type queue() against the pattern {"*", Q2} breaks the opaqueness of the term
-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
-queue_use.erl:65: The call queue:in(F::42,Q::'gazonk') does not have an opaque term of type queue() as 2nd argument
+queue_use.erl:18: The call queue:is_empty({[],[]}) does not have an opaque term of type queue:queue(_) as 1st argument
+queue_use.erl:22: The call queue:in(42,Q0::{[],[]}) does not have an opaque term of type queue:queue(_) as 2nd argument
+queue_use.erl:27: The attempt to match a term of type queue:queue(_) against the pattern {"*", Q2} breaks the opaqueness of the term
+queue_use.erl:33: Attempt to test for equality between a term of type {[42,...],[]} and a term of opaque type queue:queue(_)
+queue_use.erl:36: The attempt to match a term of type queue: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:queue(_) as 1st argument
+queue_use.erl:51: The call queue_use:is_in_queue(E::42,DB::#db{p::[],q::queue: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:queue(_)} against the pattern {'db', _, {L1, L2}} breaks the opaqueness of queue:queue(_)
+queue_use.erl:62: The call queue_use:tuple_queue({42,'gazonk'}) does not have a term of type {_,queue:queue(_)} (with opaque subterms) as 1st argument
+queue_use.erl:65: The call queue:in(F::42,Q::'gazonk') does not have an opaque term of type queue:queue(_) as 2nd argument
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/simple b/lib/dialyzer/test/opaque_SUITE_data/results/simple
new file mode 100644
index 0000000000..072ac9be8f
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/simple
@@ -0,0 +1,87 @@
+
+exact_api.erl:17: The call exact_api:set_type(A::#digraph{vtab::'notable',etab::'notable',ntab::'notable',cyclic::'true'}) does not have an opaque term of type digraph:graph() as 1st argument
+exact_api.erl:23: The call digraph:delete(G::#digraph{vtab::'notable',etab::'notable',ntab::'notable',cyclic::'true'}) does not have an opaque term of type digraph:graph() as 1st argument
+exact_api.erl:55: The attempt to match a term of type exact_adt:exact_adt() against the pattern {'exact_adt'} breaks the opaqueness of the term
+exact_api.erl:59: The call exact_adt:exact_adt_set_type2(A::#exact_adt{}) does not have an opaque term of type exact_adt:exact_adt() as 1st argument
+is_rec.erl:10: The call erlang:is_record(simple1_adt:d1(),'r',2) contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:15: The call erlang:is_record(A::simple1_adt:d1(),'r',I::1 | 2 | 3) contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:19: Guard test is_record(A::simple1_adt:d1(),'r',2) breaks the opaqueness of its argument
+is_rec.erl:23: Guard test is_record({simple1_adt:d1(),1},'r',2) breaks the opaqueness of its argument
+is_rec.erl:41: The call erlang:is_record(A::simple1_adt:d1(),R::'a') contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:45: The call erlang:is_record(A::simple1_adt:d1(),A::simple1_adt:d1(),1) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+is_rec.erl:49: The call erlang:is_record(A::simple1_adt:d1(),any(),1) contains an opaque term as 1st argument when terms of different types are expected in these positions
+is_rec.erl:53: The call erlang:is_record(A::simple1_adt:d1(),A::simple1_adt:d1(),any()) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+is_rec.erl:57: Guard test is_record(A::simple1_adt:d1(),'r',2) breaks the opaqueness of its argument
+is_rec.erl:61: The record #r{f1::simple1_adt:d1()} violates the declared type for #r{}
+is_rec.erl:65: The call erlang:is_record({simple1_adt:d1(),1},'r',2) contains an opaque term as 1st argument when terms of different types are expected in these positions
+rec_api.erl:22: Record construction #r1{f1::10} violates the declared type of field f1::'undefined' | rec_api:a()
+rec_api.erl:23: The pattern {'r1', 10} violates the declared type for #r1{}
+rec_api.erl:27: The attempt to match a term of type rec_adt:r1() against the pattern {'r1', 'a'} breaks the opaqueness of the term
+rec_api.erl:29: Invalid type specification for function rec_api:adt_t1/1. The success typing is (#r1{f1::'a'}) -> #r1{f1::'a'}
+rec_api.erl:34: Invalid type specification for function rec_api:adt_r1/0. The success typing is () -> #r1{f1::'a'}
+rec_api.erl:77: The attempt to match a term of type rec_api:f() against the variable _ breaks the opaqueness of the term
+simple1_api.erl:113: The test simple1_api:d1() =:= simple1_api:d2() can never evaluate to 'true'
+simple1_api.erl:118: Guard test simple1_api:d2() =:= A::simple1_api:d1() can never succeed
+simple1_api.erl:142: Attempt to test for equality between a term of type simple1_adt:o2() and a term of opaque type simple1_adt:o1()
+simple1_api.erl:148: Guard test simple1_adt:o2() =:= A::simple1_adt:o1() contains an opaque term as 1st argument
+simple1_api.erl:154: Attempt to test for inequality between a term of type simple1_adt:o2() and a term of opaque type simple1_adt:o1()
+simple1_api.erl:160: Attempt to test for inequality between a term of type simple1_adt:o2() and a term of opaque type simple1_adt:o1()
+simple1_api.erl:165: Attempt to test for equality between a term of type simple1_adt:c2() and a term of opaque type simple1_adt:c1()
+simple1_api.erl:181: Guard test A::simple1_adt:d1() =< B::simple1_adt:d2() contains an opaque term as 1st argument
+simple1_api.erl:185: Guard test 'a' =< B::simple1_adt:d2() contains an opaque term as 2nd argument
+simple1_api.erl:189: Guard test A::simple1_adt:d1() =< 'd' contains an opaque term as 1st argument
+simple1_api.erl:197: The type test is_integer(A::simple1_adt:d1()) breaks the opaqueness of the term A::simple1_adt:d1()
+simple1_api.erl:221: Guard test A::simple1_api:i1() > 3 can never succeed
+simple1_api.erl:225: Guard test A::simple1_adt:i1() > 3 contains an opaque term as 1st argument
+simple1_api.erl:233: Guard test A::simple1_adt:i1() < 3 contains an opaque term as 1st argument
+simple1_api.erl:239: Guard test A::1 > 3 can never succeed
+simple1_api.erl:243: Guard test A::1 > 3 can never succeed
+simple1_api.erl:257: Guard test is_function(T::simple1_api:o1()) can never succeed
+simple1_api.erl:265: Guard test is_function(T::simple1_adt:o1()) breaks the opaqueness of its argument
+simple1_api.erl:269: The type test is_function(T::simple1_adt:o1()) breaks the opaqueness of the term T::simple1_adt:o1()
+simple1_api.erl:274: Guard test is_function(T::simple1_api:o1(),A::simple1_api:i1()) can never succeed
+simple1_api.erl:284: Guard test is_function(T::simple1_adt:o1(),A::simple1_adt:i1()) breaks the opaqueness of its argument
+simple1_api.erl:289: The type test is_function(T::simple1_adt:o1(),A::simple1_adt:i1()) breaks the opaqueness of the term T::simple1_adt:o1()
+simple1_api.erl:294: The call erlang:is_function(T::simple1_api:o1(),A::simple1_adt:i1()) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+simple1_api.erl:300: The type test is_function(T::simple1_adt:o1(),A::simple1_api:i1()) breaks the opaqueness of the term T::simple1_adt:o1()
+simple1_api.erl:306: Guard test B::simple1_api:b2() =:= 'true' can never succeed
+simple1_api.erl:315: Guard test A::simple1_api:b1() =:= 'false' can never succeed
+simple1_api.erl:319: Guard test not('and'('true','true')) can never succeed
+simple1_api.erl:337: Clause guard cannot succeed.
+simple1_api.erl:342: Guard test B::simple1_adt:b2() =:= 'true' contains an opaque term as 1st argument
+simple1_api.erl:347: Guard test A::simple1_adt:b1() =:= 'true' contains an opaque term as 1st argument
+simple1_api.erl:355: Invalid type specification for function simple1_api:bool_adt_t6/1. The success typing is ('true') -> 1
+simple1_api.erl:365: Clause guard cannot succeed.
+simple1_api.erl:368: Invalid type specification for function simple1_api:bool_adt_t8/2. The success typing is (boolean(),boolean()) -> 1
+simple1_api.erl:378: Clause guard cannot succeed.
+simple1_api.erl:381: Invalid type specification for function simple1_api:bool_adt_t9/2. The success typing is ('false','false') -> 1
+simple1_api.erl:407: The size simple1_adt:i1() breaks the opaqueness of A
+simple1_api.erl:418: The attempt to match a term of type non_neg_integer() against the variable A breaks the opaqueness of simple1_adt:i1()
+simple1_api.erl:425: The attempt to match a term of type non_neg_integer() against the variable B breaks the opaqueness of simple1_adt:i1()
+simple1_api.erl:432: The attempt to match a term of type non_neg_integer() against the variable B breaks the opaqueness of simple1_api:o1()
+simple1_api.erl:448: The attempt to match a term of type non_neg_integer() against the variable Sz breaks the opaqueness of simple1_adt:i1()
+simple1_api.erl:460: The attempt to match a term of type simple1_adt:bit1() against the pattern <<_/binary-unit:8>> breaks the opaqueness of the term
+simple1_api.erl:478: The call 'foo':A(A::simple1_adt:a()) breaks the opaqueness of the term A :: simple1_adt:a()
+simple1_api.erl:486: The call A:'foo'(A::simple1_adt:a()) breaks the opaqueness of the term A :: simple1_adt:a()
+simple1_api.erl:499: The call 'foo':A(A::simple1_api:i()) requires that A is of type atom() not simple1_api:i()
+simple1_api.erl:503: The call 'foo':A(A::simple1_adt:i()) requires that A is of type atom() not simple1_adt:i()
+simple1_api.erl:507: The call A:'foo'(A::simple1_api:i()) requires that A is of type atom() | tuple() not simple1_api:i()
+simple1_api.erl:511: The call A:'foo'(A::simple1_adt:i()) requires that A is of type atom() | tuple() not simple1_adt:i()
+simple1_api.erl:519: Guard test A::simple1_adt:d2() == B::simple1_adt:d1() contains an opaque term as 1st argument
+simple1_api.erl:534: Guard test A::simple1_adt:d1() >= 3 contains an opaque term as 1st argument
+simple1_api.erl:536: Guard test A::simple1_adt:d1() == 3 contains an opaque term as 1st argument
+simple1_api.erl:538: Guard test A::simple1_adt:d1() =:= 3 contains an opaque term as 1st argument
+simple1_api.erl:548: The call erlang:'<'(A::simple1_adt:d1(),3) contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple1_api.erl:558: The call erlang:'=<'(A::simple1_adt:d1(),B::simple1_adt:d2()) contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple1_api.erl:565: Guard test {digraph:graph(),3} > {digraph:graph(),atom() | ets:tid()} contains an opaque term as 2nd argument
+simple1_api.erl:91: Invalid type specification for function simple1_api:tup/0. The success typing is () -> {'a','b'}
+simple2_api.erl:100: The call lists:flatten(A::simple1_adt:tuple1()) contains an opaque term as 1st argument when a structured term of type [any()] is expected
+simple2_api.erl:116: The call lists:flatten({simple1_adt:tuple1()}) will never return since it differs in the 1st argument from the success typing arguments: ([any()])
+simple2_api.erl:121: Guard test {simple1_adt:d1(),3} > {simple1_adt:d1(),simple1_adt:tuple1()} contains an opaque term as 2nd argument
+simple2_api.erl:125: The call erlang:tuple_to_list(B::simple1_adt:tuple1()) contains an opaque term as 1st argument when a structured term of type tuple() is expected
+simple2_api.erl:31: The call erlang:'!'(A::simple1_adt:d1(),'foo') contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple2_api.erl:35: The call erlang:send(A::simple1_adt:d1(),'foo') contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple2_api.erl:51: The call erlang:'<'(A::simple1_adt:d1(),3) contains an opaque term as 1st argument when terms of different types are expected in these positions
+simple2_api.erl:59: The call lists:keysearch(1,A::simple1_adt:d1(),[]) contains an opaque term as 2nd argument when terms of different types are expected in these positions
+simple2_api.erl:67: The call lists:keysearch('key',1,A::simple1_adt:tuple1()) contains an opaque term as 3rd argument when terms of different types are expected in these positions
+simple2_api.erl:96: The call lists:keyreplace('a',1,[{1, 2}],A::simple1_adt:tuple1()) contains an opaque term as 4th argument when terms of different types are expected in these positions
diff --git a/lib/dialyzer/test/opaque_SUITE_data/results/wings b/lib/dialyzer/test/opaque_SUITE_data/results/wings
index a9571441f8..511263b70a 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/results/wings
+++ b/lib/dialyzer/test/opaque_SUITE_data/results/wings
@@ -1,11 +1,11 @@
 
-wings_dissolve.erl:103: Guard test is_list(List::gb_set()) breaks the opaqueness of its argument
-wings_dissolve.erl:19: Guard test is_list(Faces::gb_set()) breaks the opaqueness of its argument
-wings_dissolve.erl:272: Guard test is_list(Faces::gb_set()) breaks the opaqueness of its argument
-wings_dissolve.erl:31: The call gb_sets:is_empty(Faces::[any(),...]) does not have an opaque term of type gb_set() as 1st argument
+wings_dissolve.erl:103: Guard test is_list(List::gb_sets:set(_)) breaks the opaqueness of its argument
+wings_dissolve.erl:19: Guard test is_list(Faces::gb_sets:set(_)) breaks the opaqueness of its argument
+wings_dissolve.erl:272: Guard test is_list(Faces::gb_sets:set(_)) breaks the opaqueness of its argument
+wings_dissolve.erl:31: The call gb_sets:is_empty(Faces::[any(),...]) does not have an opaque term of type gb_sets:set(_) as 1st argument
 wings_edge.erl:205: The pattern <Edge, 'hard', Htab> can never match the type <_,'soft',_>
-wings_edge_cmd.erl:30: The call gb_trees:size(P::gb_set()) contains an opaque term as 1st argument when an opaque term of type gb_tree() is expected
+wings_edge_cmd.erl:30: The call gb_trees:size(P::gb_sets:set(_)) does not have an opaque term of type gb_trees:tree(_,_) as 1st argument
 wings_edge_cmd.erl:32: The pattern [_ | Parts] can never match the type []
 wings_edge_cmd.erl:32: The pattern [{_, P} | _] can never match the type []
-wings_io.erl:30: The attempt to match a term of type {'empty',queue()} against the pattern {'empty', {In, Out}} breaks the opaqueness of queue()
-wings_we.erl:155: The call wings_util:gb_trees_largest_key(Etab::gb_tree()) contains an opaque term as 1st argument when a structured term of type {_,{_,_,_,'nil' | {_,_,_,'nil' | {_,_,_,_}}}} is expected
+wings_io.erl:30: The attempt to match a term of type {'empty',queue:queue(_)} against the pattern {'empty', {In, Out}} breaks the opaqueness of queue:queue(_)
+wings_we.erl:155: The call wings_util:gb_trees_largest_key(Etab::gb_trees:tree(_,_)) contains an opaque term as 1st argument when a structured term of type {_,{_,_,_,'nil' | {_,_,_,'nil' | {_,_,_,_}}}} is expected
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/dict/dict_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/dict/dict_use.erl
index 8a2cd86f43..a4cec065ab 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/dict/dict_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/dict/dict_use.erl
@@ -24,7 +24,7 @@ ok3() ->
 ok4() ->
   dict:fetch(foo, dict:new()).
 
-ok5() ->  % this is OK since some_mod:new/0 might be returning a dict()
+ok5() ->  % this is OK since some_mod:new/0 might be returning a dict:dict()
   dict:fetch(foo, some_mod:new()).
 
 ok6() ->
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ets/ets_use.erl b/lib/dialyzer/test/opaque_SUITE_data/src/ets/ets_use.erl
index d65af0af4e..593d9a669d 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/ets/ets_use.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ets/ets_use.erl
@@ -1,5 +1,5 @@
 -module(ets_use).
--export([t1/0, t2/0]).
+-export([t1/0, t2/0, t3/0, t4/0]).
 
 t1() ->
     case n() of
@@ -13,4 +13,10 @@ t2() ->
 	T when is_atom(T) -> atm
     end.
 
-n() -> ets:new(n, [named_table]).
+t3() ->
+    is_atom(n()). % no warning since atom() is possible
+
+t4() ->
+    is_integer(n()). % opaque warning since ets:tid() is opaque
+
+n() -> ets:new(n, [named_table]). % -> atom() | ets:tid()
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
index 0b98f550f1..5cbc79f948 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi/ewgi.hrl
@@ -28,7 +28,7 @@
 
 %% @type bag() = gb_tree()
 -ifdef(HAS_GB_TREE_SPEC).
--type bag() :: gb_tree().
+-type bag() :: gb_trees:tree().
 -else.
 -type bag() :: {non_neg_integer(), {any(), any(), any(), any()} | 'nil'}.
 -endif.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
index 5da8ff0ecf..d8e15cb081 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/ewgi2/ewgi.hrl
@@ -29,7 +29,7 @@
 
 %% @type bag() = gb_tree()
 -ifdef(HAS_GB_TREE_SPEC).
--type bag() :: gb_tree().
+-type bag() :: gb_trees:tree().
 -else.
 -type bag() :: {non_neg_integer(), {any(), any(), any(), any()} | 'nil'}.
 -endif.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/gb_sets/gb_sets_rec.erl b/lib/dialyzer/test/opaque_SUITE_data/src/gb_sets/gb_sets_rec.erl
index 008b0a486a..7c34b01c2d 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/gb_sets/gb_sets_rec.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/gb_sets/gb_sets_rec.erl
@@ -12,12 +12,12 @@
 
 -export([new/0, get_g/1]).
 
--record(rec, {g :: gb_set()}).
+-record(rec, {g :: gb_sets:set()}).
 
 -spec new() -> #rec{}.
 new() ->
   #rec{g = gb_sets:empty()}.
 
--spec get_g(#rec{}) -> gb_set().
+-spec get_g(#rec{}) -> gb_sets:set().
 get_g(R) ->
   R#rec.g.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop1.erl b/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop1.erl
index 0dff16cf14..3275736e75 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop1.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop1.erl
@@ -1,7 +1,7 @@
 %% -*- erlang-indent-level: 2 -*-
 %%----------------------------------------------------------------------------
 %% Non-sensical (i.e., stripped-down) program that sends the analysis
-%% into an infinite loop. The #we.es field was originally a gb_tree()
+%% into an infinite loop. The #we.es field was originally a gb_trees:tree()
 %% but the programmer declared it as an array in order to change it to
 %% that data type instead. In the file, there are two calls to function
 %% gb_trees:get/2 which seem to be the ones responsible for sending the
@@ -14,7 +14,7 @@
 -export([command/1]).
 
 -record(we, {id,
-	     es = array:new() :: array(),
+	     es = array:new() :: array:array(),
 	     vp,
 	     mirror = none}).
 -record(edge, {vs,ve,a = none,b = none,lf,rf,ltpr,ltsu,rtpr,rtsu}).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop2.erl b/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop2.erl
new file mode 100644
index 0000000000..3787fc6750
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/inf_loop2.erl
@@ -0,0 +1,175 @@
+%% -*- erlang-indent-level: 2 -*-
+%%----------------------------------------------------------------------------
+%% Copy of inf_loop1.erl, where the calls mentioned below have been
+%% restored.
+
+%% Non-sensical (i.e., stripped-down) program that sends the analysis
+%% into an infinite loop. The #we.es field was originally a gb_trees:tree()
+%% but the programmer declared it as an array in order to change it to
+%% that data type instead. In the file, there are two calls to function
+%% gb_trees:get/2 which seem to be the ones responsible for sending the
+%% analysis into an infinite loop. Currently, these calls are marked and
+%% have been changed to gbee_trees:get/2 in order to be able to see that
+%% the analysis works if these two calls are taken out of the picture.
+%%----------------------------------------------------------------------------
+-module(inf_loop2).
+
+-export([command/1]).
+
+-record(we, {id,
+	     es = array:new() :: array:array(),
+	     vp,
+	     mirror = none}).
+-record(edge, {vs,ve,a = none,b = none,lf,rf,ltpr,ltsu,rtpr,rtsu}).
+
+command(St) ->
+  State = drag_mode(offset_region),
+  SetupSt = wings_sel_conv:more(St),
+  Tvs = wings_sel:fold(fun(Faces, #we{id = Id} = We, Acc) ->
+			   FaceRegions = wings_sel:face_regions(Faces, We),
+			   {AllVs0,VsData} =
+			     collect_offset_regions_data(FaceRegions, We, [], []),
+			   AllVs = ordsets:from_list(AllVs0),
+			   [{Id,{AllVs,offset_regions_fun(VsData, State)}}|Acc]
+                       end,
+                       [],
+                       SetupSt),
+    wings_drag:setup(Tvs, 42, [], St).
+
+drag_mode(Type) ->
+    {Mode,Norm} = wings_pref:get_value(Type, {average,loop}),
+    {Type,Mode,Norm}.
+
+collect_offset_regions_data([Faces|Regions], We, AllVs, VsData) ->
+  {FaceNormTab,OuterEdges,RegVs} =
+    some_fake_module:faces_data_0(Faces, We, [], [], []),
+  {LoopNorm,LoopVsData,LoopVs} =
+    offset_regions_loop_data(OuterEdges, Faces, We, FaceNormTab),
+  Vs = RegVs -- LoopVs,
+  RegVsData = vertex_normals(Vs, FaceNormTab, We, LoopVsData),
+  collect_offset_regions_data(Regions, We, RegVs ++ AllVs,
+			      [{LoopNorm,RegVsData}|VsData]);
+collect_offset_regions_data([], _, AllVs, VsData) ->
+  {AllVs,VsData}.
+
+offset_regions_loop_data(Edges, Faces, We, FNtab) ->
+  EdgeSet = gb_sets:from_list(Edges),
+  offset_loop_data_0(EdgeSet, Faces, We, FNtab, [], [], []).
+
+offset_loop_data_0(EdgeSet0, Faces, We, FNtab, LNorms, VData0, Vs0) ->
+  case gb_sets:is_empty(EdgeSet0) of
+    false ->
+      {Edge,EdgeSet1} = gb_sets:take_smallest(EdgeSet0),
+      {EdgeSet,VData,Links,LoopNorm,Vs} =
+	offset_loop_data_1(Edge, EdgeSet1, Faces, We, FNtab, VData0, Vs0),
+      offset_loop_data_0(EdgeSet, Faces, We, FNtab,
+			 [{Links,LoopNorm}|LNorms], VData, Vs);
+    true ->
+      AvgLoopNorm = average_loop_norm(LNorms),
+      {AvgLoopNorm,VData0,Vs0}
+  end.
+
+offset_loop_data_1(Edge, EdgeSet, _Faces,
+                   #we{es = Etab, vp = Vtab} = We, FNtab, VData, Vs) ->
+  #edge{vs = Va, ve = Vb, lf = Lf, ltsu = NextLeft} = gb_trees:get(Edge, Etab),
+  VposA = gb_trees:get(Va, Vtab),
+  VposB = gb_trees:get(Vb, Vtab),
+  VDir = e3d_vec:sub(VposB, VposA),
+  FNorm = wings_face:normal(Lf, We),
+  EdgeData = gb_trees:get(NextLeft, Etab),
+  offset_loop_data_2(NextLeft, EdgeData, Va, VposA, Lf, Edge, We, FNtab,
+		     EdgeSet, VDir, [], [FNorm], VData, [], Vs, 0).
+
+offset_loop_data_2(CurE, #edge{vs = Va, ve = Vb, lf = PrevFace,
+			       rtsu = NextEdge, ltsu = IfCurIsMember},
+                   Vb, VposB, PrevFace, LastE,
+                   #we{mirror = M} = We,
+                   FNtab, EdgeSet0, VDir, EDir0, VNorms0, VData0, VPs0, Vs0,
+                   Links) ->
+  Mirror = M == PrevFace,
+  offset_loop_is_member(Mirror, Vb, Va, VposB, CurE, IfCurIsMember, VNorms0,
+			NextEdge, EdgeSet0, VDir, EDir0, FNtab, PrevFace,
+			LastE, We, VData0, VPs0, Vs0, Links).
+
+offset_loop_is_member(Mirror, V1, V2, Vpos1, CurE, NextE, VNorms0, NEdge,
+                      EdgeSet0, VDir, EDir0, FNtab, PFace, LastE, We,
+                      VData0, VPs0, Vs0, Links) ->
+  #we{es = Etab, vp = Vtab} = We,
+  Vpos2 = gb_trees:get(V2, Vtab),
+  Dir = e3d_vec:sub(Vpos2, Vpos1),
+  NextVDir = e3d_vec:neg(Dir),
+  EdgeSet = gb_sets:delete(CurE, EdgeSet0),
+  EdgeData = gb_trees:get(NextE, Etab), %% HERE
+  [FNorm|_] = VNorms0,
+  VData = offset_loop_data_3(Mirror, V1, Vpos1, VNorms0, NEdge, VDir,
+			     Dir, EDir0, FNtab, We, VData0),
+  VPs = [Vpos1|VPs0],
+  Vs = [V1|Vs0],
+  offset_loop_data_2(NextE, EdgeData, V2, Vpos2, PFace, LastE, We, FNtab,
+		     EdgeSet, NextVDir, [], [FNorm], VData, VPs, Vs, Links + 1).
+
+offset_loop_data_3(false, V, Vpos, VNorms0, NextEdge,
+                   VDir, Dir, EDir0, FNtab, We, VData0) ->
+  #we{es = Etab} = We,
+  VNorm = e3d_vec:norm(e3d_vec:add(VNorms0)),
+  NV = wings_vertex:other(V, gb_trees:get(NextEdge, Etab)), %% HERE
+  ANorm = vertex_normal(NV, FNtab, We),
+  EDir = some_fake_module:average_edge_dir(VNorm, VDir, Dir, EDir0),
+  AvgDir = some_fake_module:evaluate_vdata(VDir, Dir, VNorm),
+  ScaledDir = some_fake_module:along_edge_scale_factor(VDir, Dir, EDir, ANorm),
+  [{V,{Vpos,AvgDir,EDir,ScaledDir}}|VData0].
+
+average_loop_norm([{_,LNorms}]) ->
+  e3d_vec:norm(LNorms);
+average_loop_norm([{LinksA,LNormA},{LinksB,LNormB}]) ->
+  case LinksA < LinksB of
+    true ->
+      e3d_vec:norm(e3d_vec:add(e3d_vec:neg(LNormA), LNormB));
+    false ->
+      e3d_vec:norm(e3d_vec:add(e3d_vec:neg(LNormB), LNormA))
+  end;
+average_loop_norm(LNorms) ->
+  LoopNorms = [Norm || {_,Norm} <- LNorms],
+  e3d_vec:norm(e3d_vec:neg(e3d_vec:add(LoopNorms))).
+
+vertex_normals([V|Vs], FaceNormTab, #we{vp = Vtab, mirror = M} = We, Acc) ->
+  FaceNorms =
+    wings_vertex:fold(fun(_, Face, _, A) when Face == M ->
+			  [e3d_vec:neg(wings_face:normal(M, We))|A];
+			 (_, Face, _, A) ->
+			  [gb_trees:get(Face, FaceNormTab)|A]
+		      end, [], V, We),
+  VNorm = e3d_vec:norm(e3d_vec:add(FaceNorms)),
+  Vpos = gb_trees:get(V, Vtab),
+  vertex_normals(Vs, FaceNormTab, We, [{V,{Vpos,VNorm}}|Acc]);
+vertex_normals([], _, _, Acc) ->
+  Acc.
+
+vertex_normal(V, FaceNormTab, #we{mirror = M} = We) ->
+  wings_vertex:fold(fun(_, Face, _, A) when Face == M ->
+			[e3d_vec:neg(wings_face:normal(Face, We))|A];
+		       (_, Face, _, A) ->
+			N = gb_trees:get(Face, FaceNormTab),
+			case e3d_vec:is_zero(N) of
+			  true -> A;
+			  false -> [N|A]
+			end
+		    end, [], V, We).
+
+offset_regions_fun(OffsetData, {_,Solution,_} = State) ->
+  fun(new_mode_data, {NewState,_}) ->
+      offset_regions_fun(OffsetData, NewState);
+     ([Dist,_,_,Bump|_], A) ->
+      lists:foldl(fun({LoopNormal,VsData}, VsAcc0) ->
+		      lists:foldl(fun({V,{Vpos0,VNorm}}, VsAcc) ->
+				      [{V,Vpos0}|VsAcc];
+				     ({V,{Vpos0,Dir,EDir,ScaledEDir}}, VsAcc) ->
+				      Vec = case Solution of
+					      average -> Dir;
+					      along_edges -> EDir;
+					      scaled -> ScaledEDir
+					    end,
+				      [{V,Vpos0}|VsAcc]
+				  end, VsAcc0, VsData)
+		  end, A, OffsetData)
+  end.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/modules/opaque_digraph.erl b/lib/dialyzer/test/opaque_SUITE_data/src/modules/opaque_digraph.erl
new file mode 100644
index 0000000000..09d4229e28
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/modules/opaque_digraph.erl
@@ -0,0 +1,655 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%%
+%% The 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%
+%%
+
+
+%%% The Erlang scanner. All types are opaque, which puts some stress
+%%% on Dialyzer.
+
+-module(opaque_digraph).
+
+-export([new/0, new/1, delete/1, info/1]).
+
+-export([add_vertex/1, add_vertex/2, add_vertex/3]).
+-export([del_vertex/2, del_vertices/2]).
+-export([vertex/2, no_vertices/1, vertices/1]).
+-export([source_vertices/1, sink_vertices/1]).
+
+-export([add_edge/3, add_edge/4, add_edge/5]).
+-export([del_edge/2, del_edges/2, del_path/3]).
+-export([edge/2, no_edges/1, edges/1]).
+
+-export([out_neighbours/2, in_neighbours/2]).
+-export([out_edges/2, in_edges/2, edges/2]).
+-export([out_degree/2, in_degree/2]).
+-export([get_path/3, get_cycle/2]).
+
+-export([get_short_path/3, get_short_cycle/2]).
+
+-export_type([local_digraph/0, d_type/0, vertex/0]).
+
+-record(digraph, {vtab = notable :: ets:tab(),
+		  etab = notable :: ets:tab(),
+		  ntab = notable :: ets:tab(),
+	          cyclic = true  :: boolean()}).
+
+-opaque local_digraph() :: #digraph{}.
+
+-export_type([edge/0, label/0, add_edge_err_rsn/0,
+              d_protection/0, d_cyclicity/0]).
+
+-opaque edge()    :: term().
+-opaque label()   :: term().
+-opaque vertex()  :: term().
+
+-opaque add_edge_err_rsn() :: {'bad_edge', Path :: [vertex()]}
+                          | {'bad_vertex', V :: vertex()}.
+
+%%
+%% Type is a list of
+%%  protected | private
+%%  acyclic | cyclic
+%%
+%%  default is [cyclic,protected]
+%%
+-opaque d_protection() :: 'private' | 'protected'.
+-opaque d_cyclicity()  :: 'acyclic' | 'cyclic'.
+-opaque d_type()       :: d_cyclicity() | d_protection().
+
+-spec new() -> local_digraph().
+
+new() -> new([]).
+
+-spec new(Type) -> local_digraph() when
+      Type :: [d_type()].
+
+new(Type) ->
+    case check_type(Type, protected, []) of
+	{Access, Ts} ->
+	    V = ets:new(vertices, [set, Access]),
+	    E = ets:new(edges, [set, Access]),
+	    N = ets:new(neighbours, [bag, Access]),
+	    ets:insert(N, [{'$vid', 0}, {'$eid', 0}]),
+	    set_type(Ts, #digraph{vtab=V, etab=E, ntab=N});
+	error ->
+	    erlang:error(badarg)
+    end.
+
+%%
+%% Check type of graph
+%%
+%-spec check_type([d_type()], d_protection(), [{'cyclic', boolean()}]) ->
+%       	{d_protection(), [{'cyclic', boolean()}]}.
+
+check_type([acyclic|Ts], A, L) ->
+    check_type(Ts, A,[{cyclic,false} | L]);
+check_type([cyclic | Ts], A, L) ->
+    check_type(Ts, A, [{cyclic,true} | L]);
+check_type([protected | Ts], _, L) ->
+    check_type(Ts, protected, L);
+check_type([private | Ts], _, L) ->
+    check_type(Ts, private, L);
+check_type([], A, L) -> {A, L};
+check_type(_, _, _) -> error.
+
+%%
+%% Set graph type
+%%
+-spec set_type([{'cyclic', boolean()}], local_digraph()) -> local_digraph().
+
+set_type([{cyclic,V} | Ks], G) ->
+    set_type(Ks, G#digraph{cyclic = V});
+set_type([], G) -> G.
+
+
+%% Data access functions
+
+-spec delete(G) -> 'true' when
+      G :: local_digraph().
+
+delete(G) ->
+    ets:delete(G#digraph.vtab),
+    ets:delete(G#digraph.etab),
+    ets:delete(G#digraph.ntab).
+
+-spec info(G) -> InfoList when
+      G :: local_digraph(),
+      InfoList :: [{'cyclicity', Cyclicity :: d_cyclicity()} |
+                   {'memory', NoWords :: non_neg_integer()} |
+                   {'protection', Protection :: d_protection()}].
+
+info(G) ->
+    VT = G#digraph.vtab,
+    ET = G#digraph.etab,
+    NT = G#digraph.ntab,
+    Cyclicity = case G#digraph.cyclic of
+		    true  -> cyclic;
+		    false -> acyclic
+		end,
+    Protection = ets:info(VT, protection),
+    Memory = ets:info(VT, memory) + ets:info(ET, memory) + ets:info(NT, memory),
+    [{cyclicity, Cyclicity}, {memory, Memory}, {protection, Protection}].
+
+-spec add_vertex(G) -> vertex() when
+      G :: local_digraph().
+
+add_vertex(G) ->
+    do_add_vertex({new_vertex_id(G), []}, G).
+
+-spec add_vertex(G, V) -> vertex() when
+      G :: local_digraph(),
+      V :: vertex().
+
+add_vertex(G, V) ->
+    do_add_vertex({V, []}, G).
+
+-spec add_vertex(G, V, Label) -> vertex() when
+      G :: local_digraph(),
+      V :: vertex(),
+      Label :: label().
+
+add_vertex(G, V, D) ->
+    do_add_vertex({V, D}, G).
+
+-spec del_vertex(G, V) -> 'true' when
+      G :: local_digraph(),
+      V :: vertex().
+
+del_vertex(G, V) ->
+    do_del_vertex(V, G).
+
+-spec del_vertices(G, Vertices) -> 'true' when
+      G :: local_digraph(),
+      Vertices :: [vertex()].
+
+del_vertices(G, Vs) ->
+    do_del_vertices(Vs, G).
+
+-spec vertex(G, V) -> {V, Label} | 'false' when
+      G :: local_digraph(),
+      V :: vertex(),
+      Label :: label().
+
+vertex(G, V) ->
+    case ets:lookup(G#digraph.vtab, V) of
+	[] -> false;
+	[Vertex] -> Vertex
+    end.
+
+-spec no_vertices(G) -> non_neg_integer() when
+      G :: local_digraph().
+
+no_vertices(G) ->
+    ets:info(G#digraph.vtab, size).
+
+-spec vertices(G) -> Vertices when
+      G :: local_digraph(),
+      Vertices :: [vertex()].
+
+vertices(G) ->
+    ets:select(G#digraph.vtab, [{{'$1', '_'}, [], ['$1']}]).
+
+-spec source_vertices(local_digraph()) -> [vertex()].
+
+source_vertices(G) ->
+    collect_vertices(G, in).
+
+-spec sink_vertices(local_digraph()) -> [vertex()].
+
+sink_vertices(G) ->
+    collect_vertices(G, out).
+
+-spec in_degree(G, V) -> non_neg_integer() when
+      G :: local_digraph(),
+      V :: vertex().
+
+in_degree(G, V) ->
+    length(ets:lookup(G#digraph.ntab, {in, V})).
+
+-spec in_neighbours(G, V) -> Vertex when
+      G :: local_digraph(),
+      V :: vertex(),
+      Vertex :: [vertex()].
+
+in_neighbours(G, V) ->
+    ET = G#digraph.etab,
+    NT = G#digraph.ntab,
+    collect_elems(ets:lookup(NT, {in, V}), ET, 2).
+
+-spec in_edges(G, V) -> Edges when
+      G :: local_digraph(),
+      V :: vertex(),
+      Edges :: [edge()].
+
+in_edges(G, V) ->
+    ets:select(G#digraph.ntab, [{{{in, V}, '$1'}, [], ['$1']}]).
+
+-spec out_degree(G, V) -> non_neg_integer() when
+      G :: local_digraph(),
+      V :: vertex().
+
+out_degree(G, V) ->
+    length(ets:lookup(G#digraph.ntab, {out, V})).
+
+-spec out_neighbours(G, V) -> Vertices when
+      G :: local_digraph(),
+      V :: vertex(),
+      Vertices :: [vertex()].
+
+out_neighbours(G, V) ->
+    ET = G#digraph.etab,
+    NT = G#digraph.ntab,
+    collect_elems(ets:lookup(NT, {out, V}), ET, 3).
+
+-spec out_edges(G, V) -> Edges when
+      G :: local_digraph(),
+      V :: vertex(),
+      Edges :: [edge()].
+
+out_edges(G, V) ->
+    ets:select(G#digraph.ntab, [{{{out, V}, '$1'}, [], ['$1']}]).
+
+-spec add_edge(G, V1, V2) -> edge() | {'error', add_edge_err_rsn()} when
+      G :: local_digraph(),
+      V1 :: vertex(),
+      V2 :: vertex().
+
+add_edge(G, V1, V2) ->
+    do_add_edge({new_edge_id(G), V1, V2, []}, G).
+
+-spec add_edge(G, V1, V2, Label) -> edge() | {'error', add_edge_err_rsn()} when
+      G :: local_digraph(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Label :: label().
+
+add_edge(G, V1, V2, D) ->
+    do_add_edge({new_edge_id(G), V1, V2, D}, G).
+
+-spec add_edge(G, E, V1, V2, Label) -> edge() | {'error', add_edge_err_rsn()} when
+      G :: local_digraph(),
+      E :: edge(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Label :: label().
+
+add_edge(G, E, V1, V2, D) ->
+    do_add_edge({E, V1, V2, D}, G).
+
+-spec del_edge(G, E) -> 'true' when
+      G :: local_digraph(),
+      E :: edge().
+
+del_edge(G, E) ->
+    do_del_edges([E], G).
+
+-spec del_edges(G, Edges) -> 'true' when
+      G :: local_digraph(),
+      Edges :: [edge()].
+
+del_edges(G, Es) ->
+    do_del_edges(Es, G).
+
+-spec no_edges(G) -> non_neg_integer() when
+      G :: local_digraph().
+
+no_edges(G) ->
+    ets:info(G#digraph.etab, size).
+
+-spec edges(G) -> Edges when
+      G :: local_digraph(),
+      Edges :: [edge()].
+
+edges(G) ->
+    ets:select(G#digraph.etab, [{{'$1', '_', '_', '_'}, [], ['$1']}]).
+
+-spec edges(G, V) -> Edges when
+      G :: local_digraph(),
+      V :: vertex(),
+      Edges :: [edge()].
+
+edges(G, V) ->
+    ets:select(G#digraph.ntab, [{{{out, V},'$1'}, [], ['$1']},
+				{{{in, V}, '$1'}, [], ['$1']}]).
+
+-spec edge(G, E) -> {E, V1, V2, Label} | 'false' when
+      G :: local_digraph(),
+      E :: edge(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Label :: label().
+
+edge(G, E) ->
+    case ets:lookup(G#digraph.etab,E) of
+	[] -> false;
+	[Edge] -> Edge
+    end.
+
+%%
+%% Generate a "unique" edge identifier (relative to this graph)
+%%
+-spec new_edge_id(local_digraph()) -> edge().
+
+new_edge_id(G) ->
+    NT = G#digraph.ntab,
+    [{'$eid', K}] = ets:lookup(NT, '$eid'),
+    true = ets:delete(NT, '$eid'),
+    true = ets:insert(NT, {'$eid', K+1}),
+    ['$e' | K].
+
+%%
+%% Generate a "unique" vertex identifier (relative to this graph)
+%%
+-spec new_vertex_id(local_digraph()) -> vertex().
+
+new_vertex_id(G) ->
+    NT = G#digraph.ntab,
+    [{'$vid', K}] = ets:lookup(NT, '$vid'),
+    true = ets:delete(NT, '$vid'),
+    true = ets:insert(NT, {'$vid', K+1}),
+    ['$v' | K].
+
+%%
+%% Collect elements for a index in a tuple
+%%
+collect_elems(Keys, Table, Index) ->
+    collect_elems(Keys, Table, Index, []).
+
+collect_elems([{_,Key}|Keys], Table, Index, Acc) ->
+    collect_elems(Keys, Table, Index,
+		  [ets:lookup_element(Table, Key, Index)|Acc]);
+collect_elems([], _, _, Acc) -> Acc.
+
+-spec do_add_vertex({vertex(), label()}, local_digraph()) -> vertex().
+
+do_add_vertex({V, _Label} = VL, G) ->
+    ets:insert(G#digraph.vtab, VL),
+    V.
+
+%%
+%% Collect either source or sink vertices.
+%%
+collect_vertices(G, Type) ->
+    Vs = vertices(G),
+    lists:foldl(fun(V, A) ->
+			case ets:member(G#digraph.ntab, {Type, V}) of
+			    true -> A;
+			    false -> [V|A]
+			end
+		end, [], Vs).
+
+%%
+%% Delete vertices
+%%
+do_del_vertices([V | Vs], G) ->
+    do_del_vertex(V, G),
+    do_del_vertices(Vs, G);
+do_del_vertices([], #digraph{}) -> true.
+
+do_del_vertex(V, G) ->
+    do_del_nedges(ets:lookup(G#digraph.ntab, {in, V}), G),
+    do_del_nedges(ets:lookup(G#digraph.ntab, {out, V}), G),
+    ets:delete(G#digraph.vtab, V).
+
+do_del_nedges([{_, E}|Ns], G) ->
+    case ets:lookup(G#digraph.etab, E) of
+	[{E, V1, V2, _}] ->
+	    do_del_edge(E, V1, V2, G),
+	    do_del_nedges(Ns, G);
+	[] -> % cannot happen
+	    do_del_nedges(Ns, G)
+    end;
+do_del_nedges([], #digraph{}) -> true.
+
+%%
+%% Delete edges
+%%
+do_del_edges([E|Es], G) ->
+    case ets:lookup(G#digraph.etab, E) of
+	[{E,V1,V2,_}] ->
+	    do_del_edge(E,V1,V2,G),
+	    do_del_edges(Es, G);
+	[] ->
+	    do_del_edges(Es, G)
+    end;
+do_del_edges([], #digraph{}) -> true.
+
+do_del_edge(E, V1, V2, G) ->
+    ets:select_delete(G#digraph.ntab, [{{{in, V2}, E}, [], [true]},
+				       {{{out,V1}, E}, [], [true]}]),
+    ets:delete(G#digraph.etab, E).
+
+-spec rm_edges([vertex(),...], local_digraph()) -> 'true'.
+
+rm_edges([V1, V2|Vs], G) ->
+    rm_edge(V1, V2, G),
+    rm_edges([V2|Vs], G);
+rm_edges(_, _) -> true.
+
+-spec rm_edge(vertex(), vertex(), local_digraph()) -> 'ok'.
+
+rm_edge(V1, V2, G) ->
+    Es = out_edges(G, V1),
+    rm_edge_0(Es, V1, V2, G).
+
+rm_edge_0([E|Es], V1, V2, G) ->
+    case ets:lookup(G#digraph.etab, E) of
+	[{E, V1, V2, _}]  ->
+            do_del_edge(E, V1, V2, G),
+	    rm_edge_0(Es, V1, V2, G);
+	_ ->
+	    rm_edge_0(Es, V1, V2, G)
+    end;
+rm_edge_0([], _, _, #digraph{}) -> ok.
+
+%%
+%% Check that endpoints exist
+%%
+-spec do_add_edge({edge(), vertex(), vertex(), label()}, local_digraph()) ->
+	edge() | {'error', add_edge_err_rsn()}.
+
+do_add_edge({E, V1, V2, Label}, G) ->
+    case ets:member(G#digraph.vtab, V1) of
+	false -> {error, {bad_vertex, V1}};
+	true  ->
+	    case ets:member(G#digraph.vtab, V2) of
+		false -> {error, {bad_vertex, V2}};
+                true ->
+                    case other_edge_exists(G, E, V1, V2) of
+                        true -> {error, {bad_edge, [V1, V2]}};
+                        false when G#digraph.cyclic =:= false ->
+                            acyclic_add_edge(E, V1, V2, Label, G);
+                        false ->
+                            do_insert_edge(E, V1, V2, Label, G)
+                    end
+	    end
+    end.
+
+other_edge_exists(#digraph{etab = ET}, E, V1, V2) ->
+    case ets:lookup(ET, E) of
+        [{E, Vert1, Vert2, _}] when Vert1 =/= V1; Vert2 =/= V2 ->
+            true;
+        _ ->
+            false
+    end.
+
+-spec do_insert_edge(edge(), vertex(), vertex(), label(), local_digraph()) -> edge().
+
+do_insert_edge(E, V1, V2, Label, #digraph{ntab=NT, etab=ET}) ->
+    ets:insert(NT, [{{out, V1}, E}, {{in, V2}, E}]),
+    ets:insert(ET, {E, V1, V2, Label}),
+    E.
+
+-spec acyclic_add_edge(edge(), vertex(), vertex(), label(), local_digraph()) ->
+	edge() | {'error', {'bad_edge', [vertex()]}}.
+
+acyclic_add_edge(_E, V1, V2, _L, _G) when V1 =:= V2 ->
+    {error, {bad_edge, [V1, V2]}};
+acyclic_add_edge(E, V1, V2, Label, G) ->
+    case get_path(G, V2, V1) of
+	false -> do_insert_edge(E, V1, V2, Label, G);
+	Path -> {error, {bad_edge, Path}}
+    end.
+
+%%
+%% Delete all paths from vertex V1 to vertex V2
+%%
+
+-spec del_path(G, V1, V2) -> 'true' when
+      G :: local_digraph(),
+      V1 :: vertex(),
+      V2 :: vertex().
+
+del_path(G, V1, V2) ->
+    case get_path(G, V1, V2) of
+	false -> true;
+	Path ->
+	    rm_edges(Path, G),
+	    del_path(G, V1, V2)
+    end.
+
+%%
+%% Find a cycle through V
+%% return the cycle as list of vertices [V ... V]
+%% if no cycle exists false is returned
+%% if only a cycle of length one exists it will be
+%% returned as [V] but only after longer cycles have
+%% been searched.
+%%
+
+-spec get_cycle(G, V) -> Vertices | 'false' when
+      G :: local_digraph(),
+      V :: vertex(),
+      Vertices :: [vertex(),...].
+
+get_cycle(G, V) ->
+    case one_path(out_neighbours(G, V), V, [], [V], [V], 2, G, 1) of
+	false ->
+	    case lists:member(V, out_neighbours(G, V)) of
+		true -> [V];
+		false -> false
+	    end;
+	Vs -> Vs
+    end.
+
+%%
+%% Find a path from V1 to V2
+%% return the path as list of vertices [V1 ... V2]
+%% if no path exists false is returned
+%%
+
+-spec get_path(G, V1, V2) -> Vertices | 'false' when
+      G :: local_digraph(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Vertices :: [vertex(),...].
+
+get_path(G, V1, V2) ->
+    one_path(out_neighbours(G, V1), V2, [], [V1], [V1], 1, G, 1).
+
+%%
+%% prune_short_path (evaluate conditions on path)
+%% short : if path is too short
+%% ok    : if path is ok
+%%
+prune_short_path(Counter, Min) when Counter < Min ->
+    short;
+prune_short_path(_Counter, _Min) ->
+    ok.
+
+one_path([W|Ws], W, Cont, Xs, Ps, Prune, G, Counter) ->
+    case prune_short_path(Counter, Prune) of
+	short -> one_path(Ws, W, Cont, Xs, Ps, Prune, G, Counter);
+	ok -> lists:reverse([W|Ps])
+    end;
+one_path([V|Vs], W, Cont, Xs, Ps, Prune, G, Counter) ->
+    case lists:member(V, Xs) of
+	true ->  one_path(Vs, W, Cont, Xs, Ps, Prune, G, Counter);
+	false -> one_path(out_neighbours(G, V), W,
+			  [{Vs,Ps} | Cont], [V|Xs], [V|Ps],
+			  Prune, G, Counter+1)
+    end;
+one_path([], W, [{Vs,Ps}|Cont], Xs, _, Prune, G, Counter) ->
+    one_path(Vs, W, Cont, Xs, Ps, Prune, G, Counter-1);
+one_path([], _, [], _, _, _, _, _Counter) -> false.
+
+%%
+%% Like get_cycle/2, but a cycle of length one is preferred.
+%%
+
+-spec get_short_cycle(G, V) -> Vertices | 'false' when
+      G :: local_digraph(),
+      V :: vertex(),
+      Vertices :: [vertex(),...].
+
+get_short_cycle(G, V) ->
+    get_short_path(G, V, V).
+
+%%
+%% Like get_path/3, but using a breadth-first search makes it possible
+%% to find a short path.
+%%
+
+-spec get_short_path(G, V1, V2) -> Vertices | 'false' when
+      G :: local_digraph(),
+      V1 :: vertex(),
+      V2 :: vertex(),
+      Vertices :: [vertex(),...].
+
+get_short_path(G, V1, V2) ->
+    T = new(),
+    add_vertex(T, V1),
+    Q = queue:new(),
+    Q1 = queue_out_neighbours(V1, G, Q),
+    L = spath(Q1, G, V2, T),
+    delete(T),
+    L.
+
+spath(Q, G, Sink, T) ->
+    case queue:out(Q) of
+	{{value, E}, Q1} ->
+	    {_E, V1, V2, _Label} = edge(G, E),
+	    if
+		Sink =:= V2 ->
+		    follow_path(V1, T, [V2]);
+		true ->
+		    case vertex(T, V2) of
+			false ->
+			    add_vertex(T, V2),
+			    add_edge(T, V2, V1),
+			    NQ = queue_out_neighbours(V2, G, Q1),
+			    spath(NQ, G, Sink, T);
+			_V ->
+			    spath(Q1, G, Sink, T)
+		    end
+	    end;
+	{empty, _Q1} ->
+	    false
+    end.
+
+follow_path(V, T, P) ->
+    P1 = [V | P],
+    case out_neighbours(T, V) of
+	[N] ->
+	    follow_path(N, T, P1);
+	[] ->
+	    P1
+    end.
+
+queue_out_neighbours(V, G, Q0) ->
+    lists:foldl(fun(E, Q) -> queue:in(E, Q) end, Q0, out_edges(G, V)).
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/modules/opaque_erl_scan.erl b/lib/dialyzer/test/opaque_SUITE_data/src/modules/opaque_erl_scan.erl
new file mode 100644
index 0000000000..9ecd4f92a1
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/modules/opaque_erl_scan.erl
@@ -0,0 +1,1300 @@
+%% -*- coding: utf-8 -*-
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
+%%
+%% The 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%
+%%
+
+
+%%% The Erlang scanner. All types are opaque, which puts some stress
+%%% on Dialyzer.
+
+-module(opaque_erl_scan).
+
+%%% External exports
+
+-export([string/1,string/2,string/3,tokens/3,tokens/4,
+         format_error/1,reserved_word/1,
+         token_info/1,token_info/2,
+         attributes_info/1,attributes_info/2,set_attribute/3]).
+
+%%% Private
+-export([continuation_location/1]).
+
+-export_type([error_info/0,
+              line/0,
+              location/0,
+              options/0,
+              return_cont/0,
+              token/0,
+              tokens_result/0]).
+
+%%%
+%%% Defines and type definitions
+%%%
+
+-define(COLUMN(C), (is_integer(C) andalso C >= 1)).
+%% Line numbers less than zero have always been allowed:
+-define(ALINE(L), is_integer(L)).
+-define(STRING(S), is_list(S)).
+-define(RESWORDFUN(F), is_function(F, 1)).
+-define(SETATTRFUN(F), is_function(F, 1)).
+
+-export_type([category/0, column/0, resword_fun/0, option/0, symbol/0,
+              info_line/0, attributes_data/0, attributes/0, tokens/0,
+              error_description/0, char_spec/0, cont_fun/0,
+              attribute_item/0, info_location/0, attribute_info/0,
+              token_item/0, token_info/0]).
+
+-opaque category() :: atom().
+-opaque column() :: pos_integer().
+-opaque line() :: integer().
+-opaque location() :: line() | {line(),column()}.
+-opaque resword_fun() :: fun((atom()) -> boolean()).
+-opaque option() :: 'return' | 'return_white_spaces' | 'return_comments'
+                | 'text' | {'reserved_word_fun', resword_fun()}.
+-opaque options() :: option() | [option()].
+-opaque symbol() :: atom() | float() | integer() | string().
+-opaque info_line() :: integer() | term().
+-opaque attributes_data()
+       :: [{'column', column()} | {'line', info_line()} | {'text', string()}]
+        |  {line(), column()}.
+%% The fact that {line(),column()} is a possible attributes() type
+%% is hidden.
+-opaque attributes() :: line() | attributes_data().
+-opaque token() :: {category(), attributes(), symbol()}
+               | {category(), attributes()}.
+-opaque tokens() :: [token()].
+-opaque error_description() :: term().
+-opaque error_info() :: {location(), module(), error_description()}.
+
+%%% Local record.
+-record(erl_scan,
+        {resword_fun = fun reserved_word/1 :: resword_fun(),
+         ws          = false               :: boolean(),
+         comment     = false               :: boolean(),
+         text        = false               :: boolean()}).
+
+%%----------------------------------------------------------------------------
+
+-spec format_error(ErrorDescriptor) -> string() when
+      ErrorDescriptor :: error_description().
+format_error({string,Quote,Head}) ->
+    lists:flatten(["unterminated " ++ string_thing(Quote) ++
+                   " starting with " ++
+                   io_lib:write_string(Head, Quote)]);
+format_error({illegal,Type}) ->
+    lists:flatten(io_lib:fwrite("illegal ~w", [Type]));
+format_error(char) -> "unterminated character";
+format_error({base,Base}) ->
+    lists:flatten(io_lib:fwrite("illegal base '~w'", [Base]));
+format_error(Other) ->
+    lists:flatten(io_lib:write(Other)).
+
+-spec string(String) -> Return when
+      String :: string(),
+      Return :: {'ok', Tokens :: tokens(), EndLocation}
+              | {'error', ErrorInfo :: error_info(), ErrorLocation},
+      EndLocation :: location(),
+      ErrorLocation :: location().
+string(String) ->
+    string(String, 1, []).
+
+-spec string(String, StartLocation) -> Return when
+      String :: string(),
+      Return :: {'ok', Tokens :: tokens(), EndLocation}
+              | {'error', ErrorInfo :: error_info(), ErrorLocation},
+      StartLocation :: location(),
+      EndLocation :: location(),
+      ErrorLocation :: location().
+string(String, StartLocation) ->
+    string(String, StartLocation, []).
+
+-spec string(String, StartLocation, Options) -> Return when
+      String :: string(),
+      Options :: options(),
+      Return :: {'ok', Tokens :: tokens(), EndLocation}
+              | {'error', ErrorInfo :: error_info(), ErrorLocation},
+      StartLocation :: location(),
+      EndLocation :: location(),
+      ErrorLocation :: location().
+string(String, Line, Options) when ?STRING(String), ?ALINE(Line) ->
+    string1(String, options(Options), Line, no_col, []);
+string(String, {Line,Column}, Options) when ?STRING(String),
+                                            ?ALINE(Line),
+                                            ?COLUMN(Column) ->
+    string1(String, options(Options), Line, Column, []).
+
+-opaque char_spec() :: string() | 'eof'.
+-opaque cont_fun() :: fun((char_spec(), #erl_scan{}, line(), column(),
+                         tokens(), any()) -> any()).
+-opaque return_cont() :: {erl_scan_continuation,
+                          string(), column(), tokens(), line(),
+                          #erl_scan{}, any(), cont_fun()}.
+-opaque tokens_result() :: {'ok', Tokens :: tokens(), EndLocation :: location()}
+                       | {'eof', EndLocation :: location()}
+                       | {'error', ErrorInfo :: error_info(),
+                          EndLocation :: location()}.
+
+-spec tokens(Continuation, CharSpec, StartLocation) -> Return when
+      Continuation :: return_cont() | [],
+      CharSpec :: char_spec(),
+      StartLocation :: location(),
+      Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
+              | {'more', Continuation1 :: return_cont()}.
+tokens(Cont, CharSpec, StartLocation) ->
+    tokens(Cont, CharSpec, StartLocation, []).
+
+-spec tokens(Continuation, CharSpec, StartLocation, Options) -> Return when
+      Continuation :: return_cont() | [],
+      CharSpec :: char_spec(),
+      StartLocation :: location(),
+      Options :: options(),
+      Return :: {'done',Result :: tokens_result(),LeftOverChars :: char_spec()}
+              | {'more', Continuation1 :: return_cont()}.
+tokens([], CharSpec, Line, Options) when ?ALINE(Line) ->
+    tokens1(CharSpec, options(Options), Line, no_col, [], fun scan/6, []);
+tokens([], CharSpec, {Line,Column}, Options) when ?ALINE(Line),
+                                                  ?COLUMN(Column) ->
+    tokens1(CharSpec, options(Options), Line, Column, [], fun scan/6, []);
+tokens({erl_scan_continuation,Cs,Col,Toks,Line,St,Any,Fun},
+       CharSpec, _Loc, _Opts) ->
+    tokens1(Cs++CharSpec, St, Line, Col, Toks, Fun, Any).
+
+continuation_location({erl_scan_continuation,_,no_col,_,Line,_,_,_}) ->
+    Line;
+continuation_location({erl_scan_continuation,_,Col,_,Line,_,_,_}) ->
+    {Line,Col}.
+
+-opaque attribute_item() :: 'column' | 'length' | 'line'
+                        | 'location' | 'text'.
+-opaque info_location() :: location() | term().
+-opaque attribute_info() :: {'column', column()}| {'length', pos_integer()}
+                        | {'line', info_line()}
+                        | {'location', info_location()}
+                        | {'text', string()}.
+-opaque token_item() :: 'category' | 'symbol' | attribute_item().
+-opaque token_info() :: {'category', category()} | {'symbol', symbol()}
+                    | attribute_info().
+
+-spec token_info(Token) -> TokenInfo when
+      Token :: token(),
+      TokenInfo :: [TokenInfoTuple :: token_info()].
+token_info(Token) ->
+    Items = [category,column,length,line,symbol,text], % undefined order
+    token_info(Token, Items).
+
+-spec token_info(Token, TokenItem) -> TokenInfoTuple | 'undefined' when
+                     Token :: token(),
+                     TokenItem :: token_item(),
+                     TokenInfoTuple :: token_info();
+                (Token, TokenItems) -> TokenInfo when
+                     Token :: token(),
+                     TokenItems :: [TokenItem :: token_item()],
+                     TokenInfo :: [TokenInfoTuple :: token_info()].
+token_info(_Token, []) ->
+    [];
+token_info(Token, [Item|Items]) when is_atom(Item) ->
+    case token_info(Token, Item) of
+        undefined ->
+            token_info(Token, Items);
+        TokenInfo when is_tuple(TokenInfo) ->
+            [TokenInfo|token_info(Token, Items)]
+    end;
+token_info({Category,_Attrs}, category=Item) ->
+    {Item,Category};
+token_info({Category,_Attrs,_Symbol}, category=Item) ->
+    {Item,Category};
+token_info({Category,_Attrs}, symbol=Item) ->
+    {Item,Category};
+token_info({_Category,_Attrs,Symbol}, symbol=Item) ->
+    {Item,Symbol};
+token_info({_Category,Attrs}, Item) ->
+    attributes_info(Attrs, Item);
+token_info({_Category,Attrs,_Symbol}, Item) ->
+    attributes_info(Attrs, Item).
+
+-spec attributes_info(Attributes) -> AttributesInfo when
+      Attributes :: attributes(),
+      AttributesInfo :: [AttributeInfoTuple :: attribute_info()].
+attributes_info(Attributes) ->
+    Items = [column,length,line,text], % undefined order
+    attributes_info(Attributes, Items).
+
+-spec attributes_info
+        (Attributes, AttributeItem) -> AttributeInfoTuple | 'undefined' when
+             Attributes :: attributes(),
+             AttributeItem :: attribute_item(),
+             AttributeInfoTuple :: attribute_info();
+        (Attributes, AttributeItems) -> AttributeInfo when
+             Attributes :: attributes(),
+             AttributeItems :: [AttributeItem :: attribute_item()],
+             AttributeInfo :: [AttributeInfoTuple :: attribute_info()].
+attributes_info(_Attrs, []) ->
+    [];
+attributes_info(Attrs, [A|As]) when is_atom(A) ->
+    case attributes_info(Attrs, A) of
+        undefined ->
+            attributes_info(Attrs, As);
+        AttributeInfo when is_tuple(AttributeInfo) ->
+            [AttributeInfo|attributes_info(Attrs, As)]
+    end;
+attributes_info({Line,Column}, column=Item) when ?ALINE(Line),
+                                                 ?COLUMN(Column) ->
+    {Item,Column};
+attributes_info(Line, column) when ?ALINE(Line) ->
+    undefined;
+attributes_info(Attrs, column=Item) ->
+    attr_info(Attrs, Item);
+attributes_info(Attrs, length=Item) ->
+    case attributes_info(Attrs, text) of
+        undefined ->
+            undefined;
+        {text,Text} ->
+            {Item,length(Text)}
+    end;
+attributes_info(Line, line=Item) when ?ALINE(Line) ->
+    {Item,Line};
+attributes_info({Line,Column}, line=Item) when ?ALINE(Line),
+                                               ?COLUMN(Column) ->
+    {Item,Line};
+attributes_info(Attrs, line=Item) ->
+    attr_info(Attrs, Item);
+attributes_info({Line,Column}=Location, location=Item) when ?ALINE(Line),
+                                                            ?COLUMN(Column) ->
+    {Item,Location};
+attributes_info(Line, location=Item) when ?ALINE(Line) ->
+    {Item,Line};
+attributes_info(Attrs, location=Item) ->
+    {line,Line} = attributes_info(Attrs, line), % assume line is present
+    case attributes_info(Attrs, column) of
+        undefined ->
+            %% If set_attribute() has assigned a term such as {17,42}
+            %% to 'line', then Line will look like {Line,Column}. One
+            %% should not use 'location' but 'line' and 'column' in
+            %% such special cases.
+            {Item,Line};
+        {column,Column} ->
+            {Item,{Line,Column}}
+    end;
+attributes_info({Line,Column}, text) when ?ALINE(Line), ?COLUMN(Column) ->
+    undefined;
+attributes_info(Line, text) when ?ALINE(Line) ->
+    undefined;
+attributes_info(Attrs, text=Item) ->
+    attr_info(Attrs, Item);
+attributes_info(T1, T2) ->
+    erlang:error(badarg, [T1,T2]).
+
+-spec set_attribute(AttributeItem, Attributes, SetAttributeFun) -> Attributes when
+      AttributeItem :: 'line',
+      Attributes :: attributes(),
+      SetAttributeFun :: fun((info_line()) -> info_line()).
+set_attribute(Tag, Attributes, Fun) when ?SETATTRFUN(Fun) ->
+    set_attr(Tag, Attributes, Fun).
+
+%%%
+%%% Local functions
+%%%
+
+string_thing($') -> "atom";   %' Stupid Emacs
+string_thing(_) -> "string".
+
+-define(WHITE_SPACE(C),
+        is_integer(C) andalso
+         (C >= $\000 andalso C =< $\s orelse C >= $\200 andalso C =< $\240)).
+-define(DIGIT(C), C >= $0, C =< $9).
+-define(CHAR(C), is_integer(C), C >= 0).
+-define(UNICODE(C),
+        is_integer(C) andalso
+         (C >= 0 andalso C < 16#D800 orelse
+          C > 16#DFFF andalso C < 16#FFFE orelse
+          C > 16#FFFF andalso C =< 16#10FFFF)).
+
+-define(UNI255(C), C >= 0, C =< 16#ff).
+
+options(Opts0) when is_list(Opts0) ->
+    Opts = lists:foldr(fun expand_opt/2, [], Opts0),
+    [RW_fun] =
+        case opts(Opts, [reserved_word_fun], []) of
+            badarg ->
+                erlang:error(badarg, [Opts0]);
+            R ->
+                R
+        end,
+    Comment = proplists:get_bool(return_comments, Opts),
+    WS = proplists:get_bool(return_white_spaces, Opts),
+    Txt = proplists:get_bool(text, Opts),
+    #erl_scan{resword_fun = RW_fun,
+              comment     = Comment,
+              ws          = WS,
+              text        = Txt};
+options(Opt) ->
+    options([Opt]).
+
+opts(Options, [Key|Keys], L) ->
+    V = case lists:keyfind(Key, 1, Options) of
+            {reserved_word_fun,F} when ?RESWORDFUN(F) ->
+                {ok,F};
+            {Key,_} ->
+                badarg;
+            false ->
+                {ok,default_option(Key)}
+        end,
+    case V of
+        badarg ->
+            badarg;
+        {ok,Value} ->
+            opts(Options, Keys, [Value|L])
+    end;
+opts(_Options, [], L) ->
+    lists:reverse(L).
+
+default_option(reserved_word_fun) ->
+    fun reserved_word/1.
+
+expand_opt(return, Os) ->
+    [return_comments,return_white_spaces|Os];
+expand_opt(O, Os) ->
+    [O|Os].
+
+attr_info(Attrs, Item) ->
+    try lists:keyfind(Item, 1, Attrs) of
+        {_Item, _Value} = T ->
+            T;
+        false ->
+            undefined
+    catch
+	_:_ ->
+            erlang:error(badarg, [Attrs, Item])
+    end.
+
+-spec set_attr('line', attributes(), fun((line()) -> line())) -> attributes().
+
+set_attr(line, Line, Fun) when ?ALINE(Line) ->
+    Ln = Fun(Line),
+    if
+        ?ALINE(Ln) ->
+            Ln;
+        true ->
+            [{line,Ln}]
+    end;
+set_attr(line, {Line,Column}, Fun) when ?ALINE(Line), ?COLUMN(Column) ->
+    Ln = Fun(Line),
+    if
+        ?ALINE(Ln) ->
+            {Ln,Column};
+        true ->
+            [{line,Ln},{column,Column}]
+    end;
+set_attr(line=Tag, Attrs, Fun) when is_list(Attrs) ->
+    {line,Line} = lists:keyfind(Tag, 1, Attrs),
+    case lists:keyreplace(Tag, 1, Attrs, {line,Fun(Line)}) of
+        [{line,Ln}] when ?ALINE(Ln) ->
+            Ln;
+        As ->
+            As
+    end;
+set_attr(T1, T2, T3) ->
+    erlang:error(badarg, [T1,T2,T3]).
+
+tokens1(Cs, St, Line, Col, Toks, Fun, Any) when ?STRING(Cs); Cs =:= eof ->
+    case Fun(Cs, St, Line, Col, Toks, Any) of
+        {more,{Cs0,Ncol,Ntoks,Nline,Nany,Nfun}} ->
+            {more,{erl_scan_continuation,Cs0,Ncol,Ntoks,Nline,St,Nany,Nfun}};
+        {ok,Toks0,eof,Nline,Ncol} ->
+            Res = case Toks0 of
+                      [] ->
+                          {eof,location(Nline, Ncol)};
+                      _ ->
+                          {ok,lists:reverse(Toks0),location(Nline,Ncol)}
+                  end,
+            {done,Res,eof};
+        {ok,Toks0,Rest,Nline,Ncol} ->
+            {done,{ok,lists:reverse(Toks0),location(Nline, Ncol)},Rest};
+        {{error,_,_}=Error,Rest} ->
+            {done,Error,Rest}
+    end.
+
+string1(Cs, St, Line, Col, Toks) ->
+    case scan1(Cs, St, Line, Col, Toks) of
+        {more,{Cs0,Ncol,Ntoks,Nline,Any,Fun}} ->
+            case Fun(Cs0++eof, St, Nline, Ncol, Ntoks, Any) of
+                {ok,Toks1,_Rest,Line2,Col2} ->
+                    {ok,lists:reverse(Toks1),location(Line2, Col2)};
+                {{error,_,_}=Error,_Rest} ->
+                    Error
+            end;
+        {ok,Ntoks,[_|_]=Rest,Nline,Ncol} ->
+            string1(Rest, St, Nline, Ncol, Ntoks);
+        {ok,Ntoks,_,Nline,Ncol} ->
+            {ok,lists:reverse(Ntoks),location(Nline, Ncol)};
+        {{error,_,_}=Error,_Rest} ->
+            Error
+    end.
+
+scan(Cs, St, Line, Col, Toks, _) ->
+    scan1(Cs, St, Line, Col, Toks).
+
+scan1([$\s|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
+    scan_spcs(Cs, St, Line, Col, Toks, 1);
+scan1([$\s|Cs], St, Line, Col, Toks) ->
+    skip_white_space(Cs, St, Line, Col, Toks, 1);
+scan1([$\n|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
+    scan_newline(Cs, St, Line, Col, Toks);
+scan1([$\n|Cs], St, Line, Col, Toks) ->
+    skip_white_space(Cs, St, Line+1, new_column(Col, 1), Toks, 0);
+scan1([C|Cs], St, Line, Col, Toks) when C >= $A, C =< $Z ->
+    scan_variable(Cs, St, Line, Col, Toks, [C]);
+scan1([C|Cs], St, Line, Col, Toks) when C >= $a, C =< $z ->
+    scan_atom(Cs, St, Line, Col, Toks, [C]);
+%% Optimization: some very common punctuation characters:
+scan1([$,|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ",", ',', 1);
+scan1([$(|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "(", '(', 1);
+scan1([$)|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ")", ')', 1);
+scan1([${|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "{", '{', 1);
+scan1([$}|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "}", '}', 1);
+scan1([$[|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "[", '[', 1);
+scan1([$]|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "]", ']', 1);
+scan1([$;|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ";", ';', 1);
+scan1([$_=C|Cs], St, Line, Col, Toks) ->
+    scan_variable(Cs, St, Line, Col, Toks, [C]);
+%% More punctuation characters below.
+scan1([$\%|Cs], St, Line, Col, Toks) when not St#erl_scan.comment ->
+    skip_comment(Cs, St, Line, Col, Toks, 1);
+scan1([$\%=C|Cs], St, Line, Col, Toks) ->
+    scan_comment(Cs, St, Line, Col, Toks, [C]);
+scan1([C|Cs], St, Line, Col, Toks) when ?DIGIT(C) ->
+    scan_number(Cs, St, Line, Col, Toks, [C]);
+scan1("..."++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "...", '...', 3);
+scan1(".."=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+scan1(".."++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "..", '..', 2);
+scan1("."=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+scan1([$.=C|Cs], St, Line, Col, Toks) ->
+    scan_dot(Cs, St, Line, Col, Toks, [C]);
+scan1([$"|Cs], St, Line, Col, Toks) -> %" Emacs
+    State0 = {[],[],Line,Col},
+    scan_string(Cs, St, Line, incr_column(Col, 1), Toks, State0);
+scan1([$'|Cs], St, Line, Col, Toks) -> %' Emacs
+    State0 = {[],[],Line,Col},
+    scan_qatom(Cs, St, Line, incr_column(Col, 1), Toks, State0);
+scan1([$$|Cs], St, Line, Col, Toks) ->
+    scan_char(Cs, St, Line, Col, Toks);
+scan1([$\r|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
+    white_space_end(Cs, St, Line, Col, Toks, 1, "\r");
+scan1([C|Cs], St, Line, Col, Toks) when C >= $ß, C =< $ÿ, C =/= $÷ ->
+    scan_atom(Cs, St, Line, Col, Toks, [C]);
+scan1([C|Cs], St, Line, Col, Toks) when C >= $À, C =< $Þ, C /= $× ->
+    scan_variable(Cs, St, Line, Col, Toks, [C]);
+scan1([$\t|Cs], St, Line, Col, Toks) when St#erl_scan.ws ->
+    scan_tabs(Cs, St, Line, Col, Toks, 1);
+scan1([$\t|Cs], St, Line, Col, Toks) ->
+    skip_white_space(Cs, St, Line, Col, Toks, 1);
+scan1([C|Cs], St, Line, Col, Toks) when ?WHITE_SPACE(C) ->
+    case St#erl_scan.ws of
+        true ->
+            scan_white_space(Cs, St, Line, Col, Toks, [C]);
+        false ->
+            skip_white_space(Cs, St, Line, Col, Toks, 1)
+    end;
+%% Punctuation characters and operators, first recognise multiples.
+%% << <- <=
+scan1("<<"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "<<", '<<', 2);
+scan1("<-"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "<-", '<-', 2);
+scan1("<="++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "<=", '<=', 2);
+scan1("<"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% >> >=
+scan1(">>"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ">>", '>>', 2);
+scan1(">="++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ">=", '>=', 2);
+scan1(">"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% -> --
+scan1("->"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "->", '->', 2);
+scan1("--"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "--", '--', 2);
+scan1("-"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% ++
+scan1("++"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "++", '++', 2);
+scan1("+"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% =:= =/= =< ==
+scan1("=:="++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "=:=", '=:=', 3);
+scan1("=:"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+scan1("=/="++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "=/=", '=/=', 3);
+scan1("=/"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+scan1("=<"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "=<", '=<', 2);
+scan1("=="++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "==", '==', 2);
+scan1("="=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% /=
+scan1("/="++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "/=", '/=', 2);
+scan1("/"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% ||
+scan1("||"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "||", '||', 2);
+scan1("|"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% :-
+scan1(":-"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ":-", ':-', 2);
+%% :: for typed records
+scan1("::"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "::", '::', 2);
+scan1(":"=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% Optimization: punctuation characters less than 127:
+scan1([$=|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "=", '=', 1);
+scan1([$:|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ":", ':', 1);
+scan1([$||Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "|", '|', 1);
+scan1([$#|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "#", '#', 1);
+scan1([$/|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "/", '/', 1);
+scan1([$?|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "?", '?', 1);
+scan1([$-|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "-", '-', 1);
+scan1([$+|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "+", '+', 1);
+scan1([$*|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "*", '*', 1);
+scan1([$<|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "<", '<', 1);
+scan1([$>|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ">", '>', 1);
+scan1([$!|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "!", '!', 1);
+scan1([$@|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "@", '@', 1);
+scan1([$\\|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "\\", '\\', 1);
+scan1([$^|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "^", '^', 1);
+scan1([$`|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "`", '`', 1);
+scan1([$~|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "~", '~', 1);
+scan1([$&|Cs], St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "&", '&', 1);
+%% End of optimization.
+scan1([C|Cs], St, Line, Col, Toks) when ?UNI255(C) ->
+    Str = [C],
+    tok2(Cs, St, Line, Col, Toks, Str, list_to_atom(Str), 1);
+scan1([C|Cs], _St, Line, Col, _Toks) when ?CHAR(C) ->
+    Ncol = incr_column(Col, 1),
+    scan_error({illegal,character}, Line, Col, Line, Ncol, Cs);
+scan1([]=Cs, _St, Line, Col, Toks) ->
+    {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+scan1(eof=Cs, _St, Line, Col, Toks) ->
+    {ok,Toks,Cs,Line,Col}.
+
+scan_atom(Cs0, St, Line, Col, Toks, Ncs0) ->
+    case scan_name(Cs0, Ncs0) of
+        {more,Ncs} ->
+            {more,{[],Col,Toks,Line,Ncs,fun scan_atom/6}};
+        {Wcs,Cs} ->
+            case catch list_to_atom(Wcs) of
+                Name when is_atom(Name) ->
+                    case (St#erl_scan.resword_fun)(Name) of
+                        true ->
+                            tok2(Cs, St, Line, Col, Toks, Wcs, Name);
+                        false ->
+                            tok3(Cs, St, Line, Col, Toks, atom, Wcs, Name)
+                    end;
+                _Error ->
+                    Ncol = incr_column(Col, length(Wcs)),
+                    scan_error({illegal,atom}, Line, Col, Line, Ncol, Cs)
+            end
+    end.
+
+scan_variable(Cs0, St, Line, Col, Toks, Ncs0) ->
+    case scan_name(Cs0, Ncs0) of
+        {more,Ncs} ->
+            {more,{[],Col,Toks,Line,Ncs,fun scan_variable/6}};
+        {Wcs,Cs} ->
+            case catch list_to_atom(Wcs) of
+                Name when is_atom(Name) ->
+                    tok3(Cs, St, Line, Col, Toks, var, Wcs, Name);
+                _Error ->
+                    Ncol = incr_column(Col, length(Wcs)),
+                    scan_error({illegal,var}, Line, Col, Line, Ncol, Cs)
+            end
+    end.
+
+scan_name([C|Cs], Ncs) when C >= $a, C =< $z ->
+    scan_name(Cs, [C|Ncs]);
+scan_name([C|Cs], Ncs) when C >= $A, C =< $Z ->
+    scan_name(Cs, [C|Ncs]);
+scan_name([$_=C|Cs], Ncs) ->
+    scan_name(Cs, [C|Ncs]);
+scan_name([C|Cs], Ncs) when ?DIGIT(C) ->
+    scan_name(Cs, [C|Ncs]);
+scan_name([$@=C|Cs], Ncs) ->
+    scan_name(Cs, [C|Ncs]);
+scan_name([C|Cs], Ncs) when C >= $ß, C =< $ÿ, C =/= $÷ ->
+    scan_name(Cs, [C|Ncs]);
+scan_name([C|Cs], Ncs) when C >= $À, C =< $Þ, C =/= $× ->
+    scan_name(Cs, [C|Ncs]);
+scan_name([], Ncs) ->
+    {more,Ncs};
+scan_name(Cs, Ncs) ->
+    {lists:reverse(Ncs),Cs}.
+
+-define(STR(St, S), if St#erl_scan.text -> S; true -> [] end).
+
+scan_dot([$%|_]=Cs, St, Line, Col, Toks, Ncs) ->
+    Attrs = attributes(Line, Col, St, Ncs),
+    {ok,[{dot,Attrs}|Toks],Cs,Line,incr_column(Col, 1)};
+scan_dot([$\n=C|Cs], St, Line, Col, Toks, Ncs) ->
+    Attrs = attributes(Line, Col, St, ?STR(St, Ncs++[C])),
+    {ok,[{dot,Attrs}|Toks],Cs,Line+1,new_column(Col, 1)};
+scan_dot([C|Cs], St, Line, Col, Toks, Ncs) when ?WHITE_SPACE(C) ->
+    Attrs = attributes(Line, Col, St, ?STR(St, Ncs++[C])),
+    {ok,[{dot,Attrs}|Toks],Cs,Line,incr_column(Col, 2)};
+scan_dot(eof=Cs, St, Line, Col, Toks, Ncs) ->
+    Attrs = attributes(Line, Col, St, Ncs),
+    {ok,[{dot,Attrs}|Toks],Cs,Line,incr_column(Col, 1)};
+scan_dot(Cs, St, Line, Col, Toks, Ncs) ->
+    tok2(Cs, St, Line, Col, Toks, Ncs, '.', 1).
+
+%%% White space characters are very common, so it is worthwhile to
+%%% scan them fast and store them compactly. (The words "whitespace"
+%%% and "white space" usually mean the same thing. The Erlang
+%%% specification denotes the characters with ASCII code in the
+%%% interval 0 to 32 as "white space".)
+%%%
+%%% Convention: if there is a white newline ($\n) it will always be
+%%% the first character in the text string. As a consequence, there
+%%% cannot be more than one newline in a white_space token string.
+%%%
+%%% Some common combinations are recognized, some are not. Examples
+%%% of the latter are tab(s) followed by space(s), like "\t  ".
+%%% (They will be represented by two (or more) tokens.)
+%%%
+%%% Note: the character sequence "\r\n" is *not* recognized since it
+%%% would violate the property that $\n will always be the first
+%%% character. (But since "\r\n\r\n" is common, it pays off to
+%%% recognize "\n\r".)
+
+scan_newline([$\s|Cs], St, Line, Col, Toks) ->
+    scan_nl_spcs(Cs, St, Line, Col, Toks, 2);
+scan_newline([$\t|Cs], St, Line, Col, Toks) ->
+    scan_nl_tabs(Cs, St, Line, Col, Toks, 2);
+scan_newline([$\r|Cs], St, Line, Col, Toks) ->
+    newline_end(Cs, St, Line, Col, Toks, 2, "\n\r");
+scan_newline([$\f|Cs], St, Line, Col, Toks) ->
+    newline_end(Cs, St, Line, Col, Toks, 2, "\n\f");
+scan_newline([], _St, Line, Col, Toks) ->
+    {more,{[$\n],Col,Toks,Line,[],fun scan/6}};
+scan_newline(Cs, St, Line, Col, Toks) ->
+    scan_nl_white_space(Cs, St, Line, Col, Toks, "\n").
+
+scan_nl_spcs([$\s|Cs], St, Line, Col, Toks, N) when N < 17 ->
+    scan_nl_spcs(Cs, St, Line, Col, Toks, N+1);
+scan_nl_spcs([]=Cs, _St, Line, Col, Toks, N) ->
+    {more,{Cs,Col,Toks,Line,N,fun scan_nl_spcs/6}};
+scan_nl_spcs(Cs, St, Line, Col, Toks, N) ->
+    newline_end(Cs, St, Line, Col, Toks, N, nl_spcs(N)).
+
+scan_nl_tabs([$\t|Cs], St, Line, Col, Toks, N) when N < 11 ->
+    scan_nl_tabs(Cs, St, Line, Col, Toks, N+1);
+scan_nl_tabs([]=Cs, _St, Line, Col, Toks, N) ->
+    {more,{Cs,Col,Toks,Line,N,fun scan_nl_tabs/6}};
+scan_nl_tabs(Cs, St, Line, Col, Toks, N) ->
+    newline_end(Cs, St, Line, Col, Toks, N, nl_tabs(N)).
+
+%% Note: returning {more,Cont} is meaningless here; one could just as
+%% well return several tokens. But since tokens() scans up to a full
+%% stop anyway, nothing is gained by not collecting all white spaces.
+scan_nl_white_space([$\n|Cs], #erl_scan{text = false}=St, Line, no_col=Col,
+                    Toks0, Ncs) ->
+    Toks = [{white_space,Line,lists:reverse(Ncs)}|Toks0],
+    scan_newline(Cs, St, Line+1, Col, Toks);
+scan_nl_white_space([$\n|Cs], St, Line, Col, Toks, Ncs0) ->
+    Ncs = lists:reverse(Ncs0),
+    Attrs = attributes(Line, Col, St, Ncs),
+    Token = {white_space,Attrs,Ncs},
+    scan_newline(Cs, St, Line+1, new_column(Col, length(Ncs)), [Token|Toks]);
+scan_nl_white_space([C|Cs], St, Line, Col, Toks, Ncs) when ?WHITE_SPACE(C) ->
+    scan_nl_white_space(Cs, St, Line, Col, Toks, [C|Ncs]);
+scan_nl_white_space([]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_nl_white_space/6}};
+scan_nl_white_space(Cs, #erl_scan{text = false}=St, Line, no_col=Col,
+                    Toks, Ncs) ->
+    scan1(Cs, St, Line+1, Col, [{white_space,Line,lists:reverse(Ncs)}|Toks]);
+scan_nl_white_space(Cs, St, Line, Col, Toks, Ncs0) ->
+    Ncs = lists:reverse(Ncs0),
+    Attrs = attributes(Line, Col, St, Ncs),
+    Token = {white_space,Attrs,Ncs},
+    scan1(Cs, St, Line+1, new_column(Col, length(Ncs)), [Token|Toks]).
+
+newline_end(Cs, #erl_scan{text = false}=St, Line, no_col=Col,
+            Toks, _N, Ncs) ->
+    scan1(Cs, St, Line+1, Col, [{white_space,Line,Ncs}|Toks]);
+newline_end(Cs, St, Line, Col, Toks, N, Ncs) ->
+    Attrs = attributes(Line, Col, St, Ncs),
+    scan1(Cs, St, Line+1, new_column(Col, N), [{white_space,Attrs,Ncs}|Toks]).
+
+scan_spcs([$\s|Cs], St, Line, Col, Toks, N) when N < 16 ->
+    scan_spcs(Cs, St, Line, Col, Toks, N+1);
+scan_spcs([]=Cs, _St, Line, Col, Toks, N) ->
+    {more,{Cs,Col,Toks,Line,N,fun scan_spcs/6}};
+scan_spcs(Cs, St, Line, Col, Toks, N) ->
+    white_space_end(Cs, St, Line, Col, Toks, N, spcs(N)).
+
+scan_tabs([$\t|Cs], St, Line, Col, Toks, N) when N < 10 ->
+    scan_tabs(Cs, St, Line, Col, Toks, N+1);
+scan_tabs([]=Cs, _St, Line, Col, Toks, N) ->
+    {more,{Cs,Col,Toks,Line,N,fun scan_tabs/6}};
+scan_tabs(Cs, St, Line, Col, Toks, N) ->
+    white_space_end(Cs, St, Line, Col, Toks, N, tabs(N)).
+
+skip_white_space([$\n|Cs], St, Line, Col, Toks, _N) ->
+    skip_white_space(Cs, St, Line+1, new_column(Col, 1), Toks, 0);
+skip_white_space([C|Cs], St, Line, Col, Toks, N) when ?WHITE_SPACE(C) ->
+    skip_white_space(Cs, St, Line, Col, Toks, N+1);
+skip_white_space([]=Cs, _St, Line, Col, Toks, N) ->
+    {more,{Cs,Col,Toks,Line,N,fun skip_white_space/6}};
+skip_white_space(Cs, St, Line, Col, Toks, N) ->
+    scan1(Cs, St, Line, incr_column(Col, N), Toks).
+
+%% Maybe \t and \s should break the loop.
+scan_white_space([$\n|_]=Cs, St, Line, Col, Toks, Ncs) ->
+    white_space_end(Cs, St, Line, Col, Toks, length(Ncs), lists:reverse(Ncs));
+scan_white_space([C|Cs], St, Line, Col, Toks, Ncs) when ?WHITE_SPACE(C) ->
+    scan_white_space(Cs, St, Line, Col, Toks, [C|Ncs]);
+scan_white_space([]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_white_space/6}};
+scan_white_space(Cs, St, Line, Col, Toks, Ncs) ->
+    white_space_end(Cs, St, Line, Col, Toks, length(Ncs), lists:reverse(Ncs)).
+
+-compile({inline,[white_space_end/7]}).
+
+white_space_end(Cs, St, Line, Col, Toks, N, Ncs) ->
+    tok3(Cs, St, Line, Col, Toks, white_space, Ncs, Ncs, N).
+
+scan_char([$\\|Cs]=Cs0, St, Line, Col, Toks) ->
+    case scan_escape(Cs, incr_column(Col, 2)) of
+        more ->
+            {more,{[$$|Cs0],Col,Toks,Line,[],fun scan/6}};
+        {error,Ncs,Error,Ncol} ->
+            scan_error(Error, Line, Col, Line, Ncol, Ncs);
+        {eof,Ncol} ->
+            scan_error(char, Line, Col, Line, Ncol, eof);
+        {nl,Val,Str,Ncs,Ncol} ->
+            Attrs = attributes(Line, Col, St, ?STR(St, "$\\"++Str)), %"
+            Ntoks = [{char,Attrs,Val}|Toks],
+            scan1(Ncs, St, Line+1, Ncol, Ntoks);
+        {Val,Str,Ncs,Ncol} ->
+            Attrs = attributes(Line, Col, St, ?STR(St, "$\\"++Str)), %"
+            Ntoks = [{char,Attrs,Val}|Toks],
+            scan1(Ncs, St, Line, Ncol, Ntoks)
+    end;
+scan_char([$\n=C|Cs], St, Line, Col, Toks) ->
+    Attrs = attributes(Line, Col, St, ?STR(St, [$$,C])),
+    scan1(Cs, St, Line+1, new_column(Col, 1), [{char,Attrs,C}|Toks]);
+scan_char([C|Cs], St, Line, Col, Toks) when ?UNICODE(C) ->
+    Attrs = attributes(Line, Col, St, ?STR(St, [$$,C])),
+    scan1(Cs, St, Line, incr_column(Col, 2), [{char,Attrs,C}|Toks]);
+scan_char([C|_Cs], _St, Line, Col, _Toks) when ?CHAR(C) ->
+    scan_error({illegal,character}, Line, Col, Line, incr_column(Col, 1), eof);
+scan_char([], _St, Line, Col, Toks) ->
+    {more,{[$$],Col,Toks,Line,[],fun scan/6}};
+scan_char(eof, _St, Line, Col, _Toks) ->
+    scan_error(char, Line, Col, Line, incr_column(Col, 1), eof).
+
+scan_string(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0}) ->
+    case scan_string0(Cs, St, Line, Col, $\", Str, Wcs) of %"
+        {more,Ncs,Nline,Ncol,Nstr,Nwcs} ->
+            State = {Nwcs,Nstr,Line0,Col0},
+            {more,{Ncs,Ncol,Toks,Nline,State,fun scan_string/6}};
+        {char_error,Ncs,Error,Nline,Ncol,EndCol} ->
+            scan_error(Error, Nline, Ncol, Nline, EndCol, Ncs);
+        {error,Nline,Ncol,Nwcs,Ncs} ->
+            Estr = string:substr(Nwcs, 1, 16), % Expanded escape chars.
+            scan_error({string,$\",Estr}, Line0, Col0, Nline, Ncol, Ncs); %"
+        {Ncs,Nline,Ncol,Nstr,Nwcs} ->
+            Attrs = attributes(Line0, Col0, St, Nstr),
+            scan1(Ncs, St, Nline, Ncol, [{string,Attrs,Nwcs}|Toks])
+    end.
+
+scan_qatom(Cs, St, Line, Col, Toks, {Wcs,Str,Line0,Col0}) ->
+    case scan_string0(Cs, St, Line, Col, $\', Str, Wcs) of %'
+        {more,Ncs,Nline,Ncol,Nstr,Nwcs} ->
+            State = {Nwcs,Nstr,Line0,Col0},
+            {more,{Ncs,Ncol,Toks,Nline,State,fun scan_qatom/6}};
+        {char_error,Ncs,Error,Nline,Ncol,EndCol} ->
+            scan_error(Error, Nline, Ncol, Nline, EndCol, Ncs);
+        {error,Nline,Ncol,Nwcs,Ncs} ->
+            Estr = string:substr(Nwcs, 1, 16), % Expanded escape chars.
+            scan_error({string,$\',Estr}, Line0, Col0, Nline, Ncol, Ncs); %'
+        {Ncs,Nline,Ncol,Nstr,Nwcs} ->
+            case catch list_to_atom(Nwcs) of
+                A when is_atom(A) ->
+                    Attrs = attributes(Line0, Col0, St, Nstr),
+                    scan1(Ncs, St, Nline, Ncol, [{atom,Attrs,A}|Toks]);
+                _ ->
+                    scan_error({illegal,atom}, Line0, Col0, Nline, Ncol, Ncs)
+            end
+    end.
+
+scan_string0(Cs, #erl_scan{text=false}, Line, no_col=Col, Q, [], Wcs) ->
+    scan_string_no_col(Cs, Line, Col, Q, Wcs);
+scan_string0(Cs, #erl_scan{text=true}, Line, no_col=Col, Q, Str, Wcs) ->
+    scan_string1(Cs, Line, Col, Q, Str, Wcs);
+scan_string0(Cs, St, Line, Col, Q, [], Wcs) ->
+    scan_string_col(Cs, St, Line, Col, Q, Wcs);
+scan_string0(Cs, _St, Line, Col, Q, Str, Wcs) ->
+    scan_string1(Cs, Line, Col, Q, Str, Wcs).
+
+%% Optimization. Col =:= no_col.
+scan_string_no_col([Q|Cs], Line, Col, Q, Wcs) ->
+    {Cs,Line,Col,_DontCare=[],lists:reverse(Wcs)};
+scan_string_no_col([$\n=C|Cs], Line, Col, Q, Wcs) ->
+    scan_string_no_col(Cs, Line+1, Col, Q, [C|Wcs]);
+scan_string_no_col([C|Cs], Line, Col, Q, Wcs) when C =/= $\\, ?UNICODE(C) ->
+    scan_string_no_col(Cs, Line, Col, Q, [C|Wcs]);
+scan_string_no_col(Cs, Line, Col, Q, Wcs) ->
+    scan_string1(Cs, Line, Col, Q, Wcs, Wcs).
+
+%% Optimization. Col =/= no_col.
+scan_string_col([Q|Cs], St, Line, Col, Q, Wcs0) ->
+    Wcs = lists:reverse(Wcs0),
+    Str = ?STR(St, [Q|Wcs++[Q]]),
+    {Cs,Line,Col+1,Str,Wcs};
+scan_string_col([$\n=C|Cs], St, Line, _xCol, Q, Wcs) ->
+    scan_string_col(Cs, St, Line+1, 1, Q, [C|Wcs]);
+scan_string_col([C|Cs], St, Line, Col, Q, Wcs) when C =/= $\\, ?UNICODE(C) ->
+    scan_string_col(Cs, St, Line, Col+1, Q, [C|Wcs]);
+scan_string_col(Cs, _St, Line, Col, Q, Wcs) ->
+    scan_string1(Cs, Line, Col, Q, Wcs, Wcs).
+
+%% Note: in those cases when a 'char_error' tuple is returned below it
+%% is tempting to skip over characters up to the first Q character,
+%% but then the end location of the error tuple would not correspond
+%% to the start location of the returned Rest string. (Maybe the end
+%% location could be modified, but that too is ugly.)
+scan_string1([Q|Cs], Line, Col, Q, Str0, Wcs0) ->
+    Wcs = lists:reverse(Wcs0),
+    Str = [Q|lists:reverse(Str0, [Q])],
+    {Cs,Line,incr_column(Col, 1),Str,Wcs};
+scan_string1([$\n=C|Cs], Line, Col, Q, Str, Wcs) ->
+    Ncol = new_column(Col, 1),
+    scan_string1(Cs, Line+1, Ncol, Q, [C|Str], [C|Wcs]);
+scan_string1([$\\|Cs]=Cs0, Line, Col, Q, Str, Wcs) ->
+    case scan_escape(Cs, Col) of
+        more ->
+            {more,Cs0,Line,Col,Str,Wcs};
+        {error,Ncs,Error,Ncol} ->
+            {char_error,Ncs,Error,Line,Col,incr_column(Ncol, 1)};
+        {eof,Ncol} ->
+            {error,Line,incr_column(Ncol, 1),lists:reverse(Wcs),eof};
+        {nl,Val,ValStr,Ncs,Ncol} ->
+            Nstr = lists:reverse(ValStr, [$\\|Str]),
+            Nwcs = [Val|Wcs],
+            scan_string1(Ncs, Line+1, Ncol, Q, Nstr, Nwcs);
+        {Val,ValStr,Ncs,Ncol} ->
+            Nstr = lists:reverse(ValStr, [$\\|Str]),
+            Nwcs = [Val|Wcs],
+            scan_string1(Ncs, Line, incr_column(Ncol, 1), Q, Nstr, Nwcs)
+    end;
+scan_string1([C|Cs], Line, no_col=Col, Q, Str, Wcs) when ?UNICODE(C) ->
+    scan_string1(Cs, Line, Col, Q, [C|Str], [C|Wcs]);
+scan_string1([C|Cs], Line, Col, Q, Str, Wcs) when ?UNICODE(C) ->
+    scan_string1(Cs, Line, Col+1, Q, [C|Str], [C|Wcs]);
+scan_string1([C|Cs], Line, Col, _Q, _Str, _Wcs) when ?CHAR(C) ->
+    {char_error,Cs,{illegal,character},Line,Col,incr_column(Col, 1)};
+scan_string1([]=Cs, Line, Col, _Q, Str, Wcs) ->
+    {more,Cs,Line,Col,Str,Wcs};
+scan_string1(eof, Line, Col, _Q, _Str, Wcs) ->
+    {error,Line,Col,lists:reverse(Wcs),eof}.
+
+-define(OCT(C), C >= $0, C =< $7).
+-define(HEX(C), C >= $0 andalso C =< $9 orelse
+                C >= $A andalso C =< $F orelse
+                C >= $a andalso C =< $f).
+
+%% \<1-3> octal digits
+scan_escape([O1,O2,O3|Cs], Col) when ?OCT(O1), ?OCT(O2), ?OCT(O3) ->
+    Val = (O1*8 + O2)*8 + O3 - 73*$0,
+    {Val,[O1,O2,O3],Cs,incr_column(Col, 3)};
+scan_escape([O1,O2], _Col) when ?OCT(O1), ?OCT(O2) ->
+    more;
+scan_escape([O1,O2|Cs], Col) when ?OCT(O1), ?OCT(O2) ->
+    Val = (O1*8 + O2) - 9*$0,
+    {Val,[O1,O2],Cs,incr_column(Col, 2)};
+scan_escape([O1], _Col) when ?OCT(O1) ->
+    more;
+scan_escape([O1|Cs], Col) when ?OCT(O1) ->
+    {O1 - $0,[O1],Cs,incr_column(Col, 1)};
+%% \x{<hex digits>}
+scan_escape([$x,${|Cs], Col) ->
+    scan_hex(Cs, incr_column(Col, 2), []);
+scan_escape([$x], _Col) ->
+    more;
+scan_escape([$x|eof], Col) ->
+    {eof,incr_column(Col, 1)};
+%% \x<2> hexadecimal digits
+scan_escape([$x,H1,H2|Cs], Col) when ?HEX(H1), ?HEX(H2) ->
+    Val = erlang:list_to_integer([H1,H2], 16),
+    {Val,[$x,H1,H2],Cs,incr_column(Col, 3)};
+scan_escape([$x,H1], _Col) when ?HEX(H1) ->
+    more;
+scan_escape([$x|Cs], Col) ->
+    {error,Cs,{illegal,character},incr_column(Col, 1)};
+%% \^X -> CTL-X
+scan_escape([$^=C0,$\n=C|Cs], Col) ->
+    {nl,C,[C0,C],Cs,new_column(Col, 1)};
+scan_escape([$^=C0,C|Cs], Col) when ?CHAR(C) ->
+    Val = C band 31,
+    {Val,[C0,C],Cs,incr_column(Col, 2)};
+scan_escape([$^], _Col) ->
+    more;
+scan_escape([$^|eof], Col) ->
+    {eof,incr_column(Col, 1)};
+scan_escape([$\n=C|Cs], Col) ->
+    {nl,C,[C],Cs,new_column(Col, 1)};
+scan_escape([C0|Cs], Col) when ?UNICODE(C0) ->
+    C = escape_char(C0),
+    {C,[C0],Cs,incr_column(Col, 1)};
+scan_escape([C|Cs], Col) when ?CHAR(C) ->
+    {error,Cs,{illegal,character},incr_column(Col, 1)};
+scan_escape([], _Col) ->
+    more;
+scan_escape(eof, Col) ->
+    {eof,Col}.
+
+scan_hex([C|Cs], no_col=Col, Wcs) when ?HEX(C) ->
+    scan_hex(Cs, Col, [C|Wcs]);
+scan_hex([C|Cs], Col, Wcs) when ?HEX(C) ->
+    scan_hex(Cs, Col+1, [C|Wcs]);
+scan_hex(Cs, Col, Wcs) ->
+    scan_esc_end(Cs, Col, Wcs, 16, "x{").
+
+scan_esc_end([$}|Cs], Col, Wcs0, B, Str0) ->
+    Wcs = lists:reverse(Wcs0),
+    case catch erlang:list_to_integer(Wcs, B) of
+        Val when ?UNICODE(Val) ->
+            {Val,Str0++Wcs++[$}],Cs,incr_column(Col, 1)};
+        _ ->
+            {error,Cs,{illegal,character},incr_column(Col, 1)}
+    end;
+scan_esc_end([], _Col, _Wcs, _B, _Str0) ->
+    more;
+scan_esc_end(eof, Col, _Wcs, _B, _Str0) ->
+    {eof,Col};
+scan_esc_end(Cs, Col, _Wcs, _B, _Str0) ->
+    {error,Cs,{illegal,character},Col}.
+
+escape_char($n) -> $\n;                         % \n = LF
+escape_char($r) -> $\r;                         % \r = CR
+escape_char($t) -> $\t;                         % \t = TAB
+escape_char($v) -> $\v;                         % \v = VT
+escape_char($b) -> $\b;                         % \b = BS
+escape_char($f) -> $\f;                         % \f = FF
+escape_char($e) -> $\e;                         % \e = ESC
+escape_char($s) -> $\s;                         % \s = SPC
+escape_char($d) -> $\d;                         % \d = DEL
+escape_char(C) -> C.
+
+scan_number([C|Cs], St, Line, Col, Toks, Ncs) when ?DIGIT(C) ->
+    scan_number(Cs, St, Line, Col, Toks, [C|Ncs]);
+scan_number([$.,C|Cs], St, Line, Col, Toks, Ncs) when ?DIGIT(C) ->
+    scan_fraction(Cs, St, Line, Col, Toks, [C,$.|Ncs]);
+scan_number([$.]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_number/6}};
+scan_number([$#|Cs]=Cs0, St, Line, Col, Toks, Ncs0) ->
+    Ncs = lists:reverse(Ncs0),
+    case catch list_to_integer(Ncs) of
+        B when B >= 2, B =< 1+$Z-$A+10 ->
+            Bcs = ?STR(St, Ncs++[$#]),
+            scan_based_int(Cs, St, Line, Col, Toks, {B,[],Bcs});
+        B ->
+            Len = length(Ncs),
+            scan_error({base,B}, Line, Col, Line, incr_column(Col, Len), Cs0)
+    end;
+scan_number([]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_number/6}};
+scan_number(Cs, St, Line, Col, Toks, Ncs0) ->
+    Ncs = lists:reverse(Ncs0),
+    case catch list_to_integer(Ncs) of
+        N when is_integer(N) ->
+            tok3(Cs, St, Line, Col, Toks, integer, Ncs, N);
+        _ ->
+            Ncol = incr_column(Col, length(Ncs)),
+            scan_error({illegal,integer}, Line, Col, Line, Ncol, Cs)
+    end.
+
+scan_based_int([C|Cs], St, Line, Col, Toks, {B,Ncs,Bcs})
+    when ?DIGIT(C), C < $0+B ->
+    scan_based_int(Cs, St, Line, Col, Toks, {B,[C|Ncs],Bcs});
+scan_based_int([C|Cs], St, Line, Col, Toks, {B,Ncs,Bcs})
+    when C >= $A, B > 10, C < $A+B-10 ->
+    scan_based_int(Cs, St, Line, Col, Toks, {B,[C|Ncs],Bcs});
+scan_based_int([C|Cs], St, Line, Col, Toks, {B,Ncs,Bcs})
+    when C >= $a, B > 10, C < $a+B-10 ->
+    scan_based_int(Cs, St, Line, Col, Toks, {B,[C|Ncs],Bcs});
+scan_based_int([]=Cs, _St, Line, Col, Toks, State) ->
+    {more,{Cs,Col,Toks,Line,State,fun scan_based_int/6}};
+scan_based_int(Cs, St, Line, Col, Toks, {B,Ncs0,Bcs}) ->
+    Ncs = lists:reverse(Ncs0),
+    case catch erlang:list_to_integer(Ncs, B) of
+        N when is_integer(N) ->
+            tok3(Cs, St, Line, Col, Toks, integer, ?STR(St, Bcs++Ncs), N);
+        _ ->
+            Len = length(Bcs)+length(Ncs),
+            Ncol = incr_column(Col, Len),
+            scan_error({illegal,integer}, Line, Col, Line, Ncol, Cs)
+    end.
+
+scan_fraction([C|Cs], St, Line, Col, Toks, Ncs) when ?DIGIT(C) ->
+    scan_fraction(Cs, St, Line, Col, Toks, [C|Ncs]);
+scan_fraction([E|Cs], St, Line, Col, Toks, Ncs) when E =:= $e; E =:= $E ->
+    scan_exponent_sign(Cs, St, Line, Col, Toks, [E|Ncs]);
+scan_fraction([]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_fraction/6}};
+scan_fraction(Cs, St, Line, Col, Toks, Ncs) ->
+    float_end(Cs, St, Line, Col, Toks, Ncs).
+
+scan_exponent_sign([C|Cs], St, Line, Col, Toks, Ncs) when C =:= $+; C =:= $- ->
+    scan_exponent(Cs, St, Line, Col, Toks, [C|Ncs]);
+scan_exponent_sign([]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_exponent_sign/6}};
+scan_exponent_sign(Cs, St, Line, Col, Toks, Ncs) ->
+    scan_exponent(Cs, St, Line, Col, Toks, Ncs).
+
+scan_exponent([C|Cs], St, Line, Col, Toks, Ncs) when ?DIGIT(C) ->
+    scan_exponent(Cs, St, Line, Col, Toks, [C|Ncs]);
+scan_exponent([]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_exponent/6}};
+scan_exponent(Cs, St, Line, Col, Toks, Ncs) ->
+    float_end(Cs, St, Line, Col, Toks, Ncs).
+
+float_end(Cs, St, Line, Col, Toks, Ncs0) ->
+    Ncs = lists:reverse(Ncs0),
+    case catch list_to_float(Ncs) of
+        F when is_float(F) ->
+            tok3(Cs, St, Line, Col, Toks, float, Ncs, F);
+        _ ->
+            Ncol = incr_column(Col, length(Ncs)),
+            scan_error({illegal,float}, Line, Col, Line, Ncol, Cs)
+    end.
+
+skip_comment([C|Cs], St, Line, Col, Toks, N) when C =/= $\n, ?CHAR(C) ->
+    case ?UNICODE(C) of
+        true ->
+            skip_comment(Cs, St, Line, Col, Toks, N+1);
+        false ->
+            Ncol = incr_column(Col, N+1),
+            scan_error({illegal,character}, Line, Col, Line, Ncol, Cs)
+    end;
+skip_comment([]=Cs, _St, Line, Col, Toks, N) ->
+    {more,{Cs,Col,Toks,Line,N,fun skip_comment/6}};
+skip_comment(Cs, St, Line, Col, Toks, N) ->
+    scan1(Cs, St, Line, incr_column(Col, N), Toks).
+
+scan_comment([C|Cs], St, Line, Col, Toks, Ncs) when C =/= $\n, ?CHAR(C) ->
+    case ?UNICODE(C) of
+        true ->
+            scan_comment(Cs, St, Line, Col, Toks, [C|Ncs]);
+        false ->
+            Ncol = incr_column(Col, length(Ncs)+1),
+            scan_error({illegal,character}, Line, Col, Line, Ncol, Cs)
+    end;
+scan_comment([]=Cs, _St, Line, Col, Toks, Ncs) ->
+    {more,{Cs,Col,Toks,Line,Ncs,fun scan_comment/6}};
+scan_comment(Cs, St, Line, Col, Toks, Ncs0) ->
+    Ncs = lists:reverse(Ncs0),
+    tok3(Cs, St, Line, Col, Toks, comment, Ncs, Ncs).
+
+tok2(Cs, #erl_scan{text = false}=St, Line, no_col=Col, Toks, _Wcs, P) ->
+    scan1(Cs, St, Line, Col, [{P,Line}|Toks]);
+tok2(Cs, St, Line, Col, Toks, Wcs, P) ->
+    Attrs = attributes(Line, Col, St, Wcs),
+    scan1(Cs, St, Line, incr_column(Col, length(Wcs)), [{P,Attrs}|Toks]).
+
+tok2(Cs, #erl_scan{text = false}=St, Line, no_col=Col, Toks, _Wcs, P, _N) ->
+    scan1(Cs, St, Line, Col, [{P,Line}|Toks]);
+tok2(Cs, St, Line, Col, Toks, Wcs, P, N) ->
+    Attrs = attributes(Line, Col, St, Wcs),
+    scan1(Cs, St, Line, incr_column(Col, N), [{P,Attrs}|Toks]).
+
+tok3(Cs, #erl_scan{text = false}=St, Line, no_col=Col, Toks, Item, _S, Sym) ->
+    scan1(Cs, St, Line, Col, [{Item,Line,Sym}|Toks]);
+tok3(Cs, St, Line, Col, Toks, Item, String, Sym) ->
+    Token = {Item,attributes(Line, Col, St, String),Sym},
+    scan1(Cs, St, Line, incr_column(Col, length(String)), [Token|Toks]).
+
+tok3(Cs, #erl_scan{text = false}=St, Line, no_col=Col, Toks, Item,
+     _String, Sym, _Length) ->
+    scan1(Cs, St, Line, Col, [{Item,Line,Sym}|Toks]);
+tok3(Cs, St, Line, Col, Toks, Item, String, Sym, Length) ->
+    Token = {Item,attributes(Line, Col, St, String),Sym},
+    scan1(Cs, St, Line, incr_column(Col, Length), [Token|Toks]).
+
+scan_error(Error, Line, Col, EndLine, EndCol, Rest) ->
+    Loc = location(Line, Col),
+    EndLoc = location(EndLine, EndCol),
+    scan_error(Error, Loc, EndLoc, Rest).
+
+scan_error(Error, ErrorLoc, EndLoc, Rest) ->
+    {{error,{ErrorLoc,?MODULE,Error},EndLoc},Rest}.
+
+-compile({inline,[attributes/4]}).
+
+attributes(Line, no_col, #erl_scan{text = false}, _String) ->
+    Line;
+attributes(Line, no_col, #erl_scan{text = true}, String) ->
+    [{line,Line},{text,String}];
+attributes(Line, Col, #erl_scan{text = false}, _String) ->
+    {Line,Col};
+attributes(Line, Col, #erl_scan{text = true}, String) ->
+    [{line,Line},{column,Col},{text,String}].
+
+location(Line, no_col) ->
+    Line;
+location(Line, Col) when is_integer(Col) ->
+    {Line,Col}.
+
+-compile({inline,[incr_column/2,new_column/2]}).
+
+incr_column(no_col=Col, _N) ->
+    Col;
+incr_column(Col, N) when is_integer(Col) ->
+    Col + N.
+
+new_column(no_col=Col, _Ncol) ->
+    Col;
+new_column(Col, Ncol) when is_integer(Col) ->
+    Ncol.
+
+nl_spcs(2)  -> "\n ";
+nl_spcs(3)  -> "\n  ";
+nl_spcs(4)  -> "\n   ";
+nl_spcs(5)  -> "\n    ";
+nl_spcs(6)  -> "\n     ";
+nl_spcs(7)  -> "\n      ";
+nl_spcs(8)  -> "\n       ";
+nl_spcs(9)  -> "\n        ";
+nl_spcs(10) -> "\n         ";
+nl_spcs(11) -> "\n          ";
+nl_spcs(12) -> "\n           ";
+nl_spcs(13) -> "\n            ";
+nl_spcs(14) -> "\n             ";
+nl_spcs(15) -> "\n              ";
+nl_spcs(16) -> "\n               ";
+nl_spcs(17) -> "\n                ".
+
+spcs(1)  -> " ";
+spcs(2)  -> "  ";
+spcs(3)  -> "   ";
+spcs(4)  -> "    ";
+spcs(5)  -> "     ";
+spcs(6)  -> "      ";
+spcs(7)  -> "       ";
+spcs(8)  -> "        ";
+spcs(9)  -> "         ";
+spcs(10) -> "          ";
+spcs(11) -> "           ";
+spcs(12) -> "            ";
+spcs(13) -> "             ";
+spcs(14) -> "              ";
+spcs(15) -> "               ";
+spcs(16) -> "                ".
+
+nl_tabs(2)  -> "\n\t";
+nl_tabs(3)  -> "\n\t\t";
+nl_tabs(4)  -> "\n\t\t\t";
+nl_tabs(5)  -> "\n\t\t\t\t";
+nl_tabs(6)  -> "\n\t\t\t\t\t";
+nl_tabs(7)  -> "\n\t\t\t\t\t\t";
+nl_tabs(8)  -> "\n\t\t\t\t\t\t\t";
+nl_tabs(9)  -> "\n\t\t\t\t\t\t\t\t";
+nl_tabs(10) -> "\n\t\t\t\t\t\t\t\t\t";
+nl_tabs(11) -> "\n\t\t\t\t\t\t\t\t\t\t".
+
+tabs(1)  ->  "\t";
+tabs(2)  ->  "\t\t";
+tabs(3)  ->  "\t\t\t";
+tabs(4)  ->  "\t\t\t\t";
+tabs(5)  ->  "\t\t\t\t\t";
+tabs(6)  ->  "\t\t\t\t\t\t";
+tabs(7)  ->  "\t\t\t\t\t\t\t";
+tabs(8)  ->  "\t\t\t\t\t\t\t\t";
+tabs(9)  ->  "\t\t\t\t\t\t\t\t\t";
+tabs(10) ->  "\t\t\t\t\t\t\t\t\t\t".
+
+-spec reserved_word(Atom :: atom()) -> boolean().
+reserved_word('after') -> true;
+reserved_word('begin') -> true;
+reserved_word('case') -> true;
+reserved_word('try') -> true;
+reserved_word('cond') -> true;
+reserved_word('catch') -> true;
+reserved_word('andalso') -> true;
+reserved_word('orelse') -> true;
+reserved_word('end') -> true;
+reserved_word('fun') -> true;
+reserved_word('if') -> true;
+reserved_word('let') -> true;
+reserved_word('of') -> true;
+reserved_word('receive') -> true;
+reserved_word('when') -> true;
+reserved_word('bnot') -> true;
+reserved_word('not') -> true;
+reserved_word('div') -> true;
+reserved_word('rem') -> true;
+reserved_word('band') -> true;
+reserved_word('and') -> true;
+reserved_word('bor') -> true;
+reserved_word('bxor') -> true;
+reserved_word('bsl') -> true;
+reserved_word('bsr') -> true;
+reserved_word('or') -> true;
+reserved_word('xor') -> true;
+reserved_word(_) -> false.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl b/lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl
index 9e695cec1d..e9f7ad825b 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/multiple_wrong_opaques.erl
@@ -2,7 +2,7 @@
 
 -export([weird/1]).
 
--spec weird(dict() | gb_tree()) -> 42.
+-spec weird(dict:dict() | gb_trees:tree()) -> 42.
 
 weird(gazonk) -> 42.
 
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_adt.erl
index 3456f0e9c6..cdcaa5f9e8 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/opaque/opaque_adt.erl
@@ -3,6 +3,8 @@
 
 -opaque abc() :: 'a' | 'b' | 'c'.
 
+-spec atom_or_list(_) -> abc() | list().
+
 atom_or_list(1) -> a;
 atom_or_list(2) -> b;
 atom_or_list(3) -> c;
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para1.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para1.erl
new file mode 100644
index 0000000000..68e2c60368
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para1.erl
@@ -0,0 +1,93 @@
+-module(para1).
+
+-compile(export_all).
+
+%% Parameterized opaque types
+
+-export_type([t/0, t/1]).
+
+-opaque t() :: {integer(), integer()}.
+
+-opaque t(A) :: {A, A}.
+
+-type y(A) :: {A, A}.
+
+tt1() ->
+    I = t1(),
+    A = t2(),
+    A =:= I. % never 'true'
+
+tt2() ->
+    I = t0(),
+    A = t2(),
+    A =:= I. % never 'true'
+
+tt3() ->
+    I1 = t0(),
+    I2 = t1(),
+    I1 =:= I2. % never true
+
+tt4() ->
+    I1 = y1(),
+    I2 = y2(),
+    I1 =:= I2. % cannot evaluate to true
+
+adt_tt1() ->
+    I = adt_t1(),
+    A = adt_t2(),
+    A =:= I. % opaque attempt
+
+adt_tt2() ->
+    I = adt_t0(),
+    A = adt_t2(),
+    A =:= I. % opaque attempt
+
+adt_tt3() ->
+    I1 = adt_t0(),
+    I2 = adt_t1(),
+    I1 =:= I2. % opaque attempt
+
+adt_tt4() ->
+    I1 = adt_y1(),
+    I2 = adt_y2(),
+    I1 =:= I2. % cannot evaluate to true
+
+-spec t0() -> t().
+
+t0() ->
+    {3, 2}.
+
+-spec t1() -> t(integer()).
+
+t1() ->
+    {3, 3}.
+
+-spec t2() -> t(atom()).
+
+t2() ->
+    {a, b}.
+
+-spec y1() -> y(integer()).
+
+y1() ->
+    {3, 2}.
+
+-spec y2() -> y(atom()).
+
+y2() ->
+    {a, b}.
+
+adt_t0() ->
+    para1_adt:t0().
+
+adt_t1() ->
+    para1_adt:t1().
+
+adt_t2() ->
+    para1_adt:t2().
+
+adt_y1() ->
+    para1_adt:y1().
+
+adt_y2() ->
+    para1_adt:y2().
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para1_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para1_adt.erl
new file mode 100644
index 0000000000..95ac6b7982
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para1_adt.erl
@@ -0,0 +1,36 @@
+-module(para1_adt).
+
+-export([t0/0, t1/0, t2/0, y1/0, y2/0]).
+
+-export_type([t/0, t/1, y/1]).
+
+-opaque t() :: {integer(), integer()}.
+
+-opaque t(A) :: {A, A}.
+
+-type y(A) :: {A, A}.
+
+-spec t0() -> t().
+
+t0() ->
+    {3, 2}.
+
+-spec t1() -> t(integer()).
+
+t1() ->
+    {3, 3}.
+
+-spec t2() -> t(atom()).
+
+t2() ->
+    {a, b}.
+
+-spec y1() -> y(integer()).
+
+y1() ->
+    {3, 2}.
+
+-spec y2() -> y(atom()).
+
+y2() ->
+    {a, b}.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para2.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para2.erl
new file mode 100644
index 0000000000..09b2235fa5
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para2.erl
@@ -0,0 +1,123 @@
+-module(para2).
+
+-compile(export_all).
+
+%% More parameterized opaque types
+
+-export_type([strange/1]).
+
+-export_type([c1/0, c2/0]).
+
+-export_type([circ/1, circ/2]).
+
+-opaque strange(A) :: {B, B, A}.
+
+-spec t(strange(integer())) -> strange(atom()).
+
+t({3, 4, 5}) ->
+    {a, b, c}.
+
+-opaque c1() :: c2().
+-opaque c2() :: c1().
+
+c() ->
+    A = c1(),
+    B = c2(),
+    A =:= B.
+
+t() ->
+    A = ct1(),
+    B = ct2(),
+    A =:= B. % can never evaluate to 'true'
+
+-spec c1() -> c1().
+
+c1() ->
+    a.
+
+-spec c2() -> c2().
+
+c2() ->
+    a.
+
+-type ct1() :: ct2().
+-type ct2() :: ct1().
+
+-spec ct1() -> ct1().
+
+ct1() ->
+    a.
+
+-spec ct2() -> ct2().
+
+ct2() ->
+    b.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+c_adt() ->
+    A = c1_adt(),
+    B = c2_adt(),
+    A =:= B. % opaque attempt
+
+t_adt() ->
+    A = ct1_adt(),
+    B = ct2_adt(),
+    A =:= B. % can never evaluate to true
+
+c1_adt() ->
+    para2_adt:c1().
+
+c2_adt() ->
+    para2_adt:c2().
+
+ct1_adt() ->
+    para2_adt:ct1().
+
+ct2_adt() ->
+    para2_adt:ct2().
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-opaque circ(A) :: circ(A, A).
+-opaque circ(A, B) :: circ({A, B}).
+
+tcirc() ->
+    A = circ1(),
+    B = circ2(),
+    A =:= B. % can never evaluate to 'true' (but the types are not OK, or?)
+
+-spec circ1() -> circ(integer()).
+
+circ1() ->
+    3.
+
+-spec circ2() -> circ(integer(), integer()).
+
+circ2() ->
+    {3, 3}.
+
+tcirc_adt() ->
+    A = circ1_adt(),
+    B = circ2_adt(),
+    A =:= B. % opaque attempt (one would expect them to be the same...)
+
+circ1_adt() ->
+    para2_adt:circ1().
+
+circ2_adt() ->
+    para2_adt:circ2().
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+u_adt() ->
+    A = u1_adt(),
+    B = u2_adt(),
+    %% The resulting types are equal, but not the parameters:
+    A =:= B. % opaque attempt
+
+u1_adt() ->
+    para2_adt:u1().
+
+u2_adt() ->
+    para2_adt:u2().
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para2_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para2_adt.erl
new file mode 100644
index 0000000000..96df437c67
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para2_adt.erl
@@ -0,0 +1,64 @@
+-module(para2_adt).
+
+%% More parameterized opaque types
+
+-export_type([c1/0, c2/0]).
+
+-export_type([ct1/0, ct2/0]).
+
+-export_type([circ/1, circ/2]).
+
+-export_type([un/2]).
+
+-export([c1/0, c2/0, ct1/0, ct2/0, circ1/0, circ2/0, u1/0, u2/0]).
+
+-opaque c1() :: c2().
+-opaque c2() :: c1().
+
+-spec c1() -> c1().
+
+c1() ->
+    a.
+
+-spec c2() -> c2().
+
+c2() ->
+    a.
+
+-type ct1() :: ct2().
+-type ct2() :: ct1().
+
+-spec ct1() -> ct1().
+
+ct1() ->
+    a.
+
+-spec ct2() -> ct2().
+
+ct2() ->
+    b.
+
+-opaque circ(A) :: circ(A, A).
+-opaque circ(A, B) :: circ({A, B}).
+
+-spec circ1() -> circ(integer()).
+
+circ1() ->
+    3.
+
+-spec circ2() -> circ(integer(), integer()).
+
+circ2() ->
+    {3, 3}.
+
+-opaque un(A, B) :: A | B.
+
+-spec u1() -> un(integer(), atom()).
+
+u1() ->
+    3.
+
+-spec u2() -> un(atom(), integer()).
+
+u2() ->
+    3.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para3.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para3.erl
new file mode 100644
index 0000000000..792ae40d39
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para3.erl
@@ -0,0 +1,77 @@
+-module(para3).
+
+-export([t/0, t1/1, t2/0, ot1/1, ot2/0, t1_adt/0, t2_adt/0]).
+
+-export([exp_adt/0]).
+
+%% More opaque tests.
+
+-export_type([ot1/0, ot1/1, ot1/2, ot1/3, ot1/4, ot1/5]).
+
+-opaque ot1() :: {ot1(_)}.
+
+-opaque ot1(A) :: {ot1(A, A)}.
+
+-opaque ot1(A, B) :: {ot1(A, B, A)}.
+
+-opaque ot1(A, B, C) :: {ot1(A, B, C, A)}.
+
+-opaque ot1(A, B, C, D) :: {ot1(A, B, C, D, A)}.
+
+-opaque ot1(A, B, C, D, E) :: {A, B, C, D, E}.
+
+-spec ot1(_) -> ot1().
+
+ot1(A) ->
+    {{{{{A, A, A, A, A}}}}}.
+
+-spec ot2() -> ot1(). % invalid type spec
+
+ot2() ->
+    foo.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+t() ->
+    {{{17}}} = t1(3). %% pattern can never match
+
+-type t1() :: {t1(_)}.
+
+-type t1(A) :: {t1(A, A)}.
+
+-type t1(A, B) :: {t1(A, B, A)}.
+
+-type t1(A, B, C) :: {t1(A, B, C, A)}.
+
+-type t1(A, B, C, D) :: {t1(A, B, C, D, A)}.
+
+-type t1(A, B, C, D, E) :: {A, B, C, D, E}.
+
+-spec t1(_) -> t1().
+
+t1(A) ->
+    {{{{{A, A, A, A, A}}}}}.
+
+-spec t2() -> t1(). % invalid type spec
+
+t2() ->
+    foo.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Shows that the list TypeNames in t_from_form must include ArgsLen.
+
+t1_adt() ->
+    {{{{{17}}}}} = para3_adt:t1(3). % breaks the opaqueness
+
+t2_adt() ->
+    {{{{17}}}} = para3_adt:t1(3). % can never match
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-type exp() :: para3_adt:exp1(para3_adt:exp2()).
+
+-spec exp_adt() -> exp().
+
+exp_adt() ->
+    3.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/para/para3_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/para/para3_adt.erl
new file mode 100644
index 0000000000..3919b846e6
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/para/para3_adt.erl
@@ -0,0 +1,27 @@
+-module(para3_adt).
+
+-export([t1/1]).
+
+-export_type([t1/0, t1/1, t1/2, t1/3, t1/4, ot1/5]).
+
+-export_type([exp1/1, exp2/0]).
+
+-type t1() :: {t1(_)}.
+
+-type t1(A) :: {t1(A, A)}.
+
+-type t1(A, B) :: {t1(A, B, A)}.
+
+-type t1(A, B, C) :: {t1(A, B, C, A)}.
+
+-type t1(A, B, C, D) :: {ot1(A, B, C, D, A)}.
+
+-opaque ot1(A, B, C, D, E) :: {A, B, C, D, E}.
+
+-spec t1(_) -> t1().
+
+t1(A) ->
+    {{{{{A, A, A, A, A}}}}}.
+
+-opaque exp1(T) :: T.
+-opaque exp2() :: integer().
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/exact_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/exact_adt.erl
new file mode 100644
index 0000000000..7103847ae7
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/exact_adt.erl
@@ -0,0 +1,17 @@
+-module(exact_adt).
+
+-export([exact_adt_set_type/1, exact_adt_set_type2/1]).
+
+-export_type([exact_adt/0]).
+
+-record(exact_adt, {}).
+
+-opaque exact_adt() :: #exact_adt{}.
+
+-spec exact_adt_set_type(_) -> exact_adt().
+
+exact_adt_set_type(G) -> G.
+
+-spec exact_adt_set_type2(exact_adt()) -> exact_adt().
+
+exact_adt_set_type2(G) -> G.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/exact_api.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/exact_api.erl
new file mode 100644
index 0000000000..c19330eb30
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/exact_api.erl
@@ -0,0 +1,60 @@
+-module(exact_api).
+
+-export([new/0, exact_api_test/1, exact_api_new/1,
+         exact_adt_test/1, exact_adt_new/1]).
+
+-export_type([exact_api/0]).
+
+-record(digraph, {vtab = notable :: ets:tab(),
+		  etab = notable :: ets:tab(),
+		  ntab = notable :: ets:tab(),
+	          cyclic = true  :: boolean()}).
+
+-spec new() -> digraph:graph().
+
+new() ->
+    A = #digraph{},
+    set_type(A), % does not have an opaque term as 1st argument
+    A.
+
+-spec set_type(digraph:graph()) -> true.
+
+set_type(G) ->
+    digraph:delete(G).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%% The derived spec of exact_api_new() is
+%%% -spec exact_api_new(exact_api:exact_api()) -> exact_api:exact_api().
+%%% This won't happen unless dialyzer_typesig uses
+%%% t_is_exactly_equal() rather than t_is_equal().
+%%% [As of R17B the latter considers two types equal if nothing but
+%%%  their ?opaque tags differ.]
+
+-record(exact_api, {}).
+
+-opaque exact_api() :: #exact_api{}.
+
+exact_api_test(X) ->
+    #exact_api{} = exact_api_set_type(X). % OK
+
+exact_api_new(A) ->
+    A = #exact_api{},
+    _ = exact_api_set_type(A), % OK (the opaque type is local)
+    A.
+
+-spec exact_api_set_type(exact_api()) -> exact_api().
+
+exact_api_set_type(#exact_api{}=E) -> E.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-record(exact_adt, {}).
+
+exact_adt_test(X) ->
+    #exact_adt{} = exact_adt:exact_adt_set_type(X). % breaks the opaqueness
+
+exact_adt_new(A) ->
+    A = #exact_adt{},
+    _ = exact_adt:exact_adt_set_type2(A), % does not have an opaque term as 1st argument
+    A.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/is_rec.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/is_rec.erl
new file mode 100644
index 0000000000..2b157483bc
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/is_rec.erl
@@ -0,0 +1,65 @@
+-module(is_rec).
+
+-export([ri1/0, ri11/0, ri13/0, ri14/0, ri2/0, ri3/0, ri4/0, ri5/0,
+         ri6/0, ri7/0, ri8/0]).
+
+-record(r, {f1 :: integer()}).
+
+ri1() ->
+    A = simple1_adt:d1(),
+    is_record(A, r). % opaque term 1
+
+ri11() ->
+    A = simple1_adt:d1(),
+    I = '1-3'(),
+    is_record(A, r, I). % opaque term 1
+
+ri13() ->
+    A = simple1_adt:d1(),
+    if is_record(A, r) -> true end. % breaks the opaqueness
+
+ri14() ->
+    A = simple1_adt:d1(),
+    if is_record({A, 1}, r) -> true end. % breaks the opaqueness
+
+-type '1-3-t'() :: 1..3.
+
+-spec '1-3'() -> '1-3-t'().
+
+'1-3'() ->
+    random:uniform(3).
+
+
+-spec 'Atom'() -> atom().
+
+'Atom'() ->
+    a.
+
+ri2() ->
+    A = simple1_adt:d1(),
+    R = 'Atom'(),
+    is_record(A, R). % opaque term 1
+
+ri3() ->
+    A = simple1_adt:d1(),
+    is_record(A, A, 1). % opaque term 2
+
+ri4() ->
+    A = simple1_adt:d1(),
+    is_record(A, hipp:hopp(), 1). % opaque term 1
+
+ri5() ->
+    A = simple1_adt:d1(),
+    is_record(A, A, hipp:hopp()). % opaque term 2
+
+ri6() ->
+    A = simple1_adt:d1(),
+    if is_record(A, r) -> true end. % breaks opaqueness
+
+ri7() ->
+    A = simple1_adt:d1(),
+    if is_record({r, A}, r) -> true end. % A violates #r{}
+
+ri8() ->
+    A = simple1_adt:d1(),
+    is_record({A, 1}, r). % opaque term 1
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/rec_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/rec_adt.erl
new file mode 100644
index 0000000000..ff80d6e99b
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/rec_adt.erl
@@ -0,0 +1,28 @@
+-module(rec_adt).
+
+-export([f/0, r1/0]).
+
+-export_type([r1/0]).
+
+-export_type([f/0, op_t/0, a/0]).
+
+-opaque a() :: a | b.
+
+-record(r1,
+        {f1 :: a()}).
+
+-opaque r1() :: #r1{}.
+
+-opaque f() :: fun((_) -> _).
+
+-opaque op_t() :: integer().
+
+-spec f() -> f().
+
+f() ->
+    fun(_) -> 3 end.
+
+-spec r1() -> r1().
+
+r1() ->
+    #r1{f1 = a}.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/rec_api.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/rec_api.erl
new file mode 100644
index 0000000000..d9b1d59f0c
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/rec_api.erl
@@ -0,0 +1,77 @@
+-module(rec_api).
+
+-export([t1/0, t2/0, adt_t1/0, adt_t1/1, adt_r1/0,
+         t/1, t_adt/0, r/0, r_adt/0]).
+
+-export_type([{a,0},{r1,0}]).
+
+-export_type([f/0, op_t/0, r/0, tup/0]).
+
+-opaque a() :: a | b.
+
+-record(r1,
+        {f1 :: a()}).
+
+-opaque r1() :: #r1{}.
+
+t1() ->
+    A = #r1{f1 = a},
+    {r1, a} = A.
+
+t2() ->
+    A = {r1, 10}, % violates the type of #r1{}
+    {r1, 10} = A. % violates the type of #r1{}
+
+adt_t1() ->
+    R = rec_adt:r1(),
+    {r1, a} = R. % breaks the opaqueness
+
+-spec adt_t1(rec_adt:r1()) -> rec_adt:r1(). % invalid type spec
+
+adt_t1(R) ->
+    {r1, a} = R.
+
+-spec adt_r1() -> rec_adt:r1(). % invalid type spec
+
+adt_r1() ->
+    #r1{f1 = a}.
+
+-opaque f() :: fun((_) -> _).
+
+-opaque op_t() :: integer().
+
+-spec t(f()) -> _.
+
+t(A) ->
+    T = term(),
+    %% 3(T), % cannot test this: dialyzer_dep deliberately crashes
+    A(T).
+
+-spec term() -> op_t().
+
+term() ->
+    3.
+
+t_adt() ->
+    A = rec_adt:f(),
+    T = term(),
+    A(T).
+
+-record(r, {f = fun(_) -> 3 end :: f(), o = 1 :: op_t()}).
+
+-opaque r() :: #r{}.
+
+-opaque tup() :: {'r', f(), op_t()}.
+
+-spec r() -> _.
+
+r() ->
+    {r, f(), 2}. % OK, f() is a local opaque type
+
+-spec f() -> f().
+
+f() ->
+    fun(_) -> 3 end.
+
+r_adt() ->
+    {r, rec_adt:f(), 2}. % breaks the opaqueness
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple1_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple1_adt.erl
new file mode 100644
index 0000000000..21a277c1e9
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple1_adt.erl
@@ -0,0 +1,138 @@
+-module(simple1_adt).
+
+-export([d1/0, d2/0, i/0, n1/0, n2/0, o1/0, o2/0,
+         c1/0, c2/0, bit1/0, a/0, i1/0, tuple/0,
+         b1/0, b2/0, ty_i1/0]).
+
+-export_type([o1/0, o2/0, d1/0, d2/0]).
+
+-export_type([i1/0, i2/0, di1/0, di2/0]).
+
+-export_type([ty_i1/0, c1/0, c2/0]).
+
+-export_type([b1/0, b2/0]).
+
+-export_type([bit1/0]).
+
+-export_type([tuple1/0, a/0, i/0]).
+
+%% Equal:
+
+-opaque o1() :: a | b | c.
+
+-opaque o2() :: a | b | c.
+
+%% Disjoint:
+
+-opaque d1() :: a | b | c.
+
+-opaque d2() :: d | e | f.
+
+%% One common element:
+
+-opaque c1() :: a | b | c.
+
+-opaque c2() :: c | e | f.
+
+%% Equal integer range:
+
+-opaque i1() :: 1 | 2.
+
+-opaque i2() :: 1 | 2.
+
+%% Disjoint integer range:
+
+-opaque di1() :: 1 | 2.
+
+-opaque di2() :: 3 | 4.
+
+
+-type ty_i1() :: 1 | 2.
+
+%% Boolean types
+
+-opaque b1() :: boolean().
+
+-opaque b2() :: boolean().
+
+%% Binary types
+
+-opaque bit1() :: binary().
+
+%% Tuple types
+
+-opaque tuple1() :: tuple().
+
+%% Atom type
+
+-opaque a() :: atom().
+
+-opaque i() :: integer().
+
+-spec d1() -> d1().
+
+d1() -> a.
+
+-spec d2() -> d2().
+
+d2() -> d.
+
+-spec i() -> i().
+
+i() ->
+    1.
+
+-spec n1() -> o1().
+
+n1() -> a.
+
+-spec n2() -> o2().
+
+n2() -> a.
+
+-spec o1() -> o1().
+
+o1() -> a.
+
+-spec o2() -> o2().
+
+o2() -> a.
+
+-spec c1() -> c1().
+
+c1() -> a.
+
+-spec c2() -> c2().
+
+c2() -> e.
+
+-spec bit1() -> bit1().
+
+bit1() ->
+    <<"hej">>.
+
+-spec a() -> a().
+
+a() ->
+    e.
+
+-spec i1() -> i1().
+
+i1() -> 1.
+
+-spec tuple() -> tuple1().
+
+tuple() -> {1,2}.
+
+-spec b1() -> b1().
+
+b1() -> true.
+
+-spec b2() -> b2().
+
+b2() -> false.
+
+-spec ty_i1() -> ty_i1().
+
+ty_i1() ->
+    1.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple1_api.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple1_api.erl
new file mode 100644
index 0000000000..5135eb8e59
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple1_api.erl
@@ -0,0 +1,571 @@
+-module(simple1_api).
+
+-export([t1/1, adt_t1/1, t2/1, adt_t2/1, tup/0, t3/0, t4/0, t5/0, t6/0, t7/0,
+         t8/0, adt_t3/0, adt_t4/0, adt_t7/0, adt_t8/0, adt_t5/0,
+         c1/2, c2/2, c2/0, c3/0, c4/0, tt1/0, tt2/0,
+         cmp1/0, cmp2/0, cmp3/0, cmp4/0,
+         ty_cmp1/0, ty_cmp2/0, ty_cmp3/0, ty_cmp4/0,
+         f1/0, f2/0, adt_f1/0, adt_f2/0, f3/0, f4/0, adt_f3/0, adt_f4/0,
+         adt_f4_a/0, adt_f4_b/0,
+         bool_t1/0, bool_t2/0, bool_t3/0, bool_t4/0, bool_t5/1, bool_t6/1,
+         bool_t7/0, bool_adt_t1/0, bool_adt_t2/0, bool_adt_t5/1,
+         bool_adt_t6/1, bool_t8/0, bool_adt_t8/2, bool_t9/0, bool_adt_t9/2,
+         bit_t1/0, bit_adt_t1/0, bit_t3/1, bit_adt_t2/0, bit_adt_t3/1,
+         bit_t5/1, bit_t4/1, bit_adt_t4/1, bit_t5/0, bit_adt_t5/0,
+         call_f/1, call_f_adt/1, call_m_adt/1, call_m/1, call_f_i/1,
+         call_m_i/1, call_m_adt_i/1, call_f_adt_i/1,
+         eq1/0, eq2/0, c5/0, c6/2, c7/2, c8/0]).
+
+%%% Equal opaque types
+
+-export_type([o1/0, o2/0]).
+
+-export_type([d1/0, d2/0]).
+
+-opaque o1() :: a | b | c.
+
+-opaque o2() :: a | b | c.
+
+-export_type([i1/0, i2/0, di1/0, di2/0]).
+
+-export_type([b1/0, b2/0]).
+
+-export_type([bit1/0]).
+
+-export_type([a/0, i/0]).
+
+%% The derived spec is
+%%  -spec t1('a' | 'b') -> simple1_api:o1('a') | simple1_api:o2('a').
+%% but that is not tested...
+
+t1(a) ->
+    o1();
+t1(b) ->
+    o2().
+
+-spec o1() -> o1().
+
+o1() -> a.
+
+-spec o2() -> o2().
+
+o2() -> a.
+
+%% The derived spec is
+%% -spec adt_t1('a' | 'b') -> simple1_adt:o1('a') | simple1_adt:o2('a').
+%% but that is not tested...
+
+adt_t1(a) ->
+    simple1_adt:o1();
+adt_t1(b) ->
+    simple1_adt:o2().
+
+%%% Disjunct opaque types
+
+-opaque d1() :: a | b | c.
+
+-opaque d2() :: d | e | f.
+
+%% -spec t2('a' | 'b') -> simple1_api:d1('a') | simple1_api:d2('d').
+
+t2(a) ->
+    d1();
+t2(b) ->
+    d2().
+
+-spec d1() -> d1().
+
+d1() -> a.
+
+-spec d2() -> d2().
+
+d2() -> d.
+
+%% -spec adt_t2('a' | 'b') -> simple1_adt:d1('a') | simple1_adt:d2('d').
+
+adt_t2(a) ->
+    simple1_adt:d1();
+adt_t2(b) ->
+    simple1_adt:d2().
+
+-spec tup() -> simple1_adt:tuple1(). % invalid type spec
+
+tup() ->
+    {a, b}.
+
+%%% Matching equal opaque types with different names
+
+t3() ->
+    A = n1(),
+    B = n2(),
+    A = A, % OK, of course
+    A = B. % OK since o1() and o2() are local opaque types
+
+t4() ->
+    A = n1(),
+    B = n2(),
+    true = A =:= A, % OK, of course
+    A =:= B. % OK since o1() and o2() are local opaque types
+
+t5() ->
+    A = d1(),
+    B = d2(),
+    A =:= B. % can never evaluate to true
+
+t6() ->
+    A = d1(),
+    B = d2(),
+    A = B. % can never succeed
+
+t7() ->
+    A = d1(),
+    B = d2(),
+    A =/= B. % OK (always true?)
+
+t8() ->
+    A = d1(),
+    B = d2(),
+    A /= B. % OK (always true?)
+
+-spec n1() -> o1().
+
+n1() -> a.
+
+-spec n2() -> o2().
+
+n2() -> a.
+
+adt_t3() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    true = A =:= A, % OK.
+    A =:= B. % opaque test, not OK
+
+adt_t4() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    A = A, % OK
+    A = B. % opaque term
+
+adt_t7() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    false = A =/= A, % OK
+    A =/= B. % opaque test, not OK
+
+adt_t8() ->
+    A = simple1_adt:n1(),
+    B = simple1_adt:n2(),
+    false = A /= A, % OK
+    A /= B. % opaque test, not OK
+
+adt_t5() ->
+    A = simple1_adt:c1(),
+    B = simple1_adt:c2(),
+    A =:= B. % opaque test, not OK
+
+%% Comparison in guard
+
+-spec c1(simple1_adt:d1(), simple1_adt:d2()) -> boolean().
+
+c1(A, B) when A =< B -> true. % succ type of A and B is any() (type spec is OK)
+
+-spec c2(simple1_adt:d1(), simple1_adt:d2()) -> boolean().
+
+c2(A, B) ->
+    if A =< B -> true end. % succ type of A and B is any() (type spec is OK)
+
+c2() ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:d2(),
+    if A =< B -> ok end. % opaque term
+
+c3() ->
+    B = simple1_adt:d2(),
+    if a =< B -> ok end. % opaque term
+
+c4() ->
+    A = simple1_adt:d1(),
+    if A =< d -> ok end. % opaque term
+
+tt1() ->
+    A = o1(),
+    is_integer(A). % OK
+
+tt2() ->
+    A = simple1_adt:d1(),
+    is_integer(A). % breaks the opaqueness
+
+%% Comparison with integers
+
+-opaque i1() :: 1 | 2.
+
+-opaque i2() :: 1 | 2.
+
+-opaque di1() :: 1 | 2.
+
+-opaque di2() :: 3 | 4.
+
+-spec i1() -> i1().
+
+i1() -> 1.
+
+-type ty_i1() :: 1 | 2.
+
+-spec ty_i1() -> ty_i1().
+
+ty_i1() -> 1.
+
+cmp1() ->
+    A = i1(),
+    if A > 3 -> ok end. % can never succeed
+
+cmp2() ->
+    A = simple1_adt:i1(),
+    if A > 3 -> ok end. % opaque term
+
+cmp3() ->
+    A = i1(),
+    if A < 3 -> ok end.
+
+cmp4() ->
+    A = simple1_adt:i1(),
+    if A < 3 -> ok end. % opaque term
+
+%% -type
+
+ty_cmp1() ->
+    A = ty_i1(),
+    if A > 3 -> ok end. % can never succeed
+
+ty_cmp2() ->
+    A = simple1_adt:ty_i1(),
+    if A > 3 -> ok end. % can never succeed
+
+ty_cmp3() ->
+    A = ty_i1(),
+    if A < 3 -> ok end.
+
+ty_cmp4() ->
+    A = simple1_adt:ty_i1(),
+    if A < 3 -> ok end.
+
+%% is_function
+
+f1() ->
+    T = n1(),
+    if is_function(T) -> ok end. % can never succeed
+
+f2() ->
+    T = n1(),
+    is_function(T). % ok
+
+adt_f1() ->
+    T = simple1_adt:n1(),
+    if is_function(T) -> ok end. % breaks the opaqueness
+
+adt_f2() ->
+    T = simple1_adt:n1(),
+    is_function(T). % breaks the opaqueness
+
+f3() ->
+    A = i1(),
+    T = n1(),
+    if is_function(T, A) -> ok end. % can never succeed
+
+f4() ->
+    A = i1(),
+    T = n1(),
+    is_function(T, A). % ok
+
+adt_f3() ->
+    A = simple1_adt:i1(),
+    T = simple1_adt:n1(),
+    if is_function(T, A) -> ok end. % breaks the opaqueness
+
+adt_f4() ->
+    A = simple1_adt:i1(),
+    T = simple1_adt:n1(),
+    is_function(T, A). % breaks the opaqueness
+
+adt_f4_a() ->
+    A = simple1_adt:i1(),
+    T = n1(),
+    is_function(T, A). % opaque term
+
+
+adt_f4_b() ->
+    A = i1(),
+    T = simple1_adt:n1(),
+    is_function(T, A). % breaks the opaqueness
+
+%% A few Boolean examples
+
+bool_t1() ->
+    B = b2(),
+    if B -> ok end. % B =:= true can never succeed
+
+bool_t2() ->
+    A = b1(),
+    B = b2(),
+    if A and not B -> ok end.
+
+bool_t3() ->
+    A = b1(),
+    if not A -> ok end. % can never succeed
+
+bool_t4() ->
+    A = n1(),
+    if not ((A >= 1) and not (A < 1)) -> ok end. % can never succeed
+
+-spec bool_t5(i1()) -> integer().
+
+bool_t5(A) ->
+    if [not (A > 1)] =:=
+       [false]-> 1 end.
+
+-spec bool_t6(b1()) -> integer().
+
+bool_t6(A) ->
+    if [not A] =:=
+       [false]-> 1 end.
+
+-spec bool_t7() -> integer().
+
+bool_t7() ->
+    A = i1(),
+    if [not A] =:= % cannot succeed
+       [false]-> 1 end.
+
+bool_adt_t1() ->
+    B = simple1_adt:b2(),
+    if B -> ok end. % opaque term
+
+bool_adt_t2() ->
+    A = simple1_adt:b1(),
+    B = simple1_adt:b2(),
+    if A and not B -> ok end. % opaque term
+
+-spec bool_adt_t5(simple1_adt:i1()) -> integer().
+
+bool_adt_t5(A) ->
+    if [not (A > 1)] =:= % succ type of A is any() (type spec is OK)
+       [false]-> 1 end.
+
+-spec bool_adt_t6(simple1_adt:b1()) -> integer(). % invalid type spec
+
+bool_adt_t6(A) ->
+    if [not A] =:= % succ type of A is 'true'
+       [false]-> 1 end.
+
+-spec bool_t8() -> integer().
+
+bool_t8() ->
+    A = i1(),
+    if [A and A] =:= % cannot succeed
+       [false]-> 1 end.
+
+-spec bool_adt_t8(simple1_adt:b1(), simple1_adt:b2()) -> integer(). % invalid
+
+bool_adt_t8(A, B) ->
+    if [A and B] =:=
+       [false]-> 1 end.
+
+-spec bool_t9() -> integer().
+
+bool_t9() ->
+    A = i1(),
+    if [A or A] =:= % cannot succeed
+       [false]-> 1 end.
+
+-spec bool_adt_t9(simple1_adt:b1(), simple1_adt:b2()) -> integer(). % invalid
+
+bool_adt_t9(A, B) ->
+    if [A or B] =:=
+       [false]-> 1 end.
+
+-opaque b1() :: boolean().
+
+-opaque b2() :: boolean().
+
+-spec b1() -> b1().
+
+b1() -> true.
+
+-spec b2() -> b2().
+
+b2() -> false.
+
+%% Few (very few...) examples with bit syntax
+
+bit_t1() ->
+    A = i1(),
+    <<100:(A)>>.
+
+bit_adt_t1() ->
+    A = simple1_adt:i1(),
+    <<100:(A)>>. % breaks the opaqueness
+
+bit_t3(A) ->
+    B = i1(),
+    case none:none() of
+        <<A:B>> -> 1
+    end.
+
+bit_adt_t2() ->
+    A = simple1_adt:i1(),
+    case <<"hej">> of
+        <<_:A>> -> ok % breaks the opaqueness (but the message is strange)
+    end.
+
+
+bit_adt_t3(A) ->
+    B = simple1_adt:i1(),
+    case none:none() of
+        <<A:  % breaks the opaqueness (the message is less than perfect)
+          B>> -> 1
+    end.
+
+bit_t5(A) ->
+    B = o1(),
+    case none:none() of
+        <<A:B>> -> 1 % breaks the opaqueness
+    end.
+
+-spec bit_t4(<<_:1>>) -> integer().
+
+bit_t4(A) ->
+    Sz = i1(),
+    case A of
+        <<_:Sz>> -> 1
+    end.
+
+-spec bit_adt_t4(<<_:1>>) -> integer().
+
+bit_adt_t4(A) ->
+    Sz = simple1_adt:i1(),
+    case A of
+        <<_:Sz>> -> 1 % breaks the opaqueness
+    end.
+
+bit_t5() ->
+    A = bit1(),
+    case A of
+        <<_/binary>> -> 1
+    end.
+
+bit_adt_t5() ->
+    A = simple1_adt:bit1(),
+    case A of
+        <<_/binary>> -> 1 % breaks the opaqueness
+    end.
+
+-opaque bit1() :: binary().
+
+-spec bit1() -> bit1().
+
+bit1() ->
+    <<"hej">>.
+
+%% Calls with variable module or function
+
+call_f(A) ->
+    A = a(),
+    foo:A(A).
+
+call_f_adt(A) ->
+    A = simple1_adt:a(),
+    foo:A(A). % breaks the opaqueness
+
+call_m(A) ->
+    A = a(),
+    A:foo(A).
+
+call_m_adt(A) ->
+    A = simple1_adt:a(),
+    A:foo(A). % breaks the opaqueness
+
+-opaque a() :: atom().
+
+-opaque i() :: integer().
+
+-spec a() -> a().
+
+a() ->
+    e.
+
+call_f_i(A) ->
+    A = i(),
+    foo:A(A). % A is not atom() but i()
+
+call_f_adt_i(A) ->
+    A = simple1_adt:i(),
+    foo:A(A). % A is not atom() but simple1_adt:i()
+
+call_m_i(A) ->
+    A = i(),
+    A:foo(A). % A is not atom() but i()
+
+call_m_adt_i(A) ->
+    A = simple1_adt:i(),
+    A:foo(A). % A is not atom() but simple1_adt:i()
+
+-spec eq1() -> integer().
+
+eq1() ->
+    A = simple1_adt:d2(),
+    B = simple1_adt:d1(),
+    if
+        A == B -> % opaque term
+            0;
+        A == A ->
+            1;
+        A =:= A -> % compiler finds this one cannot match
+            2;
+        true -> % compiler finds this one cannot match
+            3
+    end.
+
+eq2() ->
+    A = simple1_adt:d1(),
+    if
+        {A} >= {A} ->
+            1;
+        A >= 3 -> % opaque term
+            2;
+        A == 3 -> % opaque term
+            3;
+        A =:= 3 -> % opaque term
+            4;
+        A == A ->
+            5;
+        A =:= A -> % compiler finds this one cannot match
+            6
+    end.
+
+c5() ->
+    A = simple1_adt:d1(),
+    A < 3. % opaque term
+
+c6(A, B) ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:d1(),
+    A =< B. % same type - no warning
+
+c7(A, B) ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:d2(),
+    A =< B. % opaque term
+
+c8() ->
+    D = digraph:new(),
+    E = ets:new(foo, []),
+    if {D, a} > {D, E} -> true; % OK
+       {1.0, 2} > {{D}, {E}} -> true; % OK
+       {D, 3} > {D, E} -> true  % opaque term 2
+    end.
+
+-spec i() -> i().
+
+i() ->
+    1.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple2_api.erl b/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple2_api.erl
new file mode 100644
index 0000000000..c86f6fd0b5
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/simple/simple2_api.erl
@@ -0,0 +1,125 @@
+-module(simple2_api).
+
+-export([c1/2, c2/0, c3/0, c4/1, c5/1, c6/0, c6_b/0, c7/0, c7_b/0,
+         c7_c/0, c8/0, c9/0, c10/0, c11/0, c12/0, c13/0, c14/0, c15/0,
+         c16/0, c17/0, c18/0, c19/0, c20/0, c21/0, c22/0, c23/0,
+         c24/0, c25/0, c26/0]).
+
+-spec c1(simple1_adt:d1(), simple1_adt:d2()) -> boolean().
+
+c1(A, B) ->
+    {A} =< {B}. % succ type of A and B is any()
+
+c2() ->
+    A = simple1_adt:d1(),
+    erlang:make_tuple(1, A). % ok
+
+c3() ->
+    A = simple1_adt:d1(),
+    setelement(1, {A}, A). % ok
+
+c4(_) ->
+    A = simple1_adt:d1(),
+    halt(A). % ok (BIF fails...)
+
+c5(_) ->
+    A = simple1_adt:d1(),
+    [A] -- [A]. % ok
+
+c6() ->
+    A = simple1_adt:d1(),
+    A ! foo. % opaque term
+
+c6_b() ->
+    A = simple1_adt:d1(),
+    erlang:send(A, foo). % opaque term
+
+c7() ->
+    A = simple1_adt:d1(),
+    foo ! A. % ok
+
+c7_b() ->
+    A = simple1_adt:d1(),
+    erlang:send(foo, A). % ok
+
+c7_c() ->
+    A = simple1_adt:d1(),
+    erlang:send(foo, A, []). % ok
+
+c8() ->
+    A = simple1_adt:d1(),
+    A < 3. % opaque term
+
+c9() ->
+    A = simple1_adt:d1(),
+    lists:keysearch(A, 1, []). % ok
+
+c10() ->
+    A = simple1_adt:d1(),
+    lists:keysearch(1, A, []). % opaque term 2
+
+c11() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, [A]). % ok
+
+c12() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, A). % opaque term 3
+
+c13() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, [{A,2}]). % ok
+
+c14() ->
+    A = simple1_adt:tuple(),
+    lists:keysearch(key, 1, [{2,A}]). % ok
+
+c15() ->
+    A = simple1_adt:d1(),
+    lists:keysearch(key, 1, [A]). % ok
+
+c16() ->
+    A = simple1_adt:tuple(),
+    erlang:send(foo, A). % ok
+
+c17() ->
+    A = simple1_adt:tuple(),
+    lists:reverse([A]). % ok
+
+c18() ->
+    A = simple1_adt:tuple(),
+    lists:keyreplace(a, 1, [A], {1,2}). % ok
+
+c19() ->
+    A = simple1_adt:tuple(),
+    %% Problem. The spec says argument 4 is a tuple(). Fix that!
+    lists:keyreplace(a, 1, [{1,2}], A). % opaque term 4
+
+c20() ->
+    A = simple1_adt:tuple(),
+    lists:flatten(A). % opaque term 1
+
+c21() ->
+    A = simple1_adt:tuple(),
+    lists:flatten([[{A}]]). % ok
+
+c22() ->
+    A = simple1_adt:tuple(),
+    lists:flatten([[A]]). % ok
+
+c23() ->
+    A = simple1_adt:tuple(),
+    lists:flatten([A]). % ok
+
+c24() ->
+    A = simple1_adt:tuple(),
+    lists:flatten({A}). % will never return
+
+c25() ->
+    A = simple1_adt:d1(),
+    B = simple1_adt:tuple(),
+    if {A,3} > {A,B} -> true end. % opaque 2nd argument
+
+c26() ->
+    B = simple1_adt:tuple(),
+    tuple_to_list(B). % opaque term 1
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/union/union_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/union/union_adt.erl
index 5ca3202bba..d88f238190 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/union/union_adt.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/union/union_adt.erl
@@ -1,10 +1,15 @@
 -module(union_adt).
 -export([new/1, new_a/1, new_rec/1]).
 
+%% Now (R17) that opaque types are no longer recognized by their shape
+%% this test case is rather meaningless.
+
 -record(rec, {x = 42 :: integer()}).
 
 -opaque u() :: 'aaa' | 'bbb' | #rec{}.
 
+-spec new(_) -> u().
+
 new(a) -> aaa;
 new(b) -> bbb;
 new(X) when is_integer(X) ->
@@ -13,7 +18,11 @@ new(X) when is_integer(X) ->
 %% the following two functions (and their uses in union_use.erl) test
 %% that the return type is the opaque one and not just a subtype of it
 
+-spec new_a(_) -> u().
+
 new_a(a) -> aaa.
 
+-spec new_rec(_) -> u().
+
 new_rec(X) when is_integer(X) ->
   #rec{x = X}.
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_util.erl b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_util.erl
index 8f0da1f5dc..ca6bc0ab4a 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_util.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/wings/wings_util.erl
@@ -14,12 +14,12 @@
 rel2fam(Rel) ->
     sofs:to_external(sofs:relation_to_family(sofs:relation(Rel))).
 
-%% a definition that does not violate the opaqueness of gb_tree()
+%% a definition that does not violate the opaqueness of gb_trees:tree()
 gb_trees_smallest_key(Tree) ->
     {Key, _V} = gb_trees:smallest(Tree),
     Key.
 
-%% a definition that violates the opaqueness of gb_tree()
+%% a definition that violates the opaqueness of gb_trees:tree()
 gb_trees_largest_key({_, Tree}) ->
     largest_key1(Tree).
 
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_adt.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_adt.erl
new file mode 100644
index 0000000000..c742990c6a
--- /dev/null
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_adt.erl
@@ -0,0 +1,5 @@
+-module(zoltan_adt).
+
+-export_type([id/0]).
+
+-opaque id() :: string().
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis2.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis2.erl
index 38c6051c58..e094d1982b 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis2.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis2.erl
@@ -2,7 +2,7 @@
 
 -export([get/2]).
 
--opaque data() :: gb_tree().
+-opaque data() :: gb_trees:tree().
 
 -spec get(term(), data()) -> term().
 
diff --git a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis3.erl b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis3.erl
index b62b9de576..07c9f0a270 100644
--- a/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis3.erl
+++ b/lib/dialyzer/test/opaque_SUITE_data/src/zoltan_kis3.erl
@@ -2,13 +2,13 @@
 
 -export([f/0, gen/0]).
 
--opaque id() :: string().
+%-opaque id() :: string().
 
 -spec f() -> char().
 
 %% List pattern matching issue
 f() -> [H|_T] = gen(), H.
 
--spec gen() -> id().
+-spec gen() -> zoltan_adt:id().
 
 gen() -> "Dummy".
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_clean.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_clean.erl
index 04225e9bd0..4fc4e89ce9 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_clean.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_clean.erl
@@ -80,7 +80,7 @@ add_to_work_list(F, {Fs,Used}=Sets) ->
 	false -> {[F|Fs],sets:add_element(F, Used)}
     end.
 
-
+
 %%%
 %%% Coalesce adjacent labels. Renumber all labels to eliminate gaps.
 %%% This cleanup will slightly reduce file size and slightly speed up loading.
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_type.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_type.erl
index d2ac3fcd99..f59cc897d6 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_type.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/beam_type.erl
@@ -456,7 +456,7 @@ are_live_regs_determinable([{'%live',_}|_]) -> true;
 are_live_regs_determinable([_|Is]) -> are_live_regs_determinable(Is);
 are_live_regs_determinable([]) -> false.
 
-
+
 %%% Routines for maintaining a type database.  The type database
 %%% associates type information with registers.
 %%%
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
index 2b6d14e300..9b56d384ab 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
@@ -990,7 +990,7 @@ listing(LFun, Ext, St) ->
 	    Es = [{Lfile,[{none,compile,write_error}]}],
 	    {error,St#compile{errors=St#compile.errors ++ Es}}
     end.
-
+
 options() ->
     help(standard_passes()).
 
@@ -1022,7 +1022,7 @@ help([_|T]) ->
 help(_) ->
     ok.
 
-
+
 %% compile(AbsFileName, Outfilename, Options)
 %%   Compile entry point for erl_compile.
 
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
index f4e609bf5b..2f9f6a2bcc 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/core_scan.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% ``The 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
@@ -123,7 +122,7 @@ format_error(Other) -> io_lib:write(Other).
 
 string_thing($') -> "atom";
 string_thing($") -> "string".
-
+
 %% Re-entrant pre-scanner.
 %%
 %% If the input list of characters is insufficient to build a term the
@@ -241,7 +240,7 @@ pre_comment(eof, Sofar, Pos) ->
 
 pre_error(E, Epos, Pos) ->
     {error,{Epos,core_scan,E}, Pos}.
-
+
 %% scan(CharList, StartPos)
 %%  This takes a list of characters and tries to tokenise them.
 %%
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_expand_pmod.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_expand_pmod.erl
index f48cc05b9c..cd13f468b2 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_expand_pmod.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_expand_pmod.erl
@@ -341,6 +341,8 @@ expr({'fun',Line,Body,Info},St) ->
 	{function,M,F,A} ->			%This is an error in lint!
 	    {'fun',Line,{function,M,F,A},Info}
     end;
+expr({named_fun,Loc,Name,Cs,Info},St) ->
+    {named_fun,Loc,Name,fun_clauses(Cs, St),Info};
 expr({call,Lc,{atom,_,new}=Name,As0},#pmod{parameters=Ps}=St)
   when length(As0) =:= length(Ps) ->
     %% The new() function does not take a 'THIS' argument (it's static).
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
index 41b7cb248d..590cc682c9 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/sys_pre_expand.erl
@@ -647,7 +647,7 @@ new_fun_name(#expand{func=F,arity=A,fcount=I}=St) ->
 	++ "-fun-" ++ integer_to_list(I) ++ "-",
     {list_to_atom(Name),St#expand{fcount=I+1}}.
 
-
+
 %% normalise_fields([RecDef]) -> [Field].
 %%  Normalise the field definitions to always have a default value. If
 %%  none has been given then use 'undefined'.
@@ -881,7 +881,7 @@ bin_expand_strings(Es) ->
 			end, Es1, S);
 	      (E, Es1) -> [E|Es1]
 	  end, [], Es).
-
+
 %% new_var_name(State) -> {VarName,State}.
 
 new_var_name(St) ->
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_core.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_core.erl
index c96837ab5e..45a8bc4ad9 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_core.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_core.erl
@@ -1127,7 +1127,7 @@ new_in_all([Le|Les]) ->
     foldl(fun (L, Ns) -> intersection((core_lib:get_anno(L))#a.ns, Ns) end,
 	  (core_lib:get_anno(Le))#a.ns, Les);
 new_in_all([]) -> [].
-
+
 %% The AfterVars are the variables which are used afterwards.  We need
 %% this to work out which variables are actually exported and used
 %% from case/receive.  In subblocks/clauses the AfterVars of the block
diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.erl
index d7c3e1add9..ecba19b1d1 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/v3_kernel.erl
@@ -129,7 +129,7 @@ function(#c_def{anno=Af,name=#c_fname{id=F,arity=Arity},val=Body}, St0) ->
     %%B1 = B0, St3 = St2,				%Null second pass
     {#k_fdef{anno=#k{us=[],ns=[],a=Af ++ Ab},
 	     func=F,arity=Arity,vars=Kvs,body=B1},St3}.
-
+
 %% body(Cexpr, Sub, State) -> {Kexpr,[PreKepxr],State}.
 %%  Do the main sequence of a body.  A body ends in an atomic value or
 %%  values.  Must check if vector first so do expr.
@@ -719,7 +719,7 @@ last([_|T]) -> last(T).
 
 first([_]) -> [];
 first([H|T]) -> [H|first(T)].
-
+
 %% This code implements the algorithm for an optimizing compiler for
 %% pattern matching given "The Implementation of Functional
 %% Programming Languages" by Simon Peyton Jones. The code is much
@@ -1143,7 +1143,7 @@ arg_val(Arg) ->
 	#k_bin_end{} -> 0;
 	#k_binary{} -> 0
     end.
-
+
 %% ubody(Expr, Break, State) -> {Expr,[UsedVar],State}.
 %%  Tag the body sequence with its used variables.  These bodies
 %%  either end with a #k_break{}, or with #k_return{} or an expression
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl
index d3f67eb77a..8c91b6f430 100644
--- a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl
+++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl
@@ -338,7 +338,7 @@ exec_script(false,Info,Script,_AfterScript,_RequestURI) ->
 %%
 
 proxy(#mod{config_db = ConfigDb} = Info, Port) ->
-    Timeout = httpd_util:lookup(ConfigDb, cgi_timeout, ?DEFAULT_CGI_TIMEOUT),
+    Timeout = httpd_util:lookup(ConfigDb, script_timeout, ?DEFAULT_CGI_TIMEOUT),
     proxy(Info, Port, 0, undefined,[], Timeout).
 
 proxy(Info, Port, Size, StatusCode, AccResponse, Timeout) ->
diff --git a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow3 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow3
index d640f564cd..0382627cfc 100644
--- a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow3
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow3
@@ -1,3 +1,3 @@
 
-ets_insert_control_flow3.erl:21: The call ets:insert(Table::atom() | tid(),{'root',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'root') call in ets_insert_control_flow3.erl on line 12
-ets_insert_control_flow3.erl:23: The call ets:insert(Table::atom() | tid(),{'user',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'user') call in ets_insert_control_flow3.erl on line 13
+ets_insert_control_flow3.erl:21: The call ets:insert(Table::atom() | ets:tid(),{'root',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'root') call in ets_insert_control_flow3.erl on line 12
+ets_insert_control_flow3.erl:23: The call ets:insert(Table::atom() | ets:tid(),{'user',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'user') call in ets_insert_control_flow3.erl on line 13
diff --git a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow4 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow4
index 6f34e75902..22944fd066 100644
--- a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow4
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow4
@@ -1,3 +1,3 @@
 
-ets_insert_control_flow4.erl:21: The call ets:insert(Table::atom() | tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow4.erl on line 12, the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow4.erl on line 13
-ets_insert_control_flow4.erl:23: The call ets:insert(Table::atom() | tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow4.erl on line 12, the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow4.erl on line 13
+ets_insert_control_flow4.erl:21: The call ets:insert(Table::atom() | ets:tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow4.erl on line 12, the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow4.erl on line 13
+ets_insert_control_flow4.erl:23: The call ets:insert(Table::atom() | ets:tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow4.erl on line 12, the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow4.erl on line 13
diff --git a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow5 b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow5
index 5af592f43f..e172887f34 100644
--- a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow5
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_control_flow5
@@ -1,5 +1,5 @@
 
-ets_insert_control_flow5.erl:22: The call ets:insert(Table::atom() | tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'welcome_msg') call in ets_insert_control_flow5.erl on line 16
-ets_insert_control_flow5.erl:23: The call ets:insert(Table::atom() | tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow5.erl on line 12, the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow5.erl on line 13
-ets_insert_control_flow5.erl:25: The call ets:insert(Table::atom() | tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'welcome_msg') call in ets_insert_control_flow5.erl on line 16
-ets_insert_control_flow5.erl:26: The call ets:insert(Table::atom() | tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow5.erl on line 12, the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_control_flow5.erl on line 13
+ets_insert_control_flow5.erl:22: The call ets:insert(Table::atom() | ets:tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'welcome_msg') call in ets_insert_control_flow5.erl on line 16
+ets_insert_control_flow5.erl:23: The call ets:insert(Table::atom() | ets:tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow5.erl on line 12, the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow5.erl on line 13
+ets_insert_control_flow5.erl:25: The call ets:insert(Table::atom() | ets:tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'welcome_msg') call in ets_insert_control_flow5.erl on line 16
+ets_insert_control_flow5.erl:26: The call ets:insert(Table::atom() | ets:tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow5.erl on line 12, the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_control_flow5.erl on line 13
diff --git a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_param b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_param
index 58f934a190..6a34337a2c 100644
--- a/lib/dialyzer/test/race_SUITE_data/results/ets_insert_param
+++ b/lib/dialyzer/test/race_SUITE_data/results/ets_insert_param
@@ -1,5 +1,5 @@
 
-ets_insert_param.erl:13: The call ets:insert(Table::atom() | tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'welcome_msg') call in ets_insert_param.erl on line 10
-ets_insert_param.erl:14: The call ets:insert(Table::atom() | tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_param.erl on line 14, the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_param.erl on line 15
-ets_insert_param.erl:17: The call ets:insert(Table::atom() | tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'welcome_msg') call in ets_insert_param.erl on line 10
-ets_insert_param.erl:18: The call ets:insert(Table::atom() | tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | tid(),'pass') call in ets_insert_param.erl on line 18
+ets_insert_param.erl:13: The call ets:insert(Table::atom() | ets:tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'welcome_msg') call in ets_insert_param.erl on line 10
+ets_insert_param.erl:14: The call ets:insert(Table::atom() | ets:tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_param.erl on line 14, the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_param.erl on line 15
+ets_insert_param.erl:17: The call ets:insert(Table::atom() | ets:tid(),{'welcome_msg',[any(),...]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'welcome_msg') call in ets_insert_param.erl on line 10
+ets_insert_param.erl:18: The call ets:insert(Table::atom() | ets:tid(),{'pass',[pos_integer()]}) might have an unintended effect due to a possible race condition caused by its combination with the ets:lookup(Table::atom() | ets:tid(),'pass') call in ets_insert_param.erl on line 18
diff --git a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
index 173ff3a9f1..bfa33cd296 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
+++ b/lib/dialyzer/test/small_SUITE_data/results/contracts_with_subtypes
@@ -8,15 +8,15 @@ contracts_with_subtypes.erl:111: The call contracts_with_subtypes:rec_arg({'b',{
 contracts_with_subtypes.erl:142: The pattern 1 can never match the type string()
 contracts_with_subtypes.erl:145: The pattern 'alpha' can never match the type {'ok',_} | {'ok',_,string()}
 contracts_with_subtypes.erl:147: The pattern 42 can never match the type {'ok',_} | {'ok',_,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:163: The pattern 'alpha' can never match the type {'ok',_}
+contracts_with_subtypes.erl:165: The pattern 42 can never match the type {'ok',_}
+contracts_with_subtypes.erl:183: The pattern 'alpha' can never match the type {'ok',_}
+contracts_with_subtypes.erl:185: The pattern 42 can never match the type {'ok',_}
 contracts_with_subtypes.erl:202: The pattern 1 can never match the type string()
-contracts_with_subtypes.erl:205: The pattern {'ok', _} can never match the type {'ok',X,string()}
-contracts_with_subtypes.erl:206: The pattern 'alpha' can never match the type {'ok',X,string()}
-contracts_with_subtypes.erl:207: The pattern {'ok', 42} can never match the type {'ok',X,string()}
-contracts_with_subtypes.erl:208: The pattern 42 can never match the type {'ok',X,string()}
+contracts_with_subtypes.erl:205: The pattern {'ok', _} can never match the type {'ok',_,string()}
+contracts_with_subtypes.erl:206: The pattern 'alpha' can never match the type {'ok',_,string()}
+contracts_with_subtypes.erl:207: The pattern {'ok', 42} can never match the type {'ok',_,string()}
+contracts_with_subtypes.erl:208: The pattern 42 can never match the type {'ok',_,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'
diff --git a/lib/appmon/doc/html/.gitignore b/lib/dialyzer/test/small_SUITE_data/results/eep37
index e69de29bb2..e69de29bb2 100644
--- a/lib/appmon/doc/html/.gitignore
+++ b/lib/dialyzer/test/small_SUITE_data/results/eep37
diff --git a/lib/dialyzer/test/small_SUITE_data/results/predef b/lib/dialyzer/test/small_SUITE_data/results/predef
new file mode 100644
index 0000000000..85e210d6e4
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/results/predef
@@ -0,0 +1,8 @@
+
+predef.erl:19: Invalid type specification for function predef:array/1. The success typing is (array:array(_)) -> array:array(_)
+predef.erl:24: Invalid type specification for function predef:dict/1. The success typing is (dict:dict(_,_)) -> dict:dict(_,_)
+predef.erl:29: Invalid type specification for function predef:digraph/1. The success typing is (digraph:graph()) -> [any()]
+predef.erl:39: Invalid type specification for function predef:gb_set/1. The success typing is (gb_sets:set(_)) -> gb_sets:set(_)
+predef.erl:44: Invalid type specification for function predef:gb_tree/1. The success typing is (gb_trees:tree(_,_)) -> gb_trees:tree(_,_)
+predef.erl:49: Invalid type specification for function predef:queue/1. The success typing is (queue:queue(_)) -> queue:queue(_)
+predef.erl:54: Invalid type specification for function predef:set/1. The success typing is (sets:set(_)) -> sets:set(_)
diff --git a/lib/dialyzer/test/small_SUITE_data/results/record_construct b/lib/dialyzer/test/small_SUITE_data/results/record_construct
index c0110b144f..4c40fec298 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/record_construct
+++ b/lib/dialyzer/test/small_SUITE_data/results/record_construct
@@ -1,6 +1,6 @@
 
 record_construct.erl:15: Function t_opa/0 has no local return
-record_construct.erl:16: Record construction #r_opa{b::gb_set(),c::42,e::'false'} violates the declared type of field c::boolean()
+record_construct.erl:16: Record construction #r_opa{b::gb_sets:set(_),c::42,e::'false'} violates the declared type of field c::boolean()
 record_construct.erl:20: Function t_rem/0 has no local return
 record_construct.erl:21: Record construction #r_rem{a::'gazonk'} violates the declared type of field a::string()
 record_construct.erl:6: Function t_loc/0 has no local return
diff --git a/lib/dialyzer/test/small_SUITE_data/results/trec b/lib/dialyzer/test/small_SUITE_data/results/trec
index 01ccc63761..b95df1e6ef 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/trec
+++ b/lib/dialyzer/test/small_SUITE_data/results/trec
@@ -1,7 +1,7 @@
 
-trec.erl:26: Function test/0 has no local return
-trec.erl:27: The call trec:mk_foo_loc(42,any()) will never return since it differs in the 1st argument from the success typing arguments: ('undefined',atom())
-trec.erl:29: Function mk_foo_loc/2 has no local return
-trec.erl:30: Record construction violates the declared type for #foo{} since variable A cannot be of type atom()
-trec.erl:36: Function mk_foo_exp/2 has no local return
-trec.erl:37: Record construction violates the declared type for #foo{} since variable A cannot be of type atom()
+trec.erl:28: Function test/0 has no local return
+trec.erl:29: The call trec:mk_foo_loc(42,any()) will never return since it differs in the 1st argument from the success typing arguments: ('undefined',atom())
+trec.erl:31: Function mk_foo_loc/2 has no local return
+trec.erl:32: Record construction violates the declared type for #foo{} since variable A cannot be of type atom()
+trec.erl:38: Function mk_foo_exp/2 has no local return
+trec.erl:39: Record construction violates the declared type for #foo{} since variable A cannot be of type atom()
diff --git a/lib/dialyzer/test/small_SUITE_data/src/appmon_place.erl b/lib/dialyzer/test/small_SUITE_data/src/appmon_place.erl
index 60ffbe818f..ddb97796fb 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/appmon_place.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/appmon_place.erl
@@ -1,6 +1,6 @@
 %%---------------------------------------------------------------------
 %% This is added as a test because it was giving a false positive
-%% (function move/4 will nevr be called) due to the strange use of
+%% (function move/4 will never be called) due to the strange use of
 %% self-recursive fun construction in placex/3.
 %%
 %% The analysis was getting confused that the foldl call will never
diff --git a/lib/dialyzer/test/small_SUITE_data/src/bin_compr.erl b/lib/dialyzer/test/small_SUITE_data/src/bin_compr.erl
deleted file mode 100644
index 8c2497ed21..0000000000
--- a/lib/dialyzer/test/small_SUITE_data/src/bin_compr.erl
+++ /dev/null
@@ -1,16 +0,0 @@
-%%% -*- erlang-indent-level: 2 -*-
-%%%------------------------------------------------------------------------
-%%% File    : bin_compr.erl
-%%% Purpose : Test case which crashes in dialyzer_dataflow:bind_bin_segs/5.
-%%%------------------------------------------------------------------------
-
--module(bin_compr).
-
--export([bc/1]).
-
-%% The binary comprehension below is stupid: it consumes the whole
-%% bitstr in one go and produces a [666] result provided Bits is a
-%% bitstr of at least 8 bits. Still, this is a valid Erlang program
-%% and dialyzer's analysis should not crash on it.
-bc(Bits) ->
-  [666 || <<_:8/integer, _/bits>> <= Bits].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/contract3.erl b/lib/dialyzer/test/small_SUITE_data/src/contract3.erl
index 5b0bee9694..a6ce91882e 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/contract3.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/contract3.erl
@@ -18,16 +18,23 @@ t(X, Y, Z) ->
         (atom()|list()) -> atom().
 
 t1(X) ->
-  foo:bar(X).
+  f(X).
 
 -spec t2(atom(), integer()) -> integer();
         (atom(), list()) -> atom().
 
 t2(X, Y) ->
-  foo:bar(X, Y).
+  g(X, Y).
 
 -spec t3(atom(), integer(), list()) -> integer();
         (X, integer(), list()) -> X.
 
 t3(X, Y, Z) ->
   X.
+
+%% dummy functions below
+
+f(X) -> X.
+
+g(X, Y) when is_atom(X), is_integer(Y) -> Y;
+g(X, Y) when is_atom(X), is_list(Y) -> X.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/eep37.erl b/lib/dialyzer/test/small_SUITE_data/src/eep37.erl
new file mode 100644
index 0000000000..2818688f95
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/eep37.erl
@@ -0,0 +1,15 @@
+-module(eep37).
+
+-compile(export_all).
+
+-spec self() -> fun(() -> fun()).
+self() ->
+    fun Self() -> Self end.
+
+-spec fact() -> fun((non_neg_integer()) -> non_neg_integer()).
+fact() ->
+    fun Fact(N) when N > 0 ->
+            N * Fact(N - 1);
+        Fact(0) ->
+            1
+    end.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/empty_list_infimum.erl b/lib/dialyzer/test/small_SUITE_data/src/empty_list_infimum.erl
index b58fa732cb..3acc5ca065 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/empty_list_infimum.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/empty_list_infimum.erl
@@ -1,6 +1,6 @@
 %%
-%% The Original Code is RabbitMQ.
-%%
+%% This is stripped down code from RabbitMQ. It is used to report an
+%% invalid type specification for function list_vhost_permissions/1.
 %% The Initial Developer of the Original Code is VMware, Inc.
 %%
 
@@ -38,7 +38,7 @@ vhost_perms_info_keys() ->
 -spec list_vhost_permissions(vhost()) -> infos().
 
 list_vhost_permissions(VHostPath) ->
-    list_permissions(vhost_perms_info_keys(), rabbit_foo:some_list()).
+    list_permissions(vhost_perms_info_keys(), some_mod:some_function()).
 
 filter_props(Keys, Props) ->
     [T || T = {K, _} <- Props, lists:member(K, Keys)].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/gencall.erl b/lib/dialyzer/test/small_SUITE_data/src/gencall.erl
index d2875c9df1..762be55007 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/gencall.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/gencall.erl
@@ -7,6 +7,6 @@
 f() ->
   gen_server:call(1,2,3),
   ets:lookup(1,2,3),
-  gencall2:foo(),
+  some_mod:some_function(),
   gencall:foo(),
   gen_server:handle_cast(1,2).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/maps1.erl b/lib/dialyzer/test/small_SUITE_data/src/maps1.erl
new file mode 100644
index 0000000000..06ced5b69e
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/maps1.erl
@@ -0,0 +1,41 @@
+%%
+%% File:    maps1.erl
+%% Author:  Björn-Egil Dahlberg
+%% Created: 2014-01-17
+%%
+
+-module(maps1).
+
+-compile([export_all]).
+
+
+-export([recv/3, decode/1]).
+
+%-record(can_pkt, {id, data :: binary(), timestamp}).
+
+-type can_pkt() :: #{ id => term(), data => binary(), timestamp => term() }.
+-type channel() :: atom() | pid() | {atom(),_}.
+
+-spec recv(<<_:64,_:_*8>>, fun((can_pkt()) -> R), channel()) -> R.
+recv(Packet, Fun, Chan) ->
+  #{id := Can_id, data := Can_data} = P = decode(Packet),
+  Fun(P).
+
+-spec decode(<<_:64,_:_*8>>) -> #{id => <<_:11>>,timestamp => char()}.
+decode(<<_:12, Len:4, Timestamp:16, 0:3, Id:11/bitstring, 0:18,
+	 Data:Len/binary, _/binary>>) ->
+  #{id => Id, data => Data, timestamp => Timestamp}.
+
+
+
+t1() ->
+    #{bar=>fun t2/0}.
+
+t2() -> ok.
+
+-type map_state() :: #{ id => integer(), val => term() }.
+
+-spec update(map_state(), term()) -> map_state().
+
+update(#{ id := Id, val := Val } = M, X) when is_integer(Id) ->
+    M#{ val := [Val,X] }.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/maybe_improper.erl b/lib/dialyzer/test/small_SUITE_data/src/maybe_improper.erl
index 1743d81493..6d2a35b7c8 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/maybe_improper.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/maybe_improper.erl
@@ -1,7 +1,18 @@
+%%%========================================================================
+%%% Tests handling of maybe improper lists
+%%%========================================================================
 -module(maybe_improper).
 
--export([s/1]).
+-export([s/1, t/0]).
 
 -spec s(maybe_improper_list(X,Y)) -> {[X], maybe_improper_list(X,Y)}.
-s(A) ->
-    lists:split(2,A).
+s(L) ->
+    lists:split(2, L).
+
+%% Having a remote type in the 'tail' of the list crashed dialyzer.
+%% The problem was fixed for R16B03.
+-type t_mil() :: maybe_improper_list(integer(), orddict:orddict()).
+
+-spec t() -> t_mil().
+t() ->
+    [42 | []].
diff --git a/lib/dialyzer/test/small_SUITE_data/src/on_load.erl b/lib/dialyzer/test/small_SUITE_data/src/on_load.erl
index 16533a9caa..7242ac2016 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/on_load.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/on_load.erl
@@ -1,4 +1,6 @@
 %%% This is to ensure that "on_load" functions are never reported as unused.
+%%% In addition, all functions called by a function in an on_load attribute
+%%% should be considered as called by an entry point of the module.
 
 -module(on_load).
 
@@ -8,4 +10,7 @@
 
 foo() -> ok.
 
-bar() -> ok.
+bar() -> gazonk(17).
+
+gazonk(N) when N < 42 -> gazonk(N+1);
+gazonk(42) -> ok.
diff --git a/lib/dialyzer/test/small_SUITE_data/src/overloaded1.erl b/lib/dialyzer/test/small_SUITE_data/src/overloaded1.erl
index 0af4f7446f..074a93e2fe 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/overloaded1.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/overloaded1.erl
@@ -1,5 +1,5 @@
 %%-----------------------------------------------------------------------------
-%% Test that tests overloaded contratcs.
+%% Test that tests overloaded contracts.
 %% In December 2008 it works as far as intersection types are concerned (test1)
 %% However, it does NOT work as far as type variables are concerned (test2)
 %%-----------------------------------------------------------------------------
@@ -16,13 +16,13 @@ test2() ->
 
 -type mod() :: atom().
 
--spec foo(ATM, list()) -> {'ok', ATM} | {'error', _} when is_subtype(ATM, mod())
-       ; (MFA, list()) -> {'ok', MFA} | {'error', _} when is_subtype(MFA, mfa()).
+-spec foo(ATM, list()) -> {'ok', ATM} | {'error', _} when ATM :: mod()
+       ; (MFA, list()) -> {'ok', MFA} | {'error', _} when MFA :: mfa().
 
 foo(F, _) when is_atom(F) ->
   case atom_to_list(F) of
-      [42|_] -> {ok, F};
-      _Other -> {error, mod:bar(F)}
+    [42|_] -> {ok, F};
+    _Other -> {error, some_mod:some_function()}
   end;
 foo({M,F,A}, _) ->
   case A =:= 0 of
diff --git a/lib/dialyzer/test/small_SUITE_data/src/predef.erl b/lib/dialyzer/test/small_SUITE_data/src/predef.erl
new file mode 100644
index 0000000000..c2364fd1c2
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/predef.erl
@@ -0,0 +1,67 @@
+-module(predef).
+
+-export([array/1, dict/1, digraph/1, digraph2/1, gb_set/1, gb_tree/1,
+         queue/1, set/1, tid/0, tid2/0]).
+
+-export_type([array/0, digraph/0, gb_set/0]).
+
+%% Before R17B local re-definitions of pre-defined opaque types were
+%% ignored but did not generate any warning.
+-opaque array() :: atom().
+-opaque digraph() :: atom().
+-opaque gb_set() :: atom().
+-type dict() :: atom().
+-type gb_tree() :: atom().
+-type queue() :: atom().
+-type set() :: atom().
+-type tid() :: atom().
+
+-spec array(array()) -> array:array().
+
+array(A) ->
+    array:relax(A).
+
+-spec dict(dict()) -> dict:dict().
+
+dict(D) ->
+    dict:store(1, a, D).
+
+-spec digraph(digraph()) -> [digraph:edge()].
+
+digraph(G) ->
+    digraph:edges(G).
+
+-spec digraph2(digraph:graph()) -> [digraph:edge()].
+
+digraph2(G) ->
+    digraph:edges(G).
+
+-spec gb_set(gb_set()) -> gb_sets:set().
+
+gb_set(S) ->
+    gb_sets:balance(S).
+
+-spec gb_tree(gb_tree()) -> gb_trees:tree().
+
+gb_tree(S) ->
+    gb_trees:balance(S).
+
+-spec queue(queue()) -> queue:queue().
+
+queue(Q) ->
+    queue:reverse(Q).
+
+-spec set(set()) -> sets:set().
+
+set(S) ->
+    sets:union([S]).
+
+-spec tid() -> tid().
+
+tid() ->
+    ets:new(tid, []).
+
+-spec tid2() -> ets:tid().
+
+tid2() ->
+    ets:new(tid, []).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/predef2.erl b/lib/dialyzer/test/small_SUITE_data/src/predef2.erl
new file mode 100644
index 0000000000..b1d941a49a
--- /dev/null
+++ b/lib/dialyzer/test/small_SUITE_data/src/predef2.erl
@@ -0,0 +1,56 @@
+-module(predef2).
+
+-export([array/1, dict/1, digraph/1, digraph2/1, gb_set/1, gb_tree/1,
+         queue/1, set/1, tid/0, tid2/0]).
+
+-export_type([array/0, digraph/0, gb_set/0]).
+
+-spec array(array()) -> array:array().
+
+array(A) ->
+    array:relax(A).
+
+-spec dict(dict()) -> dict:dict().
+
+dict(D) ->
+    dict:store(1, a, D).
+
+-spec digraph(digraph()) -> [digraph:edge()].
+
+digraph(G) ->
+    digraph:edges(G).
+
+-spec digraph2(digraph:graph()) -> [digraph:edge()].
+
+digraph2(G) ->
+    digraph:edges(G).
+
+-spec gb_set(gb_set()) -> gb_sets:set().
+
+gb_set(S) ->
+    gb_sets:balance(S).
+
+-spec gb_tree(gb_tree()) -> gb_trees:tree().
+
+gb_tree(S) ->
+    gb_trees:balance(S).
+
+-spec queue(queue()) -> queue:queue().
+
+queue(Q) ->
+    queue:reverse(Q).
+
+-spec set(set()) -> sets:set().
+
+set(S) ->
+    sets:union([S]).
+
+-spec tid() -> tid().
+
+tid() ->
+    ets:new(tid, []).
+
+-spec tid2() -> ets:tid().
+
+tid2() ->
+    ets:new(tid, []).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/record_construct.erl b/lib/dialyzer/test/small_SUITE_data/src/record_construct.erl
index 54cc2601bd..b250c6ee65 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/record_construct.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/record_construct.erl
@@ -7,7 +7,7 @@ t_loc() ->
   #r_loc{}.
 
 -record(r_opa, {a                 :: atom(),
-		b = gb_sets:new() :: gb_set(),
+		b = gb_sets:new() :: gb_sets:set(),
 		c = 42            :: boolean(),
 		d,	% untyped on purpose
 		e = false         :: boolean()}).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/trec.erl b/lib/dialyzer/test/small_SUITE_data/src/trec.erl
index ba50c3b401..06706162c1 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/trec.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/trec.erl
@@ -18,20 +18,22 @@
 %%      ('undefined',atom())
 %%   3. Function mk_foo_loc/2 has no local return
 %%
-%% Arguably, the second warning is not what most users have in mind
-%% when they wrote the type declarations in the 'foo' record, so no
-%% doubt they'll find it confusing. But note that it is also inconsistent!
-%% How come there is a success typing for a function that has no local return?
+%% Arguably, the second warning is not what most users have in mind when
+%% they wrote the type declarations in the 'foo' record, so no doubt
+%% they'll find it confusing. But note that it is also quite confusing!
+%% Many users may be wondering: How come there is a success typing for a
+%% function that has no local return? Running typer on this module
+%% reveals a success typing for this function that is interesting indeed.
 %%
 test() ->
-   mk_foo_loc(42, bar:f()).
+   mk_foo_loc(42, some_mod:some_function()).
 
 mk_foo_loc(A, B) ->
     #foo{a = A, b = [A,B]}.
 
 %%
-%% For this function we currently get "has no local return" but we get
-%% no reason; I want us to get a reason.
+%% For this function we used to get a "has no local return" warning
+%% but we got no reason. This has now been fixed.
 %%
 mk_foo_exp(A, B) when is_integer(A) ->
     #foo{a = A, b = [A,B]}.
diff --git a/lib/dialyzer/test/unmatched_returns_SUITE_data/dialyzer_options b/lib/dialyzer/test/unmatched_returns_SUITE_data/dialyzer_options
new file mode 100644
index 0000000000..49ac917f61
--- /dev/null
+++ b/lib/dialyzer/test/unmatched_returns_SUITE_data/dialyzer_options
@@ -0,0 +1 @@
+{dialyzer_options, [{warnings, [unmatched_returns]}]}.
diff --git a/lib/dialyzer/test/unmatched_returns_SUITE_data/results/lc_warnings b/lib/dialyzer/test/unmatched_returns_SUITE_data/results/lc_warnings
new file mode 100644
index 0000000000..24b44c1b5c
--- /dev/null
+++ b/lib/dialyzer/test/unmatched_returns_SUITE_data/results/lc_warnings
@@ -0,0 +1,5 @@
+
+lc_warnings.erl:32: Expression produces a value of type [opaque_atom_adt:opaque_atom()], but this value is unmatched
+lc_warnings.erl:43: Expression produces a value of type [array:array(_)], but this value is unmatched
+lc_warnings.erl:65: Expression produces a value of type [lc_warnings:opaque_tuple()], but this value is unmatched
+lc_warnings.erl:7: Expression produces a value of type ['ok' | {'error',atom()}], but this value is unmatched
diff --git a/lib/dialyzer/test/unmatched_returns_SUITE_data/src/lc_warnings/lc_warnings.erl b/lib/dialyzer/test/unmatched_returns_SUITE_data/src/lc_warnings/lc_warnings.erl
new file mode 100644
index 0000000000..cb01a8fde3
--- /dev/null
+++ b/lib/dialyzer/test/unmatched_returns_SUITE_data/src/lc_warnings/lc_warnings.erl
@@ -0,0 +1,95 @@
+-module(lc_warnings).
+-compile([export_all]).
+
+close(Fs) ->
+    %% There should be a warning since we ignore a potential
+    %% {error,Error} return from file:close/1.
+    [file:close(F) || F <- Fs],
+
+    %% No warning because the type of unmatched return will be ['ok']
+    %% (which is a list of a simple type).
+    [ok = file:close(F) || F <- Fs],
+
+    %% Suppressed.
+    _ = [file:close(F) || F <- Fs],
+    ok.
+
+format(X) ->
+    %% No warning since the result of the list comprehension is
+    %% a list of simple.
+    [io:format("~p\n", [E]) || E <- X],
+
+    %% Warning explicitly suppressed.
+    _ = [io:format("~p\n", [E]) || E <- X],
+    ok.
+
+opaque1() ->
+    List = gen_atom(),
+    %% This is a list of an externally defined opaque type. Since
+    %% we are not allowed to peek inside opaque types, there should
+    %% be a warning (even though the type in this case happens to be
+    %% an atom).
+    [E || E <- List],
+
+    %% Suppressed.
+    _ = [E || E <- List],
+    ok.
+
+opaque2() ->
+    List = gen_array(),
+    %% This is an list of an externally defined opaque type. Since
+    %% we are not allowed to peek inside opaque types, there should
+    %% be a warning.
+    [E || E <- List],
+
+    %% Suppressed.
+    _ = [E || E <- List],
+    ok.
+
+opaque3() ->
+    List = gen_int(),
+
+    %% No warning, since we are allowed to look into the type and can
+    %% see that it is a simple type.
+    [E || E <- List],
+
+    %% Suppressed.
+    _ = [E || E <- List],
+    ok.
+
+opaque4() ->
+    List = gen_tuple(),
+
+    %% There should be a warning, since we are allowed to look inside
+    %% the opaque type and see that it is a tuple (non-simple).
+    [E || E <- List],
+
+    %% Suppressed.
+    _ = [E || E <- List],
+    ok.
+
+gen_atom() ->
+    [opaque_atom_adt:atom(ok)].
+
+gen_array() ->
+    [array:new()].
+
+
+gen_int() ->
+    [opaque_int(42)].
+
+gen_tuple() ->
+    [opaque_tuple(x, 25)].
+
+-opaque opaque_int() :: integer().
+
+-spec opaque_int(integer()) -> opaque_int().
+
+opaque_int(Int) -> Int.
+
+-opaque opaque_tuple() :: {any(),any()}.
+
+-spec opaque_tuple(any(), any()) -> opaque_tuple().
+
+opaque_tuple(X, Y) ->
+    {X,Y}.
diff --git a/lib/dialyzer/test/unmatched_returns_SUITE_data/src/lc_warnings/opaque_atom_adt.erl b/lib/dialyzer/test/unmatched_returns_SUITE_data/src/lc_warnings/opaque_atom_adt.erl
new file mode 100644
index 0000000000..b5b51fe75b
--- /dev/null
+++ b/lib/dialyzer/test/unmatched_returns_SUITE_data/src/lc_warnings/opaque_atom_adt.erl
@@ -0,0 +1,9 @@
+-module(opaque_atom_adt).
+-export([atom/1]).
+
+-opaque opaque_atom() :: atom().
+
+-spec atom(atom()) -> opaque_atom().
+
+atom(Atom) ->
+    Atom.
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index af32c5b901..95d2464e1d 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 2.6.1
+DIALYZER_VSN = 2.7
diff --git a/lib/diameter/bin/diameterc b/lib/diameter/bin/diameterc
index 2f5834d359..2c9a8f555c 100755
--- a/lib/diameter/bin/diameterc
+++ b/lib/diameter/bin/diameterc
@@ -4,7 +4,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,13 +50,10 @@ usage() ->
       "      -i dir    = set an include directory for inherited beams~n"
       "      -E        = no .erl output~n"
       "      -H        = no .hrl output~n"
-      "      -d        = write intermediate files (.spec and .forms)~n",
+      "      -d        = write intermediate files (.D and .F)~n",
       [?MODULE]).
 
 main(Args) ->
-    %% Add the ebin directory relative to the script path.
-    BinDir = filename:dirname(escript:script_name()),
-    code:add_path(filename:join([BinDir, "..", "ebin"])),
     halt(gen(Args)).
 
 gen(Args) ->
@@ -72,15 +69,12 @@ gen(Args) ->
             1
     end.
 
-compile(#argv{file = File, options = Opts} = A) ->
-    try diameter_dict_util:parse({path, File}, Opts) of
-        {ok, Spec} ->
-            maybe_output(A, Spec, Opts, spec), %% the spec file
-            maybe_output(A, Spec, Opts, erl),  %% the erl file
-            maybe_output(A, Spec, Opts, hrl),  %% The hrl file
+compile(#argv{file = File, options = Opts, output = Out}) ->
+    try diameter_make:codec({path, File}, Opts ++ Out) of
+        ok ->
             0;
         {error, Reason} ->
-            error_msg(diameter_dict_util:format_error(Reason), []),
+            error_msg(diameter_make:format_error(Reason), []),
             1
     catch
         error: Reason ->
@@ -88,10 +82,6 @@ compile(#argv{file = File, options = Opts} = A) ->
             2
     end.
 
-maybe_output(#argv{file = File, output = Output}, Spec, Opts, Mode) ->
-    lists:member(Mode, Output)
-        andalso diameter_codegen:from_dict(File, Spec, Opts, Mode).
-
 error_msg({Fmt, Args}) ->
     error_msg(Fmt, Args).
 
@@ -119,8 +109,9 @@ arg(["-o", Dir | Args], #argv{options = Opts} = A) ->
     true = dir_exists(Dir),
     arg(Args, A#argv{options = [{outdir, Dir} | Opts]});
 
-arg(["-i", Dir | Args], #argv{options = Opts} = A) ->
-    arg(Args, A#argv{options = Opts ++ [{include, Dir}]});
+arg(["-i", Dir | Args], #argv{} = A) ->
+    code:add_patha(Dir), %% Set path here instead of passing an include
+    arg(Args, A);        %% option so it's set before calling diameter_make.
 
 arg(["--name", Name | Args], #argv{options = Opts} = A) ->
     arg(Args, A#argv{options = [{name, Name} | Opts]});
@@ -137,9 +128,8 @@ arg(["-E" | Args], #argv{output = Output} = A) ->
 arg(["-H" | Args], #argv{output = Output} = A) ->
     arg(Args, A#argv{output = lists:delete(hrl, Output)});
 
-arg(["-d" | Args], #argv{options = Opts, output = Output} = A) ->
-    arg(Args, A#argv{options = [debug | Opts],
-                     output = [spec | Output]});
+arg(["-d" | Args], #argv{output = Output} = A) ->
+    arg(Args, A#argv{output = [parse, forms | Output -- [parse, forms]]});
 
 arg([[$- = M, C, H | T] | Args], A)  %% clustered options
   when C /= $i, C /= $o, C /= $- ->
diff --git a/lib/diameter/doc/src/Makefile b/lib/diameter/doc/src/Makefile
index bd2b6b103a..229812fd08 100644
--- a/lib/diameter/doc/src/Makefile
+++ b/lib/diameter/doc/src/Makefile
@@ -82,6 +82,7 @@ gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 man: $(MAN1_FILES) $(MAN3_FILES) $(MAN4_FILES)
 
 $(INDEX_TARGET): $(INDEX_SRC) $(APP_FILE)
+	$(gen_verbose) \
 	sed -e 's/%VSN%/$(VSN)/; \
 	        s/%ERLANG_SITE%/www\.erlang\.se\//; \
 	        s/%UP_ONE_LEVEL%/..\/..\/..\/doc\/index.html/; \
@@ -140,7 +141,10 @@ release_spec:
 
 depend.mk: depend.sed Makefile seealso.ent \
            $(XML_REF_FILES) $(XML_CHAPTER_FILES)
+	$(gen_verbose)
+	$(V_at) \
 	sed -f seehere.sed seealso.ent > seehere.ent
+	$(V_at) \
 	(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/book.xml b/lib/diameter/doc/src/book.xml
index 960296528b..7b606c84d0 100644
--- a/lib/diameter/doc/src/book.xml
+++ b/lib/diameter/doc/src/book.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <header titlestyle="normal">
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index db19fbb271..7d6a28e51c 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
   <!ENTITY spawn_opt
   '<seealso marker="erts:erlang#spawn_opt-2">erlang:spawn_opt/2</seealso>'>
@@ -20,7 +20,8 @@
 <header>
 
 <copyright>
-<year>2011</year><year>2013</year>
+<year>2011</year>
+<year>2014</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -130,7 +131,7 @@ ExtraArgs = list()
 <p>
 A module implementing the callback interface defined in &man_app;,
 along with any
-extra arguments to be appended to those documented for the interface.
+extra arguments to be appended to those documented.
 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>
@@ -138,7 +139,7 @@ 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 &man_app; callbacks.
-See that module for details.</p>
+See <c>diameter_callback.erl</c> for details.</p>
 
 <marker id="application_opt"/>
 </item>
@@ -155,7 +156,7 @@ Has one the following types.</p>
 <tag><c>{alias, &application_alias;}</c></tag>
 <item>
 <p>
-An unique identifier for the application in the scope of the
+A unique identifier for the application in the scope of the
 service.
 Defaults to the value of the <c>dictionary</c> option if
 unspecified.</p>
@@ -166,8 +167,8 @@ unspecified.</p>
 <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 &man_dict;.</p>
+These modules are generated from files whose format is documented in
+&man_dict;.</p>
 </item>
 
 <tag><c>{module, &application_module;}</c></tag>
@@ -195,15 +196,14 @@ Specifies whether or not the &app_pick_peer;
 application callback can modify the application state.
 Defaults to <c>false</c> if unspecified.</p>
 
-<note>
+<warning>
 <p>
-&app_pick_peer; callbacks
-are serialized when these are allowed to modify state, which is a
-potential performance bottleneck.
+&app_pick_peer; callbacks are serialized when this option is <c>true</c>,
+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 should
 probably avoid it.</p>
-</note>
+</warning>
 </item>
 
 <tag><c>{answer_errors, callback|report|discard}</c></tag>
@@ -234,7 +234,7 @@ Defaults to <c>report</c> if unspecified.</p>
 <item>
 <p>
 Determines the manner in which incoming requests are handled when an
-error other than 3007, DIAMETER_APPLICATION_UNSUPPORTED (which cannot
+error other than 3007 (DIAMETER_APPLICATION_UNSUPPORTED, which cannot
 be associated with an application callback module), is detected.</p>
 
 <p>
@@ -244,7 +244,8 @@ If <c>answer</c> then even 5xxx errors are answered without a
 callback unless the connection in question has configured the RFC 3588
 common dictionary as noted below.
 If <c>callback</c> then a &app_handle_request; callback always takes
-place and the return value determines the answer sent to the peer.</p>
+place and its return value determines the answer sent to the peer, if
+any.</p>
 
 <p>
 Defaults to <c>answer_3xxx</c> if unspecified.</p>
@@ -252,13 +253,14 @@ Defaults to <c>answer_3xxx</c> if unspecified.</p>
 <note>
 <p>
 Answers sent by diameter set the E-bit in the Diameter Header.
-Since RFC 3588 allowed only 3xxx result codes in an
+Since RFC 3588 allows only 3xxx result codes in an
 <c>answer-message</c>, <c>answer</c> has the same semantics as
-<c>answer_3xxx</c> if the peer connection in question has configured
-the RFC 3588 common dictionary, <c>diameter_gen_base_rfc3588</c>.
-RFC 6733 allows both 3xxx and 5xxx result codes in an
-<c>answer-message</c> so a connection configured with the RFC 6733
-common dictionary, <c>diameter_gen_base_rfc6733</c>, does
+<c>answer_3xxx</c> when the transport in question has
+been configured with <c>diameter_gen_base_rfc3588</c> as its common
+dictionary.
+Since RFC 6733 allows both 3xxx and 5xxx result codes in an
+<c>answer-message</c>, a transport with
+<c>diameter_gen_base_rfc6733</c> as its common dictionary does
 distinguish between <c>answer_3xxx</c> and <c>answer</c>.</p>
 </note>
 </item>
@@ -291,9 +293,8 @@ Multiple options append to the argument list.</p>
 <tag><c>{filter, &peer_filter;}</c></tag>
 <item>
 <p>
-A filter to apply to the list of available peers before passing them to
-the &app_pick_peer;
-callback for the application in question.
+A filter to apply to the list of available peers before passing it to
+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>
@@ -312,7 +313,7 @@ Defaults to 5000.</p>
 <p>
 Causes &call; to return <c>ok</c> as
 soon as the request in
-question has been encoded instead of waiting for and returning
+question has been encoded, instead of waiting for and returning
 the result from a subsequent &app_handle_answer; or
 &app_handle_error; callback.</p>
 </item>
@@ -331,8 +332,8 @@ An invalid option will cause &call; to fail.</p>
 <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.
+Can be configured both on a service and a transport, values
+on the latter taking precedence.
 Has one of the following types.</p>
 
 <taglist>
@@ -355,10 +356,10 @@ question communicates an address list as described in
 <tag><c>{'Origin-State-Id', &dict_Unsigned32;}</c></tag>
 <item>
 <p>
-Origin-State-Id is optional but will be included in outgoing messages
-sent by diameter itself: CER/CEA, DWR/DWA and DPR/DPA.
+Origin-State-Id is optional but, if configured, will be included in
+outgoing CER/CEA and DWR/DWA messages.
 Setting a value of <c>0</c> (zero) is equivalent to not setting a
-value as documented in &the_rfc;.
+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>
@@ -370,8 +371,8 @@ application is started.</p>
 <item>
 <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
+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>
 
@@ -437,38 +438,38 @@ Has one of the following types.</p>
 <p>
 Matches any peer.
 This is a convenience that provides a filter equivalent to no
-filter at all.</p>
+filter.</p>
 </item>
 
 <tag><c>host</c></tag>
 <item>
 <p>
-Matches only those peers whose <c>Origin-Host</c> has the same value
-as <c>Destination-Host</c> in the outgoing request in question,
+Matches only those peers whose Origin-Host has the same value
+as Destination-Host in the outgoing request in question,
 or any peer if the request does not contain
-a <c>Destination-Host</c> AVP.</p>
+a Destination-Host AVP.</p>
 </item>
 
 <tag><c>realm</c></tag>
 <item>
 <p>
-Matches only those peers whose <c>Origin-Realm</c> has the same value
-as <c>Destination-Realm</c> in the outgoing request in question,
+Matches only those peers whose Origin-Realm has the same value
+as Destination-Realm in the outgoing request in question,
 or any peer if the request does not contain
-a <c>Destination-Realm</c> AVP.</p>
+a Destination-Realm AVP.</p>
 </item>
 
 <tag><c>{host, any|&dict_DiameterIdentity;}</c></tag>
 <item>
 <p>
-Matches only those peers whose <c>Origin-Host</c> has the
+Matches only those peers whose Origin-Host has the
 specified value, or all peers if the atom <c>any</c>.</p>
 </item>
 
 <tag><c>{realm, any|&dict_DiameterIdentity;</c></tag>
 <item>
 <p>
-Matches only those peers whose <c>Origin-Realm</c> has the
+Matches only those peers whose Origin-Realm has the
 specified value, or all peers if the atom <c>any</c>.</p>
 </item>
 
@@ -477,7 +478,8 @@ specified value, or all peers if the atom <c>any</c>.</p>
 <p>
 Matches only those peers for which the specified
 <c>&evaluable;</c> returns
-<c>true</c> on the connection's <c>diameter_caps</c> record.
+<c>true</c> when applied to the connection's <c>diameter_caps</c>
+record.
 Any other return value or exception is equivalent to <c>false</c>.</p>
 </item>
 
@@ -508,10 +510,10 @@ 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.
+The <c>host</c> and <c>realm</c> filters cause the Destination-Host
+and Destination-Realm AVPs to be extracted from the
+outgoing request, assuming it to be a record- or list-valued
+<c>&codec_message;</c>, and assuming 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.
 An empty <c>&dict_DiameterIdentity;</c>
@@ -555,7 +557,7 @@ Can have one of the following types.</p>
 <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
+No event follows a <c>stop</c> event, and this event
 implies the termination of all transport processes.</p>
 </item>
 
@@ -575,16 +577,15 @@ The RFC 3539 watchdog state machine has
 transitioned into (<c>up</c>) or out of (<c>down</c>) the OKAY
 state.
 If a <c>#diameter_packet{}</c> 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>
+then there has been a capabilities exchange on a newly established
+transport connection and the record contains the received CER or
+CEA.</p>
 
 <p>
 Note that a single <c>up</c> or <c>down</c> event for a given peer
 corresponds to multiple &app_peer_up; or &app_peer_down;
 callbacks, one for each of the Diameter applications negotiated during
-capablilities exchange.
+capabilities 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>
@@ -599,7 +600,7 @@ Opts = [&transport_opt;]
 
 <p>
 A connecting transport is attempting to establish/reestablish a
-transport connection with a peer following &reconnect_timer; or
+transport connection with a peer following &connect_timer; or
 &watchdog_timer; expiry.</p>
 </item>
 
@@ -627,10 +628,10 @@ CB = &evaluable;
 </pre>
 
 <p>
-An incoming CER has been answered with the indicated result code or
+An incoming CER has been answered with the indicated result code, or
 discarded.
-<c>Caps</c> contains pairs of values for the local node and remote
-peer.
+<c>Caps</c> contains pairs of values, for the local node and remote
+peer respectively.
 <c>Pkt</c> contains the CER in question.
 In the case of rejection by a capabilities callback, the tuple
 contains the rejecting callback.</p>
@@ -647,7 +648,7 @@ Pkt  = #diameter_packet{}
 <p>
 An incoming CER contained errors and has been answered with the
 indicated result code.
-<c>Caps</c> contains only values for the local node.
+<c>Caps</c> contains values for the local node only.
 <c>Pkt</c> contains the CER in question.</p>
 </item>
 
@@ -754,7 +755,7 @@ Defines a Diameter application supported by the service.</p>
 <p>
 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
+For an outgoing 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, the identifier being specified in
@@ -765,7 +766,7 @@ the application's &dictionary; file.</p>
 The capabilities advertised by a node must match its configured
 applications. In particular, <c>application</c> configuration must
 be matched by corresponding &capability; configuration, of
-Application-Id AVP's in particular.</p>
+*-Application-Id AVPs in particular.</p>
 </warning>
 
 </item>
@@ -778,10 +779,11 @@ Application-Id AVP's in particular.</p>
 <item>
 <p>
 Specifies the degree to which the service allows multiple transport
-connections to the same peer.</p>
+connections to the same peer, as identified by its Origin-Host
+at capabilities exchange.</p>
 
 <p>
-If type <c>[node()]</c> then a connection is rejected if another already
+If <c>[node()]</c> then a connection is rejected if another already
 exists on any of the specified nodes.
 Types <c>false</c>, <c>node</c>, <c>nodes</c> and
 &evaluable; are equivalent to
@@ -803,8 +805,8 @@ Defaults to <c>nodes</c>.</p>
 <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
+of 32-bit End-to-End and Hop-by-Hop Identifiers generated
+by the service, either explicitly 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>
@@ -812,11 +814,11 @@ as follows.</p>
 (H bsl N) bor (Id band ((1 bsl N) - 1))
 </pre>
 <p>
-Note that &the_rfc; requires that End-to-End identifiers remain unique
+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
+places a lower bound on 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
@@ -829,7 +831,7 @@ Defaults to <c>{0,32}</c>.</p>
 <p>
 Multiple Erlang nodes implementing the same Diameter node should
 be configured with different sequence masks to ensure that each node
-uses a unique range of End-to-End and Hop-by-Hop identifiers for
+uses a unique range of End-to-End and Hop-by-Hop Identifiers for
 outgoing requests.</p>
 </warning>
 </item>
@@ -852,7 +854,7 @@ by the specified function, evaluated whenever a peer connection
 becomes available or a remote service requests information about local
 connections.
 The value <c>true</c> is equivalent to <c>fun &nodes;</c>.
-The value <c>node()</c> in a node list is ignored, so a collection of
+The value <c>node()</c> in a list is ignored, so a collection of
 services can all be configured to share with the same list of
 nodes.</p>
 
@@ -899,7 +901,7 @@ If <c>evaluable()</c> then only peers returned by the specified
 function are used, evaluated whenever a remote service communicates
 information about an available peer connection.
 The value <c>true</c> is equivalent to <c>fun &nodes;</c>.
-The value <c>node()</c> in a node list is ignored.</p>
+The value <c>node()</c> in a list is ignored.</p>
 
 <p>
 Defaults to <c>false</c>.</p>
@@ -946,7 +948,7 @@ Applications not configured on the service in question are ignored.</p>
 The capabilities advertised by a node must match its configured
 applications.
 In particular, setting <c>applications</c> on a transport typically
-implies having to set matching Application-Id AVP's in a
+implies having to set matching *-Application-Id AVPs in a
 &capabilities; tuple.</p>
 </warning>
 
@@ -956,7 +958,7 @@ implies having to set matching Application-Id AVP's in a
 <tag><c>{capabilities, [&capability;]}</c></tag>
 <item>
 <p>
-AVP's used to construct outgoing CER/CEA messages.
+AVPs used to construct outgoing CER/CEA messages.
 Values take precedence over any specified on the service in
 question.</p>
 
@@ -1021,14 +1023,45 @@ case the corresponding callbacks are applied until either all return
 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 of reconnection attempts is
-governed by &watchdog_timer; or &reconnect_timer; expiry.
+For a connecting transport, the timing of connection attempts is
+governed by &connect_timer; or &watchdog_timer; expiry.
 For a listening transport, the peer determines the timing.</p>
 
 <p>
 Defaults to 10000.</p>
 </item>
 
+<marker id="connect_timer"/>
+<tag><c>{connect_timer, Tc}</c></tag>
+<item>
+<pre>
+Tc = &dict_Unsigned32;
+</pre>
+
+<p>
+For a connecting transport, the &the_rfc; Tc timer, in milliseconds.
+This timer determines the frequency with which a transport
+attempts to establish an initial connection with its peer
+following transport configuration.
+Once an initial connection has been
+established, &watchdog_timer; 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 reestablishment,
+causing the RFC 3539 state machine to pass to state OKAY rather than
+REOPEN.
+Note that these semantics are not governed by the RFC and
+that a listening transport's &connect_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="disconnect_cb"/>
 <tag><c>{disconnect_cb, &evaluable;}</c></tag>
 
@@ -1036,14 +1069,12 @@ Defaults to 10000.</p>
 <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 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>
+Applied to <c>application|service|transport</c> and the
+<c>&transport_ref;</c> and <c>&app_peer;</c> in question:
+<c>application</c> indicates that the diameter application is
+being stopped, <c>service</c> that the service in question is being
+stopped by &stop_service;, and <c>transport</c> that the transport in
+question is being removed by &remove_transport;.</p>
 
 <p>
 The return value can have one of the following types.</p>
@@ -1145,36 +1176,6 @@ See &man_tcp; for the behaviour of that module.</p>
 </note>
 </item>
 
-<marker id="reconnect_timer"/>
-<tag><c>{reconnect_timer, Tc}</c></tag>
-<item>
-<pre>
-Tc = &dict_Unsigned32;
-</pre>
-
-<p>
-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>
-
-<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 OKAY rather than
-REOPEN.
-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="spawn_opt"/>
 <tag><c>{spawn_opt, [term()]}</c></tag>
 <item>
@@ -1661,7 +1662,7 @@ R_Flag}</c>.</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
+Note also that the <c>statistics</c> entry presents values accumulated
 during the lifetime of the transport configuration.</p>
 
 <p>
diff --git a/lib/diameter/doc/src/diameter_app.xml b/lib/diameter/doc/src/diameter_app.xml
index e6c9cc9a90..67c430c40a 100644
--- a/lib/diameter/doc/src/diameter_app.xml
+++ b/lib/diameter/doc/src/diameter_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
   <!ENTITY message '<seealso marker="#message">message()</seealso>'>
   <!ENTITY dict
@@ -308,7 +308,7 @@ 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
+the initial value as configured on the application, not any subsequent
 value returned by a &peer_up;
 or &peer_down; callback.</p>
 </warning>
@@ -565,7 +565,7 @@ Equivalent to</p>
 </pre>
 <p>
 where <c>Avps</c> sets the Origin-Host, Origin-Realm, the specified
-Result-Code and (if the request contained one) Session-Id AVP's, and
+Result-Code and (if the request contained one) Session-Id AVPs, and
 possibly Failed-AVP as described below.</p>
 
 <p>
diff --git a/lib/diameter/doc/src/diameter_codec.xml b/lib/diameter/doc/src/diameter_codec.xml
index 4a77d5435b..308a56fab7 100644
--- a/lib/diameter/doc/src/diameter_codec.xml
+++ b/lib/diameter/doc/src/diameter_codec.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
   <!ENTITY records
   '<seealso marker="diameter_dict#MESSAGE_RECORDS">diameter_dict(4)</seealso>'>
@@ -13,7 +13,7 @@
 <erlref>
 <header>
 <copyright>
-<year>2012</year>
+<year>2012</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -73,7 +73,7 @@ are defined in diameter.hrl, which can be included as follows.</p>
 </pre>
 
 <p>
-Application-specific records are definied in the hrl
+Application-specific records are defined in the hrl
 files resulting from dictionary file compilation.</p>
 
 </description>
@@ -122,7 +122,7 @@ Fields have the following types.</p>
 <item>
 <p>
 Values in the AVP header, corresponding to AVP Code, the M flag, P
-flags and Vendor-ID respectivelty.
+flags and Vendor-ID respectively.
 A Vendor-ID other than <c>undefined</c> implies a set V flag.</p>
 </item>
 
@@ -222,7 +222,7 @@ header.</p>
 <tag><c>is_retransmitted = boolean()</c></tag>
 <item>
 <p>
-Values correspoding to the R(equest), P(roxiable), E(rror)
+Values corresponding to the R(equest), P(roxiable), E(rror)
 and T(Potentially re-transmitted message) flags of the Diameter
 header.</p>
 </item>
diff --git a/lib/diameter/doc/src/diameter_dict.xml b/lib/diameter/doc/src/diameter_dict.xml
index 4fcde495b3..810a146b88 100644
--- a/lib/diameter/doc/src/diameter_dict.xml
+++ b/lib/diameter/doc/src/diameter_dict.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "fileref.dtd" [
   <!ENTITY format
            '<seealso marker="#FILE_FORMAT">FILE FORMAT</seealso>'>
@@ -431,7 +431,7 @@ equivalent to specifying it with <c>@avp_vendor_id</c>.</p>
 Defines values of AVP Name having type Enumerated.
 Section content consists of names and corresponding integer values.
 Integer values can be prefixed with 0x to be interpreted as
-hexidecimal.</p>
+hexadecimal.</p>
 
 <p>
 Note that the AVP in question can be defined in an inherited
@@ -609,7 +609,9 @@ UTF8String() = [integer()]
 <p>
 List elements are the UTF-8 encodings of the individual characters
 in the string.
-Invalid codepoints will result in encode/decode failure.</p>
+Invalid codepoints will result in encode/decode failure.
+On encode, a UTF8String() can be specified as a binary, or as a nested
+list of binaries and codepoints.</p>
 
 <marker id="DiameterIdentity"/>
 <pre>
diff --git a/lib/diameter/doc/src/diameter_examples.xml b/lib/diameter/doc/src/diameter_examples.xml
index 1fd7755695..7808d64b8d 100644
--- a/lib/diameter/doc/src/diameter_examples.xml
+++ b/lib/diameter/doc/src/diameter_examples.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
 <header>
 
 <copyright>
-<year>2011</year><year>2012</year>
+<year>2011</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
diff --git a/lib/diameter/doc/src/diameter_intro.xml b/lib/diameter/doc/src/diameter_intro.xml
index 288ebc0c7c..93293f2d8e 100644
--- a/lib/diameter/doc/src/diameter_intro.xml
+++ b/lib/diameter/doc/src/diameter_intro.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd" [
   <!ENTITY % also SYSTEM "seealso.ent">
   %also;
@@ -40,7 +40,7 @@ under the License.
 The diameter application is an implementation of the Diameter protocol
 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
+<em>dictionary</em> interface that allows messages and AVPs to be
 defined and input into diameter as configuration.
 It has support for all roles defined in the RFC: client, server and
 agent.
@@ -69,7 +69,7 @@ interface</seealso>.</p>
 <p>
 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 can be
+associated with capabilities AVPs so that a single service can be
 used to implement more than one Diameter node.</p>
 
 <p>
diff --git a/lib/diameter/doc/src/diameter_make.xml b/lib/diameter/doc/src/diameter_make.xml
index ec71251be1..13ec5bbfc1 100644
--- a/lib/diameter/doc/src/diameter_make.xml
+++ b/lib/diameter/doc/src/diameter_make.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
+  <!ENTITY compile_forms2
+  '<seealso marker="compiler:compile#forms-2">compile:forms/2</seealso>'>
   <!ENTITY filename
   '<seealso marker="kernel:file#type-name">file:name()</seealso>'>
   <!ENTITY dictionary
@@ -14,7 +16,7 @@
 <header>
 <copyright>
 <year>2012</year>
-<year>2013</year>
+<year>2014</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -51,7 +53,7 @@ under the License.
 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>
+to encode and decode the dictionary's messages and AVPs.</p>
 
 <p>
 The utility &man_compile; provides an alternate compilation
@@ -64,16 +66,47 @@ interface.</p>
 <funcs>
 
 <func>
-<name>codec(Path::string(), [Opt]) -> ok | {error, Reason}</name>
+<name>codec(File :: iolist() | binary(), [Opt]) -> ok
+                                                 | {ok, [Out]}
+                                                 | {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>
+Compile a single dictionary file.
+The input <c>File</c> can be either a path or a literal dictionary,
+the occurrence of newline (ascii NL) or carriage return (ascii CR)
+identifying the latter.
+<c>Opt</c> determines the format of the results and whether they are
+written to file or returned, and can have the following types.</p>
 
 <taglist>
 
+<tag><c>parse | forms | erl | hrl</c></tag>
+<item>
+<p>
+Specifies an output format.
+Whether the output is returned or written to file depends on whether
+or not option <c>return</c> is specified.
+When written to file, the resulting file(s) will have extensions
+<c>.D</c>, <c>.F</c>, <c>.erl</c>, and <c>.hrl</c>
+respectively, basenames defaulting to <c>dictionary</c> if the input
+dictionary is literal and does not specify <c>&dict_name;</c>.
+When returned, results are in the order of the corresponding format
+options.
+Format options default to <c>erl</c> and <c>hrl</c> (in this order) if
+unspecified.</p>
+
+<p>
+The <c>parse</c> format is an internal representation that can be
+passed to &flatten; and &format;, while the <c>forms</c> format can be
+passed to &compile_forms2;.
+The <c>erl</c> and <c>hrl</c> formats are returned as
+iolists.</p>
+<!-- That codec/2 can take the parsed format is undocumented, and
+     options name and inherits have no effect in this case. -->
+</item>
+
 <tag><c>{include, string()}</c></tag>
 <item>
 <p>
@@ -90,7 +123,15 @@ Multiple <c>include</c> options can be specified.</p>
 <item>
 <p>
 Write generated source to the specified directory.
-Defaults to the current working directory.</p>
+Defaults to the current working directory.
+Has no effect if option <c>return</c> is specified.</p>
+</item>
+
+<tag><c>return</c></tag>
+<item>
+<p>
+Return results in a <c>{ok, [Out]}</c> tuple instead of writing to
+file and returning <c>ok</c>.</p>
 </item>
 
 <tag><c>{name|prefix, string()}</c></tag>
@@ -108,7 +149,7 @@ Transform the input dictionary before compilation, appending
 <c>&dict_inherits;</c> of the specified string.</p>
 
 <p>
-Two forms of <c>@inherits</c> have special meaning:</p>
+Two forms have special meaning:</p>
 
 <pre>
 {inherits, "-"}
@@ -127,6 +168,57 @@ Multiple <c>inherits</c> options can be specified.</p>
 
 </taglist>
 
+<p>
+Note that a dictionary's <c>&dict_name;</c>, together with the
+<c>outdir</c> option, determine the output paths when the
+<c>return</c> option is not specified.
+The <c>&dict_name;</c> of a literal input dictionary defaults to
+<c>dictionary</c>.</p>
+
+<p>
+A returned error reason can be converted into a readable string using
+&format_error;.</p>
+
+</desc>
+</func>
+
+<!-- ===================================================================== -->
+
+<func>
+<name>format(Parsed) -> iolist()</name>
+<fsummary>Format a parsed dictionary.</fsummary>
+<desc>
+<p>
+Turns a parsed dictionary, as returned by &codec;, back into the
+dictionary format.</p>
+</desc>
+</func>
+
+<!-- ===================================================================== -->
+
+<func>
+<name>flatten(Parsed) -> term()</name>
+<fsummary>Flatten a parsed dictionary.</fsummary>
+<desc>
+
+<p>
+Reconstitute a parsed dictionary, as returned by &codec;, without
+using <c>&dict_inherits;</c>.
+That is, construct an equivalent dictionary in which all AVP's are
+definined in the dictionary itself.
+The return value is also a parsed dictionary.</p>
+</desc>
+</func>
+
+<!-- ===================================================================== -->
+
+<func>
+<name>format_error(Reason) -> string()</name>
+<fsummary>Turn an error reason into a readable string.</fsummary>
+<desc>
+
+<p>
+Turn an error reason returned by &codec; into a readable string.</p>
 </desc>
 </func>
 
@@ -138,11 +230,7 @@ Multiple <c>inherits</c> options can be specified.</p>
 <title>BUGS</title>
 
 <p>
-All options are string-valued.
-In particular, it is not currently possible to specify
-an &dict_inherits; module as an atom(), or a path as an arbitrary
-&filename;</p>
-
+Unrecognized options are silently ignored.</p>
 </section>
 
 <!-- ===================================================================== -->
diff --git a/lib/diameter/doc/src/diameter_sctp.xml b/lib/diameter/doc/src/diameter_sctp.xml
index 5fe14b1ef6..6302cb1435 100644
--- a/lib/diameter/doc/src/diameter_sctp.xml
+++ b/lib/diameter/doc/src/diameter_sctp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
   <!ENTITY gen_sctp '<seealso marker="kernel:gen_sctp">gen_sctp(3)</seealso>'>
   <!ENTITY gen_sctp_open1
@@ -15,7 +15,8 @@
 <erlref>
 <header>
 <copyright>
-<year>2011</year><year>2013</year>
+<year>2011</year>
+<year>2014</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -90,7 +91,7 @@ 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.
-Mupltiple <c>raddr</c> options can be specified, in which case the
+Multiple <c>raddr</c> options can be specified, in which case the
 connecting transport in question attempts each in sequence until
 an association is established.</p>
 
@@ -113,7 +114,7 @@ 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 <c>Host-IP-Address</c>
-in the <c>#diameter_service{}</c> record are used.
+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>
@@ -131,25 +132,18 @@ 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
-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 &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 &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.                                                -->
-
+The <c>transport_data</c> field of record <c>diameter_packet</c>
+is used 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> for an inbound
+message passed to a &app_handle_request; or &app_handle_answer;
+callback.
+For an outbound message, <c>{outstream, Id}</c> in the return value of
+&app_handle_request; or &app_prepare_retransmit; sets the outbound
+stream, the stream id being interpreted modulo the number of outbound
+streams.
+Any other value, or not setting a value, causes successive such sends
+to cycle though all outbound streams.</p>
 </desc>
 </func>
 
diff --git a/lib/diameter/doc/src/diameter_soc.xml b/lib/diameter/doc/src/diameter_soc.xml
index 4f5419122f..d9159f84b5 100644
--- a/lib/diameter/doc/src/diameter_soc.xml
+++ b/lib/diameter/doc/src/diameter_soc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd" [
   <!ENTITY % also SYSTEM "seealso.ent" >
   %also;
diff --git a/lib/diameter/doc/src/diameter_soc_rfc6733.xml b/lib/diameter/doc/src/diameter_soc_rfc6733.xml
index 8d85569650..34ec902632 100644
--- a/lib/diameter/doc/src/diameter_soc_rfc6733.xml
+++ b/lib/diameter/doc/src/diameter_soc_rfc6733.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 
 <!--
 
 <copyright>
-<year>2013</year>
+<year>2013</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 
@@ -1272,7 +1272,7 @@ during capabilities exchange.)</p>
 
 <p>
 The frequency of reconnection attempts is configured with the
-&mod_transport_opt; <c>reconnect_timer</c> and
+&mod_transport_opt; <c>connect_timer</c> and
 <c>watchdog_timer</c>.</p>
 
 <pre>
diff --git a/lib/diameter/doc/src/diameter_tcp.xml b/lib/diameter/doc/src/diameter_tcp.xml
index ce4d6cfd0f..f6bbe7dd23 100644
--- a/lib/diameter/doc/src/diameter_tcp.xml
+++ b/lib/diameter/doc/src/diameter_tcp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
   <!ENTITY start '<seealso marker="#start-3">start/3</seealso>'>
   <!ENTITY gen_tcp_connect3
diff --git a/lib/diameter/doc/src/diameter_transport.xml b/lib/diameter/doc/src/diameter_transport.xml
index 9161bd1f48..1618d05c47 100644
--- a/lib/diameter/doc/src/diameter_transport.xml
+++ b/lib/diameter/doc/src/diameter_transport.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd" [
   <!ENTITY message '<seealso marker="#message">message()</seealso>'>
   <!ENTITY MESSAGES '<seealso marker="#MESSAGES">MESSAGES</seealso>'>
diff --git a/lib/diameter/doc/src/diameter_using.xml b/lib/diameter/doc/src/diameter_using.xml
index c487d94a16..4427d29c3c 100644
--- a/lib/diameter/doc/src/diameter_using.xml
+++ b/lib/diameter/doc/src/diameter_using.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/diameter/doc/src/diameter_compile.xml b/lib/diameter/doc/src/diameterc.xml
index 6630019e5c..5bffe9a771 100644
--- a/lib/diameter/doc/src/diameter_compile.xml
+++ b/lib/diameter/doc/src/diameterc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE comref SYSTEM "comref.dtd" [
   <!ENTITY dictionary
   '<seealso marker="diameter_dict">dictionary file</seealso>'>
@@ -29,7 +29,7 @@ supplied.
 <docno></docno>
 <date></date>
 <rev></rev>
-<file>diameter_compile.xml</file>
+<file>diameterc.xml</file>
 </header>
 
 <com>diameterc</com>
@@ -41,7 +41,7 @@ supplied.
 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>
+to encode and decode the dictionary's messages and AVPs.</p>
 
 <p>
 The module &man_make; provides an alternate compilation interface.</p>
@@ -83,7 +83,7 @@ Defaults to the current working directory.</p>
 <tag><![CDATA[-H]]></tag>
 <item>
 <p>
-Supress erl and hrl generation, respectively.</p>
+Suppress erl and hrl generation, respectively.</p>
 </item>
 
 <tag><![CDATA[--name <name>]]></tag>
diff --git a/lib/diameter/doc/src/files.mk b/lib/diameter/doc/src/files.mk
index 510786a7fb..6e8b1f9068 100644
--- a/lib/diameter/doc/src/files.mk
+++ b/lib/diameter/doc/src/files.mk
@@ -21,7 +21,7 @@ XML_APPLICATION_FILES = \
 	ref_man.xml
 
 XML_REF1_FILES = \
-	diameter_compile.xml
+	diameterc.xml
 
 XML_REF3_FILES = \
 	diameter.xml \
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index e750b56f1e..cd14195e78 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd" [
   <!ENTITY % also SYSTEM "seealso.ent" >
   <!ENTITY % here SYSTEM "seehere.ent" >
@@ -42,6 +42,124 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 1.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Rename reconnect_timer to connect_timer.</p>
+          <p>
+	    The former is still accepted for backwards compatibility,
+	    but the name is misleading given the semantics of the
+	    timer.</p>
+          <p>
+	    Own Id: OTP-11168</p>
+        </item>
+        <item>
+          <p>
+	    Extend diameter_make(3).</p>
+          <p>
+	    Dictionaries can now be compiled from strings, not just
+	    filesystem paths, and results can be returned instead of
+	    written to the filesystem.</p>
+          <p>
+	    Own Id: OTP-11348</p>
+        </item>
+        <item>
+          <p>
+	    Remove hardcoding of diameter_base as @prefix on
+	    dictionaries for application id 0.</p>
+          <p>
+	    Own Id: OTP-11361</p>
+        </item>
+        <item>
+          <p>
+	    Fix silent make rules (Thanks to Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11514</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>diameter 1.4.4</title>
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Fix setting of End-to-End and Hop-by-Hop Identifiers in
+	    outgoing DWA.</p>
+          <p>
+	    Broken by OTP-11184, which caused the identifiers to be
+	    set anew, discarding the values from the incoming DWR.</p>
+          <p>
+	    Own Id: OTP-11367</p>
+        </item>
+        <item>
+          <p>
+	    Fix handling of 5014, DIAMETER_INVALID_AVP_LENGTH.</p>
+          <p>
+	    The error was detected as 5004,
+	    DIAMETER_INVALID_AVP_VALUE, for some Diameter types, in
+	    which case an AVP length that pointed past the end of a
+	    message resulted in encode failure.</p>
+          <p>
+	    Own Id: OTP-11395</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>diameter 1.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix UTF8String encode.</p>
+          <p>
+	    Encode now accepts any nested list of codepoints and
+	    binaries. A list containing a binary was previously
+	    misinterpreted and the documentation was incomplete.</p>
+          <p>
+	    Own Id: OTP-11172</p>
+        </item>
+        <item>
+          <p>
+	    Ensure DWR isn't sent immediately after DWA.</p>
+          <p>
+	    This was possible if the timing was unfortunate. An
+	    incoming DWR now properly resets the watchdog timer.</p>
+          <p>
+	    Own Id: OTP-11184</p>
+        </item>
+        <item>
+          <p>
+	    Fix faulty encode of Failed-AVP</p>
+          <p>
+	    Reception of a CER, DWR or DPR that has decode failures
+	    caused encode of the corresponding answer message to
+	    fail.</p>
+          <p>
+	    Own Id: OTP-11293</p>
+        </item>
+        <item>
+          <p>
+	    Fix broken service_opt() spawn_opt.</p>
+          <p>
+	    The option was ignored.</p>
+          <p>
+	    Own Id: OTP-11299</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 1.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/doc/src/ref_man.xml b/lib/diameter/doc/src/ref_man.xml
index 4b99fe716d..62ba02b0b5 100644
--- a/lib/diameter/doc/src/ref_man.xml
+++ b/lib/diameter/doc/src/ref_man.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -6,7 +6,7 @@
 <header>
 <copyright>
 <year>2011</year>
-<year>2012</year>
+<year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
@@ -39,7 +39,7 @@ applications on top of the Diameter protocol. </p>
 </description>
 
 <xi:include href="diameter.xml"/>
-<xi:include href="diameter_compile.xml"/>
+<xi:include href="diameterc.xml"/>
 <xi:include href="diameter_app.xml"/>
 <xi:include href="diameter_codec.xml"/>
 <xi:include href="diameter_dict.xml"/>
diff --git a/lib/diameter/doc/src/seealso.ent b/lib/diameter/doc/src/seealso.ent
index 76b9823f79..44541afb9b 100644
--- a/lib/diameter/doc/src/seealso.ent
+++ b/lib/diameter/doc/src/seealso.ent
@@ -4,7 +4,7 @@
 
 %CopyrightBegin%
 
-Copyright Ericsson AB 2012-2013. All Rights Reserved.
+Copyright Ericsson AB 2012-2014. All Rights Reserved.
 
 The 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 @@ significant.
 <!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 connect_timer '<seealso marker="#connect_timer">connect_timer</seealso>'>
 <!ENTITY watchdog_timer '<seealso marker="#watchdog_timer">watchdog_timer</seealso>'>
 
 <!-- diameter_app -->
@@ -115,6 +115,9 @@ significant.
 <!-- diameter_make -->
 
 <!ENTITY make_codec '<seealso marker="diameter_make#codec-2">diameter_make:codec/2</seealso>'>
+<!ENTITY make_format '<seealso marker="diameter_make#format-1">diameter_make:format/1</seealso>'>
+<!ENTITY make_flatten '<seealso marker="diameter_make#flatten-1">diameter_make:flatten/1</seealso>'>
+<!ENTITY make_format_error '<seealso marker="diameter_make#format_error-1">diameter_make:format_error/1</seealso>'>
 
 <!-- diameter_transport -->
 
diff --git a/lib/diameter/doc/src/user_man.xml b/lib/diameter/doc/src/user_man.xml
index a6416c7e23..f915fa5a66 100644
--- a/lib/diameter/doc/src/user_man.xml
+++ b/lib/diameter/doc/src/user_man.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <header>
 <copyright>
-<year>2011</year>
+<year>2011</year><year>2013</year>
 <holder>Ericsson AB. All Rights Reserved.</holder>
 </copyright>
 <legalnotice>
diff --git a/lib/diameter/doc/standard/rfc7068.txt b/lib/diameter/doc/standard/rfc7068.txt
new file mode 100644
index 0000000000..70fc24fab0
--- /dev/null
+++ b/lib/diameter/doc/standard/rfc7068.txt
@@ -0,0 +1,1627 @@
+
+
+
+
+
+
+Internet Engineering Task Force (IETF)                        E. McMurry
+Request for Comments: 7068                                   B. Campbell
+Category: Informational                                           Oracle
+ISSN: 2070-1721                                            November 2013
+
+
+                 Diameter Overload Control Requirements
+
+Abstract
+
+   When a Diameter server or agent becomes overloaded, it needs to be
+   able to gracefully reduce its load, typically by advising clients to
+   reduce traffic for some period of time.  Otherwise, it must continue
+   to expend resources parsing and responding to Diameter messages,
+   possibly resulting in a progressively severe overload condition.  The
+   existing Diameter mechanisms are not sufficient for managing overload
+   conditions.  This document describes the limitations of the existing
+   mechanisms.  Requirements for new overload management mechanisms are
+   also provided.
+
+Status of This Memo
+
+   This document is not an Internet Standards Track specification; it is
+   published for informational purposes.
+
+   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).  Not all documents
+   approved by the IESG are a candidate for any level of Internet
+   Standard; see 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/rfc7068.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                     [Page 1]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+Copyright Notice
+
+   Copyright (c) 2013 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.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                     [Page 2]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+Table of Contents
+
+   1. Introduction ....................................................4
+      1.1. Documentation Conventions ..................................4
+      1.2. Causes of Overload .........................................5
+      1.3. Effects of Overload ........................................6
+      1.4. Overload vs. Network Congestion ............................6
+      1.5. Diameter Applications in a Broader Network .................7
+   2. Overload Control Scenarios ......................................7
+      2.1. Peer-to-Peer Scenarios .....................................8
+      2.2. Agent Scenarios ...........................................10
+      2.3. Interconnect Scenario .....................................14
+   3. Diameter Overload Case Studies .................................15
+      3.1. Overload in Mobile Data Networks ..........................15
+      3.2. 3GPP Study on Core Network Overload .......................16
+   4. Existing Mechanisms ............................................17
+   5. Issues with the Current Mechanisms .............................18
+      5.1. Problems with Implicit Mechanism ..........................18
+      5.2. Problems with Explicit Mechanisms .........................18
+   6. Extensibility and Application Independence .....................19
+   7. Solution Requirements ..........................................20
+      7.1. General ...................................................20
+      7.2. Performance ...............................................21
+      7.3. Heterogeneous Support for Solution ........................22
+      7.4. Granular Control ..........................................23
+      7.5. Priority and Policy .......................................23
+      7.6. Security ..................................................23
+      7.7. Flexibility and Extensibility .............................24
+   8. Security Considerations ........................................25
+      8.1. Access Control ............................................25
+      8.2. Denial-of-Service Attacks .................................26
+      8.3. Replay Attacks ............................................26
+      8.4. Man-in-the-Middle Attacks .................................26
+      8.5. Compromised Hosts .........................................27
+   9. References .....................................................27
+      9.1. Normative References ......................................27
+      9.2. Informative References ....................................27
+   Appendix A. Contributors ..........................................29
+   Appendix B. Acknowledgements ......................................29
+
+
+
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                     [Page 3]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+1.  Introduction
+
+   A Diameter [RFC6733] node is said to be overloaded when it has
+   insufficient resources to successfully process all of the Diameter
+   requests that it receives.  When a node becomes overloaded, it needs
+   to be able to gracefully reduce its load, typically by advising
+   clients to reduce traffic for some period of time.  Otherwise, it
+   must continue to expend resources parsing and responding to Diameter
+   messages, possibly resulting in a progressively severe overload
+   condition.  The existing mechanisms provided by Diameter are not
+   sufficient for managing overload conditions.  This document describes
+   the limitations of the existing mechanisms and provides requirements
+   for new overload management mechanisms.
+
+   This document draws on the work done on SIP overload control
+   ([RFC5390], [RFC6357]) as well as on experience gained via overload
+   handling in Signaling System No. 7 (SS7) networks and studies done by
+   the Third Generation Partnership Project (3GPP) (Section 3).
+
+   Diameter is not typically an end-user protocol; rather, it is
+   generally used as one component in support of some end-user activity.
+
+   For example, a SIP server might use Diameter to authenticate and
+   authorize user access.  Overload in the Diameter backend
+   infrastructure will likely impact the experience observed by the end
+   user in the SIP application.
+
+   The impact of Diameter overload on the client application (a client
+   application may use the Diameter protocol and other protocols to do
+   its job) is beyond the scope of this document.
+
+   This document presents non-normative descriptions of causes of
+   overload, along with related scenarios and studies.  Finally, it
+   offers a set of normative requirements for an improved overload
+   indication mechanism.
+
+1.1.  Documentation Conventions
+
+   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 defined in [RFC2119], with the
+   exception that they are not intended for interoperability of
+   implementations.  Rather, they are used to describe requirements
+   towards future specifications where the interoperability requirements
+   will be defined.
+
+   The terms "client", "server", "agent", "node", "peer", "upstream",
+   and "downstream" are used as defined in [RFC6733].
+
+
+
+McMurry & Campbell            Informational                     [Page 4]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+1.2.  Causes of Overload
+
+   Overload occurs when an element, such as a Diameter server or agent,
+   has insufficient resources to successfully process all of the traffic
+   it is receiving.  Resources include all of the capabilities of the
+   element used to process a request, including CPU processing, memory,
+   I/O, and disk resources.  It can also include external resources such
+   as a database or DNS server, in which case the CPU, processing,
+   memory, I/O, and disk resources of those elements are effectively
+   part of the logical element processing the request.
+
+   External resources can include upstream Diameter nodes; for example,
+   a Diameter agent can become effectively overloaded if one or more
+   upstream nodes are overloaded.
+
+   A Diameter node can become overloaded due to request levels that
+   exceed its capacity, a reduction of available resources (for example,
+   a local or upstream hardware failure), or a combination of the two.
+
+   Overload can occur for many reasons, including:
+
+   Inadequate capacity:  When designing Diameter networks, that is,
+      application-layer multi-node Diameter deployments, it can be very
+      difficult to predict all scenarios that may cause elevated
+      traffic.  It may also be more costly to implement support for some
+      scenarios than a network operator may deem worthwhile.  This
+      results in the likelihood that a Diameter network will not have
+      adequate capacity to handle all situations.
+
+   Dependency failures:  A Diameter node can become overloaded because a
+      resource on which it depends has failed or become overloaded,
+      greatly reducing the logical capacity of the node.  In these
+      cases, even minimal traffic might cause the node to go into
+      overload.  Examples of such dependency overloads include DNS
+      servers, databases, disks, and network interfaces that have failed
+      or become overloaded.
+
+   Component failures:  A Diameter node can become overloaded when it is
+      a member of a cluster of servers that each share the load of
+      traffic and one or more of the other members in the cluster fail.
+      In this case, the remaining nodes take over the work of the failed
+      nodes.  Normally, capacity planning takes such failures into
+      account, and servers are typically run with enough spare capacity
+      to handle failure of another node.  However, unusual failure
+      conditions can cause many nodes to fail at once.  This is often
+      the case with software failures, where a bad packet or bad
+      database entry hits the same bug in a set of nodes in a cluster.
+
+
+
+
+McMurry & Campbell            Informational                     [Page 5]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   Network-initiated traffic flood:  Certain access network events can
+      precipitate floods of Diameter signaling traffic.  For example,
+      operational changes can trigger avalanche restarts, or frequent
+      radio overlay handovers can generate excessive authorization
+      requests.  Failure of a Diameter proxy may also result in a large
+      amount of signaling as connections and sessions are reestablished.
+
+   Subscriber-initiated traffic flood:  Large gatherings of subscribers
+      or events that result in many subscribers interacting with the
+      network in close time proximity can result in Diameter signaling
+      traffic floods.  For example, the finale of a large fireworks show
+      could be immediately followed by many subscribers posting
+      messages, pictures, and videos concentrated on one portion of a
+      network.  Subscriber devices such as smartphones may use
+      aggressive registration strategies that generate unusually high
+      Diameter traffic loads.
+
+   DoS attacks:  An attacker wishing to disrupt service in the network
+      can cause a large amount of traffic to be launched at a target
+      element.  This can be done from a central source of traffic or
+      through a distributed DoS attack.  In all cases, the volume of
+      traffic well exceeds the capacity of the element, sending the
+      system into overload.
+
+1.3.  Effects of Overload
+
+   Modern Diameter networks, composed of application-layer multi-node
+   deployments of Diameter elements, may operate at very large
+   transaction volumes.  If a Diameter node becomes overloaded or, even
+   worse, fails completely, a large number of messages may be lost very
+   quickly.  Even with redundant servers, many messages can be lost in
+   the time it takes for failover to complete.  While a Diameter client
+   or agent should be able to retry such requests, an overloaded peer
+   may cause a sudden large increase in the number of transactions
+   needing to be retried, rapidly filling local queues or otherwise
+   contributing to local overload.  Therefore, Diameter devices need to
+   be able to shed load before critical failures can occur.
+
+1.4.  Overload vs. Network Congestion
+
+   This document uses the term "overload" to refer to application-layer
+   overload at Diameter nodes.  This is distinct from "network
+   congestion", that is, congestion that occurs at the lower networking
+   layers that may impact the delivery of Diameter messages between
+   nodes.  This document recognizes that element overload and network
+   congestion are interrelated, and that overload can contribute to
+   network congestion and vice versa.
+
+
+
+
+McMurry & Campbell            Informational                     [Page 6]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   Network congestion issues are better handled by the transport
+   protocols.  Diameter uses TCP and the Stream Control Transmission
+   Protocol (SCTP), both of which include congestion management
+   features.  Analysis of whether those features are sufficient for
+   transport-level congestion between Diameter nodes and of any work to
+   further mitigate network congestion is out of scope for both this
+   document and the work proposed by it.
+
+1.5.  Diameter Applications in a Broader Network
+
+   Most elements using Diameter applications do not use Diameter
+   exclusively.  It is important to realize that overload of an element
+   can be caused by a number of factors that may be unrelated to the
+   processing of Diameter or Diameter applications.
+
+   An element that doesn't use Diameter exclusively needs to be able to
+   signal to Diameter peers that it is experiencing overload regardless
+   of the cause of the overload, since the overload will affect that
+   element's ability to process Diameter transactions.  If the element
+   communicates with protocols other than Diameter, it may also need to
+   signal the overload situation on these protocols, depending on its
+   function and the architecture of the network and application for
+   which it is providing services.  Whether that is necessary can only
+   be decided within the context of that architecture and use cases.
+   This specification details the requirements for a mechanism for
+   signaling overload with Diameter; this mechanism provides Diameter
+   nodes the ability to inform their Diameter peers of overload,
+   mitigating that part of the issue.  Diameter nodes may need to use
+   this, as well as other mechanisms, to solve their broader overload
+   issues.  Indicating overload on protocols other than Diameter is out
+   of scope for this document and for the work proposed by it.
+
+2.  Overload Control Scenarios
+
+   Several Diameter deployment scenarios exist that may impact overload
+   management.  The following scenarios help motivate the requirements
+   for an overload management mechanism.
+
+   These scenarios are by no means exhaustive and are in general
+   simplified for the sake of clarity.  In particular, this document
+   assumes for the sake of clarity that the client sends Diameter
+   requests to the server, and the server sends responses to the client,
+   even though Diameter supports bidirectional applications.  Each
+   direction in such an application can be modeled separately.
+
+   In a large-scale deployment, many of the nodes represented in these
+   scenarios would be deployed as clusters of servers.  This document
+   assumes that such a cluster is responsible for managing its own
+
+
+
+McMurry & Campbell            Informational                     [Page 7]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   internal load-balancing and overload management so that it appears as
+   a single Diameter node.  That is, other Diameter nodes can treat it
+   as a single, monolithic node for the purposes of overload management.
+
+   These scenarios do not illustrate the client application.  As
+   mentioned in Section 1, Diameter is not typically an end-user
+   protocol; rather, it is generally used in support of some other
+   client application.  These scenarios do not consider the impact of
+   Diameter overload on the client application.
+
+2.1.  Peer-to-Peer Scenarios
+
+   This section describes Diameter peer-to-peer scenarios, that is,
+   scenarios where a Diameter client talks directly with a Diameter
+   server, without the use of a Diameter agent.
+
+   Figure 1 illustrates the simplest possible Diameter relationship.
+   The client and server share a one-to-one peer-to-peer relationship.
+   If the server becomes overloaded, either because the client exceeds
+   the server's capacity or because the server's capacity is reduced due
+   to some resource dependency, the client needs to reduce the amount of
+   Diameter traffic it sends to the server.  Since the client cannot
+   forward requests to another server, it must either queue requests
+   until the server recovers or itself become overloaded in the context
+   of the client application and other protocols it may also use.
+
+                            +------------------+
+                            |                  |
+                            |                  |
+                            |     Server       |
+                            |                  |
+                            +--------+---------+
+                                     |
+                                     |
+                            +--------+---------+
+                            |                  |
+                            |                  |
+                            |     Client       |
+                            |                  |
+                            +------------------+
+
+                   Figure 1: Basic Peer-to-Peer Scenario
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                     [Page 8]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   Figure 2 shows a similar scenario, except in this case the client has
+   multiple servers that can handle work for a specific realm and
+   application.  If Server 1 becomes overloaded, the client can forward
+   traffic to Server 2.  Assuming that Server 2 has sufficient reserve
+   capacity to handle the forwarded traffic, the client should be able
+   to continue serving client application protocol users.  If Server 1
+   is approaching overload, but can still handle some number of new
+   requests, it needs to be able to instruct the client to forward a
+   subset of its traffic to Server 2.
+
+               +------------------+     +------------------+
+               |                  |     |                  |
+               |                  |     |                  |
+               |     Server 1     |     |     Server 2     |
+               |                  |     |                  |
+               +--------+-`.------+     +------.'+---------+
+                            `.               .'
+                              `.           .'
+                                `.       .'
+                                  `.   .'
+                            +-------`.'--------+
+                            |                  |
+                            |                  |
+                            |     Client       |
+                            |                  |
+                            +------------------+
+
+              Figure 2: Multiple-Server Peer-to-Peer Scenario
+
+   Figure 3 illustrates a peer-to-peer scenario with multiple Diameter
+   realm and application combinations.  In this example, Server 2 can
+   handle work for both applications.  Each application might have
+   different resource dependencies.  For example, a server might need to
+   access one database for Application A and another for Application B.
+   This creates a possibility that Server 2 could become overloaded for
+   Application A but not for Application B, in which case the client
+   would need to divert some part of its Application A requests to
+   Server 1, but the client should not divert any Application B
+   requests.  This requires that Server 2 be able to distinguish between
+   applications when it indicates an overload condition to the client.
+
+   On the other hand, it's possible that the servers host many
+   applications.  If Server 2 becomes overloaded for all applications,
+   it would be undesirable for it to have to notify the client
+   separately for each application.  Therefore, it also needs a way to
+   indicate that it is overloaded for all possible applications.
+
+
+
+
+
+McMurry & Campbell            Informational                     [Page 9]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   +---------------------------------------------+
+   | Application A       +----------------------+----------------------+
+   |+------------------+ |  +----------------+  |  +------------------+|
+   ||                  | |  |                |  |  |                  ||
+   ||                  | |  |                |  |  |                  ||
+   ||     Server 1     | |  |    Server 2    |  |  |     Server 3     ||
+   ||                  | |  |                |  |  |                  ||
+   |+--------+---------+ |  +-------+--------+  |  +-+----------------+|
+   |         |           |          |           |    |                 |
+   +---------+-----------+----------+-----------+    |                 |
+             |           |          |                |                 |
+             |           |          |                |  Application B  |
+             |           +----------+----------------+-----------------+
+             ``-.._                 |                |
+                   `-..__           |            _.-''
+                        `--._       |        _.-''
+                             ``-._  |   _.-''
+                            +-----`-.-''-----+
+                            |                |
+                            |                |
+                            |     Client     |
+                            |                |
+                            +----------------+
+
+           Figure 3: Multiple-Application Peer-to-Peer Scenario
+
+2.2.  Agent Scenarios
+
+   This section describes scenarios that include a Diameter agent, in
+   the form of either a Diameter relay or Diameter proxy.  These
+   scenarios do not consider Diameter redirect agents, since they are
+   more readily modeled as end servers.  The examples have been kept
+   simple deliberately, to illustrate basic concepts.  Significantly
+   more complicated topologies are possible with Diameter, including
+   multiple intermediate agents in a path connected in a variety
+   of ways.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 10]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   Figure 4 illustrates a simple Diameter agent scenario with a single
+   client, agent, and server.  In this case, overload can occur at the
+   server, at the agent, or both.  But in most cases, client behavior is
+   the same whether overload occurs at the server or at the agent.  From
+   the client's perspective, server overload and agent overload are the
+   same thing.
+
+                           +------------------+
+                           |                  |
+                           |                  |
+                           |     Server       |
+                           |                  |
+                           +--------+---------+
+                                    |
+                                    |
+                           +--------+---------+
+                           |                  |
+                           |                  |
+                           |      Agent       |
+                           |                  |
+                           +--------+---------+
+                                    |
+                                    |
+                           +--------+---------+
+                           |                  |
+                           |                  |
+                           |     Client       |
+                           |                  |
+                           +------------------+
+
+                      Figure 4: Basic Agent Scenario
+
+   Figure 5 shows an agent scenario with multiple servers.  If Server 1
+   becomes overloaded but Server 2 has sufficient reserve capacity, the
+   agent may be able to transparently divert some or all Diameter
+   requests originally bound for Server 1 to Server 2.
+
+   In most cases, the client does not have detailed knowledge of the
+   Diameter topology upstream of the agent.  If the agent uses dynamic
+   discovery to find eligible servers, the set of eligible servers may
+   not be enumerable from the perspective of the client.  Therefore, in
+   most cases the agent needs to deal with any upstream overload issues
+   in a way that is transparent to the client.  If one server notifies
+   the agent that it has become overloaded, the notification should not
+   be passed back to the client in a way that the client could
+   mistakenly perceive the agent itself as being overloaded.  If the set
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 11]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   of all possible destinations upstream of the agent no longer has
+   sufficient capacity for incoming load, the agent itself becomes
+   effectively overloaded.
+
+   On the other hand, there are cases where the client needs to be able
+   to select a particular server from behind an agent.  For example, if
+   a Diameter request is part of a multiple-round-trip authentication,
+   or is otherwise part of a Diameter "session", it may have a
+   Destination-Host Attribute-Value Pair (AVP) that requires that the
+   request be served by Server 1.  Therefore, the agent may need to
+   inform a client that a particular upstream server is overloaded or
+   otherwise unavailable.  Note that there can be many ways a server can
+   be specified, which may have different implications (e.g., by IP
+   address, by host name, etc).
+
+              +------------------+     +------------------+
+              |                  |     |                  |
+              |                  |     |                  |
+              |     Server 1     |     |     Server 2     |
+              |                  |     |                  |
+              +--------+-`.------+     +------.'+---------+
+                           `.               .'
+                             `.           .'
+                               `.       .'
+                                 `.   .'
+                           +-------`.'--------+
+                           |                  |
+                           |                  |
+                           |     Agent        |
+                           |                  |
+                           +--------+---------+
+                                    |
+                                    |
+                                    |
+                           +--------+---------+
+                           |                  |
+                           |                  |
+                           |     Client       |
+                           |                  |
+                           +------------------+
+
+                 Figure 5: Multiple-Server Agent Scenario
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 12]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   Figure 6 shows a scenario where an agent routes requests to a set of
+   servers for more than one Diameter realm and application.  In this
+   scenario, if Server 1 becomes overloaded or unavailable while
+   Server 2 still has available capacity, the agent may effectively
+   operate at reduced capacity for Application A but at full capacity
+   for Application B.  Therefore, the agent needs to be able to report
+   that it is overloaded for one application but not for another.
+
+   +--------------------------------------------+
+   | Application A       +----------------------+----------------------+
+   |+------------------+ |  +----------------+  |  +------------------+|
+   ||                  | |  |                |  |  |                  ||
+   ||                  | |  |                |  |  |                  ||
+   ||     Server 1     | |  |    Server 2    |  |  |     Server 3     ||
+   ||                  | |  |                |  |  |                  ||
+   |+---------+--------+ |  +-------+--------+  |  +--+---------------+|
+   |          |          |          |           |     |                |
+   +----------+----------+----------+-----------+     |                |
+              |          |          |                 |                |
+              |          |          |                 | Application B  |
+              |          +----------+-----------------+----------------+
+              |                     |                 |
+               ``--.__              |                _.
+                      ``-.__        |          __.--''
+                            `--.._  |    _..--'
+                            +----``-+.''-----+
+                            |                |
+                            |                |
+                            |    Agent       |
+                            |                |
+                            +-------+--------+
+                                    |
+                                    |
+                            +-------+--------+
+                            |                |
+                            |                |
+                            |    Client      |
+                            |                |
+                            +----------------+
+
+               Figure 6: Multiple-Application Agent Scenario
+
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 13]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+2.3.  Interconnect Scenario
+
+   Another scenario to consider when looking at Diameter overload is
+   that of multiple network operators using Diameter components
+   connected through an interconnect service, e.g., using IPX (IP Packet
+   eXchange).  IPX [IR.34] is an Inter-Operator IP Backbone that
+   provides a roaming interconnection network between mobile operators
+   and service providers.  IPX is also used to transport Diameter
+   signaling between operators [IR.88].  Figure 7 shows two network
+   operators with an interconnect network between them.  There could be
+   any number of these networks between any two network operators'
+   networks.
+
+               +-------------------------------------------+
+               |               Interconnect                |
+               |                                           |
+               |   +--------------+      +--------------+  |
+               |   |   Server 3   |------|   Server 4   |  |
+               |   +--------------+      +--------------+  |
+               |         .'                      `.        |
+               +------.-'--------------------------`.------+
+                    .'                               `.
+                 .-'                                   `.
+   ------------.'-----+                             +----`.-------------
+         +----------+ |                             | +----------+
+         | Server 1 | |                             | | Server 2 |
+         +----------+ |                             | +----------+
+                      |                             |
+   Network Operator 1 |                             | Network Operator 2
+   -------------------+                             +-------------------
+
+                Figure 7: Two-Network Interconnect Scenario
+
+   The characteristics of the information that an operator would want to
+   share over such a connection are different from the information
+   shared between components within a network operator's network.  For
+   example, network operators may not want to convey topology or
+   operational information; this would in turn limit how much overload
+   and loading information can be sent.  For the interconnect scenario
+   shown in Figure 7, Server 2 may want to signal overload to Server 1,
+   to affect traffic coming from Network Operator 1.
+
+   This case is distinct from those internal to a network operator's
+   network, where there may be many more elements in a more complicated
+   topology.  Also, the elements in the interconnect network may not
+   support Diameter overload control, and the network operators may not
+   want the interconnect network to use overload or loading information.
+   They may only want the information to pass through the interconnect
+
+
+
+McMurry & Campbell            Informational                    [Page 14]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   network without further processing or action by the interconnect
+   network, even if the elements in the interconnect network do support
+   Diameter overload control.
+
+3.  Diameter Overload Case Studies
+
+3.1.  Overload in Mobile Data Networks
+
+   As the number of smartphone devices that are Third Generation (3G)
+   and Long Term Evolution (LTE) enabled continues to expand in mobile
+   networks, there have been situations where high signaling traffic
+   load led to overload events at the Diameter-based Home Location
+   Registers (HLRs) and/or Home Subscriber Servers (HSS) [TR23.843].
+   The root causes of the HLR overload events were manifold but included
+   hardware failure and procedural errors.  The result was high
+   signaling traffic load on the HLR and HSS.
+
+   The 3GPP architecture [TS23.002] makes extensive use of Diameter.  It
+   is used for mobility management [TS29.272], the IP Multimedia
+   Subsystem (IMS) [TS29.228], and policy and charging control
+   [TS29.212], as well as other functions.  The details of the
+   architecture are out of scope for this document, but it is worth
+   noting that there are quite a few Diameter applications, some with
+   quite large amounts of Diameter signaling in deployed networks.
+
+   The 3GPP specifications do not currently address overload for
+   Diameter applications or provide a load control mechanism equivalent
+   to those provided in the more traditional SS7 elements in the Global
+   System for Mobile Communications (GSM); see [TS29.002].  The
+   capabilities specified in the 3GPP standards do not adequately
+   address the abnormal condition where excessively high signaling
+   traffic load situations are experienced.
+
+   Smartphones, which comprise an increasingly large percentage of
+   mobile devices, contribute much more heavily, relative to
+   non-smartphones, to the continuation of a registration surge, due to
+   their very aggressive registration algorithms.  Smartphone behavior
+   contributes to network loading and can contribute to overload
+   conditions.  The aggressive smartphone logic is designed to:
+
+   a.  always have voice and data registration, and
+
+   b.  constantly try to be on 3G or LTE data (and thus on 3G voice or
+       Voice over LTE (VoLTE) [IR.92]) for their added benefits.
+
+   Non-smartphones typically have logic to wait for a time period after
+   registering successfully on voice and data.
+
+
+
+
+McMurry & Campbell            Informational                    [Page 15]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   The aggressive smartphone registration is problematic in two ways:
+
+   o  first, by generating excessive signaling load towards the HSS that
+      is ten times the load from a non-smartphone, and
+
+   o  second, by causing continual registration attempts when a network
+      failure affects registrations through the 3G data network.
+
+3.2.  3GPP Study on Core Network Overload
+
+   A study in the 3GPP System Aspects working group 2 (SA2) on core
+   network overload has produced the technical report [TR23.843].  This
+   enumerates several causes of overload in mobile core networks,
+   including portions that are signaled using Diameter.  [TR23.843] is a
+   work in progress and is not complete.  However, it is useful for
+   pointing out scenarios and the general need for an overload control
+   mechanism for Diameter.
+
+   It is common for mobile networks to employ more than one radio
+   technology and to do so in an overlay fashion with multiple
+   technologies present in the same location (such as 2nd or 3rd
+   generation mobile technologies, along with LTE).  This presents
+   opportunities for traffic storms when issues occur on one overlay and
+   not another as all devices that had been on the overlay with issues
+   switch.  This causes a large amount of Diameter traffic as locations
+   and policies are updated.
+
+   Another scenario called out by this study is a flood of registration
+   and mobility management events caused by some element in the core
+   network failing.  This flood of traffic from end nodes falls under
+   the network-initiated traffic flood category.  There is likely to
+   also be traffic resulting directly from the component failure in this
+   case.  A similar flood can occur when elements or components recover
+   as well.
+
+   Subscriber-initiated traffic floods are also indicated in this study
+   as an overload mechanism where a large number of mobile devices are
+   attempting to access services at the same time, such as in response
+   to an entertainment event or a catastrophic event.
+
+   While this 3GPP study is concerned with the broader effects of these
+   scenarios on wireless networks and their elements, they have
+   implications specifically for Diameter signaling.  One of the goals
+   of this document is to provide guidance for a core mechanism that can
+   be used to mitigate the scenarios called out by this study.
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 16]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+4.  Existing Mechanisms
+
+   Diameter offers both implicit and explicit mechanisms for a Diameter
+   node to learn that a peer is overloaded or unreachable.  The implicit
+   mechanism is simply the lack of responses to requests.  If a client
+   fails to receive a response in a certain time period, it assumes that
+   the upstream peer is unavailable or is overloaded to the point of
+   effective unavailability.  The watchdog mechanism [RFC3539] ensures
+   that transaction responses occur at a certain rate even when there is
+   otherwise little or no other Diameter traffic.
+
+   The explicit mechanism can involve specific protocol error responses,
+   where an agent or server tells a downstream peer that it is either
+   too busy to handle a request (DIAMETER_TOO_BUSY) or unable to route a
+   request to an upstream destination (DIAMETER_UNABLE_TO_DELIVER)
+   perhaps because that destination itself is overloaded to the point of
+   unavailability.
+
+   Another explicit mechanism, a DPR (Disconnect-Peer-Request) message,
+   can be sent with a Disconnect-Cause of BUSY.  This signals the
+   sender's intent to close the transport connection and requests that
+   the client not reconnect.
+
+   Once a Diameter node learns via one of these mechanisms that an
+   upstream peer has become overloaded, it can then attempt to take
+   action to reduce the load.  This usually means forwarding traffic to
+   an alternate destination, if available.  If no alternate destination
+   is available, the node must either reduce the number of messages it
+   originates (in the case of a client) or inform the client to reduce
+   traffic (in the case of an agent).
+
+   Diameter requires the use of a congestion-managed transport layer,
+   currently TCP or SCTP, to mitigate network congestion.  It is
+   expected that these transports manage network congestion and that
+   issues with transport (e.g., congestion propagation and window
+   management) are managed at that level.  But even with a congestion-
+   managed transport, a Diameter node can become overloaded at the
+   Diameter protocol or application layers due to the causes described
+   in Section 1.2, and congestion-managed transports do not provide
+   facilities (and are at the wrong level) to handle server overload.
+   Transport-level congestion management is also not sufficient to
+   address overload in cases of multi-hop and multi-destination
+   signaling.
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 17]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+5.  Issues with the Current Mechanisms
+
+   The currently available Diameter mechanisms for indicating an
+   overload condition are not adequate to avoid service outages due to
+   overload.  This inadequacy may, in turn, contribute to broader
+   impacts resulting from overload due to unresponsive Diameter nodes
+   causing application-layer or transport-layer retransmissions.  In
+   particular, they do not allow a Diameter agent or server to shed load
+   as it approaches overload.  At best, a node can only indicate that it
+   needs to entirely stop receiving requests, i.e., that it has
+   effectively failed.  Even that is problematic due to the inability to
+   indicate durational validity on the transient errors available in the
+   base Diameter protocol.  Diameter offers no mechanism to allow a node
+   to indicate different overload states for different categories of
+   messages, for example, if it is overloaded for one Diameter
+   application but not another.
+
+5.1.  Problems with Implicit Mechanism
+
+   The implicit mechanism doesn't allow an agent or server to inform the
+   client of a problem until it is effectively too late to do anything
+   about it.  The client does not know that it needs to take action
+   until the upstream node has effectively failed.  A Diameter node has
+   no opportunity to shed load early to avoid collapse in the first
+   place.
+
+   Additionally, the implicit mechanism cannot distinguish between
+   overload of a Diameter node and network congestion.  Diameter treats
+   the failure to receive an answer as a transport failure.
+
+5.2.  Problems with Explicit Mechanisms
+
+   The Diameter specification is ambiguous on how a client should handle
+   receipt of a DIAMETER_TOO_BUSY response.  The base specification
+   [RFC6733] indicates that the sending client should attempt to send
+   the request to a different peer.  It makes no suggestion that the
+   receipt of a DIAMETER_TOO_BUSY response should affect future Diameter
+   messages in any way.
+
+   The Authentication, Authorization, and Accounting (AAA) Transport
+   Profile [RFC3539] recommends that a AAA node that receives a "Busy"
+   response failover all remaining requests to a different agent or
+   server.  But while the Diameter base specification explicitly depends
+   on [RFC3539] to define transport behavior, it does not refer to
+   [RFC3539] in the description of behavior on receipt of a
+   DIAMETER_TOO_BUSY error.  There's a strong likelihood that at least
+   some implementations will continue to send Diameter requests to an
+   upstream peer even after receiving a DIAMETER_TOO_BUSY error.
+
+
+
+McMurry & Campbell            Informational                    [Page 18]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   BCP 41 [RFC2914] describes, among other things, how end-to-end
+   application behavior can help avoid congestion collapse.  In
+   particular, an application should avoid sending messages that will
+   never be delivered or processed.  The DIAMETER_TOO_BUSY behavior as
+   described in the Diameter base specification fails at this, since if
+   an upstream node becomes overloaded, a client attempts each request
+   and does not discover the need to failover the request until the
+   initial attempt fails.
+
+   The situation is improved if implementations follow the [RFC3539]
+   recommendation to keep state about upstream peer overload.  But even
+   then, the Diameter specification offers no guidance on how long a
+   client should wait before retrying the overloaded destination.  If an
+   agent or server supports multiple realms and/or applications,
+   DIAMETER_TOO_BUSY offers no way to indicate that it is overloaded for
+   one application but not another.  A DIAMETER_TOO_BUSY error can only
+   indicate overload at a "whole server" scope.
+
+   Agent processing of a DIAMETER_TOO_BUSY response is also problematic
+   as described in the base specification.  DIAMETER_TOO_BUSY is defined
+   as a protocol error.  If an agent receives a protocol error, it may
+   either handle it locally or forward the response back towards the
+   downstream peer.  If a downstream peer receives the DIAMETER_TOO_BUSY
+   response, it may stop sending all requests to the agent for some
+   period of time, even though the agent may still be able to deliver
+   requests to other upstream peers.
+
+   DIAMETER_UNABLE_TO_DELIVER errors, or using DPR with cause code BUSY,
+   also have no mechanisms for specifying the scope or cause of the
+   failure, or the durational validity.
+
+   The issues with error responses described in [RFC6733] extend beyond
+   the particular issues for overload control and have been addressed in
+   an ad hoc fashion by various implementations.  Addressing these in a
+   standard way would be a useful exercise, but it is beyond the scope
+   of this document.
+
+6.  Extensibility and Application Independence
+
+   Given the variety of scenarios in which Diameter elements can be
+   deployed and the variety of roles they can fulfill with Diameter and
+   other technologies, a single algorithm for handling overload may not
+   be sufficient.  For purposes of this discussion, an algorithm is
+   inclusive of behavior for control of overload but does not encompass
+   the general mechanism for transporting control information.  This
+   effort cannot anticipate all possible future scenarios and roles.
+   Extensibility, particularly of algorithms used to deal with overload,
+   will be important to cover these cases.
+
+
+
+McMurry & Campbell            Informational                    [Page 19]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   Similarly, the scopes to which overload information may apply may
+   include cases that have not yet been considered.  Extensibility in
+   this area will also be important.
+
+   The basic mechanism is intended to be application independent, that
+   is, a Diameter node can use it across any existing and future
+   Diameter applications and expect reasonable results.  Certain
+   Diameter applications might, however, benefit from application-
+   specific behavior over and above the mechanism's defaults.  For
+   example, an application specification might specify relative
+   priorities of messages or selection of a specific overload control
+   algorithm.
+
+7.  Solution Requirements
+
+   This section proposes requirements for an improved mechanism to
+   control Diameter overload, with the goals of addressing the issues
+   described in Section 5 and supporting the scenarios described in
+   Section 2.  These requirements are stated primarily in terms of
+   individual node behavior to inform the design of the improved
+   mechanism; solution designers should keep in mind that the overall
+   goal is improved overall system behavior across all the nodes
+   involved, not just improved behavior from specific individual nodes.
+
+7.1.  General
+
+   REQ 1:  The solution MUST provide a communication method for Diameter
+           nodes to exchange load and overload information.
+
+   REQ 2:  The solution MUST allow Diameter nodes to support overload
+           control regardless of which Diameter applications they
+           support.  Diameter clients and agents must be able to use the
+           received load and overload information to support graceful
+           behavior during an overload condition.  Graceful behavior
+           under overload conditions is best described by REQ 3.
+
+   REQ 3:  The solution MUST limit the impact of overload on the overall
+           useful throughput of a Diameter server, even when the
+           incoming load on the network is far in excess of its
+           capacity.  The overall useful throughput under load is the
+           ultimate measure of the value of a solution.
+
+   REQ 4:  Diameter allows requests to be sent from either side of a
+           connection, and either side of a connection may have need to
+           provide its overload status.  The solution MUST allow each
+           side of a connection to independently inform the other of its
+           overload status.
+
+
+
+
+McMurry & Campbell            Informational                    [Page 20]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   REQ 5:  Diameter allows nodes to determine their peers via dynamic
+           discovery or manual configuration.  The solution MUST work
+           consistently without regard to how peers are determined.
+
+   REQ 6:  The solution designers SHOULD seek to minimize the amount of
+           new configuration required in order to work.  For example, it
+           is better to allow peers to advertise or negotiate support
+           for the solution, rather than to require that this knowledge
+           be configured at each node.
+
+7.2.  Performance
+
+   REQ 7:  The solution and any associated default algorithm(s) MUST
+           ensure that the system remains stable.  At some point after
+           an overload condition has ended, the solution MUST enable
+           capacity to stabilize and become equal to what it would be in
+           the absence of an overload condition.  Note that this also
+           requires that the solution MUST allow nodes to shed load
+           without introducing non-converging oscillations during or
+           after an overload condition.
+
+   REQ 8:  Supporting nodes MUST be able to distinguish current overload
+           information from stale information.
+
+   REQ 9:  The solution MUST function across fully loaded as well as
+           quiescent transport connections.  This is partially derived
+           from the requirement for stability in REQ 7.
+
+   REQ 10: Consumers of overload information MUST be able to determine
+           when the overload condition improves or ends.
+
+   REQ 11: The solution MUST be able to operate in networks of different
+           sizes.
+
+   REQ 12: When a single network node fails, goes into overload, or
+           suffers from reduced processing capacity, the solution MUST
+           make it possible to limit the impact of the affected node on
+           other nodes in the network.  This helps to prevent a small-
+           scale failure from becoming a widespread outage.
+
+   REQ 13: The solution MUST NOT introduce substantial additional work
+           for a node in an overloaded state.  For example, a
+           requirement for an overloaded node to send overload
+           information every time it received a new request would
+           introduce substantial work.
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 21]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   REQ 14: Some scenarios that result in overload involve a rapid
+           increase of traffic with little time between normal levels
+           and levels that induce overload.  The solution SHOULD provide
+           for rapid feedback when traffic levels increase.
+
+   REQ 15: The solution MUST NOT interfere with the congestion control
+           mechanisms of underlying transport protocols.  For example, a
+           solution that opened additional TCP connections when the
+           network is congested would reduce the effectiveness of the
+           underlying congestion control mechanisms.
+
+7.3.  Heterogeneous Support for Solution
+
+   REQ 16: The solution is likely to be deployed incrementally.  The
+           solution MUST support a mixed environment where some, but not
+           all, nodes implement it.
+
+   REQ 17: In a mixed environment with nodes that support the solution
+           and nodes that do not, the solution MUST NOT result in
+           materially less useful throughput during overload as would
+           have resulted if the solution were not present.  It SHOULD
+           result in less severe overload in this environment.
+
+   REQ 18: In a mixed environment of nodes that support the solution and
+           nodes that do not, the solution MUST NOT preclude elements
+           that support overload control from treating elements that do
+           not support overload control in an equitable fashion relative
+           to those that do.  Users and operators of nodes that do not
+           support the solution MUST NOT unfairly benefit from the
+           solution.  The solution specification SHOULD provide guidance
+           to implementors for dealing with elements not supporting
+           overload control.
+
+   REQ 19: It MUST be possible to use the solution between nodes in
+           different realms and in different administrative domains.
+
+   REQ 20: Any explicit overload indication MUST be clearly
+           distinguishable from other errors reported via Diameter.
+
+   REQ 21: In cases where a network node fails, is so overloaded that it
+           cannot process messages, or cannot communicate due to a
+           network failure, it may not be able to provide explicit
+           indications of the nature of the failure or its levels of
+           overload.  The solution MUST result in at least as much
+           useful throughput as would have resulted if the solution were
+           not in place.
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 22]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+7.4.  Granular Control
+
+   REQ 22: The solution MUST provide a way for a node to throttle the
+           amount of traffic it receives from a peer node.  This
+           throttling SHOULD be graded so that it can be applied
+           gradually as offered load increases.  Overload is not a
+           binary state; there may be degrees of overload.
+
+   REQ 23: The solution MUST provide sufficient information to enable a
+           load-balancing node to divert messages that are rejected or
+           otherwise throttled by an overloaded upstream node to other
+           upstream nodes that are the most likely to have sufficient
+           capacity to process them.
+
+   REQ 24: The solution MUST provide a mechanism for indicating load
+           levels, even when not in an overload condition, to assist
+           nodes in making decisions to prevent overload conditions from
+           occurring.
+
+7.5.  Priority and Policy
+
+   REQ 25: The base specification for the solution SHOULD offer general
+           guidance on which message types might be desirable to send or
+           process over others during times of overload, based on
+           application-specific considerations.  For example, it may be
+           more beneficial to process messages for existing sessions
+           ahead of new sessions.  Some networks may have a requirement
+           to give priority to requests associated with emergency
+           sessions.  Any normative or otherwise detailed definition of
+           the relative priorities of message types during an overload
+           condition will be the responsibility of the application
+           specification.
+
+   REQ 26: The solution MUST NOT prevent a node from prioritizing
+           requests based on any local policy, so that certain requests
+           are given preferential treatment, given additional
+           retransmission, not throttled, or processed ahead of others.
+
+7.6.  Security
+
+   REQ 27: The solution MUST NOT provide new vulnerabilities to
+           malicious attack or increase the severity of any existing
+           vulnerabilities.  This includes vulnerabilities to DoS and
+           DDoS attacks as well as replay and man-in-the-middle attacks.
+           Note that the Diameter base specification [RFC6733] lacks
+           end-to-end security, and this must be considered (see
+           Security Considerations in this document (Section 8)).  Note
+
+
+
+
+McMurry & Campbell            Informational                    [Page 23]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+           that this requirement was expressed at a high level so as to
+           not preclude any particular solution.  Is is expected that
+           the solution will address this in more detail.
+
+   REQ 28: The solution MUST NOT depend on being deployed in
+           environments where all Diameter nodes are completely trusted.
+           It SHOULD operate as effectively as possible in environments
+           where other nodes are malicious; this includes preventing
+           malicious nodes from obtaining more than a fair share of
+           service.  Note that this does not imply any responsibility on
+           the solution to detect, or take countermeasures against,
+           malicious nodes.
+
+   REQ 29: It MUST be possible for a supporting node to make
+           authorization decisions about what information will be sent
+           to peer nodes based on the identity of those nodes.  This
+           allows a domain administrator who considers the load of their
+           nodes to be sensitive information to restrict access to that
+           information.  Of course, in such cases, there is no
+           expectation that the solution itself will help prevent
+           overload from that peer node.
+
+   REQ 30: The solution MUST NOT interfere with any Diameter-compliant
+           method that a node may use to protect itself from overload
+           from non-supporting nodes or from denial-of-service attacks.
+
+7.7.  Flexibility and Extensibility
+
+   REQ 31: There are multiple situations where a Diameter node may be
+           overloaded for some purposes but not others.  For example,
+           this can happen to an agent or server that supports multiple
+           applications, or when a server depends on multiple external
+           resources, some of which may become overloaded while others
+           are fully available.  The solution MUST allow Diameter nodes
+           to indicate overload with sufficient granularity to allow
+           clients to take action based on the overloaded resources
+           without unreasonably forcing available capacity to go unused.
+           The solution MUST support specification of overload
+           information with granularities of at least "Diameter node",
+           "realm", and "Diameter application" and MUST allow
+           extensibility for others to be added in the future.
+
+   REQ 32: The solution MUST provide a method for extending the
+           information communicated and the algorithms used for overload
+           control.
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 24]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   REQ 33: The solution MUST provide a default algorithm that is
+           mandatory to implement.
+
+   REQ 34: The solution SHOULD provide a method for exchanging overload
+           and load information between elements that are connected by
+           intermediaries that do not support the solution.
+
+8.  Security Considerations
+
+   A Diameter overload control mechanism is primarily concerned with the
+   load-related and overload-related behavior of nodes in a Diameter
+   network, and the information used to affect that behavior.  Load and
+   overload information is shared between nodes and directly affects the
+   behavior, and thus the information is potentially vulnerable to a
+   number of methods of attack.
+
+   Load and overload information may also be sensitive from both
+   business and network protection viewpoints.  Operators of Diameter
+   equipment want to control the visibility of load and overload
+   information to keep it from being used for competitive intelligence
+   or for targeting attacks.  It is also important that the Diameter
+   overload control mechanism not introduce any way in which any other
+   information carried by Diameter is sent inappropriately.
+
+   Note that the Diameter base specification [RFC6733] lacks end-to-end
+   security, making it difficult for non-adjacent nodes to verify the
+   authenticity and ownership of load and overload information.
+   Authentication of load and overload information helps to alleviate
+   several of the security issues listed in this section.
+
+   This document includes requirements intended to mitigate the effects
+   of attacks and to protect the information used by the mechanism.
+   This section discusses potential security considerations for overload
+   control solutions.  This discussion provides the motivation for
+   several normative requirements described in Section 7.  The
+   discussion includes specific references to the normative requirements
+   that apply for each issue.
+
+8.1.  Access Control
+
+   To control the visibility of load and overload information, sending
+   should be subject to some form of authentication and authorization of
+   the receiver.  It is also important to the receivers that they are
+   confident the load and overload information they receive is from a
+   legitimate source.  REQ 28 requires that the solution work without
+   assuming that all Diameter nodes in a network are trusted for the
+   purposes of exchanging overload and load information.  REQ 29
+   requires that the solution let nodes restrict unauthorized parties
+
+
+
+McMurry & Campbell            Informational                    [Page 25]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   from seeing overload information.  Note that this implies a certain
+   amount of configurability on the nodes supporting the Diameter
+   overload control mechanism.
+
+8.2.  Denial-of-Service Attacks
+
+   An overload control mechanism provides a very attractive target for
+   denial-of-service attacks.  A small number of messages may effect a
+   large service disruption by falsely reporting overload conditions.
+   Alternately, attacking servers nearing, or in, overload may also be
+   facilitated by disrupting their overload indications, potentially
+   preventing them from mitigating their overload condition.
+
+   A design goal for the Diameter overload control mechanism is to
+   minimize or eliminate the possibility of using the mechanism for this
+   type of attack.  More strongly, REQ 27 forbids the solution from
+   introducing new vulnerabilities to malicious attack.  Additionally,
+   REQ 30 stipulates that the solution not interfere with other
+   mechanisms used for protection against denial-of-service attacks.
+
+   As the intent of some denial-of-service attacks is to induce overload
+   conditions, an effective overload control mechanism should help to
+   mitigate the effects of such an attack.
+
+8.3.  Replay Attacks
+
+   An attacker that has managed to obtain some messages from the
+   overload control mechanism may attempt to affect the behavior of
+   nodes supporting the mechanism by sending those messages at
+   potentially inopportune times.  In addition to time shifting, replay
+   attacks may send messages to other nodes as well (target shifting).
+
+   A design goal for the Diameter overload control solution is to
+   minimize or eliminate the possibility of causing disruption by using
+   a replay attack on the Diameter overload control mechanism.
+   (Allowing a replay attack using the overload control solution would
+   violate REQ 27.)
+
+8.4.  Man-in-the-Middle Attacks
+
+   By inserting themselves between two nodes supporting the Diameter
+   overload control mechanism, an attacker may potentially both access
+   and alter the information sent between those nodes.  This can be used
+   for information gathering for business intelligence and attack
+   targeting, as well as direct attacks.
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 26]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   REQs 27, 28, and 29 imply a need to prevent man-in-the-middle attacks
+   on the overload control solution.  A transport using Transport Layer
+   Security (TLS) and/or IPsec may be desirable for this purpose.
+
+8.5.  Compromised Hosts
+
+   A compromised host that supports the Diameter overload control
+   mechanism could be used for information gathering as well as for
+   sending malicious information to any Diameter node that would
+   normally accept information from it.  While it is beyond the scope of
+   the Diameter overload control mechanism to mitigate any operational
+   interruption to the compromised host, REQs 28 and 29 imply a need to
+   minimize the impact that a compromised host can have on other nodes
+   through the use of the Diameter overload control mechanism.  Of
+   course, a compromised host could be used to cause damage in a number
+   of other ways.  This is out of scope for a Diameter overload control
+   mechanism.
+
+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.
+
+   [RFC2914]   Floyd, S., "Congestion Control Principles", BCP 41,
+               RFC 2914, September 2000.
+
+   [RFC3539]   Aboba, B. and J. Wood, "Authentication, Authorization and
+               Accounting (AAA) Transport Profile", RFC 3539, June 2003.
+
+9.2.  Informative References
+
+   [RFC5390]   Rosenberg, J., "Requirements for Management of Overload
+               in the Session Initiation Protocol", RFC 5390,
+               December 2008.
+
+   [RFC6357]   Hilt, V., Noel, E., Shen, C., and A. Abdelal, "Design
+               Considerations for Session Initiation Protocol (SIP)
+               Overload Control", RFC 6357, August 2011.
+
+   [TR23.843]  3GPP, "Study on Core Network (CN) overload solutions",
+               TR 23.843 1.2.0, Work in Progress, October 2013.
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 27]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+   [IR.34]     GSMA, "Inter-Service Provider IP Backbone Guidelines",
+               IR 34 9.1, May 2013.
+
+   [IR.88]     GSMA, "LTE Roaming Guidelines", IR 88 9.0, January 2013.
+
+   [IR.92]     GSMA, "IMS Profile for Voice and SMS", IR 92 7.0,
+               March 2013.
+
+   [TS23.002]  3GPP, "Network Architecture", TS 23.002 12.2.0,
+               June 2013.
+
+   [TS29.272]  3GPP, "Evolved Packet System (EPS); Mobility Management
+               Entity (MME) and Serving GPRS Support Node (SGSN) related
+               interfaces based on Diameter protocol", TS 29.272 12.2.0,
+               September 2013.
+
+   [TS29.212]  3GPP, "Policy and Charging Control (PCC) over Gx/Sd
+               reference point", TS 29.212 12.2.0, September 2013.
+
+   [TS29.228]  3GPP, "IP Multimedia (IM) Subsystem Cx and Dx interfaces;
+               Signalling flows and message contents", TS 29.228 12.0.0,
+               September 2013.
+
+   [TS29.002]  3GPP, "Mobile Application Part (MAP) specification",
+               TS 29.002 12.2.0, September 2013.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 28]
+
+RFC 7068         Diameter Overload Control Requirements    November 2013
+
+
+Appendix A.  Contributors
+
+   Significant contributions to this document were made by Adam Roach
+   and Eric Noel.
+
+Appendix B.  Acknowledgements
+
+   Review of, and contributions to, this specification by Martin Dolly,
+   Carolyn Johnson, Jianrong Wang, Imtiaz Shaikh, Jouni Korhonen, Robert
+   Sparks, Dieter Jacobsohn, Janet Gunn, Jean-Jacques Trottin, Laurent
+   Thiebaut, Andrew Booth, and Lionel Morand were most appreciated.  We
+   would like to thank them for their time and expertise.
+
+Authors' Addresses
+
+   Eric McMurry
+   Oracle
+   17210 Campbell Rd.
+   Suite 250
+   Dallas, TX  75252
+   US
+
+   EMail: [email protected]
+
+
+   Ben Campbell
+   Oracle
+   17210 Campbell Rd.
+   Suite 250
+   Dallas, TX  75252
+   US
+
+   EMail: [email protected]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+McMurry & Campbell            Informational                    [Page 29]
+
diff --git a/lib/diameter/doc/standard/rfc7075.txt b/lib/diameter/doc/standard/rfc7075.txt
new file mode 100644
index 0000000000..f5fd905e72
--- /dev/null
+++ b/lib/diameter/doc/standard/rfc7075.txt
@@ -0,0 +1,563 @@
+
+
+
+
+
+
+Internet Engineering Task Force (IETF)                           T. Tsou
+Request for Comments: 7075                     Huawei Technologies (USA)
+Updates: 6733                                                     R. Hao
+Category: Standards Track                                  Comcast Cable
+ISSN: 2070-1721                                           T. Taylor, Ed.
+                                                     Huawei Technologies
+                                                           November 2013
+
+
+                  Realm-Based Redirection In Diameter
+
+Abstract
+
+   The Diameter protocol includes a capability for message redirection,
+   controlled by an application-independent "redirect agent".  In some
+   circumstances, an operator may wish to redirect messages to an
+   alternate domain without specifying individual hosts.  This document
+   specifies an application-specific mechanism by which a Diameter
+   server or proxy (node) can perform such a redirection when the
+   Straightforward-Naming Authority Pointer (S-NAPTR) is not used for
+   dynamic peer discovery.  A node performing this new function is
+   referred to as a "Realm-based Redirect Server".
+
+   This memo updates Sections 6.13 and 6.14 of RFC 6733 with respect to
+   the usage of the Redirect-Host-Usage and Redirect-Max-Cache-Time
+   Attribute-Value Pairs (AVPs).
+
+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/rfc7075.
+
+
+
+
+
+
+
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 1]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+Copyright Notice
+
+   Copyright (c) 2013 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.
+
+Table of Contents
+
+   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   3
+     1.1.  Terminology . . . . . . . . . . . . . . . . . . . . . . .   3
+   2.  Support of Realm-Based Redirection Within Applications  . . .   4
+   3.  Realm-Based Redirection . . . . . . . . . . . . . . . . . . .   5
+     3.1.  Configuration of the Realm-Based Redirect Server  . . . .   5
+     3.2.  Behavior of Diameter Nodes  . . . . . . . . . . . . . . .   6
+       3.2.1.  Behavior at the Realm-Based Redirect Server . . . . .   6
+       3.2.2.  Proxy Behavior  . . . . . . . . . . . . . . . . . . .   6
+       3.2.3.  Client Behavior . . . . . . . . . . . . . . . . . . .   7
+     3.3.  The Redirect-Realm AVP  . . . . . . . . . . . . . . . . .   7
+     3.4.  DIAMETER_REALM_REDIRECT_INDICATION Protocol Error Code  .   7
+   4.  Security Considerations . . . . . . . . . . . . . . . . . . .   8
+   5.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .   8
+   6.  Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .   9
+   7.  References  . . . . . . . . . . . . . . . . . . . . . . . . .   9
+     7.1.  Normative References  . . . . . . . . . . . . . . . . . .   9
+     7.2.  Informative References  . . . . . . . . . . . . . . . . .   9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 2]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+1.  Introduction
+
+   The Diameter base protocol [RFC6733] specifies a basic redirection
+   service provided by a redirect agent.  The redirect indication
+   returned by the redirect agent is described in Section 6.1.8 and
+   Sections 6.12 through 6.14 of [RFC6733].  It provides one or more
+   individual hosts to the message sender as the destination of the
+   redirected message.
+
+   However, consider the case where an operator has offered a specific
+   service but no longer wishes to do so.  The operator has arranged for
+   an alternative domain to provide the service.  To aid in the
+   transition to the new arrangement, the original operator maintains a
+   redirect server to indicate to the message sender the alternative
+   domain to which the redirect the request should be sent.  However,
+   the original operator should not have to configure the redirect
+   server with a list of hosts to contact in the alternative operator's
+   domain; the original operator should simply be able to provide
+   redirect indications to the domain as a whole.
+
+1.1.  Terminology
+
+   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 [RFC2119].
+
+   Within this specification, the term "realm-based redirection" is used
+   to refer to a mode of operation where a realm, rather than an
+   individual host, is returned as the redirect indication.
+
+   The term "Realm-based Redirect Server" denotes the Diameter node
+   (Diameter server or proxy) that returns the realm-based redirection.
+   The behavior of the Realm-based Redirect Server itself is a slight
+   modification to the behavior of a basic redirect agent as described
+   in Section 6.1.8 of [RFC6733].
+
+   The use of a number of terms in this document is consistent with the
+   usage in [RFC6733]: "Diameter client", "Diameter node", "Diameter
+   peer", "Diameter server", "proxy", "realm" or "domain", "redirect
+   agent", and "session" as defined in Section 1.2, and "application" as
+   defined implicitly by Sections 1.3.4, 2.3, and 2.4.
+
+
+
+
+
+
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 3]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+2.  Support of Realm-Based Redirection Within Applications
+
+   The DNS-based dynamic peer discovery mechanism defined in the
+   Diameter base protocol [RFC6733] provides a simple mechanism for
+   realm-based redirection using the S-NAPTR DDDS application [RFC3958].
+   When S-NAPTR is used for peer discovery, redirection of Diameter
+   requests from the original realm to a new realm may be performed by
+   updating the existing NAPTR resource records (RRs) for the original
+   realm as follows: the NAPTR RR for the desired application(s) and
+   supported application protocol(s) provided by the new realm will have
+   an empty FLAG field and the REPLACEMENT field will contain the new
+   realm to use for the next DNS lookup.  The new realm can be
+   arbitrary; the restriction in [RFC6733] that the NAPTR replacement
+   field match the domain of the original query does not apply for
+   realm-based redirect purposes.
+
+   However, the use of DNS-based dynamic peer discovery is optional for
+   Diameter implementations.  For deployments that do not make use of
+   S-NAPTR peer discovery, support of realm-based redirection needs to
+   be specified as part of the functionality supported by a Diameter
+   application.  In this way, support of the considered Diameter
+   application (discovered during capabilities exchange phase as defined
+   in Diameter base protocol [RFC6733]) indicates implicit support of
+   the realm-based redirection mechanism.  A new application
+   specification can incorporate the mechanism specified here by making
+   it mandatory to implement for the application and referencing this
+   specification normatively.
+
+   The result of making realm-based redirection an application-specific
+   behavior is that it cannot be performed by a redirect agent as
+   defined in [RFC6733], but MUST be performed instead by an
+   application-aware Diameter node (Diameter server or proxy) (hereafter
+   called a "Realm-based Redirect Server").
+
+   An application can specify that realm-based redirection operates only
+   on complete sessions beginning with the initial message or on every
+   message within the application, even if earlier messages of the same
+   session were not redirected.  This distinction matters only when
+   realm-based redirection is first initiated.  In the former case,
+   existing sessions will not be disrupted by the deployment of realm-
+   based redirection.  In the latter case, existing sessions will be
+   disrupted if they are stateful.
+
+
+
+
+
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 4]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+3.  Realm-Based Redirection
+
+   This section specifies an extension of the Diameter base protocol
+   [RFC6733] to achieve realm-based redirection.  The elements of this
+   solution are:
+
+   o  a new result code, DIAMETER_REALM_REDIRECT_INDICATION (3011);
+
+   o  a new attribute-value pair (AVP), Redirect-Realm (620); and
+
+   o  associated behavior at Diameter nodes implementing this
+      specification.
+
+   This behavior includes the optional use of the Redirect-Host-Usage
+   and Redirect-Max-Cache-Time AVPs.  In this document, these AVPs apply
+   to the peer discovered by a node acting on the redirect server's
+   response, an extension to their normal usage as described in Sections
+   6.13 and 6.14 of [RFC6733].
+
+   Section 3.2.2 and Section 3.2.3 describe how a proxy or client may
+   update its routing table for the application and initial realm as a
+   result of selecting a peer in the new realm after realm-based
+   redirection.  Note that as a result, the proxy or client will
+   automatically route subsequent requests for that application to the
+   new realm (with the possible exception of requests within sessions
+   already established with the initial realm) until the cached routing
+   entry expires.  This should be borne in mind if the rerouting is
+   intended to be temporary.
+
+3.1.  Configuration of the Realm-Based Redirect Server
+
+   A Diameter node (Diameter server or proxy) acting as a Realm-based
+   Redirect Server MUST be configured as follows to execute realm-based
+   redirection:
+
+   o  configured with an application that incorporates realm-based
+      redirection;
+
+   o  the Local Action field of the routing table described in
+      Section 2.7 of [RFC6733] is set to LOCAL;
+
+   o  an application-specific field is set to indicate that the required
+      local action is to perform realm-based redirection;
+
+   o  an associated application-specific field is configured with the
+      identities of one or more realms to which the request should be
+      redirected.
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 5]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+3.2.  Behavior of Diameter Nodes
+
+3.2.1.  Behavior at the Realm-Based Redirect Server
+
+   As mentioned in Section 2, an application can specify that realm-
+   based redirection operates only on complete sessions beginning with
+   the initial message (i.e., to prevent disruption of established
+   sessions) or on every message within the application, even if earlier
+   messages of the same session were not redirected.
+
+   If a Realm-based Redirect Server configured as described in
+   Section 3.1 receives a request to which realm-based redirection
+   applies, the Realm-based Redirect Server MUST reply with an answer
+   message with the 'E' bit set, while maintaining the Hop-by-Hop
+   Identifier in the header.  The Realm-based Redirect Server MUST
+   include the Result-Code AVP set to
+   DIAMETER_REALM_REDIRECT_INDICATION.  The Realm-based Redirect Server
+   MUST also include the alternate realm identifier(s) with which it has
+   been configured, each in a separate Redirect-Realm AVP instance.
+
+   The Realm-based Redirect Server MAY include a copy of the Redirect-
+   Host-Usage AVP, which SHOULD be set to REALM_AND_APPLICATION.  If
+   this AVP is added, the Redirect-Max-Cache-Time AVP MUST also be
+   included.  Note that these AVPs apply to the peer discovered by a
+   node acting on the Realm-based Redirect Server's response as
+   described in the next section.  This is an extension of their normal
+   usage as described by Sections 6.13 and 6.14 of [RFC6733].
+
+      Realm-based redirection MAY be applied even if a Destination-Host
+      AVP is present in the request, depending on the operator-based
+      policy.
+
+3.2.2.  Proxy Behavior
+
+   A proxy conforming to this specification that receives an answer
+   message with the Result-Code AVP set to
+   DIAMETER_REALM_REDIRECT_INDICATION MUST attempt to reroute the
+   original request to a server in a realm identified by a Redirect-
+   Realm AVP instance in the answer message, and if it fails MUST
+   forward the indication toward the client.  To reroute the request, it
+   MUST take the following actions:
+
+   1.  Select a specific realm from amongst those identified in
+       instances of the Redirect-Realm AVP in the answer message.
+
+   2.  If successful, locate and establish a route to a peer in the
+       realm given by the Redirect-Realm AVP, using normal discovery
+       procedures as described in Section 5.2 of [RFC6733].
+
+
+
+Tsou, et al.                 Standards Track                    [Page 6]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+   3.  If again successful:
+
+       A.  update its cache of routing entries for the realm and
+           application to which the original request was directed,
+           taking into account the Redirect-Host-Usage and Redirect-Max-
+           Cache-Time AVPs, if present in the answer.
+
+       B.  Remove the Destination-Host (if present) and Destination-
+           Realm AVPs from the original request and add a new
+           Destination-Realm AVP containing the realm selected in the
+           initial step.
+
+       C.  Forward the modified request.
+
+   4.  If either of the preceding steps 2-3 fail and additional realms
+       have been identified in the original answer, select another
+       instance of the Redirect-Realm AVP in that answer and repeat
+       steps 2-3 for the realm that it identifies.
+
+3.2.3.  Client Behavior
+
+   A client conforming to this specification MUST be prepared to receive
+   either an answer message containing a Result-Code AVP set to
+   DIAMETER_REALM_REDIRECT_INDICATION, or, as the result of proxy
+   action, some other result from a realm differing from the one to
+   which it sent the original request.  In the case where it receives
+   DIAMETER_REALM_REDIRECT_INDICATION, the client SHOULD follow the same
+   steps prescribed in the previous section for a proxy, in order to
+   both update its routing table and obtain service for the original
+   request.
+
+3.3.  The Redirect-Realm AVP
+
+   The Redirect-Realm AVP (620) is of type DiameterIdentity.  It
+   specifies a realm to which a node receiving a redirect indication
+   containing the result code value DIAMETER_REALM_REDIRECT_INDICATION
+   and the Redirect-Realm AVP SHOULD route the original request.
+
+3.4.  DIAMETER_REALM_REDIRECT_INDICATION Protocol Error Code
+
+   The DIAMETER_REALM_REDIRECT_INDICATION (3011) Protocol error code
+   indicates that a server has determined that the request within an
+   application supporting realm-based redirection could not be satisfied
+   locally, and the initiator of the request SHOULD direct the request
+   directly to a peer within a realm that has been identified in the
+   response.  When set, the Redirect-Realm AVP MUST be present.
+
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 7]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+4.  Security Considerations
+
+   The general recommendations given in Section 13 of the Diameter base
+   protocol [RFC6733] apply.  Specific security recommendations related
+   to the realm-based redirection defined in this document are described
+   below.
+
+   Realm-based redirection implies a change in the business relationship
+   between organizations.  Before redirecting a request towards a realm
+   different from the initial realm, the client or proxy MUST ensure
+   that the authorization checks have been performed at each connection
+   along the path toward the realm identified in the realm-based
+   redirect indication.  Details on Diameter authorization path set-up
+   are given in Section 2.9 of [RFC6733].  Section 13 of [RFC6733]
+   provides recommendations on how to authenticate and secure each peer-
+   to-peer connection (using TLS, DTLS, or IPsec) along the way, thus
+   permitting the necessary hop-by-hop authorization checks.
+
+   Although it is assumed that the administrative domains are secure, a
+   compromised Diameter node acting as a Realm-based Redirect Server
+   would be able to redirect a large number of Diameter requests towards
+   a victim domain that would then be flooded with undesired Diameter
+   requests.  Such an attack is nevertheless discouraged by the use of
+   secure Diameter peer-to-peer connections and authorization checks,
+   since these would enable a potential victim domain to discover from
+   where an attack is coming.  That in itself, however, does not prevent
+   such a DoS attack.
+
+   Because realm-based redirection defined in this document implies that
+   the Destination-Realm AVP in a client-initiated request can be
+   changed by a Diameter proxy in the path between the client and the
+   server, any cryptographic algorithm that would use the Destination-
+   Realm AVP as input to the calculation performed by the client and the
+   server would be broken by this form of redirection.  Application
+   specifications that would rely on such cryptographic algorithms
+   SHOULD NOT incorporate this realm-based redirection.
+
+5.  IANA Considerations
+
+   This specification allocates a new AVP code Redirect-Realm (620) in
+   the "AVP Codes" registry under "Authentication, Authorization, and
+   Accounting (AAA) Parameters".
+
+   This specification allocates a new Result-Code value
+   DIAMETER_REALM_REDIRECT_INDICATION (3011) in the "Result-Code AVP
+   Values (code 268) - Protocol Errors" registry under "Authentication,
+   Authorization, and Accounting (AAA) Parameters".
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 8]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+6.  Acknowledgements
+
+   Glen Zorn, Sebastien Decugis, Wolfgang Steigerwald, Mark Jones,
+   Victor Fajardo, Jouni Korhonen, Avi Lior, and Lionel Morand
+   contributed comments that helped to shape this document.  As
+   shepherd, Lionel contributed a second set of comments that added
+   polish to the document before it was submitted to the IESG.  Benoit
+   Claise picked up additional points that were quickly resolved with
+   Lionel's help.  During IETF Last Call Review, Enrico Marocco picked
+   up some important editorial corrections.  Stefan Winter contributed
+   text on the use of S-NAPTR as an alternative method of realm-based
+   redirection already specified in [RFC6733].  Derek Atkins performed a
+   review on behalf of the Security Directorate.  Lionel noted one more
+   correction.
+
+   Finally, this document benefited from comments and discussion raised
+   by IESG members Stewart Bryant, Stephen Farrell, Barry Leiba, Pete
+   Resnick, Jari Arkko, and Sean Turner during IESG review.
+
+   The authors are very grateful to Lionel Morand for his active role as
+   document shepherd.  At each stage, he worked to summarize and resolve
+   comments, making the editor's role easy.  Thank you.
+
+7.  References
+
+7.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.
+
+7.2.  Informative References
+
+   [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.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Tsou, et al.                 Standards Track                    [Page 9]
+
+RFC 7075           Realm-Based Redirection In Diameter     November 2013
+
+
+Authors' Addresses
+
+   Tina Tsou
+   Huawei Technologies (USA)
+   2330 Central Expressway
+   Santa Clara, CA  95050
+   USA
+
+   Phone: +1 408 330 4424
+   EMail: [email protected]
+   URI:   http://tinatsou.weebly.com/contact.html
+
+
+   Ruibing Hao
+   Comcast Cable
+   One Comcast Center
+   Philadelphia, PA  19103
+   USA
+
+   Phone: +1 215 286 3991(O)
+   EMail: [email protected]
+
+
+   Tom Taylor (editor)
+   Huawei Technologies
+   Ottawa
+   Canada
+
+   EMail: [email protected]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Tsou, et al.                 Standards Track                   [Page 10]
+
diff --git a/lib/diameter/examples/dict/.gitignore b/lib/diameter/examples/dict/.gitignore
new file mode 100644
index 0000000000..feeb378fd8
--- /dev/null
+++ b/lib/diameter/examples/dict/.gitignore
@@ -0,0 +1,2 @@
+
+/depend.mk
diff --git a/lib/diameter/examples/dict/GNUmakefile b/lib/diameter/examples/dict/GNUmakefile
new file mode 100644
index 0000000000..60c95c08f9
--- /dev/null
+++ b/lib/diameter/examples/dict/GNUmakefile
@@ -0,0 +1,60 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 2013. All Rights Reserved.
+#
+# The 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%
+#
+
+#
+# Build example dictionaries. Assumes erlc and diameterc are on PATH.
+#
+
+DICTS = rfc4004_mip \
+        rfc4005_nas \
+        rfc4006_cc \
+        rfc4072_eap \
+        rfc4590_digest \
+        rfc4740_sip
+
+FILES = $(DICTS:%=%.dia)
+BEAMS = $(DICTS:%=%.beam)
+
+COMMON = diameter_gen_base_rfc6733
+
+%.erl: %.dia
+	diameterc --name $(basename $@) \
+	          --prefix $(basename $@) \
+	          --inherits common/$(COMMON) \
+	  $<
+
+%.beam: %.erl
+	erlc -Wall +debug_info $<
+
+all: $(BEAMS)
+
+clean:
+	rm -f $(DICTS:%=%.erl) $(DICTS:%=%.hrl) $(BEAMS) depend.mk
+
+-include depend.mk
+
+depend.mk: depend.sed $(FILES) GNUmakefile
+	(for f in $(FILES); do \
+	     (echo $$f; cat $$f) | sed -f depend.sed; \
+	 done) \
+	> $@
+
+.PHONY: all clean
+
+.SECONDARY: $(DICTS:%=%.erl)
diff --git a/lib/appmon/Makefile b/lib/diameter/examples/dict/depend.sed
index 62033ab92e..fd9a38479c 100644
--- a/lib/appmon/Makefile
+++ b/lib/diameter/examples/dict/depend.sed
@@ -1,33 +1,43 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2013. All Rights Reserved.
+#
 # The 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 $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
+#
+
+#
+# Extract dependencies from .dia files. First line of input is the
+# dictionary's filename, the rest is its contents.
+#
 
-# ----------------------------------------------------
-# Macros
-# ----------------------------------------------------
+1{
+  s@\.[^.]*$@@
+  h
+  d
+}
 
-SUB_DIRECTORIES = src priv doc/src
+# Only interested in @inherits.
+/^@inherits  */!d
 
-SPECIAL_TARGETS = 
+s///
+s/ .*//
 
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
+# Ignore the common application.
+/^common$/d
 
+# Retrieve the dictionary name from the hold space and output
+# a dependency.
+G
+s@^\(.*\)\n\(.*\)@\2.erl: \1.beam@
diff --git a/lib/diameter/examples/dict/rfc4004_mip.dia b/lib/diameter/examples/dict/rfc4004_mip.dia
index 575ad4394a..0595cfe9ef 100644
--- a/lib/diameter/examples/dict/rfc4004_mip.dia
+++ b/lib/diameter/examples/dict/rfc4004_mip.dia
@@ -1,7 +1,7 @@
 ;;
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
 ;;
 ;; The 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,7 @@
 
 @id 2
 
-@inherits rfc3588_base
+@inherits common
 
 ;; ===========================================================================
 
diff --git a/lib/diameter/examples/dict/rfc4005_nas.dia b/lib/diameter/examples/dict/rfc4005_nas.dia
index a4b44e38bb..6f0e7c1ce5 100644
--- a/lib/diameter/examples/dict/rfc4005_nas.dia
+++ b/lib/diameter/examples/dict/rfc4005_nas.dia
@@ -1,7 +1,7 @@
 ;;
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
 ;;
 ;; The 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 @@
 
 @id 1
 
-@inherits rfc3588_base
+@inherits common
 
 ;; ===========================================================================
 
diff --git a/lib/diameter/examples/dict/rfc4006_cc.dia b/lib/diameter/examples/dict/rfc4006_cc.dia
index b723e4ddbb..b45ffc8090 100644
--- a/lib/diameter/examples/dict/rfc4006_cc.dia
+++ b/lib/diameter/examples/dict/rfc4006_cc.dia
@@ -1,7 +1,7 @@
 ;;
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
 ;;
 ;; The 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 @@
 
 @id 4
 
-@inherits rfc3588_base
+@inherits common
 @inherits rfc4005_nas  Filter-Id
 
 ;; ===========================================================================
diff --git a/lib/diameter/examples/dict/rfc4072_eap.dia b/lib/diameter/examples/dict/rfc4072_eap.dia
index 111516b347..676b1b8b9b 100644
--- a/lib/diameter/examples/dict/rfc4072_eap.dia
+++ b/lib/diameter/examples/dict/rfc4072_eap.dia
@@ -1,7 +1,7 @@
 ;;
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
 ;;
 ;; The 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,7 @@
 
 @id 5
 
-@inherits rfc3588_base
+@inherits common
 @inherits rfc4005_nas
 
 ;; ===========================================================================
diff --git a/lib/diameter/examples/dict/rfc4590_digest.dia b/lib/diameter/examples/dict/rfc4590_digest.dia
index a4ebe0c456..de68a6ef7e 100644
--- a/lib/diameter/examples/dict/rfc4590_digest.dia
+++ b/lib/diameter/examples/dict/rfc4590_digest.dia
@@ -1,7 +1,7 @@
 ;;
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
 ;;
 ;; The 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/diameter/examples/dict/rfc4740_sip.dia b/lib/diameter/examples/dict/rfc4740_sip.dia
index 8c21882649..cada3ac826 100644
--- a/lib/diameter/examples/dict/rfc4740_sip.dia
+++ b/lib/diameter/examples/dict/rfc4740_sip.dia
@@ -1,7 +1,7 @@
 ;;
 ;; %CopyrightBegin%
 ;;
-;; Copyright Ericsson AB 2010-2011. All Rights Reserved.
+;; Copyright Ericsson AB 2010-2013. All Rights Reserved.
 ;;
 ;; The 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 @@
 
 @id 6
 
-@inherits rfc3588_base
+@inherits common
 @inherits rfc4590_digest
 
 ;; ===========================================================================
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 77200cc7d0..d74e091e11 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -343,7 +343,7 @@ call(SvcName, App, Message) ->
     | {capx_timeout, 'Unsigned32'()}
     | {disconnect_cb, evaluable()}
     | {length_errors, exit | handle | discard}
-    | {reconnect_timer, 'Unsigned32'()}
+    | {connect_timer, 'Unsigned32'()}
     | {watchdog_timer, 'Unsigned32'() | {module(), atom(), list()}}
     | {watchdog_config, [{okay|suspect, non_neg_integer()}]}
     | {spawn_opt, list()}
diff --git a/lib/diameter/src/base/diameter_capx.erl b/lib/diameter/src/base/diameter_capx.erl
index 1a931a9854..93548ecafd 100644
--- a/lib/diameter/src/base/diameter_capx.erl
+++ b/lib/diameter/src/base/diameter_capx.erl
@@ -168,12 +168,13 @@ ipaddr(A) ->
 %%
 %% Build a CER record to send to a remote peer.
 
-%% Use the fact that diameter_caps has the same field names as CER.
+%% Use the fact that diameter_caps is expected to have the same field
+%% names as CER.
 bCER(#diameter_caps{} = Rec, Dict) ->
-    Values = lists:zip(Dict:'#info-'(diameter_base_CER, fields),
+    RecName = Dict:msg2rec('CER'),
+    Values = lists:zip(Dict:'#info-'(RecName, fields),
                        tl(tuple_to_list(Rec))),
-    Dict:'#new-'(diameter_base_CER, [{K, map(K, V, Dict)}
-                                     || {K,V} <- Values]).
+    Dict:'#new-'(RecName, [{K, map(K, V, Dict)} || {K,V} <- Values]).
 
 %% map/3
 %%
@@ -186,8 +187,9 @@ bCER(#diameter_caps{} = Rec, Dict) ->
 %% since the corresponding dictionaries expect different values for a
 %% 'Vendor-Id': a list for 3588, an integer for 6733.
 
-map('Vendor-Specific-Application-Id', L, Dict) ->
-    Rec = Dict:'#new-'('diameter_base_Vendor-Specific-Application-Id', []),
+map('Vendor-Specific-Application-Id' = T, L, Dict) ->
+    RecName = Dict:name2rec(T),
+    Rec = Dict:'#new-'(RecName, []),
     Def = Dict:'#get-'('Vendor-Id', Rec),
     [vsa(V, Def) || V <- L];
 map(_, V, _) ->
@@ -342,8 +344,9 @@ cs(LS, RS) ->
 %% CER is a subset of CEA, the latter adding Result-Code and a few
 %% more AVP's.
 cea_from_cer(CER, Dict) ->
-    [diameter_base_CER | Values] = Dict:'#get-'(CER),
-    Dict:'#set-'(Values, Dict:'#new-'(diameter_base_CEA)).
+    RecName = Dict:msg2rec('CEA'),
+    [_ | Values] = Dict:'#get-'(CER),
+    Dict:'#set-'(Values, Dict:'#new-'(RecName)).
 
 %% rCEA/3
 
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index 1d647b8c87..0de4d53973 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -477,8 +477,11 @@ split_head(<<Code:32, 1:1, M:1, P:1, _:5, Len:24, V:32, _/bitstring>>) ->
 split_head(<<Code:32, 0:1, M:1, P:1, _:5, Len:24, _/bitstring>>) ->
     {Code, undefined, M, P, Len, 8};
 
-split_head(Bin) ->
-    ?THROW({5014, #diameter_avp{data = Bin}}).
+%% Header is truncated: pack_avp/1 will pad to the minimum header
+%% length.
+split_head(B)
+  when is_bitstring(B) ->
+    ?THROW({5014, #diameter_avp{data = B}}).
 
 %% 3588:
 %%
@@ -523,9 +526,8 @@ split_data(_, _, _) ->
 %% split_data/4
 
 split_data(Bin, HdrLen, Len, Pad) ->
-    <<_:HdrLen/binary, T/bitstring>> = Bin,
-    case T of
-        <<Data:Len/binary, _:Pad/binary, Rest/bitstring>> ->
+    case Bin of
+        <<_:HdrLen/binary, Data:Len/binary, _:Pad/binary, Rest/bitstring>> ->
             {Data, Rest};
         _ ->
             invalid_avp_length()
@@ -573,15 +575,15 @@ pack_avp(#diameter_avp{data = {Dict, Name, Value}} = A) ->
     {Name, Type} = Dict:avp_name(Code, Vid),
     pack_avp(A#diameter_avp{data = {Hdr, {Type, Value}}});
 
-pack_avp(#diameter_avp{code = undefined, data = Bin})
-  when is_binary(Bin) ->
+pack_avp(#diameter_avp{code = undefined, data = B})
+  when is_bitstring(B) ->
     %% Reset the AVP Length of an AVP Header resulting from a 5014
     %% error. The RFC doesn't explicitly say to do this but the
     %% receiver can't correctly extract this and following AVP's
     %% without a correct length. On the downside, the header doesn't
     %% reveal if the received header has been padded.
-    Pad = 8*header_length(Bin) - bit_size(Bin),
-    Len = size(<<H:5/binary, _:24, T/binary>> = <<Bin/bitstring, 0:Pad>>),
+    Pad = 8*header_length(B) - bit_size(B),
+    Len = size(<<H:5/binary, _:24, T/binary>> = <<B/bitstring, 0:Pad>>),
     <<H/binary, Len:24, T/binary>>;
 
 %% ... or as an iolist.
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl
index fc5c284bf2..f5ea459fd0 100644
--- a/lib/diameter/src/base/diameter_config.erl
+++ b/lib/diameter/src/base/diameter_config.erl
@@ -537,7 +537,9 @@ opt({capx_timeout, Tmo}) ->
 opt({length_errors, T}) ->
     lists:member(T, [exit, handle, discard]);
 
-opt({reconnect_timer, Tmo}) ->
+opt({K, Tmo})
+  when K == reconnect_timer;  %% deprecated
+       K == connect_timer ->
     ?IS_UINT32(Tmo);
 
 opt({watchdog_timer, {M,F,A}})
@@ -651,8 +653,9 @@ make_opts(Opts, Defs) ->
 
     [{K, opt(K,V)} || {K,V} <- Known].
 
-opt(spawn_opt, L) ->
-    is_list(L);
+opt(spawn_opt, L)
+  when is_list(L) ->
+    L;
 
 opt(K, false = B)
   when K /= sequence ->
diff --git a/lib/diameter/src/base/diameter_peer_fsm.erl b/lib/diameter/src/base/diameter_peer_fsm.erl
index 4e55864168..f76bd96c3c 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,8 @@
 -behaviour(gen_server).
 
 %% Interface towards diameter_watchdog.
--export([start/3]).
+-export([start/3,
+         result_code/2]).
 
 %% gen_server callbacks
 -export([init/1,
@@ -62,7 +63,6 @@
 %% 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
@@ -177,14 +177,9 @@ init(T) ->
     proc_lib:init_ack({ok, self()}),
     gen_server:enter_loop(?MODULE, [], i(T)).
 
-i({Ack, WPid, {M, Ref} = T, Opts, {Mask,
-                                   Nodes,
-                                   Dict0,
-                                   #diameter_service{capabilities = LCaps}
-                                   = Svc}}) ->
+i({Ack, WPid, {M, Ref} = T, Opts, {Mask, Nodes, Dict0, Svc}}) ->
     erlang:monitor(process, WPid),
     wait(Ack, WPid),
-    putr(?DWA_KEY, dwa(LCaps)),
     diameter_stats:reg(Ref),
     {[Cs,Ds], Rest} = proplists:split(Opts, [capabilities_cb, disconnect_cb]),
     putr(?CB_KEY, {Ref, [F || {_,F} <- Cs]}),
@@ -194,11 +189,7 @@ i({Ack, WPid, {M, Ref} = T, Opts, {Mask,
     putr(?RESTRICT_KEY, Nodes),
 
     Tmo = proplists:get_value(capx_timeout, Opts, ?EVENT_TIMEOUT),
-    ?IS_TIMEOUT(Tmo) orelse ?ERROR({invalid, {capx_timeout, Tmo}}),
     OnLengthErr = proplists:get_value(length_errors, Opts, exit),
-    lists:member(OnLengthErr, [exit, handle, discard])
-        orelse ?ERROR({invalid, {length_errors, OnLengthErr}}),
-    %% Error checking is for configuration added in old code.
 
     {TPid, Addrs} = start_transport(T, Rest, Svc),
 
@@ -612,9 +603,7 @@ rcv(Name, _, #state{state = PS})
        Name == 'CEA' ->
     {stop, {Name, PS}};
 
-rcv(N, Pkt, S)
-  when N == 'DWR';
-       N == 'DPR' ->
+rcv('DPR' = N, Pkt, S) ->
     handle_request(N, Pkt, S);
 
 %% DPA in response to DPR and with the expected identifiers.
@@ -717,8 +706,8 @@ build_answer(Type,
                               errors = Es}
              = Pkt,
              S) ->
-    RC = rc(H, Es),
-    {answer(Type, RC, Es, S), post(Type, RC, Pkt, S)}.
+    {RC, FailedAVP} = result_code(H, Es),
+    {answer(Type, RC, FailedAVP, S), post(Type, RC, Pkt, S)}.
 
 inband_security([]) ->
     ?NO_INBAND_SECURITY;
@@ -734,7 +723,7 @@ cea(CEA, RC, Dict0) ->
 
 post('CER' = T, RC, Pkt, S) ->
     {T, caps(S), {RC, Pkt}};
-post(_, _, _, _) ->
+post('DPR', _, _, _) ->
     ok.
 
 rejected({capabilities_cb, _F, Reason}, T, S) ->
@@ -743,20 +732,20 @@ rejected({capabilities_cb, _F, Reason}, T, S) ->
 rejected(discard, T, _) ->
     close(T);
 rejected({N, Es}, T, S) ->
-    {answer('CER', N, Es, S), T};
+    {answer('CER', N, failed_avp(N, Es), S), T};
 rejected(N, T, S) ->
     rejected({N, []}, T, S).
 
-answer(Type, RC, Es, S) ->
-    set(answer(Type, RC, S), failed_avp(RC, Es)).
-
 failed_avp(RC, [{RC, Avp} | _]) ->
-    [{'Failed-AVP', [{'AVP', [Avp]}]}];
+    [{'Failed-AVP', [[{'AVP', [Avp]}]]}];
 failed_avp(RC, [_ | Es]) ->
     failed_avp(RC, Es);
 failed_avp(_, [] = No) ->
     No.
 
+answer(Type, RC, FailedAVP, S) ->
+    set(answer(Type, RC, S), FailedAVP).
+
 answer(Type, RC, S) ->
     answer_message(answer(Type, S), RC).
 
@@ -784,29 +773,25 @@ set(['answer-message' | _] = Ans, FailedAvp) ->
 set([_|_] = Ans, FailedAvp) ->
     Ans ++ FailedAvp.
 
-%% rc/2
-
-rc(#diameter_header{is_error = true}, _) ->
-    3008;  %% DIAMETER_INVALID_HDR_BITS
+%% result_code/2
 
-rc(_, [Bs|_])
-  when is_bitstring(Bs) ->  %% from old code
-    3009;  %% DIAMETER_INVALID_HDR_BITS
+result_code(#diameter_header{is_error = true}, _) ->
+    {3008, []};  %% DIAMETER_INVALID_HDR_BITS
 
-rc(#diameter_header{version = ?DIAMETER_VERSION}, Es) ->
+result_code(#diameter_header{version = ?DIAMETER_VERSION}, Es) ->
     rc(Es);
 
-rc(_, _) ->
-    5011.  %% DIAMETER_UNSUPPORTED_VERSION
+result_code(_, _) ->
+    {5011, []}.  %% DIAMETER_UNSUPPORTED_VERSION
 
 %% rc/1
 
 rc([]) ->
-    2001;  %% DIAMETER_SUCCESS
-rc([{RC,_}|_]) ->
-    RC;
+    {2001, []};  %% DIAMETER_SUCCESS
+rc([{RC, _} | _] = Es) ->
+    {RC, failed_avp(RC, Es)};
 rc([RC|_]) ->
-    RC.
+    {RC, []}.
 
 %%   DIAMETER_INVALID_HDR_BITS          3008
 %%      A request was received whose bits in the Diameter header were
@@ -832,9 +817,6 @@ rc([RC|_]) ->
 
 %% answer/2
 
-answer('DWR', _) ->
-    getr(?DWA_KEY);
-
 answer(Name, #state{service = #diameter_service{capabilities = Caps}}) ->
     a(Name, Caps).
 
@@ -1019,15 +1001,6 @@ report({M, _, _, _, _} = T)
 report(_) ->
     ok.
 
-%% dwa/1
-
-dwa(#diameter_caps{origin_host = OH,
-                   origin_realm = OR,
-                   origin_state_id = OSI}) ->
-    ['DWA', {'Origin-Host', OH},
-            {'Origin-Realm', OR},
-            {'Origin-State-Id', OSI}].
-
 %% dpr/2
 %%
 %% The RFC isn't clear on whether DPR should be send in a non-Open
diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl
index 9dd8aafc61..1274e0fc48 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -673,7 +673,8 @@ service_options(Opts) ->
      {use_shared_peers, get_value(use_shared_peers, Opts)},
      {restrict_connections, proplists:get_value(restrict_connections,
                                                 Opts,
-                                                ?RESTRICT)}].
+                                                ?RESTRICT)},
+     {spawn_opt, proplists:get_value(spawn_opt, Opts, [])}].
 %% The order of options is significant since we match against the list.
 
 mref(false = No) ->
@@ -700,8 +701,7 @@ notify(Share, SvcName, T) ->
     Nodes = remotes(Share),
     [] /= Nodes andalso diameter_peer:notify(Nodes, SvcName, T).
 %% Test for the empty list for upgrade reasons: there's no
-%% diameter_peer:notify/3 in old code so no call means no load order
-%% requirement.
+%% diameter_peer:notify/3 in old code.
 
 remotes(false) ->
     [];
@@ -1142,10 +1142,17 @@ q_restart(false, _) ->
 %%   communicate.
 
 default_tc(connect, Opts) ->
-    proplists:get_value(reconnect_timer, Opts, ?DEFAULT_TC);
+    connect_timer(Opts, ?DEFAULT_TC);
 default_tc(accept, _) ->
     0.
 
+%% Accept both connect_timer and the (older) reconnect_timer, the
+%% latter being a remnant from a time in which the timer did apply to
+%% reconnect attempts.
+connect_timer(Opts, Def0) ->
+    Def = proplists:get_value(reconnect_timer, Opts, Def0),
+    proplists:get_value(connect_timer, Opts, Def).
+
 %% Bound tc below if the watchdog was restarted recently to avoid
 %% continuous restarted in case of faulty config or other problems.
 tc(Time, Tc) ->
@@ -1180,7 +1187,7 @@ tc(false = No, _, _) ->  %% removed
 %% another watchdog to be able to detect that it should transition
 %% from initial into reopen rather than okay. That someone is either
 %% the accepting watchdog upon reception of a CER from the previously
-%% connected peer, or us after reconnect_timer timeout.
+%% connected peer, or us after connect_timer timeout.
 
 close(#watchdog{type = connect}, _) ->
     ok;
@@ -1193,16 +1200,16 @@ close(#watchdog{type = accept,
 
 %% Tell watchdog to (maybe) die later ...
 c(Pid, true, Opts) ->
-    Tc = proplists:get_value(reconnect_timer, Opts, 2*?DEFAULT_TC),
+    Tc = connect_timer(Opts, 2*?DEFAULT_TC),
     erlang:send_after(Tc, Pid, close);
 
 %% ... or now.
 c(Pid, false, _Opts) ->
     Pid ! close.
 
-%% The RFC's only document the behaviour of Tc, our reconnect_timer,
+%% The RFC's only document the behaviour of Tc, our connect_timer,
 %% for the establishment of connections but we also give
-%% reconnect_timer semantics for a listener, being the time within
+%% connect_timer semantics for a listener, being the time within
 %% which a new connection attempt is expected of a connecting peer.
 %% The value should be greater than the peer's Tc + jitter.
 
diff --git a/lib/diameter/src/base/diameter_stats.erl b/lib/diameter/src/base/diameter_stats.erl
index b68d4af11f..8353613d32 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,9 +245,6 @@ handle_call({read, Refs, Del}, _From, State) ->
 handle_call({read, Refs}, _, State) ->
     {reply, read_refs(Refs), State};
 
-handle_call({flush, Refs}, _From, State) ->  %% from old code
-    {reply, to_refdict(read(Refs, true)), State};
-
 handle_call(Req, From, State) ->
     ?UNEXPECTED([Req, From]),
     {reply, nok, State}.
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 8b6f026b34..7fbb306b02 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
 %%
 %% The 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,9 +90,6 @@ make_recvdata([SvcName, PeerT, Apps, Mask | _]) ->
               peerT = PeerT,
               apps = Apps,
               sequence = Mask}.
-%% Take a list so that the caller (diameter_service) can be upgraded
-%% first if new members are added. Note that receive_message/4 might
-%% still get an old term from any watchdog started in old code.
 
 %% ---------------------------------------------------------------------------
 %% peer_up/1
@@ -305,15 +302,6 @@ errors(_, #diameter_packet{header = #diameter_header{version = V},
   when V /= ?DIAMETER_VERSION ->
     Pkt#diameter_packet{errors = [5011 | Es]};
 
-%%   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.
-
-errors(_, #diameter_packet{errors = [Bs | Es]} = Pkt)
-  when is_bitstring(Bs) ->  %% from old code
-    Pkt#diameter_packet{errors = [3009 | Es]};
-
 %%   DIAMETER_COMMAND_UNSUPPORTED       3001
 %%      The Request contained a Command-Code that the receiver did not
 %%      recognize or support.  This MUST be used when a Diameter node
diff --git a/lib/diameter/src/base/diameter_types.erl b/lib/diameter/src/base/diameter_types.erl
index 9ae289034c..ca3338be5f 100644
--- a/lib/diameter/src/base/diameter_types.erl
+++ b/lib/diameter/src/base/diameter_types.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
 %%
 %% The 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,6 +92,9 @@
   when is_binary(Bin) ->
     binary_to_list(Bin);
 
+'OctetString'(decode, B) ->
+    ?INVALID_LENGTH(B);
+
 'OctetString'(encode = M, zero) ->
     'OctetString'(M, []);
 
@@ -250,44 +253,19 @@
 'Address'(encode, zero) ->
     <<0:48>>;
 
-'Address'(decode, <<1:16, B/binary>>)
-  when size(B) == 4 ->
-    list_to_tuple(binary_to_list(B));
-
-'Address'(decode, <<2:16, B/binary>>)
-  when size(B) == 16 ->
-    list_to_tuple(v6dec(B, []));
+'Address'(decode, <<A:16, B/binary>>)
+  when 1 == A,  4 == size(B);
+       2 == A, 16 == size(B) ->
+    list_to_tuple([N || <<N:A/unit:8>> <= B]);
 
-'Address'(decode, <<A:16, _/binary>> = B)
-  when 1 == A;
-       2 == A ->
+'Address'(decode, B) ->
     ?INVALID_LENGTH(B);
 
 'Address'(encode, T) ->
-    ipenc(diameter_lib:ipaddr(T)).
-
-ipenc(T)
-  when is_tuple(T), size(T) == 4 ->
-    B = list_to_binary(tuple_to_list(T)),
-    <<1:16, B/binary>>;
-
-ipenc(T)
-  when is_tuple(T), size(T) == 8 ->
-    B = v6enc(lists:reverse(tuple_to_list(T)), <<>>),
-    <<2:16, B/binary>>.
-
-v6dec(<<N:16, B/binary>>, Acc) ->
-    v6dec(B, [N | Acc]);
-
-v6dec(<<>>, Acc) ->
-    lists:reverse(Acc).
-
-v6enc([N | Rest], B)
-  when ?UINT(16,N) ->
-    v6enc(Rest, <<N:16, B/binary>>);
-
-v6enc([], B) ->
-    B.
+    Ns = tuple_to_list(diameter_lib:ipaddr(T)),  %% length 4 or 8
+    A = length(Ns) div 4,                        %% 1 or 2
+    B = << <<N:A/unit:8>> || N <- Ns >>,
+    <<A:16, B/binary>>.
 
 %% --------------------
 
@@ -301,7 +279,10 @@ v6enc([], B) ->
     <<_,_/binary>> = 'OctetString'(M, X);
 
 'DiameterIdentity'(decode = M, <<_,_/binary>> = X) ->
-    'OctetString'(M, X).
+    'OctetString'(M, X);
+
+'DiameterIdentity'(decode, X) ->
+    ?INVALID_LENGTH(X).
 
 %% --------------------
 
@@ -309,6 +290,9 @@ v6enc([], B) ->
   when is_binary(Bin) ->
     scan_uri(Bin);
 
+'DiameterURI'(decode, B) ->
+    ?INVALID_LENGTH(B);
+
 %% The minimal DiameterURI is "aaa://x", 7 characters.
 'DiameterURI'(encode = M, zero) ->
     'OctetString'(M, lists:duplicate(0,7));
@@ -353,37 +337,18 @@ v6enc([], B) ->
 
 %% --------------------
 
-'UTF8String'(decode, Bin) ->
-    udec(Bin, []);
+'UTF8String'(decode, Bin)
+  when is_binary(Bin) ->
+    tl([0|_] = unicode:characters_to_list([0, Bin])); %% assert list return
+
+'UTF8String'(decode, B) ->
+    ?INVALID_LENGTH(B);
 
 'UTF8String'(encode = M, zero) ->
     'UTF8String'(M, []);
 
 'UTF8String'(encode, S) ->
-    uenc(S, []).
-
-udec(<<>>, Acc) ->
-    lists:reverse(Acc);
-
-udec(<<C/utf8, Rest/binary>>, Acc) ->
-    udec(Rest, [C | Acc]).
-
-uenc(E, Acc)
-  when E == [];
-       E == <<>> ->
-    list_to_binary(lists:reverse(Acc));
-
-uenc(<<C/utf8, Rest/binary>>, Acc) ->
-    uenc(Rest, [<<C/utf8>> | Acc]);
-
-uenc([[] | Rest], Acc) ->
-    uenc(Rest, Acc);
-
-uenc([[H|T] | Rest], Acc) ->
-    uenc([H, T | Rest], Acc);
-
-uenc([C | Rest], Acc) ->
-    uenc(Rest, [<<C/utf8>> | Acc]).
+    <<_/binary>> = unicode:characters_to_binary(S).   %% assert binary return
 
 %% --------------------
 
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 88ccf630e2..53e659e3f6 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -157,8 +157,7 @@ wait(Ref, Pid) ->
 
 config(Opts) ->
     Config = proplists:get_value(watchdog_config, Opts, []),
-    is_list(Config) orelse config_error({watchdog_config, Config}),
-    lists:foldl(fun config/2, #config{}, Config).      %% ^ added in old code
+    lists:foldl(fun config/2, #config{}, Config).
 
 config({suspect, N}, Rec)
   when ?IS_NATURAL(N) ->
@@ -166,10 +165,7 @@ config({suspect, N}, Rec)
 
 config({okay, N}, Rec)
   when ?IS_NATURAL(N) ->
-    Rec#config{okay = N};
-
-config(T, _) ->  %% added in old code
-    config_error(T).
+    Rec#config{okay = N}.
 
 %% start/5
 
@@ -201,7 +197,7 @@ common_dictionary(Apps) ->
             %% means a user won't be able either send of receive
             %% messages in the common dictionary: incoming request
             %% will be answered with 3007 and outgoing requests cannot
-            %% be sent. The dictionary returned here is oly used for
+            %% be sent. The dictionary returned here is only used for
             %% messages diameter sends and receives: CER/CEA, DPR/DPA
             %% and DWR/DWA.
             ?BASE
@@ -252,17 +248,6 @@ handle_info(T, #watchdog{} = State) ->
             ?LOG(stop, T),
             event(T, State, State#watchdog{status = down}),
             {stop, {shutdown, T}, State}
-    end;
-
-handle_info(T, State) ->  %% started in old code
-    handle_info(T, upgrade(State)).
-
-upgrade(State) ->
-    case erlang:append_element(State, #config{}) of
-        #watchdog{status = okay, config = #config{suspect = OS}} = S ->
-            S#watchdog{num_dwa = OS};
-        #watchdog{} = S ->
-            S
     end.
 
 close({'DOWN', _, process, TPid, {shutdown, Reason}},
@@ -329,7 +314,7 @@ code_change(_, State, _) ->
 %% the commentary is ours.
 
 %% Service or watchdog is telling the watchdog of an accepting
-%% transport to die after reconnect_timer expiry or reestablished
+%% transport to die after connect_timer expiry or reestablished
 %% connection (in another transport process) respectively.
 transition(close, #watchdog{status = down}) ->
     {{accept, _}, _, _} = getr(restart), %% assert
@@ -461,15 +446,28 @@ eraser(Key) ->
 
 %% encode/3
 
-encode(Msg, Mask, Dict) ->
+encode(dwr = M, Dict0, Mask) ->
+    Msg = getr(M),
     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(Dict, Pkt),
-    Bin.
+    #diameter_packet{bin = Bin} = diameter_codec:encode(Dict0, Pkt),
+    Bin;
+
+
+encode(dwa, Dict0, #diameter_packet{header = H, transport_data = TD}
+                   = ReqPkt) ->
+    AnsPkt = #diameter_packet{header
+                              = H#diameter_header{is_request = false,
+                                                  is_error = undefined,
+                                                  is_retransmitted = false},
+                              msg = dwa(ReqPkt),
+                              transport_data = TD},
+
+    diameter_codec:encode(Dict0, AnsPkt).
 
 %% okay/3
 
@@ -527,7 +525,7 @@ send_watchdog(#watchdog{pending = false,
                         dictionary = Dict0,
                         sequence = Mask}
               = S) ->
-    send(TPid, {send, encode(getr(dwr), Mask, Dict0)}),
+    send(TPid, {send, encode(dwr, Dict0, Mask)}),
     ?LOG(send, 'DWR'),
     S#watchdog{pending = true}.
 
@@ -545,10 +543,14 @@ recv(Name, Pkt, S) ->
 
 %% rcv/3
 
+rcv('DWR', Pkt, #watchdog{transport = TPid,
+                          dictionary = Dict0}) ->
+    send(TPid, {send, encode(dwa, Dict0, Pkt)}),
+    ?LOG(send, 'DWA');
+
 rcv(N, _, _)
   when N == 'CER';
        N == 'CEA';
-       N == 'DWR';
        N == 'DWA';
        N == 'DPR';
        N == 'DPA' ->
@@ -642,6 +644,9 @@ rcv('DWA', #watchdog{status = reopen,
 
 %%   REOPEN        Receive non-DWA      Throwaway()          REOPEN
 
+rcv('DWR', #watchdog{status = reopen} = S) ->
+    S;  %% ensure DWA: the RFC isn't explicit about answering
+
 rcv(_, #watchdog{status = reopen} = S) ->
     throwaway(S).
 
@@ -782,6 +787,13 @@ dwr(#diameter_caps{origin_host = OH,
             {'Origin-Realm', OR},
             {'Origin-State-Id', OSI}].
 
+%% dwa/1
+
+dwa(#diameter_packet{header = H, errors = Es}) ->
+    {RC, FailedAVP} = diameter_peer_fsm:result_code(H, Es),
+    ['DWA', {'Result-Code', RC}
+          | tl(getr(dwr)) ++ FailedAVP].
+
 %% restrict_nodes/1
 
 restrict_nodes(false) ->
diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl
index e687145263..22422f2ef2 100644
--- a/lib/diameter/src/compiler/diameter_codegen.erl
+++ b/lib/diameter/src/compiler/diameter_codegen.erl
@@ -33,11 +33,6 @@
 
 -export([from_dict/4]).
 
-%% Internal exports (for test).
--export([file/1,
-         file/2,
-         file/3]).
-
 -include("diameter_forms.hrl").
 -include("diameter_vsn.hrl").
 
@@ -48,18 +43,61 @@
 
 %% ===========================================================================
 
--spec from_dict(File, Spec, Opts, Mode)
+-spec from_dict(File, ParseD, Opts, Mode)
    -> ok
+    | term()
  when File :: string(),
-      Spec :: orddict:orddict(),
+      ParseD :: orddict:orddict(),
       Opts :: list(),
-      Mode :: spec | erl | hrl.
+      Mode :: parse | forms | erl | hrl.
 
-from_dict(File, Spec, Opts, Mode) ->
+from_dict(File, ParseD, Opts, Mode) ->
     Outdir = proplists:get_value(outdir, Opts, "."),
+    Return = proplists:get_value(return, Opts, false),
+    Mod = mod(File, orddict:find(name, ParseD)),
     putr(verbose, lists:member(verbose, Opts)),
-    putr(debug,   lists:member(debug, Opts)),
-    codegen(File, Spec, Outdir, Mode).
+    try
+        maybe_write(Return, Mode, Outdir, Mod, gen(Mode, ParseD, ?A(Mod)))
+    after
+        eraser(verbose)
+    end.
+
+mod(File, error) ->
+    filename:rootname(filename:basename(File));
+mod(_, {ok, Mod}) ->
+    Mod.
+
+maybe_write(true, _, _, _, T) ->
+    T;
+
+maybe_write(_, Mode, Outdir, Mod, T) ->
+    Path = filename:join(Outdir, Mod),  %% minus extension
+    do_write(Mode, [Path, $., ext(Mode)], T).
+
+ext(parse) ->
+    "D";
+ext(forms) ->
+    "F";
+ext(T) ->
+    ?S(T).
+
+do_write(M, Path, T)
+  when M == parse;
+       M == forms ->
+    write_term(Path, T);
+do_write(_, Path, T) ->
+    write(Path, T).
+
+write(Path, T) ->
+    write(Path, "~s", T).
+
+write_term(Path, T) ->
+    write(Path, "~p.~n", T).
+
+write(Path, Fmt, T) ->
+    {ok, Fd} = file:open(Path, [write]),
+    io:fwrite(Fd, Fmt, [T]),
+    ok = file:close(Fd).
 
 %% Optional reports when running verbosely.
 report(What, Data) ->
@@ -77,20 +115,8 @@ putr(Key, Value) ->
 getr(Key) ->
     get({?MODULE, Key}).
 
-%% ===========================================================================
-%% ===========================================================================
-
-%% Generate from parsed dictionary in a file.
-
-file(F) ->
-    file(F, spec).
-
-file(F, Mode) ->
-    file(F, ".", Mode).
-
-file(F, Outdir, Mode) ->
-    {ok, [Spec]} = file:consult(F),
-    from_dict(F, Spec, Outdir, Mode).
+eraser(Key) ->
+    erase({?MODULE, Key}).
 
 %% ===========================================================================
 %% ===========================================================================
@@ -98,97 +124,68 @@ file(F, Outdir, Mode) ->
 get_value(Key, Plist) ->
     proplists:get_value(Key, Plist, []).
 
-write(Path, Str) ->
-    w(Path, Str, "~s").
-
-write_term(Path, T) ->
-    w(Path, T, "~p.").
-
-w(Path, T, Fmt) ->
-    {ok, Fd} = file:open(Path, [write]),
-    io:fwrite(Fd, Fmt ++ "~n", [T]),
-    file:close(Fd).
-
-codegen(File, Spec, Outdir, Mode) ->
-    Mod = mod(File, orddict:find(name, Spec)),
-    Path = filename:join(Outdir, Mod),  %% minus extension
-    gen(Mode, Spec, ?A(Mod), Path),
-    ok.
-
-mod(File, error) ->
-    filename:rootname(filename:basename(File));
-mod(_, {ok, Mod}) ->
-    Mod.
-
-gen(spec, Spec, _Mod, Path) ->
-    write_term(Path ++ ".spec", [?VERSION | Spec]);
-
-gen(hrl, Spec, Mod, Path) ->
-    gen_hrl(Path ++ ".hrl", Mod, Spec);
-
-gen(erl, Spec, Mod, Path) ->
-    Forms = [{?attribute, module, Mod},
-             {?attribute, compile, {parse_transform, diameter_exprecs}},
-             {?attribute, compile, nowarn_unused_function},
-             {?attribute, export, [{name, 0},
-                                   {id, 0},
-                                   {vendor_id, 0},
-                                   {vendor_name, 0},
-                                   {decode_avps, 2}, %% in diameter_gen.hrl
-                                   {encode_avps, 2}, %%
-                                   {msg_name, 2},
-                                   {msg_header, 1},
-                                   {rec2msg, 1},
-                                   {msg2rec, 1},
-                                   {name2rec, 1},
-                                   {avp_name, 2},
-                                   {avp_arity, 2},
-                                   {avp_header, 1},
-                                   {avp, 3},
-                                   {grouped_avp, 3},
-                                   {enumerated_avp, 3},
-                                   {empty_value, 1},
-                                   {dict, 0}]},
-             %% diameter.hrl is included for #diameter_avp
-             {?attribute, include_lib, "diameter/include/diameter.hrl"},
-             {?attribute, include_lib, "diameter/include/diameter_gen.hrl"},
-             f_name(Mod),
-             f_id(Spec),
-             f_vendor_id(Spec),
-             f_vendor_name(Spec),
-             f_msg_name(Spec),
-             f_msg_header(Spec),
-             f_rec2msg(Spec),
-             f_msg2rec(Spec),
-             f_name2rec(Spec),
-             f_avp_name(Spec),
-             f_avp_arity(Spec),
-             f_avp_header(Spec),
-             f_avp(Spec),
-             f_enumerated_avp(Spec),
-             f_empty_value(Spec),
-             f_dict(Spec),
-             {eof, ?LINE}],
-
-    gen_erl(Path, insert_hrl_forms(Spec, Forms)).
-
-gen_erl(Path, Forms) ->
-    getr(debug) andalso write_term(Path ++ ".forms", Forms),
-    write(Path ++ ".erl",
-          header() ++ erl_prettypr:format(erl_syntax:form_list(Forms))).
-
-insert_hrl_forms(Spec, Forms) ->
-    {H,T} = lists:splitwith(fun is_header/1, Forms),
-    H ++ make_hrl_forms(Spec) ++ T.
-
-is_header({attribute, _, export, _}) ->
-    false;
-is_header(_) ->
-    true.
-
-make_hrl_forms(Spec) ->
+gen(parse, ParseD, _Mod) ->
+    [?VERSION | ParseD];
+
+gen(forms, ParseD, Mod) ->
+    pp(erl_forms(Mod, ParseD));
+
+gen(hrl, ParseD, Mod) ->
+    gen_hrl(Mod, ParseD);
+
+gen(erl, ParseD, Mod) ->
+    [header(), prettypr(erl_forms(Mod, ParseD)), $\n].
+
+erl_forms(Mod, ParseD) ->
+    Forms = [[{?attribute, module, Mod},
+              {?attribute, compile, {parse_transform, diameter_exprecs}},
+              {?attribute, compile, nowarn_unused_function}],
+             make_hrl_forms(ParseD),
+             [{?attribute, export, [{name, 0},
+                                    {id, 0},
+                                    {vendor_id, 0},
+                                    {vendor_name, 0},
+                                    {decode_avps, 2}, %% in diameter_gen.hrl
+                                    {encode_avps, 2}, %%
+                                    {msg_name, 2},
+                                    {msg_header, 1},
+                                    {rec2msg, 1},
+                                    {msg2rec, 1},
+                                    {name2rec, 1},
+                                    {avp_name, 2},
+                                    {avp_arity, 2},
+                                    {avp_header, 1},
+                                    {avp, 3},
+                                    {grouped_avp, 3},
+                                    {enumerated_avp, 3},
+                                    {empty_value, 1},
+                                    {dict, 0}]},
+              %% diameter.hrl is included for #diameter_avp
+              {?attribute, include_lib, "diameter/include/diameter.hrl"},
+              {?attribute, include_lib, "diameter/include/diameter_gen.hrl"},
+              f_name(Mod),
+              f_id(ParseD),
+              f_vendor_id(ParseD),
+              f_vendor_name(ParseD),
+              f_msg_name(ParseD),
+              f_msg_header(ParseD),
+              f_rec2msg(ParseD),
+              f_msg2rec(ParseD),
+              f_name2rec(ParseD),
+              f_avp_name(ParseD),
+              f_avp_arity(ParseD),
+              f_avp_header(ParseD),
+              f_avp(ParseD),
+              f_enumerated_avp(ParseD),
+              f_empty_value(ParseD),
+              f_dict(ParseD),
+              {eof, ?LINE}]],
+
+    lists:append(Forms).
+
+make_hrl_forms(ParseD) ->
     {_Prefix, MsgRecs, GrpRecs, ImportedGrpRecs}
-        = make_record_forms(Spec),
+        = make_record_forms(ParseD),
 
     RecordForms = MsgRecs ++ GrpRecs ++ lists:flatmap(fun({_,Fs}) -> Fs end,
                                                       ImportedGrpRecs),
@@ -199,16 +196,16 @@ make_hrl_forms(Spec) ->
     %% export_records is used by the diameter_exprecs parse transform.
     [{?attribute, export_records, RecNames} | RecordForms].
 
-make_record_forms(Spec) ->
-    Prefix = prefix(Spec),
+make_record_forms(ParseD) ->
+    Prefix = prefix(ParseD),
 
-    MsgRecs = a_record(Prefix, fun msg_proj/1, get_value(messages, Spec)),
-    GrpRecs = a_record(Prefix, fun grp_proj/1, get_value(grouped, Spec)),
+    MsgRecs = a_record(Prefix, fun msg_proj/1, get_value(messages, ParseD)),
+    GrpRecs = a_record(Prefix, fun grp_proj/1, get_value(grouped, ParseD)),
 
     ImportedGrpRecs = [{M, a_record(Prefix, fun grp_proj/1, Gs)}
-                       || {M,Gs} <- get_value(import_groups, Spec)],
+                       || {M,Gs} <- get_value(import_groups, ParseD)],
 
-    {Prefix, MsgRecs, GrpRecs, ImportedGrpRecs}.
+    {to_upper(Prefix), MsgRecs, GrpRecs, ImportedGrpRecs}.
 
 msg_proj({Name, _, _, _, Avps}) ->
     {Name, Avps}.
@@ -246,9 +243,9 @@ f_name(Name) ->
 %%% # id/0
 %%% ------------------------------------------------------------------------
 
-f_id(Spec) ->
+f_id(ParseD) ->
     {?function, id, 0,
-     [c_id(orddict:find(id, Spec))]}.
+     [c_id(orddict:find(id, ParseD))]}.
 
 c_id({ok, Id}) ->
     {?clause, [], [], [?INTEGER(Id)]};
@@ -260,9 +257,9 @@ c_id(error) ->
 %%% # vendor_id/0
 %%% ------------------------------------------------------------------------
 
-f_vendor_id(Spec) ->
+f_vendor_id(ParseD) ->
     {?function, vendor_id, 0,
-     [{?clause, [], [], [b_vendor_id(orddict:find(vendor, Spec))]}]}.
+     [{?clause, [], [], [b_vendor_id(orddict:find(vendor, ParseD))]}]}.
 
 b_vendor_id({ok, {Id, _}}) ->
     ?INTEGER(Id);
@@ -273,9 +270,9 @@ b_vendor_id(error) ->
 %%% # vendor_name/0
 %%% ------------------------------------------------------------------------
 
-f_vendor_name(Spec) ->
+f_vendor_name(ParseD) ->
     {?function, vendor_name, 0,
-     [{?clause, [], [], [b_vendor_name(orddict:find(vendor, Spec))]}]}.
+     [{?clause, [], [], [b_vendor_name(orddict:find(vendor, ParseD))]}]}.
 
 b_vendor_name({ok, {_, Name}}) ->
     ?Atom(Name);
@@ -286,15 +283,15 @@ b_vendor_name(error) ->
 %%% # msg_name/1
 %%% ------------------------------------------------------------------------
 
-f_msg_name(Spec) ->
-    {?function, msg_name, 2, msg_name(Spec)}.
+f_msg_name(ParseD) ->
+    {?function, msg_name, 2, msg_name(ParseD)}.
 
 %% Return the empty name for any unknown command to which
 %% DIAMETER_COMMAND_UNSUPPORTED should be replied.
 
-msg_name(Spec) ->
+msg_name(ParseD) ->
     lists:flatmap(fun c_msg_name/1, proplists:get_value(command_codes,
-                                                        Spec,
+                                                        ParseD,
                                                         []))
         ++ [{?clause, [?VAR('_'), ?VAR('_')], [], [?ATOM('')]}].
 
@@ -310,12 +307,12 @@ c_msg_name({Code, Req, Ans}) ->
 %%% # msg2rec/1
 %%% ------------------------------------------------------------------------
 
-f_msg2rec(Spec) ->
-    {?function, msg2rec, 1, msg2rec(Spec)}.
+f_msg2rec(ParseD) ->
+    {?function, msg2rec, 1, msg2rec(ParseD)}.
 
-msg2rec(Spec) ->
-    Pre = prefix(Spec),
-    lists:map(fun(T) -> c_msg2rec(T, Pre) end, get_value(messages, Spec))
+msg2rec(ParseD) ->
+    Pre = prefix(ParseD),
+    lists:map(fun(T) -> c_msg2rec(T, Pre) end, get_value(messages, ParseD))
         ++ [?BADARG(1)].
 
 c_msg2rec({N,_,_,_,_}, Pre) ->
@@ -325,12 +322,12 @@ c_msg2rec({N,_,_,_,_}, Pre) ->
 %%% # rec2msg/1
 %%% ------------------------------------------------------------------------
 
-f_rec2msg(Spec) ->
-    {?function, rec2msg, 1, rec2msg(Spec)}.
+f_rec2msg(ParseD) ->
+    {?function, rec2msg, 1, rec2msg(ParseD)}.
 
-rec2msg(Spec) ->
-    Pre = prefix(Spec),
-    lists:map(fun(T) -> c_rec2msg(T, Pre) end, get_value(messages, Spec))
+rec2msg(ParseD) ->
+    Pre = prefix(ParseD),
+    lists:map(fun(T) -> c_rec2msg(T, Pre) end, get_value(messages, ParseD))
         ++ [?BADARG(1)].
 
 c_rec2msg({N,_,_,_,_}, Pre) ->
@@ -340,13 +337,13 @@ c_rec2msg({N,_,_,_,_}, Pre) ->
 %%% # name2rec/1
 %%% ------------------------------------------------------------------------
 
-f_name2rec(Spec) ->
-    {?function, name2rec, 1, name2rec(Spec)}.
+f_name2rec(ParseD) ->
+    {?function, name2rec, 1, name2rec(ParseD)}.
 
-name2rec(Spec) ->
-    Pre = prefix(Spec),
-    Groups = get_value(grouped, Spec)
-          ++ lists:flatmap(fun avps/1, get_value(import_groups, Spec)),
+name2rec(ParseD) ->
+    Pre = prefix(ParseD),
+    Groups = get_value(grouped, ParseD)
+          ++ lists:flatmap(fun avps/1, get_value(import_groups, ParseD)),
     lists:map(fun({N,_,_,_}) -> c_name2rec(N, Pre) end, Groups)
         ++ [{?clause, [?VAR('T')], [], [?CALL(msg2rec, [?VAR('T')])]}].
 
@@ -360,8 +357,8 @@ avps({_Mod, Avps}) ->
 %%% # avp_name/1
 %%% ------------------------------------------------------------------------
 
-f_avp_name(Spec) ->
-    {?function, avp_name, 2, avp_name(Spec)}.
+f_avp_name(ParseD) ->
+    {?function, avp_name, 2, avp_name(ParseD)}.
 
 %% 3588, 4.1:
 %%
@@ -372,11 +369,11 @@ f_avp_name(Spec) ->
 %%       field.  AVP numbers 256 and above are used for Diameter, which are
 %%       allocated by IANA (see Section 11.1).
 
-avp_name(Spec) ->
-    Avps = get_value(avp_types, Spec),
-    Imported = get_value(import_avps, Spec),
-    Vid = orddict:find(vendor, Spec),
-    Vs = vendor_id_map(Spec),
+avp_name(ParseD) ->
+    Avps = get_value(avp_types, ParseD),
+    Imported = get_value(import_avps, ParseD),
+    Vid = orddict:find(vendor, ParseD),
+    Vs = vendor_id_map(ParseD),
 
     lists:map(fun(T) -> c_avp_name(T, Vs, Vid) end, Avps)
         ++ lists:flatmap(fun(T) -> c_imported_avp_name(T, Vs) end, Imported)
@@ -407,25 +404,25 @@ c_avp_name_(T, Code, Vid) ->
      [],
      [T]}.
 
-vendor_id_map(Spec) ->
+vendor_id_map(ParseD) ->
     lists:flatmap(fun({V,Ns}) -> [{N,V} || N <- Ns] end,
-                  get_value(avp_vendor_id, Spec))
+                  get_value(avp_vendor_id, ParseD))
         ++ lists:flatmap(fun({_,_,[],_}) -> [];
                             ({N,_,[V],_}) -> [{N,V}]
                          end,
-                         get_value(grouped, Spec)).
+                         get_value(grouped, ParseD)).
 
 %%% ------------------------------------------------------------------------
 %%% # avp_arity/2
 %%% ------------------------------------------------------------------------
 
-f_avp_arity(Spec) ->
-    {?function, avp_arity, 2, avp_arity(Spec)}.
+f_avp_arity(ParseD) ->
+    {?function, avp_arity, 2, avp_arity(ParseD)}.
 
-avp_arity(Spec) ->
-    Msgs = get_value(messages, Spec),
-    Groups = get_value(grouped, Spec)
-          ++ lists:flatmap(fun avps/1, get_value(import_groups, Spec)),
+avp_arity(ParseD) ->
+    Msgs = get_value(messages, ParseD),
+    Groups = get_value(grouped, ParseD)
+          ++ lists:flatmap(fun avps/1, get_value(import_groups, ParseD)),
     c_avp_arity(Msgs ++ Groups)
         ++ [{?clause, [?VAR('_'), ?VAR('_')], [], [?INTEGER(0)]}].
 
@@ -449,15 +446,15 @@ c_arity(Name, Avp) ->
 %%% # avp/3
 %%% ------------------------------------------------------------------------
 
-f_avp(Spec) ->
-    {?function, avp, 3, avp(Spec) ++ [?BADARG(3)]}.
+f_avp(ParseD) ->
+    {?function, avp, 3, avp(ParseD) ++ [?BADARG(3)]}.
 
-avp(Spec) ->
-    Native     = get_value(avp_types, Spec),
-    CustomMods = get_value(custom_types, Spec),
-    TypeMods   = get_value(codecs, Spec),
-    Imported   = get_value(import_avps, Spec),
-    Enums      = get_value(enum, Spec),
+avp(ParseD) ->
+    Native     = get_value(avp_types, ParseD),
+    CustomMods = get_value(custom_types, ParseD),
+    TypeMods   = get_value(codecs, ParseD),
+    Imported   = get_value(import_avps, ParseD),
+    Enums      = get_value(enum, ParseD),
 
     Custom = lists:map(fun({M,As}) -> {M, custom_types, As} end,
                        CustomMods)
@@ -548,14 +545,14 @@ custom(codecs, AvpName, Type) ->
 %%% # enumerated_avp/3
 %%% ------------------------------------------------------------------------
 
-f_enumerated_avp(Spec) ->
-    {?function, enumerated_avp, 3, enumerated_avp(Spec) ++ [?BADARG(3)]}.
+f_enumerated_avp(ParseD) ->
+    {?function, enumerated_avp, 3, enumerated_avp(ParseD) ++ [?BADARG(3)]}.
 
-enumerated_avp(Spec) ->
-    Enums = get_value(enum, Spec),
+enumerated_avp(ParseD) ->
+    Enums = get_value(enum, ParseD),
     lists:flatmap(fun cs_enumerated_avp/1, Enums)
         ++ lists:flatmap(fun({M,Es}) -> enumerated_avp(M, Es, Enums) end,
-                         get_value(import_enums, Spec)).
+                         get_value(import_enums, ParseD)).
 
 enumerated_avp(Mod, Es, Enums) ->
     lists:flatmap(fun({N,_}) ->
@@ -585,16 +582,16 @@ c_enumerated_avp(AvpName, {_,I}) ->
 %%% msg_header/1
 %%% ------------------------------------------------------------------------
 
-f_msg_header(Spec) ->
-    {?function, msg_header, 1, msg_header(Spec) ++ [?BADARG(1)]}.
+f_msg_header(ParseD) ->
+    {?function, msg_header, 1, msg_header(ParseD) ++ [?BADARG(1)]}.
 
-msg_header(Spec) ->
-    msg_header(get_value(messages, Spec), Spec).
+msg_header(ParseD) ->
+    msg_header(get_value(messages, ParseD), ParseD).
 
 msg_header([], _) ->
     [];
-msg_header(Msgs, Spec) ->
-    ApplId = orddict:fetch(id, Spec),
+msg_header(Msgs, ParseD) ->
+    ApplId = orddict:fetch(id, ParseD),
 
     lists:map(fun({M,C,F,_,_}) -> c_msg_header(M, C, F, ApplId) end, Msgs).
 
@@ -616,14 +613,14 @@ emf('ERR', N) -> N bor 2#00100000.
 %%% # avp_header/1
 %%% ------------------------------------------------------------------------
 
-f_avp_header(Spec) ->
-    {?function, avp_header, 1, avp_header(Spec) ++ [?BADARG(1)]}.
+f_avp_header(ParseD) ->
+    {?function, avp_header, 1, avp_header(ParseD) ++ [?BADARG(1)]}.
 
-avp_header(Spec) ->
-    Native = get_value(avp_types, Spec),
-    Imported = get_value(import_avps, Spec),
-    Vid = orddict:find(vendor, Spec),
-    Vs = vendor_id_map(Spec),
+avp_header(ParseD) ->
+    Native = get_value(avp_types, ParseD),
+    Imported = get_value(import_avps, ParseD),
+    Vid = orddict:find(vendor, ParseD),
+    Vs = vendor_id_map(ParseD),
 
     lists:flatmap(fun(A) -> c_avp_header(A, Vs, Vid) end,
                   Native ++ Imported).
@@ -679,14 +676,14 @@ v(false, _, _, _) ->
 %%% # empty_value/0
 %%% ------------------------------------------------------------------------
 
-f_empty_value(Spec) ->
-    {?function, empty_value, 1, empty_value(Spec)}.
+f_empty_value(ParseD) ->
+    {?function, empty_value, 1, empty_value(ParseD)}.
 
-empty_value(Spec) ->
-    Imported = lists:flatmap(fun avps/1, get_value(import_enums, Spec)),
-    Groups = get_value(grouped, Spec)
-        ++ lists:flatmap(fun avps/1, get_value(import_groups, Spec)),
-    Enums = [T || {N,_} = T <- get_value(enum, Spec),
+empty_value(ParseD) ->
+    Imported = lists:flatmap(fun avps/1, get_value(import_enums, ParseD)),
+    Groups = get_value(grouped, ParseD)
+        ++ lists:flatmap(fun avps/1, get_value(import_groups, ParseD)),
+    Enums = [T || {N,_} = T <- get_value(enum, ParseD),
                   not lists:keymember(N, 1, Imported)]
         ++ Imported,
     lists:map(fun c_empty_value/1, Groups ++ Enums)
@@ -706,72 +703,52 @@ c_empty_value({Name, _}) ->
 %%% # dict/0
 %%% ------------------------------------------------------------------------
 
-f_dict(Spec) ->
+f_dict(ParseD) ->
     {?function, dict, 0,
-     [{?clause, [], [], [?TERM([?VERSION | Spec])]}]}.
+     [{?clause, [], [], [?TERM([?VERSION | ParseD])]}]}.
 
 %%% ------------------------------------------------------------------------
-%%% # gen_hrl/3
+%%% # gen_hrl/2
 %%% ------------------------------------------------------------------------
 
-gen_hrl(Path, Mod, Spec) ->
-    {ok, Fd} = file:open(Path, [write]),
-
+gen_hrl(Mod, ParseD) ->
     {Prefix, MsgRecs, GrpRecs, ImportedGrpRecs}
-        = make_record_forms(Spec),
-
-    file:write(Fd, hrl_header(Mod)),
-
-    forms("Message records",     Fd, MsgRecs),
-    forms("Grouped AVP records", Fd, GrpRecs),
-
-    lists:foreach(fun({M,Fs}) ->
-                          forms("Grouped AVP records from " ++ atom_to_list(M),
-                                Fd,
-                                Fs)
-                  end,
-                  ImportedGrpRecs),
-
-    PREFIX = to_upper(Prefix),
-
-    write("ENUM Macros",
-          Fd,
-          m_enums(PREFIX, false, get_value(enum, Spec))),
-    write("DEFINE Macros",
-          Fd,
-          m_enums(PREFIX, false, get_value(define, Spec))),
-
-    lists:foreach(fun({M,Es}) ->
-                          write("ENUM Macros from " ++ atom_to_list(M),
-                                Fd,
-                                m_enums(PREFIX, true, Es))
-                  end,
-                  get_value(import_enums, Spec)),
-
-    file:close(Fd).
-
-forms(_, _, []) ->
-    ok;
-forms(Banner, Fd, Forms) ->
-    write(Banner, Fd, prettypr(Forms)).
-
-write(_, _, []) ->
-    ok;
-write(Banner, Fd, Str) ->
-    banner(Fd, Banner),
-    io:fwrite(Fd, "~s~n", [Str]).
+        = make_record_forms(ParseD),
+
+    [hrl_header(Mod),
+     forms("Message records",     MsgRecs),
+     forms("Grouped AVP records", GrpRecs),
+     lists:map(fun({M,Fs}) ->
+                       forms("Grouped AVP records from " ++ atom_to_list(M),
+                             Fs)
+               end,
+               ImportedGrpRecs),
+     format("ENUM Macros", m_enums(Prefix, false, get_value(enum, ParseD))),
+     format("DEFINE Macros", m_enums(Prefix, false, get_value(define, ParseD))),
+     lists:map(fun({M,Es}) ->
+                       format("ENUM Macros from " ++ atom_to_list(M),
+                              m_enums(Prefix, true, Es))
+               end,
+               get_value(import_enums, ParseD))].
+
+forms(_, [] = No) ->
+    No;
+forms(Banner, Forms) ->
+    format(Banner, prettypr(Forms)).
+
+format(_, [] = No) ->
+    No;
+format(Banner, Str) ->
+    [banner(Banner), Str, $\n].
 
 prettypr(Forms) ->
     erl_prettypr:format(erl_syntax:form_list(Forms)).
 
-banner(Fd, Heading) ->
-    file:write(Fd, banner(Heading)).
-
 banner(Heading) ->
-    ("\n\n"
+    ["\n\n"
      "%%% -------------------------------------------------------\n"
-     "%%% " ++ Heading ++ ":\n"
-     "%%% -------------------------------------------------------\n\n").
+     "%%% ", Heading, ":\n"
+     "%%% -------------------------------------------------------\n\n"].
 
 z(S) ->
     string:join(string:tokens(S, "\s\t"), "\s").
@@ -845,8 +822,8 @@ arity([_],   '*' = Inf) -> {0, Inf};
 arity({_},   '*' = Inf) -> {1, Inf};
 arity(_,   {_,_} = Q)   -> Q.
 
-prefix(Spec) ->
-    case orddict:find(prefix, Spec) of
+prefix(ParseD) ->
+    case orddict:find(prefix, ParseD) of
         {ok, P} ->
             P ++ "_";
         error ->
@@ -855,3 +832,70 @@ prefix(Spec) ->
 
 rec_name(Name, Prefix) ->
     Prefix ++ Name.
+
+%% ===========================================================================
+%% pp/1
+%%
+%% Preprocess forms as generated by 'forms' option. In particular,
+%% replace the include_lib attributes in generated forms by the
+%% corresponding forms, extracting the latter from an existing
+%% dictionary (diameter_gen_relay). The resulting forms can be
+%% compiled to beam using compile:forms/2 (which does no preprocessing
+%% or it's own; DiY currently appears to be the only way to preprocess
+%% a forms list).
+
+pp(Forms) ->
+    {_, Beam, _} = code:get_object_code(diameter_gen_relay),
+    pp(Forms, abstract_code(Beam)).
+
+pp(Forms, {ok, Code}) ->
+    Files = files(Code, []),
+    lists:flatmap(fun(T) -> include(T, Files) end, Forms);
+
+pp(Forms, {error, Reason}) ->
+    erlang:error({forms, Reason, Forms}).
+
+include({attribute, _, include_lib, Path}, Files) ->
+    Inc = filename:basename(Path),
+    [{Inc, Forms}] = [T || {F, _} = T <- Files, F == Inc], %% expect one
+    lists:flatmap(fun filter/1, Forms);
+
+include(T, _) ->
+    [T].
+
+abstract_code(Beam) ->
+    case beam_lib:chunks(Beam, [abstract_code]) of
+        {ok, {_Mod, [{abstract_code, {_Vsn, Code}}]}} ->
+            {ok, Code};
+        {ok, {_Mod, [{abstract_code, no_abstract_code = No}]}} ->
+            {error, No};
+        {error = E, beam_lib, Reason} ->
+            {E, Reason}
+    end.
+
+files([{attribute, _, file, {Path, _}} | T], Acc) ->
+    {Body, Rest} = lists:splitwith(fun({attribute, _, file, _}) -> false;
+                                      (_) -> true
+                                   end,
+                                   T),
+    files(Rest, [{filename:basename(Path), Body} | Acc]);
+
+files([], Acc) ->
+    Acc.
+
+%% Only retain record diameter_avp and functions not generated by
+%% diameter_exprecs.
+
+filter({attribute, _, record, {diameter_avp, _}} = T) ->
+    [T];
+
+filter({function, _, Name, _, _} = T) ->
+    case ?S(Name) of
+        [$#|_] ->  %% generated by diameter_exprecs
+            [];
+        _ ->
+            [T]
+    end;
+
+filter(_) ->
+    [].
diff --git a/lib/diameter/src/compiler/diameter_dict_util.erl b/lib/diameter/src/compiler/diameter_dict_util.erl
index 36a6efa294..136bba16cb 100644
--- a/lib/diameter/src/compiler/diameter_dict_util.erl
+++ b/lib/diameter/src/compiler/diameter_dict_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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 @@
 -spec parse(File, Opts)
    -> {ok, orddict:orddict()}
     | {error, term()}
- when File :: {path, string()}
+ when File :: {path, file:name_all()}
             | iolist()
             | binary(),
       Opts :: list().
@@ -155,6 +155,8 @@ fmt(grouped_avp_has_wrong_type) ->
     "Grouped AVP ~s at line ~p defined with type ~s at line ~p";
 fmt(grouped_avp_not_defined) ->
     "Grouped AVP ~s on line ~p not defined in @avp_types";
+fmt(grouped_avp_not_grouped) ->
+    "Grouped AVP ~s on line ~p not defined in @grouped";
 fmt(grouped_vendor_id_without_flag) ->
     "Grouped AVP ~s at line ~p has vendor id "
     "but definition at line ~p does not specify V flag";
@@ -265,6 +267,9 @@ io(K, Id)
 io(vendor = K, {Id, Name}) ->
     [?NL, section(K) | [[?SP, tok(X)] || X <- [Id, Name]]];
 
+io(_, []) ->
+    [];
+
 io(avp_types = K, Body) ->
     [?NL, ?NL, section(K), ?NL, [body(K,A) || A <- Body]];
 
@@ -398,9 +403,9 @@ read(File) ->
     {ok, iolist_to_binary([File])}.
 
 make_dict(Parse, Opts) ->
-    make_orddict(pass4(pass3(pass2(pass1(reset(make_dict(Parse),
-                                               Opts))),
-                             Opts))).
+    Dict = pass3(pass2(pass1(reset(make_dict(Parse), Opts))), Opts),
+    ok = examine(Dict),
+    make_orddict(Dict).
 
 %% make_orddict/1
 
@@ -1165,7 +1170,7 @@ import_avps(Dict, Opts) ->
     Import = inherit(Dict, Opts),
     report(imported, Import),
 
-    %% pass4/1 tests that all referenced AVP's are either defined
+    %% examine/1 tests that all referenced AVP's are either defined
     %% or imported.
 
     dict:store(import_avps,
@@ -1273,21 +1278,21 @@ dict(Mod) ->
     end.
 
 %% ===========================================================================
-%% pass4/1
+%% examine/1
 %%
 %% Sanity checks.
 
-pass4(Dict) ->
-    dict:fold(fun(K, V, _) -> p4(K, V, Dict) end, ok, Dict),
-    Dict.
+examine(Dict) ->
+    dict:fold(fun(K, V, _) -> x(K, V, Dict) end, ok, Dict),
+    ok.
 
 %% Ensure enum AVP's have type Enumerated.
-p4({enum, Name}, [Line | _], Dict)
+x({enum, Name}, [Line | _], Dict)
   when is_list(Name) ->
     true = is_enumerated_avp(Name, Dict, Line);
 
 %% Ensure all referenced AVP's are either defined locally or imported.
-p4({K, {Name, AvpName}}, [Line | _], Dict)
+x({K, {Name, AvpName}}, [Line | _], Dict)
   when (K == grouped orelse K == messages),
        is_list(Name),
        is_list(AvpName),
@@ -1295,13 +1300,22 @@ p4({K, {Name, AvpName}}, [Line | _], Dict)
     true = avp_is_defined(AvpName, Dict, Line);
 
 %% Ditto.
-p4({K, AvpName}, [Line | _], Dict)
+x({K, AvpName}, [Line | _], Dict)
   when K == avp_vendor_id;
        K == custom_types;
        K == codecs ->
     true = avp_is_defined(AvpName, Dict, Line);
 
-p4(_, _, _) ->
+%% Ensure that all local AVP's of type Grouped are also present in @grouped.
+x({avp_types, Name}, [Line | Toks], Dict)
+  when 0 < Line, is_list(Name) ->
+    [{number, _, _Code}, {word, _, Type}, {word, _, _Flags}] = Toks,
+    "Grouped" == Type
+        andalso error == dict:find({grouped, Name}, Dict)
+        andalso ?RETURN(grouped_avp_not_grouped, [Name, Line]),
+    ok;
+
+x(_, _, _) ->
     ok.
 
 %% has_enumerated_type/3
diff --git a/lib/diameter/src/compiler/diameter_make.erl b/lib/diameter/src/compiler/diameter_make.erl
index 16e30c1ffb..adc7808e49 100644
--- a/lib/diameter/src/compiler/diameter_make.erl
+++ b/lib/diameter/src/compiler/diameter_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,38 +30,58 @@
 
 -module(diameter_make).
 
--export([codec/1,
-         codec/2,
-         dict/1,
-         dict/2,
+-export([codec/2,
+         codec/1,
          format/1,
-         reformat/1]).
+         flatten/1,
+         format_error/1]).
 
 -export_type([opt/0]).
 
+-include("diameter_vsn.hrl").
+
+%% Options passed to codec/2.
 -type opt() :: {include|outdir|name|prefix|inherits, string()}
+             | return
              | verbose
-             | debug.
+             | parse  %% internal parsed form
+             | forms  %% abstract format for compile:forms/1,2
+             | erl
+             | hrl.
+
+%% Internal parsed format with a version tag.
+-type parsed() :: list().
+
+%% Literal dictionary or path. A NL of CR identifies the former.
+-type dict() :: iolist()
+              | binary()
+              | parsed().  %% as returned by codec/2
+
+%% Name of a literal dictionary if otherwise unspecified.
+-define(DEFAULT_DICT_FILE, "dictionary.dia").
 
 %% ===========================================================================
 
 %% codec/1-2
 %%
-%% Parse a dictionary file and generate a codec module.
+%% Parse a dictionary file and generate a codec module. Input
+%% dictionary can be either a path or the dictionary itself: the
+%% occurrence of \n or \r in the argument is used to distinguish the
+%% two.
 
--spec codec(Path, [opt()])
+-spec codec(File, [opt()])
    -> ok
+    | {ok, list()}   %% with option 'return', one element for each output
     | {error, Reason}
- when Path :: string(),
+ when File :: dict()
+            | {path, file:name_all()},
       Reason :: string().
 
 codec(File, Opts) ->
-    case dict(File, Opts) of
-        {ok, Dict} ->
-            make(File,
-                 Opts,
-                 Dict,
-                 [spec || _ <- [1], lists:member(debug, Opts)] ++ [erl, hrl]);
+    {Dict, Path} = identify(File),
+    case parse(Dict, Opts) of
+        {ok, ParseD} ->
+            make(Path, default(Opts), ParseD);
         {error, _} = E ->
             E
     end.
@@ -69,63 +89,178 @@ codec(File, Opts) ->
 codec(File) ->
     codec(File, []).
 
-%% dict/2
-%%
-%% Parse a dictionary file and return the orddict that a codec module
-%% returns from dict/0.
-
--spec dict(string(), [opt()])
-   -> {ok, orddict:orddict()}
-    | {error, string()}.
-
-dict(Path, Opts) ->
-    case diameter_dict_util:parse({path, Path}, Opts) of
-        {ok, _} = Ok ->
-            Ok;
-        {error = E, Reason} ->
-            {E, diameter_dict_util:format_error(Reason)}
-    end.
-
-dict(File) ->
-    dict(File, []).
-
 %% format/1
 %%
-%% Turn an orddict returned by dict/1-2 back into a dictionary file
-%% in the form of an iolist().
+%% Turn an orddict returned by dict/1-2 back into a dictionary.
 
--spec format(orddict:orddict())
+-spec format(parsed())
    -> iolist().
 
-format(Dict) ->
+format([?VERSION | Dict]) ->
     diameter_dict_util:format(Dict).
 
-%% reformat/1
+%% flatten/1
 %%
-%% Parse a dictionary file and return its formatted equivalent.
+%% Reconstitute a dictionary without @inherits.
 
--spec reformat(File)
-   -> {ok, iolist()}
-    | {error, Reason}
- when File :: string(),
-      Reason :: string().
+-spec flatten(parsed())
+   -> parsed().
+
+flatten([?VERSION = V | Dict]) ->
+    [V | lists:foldl(fun flatten/2,
+                     Dict,
+                     [avp_vendor_id,
+                      custom_types,
+                      codecs,
+                      [avp_types, import_avps],
+                      [grouped, import_groups],
+                      [enum, import_enums]])].
+
+%% format_error/1
+
+format_error(T) ->
+    diameter_dict_util:format_error(T).
+
+%% ===========================================================================
+
+%% flatten/2
+
+flatten([_,_] = Keys, Dict) ->
+    [Values, Imports] = [orddict:fetch(K, Dict) || K <- Keys],
+    Vs = lists:append([Values | [V || {_Mod, V} <- Imports]]),
+    lists:foldl(fun({K,V},D) -> orddict:store(K,V,D) end,
+                Dict,
+                lists:zip([inherits | Keys], [[], Vs, []]));
+
+%% Inherited avp's setting the 'V' flag get their value either from
+%% @avp_vendor_id in the inheriting dictionary or from @vendor in the
+%% *inherited* (not inheriting) dictionary: add the latter to
+%% @avp_vendor_id as required.
+flatten(avp_vendor_id = Key, Dict) ->
+    Def = orddict:find(vendor, Dict),
+    ModD = imports(Dict),
+    Vids = orddict:fetch(Key, Dict),
+    Avps = lists:append([As || {_,As} <- Vids]),
+    orddict:store(Key,
+                  dict:fold(fun(M, As, A) -> vid(M, As -- Avps, Def, A) end,
+                            Vids,
+                            ModD),
+                  Dict);
+
+%% Import @codecs and @custom_types from inherited dictionaries as
+%% required.
+flatten(Key, Dict) ->
+    ImportAvps = orddict:fetch(import_avps, Dict),
+    ImportItems = [{M, As}
+                   || {Mod, Avps} <- ImportAvps,
+                      [_|D] <- [Mod:dict()],
+                      {M,As0} <- orddict:fetch(Key, D),
+                      F <- [fun(A) -> lists:keymember(A, 1, Avps) end],
+                      [_|_] = As <- [lists:filter(F, As0)]],
+    orddict:store(Key,
+                  lists:foldl(fun merge/2,
+                              orddict:fetch(Key, Dict),
+                              ImportItems),
+                  Dict).
+
+%% merge/2
+
+merge({Mod, _Avps} = T, Acc) ->
+    merge(lists:keyfind(Mod, 1, Acc), T, Acc).
 
-reformat(File) ->
-    case dict(File) of
-        {ok, Dict} ->
-            {ok, format(Dict)};
-        {error, _} = No ->
-            No
+merge({Mod, Avps}, {Mod, As}, Acc) ->
+    lists:keyreplace(Mod, 1, Acc, {Mod, Avps ++ As});
+merge(false, T, Acc) ->
+    [T | Acc].
+
+%% imports/1
+%%
+%% Return a module() -> [AVP] dict of inherited AVP's setting the V flag.
+
+imports(Dict) ->
+    lists:foldl(fun imports/2,
+                dict:new(),
+                orddict:fetch(import_avps, Dict)).
+
+imports({Mod, Avps}, Dict) ->
+    dict:store(Mod,
+               [A || {A,_,_,Fs} <- Avps, lists:member($V, Fs)],
+               Dict).
+
+%% vid/4
+
+vid(_, [], _, Acc) ->
+    Acc;
+vid(Mod, Avps, Def, Acc) ->
+    v(Mod:vendor_id(), Avps, Def, Acc).
+
+v(Vid, _, {ok, {Vid, _}}, Acc) -> %% same id as inheriting dictionary's
+    Acc;
+v(Vid, Avps, _, Acc) ->
+    case lists:keyfind(Vid, 1, Acc) of
+        {Vid, As} ->
+            lists:keyreplace(Vid, 1, Acc, {Vid, As ++ Avps});
+        false ->
+            [{Vid, Avps} | Acc]
     end.
 
 %% ===========================================================================
 
-make(_, _, _, []) ->
+parse({dict, ParseD}, _) ->
+    {ok, ParseD};
+parse(File, Opts) ->
+    diameter_dict_util:parse(File, Opts).
+
+default(Opts) ->
+    def(modes(Opts), Opts).
+
+def([], Opts) ->
+    [erl, hrl | Opts];
+def(_, Opts) ->
+    Opts.
+
+modes(Opts) ->
+    lists:filter(fun is_mode/1, Opts).
+
+is_mode(T) ->
+    lists:member(T, [erl, hrl, parse, forms]).
+
+identify([Vsn | [T|_] = ParseD])
+  when is_tuple(T) ->
+    ?VERSION == Vsn orelse erlang:error({version, {Vsn, ?VERSION}}),
+    {{dict, ParseD}, ?DEFAULT_DICT_FILE};
+identify({path, File} = T) ->
+    {T, File};
+identify(File) ->
+    Bin = iolist_to_binary([File]),
+    case is_path(Bin) of
+        true  -> {{path, File}, File};
+        false -> {Bin, ?DEFAULT_DICT_FILE}
+    end.
+
+%% Interpret anything containing \n or \r as a literal dictionary,
+%% otherwise a path. (Which might be the wrong guess in the worst case.)
+is_path(Bin) ->
+    try
+        [throw(C) || <<C>> <= Bin, $\n == C orelse $\r == C],
+        true
+    catch
+        throw:_ -> false
+    end.
+
+make(File, Opts, Dict) ->
+    ok(lists:foldl(fun(M,A) -> [make(File, Opts, Dict, M) | A] end,
+                   [],
+                   modes(Opts))).
+
+ok([ok|_]) ->
     ok;
-make(File, Opts, Dict, [Mode | Rest]) ->
+ok([_|_] = L) ->
+    {ok, lists:reverse(L)}.
+
+make(File, Opts, Dict, Mode) ->
     try
-        ok = diameter_codegen:from_dict(File, Dict, Opts, Mode),
-        make(File, Opts, Dict, Rest)
+        diameter_codegen:from_dict(File, Dict, Opts, Mode)
     catch
         error: Reason ->
             erlang:error({Reason, Mode, erlang:get_stacktrace()})
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 62ace16faa..0d421c229e 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,59 +20,37 @@
 
 {"%VSN%",
  [
-  {"0.9",   [{restart_application, diameter}]},  %% R14B03
-  {"0.10",  [{restart_application, diameter}]},  %% R14B04
-  {"1.0",   [{restart_application, diameter}]},  %% R15B
-  {"1.1",   [{restart_application, diameter}]},  %% R15B01
-  {"1.2",   [{restart_application, diameter}]},  %% R15B02
-  {"1.2.1", [{restart_application, diameter}]},
-  {"1.3",   [{restart_application, diameter}]},  %% R15B03
-  {"1.3.1", [{restart_application, diameter}]},
-  {"1.4",   [{restart_application, diameter}]},  %% R16A
-  {"1.4.1", [{load_module, diameter_reg},        %% R16B
-             {load_module, diameter_stats},
-             {load_module, diameter_traffic},
-             {load_module, diameter_service},
-             {load_module, diameter_config},
-             {load_module, diameter_peer},
-             {load_module, diameter_peer_fsm},
-             {load_module, diameter_watchdog},
-             {load_module, diameter_capx},
-             {load_module, diameter_codec},
-             {load_module, diameter_gen_base_rfc3588},
-             {load_module, diameter_gen_base_accounting},
-             {load_module, diameter_gen_base_rfc6733},
-             {load_module, diameter_gen_base_acct6733},
-             {load_module, diameter_tcp},
-             {load_module, diameter_lib},
-             {load_module, diameter}]},
-  {"1.4.1.1", [{load_module, diameter_traffic},
-               {load_module, diameter_service},
-               {load_module, diameter_config},
-               {load_module, diameter_peer},
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_watchdog},
-               {load_module, diameter_capx},
-               {load_module, diameter_codec},
-               {load_module, diameter_gen_base_rfc3588},
-               {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter_gen_base_acct6733},
-               {load_module, diameter_tcp},
-               {load_module, diameter_lib},
-               {load_module, diameter}]}
+  {"0.9",     [{restart_application, diameter}]},  %% R14B03
+  {"0.10",    [{restart_application, diameter}]},  %% R14B04
+  {"1.0",     [{restart_application, diameter}]},  %% R15B
+  {"1.1",     [{restart_application, diameter}]},  %% R15B01
+  {"1.2",     [{restart_application, diameter}]},  %% R15B02
+  {"1.2.1",   [{restart_application, diameter}]},
+  {"1.3",     [{restart_application, diameter}]},  %% R15B03
+  {"1.3.1",   [{restart_application, diameter}]},
+  {"1.4",     [{restart_application, diameter}]},  %% R16A
+  {"1.4.1",   [{restart_application, diameter}]},  %% R16B
+  {"1.4.1.1", [{restart_application, diameter}]},
+  {"1.4.2",   [{restart_application, diameter}]},  %% R16B01
+  {"1.4.3",   [{restart_application, diameter}]},  %% R16B02
+  {"1.4.4",   [{restart_application, diameter}]},
+  {"1.5",     [{restart_application, diameter}]}   %% R16B03
  ],
  [
-  {"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}]},
-  {"1.3",   [{restart_application, diameter}]},
-  {"1.3.1", [{restart_application, diameter}]},
-  {"1.4",   [{restart_application, diameter}]},
-  {"1.4.1", [{restart_application, diameter}]},
-  {"1.4.1.1", [{restart_application, diameter}]}
+  {"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}]},
+  {"1.3",     [{restart_application, diameter}]},
+  {"1.3.1",   [{restart_application, diameter}]},
+  {"1.4",     [{restart_application, diameter}]},
+  {"1.4.1",   [{restart_application, diameter}]},
+  {"1.4.1.1", [{restart_application, diameter}]},
+  {"1.4.2",   [{restart_application, diameter}]},
+  {"1.4.3",   [{restart_application, diameter}]},
+  {"1.4.4",   [{restart_application, diameter}]},
+  {"1.5",     [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/src/transport/diameter_sctp.erl b/lib/diameter/src/transport/diameter_sctp.erl
index 49a530b4eb..d0a01351f3 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,14 +70,14 @@
 
 -type connect_option() :: {raddr, inet:ip_address()}
                         | {rport, inet:port_number()}
-                        | gen_sctp:open_option().
+                        | term(). %% gen_sctp:open_option().
 
 -type match() :: inet:ip_address()
                | string()
                | [match()].
 
 -type listen_option() :: {accept, match()}
-                       | gen_sctp:open_option().
+                       | term().  %% gen_sctp:open_option().
 
 -type uint() :: non_neg_integer().
 
@@ -171,18 +171,33 @@ start_link(T) ->
 
 info({gen_sctp, Sock}) ->
     lists:flatmap(fun(K) -> info(K, Sock) end,
-                  [{socket, sockname},
-                   {peer, peername},
+                  [{socket, socknames},
+                   {peer, peernames},
                    {statistics, getstat}]).
 
 info({K,F}, Sock) ->
     case inet:F(Sock) of
         {ok, V} ->
-            [{K,V}];
+            [{K, map(F,V)}];
         _ ->
             []
     end.
 
+%% inet:{sock,peer}names/1 returns [{Addr, Port}] but the port number
+%% should be the same in each tuple. Map to a {[Addr], Port} tuple if
+%% so.
+map(K, [{_, Port} | _] = APs)
+  when K == socknames;
+       K == peernames ->
+    try [A || {A,P} <- APs, P == Port orelse throw(?MODULE)] of
+        As -> {As, Port}
+    catch
+        ?MODULE -> APs
+    end;
+
+map(_, V) ->
+    V.
+
 %% ---------------------------------------------------------------------------
 %% # init/1
 %% ---------------------------------------------------------------------------
@@ -338,9 +353,6 @@ handle_call({{accept, Ref}, Pid}, _, #listener{ref = Ref,
     {TPid, NewS} = accept(Ref, Pid, S),
     {reply, {ok, TPid}, NewS#listener{count = N+1}};
 
-handle_call(T, From, {listener,_,_,_,_,_,_} = S) -> % started in old code
-    handle_call(T, From, upgrade(S));
-
 handle_call(_, _, State) ->
     {reply, nok, State}.
 
@@ -359,10 +371,7 @@ handle_info(T, #transport{} = S) ->
     {noreply, #transport{} = t(T,S)};
 
 handle_info(T, #listener{} = S) ->
-    {noreply, #listener{} = l(T,S)};
-
-handle_info(T, {listener,_,_,_,_,_,_} = S) -> % started in old code
-    handle_info(T, upgrade(S)).
+    {noreply, #listener{} = l(T,S)}.
 
 %% ---------------------------------------------------------------------------
 %% # code_change/3
@@ -396,9 +405,6 @@ terminate(_, #listener{socket = Sock}) ->
 
 %% ---------------------------------------------------------------------------
 
-upgrade(S) ->
-    #listener{} = erlang:append_element(S, ?DEFAULT_ACCEPT).
-
 putr(Key, Val) ->
     put({?MODULE, Key}, Val).
 
@@ -502,8 +508,6 @@ transition({peeloff, Sock, {sctp, LSock, _RA, _RP, _Data} = Msg, Matches},
            = S) ->
     ok = accept_peer(Sock, Matches),
     transition(Msg, S#transport{socket = Sock});
-transition({peeloff = T, _Sock, _Msg} = T, #transport{} = S) ->% from old code
-    transition(erlang:append_element(T, ?DEFAULT_ACCEPT), S);
 
 %% Incoming message.
 transition({sctp, _Sock, _RA, _RP, Data}, #transport{socket = Sock} = S) ->
@@ -560,7 +564,7 @@ accept_peer(_, []) ->
     ok;
 
 accept_peer(Sock, Matches) ->
-    {RAddrs, _} = ok(inet:peername(Sock)),
+    RAddrs = [A || {A,_} <- ok(inet:peernames(Sock))],
     diameter_peer:match(RAddrs, Matches)
         orelse x({accept, RAddrs, Matches}),
     ok.
@@ -605,11 +609,13 @@ accept(_, Pid, #listener{ref = Ref, pending = {N,Q}} = S) ->
 %% send/2
 
 %% Outbound Diameter message on a specified stream ...
-send(#diameter_packet{bin = Bin, transport_data = {stream, SId}}, S) ->
-    send(SId, Bin, S),
+send(#diameter_packet{bin = Bin, transport_data = {outstream, SId}},
+     #transport{streams = {_, OS}}
+     = S) ->
+    send(SId rem OS, Bin, S),
     S;
 
-%% ... or not: rotate through all steams.
+%% ... or not: rotate through all streams.
 send(Bin, #transport{streams = {_, OS},
                      os = N}
           = S)
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
index 24d4c7665e..0b4568a9e5 100644
--- a/lib/diameter/test/diameter_codec_test.erl
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -1,3 +1,4 @@
+%% coding: utf-8
 %%
 %% %CopyrightBegin%
 %%
@@ -19,7 +20,9 @@
 
 -module(diameter_codec_test).
 
--compile(export_all).
+-export([base/0,
+         gen/1,
+         lib/0]).
 
 %%
 %% Test encode/decode of dictionary-related modules.
@@ -38,37 +41,34 @@
 %% Interface.
 
 base() ->
-    [] = run([{?MODULE, [base, T]} || T <- [zero, decode]]).
+    [] = run([[fun base/1, T] || T <- [zero, decode]]).
 
 gen(Mod) ->
     Fs = [{Mod, F, []} || F <- [name, id, vendor_id, vendor_name]],
-    [] = run(Fs ++ [{?MODULE, [gen, Mod, T]} || T <- [messages,
-                                                      command_codes,
-                                                      avp_types,
-                                                      grouped,
-                                                      enum,
-                                                      import_avps,
-                                                      import_groups,
-                                                      import_enums]]).
+    [] = run(Fs ++ [[fun gen/2, Mod, T] || T <- [messages,
+                                                 command_codes,
+                                                 avp_types,
+                                                 grouped,
+                                                 enum,
+                                                 import_avps,
+                                                 import_groups,
+                                                 import_enums]]).
 
 lib() ->
-    Vs = {_,_} = values('Address'),
-    [] = run([[fun lib/2, N, Vs] || N <- [1,2]]).
+    Vs = {_,_,_} = values('Address'),
+    [] = run([[fun lib/2, N, Vs] || N <- [{1, true}, {3, false}]]).
 
 %% ===========================================================================
 %% Internal functions.
 
-lib(N, {_,_} = T) ->
-    B = 1 == N rem 2,
-    [] = run([[fun lib/2, A, B] || A <- element(N,T)]);
+lib({N,B}, {_,_,_} = T) ->
+    [] = run([[fun lib/2, A, B] || A <- element(N,T), is_tuple(A)]);
 
 lib(IP, B) ->
-    LA = tuple_to_list(IP),
-    {SA,Fun} = ip(LA),
-    [] = run([[fun lib/4, IP, B, Fun, A] || A <- [IP, SA]]).
+    [] = run([[fun lib/3, IP, B, A] || A <- [IP, ntoa(tuple_to_list(IP))]]).
 
-lib(IP, B, Fun, A) ->
-    try Fun(A) of
+lib(IP, B, A) ->
+    try diameter_lib:ipaddr(A) of
         IP when B ->
             ok
     catch
@@ -76,12 +76,12 @@ lib(IP, B, Fun, A) ->
             ok
     end.
 
-ip([_,_,_,_] = A) ->
+ntoa([_,_,_,_] = A) ->
     [$.|S] = lists:append(["." ++ integer_to_list(N) || N <- A]),
-    {S, fun diameter_lib:ipaddr/1};
-ip([_,_,_,_,_,_,_,_] = A) ->
+    S;
+ntoa([_,_,_,_,_,_,_,_] = A) ->
     [$:|S] = lists:flatten([":" ++ io_lib:format("~.16B", [N]) || N <- A]),
-    {S, fun diameter_lib:ipaddr/1}.
+    S.
 
 %% ------------------------------------------------------------------------
 %% base/1
@@ -90,7 +90,7 @@ ip([_,_,_,_,_,_,_,_] = A) ->
 %% ------------------------------------------------------------------------
 
 base(T) ->
-    [] = run([{?MODULE, [base, T, F]} || F <- types()]).
+    [] = run([[fun base/2, T, F] || F <- types()]).
 
 %% Ensure that 'zero' values encode only zeros.
 base(zero = T, F) ->
@@ -100,32 +100,23 @@ base(zero = T, F) ->
 %% Ensure that we can decode what we encode and vice-versa, and that
 %% we can't decode invalid values.
 base(decode, F) ->
-    {Eq, Vs, Ns} = b(values(F)),
-    [] = run([{?MODULE, [base_decode, F, Eq, V]}  || V <- Vs]),
-    [] = run([{?MODULE, [base_invalid, F, Eq, V]} || V <- Ns]).
+    {Ts, Fs, Is} = values(F),
+    [] = run([[fun base_decode/3, F, true, V]  || V <- Ts]),
+    [] = run([[fun base_decode/3, F, false, V] || V <- Fs]),
+    [] = run([[fun base_invalid/2, F, V]       || V <- Is]).
 
 base_decode(F, Eq, Value) ->
     d(fun(X,V) -> diameter_types:F(X,V) end, Eq, Value).
 
-base_invalid(F, Eq, Value) ->
+base_invalid(F, Value) ->
     try
-        base_decode(F, Eq, Value),
+        base_decode(F, false, Value),
         exit(nok)
     catch
         error: _ ->
             ok
     end.
 
-b({_,_,_} = T) ->
-    T;
-b({B,Vs})
-  when is_atom(B) ->
-    {B,Vs,[]};
-b({Vs,Ns}) ->
-    {true, Vs, Ns};
-b(Vs) ->
-    {true, Vs, []}.
-
 types() ->
     [F || {F,2} <- diameter_types:module_info(exports)].
 
@@ -136,7 +127,7 @@ types() ->
 %% ------------------------------------------------------------------------
 
 gen(M, T) ->
-    [] = run(lists:map(fun(X) -> {?MODULE, [gen, M, T, X]} end,
+    [] = run(lists:map(fun(X) -> [fun gen/3, M, T, X] end,
                        fetch(T, dict(M)))).
 
 fetch(T, Spec) ->
@@ -197,18 +188,20 @@ gen(M, enum = T, {Name, ED})
     gen(M, T, {?A(Name), lists:map(fun({E,D}) -> {?A(E), D} end, ED)});
 
 gen(M, enum, {Name, ED}) ->
-    [] = run([{?MODULE, [enum, M, Name, T]} || T <- ED]);
+    [] = run([[fun enum/3, M, Name, T] || T <- ED]);
 
 gen(M, Tag, {_Mod, L}) ->
     T = retag(Tag),
-    [] = run([{?MODULE, [gen, M, T, I]} || I <- L]).
+    [] = run([[fun gen/3, M, T, I] || I <- L]).
 
 %% avp_decode/3
 
 avp_decode(Mod, Type, Name) ->
-    {Eq, Vs, _} = b(values(Type, Name, Mod)),
-    [] = run([{?MODULE, [avp_decode, Mod, Name, Type, Eq, V]}
-              || V <- v(Vs)]).
+    {Ts, Fs, _} = values(Type, Name, Mod),
+    [] = run([[fun avp_decode/5, Mod, Name, Type, true, V]
+              || V <- v(Ts)]),
+    [] = run([[fun avp_decode/5, Mod, Name, Type, false, V]
+              || V <- v(Fs)]).
 
 avp_decode(Mod, Name, Type, Eq, Value) ->
     d(fun(X,V) -> avp(Mod, X, V, Name, Type) end, Eq, Value).
@@ -250,7 +243,7 @@ v(N, Ord, E, Acc) ->
 
 arity(M, Name, Rname) ->
     Rec = M:'#new-'(Rname),
-    [] = run([{?MODULE, [arity, M, Name, F, Rec]}
+    [] = run([[fun arity/4, M, Name, F, Rec]
               || F <- M:'#info-'(Rname, fields)]).
 
 arity(M, Name, AvpName, Rec) ->
@@ -299,68 +292,93 @@ z(B) ->
 %% tested.)
 
 values('OctetString' = T) ->
-    {["", atom_to_list(T)], [-1, 256]};
+    {["", atom_to_list(T)],
+     [],
+     [-1, 256]};
 
 values('Integer32') ->
     Mx = (1 bsl 31) - 1,
     Mn = -1*Mx,
-    {[Mn, 0, random(Mn,Mx), Mx], [Mn - 1, Mx + 1]};
+    {[Mn, 0, random(Mn,Mx), Mx],
+     [],
+     [Mn - 1, Mx + 1]};
 
 values('Integer64') ->
     Mx = (1 bsl 63) - 1,
     Mn = -1*Mx,
-    {[Mn, 0, random(Mn,Mx), Mx], [Mn - 1, Mx + 1]};
+    {[Mn, 0, random(Mn,Mx), Mx],
+     [],
+     [Mn - 1, Mx + 1]};
 
 values('Unsigned32') ->
     M = (1 bsl 32) - 1,
-    {[0, random(M), M], [-1, M + 1]};
+    {[0, random(M), M],
+     [],
+     [-1, M + 1]};
 
 values('Unsigned64') ->
     M = (1 bsl 64) - 1,
-    {[0, random(M), M], [-1, M + 1]};
+    {[0, random(M), M],
+     [],
+     [-1, M + 1]};
 
 values('Float32') ->
     E = (1 bsl  8) - 2,
     F = (1 bsl 23) - 1,
     <<Mx:32/float>> = <<0:1, E:8, F:23>>,
     <<Mn:32/float>> = <<1:1, E:8, F:23>>,
-    {[0.0, infinity, '-infinity', Mx, Mn], [0]};
+    {[0.0, infinity, '-infinity', Mx, Mn],
+     [],
+     [0]};
 
 values('Float64') ->
     E = (1 bsl 11) - 2,
     F = (1 bsl 52) - 1,
     <<Mx:64/float>> = <<0:1, E:11, F:52>>,
     <<Mn:64/float>> = <<1:1, E:11, F:52>>,
-    {[0.0, infinity, '-infinity', Mx, Mn], [0]};
+    {[0.0, infinity, '-infinity', Mx, Mn],
+     [],
+     [0]};
 
 values('Address') ->
     {[{255,0,random(16#FF),1}, {65535,0,0,random(16#FFFF),0,0,0,1}],
-     [{256,0,0,1}, {65536,0,0,0,0,0,0,1}]};
+     ["127.0.0.1", "FFFF:FF::1.2.3.4"],
+     [{256,0,0,1}, {65536,0,0,0,0,0,0,1}, "256.0.0.1", "10000::1"]};
 
 values('DiameterIdentity') ->
-    {["x", "diameter.com"], [""]};
+    {["x", "diameter.com"],
+     [],
+     [""]};
 
 values('DiameterURI') ->
-    {false, ["aaa" ++ S ++ "://diameter.se" ++ P ++ Tr ++ Pr
-             || S  <- ["", "s"],
-                P  <- ["", ":1234"],
-                Tr <- ["" | [";transport=" ++ X
-                             || X <- ["tcp", "sctp", "udp"]]],
-                Pr <- ["" | [";protocol=" ++ X
-                             || X <- ["diameter","radius","tacacs+"]]]]};
+    {[],
+     ["aaa" ++ S ++ "://diameter.se" ++ P ++ Tr ++ Pr
+      || S  <- ["", "s"],
+         P  <- ["", ":1234"],
+         Tr <- ["" | [";transport=" ++ X
+                      || X <- ["tcp", "sctp", "udp"]]],
+         Pr <- ["" | [";protocol=" ++ X
+                      || X <- ["diameter","radius","tacacs+"]]]],
+     []};
 
 values(T)
   when T == 'IPFilterRule';
        T == 'QoSFilterRule' ->
-    ["deny in 0 from 127.0.0.1 to 10.0.0.1"];
+    {["deny in 0 from 127.0.0.1 to 10.0.0.1"],
+     [],
+     []};
 
 %% RFC 3629 defines the UTF-8 encoding of U+0000 through U+10FFFF with the
 %% exception of U+D800 through U+DFFF.
 values('UTF8String') ->
+    S = "ᚠᚢᚦᚨᚱᚲ",
+    B = unicode:characters_to_binary(S),
     {[[],
+      S,
       lists:seq(0,16#1FF),
       [0,16#D7FF,16#E000,16#10FFFF],
       [random(16#D7FF), random(16#E000,16#10FFFF)]],
+     [B, [B, S, hd(S)], [S, B]],
      [[-1],
       [16#D800],
       [16#DFFF],
@@ -372,6 +390,7 @@ values('Time') ->
       {{2036,2,7},{6,28,15}},
       {{2036,2,7},{6,28,16}},    %% 19000101T000000 + 2 bsl 31
       {{2104,2,26},{9,42,23}}],
+     [],
      [{{1968,1,20},{3,14,7}},
       {{2104,2,26},{9,42,24}}]}. %% 19000101T000000 + 3 bsl 31
 
@@ -382,18 +401,24 @@ values('Time') ->
 
 values('Enumerated', Name, Mod) ->
     {_Name, Vals} = lists:keyfind(?S(Name), 1, types(enum, Mod)),
-    lists:map(fun({_,N}) -> N end, Vals);
+    {lists:map(fun({_,N}) -> N end, Vals),
+     [],
+     []};
 
 values('Grouped', Name, Mod) ->
     Rname = Mod:name2rec(Name),
     Rec = Mod:'#new-'(Rname),
     Avps = Mod:'#info-'(Rname, fields),
-    Enum = diameter_enum:combine(lists:map(fun({_,Vs,_}) -> to_enum(Vs) end,
+    Enum = diameter_enum:combine(lists:map(fun({Vs,_,_}) -> to_enum(Vs) end,
                                            [values(F, Mod) || F <- Avps])),
-    {false, diameter_enum:append(group(Mod, Name, Rec, Avps, Enum))};
+    {[],
+     diameter_enum:append(group(Mod, Name, Rec, Avps, Enum)),
+     []};
 
 values(_, 'Framed-IP-Address', _) ->
-    [{127,0,0,1}];
+    {[{127,0,0,1}],
+     [],
+     []};
 
 values(Type, _, _) ->
     values(Type).
@@ -407,12 +432,14 @@ to_enum(E) ->
 %% values/2
 
 values('AVP', _) ->
-    {true, [#diameter_avp{code = 0, data = <<0>>}], []};
+    {[#diameter_avp{code = 0, data = <<0>>}],
+     [],
+     []};
 
 values(Name, Mod) ->
     Avps = types(avp_types, Mod),
     {_Name, _Code, Type, _Flags} = lists:keyfind(?S(Name), 1, Avps),
-    b(values(?A(Type), Name, Mod)).
+    values(?A(Type), Name, Mod).
 
 %% group/5
 %%
@@ -446,9 +473,6 @@ pack(true, Arity, Avp, Value, Acc) ->
 pack(false, Arity, Avp, Value, Acc) ->
     min(Arity, Avp, Value, Acc).
 
-all(Mod, Name, Avp, V) ->
-    all(Mod:avp_arity(Name, Avp), Avp, V).
-
 all(1, Avp, V) ->
     {Avp, V};
 all({0,'*'}, Avp, V) ->
@@ -462,9 +486,6 @@ a(N, Avp, V)
   when N /= 0 ->
     {Avp, lists:duplicate(N,V)}.
 
-min(Mod, Name, Avp, V, Acc) ->
-    min(Mod:avp_arity(Name, Avp), Avp, V, Acc).
-
 min(1, Avp, V, Acc) ->
     [{Avp, V} | Acc];
 min({0,_}, _, _, Acc) ->
diff --git a/lib/diameter/test/diameter_compiler_SUITE.erl b/lib/diameter/test/diameter_compiler_SUITE.erl
index 81722c8dca..df4dde6240 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,10 +31,15 @@
 %% testcases
 -export([format/1,    format/2,
          replace/1,   replace/2,
-         generate/1,  generate/4]).
+         generate/1,  generate/4,
+         flatten1/1,  flatten1/3,
+         flatten2/1]).
 
 -export([dict/0]).  %% fake dictionary module
 
+%% dictionary callbacks for flatten2/1
+-export(['A1'/3, 'Unsigned32'/3]).
+
 -define(base, "base_rfc3588.dia").
 -define(util, diameter_util).
 -define(S, atom_to_list).
@@ -45,7 +50,7 @@
 %% RE/Replacement (in the sense of re:replace/4) pairs for morphing
 %% base_rfc3588.dia. The key is 'ok' or the the expected error as
 %% returned in the first element of the error tuple returned by
-%% diameter_dict_util:parse/2.
+%% diameter_make:codec/2.
 -define(REPLACE,
         [{ok,
           "",
@@ -133,6 +138,9 @@
          {grouped_avp_not_defined,
           "Failed-AVP *.*",
           ""},
+         {grouped_avp_not_grouped,
+          "Failed-AVP ::=.*\n.*}",
+          ""},
          {grouped_vendor_id_without_flag,
           "(Failed-AVP .*)>",
           "\\1 668>"},
@@ -335,7 +343,9 @@ suite() ->
 all() ->
     [format,
      replace,
-     generate].
+     generate,
+     flatten1,
+     flatten2].
 
 %% Error handling testcases will make an erroneous dictionary out of
 %% the base dictionary and check that the expected error results.
@@ -361,10 +371,18 @@ format(Config) ->
 
 format(Mods, Bin) ->
     B = modify(Bin, Mods),
-    {ok, Dict} = diameter_dict_util:parse(B, []),
-    {ok, D} = diameter_dict_util:parse(diameter_dict_util:format(Dict), []),
+    {ok, Dict} = parse(B, []),
+    {ok, D} = parse(diameter_make:format(Dict), []),
     {Dict, Dict} = {Dict, D}.
 
+parse(File, Opts) ->
+    case diameter_make:codec(File, [parse, hrl, return | Opts]) of
+        {ok, [Dict, _]} ->
+            {ok, Dict};
+        {error, _} = E ->
+            E
+    end.
+
 %% ===========================================================================
 %% replace/1
 %%
@@ -379,14 +397,11 @@ replace(Config) ->
 
 replace({E, Mods}, Bin) ->
     B = modify(Bin, Mods),
-    case {E, diameter_dict_util:parse(B, [{include, here()}]), Mods} of
+    case {E, parse(B, [{include, here()}]), Mods} of
         {ok, {ok, Dict}, _} ->
             Dict;
-        {_, {error, {E,_} = T}, _} ->
-            S = diameter_dict_util:format_error(T),
-            true = nochar($", S, E),
-            true = nochar($', S, E),
-            S
+        {_, {error, {E,_} = T}, _} when E /= ok ->
+            diameter_make:format_error(T)
     end.
 
 re({RE, Repl}, Bin) ->
@@ -403,20 +418,127 @@ generate(Config) ->
     [] = ?util:run([{?MODULE, [generate, M, Bin, N, T]}
                     || {E,N} <- Rs,
                        {ok, M} <- [norm(E)],
-                       T <- [erl, hrl, spec]]).
+                       T <- [erl, hrl, parse, forms]]).
 
 generate(Mods, Bin, N, Mode) ->
     B = modify(Bin, Mods ++ [{"@name .*", "@name dict" ++ ?L(N)}]),
-    {ok, Dict} = diameter_dict_util:parse(B, []),
+    {ok, Dict} = parse(B, []),
     File = "dict" ++ integer_to_list(N),
-    {_, ok} = {Dict, diameter_codegen:from_dict("dict",
-                                                Dict,
-                                                [{name, File},
-                                                 {prefix, "base"},
-                                                 debug],
-                                                Mode)},
-    Mode == erl
-        andalso ({ok, _} = compile:file(File ++ ".erl", [return_errors])).
+    {_, ok} = {Dict, diameter_make:codec(Dict,
+                                         [{name, File},
+                                          {prefix, "base"},
+                                          Mode])},
+    generate(Mode, File, Dict).
+
+generate(erl, File, _) ->
+    {ok, _} = compile:file(File ++ ".erl", [return_errors]);
+
+generate(forms, File, _) ->
+    {ok, [_]} = file:consult(File ++ ".F");
+
+generate(parse, File, Dict) ->
+    {ok, [Dict]} = file:consult(File ++ ".D"),  %% assert
+    {ok, [F]} = diameter_make:codec(Dict, [forms, return]),
+    {ok, _, _, _} = compile:forms(F, [return]);
+
+generate(hrl, _, _) ->
+    ok.
+
+%% ===========================================================================
+%% flatten1/1
+
+flatten1(_Config) ->
+    [Vsn | BaseD] = diameter_gen_base_rfc6733:dict(),
+    {ok, I} = parse("@inherits diameter_gen_base_rfc6733\n", []),
+    [Vsn | FlatD] = diameter_make:flatten(I),
+    [] = ?util:run([{?MODULE, [flatten1, K, BaseD, FlatD]}
+                    || K <- [avp_types, grouped, enum]]).
+
+flatten1(Key, BaseD, FlatD) ->
+    Vs = orddict:fetch(Key, BaseD),
+    Vs = orddict:fetch(Key, FlatD).
+
+%% ===========================================================================
+%% flatten2/1
+
+flatten2(_Config) ->
+    Dict1 =
+        "@name diameter_test1\n"
+        "@prefix diameter_test1\n"
+        "@vendor 666 test\n"
+        "@avp_vendor_id 111 A1 A3\n"
+        "@avp_vendor_id 222 A4 A6\n"
+        "@custom_types " ++ ?S(?MODULE) ++ " A1 A4\n"
+        "@codecs " ++ ?S(?MODULE) ++ " A3 A6\n"
+        "@avp_types\n"
+        "A1 1001 Unsigned32 V\n"
+        "A2 1002 Unsigned32 V\n"
+        "A3 1003 Unsigned32 V\n"
+        "A4 1004 Unsigned32 V\n"
+        "A5 1005 Unsigned32 V\n"
+        "A6 1006 Unsigned32 V\n"
+        "@end ignored\n",
+    Dict2 =
+        "@name diameter_test2\n"
+        "@prefix diameter_test2\n"
+        "@vendor 777 test\n"
+        "@inherits diameter_test1 A1 A2 A3\n"
+        "@inherits diameter_gen_base_rfc6733\n"
+        "@avp_vendor_id 333 A1\n",
+
+    {ok, [E1, F1]}
+        = diameter_make:codec(Dict1, [erl, forms, return]),
+    ct:pal("~s", [E1]),
+    diameter_test1 = M1 = load_forms(F1),
+
+    {ok, [D2, E2, F2]}
+        = diameter_make:codec(Dict2, [parse, erl, forms, return]),
+    ct:pal("~s", [E2]),
+    diameter_test2 = M2 = load_forms(F2),
+
+    Flat = lists:flatten(diameter_make:format(diameter_make:flatten(D2))),
+    ct:pal("~s", [Flat]),
+    {ok, [E3, F3]}
+        = diameter_make:codec(Flat, [erl, forms, return,
+                                     {name, "diameter_test3"}]),
+    ct:pal("~s", [E3]),
+    diameter_test3 = M3 = load_forms(F3),
+
+    [{1001, 111, M1, 'A1'},  %% @avp_vendor_id
+     {1002, 666, M1, 'A2'},  %% @vendor
+     {1003, 111, M1, 'A3'},  %% @avp_vendor_id
+     {1004, 222, M1, 'A4'},  %% @avp_vendor_id
+     {1005, 666, M1, 'A5'},  %% @vendor
+     {1006, 222, M1, 'A6'},  %% @avp_vendor_id
+     {1001, 333, M2, 'A1'},  %% M2 @avp_vendor_id
+     {1002, 666, M2, 'A2'},  %% M1 @vendor
+     {1003, 666, M2, 'A3'},  %% M1 @vendor
+     {1001, 333, M3, 'A1'},  %% (as for M2)
+     {1002, 666, M3, 'A2'},  %%   "
+     {1003, 666, M3, 'A3'}]  %%   "
+        = [{Code, Vid, Mod, Name}
+           || Mod <- [M1, M2, M3],
+              Code <- lists:seq(1001, 1006),
+              Vid <- [666, 111, 222, 777, 333],
+              {Name, 'Unsigned32'} <- [Mod:avp_name(Code, Vid)]],
+
+    [] = [{A,T,M,RC} || A <- ['A1', 'A3'],
+                        T <- [encode, decode],
+                        M <- [M2, M3],
+                        Ref <- [make_ref()],
+                        RC <- [M:avp(T, Ref, A)],
+                        RC /= {T, Ref}].
+
+'A1'(T, 'Unsigned32', Ref) ->
+    {T, Ref}.
+
+'Unsigned32'(T, 'A3', Ref) ->
+    {T, Ref}.
+
+load_forms(Forms) ->
+    {ok, Mod, Bin, _} = compile:forms(Forms, [return]),
+    {module, Mod} = code:load_binary(Mod, ?S(Mod), Bin),
+    Mod.
 
 %% ===========================================================================
 
@@ -428,9 +550,6 @@ norm({E, RE, Repl}) ->
 norm({_,_} = T) ->
     T.
 
-nochar(Char, Str, Err) ->
-    Err == parse orelse not lists:member(Char, Str) orelse Str.
-
 here() ->
     filename:dirname(code:which(?MODULE)).
 
diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index 46ff63756d..d10ee83ba4 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -1,4 +1,3 @@
-%% coding: utf-8
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/diameter/test/diameter_examples_SUITE.erl b/lib/diameter/test/diameter_examples_SUITE.erl
index 75b542b679..02c8d34361 100644
--- a/lib/diameter/test/diameter_examples_SUITE.erl
+++ b/lib/diameter/test/diameter_examples_SUITE.erl
@@ -133,7 +133,7 @@ make(Path, Dict0) ->
     try
         ok = to_erl(Path, [{name, Name},
                            {prefix, Pre},
-                           {inherits, "rfc3588_base/" ++ Mod0}
+                           {inherits, "common/" ++ Mod0}
                            | [{inherits, D ++ "/" ++ M ++ Suf}
                               || {D,M} <- dep(Dict)]]),
         ok = to_beam(Name)
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 97f4cec11f..9408fae62c 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -180,12 +180,13 @@ reconnect({listen, Ref}) ->
     [_] = diameter_reg:wait({diameter_tcp, listener, {LRef, '_'}}),
     true = diameter_reg:add_new({?MODULE, Ref, LRef}),
 
-    %% Wait for partner to request transport death: kill to force the
-    %% peer to reconnect.
+    %% Wait for partner to request transport death.
     TPid = abort(SvcName, LRef, Ref),
 
+    %% Kill transport to force the peer to reconnect.
     exit(TPid, kill),
 
+    %% Wait for the partner again.
     abort(SvcName, LRef, Ref);
 
 reconnect({connect, Ref}) ->
@@ -200,7 +201,7 @@ reconnect({connect, Ref}) ->
     %% reconnection attempts.
     abort(SvcName, Pid, Ref),
 
-    %% Transport does down and is reestablished.
+    %% Transport goes down and is reestablished.
     ?RECV(#diameter_event{service = SvcName, info = {down, CRef, _, _}}),
     ?RECV(#diameter_event{service = SvcName, info = {reconnect, CRef, _}}),
     ?RECV(#diameter_event{service = SvcName, info = {up, CRef, _, _, _}}),
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index f7462c3916..54019fa46c 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2013. All Rights Reserved.
+# Copyright Ericsson AB 2010-2014. All Rights Reserved.
 #
 # The 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,5 +18,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.4.2
+DIAMETER_VSN = 1.6
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/edoc/doc/src/book.xml b/lib/edoc/doc/src/book.xml
index 67b7cdb2d7..1a11629e6d 100644
--- a/lib/edoc/doc/src/book.xml
+++ b/lib/edoc/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/edoc/doc/src/fascicules.xml b/lib/edoc/doc/src/fascicules.xml
index 1b9d6bc94d..154c8a3b6d 100644
--- a/lib/edoc/doc/src/fascicules.xml
+++ b/lib/edoc/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/edoc/doc/src/notes.xml b/lib/edoc/doc/src/notes.xml
index 12f93ab400..394e7af09c 100644
--- a/lib/edoc/doc/src/notes.xml
+++ b/lib/edoc/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,23 @@
   <p>This document describes the changes made to the EDoc
     application.</p>
 
+<section><title>Edoc 0.7.12.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Edoc 0.7.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -219,7 +236,7 @@
       <list>
         <item>
 	    <p> Add encoding when parsing Wiki text. EDoc used to
-	    fail on strings such as "���". (Thanks to Richard
+	    fail on strings such as "äåö". (Thanks to Richard
 	    Carlsson.) </p>
           <p>
 	    Own Id: OTP-9109</p>
diff --git a/lib/edoc/doc/src/part.xml b/lib/edoc/doc/src/part.xml
index a71b4eda13..876ae858f9 100644
--- a/lib/edoc/doc/src/part.xml
+++ b/lib/edoc/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/edoc/doc/src/part_notes.xml b/lib/edoc/doc/src/part_notes.xml
index 42fc39af42..41e6c1c7f7 100644
--- a/lib/edoc/doc/src/part_notes.xml
+++ b/lib/edoc/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2007</year><year>2009</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/edoc/doc/src/ref_man.xml b/lib/edoc/doc/src/ref_man.xml
index a9af8740b9..a71b35d118 100644
--- a/lib/edoc/doc/src/ref_man.xml
+++ b/lib/edoc/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/edoc/src/edoc.appup.src b/lib/edoc/src/edoc.appup.src
index 54a63833e6..45b4046ed8 100644
--- a/lib/edoc/src/edoc.appup.src
+++ b/lib/edoc/src/edoc.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, edoc}]}],
+ [{<<".*">>,[{restart_application, edoc}]}]
+}.
diff --git a/lib/edoc/src/edoc_doclet.erl b/lib/edoc/src/edoc_doclet.erl
index ce1e94a26a..5653b5894b 100644
--- a/lib/edoc/src/edoc_doclet.erl
+++ b/lib/edoc/src/edoc_doclet.erl
@@ -200,7 +200,7 @@ source({M, P, Name, Path}, Dir, Suffix, Env, Set, Private, Hidden,
 		    {Set, Error}
 	    end;
 	R ->
-	    report("skipping source file '~ts': ~W.", [File, R, 15]),
+	    report("skipping source file '~ts': ~P.", [File, R, 15]),
 	    {Set, true}
     end.
 
diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index 7bd0615f5c..e164ff060f 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -829,6 +829,10 @@ t_type([#xmlElement{name = list, content = Es}]) ->
     t_list(Es);
 t_type([#xmlElement{name = nonempty_list, content = Es}]) ->
     t_nonempty_list(Es);
+t_type([#xmlElement{name = map, content = Es}]) ->
+    t_map(Es);
+t_type([#xmlElement{name = map_field, content=Es}]) ->
+    t_map_field(Es);
 t_type([#xmlElement{name = tuple, content = Es}]) ->
     t_tuple(Es);
 t_type([#xmlElement{name = 'fun', content = Es}]) ->
@@ -877,6 +881,12 @@ t_fun(Es) ->
     ["("] ++ seq(fun t_utype_elem/1, get_content(argtypes, Es),
 		 [") -> "] ++ t_utype(get_elem(type, Es))).
 
+t_map(Es) ->
+    ["#{"] ++ seq(fun t_utype_elem/1, Es, ["}"]).
+
+t_map_field([K,V]) ->
+    [t_utype_elem(K) ++ " => " ++ t_utype_elem(V)].
+
 t_record(E, Es) ->
     Name = ["#"] ++ t_type(get_elem(atom, Es)),
     case get_elem(field, Es) of
diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 276f48453e..c46338a2e1 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% =====================================================================
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
@@ -1033,7 +1032,7 @@ run_plugin(Name, Key, Default, Fun, Opts) when is_atom(Name) ->
 	{ok, Value} ->
 	    Value;
 	R ->
-	    report("error in ~ts '~w': ~W.", [Name, Module, R, 20]),
+	    report("error in ~ts '~w': ~P.", [Name, Module, R, 20]),
 	    exit(error)
     end.
 
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl
index a20f152f34..c6f8a04775 100644
--- a/lib/edoc/src/edoc_parser.yrl
+++ b/lib/edoc/src/edoc_parser.yrl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% ========================== -*-Erlang-*- =============================
 %% EDoc type specification grammar for the Yecc parser generator,
 %% adapted from Sven-Olof Nyström's type specification parser.
@@ -30,13 +29,14 @@ Nonterminals
 start spec func_type utype_list utype_tuple utypes utype ptypes ptype
 nutype function_name where_defs defs defs2 def typedef etype
 throws qname ref aref mref lref pref var_list vars fields field
+utype_map utype_map_fields utype_map_field
 futype_list bin_base_type bin_unit_type.
 
 Terminals
 atom float integer var an_var string start_spec start_typedef start_throws
 start_ref
 
-'(' ')' ',' '.' '->' '{' '}' '[' ']' '|' '+' ':' '::' '=' '/' '//' '*'
+'(' ')' ',' '.' '=>' '->' '{' '}' '[' ']' '|' '+' ':' '::' '=' '/' '//' '*'
 '#' 'where' '<<' '>>' '..' '...'.
 
 Rootsymbol start.
@@ -70,6 +70,14 @@ utype_list -> '(' utypes ')' : {lists:reverse('$2'), tok_line('$1')}.
 futype_list -> utype_list : '$1'.
 futype_list -> '(' '...' ')' : {[#t_var{name = '...'}], tok_line('$1')}.
 
+utype_map -> '#' '{' utype_map_fields '}' : lists:reverse('$3').
+
+utype_map_fields -> '$empty' : [].
+utype_map_fields -> utype_map_field : ['$1'].
+utype_map_fields -> utype_map_fields ',' utype_map_field : ['$3' | '$1'].
+
+utype_map_field -> utype '=>' utype : #t_map_field{ k_type = '$1', v_type = '$3'}.
+
 utype_tuple -> '{' utypes '}' : lists:reverse('$2').
 
 %% Produced in reverse order.
@@ -92,9 +100,10 @@ ptype -> var : #t_var{name = tok_val('$1')}.
 ptype -> atom : #t_atom{val = tok_val('$1')}.
 ptype -> integer: #t_integer{val = tok_val('$1')}.
 ptype -> integer '..' integer: #t_integer_range{from = tok_val('$1'),
-                                                   to = tok_val('$3')}.
+                                                  to = tok_val('$3')}.
 ptype -> float: #t_float{val = tok_val('$1')}.
 ptype -> utype_tuple : #t_tuple{types = '$1'}.
+ptype -> utype_map : #t_map{types = '$1'}.
 ptype -> '[' ']' : #t_nil{}.
 ptype -> '[' utype ']' : #t_list{type = '$2'}.
 ptype -> '[' utype ',' '...' ']' : #t_nonempty_list{type = '$2'}.
@@ -463,3 +472,5 @@ throw_error(parse_param, L) ->
     throw({error, L, "missing parameter name"});
 throw_error({Where, E}, L) when is_list(Where) ->
     throw({error,L,{"unknown error parsing ~ts: ~P.",[Where,E,15]}}).
+
+%% vim: ft=erlang
diff --git a/lib/edoc/src/edoc_scanner.erl b/lib/edoc/src/edoc_scanner.erl
index 754fcef643..6ff97a134c 100644
--- a/lib/edoc/src/edoc_scanner.erl
+++ b/lib/edoc/src/edoc_scanner.erl
@@ -137,6 +137,8 @@ scan1([$"|Cs0], Toks, Pos) ->				% String
 	    scan_error({illegal, string}, Pos)
     end;
 %% Punctuation characters and operators, first recognise multiples.
+scan1([$=,$>|Cs], Toks, Pos) ->
+    scan1(Cs, [{'=>',Pos}|Toks], Pos);
 scan1([$<,$<|Cs], Toks, Pos) ->
     scan1(Cs, [{'<<',Pos}|Toks], Pos);
 scan1([$>,$>|Cs], Toks, Pos) ->
diff --git a/lib/edoc/src/edoc_specs.erl b/lib/edoc/src/edoc_specs.erl
index 5acf8ac0d5..211a354c74 100644
--- a/lib/edoc/src/edoc_specs.erl
+++ b/lib/edoc/src/edoc_specs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,7 +35,7 @@
 %%  Exported functions
 %%
 
--spec type(Form::syntaxTree(), TypeDocs::dict()) -> #tag{}.
+-spec type(Form::syntaxTree(), TypeDocs::dict:dict()) -> #tag{}.
 
 %% @doc Convert an Erlang type to EDoc representation.
 %% TypeDocs is a dict of {Name, Doc}.
@@ -88,7 +88,7 @@ dummy_spec(Form) ->
 
 -spec docs(Forms::[syntaxTree()],
            CommentFun :: fun( ([syntaxTree()], Line :: term()) -> #tag{} ))
-          -> dict().
+          -> dict:dict().
 
 %% @doc Find comments after -type/-opaque declarations.
 %% Postcomments "inside" the type are skipped.
@@ -358,6 +358,14 @@ d2e({type,_,tuple,any}) ->
 d2e({type,_,binary,[Base,Unit]}) ->
     #t_binary{base_size = element(3, Base),
               unit_size = element(3, Unit)};
+d2e({type,_,map,any}) ->
+    #t_map{ types = []};
+d2e({type,_,map,Es}) ->
+    #t_map{ types = d2e(Es) };
+d2e({type,_,map_field_assoc,K,V}) ->
+    #t_map_field{ k_type = d2e(K), v_type=d2e(V) };
+d2e({type,_,map_field_exact,K,V}) ->
+    #t_map_field{ k_type = d2e(K), v_type=d2e(V) };
 d2e({type,_,tuple,Ts0}) ->
     Ts = d2e(Ts0),
     typevar_anno(#t_tuple{types = Ts}, Ts);
@@ -476,6 +484,11 @@ xrecs(#t_fun{args = Args0, range = Range0}=T, P) ->
     Args = xrecs(Args0, P),
     Range = xrecs(Range0, P),
     T#t_fun{args = Args, range = Range};
+xrecs(#t_map{ types = Ts0 }=T,P) ->
+    Ts = xrecs(Ts0, P),
+    T#t_map{ types = Ts };
+xrecs(#t_map_field{ k_type=Kt, v_type=Vt}=T, P) ->
+    T#t_map_field{ k_type=xrecs(Kt,P), v_type=xrecs(Vt,P)};
 xrecs(#t_tuple{types = Types0}=T, P) ->
     Types = xrecs(Types0, P),
     T#t_tuple{types = Types};
diff --git a/lib/edoc/src/edoc_tags.erl b/lib/edoc/src/edoc_tags.erl
index eb41f1922a..264a533a52 100644
--- a/lib/edoc/src/edoc_tags.erl
+++ b/lib/edoc/src/edoc_tags.erl
@@ -454,12 +454,14 @@ check_type(#tag{line = L, data = Data}, P0, Ls, Ts) ->
 check_type(#t_def{type = Type}, P, Ls, Ts) ->
     check_type(Type, P, Ls, Ts);
 check_type(#t_type{name = Name, args = Args}, P, Ls, Ts) ->
-    check_used_type(Name, Args, P, Ls),
+    _ = check_used_type(Name, Args, P, Ls),
     check_types3(Args++Ts, P, Ls);
 check_type(#t_var{}, P, Ls, Ts) ->
     check_types3(Ts, P, Ls);
 check_type(#t_fun{args = Args, range = Range}, P, Ls, Ts) ->
     check_type(Range, P, Ls, Args++Ts);
+check_type(#t_map{}, P, Ls, Ts) ->
+    check_types3(Ts, P, Ls);
 check_type(#t_tuple{types = Types}, P, Ls, Ts) ->
     check_types3(Types ++Ts, P, Ls);
 check_type(#t_list{type = Type}, P, Ls, Ts) ->
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl
index 60c6cecb97..af8f1230fb 100644
--- a/lib/edoc/src/edoc_types.erl
+++ b/lib/edoc/src/edoc_types.erl
@@ -141,6 +141,10 @@ to_xml(#t_type{name = N, args = As}, Env) ->
 to_xml(#t_fun{args = As, range = T}, Env) ->
     {'fun', [{argtypes, map(fun wrap_utype/2, As, Env)},
 	     wrap_utype(T, Env)]};
+to_xml(#t_map{ types = Ts}, Env) ->
+    {map, map(fun wrap_utype/2, Ts, Env)};
+to_xml(#t_map_field{ k_type=K, v_type=V}, Env) ->
+    {map_field, [wrap_utype(K,Env), wrap_utype(V, Env)]};
 to_xml(#t_tuple{types = Ts}, Env) ->
     {tuple, map(fun wrap_utype/2, Ts, Env)};
 to_xml(#t_list{type = T}, Env) ->
diff --git a/lib/edoc/src/edoc_types.hrl b/lib/edoc/src/edoc_types.hrl
index 05c61d70ff..7fec10d936 100644
--- a/lib/edoc/src/edoc_types.hrl
+++ b/lib/edoc/src/edoc_types.hrl
@@ -155,3 +155,7 @@
 %% @type t_paren() = #t_paren{a = list(), type = type()}
 
 -record(t_paren, {a=[], type}).		% parentheses
+
+-record(t_map, {a=[], types=[]}).
+-record(t_map_field, {a=[], k_type, v_type}).
+
diff --git a/lib/edoc/test/edoc_SUITE.erl b/lib/edoc/test/edoc_SUITE.erl
index 5b95c35756..c9c7811afb 100644
--- a/lib/edoc/test/edoc_SUITE.erl
+++ b/lib/edoc/test/edoc_SUITE.erl
@@ -22,12 +22,12 @@
 	 init_per_group/2,end_per_group/2]).
 
 %% Test cases
--export([build_std/1]).
+-export([app/1,appup/1,build_std/1,build_map_module/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [build_std].
+    [app,appup,build_std,build_map_module].
 
 groups() -> 
     [].
@@ -44,26 +44,36 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+%% Test that the .app file does not contain any `basic' errors
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(edoc).
 
-build_std(suite) ->
-    [];
-build_std(doc) ->
-    ["Build some documentation using standard EDoc layout"];
-build_std(Config) when is_list(Config) ->
+%% Test that the .appup file does not contain any `basic' errors
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(edoc).
 
-    ?line DataDir = ?config(data_dir, Config),
-    ?line Overview1 = filename:join(DataDir, "overview.edoc"),
-    ?line Overview2 = filename:join(DataDir, "overview.syntax_tools"),
-    ?line PrivDir = ?config(priv_dir, Config),
+build_std(suite) -> [];
+build_std(doc) -> ["Build some documentation using standard EDoc layout"];
+build_std(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Overview1 = filename:join(DataDir, "overview.edoc"),
+    Overview2 = filename:join(DataDir, "overview.syntax_tools"),
+    PrivDir = ?config(priv_dir, Config),
 
-    ?line ok = edoc:application(edoc, [{overview, Overview1},
-				       {def, {vsn,"TEST"}},
-				       {dir, PrivDir}]),
+    ok = edoc:application(edoc, [{overview, Overview1},
+	    {def, {vsn,"TEST"}},
+	    {dir, PrivDir}]),
 
-    ?line ok = edoc:application(syntax_tools, [{overview, Overview2},
-					       {def, {vsn,"TEST"}},
-					       {dir, PrivDir}]),
+    ok = edoc:application(syntax_tools, [{overview, Overview2},
+	    {def, {vsn,"TEST"}},
+	    {dir, PrivDir}]),
 
-    ?line ok = edoc:application(xmerl, [{dir, PrivDir}]),
+    ok = edoc:application(xmerl, [{dir, PrivDir}]),
+    ok.
 
+build_map_module(Config) when is_list(Config) ->
+    DataDir  = ?config(data_dir, Config),
+    PrivDir  = ?config(priv_dir, Config),
+    Filename = filename:join(DataDir, "map_module.erl"),
+    ok = edoc:file(Filename, [{dir, PrivDir}]),
     ok.
diff --git a/lib/edoc/test/edoc_SUITE_data/map_module.erl b/lib/edoc/test/edoc_SUITE_data/map_module.erl
new file mode 100644
index 0000000000..94ee7e6f26
--- /dev/null
+++ b/lib/edoc/test/edoc_SUITE_data/map_module.erl
@@ -0,0 +1,27 @@
+-module(map_module).
+
+-export([foo1/1,foo2/3]).
+
+%% @type wazzup() = integer()
+%% @type some_type() = map()
+%% @type some_other_type() = {a, #{ list() => term()}}
+
+-type some_type() :: map().
+-type some_other_type() :: {'a', #{ list() => term()} }.
+-type wazzup() :: integer().
+
+-spec foo1(Map :: #{ 'a' => integer(), 'b' => term()}) -> term().
+
+%% @doc Gets value from map.
+
+foo1(#{ a:= 1, b := V}) -> V.
+
+%% @spec foo2(some_type(), Type2 :: some_other_type(), map()) -> Value
+%% @doc Gets value from map.
+
+-spec foo2(
+    Type1 :: some_type(),
+    Type2 :: some_other_type(),
+    Map :: #{ get => 'value', 'value' => binary()}) -> binary().
+
+foo2(Type1, {a,#{ "a" := _}}, #{get := value, value := B}) when is_map(Type1) -> B.
diff --git a/lib/edoc/vsn.mk b/lib/edoc/vsn.mk
index af2aa2203f..2fcc97e406 100644
--- a/lib/edoc/vsn.mk
+++ b/lib/edoc/vsn.mk
@@ -1 +1 @@
-EDOC_VSN = 0.7.12
+EDOC_VSN = 0.7.12.1
diff --git a/lib/eldap/doc/src/book.xml b/lib/eldap/doc/src/book.xml
index 74f1c37cdc..0056d99d9b 100644
--- a/lib/eldap/doc/src/book.xml
+++ b/lib/eldap/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/eldap/doc/src/eldap.xml b/lib/eldap/doc/src/eldap.xml
index 30767abd7e..228d3b34c3 100644
--- a/lib/eldap/doc/src/eldap.xml
+++ b/lib/eldap/doc/src/eldap.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -35,6 +35,7 @@
     <p>References:</p>
     <list type="bulleted">
       <item> <p>RFC 4510 - RFC 4519</p> </item>
+      <item> <p>RFC 2830</p> </item>
     </list>
     <p>The above publications can be found at <url href="http://www.ietf.org">IETF</url>.
     </p>
@@ -87,6 +88,38 @@ filter()    See present/1, substrings/2,
       </desc>
     </func>
     <func>
+      <name>start_tls(Handle, Options) -> ok | {error,Error}</name>
+      <fsummary>Upgrade a connection to TLS.</fsummary>
+      <desc>
+        <p>Same as start_tls(Handle, Options, infinity)</p>
+      </desc>
+    </func>
+    <func>
+      <name>start_tls(Handle, Options, Timeout) -> ok | {error,Error}</name>
+      <fsummary>Upgrade a connection to TLS.</fsummary>
+      <type>
+	<v>Handle = handle()</v>
+	<v>Options = ssl:ssl_options()</v>
+	<v>Timeout = inifinity | positive_integer()</v>
+      </type>
+      <desc>
+        <p>Upgrade the connection associated with <c>Handle</c> to a tls connection if possible.</p>
+	<p>The upgrade is done in two phases: first the server is asked for permission to upgrade. Second, if the request is acknowledged, the upgrade is performed.</p>
+	<p>Error responese from phase one will not affect the current encryption state of the connection. Those responses are:</p>
+	<taglist>
+	  <tag><c>tls_already_started</c></tag>
+	  <item>The connection is already encrypted.  The connection is not affected.</item>
+	  <tag><c>{response,ResponseFromServer}</c></tag>
+	  <item>The upgrade was refused by the LDAP server.  The <c>ResponseFromServer</c> is an atom delivered byt the LDAP server explained in section 2.3 of rfc 2830. The connection is not affected, so it is still un-encrypted.</item>
+	</taglist>
+	<p>Errors in the seconde phase will however end the connection:</p>
+	<taglist>
+	  <tag><c>Error</c></tag>
+	  <item>Any error responded from ssl:connect/3</item>
+	</taglist>
+      </desc>
+    </func>
+    <func>
       <name>simple_bind(Handle, Dn, Password) -> ok | {error, Reason}</name>
       <fsummary>Authenticate the connection.</fsummary>
       <type>
diff --git a/lib/eldap/doc/src/fascicules.xml b/lib/eldap/doc/src/fascicules.xml
index 8fc250bc75..cbc266cd30 100644
--- a/lib/eldap/doc/src/fascicules.xml
+++ b/lib/eldap/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/eldap/doc/src/notes.xml b/lib/eldap/doc/src/notes.xml
index 2cdba83bcd..e7a3e20202 100644
--- a/lib/eldap/doc/src/notes.xml
+++ b/lib/eldap/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,7 +30,39 @@
   </header>
   <p>This document describes the changes made to the Eldap application.</p>
 
-  <section><title>Eldap 1.0.1</title>
+  <section><title>Eldap 1.0.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Removed {verify,0} from ssl-options because eldap does
+	    not support peer verification. Thanks to Florian Waas for
+	    reporting.</p>
+          <p>
+	    Own Id: OTP-11354</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The ldap client eldap now supports the start_tls
+	    operation. This upgrades an existing tcp connection to
+	    encryption using tls, if the server supports it. See
+	    eldap:start_tls/2 and /3.</p>
+          <p>
+	    Own Id: OTP-11336</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Eldap 1.0.1</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/eldap/doc/src/ref_man.xml b/lib/eldap/doc/src/ref_man.xml
index 70c4cee16d..8af5030c58 100644
--- a/lib/eldap/doc/src/ref_man.xml
+++ b/lib/eldap/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/eldap/doc/src/release_notes.xml b/lib/eldap/doc/src/release_notes.xml
index 778a49b894..e29a0ffce7 100644
--- a/lib/eldap/doc/src/release_notes.xml
+++ b/lib/eldap/doc/src/release_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/eldap/doc/src/usersguide.xml b/lib/eldap/doc/src/usersguide.xml
index 828588e88e..3a9a8e1060 100644
--- a/lib/eldap/doc/src/usersguide.xml
+++ b/lib/eldap/doc/src/usersguide.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/eldap/src/eldap.appup.src b/lib/eldap/src/eldap.appup.src
index 8d33482f11..7a9a5ef548 100644
--- a/lib/eldap/src/eldap.appup.src
+++ b/lib/eldap/src/eldap.appup.src
@@ -1,6 +1,21 @@
 %% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
 {"%VSN%",
- [
- ],
- [
- ]}.
+ [{<<".*">>,[{restart_application, eldap}]}],
+ [{<<".*">>,[{restart_application, eldap}]}]
+}.
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index d11f904996..a86fd39adb 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -6,10 +6,12 @@
 %%%           draft-ietf-asid-ldap-c-api-00.txt
 %%%
 %%% Copyright (c) 2010 Torbjorn Tornkvist
+%%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%% See MIT-LICENSE at the top dir for licensing information.
 %%% --------------------------------------------------------------------
 -vc('$Id$ ').
 -export([open/1,open/2,simple_bind/3,controlling_process/2,
+	 start_tls/2, start_tls/3,
 	 baseObject/0,singleLevel/0,wholeSubtree/0,close/1,
 	 equalityMatch/2,greaterOrEqual/2,lessOrEqual/2,
 	 approxMatch/2,search/2,substrings/2,present/1,
@@ -36,14 +38,16 @@
 		host,                % Host running LDAP server
 		port = ?LDAP_PORT,   % The LDAP server port
 		fd,                  % Socket filedescriptor.
+		prev_fd,	     % Socket that was upgraded by start_tls
 		binddn = "",         % Name of the entry to bind as
 		passwd,              % Password for (above) entry
 		id = 0,              % LDAP Request ID
 		log,                 % User provided log function
 		timeout = infinity,  % Request timeout
 		anon_auth = false,   % Allow anonymous authentication
-		use_tls = false,      % LDAP/LDAPS
-		tls_opts = [] % ssl:ssloptsion()
+		ldaps = false,      % LDAP/LDAPS
+		using_tls = false,   % true if LDAPS or START_TLS executed
+		tls_opts = [] % ssl:ssloption()
 	       }).
 
 %%% For debug purposes
@@ -77,6 +81,16 @@ open(Hosts, Opts) when is_list(Hosts), is_list(Opts) ->
     recv(Pid).
 
 %%% --------------------------------------------------------------------
+%%% Upgrade an existing connection to tls
+%%% --------------------------------------------------------------------
+start_tls(Handle, TlsOptions) ->
+    start_tls(Handle, TlsOptions, infinity).
+
+start_tls(Handle, TlsOptions, Timeout) ->
+    send(Handle, {start_tls,TlsOptions,Timeout}),
+    recv(Handle).
+
+%%% --------------------------------------------------------------------
 %%% Shutdown connection (and process) asynchronous.
 %%% --------------------------------------------------------------------
 
@@ -351,11 +365,11 @@ parse_args([{anon_auth, true}|T], Cpid, Data) ->
 parse_args([{anon_auth, _}|T], Cpid, Data) ->
     parse_args(T, Cpid, Data);
 parse_args([{ssl, true}|T], Cpid, Data) ->
-    parse_args(T, Cpid, Data#eldap{use_tls = true});
+    parse_args(T, Cpid, Data#eldap{ldaps = true, using_tls=true});
 parse_args([{ssl, _}|T], Cpid, Data) ->
     parse_args(T, Cpid, Data);
 parse_args([{sslopts, Opts}|T], Cpid, Data) when is_list(Opts) ->
-    parse_args(T, Cpid, Data#eldap{use_tls = true, tls_opts = Opts ++ Data#eldap.tls_opts});
+    parse_args(T, Cpid, Data#eldap{ldaps = true, using_tls=true, tls_opts = Opts ++ Data#eldap.tls_opts});
 parse_args([{sslopts, _}|T], Cpid, Data) ->
     parse_args(T, Cpid, Data);
 parse_args([{log, F}|T], Cpid, Data) when is_function(F) ->
@@ -386,11 +400,10 @@ try_connect([Host|Hosts], Data) ->
 try_connect([],_) ->
     {error,"connect failed"}.
 
-do_connect(Host, Data, Opts) when Data#eldap.use_tls == false ->
+do_connect(Host, Data, Opts) when Data#eldap.ldaps == false ->
     gen_tcp:connect(Host, Data#eldap.port, Opts, Data#eldap.timeout);
-do_connect(Host, Data, Opts) when Data#eldap.use_tls == true ->
-    SslOpts = [{verify,0} | Opts ++ Data#eldap.tls_opts],
-    ssl:connect(Host, Data#eldap.port, SslOpts).
+do_connect(Host, Data, Opts) when Data#eldap.ldaps == true ->
+    ssl:connect(Host, Data#eldap.port, Opts++Data#eldap.tls_opts).
 
 loop(Cpid, Data) ->
     receive
@@ -431,6 +444,11 @@ loop(Cpid, Data) ->
 	    ?PRINT("New Cpid is: ~p~n",[NewCpid]),
 	    ?MODULE:loop(NewCpid, Data);
 
+	{From, {start_tls,TlsOptions,Timeout}} ->
+	    {Res,NewData} = do_start_tls(Data, TlsOptions, Timeout),
+	    send(From,Res),
+	    ?MODULE:loop(Cpid, NewData);
+
 	{_From, close} ->
 	    unlink(Cpid),
 	    exit(closed);
@@ -445,6 +463,51 @@ loop(Cpid, Data) ->
 
     end.
 
+
+%%% --------------------------------------------------------------------
+%%% startTLS Request
+%%% --------------------------------------------------------------------
+
+do_start_tls(Data=#eldap{using_tls=true}, _, _) ->
+    {{error,tls_already_started}, Data};
+do_start_tls(Data=#eldap{fd=FD} , TlsOptions, Timeout) ->
+    case catch exec_start_tls(Data) of
+	{ok,NewData} ->
+	    case ssl:connect(FD,TlsOptions,Timeout) of
+		{ok, SslSocket} ->
+		    {ok, NewData#eldap{prev_fd = FD,
+				       fd = SslSocket,
+				       using_tls = true
+				      }};
+		{error,Error} ->
+		    {{error,Error}, Data}
+	    end;
+	{error,Error} -> {{error,Error},Data};
+	Else         -> {{error,Else},Data}
+    end.
+
+-define(START_TLS_OID, "1.3.6.1.4.1.1466.20037").
+
+exec_start_tls(Data) ->
+    Req = #'ExtendedRequest'{requestName = ?START_TLS_OID},
+    Reply = request(Data#eldap.fd, Data, Data#eldap.id, {extendedReq, Req}),
+    exec_extended_req_reply(Data, Reply).
+
+exec_extended_req_reply(Data, {ok,Msg}) when
+  Msg#'LDAPMessage'.messageID == Data#eldap.id ->
+    case Msg#'LDAPMessage'.protocolOp of
+	{extendedResp, Result} ->
+	    case Result#'ExtendedResponse'.resultCode of
+		success ->
+		    {ok,Data};
+		Error ->
+		    {error, {response,Error}}
+	    end;
+	Other -> {error, Other}
+    end;
+exec_extended_req_reply(_, Error) ->
+    {error, Error}.
+
 %%% --------------------------------------------------------------------
 %%% bindRequest
 %%% --------------------------------------------------------------------
@@ -680,26 +743,26 @@ request(S, Data, ID, Request) ->
 send_request(S, Data, ID, Request) ->
     Message = #'LDAPMessage'{messageID  = ID,
 			     protocolOp = Request},
-    {ok,Bytes} = asn1rt:encode('ELDAPv3', 'LDAPMessage', Message),
+    {ok,Bytes} = 'ELDAPv3':encode('LDAPMessage', Message),
     case do_send(S, Data, Bytes) of
 	{error,Reason} -> throw({gen_tcp_error,Reason});
 	Else           -> Else
     end.
 
-do_send(S, Data, Bytes) when Data#eldap.use_tls == false ->
+do_send(S, Data, Bytes) when Data#eldap.using_tls == false ->
     gen_tcp:send(S, Bytes);
-do_send(S, Data, Bytes) when Data#eldap.use_tls == true ->
+do_send(S, Data, Bytes) when Data#eldap.using_tls == true ->
     ssl:send(S, Bytes).
 
-do_recv(S, #eldap{use_tls=false, timeout=Timeout}, Len) ->
+do_recv(S, #eldap{using_tls=false, timeout=Timeout}, Len) ->
     gen_tcp:recv(S, Len, Timeout);
-do_recv(S, #eldap{use_tls=true, timeout=Timeout}, Len) ->
+do_recv(S, #eldap{using_tls=true, timeout=Timeout}, Len) ->
     ssl:recv(S, Len, Timeout).
 
 recv_response(S, Data) ->
     case do_recv(S, Data, 0) of
 	{ok, Packet} ->
-	    case asn1rt:decode('ELDAPv3', 'LDAPMessage', Packet) of
+	    case 'ELDAPv3':decode('LDAPMessage', Packet) of
 		{ok,Resp} -> {ok,Resp};
 		Error     -> throw(Error)
 	    end;
@@ -801,7 +864,7 @@ recv(From)   ->
 	    {error, {internal_error, Reason}}
     end.
 
-ldap_closed_p(Data, Emsg) when Data#eldap.use_tls == true ->
+ldap_closed_p(Data, Emsg) when Data#eldap.using_tls == true ->
     %% Check if the SSL socket seems to be alive or not
     case catch ssl:sockname(Data#eldap.fd) of
 	{error, _} ->
diff --git a/lib/eldap/test/README b/lib/eldap/test/README
new file mode 100644
index 0000000000..8774db1504
--- /dev/null
+++ b/lib/eldap/test/README
@@ -0,0 +1,36 @@
+
+This works for me on Ubuntu.
+
+To run thoose test you need
+   1) some certificates
+   2) a running ldap server, for example OpenLDAPs slapd. See http://www.openldap.org/doc/admin24
+
+1)-------
+To generate certificates:
+erl
+> make_certs:all("/dev/null", "eldap_basic_SUITE_data/certs").
+
+2)-------
+To start slapd:
+   sudo slapd -f $ERL_TOP/lib/eldap/test/ldap_server/slapd.conf -F /tmp/slapd/slapd.d -h "ldap://localhost:9876 ldaps://localhost:9877"
+
+This will however not work, since slapd is guarded by apparmor that checks that slapd does not access other than allowed files...
+
+To make a local extension of alowed operations:
+    sudo emacs /etc/apparmor.d/local/usr.sbin.slapd
+
+and, after the change (yes, at least on Ubuntu it is right to edit ../local/.. but run with an other file) :
+
+    sudo apparmor_parser -r /etc/apparmor.d/usr.sbin.slapd
+
+
+The local file looks like this for me:
+
+# Site-specific additions and overrides for usr.sbin.slapd.
+# For more details, please see /etc/apparmor.d/local/README.
+
+/etc/pkcs11/** r,
+/usr/lib/x86_64-linux-gnu/** rm,
+
+/ldisk/hans_otp/otp/lib/eldap/test/** rw,
+/tmp/slapd/** rwk,
diff --git a/lib/eldap/test/eldap.cfg b/lib/eldap/test/eldap.cfg
new file mode 100644
index 0000000000..3a24afa067
--- /dev/null
+++ b/lib/eldap/test/eldap.cfg
@@ -0,0 +1 @@
+{eldap_server,{"localhost",389}}.
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index c7e3052b29..6c3d303da0 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
 %%
 %% The 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,39 +27,45 @@
 
 -define(TIMEOUT, 120000). % 2 min
 
-init_per_suite(Config0) ->
-    {{EldapHost,Port}, Config1} =
-	case catch ct:get_config(eldap_server, undefined) of
-	    undefined -> %% Dev test only
-		Server = {"localhost", 9876},
-		{Server, [{eldap_server, {"localhost", 9876}}|Config0]};
-	    {'EXIT', _} -> %% Dev test only
-		Server = {"localhost", 9876},
-		{Server, [{eldap_server, {"localhost", 9876}}|Config0]};
-	    Server ->
-		{Server, [{eldap_server, Server}|Config0]}
-	end,
-    %% Add path for this test run
+init_per_suite(Config) ->
+    StartSsl = try ssl:start() 
+    catch
+	Error:Reason ->
+	    {skip, lists:flatten(io_lib:format("eldap init_per_suite failed to start ssl Error=~p Reason=~p", [Error, Reason]))}
+    end,
+    case StartSsl of
+	ok ->
+	    chk_config(ldap_server, {"localhost",9876},
+		       chk_config(ldaps_server, {"localhost",9877},
+				  Config));
+	_ ->
+	    StartSsl
+    end.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config0) ->
+    {EldapHost,Port} = proplists:get_value(ldap_server,Config0),
     try
-	{ok, Handle} = eldap:open([EldapHost], [{port, Port}]),
+	{ok, Handle} = eldap:open([EldapHost], [{port,Port}]),
 	ok = eldap:simple_bind(Handle, "cn=Manager,dc=ericsson,dc=se", "hejsan"),
 	{ok, MyHost} = inet:gethostname(),
 	Path = "dc="++MyHost++",dc=ericsson,dc=se",
-	Config = [{eldap_path,Path}|Config1],
 	eldap:add(Handle,"dc=ericsson,dc=se",
 		  [{"objectclass", ["dcObject", "organization"]},
 		   {"dc", ["ericsson"]}, {"o", ["Testing"]}]),
 	eldap:add(Handle,Path,
 		  [{"objectclass", ["dcObject", "organization"]},
 		   {"dc", [MyHost]}, {"o", ["Test machine"]}]),
-	Config
+	[{eldap_path,Path}|Config0]
     catch error:{badmatch,Error} ->
 	    io:format("Eldap init error ~p~n ~p~n",[Error, erlang:get_stacktrace()]),
-	    {skip, lists:flatten(io_lib:format("Ldap init failed with host ~p", [EldapHost]))}
+	    {skip, lists:flatten(io_lib:format("Ldap init failed with host ~p:~p. Error=~p", [EldapHost,Port,Error]))}
     end.
-end_per_suite(Config) ->
-    %% Cleanup everything
-    {EHost, Port} = proplists:get_value(eldap_server, Config),
+
+end_per_testcase(_TestCase, Config) ->
+    {EHost, Port} = proplists:get_value(ldap_server, Config),
     Path = proplists:get_value(eldap_path, Config),
     {ok, H} = eldap:open([EHost], [{port, Port}]),
     ok = eldap:simple_bind(H, "cn=Manager,dc=ericsson,dc=se", "hejsan"),
@@ -71,40 +77,117 @@ end_per_suite(Config) ->
 	    [ok = eldap:delete(H, Entry) || {eldap_entry, Entry, _} <- Entries];
 	_ -> ignore
     end,
-    ok.
 
-init_per_testcase(_TestCase, Config) -> Config.
-end_per_testcase(_TestCase, _Config) -> ok.
+    ok.
 
 %% suite() ->
 
 all() ->
     [app,
-     api].
+     appup,
+     api,
+     ssl_api,
+     start_tls,
+     tls_operations,
+     start_tls_twice,
+     start_tls_on_ssl
+    ].
 
 app(doc) ->  "Test that the eldap app file is ok";
 app(suite) -> [];
 app(Config) when is_list(Config) ->
-    ok = test_server:app_test(public_key).
+    ok = test_server:app_test(eldap).
+
+%% Test that the eldap appup file is ok
+appup(Config) when is_list(Config) ->
+    ok = test_server:appup_test(eldap).
 
 api(doc) -> "Basic test that all api functions works as expected";
 api(suite) -> [];
 api(Config) ->
-    {Host,Port} = proplists:get_value(eldap_server, Config),
+    {Host,Port} = proplists:get_value(ldap_server, Config),
     {ok, H} = eldap:open([Host], [{port,Port}]),
     %% {ok, H} = eldap:open([Host], [{port,Port+1}, {ssl, true}]),
+    do_api_checks(H, Config),
+    eldap:close(H),
+    ok.
+
+
+ssl_api(doc) -> "Basic test that all api functions works as expected";
+ssl_api(suite) -> [];
+ssl_api(Config) ->
+    {Host,Port} = proplists:get_value(ldaps_server, Config),
+    {ok, H} = eldap:open([Host], [{port,Port}, {ssl,true}]),
+    do_api_checks(H, Config),
+    eldap:close(H),
+    ok.
+
+
+start_tls(doc) -> "Test that an existing (tcp) connection can be upgraded to tls";
+start_tls(suite) -> [];
+start_tls(Config) ->
+    {Host,Port} = proplists:get_value(ldap_server, Config),
+    {ok, H} = eldap:open([Host], [{port,Port}]),
+    ok = eldap:start_tls(H, [
+			     {keyfile, filename:join([proplists:get_value(data_dir,Config),
+						      "certs/client/key.pem"])}
+			    ]),
+    eldap:close(H).
+
+
+tls_operations(doc) -> "Test that an upgraded connection is usable for ldap stuff";
+tls_operations(suite) -> [];
+tls_operations(Config) ->
+    {Host,Port} = proplists:get_value(ldap_server, Config),
+    {ok, H} = eldap:open([Host], [{port,Port}]),
+    ok = eldap:start_tls(H, [
+			     {keyfile, filename:join([proplists:get_value(data_dir,Config),
+						      "certs/client/key.pem"])}
+			    ]),
+    do_api_checks(H, Config),
+    eldap:close(H).
+
+start_tls_twice(doc) -> "Test that start_tls on an already upgraded connection fails";
+start_tls_twice(suite) -> [];
+start_tls_twice(Config) ->
+    {Host,Port} = proplists:get_value(ldap_server, Config),
+    {ok, H} = eldap:open([Host], [{port,Port}]),
+    ok = eldap:start_tls(H, []),
+    {error,tls_already_started} = eldap:start_tls(H, []),
+    do_api_checks(H, Config),
+    eldap:close(H).
+
+
+start_tls_on_ssl(doc) -> "Test that start_tls on an ldaps connection fails";
+start_tls_on_ssl(suite) -> [];
+start_tls_on_ssl(Config) ->
+    {Host,Port} = proplists:get_value(ldaps_server, Config),
+    {ok, H} = eldap:open([Host], [{port,Port}, {ssl,true}]),
+    {error,tls_already_started} = eldap:start_tls(H, []),
+    do_api_checks(H, Config),
+    eldap:close(H).
+
+
+%%%--------------------------------------------------------------------------------
+chk_config(Key, Default, Config) ->
+    case catch ct:get_config(ldap_server, undefined) of
+	undefined  -> [{Key,Default} | Config ];
+	{'EXIT',_} -> [{Key,Default} | Config ];
+	Value -> [{Key,Value} | Config]
+    end.
+
+
+
+do_api_checks(H, Config) ->
     BasePath = proplists:get_value(eldap_path, Config),
+
     All = fun(Where) ->
 		  eldap:search(H, #eldap_search{base=Where,
 						filter=eldap:present("objectclass"),
 						scope= eldap:wholeSubtree()})
 	  end,
-    Search = fun(Filter) ->
-		     eldap:search(H, #eldap_search{base=BasePath,
-						   filter=Filter,
-						   scope=eldap:singleLevel()})
-	     end,
-    {ok, #eldap_search_result{entries=[_]}} = All(BasePath),
+    {ok, #eldap_search_result{entries=[_XYZ]}} = All(BasePath),
+%%    ct:log("XYZ=~p",[_XYZ]),
     {error, noSuchObject} = All("cn=Bar,"++BasePath),
 
     {error, _} = eldap:add(H, "cn=Jonas Jonsson," ++ BasePath,
@@ -112,52 +195,67 @@ api(Config) ->
 			    {"cn", ["Jonas Jonsson"]}, {"sn", ["Jonsson"]}]),
     eldap:simple_bind(H, "cn=Manager,dc=ericsson,dc=se", "hejsan"),
 
-    %% Add
+    chk_add(H, BasePath),
+    {ok,FB} = chk_search(H, BasePath),
+    chk_modify(H, FB),
+    chk_delete(H, BasePath),
+    chk_modify_dn(H, FB).
+
+
+chk_add(H, BasePath) ->
     ok = eldap:add(H, "cn=Jonas Jonsson," ++ BasePath,
 		   [{"objectclass", ["person"]},
 		    {"cn", ["Jonas Jonsson"]}, {"sn", ["Jonsson"]}]),
+    {error, entryAlreadyExists} = eldap:add(H, "cn=Jonas Jonsson," ++ BasePath,
+					    [{"objectclass", ["person"]},
+					     {"cn", ["Jonas Jonsson"]}, {"sn", ["Jonsson"]}]),
     ok = eldap:add(H, "cn=Foo Bar," ++ BasePath,
 		   [{"objectclass", ["person"]},
 		    {"cn", ["Foo Bar"]}, {"sn", ["Bar"]}, {"telephoneNumber", ["555-1232", "555-5432"]}]),
     ok = eldap:add(H, "ou=Team," ++ BasePath,
 		   [{"objectclass", ["organizationalUnit"]},
-		    {"ou", ["Team"]}]),
+		    {"ou", ["Team"]}]).
 
-    %% Search
+chk_search(H, BasePath) ->
+    Search = fun(Filter) ->
+		     eldap:search(H, #eldap_search{base=BasePath,
+						   filter=Filter,
+						   scope=eldap:singleLevel()})
+	     end,
     JJSR = {ok, #eldap_search_result{entries=[#eldap_entry{}]}} = Search(eldap:equalityMatch("sn", "Jonsson")),
     JJSR = Search(eldap:substrings("sn", [{any, "ss"}])),
     FBSR = {ok, #eldap_search_result{entries=[#eldap_entry{object_name=FB}]}} =
 	Search(eldap:substrings("sn", [{any, "a"}])),
     FBSR = Search(eldap:substrings("sn", [{initial, "B"}])),
     FBSR = Search(eldap:substrings("sn", [{final, "r"}])),
-
     F_AND = eldap:'and'([eldap:present("objectclass"), eldap:present("ou")]),
     {ok, #eldap_search_result{entries=[#eldap_entry{}]}} = Search(F_AND),
     F_NOT = eldap:'and'([eldap:present("objectclass"), eldap:'not'(eldap:present("ou"))]),
     {ok, #eldap_search_result{entries=[#eldap_entry{}, #eldap_entry{}]}} = Search(F_NOT),
+    {ok,FB}.					%% FIXME
 
-    %% MODIFY
+chk_modify(H, FB) ->
     Mod = [eldap:mod_replace("telephoneNumber", ["555-12345"]),
 	   eldap:mod_add("description", ["Nice guy"])],
     %% io:format("MOD ~p ~p ~n",[FB, Mod]),
     ok = eldap:modify(H, FB, Mod),
     %% DELETE ATTR
-    ok = eldap:modify(H, FB, [eldap:mod_delete("telephoneNumber", [])]),
+    ok = eldap:modify(H, FB, [eldap:mod_delete("telephoneNumber", [])]).
 
-    %% DELETE
+
+chk_delete(H, BasePath) ->
     {error, entryAlreadyExists} = eldap:add(H, "cn=Jonas Jonsson," ++ BasePath,
 					    [{"objectclass", ["person"]},
 					     {"cn", ["Jonas Jonsson"]}, {"sn", ["Jonsson"]}]),
     ok = eldap:delete(H, "cn=Jonas Jonsson," ++ BasePath),
-    {error, noSuchObject} = eldap:delete(H, "cn=Jonas Jonsson," ++ BasePath),
+    {error, noSuchObject} = eldap:delete(H, "cn=Jonas Jonsson," ++ BasePath).
 
-    %% MODIFY_DN
-    ok = eldap:modify_dn(H, FB, "cn=Niclas Andre", true, ""),
-    %%io:format("Res ~p~n ~p~n",[R, All(BasePath)]),
+chk_modify_dn(H, FB) ->
+    ok = eldap:modify_dn(H, FB, "cn=Niclas Andre", true, "").
+    %%io:format("Res ~p~n ~p~n",[R, All(BasePath)]).
 
-    eldap:close(H),
-    ok.
 
+%%%----------------
 add(H,  Attr, Value, Path0, Attrs, Class) ->
     Path = case Path0 of
 	       [] -> Attr ++ "=" ++ Value;
diff --git a/lib/eldap/test/eldap_basic_SUITE_data/certs/README b/lib/eldap/test/eldap_basic_SUITE_data/certs/README
new file mode 100644
index 0000000000..a7c8e9dc2e
--- /dev/null
+++ b/lib/eldap/test/eldap_basic_SUITE_data/certs/README
@@ -0,0 +1 @@
+See ../../README
diff --git a/lib/eldap/test/ldap_server/slapd.conf b/lib/eldap/test/ldap_server/slapd.conf
index 87be676d9f..eca298c866 100644
--- a/lib/eldap/test/ldap_server/slapd.conf
+++ b/lib/eldap/test/ldap_server/slapd.conf
@@ -1,14 +1,32 @@
-include         /etc/ldap/schema/core.schema
-pidfile		/tmp/openldap-data/slapd.pid
-argsfile	/tmp/openldap-data/slapd.args
+modulepath /usr/lib/ldap
+moduleload back_bdb.la
+
+# example config file - global configuration section
+include /etc/ldap/schema/core.schema
+referral ldap://root.openldap.org
+access to * by * read
+
+TLSCACertificateFile  /ldisk/hans_otp/otp/lib/eldap/test/eldap_basic_SUITE_data/certs/server/cacerts.pem
+TLSCertificateFile    /ldisk/hans_otp/otp/lib/eldap/test/eldap_basic_SUITE_data/certs/server/cert.pem
+TLSCertificateKeyFile /ldisk/hans_otp/otp/lib/eldap/test/eldap_basic_SUITE_data/certs/server/keycert.pem
+
 
 database	bdb
 suffix		"dc=ericsson,dc=se"
 rootdn		"cn=Manager,dc=ericsson,dc=se"
 rootpw		hejsan
+
 # The database must exist before running slapd
-directory	/tmp/openldap-data
+directory	/tmp/slapd/openldap-data-ericsson.se
+
 # Indices to maintain
 index	objectClass	eq
-# URI    "ldap://0.0.0.0:9876 ldaps://0.0.0.0:9870"
-# servers/slapd/slapd -d 255 -h "ldap://0.0.0.0:9876 ldaps://0.0.0.0:9870" -f /ldisk/dgud/src/otp/lib/eldap/test/ldap_server/slapd.conf
\ No newline at end of file
+access to attrs=userPassword
+    by self write
+    by anonymous auth
+    by dn.base="cn=Manager,dc=ericsson,dc=se" write
+    by * none
+access to *
+    by self write
+    by dn.base="cn=Manager,dc=ericsson,dc=se" write
+    by * read
diff --git a/lib/eldap/test/make_certs.erl b/lib/eldap/test/make_certs.erl
new file mode 100644
index 0000000000..f963af180d
--- /dev/null
+++ b/lib/eldap/test/make_certs.erl
@@ -0,0 +1,313 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%%
+%% The 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(make_certs).
+
+-export([all/2]).
+
+-record(dn, {commonName,
+	     organizationalUnitName = "Erlang OTP",
+	     organizationName = "Ericsson AB",
+	     localityName = "Stockholm",
+	     countryName = "SE",
+	     emailAddress = "[email protected]"}).
+
+all(DataDir, PrivDir) ->
+    OpenSSLCmd = "openssl",
+    create_rnd(DataDir, PrivDir),			% For all requests
+    rootCA(PrivDir, OpenSSLCmd, "erlangCA"),
+    intermediateCA(PrivDir, OpenSSLCmd, "otpCA", "erlangCA"),
+    endusers(PrivDir, OpenSSLCmd, "otpCA", ["client", "server"]),
+    collect_certs(PrivDir, ["erlangCA", "otpCA"], ["client", "server"]),
+    %% Create keycert files
+    SDir = filename:join([PrivDir, "server"]),
+    SC = filename:join([SDir, "cert.pem"]),
+    SK = filename:join([SDir, "key.pem"]),
+    SKC = filename:join([SDir, "keycert.pem"]),
+    append_files([SK, SC], SKC),
+    CDir = filename:join([PrivDir, "client"]),
+    CC = filename:join([CDir, "cert.pem"]),
+    CK = filename:join([CDir, "key.pem"]),
+    CKC = filename:join([CDir, "keycert.pem"]),
+    append_files([CK, CC], CKC),
+    remove_rnd(PrivDir).
+
+append_files(FileNames, ResultFileName) ->
+    {ok, ResultFile} = file:open(ResultFileName, [write]),
+    do_append_files(FileNames, ResultFile).
+
+do_append_files([], RF) ->
+    ok = file:close(RF);
+do_append_files([F|Fs], RF) ->
+    {ok, Data} = file:read_file(F),
+    ok = file:write(RF, Data),
+    do_append_files(Fs, RF).
+
+rootCA(Root, OpenSSLCmd, Name) ->
+    create_ca_dir(Root, Name, ca_cnf(Name)),
+    DN = #dn{commonName = Name},
+    create_self_signed_cert(Root, OpenSSLCmd, Name, req_cnf(DN)),
+    ok.
+
+intermediateCA(Root, OpenSSLCmd, CA, ParentCA) ->
+    CA = "otpCA",
+    create_ca_dir(Root, CA, ca_cnf(CA)),
+    CARoot = filename:join([Root, CA]),
+    DN = #dn{commonName = CA},
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, req_cnf(DN)),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]),
+    ReqFile =  filename:join([CARoot, "req.pem"]),
+    create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile),
+    CertFile = filename:join([CARoot, "cert.pem"]),
+    sign_req(Root, OpenSSLCmd, ParentCA, "ca_cert", ReqFile, CertFile).
+
+endusers(Root, OpenSSLCmd, CA, Users) ->
+    lists:foreach(fun(User) -> enduser(Root, OpenSSLCmd, CA, User) end, Users).
+
+enduser(Root, OpenSSLCmd, CA, User) ->
+    UsrRoot = filename:join([Root, User]),
+    file:make_dir(UsrRoot),
+    CnfFile = filename:join([UsrRoot, "req.cnf"]),
+    DN = #dn{commonName = User},
+    file:write_file(CnfFile, req_cnf(DN)),
+    KeyFile = filename:join([UsrRoot, "key.pem"]),
+    ReqFile =  filename:join([UsrRoot, "req.pem"]),
+    create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile),
+    CertFileAllUsage =  filename:join([UsrRoot, "cert.pem"]),
+    sign_req(Root, OpenSSLCmd, CA, "user_cert", ReqFile, CertFileAllUsage),
+    CertFileDigitalSigOnly =  filename:join([UsrRoot, "digital_signature_only_cert.pem"]),
+    sign_req(Root, OpenSSLCmd, CA, "user_cert_digital_signature_only", ReqFile, CertFileDigitalSigOnly).
+
+collect_certs(Root, CAs, Users) ->
+    Bins = lists:foldr(
+	     fun(CA, Acc) ->
+		     File = filename:join([Root, CA, "cert.pem"]),
+		     {ok, Bin} = file:read_file(File),
+		     [Bin, "\n" | Acc]
+	     end, [], CAs),
+    lists:foreach(
+      fun(User) ->
+	      File = filename:join([Root, User, "cacerts.pem"]),
+	      file:write_file(File, Bins)
+      end, Users).
+
+create_self_signed_cert(Root, OpenSSLCmd, CAName, Cnf) ->
+    CARoot = filename:join([Root, CAName]),
+    CnfFile = filename:join([CARoot, "req.cnf"]),
+    file:write_file(CnfFile, Cnf),
+    KeyFile = filename:join([CARoot, "private", "key.pem"]),
+    CertFile = filename:join([CARoot, "cert.pem"]),
+    Cmd = [OpenSSLCmd, " req"
+	   " -new"
+	   " -x509"
+	   " -config ", CnfFile,
+	   " -keyout ", KeyFile,
+	   " -out ", CertFile],
+    Env = [{"ROOTDIR", Root}],
+    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]),
+    file:make_dir(CARoot),
+    create_dirs(CARoot, ["certs", "crl", "newcerts", "private"]),
+    create_rnd(Root, filename:join([CAName, "private"])),
+    create_files(CARoot, [{"serial", "01\n"},
+			  {"index.txt", ""},
+			  {"ca.cnf", Cnf}]).
+
+create_req(Root, OpenSSLCmd, CnfFile, KeyFile, ReqFile) ->
+    Cmd = [OpenSSLCmd, " req"
+	   " -new"
+	   " -config ", CnfFile,
+	   " -keyout ", KeyFile,
+	   " -out ", ReqFile],
+    Env = [{"ROOTDIR", Root}],
+    cmd(Cmd, Env),
+    fix_key_file(OpenSSLCmd, KeyFile).
+
+sign_req(Root, OpenSSLCmd, CA, CertType, ReqFile, CertFile) ->
+    CACnfFile = filename:join([Root, CA, "ca.cnf"]),
+    Cmd = [OpenSSLCmd, " ca"
+	   " -batch"
+	   " -notext"
+	   " -config ", CACnfFile,
+	   " -extensions ", CertType,
+	   " -in ", ReqFile,
+	   " -out ", CertFile],
+    Env = [{"ROOTDIR", Root}],
+    cmd(Cmd, Env).
+
+%%
+%%  Misc
+%%
+
+create_dirs(Root, Dirs) ->
+    lists:foreach(fun(Dir) ->
+			  file:make_dir(filename:join([Root, Dir])) end,
+		  Dirs).
+
+create_files(Root, NameContents) ->
+    lists:foreach(
+      fun({Name, Contents}) ->
+	      file:write_file(filename:join([Root, Name]), Contents) end,
+      NameContents).
+
+create_rnd(FromDir, ToDir) ->
+     From = filename:join([FromDir, "RAND"]),
+     To = filename:join([ToDir, "RAND"]),
+     file:copy(From, To).
+
+remove_rnd(Dir) ->
+    File = filename:join([Dir, "RAND"]),
+    file:delete(File).
+
+cmd(Cmd, Env) ->
+    FCmd = lists:flatten(Cmd),
+    Port = open_port({spawn, FCmd}, [stream, eof, exit_status, stderr_to_stdout,
+				    {env, Env}]),
+    eval_cmd(Port).
+
+eval_cmd(Port) ->
+    receive
+	{Port, {data, _}} ->
+	    eval_cmd(Port);
+	{Port, eof} ->
+	    ok
+    end,
+    receive
+	{Port, {exit_status, Status}} when Status /= 0 ->
+	    %% io:fwrite("exit status: ~w~n", [Status]),
+	    exit({eval_cmd, Status})
+    after 0 ->
+	    ok
+    end.
+
+%%
+%% Contents of configuration files
+%%
+
+req_cnf(DN) ->
+    ["# Purpose: Configuration for requests (end users and CAs)."
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "\n"
+
+     "[req]\n"
+     "input_password	= secret\n"
+     "output_password	= secret\n"
+     "default_bits	= 1024\n"
+     "RANDFILE		= $ROOTDIR/RAND\n"
+     "encrypt_key	= no\n"
+     "default_md	= sha1\n"
+     "#string_mask	= pkix\n"
+     "x509_extensions	= ca_ext\n"
+     "prompt		= no\n"
+     "distinguished_name= name\n"
+     "\n"
+
+     "[name]\n"
+     "commonName		= ", DN#dn.commonName, "\n"
+     "organizationalUnitName	= ", DN#dn.organizationalUnitName, "\n"
+     "organizationName	        = ", DN#dn.organizationName, "\n"
+     "localityName		= ", DN#dn.localityName, "\n"
+     "countryName		= ", DN#dn.countryName, "\n"
+     "emailAddress		= ", DN#dn.emailAddress, "\n"
+     "\n"
+
+     "[ca_ext]\n"
+     "basicConstraints 	= critical, CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "subjectAltName	= email:copy\n"].
+
+
+ca_cnf(CA) ->
+    ["# Purpose: Configuration for CAs.\n"
+     "\n"
+     "ROOTDIR	        = $ENV::ROOTDIR\n"
+     "default_ca	= ca\n"
+     "\n"
+
+     "[ca]\n"
+     "dir		= $ROOTDIR/", CA, "\n"
+     "certs		= $dir/certs\n"
+     "crl_dir	        = $dir/crl\n"
+     "database	        = $dir/index.txt\n"
+     "new_certs_dir	= $dir/newcerts\n"
+     "certificate	= $dir/cert.pem\n"
+     "serial		= $dir/serial\n"
+     "crl		= $dir/crl.pem\n"
+     "private_key	= $dir/private/key.pem\n"
+     "RANDFILE	        = $dir/private/RAND\n"
+     "\n"
+     "x509_extensions   = user_cert\n"
+     "unique_subject  = no\n"
+     "default_days	= 3600\n"
+     "default_md	= sha1\n"
+     "preserve	        = no\n"
+     "policy		= policy_match\n"
+     "\n"
+
+     "[policy_match]\n"
+     "commonName		= supplied\n"
+     "organizationalUnitName	= optional\n"
+     "organizationName	        = match\n"
+     "countryName		= match\n"
+     "localityName		= match\n"
+     "emailAddress		= supplied\n"
+     "\n"
+
+     "[user_cert]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= nonRepudiation, digitalSignature, keyEncipherment\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "\n"
+
+     "[user_cert_digital_signature_only]\n"
+     "basicConstraints	= CA:false\n"
+     "keyUsage 		= digitalSignature\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"
+     "\n"
+
+     "[ca_cert]\n"
+     "basicConstraints 	= critical,CA:true\n"
+     "keyUsage 		= cRLSign, keyCertSign\n"
+     "subjectKeyIdentifier = hash\n"
+     "authorityKeyIdentifier = keyid:always,issuer:always\n"
+     "subjectAltName	= email:copy\n"
+     "issuerAltName	= issuer:copy\n"].
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 4d05d3d1e3..dd1f50653c 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.0.1
+ELDAP_VSN = 1.0.2
diff --git a/lib/erl_docgen/doc/src/block_tags.xml b/lib/erl_docgen/doc/src/block_tags.xml
index 0900d7f008..9048d89e87 100644
--- a/lib/erl_docgen/doc/src/block_tags.xml
+++ b/lib/erl_docgen/doc/src/block_tags.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/book.xml b/lib/erl_docgen/doc/src/book.xml
index 73bfb7916d..2ff26ba5a1 100644
--- a/lib/erl_docgen/doc/src/book.xml
+++ b/lib/erl_docgen/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/character_entities.xml b/lib/erl_docgen/doc/src/character_entities.xml
index 9f55b68d18..f484ac2201 100644
--- a/lib/erl_docgen/doc/src/character_entities.xml
+++ b/lib/erl_docgen/doc/src/character_entities.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/doc-build.xml b/lib/erl_docgen/doc/src/doc-build.xml
index ae1b17dff5..95cfd367aa 100644
--- a/lib/erl_docgen/doc/src/doc-build.xml
+++ b/lib/erl_docgen/doc/src/doc-build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/erl_docgen/doc/src/docgen_xml_check.xml b/lib/erl_docgen/doc/src/docgen_xml_check.xml
index 58cf069d81..04ff25c8af 100644
--- a/lib/erl_docgen/doc/src/docgen_xml_check.xml
+++ b/lib/erl_docgen/doc/src/docgen_xml_check.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/erl_docgen_app.xml b/lib/erl_docgen/doc/src/erl_docgen_app.xml
index 25c473bb7e..bf12f69534 100644
--- a/lib/erl_docgen/doc/src/erl_docgen_app.xml
+++ b/lib/erl_docgen/doc/src/erl_docgen_app.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
   <header>
     <copyright>
-      <year>2011</year><year>2011</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/fasc_dtds.xml b/lib/erl_docgen/doc/src/fasc_dtds.xml
index 86eeb958f6..a00def1644 100644
--- a/lib/erl_docgen/doc/src/fasc_dtds.xml
+++ b/lib/erl_docgen/doc/src/fasc_dtds.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2007</year><year>2011</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/fascicules.xml b/lib/erl_docgen/doc/src/fascicules.xml
index 1b9d6bc94d..154c8a3b6d 100644
--- a/lib/erl_docgen/doc/src/fascicules.xml
+++ b/lib/erl_docgen/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/erl_docgen/doc/src/header_tags.xml b/lib/erl_docgen/doc/src/header_tags.xml
index dfae15107f..70f7588675 100644
--- a/lib/erl_docgen/doc/src/header_tags.xml
+++ b/lib/erl_docgen/doc/src/header_tags.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/inline_tags.xml b/lib/erl_docgen/doc/src/inline_tags.xml
index 9b27da659b..2aff8bae68 100644
--- a/lib/erl_docgen/doc/src/inline_tags.xml
+++ b/lib/erl_docgen/doc/src/inline_tags.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index abd3a663bd..24d12b2bb7 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,7 +30,24 @@
   </header>
   <p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
 
-  <section><title>Erl_Docgen 0.3.4</title>
+  <section><title>Erl_Docgen 0.3.4.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Docgen 0.3.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -120,7 +137,7 @@
 	    have it installed.</p>
           <p>
 	    Also adds minor cosmetic changes to the CSS. (Thanks to
-	    Ricardo Catalinas Jim�nez)</p>
+	    Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-9918</p>
         </item>
diff --git a/lib/erl_docgen/doc/src/overview.xml b/lib/erl_docgen/doc/src/overview.xml
index 2a420c53d9..9985141e75 100644
--- a/lib/erl_docgen/doc/src/overview.xml
+++ b/lib/erl_docgen/doc/src/overview.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/part.xml b/lib/erl_docgen/doc/src/part.xml
index 26d660df08..36d0baabd0 100644
--- a/lib/erl_docgen/doc/src/part.xml
+++ b/lib/erl_docgen/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2011</year><year>2011</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/ref_man.xml b/lib/erl_docgen/doc/src/ref_man.xml
index a2bc1a10a0..735fb7d1c9 100644
--- a/lib/erl_docgen/doc/src/ref_man.xml
+++ b/lib/erl_docgen/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2011</year><year>2011</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/refman_dtds.xml b/lib/erl_docgen/doc/src/refman_dtds.xml
index 4f0e388a8a..86d4272e8c 100644
--- a/lib/erl_docgen/doc/src/refman_dtds.xml
+++ b/lib/erl_docgen/doc/src/refman_dtds.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/doc/src/user_guide_dtds.xml b/lib/erl_docgen/doc/src/user_guide_dtds.xml
index 79a7701ce8..e533fbd96c 100644
--- a/lib/erl_docgen/doc/src/user_guide_dtds.xml
+++ b/lib/erl_docgen/doc/src/user_guide_dtds.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index fdc02c55a1..f999ef8ea4 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -67,7 +67,7 @@
 
 <!-- References -->
 
-<!ELEMENT seealso             (#PCDATA) >
+<!ELEMENT seealso             (#PCDATA|c|em)* >
 <!ATTLIST seealso             marker CDATA #REQUIRED >
 <!ELEMENT url                 (#PCDATA) >
 <!ATTLIST url                 href CDATA #REQUIRED >
diff --git a/lib/erl_docgen/priv/xsl/db_man.xsl b/lib/erl_docgen/priv/xsl/db_man.xsl
index 33808859c7..3bcdd11c35 100644
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
@@ -454,13 +454,21 @@
 
   <!-- *ref/Section -->
   <xsl:template match="erlref/section|comref/section|cref/section|fileref/section|appref/section">
-    <xsl:text>&#10;.SH "</xsl:text><xsl:value-of select="translate(title, 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/><xsl:text>"&#10;</xsl:text>
+      <xsl:text>&#10;.SH "</xsl:text><xsl:call-template name="replace-string">
+        <xsl:with-param name="text" select="translate(title, 'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')" />
+        <xsl:with-param name="replace" select="&quot;\&quot;" />
+        <xsl:with-param name="with" select="&quot;\\\&quot;" />
+      </xsl:call-template><xsl:text>"&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
   <!-- *ref/Subsection -->
   <xsl:template match="section/section">
-    <xsl:text>&#10;.SS "</xsl:text><xsl:value-of select="title"/><xsl:text>"&#10;</xsl:text>
+    <xsl:text>&#10;.SS "</xsl:text><xsl:call-template name="replace-string">
+        <xsl:with-param name="text" select="title" />
+        <xsl:with-param name="replace" select="&quot;\&quot;" />
+        <xsl:with-param name="with" select="&quot;\\\&quot;" />
+      </xsl:call-template><xsl:text>"&#10;</xsl:text>
     <xsl:apply-templates/>
   </xsl:template>
 
diff --git a/lib/erl_docgen/src/docgen_otp_specs.erl b/lib/erl_docgen/src/docgen_otp_specs.erl
index 3929e66515..3240edd68e 100644
--- a/lib/erl_docgen/src/docgen_otp_specs.erl
+++ b/lib/erl_docgen/src/docgen_otp_specs.erl
@@ -388,6 +388,8 @@ t_type([#xmlElement{name = nonempty_list, content = Es}]) ->
     t_nonempty_list(Es);
 t_type([#xmlElement{name = tuple, content = Es}]) ->
     t_tuple(Es);
+t_type([#xmlElement{name = map}]) ->
+    t_map();
 t_type([#xmlElement{name = 'fun', content = Es}]) ->
     ["fun("] ++ t_fun(Es) ++ [")"];
 t_type([E = #xmlElement{name = record, content = Es}]) ->
@@ -430,6 +432,9 @@ t_nonempty_list(Es) ->
 t_tuple(Es) ->
     ["{"] ++ seq(fun t_utype_elem/1, Es, ["}"]).
 
+t_map() ->
+    ["#{}"].
+
 t_fun(Es) ->
     ["("] ++ seq(fun t_utype_elem/1, get_content(argtypes, Es),
 		 [") -> "] ++ t_utype(get_elem(type, Es))).
diff --git a/lib/erl_docgen/src/erl_docgen.appup.src b/lib/erl_docgen/src/erl_docgen.appup.src
index 54a63833e6..972a881c41 100644
--- a/lib/erl_docgen/src/erl_docgen.appup.src
+++ b/lib/erl_docgen/src/erl_docgen.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, erl_docgen}]}],
+ [{<<".*">>,[{restart_application, erl_docgen}]}]
+}.
diff --git a/lib/erl_docgen/test/Makefile b/lib/erl_docgen/test/Makefile
new file mode 100644
index 0000000000..9f4cc04105
--- /dev/null
+++ b/lib/erl_docgen/test/Makefile
@@ -0,0 +1,65 @@
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	erl_docgen_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/erl_docgen_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)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES) $(GEN_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) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) erl_docgen.spec "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+
+release_docs_spec:
diff --git a/lib/erl_docgen/test/erl_docgen.spec b/lib/erl_docgen/test/erl_docgen.spec
new file mode 100644
index 0000000000..98833614df
--- /dev/null
+++ b/lib/erl_docgen/test/erl_docgen.spec
@@ -0,0 +1 @@
+{suites,"../erl_docgen_test",all}.
diff --git a/lib/erl_docgen/test/erl_docgen_SUITE.erl b/lib/erl_docgen/test/erl_docgen_SUITE.erl
new file mode 100644
index 0000000000..20fbc1229b
--- /dev/null
+++ b/lib/erl_docgen/test/erl_docgen_SUITE.erl
@@ -0,0 +1,50 @@
+%% ``The 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.''
+%%
+-module(erl_docgen_SUITE).
+
+-compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [app, appup].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+     ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+app() ->
+    [{doc, "Test that the erl_docgen app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(erl_docgen).
+
+appup() ->
+    [{doc, "Test that the erl_docgen appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(erl_docgen).
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index a2262198dc..cda8671cfd 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 0.3.4
+ERL_DOCGEN_VSN = 0.3.4.1
diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4
index 25f40944e7..46b30a16b3 100644
--- a/lib/erl_interface/aclocal.m4
+++ b/lib/erl_interface/aclocal.m4
@@ -954,6 +954,40 @@ dnl
 AC_DEFUN(ERL_FIND_ETHR_LIB,
 [
 
+AC_ARG_ENABLE(native-ethr-impls,
+	      AS_HELP_STRING([--disable-native-ethr-impls],
+                             [disable native ethread implementations]),
+[ case "$enableval" in
+    no) disable_native_ethr_impls=yes ;;
+    *)  disable_native_ethr_impls=no ;;
+  esac ], disable_native_ethr_impls=no)
+
+test "X$disable_native_ethr_impls" = "Xyes" &&
+  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
+
+AC_ARG_ENABLE(x86-out-of-order,
+	      AS_HELP_STRING([--enable-x86-out-of-order],
+                             [enable x86/x84_64 out of order support (default disabled)]))
+
+AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
+	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
+			     [prefer gcc native ethread implementations]),
+[ case "$enableval" in
+    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
+    *)  enable_prefer_gcc_native_ethr_impls=no ;;
+  esac ], enable_prefer_gcc_native_ethr_impls=no)
+
+test $enable_prefer_gcc_native_ethr_impls = yes &&
+  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
+
+AC_ARG_WITH(libatomic_ops,
+	    AS_HELP_STRING([--with-libatomic_ops=PATH],
+			   [specify and prefer usage of libatomic_ops in the ethread library]))
+
+AC_ARG_WITH(with_sparc_memory_order,
+	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
+			   [specify sparc memory order (defaults to RMO)]))
+
 LM_CHECK_THR_LIB
 ERL_INTERNAL_LIBS
 
@@ -1003,40 +1037,44 @@ case "$THR_LIB_NAME" in
 
 	AC_DEFINE(ETHR_WIN32_THREADS, 1, [Define if you have win32 threads])
 
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
-
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    have_interlocked_op=no
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
+	fi
 	test "$ethr_have_native_atomics" = "yes" && ethr_have_native_spinlock=yes
 	;;
 
@@ -1303,93 +1341,98 @@ case "$THR_LIB_NAME" in
 	    int128="__int128_t"
 	fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+
+	    if test $int128 != no; then
+	        ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
+	    fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+	    AC_MSG_CHECKING([for a usable libatomic_ops implementation])
+	    case "x$with_libatomic_ops" in
+	        xno | xyes | x)
+	    	    libatomic_ops_include=
+	    	    ;;
+	        *)
+	    	    if test -d "${with_libatomic_ops}/include"; then
+	    	        libatomic_ops_include="-I$with_libatomic_ops/include"
+	    	        CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
+	    	    else
+	    	        AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
+	    	    fi;;
+	    esac
+	    ethr_have_libatomic_ops=no
+	    AC_TRY_LINK([#include "atomic_ops.h"],
+	    	        [
+	    	    	    volatile AO_t x;
+	    	    	    AO_t y;
+	    	    	    int z;
+
+	    	    	    AO_nop_full();
+	    	    	    AO_store(&x, (AO_t) 0);
+	    	    	    z = AO_load(&x);
+	    	    	    z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
+	    	        ],
+	    	        [ethr_have_native_atomics=yes
+	    	         ethr_have_libatomic_ops=yes])
+	    AC_MSG_RESULT([$ethr_have_libatomic_ops])
+	    if test $ethr_have_libatomic_ops = yes; then
+	        AC_CHECK_SIZEOF(AO_t, ,
+	    	    	        [
+	    	    	    	    #include <stdio.h>
+	    	    	    	    #include "atomic_ops.h"
+	    	    	        ])
+	        AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
+
+	        AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
+	        if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	    	    AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
+	        fi
+	        ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
+	    elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	        AC_MSG_ERROR([No usable libatomic_ops implementation found])
+	    fi
 
-	if test $int128 != no; then
-	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
-	fi
+	    case "$host_cpu" in
+	      sparc | sun4u | sparc64 | sun4v)
+	    	    case "$with_sparc_memory_order" in
+	    	        "TSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
+	    	        "PSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
+	    	        "RMO"|"")
+	    	    	    AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
+	    	        *)
+	    	    	    AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
+	    	    esac
+	    	    ethr_have_native_atomics=yes;; 
+	      i86pc | i*86 | x86_64 | amd64)
+	    	    if test "$enable_x86_out_of_order" = "yes"; then
+	    	    	    AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
+	    	    fi
+	    	    ethr_have_native_atomics=yes;;
+	      macppc | ppc | powerpc | "Power Macintosh")
+	    	    ethr_have_native_atomics=yes;;
+	      tile)
+	    	    ethr_have_native_atomics=yes;;
+	      *)
+	    	    ;;
+	    esac
 
-	AC_MSG_CHECKING([for a usable libatomic_ops implementation])
-	case "x$with_libatomic_ops" in
-	    xno | xyes | x)
-		libatomic_ops_include=
-		;;
-	    *)
-		if test -d "${with_libatomic_ops}/include"; then
-		    libatomic_ops_include="-I$with_libatomic_ops/include"
-		    CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
-		else
-		    AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
-		fi;;
-	esac
-	ethr_have_libatomic_ops=no
-	AC_TRY_LINK([#include "atomic_ops.h"],
-		    [
-			volatile AO_t x;
-			AO_t y;
-			int z;
-
-			AO_nop_full();
-			AO_store(&x, (AO_t) 0);
-			z = AO_load(&x);
-			z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
-		    ],
-		    [ethr_have_native_atomics=yes
-		     ethr_have_libatomic_ops=yes])
-	AC_MSG_RESULT([$ethr_have_libatomic_ops])
-	if test $ethr_have_libatomic_ops = yes; then
-	    AC_CHECK_SIZEOF(AO_t, ,
-			    [
-				#include <stdio.h>
-				#include "atomic_ops.h"
-			    ])
-	    AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
-
-	    AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
-	    if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-		AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
-	    fi
-	    ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
-	elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-	    AC_MSG_ERROR([No usable libatomic_ops implementation found])
 	fi
 
-	case "$host_cpu" in
-	  sparc | sun4u | sparc64 | sun4v)
-		case "$with_sparc_memory_order" in
-		    "TSO")
-			AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
-		    "PSO")
-			AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
-		    "RMO"|"")
-			AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
-		    *)
-			AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
-		esac
-		ethr_have_native_atomics=yes;; 
-	  i86pc | i*86 | x86_64 | amd64)
-		if test "$enable_x86_out_of_order" = "yes"; then
-			AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
-		fi
-		ethr_have_native_atomics=yes;;
-	  macppc | ppc | "Power Macintosh")
-		ethr_have_native_atomics=yes;;
-	  tile)
-		ethr_have_native_atomics=yes;;
-	  *)
-		;;
-	esac
-
 	test ethr_have_native_atomics = "yes" && ethr_have_native_spinlock=yes
 
 	dnl Restore LIBS
@@ -1451,40 +1494,6 @@ esac
 
 AC_C_DOUBLE_MIDDLE_ENDIAN
 
-AC_ARG_ENABLE(native-ethr-impls,
-	      AS_HELP_STRING([--disable-native-ethr-impls],
-                             [disable native ethread implementations]),
-[ case "$enableval" in
-    no) disable_native_ethr_impls=yes ;;
-    *)  disable_native_ethr_impls=no ;;
-  esac ], disable_native_ethr_impls=no)
-
-AC_ARG_ENABLE(x86-out-of-order,
-	      AS_HELP_STRING([--enable-x86-out-of-order],
-                             [enable x86/x84_64 out of order support (default disabled)]))
-
-test "X$disable_native_ethr_impls" = "Xyes" &&
-  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
-
-AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
-	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
-			     [prefer gcc native ethread implementations]),
-[ case "$enableval" in
-    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
-    *)  enable_prefer_gcc_native_ethr_impls=no ;;
-  esac ], enable_prefer_gcc_native_ethr_impls=no)
-
-test $enable_prefer_gcc_native_ethr_impls = yes &&
-  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
-
-AC_ARG_WITH(libatomic_ops,
-	    AS_HELP_STRING([--with-libatomic_ops=PATH],
-			   [specify and prefer usage of libatomic_ops in the ethread library]))
-
-AC_ARG_WITH(with_sparc_memory_order,
-	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
-			   [specify sparc memory order (defaults to RMO)]))
-
 ETHR_X86_SSE2_ASM=no
 case "$GCC-$ac_cv_sizeof_void_p-$host_cpu" in
   yes-4-i86pc | yes-4-i*86 | yes-4-x86_64 | yes-4-amd64)
diff --git a/lib/erl_interface/doc/src/book.xml b/lib/erl_interface/doc/src/book.xml
index e911b6aa2b..e6a00012d5 100644
--- a/lib/erl_interface/doc/src/book.xml
+++ b/lib/erl_interface/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index 6c340378d4..ab185c9179 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
diff --git a/lib/erl_interface/doc/src/ei_connect.xml b/lib/erl_interface/doc/src/ei_connect.xml
index f562615ddd..e8838da004 100644
--- a/lib/erl_interface/doc/src/ei_connect.xml
+++ b/lib/erl_interface/doc/src/ei_connect.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>2001</year><year>2010</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/ei_users_guide.xml b/lib/erl_interface/doc/src/ei_users_guide.xml
index 5d18e356cb..b6d3cc3209 100644
--- a/lib/erl_interface/doc/src/ei_users_guide.xml
+++ b/lib/erl_interface/doc/src/ei_users_guide.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_call.xml b/lib/erl_interface/doc/src/erl_call.xml
index c597e11481..4ab5153d30 100644
--- a/lib/erl_interface/doc/src/erl_call.xml
+++ b/lib/erl_interface/doc/src/erl_call.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE comref SYSTEM "comref.dtd">
 
 <comref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_connect.xml b/lib/erl_interface/doc/src/erl_connect.xml
index bd5e637244..c8dc43fcc8 100644
--- a/lib/erl_interface/doc/src/erl_connect.xml
+++ b/lib/erl_interface/doc/src/erl_connect.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_error.xml b/lib/erl_interface/doc/src/erl_error.xml
index 4a3f34fac7..ee21c640e9 100644
--- a/lib/erl_interface/doc/src/erl_error.xml
+++ b/lib/erl_interface/doc/src/erl_error.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_eterm.xml b/lib/erl_interface/doc/src/erl_eterm.xml
index a7921ea9d2..429f77501c 100644
--- a/lib/erl_interface/doc/src/erl_eterm.xml
+++ b/lib/erl_interface/doc/src/erl_eterm.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
diff --git a/lib/erl_interface/doc/src/erl_format.xml b/lib/erl_interface/doc/src/erl_format.xml
index f036b12879..ff3274047a 100644
--- a/lib/erl_interface/doc/src/erl_format.xml
+++ b/lib/erl_interface/doc/src/erl_format.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_global.xml b/lib/erl_interface/doc/src/erl_global.xml
index 8f9a354b4f..71c7feb9cc 100644
--- a/lib/erl_interface/doc/src/erl_global.xml
+++ b/lib/erl_interface/doc/src/erl_global.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_interface.xml b/lib/erl_interface/doc/src/erl_interface.xml
index 850a4127f4..5c3d8bc218 100644
--- a/lib/erl_interface/doc/src/erl_interface.xml
+++ b/lib/erl_interface/doc/src/erl_interface.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_malloc.xml b/lib/erl_interface/doc/src/erl_malloc.xml
index 8c8750d62a..f387a887cb 100644
--- a/lib/erl_interface/doc/src/erl_malloc.xml
+++ b/lib/erl_interface/doc/src/erl_malloc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/erl_marshal.xml b/lib/erl_interface/doc/src/erl_marshal.xml
index a7eaf78f35..173e609b83 100644
--- a/lib/erl_interface/doc/src/erl_marshal.xml
+++ b/lib/erl_interface/doc/src/erl_marshal.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/fascicules.xml b/lib/erl_interface/doc/src/fascicules.xml
index 3d6219a2bd..f7edd8a973 100644
--- a/lib/erl_interface/doc/src/fascicules.xml
+++ b/lib/erl_interface/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 2fdc839c7b..4eb61015cc 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,53 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.7.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Silence warnings (Thanks to Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11517</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Erl_Interface 3.7.14</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Introduced functionality for inspection of system and
+	    build configuration.</p>
+          <p>
+	    Own Id: OTP-11196</p>
+        </item>
+        <item>
+          <p>
+	    Header and library files from ic and erl_interface are
+	    now installed into usr/{include,lib}. Note that these
+	    directories are unversioned, so the latest installed
+	    version will be the one in the directory.</p>
+          <p>
+	    Own Id: OTP-11284</p>
+        </item>
+        <item>
+          <p>
+	    Fix location of true binary under Mac OSX. Thanks to
+	    Simon Cornish.</p>
+          <p>
+	    Own Id: OTP-11289</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.7.13</title>
 
     <section><title>Improvements and New Features</title>
@@ -262,7 +309,7 @@
         <item>
           <p>
 	    Initialize <c>to</c> and <c>to_name</c> in
-	    <c>erl_receive_msg</c>. (Thanks to G�ran Larsson)</p>
+	    <c>erl_receive_msg</c>. (Thanks to Göran Larsson)</p>
           <p>
 	    Own Id: OTP-9241</p>
         </item>
diff --git a/lib/erl_interface/doc/src/notes_history.xml b/lib/erl_interface/doc/src/notes_history.xml
index f484f3c04e..3aec9d051a 100644
--- a/lib/erl_interface/doc/src/notes_history.xml
+++ b/lib/erl_interface/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/part.xml b/lib/erl_interface/doc/src/part.xml
index e38b9164b8..b3cee31720 100644
--- a/lib/erl_interface/doc/src/part.xml
+++ b/lib/erl_interface/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/part_erl_interface.xml b/lib/erl_interface/doc/src/part_erl_interface.xml
index c69cc85c63..c382dce447 100644
--- a/lib/erl_interface/doc/src/part_erl_interface.xml
+++ b/lib/erl_interface/doc/src/part_erl_interface.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/part_notes.xml b/lib/erl_interface/doc/src/part_notes.xml
index 14c1de1d6e..79dc973d5e 100644
--- a/lib/erl_interface/doc/src/part_notes.xml
+++ b/lib/erl_interface/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/part_notes_history.xml b/lib/erl_interface/doc/src/part_notes_history.xml
index 612b4a9e1e..95f8c773cf 100644
--- a/lib/erl_interface/doc/src/part_notes_history.xml
+++ b/lib/erl_interface/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/ref_man.xml b/lib/erl_interface/doc/src/ref_man.xml
index 9ae4cf27f5..354313127d 100644
--- a/lib/erl_interface/doc/src/ref_man.xml
+++ b/lib/erl_interface/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/ref_man_ei.xml b/lib/erl_interface/doc/src/ref_man_ei.xml
index ff161f9e7f..b4fbc4b2c6 100644
--- a/lib/erl_interface/doc/src/ref_man_ei.xml
+++ b/lib/erl_interface/doc/src/ref_man_ei.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/ref_man_erl_interface.xml b/lib/erl_interface/doc/src/ref_man_erl_interface.xml
index 7ffa0cfb23..2641475415 100644
--- a/lib/erl_interface/doc/src/ref_man_erl_interface.xml
+++ b/lib/erl_interface/doc/src/ref_man_erl_interface.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/doc/src/registry.xml b/lib/erl_interface/doc/src/registry.xml
index 8aeb378d95..d06ceb095a 100644
--- a/lib/erl_interface/doc/src/registry.xml
+++ b/lib/erl_interface/doc/src/registry.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
index ebacc1cee0..e36b39c1fb 100644
--- a/lib/erl_interface/src/Makefile.in
+++ b/lib/erl_interface/src/Makefile.in
@@ -866,8 +866,12 @@ release: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/prog"
 	$(INSTALL_DIR) "$(RELSYSDIR)/src/registry"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
 	$(INSTALL_DATA) $(HEADERS)     "$(RELSYSDIR)/include"
+	$(INSTALL_DATA) $(HEADERS)     "$(RELEASE_PATH)/usr/include"
 	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELSYSDIR)/lib"
+	$(INSTALL_DATA) $(OBJ_TARGETS) "$(RELEASE_PATH)/usr/lib"
 ifneq ($(EXE_TARGETS),)
 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
 endif
diff --git a/lib/erl_interface/src/connect/ei_connect.c b/lib/erl_interface/src/connect/ei_connect.c
index 8f1f231b82..c9aa28812c 100644
--- a/lib/erl_interface/src/connect/ei_connect.c
+++ b/lib/erl_interface/src/connect/ei_connect.c
@@ -1161,6 +1161,7 @@ static unsigned int gen_challenge(void)
 	struct utsname name;
     } s;
 
+    memset(&s, 0, sizeof(s));
     gettimeofday(&s.tv, 0);
     uname(&s.name);
     s.cpu  = clock();
diff --git a/lib/erl_interface/src/connect/ei_resolve.c b/lib/erl_interface/src/connect/ei_resolve.c
index 2545c5f3de..74dcba61a7 100644
--- a/lib/erl_interface/src/connect/ei_resolve.c
+++ b/lib/erl_interface/src/connect/ei_resolve.c
@@ -173,6 +173,8 @@ static int verify_dns_configuration(void)
 
 #endif    
 
+#if defined(VXWORKS) || _REENTRANT
+
 /* 
  * Copy the contents of one struct hostent to another, i.e. don't just
  * copy the pointers, copy all the data and create new pointers, etc.
@@ -226,7 +228,7 @@ static int copy_hostent(struct hostent *dest, const struct hostent *src, char *b
   
   while(*(src_aliases)) {
     if (buflen < sizeof(*pptr)) return -1;
-    *pptr = src_aliases;
+    *pptr = (char *)src_aliases;
     advance_buf(buffer,buflen,sizeof(*pptr));
     src_aliases++;
     pptr++;
@@ -357,6 +359,10 @@ static struct hostent *my_gethostbyname_r(const char *name,
   return rval;
 }
 
+#endif /* defined(VXWORKS) || _REENTRANT */
+
+#if defined(VXWORKS) || EI_THREADS != false
+
 static struct hostent *my_gethostbyaddr_r(const char *addr,
 					  int length, 
 					  int type, 
@@ -418,6 +424,7 @@ static struct hostent *my_gethostbyaddr_r(const char *addr,
   return rval;
 }
 
+#endif /* defined(VXWORKS) || EI_THREADS != false */
 
 #endif /* !HAVE_GETHOSTBYNAME_R */
 
diff --git a/lib/erl_interface/src/encode/encode_ulonglong.c b/lib/erl_interface/src/encode/encode_ulonglong.c
index 0f21af2a91..2f136abf96 100644
--- a/lib/erl_interface/src/encode/encode_ulonglong.c
+++ b/lib/erl_interface/src/encode/encode_ulonglong.c
@@ -52,7 +52,7 @@ int ei_encode_ulonglong(char *buf, int *index, EI_ULONGLONG p)
     char *s = buf + *index;
     char *s0 = s;
 
-    if ((p < 256) && (p >= 0)) {
+    if (p < 256) {
 	if (!buf) s += 2;
 	else {
 	    put8(s,ERL_SMALL_INTEGER_EXT);
diff --git a/lib/erl_interface/src/legacy/erl_eterm.c b/lib/erl_interface/src/legacy/erl_eterm.c
index 7ca4f430de..636d26b24b 100644
--- a/lib/erl_interface/src/legacy/erl_eterm.c
+++ b/lib/erl_interface/src/legacy/erl_eterm.c
@@ -686,7 +686,7 @@ int erl_length(const ETERM *ep)
     return n;
 }
 
-
+
 /***********************************************************************
  * I o l i s t   f u n c t i o n s
  *
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c
index e207b5f0f1..9558dc134b 100644
--- a/lib/erl_interface/src/legacy/erl_marshal.c
+++ b/lib/erl_interface/src/legacy/erl_marshal.c
@@ -290,7 +290,7 @@ int erl_encode_it(ETERM *ep, unsigned char **ext, int dist)
 	    return 0;
 	}
 	/* SMALL_INTEGER */
-	if ((ul < 256) && (ul >= 0)) {
+	if (ul < 256) {
 	    *(*ext)++ = ERL_SMALL_INTEGER_EXT;
 	    *(*ext)++ = ul & 0xff;
 	    return 0;
diff --git a/lib/erl_interface/test/Makefile b/lib/erl_interface/test/Makefile
index 2b85dfc571..1ed34c74a0 100644
--- a/lib/erl_interface/test/Makefile
+++ b/lib/erl_interface/test/Makefile
@@ -42,7 +42,7 @@ MODULES= \
 	runner
 
 SPEC_FILES = \
-	erl_interface.spec
+	erl_interface.spec erl_interface_smoke.spec
 
 COVER_FILE = erl_interface.cover
 
diff --git a/lib/erl_interface/test/Makefile.src b/lib/erl_interface/test/Makefile.src
index 9c620bb8d9..4f11b5675e 100644
--- a/lib/erl_interface/test/Makefile.src
+++ b/lib/erl_interface/test/Makefile.src
@@ -17,7 +17,7 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
diff --git a/lib/erl_interface/test/all_SUITE_data/Makefile.src b/lib/erl_interface/test/all_SUITE_data/Makefile.src
index d2f57c8149..5efe7d42db 100644
--- a/lib/erl_interface/test/all_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/all_SUITE_data/Makefile.src
@@ -16,7 +16,7 @@
 # 
 # %CopyrightEnd%
 #
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = .@DS@gccifier@exe@ -CC"$(CC0)"
diff --git a/lib/erl_interface/test/all_SUITE_data/ei_runner.c b/lib/erl_interface/test/all_SUITE_data/ei_runner.c
index 205f911e38..cdf32b48c4 100644
--- a/lib/erl_interface/test/all_SUITE_data/ei_runner.c
+++ b/lib/erl_interface/test/all_SUITE_data/ei_runner.c
@@ -77,7 +77,7 @@ run_tests(char* argv0, TestCase test_cases[], unsigned number)
     }
 }
 
-
+
 /***********************************************************************
  *
  * R e a d i n g   p a c k e t s
@@ -182,7 +182,7 @@ char *read_packet(int *len)
     return io_buf;
 }
 
-
+
 /***********************************************************************
  * S e n d i n g   r e p l i e s
  *
diff --git a/lib/erl_interface/test/all_SUITE_data/runner.c b/lib/erl_interface/test/all_SUITE_data/runner.c
index a474c17722..038d651275 100644
--- a/lib/erl_interface/test/all_SUITE_data/runner.c
+++ b/lib/erl_interface/test/all_SUITE_data/runner.c
@@ -78,7 +78,7 @@ run_tests(char* argv0, TestCase test_cases[], unsigned number)
     }
 }
 
-
+
 /***********************************************************************
  *
  * R e a d i n g   p a c k e t s
@@ -188,7 +188,7 @@ char *read_packet(int *len)
   return io_buf;
 }
 
-
+
 /***********************************************************************
  * S e n d i n g   r e p l i e s
  *
diff --git a/lib/erl_interface/test/ei_accept_SUITE.erl b/lib/erl_interface/test/ei_accept_SUITE.erl
index 48469e68dc..642809ea7a 100644
--- a/lib/erl_interface/test/ei_accept_SUITE.erl
+++ b/lib/erl_interface/test/ei_accept_SUITE.erl
@@ -155,7 +155,7 @@ start_einode(Einode, N, Host, Port) ->
     ok.
 
 
-
+
 %%% Interface functions for ei (erl_interface) functions.
 
 ei_connect_init(P, Num, Cookie, Creation) ->
diff --git a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
index 9b751d8f65..d6e58559cd 100644
--- a/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_accept_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
index a6525a9138..c2db6436f3 100644
--- a/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_connect_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index d7df63cc88..ccdc19dbbd 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
index 76e55750c3..0b2b0560bf 100644
--- a/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_decode_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE.erl b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
index 2271278291..c7830f58f2 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE.erl
@@ -68,6 +68,8 @@ test_ei_decode_encode(Config) when is_list(Config) ->
     Port  = case os:type() of
 		{win32,_} ->
 		    open_port({spawn,"sort"},[]);
+		{unix, darwin} ->
+		    open_port({spawn,"/usr/bin/true"},[]);
 		_ ->
 		    open_port({spawn,"/bin/true"},[])
 	    end,
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
index d43e834558..d9464f3b75 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_encode_SUITE.erl b/lib/erl_interface/test/ei_encode_SUITE.erl
index 8d622a9e65..50dc8b6a3c 100644
--- a/lib/erl_interface/test/ei_encode_SUITE.erl
+++ b/lib/erl_interface/test/ei_encode_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
index f2a2c40615..6e98bb968b 100644
--- a/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_encode_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
index 73d51794e9..de062914c5 100644
--- a/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_format_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
index 6eec4b1990..469b49a581 100644
--- a/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_print_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
index a49eeccc02..4e8018b515 100644
--- a/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/ei_tmo_SUITE_data/Makefile.src
@@ -17,13 +17,12 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/ei_runner@obj@ \
 	$(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_connect_SUITE.erl b/lib/erl_interface/test/erl_connect_SUITE.erl
index bd54013402..c8becc760c 100644
--- a/lib/erl_interface/test/erl_connect_SUITE.erl
+++ b/lib/erl_interface/test/erl_connect_SUITE.erl
@@ -106,7 +106,7 @@ erl_reg_send(Config) when is_list(Config) ->
     ?line runner:recv_eot(P),
     ok.
 
-
+
 %%% Interface functions for erl_interface functions.
 
 erl_connect_init(P, Num, Cookie, Creation) ->
diff --git a/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src
index 047a734ecb..dad2b5ea90 100644
--- a/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_connect_SUITE_data/Makefile.src
@@ -17,14 +17,13 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_eterm_SUITE.erl b/lib/erl_interface/test/erl_eterm_SUITE.erl
index 10a27e48e3..100e9b6f68 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE.erl
+++ b/lib/erl_interface/test/erl_eterm_SUITE.erl
@@ -108,7 +108,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	1.   B a s i c    t e s t s
@@ -196,7 +196,7 @@ t_erl_free_compound(Config) when is_list(Config) ->
     ?line runner:test(?t_erl_free_compound),
     ok.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	2.   C o n s t r u c t i n g   t e r m s
@@ -521,7 +521,7 @@ t_erl_cons(Config) when is_list(Config) ->
 
 
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	3.   E x t r a c t i n g  &   i n f o    f u n c t i o n s
@@ -669,7 +669,7 @@ t_erl_element(Config) when is_list(Config) ->
     ok.
 
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	4.   I / O   l i s t   f u n c t i o n s
@@ -894,7 +894,7 @@ iolist_to_string(Port, Term) ->
 	'NULL'       -> 'NULL'
     end.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	5.   M i s c e l l a n o u s   T e s t s
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src
index 89931c7701..8f27e5495b 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/Makefile.src
@@ -17,14 +17,13 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @erl_interface_sock_libs@ @LIBS@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
index 80d7f69520..94959187b9 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
@@ -269,7 +269,7 @@ TESTCASE(t_erl_free_compound)
     report(1);
 }
 
-
+
 /***********************************************************************
  *
  *	2.   C o n s t r u c t i n g   t e r m s
@@ -1047,7 +1047,7 @@ TESTCASE(t_erl_cons)
 
 
 
-
+
 /***********************************************************************
  *
  *	3.   E x t r a c t i n g  &   i n f o    f u n c t i o n s
@@ -1296,7 +1296,7 @@ TESTCASE(extractor_macros)
 }
 
 
-
+
 /***********************************************************************
  *
  *	4.   I / O   l i s t   f u n c t i o n s
@@ -1393,7 +1393,7 @@ TESTCASE(t_erl_iolist_to_string)
     }
 }
 
-
+
 /***********************************************************************
  *
  *	5.   M i s c e l l a n o u s   T e s t s
diff --git a/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src
index 6f363ccd6f..7a532ea0ed 100644
--- a/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_ext_SUITE_data/Makefile.src
@@ -17,14 +17,13 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src
index 0cd1ab512d..73f4b1c685 100644
--- a/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_format_SUITE_data/Makefile.src
@@ -17,14 +17,13 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
index ef846bc440..ec159b0be0 100644
--- a/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_global_SUITE_data/Makefile.src
@@ -17,14 +17,13 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/erl_interface_smoke.spec b/lib/erl_interface/test/erl_interface_smoke.spec
new file mode 100644
index 0000000000..bfaea2b279
--- /dev/null
+++ b/lib/erl_interface/test/erl_interface_smoke.spec
@@ -0,0 +1 @@
+{suites,"../erl_interface_test",[ei_decode_encode_SUITE]}.
diff --git a/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src b/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src
index 8ce6c9c985..dd5ea98d71 100644
--- a/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/erl_match_SUITE_data/Makefile.src
@@ -17,14 +17,13 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib@
-LIBEI = $(LIBPATH)/@erl_interface_eilib@
+LIBERL = @erl_interface_lib@
+LIBEI = @erl_interface_eilib@
 LIBFLAGS = ../all_SUITE_data/runner@obj@ \
 	$(LIBERL) $(LIBEI) @LIBS@ @erl_interface_sock_libs@ \
 	@erl_interface_threadlib@
diff --git a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
index a512494aa3..7672b3dcd2 100644
--- a/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
+++ b/lib/erl_interface/test/port_call_SUITE_data/Makefile.src
@@ -17,14 +17,13 @@
 # %CopyrightEnd%
 #
 
-include @erl_interface_mk_include@@[email protected]
+include @erl_interface_mk_include@
 
 CC0 = @CC@
 CC = ..@DS@all_SUITE_data@DS@gccifier@exe@ -CC"$(CC0)"
 LD = @LD@
-LIBPATH = @erl_interface_libpath@
-LIBERL = $(LIBPATH)/@erl_interface_lib_drv@
-LIBEI = $(LIBPATH)/@erl_interface_eilib_drv@
+LIBERL = @erl_interface_lib_drv@
+LIBEI = @erl_interface_eilib_drv@
 
 SHLIB_EXTRA_LDLIBS = $(LIBERL) $(LIBEI) @erl_interface_threadlib@
 SHLIB_EXTRA_CFLAGS = -I@erl_interface_include@ -I../all_SUITE_data
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 6f08d380ca..f386ce09a8 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1 +1 @@
-EI_VSN = 3.7.13
+EI_VSN = 3.7.15
diff --git a/lib/et/doc/src/book.xml b/lib/et/doc/src/book.xml
index 222fbda046..6c78f2ca07 100644
--- a/lib/et/doc/src/book.xml
+++ b/lib/et/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/et.xml b/lib/et/doc/src/et.xml
index 5e3453c348..f1f74df1b1 100644
--- a/lib/et/doc/src/et.xml
+++ b/lib/et/doc/src/et.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/et_collector.xml b/lib/et/doc/src/et_collector.xml
index e9885dcbb3..8b4592ac63 100644
--- a/lib/et/doc/src/et_collector.xml
+++ b/lib/et/doc/src/et_collector.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/et_desc.xmlsrc b/lib/et/doc/src/et_desc.xmlsrc
index 68017b972e..a4240db2ba 100644
--- a/lib/et/doc/src/et_desc.xmlsrc
+++ b/lib/et/doc/src/et_desc.xmlsrc
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/et/doc/src/et_examples.xmlsrc b/lib/et/doc/src/et_examples.xmlsrc
index 7678184515..3bd95bcb06 100644
--- a/lib/et/doc/src/et_examples.xmlsrc
+++ b/lib/et/doc/src/et_examples.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/et_intro.xml b/lib/et/doc/src/et_intro.xml
index f90a6d2b5c..62cc291d4c 100644
--- a/lib/et/doc/src/et_intro.xml
+++ b/lib/et/doc/src/et_intro.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2012</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/et_selector.xml b/lib/et/doc/src/et_selector.xml
index 34203306bb..72392fdfe4 100644
--- a/lib/et/doc/src/et_selector.xml
+++ b/lib/et/doc/src/et_selector.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/et_tutorial.xmlsrc b/lib/et/doc/src/et_tutorial.xmlsrc
index 1337af76d1..02c303f66e 100644
--- a/lib/et/doc/src/et_tutorial.xmlsrc
+++ b/lib/et/doc/src/et_tutorial.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2009</year><year>2011</year>
+      <year>2009</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/et_viewer.xml b/lib/et/doc/src/et_viewer.xml
index d4cfbdfa31..695725f281 100644
--- a/lib/et/doc/src/et_viewer.xml
+++ b/lib/et/doc/src/et_viewer.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/notes.xml b/lib/et/doc/src/notes.xml
index d45d0a89bf..815dfada5e 100644
--- a/lib/et/doc/src/notes.xml
+++ b/lib/et/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -36,6 +36,23 @@
   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.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>ET 1.4.4.4</title>
 
     <section><title>Improvements and New Features</title>
@@ -43,7 +60,7 @@
         <item>
           <p>
 	    Use erlang:demonitor(Ref, [flush]) where applicable.
-	    Thanks to Lo�c Hoguin.</p>
+	    Thanks to Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-11039</p>
         </item>
@@ -82,7 +99,7 @@
       <list>
         <item>
           <p>
-	    Fix typo in ET doc (Thanks to Ricardo Catalinas Jim�nez)</p>
+	    Fix typo in ET doc (Thanks to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-10119</p>
         </item>
diff --git a/lib/et/doc/src/part.xml b/lib/et/doc/src/part.xml
index 627aee866d..7048e3a401 100644
--- a/lib/et/doc/src/part.xml
+++ b/lib/et/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/doc/src/ref_man.xml b/lib/et/doc/src/ref_man.xml
index 344b4fabed..47706339b6 100644
--- a/lib/et/doc/src/ref_man.xml
+++ b/lib/et/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
index 386169fe95..377e593712 100644
--- a/lib/et/src/Makefile
+++ b/lib/et/src/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2000-2012. All Rights Reserved.
+# Copyright Ericsson AB 2000-2013. All Rights Reserved.
 #
 # The 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,15 +127,12 @@ $(EBIN)/et_selector.$(EMULATOR): et_selector.erl ../include/et.hrl
 
 $(EBIN)/et_contents_viewer.$(EMULATOR): et_contents_viewer.erl ../include/et.hrl et_internal.hrl
 
-$(EBIN)/et_gs_contents_viewer.$(EMULATOR): et_gs_contents_viewer.erl ../include/et.hrl et_internal.hrl
 $(EBIN)/et_wx_contents_viewer.$(EMULATOR): et_wx_contents_viewer.erl ../include/et.hrl et_internal.hrl
 
 $(EBIN)/et_collector.$(EMULATOR): et_collector.erl ../include/et.hrl et_internal.hrl
 
 $(EBIN)/et_viewer.$(EMULATOR): et_viewer.erl ../include/et.hrl et_internal.hrl
 
-$(EBIN)/et_gs_viewer.$(EMULATOR): et_gs_viewer.erl ../include/et.hrl et_internal.hrl
-
 $(EBIN)/et_wx_viewer.$(EMULATOR): et_wx_viewer.erl ../include/et.hrl et_internal.hrl
 
 
diff --git a/lib/et/src/et.app.src b/lib/et/src/et.app.src
index fd203e3e44..f7189a4197 100644
--- a/lib/et/src/et.app.src
+++ b/lib/et/src/et.app.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
 %%
 %% The 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,8 +24,6 @@
    [
     et,
     et_collector,
-    et_gs_contents_viewer,
-    et_gs_viewer,
     et_selector,
     et_viewer,
     et_wx_contents_viewer,
diff --git a/lib/et/src/et.appup.src b/lib/et/src/et.appup.src
index b6344a9387..5f15b00386 100644
--- a/lib/et/src/et.appup.src
+++ b/lib/et/src/et.appup.src
@@ -1,8 +1,7 @@
-%% This is an -*- erlang -*- file.
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %% 
 %% The 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,8 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-
 {"%VSN%",
- [ ]
+ [{<<".*">>,[{restart_application, et}]}],
+ [{<<".*">>,[{restart_application, et}]}]
 }.
-
diff --git a/lib/et/src/et_collector.erl b/lib/et/src/et_collector.erl
index a78b30c419..e05c67be60 100644
--- a/lib/et/src/et_collector.erl
+++ b/lib/et/src/et_collector.erl
@@ -409,8 +409,6 @@ report(TH, TraceOrEvent) when is_record(TH, table_handle) ->
                     report(TH#table_handle.collector_pid, TraceOrEvent)
             end
     end;
-report(TH, end_of_trace) when is_record(TH, table_handle) ->
-    {ok, TH};
 report(_, Bad) ->
     exit({bad_event, Bad}).
 
diff --git a/lib/et/src/et_gs_contents_viewer.erl b/lib/et/src/et_gs_contents_viewer.erl
deleted file mode 100644
index 2d414f10b4..0000000000
--- a/lib/et/src/et_gs_contents_viewer.erl
+++ /dev/null
@@ -1,602 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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: Displays details of a trace event
-%%----------------------------------------------------------------------
-
--module(et_gs_contents_viewer).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,editor,2}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,menu,2}},
-          {nowarn_deprecated_function,{gs,menubar,2}},
-          {nowarn_deprecated_function,{gs,menubutton,2}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,menuitem,3}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
--behaviour(gen_server).
-
-%% External exports
--export([start_link/1, 
-         stop/1]).
-
-%% gen_server callbacks
--export([init/1, terminate/2, code_change/3,
-         handle_call/3, handle_cast/2, handle_info/2]).
-
--include("../include/et.hrl").
--include("et_internal.hrl").
-
--record(state, {parent_pid,     % Pid of parent process
-                viewer_pid,     % Pid of viewer process
-                event_order,    % Field to be used as primary key
-                event,          % The original event
-                filtered_event, % Event processed by active filter
-                active_filter,  % Name of the active filter
-                filters,        % List of possible filters
-                win,            % GUI: Window object
-                packer,         % GUI: Packer object
-                width,          % GUI: Window width
-                height}).       % GUI: Window height
-
-%%%----------------------------------------------------------------------
-%%% Client side
-%%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% start_link(Options) -> {ok, ContentsPid} | {error, Reason}
-%%
-%% Start an viewer for the event contents as window in GS
-%%
-%% Options = [option()]
-%% 
-%% option() =
-%% 
-%%   {parent_pid, pid()}          |  % Pid of parent process
-%%   {viewer_pid, pid()}          |  % Pid of viewer process
-%%   {event_order, event_order()} |  % Field to be used as primary key 
-%%   {active_filter, atom()}      |  % Name of the active filter
-%%   {filter, atom(), fun()}         % A named filter fun
-%%   
-%% event_order() = 'trace_ts' | 'event_ts'
-%% ContentsPid = pid()
-%% Reason = term()
-%%----------------------------------------------------------------------
-
-start_link(Options) ->
-    case parse_opt(Options, default_state()) of
-        {ok, S} ->
-            case gen_server:start_link(?MODULE, [S], []) of
-                {ok, ContentsPid} when S#state.parent_pid =/= self() ->
-                    unlink(ContentsPid),
-                    {ok, ContentsPid};
-                Other ->
-                    Other
-            end;
-        {error, Reason} ->
-            {error, Reason}
-    end.
-
-default_state() ->
-    #state{parent_pid    = self(),
-           viewer_pid    = undefined,
-           active_filter = ?DEFAULT_FILTER_NAME,
-           filters       = [?DEFAULT_FILTER],
-           width         = 600,
-           height        = 300}.
-
-parse_opt([], S) ->
-    Name = S#state.active_filter,
-    Filters = S#state.filters,
-    if
-        S#state.event =:= undefined ->
-            {error, {badarg, no_event}};
-        is_atom(Name) ->
-            case lists:keysearch(Name, #filter.name, Filters) of
-                {value, F} when is_record(F, filter) ->
-                    {ok, S#state{active_filter = Name}};
-                false ->
-                    {error, {badarg, {no_such_filter, Name, Filters}}}
-            end
-    end;
-parse_opt([H | T], S) ->
-    case H of
-        {parent_pid, ParentPid} when is_pid(ParentPid) ->
-            parse_opt(T, S#state{parent_pid = ParentPid});
-        {viewer_pid, ViewerPid} when is_pid(ViewerPid) ->
-            parse_opt(T, S#state{viewer_pid = ViewerPid});
-        {event_order, trace_ts} ->
-            parse_opt(T, S#state{event_order = trace_ts});
-        {event_order, event_ts} ->
-            parse_opt(T, S#state{event_order = event_ts});
-        {event, Event} when is_record(Event, event) ->
-            parse_opt(T, S#state{event = Event});
-        {active_filter, Name} when is_atom(Name) ->
-            parse_opt(T, S#state{active_filter = Name});
-        F when is_record(F, filter),
-               is_atom(F#filter.name),
-               is_function(F#filter.function) ->
-            Filters = lists:keydelete(F#filter.name, #filter.name, S#state.filters),
-            Filters2 = lists:keysort(#filter.name, [F | Filters]),
-            parse_opt(T, S#state{filters = Filters2});
-        {width, Width} when is_integer(Width), Width > 0 ->
-            parse_opt(T, S#state{width = Width});
-        {height, Height} when is_integer(Height), Height > 0 ->
-            parse_opt(T, S#state{height = Height});
-        Bad ->
-            {error, {bad_option, Bad}}
-    end;
-parse_opt(BadList, _S) ->
-    {error, {bad_option_list, BadList}}.
-
-%%----------------------------------------------------------------------
-%% stop(ContentsPid) -> ok
-%%
-%% Stops a contents viewer process
-%%
-%% ContentsPid = pid()
-%%----------------------------------------------------------------------
-
-stop(ContentsPid) ->
-    unlink(ContentsPid),
-    call(ContentsPid, stop).
-
-call(ContentsPid, Request) ->
-    gen_server:call(ContentsPid, Request, infinity).
-
-%%%----------------------------------------------------------------------
-%%% Callback functions from gen_server
-%%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          ignore               |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-
-init([S]) when is_record(S, state) ->
-    process_flag(trap_exit, true),
-    S2 = create_window(S),
-    {ok, S2}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_call(stop, _From, S) ->
-    unlink(S#state.parent_pid),
-    {stop, shutdown, ok, S};
-handle_call(Request, From, S) ->
-    ok = error_logger:format("~p(~p): handle_call(~p, ~p, ~p)~n",
-                             [?MODULE, self(), Request, From, S]),
-    Reply = {error, {bad_request, Request}},
-    {reply, Reply, S}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_cast(Msg, S) ->
-    ok = error_logger:format("~p(~p): handle_cast(~p, ~p)~n",
-                             [?MODULE, self(), Msg, S]),
-    {noreply, S}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_info({gs, Button, click, Data, _Other}, S) ->
-    case Button of
-        close ->
-            gs:destroy(S#state.win),
-            {stop, normal, S};
-        save ->
-            Event = S#state.event,
-            Bin = list_to_binary(event_to_string(Event, S#state.event_order)),
-            TimeStamp = 
-                case S#state.event_order of
-                    trace_ts -> Event#event.trace_ts;
-                    event_ts   -> Event#event.event_ts
-                end,
-            FileName = ["et_contents_viewer_", now_to_string(TimeStamp), ".save"],
-            file:write_file(lists:flatten(FileName), Bin),
-            {noreply, S};
-        _PopupMenuItem when is_record(Data, filter) ->
-            F = Data,
-            ChildState= S#state{active_filter = F#filter.name},
-            case gen_server:start_link(?MODULE, [ChildState], []) of
-                {ok, Pid} when S#state.parent_pid =/= self() ->
-                    unlink(Pid),
-                    {noreply, S};
-                _ ->
-                    {noreply, S}
-            end;
-        {hide, Actors} ->
-            send_viewer_event(S, {delete_actors, Actors}),
-            {noreply, S};
-        {show, Actors} ->
-            send_viewer_event(S, {insert_actors, Actors}),
-            {noreply, S};
-        {mode, Mode} ->
-            send_viewer_event(S, {mode, Mode}),
-            {noreply, S};
-        Nyi ->
-            ok = error_logger:format("~p: click ~p ignored (nyi)~n",
-                                     [?MODULE, Nyi]),
-            {noreply, S}
-    end;
-handle_info({gs, _Obj, destroy,_, _}, S) ->
-    unlink(S#state.parent_pid),
-    gs:destroy(S#state.win),
-    {stop, normal, S};
-handle_info({gs, _Obj, keypress, _, [KeySym, _Keycode, _Shift, _Control | _]}, S) ->
-    case KeySym of
-        'c' ->
-            gs:destroy(S#state.win),
-            {stop, normal, S};
-
-        'f' ->
-            E    = S#state.filtered_event,
-            From = E#event.from,
-            send_viewer_event(S, {delete_actors, [From]}),
-            {noreply, S};
-        't' ->
-            E  = S#state.filtered_event,
-            To = E#event.to,
-            send_viewer_event(S, {delete_actors, [To]}),
-            {noreply, S};
-        'b' ->
-            E    = S#state.filtered_event,
-            From = E#event.from,
-            To   = E#event.to,
-            send_viewer_event(S, {delete_actors, [From, To]}),
-            {noreply, S};
-        
-        'F' ->
-            E    = S#state.filtered_event,
-            From = E#event.from,
-            send_viewer_event(S, {insert_actors, [From]}),
-            {noreply, S};
-        'T' ->
-            E  = S#state.filtered_event,
-            To = E#event.to,
-            send_viewer_event(S, {insert_actors, [To]}),
-            {noreply, S};
-        'B' ->
-            E    = S#state.filtered_event,
-            From = E#event.from,
-            To   = E#event.to,
-            send_viewer_event(S, {insert_actors, [From, To]}),
-            {noreply, S};
-
-        's' ->
-            E     = S#state.filtered_event,
-            From  = E#event.from,
-            To    = E#event.to,
-            First = et_collector:make_key(S#state.event_order, E),
-            Mode  = {search_actors, forward, First, [From, To]},
-            send_viewer_event(S, {mode, Mode}),
-            {noreply, S};
-        'r' ->
-            E     = S#state.filtered_event,
-            From  = E#event.from,
-            To    = E#event.to,
-            First = et_collector:make_key(S#state.event_order, E),
-            Mode  = {search_actors, reverse, First, [From, To]},
-            send_viewer_event(S, {mode, Mode}),
-            {noreply, S};
-        'a' ->
-            send_viewer_event(S, {mode, all}),
-            {noreply, S};
-
-        0 ->
-            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 gen_server:start_link(?MODULE, [ChildState], []) of
-                        {ok, Pid} when S#state.parent_pid =/= self() ->
-                            unlink(Pid);
-                        _ ->
-                            ignore
-                    end;
-                false ->
-                    ignore
-            end,
-            {noreply, S};
-        Int when is_integer(Int), Int > 0, Int =< 9 ->
-            case catch lists:nth(Int, S#state.filters) of
-                F when is_record(F, filter) ->
-                    ChildState= S#state{active_filter = F#filter.name},
-                    case gen_server:start_link(?MODULE, [ChildState], []) of
-                        {ok, Pid} when S#state.parent_pid =/= self() ->
-                            unlink(Pid);
-                        _ ->
-                            ignore
-                    end;
-                {'EXIT', _} ->
-                    ignore
-            end,
-            {noreply, S};
-
-        'Shift_L' ->
-            {noreply, S};
-        'Shift_R' ->
-            {noreply, S};
-        'Caps_Lock' ->
-            {noreply, S};
-        _ ->
-            io:format("~p: ignored: ~p~n", [?MODULE, KeySym]),
-            {noreply, S}
-    end;
-handle_info({gs, _Obj, configure, [], [W, H | _]}, S) ->
-    gs:config(S#state.packer, [{width, W},{height, H}]),
-    S2 = S#state{width = W, height = H},
-    {noreply, S2};
-handle_info({'EXIT', Pid, Reason}, S) ->
-    if
-        Pid =:= S#state.parent_pid ->
-            unlink(Pid),
-            {stop, Reason, S};
-        true ->
-            {noreply, S}
-    end;
-handle_info(Info, S) ->
-    ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
-                             [?MODULE, self(), Info, S]),
-    {noreply, S}.
-
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-
-terminate(_Reason, _S) ->
-    ignore.
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Convert process state when code is changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-
-code_change(_OldVsn, S, _Extra) ->
-    {ok, S}.
-
-%%%----------------------------------------------------------------------
-%%% Handle graphics
-%%%----------------------------------------------------------------------
-
-create_window(S) ->
-    H = S#state.height,
-    W = S#state.width,
-    Name = S#state.active_filter,
-    Title = lists:concat([?MODULE, " (filter: ", Name, ")"]),
-    WinOpt = [{title, Title}, {configure, true},
-              {width, W}, {height, H}],
-    GS  = gs:start(),
-    Win = gs:window(GS, WinOpt),
-    Bar = gs:menubar(Win, []),
-    create_file_menu(Bar),
-    PackerOpt = [{packer_x, [{stretch, 1}]},
-                 {packer_y, [{stretch, 1}, {fixed, 25}]},
-                 {x, 0}, {y, 25}],
-    Packer = gs:frame(Win, PackerOpt),
-    EditorOpt = [{pack_xy, {1, 1}}, {vscroll, right}, {hscroll, bottom},
-                 {wrap, none},
-                 {bg, lightblue},  {font, {courier, 12}}],
-    Editor = gs:editor(Packer, EditorOpt),
-    FilteredEvent = config_editor(Editor, S),
-    S2 = S#state{win = Win, packer = Packer, filtered_event = FilteredEvent},
-    create_hide_menu(Bar, S2),
-    create_search_menu(Bar, S2),
-    create_filter_menu(Bar, S#state.filters),
-    gs:config(Packer, [{width, W}, {height, H}]),
-    gs:config(Win, [{map,true}, {keypress, true}]),
-    S2.
-
-create_file_menu(Bar) ->
-    Button = gs:menubutton(Bar,  [{label, {text, "File"}}]),
-    Menu  = gs:menu(Button, []),
-    gs:menuitem(close, Menu,     [{label, {text,"Close (c)"}}]),
-    gs:menuitem(save, Menu,      [{label, {text,"Save"}}]).
-
-create_filter_menu(Bar, Filters) ->
-    Button = gs:menubutton(Bar, [{label, {text, "Filters"}}]),
-    Menu  = gs:menu(Button, []),
-    gs:menuitem(Menu, [{label, {text, "Select Filter"}}, {bg, lightblue}, {enable, false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    Item = fun(F, N) when F#filter.name =:= ?DEFAULT_FILTER_NAME->
-                   Label = lists:concat([pad_string(F#filter.name, 20), "(0)"]),
-                   gs:menuitem(Menu, [{label, {text, Label}}, {data, F}]),
-                   N + 1;
-              (F, N) ->
-                   Name = F#filter.name,
-                   Label = lists:concat([pad_string(Name, 20), "(", N, ")"]),
-                   gs:menuitem(Menu, [{label, {text, Label}}, {data, F}]),
-                   N + 1
-           end,
-    Filters2 = lists:keysort(#filter.name, Filters),
-    lists:foldl(Item, 1, Filters2),
-    Menu.
-
-create_hide_menu(Bar, S) ->
-    Button = gs:menubutton(Bar,  [{label, {text, "Hide"}}]),
-    Menu   = gs:menu(Button, []),
-    E      = S#state.filtered_event,
-    From   = E#event.from,
-    To     = E#event.to,
-    if
-        S#state.viewer_pid =:= undefined ->
-            ignore;
-        From =:= To ->
-            gs:menuitem(Menu, [{label, {text, "Hide actor in Viewer "}}, {bg, lightblue}, {enable, false}]),
-            gs:menuitem(Menu, [{itemtype, separator}]),
-            gs:menuitem({hide, [From]},     Menu, [{label, {text,"From=To (f|t|b)"}}]),
-            gs:menuitem(Menu, [{itemtype, separator}]),
-            gs:menuitem(Menu, [{label, {text, "Show actor in Viewer "}}, {bg, lightblue}, {enable, false}]),
-            gs:menuitem(Menu, [{itemtype, separator}]),
-            gs:menuitem({show, [From]},     Menu, [{label, {text,"From=To (F|T|B)"}}]);
-        true ->
-            gs:menuitem(Menu, [{label, {text, "Hide actor in Viewer "}}, {bg, lightblue}, {enable, false}]),
-            gs:menuitem(Menu, [{itemtype, separator}]),
-            gs:menuitem({hide, [From]},     Menu, [{label, {text,"From (f)"}}]),
-            gs:menuitem({hide, [To]},       Menu, [{label, {text,"To   (t)"}}]),
-            gs:menuitem({hide, [From, To]}, Menu, [{label, {text,"Both (b)"}}]),
-            gs:menuitem(Menu, [{itemtype, separator}]),
-            gs:menuitem(Menu, [{label, {text, "Show actor in Viewer "}}, {bg, lightblue}, {enable, false}]),
-            gs:menuitem(Menu, [{itemtype, separator}]),
-            gs:menuitem({show, [From]},     Menu, [{label, {text,"From (F)"}}]),
-            gs:menuitem({show, [To]},       Menu, [{label, {text,"To   (T)"}}]),
-            gs:menuitem({show, [From, To]}, Menu, [{label, {text,"Both (B)"}}])
-    end.
-
-create_search_menu(Bar, S) ->
-    Button = gs:menubutton(Bar,  [{label, {text, "Search"}}]),
-    Menu   = gs:menu(Button, []),
-    E      = S#state.filtered_event,
-    From   = E#event.from,
-    To     = E#event.to,
-    gs:menuitem(Menu, [{label, {text, "Search in Viewer "}},
-                       {bg, lightblue}, {enable, false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    if
-        S#state.viewer_pid =:= undefined ->
-            S;
-        From =:= To  ->
-            Key = et_collector:make_key(S#state.event_order, E),
-            ModeS = {search_actors, forward, Key, [From]},
-            ModeR = {search_actors, reverse, Key, [From]},
-            gs:menuitem({mode, ModeS}, Menu, [{label, {text,"Forward from this event   (s)"}}]),
-            gs:menuitem({mode, ModeR}, Menu, [{label, {text,"Reverse from this event   (r)"}}]);
-        true ->
-            Key = et_collector:make_key(S#state.event_order, E),
-            ModeS = {search_actors, forward, Key, [From, To]},
-            ModeR = {search_actors, reverse, Key, [From, To]},
-            gs:menuitem({mode, ModeS}, Menu, [{label, {text,"Forward from this event   (s)"}}]),
-            gs:menuitem({mode, ModeR}, Menu, [{label, {text,"Reverse from this event   (r)"}}])
-    end,
-    gs:menuitem({mode, all}, Menu,   [{label, {text,"Abort search. Display all (a)"}}]).
-
-config_editor(Editor, S) ->
-    Event = S#state.event,
-    Name = S#state.active_filter,
-    {value, F} = lists:keysearch(Name, #filter.name, S#state.filters),
-    FilterFun = F#filter.function,
-    case catch FilterFun(Event) of
-        true ->
-            do_config_editor(Editor, Event, lightblue, S#state.event_order);
-        {true, Event2} when is_record(Event2, event) ->
-            do_config_editor(Editor, Event2, lightblue, S#state.event_order);
-        false ->
-            do_config_editor(Editor, Event, red, S#state.event_order);
-        Bad ->
-            Contents = {bad_filter, Name, Bad},
-            BadEvent = Event#event{contents = Contents},
-            do_config_editor(Editor, BadEvent, red, S#state.event_order)
-    end.
-
-do_config_editor(Editor, Event, Colour, TsKey) ->
-    String = event_to_string(Event, TsKey),
-    gs:config(Editor, {insert, {'end', String}}),
-    gs:config(Editor, {enable, false}),
-    gs:config(Editor, {bg, Colour}),
-    Event.
-
-%%%----------------------------------------------------------------------
-%%% String handling
-%%%----------------------------------------------------------------------
-
-term_to_string(Term) ->
-    case catch io_lib:format("~s", [Term]) of
-        {'EXIT', _} -> io_lib:format("~p", [Term]);
-        GoodString  -> GoodString
-    end.
-
-now_to_string({Mega, Sec, Micro} = Now)
-  when is_integer(Mega), is_integer(Sec), is_integer(Micro) ->
-    {{Y, Mo, D}, {H, Mi, S}} = calendar:now_to_universal_time(Now),
-    lists:concat([Y, "-", Mo, "-", D, " ", H, ".", Mi, ".", S, ".", Micro]);
-now_to_string(Other) ->
-    term_to_string(Other).
-
-event_to_string(Event, TsKey) ->
-    ReportedTs = Event#event.trace_ts,
-    ParsedTs   = Event#event.event_ts,
-    Deep = 
-        ["DETAIL LEVEL: ", term_to_string(Event#event.detail_level),
-         "\nLABEL:        ", term_to_string(Event#event.label),
-         case Event#event.from =:= Event#event.to of
-             true ->
-                 ["\nACTOR:        ", term_to_string(Event#event.from)];
-             false ->
-                 ["\nFROM:         ", term_to_string(Event#event.from),
-                  "\nTO:           ", term_to_string(Event#event.to)]
-         end,
-         case ReportedTs =:= ParsedTs of
-             true ->
-                 ["\nPARSED:       ", now_to_string(ParsedTs)];
-             false ->
-                 case TsKey of
-                     trace_ts ->
-                         ["\nTRACE_TS:     ", now_to_string(ReportedTs),
-                          "\nEVENT_TS:     ", now_to_string(ParsedTs)];
-                     event_ts ->
-                         ["\nEVENT_TS:     ", now_to_string(ParsedTs),
-                          "\nTRACE_TS:     ", now_to_string(ReportedTs)]
-                 end
-         end,
-         "\nCONTENTS:\n\n", term_to_string(Event#event.contents)],
-    lists:flatten(Deep).
-
-pad_string(Atom, MinLen) when is_atom(Atom) ->
-    pad_string(atom_to_list(Atom), MinLen);
-pad_string(String, MinLen) when is_integer(MinLen), MinLen >= 0 ->
-    Len = length(String),
-    case Len >= MinLen of
-        true ->
-            String;
-        false ->
-            String ++ lists:duplicate(MinLen - Len, $ )
-    end.
-
-send_viewer_event(S, Event)  ->
-    case S#state.viewer_pid of
-        ViewerPid when is_pid(ViewerPid) ->
-            ViewerPid ! {et, Event};
-        undefined  ->
-            ignore
-    end.
diff --git a/lib/et/src/et_gs_viewer.erl b/lib/et/src/et_gs_viewer.erl
deleted file mode 100644
index ce8634d09f..0000000000
--- a/lib/et/src/et_gs_viewer.erl
+++ /dev/null
@@ -1,1498 +0,0 @@
-%%
-%% %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%
-%%
-%%----------------------------------------------------------------------
-%% Purpose: Displays a sequence chart for trace events (messages/actions)
-%%----------------------------------------------------------------------
-
--module(et_gs_viewer).
--compile([{nowarn_deprecated_function,{gs,canvas,2}},
-          {nowarn_deprecated_function,{gs,checkbutton,3}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,line,2}},
-          {nowarn_deprecated_function,{gs,menu,2}},
-          {nowarn_deprecated_function,{gs,menu,3}},
-          {nowarn_deprecated_function,{gs,menubar,2}},
-          {nowarn_deprecated_function,{gs,menubutton,2}},
-          {nowarn_deprecated_function,{gs,menubutton,3}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,menuitem,3}},
-          {nowarn_deprecated_function,{gs,scale,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,text,2}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
--behaviour(gen_server).
-
-%% External exports
--export([start_link/1]).
-
-%% gen_server callbacks
--export([init/1, terminate/2, code_change/3,
-         handle_call/3, handle_cast/2, handle_info/2]).
-
--include("../include/et.hrl").
--include("et_internal.hrl").
-
--define(unknown, "UNKNOWN").
-
--record(state,
-        {parent_pid,       % Pid of parent process
-         collector_pid,    % Pid of collector process
-         event_order,      % Field to be used as primary key
-         trace_pattern,    % Collector trace pattern
-         active_filter,    % Name of the active filter
-         filters,          % List of possible filters
-         selected_actor,   % Actor selected by user
-         first_event,      % Key of first event (regardless of visibility)
-         last_event,       % Key of last event (regardless of visibility)
-         max_events,       % Maximum number of shown events
-         events,           % Queue containg all event keys (regardless of visibility)
-         max_actors,       % Maximum number of shown actors
-         actors,           % List of known actors
-         refresh_needed,   % Refresh is needed in order to show all actors
-         display_mode,     % Display all or only matching actors
-         detail_level,     % Show only events with lesser detail level
-         hide_actions,     % Hide/show events where to == from actor (bool)
-         hide_unknown,     % Hide/show events with unknown actor (bool)
-         is_suspended,     % Suspend viewer updates (bool)
-         title,            % GUI: Window title
-         win,              % GUI: Window object
-         menubar,          % GUI: Menu bar object
-         packer,           % GUI: Packer object
-         width,            % GUI: Window width
-         height,           % GUI: Window height
-         scale,            % GUI: Scaling factor on canvas
-         font,             % GUI: Font to be used on text labels
-         canvas_width,     % GUI: Canvas width
-         canvas_height,    % GUI: Canvas height
-         canvas,           % GUI: Canvas object
-         y_pos}).          % GUI: Current y position on canvas
-
--record(actor, {name, string}).
-
--define(initial_x, 10).
--define(incr_x,    60).
--define(initial_y, 15).
--define(incr_y,    15).
-
-%%%----------------------------------------------------------------------
-%%% Client side
-%%%----------------------------------------------------------------------
-
-start_link(Options) -> 
-    case parse_opt(Options, default_state(), []) of
-        {ok, S, CollectorOpt} ->
-            case S#state.collector_pid of
-                CollectorPid when is_pid(CollectorPid) ->
-                    case gen_server:start_link(?MODULE, [S], []) of
-                        {ok, Pid} when S#state.parent_pid =/= self() ->
-                            unlink(Pid),
-                            {ok, Pid};
-                        Other ->
-                            Other
-                    end;
-                undefined ->
-                    case et_collector:start_link(CollectorOpt) of
-                        {ok, CollectorPid} ->
-                            S2 = S#state{collector_pid = CollectorPid},
-                            case gen_server:start_link(?MODULE, [S2], []) of
-                                {ok, Pid} when S#state.parent_pid =/= self() ->
-                                    unlink(Pid),
-                                    {ok, Pid};
-                                Other ->
-                                    Other
-                            end;
-                        {error, Reason} ->
-                            {error, {et_collector, Reason}}
-                    end
-            end;
-        {error, Reason} ->
-            {error, Reason}
-    end.
-
-default_state() ->
-    #state{parent_pid     = self(),
-           collector_pid  = undefined,
-           detail_level   = ?detail_level_max,
-           active_filter  = ?DEFAULT_FILTER_NAME,
-           filters        = [?DEFAULT_FILTER],
-           event_order    = trace_ts,
-           is_suspended   = false,
-           max_events     = 100,
-           first_event    = first,
-           last_event     = first,
-           events         = queue_new(),
-           max_actors     = 5,
-           actors         = [create_actor(?unknown)],
-           selected_actor = ?unknown,
-           hide_actions   = false,
-           hide_unknown   = false,
-           refresh_needed = false,
-           display_mode   = all,
-           scale          = 2,
-           canvas_height  = 0,
-           canvas_width   = 0,
-           width          = 800,
-           height         = 600}.
-
-parse_opt([], S, CollectorOpt) ->
-    {ok, S, [{parent_pid, S#state.parent_pid} | CollectorOpt]};
-parse_opt([H | T], S, CollectorOpt) ->
-    case H of
-        {parent_pid, Parent} when Parent =:= undefined ->
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S#state{parent_pid = Parent}, CollectorOpt2);
-        {parent_pid, Parent} when is_pid(Parent) ->
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S#state{parent_pid = Parent}, CollectorOpt2);
-        {title, Title} ->
-            parse_opt(T, S#state{title = name_to_string(Title)}, CollectorOpt);
-        {detail_level, Level} when is_integer(Level),
-                                   Level >= ?detail_level_min,
-                                   Level =< ?detail_level_max -> 
-            parse_opt(T, S#state{detail_level = Level}, CollectorOpt);
-        {detail_level, max} ->
-            parse_opt(T, S#state{detail_level = ?detail_level_max}, CollectorOpt);
-        {detail_level, min} ->
-            parse_opt(T, S#state{detail_level = ?detail_level_min}, CollectorOpt);
-        {is_suspended, true} ->
-            parse_opt(T, S#state{is_suspended = true}, CollectorOpt);
-        {is_suspended, false} ->
-            parse_opt(T, S#state{is_suspended = false}, CollectorOpt);
-        {scale, Scale} when is_integer(Scale), Scale > 0 ->
-            parse_opt(T, S#state{scale = Scale}, CollectorOpt);
-        {width, W} when is_integer(W), W > 0 ->
-            parse_opt(T, S#state{width = W, canvas_width = W}, CollectorOpt);
-        {height, WH} when is_integer(WH), WH > 0 ->
-            parse_opt(T, S#state{height = WH, canvas_height = WH}, CollectorOpt);
-        {collector_pid, Pid} when is_pid(Pid) -> 
-            parse_opt(T, S#state{collector_pid = Pid}, CollectorOpt);
-        {collector_pid, undefined} -> 
-            parse_opt(T, S#state{collector_pid = undefined}, CollectorOpt);
-        {active_filter, Name} when is_atom(Name) ->
-            parse_opt(T, S#state{active_filter = Name}, CollectorOpt);
-        {event_order, trace_ts} -> %% BUGBUG: Verify event_order with collector
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S#state{event_order = trace_ts}, CollectorOpt2);
-        {event_order, event_ts} -> %% BUGBUG: Verify event_order with collector
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S#state{event_order = event_ts}, CollectorOpt2);
-        {trace_port, _Port} -> 
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S, CollectorOpt2);
-        {trace_max_queue, _Queue} -> 
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S, CollectorOpt2);
-        {trace_pattern, _Pattern} -> 
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S, CollectorOpt2);
-        {trace_global, _Boolean} -> 
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S, CollectorOpt2);
-        {trace_client, _Client} -> 
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S, CollectorOpt2);
-        {dict_insert, {filter, Name}, Fun} ->
-	    if
-		is_atom(Name), is_function(Fun) ->
-		    F = #filter{name = Name, function = Fun},
-		    Filters = lists:keydelete(Name, #filter.name, S#state.filters),
-		    CollectorOpt2 = [H | CollectorOpt],
-		    parse_opt(T, S#state{filters = Filters ++ [F]}, CollectorOpt2);
-		true ->
-	            {error, {bad_option, H}}
-	    end;
-        {dict_insert, {subscriber, Pid}, _Val} ->
-	    if
-		is_pid(Pid) ->
-		    CollectorOpt2 = [H | CollectorOpt],
-		    parse_opt(T, S, CollectorOpt2);
-		true ->
-	            {error, {bad_option, H}}
-	    end;
-        {dict_insert, _Key, _Val} ->
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S, CollectorOpt2);
-        {dict_delete, {filter, Name}} ->
-            Filters = lists:keydelete(Name, #filter.name, S#state.filters),
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S#state{filters = Filters}, CollectorOpt2);
-        {dict_delete, _Key} ->
-            CollectorOpt2 = [H | CollectorOpt],
-            parse_opt(T, S, CollectorOpt2);
-        {max_events, Max} when is_integer(Max), Max > 0->
-            parse_opt(T,  S#state{max_events = Max}, CollectorOpt);
-        {max_events, Max} when Max =:= infinity ->
-            parse_opt(T,  S#state{max_events = Max}, CollectorOpt);
-        {max_actors, Max} when is_integer(Max), Max >= 0->
-            parse_opt(T,  S#state{max_actors = Max}, CollectorOpt);
-        {max_actors, Max} when Max =:= infinity ->
-            parse_opt(T,  S#state{max_actors = Max}, CollectorOpt);
-        {actors, ActorNames} when is_list(ActorNames) ->
-            ActorNames2 = 
-                case lists:member(?unknown, ActorNames) of
-                    false -> [?unknown | ActorNames];
-                    true  -> ActorNames
-                end,
-            Actors = [create_actor(Name) || Name <- ActorNames2],
-            parse_opt(T, S#state{actors = Actors}, CollectorOpt);
-        {first_event, First} ->
-            parse_opt(T,  S#state{first_event = First}, CollectorOpt);
-        {hide_unknown, Bool} when Bool =:= false ->
-            parse_opt(T,  S#state{hide_unknown = Bool}, CollectorOpt);
-        {hide_unknown, Bool} when Bool =:= true ->
-            parse_opt(T,  S#state{hide_unknown = Bool}, CollectorOpt);
-        {hide_actions, Bool} when Bool =:= false ->
-            parse_opt(T,  S#state{hide_actions = Bool}, CollectorOpt);
-        {hide_actions, Bool} when Bool =:= true ->
-            parse_opt(T,  S#state{hide_actions = Bool}, CollectorOpt);
-        {display_mode, Mode = all} ->
-            parse_opt(T,  S#state{display_mode = Mode}, CollectorOpt);
-        {display_mode, Mode = {search_actors, Dir, _Key, Actors}} when is_list(Actors), Dir =:= forward ->
-            parse_opt(T,  S#state{display_mode = Mode}, CollectorOpt);
-        {display_mode, Mode = {search_actors, Dir, _Key, Actors}} when is_list(Actors), Dir =:= reverse ->
-            parse_opt(T,  S#state{display_mode = Mode}, CollectorOpt);
-
-        Bad ->
-            {error, {bad_option, Bad}}
-    end;
-parse_opt(BadList, _S, _CollectorOpt) ->
-    {error, {bad_option_list, BadList}}.
-
-do_dict_insert({filter, Name}, Fun, S) when is_atom(Name), is_function(Fun) ->
-    F = #filter{name = Name, function = Fun},
-    Filters = lists:keydelete(Name, #filter.name, S#state.filters),
-    Filters2 = lists:keysort(#filter.name, [F | Filters]),
-    gs:destroy(filter_menu),
-    create_filter_menu(S#state.active_filter, Filters2),    
-    S#state{filters = Filters2};
-do_dict_insert(_Key, _Val, S) ->
-    %% ok = error_logger:format("~p(~p): handle_info({et, {dict_insert, ~p, ~p}})~n",
-    %%                          [?MODULE, self(), Key, Val]),
-    S.
-
-do_dict_delete({filter, Name}, S) when is_atom(Name), Name =/= S#state.active_filter ->
-    Filters = lists:keydelete(Name, #filter.name, S#state.filters),
-    gs:destroy(filter_menu),
-    create_filter_menu(S#state.active_filter, Filters),    
-    S#state{filters = Filters};
-do_dict_delete(_Key, S) ->
-    %% ok = error_logger:format("~p(~p): handle_info({et, {dict_delete, ~p}})~n",
-    %%                          [?MODULE, self(), Key]),
-    S.
-
-%%%----------------------------------------------------------------------
-%%% Callback functions from gen_server
-%%%----------------------------------------------------------------------
-
-%%----------------------------------------------------------------------
-%% Func: init/1
-%% Returns: {ok, State}          |
-%%          {ok, State, Timeout} |
-%%          ignore               |
-%%          {stop, Reason}
-%%----------------------------------------------------------------------
-
-init([S]) when is_record(S, state) ->
-    process_flag(trap_exit, true),
-    InitialTimeout = 0,
-    case S#state.parent_pid of
-	undefined ->
-	    ignore;
-	Pid when is_pid(Pid) ->
-	    link(Pid)
-    end,
-    et_collector:dict_insert(S#state.collector_pid,
-                             {subscriber, self()},
-                             ?MODULE),
-    {ok, create_main_window(S), InitialTimeout}.
-
-%%----------------------------------------------------------------------
-%% Func: handle_call/3
-%% Returns: {reply, Reply, State}          |
-%%          {reply, Reply, State, Timeout} |
-%%          {noreply, State}               |
-%%          {noreply, State, Timeout}      |
-%%          {stop, Reason, Reply, State}   | (terminate/2 is called)
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_call(get_collector_pid, _From, S) ->
-    Reply = S#state.collector_pid,
-    reply(Reply, S);
-handle_call(stop, _From, S) ->
-    gs:destroy(S#state.win),
-    {stop, shutdown, ok, S};
-handle_call(Request, From, S) ->
-    ok = error_logger:format("~p(~p): handle_call(~p, ~p, ~p)~n",
-                             [?MODULE, self(), Request, From, S]),
-    Reply = {error, {bad_request, Request}},
-    reply(Reply, S).
-
-%%----------------------------------------------------------------------
-%% Func: handle_cast/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_cast(Msg, S) ->
-    ok = error_logger:format("~p(~p): handle_cast(~p, ~p)~n",
-                             [?MODULE, self(), Msg, S]),
-    noreply(S).
-
-%%----------------------------------------------------------------------
-%% Func: handle_info/2
-%% Returns: {noreply, State}          |
-%%          {noreply, State, Timeout} |
-%%          {stop, Reason, State}            (terminate/2 is called)
-%%----------------------------------------------------------------------
-
-handle_info({et, {more_events, _Size}}, S) ->
-    noreply(S);
-handle_info({et, {insert_actors, ActorNames}}, S) when is_list(ActorNames) ->
-    Fun = fun(N, Actors) ->
-                  case lists:keymember(N, #actor.name, Actors) of
-                      true  -> Actors;
-                      false -> Actors ++ [create_actor(N)]
-                  end
-          end,
-    Actors = lists:foldl(Fun, S#state.actors, ActorNames),
-    S2 = refresh_main_window(S#state{actors = Actors}),
-    noreply(S2);
-handle_info({et, {delete_actors, ActorNames}}, S) when is_list(ActorNames)->
-    Fun = fun(N, Actors) when N =:= ?unknown ->
-                  Actors;
-             (N, Actors) ->
-                  lists:keydelete(N, #actor.name, Actors)
-          end,
-    New = lists:foldl(Fun, S#state.actors, ActorNames),
-    S2 = refresh_main_window(S#state{actors = New}),
-    noreply(S2);
-handle_info({et, {dict_insert, Key, Val}}, S) ->
-    S2 = do_dict_insert(Key, Val, S),
-    noreply(S2);
-handle_info({et, {dict_delete, Key}}, S) ->
-    S2 = do_dict_delete(Key, S),
-    noreply(S2);
-handle_info({et, first}, S) ->
-    S2 = scroll_first(S),
-    noreply(S2);
-handle_info({et, prev}, S) ->
-    S2 = scroll_prev(S),
-    noreply(S2);
-handle_info({et, next}, S) ->
-    S2 = scroll_next(S),
-    noreply(S2);
-handle_info({et, last}, S) ->
-    S2 = scroll_last(S),
-    noreply(S2);
-handle_info({et, refresh}, S) ->
-    S2 = refresh_main_window(S),
-    noreply(S2);
-handle_info({et, {display_mode, Mode}}, S) ->
-    S2 = change_display_mode(Mode, S),
-    noreply(S2);
-handle_info({et, close}, S) ->
-    gs:destroy(S#state.win),
-    {stop, shutdown, S};
-handle_info({gs, Button, click, Data, Other} = Click, S) ->
-    CollectorPid = S#state.collector_pid,
-    case Button of
-        close ->
-            gs:destroy(S#state.win),
-            {stop, shutdown, S};
-        suspended ->
-            case Other of
-                [_Text, _Group, Bool | _] when Bool =:= true ->
-                    S2 = do_suspend(S),
-                    noreply(S2);    
-                [_Text, _Group, Bool | _] when Bool =:= false ->
-                    S2 = do_resume(S),
-                    noreply(S2);
-                _ ->
-                    click_error(Click, S),
-                    noreply(S)
-            end;
-        hide_actions ->
-            case Other of
-                [_Text, _Group, Bool | _] when Bool =:= true ->
-                    S2 = refresh_main_window(S#state{hide_actions = Bool}),
-                    noreply(S2);    
-                [_Text, _Group, Bool | _] when Bool =:= false ->
-                    S2 = refresh_main_window(S#state{hide_actions = Bool}),
-                    noreply(S2);
-                _ -> 
-                    click_error(Click, S),
-                    noreply(S)
-            end;
-        hide_unknown ->
-            case Other of
-                [_Text, _Group, Bool | _] when Bool =:= true ->
-                    S2 = refresh_main_window(S#state{hide_unknown = Bool}),
-                    noreply(S2);    
-                [_Text, _Group, Bool | _] when Bool =:= false ->
-                    S2 = refresh_main_window(S#state{hide_unknown = Bool}),
-                    noreply(S2);
-                _ -> 
-                    click_error(Click, S),
-                    noreply(S)
-            end;
-        up ->
-            S2 = scroll_up(S),
-            noreply(S2);
-        down ->
-            S2 = scroll_down(S),
-            noreply(S2);
-        first ->
-            S2 = scroll_first(S),
-            noreply(S2);
-        prev ->
-            S2 = scroll_prev(S),
-            noreply(S2);
-        next ->
-            S2 = scroll_next(S),
-            noreply(S2);
-        last ->
-            S2 = scroll_last(S),
-            noreply(S2);
-        refresh ->
-            S2 = refresh_main_window(S),
-            noreply(S2);
-        {display_mode, Mode} ->
-            S2 = change_display_mode(Mode, S),
-            noreply(S2);
-        close_all ->
-            close_all(S);
-        close_all_others ->
-            close_all_others(S);
-        first_all ->
-            et_collector:multicast(CollectorPid, first),
-            noreply(S);
-        prev_all ->
-            et_collector:multicast(CollectorPid, prev),
-            noreply(S);
-        next_all ->
-            et_collector:multicast(CollectorPid, next),
-            noreply(S);
-        last_all ->
-            et_collector:multicast(CollectorPid, last),
-            noreply(S);
-        refresh_all ->
-            et_collector:multicast(CollectorPid, refresh),
-            noreply(S);
-        clear_all ->
-            et_collector:clear_table(CollectorPid),
-            et_collector:multicast(CollectorPid, refresh),
-            noreply(S);
-        load_all ->
-            et_collector:start_trace_client(CollectorPid, event_file, "et_viewer.log"),
-            noreply(S);
-        save_all ->
-            et_collector:save_event_file(CollectorPid,
-                                         "et_viewer.log",
-                                         [existing, write, keep]),
-            noreply(S);
-        {open_viewer, Scale} ->
-            Actors = [A#actor.name || A <- S#state.actors],
-            open_viewer(Scale, S#state.active_filter, Actors, S),
-            noreply(S);
-        _Level when Data =:= detail_level, is_integer(hd(Other)),
-                    hd(Other) >= ?detail_level_min,
-                    hd(Other) =< ?detail_level_max ->
-            S2 = S#state{detail_level = hd(Other)},
-            noreply(S2);
-        _PopupMenuItem when is_record(Data, filter) ->
-            open_viewer(S#state.scale, Data#filter.name, [?unknown], S),
-            noreply(S);
-        _ ->
-            click_error(Click, S),
-            noreply(S)
-    end;
-handle_info({gs, _Obj, destroy,_, _}, S) ->
-    gs:destroy(S#state.win),
-    {stop, shutdown, S};
-handle_info({gs, _Obj, buttonpress, _, [_Button, X, Y | _]}, S) ->
-    S3 =
-        case y_to_n(Y, S) of
-            actor ->
-                %% Actor click
-                case S#state.actors of
-                    [] ->
-                        S;
-                    _ ->
-                        N = x_to_n(X, S),
-                        A = lists:nth(N, S#state.actors),
-                        S#state{selected_actor = A}
-                end;
-            {event, N} ->
-                %% Event click
-                List = queue_to_list(S#state.events),
-                S2 = S#state{events = list_to_queue(List)},
-                
-                Key = lists:nth(N, List),
-                Pid = S#state.collector_pid,
-                Fun = fun create_contents_window/2,
-		case et_collector:iterate(Pid, Key, -1) of
-		    Prev when Prev =:= Key ->
-			et_collector:iterate(Pid, first, 1, Fun, S2);
-		    Prev ->
-			et_collector:iterate(Pid, Prev, 1, Fun, S2)
-		end
-        end,
-    noreply(S3);
-handle_info({gs, _Obj, buttonrelease, _, [_Button, X, Y | _]}, S) ->
-    S2 =
-        case y_to_n(Y, S) of
-            actor ->
-                %% Actor click
-                case S#state.actors of
-                    [] ->
-                        S;
-                    Actors ->
-                        N = x_to_n(X, S),
-                        New = lists:nth(N, S#state.actors),
-                        Old = S#state.selected_actor,
-                        case New#actor.name =:= Old#actor.name of
-                            true ->
-                                A = S#state.selected_actor,
-                                toggle_search_for_actor(A#actor.name, S);
-                            false ->
-                                move_actor(Old, New, Actors, S)
-                        end
-                end;
-            {event, _N} ->
-                %% Event click ignored
-                S
-        end,
-    noreply(S2);
-handle_info({gs, _Obj, keypress, _, [KeySym, _Keycode, _Shift, _Control | _]} = Key, S) ->
-    case KeySym of
-        'c' ->
-            close_all_others(S);
-        'C' ->
-            close_all(S);
-        'Up' ->
-            S2 = scroll_up(S),
-            noreply(S2);
-        'Down' ->
-            S2 = scroll_down(S),
-            noreply(S2);
-        'f' ->
-            S2 = scroll_first(S),
-            noreply(S2);
-        'p' ->
-            S2 = scroll_prev(S),
-            noreply(S2);
-        'Prior' ->
-            S2 = scroll_prev(S),
-            noreply(S2);
-        'n' ->
-            S2 = scroll_next(S),
-            noreply(S2);
-        'Next' ->
-            S2 = scroll_next(S),
-            noreply(S2);
-        'l' ->
-            S2 = scroll_last(S),
-            noreply(S2);
-        'r' ->
-            S2 = refresh_main_window(S),
-            noreply(S2);
-        'F' ->
-            et_collector:multicast(S#state.collector_pid, first),
-            noreply(S);
-        'P' ->
-            et_collector:multicast(S#state.collector_pid, prev),
-            noreply(S);
-        'N' ->
-            et_collector:multicast(S#state.collector_pid, next),
-            noreply(S);
-        'L' ->
-            et_collector:multicast(S#state.collector_pid, last),
-            noreply(S);
-        'R' ->
-            et_collector:multicast(S#state.collector_pid, refresh),
-            noreply(S);
-
-        'a' ->
-            S2 = S#state{display_mode = all},
-            S3 = refresh_main_window(S2),
-            noreply(S3);
-
-        'equal' ->
-            Scale = S#state.scale,
-            Actors = [A#actor.name || A <- S#state.actors],
-            open_viewer(Scale, S#state.active_filter, Actors, S),
-            noreply(S);
-        'plus' ->
-            Scale = S#state.scale + 1,
-            Actors = [A#actor.name || A <- S#state.actors],
-            open_viewer(Scale, S#state.active_filter, Actors, S),
-            noreply(S);
-        'minus' ->
-            case S#state.scale of
-                1 ->
-                    gs:config(S#state.canvas, beep);
-                Scale ->
-                    Actors = [A#actor.name || A <- S#state.actors],
-                    open_viewer(Scale - 1, S#state.active_filter, Actors, S)
-            end,
-            noreply(S);
-        0 ->
-            case lists:keysearch(?DEFAULT_FILTER_NAME, #filter.name, S#state.filters) of
-                {value, F} when is_record(F, filter) ->
-                    open_viewer(S#state.scale, F#filter.name, [?unknown], S);
-                false ->
-                    gs:config(S#state.canvas, beep)
-            end,
-            noreply(S);
-        Int when is_integer(Int), Int > 0, Int =< 9 ->
-            case catch lists:nth(Int, S#state.filters) of
-                F when is_record(F, filter) ->
-                    open_viewer(S#state.scale, F#filter.name, [?unknown], S);
-                {'EXIT', _} ->
-                    gs:config(S#state.canvas, beep)
-            end,
-            noreply(S);
-
-        'Shift_L' ->
-            noreply(S);
-        'Shift_R' ->
-            noreply(S);
-        'Caps_Lock' ->
-            noreply(S);
-            
-        _ ->
-            click_error(Key, S),
-            noreply(S)
-    end;
-handle_info({gs, _Obj,configure, [], [W, H | _]}, S) ->
-    gs:config(S#state.packer, [{width, W}, {height, H}]),
-    S2 = S#state{width = W, height = H},
-    noreply(S2);
-handle_info(timeout, S) ->
-    Try =
-        case S#state.display_mode of
-            {search_actors, reverse, _, _} ->
-                -10;
-            _ ->
-                10
-        end,
-    if
-        S#state.is_suspended =:= true ->
-            {noreply, S, infinity};
-        S#state.max_events =:= infinity ->
-            display_more_events(Try, S);
-        true ->
-            Needed = S#state.max_events - queue_length(S#state.events),
-            if
-                Needed =< 0  -> {noreply, S, infinity};
-                Needed > 10  -> display_more_events(Try, S);
-                Needed =< 10 -> display_more_events(Needed, S)
-            end
-    end;
-
-handle_info({'EXIT', Pid, Reason}, S) ->
-    if
-        Pid =:= S#state.collector_pid ->
-            unlink(Pid),
-            gs:destroy(S#state.win),
-            {stop, Reason, S};
-        Pid =:= S#state.parent_pid ->
-            unlink(Pid),
-            gs:destroy(S#state.win),
-            {stop, Reason, S};
-        true ->
-            noreply(S)
-    end;
-handle_info(Info, S) ->
-    ok = error_logger:format("~p(~p): handle_info(~p, ~p)~n",
-                             [?MODULE, self(), Info, S]),
-    noreply(S).
-
-%%----------------------------------------------------------------------
-%% Func: terminate/2
-%% Purpose: Shutdown the server
-%% Returns: any (ignored by gen_server)
-%%----------------------------------------------------------------------
-
-terminate(_Reason, _S) ->
-    ignore.
-
-%%----------------------------------------------------------------------
-%% Func: code_change/3
-%% Purpose: Convert process state when code is changed
-%% Returns: {ok, NewState}
-%%----------------------------------------------------------------------
-
-code_change(_OldVsn, S, _Extra) ->
-    {ok, S}.
-
-%%%----------------------------------------------------------------------
-%%% Handle suspend/resume
-%%%----------------------------------------------------------------------
-
-reply(Reply, S) ->
-    case queue_length(S#state.events) of
-        _ when S#state.is_suspended =:= true ->
-            {reply, Reply, S, infinity};
-        _ when S#state.max_events =:= infinity ->
-            {reply, Reply, S, 500};
-        N when N >= S#state.max_events ->
-            {reply, Reply, S, infinity};
-        _ ->
-            {reply, Reply, S, 0}
-    end.
-
-noreply(S) ->
-    case queue_length(S#state.events) of
-        _ when S#state.is_suspended =:= true ->
-            {noreply, S, infinity};
-        _ when S#state.max_events =:= infinity ->
-            {noreply, S, 500};
-        N when N >= S#state.max_events ->
-            {noreply, S, infinity};
-        _ ->
-            {noreply, S, 0}
-    end.
-
-do_suspend(S) ->
-    config_suspend(S#state{is_suspended = true}).
-
-do_resume(S) ->
-    config_suspend(S#state{is_suspended = false}).
-
-config_suspend(S) ->
-    Suspended = S#state.is_suspended,
-    gs:config(refresh,     [{enable, not Suspended}]),
-    gs:config(refresh_all, [{enable, not Suspended}]),
-    gs:config(clear_all,   [{enable, not Suspended}]),
-    S.
-
-refresh_main_window(S) ->
-    Pid = S#state.collector_pid,
-    Key = S#state.first_event,
-    case et_collector:iterate(Pid, Key, -1) of
-	Prev when Prev =:= Key ->
-	    scroll_first(S);
-	_Prev ->
-	    S2 = S#state{last_event = S#state.first_event},
-	    clear_canvas(S2)
-    end.    
-
-scroll_first(S) ->
-    S2 = S#state{first_event = first, last_event  = first},
-    clear_canvas(S2).
-
-scroll_prev(S) ->
-    Try =
-        case S#state.max_events of
-            infinity -> -10;
-            Max      -> -Max
-        end,
-    Key = et_collector:iterate(S#state.collector_pid, S#state.first_event, Try),
-    S2 = S#state{first_event = Key, last_event  = Key},
-    clear_canvas(S2).
-
-scroll_next(S) ->
-    S2 = S#state{first_event = S#state.last_event},
-    clear_canvas(S2).
-
-scroll_up(S) ->
-    Key = et_collector:iterate(S#state.collector_pid, S#state.first_event, -5),
-    S2 = S#state{first_event = Key, last_event  = Key},
-    clear_canvas(S2).
-
-scroll_down(S) ->
-    Key = et_collector:iterate(S#state.collector_pid, S#state.first_event, 5),
-    S2 = S#state{first_event = Key, last_event  = Key},
-    clear_canvas(S2).
-
-scroll_last(S) ->
-    S2 = S#state{first_event = last, last_event  = last},
-    clear_canvas(S2).
-
-change_display_mode(Mode, S) ->
-    case Mode of
-        all ->
-            S2 = S#state{display_mode = Mode},
-            refresh_main_window(S2);
-        {search_actors, _Dir, _Key, []}  ->
-            S2 = S#state{display_mode = all},
-            refresh_main_window(S2);
-        {search_actors, _Dir, Key, Actors} when is_list(Actors) ->
-            Pid = S#state.collector_pid,
-            Prev = et_collector:iterate(Pid, Key, -1),
-            S2 = S#state{first_event  = Prev,
-                         last_event   = Prev,
-                         display_mode = Mode},
-            clear_canvas(S2)
-    end.
-
-close_all(S) ->
-    et_collector:multicast(S#state.collector_pid, close),
-    timer:sleep(timer:seconds(1)),
-    spawn(et_collector, stop, [S#state.collector_pid]),
-    gs:destroy(S#state.win),
-    {stop, shutdown, S}.
-
-close_all_others(S) ->
-    Fun =
-        fun({{subscriber, Pid}, _}) ->
-                if
-                    Pid =:= self() ->
-                        ignore;
-                    true ->
-                        unlink(Pid),
-                        Pid ! {et, close}
-                end
-        end,
-    All = et_collector:dict_match(S#state.collector_pid,
-                                  {{subscriber, '_'}, '_'}),
-    lists:foreach(Fun, All),
-    noreply(S).
-
-click_error(Click, S) ->
-    gs:config(S#state.canvas, beep),
-    io:format("~p: ignored: ~p~n", [?MODULE, Click]).
-
-%%%----------------------------------------------------------------------
-%%% Clone viewer
-%%%----------------------------------------------------------------------
-
-open_viewer(Scale, FilterName, Actors, S) ->
-    Filters = [{dict_insert, {filter, F#filter.name}, F#filter.function}
-               || F <- S#state.filters],
-    Options = 
-        [{parent_pid,    S#state.parent_pid},
-         {title,         S#state.title},
-         {collector_pid, S#state.collector_pid},
-         {is_suspended,  S#state.is_suspended},
-         {detail_level,  S#state.detail_level},
-         {active_filter, FilterName},
-         {event_order,   S#state.event_order},
-         {first_event,   S#state.first_event},
-         {max_events,    S#state.max_events},
-         {max_actors,    S#state.max_actors},
-         {hide_actions,  S#state.hide_actions},
-         {hide_unknown,  S#state.hide_unknown},
-         {is_suspended,  S#state.is_suspended},
-         {actors,        Actors},
-         {scale,         Scale},
-         {width,         S#state.width},
-         {height,        S#state.height} | Filters],
-    case start_link(Options) of
-        {ok, ViewerPid} ->
-            unlink(ViewerPid),
-            ok;
-        {error, Reason} ->
-            ok = error_logger:format("~p: Failed to start a new window: ~p~n",
-                                     [?MODULE, Reason])
-    end.
-
-%%%----------------------------------------------------------------------
-%%% Handle graphics
-%%%----------------------------------------------------------------------
-
-create_main_window(S) ->
-    Font    = select_font(S#state.scale),
-    GS      = gs:start(),
-    Name    = name_to_string(S#state.active_filter),
-    Title   = case S#state.title of
-                  undefined -> atom_to_list(?MODULE);
-                  Explicit  -> name_to_string(Explicit)
-              end,
-    WinOpt  = [{title, Title ++ " (filter: " ++ Name ++  ")"},
-               {configure, true},
-               {width, S#state.width},
-               {height, S#state.height}],
-    Win     = gs:window(GS, WinOpt),
-    Bar     = gs:menubar(Win, []),
-
-    create_file_menu(Bar),
-    create_viewer_menu(Bar),
-    create_collector_menu(Bar),
-    gs:menubutton(filter_button, Bar, [{label, {text, "Filter"}}]),
-    create_filter_menu(S#state.active_filter, S#state.filters),
-    create_help_menu(Bar),
-   
-    config_suspend(S),
-
-    PackerOpt = [{packer_x, [{fixed, 5}, {fixed, 40}, {fixed, 40},
-                             {stretch, 1}, {fixed, 5}]},
-                 {packer_y, [{fixed, 30}, {fixed, 30},
-                             {stretch, 1}, {fixed, 30}]},
-                 {x, 0}, {y, 30}],
-    Packer = gs:frame(Win, PackerOpt),
-    gs:checkbutton(suspended, Packer, [{label,{text,"Freeze"}},
-                                       {x, 10}, {y, 0},
-                                       {width, 120}, {align, w},
-                                       {select, S#state.is_suspended}]),
-    gs:checkbutton(hide_actions, Packer, [{label,{text,"Hide From=To"}},
-                                          {x, 10}, {y, 20},
-                                          {width, 120}, {align, w},
-                                          {select, S#state.hide_actions}]),
-    gs:checkbutton(hide_unknown, Packer, [{label,{text,"Hide Unknown"}},
-                                          {x, 10}, {y, 40},
-                                          {width, 120}, {align, w},
-                                          {select, S#state.hide_unknown}]),
-    gs:scale(Packer, [{text,"Detail Level"},
-                      {range, {?detail_level_min, ?detail_level_max}},
-                      {orient, horizontal},
-                      {x, 150}, {y, 0}, {height, 65}, {width, 200},
-                      {pos, S#state.detail_level}, {data, detail_level}]),
-    CanvasW = calc_canvas_width(S),
-    CanvasH = calc_canvas_height(S),
-    CanOpt = [{pack_xy, {{2, 4}, 3}}, {vscroll, right}, {hscroll, bottom},
-              {scrollregion, {2, 2, CanvasW, CanvasH}}],
-    Canvas = gs:canvas(Packer, CanOpt),
-    gs:config(Canvas, [{buttonpress, true}, {buttonrelease, true}]),
-    gs:config(Packer, [{width, S#state.width}, {height, S#state.height}]),
-    gs:config(Win, [{map, true}, {keypress, true}]),
-    S2 = S#state{title = Title,
-                 win = Win, font = Font, packer = Packer,
-                 canvas_width = CanvasW, canvas_height = CanvasH,
-                 canvas = Canvas,
-                 y_pos = ?initial_y * S#state.scale},
-    draw_all_actors(S2).
-
-select_font(Scale) when is_integer(Scale) ->
-    case Scale of
-        1 -> {courier,  7};
-        2 -> {courier, 10};
-        3 -> {courier, 12};
-        4 -> {courier, 14};
-        S -> {courier, S * 4}
-    end.
-
-create_file_menu(Bar) ->
-    Button = gs:menubutton(Bar,  [{label, {text, "File"}}]),
-    Menu   = gs:menu(Button, []),
-    gs:menuitem(close_all, Menu,        [{label, {text, "Close Collector and all Viewers         (C) "}}]),
-    gs:menuitem(close_all_others, Menu, [{label, {text, "Close other Viewers, but keep Collector (c)"}}]),
-    gs:menuitem(close, Menu,            [{label, {text, "Close this  Viewer,  but keep Collector"}}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-
-    gs:menuitem(clear_all, Menu, [{label, {text, "Clear Collector"}}]),
-    gs:menuitem(load_all, Menu,  [{label, {text, "Load  Collector from the file \"et_viewer.log\""}}]),
-    gs:menuitem(save_all, Menu,  [{label, {text, "Save  Collector to   the file \"et_viewer.log\""}}]).
-
-create_viewer_menu(Bar) ->
-    Button = gs:menubutton(Bar,  [{label, {text, "Viewer"}}]),
-    Menu   = gs:menu(Button, []),
-    gs:menuitem(Menu, [{label, {text, "Scroll this Viewer"}}, {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    gs:menuitem(first, Menu,   [{label, {text, "First                     (f)"}}]),
-    gs:menuitem(prev, Menu,    [{label, {text, "Prev                      (p)"}}]),
-    gs:menuitem(next, Menu,    [{label, {text, "Next                      (n)"}}]),
-    gs:menuitem(last, Menu,    [{label, {text, "Last                      (l)"}}]),
-    gs:menuitem(refresh, Menu, [{label, {text, "Refresh                   (r)"}}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),                  
-    gs:menuitem(up,   Menu,    [{label, {text, "Up   5                    (Up)"}}]),
-    gs:menuitem(down, Menu,    [{label, {text, "Down 5                    (Down)"}}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    gs:menuitem(Menu, [{label, {text, "Search in this Viewer"}}, {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    gs:menuitem({mode, all}, Menu,    [{label, {text, "Abort search. Display all (a)"}}]).
-
-create_collector_menu(Bar) ->
-    Button = gs:menubutton(Bar,  [{label, {text, "Collector"}}]),
-    Menu = gs:menu(Button, []),
-    gs:menuitem(Menu, [{label, {text, "Scroll all Viewers"}}, {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    gs:menuitem(first_all, Menu,   [{label, {text, "First   (F)"}}]),
-    gs:menuitem(prev_all, Menu,    [{label, {text, "Prev    (P)"}}]),
-    gs:menuitem(next_all, Menu,    [{label, {text, "Next    (N)"}}]),
-    gs:menuitem(last_all, Menu,    [{label, {text, "Last    (L)"}}]),
-    gs:menuitem(refresh_all, Menu, [{label, {text, "Refresh (R)"}}]).
-
-create_filter_menu(ActiveFilterName, Filters) ->
-    Menu = gs:menu(filter_menu, filter_button, []),
-    Item = fun(F, N) when F#filter.name =:= collector ->
-                   Label = lists:concat([pad_string(F#filter.name, 20), "(0)"]),
-                   gs:menuitem(Menu, [{label, {text, Label}}, {data, F}]),
-                   N + 1;
-              (F, N) ->
-                   Label = lists:concat([pad_string(F#filter.name, 20), "(", N, ")"]),
-                   gs:menuitem(Menu, [{label, {text, Label}}, {data, F}]),
-                   N + 1
-           end,
-    gs:menuitem(Menu, [{label, {text, "Same Filter New Scale"}}, {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    {value, Filter} = lists:keysearch(ActiveFilterName, #filter.name, Filters),
-    Same    = lists:concat([pad_string(ActiveFilterName, 20), "(=)"]),
-    Larger  = lists:concat([pad_string(ActiveFilterName, 20), "(+)"]),
-    Smaller = lists:concat([pad_string(ActiveFilterName, 20), "(-)"]),
-    gs:menuitem(Menu, [{label, {text, Same}}, {data, Filter}]),
-    gs:menuitem(Menu, [{label, {text, Smaller}}, {data, Filter}]),
-    gs:menuitem(Menu, [{label, {text, Larger}}, {data, Filter}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    gs:menuitem(Menu, [{label, {text, "New Filter Same Scale"}}, {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    lists:foldl(Item, 1, Filters).
-
-create_help_menu(Bar) ->
-    Button = gs:menubutton(Bar,  [{label, {text, "Help"}}]),
-    Menu = gs:menu(Button, []),
-    gs:menuitem(Menu, [{label, {text, "Display details of an event"}},
-                       {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{label, {text, "    Single click on the name tag or the arrow (Mouse-1)"}},
-                       {enable,false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    gs:menuitem(Menu, [{label, {text, "Toggle actor search"}},
-                       {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{label, {text, "    Single click on the name tag (Mouse-1)"}},
-                       {enable,false}]),
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    gs:menuitem(Menu, [{label, {text, "Move actor"}},
-                       {bg, lightblue}, {enable,false}]),
-    gs:menuitem(Menu, [{label, {text, "    se drag and drop on name tag (Mouse-1)"}},
-                       {enable,false}]).
-
-clear_canvas(S) ->
-    gs:destroy(S#state.canvas),
-    CanvasW = calc_canvas_width(S),
-    CanvasH = calc_canvas_height(S),
-    CanOpt = [{pack_xy, {{2, 4}, 3}}, {vscroll, right}, {hscroll, bottom},
-              {scrollregion, {2, 2, CanvasW, CanvasH}}],
-    Canvas = gs:canvas(S#state.packer, CanOpt),
-    gs:config(S#state.packer, [{width, S#state.width}, {height, S#state.height}]), 
-    gs:config(Canvas, [{buttonpress, true}, {buttonrelease, true}]),
-    S2 = S#state{refresh_needed = false,
-                 y_pos          = ?initial_y * S#state.scale,
-                 canvas         = Canvas,
-                 canvas_width   = CanvasW, 
-                 canvas_height  = CanvasH,
-                 events         = queue_new()},
-    draw_all_actors(S2).
-
-calc_canvas_width(S) ->
-    Min = calc_min_actors(S),
-    CanvasW = ((2 * ?initial_x) + (Min * ?incr_x)) * S#state.scale,
-    lists:max([CanvasW, S#state.width - (15 * S#state.scale), S#state.canvas_width]).
-
-calc_canvas_height(S) ->
-    Min = calc_min_events(S),
-    CanvasH = ((2 * ?initial_y) + (Min * ?incr_y)) * S#state.scale,
-    lists:max([CanvasH, S#state.height - (4 * 30), S#state.canvas_height]).
-
-calc_min_actors(S) ->
-    Max = S#state.max_actors,
-    N   = length(S#state.actors),
-    if
-        Max =:= infinity ->
-            N * 2;
-        Max < N ->
-            N;
-        true ->
-            Max
-    end.
-    
-calc_min_events(S) ->
-    Max = S#state.max_events,
-    N   = queue_length(S#state.events),
-    if
-        Max =:= infinity ->
-            N * 2;
-        Max < N ->
-            N;
-        true ->
-            Max
-    end.
-
-display_more_events(Try, S) ->
-    Name = S#state.active_filter,
-    {value, F} = lists:keysearch(Name, #filter.name, S#state.filters),
-    FilterFun = F#filter.function,
-    Fun = fun(Event, State) ->
-              case catch FilterFun(Event) of
-                  true ->
-                      State2 = ensure_key(Event, State),
-                      opt_display_event(Event, State2);
-                  {true, Event2} -> 
-                      State2 = ensure_key(Event2, State),
-                      opt_display_event(Event2, State2);
-                  false ->
-                      ensure_key(Event, State);
-                  Bad ->
-                      Contents = {bad_filter, Name, Bad, Event},
-                      Event2 = Event#event{contents = Contents,
-                                           from     = bad_filter,
-                                           to       = bad_filter},
-                      State2 = ensure_key(Event2, State),
-                      opt_display_event(Event2, State2)
-              end
-          end,
-    Pid = S#state.collector_pid,
-    S2 = et_collector:iterate(Pid, S#state.last_event, Try, Fun, S),
-    case queue_length(S2#state.events) - queue_length(S#state.events) of
-        Diff when Diff =:= Try ->
-            %% Got as much as requested, look for more
-            %% io:format("Done: ~p~n", [{Try, Diff}]),
-            {noreply, S2, 0};
-        _Diff when S2#state.first_event =:= S#state.first_event,
-                  S2#state.last_event  =:= S#state.last_event ->
-            %% Got lesser than requested, wait a while before looking for more
-            %% io:format("More: ~p~n", [{Try, Diff}]),
-            {noreply, S2, 500};
-        _Diff ->
-            %% Got lesser than requested, look for more
-            %% io:format("More2: ~p~n", [{Try, Diff}]),
-            {noreply, S2, 0}
-    end.
-
-ensure_key(E, S) when is_record(E, event), is_record(S, state)  ->
-    Key  = et_collector:make_key(S#state.event_order, E),
-    case S#state.first_event of
-             first ->
-                 S#state{first_event = Key, last_event = Key};
-             last ->
-                 S#state{first_event = Key, last_event = Key};
-             _     -> 
-                 S#state{last_event = Key}
-    end.
-
-opt_display_event(E, S) ->
-    case S#state.display_mode of
-        all ->
-            display_event(E, S);
-        {search_actors, _Dir, _FirstKey, Actors} ->
-            %% Key = S#state.last_event,
-            From = select_actor_name(E#event.from, S),
-            case lists:member(From, Actors) of
-                true ->
-                    display_event(E, S);
-                false ->
-                    To = select_actor_name(E#event.to, S),
-                    case lists:member(To, Actors) of
-                        true ->
-                            display_event(E, S);
-                        false ->
-                            S
-                    end
-            end
-    end.
-
-select_actor_name(Name, S) ->
-    case lists:keymember(Name, #actor.name, S#state.actors) of
-        true  ->  Name;
-        false ->  ?unknown
-    end.
-
-display_event(E, S) when E#event.detail_level < S#state.detail_level ->
-    {FromRefresh, From} = ensure_actor(E#event.from, S),
-    {FromName, FromPos, S2} = From,
-    {ToRefresh, To} = ensure_actor(E#event.to, S2),
-    {ToName, ToPos, S3} = To,
-    if
-        FromRefresh =/= false, ToRefresh =/= false ->
-            Key = S#state.last_event,
-            refresh_beep(S),
-            S3#state{refresh_needed = true,
-                     events = queue_in(Key, S3#state.events)};
-        FromName =:= ToName ->
-            case S#state.hide_actions of
-                true  -> 
-                    S3;
-                false -> 
-                    Label = name_to_string(E#event.label),
-                    draw_named_arrow(Label, FromName, FromPos, ToName, ToPos, S3)
-            end;
-        true ->
-            Label = name_to_string(E#event.label),
-            draw_named_arrow(Label, FromName, FromPos, ToName, ToPos, S3)
-    end;
-display_event(_, S) ->
-    S.
-
-draw_named_arrow(Label, FromName, FromPos, ToName, ToPos, S) ->
-    Key = S#state.last_event,
-    case S#state.y_pos + (?incr_y *  S#state.scale) of
-        _ when S#state.hide_unknown =:= true, FromName =:= ?unknown ->
-            S;
-        _ when S#state.hide_unknown =:= true, ToName =:= ?unknown ->
-            S;
-        Y when  Y > S#state.canvas_height ->
-            refresh_beep(S),
-            S#state{refresh_needed = true,
-                    events = queue_in(Key, S#state.events)};
-        Y ->
-            S2 = S#state{y_pos  = Y, events = queue_in(Key, S#state.events)},
-            S3 = draw_arrow(FromPos, ToPos, S2),
-            draw_label(Label, FromName, ToName, FromPos, ToPos, S3)
-    end.
-
-refresh_beep(S) ->
-    case S#state.refresh_needed of
-        false  -> 
-            gs:config(S#state.canvas, beep),
-            gs:config(S#state.canvas, beep),
-            gs:config(S#state.canvas, beep);
-        true -> 
-            ignore
-    end.
-
-draw_arrow(Pos, Pos, S) ->
-    S;
-draw_arrow(FromPos, ToPos, S) ->
-    Y = S#state.y_pos,
-    CanOpts = [{coords, [{FromPos , Y}, {ToPos, Y}]},
-               {arrow, last},{width, 1}, {fg, black}],
-    gs:line(S#state.canvas, CanOpts),
-    S.
-
-draw_label(Label, FromName, ToName, FromPos, ToPos, S) ->
-    Colour =
-        if
-            FromName =:= ?unknown, 
-            ToName   =:= ?unknown -> blue; %turquoise;
-            FromName =:= ?unknown -> orange;
-            ToName   =:= ?unknown -> orange;
-            FromPos  =:= ToPos    -> blue;
-            true                  -> red
-        end,
-    Scale = S#state.scale,
-    X = lists:min([FromPos, ToPos]) + (6 * Scale),
-    Y = S#state.y_pos,
-    write_text(Label, X, Y, Colour, S),
-    S.
-
-draw_all_actors(State) ->
-    Scale = State#state.scale,
-    Fun = fun(A, X) ->
-                  draw_actor(A, X, State),
-                  X + (?incr_x * Scale)
-          end,
-    lists:foldl(Fun, ?initial_x * Scale, State#state.actors),
-    State.
-
-%% Returns: {NeedsRefreshBool, {ActorPos, NewsS, NewActors}}
-ensure_actor(Name, S) ->
-    do_ensure_actor(Name, S, S#state.actors, 0).
-
-do_ensure_actor(Name, S, [H | _], N) when H#actor.name =:= Name ->
-    Pos = (?initial_x + (N * ?incr_x)) * S#state.scale,
-    {false, {Name, Pos, S}};
-do_ensure_actor(Name, S, [_ | T], N) ->
-    do_ensure_actor(Name, S, T, N + 1);
-do_ensure_actor(Name, S, [], N) ->
-    %% A brand new actor, let's see if it does fit
-    Pos = (?initial_x + (N * ?incr_x)) * S#state.scale,
-    MaxActors = S#state.max_actors,
-    if
-        is_integer(MaxActors), N > MaxActors ->
-            %% Failed on max_actors limit, put into unknown
-            %% Assume that unknown always is in actor list
-            ensure_actor(?unknown, S);
-        Pos > (S#state.canvas_width - ((?initial_x - 15) * S#state.scale)) ->
-            %% New actor does not fit in canvas, refresh needed
-            A = create_actor(Name),
-            draw_actor(A, Pos, S),
-            {true, {Name, Pos, S#state{actors = S#state.actors ++ [A]}}};
-        true ->
-            %% New actor fits in canvas. Draw the new actor.
-            A = create_actor(Name),
-            draw_actor(A, Pos, S),
-            {false, {Name, Pos, S#state{actors = S#state.actors ++ [A]}}}
-    end.
-
-draw_actor(A, LineX, S) ->
-    Scale    = S#state.scale,
-    TextX    = LineX - (5 * Scale),
-    TextY    = ?initial_y * Scale,
-    LineTopY = TextY + ((?incr_y  / 2) * Scale),
-    LineBotY = S#state.canvas_height - ((?incr_y / 2) * Scale),
-    Colour   = case A#actor.name of
-                   ?unknown -> orange;
-                   _        -> red
-               end,
-    write_text(A#actor.string, TextX, TextY, Colour, S),
-    LineOpt = [{coords, [{LineX, LineTopY}, {LineX, LineBotY}]},
-               {width, 1}, {fg, Colour}],
-    gs:line(S#state.canvas, LineOpt).
-
-toggle_search_for_actor(ActorName,S) ->    
-    case S#state.display_mode of
-        all ->
-            io:format("~p: search for: ~p ++ ~p~n", [?MODULE, [], [ActorName]]),
-            %% Search for this actor
-            Key = S#state.first_event,
-            Actors = [ActorName],
-            Mode = {search_actors, forward, Key, Actors},
-            change_display_mode(Mode, S);
-        {search_actors, Dir, Key, Actors}->
-            Actors2 = 
-                case lists:member(ActorName, Actors) of
-                    true ->
-                        io:format("~p: search for: ~p -- ~p~n", [?MODULE, Actors, [ActorName]]),
-                        %% Remove actor from search list
-                        Actors -- [ActorName];
-                    false ->
-                        io:format("~p: search for: ~p ++ ~p~n", [?MODULE, Actors, [ActorName]]),
-                        %% Add actor from search list
-                        [ActorName | Actors]
-                end,
-            Mode2 = {search_actors, Dir, Key, Actors2},
-            change_display_mode(Mode2, S)
-    end.
-
-move_actor(From, To, Actors, S) ->
-    Pos      = #actor.name,
-    ToName   = To#actor.name,
-    FromName = From#actor.name,
-    ToIx     = actor_index(ToName, Pos, Actors),
-    FromIx   = actor_index(FromName, Pos, Actors),
-    if
-        FromIx =/= 0, ToIx =/= 0, ToIx > FromIx ->
-            Actors2 = lists:keydelete(FromName, Pos, Actors),
-            Actors3 = insert_actor_after(From, To, Actors2),
-            S2 = S#state{actors = Actors3},
-            refresh_main_window(S2);
-        FromIx =/= 0, ToIx =/= 0 ->
-            Actors2 = lists:keydelete(FromName, Pos, Actors),
-            Actors3 = insert_actor_before(From, To, Actors2),
-            S2 = S#state{actors = Actors3},
-            refresh_main_window(S2);
-        true ->
-            %% Ignore
-            S
-    end.
-
-insert_actor_after(From, To, [H | T]) ->
-    case To#actor.name =:= H#actor.name of
-        true  -> [H, From | T];
-        false -> [H | insert_actor_after(From, To, T)]
-    end;
-insert_actor_after(_From, _To, []) ->
-    [].
-
-insert_actor_before(From, To, [H | T]) ->
-    case To#actor.name =:= H#actor.name of
-        true  -> [From, H | T];
-        false -> [H | insert_actor_before(From, To, T)]
-    end;
-insert_actor_before(_From, _To, []) ->
-    [].
-
-actor_index(_Key, _Pos, []) ->
-    0;
-actor_index(Key, Pos, [H | T]) ->
-    case Key =:= element(Pos, H) of
-        false -> actor_index(Key, Pos, T) + 1;
-        true  -> 1
-    end.
-
-y_to_n(Y, S) ->
-    Y2   = ((Y / S#state.scale) - ?initial_y + (?incr_y / 2)),
-    N    = round(Y2 / ?incr_y - 0.2),
-    MaxN = queue_length(S#state.events),
-    if
-        N =< 0   -> actor;
-        N > MaxN -> actor;
-        true     -> {event, N}
-    end.
-
-x_to_n(X, S) ->
-    Scale   = S#state.scale,
-    Len = length(S#state.actors),
-    X2 = X - (?initial_x * Scale),
-    N  = X2 / (?incr_x * Scale),
-    N2 = trunc(N + 1.5),
-    if
-        N2 > Len -> Len;
-        N2 < 1   -> 1;
-        true     -> N2
-    end.
-
-write_text(Text, X, Y, Colour, S) ->
-    Opt = [{coords, [{X, Y - (?incr_y * S#state.scale / 2)}]},
-           {font, S#state.font}, {fg, Colour}, {text, Text}],
-    gs:text(S#state.canvas, Opt).
-
-create_contents_window(Event, S) ->
-    Options = [{viewer_pid, self()},
-               {event, Event},
-               {event_order, S#state.event_order},
-               {active_filter, S#state.active_filter}
-               | S#state.filters],
-    case et_gs_contents_viewer:start_link(Options) of
-        {ok, _Pid} ->
-            S;
-        {error, Reason} ->
-            ok = error_logger:format("~p(~p): create_contents_window(~p) ->~n     ~p~n",
-                                     [?MODULE, self(), Options, Reason]),
-            S
-    end.
-
-%%%----------------------------------------------------------------------
-%%% String padding of actors
-%%%----------------------------------------------------------------------
-
-create_actor(Name) ->
-    String = name_to_string(Name),
-    PaddedString = pad_string(String, 8),
-    #actor{name = Name, string = PaddedString}.
-
-name_to_string(Name) ->
-    case catch io_lib:format("~s", [Name]) of
-        {'EXIT', _} -> lists:flatten(io_lib:format("~w", [Name]));
-        GoodString  -> lists:flatten(GoodString)
-    end.
-
-pad_string(Atom, MinLen) when is_atom(Atom) ->
-    pad_string(atom_to_list(Atom), MinLen);
-pad_string(String, MinLen) when is_integer(MinLen), MinLen >= 0 ->
-    Len = length(String),
-    case Len >= MinLen of
-        true ->
-            String;
-        false ->
-            String ++ lists:duplicate(MinLen - Len, $ )
-    end.
-
-%%%----------------------------------------------------------------------
-%%% Queue management
-%%%----------------------------------------------------------------------
-
-queue_new() ->
-    {0, [], []}.
-
-queue_in(X, {Size, In, Out}) ->
-    {Size + 1, [X | In], Out}.
-
-%% queue_out(Q) ->
-%%     case Q of
-%%         {Size, In, [H | Out]} -> {{value, H}, {Size - 1, In, Out}};
-%%         {Size, [], []}        -> {empty, {Size, [], []}};
-%%         {Size, In, _}         -> queue_out({Size, [], lists:reverse(In)})
-%%     end.
-
-queue_to_list({_Size, [], Out}) ->
-    Out;
-queue_to_list({_Size, In, Out}) ->
-    Out ++ lists:reverse(In).
-
-queue_length({Size, _In, _Out}) ->
-    Size.
-
-list_to_queue(List) when is_list(List) ->
-    {length(List), [], List}.
diff --git a/lib/et/src/et_viewer.erl b/lib/et/src/et_viewer.erl
index d9bd01f8d0..ead5639da6 100644
--- a/lib/et/src/et_viewer.erl
+++ b/lib/et/src/et_viewer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
 %%
 %% The 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,7 +76,7 @@ start() ->
 %% start(Options) -> {ok, ViewerPid} | {error, Reason}
 %%----------------------------------------------------------------------
 
-start(GUI) when GUI =:= wx; GUI =:= gs; GUI =:= default ->
+start(GUI) when GUI =:= wx; GUI =:= default ->
     start_link([{trace_global, true}], GUI);
 start(Options) ->
     start_link([{parent_pid, undefined} | Options], default).
@@ -139,7 +139,7 @@ start(Options, GUI) ->
 %% and returns false | true | {true, NewEvent}.
 %%----------------------------------------------------------------------
 
-start_link(GUI) when GUI =:= wx; GUI =:= gs; GUI =:= default ->
+start_link(GUI) when GUI =:= wx; GUI =:= default ->
     start_link([{trace_global, true}], GUI);
 start_link(Options) ->
     start_link(Options, default).
@@ -148,22 +148,11 @@ start_link(Options, GUI) ->
     case GUI of
 	wx ->
 	    et_wx_viewer:start_link(Options);
-	gs ->
-	    et_gs_viewer:start_link(Options);
 	default ->
 	    start_link(Options, which_gui())
     end.
 
-
-which_gui() ->
-    try
-	wx:new(),
-	wx:destroy(),
-	wx
-    catch _:_ ->
-	    gs
-    end.
-
+which_gui() -> wx.
 
 get_collector_pid(ViewerPid) ->
     call(ViewerPid, get_collector_pid).
diff --git a/lib/et/src/modules.mk b/lib/et/src/modules.mk
index 8d6c0902fb..b2d2f0b481 100644
--- a/lib/et/src/modules.mk
+++ b/lib/et/src/modules.mk
@@ -1,7 +1,7 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2001-2010. All Rights Reserved.
+# Copyright Ericsson AB 2001-2013. All Rights Reserved.
 #
 # The 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,8 +19,6 @@
 MODULES = \
 	et \
 	et_collector \
-	et_gs_contents_viewer \
-	et_gs_viewer \
 	et_selector \
 	et_viewer \
 	et_wx_contents_viewer \
diff --git a/lib/et/test/Makefile b/lib/et/test/Makefile
index 3817079b5f..1be5aac3fd 100644
--- a/lib/et/test/Makefile
+++ b/lib/et/test/Makefile
@@ -25,6 +25,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 MODULES= \
 	ett \
+	et_SUITE \
 	et_wx_SUITE \
 	et_test_lib
 
diff --git a/lib/et/test/et_SUITE.erl b/lib/et/test/et_SUITE.erl
new file mode 100644
index 0000000000..e0bce41e15
--- /dev/null
+++ b/lib/et/test/et_SUITE.erl
@@ -0,0 +1,50 @@
+%% ``The 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.''
+%%
+-module(et_SUITE).
+
+-compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [app, appup].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+     ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+app() ->
+    [{doc, "Test that the et app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(et).
+
+appup() ->
+    [{doc, "Test that the et appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(et).
diff --git a/lib/et/vsn.mk b/lib/et/vsn.mk
index 40cdc2b298..282991aa49 100644
--- a/lib/et/vsn.mk
+++ b/lib/et/vsn.mk
@@ -1 +1 @@
-ET_VSN  = 1.4.4.4
+ET_VSN  = 1.4.4.5
diff --git a/lib/eunit/doc/overview.edoc b/lib/eunit/doc/overview.edoc
index b4af31ae6a..872a017440 100644
--- a/lib/eunit/doc/overview.edoc
+++ b/lib/eunit/doc/overview.edoc
@@ -6,9 +6,9 @@
 @title EUnit - a Lightweight Unit Testing Framework for Erlang
 
 @author Richard Carlsson <[email protected]>
-@author Micka�l R�mond <[email protected]> 
+@author Mickaël Rémond <[email protected]>
         [http://www.process-one.net/]
-@copyright 2004-2007 Micka�l R�mond, Richard Carlsson
+@copyright 2004-2007 Mickaël Rémond, Richard Carlsson
 @version {@version}, {@date} {@time}
 
 @doc EUnit is a unit testing framework for Erlang. It is very powerful
diff --git a/lib/eunit/doc/src/book.xml b/lib/eunit/doc/src/book.xml
index eb044c1a66..c9bd320d5a 100644
--- a/lib/eunit/doc/src/book.xml
+++ b/lib/eunit/doc/src/book.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,7 +24,7 @@
     </legalnotice>
 
     <title>EUnit</title>
-    <prepared>Richard Carlsson, Micka�l R�mond</prepared>
+    <prepared>Richard Carlsson, Mickaël Rémond</prepared>
     <docno></docno>
     <date>2008-10-29</date>
     <rev>2.0</rev>
diff --git a/lib/eunit/doc/src/fascicules.xml b/lib/eunit/doc/src/fascicules.xml
index bbe1e6c5cc..217228785c 100644
--- a/lib/eunit/doc/src/fascicules.xml
+++ b/lib/eunit/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index fd51b05f79..c52f12dcc8 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -32,6 +32,51 @@
   </header>
   <p>This document describes the changes made to the EUnit application.</p>
 
+<section><title>Eunit 2.2.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix I/O-protocol error handling in eunit. Thanks to Yuki
+	    Ito.</p>
+          <p>
+	    Own Id: OTP-11373</p>
+        </item>
+        <item>
+          <p>
+	    Do not attempt to detect lists of printable characters in
+	    format. Thanks to Roberto Aloi.</p>
+          <p>
+	    Own Id: OTP-11467</p>
+        </item>
+        <item>
+          <p>
+	    Fix silent make rule (Thanks to Anthony Ramine )</p>
+          <p>
+	    Own Id: OTP-11516</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Eunit 2.2.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Wrap eunit macros into begin ... end blocks. Thanks to
+	    Anthony Ramine.</p>
+          <p>
+	    Own Id: OTP-11217</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Eunit 2.2.4</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/eunit/doc/src/part.xml b/lib/eunit/doc/src/part.xml
index 84e5aec039..4ce63f7a94 100644
--- a/lib/eunit/doc/src/part.xml
+++ b/lib/eunit/doc/src/part.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/eunit/doc/src/part_notes.xml b/lib/eunit/doc/src/part_notes.xml
index 191d69b915..149a4f79f0 100644
--- a/lib/eunit/doc/src/part_notes.xml
+++ b/lib/eunit/doc/src/part_notes.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/eunit/doc/src/ref_man.xml b/lib/eunit/doc/src/ref_man.xml
index eb46ceda1e..1e59ad1c7d 100644
--- a/lib/eunit/doc/src/ref_man.xml
+++ b/lib/eunit/doc/src/ref_man.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/eunit/include/eunit.hrl b/lib/eunit/include/eunit.hrl
index 8ebdb6ba16..9e8d34567a 100644
--- a/lib/eunit/include/eunit.hrl
+++ b/lib/eunit/include/eunit.hrl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
@@ -102,7 +101,7 @@
 %% X gets a new, local binding.
 %% (Note that lowercase 'let' is a reserved word.)
 -ifndef(LET).
--define(LET(X,Y,Z), ((fun(X)->(Z)end)(Y))).
+-define(LET(X,Y,Z), begin ((fun(X)->(Z)end)(Y)) end).
 -endif.
 
 %% It is important that testing code is short and readable.
@@ -110,13 +109,13 @@
 %% Compare:  case f(X) of true->g(X); false->h(X) end
 %%     and:  ?IF(f(X), g(Y), h(Z))
 -ifndef(IF).
--define(IF(B,T,F), (case (B) of true->(T); false->(F) end)).
+-define(IF(B,T,F), begin (case (B) of true->(T); false->(F) end) end).
 -endif.
 
 %% This macro yields 'true' if the value of E matches the guarded
 %% pattern G, otherwise 'false'.
 -ifndef(MATCHES).
--define(MATCHES(G,E), (case (E) of G -> true; _ -> false end)).
+-define(MATCHES(G,E), begin (case (E) of G -> true; _ -> false end) end).
 -endif.
 
 %% This macro can be used at any time to check whether or not the code
@@ -140,6 +139,7 @@
 %% for clauses that cannot match, even if the expression is a constant.
 -undef(assert).
 -define(assert(BoolExpr),
+	begin
 	((fun () ->
 	    case (BoolExpr) of
 		true -> ok;
@@ -152,7 +152,8 @@
 						  _ -> {not_a_boolean,__V}
 					      end}]})
 	    end
-	  end)())).
+	  end)())
+	end).
 -endif.
 -define(assertNot(BoolExpr), ?assert(not (BoolExpr))).
 
@@ -168,6 +169,7 @@
 -define(assertMatch(Guard, Expr), ok).
 -else.
 -define(assertMatch(Guard, Expr),
+	begin
 	((fun () ->
 	    case (Expr) of
 		Guard -> ok;
@@ -178,7 +180,8 @@
 				      {pattern, (??Guard)},
 				      {value, __V}]})
 	    end
-	  end)())).
+	  end)())
+	end).
 -endif.
 -define(_assertMatch(Guard, Expr), ?_test(?assertMatch(Guard, Expr))).
 
@@ -187,6 +190,7 @@
 -define(assertNotMatch(Guard, Expr), ok).
 -else.
 -define(assertNotMatch(Guard, Expr),
+	begin
 	((fun () ->
 	    __V = (Expr),
 	    case __V of
@@ -198,7 +202,8 @@
 					{value, __V}]});
 		_ -> ok
 	    end
-	  end)())).
+	  end)())
+	end).
 -endif.
 -define(_assertNotMatch(Guard, Expr), ?_test(?assertNotMatch(Guard, Expr))).
 
@@ -208,6 +213,7 @@
 -define(assertEqual(Expect, Expr), ok).
 -else.
 -define(assertEqual(Expect, Expr),
+	begin
 	((fun (__X) ->
 	    case (Expr) of
 		__X -> ok;
@@ -218,7 +224,8 @@
 				      {expected, __X},
 				      {value, __V}]})
 	    end
-	  end)(Expect))).
+	  end)(Expect))
+	end).
 -endif.
 -define(_assertEqual(Expect, Expr), ?_test(?assertEqual(Expect, Expr))).
 
@@ -227,6 +234,7 @@
 -define(assertNotEqual(Unexpected, Expr), ok).
 -else.
 -define(assertNotEqual(Unexpected, Expr),
+	begin
 	((fun (__X) ->
 	    case (Expr) of
 		__X -> erlang:error({assertNotEqual_failed,
@@ -236,7 +244,8 @@
 				      {value, __X}]});
 		_ -> ok
 	    end
-	  end)(Unexpected))).
+	  end)(Unexpected))
+	end).
 -endif.
 -define(_assertNotEqual(Unexpected, Expr),
 	?_test(?assertNotEqual(Unexpected, Expr))).
@@ -247,6 +256,7 @@
 -define(assertException(Class, Term, Expr), ok).
 -else.
 -define(assertException(Class, Term, Expr),
+	begin
 	((fun () ->
 	    try (Expr) of
 	        __V -> erlang:error({assertException_failed,
@@ -271,7 +281,8 @@
 				    {__C, __T,
 				     erlang:get_stacktrace()}}]})
 	    end
-	  end)())).
+	  end)())
+	end).
 -endif.
 
 -define(assertError(Term, Expr), ?assertException(error, Term, Expr)).
@@ -291,6 +302,7 @@
 -define(assertNotException(Class, Term, Expr), ok).
 -else.
 -define(assertNotException(Class, Term, Expr),
+	begin
 	((fun () ->
 	    try (Expr) of
 	        _ -> ok
@@ -316,7 +328,8 @@
 			_ -> ok
 		    end
 	    end
-	  end)())).
+	  end)())
+	end).
 -endif.
 -define(_assertNotException(Class, Term, Expr),
 	?_test(?assertNotException(Class, Term, Expr))).
@@ -327,6 +340,7 @@
 %% these can be used for simply running commands in a controlled way
 -define(_cmd_(Cmd), (eunit_lib:command(Cmd))).
 -define(cmdStatus(N, Cmd),
+	begin
 	((fun () ->
 	    case ?_cmd_(Cmd) of
 		{(N), __Out} -> __Out;
@@ -337,7 +351,8 @@
 					   {expected_status,(N)},
 					   {status,__N}]})
 	    end
-	  end)())).
+	  end)())
+	end).
 -define(_cmdStatus(N, Cmd), ?_test(?cmdStatus(N, Cmd))).
 -define(cmd(Cmd), ?cmdStatus(0, Cmd)).
 -define(_cmd(Cmd), ?_test(?cmd(Cmd))).
@@ -348,6 +363,7 @@
 -define(assertCmdStatus(N, Cmd), ok).
 -else.
 -define(assertCmdStatus(N, Cmd),
+	begin
  	((fun () ->
 	    case ?_cmd_(Cmd) of
 		{(N), _} -> ok;
@@ -358,7 +374,8 @@
 					   {expected_status,(N)},
 					   {status,__N}]})
 	    end
-	  end)())).
+	  end)())
+	 end).
 -endif.
 -define(assertCmd(Cmd), ?assertCmdStatus(0, Cmd)).
 
@@ -366,6 +383,7 @@
 -define(assertCmdOutput(T, Cmd), ok).
 -else.
 -define(assertCmdOutput(T, Cmd),
+	begin
  	((fun () ->
 	    case ?_cmd_(Cmd) of
 		{_, (T)} -> ok;
@@ -376,7 +394,8 @@
 					   {expected_output,(T)},
 					   {output,__T}]})
 	    end
-	  end)())).
+	  end)())
+	end).
 -endif.
 
 -define(_assertCmdStatus(N, Cmd), ?_test(?assertCmdStatus(N, Cmd))).
@@ -394,26 +413,30 @@
 -define(debugTime(S, E), (E)).
 -else.
 -define(debugMsg(S),
-	(begin
-	     io:fwrite(user, <<"~s:~w:~w: ~s\n">>,
-		       [?FILE, ?LINE, self(), S]),
-	     ok
-	 end)).
+	begin
+	    io:fwrite(user, <<"~s:~w:~w: ~s\n">>,
+		      [?FILE, ?LINE, self(), S]),
+	    ok
+	end).
 -define(debugHere, (?debugMsg("<-"))).
 -define(debugFmt(S, As), (?debugMsg(io_lib:format((S), (As))))).
 -define(debugVal(E),
+	begin
 	((fun (__V) ->
 		  ?debugFmt(<<"~s = ~P">>, [(??E), __V, 15]),
 		  __V
-	  end)(E))).
+	  end)(E))
+	end).
 -define(debugTime(S, E),
+	begin
 	((fun () ->
 		  {__T0, _} = statistics(wall_clock),
 		  __V = (E),
 		  {__T1, _} = statistics(wall_clock),
 		  ?debugFmt(<<"~s: ~.3f s">>, [(S), (__T1-__T0)/1000]),
 		  __V
-	  end)())).
+	  end)())
+	end).
 -endif.
 
 
diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
index e88e28df83..e6dab67363 100644
--- a/lib/eunit/src/Makefile
+++ b/lib/eunit/src/Makefile
@@ -95,7 +95,7 @@ info:
 realclean: clean
 
 $(EBIN)/%.$(EMULATOR):%.erl
-	erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+	$(erlc_verbose)erlc -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 $(OBJECTS): $(PARSE_TRANSFORM_BIN)
 
diff --git a/lib/eunit/src/eunit.app.src b/lib/eunit/src/eunit.app.src
index 431abac98b..5e16dfa2ce 100644
--- a/lib/eunit/src/eunit.app.src
+++ b/lib/eunit/src/eunit.app.src
@@ -14,6 +14,7 @@
 	     eunit_striptests,
 	     eunit_surefire,
 	     eunit_test,
+	     eunit_tests,
 	     eunit_tty]},
   {registered,[]},
   {applications, [kernel,stdlib]},
diff --git a/lib/eunit/src/eunit.appup.src b/lib/eunit/src/eunit.appup.src
index 54a63833e6..18934d44c2 100644
--- a/lib/eunit/src/eunit.appup.src
+++ b/lib/eunit/src/eunit.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, eunit}]}],
+ [{<<".*">>,[{restart_application, eunit}]}]
+}.
diff --git a/lib/eunit/src/eunit.erl b/lib/eunit/src/eunit.erl
index 5763949519..9c589dfa86 100644
--- a/lib/eunit/src/eunit.erl
+++ b/lib/eunit/src/eunit.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index 809cb7ab7b..40bae93298 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
diff --git a/lib/eunit/src/eunit_proc.erl b/lib/eunit/src/eunit_proc.erl
index ec7d93fd48..03d1a18321 100644
--- a/lib/eunit/src/eunit_proc.erl
+++ b/lib/eunit/src/eunit_proc.erl
@@ -643,11 +643,11 @@ io_request({get_until, _Prompt, _M, _F, _As}, Buf) ->
 io_request({setopts, _Opts}, Buf) ->
     {ok, Buf};
 io_request(getopts, Buf) ->
-    {error, {error, enotsup}, Buf};
+    {{error, enotsup}, Buf};
 io_request({get_geometry,columns}, Buf) ->
-    {error, {error, enotsup}, Buf};
+    {{error, enotsup}, Buf};
 io_request({get_geometry,rows}, Buf) ->
-    {error, {error, enotsup}, Buf};
+    {{error, enotsup}, Buf};
 io_request({requests, Reqs}, Buf) ->
     io_requests(Reqs, {ok, Buf});
 io_request(_, Buf) ->
@@ -657,3 +657,10 @@ io_requests([R | Rs], {ok, Buf}) ->
     io_requests(Rs, io_request(R, Buf));
 io_requests(_, Result) ->
     Result.
+
+-ifdef(TEST).
+io_error_test_() ->
+    [?_assertMatch({error, enotsup}, io:getopts()),
+     ?_assertMatch({error, enotsup}, io:columns()),
+     ?_assertMatch({error, enotsup}, io:rows())].
+-endif.
diff --git a/lib/eunit/src/eunit_serial.erl b/lib/eunit/src/eunit_serial.erl
index 80e79116e3..1a0179a5df 100644
--- a/lib/eunit/src/eunit_serial.erl
+++ b/lib/eunit/src/eunit_serial.erl
@@ -56,9 +56,9 @@
 %% future use, and/or cancel the current item and possibly one or more
 %% of its parent groups.
 
--record(state, {listeners			 :: set(),
-		cancelled = eunit_lib:trie_new() :: gb_tree(),
-		messages  = dict:new()		 :: dict()}).
+-record(state, {listeners			 :: sets:set(),
+		cancelled = eunit_lib:trie_new() :: gb_trees:tree(),
+		messages  = dict:new()		 :: dict:dict()}).
 
 start(Pids) ->
     spawn(fun () -> serializer(Pids) end).
diff --git a/lib/eunit/src/eunit_surefire.erl b/lib/eunit/src/eunit_surefire.erl
index cc021625d5..2d1f0b1497 100644
--- a/lib/eunit/src/eunit_surefire.erl
+++ b/lib/eunit/src/eunit_surefire.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% This library is free software; you can redistribute it and/or modify
 %% it under the terms of the GNU Lesser General Public License as
 %% published by the Free Software Foundation; either version 2 of the
@@ -174,7 +173,7 @@ handle_cancel(group, Data, St) ->
                        setup_failed -> "fixture setup ";
                        cleanup_failed -> "fixture cleanup "
                    end
-                ++ io_lib:format("~p", [proplists:get_value(id, Data)]),
+                ++ io_lib:format("~w", [proplists:get_value(id, Data)]),
             Desc = format_desc(proplists:get_value(desc, Data)),
             TestCase = #testcase{
               name = Name, description = Desc,
diff --git a/lib/eunit/test/eunit_SUITE.erl b/lib/eunit/test/eunit_SUITE.erl
index 47c2435d63..d13dc73923 100644
--- a/lib/eunit/test/eunit_SUITE.erl
+++ b/lib/eunit/test/eunit_SUITE.erl
@@ -19,14 +19,15 @@
 -module(eunit_SUITE).
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
-	 init_per_group/2,end_per_group/2,eunit_test/1]).
+	 init_per_group/2,end_per_group/2,
+	 app_test/1,appup_test/1,eunit_test/1]).
 	 
 -include_lib("common_test/include/ct.hrl").
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [eunit_test].
+    [app_test, appup_test, eunit_test].
 
 groups() -> 
     [].
@@ -43,6 +44,11 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+app_test(Config) when is_list(Config) ->
+    ok = ?t:app_test(eunit).
+
+appup_test(Config) when is_list(Config) ->
+    ok = ?t:appup_test(eunit).
 
 eunit_test(Config) when is_list(Config) ->
     ok = file:set_cwd(code:lib_dir(eunit)),
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 798196f8cf..8f816b3b94 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.2.4
+EUNIT_VSN = 2.2.6
diff --git a/lib/gs/contribs/mandel/mandel.erl b/lib/gs/contribs/mandel/mandel.erl
index a7a786ce98..a4feaa87ec 100644
--- a/lib/gs/contribs/mandel/mandel.erl
+++ b/lib/gs/contribs/mandel/mandel.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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/gs/doc/src/book.xml b/lib/gs/doc/src/book.xml
index 89f356d131..dbc869751a 100644
--- a/lib/gs/doc/src/book.xml
+++ b/lib/gs/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/fascicules.xml b/lib/gs/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/gs/doc/src/fascicules.xml
+++ b/lib/gs/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/gs/doc/src/gs.xml b/lib/gs/doc/src/gs.xml
index 417163e963..7b589d002d 100644
--- a/lib/gs/doc/src/gs.xml
+++ b/lib/gs/doc/src/gs.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2012</year>
+      <year>2014</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -39,7 +39,7 @@
 	graphical user interface.
       </p>
       <p>
-	GS is deprecated and will be removed in the R16 release.
+	GS is deprecated and will be removed in the 18.0 release.
       </p>
     </warning>
     <p>The Graphics System, GS, is easy to learn and
diff --git a/lib/gs/doc/src/gs_chapter1.xml b/lib/gs/doc/src/gs_chapter1.xml
index 912d6e1ef9..71f213b34d 100644
--- a/lib/gs/doc/src/gs_chapter1.xml
+++ b/lib/gs/doc/src/gs_chapter1.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/gs_chapter2.xmlsrc b/lib/gs/doc/src/gs_chapter2.xmlsrc
index 9a8ffce35b..d37065d954 100644
--- a/lib/gs/doc/src/gs_chapter2.xmlsrc
+++ b/lib/gs/doc/src/gs_chapter2.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/gs_chapter3.xml b/lib/gs/doc/src/gs_chapter3.xml
index 66b1b975a8..a124354e7d 100644
--- a/lib/gs/doc/src/gs_chapter3.xml
+++ b/lib/gs/doc/src/gs_chapter3.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/gs_chapter4.xmlsrc b/lib/gs/doc/src/gs_chapter4.xmlsrc
index 011b23f547..9747382655 100644
--- a/lib/gs/doc/src/gs_chapter4.xmlsrc
+++ b/lib/gs/doc/src/gs_chapter4.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/gs_chapter5.xmlsrc b/lib/gs/doc/src/gs_chapter5.xmlsrc
index fb60272598..f2ccedae2d 100644
--- a/lib/gs/doc/src/gs_chapter5.xmlsrc
+++ b/lib/gs/doc/src/gs_chapter5.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/gs_chapter6.xmlsrc b/lib/gs/doc/src/gs_chapter6.xmlsrc
index 9fd9fdc414..807d82589d 100644
--- a/lib/gs/doc/src/gs_chapter6.xmlsrc
+++ b/lib/gs/doc/src/gs_chapter6.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/gs_chapter7.xmlsrc b/lib/gs/doc/src/gs_chapter7.xmlsrc
index d6af68f8b0..63ee4c472c 100644
--- a/lib/gs/doc/src/gs_chapter7.xmlsrc
+++ b/lib/gs/doc/src/gs_chapter7.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/gs_chapter8.xmlsrc b/lib/gs/doc/src/gs_chapter8.xmlsrc
index 3cffd5bb32..db69395102 100644
--- a/lib/gs/doc/src/gs_chapter8.xmlsrc
+++ b/lib/gs/doc/src/gs_chapter8.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/notes.xml b/lib/gs/doc/src/notes.xml
index f778c010e9..f5117cb9ba 100644
--- a/lib/gs/doc/src/notes.xml
+++ b/lib/gs/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/gs/doc/src/part.xml b/lib/gs/doc/src/part.xml
index 5e28723665..ac8e40ecde 100644
--- a/lib/gs/doc/src/part.xml
+++ b/lib/gs/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/part_notes.xml b/lib/gs/doc/src/part_notes.xml
index e0cf7fef0b..23ef749bff 100644
--- a/lib/gs/doc/src/part_notes.xml
+++ b/lib/gs/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/doc/src/ref_man.xml b/lib/gs/doc/src/ref_man.xml
index 9e111f0c5b..b57ad7db3b 100644
--- a/lib/gs/doc/src/ref_man.xml
+++ b/lib/gs/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/gs/src/gs.appup.src b/lib/gs/src/gs.appup.src
index 54a63833e6..2cb3b547e8 100644
--- a/lib/gs/src/gs.appup.src
+++ b/lib/gs/src/gs.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, gs}]}],
+ [{<<".*">>,[{restart_application, gs}]}]
+}.
diff --git a/lib/gs/test/Makefile b/lib/gs/test/Makefile
new file mode 100644
index 0000000000..493770745f
--- /dev/null
+++ b/lib/gs/test/Makefile
@@ -0,0 +1,65 @@
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	gs_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/gs_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)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES) $(GEN_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) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) gs.spec "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+
+release_docs_spec:
diff --git a/lib/gs/test/gs.spec b/lib/gs/test/gs.spec
new file mode 100644
index 0000000000..46e6b2061e
--- /dev/null
+++ b/lib/gs/test/gs.spec
@@ -0,0 +1 @@
+{suites,"../gs_test",all}.
diff --git a/lib/gs/test/gs_SUITE.erl b/lib/gs/test/gs_SUITE.erl
new file mode 100644
index 0000000000..01ce90df0b
--- /dev/null
+++ b/lib/gs/test/gs_SUITE.erl
@@ -0,0 +1,50 @@
+%% ``The 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.''
+%%
+-module(gs_SUITE).
+
+-compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [app, appup].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+     ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+app() ->
+    [{doc, "Test that the gs app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(gs, tolerant).
+
+appup() ->
+    [{doc, "Test that the gs appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(gs).
diff --git a/lib/hipe/cerl/cerl_closurean.erl b/lib/hipe/cerl/cerl_closurean.erl
index 021acd5b35..1b325703ae 100644
--- a/lib/hipe/cerl/cerl_closurean.erl
+++ b/lib/hipe/cerl/cerl_closurean.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %%
 %% The 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,8 @@
 %%	function; see `analyze' for details.
 
 -spec annotate(cerl:cerl()) ->
-        {cerl:cerl(), outlist(), dict(), escapes(), dict(), dict()}.
+        {cerl:cerl(), outlist(), dict:dict(),
+         escapes(), dict:dict(), dict:dict()}.
 
 annotate(Tree) ->
     {Xs, Out, Esc, Deps, Par} = analyze(Tree),
@@ -206,7 +207,8 @@ append_ann(Tag, Val, []) ->
 %% variable labeled `escape', which will hold the set of escaped labels.
 %% initially it contains `top' and `external'.
 
--spec analyze(cerl:cerl()) -> {outlist(), dict(), escapes(), dict(), dict()}.
+-spec analyze(cerl:cerl()) ->
+        {outlist(), dict:dict(), escapes(), dict:dict(), dict:dict()}.
 
 analyze(Tree) ->
     %% Note that we use different name spaces for variable labels and
diff --git a/lib/hipe/cerl/cerl_messagean.erl b/lib/hipe/cerl/cerl_messagean.erl
index ca812a0f0d..7911b875a9 100644
--- a/lib/hipe/cerl/cerl_messagean.erl
+++ b/lib/hipe/cerl/cerl_messagean.erl
@@ -1,7 +1,7 @@
 %% =====================================================================
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -182,7 +182,7 @@
 -type label()   :: integer() | 'external' | 'top'.
 -type ordset(X) :: [X].  % XXX: TAKE ME OUT
 
--spec annotate(cerl:cerl()) -> {cerl:cerl(), ordset(label()), dict()}.
+-spec annotate(cerl:cerl()) -> {cerl:cerl(), ordset(label()), dict:dict()}.
 
 annotate(Tree) ->
     {Esc0, Vars} = analyze(Tree),
diff --git a/lib/hipe/cerl/cerl_prettypr.erl b/lib/hipe/cerl/cerl_prettypr.erl
index fba9a48cda..22f5b8945a 100644
--- a/lib/hipe/cerl/cerl_prettypr.erl
+++ b/lib/hipe/cerl/cerl_prettypr.erl
@@ -62,7 +62,9 @@
 	       receive_action/1, receive_clauses/1, receive_timeout/1,
 	       seq_arg/1, seq_body/1, string_lit/1, try_arg/1,
 	       try_body/1, try_vars/1, try_evars/1, try_handler/1,
-	       tuple_es/1, type/1, values_es/1, var_name/1]).
+	       tuple_es/1, type/1, values_es/1, var_name/1,
+	       map_es/1, map_pair_key/1, map_pair_val/1, map_pair_op/1
+	   ]).
 
 -define(PAPER, 76).
 -define(RIBBON, 45).
@@ -424,6 +426,10 @@ lay_1(Node, Ctxt) ->
 	    lay_cons(Node, Ctxt);
 	tuple ->
 	    lay_tuple(Node, Ctxt);
+	map ->
+	    lay_map(Node, Ctxt);
+	map_pair ->
+	    lay_map_pair(Node, Ctxt);
 	'let' ->
 	    lay_let(Node, Ctxt);
 	seq ->
@@ -589,6 +595,23 @@ lay_tuple(Node, Ctxt) ->
 			  Ctxt, fun lay/2)),
 		  floating(text("}")))).
 
+lay_map(Node, Ctxt) ->
+    beside(floating(text("~{")),
+	   beside(par(seq(map_es(Node), floating(text(",")),
+			  Ctxt, fun lay/2)),
+		  floating(text("}~")))).
+
+lay_map_pair(Node, Ctxt) ->
+    K = map_pair_key(Node),
+    V = map_pair_val(Node),
+    OpTxt = case concrete(map_pair_op(Node)) of
+	assoc -> "::<";
+	exact -> "~<"
+    end,
+    beside(floating(text(OpTxt)),
+	beside(lay(K,Ctxt),beside(floating(text(",")), beside(lay(V,Ctxt),
+		    floating(text(">")))))).
+
 lay_let(Node, Ctxt) ->
     V = lay_value_list(let_vars(Node), Ctxt),
     D1 = par([follow(text("let"),
diff --git a/lib/hipe/cerl/cerl_typean.erl b/lib/hipe/cerl/cerl_typean.erl
index ccd8903658..f694c07c82 100644
--- a/lib/hipe/cerl/cerl_typean.erl
+++ b/lib/hipe/cerl/cerl_typean.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -242,7 +242,7 @@ delete_ann(_, []) ->
 -type labelset() :: ordset(label()).
 -type outlist()  :: [labelset()] | 'none'.
 
--spec analyze(cerl:cerl()) -> {outlist(), dict(), dict()}.
+-spec analyze(cerl:cerl()) -> {outlist(), dict:dict(), dict:dict()}.
 
 analyze(Tree) ->
     analyze(Tree, ?DEF_LIMIT).
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index 42c7e360c1..8b610ac893 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -30,19 +30,17 @@
 
 %-define(BITS, (hipe_rtl_arch:word_size() * 8) - ?TAG_IMMED1_SIZE).
 -define(BITS, 128). %This is only in bsl to convert answer to pos_inf/neg_inf.
--define(TAG_IMMED1_SIZE, 4).
+-export([type/3, type/4, type/5, arg_types/3,
+	 is_known/3, opaque_args/5, infinity_add/2]).
 
--export([type/3, type/4, arg_types/3, 
-	 is_known/3, structure_inspecting_args/3, infinity_add/2]).
-
--import(erl_types, [number_max/1,
-		    number_min/1,
+-import(erl_types, [number_max/2,
+		    number_min/2,
 		    t_any/0,
 		    t_arity/0,
 		    t_atom/0,
 		    t_atom/1,
 		    t_atoms/1,
-		    t_atom_vals/1,
+		    t_atom_vals/2,
 		    t_binary/0,
 		    t_bitstr/0,
 		    t_boolean/0,
@@ -60,10 +58,11 @@
 		    t_from_term/1,
 		    t_fun/0,
 		    t_fun/2,
-		    t_fun_args/1,
-		    t_fun_range/1,
+		    t_fun_args/2,
+		    t_fun_range/2,
 		    t_identifier/0,
-		    t_inf/2,
+                    t_has_opaque_subtype/2,
+                    t_inf/3,
 		    t_integer/0,
 		    t_integer/1,
 		    t_non_neg_fixnum/0,
@@ -71,30 +70,28 @@
 		    t_pos_integer/0,
 		    t_integers/1,
 		    t_is_any/1,
-		    t_is_atom/1,
-		    t_is_binary/1,
-		    t_is_bitstr/1,
-		    t_is_boolean/1,
-		    t_is_cons/1,
-		    t_is_float/1,
-		    t_is_float/1,
-		    t_is_fun/1,
-		    t_is_integer/1,
-		    t_is_integer/1,
-		    t_is_nil/1,
+		    t_is_atom/2,
+		    t_is_binary/2,
+		    t_is_bitstr/2,
+		    t_is_boolean/2,
+		    t_is_cons/2,
+		    t_is_float/2,
+		    t_is_fun/2,
+		    t_is_integer/2,
+		    t_is_nil/1, t_is_nil/2,
 		    t_is_none/1,
 		    t_is_none_or_unit/1,
-		    t_is_number/1,
-		    t_is_pid/1,
-		    t_is_port/1,
-		    t_is_maybe_improper_list/1,
-		    t_is_reference/1,
+		    t_is_number/2,
+		    t_is_pid/2,
+		    t_is_port/2,
+		    t_is_maybe_improper_list/2,
+		    t_is_reference/2,
 		    t_is_string/1,
 		    t_is_subtype/2,
-		    t_is_tuple/1,
+		    t_is_tuple/2,
 		    t_list/0,
 		    t_list/1,
-		    t_list_elements/1,
+		    t_list_elements/2,
 		    t_list_termination/1,
 		    t_mfa/0,
 		    t_module/0,
@@ -104,7 +101,7 @@
 		    t_nonempty_list/0,
 		    t_nonempty_list/1,
 		    t_number/0,
-		    t_number_vals/1,
+		    t_number_vals/2,
 		    t_pid/0,
 		    t_port/0,
 		    t_maybe_improper_list/0,
@@ -115,9 +112,11 @@
 		    t_sup/2,
 		    t_tuple/0,
 		    t_tuple/1,
-		    t_tuple_args/1,
-		    t_tuple_size/1,
-		    t_tuple_subtypes/1
+		    t_tuple_args/2,
+		    t_tuple_size/2,
+		    t_tuple_subtypes/2,
+		    t_is_map/2,
+		    t_map/0
 		   ]).
 
 -ifdef(DO_ERL_BIF_TYPES_TEST).
@@ -129,47 +128,61 @@
 -spec type(atom(), atom(), arity()) -> erl_types:erl_type().
 
 type(M, F, A) ->
-  type(M, F, A, any_list(A)).
+  type(M, F, A, any_list(A), []).
 
 %% Arguments should be checked for undefinedness, so we do not make
 %% unnecessary overapproximations.
 
 -spec type(atom(), atom(), arity(), [erl_types:erl_type()]) -> erl_types:erl_type().
 
+type(M, F, A, Xs) ->
+  type(M, F, A, Xs, 'universe').
+
+-type opaques() :: 'universe' | [erl_types:erl_type()].
+
+-type arg_types() :: [erl_types:erl_type()].
+
+-spec type(atom(), atom(), arity(), arg_types(), opaques()) ->
+              erl_types:erl_type().
+
 %%-- 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();
-type(erlang, error, 1, _) -> t_none();
-type(erlang, error, 2, _) -> t_none();
-type(erlang, throw, 1, _) -> t_none();
-type(erlang, '==', 2, Xs = [X1, X2]) ->
-  case t_is_atom(X1) andalso t_is_atom(X2) of
-    true -> type(erlang, '=:=', 2, Xs);
+type(erlang, halt, 0, _, _) -> t_none();
+type(erlang, halt, 1, _, _) -> t_none();
+type(erlang, halt, 2, _, _) -> t_none();
+type(erlang, exit, 1, _, _) -> t_none();
+type(erlang, error, 1, _, _) -> t_none();
+type(erlang, error, 2, _, _) -> t_none();
+type(erlang, throw, 1, _, _) -> t_none();
+type(erlang, '==', 2, Xs = [X1, X2], Opaques) ->
+  case
+    t_is_atom(X1, Opaques) andalso t_is_atom(X2, Opaques)
+  of
+    true -> type(erlang, '=:=', 2, Xs, Opaques);
     false ->
-      case t_is_integer(X1) andalso t_is_integer(X2) of
-	true -> type(erlang, '=:=', 2, Xs);
-	false -> strict(Xs, t_boolean())
+      case t_is_integer(X1, Opaques) andalso t_is_integer(X2, Opaques) of
+	true -> type(erlang, '=:=', 2, Xs, Opaques);
+	false -> strict2(Xs, t_boolean())
       end
   end;
-type(erlang, '/=', 2, Xs = [X1, X2]) -> 
-  case t_is_atom(X1) andalso t_is_atom(X2) of
-    true -> type(erlang, '=/=', 2, Xs);
+type(erlang, '/=', 2, Xs = [X1, X2], Opaques) ->
+  case
+    t_is_atom(X1, Opaques) andalso t_is_atom(X2, Opaques)
+  of
+    true -> type(erlang, '=/=', 2, Xs, Opaques);
     false ->
-      case t_is_integer(X1) andalso t_is_integer(X2) of
-	true -> type(erlang, '=/=', 2, Xs);
-	false -> strict(Xs, t_boolean())
+      case t_is_integer(X1, Opaques) andalso t_is_integer(X2, Opaques) of
+	true -> type(erlang, '=/=', 2, Xs, Opaques);
+	false -> strict2(Xs, t_boolean())
       end
   end;
-type(erlang, '=:=', 2, Xs = [Lhs, Rhs]) -> 
+type(erlang, '=:=', 2, Xs = [Lhs, Rhs], Opaques) ->
   Ans =
-    case t_is_none(t_inf(Lhs, Rhs)) of
+    case t_is_none(t_inf(Lhs, Rhs, Opaques)) of
       true -> t_atom('false');
       false ->
-	case t_is_atom(Lhs) andalso t_is_atom(Rhs) of
+	case t_is_atom(Lhs, Opaques) andalso t_is_atom(Rhs, Opaques) of
 	  true ->
-	    case {t_atom_vals(Lhs), t_atom_vals(Rhs)} of
+	    case {t_atom_vals(Lhs, Opaques), t_atom_vals(Rhs, Opaques)} of
 	      {unknown, _} -> t_boolean();
 	      {_, unknown} -> t_boolean();
 	      {[X], [X]} -> t_atom('true');
@@ -181,16 +194,20 @@ type(erlang, '=:=', 2, Xs = [Lhs, Rhs]) ->
 		end
 	    end;
 	  false ->
-	    case t_is_integer(Lhs) andalso t_is_integer(Rhs) of
+	    case
+              t_is_integer(Lhs, Opaques) andalso t_is_integer(Rhs, Opaques)
+            of
 	      false -> t_boolean();
 	      true ->
-		case {t_number_vals(Lhs), t_number_vals(Rhs)} of
+		case
+                  {t_number_vals(Lhs, Opaques), t_number_vals(Rhs, Opaques)}
+                of
 		  {[X], [X]} when is_integer(X) -> t_atom('true');
 		  _ ->
-		    LhsMax = number_max(Lhs),
-		    LhsMin = number_min(Lhs),
-		    RhsMax = number_max(Rhs),
-		    RhsMin = number_min(Rhs),
+		    LhsMax = number_max(Lhs, Opaques),
+		    LhsMin = number_min(Lhs, Opaques),
+		    RhsMax = number_max(Rhs, Opaques),
+		    RhsMin = number_min(Rhs, Opaques),
 		    Ans1 = (is_integer(LhsMin) 
 			    andalso is_integer(RhsMax)
 			    andalso (LhsMin > RhsMax)),
@@ -205,15 +222,15 @@ type(erlang, '=:=', 2, Xs = [Lhs, Rhs]) ->
 	    end
 	end
     end,
-  strict(Xs, Ans);
-type(erlang, '=/=', 2, Xs = [Lhs, Rhs]) ->
+  strict2(Xs, Ans);
+type(erlang, '=/=', 2, Xs = [Lhs, Rhs], Opaques) ->
   Ans =
-    case t_is_none(t_inf(Lhs, Rhs)) of
+    case t_is_none(t_inf(Lhs, Rhs, Opaques)) of
       true -> t_atom('true');
       false ->
-	case t_is_atom(Lhs) andalso t_is_atom(Rhs) of
+	case t_is_atom(Lhs, Opaques) andalso t_is_atom(Rhs, Opaques) of
 	  true ->
-	    case {t_atom_vals(Lhs), t_atom_vals(Rhs)} of
+	    case {t_atom_vals(Lhs, Opaques), t_atom_vals(Rhs, Opaques)} of
 	      {unknown, _} -> t_boolean();
 	      {_, unknown} -> t_boolean();
 	      {[Val], [Val]} -> t_atom('false');
@@ -221,13 +238,15 @@ type(erlang, '=/=', 2, Xs = [Lhs, Rhs]) ->
 		t_sup([t_from_term(X =/= Y) || X <- LhsVals, Y <- RhsVals])
 	    end;
 	  false ->
-	    case t_is_integer(Lhs) andalso t_is_integer(Rhs) of
+	    case
+              t_is_integer(Lhs, Opaques) andalso t_is_integer(Rhs, Opaques)
+            of
 	      false -> t_boolean();
 	      true ->
-		LhsMax = number_max(Lhs),
-		LhsMin = number_min(Lhs),
-		RhsMax = number_max(Rhs),
-		RhsMin = number_min(Rhs),
+		LhsMax = number_max(Lhs, Opaques),
+		LhsMin = number_min(Lhs, Opaques),
+		RhsMax = number_max(Rhs, Opaques),
+		RhsMin = number_min(Rhs, Opaques),
 		Ans1 = (is_integer(LhsMin) andalso is_integer(RhsMax)
 			andalso (LhsMin > RhsMax)),
 		Ans2 = (is_integer(LhsMax) andalso is_integer(RhsMin)
@@ -244,15 +263,15 @@ type(erlang, '=/=', 2, Xs = [Lhs, Rhs]) ->
 	    end
 	end
     end,
-  strict(Xs, Ans);
-type(erlang, '>', 2, Xs = [Lhs, Rhs]) -> 
+  strict2(Xs, Ans);
+type(erlang, '>', 2, Xs = [Lhs, Rhs], Opaques) ->
   Ans =
-    case t_is_integer(Lhs) andalso t_is_integer(Rhs) of
+    case t_is_integer(Lhs, Opaques) andalso t_is_integer(Rhs, Opaques) of
       true ->
-	LhsMax = number_max(Lhs),
-	LhsMin = number_min(Lhs),
-	RhsMax = number_max(Rhs),
-	RhsMin = number_min(Rhs),
+	LhsMax = number_max(Lhs, Opaques),
+	LhsMin = number_min(Lhs, Opaques),
+	RhsMax = number_max(Rhs, Opaques),
+	RhsMin = number_min(Rhs, Opaques),
 	T = t_atom('true'),
 	F = t_atom('false'),
 	if 
@@ -260,17 +279,17 @@ type(erlang, '>', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMax), is_integer(RhsMin), RhsMin >= LhsMax -> F;
 	  true -> t_boolean()
 	end;
-      false -> compare('>', Lhs, Rhs)
+      false -> compare('>', Lhs, Rhs, Opaques)
     end,
-  strict(Xs, Ans);
-type(erlang, '>=', 2, Xs = [Lhs, Rhs]) ->
+  strict2(Xs, Ans);
+type(erlang, '>=', 2, Xs = [Lhs, Rhs], Opaques) ->
   Ans =
-    case t_is_integer(Lhs) andalso t_is_integer(Rhs) of
+    case t_is_integer(Lhs, Opaques) andalso t_is_integer(Rhs, Opaques) of
       true ->
-	LhsMax = number_max(Lhs),
-	LhsMin = number_min(Lhs),
-	RhsMax = number_max(Rhs),
-	RhsMin = number_min(Rhs),
+	LhsMax = number_max(Lhs, Opaques),
+	LhsMin = number_min(Lhs, Opaques),
+	RhsMax = number_max(Rhs, Opaques),
+	RhsMin = number_min(Rhs, Opaques),
 	T = t_atom('true'),
 	F = t_atom('false'),
 	if 
@@ -278,17 +297,17 @@ type(erlang, '>=', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMax), is_integer(RhsMin), RhsMin > LhsMax -> F;
 	  true -> t_boolean()
 	end;
-      false -> compare('>=', Lhs, Rhs)
+      false -> compare('>=', Lhs, Rhs, Opaques)
     end,
-  strict(Xs, Ans);
-type(erlang, '<', 2, Xs = [Lhs, Rhs]) ->
+  strict2(Xs, Ans);
+type(erlang, '<', 2, Xs = [Lhs, Rhs], Opaques) ->
   Ans =
-    case t_is_integer(Lhs) andalso t_is_integer(Rhs) of
+    case t_is_integer(Lhs, Opaques) andalso t_is_integer(Rhs, Opaques) of
       true ->
-	LhsMax = number_max(Lhs),
-	LhsMin = number_min(Lhs),
-	RhsMax = number_max(Rhs),
-	RhsMin = number_min(Rhs),
+	LhsMax = number_max(Lhs, Opaques),
+	LhsMin = number_min(Lhs, Opaques),
+	RhsMax = number_max(Rhs, Opaques),
+	RhsMin = number_min(Rhs, Opaques),
 	T = t_atom('true'),
 	F = t_atom('false'),
 	if 
@@ -296,17 +315,17 @@ type(erlang, '<', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMin), is_integer(RhsMax), RhsMax =< LhsMin -> F;
 	  true -> t_boolean()
 	end;
-      false -> compare('<', Lhs, Rhs)
+      false -> compare('<', Lhs, Rhs, Opaques)
     end,
-  strict(Xs, Ans);
-type(erlang, '=<', 2, Xs = [Lhs, Rhs]) ->
+  strict2(Xs, Ans);
+type(erlang, '=<', 2, Xs = [Lhs, Rhs], Opaques) ->
   Ans =
-    case t_is_integer(Lhs) andalso t_is_integer(Rhs) of
+    case t_is_integer(Lhs, Opaques) andalso t_is_integer(Rhs, Opaques) of
       true ->
-	LhsMax = number_max(Lhs),
-	LhsMin = number_min(Lhs),
-	RhsMax = number_max(Rhs),
-	RhsMin = number_min(Rhs),
+	LhsMax = number_max(Lhs, Opaques),
+	LhsMin = number_min(Lhs, Opaques),
+	RhsMax = number_max(Rhs, Opaques),
+	RhsMin = number_min(Rhs, Opaques),
 	T = t_atom('true'),
 	F = t_atom('false'),
 	if 
@@ -314,232 +333,237 @@ type(erlang, '=<', 2, Xs = [Lhs, Rhs]) ->
 	  is_integer(LhsMin), is_integer(RhsMax), RhsMax < LhsMin -> F;
 	  true -> t_boolean()
 	end;
-      false -> compare('=<', Lhs, Rhs)
+      false -> compare('=<', Lhs, Rhs, Opaques)
     end,
-  strict(Xs, Ans);
-type(erlang, '+', 1, Xs) ->
-  strict(arg_types(erlang, '+', 1), Xs, 
-	 fun ([X]) -> X end);
-type(erlang, '-', 1, Xs) ->
-  strict(arg_types(erlang, '-', 1), Xs, 
+  strict2(Xs, Ans);
+type(erlang, '+', 1, Xs, Opaques) ->
+  strict(erlang, '+', 1, Xs, fun ([X]) -> X end, Opaques);
+type(erlang, '-', 1, Xs, Opaques) ->
+  strict(erlang, '-', 1, Xs,
 	 fun ([X]) -> 
-	     case t_is_integer(X) of
+	     case t_is_integer(X, Opaques) of
 	       true -> type(erlang, '-', 2, [t_integer(0), X]);
 	       false -> X
 	     end
-	 end);
-type(erlang, '!', 2, Xs) ->
-  strict(arg_types(erlang, '!', 2), Xs, fun ([_, X2]) -> X2 end);
-type(erlang, '+', 2, Xs) ->
-  strict(arg_types(erlang, '+', 2), Xs,
+	 end, Opaques);
+type(erlang, '!', 2, Xs, Opaques) ->
+  strict(erlang, '!', 2, Xs, fun ([_, X2]) -> X2 end, Opaques);
+type(erlang, '+', 2, Xs, Opaques) ->
+  strict(erlang, '+', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('+', X1, X2) of
+	     case arith('+', X1, X2, Opaques) of
 	       {ok, T} -> T;
 	       error ->
-		 case t_is_float(X1) orelse t_is_float(X2) of
+		 case
+                   t_is_float(X1, Opaques) orelse t_is_float(X2, Opaques)
+                 of
 		   true -> t_float();
 		   false -> t_number()
 		 end
 	     end
-	 end);
-type(erlang, '-', 2, Xs) ->
-  strict(arg_types(erlang, '-', 2), Xs,
+	 end, Opaques);
+type(erlang, '-', 2, Xs, Opaques) ->
+  strict(erlang, '-', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('-', X1, X2) of
+	     case arith('-', X1, X2, Opaques) of
 	       {ok, T} -> T;
 	       error ->
-		 case t_is_float(X1) orelse t_is_float(X2) of
+		 case
+                   t_is_float(X1, Opaques) orelse t_is_float(X2, Opaques)
+                 of
 		   true -> t_float();
 		   false -> t_number()
 		 end
 	     end
-	 end);
-type(erlang, '*', 2, Xs) ->
-  strict(arg_types(erlang, '*', 2), Xs,
+	 end, Opaques);
+type(erlang, '*', 2, Xs, Opaques) ->
+  strict(erlang, '*', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('*', X1, X2) of
+	     case arith('*', X1, X2, Opaques) of
 	       {ok, T} -> T;
 	       error ->
-		 case t_is_float(X1) orelse t_is_float(X2) of
+		 case
+                   t_is_float(X1, Opaques) orelse t_is_float(X2, Opaques)
+                 of
 		   true -> t_float();
 		   false -> t_number()
 		 end
 	     end
-	 end);
-type(erlang, '/', 2, Xs) ->
-  strict(arg_types(erlang, '/', 2), Xs,
-	 fun (_) -> t_float() end);
-type(erlang, 'div', 2, Xs) ->
-  strict(arg_types(erlang, 'div', 2), Xs,
+	 end, Opaques);
+type(erlang, '/', 2, Xs, Opaques) ->
+  strict(erlang, '/', 2, Xs, fun (_) -> t_float() end, Opaques);
+type(erlang, 'div', 2, Xs, Opaques) ->
+  strict(erlang, 'div', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('div', X1, X2) of
+	     case arith('div', X1, X2, Opaques) of
 	       error -> t_integer();
 	       {ok, T} -> T
 	     end
-	 end);
-type(erlang, 'rem', 2, Xs) ->
-  strict(arg_types(erlang, 'rem', 2), Xs,
+	 end, Opaques);
+type(erlang, 'rem', 2, Xs, Opaques) ->
+  strict(erlang, 'rem', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('rem', X1, X2) of
+	     case arith('rem', X1, X2, Opaques) of
 	       error -> t_non_neg_integer();
 	       {ok, T} -> T
 	     end
-	 end);
-type(erlang, '++', 2, Xs) ->
-  strict(arg_types(erlang, '++', 2), Xs,
+	 end, Opaques);
+type(erlang, '++', 2, Xs, Opaques) ->
+  strict(erlang, '++', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case t_is_nil(X1) of
+	     case t_is_nil(X1, Opaques) of
 	       true  -> X2;    % even if X2 is not a list
 	       false ->
-		 case t_is_nil(X2) of
+		 case t_is_nil(X2, Opaques) of
 		   true  -> X1;
 		   false ->
-		     E1 = t_list_elements(X1),
-		     case t_is_cons(X1) of
+		     E1 = t_list_elements(X1, Opaques),
+		     case t_is_cons(X1, Opaques) of
 		       true -> t_cons(E1, X2);
 		       false ->
 			 t_sup(X2, t_cons(E1, X2))
 		     end
 		 end
 	     end
-	 end);
-type(erlang, '--', 2, Xs) ->
+	 end, Opaques);
+type(erlang, '--', 2, Xs, Opaques) ->
   %% We don't know which elements (if any) in X2 will be found and
   %% removed from X1, even if they would have the same type. Thus, we
   %% must assume that X1 can remain unchanged. However, if we succeed,
   %% we know that X1 must be a proper list, but the result could
   %% possibly be empty even if X1 is nonempty.
-  strict(arg_types(erlang, '--', 2), Xs,
+  strict(erlang, '--', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case t_is_nil(X1) of
+	     case t_is_nil(X1, Opaques) of
 	       true  -> t_nil();
 	       false ->
-		 case t_is_nil(X2) of
+		 case t_is_nil(X2, Opaques) of
 		   true  -> X1;
-		   false -> t_list(t_list_elements(X1))
+		   false -> t_list(t_list_elements(X1, Opaques))
 		 end
 	     end
-	 end);
-type(erlang, 'and', 2, Xs) ->
-  strict(arg_types(erlang, 'and', 2), Xs, fun (_) -> t_boolean() end);
-type(erlang, 'or', 2, Xs) ->
-  strict(arg_types(erlang, 'or', 2), Xs, fun (_) -> t_boolean() end);
-type(erlang, 'xor', 2, Xs) ->
-  strict(arg_types(erlang, 'xor', 2), Xs, fun (_) -> t_boolean() end);
-type(erlang, 'not', 1, Xs) ->
-  strict(arg_types(erlang, 'not', 1), Xs, fun (_) -> t_boolean() end);
-type(erlang, 'band', 2, Xs) ->
-  strict(arg_types(erlang, 'band', 2), Xs,
+	 end, Opaques);
+type(erlang, 'and', 2, Xs, Opaques) ->
+  strict(erlang, 'and', 2, Xs, fun (_) -> t_boolean() end, Opaques);
+type(erlang, 'or', 2, Xs, Opaques) ->
+  strict(erlang, 'or', 2, Xs, fun (_) -> t_boolean() end, Opaques);
+type(erlang, 'xor', 2, Xs, Opaques) ->
+  strict(erlang, 'xor', 2, Xs, fun (_) -> t_boolean() end, Opaques);
+type(erlang, 'not', 1, Xs, Opaques) ->
+  strict(erlang, 'not', 1, Xs, fun (_) -> t_boolean() end, Opaques);
+type(erlang, 'band', 2, Xs, Opaques) ->
+  strict(erlang, 'band', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('band', X1, X2) of
+	     case arith('band', X1, X2, Opaques) of
 	       error -> t_integer();
 	       {ok, T} -> T
 	     end
-	 end);
+	 end, Opaques);
 %% The result is not wider than the smallest argument. We need to
 %% kill any value-sets in the result.
-%%  strict(arg_types(erlang, 'band', 2), Xs,
-%%	 fun ([X1, X2]) -> t_sup(t_inf(X1, X2), t_byte()) end);
-type(erlang, 'bor', 2, Xs) ->
-  strict(arg_types(erlang, 'bor', 2), Xs,
+%%  strict(erlang, 'band', 2, Xs,
+%%	 fun ([X1, X2]) -> t_sup(t_inf(X1, X2, Opaques), t_byte()) end, Opaques);
+type(erlang, 'bor', 2, Xs, Opaques) ->
+  strict(erlang, 'bor', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('bor', X1, X2) of
+	     case arith('bor', X1, X2, Opaques) of
 	       error -> t_integer();
 	       {ok, T} -> T
 	     end
-	 end);
+	 end, Opaques);
 %% The result is not wider than the largest argument. We need to
 %% kill any value-sets in the result.
-%%  strict(arg_types(erlang, 'bor', 2), Xs,
-%%	 fun ([X1, X2]) -> t_sup(t_sup(X1, X2), t_byte()) end);
-type(erlang, 'bxor', 2, Xs) ->
-  strict(arg_types(erlang, 'bxor', 2), Xs,
+%%  strict(erlang, 'bor', 2, Xs,
+%%	 fun ([X1, X2]) -> t_sup(t_sup(X1, X2), t_byte()) end, Opaques);
+type(erlang, 'bxor', 2, Xs, Opaques) ->
+  strict(erlang, 'bxor', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('bxor', X1, X2) of
+	     case arith('bxor', X1, X2, Opaques) of
 	       error -> t_integer();
 	       {ok, T} -> T
 	     end
-	 end);
+	 end, Opaques);
 %% The result is not wider than the largest argument. We need to
 %% kill any value-sets in the result.
-%%  strict(arg_types(erlang, 'bxor', 2), Xs,
-%%	 fun ([X1, X2]) -> t_sup(t_sup(X1, X2), t_byte()) end);
-type(erlang, 'bsr', 2, Xs) ->
-  strict(arg_types(erlang, 'bsr', 2), Xs,
+%%  strict(erlang, 'bxor', 2, Xs,
+%%	 fun ([X1, X2]) -> t_sup(t_sup(X1, X2), t_byte()) end, Opaques);
+type(erlang, 'bsr', 2, Xs, Opaques) ->
+  strict(erlang, 'bsr', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('bsr', X1, X2) of
+	     case arith('bsr', X1, X2, Opaques) of
 	       error -> t_integer();
 	       {ok, T} -> T
 	     end
-	 end);
+	 end, Opaques);
 %% If the first argument is unsigned (which is the case for
 %% characters and bytes), the result is never wider. We need to kill
 %% any value-sets in the result.
-%%  strict(arg_types(erlang, 'bsr', 2), Xs,
-%%	 fun ([X, _]) -> t_sup(X, t_byte()) end);
-type(erlang, 'bsl', 2, Xs) ->
-  strict(arg_types(erlang, 'bsl', 2), Xs,
+%%  strict(erlang, 'bsr', 2, Xs,
+%%	 fun ([X, _]) -> t_sup(X, t_byte()) end, Opaques);
+type(erlang, 'bsl', 2, Xs, Opaques) ->
+  strict(erlang, 'bsl', 2, Xs,
 	 fun ([X1, X2]) ->
-	     case arith('bsl', X1, X2) of
+	     case arith('bsl', X1, X2, Opaques) of
 	       error -> t_integer();
 	       {ok, T} -> T
 	     end
-	 end);
+	 end, Opaques);
 %% Not worth doing anything special here.
-%%  strict(arg_types(erlang, 'bsl', 2), Xs, fun (_) -> t_integer() end);
-type(erlang, 'bnot', 1, Xs) ->
- strict(arg_types(erlang, 'bnot', 1), Xs,
+%%  strict(erlang, 'bsl', 2, Xs, fun (_) -> t_integer() end, Opaques);
+type(erlang, 'bnot', 1, Xs, Opaques) ->
+ strict(erlang, 'bnot', 1, Xs,
 	 fun ([X1]) ->
-	     case arith('bnot', X1) of
+	     case arith('bnot', X1, Opaques) of
 	       error -> t_integer();
 	       {ok, T} -> T
 	     end
-	 end);
+	 end, Opaques);
 %% Guard bif, needs to be here.
-type(erlang, abs, 1, Xs) ->
-  strict(arg_types(erlang, abs, 1), Xs, fun ([X]) -> X end);
+type(erlang, abs, 1, Xs, Opaques) ->
+  strict(erlang, abs, 1, Xs, fun ([X]) -> X end, Opaques);
 %% 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, apply, 2, Xs) ->
+%%  strict(erlang, 'bnot', 1, Xs, fun (_) -> t_integer() end, Opaques);
+type(erlang, append, 2, Xs, _Opaques) -> type(erlang, '++', 2, Xs); % alias
+type(erlang, apply, 2, Xs, Opaques) ->
   Fun = fun ([X, _Y]) -> 
-	    case t_is_fun(X) of
+	    case t_is_fun(X, Opaques) of
 	      true ->
-		t_fun_range(X);
+		t_fun_range(X, Opaques);
 	      false ->
 		t_any() 
 	    end
 	end,
-  strict(arg_types(erlang, apply, 2), Xs, Fun);
-type(erlang, apply, 3, Xs) ->
-  strict(arg_types(erlang, apply, 3), Xs, fun (_) -> t_any() end);
+  strict(erlang, apply, 2, Xs, Fun, Opaques);
+type(erlang, apply, 3, Xs, Opaques) ->
+  strict(erlang, apply, 3, Xs, fun (_) -> t_any() end, Opaques);
 %% Guard bif, needs to be here.
-type(erlang, binary_part, 2, Xs) ->
-  strict(arg_types(erlang, binary_part, 2), Xs, fun (_) -> t_binary() end);
+type(erlang, binary_part, 2, Xs, Opaques) ->
+  strict(erlang, binary_part, 2, Xs, fun (_) -> t_binary() end, Opaques);
 %% 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_part, 3, Xs, Opaques) ->
+  strict(erlang, binary_part, 3, Xs, fun (_) -> t_binary() end, Opaques);
 %% 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, bit_size, 1, Xs, Opaques) ->
+  strict(erlang, bit_size, 1, Xs,
+	 fun (_) -> t_non_neg_integer() end, Opaques);
 %% 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, disconnect_node, 1, Xs) ->
-  strict(arg_types(erlang, disconnect_node, 1), Xs, fun (_) -> t_sup([t_boolean(), t_atom('ignored')]) end);
+type(erlang, byte_size, 1, Xs, Opaques) ->
+  strict(erlang, byte_size, 1, Xs,
+	 fun (_) -> t_non_neg_integer() end, Opaques);
+type(erlang, disconnect_node, 1, Xs, Opaques) ->
+  strict(erlang, disconnect_node, 1, Xs,
+         fun (_) -> t_sup([t_boolean(), t_atom('ignored')]) end, Opaques);
 %% 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,
+type(erlang, element, 2, Xs, Opaques) ->
+  strict(erlang, element, 2, Xs,
 	 fun ([X1, X2]) ->
-	     case t_tuple_subtypes(X2) of
+	     case t_tuple_subtypes(X2, Opaques) of
 	       unknown -> t_any();
 	       [_] ->
-		 Sz = t_tuple_size(X2),
-		 As = t_tuple_args(X2),
-		 case t_number_vals(X1) of
+		 Sz = t_tuple_size(X2, Opaques),
+		 As = t_tuple_args(X2, Opaques),
+		 case t_number_vals(X1, Opaques) of
 		   unknown -> t_sup(As);
 		   Ns when is_list(Ns) ->
 		     Fun = fun 
@@ -553,165 +577,166 @@ type(erlang, element, 2, Xs) ->
 	       Ts when is_list(Ts) ->
 		 t_sup([type(erlang, element, 2, [X1, Y]) || Y <- Ts])
 	     end
-	 end);
+	 end, Opaques);
 %% Guard bif, needs to be here.
-type(erlang, float, 1, Xs) ->
-  strict(arg_types(erlang, float, 1), Xs, fun (_) -> t_float() 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, get_cookie, 0, _) -> t_atom();  % | t_atom('nocookie')
+type(erlang, float, 1, Xs, Opaques) ->
+  strict(erlang, float, 1, Xs, fun (_) -> t_float() end, Opaques);
+type(erlang, fun_info, 1, Xs, Opaques) ->
+  strict(erlang, fun_info, 1, Xs,
+	 fun (_) -> t_list(t_tuple([t_atom(), t_any()])) end, Opaques);
+type(erlang, get_cookie, 0, _, _Opaques) -> t_atom();  % | t_atom('nocookie')
 %% 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, 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, hd, 1, Xs, Opaques) ->
+  strict(erlang, hd, 1, Xs, fun ([X]) -> t_cons_hd(X) end, Opaques);
+type(erlang, integer_to_list, 2, Xs, Opaques) ->
+  strict(erlang, integer_to_list, 2, Xs,
+	 fun (_) -> t_string() end, Opaques);
+type(erlang, info, 1, Xs, _) -> type(erlang, system_info, 1, Xs); % alias
 %% 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);
-type(erlang, is_binary, 1, Xs) ->
+type(erlang, is_atom, 1, Xs, Opaques) ->
+  Fun = fun (X) ->
+            check_guard(X, fun (Y) -> t_is_atom(Y, Opaques) end,
+                        t_atom(), Opaques)
+        end,
+  strict(erlang, is_atom, 1, Xs, Fun, Opaques);
+type(erlang, is_binary, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_binary(Y) end, t_binary())
+	    check_guard(X, fun (Y) -> t_is_binary(Y, Opaques) end,
+                        t_binary(), Opaques)
 	end,
-  strict(arg_types(erlang, is_binary, 1), Xs, Fun);
-type(erlang, is_bitstring, 1, Xs) ->
+  strict(erlang, is_binary, 1, Xs, Fun, Opaques);
+type(erlang, is_bitstring, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_bitstr(Y) end, t_bitstr())
+	    check_guard(X, fun (Y) -> t_is_bitstr(Y, Opaques) end,
+                        t_bitstr(), Opaques)
 	end,
-  strict(arg_types(erlang, is_bitstring, 1), Xs, Fun);
-type(erlang, is_boolean, 1, Xs) ->
+  strict(erlang, is_bitstring, 1, Xs, Fun, Opaques);
+type(erlang, is_boolean, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_boolean(Y) end, t_boolean())
+	    check_guard(X, fun (Y) -> t_is_boolean(Y, Opaques) end,
+                        t_boolean(), Opaques)
 	end,
-  strict(arg_types(erlang, is_boolean, 1), Xs, Fun);
-type(erlang, is_float, 1, Xs) ->
+  strict(erlang, is_boolean, 1, Xs, Fun, Opaques);
+type(erlang, is_float, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_float(Y) end, t_float())
+	    check_guard(X, fun (Y) -> t_is_float(Y, Opaques) end,
+                        t_float(), Opaques)
 	end,
-  strict(arg_types(erlang, is_float, 1), Xs, Fun);
-type(erlang, is_function, 1, Xs) ->
-  Fun = fun (X) -> check_guard(X, fun (Y) -> t_is_fun(Y) end, t_fun()) end,
-  strict(arg_types(erlang, is_function, 1), Xs, Fun);
-type(erlang, is_function, 2, Xs) ->
+  strict(erlang, is_float, 1, Xs, Fun, Opaques);
+type(erlang, is_function, 1, Xs, Opaques) ->
+  Fun = fun (X) ->
+            check_guard(X, fun (Y) -> t_is_fun(Y, Opaques) end,
+                        t_fun(), Opaques)
+        end,
+  strict(erlang, is_function, 1, Xs, Fun, Opaques);
+type(erlang, is_function, 2, Xs, Opaques) ->
   Fun = fun ([FunType, ArityType]) -> 
-	    case t_number_vals(ArityType) of
+	    case t_number_vals(ArityType, Opaques) of
 	      unknown -> t_boolean();
 	      [Val] -> 
 		FunConstr = t_fun(any_list(Val), t_any()),
 		Fun2 = fun (X) ->
 			   t_is_subtype(X, FunConstr) andalso (not t_is_none(X))
 		       end,
-		check_guard_single(FunType, Fun2, FunConstr);
+		check_guard_single(FunType, Fun2, FunConstr, Opaques);
 	      IntList when is_list(IntList) -> t_boolean() %% true?
 	    end
 	end,
-  strict(arg_types(erlang, is_function, 2), Xs, Fun);
-type(erlang, is_integer, 1, Xs) ->
+  strict(erlang, is_function, 2, Xs, Fun, Opaques);
+type(erlang, is_integer, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_integer(Y) end, t_integer())
+	    check_guard(X, fun (Y) -> t_is_integer(Y, Opaques) end,
+                        t_integer(), Opaques)
 	end,
-  strict(arg_types(erlang, is_integer, 1), Xs, Fun);
-type(erlang, is_list, 1, Xs) ->
+  strict(erlang, is_integer, 1, Xs, Fun, Opaques);
+type(erlang, is_list, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    Fun2 = fun (Y) -> t_is_maybe_improper_list(Y) end,
-	    check_guard(X, Fun2, t_maybe_improper_list())
+	    Fun2 = fun (Y) -> t_is_maybe_improper_list(Y, Opaques) end,
+	    check_guard(X, Fun2, t_maybe_improper_list(), Opaques)
 	end,
-  strict(arg_types(erlang, is_list, 1), Xs, Fun);
-type(erlang, is_number, 1, Xs) ->
+  strict(erlang, is_list, 1, Xs, Fun, Opaques);
+type(erlang, is_map, 1, Xs, Opaques) ->
+  Fun = fun (X) -> 
+	    check_guard(X, fun (Y) -> t_is_map(Y, Opaques) end,
+	    t_map(), Opaques) end,
+  strict(erlang, is_map, 1, Xs, Fun, Opaques);
+type(erlang, is_number, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_number(Y) end, t_number())
+	    check_guard(X, fun (Y) -> t_is_number(Y, Opaques) end,
+                        t_number(), Opaques)
 	end,
-  strict(arg_types(erlang, is_number, 1), Xs, Fun);
-type(erlang, is_pid, 1, Xs) ->
-  Fun = fun (X) -> check_guard(X, fun (Y) -> t_is_pid(Y) end, t_pid()) end,
-  strict(arg_types(erlang, is_pid, 1), Xs, Fun);
-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_record, 2, Xs) ->
+  strict(erlang, is_number, 1, Xs, Fun, Opaques);
+type(erlang, is_pid, 1, Xs, Opaques) ->
+  Fun = fun (X) ->
+            check_guard(X, fun (Y) -> t_is_pid(Y, Opaques) end,
+                        t_pid(), Opaques)
+        end,
+  strict(erlang, is_pid, 1, Xs, Fun, Opaques);
+type(erlang, is_port, 1, Xs, Opaques) ->
+  Fun = fun (X) ->
+            check_guard(X, fun (Y) -> t_is_port(Y, Opaques) end,
+                        t_port(), Opaques)
+        end,
+  strict(erlang, is_port, 1, Xs, Fun, Opaques);
+type(erlang, is_record, 2, Xs, Opaques) ->
   Fun = fun ([X, Y]) ->
-	    case t_is_tuple(X) of
+	    case t_is_tuple(X, Opaques) of
 	      false ->
-		case t_is_none(t_inf(t_tuple(), X)) of
-		  true -> t_atom('false');
+		case t_is_none(t_inf(t_tuple(), X, Opaques)) of
+		  true ->
+                    case t_has_opaque_subtype(X, Opaques) of
+                      true -> t_none();
+                      false -> t_atom('false')
+                    end;
 		  false -> t_boolean()
 		end;
 	      true ->
-		case t_tuple_subtypes(X) of
+		case t_tuple_subtypes(X, Opaques) of
 		  unknown -> t_boolean();
 		  [Tuple] ->
-		    case t_tuple_args(Tuple) of
+		    case t_tuple_args(Tuple, Opaques) of
 		      %% any -> t_boolean();
-		      [Tag|_] ->
-			case t_is_atom(Tag) of
-			  false ->
-			    TagAtom = t_inf(Tag, t_atom()),
-			    case t_is_none(TagAtom) of
-			      true -> t_atom('false');
-			      false -> t_boolean()
-			    end;
-			  true ->
-			    case t_atom_vals(Tag) of
-			      [RealTag] -> 
-				case t_atom_vals(Y) of
-				  [RealTag] -> t_atom('true');
-				  _ -> t_boolean() 
-				end;
-			      _ -> t_boolean()
-			    end
-			end
+		      [Tag|_] -> check_record_tag(Tag, Y, Opaques)
 		    end;
 		  List when length(List) >= 2 ->
 		    t_sup([type(erlang, is_record, 2, [T, Y]) || T <- List])
 		end
 	    end
 	end,
-  strict(arg_types(erlang, is_record, 2), Xs, Fun);
-type(erlang, is_record, 3, Xs) ->
+  strict(erlang, is_record, 2, Xs, Fun, Opaques);
+type(erlang, is_record, 3, Xs, Opaques) ->
   Fun = fun ([X, Y, Z]) ->
-	    Arity = t_number_vals(Z),
-	    case t_is_tuple(X) of
+	    Arity = t_number_vals(Z, Opaques),
+	    case t_is_tuple(X, Opaques) of
 	      false when length(Arity) =:= 1 ->
 		[RealArity] = Arity,
-		case t_is_none(t_inf(t_tuple(RealArity), X)) of
-		  true -> t_atom('false');
+		case t_is_none(t_inf(t_tuple(RealArity), X, Opaques)) of
+		  true ->
+                    case t_has_opaque_subtype(X, Opaques) of
+                      true -> t_none();
+                      false -> t_atom('false')
+                    end;
 		  false -> t_boolean()
 		end;
 	      false ->
-		case t_is_none(t_inf(t_tuple(), X)) of
-		  true -> t_atom('false');
+		case t_is_none(t_inf(t_tuple(), X, Opaques)) of
+		  true ->
+                    case t_has_opaque_subtype(X, Opaques) of
+                      true -> t_none();
+                      false -> t_atom('false')
+                    end;
 		  false -> t_boolean()
 		end;
 	      true when length(Arity) =:= 1 ->
 		[RealArity] = Arity,
-		case t_tuple_subtypes(X) of
+		case t_tuple_subtypes(X, Opaques) of
 		  unknown -> t_boolean();
 		  [Tuple] ->
-		    case t_tuple_args(Tuple) of
+		    case t_tuple_args(Tuple, Opaques) of
 		      %% any -> t_boolean();
 		      Args when length(Args) =:= RealArity ->
-			Tag = hd(Args),
-			case t_is_atom(Tag) of
-			  false ->
-			    TagAtom = t_inf(Tag, t_atom()),
-			    case t_is_none(TagAtom) of
-			      true -> t_atom('false');
-			      false -> t_boolean()
-			    end;
-			  true ->
-			    case t_atom_vals(Tag) of
-			      [RealTag] -> 
-				case t_atom_vals(Y) of
-				  [RealTag] -> t_atom('true');
-				  _ -> t_boolean()
-				end;
-			      _ -> t_boolean()
-			    end
-			end;
+                        check_record_tag(hd(Args), Y, Opaques);
 		      Args when length(Args) =/= RealArity ->
 			t_atom('false')
 		    end;
@@ -722,62 +747,69 @@ type(erlang, is_record, 3, Xs) ->
 		t_boolean()
 	    end
 	end,
-  strict(arg_types(erlang, is_record, 3), Xs, Fun);
-type(erlang, is_reference, 1, Xs) ->
+  strict(erlang, is_record, 3, Xs, Fun, Opaques);
+type(erlang, is_reference, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_reference(Y) end, t_reference())
+	    check_guard(X, fun (Y) -> t_is_reference(Y, Opaques) end,
+                        t_reference(), Opaques)
 	end,
-  strict(arg_types(erlang, is_reference, 1), Xs, Fun);
-type(erlang, is_tuple, 1, Xs) ->
+  strict(erlang, is_reference, 1, Xs, Fun, Opaques);
+type(erlang, is_tuple, 1, Xs, Opaques) ->
   Fun = fun (X) ->
-	    check_guard(X, fun (Y) -> t_is_tuple(Y) end, t_tuple())
+	    check_guard(X, fun (Y) -> t_is_tuple(Y, Opaques) end,
+                        t_tuple(), Opaques)
 	end,
-  strict(arg_types(erlang, is_tuple, 1), Xs, Fun);
+  strict(erlang, is_tuple, 1, Xs, Fun, Opaques);
 %% 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, make_tuple, 2, Xs) ->
-  strict(arg_types(erlang, make_tuple, 2), Xs,
+type(erlang, length, 1, Xs, Opaques) ->
+  strict(erlang, length, 1, Xs, fun (_) -> t_non_neg_fixnum() end, Opaques);
+%% Guard bif, needs to be here.
+type(erlang, map_size, 1, Xs, Opaques) ->
+  strict(erlang, map_size, 1, Xs, fun (_) -> t_non_neg_integer() end, Opaques);
+type(erlang, make_tuple, 2, Xs, Opaques) ->
+  strict(erlang, make_tuple, 2, Xs,
 	 fun ([Int, _]) ->
-	     case t_number_vals(Int) of
+	     case t_number_vals(Int, Opaques) of
 	       [N] when is_integer(N), N >= 0 -> t_tuple(N);
 	       _Other -> t_tuple()
 	     end
-	 end);
-type(erlang, make_tuple, 3, Xs) ->
-  strict(arg_types(erlang, make_tuple, 3), Xs,
+	 end, Opaques);
+type(erlang, make_tuple, 3, Xs, Opaques) ->
+  strict(erlang, make_tuple, 3, Xs,
 	 fun ([Int, _, _]) ->
-	     case t_number_vals(Int) of
+	     case t_number_vals(Int, Opaques) of
 	       [N] when is_integer(N), N >= 0 -> t_tuple(N);
 	       _Other -> t_tuple()
 	     end
-	 end);
-type(erlang, memory, 0, _) -> t_list(t_tuple([t_atom(), t_non_neg_fixnum()]));
-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);
+	 end, Opaques);
+type(erlang, memory, 0, _, _Opaques) ->
+  t_list(t_tuple([t_atom(), t_non_neg_fixnum()]));
+type(erlang, nif_error, 1, Xs, Opaques) ->
+  %% this BIF and the next one are stubs for NIFs and never return
+  strict(erlang, nif_error, 1, Xs, fun (_) -> t_any() end, Opaques);
+type(erlang, nif_error, 2, Xs, Opaques) ->
+  strict(erlang, nif_error, 2, Xs, fun (_) -> t_any() end, Opaques);
 %% Guard bif, needs to be here.
-type(erlang, node, 0, _) -> t_node();
+type(erlang, node, 0, _, _Opaques) -> 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, node, 1, Xs, Opaques) ->
+  strict(erlang, node, 1, Xs, fun (_) -> t_node() end, Opaques);
 %% Guard bif, needs to be here.
-type(erlang, round, 1, Xs) ->
-  strict(arg_types(erlang, round, 1), Xs, fun (_) -> t_integer() end);
+type(erlang, round, 1, Xs, Opaques) ->
+  strict(erlang, round, 1, Xs, fun (_) -> t_integer() end, Opaques);
 %% Guard bif, needs to be here.
-type(erlang, self, 0, _) -> t_pid();
-type(erlang, set_cookie, 2, Xs) ->
-  strict(arg_types(erlang, set_cookie, 2), Xs, fun (_) -> t_atom('true') end);
-type(erlang, setelement, 3, Xs) ->
-  strict(arg_types(erlang, setelement, 3), Xs,
+type(erlang, self, 0, _, _Opaques) -> t_pid();
+type(erlang, set_cookie, 2, Xs, Opaques) ->
+  strict(erlang, set_cookie, 2, Xs, fun (_) -> t_atom('true') end, Opaques);
+type(erlang, setelement, 3, Xs, Opaques) ->
+  strict(erlang, setelement, 3, Xs,
 	 fun ([X1, X2, X3]) ->
-	     case t_tuple_subtypes(X2) of
+	     case t_tuple_subtypes(X2, Opaques) of
 	       unknown -> t_tuple();
 	       [_] ->
-		 Sz = t_tuple_size(X2),
-		 As = t_tuple_args(X2),
-		 case t_number_vals(X1) of
+		 Sz = t_tuple_size(X2, Opaques),
+		 As = t_tuple_args(X2, Opaques),
+		 case t_number_vals(X1, Opaques) of
 		   unknown ->
 		     t_tuple([t_sup(X, X3) || X <- As]);
 		   [N] when is_integer(N), 1 =< N, N =< Sz ->
@@ -799,29 +831,29 @@ type(erlang, setelement, 3, Xs) ->
 	       Ts when is_list(Ts) ->
 		 t_sup([type(erlang, setelement, 3, [X1, Y, X3]) || Y <- Ts])
 	     end
-	 end);
+	 end, Opaques);
 %% 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, 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, 4, Xs) -> type(erlang, spawn, 4, Xs);  % same
-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, system_info, 1, Xs) ->
-  strict(arg_types(erlang, system_info, 1), Xs,
+type(erlang, size, 1, Xs, Opaques) ->
+  strict(erlang, size, 1, Xs, fun (_) -> t_non_neg_integer() end, Opaques);
+type(erlang, spawn, 1, Xs, Opaques) ->
+  strict(erlang, spawn, 1, Xs, fun (_) -> t_pid() end, Opaques);
+type(erlang, spawn, 2, Xs, Opaques) ->
+  strict(erlang, spawn, 2, Xs, fun (_) -> t_pid() end, Opaques);
+type(erlang, spawn, 4, Xs, Opaques) ->
+  strict(erlang, spawn, 4, Xs, fun (_) -> t_pid() end, Opaques);
+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, 4, Xs, _) -> type(erlang, spawn, 4, Xs);  % same
+type(erlang, subtract, 2, Xs, _Opaques) -> type(erlang, '--', 2, Xs); % alias
+type(erlang, suspend_process, 1, Xs, Opaques) ->
+  strict(erlang, suspend_process, 1, Xs,
+	 fun (_) -> t_atom('true') end, Opaques);
+type(erlang, system_info, 1, Xs, Opaques) ->
+  strict(erlang, system_info, 1, Xs,
 	 fun ([Type]) ->
-	     case t_is_atom(Type) of
+	     case t_is_atom(Type, Opaques) of
 	       true ->
-		 case t_atom_vals(Type) of
+		 case t_atom_vals(Type, Opaques) of
 		   ['allocated_areas'] ->
 		     t_list(t_sup([t_tuple([t_atom(),t_non_neg_integer()]),
 				   t_tuple([t_atom(),
@@ -936,26 +968,28 @@ type(erlang, system_info, 1, Xs) ->
 	       false ->  %% This currently handles only {allocator, Alloc}
 		 t_any() %% overapproximation as the return value might change
 	     end
-	 end);
+	 end, Opaques);
 %% 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, tl, 1, Xs, Opaques) ->
+  strict(erlang, tl, 1, Xs, fun ([X]) -> t_cons_tl(X) end, Opaques);
 %% Guard bif, needs to be here.
-type(erlang, trunc, 1, Xs) ->
-  strict(arg_types(erlang, trunc, 1), Xs, fun (_) -> t_integer() end);
+type(erlang, trunc, 1, Xs, Opaques) ->
+  strict(erlang, trunc, 1, Xs, fun (_) -> t_integer() end, Opaques);
 %% 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) ->
-  strict(arg_types(erlang, tuple_to_list, 1), Xs,
+type(erlang, tuple_size, 1, Xs, Opaques) ->
+  strict(erlang, tuple_size, 1, Xs,
+         fun (_) -> t_non_neg_integer() end, Opaques);
+type(erlang, tuple_to_list, 1, Xs, Opaques) ->
+  strict(erlang, tuple_to_list, 1, Xs,
 	 fun ([X]) ->
-	     case t_tuple_subtypes(X) of
+	     case t_tuple_subtypes(X, Opaques) of
 	       unknown -> t_list();
 	       SubTypes -> 
-		 Args = lists:flatten([t_tuple_args(ST) || ST <- SubTypes]),
+                 Args = lists:append([t_tuple_args(ST, Opaques) ||
+                                       ST <- SubTypes]),
 		 %% Can be nil if the tuple can be {}
 		 case lists:any(fun (T) ->
-				    t_tuple_size(T) =:= 0
+				    t_tuple_size(T, Opaques) =:= 0
 				end, SubTypes) of
 		   true ->
 		     %% Be careful here. If we had only {} we need to
@@ -965,279 +999,284 @@ type(erlang, tuple_to_list, 1, Xs) ->
 		     t_nonempty_list(t_sup(Args))
 		 end
 	     end
-	 end);
-type(erlang, yield, 0, _) -> t_atom('true');
+	 end, Opaques);
+type(erlang, yield, 0, _, _Opaques) -> t_atom('true');
 %%-- ets ----------------------------------------------------------------------
-type(ets, rename, 2, Xs) ->
-  strict(arg_types(ets, rename, 2), Xs, fun ([_, Name]) -> Name end);
+type(ets, rename, 2, Xs, Opaques) ->
+  strict(ets, rename, 2, Xs, fun ([_, Name]) -> Name end, Opaques);
 %%-- hipe_bifs ----------------------------------------------------------------
-type(hipe_bifs, add_ref, 2, Xs) ->
-  strict(arg_types(hipe_bifs, add_ref, 2), Xs, fun (_) -> t_nil() end);
-type(hipe_bifs, alloc_data, 2, Xs) ->
-  strict(arg_types(hipe_bifs, alloc_data, 2), Xs,
-	 fun (_) -> t_integer() end); % address
-type(hipe_bifs, array, 2, Xs) ->
-  strict(arg_types(hipe_bifs, array, 2), Xs, fun (_) -> t_immarray() end);
-type(hipe_bifs, array_length, 1, Xs) ->
-  strict(arg_types(hipe_bifs, array_length, 1), Xs,
-	 fun (_) -> t_non_neg_fixnum() end);
-type(hipe_bifs, array_sub, 2, Xs) ->
-  strict(arg_types(hipe_bifs, array_sub, 2), Xs, fun (_) -> t_immediate() end);
-type(hipe_bifs, array_update, 3, Xs) ->
-  strict(arg_types(hipe_bifs, array_update, 3), Xs,
-	 fun (_) -> t_immarray() end);
-type(hipe_bifs, atom_to_word, 1, Xs) ->
-  strict(arg_types(hipe_bifs, atom_to_word, 1), Xs,
-	 fun (_) -> t_integer() end);
-type(hipe_bifs, bif_address, 3, Xs) ->
-  strict(arg_types(hipe_bifs, bif_address, 3), Xs,
-	 fun (_) -> t_sup(t_integer(), t_atom('false')) end);
-type(hipe_bifs, bitarray, 2, Xs) ->
-  strict(arg_types(hipe_bifs, bitarray, 2), Xs, fun (_) -> t_bitarray() end);
-type(hipe_bifs, bitarray_sub, 2, Xs) ->
-  strict(arg_types(hipe_bifs, bitarray_sub, 2), Xs, fun (_) -> t_boolean() end);
-type(hipe_bifs, bitarray_update, 3, Xs) ->
-  strict(arg_types(hipe_bifs, bitarray_update, 3), Xs,
-	 fun (_) -> t_bitarray() end);
-type(hipe_bifs, bytearray, 2, Xs) ->
-  strict(arg_types(hipe_bifs, bytearray, 2), Xs, fun (_) -> t_bytearray() end);
-type(hipe_bifs, bytearray_sub, 2, Xs) ->
-  strict(arg_types(hipe_bifs, bytearray_sub, 2), Xs, fun (_) -> t_byte() end);
-type(hipe_bifs, bytearray_update, 3, Xs) ->
-  strict(arg_types(hipe_bifs, bytearray_update, 3), Xs,
-	 fun (_) -> t_bytearray() end);
-type(hipe_bifs, call_count_clear, 1, Xs) ->
-  strict(arg_types(hipe_bifs, call_count_clear, 1), Xs,
-	 fun (_) -> t_sup(t_non_neg_integer(), t_atom('false')) end);
-type(hipe_bifs, call_count_get, 1, Xs) ->
-  strict(arg_types(hipe_bifs, call_count_get, 1), Xs,
-	 fun (_) -> t_sup(t_non_neg_integer(), t_atom('false')) end);
-type(hipe_bifs, call_count_off, 1, Xs) ->
-  strict(arg_types(hipe_bifs, call_count_off, 1), Xs,
-	 fun (_) -> t_sup(t_non_neg_integer(), t_atom('false')) end);
-type(hipe_bifs, call_count_on, 1, Xs) ->
-  strict(arg_types(hipe_bifs, call_count_on, 1), Xs,
-	 fun (_) -> t_sup(t_atom('true'), t_nil()) end);
-type(hipe_bifs, check_crc, 1, Xs) ->
-  strict(arg_types(hipe_bifs, check_crc, 1), Xs, fun (_) -> t_boolean() end);
-type(hipe_bifs, enter_code, 2, Xs) ->
-  strict(arg_types(hipe_bifs, enter_code, 2), Xs,
+type(hipe_bifs, add_ref, 2, Xs, Opaques) ->
+  strict(hipe_bifs, add_ref, 2, Xs, fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, alloc_data, 2, Xs, Opaques) ->
+  strict(hipe_bifs, alloc_data, 2, Xs,
+	 fun (_) -> t_integer() end, Opaques); % address
+type(hipe_bifs, array, 2, Xs, Opaques) ->
+  strict(hipe_bifs, array, 2, Xs, fun (_) -> t_immarray() end, Opaques);
+type(hipe_bifs, array_length, 1, Xs, Opaques) ->
+  strict(hipe_bifs, array_length, 1, Xs,
+	 fun (_) -> t_non_neg_fixnum() end, Opaques);
+type(hipe_bifs, array_sub, 2, Xs, Opaques) ->
+  strict(hipe_bifs, array_sub, 2, Xs, fun (_) -> t_immediate() end, Opaques);
+type(hipe_bifs, array_update, 3, Xs, Opaques) ->
+  strict(hipe_bifs, array_update, 3, Xs,
+	 fun (_) -> t_immarray() end, Opaques);
+type(hipe_bifs, atom_to_word, 1, Xs, Opaques) ->
+  strict(hipe_bifs, atom_to_word, 1, Xs,
+	 fun (_) -> t_integer() end, Opaques);
+type(hipe_bifs, bif_address, 3, Xs, Opaques) ->
+  strict(hipe_bifs, bif_address, 3, Xs,
+	 fun (_) -> t_sup(t_integer(), t_atom('false')) end, Opaques);
+type(hipe_bifs, bitarray, 2, Xs, Opaques) ->
+  strict(hipe_bifs, bitarray, 2, Xs, fun (_) -> t_bitarray() end, Opaques);
+type(hipe_bifs, bitarray_sub, 2, Xs, Opaques) ->
+  strict(hipe_bifs, bitarray_sub, 2, Xs,
+         fun (_) -> t_boolean() end, Opaques);
+type(hipe_bifs, bitarray_update, 3, Xs, Opaques) ->
+  strict(hipe_bifs, bitarray_update, 3, Xs,
+	 fun (_) -> t_bitarray() end, Opaques);
+type(hipe_bifs, bytearray, 2, Xs, Opaques) ->
+  strict(hipe_bifs, bytearray, 2, Xs, fun (_) -> t_bytearray() end, Opaques);
+type(hipe_bifs, bytearray_sub, 2, Xs, Opaques) ->
+  strict(hipe_bifs, bytearray_sub, 2, Xs, fun (_) -> t_byte() end, Opaques);
+type(hipe_bifs, bytearray_update, 3, Xs, Opaques) ->
+  strict(hipe_bifs, bytearray_update, 3, Xs,
+	 fun (_) -> t_bytearray() end, Opaques);
+type(hipe_bifs, call_count_clear, 1, Xs, Opaques) ->
+  strict(hipe_bifs, call_count_clear, 1, Xs,
+	 fun (_) -> t_sup(t_non_neg_integer(), t_atom('false')) end, Opaques);
+type(hipe_bifs, call_count_get, 1, Xs, Opaques) ->
+  strict(hipe_bifs, call_count_get, 1, Xs,
+	 fun (_) -> t_sup(t_non_neg_integer(), t_atom('false')) end, Opaques);
+type(hipe_bifs, call_count_off, 1, Xs, Opaques) ->
+  strict(hipe_bifs, call_count_off, 1, Xs,
+	 fun (_) -> t_sup(t_non_neg_integer(), t_atom('false')) end, Opaques);
+type(hipe_bifs, call_count_on, 1, Xs, Opaques) ->
+  strict(hipe_bifs, call_count_on, 1, Xs,
+	 fun (_) -> t_sup(t_atom('true'), t_nil()) end, Opaques);
+type(hipe_bifs, check_crc, 1, Xs, Opaques) ->
+  strict(hipe_bifs, check_crc, 1, Xs, fun (_) -> t_boolean() end, Opaques);
+type(hipe_bifs, enter_code, 2, Xs, Opaques) ->
+  strict(hipe_bifs, enter_code, 2, Xs,
 	 fun (_) -> t_tuple([t_integer(),
 			     %% XXX: The tuple below contains integers and
 			     %% is of size same as the length of the MFA list
-			     t_sup(t_nil(), t_binary())]) end);
-type(hipe_bifs, enter_sdesc, 1, Xs) ->
-  strict(arg_types(hipe_bifs, enter_sdesc, 1), Xs, fun (_) -> t_nil() end);
-type(hipe_bifs, find_na_or_make_stub, 2, Xs) ->
-  strict(arg_types(hipe_bifs, find_na_or_make_stub, 2), Xs,
-	 fun (_) -> t_integer() end); % address
-type(hipe_bifs, fun_to_address, 1, Xs) ->
-  strict(arg_types(hipe_bifs, fun_to_address, 1), Xs,
-	 fun (_) -> t_integer() end);
-%% type(hipe_bifs, get_emu_address, 1, Xs) ->
-%%    strict(arg_types(hipe_bifs, get_emu_address, 1), Xs,
-%%	   fun (_) -> t_integer() end); % address
-type(hipe_bifs, get_rts_param, 1, Xs) ->
-  strict(arg_types(hipe_bifs, get_rts_param, 1), Xs,
-	 fun (_) -> t_sup(t_integer(), t_nil()) end);
-type(hipe_bifs, invalidate_funinfo_native_addresses, 1, Xs) ->
-  strict(arg_types(hipe_bifs, invalidate_funinfo_native_addresses, 1), Xs,
-	 fun (_) -> t_nil() end);
-type(hipe_bifs, make_fe, 3, Xs) ->
-  strict(arg_types(hipe_bifs, make_fe, 3), Xs, fun (_) -> t_integer() end);
-%% type(hipe_bifs, make_native_stub, 2, Xs) ->
-%%    strict(arg_types(hipe_bifs, make_native_stub, 2), Xs,
-%%	   fun (_) -> t_integer() end); % address
-type(hipe_bifs, mark_referred_from, 1, Xs) ->
-  strict(arg_types(hipe_bifs, mark_referred_from, 1), Xs,
-	 fun (_) -> t_nil() end);
-type(hipe_bifs, merge_term, 1, Xs) ->
-  strict(arg_types(hipe_bifs, merge_term, 1), Xs, fun ([X]) -> X end);
-type(hipe_bifs, nstack_used_size, 0, _) ->
+			     t_sup(t_nil(), t_binary())]) end, Opaques);
+type(hipe_bifs, enter_sdesc, 1, Xs, Opaques) ->
+  strict(hipe_bifs, enter_sdesc, 1, Xs, fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, find_na_or_make_stub, 2, Xs, Opaques) ->
+  strict(hipe_bifs, find_na_or_make_stub, 2, Xs,
+	 fun (_) -> t_integer() end, Opaques); % address
+type(hipe_bifs, fun_to_address, 1, Xs, Opaques) ->
+  strict(hipe_bifs, fun_to_address, 1, Xs,
+	 fun (_) -> t_integer() end, Opaques);
+%% type(hipe_bifs, get_emu_address, 1, Xs, Opaques) ->
+%%    strict(hipe_bifs, get_emu_address, 1, Xs,
+%%	   fun (_) -> t_integer() end, Opaques); % address
+type(hipe_bifs, get_rts_param, 1, Xs, Opaques) ->
+  strict(hipe_bifs, get_rts_param, 1, Xs,
+	 fun (_) -> t_sup(t_integer(), t_nil()) end, Opaques);
+type(hipe_bifs, invalidate_funinfo_native_addresses, 1, Xs, Opaques) ->
+  strict(hipe_bifs, invalidate_funinfo_native_addresses, 1, Xs,
+	 fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, make_fe, 3, Xs, Opaques) ->
+  strict(hipe_bifs, make_fe, 3, Xs, fun (_) -> t_integer() end, Opaques);
+%% type(hipe_bifs, make_native_stub, 2, Xs, Opaques) ->
+%%    strict(hipe_bifs, make_native_stub, 2, Xs,
+%%	   fun (_) -> t_integer() end, Opaques); % address
+type(hipe_bifs, mark_referred_from, 1, Xs, Opaques) ->
+  strict(hipe_bifs, mark_referred_from, 1, Xs,
+	 fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, merge_term, 1, Xs, Opaques) ->
+  strict(hipe_bifs, merge_term, 1, Xs, fun ([X]) -> X end, Opaques);
+type(hipe_bifs, nstack_used_size, 0, _, _Opaques) ->
   t_non_neg_fixnum();
-type(hipe_bifs, patch_call, 3, Xs) ->
-  strict(arg_types(hipe_bifs, patch_call, 3), Xs, fun (_) -> t_nil() end);
-type(hipe_bifs, patch_insn, 3, Xs) ->
-  strict(arg_types(hipe_bifs, patch_insn, 3), Xs, fun (_) -> t_nil() end);
-type(hipe_bifs, primop_address, 1, Xs) ->
-  strict(arg_types(hipe_bifs, primop_address, 1), Xs,
-	 fun (_) -> t_sup(t_integer(), t_atom('false')) end);
-type(hipe_bifs, redirect_referred_from, 1, Xs) ->
-  strict(arg_types(hipe_bifs, redirect_referred_from, 1), Xs,
-	 fun (_) -> t_nil() end);
-type(hipe_bifs, ref, 1, Xs) ->
-  strict(arg_types(hipe_bifs, ref, 1), Xs, fun (_) -> t_immarray() end);
-type(hipe_bifs, ref_get, 1, Xs) ->
-  strict(arg_types(hipe_bifs, ref_get, 1), Xs, fun (_) -> t_immediate() end);
-type(hipe_bifs, ref_set, 2, Xs) ->
-  strict(arg_types(hipe_bifs, ref_set, 2), Xs, fun (_) -> t_nil() end);
-type(hipe_bifs, remove_refs_from, 1, Xs) ->
-  strict(arg_types(hipe_bifs, remove_refs_from, 1), Xs,
-	 fun (_) -> t_atom('ok') end);
-type(hipe_bifs, set_funinfo_native_address, 3, Xs) ->
-  strict(arg_types(hipe_bifs, set_funinfo_native_address, 3), Xs,
-	 fun (_) -> t_nil() end);
-type(hipe_bifs, set_native_address, 3, Xs) ->
-  strict(arg_types(hipe_bifs, set_native_address, 3), Xs,
-	 fun (_) -> t_nil() end);
-type(hipe_bifs, system_crc, 1, Xs) ->
-  strict(arg_types(hipe_bifs, system_crc, 1), Xs, fun (_) -> t_crc32() end);
-type(hipe_bifs, term_to_word, 1, Xs) ->
-  strict(arg_types(hipe_bifs, term_to_word, 1), Xs,
-	 fun (_) -> t_integer() end);
-type(hipe_bifs, update_code_size, 3, Xs) ->
-  strict(arg_types(hipe_bifs, update_code_size, 3), Xs,
-	 fun (_) -> t_nil() end);
-type(hipe_bifs, write_u8, 2, Xs) ->
-  strict(arg_types(hipe_bifs, write_u8, 2), Xs, fun (_) -> t_nil() end);
-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);
+type(hipe_bifs, patch_call, 3, Xs, Opaques) ->
+  strict(hipe_bifs, patch_call, 3, Xs, fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, patch_insn, 3, Xs, Opaques) ->
+  strict(hipe_bifs, patch_insn, 3, Xs, fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, primop_address, 1, Xs, Opaques) ->
+  strict(hipe_bifs, primop_address, 1, Xs,
+	 fun (_) -> t_sup(t_integer(), t_atom('false')) end, Opaques);
+type(hipe_bifs, redirect_referred_from, 1, Xs, Opaques) ->
+  strict(hipe_bifs, redirect_referred_from, 1, Xs,
+	 fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, ref, 1, Xs, Opaques) ->
+  strict(hipe_bifs, ref, 1, Xs, fun (_) -> t_immarray() end, Opaques);
+type(hipe_bifs, ref_get, 1, Xs, Opaques) ->
+  strict(hipe_bifs, ref_get, 1, Xs, fun (_) -> t_immediate() end, Opaques);
+type(hipe_bifs, ref_set, 2, Xs, Opaques) ->
+  strict(hipe_bifs, ref_set, 2, Xs, fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, remove_refs_from, 1, Xs, Opaques) ->
+  strict(hipe_bifs, remove_refs_from, 1, Xs,
+	 fun (_) -> t_atom('ok') end, Opaques);
+type(hipe_bifs, set_funinfo_native_address, 3, Xs, Opaques) ->
+  strict(hipe_bifs, set_funinfo_native_address, 3, Xs,
+	 fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, set_native_address, 3, Xs, Opaques) ->
+  strict(hipe_bifs, set_native_address, 3, Xs,
+	 fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, system_crc, 1, Xs, Opaques) ->
+  strict(hipe_bifs, system_crc, 1, Xs, fun (_) -> t_crc32() end, Opaques);
+type(hipe_bifs, term_to_word, 1, Xs, Opaques) ->
+  strict(hipe_bifs, term_to_word, 1, Xs,
+	 fun (_) -> t_integer() end, Opaques);
+type(hipe_bifs, update_code_size, 3, Xs, Opaques) ->
+  strict(hipe_bifs, update_code_size, 3, Xs,
+	 fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, write_u8, 2, Xs, Opaques) ->
+  strict(hipe_bifs, write_u8, 2, Xs, fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, write_u32, 2, Xs, Opaques) ->
+  strict(hipe_bifs, write_u32, 2, Xs, fun (_) -> t_nil() end, Opaques);
+type(hipe_bifs, write_u64, 2, Xs, Opaques) ->
+  strict(hipe_bifs, write_u64, 2, Xs, fun (_) -> t_nil() end, Opaques);
 %%-- lists --------------------------------------------------------------------
-type(lists, all, 2, Xs) ->
-  strict(arg_types(lists, all, 2), Xs, 
+type(lists, all, 2, Xs, Opaques) ->
+  strict(lists, all, 2, Xs,
 	 fun ([F, L]) -> 
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> t_atom('true');
 	       false ->
-		 El = t_list_elements(L),
-		 case check_fun_application(F, [El]) of
+		 El = t_list_elements(L, Opaques),
+		 case check_fun_application(F, [El], Opaques) of
 		   ok -> 
-		     case t_is_cons(L) of
-		       true -> t_fun_range(F);
+		     case t_is_cons(L, Opaques) of
+		       true -> t_fun_range(F, Opaques);
 		       false -> 
 			 %% The list can be empty.
-			 t_sup(t_atom('true'), t_fun_range(F))
+			 t_sup(t_atom('true'), t_fun_range(F, Opaques))
 		     end;
 		   error ->
-		     case t_is_cons(L) of
+		     case t_is_cons(L, Opaques) of
 		       true -> t_none();
-		       false -> t_fun_range(F)
+		       false -> t_fun_range(F, Opaques)
 		     end
 		 end
 	     end
-	 end);
-type(lists, any, 2, Xs) ->
-  strict(arg_types(lists, any, 2), Xs, 
+	 end, Opaques);
+type(lists, any, 2, Xs, Opaques) ->
+  strict(lists, any, 2, Xs,
 	 fun ([F, L]) -> 
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> t_atom('false');
 	       false ->
-		 El = t_list_elements(L),
-		 case check_fun_application(F, [El]) of
+		 El = t_list_elements(L, Opaques),
+		 case check_fun_application(F, [El], Opaques) of
 		   ok -> 
-		     case t_is_cons(L) of
-		       true -> t_fun_range(F);
+		     case t_is_cons(L, Opaques) of
+		       true -> t_fun_range(F, Opaques);
 		       false -> 
 			 %% The list can be empty
-			 t_sup(t_atom('false'), t_fun_range(F))
+			 t_sup(t_atom('false'), t_fun_range(F, Opaques))
 		     end;
 		   error ->
-		     case t_is_cons(L) of
+		     case t_is_cons(L, Opaques) of
 		       true -> t_none();
-		       false -> t_fun_range(F)
+		       false -> t_fun_range(F, Opaques)
 		     end
 		 end
 	     end
-	 end);
-type(lists, append, 2, Xs) -> type(erlang, '++', 2, Xs);  % alias
-type(lists, delete, 2, Xs) ->
-  strict(arg_types(lists, delete, 2), Xs, 
+	 end, Opaques);
+type(lists, append, 2, Xs, _Opaques) -> type(erlang, '++', 2, Xs);  % alias
+type(lists, delete, 2, Xs, Opaques) ->
+  strict(lists, delete, 2, Xs,
 	 fun ([_, List]) -> 
-	     case t_is_cons(List) of
+	     case t_is_cons(List, Opaques) of
 	       true -> t_cons_tl(List);
 	       false -> List
 	     end
-	 end);
-type(lists, dropwhile, 2, Xs) -> 
-  strict(arg_types(lists, dropwhile, 2), Xs,
+	 end, Opaques);
+type(lists, dropwhile, 2, Xs, Opaques) ->
+  strict(lists, dropwhile, 2, Xs,
 	 fun ([F, X]) -> 
-	     case t_is_nil(X) of
+	     case t_is_nil(X, Opaques) of
 	       true -> t_nil();
 	       false ->
-		 X1 = t_list_elements(X),
-		 case check_fun_application(F, [X1]) of
+		 X1 = t_list_elements(X, Opaques),
+		 case check_fun_application(F, [X1], Opaques) of
 		   ok ->
-		     case t_atom_vals(t_fun_range(F)) of
+		     case t_atom_vals(t_fun_range(F, Opaques), Opaques) of
 		       ['true'] ->
-			 case t_is_none(t_inf(t_list(), X)) of
+			 case t_is_none(t_inf(t_list(), X, Opaques)) of
 			   true -> t_none();
 			   false -> t_nil()
 			 end;
 		       ['false'] -> 
-			 case t_is_none(t_inf(t_list(), X)) of
+			 case t_is_none(t_inf(t_list(), X, Opaques)) of
 			   true -> t_none();
 			   false -> X
 			 end;
 		       _ -> 
-			 t_inf(t_cons_tl(t_inf(X, t_cons())), 
-			       t_maybe_improper_list())
+			 t_inf(t_cons_tl(t_inf(X, t_cons(), Opaques)),
+                             t_maybe_improper_list(), Opaques)
 		     end;
 		   error ->
-		     case t_is_cons(X) of
+		     case t_is_cons(X, Opaques) of
 		       true -> t_none();
 		       false -> t_nil()
 		     end
 		 end
 	     end
-	 end);
-type(lists, filter, 2, Xs) ->
-  strict(arg_types(lists, filter, 2), Xs,
+	 end, Opaques);
+type(lists, filter, 2, Xs, Opaques) ->
+  strict(lists, filter, 2, Xs,
 	 fun ([F, L]) -> 
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> t_nil();
 	       false ->
-		 T = t_list_elements(L),
-		 case check_fun_application(F, [T]) of
+		 T = t_list_elements(L, Opaques),
+		 case check_fun_application(F, [T], Opaques) of
 		   ok ->
-		     case t_atom_vals(t_fun_range(F)) =:= ['false'] of
+                     RangeVals = t_atom_vals(t_fun_range(F, Opaques), Opaques),
+		     case RangeVals =:= ['false'] of
 		       true -> t_nil();
 		       false -> 
-			 case t_atom_vals(t_fun_range(F)) =:= ['true'] of
+			 case RangeVals =:= ['true'] of
 			   true -> L;
 			   false -> t_list(T)
 			 end
 		     end;
 		   error ->
-		     case t_is_cons(L) of
+		     case t_is_cons(L, Opaques) of
 		       true -> t_none();
 		       false -> t_nil()
 		     end
 		 end
 	     end
-	 end);
-type(lists, flatten, 1, Xs) ->
-  strict(arg_types(lists, flatten, 1), Xs,
+	 end, Opaques);
+type(lists, flatten, 1, Xs, Opaques) ->
+  strict(lists, flatten, 1, Xs,
 	 fun ([L]) ->
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> L;    % (nil has undefined elements)
 	       false ->
 		 %% Avoiding infinite recursion is tricky
-		 X1 = t_list_elements(L),
+		 X1 = t_list_elements(L, Opaques),
 		 case t_is_any(X1) of
 		   true -> 
 		     t_list();
 		   false ->
-		     X2 = type(lists, flatten, 1, [t_inf(X1, t_list())]),
+		     X2 = type(lists, flatten, 1, [t_inf(X1, t_list(), Opaques)]),
 		     t_sup(t_list(t_subtract(X1, t_list())), X2)
 		 end
 	     end
-	 end);
-type(lists, flatmap, 2, Xs) ->
-  strict(arg_types(lists, flatmap, 2), Xs,
+	 end, Opaques);
+type(lists, flatmap, 2, Xs, Opaques) ->
+  strict(lists, flatmap, 2, Xs,
 	 fun ([F, List]) -> 
-	     case t_is_nil(List) of
+	     case t_is_nil(List, Opaques) of
 	       true -> t_nil();
 	       false ->
-		 case check_fun_application(F, [t_list_elements(List)]) of
+		 case
+                   check_fun_application(F, [t_list_elements(List, Opaques)],
+                                         Opaques)
+                 of
 		   ok ->
-		     R = t_fun_range(F),
+		     R = t_fun_range(F, Opaques),
 		     case t_is_nil(R) of
 		       true -> t_nil();
 		       false ->
-			 Elems = t_list_elements(R),
-			 case t_is_cons(List) of
+			 Elems = t_list_elements(R, Opaques),
+			 case t_is_cons(List, Opaques) of
 			   true ->
 			     case t_is_subtype(t_nil(), R) of
 			       true -> t_list(Elems);
@@ -1247,58 +1286,65 @@ type(lists, flatmap, 2, Xs) ->
 			 end
 		     end;
 		   error ->
-		     case t_is_cons(List) of
+		     case t_is_cons(List, Opaques) of
 		       true -> t_none();
 		       false -> t_nil()
 		     end
 		 end
  	     end
-	 end);
-type(lists, foreach, 2, Xs) ->
-  strict(arg_types(lists, foreach, 2), Xs,
+	 end, Opaques);
+type(lists, foreach, 2, Xs, Opaques) ->
+  strict(lists, foreach, 2, Xs,
 	 fun ([F, List]) ->
-	     case t_is_cons(List) of
+	     case t_is_cons(List, Opaques) of
 	       true ->
-		 case check_fun_application(F, [t_list_elements(List)]) of
+		 case
+                   check_fun_application(F, [t_list_elements(List, Opaques)],
+                                         Opaques)
+                 of
 		   ok -> t_atom('ok');
 		   error -> t_none()
 		 end;
 	       false ->
 		 t_atom('ok')
 	     end
-	 end);
-type(lists, foldl, 3, Xs) ->
-  strict(arg_types(lists, foldl, 3), Xs,
+	 end, Opaques);
+type(lists, foldl, 3, Xs, Opaques) ->
+  strict(lists, foldl, 3, Xs,
 	 fun ([F, Acc, List]) ->
-	     case t_is_nil(List) of
+	     case t_is_nil(List, Opaques) of
 	       true -> Acc;
 	       false ->
-		 case check_fun_application(F, [t_list_elements(List), Acc]) of
+		 case
+                   check_fun_application(F,
+                                         [t_list_elements(List, Opaques),Acc],
+                                         Opaques)
+                 of
 		   ok ->
-		     case t_is_cons(List) of
-		       true -> t_fun_range(F);
-		       false -> t_sup(t_fun_range(F), Acc)
+		     case t_is_cons(List, Opaques) of
+		       true -> t_fun_range(F, Opaques);
+		       false -> t_sup(t_fun_range(F, Opaques), Acc)
 		     end;
 		   error ->
-		     case t_is_cons(List) of
+		     case t_is_cons(List, Opaques) of
 		       true -> t_none();
 		       false -> Acc
 		     end
 		 end
 	     end
-	 end);
-type(lists, foldr, 3, Xs) -> type(lists, foldl, 3, Xs);    % same
-type(lists, keydelete, 3, Xs) ->
-  strict(arg_types(lists, keydelete, 3), Xs, 
+	 end, Opaques);
+type(lists, foldr, 3, Xs, _Opaques) -> type(lists, foldl, 3, Xs);  % same
+type(lists, keydelete, 3, Xs, Opaques) ->
+  strict(lists, keydelete, 3, Xs,
 	 fun ([_, _, L]) ->
 	     Term = t_list_termination(L),
 	     t_sup(Term, erl_types:lift_list_to_pos_empty(L))
-	 end);
-type(lists, keyfind, 3, Xs) ->
-  strict(arg_types(lists, keyfind, 3), Xs,
+	 end, Opaques);
+type(lists, keyfind, 3, Xs, Opaques) ->
+  strict(lists, keyfind, 3, Xs,
 	 fun ([X, Y, Z]) ->
-	     ListEs = t_list_elements(Z),
-	     Tuple = t_inf(t_tuple(), ListEs),
+	     ListEs = t_list_elements(Z, Opaques),
+	     Tuple = t_inf(t_tuple(), ListEs, Opaques),
 	     case t_is_none(Tuple) of
 	       true -> t_atom('false');
 	       false ->
@@ -1308,58 +1354,61 @@ type(lists, keyfind, 3, Xs) ->
 		 case t_is_any(X) of
 		   true -> Ret;
 		   false ->
-		     case t_tuple_subtypes(Tuple) of
+		     case t_tuple_subtypes(Tuple, Opaques) of
 		       unknown -> Ret;
 		       List ->
-			 case key_comparisons_fail(X, Y, List) of
+			 case key_comparisons_fail(X, Y, List, Opaques) of
 			   true -> t_atom('false');
 			   false -> Ret
 			 end
 		     end
 		 end
 	     end
-	 end);
-type(lists, keymap, 3, Xs) ->
-  strict(arg_types(lists, keymap, 3), Xs,
+	 end, Opaques);
+type(lists, keymap, 3, Xs, Opaques) ->
+  strict(lists, keymap, 3, Xs,
 	 fun ([F, _I, L]) ->
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> L;
-	       false -> t_list(t_sup(t_fun_range(F), t_list_elements(L)))
+	       false -> t_list(t_sup(t_fun_range(F, Opaques),
+                                     t_list_elements(L, Opaques)))
 	     end
-	 end);
-type(lists, keymember, 3, Xs) ->
-  strict(arg_types(lists, keymember, 3), Xs,
+	 end, Opaques);
+type(lists, keymember, 3, Xs, Opaques) ->
+  strict(lists, keymember, 3, Xs,
 	 fun ([X, Y, Z]) ->
-	     ListEs = t_list_elements(Z),
-	     Tuple = t_inf(t_tuple(), ListEs),
+	     ListEs = t_list_elements(Z, Opaques),
+	     Tuple = t_inf(t_tuple(), ListEs, Opaques),
 	     case t_is_none(Tuple) of
 	       true -> t_atom('false');
 	       false ->
 		 case t_is_any(X) of
 		   true -> t_boolean();
 		   false ->
-		     case t_tuple_subtypes(Tuple) of
+		     case t_tuple_subtypes(Tuple, Opaques) of
 		       unknown -> t_boolean();
 		       List ->
-			 case key_comparisons_fail(X, Y, List) of
+			 case key_comparisons_fail(X, Y, List, Opaques) of
 			   true -> t_atom('false');
 			   false -> t_boolean()
 			 end
 		     end
 		 end
 	     end
-	 end);
-type(lists, keymerge, 3, Xs) ->
-  strict(arg_types(lists, keymerge, 3), Xs,
-	 fun ([_I, L1, L2]) -> type(lists, merge, 2, [L1, L2]) end);
-type(lists, keyreplace, 4, Xs) ->
-  strict(arg_types(lists, keyreplace, 4), Xs,
-	 fun ([_K, _I, L, T]) -> t_list(t_sup(t_list_elements(L), T)) end);
-type(lists, keysearch, 3, Xs) ->
-  strict(arg_types(lists, keysearch, 3), Xs,
+	 end, Opaques);
+type(lists, keymerge, 3, Xs, Opaques) ->
+  strict(lists, keymerge, 3, Xs,
+	 fun ([_I, L1, L2]) -> type(lists, merge, 2, [L1, L2]) end, Opaques);
+type(lists, keyreplace, 4, Xs, Opaques) ->
+  strict(lists, keyreplace, 4, Xs,
+	 fun ([_K, _I, L, T]) ->
+             t_list(t_sup(t_list_elements(L, Opaques), T))
+         end, Opaques);
+type(lists, keysearch, 3, Xs, Opaques) ->
+  strict(lists, keysearch, 3, Xs,
 	 fun ([X, Y, Z]) ->
-	     ListEs = t_list_elements(Z),
-	     Tuple = t_inf(t_tuple(), ListEs),
+	     ListEs = t_list_elements(Z, Opaques),
+	     Tuple = t_inf(t_tuple(), ListEs, Opaques),
 	     case t_is_none(Tuple) of
 	       true -> t_atom('false');
 	       false ->
@@ -1368,91 +1417,93 @@ type(lists, keysearch, 3, Xs) ->
 		 case t_is_any(X) of
 		   true -> Ret;
 		   false ->
-		     case t_tuple_subtypes(Tuple) of
+		     case t_tuple_subtypes(Tuple, Opaques) of
 		       unknown -> Ret;
 		       List ->
-			 case key_comparisons_fail(X, Y, List) of
+			 case key_comparisons_fail(X, Y, List, Opaques) of
 			   true -> t_atom('false');
 			   false -> Ret
 			 end
 		     end
 		 end
 	     end
-	 end);
-type(lists, keysort, 2, Xs) ->
-  strict(arg_types(lists, keysort, 2), Xs, fun ([_, L]) -> L end);
-type(lists, last, 1, Xs) ->
-  strict(arg_types(lists, last, 1), Xs, fun ([L]) -> t_list_elements(L) end);
-type(lists, map, 2, Xs) ->
-  strict(arg_types(lists, map, 2), Xs,
+	 end, Opaques);
+type(lists, keysort, 2, Xs, Opaques) ->
+  strict(lists, keysort, 2, Xs, fun ([_, L]) -> L end, Opaques);
+type(lists, last, 1, Xs, Opaques) ->
+  strict(lists, last, 1, Xs,
+         fun ([L]) -> t_list_elements(L, Opaques) end, Opaques);
+type(lists, map, 2, Xs, Opaques) ->
+  strict(lists, map, 2, Xs,
 	 fun ([F, L]) -> 
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> L;
 	       false ->
-		 El = t_list_elements(L),
-		 case t_is_cons(L) of
+		 El = t_list_elements(L, Opaques),
+		 case t_is_cons(L, Opaques) of
 		   true ->
-		     case check_fun_application(F, [El]) of
-		       ok -> t_nonempty_list(t_fun_range(F));
+		     case check_fun_application(F, [El], Opaques) of
+		       ok -> t_nonempty_list(t_fun_range(F, Opaques));
 		       error -> t_none()
 		     end;
 		   false ->
-		     case check_fun_application(F, [El]) of
-		       ok -> t_list(t_fun_range(F));
+		     case check_fun_application(F, [El], Opaques) of
+		       ok -> t_list(t_fun_range(F, Opaques));
 		       error -> t_nil()
 		     end
 		 end
 	     end
-	 end);
-type(lists, mapfoldl, 3, Xs) ->
-  strict(arg_types(lists, mapfoldl, 3), Xs,
+	 end, Opaques);
+type(lists, mapfoldl, 3, Xs, Opaques) ->
+  strict(lists, mapfoldl, 3, Xs,
 	 fun ([F, Acc, List]) ->
-	     case t_is_nil(List) of
+	     case t_is_nil(List, Opaques) of
 	       true -> t_tuple([List, Acc]);
 	       false ->
-		 El = t_list_elements(List),
-		 R = t_fun_range(F),
-		 case t_is_cons(List) of
+		 El = t_list_elements(List, Opaques),
+		 R = t_fun_range(F, Opaques),
+		 case t_is_cons(List, Opaques) of
 		   true ->
-		     case check_fun_application(F, [El, Acc]) of
+		     case check_fun_application(F, [El, Acc], Opaques) of
 		       ok ->
 			 Fun = fun (RangeTuple) ->
-				   [T1, T2] = t_tuple_args(RangeTuple),
+				   [T1, T2] = t_tuple_args(RangeTuple, Opaques),
 				   t_tuple([t_nonempty_list(T1), T2])
 			       end,
-			 t_sup([Fun(ST) || ST <- t_tuple_subtypes(R)]);
+			 t_sup([Fun(ST) || ST <- t_tuple_subtypes(R, Opaques)]);
 		       error -> 
 			 t_none()
 		     end;
 		   false ->
-		     case check_fun_application(F, [El, Acc]) of
+		     case check_fun_application(F, [El, Acc], Opaques) of
 		       ok ->
 			 Fun = fun (RangeTuple) ->
-				   [T1, T2] = t_tuple_args(RangeTuple),
+				   [T1, T2] = t_tuple_args(RangeTuple, Opaques),
 				   t_tuple([t_list(T1), t_sup(Acc, T2)])
 			       end,
-			 t_sup([Fun(ST) || ST <- t_tuple_subtypes(R)]);
+			 t_sup([Fun(ST) || ST <- t_tuple_subtypes(R, Opaques)]);
 		       error ->
 			 t_tuple([t_nil(), Acc])
 		     end
 		 end
 	     end
-	 end);
-type(lists, mapfoldr, 3, Xs) -> type(lists, mapfoldl, 3, Xs);    % same
-type(lists, max, 1, Xs) ->
-  strict(arg_types(lists, max, 1), Xs, fun ([L]) -> t_list_elements(L) end);
-type(lists, member, 2, Xs) ->
-  strict(arg_types(lists, member, 2), Xs,
+	 end, Opaques);
+type(lists, mapfoldr, 3, Xs, _Opaques) -> type(lists, mapfoldl, 3, Xs); % same
+type(lists, max, 1, Xs, Opaques) ->
+  strict(lists, max, 1, Xs,
+         fun ([L]) -> t_list_elements(L, Opaques) end, Opaques);
+type(lists, member, 2, Xs, Opaques) ->
+  strict(lists, member, 2, Xs,
 	 fun ([X, Y]) ->
-	     Y1 = t_list_elements(Y),
-	     case t_is_none(t_inf(Y1, X)) of
+	     Y1 = t_list_elements(Y, Opaques),
+	     case t_is_none(t_inf(Y1, X, Opaques)) of
 	       true -> t_atom('false');
 	       false -> t_boolean()
 	     end
-	 end);
-%% type(lists, merge, 1, Xs) ->
-type(lists, merge, 2, Xs) ->
-  strict(arg_types(lists, merge, 2), Xs,
+	 end, Opaques);
+%% type(lists, merge, 1, Xs, Opaques) ->
+type(lists, merge, 2, Xs, Opaques) ->
+  strict(lists, merge, 2, Xs,
 	 fun ([L1, L2]) ->
 	     case t_is_none(L1) of
 	       true -> L2;
@@ -1462,30 +1513,31 @@ type(lists, merge, 2, Xs) ->
 		   false -> t_sup(L1, L2)
 		 end
 	     end
-	 end);
-type(lists, min, 1, Xs) ->
-  strict(arg_types(lists, min, 1), Xs, fun ([L]) -> t_list_elements(L) end);
-type(lists, nth, 2, Xs) ->
-  strict(arg_types(lists, nth, 2), Xs,
-	 fun ([_, Y]) -> t_list_elements(Y) end);
-type(lists, nthtail, 2, Xs) ->
-  strict(arg_types(lists, nthtail, 2), Xs,
-	 fun ([_, Y]) -> t_sup(Y, t_list()) end);
-type(lists, partition, 2, Xs) ->
-  strict(arg_types(lists, partition, 2), Xs,
+	 end, Opaques);
+type(lists, min, 1, Xs, Opaques) ->
+  strict(lists, min, 1, Xs,
+         fun ([L]) -> t_list_elements(L, Opaques) end, Opaques);
+type(lists, nth, 2, Xs, Opaques) ->
+  strict(lists, nth, 2, Xs,
+	 fun ([_, Y]) -> t_list_elements(Y, Opaques) end, Opaques);
+type(lists, nthtail, 2, Xs, Opaques) ->
+  strict(lists, nthtail, 2, Xs,
+	 fun ([_, Y]) -> t_sup(Y, t_list()) end, Opaques);
+type(lists, partition, 2, Xs, Opaques) ->
+  strict(lists, partition, 2, Xs,
 	 fun ([F, L]) ->
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> t_tuple([L,L]);
 	       false ->
-		 El = t_list_elements(L),
-		 case check_fun_application(F, [El]) of
+		 El = t_list_elements(L, Opaques),
+		 case check_fun_application(F, [El], Opaques) of
 		   error -> 
-		     case t_is_cons(L) of
+		     case t_is_cons(L, Opaques) of
 		       true -> t_none();
 		       false -> t_tuple([t_nil(), t_nil()])
 		     end;
 		   ok ->
-		     case t_atom_vals(t_fun_range(F)) of
+		     case t_atom_vals(t_fun_range(F, Opaques), Opaques) of
 		       ['true'] -> t_tuple([L, t_nil()]);
 		       ['false'] -> t_tuple([t_nil(), L]);
 		       [_, _] ->
@@ -1494,123 +1546,131 @@ type(lists, partition, 2, Xs) ->
 		     end
 		 end
 	     end
-	 end);
-type(lists, reverse, 1, Xs) ->
-  strict(arg_types(lists, reverse, 1), Xs, fun ([X]) -> X end);
-type(lists, reverse, 2, Xs) ->
+	 end, Opaques);
+type(lists, reverse, 1, Xs, Opaques) ->
+  strict(lists, reverse, 1, Xs, fun ([X]) -> X end, Opaques);
+type(lists, reverse, 2, Xs, _Opaques) ->
   type(erlang, '++', 2, Xs);    % reverse-onto is just like append
-type(lists, sort, 1, Xs) ->
-  strict(arg_types(lists, sort, 1), Xs, fun ([X]) -> X end);
-type(lists, sort, 2, Xs) ->
-  strict(arg_types(lists, sort, 2), Xs,
+type(lists, sort, 1, Xs, Opaques) ->
+  strict(lists, sort, 1, Xs, fun ([X]) -> X end, Opaques);
+type(lists, sort, 2, Xs, Opaques) ->
+  strict(lists, sort, 2, Xs,
 	 fun ([F, L]) ->
-	     R = t_fun_range(F),
-	     case t_is_boolean(R) of
+	     R = t_fun_range(F, Opaques),
+	     case t_is_boolean(R, Opaques) of
 	       true -> L;
 	       false ->
-		 case t_is_nil(L) of
+		 case t_is_nil(L, Opaques) of
 		   true -> t_nil();
 		   false -> t_none()
 		 end
 	     end
-	 end);
-type(lists, split, 2, Xs) ->
-  strict(arg_types(lists, split, 2), Xs,
+	 end, Opaques);
+type(lists, split, 2, Xs, Opaques) ->
+  strict(lists, split, 2, Xs,
 	 fun ([_, L]) ->
-	     case t_is_nil(L) of
+	     case t_is_nil(L, Opaques) of
 	       true -> t_tuple([L, L]);
 	       false ->
-		 T = t_list_elements(L),
+		 T = t_list_elements(L, Opaques),
 		 t_tuple([t_list(T), t_list(T)])
 	     end
-	 end);
-type(lists, splitwith, 2, Xs) -> 
+	 end, Opaques);
+type(lists, splitwith, 2, Xs, _Opaques) ->
   T1 = type(lists, takewhile, 2, Xs),
   T2 = type(lists, dropwhile, 2, Xs),
   case t_is_none(T1) orelse t_is_none(T2) of
     true -> t_none();
     false -> t_tuple([T1, T2])
   end;
-type(lists, subtract, 2, Xs) -> type(erlang, '--', 2, Xs);  % alias
-type(lists, takewhile, 2, Xs) ->
-  strict(arg_types(lists, takewhile, 2), Xs,
+type(lists, subtract, 2, Xs, _Opaques) -> type(erlang, '--', 2, Xs);  % alias
+type(lists, takewhile, 2, Xs, Opaques) ->
+  strict(lists, takewhile, 2, Xs,
 	 fun([F, L]) ->
-	     case t_is_none(t_inf(t_list(), L)) of
+	     case t_is_none(t_inf(t_list(), L, Opaques)) of
 	       false -> type(lists, filter, 2, Xs);
 	       true ->
 		 %% This works for non-proper lists as well.
-		 El = t_list_elements(L),
+		 El = t_list_elements(L, Opaques),
 		 type(lists, filter, 2, [F, t_list(El)])
 	     end
-	 end);
-type(lists, usort, 1, Xs) -> type(lists, sort, 1, Xs); % same
-type(lists, usort, 2, Xs) -> type(lists, sort, 2, Xs); % same
-type(lists, unzip, 1, Xs) ->
-  strict(arg_types(lists, unzip, 1), Xs, 
+	 end, Opaques);
+type(lists, usort, 1, Xs, _Opaques) -> type(lists, sort, 1, Xs); % same
+type(lists, usort, 2, Xs, _Opaques) -> type(lists, sort, 2, Xs); % same
+type(lists, unzip, 1, Xs, Opaques) ->
+  strict(lists, unzip, 1, Xs,
  	 fun ([Ps]) ->
-	     case t_is_nil(Ps) of
+	     case t_is_nil(Ps, Opaques) of
 	       true ->
 		 t_tuple([t_nil(), t_nil()]);
 	       false -> % Ps is a proper list of pairs
-		 TupleTypes = t_tuple_subtypes(t_list_elements(Ps)),
+		 TupleTypes = t_tuple_subtypes(t_list_elements(Ps, Opaques),
+                                               Opaques),
 		 lists:foldl(fun(Tuple, Acc) ->
-				 [A, B] = t_tuple_args(Tuple),
+				 [A, B] = t_tuple_args(Tuple, Opaques),
 				 t_sup(t_tuple([t_list(A), t_list(B)]), Acc)
 			     end, t_none(), TupleTypes)
 	     end
- 	 end);
-type(lists, unzip3, 1, Xs) ->
-  strict(arg_types(lists, unzip3, 1), Xs, 
+         end, Opaques);
+type(lists, unzip3, 1, Xs, Opaques) ->
+  strict(lists, unzip3, 1, Xs,
  	 fun ([Ts]) ->
-	     case t_is_nil(Ts) of
+	     case t_is_nil(Ts, Opaques) of
 	       true ->
 		 t_tuple([t_nil(), t_nil(), t_nil()]);
 	       false -> % Ps is a proper list of triples
-		 TupleTypes = t_tuple_subtypes(t_list_elements(Ts)),
+		 TupleTypes = t_tuple_subtypes(t_list_elements(Ts, Opaques),
+                                              Opaques),
 		 lists:foldl(fun(T, Acc) ->
-				 [A, B, C] = t_tuple_args(T),
+				 [A, B, C] = t_tuple_args(T, Opaques),
 				 t_sup(t_tuple([t_list(A), 
 						t_list(B), 
 						t_list(C)]),
 				       Acc)
 			     end, t_none(), TupleTypes)
 	     end
- 	 end);
-type(lists, zip, 2, Xs) ->
-  strict(arg_types(lists, zip, 2), Xs,
+         end, Opaques);
+type(lists, zip, 2, Xs, Opaques) ->
+  strict(lists, zip, 2, Xs,
 	 fun ([As, Bs]) ->
-	     case (t_is_nil(As) orelse t_is_nil(Bs)) of
+	     case (t_is_nil(As, Opaques) orelse t_is_nil(Bs, Opaques)) of
 	       true -> t_nil();
 	       false ->
-		 A = t_list_elements(As),
-		 B = t_list_elements(Bs),
+		 A = t_list_elements(As, Opaques),
+		 B = t_list_elements(Bs, Opaques),
 		 t_list(t_tuple([A, B]))
 	     end
-	 end);
-type(lists, zip3, 3, Xs) ->
-  strict(arg_types(lists, zip3, 3), Xs,
+	 end, Opaques);
+type(lists, zip3, 3, Xs, Opaques) ->
+  strict(lists, zip3, 3, Xs,
 	 fun ([As, Bs, Cs]) ->
-	     case (t_is_nil(As) orelse t_is_nil(Bs) orelse t_is_nil(Cs)) of
+	     case
+               (t_is_nil(As, Opaques)
+                orelse t_is_nil(Bs, Opaques)
+                orelse t_is_nil(Cs, Opaques))
+             of
 	       true -> t_nil();
 	       false ->
-		 A = t_list_elements(As),
-		 B = t_list_elements(Bs),
-		 C = t_list_elements(Cs),
+		 A = t_list_elements(As, Opaques),
+		 B = t_list_elements(Bs, Opaques),
+		 C = t_list_elements(Cs, Opaques),
 		 t_list(t_tuple([A, B, C]))
 	     end
-	 end);
-type(lists, zipwith, 3, Xs) ->
-  strict(arg_types(lists, zipwith, 3), Xs,
-	 fun ([F, _As, _Bs]) -> t_sup(t_list(t_fun_range(F)), t_nil()) end);
-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);
+	 end, Opaques);
+type(lists, zipwith, 3, Xs, Opaques) ->
+  strict(lists, zipwith, 3, Xs,
+	 fun ([F, _As, _Bs]) -> t_sup(t_list(t_fun_range(F, Opaques)),
+                                      t_nil()) end, Opaques);
+type(lists, zipwith3, 4, Xs, Opaques) ->
+  strict(lists, zipwith3, 4, Xs,
+	 fun ([F,_As,_Bs,_Cs]) -> t_sup(t_list(t_fun_range(F, Opaques)),
+                                        t_nil()) end, Opaques);
 
 %%-- string -------------------------------------------------------------------
-type(string, chars, 2, Xs) ->  % NOTE: added to avoid loss of information
-  strict(arg_types(string, chars, 2), Xs, fun (_) -> t_string() end);
-type(string, chars, 3, Xs) ->  % NOTE: added to avoid loss of information
-  strict(arg_types(string, chars, 3), Xs,
+type(string, chars, 2, Xs, Opaques) ->  % NOTE: added to avoid loss of info
+  strict(string, chars, 2, Xs, fun (_) -> t_string() end, Opaques);
+type(string, chars, 3, Xs, Opaques) -> % NOTE: added to avoid loss of info
+  strict(string, chars, 3, Xs,
 	 fun ([Char, N, Tail]) ->
 	     case t_is_nil(Tail) of
 	       true ->
@@ -1623,10 +1683,10 @@ type(string, chars, 3, Xs) ->  % NOTE: added to avoid loss of information
 		     t_sup(t_sup(t_string(), Tail), t_cons(Char, Tail))
 		 end
 	     end
-	 end);
+	 end, Opaques);
 
 %%-----------------------------------------------------------------------------
-type(M, F, A, Xs) when is_atom(M), is_atom(F),
+type(M, F, A, Xs, _O) when is_atom(M), is_atom(F),
 		       is_integer(A), 0 =< A, A =< 255 ->
   strict(Xs, t_any()).  % safe approximation for all functions.
 
@@ -1635,13 +1695,20 @@ type(M, F, A, Xs) when is_atom(M), is_atom(F),
 %% Auxiliary functions
 %%-----------------------------------------------------------------------------
 
-strict(Xs, Ts, F) ->
-  %% io:format("inf lists arg~n1:~p~n2:~p ~n", [Xs, Ts]),
-  Xs1 = inf_lists(Xs, Ts),
+strict(M, F, A, Xs, Fun, Opaques) ->
+  Ts = arg_types(M, F, A),
+  %% io:format("inf lists arg~nXs: ~p~nTs: ~p ~n", [Xs, Ts]),
+  Xs1 = inf_lists(Xs, Ts, Opaques),
   %% io:format("inf lists return ~p ~n", [Xs1]),
   case any_is_none_or_unit(Xs1) of
     true -> t_none();
-    false -> F(Xs1)
+    false -> Fun(Xs1)
+  end.
+
+strict2(Xs, X) ->
+  case any_is_none_or_unit(Xs) of
+    true -> t_none();
+    false -> X
   end.
 
 strict(Xs, X) ->
@@ -1650,9 +1717,9 @@ strict(Xs, X) ->
     false -> X
   end.
 
-inf_lists([X | Xs], [T | Ts]) ->
-  [t_inf(X, T) | inf_lists(Xs, Ts)];
-inf_lists([], []) ->
+inf_lists([X | Xs], [T | Ts], Opaques) ->
+  [t_inf(X, T, Opaques) | inf_lists(Xs, Ts, Opaques)];
+inf_lists([], [], _Opaques) ->
   [].
 
 any_list(N) -> any_list(N, t_any()).
@@ -1670,20 +1737,43 @@ list_replace(1, E, [_X | Xs]) ->
 any_is_none_or_unit(Ts) ->
   lists:any(fun erl_types:t_is_none_or_unit/1, Ts).
 
-check_guard([X], Test, Type) ->
-  check_guard_single(X, Test, Type).
+check_guard([X], Test, Type, Opaques) ->
+  check_guard_single(X, Test, Type, Opaques).
 
-check_guard_single(X, Test, Type) ->
+check_guard_single(X, Test, Type, Opaques) ->
   case Test(X) of
     true -> t_atom('true');
     false ->
-      case erl_types:t_is_opaque(X) of
-	true -> t_none();
-	false ->
-	  case t_is_none(t_inf(Type, X)) of
-	    true -> t_atom('false');
-	    false -> t_boolean()
-	  end
+      case t_is_none(t_inf(Type, X, Opaques)) of
+        true ->
+          case t_has_opaque_subtype(X, Opaques) of
+            true -> t_none();
+            false -> t_atom('false')
+          end;
+        false -> t_boolean()
+      end
+  end.
+
+check_record_tag(Tag, Y, Opaques) ->
+  case t_is_atom(Tag, Opaques) of
+    false ->
+      TagAtom = t_inf(Tag, t_atom(), Opaques),
+      case t_is_none(TagAtom) of
+        true ->
+          case t_has_opaque_subtype(Tag, Opaques) of
+            true -> t_none();
+            false -> t_atom('false')
+          end;
+        false -> t_boolean()
+      end;
+    true ->
+      case t_atom_vals(Tag, Opaques) of
+        [RealTag] ->
+          case t_atom_vals(Y, Opaques) of
+            [RealTag] -> t_atom('true');
+            _ -> t_boolean()
+          end;
+        _ -> t_boolean()
       end
   end.
 
@@ -1828,12 +1918,12 @@ negwidth(X, N) ->
     false -> negwidth(X, N+1)
   end.
 
-arith('bnot', X1) ->
-  case t_is_integer(X1) of
+arith('bnot', X1, Opaques) ->
+  case t_is_integer(X1, Opaques) of
     false -> error;
     true ->
-      Min1 = number_min(X1),
-      Max1 = number_max(X1),
+      Min1 = number_min(X1, Opaques),
+      Max1 = number_max(X1, Opaques),
       {ok, t_from_range(infinity_add(infinity_inv(Max1), -1),
 			infinity_add(infinity_inv(Min1), -1))}
   end.
@@ -1907,13 +1997,13 @@ arith_bor_range_set({Min, Max}, [Int|IntList]) ->
 	      IntList),
   {infinity_bor(Min, SafeAnd), infinity_bor(Max, SafeAnd)}.
 	      
-arith_band(X1, X2) ->
-  L1 = t_number_vals(X1), 
-  L2 = t_number_vals(X2),
-  Min1 = number_min(X1),
-  Max1 = number_max(X1),
-  Min2 = number_min(X2),
-  Max2 = number_max(X2),
+arith_band(X1, X2, Opaques) ->
+  L1 = t_number_vals(X1, Opaques),
+  L2 = t_number_vals(X2, Opaques),
+  Min1 = number_min(X1, Opaques),
+  Max1 = number_max(X1, Opaques),
+  Min2 = number_min(X2, Opaques),
+  Max2 = number_max(X2, Opaques),
   case {L1 =:= unknown, L2 =:= unknown} of
     {true, false} ->
       arith_band_range_set(arith_band_ranges(Min1, Max1, Min2, Max2), L2);
@@ -1923,13 +2013,13 @@ arith_band(X1, X2) ->
       arith_band_ranges(Min1, Max1, Min2, Max2)
   end.
 
-arith_bor(X1, X2) ->
-  L1 = t_number_vals(X1), 
-  L2 = t_number_vals(X2),
-  Min1 = number_min(X1),
-  Max1 = number_max(X1),
-  Min2 = number_min(X2),
-  Max2 = number_max(X2),
+arith_bor(X1, X2, Opaques) ->
+  L1 = t_number_vals(X1, Opaques),
+  L2 = t_number_vals(X2, Opaques),
+  Min1 = number_min(X1, Opaques),
+  Max1 = number_max(X1, Opaques),
+  Min2 = number_min(X2, Opaques),
+  Max2 = number_max(X2, Opaques),
   case {L1 =:= unknown, L2 =:= unknown} of
     {true, false} ->
       arith_bor_range_set(arith_bor_ranges(Min1, Max1, Min2, Max2), L2);
@@ -1967,19 +2057,19 @@ arith_bor_ranges(Min1, Max1, Min2, Max2) ->
     end,
   {Min, Max}.
 
-arith(Op, X1, X2) ->
+arith(Op, X1, X2, Opaques) ->
   %% io:format("arith ~p ~p ~p~n", [Op, X1, X2]),
-  case t_is_integer(X1) andalso t_is_integer(X2) of
+  case t_is_integer(X1, Opaques) andalso t_is_integer(X2, Opaques) of
     false -> error;
     true ->
-      L1 = t_number_vals(X1), 
-      L2 = t_number_vals(X2),
+      L1 = t_number_vals(X1, Opaques),
+      L2 = t_number_vals(X2, Opaques),
       case (L1 =:= unknown) orelse (L2 =:= unknown) of
 	true ->
-	  Min1 = number_min(X1),
-	  Max1 = number_max(X1),
-	  Min2 = number_min(X2),
-	  Max2 = number_max(X2),
+	  Min1 = number_min(X1, Opaques),
+	  Max1 = number_max(X1, Opaques),
+	  Min2 = number_min(X2, Opaques),
+	  Max2 = number_max(X2, Opaques),
 	  {NewMin, NewMax} =
 	    case Op of
 	      '+'    -> {infinity_add(Min1, Min2), infinity_add(Max1, Max2)};
@@ -1992,8 +2082,8 @@ arith(Op, X1, X2) ->
 	      'bsr'  -> NewMin2 = infinity_inv(Max2),
 			NewMax2 = infinity_inv(Min2),
 			arith_bsl(Min1, Max1, NewMin2, NewMax2);
-	      'band' -> arith_band(X1, X2);
-	      'bor'  -> arith_bor(X1, X2);
+	      'band' -> arith_band(X1, X2, Opaques);
+	      'bor'  -> arith_bor(X1, X2, Opaques);
 	      'bxor' -> arith_bor_ranges(Min1, Max1, Min2, Max2) %% overaprox.
 	    end,
 	  %% io:format("done arith ~p = ~p~n", [Op, {NewMin, NewMax}]),
@@ -2025,58 +2115,62 @@ arith(Op, X1, X2) ->
 %% Comparison of terms
 %%=============================================================================
 
-compare(Op, Lhs, Rhs) ->
-  case t_is_none(t_inf(Lhs, Rhs)) of
+compare(Op, Lhs, Rhs, Opaques) ->
+  case t_is_none(t_inf(Lhs, Rhs, Opaques)) of
     false -> t_boolean();
     true ->
-      case Op of
-	'<' -> always_smaller(Lhs, Rhs);
-	'>' -> always_smaller(Rhs, Lhs);
-	'=<' -> always_smaller(Lhs, Rhs);
-	'>=' -> always_smaller(Rhs, Lhs)
+      case opaque_args(erlang, Op, 2, [Lhs, Rhs], Opaques) =:= [] of
+        true ->
+          case Op of
+            '<' -> always_smaller(Lhs, Rhs, Opaques);
+            '>' -> always_smaller(Rhs, Lhs, Opaques);
+            '=<' -> always_smaller(Lhs, Rhs, Opaques);
+            '>=' -> always_smaller(Rhs, Lhs, Opaques)
+          end;
+        false -> t_none()
       end
   end.
 
-always_smaller(Type1, Type2) ->
-  {Min1, Max1} = type_ranks(Type1),
-  {Min2, Max2} = type_ranks(Type2),
+always_smaller(Type1, Type2, Opaques) ->
+  {Min1, Max1} = type_ranks(Type1, Opaques),
+  {Min2, Max2} = type_ranks(Type2, Opaques),
   if Max1 < Min2 -> t_atom('true');
      Min1 > Max2 -> t_atom('false');
      true        -> t_boolean()
   end.
 
-type_ranks(Type) ->
-  type_ranks(Type, 1, 0, 0, type_order()).
+type_ranks(Type, Opaques) ->
+  type_ranks(Type, 1, 0, 0, type_order(), Opaques).
 
-type_ranks(_Type, _I, Min, Max, []) -> {Min, Max};
-type_ranks(Type, I, Min, Max, [TypeClass|Rest]) ->
+type_ranks(_Type, _I, Min, Max, [], _Opaques) -> {Min, Max};
+type_ranks(Type, I, Min, Max, [TypeClass|Rest], Opaques) ->
   {NewMin, NewMax} =
-    case t_is_none(t_inf(Type, TypeClass)) of
+    case t_is_none(t_inf(Type, TypeClass, Opaques)) of
       true  -> {Min, Max};
       false -> case Min of
 		 0 -> {I, I};
 		 _ -> {Min, I}
 	       end
     end,
-  type_ranks(Type, I+1, NewMin, NewMax, Rest).
+  type_ranks(Type, I+1, NewMin, NewMax, Rest, Opaques).
 
 type_order() ->
   [t_number(), t_atom(), t_reference(), t_fun(), t_port(), t_pid(), t_tuple(),
    t_list(), t_binary()].
 
-key_comparisons_fail(X0, KeyPos, TupleList) ->
-  X = case t_is_number(t_inf(X0, t_number())) of
+key_comparisons_fail(X0, KeyPos, TupleList, Opaques) ->
+  X = case t_is_number(t_inf(X0, t_number(), Opaques), Opaques) of
 	false -> X0;
 	true -> t_number()
       end,
   lists:all(fun(Tuple) ->
 		Key = type(erlang, element, 2, [KeyPos, Tuple]),
-		t_is_none(t_inf(Key, X))
+		t_is_none(t_inf(Key, X, Opaques))
 	    end, TupleList).
 
 %%=============================================================================
 
--spec arg_types(atom(), atom(), arity()) -> [erl_types:erl_type()] | 'unknown'.
+-spec arg_types(atom(), atom(), arity()) -> arg_types() | 'unknown'.
 
 %%------- erlang --------------------------------------------------------------
 arg_types(erlang, '!', 2) ->
@@ -2213,6 +2307,8 @@ arg_types(erlang, is_integer, 1) ->
   [t_any()];
 arg_types(erlang, is_list, 1) ->
   [t_any()];
+arg_types(erlang, is_map, 1) ->
+  [t_any()];
 arg_types(erlang, is_number, 1) ->
   [t_any()];
 arg_types(erlang, is_pid, 1) ->
@@ -2230,6 +2326,9 @@ arg_types(erlang, is_tuple, 1) ->
 %% Guard bif, needs to be here.
 arg_types(erlang, length, 1) ->
   [t_list()];
+%% Guard bif, needs to be here.
+arg_types(erlang, map_size, 1) ->
+  [t_map()];
 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) ->
@@ -2508,47 +2607,78 @@ arg_types(M, F, A) when is_atom(M), is_atom(F),
   unknown.                     % safe approximation for all functions.
 
 
--spec is_known(atom(), atom(), arity()) -> boolean().
+-spec is_known(module(), atom(), arity()) -> boolean().
 
 is_known(M, F, A) ->
   arg_types(M, F, A) =/= unknown.
 
+-spec opaque_args(module(), atom(), arity(),
+                  arg_types(), opaques()) -> [pos_integer()].
+
+%% Use this function to find out which argument caused empty type.
+
+opaque_args(_M, _F, _A, _Xs, 'universe') -> [];
+opaque_args(M, F, A, Xs, Opaques) ->
+  case kind_of_check(M, F, A) of
+    record ->
+      [X,Y|_] = Xs,
+      [1 ||
+        case t_is_tuple(X, Opaques) of
+          true ->
+            case t_tuple_subtypes(X, Opaques) of
+              unknown -> false;
+              List when length(List) >= 1 -> opaque_recargs(List, Y, Opaques)
+            end;
+          false -> t_has_opaque_subtype(X, Opaques)
+        end];
+    subtype ->
+      [N ||
+        {N, X} <- lists:zip(lists:seq(1, length(Xs)), Xs),
+        t_has_opaque_subtype(X, Opaques)];
+    find_unknown ->
+      [L, R] = Xs,
+      erl_types:t_find_unknown_opaque(L, R, Opaques);
+    no_check -> []
+  end.
 
--spec structure_inspecting_args(atom(), atom(), arity()) -> [1..255].
-
-structure_inspecting_args(erlang, element, 2) -> [2];
-structure_inspecting_args(erlang, is_atom, 1) -> [1];
-structure_inspecting_args(erlang, is_boolean, 1) -> [1];
-structure_inspecting_args(erlang, is_binary, 1) -> [1];
-structure_inspecting_args(erlang, is_bitstring, 1) -> [1];
-structure_inspecting_args(erlang, is_float, 1) -> [1];
-structure_inspecting_args(erlang, is_function, 1) -> [1];
-structure_inspecting_args(erlang, is_integer, 1) -> [1];
-structure_inspecting_args(erlang, is_list, 1) -> [1];
-structure_inspecting_args(erlang, is_number, 1) -> [1];
-structure_inspecting_args(erlang, is_pid, 1) -> [1];
-structure_inspecting_args(erlang, is_port, 1) -> [1];
-structure_inspecting_args(erlang, is_reference, 1) -> [1];
-structure_inspecting_args(erlang, is_tuple, 1) -> [1];
-structure_inspecting_args(erlang, length, 1) -> [1];
-%%structure_inspecting_args(erlang, setelement, 3) -> [2].
-structure_inspecting_args(_, _, _) -> []. % XXX: assume no arg needs inspection
-
-
-check_fun_application(Fun, Args) ->
-  case t_is_fun(Fun) of
+kind_of_check(erlang, is_record, 3) ->
+  record;
+kind_of_check(erlang, is_record, 2) ->
+  record;
+kind_of_check(erlang, F, A) ->
+  case erl_internal:guard_bif(F, A) orelse erl_internal:bool_op(F, A) of
+    true -> subtype;
+    false ->
+      case erl_internal:comp_op(F, A) of
+        true -> find_unknown;
+        false -> no_check
+      end
+  end;
+kind_of_check(_M, _F, _A) -> no_check.
+
+opaque_recargs(Tuples, Y, Opaques) ->
+  Fun = fun(Tuple) ->
+            case t_tuple_args(Tuple, Opaques) of
+              [Tag|_] -> t_is_none(check_record_tag(Tag, Y, Opaques));
+              _ -> false
+            end
+        end,
+  lists:all(Fun, Tuples).
+
+check_fun_application(Fun, Args, Opaques) ->
+  case t_is_fun(Fun, Opaques) of
     true ->
-      case t_fun_args(Fun) of
+      case t_fun_args(Fun, Opaques) of
 	unknown ->
-	  case t_is_none_or_unit(t_fun_range(Fun)) of
+	  case t_is_none_or_unit(t_fun_range(Fun, Opaques)) of
 	    true -> error;
 	    false -> ok
 	  end;
 	FunDom when length(FunDom) =:= length(Args) ->
-	  case any_is_none_or_unit(inf_lists(FunDom, Args)) of
+	  case any_is_none_or_unit(inf_lists(FunDom, Args, Opaques)) of
 	    true -> error;
 	    false ->
-	      case t_is_none_or_unit(t_fun_range(Fun)) of
+	      case t_is_none_or_unit(t_fun_range(Fun, Opaques)) of
 		true -> error;
 		false -> ok
 	      end
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index d1243b2325..32390045e3 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %%
 %% The 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,15 +42,15 @@
 	 max/2,
 	 module_builtin_opaques/1,
 	 min/2,
-	 number_max/1,
-	 number_min/1,
+	 number_max/1, number_max/2,
+	 number_min/1, number_min/2,
 	 t_abstract_records/2,
 	 t_any/0,
 	 t_arity/0,
 	 t_atom/0,
 	 t_atom/1,
 	 t_atoms/1,
-	 t_atom_vals/1,
+	 t_atom_vals/1, t_atom_vals/2,
 	 t_binary/0,
 	 t_bitstr/0,
 	 t_bitstr/2,
@@ -66,12 +66,14 @@
 	 t_collect_vars/1,
 	 t_cons/0,
 	 t_cons/2,
-	 t_cons_hd/1,
-	 t_cons_tl/1,
+	 t_cons_hd/1, t_cons_hd/2,
+	 t_cons_tl/1, t_cons_tl/2,
 	 t_constant/0,
-	 t_contains_opaque/1,
+         t_contains_opaque/1, t_contains_opaque/2,
+         t_decorate_with_opaque/3,
 	 t_elements/1,
 	 t_find_opaque_mismatch/2,
+         t_find_unknown_opaque/3,
 	 t_fixnum/0,
 	 t_map/2,
 	 t_non_neg_fixnum/0,
@@ -87,18 +89,18 @@
 	 t_fun/0,
 	 t_fun/1,
 	 t_fun/2,
-	 t_fun_args/1,
-	 t_fun_arity/1,
-	 t_fun_range/1,
-	 t_has_opaque_subtype/1,
+	 t_fun_args/1, t_fun_args/2,
+	 t_fun_arity/1, t_fun_arity/2,
+	 t_fun_range/1, t_fun_range/2,
+	 t_has_opaque_subtype/2,
 	 t_has_var/1,
 	 t_identifier/0,
 	 %% t_improper_list/2,
-	 t_inf/2,
-	 t_inf/3,
-	 t_inf_lists/2,
-	 t_inf_lists/3,
-	 t_inf_lists_masked/3,
+         t_inf/1,
+         t_inf/2,
+         t_inf/3,
+         t_inf_lists/2,
+         t_inf_lists/3,
 	 t_integer/0,
 	 t_integer/1,
 	 t_non_neg_integer/0,
@@ -107,44 +109,44 @@
 	 t_iodata/0,
 	 t_iolist/0,
 	 t_is_any/1,
-	 t_is_atom/1,
-	 t_is_atom/2,
-	 t_is_binary/1,
-	 t_is_bitstr/1,
+	 t_is_atom/1, t_is_atom/2,
+	 t_is_any_atom/2, t_is_any_atom/3,
+	 t_is_binary/1, t_is_binary/2,
+	 t_is_bitstr/1, t_is_bitstr/2,
 	 t_is_bitwidth/1,
-	 t_is_boolean/1,
+	 t_is_boolean/1, t_is_boolean/2,
 	 %% t_is_byte/1,
 	 %% t_is_char/1,
-	 t_is_cons/1,
+	 t_is_cons/1, t_is_cons/2,
 	 t_is_constant/1,
 	 t_is_equal/2,
 	 t_is_fixnum/1,
-	 t_is_float/1,
-	 t_is_fun/1,
+	 t_is_float/1, t_is_float/2,
+	 t_is_fun/1, t_is_fun/2,
 	 t_is_instance/2,
-	 t_is_integer/1,
+	 t_is_integer/1, t_is_integer/2,
 	 t_is_list/1,
 	 t_is_matchstate/1,
-	 t_is_nil/1,
+	 t_is_nil/1, t_is_nil/2,
 	 t_is_non_neg_integer/1,
 	 t_is_none/1,
 	 t_is_none_or_unit/1,
-	 t_is_number/1,
-	 t_is_opaque/1,
-	 t_is_pid/1,
-	 t_is_port/1,
-	 t_is_maybe_improper_list/1,
-	 t_is_reference/1,
+	 t_is_number/1, t_is_number/2,
+	 t_is_opaque/1, t_is_opaque/2,
+	 t_is_pid/1, t_is_pid/2,
+	 t_is_port/1, t_is_port/2,
+	 t_is_maybe_improper_list/1, t_is_maybe_improper_list/2,
+	 t_is_reference/1, t_is_reference/2,
 	 t_is_remote/1,
 	 t_is_string/1,
 	 t_is_subtype/2,
-	 t_is_tuple/1,
+	 t_is_tuple/1, t_is_tuple/2,
 	 t_is_unit/1,
 	 t_is_var/1,
 	 t_limit/2,
 	 t_list/0,
 	 t_list/1,
-	 t_list_elements/1,
+	 t_list_elements/1, t_list_elements/2,
 	 t_list_termination/1,
 	 t_matchstate/0,
 	 t_matchstate/2,
@@ -163,11 +165,8 @@
 	 t_nonempty_string/0,
 	 t_number/0,
 	 t_number/1,
-	 t_number_vals/1,
+	 t_number_vals/1, t_number_vals/2,
 	 t_opaque_from_records/1,
-	 t_opaque_match_atom/2,
-	 t_opaque_match_record/2,
-	 t_opaque_matching_structure/2,
 	 t_opaque_structure/1,
 	 %% t_parameterized_module/0,
 	 t_pid/0,
@@ -192,16 +191,14 @@
 	 t_to_tlist/1,
 	 t_tuple/0,
 	 t_tuple/1,
-	 t_tuple_args/1,
-	 t_tuple_size/1,
+	 t_tuple_args/1, t_tuple_args/2,
+	 t_tuple_size/1, t_tuple_size/2,
 	 t_tuple_sizes/1,
 	 t_tuple_subtypes/1,
+         t_tuple_subtypes/2,
 	 t_unify/2,
-	 t_unify/3,
 	 t_unit/0,
-	 t_unopaque/1,
-	 t_unopaque/2,
-	 t_unopaque_on_mismatch/3,
+	 t_unopaque/1, t_unopaque/2,
 	 t_var/1,
 	 t_var_name/1,
 	 %% t_assign_variables_to_subtype/2,
@@ -209,8 +206,13 @@
 	 record_field_diffs_to_string/2,
 	 subst_all_vars_to_any/1,
 	 lift_list_to_pos_empty/1,
+         is_opaque_type/2,
 	 is_erl_type/1,
-	 atom_to_string/1
+	 atom_to_string/1,
+
+	 t_is_map/2,
+	 t_map/1,
+	 t_map/0
 	]).
 
 %%-define(DO_ERL_TYPES_TEST, true).
@@ -226,7 +228,15 @@
 -export([t_is_identifier/1]).
 -endif.
 
--export_type([erl_type/0]).
+-export_type([erl_type/0, type_table/0, var_table/0]).
+
+%%-define(DEBUG, true).
+
+-ifdef(DEBUG).
+-define(debug(__A), __A).
+-else.
+-define(debug(__A), ok).
+-endif.
 
 %%=============================================================================
 %%
@@ -260,6 +270,7 @@
 -define(function_tag,   function).
 -define(identifier_tag, identifier).
 -define(list_tag,       list).
+-define(map_tag,        map).
 -define(matchstate_tag, matchstate).
 -define(nil_tag,        nil).
 -define(number_tag,     number).
@@ -272,7 +283,7 @@
 -define(var_tag,        var).
 
 -type tag()  :: ?atom_tag | ?binary_tag | ?function_tag | ?identifier_tag
-              | ?list_tag | ?matchstate_tag | ?nil_tag | ?number_tag
+              | ?list_tag | ?map_tag | ?matchstate_tag | ?nil_tag | ?number_tag
               | ?opaque_tag | ?product_tag | ?remote_tag
               | ?tuple_tag | ?tuple_set_tag | ?union_tag | ?var_tag.
 
@@ -310,6 +321,9 @@
 
 -record(int_set, {set :: [integer()]}).
 -record(int_rng, {from :: rng_elem(), to :: rng_elem()}).
+%% Note: the definition of #opaque{} was changed to 'mod' and 'name';
+%% it used to be an ordsets of {Mod, Name} pairs. The Dialyzer version
+%% was updated to 2.7 due to this change.
 -record(opaque,  {mod :: module(), name :: atom(),
 		  args = [] :: [erl_type()], struct :: erl_type()}).
 -record(remote,  {mod:: module(), name :: atom(), args = [] :: [erl_type()]}).
@@ -329,6 +343,7 @@
 -define(nonempty_list(Types, Term),?list(Types, Term, ?nonempty_qual)).
 -define(number(Set, Qualifier),    #c{tag=?number_tag, elements=Set, 
 				      qualifier=Qualifier}).
+-define(map(Pairs),                #c{tag=?map_tag, elements=Pairs}).
 -define(opaque(Optypes),           #c{tag=?opaque_tag, elements=Optypes}).
 -define(product(Types),            #c{tag=?product_tag, elements=Types}).
 -define(remote(RemTypes),          #c{tag=?remote_tag, elements=RemTypes}).
@@ -346,22 +361,34 @@
 -define(integer_non_neg,           ?int_range(0, pos_inf)).
 -define(integer_neg,               ?int_range(neg_inf, -1)).
 
+-type opaques() :: [erl_type()] | 'universe'.
+
+-type record_key()   :: {'record', atom()}.
+-type type_key()     :: {'type' | 'opaque', atom(), arity()}.
+-type record_value() :: orddict:orddict(). % XXX. To be refined
+-type type_value()   :: {module(), erl_type(), atom()}.
+-type type_table() :: dict:dict(record_key(), record_value())
+                    | dict:dict(type_key(), type_value()).
+
+-type var_table() :: dict:dict(atom(), erl_type()).
+
 %%-----------------------------------------------------------------------------
 %% Unions
 %%
 
--define(union(List), #c{tag=?union_tag, elements=[_,_,_,_,_,_,_,_,_,_]=List}).
-
--define(atom_union(T),       ?union([T,?none,?none,?none,?none,?none,?none,?none,?none,?none])).
--define(bitstr_union(T),     ?union([?none,T,?none,?none,?none,?none,?none,?none,?none,?none])).
--define(function_union(T),   ?union([?none,?none,T,?none,?none,?none,?none,?none,?none,?none])).
--define(identifier_union(T), ?union([?none,?none,?none,T,?none,?none,?none,?none,?none,?none])).
--define(list_union(T),       ?union([?none,?none,?none,?none,T,?none,?none,?none,?none,?none])).
--define(number_union(T),     ?union([?none,?none,?none,?none,?none,T,?none,?none,?none,?none])).
--define(tuple_union(T),      ?union([?none,?none,?none,?none,?none,?none,T,?none,?none,?none])).
--define(matchstate_union(T), ?union([?none,?none,?none,?none,?none,?none,?none,T,?none,?none])).
--define(opaque_union(T),     ?union([?none,?none,?none,?none,?none,?none,?none,?none,T,?none])).
--define(remote_union(T),     ?union([?none,?none,?none,?none,?none,?none,?none,?none,?none,T])).
+-define(union(List), #c{tag=?union_tag, elements=[_,_,_,_,_,_,_,_,_,_,_]=List}).
+
+-define(atom_union(T),       ?union([T,?none,?none,?none,?none,?none,?none,?none,?none,?none,?none])).
+-define(bitstr_union(T),     ?union([?none,T,?none,?none,?none,?none,?none,?none,?none,?none,?none])).
+-define(function_union(T),   ?union([?none,?none,T,?none,?none,?none,?none,?none,?none,?none,?none])).
+-define(identifier_union(T), ?union([?none,?none,?none,T,?none,?none,?none,?none,?none,?none,?none])).
+-define(list_union(T),       ?union([?none,?none,?none,?none,T,?none,?none,?none,?none,?none,?none])).
+-define(number_union(T),     ?union([?none,?none,?none,?none,?none,T,?none,?none,?none,?none,?none])).
+-define(tuple_union(T),      ?union([?none,?none,?none,?none,?none,?none,T,?none,?none,?none,?none])).
+-define(matchstate_union(T), ?union([?none,?none,?none,?none,?none,?none,?none,T,?none,?none,?none])).
+-define(opaque_union(T),     ?union([?none,?none,?none,?none,?none,?none,?none,?none,T,?none,?none])).
+-define(remote_union(T),     ?union([?none,?none,?none,?none,?none,?none,?none,?none,?none,T,?none])).
+-define(map_union(T),        ?union([?none,?none,?none,?none,?none,?none,?none,?none,?none,?none,T])).
 -define(integer_union(T),    ?number_union(T)).
 -define(float_union(T),      ?number_union(T)).
 -define(nil_union(T),        ?list_union(T)).
@@ -384,8 +411,11 @@ t_any() ->
 
 -spec t_is_any(erl_type()) -> boolean().
 
-t_is_any(?any) -> true;
-t_is_any(_) -> false.
+t_is_any(Type) ->
+  do_opaque(Type, 'universe', fun is_any/1).
+
+is_any(?any) -> true;
+is_any(_) -> false.
 
 -spec t_none() -> erl_type().
 
@@ -407,16 +437,25 @@ t_opaque(Mod, Name, Args, Struct) ->
   O = #opaque{mod = Mod, name = Name, args = Args, struct = Struct},
   ?opaque(set_singleton(O)).
 
+-spec t_is_opaque(erl_type(), [erl_type()]) -> boolean().
+
+t_is_opaque(?opaque(_) = Type, Opaques) ->
+  not is_opaque_type(Type, Opaques);
+t_is_opaque(_Type, _Opaques) -> false.
+
 -spec t_is_opaque(erl_type()) -> boolean().
 
 t_is_opaque(?opaque(_)) -> true;
 t_is_opaque(_) -> false.
 
--spec t_has_opaque_subtype(erl_type()) -> boolean().
+-spec t_has_opaque_subtype(erl_type(), opaques()) -> boolean().
+
+t_has_opaque_subtype(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun has_opaque_subtype/1).
 
-t_has_opaque_subtype(?union(Ts)) ->
+has_opaque_subtype(?union(Ts)) ->
   lists:any(fun t_is_opaque/1, Ts);
-t_has_opaque_subtype(T) ->
+has_opaque_subtype(T) ->
   t_is_opaque(T).
 
 -spec t_opaque_structure(erl_type()) -> erl_type().
@@ -424,74 +463,65 @@ t_has_opaque_subtype(T) ->
 t_opaque_structure(?opaque(Elements)) ->
   t_sup([Struct || #opaque{struct = Struct} <- ordsets:to_list(Elements)]).
 
--spec t_opaque_module(erl_type()) -> module().
+-spec t_opaque_modules(erl_type()) -> [module()].
 
-t_opaque_module(?opaque(Elements)) ->
+t_opaque_modules(?opaque(Elements)) ->
   case ordsets:size(Elements) of
     1 ->
-      [#opaque{mod = Module}] = ordsets:to_list(Elements),
-      Module;
+      [#opaque{mod = Mod}] = set_to_list(Elements),
+      [Mod];
     _ -> throw({error, "Unexpected multiple opaque types"})
   end.
 
-%% This only makes sense if we know that Type matches Opaque
--spec t_opaque_matching_structure(erl_type(), erl_type()) -> erl_type().
-
-t_opaque_matching_structure(Type, Opaque) ->
-  OpaqueStruct = t_opaque_structure(Opaque),
-  case OpaqueStruct of
-    ?union(L1) ->
-      case Type of
-	?union(_L2) -> OpaqueStruct;
-	_OtherType -> t_opaque_matching_structure_list(Type, L1)
-      end;
-    ?tuple_set(_Set1) = TupleSet ->
-      case Type of
-	?tuple_set(_Set2) -> OpaqueStruct;
-	_ -> t_opaque_matching_structure_list(Type, t_tuple_subtypes(TupleSet))
-      end;
-    _Other -> OpaqueStruct
-  end.
-
-t_opaque_matching_structure_list(Type, List) ->
-  NewList = [t_inf(Element, Type) || Element <- List],
-  Results = [NotNone || NotNone <- NewList, NotNone =/= ?none],
-  case Results of
-    [] -> ?none;
-    [First|_] -> First
-  end.
-
 -spec t_contains_opaque(erl_type()) -> boolean().
 
-t_contains_opaque(?any)                     -> false;
-t_contains_opaque(?none)                    -> false;
-t_contains_opaque(?unit)                    -> false;
-t_contains_opaque(?atom(_Set))              -> false;
-t_contains_opaque(?bitstr(_Unit, _Base))    -> false;
-t_contains_opaque(?float)                   -> false;
-t_contains_opaque(?function(Domain, Range)) ->
-  t_contains_opaque(Domain) orelse t_contains_opaque(Range);
-t_contains_opaque(?identifier(_Types))      -> false;
-t_contains_opaque(?integer(_Types))         -> false;
-t_contains_opaque(?int_range(_From, _To))   -> false;
-t_contains_opaque(?int_set(_Set))           -> false;
-t_contains_opaque(?list(Type, _, _))        -> t_contains_opaque(Type);
-t_contains_opaque(?matchstate(_P, _Slots))  -> false;
-t_contains_opaque(?nil)                     -> false;
-t_contains_opaque(?number(_Set, _Tag))      -> false;
-t_contains_opaque(?opaque(_))               -> true;
-t_contains_opaque(?product(Types))          -> list_contains_opaque(Types);
-t_contains_opaque(?tuple(?any, _, _))       -> false;
-t_contains_opaque(?tuple(Types, _, _))      -> list_contains_opaque(Types);
-t_contains_opaque(?tuple_set(_Set) = T)     ->
-  list_contains_opaque(t_tuple_subtypes(T));
-t_contains_opaque(?union(List))             -> list_contains_opaque(List);
-t_contains_opaque(?var(_Id))                -> false.
-
--spec list_contains_opaque([erl_type()]) -> boolean().
-
-list_contains_opaque(List) ->
-  lists:any(fun t_contains_opaque/1, List).
+t_contains_opaque(Type) ->
+  t_contains_opaque(Type, []).
+
+%% Returns 'true' iff there is an opaque type that is *not* one of
+%% the types of the second argument.
+
+-spec t_contains_opaque(erl_type(), [erl_type()]) -> boolean().
+
+t_contains_opaque(?any, _Opaques) -> false;
+t_contains_opaque(?none, _Opaques) -> false;
+t_contains_opaque(?unit, _Opaques) -> false;
+t_contains_opaque(?atom(_Set), _Opaques) -> false;
+t_contains_opaque(?bitstr(_Unit, _Base), _Opaques) -> false;
+t_contains_opaque(?float, _Opaques) -> false;
+t_contains_opaque(?function(Domain, Range), Opaques) ->
+  t_contains_opaque(Domain, Opaques)
+  orelse t_contains_opaque(Range, Opaques);
+t_contains_opaque(?identifier(_Types), _Opaques) -> false;
+t_contains_opaque(?integer(_Types), _Opaques) -> false;
+t_contains_opaque(?int_range(_From, _To), _Opaques) -> false;
+t_contains_opaque(?int_set(_Set), _Opaques) -> false;
+t_contains_opaque(?list(Type, Tail, _), Opaques) ->
+  t_contains_opaque(Type, Opaques) orelse t_contains_opaque(Tail, Opaques);
+t_contains_opaque(?map(Pairs), Opaques) ->
+  list_contains_opaque([V||{_,V}<-Pairs], Opaques) orelse
+  list_contains_opaque([K||{K,_}<-Pairs], Opaques);
+t_contains_opaque(?matchstate(_P, _Slots), _Opaques) -> false;
+t_contains_opaque(?nil, _Opaques) -> false;
+t_contains_opaque(?number(_Set, _Tag), _Opaques) -> false;
+t_contains_opaque(?opaque(_)=T, Opaques) ->
+  not is_opaque_type(T, Opaques)
+  orelse t_contains_opaque(t_opaque_structure(T));
+t_contains_opaque(?product(Types), Opaques) ->
+  list_contains_opaque(Types, Opaques);
+t_contains_opaque(?tuple(?any, _, _), _Opaques) -> false;
+t_contains_opaque(?tuple(Types, _, _), Opaques) ->
+  list_contains_opaque(Types, Opaques);
+t_contains_opaque(?tuple_set(_Set) = T, Opaques) ->
+  list_contains_opaque(t_tuple_subtypes(T), Opaques);
+t_contains_opaque(?union(List), Opaques) ->
+  list_contains_opaque(List, Opaques);
+t_contains_opaque(?var(_Id), _Opaques) -> false.
+
+-spec list_contains_opaque([erl_type()], [erl_type()]) -> boolean().
+
+list_contains_opaque(List, Opaques) ->
+  lists:any(fun(E) -> t_contains_opaque(E, Opaques) end, List).
 
 %% t_find_opaque_mismatch/2 of two types should only be used if their
 %% t_inf is t_none() due to some opaque type violation.
@@ -506,9 +536,12 @@ t_find_opaque_mismatch(T1, T2) ->
 
 t_find_opaque_mismatch(?any, _Type, _TopType) -> error;
 t_find_opaque_mismatch(?none, _Type, _TopType) -> error;
-t_find_opaque_mismatch(?list(T1, _, _), ?list(T2, _, _), TopType) ->
-  t_find_opaque_mismatch(T1, T2, TopType);
+t_find_opaque_mismatch(?list(T1, Tl1, _), ?list(T2, Tl2, _), TopType) ->
+  t_find_opaque_mismatch_ordlists([T1, Tl1], [T2, Tl2], TopType);
 t_find_opaque_mismatch(_T1, ?opaque(_) = T2, TopType) -> {ok, TopType, T2};
+t_find_opaque_mismatch(?opaque(_) = T1, _T2, TopType) ->
+  %% The generated message is somewhat misleading:
+  {ok, TopType, T1};
 t_find_opaque_mismatch(?product(T1), ?product(T2), TopType) ->
   t_find_opaque_mismatch_ordlists(T1, T2, TopType);
 t_find_opaque_mismatch(?tuple(T1, Arity, _), ?tuple(T2, Arity, _), TopType) ->
@@ -538,7 +571,168 @@ t_find_opaque_mismatch_list([H|T]) ->
     error -> t_find_opaque_mismatch_list(T)
   end.
 
--spec t_opaque_from_records(dict()) -> [erl_type()].
+-spec t_find_unknown_opaque(erl_type(), erl_type(), opaques()) ->
+                               [pos_integer()].
+
+%% The nice thing about using two types and t_inf() as compared to
+%% calling t_contains_opaque/2 is that the traversal stops when
+%% there is a mismatch which means that unknown opaque types "below"
+%% the mismatch are not found.
+%% XXX. Returns one element even if both oparands contain opaque types.
+%% XXX. Slow since t_inf() is called but the results are ignored.
+t_find_unknown_opaque(_T1, _T2, 'universe') -> [];
+t_find_unknown_opaque(T1, T2, Opaques) ->
+  try t_inf(T1, T2, {match, Opaques}) of
+    _ -> []
+  catch throw:N when is_integer(N) -> [N]
+  end.
+
+-spec t_decorate_with_opaque(erl_type(), erl_type(), [erl_type()]) -> erl_type().
+
+%% The first argument can contain opaque types. The second argument
+%% is assumed to be taken from the contract.
+
+t_decorate_with_opaque(T1, T2, Opaques) ->
+  case t_is_equal(T1, T2) orelse not t_contains_opaque(T2) of
+    true -> T1;
+    false ->
+      T = t_inf(T1, T2),
+      case t_contains_opaque(T) of
+        false -> T1;
+        true ->
+          R = decorate(T1, T, Opaques),
+          ?debug(case catch t_is_equal(t_unopaque(R), t_unopaque(T1)) of
+                   true -> ok;
+                   false ->
+                     io:format("T1 = ~p,\n", [T1]),
+                     io:format("T2 = ~p,\n", [T2]),
+                     io:format("O = ~p,\n", [Opaques]),
+                     io:format("erl_types:t_decorate_with_opaque(T1,T2,O).\n"),
+                     throw({error, "Failed to handle opaque types"})
+                 end),
+          R
+      end
+  end.
+
+decorate(?none=Type, _, _Opaques) -> Type;
+decorate(?function(Domain, Range), ?function(D, R), Opaques) ->
+  ?function(decorate(Domain, D, Opaques), decorate(Range, R, Opaques));
+decorate(?list(Types, Tail, Size), ?list(Ts, Tl, _Sz), Opaques) ->
+  ?list(decorate(Types, Ts, Opaques), decorate(Tail, Tl, Opaques), Size);
+decorate(?product(Types), ?product(Ts), Opaques) ->
+  ?product(list_decorate(Types, Ts, Opaques));
+decorate(?tuple(_, _, _)=T, ?tuple(?any, _, _), _Opaques) -> T;
+decorate(?tuple(?any, _, _)=T, ?tuple(_, _, _), _Opaques) -> T;
+decorate(?tuple(Types, Arity, Tag), ?tuple(Ts, Arity, _), Opaques) ->
+  ?tuple(list_decorate(Types, Ts, Opaques), Arity, Tag);
+decorate(?tuple_set(List), ?tuple(_, Arity, _) = T, Opaques) ->
+  decorate_tuple_sets(List, [{Arity, [T]}], Opaques);
+decorate(?tuple_set(List), ?tuple_set(L), Opaques) ->
+  decorate_tuple_sets(List, L, Opaques);
+decorate(?union(List), T, Opaques) when T =/= ?any ->
+  ?union(L) = force_union(T),
+  union_decorate(List, L, Opaques);
+decorate(?opaque(_)=T, _, _Opaques) -> T;
+decorate(T, ?union(L), Opaques) when T =/= ?any ->
+  ?union(List) = force_union(T),
+  union_decorate(List, L, Opaques);
+decorate(Type, ?opaque(_)=T, Opaques) ->
+  decorate_with_opaque(Type, T, Opaques);
+decorate(Type, _T, _Opaques) -> Type.
+
+%% Note: it is important that #opaque.struct is a subtype of the
+%% opaque type.
+decorate_with_opaque(Type, ?opaque(Set2), Opaques) ->
+  case decoration(set_to_list(Set2), Type, Opaques, [], false) of
+    {[], false} -> Type;
+    {List, All} when List =/= [] ->
+      NewType = ?opaque(ordsets:from_list(List)),
+      case All of
+        true -> NewType;
+        false -> t_sup(NewType, Type)
+      end
+  end.
+
+decoration([#opaque{struct = S} = Opaque|OpaqueTypes], Type, Opaques,
+           NewOpaqueTypes0, All) ->
+  IsOpaque = is_opaque_type2(Opaque, Opaques),
+  I = t_inf(Type, S),
+  case not IsOpaque orelse t_is_none(I) of
+    true -> decoration(OpaqueTypes, Type, Opaques, NewOpaqueTypes0, All);
+    false ->
+      NewOpaque = Opaque#opaque{struct = decorate(I, S, Opaques)},
+      NewAll = All orelse t_is_equal(I, Type),
+      NewOpaqueTypes = [NewOpaque|NewOpaqueTypes0],
+      decoration(OpaqueTypes, Type, Opaques, NewOpaqueTypes, NewAll)
+  end;
+decoration([], _Type, _Opaques, NewOpaqueTypes, All) ->
+  {NewOpaqueTypes, All}.
+
+-spec list_decorate([erl_type()], [erl_type()], opaques()) -> [erl_type()].
+
+list_decorate(List, L, Opaques) ->
+  [decorate(Elem, E, Opaques) || {Elem, E} <- lists:zip(List, L)].
+
+union_decorate(U1, U2, Opaques) ->
+  Union = union_decorate(U1, U2, Opaques, 0, []),
+  [A,B,F,I,L,N,T,M,_,_R,Map] = U1,
+  [_,_,_,_,_,_,_,_,Opaque,_,_] = U2,
+  List = [A,B,F,I,L,N,T,M,Map],
+  DecList = [Dec ||
+              E <- List,
+              not t_is_none(Dec = decorate(E, Opaque, Opaques))],
+  t_sup([Union|DecList]).
+
+union_decorate([?none|Left1], [_|Left2], Opaques, N, Acc) ->
+  union_decorate(Left1, Left2, Opaques, N, [?none|Acc]);
+union_decorate([T1|Left1], [?none|Left2], Opaques, N, Acc) ->
+  union_decorate(Left1, Left2, Opaques, N+1, [T1|Acc]);
+union_decorate([T1|Left1], [T2|Left2], Opaques, N, Acc) ->
+  union_decorate(Left1, Left2, Opaques, N+1, [decorate(T1, T2, Opaques)|Acc]);
+union_decorate([], [], _Opaques, N, Acc) ->
+  if N =:= 0 -> ?none;
+     N =:= 1 ->
+      [Type] = [T || T <- Acc, T =/= ?none],
+      Type;
+     N >= 2  -> ?union(lists:reverse(Acc))
+  end.
+
+decorate_tuple_sets(List, L, Opaques) ->
+  decorate_tuple_sets(List, L, Opaques, []).
+
+decorate_tuple_sets([{Arity, Tuples}|List], [{Arity, Ts}|L], Opaques, Acc) ->
+  DecTs = decorate_tuples_in_sets(Tuples, Ts, Opaques),
+  decorate_tuple_sets(List, L, Opaques, [{Arity, DecTs}|Acc]);
+decorate_tuple_sets([ArTup|List], L, Opaques, Acc) ->
+  decorate_tuple_sets(List, L, Opaques, [ArTup|Acc]);
+decorate_tuple_sets([], _L, _Opaques, Acc) ->
+  ?tuple_set(lists:reverse(Acc)).
+
+decorate_tuples_in_sets([?tuple(Elements, _, ?any)], Ts, Opaques) ->
+  NewList = [list_decorate(Elements, Es, Opaques) || ?tuple(Es, _, _) <- Ts],
+  case t_sup([t_tuple(Es) || Es <- NewList]) of
+    ?tuple_set([{_Arity, Tuples}]) -> Tuples;
+    ?tuple(_, _, _)=Tuple -> [Tuple]
+  end;
+decorate_tuples_in_sets(Tuples, Ts, Opaques) ->
+  decorate_tuples_in_sets(Tuples, Ts, Opaques, []).
+
+decorate_tuples_in_sets([?tuple(Elements, Arity, Tag1) = T1|Tuples] = L1,
+                        [?tuple(Es, Arity, Tag2)|Ts] = L2, Opaques, Acc) ->
+  if
+    Tag1 < Tag2   -> decorate_tuples_in_sets(Tuples, L2, Opaques, [T1|Acc]);
+    Tag1 > Tag2   -> decorate_tuples_in_sets(L1, Ts, Opaques, Acc);
+    Tag1 =:= Tag2 ->
+      NewElements = list_decorate(Elements, Es, Opaques),
+      NewAcc = [?tuple(NewElements, Arity, Tag1)|Acc],
+      decorate_tuples_in_sets(Tuples, Ts, Opaques, NewAcc)
+  end;
+decorate_tuples_in_sets([T1|Tuples], L2, Opaques, Acc) ->
+  decorate_tuples_in_sets(Tuples, L2, Opaques, [T1|Acc]);
+decorate_tuples_in_sets([], _L, _Opaques, Acc) ->
+  lists:reverse(Acc).
+
+-spec t_opaque_from_records(type_table()) -> [erl_type()].
 
 t_opaque_from_records(RecDict) ->
   OpaqueRecDict =
@@ -549,54 +743,17 @@ t_opaque_from_records(RecDict) ->
 		    end
 		end, RecDict),
   OpaqueTypeDict =
-    dict:map(fun({opaque, Name, _Arity}, {Module, Type, ArgNames}) ->
-		 case ArgNames of
-		   [] ->
-		     t_opaque(Module, Name, [], t_from_form(Type, RecDict));
-		   _ ->
-		     throw({error,"Polymorphic opaque types not supported yet"})
-		 end
+    dict:map(fun({opaque, Name, _Arity}, {Module, _Type, ArgNames}) ->
+                 %% Args = args_to_types(ArgNames),
+                 %% List = lists:zip(ArgNames, Args),
+                 %% TmpVarDict = dict:from_list(List),
+                 %% Rep = t_from_form(Type, RecDict, TmpVarDict),
+                 Rep = t_none(), % not used for anything right now
+                 Args = [t_any() || _ <- ArgNames],
+                 skip_opaque_alias(Rep, Module, Name, Args)
 	     end, OpaqueRecDict),
   [OpaqueType || {_Key, OpaqueType} <- dict:to_list(OpaqueTypeDict)].
 
--spec t_opaque_match_atom(erl_type(), [erl_type()]) -> [erl_type()].
-
-t_opaque_match_atom(?atom(_) = Atom,  Opaques) ->
-  case t_atom_vals(Atom) of
-    unknown -> [];
-    _  -> [O || O <- Opaques, t_inf(Atom, O, opaque) =/= ?none,
-		t_opaque_atom_vals(t_opaque_structure(O)) =/= unknown]
-  end;
-t_opaque_match_atom(_, _) -> [].
-
--spec t_opaque_atom_vals(erl_type()) -> 'unknown' | [atom(),...].
-
-t_opaque_atom_vals(OpaqueStruct) ->
-  case OpaqueStruct of
-    ?atom(_) -> t_atom_vals(OpaqueStruct);
-    ?union([Atom,_,_,_,_,_,_,_,_,_]) -> t_atom_vals(Atom);
-    _ -> unknown
-  end.
-	  
--spec t_opaque_match_record(erl_type(), [erl_type()]) -> [erl_type()].
-
-t_opaque_match_record(?tuple([?atom(_) = Tag|_Fields], _, _) = Rec, Opaques) ->
-  [O || O <- Opaques, t_inf(Rec, O, opaque) =/= ?none,
-	lists:member(Tag, t_opaque_tuple_tags(t_opaque_structure(O)))];
-t_opaque_match_record(_, _) -> [].
-
--spec t_opaque_tuple_tags(erl_type()) -> [erl_type()].
-
-t_opaque_tuple_tags(OpaqueStruct) ->
-  case OpaqueStruct of
-    ?tuple([?atom(_) = Tag|_Fields], _, _) -> [Tag];
-    ?tuple_set(_) = TupleSet ->
-      Tuples = t_tuple_subtypes(TupleSet),
-      lists:flatten([t_opaque_tuple_tags(T) || T <- Tuples]);
-    ?union([_,_,_,_,_,_,Tuples,_,_,_]) -> t_opaque_tuple_tags(Tuples);
-    _ -> []
-  end.
-
 %% Decompose opaque instances of type arg2 to structured types, in arg1
 %% XXX: Same as t_unopaque
 -spec t_struct_from_opaque(erl_type(), [erl_type()]) -> erl_type().
@@ -605,9 +762,10 @@ t_struct_from_opaque(?function(Domain, Range), Opaques) ->
   ?function(t_struct_from_opaque(Domain, Opaques),
 	    t_struct_from_opaque(Range, Opaques));
 t_struct_from_opaque(?list(Types, Term, Size), Opaques) ->
-  ?list(t_struct_from_opaque(Types, Opaques), Term, Size);
+  ?list(t_struct_from_opaque(Types, Opaques),
+        t_struct_from_opaque(Term, Opaques), Size);
 t_struct_from_opaque(?opaque(_) = T, Opaques) ->
-  case lists:member(T, Opaques) of
+  case is_opaque_type(T, Opaques) of
     true  -> t_opaque_structure(T);
     false -> T
   end;
@@ -627,24 +785,10 @@ t_struct_from_opaque(Type, _Opaques) -> Type.
 list_struct_from_opaque(Types, Opaques) ->
   [t_struct_from_opaque(Type, Opaques) || Type <- Types].
 
--spec t_unopaque_on_mismatch(erl_type(), erl_type(), [erl_type()]) -> erl_type().
-
-t_unopaque_on_mismatch(GenType, Type, Opaques) ->
-  case t_inf(GenType, Type) of
-    ?none ->
-      Unopaqued = t_unopaque(Type, Opaques),
-      %% XXX: Unions might be a problem, must investigate.
-      case t_inf(GenType, Unopaqued) of
-	?none -> Type;
-	_ -> Unopaqued
-      end;
-     _ -> Type
-  end.
-
 -spec module_builtin_opaques(module()) -> [erl_type()].
 
 module_builtin_opaques(Module) ->
-  [O || O <- all_opaque_builtins(), t_opaque_module(O) =:= Module].
+  [O || O <- all_opaque_builtins(), lists:member(Module, t_opaque_modules(O))].
 
 %%-----------------------------------------------------------------------------
 %% Remote types: these types are used for preprocessing;
@@ -657,10 +801,15 @@ t_remote(Mod, Name, Args) ->
 
 -spec t_is_remote(erl_type()) -> boolean().
 
-t_is_remote(?remote(_)) -> true;
-t_is_remote(_) -> false.
+t_is_remote(Type) ->
+  do_opaque(Type, 'universe', fun is_remote/1).
+
+is_remote(?remote(_)) -> true;
+is_remote(_) -> false.
 
--spec t_solve_remote(erl_type(), set(), dict()) -> erl_type().
+-type mod_records() :: dict:dict(module(), type_table()).
+
+-spec t_solve_remote(erl_type(), sets:set(mfa()), mod_records()) -> erl_type().
 
 t_solve_remote(Type, ExpTypes, Records) ->
   {RT, _RR} = t_solve_remote(Type, ExpTypes, Records, []),
@@ -671,8 +820,9 @@ t_solve_remote(?function(Domain, Range), ET, R, C) ->
   {RT2, RR2} = t_solve_remote(Range, ET, R, C),
   {?function(RT1, RT2), RR1 ++ RR2};
 t_solve_remote(?list(Types, Term, Size), ET, R, C) ->
-  {RT, RR} = t_solve_remote(Types, ET, R, C),
-  {?list(RT, Term, Size), RR};
+  {RT1, RR1} = t_solve_remote(Types, ET, R, C),
+  {RT2, RR2} = t_solve_remote(Term, ET, R, C),
+  {?list(RT1, RT2, Size), RR1 ++ RR2};
 t_solve_remote(?product(Types), ET, R, C) ->
   {RL, RR} = list_solve_remote(Types, ET, R, C),
   {?product(RL), RR};
@@ -696,8 +846,12 @@ t_solve_remote(?union(List), ET, R, C) ->
   {t_sup(RL), RR};
 t_solve_remote(T, _ET, _R, _C) -> {T, []}.
 
-t_solve_remote_type(#remote{mod = RemMod, name = Name, args = Args} = RemType,
+t_solve_remote_type(#remote{mod = RemMod, name = Name, args = Args0} = RemType,
                     ET, R, C) ->
+  Args = lists:map(fun(A) ->
+                       {Arg, _} = t_solve_remote(A, ET, R, C),
+                       Arg
+                   end, Args0),
   ArgsLen = length(Args),
   case dict:find(RemMod, R) of
     error ->
@@ -743,9 +897,7 @@ t_solve_remote_type(#remote{mod = RemMod, name = Name, args = Args} = RemType,
                   true -> t_limit(NewRep, ?REC_TYPE_LIMIT);
                   false -> NewRep
                 end,
-              {t_from_form({opaque, -1, Name, {Mod, Args, RT1}},
-                           RemDict, TmpVarDict),
-               RetRR};
+              {skip_opaque_alias(RT1, Mod, Name, Args), RetRR};
             error ->
               Msg = io_lib:format("Unable to find remote type ~w:~w()\n",
                                   [RemMod, Name]),
@@ -826,40 +978,75 @@ t_atoms(List) when is_list(List) ->
 
 -spec t_atom_vals(erl_type()) -> 'unknown' | [atom(),...].
 
-t_atom_vals(?atom(?any)) -> unknown;
-t_atom_vals(?atom(Set)) -> set_to_list(Set);
-t_atom_vals(Other) ->
+t_atom_vals(Type) ->
+  t_atom_vals(Type, 'universe').
+
+-spec t_atom_vals(erl_type(), opaques()) -> 'unknown' | [atom(),...].
+
+t_atom_vals(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun atom_vals/1).
+
+atom_vals(?atom(?any)) -> unknown;
+atom_vals(?atom(Set)) -> set_to_list(Set);
+atom_vals(?opaque(_)) -> unknown;
+atom_vals(Other) ->
   ?atom(_) = Atm = t_inf(t_atom(), Other),
-  t_atom_vals(Atm).
+  atom_vals(Atm).
 
 -spec t_is_atom(erl_type()) -> boolean().
 
-t_is_atom(?atom(_)) -> true;
-t_is_atom(_) -> false.
+t_is_atom(Type) ->
+  t_is_atom(Type, 'universe').
+
+-spec t_is_atom(erl_type(), opaques()) -> boolean().
+
+t_is_atom(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_atom1/1).
+
+is_atom1(?atom(_)) -> true;
+is_atom1(_) -> false.
+
+-spec t_is_any_atom(atom(), erl_type()) -> boolean().
+
+t_is_any_atom(Atom, SomeAtomsType) ->
+  t_is_any_atom(Atom, SomeAtomsType, 'universe').
+
+-spec t_is_any_atom(atom(), erl_type(), opaques()) -> boolean().
 
--spec t_is_atom(atom(), erl_type()) -> boolean().
+t_is_any_atom(Atom, SomeAtomsType, Opaques) ->
+  do_opaque(SomeAtomsType, Opaques,
+            fun(AtomsType) -> is_any_atom(Atom, AtomsType) end).
 
-t_is_atom(Atom, ?atom(?any)) when is_atom(Atom) -> false;
-t_is_atom(Atom, ?atom(Set)) when is_atom(Atom) -> set_is_singleton(Atom, Set);
-t_is_atom(Atom, _) when is_atom(Atom) -> false.
+is_any_atom(Atom, ?atom(?any)) when is_atom(Atom) -> false;
+is_any_atom(Atom, ?atom(Set)) when is_atom(Atom) ->
+  set_is_singleton(Atom, Set);
+is_any_atom(Atom, _) when is_atom(Atom) -> false.
 
 %%------------------------------------
 
+-spec t_is_boolean(erl_type()) -> boolean().
+
+t_is_boolean(Type) ->
+  t_is_boolean(Type, 'universe').
+
+-spec t_is_boolean(erl_type(), opaques()) -> boolean().
+
+t_is_boolean(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_boolean/1).
+
 -spec t_boolean() -> erl_type().
 
 t_boolean() ->
   ?atom(set_from_list([false, true])).
 
--spec t_is_boolean(erl_type()) -> boolean().
-
-t_is_boolean(?atom(?any)) -> false;
-t_is_boolean(?atom(Set)) ->
+is_boolean(?atom(?any)) -> false;
+is_boolean(?atom(Set)) ->
   case set_size(Set) of
     1 -> set_is_element(true, Set) orelse set_is_element(false, Set);
     2 -> set_is_element(true, Set) andalso set_is_element(false, Set);
     N when is_integer(N), N > 2 -> false
   end;
-t_is_boolean(_) -> false.
+is_boolean(_) -> false.
 
 %%-----------------------------------------------------------------------------
 %% Binaries
@@ -872,9 +1059,17 @@ t_binary() ->
 
 -spec t_is_binary(erl_type()) -> boolean().
 
-t_is_binary(?bitstr(U, B)) -> 
+t_is_binary(Type) ->
+  t_is_binary(Type, 'universe').
+
+-spec t_is_binary(erl_type(), opaques()) -> boolean().
+
+t_is_binary(Type, Opaques) ->
+    do_opaque(Type, Opaques, fun is_binary/1).
+
+is_binary(?bitstr(U, B)) ->
   ((U rem 8) =:= 0) andalso ((B rem 8) =:= 0);
-t_is_binary(_) -> false.
+is_binary(_) -> false.
 
 %%-----------------------------------------------------------------------------
 %% Bitstrings
@@ -921,19 +1116,27 @@ t_bitstr_concat_1([], Acc) ->
 t_bitstr_concat(T1, T2) ->
   T1p = t_inf(t_bitstr(), T1),
   T2p = t_inf(t_bitstr(), T2),
-  bitstr_concat(T1p, T2p).
+  bitstr_concat(t_unopaque(T1p), t_unopaque(T2p)).
 
 -spec t_bitstr_match(erl_type(), erl_type()) -> erl_type().
 
 t_bitstr_match(T1, T2) ->
   T1p = t_inf(t_bitstr(), T1),
   T2p = t_inf(t_bitstr(), T2),
-  bitstr_match(T1p, T2p).
+  bitstr_match(t_unopaque(T1p), t_unopaque(T2p)).
 
 -spec t_is_bitstr(erl_type()) -> boolean().
 
-t_is_bitstr(?bitstr(_, _)) -> true;
-t_is_bitstr(_) -> false.
+t_is_bitstr(Type) ->
+  t_is_bitstr(Type, 'universe').
+
+-spec t_is_bitstr(erl_type(), opaques()) -> boolean().
+
+t_is_bitstr(Type, Opaques) ->
+    do_opaque(Type, Opaques, fun is_bitstr/1).
+
+is_bitstr(?bitstr(_, _)) -> true;
+is_bitstr(_) -> false.
 
 %%-----------------------------------------------------------------------------
 %% Matchstates
@@ -1044,27 +1247,59 @@ t_fun(Arity, Range) when is_integer(Arity), 0 =< Arity, Arity =< 255 ->
 
 -spec t_fun_args(erl_type()) -> 'unknown' | [erl_type()].
 
-t_fun_args(?function(?any, _)) ->
+t_fun_args(Type) ->
+  t_fun_args(Type, 'universe').
+
+-spec t_fun_args(erl_type(), opaques()) -> 'unknown' | [erl_type()].
+
+t_fun_args(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun fun_args/1).
+
+fun_args(?function(?any, _)) ->
   unknown;
-t_fun_args(?function(?product(Domain), _)) when is_list(Domain) ->
+fun_args(?function(?product(Domain), _)) when is_list(Domain) ->
   Domain.
 
 -spec t_fun_arity(erl_type()) -> 'unknown' | non_neg_integer().
 
-t_fun_arity(?function(?any, _)) ->
+t_fun_arity(Type) ->
+  t_fun_arity(Type, 'universe').
+
+-spec t_fun_arity(erl_type(), opaques()) -> 'unknown' | non_neg_integer().
+
+t_fun_arity(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun fun_arity/1).
+
+fun_arity(?function(?any, _)) ->
   unknown;
-t_fun_arity(?function(?product(Domain), _)) ->
+fun_arity(?function(?product(Domain), _)) ->
   length(Domain).
 
 -spec t_fun_range(erl_type()) -> erl_type().
 
-t_fun_range(?function(_, Range)) ->
+t_fun_range(Type) ->
+  t_fun_range(Type, 'universe').
+
+-spec t_fun_range(erl_type(), opaques()) -> erl_type().
+
+t_fun_range(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun fun_range/1).
+
+fun_range(?function(_, Range)) ->
   Range.
 
 -spec t_is_fun(erl_type()) -> boolean().
 
-t_is_fun(?function(_, _)) -> true;
-t_is_fun(_) -> false.
+t_is_fun(Type) ->
+  t_is_fun(Type, 'universe').
+
+-spec t_is_fun(erl_type(), opaques()) -> boolean().
+
+t_is_fun(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_fun/1).
+
+is_fun(?function(_, _)) -> true;
+is_fun(_) -> false.
 
 %%-----------------------------------------------------------------------------
 %% Identifiers. Includes ports, pids and refs.
@@ -1091,9 +1326,17 @@ t_port() ->
 
 -spec t_is_port(erl_type()) -> boolean().
 
-t_is_port(?identifier(?any)) -> false;
-t_is_port(?identifier(Set)) -> set_is_singleton(?port_qual, Set);
-t_is_port(_) -> false.
+t_is_port(Type) ->
+  t_is_port(Type, 'universe').
+
+-spec t_is_port(erl_type(), opaques()) -> boolean().
+
+t_is_port(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_port1/1).
+
+is_port1(?identifier(?any)) -> false;
+is_port1(?identifier(Set)) -> set_is_singleton(?port_qual, Set);
+is_port1(_) -> false.
 
 %%------------------------------------
 
@@ -1104,9 +1347,17 @@ t_pid() ->
 
 -spec t_is_pid(erl_type()) -> boolean().
 
-t_is_pid(?identifier(?any)) -> false;
-t_is_pid(?identifier(Set)) -> set_is_singleton(?pid_qual, Set);
-t_is_pid(_) -> false.
+t_is_pid(Type) ->
+  t_is_pid(Type, 'universe').
+
+-spec t_is_pid(erl_type(), opaques()) -> boolean().
+
+t_is_pid(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_pid1/1).
+
+is_pid1(?identifier(?any)) -> false;
+is_pid1(?identifier(Set)) -> set_is_singleton(?pid_qual, Set);
+is_pid1(_) -> false.
 
 %%------------------------------------
 
@@ -1117,9 +1368,17 @@ t_reference() ->
 
 -spec t_is_reference(erl_type()) -> boolean().
 
-t_is_reference(?identifier(?any)) -> false;
-t_is_reference(?identifier(Set)) -> set_is_singleton(?reference_qual, Set);
-t_is_reference(_) -> false.
+t_is_reference(Type) ->
+  t_is_reference(Type, 'universe').
+
+-spec t_is_reference(erl_type(), opaques()) -> boolean().
+
+t_is_reference(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_reference1/1).
+
+is_reference1(?identifier(?any)) -> false;
+is_reference1(?identifier(Set)) -> set_is_singleton(?reference_qual, Set);
+is_reference1(_) -> false.
 
 %%-----------------------------------------------------------------------------
 %% Numbers are divided into floats, integers, chars and bytes.
@@ -1137,21 +1396,39 @@ t_number(X) when is_integer(X) ->
 
 -spec t_is_number(erl_type()) -> boolean().
 
-t_is_number(?number(_, _)) -> true;
-t_is_number(_) -> false.
+t_is_number(Type) ->
+  t_is_number(Type, 'universe').
+
+-spec t_is_number(erl_type(), opaques()) -> boolean().
+
+t_is_number(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_number/1).
+
+is_number(?number(_, _)) -> true;
+is_number(_) -> false.
 
 %% Currently, the type system collapses all floats to ?float and does
 %% not keep any information about their values. As a result, the list
 %% that this function returns contains only integers.
+
 -spec t_number_vals(erl_type()) -> 'unknown' | [integer(),...].
 
-t_number_vals(?int_set(?any)) -> unknown;
-t_number_vals(?int_set(Set)) -> set_to_list(Set);
-t_number_vals(?number(_, _)) -> unknown;
-t_number_vals(Other) ->
+t_number_vals(Type) ->
+  t_number_vals(Type, 'universe').
+
+-spec t_number_vals(erl_type(), opaques()) -> 'unknown' | [integer(),...].
+
+t_number_vals(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun number_vals/1).
+
+number_vals(?int_set(?any)) -> unknown;
+number_vals(?int_set(Set)) -> set_to_list(Set);
+number_vals(?number(_, _)) -> unknown;
+number_vals(?opaque(_)) -> unknown;
+number_vals(Other) ->
   Inf = t_inf(Other, t_number()),
   false = t_is_none(Inf), % sanity check
-  t_number_vals(Inf).
+  number_vals(Inf).
 
 %%------------------------------------
 
@@ -1162,8 +1439,16 @@ t_float() ->
 
 -spec t_is_float(erl_type()) -> boolean().
 
-t_is_float(?float) -> true;
-t_is_float(_) -> false.
+t_is_float(Type) ->
+  t_is_float(Type, 'universe').
+
+-spec t_is_float(erl_type(), opaques()) -> boolean().
+
+t_is_float(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_float1/1).
+
+is_float1(?float) -> true;
+is_float1(_) -> false.
 
 %%------------------------------------
 
@@ -1184,8 +1469,16 @@ t_integers(List) when is_list(List) ->
 
 -spec t_is_integer(erl_type()) -> boolean().
 
-t_is_integer(?integer(_)) -> true;
-t_is_integer(_) -> false.
+t_is_integer(Type) ->
+  t_is_integer(Type, 'universe').
+
+-spec t_is_integer(erl_type(), opaques()) -> boolean().
+
+t_is_integer(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_integer1/1).
+
+is_integer1(?integer(_)) -> true;
+is_integer1(_) -> false.
 
 %%------------------------------------
 
@@ -1249,7 +1542,7 @@ t_cons(Hd, ?nil) ->
 t_cons(Hd, ?list(Contents, Termination, _)) ->
   ?nonempty_list(t_sup(Contents, Hd), Termination);
 t_cons(Hd, Tail) ->
-  case t_inf(Tail, t_maybe_improper_list()) of
+  case cons_tail(t_inf(Tail, t_maybe_improper_list())) of
     ?list(Contents, Termination, _Size) ->
       %% Collapse the list part of the termination but keep the
       %% non-list part intact.
@@ -1261,18 +1554,45 @@ t_cons(Hd, Tail) ->
     ?unit -> ?none
   end.
 
+cons_tail(Type) ->
+  do_opaque(Type, 'universe', fun(T) -> T end).
+
 -spec t_is_cons(erl_type()) -> boolean().
 
-t_is_cons(?nonempty_list(_, _)) -> true;
-t_is_cons(_) -> false.  
+t_is_cons(Type) ->
+  t_is_cons(Type, 'universe').
+
+-spec t_is_cons(erl_type(), opaques()) -> boolean().
+
+t_is_cons(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_cons/1).
+
+is_cons(?nonempty_list(_, _)) -> true;
+is_cons(_) -> false.
 
 -spec t_cons_hd(erl_type()) -> erl_type().
 
-t_cons_hd(?nonempty_list(Contents, _Termination)) -> Contents.
+t_cons_hd(Type) ->
+  t_cons_hd(Type, 'universe').
+
+-spec t_cons_hd(erl_type(), opaques()) -> erl_type().
+
+t_cons_hd(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun cons_hd/1).
+
+cons_hd(?nonempty_list(Contents, _Termination)) -> Contents.
 
 -spec t_cons_tl(erl_type()) -> erl_type().
 
-t_cons_tl(?nonempty_list(_Contents, Termination) = T) ->
+t_cons_tl(Type) ->
+  t_cons_tl(Type, 'universe').
+
+-spec t_cons_tl(erl_type(), opaques()) -> erl_type().
+
+t_cons_tl(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun cons_tl/1).
+
+cons_tl(?nonempty_list(_Contents, Termination) = T) ->
   t_sup(Termination, T).
 
 -spec t_nil() -> erl_type().
@@ -1282,8 +1602,16 @@ t_nil() ->
 
 -spec t_is_nil(erl_type()) -> boolean().
 
-t_is_nil(?nil) -> true;
-t_is_nil(_) -> false.
+t_is_nil(Type) ->
+  t_is_nil(Type, 'universe').
+
+-spec t_is_nil(erl_type(), opaques()) -> boolean().
+
+t_is_nil(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_nil/1).
+
+is_nil(?nil) -> true;
+is_nil(_) -> false.
 
 -spec t_list() -> erl_type().
 
@@ -1299,8 +1627,16 @@ t_list(Contents) ->
 
 -spec t_list_elements(erl_type()) -> erl_type().
 
-t_list_elements(?list(Contents, _, _)) -> Contents;
-t_list_elements(?nil) -> ?none.
+t_list_elements(Type) ->
+  t_list_elements(Type, 'universe').
+
+-spec t_list_elements(erl_type(), opaques()) -> erl_type().
+
+t_list_elements(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun list_elements/1).
+
+list_elements(?list(Contents, _, _)) -> Contents;
+list_elements(?nil) -> ?none.
 
 -spec t_list_termination(erl_type()) -> erl_type().
 
@@ -1349,15 +1685,23 @@ t_maybe_improper_list() ->
 t_maybe_improper_list(_Content, ?unit) -> ?none;
 t_maybe_improper_list(?unit, _Termination) -> ?none;
 t_maybe_improper_list(Content, Termination) ->
-  %% Safety check
-  true = t_is_subtype(t_nil(), Termination),
+  %% Safety check: would be nice to have but does not work with remote types
+  %% true = t_is_subtype(t_nil(), Termination),
   ?list(Content, Termination, ?unknown_qual).
 
 -spec t_is_maybe_improper_list(erl_type()) -> boolean().
 
-t_is_maybe_improper_list(?list(_, _, _)) -> true;
-t_is_maybe_improper_list(?nil) -> true;
-t_is_maybe_improper_list(_) -> false.
+t_is_maybe_improper_list(Type) ->
+  t_is_maybe_improper_list(Type, 'universe').
+
+-spec t_is_maybe_improper_list(erl_type(), opaques()) -> boolean().
+
+t_is_maybe_improper_list(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_maybe_improper_list/1).
+
+is_maybe_improper_list(?list(_, _, _)) -> true;
+is_maybe_improper_list(?nil) -> true;
+is_maybe_improper_list(_) -> false.
 
 %% %% Should only be used if you know what you are doing. See t_cons/2
 %% -spec t_improper_list(erl_type(), erl_type()) -> erl_type().
@@ -1365,8 +1709,8 @@ t_is_maybe_improper_list(_) -> false.
 %% t_improper_list(?unit, _Termination) -> ?none;
 %% t_improper_list(_Content, ?unit) -> ?none;
 %% t_improper_list(Content, Termination) ->
-%%   %% Safety check
-%%   false = t_is_subtype(t_nil(), Termination),
+%%   %% Safety check: would be nice to have but does not work with remote types
+%%   %% false = t_is_subtype(t_nil(), Termination),
 %%   ?list(Content, Termination, ?any).  
 
 -spec lift_list_to_pos_empty(erl_type()) -> erl_type().
@@ -1376,6 +1720,29 @@ lift_list_to_pos_empty(?list(Content, Termination, _)) ->
   ?list(Content, Termination, ?unknown_qual).
 
 %%-----------------------------------------------------------------------------
+%% Maps
+%%
+
+-spec t_map() -> erl_type().
+
+t_map() ->
+  ?map([]).
+
+-spec t_map([{erl_type(),erl_type()}]) -> erl_type().
+
+t_map(_) ->
+  ?map([]).
+
+-spec t_is_map(erl_type(), opaques()) -> boolean().
+
+t_is_map(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_map1/1).
+
+is_map1(?map(_)) -> true;
+is_map1(_) -> false.
+
+
+%%-----------------------------------------------------------------------------
 %% Tuples
 %%
 
@@ -1404,32 +1771,77 @@ t_tuple(List) ->
 
 -spec get_tuple_tags([erl_type()]) -> [erl_type(),...].
 
-get_tuple_tags([?atom(?any)|_]) -> [?any];
-get_tuple_tags([?atom(Set)|_]) ->
+get_tuple_tags([Tag|_]) ->
+  do_opaque(Tag, 'universe', fun tuple_tags/1);
+get_tuple_tags(_) -> [?any].
+
+tuple_tags(?atom(?any)) -> [?any];
+tuple_tags(?atom(Set)) ->
   case set_size(Set) > ?TUPLE_TAG_LIMIT of
     true -> [?any];
     false -> [t_atom(A) || A <- set_to_list(Set)]
   end;
-get_tuple_tags(_) -> [?any].
+tuple_tags(_) -> [?any].
 
 %% to be used for a tuple with known types for its arguments (not ?any)
 -spec t_tuple_args(erl_type()) -> [erl_type()].
 
-t_tuple_args(?tuple(Args, _, _)) when is_list(Args) -> Args.
+t_tuple_args(Type) ->
+  t_tuple_args(Type, 'universe').
+
+%% to be used for a tuple with known types for its arguments (not ?any)
+-spec t_tuple_args(erl_type(), opaques()) -> [erl_type()].
+
+t_tuple_args(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun tuple_args/1).
+
+tuple_args(?tuple(Args, _, _)) when is_list(Args) -> Args.
 
 %% to be used for a tuple with a known size (not ?any)
 -spec t_tuple_size(erl_type()) -> non_neg_integer().
 
-t_tuple_size(?tuple(_, Size, _)) when is_integer(Size) -> Size.
+t_tuple_size(Type) ->
+  t_tuple_size(Type, 'universe').
+
+%% to be used for a tuple with a known size (not ?any)
+-spec t_tuple_size(erl_type(), opaques()) -> non_neg_integer().
+
+t_tuple_size(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun tuple_size1/1).
+
+tuple_size1(?tuple(_, Size, _)) when is_integer(Size) -> Size.
 
 -spec t_tuple_sizes(erl_type()) -> 'unknown' | [non_neg_integer(),...].
 
-t_tuple_sizes(?tuple(?any, ?any, ?any)) -> unknown;
-t_tuple_sizes(?tuple(_, Size, _)) when is_integer(Size) -> [Size];
-t_tuple_sizes(?tuple_set(List)) -> [Size || {Size, _} <- List].
+t_tuple_sizes(Type) ->
+  do_opaque(Type, 'universe', fun tuple_sizes/1).
+
+tuple_sizes(?tuple(?any, ?any, ?any)) -> unknown;
+tuple_sizes(?tuple(_, Size, _)) when is_integer(Size) -> [Size];
+tuple_sizes(?tuple_set(List)) -> [Size || {Size, _} <- List].
+
+-spec t_tuple_subtypes(erl_type(), opaques()) ->
+         'unknown' | [erl_type(),...].
+
+t_tuple_subtypes(Type, Opaques) ->
+  Fun = fun(?tuple_set(List)) ->
+            t_tuple_subtypes_tuple_list(List, Opaques);
+           (?opaque(_)) -> unknown;
+           (T) -> t_tuple_subtypes(T)
+        end,
+  do_opaque(Type, Opaques, Fun).
+
+t_tuple_subtypes_tuple_list(List, Opaques) ->
+  lists:append([t_tuple_subtypes_list(Tuples, Opaques) ||
+                 {_Size, Tuples} <- List]).
+
+t_tuple_subtypes_list(List, Opaques) ->
+  ListOfLists = [t_tuple_subtypes(E, Opaques) || E <- List, E =/= ?none],
+  lists:append([L || L <- ListOfLists, L =/= 'unknown']).
 
 -spec t_tuple_subtypes(erl_type()) -> 'unknown' | [erl_type(),...].
 
+%% XXX. Not the same as t_tuple_subtypes(T, 'universe')...
 t_tuple_subtypes(?tuple(?any, ?any, ?any)) -> unknown;
 t_tuple_subtypes(?tuple(_, _, _) = T) -> [T];
 t_tuple_subtypes(?tuple_set(List)) ->
@@ -1437,9 +1849,17 @@ t_tuple_subtypes(?tuple_set(List)) ->
 
 -spec t_is_tuple(erl_type()) -> boolean().
 
-t_is_tuple(?tuple(_, _, _)) -> true;
-t_is_tuple(?tuple_set(_)) -> true;
-t_is_tuple(_) -> false.
+t_is_tuple(Type) ->
+  t_is_tuple(Type, 'universe').
+
+-spec t_is_tuple(erl_type(), opaques()) -> boolean().
+
+t_is_tuple(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun is_tuple1/1).
+
+is_tuple1(?tuple(_, _, _)) -> true;
+is_tuple1(?tuple_set(_)) -> true;
+is_tuple1(_) -> false.
 
 %%-----------------------------------------------------------------------------
 %% Non-primitive types, including some handy syntactic sugar types
@@ -1450,6 +1870,7 @@ t_is_tuple(_) -> false.
 t_bitstrlist() ->
   t_iolist(1, t_bitstr()).
 
+%% XXX. To be removed.
 -spec t_constant() -> erl_type().
 
 t_constant() ->
@@ -1552,20 +1973,26 @@ t_timeout() ->
 -spec t_array() -> erl_type().
 
 t_array() ->
-  t_opaque(array, array, [],
+  t_opaque(array, array, [t_any()],
 	   t_tuple([t_atom('array'),
-		    t_non_neg_integer(), t_non_neg_integer(),
-		    t_any(), t_any()])).
+		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+                    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+		    t_any(),
+                    t_any()])).
 
 -spec t_dict() -> erl_type().
 
 t_dict() ->
-  t_opaque(dict, dict, [],
+  t_opaque(dict, dict, [t_any(), t_any()],
 	   t_tuple([t_atom('dict'),
-		    t_non_neg_integer(), t_non_neg_integer(),
-		    t_non_neg_integer(), t_non_neg_integer(),
-		    t_non_neg_integer(), t_non_neg_integer(),
-		    t_tuple(), t_tuple()])).
+		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
+                    t_sup([t_atom('undefined'), t_tuple()]),
+                    t_sup([t_atom('undefined'), t_tuple()])])).
 
 -spec t_digraph() -> erl_type().
 
@@ -1592,15 +2019,17 @@ t_gb_tree() ->
 -spec t_queue() -> erl_type().
 
 t_queue() ->
-  t_opaque(queue, queue, [], t_tuple([t_list(), t_list()])).
+  t_opaque(queue, queue, [t_any()], t_tuple([t_list(), t_list()])).
 
 -spec t_set() -> erl_type().
 
 t_set() ->
-  t_opaque(sets, set, [],
+  t_opaque(sets, set, [t_any()],
 	   t_tuple([t_atom('set'), t_non_neg_integer(), t_non_neg_integer(),
 		    t_pos_integer(), t_non_neg_integer(), t_non_neg_integer(),
-		    t_non_neg_integer(), t_tuple(), t_tuple()])).
+		    t_non_neg_integer(),
+                    t_sup([t_atom('undefined'), t_tuple()]),
+                    t_sup([t_atom('undefined'), t_tuple()])])).
 
 -spec t_tid() -> erl_type().
 
@@ -1613,18 +2042,6 @@ all_opaque_builtins() ->
   [t_array(), t_dict(), t_digraph(), t_gb_set(),
    t_gb_tree(), t_queue(), t_set(), t_tid()].
 
--spec is_opaque_builtin(atom(), atom()) -> boolean().
-
-is_opaque_builtin(array, array) -> true;
-is_opaque_builtin(dict, dict) -> true;
-is_opaque_builtin(digraph, digraph) -> true;
-is_opaque_builtin(gb_sets, gb_set) -> true;
-is_opaque_builtin(gb_trees, gb_tree) -> true;
-is_opaque_builtin(queue, queue) -> true;
-is_opaque_builtin(sets, set) -> true;
-is_opaque_builtin(ets, tid) -> true;
-is_opaque_builtin(_, _) -> false.
-
 %%------------------------------------
 
 %% ?none is allowed in products. A product of size 1 is not a product.
@@ -1672,8 +2089,11 @@ t_has_var(?tuple(Elements, _, _)) ->
   t_has_var_list(Elements);
 t_has_var(?tuple_set(_) = T) ->
   t_has_var_list(t_tuple_subtypes(T));
-%% t_has_var(?union(_) = U) ->
-%% exit(lists:flatten(io_lib:format("Union happens in t_has_var/1 ~p\n",[U])));
+t_has_var(?opaque(Set)) ->
+  %% Assume variables in 'args' are also present i 'struct'
+  t_has_var_list([O#opaque.struct || O <- set_to_list(Set)]);
+t_has_var(?union(List)) ->
+  t_has_var_list(List);
 t_has_var(_) -> false.
 
 -spec t_has_var_list([erl_type()]) -> boolean().
@@ -1704,6 +2124,10 @@ t_collect_vars(?tuple(Types, _, _), Acc) ->
 t_collect_vars(?tuple_set(_) = TS, Acc) ->
   lists:foldl(fun(T, TmpAcc) -> t_collect_vars(T, TmpAcc) end, Acc, 
 	      t_tuple_subtypes(TS));
+t_collect_vars(?opaque(Set), Acc) ->
+  %% Assume variables in 'args' are also present i 'struct'
+  lists:foldl(fun(T, TmpAcc) -> t_collect_vars(T, TmpAcc) end, Acc,
+	      [O#opaque.struct || O <- set_to_list(Set)]);
 t_collect_vars(_, Acc) ->
   Acc.
 
@@ -1826,15 +2250,31 @@ t_is_bitwidth(_) -> false.
 
 -spec number_min(erl_type()) -> rng_elem().
 
-number_min(?int_range(From, _)) -> From;
-number_min(?int_set(Set)) -> set_min(Set);
-number_min(?number(?any, _Tag)) -> neg_inf.
+number_min(Type) ->
+  number_min(Type, 'universe').
+
+-spec number_min(erl_type(), opaques()) -> rng_elem().
+
+number_min(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun number_min2/1).
+
+number_min2(?int_range(From, _)) -> From;
+number_min2(?int_set(Set)) -> set_min(Set);
+number_min2(?number(?any, _Tag)) -> neg_inf.
 
 -spec number_max(erl_type()) -> rng_elem().
 
-number_max(?int_range(_, To)) -> To;
-number_max(?int_set(Set)) -> set_max(Set);
-number_max(?number(?any, _Tag)) -> pos_inf.
+number_max(Type) ->
+  number_max(Type, 'universe').
+
+-spec number_max(erl_type(), opaques()) -> rng_elem().
+
+number_max(Type, Opaques) ->
+  do_opaque(Type, Opaques, fun number_max2/1).
+
+number_max2(?int_range(_, To)) -> To;
+number_max2(?int_set(Set)) -> set_max(Set);
+number_max2(?number(?any, _Tag)) -> pos_inf.
 
 %% -spec int_range(rgn_elem(), rng_elem()) -> erl_type().
 %%
@@ -1916,7 +2356,7 @@ t_sup(?function(Domain1, Range1), ?function(Domain2, Range2)) ->
 t_sup(?identifier(Set1), ?identifier(Set2)) ->
   ?identifier(set_union(Set1, Set2));
 t_sup(?opaque(Set1), ?opaque(Set2)) ->
-  ?opaque(set_union_no_limit(Set1, Set2));
+  sup_opaque(set_to_list(ordsets:union(Set1, Set2)));
 %%Disallow unions with opaque types
 %%t_sup(T1=?opaque(_,_,_), T2) ->
 %%  io:format("Debug: t_sup executed with args ~w and ~w~n",[T1, T2]), ?none;
@@ -2004,6 +2444,27 @@ t_sup(T1, T2) ->
   ?union(U2) = force_union(T2),
   sup_union(U1, U2).
 
+sup_opaque([]) -> ?none;
+sup_opaque(List) ->
+  L = sup_opaq(List),
+  ?opaque(ordsets:from_list(L)).
+
+sup_opaq(L0) ->
+  L1 = [{{Mod,Name,Args}, T} ||
+         #opaque{mod = Mod, name = Name, args = Args}=T <- L0],
+  F = family(L1),
+  [supl(Ts) || {_, Ts} <- F].
+
+supl([O]) -> O;
+supl(Ts) -> supl(Ts, t_none()).
+
+supl([#opaque{struct = S}=O|L], S0) ->
+  S1 = t_sup(S, S0),
+  case L =:= [] of
+    true -> O#opaque{struct = S1};
+    false -> supl(L, S1)
+  end.
+
 -spec t_sup_lists([erl_type()], [erl_type()]) -> [erl_type()].
 
 t_sup_lists([T1|Left1], [T2|Left2]) ->
@@ -2097,6 +2558,7 @@ force_union(T = ?nil) ->              ?list_union(T);
 force_union(T = ?number(_,_)) ->      ?number_union(T);
 force_union(T = ?opaque(_)) ->        ?opaque_union(T);
 force_union(T = ?remote(_)) ->        ?remote_union(T);
+force_union(T = ?map(_)) ->           ?map_union(T);
 force_union(T = ?tuple(_, _, _)) ->   ?tuple_union(T);
 force_union(T = ?tuple_set(_)) ->     ?tuple_union(T);
 force_union(T = ?matchstate(_, _)) -> ?matchstate_union(T);
@@ -2131,19 +2593,27 @@ t_elements(?number(_, _) = T) ->
     ?int_set(Set) ->
       [t_integer(I) || I <- Set]
   end;
-t_elements(?opaque(_) = T) -> [T];
+t_elements(?opaque(_) = T) ->
+  do_elements(T);
+t_elements(?map(_) = T) -> [T];
 t_elements(?tuple(_, _, _) = T) -> [T];
 t_elements(?tuple_set(_) = TS) ->
   case t_tuple_subtypes(TS) of
     unknown -> [];
     Elems -> Elems
   end;
-t_elements(?union(List)) ->
-  lists:append([t_elements(T) || T <- List]);
+t_elements(?union(_) = T) ->
+  do_elements(T);
 t_elements(?var(_)) -> [?any].  %% yes, vars exist -- what else to do here?
 %% t_elements(T) ->
 %%   io:format("T_ELEMENTS => ~p\n", [T]).
 
+do_elements(Type0) ->
+  case do_opaque(Type0, 'universe', fun(T) -> T end) of
+    ?union(List) -> lists:append([t_elements(T) || T <- List]);
+    Type -> t_elements(Type)
+  end.
+
 %%-----------------------------------------------------------------------------
 %% Infimum
 %%
@@ -2161,74 +2631,77 @@ t_inf([]) -> ?none.
 -spec t_inf(erl_type(), erl_type()) -> erl_type().
 
 t_inf(T1, T2) ->
-  t_inf(T1, T2, structured).
-
--type t_inf_mode() :: 'opaque' | 'structured'.
--spec t_inf(erl_type(), erl_type(), t_inf_mode()) -> erl_type().
-
-t_inf(?var(_), ?var(_), _Mode) -> ?any;
-t_inf(?var(_), T, _Mode) -> subst_all_vars_to_any(T);
-t_inf(T, ?var(_), _Mode) -> subst_all_vars_to_any(T);
-t_inf(?any, T, _Mode) -> subst_all_vars_to_any(T);
-t_inf(T, ?any, _Mode) -> subst_all_vars_to_any(T);
-t_inf(?none, _, _Mode) -> ?none;
-t_inf(_, ?none, _Mode) -> ?none;
-t_inf(?unit, _, _Mode) -> ?unit;	% ?unit cases should appear below ?none
-t_inf(_, ?unit, _Mode) -> ?unit;
-t_inf(T, T, _Mode) -> subst_all_vars_to_any(T);
+  t_inf(T1, T2, 'universe').
+
+%% 'match' should be used from t_find_unknown_opaque() only
+-type t_inf_opaques() :: 'universe'
+                       | [erl_type()] | {'match', [erl_type() | 'universe']}.
+
+-spec t_inf(erl_type(), erl_type(), t_inf_opaques()) -> erl_type().
+
+t_inf(?var(_), ?var(_), _Opaques) -> ?any;
+t_inf(?var(_), T, _Opaques) -> subst_all_vars_to_any(T);
+t_inf(T, ?var(_), _Opaques) -> subst_all_vars_to_any(T);
+t_inf(?any, T, _Opaques) -> subst_all_vars_to_any(T);
+t_inf(T, ?any, _Opaques) -> subst_all_vars_to_any(T);
+t_inf(?none, _, _Opaques) -> ?none;
+t_inf(_, ?none, _Opaques) -> ?none;
+t_inf(?unit, _, _Opaques) -> ?unit;	% ?unit cases should appear below ?none
+t_inf(_, ?unit, _Opaques) -> ?unit;
+t_inf(T, T, _Opaques) -> subst_all_vars_to_any(T);
 t_inf(?atom(Set1), ?atom(Set2), _) ->
   case set_intersection(Set1, Set2) of
     ?none ->  ?none;
     NewSet -> ?atom(NewSet)
   end;
-t_inf(?bitstr(U1, B1), ?bitstr(0, B2), _Mode) ->
+t_inf(?bitstr(U1, B1), ?bitstr(0, B2), _Opaques) ->
   if B2 >= B1 andalso (B2-B1) rem U1 =:= 0 -> t_bitstr(0, B2);
      true -> ?none
   end;
-t_inf(?bitstr(0, B1), ?bitstr(U2, B2), _Mode) ->
+t_inf(?bitstr(0, B1), ?bitstr(U2, B2), _Opaques) ->
   if B1 >= B2 andalso (B1-B2) rem U2 =:= 0 -> t_bitstr(0, B1);
      true -> ?none
   end;
-t_inf(?bitstr(U1, B1), ?bitstr(U1, B1), _Mode) ->
+t_inf(?bitstr(U1, B1), ?bitstr(U1, B1), _Opaques) ->
   t_bitstr(U1, B1);
-t_inf(?bitstr(U1, B1), ?bitstr(U2, B2), _Mode) when U2 > U1 ->
+t_inf(?bitstr(U1, B1), ?bitstr(U2, B2), _Opaques) when U2 > U1 ->
   inf_bitstr(U2, B2, U1, B1);
-t_inf(?bitstr(U1, B1), ?bitstr(U2, B2), _Mode) ->
+t_inf(?bitstr(U1, B1), ?bitstr(U2, B2), _Opaques) ->
   inf_bitstr(U1, B1, U2, B2);
-t_inf(?function(Domain1, Range1), ?function(Domain2, Range2), Mode) ->
-  case t_inf(Domain1, Domain2, Mode) of
+t_inf(?function(Domain1, Range1), ?function(Domain2, Range2), Opaques) ->
+  case t_inf(Domain1, Domain2, Opaques) of
     ?none -> ?none;
-    Domain -> ?function(Domain, t_inf(Range1, Range2, Mode))
+    Domain -> ?function(Domain, t_inf(Range1, Range2, Opaques))
   end;
-t_inf(?identifier(Set1), ?identifier(Set2), _Mode) ->
+t_inf(?identifier(Set1), ?identifier(Set2), _Opaques) ->
   case set_intersection(Set1, Set2) of
     ?none -> ?none;
     Set -> ?identifier(Set)
   end;
-t_inf(?matchstate(Pres1, Slots1), ?matchstate(Pres2, Slots2), _Mode) ->
+t_inf(?matchstate(Pres1, Slots1), ?matchstate(Pres2, Slots2), _Opaques) ->
   ?matchstate(t_inf(Pres1, Pres2), t_inf(Slots1, Slots2));
-t_inf(?nil, ?nil, _Mode) -> ?nil;
-t_inf(?nil, ?nonempty_list(_, _), _Mode) ->
+t_inf(?nil, ?nil, _Opaques) -> ?nil;
+t_inf(?nil, ?nonempty_list(_, _), _Opaques) ->
   ?none;
-t_inf(?nonempty_list(_, _), ?nil, _Mode) ->
+t_inf(?nonempty_list(_, _), ?nil, _Opaques) ->
   ?none;
-t_inf(?nil, ?list(_Contents, Termination, _), Mode) ->
-  t_inf(?nil, Termination, Mode);
-t_inf(?list(_Contents, Termination, _), ?nil, Mode) ->
-  t_inf(?nil, Termination, Mode);
+t_inf(?nil, ?list(_Contents, Termination, _), Opaques) ->
+  t_inf(?nil, t_unopaque(Termination), Opaques);
+t_inf(?list(_Contents, Termination, _), ?nil, Opaques) ->
+  t_inf(?nil, t_unopaque(Termination), Opaques);
 t_inf(?list(Contents1, Termination1, Size1),
-      ?list(Contents2, Termination2, Size2), Mode) ->  
-  case t_inf(Termination1, Termination2, Mode) of
+      ?list(Contents2, Termination2, Size2), Opaques) ->
+  case t_inf(Termination1, Termination2, Opaques) of
     ?none -> ?none;
     Termination ->
-      case t_inf(Contents1, Contents2, Mode) of
-	?none -> 
+      case t_inf(Contents1, Contents2, Opaques) of
+	?none ->
 	  %% If none of the lists are nonempty, then the infimum is nil.
 	  case (Size1 =:= ?unknown_qual) andalso (Size2 =:= ?unknown_qual) of
 	    true -> t_nil();
 	    false -> ?none
 	  end;
-	Contents -> 
+	Contents ->
 	  Size =
 	    case {Size1, Size2} of
 	      {?unknown_qual, ?unknown_qual} -> ?unknown_qual;
@@ -2239,7 +2712,7 @@ t_inf(?list(Contents1, Termination1, Size1),
 	  ?list(Contents, Termination, Size)
       end
   end;
-t_inf(?number(_, _) = T1, ?number(_, _) = T2, _Mode) ->
+t_inf(?number(_, _) = T1, ?number(_, _) = T2, _Opaques) ->
   case {T1, T2} of
     {T, T}                            -> T;
     {_, ?number(?any, ?unknown_qual)} -> T1;
@@ -2248,16 +2721,16 @@ t_inf(?number(_, _) = T1, ?number(_, _) = T2, _Mode) ->
     {?integer(_), ?float}             -> ?none;
     {?integer(?any), ?integer(_)}     -> T2;
     {?integer(_), ?integer(?any)}     -> T1;
-    {?int_set(Set1), ?int_set(Set2)}  -> 
+    {?int_set(Set1), ?int_set(Set2)}  ->
       case set_intersection(Set1, Set2) of
 	?none -> ?none;
 	Set -> ?int_set(Set)
       end;
-    {?int_range(From1, To1), ?int_range(From2, To2)} -> 
+    {?int_range(From1, To1), ?int_range(From2, To2)} ->
       t_from_range(max(From1, From2), min(To1, To2));
     {Range = ?int_range(_, _), ?int_set(Set)} ->
       %% io:format("t_inf range, set args ~p ~p ~n", [T1, T2]),
-      Ans2 = 
+      Ans2 =
 	case set_filter(fun(X) -> in_range(X, Range) end, Set) of
 	  ?none -> ?none;
 	  NewSet -> ?int_set(NewSet)
@@ -2270,193 +2743,261 @@ t_inf(?number(_, _) = T1, ?number(_, _) = T2, _Mode) ->
 	NewSet -> ?int_set(NewSet)
       end
   end;
-t_inf(?product(Types1), ?product(Types2), Mode) ->
+t_inf(?product(Types1), ?product(Types2), Opaques) ->
   L1 = length(Types1),
   L2 = length(Types2),
-  if L1 =:= L2 -> ?product(t_inf_lists(Types1, Types2, Mode));
+  if L1 =:= L2 -> ?product(t_inf_lists(Types1, Types2, Opaques));
      true -> ?none
   end;
-t_inf(?product(_), _, _Mode) ->
+t_inf(?product(_), _, _Opaques) ->
   ?none;
-t_inf(_, ?product(_), _Mode) ->
+t_inf(_, ?product(_), _Opaques) ->
   ?none;
-t_inf(?tuple(?any, ?any, ?any), ?tuple(_, _, _) = T, _Mode) ->
+t_inf(?tuple(?any, ?any, ?any), ?tuple(_, _, _) = T, _Opaques) ->
   subst_all_vars_to_any(T);
-t_inf(?tuple(_, _, _) = T, ?tuple(?any, ?any, ?any), _Mode) ->
+t_inf(?tuple(_, _, _) = T, ?tuple(?any, ?any, ?any), _Opaques) ->
   subst_all_vars_to_any(T);
-t_inf(?tuple(?any, ?any, ?any), ?tuple_set(_) = T, _Mode) ->
+t_inf(?tuple(?any, ?any, ?any), ?tuple_set(_) = T, _Opaques) ->
   subst_all_vars_to_any(T);
-t_inf(?tuple_set(_) = T, ?tuple(?any, ?any, ?any), _Mode) ->
+t_inf(?tuple_set(_) = T, ?tuple(?any, ?any, ?any), _Opaques) ->
   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
+t_inf(?tuple(Elements1, Arity, _Tag1), ?tuple(Elements2, Arity, _Tag2), Opaques) ->
+  case t_inf_lists_strict(Elements1, Elements2, Opaques) of
     bottom -> ?none;
     NewElements -> t_tuple(NewElements)
   end;
-t_inf(?tuple_set(List1), ?tuple_set(List2), Mode) ->
-  inf_tuple_sets(List1, List2, Mode);
-t_inf(?tuple_set(List), ?tuple(_, Arity, _) = T, Mode) ->
-  inf_tuple_sets(List, [{Arity, [T]}], Mode);
-t_inf(?tuple(_, Arity, _) = T, ?tuple_set(List), Mode) ->
-  inf_tuple_sets(List, [{Arity, [T]}], Mode);
+t_inf(?tuple_set(List1), ?tuple_set(List2), Opaques) ->
+  inf_tuple_sets(List1, List2, Opaques);
+t_inf(?tuple_set(List), ?tuple(_, Arity, _) = T, Opaques) ->
+  inf_tuple_sets(List, [{Arity, [T]}], Opaques);
+t_inf(?tuple(_, Arity, _) = T, ?tuple_set(List), Opaques) ->
+  inf_tuple_sets(List, [{Arity, [T]}], Opaques);
 %% be careful: here and in the next clause T can be ?opaque
-t_inf(?union(U1), T, Mode) ->
+t_inf(?union(U1), T, Opaques) ->
   ?union(U2) = force_union(T),
-  inf_union(U1, U2, Mode);
-t_inf(T, ?union(U2), Mode) ->
+  inf_union(U1, U2, Opaques);
+t_inf(T, ?union(U2), Opaques) ->
   ?union(U1) = force_union(T),
-  inf_union(U1, U2, Mode);
+  inf_union(U1, U2, Opaques);
+t_inf(?opaque(Set1), ?opaque(Set2), Opaques) ->
+  inf_opaque(Set1, Set2, Opaques);
+t_inf(?opaque(_) = T1, T2, Opaques) ->
+  inf_opaque1(T2, T1, 1, Opaques);
+t_inf(T1, ?opaque(_) = T2, Opaques) ->
+  inf_opaque1(T1, T2, 2, Opaques);
 %% and as a result, the cases for ?opaque should appear *after* ?union
-t_inf(?opaque(Set1) = T1, ?opaque(Set2) = T2, Mode) ->
-  case set_intersection(Set1, Set2) of
-    ?none ->
-      case Mode =:= opaque of
-	true ->
-	  Struct1 = t_opaque_structure(T1),
-	  case t_inf(Struct1, T2) of
-	    ?none ->
-	      Struct2 = t_opaque_structure(T2),
-	      case t_inf(Struct2, T1) of
-		?none -> ?none;
-		_ -> T2
-	      end;
-	    _ -> T1
-	  end;
-	false -> ?none
-      end;
-    NewSet -> ?opaque(NewSet)
-  end;
-t_inf(?opaque(_) = T1, T2, opaque) ->
-  case t_inf(t_opaque_structure(T1), T2, structured) of
-    ?none -> ?none;
-    _Type -> T1
-  end;
-t_inf(T1, ?opaque(_) = T2, opaque) ->
-  case t_inf(T1, t_opaque_structure(T2), structured) of
-    ?none -> ?none;
-    _Type -> T2
-  end;
 t_inf(#c{}, #c{}, _) ->
   ?none.
 
+inf_opaque1(T1, ?opaque(Set2)=T2, Pos, Opaques) ->
+  case Opaques =:= 'universe' orelse inf_is_opaque_type(T2, Pos, Opaques) of
+    false -> ?none;
+    true ->
+      List2 = set_to_list(Set2),
+      case inf_collect(T1, List2, Opaques, []) of
+        [] -> ?none;
+        OpL -> ?opaque(ordsets:from_list(OpL))
+      end
+  end.
+
+inf_is_opaque_type(T, Pos, {match, Opaques}) ->
+  is_opaque_type(T, Opaques) orelse throw(Pos);
+inf_is_opaque_type(T, _Pos, Opaques) ->
+  is_opaque_type(T, Opaques).
+
+inf_collect(T1, [T2|List2], Opaques, OpL) ->
+  #opaque{struct = S2} = T2,
+  case t_inf(T1, S2, Opaques) of
+    ?none -> inf_collect(T1, List2, Opaques, OpL);
+    Inf ->
+      Op = T2#opaque{struct = Inf},
+      inf_collect(T1, List2, Opaques, [Op|OpL])
+  end;
+inf_collect(_T1, [], _Opaques, OpL) ->
+  OpL.
+
+combine(S, T1, T2) ->
+  #opaque{mod = Mod1, name = Name1, args = Args1} = T1,
+  #opaque{mod = Mod2, name = Name2, args = Args2} = T2,
+  case is_same_type_name({Mod1, Name1, Args1}, {Mod2, Name2, Args2}) of
+    true  -> [comb(Mod1, Name1, Args1, S, T1)];
+    false -> [comb(Mod1, Name1, Args1, S, T1), comb(Mod2, Name2, Args2, S, T2)]
+  end.
+
+comb(Mod, Name, Args, S, T) ->
+  case is_same_name(Mod, Name, Args, S) of
+    true -> S;
+    false -> T#opaque{struct = S}
+  end.
+
+is_same_name(Mod1, Name1, Args1,
+             ?opaque([#opaque{mod = Mod2, name = Name2, args = Args2}])) ->
+  is_same_type_name({Mod1, Name1, Args1}, {Mod2, Name2, Args2});
+is_same_name(_, _, _, _) -> false.
+
+%% Combining two lists this way can be very time consuming...
+%% Note: two parameterized opaque types are not the same if their
+%% actual parameters differ
+inf_opaque(Set1, Set2, Opaques) ->
+  List1 = inf_look_up(Set1, 1, Opaques),
+  List2 = inf_look_up(Set2, 2, Opaques),
+  List0 = [combine(Inf, T1, T2) ||
+            {Is1, ModNameArgs1, T1} <- List1,
+            {Is2, ModNameArgs2, T2} <- List2,
+            not t_is_none(Inf = inf_opaque_types(Is1, ModNameArgs1, T1,
+                                                 Is2, ModNameArgs2, T2,
+                                                 Opaques))],
+  List = lists:sort(lists:append(List0)),
+  sup_opaque(List).
+
+%% Optimization: do just one lookup.
+inf_look_up(Set, Pos, Opaques) ->
+  [{Opaques =:= 'universe' orelse inf_is_opaque_type2(T, Pos, Opaques),
+    {M, N, Args}, T} ||
+    #opaque{mod = M, name = N, args = Args} = T <- set_to_list(Set)].
+
+inf_is_opaque_type2(T, Pos, {match, Opaques}) ->
+  is_opaque_type2(T, Opaques) orelse throw(Pos);
+inf_is_opaque_type2(T, _Pos, Opaques) ->
+  is_opaque_type2(T, Opaques).
+
+inf_opaque_types(IsOpaque1, ModNameArgs1, T1,
+                 IsOpaque2, ModNameArgs2, T2, Opaques) ->
+  #opaque{struct = S1}=T1,
+  #opaque{struct = S2}=T2,
+  case
+    Opaques =:= 'universe' orelse
+    is_same_type_name(ModNameArgs1, ModNameArgs2)
+  of
+    true -> t_inf(S1, S2, Opaques);
+    false ->
+      case {IsOpaque1, IsOpaque2} of
+        {true, true}   -> t_inf(S1, S2, Opaques);
+        {true, false}  -> t_inf(S1, ?opaque(set_singleton(T2)), Opaques);
+        {false, true}  -> t_inf(?opaque(set_singleton(T1)), S2, Opaques);
+        {false, false} -> t_none()
+      end
+  end.
+
 -spec t_inf_lists([erl_type()], [erl_type()]) -> [erl_type()].
 
 t_inf_lists(L1, L2) ->
-  t_inf_lists(L1, L2, structured).
+  t_inf_lists(L1, L2, 'universe').
 
--spec t_inf_lists([erl_type()], [erl_type()], t_inf_mode()) -> [erl_type()].
+-spec t_inf_lists([erl_type()], [erl_type()], t_inf_opaques()) -> [erl_type()].
 
-t_inf_lists(L1, L2, Mode) ->
-  t_inf_lists(L1, L2, [], Mode).
+t_inf_lists(L1, L2, Opaques) ->
+  t_inf_lists(L1, L2, [], Opaques).
 
--spec t_inf_lists([erl_type()], [erl_type()], [erl_type()], t_inf_mode()) -> [erl_type()].
+-spec t_inf_lists([erl_type()], [erl_type()], [erl_type()], [erl_type()]) -> [erl_type()].
 
-t_inf_lists([T1|Left1], [T2|Left2], Acc, Mode) ->
-  t_inf_lists(Left1, Left2, [t_inf(T1, T2, Mode)|Acc], Mode);
-t_inf_lists([], [], Acc, _Mode) ->
+t_inf_lists([T1|Left1], [T2|Left2], Acc, Opaques) ->
+  t_inf_lists(Left1, Left2, [t_inf(T1, T2, Opaques)|Acc], Opaques);
+t_inf_lists([], [], Acc, _Opaques) ->
   lists:reverse(Acc).
 
 %% Infimum of lists with strictness.
 %% If any element is the ?none type, the value 'bottom' is returned.
 
--spec t_inf_lists_strict([erl_type()], [erl_type()], t_inf_mode()) -> 'bottom' | [erl_type()].
+-spec t_inf_lists_strict([erl_type()], [erl_type()], [erl_type()]) -> 'bottom' | [erl_type()].
 
-t_inf_lists_strict(L1, L2, Mode) ->
-  t_inf_lists_strict(L1, L2, [], Mode).
+t_inf_lists_strict(L1, L2, Opaques) ->
+  t_inf_lists_strict(L1, L2, [], Opaques).
 
--spec t_inf_lists_strict([erl_type()], [erl_type()], [erl_type()], t_inf_mode()) -> 'bottom' | [erl_type()].
+-spec t_inf_lists_strict([erl_type()], [erl_type()], [erl_type()], [erl_type()]) -> 'bottom' | [erl_type()].
 
-t_inf_lists_strict([T1|Left1], [T2|Left2], Acc, Mode) ->
-  case t_inf(T1, T2, Mode) of
+t_inf_lists_strict([T1|Left1], [T2|Left2], Acc, Opaques) ->
+  case t_inf(T1, T2, Opaques) of
     ?none -> bottom;
-    T -> t_inf_lists_strict(Left1, Left2, [T|Acc], Mode)
+    T -> t_inf_lists_strict(Left1, Left2, [T|Acc], Opaques)
   end;
-t_inf_lists_strict([], [], Acc, _Mode) ->
+t_inf_lists_strict([], [], Acc, _Opaques) ->
   lists:reverse(Acc).
 
--spec t_inf_lists_masked([erl_type()], [erl_type()], [t_inf_mode()]) -> [erl_type()].
-
-t_inf_lists_masked(List1, List2, Mask) ->
-  List = lists:zip3(List1, List2, Mask),
-  [t_inf(T1, T2, Mode) || {T1, T2, Mode} <- List].
-
-inf_tuple_sets(L1, L2, Mode) ->
-  case inf_tuple_sets(L1, L2, [], Mode) of
+inf_tuple_sets(L1, L2, Opaques) ->
+  case inf_tuple_sets(L1, L2, [], Opaques) of
     [] -> ?none;
     [{_Arity, [?tuple(_, _, _) = OneTuple]}] -> OneTuple;
     List -> ?tuple_set(List)
   end.
 
-inf_tuple_sets([{Arity, Tuples1}|Ts1], [{Arity, Tuples2}|Ts2], Acc, Mode) ->
-  case inf_tuples_in_sets(Tuples1, Tuples2, Mode) of
-    [] -> inf_tuple_sets(Ts1, Ts2, Acc, Mode);
+inf_tuple_sets([{Arity, Tuples1}|Ts1], [{Arity, Tuples2}|Ts2], Acc, Opaques) ->
+  case inf_tuples_in_sets(Tuples1, Tuples2, Opaques) of
+    [] -> inf_tuple_sets(Ts1, Ts2, Acc, Opaques);
     [?tuple_set([{Arity, NewTuples}])] ->
-      inf_tuple_sets(Ts1, Ts2, [{Arity, NewTuples}|Acc], Mode);
-    NewTuples -> inf_tuple_sets(Ts1, Ts2, [{Arity, NewTuples}|Acc], Mode)
+      inf_tuple_sets(Ts1, Ts2, [{Arity, NewTuples}|Acc], Opaques);
+    NewTuples -> inf_tuple_sets(Ts1, Ts2, [{Arity, NewTuples}|Acc], Opaques)
   end;
-inf_tuple_sets([{Arity1, _}|Ts1] = L1, [{Arity2, _}|Ts2] = L2, Acc, Mode) ->
-  if Arity1 < Arity2 -> inf_tuple_sets(Ts1, L2, Acc, Mode);
-     Arity1 > Arity2 -> inf_tuple_sets(L1, Ts2, Acc, Mode)
+inf_tuple_sets([{Arity1, _}|Ts1] = L1, [{Arity2, _}|Ts2] = L2, Acc, Opaques) ->
+  if Arity1 < Arity2 -> inf_tuple_sets(Ts1, L2, Acc, Opaques);
+     Arity1 > Arity2 -> inf_tuple_sets(L1, Ts2, Acc, Opaques)
   end;
-inf_tuple_sets([], _, Acc, _Mode) -> lists:reverse(Acc);
-inf_tuple_sets(_, [], Acc, _Mode) -> lists:reverse(Acc).
-      
-inf_tuples_in_sets([?tuple(Elements1, _, ?any)], L2, Mode) ->
-  NewList = [t_inf_lists_strict(Elements1, Elements2, Mode)
+inf_tuple_sets([], _, Acc, _Opaques) -> lists:reverse(Acc);
+inf_tuple_sets(_, [], Acc, _Opaques) -> lists:reverse(Acc).
+
+inf_tuples_in_sets([?tuple(Elements1, _, ?any)], L2, Opaques) ->
+  NewList = [t_inf_lists_strict(Elements1, Elements2, Opaques)
 	     || ?tuple(Elements2, _, _) <- L2],
   [t_tuple(Es) || Es <- NewList, Es =/= bottom];
-inf_tuples_in_sets(L1, [?tuple(Elements2, _, ?any)], Mode) ->
-  NewList = [t_inf_lists_strict(Elements1, Elements2, Mode)
+inf_tuples_in_sets(L1, [?tuple(Elements2, _, ?any)], Opaques) ->
+  NewList = [t_inf_lists_strict(Elements1, Elements2, Opaques)
 	     || ?tuple(Elements1, _, _) <- L1],
   [t_tuple(Es) || Es <- NewList, Es =/= bottom];
-inf_tuples_in_sets(L1, L2, Mode) ->
-  inf_tuples_in_sets(L1, L2, [], Mode).
+inf_tuples_in_sets(L1, L2, Opaques) ->
+  inf_tuples_in_sets2(L1, L2, [], Opaques).
 
-inf_tuples_in_sets([?tuple(Elements1, Arity, Tag)|Ts1],
-		   [?tuple(Elements2, Arity, Tag)|Ts2], Acc, Mode) ->
-  case t_inf_lists_strict(Elements1, Elements2, Mode) of
-    bottom -> inf_tuples_in_sets(Ts1, Ts2, Acc, Mode);
+inf_tuples_in_sets2([?tuple(Elements1, Arity, Tag)|Ts1],
+                    [?tuple(Elements2, Arity, Tag)|Ts2], Acc, Opaques) ->
+  case t_inf_lists_strict(Elements1, Elements2, Opaques) of
+    bottom -> inf_tuples_in_sets2(Ts1, Ts2, Acc, Opaques);
     NewElements ->
-      inf_tuples_in_sets(Ts1, Ts2, [?tuple(NewElements, Arity, Tag)|Acc], Mode)
+      inf_tuples_in_sets2(Ts1, Ts2, [?tuple(NewElements, Arity, Tag)|Acc],
+                          Opaques)
   end;
-inf_tuples_in_sets([?tuple(_, _, Tag1)|Ts1] = L1,
-		   [?tuple(_, _, Tag2)|Ts2] = L2, Acc, Mode) ->
-  if Tag1 < Tag2 -> inf_tuples_in_sets(Ts1, L2, Acc, Mode);
-     Tag1 > Tag2 -> inf_tuples_in_sets(L1, Ts2, Acc, Mode)
+inf_tuples_in_sets2([?tuple(_, _, Tag1)|Ts1] = L1,
+                    [?tuple(_, _, Tag2)|Ts2] = L2, Acc, Opaques) ->
+  if Tag1 < Tag2 -> inf_tuples_in_sets2(Ts1, L2, Acc, Opaques);
+     Tag1 > Tag2 -> inf_tuples_in_sets2(L1, Ts2, Acc, Opaques)
   end;
-inf_tuples_in_sets([], _, Acc, _Mode) -> lists:reverse(Acc);
-inf_tuples_in_sets(_, [], Acc, _Mode) -> lists:reverse(Acc).
-
-inf_union(U1, U2, opaque) ->
-%%---------------------------------------------------------------------
-%%                          Under Testing
-%%----------------------------------------------------------------------
-%%   OpaqueFun = 
-%%     fun(Union1, Union2) ->
-%% 	[_,_,_,_,_,_,_,_,Opaque,_] = Union1,
-%% 	[A,B,F,I,L,N,T,M,_,_R] = Union2,
-%% 	List = [A,B,F,I,L,N,T,M],
-%%         case [T || T <- List, t_inf(T, Opaque, opaque) =/= ?none] of
-%% 	  [] -> ?none;
-%% 	  _  -> Opaque
-%% 	end
-%%     end,
-%%   O1 = OpaqueFun(U1, U2),
-%%   O2 = OpaqueFun(U2, U1),
-%%   Union = inf_union(U1, U2, 0, [], opaque),
-%%   t_sup([O1, O2, Union]);
-  inf_union(U1, U2, 0, [], opaque);
-inf_union(U1, U2, OtherMode) ->
-  inf_union(U1, U2, 0, [], OtherMode).
-
-inf_union([?none|Left1], [?none|Left2], N, Acc, Mode) ->
-  inf_union(Left1, Left2, N, [?none|Acc], Mode);
-inf_union([T1|Left1], [T2|Left2], N, Acc, Mode) ->
-  case t_inf(T1, T2, Mode) of
-    ?none -> inf_union(Left1, Left2, N, [?none|Acc], Mode);
-    T     -> inf_union(Left1, Left2, N+1, [T|Acc], Mode)
+inf_tuples_in_sets2([], _, Acc, _Opaques) -> lists:reverse(Acc);
+inf_tuples_in_sets2(_, [], Acc, _Opaques) -> lists:reverse(Acc).
+
+inf_union(U1, U2, Opaques) ->
+  OpaqueFun =
+    fun(Union1, Union2, InfFun) ->
+	[_,_,_,_,_,_,_,_,Opaque,_,_] = Union1,
+        [A,B,F,I,L,N,T,M,_,_R,Map] = Union2,
+        List = [A,B,F,I,L,N,T,M,Map],
+        inf_union_collect(List, Opaque, InfFun, [], [])
+    end,
+  O1 = OpaqueFun(U1, U2, fun(E, Opaque) -> t_inf(Opaque, E, Opaques) end),
+  O2 = OpaqueFun(U2, U1, fun(E, Opaque) -> t_inf(E, Opaque, Opaques) end),
+  Union = inf_union(U1, U2, 0, [], Opaques),
+  t_sup([O1, O2, Union]).
+
+inf_union_collect([], _Opaque, _InfFun, InfList, ThrowList) ->
+  case t_sup(InfList) of
+    ?none when ThrowList =/= [] -> throw(hd(lists:flatten(ThrowList)));
+    Sup -> Sup
+  end;
+inf_union_collect([?none|L], Opaque, InfFun, InfList, ThrowList) ->
+  inf_union_collect(L, Opaque, InfFun, [?none|InfList], ThrowList);
+inf_union_collect([E|L], Opaque, InfFun, InfList, ThrowList) ->
+  try InfFun(E, Opaque)of
+    Inf ->
+      inf_union_collect(L, Opaque, InfFun, [Inf|InfList], ThrowList)
+  catch throw:N when is_integer(N) ->
+      inf_union_collect(L, Opaque, InfFun, InfList, [N|ThrowList])
+  end.
+
+inf_union([?none|Left1], [?none|Left2], N, Acc, Opaques) ->
+  inf_union(Left1, Left2, N, [?none|Acc], Opaques);
+inf_union([T1|Left1], [T2|Left2], N, Acc, Opaques) ->
+  case t_inf(T1, T2, Opaques) of
+    ?none -> inf_union(Left1, Left2, N, [?none|Acc], Opaques);
+    T     -> inf_union(Left1, Left2, N+1, [T|Acc], Opaques)
   end;
-inf_union([], [], N, Acc, _Mode) ->
+inf_union([], [], N, Acc, _Opaques) ->
   if N =:= 0 -> ?none;
      N =:= 1 ->
       [Type] = [T || T <- Acc, T =/= ?none],
@@ -2493,13 +3034,13 @@ findfirst(N1, N2, U1, B1, U2, B2) ->
 %% to types. Hans Bolinder suggested the use of lists of Key-Value pairs for
 %% this data structure and measurements showed a non-trivial speedup when using
 %% them for operations within this module (e.g. in t_unify/2). However, there
-%% is code outside erl_types that still passes a dict() in the 2nd argument.
+%% is code outside erl_types that still passes a dict:dict() in the 2nd argument.
 %% So, for the time being, this module provides a t_subst/2 function for these
 %% external calls and a clone of it (t_subst_kv/2) which is used from all calls
 %% from within this module. This code duplication needs to be eliminated at
 %% some point.
 
--spec t_subst(erl_type(), dict()) -> erl_type().
+-spec t_subst(erl_type(), dict:dict(atom(), erl_type())) -> erl_type().
 
 t_subst(T, Dict) ->
   case t_has_var(T) of
@@ -2535,6 +3076,13 @@ t_subst_dict(?tuple(Elements, _Arity, _Tag), Dict) ->
   t_tuple([t_subst_dict(E, Dict) || E <- Elements]);
 t_subst_dict(?tuple_set(_) = TS, Dict) ->
   t_sup([t_subst_dict(T, Dict) || T <- t_tuple_subtypes(TS)]);
+t_subst_dict(?opaque(Es), Dict) ->
+  List = [Opaque#opaque{args = [t_subst_dict(Arg, Dict) || Arg <- Args],
+                        struct = t_subst_dict(S, Dict)} ||
+           Opaque = #opaque{args = Args, struct = S} <- set_to_list(Es)],
+  ?opaque(ordsets:from_list(List));
+t_subst_dict(?union(List), Dict) ->
+  ?union([t_subst_dict(E, Dict) || E <- List]);
 t_subst_dict(T, _Dict) ->
   T.
 
@@ -2577,6 +3125,13 @@ t_subst_aux(?tuple(Elements, _Arity, _Tag), VarMap) ->
   t_tuple([t_subst_aux(E, VarMap) || E <- Elements]);
 t_subst_aux(?tuple_set(_) = TS, VarMap) ->
   t_sup([t_subst_aux(T, VarMap) || T <- t_tuple_subtypes(TS)]);
+t_subst_aux(?opaque(Es), VarMap) ->
+   List = [Opaque#opaque{args = [t_subst_aux(Arg, VarMap) || Arg <- Args],
+                         struct = t_subst_aux(S, VarMap)} ||
+            Opaque = #opaque{args = Args, struct = S} <- set_to_list(Es)],
+   ?opaque(ordsets:from_list(List));
+t_subst_aux(?union(List), VarMap) ->
+  ?union([t_subst_aux(E, VarMap) || E <- List]);
 t_subst_aux(T, _VarMap) ->
   T.
 	      
@@ -2589,112 +3144,152 @@ t_subst_aux(T, _VarMap) ->
 -spec t_unify(erl_type(), erl_type()) -> t_unify_ret().
 
 t_unify(T1, T2) ->
-  t_unify(T1, T2, []).
-
--spec t_unify(erl_type(), erl_type(), [erl_type()]) -> t_unify_ret().
-
-t_unify(T1, T2, Opaques) ->
-  {T, VarMap} = t_unify(T1, T2, [], Opaques),
+  {T, VarMap} = t_unify(T1, T2, []),
   {t_subst_kv(T, VarMap), lists:keysort(1, VarMap)}.
 
-t_unify(?var(Id) = T, ?var(Id), VarMap, _Opaques) ->
+t_unify(?var(Id) = T, ?var(Id), VarMap) ->
   {T, VarMap};
-t_unify(?var(Id1) = T, ?var(Id2), VarMap, Opaques) ->
+t_unify(?var(Id1) = T, ?var(Id2), VarMap) ->
   case lists:keyfind(Id1, 1, VarMap) of
     false ->
       case lists:keyfind(Id2, 1, VarMap) of
 	false -> {T, [{Id2, T} | VarMap]};
-	{Id2, Type} -> t_unify(T, Type, VarMap, Opaques)
+	{Id2, Type} -> t_unify(T, Type, VarMap)
       end;
     {Id1, Type1} ->
       case lists:keyfind(Id2, 1, VarMap) of
 	false -> {Type1, [{Id2, T} | VarMap]};
-	{Id2, Type2} -> t_unify(Type1, Type2, VarMap, Opaques)
+	{Id2, Type2} -> t_unify(Type1, Type2, VarMap)
       end
   end;
-t_unify(?var(Id), Type, VarMap, Opaques) ->
+t_unify(?var(Id), Type, VarMap) ->
   case lists:keyfind(Id, 1, VarMap) of
     false -> {Type, [{Id, Type} | VarMap]};
-    {Id, VarType} -> t_unify(VarType, Type, VarMap, Opaques)
+    {Id, VarType} -> t_unify(VarType, Type, VarMap)
   end;
-t_unify(Type, ?var(Id), VarMap, Opaques) ->
+t_unify(Type, ?var(Id), VarMap) ->
   case lists:keyfind(Id, 1, VarMap) of
     false -> {Type, [{Id, Type} | VarMap]};
-    {Id, VarType} -> t_unify(VarType, Type, VarMap, Opaques)
+    {Id, VarType} -> t_unify(VarType, Type, VarMap)
   end;
-t_unify(?function(Domain1, Range1), ?function(Domain2, Range2), VarMap, Opaques) ->
-  {Domain, VarMap1} = t_unify(Domain1, Domain2, VarMap, Opaques),
-  {Range, VarMap2} = t_unify(Range1, Range2, VarMap1, Opaques),
+t_unify(?function(Domain1, Range1), ?function(Domain2, Range2), VarMap) ->
+  {Domain, VarMap1} = t_unify(Domain1, Domain2, VarMap),
+  {Range, VarMap2} = t_unify(Range1, Range2, VarMap1),
   {?function(Domain, Range), VarMap2};
 t_unify(?list(Contents1, Termination1, Size), 
-	?list(Contents2, Termination2, Size), VarMap, Opaques) ->
-  {Contents, VarMap1} = t_unify(Contents1, Contents2, VarMap, Opaques),
-  {Termination, VarMap2} = t_unify(Termination1, Termination2, VarMap1, Opaques),
+	?list(Contents2, Termination2, Size), VarMap) ->
+  {Contents, VarMap1} = t_unify(Contents1, Contents2, VarMap),
+  {Termination, VarMap2} = t_unify(Termination1, Termination2, VarMap1),
   {?list(Contents, Termination, Size), VarMap2};
-t_unify(?product(Types1), ?product(Types2), VarMap, Opaques) ->
-  {Types, VarMap1} = unify_lists(Types1, Types2, VarMap, Opaques),
+t_unify(?product(Types1), ?product(Types2), VarMap) ->
+  {Types, VarMap1} = unify_lists(Types1, Types2, VarMap),
   {?product(Types), VarMap1};
-t_unify(?tuple(?any, ?any, ?any) = T, ?tuple(?any, ?any, ?any), VarMap, _Opaques) ->
+t_unify(?tuple(?any, ?any, ?any) = T, ?tuple(?any, ?any, ?any), VarMap) ->
   {T, VarMap};
 t_unify(?tuple(Elements1, Arity, _), 
-	?tuple(Elements2, Arity, _), VarMap, Opaques) when Arity =/= ?any ->
-  {NewElements, VarMap1} = unify_lists(Elements1, Elements2, VarMap, Opaques),
+	?tuple(Elements2, Arity, _), VarMap) when Arity =/= ?any ->
+  {NewElements, VarMap1} = unify_lists(Elements1, Elements2, VarMap),
   {t_tuple(NewElements), VarMap1};
 t_unify(?tuple_set([{Arity, _}]) = T1, 
-	?tuple(_, Arity, _) = T2, VarMap, Opaques) when Arity =/= ?any ->
-  unify_tuple_set_and_tuple(T1, T2, VarMap, Opaques);
+	?tuple(_, Arity, _) = T2, VarMap) when Arity =/= ?any ->
+  unify_tuple_set_and_tuple1(T1, T2, VarMap);
 t_unify(?tuple(_, Arity, _) = T1,
-	?tuple_set([{Arity, _}]) = T2, VarMap, Opaques) when Arity =/= ?any ->
-  unify_tuple_set_and_tuple(T2, T1, VarMap, Opaques);
-t_unify(?tuple_set(List1), ?tuple_set(List2), VarMap, Opaques) ->
-  {Tuples, NewVarMap} =
-    unify_lists(lists:append([T || {_Arity, T} <- List1]), 
-		lists:append([T || {_Arity, T} <- List2]), VarMap, Opaques),
-  {t_sup(Tuples), NewVarMap};
-t_unify(?opaque(Elements) = T, ?opaque(Elements), VarMap, _Opaques) ->
-  {T, VarMap};
-t_unify(?opaque(_) = T1, ?opaque(_) = T2, _VarMap, _Opaques) ->
-  throw({mismatch, T1, T2});
-t_unify(Type, ?opaque(_) = OpType, VarMap, Opaques) ->
-  t_unify_with_opaque(Type, OpType, VarMap, Opaques);
-t_unify(?opaque(_) = OpType, Type, VarMap, Opaques) ->
-  t_unify_with_opaque(Type, OpType, VarMap, Opaques);
-t_unify(T, T, VarMap, _Opaques) ->
+	?tuple_set([{Arity, _}]) = T2, VarMap) when Arity =/= ?any ->
+  unify_tuple_set_and_tuple2(T1, T2, VarMap);
+t_unify(?tuple_set(List1) = T1, ?tuple_set(List2) = T2, VarMap) ->
+  try
+    unify_lists(lists:append([T || {_Arity, T} <- List1]),
+                lists:append([T || {_Arity, T} <- List2]), VarMap)
+  of
+    {Tuples, NewVarMap} -> {t_sup(Tuples), NewVarMap}
+  catch _:_ -> throw({mismatch, T1, T2})
+  end;
+t_unify(?opaque(_) = T1, ?opaque(_) = T2, VarMap) ->
+  t_unify(t_opaque_structure(T1), t_opaque_structure(T2), VarMap);
+t_unify(T1, ?opaque(_) = T2, VarMap) ->
+  t_unify(T1, t_opaque_structure(T2), VarMap);
+t_unify(?opaque(_) = T1, T2, VarMap) ->
+  t_unify(t_opaque_structure(T1), T2, VarMap);
+t_unify(T, T, VarMap) ->
   {T, VarMap};
-t_unify(T1, T2, _, _) ->
+t_unify(?union(_)=T1, ?union(_)=T2, VarMap) ->
+  {Type1, Type2} = unify_union2(T1, T2),
+  t_unify(Type1, Type2, VarMap);
+t_unify(?union(_)=T1, T2, VarMap) ->
+  t_unify(unify_union1(T1, T1, T2), T2, VarMap);
+t_unify(T1, ?union(_)=T2, VarMap) ->
+  t_unify(T1, unify_union1(T2, T1, T2), VarMap);
+t_unify(T1, T2, _) ->
   throw({mismatch, T1, T2}).
 
-t_unify_with_opaque(Type, OpType, VarMap, Opaques) ->
-  case lists:member(OpType, Opaques) of
+unify_union2(?union(List1)=T1, ?union(List2)=T2) ->
+  case {unify_union(List1), unify_union(List2)} of
+    {{yes, Type1}, {yes, Type2}} -> {Type1, Type2};
+    {{yes, Type1}, no} -> {Type1, T2};
+    {no, {yes, Type2}} -> {T1, Type2};
+    {no, no} -> throw({mismatch, T1, T2})
+  end.
+
+unify_union1(?union(List), T1, T2) ->
+  case unify_union(List) of
+    {yes, Type} -> Type;
+    no -> throw({mismatch, T1, T2})
+  end.
+
+unify_union(List) ->
+  [A,B,F,I,L,N,T,M,O,R,Map] = List,
+  if O =:= ?none -> no;
     true ->
-      Struct = t_opaque_structure(OpType),
-      try t_unify(Type, Struct, VarMap, Opaques) of
-	{_T, VarMap1} -> {OpType, VarMap1}
-      catch
-	throw:{mismatch, _T1, _T2} ->
-	  case t_inf(OpType, Type, opaque) of
-	    ?none -> throw({mismatch, Type, OpType});
-	    _ -> {OpType, VarMap}
-	  end
-      end;
-    false ->
-      throw({mismatch, Type, OpType})
+      S = t_opaque_structure(O),
+      {yes, t_sup([A,B,F,I,L,N,T,M,S,R,Map])}
   end.
 
-unify_tuple_set_and_tuple(?tuple_set([{Arity, List}]), 
-			  ?tuple(Elements2, Arity, _), VarMap, Opaques) ->
+-spec is_opaque_type(erl_type(), [erl_type()]) -> boolean().
+
+%% An opaque type is a union of types. Returns true iff any of the type
+%% names (Module and Name) of the first argument (the opaque type to
+%% check) occurs in any of the opaque types of the second argument.
+is_opaque_type(?opaque(Elements), Opaques) ->
+  lists:any(fun(Opaque) -> is_opaque_type2(Opaque, Opaques) end, Elements).
+
+is_opaque_type2(#opaque{mod = Mod1, name = Name1, args = Args1}, Opaques) ->
+  F1 = fun(?opaque(Es)) ->
+           F2 = fun(#opaque{mod = Mod, name = Name, args = Args}) ->
+                    is_type_name(Mod1, Name1, Args1, Mod, Name, Args)
+                end,
+           lists:any(F2, Es)
+       end,
+  lists:any(F1, Opaques).
+
+is_type_name(Mod, Name, Args1, Mod, Name, Args2) ->
+  length(Args1) =:= length(Args2);
+is_type_name(Mod1, Name1, Args1, Mod2, Name2, Args2) ->
+  is_same_type_name2(Mod1, Name1, Args1, Mod2, Name2, Args2).
+
+%% Two functions since t_unify is not symmetric.
+unify_tuple_set_and_tuple1(?tuple_set([{Arity, List}]),
+                           ?tuple(Elements2, Arity, _), VarMap) ->
   %% Can only work if the single tuple has variables at correct places.
   %% Collapse the tuple set.
-  {NewElements, VarMap1} = unify_lists(sup_tuple_elements(List), Elements2, VarMap, Opaques),
+  {NewElements, VarMap1} =
+    unify_lists(sup_tuple_elements(List), Elements2, VarMap),
   {t_tuple(NewElements), VarMap1}.
 
-unify_lists(L1, L2, VarMap, Opaques) ->
-  unify_lists(L1, L2, VarMap, [], Opaques).
+unify_tuple_set_and_tuple2(?tuple(Elements2, Arity, _),
+                           ?tuple_set([{Arity, List}]), VarMap) ->
+  %% Can only work if the single tuple has variables at correct places.
+  %% Collapse the tuple set.
+  {NewElements, VarMap1} =
+    unify_lists(Elements2, sup_tuple_elements(List), VarMap),
+  {t_tuple(NewElements), VarMap1}.
+
+unify_lists(L1, L2, VarMap) ->
+  unify_lists(L1, L2, VarMap, []).
 
-unify_lists([T1|Left1], [T2|Left2], VarMap, Acc, Opaques) ->
-  {NewT, NewVarMap} = t_unify(T1, T2, VarMap, Opaques),
-  unify_lists(Left1, Left2, NewVarMap, [NewT|Acc], Opaques);
-unify_lists([], [], VarMap, Acc, _Opaques) ->
+unify_lists([T1|Left1], [T2|Left2], VarMap, Acc) ->
+  {NewT, NewVarMap} = t_unify(T1, T2, VarMap),
+  unify_lists(Left1, Left2, NewVarMap, [NewT|Acc]);
+unify_lists([], [], VarMap, Acc) ->
   {lists:reverse(Acc), VarMap}.
 
 %%t_assign_variables_to_subtype(T1, T2) ->
@@ -2836,11 +3431,12 @@ t_subtract(?identifier(Set1), ?identifier(Set2)) ->
     ?none -> ?none;
     Set -> ?identifier(Set)
   end;
-t_subtract(?opaque(Set1), ?opaque(Set2)) ->
-  case set_subtract(Set1, Set2) of
-    ?none -> ?none;
-    Set -> ?opaque(Set)
-  end;
+t_subtract(?opaque(_)=T1, ?opaque(_)=T2) ->
+  opaque_subtract(T1, t_opaque_structure(T2));
+t_subtract(?opaque(_)=T1, T2) ->
+  opaque_subtract(T1, T2);
+t_subtract(T1, ?opaque(_)=T2) ->
+  t_subtract(T1, t_opaque_structure(T2));
 t_subtract(?matchstate(Pres1, Slots1), ?matchstate(Pres2, _Slots2)) ->
   Pres = t_subtract(Pres1, Pres2),
   case t_is_none(Pres) of
@@ -2975,6 +3571,17 @@ t_subtract(T1, T2) ->
   ?union(U2) = force_union(T2),
   subtract_union(U1, U2).
 
+-spec opaque_subtract(erl_type(), erl_type()) -> erl_type().
+
+opaque_subtract(?opaque(Set1), T2) ->
+  List = [T1#opaque{struct = Sub} ||
+           #opaque{struct = S1}=T1 <- set_to_list(Set1),
+           not t_is_none(Sub = t_subtract(S1, T2))],
+  case List of
+    [] -> ?none;
+    _ -> ?opaque(ordsets:from_list(List))
+  end.
+
 -spec t_subtract_lists([erl_type()], [erl_type()]) -> [erl_type()].
 
 t_subtract_lists(L1, L2) ->
@@ -2990,7 +3597,18 @@ t_subtract_lists([], [], Acc) ->
 -spec subtract_union([erl_type(),...], [erl_type(),...]) -> erl_type().
 
 subtract_union(U1, U2) ->
-  subtract_union(U1, U2, 0, []).
+  [A1,B1,F1,I1,L1,N1,T1,M1,O1,R1,Map1] = U1,
+  [A2,B2,F2,I2,L2,N2,T2,M2,O2,R2,Map2] = U2,
+  List1 = [A1,B1,F1,I1,L1,N1,T1,M1,?none,R1,Map1],
+  List2 = [A2,B2,F2,I2,L2,N2,T2,M2,?none,R2,Map2],
+  Sub1 = subtract_union(List1, List2, 0, []),
+  O = if O1 =:= ?none -> O1;
+         true -> t_subtract(O1, ?union(U2))
+      end,
+  Sub2 = if O2 =:= ?none -> Sub1;
+            true -> t_subtract(Sub1, t_opaque_structure(O2))
+         end,
+  t_sup(O, Sub2).
 
 -spec subtract_union([erl_type()], [erl_type()], non_neg_integer(), [erl_type()]) -> erl_type().
 
@@ -3051,10 +3669,24 @@ t_is_equal(_, _) -> false.
 
 t_is_subtype(T1, T2) ->
   Inf = t_inf(T1, T2),
-  t_is_equal(T1, Inf).
+  subtype_is_equal(T1, Inf).
+
+%% The subtype relation has to behave correctly irrespective of opaque
+%% types.
+subtype_is_equal(T, T)   -> true;
+subtype_is_equal(T1, T2) ->
+  t_is_equal(case t_contains_opaque(T1) of
+               true  -> t_unopaque(T1);
+               false -> T1
+             end,
+             case t_contains_opaque(T2) of
+               true  -> t_unopaque(T2);
+               false -> T2
+             end).
 
 -spec t_is_instance(erl_type(), erl_type()) -> boolean().
 
+%% XXX. To be removed.
 t_is_instance(ConcreteType, Type) ->
   t_is_subtype(ConcreteType, t_unopaque(Type)).
 
@@ -3066,12 +3698,12 @@ t_unopaque(T) ->
 -spec t_unopaque(erl_type(), 'universe' | [erl_type()]) -> erl_type().
 
 t_unopaque(?opaque(_) = T, Opaques) ->
-  case Opaques =:= universe orelse lists:member(T, Opaques) of
+  case Opaques =:= 'universe' orelse is_opaque_type(T, Opaques) of
     true -> t_unopaque(t_opaque_structure(T), Opaques);
     false -> T  % XXX: needs revision for parametric opaque data types
   end;
 t_unopaque(?list(ElemT, Termination, Sz), Opaques) ->
-  ?list(t_unopaque(ElemT, Opaques), Termination, Sz);
+  ?list(t_unopaque(ElemT, Opaques), t_unopaque(Termination, Opaques), Sz);
 t_unopaque(?tuple(?any, _, _) = T, _) -> T;
 t_unopaque(?tuple(ArgTs, Sz, Tag), Opaques) when is_list(ArgTs) ->
   NewArgTs = [t_unopaque(A, Opaques) || A <- ArgTs],
@@ -3080,14 +3712,19 @@ t_unopaque(?tuple_set(Set), Opaques) ->
   NewSet = [{Sz, [t_unopaque(T, Opaques) || T <- Tuples]}
 	    || {Sz, Tuples} <- Set],
   ?tuple_set(NewSet);
-t_unopaque(?union([A,B,F,I,L,N,T,M,O,R]), Opaques) ->
+t_unopaque(?product(Types), Opaques) ->
+  ?product([t_unopaque(T, Opaques) || T <- Types]);
+t_unopaque(?function(Domain, Range), Opaques) ->
+  ?function(t_unopaque(Domain, Opaques), t_unopaque(Range, Opaques));
+t_unopaque(?union([A,B,F,I,L,N,T,M,O,R,Map]), Opaques) ->
   UL = t_unopaque(L, Opaques),
   UT = t_unopaque(T, Opaques),
-  UO = case O of
-	 ?none -> [];
-	 ?opaque(Os) -> [t_unopaque(S, Opaques) || #opaque{struct = S} <- Os]
-       end,
-  t_sup([?union([A,B,F,I,UL,N,UT,M,?none,R])|UO]);
+  UF = t_unopaque(F, Opaques),
+  {OF,UO} = case t_unopaque(O, Opaques) of
+              ?opaque(_) = O1 -> {O1, []};
+              Type -> {?none, [Type]}
+            end,
+  t_sup([?union([A,B,UF,I,UL,N,UT,M,OF,R,Map])|UO]);
 t_unopaque(T, _) ->
   T.
 
@@ -3133,6 +3770,12 @@ t_limit_k(?product(Elements), K) ->
   ?product([t_limit_k(X, K - 1) || X <- Elements]);
 t_limit_k(?union(Elements), K) ->
   ?union([t_limit_k(X, K) || X <- Elements]);
+t_limit_k(?opaque(Es), K) ->
+  List = [begin
+            NewS = t_limit_k(S, K),
+            Opaque#opaque{struct = NewS}
+          end || #opaque{struct = S} = Opaque <- set_to_list(Es)],
+  ?opaque(ordsets:from_list(List));
 t_limit_k(T, _K) -> T.
 
 %%============================================================================
@@ -3141,7 +3784,7 @@ t_limit_k(T, _K) -> T.
 %%
 %%============================================================================
 
--spec t_abstract_records(erl_type(), dict()) -> erl_type().
+-spec t_abstract_records(erl_type(), type_table()) -> erl_type().
 
 t_abstract_records(?list(Contents, Termination, Size), RecDict) ->
   case t_abstract_records(Contents, RecDict) of
@@ -3166,7 +3809,7 @@ t_abstract_records(?union(Types), RecDict) ->
 t_abstract_records(?tuple(?any, ?any, ?any) = T, _RecDict) ->
   T;
 t_abstract_records(?tuple(Elements, Arity, ?atom(_) = Tag), RecDict) ->
-  [TagAtom] = t_atom_vals(Tag),
+  [TagAtom] = atom_vals(Tag),
   case lookup_record(TagAtom, Arity - 1, RecDict) of
     error -> t_tuple([t_abstract_records(E, RecDict) || E <- Elements]);
     {ok, Fields} -> t_tuple([Tag|[T || {_Name, T} <- Fields]])
@@ -3175,6 +3818,8 @@ t_abstract_records(?tuple(Elements, _Arity, _Tag), RecDict) ->
   t_tuple([t_abstract_records(E, RecDict) || E <- Elements]);
 t_abstract_records(?tuple_set(_) = Tuples, RecDict) ->
   t_sup([t_abstract_records(T, RecDict) || T <- t_tuple_subtypes(Tuples)]);
+t_abstract_records(?opaque(_)=Type, RecDict) ->
+  t_abstract_records(t_opaque_structure(Type), RecDict);
 t_abstract_records(T, _RecDict) -> 
   T.
 
@@ -3197,6 +3842,14 @@ t_map(Fun, ?tuple(Elements, _Arity, _Tag)) ->
   Fun(t_tuple([t_map(Fun, E) || E <- Elements]));
 t_map(Fun, ?tuple_set(_) = Tuples) ->
   Fun(t_sup([t_map(Fun, T) || T <- t_tuple_subtypes(Tuples)]));
+t_map(Fun, ?opaque(Set)) ->
+  L = [Opaque#opaque{struct = NewS} ||
+        #opaque{struct = S} = Opaque <- set_to_list(Set),
+        not t_is_none(NewS = t_map(Fun, S))],
+  Fun(case L of
+        [] -> ?none;
+        _ -> ?opaque(ordsets:from_list(L))
+      end);
 t_map(Fun, T) ->
   Fun(T).
 
@@ -3211,7 +3864,7 @@ t_map(Fun, T) ->
 t_to_string(T) ->
   t_to_string(T, dict:new()).
 
--spec t_to_string(erl_type(), dict()) -> string().
+-spec t_to_string(erl_type(), type_table()) -> string().
 
 t_to_string(?any, _RecDict) ->
   "any()";
@@ -3238,11 +3891,11 @@ t_to_string(?bitstr(8, 0), _RecDict) ->
 t_to_string(?bitstr(1, 0), _RecDict) ->
   "bitstring()";
 t_to_string(?bitstr(0, B), _RecDict) ->
-  lists:flatten(io_lib:format("<<_:~w>>", [B]));
+  flat_format("<<_:~w>>", [B]);
 t_to_string(?bitstr(U, 0), _RecDict) ->
-  lists:flatten(io_lib:format("<<_:_*~w>>", [U]));
+  flat_format("<<_:_*~w>>", [U]);
 t_to_string(?bitstr(U, B), _RecDict) ->
-  lists:flatten(io_lib:format("<<_:~w,_:_*~w>>", [B, U]));
+  flat_format("<<_:~w,_:_*~w>>", [B, U]);
 t_to_string(?function(?any, ?any), _RecDict) ->
   "fun()";
 t_to_string(?function(?any, Range), RecDict) ->
@@ -3254,18 +3907,16 @@ t_to_string(?identifier(Set), _RecDict) ->
   case Set of
     ?any -> "identifier()";
     _ ->
-      string:join([io_lib:format("~w()", [T]) || T <- set_to_list(Set)], " | ")
+      string:join([flat_format("~w()", [T]) || T <- set_to_list(Set)], " | ")
   end;
-t_to_string(?opaque(Set), _RecDict) ->
-  string:join([case is_opaque_builtin(Mod, Name) of
-		 true  -> io_lib:format("~w()", [Name]);
-		 false -> io_lib:format("~w:~w()", [Mod, Name])
-	       end
-	       || #opaque{mod = Mod, name = Name} <- set_to_list(Set)],
+t_to_string(?opaque(Set), RecDict) ->
+  string:join([opaque_type(Mod, Name, Args, S, RecDict) ||
+                #opaque{mod = Mod, name = Name, struct = S, args = Args}
+                  <- set_to_list(Set)],
 	      " | ");
 t_to_string(?matchstate(Pres, Slots), RecDict) ->
-  io_lib:format("ms(~s,~s)", [t_to_string(Pres, RecDict),
-			      t_to_string(Slots,RecDict)]);
+  flat_format("ms(~s,~s)", [t_to_string(Pres, RecDict),
+                            t_to_string(Slots,RecDict)]);
 t_to_string(?nil, _RecDict) ->
   "[]";
 t_to_string(?nonempty_list(Contents, Termination), RecDict) ->
@@ -3281,7 +3932,9 @@ t_to_string(?nonempty_list(Contents, Termination), RecDict) ->
       case Contents =:= ?any of
 	true -> ok;
 	false ->
-	  erlang:error({illegal_list, ?nonempty_list(Contents, Termination)})
+          %% XXX. See comment below.
+          %% erlang:error({illegal_list, ?nonempty_list(Contents, Termination)})
+          ok
       end,
       "nonempty_maybe_improper_list()";
     _ ->
@@ -3304,11 +3957,14 @@ t_to_string(?list(Contents, Termination, ?unknown_qual), RecDict) ->
       end;
     ?any ->
       %% Just a safety check.      
+      %% XXX. Types such as "maybe_improper_list(integer(), any())"
+      %% are OK, but cannot be printed!?
       case Contents =:= ?any of
 	true -> ok;
 	false ->
-	  L = ?list(Contents, Termination, ?unknown_qual),
-	  erlang:error({illegal_list, L})
+          ok
+          %% L = ?list(Contents, Termination, ?unknown_qual),
+          %% erlang:error({illegal_list, L})
       end,
       "maybe_improper_list()";
     _ -> 
@@ -3329,7 +3985,7 @@ t_to_string(?integer_pos, _RecDict) -> "pos_integer()";
 t_to_string(?integer_non_neg, _RecDict) -> "non_neg_integer()";
 t_to_string(?integer_neg, _RecDict) -> "neg_integer()";
 t_to_string(?int_range(From, To), _RecDict) ->
-  lists:flatten(io_lib:format("~w..~w", [From, To]));
+  flat_format("~w..~w", [From, To]);
 t_to_string(?integer(?any), _RecDict) -> "integer()";
 t_to_string(?float, _RecDict) -> "float()";
 t_to_string(?number(?any, ?unknown_qual), _RecDict) -> "number()";
@@ -3337,19 +3993,21 @@ t_to_string(?product(List), RecDict) ->
   "<" ++ comma_sequence(List, RecDict) ++ ">";
 t_to_string(?remote(Set), RecDict) ->
   string:join([case Args =:= [] of
-		 true  -> io_lib:format("~w:~w()", [Mod, Name]);
+		 true  -> flat_format("~w:~w()", [Mod, Name]);
 		 false ->
 		   ArgString = comma_sequence(Args, RecDict),
-		   io_lib:format("~w:~w(~s)", [Mod, Name, ArgString])
+		   flat_format("~w:~w(~s)", [Mod, Name, ArgString])
 	       end
 	       || #remote{mod = Mod, name = Name, args = Args} <-
 		    set_to_list(Set)],
 	      " | ");
+t_to_string(?map(Pairs), RecDict) ->
+    "#{" ++ map_pairs_to_string(Pairs,RecDict) ++ "}";
 t_to_string(?tuple(?any, ?any, ?any), _RecDict) -> "tuple()";
 t_to_string(?tuple(Elements, _Arity, ?any), RecDict) ->   
   "{" ++ comma_sequence(Elements, RecDict) ++ "}";
 t_to_string(?tuple(Elements, Arity, Tag), RecDict) ->
-  [TagAtom] = t_atom_vals(Tag),
+  [TagAtom] = atom_vals(Tag),
   case lookup_record(TagAtom, Arity-1, RecDict) of
     error -> "{" ++ comma_sequence(Elements, RecDict) ++ "}";
     {ok, FieldNames} ->
@@ -3360,9 +4018,16 @@ t_to_string(?tuple_set(_) = T, RecDict) ->
 t_to_string(?union(Types), RecDict) ->
   union_sequence([T || T <- Types, T =/= ?none], RecDict);
 t_to_string(?var(Id), _RecDict) when is_atom(Id) ->
-  io_lib:format("~s", [atom_to_list(Id)]);
+  flat_format("~s", [atom_to_list(Id)]);
 t_to_string(?var(Id), _RecDict) when is_integer(Id) ->
-  io_lib:format("var(~w)", [Id]).
+  flat_format("var(~w)", [Id]).
+
+
+map_pairs_to_string([],_) -> [];
+map_pairs_to_string(Pairs,RecDict) ->
+    StrPairs = [{t_to_string(K,RecDict),t_to_string(V,RecDict)}||{K,V}<-Pairs],
+    string:join([K ++ "=>" ++ V||{K,V}<-StrPairs], ", ").
+
 
 record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
   FieldStrings = record_fields_to_string(Fields, FieldNames, RecDict, []),
@@ -3370,7 +4035,7 @@ record_to_string(Tag, [_|Fields], FieldNames, RecDict) ->
 
 record_fields_to_string([F|Fs], [{FName, _DefType}|FDefs], RecDict, Acc) ->
   NewAcc =
-    case t_is_any(F) orelse t_is_atom('undefined', F) of
+    case t_is_equal(F, t_any()) orelse t_is_any_atom('undefined', F) of
       true -> Acc;
       false ->
 	StrFV = atom_to_string(FName) ++ "::" ++ t_to_string(F, RecDict),
@@ -3385,16 +4050,17 @@ record_fields_to_string([F|Fs], [{FName, _DefType}|FDefs], RecDict, Acc) ->
 record_fields_to_string([], [], _RecDict, Acc) ->
   lists:reverse(Acc).
 
--spec record_field_diffs_to_string(erl_type(), dict()) -> string().
+-spec record_field_diffs_to_string(erl_type(), type_table()) -> string().
 
 record_field_diffs_to_string(?tuple([_|Fs], Arity, Tag), RecDict) ->
-  [TagAtom] = t_atom_vals(Tag),
+  [TagAtom] = atom_vals(Tag),
   {ok, FieldNames} = lookup_record(TagAtom, Arity-1, RecDict),
   %% io:format("RecCElems = ~p\nRecTypes = ~p\n", [Fs, FieldNames]),
   FieldDiffs = field_diffs(Fs, FieldNames, RecDict, []),
   string:join(FieldDiffs, " and ").
 
 field_diffs([F|Fs], [{FName, DefType}|FDefs], RecDict, Acc) ->
+  %% Don't care about opaqueness for now.
   NewAcc =
     case not t_is_none(t_inf(F, DefType)) of
       true -> Acc;
@@ -3417,6 +4083,32 @@ union_sequence(Types, RecDict) ->
   List = [t_to_string(T, RecDict) || T <- Types], 
   string:join(List, " | ").
 
+-ifdef(DEBUG).
+opaque_type(Mod, Name, _Args, S, RecDict) ->
+  ArgsString = comma_sequence(_Args, RecDict),
+  String = t_to_string(S, RecDict),
+  opaque_name(Mod, Name, ArgsString) ++ "[" ++ String ++ "]".
+-else.
+opaque_type(Mod, Name, Args, _S, RecDict) ->
+  ArgsString = comma_sequence(Args, RecDict),
+  opaque_name(Mod, Name, ArgsString).
+-endif.
+
+opaque_name(Mod, Name, Extra) ->
+  S = mod_name(Mod, Name),
+  flat_format("~s(~s)", [S, Extra]).
+
+mod_name(Mod, Name) ->
+  case is_obsolete_opaque_builtin(Mod, Name) of
+    true  -> flat_format("~w", [Name]);
+    false -> flat_format("~w:~w", [Mod, Name])
+  end.
+
+is_obsolete_opaque_builtin(digraph, digraph) -> true;
+is_obsolete_opaque_builtin(gb_sets, gb_set) -> true;
+is_obsolete_opaque_builtin(gb_trees, gb_tree) -> true;
+is_obsolete_opaque_builtin(_, _) -> false.
+
 %%=============================================================================
 %% 
 %% Build a type from parse forms.
@@ -3428,318 +4120,270 @@ union_sequence(Types, RecDict) ->
 t_from_form(Form) ->
   t_from_form(Form, dict:new()).
 
--spec t_from_form(parse_form(), dict()) -> erl_type().
+-spec t_from_form(parse_form(), type_table()) -> erl_type().
 
 t_from_form(Form, RecDict) ->
   t_from_form(Form, RecDict, dict:new()).
 
--spec t_from_form(parse_form(), dict(), dict()) -> erl_type().
+-spec t_from_form(parse_form(), type_table(), var_table()) -> erl_type().
 
 t_from_form(Form, RecDict, VarDict) ->
-  {T, _R} = t_from_form(Form, [], false, RecDict, VarDict),
+  {T, _R} = t_from_form(Form, [], RecDict, VarDict),
   T.
 
--type type_names() :: [{'type' | 'opaque' | 'record', atom()}].
--spec t_from_form(parse_form(), type_names(), boolean(), dict(), dict()) ->
+-type type_names() :: [type_key() | record_key()].
+
+-spec t_from_form(parse_form(), type_names(), type_table(), var_table()) ->
                      {erl_type(), type_names()}.
 
-t_from_form({var, _L, '_'}, _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+t_from_form({var, _L, '_'}, _TypeNames, _RecDict, _VarDict) ->
   {t_any(), []};
-t_from_form({var, _L, Name}, _TypeNames, _InOpaque, _RecDict, VarDict) ->
+t_from_form({var, _L, Name}, _TypeNames, _RecDict, VarDict) ->
   case dict:find(Name, VarDict) of
     error -> {t_var(Name), []};
     {ok, Val} -> {Val, []}
   end;
-t_from_form({ann_type, _L, [_Var, Type]}, TypeNames, InOpaque, RecDict,
-            VarDict) ->
-  t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict);
-t_from_form({paren_type, _L, [Type]}, TypeNames, InOpaque, RecDict,
-            VarDict) ->
-  t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict);
+t_from_form({ann_type, _L, [_Var, Type]}, TypeNames, RecDict, VarDict) ->
+  t_from_form(Type, TypeNames, RecDict, VarDict);
+t_from_form({paren_type, _L, [Type]}, TypeNames, RecDict, VarDict) ->
+  t_from_form(Type, TypeNames, RecDict, VarDict);
 t_from_form({remote_type, _L, [{atom, _, Module}, {atom, _, Type}, Args]},
-	    TypeNames, InOpaque, RecDict, VarDict) ->
-  {L, R} = list_from_form(Args, TypeNames, InOpaque, RecDict, VarDict),
+	    TypeNames, RecDict, VarDict) ->
+  {L, R} = list_from_form(Args, TypeNames, RecDict, VarDict),
   {t_remote(Module, Type, L), R};
-t_from_form({atom, _L, Atom}, _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+t_from_form({atom, _L, Atom}, _TypeNames, _RecDict, _VarDict) ->
   {t_atom(Atom), []};
-t_from_form({integer, _L, Int}, _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+t_from_form({integer, _L, Int}, _TypeNames, _RecDict, _VarDict) ->
   {t_integer(Int), []};
-t_from_form({op, _L, _Op, _Arg} = Op, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({op, _L, _Op, _Arg} = Op, _TypeNames, _RecDict, _VarDict) ->
   case erl_eval:partial_eval(Op) of
     {integer, _, Val} ->
       {t_integer(Val), []};
     _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Op])})
   end;
-t_from_form({op, _L, _Op, _Arg1, _Arg2} = Op, _TypeNames, _InOpaque,
+t_from_form({op, _L, _Op, _Arg1, _Arg2} = Op, _TypeNames,
             _RecDict, _VarDict) ->
   case erl_eval:partial_eval(Op) of
     {integer, _, Val} ->
       {t_integer(Val), []};
     _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Op])})
   end;
-t_from_form({type, _L, any, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, any, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_any(), []};
-t_from_form({type, _L, arity, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, arity, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_arity(), []};
-t_from_form({type, _L, array, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_array(), []};
-t_from_form({type, _L, atom, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, array, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(array, t_array(), TypeNames, RecDict, VarDict);
+t_from_form({type, _L, atom, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_atom(), []};
-t_from_form({type, _L, binary, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, binary, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_binary(), []};
 t_from_form({type, _L, binary, [Base, Unit]} = Type,
-	    _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+	    _TypeNames, _RecDict, _VarDict) ->
   case {erl_eval:partial_eval(Base), erl_eval:partial_eval(Unit)} of
     {{integer, _, B}, {integer, _, U}} when B >= 0, U >= 0 ->
       {t_bitstr(U, B), []};
     _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Type])})
   end;
-t_from_form({type, _L, bitstring, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, bitstring, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_bitstr(), []};
-t_from_form({type, _L, bool, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, bool, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_boolean(), []};	% XXX: Temporarily
-t_from_form({type, _L, boolean, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, boolean, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_boolean(), []};
-t_from_form({type, _L, byte, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, byte, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_byte(), []};
-t_from_form({type, _L, char, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, char, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_char(), []};
-t_from_form({type, _L, dict, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_dict(), []};
-t_from_form({type, _L, digraph, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_digraph(), []};
-t_from_form({type, _L, float, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, dict, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(dict, t_dict(), TypeNames, RecDict, VarDict);
+t_from_form({type, _L, digraph, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(digraph, t_digraph(), TypeNames, RecDict, VarDict);
+t_from_form({type, _L, float, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_float(), []};
-t_from_form({type, _L, function, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, function, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_fun(), []};
-t_from_form({type, _L, 'fun', []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, 'fun', []}, _TypeNames, _RecDict, _VarDict) ->
   {t_fun(), []};
 t_from_form({type, _L, 'fun', [{type, _, any}, Range]}, TypeNames,
-            InOpaque, RecDict, VarDict) ->
-  {T, R} = t_from_form(Range, TypeNames, InOpaque, RecDict, VarDict),
+            RecDict, VarDict) ->
+  {T, R} = t_from_form(Range, TypeNames, RecDict, VarDict),
   {t_fun(T), R};
 t_from_form({type, _L, 'fun', [{type, _, product, Domain}, Range]},
-            TypeNames, InOpaque, RecDict, VarDict) ->
-  {L, R1} = list_from_form(Domain, TypeNames, InOpaque, RecDict, VarDict),
-  {T, R2} = t_from_form(Range, TypeNames, InOpaque, RecDict, VarDict),
+            TypeNames, RecDict, VarDict) ->
+  {L, R1} = list_from_form(Domain, TypeNames, RecDict, VarDict),
+  {T, R2} = t_from_form(Range, TypeNames, RecDict, VarDict),
   {t_fun(L, T), R1 ++ R2};
-t_from_form({type, _L, gb_set, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_gb_set(), []};
-t_from_form({type, _L, gb_tree, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_gb_tree(), []};
-t_from_form({type, _L, identifier, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, gb_set, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(gb_set, t_gb_set(), TypeNames, RecDict, VarDict);
+t_from_form({type, _L, gb_tree, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(gb_tree, t_gb_tree(), TypeNames, RecDict, VarDict);
+t_from_form({type, _L, identifier, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_identifier(), []};
-t_from_form({type, _L, integer, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, integer, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_integer(), []};
-t_from_form({type, _L, iodata, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, iodata, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_iodata(), []};
-t_from_form({type, _L, iolist, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, iolist, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_iolist(), []};
-t_from_form({type, _L, list, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, list, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_list(), []};
-t_from_form({type, _L, list, [Type]}, TypeNames, InOpaque, RecDict,
-            VarDict) ->
-  {T, R} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
+t_from_form({type, _L, list, [Type]}, TypeNames, RecDict,  VarDict) ->
+  {T, R} = t_from_form(Type, TypeNames, RecDict, VarDict),
   {t_list(T), R};
-t_from_form({type, _L, mfa, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, map, _}, _TypeNames, _RecDict, _VarDict) ->
+  {t_map([]), []};
+t_from_form({type, _L, mfa, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_mfa(), []};
-t_from_form({type, _L, module, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, module, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_module(), []};
-t_from_form({type, _L, nil, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, nil, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_nil(), []};
-t_from_form({type, _L, neg_integer, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, neg_integer, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_neg_integer(), []};
-t_from_form({type, _L, non_neg_integer, []}, _TypeNames, _InOpaque, _RecDict,
+t_from_form({type, _L, non_neg_integer, []}, _TypeNames, _RecDict,
             _VarDict) ->
   {t_non_neg_integer(), []};
-t_from_form({type, _L, no_return, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, no_return, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_unit(), []};
-t_from_form({type, _L, node, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, node, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_node(), []};
-t_from_form({type, _L, none, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, none, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_none(), []};
-t_from_form({type, _L, nonempty_list, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, nonempty_list, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_nonempty_list(), []};
-t_from_form({type, _L, nonempty_list, [Type]}, TypeNames, InOpaque, RecDict,
-            VarDict) ->
-  {T, R} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
+t_from_form({type, _L, nonempty_list, [Type]}, TypeNames, RecDict, VarDict) ->
+  {T, R} = t_from_form(Type, TypeNames, RecDict, VarDict),
   {t_nonempty_list(T), R};
 t_from_form({type, _L, nonempty_improper_list, [Cont, Term]}, TypeNames,
-            InOpaque, RecDict, VarDict) ->
-  {T1, R1} = t_from_form(Cont, TypeNames, InOpaque, RecDict, VarDict),
-  {T2, R2} = t_from_form(Term, TypeNames, InOpaque, RecDict, VarDict),
+            RecDict, VarDict) ->
+  {T1, R1} = t_from_form(Cont, TypeNames, RecDict, VarDict),
+  {T2, R2} = t_from_form(Term, TypeNames, RecDict, VarDict),
   {t_cons(T1, T2), R1 ++ R2};
 t_from_form({type, _L, nonempty_maybe_improper_list, []}, _TypeNames,
-            _InOpaque, _RecDict, _VarDict) ->
+            _RecDict, _VarDict) ->
   {t_cons(?any, ?any), []};
 t_from_form({type, _L, nonempty_maybe_improper_list, [Cont, Term]},
-            TypeNames, InOpaque, RecDict, VarDict) ->
-  {T1, R1} = t_from_form(Cont, TypeNames, InOpaque, RecDict, VarDict),
-  {T2, R2} = t_from_form(Term, TypeNames, InOpaque, RecDict, VarDict),
+            TypeNames, RecDict, VarDict) ->
+  {T1, R1} = t_from_form(Cont, TypeNames, RecDict, VarDict),
+  {T2, R2} = t_from_form(Term, TypeNames, RecDict, VarDict),
   {t_cons(T1, T2), R1 ++ R2};
-t_from_form({type, _L, nonempty_string, []}, _TypeNames, _InOpaque, _RecDict,
+t_from_form({type, _L, nonempty_string, []}, _TypeNames, _RecDict,
             _VarDict) ->
   {t_nonempty_string(), []};
-t_from_form({type, _L, number, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, number, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_number(), []};
-t_from_form({type, _L, pid, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, pid, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_pid(), []};
-t_from_form({type, _L, port, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, port, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_port(), []};
-t_from_form({type, _L, pos_integer, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, pos_integer, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_pos_integer(), []};
-t_from_form({type, _L, maybe_improper_list, []}, _TypeNames, _InOpaque,
+t_from_form({type, _L, maybe_improper_list, []}, _TypeNames,
             _RecDict, _VarDict) ->
   {t_maybe_improper_list(), []};
 t_from_form({type, _L, maybe_improper_list, [Content, Termination]},
-            TypeNames, InOpaque, RecDict, VarDict) ->
-  {T1, R1} = t_from_form(Content, TypeNames, InOpaque, RecDict, VarDict),
-  {T2, R2} = t_from_form(Termination, TypeNames, InOpaque, RecDict, VarDict),
+            TypeNames, RecDict, VarDict) ->
+  {T1, R1} = t_from_form(Content, TypeNames, RecDict, VarDict),
+  {T2, R2} = t_from_form(Termination, TypeNames, RecDict, VarDict),
   {t_maybe_improper_list(T1, T2), R1 ++ R2};
-t_from_form({type, _L, product, Elements}, TypeNames, InOpaque, RecDict,
-            VarDict) ->
-  {L, R} = list_from_form(Elements, TypeNames, InOpaque, RecDict, VarDict),
+t_from_form({type, _L, product, Elements}, TypeNames, RecDict, VarDict) ->
+  {L, R} = list_from_form(Elements, TypeNames, RecDict, VarDict),
   {t_product(L), R};
-t_from_form({type, _L, queue, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_queue(), []};
+t_from_form({type, _L, queue, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(queue, t_queue(), TypeNames, RecDict, VarDict);
 t_from_form({type, _L, range, [From, To]} = Type,
-	    _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+	    _TypeNames, _RecDict, _VarDict) ->
   case {erl_eval:partial_eval(From), erl_eval:partial_eval(To)} of
     {{integer, _, FromVal}, {integer, _, ToVal}} ->
       {t_from_range(FromVal, ToVal), []};
     _ -> throw({error, io_lib:format("Unable to evaluate type ~w\n", [Type])})
   end;
-t_from_form({type, _L, record, [Name|Fields]}, TypeNames, InOpaque, RecDict,
-            VarDict) ->
-  record_from_form(Name, Fields, TypeNames, InOpaque, RecDict, VarDict);
-t_from_form({type, _L, reference, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, record, [Name|Fields]}, TypeNames, RecDict, VarDict) ->
+  record_from_form(Name, Fields, TypeNames, RecDict, VarDict);
+t_from_form({type, _L, reference, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_reference(), []};
-t_from_form({type, _L, set, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_set(), []};
-t_from_form({type, _L, string, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, set, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(set, t_set(), TypeNames, RecDict, VarDict);
+t_from_form({type, _L, string, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_string(), []};
-t_from_form({type, _L, term, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, term, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_any(), []};
-t_from_form({type, _L, tid, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
-  {t_tid(), []};
-t_from_form({type, _L, timeout, []}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, tid, []}, TypeNames, RecDict, VarDict) ->
+  builtin_type(tid, t_tid(), TypeNames, RecDict, VarDict);
+t_from_form({type, _L, timeout, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_timeout(), []};
-t_from_form({type, _L, tuple, any}, _TypeNames, _InOpaque, _RecDict,
-            _VarDict) ->
+t_from_form({type, _L, tuple, any}, _TypeNames, _RecDict, _VarDict) ->
   {t_tuple(), []};
-t_from_form({type, _L, tuple, Args}, TypeNames, InOpaque, RecDict, VarDict) ->
-  {L, R} = list_from_form(Args, TypeNames, InOpaque, RecDict, VarDict),
+t_from_form({type, _L, tuple, Args}, TypeNames, RecDict, VarDict) ->
+  {L, R} = list_from_form(Args, TypeNames, RecDict, VarDict),
   {t_tuple(L), R};
-t_from_form({type, _L, union, Args}, TypeNames, InOpaque, RecDict, VarDict) ->
-  {L, R} = list_from_form(Args, TypeNames, InOpaque, RecDict, VarDict),
+t_from_form({type, _L, union, Args}, TypeNames, RecDict, VarDict) ->
+  {L, R} = list_from_form(Args, TypeNames, RecDict, VarDict),
   {t_sup(L), R};
-t_from_form({type, _L, Name, Args}, TypeNames, InOpaque, RecDict, VarDict) ->
+t_from_form({type, _L, Name, Args}, TypeNames, RecDict, VarDict) ->
+  type_from_form(Name, Args, TypeNames, RecDict, VarDict);
+t_from_form({opaque, _L, Name, {Mod, Args, Rep}}, _TypeNames,
+            _RecDict, _VarDict) ->
+  {t_opaque(Mod, Name, Args, Rep), []}.
+
+builtin_type(Name, Type, TypeNames, RecDict, VarDict) ->
+  case lookup_type(Name, 0, RecDict) of
+    {_, {_M, _T, _A}} ->
+      type_from_form(Name, [], TypeNames, RecDict, VarDict);
+    error ->
+      {Type, []}
+  end.
+
+type_from_form(Name, Args, TypeNames, RecDict, VarDict) ->
   ArgsLen = length(Args),
+  ArgTypes = forms_to_types(Args, TypeNames, RecDict, VarDict),
   case lookup_type(Name, ArgsLen, RecDict) of
     {type, {_Module, Type, ArgNames}} ->
-      case can_unfold_more({type, Name}, TypeNames) of
+      TypeName = {type, Name, ArgsLen},
+      case can_unfold_more(TypeName, TypeNames) of
         true ->
-          List = lists:zipwith(
-                   fun(ArgName, ArgType) ->
-                       {Ttemp, _R} = t_from_form(ArgType, TypeNames,
-                                                 InOpaque, RecDict,
-                                                 VarDict),
-                       {ArgName, Ttemp}
-                   end,
-                   ArgNames, Args),
+          List = lists:zip(ArgNames, ArgTypes),
           TmpVarDict = dict:from_list(List),
-          {T, R} = t_from_form(Type, [{type, Name}|TypeNames], InOpaque,
+          {T, R} = t_from_form(Type, [TypeName|TypeNames],
                                RecDict, TmpVarDict),
-          case lists:member({type, Name}, R) of
+          case lists:member(TypeName, R) of
             true -> {t_limit(T, ?REC_TYPE_LIMIT), R};
             false -> {T, R}
           end;
-        false -> {t_any(), [{type, Name}]}
+        false -> {t_any(), [TypeName]}
       end;
     {opaque, {Module, Type, ArgNames}} ->
+      TypeName = {opaque, Name, ArgsLen},
       {Rep, Rret} =
-        case can_unfold_more({opaque, Name}, TypeNames) of
+        case can_unfold_more(TypeName, TypeNames) of
           true ->
-            List = lists:zipwith(
-                     fun(ArgName, ArgType) ->
-                         {Ttemp, _R} = t_from_form(ArgType, TypeNames,
-                                                   InOpaque, RecDict,
-                                                   VarDict),
-                         {ArgName, Ttemp}
-                     end,
-                     ArgNames, Args),
+            List = lists:zip(ArgNames, ArgTypes),
             TmpVarDict = dict:from_list(List),
-            {T, R} = t_from_form(Type, [{opaque, Name}|TypeNames], true,
+            {T, R} = t_from_form(Type, [TypeName|TypeNames],
                                  RecDict, TmpVarDict),
-            case lists:member({opaque, Name}, R) of
+            case lists:member(TypeName, R) of
               true -> {t_limit(T, ?REC_TYPE_LIMIT), R};
               false -> {T, R}
             end;
-          false -> {t_any(), [{opaque, Name}]}
+          false -> {t_any(), [TypeName]}
         end,
-      Tret =
-        case InOpaque of
-          true -> Rep;
-          false ->
-            t_from_form({opaque, -1, Name, {Module, Args, Rep}},
-                        RecDict, VarDict)
-          end,
-      {Tret, Rret};
+      Args2 = [subst_all_vars_to_any(ArgType) || ArgType <- ArgTypes],
+      {skip_opaque_alias(Rep, Module, Name, Args2), Rret};
     error ->
       Msg = io_lib:format("Unable to find type ~w/~w\n", [Name, ArgsLen]),
       throw({error, Msg})
-  end;
-t_from_form({opaque, _L, Name, {Mod, Args, Rep}}, _TypeNames, _InOpaque,
-            _RecDict, _VarDict) ->
-  case Args of
-    [] -> {t_opaque(Mod, Name, Args, Rep), []};
-    _ -> throw({error, "Polymorphic opaque types not supported yet"})
   end.
 
-record_from_form({atom, _, Name}, ModFields, TypeNames, InOpaque, RecDict,
-                 VarDict) ->
+forms_to_types(Forms, TypeNames, RecDict, VarDict) ->
+  {Types, _} = list_from_form(Forms, TypeNames, RecDict, VarDict),
+  Types.
+
+skip_opaque_alias(?opaque(_) = T, _Mod, _Name, _Args) -> T;
+skip_opaque_alias(T, Module, Name, Args) ->
+  t_opaque(Module, Name, Args, T).
+
+record_from_form({atom, _, Name}, ModFields, TypeNames, RecDict, VarDict) ->
   case can_unfold_more({record, Name}, TypeNames) of
     true ->
       case lookup_record(Name, RecDict) of
@@ -3750,11 +4394,11 @@ record_from_form({atom, _, Name}, ModFields, TypeNames, InOpaque, RecDict,
           {DeclFields1, R1} =
             case lists:all(fun(Elem) -> Elem end, AreTyped) of
               true -> {DeclFields, []};
-              false -> fields_from_form(DeclFields, TypeNames1, InOpaque,
+              false -> fields_from_form(DeclFields, TypeNames1,
                                         RecDict, dict:new())
             end,
           {GetModRec, R2} = get_mod_record(ModFields, DeclFields1,
-                                           TypeNames1, InOpaque,
+                                           TypeNames1,
                                            RecDict, VarDict),
           case GetModRec of
             {error, FieldName} ->
@@ -3771,13 +4415,11 @@ record_from_form({atom, _, Name}, ModFields, TypeNames, InOpaque, RecDict,
     false -> {t_any(), []}
   end.
 
-get_mod_record([], DeclFields, _TypeNames, _InOpaque, _RecDict,
-               _VarDict) ->
+get_mod_record([], DeclFields, _TypeNames, _RecDict, _VarDict) ->
   {{ok, DeclFields}, []};
-get_mod_record(ModFields, DeclFields, TypeNames, InOpaque, RecDict,
-               VarDict) ->
+get_mod_record(ModFields, DeclFields, TypeNames, RecDict, VarDict) ->
   DeclFieldsDict = orddict:from_list(DeclFields),
-  {ModFieldsDict, R} = build_field_dict(ModFields, TypeNames, InOpaque,
+  {ModFieldsDict, R} = build_field_dict(ModFields, TypeNames,
                                         RecDict, VarDict),
   case get_mod_record(DeclFieldsDict, ModFieldsDict, []) of
     {error, _FieldName} = Error -> {Error, R};
@@ -3787,23 +4429,24 @@ get_mod_record(ModFields, DeclFields, TypeNames, InOpaque, RecDict,
        R}
   end.
 
-build_field_dict(FieldTypes, TypeNames, InOpaque, RecDict, VarDict) ->
-  build_field_dict(FieldTypes, TypeNames, InOpaque, RecDict, VarDict, []).
+build_field_dict(FieldTypes, TypeNames, RecDict, VarDict) ->
+  build_field_dict(FieldTypes, TypeNames, RecDict, VarDict, []).
 
 build_field_dict([{type, _, field_type, [{atom, _, Name}, Type]}|Left], 
-		 TypeNames, InOpaque, RecDict, VarDict, Acc) ->
-  {T, R1} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
+		 TypeNames, RecDict, VarDict, Acc) ->
+  {T, R1} = t_from_form(Type, TypeNames, RecDict, VarDict),
   NewAcc = [{Name, T}|Acc],
-  {D, R2} = build_field_dict(Left, TypeNames, InOpaque, RecDict, VarDict,
-                             NewAcc),
+  {D, R2} = build_field_dict(Left, TypeNames, RecDict, VarDict, NewAcc),
   {D, R1 ++ R2};
-build_field_dict([], _TypeNames, _InOpaque, _RecDict, _VarDict, Acc) ->
+build_field_dict([], _TypeNames, _RecDict, _VarDict, Acc) ->
   {orddict:from_list(Acc), []}.
 
 get_mod_record([{FieldName, DeclType}|Left1], 
 	       [{FieldName, ModType}|Left2], Acc) ->
-  case t_is_var(ModType) orelse t_is_remote(ModType) orelse
-    t_is_subtype(ModType, DeclType) of
+  ModTypeNoVars = subst_all_vars_to_any(ModType),
+  case
+    t_is_remote(ModTypeNoVars) orelse t_is_subtype(ModTypeNoVars, DeclType)
+  of
     false -> {error, FieldName};
     true -> get_mod_record(Left1, Left2, [{FieldName, ModType}|Acc])
   end;
@@ -3816,19 +4459,19 @@ get_mod_record(DeclFields, [], Acc) ->
 get_mod_record(_, [{FieldName2, _ModType}|_], _Acc) ->
   {error, FieldName2}.
 
-fields_from_form([], _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+fields_from_form([], _TypeNames, _RecDict, _VarDict) ->
   {[], []};
-fields_from_form([{Name, Type}|Tail], TypeNames, InOpaque, RecDict,
+fields_from_form([{Name, Type}|Tail], TypeNames, RecDict,
                  VarDict) ->
-  {T, R1} = t_from_form(Type, TypeNames, InOpaque, RecDict, VarDict),
-  {F, R2} = fields_from_form(Tail, TypeNames, InOpaque, RecDict, VarDict),
+  {T, R1} = t_from_form(Type, TypeNames, RecDict, VarDict),
+  {F, R2} = fields_from_form(Tail, TypeNames, RecDict, VarDict),
   {[{Name, T}|F], R1 ++ R2}.
 
-list_from_form([], _TypeNames, _InOpaque, _RecDict, _VarDict) ->
+list_from_form([], _TypeNames, _RecDict, _VarDict) ->
   {[], []};
-list_from_form([H|Tail], TypeNames, InOpaque, RecDict, VarDict) ->
-  {T, R1} = t_from_form(H, TypeNames, InOpaque, RecDict, VarDict),
-  {L, R2} = list_from_form(Tail, TypeNames, InOpaque, RecDict, VarDict),
+list_from_form([H|Tail], TypeNames, RecDict, VarDict) ->
+  {T, R1} = t_from_form(H, TypeNames, RecDict, VarDict),
+  {L, R2} = list_from_form(Tail, TypeNames, RecDict, VarDict),
   {[T|L], R1 ++ R2}.
 
 -spec t_form_to_string(parse_form()) -> string().
@@ -3851,10 +4494,10 @@ t_form_to_string({op, _L, _Op, _Arg1, _Arg2} = Op) ->
 t_form_to_string({ann_type, _L, [Var, Type]}) ->
   t_form_to_string(Var) ++ "::" ++ t_form_to_string(Type);
 t_form_to_string({paren_type, _L, [Type]}) ->
-  io_lib:format("(~s)", [t_form_to_string(Type)]);
+  flat_format("(~s)", [t_form_to_string(Type)]);
 t_form_to_string({remote_type, _L, [{atom, _, Mod}, {atom, _, Name}, Args]}) ->
   ArgString = "(" ++ string:join(t_form_to_string_list(Args), ",") ++ ")",
-  io_lib:format("~w:~w", [Mod, Name]) ++ ArgString;
+  flat_format("~w:~w", [Mod, Name]) ++ ArgString;
 t_form_to_string({type, _L, arity, []}) -> "arity()";
 t_form_to_string({type, _L, binary, []}) -> "binary()";
 t_form_to_string({type, _L, binary, [Base, Unit]} = Type) ->
@@ -3865,9 +4508,9 @@ t_form_to_string({type, _L, binary, [Base, Unit]} = Type) ->
 	{0, 0} -> "<<>>";
 	{8, 0} -> "binary()";
 	{1, 0} -> "bitstring()";
-	{0, B} -> lists:flatten(io_lib:format("<<_:~w>>", [B]));
-	{U, 0} -> lists:flatten(io_lib:format("<<_:_*~w>>", [U]));
-	{U, B} -> lists:flatten(io_lib:format("<<_:~w,_:_*~w>>", [B, U]))
+	{0, B} -> flat_format("<<_:~w>>", [B]);
+	{U, 0} -> flat_format("<<_:_*~w>>", [U]);
+	{U, B} -> flat_format("<<_:~w,_:_*~w>>", [B, U])
       end;
     _ -> io_lib:format("Badly formed bitstr type ~w", [Type])
   end;
@@ -3882,6 +4525,8 @@ t_form_to_string({type, _L, iodata, []}) -> "iodata()";
 t_form_to_string({type, _L, iolist, []}) -> "iolist()";
 t_form_to_string({type, _L, list, [Type]}) -> 
   "[" ++ t_form_to_string(Type) ++ "]";
+t_form_to_string({type, _L, map, _}) ->
+  "#{}";
 t_form_to_string({type, _L, mfa, []}) -> "mfa()";
 t_form_to_string({type, _L, module, []}) -> "module()";
 t_form_to_string({type, _L, node, []}) -> "node()";
@@ -3893,16 +4538,16 @@ t_form_to_string({type, _L, product, Elements}) ->
 t_form_to_string({type, _L, range, [From, To]} = Type) ->
   case {erl_eval:partial_eval(From), erl_eval:partial_eval(To)} of
     {{integer, _, FromVal}, {integer, _, ToVal}} ->
-      io_lib:format("~w..~w", [FromVal, ToVal]);
-    _ -> io_lib:format("Badly formed type ~w",[Type])
+      flat_format("~w..~w", [FromVal, ToVal]);
+    _ -> flat_format("Badly formed type ~w",[Type])
   end;
 t_form_to_string({type, _L, record, [{atom, _, Name}]}) ->
-  io_lib:format("#~w{}", [Name]);
+  flat_format("#~w{}", [Name]);
 t_form_to_string({type, _L, record, [{atom, _, Name}|Fields]}) ->
   FieldString = string:join(t_form_to_string_list(Fields), ","),
-  io_lib:format("#~w{~s}", [Name, FieldString]);
+  flat_format("#~w{~s}", [Name, FieldString]);
 t_form_to_string({type, _L, field_type, [{atom, _, Name}, Type]}) ->
-  io_lib:format("~w::~s", [Name, t_form_to_string(Type)]);
+  flat_format("~w::~s", [Name, t_form_to_string(Type)]);
 t_form_to_string({type, _L, term, []}) -> "term()";
 t_form_to_string({type, _L, timeout, []}) -> "timeout()";
 t_form_to_string({type, _L, tuple, any}) -> "tuple()";
@@ -3915,8 +4560,8 @@ t_form_to_string({type, _L, Name, []} = T) ->
   catch throw:{error, _} -> atom_to_string(Name) ++ "()"
   end;
 t_form_to_string({type, _L, Name, List}) -> 
-  io_lib:format("~w(~s)",
-		[Name, string:join(t_form_to_string_list(List), ",")]).
+  flat_format("~w(~s)",
+              [Name, string:join(t_form_to_string_list(List), ",")]).
 
 t_form_to_string_list(List) ->
   t_form_to_string_list(List, []).
@@ -3929,7 +4574,7 @@ t_form_to_string_list([], Acc) ->
 -spec atom_to_string(atom()) -> string().
 
 atom_to_string(Atom) ->
-  lists:flatten(io_lib:format("~w", [Atom])).
+  flat_format("~w", [Atom]).
 
 %%=============================================================================
 %% 
@@ -3958,7 +4603,7 @@ is_erl_type(?unit) -> true;
 is_erl_type(#c{}) -> true;
 is_erl_type(_) -> false.
 
--spec lookup_record(atom(), dict()) ->
+-spec lookup_record(atom(), type_table()) ->
         'error' | {'ok', [{atom(), parse_form() | erl_type()}]}.
 
 lookup_record(Tag, RecDict) when is_atom(Tag) ->
@@ -3973,7 +4618,8 @@ lookup_record(Tag, RecDict) when is_atom(Tag) ->
       error
   end.
 
--spec lookup_record(atom(), arity(), dict()) -> 'error' | {'ok', [{atom(), erl_type()}]}.
+-spec lookup_record(atom(), arity(), type_table()) ->
+        'error' | {'ok', [{atom(), erl_type()}]}.
 
 lookup_record(Tag, Arity, RecDict) when is_atom(Tag) ->
   case dict:find({record, Tag}, RecDict) of
@@ -3992,7 +4638,8 @@ lookup_type(Name, Arity, RecDict) ->
     {ok, Found} -> {type, Found}
   end.
 
--spec type_is_defined('type' | 'opaque', atom(), arity(), dict()) -> boolean().
+-spec type_is_defined('type' | 'opaque', atom(), arity(), type_table()) ->
+        boolean().
 
 type_is_defined(TypeOrOpaque, Name, Arity, RecDict) ->
   dict:is_key({TypeOrOpaque, Name, Arity}, RecDict).
@@ -4001,6 +4648,53 @@ can_unfold_more(TypeName, TypeNames) ->
   Fun = fun(E, Acc) -> case E of TypeName -> Acc + 1; _ -> Acc end end,
   lists:foldl(Fun, 0, TypeNames) < ?REC_TYPE_LIMIT.
 
+-spec do_opaque(erl_type(), opaques(), fun((_) -> T)) -> T.
+
+%% Probably a little faster than calling t_unopaque/2.
+%% Unions that are due to opaque types are unopaqued.
+do_opaque(?opaque(_) = Type, Opaques, Pred) ->
+  case Opaques =:= 'universe' orelse is_opaque_type(Type, Opaques) of
+    true -> do_opaque(t_opaque_structure(Type), Opaques, Pred);
+    false -> Pred(Type)
+  end;
+do_opaque(?union(List) = Type, Opaques, Pred) ->
+  [A,B,F,I,L,N,T,M,O,R,Map] = List,
+  if O =:= ?none -> Pred(Type);
+    true ->
+      case Opaques =:= 'universe' orelse is_opaque_type(O, Opaques) of
+        true ->
+          S = t_opaque_structure(O),
+          do_opaque(t_sup([A,B,F,I,L,N,T,M,S,R,Map]), Opaques, Pred);
+        false -> Pred(Type)
+      end
+  end;
+do_opaque(Type, _Opaques, Pred) ->
+  Pred(Type).
+
+is_same_type_name(ModNameArgs, ModNameArgs) -> true;
+is_same_type_name({Mod, Name, Args1}, {Mod, Name, Args2}) ->
+  all_any(Args1) orelse all_any(Args2);
+is_same_type_name({Mod1, Name1, Args1}, {Mod2, Name2, Args2}) ->
+  is_same_type_name2(Mod1, Name1, Args1, Mod2, Name2, Args2).
+
+all_any([]) -> true;
+all_any([T|L]) ->
+  t_is_any(T) andalso all_any(L);
+all_any(_) -> false.
+
+%% Compatibility. In Erlang/OTP 17 the pre-defined opaque types
+%% digraph() and so on can be used, but there are also new types such
+%% as digraph:graph() with the exact same meaning. In Erlang/OTP R18.0
+%% all but the last clause can be removed.
+
+is_same_type_name2(digraph,  digraph, [], digraph,  graph, [])   -> true;
+is_same_type_name2(digraph,  graph, [],   digraph,  digraph, []) -> true;
+is_same_type_name2(gb_sets,  gb_set, [],  gb_sets,  set, [_]) -> true;
+is_same_type_name2(gb_sets,  set, [_], gb_sets,  gb_set, [])  -> true;
+is_same_type_name2(gb_trees, gb_tree, [], gb_trees, tree, [_, _]) -> true;
+is_same_type_name2(gb_trees, tree, [_, _], gb_trees, gb_tree, []) -> true;
+is_same_type_name2(_, _, _, _, _, _) -> false.
+
 %% -----------------------------------
 %% Set
 %%
@@ -4067,7 +4761,7 @@ set_size(Set) ->
 set_to_string(Set) ->
   L = [case is_atom(X) of
 	 true -> io_lib:write_string(atom_to_list(X), $'); % stupid emacs '
-	 false -> io_lib:format("~w", [X])
+	 false -> flat_format("~w", [X])
        end || X <- set_to_list(Set)],
   string:join(L, " | ").
 
@@ -4076,6 +4770,9 @@ set_min([H|_]) -> H.
 set_max(Set) ->
   hd(lists:reverse(Set)).
 
+flat_format(F, S) ->
+  lists:flatten(io_lib:format(F, S)).
+
 %%=============================================================================
 %% 
 %% Utilities for the binary type
@@ -4130,6 +4827,11 @@ handle_base(Unit, Pos) when Pos >= 0 ->
 handle_base(Unit, Neg) ->
   (Unit+(Neg rem Unit)) rem Unit.
   
+family(L) ->
+  R = sofs:relation(L),
+  F = sofs:relation_to_family(R),
+  sofs:to_external(F).
+
 %%=============================================================================
 %% Consistency-testing function(s) below
 %%=============================================================================
diff --git a/lib/hipe/doc/src/book.xml b/lib/hipe/doc/src/book.xml
index 9c95e3a827..438be134a2 100644
--- a/lib/hipe/doc/src/book.xml
+++ b/lib/hipe/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2006</year><year>2010</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/hipe/doc/src/fascicules.xml b/lib/hipe/doc/src/fascicules.xml
index 28acc14624..b15610fa8b 100644
--- a/lib/hipe/doc/src/fascicules.xml
+++ b/lib/hipe/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/hipe/doc/src/hipe_app.xml b/lib/hipe/doc/src/hipe_app.xml
index 0612392c3f..2ddce664cc 100644
--- a/lib/hipe/doc/src/hipe_app.xml
+++ b/lib/hipe/doc/src/hipe_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
diff --git a/lib/hipe/doc/src/notes.xml b/lib/hipe/doc/src/notes.xml
index b3c41bd396..e0b1622d19 100644
--- a/lib/hipe/doc/src/notes.xml
+++ b/lib/hipe/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,40 @@
   </header>
   <p>This document describes the changes made to HiPE.</p>
 
+<section><title>Hipe 3.10.2.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a dialyzer crash when using remote types in the
+	    tail position of a maybe_improper_list/2 type. Thanks to
+	    Kostis Sagonas</p>
+          <p>
+	    Own Id: OTP-11374</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Hipe 3.10.2.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Hipe 3.10.2</title>
 
     <section><title>Improvements and New Features</title>
@@ -37,7 +71,7 @@
         <item>
           <p>
 	    Fix the title of hipe_app documentation page. Thanks to
-	    Lo�c Hoguin.</p>
+	    Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-10904</p>
         </item>
@@ -76,7 +110,7 @@
           <p>
 	    Fix bug in hipe compiled code related to the handling of
 	    <c>is_number/1</c>. (Thanks to Sebastian Egner and
-	    Johannes Wei�l for minimal test code and Kostis for quick
+	    Johannes Weißl for minimal test code and Kostis for quick
 	    patch)</p>
           <p>
 	    Own Id: OTP-10897</p>
diff --git a/lib/hipe/doc/src/part_notes.xml b/lib/hipe/doc/src/part_notes.xml
index 8a3e82027b..f912fcfcdb 100644
--- a/lib/hipe/doc/src/part_notes.xml
+++ b/lib/hipe/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/hipe/doc/src/ref_man.xml b/lib/hipe/doc/src/ref_man.xml
index bdafb61d08..0e1288b4c4 100644
--- a/lib/hipe/doc/src/ref_man.xml
+++ b/lib/hipe/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/hipe/flow/cfg.hrl b/lib/hipe/flow/cfg.hrl
index 95bf5f7194..1f7a162f27 100644
--- a/lib/hipe/flow/cfg.hrl
+++ b/lib/hipe/flow/cfg.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %% 
 %% The 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,12 +42,12 @@
 %%
 %% Data is a triple with a dict of constants, a list of labels and an integer
 %%
--type cfg_data() :: {dict(), [cfg_lbl()], non_neg_integer()}.
+-type cfg_data() :: {dict:dict(), [cfg_lbl()], non_neg_integer()}.
 
 %%
 %% The following is to be used by other modules
 %%
--record(cfg, {table = gb_trees:empty() :: gb_tree(),
+-record(cfg, {table = gb_trees:empty() :: gb_trees:tree(),
               info                     :: #cfg_info{},
               data                     :: cfg_data()}).
 -type cfg() :: #cfg{}.
diff --git a/lib/hipe/flow/cfg.inc b/lib/hipe/flow/cfg.inc
index 62f399a81c..f0b1a75737 100644
--- a/lib/hipe/flow/cfg.inc
+++ b/lib/hipe/flow/cfg.inc
@@ -4,7 +4,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -534,7 +534,7 @@ breadth_list([], Vis, _CFG, BO) ->
   {Vis, BO}.
 -endif.
 
--spec none_visited() -> gb_set().
+-spec none_visited() -> gb_sets:set().
 none_visited() -> 
   gb_sets:empty().
 
diff --git a/lib/hipe/flow/hipe_dominators.erl b/lib/hipe/flow/hipe_dominators.erl
index 1f2c830eaf..50d45c7c72 100644
--- a/lib/hipe/flow/hipe_dominators.erl
+++ b/lib/hipe/flow/hipe_dominators.erl
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The 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,7 +57,7 @@
 
 -record(domTree, {root                     :: cfg_lbl(),
 		  size  = 0		   :: non_neg_integer(),
-		  nodes = gb_trees:empty() :: gb_tree()}).
+		  nodes = gb_trees:empty() :: gb_trees:tree()}).
 -type domTree() :: #domTree{}.
 
 %%>----------------------------------------------------------------------<
@@ -590,7 +590,7 @@ domTree_pp_children([], _) ->
 %%
 %%========================================================================
 
--type domFrontier() :: gb_tree().
+-type domFrontier() :: gb_trees:tree().
 
 %%>----------------------------------------------------------------------<
 %% Procedure : domFrontier_create
diff --git a/lib/hipe/flow/liveness.inc b/lib/hipe/flow/liveness.inc
index 9c5eaf3e68..6f161fb269 100644
--- a/lib/hipe/flow/liveness.inc
+++ b/lib/hipe/flow/liveness.inc
@@ -3,7 +3,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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,7 +71,7 @@
 %% The generic liveness analysis
 %%
 
--spec analyze(cfg()) -> gb_tree().
+-spec analyze(cfg()) -> gb_trees:tree().
 
 -ifdef(HIPE_LIVENESS_CALC_LARGEST_LIVESET).
 analyze(CFG) ->
@@ -209,7 +209,7 @@ successors(L, Liveness) ->
   {_GK, _LiveIn, Successors} = liveness_lookup(L, Liveness),
   Successors.
 
--spec livein(gb_tree(), _) -> [_].
+-spec livein(gb_trees:tree(), _) -> [_].
 
 livein(Liveness, L) ->
   {_GK, LiveIn, _Successors} = liveness_lookup(L, Liveness),
diff --git a/lib/hipe/icode/hipe_icode.erl b/lib/hipe/icode/hipe_icode.erl
index 6d4758bbf1..0e651a351c 100644
--- a/lib/hipe/icode/hipe_icode.erl
+++ b/lib/hipe/icode/hipe_icode.erl
@@ -1464,6 +1464,7 @@ successors(I) ->
       case fail_label(I) of [] -> []; L when is_integer(L) -> [L] end;
     #icode_enter{} -> [];
     #icode_return{} -> [];
+    #icode_comment{} -> [];
     %% the following are included here for handling linear code
     #icode_move{} -> [];
     #icode_begin_handler{} -> []
diff --git a/lib/hipe/icode/hipe_icode_callgraph.erl b/lib/hipe/icode/hipe_icode_callgraph.erl
index 5789328f47..ccf97ecc17 100644
--- a/lib/hipe/icode/hipe_icode_callgraph.erl
+++ b/lib/hipe/icode/hipe_icode_callgraph.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %% 
 %% The 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 @@
 
 -type mfa_icode() :: {mfa(), #icode{}}.
 
--record(icode_callgraph, {codedict :: dict(), ordered_sccs :: [[mfa()]]}).
+-record(icode_callgraph, {codedict :: dict:dict(), ordered_sccs :: [[mfa()]]}).
 
 %%------------------------------------------------------------------------
 %% Exported functions
diff --git a/lib/hipe/icode/hipe_icode_cfg.erl b/lib/hipe/icode/hipe_icode_cfg.erl
index 9b4a10e273..f6c2b0600b 100644
--- a/lib/hipe/icode/hipe_icode_cfg.erl
+++ b/lib/hipe/icode/hipe_icode_cfg.erl
@@ -3,7 +3,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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 @@
 -spec postorder(cfg()) -> [icode_lbl()].
 -spec reverse_postorder(cfg()) -> [icode_lbl()].
 
--spec is_visited(icode_lbl(), gb_set()) -> boolean().
--spec visit(icode_lbl(), gb_set()) -> gb_set().
+-spec is_visited(icode_lbl(), gb_sets:set()) -> boolean().
+-spec visit(icode_lbl(), gb_sets:set()) -> gb_sets:set().
 
 -spec bb(cfg(), icode_lbl()) -> 'not_found' | bb().
 -spec bb_add(cfg(), icode_lbl(), bb()) -> cfg().
diff --git a/lib/hipe/icode/hipe_icode_coordinator.erl b/lib/hipe/icode/hipe_icode_coordinator.erl
index 79e3304e6f..c69db9afa9 100644
--- a/lib/hipe/icode/hipe_icode_coordinator.erl
+++ b/lib/hipe/icode/hipe_icode_coordinator.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %% 
 %% The 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,9 +49,9 @@ coordinate(CG, Escaping, NonEscaping, Mod) ->
 
 -type mfalists() :: {[mfa()], [mfa()]}.
 
--spec coordinate(mfalists(), hipe_digraph:hdg(), gb_tree(),
-                 fun((mfalists(), gb_tree()) -> mfalists()),
-                 fun((gb_tree()) -> 'ok'), pid()) -> no_return().
+-spec coordinate(mfalists(), hipe_digraph:hdg(), gb_trees:tree(),
+                 fun((mfalists(), gb_trees:tree()) -> mfalists()),
+                 fun((gb_trees:tree()) -> 'ok'), pid()) -> no_return().
 
 coordinate(MFALists, CG, PM, Restart, LastAction, ServerPid) ->
   case MFALists of
diff --git a/lib/hipe/icode/hipe_icode_exceptions.erl b/lib/hipe/icode/hipe_icode_exceptions.erl
index 00caffb24b..6191c536ad 100644
--- a/lib/hipe/icode/hipe_icode_exceptions.erl
+++ b/lib/hipe/icode/hipe_icode_exceptions.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -397,9 +397,9 @@ get_renaming(C, Map) ->
 		succ					:: #cfg{},
 		pred					:: #cfg{},
 		start_labels				:: [icode_lbl(),...],
-		visited = hipe_icode_cfg:none_visited()	:: gb_set(),
-		out     = gb_trees:empty()		:: gb_tree(),
-		in      = gb_trees:empty()		:: gb_tree()
+		visited = hipe_icode_cfg:none_visited()	:: gb_sets:set(),
+		out     = gb_trees:empty()		:: gb_trees:tree(),
+		in      = gb_trees:empty()		:: gb_trees:tree()
 	       }).
 
 init_state(CFG) ->
diff --git a/lib/hipe/icode/hipe_icode_fp.erl b/lib/hipe/icode/hipe_icode_fp.erl
index a2ca6132d1..c0cd9bd2d1 100644
--- a/lib/hipe/icode/hipe_icode_fp.erl
+++ b/lib/hipe/icode/hipe_icode_fp.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %% 
 %% The 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,8 +33,8 @@
 -include("hipe_icode.hrl").
 -include("../flow/cfg.hrl").
 
--record(state, {edge_map   = gb_trees:empty() :: gb_tree(),
-		fp_ebb_map = gb_trees:empty() :: gb_tree(),
+-record(state, {edge_map   = gb_trees:empty() :: gb_trees:tree(),
+		fp_ebb_map = gb_trees:empty() :: gb_trees:tree(),
 		cfg	                      :: #cfg{}}).
 
 %%--------------------------------------------------------------------
diff --git a/lib/hipe/icode/hipe_icode_instruction_counter.erl b/lib/hipe/icode/hipe_icode_instruction_counter.erl
index 92658d294a..f44adfe149 100644
--- a/lib/hipe/icode/hipe_icode_instruction_counter.erl
+++ b/lib/hipe/icode/hipe_icode_instruction_counter.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %% 
 %% The 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,7 +64,8 @@ walktrough_bb(BB, Info) ->
 %% The counter specific functions
 %%-------------------------------------------------------------------
 
--spec compare(gb_tree(), gb_tree(), gb_tree()) -> gb_tree().
+-spec compare(gb_trees:tree(), gb_trees:tree(), gb_trees:tree()) ->
+        gb_trees:tree().
 
 compare(Name, Old, New) ->
   NewList = gb_trees:to_list(New),
diff --git a/lib/hipe/icode/hipe_icode_mulret.erl b/lib/hipe/icode/hipe_icode_mulret.erl
index 0bf9f89994..2402bad42c 100644
--- a/lib/hipe/icode/hipe_icode_mulret.erl
+++ b/lib/hipe/icode/hipe_icode_mulret.erl
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/icode/hipe_icode_range.erl b/lib/hipe/icode/hipe_icode_range.erl
index 1a2cbfae31..fbc58f3568 100644
--- a/lib/hipe/icode/hipe_icode_range.erl
+++ b/lib/hipe/icode/hipe_icode_range.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %%
 %% The 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 @@
 -type final_fun() :: fun((mfa(), [range()]) -> 'ok').
 -type data() :: {mfa(), args_fun(), call_fun(), final_fun()}.
 -type label() :: non_neg_integer().
--type info() :: gb_tree().
--type work_list() :: {[label()], [label()], set()}.
+-type info() :: gb_trees:tree().
+-type work_list() :: {[label()], [label()], sets:set()}.
 -type variable() :: #icode_variable{}.
 -type annotated_variable() :: #icode_variable{}.
 -type argument() :: #icode_const{} | variable().
@@ -82,9 +82,9 @@
 -type last_instr_return() :: {instr_split_info(), range()}.
 
 -record(state, {info_map = gb_trees:empty()	:: info(), 
-		counter  = dict:new()		:: dict(), 
+		counter  = dict:new()		:: dict:dict(),
 		cfg				:: cfg(), 
-		liveness = gb_trees:empty()	:: gb_tree(), 
+		liveness = gb_trees:empty()	:: gb_trees:tree(),
 		ret_type			:: range(),
 		lookup_fun			:: call_fun(),
 		result_action			:: final_fun()}).
diff --git a/lib/hipe/icode/hipe_icode_ssa.erl b/lib/hipe/icode/hipe_icode_ssa.erl
index 4607a96dda..2c4b6d9409 100644
--- a/lib/hipe/icode/hipe_icode_ssa.erl
+++ b/lib/hipe/icode/hipe_icode_ssa.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %% 
 %% The 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 @@
 -include("../ssa/hipe_ssa.inc").
 
 %% Declarations for exported functions which are Icode-specific.
--spec ssa_liveness__analyze(#cfg{}) -> gb_tree().
+-spec ssa_liveness__analyze(#cfg{}) -> gb_trees:tree().
 -spec ssa_liveness__livein(_, icode_lbl()) -> [#icode_variable{}].
 %% -spec ssa_liveness__livein(_, icode_lbl(), _) -> [#icode_var{}].
 
diff --git a/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl b/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl
index 2337ef9323..772e30eada 100644
--- a/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl
+++ b/lib/hipe/icode/hipe_icode_ssa_struct_reuse.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %% 
 %% The 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 @@
 %% var - maps variables to expression value numbers. These variables are
 %% defined or used by the structure expressions.
 
--record(maps, {var   = gb_trees:empty() :: gb_tree(),
-	       instr = gb_trees:empty() :: gb_tree(),
-	       expr  = gb_trees:empty() :: gb_tree()}).
+-record(maps, {var   = gb_trees:empty() :: gb_trees:tree(),
+	       instr = gb_trees:empty() :: gb_trees:tree(),
+	       expr  = gb_trees:empty() :: gb_trees:tree()}).
 
 maps_var(#maps{var = Out}) -> Out.
 maps_instr(#maps{instr = Out}) -> Out.
@@ -211,10 +211,10 @@ varinfo_use_add(#varinfo{use = UseSet} = I, Use) ->
   pred			= none             :: 'none' | [icode_lbl()],
   succ 			= none             :: 'none' | [icode_lbl()],
   code     		= []               :: [tuple()], % [illegal_icode_instr()]
-  phi			= gb_trees:empty() :: gb_tree(),
+  phi			= gb_trees:empty() :: gb_trees:tree(),
   varmap		= []               :: [{icode_var(), icode_var()}],
   pre_loop		= false            :: boolean(),
-  non_struct_defs 	= gb_sets:new()    :: gb_set(),
+  non_struct_defs 	= gb_sets:new()    :: gb_sets:set(),
   up_expr     		= none             :: 'none' | ?SETS:?SET(_),
   killed_expr 		= none             :: 'none' | ?SETS:?SET(_),
   sub_inserts		= ?SETS:new()      :: ?SETS:?SET(_),
@@ -319,7 +319,7 @@ node_create(Label, Pred, Succ) ->
   start_label	= none             :: 'none' | icode_lbl(),
   rev_postorder = none             :: 'none' | [icode_lbl()],
   all_expr	= none             :: 'none' | [non_neg_integer()],
-  tree  	= gb_trees:empty() :: gb_tree()}).
+  tree  	= gb_trees:empty() :: gb_trees:tree()}).
 
 nodes_postorder(#nodes{postorder = Out}) -> Out.
 nodes_rev_postorder(#nodes{rev_postorder = Out}) -> Out.
@@ -356,7 +356,7 @@ nodes_create() -> #nodes{}.
 %% del_red_test - flag that is set to true when the reduction test
 %% 	has been inserted is used to move the reduction test.
 
--record(update, {inserted     = gb_trees:empty() :: gb_tree(),
+-record(update, {inserted     = gb_trees:empty() :: gb_trees:tree(),
 		 del_red_test = false            :: boolean()}).
 
 update_inserted_lookup(#update{inserted = Inserted}, ExprId) ->
diff --git a/lib/hipe/icode/hipe_icode_type.erl b/lib/hipe/icode/hipe_icode_type.erl
index 046949d2f2..65876b83ea 100644
--- a/lib/hipe/icode/hipe_icode_type.erl
+++ b/lib/hipe/icode/hipe_icode_type.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %%
 %% The 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,9 +97,9 @@
 		    t_pid/0, t_port/0, t_reference/0, t_subtract/2, t_sup/2,
 		    t_to_tlist/1, t_tuple/0, t_tuple/1, t_tuple_sizes/1]).
 
--record(state, {info_map  = gb_trees:empty() :: gb_tree(),
+-record(state, {info_map  = gb_trees:empty() :: gb_trees:tree(),
 		cfg                          :: cfg(),
-		liveness  = gb_trees:empty() :: gb_tree(),
+		liveness  = gb_trees:empty() :: gb_trees:tree(),
 		arg_types                    :: [erl_types:erl_type()],
 		ret_type  = [t_none()]       :: [erl_types:erl_type()],
 		lookupfun                    :: call_fun(),
diff --git a/lib/hipe/main/hipe.app.src b/lib/hipe/main/hipe.app.src
index 7db4db8a57..bcdfcb0e03 100644
--- a/lib/hipe/main/hipe.app.src
+++ b/lib/hipe/main/hipe.app.src
@@ -192,7 +192,6 @@
 	     hipe_tagscheme,
 	     hipe_temp_map,
 	     hipe_timing,
-	     hipe_tool,
 	     hipe_vectors,
 	     hipe_x86,
 	     hipe_x86_assemble,
diff --git a/lib/hipe/main/hipe.appup.src b/lib/hipe/main/hipe.appup.src
index 1d5a0d93f5..02679fab21 100644
--- a/lib/hipe/main/hipe.appup.src
+++ b/lib/hipe/main/hipe.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %% 
 %% The 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,5 +15,4 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-{"%VSN%",[],[]}.
+{"%VSN%", [], []}.
diff --git a/lib/hipe/misc/hipe_consttab.erl b/lib/hipe/misc/hipe_consttab.erl
index c381e6a057..2b02f54b5c 100644
--- a/lib/hipe/misc/hipe_consttab.erl
+++ b/lib/hipe/misc/hipe_consttab.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -462,7 +462,7 @@ update_referred_labels(Table, LabelMap) ->
 tree_keys(T) ->
   dict:fetch_keys(T).
 
--spec tree_to_list(dict()) -> [{_, _}].
+-spec tree_to_list(dict:dict()) -> [{_, _}].
 tree_to_list(T) ->
   dict:to_list(T).
 
@@ -486,11 +486,11 @@ tree_lookup(Key, T) ->
       none
   end.
 
--spec tree_empty() -> dict().
+-spec tree_empty() -> dict:dict().
 tree_empty() ->
   dict:new().
 
--spec tree_lookup_key_for_value(ctdata(), dict()) -> 'none' | {'value', _}.
+-spec tree_lookup_key_for_value(ctdata(), dict:dict()) -> 'none' | {'value', _}.
 tree_lookup_key_for_value(Val, T) ->
   tree_lookup_key_for_value_1(tree_to_list(T), Val).
 
diff --git a/lib/hipe/misc/hipe_consttab.hrl b/lib/hipe/misc/hipe_consttab.hrl
index 39018dac34..aea3c5bc88 100644
--- a/lib/hipe/misc/hipe_consttab.hrl
+++ b/lib/hipe/misc/hipe_consttab.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %% 
 %% The 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,6 +22,6 @@
 -type ct_alignment()  :: 4 | 8.
 
 -type hipe_constlbl() :: non_neg_integer().
--type hipe_consttab() :: {dict(), [hipe_constlbl()], hipe_constlbl()}.
+-type hipe_consttab() :: {dict:dict(), [hipe_constlbl()], hipe_constlbl()}.
 
 %%-----------------------------------------------------------------------------
diff --git a/lib/hipe/misc/hipe_pack_constants.erl b/lib/hipe/misc/hipe_pack_constants.erl
index e214d7ebbc..ca8a9e6bf7 100644
--- a/lib/hipe/misc/hipe_pack_constants.erl
+++ b/lib/hipe/misc/hipe_pack_constants.erl
@@ -3,7 +3,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %% 
 %% The 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,7 +198,7 @@ compact_dests([], Dest, AccofDest, Acc) ->
 slim_constmap(Map) ->
   slim_constmap(Map, gb_sets:new(), []).
 
--spec slim_constmap([#pcm_entry{}], gb_set(), [raw_data()]) -> [raw_data()].
+-spec slim_constmap([#pcm_entry{}], gb_sets:set(), [raw_data()]) -> [raw_data()].
 slim_constmap([#pcm_entry{const_num=ConstNo, start=Offset,
 			  type=Type, raw_data=Term}|Rest], Inserted, Acc) ->
   case gb_sets:is_member(ConstNo, Inserted) of
diff --git a/lib/hipe/misc/hipe_sdi.erl b/lib/hipe/misc/hipe_sdi.erl
index ef1b5b48c5..9a2ff78ecf 100644
--- a/lib/hipe/misc/hipe_sdi.erl
+++ b/lib/hipe/misc/hipe_sdi.erl
@@ -3,7 +3,7 @@
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%% 
 %%% The 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,7 +50,7 @@
 
 -record(pass1, {prevSdi			    :: integer(),
 		preS	 = []		    :: [#pre_sdi_data{}],
-		labelMap = gb_trees:empty() :: gb_tree()}).
+		labelMap = gb_trees:empty() :: gb_trees:tree()}).
 
 -record(sdi_data, {address       :: address(),
 		   label_address :: address(),
@@ -105,11 +105,11 @@ pass1_add_sdi(Pass1, Address, Label, SdiInfo) ->
   PreSdiData = #pre_sdi_data{address=Address, label=Label, si=SdiInfo},
   Pass1#pass1{prevSdi=PrevSdi+1, preS=[PreSdiData|PreS]}.
 
--spec pass1_finalise(#pass1{}) -> {non_neg_integer(),tuple(),gb_tree()}.
+-spec pass1_finalise(#pass1{}) -> {non_neg_integer(),tuple(),gb_trees:tree()}.
 pass1_finalise(#pass1{prevSdi=PrevSdi, preS=PreS, labelMap=LabelMap}) ->
   {PrevSdi+1, pass1_finalise_preS(PreS, LabelMap, []), LabelMap}.
 
--spec pass1_finalise_preS([#pre_sdi_data{}], gb_tree(), [#sdi_data{}]) ->
+-spec pass1_finalise_preS([#pre_sdi_data{}], gb_trees:tree(), [#sdi_data{}]) ->
 	tuple().
 pass1_finalise_preS([], _LabelMap, S) -> vector_from_list(S);
 pass1_finalise_preS([PreSdiData|PreS], LabelMap, S) ->
@@ -122,7 +122,7 @@ pass1_finalise_preS([PreSdiData|PreS], LabelMap, S) ->
 
 %%% Pass2.
 
--spec pass2(#pass1{}) -> {gb_tree(), non_neg_integer()}.
+-spec pass2(#pass1{}) -> {gb_trees:tree(), non_neg_integer()}.
 pass2(Pass1) ->
   {N,SDIS,LabelMap} = pass1_finalise(Pass1),
   LONG = mk_long(N),
@@ -339,13 +339,14 @@ initINCR(SdiNr, PrevIncr, N, LONG, INCREMENT) ->
 %%%   a and previous sdi i is remapped to a+incr(i), where
 %%%   incr(i) = if i < 0 then 0 else INCREMENT[i].
 
--spec adjust_label_map(gb_tree(), hipe_array()) -> gb_tree().
+-spec adjust_label_map(gb_trees:tree(), hipe_array()) -> gb_trees:tree().
 adjust_label_map(LabelMap, INCREMENT) ->
   applyIncr(gb_trees:to_list(LabelMap), INCREMENT, gb_trees:empty()).
 
 -type label_pair() :: {label(), #label_data{}}.
 
--spec applyIncr([label_pair()], hipe_array(), gb_tree()) -> gb_tree().
+-spec applyIncr([label_pair()], hipe_array(), gb_trees:tree()) ->
+                   gb_trees:tree().
 applyIncr([], _INCREMENT, LabelMap) -> LabelMap;
 applyIncr([{Label,LabelData}|List], INCREMENT, LabelMap) ->
   #label_data{address=Address, prevSdi=PrevSdi} = LabelData,
diff --git a/lib/hipe/regalloc/hipe_coalescing_regalloc.erl b/lib/hipe/regalloc/hipe_coalescing_regalloc.erl
index 7169dd18f3..e231098e0a 100644
--- a/lib/hipe/regalloc/hipe_coalescing_regalloc.erl
+++ b/lib/hipe/regalloc/hipe_coalescing_regalloc.erl
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/regalloc/hipe_ig_moves.erl b/lib/hipe/regalloc/hipe_ig_moves.erl
index 186c87a690..ebc6ebc20d 100644
--- a/lib/hipe/regalloc/hipe_ig_moves.erl
+++ b/lib/hipe/regalloc/hipe_ig_moves.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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,7 @@
 -record(ig_moves, {movelist                    :: hipe_vector(),	
 		   nrmoves   = 0               :: non_neg_integer(),
 		   moveinsns = []              :: [{_,_}],
-		   moveset   = gb_sets:empty() :: gb_set()}).
+		   moveset   = gb_sets:empty() :: gb_sets:set()}).
 
 %%-----------------------------------------------------------------------------
 
diff --git a/lib/hipe/regalloc/hipe_optimistic_regalloc.erl b/lib/hipe/regalloc/hipe_optimistic_regalloc.erl
index fc3718cbc0..5bad31ade9 100644
--- a/lib/hipe/regalloc/hipe_optimistic_regalloc.erl
+++ b/lib/hipe/regalloc/hipe_optimistic_regalloc.erl
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/regalloc/hipe_reg_worklists.erl b/lib/hipe/regalloc/hipe_reg_worklists.erl
index e22cc8dc07..897bf0ef77 100644
--- a/lib/hipe/regalloc/hipe_reg_worklists.erl
+++ b/lib/hipe/regalloc/hipe_reg_worklists.erl
@@ -1,8 +1,8 @@
-%%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%%% -*- erlang-indent-level: 2 -*-
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
 %%% 
 %%% The 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/hipe/rtl/hipe_rtl_arith.inc b/lib/hipe/rtl/hipe_rtl_arith.inc
index 7b587e882d..1d13e59420 100644
--- a/lib/hipe/rtl/hipe_rtl_arith.inc
+++ b/lib/hipe/rtl/hipe_rtl_arith.inc
@@ -1,9 +1,9 @@
 %% -*- Erlang -*-
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/rtl/hipe_rtl_mk_switch.erl b/lib/hipe/rtl/hipe_rtl_mk_switch.erl
index d859c50b7d..c14fa5628e 100644
--- a/lib/hipe/rtl/hipe_rtl_mk_switch.erl
+++ b/lib/hipe/rtl/hipe_rtl_mk_switch.erl
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/rtl/hipe_rtl_ssa_const_prop.erl b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
index 1c900d767e..2f594333c1 100644
--- a/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssa_const_prop.erl
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/rtl/hipe_rtl_ssapre.erl b/lib/hipe/rtl/hipe_rtl_ssapre.erl
index 34897ba4b7..2ebebb5197 100644
--- a/lib/hipe/rtl/hipe_rtl_ssapre.erl
+++ b/lib/hipe/rtl/hipe_rtl_ssapre.erl
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/ssa/hipe_ssa.inc b/lib/hipe/ssa/hipe_ssa.inc
index e766a83c41..2766c10e4f 100644
--- a/lib/hipe/ssa/hipe_ssa.inc
+++ b/lib/hipe/ssa/hipe_ssa.inc
@@ -1,8 +1,8 @@
-%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%% -*- erlang-indent-level: 2 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
 %% 
 %% The 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/hipe/ssa/hipe_ssa_const_prop.inc b/lib/hipe/ssa/hipe_ssa_const_prop.inc
index 2fce384197..0876fca34a 100644
--- a/lib/hipe/ssa/hipe_ssa_const_prop.inc
+++ b/lib/hipe/ssa/hipe_ssa_const_prop.inc
@@ -3,7 +3,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %% 
 %% The 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,10 +72,10 @@ visit_expressions([Inst | Insts], Environment, FlowWork, SSAWork) ->
 %%-----------------------------------------------------------------------------
 
 -record(env, {cfg                                 :: #cfg{},
-	      executable_flags = gb_sets:empty()  :: gb_set(),
-	      handled_blocks   = gb_sets:empty()  :: gb_set(),
-	      lattice_values   = gb_trees:empty() :: gb_tree(),
-	      ssa_edges        = gb_trees:empty() :: gb_tree()
+	      executable_flags = gb_sets:empty()  :: gb_sets:set(),
+	      handled_blocks   = gb_sets:empty()  :: gb_sets:set(),
+	      lattice_values   = gb_trees:empty() :: gb_trees:tree(),
+	      ssa_edges        = gb_trees:empty() :: gb_trees:tree()
 	     }).
 
 create_env(CFG) ->
diff --git a/lib/hipe/test/Makefile b/lib/hipe/test/Makefile
new file mode 100644
index 0000000000..19fa227912
--- /dev/null
+++ b/lib/hipe/test/Makefile
@@ -0,0 +1,65 @@
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	hipe_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/hipe_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)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES) $(GEN_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) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) hipe.spec "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+
+release_docs_spec:
diff --git a/lib/hipe/test/hipe.spec b/lib/hipe/test/hipe.spec
new file mode 100644
index 0000000000..6b0b226dc3
--- /dev/null
+++ b/lib/hipe/test/hipe.spec
@@ -0,0 +1 @@
+{suites,"../hipe_test",all}.
diff --git a/lib/hipe/test/hipe_SUITE.erl b/lib/hipe/test/hipe_SUITE.erl
new file mode 100644
index 0000000000..554bc972f6
--- /dev/null
+++ b/lib/hipe/test/hipe_SUITE.erl
@@ -0,0 +1,55 @@
+%% ``The 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.''
+%%
+-module(hipe_SUITE).
+
+-compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [app, appup].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    case erlang:system_info(hipe_architecture) of
+        undefined -> {skip, "HiPE not available or enabled"};
+        _ -> Config
+    end.
+
+end_per_suite(_Config) ->
+     ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+app() ->
+    [{doc, "Test that the hipe app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(hipe, tolerant).
+
+appup() ->
+    [{doc, "Test that the hipe appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    AppupFile = "hipe.appup",
+    AppupPath = filename:join([code:lib_dir(hipe), "ebin", AppupFile]),
+    {ok, [{_Vsn, [], []}]} = file:consult(AppupPath).
diff --git a/lib/hipe/tools/Makefile b/lib/hipe/tools/Makefile
index 3ce8ad5dd7..ed80eb075b 100644
--- a/lib/hipe/tools/Makefile
+++ b/lib/hipe/tools/Makefile
@@ -42,7 +42,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/hipe-$(VSN)
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
-MODULES = hipe_tool hipe_profile hipe_jit
+MODULES = hipe_profile hipe_jit
 #	  hipe_timer
 
 HRL_FILES=
@@ -110,5 +110,4 @@ realclean:	clean
 # ---------------------------------------------------- 
 
 $(EBIN)/hipe_ceach.beam: ../main/hipe.hrl
-$(EBIN)/hipe_tool.beam: ../main/hipe.hrl
 
diff --git a/lib/hipe/tools/hipe_tool.erl b/lib/hipe/tools/hipe_tool.erl
deleted file mode 100644
index efcf073efa..0000000000
--- a/lib/hipe/tools/hipe_tool.erl
+++ /dev/null
@@ -1,525 +0,0 @@
-%% -*- erlang-indent-level: 2 -*-
-%%
-%% %CopyrightBegin%
-%%
-%% 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
-%% 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%
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Copyright (c) 2002 by Erik Johansson.  
-%% ====================================================================
-%%  Module   :	hipe_tool
-%%  Purpose  :  
-%%  Notes    : 
-%%  History  :	* 2002-03-13 Erik Johansson ([email protected]): Created.
-%% ====================================================================
-%%  Exports  :
-%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--module(hipe_tool).
--compile([{nowarn_deprecated_function,{gs,button,3}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,editor,3}},
-          {nowarn_deprecated_function,{gs,label,3}},
-          {nowarn_deprecated_function,{gs,listbox,3}},
-          {nowarn_deprecated_function,{gs,menu,3}},
-          {nowarn_deprecated_function,{gs,menubar,3}},
-          {nowarn_deprecated_function,{gs,menubutton,3}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
--export([start/0]).
-
-%%---------------------------------------------------------------------
-
--include("../main/hipe.hrl").
-
-%%---------------------------------------------------------------------
-
--define(WINDOW_WIDTH, 920).
--define(WINDOW_HEIGHT, 460).
--define(DEFAULT_BG_COLOR, {217,217,217}).
--define(POLL_INTERVAL, 5000).
--define(FONT, {screen, 12}).
--define(HEADER_FONT, {screen, [bold], 12}).
--define(NORMAL_FG_COLOR, {0,0,0}).
-
-%%---------------------------------------------------------------------
-
--type fa() :: {atom(), arity()}. % {Fun,Arity}
--type fa_address() :: {atom(), arity(), non_neg_integer()}. % {F,A,Address}
-
-%%---------------------------------------------------------------------
-
--record(state, {win_created = false	:: boolean(),
-		mindex = 0		:: integer(),
-		mod			:: atom(),
-		funs = []		:: [fa()],
-		mods = [] 		:: [atom()],
-		options = [o2]		:: comp_options(),
-		compiling = false	:: 'false' | pid()
-	       }).
-
-%%---------------------------------------------------------------------
-
--spec start() -> pid().
-
-start() ->
-  spawn(fun () -> init() end).
-
-init() ->
-  process_flag(trap_exit, true), 
-  gs:start(),
-  S = init_window(#state{}),
-  loop(S).
-
--spec loop(#state{}) -> no_return().
-
-loop(State) ->
-    receive
-      {gs, code_listbox, click, Data, [Idx, Txt | _]} ->
-	NewState = update_module_box(State,Idx,Data,Txt),
-	loop(NewState);
-      {gs, module_listbox, click, Data, [Idx, _Txt | _]} ->
-	NewState = update_fun(State,Idx,Data),
-	loop(NewState);
-      {gs, compmod, click, _, _} ->
-	loop(compile(State));
-      {gs, prof, click, [], ["Turn off\nProfiling"]} ->
-	hipe_profile:prof_module_off(State#state.mod),
-	loop(update_module_box(State,State#state.mindex,State#state.mods,""));
-      {gs, prof, click, [], _} ->
-	hipe_profile:prof_module(State#state.mod),
-	loop(update_module_box(State,State#state.mindex,State#state.mods,""));
-      {gs, win, configure, _, _} ->
-	gs:config(win, [{width, ?WINDOW_WIDTH}, {height, ?WINDOW_HEIGHT}]),
-	loop(State);
-
-      show_window when State#state.win_created =:= true ->
-	gs:config(win, [raise]),
-	loop(State);
-      show_window when State#state.win_created =:= false ->
-	loop((init_window(State))#state{win_created = true});
-
-      {gs, _Id, click, close_menu, _Args} ->
-	gs:destroy(win),
-	loop(State#state{win_created = false});
-      {gs, _Id, keypress, _Data, [c, _, 0, 1 | _]} ->
-	gs:destroy(win),
-	loop(State#state{win_created = false});
-      {gs, _Id, keypress, _Data, ['C', _, 1, 1 | _]} ->
-	gs:destroy(win),
-	loop(State#state{win_created = false});
-      {gs, _Id, keypress, _Data, _Args} ->
-	loop(State);
-      {gs, _, destroy, _, _} ->
-	loop(State#state{win_created = false});
-
-      {compilation_done, _Res, Sender} ->
-	case State#state.compiling of
-	  Sender ->
-	    catch gs:config(compmod, [{enable, true}]),
-	    update_text(compiling, ""),
-	    loop(update_module_box(State,
-				   State#state.mindex,
-				   State#state.mods, ""));
-	  _ ->
-	    loop(State)
-	end;
-
-      {'EXIT', _Pid, _Reason} ->
-	exit(normal);
-      _Other ->
-	io:format("HiPE window received message ~p ~n", [_Other]),
-	loop(State)
-    after 
-      ?POLL_INTERVAL ->
-	loop(update_code_listbox(State))
-    end.
-
--spec init_window(#state{}) -> #state{}.
-
-init_window(State) ->
-  create_window(State),
-  gs:config(win, [{map,true}]),
-  update_code_listbox(State#state{win_created = true}).
-
--spec create_window(#state{}) -> 'ok'.
-
-create_window(State) ->
-  gs:window(win, gs:start(), [{width, ?WINDOW_WIDTH},
-			      {height, ?WINDOW_HEIGHT},
-			      {bg, ?DEFAULT_BG_COLOR},
-			      {title, "[HiPE] Code list"},
-			      {configure, true},
-			      {destroy, true},
-			      {cursor, arrow},
-			      {keypress, true}
-			     ]),
-  create_menu(),
-  Xpos = 4, 
-  Ypos1 = 60, 
-  Width =  (?WINDOW_WIDTH - (Xpos*4)) div 3,
-  create_labels([{mods,Ypos1-20,"Loaded Modules"}], Xpos + 1 + 3),
-  Xpos2 = Xpos*2+Width,
-  create_labels([{mod,Ypos1-20,"Module:"++atom_to_list(State#state.mod)},
-		 {ver,Ypos1,""},
-		 {time,Ypos1+20,""},
-		 {native,Ypos1+40,""},
-		 {compiling,Ypos1+60,""}], Xpos2),
-  create_labels([{function,Ypos1-20,"Function:"},
-		 {nativefun,Ypos1,""}], Xpos*3+Width*2),
-  Ypos = 240,
-  Height1 = ?WINDOW_HEIGHT - Ypos1 - Xpos,
-  Height = ?WINDOW_HEIGHT - Ypos - Xpos,
-  gs:listbox(code_listbox, win, [{x, Xpos},
-				 {y, Ypos1},
-				 {width, Width},
-				 {height, Height1},
-				 {bg, {255,255,255}},
-				 {vscroll, right},
-				 {hscroll, true},
-				 {click, true}]),
-  gs:listbox(module_listbox, win, [{x, Xpos*2+Width},
-				   {y, Ypos},
-				   {width, Width},
-				   {height, Height},
-				   {bg, {255,255,255}},
-				   {vscroll, right},
-				   {hscroll, true},
-				   {click, true}]),
-  gs:listbox(profile_listbox, win, [{x, Xpos*3+Width*2},
-				    {y, Ypos1+40},
-				    {width, Width},
-				    {height, Height-60},
-				    {bg, {255,255,255}},
-				    {vscroll, right},
-				    {hscroll, true},
-				    {click, true}]),
-  gs:button(compmod,win,[{label,{text,"Compile\nModule"}},
-			 {justify,center},
-			 {x,Xpos*2+Width*1},
-			 {height,60},
-			 {y,Ypos-80}]),
-  gs:button(prof,win,[{label,{text,"Profile\nModule"}},
-		      {justify,center},
-		      {x,Xpos*2+Width*1+100},
-		      {height,60},
-		      {y,Ypos-80}]),
-  gs:button(clearprof,win,[{label, {text,"Clear\nProfile"}},
-			   {justify, center},
-			   {x, Xpos*2+Width*1+200},
-			   {height, 60},
-			   {y, Ypos-80}]),
-  gs:editor(edoc,win,[{x, Xpos*3+Width*2}, {y, Ypos},
-		      {width, Width}, {height, Height},
-		      {insert, {'end',"Edit this text!"}},
-		      {vscroll, right},
-		      {hscroll, true},
-		      {wrap, none}]),
-  ok.
-
--spec create_menu() -> 'ok'.
-
-create_menu() ->
-  gs:menubar(menubar, win, [{bg, ?DEFAULT_BG_COLOR}]),
-  create_sub_menus([{mbutt, fmenu, " File",
-		     [{" Close    Ctrl-C ",close_menu}]},
-		    {mbuttc,cmenu, " Compile ",
-		     [{" Compile Module", comp_mod}]},
-		    {mbuttp,pmenu, " Profile ",
-		     [{" Profile Module", prof_mod}]},
-		    {mbutte,emenu, " Edoc", [separator]},
-		    {mbutta,amenu, " Analyze ", [separator]},
-		    {mbuttb,bmenu, " Benchmark ", [separator]},		    
-		    {mbuttj,jmenu, " Jit ", [separator]}]),
-  ok.
-
-create_menuitems(Parent, [{Text,Data}|Rest]) ->
-  gs:menuitem(Parent, [{bg, ?DEFAULT_BG_COLOR},
-		       {fg, {178, 34, 34}},
-		       {label, {text, Text}},
-		       {data, Data},
-		       {underline, 1}
-		      ]),
-  create_menuitems(Parent, Rest);
-create_menuitems(Parent, [separator|Rest]) ->
-  gs:menuitem(Parent, [{itemtype, separator}]),
-  create_menuitems(Parent, Rest);
-create_menuitems(_, []) -> ok.
-
-create_sub_menus([{Parent, Name, Text, Items}|Rest]) ->
-  BG = {bg, ?DEFAULT_BG_COLOR},
-  FG = {fg, {178, 34, 34}},  % firebrick
-  Label = {label, {text, Text}},
-  gs:menubutton(Parent, menubar, [BG, FG, Label, {underline, 1}]),
-  gs:menu(Name, Parent, [BG, FG]),
-  create_menuitems(Name, Items),
-  create_sub_menus(Rest);
-create_sub_menus([]) -> ok.
-
-create_labels([{Name,Y,Text}|Rest], Xpos) ->    
-  gs:label(Name, win, [{width, (?WINDOW_WIDTH - 16) div 3},
-		       {height, 20},
-		       {x, Xpos + 1 + 3},
-		       {y, Y},
-		       {bg, ?DEFAULT_BG_COLOR},
-		       {fg, ?NORMAL_FG_COLOR},
-		       {font, ?HEADER_FONT},
-		       {align, w},
-		       {label, {text, Text}}
-		      ]),
-  create_labels(Rest,Xpos);
-create_labels([],_) -> ok.
-
--spec update_code_listbox(#state{}) -> #state{}.
-
-update_code_listbox(State) ->
-  Mods = lists:sort(mods()),
-  case State#state.win_created of
-    false ->
-      State;
-    true ->
-      case Mods =:= State#state.mods of
-	true -> State;
-	false ->
-	  update_text(mods,
-		      "Loaded Modules ("++
-		      integer_to_list(length(Mods))++")"),
-	  catch gs:config(code_listbox, [{data, Mods},
-					 {items, Mods},
-					 {selection, 0}]),
-	  update_module_box(State#state{mods = Mods}, 0, Mods, "")  
-      end
-  end.
-
--spec update_fun(#state{}, integer(), [mfa()]) -> #state{}.
-
-update_fun(State, Idx, Data) ->
-  case State#state.win_created of
-    false ->
-      State;
-    true ->
-      MFA = {M,F,A} = get_selection(Idx, Data, {?MODULE,start,0}),
-      update_text(function, "Function: "++mfa_to_string(MFA)),
-      case in_native(F, A, native_code(M)) of
-	true  -> update_text(nativefun, "Native");
-	false -> update_text(nativefun, "Emulated")
-      end,
-      State
-  end.
-
-get_selection(Idx, Data, Default) ->
-  try lists:nth(Idx+1, Data) catch _:_ -> Default end.
-
--spec update_module_box(#state{}, integer(), [atom()], string()) -> #state{}.
-
-update_module_box(State, Idx, Data, _Txt) ->
-  case State#state.win_created of
-    false ->
-      State;
-    true ->
-      Mod = get_selection(Idx, Data, hipe_tool),
-      %% io:format("~w\n", [Mod:module_info()]),      
-      Info = Mod:module_info(),
-      Funs = lists:usort(funs(Mod)), 
-      MFAs = mfas(Mod, Funs),
-      ModText = atom_to_list(Mod),
-      update_text(mod, "Module:"++ModText),
-      update_text(compmod, "Compile\nModule\n"++ModText),
-      Options = get_compile(Info),
-      update_text(ver, get_version(Options)),
-      update_text(time, get_time(Options)),
-      NativeCode = native_code(Mod),
-
-      Prof = is_profiled(Mod),
-      if Prof -> update_text(prof, "Turn off\nProfiling");
-	 true -> update_text(prof, "Profile\n"++ModText)
-      end,
- 
-      Mode = get_mode(Funs, NativeCode),
-      
-      update_text(native, Mode),
-      Items = fun_names(Mod, Funs, NativeCode, Prof),
-
-      Selection = {selection, 0},
-      catch gs:config(module_listbox, [{data, MFAs},
-				       {items, Items},
-				       Selection]),
-      ProfData = [mfa_to_string(element(1, X)) ++ " " ++
-				integer_to_list(element(2,X))
-		  || X <- hipe_profile:res(), element(2, X) > 0],
-      catch gs:config(profile_listbox, [{data, ProfData},
-					{items, ProfData},
-					Selection]),
-      get_edoc(Mod),
-      update_fun(State#state{mindex = Idx, mod = Mod, funs = Funs}, 0, MFAs)
-  end.
-
-update_text(Lab, Text) ->
-  catch gs:config(Lab, [{label, {text, Text}}]).
-
-%%---------------------------------------------------------------------
-%% @doc Returns a list of all loaded modules. 
-%%---------------------------------------------------------------------
-
--spec mods() -> [atom()].
-
-mods() ->
-  [Mod || {Mod,_File} <- code:all_loaded()].
-
--spec funs(module()) -> [fa()].
-
-funs(Mod) -> 
-  Mod:module_info(functions).
-
--spec native_code(module()) -> [fa_address()].
-
-native_code(Mod) ->
-  Mod:module_info(native_addresses).
-
--spec mfas(atom(), [fa()]) -> [mfa()].
-
-mfas(Mod, Funs) ->
-  [{Mod,F,A} || {F,A} <- Funs].
-
--spec fun_names(atom(), [fa()], [fa_address()], boolean()) -> [string()].
-
-fun_names(M, Funs, NativeCode, Prof) ->
-  [atom_to_list(F) ++ "/" ++ integer_to_list(A)
-   ++
-     (case in_native(F, A, NativeCode) of
-	true -> " [native] ";
-	false -> ""
-      end)
-   ++
-     if Prof ->
-	 (catch integer_to_list(hipe_bifs:call_count_get({M,F,A})));
-	true -> ""
-     end
-   || {F,A} <- Funs].
-
--spec in_native(atom(), arity(), [fa_address()]) -> boolean().
-
-in_native(F, A, NativeCode) ->
-  lists:any(fun({Fun,Arity,_}) ->
-		(Fun =:= F andalso Arity =:= A)
-	    end,
-	    NativeCode).
-
--spec mfa_to_string(mfa()) -> [char(),...].
-
-mfa_to_string({M,F,A}) ->
-  atom_to_list(M) ++ ":" ++ atom_to_list(F) ++ "/" ++ integer_to_list(A).
-
-get_mode(Funs, NativeCode) ->
-  case NativeCode of
-    [] -> "Emulated";
-    InNative when is_list(InNative) ->
-      if length(InNative) =:= length(Funs) ->
-	  "Native";
-	 true -> "Mixed"
-      end
-  end.
-
-get_time(Comp) ->
-  case lists:keyfind(time, 1, Comp) of
-    {_, {Y,Month,D,H,Min,S}} ->
-      integer_to_list(Y) ++
-	"-" ++ integer_to_list(Month) ++
-	"-" ++ integer_to_list(D) ++ " " ++
-	integer_to_list(H) ++ ":" ++ integer_to_list(Min) ++
-	":"  ++ integer_to_list(S);
-    false -> ""
-  end.
-
-get_version(Comp) ->
-  case lists:keyfind(version, 1, Comp) of
-    {_, V} when is_list(V) -> V;
-    false -> ""
-  end.
-
-get_cwd(Options) ->
-  case lists:keyfind(cwd, 1, Options) of
-    {_, V} when is_atom(V) -> atom_to_list(V);
-    {_, V} -> V; 
-    false -> ""
-  end.
-
-get_options(Comp) ->
-  case lists:keyfind(options, 1, Comp) of
-    {_, V} when is_list(V) -> V;
-    false -> ""
-  end.
-
-get_compile(Info) ->
-  case lists:keyfind(compile, 1, Info) of
-    {_, O} when is_list(O) -> O;
-    false -> []
-  end.
-
--spec is_profiled(atom()) -> boolean().
-
-is_profiled(Mod) ->
-  case hipe_bifs:call_count_get({Mod,module_info,0}) of
-    false -> false;
-    C when is_integer(C) -> true
-  end.
-
--spec compile(#state{}) -> #state{}.
-
-compile(State) ->
-  catch gs:config(compmod, [{enable, false}]),
-  update_text(compiling, "Compiling..."),
-  Parent = self(),
-  P = spawn(fun() -> c(Parent, State#state.mod, State#state.options) end),
-  State#state{compiling = P}.
-
--spec c(pid(), atom(), comp_options()) -> 'ok'.
-
-c(Parent, Mod, Options) ->
-  Res = hipe:c(Mod, Options),
-  Parent ! {compilation_done,Res,self()},
-  ok.
-
-get_edoc(Mod) ->
-  Info = Mod:module_info(),
-  Comp = get_compile(Info), 
-  Options = get_options(Comp),
-  Dir = get_cwd(Options),
-  File = 
-    case Dir of
-      "" ->  atom_to_list(Mod) ++ ".erl";
-      _ -> Dir ++"/" ++ atom_to_list(Mod) ++ ".erl"
-    end,
-  %% io:format("Get ~s\n", [File]),
-  Text = try edoc(File, [{xml_export,xmerl_text}, no_output])
-	 catch  _:_ -> "error"
-	 end,
-  gs:config(edoc, {enable, true}),
-  gs:config(edoc, clear),
-  gs:config(edoc, {insert, {insert, Text}}),
-  gs:config(edoc, {enable, false}),
-  ok.
-
-edoc(Name, Opts) ->
-  Doc = edoc:get_doc(Name, Opts),
-  %% Comments = edoc:read_comments(Name, Opts),
-  %% Text = edoc:forms(Forms, Comments, Name, Opts),
-  edoc:layout(Doc, Opts),
-  ok.
diff --git a/lib/hipe/util/hipe_digraph.erl b/lib/hipe/util/hipe_digraph.erl
index fcfaa64684..01b1f8c77c 100644
--- a/lib/hipe/util/hipe_digraph.erl
+++ b/lib/hipe/util/hipe_digraph.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2014. All Rights Reserved.
 %%
 %% The 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,10 +36,10 @@
 
 -type ordset(T) :: [T].      % XXX: temporarily
 
--record(hipe_digraph, {edges     = dict:new()    :: dict(),
-		       rev_edges = dict:new()    :: dict(),
+-record(hipe_digraph, {edges     = dict:new()    :: dict:dict(),
+		       rev_edges = dict:new()    :: dict:dict(),
 		       leaves    = ordsets:new() :: ordset(_), % ???
-		       nodes     = sets:new()    :: set()}).
+		       nodes     = sets:new()    :: sets:set()}).
 
 -opaque hdg() :: #hipe_digraph{}.
 
diff --git a/lib/hipe/util/hipe_dot.erl b/lib/hipe/util/hipe_dot.erl
index e4a47ae0c4..94f7fd60cc 100644
--- a/lib/hipe/util/hipe_dot.erl
+++ b/lib/hipe/util/hipe_dot.erl
@@ -2,7 +2,7 @@
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%% 
 %%% The 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,13 +70,13 @@
 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
 
--spec translate_digraph(digraph(), string(), string()) -> 'ok'.
+-spec translate_digraph(digraph:graph(), string(), string()) -> 'ok'.
 
 translate_digraph(G, FileName, GName) ->
   translate_digraph(G, FileName, GName, 
 		    fun(X) -> io_lib:format("~p", [X]) end, []).
 
--spec translate_digraph(digraph(), string(), string(),
+-spec translate_digraph(digraph:graph(), string(), string(),
 			fun((_) -> string()), [_]) -> 'ok'.
 
 translate_digraph(G, FileName, GName, Fun, Opts) ->
diff --git a/lib/hipe/util/hipe_vectors.hrl b/lib/hipe/util/hipe_vectors.hrl
index 043faf4c91..5e24db238d 100644
--- a/lib/hipe/util/hipe_vectors.hrl
+++ b/lib/hipe/util/hipe_vectors.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %% 
 %% The 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,5 +24,5 @@
 -endif.
 
 -ifdef(USE_GBTREES).
--type hipe_vector() :: gb_tree().
+-type hipe_vector() :: gb_trees:tree().
 -endif.
diff --git a/lib/hipe/vsn.mk b/lib/hipe/vsn.mk
index deb16b02fd..ed4b4dc8d2 100644
--- a/lib/hipe/vsn.mk
+++ b/lib/hipe/vsn.mk
@@ -1 +1 @@
-HIPE_VSN = 3.10.2
+HIPE_VSN = 3.10.2.2
diff --git a/lib/hipe/x86/hipe_x86_postpass.erl b/lib/hipe/x86/hipe_x86_postpass.erl
index c0918c4f89..a95a8745ba 100644
--- a/lib/hipe/x86/hipe_x86_postpass.erl
+++ b/lib/hipe/x86/hipe_x86_postpass.erl
@@ -1,8 +1,8 @@
-%%% -*- coding: utf-8; erlang-indent-level: 2 -*-
+%%% -*- erlang-indent-level: 2 -*-
 %%%
 %%% %CopyrightBegin%
 %%% 
-%%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %%% 
 %%% The 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/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
index 856823b1b3..ed860ab73b 100644
--- a/lib/ic/c_src/Makefile.in
+++ b/lib/ic/c_src/Makefile.in
@@ -132,10 +132,8 @@ docs:
 _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
 $(LIBRARY): $(OBJ_FILES) 
-	$(ar_verbose)
-	-$(AR) $(AR_OUT) $@ $(OBJ_FILES)
-	$(ranlib_verbose)
-	-$(RANLIB) $@
+	-$(V_AR) $(AR_OUT) $@ $(OBJ_FILES)
+	-$(V_RANLIB) $@
 
 $(OBJDIR)/%.o: %.c
 	$(V_CC) $(CC_FLAGS) -c -o $@ $(ALL_CFLAGS) $<
@@ -149,9 +147,13 @@ release_spec: opt
 	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
+	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/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_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
+	$(INSTALL_DATA) $(LIBRARY) "$(RELEASE_PATH)/usr/lib"
 
 release_docs_spec:
 
diff --git a/lib/ic/c_src/oe_ei_code_erlang_binary.c b/lib/ic/c_src/oe_ei_code_erlang_binary.c
index f790f8bd69..a484dadbe0 100644
--- a/lib/ic/c_src/oe_ei_code_erlang_binary.c
+++ b/lib/ic/c_src/oe_ei_code_erlang_binary.c
@@ -24,7 +24,7 @@ int oe_encode_erlang_binary(CORBA_Environment *ev, erlang_binary *binary) {
 
   int size = ev->_iout;
     
-  (int) ei_encode_binary(0, &size, binary->_buffer, binary->_length);
+  ei_encode_binary(0, &size, binary->_buffer, binary->_length);
 
   if (size >= ev->_outbufsz) {
     char *buf = ev->_outbuf;
diff --git a/lib/ic/c_src/oe_ei_encode_atom.c b/lib/ic/c_src/oe_ei_encode_atom.c
index d16df25859..c643cf4fee 100644
--- a/lib/ic/c_src/oe_ei_encode_atom.c
+++ b/lib/ic/c_src/oe_ei_encode_atom.c
@@ -23,7 +23,7 @@
 int oe_ei_encode_atom(CORBA_Environment *ev, const char *p) { 
   int size = ev->_iout;
 
-  (int) ei_encode_atom(0,&size,p);
+  ei_encode_atom(0,&size,p);
 
   if (size >= ev->_outbufsz) {
     char *buf = ev->_outbuf;
diff --git a/lib/ic/c_src/oe_ei_encode_port.c b/lib/ic/c_src/oe_ei_encode_port.c
index 981f82c08d..4be1523df1 100644
--- a/lib/ic/c_src/oe_ei_encode_port.c
+++ b/lib/ic/c_src/oe_ei_encode_port.c
@@ -23,7 +23,7 @@
 int oe_ei_encode_port(CORBA_Environment *ev, const erlang_port *p) {
   int size = ev->_iout;
   
-  (int) ei_encode_port(NULL, &size, p);
+  ei_encode_port(NULL, &size, p);
 
   if (size >= ev->_outbufsz) {
     char *buf = ev->_outbuf;
diff --git a/lib/ic/c_src/oe_ei_encode_ref.c b/lib/ic/c_src/oe_ei_encode_ref.c
index d321469b45..71dc5e5a70 100644
--- a/lib/ic/c_src/oe_ei_encode_ref.c
+++ b/lib/ic/c_src/oe_ei_encode_ref.c
@@ -23,7 +23,7 @@
 int oe_ei_encode_ref(CORBA_Environment *ev, const erlang_ref *p) {
   int size = ev->_iout;
   
-  (int) ei_encode_ref(NULL, &size, p);
+  ei_encode_ref(NULL, &size, p);
   
   if (size >= ev->_outbufsz) {
     char *buf = ev->_outbuf;
diff --git a/lib/ic/c_src/oe_ei_encode_string.c b/lib/ic/c_src/oe_ei_encode_string.c
index 48de73b5a8..a52a2e639d 100644
--- a/lib/ic/c_src/oe_ei_encode_string.c
+++ b/lib/ic/c_src/oe_ei_encode_string.c
@@ -23,7 +23,7 @@
 int oe_ei_encode_string(CORBA_Environment *ev, const char *p) {
   int size = ev->_iout;
   
-  (int) ei_encode_string(0,&size,p);
+  ei_encode_string(0,&size,p);
 
   if (size >= ev->_outbufsz) {
     char *buf = ev->_outbuf;
diff --git a/lib/ic/c_src/oe_ei_encode_term.c b/lib/ic/c_src/oe_ei_encode_term.c
index 48de152ac6..b1f1375638 100644
--- a/lib/ic/c_src/oe_ei_encode_term.c
+++ b/lib/ic/c_src/oe_ei_encode_term.c
@@ -23,7 +23,7 @@
 int oe_ei_encode_term(CORBA_Environment *ev, void *t) {
   int size = ev->_iout;
   
-  (int) ei_encode_term(NULL, &size, t);
+  ei_encode_term(NULL, &size, t);
   
   if (size >= ev->_outbufsz) {
     char *buf = ev->_outbuf;
diff --git a/lib/ic/doc/src/CORBA_Environment_alloc.xml b/lib/ic/doc/src/CORBA_Environment_alloc.xml
index 909379d6dc..ee76739a10 100644
--- a/lib/ic/doc/src/CORBA_Environment_alloc.xml
+++ b/lib/ic/doc/src/CORBA_Environment_alloc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/book.xml b/lib/ic/doc/src/book.xml
index f83bb1c632..066c1d8150 100644
--- a/lib/ic/doc/src/book.xml
+++ b/lib/ic/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/c-part.xml b/lib/ic/doc/src/c-part.xml
index cef4399960..967f17858b 100644
--- a/lib/ic/doc/src/c-part.xml
+++ b/lib/ic/doc/src/c-part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_basic_idl.xml b/lib/ic/doc/src/ch_basic_idl.xml
index d993fa3594..986052bf16 100644
--- a/lib/ic/doc/src/ch_basic_idl.xml
+++ b/lib/ic/doc/src/ch_basic_idl.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_c_client.xml b/lib/ic/doc/src/ch_c_client.xml
index 7d4f8ec91a..bbdf502b32 100644
--- a/lib/ic/doc/src/ch_c_client.xml
+++ b/lib/ic/doc/src/ch_c_client.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_c_corba_env.xml b/lib/ic/doc/src/ch_c_corba_env.xml
index bd4b52ca34..69ce0e5e0e 100644
--- a/lib/ic/doc/src/ch_c_corba_env.xml
+++ b/lib/ic/doc/src/ch_c_corba_env.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_c_mapping.xml b/lib/ic/doc/src/ch_c_mapping.xml
index 23a9361c2c..59ab4d9817 100644
--- a/lib/ic/doc/src/ch_c_mapping.xml
+++ b/lib/ic/doc/src/ch_c_mapping.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2010</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_c_server.xml b/lib/ic/doc/src/ch_c_server.xml
index c66ae85fa3..8c64b87dcc 100644
--- a/lib/ic/doc/src/ch_c_server.xml
+++ b/lib/ic/doc/src/ch_c_server.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_erl_genserv.xml b/lib/ic/doc/src/ch_erl_genserv.xml
index 055b751ba1..34de3d64dd 100644
--- a/lib/ic/doc/src/ch_erl_genserv.xml
+++ b/lib/ic/doc/src/ch_erl_genserv.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_erl_plain.xml b/lib/ic/doc/src/ch_erl_plain.xml
index 1d6f84b5ea..0744cb99d1 100644
--- a/lib/ic/doc/src/ch_erl_plain.xml
+++ b/lib/ic/doc/src/ch_erl_plain.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_ic_protocol.xml b/lib/ic/doc/src/ch_ic_protocol.xml
index 68a01a6a46..465e397880 100644
--- a/lib/ic/doc/src/ch_ic_protocol.xml
+++ b/lib/ic/doc/src/ch_ic_protocol.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_introduction.xml b/lib/ic/doc/src/ch_introduction.xml
index 898d2a732a..f2ed61c4ed 100644
--- a/lib/ic/doc/src/ch_introduction.xml
+++ b/lib/ic/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ch_java.xml b/lib/ic/doc/src/ch_java.xml
index a189daa44b..4ee61ddf19 100644
--- a/lib/ic/doc/src/ch_java.xml
+++ b/lib/ic/doc/src/ch_java.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/erl-part.xml b/lib/ic/doc/src/erl-part.xml
index 8dd7001436..470f936ae4 100644
--- a/lib/ic/doc/src/erl-part.xml
+++ b/lib/ic/doc/src/erl-part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/fascicules.xml b/lib/ic/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/ic/doc/src/fascicules.xml
+++ b/lib/ic/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/ic/doc/src/ic.xml b/lib/ic/doc/src/ic.xml
index b743736a66..b11206257f 100644
--- a/lib/ic/doc/src/ic.xml
+++ b/lib/ic/doc/src/ic.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ic_c_protocol.xml b/lib/ic/doc/src/ic_c_protocol.xml
index 26862addf9..460fcdec0d 100644
--- a/lib/ic/doc/src/ic_c_protocol.xml
+++ b/lib/ic/doc/src/ic_c_protocol.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ic_clib.xml b/lib/ic/doc/src/ic_clib.xml
index ebeaabae91..8ac783e5b2 100644
--- a/lib/ic/doc/src/ic_clib.xml
+++ b/lib/ic/doc/src/ic_clib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cref SYSTEM "cref.dtd">
 
 <cref>
   <header>
     <copyright>
-      <year>2003</year><year>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/java-part.xml b/lib/ic/doc/src/java-part.xml
index ab4049ee2a..69a8e4b55b 100644
--- a/lib/ic/doc/src/java-part.xml
+++ b/lib/ic/doc/src/java-part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index c93528ace4..9ae464e028 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,7 +30,47 @@
     <file>notes.xml</file>
   </header>
 
-   <section><title>IC 4.3.2</title>
+   <section><title>IC 4.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix two small silent rules omissions. Thanks to Anthony
+	    Ramine.</p>
+          <p>
+	    Own Id: OTP-11351</p>
+        </item>
+        <item>
+          <p>
+	    Silence warnings (Thanks to Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11517</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>IC 4.3.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Header and library files from ic and erl_interface are
+	    now installed into usr/{include,lib}. Note that these
+	    directories are unversioned, so the latest installed
+	    version will be the one in the directory.</p>
+          <p>
+	    Own Id: OTP-11284</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>IC 4.3.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/ic/doc/src/part.xml b/lib/ic/doc/src/part.xml
index 376a0b3455..891fc8a7e2 100644
--- a/lib/ic/doc/src/part.xml
+++ b/lib/ic/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/part_notes.xml b/lib/ic/doc/src/part_notes.xml
index 0aac643c7d..e8ddbd3879 100644
--- a/lib/ic/doc/src/part_notes.xml
+++ b/lib/ic/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/doc/src/ref_man.xml b/lib/ic/doc/src/ref_man.xml
index 153b25c609..a43750d495 100644
--- a/lib/ic/doc/src/ref_man.xml
+++ b/lib/ic/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ic/test/Makefile b/lib/ic/test/Makefile
index 54ac186c16..63af6ed9f1 100644
--- a/lib/ic/test/Makefile
+++ b/lib/ic/test/Makefile
@@ -33,7 +33,7 @@ RELSYSDIR = $(RELEASE_PATH)/ic_test
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
-TEST_SPEC_FILE = ic.spec
+TEST_SPEC_FILE = ic.spec ic_smoke.spec
 
 
 IDL_FILES = 
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
index f3e6fdb67e..8073e3c97d 100644
--- a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src
@@ -37,11 +37,11 @@
 ERL_INCLUDE = @erl_include@
 
 IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_libpath@@DS@@ic_lib@
+IC_LIB = @ic_lib@
 
 ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_LIB = @erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_eilib@
 ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
 ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
 
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
index 0818be01a6..bd8b2a0972 100644
--- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src
@@ -37,11 +37,11 @@
 ERL_INCLUDE = @erl_include@
 
 IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_libpath@@DS@@ic_lib@
+IC_LIB = @ic_lib@
 
 ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_LIB = @erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_eilib@
 ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
 ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
 
diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
index 07b353bc0a..746991b17f 100644
--- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
+++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src
@@ -37,11 +37,11 @@
 ERL_INCLUDE = @erl_include@
 
 IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_libpath@@DS@@ic_lib@
+IC_LIB = @ic_lib@
 
 ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_LIB = @erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_eilib@
 ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
 ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
 
diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
index e190295d70..997d7a4cdc 100644
--- a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
+++ b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src
@@ -37,11 +37,11 @@
 ERL_INCLUDE = @erl_include@
 
 IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_libpath@@DS@@ic_lib@
+IC_LIB = @ic_lib@
 
 ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_LIB = @erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_eilib@
 ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
 ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
 
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
index 86917950c9..1213944383 100644
--- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
+++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src
@@ -37,11 +37,11 @@
 ERL_INCLUDE = @erl_include@
 
 IC_INCLUDE_PATH = @ic_include_path@
-IC_LIB = @ic_libpath@@DS@@ic_lib@
+IC_LIB = @ic_lib@
 
 ERL_INTERFACE_INCLUDE = @erl_interface_include@
-ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@
-ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@
+ERL_INTERFACE_LIB = @erl_interface_lib@
+ERL_INTERFACE_EILIB = @erl_interface_eilib@
 ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@
 ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@
 
diff --git a/lib/ic/test/ic_smoke.spec b/lib/ic/test/ic_smoke.spec
new file mode 100644
index 0000000000..ec3b5758b1
--- /dev/null
+++ b/lib/ic/test/ic_smoke.spec
@@ -0,0 +1 @@
+{suites,"../ic_test",[ic_SUITE]}.
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index 53b81ad731..fe27d095d3 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1 +1 @@
-IC_VSN = 4.3.2
+IC_VSN = 4.3.4
diff --git a/lib/inets/doc/src/book.xml b/lib/inets/doc/src/book.xml
index 51cbb2d963..eca0c319ef 100644
--- a/lib/inets/doc/src/book.xml
+++ b/lib/inets/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/fascicules.xml b/lib/inets/doc/src/fascicules.xml
index ea3b988882..c075478967 100644
--- a/lib/inets/doc/src/fascicules.xml
+++ b/lib/inets/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/inets/doc/src/ftp.xml b/lib/inets/doc/src/ftp.xml
index f8f11ec705..0cd75ff645 100644
--- a/lib/inets/doc/src/ftp.xml
+++ b/lib/inets/doc/src/ftp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -547,15 +547,14 @@
 	<v>Opts = options()</v>
 	<v>options() = [option()]</v>
 	<v>option() = start_option() | open_option()</v>
-	<!-- <v>start_options() = [start_option()]</v> -->
 	<v>start_option() = {verbose, verbose()} | {debug, debug()}</v>
 	<v>verbose() = boolean() (defaults to false)</v>
 	<v>debug() = disable | debug | trace (defaults to disable)</v>
-	<!-- <v>open_options() = [open_option()]</v> -->
-	<v>open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {timeout, timeout()} | {dtimeout, dtimeout()} | {progress, progress()}</v>
+	<v>open_option() = {ipfamily, ipfamily()} | {port, port()} | {mode, mode()} | {tls, tls_options()} | {timeout, timeout()} | {dtimeout, dtimeout()} | {progress, progress()}</v>
 	<v>ipfamily() = inet | inet6 | inet6fb4 (defaults to inet)</v>
 	<v>port() = integer() > 0 (defaults to 21)</v>
 	<v>mode() = active | passive (defaults to passive)</v>
+	<v>tls_options() = [<seealso marker="ssl:ssl#type-ssloption">ssl:ssloption()</seealso>]</v>
 	<v>timeout() = integer() > 0 (defaults to 60000 milliseconds)</v>
 	<v>dtimeout() = integer() > 0 | infinity (defaults to infinity)</v>
 	<v>pogress() = ignore | {module(), function(), initial_data()} (defaults to ignore)</v>
@@ -570,6 +569,10 @@
           (without the inets service framework) and 
           open a session with the FTP server at <c>Host</c>. </p>
 
+	<p>If the option <c>{tls, tls_options()}</c> is present, the ftp session will be transported over tls (ftps, see 
+<url href="http://www.ietf.org/rfc/rfc4217.txt">RFC 4217</url>). The list <c>tls_options()</c> may be empty. The function <seealso marker="ssl:ssl#connect/3"><c>ssl:connect/3</c></seealso> is used for securing both the control connection and the data sessions.
+	</p>
+
         <p>A session opened in this way, is closed using the 
           <seealso marker="#close">close</seealso> function. </p>
 
@@ -815,8 +818,7 @@
         <p>Sets the file transfer type to <c>ascii</c> or <c>binary</c>. When
           an ftp session is opened, the default transfer type of the
           server is used, most often <c>ascii</c>, which is the default
-          according to RFC 959.</p>
-
+          according to <url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>.</p>
        <marker id="user3"></marker>
       </desc>
     </func>
@@ -943,7 +945,7 @@
   <section>
     <title>SEE ALSO</title>
     <p>file, filename, J. Postel and J. Reynolds: File Transfer Protocol
-      (RFC 959).
+      (<url href="http://www.ietf.org/rfc/rfc959.txt">RFC 959</url>).
       </p>
   </section>
   
diff --git a/lib/inets/doc/src/ftp_client.xml b/lib/inets/doc/src/ftp_client.xml
index b44674d997..e46b354e45 100644
--- a/lib/inets/doc/src/ftp_client.xml
+++ b/lib/inets/doc/src/ftp_client.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/http_client.xml b/lib/inets/doc/src/http_client.xml
index 4542211d71..1c7f76ec28 100644
--- a/lib/inets/doc/src/http_client.xml
+++ b/lib/inets/doc/src/http_client.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/http_server.xml b/lib/inets/doc/src/http_server.xml
index f29b505bc7..e3b763b4f3 100644
--- a/lib/inets/doc/src/http_server.xml
+++ b/lib/inets/doc/src/http_server.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/http_uri.xml b/lib/inets/doc/src/http_uri.xml
index d9e8587bbf..e64c375bba 100644
--- a/lib/inets/doc/src/http_uri.xml
+++ b/lib/inets/doc/src/http_uri.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 741f2abaef..37eb7ba718 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -300,11 +300,11 @@ filename()       = string()
 	    process or to a file. When streaming to the calling process 
 	    using the option <c>self</c> the following stream messages
 	    will be sent to that process: <c>{http, {RequestId,
-	    stream_start, Headers}, {http, {RequestId, stream,
-	    BinBodyPart}, {http, {RequestId, stream_end, Headers}</c>. When
+	    stream_start, Headers}}, {http, {RequestId, stream,
+	    BinBodyPart}}, {http, {RequestId, stream_end, Headers}}</c>. When
 	    streaming to to the calling processes using the option
 	    <c>{self, once}</c> the first message will have an additional
-	    element e.i. <c>{http, {RequestId, stream_start, Headers, Pid}</c>,
+	    element e.i. <c>{http, {RequestId, stream_start, Headers, Pid}}</c>,
 	    this is the process id that should be used as an argument to
 	    <c>http:stream_next/1</c> to trigger the next message to be sent to
 	    the calling process. </p>
@@ -387,7 +387,7 @@ Receiver(ReplyInfo)
 </pre>
   	      </item>
 
-              <tag><c><![CDATA[{Module, Funcion, Args}]]></c></tag>
+              <tag><c><![CDATA[{Module, Function, Args}]]></c></tag>
               <item>
 	        <p>Information will be delivered to the receiver via calls 
 		to the callback function: </p>
@@ -440,7 +440,10 @@ apply(Module, Function, [ReplyInfo | Args])
 	<v>Profile = profile() | pid() (when started <c>stand_alone</c>)</v>
       </type>
       <desc>
-        <p>Cancels an asynchronous HTTP-request. </p>
+        <p>Cancels an asynchronous HTTP-request. Note this does not guarantee
+	that the request response will not be delivered, as it is asynchronous the
+	the request may already have been completed when the cancellation arrives.
+	</p>
 
         <marker id="set_options"></marker>
       </desc>
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index 8438961511..3830b2e5ab 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -251,14 +251,14 @@
       </item>
       
       <marker id="prop_max_uri"></marker>
-      <tag>{max_uri, integer()}</tag>
+      <tag>{max_uri_size, integer()}</tag>
       <item>
 	<p>Limits the size of the HTTP request URI. By
 	default there is no limit. </p>
       </item>
       
       <marker id="prop_max_keep_alive_req"></marker>
-      <tag>{max_keep_alive_requests, integer()}</tag>
+      <tag>{max_keep_alive_request, integer()}</tag>
       <item>
 	<p>The number of request that a client can do on one
 	connection. When the server has responded to the number of
@@ -406,7 +406,7 @@ bytes
 	begins with url-path is mapped to local files that begins with
 	directory-filename, for example:
 	
-	<code>{alias, {"/image", "/ftp/pub/image"}</code>
+	<code>{alias, {"/image", "/ftp/pub/image"}}</code>
 	
 	and an access to http://your.server.org/image/foo.gif would refer to
 	the file /ftp/pub/image/foo.gif. </p>
@@ -421,7 +421,7 @@ bytes
         by re:replace/3 to produce a path in the local filesystem.
         For example:
 	
-	<code>{re_write, {"^/[~]([^/]+)(.*)$", "/home/\\1/public\\2"}</code>
+	<code>{re_write, {"^/[~]([^/]+)(.*)$", "/home/\\1/public\\2"}}</code>
 	
 	and an access to http://your.server.org/~bob/foo.gif would refer to
 	the file /home/bob/public/foo.gif.
@@ -468,7 +468,7 @@ bytes
 	scripts. URLs with a path beginning with url-path are mapped to
 	scripts beginning with directory-filename, for example:
 	
-	<code>{script_alias, {"/cgi-bin/", "/web/cgi-bin/"}</code>
+	<code>{script_alias, {"/cgi-bin/", "/web/cgi-bin/"}}</code>
 	
 	and an access to http://your.server.org/cgi-bin/foo would cause
 	the server to run the script /web/cgi-bin/foo. </p>
@@ -483,7 +483,7 @@ bytes
 	scripts. URLs with a path beginning with url-path are mapped to
 	scripts beginning with directory-filename, for example:
 	
-	<code>{script_re_write, {"^/cgi-bin/(\\d+)/", "/web/\\1/cgi-bin/"}</code>
+	<code>{script_re_write, {"^/cgi-bin/(\\d+)/", "/web/\\1/cgi-bin/"}}</code>
 	
 	and an access to http://your.server.org/cgi-bin/17/foo would cause
 	the server to run the script /web/17/cgi-bin/foo. </p>
@@ -517,7 +517,7 @@ bytes
 	the standard CGI PATH_INFO and PATH_TRANSLATED environment
 	variables.
 
-	<code>{action, {"text/plain", "/cgi-bin/log_and_deliver_text"}</code>
+	<code>{action, {"text/plain", "/cgi-bin/log_and_deliver_text"}}</code>
 	</p>
       </item>
 
@@ -532,7 +532,7 @@ bytes
 	the standard CGI PATH_INFO and PATH_TRANSLATED environment
 	variables.
 	
-	<code>{script, {"PUT", "/cgi-bin/put"}</code>
+	<code>{script, {"PUT", "/cgi-bin/put"}}</code>
 	</p>
 	
       </item>
@@ -549,7 +549,7 @@ bytes
 	scheme scripts. A matching URL is mapped into a specific module
 	and function. For example:
 	
-	<code>{erl_script_alias, {"/cgi-bin/example", [httpd_example]}
+	<code>{erl_script_alias, {"/cgi-bin/example", [httpd_example]}}
 	</code>
 	
 	and a request to
@@ -632,7 +632,7 @@ bytes
       </item>
 
       <marker id="prop_edlog"></marker>
-      <tag>{error_disk_log, internal | external}</tag>
+      <tag>{error_disk_log, path()}</tag>
       <item>
 	<p>Defines the filename of the (disk_log(3)) error log file
 	to be used to log server errors. If the filename does not begin
@@ -706,7 +706,7 @@ bytes
 	
 	For example:
 	
-	<code>{allow_from, ["123.34.56.11", "150.100.23"] </code>
+	<code>{allow_from, ["123.34.56.11", "150.100.23"]}</code>
           
 	The host 123.34.56.11 and all machines on the 150.100.23
 	subnet are allowed access. </p>
@@ -719,7 +719,7 @@ bytes
 	which should be denied access to a given directory.
 	For example:
 	
-	<code>{deny_from, ["123.34.56.11", "150.100.23"] </code>
+	<code>{deny_from, ["123.34.56.11", "150.100.23"]}</code>
           
 	The host 123.34.56.11 and all machines on the 150.100.23
 	subnet are not allowed access. </p>
@@ -835,7 +835,7 @@ bytes
     <p><em>Security properties - requires mod_security </em></p>
  
     <marker id="prop_sec_dir"></marker>
-    <p><em>{security_directory, {path(), [{property(), term()}]}</em></p>
+    <p><em>{security_directory, {path(), [{property(), term()}]}}</em></p>
        
     <marker id="props_sdir"></marker>
     <p>Here follows the valid properties for security directories</p>
@@ -1067,7 +1067,7 @@ bytes
       <fsummary>Called for each request to the Web server.</fsummary>
       <type>
         <v>OldData = list()</v>
-        <v>NewData = [{response,{StatusCode,Body}}] | [{response,{response,Head,Body}}] |  [{response,{already_sent,Statuscode,Size}] </v>
+        <v>NewData = [{response,{StatusCode,Body}}] | [{response,{response,Head,Body}}] |  [{response,{already_sent,Statuscode,Size}}] </v>
         <v>StausCode = integer()</v>
         <v>Body = io_list() | nobody | {Fun, Arg}</v>
         <v>Head = [HeaderOption]</v>
diff --git a/lib/inets/doc/src/httpd_conf.xml b/lib/inets/doc/src/httpd_conf.xml
index fc34f14ec3..3ef03966a7 100644
--- a/lib/inets/doc/src/httpd_conf.xml
+++ b/lib/inets/doc/src/httpd_conf.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/httpd_socket.xml b/lib/inets/doc/src/httpd_socket.xml
index 58cd2ec575..70b4a4a842 100644
--- a/lib/inets/doc/src/httpd_socket.xml
+++ b/lib/inets/doc/src/httpd_socket.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/httpd_util.xml b/lib/inets/doc/src/httpd_util.xml
index 9f290084d2..1236576ca8 100644
--- a/lib/inets/doc/src/httpd_util.xml
+++ b/lib/inets/doc/src/httpd_util.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -337,10 +337,10 @@
 
     <func>
       <name>rfc1123_date() -> RFC1123Date</name>
-      <name>rfc1123_date({{YYYY,MM,DD},{Hour,Min,Sec}}}) -> RFC1123Date</name>
+      <name>rfc1123_date({{YYYY,MM,DD},{Hour,Min,Sec}}) -> RFC1123Date</name>
       <fsummary>Return the current date in RFC 1123 format.</fsummary>
       <type>
-        <v>YYYY = MM = DD = Hour = Min =Sec = integer()</v>
+        <v>YYYY = MM = DD = Hour = Min = Sec = integer()</v>
         <v>RFC1123Date = string()</v>
       </type>
       <desc>
diff --git a/lib/inets/doc/src/inets.xml b/lib/inets/doc/src/inets.xml
index 079f60779d..8c3a677966 100644
--- a/lib/inets/doc/src/inets.xml
+++ b/lib/inets/doc/src/inets.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2011</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/inets_services.xml b/lib/inets/doc/src/inets_services.xml
index e282050b12..8cd0794ff2 100644
--- a/lib/inets/doc/src/inets_services.xml
+++ b/lib/inets/doc/src/inets_services.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/mod_alias.xml b/lib/inets/doc/src/mod_alias.xml
index 265a1b8e76..e4c78a5b15 100644
--- a/lib/inets/doc/src/mod_alias.xml
+++ b/lib/inets/doc/src/mod_alias.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -118,7 +118,7 @@
     </func>
 
     <func>
-      <name>real_script_name(ConfigDB,RequestURI,ScriptAliases) -> Ret</name>
+      <name>real_script_name(ConfigDB, RequestURI, ScriptAliases) -> Ret</name>
       <fsummary>Expand a request uri using ScriptAlias config directives.</fsummary>
       <type>
         <v>ConfigDB = config_db()</v>
@@ -129,7 +129,7 @@
       </type>
       <desc>
         <marker id="real_script_name"></marker>
-        <p><c>real_name/3</c> traverses <c>ScriptAliases</c>,
+        <p><c>real_script_name/3</c> traverses <c>ScriptAliases</c>,
 	typically extracted from <c>ConfigDB</c>, and matches each
 	<c>FakeName</c> with <c>RequestURI</c>. If a match is found
 	<c>FakeName</c> is replaced with <c>RealName</c> in the
diff --git a/lib/inets/doc/src/mod_auth.xml b/lib/inets/doc/src/mod_auth.xml
index a176242a72..e941b799a1 100644
--- a/lib/inets/doc/src/mod_auth.xml
+++ b/lib/inets/doc/src/mod_auth.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/mod_esi.xml b/lib/inets/doc/src/mod_esi.xml
index 9906ae0895..5afe5835c7 100644
--- a/lib/inets/doc/src/mod_esi.xml
+++ b/lib/inets/doc/src/mod_esi.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/mod_security.xml b/lib/inets/doc/src/mod_security.xml
index a3c91dca5b..e67111a73d 100644
--- a/lib/inets/doc/src/mod_security.xml
+++ b/lib/inets/doc/src/mod_security.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 72d67ddb4a..f77214c589 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -32,8 +32,123 @@
     <file>notes.xml</file>
   </header>
   
-  
-  <section><title>Inets 5.9.5</title>
+  <section><title>Inets 5.9.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Mend max_clients check that was broken and avoid too
+	    extensive logging that could cause memory problems.</p>
+          <p>
+	    Own Id: OTP-11557 Aux Id: seq12478 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 5.9.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix httpd config option 'script_timeout' and fixed httpd
+	    config option 'keep_alive_timeout'. Thanks to Johannes
+	    Weissl.</p>
+          <p>
+	    Own Id: OTP-11276</p>
+        </item>
+        <item>
+          <p>
+	    Make httpc:request_cancel/[1,2] asynchronous. Previously
+	    these functions tried to guarantee request answer would
+	    not reach the client, which only worked for some of the
+	    use cases. Now these functions are totally asynchronous
+	    which makes it the clients responsibility to disregard
+	    possible answers to canceled requests. </p>
+          <p>
+	    Also pipelining implementation has been changed to
+	    improve the utilization factor. Further investigation of
+	    possible enhancements in this area are planned for later.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-11312</p>
+        </item>
+        <item>
+          <p>
+	    [httpd] Add handling of new response for mod_head
+	    (otherwise causing case_clause crash). Also updated
+	    logging: Removed logging for keep-alive connections
+	    timeout (this is a normal occurrence and not an error)
+	    and some access-log body size corrections.</p>
+          <p>
+	    Own Id: OTP-11328</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The ftp client now supports ftp over tls (ftps).</p>
+          <p>
+	    Own Id: OTP-11037</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 5.9.6</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    httpc: Allow content body in DELETE requests. Thanks to
+	    James Wheare.</p>
+          <p>
+	    Own Id: OTP-11190</p>
+        </item>
+        <item>
+          <p>
+	    Add missing brackets to report formatting on ftp_progress
+	    process exit. Thanks to Artur Wilniewczyc.</p>
+          <p>
+	    Own Id: OTP-11202</p>
+        </item>
+        <item>
+          <p>
+	    Fix some errors in the inets documentation. Thanks to
+	    Johannes Weissl.</p>
+          <p>
+	    Own Id: OTP-11210</p>
+        </item>
+        <item>
+          <p>
+	    Fix various typos in httpd, inets. Thanks to Tomohiko
+	    Aono.</p>
+          <p>
+	    Own Id: OTP-11226</p>
+        </item>
+        <item>
+          <p>
+	    Fix httpd config option 'erl_script_nocache'. Thanks to
+	    Johannes Weissl.</p>
+          <p>
+	    Own Id: OTP-11260</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 5.9.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -46,8 +161,6 @@
         </item>
       </list>
     </section>
-
-
     <section><title>Improvements and New Features</title>
       <list>
         <item>
@@ -93,7 +206,6 @@
 </section>
 
 <section><title>Inets 5.9.4</title>
-
     <section><title>Improvements and New Features</title>
       <list>
         <item>
@@ -160,6 +272,32 @@
     </section>
 
 </section>
+<section><title>Inets 5.9.2.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Make log_alert configurable as option in ssl, SSLLogLevel
+	    added as option to inets conf file</p>
+          <p>
+	    Own Id: OTP-11259</p>
+	</item>
+      </list>
+    </section>
+</section>
+<section><title>Inets 5.9.2.1</title>
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed obsolete error report in inets.</p>
+	  <p>
+	    Own Id: OTP-11185 Aux Id: seq12357 </p>
+	</item>
+      </list>
+    </section>
+</section>
 
 <section><title>Inets 5.9.2</title>
 
@@ -594,7 +732,7 @@
           <p>[httpd] Fix httpd directory traversal on Windows. 
           Directory traversal was possible on Windows where
           backward slash is used as directory separator. </p>
-          <p>Andr�s Veres-Szentkir�lyi.</p>
+          <p>András Veres-Szentkirályi.</p>
           <p>Own Id: OTP-9561</p>
         </item>
 
@@ -702,7 +840,7 @@
 
         <item>
           <p>[httpd] Improved error messages. </p>
-	  <p>Ricardo Catalinas Jim�nez</p>
+	  <p>Ricardo Catalinas Jiménez</p>
           <p>Own Id: OTP-9157</p>
         </item>
 
diff --git a/lib/inets/doc/src/notes_history.xml b/lib/inets/doc/src/notes_history.xml
index bd59c1ba47..2903b753a1 100644
--- a/lib/inets/doc/src/notes_history.xml
+++ b/lib/inets/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -834,7 +834,7 @@
     <list type="bulleted">
       <item>
 	<p>[ftp, client] - A new option {progress, {CBmodule,
-	  CBFunction, InitProgressTerm} has been added to allow
+	  CBFunction, InitProgressTerm}} has been added to allow
 	  users to create things such as progress bars in there
 	  GUI's. The option affects ftp:send/[3,4] and
 	  ftp:recv/[3,4].</p>
diff --git a/lib/inets/doc/src/part.xml b/lib/inets/doc/src/part.xml
index 3b6734a9b8..6ebca1f87f 100644
--- a/lib/inets/doc/src/part.xml
+++ b/lib/inets/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/part_notes.xml b/lib/inets/doc/src/part_notes.xml
index 81b0dedbfa..35d645e299 100644
--- a/lib/inets/doc/src/part_notes.xml
+++ b/lib/inets/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2012</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/part_notes_history.xml b/lib/inets/doc/src/part_notes_history.xml
index f714a6d2e3..d699f5f60a 100644
--- a/lib/inets/doc/src/part_notes_history.xml
+++ b/lib/inets/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/ref_man.xml b/lib/inets/doc/src/ref_man.xml
index e44829827c..aaedf330b4 100644
--- a/lib/inets/doc/src/ref_man.xml
+++ b/lib/inets/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/doc/src/tftp.xml b/lib/inets/doc/src/tftp.xml
index 0b3e93a153..42a65ed0c5 100644
--- a/lib/inets/doc/src/tftp.xml
+++ b/lib/inets/doc/src/tftp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2012</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/inets/src/ftp/ftp.erl b/lib/inets/src/ftp/ftp.erl
index 7ca6bae38d..5674599ac5 100644
--- a/lib/inets/src/ftp/ftp.erl
+++ b/lib/inets/src/ftp/ftp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The 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 @@
 %%
 %%
 %% Description: This module implements an ftp client, RFC 959. 
-%% It also supports ipv6 RFC 2428.
+%% It also supports ipv6 RFC 2428 and starttls RFC 4217.
 
 -module(ftp).
 
@@ -39,7 +39,8 @@
 	 send_chunk_start/2, send_chunk/2, send_chunk_end/1, 
 	 type/2, user/3, user/4, account/2,
 	 append/3, append/2, append_bin/3,
-	 append_chunk/2, append_chunk_end/1, append_chunk_start/2, info/1]).
+	 append_chunk/2, append_chunk_end/1, append_chunk_start/2, 
+	 info/1, latest_ctrl_response/1]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, 
@@ -54,7 +55,7 @@
 
 -include("ftp_internal.hrl").
 
-%% Constante used in internal state definition
+%% Constants used in internal state definition
 -define(CONNECTION_TIMEOUT,  60*1000).
 -define(DATA_ACCEPT_TIMEOUT, infinity).
 -define(DEFAULT_MODE,        passive).
@@ -67,7 +68,8 @@
 %% Internal state
 -record(state, {
 	  csock   = undefined, % socket() - Control connection socket 
-	  dsock   = undefined, % socket() - Data connection socket 
+	  dsock   = undefined, % socket() - Data connection socket
+	  tls_options = undefined, % list()
 	  verbose = false,   % boolean() 
 	  ldir    = undefined,  % string() - Current local directory
 	  type    = ftp_server_default,  % atom() - binary | ascii 
@@ -83,6 +85,7 @@
 	  %% and hence the end of the response is reached!
 	  ctrl_data = {<<>>, [], start},  % {binary(), [bytes()], LineStatus}
 	  %% pid() - Client pid (note not the same as "From")
+	  latest_ctrl_response = "",
 	  owner = undefined,   
 	  client = undefined,  % "From" to be used in gen_server:reply/2
 	  %% Function that activated a connection and maybe some
@@ -90,7 +93,8 @@
 	  caller = undefined, % term()     
 	  ipfamily,     % inet | inet6 | inet6fb4
 	  progress = ignore,   % ignore | pid()	    
-	  dtimeout = ?DATA_ACCEPT_TIMEOUT  % non_neg_integer() | infinity
+	  dtimeout = ?DATA_ACCEPT_TIMEOUT,  % non_neg_integer() | infinity
+	  tls_upgrading_data_connection = false
 	 }).
 
 
@@ -99,6 +103,8 @@
 -type common_reason() ::  'econn' | 'eclosed' | term().
 -type file_write_error_reason() :: term(). % See file:write for more info
 
+-define(DBG(F,A), 'n/a').
+%%-define(DBG(F,A), io:format(F,A)).
 
 %%%=========================================================================
 %%%  API - CLIENT FUNCTIONS
@@ -154,8 +160,7 @@ open(Host, Opts) when is_list(Opts) ->
 	?fcrt("open", [{open_options, OpenOptions}]), 
 	case start_link(StartOptions, []) of
 	    {ok, Pid} ->
-		?fcrt("open - ok", [{pid, Pid}]), 
-		call(Pid, {open, ip_comm, OpenOptions}, plain);
+		do_open(Pid, OpenOptions, tls_options(Opts));
 	    Error1 ->
 		?fcrt("open - error", [{error1, Error1}]), 
 		Error1
@@ -166,7 +171,13 @@ open(Host, Opts) when is_list(Opts) ->
 	    Error2
     end.
 
-
+do_open(Pid, OpenOptions, TLSOpts) ->
+    case call(Pid, {open, ip_comm, OpenOptions}, plain) of
+	{ok, Pid} ->
+	    maybe_tls_upgrade(Pid, TLSOpts);
+	Error ->
+	    Error
+    end.
 %%--------------------------------------------------------------------------
 %% user(Pid, User, Pass, <Acc>) -> ok | {error, euser} | {error, econn} 
 %%                                    | {error, eacct}
@@ -839,6 +850,18 @@ info(Pid) ->
     call(Pid, info, list).
 
 
+%%--------------------------------------------------------------------------
+%% latest_ctrl_response(Pid) -> string()
+%%	Pid = pid()
+%%
+%% Description:  The latest received response from the server
+%%--------------------------------------------------------------------------
+
+-spec latest_ctrl_response(Pid :: pid()) -> string().
+
+latest_ctrl_response(Pid) ->
+    call(Pid, latest_ctrl_response, string).
+
 %%%========================================================================
 %%% Behavior callbacks
 %%%========================================================================
@@ -1000,6 +1023,10 @@ open_options(Options) ->
 	 {progress, ValidateProgress, false, ?PROGRESS_DEFAULT}], 
     validate_options(Options, ValidOptions, []).
 
+tls_options(Options) ->
+    %% Options will be validated by ssl application
+    proplists:get_value(tls, Options, undefined).
+
 validate_options([], [], Acc) ->
     ?fcrt("validate_options -> done", [{acc, Acc}]), 
     {ok, lists:reverse(Acc)};
@@ -1116,8 +1143,8 @@ handle_call({_, info}, _, #state{verbose  = Verbose,
 				 ipfamily = IpFamily,
 				 csock    = Socket,
 				 progress = Progress} = State) ->
-    {ok, {_, LocalPort}}  = inet:sockname(Socket),
-    {ok, {Address, Port}} = inet:peername(Socket),
+    {ok, {_, LocalPort}}  = sockname(Socket),
+    {ok, {Address, Port}} = peername(Socket),
     Options = [{verbose,    Verbose}, 
 	       {ipfamily,   IpFamily},
 	       {mode,       Mode}, 
@@ -1128,6 +1155,9 @@ handle_call({_, info}, _, #state{verbose  = Verbose,
 	       {progress,   Progress}],
     {reply, {ok, Options}, State};
 
+handle_call({_,latest_ctrl_response}, _, #state{latest_ctrl_response=Resp} = State) ->
+    {reply, {ok,Resp}, State};
+
 %% But everything else must come from the owner
 handle_call({Pid, _}, _, #state{owner = Owner} = State) when Owner =/= Pid ->
     {reply, {error, not_connection_owner}, State};
@@ -1186,6 +1216,11 @@ handle_call({_, {open, ip_comm, Host, Opts}}, From, State) ->
 	    {stop, normal, State2#state{client = undefined}}
     end;	
 
+handle_call({_, {open, tls_upgrade, TLSOptions}}, From, State) ->
+    send_ctrl_message(State, mk_cmd("AUTH TLS", [])), 
+    activate_ctrl_connection(State),
+    {noreply, State#state{client = From, caller = open, tls_options = TLSOptions}};
+
 handle_call({_, {user, User, Password}}, From, 
 	    #state{csock = CSock} = State) when (CSock =/= undefined) ->
     handle_user(User, Password, "", State#state{client = From});
@@ -1291,8 +1326,8 @@ handle_call({_,{recv_chunk_start, RemoteFile}}, From, #state{chunk = false}
 handle_call({_, recv_chunk}, _, #state{chunk = false} = State) ->
     {reply, {error, "ftp:recv_chunk_start/2 not called"}, State}; 
 
-handle_call({_, recv_chunk}, From, #state{chunk = true} = State) ->
-    activate_data_connection(State),
+handle_call({_, recv_chunk}, From, #state{chunk = true} = State0) ->
+    State = activate_data_connection(State0),
     {noreply, State#state{client = From, caller = recv_chunk}};
     
 handle_call({_, {send, LocalFile, RemoteFile}}, From, 
@@ -1394,71 +1429,77 @@ handle_info(timeout, State) ->
     {noreply, State};
 
 %%% Data socket messages %%%
-handle_info({tcp, Socket, Data}, 
-	    #state{dsock = Socket, 
-		   caller = {recv_file, Fd}} = State) ->    
+handle_info({Trpt, Socket, Data}, 
+	    #state{dsock = {Trpt,Socket},
+		   caller = {recv_file, Fd}} = State0) when Trpt==tcp;Trpt==ssl ->    
+    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State0]),
     file_write(binary_to_list(Data), Fd),
-    progress_report({binary, Data}, State),
-    activate_data_connection(State),
+    progress_report({binary, Data}, State0),
+    State = activate_data_connection(State0),
     {noreply, State};
 
-handle_info({tcp, Socket, Data}, #state{dsock = Socket, client = From,	
+handle_info({Trpt, Socket, Data}, #state{dsock = {Trpt,Socket}, client = From,	
 					caller = recv_chunk} 
-	    = State)  ->    
+	    = State) when Trpt==tcp;Trpt==ssl ->    
+    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State]),
     gen_server:reply(From, {ok, Data}),
     {noreply, State#state{client = undefined, data = <<>>}};
 
-handle_info({tcp, Socket, Data}, #state{dsock = Socket} = State) ->
-    activate_data_connection(State),
+handle_info({Trpt, Socket, Data}, #state{dsock = {Trpt,Socket}} = State0) when Trpt==tcp;Trpt==ssl ->
+    ?DBG('L~p --data ~p ----> ~s~p~n',[?LINE,Socket,Data,State0]),
+    State = activate_data_connection(State0),
     {noreply, State#state{data = <<(State#state.data)/binary,
 				  Data/binary>>}};
 
-handle_info({tcp_closed, Socket}, #state{dsock = Socket,
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket},
 					 caller = {recv_file, Fd}} 
-	    = State) ->
+	    = State) when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     file_close(Fd),
     progress_report({transfer_size, 0}, State),
     activate_ctrl_connection(State),
     {noreply, State#state{dsock = undefined, data = <<>>}};
 
-handle_info({tcp_closed, Socket}, #state{dsock = Socket, client = From,
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, client = From,
 					 caller = recv_chunk} 
-	    = State) ->
+	    = State) when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     gen_server:reply(From, ok),
     {noreply, State#state{dsock = undefined, client = undefined,
 			  data = <<>>, caller = undefined,
 			  chunk = false}};
 
-handle_info({tcp_closed, Socket}, #state{dsock = Socket, caller = recv_bin, 
-					 data = Data} = State) ->
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, caller = recv_bin, 
+					 data = Data} = State)
+  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     activate_ctrl_connection(State),
     {noreply, State#state{dsock = undefined, data = <<>>, 
 			  caller = {recv_bin, Data}}};
 
-handle_info({tcp_closed, Socket}, #state{dsock = Socket, data = Data,
+handle_info({Cls, Socket}, #state{dsock = {Trpt,Socket}, data = Data,
 					 caller = {handle_dir_result, Dir}} 
-	    = State) ->
+	    = State) when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->
     activate_ctrl_connection(State),
     {noreply, State#state{dsock = undefined, 
 			  caller = {handle_dir_result, Dir, Data},
 %			  data = <<?CR,?LF>>}};
 			  data = <<>>}};
-	    
-handle_info({tcp_error, Socket, Reason}, #state{dsock = Socket,
-						client = From} = State) ->
+
+handle_info({Err, Socket, Reason}, #state{dsock = {Trpt,Socket},
+					  client = From} = State) 
+  when {Err,Trpt}=={tcp_error,tcp} ; {Err,Trpt}=={ssl_error,ssl} ->
     gen_server:reply(From, {error, Reason}),
     close_data_connection(State),
     {noreply, State#state{dsock = undefined, client = undefined,
 			  data = <<>>, caller = undefined, chunk = false}};
 
 %%% Ctrl socket messages %%%
-handle_info({tcp, Socket, Data}, #state{csock = Socket, 
-					verbose = Verbose,
-					caller = Caller,
-					client = From,
-					ctrl_data = {CtrlData, AccLines, 
-						     LineStatus}} 
+handle_info({Transport, Socket, Data}, #state{csock = {Transport, Socket}, 
+					      verbose = Verbose,
+					      caller = Caller,
+					      client = From,
+					      ctrl_data = {CtrlData, AccLines, 
+							   LineStatus}} 
 	    = State) ->    
+    ?DBG('--ctrl ~p ----> ~s~p~n',[Socket,<<CtrlData/binary, Data/binary>>,State]),
     case ftp_response:parse_lines(<<CtrlData/binary, Data/binary>>, 
 				  AccLines, LineStatus) of
 	{ok, Lines, NextMsgData} ->
@@ -1469,27 +1510,32 @@ handle_info({tcp, Socket, Data}, #state{csock = Socket,
 		    gen_server:reply(From, string:tokens(Lines, [?CR, ?LF])),
 		    {noreply, State#state{client = undefined, 
 					  caller = undefined,
+					  latest_ctrl_response = Lines,
 					  ctrl_data = {NextMsgData, [], 
 						       start}}};
 		_ ->
+		    ?DBG('   ...handle_ctrl_result(~p,...) ctrl_data=~p~n',[CtrlResult,{NextMsgData, [], start}]),
 		    handle_ctrl_result(CtrlResult,
-				       State#state{ctrl_data = 
-						   {NextMsgData, [], start}})
+				       State#state{latest_ctrl_response = Lines,
+						   ctrl_data = 
+						       {NextMsgData, [], start}})
 	    end;
 	{continue, NewCtrlData} ->
+	    ?DBG('   ...Continue... ctrl_data=~p~n',[NewCtrlData]),
 	    activate_ctrl_connection(State),
 	    {noreply, State#state{ctrl_data = NewCtrlData}}
     end;
 
-handle_info({tcp_closed, Socket}, #state{csock = Socket}) ->  
-    %% If the server closes the control channel it is 
-    %% the expected behavior that connection process terminates.
+%% If the server closes the control channel it is 
+%% the expected behavior that connection process terminates.
+handle_info({Cls, Socket}, #state{csock = {Trpt, Socket}}) 
+  when {Cls,Trpt}=={tcp_closed,tcp} ; {Cls,Trpt}=={ssl_closed,ssl} ->  
     exit(normal); %% User will get error message from terminate/2
 
-handle_info({tcp_error, Socket, Reason}, _) ->
+handle_info({Err, Socket, Reason}, _) when Err==tcp_error ; Err==ssl_error ->
     Report = 
-	io_lib:format("tcp_error on socket: ~p  for reason: ~p~n",
-		      [Socket, Reason]),
+	io_lib:format("~p on socket: ~p  for reason: ~p~n",
+		      [Err, Socket, Reason]),
     error_logger:error_report(Report),
     %% If tcp does not work the only option is to terminate,
     %% this is the expected behavior under these circumstances.
@@ -1512,7 +1558,7 @@ handle_info({'DOWN', _Ref, _Type, Process, Reason}, State) ->
 
 handle_info({'EXIT', Pid, Reason}, #state{progress = Pid} = State) ->
     Report = io_lib:format("Progress reporting stopped for reason ~p~n",
-			   Reason),
+			   [Reason]),
     error_logger:info_report(Report),
     {noreply, State#state{progress = ignore}};
    
@@ -1520,8 +1566,8 @@ handle_info({'EXIT', Pid, Reason}, #state{progress = Pid} = State) ->
 %% so we do not want to crash, but we make a log entry as it is an
 %% unwanted behaviour.) 
 handle_info(Info, State) ->
-    Report = io_lib:format("ftp : ~p : Unexpected message: ~p\n", 
-			   [self(), Info]),
+    Report = io_lib:format("ftp : ~p : Unexpected message: ~p~nState: ~p~n",
+			   [self(), Info, State]),
     error_logger:info_report(Report),
     {noreply, State}.
 
@@ -1661,8 +1707,37 @@ handle_user_account(Acc, State) ->
 %%--------------------------------------------------------------------------
 %% handle_ctrl_result 
 %%--------------------------------------------------------------------------
-%%--------------------------------------------------------------------------
-%% Handling of control connection setup
+handle_ctrl_result({tls_upgrade, _}, #state{csock = {tcp, Socket},
+					    tls_options = TLSOptions,
+					    timeout = Timeout,
+					    caller = open, client = From} 
+		   = State0) ->
+    ?DBG('<--ctrl ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State0]),
+    case ssl:connect(Socket, TLSOptions, Timeout) of
+	{ok, TLSSocket} ->
+	    State = State0#state{csock = {ssl,TLSSocket}},
+	    send_ctrl_message(State, mk_cmd("PBSZ 0", [])),
+	    activate_ctrl_connection(State),
+	    {noreply, State#state{tls_upgrading_data_connection = {true, pbsz}} };
+	{error, _} = Error ->
+	    gen_server:reply(From,  {Error, self()}),
+	    {stop, normal, State0#state{client = undefined, 
+					caller = undefined,
+					tls_upgrading_data_connection = false}}
+    end;	
+
+handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, pbsz}} = State) ->
+    send_ctrl_message(State, mk_cmd("PROT P", [])),
+    activate_ctrl_connection(State),
+    {noreply, State#state{tls_upgrading_data_connection = {true, prot}}};
+
+handle_ctrl_result({pos_compl, _}, #state{tls_upgrading_data_connection = {true, prot},
+					  client = From} = State) ->
+    gen_server:reply(From,  {ok, self()}),
+    {noreply, State#state{client = undefined,
+			  caller = undefined,
+			  tls_upgrading_data_connection = false}};
+
 handle_ctrl_result({pos_compl, _}, #state{caller = open, client = From} 
 		   = State) ->
     gen_server:reply(From,  {ok, self()}),
@@ -1696,10 +1771,10 @@ handle_ctrl_result({pos_compl, Lines},
 			  timeout  = Timeout} 
 		   = State) ->
     [_, PortStr | _] =  lists:reverse(string:tokens(Lines, "|")),
-    {ok, {IP, _}} = inet:peername(CSock),
+    {ok, {IP, _}} = peername(CSock),
     case connect(IP, list_to_integer(PortStr), Timeout, State) of
 	{ok, _, Socket} ->	       
-	    handle_caller(State#state{caller = Caller, dsock = Socket});
+	    handle_caller(State#state{caller = Caller, dsock = {tcp, Socket}});
 	{error, _Reason} = Error ->
 	    gen_server:reply(From, Error),
 	    {noreply, State#state{client = undefined, caller = undefined}}
@@ -1709,7 +1784,7 @@ handle_ctrl_result({pos_compl, Lines},
 		   #state{mode     = passive, 
 			  ipfamily = inet,
 			  client   = From,
-			  caller   = {setup_data_connection, Caller}, 
+			  caller   = {setup_data_connection, Caller},
 			  timeout  = Timeout} = State) ->
     
     {_, [?LEFT_PAREN | Rest]} = 
@@ -1721,9 +1796,11 @@ handle_ctrl_result({pos_compl, Lines},
 		  string:tokens(NewPortAddr, [$,])),
     IP   = {A1, A2, A3, A4}, 
     Port = (P1 * 256) + P2, 
+
+    ?DBG('<--data tcp connect to ~p:~p, Caller=~p~n',[IP,Port,Caller]),
     case connect(IP, Port, Timeout, State) of
-	{ok, _, Socket} ->
-	    handle_caller(State#state{caller = Caller, dsock = Socket});
+	{ok, _, Socket}  ->
+	    handle_caller(State#state{caller = Caller, dsock = {tcp,Socket}});
 	{error, _Reason} = Error ->
 	    gen_server:reply(From, Error),
 	    {noreply,State#state{client = undefined, caller = undefined}}
@@ -1764,18 +1841,18 @@ handle_ctrl_result({pos_compl, Lines},
 
 %%--------------------------------------------------------------------------
 %% Directory listing 
-handle_ctrl_result({pos_prel, _}, #state{caller = {dir, Dir}} = State) ->
-    case accept_data_connection(State) of
-	{ok, NewState} ->
-	    activate_data_connection(NewState),
-	    {noreply, NewState#state{caller = {handle_dir_result, Dir}}};
+handle_ctrl_result({pos_prel, _}, #state{caller = {dir, Dir}} = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = activate_data_connection(State1),
+	    {noreply, State#state{caller = {handle_dir_result, Dir}}};
 	{error, _Reason} = ERROR ->
-	    case State#state.client of
+	    case State0#state.client of
 		undefined ->
-		    {stop, ERROR, State};
+		    {stop, ERROR, State0};
 		From ->
 		    gen_server:reply(From, ERROR),
-		    {stop, normal, State#state{client = undefined}}
+		    {stop, normal, State0#state{client = undefined}}
 	    end
     end;
 
@@ -1873,18 +1950,18 @@ handle_ctrl_result({Status, _},
 
 %%--------------------------------------------------------------------------
 %% File handling - recv_bin
-handle_ctrl_result({pos_prel, _}, #state{caller = recv_bin} = State) ->
-    case accept_data_connection(State) of
-	{ok, NewState} ->
-	    activate_data_connection(NewState),
-	    {noreply, NewState};
+handle_ctrl_result({pos_prel, _}, #state{caller = recv_bin} = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = activate_data_connection(State1),
+	    {noreply, State};
 	{error, _Reason} = ERROR ->
-	    case State#state.client of
+	    case State0#state.client of
 		undefined ->
-		    {stop, ERROR, State};
+		    {stop, ERROR, State0};
 		From ->
 		    gen_server:reply(From, ERROR),
-		    {stop, normal, State#state{client = undefined}}
+		    {stop, normal, State0#state{client = undefined}}
 	    end
     end;
 
@@ -1907,36 +1984,35 @@ handle_ctrl_result({Status, _}, #state{caller = {recv_bin, _}} = State) ->
 %% File handling - start_chunk_transfer
 handle_ctrl_result({pos_prel, _}, #state{client = From,
 					 caller = start_chunk_transfer}
-		   = State) ->
-    case accept_data_connection(State) of
-	{ok, NewState} ->
-	    gen_server:reply(From, ok),
-	    {noreply, NewState#state{chunk = true, client = undefined,
-				     caller = undefined}};
+		   = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = start_chunk(State1),
+	    {noreply, State};
 	{error, _Reason} = ERROR ->
-	    case State#state.client of
+	    case State0#state.client of
 		undefined ->
-		    {stop, ERROR, State};
+		    {stop, ERROR, State0};
 		From ->
 		    gen_server:reply(From, ERROR),
-		    {stop, normal, State#state{client = undefined}}
+		    {stop, normal, State0#state{client = undefined}}
 	    end
     end;
 
 %%--------------------------------------------------------------------------
 %% File handling - recv_file
-handle_ctrl_result({pos_prel, _}, #state{caller = {recv_file, _}} = State) ->
-    case accept_data_connection(State) of
-	{ok, NewState} ->
-	    activate_data_connection(NewState),
-	    {noreply, NewState};
+handle_ctrl_result({pos_prel, _}, #state{caller = {recv_file, _}} = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    State = activate_data_connection(State1),
+	    {noreply, State};
 	{error, _Reason} = ERROR ->
-	    case State#state.client of
+	    case State0#state.client of
 		undefined ->
-		    {stop, ERROR, State};
+		    {stop, ERROR, State0};
 		From ->
 		    gen_server:reply(From, ERROR),
-		    {stop, normal, State#state{client = undefined}}
+		    {stop, normal, State0#state{client = undefined}}
 	    end
     end;
 
@@ -1948,36 +2024,32 @@ handle_ctrl_result({Status, _}, #state{caller = {recv_file, Fd}} = State) ->
 %%--------------------------------------------------------------------------
 %% File handling - transfer_*
 handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_file, Fd}} 
-		   = State) ->
-    case accept_data_connection(State) of
-	{ok, NewState} ->
-	    send_file(Fd, NewState); 
+		   = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State1} ->
+	    send_file(State1, Fd); 
 	{error, _Reason} = ERROR ->
-	    case State#state.client of
+	    case State0#state.client of
 		undefined ->
-		    {stop, ERROR, State};
+		    {stop, ERROR, State0};
 		From ->
 		    gen_server:reply(From, ERROR),
-		    {stop, normal, State#state{client = undefined}}
+		    {stop, normal, State0#state{client = undefined}}
 	    end
     end;
 
 handle_ctrl_result({pos_prel, _}, #state{caller = {transfer_data, Bin}} 
-		   = State) ->
-    case accept_data_connection(State) of
-	{ok, NewState} ->
-	    send_data_message(NewState, Bin),
-	    close_data_connection(NewState),
-	    activate_ctrl_connection(NewState),
-	    {noreply, NewState#state{caller = transfer_data_second_phase,
-				     dsock = undefined}};
+		   = State0) ->
+    case accept_data_connection(State0) of
+	{ok, State} ->
+	    send_bin(State, Bin);
 	{error, _Reason} = ERROR ->
-	    case State#state.client of
+	    case State0#state.client of
 		undefined ->
-		    {stop, ERROR, State};
+		    {stop, ERROR, State0};
 		From ->
 		    gen_server:reply(From, ERROR),
-		    {stop, normal, State#state{client = undefined}}
+		    {stop, normal, State0#state{client = undefined}}
 	    end
     end;
 
@@ -2070,7 +2142,7 @@ setup_ctrl_connection(Host, Port, Timeout, State) ->
     MsTime = millisec_time(),
     case connect(Host, Port, Timeout, State) of
 	{ok, IpFam, CSock} ->
-	    NewState = State#state{csock = CSock, ipfamily = IpFam},
+	    NewState = State#state{csock = {tcp, CSock}, ipfamily = IpFam},
 	    activate_ctrl_connection(NewState),
 	    case Timeout - (millisec_time() - MsTime) of
 		Timeout2 when (Timeout2 >= 0) ->
@@ -2086,12 +2158,12 @@ setup_ctrl_connection(Host, Port, Timeout, State) ->
 setup_data_connection(#state{mode   = active, 
 			     caller = Caller, 
 			     csock  = CSock} = State) ->    
-    case (catch inet:sockname(CSock)) of
+    case (catch sockname(CSock)) of
 	{ok, {{_, _, _, _, _, _, _, _} = IP, _}} ->
 	    {ok, LSock} = 
 		gen_tcp:listen(0, [{ip, IP}, {active, false},
 				   inet6, binary, {packet, 0}]),
-	    {ok, Port} = inet:port(LSock),
+	    {ok, {_, Port}} = sockname({tcp,LSock}),
 	    IpAddress = inet_parse:ntoa(IP),
 	    Cmd = mk_cmd("EPRT |2|~s|~p|", [IpAddress, Port]),
 	    send_ctrl_message(State, Cmd),
@@ -2124,20 +2196,6 @@ setup_data_connection(#state{mode = passive, ipfamily = inet,
     activate_ctrl_connection(State),
     {noreply, State#state{caller = {setup_data_connection, Caller}}}.
 
-
-%% setup_data_connection(#state{mode = passive, ip_v6_disabled = false,
-%% 			     caller = Caller} = State) ->
-%%     send_ctrl_message(State, mk_cmd("EPSV", [])),
-%%     activate_ctrl_connection(State),
-%%     {noreply, State#state{caller = {setup_data_connection, Caller}}};
-
-%% setup_data_connection(#state{mode = passive, ip_v6_disabled = true,
-%% 			     caller = Caller} = State) ->
-%%     send_ctrl_message(State, mk_cmd("PASV", [])),
-%%     activate_ctrl_connection(State),
-%%     {noreply, State#state{caller = {setup_data_connection, Caller}}}.
-
-
 connect(Host, Port, Timeout, #state{ipfamily = inet = IpFam}) ->
     connect2(Host, Port, IpFam, Timeout);
 
@@ -2183,75 +2241,101 @@ connect2(Host, Port, IpFam, Timeout) ->
 
 accept_data_connection(#state{mode     = active,
 			      dtimeout = DTimeout, 
-			      dsock    = {lsock, LSock}} = State) ->
+			      tls_options = TLSOptions,
+			      dsock    = {lsock, LSock}} = State0) ->
     case gen_tcp:accept(LSock, DTimeout) of
+	{ok, Socket} when  is_list(TLSOptions) ->
+	    gen_tcp:close(LSock),
+	    ?DBG('<--data ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State0]),
+	    case ssl:connect(Socket, TLSOptions, DTimeout) of
+		{ok, TLSSocket} ->
+		    {ok, State0#state{dsock={ssl,TLSSocket}}};
+		{error, Reason} ->
+		    {error, {ssl_connect_failed, Reason}}
+	    end;
 	{ok, Socket} ->
 	    gen_tcp:close(LSock),
-	    {ok, State#state{dsock = Socket}};
+	    {ok, State0#state{dsock={tcp,Socket}}};
 	{error, Reason} ->
 	    {error, {data_connect_failed, Reason}}
     end;
 
+accept_data_connection(#state{mode = passive,
+			      dtimeout = DTimeout,
+			      dsock = {tcp,Socket},
+			      tls_options = TLSOptions} = State) when is_list(TLSOptions) ->
+    ?DBG('<--data ssl:connect(~p, ~p)~n~p~n',[Socket,TLSOptions,State]),
+    case ssl:connect(Socket, TLSOptions, DTimeout) of
+	{ok, TLSSocket} ->
+	    {ok, State#state{dsock={ssl,TLSSocket}}};
+	{error, Reason} ->
+	    {error, {ssl_connect_failed, Reason}}
+    end;
 accept_data_connection(#state{mode = passive} = State) ->
-    {ok, State}.
+    {ok,State}.
+    
 
-send_ctrl_message(#state{csock = Socket, verbose = Verbose}, Message) ->
-    %% io:format("send control message: ~n~p~n", [lists:flatten(Message)]),
+send_ctrl_message(_S=#state{csock = Socket, verbose = Verbose}, Message) ->
     verbose(lists:flatten(Message),Verbose,send),
+    ?DBG('<--ctrl ~p ---- ~s~p~n',[Socket,Message,_S]),
     send_message(Socket, Message).
 
-send_data_message(#state{dsock = Socket}, Message) ->
-    send_message(Socket, Message).
-
-send_message(Socket, Message) ->
-    case gen_tcp:send(Socket, Message) of
+send_data_message(_S=#state{dsock = Socket}, Message) ->
+    ?DBG('<==data ~p ==== ~s~n~p~n',[Socket,Message,_S]),
+    case send_message(Socket, Message) of
 	ok ->
 	    ok;
 	{error, Reason} ->
-	    Report = io_lib:format("gen_tcp:send/2 failed for "
-				   "reason ~p~n", [Reason]),
+	    Report = io_lib:format("send/2 for socket ~p failed with "
+				   "reason ~p~n", [Socket, Reason]),
 	    error_logger:error_report(Report),
-	    %% If tcp does not work the only option is to terminate,
+	    %% If tcp/ssl does not work the only option is to terminate,
 	    %% this is the expected behavior under these circumstances.
 	    exit(normal) %% User will get error message from terminate/2
     end.
 
+send_message({tcp, Socket}, Message) ->
+    gen_tcp:send(Socket, Message);
+send_message({ssl, Socket}, Message) ->
+    ssl:send(Socket, Message).
+
 activate_ctrl_connection(#state{csock = Socket, ctrl_data = {<<>>, _, _}}) ->
     activate_connection(Socket);
 activate_ctrl_connection(#state{csock = Socket}) ->
     %% We have already received at least part of the next control message,
     %% that has been saved in ctrl_data, process this first.
-    self() ! {tcp, Socket, <<>>}.
+    self() ! {tcp, unwrap_socket(Socket), <<>>}.
 
-activate_data_connection(#state{dsock = Socket}) ->
-    activate_connection(Socket).
+unwrap_socket({tcp,Socket}) -> Socket;
+unwrap_socket({ssl,Socket}) -> Socket;
+unwrap_socket(Socket) -> Socket.
+    
 
-activate_connection(Socket) ->
-    inet:setopts(Socket, [{active, once}]).
+activate_data_connection(#state{dsock = Socket} = State) ->
+    activate_connection(Socket),
+    State.
 
-close_ctrl_connection(#state{csock = undefined}) ->
-    ok;
-close_ctrl_connection(#state{csock = Socket}) ->
-    close_connection(Socket).
+activate_connection({tcp, Socket}) ->  inet:setopts(Socket, [{active, once}]);
+activate_connection({ssl, Socket}) ->  ssl:setopts(Socket, [{active, once}]).
 
-close_data_connection(#state{dsock = undefined}) ->
-    ok;
-close_data_connection(#state{dsock = {lsock, Socket}}) ->
-    close_connection(Socket);
-close_data_connection(#state{dsock = Socket}) ->
-    close_connection(Socket).
+close_ctrl_connection(#state{csock = undefined}) -> ok;
+close_ctrl_connection(#state{csock = Socket}) -> close_connection(Socket).
 
-close_connection(Socket) ->
-    gen_tcp:close(Socket).
+close_data_connection(#state{dsock = undefined}) -> ok;
+close_data_connection(#state{dsock = Socket}) -> close_connection(Socket).
 
-%%  ------------ FILE HANDELING  ----------------------------------------   
+close_connection({tcp, Socket}) -> gen_tcp:close(Socket);
+close_connection({ssl, Socket}) -> ssl:close(Socket).
 
-send_file(Fd, State) ->
+%%  ------------ FILE HANDELING  ----------------------------------------   
+send_file(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Fd) ->
+    {noreply, State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_file, Fd}}};
+send_file(State, Fd) ->
     case file_read(Fd) of
 	{ok, N, Bin} when N > 0->
 	    send_data_message(State, Bin),
 	    progress_report({binary, Bin}, State),
-	    send_file(Fd, State);
+	    send_file(State, Fd);
 	{ok, _, _} ->
 	    file_close(Fd),
 	    close_data_connection(State),
@@ -2301,6 +2385,15 @@ call(GenServer, Msg, Format, Timeout) ->
 cast(GenServer, Msg) ->
     gen_server:cast(GenServer, {self(), Msg}).
 
+send_bin(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State, Bin) ->
+    State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, send_bin, Bin}};
+send_bin(State, Bin) ->
+    send_data_message(State, Bin),
+    close_data_connection(State),
+    activate_ctrl_connection(State),
+    {noreply, State#state{caller = transfer_data_second_phase,
+			  dsock = undefined}}.
+
 mk_cmd(Fmt, Args) ->
     [io_lib:format(Fmt, Args)| [?CR, ?LF]].		% Deep list ok.
 
@@ -2320,20 +2413,6 @@ pwd_result(Lines) ->
 	lists:splitwith(fun(?DOUBLE_QUOTE) -> false; (_) -> true end, Rest),
     Dir.
 
-%% is_verbose(Params) -> 
-%%     check_param(verbose, Params).
-
-%% is_debug(Flags) -> 
-%%     check_param(debug, Flags).
-
-%% is_trace(Flags) -> 
-%%     check_param(trace, Flags).
-
-%% is_ipv6_disabled(Flags) -> 
-%%     check_param(ip_v6_disabled, Flags).
-
-%% check_param(Param, Params) -> 
-%%     lists:member(Param, Params).
 
 key_search(Key, List, Default) ->	     
     case lists:keysearch(Key, 1, List) of
@@ -2343,14 +2422,6 @@ key_search(Key, List, Default) ->
 	    Default
     end.
 
-%% check_option(Pred, Value, Default) ->
-%%     case Pred(Value) of
-%% 	true ->
-%% 	    Value;
-%% 	false ->
-%% 	    Default
-%%     end.
-
 verbose(Lines, true, Direction) ->
     DirStr =
 	case Direction of
@@ -2380,3 +2451,23 @@ progress_report(Report,  #state{progress = ProgressPid}) ->
 millisec_time() ->
     {A,B,C} = erlang:now(),
     A*1000000000+B*1000+(C div 1000).
+
+peername({tcp, Socket}) -> inet:peername(Socket);
+peername({ssl, Socket}) -> ssl:peername(Socket).
+
+sockname({tcp, Socket}) -> inet:sockname(Socket);
+sockname({ssl, Socket}) -> ssl:sockname(Socket).
+
+maybe_tls_upgrade(Pid, undefined) ->
+    {ok, Pid};
+maybe_tls_upgrade(Pid, TLSOptions) ->
+    catch ssl:start(),
+    call(Pid, {open, tls_upgrade, TLSOptions}, plain).
+
+start_chunk(#state{tls_upgrading_data_connection = {true, CTRL, _}} = State) ->
+    State#state{tls_upgrading_data_connection = {true, CTRL, ?MODULE, start_chunk, undefined}};
+start_chunk(#state{client = From} = State) ->
+    gen_server:reply(From, ok),
+    State#state{chunk = true, 
+		client = undefined,
+		caller = undefined}.
diff --git a/lib/inets/src/ftp/ftp_response.erl b/lib/inets/src/ftp/ftp_response.erl
index 4bf788e946..dfe180ff18 100644
--- a/lib/inets/src/ftp/ftp_response.erl
+++ b/lib/inets/src/ftp/ftp_response.erl
@@ -175,6 +175,8 @@ error_string(Reason) ->
 
 %% Positive Preleminary Reply
 interpret_status(?POS_PREL,_,_)                   -> pos_prel; 
+%%FIXME ??? 3??? interpret_status(?POS_COMPL, ?AUTH_ACC, 3)        -> tls_upgrade; 
+interpret_status(?POS_COMPL, ?AUTH_ACC, 4)        -> tls_upgrade; 
 %% Positive Completion Reply
 interpret_status(?POS_COMPL,_,_)                  -> pos_compl;
 %% Positive Intermediate Reply nedd account
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 41bba7995e..da9bbdd1ec 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -175,7 +175,7 @@ request(Method,
 request(Method, 
 	{Url, Headers, ContentType, Body}, 
 	HTTPOptions, Options, Profile) 
-  when ((Method =:= post) orelse (Method =:= put)) andalso 
+  when ((Method =:= post) orelse (Method =:= put) orelse (Method =:= delete)) andalso 
        (is_atom(Profile) orelse is_pid(Profile)) ->
     ?hcrt("request", [{method,       Method}, 
 		      {url,          Url},
@@ -208,16 +208,8 @@ cancel_request(RequestId) ->
 cancel_request(RequestId, Profile) 
   when is_atom(Profile) orelse is_pid(Profile) ->
     ?hcrt("cancel request", [{request_id, RequestId}, {profile, Profile}]),
-    ok = httpc_manager:cancel_request(RequestId, profile_name(Profile)), 
-    receive  
-	%% If the request was already fulfilled throw away the 
-	%% answer as the request has been canceled.
-	{http, {RequestId, _}} ->
-	    ok 
-    after 0 ->
-	    ok
-    end.
-
+    httpc_manager:cancel_request(RequestId, profile_name(Profile)).
+   
 
 %%--------------------------------------------------------------------------
 %% set_options(Options) -> ok | {error, Reason}
@@ -241,14 +233,7 @@ set_options(Options, Profile) when is_atom(Profile) orelse is_pid(Profile) ->
     ?hcrt("set options", [{options, Options}, {profile, Profile}]),
     case validate_options(Options) of
 	{ok, Opts} ->
-	    try 
-		begin
-		    httpc_manager:set_options(Opts, profile_name(Profile))
-		end
-	    catch
-		exit:{noproc, _} ->
-		    {error, inets_not_started}
-	    end;
+	    httpc_manager:set_options(Opts, profile_name(Profile));
 	{error, Reason} ->
 	    {error, Reason}
     end.
@@ -343,8 +328,6 @@ store_cookies(SetCookieHeaders, Url, Profile)
 	    ok
 	end
     catch 
-	exit:{noproc, _} ->
-	    {error, {not_started, Profile}};
 	error:{badmatch, Bad} ->
 	    {error, {parse_failed, Bad}}
     end.
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 55794f57dc..a89a457a51 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %% 
 %% The 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 @@
          start_link/4,
          %% connect_and_send/2,
          send/2, 
-         cancel/3,
+         cancel/2,
          stream_next/1,
          info/1
         ]).
@@ -55,8 +55,8 @@
           headers,                   % #http_response_h{}
           body,                      % binary()
           mfa,                       % {Module, Function, Args}
-          pipeline = queue:new(),    % queue() 
-          keep_alive = queue:new(),  % queue() 
+          pipeline = queue:new(),    % queue:queue()
+          keep_alive = queue:new(),  % queue:queue()
           status,   % undefined | new | pipeline | keep_alive | close | {ssl_tunnel, Request}
           canceled = [],             % [RequestId]
           max_header_size = nolimit, % nolimit | integer() 
@@ -117,8 +117,8 @@ send(Request, Pid) ->
 %% Description: Cancels a request. Intended to be called by the httpc
 %% manager process.
 %%--------------------------------------------------------------------
-cancel(RequestId, Pid, From) ->
-    cast({cancel, RequestId, From}, Pid).
+cancel(RequestId, Pid) ->
+    cast({cancel, RequestId}, Pid).
 
 
 %%--------------------------------------------------------------------
@@ -400,19 +400,17 @@ handle_call(info, _, State) ->
 %% handle_keep_alive_queue/2 on the other hand will just skip the
 %% request as if it was never issued as in this case the request will
 %% not have been sent. 
-handle_cast({cancel, RequestId, From},
+handle_cast({cancel, RequestId},
             #state{request      = #request{id = RequestId} = Request,
                    profile_name = ProfileName,
                    canceled     = Canceled} = State) ->
     ?hcrv("cancel current request", [{request_id, RequestId}, 
                                      {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}}};
-handle_cast({cancel, RequestId, From},
+handle_cast({cancel, RequestId},
             #state{profile_name = ProfileName,
                    request      = #request{id = CurrId},
                    canceled     = Canceled} = State) ->
@@ -420,8 +418,6 @@ handle_cast({cancel, RequestId, From},
                      {curr_req_id, CurrId},
                      {profile, ProfileName},
                      {canceled,   Canceled}]),
-    httpc_manager:request_canceled(RequestId, ProfileName, From),
-    ?hcrv("canceled", []),
     {noreply, State#state{canceled = [RequestId | Canceled]}};
 
 handle_cast(stream_next, #state{session = Session} = State) ->
@@ -521,19 +517,12 @@ handle_info({Proto, _Socket, Data},
                 activate_once(Session),
                 {noreply, State#state{mfa = NewMFA}}
         catch
-            exit:_Exit ->
-                ?hcrd("data processing exit", [{exit, _Exit}]),
+            _:_Reason ->
+                ?hcrd("data processing exit", [{exit, _Reason}]),
                 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;
@@ -1165,7 +1154,7 @@ handle_http_body(Body, #state{headers       = Headers,
 
 handle_response(#state{status = new} = State) ->
     ?hcrd("handle response - status = new", []),
-    handle_response(try_to_enable_pipeline_or_keep_alive(State));
+    handle_response(check_persistent(State));
 
 handle_response(#state{request      = Request,
 		       status       = Status,
@@ -1440,39 +1429,22 @@ is_keep_alive_enabled_server(_,_) ->
 is_keep_alive_connection(Headers, #session{client_close = ClientClose}) ->
     (not ((ClientClose) orelse httpc_response:is_server_closing(Headers))).
 
-try_to_enable_pipeline_or_keep_alive(
-  #state{session      = Session, 
-	 request      = #request{method = Method},
+check_persistent(
+  #state{session      = #session{type = Type} = Session, 
 	 status_line  = {Version, _, _},
 	 headers      = Headers,
-	 profile_name = ProfileName} = State) ->
-    ?hcrd("try to enable pipeline or keep-alive", 
-	  [{version, Version}, 
-	   {headers, Headers}, 
-	   {session, Session}]),
+	 profile_name = ProfileName} = State) ->    
     case is_keep_alive_enabled_server(Version, Headers) andalso 
-	  is_keep_alive_connection(Headers, Session) of
+	is_keep_alive_connection(Headers, Session) of
 	true ->
-	    case (is_pipeline_enabled_client(Session) andalso 
-		  httpc_request:is_idempotent(Method)) of
-		true ->
-		    insert_session(Session, ProfileName),
-		    State#state{status = pipeline};
-		false ->
-		    insert_session(Session, ProfileName),
-		    %% Make sure type is keep_alive in session
-		    %% as it in this case might be pipeline
-		    NewSession = Session#session{type = keep_alive}, 
-		    State#state{status  = keep_alive,
-				session = NewSession}
-	    end;
+	    mark_persistent(ProfileName, Session),
+	    State#state{status = Type};
 	false ->
 	    State#state{status = close}
     end.
 
 answer_request(#request{id = RequestId, from = From} = Request, Msg, 
-	       #state{session      = Session, 
-		      timers       = Timers, 
+	       #state{timers       = Timers, 
 		      profile_name = ProfileName} = State) -> 
     ?hcrt("answer request", [{request, Request}, {msg, Msg}]),
     httpc_response:send(From, Msg),
@@ -1482,19 +1454,14 @@ answer_request(#request{id = RequestId, from = From} = Request, Msg,
     Timer = {RequestId, TimerRef},
     cancel_timer(TimerRef, {timeout, Request#request.id}),
     httpc_manager:request_done(RequestId, ProfileName),
-    NewSession = maybe_make_session_available(ProfileName, Session), 
     Timers2 = Timers#timers{request_timers = lists:delete(Timer, 
 							  RequestTimers)}, 
     State#state{request = Request#request{from = answer_sent},
-		session = NewSession, 
 		timers  = Timers2}.
 
-maybe_make_session_available(ProfileName, 
-			     #session{available = false} = Session) ->
-    update_session(ProfileName, Session, #session.available, true),
-    Session#session{available = true};
-maybe_make_session_available(_ProfileName, Session) ->
-    Session.
+mark_persistent(ProfileName, Session) ->
+    update_session(ProfileName, Session, #session.persistent, true),
+    Session#session{persistent = true}.
     
 cancel_timers(#timers{request_timers = ReqTmrs, queue_timer = QTmr}) ->
     cancel_timer(QTmr, timeout_queue),
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl
index 30e2742e9d..d5b3dd2a2a 100644
--- a/lib/inets/src/http_client/httpc_internal.hrl
+++ b/lib/inets/src/http_client/httpc_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -143,8 +143,8 @@
 
 	  %% true | false
 	  %% This will be true, when a response has been received for 
-	  %% the first request. See type above.
-	  available = false
+	  %% the first request and the server has not closed the connection
+	  persistent = false
 	 }).
 
 
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl
index c45dcab802..a3ed371e61 100644
--- a/lib/inets/src/http_client/httpc_manager.erl
+++ b/lib/inets/src/http_client/httpc_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
 %% 
 %% The 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,6 @@
 	 start_link/3, 
 	 request/2, 
 	 cancel_request/2,
-	 request_canceled/3,
 	 request_done/2, 
 	 retry_request/2, 
 	 redirect_request/2,
@@ -144,22 +143,7 @@ redirect_request(Request, ProfileName) ->
 %%--------------------------------------------------------------------
 
 cancel_request(RequestId, ProfileName) ->
-    call(ProfileName, {cancel_request, RequestId}).
-
-
-%%--------------------------------------------------------------------
-%% Function: request_canceled(RequestId, ProfileName) -> ok
-%%	RequestId - ref()
-%%      ProfileName = atom()
-%%
-%% Description: Confirms that a request has been canceld. Intended to
-%% be called by the httpc handler process.
-%%--------------------------------------------------------------------
-
-request_canceled(RequestId, ProfileName, From) ->
-    gen_server:reply(From, ok),
-    cast(ProfileName, {request_canceled, RequestId}).
-
+    cast(ProfileName, {cancel_request, RequestId}).
 
 %%--------------------------------------------------------------------
 %% Function: request_done(RequestId, ProfileName) -> ok
@@ -467,33 +451,13 @@ do_init(ProfileName, CookiesDir) ->
 %%--------------------------------------------------------------------
 handle_call({request, Request}, _, State) ->
     ?hcri("request", [{request, Request}]),
-    case (catch handle_request(Request, State)) of
+    case (catch handle_request(Request, State, false)) of
 	{reply, Msg, NewState} ->
 	    {reply, Msg, NewState};
 	Error ->
 	    {stop, Error, httpc_response:error(Request, Error), State}
     end;
 
-handle_call({cancel_request, RequestId}, From, 
-	    #state{handler_db = HandlerDb} = State) ->
-    ?hcri("cancel_request", [{request_id, RequestId}]),
-    case ets:lookup(HandlerDb, RequestId) of
-	[] ->
-	    %% The request has allready compleated make sure
-	    %% it is deliverd to the client process queue so
-	    %% it can be thrown away by httpc:cancel_request
-	    %% This delay is hopfully a temporary workaround.
-	    %% Note that it will not not delay the manager,
-	    %% only the client that called httpc:cancel_request
-	    timer:apply_after(?DELAY, gen_server, reply, [From, ok]),
-	    {noreply, State};
-	[{_, Pid, _}] ->
-	    httpc_handler:cancel(RequestId, Pid, From),
-	    {noreply, 
-	     State#state{cancel = 
-			 [{RequestId, Pid, From} | State#state.cancel]}}
-    end;
-
 handle_call(reset_cookies, _, #state{cookie_db = CookieDb} = State) ->
     ?hcrv("reset cookies", []),
     httpc_cookie:reset_db(CookieDb),
@@ -547,7 +511,7 @@ handle_cast({retry_or_redirect_request, {Time, Request}},
     {noreply, State};
 
 handle_cast({retry_or_redirect_request, Request}, State) ->
-    case (catch handle_request(Request, State)) of
+    case (catch handle_request(Request, State, true)) of
 	{reply, {ok, _}, NewState} ->
 	    {noreply, NewState};
 	Error  ->
@@ -555,19 +519,19 @@ handle_cast({retry_or_redirect_request, Request}, State) ->
 	    {stop, Error, State}
     end;
 
-handle_cast({request_canceled, RequestId}, State) ->
-    ?hcrv("request canceled", [{request_id, RequestId}]),
-    ets:delete(State#state.handler_db, RequestId),
-    case lists:keysearch(RequestId, 1, State#state.cancel) of
-	{value, Entry = {RequestId, _, From}} ->
-	    ?hcrt("found in cancel", [{from, From}]),
-	    {noreply, 
-	     State#state{cancel = lists:delete(Entry, State#state.cancel)}};
-	Else ->
-	    ?hcrt("not found in cancel", [{else, Else}]),
-	   {noreply, State}
+handle_cast({cancel_request, RequestId}, 
+	    #state{handler_db = HandlerDb} = State) ->
+    case ets:lookup(HandlerDb, RequestId) of
+	[] ->
+	    %% Request already compleated nothing to 
+	    %% cancel
+	    {noreply, State};
+	[{_, Pid, _}] ->
+	    httpc_handler:cancel(RequestId, Pid),
+	    ets:delete(State#state.handler_db, RequestId),
+	    {noreply, State}
     end;
-
+  
 handle_cast({request_done, RequestId}, State) ->
     ?hcrv("request done", [{request_id, RequestId}]),
     ets:delete(State#state.handler_db, RequestId),
@@ -629,22 +593,8 @@ handle_info({'EXIT', _, _}, State) ->
     %% Handled in DOWN
     {noreply, State};
 handle_info({'DOWN', _, _, Pid, _}, State) ->
-    ets:match_delete(State#state.handler_db, {'_', Pid, '_'}),
-
-    %% If there where any canceled request, handled by the
-    %% the process that now has terminated, the
-    %% cancelation can be viewed as sucessfull!
-    NewCanceldList =
-	lists:foldl(fun(Entry = {_, HandlerPid, From}, Acc)  ->
-			    case HandlerPid of
-				Pid ->
-				    gen_server:reply(From, ok),
-				    lists:delete(Entry, Acc);
-				_ ->
-				    Acc
-			    end 
-		    end, State#state.cancel, State#state.cancel),
-    {noreply, State#state{cancel = NewCanceldList}};
+    ets:match_delete(State#state.handler_db, {'_', Pid, '_'}),  
+    {noreply, State};
 handle_info(Info, State) ->
     Report = io_lib:format("Unknown message in "
 			   "httpc_manager:handle_info ~p~n", [Info]),
@@ -774,7 +724,7 @@ get_handler_info(Tab) ->
 
 handle_request(#request{settings = 
 			#http_options{version = "HTTP/0.9"}} = Request,
-	       State) ->
+	       State, _) ->
     %% Act as an HTTP/0.9 client that does not know anything
     %% about persistent connections
 
@@ -787,7 +737,7 @@ handle_request(#request{settings =
 
 handle_request(#request{settings = 
 			#http_options{version = "HTTP/1.0"}} = Request,
-	       State) ->
+	       State, _) ->
     %% Act as an HTTP/1.0 client that does not
     %% use persistent connections
 
@@ -798,13 +748,13 @@ handle_request(#request{settings =
     start_handler(NewRequest#request{headers = NewHeaders}, State),
     {reply, {ok, NewRequest#request.id}, State};
 
-handle_request(Request, State = #state{options = Options}) ->
+handle_request(Request, State = #state{options = Options}, Retry) ->
 
     NewRequest = handle_cookies(generate_request_id(Request), State),
     SessionType = session_type(Options),
     case select_session(Request#request.method,
 			Request#request.address,
-			Request#request.scheme, SessionType, State) of
+			Request#request.scheme, SessionType, State, Retry) of
 	{ok, HandlerPid} ->
 	    pipeline_or_keep_alive(NewRequest, HandlerPid, State);
 	no_connection ->
@@ -828,6 +778,7 @@ start_handler(#request{id   = Id,
 	      #state{profile_name = ProfileName, 
 		     handler_db   = HandlerDb, 
 		     options      = Options}) ->
+    ClientClose = httpc_request:is_client_closing(Request#request.headers),
     {ok, Pid} =
 	case is_inets_manager() of
 	    true ->
@@ -838,13 +789,18 @@ start_handler(#request{id   = Id,
 	end,
     HandlerInfo = {Id, Pid, From}, 
     ets:insert(HandlerDb, HandlerInfo), 
+    insert_session(#session{id = {Request#request.address, Pid},
+			    scheme = Request#request.scheme,
+			    client_close = ClientClose,
+			    type = session_type(Options)
+			   }, ProfileName),
     erlang:monitor(process, Pid).
 
 
 select_session(Method, HostPort, Scheme, SessionType, 
 	       #state{options = #options{max_pipeline_length   = MaxPipe,
 					 max_keep_alive_length = MaxKeepAlive},
-		      session_db = SessionDb}) ->
+		      session_db = SessionDb}, Retry) ->
     ?hcrd("select session", [{session_type,          SessionType},
 			     {max_pipeline_length,   MaxPipe},
 			     {max_keep_alive_length, MaxKeepAlive}]),
@@ -857,19 +813,29 @@ select_session(Method, HostPort, Scheme, SessionType,
 	    %% client_close, scheme and type specified. 
 	    %% The fields id (part of: HandlerPid) and queue_length
 	    %% specified.
-	    Pattern = #session{id           = {HostPort, '$1'},
-			       client_close = false,
-			       scheme       = Scheme,
-			       queue_length = '$2',
-			       type         = SessionType,
-			       available    = true, 
-			       _            = '_'},
+	    Pattern = case (Retry andalso SessionType == pipeline) of
+			  true ->
+			      #session{id           = {HostPort, '$1'},
+				       client_close = false,
+				       scheme       = Scheme,
+				       queue_length = '$2',
+				       type         = SessionType,
+				       persistent   = true,
+				       _            = '_'};
+			  false ->
+			      #session{id           = {HostPort, '$1'},
+				       client_close = false,
+				       scheme       = Scheme,
+				       queue_length = '$2',
+				       type         = SessionType,
+				       _            = '_'}
+		      end,
 	    %% {'_', {HostPort, '$1'}, false, Scheme, '_', '$2', SessionTyp}, 
 	    Candidates = ets:match(SessionDb, Pattern), 
 	    ?hcrd("select session", [{host_port,  HostPort}, 
 				     {scheme,     Scheme}, 
 				     {type,       SessionType}, 
-				     {candidates, Candidates}]),
+				     {candidates, Candidates}]),	    
 	    select_session(Candidates, MaxKeepAlive, MaxPipe, SessionType);
 	false ->
 	    no_connection
diff --git a/lib/inets/src/http_lib/http_request.erl b/lib/inets/src/http_lib/http_request.erl
index aa9f9f6774..f295453bdd 100644
--- a/lib/inets/src/http_lib/http_request.erl
+++ b/lib/inets/src/http_lib/http_request.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2014. All Rights Reserved.
 %% 
 %% The 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,9 +40,6 @@ headers([Header | Tail], Headers) ->
 	    headers(Tail, headers(http_util:to_lower(string:strip(Key)), 
 				  string:strip(Value), Headers));
 	{_, []} -> 
-	    Report = io_lib:format("Ignored invalid HTTP-header: ~p~n", 
-				   [Header]),
-	    error_logger:error_report(Report),
 	    headers(Tail, Headers)
     end.
 
diff --git a/lib/inets/src/http_lib/http_transport.erl b/lib/inets/src/http_lib/http_transport.erl
index df58fa1b81..7e679531cf 100644
--- a/lib/inets/src/http_lib/http_transport.erl
+++ b/lib/inets/src/http_lib/http_transport.erl
@@ -159,7 +159,7 @@ listen(ip_comm = _SocketType, Addr, Port, Fd, IpFamily) ->
     listen_ip_comm(Addr, Port, Fd, IpFamily);
   
 listen({essl, SSLConfig}, Addr, Port, Fd, IpFamily) ->
-    listen_ssl(Addr, Port, Fd, SSLConfig, IpFamily).
+    listen_ssl(Addr, Port, Fd, SSLConfig, IpFamily, []).
 
 listen(ip_comm = _SocketType, Addr, Port, IpFamily) ->
     listen_ip_comm(Addr, Port, undefined, IpFamily);
@@ -178,7 +178,13 @@ listen({essl, SSLConfig}, Addr, Port, IpFamily) ->
 	  [{addr,       Addr}, 
 	   {port,       Port}, 
 	   {ssl_config, SSLConfig}]),
-    listen_ssl(Addr, Port, undefined, SSLConfig, IpFamily).
+    {SSLConfig2, ExtraOpts} = case proplists:get_value(log_alert, SSLConfig, undefined) of
+		    undefined ->
+			{SSLConfig, []};
+		    LogAlert ->
+			{proplists:delete(log_alert, SSLConfig), [{log_alert, LogAlert}]}
+		end,
+    listen_ssl(Addr, Port, undefined, SSLConfig2, IpFamily, ExtraOpts).
 
 listen_ip_comm(Addr, Port, Fd, IpFamily) ->
     case (catch do_listen_ip_comm(Addr, Port, Fd, IpFamily)) of
@@ -221,24 +227,23 @@ do_listen_ip_comm(Addr, Port, Fd, IpFamily) ->
 	    gen_tcp:listen(NewPort, Opts2)
     end.
 
-
-listen_ssl(Addr, Port, Fd, Opts0, IpFamily) ->
+listen_ssl(Addr, Port, Fd, Opts0, IpFamily, ExtraOpts) ->
     {NewPort, SockOpt} = get_socket_info(Addr, Port, Fd),
     Opts = SockOpt ++ Opts0,
     case IpFamily of
 	inet6fb4 -> 
-	    Opts2 = [inet6 | Opts], 
+	    Opts2 = [inet6 | Opts] ++ ExtraOpts, 
 	    ?hlrt("try ipv6 listen", [{opts, Opts2}]),
 	    case (catch ssl:listen(Port, Opts2)) of
 		{error, Reason} when ((Reason =:= nxdomain) orelse 
 				      (Reason =:= eafnosupport)) ->
-		    Opts3 = [inet | Opts], 
+		    Opts3 = [inet | Opts] ++ ExtraOpts, 
 		    ?hlrt("ipv6 listen failed - try ipv4 instead", 
 			  [{reason, Reason}, {opts, Opts3}]),
 		    ssl:listen(NewPort, Opts3);
 		
 		{'EXIT', Reason} -> 
-		    Opts3 = [inet | Opts], 
+		    Opts3 = [inet | Opts] ++ ExtraOpts, 
 		    ?hlrt("ipv6 listen exit - try ipv4 instead", 
 			  [{reason, Reason}, {opts, Opts3}]),
 		    ssl:listen(NewPort, Opts3); 
@@ -251,7 +256,7 @@ listen_ssl(Addr, Port, Fd, Opts0, IpFamily) ->
 	_ ->
 	    Opts2 = [IpFamily | Opts],
 	    ?hlrt("listen", [{opts, Opts2}]),
-	    ssl:listen(NewPort, Opts2)
+	    ssl:listen(NewPort, Opts2 ++ ExtraOpts)
     end.
 
 
diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
index 67555d5f1c..2660d04d16 100644
--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2005-2012. All Rights Reserved.
+# Copyright Ericsson AB 2005-2013. All Rights Reserved.
 #
 # The 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 @@ MODULES = \
 	httpd \
 	httpd_acceptor \
 	httpd_acceptor_sup \
+	httpd_connection_sup\
 	httpd_cgi \
 	httpd_conf \
 	httpd_example \
diff --git a/lib/inets/src/http_server/httpd.erl b/lib/inets/src/http_server/httpd.erl
index 93608dbf96..6052ae9022 100644
--- a/lib/inets/src/http_server/httpd.erl
+++ b/lib/inets/src/http_server/httpd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The 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,13 +36,6 @@
 %% API
 -export([parse_query/1, reload_config/2, info/1, info/2, info/3]).
 
-%% Internal debugging and status info stuff...
--export([
-	 get_status/1, get_status/2, get_status/3,
-	 get_admin_state/0, get_admin_state/1, get_admin_state/2,
-	 get_usage_state/0, get_usage_state/1, get_usage_state/2
-	]).
-
 %%%========================================================================
 %%% API
 %%%========================================================================
@@ -296,136 +289,6 @@ make_name(Addr, Port) ->
     httpd_util:make_name("httpd", Addr, Port).
 
 
-%%%--------------------------------------------------------------
-%%% Internal debug functions - Do we want these functions here!?
-%%%--------------------------------------------------------------------
-
-%%% =========================================================
-%%% Function:    get_admin_state/0, get_admin_state/1, get_admin_state/2
-%%%              get_admin_state()
-%%%              get_admin_state(Port)
-%%%              get_admin_state(Addr,Port)
-%%%              
-%%% Returns:     {ok,State} | {error,Reason}
-%%%              
-%%% Description: This function is used to retrieve the administrative 
-%%%              state of the HTTP server.
-%%%
-%%% Types:       Port    -> integer()             
-%%%              Addr    -> {A,B,C,D} | string() | undefined
-%%%              State   -> unblocked | shutting_down | blocked
-%%%              Reason  -> term()
-%%%
-get_admin_state()                        -> get_admin_state(undefined,8888).
-get_admin_state(Port) when is_integer(Port) -> get_admin_state(undefined,Port);
-
-get_admin_state(ConfigFile) when is_list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    unblock(Addr,Port);
-	Error ->
-	    Error
-    end.
-
-get_admin_state(Addr,Port) when is_integer(Port) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:get_admin_state(Pid);
-	_ ->
-	    {error,not_started}
-    end.
-
-
-
-%%% =========================================================
-%%% Function:    get_usage_state/0, get_usage_state/1, get_usage_state/2
-%%%              get_usage_state()
-%%%              get_usage_state(Port)
-%%%              get_usage_state(Addr,Port)
-%%%              
-%%% Returns:     {ok,State} | {error,Reason}
-%%%              
-%%% Description: This function is used to retrieve the usage 
-%%%              state of the HTTP server.
-%%%
-%%% Types:       Port    -> integer()             
-%%%              Addr    -> {A,B,C,D} | string() | undefined
-%%%              State   -> idle | active | busy
-%%%              Reason  -> term()
-%%%
-get_usage_state()                        -> get_usage_state(undefined,8888).
-get_usage_state(Port) when is_integer(Port) -> get_usage_state(undefined,Port);
-
-get_usage_state(ConfigFile) when is_list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    unblock(Addr,Port);
-	Error ->
-	    Error
-    end.
-
-get_usage_state(Addr,Port) when is_integer(Port) -> 
-    Name = make_name(Addr,Port),
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:get_usage_state(Pid);
-	_ ->
-	    {error,not_started}
-    end.
-
-
-
-%%% =========================================================
-%% Function:    get_status(ConfigFile)        -> Status
-%%              get_status(Port)              -> Status
-%%              get_status(Addr,Port)         -> Status
-%%              get_status(Port,Timeout)      -> Status
-%%              get_status(Addr,Port,Timeout) -> Status
-%%
-%% Arguments:   ConfigFile -> string()  
-%%                            Configuration file from which Port and 
-%%                            BindAddress will be extracted.
-%%              Addr       -> {A,B,C,D} | string()
-%%                            Bind Address of the http server
-%%              Port       -> integer()
-%%                            Port number of the http server
-%%              Timeout    -> integer()
-%%                            Timeout time for the call
-%%
-%% Returns:     Status -> list()
-%%
-%% Description: This function is used when the caller runs in the 
-%%              same node as the http server or if calling with a 
-%%              program such as erl_call (see erl_interface).
-%% 
-
-get_status(ConfigFile) when is_list(ConfigFile) ->
-    case get_addr_and_port(ConfigFile) of
-	{ok,Addr,Port} ->
-	    get_status(Addr,Port);
-	Error ->
-	    Error
-    end;
-
-get_status(Port) when is_integer(Port) ->
-    get_status(undefined,Port,5000).
-
-get_status(Port,Timeout) when is_integer(Port) andalso is_integer(Timeout) ->
-    get_status(undefined,Port,Timeout);
-
-get_status(Addr,Port) ->
-    get_status(Addr,Port,5000).
-
-get_status(Addr,Port,Timeout) when is_integer(Port) ->
-    Name = make_name(Addr,Port), 
-    case whereis(Name) of
-	Pid when is_pid(Pid) ->
-	    httpd_manager:get_status(Pid,Timeout);
-	_ ->
-	    not_started
-    end.
-
 do_reload_config(ConfigList, Mode) ->
     case (catch httpd_conf:validate_properties(ConfigList)) of
 	{ok, Config} ->
@@ -438,85 +301,6 @@ do_reload_config(ConfigList, Mode) ->
 	    Error
     end.
 
-
 %%%--------------------------------------------------------------
 %%% Deprecated 
 %%%--------------------------------------------------------------
-
-%% start() ->
-%%     start("/var/tmp/server_root/conf/8888.conf").
-
-%% start(ConfigFile) ->
-%%     {ok, Pid} = inets:start(httpd, ConfigFile, stand_alone), 
-%%     unlink(Pid),
-%%     {ok, Pid}.
-
-%% start_link() ->
-%%     start("/var/tmp/server_root/conf/8888.conf").
-
-%% start_link(ConfigFile) when is_list(ConfigFile) ->
-%%     inets:start(httpd, ConfigFile, stand_alone). 
-
-%% stop() ->
-%%   stop(8888).
-
-%% stop(Port) when is_integer(Port) ->
-%%     stop(undefined, Port);
-%% stop(Pid) when is_pid(Pid) ->
-%%     old_stop(Pid);
-%% stop(ConfigFile) when is_list(ConfigFile) ->
-%%     old_stop(ConfigFile).
-
-%% stop(Addr, Port) when is_integer(Port) ->
-%%     old_stop(Addr, Port).
-
-%% start_child() ->
-%%     start_child("/var/tmp/server_root/conf/8888.conf").
-
-%% start_child(ConfigFile) ->
-%%     httpd_sup:start_child(ConfigFile).
-
-%% stop_child() ->
-%%   stop_child(8888).
-
-%% stop_child(Port) ->
-%%     stop_child(undefined, Port).
-
-%% stop_child(Addr, Port) when is_integer(Port) ->
-%%     httpd_sup:stop_child(Addr, Port).
-
-%% restart() -> reload(undefined, 8888).
-
-%% restart(Port) when is_integer(Port) ->
-%%     reload(undefined,  Port).
-%% restart(Addr, Port) ->
-%%     reload(Addr, Port).
-
-%% old_stop(Pid) when is_pid(Pid) ->
-%%     do_stop(Pid);
-%% old_stop(ConfigFile) when is_list(ConfigFile) ->
-%%     case get_addr_and_port(ConfigFile) of
-%% 	{ok, Addr, Port} ->
-%% 	    old_stop(Addr, Port);
-	    
-%% 	Error ->
-%% 	    Error
-%%     end;
-%% old_stop(_StartArgs) ->
-%%     ok.
-
-%% old_stop(Addr, Port) when is_integer(Port) ->
-%%     Name = old_make_name(Addr, Port), 
-%%     case whereis(Name) of
-%% 	Pid when is_pid(Pid) ->
-%% 	    do_stop(Pid),
-%% 	    ok;
-%% 	_ ->
-%% 	    not_started
-%%     end.
-    
-%% do_stop(Pid) ->
-%%     exit(Pid, shutdown).
-
-%% old_make_name(Addr,Port) ->
-%%     httpd_util:make_name("httpd_instance_sup",Addr,Port).
diff --git a/lib/inets/src/http_server/httpd_acceptor.erl b/lib/inets/src/http_server/httpd_acceptor.erl
index 1bffcc1f12..e812bc76f5 100644
--- a/lib/inets/src/http_server/httpd_acceptor.erl
+++ b/lib/inets/src/http_server/httpd_acceptor.erl
@@ -21,13 +21,13 @@
 
 -include("httpd.hrl").
 -include("httpd_internal.hrl").
--include("inets_internal.hrl").
+%%-include("inets_internal.hrl").
 
 %% Internal application API
--export([start_link/6, start_link/7]).
+-export([start_link/7, start_link/8]).
 
 %% Other exports (for spawn's etc.)
--export([acceptor_init/7, acceptor_init/8, acceptor_loop/6]).
+-export([acceptor_init/8, acceptor_init/9, acceptor_loop/8]).
 
 %%
 %% External API
@@ -36,51 +36,52 @@
 %% start_link
 
 start_link(Manager, SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout) ->
-    ?hdrd("start link", 
-	  [{manager, Manager}, 
-	   {socket_type, SocketType}, 
-	   {address, Addr}, 
-	   {port, Port}, 
-	   {timeout, AcceptTimeout}]),
+    %% ?hdrd("start link", 
+	  %% [{manager, Manager}, 
+	  %%  {socket_type, SocketType}, 
+	  %%  {address, Addr}, 
+	  %%  {port, Port}, 
+	  %%  {timeout, AcceptTimeout}]),
     Args = [self(), Manager, SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout],
     proc_lib:start_link(?MODULE, acceptor_init, Args).
 
-start_link(Manager, SocketType, ListenSocket, IpFamily, ConfigDb, AcceptTimeout) ->
-    ?hdrd("start link", 
-	  [{manager, Manager}, 
-	   {socket_type, SocketType}, 
-	   {listen_socket, ListenSocket}, 
-	   {timeout, AcceptTimeout}]),
-    Args = [self(), Manager, SocketType, ListenSocket, IpFamily, 
+start_link(Manager, SocketType, Addr, Port, ListenSocket, IpFamily, ConfigDb, AcceptTimeout) ->
+    %% ?hdrd("start link", 
+	  %% [{manager, Manager}, 
+	  %%  {socket_type, SocketType}, 
+	  %%  {listen_socket, ListenSocket}, 
+	  %%  {timeout, AcceptTimeout}]),
+    Args = [self(), Manager, SocketType, Addr, Port, ListenSocket, IpFamily, 
 	    ConfigDb, AcceptTimeout],
     proc_lib:start_link(?MODULE, acceptor_init, Args).
 
-acceptor_init(Parent, Manager, SocketType, {ListenOwner, ListenSocket}, IpFamily,
+acceptor_init(Parent, Manager, SocketType, Addr, Port, {ListenOwner, ListenSocket}, IpFamily,
 	      ConfigDb, AcceptTimeout) ->
-    ?hdrd("acceptor init", 
-	  [{parent, Parent}, 
-	   {manager, Manager}, 
-	   {socket_type, SocketType}, 
-	   {listen_owner, ListenOwner}, 
-	   {listen_socket, ListenSocket}, 
-	   {timeout, AcceptTimeout}]),
+    %% ?hdrd("acceptor init", 
+    %% 	  [{parent, Parent}, 
+    %% 	   {manager, Manager}, 
+    %% 	   {socket_type, SocketType}, 
+    %% 	   {listen_owner, ListenOwner}, 
+    %% 	   {listen_socket, ListenSocket}, 
+    %% 	   {timeout, AcceptTimeout}]),
     link(ListenOwner),
     proc_lib:init_ack(Parent, {ok, self()}),
-    acceptor_loop(Manager, SocketType, ListenSocket, IpFamily, ConfigDb, AcceptTimeout).
+    acceptor_loop(Manager, SocketType, Addr, Port,
+		  ListenSocket, IpFamily, ConfigDb, AcceptTimeout).
 
 acceptor_init(Parent, Manager, SocketType, Addr, Port, IpFamily, 
 	      ConfigDb, AcceptTimeout) ->
-    ?hdrd("acceptor init", 
-	  [{parent, Parent}, 
-	   {manager, Manager}, 
-	   {socket_type, SocketType}, 
-	   {address, Addr}, 
-	   {port, Port}, 
-	   {timeout, AcceptTimeout}]),
+    %% ?hdrd("acceptor init", 
+    %% 	  [{parent, Parent}, 
+    %% 	   {manager, Manager}, 
+    %% 	   {socket_type, SocketType}, 
+    %% 	   {address, Addr}, 
+    %% 	   {port, Port}, 
+    %% 	   {timeout, AcceptTimeout}]),
     case (catch do_init(SocketType, Addr, Port, IpFamily)) of
 	{ok, ListenSocket} ->
 	    proc_lib:init_ack(Parent, {ok, self()}),
-	    acceptor_loop(Manager, SocketType, 
+	    acceptor_loop(Manager, SocketType, Addr, Port, 
 			  ListenSocket, IpFamily,ConfigDb, AcceptTimeout);
 	Error ->
 	    proc_lib:init_ack(Parent, Error),
@@ -88,67 +89,68 @@ acceptor_init(Parent, Manager, SocketType, Addr, Port, IpFamily,
     end.
    
 do_init(SocketType, Addr, Port, IpFamily) ->
-    ?hdrt("do init", []),
+    %% ?hdrt("do init", []),
     do_socket_start(SocketType),
     ListenSocket = do_socket_listen(SocketType, Addr, Port, IpFamily),
     {ok, ListenSocket}.
 
 
 do_socket_start(SocketType) ->
-    ?hdrt("do socket start", []),
+    %% ?hdrt("do socket start", []),
     case http_transport:start(SocketType) of
 	ok ->
 	    ok;
 	{error, Reason} ->
-	    ?hdrv("failed starting transport", [{reason, Reason}]),
+	    %% ?hdrv("failed starting transport", [{reason, Reason}]),
 	    throw({error, {socket_start_failed, Reason}})
     end.
 
 
 do_socket_listen(SocketType, Addr, Port, IpFamily) ->
-    ?hdrt("do socket listen", []),
+    %% ?hdrt("do socket listen", []),
     case http_transport:listen(SocketType, Addr, Port, IpFamily) of
 	{ok, ListenSocket} ->
 	    ListenSocket;
 	{error, Reason} ->
-	    ?hdrv("listen failed", [{reason,      Reason}, 
-				    {socket_type, SocketType},
-				    {addr,        Addr},
-				    {port,        Port}]),
+	    %% ?hdrv("listen failed", [{reason,      Reason}, 
+	    %% 			    {socket_type, SocketType},
+	    %% 			    {addr,        Addr},
+	    %% 			    {port,        Port}]),
 	    throw({error, {listen, Reason}})
     end.
 
 
 %% acceptor 
 
-acceptor_loop(Manager, SocketType, ListenSocket, IpFamily, ConfigDb, AcceptTimeout) ->
-    ?hdrd("awaiting accept", 
-	  [{manager, Manager}, 
-	   {socket_type, SocketType}, 
-	   {listen_socket, ListenSocket}, 
-	   {timeout, AcceptTimeout}]),
+acceptor_loop(Manager, SocketType, Addr, Port, ListenSocket, IpFamily, ConfigDb, AcceptTimeout) ->
+    %% ?hdrd("awaiting accept", 
+    %% 	  [{manager, Manager}, 
+    %% 	   {socket_type, SocketType}, 
+    %% 	   {listen_socket, ListenSocket}, 
+    %% 	   {timeout, AcceptTimeout}]),
     case (catch http_transport:accept(SocketType, ListenSocket, 50000)) of
 	{ok, Socket} ->
-	    ?hdrv("accepted", [{socket, Socket}]),
-	    handle_connection(Manager, ConfigDb, AcceptTimeout, 
+	    %% ?hdrv("accepted", [{socket, Socket}]),
+	    handle_connection(Addr, Port, Manager, ConfigDb, AcceptTimeout, 
 			      SocketType, Socket),
-	    ?MODULE:acceptor_loop(Manager, SocketType, 
+	    ?MODULE:acceptor_loop(Manager, SocketType,  Addr, Port,
 				  ListenSocket, IpFamily, ConfigDb,AcceptTimeout);
 	{error, Reason} ->
-	    ?hdri("accept failed", [{reason, Reason}]),
+	    %% ?hdri("accept failed", [{reason, Reason}]),
 	    handle_error(Reason, ConfigDb),
-	    ?MODULE:acceptor_loop(Manager, SocketType, ListenSocket, 
+	    ?MODULE:acceptor_loop(Manager, SocketType, Addr, Port, ListenSocket, 
 				  IpFamily, ConfigDb, AcceptTimeout);
 	{'EXIT', Reason} ->
-	    ?hdri("accept exited", [{reason, Reason}]),
+	    %% ?hdri("accept exited", [{reason, Reason}]),
 	    ReasonString = 
 		lists:flatten(io_lib:format("Accept exit: ~p", [Reason])),
 	    accept_failed(ConfigDb, ReasonString)
     end.
 
 
-handle_connection(Manager, ConfigDb, AcceptTimeout, SocketType, Socket) ->
-    {ok, Pid} = httpd_request_handler:start(Manager, ConfigDb, AcceptTimeout),
+handle_connection(Address, Port,  Manager, ConfigDb, AcceptTimeout, SocketType, Socket) ->
+    Sup = httpd_connection_sup:connection_sup(Address, Port),
+    {ok, Pid} = httpd_connection_sup:start_child(Sup, [Manager, ConfigDb, AcceptTimeout]),
     http_transport:controlling_process(SocketType, Socket, Pid),
     httpd_request_handler:socket_ownership_transfered(Pid, SocketType, Socket).
 
diff --git a/lib/inets/src/http_server/httpd_acceptor_sup.erl b/lib/inets/src/http_server/httpd_acceptor_sup.erl
index df837b5a24..cc2b582b52 100644
--- a/lib/inets/src/http_server/httpd_acceptor_sup.erl
+++ b/lib/inets/src/http_server/httpd_acceptor_sup.erl
@@ -27,7 +27,8 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/2, start_acceptor/6, start_acceptor/7, stop_acceptor/2]).
+-export([start_link/1]).
+%%, start_acceptor/6, start_acceptor/7, stop_acceptor/2]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -35,63 +36,48 @@
 %%%=========================================================================
 %%%  API
 %%%=========================================================================
-start_link(Addr, Port) ->
+start_link([Addr, Port| _] = Args) ->
     SupName = make_name(Addr, Port),
-    supervisor:start_link({local, SupName}, ?MODULE, []).
-
-%%----------------------------------------------------------------------
-%% Function: [start|stop]_acceptor/5
-%% Description: Starts/stops an [auth | security] worker (child) process
-%%----------------------------------------------------------------------
-start_acceptor(SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout) ->
-    start_worker(httpd_acceptor, SocketType, Addr, Port, IpFamily,
-		 ConfigDb, AcceptTimeout, self(), []).
-start_acceptor(SocketType, Addr, Port, IpFamily, ConfigDb, AcceptTimeout, ListenSocket) ->
-    start_worker(httpd_acceptor, SocketType, Addr, Port, IpFamily,
-		 ConfigDb, AcceptTimeout, ListenSocket, self(), []).
-
-
-stop_acceptor(Addr, Port) ->
-    stop_worker(httpd_acceptor, Addr, Port).
+    supervisor:start_link({local, SupName}, ?MODULE, [Args]).
 
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
-init(_) ->    
-    Flags     = {one_for_one, 500, 100},
-    Workers   = [],
-    {ok, {Flags, Workers}}.
+init([Args]) ->    
+    RestartStrategy = one_for_one,
+    MaxR = 10,
+    MaxT = 3600,
+    Children = [child_spec(Args)],
+    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
 
 %%%=========================================================================
 %%%  Internal functions
 %%%=========================================================================  
+child_spec([Address, Port, ConfigList, AcceptTimeout, ListenInfo]) ->
+    Name = id(Address, Port),
+    Manager = httpd_util:make_name("httpd", Address, Port),
+    SockType = proplists:get_value(socket_type, ConfigList, ip_comm),
+    IpFamily = proplists:get_value(ipfamily, ConfigList, inet),
+    StartFunc = case ListenInfo of
+		    undefined ->
+			{httpd_acceptor, start_link, [Manager, SockType, Address, Port, IpFamily,
+						      httpd_util:make_name("httpd_conf", Address, Port), 
+						      AcceptTimeout]};
+		    _ ->
+			{httpd_acceptor, start_link, [Manager, SockType, Address, Port, ListenInfo,
+						      IpFamily,
+						      httpd_util:make_name("httpd_conf", Address, Port), 
+						      AcceptTimeout]}
+		end,
+    Restart = transient, 
+    Shutdown = brutal_kill,
+    Modules = [httpd_acceptor],
+    Type = worker,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-make_name(Addr,Port) ->
-    httpd_util:make_name("httpd_acc_sup", Addr, Port).
+id(Address, Port) ->
+    {httpd_acceptor_sup, Address, Port}.
 
-start_worker(M, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout, Manager, Modules) ->
-    SupName = make_name(Addr, Port),
-    Args    = [Manager, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout],
-    Spec    = {{M, Addr, Port},
-	       {M, start_link, Args}, 
-	       permanent, timer:seconds(1), worker, [M] ++ Modules},
-    supervisor:start_child(SupName, Spec).
-
-start_worker(M, SocketType, Addr, Port, IpFamily, ConfigDB, AcceptTimeout, ListenSocket,
-	     Manager, Modules) ->
-    SupName = make_name(Addr, Port),
-    Args    = [Manager, SocketType, ListenSocket, IpFamily, ConfigDB, AcceptTimeout],
-    Spec    = {{M, Addr, Port},
-	       {M, start_link, Args}, 
-	       permanent, timer:seconds(1), worker, [M] ++ Modules},
-    supervisor:start_child(SupName, Spec).
+make_name(Addr,Port) ->
+    httpd_util:make_name("httpd_acceptor_sup", Addr, Port).
 
-stop_worker(M, Addr, Port) ->
-    SupName = make_name(Addr, Port),
-    Name    = {M, Addr, Port},
-    case supervisor:terminate_child(SupName, Name) of
-	ok ->
-	    supervisor:delete_child(SupName, Name);
-	Error ->
-	    Error
-    end.
diff --git a/lib/inets/src/http_server/httpd_conf.erl b/lib/inets/src/http_server/httpd_conf.erl
index d45f3c0048..27446ca7fe 100644
--- a/lib/inets/src/http_server/httpd_conf.erl
+++ b/lib/inets/src/http_server/httpd_conf.erl
@@ -390,6 +390,13 @@ load("SSLCertificateFile " ++ SSLCertificateFile, []) ->
 	    {error, ?NICE(clean(SSLCertificateFile)++
 			  " is an invalid SSLCertificateFile")}
     end;
+load("SSLLogLevel " ++ SSLLogAlert, []) ->
+    case SSLLogAlert of
+	"none" ->
+	    {ok, [], {ssl_log_alert, false}};
+	_ ->
+	    {ok, [], {ssl_log_alert, true}}
+    end;
 load("SSLCertificateKeyFile " ++ SSLCertificateKeyFile, []) ->
     case is_file(clean(SSLCertificateKeyFile)) of
 	{ok, File} ->
@@ -791,6 +798,8 @@ store({log_format, LogFormat}, _ConfigList)
 store({server_tokens, ServerTokens} = Entry, _ConfigList) ->
     Server = server(ServerTokens), 
     {ok, [Entry, {server, Server}]};
+store({keep_alive_timeout, KeepAliveTimeout}, _ConfigList) ->
+    {ok, {keep_alive_timeout, KeepAliveTimeout * 1000}};
 store(ConfigListEntry, _ConfigList) ->
     {ok, ConfigListEntry}.
 
@@ -948,7 +957,8 @@ ssl_config(ConfigDB) ->
 	ssl_ciphers(ConfigDB) ++
 	ssl_password(ConfigDB) ++
 	ssl_verify_depth(ConfigDB) ++
-	ssl_ca_certificate_file(ConfigDB).
+	ssl_ca_certificate_file(ConfigDB) ++
+	ssl_log_level(ConfigDB).
 	    
     
 
@@ -1214,6 +1224,14 @@ ssl_certificate_key_file(ConfigDB) ->
 	    [{keyfile,SSLCertificateKeyFile}]
     end.
 
+ssl_log_level(ConfigDB) ->
+    case httpd_util:lookup(ConfigDB,ssl_log_alert) of
+	undefined ->
+	    [];
+	SSLLogLevel ->
+	    [{log_alert,SSLLogLevel}]
+    end.
+
 ssl_verify_client(ConfigDB) ->
     case httpd_util:lookup(ConfigDB,ssl_verify_client) of
 	undefined ->
diff --git a/lib/inets/src/http_server/httpd_connection_sup.erl b/lib/inets/src/http_server/httpd_connection_sup.erl
new file mode 100644
index 0000000000..48c2d8f076
--- /dev/null
+++ b/lib/inets/src/http_server/httpd_connection_sup.erl
@@ -0,0 +1,68 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%% 
+%% The 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: Ssh connection supervisor.
+%%----------------------------------------------------------------------
+
+-module(httpd_connection_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/1]).
+-export([start_child/2, connection_sup/2]).
+
+%% Supervisor callback
+-export([init/1]).
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+start_link(Args) ->
+    supervisor:start_link(?MODULE, [Args]).
+
+start_child(Sup, Args) ->
+    supervisor:start_child(Sup, Args).
+
+connection_sup(Addr, Port) ->
+    httpd_util:make_name("httpd_connection_sup", Addr, Port).
+
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+init([[Addr, Port]]) ->
+    RegName = connection_sup(Addr, Port),
+    register(RegName, self()),
+    RestartStrategy = simple_one_for_one,
+    MaxR = 0,
+    MaxT = 3600,
+
+    Name = undefined, % As simple_one_for_one is used.
+    StartFunc = {httpd_request_handler, start_link, []},
+    Restart = temporary, % E.g. should not be restarted
+    Shutdown = 4000,
+    Modules = [httpd_request_handler],
+    Type = worker,
+
+    ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules},
+    {ok, {{RestartStrategy, MaxR, MaxT}, [ChildSpec]}}.
+
+
+
diff --git a/lib/inets/src/http_server/httpd_instance_sup.erl b/lib/inets/src/http_server/httpd_instance_sup.erl
index baa60d318c..b95be44b2a 100644
--- a/lib/inets/src/http_server/httpd_instance_sup.erl
+++ b/lib/inets/src/http_server/httpd_instance_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
 %%
 %% The 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,9 @@ start_link(ConfigFile, AcceptTimeout, ListenInfo, Debug) ->
 init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port]) -> 
     httpd_util:enable_debug(Debug), 
     Flags = {one_for_one, 0, 1},
-    Children  = [sup_spec(httpd_acceptor_sup, Address, Port), 
+    Children  = [httpd_connection_sup_spec(Address, Port), 
+		 httpd_acceptor_sup_spec(Address, Port, ConfigList, AcceptTimeout,
+					 undefined), 
 		 sup_spec(httpd_misc_sup, Address, Port), 
 		 worker_spec(httpd_manager, Address, Port, 
 			     ConfigFile, ConfigList,AcceptTimeout)],
@@ -108,7 +110,9 @@ init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port]) ->
 init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port, ListenInfo]) -> 
     httpd_util:enable_debug(Debug), 
     Flags = {one_for_one, 0, 1},
-    Children  = [sup_spec(httpd_acceptor_sup, Address, Port), 
+    Children  = [httpd_connection_sup_spec(Address, Port), 
+		 httpd_acceptor_sup_spec(Address, Port, ConfigList, AcceptTimeout,
+					ListenInfo), 
 		 sup_spec(httpd_misc_sup, Address, Port), 
 		 worker_spec(httpd_manager, Address, Port, ListenInfo, 
 			     ConfigFile, ConfigList, AcceptTimeout)],
@@ -118,6 +122,24 @@ init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port, ListenInfo])
 %%%=========================================================================
 %%%  Internal functions
 %%%=========================================================================
+httpd_connection_sup_spec(Address, Port) -> 
+    Name = {httpd_connection_sup, Address, Port},
+    StartFunc = {httpd_connection_sup, start_link, [[Address, Port]]},
+    Restart = permanent,
+    Shutdown = 5000,
+     Modules = [httpd_connection_sup],
+    Type = supervisor,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+
+httpd_acceptor_sup_spec(Address, Port, ConfigList, AcceptTimeout, ListenInfo) ->
+    Name = {httpd_acceptor_sup, Address, Port},
+    StartFunc = {httpd_acceptor_sup, start_link, [[Address, Port, ConfigList, AcceptTimeout, ListenInfo]]},
+    Restart = permanent, 
+    Shutdown = infinity,
+    Modules = [httpd_acceptor_sup],
+    Type = supervisor,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
+    
 sup_spec(SupModule, Address, Port) ->
     Name = {SupModule, Address, Port},
     StartFunc = {SupModule, start_link, [Address, Port]},
@@ -167,5 +189,3 @@ file_2_config(ConfigFile) ->
 	Error ->
 	    Error
     end.
-
-
diff --git a/lib/inets/src/http_server/httpd_log.erl b/lib/inets/src/http_server/httpd_log.erl
index a34435e0e8..7ff73669f9 100644
--- a/lib/inets/src/http_server/httpd_log.erl
+++ b/lib/inets/src/http_server/httpd_log.erl
@@ -39,14 +39,21 @@
 		   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) ->
+%% Somethime the size in the form of the content_length is put here, which
+%% is actually in the form of a string
+%% So it can either be the size as an integer, the size as a string
+%% or, worst case scenario, bytes.
+access_entry(Log, NoLog, Info, RFC931, AuthUser, Date, StatusCode, 
+	     SizeStrOrBytes) 
+  when is_list(SizeStrOrBytes) ->
     Size = 
-	case (catch list_to_integer(SizeStr)) of
+	case (catch list_to_integer(SizeStrOrBytes)) of
 	    I when is_integer(I) ->
+		%% This is from using the content_length (which is a string)
 		I;
 	    _ ->
-		SizeStr % This is better then nothing
+		%% This is better than nothing
+		httpd_util:flatlength(SizeStrOrBytes) 
 	end,
     access_entry(Log, NoLog, Info, RFC931, AuthUser, Date, StatusCode, Size);
 access_entry(Log, NoLog, 
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index c83d06a158..e155498bb8 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %%
 %% The 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,11 +25,11 @@
 -behaviour(gen_server).
 
 %% Application internal API
--export([start/2, start_link/2, start_link/3, start_link/4, stop/1, reload/2]).
--export([new_connection/1, done_connection/1]).
--export([config_lookup/2, config_lookup/3, 
-	 config_multi_lookup/2, config_multi_lookup/3, 
-	 config_match/2, config_match/3]).
+-export([start/2, start_link/2, start_link/3, start_link/4, 
+	 stop/1, reload/2]).
+-export([new_connection/1]).
+-export([config_match/2, config_match/3]).
+-export([block/2, block/3, unblock/1]).
 
 %% gen_server exports
 -export([init/1, 
@@ -37,34 +37,19 @@
 	 terminate/2,
          code_change/3]).
 
-
-%% Management exports
--export([block/2, block/3, unblock/1]).
--export([get_admin_state/1, get_usage_state/1]).
--export([is_busy/1,is_busy/2,is_busy_or_blocked/1,is_blocked/1]). %% ???????
--export([get_status/1, get_status/2]).
-
--export([c/1]).
-
 -record(state,{socket_type  = ip_comm,
 	       config_file,
 	       config_db    = null,
-	       connections, %% Current request handlers
+	       connection_sup, 
 	       admin_state  = unblocked,
 	       blocker_ref  = undefined,
-	       blocking_tmr = undefined,
+	       blocking_from = undefined,
+	       shutdown_poller = undefined,
 	       status       = []}).
+%%%--------------------------------------------------------------------
+%%% Application internal API
+%%%--------------------------------------------------------------------
 
-
-%%TODO: Clean up this module!
-
-c(Port) ->
-    Ref = httpd_util:make_name("httpd",undefined,Port),
-    call(Ref, fake_close).
-
-%%
-%% External API
-%%
 %% Deprecated 
 start(ConfigFile, ConfigList) ->
     Port = proplists:get_value(port,ConfigList,80),
@@ -83,7 +68,8 @@ start_link(ConfigFile, ConfigList, AcceptTimeout) ->
     Name = make_name(Addr, Port),
     
     gen_server:start_link({local, Name},?MODULE,
-			  [ConfigFile, ConfigList, AcceptTimeout, Addr, Port],[]).
+			  [ConfigFile, ConfigList, 
+			   AcceptTimeout, Addr, Port],[]).
     
 start_link(ConfigFile, ConfigList, AcceptTimeout, ListenSocket) ->
     Port = proplists:get_value(port, ConfigList, 80),
@@ -93,146 +79,33 @@ start_link(ConfigFile, ConfigList, AcceptTimeout, ListenSocket) ->
     gen_server:start_link({local, Name},?MODULE,
 			  [ConfigFile, ConfigList, AcceptTimeout, Addr, 
 			   Port, ListenSocket],[]).
-
 stop(ServerRef) ->
     call(ServerRef, stop).
 
 reload(ServerRef, Conf) ->
     call(ServerRef, {reload, Conf}).
 
-
-%%%----------------------------------------------------------------
-
-block(ServerRef, disturbing) ->
-    call(ServerRef,block);
-
-block(ServerRef, non_disturbing) ->
-    do_block(ServerRef, non_disturbing, infinity).
+block(ServerRef, Method) ->
+    block(ServerRef, Method, infinity).
 
 block(ServerRef, Method, Timeout) ->
-    do_block(ServerRef, Method, Timeout).
-
-
-%% The reason for not using call here, is that the manager cannot
-%% _wait_ for completion of the requests. It must be able to do
-%% do other things at the same time as the blocking goes on.
-do_block(ServerRef, Method, infinity) ->
-    Ref = make_ref(),
-    cast(ServerRef, {block, Method, infinity, self(), Ref}),
-    receive
-	{block_reply, Reply, Ref} ->
-	    Reply
-    end;
-do_block(ServerRef,Method,Timeout) when Timeout > 0 ->
-    Ref = make_ref(),
-    cast(ServerRef,{block,Method,Timeout,self(),Ref}),
-    receive
-	{block_reply,Reply,Ref} ->
-	    Reply
-    end.
-
-
-%%%----------------------------------------------------------------
-
-%% unblock
+    call(ServerRef, {block, self(), Method, Timeout}).
 
 unblock(ServerRef) ->
-    call(ServerRef,unblock).
-
-%% get admin/usage state
-
-get_admin_state(ServerRef) ->
-    call(ServerRef,get_admin_state).
-
-get_usage_state(ServerRef) ->
-    call(ServerRef,get_usage_state).
-
-
-%% get_status
-
-get_status(ServerRef) ->
-    gen_server:call(ServerRef,get_status).
-
-get_status(ServerRef,Timeout) ->
-    gen_server:call(ServerRef,get_status,Timeout).
-
-%%
-%% Internal API
-%%
-
-
-%% new_connection
+    call(ServerRef,{unblock, self()}).
 
 new_connection(Manager) ->
-    gen_server:call(Manager, {new_connection, self()}, infinity).
-
-%% done
-
-done_connection(Manager) ->
-    gen_server:cast(Manager, {done_connection, self()}).
-
-
-%% is_busy(ServerRef) -> true | false
-%% 
-%% Tests if the server is (in usage state) busy, 
-%% i.e. has rached the heavy load limit.
-%% 
-
-is_busy(ServerRef) ->
-    gen_server:call(ServerRef,is_busy).
-    
-is_busy(ServerRef,Timeout) ->
-    gen_server:call(ServerRef,is_busy,Timeout).
-
-
-%% is_busy_or_blocked(ServerRef) -> busy | blocked | false
-%% 
-%% Tests if the server is busy (usage state), i.e. has rached,
-%% the heavy load limit, or blocked (admin state) .
-%% 
-
-is_busy_or_blocked(ServerRef) ->
-    gen_server:call(ServerRef,is_busy_or_blocked).
-    
-
-%% is_blocked(ServerRef) -> true | false
-%% 
-%% Tests if the server is blocked (admin state) .
-%% 
-
-is_blocked(ServerRef) ->
-    gen_server:call(ServerRef,is_blocked).
-    
-
-%%
-%% Module API. Theese functions are intended for use from modules only.
-%%
-
-config_lookup(Port, Query) ->
-    config_lookup(undefined, Port, Query).
-config_lookup(Addr, Port, Query) ->
-    Name = httpd_util:make_name("httpd",Addr,Port),
-    gen_server:call(whereis(Name), {config_lookup, Query}).
-
-config_multi_lookup(Port, Query) ->
-    config_multi_lookup(undefined,Port,Query).
-config_multi_lookup(Addr,Port, Query) ->
-    Name = httpd_util:make_name("httpd",Addr,Port),
-    gen_server:call(whereis(Name), {config_multi_lookup, Query}).
+    call(Manager, {new_connection, self()}).
 
 config_match(Port, Pattern) ->
     config_match(undefined,Port,Pattern).
 config_match(Addr, Port, Pattern) ->
     Name = httpd_util:make_name("httpd",Addr,Port),
-    gen_server:call(whereis(Name), {config_match, Pattern}).
-
-
-%%
-%% Server call-back functions
-%%
-
-%% init
+    call(whereis(Name), {config_match, Pattern}).
 
+%%%--------------------------------------------------------------------
+%%% gen_server callbacks functions
+%%%--------------------------------------------------------------------
 init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port]) ->
     process_flag(trap_exit, true),
     case (catch do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port)) of
@@ -263,47 +136,35 @@ init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo]) ->
 	    {ok, State}
     end.
 
-do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port) ->
-    IpFamily = proplists:get_value(ipfamily, ConfigList, inet6fb4),
+do_init(ConfigFile, ConfigList, _AcceptTimeout, Addr, Port) ->
+    Sup = httpd_util:make_name("httpd_connection_sup", Addr, Port),
     NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile),
     ConfigDB      = do_initial_store(ConfigList),
     SocketType    = httpd_conf:lookup_socket_type(ConfigDB),
-    case httpd_acceptor_sup:start_acceptor(SocketType, Addr,
-					   Port, IpFamily, ConfigDB, AcceptTimeout) of
-	{ok, _Pid} ->
-	    Status = [{max_conn,        0}, 
-		      {last_heavy_load, never}, 
-		      {last_connection, never}],
+    Status = [{max_conn,        0}, 
+	      {last_heavy_load, never}, 
+	      {last_connection, never}],
 	    State  = #state{socket_type = SocketType,
 			    config_file = NewConfigFile,
 			    config_db   = ConfigDB,
-			    connections = [],
+			    connection_sup = Sup, 
 			    status      = Status},
-	    {ok, State};
-	Else ->
-	    Else
-    end.
+    {ok, State}.
 
-do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo) ->
-    IpFamily = proplists:get_value(ipfamily, ConfigList, inet6fb4),
+do_init(ConfigFile, ConfigList, _AcceptTimeout, Addr, Port, _ListenInfo) ->
+    Sup = httpd_util:make_name("httpd_connection_sup", Addr, Port),
     NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile),
     ConfigDB   = do_initial_store(ConfigList),
     SocketType = httpd_conf:lookup_socket_type(ConfigDB),
-    case httpd_acceptor_sup:start_acceptor(SocketType, Addr,
-					   Port, IpFamily, ConfigDB, 
-					   AcceptTimeout, ListenInfo) of
-	{ok, _Pid} ->
-	    Status = [{max_conn,0}, {last_heavy_load,never}, 
-		      {last_connection,never}],
+    Status = [{max_conn,0}, {last_heavy_load,never}, 
+	      {last_connection,never}],
 	    State  = #state{socket_type = SocketType,
 			    config_file = NewConfigFile,
 			    config_db   = ConfigDB,
-			    connections = [],
+			    connection_sup = Sup,
 			    status      = Status},
-	    {ok, State};
-	Else ->
-	    Else
-    end.
+    {ok, State}.
+
 
 do_initial_store(ConfigList) ->
     case httpd_conf:store(ConfigList) of
@@ -313,75 +174,14 @@ do_initial_store(ConfigList) ->
 	    throw({error, Reason})
     end.
 
-   
-
-%% handle_call
-
 handle_call(stop, _From, State) ->
     {stop, normal, ok, State};
 
-handle_call({config_lookup, Query}, _From, State) ->
-    Res = httpd_util:lookup(State#state.config_db, Query),
-    {reply, Res, State};
-
-handle_call({config_multi_lookup, Query}, _From, State) ->
-    Res = httpd_util:multi_lookup(State#state.config_db, Query),
-    {reply, Res, State};
-
 handle_call({config_match, Query}, _From, State) ->
     Res = ets:match_object(State#state.config_db, Query),
     {reply, Res, State};
 
-handle_call(get_status, _From, State) ->
-    ManagerStatus  = manager_status(self()),
-    S1 = [{current_conn,length(State#state.connections)}|State#state.status]++
-	[ManagerStatus],
-    {reply,S1,State};
-
-handle_call(is_busy, _From, State) ->
-    Reply = case get_ustate(State) of
-		busy ->
-		    true;
-		_ ->
-		    false
-	  end,
-    {reply,Reply,State};
-
-handle_call(is_busy_or_blocked, _From, State) ->
-    Reply = 
-	case get_astate(State) of
-	    unblocked ->
-		case get_ustate(State) of
-		    busy ->
-			busy;
-		    _ ->
-			false
-		end;
-	    _ ->
-		blocked
-	  end,
-    {reply,Reply,State};
-
-handle_call(is_blocked, _From, State) ->
-    Reply = 
-	case get_astate(State) of
-	    unblocked ->
-		false;
-	    _ ->
-		true
-	  end,
-    {reply,Reply,State};
-
-handle_call(get_admin_state, _From, State) ->
-    Reply = get_astate(State),
-    {reply,Reply,State};
-
-handle_call(get_usage_state, _From, State) ->
-    Reply = get_ustate(State),
-    {reply,Reply,State};
-
-handle_call({reload, Conf}, _From, State) 
-  when State#state.admin_state =:= blocked ->
+handle_call({reload, Conf}, _From, #state{admin_state = blocked} = State) ->
     case handle_reload(Conf, State) of
 	{stop, Reply,S1} ->
 	    {stop, Reply, S1};
@@ -392,13 +192,32 @@ handle_call({reload, Conf}, _From, State)
 handle_call({reload, _}, _From, State) ->
     {reply,{error,{invalid_admin_state,State#state.admin_state}},State};
 
-handle_call(block, _From, State) ->
-    {Reply,S1} = handle_block(State),
-    {reply,Reply,S1};
+handle_call({block , Blocker, Mode, Timeout}, From, 
+	    #state{admin_state = unblocked,
+		   connection_sup = CSup} = State) ->
+    Monitor = erlang:monitor(process, Blocker),
+    case count_children(CSup) of
+	0 ->
+	   %% Already in idle usage state => go directly to blocked
+	    {reply, ok, State#state{admin_state = blocked,
+				    blocker_ref = {Blocker, Monitor},
+				    blocking_from = From}};
+	_ ->
+	    handle_block(Mode, Timeout, 
+			 State#state{blocker_ref = {Blocker, Monitor},
+				     blocking_from = From})
+    end;
+handle_call({block , _, _, _}, _, State) ->
+    {reply, {error, blocked}, State};
 
-handle_call(unblock, {From,_Tag}, State) ->
-    {Reply,S1} = handle_unblock(State,From),
-    {reply, Reply, S1};
+handle_call({unblock, Blocker}, _, #state{blocker_ref = {Blocker,_},
+					  admin_state = blocked} = State) ->
+    
+    {reply, ok, 
+     State#state{admin_state = unblocked, blocker_ref = undefined}};
+
+handle_call({unblock, _}, _, State) ->
+    {reply, {error, only_blocker_may_unblock}, State};
 
 handle_call({new_connection, Pid}, _From, State) ->
     {Status, NewState} = handle_new_connection(State, Pid),
@@ -415,21 +234,6 @@ handle_call(Request, From, State) ->
     report_error(State,String),
     {reply, ok, State}.
 
-
-%% handle_cast
-
-handle_cast({done_connection, Pid}, State) ->
-    S1 = handle_done_connection(State, Pid),
-    {noreply, S1};
-
-handle_cast({block, disturbing, Timeout, From, Ref}, State) ->
-    S1 = handle_block(State, Timeout, From, Ref),
-    {noreply,S1};
-
-handle_cast({block, non_disturbing, Timeout, From, Ref}, State) ->
-    S1 = handle_nd_block(State, Timeout, From, Ref),
-    {noreply,S1};
-
 handle_cast(Message, State) ->
     String = 
 	lists:flatten(
@@ -440,32 +244,51 @@ handle_cast(Message, State) ->
     report_error(State, String),
     {noreply, State}.
 
-%% handle_info
-
-handle_info({block_timeout, Method}, State) ->
-    S1 = handle_block_timeout(State,Method),
-    {noreply, S1};
+handle_info(connections_terminated, #state{admin_state = shutting_down,
+					   blocking_from = From} = State) ->
+    gen_server:reply(From, ok),
+    {noreply, State#state{admin_state = blocked, blocking_from = undefined,
+			  blocker_ref = undefined}};
+handle_info(connections_terminated, State) ->
+    {noreply, State};
 
-handle_info({'DOWN', Ref, process, _Object, _Info}, State) ->
-    S1 = 
-	case State#state.blocker_ref of
-	    Ref ->
-		handle_blocker_exit(State);
-	    _ ->
-		%% Not our blocker, so ignore
-		State
-	end,
-    {noreply, S1};
+handle_info({block_timeout, non_disturbing}, 
+	    #state{admin_state = shutting_down,
+		   blocking_from = From,
+		   blocker_ref = {_, Monitor}} = State) ->
+    erlang:demonitor(Monitor),		  
+    gen_server:reply(From, {error, timeout}),
+    {noreply, State#state{admin_state = unblocked, blocking_from = undefined,
+			  blocker_ref = undefined}};
+handle_info({block_timeout, disturbing}, 
+	    #state{admin_state = shutting_down,
+		   blocking_from = From,
+		   blocker_ref = {_, Monitor},
+		   connection_sup = Sup} = State) ->
+    SupPid = whereis(Sup),
+    shutdown_connections(SupPid),
+    erlang:demonitor(Monitor),		  
+    gen_server:reply(From, ok),
+    {noreply, State#state{admin_state = blocked, blocker_ref = undefined,
+			  blocking_from = undefined}};
+handle_info({block_timeout, _, _}, State) ->
+    {noreply, State};	   
+
+handle_info({'DOWN', _, process, Pid, _Info}, 
+	    #state{admin_state = Admin,
+		   blocker_ref = {Pid, _}} = State) when 
+      Admin =/= unblocked ->
+    {noreply, State#state{admin_state = unblocked,
+			  blocking_from = undefined,
+			  blocker_ref = undefined}};
+handle_info({'DOWN', _, process, _, _}, State) ->
+    {noreply, State};
 
 handle_info({'EXIT', _, normal}, State) ->
     {noreply, State};
 
-handle_info({'EXIT', _, blocked}, S) ->
-    {noreply, S};
-
-handle_info({'EXIT', Pid, Reason}, State) ->
-    S1 = check_connections(State, Pid, Reason),
-    {noreply, S1};
+handle_info({'EXIT', _, shutdown}, State) ->
+    {stop, shutdown, State};
 
 handle_info(Info, State) ->
     String = 
@@ -477,246 +300,66 @@ handle_info(Info, State) ->
     report_error(State, String),
     {noreply, State}.
 
-
-%% terminate
-
 terminate(_, #state{config_db = Db}) -> 
     httpd_conf:remove_all(Db),
     ok.
 
-
-%% code_change({down,ToVsn}, State, Extra)
-%% 
-
 code_change({down,_ToVsn}, State, _Extra) ->
     {ok,State};
 
-%% code_change(FromVsn, State, Extra)
-%%
 code_change(_FromVsn, State, _Extra) ->
     {ok,State}.
 
-
-
-%% -------------------------------------------------------------------------
-%% check_connection
-%%
-%%
-%%
-%%
-
-check_connections(#state{connections = []} = State, _Pid, _Reason) ->
-    State;
-check_connections(#state{admin_state = shutting_down,
-			 connections = Connections} = State, Pid, Reason) ->
-    %% Could be a crashing request handler
-    case lists:delete(Pid, Connections) of
-	[] -> % Crashing request handler => block complete
-	    String = 
-		lists:flatten(
-		  io_lib:format("request handler (~p) crashed:"
-				"~n   ~p", [Pid, Reason])),
-	    report_error(State, String),
-	    demonitor_blocker(State#state.blocker_ref),
-	    {Tmr,From,Ref} = State#state.blocking_tmr,
-	    stop_block_tmr(Tmr),
-	    From ! {block_reply,ok,Ref},
-	    State#state{admin_state = blocked, connections = [],
-			blocker_ref = undefined};
-	Connections1 ->
-	    State#state{connections = Connections1}
-    end;
-check_connections(#state{connections = Connections} = State, Pid, Reason) ->
-    case lists:delete(Pid, Connections) of
-	Connections -> % Not a request handler, so ignore
-	    State;
-        NewConnections ->
-	    String = 
-		lists:flatten(
-		  io_lib:format("request handler (~p) crashed:"
-				"~n   ~p", [Pid, Reason])),
-	    report_error(State, String),
-	    State#state{connections = NewConnections}
-    end.
-
-
-%% -------------------------------------------------------------------------
-%% handle_[new | done]_connection
-%%
-%%
-%%
-%%
-
-handle_new_connection(State, Handler) ->
+%%%--------------------------------------------------------------------
+%%% Internal functions
+%%%--------------------------------------------------------------------
+handle_new_connection(#state{admin_state = AdminState} = State, Handler) ->
     UsageState = get_ustate(State),
-    AdminState = get_astate(State),
     handle_new_connection(UsageState, AdminState, State, Handler).
 
-handle_new_connection(busy, unblocked, State, _Handler) ->
-    Status = update_heavy_load_status(State#state.status),
-    {{reject, busy}, 
-     State#state{status = Status}};
-
-handle_new_connection(_UsageState, unblocked, State, Handler) ->
-    Connections = State#state.connections,
-    Status      = update_connection_status(State#state.status, 
-					   length(Connections)+1),
-    link(Handler),
-    {{ok, accept}, 
-     State#state{connections = [Handler|Connections], status = Status}};
-
-handle_new_connection(_UsageState, _AdminState, State, _Handler) ->
-    {{reject, blocked}, 
-     State}.
-
-handle_done_connection(#state{admin_state = shutting_down,
-			      connections = Connections} = State, Handler) ->
-    unlink(Handler),
-    case lists:delete(Handler, Connections) of
-	[] -> % Ok, block complete
-	    demonitor_blocker(State#state.blocker_ref),
-	    {Tmr,From,Ref} = State#state.blocking_tmr,
-	    stop_block_tmr(Tmr),
-	    From ! {block_reply,ok,Ref},
-	    State#state{admin_state = blocked, connections = [],
-			blocker_ref = undefined};
-	Connections1 ->
-	    State#state{connections = Connections1}
-    end;
-
-handle_done_connection(#state{connections = Connections} = State, Handler) ->
-    State#state{connections = lists:delete(Handler, Connections)}.
-    
-    
-%% -------------------------------------------------------------------------
-%% handle_block
-%%
-%%
-%%
-%%
-handle_block(#state{admin_state = AdminState} = S) ->
-    handle_block(S, AdminState).
-
-handle_block(S,unblocked) ->
-    %% Kill all connections
-    [kill_handler(Pid) || Pid <- S#state.connections],
-    {ok,S#state{connections = [], admin_state = blocked}};
-handle_block(S,blocked) ->
-    {ok,S};
-handle_block(S,shutting_down) ->
-    {{error,shutting_down},S}.
-    
-
-kill_handler(Pid) ->
-    exit(Pid, blocked).
-
-handle_block(S,Timeout,From,Ref) when Timeout >= 0 ->
-    do_block(S,Timeout,From,Ref);
-
-handle_block(S,Timeout,From,Ref) ->
-    Reply = {error,{invalid_block_request,Timeout}},
-    From ! {block_reply,Reply,Ref},
-    S.
-
-do_block(S,Timeout,From,Ref) ->
-    case S#state.connections of
-	[] ->
-	    %% Already in idle usage state => go directly to blocked
-	    From ! {block_reply,ok,Ref},
-	    S#state{admin_state = blocked};
-	_ ->
-	    %% Active or Busy usage state => go to shutting_down
-	    %% Make sure we get to know if blocker dies...
-	    MonitorRef = monitor_blocker(From),
-	    Tmr = {start_block_tmr(Timeout,disturbing),From,Ref},
-	    S#state{admin_state = shutting_down, 
-		    blocker_ref = MonitorRef, blocking_tmr = Tmr}
-    end.
-
-handle_nd_block(S,infinity,From,Ref) ->
-    do_nd_block(S,infinity,From,Ref);
-
-handle_nd_block(S,Timeout,From,Ref) when Timeout >= 0 ->
-    do_nd_block(S,Timeout,From,Ref);
-
-handle_nd_block(S,Timeout,From,Ref) ->
-    Reply = {error,{invalid_block_request,Timeout}},
-    From ! {block_reply,Reply,Ref},
-    S.
-
-do_nd_block(S,Timeout,From,Ref) ->
-    case S#state.connections of
-	[] ->
-	    %% Already in idle usage state => go directly to blocked
-	    From ! {block_reply,ok,Ref},
-	    S#state{admin_state = blocked};
+handle_new_connection(_UsageState, unblocked, 
+		      #state{config_db = Db, connection_sup = CSup} = 
+			  State, _) ->
+    Max = httpd_util:lookup(Db, max_clients),
+    case count_children(CSup) of
+	Count when Count =< Max ->
+	    {{ok, accept}, State};
 	_ ->
-	    %% Active or Busy usage state => go to shutting_down
-	    %% Make sure we get to know if blocker dies...
-	    MonitorRef = monitor_blocker(From),
-	    Tmr = {start_block_tmr(Timeout,non_disturbing),From,Ref},
-	    S#state{admin_state = shutting_down, 
-		    blocker_ref = MonitorRef, blocking_tmr = Tmr}
-    end.
+	    {{reject, busy}, State}
+    end;
 
-handle_block_timeout(S,Method) ->
-    %% Time to take this to the road...
-    demonitor_blocker(S#state.blocker_ref),
-    handle_block_timeout1(S,Method,S#state.blocking_tmr).
-
-handle_block_timeout1(S,non_disturbing,{_,From,Ref}) ->
-    From ! {block_reply,{error,timeout},Ref},
-    S#state{admin_state = unblocked, 
-	    blocker_ref = undefined, blocking_tmr = undefined};
-
-handle_block_timeout1(S,disturbing,{_,From,Ref}) ->
-    [exit(Pid,blocked) || Pid <- S#state.connections],
-
-    From ! {block_reply,ok,Ref},
-    S#state{admin_state = blocked,    connections = [], 
-	    blocker_ref = undefined, blocking_tmr = undefined};
-
-handle_block_timeout1(S,Method,{_,From,Ref}) ->
-    From ! {block_reply,{error,{unknown_block_method,Method}},Ref},
-    S#state{admin_state = blocked,    connections = [], 
-	    blocker_ref = undefined, blocking_tmr = undefined};
-
-handle_block_timeout1(S, _Method, _TmrInfo) ->
-    S#state{admin_state = unblocked,
-	    blocker_ref = undefined, blocking_tmr = undefined}.
-
-handle_unblock(S, FromA) ->
-    handle_unblock(S, FromA, S#state.admin_state).
-
-handle_unblock(S, _FromA, unblocked) ->
-    {ok,S};
-handle_unblock(S, FromA, _AdminState) ->
-    case S#state.blocking_tmr of
-	{Tmr,FromB,Ref} ->
-	    %% Another process is trying to unblock
-	    %% Inform the blocker
-	    stop_block_tmr(Tmr),
-	    FromB ! {block_reply, {error,{unblocked,FromA}},Ref};
-	_ ->
-	    ok
-    end,
-    {ok,S#state{admin_state = unblocked, blocking_tmr = undefined}}.
-    
-%% The blocker died so we give up on the block.
-handle_blocker_exit(S) ->
-    {Tmr,_From,_Ref} = S#state.blocking_tmr,
-    stop_block_tmr(Tmr),
-    S#state{admin_state = unblocked,
-	    blocker_ref = undefined, blocking_tmr = undefined}.
+handle_new_connection(_UsageState, _AdminState, State, _Handler) ->
+    {{reject, blocked}, State}.
+
+handle_block(disturbing, infinity, 
+	     #state{connection_sup = CSup,
+		    blocking_from = From,
+		    blocker_ref = {_, Monitor}} = State) ->
+    SupPid = whereis(CSup),
+    shutdown_connections(SupPid),
+    erlang:demonitor(Monitor),		  
+    gen_server:reply(From, ok),
+    {noreply, State#state{admin_state = blocked, blocker_ref = undefined,
+			  blocking_from = undefined}};
+handle_block(disturbing, Timeout, #state{connection_sup = CSup} = State) ->
+    Manager = self(),
+    spawn_link(fun() -> wait_for_shutdown(CSup, Manager) end),
+    erlang:send_after(Timeout, self(), {block_timeout, disturbing}),
+    {noreply, State#state{admin_state = shutting_down}};
+
+handle_block(non_disturbing, infinity, 
+	     #state{connection_sup = CSup} = State) ->
+    Manager = self(),
+    spawn_link(fun() -> wait_for_shutdown(CSup, Manager) end),
+    {noreply, State#state{admin_state = shutting_down}};
+
+handle_block(non_disturbing, Timeout,  
+	     #state{connection_sup = CSup} = State) ->
+    Manager = self(),
+    spawn_link(fun() -> wait_for_shutdown(CSup, Manager) end),
+    erlang:send_after(Timeout, self(), {block_timeout, non_disturbing}),
+    {noreply, State#state{admin_state = shutting_down}}.
     
-
-
-%% -------------------------------------------------------------------------
-%% handle_reload
-%%
-%%
-%%
-%%
 handle_reload(undefined, #state{config_file = undefined} = State) ->
     {continue, {error, undefined_config_file}, State};
 handle_reload(undefined, #state{config_file = ConfigFile} = State) ->
@@ -792,7 +435,7 @@ check_constant_values(Db, Config) ->
 %%   Otherwise                      -> active
 %%
 get_ustate(State) ->
-    get_ustate(length(State#state.connections),State).
+    get_ustate(count_children(State#state.connection_sup),State).
 
 get_ustate(0,_State) ->
     idle;
@@ -805,76 +448,6 @@ get_ustate(ConnectionCnt,State) ->
 	    active
     end.
 
-
-get_astate(S) -> S#state.admin_state.
-
-
-%% Timer handling functions
-start_block_tmr(infinity,_) ->
-    undefined;
-start_block_tmr(T,M) ->
-    erlang:send_after(T,self(),{block_timeout,M}).
-
-stop_block_tmr(undefined) ->
-    ok;
-stop_block_tmr(Ref) ->
-    erlang:cancel_timer(Ref).
-
-
-%% Monitor blocker functions
-monitor_blocker(Pid) when is_pid(Pid) ->
-    case (catch erlang:monitor(process,Pid)) of
-	{'EXIT', _Reason} ->
-	    undefined;
-	MonitorRef ->
-	    MonitorRef
-    end;
-monitor_blocker(_) ->
-    undefined.
-
-demonitor_blocker(undefined) ->
-    ok;
-demonitor_blocker(Ref) ->
-    (catch erlang:demonitor(Ref)).
-
-
-%% Some status utility functions
-
-update_heavy_load_status(Status) ->
-    update_status_with_time(Status,last_heavy_load).
-
-update_connection_status(Status,ConnCount) ->
-    S1 = case lists:keysearch(max_conn,1,Status) of
-	     {value, {max_conn, C1}} when ConnCount > C1 ->
-		 lists:keyreplace(max_conn,1,Status,{max_conn,ConnCount});
-	     {value, {max_conn, _C2}} ->
-		 Status;
-	     false ->
-		 [{max_conn, ConnCount} | Status]
-	 end,
-    update_status_with_time(S1,last_connection).
-
-update_status_with_time(Status,Key) ->
-    lists:keyreplace(Key,1,Status,{Key,universal_time()}).
-
-universal_time() -> calendar:universal_time().
-
-manager_status(P) ->
-    Items = [status, message_queue_len, reductions,
-	     heap_size, stack_size],
-    {manager_status, process_status(P,Items,[])}.
-
-
-process_status(P,[],L) ->
-    [{pid,P}|lists:reverse(L)];
-process_status(P,[H|T],L) ->
-    case (catch process_info(P,H)) of
-	{H, Value} ->
-	    process_status(P,T,[{H,Value}|L]);
-	_ ->
-	    process_status(P,T,[{H,undefined}|L])
-    end.
-	
 make_name(Addr,Port) ->
     httpd_util:make_name("httpd",Addr,Port).
 
@@ -885,10 +458,31 @@ report_error(State,String) ->
     mod_log:report_error(Cdb,String),
     mod_disk_log:report_error(Cdb,String).
         
-%%
-call(ServerRef,Request) ->
-    gen_server:call(ServerRef,Request).
+call(ServerRef, Request) ->
+    try gen_server:call(ServerRef, Request, infinity) 
+    catch
+	exit:_ ->
+	    {error, closed} 
+    end.
+
+count_children(Sup) ->
+    Children = supervisor:count_children(whereis(Sup)),
+    proplists:get_value(workers, Children).
 
-cast(ServerRef,Message) ->
-    gen_server:cast(ServerRef,Message).
+shutdown_connections(Sup) ->
+    Children = [Child || {_,Child,_,_} <- supervisor:which_children(Sup)],
+    lists:foreach(fun(Pid) -> exit(Pid, kill) end,
+		  Children).
+
+wait_for_shutdown(CSup, Manager) ->	      
+    case count_children(CSup) of
+	0 ->
+	    Manager ! connections_terminated;
+	_ ->
+	    receive 
+	    after 500 ->
+		    ok
+	    end,
+	    wait_for_shutdown(CSup, Manager)
+    end.	
 
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl
index 0f47d785ef..bd37066ff6 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %% 
 %% The 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 @@
 -behaviour(gen_server).
 
 %% Application internal API
--export([start/2, start/3, socket_ownership_transfered/3]).
+-export([start_link/2, start_link/3, socket_ownership_transfered/3]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -57,10 +57,10 @@
 %% Description: Starts a httpd-request handler process. Intended to be
 %% called by the httpd acceptor process.
 %%--------------------------------------------------------------------
-start(Manager, ConfigDB) ->
-    start(Manager, ConfigDB, 15000).
-start(Manager, ConfigDB, AcceptTimeout) ->
-    proc_lib:start(?MODULE, init, [[Manager, ConfigDB,AcceptTimeout]]).
+start_link(Manager, ConfigDB) ->
+    start_link(Manager, ConfigDB, 15000).
+start_link(Manager, ConfigDB, AcceptTimeout) ->
+    proc_lib:start_link(?MODULE, init, [[Manager, ConfigDB,AcceptTimeout]]).
 
 
 %%--------------------------------------------------------------------
@@ -87,34 +87,27 @@ socket_ownership_transfered(Pid, SocketType, Socket) ->
 %% gen_server provides is needed. 
 %%--------------------------------------------------------------------
 init([Manager, ConfigDB, AcceptTimeout]) ->
-    ?hdrd("initiate", 
-	  [{manager, Manager}, {cdb, ConfigDB}, {timeout, AcceptTimeout}]),
+    process_flag(trap_exit, true),
     %% Make sure this process terminates if the httpd manager process
     %% should die!
-    link(Manager), 
+    %%link(Manager), 
     %% At this point the function httpd_request_handler:start/2 will return.
     proc_lib:init_ack({ok, self()}),
     
     {SocketType, Socket} = await_socket_ownership_transfer(AcceptTimeout),
-    ?hdrd("socket ownership transfered", 
-	  [{socket_type, SocketType}, {socket, Socket}]),
-
+ 
     TimeOut = httpd_util:lookup(ConfigDB, keep_alive_timeout, 150000),
     Then = erlang:now(),
     
-    ?hdrd("negotiate", []),
     case http_transport:negotiate(SocketType, Socket, TimeOut) of
-	{error, Error} ->
-	    ?hdrd("negotiation failed", [{error, Error}]),
-	    exit(Error); %% Can be 'normal'.
+	{error, _Error} ->
+	    exit(shutdown); %% Can be 'normal'.
 	ok ->
-	    ?hdrt("negotiation successfull", []),
 	    NewTimeout = TimeOut - timer:now_diff(now(),Then) div 1000,
 	    continue_init(Manager, ConfigDB, SocketType, Socket, NewTimeout)
     end.
 
 continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
-    ?hdrt("continue init", [{timeout, TimeOut}]),
     Resolve = http_transport:resolve(),
     
     Peername = httpd_socket:peername(SocketType, Socket),
@@ -139,14 +132,10 @@ continue_init(Manager, ConfigDB, SocketType, Socket, TimeOut) ->
 		   max_keep_alive_request = NrOfRequest,
 		   mfa                    = MFA},
     
-    ?hdrt("activate request timeout", []),
-    
-    ?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).
+     gen_server:enter_loop(?MODULE, [], NewState).
 
 
 %%====================================================================
@@ -195,18 +184,13 @@ handle_cast(Msg, #state{mod = ModData} = State) ->
 %% Description: Handling all non call/cast messages
 %%--------------------------------------------------------------------
 handle_info({Proto, Socket, Data}, 
-	    #state{mfa = {Module, Function, Args} = MFA,
+	    #state{mfa = {Module, Function, Args},
 		   mod = #mod{socket_type = SockType, 
 			      socket = Socket} = ModData} = State) 
   when (((Proto =:= tcp) orelse 
 	 (Proto =:= ssl) orelse 
 	 (Proto =:= dummy)) andalso is_binary(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 ->
@@ -214,10 +198,8 @@ handle_info({Proto, Socket, Data},
 		      _ ->
 			  State#state.data + byte_size(Data)
 		  end,
-    ?hdrt("data processed", [{processing_result, PROCESSED}]),
     case PROCESSED of
         {ok, Result} ->
-	    ?hdrd("data processed", [{result, Result}]),
 	    NewState = case NewDataSize of
 			   undefined ->
 			       cancel_request_timeout(State);
@@ -227,7 +209,6 @@ handle_info({Proto, Socket, Data},
             handle_http_msg(Result, NewState); 
 
 	{error, {uri_too_long, MaxSize}, Version} ->
-	    ?hdrv("uri too long", [{max_size, MaxSize}, {version, Version}]),
 	    NewModData =  ModData#mod{http_version = Version},
 	    httpd_response:send_status(NewModData, 414, "URI too long"),
 	    Reason = io_lib:format("Uri too long, max size is ~p~n", 
@@ -236,8 +217,6 @@ handle_info({Proto, Socket, Data},
 	    {stop, normal, State#state{response_sent = true, 
 				       mod = NewModData}};
 	{error, {header_too_long, MaxSize}, Version} ->
-	    ?hdrv("header too long", 
-		  [{max_size, MaxSize}, {version, Version}]),
 	    NewModData =  ModData#mod{http_version = Version},
 	    httpd_response:send_status(NewModData, 413, "Header too long"),
 	    Reason = io_lib:format("Header too long, max size is ~p~n", 
@@ -246,7 +225,6 @@ handle_info({Proto, Socket, Data},
 	    {stop, normal, State#state{response_sent = true, 
 				       mod = NewModData}};
 	NewMFA ->
-	    ?hdrd("data processed - reactivate socket", [{new_mfa, NewMFA}]),
 	    http_transport:setopts(SockType, Socket, [{active, once}]),
 	    case NewDataSize of
 		undefined ->
@@ -267,9 +245,9 @@ handle_info({ssl_error, _, _} = Reason, State) ->
     {stop, Reason, State};
 
 %% Timeouts
-handle_info(timeout, #state{mod = ModData, mfa = {_, parse, _}} = State) ->
-    error_log("No request received on keep-alive connection "
-	      "before server side timeout", ModData),
+handle_info(timeout, #state{mfa = {_, parse, _}} = State) ->
+    %% error_log("No request received on keep-alive connection "
+    %% 	      "before server side timeout", ModData),
     %% No response should be sent!
     {stop, normal, State#state{response_sent = true}}; 
 handle_info(timeout, #state{mod = ModData} = State) ->
@@ -293,6 +271,10 @@ handle_info(check_data, #state{data = Data, byte_limit = Byte_Limit} = State) ->
 	_ ->
 	    {stop, normal, State#state{response_sent = true}}
     end;
+
+handle_info({'EXIT', _, Reason}, State) ->
+    {stop, Reason, State};
+
 %% Default case
 handle_info(Info, #state{mod = ModData} = State) ->
     Error = lists:flatten(
@@ -316,15 +298,16 @@ terminate(normal, State) ->
     do_terminate(State);
 terminate(Reason, #state{response_sent = false, mod = ModData} = State) ->
     httpd_response:send_status(ModData, 500, none),
-    error_log(httpd_util:reason_phrase(500), ModData),
+     ReasonStr = 
+	lists:flatten(io_lib:format("~s - ~p", 
+				    [httpd_util:reason_phrase(500), Reason])),
+    error_log(ReasonStr, ModData),
     terminate(Reason, State#state{response_sent = true, mod = ModData});
 terminate(_Reason, State) ->
     do_terminate(State).
 
-do_terminate(#state{mod = ModData, manager = Manager} = State) ->
-    catch httpd_manager:done_connection(Manager),
+do_terminate(#state{mod = ModData} = State) ->
     cancel_request_timeout(State),
-    %% receive after 5000 -> ok end, 
     httpd_socket:close(ModData#mod.socket_type, ModData#mod.socket).
 
 
@@ -352,30 +335,24 @@ await_socket_ownership_transfer(AcceptTimeout) ->
 
 handle_http_msg({_, _, Version, {_, _}, _}, 
 		#state{status = busy, mod = ModData} = State) -> 
-    ?hdrt("handle http msg when manager busy", [{mod, ModData}]),
     handle_manager_busy(State#state{mod = 
 				    ModData#mod{http_version = Version}}),
     {stop, normal, State}; 
 
 handle_http_msg({_, _, Version, {_, _}, _}, 
 		#state{status = blocked, mod = ModData} = State) ->
-    ?hdrt("handle http msg when manager blocket", [{mod, ModData}]),
     handle_manager_blocked(State#state{mod = 
 				       ModData#mod{http_version = Version}}),
     {stop, normal, State}; 
 
 handle_http_msg({Method, Uri, Version, {RecordHeaders, Headers}, Body},
 		#state{status = accept, mod = ModData} = State) ->        
-    ?hdrt("handle http msg when manager accepting", 
-	  [{method, Method}, {mod, ModData}]),
     case httpd_request:validate(Method, Uri, Version) of
 	ok  ->
-	    ?hdrt("request validated", []),
 	    {ok, NewModData} = 
 		httpd_request:update_mod_data(ModData, Method, Uri,
 					      Version, Headers),
       
-	    ?hdrt("new mod data", [{mod, NewModData}]),
 	    case is_host_specified_if_required(NewModData#mod.absolute_uri,
 					       RecordHeaders, Version) of
 		true ->
@@ -389,23 +366,18 @@ handle_http_msg({Method, Uri, Version, {RecordHeaders, Headers}, Body},
 		    {stop, normal, State#state{response_sent = true}}
 	    end;
 	{error, {not_supported, What}} ->
-	    ?hdrd("validation failed: not supported", [{what, What}]),
 	    httpd_response:send_status(ModData#mod{http_version = Version},
 				       501, {Method, Uri, Version}),
 	    Reason = io_lib:format("Not supported: ~p~n", [What]),
 	    error_log(Reason, ModData),
 	    {stop, normal, State#state{response_sent = true}};
 	{error, {bad_request, {forbidden, URI}}} ->
-	    ?hdrd("validation failed: bad request - forbidden", 
-		  [{uri, URI}]),
 	    httpd_response:send_status(ModData#mod{http_version = Version},
 				       403, URI),
 	    Reason = io_lib:format("Forbidden URI: ~p~n", [URI]),
 	    error_log(Reason, ModData),
 	    {stop, normal, State#state{response_sent = true}};
 	{error, {bad_request, {malformed_syntax, URI}}} ->
-	    ?hdrd("validation failed: bad request - malformed syntax", 
-		  [{uri, URI}]),
 	    httpd_response:send_status(ModData#mod{http_version = Version},
 				       400, URI),
 	    Reason = io_lib:format("Malformed syntax in URI: ~p~n", [URI]),
@@ -414,12 +386,9 @@ handle_http_msg({Method, Uri, Version, {RecordHeaders, Headers}, Body},
     end;
 handle_http_msg({ChunkedHeaders, Body}, 
 		State = #state{headers = Headers}) ->
-    ?hdrt("handle http msg", 
-	  [{chunked_headers, ChunkedHeaders}, {body, Body}]),
     NewHeaders = http_chunk:handle_headers(Headers, ChunkedHeaders),
     handle_response(State#state{headers = NewHeaders, body = Body});
 handle_http_msg(Body, State) ->
-    ?hdrt("handle http msg", [{body, Body}]),
     handle_response(State#state{body = Body}).
 
 handle_manager_busy(#state{mod = #mod{config_db = ConfigDB}} = State) ->
@@ -442,7 +411,6 @@ is_host_specified_if_required(_, _, _) ->
     true.
 
 handle_body(#state{mod = #mod{config_db = ConfigDB}} = State) ->
-    ?hdrt("handle body", []),    
     MaxHeaderSize = max_header_size(ConfigDB), 
     MaxBodySize   = max_body_size(ConfigDB), 
    
@@ -456,34 +424,22 @@ handle_body(#state{mod = #mod{config_db = ConfigDB}} = State) ->
 	
 handle_body(#state{headers = Headers, body = Body, mod = ModData} = State,
 	    MaxHeaderSize, MaxBodySize) ->
-    ?hdrt("handle body", [{headers, Headers}, {body, Body}]),    
     case Headers#http_request_h.'transfer-encoding' of
 	"chunked" ->
-	    ?hdrt("chunked - attempt decode", []),    
 	    case http_chunk:decode(Body, MaxBodySize, MaxHeaderSize) of
 		{Module, Function, Args} ->
-		    ?hdrt("chunk decoded", 
-			  [{module, Module}, 
-			   {function, Function}, 
-			   {args, Args}]),    
 		    http_transport:setopts(ModData#mod.socket_type, 
 					   ModData#mod.socket, 
 					   [{active, once}]),
 		    {noreply, State#state{mfa = 
 					  {Module, Function, Args}}};
 		{ok, {ChunkedHeaders, NewBody}} ->
-		    ?hdrt("chunk decoded", 
-			  [{chunked_headers, ChunkedHeaders}, 
-			   {new_body, NewBody}]),    
 		    NewHeaders = 
 			http_chunk:handle_headers(Headers, ChunkedHeaders),
-		    ?hdrt("chunked - headers handled", 
-			  [{new_headers, NewHeaders}]),    
 		    handle_response(State#state{headers = NewHeaders,
 						body = NewBody})
 	    end;
 	Encoding when is_list(Encoding) ->
-	    ?hdrt("not chunked - encoding", [{encoding, Encoding}]),    
 	    httpd_response:send_status(ModData, 501, 
 				       "Unknown Transfer-Encoding"),
 	    Reason = io_lib:format("Unknown Transfer-Encoding: ~p~n", 
@@ -491,17 +447,12 @@ handle_body(#state{headers = Headers, body = Body, mod = ModData} = State,
 	    error_log(Reason, ModData),
 	    {stop, normal, State#state{response_sent = true}};
 	_ -> 
-	    ?hdrt("not chunked", []),    
 	    Length = 
 		list_to_integer(Headers#http_request_h.'content-length'),
 	    case ((Length =< MaxBodySize) or (MaxBodySize == nolimit)) of
 		true ->
 		    case httpd_request:whole_body(Body, Length) of 
 			{Module, Function, Args} ->
-			    ?hdrt("whole body", 
-				  [{module, Module}, 
-				   {function, Function}, 
-				   {args, Args}]),    
 			    http_transport:setopts(ModData#mod.socket_type, 
 						   ModData#mod.socket, 
 						   [{active, once}]),
@@ -509,15 +460,11 @@ handle_body(#state{headers = Headers, body = Body, mod = ModData} = State,
 						  {Module, Function, Args}}};
 			
 			{ok, NewBody} ->
-			    ?hdrt("whole body", 
-				  [{new_body, NewBody}]),    
 			    handle_response(
 			      State#state{headers = Headers,
 					  body = NewBody})
 		    end;
 		false ->
-		    ?hdrd("body too long", 
-			  [{length, Length}, {max_body_size, MaxBodySize}]),
 		    httpd_response:send_status(ModData, 413, "Body too long"),
 		    error_log("Body too long", ModData),
 		    {stop, normal,  State#state{response_sent = true}}
@@ -579,8 +526,6 @@ handle_response(#state{body    = Body,
 		       mod     = ModData, 
 		       headers = Headers,
 		       max_keep_alive_request = Max} = State) when Max > 0 ->
-    ?hdrt("handle response", 
-	  [{body, Body}, {mod, ModData}, {headers, Headers}, {max, Max}]),    
     {NewBody, Data} = httpd_request:body_data(Headers, Body),
     ok = httpd_response:generate_and_send_response(
 	   ModData#mod{entity_body = NewBody}),
@@ -589,8 +534,6 @@ handle_response(#state{body    = Body,
 handle_response(#state{body    = Body, 
 		       headers = Headers, 
 		       mod     = ModData} = State) ->
-    ?hdrt("handle response", 
-	  [{body, Body}, {mod, ModData}, {headers, Headers}]),    
     {NewBody, _} = httpd_request:body_data(Headers, Body),
     ok = httpd_response:generate_and_send_response(
 	   ModData#mod{entity_body = NewBody}),
@@ -598,7 +541,6 @@ handle_response(#state{body    = Body,
 
 handle_next_request(#state{mod = #mod{connection = true} = ModData,
 			   max_keep_alive_request = Max} = State, Data) ->
-    ?hdrt("handle next request", [{max, Max}]),    
 
     NewModData = #mod{socket_type = ModData#mod.socket_type, 
  		      socket      = ModData#mod.socket, 
@@ -627,11 +569,9 @@ handle_next_request(#state{mod = #mod{connection = true} = ModData,
     end;
 
 handle_next_request(State, _) ->
-    ?hdrt("handle next request - stop", []),    
     {stop, normal, State}.
 
 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) ->
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl
index 6b6532266b..0895729d05 100644
--- a/lib/inets/src/http_server/httpd_response.erl
+++ b/lib/inets/src/http_server/httpd_response.erl
@@ -20,12 +20,13 @@
 -module(httpd_response).
 -export([generate_and_send_response/1, send_status/3, send_header/3, 
 	 send_body/3, send_chunk/3, send_final_chunk/2, split_header/2,
-	 is_disable_chunked_send/1, cache_headers/1]).
+	 is_disable_chunked_send/1, cache_headers/2]).
 -export([map_status_code/2]).
 
--include("httpd.hrl").
--include("http_internal.hrl").
--include("httpd_internal.hrl").
+-include_lib("inets/src/inets_app/inets_internal.hrl").
+-include_lib("inets/include/httpd.hrl").
+-include_lib("inets/src/http_lib/http_internal.hrl").
+-include_lib("inets/src/http_server/httpd_internal.hrl").
 
 -define(VMODULE,"RESPONSE").
 
@@ -35,7 +36,7 @@ generate_and_send_response(#mod{init_data =
 				#init_data{peername = {_,"unknown"}}}) ->
     ok;
 generate_and_send_response(#mod{config_db = ConfigDB} = ModData) ->
-    Modules = httpd_util:lookup(ConfigDB,modules, ?DEFAULT_MODS),
+    Modules = httpd_util:lookup(ConfigDB, modules, ?DEFAULT_MODS),
     case traverse_modules(ModData, Modules) of
 	done ->
 	    ok;
@@ -68,16 +69,7 @@ traverse_modules(ModData,[]) ->
   {proceed,ModData#mod.data};
 traverse_modules(ModData,[Module|Rest]) ->
     ?hdrd("traverse modules", [{callback_module, Module}]), 
-    case (catch apply(Module, do, [ModData])) of
-	{'EXIT', Reason} ->
-	    String = 
-		lists:flatten(
-		  io_lib:format("traverse exit from apply: ~p:do => ~n~p",
-				[Module, Reason])),
-	    report_error(mod_log, ModData#mod.config_db, String),
-	    report_error(mod_disk_log, ModData#mod.config_db, String),
-	    send_status(ModData, 500, none),
-	    done;
+    try apply(Module, do, [ModData]) of
 	done ->
 	    ?hdrt("traverse modules - done", []), 
 	    done;
@@ -87,6 +79,19 @@ traverse_modules(ModData,[Module|Rest]) ->
 	{proceed, NewData} ->
 	    ?hdrt("traverse modules - proceed", [{new_data, NewData}]), 
 	    traverse_modules(ModData#mod{data = NewData}, Rest)
+    catch 
+	T:E ->
+	    String = 
+		lists:flatten(
+		  io_lib:format("module traverse failed: ~p:do => "
+				"~n   Error Type:  ~p"
+				"~n   Error:       ~p"
+				"~n   Stack trace: ~p",
+				[Module, T, E, ?STACK()])),
+	    report_error(mod_log, ModData#mod.config_db, String),
+	    report_error(mod_disk_log, ModData#mod.config_db, String),
+	    send_status(ModData, 500, none),
+	    done
     end.
 
 %% send_status %%
@@ -266,8 +271,8 @@ get_connection(false,"HTTP/1.1") ->
 get_connection(_,_) ->
     "".
 
-cache_headers(#mod{config_db = Db}) ->
-    case httpd_util:lookup(Db, script_nocache, false) of
+cache_headers(#mod{config_db = Db}, NoCacheType) ->
+    case httpd_util:lookup(Db, NoCacheType, false) of
 	true ->
 	    Date = httpd_util:rfc1123_date(),
 	    [{"cache-control", "no-cache"},
diff --git a/lib/inets/src/http_server/mod_cgi.erl b/lib/inets/src/http_server/mod_cgi.erl
index c854166c29..d933b0a4ba 100644
--- a/lib/inets/src/http_server/mod_cgi.erl
+++ b/lib/inets/src/http_server/mod_cgi.erl
@@ -131,9 +131,9 @@ store({script_nocache, Value} = Conf, _)
     {ok, Conf};
 store({script_nocache, Value}, _) ->
     {error, {wrong_type, {script_nocache, Value}}};
-store({script_timeout, Value} = Conf, _) 
+store({script_timeout, Value}, _) 
   when is_integer(Value), Value >= 0 ->
-    {ok, Conf};
+    {ok, {script_timeout, Value * 1000}};
 store({script_timeout, Value}, _) ->
     {error, {wrong_type, {script_timeout, Value}}}.
 	
@@ -238,7 +238,7 @@ send_request_body_to_script(ModData, Port) ->
     end.	
 	   
 deliver_webpage(#mod{config_db = Db} = ModData, Port) ->
-    Timeout = cgi_timeout(Db),    
+    Timeout = script_timeout(Db),    
     case receive_headers(Port, httpd_cgi, parse_headers, 
 			 [<<>>, [], []], Timeout) of
 	{Headers, Body} ->
@@ -295,7 +295,7 @@ receive_headers(Port, Module, Function, Args, Timeout) ->
       end.
 
 send_headers(ModData, {StatusCode, _}, HTTPHeaders) ->
-    ExtraHeaders = httpd_response:cache_headers(ModData),
+    ExtraHeaders = httpd_response:cache_headers(ModData, script_nocache),
     httpd_response:send_header(ModData, StatusCode, 
 			       ExtraHeaders ++ HTTPHeaders).
 
@@ -341,8 +341,8 @@ script_elements(#mod{method = "PUT", entity_body = Body}, _) ->
 script_elements(_, _) ->
     [].
 
-cgi_timeout(Db) ->
-    httpd_util:lookup(Db, cgi_timeout, ?DEFAULT_CGI_TIMEOUT).
+script_timeout(Db) ->
+    httpd_util:lookup(Db, script_timeout, ?DEFAULT_CGI_TIMEOUT).
 
 %% Convert error to printable string
 %%
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index e36c33b282..b11df34f9e 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -440,7 +440,7 @@ receive_headers(Timeout) ->
     end.
 
 send_headers(ModData, StatusCode, HTTPHeaders) ->
-    ExtraHeaders = httpd_response:cache_headers(ModData),
+    ExtraHeaders = httpd_response:cache_headers(ModData, erl_script_nocache),
     httpd_response:send_header(ModData, StatusCode, 
 			       ExtraHeaders ++ HTTPHeaders).
 
diff --git a/lib/inets/src/http_server/mod_head.erl b/lib/inets/src/http_server/mod_head.erl
index c346fd4d23..02b8485b25 100644
--- a/lib/inets/src/http_server/mod_head.erl
+++ b/lib/inets/src/http_server/mod_head.erl
@@ -42,6 +42,10 @@ do(Info) ->
 			%% A response has been sent! Nothing to do about it!
 			{already_sent, _StatusCode, _Size} ->
 			    {proceed,Info#mod.data};
+			{response, Header, _Body} -> %% New way
+			    {proceed, 
+			     lists:keyreplace(response, 1, Info#mod.data, 
+					      {response, Header, nobody})};
 			%% A response has been generated!
 			{_StatusCode, _Response} ->
 			    {proceed,Info#mod.data}
diff --git a/lib/inets/src/inets_app/inets.app.src b/lib/inets/src/inets_app/inets.app.src
index 4aea2ef3d7..a6dd364c2d 100644
--- a/lib/inets/src/inets_app/inets.app.src
+++ b/lib/inets/src/inets_app/inets.app.src
@@ -1,7 +1,7 @@
 %% This is an -*- erlang -*- file.
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
 %%
 %% The 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,6 +59,7 @@
             httpd_acceptor,
             httpd_acceptor_sup,
 	    httpd_cgi,
+	    httpd_connection_sup,
             httpd_conf,
 	    httpd_esi,
             httpd_example,
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index c63dcafa6c..7a909b2f3f 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -1,7 +1,7 @@
-%% This is an -*- erlang -*- file.
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The 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,11 +15,7 @@
 %% under the License.
 %%
 %% %CopyrightEnd%
-
 {"%VSN%",
- [
-  {<<"5\\.*">>, [{restart_application, inets}]}
- ], 
- [
-  {<<"5\\.*">>, [{restart_application, inets}]}
-]}.
+ [{<<"5\\..*">>,[{restart_application, inets}]}],
+ [{<<"5\\..*">>,[{restart_application, inets}]}]
+}.
diff --git a/lib/inets/src/inets_app/inets_internal.hrl b/lib/inets/src/inets_app/inets_internal.hrl
index e56af3b59d..06843f2275 100644
--- a/lib/inets/src/inets_app/inets_internal.hrl
+++ b/lib/inets/src/inets_app/inets_internal.hrl
@@ -21,6 +21,8 @@
 -ifndef(inets_internal_hrl).
 -define(inets_internal_hrl, true).
 
+-define(STACK(), erlang:get_stacktrace()).
+
 %% Various trace macros
 
 -define(report(Severity, Label, Service, Content), 
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index dfa86906fd..c156b34406 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -151,33 +151,21 @@ MODULES =                 		\
 	inets_test_lib    		\
 	erl_make_certs                  \
 	ftp_SUITE 	  		\
+	ftp_suite_lib			\
 	ftp_format_SUITE  		\
-	ftp_solaris8_sparc_test		\
-	ftp_solaris9_sparc_test		\
-	ftp_solaris10_sparc_test	\
-	ftp_solaris10_x86_test		\
-	ftp_linux_x86_test		\
-	ftp_linux_ppc_test		\
-	ftp_macosx_x86_test		\
-	ftp_macosx_ppc_test		\
-	ftp_openbsd_x86_test		\
-	ftp_freebsd_x86_test		\
-	ftp_netbsd_x86_test		\
-	ftp_windows_xp_test		\
-	ftp_windows_2003_server_test	\
-	ftp_suite_lib	  		\
-	ftp_ticket_test			\
 	http_format_SUITE 		\
 	httpc_SUITE	  		\
 	httpc_cookie_SUITE		\
 	httpc_proxy_SUITE		\
 	httpd_SUITE       		\
+	old_httpd_SUITE       		\
 	httpd_basic_SUITE		\
 	httpd_mod 	  		\
 	httpd_block	  		\
 	httpd_load        		\
 	httpd_time_test	  		\
 	httpd_1_1         		\
+	httpd_1_0                       \
 	httpd_test_lib    		\
 	inets_sup_SUITE   		\
 	inets_SUITE       		\
@@ -215,7 +203,7 @@ INETS_FILES = inets.config $(INETS_SPECS)
 # 	inets_tftp_suite
 
 INETS_DATADIRS = inets_SUITE_data inets_sup_SUITE_data 
-HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data
+HTTPD_DATADIRS = httpd_test_data httpd_SUITE_data httpd_basic_SUITE_data old_httpd_SUITE_data
 HTTPC_DATADIRS = httpc_SUITE_data httpc_proxy_SUITE_data
 FTP_DATADIRS   = ftp_SUITE_data  
 
diff --git a/lib/inets/test/ftp_SUITE.erl b/lib/inets/test/ftp_SUITE.erl
index 17e5f6777e..e39f9f1eb6 100644
--- a/lib/inets/test/ftp_SUITE.erl
+++ b/lib/inets/test/ftp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The 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,110 +18,803 @@
 %%
 %%
 
+%% 
+%% ct:run("../inets_test", ftp_SUITE).
+%%
+
 -module(ftp_SUITE).
 
+-include_lib("kernel/include/file.hrl").
 -include_lib("common_test/include/ct.hrl").
--include("test_server_line.hrl").
+-include("inets_test_lib.hrl").
 
-%% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
-% -export([init_per_testcase/2, end_per_testcase/2]).
--export([init_per_suite/1, end_per_suite/1]).
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
 
 -define(FTP_USER, "anonymous").
--define(FTP_PASS, passwd()).
--define(FTP_PORT, 21).
+-define(FTP_PASS(Cmnt), (fun({ok,__H}) -> "ftp_SUITE_"++Cmnt++"@" ++ __H;
+			    (_) -> "ftp_SUITE_"++Cmnt++"@localhost"
+			 end)(inet:gethostname())
+       ).
 
 -define(BAD_HOST, "badhostname").
 -define(BAD_USER, "baduser").
 -define(BAD_DIR,  "baddirectory").
 
--ifdef(ftp_debug_client).
--define(ftp_open(Host, Flags), do_ftp_open(Host, [debug] ++ Flags)).
--else.
--ifdef(ftp_trace_client).
--define(ftp_open(Host, Flags), do_ftp_open(Host, [trace] ++ Flags)).
--else.
--define(ftp_open(Host, Flags), do_ftp_open(Host, [verbose] ++ Flags)).
--endif.
--endif.
-
+go() -> ct:run_test([{suite,"ftp_SUITE"}, {logdir,"LOG"}]).
+gos() -> ct:run_test([{suite,"ftp_SUITE"}, {group,ftps_passive}, {logdir,"LOG"}]).
 
 %%--------------------------------------------------------------------
-%% all(Arg) -> [Doc] | [Case] | {skip, Comment}
-%% Arg - doc | suite
-%% Doc - string()
-%% Case - atom() 
-%%	Name of a test case function. 
-%% Comment - string()
-%% Description: Returns documentation/test cases in this test suite
-%%		or a skip tuple if the platform is not supported.  
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-suite() -> [{ct_hooks, [ts_install_cth]}].
+all() ->
+    [
+     {group, ftp_passive},
+     {group, ftp_active},
+     {group, ftps_passive},
+     {group, ftps_active}
+    ].
 
-all() -> 
+groups() ->
     [
-     {group, solaris8_test},   
-     {group, solaris9_test},
-     {group, solaris10_test}, 
-     {group, linux_x86_test},
-     {group, linux_ppc_test}, 
-     {group, macosx_x86_test},
-     {group, macosx_ppc_test}, 
-     {group, openbsd_test},
-     {group, freebsd_test}, 
-     {group, netbsd_test},
-     {group, windows_xp_test},
-     {group, windows_2003_server_test},
-     {group, ticket_tests}
+     {ftp_passive, [], ftp_tests()},
+     {ftp_active, [], ftp_tests()},
+     {ftps_passive, [], ftp_tests()},
+     {ftps_active, [], ftp_tests()}
     ].
 
-groups() -> 
+ftp_tests()->
     [
-     {solaris8_test,            [], [{ftp_solaris8_sparc_test, all}]},
-     {solaris9_test,            [], [{ftp_solaris9_sparc_test, all}]},
-     {solaris10_test,           [], [{ftp_solaris10_sparc_test, all},
-				     {ftp_solaris10_x86_test, all}]},
-     {linux_x86_test,           [], [{ftp_linux_x86_test, all}]},
-     {linux_ppc_test,           [], [{ftp_linux_ppc_test, all}]},
-     {macosx_x86_test,          [], [{ftp_macosx_x86_test, all}]},
-     {macosx_ppc_test,          [], [{ftp_macosx_ppc_test, all}]},
-     {openbsd_test,             [], [{ftp_openbsd_x86_test, all}]},
-     {freebsd_test,             [], [{ftp_freebsd_x86_test, all}]},
-     {netbsd_test,              [], [{ftp_netbsd_x86_test, all}]},
-     {windows_xp_test,          [], [{ftp_windows_xp_test, all}]},
-     {windows_2003_server_test, [], [{ftp_windows_2003_server_test, all}]},
-     {ticket_tests,             [], [{ftp_ticket_test, all}]}
+     user,
+     bad_user,
+     pwd, 
+     cd, 
+     lcd,
+     ls, 
+     nlist, 
+     rename, 
+     delete, 
+     mkdir, 
+     rmdir,
+     send, 
+     send_3,
+     send_bin, 
+     send_chunk, 
+     append, 
+     append_bin,
+     append_chunk, 
+     recv, 
+     recv_3, 
+     recv_bin, 
+     recv_chunk, 
+     type, 
+     quote, 
+     ip_v6_disabled
     ].
 
-init_per_group(_GroupName, Config) ->
-	Config.
+%%--------------------------------------------------------------------
+
+%%% Config
+%%% key			meaning
+%%% ................................................................
+%%% ftpservers		list of servers to check if they are available
+%%%			The element is:
+%%%			  {Name,         % string(). The os command name
+%%%			   StartCommand, % fun()->{ok,start_result()} | {error,string()}.
+%%%			                 % The command to start the daemon with.
+%%%			   ChkUp,        % fun(start_result()) -> string(). Os command to check
+%%%			                 %       if the server is running. [] if not running.
+%%%			                 %       The string in string() is suitable for logging.
+%%%			   StopCommand,  % fun(start_result()) -> void(). The command to stop the daemon with.
+%%%			   AugmentFun,   % fun(config()) -> config() Adds two funs for transforming names of files
+%%%			                 %       and directories to the form they are returned from this server
+%%%			   ServerHost,   % string(). Mostly "localhost"
+%%%			   ServerPort    % pos_integer()
+%%%			  }
+%%%			  
+
+-define(default_ftp_servers,
+	[{"vsftpd",
+	  fun(__CONF__) -> 
+		  DataDir = ?config(data_dir,__CONF__),
+		  ConfFile = filename:join(DataDir, "vsftpd.conf"),
+		  PrivDir = ?config(priv_dir,__CONF__),
+		  AnonRoot = PrivDir,
+		  Cmd = ["vsftpd "++filename:join(DataDir,"vsftpd.conf"),
+			 " -oftpd_banner=erlang_otp_testing",
+			 " -oanon_root=\"",AnonRoot,"\"",
+			 " -orsa_cert_file=\"",filename:join(DataDir,"server-cert.pem"),"\"",
+			 " -orsa_private_key_file=\"",filename:join(DataDir,"server-key.pem"),"\""
+			],
+		  Result = os:cmd(Cmd),
+		  ct:log("Config file:~n~s~n~nServer start command:~n  ~s~nResult:~n  ~p",
+			 [case file:read_file(ConfFile) of
+			      {ok,X} -> X;
+			      _ -> ""
+			  end,
+			  Cmd, Result
+			 ]),
+		  case Result of
+		      [] -> {ok,'dont care'};
+		      [Msg] -> {error,Msg}
+		  end
+	  end,
+	  fun(_StartResult) -> os:cmd("ps ax | grep erlang_otp_testing | grep -v grep")
+	  end,
+	  fun(_StartResult) -> os:cmd("kill `ps ax | grep erlang_otp_testing | awk '/vsftpd/{print $1}'`")
+	  end,
+	  fun(__CONF__) ->
+		  AnonRoot = ?config(priv_dir,__CONF__),
+		  [{id2ftp, fun(Id) -> filename:join(AnonRoot,Id) end},
+		   {id2ftp_result,fun(Id) -> filename:join(AnonRoot,Id) end} | __CONF__]
+	  end,
+	  "localhost",
+	  9999
+	 }
+	]
+       ).
 
-end_per_group(_GroupName, Config) ->
-	Config.
 
+init_per_suite(Config) ->
+    case find_executable(Config) of
+	false -> 
+	    {skip, "No ftp server found"};
+	{ok,Data} -> 
+	    TstDir = filename:join(?config(priv_dir,Config), "test"),
+	    file:make_dir(TstDir),
+	    make_cert_files(dsa, rsa, "server-", ?config(data_dir,Config)),
+	    start_ftpd([{test_dir,TstDir},
+			{ftpd_data,Data}
+			| Config])
+    end.
+
+end_per_suite(Config) ->
+    ps_ftpd(Config),
+    stop_ftpd(Config),
+    ps_ftpd(Config),
+    ok.
+
+%%--------------------------------------------------------------------
+init_per_group(_Group, Config) -> Config.
+    
+end_per_group(_Group, Config) -> Config.
 
+%%--------------------------------------------------------------------
+init_per_testcase(Case, Config0) -> 
+    Group = proplists:get_value(name,?config(tc_group_properties,Config0)),
+    try ?MODULE:Case(doc) of
+	Msg -> ct:comment(Msg)
+    catch
+	_:_-> ok
+    end,
+    TLS = [{tls,[{reuse_sessions,true}]}],
+    ACTIVE = [{mode,active}],
+    PASSIVE = [{mode,passive}],
+    ExtraOpts = [verbose],
+    Config =
+	case Group of
+	    ftp_active   -> ftp__open(Config0,       ACTIVE  ++ExtraOpts);
+	    ftps_active  -> ftp__open(Config0, TLS++ ACTIVE  ++ExtraOpts);
+	    ftp_passive  -> ftp__open(Config0,      PASSIVE  ++ExtraOpts);
+	    ftps_passive -> ftp__open(Config0, TLS++PASSIVE  ++ExtraOpts)
+	end,
+    case Case of
+	user -> Config;
+	bad_user -> Config;
+	_ ->
+	    Pid = ?config(ftp,Config),
+	    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS(atom_to_list(Group)++"-"++atom_to_list(Case)) ),
+	    ok = ftp:cd(Pid, ?config(priv_dir,Config)),
+	    Config
+    end.
 
+    
+end_per_testcase(user, _Config) -> ok;
+end_per_testcase(bad_user, _Config) -> ok;
+end_per_testcase(_Case, Config) -> 
+    case ?config(tc_status,Config) of
+	ok -> ok;
+	_ ->
+	    try ftp:latest_ctrl_response(?config(ftp,Config))
+	    of
+		{ok,S} -> ct:log("***~n*** Latest ctrl channel response:~n***     ~p~n***",[S])
+	    catch
+		_:_ -> ok
+	    end
+    end,
+    ftp__close(Config).
 
 %%--------------------------------------------------------------------
-%% 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
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+user(doc) -> ["Open an ftp connection to a host, and logon as anonymous ftp, then logoff"];
+user(Config) ->
+    Pid = ?config(ftp, Config),
+    ok = ftp:user(Pid, ?FTP_USER, ?FTP_PASS("")),% logon
+    ok = ftp:close(Pid),			% logoff
+    {error,eclosed} = ftp:pwd(Pid),		% check logoff result
+    ok.
+
+%%-------------------------------------------------------------------------
+bad_user(doc) -> ["Open an ftp connection to a host, and logon with bad user."];
+bad_user(Config) ->
+    Pid = ?config(ftp, Config),
+    {error, euser} = ftp:user(Pid, ?BAD_USER, ?FTP_PASS("")),
+    ok.
+
+%%-------------------------------------------------------------------------
+pwd(doc) -> ["Test ftp:pwd/1 & ftp:lpwd/1"];
+pwd(Config0) ->
+    Config = set_state([reset], Config0),
+    Pid = ?config(ftp, Config),
+    {ok, PWD} = ftp:pwd(Pid),
+    {ok, PathLpwd} = ftp:lpwd(Pid),
+    PWD = id2ftp_result("", Config),
+    PathLpwd = id2ftp_result("", Config).
+
+%%-------------------------------------------------------------------------
+cd(doc) -> ["Open an ftp connection, log on as anonymous ftp, and cd to a"
+	    "directory and to a non-existent directory."];
+cd(Config0) ->
+    Dir = "test",
+    Config = set_state([reset,{mkdir,Dir}], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:cd(Pid, id2ftp(Dir,Config)),
+    {ok, PWD} = ftp:pwd(Pid),
+    ExpectedPWD = id2ftp_result(Dir, Config),
+    PWD = ExpectedPWD,
+    {error, epath} = ftp:cd(Pid, ?BAD_DIR).
+
+%%-------------------------------------------------------------------------
+lcd(doc) ->
+    ["Test api function ftp:lcd/2"];
+lcd(Config0) ->
+    Dir = "test",
+    Config = set_state([reset,{mkdir,Dir}], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:lcd(Pid, id2ftp(Dir,Config)),
+    {ok, PWD} = ftp:lpwd(Pid),
+    ExpectedPWD = id2ftp_result(Dir, Config),
+    PWD = ExpectedPWD,
+    {error, epath} = ftp:lcd(Pid, ?BAD_DIR).
+
+%%-------------------------------------------------------------------------
+ls(doc) -> ["Open an ftp connection; ls the current directory, and the "
+	    "\"test\" directory. We assume that ls never fails, since "
+	    "it's output is meant to be read by humans. "];
+ls(Config0) ->
+    Config = set_state([reset,{mkdir,"test"}], Config0),
+    Pid = ?config(ftp, Config),
+    {ok, _R1} = ftp:ls(Pid),
+    {ok, _R2} = ftp:ls(Pid, id2ftp("test",Config)),
+    %% neither nlist nor ls operates on a directory
+    %% they operate on a pathname, which *can* be a 
+    %% directory, but can also be a filename or a group 
+    %% of files (including wildcards).
+    case ?config(wildcard_support, Config) of
+	true ->
+	    {ok, _R3} = ftp:ls(Pid, id2ftp("te*",Config));
+	_ ->
+	    ok
+    end.
+
+%%-------------------------------------------------------------------------
+nlist(doc) -> ["Open an ftp connection; nlist the current directory, and the "
+	       "\"test\" directory. Nlist does not behave consistenly over "
+	       "operating systems. On some it is an error to have an empty "
+	       "directory."];
+nlist(Config0) ->
+    Config = set_state([reset,{mkdir,"test"}], Config0),
+    Pid = ?config(ftp, Config),
+    {ok, _R1} = ftp:nlist(Pid),
+    {ok, _R2} = ftp:nlist(Pid, id2ftp("test",Config)),
+    %% neither nlist nor ls operates on a directory
+    %% they operate on a pathname, which *can* be a 
+    %% directory, but can also be a filename or a group 
+    %% of files (including wildcards).
+    case ?config(wildcard_support, Config) of
+	true ->
+	    {ok, _R3} = ftp:nlist(Pid, id2ftp("te*",Config));
+	_ ->
+	    ok
+    end.
+
+%%-------------------------------------------------------------------------
+rename(doc) -> ["Rename a file."];
+rename(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    OldFile = "old.txt",
+    NewFile = "new.txt",
+    Config = set_state([reset,{mkfile,OldFile,Contents}], Config0),
+    Pid = ?config(ftp, Config),
+
+    ok = ftp:rename(Pid, 
+		    id2ftp(OldFile,Config),
+		    id2ftp(NewFile,Config)),
+
+    true = (chk_file(NewFile,Contents,Config) 
+	    and chk_no_file([OldFile],Config)).
+
+
+%%-------------------------------------------------------------------------
+send(doc) -> ["Transfer a file with ftp using send/2."];
+send(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    SrcDir = "data",
+    File = "file.txt",
+    Config = set_state([reset,{mkfile,[SrcDir,File],Contents}], Config0),
+    Pid = ?config(ftp, Config),
+
+chk_no_file([File],Config),
+chk_file([SrcDir,File],Contents,Config),
+
+    ok = ftp:lcd(Pid, id2ftp(SrcDir,Config)),
+    ok = ftp:cd(Pid, id2ftp("",Config)),
+    ok = ftp:send(Pid, File),
+
+    chk_file(File, Contents, Config).
+
+%%-------------------------------------------------------------------------
+send_3(doc) -> ["Transfer a file with ftp using send/3."];
+send_3(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    Dir = "incoming",
+    File = "file.txt",
+    RemoteFile = "remfile.txt",
+    Config = set_state([reset,{mkfile,File,Contents},{mkdir,Dir}], Config0),
+    Pid = ?config(ftp, Config),
+
+    ok = ftp:cd(Pid, id2ftp(Dir,Config)),
+    ok = ftp:lcd(Pid, id2ftp("",Config)),
+    ok = ftp:send(Pid, File, RemoteFile),
+
+    chk_file([Dir,RemoteFile], Contents, Config).
+
+%%------------------------------------------------------------------------- 
+send_bin(doc) -> ["Send a binary."];
+send_bin(Config0) ->
+    BinContents = <<"ftp_SUITE test ...">>,
+    File = "file.txt",
+    Config = set_state([reset], Config0),
+    Pid = ?config(ftp, Config),
+    {error, enotbinary} = ftp:send_bin(Pid, "some string", id2ftp(File,Config)),
+    ok = ftp:send_bin(Pid, BinContents, id2ftp(File,Config)),
+    chk_file(File, BinContents, Config).
+
+%%-------------------------------------------------------------------------    
+send_chunk(doc) -> ["Send a binary using chunks."];
+send_chunk(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    File = "file.txt",
+    Config = set_state([reset,{mkdir,"incoming"}], Config0),
+    Pid = ?config(ftp, Config),
+
+    ok = ftp:send_chunk_start(Pid, id2ftp(File,Config)),
+    {error, echunk} = ftp:cd(Pid, "incoming"),
+    {error, enotbinary} = ftp:send_chunk(Pid, "some string"),
+    ok = ftp:send_chunk(Pid, Contents),
+    ok = ftp:send_chunk(Pid, Contents),
+    ok = ftp:send_chunk_end(Pid),
+    chk_file(File, <<Contents/binary,Contents/binary>>, Config).
+
+%%-------------------------------------------------------------------------
+delete(doc) -> ["Delete a file."];
+delete(Config0) ->
+    Contents = <<"ftp_SUITE test ...">>,
+    File = "file.txt",
+    Config = set_state([reset,{mkfile,File,Contents}], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:delete(Pid, id2ftp(File,Config)),
+    chk_no_file([File], Config).
+
+%%-------------------------------------------------------------------------
+mkdir(doc) -> ["Make a remote directory."];
+mkdir(Config0) ->
+    NewDir = "new_dir",
+    Config = set_state([reset], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:mkdir(Pid, id2ftp(NewDir,Config)),
+    chk_dir([NewDir], Config).
+
+%%-------------------------------------------------------------------------
+rmdir(doc) -> ["Remove a directory."];
+rmdir(Config0) ->
+    Dir = "dir",
+    Config = set_state([reset,{mkdir,Dir}], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:rmdir(Pid, id2ftp(Dir,Config)),
+    chk_no_dir([Dir], Config).
+
+%%-------------------------------------------------------------------------
+append(doc) -> ["Append a local file twice to a remote file"];
+append(Config0) ->
+    SrcFile = "f_src.txt",
+    DstFile = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset,{mkfile,SrcFile,Contents}], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:append(Pid, id2ftp(SrcFile,Config), id2ftp(DstFile,Config)),
+    ok = ftp:append(Pid, id2ftp(SrcFile,Config), id2ftp(DstFile,Config)),
+    chk_file(DstFile, <<Contents/binary,Contents/binary>>, Config).
+		
+%%-------------------------------------------------------------------------
+append_bin(doc) -> ["Append a local file twice to a remote file using append_bin"];
+append_bin(Config0) ->
+    DstFile = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:append_bin(Pid, Contents, id2ftp(DstFile,Config)),
+    ok = ftp:append_bin(Pid, Contents, id2ftp(DstFile,Config)),
+    chk_file(DstFile, <<Contents/binary,Contents/binary>>, Config).
+
+%%-------------------------------------------------------------------------
+append_chunk(doc) -> ["Append chunks."];
+append_chunk(Config0) ->
+    File = "f_dst.txt",
+    Contents = [<<"ER">>,<<"LE">>,<<"RL">>],
+    Config = set_state([reset], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:append_chunk_start(Pid, id2ftp(File,Config)),
+    {error, enotbinary} = ftp:append_chunk(Pid, binary_to_list(lists:nth(1,Contents))),
+    ok = ftp:append_chunk(Pid,lists:nth(1,Contents)),
+    ok = ftp:append_chunk(Pid,lists:nth(2,Contents)),
+    ok = ftp:append_chunk(Pid,lists:nth(3,Contents)),
+    ok = ftp:append_chunk_end(Pid),
+    chk_file(File, <<"ERLERL">>, Config).
+
+%%-------------------------------------------------------------------------
+recv(doc) -> ["Receive a file using recv/2"];
+recv(Config0) ->
+    File = "f_dst.txt",
+    SrcDir = "a_dir",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset, {mkfile,[SrcDir,File],Contents}], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:cd(Pid, id2ftp(SrcDir,Config)),
+    ok = ftp:lcd(Pid, id2ftp("",Config)),
+    ok = ftp:recv(Pid, File),
+    chk_file(File, Contents, Config).
+
+%%-------------------------------------------------------------------------
+recv_3(doc) -> ["Receive a file using recv/3"];
+recv_3(Config0) ->
+    DstFile = "f_src.txt",
+    SrcFile = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset, {mkfile,SrcFile,Contents}], Config0),
+    Pid = ?config(ftp, Config),
+    ok = ftp:cd(Pid, id2ftp("",Config)),
+    ok = ftp:recv(Pid, SrcFile, id2abs(DstFile,Config)),
+    chk_file(DstFile, Contents, Config).
+
+%%-------------------------------------------------------------------------
+recv_bin(doc) -> ["Receive a file as a binary."];
+recv_bin(Config0) ->
+    File = "f_dst.txt",
+    Contents = <<"ftp_SUITE test ...">>,
+    Config = set_state([reset, {mkfile,File,Contents}], Config0),
+    Pid = ?config(ftp, Config),
+    {ok,Received} = ftp:recv_bin(Pid, id2ftp(File,Config)),
+    find_diff(Received, Contents).
+
+%%-------------------------------------------------------------------------
+recv_chunk(doc) -> ["Receive a file using chunk-wise."];
+recv_chunk(Config0) ->
+    File = "big_file.txt",
+    Contents = list_to_binary( lists:duplicate(1000, lists:seq(0,255)) ),
+    Config = set_state([reset, {mkfile,File,Contents}], Config0),
+    Pid = ?config(ftp, Config),
+    {{error, "ftp:recv_chunk_start/2 not called"},_} = recv_chunk(Pid, <<>>),
+    ok = ftp:recv_chunk_start(Pid, id2ftp(File,Config)),
+    {ok, ReceivedContents, _Ncunks} = recv_chunk(Pid, <<>>),
+    find_diff(ReceivedContents, Contents).
+
+recv_chunk(Pid, Acc) -> recv_chunk(Pid, Acc, 0).
+
+recv_chunk(Pid, Acc, N) ->
+    case ftp:recv_chunk(Pid) of
+	ok -> {ok, Acc, N};
+	{ok, Bin} -> recv_chunk(Pid, <<Acc/binary, Bin/binary>>, N+1);
+	Error -> {Error, N}
+    end.
+
+%%-------------------------------------------------------------------------
+type(doc) -> ["Test that we can change btween ASCCI and binary transfer mode"];
+type(Config) ->
+    Pid = ?config(ftp, Config),
+    ok = ftp:type(Pid, ascii),
+    ok = ftp:type(Pid, binary),
+    ok = ftp:type(Pid, ascii),
+    {error, etype} = ftp:type(Pid, foobar).
+
+%%-------------------------------------------------------------------------
+quote(doc) -> [""];
+quote(Config) ->
+    Pid = ?config(ftp, Config),
+    ["257 \""++_Rest] = ftp:quote(Pid, "pwd"), %% 257
+    [_| _] = ftp:quote(Pid, "help"),
+    %% This negativ test causes some ftp servers to hang. This test
+    %% is not important for the client, so we skip it for now.
+    %%["425 Can't build data connection: Connection refused."] 
+    %% = ftp:quote(Pid, "list"), 
+    ok.
+
+
+%%-------------------------------------------------------------------------
+ip_v6_disabled(doc) -> ["Test ipv4 command PORT"];
+ip_v6_disabled(_Config) ->
+    %%% FIXME!!!! What is this???
+    ok.%% send(Config).
+
+%%-------------------------------------------------------------------------
+%% big_one(doc) ->
+%%     ["Create a local file and transfer it to the remote host into the "
+%%      "the \"incoming\" directory, remove "
+%%      "the local file. Then open a new connection; cd to \"incoming\", "
+%%      "lcd to the private directory; receive the file; delete the "
+%%      "remote file; close connection; check that received file is in "
+%%      "the correct directory; cleanup." ];
+%% big_one(Config) ->
+%%     Pid = ?config(ftp, Config),
+%%     do_recv(Pid, Config).
+ 
+%% do_recv(Pid, Config) ->
+%%     PrivDir = ?config(priv_dir, Config),
+%%     File  = ?config(file, Config),
+%%     Newfile = ?config(new_file, Config),
+%%     AbsFile = filename:absname(File, PrivDir),
+%%     Contents = "ftp_SUITE:recv test ...",
+%%     ok = file:write_file(AbsFile, list_to_binary(Contents)),
+%%     ok = ftp:cd(Pid, "incoming"),
+%%     ftp:delete(Pid, File),		% reset
+%%     ftp:lcd(Pid, PrivDir),
+%%     ok = ftp:send(Pid, File),
+%%     ok = file:delete(AbsFile),		% cleanup
+%%     test_server:sleep(100),
+%%     ok = ftp:lcd(Pid, PrivDir),
+%%     ok = ftp:recv(Pid, File),
+%%     {ok, Files} = file:list_dir(PrivDir),
+%%     true = lists:member(File, Files),
+%%     ok = file:delete(AbsFile), % cleanup
+%%     ok = ftp:recv(Pid, File, Newfile), 
+%%     ok = ftp:delete(Pid, File),		% cleanup
+%%     ok.
+
+
+%%--------------------------------------------------------------------
+%% Internal functions  -----------------------------------------------
+%%--------------------------------------------------------------------
+
+make_cert_files(Alg1, Alg2, Prefix, Dir) ->
+    CaInfo = {CaCert,_} = erl_make_certs:make_cert([{key,Alg1}]),
+    {Cert,CertKey} = erl_make_certs:make_cert([{key,Alg2},{issuer,CaInfo}]),
+    CaCertFile = filename:join(Dir, Prefix++"cacerts.pem"),
+    CertFile = filename:join(Dir, Prefix++"cert.pem"),
+    KeyFile = filename:join(Dir, 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).
+
+%%--------------------------------------------------------------------
+chk_file(Path=[C|_], ExpectedContents, Config) when 0<C,C=<255 ->
+    chk_file([Path], ExpectedContents, Config);
+
+chk_file(PathList, ExpectedContents, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file(AbsPath) of
+	{ok,ExpectedContents} -> 
+	    true;
+	{ok,ReadContents} -> 
+	    {error,{diff,Pos,RC,LC}} = find_diff(ReadContents, ExpectedContents, 1),
+	    ct:log("Bad contents of ~p.~nGot:~n~p~nExpected:~n~p~nDiff at pos ~p ~nRead: ~p~nExp : ~p",
+		   [AbsPath,ReadContents,ExpectedContents,Pos,RC,LC]),
+	    ct:fail("Bad contents of ~p", [Path]);
+	{error,Error} ->
+	    try begin
+		    {ok,CWD} = file:get_cwd(),
+		    ct:log("file:get_cwd()=~p~nfiles:~n~p",[CWD,file:list_dir(CWD)])
+		end
+	    of _ -> ok
+	    catch _:_ ->ok
+	    end,
+	    ct:fail("Error reading ~p: ~p",[Path,Error])
+    end.
+
+
+chk_no_file(Path=[C|_], Config) when 0<C,C=<255 ->
+    chk_no_file([Path], Config);
+
+chk_no_file(PathList, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file(AbsPath) of
+	{error,enoent} -> 
+	    true;
+	{ok,Contents} -> 
+	    ct:log("File ~p exists although it shouldn't. Contents:~n~p",
+		   [AbsPath,Contents]),
+	    ct:fail("File exists: ~p", [Path]);
+	{error,Error} ->
+	    ct:fail("Unexpected error reading ~p: ~p",[Path,Error])
+    end.
+
+
+chk_dir(Path=[C|_], Config) when 0<C,C=<255 ->
+    chk_dir([Path], Config);
+
+chk_dir(PathList, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file_info(AbsPath) of
+	{ok, #file_info{type=directory}} ->
+	    true;
+	{ok, #file_info{type=Type}} ->
+	    ct:fail("Expected dir ~p is a ~p",[Path,Type]);
+	{error,Error} ->
+	    ct:fail("Expected dir ~p: ~p",[Path,Error])
+    end.
+
+chk_no_dir(PathList, Config) ->
+    Path = filename:join(PathList),
+    AbsPath = id2abs(Path,Config),
+    case file:read_file_info(AbsPath) of
+	{error,enoent} ->
+	    true;
+	{ok, #file_info{type=directory}} ->
+	    ct:fail("Dir ~p erroneously exists",[Path]);
+	{ok, #file_info{type=Type}} ->
+	    ct:fail("~p ~p erroneously exists",[Type,Path]);
+	{error,Error} ->
+	    ct:fail("Unexpected error for ~p: ~p",[Path,Error])
+    end.
+
+
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% find a suitable ftpd
 %%
-%% Note: This function is free to add any key/value pairs to the Config
-%% variable, but should NOT alter/remove any existing entries.
+find_executable(Config) ->
+    FTPservers = case ?config(ftpservers,Config) of
+		     undefined -> ?default_ftp_servers;
+		     L -> L
+		 end,
+    case lists:dropwhile(fun not_available/1, FTPservers) of
+	[] -> false;
+	[FTPD_data|_] -> {ok, FTPD_data}
+    end.
+
+not_available({Name,_StartCmd,_ChkUp,_StopCommand,_ConfigUpd,_Host,_Port}) ->
+    os:find_executable(Name) == false.
+
 %%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    inets:start(),
+%% start/stop of ftpd
+%%
+start_ftpd(Config) ->
+    {Name,StartCmd,_ChkUp,_StopCommand,ConfigRewrite,Host,Port} = ?config(ftpd_data, Config),
+    case StartCmd(Config) of
+	{ok,StartResult} ->
+	    [{ftpd_host,Host},
+	     {ftpd_port,Port},
+	     {ftpd_start_result,StartResult} | ConfigRewrite(Config)];
+	{error,Msg} ->
+	    {skip, [Name," not started: ",Msg]}
+    end.
+
+stop_ftpd(Config) ->
+    {_Name,_StartCmd,_ChkUp,StopCommand,_ConfigUpd,_Host,_Port} = ?config(ftpd_data, Config),
+    StopCommand(?config(ftpd_start_result,Config)).
+
+ps_ftpd(Config) ->
+    {_Name,_StartCmd,ChkUp,_StopCommand,_ConfigUpd,_Host,_Port} = ?config(ftpd_data, Config),
+    ct:log( ChkUp(?config(ftpd_start_result,Config)) ).
+
+
+ftpd_running(Config) ->
+    {_Name,_StartCmd,ChkUp,_StopCommand,_ConfigUpd,_Host,_Port} = ?config(ftpd_data, Config),
+    ChkUp(?config(ftpd_start_result,Config)).
+
+%%--------------------------------------------------------------------
+%% start/stop of ftpc
+%%
+ftp__open(Config, Options) ->
+    Host = ?config(ftpd_host,Config),
+    Port = ?config(ftpd_port,Config),
+    ct:log("Host=~p, Port=~p",[Host,Port]),
+    {ok,Pid} = ftp:open(Host, [{port,Port} | Options]),
+    [{ftp,Pid}|Config].
+
+ftp__close(Config) ->
+    ok = ftp:close(?config(ftp,Config)),
     Config.
 
 %%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
+%%
+split(Cs) -> string:tokens(Cs, "\r\n").
+
+%%--------------------------------------------------------------------
+%%
+find_diff(Bin1, Bin2) -> 
+    case find_diff(Bin1, Bin2, 1) of
+	{error, {diff,Pos,RC,LC}} ->
+	    ct:log("Contents differ at position ~p.~nOp1: ~p~nOp2: ~p",[Pos,RC,LC]),
+	    ct:fail("Contents differ at pos ~p",[Pos]);
+	Other ->
+	    Other
+    end.
+
+find_diff(A, A, _) -> true;
+find_diff(<<H,T1/binary>>, <<H,T2/binary>>, Pos) -> find_diff(T1, T2, Pos+1);
+find_diff(RC, LC, Pos) -> {error, {diff, Pos, RC, LC}}.
 %%--------------------------------------------------------------------
-end_per_suite(_Config) ->
-    inets:stop(),
-    ok.
+%%
+set_state(Ops, Config) when is_list(Ops) -> lists:foldl(fun set_state/2, Config, Ops);
+
+set_state(reset, Config) -> 
+    rm('*', id2abs("",Config)),
+    PrivDir = ?config(priv_dir,Config),
+    file:set_cwd(PrivDir),
+    ftp:lcd(?config(ftp,Config),PrivDir),
+    set_state({mkdir,""},Config);
+set_state({mkdir,Id}, Config) ->
+    Abs = id2abs(Id, Config),
+    mk_path(Abs),
+    file:make_dir(Abs),
+    Config;
+set_state({mkfile,Id,Contents}, Config) ->
+    Abs = id2abs(Id, Config),
+    mk_path(Abs),
+    ok = file:write_file(Abs, Contents),
+    Config.
+
+mk_path(Abs) -> lists:foldl(fun mk_path/2, [], filename:split(filename:dirname(Abs))).
+
+mk_path(F, Pfx) ->
+    case file:read_file_info(AbsName=filename:join(Pfx,F)) of
+	{ok,#file_info{type=directory}} ->
+	    AbsName;
+	{error,eexist} ->
+	    AbsName;
+	{error,enoent} ->
+	    ok = file:make_dir(AbsName),
+	    AbsName
+    end.
+    
+
+rm('*', Pfx) ->
+    {ok,Fs} = file:list_dir(Pfx),
+    lists:foreach(fun(F) -> rm(F, Pfx) end, Fs);
+rm(F, Pfx) -> 
+    case file:read_file_info(AbsName=filename:join(Pfx,F)) of
+	{ok,#file_info{type=directory}} ->
+	    {ok,Fs} = file:list_dir(AbsName),
+	    lists:foreach(fun(F1) -> rm(F1,AbsName) end, Fs),
+	    ok = file:del_dir(AbsName);
+
+	{ok,#file_info{type=regular}} ->
+	    ok = file:delete(AbsName);
+
+	{error,enoent} ->
+	    ok
+    end.
+
+%%--------------------------------------------------------------------
+%%
+
+id2abs(Id, Conf) -> filename:join(?config(priv_dir,Conf),ids(Id)).
+id2ftp(Id, Conf) -> (?config(id2ftp,Conf))(ids(Id)).
+id2ftp_result(Id, Conf) -> (?config(id2ftp_result,Conf))(ids(Id)).
+
+ids([[_|_]|_]=Ids) -> filename:join(Ids);
+ids(Id) -> Id.
+
+
+is_expected_absName(Id, File, Conf) -> File = (?config(id2abs,Conf))(Id).
+is_expected_ftpInName(Id, File, Conf) -> File = (?config(id2ftp,Conf))(Id).
+is_expected_ftpOutName(Id, File, Conf) -> File = (?config(id2ftp_result,Conf))(Id).
diff --git a/lib/inets/test/ftp_SUITE_data/vsftpd.conf b/lib/inets/test/ftp_SUITE_data/vsftpd.conf
new file mode 100644
index 0000000000..a5584f5916
--- /dev/null
+++ b/lib/inets/test/ftp_SUITE_data/vsftpd.conf
@@ -0,0 +1,26 @@
+
+###
+### Some parameters are given in the vsftpd start command.
+### 
+### Typical command-line paramters are such that has a file path
+### component like cert files.
+###
+
+
+listen=YES
+listen_port=9999
+run_as_launching_user=YES
+ssl_enable=YES
+allow_anon_ssl=YES
+
+background=YES
+
+write_enable=YES
+anonymous_enable=YES
+anon_upload_enable=YES
+anon_mkdir_write_enable=YES
+anon_other_write_enable=YES
+anon_world_readable_only=NO
+
+### Shouldn't be necessary....
+require_ssl_reuse=NO
diff --git a/lib/inets/test/ftp_freebsd_x86_test.erl b/lib/inets/test/ftp_freebsd_x86_test.erl
deleted file mode 100644
index 1d66779882..0000000000
--- a/lib/inets/test/ftp_freebsd_x86_test.erl
+++ /dev/null
@@ -1,160 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_freebsd_x86_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Freebsd x86 ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(freebsd_x86, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_linux_ppc_test.erl b/lib/inets/test/ftp_linux_ppc_test.erl
deleted file mode 100644
index bba97237f1..0000000000
--- a/lib/inets/test/ftp_linux_ppc_test.erl
+++ /dev/null
@@ -1,158 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_linux_ppc_test).
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Linux ppc ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(linux_ppc, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
diff --git a/lib/inets/test/ftp_linux_x86_test.erl b/lib/inets/test/ftp_linux_x86_test.erl
deleted file mode 100644
index bbefd8231e..0000000000
--- a/lib/inets/test/ftp_linux_x86_test.erl
+++ /dev/null
@@ -1,160 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_linux_x86_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Linux x86 ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(linux_x86, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_macosx_ppc_test.erl b/lib/inets/test/ftp_macosx_ppc_test.erl
deleted file mode 100644
index c9f33b8beb..0000000000
--- a/lib/inets/test/ftp_macosx_ppc_test.erl
+++ /dev/null
@@ -1,159 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_macosx_ppc_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Macosx ppc ").
-
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(macosx_ppc, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
- api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
- {active, [], ftp_suite_lib:active(suite)},
- {progress_report, [],
-  ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(_X) -> {skipped,"unknown error"}.%?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(_X) -> {skipped,"unknown error"}.%%?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_macosx_x86_test.erl b/lib/inets/test/ftp_macosx_x86_test.erl
deleted file mode 100644
index 17b7160b95..0000000000
--- a/lib/inets/test/ftp_macosx_x86_test.erl
+++ /dev/null
@@ -1,159 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_macosx_x86_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Macosx x86 ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(macosx_x86, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
- api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
- {active, [], ftp_suite_lib:active(suite)},
- {progress_report, [],
-  ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-	Config.
-
-end_per_group(_GroupName, Config) ->
-	Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist([{wildcard_support, false} | X]).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist([{wildcard_support, false} | X]). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_netbsd_x86_test.erl b/lib/inets/test/ftp_netbsd_x86_test.erl
deleted file mode 100644
index bb474852c5..0000000000
--- a/lib/inets/test/ftp_netbsd_x86_test.erl
+++ /dev/null
@@ -1,159 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_netbsd_x86_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Netbsd x86 ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(netbsd_x86, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_openbsd_x86_test.erl b/lib/inets/test/ftp_openbsd_x86_test.erl
deleted file mode 100644
index 54fce702a0..0000000000
--- a/lib/inets/test/ftp_openbsd_x86_test.erl
+++ /dev/null
@@ -1,158 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_openbsd_x86_test).
-
-%% Note: This directive should only be used in test suites.
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Openbsd x86 ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(openbsd_x86, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
diff --git a/lib/inets/test/ftp_solaris10_sparc_test.erl b/lib/inets/test/ftp_solaris10_sparc_test.erl
deleted file mode 100644
index 0da50dc91b..0000000000
--- a/lib/inets/test/ftp_solaris10_sparc_test.erl
+++ /dev/null
@@ -1,161 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_solaris10_sparc_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Solaris 10 sparc ").
-
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(solaris10_sparc, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_solaris10_x86_test.erl b/lib/inets/test/ftp_solaris10_x86_test.erl
deleted file mode 100644
index 3e7045bb4d..0000000000
--- a/lib/inets/test/ftp_solaris10_x86_test.erl
+++ /dev/null
@@ -1,162 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 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(ftp_solaris10_x86_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD, ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_), ?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM, "Solaris 10 x86 ").
-
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(solaris10_x86, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-%%--------------------------------------------------------------------
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_solaris8_sparc_test.erl b/lib/inets/test/ftp_solaris8_sparc_test.erl
deleted file mode 100644
index 23dbfc8fe3..0000000000
--- a/lib/inets/test/ftp_solaris8_sparc_test.erl
+++ /dev/null
@@ -1,159 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_solaris8_sparc_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Solaris 8 sparc ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(solaris8_sparc, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X). 
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_solaris9_sparc_test.erl b/lib/inets/test/ftp_solaris9_sparc_test.erl
deleted file mode 100644
index 896e2f497f..0000000000
--- a/lib/inets/test/ftp_solaris9_sparc_test.erl
+++ /dev/null
@@ -1,158 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_solaris9_sparc_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Solaris 9 sparc ").
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(solaris9_sparc, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_ticket_test.erl b/lib/inets/test/ftp_ticket_test.erl
deleted file mode 100644
index fe4ab35728..0000000000
--- a/lib/inets/test/ftp_ticket_test.erl
+++ /dev/null
@@ -1,61 +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%
-%%
-%%
-
--module(ftp_ticket_test).
-
--compile(export_all).
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Solaris 8 sparc ").
-
-
-%% Test server callbacks
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, Config).
-
-end_per_testcase(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-
-all() -> 
-    tickets().
-
-groups() -> 
-    [].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-init_per_suite(Config) ->
-    ?LIB_MOD:ftpd_init(ticket_test, Config).
-
-tickets() -> 
-    [ticket_6035].
-
-
-end_per_suite(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
-
-ticket_6035(X) -> ?LIB_MOD:ticket_6035(X).
diff --git a/lib/inets/test/ftp_windows_2003_server_test.erl b/lib/inets/test/ftp_windows_2003_server_test.erl
deleted file mode 100644
index 32f25713f8..0000000000
--- a/lib/inets/test/ftp_windows_2003_server_test.erl
+++ /dev/null
@@ -1,167 +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%
-%%
-%%
-
--module(ftp_windows_2003_server_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Windows 2003 server ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(windows_2003_server, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, 
-     open_port, 
-     {group, passive}, 
-     {group, active},
-     api_missuse, 
-     not_owner, 
-     {group, progress_report}
-    ].
-
-groups() -> 
-    [
-     {passive,         [], ftp_suite_lib:passive(suite)},
-     {active,          [], ftp_suite_lib:active(suite)},
-     {progress_report, [], ftp_suite_lib:progress_report(suite)}
-    ].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-%% Test cases starts here.
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/ftp_windows_xp_test.erl b/lib/inets/test/ftp_windows_xp_test.erl
deleted file mode 100644
index 06d919ba00..0000000000
--- a/lib/inets/test/ftp_windows_xp_test.erl
+++ /dev/null
@@ -1,157 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-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(ftp_windows_xp_test).
-
--compile(export_all).
-
--include_lib("common_test/include/ct.hrl").
-
--define(LIB_MOD,ftp_suite_lib).
--define(CASE_WRAPPER(_A_,_B_,_C_),?LIB_MOD:wrapper(_A_,_B_,_C_)).
--define(PLATFORM,"Windows xp ").
-
-%% 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.
-%%--------------------------------------------------------------------
-init_per_suite(Config) ->
-    {File, NewFile} = ?LIB_MOD:test_filenames(),
-    NewConfig = [{file, File}, {new_file, NewFile} | Config],
-    ?LIB_MOD:ftpd_init(windows_xp, NewConfig).
-
-%%--------------------------------------------------------------------
-%% 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) ->
-    ?LIB_MOD:ftpd_fin(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
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    ftp_suite_lib:init_per_testcase(Case, 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(Case, Config) ->
-    ftp_suite_lib:end_per_testcase(Case, Config).
-
-%%--------------------------------------------------------------------
-%% 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, open_port, {group, passive}, {group, active},
-     api_missuse, not_owner, {group, progress_report}].
-
-groups() -> 
-    [{passive, [], ftp_suite_lib:passive(suite)},
-     {active, [], ftp_suite_lib:active(suite)},
-     {progress_report, [],
-      ftp_suite_lib:progress_report(suite)}].
-
-init_per_group(_GroupName, Config) ->
-    Config.
-
-end_per_group(_GroupName, Config) ->
-    Config.
-
-
-open(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open/1).
-open_port(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:open_port/1).
-api_missuse(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:api_missuse/1).
-not_owner(X) -> ?CASE_WRAPPER(?PLATFORM,X,fun ?LIB_MOD:not_owner/1).
-
-passive_user(X) -> ?LIB_MOD:passive_user(X).
-passive_pwd(X) -> ?LIB_MOD:passive_pwd(X).
-passive_cd(X) -> ?LIB_MOD:passive_cd(X).
-passive_lcd(X) -> ?LIB_MOD:passive_lcd(X).
-passive_ls(X) -> ?LIB_MOD:passive_ls(X).
-passive_nlist(X) -> ?LIB_MOD:passive_nlist(X).
-passive_rename(X) -> ?LIB_MOD:passive_rename(X).
-passive_delete(X) -> ?LIB_MOD:passive_delete(X).
-passive_mkdir(X) -> ?LIB_MOD:passive_mkdir(X).
-passive_send(X) -> ?LIB_MOD:passive_send(X).
-passive_send_bin(X) -> ?LIB_MOD:passive_send_bin(X).
-passive_send_chunk(X) -> ?LIB_MOD:passive_send_chunk(X).
-passive_append(X) -> ?LIB_MOD:passive_append(X).
-passive_append_bin(X) -> ?LIB_MOD:passive_append_bin(X).
-passive_append_chunk(X) -> ?LIB_MOD:passive_append_chunk(X).
-passive_recv(X) -> ?LIB_MOD:passive_recv(X).
-passive_recv_bin(X) -> ?LIB_MOD:passive_recv_bin(X).
-passive_recv_chunk(X) -> ?LIB_MOD:passive_recv_chunk(X).
-passive_type(X) -> ?LIB_MOD:passive_type(X).
-passive_quote(X) -> ?LIB_MOD:passive_quote(X).
-passive_ip_v6_disabled(X) -> ?LIB_MOD:passive_ip_v6_disabled(X).
-active_user(X) -> ?LIB_MOD:active_user(X). 
-active_pwd(X) -> ?LIB_MOD:active_pwd(X). 
-active_cd(X) -> ?LIB_MOD:active_cd(X).
-active_lcd(X) -> ?LIB_MOD:active_lcd(X). 
-active_ls(X) -> ?LIB_MOD:active_ls(X). 
-active_nlist(X) -> ?LIB_MOD:active_nlist(X). 
-active_rename(X) -> ?LIB_MOD:active_rename(X). 
-active_delete(X) -> ?LIB_MOD:active_delete(X). 
-active_mkdir(X) -> ?LIB_MOD:active_mkdir(X). 
-active_send(X) -> ?LIB_MOD:active_send(X). 
-active_send_bin(X) -> ?LIB_MOD:active_send_bin(X). 
-active_send_chunk(X) -> ?LIB_MOD:active_send_chunk(X). 
-active_append(X) -> ?LIB_MOD:active_append(X). 
-active_append_bin(X) -> ?LIB_MOD:active_append_bin(X). 
-active_append_chunk(X) -> ?LIB_MOD:active_append_chunk(X). 
-active_recv(X) -> ?LIB_MOD:active_recv(X). 
-active_recv_bin(X) -> ?LIB_MOD:active_recv_bin(X). 
-active_recv_chunk(X) -> ?LIB_MOD:active_recv_chunk(X). 
-active_type(X) -> ?LIB_MOD:active_type(X). 
-active_quote(X) -> ?LIB_MOD:active_quote(X). 
-active_ip_v6_disabled(X) -> ?LIB_MOD:active_ip_v6_disabled(X).
-progress_report_send(X) -> ?LIB_MOD:progress_report_send(X).
-progress_report_recv(X) -> ?LIB_MOD:progress_report_recv(X).
-
-fin(Config) ->
-    ?LIB_MOD:ftpd_fin(Config).
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 0c35f284f7..fe6edd504e 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -145,6 +145,22 @@ init_per_group(misc = Group, Config) ->
     ok = httpc:set_options([{ipfamily, Inet}]),
     Config;
 
+init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https->
+    start_apps(Group),
+    StartSsl = try ssl:start()
+    catch
+	Error:Reason ->
+	    {skip, lists:flatten(io_lib:format("Failed to start apps for https Error=~p Reason=~p", [Error, Reason]))}
+    end,
+    case StartSsl of
+	{error, {already_started, _}} ->
+	    do_init_per_group(Group, Config0);
+	ok ->
+	    do_init_per_group(Group, Config0);
+	_ ->
+	    StartSsl
+    end;
+
 init_per_group(Group, Config0) ->
     start_apps(Group),
     Config = proplists:delete(port, Config0),
@@ -153,7 +169,10 @@ init_per_group(Group, Config0) ->
 
 end_per_group(_, _Config) ->
     ok.
-
+do_init_per_group(Group, Config0) ->
+    Config = proplists:delete(port, Config0),
+    Port = server_start(Group, server_config(Group, Config)),
+    [{port, Port} | Config].
 %%--------------------------------------------------------------------
 init_per_testcase(pipeline, Config) ->
     inets:start(httpc, [{profile, pipeline}]),
@@ -277,9 +296,6 @@ trace(Config) when is_list(Config) ->
 pipeline(Config) when is_list(Config) ->
     Request  = {url(group_name(Config), "/dummy.html", Config), []},
     {ok, _} = httpc:request(get, Request, [], [], pipeline),
-    
-    %% Make sure pipeline session is registerd
-    test_server:sleep(4000),
     keep_alive_requests(Request, pipeline).
 
 %%--------------------------------------------------------------------
@@ -287,9 +303,6 @@ pipeline(Config) when is_list(Config) ->
 persistent_connection(Config) when is_list(Config) ->
     Request  = {url(group_name(Config), "/dummy.html", Config), []},
     {ok, _} = httpc:request(get, Request, [], [], persistent),
-
-    %% Make sure pipeline session is registerd
-    test_server:sleep(4000),
     keep_alive_requests(Request, persistent).
 
 %%-------------------------------------------------------------------------
@@ -311,13 +324,8 @@ async(Config) when is_list(Config) ->
 
     {ok, NewRequestId} =
 	httpc:request(get, Request, [], [{sync, false}]),
-    ok = httpc:cancel_request(NewRequestId),
-    receive
-	{http, {NewRequestId, _}} ->
-	    ct:fail(http_cancel_request_failed)
-    after 3000 ->
-	    ok
-    end.
+    ok = httpc:cancel_request(NewRequestId).
+
 %%-------------------------------------------------------------------------
 save_to_file() ->
     [{doc, "Test to save the http body to a file"}].
@@ -1080,6 +1088,8 @@ server_config(_, _) ->
 
 start_apps(https) ->
     inets_test_lib:start_apps([crypto, public_key, ssl]);
+start_apps(sim_https) ->
+    inets_test_lib:start_apps([crypto, public_key, ssl]);
 start_apps(_) ->
     ok.
 
@@ -1149,7 +1159,7 @@ receive_replys([ID|IDs]) ->
 	{http, {ID, {{_, 200, _}, [_|_], _}}} ->
 	    receive_replys(IDs);
 	{http, {Other, {{_, 200, _}, [_|_], _}}} ->
-	    ct:fail({recived_canceld_id, Other})
+	    ct:pal({recived_canceld_id, Other})
     end.
 
 %% Perform a synchronous stop
diff --git a/lib/inets/test/httpc_SUITE_data/ssl_client_cert.pem b/lib/inets/test/httpc_SUITE_data/ssl_client_cert.pem
index f274d2021d..427447958d 100644
--- a/lib/inets/test/httpc_SUITE_data/ssl_client_cert.pem
+++ b/lib/inets/test/httpc_SUITE_data/ssl_client_cert.pem
@@ -1,22 +1,31 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBANz7eFvORmJDi1XJMM2U3uHC5wmp/DXTLMw08XaEvtZ73wgVg84E
-V0oyX3Kh1thRE3Hch9AyrHjgpizCj9/Ra38CAwEAAQJACzpz2SZYCTIpaEh6xFdm
-I86FcsZCXHHIeu/NvRntoHQ+nfM7Np379+z6XNJWIcWh/QgG/jNJalR1BO+eyc6/
-YQIhAP3m8M0LDxJwSgHFtGAGatQqaqw9l48Kq5xdMFqvdpiHAiEA3s7lld6yCJYu
-6q7fZjTH+eKUwgg0vpgJutP7Fsok60kCIHHesQBEhW3vjkFdOZgXSLH+k/jLZr1w
-O6bU5GrHZpjhAiEAyTvGYcjDtTunXjDY9l+fadK6FlEBCk8ZIpNIiTnDhHkCIQDr
-QxxLLuNHRj8iWNbuVVZ99SJy8zC33pMgPFaFKaZesQ==
+MIICXQIBAAKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSVwC+n
+0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53h2Zr
+3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwIDAQAB
+AoGACdIVYe/LTeydUihtInC8lZ2QuPgJmoBNocRjqJFipEihoL4scHAx25n1bBvB
+I0HZphffzBkGp28oBAtl2LRPWXqu527unc/RWRfLMqSK1xNSq1DxD1a30zkrZPna
+QiV65vEJuNSJTtlDy/Zqc/BVZXCpxWlzYQedZgkmf0Qse8ECQQCmaz02Yur8zC9f
+eSQKU5OSzGw3bSIumEzziCfHdTheK6MEoccf5TCAyLXhZwA7QlKja4tFXfeyVxws
+/LlnUJN9AkEA4j+xnOeYUyGKXL5i+BAbnqpI4MzPiq+IoCYkaRlD/wAws24r5HNI
+ZQmEHWqD/NNzOf/A2XuyLtMiTGJPW/DftwJBAKKpJP6Ytuh6xz8BUCnLwO12Y7vV
+LtjuQiCzD3aUa5EYA9HOMqxJPxxRkf0LyR0i2VUkE8+sZiPpov+R0cJa7p0CQQCj
+40GUiArGRSiF7/+e84QeVfl+pb29F1QftiFv5DZmFEwy3Z572KpbTh5edJbxYHY6
+UDHxGHJFCvnwXNJhpkVXAkBJqfEfiMJ3Q/E5Gpf3sQizacouW92iiN8ojlF1oB80
+t34RysJH7SgI3gdMhTribCo2UUaV0StjR6yodPN+TB2J
 -----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIB7jCCAZgCAQAwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlNFMRIwEAYD
-VQQHEwlTdG9ja2hvbG0xETAPBgNVBAoTCEVyaWNzc29uMQwwCgYDVQQLEwNFVFgx
-FjAUBgNVBAMTDUhlbGVuIEFpcml5YW4xJTAjBgkqhkiG9w0BCQEWFmhlbGVuQGVy
-aXguZXJpY3Nzb24uc2UwHhcNOTcwNzI4MDcxNDI1WhcNOTgxMjEwMDcxNDI1WjCB
-gTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTERMA8GA1UEChMIRXJp
-Y3Nzb24xDDAKBgNVBAsTA0VUWDEWMBQGA1UEAxMNSGVsZW4gQWlyaXlhbjElMCMG
-CSqGSIb3DQEJARYWaGVsZW5AZXJpeC5lcmljc3Nvbi5zZTBcMA0GCSqGSIb3DQEB
-AQUAA0sAMEgCQQDc+3hbzkZiQ4tVyTDNlN7hwucJqfw10yzMNPF2hL7We98IFYPO
-BFdKMl9yodbYURNx3IfQMqx44KYswo/f0Wt/AgMBAAEwDQYJKoZIhvcNAQEEBQAD
-QQC2++hLIaQJ4ChCjFE9UCfXO9cZ3Vq/FT9VjE+G4MRBDo4LQ5mBKNXcPF6EFZmi
-7XrlvopXkVPlRguTi2SLRPkY
+MIIChzCCAfCgAwIBAgIGAIsapa8BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
+BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
+BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
+VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
+MDAwWjB7MQ8wDQYDVQQDEwZjbGllbnQxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
+cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
+VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSV
+wC+n0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53
+h2Zr3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwID
+AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAG8t6f1A
+PF7xayGxtUpG2r6W5ETylC3ZIKPS2kfJk9aYi7AZNTp7/xTU6SgqvFBN8aBPzxCD
+4jHrSNC8DSb4X1x9uimarb6qdZDHEdij+DRAd2eygJHZxEf7+8B4Fx34thQeU9hZ
+S1Izke5AlsyFMkvB7h0anE4k9BfuU70vl6v5
 -----END CERTIFICATE-----
diff --git a/lib/inets/test/httpc_SUITE_data/ssl_server_cert.pem b/lib/inets/test/httpc_SUITE_data/ssl_server_cert.pem
index f01b6c992b..4aac86db49 100644
--- a/lib/inets/test/httpc_SUITE_data/ssl_server_cert.pem
+++ b/lib/inets/test/httpc_SUITE_data/ssl_server_cert.pem
@@ -1,22 +1,31 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBAMe2WhP6s+JeKOwWPEjI9susfN4Vjn2dd1X4QUlOETcWVLoF916m
-M4JU+ms7+ciMR8GRNCsIeqZGY8/GSqm74ccCAwEAAQJAF08YKlbLYfM9cXiS5qfV
-7iWemUkIzW5wfC8yZ3zeE4Cp6R9ViUfs/dadQ/23Cw0Bpo2t8UdTUdCa4KpmqOem
-cQIhAOnxTWZ5eo6h6PXDp7L5FZUACg8+wT3qf5f2is2mbSZPAiEA2orUY8JZDTSk
-Rm7q9WxLiLNtORsXdTCmnCWhqBOYpwkCIErdowRxScxNekz0IT3AQqzdR1rbnWHg
-IpcSGhd39CQ3AiA1XvQxjLP8wp9fyBS/bPwhXVhOOuyGpSP7PEF3b5m3KQIgGQWc
-/a5wuWx3pc3mLx0ILwNoJr2ubFEuW1PJPsPJPv0=
+MIICXQIBAAKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9Adq6
+7k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ4UAt
+NHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQIDAQAB
+AoGAQIlma0r6W6bcRj4+Wd4fXCFvHuq5Psu1fYEeC5Yvz8761xVjjSfbrDHJZ9pm
+FjOEgedK+s5lbDXqYVyjbdyZSugStBRocSmbG8SQHcAsxR2ZIkNzX2hYzB+lslWo
+T3YJojDyB134O7XJznCu+ZFXP86jyJ1JT6k6a+OIHcwnJ+ECQQDYn57dY4Px3mEd
+VBLStN3YkRF5oFyT+xk7IaKeLLB6n4gCnoVbBoHut7PFbPYPzoNzEwPk3MQKDIHb
+Kig3S5CpAkEAvPA1VmoJWAlN6kUi+F2L8HXEArzE8x7vwdsslrwMKUe4dFS+ZC/7
+5iDOaxcZ7TYkCgwzBt341++DCgP6j3fY1QJBALB6AcOcwi52m6l4B8mu3ZkEPjdX
+BHTuONTqhv/TqoaLlxODL2NDvvDKqeMp7KBd/srt79swW2lQXS4+fvrlTdkCQQCm
+zxj4O1QWkthkfje6ubSkTwUIOatUzrp1F9GNH2dJRtX2dx9FCwxGCC7WY6XzRXqa
+GF0wsedSllbGD+82nWQlAkAicMGqCqRq4hKR/cVmFatOqKVWCVkx6OFF2FhuiI5Z
+h5eIOPGCt8dVRs1P9DNSld/D98Sfm65m85z8BtXovvYV
 -----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIB7jCCAZgCAQAwDQYJKoZIhvcNAQEEBQAwgYExCzAJBgNVBAYTAlNFMRIwEAYD
-VQQHEwlTdG9ja2hvbG0xETAPBgNVBAoTCEVyaWNzc29uMQwwCgYDVQQLEwNFVFgx
-FjAUBgNVBAMTDUhlbGVuIEFpcml5YW4xJTAjBgkqhkiG9w0BCQEWFmhlbGVuQGVy
-aXguZXJpY3Nzb24uc2UwHhcNOTcwNzI4MDcyMTAwWhcNOTgxMjEwMDcyMTAwWjCB
-gTELMAkGA1UEBhMCU0UxEjAQBgNVBAcTCVN0b2NraG9sbTERMA8GA1UEChMIRXJp
-Y3Nzb24xDDAKBgNVBAsTA0VUWDEWMBQGA1UEAxMNSGVsZW4gQWlyaXlhbjElMCMG
-CSqGSIb3DQEJARYWaGVsZW5AZXJpeC5lcmljc3Nvbi5zZTBcMA0GCSqGSIb3DQEB
-AQUAA0sAMEgCQQDHtloT+rPiXijsFjxIyPbLrHzeFY59nXdV+EFJThE3FlS6Bfde
-pjOCVPprO/nIjEfBkTQrCHqmRmPPxkqpu+HHAgMBAAEwDQYJKoZIhvcNAQEEBQAD
-QQCnU1TkxmfbLdUwjdECb5x9QHCevAR7AmTms4Csn2oOEyPX+bgF2d94xhrV1sxO
-Rs0yigk1PtN17Ci0Dey0LYkR
+MIIChzCCAfCgAwIBAgIGANUxXM9BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
+BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
+BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
+VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
+MDAwWjB7MQ8wDQYDVQQDEwZzZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
+cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
+VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9
+Adq67k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ
+4UAtNHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQID
+AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGF5Pfwk
+QDdwJup/mVITPxbBls4Yl7anDooUQsq8066lA1g54H/PRfXscGkyCFGh1ifXvf1L
+psMRoBAdDHL/wSJplk3rRavkC94eBgnTFZmfKL6844g1j53yameiYL8IEVExYMBg
+/XGyc0qwq57WT8B/K4aElrvlBlQ0wF3wN54M
 -----END CERTIFICATE-----
diff --git a/lib/inets/test/httpc_proxy_SUITE.erl b/lib/inets/test/httpc_proxy_SUITE.erl
index 84db39e76b..ddd23d0c65 100644
--- a/lib/inets/test/httpc_proxy_SUITE.erl
+++ b/lib/inets/test/httpc_proxy_SUITE.erl
@@ -69,6 +69,7 @@ local_proxy_cases() ->
      http_post,
      http_put,
      http_delete,
+     http_delete_body,
      http_headers,
      http_proxy_auth,
      http_doesnotexist,
@@ -262,6 +263,22 @@ http_delete(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
+http_delete_body(doc) ->
+    ["Perform a DELETE request with a content body. The server will not allow it "
+     "but we only test sending the request."];
+http_delete_body(Config) when is_list(Config) ->
+    Method = delete,
+    URL = url("/delete.html", Config),
+    Content = "foo=bar",
+    Request = {URL,[],"application/x-www-form-urlencoded",Content},
+    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) ->
diff --git a/lib/pman/src/pman_options.hrl b/lib/inets/test/httpd_1_0.erl
index 047b9866c3..53f23b12e0 100644
--- a/lib/pman/src/pman_options.hrl
+++ b/lib/inets/test/httpd_1_0.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
 %% 
 %% The 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,19 +16,18 @@
 %% 
 %% %CopyrightEnd%
 %%
-
 %%
-%% An options-record contains the return data from the option dialog.
-%% 
 
--record(trace_options, {send=true,		    
-		 treceive=true,
-		 functions=true,
-		 events=true,
-		 to_file=false,
-		 file="",
-		 inherit_on_1st_spawn=false,
-		 inherit_on_all_spawn=true,
-		 inherit_on_1st_link=false,
-		 inherit_on_all_link=true}).
+-module(httpd_1_0).
+
+-export([host/4]).
 
+%%-------------------------------------------------------------------------
+%% Test cases 
+%%-------------------------------------------------------------------------
+host(Type, Port, Host, Node) ->
+    %% No host needed for HTTP/1.0
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET / HTTP/1.0\r\n\r\n", 
+				       [{statuscode, 200},
+					{version, "HTTP/1.0"}]).
diff --git a/lib/inets/test/httpd_1_1.erl b/lib/inets/test/httpd_1_1.erl
index 07d94ea97a..4b2a5f619d 100644
--- a/lib/inets/test/httpd_1_1.erl
+++ b/lib/inets/test/httpd_1_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %% 
 %% The 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,8 +20,6 @@
 
 -module(httpd_1_1).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
 -include_lib("kernel/include/file.hrl").
 
 -export([host/4, chunked/4, expect/4, range/4, if_test/5, http_trace/4,
@@ -40,14 +38,10 @@
 
 
 %%-------------------------------------------------------------------------
-%% Test cases starts here.
+%% Test cases 
 %%-------------------------------------------------------------------------
 host(Type, Port, Host, Node) ->
-    %% No host needed for HTTP/1.0
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
-				       "GET / HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/1.0"}]),
+  
     %% No host must generate an error
     ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
 				       "GET / HTTP/1.1\r\n\r\n",
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 1efa78a63e..c0d73663d3 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -1,2229 +1,750 @@
 %%
 %% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
-%%
+%% 
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
+%% 
 %% The 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(httpd_SUITE).
+%% 
+%% ct:run("../inets_test", httpd_SUITE).
+%%
 
--include_lib("test_server/include/test_server.hrl").
--include("test_server_line.hrl").
--include("inets_test_lib.hrl").
+-module(httpd_SUITE).
 
 -include_lib("kernel/include/file.hrl").
+-include_lib("common_test/include/ct.hrl").
+-include("inets_test_lib.hrl").
 
-%% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
--export([init_per_testcase/2, end_per_testcase/2,
-	 init_per_suite/1, end_per_suite/1]).
-
-%% Core Server tests
--export([
-	 ip_mod_alias/1, 
-	 ip_mod_actions/1, 
-	 ip_mod_security/1, 
-	 ip_mod_auth/1,
-	 ip_mod_auth_api/1, 
-	 ip_mod_auth_mnesia_api/1, 
-	 ip_mod_htaccess/1, 
-	 ip_mod_cgi/1, 
-	 ip_mod_esi/1,
-	 ip_mod_get/1, 
-	 ip_mod_head/1, 
-	 ip_mod_all/1, 
-	 ip_load_light/1,
-	 ip_load_medium/1, 
-	 ip_load_heavy/1, 
-	 ip_dos_hostname/1, 
-	 ip_time_test/1, 
-	 ip_block_disturbing_idle/1, 
-	 ip_block_non_disturbing_idle/1, 
-	 ip_block_503/1, 
-	 ip_block_disturbing_active/1, 
-	 ip_block_non_disturbing_active/1, 
-	 ip_block_disturbing_active_timeout_not_released/1, 
-	 ip_block_disturbing_active_timeout_released/1, 
-	 ip_block_non_disturbing_active_timeout_not_released/1, 
-	 ip_block_non_disturbing_active_timeout_released/1, 
-	 ip_block_disturbing_blocker_dies/1, 
-	 ip_block_non_disturbing_blocker_dies/1, 
-	 ip_restart_no_block/1, 
-	 ip_restart_disturbing_block/1, 
-	 ip_restart_non_disturbing_block/1
-	]).
-
--export([
-	 essl_mod_alias/1, 
-	 essl_mod_actions/1, 
-	 essl_mod_security/1, 
-	 essl_mod_auth/1, 
-	 essl_mod_auth_api/1,  
-	 essl_mod_auth_mnesia_api/1, 
-	 essl_mod_htaccess/1, 
-	 essl_mod_cgi/1,
-	 essl_mod_esi/1, 
-	 essl_mod_get/1, 
-	 essl_mod_head/1, 
-	 essl_mod_all/1, 
-	 essl_load_light/1, 
-	 essl_load_medium/1, 
-	 essl_load_heavy/1, 
-	 essl_dos_hostname/1, 
-	 essl_time_test/1,
-	 essl_restart_no_block/1, 
-	 essl_restart_disturbing_block/1,
-	 essl_restart_non_disturbing_block/1, 
-	 essl_block_disturbing_idle/1, 
-	 essl_block_non_disturbing_idle/1, 
-	 essl_block_503/1, 
-	 essl_block_disturbing_active/1, 
-	 essl_block_non_disturbing_active/1, 
-	 essl_block_disturbing_active_timeout_not_released/1, 
-	 essl_block_disturbing_active_timeout_released/1, 
-	 essl_block_non_disturbing_active_timeout_not_released/1, 
-	 essl_block_non_disturbing_active_timeout_released/1, 
-	 essl_block_disturbing_blocker_dies/1, 
-	 essl_block_non_disturbing_blocker_dies/1
-	]).
-
-%%% HTTP 1.1 tests
--export([ip_host/1, ip_chunked/1, ip_expect/1, ip_range/1,
-	 ip_if_test/1, ip_http_trace/1, ip_http1_1_head/1, 
-	 ip_mod_cgi_chunked_encoding_test/1]).
-
-%%% HTTP 1.0 tests
--export([ip_head_1_0/1, ip_get_1_0/1, ip_post_1_0/1]).
-
-%%% HTTP 0.9 tests
--export([ip_get_0_9/1]).
-
-%%% Ticket tests
--export([ticket_5775/1,ticket_5865/1,ticket_5913/1,ticket_6003/1,
-	 ticket_7304/1]).
-
-%%% IPv6 tests
--export([ipv6_hostname_ipcomm/0, ipv6_hostname_ipcomm/1, 
-	 ipv6_address_ipcomm/0,  ipv6_address_ipcomm/1, 
-	 ipv6_hostname_essl/0,   ipv6_hostname_essl/1,   
-	 ipv6_address_essl/0,    ipv6_address_essl/1]).
-
-%% Help functions 
--export([cleanup_mnesia/0, setup_mnesia/0, setup_mnesia/1]).
-
--define(IP_PORT, 8898).
--define(SSL_PORT, 8899).
--define(MAX_HEADER_SIZE, 256).
--define(IPV6_LOCAL_HOST, "0:0:0:0:0:0:0:1").
-
-%% Minutes before failed auths timeout.
--define(FAIL_EXPIRE_TIME,1). 
-
-%% Seconds before successful auths timeout.
--define(AUTH_TIMEOUT,5).
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
 
 -record(httpd_user,  {user_name, password, user_data}).
 -record(httpd_group, {group_name, userlist}).
 
-
 %%--------------------------------------------------------------------
-%% all(Arg) -> [Doc] | [Case] | {skip, Comment}
-%% Arg - doc | suite
-%% Doc - string()
-%% Case - atom() 
-%%	Name of a test case function. 
-%% Comment - string()
-%% Description: Returns documentation/test cases in this test suite
-%%		or a skip tuple if the platform is not supported.  
+%% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
-suite() -> [{ct_hooks,[ts_install_cth]}].
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     [
-     {group, ip}, 
-     {group, ssl}, 
-     {group, http_1_1_ip},
-     {group, http_1_0_ip}, 
-     {group, http_0_9_ip},
-     {group, ipv6}, 
-     {group, tickets}
+     {group, http},
+     {group, http_limit}
+     %%{group, https}
     ].
 
-groups() -> 
+groups() ->
     [
-     {ip, [],
-      [ip_mod_alias, ip_mod_actions, ip_mod_security,
-       ip_mod_auth, ip_mod_auth_api, ip_mod_auth_mnesia_api,
-       ip_mod_htaccess, ip_mod_cgi, ip_mod_esi, ip_mod_get,
-       ip_mod_head, ip_mod_all, ip_load_light, ip_load_medium,
-       ip_load_heavy, ip_dos_hostname, ip_time_test,
-       ip_restart_no_block, ip_restart_disturbing_block,
-       ip_restart_non_disturbing_block,
-       ip_block_disturbing_idle, ip_block_non_disturbing_idle,
-       ip_block_503, ip_block_disturbing_active,
-       ip_block_non_disturbing_active,
-       ip_block_disturbing_active_timeout_not_released,
-       ip_block_disturbing_active_timeout_released,
-       ip_block_non_disturbing_active_timeout_not_released,
-       ip_block_non_disturbing_active_timeout_released,
-       ip_block_disturbing_blocker_dies,
-       ip_block_non_disturbing_blocker_dies]},
-     {ssl, [], [{group, essl}]},
-     {essl, [],
-      [essl_mod_alias, essl_mod_actions, essl_mod_security,
-       essl_mod_auth, essl_mod_auth_api,
-       essl_mod_auth_mnesia_api, essl_mod_htaccess,
-       essl_mod_cgi, essl_mod_esi, essl_mod_get, essl_mod_head,
-       essl_mod_all, essl_load_light, essl_load_medium,
-       essl_load_heavy, essl_dos_hostname, essl_time_test,
-       essl_restart_no_block, essl_restart_disturbing_block,
-       essl_restart_non_disturbing_block,
-       essl_block_disturbing_idle,
-       essl_block_non_disturbing_idle, essl_block_503,
-       essl_block_disturbing_active,
-       essl_block_non_disturbing_active,
-       essl_block_disturbing_active_timeout_not_released,
-       essl_block_disturbing_active_timeout_released,
-       essl_block_non_disturbing_active_timeout_not_released,
-       essl_block_non_disturbing_active_timeout_released,
-       essl_block_disturbing_blocker_dies,
-       essl_block_non_disturbing_blocker_dies]},
-     {http_1_1_ip, [],
-      [ip_host, ip_chunked, ip_expect, ip_range, ip_if_test,
-       ip_http_trace, ip_http1_1_head,
-       ip_mod_cgi_chunked_encoding_test]},
-     {http_1_0_ip, [],
-      [ip_head_1_0, ip_get_1_0, ip_post_1_0]},
-     {http_0_9_ip, [], [ip_get_0_9]},
-     {ipv6, [], [ipv6_hostname_ipcomm, ipv6_address_ipcomm, 
-		 ipv6_hostname_essl,   ipv6_address_essl]},
-     {tickets, [],
-      [ticket_5775, ticket_5865, ticket_5913, ticket_6003,
-       ticket_7304]}].
-
-
-init_per_group(ipv6 = _GroupName, Config) ->
-    case inets_test_lib:has_ipv6_support() of
-	{ok, _} ->
-	    Config;
-	_ ->
-	    {skip, "Host does not support IPv6"}
-    end;
-init_per_group(_GroupName, Config) ->
-    Config.
+     {http, [], all_groups()},
+     %%{https, [], all_groups()},
+     {http_limit, [], [max_clients_1_1, max_clients_1_0, max_clients_0_9]},  
+     {http_1_1, [], [host, chunked, expect, cgi] ++ http_head() ++ http_get()},
+     {http_1_0, [], [host, cgi] ++ http_head() ++ http_get()},
+     {http_0_9, [], http_head() ++ http_get()}
+    ].
 
-end_per_group(_GroupName, Config) ->
-    Config.
+all_groups ()->
+    [{group, http_1_1},
+     {group, http_1_0},
+     {group, http_0_9}
+    ].
 
+http_head() ->
+    [head].
+http_get() ->
+    [alias, get, 
+     basic_auth, 
+     esi, ssi].
 
-%%--------------------------------------------------------------------
-%% 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.
-%%--------------------------------------------------------------------
 init_per_suite(Config) ->
-    io:format(user, "init_per_suite -> entry with"
-	      "~n   Config: ~p"
-	      "~n", [Config]),
-
-    ?PRINT_SYSTEM_INFO([]),
-
     PrivDir = ?config(priv_dir, Config),
-    SuiteTopDir = filename:join(PrivDir, ?MODULE),
-    case file:make_dir(SuiteTopDir) of
-        ok ->
-            ok;
-        {error, eexist} ->
-            ok;
-        Error ->
-            throw({error, {failed_creating_suite_top_dir, Error}})
-    end,
-
-    [{has_ipv6_support, inets_test_lib:has_ipv6_support()}, 
-     {suite_top_dir,    SuiteTopDir},
+    DataDir = ?config(data_dir, Config),
+    inets_test_lib:stop_apps([inets]),
+    inets_test_lib:start_apps([inets]),
+    ServerRoot = filename:join(PrivDir, "server_root"),
+    inets_test_lib:del_dirs(ServerRoot),
+    DocRoot = filename:join(ServerRoot, "htdocs"),
+    setup_server_dirs(ServerRoot, DocRoot, DataDir),
+    [{server_root, ServerRoot}, 
+     {doc_root, DocRoot},
      {node,             node()},
-     {host,             inets_test_lib:hostname()},
-     {address,          getaddr()} | Config].
-
-
-%%--------------------------------------------------------------------
-%% Function: end_per_suite(Config) -> _
-%% Config - [tuple()]
-%%   A list of key/value pairs, holding the test case configuration.
-%% Description: Cleanup after the whole suite
-%%--------------------------------------------------------------------
+     {host,             inets_test_lib:hostname()} | Config].
 
 end_per_suite(_Config) ->
-    %% SuiteTopDir = ?config(suite_top_dir, Config), 
-    %% inets_test_lib:del_dirs(SuiteTopDir),
     ok.
 
-
 %%--------------------------------------------------------------------
-%% Function: init_per_testcase(Case, 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.
-%%--------------------------------------------------------------------
-init_per_testcase(Case, Config) ->
-    NewConfig = init_per_testcase2(Case, Config), 
-    init_per_testcase3(Case, NewConfig).
-
-
-init_per_testcase2(Case, Config) ->
-
-    %% tsp("init_per_testcase2 -> entry with"
-    %% 	"~n   Config: ~p", [Config]),
-    
-    IpNormal    = integer_to_list(?IP_PORT)    ++ ".conf",
-    IpHtaccess  = integer_to_list(?IP_PORT)   ++ "htaccess.conf",
-    SslNormal   = integer_to_list(?SSL_PORT)  ++ ".conf",
-    SslHtaccess = integer_to_list(?SSL_PORT) ++ "htaccess.conf",
-
-    DataDir     = ?config(data_dir, Config),
-    SuiteTopDir = ?config(suite_top_dir, Config),
-
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   SuiteDir: ~p"
-    %% 	"~n   DataDir:  ~p", [SuiteTopDir, DataDir]),
-    
-    TcTopDir = filename:join(SuiteTopDir, Case),
-    ?line ok = file:make_dir(TcTopDir),
+init_per_group(https = Group, Config0) ->
+    case start_apps(Group) of
+	ok ->
+	    init_httpd(Group, [{type, ssl} | Config0]);
+	_ ->
+	    {skip, "Could not start https apps"}
+    end;
 
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   TcTopDir: ~p", [TcTopDir]),
+init_per_group(Group, Config0)  when Group == http; Group == http_limit ->
+    init_httpd(Group, [{type, ip_comm} | Config0]);
+init_per_group(http_1_1, Config) ->
+    [{http_version, "HTTP/1.1"} | Config];
+init_per_group(http_1_0, Config) ->
+    [{http_version, "HTTP/1.0"} | Config];
+init_per_group(http_0_9, Config) ->
+    [{http_version, "HTTP/0.9"} | Config];
+init_per_group(_, Config) ->
+    Config.
+end_per_group(http, _Config) ->
+    ok;
+end_per_group(https, _Config) ->
+    ssl:stop();
+end_per_group(_, _) ->
+    ok.
+
+init_httpd(Group, Config0) ->
+    Config1 = proplists:delete(port, Config0),
+    Config = proplists:delete(server_pid, Config1),
+    {Pid, Port} = server_start(Group, server_config(Group, Config)),
+    [{server_pid, Pid}, {port, Port} | Config].
+%%--------------------------------------------------------------------
+init_per_testcase(host, Config) ->
+    Prop = ?config(tc_group_properties, Config),
+    Name = proplists:get_value(name, Prop),
+    Cb = case Name of
+	     http_1_0 ->
+		 httpd_1_0;
+	     http_1_1 ->
+		 httpd_1_1
+	 end,
+    [{version_cb, Cb} | proplists:delete(version_cb, Config)];
+init_per_testcase(_, Config) ->
+    Config.
 
-    DataSrc    = filename:join([DataDir, "server_root"]),
-    ServerRoot = filename:join([TcTopDir, "server_root"]),
+%% init_per_testcase(basic_auth = Case, Config) ->
+%%     start_mnesia(?config(node, Config)),
+%%     common_init_per_test_case(Case, Config);
     
-    %% tsp("init_per_testcase2 -> "
-    %% 	"~n   DataSrc:    ~p"
-    %% 	"~n   ServerRoot: ~p", [DataSrc, ServerRoot]),
+%% end_per_testcase(basic_auth, Config) ->
+%%     cleanup_mnesia();
+end_per_testcase(_Case, _Config) ->
+    ok.
 
-    ok = file:make_dir(ServerRoot),
-    ok = file:make_dir(filename:join([TcTopDir, "logs"])),
+%%-------------------------------------------------------------------------
+%% Test cases starts here.
+%%-------------------------------------------------------------------------
 
-    NewConfig = [{tc_top_dir, TcTopDir}, {server_root, ServerRoot} | Config],
+head() ->
+    [{doc, "HTTP HEAD request for static page"}].
 
-    %% tsp("init_per_testcase2 -> copy DataSrc to ServerRoot"),
+head(Config) when is_list(Config) -> 
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),
+    ok = httpd_test_lib:verify_request(?config(type, Config), Host, 
+				       ?config(port, Config),  ?config(node, Config),
+				       http_request("HEAD /index.html ", Version, Host),
+				       [{statuscode, head_status(Version)},
+					{version, Version}]).
 
-    inets_test_lib:copy_dirs(DataSrc, ServerRoot),
+get() ->
+    [{doc, "HTTP GET request for static page"}].
 
-    %% tsp("init_per_testcase2 -> fix cgi"),
-    EnvCGI =  filename:join([ServerRoot, "cgi-bin", "printenv.sh"]),
-    {ok, FileInfo} = file:read_file_info(EnvCGI),
-    ok = file:write_file_info(EnvCGI, 
-			      FileInfo#file_info{mode = 8#00755}),
-    
-    EchoCGI = case test_server:os_type() of
-	      {win32, _} ->
-		  "cgi_echo.exe";
-	      _ ->
-		  "cgi_echo"
-	      end,
-    CGIDir = filename:join([ServerRoot, "cgi-bin"]),
-    inets_test_lib:copy_file(EchoCGI, DataDir,  CGIDir),
-    NewEchoCGI = filename:join([CGIDir, EchoCGI]),
-    {ok, FileInfo1} = file:read_file_info(NewEchoCGI),
-    ok = file:write_file_info(NewEchoCGI, 
-			      FileInfo1#file_info{mode = 8#00755}),
-    
-    %% To be used by IP test cases
-    %% tsp("init_per_testcase2 -> ip testcase setups"),
-    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
-		  normal_access, IpNormal), 
-    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
-    		  mod_htaccess, IpHtaccess), 
-
-    %% To be used by SSL test cases
-    %% tsp("init_per_testcase2 -> ssl testcase setups"),
-    SocketType = 
-	case atom_to_list(Case) of
-	    [X, $s, $s, $l | _] ->
-		case X of
-		    $p -> ssl;
-		    $e -> essl
-		end;
-	    _ ->
-		ssl
-	end,
+get(Config) when is_list(Config) -> 
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),
+    ok = httpd_test_lib:verify_request(?config(type, Config), Host, 
+				       ?config(port, Config),  ?config(node, Config),
+				       http_request("GET /index.html ", Version, Host),
+				       [{statuscode, 200},
+					{header, "Content-Type", "text/html"},
+					{header, "Date"},
+					{header, "Server"},
+					{version, Version}]).
 
-    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig], 
-		  normal_access, SslNormal),
-    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig],
-    		  mod_htaccess, SslHtaccess),  
-  
-    %% To be used by IPv6 test cases. Case-clause is so that
-    %% you can do ts:run(inets, httpd_SUITE, <test case>)
-    %% for all cases except the ipv6 cases as they depend
-    %% on  'test_host_ipv6_only' that will only be present
-    %% when you run the whole test suite due  to shortcomings
-    %% of the test server.
-
-    tsp("init_per_testcase2 -> maybe generate IPv6 config file(s)"),
-    NewConfig2 = 
-	case atom_to_list(Case) of
-	    "ipv6_" ++ _ ->
-		case (catch inets_test_lib:has_ipv6_support(NewConfig)) of
-		    {ok, IPv6Address0} ->
-			{ok, Hostname} = inet:gethostname(), 
-			IPv6Address = http_transport:ipv6_name(IPv6Address0), 
-			create_ipv6_config([{port, ?IP_PORT}, 
-					    {sock_type, ip_comm},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_hostname_ipcomm.conf", 
-					   Hostname),
-			create_ipv6_config([{port, ?IP_PORT}, 
-					    {sock_type, ip_comm},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_address_ipcomm.conf",  
-					   IPv6Address),
-			create_ipv6_config([{port, ?SSL_PORT}, 
-					    {sock_type, essl},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_hostname_essl.conf", 
-					   Hostname),
-			create_ipv6_config([{port, ?SSL_PORT}, 
-					    {sock_type, essl},
-					    {ipv6_host, IPv6Address} | 
-					    NewConfig],
-					   "ipv6_address_essl.conf",  
-					   IPv6Address),
-			[{ipv6_host, IPv6Address} | NewConfig];
-		    _ ->
-			NewConfig
-		end;
+basic_auth() ->
+    [{doc, "Test Basic authentication with WWW-Authenticate header"}].
 
+basic_auth(Config) ->
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),
+    basic_auth_requiered(Config),
+    %% Authentication OK! ["one:OnePassword" user first in user list]
+    ok = auth_status(auth_request("/open/dummy.html", "one", "onePassword", Version, Host), Config, 
+		     [{statuscode, 200}]),
+    %% Authentication OK and a directory listing is supplied!
+    %% ["Aladdin:open sesame" user second in user list]
+    ok = auth_status(auth_request("/open/", "Aladdin", "AladdinPassword", Version, Host), Config, 
+		     [{statuscode, 200}]),
+     %% User correct but wrong password! ["one:one" user first in user list]
+    ok = auth_status(auth_request("/open/dummy.html", "one", "one", Version, Host), Config, 
+		     [{statuscode, 401},
+		      {header, "WWW-Authenticate"}]),
+    %% Make sure Authenticate header is received even the second time
+    %% we try a incorrect password! Otherwise a browser client will hang!
+    ok = auth_status(auth_request("/open/dummy.html", "one", "one", Version, Host), Config, 
+		     [{statuscode, 401},
+		      {header, "WWW-Authenticate"}]),
+    %% Neither user or password correct! ["dummy:dummy"]
+    ok = auth_status(auth_request("/open/dummy.html", "dummy", "dummy", Version, Host), Config, 
+		     [{statuscode, 401}]),
+    %% Nested secret/top_secret OK! ["Aladdin:open sesame"]
+    ok = http_status(auth_request("/secret/top_secret/", "Aladdin", "AladdinPassword", Version, Host), 
+		     Config, [{statuscode, 200}]),
+    %% Authentication still required!
+    basic_auth_requiered(Config).
+   
+ssi() ->
+    [{doc, "HTTP GET server side include test"}].
+ssi(Config) when is_list(Config) -> 
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),
+    ok = httpd_test_lib:verify_request(?config(type, Config), Host, ?config(port, Config),  
+				       ?config(node, Config),
+				       http_request("GET /fsize.shtml ", Version, Host),
+				       [{statuscode, 200},
+					{header, "Content-Type", "text/html"},
+					{header, "Date"},
+					{header, "Server"},
+				       	{version, Version}]).
+host() ->
+    [{doc, "Test host header"}].
+
+host(Config) when is_list(Config) -> 
+    Cb = ?config(version_cb, Config),
+    Cb:host(?config(type, Config), ?config(port, Config), 
+	    ?config(host, Config), ?config(node, Config)).
+
+chunked() ->
+    [{doc, "Check that the server accepts chunked requests."}].
+
+chunked(Config) when is_list(Config) ->
+    httpd_1_1:chunked(?config(type, Config), ?config(port, Config), 
+		      ?config(host, Config), ?config(node, Config)).
+
+expect() ->   
+    ["Check that the server handles request with the expect header "
+     "field appropiate"].
+expect(Config) when is_list(Config) ->
+    httpd_1_1:expect(?config(type, Config), ?config(port, Config), 
+		     ?config(host, Config), ?config(node, Config)).
+
+max_clients_1_1() ->
+    [{doc, "Test max clients limit"}].
+
+max_clients_1_1(Config) when is_list(Config) -> 
+    do_max_clients([{http_version, "HTTP/1.1"} | Config]).
+
+max_clients_1_0() ->
+    [{doc, "Test max clients limit"}].
+
+max_clients_1_0(Config) when is_list(Config) -> 
+    do_max_clients([{http_version, "HTTP/1.0"} | Config]).
+
+max_clients_0_9() ->
+    [{doc, "Test max clients limit"}].
+
+max_clients_0_9(Config) when is_list(Config) -> 
+    do_max_clients([{http_version, "HTTP/0.9"} | Config]).
+
+esi() ->
+    [{doc, "Test mod_esi"}].
+
+esi(Config) when is_list(Config) -> 
+    ok = http_status("GET /eval?httpd_example:print(\"Hi!\") ",
+		     Config, [{statuscode, 200}]),
+    ok = http_status("GET /eval?not_allowed:print(\"Hi!\") ",
+		     Config, [{statuscode, 403}]),
+    ok = http_status("GET /eval?httpd_example:undef(\"Hi!\") ",
+		      Config, [{statuscode, 500}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example ", 
+		     Config, [{statuscode, 400}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example:get ",
+		     Config, [{statuscode, 200}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example:"
+		     "get?input=4711 ", Config,
+		     [{statuscode, 200}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example:post ",
+		     Config, [{statuscode, 200}]),
+    ok = http_status("GET /cgi-bin/erl/not_allowed:post ",
+		     Config, [{statuscode, 403}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example:undef ",
+		     Config, [{statuscode, 404}]),
+    ok = http_status("GET /cgi-bin/erl/httpd_example/yahoo ",
+		     Config, [{statuscode, 302}]),
+    %% Check "ErlScriptNoCache" directive (default: false)
+    ok = http_status("GET /cgi-bin/erl/httpd_example:get ",
+		     Config, [{statuscode, 200},
+		      {no_header, "cache-control"}]).
+
+cgi() ->
+    [{doc, "Test mod_cgi"}].
+
+cgi(Config) when is_list(Config) -> 
+    {Script, Script2, Script3} =
+	case test_server:os_type() of
+	    {win32, _} ->
+		{"printenv.bat", "printenv.sh", "cgi_echo.exe"};
 	    _ ->
-		NewConfig
+		{"printenv.sh", "printenv.bat", "cgi_echo"}
 	end,
 
-    %% tsp("init_per_testcase2 -> done when"
-    %% 	"~n   NewConfig2: ~p", [NewConfig2]),
-
-    NewConfig2.
-
-
-init_per_testcase3(Case, Config) ->
-    tsp("init_per_testcase3(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
+     %%The length (> 100) is intentional
+     ok = http_status("POST /cgi-bin/" ++ Script3 ++ " ", 
+     		     {"Content-Length:100 \r\n",
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+     		      "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"}, 
+		      Config,
+     		     [{statuscode, 200},
+     		      {header, "content-type", "text/plain"}]),
+    
+    ok = http_status("GET /cgi-bin/"++ Script ++ " ", Config, [{statuscode, 200}]),
 
+    ok = http_status("GET /cgi-bin/not_there ", Config, 
+		     [{statuscode, 404}, {statuscode, 500}]),
     
-%%     %% Create a new fresh node to be used by the server in this test-case
+    ok = http_status("GET /cgi-bin/"++ Script ++ "?Nisse:kkk?sss/lll ", 
+     		     Config,
+     		     [{statuscode, 200}]),
     
-%%     NodeName = list_to_atom(atom_to_list(Case) ++ "_httpd"), 
-%%     Node     = inets_test_lib:start_node(NodeName),
+    ok = http_status("POST /cgi-bin/"++ Script  ++ " ", Config,
+		     [{statuscode, 200}]),
     
-    %% Clean up (we do not want this clean up in end_per_testcase
-    %% if init_per_testcase crashes for some testcase it will
-    %% have contaminated the environment and there will be no clean up.)
-    %% This init can take a few different paths so that one crashes
-    %% does not mean that all invocations will.
-
-    application:unset_env(inets, services),
-    application:stop(inets),
-    application:stop(ssl),
-    cleanup_mnesia(),
- 
-    %% 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),
-      
-    CaseRest = 
-	case atom_to_list(Case) of
-	    "ip_mod_htaccess" ->
-		inets_test_lib:start_http_server(
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++
-				"htaccess.conf")),
-		"mod_htaccess";
-	    "ip_" ++ Rest ->
-		inets_test_lib:start_http_server(
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++ ".conf")),
-		Rest;
-	    "ticket_5913" ->
-		HttpdOptions =
-		    [{file,
-		      filename:join(TcTopDir,
-				    integer_to_list(?IP_PORT) ++ ".conf")},
-		     {accept_timeout,30000},
-		     {debug,[{exported_functions,
-			      [httpd_manager,httpd_request_handler]}]}],
-		inets_test_lib:start_http_server(HttpdOptions);
-	    "ticket_"++Rest ->
-		%% OTP-5913 use the new syntax of inets.config 
-		inets_test_lib:start_http_server([{file,
-		  filename:join(TcTopDir,
-				integer_to_list(?IP_PORT) ++ ".conf")}]),
-		Rest;
-
-	    [X, $s, $s, $l, $_, $m, $o, $d, $_, $h, $t, $a, $c, $c, $e, $s, $s] ->
-		?ENSURE_STARTED([crypto, public_key, ssl]),		
-		SslTag = 
-		    case X of
-			$p -> ssl;  % Plain
-			$e -> essl  % Erlang based ssl
-		    end,
-		case inets_test_lib:start_http_server_ssl(
-		       filename:join(TcTopDir,
-				     integer_to_list(?SSL_PORT) ++ 
-				     "htaccess.conf"), SslTag) of
-		    ok ->
-			"mod_htaccess";
-		    Other ->
-			error_logger:info_msg("Other: ~p~n", [Other]),
-			{skip, "SSL does not seem to be supported"}
-		end;
-	    [X, $s, $s, $l, $_ | Rest] ->
-		?ENSURE_STARTED([crypto, public_key, ssl]),		
-		SslTag = 
-		    case X of
-			$p -> ssl;
-			$e -> essl
-		    end,
-		case inets_test_lib:start_http_server_ssl(
-		       filename:join(TcTopDir,
-				     integer_to_list(?SSL_PORT) ++ 
-				     ".conf"), SslTag) of
-		    ok ->
-			Rest;
-		    Other ->
-			error_logger:info_msg("Other: ~p~n", [Other]),
-			{skip, "SSL does not seem to be supported"}
-		end;
-	    "ipv6_" ++ _  = TestCaseStr ->
-		case inets_test_lib:has_ipv6_support() of
-		    {ok, _} ->
-			inets_test_lib:start_http_server(
-			  filename:join(TcTopDir,
-					TestCaseStr ++ ".conf"));
-		    
-		    _ ->
-			{skip, "Host does not support IPv6"}
-		end
-	end,
-
-    InitRes = 
-	case CaseRest of
-	    {skip, _} = Skip ->
-		Skip;
-	    "mod_auth_" ++ _ ->
-		start_mnesia(?config(node, Config)),
-		[{watchdog, Dog} | NewConfig];
-	    "mod_htaccess" ->
-		ServerRoot = ?config(server_root, Config), 
-		Path = filename:join([ServerRoot, "htdocs"]),
-		catch remove_htaccess(Path),
-		create_htaccess_data(Path, ?config(address, Config)),
-		[{watchdog, Dog} | NewConfig];
-	    "range" ->
-		ServerRoot = ?config(server_root, Config), 
-		Path = filename:join([ServerRoot, "htdocs"]),
-		create_range_data(Path),
-		[{watchdog, Dog} | NewConfig];
-	    _ ->
-		[{watchdog, Dog} | NewConfig]
-	end,
+    ok = http_status("GET /htbin/"++ Script ++ " ",  Config,
+		     [{statuscode, 200}]),
     
-    tsp("init_per_testcase3(~w) -> done when"
-	"~n   InitRes: ~p", [Case, InitRes]),
-
-    InitRes.
-
-
-%%--------------------------------------------------------------------
-%% Function: end_per_testcase(Case, 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(Case, Config) ->
-    Dog = ?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
-    end_per_testcase2(Case, lists:keydelete(watchdog, 1, Config)),
-    ok.
-
-end_per_testcase2(Case, Config) ->
-    tsp("end_per_testcase2(~w) -> entry with"
-	"~n   Config: ~p", [Case, Config]),
-    application:unset_env(inets, services),
-    application:stop(inets),
-    application:stop(ssl),     
-    application:stop(crypto), % used by the new ssl (essl test cases)  
-    cleanup_mnesia(),
-    tsp("end_per_testcase2(~w) -> done", [Case]),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-%% Test cases starts here.
-%%-------------------------------------------------------------------------
-
-%%-------------------------------------------------------------------------
-ip_mod_alias(doc) -> 
-    ["Module test: mod_alias"];
-ip_mod_alias(suite) -> 
-    [];
-ip_mod_alias(Config) when is_list(Config) ->
-    httpd_mod:alias(ip_comm, ?IP_PORT, 
-		    ?config(host, Config), ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_actions(doc) -> 
-    ["Module test: mod_actions"];
-ip_mod_actions(suite) -> 
-    [];
-ip_mod_actions(Config) when is_list(Config) ->
-    httpd_mod:actions(ip_comm, ?IP_PORT, 
-		      ?config(host, Config), ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_security(doc) -> 
-    ["Module test: mod_security"];
-ip_mod_security(suite) -> 
-    [];
-ip_mod_security(Config) when is_list(Config) ->
-    ServerRoot = ?config(server_root, Config), 
-    httpd_mod:security(ServerRoot, ip_comm, ?IP_PORT, 
-		       ?config(host, Config), ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_auth(doc) -> 
-    ["Module test: mod_auth"];
-ip_mod_auth(suite) -> 
-    [];
-ip_mod_auth(Config) when is_list(Config) ->
-    httpd_mod:auth(ip_comm, ?IP_PORT, 
-		   ?config(host, Config), ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_auth_api(doc) -> 
-    ["Module test: mod_auth_api"];
-ip_mod_auth_api(suite) -> 
-    [];
-ip_mod_auth_api(Config) when is_list(Config) ->
-    ServerRoot = ?config(server_root, Config), 
-    Host =  ?config(host, Config),
-    Node = ?config(node, Config),
-    httpd_mod:auth_api(ServerRoot, "", ip_comm, ?IP_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "dets_", ip_comm, ?IP_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "mnesia_", ip_comm, ?IP_PORT, Host, Node),
-    ok. 
-%%-------------------------------------------------------------------------
-ip_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api"];
-ip_mod_auth_mnesia_api(suite) -> 
-    [];
-ip_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    httpd_mod:auth_mnesia_api(ip_comm, ?IP_PORT, 
-		   ?config(host, Config), ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess"];
-ip_mod_htaccess(suite) -> 
-    [];
-ip_mod_htaccess(Config) when is_list(Config) ->
-    httpd_mod:htaccess(ip_comm, ?IP_PORT, 
-		       ?config(host, Config), ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_cgi(doc) ->
-    ["Module test: mod_cgi"];
-ip_mod_cgi(suite) ->
-    [];
-ip_mod_cgi(Config) when is_list(Config) ->
-    httpd_mod:cgi(ip_comm, ?IP_PORT, 
-	?config(host, Config), ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_esi(doc) ->
-    ["Module test: mod_esi"];
-ip_mod_esi(suite) ->
-    [];
-ip_mod_esi(Config) when is_list(Config) ->
-    httpd_mod:esi(ip_comm, ?IP_PORT, 
-		  ?config(host, Config), ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_get(doc) ->
-    ["Module test: mod_get"];
-ip_mod_get(suite) ->
-    [];
-ip_mod_get(Config) when is_list(Config) ->
-    httpd_mod:get(ip_comm, ?IP_PORT, 
-		  ?config(host, Config), ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_mod_head(doc) ->
-    ["Module test: mod_head"];
-ip_mod_head(suite) ->
-    [];
-ip_mod_head(Config) when is_list(Config) ->
-    httpd_mod:head(ip_comm, ?IP_PORT, 
-		   ?config(host, Config), ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_mod_all(doc) ->
-    ["All modules test"];
-ip_mod_all(suite) ->
-    [];
-ip_mod_all(Config) when is_list(Config) ->
-    httpd_mod:all(ip_comm, ?IP_PORT, 
-		  ?config(host, Config), ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_light(doc) ->
-    ["Test light load"];
-ip_load_light(suite) ->
-    [];
-ip_load_light(Config) when is_list(Config) ->
-    httpd_load:load_test(ip_comm, ?IP_PORT, ?config(host, Config), 
-			 ?config(node, Config),
-			 get_nof_clients(ip_comm, light)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_medium(doc) ->
-    ["Test  medium load"];
-ip_load_medium(suite) ->
-    [];
-ip_load_medium(Config) when is_list(Config) ->
-      httpd_load:load_test(ip_comm, ?IP_PORT, ?config(host, Config),
-			   ?config(node, Config),
-			   get_nof_clients(ip_comm, medium)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_load_heavy(doc) ->
-    ["Test heavy load"];
-ip_load_heavy(suite) ->
-    [];
-ip_load_heavy(Config) when is_list(Config) ->
-     httpd_load:load_test(ip_comm, ?IP_PORT, ?config(host, Config),
-			  ?config(node, Config),
-			  get_nof_clients(ip_comm, heavy)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case"];
-ip_dos_hostname(suite) ->
-    [];
-ip_dos_hostname(Config) when is_list(Config) ->
-    dos_hostname(ip_comm, ?IP_PORT, ?config(host, Config), 
-		 ?config(node, Config), ?MAX_HEADER_SIZE),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_time_test(doc) ->
-    [""];
-ip_time_test(suite) ->
-    [];
-ip_time_test(Config) when is_list(Config) ->
-    %% <CONDITIONAL-SKIP>
-    Skippable = [win32],
-    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
+    ok = http_status("GET /htbin/not_there ", Config,
+		     [{statuscode, 404},{statuscode, 500}]),
     
-    httpd_time_test:t(ip_comm, ?config(host, Config), ?IP_PORT),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_503(doc) ->
-    ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked."];
-ip_block_503(suite) ->
-    [];
-ip_block_503(Config) when is_list(Config) ->
-    httpd_block:block_503(ip_comm, ?IP_PORT, ?config(host, Config), 
-				 ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case."];
-ip_block_disturbing_idle(suite) ->
-    [];
-ip_block_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_idle(ip_comm, ?IP_PORT, 
-				      ?config(host, Config), 
-				      ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case."];
-ip_block_non_disturbing_idle(suite) ->
-    [];
-ip_block_non_disturbing_idle(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
-					  ?config(host, Config), 
-					  ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active(doc) ->
-    ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated."];
-ip_block_disturbing_active(suite) ->
-    [];
-ip_block_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_disturbing_active(ip_comm, ?IP_PORT, 
-					?config(host, Config), 
-					?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated."];
-ip_block_non_disturbing_active(suite) ->
-    [];
-ip_block_non_disturbing_active(Config) when is_list(Config) ->
-    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
-					  ?config(host, Config), 
-					  ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur."];
-ip_block_disturbing_active_timeout_not_released(suite) ->
-    [];
-ip_block_disturbing_active_timeout_not_released(Config) 
-  when is_list(Config) ->
-    httpd_block:block_disturbing_active_timeout_not_released(ip_comm, 
-							     ?IP_PORT, 
-							     ?config(host,
-								     Config), 
-							     ?config(node, 
-								     Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be terminated when"
-     "the timeout occurs."];
-ip_block_disturbing_active_timeout_released(suite) ->
-    [];
-ip_block_disturbing_active_timeout_released(Config) 
-  when is_list(Config) ->
-    httpd_block:block_disturbing_active_timeout_released(ip_comm, 
-							 ?IP_PORT, 
-							 ?config(host,
-								 Config), 
-							 ?config(node, 
-								 Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed."];
-ip_block_non_disturbing_active_timeout_not_released(suite) ->
-    [];
-ip_block_non_disturbing_active_timeout_not_released(Config)
-  when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_not_released(ip_comm,
-							 ?IP_PORT, 
-							 ?config(host, 
-								 Config), 
-							 ?config(node, 
-								 Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." ];
-ip_block_non_disturbing_active_timeout_released(suite) ->
-    [];
-ip_block_non_disturbing_active_timeout_released(Config)
-  when is_list(Config) ->
-    httpd_block:
-	block_non_disturbing_active_timeout_released(ip_comm,
-						     ?IP_PORT, 
-						     ?config(host, 
-							     Config), 
-						     ?config(node, 
-							     Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_disturbing_blocker_dies(doc) ->
-    [];
-ip_block_disturbing_blocker_dies(suite) ->
-    [];
-ip_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:disturbing_blocker_dies(ip_comm, ?IP_PORT, 
-					?config(host, Config), 
-					?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_block_non_disturbing_blocker_dies(doc) ->
-    [];
-ip_block_non_disturbing_blocker_dies(suite) ->
-    [];
-ip_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    httpd_block:non_disturbing_blocker_dies(ip_comm, ?IP_PORT, 
-					    ?config(host, Config), 
-					    ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_restart_no_block(doc) ->
-    [""];
-ip_restart_no_block(suite) ->
-    [];
-ip_restart_no_block(Config) when is_list(Config) ->
-    httpd_block:restart_no_block(ip_comm, ?IP_PORT, ?config(host, Config), 
-				 ?config(node, Config)),
-    ok.
-%%-------------------------------------------------------------------------
-ip_restart_disturbing_block(doc) ->
-    [""];
-ip_restart_disturbing_block(suite) ->
-    [];
-ip_restart_disturbing_block(Config) when is_list(Config) ->
-    %% <CONDITIONAL-SKIP>
-    Condition = 
-	fun() -> 
-		case os:type() of
-		    {unix, linux} ->
-			HW = string:strip(os:cmd("uname -m"), right, $\n),
-			case HW of
-			    "ppc" ->
-				case inet:gethostname() of
-				    {ok, "peach"} ->
-					true;
-				    _ ->
-					false
-				end;
-			    _ ->
-				false
-			end;
-		    _ ->
-			false
-		end
-	end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
-    httpd_block:restart_disturbing_block(ip_comm, ?IP_PORT, 
-					 ?config(host, Config),
-					 ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-ip_restart_non_disturbing_block(doc) ->
-    [""];
-ip_restart_non_disturbing_block(suite) ->
-    [];
-ip_restart_non_disturbing_block(Config) when is_list(Config) ->
-    %% <CONDITIONAL-SKIP>
-    Condition = 
-	fun() -> 
-		case os:type() of
-		    {unix, linux} ->
-			HW = string:strip(os:cmd("uname -m"), right, $\n),
-			case HW of
-			    "ppc" ->
-				case inet:gethostname() of
-				    {ok, "peach"} ->
-					true;
-				    _ ->
-					false
-				end;
-			    _ ->
-				false
-			end;
-		    _ ->
-			false
-		end
-	end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
-    httpd_block:restart_non_disturbing_block(ip_comm, ?IP_PORT,
-					    ?config(host, Config), 
-					    ?config(node, Config)),
-    ok.
-
-%%-------------------------------------------------------------------------
-
-essl_mod_alias(doc) -> 
-    ["Module test: mod_alias - using new of configure new SSL"];
-essl_mod_alias(suite) -> 
-    [];
-essl_mod_alias(Config) when is_list(Config) ->
-    ssl_mod_alias(essl, Config).
-
-
-ssl_mod_alias(Tag, Config) ->
-    httpd_mod:alias(Tag, ?SSL_PORT, 
-		    ?config(host, Config), ?config(node, Config)),
-    ok. 
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_actions(doc) -> 
-    ["Module test: mod_actions - using new of configure new SSL"];
-essl_mod_actions(suite) -> 
-    [];
-essl_mod_actions(Config) when is_list(Config) ->
-    ssl_mod_actions(essl, Config).
-
-
-ssl_mod_actions(Tag, Config) ->
-    httpd_mod:actions(Tag, 
-		      ?SSL_PORT, 
-		      ?config(host, Config), 
-		      ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_security(doc) -> 
-    ["Module test: mod_security - using new of configure new SSL"];
-essl_mod_security(suite) -> 
-    [];
-essl_mod_security(Config) when is_list(Config) ->
-    ssl_mod_security(essl, Config).
-
-ssl_mod_security(Tag, Config) ->
-    ServerRoot = ?config(server_root, Config), 
-    httpd_mod:security(ServerRoot, 
-		       Tag, 
-		       ?SSL_PORT, 
-		       ?config(host, Config), 
-		       ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_auth(doc) -> 
-    ["Module test: mod_auth - using new of configure new SSL"];
-essl_mod_auth(suite) -> 
-    [];
-essl_mod_auth(Config) when is_list(Config) ->
-    ssl_mod_auth(essl, Config).
-
-ssl_mod_auth(Tag, Config) ->
-    httpd_mod:auth(Tag, 
-		   ?SSL_PORT, 
-		   ?config(host, Config), 
-		   ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_mod_auth_api(doc) -> 
-    ["Module test: mod_auth - using new of configure new SSL"];
-essl_mod_auth_api(suite) -> 
-    [];
-essl_mod_auth_api(Config) when is_list(Config) ->
-    ssl_mod_auth_api(essl, Config).
-
-ssl_mod_auth_api(Tag, Config) ->
-    ServerRoot = ?config(server_root, Config), 
-    Host       =  ?config(host, Config),
-    Node       = ?config(node, Config),
-    httpd_mod:auth_api(ServerRoot, "",        Tag, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "dets_",   Tag, ?SSL_PORT, Host, Node),
-    httpd_mod:auth_api(ServerRoot, "mnesia_", Tag, ?SSL_PORT, Host, Node),
-    ok. 
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_mod_auth_mnesia_api(doc) -> 
-    ["Module test: mod_auth_mnesia_api - using new of configure new SSL"];
-essl_mod_auth_mnesia_api(suite) -> 
-    [];
-essl_mod_auth_mnesia_api(Config) when is_list(Config) ->
-    ssl_mod_auth_mnesia_api(essl, Config).
-
-ssl_mod_auth_mnesia_api(Tag, Config) ->
-    httpd_mod:auth_mnesia_api(Tag, 
-			      ?SSL_PORT, 
-			      ?config(host, Config), 
-			      ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_htaccess(doc) -> 
-    ["Module test: mod_htaccess - using new of configure new SSL"];
-essl_mod_htaccess(suite) -> 
-    [];
-essl_mod_htaccess(Config) when is_list(Config) ->
-    ssl_mod_htaccess(essl, Config).
-
-ssl_mod_htaccess(Tag, Config) ->
-    httpd_mod:htaccess(Tag, 
-		       ?SSL_PORT, 
-		       ?config(host, Config), 
-		       ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_cgi(doc) ->
-    ["Module test: mod_cgi - using new of configure new SSL"];
-essl_mod_cgi(suite) ->
-    [];
-essl_mod_cgi(Config) when is_list(Config) ->
-    ssl_mod_cgi(essl, Config).
-
-ssl_mod_cgi(Tag, Config) ->
-    httpd_mod:cgi(Tag, 
-	?SSL_PORT, 
-	?config(host, Config), 
-	?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_esi(doc) ->
-    ["Module test: mod_esi - using new of configure new SSL"];
-essl_mod_esi(suite) ->
-    [];
-essl_mod_esi(Config) when is_list(Config) ->
-    ssl_mod_esi(essl, Config).
-
-ssl_mod_esi(Tag, Config) ->
-    httpd_mod:esi(Tag, 
-		  ?SSL_PORT, 
-		  ?config(host, Config), 
-		  ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_get(doc) ->
-    ["Module test: mod_get - using new of configure new SSL"];
-essl_mod_get(suite) ->
-    [];
-essl_mod_get(Config) when is_list(Config) ->
-    ssl_mod_get(essl, Config).
-
-ssl_mod_get(Tag, Config) ->
-    httpd_mod:get(Tag, 
-		  ?SSL_PORT, 
-		  ?config(host, Config), 
-		  ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_head(doc) ->
-    ["Module test: mod_head - using new of configure new SSL"];
-essl_mod_head(suite) ->
-    [];
-essl_mod_head(Config) when is_list(Config) ->
-    ssl_mod_head(essl, Config).
-
-ssl_mod_head(Tag, Config) ->
-    httpd_mod:head(Tag, 
-		   ?SSL_PORT, 
-		   ?config(host, Config), 
-		   ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_mod_all(doc) ->
-    ["All modules test - using new of configure new SSL"];
-essl_mod_all(suite) ->
-    [];
-essl_mod_all(Config) when is_list(Config) ->
-    ssl_mod_all(essl, Config).
-
-ssl_mod_all(Tag, Config) ->
-    httpd_mod:all(Tag, 
-		  ?SSL_PORT, 
-		  ?config(host, Config), 
-		  ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_light(doc) ->
-    ["Test light load - using new of configure new SSL"];
-essl_load_light(suite) ->
-    [];
-essl_load_light(Config) when is_list(Config) ->
-    ssl_load_light(essl, Config).
-
-ssl_load_light(Tag, Config) ->
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 ?config(host, Config), 
-			 ?config(node, Config),
-			 get_nof_clients(ssl, light)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_medium(doc) ->
-    ["Test medium load - using new of configure new SSL"];
-essl_load_medium(suite) ->
-    [];
-essl_load_medium(Config) when is_list(Config) ->
-    ssl_load_medium(essl, Config).
-
-ssl_load_medium(Tag, Config) ->
-    %% <CONDITIONAL-SKIP>
-    Skippable = [win32],
-    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 ?config(host, Config), 
-			 ?config(node, Config),
-			 get_nof_clients(ssl, medium)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_load_heavy(doc) ->
-    ["Test heavy load - using new of configure new SSL"];
-essl_load_heavy(suite) ->
-    [];
-essl_load_heavy(Config) when is_list(Config) ->
-    ssl_load_heavy(essl, Config).
-
-ssl_load_heavy(Tag, Config) ->
-    %% <CONDITIONAL-SKIP>
-    Skippable = [win32],
-    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
-    httpd_load:load_test(Tag, 
-			 ?SSL_PORT, 
-			 ?config(host, Config), 
-			 ?config(node, Config),
-			 get_nof_clients(ssl, heavy)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_dos_hostname(doc) ->
-    ["Denial Of Service (DOS) attack test case - using new of configure new SSL"];
-essl_dos_hostname(suite) ->
-    [];
-essl_dos_hostname(Config) when is_list(Config) ->
-    ssl_dos_hostname(essl, Config).
-
-ssl_dos_hostname(Tag, Config) ->
-    dos_hostname(Tag, 
-		 ?SSL_PORT, 
-		 ?config(host, Config), 
-		 ?config(node, Config), 
-		 ?MAX_HEADER_SIZE),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_time_test(doc) ->
-    ["using new of configure new SSL"];
-essl_time_test(suite) ->
-    [];
-essl_time_test(Config) when is_list(Config) ->
-    ssl_time_test(essl, Config).
-
-ssl_time_test(Tag, Config) when is_list(Config) ->
-    %% <CONDITIONAL-SKIP>
-    FreeBSDVersionVerify = 
-	fun() ->
-		case os:version() of
-		    {7, 1, _} -> % We only have one such machine, so...
-			true;
-		    _ ->
-			false
-		end
-	end,
-    Skippable = [win32, {unix, [{freebsd, FreeBSDVersionVerify}]}],
-    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
+    ok = http_status("GET /htbin/"++ Script ++ "?Nisse:kkk?sss/lll ", Config, 
+     		     [{statuscode, 200}]),
     
-    httpd_time_test:t(Tag, 
-		      ?config(host, Config), 
-		      ?SSL_PORT),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_503(doc) ->
-    ["Check that you will receive status code 503 when the server"
-     " is blocked and 200 when its not blocked - using new of configure new SSL."];
-essl_block_503(suite) ->
-    [];
-essl_block_503(Config) when is_list(Config) ->
-    ssl_block_503(essl, Config).
-
-ssl_block_503(Tag, Config) ->
-    httpd_block:block_503(Tag, 
-			  ?SSL_PORT, 
-			  ?config(host, Config), 
-			  ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "distribing does not really make a difference in this case." 
-     "Using new of configure new SSL"];
-essl_block_disturbing_idle(suite) ->
-    [];
-essl_block_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_disturbing_idle(essl, Config).
-
-ssl_block_disturbing_idle(Tag, Config) ->
-    httpd_block:block_disturbing_idle(Tag, 
-				      ?SSL_PORT, 
-				      ?config(host, Config), 
-				      ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_idle(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing does not really make a difference in this case." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_idle(suite) ->
-    [];
-essl_block_non_disturbing_idle(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_idle(essl, Config).
-
-ssl_block_non_disturbing_idle(Tag, Config) ->
-    httpd_block:block_non_disturbing_idle(Tag, 
-					  ?SSL_PORT, 
-					  ?config(host, Config), 
-					  ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active(doc) ->
-    ["Check that you can block/unblock an active server. The strategy " 
-     "distribing means ongoing requests should be terminated." 
-     "Using new of configure new SSL"];
-essl_block_disturbing_active(suite) ->
-    [];
-essl_block_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_disturbing_active(essl, Config).
-
-ssl_block_disturbing_active(Tag, Config) ->
-    httpd_block:block_disturbing_active(Tag, 
-					?SSL_PORT, 
-					?config(host, Config), 
-					?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_active(doc) ->
-    ["Check that you can block/unblock an idle server. The strategy " 
-     "non distribing means the ongoing requests should be compleated." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_active(suite) ->
-    [];
-essl_block_non_disturbing_active(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_active(essl, Config).
-
-ssl_block_non_disturbing_active(Tag, Config) ->
-    httpd_block:block_non_disturbing_idle(Tag, 
-					  ?SSL_PORT, 
-					  ?config(host, Config), 
-					  ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be compleated"
-     "if the timeout does not occur." 
-    "Using new of configure new SSL"];
-essl_block_disturbing_active_timeout_not_released(suite) ->
-    [];
-essl_block_disturbing_active_timeout_not_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_not_released(essl, Config).
-
-ssl_block_disturbing_active_timeout_not_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = ?config(host, Config), 
-    Node = ?config(node, Config), 
-    httpd_block:block_disturbing_active_timeout_not_released(Tag, 
-							     Port, Host, Node),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "distribing means ongoing requests should be terminated when"
-     "the timeout occurs." 
-    "Using new of configure new SSL"];
-essl_block_disturbing_active_timeout_released(suite) ->
-    [];
-essl_block_disturbing_active_timeout_released(Config) 
-  when is_list(Config) ->
-    ssl_block_disturbing_active_timeout_released(essl, Config).
-
-ssl_block_disturbing_active_timeout_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = ?config(host, Config), 
-    Node = ?config(node, Config),     
-    httpd_block:block_disturbing_active_timeout_released(Tag, 
-							 Port, 
-							 Host, 
-							 Node), 
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_active_timeout_not_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non non distribing means ongoing requests should be completed." 
-    "Using new of configure new SSL"];
-essl_block_non_disturbing_active_timeout_not_released(suite) ->
-    [];
-essl_block_non_disturbing_active_timeout_not_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_not_released(essl, Config).
-
-ssl_block_non_disturbing_active_timeout_not_released(Tag, Config) ->
-    Port = ?SSL_PORT, 
-    Host = ?config(host, Config), 
-    Node = ?config(node, Config), 
-    httpd_block:block_non_disturbing_active_timeout_not_released(Tag,
-								 Port, 
-								 Host, 
-								 Node),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_non_disturbing_active_timeout_released(doc) ->
-    ["Check that you can block an active server. The strategy " 
-     "non distribing means ongoing requests should be completed. "
-     "When the timeout occurs the block operation sohould be canceled." 
-     "Using new of configure new SSL"];
-essl_block_non_disturbing_active_timeout_released(suite) ->
-    [];
-essl_block_non_disturbing_active_timeout_released(Config)
-  when is_list(Config) ->
-    ssl_block_non_disturbing_active_timeout_released(essl, Config).
-
-ssl_block_non_disturbing_active_timeout_released(Tag, Config)
-  when is_list(Config) ->
-    Port = ?SSL_PORT, 
-    Host = ?config(host, Config), 
-    Node = ?config(node, Config), 
-    httpd_block:block_non_disturbing_active_timeout_released(Tag, 
-							     Port, 
-							     Host, 
-							     Node), 
-
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_block_disturbing_blocker_dies(doc) ->
-    ["using new of configure new SSL"];
-essl_block_disturbing_blocker_dies(suite) ->
-    [];
-essl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_disturbing_blocker_dies(essl, Config).
-
-ssl_block_disturbing_blocker_dies(Tag, Config) ->
-    httpd_block:disturbing_blocker_dies(Tag, 
-					?SSL_PORT, 
-					?config(host, Config), 
-					?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-essl_block_non_disturbing_blocker_dies(doc) ->
-    ["using new of configure new SSL"];
-essl_block_non_disturbing_blocker_dies(suite) ->
-    [];
-essl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
-    ssl_block_non_disturbing_blocker_dies(essl, Config).
-
-ssl_block_non_disturbing_blocker_dies(Tag, Config) ->
-    httpd_block:non_disturbing_blocker_dies(Tag, 
-					    ?SSL_PORT, 
-					    ?config(host, Config), 
-					    ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_no_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_no_block(suite) ->
-    [];
-essl_restart_no_block(Config) when is_list(Config) ->
-    ssl_restart_no_block(essl, Config).
-
-ssl_restart_no_block(Tag, Config) ->
-    httpd_block:restart_no_block(Tag, 
-				 ?SSL_PORT, 
-				 ?config(host, Config), 
-				 ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_disturbing_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_disturbing_block(suite) ->
-    [];
-essl_restart_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_disturbing_block(essl, Config).
-
-ssl_restart_disturbing_block(Tag, Config) ->
-    %% <CONDITIONAL-SKIP>
-    Condition = 
-	fun() -> 
-		case os:type() of
-		    {unix, linux} ->
-			case ?OSCMD("uname -m") of
-			    "ppc" ->
-				case file:read_file_info("/etc/fedora-release") of
-				    {ok, _} ->
-					case ?OSCMD("awk '{print $2}' /etc/fedora-release") of
-					    "release" ->
-						%% Fedora 7 and later
-						case ?OSCMD("awk '{print $3}' /etc/fedora-release") of
-						    "7" ->
-							true;
-						    _ ->
-							false
-						end;
-					    _ ->
-						false
-					end;
-				    _ ->
-					false
-				end;
-			    _ ->
-				false
-			end;
-		    _ ->
-			false
-		end
-	end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
-    httpd_block:restart_disturbing_block(Tag, ?SSL_PORT, 
-					 ?config(host, Config), 
-					 ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-
-
-essl_restart_non_disturbing_block(doc) ->
-    ["using new of configure new SSL"];
-essl_restart_non_disturbing_block(suite) ->
-    [];
-essl_restart_non_disturbing_block(Config) when is_list(Config) ->
-    ssl_restart_non_disturbing_block(essl, Config).
-
-ssl_restart_non_disturbing_block(Tag, Config) ->
-    %% <CONDITIONAL-SKIP>
-    Condition = 
-	fun() -> 
-		case os:type() of
-		    {unix, linux} ->
-			HW = string:strip(os:cmd("uname -m"), right, $\n),
-			case HW of
-			    "ppc" ->
-				case inet:gethostname() of
-				    {ok, "peach"} ->
-					true;
-				    _ ->
-					false
-				end;
-			    _ ->
-				false
-			end;
-		    _ ->
-			false
-		end
-	end,
-    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
-    %% </CONDITIONAL-SKIP>
-
-    httpd_block:restart_non_disturbing_block(Tag, 
-					     ?SSL_PORT, 
-					     ?config(host, Config), 
-					     ?config(node, Config)),
-    ok.
-
-
-%%-------------------------------------------------------------------------
-ip_host(doc) ->   
-    ["Control that the server accepts/rejects requests with/ without host"];
-ip_host(suite)->
-    [];
-ip_host(Config) when is_list(Config) ->
-    httpd_1_1:host(ip_comm, ?IP_PORT, ?config(host, Config),
-		   ?config(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_chunked(doc) ->   
-    ["Control that the server accepts chunked requests"];
-ip_chunked(suite) ->
-    [];
-ip_chunked(Config) when is_list(Config) ->
-    httpd_1_1:chunked(ip_comm, ?IP_PORT, ?config(host, Config),
-		      ?config(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_expect(doc) ->   
-    ["Control that the server handles request with the expect header "
-     "field appropiate"];
-ip_expect(suite)->
-    [];
-ip_expect(Config) when is_list(Config) ->
-    httpd_1_1:expect(ip_comm, ?IP_PORT, ?config(host, Config),
-		     ?config(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_range(doc) ->   
-    ["Control that the server can handle range requests to plain files"];
-ip_range(suite)->
-    [];
-ip_range(Config) when is_list(Config) ->
-    httpd_1_1:range(ip_comm, ?IP_PORT, ?config(host, Config),
-		    ?config(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_if_test(doc) ->   
-    ["Test that the if - request header fields is handled correclty"];
-ip_if_test(suite) ->
-    [];
-ip_if_test(Config) when is_list(Config) ->
-    ServerRoot = ?config(server_root, Config), 
-    DocRoot = filename:join([ServerRoot, "htdocs"]),
-    httpd_1_1:if_test(ip_comm, ?IP_PORT, ?config(host, Config),
-		      ?config(node, Config), DocRoot),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_http_trace(doc) ->   
-    ["Test the trace module "];
-ip_http_trace(suite) -> 
-    [];
-ip_http_trace(Config) when is_list(Config) ->
-    httpd_1_1:http_trace(ip_comm, ?IP_PORT, ?config(host, Config),
-			 ?config(node, Config)),
-    ok.
-%%------------------------------------------------------------------------- 
-ip_http1_1_head(doc) ->  
-    ["Test the trace module "];
-ip_http1_1_head(suite)->
-    [];
-ip_http1_1_head(Config) when is_list(Config) ->
-    httpd_1_1:head(ip_comm, ?IP_PORT, ?config(host, Config),
-			   ?config(node, Config)),
-    ok.
-
-%%------------------------------------------------------------------------- 
-ip_get_0_9(doc) ->  
-    ["Test simple HTTP/0.9 GET"];
-ip_get_0_9(suite)->
-    [];
-ip_get_0_9(Config) when is_list(Config) ->
-    Host =  ?config(host, Config),
-    Node =  ?config(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET / \r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"} ]),
-    %% Without space after uri
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET /\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"} ]),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-				       "GET / HTTP/0.9\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/0.9"}]),
+    ok = http_status("POST /htbin/"++ Script ++ " ",   Config,
+		     [{statuscode, 200}]),
     
-    ok.
-%%------------------------------------------------------------------------- 
-ip_head_1_0(doc) ->  
-    ["Test HTTP/1.0 HEAD"];
-ip_head_1_0(suite)->
-    [];
-ip_head_1_0(Config) when is_list(Config) ->
-    Host =  ?config(host, Config),
-    Node =  ?config(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "HEAD / HTTP/1.0\r\n\r\n", [{statuscode, 200},
-						    {version, "HTTP/1.0"}]),
+    ok = http_status("POST /htbin/"++ Script ++ " ",  Config,
+		     [{statuscode, 200}]),
     
-    ok.
-%%------------------------------------------------------------------------- 
-ip_get_1_0(doc) ->  
-    ["Test HTTP/1.0 GET"];
-ip_get_1_0(suite)->
-    [];
-ip_get_1_0(Config) when is_list(Config) ->
-    Host =  ?config(host, Config),
-    Node =  ?config(node, Config),
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "GET / HTTP/1.0\r\n\r\n", [{statuscode, 200},
-						    {version, "HTTP/1.0"}]),
+    %% Execute an existing, but bad CGI script..
+    ok = http_status("POST /htbin/"++ Script2 ++ " ",  Config, 
+		     [{statuscode, 404}]),
     
-    ok.
-%%------------------------------------------------------------------------- 
-ip_post_1_0(doc) ->  
-    ["Test HTTP/1.0 POST"];
-ip_post_1_0(suite)->
-    [];
-ip_post_1_0(Config) when is_list(Config) ->
-    Host =  ?config(host, Config),
-    Node =  ?config(node, Config),
-    %% Test the post message formatin 1.0! Real post are testes elsewhere
-    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
-			 "POST / HTTP/1.0\r\n\r\n "  
-			 "Content-Length:6 \r\n\r\nfoobar", 
-			 [{statuscode, 500}, {version, "HTTP/1.0"}]),
+    ok = http_status("POST /cgi-bin/"++ Script2 ++ " ", Config,
+		     [{statuscode, 404}]),
     
-    ok.
-%%------------------------------------------------------------------------- 
-ip_mod_cgi_chunked_encoding_test(doc) ->  
-    ["Test the trace module "];
-ip_mod_cgi_chunked_encoding_test(suite)->
-    [];
-ip_mod_cgi_chunked_encoding_test(Config) when is_list(Config) ->
-    Host = ?config(host, Config),
-    Script =
-	case test_server:os_type() of
-	    {win32, _} ->
-		"/cgi-bin/printenv.bat";
-	    _ ->
-		"/cgi-bin/printenv.sh"
-	end,
-    Requests = 
-	["GET " ++ Script ++ " HTTP/1.1\r\nHost:"++ Host ++"\r\n\r\n",
-	 "GET /cgi-bin/erl/httpd_example/newformat  HTTP/1.1\r\nHost:"
-	 ++ Host ++"\r\n\r\n"],
-    httpd_1_1:mod_cgi_chunked_encoding_test(ip_comm, ?IP_PORT,
-					    Host,
-					    ?config(node, Config),
-					    Requests),
-    ok.
-
-%------------------------------------------------------------------------- 
-
-ipv6_hostname_ipcomm() ->
-    [{require, ipv6_hosts}].
-ipv6_hostname_ipcomm(X) -> 
-    SocketType = ip_comm,
-    Port       = ?IP_PORT, 
-    ipv6_hostname(SocketType, Port, X).
-
-ipv6_hostname_essl() ->
-    [{require, ipv6_hosts}].
-ipv6_hostname_essl(X) -> 
-    SocketType = essl, 
-    Port       = ?SSL_PORT, 
-    ipv6_hostname(SocketType, Port, X).
-
-ipv6_hostname(_SocketType, _Port, doc) ->  
-    ["Test standard ipv6 address"];
-ipv6_hostname(_SocketType, _Port, suite)->
-    [];
-ipv6_hostname(SocketType, Port, Config) when is_list(Config) -> 
-    tsp("ipv6_hostname -> entry with"
-	"~n   SocketType: ~p"
-	"~n   Port:       ~p"
-	"~n   Config:     ~p", [SocketType, Port, Config]),
-    Host = ?config(host, Config),
-    URI  = "GET HTTP://" ++ 
-	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
-    tsp("ipv6_hostname -> Host: ~p", [Host]),
-    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
-				  node(), 
-				  URI, 
-				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
-    ok.
-
-%%------------------------------------------------------------------------- 
-
-ipv6_address_ipcomm() ->
-    [{require, ipv6_hosts}].
-ipv6_address_ipcomm(X) ->
-    SocketType = ip_comm,
-    Port       = ?IP_PORT, 
-    ipv6_address(SocketType, Port, X).
-
-ipv6_address_essl() ->
-    [{require, ipv6_hosts}].
-ipv6_address_essl(X) ->
-    SocketType = essl,
-    Port       = ?SSL_PORT, 
-    ipv6_address(SocketType, Port, X).
-
-ipv6_address(_SocketType, _Port, doc) ->
-    ["Test standard ipv6 address"];
-ipv6_address(_SocketType, _Port, suite)->
-    [];
-ipv6_address(SocketType, Port, Config) when is_list(Config) ->   
-    tsp("ipv6_address -> entry with"
-	"~n   SocketType: ~p"
-	"~n   Port:       ~p"
-	"~n   Config:     ~p", [SocketType, Port, Config]),
-    Host = ?config(host, Config),
-    tsp("ipv6_address -> Host: ~p", [Host]),
-    URI = "GET HTTP://" ++ 
-	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
-    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
-				  node(), 
-				  URI, 
-				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
-    ok.
-
-
-%%--------------------------------------------------------------------
-ticket_5775(doc) ->
-    ["Tests that content-length is correct"];
-ticket_5775(suite) ->
-    [];
-ticket_5775(Config) ->
-    ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				     ?IP_PORT, ?config(node, Config),
-				       "GET /cgi-bin/erl/httpd_example:get_bin "
-				       "HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-				       {version, "HTTP/1.0"}]),
-    ok.
-ticket_5865(doc) ->
-    ["Tests that a header without last-modified is handled"];
-ticket_5865(suite) ->
-    [];
-ticket_5865(Config) ->
-    ?SKIP(as_of_r15_behaviour_of_calendar_has_changed),
-    Host = ?config(host,Config),
-    ServerRoot = ?config(server_root, Config), 
-    DocRoot = filename:join([ServerRoot, "htdocs"]),
-    File = filename:join([DocRoot,"last_modified.html"]),
-
-    Bad_mtime = case test_server:os_type() of
-		    {win32, _} ->
-			{{1600,12,31},{23,59,59}};
-		    {unix, _} ->
-			{{1969,12,31},{23,59,59}}
-		end,
+    %% Check "ScriptNoCache" directive (default: false)
+    ok = http_status("GET /cgi-bin/" ++ Script ++ " ", Config,
+		     [{statuscode, 200},
+		      {no_header, "cache-control"}]).
+
+alias() ->
+    [{doc, "Test mod_alias"}].
+
+alias(Config) when is_list(Config) -> 
+    ok = http_status("GET /pics/icon.sheet.gif ", Config,
+		     [{statuscode, 200},
+		      {header, "Content-Type","image/gif"},
+		      {header, "Server"},
+		      {header, "Date"}]),
     
-    {ok,FI}=file:read_file_info(File),
+    ok = http_status("GET / ", Config,
+		     [{statuscode, 200},
+		      {header, "Content-Type","text/html"},
+		      {header, "Server"},
+		      {header, "Date"}]),
     
-    case file:write_file_info(File,FI#file_info{mtime=Bad_mtime}) of
-	ok ->
-	    ok = httpd_test_lib:verify_request(ip_comm, Host,
-					       ?IP_PORT, ?config(node, Config),
-					       "GET /last_modified.html"
-					       " HTTP/1.1\r\nHost:"
-					       ++Host++"\r\n\r\n", 
-					       [{statuscode, 200},
-						{no_last_modified,
-						 "last-modified"}]),
-	    ok;
-	{error, Reason} ->
-	    Fault = 
-		io_lib:format("Attempt to change the file info to set the"
-			      " preconditions of the test case failed ~p~n",
-			      [Reason]),
-	    {skip, Fault}
-    end.
-
-ticket_5913(doc) ->
-    ["Tests that a header without last-modified is handled"];
-ticket_5913(suite) -> [];
-ticket_5913(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				       ?IP_PORT, ?config(node, Config),
-				       "GET /cgi-bin/erl/httpd_example:get_bin "
-				       "HTTP/1.0\r\n\r\n", 
-				       [{statuscode, 200},
-					{version, "HTTP/1.0"}]),
-    ok.
+    ok = http_status("GET /misc/ ", Config,
+		     [{statuscode, 200},
+		      {header, "Content-Type","text/html"},
+		      {header, "Server"},
+		      {header, "Date"}]),
+
+    %% Check redirection if trailing slash is missing.
+    ok = http_status("GET /misc ", Config,
+		     [{statuscode, 301},
+		      {header, "Location"},
+		      {header, "Content-Type","text/html"}]).
+
+
+%% auth_api() ->
+%%     [{doc, "Test mod_auth API"}].
+
+%% auth_api(Config) when is_list(Config) -> 
+%%     Version = ?config(http_version, Config),
+%%     Host = ?config(host, Config),
+%%     ok = http_status("GET / ", Config,
+%% 		     [{statuscode, 200}]),
+%%     ok = auth_status(auth_request("/", "one", "WrongPassword", Version, Host), Config,
+%% 		     [{statuscode, 200}]),
+
+%%     %% Make sure Authenticate header is received even the second time
+%%     %% we try a incorrect password! Otherwise a browser client will hang!
+%%     ok = auth_status(auth_request("/" ++ AuthStoreType ++ "open/",
+%% 				  "dummy", "WrongPassword", Host), Config, 
+%% 		     [{statuscode, 401},
+%% 		      {header, "WWW-Authenticate"}]),
+%%     ok = auth_status(auth_request("/" ++ AuthStoreType ++ "open/", "dummy", "WrongPassword", 
+%% 				  Host), Config, [{statuscode, 401},	
+%% 						  {header, "WWW-Authenticate"}]),
+    
+%%     %% Change the password to DummyPassword then try to add a user 
+%%     %% Get an error and set it to NoPassword
+%%     ok = update_password(Node, ServerRoot, Host, Port, AuthStoreType ++ 
+%% 			 "open", "NoPassword", "DummyPassword"),
+%%     {error,bad_password} = 
+%% 	add_user(Node, ServerRoot, Port, AuthStoreType ++ "open", "one", 
+%% 		 "onePassword", []),
+%%     ok = update_password(Node, ServerRoot, Host, Port, AuthStoreType ++"open",
+%% 			 "DummyPassword", "NoPassword"),
+  
+%%     %% Test /*open, require user one Aladdin
+%%     remove_users(Node, ServerRoot, Host, Port, AuthStoreType ++ "open"),
 
-ticket_6003(doc) ->
-    ["Tests that a URI with a bad hexadecimal code is handled"];
-ticket_6003(suite) -> [];
-ticket_6003(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				       ?IP_PORT, ?config(node, Config),
-				       "GET http://www.erlang.org/%skalle "
-				       "HTTP/1.0\r\n\r\n",
-				       [{statuscode, 400},
-					{version, "HTTP/1.0"}]),
-    ok.
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "open/",
+%% 		 "one", "onePassword", [{statuscode, 401}]),
+    
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "open/",
+%% 		 "two", "twoPassword", [{statuscode, 401}]),
+ 
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "open/", 
+%% 		 "Aladdin", "onePassword", [{statuscode, 401}]),
+
+%%     add_user(Node, ServerRoot, Port, AuthStoreType ++ "open", "one", 
+%% 	     "onePassword", []),
+%%     add_user(Node, ServerRoot, Port, AuthStoreType ++ "open", "two", 
+%% 	     "twoPassword", []),
+%%     add_user(Node, ServerRoot, Port, AuthStoreType ++ "open", "Aladdin", 
+%% 	     "AladdinPassword", []),
+   
+%%     {ok, [_|_]} = list_users(Node, ServerRoot, Host, Port, 
+%% 			  AuthStoreType++"open"),
+%%     auth_request(Type, Host, Port, Node, "/" ++ AuthStoreType ++ "open/",
+%% 		 "one", "WrongPassword", [{statuscode, 401}]),
+%%     auth_request(Type, Host, Port, Node, "/" ++ AuthStoreType ++ "open/", 
+%% 		 "one", "onePassword", [{statuscode, 200}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "open/", 
+%% 		 "two", "twoPassword", [{statuscode, 401}]),
+%%     auth_request(Type, Host, Port, Node, "/" ++ AuthStoreType ++ "open/", 
+%% 		 "Aladdin", "WrongPassword", [{statuscode, 401}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "open/", 
+%% 		 "Aladdin", "AladdinPassword", [{statuscode, 200}]),
+   
+%%     remove_users(Node, ServerRoot, Host, Port, AuthStoreType++"open"),
+%%     {ok, []} = list_users(Node, ServerRoot, Host, Port, 
+%% 			  AuthStoreType++"open"),
+
+%%     %% Phase 2
+%%     remove_users(Node, ServerRoot, Host, Port, AuthStoreType++"secret"),
+%%     {ok, []} = list_users(Node, ServerRoot, Host, Port, AuthStoreType ++
+%% 			  "secret"),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "secret/",
+%% 		 "one", "onePassword", [{statuscode, 401}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "secret/", 
+%% 		 "two", "twoPassword", [{statuscode, 401}]),
+%%     auth_request(Type, Host, Port,  Node, "/" ++ AuthStoreType ++ "secret/", 
+%% 		 "three", "threePassword", [{statuscode, 401}]),
+%%     add_user(Node, ServerRoot, Port, AuthStoreType ++ "secret", "one",
+%% 	     "onePassword", 
+%% 	     []),
+%%     add_user(Node, ServerRoot, Port, AuthStoreType ++ "secret", 
+%% 	     "two", "twoPassword", []),
+%%     add_user(Node, ServerRoot, Port, AuthStoreType++"secret", "Aladdin", 
+%% 	     "AladdinPassword",[]),
+%%     add_group_member(Node, ServerRoot, Port, AuthStoreType ++ "secret", 
+%% 		     "one", "group1"),
+%%     add_group_member(Node, ServerRoot, Port, AuthStoreType ++ "secret", 
+%% 		     "two", "group1"),
+%%     add_group_member(Node, ServerRoot, Port, AuthStoreType ++ 
+%% 		     "secret", "Aladdin", "group2"),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "secret/",
+%% 		 "one", "onePassword", [{statuscode, 200}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "secret/", 
+%% 		 "two", "twoPassword", [{statuscode, 200}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "secret/",
+%% 		 "Aladdin", "AladdinPassword", [{statuscode, 200}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ "secret/",
+%% 		 "three", "threePassword", [{statuscode, 401}]),
+%%     remove_users(Node, ServerRoot, Host, Port, AuthStoreType ++ "secret"),
+%%     {ok, []} = list_users(Node, ServerRoot, Host, Port, 
+%% 			  AuthStoreType ++ "secret"),
+%%     remove_groups(Node, ServerRoot, Host, Port, AuthStoreType ++ "secret"),
+%%     Directory = filename:join([ServerRoot, "htdocs", AuthStoreType ++ 
+%% 			       "secret"]),
+%%     {ok, []} = list_groups(Node, ServerRoot, Host, Port, Directory),
+
+%%     %% Phase 3
+%%     remove_users(Node, ServerRoot, Host, Port, AuthStoreType ++ 
+%% 		 "secret/top_secret"),
+%%     remove_groups(Node, ServerRoot, Host, Port, AuthStoreType ++ 
+%% 		  "secret/top_secret"),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ 
+%% 		 "secret/top_secret/",
+%% 		 "three", "threePassword", [{statuscode, 401}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ 
+%% 		 "secret/top_secret/", "two", "twoPassword", 
+%% 		 [{statuscode, 401}]),
+%%     add_user(Node, ServerRoot, Port, AuthStoreType ++ 
+%% 	     "secret/top_secret","three",
+%% 	     "threePassword",[]),
+%%     add_user(Node, ServerRoot, Port, AuthStoreType ++ "secret/top_secret",
+%% 	     "two","twoPassword", []),
+%%     add_group_member(Node, ServerRoot, Port, AuthStoreType ++ 
+%% 		     "secret/top_secret",
+%% 		     "three", "group3"),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ 
+%% 		 "secret/top_secret/", "three", "threePassword", 
+%% 		 [{statuscode, 200}]),
+%%     auth_request(Type, Host, Port, Node,"/" ++ AuthStoreType ++ 
+%% 		 "secret/top_secret/", "two", "twoPassword", 
+%% 		 [{statuscode, 401}]),
+%%     add_group_member(Node, ServerRoot, Port, AuthStoreType ++ 
+%% 		     "secret/top_secret",
+%% 		     "two", "group3"),
+%%     auth_request(Type,Host,Port,Node,"/" ++ AuthStoreType ++ 
+%% 		 "secret/top_secret/",
+%% 		 "two", "twoPassword", [{statuscode, 200}]),
+%%     remove_users(Node, ServerRoot, Host, Port, AuthStoreType ++ 
+%% 		 "secret/top_secret"),
+%%     {ok, []} = list_users(Node, ServerRoot, Host, Port, 
+%% 			  AuthStoreType ++ "secret/top_secret"),
+%%     remove_groups(Node, ServerRoot, Host, Port, AuthStoreType ++ 
+%% 		  "secret/top_secret"),
+%%     Directory2 = filename:join([ServerRoot, "htdocs", 
+%% 				AuthStoreType ++ "secret/top_secret"]),
+%%     {ok, []} = list_groups(Node, ServerRoot, Host, Port, Directory2),
+%%     auth_request(Type, Host, Port, Node, "/" ++ AuthStoreType ++ 
+%% 		 "secret/top_secret/", "two", "twoPassword", 
+%% 		 [{statuscode, 401}]),
+%%     auth_request(Type, Host, Port, Node, "/" ++ AuthStoreType ++ 
+%% 		 "secret/top_secret/","three", "threePassword",
+%% 		 [{statuscode, 401}]).
 
-ticket_7304(doc) ->
-     ["Tests missing CR in delimiter"];
-ticket_7304(suite) -> 
-    [];
-ticket_7304(Config) ->
-    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
-				       ?IP_PORT, ?config(node, Config),
-				       "GET / HTTP/1.0\r\n\n",
-				       [{statuscode, 200},
-					{version, "HTTP/1.0"}]),
-    ok.
 
 %%--------------------------------------------------------------------
-%% Internal functions
+%% Internal functions -----------------------------------
 %%--------------------------------------------------------------------
-dos_hostname(Type, Port, Host, Node, Max) ->
-    H1 = {"", 200},
-    H2 = {"dummy-host.ericsson.se", 200},
-    TooLongHeader = lists:append(lists:duplicate(Max + 1, "a")),
-    H3 = {TooLongHeader, 403},
-    Hosts = [H1,H2,H3],
-    dos_hostname_poll(Type, Host, Port, Node, Hosts).
+do_max_clients(Config) ->
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),
+    start_blocker(Config),
+    ok = httpd_test_lib:verify_request(?config(type, Config), Host, 
+				       ?config(port, Config),  ?config(node, Config),
+				       http_request("GET /index.html ", Version, Host),
+				       [{statuscode, 503},
+					{version, Version}]),
+    receive 
+    after 2000 ->
+	    ok = httpd_test_lib:verify_request(?config(type, Config), Host, 
+					       ?config(port, Config),  ?config(node, Config),
+					       http_request("GET /index.html ", Version, Host),
+					       [{statuscode, 200},
+						{version, Version}])
+    end.
 
-%% make_ipv6(T) when is_tuple(T) andalso (size(T) =:= 8) ->
-%%     make_ipv6(tuple_to_list(T));
+setup_server_dirs(ServerRoot, DocRoot, DataDir) ->   
+    CgiDir =  filename:join(ServerRoot, "cgi-bin"),
+    AuthDir =  filename:join(ServerRoot, "auth"),
+    PicsDir =  filename:join(ServerRoot, "icons"),
 
-%% make_ipv6([_, _, _, _, _, _, _, _] = IPV6) ->
-%%     lists:flatten(io_lib:format("~s:~s:~s:~s:~s:~s:~s:~s", IPV6)).
+    ok = file:make_dir(ServerRoot),
+    ok = file:make_dir(DocRoot),
+    ok = file:make_dir(CgiDir),
+    ok = file:make_dir(AuthDir),
+    ok = file:make_dir(PicsDir),
+
+    DocSrc = filename:join(DataDir, "server_root/htdocs"),    
+    AuthSrc = filename:join(DataDir, "server_root/auth"),    
+    CgiSrc =  filename:join(DataDir, "server_root/cgi-bin"),    
+    PicsSrc =  filename:join(DataDir, "server_root/icons"),    
+    
+    inets_test_lib:copy_dirs(DocSrc, DocRoot),
+    inets_test_lib:copy_dirs(AuthSrc, AuthDir),
+    inets_test_lib:copy_dirs(CgiSrc, CgiDir),
+    inets_test_lib:copy_dirs(PicsSrc, PicsDir),
+        
+    Cgi = case test_server:os_type() of
+	      {win32, _} ->
+		  "cgi_echo.exe";
+	      _ ->
+		  "cgi_echo"
+	  end,
+    
+    inets_test_lib:copy_file(Cgi, DataDir, CgiDir),
+    AbsCgi = filename:join([CgiDir, Cgi]),
+    {ok, FileInfo} = file:read_file_info(AbsCgi),
+    ok = file:write_file_info(AbsCgi, FileInfo#file_info{mode = 8#00755}),
+    
+    EnvCGI =  filename:join([ServerRoot, "cgi-bin", "printenv.sh"]),
+    {ok, FileInfo1} = file:read_file_info(EnvCGI),
+    ok = file:write_file_info(EnvCGI, 
+			      FileInfo1#file_info{mode = 8#00755}).
+    
+start_apps(https) ->
+    inets_test_lib:start_apps([crypto, public_key, ssl]);
+start_apps(_) ->
+    ok.
 
+server_start(_, HttpdConfig) ->
+    {ok, Pid} = inets:start(httpd, HttpdConfig),
+    Serv = inets:services_info(),
+    {value, {_, _, Info}} = lists:keysearch(Pid, 2, Serv),
+    {Pid, proplists:get_value(port, Info)}.
 
-%%--------------------------------------------------------------------
-%% Other help functions
-create_config(Config, Access, FileName) ->
+server_config(http, Config) ->
     ServerRoot = ?config(server_root, Config),
-    TcTopDir   = ?config(tc_top_dir,  Config),
-    Port       = ?config(port,        Config),
-    Type       = ?config(sock_type,   Config),
-    Host       = ?config(host,        Config),
-    Mods       = io_lib:format("~p", [httpd_mod]),
-    Funcs      = io_lib:format("~p", [ssl_password_cb]),
-    MaxHdrSz   = io_lib:format("~p", [256]),
-    MaxHdrAct  = io_lib:format("~p", [close]),
-
-    io:format(user, 
-	      "create_config -> "
-	      "~n   ServerRoot: ~p"
-	      "~n   TcTopDir:   ~p"
-	      "~n   Type:       ~p"
-	      "~n   Port:       ~p"
-	      "~n   Host:       ~p"
-	      "~n", [ServerRoot, TcTopDir, Type, Port, Host]),
-
-    SSL =
-	if
-	    (Type =:= ssl)  orelse 
-	    (Type =:= essl) ->
-		[cline(["SSLCertificateFile ", 
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCertificateKeyFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCACertificateFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLPasswordCallbackModule ", Mods]),
-		 cline(["SSLPasswordCallbackFunction ", Funcs]),
-		 cline(["SSLVerifyClient 0"]),
-		 cline(["SSLVerifyDepth 1"])];
-	    true ->
-		[]
-	end,
-    ModOrder = 
-	case Access of
-	    mod_htaccess ->
-		"Modules mod_alias mod_htaccess mod_auth "
-		    "mod_security "
-		    "mod_responsecontrol mod_trace mod_esi "
-		    "mod_actions mod_cgi mod_include mod_dir "
-		    "mod_range mod_get "
-		    "mod_head mod_log mod_disk_log";
-	    _ ->
-		"Modules mod_alias mod_auth mod_security "
-		    "mod_responsecontrol mod_trace mod_esi "
-		    "mod_actions mod_cgi mod_include mod_dir "
-			   "mod_range mod_get "
-		    "mod_head mod_log mod_disk_log"
-	end,
+    [{port, 0},
+     {server_name,"httpd_test"},
+     {server_root, ServerRoot},
+     {document_root, ?config(doc_root, Config)},
+     {bind_address, any},
+     {ipfamily, inet},
+     {max_header_size, 256},
+     {max_header_action, close},
+     {mime_types, [{"html","text/html"},{"htm","text/html"}, {"shtml","text/html"},
+		   {"gif", "image/gif"}]},
+     {alias, {"/icons/", filename:join(ServerRoot,"icons") ++ "/"}},
+     {alias, {"/pics/",  filename:join(ServerRoot,"icons") ++ "/"}},
+     {script_alias, {"/cgi-bin/", filename:join(ServerRoot, "cgi-bin") ++ "/"}},
+     {script_alias, {"/htbin/", filename:join(ServerRoot, "cgi-bin") ++ "/"}},
+     {erl_script_alias, {"/cgi-bin/erl", [httpd_example, io]}},
+     {eval_script_alias, {"/eval", [httpd_example, io]}}
+    ] ++  auth_conf(ServerRoot);
+
+server_config(http_limit, Config) ->
+    [{max_clients, 1}]  ++ server_config(http, Config);
     
-    %% The test suite currently does not handle an explicit BindAddress.
-    %% They assume any has been used, that is Addr is always set to undefined!
-
-    %%     {ok, Hostname} = inet:gethostname(), 
-    %%     {ok, Addr} = inet:getaddr(Hostname, inet6),
-    %%     AddrStr = make_ipv6(Addr), 
-    %%     BindAddress = lists:flatten(io_lib:format("~s|inet6", [AddrStr])),
-
-    BindAddress = "*|inet", 
-    %% BindAddress = "*", 
-
-    HttpConfig = [
-		  cline(["Port ", integer_to_list(Port)]),
-		  cline(["ServerName ", Host]),
-		  cline(["SocketType ", atom_to_list(Type)]),
-		  cline([ModOrder]),
-		  %% cline(["LogFormat ", "erlang"]),
-		  cline(["ServerAdmin [email protected]"]),
-		  cline(["BindAddress ", BindAddress]),
-		  cline(["ServerRoot ", ServerRoot]),
-		  cline(["ErrorLog ", TcTopDir, 
-		     "/logs/error_log_", integer_to_list(Port)]),
-		  cline(["TransferLog ", TcTopDir, 
-			 "/logs/access_log_", integer_to_list(Port)]),
-		  cline(["SecurityLog ", TcTopDir, 
-			 "/logs/security_log_", integer_to_list(Port)]),
-		  cline(["ErrorDiskLog ", TcTopDir, 
-			 "/logs/error_disk_log_", integer_to_list(Port)]),
-		  cline(["ErrorDiskLogSize ", "190000 ", "11"]),
-		  cline(["TransferDiskLog ", TcTopDir, 
-			 "/logs/access_disk_log_", integer_to_list(Port)]),
-		  cline(["TransferDiskLogSize ", "200000 ", "10"]),
-		  cline(["SecurityDiskLog ", TcTopDir, 
-			 "/logs/security_disk_log_", integer_to_list(Port)]),
-		  cline(["SecurityDiskLogSize ", "210000 ", "9"]),
-		  cline(["MaxClients 10"]),
-		  cline(["MaxHeaderSize ", MaxHdrSz]),
-		  cline(["MaxHeaderAction ", MaxHdrAct]),
-		  cline(["DocumentRoot ", 
-			 filename:join(ServerRoot, "htdocs")]),
-		  cline(["DirectoryIndex ", "index.html ", "welcome.html"]),
-		  cline(["DefaultType ", "text/plain"]),
-		  SSL,
-		  mod_alias_config(ServerRoot),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs",
-						  "open"]),
-				   "Open Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "user one Aladdin",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "secret"]),
-				   "Secret Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "secret", 
-						  "top_secret"]),
-				   "Top Secret Area", 
-				   filename:join(ServerRoot, "auth/passwd"),
-				   filename:join(ServerRoot, "auth/group"),
-				   plain,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data")),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_open"]),
-				   "Dets Open Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "user one Aladdin",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_secret"]),
-			       "Dets Secret Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "dets_secret", 
-						  "top_secret"]),
-				   "Dets Top Secret Area", 
-				   filename:join(ServerRoot, "passwd"),
-				   filename:join(ServerRoot, "group"),
-				   dets,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data")),
-		  
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "mnesia_open"]),
-				   "Mnesia Open Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "user one Aladdin",
-			       filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join([ServerRoot,"htdocs", 
-						  "mnesia_secret"]),
-				   "Mnesia Secret Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "group group1 group2",
-				   filename:join(ServerRoot, "security_data")),
-		  config_directory(filename:join(
-				     [ServerRoot, "htdocs", "mnesia_secret",
-				      "top_secret"]),
-				   "Mnesia Top Secret Area", 
-				   false,
-				   false,
-				   mnesia,
-				   "group group3",
-				   filename:join(ServerRoot, "security_data"))
-		 ],
-    ConfigFile = filename:join([TcTopDir, FileName]),
-    {ok, Fd} = file:open(ConfigFile, [write]),
-    ok = file:write(Fd, lists:flatten(HttpConfig)),
-    ok = file:close(Fd).
-
-config_directory(Dir, AuthName, AuthUserFile, AuthGroupFile, AuthDBType, 
-		 Require, SF) ->
-    file:delete(SF),
-    [
-     cline(["<Directory ", Dir, ">"]),
-     cline(["SecurityDataFile ", SF]),
-     cline(["SecurityMaxRetries 3"]),
-     cline(["SecurityFailExpireTime ", integer_to_list(?FAIL_EXPIRE_TIME)]),
-     cline(["SecurityBlockTime 1"]),
-     cline(["SecurityAuthTimeout ", integer_to_list(?AUTH_TIMEOUT)]),
-     cline(["SecurityCallbackModule ", "httpd_mod"]),
-     cline_if_set("AuthUserFile", AuthUserFile),
-     cline_if_set("AuthGroupFile", AuthGroupFile),
-     cline_if_set("AuthName", AuthName),
-     cline_if_set("AuthDBType", AuthDBType),
-     cline(["require ", Require]),
-     cline(["</Directory>\r\n"])
-    ].
-
-mod_alias_config(Root) ->
-    [
-     cline(["Alias /icons/ ", filename:join(Root,"icons"), "/"]),
-     cline(["Alias /pics/ ", filename:join(Root, "icons"), "/"]),
-     cline(["ScriptAlias /cgi-bin/ ", filename:join(Root, "cgi-bin"), "/"]),
-     cline(["ScriptAlias /htbin/ ", filename:join(Root, "cgi-bin"), "/"]),
-     cline(["ErlScriptAlias /cgi-bin/erl httpd_example io"]),
-     cline(["EvalScriptAlias /eval httpd_example io"])
-    ].
-
-cline(List) ->
-    lists:flatten([List, "\r\n"]).
-
-cline_if_set(_, false) ->
-    [];
-cline_if_set(Name, Var) when is_list(Var) ->
-    cline([Name, " ", Var]);
-cline_if_set(Name, Var) when is_atom(Var) ->
-    cline([Name, " ", atom_to_list(Var)]).
-
-getaddr() ->
-    {ok,HostName} = inet:gethostname(),
-    {ok,{A1,A2,A3,A4}} = inet:getaddr(HostName,inet),
-    lists:flatten(io_lib:format("~p.~p.~p.~p",[A1,A2,A3,A4])).
+server_config(_, _) ->
+    [].
+
+http_request(Request, "HTTP/1.1" = Version, Host, {Headers, Body}) ->
+    Request ++ Version ++ "\r\nhost:" ++ Host ++ "\r\n" ++ Headers ++ "\r\n" ++ Body;
+http_request(Request, Version, _, {Headers, Body}) ->
+    Request ++ Version ++ "\r\n" ++ Headers  ++ "\r\n" ++ Body.
+
+http_request(Request, "HTTP/1.1" = Version, Host) ->
+    Request ++ Version ++ "\r\nhost:" ++ Host  ++ "\r\n\r\n";
+http_request(Request, Version, _) ->
+    Request ++ Version ++ "\r\n\r\n".
+
+auth_request(Path, User, Passwd, "HTTP/1.1" = Version, Host) ->
+    "GET " ++ Path ++ " " ++ Version ++  "\r\nhost:" ++ Host  ++
+	"\r\nAuthorization: Basic " ++  
+	base64:encode_to_string(User++":"++Passwd) ++
+	"\r\n\r\n";
+auth_request(Path, User, Passwd, Version, _Host) ->
+    "GET " ++ Path ++ " " ++ Version ++  
+	"\r\nAuthorization: Basic " ++  
+	base64:encode_to_string(User++":"++Passwd) ++
+	"\r\n\r\n".
+
+head_status("HTTP/0.9") ->
+    501; %% Not implemented in HTTP/0.9
+head_status(_) ->
+    200.
+
+auth_conf(Root) ->
+    [{directory, {filename:join(Root, "htdocs/open"), 
+		  [{auth_type, plain},
+		   {auth_name, "Open Area"},
+		   {auth_user_file, filename:join(Root, "auth/passwd")},
+		   {auth_group_file, filename:join(Root, "auth/group")},
+		   {require_user, ["one", "Aladdin"]}]}},
+    {directory, {filename:join(Root, "htdocs/secret"), 
+		  [{auth_type, plain},
+		   {auth_name, "Secret Area"},
+		   {auth_user_file, filename:join(Root, "auth/passwd")},
+		   {auth_group_file, filename:join(Root, "auth/group")},
+		   {require_group, ["group1", "group2"]}]}},
+     {directory, {filename:join(Root, "htdocs/secret/top_secret"), 
+		  [{auth_type, plain},
+		   {auth_name, "Top Secret Area"},
+		   {auth_user_file, filename:join(Root, "auth/passwd")},
+		   {auth_group_file, filename:join(Root, "auth/group")},
+		   {require_group, ["group3"]}]}},
+     {directory, {filename:join(Root, "htdocs/open"), 
+		  [{auth_type, mnesia},
+		   {auth_name, "Open Area"},
+		   {auth_user_file, filename:join(Root, "auth/passwd")},
+		   {auth_group_file, filename:join(Root, "auth/group")},
+		   {require_user, ["one", "Aladdin"]}]}},
+     {directory, {filename:join(Root, "htdocs/secret"), 
+		  [{auth_type, mnesia},
+		   {auth_name, "Secret Area"},
+		   {auth_user_file, filename:join(Root, "auth/passwd")},
+		   {auth_group_file, filename:join(Root, "auth/group")},
+		   {require_group, ["group1", "group2"]}]}}
+    ]. 
+
+
+http_status(Request, Config, Expected) ->
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),    
+    httpd_test_lib:verify_request(?config(type, Config), Host, 
+				  ?config(port, Config),  ?config(node, Config),
+				  http_request(Request, Version, Host),
+				  Expected ++ [{version, Version}]).
+
+http_status(Request, HeadersAndBody, Config, Expected) ->
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),    
+    httpd_test_lib:verify_request(?config(type, Config), Host, 
+				  ?config(port, Config),  ?config(node, Config),
+				  http_request(Request, Version, Host, HeadersAndBody),
+				  Expected ++ [{version, Version}]).
+
+auth_status(AuthRequest, Config, Expected) ->
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),    
+    httpd_test_lib:verify_request(?config(type, Config), Host, 
+				  ?config(port, Config),  ?config(node, Config),
+				  AuthRequest,
+				  Expected ++ [{version, Version}]).
+
+basic_auth_requiered(Config) -> 
+    ok = http_status("GET /open/ ", Config,  [{statuscode, 401},
+					      {header, "WWW-Authenticate"}]),
+    ok = http_status("GET /secret/ ", Config,  [{statuscode, 401},
+						{header, "WWW-Authenticate"}]),
+    ok = http_status("GET /secret/top_secret/ ", Config,  [{statuscode, 401},
+						      {header, "WWW-Authenticate"}]).  
 
 start_mnesia(Node) ->
     case rpc:call(Node, ?MODULE, cleanup_mnesia, []) of
 	ok ->
 	    ok;
 	Other ->
-	    tsf({failed_to_cleanup_mnesia, Other})
+	    ct:fail({failed_to_cleanup_mnesia, Other})
     end,
     case rpc:call(Node, ?MODULE, setup_mnesia, []) of
 	{atomic, ok} ->
 	    ok;
 	Other2 ->
-	    tsf({failed_to_setup_mnesia, Other2})
+	    ct:fail({failed_to_setup_mnesia, Other2})
     end,
     ok.
 
@@ -2251,195 +772,23 @@ cleanup_mnesia() ->
     mnesia:delete_schema([node()]),
     ok.
 
-create_htaccess_data(Path, IpAddress)->
-    create_htaccess_dirs(Path),
-    
-    create_html_file(filename:join([Path,"ht/open/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/blocknet/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/secret/dummy.html"])),
-    create_html_file(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
+start_blocker(Config) ->
+    spawn(httpd_SUITE, init_blocker, [self(), Config]),
+    receive
+	blocker_start ->
+	    ok
+    end.
     
-    create_htaccess_file(filename:join([Path,"ht/open/.htaccess"]),
-			 Path, "user one Aladdin"),
-    create_htaccess_file(filename:join([Path,"ht/secret/.htaccess"]),
-			 Path, "group group1 group2"),
-    create_htaccess_file(filename:join([Path,
-				       "ht/secret/top_secret/.htaccess"]),
-			Path, "user four"),
-    create_htaccess_file(filename:join([Path,"ht/blocknet/.htaccess"]),
-			Path, nouser, IpAddress),
-   
-    create_user_group_file(filename:join([Path,"ht","users.file"]),
-			   "one:OnePassword\ntwo:TwoPassword\nthree:"
-			   "ThreePassword\nfour:FourPassword\nAladdin:"
-			   "AladdinPassword"),
-    create_user_group_file(filename:join([Path,"ht","groups.file"]),
-			   "group1: two one\ngroup2: two three").
-
-create_html_file(PathAndFileName)->
-    file:write_file(PathAndFileName,list_to_binary(
-	 "<html><head><title>test</title></head>
-         <body>testar</body></html>")).
-
-create_htaccess_file(PathAndFileName, BaseDir, RequireData)->
-    file:write_file(PathAndFileName,
-		    list_to_binary(
-		      "AuthUserFile "++ BaseDir ++
-		      "/ht/users.file\nAuthGroupFile "++ BaseDir
-		      ++ "/ht/groups.file\nAuthName Test\nAuthType"
-		      " Basic\n<Limit>\nrequire " ++ RequireData ++
-		      "\n</Limit>")).
-
-create_htaccess_file(PathAndFileName, BaseDir, nouser, IpAddress)->
-    file:write_file(PathAndFileName,list_to_binary(
-				      "AuthUserFile "++ BaseDir ++
-				      "/ht/users.file\nAuthGroupFile " ++ 
-				      BaseDir ++ "/ht/groups.file\nAuthName"
-				      " Test\nAuthType"
-				      " Basic\n<Limit GET>\n\tallow from " ++ 
-				      format_ip(IpAddress,
-						string:rchr(IpAddress,$.)) ++ 
-				      "\n</Limit>")).
-
-create_user_group_file(PathAndFileName, Data)->
-    file:write_file(PathAndFileName, list_to_binary(Data)).
-
-create_htaccess_dirs(Path)->
-    ok = file:make_dir(filename:join([Path,"ht"])),
-    ok = file:make_dir(filename:join([Path,"ht/open"])),
-    ok = file:make_dir(filename:join([Path,"ht/blocknet"])),
-    ok = file:make_dir(filename:join([Path,"ht/secret"])),
-    ok = file:make_dir(filename:join([Path,"ht/secret/top_secret"])).
-
-remove_htaccess_dirs(Path)->
-    file:del_dir(filename:join([Path,"ht/secret/top_secret"])),
-    file:del_dir(filename:join([Path,"ht/secret"])),
-    file:del_dir(filename:join([Path,"ht/blocknet"])),
-    file:del_dir(filename:join([Path,"ht/open"])),
-    file:del_dir(filename:join([Path,"ht"])).
-
-format_ip(IpAddress,Pos)when Pos > 0->
-    case lists:nth(Pos,IpAddress) of
-	$.->
-	    case lists:nth(Pos-2,IpAddress) of
-		$.->
-		   format_ip(IpAddress,Pos-3);
-		_->
-		    lists:sublist(IpAddress,Pos-2) ++ "."
-	    end;
-	_ ->
-	    format_ip(IpAddress,Pos-1)
-    end;
-
-format_ip(IpAddress, _Pos)->
-    "1" ++ IpAddress.
-
-remove_htaccess(Path)->
-    file:delete(filename:join([Path,"ht/open/dummy.html"])),
-    file:delete(filename:join([Path,"ht/secret/dummy.html"])),
-    file:delete(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
-    file:delete(filename:join([Path,"ht/blocknet/dummy.html"])),
-    file:delete(filename:join([Path,"ht/blocknet/.htaccess"])),
-    file:delete(filename:join([Path,"ht/open/.htaccess"])),
-    file:delete(filename:join([Path,"ht/secret/.htaccess"])),
-    file:delete(filename:join([Path,"ht/secret/top_secret/.htaccess"])),
-    file:delete(filename:join([Path,"ht","users.file"])),
-    file:delete(filename:join([Path,"ht","groups.file"])),
-    remove_htaccess_dirs(Path).
-
-
-dos_hostname_poll(Type, Host, Port, Node, Hosts) ->
-    [dos_hostname_poll1(Type, Host, Port, Node, Host1, Code)
-     || {Host1,Code} <- Hosts].
-
-dos_hostname_poll1(Type, Host, Port, Node, Host1, Code) ->
-    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
-				       dos_hostname_request(Host1),
-				       [{statuscode, Code},
-					{version, "HTTP/1.0"}]).
-        
-dos_hostname_request(Host) ->
-    "GET / HTTP/1.0\r\n" ++ Host ++ "\r\n\r\n".
-
-get_nof_clients(Mode, Load) ->
-    get_nof_clients(test_server:os_type(), Mode, Load).
-
-get_nof_clients(_,       ip_comm, light)  -> 5;
-get_nof_clients(_,       ssl,     light)  -> 2;
-get_nof_clients(_,       ip_comm, medium) -> 10;
-get_nof_clients(_,       ssl,     medium) -> 4;
-get_nof_clients(_,       ip_comm, heavy)  -> 20;
-get_nof_clients(_,       ssl,     heavy)  -> 6.
-
-%% Make a file 100 bytes long containing 012...9*10
-create_range_data(Path) ->
-    PathAndFileName=filename:join([Path,"range.txt"]),
-    file:write_file(PathAndFileName,list_to_binary(["12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890",
-						   "12345678901234567890"])).
-
-create_ipv6_config(Config, FileName, Ipv6Address) ->
-    ServerRoot = ?config(server_root, Config),
-    TcTopDir   = ?config(tc_top_dir,  Config),
-    Port       = ?config(port,        Config),
-    SockType   = ?config(sock_type,   Config),
-    Mods       = io_lib:format("~p",  [httpd_mod]),
-    Funcs      = io_lib:format("~p",  [ssl_password_cb]),
-    Host       = ?config(ipv6_host,   Config),
-
-    MaxHdrSz     = io_lib:format("~p", [256]),
-    MaxHdrAct    = io_lib:format("~p", [close]),
-  
-    Mod_order = "Modules mod_alias mod_auth mod_esi mod_actions mod_cgi" 
-	" mod_include mod_dir mod_get mod_head" 
-	" mod_log mod_disk_log mod_trace",
-	    
-    SSL =
-	if
-	    (SockType =:= ssl)  orelse 
-	    (SockType =:= essl) ->
-		[cline(["SSLCertificateFile ", 
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCertificateKeyFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLCACertificateFile ",
-			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
-		 cline(["SSLPasswordCallbackModule ", Mods]),
-		 cline(["SSLPasswordCallbackFunction ", Funcs]),
-		 cline(["SSLVerifyClient 0"]),
-		 cline(["SSLVerifyDepth 1"])];
-	    true ->
-		[]
-	end,
-
-    BindAddress = "[" ++ Ipv6Address ++"]|inet6", 
-
-    HttpConfig = 
-	[cline(["BindAddress ", BindAddress]),
-	 cline(["Port ", integer_to_list(Port)]),
-	 cline(["ServerName ", Host]),
-	 cline(["SocketType ", atom_to_list(SockType)]),
-	 cline([Mod_order]),
-	 cline(["ServerRoot ", ServerRoot]),
-	 cline(["DocumentRoot ", filename:join(ServerRoot, "htdocs")]),
-	 cline(["MaxHeaderSize ",MaxHdrSz]),
-	 cline(["MaxHeaderAction ",MaxHdrAct]),
-	 cline(["DirectoryIndex ", "index.html "]),
-	 cline(["DefaultType ", "text/plain"]), 
-	 SSL],
-    ConfigFile = filename:join([TcTopDir,FileName]),
-    {ok, Fd} = file:open(ConfigFile, [write]),
-    ok = file:write(Fd, lists:flatten(HttpConfig)),
-    ok = file:close(Fd).
-
-
-tsp(F) ->
-    inets_test_lib:tsp("[~w]" ++ F, [?MODULE]).
-tsp(F, A) ->
-    inets_test_lib:tsp("[~w]" ++ F, [?MODULE|A]).
-
-tsf(Reason) ->
-    inets_test_lib:tsf(Reason).
+init_blocker(From, Config) ->
+    From ! blocker_start,
+    block(Config).
 
+block(Config) ->
+    Version = ?config(http_version, Config),
+    Host = ?config(host, Config),
+    httpd_test_lib:verify_request(?config(type, Config), Host, 
+				  ?config(port, Config),  ?config(node, Config),
+				  http_request("GET /eval?httpd_example:delay(1000) ", 
+					       Version, Host),
+				  [{statuscode, 200},
+				   {version, Version}]).
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/ssl/ssl_client.pem b/lib/inets/test/httpd_SUITE_data/server_root/ssl/ssl_client.pem
deleted file mode 100644
index 8221139eb4..0000000000
--- a/lib/inets/test/httpd_SUITE_data/server_root/ssl/ssl_client.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAL6Ym/bgUvhhnPkw08sggGg8Tnp759ThGMEjkmDzhuJ3w3PfnF65
-mgHcgunku4G6LxAQfEUougJWf9Phmjj3oRUCAwEAAQJBAKMjvVvzZxFzfAlP4flc
-OI0AEayFokp04dtvtzuFN09f+aBo2dP18xHmKLCZvxrBOaRAROoQYscALiIVpN07
-GAECIQDfi+sSfAFaDlT3vzpL3xE5UEH6IzY8jWpaZfM1QaToJQIhANpEF50H4wGO
-8Sbh7dUutNd+s+NYUjsMySW2DjLKMsoxAiEAzzb2ftrdsempD0F+O0gZwiPIFKLB
-Kp33YLYyHEKuJtUCIDGi+pvDh2R7VWw6RRQOIyI+tjolg83aAoSI+oGiahqBAiEA
-xzmNNajwoaokvWvlaz0na8rhxu45grOvDrflBT9XvSQ=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICDDCCAbYCAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAlNFMRIwEAYD
-VQQIEwlTdG9ja2hvbG0xDzANBgNVBAcTBkFsdnNqbzEMMAoGA1UEChMDRVRYMQ4w
-DAYDVQQLEwVETi9TUDEXMBUGA1UEAxMOSm9ha2ltIEdyZWJlbm8xJTAjBgkqhkiG
-9w0BCQEWFmpvY2tlQGVyaXguZXJpY3Nzb24uc2UwHhcNOTcwNzE1MTUzNDM2WhcN
-MDMwMjIyMTUzNDM2WjCBkDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9s
-bTEPMA0GA1UEBxMGQWx2c2pvMQwwCgYDVQQKEwNFVFgxDjAMBgNVBAsTBUROL1NQ
-MRcwFQYDVQQDEw5Kb2FraW0gR3JlYmVubzElMCMGCSqGSIb3DQEJARYWam9ja2VA
-ZXJpeC5lcmljc3Nvbi5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC+mJv24FL4
-YZz5MNPLIIBoPE56e+fU4RjBI5Jg84bid8Nz35xeuZoB3ILp5LuBui8QEHxFKLoC
-Vn/T4Zo496EVAgMBAAEwDQYJKoZIhvcNAQEEBQADQQBYxQVfTydyZCE0UXvZd7Ei
-josNsAaWJk9fFIJaG9uyXCEfg2dVgoT2eBk3D9DI+7OB+78isM5CVlFbL7hilvP8
------END CERTIFICATE-----
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/ssl/ssl_server.pem b/lib/inets/test/httpd_SUITE_data/server_root/ssl/ssl_server.pem
deleted file mode 100644
index fe739c15f7..0000000000
--- a/lib/inets/test/httpd_SUITE_data/server_root/ssl/ssl_server.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAL9Bozj3BIjL5Cy8b3rjMT2kPZRychX4wz9bHoIIiKnKo1xXHYjw
-g3N9zWM1f1ZzMADwVry1uAInA8q09+7hL20CAwEAAQJACwu2ao7RozjrV64WXimK
-6X131P/7GMvCMwGHNIlbozqoOqmZcYrbKaF61l+XuwA2QvTo3ywW1Ivxcyr6TeAr
-PQIhAOX+WXT6yiqqwjt08kjBCJyMgfZtdAO6pc/6pKjNWiZfAiEA1OH1iPW/OQe5
-tlQXpiRVdLyneNsPygPRJc4Bdwu3hbMCIQDbI5pA56QxOzqOREOGJsb5wrciAfAE
-jZbnr72sSN2YqQIgAWFpvzagw9Tp/mWzNY+cwkIK7/yzsIKv04fveH8p9IMCIQCr
-td4IiukeUwXmPSvYM4uCE/+J89wEL9qU8Mlc3gDLXA==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICDDCCAbYCAQAwDQYJKoZIhvcNAQEEBQAwgZAxCzAJBgNVBAYTAlNFMRIwEAYD
-VQQIEwlTdG9ja2hvbG0xDzANBgNVBAcTBkFsdnNqbzEMMAoGA1UEChMDRVRYMQ4w
-DAYDVQQLEwVETi9TUDEXMBUGA1UEAxMOSm9ha2ltIEdyZWJlbm8xJTAjBgkqhkiG
-9w0BCQEWFmpvY2tlQGVyaXguZXJpY3Nzb24uc2UwHhcNOTcwNzE1MTUzMzQxWhcN
-MDMwMjIyMTUzMzQxWjCBkDELMAkGA1UEBhMCU0UxEjAQBgNVBAgTCVN0b2NraG9s
-bTEPMA0GA1UEBxMGQWx2c2pvMQwwCgYDVQQKEwNFVFgxDjAMBgNVBAsTBUROL1NQ
-MRcwFQYDVQQDEw5Kb2FraW0gR3JlYmVubzElMCMGCSqGSIb3DQEJARYWam9ja2VA
-ZXJpeC5lcmljc3Nvbi5zZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC/QaM49wSI
-y+QsvG964zE9pD2UcnIV+MM/Wx6CCIipyqNcVx2I8INzfc1jNX9WczAA8Fa8tbgC
-JwPKtPfu4S9tAgMBAAEwDQYJKoZIhvcNAQEEBQADQQAmXDY1CyJjzvQZX442kkHG
-ic9QFY1UuVfzokzNMwlHYl1Qx9zaodx0cJCrcH5GF9O9LJbhhV77LzoxT1Q5wZp5
------END CERTIFICATE-----
diff --git a/lib/inets/test/httpd_all.erl b/lib/inets/test/httpd_all.erl
new file mode 100644
index 0000000000..9be02e3fd8
--- /dev/null
+++ b/lib/inets/test/httpd_all.erl
@@ -0,0 +1,240 @@
+alias(Version, Type, Port, Host, Node) ->
+    Opts = [], 
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
+ 				       "GET /pics/icon.sheet.gif "
+ 				       ++ Version ++ "\r\n\r\n",
+ 				       [{statuscode, 200},
+ 					{header, "Content-Type","image/gif"},
+ 					{header, "Server"},
+ 					{header, "Date"},
+ 				        {version, Version}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
+ 				       "GET / " ++  Version ++ "\r\n\r\n",
+ 				       [{statuscode, 200},
+ 					{header, "Content-Type","text/html"},
+ 					{header, "Server"},
+ 					{header, "Date"},
+ 				        {version, Version}]),
+
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
+ 				       "GET /misc/ " ++ Version ++ "\r\n\r\n",
+ 				       [{statuscode, 200},
+ 					{header, "Content-Type","text/html"},
+ 					{header, "Server"},
+ 					{header, "Date"},
+ 				        {version, Version}]),
+
+    %% Check redirection if trailing slash is missing.
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Opts, Node, 
+ 				       "GET /misc "++ Version ++ "\r\n\r\n",
+ 				       [{statuscode, 301},
+ 					{header, "Location"},
+ 					{header, "Content-Type","text/html"},
+				        {version, Version}]).
+
+
+head(Version, Type, Port, Host, Node) ->
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "HEAD /index.html " ++ Version ++ "\r\n\r\n",
+				       [{statuscode, 200},
+					{version, Version}]).
+
+
+get(Version, Type, Port, Host, Node) ->
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /index.html " ++ Version ++ "\r\n\r\n",
+				       [{statuscode, 200},
+					{header, "Content-Type", "text/html"},
+					{header, "Date"},
+					{header, "Server"},
+					{version, Version}]),
+
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /fsize.shtml " ++ Version ++ "\r\nHost:" 
+				       ++ Host ++ "\r\n\r\n", 
+				       [{statuscode, 200},
+					{header, "Content-Type", "text/html"},
+					{header, "Date"},
+					{header, "Server"}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /secret/dummy.html "
+				       ++ Version  ++ "\r\n\r\n", 
+				       [{statuscode, 401},
+					{header, "WWW-Authenticate"},
+					{version, Version}]).
+
+esi(Version, Type, Port, Host, Node) ->
+    %% Check "ErlScriptAlias" and "EvalScriptAlias" directives
+     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+					"GET /eval?httpd_example:print(\"Hi!\") "
+ 				        ++ Version ++ "\r\n\r\n", 
+					[{statuscode, 200},
+					 {version, Version}]),
+     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+ 				       "GET /eval?not_allowed:print(\"Hi!\") "
+					++ Version ++ "\r\n\r\n",
+					[{statuscode, 403},
+					 {version, Version}]),
+     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+ 				       "GET /eval?httpd_example:undef(\"Hi!\") "
+ 				       ++ Version ++ "\r\n\r\n",
+ 				       [{statuscode, 500},
+ 					{version, Version}]),
+     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+					"GET /cgi-bin/erl/httpd_example "
+					++ Version ++ "\r\n\r\n",
+  				       [{statuscode, 400},
+ 					{version, Version}]),
+     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+					"GET /cgi-bin/erl/httpd_example:get "
+					++ Version  ++ "\r\n\r\n", 
+					[{statuscode, 200},
+					 {version, Version}]),
+     ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+ 				       "GET /cgi-bin/erl/httpd_example:"
+ 				       "get?input=4711"
+ 				       " HTTP/1.0\r\n\r\n", 
+ 				       [{statuscode, 200},
+ 				       {version, "HTTP/1.0"}]),
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/erl/httpd_example:"
+				       "post " ++ Version ++ "\r\n\r\n",
+				       [{statuscode, 200},
+					{version, Version}]),
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/erl/not_allowed:post "
+				       ++ Version ++ "\r\n\r\n",  
+				       [{statuscode, 403},
+					{version, Version}]),
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/erl/httpd_example:undef "
+				       ++ Version ++ "\r\n\r\n",
+				       [{statuscode, 404},
+					{version, Version}]),
+    ok =  httpd_test_lib:verify_request(Type, Host, Port, Node,
+					"GET /cgi-bin/erl/httpd_example/yahoo "
+					++ Version ++ "\r\n\r\n",
+					[{statuscode, 302},
+					{version, Version}]),
+    %% Check "ErlScriptNoCache" directive (default: false)
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/erl/httpd_example:get "
+				       ++ Version ++ "\r\n\r\n",
+				       [{statuscode, 200},
+					{no_header, "cache-control"},
+					{version, "HTTP/1.0"}]).
+
+cgi(Version, Type, Port, Host, Node) ->
+    {Script, Script2, Script3} =
+	case test_server:os_type() of
+	    {win32, _} ->
+		{"printenv.bat", "printenv.sh", "cgi_echo.exe"};
+	    _ ->
+		{"printenv.sh", "printenv.bat", "cgi_echo"}
+	end,
+    
+    %% The length (> 100) is intentional
+    ok = httpd_test_lib:
+	verify_request(Type, Host, Port, Node, 
+		       "POST /cgi-bin/" ++ Script3 ++
+			   Version ++ " \r\n"
+		       "Content-Length:100 \r\n\r\n "
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"
+		       " \r\n\r\n",
+		       [{statuscode, 200},
+			{version, Version},
+			{header, "content-type", "text/plain"}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET /cgi-bin/"++ Script ++
+					   " " ++ Version ++ "\r\n\r\n", 
+				       [{statuscode, 200},
+					{version, Version}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET /cgi-bin/not_there " ++
+					   Version ++ "\r\n\r\n", 
+				       [{statuscode, 404},{statuscode, 500},
+					{version, Version}]),
+
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET /cgi-bin/"++ Script ++
+					   "?Nisse:kkk?sss/lll " ++ Version ++ "\r\n\r\n", 
+				       [{statuscode, 200}, 
+					{version, Version}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "POST /cgi-bin/"++ Script ++
+				       " HTTP/1.0\r\n\r\n", 
+				       [{statuscode, 200},
+					{version, "HTTP/1.0"}]),
+
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET /htbin/"++ Script ++
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+				       {version, "HTTP/1.0"}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET /htbin/not_there "
+				       "HTTP/1.0\r\n\r\n", 
+				       [{statuscode, 404},{statuscode, 500},
+				        {version, "HTTP/1.0"}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "GET /htbin/"++ Script ++
+				       "?Nisse:kkk?sss/lll HTTP/1.0\r\n\r\n", 
+				       [{statuscode, 200},
+					{version, "HTTP/1.0"}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "POST /htbin/"++ Script ++
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+				       {version, "HTTP/1.0"}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "POST /htbin/"++ Script ++
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+				       {version, "HTTP/1.0"}]),
+    
+    %% Execute an existing, but bad CGI script..
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "POST /htbin/"++ Script2 ++
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 404},
+					{version, "HTTP/1.0"}]),
+    
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       "POST /cgi-bin/"++ Script2 ++
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 404},
+				       {version, "HTTP/1.0"}]),
+
+    %% Check "ScriptNoCache" directive (default: false)
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/" ++ Script ++
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+					{no_header, "cache-control"},
+					{version, "HTTP/1.0"}]).
+
diff --git a/lib/inets/test/httpd_basic_SUITE.erl b/lib/inets/test/httpd_basic_SUITE.erl
index 523cf9d38c..2d06f3e70c 100644
--- a/lib/inets/test/httpd_basic_SUITE.erl
+++ b/lib/inets/test/httpd_basic_SUITE.erl
@@ -19,6 +19,7 @@
 %%
 -module(httpd_basic_SUITE).
 
+-include_lib("kernel/include/file.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include("inets_test_lib.hrl").
 
@@ -33,9 +34,13 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [
      uri_too_long_414, 
-     header_too_long_413, 
+     header_too_long_413,
+     erl_script_nocache_opt,
+     script_nocache,
      escaped_url_in_error_body,
-     slowdose
+     script_timeout,
+     slowdose,
+     keep_alive_timeout
     ].
 
 groups() -> 
@@ -62,6 +67,7 @@ init_per_suite(Config) ->
 	"~n   Config: ~p", [Config]),
     ok = inets:start(),
     PrivDir = ?config(priv_dir, Config),
+    DataDir = ?config(data_dir, Config), 
 
     Dummy = 
 "<HTML>
@@ -74,6 +80,21 @@ DUMMY
 </HTML>",
 
     DummyFile = filename:join([PrivDir,"dummy.html"]),
+    CgiDir =  filename:join(PrivDir, "cgi-bin"),
+    ok = file:make_dir(CgiDir),
+    {CgiPrintEnv, CgiSleep} = case test_server:os_type() of
+				  {win32, _} ->
+				      {"printenv.bat", "cgi_sleep.exe"};
+				  _ ->
+				      {"printenv.sh", "cgi_sleep"}
+			      end,
+    lists:foreach(
+      fun(Cgi) ->
+	      inets_test_lib:copy_file(Cgi, DataDir, CgiDir),
+	      AbsCgi = filename:join([CgiDir, Cgi]),
+	      {ok, FileInfo} = file:read_file_info(AbsCgi),
+	      ok = file:write_file_info(AbsCgi, FileInfo#file_info{mode = 8#00755})
+      end, [CgiPrintEnv, CgiSleep]),
     {ok, Fd}  = file:open(DummyFile, [write]),
     ok        = file:write(Fd, Dummy),
     ok        = file:close(Fd), 
@@ -84,7 +105,8 @@ DUMMY
 		 {document_root, PrivDir}, 
 		 {bind_address,  "localhost"}],
 
-    [{httpd_conf, HttpdConf} |  Config].
+    [{httpd_conf, HttpdConf}, {cgi_dir, CgiDir},
+     {cgi_printenv, CgiPrintEnv}, {cgi_sleep, CgiSleep} |  Config].
 
 %%--------------------------------------------------------------------
 %% Function: end_per_suite(Config) -> _
@@ -178,6 +200,74 @@ header_too_long_413(Config) when is_list(Config) ->
  				        {version, "HTTP/1.1"}]),
     inets:stop(httpd, Pid).
    
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
+erl_script_nocache_opt(doc) ->
+    ["Test that too long headers's get 413 HTTP code"];
+erl_script_nocache_opt(suite) ->
+    [];
+erl_script_nocache_opt(Config) when is_list(Config) ->
+    HttpdConf   = ?config(httpd_conf, Config),
+    {ok, Pid}   = inets:start(httpd, [{port, 0}, {erl_script_nocache, true} | HttpdConf]),
+    Info        = httpd:info(Pid),
+    Port        = proplists:get_value(port,         Info),
+    _Address    = proplists:get_value(bind_address, Info),
+    URL1        = ?URL_START ++ integer_to_list(Port),
+    case httpc:request(get, {URL1 ++ "/dummy.html", []},
+		       [{url_encode,  false}, 
+			{version,     "HTTP/1.0"}],
+		       [{full_result, false}]) of
+	{ok, {200, _}} ->
+	    ok
+    end,
+    inets:stop(httpd, Pid).
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
+script_nocache(doc) ->
+    ["Test nocache option for mod_cgi and mod_esi"];
+script_nocache(suite) ->
+    [];
+script_nocache(Config) when is_list(Config) ->
+    Normal = {no_header, "cache-control"},
+    NoCache = {header, "cache-control", "no-cache"},
+    verify_script_nocache(Config, false, false, Normal, Normal),
+    verify_script_nocache(Config, true, false, NoCache, Normal),
+    verify_script_nocache(Config, false, true, Normal, NoCache),
+    verify_script_nocache(Config, true, true, NoCache, NoCache),
+    ok.
+
+verify_script_nocache(Config, CgiNoCache, EsiNoCache, CgiOption, EsiOption) ->
+    HttpdConf = ?config(httpd_conf, Config),
+    CgiScript = ?config(cgi_printenv, Config),
+    CgiDir = ?config(cgi_dir, Config),
+    {ok, Pid} = inets:start(httpd, [{port, 0},
+				    {script_alias,
+				     {"/cgi-bin/", CgiDir ++ "/"}},
+				    {script_nocache, CgiNoCache},
+				    {erl_script_alias,
+				     {"/cgi-bin/erl", [httpd_example,io]}},
+				    {erl_script_nocache, EsiNoCache}
+				    | HttpdConf]),
+    Info = httpd:info(Pid),
+    Port = proplists:get_value(port, Info),
+    Address = proplists:get_value(bind_address, Info),
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(),
+				       "GET /cgi-bin/" ++ CgiScript ++
+					   " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+					CgiOption,
+					{version, "HTTP/1.0"}]),
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(),
+				       "GET /cgi-bin/erl/httpd_example:get "
+				       "HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+					EsiOption,
+					{version, "HTTP/1.0"}]),
+    inets:stop(httpd, Pid).
+
 
 %%-------------------------------------------------------------------------
 %%-------------------------------------------------------------------------
@@ -279,6 +369,63 @@ escaped_url_in_error_body(Config) when is_list(Config) ->
     inets:stop(httpd, Pid),
     tsp("escaped_url_in_error_body -> done"),    
     ok.
+
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
+keep_alive_timeout(doc) ->
+    ["Test the keep_alive_timeout option"];
+keep_alive_timeout(suite) ->
+    [];
+keep_alive_timeout(Config) when is_list(Config) ->
+    HttpdConf   = ?config(httpd_conf, Config),
+    {ok, Pid}   = inets:start(httpd, [{port, 0}, {keep_alive, true}, {keep_alive_timeout, 2} | HttpdConf]),
+    Info        = httpd:info(Pid),
+    Port        = proplists:get_value(port,         Info),
+    _Address    = proplists:get_value(bind_address, Info),
+    {ok, S} = gen_tcp:connect("localhost", Port, []),
+    receive
+    after 3000 ->
+	    {error, closed} = gen_tcp:send(S, "hey")
+    end,
+    inets:stop(httpd, Pid).
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
+script_timeout(doc) ->
+    ["Test the httpd script_timeout option"];
+script_timeout(suite) ->
+    [];
+script_timeout(Config) when is_list(Config) ->
+    verify_script_timeout(Config, 20, 200),
+    verify_script_timeout(Config, 5, 403),
+    ok.
+
+verify_script_timeout(Config, ScriptTimeout, StatusCode) ->
+    HttpdConf = ?config(httpd_conf, Config),
+    CgiScript = ?config(cgi_sleep, Config),
+    CgiDir = ?config(cgi_dir, Config),
+    {ok, Pid} = inets:start(httpd, [{port, 0},
+				    {script_alias,
+				     {"/cgi-bin/", CgiDir ++ "/"}},
+				    {script_timeout, ScriptTimeout}
+				    | HttpdConf]),
+    Info = httpd:info(Pid),
+    Port = proplists:get_value(port, Info),
+    Address = proplists:get_value(bind_address, Info),
+    ok = httpd_test_lib:verify_request(ip_comm, Address, Port, node(),
+				       "GET /cgi-bin/" ++ CgiScript ++
+					   " HTTP/1.0\r\n\r\n",
+				       [{statuscode, StatusCode},
+					{version, "HTTP/1.0"}]),
+    inets:stop(httpd, Pid).
+
+
+%%-------------------------------------------------------------------------
+%%-------------------------------------------------------------------------
+
 slowdose(doc) ->
     ["Testing minimum bytes per second option"];
 slowdose(Config) when is_list(Config) ->
diff --git a/lib/inets/test/httpd_basic_SUITE_data/Makefile.src b/lib/inets/test/httpd_basic_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..9da2ed583f
--- /dev/null
+++ b/lib/inets/test/httpd_basic_SUITE_data/Makefile.src
@@ -0,0 +1,14 @@
+CC = @CC@
+LD = @LD@
+CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
+CROSSLDFLAGS = @CROSSLDFLAGS@
+
+PROGS = cgi_sleep@exe@
+
+all: $(PROGS)
+
+cgi_sleep@exe@: cgi_sleep@obj@
+	$(LD) $(CROSSLDFLAGS) -o cgi_sleep cgi_sleep@obj@ @LIBS@
+
+cgi_sleep@obj@: cgi_sleep.c
+	$(CC) -c -o cgi_sleep@obj@ $(CFLAGS) cgi_sleep.c
diff --git a/lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c b/lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c
new file mode 100644
index 0000000000..126bb23987
--- /dev/null
+++ b/lib/inets/test/httpd_basic_SUITE_data/cgi_sleep.c
@@ -0,0 +1,26 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#ifdef __WIN32__
+#include <windows.h>
+#include <fcntl.h>
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+int main(void)
+{
+    unsigned int seconds = 10;
+
+#ifdef __WIN32__
+    Sleep(seconds * 1000);
+    _setmode(_fileno(stdout), _O_BINARY);
+#else
+    sleep(seconds);
+#endif
+
+    printf("Content-type: text/plain\r\n\r\n");
+    printf("Slept for %u seconds.\r\n", seconds);
+    exit(EXIT_SUCCESS);
+}
diff --git a/lib/inets/test/httpd_basic_SUITE_data/printenv.bat b/lib/inets/test/httpd_basic_SUITE_data/printenv.bat
new file mode 120000
index 0000000000..1bc8e52059
--- /dev/null
+++ b/lib/inets/test/httpd_basic_SUITE_data/printenv.bat
@@ -0,0 +1 @@
+../httpd_SUITE_data/server_root/cgi-bin/printenv.bat
\ No newline at end of file
diff --git a/lib/inets/test/httpd_basic_SUITE_data/printenv.sh b/lib/inets/test/httpd_basic_SUITE_data/printenv.sh
new file mode 120000
index 0000000000..0136a3fa23
--- /dev/null
+++ b/lib/inets/test/httpd_basic_SUITE_data/printenv.sh
@@ -0,0 +1 @@
+../httpd_SUITE_data/server_root/cgi-bin/printenv.sh
\ No newline at end of file
diff --git a/lib/inets/test/httpd_block.erl b/lib/inets/test/httpd_block.erl
index ac1bf43ff5..706d014bda 100644
--- a/lib/inets/test/httpd_block.erl
+++ b/lib/inets/test/httpd_block.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2014. All Rights Reserved.
 %%
 %% The 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,8 +19,7 @@
 %%
 -module(httpd_block).
 
--include("test_server.hrl").
--include("test_server_line.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %% General testcases bodies called from httpd_SUITE
 -export([block_disturbing_idle/4, block_non_disturbing_idle/4,
@@ -88,7 +87,7 @@ block_503(Type, Port, Host, Node) ->
 block_disturbing_active(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
     Pid = long_poll(Type, Host, Port, Node, 200, 60000),
-    test_server:sleep(15000),
+    ct:sleep(15000),
     block_server(Node, Host, Port),
     await_suite_failed_process_exit(Pid, "poller", 60000,
 				    connection_closed),
@@ -100,7 +99,7 @@ block_disturbing_active(Type, Port, Host, Node) ->
 block_non_disturbing_active(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
     Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    test_server:sleep(15000),
+    ct:sleep(15000),
     ok = block_nd_server(Node, Host, Port),
     await_normal_process_exit(Poller, "poller", 60000),
     blocked = get_admin_state(Node, Host, Port),
@@ -111,7 +110,7 @@ block_non_disturbing_active(Type, Port, Host, Node) ->
 block_disturbing_active_timeout_not_released(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
     Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    test_server:sleep(15000),
+    ct:sleep(15000),
     Blocker = blocker(Node, Host, Port, 50000),
     await_normal_process_exit(Blocker, "blocker", 50000),
     await_normal_process_exit(Poller, "poller", 30000),
@@ -123,7 +122,7 @@ block_disturbing_active_timeout_not_released(Type, Port, Host, Node) ->
 block_disturbing_active_timeout_released(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
     Poller = long_poll(Type, Host, Port, Node, 200, 40000),
-    test_server:sleep(5000),
+    ct:sleep(5000),
     Blocker = blocker(Node, Host, Port, 10000),
     await_normal_process_exit(Blocker, "blocker", 15000),
     await_suite_failed_process_exit(Poller, "poller", 40000, 
@@ -146,7 +145,7 @@ block_non_disturbing_active_timeout_not_released(Type, Port, Host, Node) ->
 block_non_disturbing_active_timeout_released(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
     Poller = long_poll(Type, Host, Port, Node, 200, 45000),
-    test_server:sleep(5000),
+    ct:sleep(5000),
     Blocker = blocker_nd(Node, Host, Port ,10000, {error,timeout}),
     await_normal_process_exit(Blocker, "blocker", 15000),
     await_normal_process_exit(Poller, "poller", 50000),
@@ -157,9 +156,9 @@ block_non_disturbing_active_timeout_released(Type, Port, Host, Node) ->
 disturbing_blocker_dies(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
     Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    test_server:sleep(5000),
+    ct:sleep(5000),
     Blocker = blocker(Node, Host, Port, 10000),
-    test_server:sleep(5000),
+    ct:sleep(5000),
     exit(Blocker,simulate_blocker_crash),
     await_normal_process_exit(Poller, "poller", 60000),
     unblocked = get_admin_state(Node, Host, Port),
@@ -170,9 +169,9 @@ disturbing_blocker_dies(Type, Port, Host, Node) ->
 non_disturbing_blocker_dies(Type, Port, Host, Node) ->
     process_flag(trap_exit, true),
     Poller = long_poll(Type, Host, Port, Node, 200, 60000),
-    test_server:sleep(5000),  
+    ct:sleep(5000),  
     Blocker = blocker_nd(Node, Host, Port, 10000, ok),
-    test_server:sleep(5000),
+    ct:sleep(5000),
     exit(Blocker, simulate_blocker_crash),
     await_normal_process_exit(Poller, "poller", 60000),
     unblocked = get_admin_state(Node, Host, Port),
@@ -297,9 +296,12 @@ httpd_restart(Addr, Port) ->
 make_name(Addr, Port) ->
     httpd_util:make_name("httpd", Addr, Port).
 
-get_admin_state(Node, _Host, Port) ->
-    Addr = undefined, 
-    rpc:call(Node, httpd, get_admin_state, [Addr, Port]).
+get_admin_state(_, _Host, Port) ->
+    Name = make_name(undefined, Port),
+    {status, _, _, StatusInfo} = sys:get_status(whereis(Name)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = state(Prop),
+    element(6, State).
 
 validate_admin_state(Node, Host, Port, Expect) ->
     io:format("try validating server admin state: ~p~n", [Expect]),
@@ -323,15 +325,15 @@ await_normal_process_exit(Pid, Name, Timeout) ->
 		  io_lib:format("expected normal exit, "
 				"unexpected exit of ~s process: ~p",
 				[Name, Reason])),
-	    test_server:fail(Err)
+	    ct:fail(Err)
     after Timeout ->
-	   test_server:fail("timeout while waiting for " ++ Name)
+	    ct:fail("timeout while waiting for " ++ Name)
     end.
 
 
 await_suite_failed_process_exit(Pid, Name, Timeout, Why) ->
     receive 
-	{'EXIT', Pid, {suite_failed, Why}} ->
+	{'EXIT', Pid, {test_failed, Why}} ->
 	    ok;
 	{'EXIT', Pid, Reason} ->
 	    Err = 
@@ -339,9 +341,9 @@ await_suite_failed_process_exit(Pid, Name, Timeout, Why) ->
 		  io_lib:format("expected connection_closed, "
 				"unexpected exit of ~s process: ~p",
 				[Name, Reason])),
-	    test_server:fail(Err)
+	    ct:fail(Err)
     after Timeout ->
-	    test_server:fail("timeout while waiting for " ++ Name)
+	    ct:fail("timeout while waiting for " ++ Name)
     end.
 	  
 long_poll(Type, Host, Port, Node, StatusCode, Timeout) ->
@@ -359,10 +361,13 @@ do_long_poll(Type, Host, Port, Node, StatusCode, Timeout) ->
 	ok ->
 	    exit(normal);
 	Reason ->
-	    test_server:fail(Reason)
+	    exit({test_failed, Reason})
     end.
 
 
-
-
-
+state([{data,[{"State", State}]} | _]) ->
+    State;
+state([{data,[{"StateData", State}]} | _]) ->
+    State;
+state([_ | Rest]) ->
+    state(Rest).
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl
index df4ed6b179..7d3326fb65 100644
--- a/lib/inets/test/httpd_mod.erl
+++ b/lib/inets/test/httpd_mod.erl
@@ -842,6 +842,14 @@ cgi(Type, Port, Host, Node) ->
 				       {version, "HTTP/1.0"}]),
 
 %%     tsp("cgi -> done"),
+
+    %% Check "ScriptNoCache" directive (default: false)
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/" ++ Script ++
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+					{no_header, "cache-control"},
+					{version, "HTTP/1.0"}]),
     ok.
 
 
@@ -899,6 +907,13 @@ esi(Type, Port, Host, Node) ->
 					" HTTP/1.0\r\n\r\n",
 					[{statuscode, 302},
 					{version, "HTTP/1.0"}]),
+    %% Check "ErlScriptNoCache" directive (default: false)
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node,
+				       "GET /cgi-bin/erl/httpd_example:get"
+				       " HTTP/1.0\r\n\r\n",
+				       [{statuscode, 200},
+					{no_header, "cache-control"},
+					{version, "HTTP/1.0"}]),
     ok.
 
 
diff --git a/lib/inets/test/httpd_mod_SUITE.erl b/lib/inets/test/httpd_mod_SUITE.erl
new file mode 100644
index 0000000000..d23cd22670
--- /dev/null
+++ b/lib/inets/test/httpd_mod_SUITE.erl
@@ -0,0 +1,76 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%% 
+%% The 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:run("../inets_test", httpd_mod_SUITE).
+-module(httpd_mod_SUITE).
+
+-include_lib("kernel/include/file.hrl").
+-include_lib("common_test/include/ct.hrl").
+-include("inets_test_lib.hrl").
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+suite() ->
+    [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     {group, http},
+     {group, https}
+    ].
+
+groups() ->
+    [
+     {http, [], all_version_groups()},
+     {https, [], all_version_groups()}
+     {http_1_1, [], []},
+     {http_1_0, [], []},
+     {http_0_9, [], []},
+     {mod_alias, [], []},
+     {mod_actions, [], []},
+     {mod_security, [], []},
+     {mod_auth, [], []},
+     {mod_htaccess, [], []},
+     {mod_cgi, [], []},
+     {mod_esi, [], []},
+     {mod_head, [], []},
+     {configure, [], []}
+    ].
+
+all_version_groups ()->
+    [
+     {group, mod_alias},
+     {group, mod_actions},
+     {group, mod_security},
+     {group, mod_auth},
+     {group, mod_htaccess},
+     {group, mod_cgi},
+     {group, mod_esi},
+     {group, mod_head}
+    ].
+
+%%-------------------------------------------------------------------------
+%% Test cases starts here.
+%%-------------------------------------------------------------------------
diff --git a/lib/inets/test/httpd_test_lib.erl b/lib/inets/test/httpd_test_lib.erl
index 13584c50f6..6406eeae79 100644
--- a/lib/inets/test/httpd_test_lib.erl
+++ b/lib/inets/test/httpd_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -187,12 +187,12 @@ request(#state{mfa = {Module, Function, Args},
 	{tcp_closed, Socket} ->
 	    io:format("~p ~w[~w]request -> received (tcp) closed"
 		      "~n", [self(), ?MODULE, ?LINE]),
-	    test_server:fail(connection_closed);
+	    exit({test_failed, connection_closed});
 	{tcp_error, Socket, Reason} ->
 	    io:format("~p ~w[~w]request -> received (tcp) error"
 		      "~n   Reason: ~p"
 		      "~n", [self(), ?MODULE, ?LINE, Reason]),
-	    test_server:fail({tcp_error, Reason});    
+	    ct:fail({tcp_error, Reason});    
 	{ssl, Socket, Data} ->
 	    print(ssl, Data, State),
 	    case Module:Function([Data | Args]) of
@@ -207,13 +207,13 @@ request(#state{mfa = {Module, Function, Args},
 	    print(ssl, "closed", State),
 	    State#state{body = hd(Args)};
 	{ssl_closed, Socket} ->
-	    test_server:fail(connection_closed);
+	    exit({test_failed, connection_closed});
 	{ssl_error, Socket, Reason} ->
-	    test_server:fail({ssl_error, Reason})
+	    ct:fail({ssl_error, Reason})
     after TimeOut ->
 	    io:format("~p ~w[~w]request -> timeout"
 		      "~n", [self(), ?MODULE, ?LINE]),
-	    test_server:fail(connection_timed_out)    
+	    ct:fail(connection_timed_out)    
     end.
 
 handle_http_msg({Version, StatusCode, ReasonPharse, Headers, Body}, 
@@ -277,7 +277,7 @@ handle_http_body(Body, State = #state{headers = Headers,
 			     request(State#state{mfa = MFA}, 5000) 
 		     end;
 		 false ->
-		     test_server:fail(body_too_big)
+		     ct:fail(body_too_big)
 	     end
      end.
 
@@ -361,7 +361,7 @@ do_validate(Header, [{header, HeaderField, Value}|Rest],N,P) ->
 	    tsf({wrong_header_field_value, LowerHeaderField, Header})
     end,
     do_validate(Header, Rest, N, P);
-do_validate(Header,[{no_last_modified, HeaderField}|Rest],N,P) ->
+do_validate(Header,[{no_header, HeaderField}|Rest],N,P) ->
     case lists:keysearch(HeaderField,1,Header) of
 	{value,_} ->
 	    tsf({wrong_header_field_value, HeaderField, Header});
@@ -405,7 +405,7 @@ check_body(_, _, _, _,_) ->
     ok.
 
 print(Proto, Data, #state{print = true}) ->
-    test_server:format("Received ~p: ~p~n", [Proto, Data]);
+    ct:pal("Received ~p: ~p~n", [Proto, Data]);
 print(_, _,  #state{print = false}) ->
     ok.
 
diff --git a/lib/inets/test/inets_appup_test.erl b/lib/inets/test/inets_appup_test.erl
index d563b52ae7..a8051c6c85 100644
--- a/lib/inets/test/inets_appup_test.erl
+++ b/lib/inets/test/inets_appup_test.erl
@@ -23,13 +23,7 @@
 -module(inets_appup_test).
 
 -compile(export_all).
--compile({no_auto_import,[error/1]}).
-
--include("inets_test_lib.hrl").
-
-
-						% t()     -> megaco_test_lib:t(?MODULE).
-						% t(Case) -> megaco_test_lib:t({?MODULE, Case}).
+-include_lib("common_test/include/ct.hrl").
 
 
 %% Test server callbacks
@@ -59,16 +53,9 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(suite) -> [];
 init_per_suite(doc) -> [];
 init_per_suite(Config) when is_list(Config) ->
-    AppFile   = file_name(inets, ".app"),
-    AppupFile = file_name(inets, ".appup"),
-    [{app_file, AppFile}, {appup_file, AppupFile}|Config].
+    Config.
     
 
-file_name(App, Ext) ->
-    LibDir = code:lib_dir(App),
-    filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
-
-
 end_per_suite(suite) -> [];
 end_per_suite(doc) -> [];
 end_per_suite(Config) when is_list(Config) ->
@@ -77,282 +64,7 @@ end_per_suite(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup(suite) ->
-    [];
-appup(doc) ->
-    "perform a simple check of the appup file";
+appup() ->
+    [{doc, "Perform a simple check of the inets appup file"}].
 appup(Config) when is_list(Config) ->
-    AppupFile = key1search(appup_file, Config),
-    AppFile   = key1search(app_file, Config),
-    Modules   = modules(AppFile),
-    check_appup(AppupFile, Modules).
-
-modules(File) ->
-    case file:consult(File) of
-        {ok, [{application,inets,Info}]} ->
-            case lists:keysearch(modules,1,Info) of
-                {value, {modules, Modules}} ->
-                    Modules;
-                false ->
-                    fail({bad_appinfo, Info})
-            end;
-        Error ->
-            fail({bad_appfile, Error})
-    end.
-
-    
-check_appup(AppupFile, Modules) ->
-    case file:consult(AppupFile) of
-	{ok, [{V, UpFrom, DownTo}]} ->
-% 	    io:format("~p => "
-% 		      "~n  ~p"
-% 		      "~n  ~p"
-% 		      "~n", [V, UpFrom, DownTo]),
-	    check_appup(V, UpFrom, DownTo, Modules);
-	Else ->
-	    fail({bad_appupfile, Else})
-    end.
-
-
-check_appup(V, UpFrom, DownTo, Modules) ->
-    check_version(V),
-    check_depends(up,   UpFrom, Modules),
-    check_depends(down, DownTo, Modules),
-    ok.
-
-
-check_depends(_, [], _) ->
-    ok;
-check_depends(UpDown, [Dep|Deps], Modules) ->
-    check_depend(UpDown, Dep, Modules),
-    check_depends(UpDown, Deps, Modules).
-
-
-check_depend(UpDown, {V, Instructions}, Modules) ->
-    check_version(V),
-    case check_instructions(UpDown, 
-			    Instructions, Instructions, [], [], Modules) of
-	{_Good, []} ->
-	    ok;
-	{_, Bad} ->
-	    fail({bad_instructions, Bad, UpDown})
-    end.
-
-
-check_instructions(_, [], _, Good, Bad, _) ->
-    {lists:reverse(Good), lists:reverse(Bad)};
-check_instructions(UpDown, [Instr|Instrs], AllInstr, Good, Bad, Modules) ->
-    case (catch check_instruction(UpDown, Instr, AllInstr, Modules)) of
-        ok ->
-            check_instructions(UpDown, Instrs, AllInstr, 
-			       [Instr|Good], Bad, Modules);
-        {error, Reason} ->
-            check_instructions(UpDown, Instrs, AllInstr, Good, 
-                               [{Instr, Reason}|Bad], Modules)
-    end;
-check_instructions(UpDown, Instructions, _, _, _, _) ->
-    fail({bad_instructions, {UpDown, Instructions}}).
-
-%% A new module is added
-check_instruction(up, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    check_module(Module, Modules);
-
-%% An old module is re-added
-check_instruction(down, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    ok;
-	ok ->
-	    error({existing_readded_module, Module})
-    end;
-
-%% Removing a module on upgrade: 
-%% - the module has been removed from the app-file.
-%% - check that no module depends on this (removed) module
-check_instruction(up, {remove, {Module, Pre, Post}}, _, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    check_purge(Pre),
-	    check_purge(Post);
-	ok ->
-	    error({existing_removed_module, Module})
-    end;
-
-%% Removing a module on downgrade: the module exist
-%% in the app-file.
-check_instruction(down, {remove, {Module, Pre, Post}}, AllInstr, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
-    case (catch check_module(Module, Modules)) of
-	ok ->
-	    check_purge(Pre),
-	    check_purge(Post),
-	    check_no_remove_depends(Module, AllInstr);
-	{error, {unknown_module, Module, Modules}} ->
-	    error({nonexisting_removed_module, Module})
-    end;
-
-check_instruction(up, {load_module, Module, Pre, Post, Depend}, _, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(down, {load_module, Module, Pre, Post, Depend}, _, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
-    check_module(Module, Modules),
-    % Can not be sure that the the dependent module exists in the new appfile 
-    %%check_module_depend(Module, Depend, Modules),
-    check_purge(Pre),
-    check_purge(Post);
-
-
-
-check_instruction(up, {delete_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    ok;
-	ok ->
-	    error({existing_module_deleted, Module})
-    end;
-
-check_instruction(down, {delete_module, Module}, _, Modules) 
-  when is_atom(Module)  ->
-    check_module(Module, Modules);
-
-
-check_instruction(_, {apply, {Module, Function, Args}}, _, _) when is_atom(Module), is_atom(Function), is_list(Args) ->
-    ok;
-
-check_instruction(_, {update, Module, supervisor}, _, Modules) when is_atom(Module) ->
-    check_module(Module, Modules);
-
-check_instruction(_, {update, Module, {advanced, _}, DepMods}, _, Modules)  when is_atom(Module), is_list(DepMods) ->
-    check_module(Module, Modules),
-    check_module_depend(Module, DepMods, Modules);
-
-check_instruction(_, {update, Module, Change, Pre, Post, Depend}, _, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_change(Change),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {restart_application, inets}, _AllInstr, _Modules) ->
-    ok;
-
-check_instruction(_, {update, Module, {advanced, _}}, _, Modules) ->
-    check_module(Module, Modules);
-
-check_instruction(_, Instr, _AllInstr, _Modules) ->
-    error({error, {unknown_instruction, Instr}}).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-check_version(V) when is_list(V) ->
-    ok;
-check_version(REBin) when is_binary(REBin) ->
-    try
-	begin
-	    RE = binary_to_list(REBin),
-	    case re:compile(RE) of
-		{ok, _} ->
-		    ok;
-		{error, _} ->
-		    error({bad_version, REBin})
-	    end
-	end
-    catch
-	_T:_E ->
-	    error({bad_version, REBin})
-    end;
-check_version(V) ->
-    error({bad_version, V}).
-
-
-check_module(M, Modules) when is_atom(M) ->
-    case lists:member(M,Modules) of
-        true ->
-            ok;
-        false ->
-            error({unknown_module, M, Modules})
-    end;
-check_module(M, _) ->
-    error({bad_module, M}).
-
-
-check_module_depend(M, [], _) when is_atom(M) ->
-    ok;
-check_module_depend(M, Deps, Modules) when is_atom(M), is_list(Deps) ->
-    case [Dep || Dep <- Deps, lists:member(Dep, Modules) == false] of
-        [] ->
-            ok;
-        Unknown ->
-            error({unknown_depend_modules, Unknown})
-    end;
-check_module_depend(_M, D, _Modules) ->
-    error({bad_depend, D}).
-
-
-check_no_remove_depends(_Module, []) ->
-    ok;
-check_no_remove_depends(Module, [Instr|Instrs]) ->
-    check_no_remove_depend(Module, Instr),
-    check_no_remove_depends(Module, Instrs).
-
-check_no_remove_depend(Module, {load_module, Mod, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, load_module, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(Module, {update, Mod, _Change, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, update, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(_, _) ->
-    ok.
-    
-
-check_change(soft) ->
-    ok;
-check_change({advanced, _Something}) ->
-    ok;
-check_change(Change) ->
-    error({bad_change, Change}).
-
-
-check_purge(soft_purge) ->
-    ok;
-check_purge(brutal_purge) ->
-    ok;
-check_purge(Purge) ->
-    error({bad_purge, Purge}).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-error(Reason) ->
-    throw({error, Reason}).
-
-fail(Reason) ->
-    exit({suite_failed, Reason}).
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
-	    fail({not_found, Key, L});
-	{value, {Key, Value}} ->
-	    Value
-    end.
+    ok = ?t:appup_test(inets).
diff --git a/lib/inets/test/inets_sup_SUITE.erl b/lib/inets/test/inets_sup_SUITE.erl
index 0ac940fd3e..12b85a816f 100644
--- a/lib/inets/test/inets_sup_SUITE.erl
+++ b/lib/inets/test/inets_sup_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The 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(inets_sup_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).
@@ -297,13 +297,14 @@ httpd_subtree(Config) when is_list(Config) ->
     %% Check that we have the expected httpd instance children
     io:format("httpd_subtree -> verify httpd instance children "
 	      "(acceptor, misc and manager)~n", []),
+    {ok, _} = verify_child(Instance, httpd_connection_sup, supervisor),
     {ok, _} = verify_child(Instance, httpd_acceptor_sup, supervisor),
     {ok, _} = verify_child(Instance, httpd_misc_sup, supervisor),
     {ok, _} = verify_child(Instance, httpd_manager, worker),
 
     %% Check that the httpd instance acc supervisor has children
     io:format("httpd_subtree -> verify acc~n", []),
-    InstanceAcc = httpd_util:make_name("httpd_acc_sup", Addr, Port),
+    InstanceAcc = httpd_util:make_name("httpd_acceptor_sup", Addr, Port),
     case supervisor:which_children(InstanceAcc) of
 	[_ | _] -> 
 	    ok;
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 6ccc7b0da1..4be9d9c8b3 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -287,7 +287,9 @@ print(F, A, Mod, Line) ->
     print("", F, A, Mod, Line).
 
 hostname() ->
-    from($@, atom_to_list(node())).
+   {ok, Name} = inet:gethostname(),
+    Name.
+
 from(H, [H | T]) -> T;
 from(H, [_ | T]) -> from(H, T);
 from(_, []) -> [].
@@ -545,14 +547,14 @@ tsp(F) ->
     tsp(F, []).
 tsp(F, A) ->
     Timestamp = formated_timestamp(), 
-    test_server:format("*** ~s ~p ~p " ++ F ++ "~n", 
+    ct:pal("*** ~s ~p ~p " ++ F ++ "~n", 
 		       [Timestamp, node(), self() | A]).
 
 tsf(Reason) ->
-    test_server:fail(Reason).
+    ct:fail(Reason).
 
 tss(Time) ->
-    test_server:sleep(Time).
+    ct:sleep(Time).
 
 timestamp() ->
     http_util:timestamp().
diff --git a/lib/inets/test/old_httpd_SUITE.erl b/lib/inets/test/old_httpd_SUITE.erl
new file mode 100644
index 0000000000..de9aa4562e
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE.erl
@@ -0,0 +1,2445 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
+%%
+%% The 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(old_httpd_SUITE).
+
+-include_lib("test_server/include/test_server.hrl").
+-include("test_server_line.hrl").
+-include("inets_test_lib.hrl").
+
+-include_lib("kernel/include/file.hrl").
+
+%% Test server specific exports
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([init_per_testcase/2, end_per_testcase/2,
+	 init_per_suite/1, end_per_suite/1]).
+
+%% Core Server tests
+-export([
+	 ip_mod_alias/1, 
+	 ip_mod_actions/1, 
+	 ip_mod_security/1, 
+	 ip_mod_auth/1,
+	 ip_mod_auth_api/1, 
+	 ip_mod_auth_mnesia_api/1, 
+	 ip_mod_htaccess/1, 
+	 ip_mod_cgi/1, 
+	 ip_mod_esi/1,
+	 ip_mod_get/1, 
+	 ip_mod_head/1, 
+	 ip_mod_all/1, 
+	 ip_load_light/1,
+	 ip_load_medium/1, 
+	 ip_load_heavy/1, 
+	 ip_dos_hostname/1, 
+	 ip_time_test/1, 
+	 ip_block_disturbing_idle/1, 
+	 ip_block_non_disturbing_idle/1, 
+	 ip_block_503/1, 
+	 ip_block_disturbing_active/1, 
+	 ip_block_non_disturbing_active/1, 
+	 ip_block_disturbing_active_timeout_not_released/1, 
+	 ip_block_disturbing_active_timeout_released/1, 
+	 ip_block_non_disturbing_active_timeout_not_released/1, 
+	 ip_block_non_disturbing_active_timeout_released/1, 
+	 ip_block_disturbing_blocker_dies/1, 
+	 ip_block_non_disturbing_blocker_dies/1, 
+	 ip_restart_no_block/1, 
+	 ip_restart_disturbing_block/1, 
+	 ip_restart_non_disturbing_block/1
+	]).
+
+-export([
+	 essl_mod_alias/1, 
+	 essl_mod_actions/1, 
+	 essl_mod_security/1, 
+	 essl_mod_auth/1, 
+	 essl_mod_auth_api/1,  
+	 essl_mod_auth_mnesia_api/1, 
+	 essl_mod_htaccess/1, 
+	 essl_mod_cgi/1,
+	 essl_mod_esi/1, 
+	 essl_mod_get/1, 
+	 essl_mod_head/1, 
+	 essl_mod_all/1, 
+	 essl_load_light/1, 
+	 essl_load_medium/1, 
+	 essl_load_heavy/1, 
+	 essl_dos_hostname/1, 
+	 essl_time_test/1,
+	 essl_restart_no_block/1, 
+	 essl_restart_disturbing_block/1,
+	 essl_restart_non_disturbing_block/1, 
+	 essl_block_disturbing_idle/1, 
+	 essl_block_non_disturbing_idle/1, 
+	 essl_block_503/1, 
+	 essl_block_disturbing_active/1, 
+	 essl_block_non_disturbing_active/1, 
+	 essl_block_disturbing_active_timeout_not_released/1, 
+	 essl_block_disturbing_active_timeout_released/1, 
+	 essl_block_non_disturbing_active_timeout_not_released/1, 
+	 essl_block_non_disturbing_active_timeout_released/1, 
+	 essl_block_disturbing_blocker_dies/1, 
+	 essl_block_non_disturbing_blocker_dies/1
+	]).
+
+%%% HTTP 1.1 tests
+-export([ip_host/1, ip_chunked/1, ip_expect/1, ip_range/1,
+	 ip_if_test/1, ip_http_trace/1, ip_http1_1_head/1, 
+	 ip_mod_cgi_chunked_encoding_test/1]).
+
+%%% HTTP 1.0 tests
+-export([ip_head_1_0/1, ip_get_1_0/1, ip_post_1_0/1]).
+
+%%% HTTP 0.9 tests
+-export([ip_get_0_9/1]).
+
+%%% Ticket tests
+-export([ticket_5775/1,ticket_5865/1,ticket_5913/1,ticket_6003/1,
+	 ticket_7304/1]).
+
+%%% IPv6 tests
+-export([ipv6_hostname_ipcomm/0, ipv6_hostname_ipcomm/1, 
+	 ipv6_address_ipcomm/0,  ipv6_address_ipcomm/1, 
+	 ipv6_hostname_essl/0,   ipv6_hostname_essl/1,   
+	 ipv6_address_essl/0,    ipv6_address_essl/1]).
+
+%% Help functions 
+-export([cleanup_mnesia/0, setup_mnesia/0, setup_mnesia/1]).
+
+-define(IP_PORT, 8898).
+-define(SSL_PORT, 8899).
+-define(MAX_HEADER_SIZE, 256).
+-define(IPV6_LOCAL_HOST, "0:0:0:0:0:0:0:1").
+
+%% Minutes before failed auths timeout.
+-define(FAIL_EXPIRE_TIME,1). 
+
+%% Seconds before successful auths timeout.
+-define(AUTH_TIMEOUT,5).
+
+-record(httpd_user,  {user_name, password, user_data}).
+-record(httpd_group, {group_name, userlist}).
+
+
+%%--------------------------------------------------------------------
+%% all(Arg) -> [Doc] | [Case] | {skip, Comment}
+%% Arg - doc | suite
+%% Doc - string()
+%% Case - atom() 
+%%	Name of a test case function. 
+%% Comment - string()
+%% Description: Returns documentation/test cases in this test suite
+%%		or a skip tuple if the platform is not supported.  
+%%--------------------------------------------------------------------
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [
+     {group, ip}, 
+     {group, ssl}, 
+     {group, http_1_1_ip},
+     {group, http_1_0_ip}, 
+     {group, http_0_9_ip},
+     {group, ipv6}, 
+     {group, tickets}
+    ].
+
+groups() -> 
+    [
+     {ip, [],
+      [ip_mod_alias, ip_mod_actions, ip_mod_security,
+       ip_mod_auth, ip_mod_auth_api, ip_mod_auth_mnesia_api,
+       ip_mod_htaccess, ip_mod_cgi, ip_mod_esi, ip_mod_get,
+       ip_mod_head, ip_mod_all, ip_load_light, ip_load_medium,
+       ip_load_heavy, ip_dos_hostname, ip_time_test,
+       ip_restart_no_block, ip_restart_disturbing_block,
+       ip_restart_non_disturbing_block,
+       ip_block_disturbing_idle, ip_block_non_disturbing_idle,
+       ip_block_503, ip_block_disturbing_active,
+       ip_block_non_disturbing_active,
+       ip_block_disturbing_active_timeout_not_released,
+       ip_block_disturbing_active_timeout_released,
+       ip_block_non_disturbing_active_timeout_not_released,
+       ip_block_non_disturbing_active_timeout_released,
+       ip_block_disturbing_blocker_dies,
+       ip_block_non_disturbing_blocker_dies]},
+     {ssl, [], [{group, essl}]},
+     {essl, [],
+      [essl_mod_alias, essl_mod_actions, essl_mod_security,
+       essl_mod_auth, essl_mod_auth_api,
+       essl_mod_auth_mnesia_api, essl_mod_htaccess,
+       essl_mod_cgi, essl_mod_esi, essl_mod_get, essl_mod_head,
+       essl_mod_all, essl_load_light, essl_load_medium,
+       essl_load_heavy, essl_dos_hostname, essl_time_test,
+       essl_restart_no_block, essl_restart_disturbing_block,
+       essl_restart_non_disturbing_block,
+       essl_block_disturbing_idle,
+       essl_block_non_disturbing_idle, essl_block_503,
+       essl_block_disturbing_active,
+       essl_block_non_disturbing_active,
+       essl_block_disturbing_active_timeout_not_released,
+       essl_block_disturbing_active_timeout_released,
+       essl_block_non_disturbing_active_timeout_not_released,
+       essl_block_non_disturbing_active_timeout_released,
+       essl_block_disturbing_blocker_dies,
+       essl_block_non_disturbing_blocker_dies]},
+     {http_1_1_ip, [],
+      [ip_host, ip_chunked, ip_expect, ip_range, ip_if_test,
+       ip_http_trace, ip_http1_1_head,
+       ip_mod_cgi_chunked_encoding_test]},
+     {http_1_0_ip, [],
+      [ip_head_1_0, ip_get_1_0, ip_post_1_0]},
+     {http_0_9_ip, [], [ip_get_0_9]},
+     {ipv6, [], [ipv6_hostname_ipcomm, ipv6_address_ipcomm, 
+		 ipv6_hostname_essl,   ipv6_address_essl]},
+     {tickets, [],
+      [ticket_5775, ticket_5865, ticket_5913, ticket_6003,
+       ticket_7304]}].
+
+
+init_per_group(ipv6 = _GroupName, Config) ->
+    case inets_test_lib:has_ipv6_support() of
+	{ok, _} ->
+	    Config;
+	_ ->
+	    {skip, "Host does not support IPv6"}
+    end;
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+
+%%--------------------------------------------------------------------
+%% 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.
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    io:format(user, "init_per_suite -> entry with"
+	      "~n   Config: ~p"
+	      "~n", [Config]),
+
+    ?PRINT_SYSTEM_INFO([]),
+
+    PrivDir = ?config(priv_dir, Config),
+    SuiteTopDir = filename:join(PrivDir, ?MODULE),
+    case file:make_dir(SuiteTopDir) of
+        ok ->
+            ok;
+        {error, eexist} ->
+            ok;
+        Error ->
+            throw({error, {failed_creating_suite_top_dir, Error}})
+    end,
+
+    [{has_ipv6_support, inets_test_lib:has_ipv6_support()}, 
+     {suite_top_dir,    SuiteTopDir},
+     {node,             node()},
+     {host,             inets_test_lib:hostname()},
+     {address,          getaddr()} | Config].
+
+
+%%--------------------------------------------------------------------
+%% 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) ->
+    %% SuiteTopDir = ?config(suite_top_dir, Config), 
+    %% inets_test_lib:del_dirs(SuiteTopDir),
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(Case, 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.
+%%--------------------------------------------------------------------
+init_per_testcase(Case, Config) ->
+    NewConfig = init_per_testcase2(Case, Config), 
+    init_per_testcase3(Case, NewConfig).
+
+
+init_per_testcase2(Case, Config) ->
+
+    %% tsp("init_per_testcase2 -> entry with"
+    %% 	"~n   Config: ~p", [Config]),
+    
+    IpNormal    = integer_to_list(?IP_PORT)    ++ ".conf",
+    IpHtaccess  = integer_to_list(?IP_PORT)   ++ "htaccess.conf",
+    SslNormal   = integer_to_list(?SSL_PORT)  ++ ".conf",
+    SslHtaccess = integer_to_list(?SSL_PORT) ++ "htaccess.conf",
+
+    DataDir     = ?config(data_dir, Config),
+    SuiteTopDir = ?config(suite_top_dir, Config),
+
+    %% tsp("init_per_testcase2 -> "
+    %% 	"~n   SuiteDir: ~p"
+    %% 	"~n   DataDir:  ~p", [SuiteTopDir, DataDir]),
+    
+    TcTopDir = filename:join(SuiteTopDir, Case),
+    ?line ok = file:make_dir(TcTopDir),
+
+    %% tsp("init_per_testcase2 -> "
+    %% 	"~n   TcTopDir: ~p", [TcTopDir]),
+
+    DataSrc    = filename:join([DataDir, "server_root"]),
+    ServerRoot = filename:join([TcTopDir, "server_root"]),
+    
+    %% tsp("init_per_testcase2 -> "
+    %% 	"~n   DataSrc:    ~p"
+    %% 	"~n   ServerRoot: ~p", [DataSrc, ServerRoot]),
+
+    ok = file:make_dir(ServerRoot),
+    ok = file:make_dir(filename:join([TcTopDir, "logs"])),
+
+    NewConfig = [{tc_top_dir, TcTopDir}, {server_root, ServerRoot} | Config],
+
+    %% tsp("init_per_testcase2 -> copy DataSrc to ServerRoot"),
+
+    inets_test_lib:copy_dirs(DataSrc, ServerRoot),
+
+    %% tsp("init_per_testcase2 -> fix cgi"),
+    EnvCGI =  filename:join([ServerRoot, "cgi-bin", "printenv.sh"]),
+    {ok, FileInfo} = file:read_file_info(EnvCGI),
+    ok = file:write_file_info(EnvCGI, 
+			      FileInfo#file_info{mode = 8#00755}),
+    
+    EchoCGI = case test_server:os_type() of
+	      {win32, _} ->
+		  "cgi_echo.exe";
+	      _ ->
+		  "cgi_echo"
+	      end,
+    CGIDir = filename:join([ServerRoot, "cgi-bin"]),
+    inets_test_lib:copy_file(EchoCGI, DataDir,  CGIDir),
+    NewEchoCGI = filename:join([CGIDir, EchoCGI]),
+    {ok, FileInfo1} = file:read_file_info(NewEchoCGI),
+    ok = file:write_file_info(NewEchoCGI, 
+			      FileInfo1#file_info{mode = 8#00755}),
+    
+    %% To be used by IP test cases
+    %% tsp("init_per_testcase2 -> ip testcase setups"),
+    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
+		  normal_access, IpNormal), 
+    create_config([{port, ?IP_PORT}, {sock_type, ip_comm} | NewConfig], 
+    		  mod_htaccess, IpHtaccess), 
+
+    %% To be used by SSL test cases
+    %% tsp("init_per_testcase2 -> ssl testcase setups"),
+    SocketType = 
+	case atom_to_list(Case) of
+	    [X, $s, $s, $l | _] ->
+		case X of
+		    $p -> ssl;
+		    $e -> essl
+		end;
+	    _ ->
+		ssl
+	end,
+
+    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig], 
+		  normal_access, SslNormal),
+    create_config([{port, ?SSL_PORT}, {sock_type, SocketType} | NewConfig],
+    		  mod_htaccess, SslHtaccess),  
+  
+    %% To be used by IPv6 test cases. Case-clause is so that
+    %% you can do ts:run(inets, httpd_SUITE, <test case>)
+    %% for all cases except the ipv6 cases as they depend
+    %% on  'test_host_ipv6_only' that will only be present
+    %% when you run the whole test suite due  to shortcomings
+    %% of the test server.
+
+    tsp("init_per_testcase2 -> maybe generate IPv6 config file(s)"),
+    NewConfig2 = 
+	case atom_to_list(Case) of
+	    "ipv6_" ++ _ ->
+		case (catch inets_test_lib:has_ipv6_support(NewConfig)) of
+		    {ok, IPv6Address0} ->
+			{ok, Hostname} = inet:gethostname(), 
+			IPv6Address = http_transport:ipv6_name(IPv6Address0), 
+			create_ipv6_config([{port, ?IP_PORT}, 
+					    {sock_type, ip_comm},
+					    {ipv6_host, IPv6Address} | 
+					    NewConfig],
+					   "ipv6_hostname_ipcomm.conf", 
+					   Hostname),
+			create_ipv6_config([{port, ?IP_PORT}, 
+					    {sock_type, ip_comm},
+					    {ipv6_host, IPv6Address} | 
+					    NewConfig],
+					   "ipv6_address_ipcomm.conf",  
+					   IPv6Address),
+			create_ipv6_config([{port, ?SSL_PORT}, 
+					    {sock_type, essl},
+					    {ipv6_host, IPv6Address} | 
+					    NewConfig],
+					   "ipv6_hostname_essl.conf", 
+					   Hostname),
+			create_ipv6_config([{port, ?SSL_PORT}, 
+					    {sock_type, essl},
+					    {ipv6_host, IPv6Address} | 
+					    NewConfig],
+					   "ipv6_address_essl.conf",  
+					   IPv6Address),
+			[{ipv6_host, IPv6Address} | NewConfig];
+		    _ ->
+			NewConfig
+		end;
+
+	    _ ->
+		NewConfig
+	end,
+
+    %% tsp("init_per_testcase2 -> done when"
+    %% 	"~n   NewConfig2: ~p", [NewConfig2]),
+
+    NewConfig2.
+
+
+init_per_testcase3(Case, Config) ->
+    tsp("init_per_testcase3(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
+
+    
+%%     %% Create a new fresh node to be used by the server in this test-case
+    
+%%     NodeName = list_to_atom(atom_to_list(Case) ++ "_httpd"), 
+%%     Node     = inets_test_lib:start_node(NodeName),
+    
+    %% Clean up (we do not want this clean up in end_per_testcase
+    %% if init_per_testcase crashes for some testcase it will
+    %% have contaminated the environment and there will be no clean up.)
+    %% This init can take a few different paths so that one crashes
+    %% does not mean that all invocations will.
+
+    application:unset_env(inets, services),
+    application:stop(inets),
+    application:stop(ssl),
+    cleanup_mnesia(),
+ 
+    %% 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),
+      
+    CaseRest = 
+	case atom_to_list(Case) of
+	    "ip_mod_htaccess" ->
+		inets_test_lib:start_http_server(
+		  filename:join(TcTopDir,
+				integer_to_list(?IP_PORT) ++
+				"htaccess.conf")),
+		"mod_htaccess";
+	    "ip_" ++ Rest ->
+		inets_test_lib:start_http_server(
+		  filename:join(TcTopDir,
+				integer_to_list(?IP_PORT) ++ ".conf")),
+		Rest;
+	    "ticket_5913" ->
+		HttpdOptions =
+		    [{file,
+		      filename:join(TcTopDir,
+				    integer_to_list(?IP_PORT) ++ ".conf")},
+		     {accept_timeout,30000},
+		     {debug,[{exported_functions,
+			      [httpd_manager,httpd_request_handler]}]}],
+		inets_test_lib:start_http_server(HttpdOptions);
+	    "ticket_"++Rest ->
+		%% OTP-5913 use the new syntax of inets.config 
+		inets_test_lib:start_http_server([{file,
+		  filename:join(TcTopDir,
+				integer_to_list(?IP_PORT) ++ ".conf")}]),
+		Rest;
+
+	    [X, $s, $s, $l, $_, $m, $o, $d, $_, $h, $t, $a, $c, $c, $e, $s, $s] ->
+		?ENSURE_STARTED([crypto, public_key, ssl]),		
+		SslTag = 
+		    case X of
+			$p -> ssl;  % Plain
+			$e -> essl  % Erlang based ssl
+		    end,
+		case inets_test_lib:start_http_server_ssl(
+		       filename:join(TcTopDir,
+				     integer_to_list(?SSL_PORT) ++ 
+				     "htaccess.conf"), SslTag) of
+		    ok ->
+			"mod_htaccess";
+		    Other ->
+			error_logger:info_msg("Other: ~p~n", [Other]),
+			{skip, "SSL does not seem to be supported"}
+		end;
+	    [X, $s, $s, $l, $_ | Rest] ->
+		?ENSURE_STARTED([crypto, public_key, ssl]),		
+		SslTag = 
+		    case X of
+			$p -> ssl;
+			$e -> essl
+		    end,
+		case inets_test_lib:start_http_server_ssl(
+		       filename:join(TcTopDir,
+				     integer_to_list(?SSL_PORT) ++ 
+				     ".conf"), SslTag) of
+		    ok ->
+			Rest;
+		    Other ->
+			error_logger:info_msg("Other: ~p~n", [Other]),
+			{skip, "SSL does not seem to be supported"}
+		end;
+	    "ipv6_" ++ _  = TestCaseStr ->
+		case inets_test_lib:has_ipv6_support() of
+		    {ok, _} ->
+			inets_test_lib:start_http_server(
+			  filename:join(TcTopDir,
+					TestCaseStr ++ ".conf"));
+		    
+		    _ ->
+			{skip, "Host does not support IPv6"}
+		end
+	end,
+
+    InitRes = 
+	case CaseRest of
+	    {skip, _} = Skip ->
+		Skip;
+	    "mod_auth_" ++ _ ->
+		start_mnesia(?config(node, Config)),
+		[{watchdog, Dog} | NewConfig];
+	    "mod_htaccess" ->
+		ServerRoot = ?config(server_root, Config), 
+		Path = filename:join([ServerRoot, "htdocs"]),
+		catch remove_htaccess(Path),
+		create_htaccess_data(Path, ?config(address, Config)),
+		[{watchdog, Dog} | NewConfig];
+	    "range" ->
+		ServerRoot = ?config(server_root, Config), 
+		Path = filename:join([ServerRoot, "htdocs"]),
+		create_range_data(Path),
+		[{watchdog, Dog} | NewConfig];
+	    _ ->
+		[{watchdog, Dog} | NewConfig]
+	end,
+    
+    tsp("init_per_testcase3(~w) -> done when"
+	"~n   InitRes: ~p", [Case, InitRes]),
+
+    InitRes.
+
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(Case, 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(Case, Config) ->
+    Dog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    end_per_testcase2(Case, lists:keydelete(watchdog, 1, Config)),
+    ok.
+
+end_per_testcase2(Case, Config) ->
+    tsp("end_per_testcase2(~w) -> entry with"
+	"~n   Config: ~p", [Case, Config]),
+    application:unset_env(inets, services),
+    application:stop(inets),
+    application:stop(ssl),     
+    application:stop(crypto), % used by the new ssl (essl test cases)  
+    cleanup_mnesia(),
+    tsp("end_per_testcase2(~w) -> done", [Case]),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+%% Test cases starts here.
+%%-------------------------------------------------------------------------
+
+%%-------------------------------------------------------------------------
+ip_mod_alias(doc) -> 
+    ["Module test: mod_alias"];
+ip_mod_alias(suite) -> 
+    [];
+ip_mod_alias(Config) when is_list(Config) ->
+    httpd_mod:alias(ip_comm, ?IP_PORT, 
+		    ?config(host, Config), ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_mod_actions(doc) -> 
+    ["Module test: mod_actions"];
+ip_mod_actions(suite) -> 
+    [];
+ip_mod_actions(Config) when is_list(Config) ->
+    httpd_mod:actions(ip_comm, ?IP_PORT, 
+		      ?config(host, Config), ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_mod_security(doc) -> 
+    ["Module test: mod_security"];
+ip_mod_security(suite) -> 
+    [];
+ip_mod_security(Config) when is_list(Config) ->
+    ServerRoot = ?config(server_root, Config), 
+    httpd_mod:security(ServerRoot, ip_comm, ?IP_PORT, 
+		       ?config(host, Config), ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_mod_auth(doc) -> 
+    ["Module test: mod_auth"];
+ip_mod_auth(suite) -> 
+    [];
+ip_mod_auth(Config) when is_list(Config) ->
+    httpd_mod:auth(ip_comm, ?IP_PORT, 
+		   ?config(host, Config), ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_mod_auth_api(doc) -> 
+    ["Module test: mod_auth_api"];
+ip_mod_auth_api(suite) -> 
+    [];
+ip_mod_auth_api(Config) when is_list(Config) ->
+    ServerRoot = ?config(server_root, Config), 
+    Host =  ?config(host, Config),
+    Node = ?config(node, Config),
+    httpd_mod:auth_api(ServerRoot, "", ip_comm, ?IP_PORT, Host, Node),
+    httpd_mod:auth_api(ServerRoot, "dets_", ip_comm, ?IP_PORT, Host, Node),
+    httpd_mod:auth_api(ServerRoot, "mnesia_", ip_comm, ?IP_PORT, Host, Node),
+    ok. 
+%%-------------------------------------------------------------------------
+ip_mod_auth_mnesia_api(doc) -> 
+    ["Module test: mod_auth_mnesia_api"];
+ip_mod_auth_mnesia_api(suite) -> 
+    [];
+ip_mod_auth_mnesia_api(Config) when is_list(Config) ->
+    httpd_mod:auth_mnesia_api(ip_comm, ?IP_PORT, 
+		   ?config(host, Config), ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_mod_htaccess(doc) -> 
+    ["Module test: mod_htaccess"];
+ip_mod_htaccess(suite) -> 
+    [];
+ip_mod_htaccess(Config) when is_list(Config) ->
+    httpd_mod:htaccess(ip_comm, ?IP_PORT, 
+		       ?config(host, Config), ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_mod_cgi(doc) ->
+    ["Module test: mod_cgi"];
+ip_mod_cgi(suite) ->
+    [];
+ip_mod_cgi(Config) when is_list(Config) ->
+    httpd_mod:cgi(ip_comm, ?IP_PORT, 
+	?config(host, Config), ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_mod_esi(doc) ->
+    ["Module test: mod_esi"];
+ip_mod_esi(suite) ->
+    [];
+ip_mod_esi(Config) when is_list(Config) ->
+    httpd_mod:esi(ip_comm, ?IP_PORT, 
+		  ?config(host, Config), ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_mod_get(doc) ->
+    ["Module test: mod_get"];
+ip_mod_get(suite) ->
+    [];
+ip_mod_get(Config) when is_list(Config) ->
+    httpd_mod:get(ip_comm, ?IP_PORT, 
+		  ?config(host, Config), ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_mod_head(doc) ->
+    ["Module test: mod_head"];
+ip_mod_head(suite) ->
+    [];
+ip_mod_head(Config) when is_list(Config) ->
+    httpd_mod:head(ip_comm, ?IP_PORT, 
+		   ?config(host, Config), ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_mod_all(doc) ->
+    ["All modules test"];
+ip_mod_all(suite) ->
+    [];
+ip_mod_all(Config) when is_list(Config) ->
+    httpd_mod:all(ip_comm, ?IP_PORT, 
+		  ?config(host, Config), ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_load_light(doc) ->
+    ["Test light load"];
+ip_load_light(suite) ->
+    [];
+ip_load_light(Config) when is_list(Config) ->
+    httpd_load:load_test(ip_comm, ?IP_PORT, ?config(host, Config), 
+			 ?config(node, Config),
+			 get_nof_clients(ip_comm, light)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_load_medium(doc) ->
+    ["Test  medium load"];
+ip_load_medium(suite) ->
+    [];
+ip_load_medium(Config) when is_list(Config) ->
+      httpd_load:load_test(ip_comm, ?IP_PORT, ?config(host, Config),
+			   ?config(node, Config),
+			   get_nof_clients(ip_comm, medium)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_load_heavy(doc) ->
+    ["Test heavy load"];
+ip_load_heavy(suite) ->
+    [];
+ip_load_heavy(Config) when is_list(Config) ->
+     httpd_load:load_test(ip_comm, ?IP_PORT, ?config(host, Config),
+			  ?config(node, Config),
+			  get_nof_clients(ip_comm, heavy)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+ip_dos_hostname(doc) ->
+    ["Denial Of Service (DOS) attack test case"];
+ip_dos_hostname(suite) ->
+    [];
+ip_dos_hostname(Config) when is_list(Config) ->
+    dos_hostname(ip_comm, ?IP_PORT, ?config(host, Config), 
+		 ?config(node, Config), ?MAX_HEADER_SIZE),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+ip_time_test(doc) ->
+    [""];
+ip_time_test(suite) ->
+    [];
+ip_time_test(Config) when is_list(Config) ->
+    %% <CONDITIONAL-SKIP>
+    Skippable = [win32],
+    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+    
+    httpd_time_test:t(ip_comm, ?config(host, Config), ?IP_PORT),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_block_503(doc) ->
+    ["Check that you will receive status code 503 when the server"
+     " is blocked and 200 when its not blocked."];
+ip_block_503(suite) ->
+    [];
+ip_block_503(Config) when is_list(Config) ->
+    httpd_block:block_503(ip_comm, ?IP_PORT, ?config(host, Config), 
+				 ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "distribing does not really make a difference in this case."];
+ip_block_disturbing_idle(suite) ->
+    [];
+ip_block_disturbing_idle(Config) when is_list(Config) ->
+    httpd_block:block_disturbing_idle(ip_comm, ?IP_PORT, 
+				      ?config(host, Config), 
+				      ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_non_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing does not really make a difference in this case."];
+ip_block_non_disturbing_idle(suite) ->
+    [];
+ip_block_non_disturbing_idle(Config) when is_list(Config) ->
+    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
+					  ?config(host, Config), 
+					  ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_disturbing_active(doc) ->
+    ["Check that you can block/unblock an active server. The strategy " 
+     "distribing means ongoing requests should be terminated."];
+ip_block_disturbing_active(suite) ->
+    [];
+ip_block_disturbing_active(Config) when is_list(Config) ->
+    httpd_block:block_disturbing_active(ip_comm, ?IP_PORT, 
+					?config(host, Config), 
+					?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_non_disturbing_active(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing means the ongoing requests should be compleated."];
+ip_block_non_disturbing_active(suite) ->
+    [];
+ip_block_non_disturbing_active(Config) when is_list(Config) ->
+    httpd_block:block_non_disturbing_idle(ip_comm, ?IP_PORT, 
+					  ?config(host, Config), 
+					  ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_block_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be compleated"
+     "if the timeout does not occur."];
+ip_block_disturbing_active_timeout_not_released(suite) ->
+    [];
+ip_block_disturbing_active_timeout_not_released(Config) 
+  when is_list(Config) ->
+    httpd_block:block_disturbing_active_timeout_not_released(ip_comm, 
+							     ?IP_PORT, 
+							     ?config(host,
+								     Config), 
+							     ?config(node, 
+								     Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be terminated when"
+     "the timeout occurs."];
+ip_block_disturbing_active_timeout_released(suite) ->
+    [];
+ip_block_disturbing_active_timeout_released(Config) 
+  when is_list(Config) ->
+    httpd_block:block_disturbing_active_timeout_released(ip_comm, 
+							 ?IP_PORT, 
+							 ?config(host,
+								 Config), 
+							 ?config(node, 
+								 Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_block_non_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non non distribing means ongoing requests should be completed."];
+ip_block_non_disturbing_active_timeout_not_released(suite) ->
+    [];
+ip_block_non_disturbing_active_timeout_not_released(Config)
+  when is_list(Config) ->
+    httpd_block:
+	block_non_disturbing_active_timeout_not_released(ip_comm,
+							 ?IP_PORT, 
+							 ?config(host, 
+								 Config), 
+							 ?config(node, 
+								 Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_non_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non non distribing means ongoing requests should be completed. "
+     "When the timeout occurs the block operation sohould be canceled." ];
+ip_block_non_disturbing_active_timeout_released(suite) ->
+    [];
+ip_block_non_disturbing_active_timeout_released(Config)
+  when is_list(Config) ->
+    httpd_block:
+	block_non_disturbing_active_timeout_released(ip_comm,
+						     ?IP_PORT, 
+						     ?config(host, 
+							     Config), 
+						     ?config(node, 
+							     Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_disturbing_blocker_dies(doc) ->
+    [];
+ip_block_disturbing_blocker_dies(suite) ->
+    [];
+ip_block_disturbing_blocker_dies(Config) when is_list(Config) ->
+    httpd_block:disturbing_blocker_dies(ip_comm, ?IP_PORT, 
+					?config(host, Config), 
+					?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_block_non_disturbing_blocker_dies(doc) ->
+    [];
+ip_block_non_disturbing_blocker_dies(suite) ->
+    [];
+ip_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
+    httpd_block:non_disturbing_blocker_dies(ip_comm, ?IP_PORT, 
+					    ?config(host, Config), 
+					    ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_restart_no_block(doc) ->
+    [""];
+ip_restart_no_block(suite) ->
+    [];
+ip_restart_no_block(Config) when is_list(Config) ->
+    httpd_block:restart_no_block(ip_comm, ?IP_PORT, ?config(host, Config), 
+				 ?config(node, Config)),
+    ok.
+%%-------------------------------------------------------------------------
+ip_restart_disturbing_block(doc) ->
+    [""];
+ip_restart_disturbing_block(suite) ->
+    [];
+ip_restart_disturbing_block(Config) when is_list(Config) ->
+    %% <CONDITIONAL-SKIP>
+    Condition = 
+	fun() -> 
+		case os:type() of
+		    {unix, linux} ->
+			HW = string:strip(os:cmd("uname -m"), right, $\n),
+			case HW of
+			    "ppc" ->
+				case inet:gethostname() of
+				    {ok, "peach"} ->
+					true;
+				    _ ->
+					false
+				end;
+			    _ ->
+				false
+			end;
+		    _ ->
+			false
+		end
+	end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+
+    httpd_block:restart_disturbing_block(ip_comm, ?IP_PORT, 
+					 ?config(host, Config),
+					 ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+ip_restart_non_disturbing_block(doc) ->
+    [""];
+ip_restart_non_disturbing_block(suite) ->
+    [];
+ip_restart_non_disturbing_block(Config) when is_list(Config) ->
+    %% <CONDITIONAL-SKIP>
+    Condition = 
+	fun() -> 
+		case os:type() of
+		    {unix, linux} ->
+			HW = string:strip(os:cmd("uname -m"), right, $\n),
+			case HW of
+			    "ppc" ->
+				case inet:gethostname() of
+				    {ok, "peach"} ->
+					true;
+				    _ ->
+					false
+				end;
+			    _ ->
+				false
+			end;
+		    _ ->
+			false
+		end
+	end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+
+    httpd_block:restart_non_disturbing_block(ip_comm, ?IP_PORT,
+					    ?config(host, Config), 
+					    ?config(node, Config)),
+    ok.
+
+%%-------------------------------------------------------------------------
+
+essl_mod_alias(doc) -> 
+    ["Module test: mod_alias - using new of configure new SSL"];
+essl_mod_alias(suite) -> 
+    [];
+essl_mod_alias(Config) when is_list(Config) ->
+    ssl_mod_alias(essl, Config).
+
+
+ssl_mod_alias(Tag, Config) ->
+    httpd_mod:alias(Tag, ?SSL_PORT, 
+		    ?config(host, Config), ?config(node, Config)),
+    ok. 
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_actions(doc) -> 
+    ["Module test: mod_actions - using new of configure new SSL"];
+essl_mod_actions(suite) -> 
+    [];
+essl_mod_actions(Config) when is_list(Config) ->
+    ssl_mod_actions(essl, Config).
+
+
+ssl_mod_actions(Tag, Config) ->
+    httpd_mod:actions(Tag, 
+		      ?SSL_PORT, 
+		      ?config(host, Config), 
+		      ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_security(doc) -> 
+    ["Module test: mod_security - using new of configure new SSL"];
+essl_mod_security(suite) -> 
+    [];
+essl_mod_security(Config) when is_list(Config) ->
+    ssl_mod_security(essl, Config).
+
+ssl_mod_security(Tag, Config) ->
+    ServerRoot = ?config(server_root, Config), 
+    httpd_mod:security(ServerRoot, 
+		       Tag, 
+		       ?SSL_PORT, 
+		       ?config(host, Config), 
+		       ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_auth(doc) -> 
+    ["Module test: mod_auth - using new of configure new SSL"];
+essl_mod_auth(suite) -> 
+    [];
+essl_mod_auth(Config) when is_list(Config) ->
+    ssl_mod_auth(essl, Config).
+
+ssl_mod_auth(Tag, Config) ->
+    httpd_mod:auth(Tag, 
+		   ?SSL_PORT, 
+		   ?config(host, Config), 
+		   ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_mod_auth_api(doc) -> 
+    ["Module test: mod_auth - using new of configure new SSL"];
+essl_mod_auth_api(suite) -> 
+    [];
+essl_mod_auth_api(Config) when is_list(Config) ->
+    ssl_mod_auth_api(essl, Config).
+
+ssl_mod_auth_api(Tag, Config) ->
+    ServerRoot = ?config(server_root, Config), 
+    Host       =  ?config(host, Config),
+    Node       = ?config(node, Config),
+    httpd_mod:auth_api(ServerRoot, "",        Tag, ?SSL_PORT, Host, Node),
+    httpd_mod:auth_api(ServerRoot, "dets_",   Tag, ?SSL_PORT, Host, Node),
+    httpd_mod:auth_api(ServerRoot, "mnesia_", Tag, ?SSL_PORT, Host, Node),
+    ok. 
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_mod_auth_mnesia_api(doc) -> 
+    ["Module test: mod_auth_mnesia_api - using new of configure new SSL"];
+essl_mod_auth_mnesia_api(suite) -> 
+    [];
+essl_mod_auth_mnesia_api(Config) when is_list(Config) ->
+    ssl_mod_auth_mnesia_api(essl, Config).
+
+ssl_mod_auth_mnesia_api(Tag, Config) ->
+    httpd_mod:auth_mnesia_api(Tag, 
+			      ?SSL_PORT, 
+			      ?config(host, Config), 
+			      ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_htaccess(doc) -> 
+    ["Module test: mod_htaccess - using new of configure new SSL"];
+essl_mod_htaccess(suite) -> 
+    [];
+essl_mod_htaccess(Config) when is_list(Config) ->
+    ssl_mod_htaccess(essl, Config).
+
+ssl_mod_htaccess(Tag, Config) ->
+    httpd_mod:htaccess(Tag, 
+		       ?SSL_PORT, 
+		       ?config(host, Config), 
+		       ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_cgi(doc) ->
+    ["Module test: mod_cgi - using new of configure new SSL"];
+essl_mod_cgi(suite) ->
+    [];
+essl_mod_cgi(Config) when is_list(Config) ->
+    ssl_mod_cgi(essl, Config).
+
+ssl_mod_cgi(Tag, Config) ->
+    httpd_mod:cgi(Tag, 
+	?SSL_PORT, 
+	?config(host, Config), 
+	?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_esi(doc) ->
+    ["Module test: mod_esi - using new of configure new SSL"];
+essl_mod_esi(suite) ->
+    [];
+essl_mod_esi(Config) when is_list(Config) ->
+    ssl_mod_esi(essl, Config).
+
+ssl_mod_esi(Tag, Config) ->
+    httpd_mod:esi(Tag, 
+		  ?SSL_PORT, 
+		  ?config(host, Config), 
+		  ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_get(doc) ->
+    ["Module test: mod_get - using new of configure new SSL"];
+essl_mod_get(suite) ->
+    [];
+essl_mod_get(Config) when is_list(Config) ->
+    ssl_mod_get(essl, Config).
+
+ssl_mod_get(Tag, Config) ->
+    httpd_mod:get(Tag, 
+		  ?SSL_PORT, 
+		  ?config(host, Config), 
+		  ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_head(doc) ->
+    ["Module test: mod_head - using new of configure new SSL"];
+essl_mod_head(suite) ->
+    [];
+essl_mod_head(Config) when is_list(Config) ->
+    ssl_mod_head(essl, Config).
+
+ssl_mod_head(Tag, Config) ->
+    httpd_mod:head(Tag, 
+		   ?SSL_PORT, 
+		   ?config(host, Config), 
+		   ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_mod_all(doc) ->
+    ["All modules test - using new of configure new SSL"];
+essl_mod_all(suite) ->
+    [];
+essl_mod_all(Config) when is_list(Config) ->
+    ssl_mod_all(essl, Config).
+
+ssl_mod_all(Tag, Config) ->
+    httpd_mod:all(Tag, 
+		  ?SSL_PORT, 
+		  ?config(host, Config), 
+		  ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_load_light(doc) ->
+    ["Test light load - using new of configure new SSL"];
+essl_load_light(suite) ->
+    [];
+essl_load_light(Config) when is_list(Config) ->
+    ssl_load_light(essl, Config).
+
+ssl_load_light(Tag, Config) ->
+    httpd_load:load_test(Tag, 
+			 ?SSL_PORT, 
+			 ?config(host, Config), 
+			 ?config(node, Config),
+			 get_nof_clients(ssl, light)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_load_medium(doc) ->
+    ["Test medium load - using new of configure new SSL"];
+essl_load_medium(suite) ->
+    [];
+essl_load_medium(Config) when is_list(Config) ->
+    ssl_load_medium(essl, Config).
+
+ssl_load_medium(Tag, Config) ->
+    %% <CONDITIONAL-SKIP>
+    Skippable = [win32],
+    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+
+    httpd_load:load_test(Tag, 
+			 ?SSL_PORT, 
+			 ?config(host, Config), 
+			 ?config(node, Config),
+			 get_nof_clients(ssl, medium)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_load_heavy(doc) ->
+    ["Test heavy load - using new of configure new SSL"];
+essl_load_heavy(suite) ->
+    [];
+essl_load_heavy(Config) when is_list(Config) ->
+    ssl_load_heavy(essl, Config).
+
+ssl_load_heavy(Tag, Config) ->
+    %% <CONDITIONAL-SKIP>
+    Skippable = [win32],
+    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+
+    httpd_load:load_test(Tag, 
+			 ?SSL_PORT, 
+			 ?config(host, Config), 
+			 ?config(node, Config),
+			 get_nof_clients(ssl, heavy)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_dos_hostname(doc) ->
+    ["Denial Of Service (DOS) attack test case - using new of configure new SSL"];
+essl_dos_hostname(suite) ->
+    [];
+essl_dos_hostname(Config) when is_list(Config) ->
+    ssl_dos_hostname(essl, Config).
+
+ssl_dos_hostname(Tag, Config) ->
+    dos_hostname(Tag, 
+		 ?SSL_PORT, 
+		 ?config(host, Config), 
+		 ?config(node, Config), 
+		 ?MAX_HEADER_SIZE),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_time_test(doc) ->
+    ["using new of configure new SSL"];
+essl_time_test(suite) ->
+    [];
+essl_time_test(Config) when is_list(Config) ->
+    ssl_time_test(essl, Config).
+
+ssl_time_test(Tag, Config) when is_list(Config) ->
+    %% <CONDITIONAL-SKIP>
+    FreeBSDVersionVerify = 
+	fun() ->
+		case os:version() of
+		    {7, 1, _} -> % We only have one such machine, so...
+			true;
+		    _ ->
+			false
+		end
+	end,
+    Skippable = [win32, {unix, [{freebsd, FreeBSDVersionVerify}]}],
+    Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+    
+    httpd_time_test:t(Tag, 
+		      ?config(host, Config), 
+		      ?SSL_PORT),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_block_503(doc) ->
+    ["Check that you will receive status code 503 when the server"
+     " is blocked and 200 when its not blocked - using new of configure new SSL."];
+essl_block_503(suite) ->
+    [];
+essl_block_503(Config) when is_list(Config) ->
+    ssl_block_503(essl, Config).
+
+ssl_block_503(Tag, Config) ->
+    httpd_block:block_503(Tag, 
+			  ?SSL_PORT, 
+			  ?config(host, Config), 
+			  ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "distribing does not really make a difference in this case." 
+     "Using new of configure new SSL"];
+essl_block_disturbing_idle(suite) ->
+    [];
+essl_block_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_disturbing_idle(essl, Config).
+
+ssl_block_disturbing_idle(Tag, Config) ->
+    httpd_block:block_disturbing_idle(Tag, 
+				      ?SSL_PORT, 
+				      ?config(host, Config), 
+				      ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_non_disturbing_idle(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing does not really make a difference in this case." 
+     "Using new of configure new SSL"];
+essl_block_non_disturbing_idle(suite) ->
+    [];
+essl_block_non_disturbing_idle(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_idle(essl, Config).
+
+ssl_block_non_disturbing_idle(Tag, Config) ->
+    httpd_block:block_non_disturbing_idle(Tag, 
+					  ?SSL_PORT, 
+					  ?config(host, Config), 
+					  ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_disturbing_active(doc) ->
+    ["Check that you can block/unblock an active server. The strategy " 
+     "distribing means ongoing requests should be terminated." 
+     "Using new of configure new SSL"];
+essl_block_disturbing_active(suite) ->
+    [];
+essl_block_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_disturbing_active(essl, Config).
+
+ssl_block_disturbing_active(Tag, Config) ->
+    httpd_block:block_disturbing_active(Tag, 
+					?SSL_PORT, 
+					?config(host, Config), 
+					?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_non_disturbing_active(doc) ->
+    ["Check that you can block/unblock an idle server. The strategy " 
+     "non distribing means the ongoing requests should be compleated." 
+     "Using new of configure new SSL"];
+essl_block_non_disturbing_active(suite) ->
+    [];
+essl_block_non_disturbing_active(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_active(essl, Config).
+
+ssl_block_non_disturbing_active(Tag, Config) ->
+    httpd_block:block_non_disturbing_idle(Tag, 
+					  ?SSL_PORT, 
+					  ?config(host, Config), 
+					  ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be compleated"
+     "if the timeout does not occur." 
+    "Using new of configure new SSL"];
+essl_block_disturbing_active_timeout_not_released(suite) ->
+    [];
+essl_block_disturbing_active_timeout_not_released(Config) 
+  when is_list(Config) ->
+    ssl_block_disturbing_active_timeout_not_released(essl, Config).
+
+ssl_block_disturbing_active_timeout_not_released(Tag, Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config), 
+    httpd_block:block_disturbing_active_timeout_not_released(Tag, 
+							     Port, Host, Node),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "distribing means ongoing requests should be terminated when"
+     "the timeout occurs." 
+    "Using new of configure new SSL"];
+essl_block_disturbing_active_timeout_released(suite) ->
+    [];
+essl_block_disturbing_active_timeout_released(Config) 
+  when is_list(Config) ->
+    ssl_block_disturbing_active_timeout_released(essl, Config).
+
+ssl_block_disturbing_active_timeout_released(Tag, Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config),     
+    httpd_block:block_disturbing_active_timeout_released(Tag, 
+							 Port, 
+							 Host, 
+							 Node), 
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_non_disturbing_active_timeout_not_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non non distribing means ongoing requests should be completed." 
+    "Using new of configure new SSL"];
+essl_block_non_disturbing_active_timeout_not_released(suite) ->
+    [];
+essl_block_non_disturbing_active_timeout_not_released(Config)
+  when is_list(Config) ->
+    ssl_block_non_disturbing_active_timeout_not_released(essl, Config).
+
+ssl_block_non_disturbing_active_timeout_not_released(Tag, Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config), 
+    httpd_block:block_non_disturbing_active_timeout_not_released(Tag,
+								 Port, 
+								 Host, 
+								 Node),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_block_non_disturbing_active_timeout_released(doc) ->
+    ["Check that you can block an active server. The strategy " 
+     "non distribing means ongoing requests should be completed. "
+     "When the timeout occurs the block operation sohould be canceled." 
+     "Using new of configure new SSL"];
+essl_block_non_disturbing_active_timeout_released(suite) ->
+    [];
+essl_block_non_disturbing_active_timeout_released(Config)
+  when is_list(Config) ->
+    ssl_block_non_disturbing_active_timeout_released(essl, Config).
+
+ssl_block_non_disturbing_active_timeout_released(Tag, Config)
+  when is_list(Config) ->
+    Port = ?SSL_PORT, 
+    Host = ?config(host, Config), 
+    Node = ?config(node, Config), 
+    httpd_block:block_non_disturbing_active_timeout_released(Tag, 
+							     Port, 
+							     Host, 
+							     Node), 
+
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_block_disturbing_blocker_dies(doc) ->
+    ["using new of configure new SSL"];
+essl_block_disturbing_blocker_dies(suite) ->
+    [];
+essl_block_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_disturbing_blocker_dies(essl, Config).
+
+ssl_block_disturbing_blocker_dies(Tag, Config) ->
+    httpd_block:disturbing_blocker_dies(Tag, 
+					?SSL_PORT, 
+					?config(host, Config), 
+					?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+essl_block_non_disturbing_blocker_dies(doc) ->
+    ["using new of configure new SSL"];
+essl_block_non_disturbing_blocker_dies(suite) ->
+    [];
+essl_block_non_disturbing_blocker_dies(Config) when is_list(Config) ->
+    ssl_block_non_disturbing_blocker_dies(essl, Config).
+
+ssl_block_non_disturbing_blocker_dies(Tag, Config) ->
+    httpd_block:non_disturbing_blocker_dies(Tag, 
+					    ?SSL_PORT, 
+					    ?config(host, Config), 
+					    ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_restart_no_block(doc) ->
+    ["using new of configure new SSL"];
+essl_restart_no_block(suite) ->
+    [];
+essl_restart_no_block(Config) when is_list(Config) ->
+    ssl_restart_no_block(essl, Config).
+
+ssl_restart_no_block(Tag, Config) ->
+    httpd_block:restart_no_block(Tag, 
+				 ?SSL_PORT, 
+				 ?config(host, Config), 
+				 ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_restart_disturbing_block(doc) ->
+    ["using new of configure new SSL"];
+essl_restart_disturbing_block(suite) ->
+    [];
+essl_restart_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_disturbing_block(essl, Config).
+
+ssl_restart_disturbing_block(Tag, Config) ->
+    %% <CONDITIONAL-SKIP>
+    Condition = 
+	fun() -> 
+		case os:type() of
+		    {unix, linux} ->
+			case ?OSCMD("uname -m") of
+			    "ppc" ->
+				case file:read_file_info("/etc/fedora-release") of
+				    {ok, _} ->
+					case ?OSCMD("awk '{print $2}' /etc/fedora-release") of
+					    "release" ->
+						%% Fedora 7 and later
+						case ?OSCMD("awk '{print $3}' /etc/fedora-release") of
+						    "7" ->
+							true;
+						    _ ->
+							false
+						end;
+					    _ ->
+						false
+					end;
+				    _ ->
+					false
+				end;
+			    _ ->
+				false
+			end;
+		    _ ->
+			false
+		end
+	end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+
+    httpd_block:restart_disturbing_block(Tag, ?SSL_PORT, 
+					 ?config(host, Config), 
+					 ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+
+
+essl_restart_non_disturbing_block(doc) ->
+    ["using new of configure new SSL"];
+essl_restart_non_disturbing_block(suite) ->
+    [];
+essl_restart_non_disturbing_block(Config) when is_list(Config) ->
+    ssl_restart_non_disturbing_block(essl, Config).
+
+ssl_restart_non_disturbing_block(Tag, Config) ->
+    %% <CONDITIONAL-SKIP>
+    Condition = 
+	fun() -> 
+		case os:type() of
+		    {unix, linux} ->
+			HW = string:strip(os:cmd("uname -m"), right, $\n),
+			case HW of
+			    "ppc" ->
+				case inet:gethostname() of
+				    {ok, "peach"} ->
+					true;
+				    _ ->
+					false
+				end;
+			    _ ->
+				false
+			end;
+		    _ ->
+			false
+		end
+	end,
+    ?NON_PC_TC_MAYBE_SKIP(Config, Condition),
+    %% </CONDITIONAL-SKIP>
+
+    httpd_block:restart_non_disturbing_block(Tag, 
+					     ?SSL_PORT, 
+					     ?config(host, Config), 
+					     ?config(node, Config)),
+    ok.
+
+
+%%-------------------------------------------------------------------------
+ip_host(doc) ->   
+    ["Control that the server accepts/rejects requests with/ without host"];
+ip_host(suite)->
+    [];
+ip_host(Config) when is_list(Config) ->
+    httpd_1_1:host(ip_comm, ?IP_PORT, ?config(host, Config),
+		   ?config(node, Config)),
+    ok.
+%%------------------------------------------------------------------------- 
+ip_chunked(doc) ->   
+    ["Control that the server accepts chunked requests"];
+ip_chunked(suite) ->
+    [];
+ip_chunked(Config) when is_list(Config) ->
+    httpd_1_1:chunked(ip_comm, ?IP_PORT, ?config(host, Config),
+		      ?config(node, Config)),
+    ok.
+%%------------------------------------------------------------------------- 
+ip_expect(doc) ->   
+    ["Control that the server handles request with the expect header "
+     "field appropiate"];
+ip_expect(suite)->
+    [];
+ip_expect(Config) when is_list(Config) ->
+    httpd_1_1:expect(ip_comm, ?IP_PORT, ?config(host, Config),
+		     ?config(node, Config)),
+    ok.
+%%------------------------------------------------------------------------- 
+ip_range(doc) ->   
+    ["Control that the server can handle range requests to plain files"];
+ip_range(suite)->
+    [];
+ip_range(Config) when is_list(Config) ->
+    httpd_1_1:range(ip_comm, ?IP_PORT, ?config(host, Config),
+		    ?config(node, Config)),
+    ok.
+%%------------------------------------------------------------------------- 
+ip_if_test(doc) ->   
+    ["Test that the if - request header fields is handled correclty"];
+ip_if_test(suite) ->
+    [];
+ip_if_test(Config) when is_list(Config) ->
+    ServerRoot = ?config(server_root, Config), 
+    DocRoot = filename:join([ServerRoot, "htdocs"]),
+    httpd_1_1:if_test(ip_comm, ?IP_PORT, ?config(host, Config),
+		      ?config(node, Config), DocRoot),
+    ok.
+%%------------------------------------------------------------------------- 
+ip_http_trace(doc) ->   
+    ["Test the trace module "];
+ip_http_trace(suite) -> 
+    [];
+ip_http_trace(Config) when is_list(Config) ->
+    httpd_1_1:http_trace(ip_comm, ?IP_PORT, ?config(host, Config),
+			 ?config(node, Config)),
+    ok.
+%%------------------------------------------------------------------------- 
+ip_http1_1_head(doc) ->  
+    ["Test the trace module "];
+ip_http1_1_head(suite)->
+    [];
+ip_http1_1_head(Config) when is_list(Config) ->
+    httpd_1_1:head(ip_comm, ?IP_PORT, ?config(host, Config),
+			   ?config(node, Config)),
+    ok.
+
+%%------------------------------------------------------------------------- 
+ip_get_0_9(doc) ->  
+    ["Test simple HTTP/0.9 GET"];
+ip_get_0_9(suite)->
+    [];
+ip_get_0_9(Config) when is_list(Config) ->
+    Host =  ?config(host, Config),
+    Node =  ?config(node, Config),
+    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
+				       "GET / \r\n\r\n", 
+				       [{statuscode, 200},
+					{version, "HTTP/0.9"} ]),
+    %% Without space after uri
+    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
+				       "GET /\r\n\r\n", 
+				       [{statuscode, 200},
+					{version, "HTTP/0.9"} ]),
+    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
+				       "GET / HTTP/0.9\r\n\r\n", 
+				       [{statuscode, 200},
+					{version, "HTTP/0.9"}]),
+    
+    ok.
+%%------------------------------------------------------------------------- 
+ip_head_1_0(doc) ->  
+    ["Test HTTP/1.0 HEAD"];
+ip_head_1_0(suite)->
+    [];
+ip_head_1_0(Config) when is_list(Config) ->
+    Host =  ?config(host, Config),
+    Node =  ?config(node, Config),
+    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
+			 "HEAD / HTTP/1.0\r\n\r\n", [{statuscode, 200},
+						    {version, "HTTP/1.0"}]),
+    
+    ok.
+%%------------------------------------------------------------------------- 
+ip_get_1_0(doc) ->  
+    ["Test HTTP/1.0 GET"];
+ip_get_1_0(suite)->
+    [];
+ip_get_1_0(Config) when is_list(Config) ->
+    Host =  ?config(host, Config),
+    Node =  ?config(node, Config),
+    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
+			 "GET / HTTP/1.0\r\n\r\n", [{statuscode, 200},
+						    {version, "HTTP/1.0"}]),
+    
+    ok.
+%%------------------------------------------------------------------------- 
+ip_post_1_0(doc) ->  
+    ["Test HTTP/1.0 POST"];
+ip_post_1_0(suite)->
+    [];
+ip_post_1_0(Config) when is_list(Config) ->
+    Host =  ?config(host, Config),
+    Node =  ?config(node, Config),
+    %% Test the post message formatin 1.0! Real post are testes elsewhere
+    ok = httpd_test_lib:verify_request(ip_comm, Host, ?IP_PORT, Node, 
+			 "POST / HTTP/1.0\r\n\r\n "  
+			 "Content-Length:6 \r\n\r\nfoobar", 
+			 [{statuscode, 500}, {version, "HTTP/1.0"}]),
+    
+    ok.
+%%------------------------------------------------------------------------- 
+ip_mod_cgi_chunked_encoding_test(doc) ->  
+    ["Test the trace module "];
+ip_mod_cgi_chunked_encoding_test(suite)->
+    [];
+ip_mod_cgi_chunked_encoding_test(Config) when is_list(Config) ->
+    Host = ?config(host, Config),
+    Script =
+	case test_server:os_type() of
+	    {win32, _} ->
+		"/cgi-bin/printenv.bat";
+	    _ ->
+		"/cgi-bin/printenv.sh"
+	end,
+    Requests = 
+	["GET " ++ Script ++ " HTTP/1.1\r\nHost:"++ Host ++"\r\n\r\n",
+	 "GET /cgi-bin/erl/httpd_example/newformat  HTTP/1.1\r\nHost:"
+	 ++ Host ++"\r\n\r\n"],
+    httpd_1_1:mod_cgi_chunked_encoding_test(ip_comm, ?IP_PORT,
+					    Host,
+					    ?config(node, Config),
+					    Requests),
+    ok.
+
+%------------------------------------------------------------------------- 
+
+ipv6_hostname_ipcomm() ->
+    [{require, ipv6_hosts}].
+ipv6_hostname_ipcomm(X) -> 
+    SocketType = ip_comm,
+    Port       = ?IP_PORT, 
+    ipv6_hostname(SocketType, Port, X).
+
+ipv6_hostname_essl() ->
+    [{require, ipv6_hosts}].
+ipv6_hostname_essl(X) -> 
+    SocketType = essl, 
+    Port       = ?SSL_PORT, 
+    ipv6_hostname(SocketType, Port, X).
+
+ipv6_hostname(_SocketType, _Port, doc) ->  
+    ["Test standard ipv6 address"];
+ipv6_hostname(_SocketType, _Port, suite)->
+    [];
+ipv6_hostname(SocketType, Port, Config) when is_list(Config) -> 
+    tsp("ipv6_hostname -> entry with"
+	"~n   SocketType: ~p"
+	"~n   Port:       ~p"
+	"~n   Config:     ~p", [SocketType, Port, Config]),
+    Host = ?config(host, Config),
+    URI  = "GET HTTP://" ++ 
+	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
+    tsp("ipv6_hostname -> Host: ~p", [Host]),
+    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
+				  node(), 
+				  URI, 
+				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
+    ok.
+
+%%------------------------------------------------------------------------- 
+
+ipv6_address_ipcomm() ->
+    [{require, ipv6_hosts}].
+ipv6_address_ipcomm(X) ->
+    SocketType = ip_comm,
+    Port       = ?IP_PORT, 
+    ipv6_address(SocketType, Port, X).
+
+ipv6_address_essl() ->
+    [{require, ipv6_hosts}].
+ipv6_address_essl(X) ->
+    SocketType = essl,
+    Port       = ?SSL_PORT, 
+    ipv6_address(SocketType, Port, X).
+
+ipv6_address(_SocketType, _Port, doc) ->
+    ["Test standard ipv6 address"];
+ipv6_address(_SocketType, _Port, suite)->
+    [];
+ipv6_address(SocketType, Port, Config) when is_list(Config) ->   
+    tsp("ipv6_address -> entry with"
+	"~n   SocketType: ~p"
+	"~n   Port:       ~p"
+	"~n   Config:     ~p", [SocketType, Port, Config]),
+    Host = ?config(host, Config),
+    tsp("ipv6_address -> Host: ~p", [Host]),
+    URI = "GET HTTP://" ++ 
+	Host ++ ":" ++ integer_to_list(Port) ++ "/ HTTP/1.1\r\n\r\n", 
+    httpd_test_lib:verify_request(SocketType, Host, Port, [inet6], 
+				  node(), 
+				  URI, 
+				  [{statuscode, 200}, {version, "HTTP/1.1"}]),
+    ok.
+
+
+%%--------------------------------------------------------------------
+ticket_5775(doc) ->
+    ["Tests that content-length is correct"];
+ticket_5775(suite) ->
+    [];
+ticket_5775(Config) ->
+    ok=httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				     ?IP_PORT, ?config(node, Config),
+				       "GET /cgi-bin/erl/httpd_example:get_bin "
+				       "HTTP/1.0\r\n\r\n", 
+				       [{statuscode, 200},
+				       {version, "HTTP/1.0"}]),
+    ok.
+ticket_5865(doc) ->
+    ["Tests that a header without last-modified is handled"];
+ticket_5865(suite) ->
+    [];
+ticket_5865(Config) ->
+    ?SKIP(as_of_r15_behaviour_of_calendar_has_changed),
+    Host = ?config(host,Config),
+    ServerRoot = ?config(server_root, Config), 
+    DocRoot = filename:join([ServerRoot, "htdocs"]),
+    File = filename:join([DocRoot,"last_modified.html"]),
+
+    Bad_mtime = case test_server:os_type() of
+		    {win32, _} ->
+			{{1600,12,31},{23,59,59}};
+		    {unix, _} ->
+			{{1969,12,31},{23,59,59}}
+		end,
+    
+    {ok,FI}=file:read_file_info(File),
+    
+    case file:write_file_info(File,FI#file_info{mtime=Bad_mtime}) of
+	ok ->
+	    ok = httpd_test_lib:verify_request(ip_comm, Host,
+					       ?IP_PORT, ?config(node, Config),
+					       "GET /last_modified.html"
+					       " HTTP/1.1\r\nHost:"
+					       ++Host++"\r\n\r\n", 
+					       [{statuscode, 200},
+						{no_header,
+						 "last-modified"}]),
+	    ok;
+	{error, Reason} ->
+	    Fault = 
+		io_lib:format("Attempt to change the file info to set the"
+			      " preconditions of the test case failed ~p~n",
+			      [Reason]),
+	    {skip, Fault}
+    end.
+
+ticket_5913(doc) ->
+    ["Tests that a header without last-modified is handled"];
+ticket_5913(suite) -> [];
+ticket_5913(Config) ->
+    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				       ?IP_PORT, ?config(node, Config),
+				       "GET /cgi-bin/erl/httpd_example:get_bin "
+				       "HTTP/1.0\r\n\r\n", 
+				       [{statuscode, 200},
+					{version, "HTTP/1.0"}]),
+    ok.
+
+ticket_6003(doc) ->
+    ["Tests that a URI with a bad hexadecimal code is handled"];
+ticket_6003(suite) -> [];
+ticket_6003(Config) ->
+    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				       ?IP_PORT, ?config(node, Config),
+				       "GET http://www.erlang.org/%skalle "
+				       "HTTP/1.0\r\n\r\n",
+				       [{statuscode, 400},
+					{version, "HTTP/1.0"}]),
+    ok.
+
+ticket_7304(doc) ->
+     ["Tests missing CR in delimiter"];
+ticket_7304(suite) -> 
+    [];
+ticket_7304(Config) ->
+    ok = httpd_test_lib:verify_request(ip_comm, ?config(host, Config),
+				       ?IP_PORT, ?config(node, Config),
+				       "GET / HTTP/1.0\r\n\n",
+				       [{statuscode, 200},
+					{version, "HTTP/1.0"}]),
+    ok.
+
+%%--------------------------------------------------------------------
+%% Internal functions
+%%--------------------------------------------------------------------
+dos_hostname(Type, Port, Host, Node, Max) ->
+    H1 = {"", 200},
+    H2 = {"dummy-host.ericsson.se", 200},
+    TooLongHeader = lists:append(lists:duplicate(Max + 1, "a")),
+    H3 = {TooLongHeader, 403},
+    Hosts = [H1,H2,H3],
+    dos_hostname_poll(Type, Host, Port, Node, Hosts).
+
+%% make_ipv6(T) when is_tuple(T) andalso (size(T) =:= 8) ->
+%%     make_ipv6(tuple_to_list(T));
+
+%% make_ipv6([_, _, _, _, _, _, _, _] = IPV6) ->
+%%     lists:flatten(io_lib:format("~s:~s:~s:~s:~s:~s:~s:~s", IPV6)).
+
+
+%%--------------------------------------------------------------------
+%% Other help functions
+create_config(Config, Access, FileName) ->
+    ServerRoot = ?config(server_root, Config),
+    TcTopDir   = ?config(tc_top_dir,  Config),
+    Port       = ?config(port,        Config),
+    Type       = ?config(sock_type,   Config),
+    Host       = ?config(host,        Config),
+    Mods       = io_lib:format("~p", [httpd_mod]),
+    Funcs      = io_lib:format("~p", [ssl_password_cb]),
+    MaxHdrSz   = io_lib:format("~p", [256]),
+    MaxHdrAct  = io_lib:format("~p", [close]),
+
+    io:format(user, 
+	      "create_config -> "
+	      "~n   ServerRoot: ~p"
+	      "~n   TcTopDir:   ~p"
+	      "~n   Type:       ~p"
+	      "~n   Port:       ~p"
+	      "~n   Host:       ~p"
+	      "~n", [ServerRoot, TcTopDir, Type, Port, Host]),
+
+    SSL =
+	if
+	    (Type =:= ssl)  orelse 
+	    (Type =:= essl) ->
+		[cline(["SSLCertificateFile ", 
+			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
+		 cline(["SSLCertificateKeyFile ",
+			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
+		 cline(["SSLCACertificateFile ",
+			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
+		 cline(["SSLPasswordCallbackModule ", Mods]),
+		 cline(["SSLPasswordCallbackFunction ", Funcs]),
+		 cline(["SSLVerifyClient 0"]),
+		 cline(["SSLVerifyDepth 1"])];
+	    true ->
+		[]
+	end,
+    ModOrder = 
+	case Access of
+	    mod_htaccess ->
+		"Modules mod_alias mod_htaccess mod_auth "
+		    "mod_security "
+		    "mod_responsecontrol mod_trace mod_esi "
+		    "mod_actions mod_cgi mod_include mod_dir "
+		    "mod_range mod_get "
+		    "mod_head mod_log mod_disk_log";
+	    _ ->
+		"Modules mod_alias mod_auth mod_security "
+		    "mod_responsecontrol mod_trace mod_esi "
+		    "mod_actions mod_cgi mod_include mod_dir "
+			   "mod_range mod_get "
+		    "mod_head mod_log mod_disk_log"
+	end,
+    
+    %% The test suite currently does not handle an explicit BindAddress.
+    %% They assume any has been used, that is Addr is always set to undefined!
+
+    %%     {ok, Hostname} = inet:gethostname(), 
+    %%     {ok, Addr} = inet:getaddr(Hostname, inet6),
+    %%     AddrStr = make_ipv6(Addr), 
+    %%     BindAddress = lists:flatten(io_lib:format("~s|inet6", [AddrStr])),
+
+    BindAddress = "*|inet", 
+    %% BindAddress = "*", 
+
+    HttpConfig = [
+		  cline(["Port ", integer_to_list(Port)]),
+		  cline(["ServerName ", Host]),
+		  cline(["SocketType ", atom_to_list(Type)]),
+		  cline([ModOrder]),
+		  %% cline(["LogFormat ", "erlang"]),
+		  cline(["ServerAdmin [email protected]"]),
+		  cline(["BindAddress ", BindAddress]),
+		  cline(["ServerRoot ", ServerRoot]),
+		  cline(["ErrorLog ", TcTopDir, 
+		     "/logs/error_log_", integer_to_list(Port)]),
+		  cline(["TransferLog ", TcTopDir, 
+			 "/logs/access_log_", integer_to_list(Port)]),
+		  cline(["SecurityLog ", TcTopDir, 
+			 "/logs/security_log_", integer_to_list(Port)]),
+		  cline(["ErrorDiskLog ", TcTopDir, 
+			 "/logs/error_disk_log_", integer_to_list(Port)]),
+		  cline(["ErrorDiskLogSize ", "190000 ", "11"]),
+		  cline(["TransferDiskLog ", TcTopDir, 
+			 "/logs/access_disk_log_", integer_to_list(Port)]),
+		  cline(["TransferDiskLogSize ", "200000 ", "10"]),
+		  cline(["SecurityDiskLog ", TcTopDir, 
+			 "/logs/security_disk_log_", integer_to_list(Port)]),
+		  cline(["SecurityDiskLogSize ", "210000 ", "9"]),
+		  cline(["MaxClients 10"]),
+		  cline(["MaxHeaderSize ", MaxHdrSz]),
+		  cline(["MaxHeaderAction ", MaxHdrAct]),
+		  cline(["DocumentRoot ", 
+			 filename:join(ServerRoot, "htdocs")]),
+		  cline(["DirectoryIndex ", "index.html ", "welcome.html"]),
+		  cline(["DefaultType ", "text/plain"]),
+		  SSL,
+		  mod_alias_config(ServerRoot),
+		  
+		  config_directory(filename:join([ServerRoot,"htdocs",
+						  "open"]),
+				   "Open Area", 
+				   filename:join(ServerRoot, "auth/passwd"),
+				   filename:join(ServerRoot, "auth/group"),
+				   plain,
+				   "user one Aladdin",
+				   filename:join(ServerRoot, "security_data")),
+		  config_directory(filename:join([ServerRoot,"htdocs", 
+						  "secret"]),
+				   "Secret Area", 
+				   filename:join(ServerRoot, "auth/passwd"),
+				   filename:join(ServerRoot, "auth/group"),
+				   plain,
+				   "group group1 group2",
+				   filename:join(ServerRoot, "security_data")),
+		  config_directory(filename:join([ServerRoot,"htdocs", 
+						  "secret", 
+						  "top_secret"]),
+				   "Top Secret Area", 
+				   filename:join(ServerRoot, "auth/passwd"),
+				   filename:join(ServerRoot, "auth/group"),
+				   plain,
+				   "group group3",
+				   filename:join(ServerRoot, "security_data")),
+		  
+		  config_directory(filename:join([ServerRoot,"htdocs", 
+						  "dets_open"]),
+				   "Dets Open Area", 
+				   filename:join(ServerRoot, "passwd"),
+				   filename:join(ServerRoot, "group"),
+				   dets,
+				   "user one Aladdin",
+				   filename:join(ServerRoot, "security_data")),
+		  config_directory(filename:join([ServerRoot,"htdocs", 
+						  "dets_secret"]),
+			       "Dets Secret Area", 
+				   filename:join(ServerRoot, "passwd"),
+				   filename:join(ServerRoot, "group"),
+				   dets,
+				   "group group1 group2",
+				   filename:join(ServerRoot, "security_data")),
+		  config_directory(filename:join([ServerRoot,"htdocs", 
+						  "dets_secret", 
+						  "top_secret"]),
+				   "Dets Top Secret Area", 
+				   filename:join(ServerRoot, "passwd"),
+				   filename:join(ServerRoot, "group"),
+				   dets,
+				   "group group3",
+				   filename:join(ServerRoot, "security_data")),
+		  
+		  config_directory(filename:join([ServerRoot,"htdocs", 
+						  "mnesia_open"]),
+				   "Mnesia Open Area", 
+				   false,
+				   false,
+				   mnesia,
+				   "user one Aladdin",
+			       filename:join(ServerRoot, "security_data")),
+		  config_directory(filename:join([ServerRoot,"htdocs", 
+						  "mnesia_secret"]),
+				   "Mnesia Secret Area", 
+				   false,
+				   false,
+				   mnesia,
+				   "group group1 group2",
+				   filename:join(ServerRoot, "security_data")),
+		  config_directory(filename:join(
+				     [ServerRoot, "htdocs", "mnesia_secret",
+				      "top_secret"]),
+				   "Mnesia Top Secret Area", 
+				   false,
+				   false,
+				   mnesia,
+				   "group group3",
+				   filename:join(ServerRoot, "security_data"))
+		 ],
+    ConfigFile = filename:join([TcTopDir, FileName]),
+    {ok, Fd} = file:open(ConfigFile, [write]),
+    ok = file:write(Fd, lists:flatten(HttpConfig)),
+    ok = file:close(Fd).
+
+config_directory(Dir, AuthName, AuthUserFile, AuthGroupFile, AuthDBType, 
+		 Require, SF) ->
+    file:delete(SF),
+    [
+     cline(["<Directory ", Dir, ">"]),
+     cline(["SecurityDataFile ", SF]),
+     cline(["SecurityMaxRetries 3"]),
+     cline(["SecurityFailExpireTime ", integer_to_list(?FAIL_EXPIRE_TIME)]),
+     cline(["SecurityBlockTime 1"]),
+     cline(["SecurityAuthTimeout ", integer_to_list(?AUTH_TIMEOUT)]),
+     cline(["SecurityCallbackModule ", "httpd_mod"]),
+     cline_if_set("AuthUserFile", AuthUserFile),
+     cline_if_set("AuthGroupFile", AuthGroupFile),
+     cline_if_set("AuthName", AuthName),
+     cline_if_set("AuthDBType", AuthDBType),
+     cline(["require ", Require]),
+     cline(["</Directory>\r\n"])
+    ].
+
+mod_alias_config(Root) ->
+    [
+     cline(["Alias /icons/ ", filename:join(Root,"icons"), "/"]),
+     cline(["Alias /pics/ ", filename:join(Root, "icons"), "/"]),
+     cline(["ScriptAlias /cgi-bin/ ", filename:join(Root, "cgi-bin"), "/"]),
+     cline(["ScriptAlias /htbin/ ", filename:join(Root, "cgi-bin"), "/"]),
+     cline(["ErlScriptAlias /cgi-bin/erl httpd_example io"]),
+     cline(["EvalScriptAlias /eval httpd_example io"])
+    ].
+
+cline(List) ->
+    lists:flatten([List, "\r\n"]).
+
+cline_if_set(_, false) ->
+    [];
+cline_if_set(Name, Var) when is_list(Var) ->
+    cline([Name, " ", Var]);
+cline_if_set(Name, Var) when is_atom(Var) ->
+    cline([Name, " ", atom_to_list(Var)]).
+
+getaddr() ->
+    {ok,HostName} = inet:gethostname(),
+    {ok,{A1,A2,A3,A4}} = inet:getaddr(HostName,inet),
+    lists:flatten(io_lib:format("~p.~p.~p.~p",[A1,A2,A3,A4])).
+
+start_mnesia(Node) ->
+    case rpc:call(Node, ?MODULE, cleanup_mnesia, []) of
+	ok ->
+	    ok;
+	Other ->
+	    tsf({failed_to_cleanup_mnesia, Other})
+    end,
+    case rpc:call(Node, ?MODULE, setup_mnesia, []) of
+	{atomic, ok} ->
+	    ok;
+	Other2 ->
+	    tsf({failed_to_setup_mnesia, Other2})
+    end,
+    ok.
+
+setup_mnesia() ->
+    setup_mnesia([node()]).
+
+setup_mnesia(Nodes) ->
+    ok = mnesia:create_schema(Nodes),
+    ok = mnesia:start(),
+    {atomic, ok} = mnesia:create_table(httpd_user,
+				       [{attributes, 
+					 record_info(fields, httpd_user)}, 
+					{disc_copies,Nodes}, {type, set}]),
+    {atomic, ok} = mnesia:create_table(httpd_group,
+				       [{attributes, 
+					 record_info(fields,
+						     httpd_group)}, 
+					{disc_copies,Nodes}, {type,bag}]).
+
+cleanup_mnesia() ->
+    mnesia:start(),
+    mnesia:delete_table(httpd_user),
+    mnesia:delete_table(httpd_group),
+    stopped = mnesia:stop(),
+    mnesia:delete_schema([node()]),
+    ok.
+
+create_htaccess_data(Path, IpAddress)->
+    create_htaccess_dirs(Path),
+    
+    create_html_file(filename:join([Path,"ht/open/dummy.html"])),
+    create_html_file(filename:join([Path,"ht/blocknet/dummy.html"])),
+    create_html_file(filename:join([Path,"ht/secret/dummy.html"])),
+    create_html_file(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
+    
+    create_htaccess_file(filename:join([Path,"ht/open/.htaccess"]),
+			 Path, "user one Aladdin"),
+    create_htaccess_file(filename:join([Path,"ht/secret/.htaccess"]),
+			 Path, "group group1 group2"),
+    create_htaccess_file(filename:join([Path,
+				       "ht/secret/top_secret/.htaccess"]),
+			Path, "user four"),
+    create_htaccess_file(filename:join([Path,"ht/blocknet/.htaccess"]),
+			Path, nouser, IpAddress),
+   
+    create_user_group_file(filename:join([Path,"ht","users.file"]),
+			   "one:OnePassword\ntwo:TwoPassword\nthree:"
+			   "ThreePassword\nfour:FourPassword\nAladdin:"
+			   "AladdinPassword"),
+    create_user_group_file(filename:join([Path,"ht","groups.file"]),
+			   "group1: two one\ngroup2: two three").
+
+create_html_file(PathAndFileName)->
+    file:write_file(PathAndFileName,list_to_binary(
+	 "<html><head><title>test</title></head>
+         <body>testar</body></html>")).
+
+create_htaccess_file(PathAndFileName, BaseDir, RequireData)->
+    file:write_file(PathAndFileName,
+		    list_to_binary(
+		      "AuthUserFile "++ BaseDir ++
+		      "/ht/users.file\nAuthGroupFile "++ BaseDir
+		      ++ "/ht/groups.file\nAuthName Test\nAuthType"
+		      " Basic\n<Limit>\nrequire " ++ RequireData ++
+		      "\n</Limit>")).
+
+create_htaccess_file(PathAndFileName, BaseDir, nouser, IpAddress)->
+    file:write_file(PathAndFileName,list_to_binary(
+				      "AuthUserFile "++ BaseDir ++
+				      "/ht/users.file\nAuthGroupFile " ++ 
+				      BaseDir ++ "/ht/groups.file\nAuthName"
+				      " Test\nAuthType"
+				      " Basic\n<Limit GET>\n\tallow from " ++ 
+				      format_ip(IpAddress,
+						string:rchr(IpAddress,$.)) ++ 
+				      "\n</Limit>")).
+
+create_user_group_file(PathAndFileName, Data)->
+    file:write_file(PathAndFileName, list_to_binary(Data)).
+
+create_htaccess_dirs(Path)->
+    ok = file:make_dir(filename:join([Path,"ht"])),
+    ok = file:make_dir(filename:join([Path,"ht/open"])),
+    ok = file:make_dir(filename:join([Path,"ht/blocknet"])),
+    ok = file:make_dir(filename:join([Path,"ht/secret"])),
+    ok = file:make_dir(filename:join([Path,"ht/secret/top_secret"])).
+
+remove_htaccess_dirs(Path)->
+    file:del_dir(filename:join([Path,"ht/secret/top_secret"])),
+    file:del_dir(filename:join([Path,"ht/secret"])),
+    file:del_dir(filename:join([Path,"ht/blocknet"])),
+    file:del_dir(filename:join([Path,"ht/open"])),
+    file:del_dir(filename:join([Path,"ht"])).
+
+format_ip(IpAddress,Pos)when Pos > 0->
+    case lists:nth(Pos,IpAddress) of
+	$.->
+	    case lists:nth(Pos-2,IpAddress) of
+		$.->
+		   format_ip(IpAddress,Pos-3);
+		_->
+		    lists:sublist(IpAddress,Pos-2) ++ "."
+	    end;
+	_ ->
+	    format_ip(IpAddress,Pos-1)
+    end;
+
+format_ip(IpAddress, _Pos)->
+    "1" ++ IpAddress.
+
+remove_htaccess(Path)->
+    file:delete(filename:join([Path,"ht/open/dummy.html"])),
+    file:delete(filename:join([Path,"ht/secret/dummy.html"])),
+    file:delete(filename:join([Path,"ht/secret/top_secret/dummy.html"])),
+    file:delete(filename:join([Path,"ht/blocknet/dummy.html"])),
+    file:delete(filename:join([Path,"ht/blocknet/.htaccess"])),
+    file:delete(filename:join([Path,"ht/open/.htaccess"])),
+    file:delete(filename:join([Path,"ht/secret/.htaccess"])),
+    file:delete(filename:join([Path,"ht/secret/top_secret/.htaccess"])),
+    file:delete(filename:join([Path,"ht","users.file"])),
+    file:delete(filename:join([Path,"ht","groups.file"])),
+    remove_htaccess_dirs(Path).
+
+
+dos_hostname_poll(Type, Host, Port, Node, Hosts) ->
+    [dos_hostname_poll1(Type, Host, Port, Node, Host1, Code)
+     || {Host1,Code} <- Hosts].
+
+dos_hostname_poll1(Type, Host, Port, Node, Host1, Code) ->
+    ok = httpd_test_lib:verify_request(Type, Host, Port, Node, 
+				       dos_hostname_request(Host1),
+				       [{statuscode, Code},
+					{version, "HTTP/1.0"}]).
+        
+dos_hostname_request(Host) ->
+    "GET / HTTP/1.0\r\n" ++ Host ++ "\r\n\r\n".
+
+get_nof_clients(Mode, Load) ->
+    get_nof_clients(test_server:os_type(), Mode, Load).
+
+get_nof_clients(_,       ip_comm, light)  -> 5;
+get_nof_clients(_,       ssl,     light)  -> 2;
+get_nof_clients(_,       ip_comm, medium) -> 10;
+get_nof_clients(_,       ssl,     medium) -> 4;
+get_nof_clients(_,       ip_comm, heavy)  -> 20;
+get_nof_clients(_,       ssl,     heavy)  -> 6.
+
+%% Make a file 100 bytes long containing 012...9*10
+create_range_data(Path) ->
+    PathAndFileName=filename:join([Path,"range.txt"]),
+    file:write_file(PathAndFileName,list_to_binary(["12345678901234567890",
+						   "12345678901234567890",
+						   "12345678901234567890",
+						   "12345678901234567890",
+						   "12345678901234567890"])).
+
+create_ipv6_config(Config, FileName, Ipv6Address) ->
+    ServerRoot = ?config(server_root, Config),
+    TcTopDir   = ?config(tc_top_dir,  Config),
+    Port       = ?config(port,        Config),
+    SockType   = ?config(sock_type,   Config),
+    Mods       = io_lib:format("~p",  [httpd_mod]),
+    Funcs      = io_lib:format("~p",  [ssl_password_cb]),
+    Host       = ?config(ipv6_host,   Config),
+
+    MaxHdrSz     = io_lib:format("~p", [256]),
+    MaxHdrAct    = io_lib:format("~p", [close]),
+  
+    Mod_order = "Modules mod_alias mod_auth mod_esi mod_actions mod_cgi" 
+	" mod_include mod_dir mod_get mod_head" 
+	" mod_log mod_disk_log mod_trace",
+	    
+    SSL =
+	if
+	    (SockType =:= ssl)  orelse 
+	    (SockType =:= essl) ->
+		[cline(["SSLCertificateFile ", 
+			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
+		 cline(["SSLCertificateKeyFile ",
+			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
+		 cline(["SSLCACertificateFile ",
+			filename:join(ServerRoot, "ssl/ssl_server.pem")]),
+		 cline(["SSLPasswordCallbackModule ", Mods]),
+		 cline(["SSLPasswordCallbackFunction ", Funcs]),
+		 cline(["SSLVerifyClient 0"]),
+		 cline(["SSLVerifyDepth 1"])];
+	    true ->
+		[]
+	end,
+
+    BindAddress = "[" ++ Ipv6Address ++"]|inet6", 
+
+    HttpConfig = 
+	[cline(["BindAddress ", BindAddress]),
+	 cline(["Port ", integer_to_list(Port)]),
+	 cline(["ServerName ", Host]),
+	 cline(["SocketType ", atom_to_list(SockType)]),
+	 cline([Mod_order]),
+	 cline(["ServerRoot ", ServerRoot]),
+	 cline(["DocumentRoot ", filename:join(ServerRoot, "htdocs")]),
+	 cline(["MaxHeaderSize ",MaxHdrSz]),
+	 cline(["MaxHeaderAction ",MaxHdrAct]),
+	 cline(["DirectoryIndex ", "index.html "]),
+	 cline(["DefaultType ", "text/plain"]), 
+	 SSL],
+    ConfigFile = filename:join([TcTopDir,FileName]),
+    {ok, Fd} = file:open(ConfigFile, [write]),
+    ok = file:write(Fd, lists:flatten(HttpConfig)),
+    ok = file:close(Fd).
+
+
+tsp(F) ->
+    inets_test_lib:tsp("[~w]" ++ F, [?MODULE]).
+tsp(F, A) ->
+    inets_test_lib:tsp("[~w]" ++ F, [?MODULE|A]).
+
+tsf(Reason) ->
+    inets_test_lib:tsf(Reason).
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/Makefile.src b/lib/inets/test/old_httpd_SUITE_data/Makefile.src
new file mode 100644
index 0000000000..b0fdb43d8d
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/Makefile.src
@@ -0,0 +1,14 @@
+CC = @CC@
+LD = @LD@
+CFLAGS = @CFLAGS@ -I@erl_include@ @DEFS@
+CROSSLDFLAGS = @CROSSLDFLAGS@
+
+PROGS = cgi_echo@exe@
+
+all: $(PROGS)
+
+cgi_echo@exe@: cgi_echo@obj@
+	$(LD) $(CROSSLDFLAGS) -o cgi_echo cgi_echo@obj@ @LIBS@
+
+cgi_echo@obj@: cgi_echo.c
+	$(CC) -c -o cgi_echo@obj@ $(CFLAGS) cgi_echo.c
diff --git a/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c b/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c
new file mode 100644
index 0000000000..580f860e96
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/cgi_echo.c
@@ -0,0 +1,97 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#if defined __WIN32__
+#include <windows.h> 
+#include <fcntl.h>
+#endif
+
+static int read_exact(char *buffer, int len);
+static int write_exact(char *buffer, int len);
+
+int main(void)
+{
+    char msg[100];
+    int msg_len;
+#ifdef __WIN32__
+    _setmode(_fileno( stdin),  _O_BINARY);
+    _setmode(_fileno( stdout), _O_BINARY);
+#endif    
+    msg_len = read_exact(msg, 100);
+
+    write_exact("Content-type: text/plain\r\n\r\n", 28);
+    write_exact(msg, msg_len);
+    exit(EXIT_SUCCESS);
+}
+  
+
+/* read from stdin */ 
+#ifdef __WIN32__
+static int read_exact(char *buffer, int len)
+{
+    HANDLE standard_input = GetStdHandle(STD_INPUT_HANDLE);
+    
+    unsigned read_result;
+    unsigned sofar = 0;
+    
+    if (!len) { /* Happens for "empty packages */
+	return 0;
+    }
+    for (;;) {
+	if (!ReadFile(standard_input, buffer + sofar,
+		      len - sofar, &read_result, NULL)) {
+	    return -1; /* EOF */
+	}
+	if (!read_result) {
+	    return -2; /* Interrupted while reading? */
+	}
+	sofar += read_result;
+	if (sofar == len) {
+	    return len;
+	}
+    }
+} 
+#else
+static int read_exact(char *buffer, int len) {
+    int i, got = 0;
+    
+    do {
+	if ((i = read(0, buffer + got, len - got)) <= 0)
+	    return(i);
+	got += i;
+    } while (got < len);
+    return len;
+   
+}
+#endif
+
+/* write to stdout */
+#ifdef __WIN32__
+ static int write_exact(char *buffer, int len)
+   {
+     HANDLE standard_output = GetStdHandle(STD_OUTPUT_HANDLE);
+     unsigned written;
+
+     if (!WriteFile(standard_output, buffer, len, &written, NULL)) {
+       return -1; /* Broken Pipe */
+     }
+     if (written < ((unsigned) len)) {
+       /* This should not happen, standard output is not blocking? */
+       return -2;
+     }
+
+    return (int) written;
+}
+
+#else 
+ static int write_exact(char *buffer, int len) {
+   int i, wrote = 0;
+
+   do {
+     if ((i = write(1, buffer + wrote, len - wrote)) <= 0)
+       return i;
+     wrote += i;
+   } while (wrote < len);
+   return len;
+ }
+#endif
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/Makefile b/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
index d7a3231068..d7a3231068 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/Makefile
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/Makefile
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group
new file mode 100644
index 0000000000..b3da0ccbd3
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/group
@@ -0,0 +1,3 @@
+group1: one two
+group2: two three
+group3: three Aladdin
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd
new file mode 100644
index 0000000000..8c980ff547
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/auth/passwd
@@ -0,0 +1,4 @@
+one:onePassword
+two:twoPassword
+three:threePassword
+Aladdin:AladdinPassword
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat
new file mode 100644
index 0000000000..25a49a1536
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.bat
@@ -0,0 +1,9 @@
+@echo off
+echo tomrad > c:\cygwin\tmp\hej
+echo Content-type: text/html
+echo.
+echo ^<HTML^> ^<HEAD^> ^<TITLE^>OS Environment^</TITLE^> ^</HEAD^> ^<BODY^>^<PRE^>
+set
+echo ^</PRE^>^</BODY^>^</HTML^>
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh
new file mode 100755
index 0000000000..de81de9bde
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/cgi-bin/printenv.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+echo "Content-type: text/html"
+echo ""
+echo "<HTML> <HEAD> <TITLE>OS Environment</TITLE> </HEAD> <BODY><PRE>"
+env
+echo "</PRE></BODY></HTML>"
\ No newline at end of file
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/conf/8080.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
index 48e66f0114..48e66f0114 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/conf/8080.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8080.conf
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/conf/8888.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
index 79bb7fcca4..79bb7fcca4 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/conf/8888.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/8888.conf
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/conf/httpd.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
index ceb94237d2..ceb94237d2 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/conf/httpd.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/httpd.conf
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/conf/mime.types b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types
index d2f81e4e5e..d2f81e4e5e 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/conf/mime.types
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/mime.types
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/conf/ssl.conf b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
index 8b8c57a98b..8b8c57a98b 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/conf/ssl.conf
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/conf/ssl.conf
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml
new file mode 100644
index 0000000000..107e3ff610
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/config.shtml
@@ -0,0 +1,70 @@
+<HTML>
+<HEAD>
+<TITLE>/ssi.html (17-Apr-1997)</TITLE>
+</HEAD>
+<BODY>
+<H1>/ssi.html</H1>
+
+<!-- ************* CONFIG ************* -->
+
+<!--#config timefmt="%a %b %e %T %Z %Y" sizefmt="abbrev"-->
+<!--#config errmsg="[an especially ugly error occurred while processing this directive]"-->
+
+<!-- ************* INCLUDE ************* -->
+
+<P>Include /misc/friedrich.html:
+<!--#include virtual="/misc/friedrich.html"-->
+<P>Include /misc/not_defined.html: <!--#include virtual="/misc/not_defined.html"-->
+<P>Include misc/friedrich.html:
+<!--#include file="misc/friedrich.html"-->
+<P>Include not_defined.html: <!--#include file="not_defined.html"-->
+
+<P><HR>
+
+<!-- ************* ECHO ************* -->
+
+<P>DOCUMENT_NAME: <!--#echo var="DOCUMENT_NAME"-->
+<P>DOCUMENT_URI: <!--#echo var="DOCUMENT_URI"-->
+<P>QUERY_STRING_UNESCAPED: <!--#echo var="QUERY_STRING_UNESCAPED"-->
+<P>DATE_LOCAL: <!--#echo var="DATE_LOCAL"-->
+<P>DATE_GMT: <!--#echo var="DATE_GMT"-->
+<P>LAST_MODIFIED: <!--#echo var="LAST_MODIFIED"-->
+<P>NOT_DEFINED: <!--#echo var="NOT_DEFINED"-->
+
+<P><HR>
+
+<!-- ************* FSIZE ************* -->
+
+<P>Size of index.html: <!--#fsize file="index.html"-->
+<P>Size of not_defined.html: <!--#fsize file="not_defined.html"-->
+<!--#config sizefmt="bytes"-->
+<P>Size of /misc/friedrich.html: <!--#fsize virtual="/misc/friedrich.html"-->
+<P>Size of /misc/not_defined.html: <!--#fsize virtual="/misc/not_defined.html"-->
+
+<P><HR>
+
+<!-- ************* FLASTMOD ************* -->
+
+<P>Last modification of index.html: <!--#flastmod file="index.html"-->
+<P>Last modification of not_defined.html: <!--#flastmod file="not_defined.html"-->
+<P>Last modification of /misc/friedrich.html: <!--#flastmod virtual="/misc/friedrich.html"-->
+<P>Last modification of /misc/not_defined.html: <!--#flastmod virtual="/misc/not_defined.html"-->
+
+<!--#exec cmd="ls"-->
+<!--#exec cmd="printenv"-->
+<!--#exec cmd="sunemaja"-->
+
+<!--#exec cgi="/cgi-bin/printenv.sh"-->
+
+</BODY>
+</HTML>
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html
new file mode 100644
index 0000000000..a6e8a35a04
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_open/dummy.html
@@ -0,0 +1,10 @@
+<HTML>
+<HEAD>
+<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
+<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
+<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
+</HEAD>
+<BODY>
+<H1>/open/dummy.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html
new file mode 100644
index 0000000000..016b04e540
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/dummy.html
@@ -0,0 +1,10 @@
+<HTML>
+<HEAD>
+<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
+<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
+<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
+</HEAD>
+<BODY>
+<H1>/secret/dummy.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html
new file mode 100644
index 0000000000..34db3d5d1a
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/dets_secret/top_secret/index.html
@@ -0,0 +1,9 @@
+<HTML>
+<HEAD>
+<TITLE>/secret/top_secret/index.html (04-Feb-1998)</TITLE>
+<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
+</HEAD>
+<BODY>
+<H1>/secret/top_secret/index.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml
new file mode 100644
index 0000000000..141db5be59
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/echo.shtml
@@ -0,0 +1,35 @@
+<HTML>
+<HEAD>
+<TITLE>/echo.shtml</TITLE>
+</HEAD>
+<BODY>
+<H1>/echo.shtml</H1>
+
+<P>DOCUMENT_NAME: <!--#echo var="DOCUMENT_NAME"-->
+
+<P>DOCUMENT_URI: <!--#echo var="DOCUMENT_URI"-->
+
+<P>QUERY_STRING_UNESCAPED: <!--#echo var="QUERY_STRING_UNESCAPED"-->
+
+<P>DATE_LOCAL: <!--#echo var="DATE_LOCAL"-->
+
+<P>DATE_GMT: <!--#echo var="DATE_GMT"-->
+
+<P>LAST_MODIFIED: <!--#echo var="LAST_MODIFIED"-->
+
+<P>NOT_DEFINED: <!--#echo var="NOT_DEFINED"-->
+
+<P>[<A HREF="ssi.html">Back</A>]
+
+</BODY>
+</HTML>
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml
new file mode 100644
index 0000000000..97333da898
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/exec.shtml
@@ -0,0 +1,30 @@
+<HTML>
+<HEAD>
+<TITLE>/exec.shtml</TITLE>
+</HEAD>
+<BODY>
+<H1>/exec.shtml</H1>
+<PRE>
+<!--#exec cmd="ls"-->
+<HR>
+<!--#exec cmd="printenv"-->
+<HR>
+<!--#exec cmd="sunemaja"-->
+<HR>
+<!--#exec cgi="/cgi-bin/printenv.sh"-->
+</PRE>
+
+<P>[<A HREF="ssi.html">Back</A>]
+
+</BODY>
+</HTML>
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml
new file mode 100644
index 0000000000..d54c36fe50
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/flastmod.shtml
@@ -0,0 +1,29 @@
+<HTML>
+<HEAD>	
+<TITLE>/flastmod.shtml</TITLE>
+</HEAD>
+<BODY>
+<H1>/flastmod.shtml</H1>
+
+<P>Last modification of index.html: <!--#flastmod file="index.html"-->
+
+<P>Last modification of not_defined.html: <!--#flastmod file="not_defined.html"-->
+
+<P>Last modification of /misc/friedrich.html: <!--#flastmod virtual="/misc/friedrich.html"-->
+
+<P>Last modification of /misc/not_defined.html: <!--#flastmod virtual="/misc/not_defined.html"-->
+
+<P>[<A HREF="ssi.html">Back</A>]
+
+</BODY>
+</HTML>
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml
new file mode 100644
index 0000000000..570ee9cf6d
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/fsize.shtml
@@ -0,0 +1,29 @@
+<HTML>
+<HEAD>
+<TITLE>/fsize.shtml</TITLE>
+</HEAD>
+<BODY>
+<H1>/fsize.shtml</H1>
+
+<P>Size of index.html: <!--#fsize file="index.html"-->
+
+<P>Size of not_defined.html: <!--#fsize file="not_defined.html"-->
+
+<P>Size of /misc/friedrich.html: <!--#fsize virtual="/misc/friedrich.html"-->
+
+<P>Size of /misc/not_defined.html: <!--#fsize virtual="/misc/not_defined.html"-->
+
+<P>[<A HREF="ssi.html">Back</A>]
+
+</BODY>
+</HTML>
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml
new file mode 100644
index 0000000000..529aad0437
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/include.shtml
@@ -0,0 +1,33 @@
+<HTML>
+<HEAD>	
+<TITLE>/include.shtml</TITLE>
+</HEAD>
+<BODY>
+<H1>/include.shtml</H1>
+
+<P>Include /misc/friedrich.html:
+<!--#include virtual="/misc/friedrich.html"-->
+
+<P>Include /misc/not_defined.html:
+<!--#include virtual="/misc/not_defined.html"-->
+
+<P>Include misc/friedrich.html:
+<!--#include file="misc/friedrich.html"-->
+
+<P>Include not_defined.html:
+<!--#include file="not_defined.html"-->
+
+<P>[<A HREF="ssi.html">Back</A>]
+
+</BODY>
+</HTML>
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html
new file mode 100644
index 0000000000..cfdc9f9ab7
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/index.html
@@ -0,0 +1,25 @@
+<HTML>
+<HEAD>
+<TITLE>/index.html</TITLE>
+</HEAD>
+<BODY>
+<H1>/index.html</H1>
+
+<STRONG>Server-Side Include (SSI) commands:</STRONG><BR>
+<A HREF="config.shtml">config</A><BR>
+<A HREF="echo.shtml">echo</A><BR>
+<A HREF="exec.shtml">exec</A><BR>
+<A HREF="flastmod.shtml">flastmod</A><BR>
+<A HREF="fsize.shtml">fsize</A><BR>
+<A HREF="include.shtml">include</A><BR>
+
+<BR>
+<BR>
+
+<STRONG>ESI callback:</STRING><BR>
+<A HREF="cgi-bin/erl/httpd_example/get">cgi-bin/erl/httpd_example/get</A><BR>
+<A HREF="cgi-bin/erl/httpd_example/yahoo">cgi-bin/erl/httpd_example/yahoo</A><BR>
+<A HREF="cgi-bin/erl/httpd_example/test1">cgi-bin/erl/httpd_example/test1</A><BR>
+
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html
new file mode 100644
index 0000000000..65c1790813
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/last_modified.html
@@ -0,0 +1,22 @@
+<HTML>
+<HEAD>
+<TITLE>/last_modified.html</TITLE>
+</HEAD>
+<BODY>
+<H1>/last_modified.html</H1>
+
+<P>This document is only used for test of illegal last-modified date.</P>
+
+
+</BODY>
+</HTML>
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html
new file mode 100644
index 0000000000..d7953d5df4
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/friedrich.html
@@ -0,0 +1,7 @@
+<P><CITE>
+Talking much about oneself can also be a means to conceal oneself.<BR>
+-- Friedrich Nietzsche
+</CITE>
+
+<P>Nested Include:
+<!--#include file="misc/oech.html"-->
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html
new file mode 100644
index 0000000000..506064bf04
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/oech.html
@@ -0,0 +1,4 @@
+<P><CITE>
+What excuses stand in your way?  How can you eliminate them?<BR>
+-- Roger von Oech
+</CITE>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html
new file mode 100644
index 0000000000..8c17451f91
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/misc/welcome.html
@@ -0,0 +1 @@
+<HTML></HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html
new file mode 100644
index 0000000000..a6e8a35a04
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_open/dummy.html
@@ -0,0 +1,10 @@
+<HTML>
+<HEAD>
+<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
+<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
+<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
+</HEAD>
+<BODY>
+<H1>/open/dummy.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html
new file mode 100644
index 0000000000..016b04e540
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/dummy.html
@@ -0,0 +1,10 @@
+<HTML>
+<HEAD>
+<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
+<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
+<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
+</HEAD>
+<BODY>
+<H1>/secret/dummy.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html
new file mode 100644
index 0000000000..2d17e8b596
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/mnesia_secret/top_secret/index.html
@@ -0,0 +1,9 @@
+<HTML>
+<HEAD>
+<TITLE>/mnesia_secret/top_secret/index.html (04-Feb-1998)</TITLE>
+<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
+</HEAD>
+<BODY>
+<H1>/mnesia_secret/top_secret/index.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html
new file mode 100644
index 0000000000..a6e8a35a04
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/open/dummy.html
@@ -0,0 +1,10 @@
+<HTML>
+<HEAD>
+<TITLE>/open/dummy.html (17-Apr-1997)</TITLE>
+<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
+<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
+</HEAD>
+<BODY>
+<H1>/open/dummy.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html
new file mode 100644
index 0000000000..016b04e540
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/dummy.html
@@ -0,0 +1,10 @@
+<HTML>
+<HEAD>
+<TITLE>/secret/dummy.html (17-Apr-1997)</TITLE>
+<!-- Created by: Joakim Greben�, 17-Apr-1997 -->
+<!-- Changed by: Joakim Greben�, 17-Apr-1997 -->
+</HEAD>
+<BODY>
+<H1>/secret/dummy.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html
new file mode 100644
index 0000000000..34db3d5d1a
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/htdocs/secret/top_secret/index.html
@@ -0,0 +1,9 @@
+<HTML>
+<HEAD>
+<TITLE>/secret/top_secret/index.html (04-Feb-1998)</TITLE>
+<!-- Created by: Mattias Nilsson, 04-Feb-1998 -->
+</HEAD>
+<BODY>
+<H1>/secret/top_secret/index.html</H1>
+</BODY>
+</HTML>
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/icons/README b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README
index a1fc5a5a9c..a1fc5a5a9c 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/icons/README
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/README
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif
new file mode 100644
index 0000000000..bb23d971f4
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/a.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif
new file mode 100644
index 0000000000..eaecd2172a
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.black.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif
new file mode 100644
index 0000000000..a423894043
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/alert.red.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif
new file mode 100644
index 0000000000..3a1c139fc4
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/apache_pb.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif
new file mode 100644
index 0000000000..a694ae1ec3
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/back.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif
new file mode 100644
index 0000000000..eb84268c4c
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.gray.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif
new file mode 100644
index 0000000000..a8425cb574
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ball.red.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif
new file mode 100644
index 0000000000..9a15cbae04
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binary.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif
new file mode 100644
index 0000000000..62d0363108
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/binhex.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif
new file mode 100644
index 0000000000..0ccf01e198
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/blank.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif
new file mode 100644
index 0000000000..270fdb1c06
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/bomb.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif
new file mode 100644
index 0000000000..65dcd002ea
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif
new file mode 100644
index 0000000000..c43bc4faec
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/box2.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif
new file mode 100644
index 0000000000..9f8cbe9f76
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/broken.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif
new file mode 100644
index 0000000000..fbdcf575f7
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/burst.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif
new file mode 100644
index 0000000000..eb97cb7333
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif
new file mode 100644
index 0000000000..fe0c97998c
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button10.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif
new file mode 100644
index 0000000000..7698455bf9
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button2.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif
new file mode 100644
index 0000000000..a8b8319232
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button3.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif
new file mode 100644
index 0000000000..0fd15a0d7f
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button4.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif
new file mode 100644
index 0000000000..64241e5c5d
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button5.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif
new file mode 100644
index 0000000000..867cfd1212
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button6.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif
new file mode 100644
index 0000000000..b3f5fb248f
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button7.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif
new file mode 100644
index 0000000000..7a308be8f6
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button8.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif
new file mode 100644
index 0000000000..9acba576c0
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/button9.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif
new file mode 100644
index 0000000000..3883088e7a
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonl.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif
new file mode 100644
index 0000000000..c4dc3887db
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/buttonr.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif
new file mode 100644
index 0000000000..7555b6c164
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/c.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif
new file mode 100644
index 0000000000..f8d76a8c23
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.blue.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif
new file mode 100644
index 0000000000..7664cd0364
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/comp.gray.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif
new file mode 100644
index 0000000000..39e732739f
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/compressed.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif
new file mode 100644
index 0000000000..b0ffb7e0cc
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/continued.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif
new file mode 100644
index 0000000000..48264601ae
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dir.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif
new file mode 100644
index 0000000000..a354c871cd
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/down.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif
new file mode 100644
index 0000000000..791be33105
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/dvi.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif
new file mode 100644
index 0000000000..fbe353c282
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/f.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif
new file mode 100644
index 0000000000..48264601ae
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif
new file mode 100644
index 0000000000..30979cb528
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.open.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif
new file mode 100644
index 0000000000..75332d9e59
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/folder.sec.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif
new file mode 100644
index 0000000000..b2959b4c85
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/forward.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif
new file mode 100644
index 0000000000..de60b2940f
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif
new file mode 100644
index 0000000000..94743981d9
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.red.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif
new file mode 100644
index 0000000000..88d5240c3c
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/generic.sec.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif
new file mode 100644
index 0000000000..5cdbc7206d
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.right.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif
new file mode 100644
index 0000000000..85a5d68317
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/hand.up.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif
new file mode 100644
index 0000000000..35443fb63a
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/htdig.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif
new file mode 100644
index 0000000000..ad1686e448
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/icon.sheet.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif
new file mode 100644
index 0000000000..01e442bfa9
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif
new file mode 100644
index 0000000000..751faeea36
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image2.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif
new file mode 100644
index 0000000000..4f30484ff6
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/image3.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif
new file mode 100644
index 0000000000..162478fb3a
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/index.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif
new file mode 100644
index 0000000000..c96338a152
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/layout.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif
new file mode 100644
index 0000000000..279e6710d4
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/left.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif
new file mode 100644
index 0000000000..c5b6889a76
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/link.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif
new file mode 100644
index 0000000000..0035183774
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/movie.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif
new file mode 100644
index 0000000000..7b917b4e91
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/p.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif
new file mode 100644
index 0000000000..39bc90e795
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/patch.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif
new file mode 100644
index 0000000000..c88fd777c4
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pdf.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif
new file mode 100644
index 0000000000..6f7a0ae7a7
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie0.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif
new file mode 100644
index 0000000000..03aa6be71e
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif
new file mode 100644
index 0000000000..b04c5e0908
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie2.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif
new file mode 100644
index 0000000000..4db9d023ed
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie3.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif
new file mode 100644
index 0000000000..93471fdd88
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie4.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif
new file mode 100644
index 0000000000..57aee93f07
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie5.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif
new file mode 100644
index 0000000000..0dc327b569
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie6.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif
new file mode 100644
index 0000000000..8661337f06
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie7.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif
new file mode 100644
index 0000000000..59ddb34ce0
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/pie8.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif
new file mode 100644
index 0000000000..0e6e506e00
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/portal.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif
new file mode 100644
index 0000000000..d324ab80ea
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/poweredby.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif
new file mode 100644
index 0000000000..0f565bc1db
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/ps.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif
new file mode 100644
index 0000000000..818a5cdc7e
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/quill.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif
new file mode 100644
index 0000000000..b256e5f75f
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/right.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif
new file mode 100644
index 0000000000..af6ba2b097
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif
new file mode 100644
index 0000000000..06dccb3e44
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/screw2.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif
new file mode 100644
index 0000000000..d8a853bc58
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/script.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif
new file mode 100644
index 0000000000..8efb49f55d
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif
new file mode 100644
index 0000000000..48e6a7fb2f
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sound2.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif
new file mode 100644
index 0000000000..7067070da2
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif
new file mode 100644
index 0000000000..a9e462a377
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/sphere2.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif
new file mode 100644
index 0000000000..4cfe0a5e0f
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif
new file mode 100644
index 0000000000..a0c83cb85b
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/star_blank.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif
new file mode 100644
index 0000000000..617e779efa
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tar.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif
new file mode 100644
index 0000000000..45e43233b8
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/tex.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif
new file mode 100644
index 0000000000..4c623909fb
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/text.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif
new file mode 100644
index 0000000000..33697dbb66
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/transfer.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif
new file mode 100644
index 0000000000..32b1ea23fb
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/unknown.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif
new file mode 100644
index 0000000000..6d6d6d1ebf
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/up.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif
new file mode 100644
index 0000000000..4387d529f6
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uu.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif
new file mode 100644
index 0000000000..4387d529f6
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/uuencoded.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif
new file mode 100644
index 0000000000..05b4ec2058
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world1.gif
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif
new file mode 100644
index 0000000000..e3203f7a88
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/icons/world2.gif
diff --git a/lib/inets/test/httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip b/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip
index 8d1c8b69c3..8d1c8b69c3 100644
--- a/lib/inets/test/httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/logs/Dummy_File_Needed_By_WinZip
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem
new file mode 100644
index 0000000000..427447958d
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_client.pem
@@ -0,0 +1,31 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSVwC+n
+0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53h2Zr
+3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwIDAQAB
+AoGACdIVYe/LTeydUihtInC8lZ2QuPgJmoBNocRjqJFipEihoL4scHAx25n1bBvB
+I0HZphffzBkGp28oBAtl2LRPWXqu527unc/RWRfLMqSK1xNSq1DxD1a30zkrZPna
+QiV65vEJuNSJTtlDy/Zqc/BVZXCpxWlzYQedZgkmf0Qse8ECQQCmaz02Yur8zC9f
+eSQKU5OSzGw3bSIumEzziCfHdTheK6MEoccf5TCAyLXhZwA7QlKja4tFXfeyVxws
+/LlnUJN9AkEA4j+xnOeYUyGKXL5i+BAbnqpI4MzPiq+IoCYkaRlD/wAws24r5HNI
+ZQmEHWqD/NNzOf/A2XuyLtMiTGJPW/DftwJBAKKpJP6Ytuh6xz8BUCnLwO12Y7vV
+LtjuQiCzD3aUa5EYA9HOMqxJPxxRkf0LyR0i2VUkE8+sZiPpov+R0cJa7p0CQQCj
+40GUiArGRSiF7/+e84QeVfl+pb29F1QftiFv5DZmFEwy3Z572KpbTh5edJbxYHY6
+UDHxGHJFCvnwXNJhpkVXAkBJqfEfiMJ3Q/E5Gpf3sQizacouW92iiN8ojlF1oB80
+t34RysJH7SgI3gdMhTribCo2UUaV0StjR6yodPN+TB2J
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIChzCCAfCgAwIBAgIGAIsapa8BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
+BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
+BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
+VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
+MDAwWjB7MQ8wDQYDVQQDEwZjbGllbnQxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
+cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
+VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCTFBPkOO98fDY3j6MIxIGKp+rampfIay50Lx4+EnCnRSSV
+wC+n0VVmP7V5SGFJpuXJzN0hvqPUWOOjiMTNlNRaGy0pqu2oMXWAPLOxHWL1wT53
+h2Zr3FUNU/N0Rvnkttse1KZJ9uYCLKUiuXXsv2rR62nH3OhRIiBHSAcSv0NRWwID
+AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAG8t6f1A
+PF7xayGxtUpG2r6W5ETylC3ZIKPS2kfJk9aYi7AZNTp7/xTU6SgqvFBN8aBPzxCD
+4jHrSNC8DSb4X1x9uimarb6qdZDHEdij+DRAd2eygJHZxEf7+8B4Fx34thQeU9hZ
+S1Izke5AlsyFMkvB7h0anE4k9BfuU70vl6v5
+-----END CERTIFICATE-----
diff --git a/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem
new file mode 100644
index 0000000000..4aac86db49
--- /dev/null
+++ b/lib/inets/test/old_httpd_SUITE_data/server_root/ssl/ssl_server.pem
@@ -0,0 +1,31 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9Adq6
+7k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ4UAt
+NHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQIDAQAB
+AoGAQIlma0r6W6bcRj4+Wd4fXCFvHuq5Psu1fYEeC5Yvz8761xVjjSfbrDHJZ9pm
+FjOEgedK+s5lbDXqYVyjbdyZSugStBRocSmbG8SQHcAsxR2ZIkNzX2hYzB+lslWo
+T3YJojDyB134O7XJznCu+ZFXP86jyJ1JT6k6a+OIHcwnJ+ECQQDYn57dY4Px3mEd
+VBLStN3YkRF5oFyT+xk7IaKeLLB6n4gCnoVbBoHut7PFbPYPzoNzEwPk3MQKDIHb
+Kig3S5CpAkEAvPA1VmoJWAlN6kUi+F2L8HXEArzE8x7vwdsslrwMKUe4dFS+ZC/7
+5iDOaxcZ7TYkCgwzBt341++DCgP6j3fY1QJBALB6AcOcwi52m6l4B8mu3ZkEPjdX
+BHTuONTqhv/TqoaLlxODL2NDvvDKqeMp7KBd/srt79swW2lQXS4+fvrlTdkCQQCm
+zxj4O1QWkthkfje6ubSkTwUIOatUzrp1F9GNH2dJRtX2dx9FCwxGCC7WY6XzRXqa
+GF0wsedSllbGD+82nWQlAkAicMGqCqRq4hKR/cVmFatOqKVWCVkx6OFF2FhuiI5Z
+h5eIOPGCt8dVRs1P9DNSld/D98Sfm65m85z8BtXovvYV
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIChzCCAfCgAwIBAgIGANUxXM9BMA0GCSqGSIb3DQEBBQUAMHoxDjAMBgNVBAMT
+BW90cENBMSAwHgYJKoZIhvcNAQkBFhF0ZXN0ZXJAZXJsYW5nLm9yZzESMBAGA1UE
+BxMJU3RvY2tob2xtMQswCQYDVQQGEwJTRTEPMA0GA1UEChMGZXJsYW5nMRQwEgYD
+VQQLEwt0ZXN0aW5nIGRlcDAiGA8yMDEwMDkwMTAwMDAwMFoYDzIwMjUwODI4MDAw
+MDAwWjB7MQ8wDQYDVQQDEwZzZXJ2ZXIxIDAeBgkqhkiG9w0BCQEWEXRlc3RlckBl
+cmxhbmcub3JnMRIwEAYDVQQHEwlTdG9ja2hvbG0xCzAJBgNVBAYTAlNFMQ8wDQYD
+VQQKEwZlcmxhbmcxFDASBgNVBAsTC3Rlc3RpbmcgZGVwMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQCf4Htxr99lLs5W8QQw7jdakqyAkIjOW4aqH8sr4va4SvZ9
+Adq67k8jMHefCVZo+F8x4cwsBgB4aWzFIGBnvFTi6YsH27XW7f9O9IPCej8fdhRZ
+4UAtNHa253buOWpDGla2JmIdkmfFvXFJycMIKbG5tYilVXoWKBMKmCwWaXz0nQID
+AQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAGF5Pfwk
+QDdwJup/mVITPxbBls4Yl7anDooUQsq8066lA1g54H/PRfXscGkyCFGh1ifXvf1L
+psMRoBAdDHL/wSJplk3rRavkC94eBgnTFZmfKL6844g1j53yameiYL8IEVExYMBg
+/XGyc0qwq57WT8B/K4aElrvlBlQ0wF3wN54M
+-----END CERTIFICATE-----
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 3f464c8684..cccfb7a44f 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2001-2013. All Rights Reserved.
+# Copyright Ericsson AB 2001-2014. All Rights Reserved.
 # 
 # The 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 = inets
-INETS_VSN   = 5.9.5
+INETS_VSN   = 5.9.8
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
 
diff --git a/lib/jinterface/doc/src/book.xml b/lib/jinterface/doc/src/book.xml
index ce40510643..498fdbfd63 100644
--- a/lib/jinterface/doc/src/book.xml
+++ b/lib/jinterface/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/doc/src/fascicules.xml b/lib/jinterface/doc/src/fascicules.xml
index 099e50c332..4f04be0515 100644
--- a/lib/jinterface/doc/src/fascicules.xml
+++ b/lib/jinterface/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/jinterface/doc/src/jinterface.xml b/lib/jinterface/doc/src/jinterface.xml
index bf3a531749..d8f6183bd8 100644
--- a/lib/jinterface/doc/src/jinterface.xml
+++ b/lib/jinterface/doc/src/jinterface.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/doc/src/jinterface_users_guide.xml b/lib/jinterface/doc/src/jinterface_users_guide.xml
index 7865a0cab4..5dfe5c0c6d 100644
--- a/lib/jinterface/doc/src/jinterface_users_guide.xml
+++ b/lib/jinterface/doc/src/jinterface_users_guide.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -112,6 +112,10 @@
         <cell align="left" valign="middle"><seealso marker="java/com/ericsson/otp/erlang/OtpErlangTuple">OtpErlangTuple</seealso></cell>
       </row>
       <row>
+        <cell align="left" valign="middle">map</cell>
+        <cell align="left" valign="middle"><seealso marker="java/com/ericsson/otp/erlang/OtpErlangMap">OtpErlangMap</seealso></cell>
+      </row>
+      <row>
         <cell align="left" valign="middle">term</cell>
         <cell align="left" valign="middle"><seealso marker="java/com/ericsson/otp/erlang/OtpErlangObject">OtpErlangObject</seealso></cell>
       </row>
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index 25d4482b76..8c45d187bc 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/jinterface/doc/src/notes_history.xml b/lib/jinterface/doc/src/notes_history.xml
index 8627eb182a..6e25446751 100644
--- a/lib/jinterface/doc/src/notes_history.xml
+++ b/lib/jinterface/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/doc/src/part.xml b/lib/jinterface/doc/src/part.xml
index 413c9b9cd9..dfa0d91cda 100644
--- a/lib/jinterface/doc/src/part.xml
+++ b/lib/jinterface/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/doc/src/part_notes.xml b/lib/jinterface/doc/src/part_notes.xml
index 555efe319e..1f8fc69798 100644
--- a/lib/jinterface/doc/src/part_notes.xml
+++ b/lib/jinterface/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/doc/src/part_notes_history.xml b/lib/jinterface/doc/src/part_notes_history.xml
index b5442e98c1..31211f3645 100644
--- a/lib/jinterface/doc/src/part_notes_history.xml
+++ b/lib/jinterface/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/doc/src/ref_man.xml b/lib/jinterface/doc/src/ref_man.xml
index 43cf7accc8..62d6013db6 100644
--- a/lib/jinterface/doc/src/ref_man.xml
+++ b/lib/jinterface/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangMap.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
new file mode 100644
index 0000000000..7c1cf84e98
--- /dev/null
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
@@ -0,0 +1,293 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2000-2013. All Rights Reserved.
+ *
+ * The 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%
+ */
+package com.ericsson.otp.erlang;
+
+import java.io.Serializable;
+
+/**
+ * Provides a Java representation of Erlang maps. Maps are created from one or
+ * more arbitrary Erlang terms.
+ * 
+ * <p>
+ * The arity of the map is the number of elements it contains. The keys and
+ * values can be retrieved as arrays and the value for a key can be queried.
+ * 
+ */
+public class OtpErlangMap extends OtpErlangObject implements Serializable,
+	Cloneable {
+    // don't change this!
+    private static final long serialVersionUID = -6410770117696198497L;
+
+    private static final OtpErlangObject[] NO_ELEMENTS = new OtpErlangObject[0];
+
+    private OtpErlangObject[] keys = NO_ELEMENTS;
+    private OtpErlangObject[] values = NO_ELEMENTS;
+
+    /**
+     * Create a map from an array of keys and an array of values.
+     * 
+     * @param keys
+     *            the array of terms to create the map keys from.
+     * @param values
+     *            the array of terms to create the map values from.
+     * 
+     * @exception java.lang.IllegalArgumentException
+     *                if any array is empty (null) or contains null elements.
+     */
+    public OtpErlangMap(final OtpErlangObject[] keys,
+	    final OtpErlangObject[] values) {
+	this(keys, 0, keys.length, values, 0, values.length);
+    }
+
+    /**
+     * Create a map from an array of terms.
+     * 
+     * @param elems
+     *            the array of terms to create the map from.
+     * @param start
+     *            the offset of the first term to insert.
+     * @param vcount
+     *            the number of terms to insert.
+     * 
+     * @exception java.lang.IllegalArgumentException
+     *                if any array is empty (null) or contains null elements.
+     */
+    public OtpErlangMap(final OtpErlangObject[] keys, final int kstart,
+	    final int kcount, final OtpErlangObject[] values, final int vstart,
+	    final int vcount) {
+	if (keys == null || values == null) {
+	    throw new java.lang.IllegalArgumentException(
+		    "Map content can't be null");
+	} else if (kcount != vcount) {
+	    throw new java.lang.IllegalArgumentException(
+		    "Map keys and values must have same arity");
+	} else if (vcount < 1) {
+	    this.keys = NO_ELEMENTS;
+	    this.values = NO_ELEMENTS;
+	} else {
+	    this.keys = new OtpErlangObject[vcount];
+	    for (int i = 0; i < vcount; i++) {
+		if (keys[kstart + i] != null) {
+		    this.keys[i] = keys[kstart + i];
+		} else {
+		    throw new java.lang.IllegalArgumentException(
+			    "Map key cannot be null (element" + (kstart + i)
+				    + ")");
+		}
+	    }
+	    this.values = new OtpErlangObject[vcount];
+	    for (int i = 0; i < vcount; i++) {
+		if (values[vstart + i] != null) {
+		    this.values[i] = values[vstart + i];
+		} else {
+		    throw new java.lang.IllegalArgumentException(
+			    "Map value cannot be null (element" + (vstart + i)
+				    + ")");
+		}
+	    }
+	}
+    }
+
+    /**
+     * Create a map from a stream containing a map encoded in Erlang external
+     * format.
+     * 
+     * @param buf
+     *            the stream containing the encoded map.
+     * 
+     * @exception OtpErlangDecodeException
+     *                if the buffer does not contain a valid external
+     *                representation of an Erlang map.
+     */
+    public OtpErlangMap(final OtpInputStream buf)
+	    throws OtpErlangDecodeException {
+	final int arity = buf.read_map_head();
+
+	if (arity > 0) {
+	    keys = new OtpErlangObject[arity];
+	    values = new OtpErlangObject[arity];
+
+	    for (int i = 0; i < arity; i++) {
+		keys[i] = buf.read_any();
+	    }
+	    for (int i = 0; i < arity; i++) {
+		values[i] = buf.read_any();
+	    }
+	} else {
+	    keys = NO_ELEMENTS;
+	    values = NO_ELEMENTS;
+	}
+    }
+
+    /**
+     * Get the arity of the map.
+     * 
+     * @return the number of elements contained in the map.
+     */
+    public int arity() {
+	return keys.length;
+    }
+
+    /**
+     * Get the specified value from the map.
+     * 
+     * @param key
+     *            the key of the requested value.
+     * 
+     * @return the requested value, of null if key is not a valid key.
+     */
+    public OtpErlangObject get(final OtpErlangObject key) {
+	if (key == null) {
+	    return null;
+	}
+	for (int i = 0; i < keys.length; i++) {
+	    if (key.equals(keys[i])) {
+		return values[i];
+	    }
+	}
+	return null;
+    }
+
+    /**
+     * Get all the keys from the map as an array.
+     * 
+     * @return an array containing all of the map's keys.
+     */
+    public OtpErlangObject[] keys() {
+	final OtpErlangObject[] res = new OtpErlangObject[arity()];
+	System.arraycopy(keys, 0, res, 0, res.length);
+	return res;
+    }
+
+    /**
+     * Get all the values from the map as an array.
+     * 
+     * @return an array containing all of the map's values.
+     */
+    public OtpErlangObject[] values() {
+	final OtpErlangObject[] res = new OtpErlangObject[arity()];
+	System.arraycopy(values, 0, res, 0, res.length);
+	return res;
+    }
+
+    /**
+     * Get the string representation of the map.
+     * 
+     * @return the string representation of the map.
+     */
+    @Override
+    public String toString() {
+	int i;
+	final StringBuffer s = new StringBuffer();
+	final int arity = values.length;
+
+	s.append("#{");
+
+	for (i = 0; i < arity; i++) {
+	    if (i > 0) {
+		s.append(",");
+	    }
+	    s.append(keys[i].toString());
+	    s.append(" => ");
+	    s.append(values[i].toString());
+	}
+
+	s.append("}");
+
+	return s.toString();
+    }
+
+    /**
+     * Convert this map to the equivalent Erlang external representation.
+     * 
+     * @param buf
+     *            an output stream to which the encoded map should be written.
+     */
+    @Override
+    public void encode(final OtpOutputStream buf) {
+	final int arity = values.length;
+
+	buf.write_map_head(arity);
+
+	for (int i = 0; i < arity; i++) {
+	    buf.write_any(keys[i]);
+	}
+	for (int i = 0; i < arity; i++) {
+	    buf.write_any(values[i]);
+	}
+    }
+
+    /**
+     * Determine if two maps are equal. Maps are equal if they have the same
+     * arity and all of the elements are equal.
+     * 
+     * @param o
+     *            the map to compare to.
+     * 
+     * @return true if the maps have the same arity and all the elements are
+     *         equal.
+     */
+    @Override
+    public boolean equals(final Object o) {
+	if (!(o instanceof OtpErlangMap)) {
+	    return false;
+	}
+
+	final OtpErlangMap t = (OtpErlangMap) o;
+	final int a = arity();
+
+	if (a != t.arity()) {
+	    return false;
+	}
+
+	for (int i = 0; i < a; i++) {
+	    if (!keys[i].equals(t.keys[i])) {
+		return false; // early exit
+	    }
+	}
+	for (int i = 0; i < a; i++) {
+	    if (!values[i].equals(t.values[i])) {
+		return false; // early exit
+	    }
+	}
+
+	return true;
+    }
+
+    @Override
+    protected int doHashCode() {
+	final OtpErlangObject.Hash hash = new OtpErlangObject.Hash(9);
+	final int a = arity();
+	hash.combine(a);
+	for (int i = 0; i < a; i++) {
+	    hash.combine(keys[i].hashCode());
+	}
+	for (int i = 0; i < a; i++) {
+	    hash.combine(values[i].hashCode());
+	}
+	return hash.valueOf();
+    }
+
+    @Override
+    public Object clone() {
+	final OtpErlangMap newMap = (OtpErlangMap) super.clone();
+	newMap.values = values.clone();
+	return newMap;
+    }
+}
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpExternal.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpExternal.java
index 45a82d6c94..fa0fe18e95 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpExternal.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpExternal.java
@@ -85,6 +85,9 @@ public class OtpExternal {
     /** The tag used for new style references */
     public static final int newRefTag = 114;
 
+    /** The tag used for maps */
+    public static final int mapTag = 116;
+
     /** The tag used for old Funs */
     public static final int funTag = 117;
 
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 9dc1728346..0d1342d796 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
@@ -1202,6 +1202,9 @@ public class OtpInputStream extends ByteArrayInputStream {
 	case OtpExternal.newRefTag:
 	    return new OtpErlangRef(this);
 
+        case OtpExternal.mapTag:
+            return new OtpErlangMap(this);
+
 	case OtpExternal.portTag:
 	    return new OtpErlangPort(this);
 
@@ -1244,4 +1247,21 @@ public class OtpInputStream extends ByteArrayInputStream {
 	    throw new OtpErlangDecodeException("Uknown data type: " + tag);
 	}
     }
+
+    public int read_map_head() throws OtpErlangDecodeException {
+        int arity = 0;
+        final int tag = read1skip_version();
+
+        // decode the map header and get arity
+        switch (tag) {
+        case OtpExternal.mapTag:
+            arity = read4BE();
+            break;
+
+        default:
+            throw new OtpErlangDecodeException("Not valid map tag: " + tag);
+        }
+
+        return arity;
+    }
 }
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
index 78f47aa32f..a78423db44 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
@@ -974,4 +974,9 @@ public class OtpOutputStream extends ByteArrayOutputStream {
 	write_atom(function);
 	write_long(arity);
     }
+
+    public void write_map_head(final int arity) {
+        write1(OtpExternal.mapTag);
+        write4BE(arity);
+    }
 }
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/java_files b/lib/jinterface/java_src/com/ericsson/otp/erlang/java_files
index 1390542194..62fa7f990e 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/java_files
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/java_files
@@ -74,6 +74,7 @@ ERL = \
 	OtpErlangShort\
 	OtpErlangString\
 	OtpErlangTuple \
+	OtpErlangMap \
 	OtpErlangUInt \
 	OtpErlangUShort
 
diff --git a/lib/jinterface/test/Makefile b/lib/jinterface/test/Makefile
index d9ff406994..90d4e01035 100644
--- a/lib/jinterface/test/Makefile
+++ b/lib/jinterface/test/Makefile
@@ -32,7 +32,7 @@ RELSYSDIR = $(RELEASE_PATH)/jinterface_test
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
-TEST_SPEC_FILE = jinterface.spec
+TEST_SPEC_FILE = jinterface.spec jinterface_smoke.spec
 COVER_FILE = jinterface.cover
 
 MODULES = nc_SUITE \
diff --git a/lib/jinterface/test/jinterface_SUITE.erl b/lib/jinterface/test/jinterface_SUITE.erl
index de8d611efc..cb725164cd 100644
--- a/lib/jinterface/test/jinterface_SUITE.erl
+++ b/lib/jinterface/test/jinterface_SUITE.erl
@@ -37,7 +37,9 @@
 	 erl_exit_with_reason_any_term/1,
 	 java_exit_with_reason_any_term/1,
 	 status_handler_localStatus/1, status_handler_remoteStatus/1,
-	 status_handler_connAttempt/1]).
+	 status_handler_connAttempt/1,
+	 maps/1
+     ]).
 
 -include_lib("common_test/include/ct.hrl").
 -include("test_server_line.hrl").
@@ -103,7 +105,8 @@ fundamental() ->
      nodename,             % Nodename.java
      register_and_whereis, % RegisterAndWhereis.java
      get_names,            % GetNames.java
-     boolean_atom          % BooleanAtom.java
+     boolean_atom,         % BooleanAtom.java
+     maps                  % Maps.java
     ].
 
 ping() ->
@@ -675,6 +678,17 @@ status_handler_connAttempt(Config) when is_list(Config) ->
 		   "NodeStatusHandler",
 		   [erlang:get_cookie(),node(),?status_handler_connAttempt]).
 
+%%%-----------------------------------------------------------------
+maps(doc) ->
+    ["Maps.java: "
+     "Tests OtpErlangMap encoding, decoding, toString, get"];
+maps(suite) ->
+    [];
+maps(Config) when is_list(Config) ->
+    ok = jitu:java(?config(java, Config),
+           ?config(data_dir, Config),
+           "Maps",
+           []).
 
 %%%-----------------------------------------------------------------
 %%% INTERNAL FUNCTIONS
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
index 2a3dca463b..a15ed1aa63 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
+++ b/lib/jinterface/test/jinterface_SUITE_data/Makefile.src
@@ -46,7 +46,8 @@ JAVA_FILES = \
 	MboxPing.java \
 	MboxSendReceive.java \
 	MboxLinkUnlink.java \
-	NodeStatusHandler.java
+	NodeStatusHandler.java \
+	Maps.java
 
 CLASS_FILES = $(JAVA_FILES:.java=.class)
 
diff --git a/lib/jinterface/test/jinterface_SUITE_data/Maps.java b/lib/jinterface/test/jinterface_SUITE_data/Maps.java
new file mode 100644
index 0000000000..136a665f23
--- /dev/null
+++ b/lib/jinterface/test/jinterface_SUITE_data/Maps.java
@@ -0,0 +1,108 @@
+import java.util.Arrays;
+
+import com.ericsson.otp.erlang.OtpErlangAtom;
+import com.ericsson.otp.erlang.OtpErlangDecodeException;
+import com.ericsson.otp.erlang.OtpErlangList;
+import com.ericsson.otp.erlang.OtpErlangLong;
+import com.ericsson.otp.erlang.OtpErlangMap;
+import com.ericsson.otp.erlang.OtpInputStream;
+import com.ericsson.otp.erlang.OtpOutputStream;
+
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2004-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%
+ */
+
+class Maps {
+
+    /*
+     * Implements test case jinterface_SUITE:maps/1
+     * 
+     * Test the class OtpErlangMap
+     */
+
+    @SuppressWarnings("resource")
+    public static void main(final String argv[]) {
+
+	runTest(new byte[] { (byte) 131, 116, 0, 0, 0, 0 }, "#{}", 1);
+	runTest(new byte[] { (byte) 131, 116, 0, 0, 0, 1, 100, 0, 1, 97, 100,
+		0, 1, 98 }, "#{a => b}", 2);
+	// make sure keys are sorted here, jinterface doesn't reorder them
+	runTest(new byte[] { (byte) 131, 116, 0, 0, 0, 2, 97, 2, 100, 0, 1, 97,
+		106, 97, 1 }, "#{2 => [],a => 1}", 3);
+	runTest(new byte[] { (byte) 131, 116, 0, 0, 0, 1, 104, 1, 97, 3, 108,
+		0, 0, 0, 1, 100, 0, 1, 114, 106 }, "#{{3} => [r]}", 4);
+
+	try {
+	    // #{2 => [],a => 1}
+	    final OtpErlangMap map = new OtpErlangMap(new OtpInputStream(
+		    new byte[] { (byte) 131, 116, 0, 0, 0, 2, 97, 2, 100, 0, 1,
+			    97, 106, 97, 1 }));
+
+	    if (map.arity() != 2) {
+		fail(5);
+	    }
+	    if (!new OtpErlangLong(1).equals(map.get(new OtpErlangAtom("a")))) {
+		fail(6);
+	    }
+	    if (!new OtpErlangList().equals(map.get(new OtpErlangLong(2)))) {
+		fail(7);
+	    }
+	    if (map.get(new OtpErlangLong(1)) != null) {
+		fail(8);
+	    }
+	} catch (final OtpErlangDecodeException e) {
+	    fail(99);
+	}
+
+    }
+
+    @SuppressWarnings("resource")
+    private static void runTest(final byte[] in, final String out, final int err) {
+	try {
+	    final OtpInputStream is = new OtpInputStream(in);
+
+	    final OtpErlangMap map = new OtpErlangMap(is);
+	    final String output = map.toString();
+	    if (!output.equals(out)) {
+		fail("toString mismatch " + output + " <> " + out, err);
+	    }
+
+	    final OtpOutputStream os = new OtpOutputStream(map);
+	    final byte[] outArray0 = os.toByteArray();
+	    final byte[] outArray = new byte[outArray0.length + 1];
+	    System.arraycopy(outArray0, 0, outArray, 1, outArray0.length);
+	    outArray[0] = (byte) 131;
+	    if (!Arrays.equals(in, outArray)) {
+		fail("encode error " + Arrays.toString(outArray), err);
+	    }
+	} catch (final OtpErlangDecodeException e) {
+	    fail("decode error " + e.getMessage(), err);
+	} catch (final Exception e) {
+	    fail("error " + e.getMessage(), err);
+	}
+    }
+
+    private static void fail(final int reason) {
+	System.exit(reason);
+    }
+
+    private static void fail(final String str, final int reason) {
+	System.out.println(str);
+	System.exit(reason);
+    }
+}
diff --git a/lib/jinterface/test/jinterface_smoke.spec b/lib/jinterface/test/jinterface_smoke.spec
new file mode 100644
index 0000000000..4a76cce4cd
--- /dev/null
+++ b/lib/jinterface/test/jinterface_smoke.spec
@@ -0,0 +1 @@
+{cases,"../jinterface_test",jinterface_SUITE,[java_erlang_send_receive]}.
diff --git a/lib/jinterface/test/jitu.erl b/lib/jinterface/test/jitu.erl
index a029c063bc..46b8cb3ac2 100644
--- a/lib/jinterface/test/jitu.erl
+++ b/lib/jinterface/test/jitu.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The 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,7 +133,7 @@ es(L,Quote,EscSpace) ->
 
 cmd(Cmd) ->
     PortOpts = [{line,80},eof,exit_status,stderr_to_stdout],
-    io:format("cmd: ~s~n", [Cmd]),
+    io:format("cmd: ~ts~n", [Cmd]),
     case catch open_port({spawn,Cmd}, PortOpts) of
 	Port when is_port(Port) ->
 	    case erlang:port_info(Port,os_pid) of
diff --git a/lib/jinterface/test/nc_SUITE.erl b/lib/jinterface/test/nc_SUITE.erl
index f1493a3cc9..9f37b33718 100644
--- a/lib/jinterface/test/nc_SUITE.erl
+++ b/lib/jinterface/test/nc_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml
index 1914844b37..7c9d6eecec 100644
--- a/lib/kernel/doc/src/app.xml
+++ b/lib/kernel/doc/src/app.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fileref SYSTEM "fileref.dtd">
 
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 362c373c6c..016151891c 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -239,10 +239,19 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
       <desc>
         <p>Sets the value of the configuration parameter <c><anno>Par</anno></c> for
           <c><anno>Application</anno></c>.</p>
-        <p><c>set_env/3</c> uses the standard <c>gen_server</c> timeout
-          value (5000 ms). A <c><anno>Timeout</anno></c> argument can be provided
+        <p><c>set_env/4</c> uses the standard <c>gen_server</c> timeout
+          value (5000 ms). The <c>timeout</c> option can be provided
           if another timeout value is useful, for example, in situations
           where the application controller is heavily loaded.</p>
+        <p>If <c>set_env/4</c> is called before the application is loaded,
+          the application environment values specified in the <c>Application.app</c>
+          file will override the ones previously set. This is also true for application
+          reloads.</p>
+        <p>The <c>persistent</c> option can be set to <c>true</c>
+          when there is a need to guarantee parameters set with <c>set_env/4</c>
+          will not be overridden by the ones defined in the application resource
+          file on load. This means persistent values will stick after the application
+          is loaded and also on application reload.</p>
         <warning>
           <p>Use this function only if you know what you are doing, 
             that is, on your own applications. It is very application
@@ -253,15 +262,30 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
         </warning>
       </desc>
     </func>
-	<func>
+    <func>
       <name name="ensure_started" arity="1"/>
       <name name="ensure_started" arity="2"/>
       <fsummary>Load and start an application</fsummary>
-	  <desc>
-		  <p>Equivalent to <seealso marker="#start/2"><c>application:start/1,2</c></seealso> except
-			  it returns <c>ok</c> for already started applications.</p>
-	  </desc>
-	</func>
+      <desc>
+	<p>Equivalent to <seealso marker="#start/2"><c>application:start/1,2</c></seealso> except
+	it returns <c>ok</c> for already started applications.</p>
+      </desc>
+    </func>
+    <func>
+        <name name="ensure_all_started" arity="1"/>
+        <name name="ensure_all_started" arity="2"/>
+        <fsummary>Load and start an application and its dependencies, recursively</fsummary>
+        <desc>
+            <p>Equivalent to calling <seealso marker="#start/2"><c>application:start/1,2</c></seealso>
+               repeatedly on all dependencies that have not yet been started for an application.
+               The function returns <c>{ok, AppNames}</c> for a successful start or for an already started
+               application (which are however omitted from the <c>AppNames</c> list), and reports
+               <c>{error, {AppName,Reason}}</c> for errors, where <c>Reason</c> is any possible reason
+               returned by <seealso marker="#start/2"><c>application:start/1,2</c></seealso> when starting a
+               specific dependency. In case of an error, the applications that were started by the
+               function are stopped to bring the set of running applications back to its initial state.</p>
+        </desc>
+    </func>
     <func>
       <name name="start" arity="1"/>
       <name name="start" arity="2"/>
@@ -391,9 +415,11 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
         <p>Removes the configuration parameter <c><anno>Par</anno></c> and its value
           for <c><anno>Application</anno></c>.</p>
         <p><c>unset_env/2</c> uses the standard <c>gen_server</c>
-          timeout value (5000 ms). A <c><anno>Timeout</anno></c> argument can be
+          timeout value (5000 ms). The <c>timeout</c> option can be
           provided if another timeout value is useful, for example, in
           situations where the application controller is heavily loaded.</p>
+        <p><c>unset_env/3</c> also allows the persistent option to be passed
+          (see <c>set_env/4</c> above).</p>
         <warning>
           <p>Use this function only if you know what you are doing, 
             that is, on your own applications. It is very application
diff --git a/lib/kernel/doc/src/auth.xml b/lib/kernel/doc/src/auth.xml
index 15d9ef0fe4..72beee46f5 100644
--- a/lib/kernel/doc/src/auth.xml
+++ b/lib/kernel/doc/src/auth.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/book.xml b/lib/kernel/doc/src/book.xml
index caf13fd001..09123976cb 100644
--- a/lib/kernel/doc/src/book.xml
+++ b/lib/kernel/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 6f04741f85..454ee9bcbb 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/kernel/doc/src/config.xml b/lib/kernel/doc/src/config.xml
index 34398e90ac..005504dbd1 100644
--- a/lib/kernel/doc/src/config.xml
+++ b/lib/kernel/doc/src/config.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fileref SYSTEM "fileref.dtd">
 
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index d278d54d93..27d8ab4fc1 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/erl_boot_server.xml b/lib/kernel/doc/src/erl_boot_server.xml
index 472671a80e..abaea4f695 100644
--- a/lib/kernel/doc/src/erl_boot_server.xml
+++ b/lib/kernel/doc/src/erl_boot_server.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index 26db11cfcd..7be54c8b95 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/erl_prim_loader_stub.xml b/lib/kernel/doc/src/erl_prim_loader_stub.xml
index e6324b8168..485b16b91f 100644
--- a/lib/kernel/doc/src/erl_prim_loader_stub.xml
+++ b/lib/kernel/doc/src/erl_prim_loader_stub.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/erlang_stub.xml b/lib/kernel/doc/src/erlang_stub.xml
index 333c4fedaf..79a041110a 100644
--- a/lib/kernel/doc/src/erlang_stub.xml
+++ b/lib/kernel/doc/src/erlang_stub.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/error_handler.xml b/lib/kernel/doc/src/error_handler.xml
index 84ec3927c8..2f8f09b984 100644
--- a/lib/kernel/doc/src/error_handler.xml
+++ b/lib/kernel/doc/src/error_handler.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index cd86b364f6..3815b0877c 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/fascicules.xml b/lib/kernel/doc/src/fascicules.xml
index 43090b4aed..fadd37eefb 100644
--- a/lib/kernel/doc/src/fascicules.xml
+++ b/lib/kernel/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 66ecba1bf2..b3ec9fd33d 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2013</year>
+      <year>1996</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -37,54 +37,48 @@
       the file operations. See the command line flag
       <c>+A</c> in <seealso marker="erts:erl">erl(1)</seealso>.</p>
 
-    <p>The Erlang VM supports file names in Unicode to a limited
-    extent.  Depending on how the VM is started (with the parameter
-    <c>+fnu</c> or <c>+fnl</c>), file names given can contain
-    characters > 255 and the VM system will convert file names
-    back and forth to the native file name encoding.</p>
+    <p>With regard to file name encoding, the Erlang VM can operate in
+    two modes. The current mode can be queried using the <seealso
+    marker="#native_name_encoding">native_name_encoding/0</seealso>
+    function.  It returns either <c>latin1</c> or <c>utf8</c>.</p>
 
-    <p>The default behavior for Unicode character translation depends
-    on to what extent the underlying OS/filesystem enforces consistent
-    naming. On OSes where all file names are ensured to be in one or
-    another encoding, Unicode is the default (currently this holds for
-    Windows and MacOSX). On OSes with completely transparent file
-    naming (i.e. all Unixes except MacOSX), ISO-latin-1 file naming is
-    the default. The reason for the ISO-latin-1 default is that
-    file names are not guaranteed to be possible to interpret according to
-    the Unicode encoding expected (i.e. UTF-8), and file names that
-    cannot be decoded will only be accessible by using &quot;raw
-    file names&quot;, in other word file names given as binaries.</p>
- 
-    <p>As file names are traditionally not binaries in Erlang,
-    applications that need to handle raw file names need to be
-    converted, why the Unicode mode for file names is not default on
-    systems having completely transparent file naming.</p>
+    <p>In the <c>latin1</c> mode, the Erlang VM does not change the
+    encoding of file names. In the <c>utf8</c> mode, file names can
+    contain Unicode characters greater than 255 and the VM will
+    convert file names back and forth to the native file name encoding
+    (usually UTF-8, but UTF-16 on Windows).</p>
 
-    <p>Raw file names is a new feature in OTP R14B01, which allows the
-    user to supply completely uninterpreted file names to the
-    underlying OS/filesystem. They are supplied as binaries, where it
-    is up to the user to supply a correct encoding for the
-    environment. The function <c>file:native_name_encoding()</c> can
-    be used to check what encoding the VM is working in. If the
-    function returns <c>latin1</c> file names are not in any way
-    converted to Unicode, if it is <c>utf8</c>, raw file names should
-    be encoded as UTF-8 if they are to follow the convention of the VM
-    (and usually the convention of the OS as well). Using raw
-    file names is useful if you have a filesystem with inconsistent
-    file naming, where some files are named in UTF-8 encoding while
-    others are not. A file:list_dir on such mixed file name systems
-    when the VM is in Unicode file name mode might return file names as
-    raw binaries as they cannot be interpreted as Unicode
-    file names. Raw file names can also be used to give UTF-8 encoded
-    file names even though the VM is not started in Unicode file name
-    translation mode.</p>
+    <p>The default mode depends on the operating system. Windows and
+    MacOS X enforce consistent file name encoding and therefore the
+    VM uses the <c>utf8</c> mode.</p>
+
+    <p>On operating systems with transparent naming (i.e. all Unix
+    systems except MacOS X), the default will be <c>utf8</c> if the
+    terminal supports UTF-8, otherwise <c>latin1</c>. The default may
+    be overridden using the <c>+fnl</c> (to force <c>latin1</c> mode)
+    or <c>+fnu</c> (to force <c>utf8</c> mode) when starting <seealso
+    marker="erts:erl">erl</seealso>.</p>
+
+    <p>On operating systems with transparent naming, files could be
+    inconsistently named, i.e. some files are encoded in UTF-8 while
+    others are encoded in (for example) iso-latin1. To be able to
+    handle file systems with inconsistent naming when running in the
+    <c>utf8</c> mode, the concept of "raw file names" has been
+    introduced.</p>
+
+    <p>A raw file name is a file name given as a binary. The Erlang VM
+    will perform no translation of a file name given as a binary on
+    systems with transparent naming.</p>
+
+    <p>When running in the <c>utf8</c> mode, the
+    <c>file:list_dir/1</c> and <c>file:read_link/1</c> functions will
+    never return raw file names. Use the <seealso
+    marker="#list_dir_all">list_dir_all/1</seealso> and <seealso
+    marker="#read_link_all">read_link_all/1</seealso> functions to
+    return all file names including raw file names.</p>
+
+    <p>Also see <seealso marker="stdlib:unicode_usage#notes-about-raw-filenames">Notes about raw file names</seealso>.</p>
 
-    <p>Note that on Windows, <c>file:native_name_encoding()</c>
-    returns <c>utf8</c> per default, which is the format for raw
-    file names even on Windows, although the underlying OS specific
-    code works in a limited version of little endian UTF16. As far as
-    the Erlang programmer is concerned, Windows native Unicode format
-    is UTF-8...</p>
   </description>
 
   <datatypes>
@@ -535,8 +529,8 @@
       <name name="list_dir_all" arity="1"/>
       <fsummary>List all files in a directory</fsummary>
       <desc>
-        <p>Lists all the files in a directory, including files with
-	"raw" names.
+        <p><marker id="list_dir_all"/>Lists all the files in a directory,
+	including files with "raw" names.
 	Returns <c>{ok, <anno>Filenames</anno>}</c> if successful.
           Otherwise, it returns <c>{error, <anno>Reason</anno>}</c>.
           <c><anno>Filenames</anno></c> is a list of
@@ -653,11 +647,14 @@
     </func>
     <func>
       <name name="native_name_encoding" arity="0"/>
-      <fsummary>Return the VM's configured filename encoding.</fsummary>
+      <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>
-	<p>By default, the VM uses ISO-latin-1 file name encoding on filesystems and/or OSes that use completely transparent file naming. This includes all Unix versions except MacOSX, where the vfs layer enforces UTF-8 file naming. By giving the experimental option <c>+fnu</c> when starting Erlang, UTF-8 translation of file names can be turned on even for those systems. If Unicode file name translation is in effect, the system behaves as usual as long as file names conform to the encoding, but will return file names that are not properly encoded in UTF-8 as raw file names (i.e. binaries).</p> 
-	<p>On Windows, this function also returns <c>utf8</c> by default. The OS uses a pure Unicode naming scheme and file names are always possible to interpret as valid Unicode. The fact that the underlying Windows OS actually encodes file names using little endian UTF-16 can be ignored by the Erlang programmer. Windows and MacOSX are the only operating systems where the VM operates in Unicode file name mode by default.</p>
+	<p><marker id="native_name_encoding"/>This function returns
+	the file name encoding mode.  If it is <c>latin1</c>, the
+	system does no translation of file names.  If it is
+	<c>utf8</c>, file names will be converted back and forth to
+	the native file name encoding (usually UTF-8, but UTF-16 on
+	Windows).</p>
       </desc>
     </func>
     <func>
@@ -826,6 +823,16 @@
           <item>
             <p><c>File</c> must be <c>iodata()</c>. Returns an <c>fd()</c> which lets the <c>file</c> module operate on the data in-memory as if it is a file.</p>
           </item>
+          <tag><c>sync</c></tag>
+          <item>
+            <p>On platforms that support it, enables the POSIX <c>O_SYNC</c> synchronous I/O flag or its platform-dependent
+            equivalent (e.g., <c>FILE_FLAG_WRITE_THROUGH</c> on Windows) so that writes to the file block until the data has
+            been physically written to disk. Be aware, though, that the exact semantics of this flag differ from platform to
+            platform; for example, neither Linux nor Windows guarantees that all file metadata are also written before the call
+            returns. For precise semantics, check the details of your platform's documentation. On platforms with no
+            support for POSIX <c>O_SYNC</c> or equivalent, use of the <c>sync</c> flag causes <c>open</c> to return
+            <c>{error, enotsup}</c>.</p>
+          </item>
         </taglist>
         <p>Returns:</p>
         <taglist>
@@ -1440,7 +1447,8 @@
       <name name="read_link" arity="1"/>
       <fsummary>See what a link is pointing to</fsummary>
       <desc>
-        <p>This function returns <c>{ok, <anno>Filename</anno>}</c> if
+        <p><marker id="read_link_all"/>This function returns
+	<c>{ok, <anno>Filename</anno>}</c> if
           <c><anno>Name</anno></c> refers to a symbolic link that is
 	  not a "raw" file name, or <c>{error, <anno>Reason</anno>}</c>
 	  otherwise.
@@ -1736,16 +1744,16 @@
           <item>The chunk size used by the erlang fallback to send
 	  data. If using the fallback, this should be set to a value
 	  which comfortably fits in the systems memory. Default is 20 MB.</item>
+	  <tag><c>use_threads</c></tag>
+          <item>Instruct the emulator to use the async thread pool for the
+	  sendfile system call. This could be usefull if the OS you are running
+	  on does not properly support non-blocking sendfile calls. Do note that
+	  using async threads potentially makes your system volnerable to slow
+	  client attacks. If set to true and no async threads are available,
+	  the sendfile call will return <c>{error,einval}</c>.
+	  Introduced in Erlang/OTP 17.0. Default is false.</item>
 	</taglist>
 	</p>
-	<p>On operating systems with thread support, it is recommended to use
-	async threads. See the command line flag
-	<c>+A</c> in <seealso marker="erts:erl">erl(1)</seealso>. If it is not
-	possible to use async threads for sendfile, it is recommended to use
-	a relatively small value for the send buffer on the socket. Otherwise
-	the Erlang VM might loose some of its soft realtime guarantees.
-	Which size to use depends on the OS/hardware and the requirements
-	of the application.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index 7ea58fffff..dc9e4766a9 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2012</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -322,7 +322,7 @@
 	<p>
 	  Branch off an existing association <anno>Assoc</anno>
 	  in a socket <anno>Socket</anno> of type <c>seqpacket</c>
-	  (one-to-may style) into
+	  (one-to-many style) into
 	  a new socket <anno>NewSocket</anno> of type <c>stream</c>
 	  (one-to-one style).
 	</p>
@@ -496,9 +496,11 @@
       orthogonal to the sets of TCP, UDP and generic INET options:
       only those options which are explicitly listed below are allowed
       for SCTP sockets. Options can be set on the socket using
-      <c>gen_sctp:open/1,2</c> or <c>inet:setopts/2</c>,
-      retrieved using <c>inet:getopts/2</c>, and when calling
-      <c>gen_sctp:connect/4,5</c> options can be changed.</p>
+      <seealso marker="#open/1"><c>gen_sctp:open/1,2</c></seealso>
+      or <seealso marker="inet#setopts/2"><c>inet:setopts/2</c></seealso>,
+      retrieved using <seealso marker="inet#getopts/2"><c>inet:getopts/2</c></seealso>,
+      and when calling <seealso marker="#connect/4"><c>gen_sctp:connect/4,5</c></seealso>
+      options can be changed.</p>
     <marker id="option-binary"></marker>
     <marker id="option-list"></marker>
     <taglist>
@@ -507,7 +509,7 @@
         <p>Determines the type of data returned from <c>gen_sctp:recv/1,2</c>.</p>
         <marker id="option-active"></marker>
       </item>
-      <tag><c>{active, true|false|once}</c></tag>
+      <tag><c>{active, true|false|once|N}</c></tag>
       <item>
         <list type="bulleted">
           <item>
@@ -524,11 +526,28 @@
           </item>
           <item>
             <p>If <c>once</c>, only one message is automatically placed
-              in the message queue, after that the mode is automatically
-              re-set to passive. This provides flow control as well as
+              in the message queue, and after that the mode is automatically
+              reset to passive. This provides flow control as well as
               the possibility for the receiver to listen for its incoming
               SCTP data interleaved with other inter-process messages.</p>
           </item>
+          <item>
+            <p>If <c>active</c> is specified as an integer <c>N</c> in the
+              range -32768 to 32767 (inclusive), then that number is added to
+              the socket's count of the number of data messages to be
+              delivered to the controlling process. If the result of the
+              addition would be negative, the count is set to 0. Once the
+              count reaches 0, either through the delivery of messages or by
+              being explicitly set with <seealso
+              marker="inet#setopts/2">inet:setopts/2</seealso>, the socket's
+              mode is automatically reset to passive (<c>{active,
+              false}</c>) mode. When a socket in this active mode transitions to
+              passive mode, the message <c>{sctp_passive, Socket}</c> is sent
+              to the controlling process to notify it that if it wants to
+              receive more data messages from the socket, it must call
+              <seealso marker="inet#setopts/2">inet:setopts/2</seealso> to set
+              the socket back into an active mode.</p>
+          </item>
         </list>
       </item>
      <tag><c>{tos, integer()}</c></tag>
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 11a0843c10..dbd0d3c815 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -148,6 +148,12 @@ do_recv(Sock, Bs) ->
           as messages:</p>
         <code type="none">
 {tcp, Socket, Data}</code>
+        <p>If the socket is in <c>{active, N}</c> mode (see <seealso marker="inet#setopts/2">
+          inet:setopts/2</seealso> for details) and its message counter
+          drops to 0, the following message is delivered to indicate that the
+          socket has transitioned to passive (<c>{active, false}</c>) mode:</p>
+        <code type="none">
+{tcp_passive, Socket}</code>
         <p>If the socket is closed, the following message is delivered:</p>
         <code type="none">
 {tcp_closed, Socket}</code>
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 4850278a64..503725fe18 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -145,14 +145,23 @@
               <seealso marker="inet#setopts/2">inet:setopts/2</seealso>.</p>
           </item>
         </taglist>
-        <p>The returned socket <c><anno>Socket</anno></c> is used to send packets
-          from this port with <c>send/4</c>. When UDP packets arrive at
-          the opened port, they are delivered as messages:</p>
+        <p>The returned socket <c><anno>Socket</anno></c> is used to send
+          packets from this port with <c>send/4</c>. When UDP packets arrive
+          at the opened port, if the socket is in an active mode the packets
+          are delivered as messages to the controlling process:</p>
         <code type="none">
 {udp, Socket, IP, InPortNo, Packet}</code>
-        <p>Note that arriving UDP packets that are longer than
+        <p>If the socket is not in an active mode, data can be
+          retrieved via the <seealso marker="#recv/2">recv/2,3</seealso> calls.
+          Note that arriving UDP packets that are longer than
           the receive buffer option specifies, might be truncated
           without warning.</p>
+        <p>When a socket in <c>{active, N}</c> mode (see <seealso marker="inet#setopts/2">
+          inet:setopts/2</seealso> for details) transitions to passive
+          (<c>{active, false}</c>) mode, the controlling process is notified by a
+          message of the following form:</p>
+        <code type="none">
+{udp_passive, Socket}</code>
         <p><c>IP</c> and <c>InPortNo</c> define the address from which
           <c>Packet</c> came. <c>Packet</c> is a list of bytes if
           the option <c>list</c> was specified. <c>Packet</c> is a
diff --git a/lib/kernel/doc/src/global.xml b/lib/kernel/doc/src/global.xml
index 53958c47c2..691b243443 100644
--- a/lib/kernel/doc/src/global.xml
+++ b/lib/kernel/doc/src/global.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/kernel/doc/src/global_group.xml b/lib/kernel/doc/src/global_group.xml
index abf6178fc4..2c181da83a 100644
--- a/lib/kernel/doc/src/global_group.xml
+++ b/lib/kernel/doc/src/global_group.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml
index 2856d84dcf..3ec33d2f18 100644
--- a/lib/kernel/doc/src/heart.xml
+++ b/lib/kernel/doc/src/heart.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -118,8 +118,13 @@
           the system. The new Erlang runtime system will (if it
           misbehaves) use the environment variable
           <c>HEART_COMMAND</c> to reboot.</p>
-        <p>Limitations: The length of the <c><anno>Cmd</anno></c> command string
-          must be less than 2047 characters.</p>
+
+        <p>Limitations: The <c><anno>Cmd</anno></c> command string
+        will be sent to the heart program as a ISO-latin-1 or UTF-8
+        encoded binary depending on the file name encoding mode of the
+        emulator (see
+	<seealso marker="kernel:file#native_name_encoding/0"><c>file:native_name_encoding/0</c></seealso>).
+	The size of the encoded binary must be less than 2047 bytes.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 7cd98914d1..4a48a5c3d8 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -76,11 +76,11 @@ FFFF::192.168.42.2
                 {16#3ffe,16#b80,16#1f8d,16#2,16#204,16#acff,16#fe17,16#bf38}
 fe80::204:acff:fe17:bf38
                 {16#fe80,0,0,0,0,16#204,16#acff,16#fe17,16#bf38}</code>
-    <p>A function that may be useful is <c>inet_parse:address/1</c>:</p>
+    <p>A function that may be useful is <seealso marker="#parse_address/1">parse_address/1</seealso>:</p>
     <pre>
-1> <input>inet_parse:address("192.168.42.2").</input>
+1> <input>inet:parse_address("192.168.42.2").</input>
 {ok,{192,168,42,2}}
-2> <input>inet_parse:address("FFFF::192.168.42.2").</input>
+2> <input>inet:parse_address("FFFF::192.168.42.2").</input>
 {ok,{65535,0,0,0,0,0,49320,10754}}</pre>
   </description>
 
@@ -375,6 +375,13 @@ fe80::204:acff:fe17:bf38
       </desc>
     </func>
     <func>
+      <name name="ntoa" arity="1" />
+      <fsummary>Convert IPv6 / IPV4 adress to ascii</fsummary>
+      <desc>
+	<p>Parses an <a href="#type-ip_address">ip_address()</a> and returns an IPv4 or IPv6 address string.</p>
+      </desc>
+    </func>
+    <func>
       <name name="parse_ipv4_address" arity="1" />
       <fsummary>Parse an IPv4 address</fsummary>
       <desc>
@@ -423,8 +430,56 @@ fe80::204:acff:fe17:bf38
       <name name="peername" arity="1"/>
       <fsummary>Return the address and port for the other end of a connection</fsummary>
       <desc>
-        <p>Returns the address and port for the other end of a
-          connection.</p>
+        <p>
+	  Returns the address and port for the other end of a
+          connection.
+	</p>
+	<p>
+	  Note that for SCTP sockets this function only returns
+	  one of the socket's peer addresses.  The function
+	  <seealso marker="#peernames/1">peernames/1,2</seealso>
+	  returns all.
+	</p>
+      </desc>
+    </func>
+    <func>
+      <name name="peernames" arity="1"/>
+      <fsummary>
+	Return all address/port numbers for the other end of a connection
+      </fsummary>
+      <desc>
+	<p>
+	  Equivalent to
+	  <seealso marker="#peernames/2"><c>peernames(<anno>Socket</anno>, 0)</c></seealso>.
+	  Note that this function's behaviour for an SCTP
+	  one-to-many style socket is not defined by the
+	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>.
+	</p>
+      </desc>
+    </func>
+    <func>
+      <name name="peernames" arity="2"/>
+      <fsummary>
+	Return all address/port numbers for the other end of a connection
+      </fsummary>
+      <desc>
+	<p>
+	  Returns a list of all address/port number pairs for the other end
+	  of a socket's association <c><anno>Assoc</anno></c>.
+	</p>
+	<p>
+	  This function can return multiple addresses for multihomed
+	  sockets such as SCTP sockets.  For other sockets it
+	  returns a one element list.
+	</p>
+	<p>
+	  Note that the <c><anno>Assoc</anno></c> parameter is by the
+	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>
+	  defined to be ignored for
+	  one-to-one style sockets.  What the special value <c>0</c>
+	  means hence its behaviour for one-to-many style sockets
+	  is unfortunately not defined.
+	</p>
       </desc>
     </func>
     <func>
@@ -439,6 +494,46 @@ fe80::204:acff:fe17:bf38
       <fsummary>Return the local address and port number for a socket</fsummary>
       <desc>
         <p>Returns the local address and port number for a socket.</p>
+	<p>
+	  Note that for SCTP sockets this function only returns
+	  one of the socket addresses.  The function
+	  <seealso marker="#socknames/1">socknames/1,2</seealso>
+	  returns all.
+	</p>
+      </desc>
+    </func>
+    <func>
+      <name name="socknames" arity="1"/>
+      <fsummary>Return all local address/port numbers for a socket</fsummary>
+      <desc>
+	<p>
+	  Equivalent to
+	  <seealso marker="#socknames/2"><c>socknames(<anno>Socket</anno>, 0)</c></seealso>.
+	</p>
+      </desc>
+    </func>
+    <func>
+      <name name="socknames" arity="2"/>
+      <fsummary>Return all local address/port numbers for a socket</fsummary>
+      <desc>
+	<p>
+	  Returns a list of all local address/port number pairs for a socket
+	  for the given association <c><anno>Assoc</anno></c>.
+	</p>
+	<p>
+	  This function can return multiple addresses for multihomed
+	  sockets such as SCTP sockets.  For other sockets it
+	  returns a one element list.
+	</p>
+	<p>
+	  Note that the <c><anno>Assoc</anno></c> parameter is by the
+	  <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">SCTP Sockets API Extensions</url>
+	  defined to be ignored for one-to-one style sockets.
+	  For one-to-many style sockets the special value <c>0</c>
+	  is defined to mean that the returned addresses shall be
+	  without regard to any particular association.
+	  How different SCTP implementations interprets this varies somewhat.
+	</p>
       </desc>
     </func>
     <func>
@@ -449,47 +544,66 @@ fe80::204:acff:fe17:bf38
         <p>Sets one or more options for a socket. The following options
           are available:</p>
         <taglist>
-          <tag><c>{active, true | false | once}</c></tag>
+          <tag><c>{active, true | false | once | N}</c></tag>
           <item>
             <p>If the value is <c>true</c>, which is the default,
               everything received from the socket will be sent as
               messages to the receiving process. If the value is
               <c>false</c> (passive mode), the process must explicitly
-              receive incoming data by calling <c>gen_tcp:recv/2,3</c>
-              or <c>gen_udp:recv/2,3</c> (depending on the type of
-              socket).</p>
+              receive incoming data by calling
+              <seealso marker="gen_tcp#recv/2"><c>gen_tcp:recv/2,3</c></seealso>,
+              <seealso marker="gen_udp#recv/2"><c>gen_udp:recv/2,3</c></seealso>
+              or <seealso marker="gen_sctp#recv/1"><c>gen_sctp:recv/1,2</c></seealso>
+              (depending on the type of socket).</p>
             <p>If the value is <c>once</c> (<c>{active, once}</c>),
               <em>one</em> data message from the socket will be sent
               to the process.  To receive one more message,
               <c>setopts/2</c> must be called again with the
               <c>{active, once}</c> option.</p>
-            <p>When using <c>{active, once}</c>, the socket changes
-              behaviour automatically when data is received. This can
-              sometimes be confusing in combination with connection
-              oriented sockets (i.e. <c>gen_tcp</c>) as a socket with
-              <c>{active, false}</c> behaviour reports closing
+            <p>If the value is an integer <c>N</c> in the range -32768 to 32767
+              (inclusive), the value is added to the socket's count of data
+              messages sent to the controlling process. A socket's default
+              message count is 0. If a negative value is specified and its
+              magnitude is equal to or greater than the socket's current
+              message count, the socket's message count is set to 0. Once
+              the socket's message count reaches 0, either due to sending
+              received data messages to the process or by being explicitly set,
+              the process is then notified by a special message, specific to
+              the type of socket, that the socket has entered passive
+              mode. Once the socket enters passive mode, to receive more
+              messages <c>setopts/2</c> must be called again to set the
+              socket back into an active mode.</p>
+            <p>When using <c>{active, once}</c> or <c>{active, N}</c>, the
+              socket changes behaviour automatically when data is received.
+              This can sometimes be confusing in combination with
+              connection-oriented sockets (i.e. <c>gen_tcp</c>) as a socket
+              with <c>{active, false}</c> behaviour reports closing
               differently than a socket with <c>{active, true}</c>
               behaviour. To make programming easier, a socket where
               the peer closed and this was detected while in
               <c>{active, false}</c> mode, will still generate the
               message
-              <c>{tcp_closed,Socket}</c> when set to <c>{active, once}</c> or <c>{active, true}</c> mode. It is therefore
+              <c>{tcp_closed,Socket}</c> when set to <c>{active, once}</c>,
+              <c>{active, true}</c> or <c>{active, N}</c> mode. It is therefore
               safe to assume that the message
               <c>{tcp_closed,Socket}</c>, possibly followed by socket
               port termination (depending on the <c>exit_on_close</c>
               option) will eventually appear when a socket changes
               back and forth between <c>{active, true}</c> and
-              <c>{active, false}</c> mode. However, 
+              <c>{active, false}</c> mode. However,
               <em>when</em> peer closing is detected is all up to the
               underlying TCP/IP stack and protocol.</p>
-            <p>Note that <c>{active,true}</c> mode provides no flow
+            <p>Note that <c>{active, true}</c> mode provides no flow
               control; a fast sender could easily overflow the
-              receiver with incoming messages. Use active mode only if
+              receiver with incoming messages. The same is true of
+              <c>{active, N}</c> mode while the message count is greater
+              than zero. Use active mode only if
               your high-level protocol provides its own flow control
               (for instance, acknowledging received messages) or the
-              amount of data exchanged is small. <c>{active,false}</c>
-              mode or use of the <c>{active, once}</c> mode provides
-              flow control; the other side will not be able send
+              amount of data exchanged is small. <c>{active, false}</c>
+              mode, use of the <c>{active, once}</c> mode or <c>{active, N}</c>
+              mode with values of <c>N</c> appropriate for the application
+              provides flow control; the other side will not be able send
               faster than the receiver can read.</p>
           </item>
 
@@ -715,6 +829,59 @@ fe80::204:acff:fe17:bf38
 			  <p>Received <c>Packet</c> is delivered as defined by Mode.</p>
 		  </item>
 
+	  <tag><c>{netns, Namespace :: file:filename_all()}</c></tag>
+	  <item>
+	    <p>Set a network namespace for the socket. The <c>Namespace</c>
+	    parameter is a filename defining the namespace for example
+	    <c>"/var/run/netns/example"</c> typically created by the command
+	    <c>ip netns add example</c>. This option must be used in a
+	    function call that creates a socket i.e
+	    <seealso marker="gen_tcp#connect/3">
+	      gen_tcp:connect/3,4</seealso>,
+	    <seealso marker="gen_tcp#listen/2">
+	      gen_tcp:listen/2</seealso>,
+	    <seealso marker="gen_udp#open/1">
+	      gen_udp:open/1,2</seealso> or
+	    <seealso marker="gen_sctp#open/0">
+	      gen_sctp:open/0-2</seealso>.
+	    </p>
+	    <p>This option uses the Linux specific syscall
+	    <c>setns()</c> such as in Linux kernel 3.0 or later
+	    and therefore only exists when the runtime system
+	    has been compiled for such an operating system.
+	    </p>
+	    <p>
+	    The virtual machine also needs elevated privileges either
+	    running as superuser or (for Linux) having the capability
+	    <c>CAP_SYS_ADMIN</c> according to the documentation for setns(2).
+	    However, during testing also <c>CAP_SYS_PTRACE</c>
+	    and <c>CAP_DAC_READ_SEARCH</c> has proven to be necessary.
+	    Example:<code>
+setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp
+</code>
+            Note also that the filesystem containing the virtual machine
+	    executable (<c>beam.smp</c> in the example above) has to be local,
+	    mounted without the <c>nosetuid</c> flag,
+	    support extended attributes and that
+	    the kernel has to support file capabilities.
+	    All this runs out of the box on at least Ubuntu 12.04 LTS,
+	    except that SCTP sockets appears to not support
+	    network namespaces.
+	    </p>
+	    <p>The <c>Namespace</c> is a file name and is encoded
+	    and decoded as discussed in
+	    <seealso marker="file">file</seealso>
+	    except that the emulator flag <c>+fnu</c> is ignored and
+	    <seealso marker="#getopts/2">getopts/2</seealso>
+	    for this option will return a binary for the filename
+	    if the stored filename can not be decoded,
+	    which should only happen if you set the option using a binary
+	    that can not be decoded with the emulator's filename encoding:
+	    <seealso marker="file#native_name_encoding/0">
+	      file:native_name_encoding/0</seealso>.
+	    </p>
+	  </item>
+
 		  <tag><c>list</c></tag>
           <item>
 			  <p>Received <c>Packet</c> is delivered as a list.</p>
diff --git a/lib/kernel/doc/src/inet_res.xml b/lib/kernel/doc/src/inet_res.xml
index bf73ccf13d..7880ccda05 100644
--- a/lib/kernel/doc/src/inet_res.xml
+++ b/lib/kernel/doc/src/inet_res.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2009</year><year>2011</year>
+      <year>2009</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/init_stub.xml b/lib/kernel/doc/src/init_stub.xml
index e8645458e4..5c57f8850e 100644
--- a/lib/kernel/doc/src/init_stub.xml
+++ b/lib/kernel/doc/src/init_stub.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index faa8f86dbd..49a93d2c70 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/net_adm.xml b/lib/kernel/doc/src/net_adm.xml
index f2aac9282c..3009b1913d 100644
--- a/lib/kernel/doc/src/net_adm.xml
+++ b/lib/kernel/doc/src/net_adm.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index e54a427ff0..f5103136a1 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 0175c38397..b2e89ea850 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,129 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 2.16.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix the typespec for the inet:ifget/2 and inet:ifget/3
+	    return value. Thanks to Ali Sabil.</p>
+          <p>
+	    Own Id: OTP-11377</p>
+        </item>
+        <item>
+          <p>
+	    Fix various typos in erts, kernel and ssh. Thanks to
+	    Martin Hässler.</p>
+          <p>
+	    Own Id: OTP-11414</p>
+        </item>
+        <item>
+          <p>
+	    Fix rpc multicall sample code. Thanks to Edwin Fine.</p>
+          <p>
+	    Own Id: OTP-11471</p>
+        </item>
+        <item>
+          <p>
+	    Under rare circumstances a process calling <seealso
+	    marker="kernel:inet#close/1"><c>inet:close/1</c></seealso>,
+	    <seealso
+	    marker="kernel:gen_tcp#close/1"><c>gen_tcp:close/1</c></seealso>,
+	    <seealso
+	    marker="kernel:gen_udp#close/1"><c>gen_udp:close/1</c></seealso>,
+	    or <seealso
+	    marker="kernel:gen_sctp#close/1"><c>gen_sctp:close/1</c></seealso>
+	    could hang in the call indefinitely.</p>
+          <p>
+	    Own Id: OTP-11491</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add more SCTP errors as described in RFC 4960. Thanks to
+	    Artem Teslenko.</p>
+          <p>
+	    Own Id: OTP-11379</p>
+        </item>
+        <item>
+          <p>
+	    Add new BIF os:unsetenv/1 which deletes an environment
+	    variable. Thanks to Martin Hässler.</p>
+          <p>
+	    Own Id: OTP-11446</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.16.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix indentation of User switch command help in Erlang
+	    shell. Thanks to Sylvain Benner.</p>
+          <p>
+	    Own Id: OTP-11209</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The previous undocumented function ntoa/1 has been added
+	    to inet docs and exported in the inet module.</p>
+          <p>
+	    Own Id: OTP-10676 Aux Id: OTP-10314 </p>
+        </item>
+        <item>
+          <p>
+	    Fix typo in abcast() function comment. Thanks to Johannes
+	    Weissl.</p>
+          <p>
+	    Own Id: OTP-11219</p>
+        </item>
+        <item>
+          <p>
+	    Add application:ensure_all_started/1-2. Thanks to Fred
+	    Hebert.</p>
+          <p>
+	    Own Id: OTP-11250</p>
+        </item>
+        <item>
+          <p>
+	    Make edlin understand a few important control keys.
+	    Thanks to Stefan Zegenhagen.</p>
+          <p>
+	    Own Id: OTP-11251</p>
+        </item>
+        <item>
+          <p>
+	    Cleanup of hipe_unified_loader, eliminating uses of
+	    is_subtype/2 in specs, change module-local void functions
+	    to return 'ok' instead of [] and made sure there are no
+	    dialyzer warnings with --Wunmatched_returns. Thanks to
+	    Kostis Sagonas.</p>
+          <p>
+	    Own Id: OTP-11301</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 2.16.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -390,7 +513,7 @@
           <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>
+	    crashes. (Thanks to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-10094</p>
         </item>
@@ -532,7 +655,7 @@
 	    Various typographical errors corrected in documentation
 	    for the global, error_logger, etop, lists, ets and
 	    supervisor modules and in the c_portdriver and kernel_app
-	    documentation. (Thanks to Ricardo Catalinas Jim�nez)</p>
+	    documentation. (Thanks to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-9987</p>
         </item>
@@ -727,7 +850,7 @@
 	    Fixes net_kernel:get_net_ticktime() doc</p>
           <p>
 	    Adds missing description when `ignored' is returned.
-	    (Thanks to Ricardo Catalinas Jim�nez )</p>
+	    (Thanks to Ricardo Catalinas Jiménez )</p>
           <p>
 	    Own Id: OTP-9713</p>
         </item>
@@ -913,7 +1036,7 @@
         <item>
           <p>
 	    Fix typo in doc of rpc:pmap/3 (Thanks to Ricardo
-	    Catalinas Jim�nez)</p>
+	    Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-9168</p>
         </item>
diff --git a/lib/kernel/doc/src/notes_history.xml b/lib/kernel/doc/src/notes_history.xml
index 2f6ceb9d42..58d5109774 100644
--- a/lib/kernel/doc/src/notes_history.xml
+++ b/lib/kernel/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/os.xml b/lib/kernel/doc/src/os.xml
index 5e182de41d..2b57e75023 100644
--- a/lib/kernel/doc/src/os.xml
+++ b/lib/kernel/doc/src/os.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -177,6 +177,17 @@ format_utc_timestamp() ->
       </desc>
     </func>
     <func>
+      <name name="unsetenv" arity="1"/>
+      <fsummary>Delete an environment variable</fsummary>
+      <desc>
+	<p>Deletes 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 string (<c><anno>VarName</anno></c>) may
+	contain characters with codepoints > 255.</p>
+      </desc>
+    </func>
+    <func>
       <name name="version" arity="0"/>
       <fsummary>Return the Operating System version</fsummary>
       <desc>
diff --git a/lib/kernel/doc/src/part_notes.xml b/lib/kernel/doc/src/part_notes.xml
index ff43b9e007..d196878f19 100644
--- a/lib/kernel/doc/src/part_notes.xml
+++ b/lib/kernel/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/part_notes_history.xml b/lib/kernel/doc/src/part_notes_history.xml
index a73cc911b8..ec4998408e 100644
--- a/lib/kernel/doc/src/part_notes_history.xml
+++ b/lib/kernel/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/pg2.xml b/lib/kernel/doc/src/pg2.xml
index d26ff0fc6b..5eb63c1ef6 100644
--- a/lib/kernel/doc/src/pg2.xml
+++ b/lib/kernel/doc/src/pg2.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/ref_man.xml b/lib/kernel/doc/src/ref_man.xml
index 96604a2fa2..c1b9eac9d7 100644
--- a/lib/kernel/doc/src/ref_man.xml
+++ b/lib/kernel/doc/src/ref_man.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index b01ff16c85..e6c896f18d 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -185,7 +185,7 @@
 {Mod, Bin, File} = code:get_object_code(Mod), 
 
 %% and load it on all nodes including this one 
-{ResL, _} = rpc:multicall(code, load_binary, [Mod, Bin, File,]),
+{ResL, _} = rpc:multicall(code, load_binary, [Mod, File, Bin]),
 
 %% and then maybe check the ResL list.</code>
       </desc>
diff --git a/lib/kernel/doc/src/seq_trace.xml b/lib/kernel/doc/src/seq_trace.xml
index 1ab955bd8a..45df06e0b4 100644
--- a/lib/kernel/doc/src/seq_trace.xml
+++ b/lib/kernel/doc/src/seq_trace.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/specs.xml b/lib/kernel/doc/src/specs.xml
index 813bb06e1f..29d52f23bb 100644
--- a/lib/kernel/doc/src/specs.xml
+++ b/lib/kernel/doc/src/specs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <specs xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../specs/specs_application.xml"/>
   <xi:include href="../specs/specs_auth.xml"/>
diff --git a/lib/kernel/doc/src/user.xml b/lib/kernel/doc/src/user.xml
index 4d0f044321..df6dff9882 100644
--- a/lib/kernel/doc/src/user.xml
+++ b/lib/kernel/doc/src/user.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/wrap_log_reader.xml b/lib/kernel/doc/src/wrap_log_reader.xml
index 6cf480b532..5227b4d01c 100644
--- a/lib/kernel/doc/src/wrap_log_reader.xml
+++ b/lib/kernel/doc/src/wrap_log_reader.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/doc/src/zlib_stub.xml b/lib/kernel/doc/src/zlib_stub.xml
index fa14262181..5f5bfd56db 100644
--- a/lib/kernel/doc/src/zlib_stub.xml
+++ b/lib/kernel/doc/src/zlib_stub.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/kernel/src/application.erl b/lib/kernel/src/application.erl
index 5dd6b73857..76a80553b0 100644
--- a/lib/kernel/src/application.erl
+++ b/lib/kernel/src/application.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %% 
 %% The 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,8 @@
 %%
 -module(application).
 
--export([start/1, start/2, start_boot/1, start_boot/2, stop/1, 
+-export([ensure_all_started/1, ensure_all_started/2, start/1, start/2,
+	 start_boot/1, start_boot/2, stop/1, 
 	 load/1, load/2, unload/1, takeover/2,
 	 which_applications/0, which_applications/1,
 	 loaded_applications/0, permit/2]).
@@ -113,6 +114,46 @@ load1(Application, DistNodes) ->
 unload(Application) ->
     application_controller:unload_application(Application).
 
+
+-spec ensure_all_started(Application) -> {'ok', Started} | {'error', Reason} when
+      Application :: atom(),
+      Started :: [atom()],
+      Reason :: term().
+ensure_all_started(Application) ->
+    ensure_all_started(Application, temporary).
+
+-spec ensure_all_started(Application, Type) -> {'ok', Started} | {'error', Reason} when
+      Application :: atom(),
+      Type :: restart_type(),
+      Started :: [atom()],
+      Reason :: term().
+ensure_all_started(Application, Type) ->
+    case ensure_all_started(Application, Type, []) of
+	{ok, Started} ->
+	    {ok, lists:reverse(Started)};
+	{error, Reason, Started} ->
+	    _ = [stop(App) || App <- Started],
+	    {error, Reason}
+    end.
+
+ensure_all_started(Application, Type, Started) ->
+    case start(Application, Type) of
+	ok ->
+	    {ok, [Application | Started]};
+	{error, {already_started, Application}} ->
+	    {ok, Started};
+	{error, {not_started, Dependency}} ->
+	    case ensure_all_started(Dependency, Type, Started) of
+		{ok, NewStarted} ->
+		    ensure_all_started(Application, Type, NewStarted);
+		Error ->
+		    Error
+	    end;
+	{error, Reason} ->
+	    {error, {Application, Reason}, Started}
+    end.
+
+
 -spec start(Application) -> 'ok' | {'error', Reason} when
       Application :: atom(),
       Reason :: term().
@@ -244,16 +285,18 @@ info() ->
 set_env(Application, Key, Val) -> 
     application_controller:set_env(Application, Key, Val).
 
--spec set_env(Application, Par, Val, Timeout) -> 'ok' when
+-spec set_env(Application, Par, Val, Opts) -> 'ok' when
       Application :: atom(),
       Par :: atom(),
       Val :: term(),
-      Timeout :: timeout().
+      Opts :: [{timeout, timeout()} | {persistent, boolean()}].
 
 set_env(Application, Key, Val, infinity) ->
-    application_controller:set_env(Application, Key, Val, infinity);
+    set_env(Application, Key, Val, [{timeout, infinity}]);
 set_env(Application, Key, Val, Timeout) when is_integer(Timeout), Timeout>=0 ->
-    application_controller:set_env(Application, Key, Val, Timeout).
+    set_env(Application, Key, Val, [{timeout, Timeout}]);
+set_env(Application, Key, Val, Opts) when is_list(Opts) ->
+    application_controller:set_env(Application, Key, Val, Opts).
 
 -spec unset_env(Application, Par) -> 'ok' when
       Application :: atom(),
@@ -262,15 +305,17 @@ set_env(Application, Key, Val, Timeout) when is_integer(Timeout), Timeout>=0 ->
 unset_env(Application, Key) -> 
     application_controller:unset_env(Application, Key).
 
--spec unset_env(Application, Par, Timeout) -> 'ok' when
+-spec unset_env(Application, Par, Opts) -> 'ok' when
       Application :: atom(),
       Par :: atom(),
-      Timeout :: timeout().
+      Opts :: [{timeout, timeout()} | {persistent, boolean()}].
 
 unset_env(Application, Key, infinity) ->
-    application_controller:unset_env(Application, Key, infinity);
+    unset_env(Application, Key, [{timeout, infinity}]);
 unset_env(Application, Key, Timeout) when is_integer(Timeout), Timeout>=0 ->
-    application_controller:unset_env(Application, Key, Timeout).
+    unset_env(Application, Key, [{timeout, Timeout}]);
+unset_env(Application, Key, Opts) when is_list(Opts) ->
+    application_controller:unset_env(Application, Key, Opts).
 
 -spec get_env(Par) -> 'undefined' | {'ok', Val} when
       Par :: atom(),
diff --git a/lib/kernel/src/application_controller.erl b/lib/kernel/src/application_controller.erl
index 9ed2c7a7d9..ed13035104 100644
--- a/lib/kernel/src/application_controller.erl
+++ b/lib/kernel/src/application_controller.erl
@@ -461,14 +461,16 @@ permit_application(ApplName, Flag) ->
 
 
 set_env(AppName, Key, Val) ->
-    gen_server:call(?AC, {set_env, AppName, Key, Val}).
-set_env(AppName, Key, Val, Timeout) ->
-    gen_server:call(?AC, {set_env, AppName, Key, Val}, Timeout).
+    gen_server:call(?AC, {set_env, AppName, Key, Val, []}).
+set_env(AppName, Key, Val, Opts) ->
+    Timeout = proplists:get_value(timeout, Opts, 5000),
+    gen_server:call(?AC, {set_env, AppName, Key, Val, Opts}, Timeout).
 
 unset_env(AppName, Key) ->
-    gen_server:call(?AC, {unset_env, AppName, Key}).
-unset_env(AppName, Key, Timeout) ->
-    gen_server:call(?AC, {unset_env, AppName, Key}, Timeout).
+    gen_server:call(?AC, {unset_env, AppName, Key, []}).
+unset_env(AppName, Key, Opts) ->
+    Timeout = proplists:get_value(timeout, Opts, 5000),
+    gen_server:call(?AC, {unset_env, AppName, Key, Opts}, Timeout).
 
 %%%-----------------------------------------------------------------
 %%% call-back functions from gen_server
@@ -488,7 +490,7 @@ init(Init, Kernel) ->
 	    %% called during start-up of any app.
 	    case check_conf_data(ConfData) of
 		ok ->
-		    ets:new(ac_tab, [set, public, named_table]),
+		    _ = ets:new(ac_tab, [set, public, named_table]),
 		    S = #state{conf_data = ConfData},
 		    {ok, KAppl} = make_appl(Kernel),
 		    case catch load(S, KAppl) of
@@ -609,8 +611,8 @@ check_para([Else | _ParaList], AppName) ->
                | {'change_application_data', _, _}
                | {'permit_application', atom() | {'application',atom(),_},_}
                | {'start_application', _, _}
-               | {'unset_env', _, _}
-               | {'set_env', _, _, _}.
+               | {'unset_env', _, _, _}
+               | {'set_env', _, _, _, _}.
 
 -spec handle_call(calls(), {pid(), term()}, state()) ->
         {'noreply', state()} | {'reply', term(), state()}.
@@ -858,13 +860,25 @@ handle_call(which_applications, _From, S) ->
 	       end, S#state.running),
     {reply, Reply, S};
 
-handle_call({set_env, AppName, Key, Val}, _From, S) ->
+handle_call({set_env, AppName, Key, Val, Opts}, _From, S) ->
     ets:insert(ac_tab, {{env, AppName, Key}, Val}),
-    {reply, ok, S};
+    case proplists:get_value(persistent, Opts, false) of
+	true ->
+	    Fun = fun(Env) -> lists:keystore(Key, 1, Env, {Key, Val}) end,
+	    {reply, ok, S#state{conf_data = change_app_env(S#state.conf_data, AppName, Fun)}};
+	false ->
+	    {reply, ok, S}
+    end;
 
-handle_call({unset_env, AppName, Key}, _From, S) ->
+handle_call({unset_env, AppName, Key, Opts}, _From, S) ->
     ets:delete(ac_tab, {env, AppName, Key}),
-    {reply, ok, S};
+    case proplists:get_value(persistent, Opts, false) of
+	true ->
+	    Fun = fun(Env) -> lists:keydelete(Key, 1, Env) end,
+	    {reply, ok, S#state{conf_data = change_app_env(S#state.conf_data, AppName, Fun)}};
+	false ->
+	    {reply, ok, S}
+    end;
 
 handle_call({control_application, AppName}, {Pid, _Tag}, S) ->
     Control = S#state.control,
@@ -1640,6 +1654,16 @@ merge_env([{App, AppEnv1} | T], Env2, Res) ->
 merge_env([], Env2, Res) ->
     Env2 ++ Res.
 
+%% Changes the environment for the given application
+%% If there is no application, an empty one is created
+change_app_env(Env, App, Fun) ->
+    case get_env_key(App, Env) of
+	{value, AppEnv, RestEnv} ->
+	    [{App, Fun(AppEnv)} | RestEnv];
+	_ ->
+	    [{App, Fun([])} | Env]
+    end.
+
 %% Merges envs for an application.  Env2 overrides Env1
 merge_app_env(Env1, Env2) ->
     merge_app_env(Env1, Env2, []).
@@ -1949,10 +1973,10 @@ test_change_apps(Apps, Conf) ->
 test_do_change_appl([], _, _) ->
     ok;
 test_do_change_appl([A|Apps], [], [R|Res]) ->
-    do_change_appl(R, #appl{name = A}, []),
+    _ = do_change_appl(R, #appl{name = A}, []),
     test_do_change_appl(Apps, [], Res);
 test_do_change_appl([A|Apps], [C|Conf], [R|Res]) ->
-    do_change_appl(R, #appl{name = A}, C),
+    _ = do_change_appl(R, #appl{name = A}, C),
     test_do_change_appl(Apps, Conf, Res).
 
 test_make_apps([], Res) ->
diff --git a/lib/kernel/src/application_master.erl b/lib/kernel/src/application_master.erl
index 3e636197bb..bc15b5a7de 100644
--- a/lib/kernel/src/application_master.erl
+++ b/lib/kernel/src/application_master.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %% 
 %% The 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 @@
 
 -include("application_master.hrl").
 
--record(state, {child, appl_data, children = [], procs = 0, gleader}).
+-record(state, {child, appl_data, children = [], procs = 0, gleader, req=[]}).
 
 %%-----------------------------------------------------------------
 %% Func: start_link/1
@@ -125,7 +125,7 @@ init(Parent, Starter, ApplData, Type) ->
     State = #state{appl_data = ApplData, gleader = OldGleader},
     case start_it(State, Type) of
 	{ok, Pid} ->          % apply(M,F,A) returned ok
-	    set_timer(ApplData#appl_data.maxT),
+	    ok = set_timer(ApplData#appl_data.maxT),
 	    unlink(Starter),
 	    proc_lib:init_ack(Starter, {ok,self()}),
 	    main_loop(Parent, State#state{child = Pid});
@@ -205,22 +205,25 @@ terminate_loop(Child, State) ->
 
 %%-----------------------------------------------------------------
 %% The Application Master is linked to *all* processes in the group
-%% (application).  
+%% (application).
 %%-----------------------------------------------------------------
 handle_msg({get_child, Tag, From}, State) ->
-    From ! {Tag, get_child_i(State#state.child)},
-    State;
+    get_child_i(State, Tag, From);
 handle_msg({stop, Tag, From}, State) ->
     catch terminate(normal, State),
     From ! {Tag, ok},
     exit(normal);
+handle_msg({child, Ref, GrandChild, Mod}, #state{req=Reqs0}=State) ->
+    {value, {_, Tag, From}, Reqs} = lists:keytake(Ref, 1, Reqs0),
+    From ! {Tag, {GrandChild, Mod}},
+    State#state{req=Reqs};
 handle_msg(_, State) ->
     State.
 
-
-terminate(Reason, State) ->
-    terminate_child(State#state.child, State),
-    kill_children(State#state.children),
+terminate(Reason, State = #state{child=Child, children=Children, req=Reqs}) ->
+    _ = [From ! {Tag, error} || {_, Tag, From} <- Reqs],
+    terminate_child(Child, State),
+    kill_children(Children),
     exit(Reason).
 
 
@@ -342,8 +345,8 @@ start_supervisor(Type, M, A) ->
 
 loop_it(Parent, Child, Mod, AppState) ->
     receive
-	{Parent, get_child} ->
-	    Parent ! {self(), Child, Mod},
+	{Parent, get_child, Ref} ->
+	    Parent ! {child, Ref, Child, Mod},
 	    loop_it(Parent, Child, Mod, AppState);
 	{Parent, terminate} ->
 	    NewAppState = prep_stop(Mod, AppState),
@@ -382,10 +385,15 @@ prep_stop(Mod, AppState) ->
 	    NewAppState
     end.
 
-get_child_i(Child) ->
-    Child ! {self(), get_child},
-    receive
-	{Child, GrandChild, Mod} -> {GrandChild, Mod}
+get_child_i(#state{child=Child, req=Reqs}=State, Tag, From) ->
+    Ref = erlang:make_ref(),
+    case erlang:is_process_alive(Child) of
+	true ->
+	    Child ! {self(), get_child, Ref},
+	    State#state{req=[{Ref, Tag, From}|Reqs]};
+	false ->
+	    From ! {Tag, error},
+	    State
     end.
 
 terminate_child_i(Child, State) ->
@@ -418,4 +426,6 @@ kill_all_procs_1([], _, 0) -> ok;
 kill_all_procs_1([], _, _) -> kill_all_procs().
 
 set_timer(infinity) -> ok;
-set_timer(Time) -> timer:exit_after(Time, timeout).
+set_timer(Time) ->
+    {ok, _} = timer:exit_after(Time, timeout),
+    ok.
diff --git a/lib/kernel/src/auth.erl b/lib/kernel/src/auth.erl
index 7d463103e3..eda35147d3 100644
--- a/lib/kernel/src/auth.erl
+++ b/lib/kernel/src/auth.erl
@@ -324,7 +324,7 @@ read_cookie(Name, Size) ->
 	{ok, File} ->
 	    case file:read(File, Size) of
 		{ok, List} ->
-		    file:close(File),
+		    ok = file:close(File),
 		    check_cookie(List, []);
 		{error, Reason} ->
 		    make_error(Name, Reason)
@@ -376,7 +376,7 @@ create_cookie(Name) ->
     case file:open(Name, [write, raw]) of
 	{ok, File} ->
 	    R1 = file:write(File, Cookie),
-	    file:close(File),
+	    ok = file:close(File),
 	    R2 = file:raw_write_file_info(Name, make_info(Name)),
 	    case {R1, R2} of
 		{ok, ok} ->
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 03fba96d4b..0eda558ed5 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -364,7 +364,7 @@ load_code_server_prerequisites() ->
 	      lists,
 	      os,
 	      unicode],
-    [M = M:module_info(module) || M <- Needed],
+    _ = [M = M:module_info(module) || M <- Needed],
     ok.
 
 do_stick_dirs() ->
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
index 5d74e8620b..fc7ac08699 100644
--- a/lib/kernel/src/code_server.erl
+++ b/lib/kernel/src/code_server.erl
@@ -153,7 +153,7 @@ loop(#state{supervisor=Supervisor}=State0) ->
 	{code_call, Pid, Req} ->
 	    case handle_call(Req, {Pid, call}, State0) of
 		{reply, Res, State} ->
-		    reply(Pid, Res),
+		    _ = reply(Pid, Res),
 		    loop(State);
 		{noreply, State} ->
 		    loop(State);
@@ -1410,45 +1410,236 @@ absname_vr([[X, $:]|Name], _, _AbsBase) ->
 do_purge(Mod0) ->
     Mod = to_atom(Mod0),
     case erlang:check_old_code(Mod) of
-	false -> false;
-	true -> do_purge(processes(), Mod, false)
-    end.
-
-do_purge([P|Ps], Mod, Purged) ->
-    case erlang:check_process_code(P, Mod) of
+	false ->
+	    false;
 	true ->
-	    Ref = erlang:monitor(process, P),
-	    exit(P, kill),
-	    receive
-		{'DOWN',Ref,process,_Pid,_} -> ok
+	    Res = check_proc_code(erlang:processes(), Mod, true),
+	    try
+		erlang:purge_module(Mod)
+	    catch
+		_:_ -> ignore
 	    end,
-	    do_purge(Ps, Mod, true);
-	false ->
-	    do_purge(Ps, Mod, Purged)
-    end;
-do_purge([], Mod, Purged) ->
-    catch erlang:purge_module(Mod),
-    Purged.
+	    Res
+    end.
 
 %% do_soft_purge(Module)
 %% Purge old code only if no procs remain that run old code.
 %% Return true in that case, false if procs remain (in this
 %% case old code is not purged)
 
-do_soft_purge(Mod) ->
+do_soft_purge(Mod0) ->
+    Mod = to_atom(Mod0),
     case erlang:check_old_code(Mod) of
-	false -> true;
-	true -> do_soft_purge(processes(), Mod)
+	false ->
+	    true;
+	true ->
+	    case check_proc_code(erlang:processes(), Mod, false) of
+		false ->
+		    false;
+		true ->
+		    try
+			erlang:purge_module(Mod)
+		    catch
+			_:_ -> ignore
+		    end,
+		    true
+	    end
     end.
 
-do_soft_purge([P|Ps], Mod) ->
-    case erlang:check_process_code(P, Mod) of
-	true -> false;
-	false -> do_soft_purge(Ps, Mod)
+%%
+%% check_proc_code(Pids, Mod, Hard) - Send asynchronous
+%%   requests to all processes to perform a check_process_code
+%%   operation. Each process will check their own state and
+%%   reply with the result. If 'Hard' equals
+%%   - true, processes that refer 'Mod' will be killed. If
+%%     any processes were killed true is returned; otherwise,
+%%     false.
+%%   - false, and any processes refer 'Mod', false will
+%%     returned; otherwise, true.
+%%
+%%   Requests will be sent to all processes identified by
+%%   Pids at once, but without allowing GC to be performed.
+%%   Check process code operations that are aborted due to
+%%   GC need, will be restarted allowing GC. However, only
+%%   ?MAX_CPC_GC_PROCS outstanding operation allowing GC at
+%%   a time will be allowed. This in order not to blow up
+%%   memory wise.
+%%
+%%   We also only allow ?MAX_CPC_NO_OUTSTANDING_KILLS
+%%   outstanding kills. This both in order to avoid flooding
+%%   our message queue with 'DOWN' messages and limiting the
+%%   amount of memory used to keep references to all
+%%   outstanding kills.
+%%
+
+%% We maybe should allow more than two outstanding
+%% GC requests, but for now we play it safe...
+-define(MAX_CPC_GC_PROCS, 2).
+-define(MAX_CPC_NO_OUTSTANDING_KILLS, 10).
+
+-record(cpc_static, {hard, module, tag}).
+
+-record(cpc_kill, {outstanding = [],
+		   no_outstanding = 0,
+		   waiting = [],
+		   killed = false}).
+
+check_proc_code(Pids, Mod, Hard) ->
+    Tag = erlang:make_ref(),
+    CpcS = #cpc_static{hard = Hard,
+		       module = Mod,
+		       tag = Tag},
+    check_proc_code(CpcS, cpc_init(CpcS, Pids, 0), 0, [], #cpc_kill{}, true).
+
+check_proc_code(#cpc_static{hard = true}, 0, 0, [],
+		#cpc_kill{outstanding = [], waiting = [], killed = Killed},
+		true) ->
+    %% No outstanding requests. We did a hard check, so result is whether or
+    %% not we killed any processes...
+    Killed;
+check_proc_code(#cpc_static{hard = false}, 0, 0, [], _KillState, Success) ->
+    %% No outstanding requests and we did a soft check...
+    Success;
+check_proc_code(#cpc_static{hard = false, tag = Tag} = CpcS, NoReq0, NoGcReq0,
+		[], _KillState, false) ->
+    %% Failed soft check; just cleanup the remaining replies corresponding
+    %% to the requests we've sent...
+    {NoReq1, NoGcReq1} = receive
+			     {check_process_code, {Tag, _P, GC}, _Res} ->
+				 case GC of
+				     false -> {NoReq0-1, NoGcReq0};
+				     true -> {NoReq0, NoGcReq0-1}
+				 end
+			 end,
+    check_proc_code(CpcS, NoReq1, NoGcReq1, [], _KillState, false);
+check_proc_code(#cpc_static{tag = Tag} = CpcS, NoReq0, NoGcReq0, NeedGC0,
+		KillState0, Success) ->
+
+    %% Check if we should request a GC operation
+    {NoGcReq1, NeedGC1} = case NoGcReq0 < ?MAX_CPC_GC_PROCS of
+			      GcOpAllowed when GcOpAllowed == false;
+					       NeedGC0 == [] ->
+				  {NoGcReq0, NeedGC0};
+			      _ ->
+				  {NoGcReq0+1, cpc_request_gc(CpcS,NeedGC0)}
+			  end,
+
+    %% Wait for a cpc reply or 'DOWN' message
+    {NoReq1, NoGcReq2, Pid, Result, KillState1} = cpc_recv(Tag,
+							   NoReq0,
+							   NoGcReq1,
+							   KillState0),
+
+    %% Check the result of the reply
+    case Result of
+	aborted ->
+	    %% Operation aborted due to the need to GC in order to
+	    %% determine if the process is referring the module.
+	    %% Schedule the operation for restart allowing GC...
+	    check_proc_code(CpcS, NoReq1, NoGcReq2, [Pid|NeedGC1], KillState1,
+			    Success);
+	false ->
+	    %% Process not referring the module; done with this process...
+	    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1, KillState1,
+			    Success);
+	true ->
+	    %% Process referring the module...
+	    case CpcS#cpc_static.hard of
+		false ->
+		    %% ... and soft check. The whole operation failed so
+		    %% no point continuing; clean up and fail...
+		    check_proc_code(CpcS, NoReq1, NoGcReq2, [], KillState1,
+				    false);
+		true ->
+		    %% ... and hard check; schedule kill of it...
+		    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1,
+				    cpc_sched_kill(Pid, KillState1), Success)
+	    end;
+	'DOWN' ->
+	    %% Handled 'DOWN' message
+	    check_proc_code(CpcS, NoReq1, NoGcReq2, NeedGC1,
+			    KillState1, Success)
+    end.
+
+cpc_recv(Tag, NoReq, NoGcReq, #cpc_kill{outstanding = []} = KillState) ->
+    receive
+	{check_process_code, {Tag, Pid, GC}, Res} ->
+	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
     end;
-do_soft_purge([], Mod) ->
-    catch erlang:purge_module(Mod),
-    true.
+cpc_recv(Tag, NoReq, NoGcReq,
+	 #cpc_kill{outstanding = [R0, R1, R2, R3, R4 | _]} = KillState) ->
+    receive
+	{'DOWN', R, process, _, _} when R == R0;
+					R == R1;
+					R == R2;
+					R == R3;
+					R == R4 ->
+	    cpc_handle_down(NoReq, NoGcReq, R, KillState); 
+	{check_process_code, {Tag, Pid, GC}, Res} ->
+	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
+    end;
+cpc_recv(Tag, NoReq, NoGcReq, #cpc_kill{outstanding = [R|_]} = KillState) ->
+    receive
+	{'DOWN', R, process, _, _} ->
+	    cpc_handle_down(NoReq, NoGcReq, R, KillState); 
+	{check_process_code, {Tag, Pid, GC}, Res} ->
+	    cpc_handle_cpc(NoReq, NoGcReq, GC, Pid, Res, KillState)
+    end.
+
+cpc_handle_down(NoReq, NoGcReq, R, #cpc_kill{outstanding = Rs,
+					     no_outstanding = N} = KillState) ->
+    {NoReq, NoGcReq, undefined, 'DOWN',
+     cpc_sched_kill_waiting(KillState#cpc_kill{outstanding = cpc_list_rm(R, Rs),
+					       no_outstanding = N-1})}.
+
+cpc_list_rm(R, [R|Rs]) ->
+    Rs;
+cpc_list_rm(R0, [R1|Rs]) ->
+    [R1|cpc_list_rm(R0, Rs)].
+
+cpc_handle_cpc(NoReq, NoGcReq, false, Pid, Res, KillState) ->
+    {NoReq-1, NoGcReq, Pid, Res, KillState};
+cpc_handle_cpc(NoReq, NoGcReq, true, Pid, Res, KillState) ->
+    {NoReq, NoGcReq-1, Pid, Res, KillState}.
+
+cpc_sched_kill_waiting(#cpc_kill{waiting = []} = KillState) ->
+    KillState;
+cpc_sched_kill_waiting(#cpc_kill{outstanding = Rs,
+				 no_outstanding = N,
+				 waiting = [P|Ps]} = KillState) ->
+    R = erlang:monitor(process, P),
+    exit(P, kill),
+    KillState#cpc_kill{outstanding = [R|Rs],
+		       no_outstanding = N+1,
+		       waiting = Ps,
+		       killed = true}.
+
+cpc_sched_kill(Pid, #cpc_kill{no_outstanding = N, waiting = Pids} = KillState)
+  when N >= ?MAX_CPC_NO_OUTSTANDING_KILLS ->
+    KillState#cpc_kill{waiting = [Pid|Pids]};
+cpc_sched_kill(Pid,
+	       #cpc_kill{outstanding = Rs, no_outstanding = N} = KillState) ->
+    R = erlang:monitor(process, Pid),
+    exit(Pid, kill),
+    KillState#cpc_kill{outstanding = [R|Rs],
+		       no_outstanding = N+1,
+		       killed = true}.
+
+cpc_request(#cpc_static{tag = Tag, module = Mod}, Pid, AllowGc) ->
+    erlang:check_process_code(Pid, Mod, [{async, {Tag, Pid, AllowGc}},
+					 {allow_gc, AllowGc}]).
+
+cpc_request_gc(CpcS, [Pid|Pids]) ->
+    cpc_request(CpcS, Pid, true),
+    Pids.
+
+cpc_init(_CpcS, [], NoReqs) ->
+    NoReqs;
+cpc_init(CpcS, [Pid|Pids], NoReqs) ->
+    cpc_request(CpcS, Pid, false),
+    cpc_init(CpcS, Pids, NoReqs+1).
+
+% end of check_proc_code() implementation.
 
 is_loaded(M, Db) ->
     case ets:lookup(Db, M) of
@@ -1505,13 +1696,13 @@ finish_on_load_1(Mod, File, OnLoadRes, WaitingPids, Db) ->
     erlang:finish_after_on_load(Mod, Keep),
     Res = case Keep of
 	      false ->
-		  finish_on_load_report(Mod, OnLoadRes),
+		  _ = finish_on_load_report(Mod, OnLoadRes),
 		  {error,on_load_failure};
 	      true ->
 		  ets:insert(Db, {Mod,File}),
 		  {module,Mod}
 	  end,
-    [reply(Pid, Res) || Pid <- WaitingPids],
+    _ = [reply(Pid, Res) || Pid <- WaitingPids],
     ok.
 
 finish_on_load_report(_Mod, Atom) when is_atom(Atom) ->
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index c238eff12f..9a7726cfa0 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1076,13 +1076,13 @@ log_end(S, [], [], Sync) ->
 log_end(S, Pids, Bins, Sync) ->
     case do_log(get(log), rflat(Bins)) of
 	N when is_integer(N) ->
-	    replies(Pids, ok),
+	    ok = replies(Pids, ok),
 	    S1 = (state_ok(S))#state{cnt = S#state.cnt+N},
 	    log_end_sync(S1, Sync);
         {error, {error, {full, _Name}}, N} when Pids =:= [] ->
             log_end_sync(state_ok(S#state{cnt = S#state.cnt + N}), Sync);
 	{error, Error, N} ->
-	    replies(Pids, Error),
+	    ok = replies(Pids, Error),
 	    state_err(S#state{cnt = S#state.cnt + N}, Error)
     end.
 
@@ -1091,7 +1091,7 @@ log_end_sync(S, []) ->
     S;
 log_end_sync(S, Sync) ->
     Res = do_sync(get(log)),
-    replies(Sync, Res),
+    ok = replies(Sync, Res),
     state_err(S, Res).
 
 %% Inlined.
@@ -1183,7 +1183,7 @@ do_exit(S, From, Message0, Reason) ->
 		  _ -> Message0
 	      end,
     _ = disk_log_server:close(self()),
-    replies(From, Message),
+    ok = replies(From, Message),
     ?PROFILE(ep:done()),
     exit(Reason).
 
@@ -1881,7 +1881,8 @@ replies(Pids, Reply) ->
     send_reply(Pids, M).
 
 send_reply(Pid, M) when is_pid(Pid) ->
-    Pid ! M;
+    Pid ! M,
+    ok;
 send_reply([Pid | Pids], M) ->
     Pid ! M,
     send_reply(Pids, M);
@@ -2022,7 +2023,7 @@ notify_owners(Note) ->
 
 cache_error(S, Pids) ->
     Error = S#state.cache_error,
-    replies(Pids, Error),
+    ok = replies(Pids, Error),
     state_err(S#state{cache_error = ok}, Error).
 
 state_ok(S) ->
diff --git a/lib/kernel/src/disk_log_1.erl b/lib/kernel/src/disk_log_1.erl
index 9d431bdd30..59f5cad001 100644
--- a/lib/kernel/src/disk_log_1.erl
+++ b/lib/kernel/src/disk_log_1.erl
@@ -295,12 +295,18 @@ read_chunk_ro(FdC, FileName, Pos, MaxBytes) ->
     pread(FdC, FileName, Pos + ?HEADSZ, MaxBytes).
 
 %% -> ok | throw(Error)
-close(#cache{fd = Fd, c = []}, _FileName, read_only) ->
-    file:close(Fd);
+close(#cache{fd = Fd, c = []}, FileName, read_only) ->
+    case file:close(Fd) of
+        ok -> ok;
+        Error -> file_error(FileName, Error)
+    end;
 close(#cache{fd = Fd, c = C}, FileName, read_write) ->
     {Reply, _NewFdC} = write_cache(Fd, FileName, C),
     mark(Fd, FileName, ?CLOSED),
-    file:close(Fd),
+    case file:close(Fd) of
+        ok -> ok;
+        Error -> file_error(FileName, Error)
+    end,
     if Reply =:= ok -> ok; true -> throw(Reply) end.
 
 %% Open an internal file. Head is ignored if Mode is read_only.
@@ -320,7 +326,10 @@ int_open(FName, Repair, read_write, Head) ->
 		{ok, FileHead} ->
 		    case is_head(FileHead) of
 			yes ->
-			    file:close(Fd),
+                            case file:close(Fd) of
+                                ok -> ok;
+                                Error2 -> file_error(FName, Error2)
+                            end,
 			    case open_update(FName) of
 				{ok, Fd2} ->
 				    mark(Fd2, FName, ?OPENED),
@@ -333,14 +342,14 @@ int_open(FName, Repair, read_write, Head) ->
 			yes_not_closed when Repair ->
 			    repair(Fd, FName);
 			yes_not_closed when not Repair ->
-			    file:close(Fd),
+			    _ = file:close(Fd),
 			    throw({error, {need_repair, FName}});
 			no ->
-			    file:close(Fd),
+			    _ = file:close(Fd),
 			    throw({error, {not_a_log_file, FName}})
 		    end;
 		eof ->
-		    file:close(Fd),
+		    _= file:close(Fd),
 		    throw({error, {not_a_log_file, FName}});
 		Error ->
 		    file_error_close(Fd, FName, Error)
@@ -363,11 +372,11 @@ int_open(FName, _Repair, read_only, _Head) ->
                             FdC = #cache{fd = Fd},
 			    {ok, {existed, FdC, {0, 0}, P}};
 			no ->
-			    file:close(Fd),
+			    _= file:close(Fd),
 			    throw({error, {not_a_log_file, FName}})
 		    end;
 		eof ->
-		    file:close(Fd),
+		    _ = file:close(Fd),
 		    throw({error, {not_a_log_file, FName}});
 		Error ->
 		    file_error_close(Fd, FName, Error)
@@ -398,7 +407,7 @@ int_log_head(Fd, Head) ->
 	none ->
 	    {#cache{fd = Fd}, 0, 0};
 	Error -> 
-	    file:close(Fd),
+	    _= file:close(Fd),
 	    throw(Error)
     end.
     
@@ -450,13 +459,13 @@ ext_log_head(Fd, Head) ->
 	none ->
 	    {#cache{fd = Fd}, {0, 0}};
 	Error -> 
-            file:close(Fd),
+            _= file:close(Fd),
 	    throw(Error)
     end.
     
 %% -> _Any | throw()
 mark(Fd, FileName, What) ->
-    position_close2(Fd, FileName, 4),
+    {ok, _} = position_close2(Fd, FileName, 4),
     fwrite_close2(Fd, FileName, What).
 
 %% -> {ok, Bin} | Error
@@ -560,7 +569,7 @@ scan_f2(B, FSz, Ack, No, Bad, Size, Tail) ->
     end.
 
 done_scan(In, Out, OutName, FName, RecoveredTerms, BadChars) ->
-    file:close(In),
+    _ = file:close(In),
     case catch fclose(Out, OutName) of
         ok ->
             case file:rename(OutName, FName) of
@@ -574,21 +583,21 @@ done_scan(In, Out, OutName, FName, RecoveredTerms, BadChars) ->
                             file_error(FName, Error)
                     end;
                 Error ->
-                    file:delete(OutName),
+                    _ = file:delete(OutName),
                     file_error(FName, Error)
             end;
         Error ->
-            file:delete(OutName),
+            _ = file:delete(OutName),
             throw(Error)
     end.
 
 -spec repair_err(file:io_device(), #cache{}, file:filename(),
 		 file:filename(), {'error', file:posix()}) -> no_return().
 repair_err(In, Out, OutName, ErrFileName, Error) ->
-    file:close(In),
+    _= file:close(In),
     catch fclose(Out, OutName),
     %% OutName is often the culprit, try to remove it anyway...
-    file:delete(OutName), 
+    _ = file:delete(OutName),
     file_error(ErrFileName, Error).
 
 %% Used by wrap_log_reader.
@@ -764,10 +773,10 @@ mf_int_chunk(Handle, {FileNo, Pos}, Bin, N) ->
 	{ok, {_Alloc, FdC, _HeadSize, _FileSize}} ->
 	    case chunk(FdC, FName, Pos, Bin, N) of
 		{NewFdC, eof} ->
-		    file:close(NewFdC#cache.fd),
+		    _ = file:close(NewFdC#cache.fd),
 		    mf_int_chunk(Handle, {NFileNo, 0}, [], N);
 		{NewFdC, Other} ->
-		    file:close(NewFdC#cache.fd),
+		    _ = file:close(NewFdC#cache.fd),
 		    {Handle, conv(Other, FileNo)}
 	    end
     end.
@@ -792,10 +801,10 @@ mf_int_chunk_read_only(Handle, {FileNo, Pos}, Bin, N) ->
 	{ok, {_Alloc, FdC, _HeadSize, _FileSize}} ->
 	    case do_chunk_read_only(FdC, FName, Pos, Bin, N) of
 		{NewFdC, eof} ->
-		    file:close(NewFdC#cache.fd),
+		    _ = file:close(NewFdC#cache.fd),
 		    mf_int_chunk_read_only(Handle, {NFileNo,0}, [], N);
 		{NewFdC, Other} ->
-		    file:close(NewFdC#cache.fd),
+		    _ = file:close(NewFdC#cache.fd),
 		    {Handle, conv(Other, FileNo)}
 	    end
     end.
@@ -1017,7 +1026,7 @@ ext_file_open(FName, NewFile, OldFile, OldCnt, Head, Repair, Mode) ->
 
 read_index_file(truncate, FName, MaxF) ->
     remove_files(FName, 2, MaxF),
-    file:delete(?index_file_name(FName)),
+    _ = file:delete(?index_file_name(FName)),
     {1, 0, 0, 0};
 read_index_file(_, FName, _MaxF) ->
     read_index_file(FName).
@@ -1043,7 +1052,7 @@ read_index_file(FName) ->
 		    _ErrorOrEof ->
 			{1, 0, 0, 0}
 		end,
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    R;
 	_Error ->
 	    {1, 0, 0, 0}
@@ -1096,7 +1105,7 @@ write_index_file(read_write, FName, NewFile, OldFile, OldCnt) ->
                         %% Very old format, convert to the latest format!
 			case file:read_file(FileName) of
 			    {ok, <<_CurF, Tail/binary>>} ->
-				position_close2(Fd, FileName, bof),
+				{ok, _} = position_close2(Fd, FileName, bof),
 				Bin = <<0, 0:32, ?VERSION, NewFile:32>>,
 				NewTail = to_8_bytes(Tail, [], FileName, Fd),
 				fwrite_close2(Fd, FileName, [Bin | NewTail]),
@@ -1115,7 +1124,7 @@ write_index_file(read_write, FName, NewFile, OldFile, OldCnt) ->
 		    R = file:pread(Fd, NewPos, SzSz),
 		    OldPos = Offset + (OldFile - 1)*SzSz,
 		    pwrite_close2(Fd, FileName, OldPos, OldCntBin),
-		    file:close(Fd),
+		    _ = file:close(Fd),
 		    case R of
 			{ok, <<Lost:SzSz/unit:8>>} -> Lost;
 			{ok, _} -> 
@@ -1125,7 +1134,7 @@ write_index_file(read_write, FName, NewFile, OldFile, OldCnt) ->
 		    end;
 		true -> 	
 		    pwrite_close2(Fd, FileName, NewPos, OldCntBin),
-		    file:close(Fd),
+		    _ = file:close(Fd),
 		    0
 	    end;
 	E -> 
@@ -1137,7 +1146,7 @@ to_8_bytes(<<N:32,T/binary>>, NT, FileName, Fd) ->
 to_8_bytes(B, NT, _FileName, _Fd) when byte_size(B) =:= 0 ->
     NT;
 to_8_bytes(_B, _NT, FileName, Fd) ->
-    file:close(Fd),
+    _ = file:close(Fd),
     throw({error, {invalid_index_file, FileName}}).
 
 %% -> ok | throw(FileError)
@@ -1147,7 +1156,7 @@ index_file_trunc(FName, N) ->
 	{ok, Fd} ->
 	    case file:read(Fd, 6) of
 		eof ->
-		    file:close(Fd),
+		    _ = file:close(Fd),
 		    ok;
 		{ok, <<0, 0:32, Version>>} when Version =:= ?VERSION ->
 		    truncate_index_file(Fd, FileName, 10, 8, N);
@@ -1166,10 +1175,10 @@ truncate_index_file(Fd, FileName, Offset, N, SzSz) ->
     Pos = Offset + N*SzSz,
     case Pos > file_size(FileName) of
 	true ->
-	    file:close(Fd);
+	    ok = file:close(Fd);
 	false ->
 	    truncate_at_close2(Fd, FileName, {bof, Pos}),
-	    file:close(Fd)
+	    ok = file:close(Fd)
     end,
     ok.
 	    
@@ -1412,7 +1421,8 @@ fwrite(#cache{c = []} = FdC, _FN, B, Size) ->
             ok;
         _ -> 
             put(write_cache_timer_is_running, true),
-            erlang:send_after(?TIMEOUT, self(), {self(), write_cache})
+            erlang:send_after(?TIMEOUT, self(), {self(), write_cache}),
+            ok
     end,
     {ok, FdC#cache{sz = Size, c = B}};
 fwrite(#cache{sz = Sz, c = C} = FdC, _FN, B, Size) when Sz < ?MAX ->
@@ -1511,7 +1521,7 @@ position_close2(Fd, FileName, Pos) ->
     end.
 	    
 truncate_at_close2(Fd, FileName, Pos) ->
-    position_close2(Fd, FileName, Pos),
+    {ok, _} = position_close2(Fd, FileName, Pos),
     case file:truncate(Fd) of
 	ok    -> ok;
 	Error -> file_error_close(Fd, FileName, Error)
@@ -1519,7 +1529,7 @@ truncate_at_close2(Fd, FileName, Pos) ->
 
 fclose(#cache{fd = Fd, c = C}, FileName) ->
     %% The cache is empty if the file was opened in read_only mode.
-    write_cache_close(Fd, FileName, C),
+    _ = write_cache_close(Fd, FileName, C),
     file:close(Fd).
 
 %% -> {Reply, #cache{}}; Reply = ok | Error
@@ -1549,5 +1559,5 @@ file_error(FileName, {error, Error}) ->
 -spec file_error_close(file:fd(), file:filename(), {'error', file:posix()}) -> no_return().
 
 file_error_close(Fd, FileName, {error, Error}) ->
-    file:close(Fd),
+    _ = file:close(Fd),
     throw({error, {file_error, FileName, Error}}).
diff --git a/lib/kernel/src/disk_log_server.erl b/lib/kernel/src/disk_log_server.erl
index 8894ed87e8..684ea5b5db 100644
--- a/lib/kernel/src/disk_log_server.erl
+++ b/lib/kernel/src/disk_log_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %% 
 %% The 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,8 +83,8 @@ accessible_logs() ->
 
 init([]) ->
     process_flag(trap_exit, true),
-    ets:new(?DISK_LOG_NAME_TABLE, [named_table, set]),
-    ets:new(?DISK_LOG_PID_TABLE, [named_table, set]),
+    _ = ets:new(?DISK_LOG_NAME_TABLE, [named_table, set]),
+    _= ets:new(?DISK_LOG_PID_TABLE, [named_table, set]),
     {ok, #state{}}.
 
 handle_call({open, W, A}, From, State) ->
@@ -159,15 +159,25 @@ ensure_started() ->
 	undefined ->
 	    LogSup = {disk_log_sup, {disk_log_sup, start_link, []}, permanent,
 		      1000, supervisor, [disk_log_sup]},
-	    supervisor:start_child(kernel_safe_sup, LogSup),
+	    {ok, _} = ensure_child_started(kernel_safe_sup, LogSup),
 	    LogServer = {disk_log_server,
 			 {disk_log_server, start_link, []},
 			 permanent, 2000, worker, [disk_log_server]},
-	    supervisor:start_child(kernel_safe_sup, LogServer),
+	    {ok, _} = ensure_child_started(kernel_safe_sup, LogServer),
 	    ok;
 	_ -> ok
     end.
 
+ensure_child_started(Sup,Child) ->
+    case supervisor:start_child(Sup, Child) of
+	{ok,Pid} ->
+	    {ok,Pid};
+	{error,{already_started,Pid}} ->
+	    {ok,Pid};
+	Error ->
+	    Error
+    end.
+
 open([{Req, From} | L], State) ->
     State2 = case do_open(Req, From, State) of
                  {pending, State1} -> 
diff --git a/lib/kernel/src/dist_ac.erl b/lib/kernel/src/dist_ac.erl
index 5c62aa31e9..a4d4ae386c 100644
--- a/lib/kernel/src/dist_ac.erl
+++ b/lib/kernel/src/dist_ac.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -283,7 +283,7 @@ handle_cast(init_sync, _S) ->
 	    KernelConfig ! dist_ac_took_control,
 
 	    %% we're really just interested in nodedowns.
-	    net_kernel:monitor_nodes(true),
+	    ok = net_kernel:monitor_nodes(true),
 	    
 	    {Known, NAppls, RStarted} = sync_dacs(Appls),
 
@@ -321,7 +321,7 @@ handle_call({takeover_application, AppName, RestartType}, From, S) ->
     case keysearch(AppName, #appl.name, Appls) of
 	{value, Appl} when element(1, Appl#appl.id) =:= distributed ->
 	    {distributed, Node} = Appl#appl.id,
-	    ac_takeover(req, AppName, Node, RestartType),
+	    _ = ac_takeover(req, AppName, Node, RestartType),
 	    NAppl = Appl#appl{id = takeover},
 	    NAppls = keyreplace(AppName, #appl.name, Appls, NAppl),
 	    TR = S#state.t_reqs,
@@ -341,10 +341,10 @@ handle_call({permit_application, AppName, Bool, LockId, StartInfo}, From, S) ->
 	    %% here, but we have to be backwards-compatible.
 	    case application_controller:get_loaded(AppName) of
 		{true, _} when not Bool ->
-		    ac_stop_it(AppName),
+		    _ = ac_stop_it(AppName),
 		    {reply, ok, S};
 		{true, _} when Bool ->
-		    ac_start_it(req, AppName),
+		    _ = ac_start_it(req, AppName),
 		    {reply, ok, S};
 		false ->
 		    {reply, {error, {not_loaded, AppName}}, S}
@@ -533,7 +533,7 @@ handle_info({dist_ac_app_started, Node, Name, Res}, S) ->
 			  %% Another node started appl. Update appl list.
 			  {distributed, Node}
 		  end,
-	    ac_started(req, Name, Node),
+	    _ = ac_started(req, Name, Node),
 	    NAppl = Appl#appl{id = NId},
 	    NAppls = keyreplace(Name, #appl.name, Appls, NAppl),
 	    TmpWeights = keydelete_all(Name, 1, S#state.tmp_weights),
@@ -622,7 +622,7 @@ handle_info({nodedown, Node}, S) ->
 			    true ->
 				{true, Appl#appl{id = {failover, Node}}};
 			    false -> 
-				ac_not_running(Appl#appl.name),
+				_ = ac_not_running(Appl#appl.name),
 				{true, Appl#appl{id = undefined}}
 			end;
 		   (_) ->
@@ -656,7 +656,8 @@ handle_info({dist_ac_app_loaded, Node, Name, HisNodes, Permission, HeKnowsMe},
 			    %% he's a new node connecting to us.
 			    Msg = {dist_ac_app_loaded, node(), Name,
 				   Nodes, dist_is_runnable(Appls, Name), true},
-			    {?DIST_AC, Node} ! Msg;
+			    {?DIST_AC, Node} ! Msg,
+                            ok;
 			true ->
 			    ok
 		    end,
@@ -811,29 +812,29 @@ start_appl(AppName, S, Type) ->
 start_distributed(Appl, Name, Nodes, PermittedNodes, S, Type) ->
     case find_start_node(Nodes, PermittedNodes, Name, S) of
 	{ok, Node} when Node =:= node() ->
-	    case Appl#appl.id of
-		{failover, FoNode} when Type =:= req ->
-		    ac_failover(Name, FoNode, undefined);
-		{distributed, Node2} when Type =:= req ->
-		    ac_takeover(req, Name, Node2, undefined);
-		_ when Type =:= reply ->
-		    case lists:keysearch(Name, 2, S#state.remote_started) of
-			{value, {Node3, _}} ->
-			    ac_takeover(reply, Name, Node3, undefined);
-			_ ->
-			    ac_start_it(Type, Name)
-		    end;
-		_ ->
-		    ac_start_it(Type, Name)
-	    end,
+	    _ = case Appl#appl.id of
+		    {failover, FoNode} when Type =:= req ->
+			ac_failover(Name, FoNode, undefined);
+		    {distributed, Node2} when Type =:= req ->
+			ac_takeover(req, Name, Node2, undefined);
+		    _ when Type =:= reply ->
+			case lists:keysearch(Name, 2, S#state.remote_started) of
+			    {value, {Node3, _}} ->
+				ac_takeover(reply, Name, Node3, undefined);
+			    _ ->
+				ac_start_it(Type, Name)
+			end;
+		    _ ->
+			ac_start_it(Type, Name)
+		end,
 	    {run_waiting, true};
 	{already_started, Node} ->
-	    ac_started(Type, Name, Node),
+	    _ = ac_started(Type, Name, Node),
 	    {{distributed, Node}, false};
 	{ok, Node} ->
 	    case keysearch(Name, #appl.name, S#state.appls) of
 		{value, #appl{id = {distributed, Node}}} ->
-		    ac_started(Type, Name, Node),
+		    _ = ac_started(Type, Name, Node),
 		    {{distributed, Node}, false};
 		_ ->
 		    wait_dist_start(Node, Appl, Name, Nodes,
@@ -842,7 +843,7 @@ start_distributed(Appl, Name, Nodes, PermittedNodes, S, Type) ->
 	not_started ->
 	    wait_dist_start2(Appl, Name, Nodes, PermittedNodes, S, Type);
 	no_permission ->
-	    ac_not_started(Type, Name),
+	    _ = ac_not_started(Type, Name),
 	    {undefined, false}
     end.
 
@@ -850,11 +851,11 @@ wait_dist_start(Node, Appl, Name, Nodes, PermittedNodes, S, Type) ->
     monitor_node(Node, true),
     receive
 	{dist_ac_app_started, Node, Name, ok} ->
-	    ac_started(Type, Name, Node),
+	    _ = ac_started(Type, Name, Node),
 	    monitor_node(Node, false),
 	    {{distributed, Node}, false};
 	{dist_ac_app_started, Node, Name, {error, R}} ->
-	    ac_error(Type, Name, {Node, R}),
+	    _ = ac_error(Type, Name, {Node, R}),
 	    monitor_node(Node, false),
 	    {Appl#appl.id, false};
 	{dist_ac_weight, Name, _Weigth, Node} ->
@@ -883,10 +884,10 @@ wait_dist_start(Node, Appl, Name, Nodes, PermittedNodes, S, Type) ->
 wait_dist_start2(Appl, Name, Nodes, PermittedNodes, S, Type) ->
     receive
 	{dist_ac_app_started, Node, Name, ok} ->
-	    ac_started(Type, Name, Node),
+	    _ = ac_started(Type, Name, Node),
 	    {{distributed, Node}, false};
 	{dist_ac_app_started, Node, Name, {error, R}} ->
-	    ac_error(Type, Name, {Node, R}),
+	    _ = ac_error(Type, Name, {Node, R}),
 	    {Appl#appl.id, false};
 	{nodedown, Node} ->
 	    %% A node went down, try to start the app again - there may not
@@ -974,7 +975,7 @@ permit(false, {value, _}, AppName, From, S, _LockId) ->
     case dist_get_runnable_nodes(S#state.appls, AppName) of
 	[] ->
 	    %% There is no runnable node; stop application
-	    ac_stop_it(AppName),
+	    _ = ac_stop_it(AppName),
 	    SReqs = [{AppName, From} | S#state.s_reqs],
 	    {noreply, S#state{s_reqs = SReqs}};
 	Nodes ->
@@ -1155,7 +1156,8 @@ send_nodes(Nodes, Msg) ->
 	    end, FlatNodes).
 
 send_after(Time, Msg) when is_integer(Time), Time >= 0 ->
-    spawn_link(?MODULE, send_timeout, [self(), Time, Msg]);
+    _Pid = spawn_link(?MODULE, send_timeout, [self(), Time, Msg]),
+    ok;
 send_after(_,_) -> % infinity
     ok.
 
@@ -1305,7 +1307,7 @@ check_waiting([{From, AppName, false, Nodes} | Reqs],
 	      S, Node, Appls, Res, SReqs) ->
     case lists:delete(Node, Nodes) of
 	[] ->
-	    ac_stop_it(AppName),
+	    _ = ac_stop_it(AppName),
 	    NSReqs = [{AppName, From} | SReqs],
 	    check_waiting(Reqs, Node, S, Appls, Res, NSReqs);
 	NNodes ->
diff --git a/lib/kernel/src/erl_boot_server.erl b/lib/kernel/src/erl_boot_server.erl
index 0d68d3e198..9a49655a9f 100644
--- a/lib/kernel/src/erl_boot_server.erl
+++ b/lib/kernel/src/erl_boot_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The 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,7 +191,7 @@ init(Slaves) ->
     {ok, UPort} = inet:port(U),
     Ref = make_ref(),
     Pid = proc_lib:spawn_link(?MODULE, boot_init, [Ref]),
-    gen_tcp:controlling_process(L, Pid),
+    ok = gen_tcp:controlling_process(L, Pid),
     Pid ! {Ref, L},
     %% We trap exit inorder to restart boot_init and udp_port 
     process_flag(trap_exit, true),
@@ -233,9 +233,19 @@ handle_info({udp, U, IP, Port, Data}, S0) ->
     %% erlang version as the boot server node
     case {Valid,Data,Token} of
 	{true,Token,Token} ->
-	    gen_udp:send(U,IP,Port,[?EBOOT_REPLY,S0#state.priority,
-				    int16(S0#state.listen_port),
-				    S0#state.version]),
+	    case gen_udp:send(U,IP,Port,[?EBOOT_REPLY,S0#state.priority,
+                                         int16(S0#state.listen_port),
+                                         S0#state.version])
+            of
+                ok -> ok;
+                {error, not_owner} ->
+                    error_logger:error_msg("** Illegal boot server connection attempt: "
+				   "not owner of ~w ** ~n", [U]);
+                {error, Reason} ->
+                    Err = file:format_error(Reason),
+                    error_logger:error_msg("** Illegal boot server connection attempt: "
+				   "~w POSIX error ** ~n", [U, Err])
+            end,
 	    {noreply,S0};
 	{false,_,_} ->
 	    error_logger:error_msg("** Illegal boot server connection attempt: "
@@ -351,7 +361,14 @@ handle_command(S, PS, Msg) ->
     end.
 
 send_file_result(S, Cmd, Result) ->
-    gen_tcp:send(S, term_to_binary({Cmd,Result})).
-
-send_result(S, Result) ->
-    gen_tcp:send(S, term_to_binary(Result)).
+    send_result(S, {Cmd,Result}).
+
+send_result(S, Term) ->
+    case gen_tcp:send(S, term_to_binary(Term)) of
+	ok ->
+	    ok;
+	Error ->
+	    error_logger:error_msg("** Boot server could not send result "
+				   "to socket: ~w** ~n", [Error]),
+	    ok
+    end.
diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
index 91af49f303..b4fae24ef3 100644
--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -217,17 +217,23 @@ do_register_node(NodeName, TcpPort) ->
 	    Extra = "",
 	    Elen = length(Extra),
 	    Len = 1+2+1+1+2+2+2+length(Name)+2+Elen,
-	    gen_tcp:send(Socket, [?int16(Len), ?EPMD_ALIVE2_REQ,
-				   ?int16(TcpPort),
-				   $M,
-				   0,
-				   ?int16(epmd_dist_high()),
-				   ?int16(epmd_dist_low()),
-				   ?int16(length(Name)),
-				   Name,
-				   ?int16(Elen),
-				   Extra]),
-	    wait_for_reg_reply(Socket, []);
+            Packet = [?int16(Len), ?EPMD_ALIVE2_REQ,
+                      ?int16(TcpPort),
+                      $M,
+                      0,
+                      ?int16(epmd_dist_high()),
+                      ?int16(epmd_dist_low()),
+                      ?int16(length(Name)),
+                      Name,
+                      ?int16(Elen),
+                      Extra],
+	    case gen_tcp:send(Socket, Packet) of
+                ok ->
+                    wait_for_reg_reply(Socket, []);
+                Error ->
+                    close(Socket),
+                    Error
+            end;
 	Error ->
 	    Error
     end.
@@ -294,8 +300,14 @@ get_port(Node, EpmdAddress, Timeout) ->
 	{ok, Socket} ->
 	    Name = to_string(Node),
 	    Len = 1+length(Name),
-	    gen_tcp:send(Socket, [?int16(Len),?EPMD_PORT_PLEASE2_REQ, Name]),
-	    wait_for_port_reply(Socket, []);
+	    Msg = [?int16(Len),?EPMD_PORT_PLEASE2_REQ,Name],
+	    case gen_tcp:send(Socket, Msg) of
+		ok ->
+		    wait_for_port_reply(Socket, []);
+		_Error ->
+		    ?port_please_failure2(_Error),
+		    noport
+	    end;
 	_Error -> 
 	    ?port_please_failure2(_Error),
 	    noport
@@ -374,7 +386,7 @@ wait_for_port_reply_name(Socket, Len, Sofar) ->
 %	    io:format("data = ~p~n", _Data),
 	    wait_for_port_reply_name(Socket, Len, Sofar);
 	{tcp_closed, Socket} ->
-	    "foobar"
+	    ok
     end.
 		    
 
@@ -424,19 +436,24 @@ get_names(EpmdAddress) ->
     end.
 
 do_get_names(Socket) ->
-    gen_tcp:send(Socket, [?int16(1),?EPMD_NAMES]),
-    receive
-	{tcp, Socket, [P0,P1,P2,P3|T]} ->
-	    EpmdPort = ?u32(P0,P1,P2,P3),
-	    case get_epmd_port() of
-		EpmdPort ->
-		    names_loop(Socket, T, []);
-		_ ->
-		    close(Socket),
-		    {error, address}
+    case gen_tcp:send(Socket, [?int16(1),?EPMD_NAMES]) of
+	ok ->
+	    receive
+		{tcp, Socket, [P0,P1,P2,P3|T]} ->
+		    EpmdPort = ?u32(P0,P1,P2,P3),
+		    case get_epmd_port() of
+			EpmdPort ->
+			    names_loop(Socket, T, []);
+			_ ->
+			    close(Socket),
+			    {error, address}
+		    end;
+		{tcp_closed, Socket} ->
+		    {ok, []}
 	    end;
-	{tcp_closed, Socket} ->
-	    {ok, []}
+	_ ->
+	    close(Socket),
+	    {error, address}
     end.
 
 names_loop(Socket, Acc, Ps) ->
diff --git a/lib/kernel/src/erl_reply.erl b/lib/kernel/src/erl_reply.erl
index 1a61e630bc..f0be3ee654 100644
--- a/lib/kernel/src/erl_reply.erl
+++ b/lib/kernel/src/erl_reply.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %% 
 %% The 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 @@ reply([Addr,Port,Msg]) ->
     P = list_to_integer(atom_to_list(Port)),
     M = atom_to_list(Msg),
     {ok, S} = gen_tcp:connect(Ip,P,[]),
-    gen_tcp:send(S,M),
+    ok = gen_tcp:send(S,M),
     gen_tcp:close(S),
     reply_done;
 reply(_) ->
diff --git a/lib/kernel/src/error_logger.erl b/lib/kernel/src/error_logger.erl
index 92c1eb80dc..b8fbf02feb 100644
--- a/lib/kernel/src/error_logger.erl
+++ b/lib/kernel/src/error_logger.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,16 +245,18 @@ notify(Msg) ->
 -spec swap_handler(Type :: swap_handler_type()) -> any().
 
 swap_handler(tty) ->
-    gen_event:swap_handler(error_logger, {error_logger, swap},
-			   {error_logger_tty_h, []}),
-    simple_logger();
+    R = gen_event:swap_handler(error_logger, {error_logger, swap},
+                               {error_logger_tty_h, []}),
+    ok = simple_logger(),
+    R;
 swap_handler({logfile, File}) ->
-    gen_event:swap_handler(error_logger, {error_logger, swap},
-			   {error_logger_file_h, File}),
-    simple_logger();
+    R = gen_event:swap_handler(error_logger, {error_logger, swap},
+                               {error_logger_file_h, File}),
+    ok = simple_logger(),
+    R;
 swap_handler(silent) ->
-    gen_event:delete_handler(error_logger, error_logger, delete),
-    simple_logger();
+    _ = gen_event:delete_handler(error_logger, error_logger, delete),
+    ok = simple_logger();
 swap_handler(false) ->
     ok. % keep primitive event handler as-is
 
diff --git a/lib/kernel/src/erts_debug.erl b/lib/kernel/src/erts_debug.erl
index 6654cd9ee7..f7a815882b 100644
--- a/lib/kernel/src/erts_debug.erl
+++ b/lib/kernel/src/erts_debug.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -288,7 +288,7 @@ dff(Name, Fs) when is_list(Name) ->
 	    try
 		dff(F, Fs)
 	    after
-		file:close(F)
+		_ = file:close(F)
 	    end;
 	{error,Reason} ->
 	    {error,{badopen,Reason}}
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 36289053eb..23cf74f80f 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -95,7 +95,8 @@
                       Delay :: non_neg_integer()}
 		   | 'delayed_write' | {'read_ahead', Size :: pos_integer()}
 		   | 'read_ahead' | 'compressed'
-		   | {'encoding', unicode:encoding()}.
+		   | {'encoding', unicode:encoding()}
+		   | sync.
 -type deep_list() :: [char() | atom() | deep_list()].
 -type name()      :: string() | atom() | deep_list().
 -type name_all()  :: string() | atom() | deep_list() | (RawFilename :: binary()).
@@ -110,7 +111,8 @@
 -type date_time() :: calendar:datetime().
 -type posix_file_advise() :: 'normal' | 'sequential' | 'random'
                            | 'no_reuse' | 'will_need' | 'dont_need'.
--type sendfile_option() :: {chunk_size, non_neg_integer()}.
+-type sendfile_option() :: {chunk_size, non_neg_integer()}
+			 | {use_threads, boolean()}.
 -type file_info_option() :: {'time', 'local'} | {'time', 'universal'} 
 			  | {'time', 'posix'}.
 %%% BIFs
@@ -376,7 +378,7 @@ write_file(Name, Bin, ModeList) when is_list(ModeList) ->
 			ok ->
 			    close(Handle);
 			E1 ->
-			    close(Handle),
+			    _ = close(Handle),
 			    E1
 		    end;
 		E2 ->
@@ -770,7 +772,7 @@ copy_int({SourceName, SourceOpts}, Dest, Length)
 	    case open(Source, [read | SourceOpts]) of
 		{ok, Handle} ->
 		    Result = copy_opened_int(Handle, Dest, Length, 0),
-		    close(Handle),
+		    _ = close(Handle),
 		    Result;
 		{error, _} = Error ->
 		    Error
@@ -786,9 +788,16 @@ copy_int(Source, {DestName, DestOpts}, Length)
 	Dest ->
 	    case open(Dest, [write | DestOpts]) of
 		{ok, Handle} ->
-		    Result = copy_opened_int(Source, Handle, Length, 0),
-		    close(Handle),
-		    Result;
+                    case copy_opened_int(Source, Handle, Length, 0) of
+                        {ok, _} = OK ->
+                            case close(Handle) of
+                                ok -> OK;
+                                Error -> Error
+                            end;
+                        Error ->
+                            _ = close(Handle),
+                            Error
+                    end;
 		{error, _} = Error ->
 		    Error
 	    end
@@ -957,7 +966,7 @@ consult(File) ->
     case open(File, [read]) of
 	{ok, Fd} ->
 	    R = consult_stream(Fd),
-	    close(Fd),
+	    _ = close(Fd),
 	    R;
 	Error ->
 	    Error
@@ -977,10 +986,10 @@ path_consult(Path, File) ->
 	{ok, Fd, Full} ->
 	    case consult_stream(Fd) of
 		{ok, List} ->
-		    close(Fd),
+		    _ = close(Fd),
 		    {ok, List, Full};
 		E1 ->
-		    close(Fd),
+		    _ = close(Fd),
 		    E1
 	    end;
 	E2 ->
@@ -1005,7 +1014,7 @@ eval(File, Bs) ->
     case open(File, [read]) of
 	{ok, Fd} ->
 	    R = eval_stream(Fd, ignore, Bs),
-	    close(Fd),
+	    _ = close(Fd),
 	    R;
 	Error ->
 	    Error
@@ -1035,10 +1044,10 @@ path_eval(Path, File, Bs) ->
 	{ok, Fd, Full} ->
 	    case eval_stream(Fd, ignore, Bs) of
 		ok ->
-		    close(Fd),
+		    _ = close(Fd),
 		    {ok, Full};
 		E1 ->
-		    close(Fd),
+		    _ = close(Fd),
 		    E1
 	    end;
 	E2 ->
@@ -1065,7 +1074,7 @@ script(File, Bs) ->
     case open(File, [read]) of
 	{ok, Fd} ->
 	    R = eval_stream(Fd, return, Bs),
-	    close(Fd),
+	    _ = close(Fd),
 	    R;
 	Error ->
 	    Error
@@ -1098,10 +1107,10 @@ path_script(Path, File, Bs) ->
 	{ok,Fd,Full} ->
 	    case eval_stream(Fd, return, Bs) of
 		{ok,R} ->
-		    close(Fd),
+		    _ = close(Fd),
 		    {ok, R, Full};
 		E1 ->
-		    close(Fd),
+		    _ = close(Fd),
 		    E1
 	    end;
 	E2 ->
@@ -1221,8 +1230,7 @@ change_time(Name, {{AY, AM, AD}, {AH, AMin, ASec}}=Atime,
 sendfile(File, _Sock, _Offet, _Bytes, _Opts) when is_pid(File) ->
     {error, badarg};
 sendfile(File, Sock, Offset, Bytes, []) ->
-    sendfile(File, Sock, Offset, Bytes, ?MAX_CHUNK_SIZE, [], [],
-	     false, false, false);
+    sendfile(File, Sock, Offset, Bytes, ?MAX_CHUNK_SIZE, [], [], []);
 sendfile(File, Sock, Offset, Bytes, Opts) ->
     ChunkSize0 = proplists:get_value(chunk_size, Opts, ?MAX_CHUNK_SIZE),
     ChunkSize = if ChunkSize0 > ?MAX_CHUNK_SIZE ->
@@ -1232,8 +1240,7 @@ sendfile(File, Sock, Offset, Bytes, Opts) ->
     %% Support for headers, trailers and options has been removed because the
     %% Darwin and BSD API for using it does not play nice with
     %% non-blocking sockets. See unix_efile.c for more info.
-    sendfile(File, Sock, Offset, Bytes, ChunkSize, [], [],
-	     false,false,false).
+    sendfile(File, Sock, Offset, Bytes, ChunkSize, [], [], Opts).
 
 %% sendfile/2
 -spec sendfile(Filename, Socket) ->
@@ -1247,23 +1254,23 @@ sendfile(Filename, Sock)  ->
 	    {error, Reason};
 	{ok, Fd} ->
 	    Res = sendfile(Fd, Sock, 0, 0, []),
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    Res
     end.
 
 %% Internal sendfile functions
 sendfile(#file_descriptor{ module = Mod } = Fd, Sock, Offset, Bytes,
-	 ChunkSize, Headers, Trailers, Nodiskio, MNowait, Sync)
+	 ChunkSize, Headers, Trailers, Opts)
   when is_port(Sock) ->
     case Mod:sendfile(Fd, Sock, Offset, Bytes, ChunkSize, Headers, Trailers,
-		      Nodiskio, MNowait, Sync) of
+		      Opts) of
 	{error, enotsup} ->
 	    sendfile_fallback(Fd, Sock, Offset, Bytes, ChunkSize,
 			      Headers, Trailers);
 	Else ->
 	    Else
     end;
-sendfile(_,_,_,_,_,_,_,_,_,_) ->
+sendfile(_,_,_,_,_,_,_,_) ->
     {error, badarg}.
 
 %%%
@@ -1298,7 +1305,7 @@ sendfile_fallback(File, Sock, Offset, Bytes, ChunkSize) ->
     {ok, CurrPos} = file:position(File, {cur, 0}),
     {ok, _NewPos} = file:position(File, {bof, Offset}),
     Res = sendfile_fallback_int(File, Sock, Bytes, ChunkSize, 0),
-    file:position(File, {bof, CurrPos}),
+    _ = file:position(File, {bof, CurrPos}),
     Res.
 
 
diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index 0bcb1a658b..0e9ff5bc0f 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -162,29 +162,29 @@ server_loop(#state{mref = Mref} = State) ->
 	{file_request, From, ReplyAs, Request} when is_pid(From) ->
 	    case file_request(Request, State) of
 		{reply, Reply, NewState} ->
-		    file_reply(From, ReplyAs, Reply),
+		    _ = file_reply(From, ReplyAs, Reply),
 		    server_loop(NewState);
 		{error, Reply, NewState} ->
 		    %% error is the same as reply, except that
 		    %% it breaks the io_request_loop further down
-		    file_reply(From, ReplyAs, Reply),
+		    _ = file_reply(From, ReplyAs, Reply),
 		    server_loop(NewState);
 		{stop, Reason, Reply, _NewState} ->
-		    file_reply(From, ReplyAs, Reply),
+		    _ = file_reply(From, ReplyAs, Reply),
 		    exit(Reason)
 	    end;
 	{io_request, From, ReplyAs, Request} when is_pid(From) ->
 	    case io_request(Request, State) of
 		{reply, Reply, NewState} ->
-		    io_reply(From, ReplyAs, Reply),
+		    _ = io_reply(From, ReplyAs, Reply),
 		    server_loop(NewState);
 		{error, Reply, NewState} ->
 		    %% error is the same as reply, except that
 		    %% it breaks the io_request_loop further down
-		    io_reply(From, ReplyAs, Reply),
+		    _ = io_reply(From, ReplyAs, Reply),
 		    server_loop(NewState);
 		{stop, Reason, Reply, _NewState} ->
-		    io_reply(From, ReplyAs, Reply),
+		    _ = io_reply(From, ReplyAs, Reply),
 		    exit(Reason)
 	    end;
 	{'DOWN', Mref, _, _, Reason} ->
diff --git a/lib/kernel/src/file_server.erl b/lib/kernel/src/file_server.erl
index d036dbb516..eabf0401a3 100644
--- a/lib/kernel/src/file_server.erl
+++ b/lib/kernel/src/file_server.erl
@@ -78,7 +78,8 @@ init([]) ->
     process_flag(trap_exit, true),
     case ?PRIM_FILE:start() of
 	{ok, Handle} ->
-	    ets:new(?FILE_IO_SERVER_TABLE, [named_table]),
+	    ?FILE_IO_SERVER_TABLE =
+                ets:new(?FILE_IO_SERVER_TABLE, [named_table]),
 	    {ok, Handle};
 	{error, Reason} ->
 	    {stop, Reason}
diff --git a/lib/kernel/src/gen_sctp.erl b/lib/kernel/src/gen_sctp.erl
index 58d84ae924..adaa3159ec 100644
--- a/lib/kernel/src/gen_sctp.erl
+++ b/lib/kernel/src/gen_sctp.erl
@@ -36,7 +36,7 @@
 
 -type assoc_id() :: term().
 -type option() ::
-        {active, true | false | once} |
+        {active, true | false | once | -32768..32767} |
         {buffer, non_neg_integer()} |
         {dontroute, boolean()} |
         {high_msgq_watermark, pos_integer()} |
@@ -274,7 +274,7 @@ do_connect(S, Addr, Port, Opts, Timeout, ConnWait) when is_port(S), is_list(Opts
 				    Mod:connect(S, IP, Port, Opts, ConnectTimer);
 				Error -> Error
 			    after
-				inet:stop_timer(Timer)
+				_ = inet:stop_timer(Timer)
 			    end
 		    catch
 			error:badarg ->
@@ -423,7 +423,11 @@ error_string(9) ->
 error_string(10) ->
     "Cookie Received While Shutting Down";
 error_string(11) ->
+    "Restart of an Association with New Addresses";
+error_string(12) ->
     "User Initiated Abort";
+error_string(13) ->
+    "Protocol Violation";
 %% For more info on principal SCTP error codes: phone +44 7981131933
 error_string(N) when is_integer(N) ->
     unknown_error;
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index a98ed4c238..bc8ffbe5e3 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -30,7 +30,7 @@
 -include("file.hrl").
 
 -type option() ::
-        {active,          true | false | once} |
+        {active,          true | false | once | -32768..32767} |
         {buffer,          non_neg_integer()} |
         {delay_send,      boolean()} |
         {deliver,         port | term} |
@@ -139,7 +139,7 @@ connect(Address, Port, Opts) ->
 connect(Address, Port, Opts, Time) ->
     Timer = inet:start_timer(Time),
     Res = (catch connect1(Address,Port,Opts,Timer)),
-    inet:stop_timer(Timer),
+    _ = inet:stop_timer(Timer),
     case Res of
 	{ok,S} -> {ok,S};
 	{error, einval} -> exit(badarg);
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index e82b11d2ef..70dceb3679 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -26,7 +26,7 @@
 -include("inet_int.hrl").
 
 -type option() ::
-        {active,          true | false | once} |
+        {active,          true | false | once | -32768..32767} |
         {add_membership,  {inet:ip_address(), inet:ip_address()}} |
         {broadcast,       boolean()} |
         {buffer,          non_neg_integer()} |
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index b24a9d5eac..ef878b8d0c 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -2069,7 +2069,8 @@ random_sleep(Times) ->
     case get(random_seed) of
 	undefined ->
 	    {A1, A2, A3} = now(),
-	    random:seed(A1, A2, A3 + erlang:phash(node(), 100000));
+	    _ = random:seed(A1, A2, A3 + erlang:phash(node(), 100000)),
+            ok;
 	_ -> ok
     end,
     %% First time 1/4 seconds, then doubling each time up to 8 seconds max.
diff --git a/lib/kernel/src/global_group.erl b/lib/kernel/src/global_group.erl
index 025a9b8a5b..da8b573749 100644
--- a/lib/kernel/src/global_group.erl
+++ b/lib/kernel/src/global_group.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1149,9 +1149,14 @@ do_unlink(Pid, State) ->
 %%%====================================================================================
 %%% Send a nodeup/down messages to monitoring Pids in the own global group.
 %%%====================================================================================
-send_monitor([P|T], M, no_conf) -> safesend_nc(P, M), send_monitor(T, M, no_conf);
-send_monitor([P|T], M, SyncState) -> safesend(P, M), send_monitor(T, M, SyncState);
-send_monitor([], _, _) -> ok.
+send_monitor([P|T], M, no_conf) ->
+    _ = safesend_nc(P, M),
+    send_monitor(T, M, no_conf);
+send_monitor([P|T], M, SyncState) ->
+    _ = safesend(P, M),
+    send_monitor(T, M, SyncState);
+send_monitor([], _, _) ->
+    ok.
 
 safesend(Name, {Msg, Node}) when is_atom(Name) ->
     case lists:member(Node, get_own_nodes()) of
diff --git a/lib/kernel/src/group.erl b/lib/kernel/src/group.erl
index ff835e1047..b36dbf33dd 100644
--- a/lib/kernel/src/group.erl
+++ b/lib/kernel/src/group.erl
@@ -309,15 +309,17 @@ io_requests([], Stat, _) ->
 %%  The ACK contains the return value.
 
 io_reply(From, ReplyAs, Reply) ->
-    From ! {io_reply,ReplyAs,Reply}.
+    From ! {io_reply,ReplyAs,Reply},
+    ok.
 
 %% send_drv(Drv, Message)
 %% send_drv_reqs(Drv, Requests)
 
 send_drv(Drv, Msg) ->
-    Drv ! {self(),Msg}.
+    Drv ! {self(),Msg},
+    ok.
 
-send_drv_reqs(_Drv, []) -> [];
+send_drv_reqs(_Drv, []) -> ok;
 send_drv_reqs(Drv, Rs) ->
     send_drv(Drv, {requests,Rs}).
 
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl
index 87cb9d7f51..daed6dd488 100644
--- a/lib/kernel/src/heart.erl
+++ b/lib/kernel/src/heart.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -182,20 +182,24 @@ wait_ack(Port) ->
     end.
 
 loop(Parent, Port, Cmd) ->
-    send_heart_beat(Port),
+    _ = send_heart_beat(Port),
     receive
-	{From, set_cmd, NewCmd} when length(NewCmd) < 2047 ->
-	    send_heart_cmd(Port, NewCmd),
-	    wait_ack(Port),
-	    From ! {heart, ok},
-	    loop(Parent, Port, NewCmd);
-	{From, set_cmd, NewCmd} ->
-	    From ! {heart, {error, {bad_cmd, NewCmd}}},
-	    loop(Parent, Port, Cmd);
+	{From, set_cmd, NewCmd0} ->
+	    Enc = file:native_name_encoding(),
+	    case catch unicode:characters_to_binary(NewCmd0,Enc,Enc) of
+		NewCmd when is_binary(NewCmd), byte_size(NewCmd) < 2047 ->
+		    _ = send_heart_cmd(Port, NewCmd),
+		    _ = wait_ack(Port),
+		    From ! {heart, ok},
+		    loop(Parent, Port, NewCmd);
+		_ ->
+		    From ! {heart, {error, {bad_cmd, NewCmd0}}},
+		    loop(Parent, Port, Cmd)
+	    end;
 	{From, clear_cmd} ->
 	    From ! {heart, ok},
-	    send_heart_cmd(Port, ""),
-	    wait_ack(Port),
+	    _ = send_heart_cmd(Port, ""),
+	    _ = wait_ack(Port),
 	    loop(Parent, Port, "");
 	{From, get_cmd} ->
 	    From ! {heart, get_heart_cmd(Port)},
@@ -222,7 +226,7 @@ loop(Parent, Port, Cmd) ->
 -spec no_reboot_shutdown(port()) -> no_return().
 
 no_reboot_shutdown(Port) ->
-    send_shutdown(Port),
+    _ = send_shutdown(Port),
     receive
 	{'EXIT', Port, Reason} when Reason =/= badsig ->
 	    exit(normal)
@@ -232,10 +236,10 @@ do_cycle_port_program(Caller, Parent, Port, Cmd) ->
     unregister(?HEART_PORT_NAME),
     case catch start_portprogram() of
 	{ok, NewPort} ->
-	    send_shutdown(Port),
+	    _ = send_shutdown(Port),
 	    receive
 		{'EXIT', Port, _Reason} ->
-		    send_heart_cmd(NewPort, Cmd),
+		    _ = send_heart_cmd(NewPort, Cmd),
 		    Caller ! {heart, ok},
 		    loop(Parent, NewPort, Cmd)
 	    after
@@ -243,7 +247,7 @@ do_cycle_port_program(Caller, Parent, Port, Cmd) ->
 		    %% Huh! Two heart port programs running...
 		    %% well, the old one has to be sick not to respond
 		    %% so we'll settle for the new one...
-		    send_heart_cmd(NewPort, Cmd),
+		    _ = send_heart_cmd(NewPort, Cmd),
 		    Caller ! {heart, {error, stop_error}},
 		    loop(Parent, NewPort, Cmd)
 	    end;
diff --git a/lib/kernel/src/hipe_unified_loader.erl b/lib/kernel/src/hipe_unified_loader.erl
index e676ca997d..e111cb800e 100644
--- a/lib/kernel/src/hipe_unified_loader.erl
+++ b/lib/kernel/src/hipe_unified_loader.erl
@@ -85,7 +85,7 @@ chunk_name(Architecture) ->
 %%========================================================================
 
 -spec load_native_code(Mod, binary()) -> 'no_native' | {'module', Mod}
-					  when is_subtype(Mod, atom()).
+					  when Mod :: atom().
 %% @doc
 %%    Loads the native code of a module Mod.
 %%    Returns {module,Mod} on success (for compatibility with
@@ -148,8 +148,8 @@ version_check(Version, Mod) when is_atom(Mod) ->
 
 %%========================================================================
 
--spec load_module(Mod, binary(), _) -> 'bad_crc' | {'module',Mod}
-	     				when is_subtype(Mod,atom()).
+-spec load_module(Mod, binary(), _) -> 'bad_crc' | {'module', Mod}
+					when Mod :: atom().
 load_module(Mod, Bin, Beam) ->
   erlang:system_flag(multi_scheduling, block),
   try
@@ -169,8 +169,8 @@ load_module(Mod, Bin, Beam, OldReferencesToPatch) ->
 
 %%========================================================================
 
--spec load(Mod, binary()) -> 'bad_crc' | {'module',Mod}
-			      when is_subtype(Mod,atom()).
+-spec load(Mod, binary()) -> 'bad_crc' | {'module', Mod} when Mod :: atom().
+
 load(Mod, Bin) ->
   erlang:system_flag(multi_scheduling, block),
   try
@@ -204,15 +204,17 @@ load_common(Mod, Bin, Beam, OldReferencesToPatch) ->
       bad_crc;
     true ->
       %% Create data segment
-      {ConstAddr,ConstMap2} = create_data_segment(ConstAlign, ConstSize, ConstMap),
+      {ConstAddr,ConstMap2} =
+	create_data_segment(ConstAlign, ConstSize, ConstMap),
       %% Find callees for which we may need trampolines.
       CalleeMFAs = find_callee_mfas(Refs),
       %% Write the code to memory.
-      {CodeAddress,Trampolines} = enter_code(CodeSize, CodeBinary, CalleeMFAs, Mod, Beam),
+      {CodeAddress,Trampolines} =
+	enter_code(CodeSize, CodeBinary, CalleeMFAs, Mod, Beam),
       %% Construct CalleeMFA-to-trampoline mapping.
       TrampolineMap = mk_trampoline_map(CalleeMFAs, Trampolines),
       %% Patch references to code labels in data seg.
-      patch_consts(LabelMap, ConstAddr, CodeAddress),
+      ok = patch_consts(LabelMap, ConstAddr, CodeAddress),
       %% Find out which functions are being loaded (and where).
       %% Note: Addresses are sorted descending.
       {MFAs,Addresses} = exports(ExportMap, CodeAddress),
@@ -221,19 +223,21 @@ load_common(Mod, Bin, Beam, OldReferencesToPatch) ->
       ok = remove_refs_from(MFAs),
       %% Patch all dynamic references in the code.
       %%  Function calls, Atoms, Constants, System calls
-      patch(Refs, CodeAddress, ConstMap2, Addresses, TrampolineMap),
+      ok = patch(Refs, CodeAddress, ConstMap2, Addresses, TrampolineMap),
       %% Tell the system where the loaded funs are. 
       %%  (patches the BEAM code to redirect to native.)
       case Beam of
 	[] ->
-	  export_funs(Addresses);
+	  export_funs(Addresses),
+	  ok;
 	BeamBinary when is_binary(BeamBinary) ->
 	  %% Find all closures in the code.
 	  ClosurePatches = find_closure_patches(Refs),
 	  AddressesOfClosuresToPatch =
 	    calculate_addresses(ClosurePatches, CodeAddress, Addresses),
 	  export_funs(Addresses),
-	  export_funs(Mod, BeamBinary, Addresses, AddressesOfClosuresToPatch)
+	  export_funs(Mod, BeamBinary, Addresses, AddressesOfClosuresToPatch),
+	  ok
       end,
       %% Redirect references to the old module to the new module's BEAM stub.
       patch_to_emu_step2(OldReferencesToPatch),
@@ -322,7 +326,7 @@ trampoline_map_get(MFA, Map) -> gb_trees:get(MFA, Map).
 trampoline_map_lookup(_, []) -> []; % archs not using trampolines
 trampoline_map_lookup(Primop, Map) ->
   case gb_trees:lookup(Primop, Map) of
-    {value,X} -> X;
+    {value, X} -> X;
     _ -> []
   end.
 
@@ -369,7 +373,7 @@ offsets_to_addresses(Os, Base) ->
 find_closure_patches([{Type,Refs} | Rest]) ->
   case ?EXT2PATCH_TYPE(Type) of 
     load_address -> 
-      find_closure_refs(Refs,Rest);
+      find_closure_refs(Refs, Rest);
     _ ->
       find_closure_patches(Rest)
   end;
@@ -404,16 +408,17 @@ export_funs([FunDef | Addresses]) ->
   hipe_bifs:set_native_address(MFA, Address, IsClosure),
   export_funs(Addresses);
 export_funs([]) ->
-  true.
+  ok.
 
 export_funs(Mod, Beam, Addresses, ClosuresToPatch) ->
- Fs = [{F,A,Address} || #fundef{address=Address, mfa={_M,F,A}} <- Addresses],
- code:make_stub_module(Mod, Beam, {Fs,ClosuresToPatch}).
+  Fs = [{F,A,Address} || #fundef{address=Address, mfa={_M,F,A}} <- Addresses],
+  Mod = code:make_stub_module(Mod, Beam, {Fs,ClosuresToPatch}),
+  ok.
 
 %%========================================================================
 %% Patching 
 %%  @spec patch(refs(), BaseAddress::integer(), ConstAndZone::term(),
-%%              Addresses::term(), TrampolineMap::term()) -> term()
+%%              Addresses::term(), TrampolineMap::term()) -> 'ok'.
 %%   @type refs()=[{RefType::integer(), Reflist::reflist()} | refs()]
 %%
 %%   @type reflist()=   [{Data::term(), Offsets::offests()}|reflist()]
@@ -426,7 +431,7 @@ export_funs(Mod, Beam, Addresses, ClosuresToPatch) ->
 %%
 
 patch([{Type,SortedRefs}|Rest], CodeAddress, ConstMap2, Addresses, TrampolineMap) ->
- ?debug_msg("Patching ~w at [~w+offset] with ~w\n",
+  ?debug_msg("Patching ~w at [~w+offset] with ~w\n",
 	     [Type,CodeAddress,SortedRefs]),
   case ?EXT2PATCH_TYPE(Type) of 
     call_local -> 
@@ -437,7 +442,7 @@ patch([{Type,SortedRefs}|Rest], CodeAddress, ConstMap2, Addresses, TrampolineMap
       patch_all(Other, SortedRefs, CodeAddress, {ConstMap2,CodeAddress}, Addresses)
   end,
   patch(Rest, CodeAddress, ConstMap2, Addresses, TrampolineMap);
-patch([], _, _, _, _) -> true.
+patch([], _, _, _, _) -> ok.
 
 %%----------------------------------------------------------------
 %% Handle a 'call_local' or 'call_remote' patch.
@@ -459,14 +464,14 @@ patch_call([{DestMFA,Offsets}|SortedRefs], BaseAddress, Addresses, RemoteOrLocal
   end,
   patch_call(SortedRefs, BaseAddress, Addresses, RemoteOrLocal, TrampolineMap);
 patch_call([], _, _, _, _) ->
-  true.
+  ok.
 
 patch_bif_call_list([Offset|Offsets], BaseAddress, BifAddress, Trampoline) ->
   CallAddress = BaseAddress+Offset,
   ?ASSERT(assert_local_patch(CallAddress)),
   patch_call_insn(CallAddress, BifAddress, Trampoline),
   patch_bif_call_list(Offsets, BaseAddress, BifAddress, Trampoline);
-patch_bif_call_list([], _, _, _) -> [].
+patch_bif_call_list([], _, _, _) -> ok.
 
 patch_mfa_call_list([Offset|Offsets], BaseAddress, DestMFA, DestAddress, Addresses, RemoteOrLocal, Trampoline) ->
   CallAddress = BaseAddress+Offset,
@@ -474,7 +479,7 @@ patch_mfa_call_list([Offset|Offsets], BaseAddress, DestMFA, DestAddress, Address
   ?ASSERT(assert_local_patch(CallAddress)),
   patch_call_insn(CallAddress, DestAddress, Trampoline),
   patch_mfa_call_list(Offsets, BaseAddress, DestMFA, DestAddress, Addresses, RemoteOrLocal, Trampoline);
-patch_mfa_call_list([], _, _, _, _, _, _) -> [].
+patch_mfa_call_list([], _, _, _, _, _, _) -> ok.
 
 patch_call_insn(CallAddress, DestAddress, Trampoline) ->
   %% This assertion is false when we're called from redirect/2.
@@ -487,7 +492,7 @@ patch_call_insn(CallAddress, DestAddress, Trampoline) ->
 patch_all(Type, [{Dest,Offsets}|Rest], BaseAddress, ConstAndZone, Addresses)->
   patch_all_offsets(Type, Dest, Offsets, BaseAddress, ConstAndZone, Addresses),
   patch_all(Type, Rest, BaseAddress, ConstAndZone, Addresses);
-patch_all(_, [], _, _, _) -> true.
+patch_all(_, [], _, _, _) -> ok.
 
 patch_all_offsets(Type, Data, [Offset|Offsets], BaseAddress,
 		  ConstAndZone, Addresses) ->
@@ -497,7 +502,7 @@ patch_all_offsets(Type, Data, [Offset|Offsets], BaseAddress,
   patch_offset(Type, Data, Address, ConstAndZone, Addresses),
   ?debug_msg("Patching done\n",[]),
   patch_all_offsets(Type, Data, Offsets, BaseAddress, ConstAndZone, Addresses);
-patch_all_offsets(_, _, [], _, _, _) -> true.
+patch_all_offsets(_, _, [], _, _, _) -> ok.
 
 %%----------------------------------------------------------------
 %% Handle any patch type except 'call_local' or 'call_remote'.
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index 3ea530a366..41d422d7d4 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
 %%
 %% The 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 @@
 
 %% socket
 -export([peername/1, sockname/1, port/1, send/2,
+	 peernames/1, peernames/2, socknames/1, socknames/2,
 	 setopts/2, getopts/2, 
 	 getifaddrs/0, getifaddrs/1,
 	 getif/1, getif/0, getiflist/0, getiflist/1,
@@ -32,7 +33,7 @@
 	 ip/1, stats/0, options/0, 
 	 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]).
+	 parse_ipv6strict_address/1, parse_address/1, parse_strict_address/1, ntoa/1]).
 
 -export([connect_options/2, listen_options/2, udp_options/2, sctp_options/2]).
 
@@ -120,6 +121,17 @@
       'addr' | 'broadaddr' | 'dstaddr' | 
       'mtu' | 'netmask' | 'flags' |'hwaddr'.
 
+-type if_getopt_result() ::
+      {'addr', ip_address()} |
+      {'broadaddr', ip_address()} |
+      {'dstaddr', ip_address()} |
+      {'mtu', non_neg_integer()} |
+      {'netmask', ip_address()} |
+      {'flags', ['up' | 'down' | 'broadcast' | 'no_broadcast' |
+		 'pointtopoint' | 'no_pointtopoint' |
+		 'running' | 'multicast' | 'loopback']} |
+      {'hwaddr', ether_address()}.
+
 -type address_family() :: 'inet' | 'inet6'.
 -type socket_protocol() :: 'tcp' | 'udp' | 'sctp'.
 -type socket_type() :: 'stream' | 'dgram' | 'seqpacket'.
@@ -146,6 +158,7 @@ close(Socket) ->
 	    ok
     end.
 
+
 -spec peername(Socket) ->  {ok, {Address, Port}} | {error, posix()} when
       Socket :: socket(),
       Address :: ip_address(),
@@ -162,6 +175,24 @@ setpeername(Socket, {IP,Port}) ->
 setpeername(Socket, undefined) ->
     prim_inet:setpeername(Socket, undefined).
 
+-spec peernames(Socket) -> {ok, [{Address, Port}]} | {error, posix()} when
+      Socket :: socket(),
+      Address :: ip_address(),
+      Port :: non_neg_integer().
+
+peernames(Socket) ->
+    prim_inet:peernames(Socket).
+
+-spec peernames(Socket, Assoc) ->
+		       {ok, [{Address, Port}]} | {error, posix()} when
+      Socket :: socket(),
+      Assoc :: #sctp_assoc_change{} | gen_sctp:assoc_id(),
+      Address :: ip_address(),
+      Port :: non_neg_integer().
+
+peernames(Socket, Assoc) ->
+    prim_inet:peernames(Socket, Assoc).
+
 
 -spec sockname(Socket) -> {ok, {Address, Port}} | {error, posix()} when
       Socket :: socket(),
@@ -179,6 +210,25 @@ setsockname(Socket, {IP,Port}) ->
 setsockname(Socket, undefined) ->
     prim_inet:setsockname(Socket, undefined).
 
+-spec socknames(Socket) -> {ok, [{Address, Port}]} | {error, posix()} when
+      Socket :: socket(),
+      Address :: ip_address(),
+      Port :: non_neg_integer().
+
+socknames(Socket) ->
+    prim_inet:socknames(Socket).
+
+-spec socknames(Socket, Assoc) ->
+		       {ok, [{Address, Port}]} | {error, posix()} when
+      Socket :: socket(),
+      Assoc :: #sctp_assoc_change{} | gen_sctp:assoc_id(),
+      Address :: ip_address(),
+      Port :: non_neg_integer().
+
+socknames(Socket, Assoc) ->
+    prim_inet:socknames(Socket, Assoc).
+
+
 -spec port(Socket) -> {'ok', Port} | {'error', any()} when
       Socket :: socket(),
       Port :: port_number().
@@ -200,7 +250,14 @@ send(Socket, Packet) ->
       Options :: [socket_setopt()].
 
 setopts(Socket, Opts) -> 
-    prim_inet:setopts(Socket, Opts).
+    SocketOpts =
+	[case Opt of
+	     {netns,NS} ->
+		 {netns,filename2binary(NS)};
+	     _ ->
+		 Opt
+	 end || Opt <- Opts],
+    prim_inet:setopts(Socket, SocketOpts).
 
 -spec getopts(Socket, Options) ->
 	{'ok', OptionValues} | {'error', posix()} when
@@ -209,7 +266,18 @@ setopts(Socket, Opts) ->
       OptionValues :: [socket_setopt()].
 
 getopts(Socket, Opts) ->
-    prim_inet:getopts(Socket, Opts).
+    case prim_inet:getopts(Socket, Opts) of
+	{ok,OptionValues} ->
+	    {ok,
+	     [case OptionValue of
+		  {netns,Bin} ->
+		      {netns,binary2filename(Bin)};
+		  _ ->
+		      OptionValue
+	      end || OptionValue <- OptionValues]};
+	Other ->
+	    Other
+    end.
 
 -spec getifaddrs(Socket :: socket()) ->
 	{'ok', [string()]} | {'error', posix()}.
@@ -248,13 +316,13 @@ getiflist() ->
 -spec ifget(Socket :: socket(),
             Name :: string() | atom(),
 	    Opts :: [if_getopt()]) ->
-	{'ok', [if_setopt()]} | {'error', posix()}.
+	{'ok', [if_getopt_result()]} | {'error', posix()}.
 
 ifget(Socket, Name, Opts) -> 
     prim_inet:ifget(Socket, Name, Opts).
 
 -spec ifget(Name :: string() | atom(), Opts :: [if_getopt()]) ->
-	{'ok', [if_setopt()]} | {'error', posix()}.
+	{'ok', [if_getopt_result()]} | {'error', posix()}.
 
 ifget(Name, Opts) ->
     withsocket(fun(S) -> prim_inet:ifget(S, Name, Opts) end).
@@ -389,7 +457,7 @@ gethostbyname(Name,Family) ->
 gethostbyname(Name,Family,Timeout) ->
     Timer = start_timer(Timeout),
     Res = gethostbyname_tm(Name,Family,Timer),
-    stop_timer(Timer),
+    _ = stop_timer(Timer),
     Res.
 
 gethostbyname_tm(Name,Family,Timer) ->
@@ -420,7 +488,7 @@ gethostbyaddr(Address) ->
 gethostbyaddr(Address,Timeout) ->
     Timer = start_timer(Timeout),    
     Res = gethostbyaddr_tm(Address, Timer),
-    stop_timer(Timer),
+    _ = stop_timer(Timer),
     Res.
 
 gethostbyaddr_tm(Address,Timer) ->
@@ -475,7 +543,7 @@ getaddr(Address, Family) ->
 getaddr(Address, Family, Timeout) ->
     Timer = start_timer(Timeout),
     Res = getaddr_tm(Address, Family, Timer),
-    stop_timer(Timer),
+    _ = stop_timer(Timer),
     Res.
 
 getaddr_tm(Address, Family, Timer) ->
@@ -501,7 +569,7 @@ getaddrs(Address, Family) ->
 getaddrs(Address, Family, Timeout) ->
     Timer = start_timer(Timeout),
     Res = getaddrs_tm(Address, Family, Timer),
-    stop_timer(Timer),
+    _ = stop_timer(Timer),
     Res.
 
 -spec getservbyport(Port :: port_number(), Protocol :: atom() | string()) ->
@@ -529,6 +597,12 @@ getservbyname(Name, Protocol) when is_atom(Name) ->
 	Error -> Error
     end.
 
+-spec ntoa(IpAddress) -> Address | {error, einval} when
+      Address :: string(),
+      IpAddress :: ip_address().
+ntoa(Addr) ->
+    inet_parse:ntoa(Addr).
+
 -spec parse_ipv4_address(Address) ->
 	{ok, IPv4Address} | {error, einval} when
       Address :: string(),
@@ -634,6 +708,17 @@ con_opt([Opt | Opts], R, As) ->
 	{tcp_module,_}  -> con_opt(Opts, R, As);
 	inet        -> con_opt(Opts, R, As);
 	inet6       -> con_opt(Opts, R, As);
+	{netns,NS} ->
+	    BinNS = filename2binary(NS),
+	    case prim_inet:is_sockopt_val(netns, BinNS) of
+		true ->
+		    con_opt(Opts, R#connect_opts { fd = [{netns,BinNS}] }, As);
+		false ->
+		    {error, badarg}
+	    end;
+        {active,N} when is_integer(N), N < 32768, N >= -32768 ->
+            NOpts = lists:keydelete(active, 1, R#connect_opts.opts),
+            con_opt(Opts, R#connect_opts { opts = [{active,N}|NOpts] }, As);
 	{Name,Val} when is_atom(Name) -> con_add(Name, Val, R, Opts, As);
 	_ -> {error, badarg}
     end;
@@ -692,6 +777,17 @@ list_opt([Opt | Opts], R, As) ->
 	{tcp_module,_}  -> list_opt(Opts, R, As);
 	inet         -> list_opt(Opts, R, As);
 	inet6        -> list_opt(Opts, R, As);
+	{netns,NS} ->
+	    BinNS = filename2binary(NS),
+	    case prim_inet:is_sockopt_val(netns, BinNS) of
+		true ->
+		    list_opt(Opts, R#listen_opts { fd = [{netns,BinNS}] }, As);
+		false ->
+		    {error, badarg}
+	    end;
+        {active,N} when is_integer(N), N < 32768, N >= -32768 ->
+            NOpts = lists:keydelete(active, 1, R#listen_opts.opts),
+            list_opt(Opts, R#listen_opts { opts = [{active,N}|NOpts] }, As);
 	{Name,Val} when is_atom(Name) -> list_add(Name, Val, R, Opts, As);
 	_ -> {error, badarg}
     end;
@@ -738,6 +834,17 @@ udp_opt([Opt | Opts], R, As) ->
 	{udp_module,_} -> udp_opt(Opts, R, As);
 	inet        -> udp_opt(Opts, R, As);
 	inet6       -> udp_opt(Opts, R, As);
+	{netns,NS} ->
+	    BinNS = filename2binary(NS),
+	    case prim_inet:is_sockopt_val(netns, BinNS) of
+		true ->
+		    list_opt(Opts, R#udp_opts { fd = [{netns,BinNS}] }, As);
+		false ->
+		    {error, badarg}
+	    end;
+        {active,N} when is_integer(N), N < 32768, N >= -32768 ->
+            NOpts = lists:keydelete(active, 1, R#udp_opts.opts),
+            udp_opt(Opts, R#udp_opts { opts = [{active,N}|NOpts] }, As);
 	{Name,Val} when is_atom(Name) -> udp_add(Name, Val, R, Opts, As);
 	_ -> {error, badarg}
     end;
@@ -756,7 +863,7 @@ udp_add(Name, Val, R, Opts, As) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %  Currently supported options include:
 %  (*) {mode,   list|binary}	 or just list|binary
-%  (*) {active, true|false|once}
+%  (*) {active, true|false|once|N}
 %  (*) {sctp_module, inet_sctp|inet6_sctp} or just inet|inet6
 %  (*) options set via setsockopt.
 %      The full list is below in sctp_options/0 .
@@ -807,6 +914,20 @@ sctp_opt([Opt|Opts], Mod, R, As) ->
 	{sctp_module,_}	-> sctp_opt (Opts, Mod, R, As); % Done with
 	inet		-> sctp_opt (Opts, Mod, R, As); % Done with
 	inet6		-> sctp_opt (Opts, Mod, R, As); % Done with
+	{netns,NS} ->
+	    BinNS = filename2binary(NS),
+	    case prim_inet:is_sockopt_val(netns, BinNS) of
+		true ->
+		    sctp_opt(
+		      Opts, Mod,
+		      R#sctp_opts { fd = [{netns,BinNS}] },
+		      As);
+		false ->
+		    {error, badarg}
+	    end;
+        {active,N} when is_integer(N), N < 32768, N >= -32768 ->
+            NOpts = lists:keydelete(active, 1, R#sctp_opts.opts),
+            sctp_opt(Opts, Mod, R#sctp_opts { opts = [{active,N}|NOpts] }, As);
 	{Name,Val}	-> sctp_opt (Opts, Mod, R, As, Name, Val);
 	_ -> {error,badarg}
     end;
@@ -851,6 +972,39 @@ add_opt(Name, Val, Opts, As) ->
     end.
 	
 
+%% Passthrough all unknown - catch type errors later
+filename2binary(List) when is_list(List) ->
+    OutEncoding = file:native_name_encoding(),
+    try unicode:characters_to_binary(List, unicode, OutEncoding) of
+	Bin when is_binary(Bin) ->
+	    Bin;
+	_ ->
+	    List
+    catch
+	error:badarg ->
+	    List
+    end;
+filename2binary(Bin) ->
+    Bin.
+
+binary2filename(Bin) ->
+    InEncoding = file:native_name_encoding(),
+    case unicode:characters_to_list(Bin, InEncoding) of
+	Filename when is_list(Filename) ->
+	    Filename;
+	_ ->
+	    %% For getopt/setopt of netns this should only happen if
+	    %% a binary with wrong encoding was used when setting the
+	    %% option, hence the user shall eat his/her own medicine.
+	    %%
+	    %% I.e passthrough here too for now.
+	    %% Future usecases will most probably not want this,
+	    %% rather Unicode error or warning
+	    %% depending on emulator flag instead.
+	    Bin
+    end.
+
+
 translate_ip(any,      inet) -> {0,0,0,0};
 translate_ip(loopback, inet) -> {127,0,0,1};
 translate_ip(any,      inet6) -> {0,0,0,0,0,0,0,0};
@@ -1063,7 +1217,7 @@ gethostbyaddr_tm_native(Addr, Timer, Opts) ->
 	Result -> Result
     end.
 
--spec open(Fd :: integer(),
+-spec open(Fd_or_OpenOpts :: integer() | list(),
 	   Addr :: ip_address(),
 	   Port :: port_number(),
 	   Opts :: [socket_setopt()],
@@ -1073,8 +1227,14 @@ gethostbyaddr_tm_native(Addr, Timer, Opts) ->
 	   Module :: atom()) ->
 	{'ok', socket()} | {'error', posix()}.
 
-open(Fd, Addr, Port, Opts, Protocol, Family, Type, Module) when Fd < 0 ->
-    case prim_inet:open(Protocol, Family, Type) of
+open(FdO, Addr, Port, Opts, Protocol, Family, Type, Module)
+  when is_integer(FdO), FdO < 0;
+       is_list(FdO) ->
+    OpenOpts =
+	if  is_list(FdO) -> FdO;
+	    true -> []
+	end,
+    case prim_inet:open(Protocol, Family, Type, OpenOpts) of
 	{ok,S} ->
 	    case prim_inet:setopts(S, Opts) of
 		ok ->
@@ -1097,7 +1257,8 @@ open(Fd, Addr, Port, Opts, Protocol, Family, Type, Module) when Fd < 0 ->
 	Error ->
 	    Error
     end;
-open(Fd, _Addr, _Port, Opts, Protocol, Family, Type, Module) ->
+open(Fd, _Addr, _Port, Opts, Protocol, Family, Type, Module)
+  when is_integer(Fd) ->
     fdopen(Fd, Opts, Protocol, Family, Type, Module).
 
 bindx(S, [Addr], Port0) ->
@@ -1345,7 +1506,7 @@ tcp_controlling_process(S, NewOwner) when is_port(S), is_pid(NewOwner) ->
 		{ok, A0} ->
 		    case A0 of
 			false -> ok;
-			_ -> prim_inet:setopt(S, active, false)
+			_ -> ok = prim_inet:setopt(S, active, false)
 		    end,
 		    case tcp_sync_input(S, NewOwner, false) of
 			true ->  %% socket already closed, 
@@ -1356,7 +1517,7 @@ tcp_controlling_process(S, NewOwner) when is_port(S), is_pid(NewOwner) ->
 				    unlink(S), %% unlink from port
 				    case A0 of
 					false -> ok;
-					_ -> prim_inet:setopt(S, active, A0)
+					_ -> ok = prim_inet:setopt(S, active, A0)
 				    end,
 				    ok
 			    catch
@@ -1399,13 +1560,12 @@ udp_controlling_process(S, NewOwner) when is_port(S), is_pid(NewOwner) ->
 	    {error, not_owner};
 	_ ->
 	    {ok, A0} = prim_inet:getopt(S, active),
-	    prim_inet:setopt(S, active, false),
+	    ok = prim_inet:setopt(S, active, false),
 	    udp_sync_input(S, NewOwner),
 	    try erlang:port_connect(S, NewOwner) of
 		true -> 
 		    unlink(S),
-		    prim_inet:setopt(S, active, A0),
-		    ok
+		    ok = prim_inet:setopt(S, active, A0)
 	    catch
 		error:Reason -> 
 		    {error, Reason}
diff --git a/lib/kernel/src/inet6_tcp_dist.erl b/lib/kernel/src/inet6_tcp_dist.erl
index 2cb0e10c87..459fdc2ad5 100644
--- a/lib/kernel/src/inet6_tcp_dist.erl
+++ b/lib/kernel/src/inet6_tcp_dist.erl
@@ -92,7 +92,7 @@ accept_loop(Kernel, Listen) ->
     case inet6_tcp:accept(Listen) of
         {ok, Socket} ->
             Kernel ! {accept,self(),Socket,inet6,tcp},
-            controller(Kernel, Socket),
+            _ = controller(Kernel, Socket),
             accept_loop(Kernel, Listen);
         Error ->
             exit(Error)
diff --git a/lib/kernel/src/inet_db.erl b/lib/kernel/src/inet_db.erl
index a7679c531b..2ebdc0f554 100644
--- a/lib/kernel/src/inet_db.erl
+++ b/lib/kernel/src/inet_db.erl
@@ -1117,7 +1117,7 @@ handle_call(Request, From, #state{db=Db}=State) ->
 	{set_cache_refresh, Time} when is_integer(Time), Time > 0 ->
 	    Time1 = ((Time+999) div 1000)*1000, %% round up
 	    ets:insert(Db, {cache_refresh_interval, Time1}),
-	    stop_timer(State#state.cache_timer),
+	    _ = stop_timer(State#state.cache_timer),
 	    {reply, ok, State#state{cache_timer = init_timer()}};
 
 	clear_hosts ->
@@ -1131,7 +1131,7 @@ handle_call(Request, From, #state{db=Db}=State) ->
 
 	reset ->
 	    reset_db(Db),
-	    stop_timer(State#state.cache_timer),
+	    _ = stop_timer(State#state.cache_timer),
 	    {reply, ok, State#state{cache_timer = init_timer()}};
 
 	{add_rc_list, List} ->
@@ -1181,7 +1181,7 @@ handle_info(_Info, State) ->
 -spec terminate(term(), state()) -> 'ok'.
 
 terminate(_Reason, State) ->
-    stop_timer(State#state.cache_timer),
+    _ = stop_timer(State#state.cache_timer),
     ok.
 
 %%%----------------------------------------------------------------------
@@ -1240,8 +1240,9 @@ do_add_host(Byname, Byaddr, Names, Type, IP) ->
     ok.
 
 do_del_host(Byname, Byaddr, IP) ->
-    [ets:delete_object(Byname, {tolower(Name),Type,Addr}) ||
-	{Name,Type,Addr} <- ets:lookup(Byaddr, IP)],
+    _ =
+	[ets:delete_object(Byname, {tolower(Name),Type,Addr}) ||
+	    {Name,Type,Addr} <- ets:lookup(Byaddr, IP)],
     ets:delete(Byaddr, IP),
     ok.
 
diff --git a/lib/kernel/src/inet_gethost_native.erl b/lib/kernel/src/inet_gethost_native.erl
index 65d4c84e3b..4320987078 100644
--- a/lib/kernel/src/inet_gethost_native.erl
+++ b/lib/kernel/src/inet_gethost_native.erl
@@ -237,7 +237,7 @@ handle_message({Port, {data, Data}}, State = #state{port = Port}) ->
 				       State;
 				   Req ->
 				       lists:foreach(fun({P,R,TR}) ->
-							     ?CANCEL_TIMER(TR),
+							     _= ?CANCEL_TIMER(TR),
 							     P ! {R,
 								  {ok,
 								   BinReply}}
@@ -276,7 +276,7 @@ handle_message({timeout, Pid, RID}, State) ->
 	{last, {LP,LR,_}} ->
 	    LP ! {LR, {error,timeout}},
 	    %% Remove the whole request structure...
-	    pick_request(State, RID),
+	    _ = pick_request(State, RID),
 	    %% Also cancel the request to the port program...
 	    (catch port_command(State#state.port, 
 				<<RID:32,?OP_CANCEL_REQUEST>>))
@@ -517,7 +517,7 @@ do_start(Sup, C) ->
 	{error, {{already_started, Pid}, _Child}} when is_pid(Pid) ->
 	    ok;
 	{error, already_present} ->
-	    supervisor:delete_child(Sup, Child),
+	    _ = supervisor:delete_child(Sup, Child),
 	    do_start(Sup, C)
     end.
 
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index 67a99913a1..889b596a22 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -46,6 +46,7 @@
 -define(INET_PASSIVE, 0).
 -define(INET_ACTIVE,  1).
 -define(INET_ONCE,    2). % Active once then passive
+-define(INET_MULTI,   3). % Active N then passive
 
 %% state codes (getstatus, INET_REQ_GETSTATUS)
 -define(INET_F_OPEN,         16#0001).
@@ -86,6 +87,8 @@
 -define(INET_REQ_ACCEPT,        26).
 -define(INET_REQ_LISTEN,        27).
 -define(INET_REQ_IGNOREFD,      28).
+-define(INET_REQ_GETLADDRS,     29).
+-define(INET_REQ_GETPADDRS,     30).
 
 %% TCP requests
 %%-define(TCP_REQ_ACCEPT,         40). MOVED
@@ -143,6 +146,7 @@
 -define(INET_LOPT_TCP_SEND_TIMEOUT_CLOSE, 35).
 -define(INET_LOPT_MSGQ_HIWTRMRK,  36).
 -define(INET_LOPT_MSGQ_LOWTRMRK,  37).
+-define(INET_LOPT_NETNS,          38).
 % Specific SCTP options: separate range:
 -define(SCTP_OPT_RTOINFO,	 	100).
 -define(SCTP_OPT_ASSOCINFO,	 	101).
diff --git a/lib/kernel/src/inet_parse.erl b/lib/kernel/src/inet_parse.erl
index 619c78a6ca..a88c94a453 100644
--- a/lib/kernel/src/inet_parse.erl
+++ b/lib/kernel/src/inet_parse.erl
@@ -288,7 +288,7 @@ parse_file(_, File, Fn) ->
     case file:open(File, [read]) of
 	{ok, Fd} ->
 	    Result = parse_fd(File,Fd, 1, Fn, []),
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    Result;
 	Error -> Error
     end.
@@ -722,7 +722,9 @@ ntoa({0,0,0,0,0,16#ffff,A,B}) ->
     "::FFFF:" ++ dig_to_dec(A) ++ "." ++ dig_to_dec(B);
 ntoa({_,_,_,_,_,_,_,_}=T) ->
     %% Find longest sequence of zeros, at least 2, to replace with "::"
-    ntoa(tuple_to_list(T), []).
+    ntoa(tuple_to_list(T), []);
+ntoa(_) ->
+    {error, einval}.
 
 %% Find first double zero
 ntoa([], R) ->
diff --git a/lib/kernel/src/inet_res.erl b/lib/kernel/src/inet_res.erl
index 94a9f7c64d..6037da1d22 100644
--- a/lib/kernel/src/inet_res.erl
+++ b/lib/kernel/src/inet_res.erl
@@ -139,7 +139,7 @@ resolve(Name, Class, Type, Opts, Timeout) ->
 	{ok, Nm} ->
 	    Timer = inet:start_timer(Timeout),
 	    Res = res_query(Nm, Class, Type, Opts, Timer),
-	    inet:stop_timer(Timer),
+	    _ = inet:stop_timer(Timer),
 	    Res;
 	Error ->
 	    Error
@@ -339,7 +339,7 @@ gethostbyaddr(IP) -> gethostbyaddr_tm(IP,false).
 gethostbyaddr(IP,Timeout) ->
     Timer = inet:start_timer(Timeout),
     Res = gethostbyaddr_tm(IP,Timer),
-    inet:stop_timer(Timer),
+    _ = inet:stop_timer(Timer),
     Res.    
 
 gethostbyaddr_tm({A,B,C,D} = IP, Timer) when ?ip(A,B,C,D) ->
@@ -424,7 +424,7 @@ gethostbyname(Name,Family) ->
 gethostbyname(Name,Family,Timeout) ->
     Timer = inet:start_timer(Timeout),    
     Res = gethostbyname_tm(Name,Family,Timer),
-    inet:stop_timer(Timer),
+    _ = inet:stop_timer(Timer),
     Res.
     
 gethostbyname_tm(Name,inet,Timer) ->
@@ -483,7 +483,7 @@ getbyname(Name, Type) ->
 getbyname(Name, Type, Timeout) ->
     Timer = inet:start_timer(Timeout),
     Res = getbyname_tm(Name, Type, Timer),
-    inet:stop_timer(Timer),
+    _ = inet:stop_timer(Timer),
     Res.
 
 getbyname_tm(Name, Type, Timer) when is_list(Name) ->
@@ -921,18 +921,25 @@ query_tcp(Timeout, Id, Buffer, IP, Port, Verbose) ->
 			[{active,false},{packet,2},binary,Family], 
 			Timeout) of
 	{ok, S} ->
-	    gen_tcp:send(S, Buffer),
-	    case gen_tcp:recv(S, 0, Timeout) of
-		{ok, Answer} ->
-		    gen_tcp:close(S),
-		    case decode_answer(Answer, Id, Verbose) of
-			{ok, _} = OK -> OK;
-			{error, badid} -> {error, servfail};
-			Error -> Error
+	    case gen_tcp:send(S, Buffer) of
+		ok ->
+		    case gen_tcp:recv(S, 0, Timeout) of
+			{ok, Answer} ->
+			    gen_tcp:close(S),
+			    case decode_answer(Answer, Id, Verbose) of
+				{ok, _} = OK -> OK;
+				{error, badid} -> {error, servfail};
+				Error -> Error
+			    end;
+			Error ->
+			    gen_tcp:close(S),
+			    ?verbose(Verbose, "TCP server recv error: ~p\n",
+				     [Error]),
+			    Error
 		    end;
 		Error ->
 		    gen_tcp:close(S),
-		    ?verbose(Verbose, "TCP server recv error: ~p\n",
+		    ?verbose(Verbose, "TCP server send error: ~p\n",
 			     [Error]),
 		    Error
 	    end;
diff --git a/lib/kernel/src/inet_sctp.erl b/lib/kernel/src/inet_sctp.erl
index 2d799d79fa..93528d305d 100644
--- a/lib/kernel/src/inet_sctp.erl
+++ b/lib/kernel/src/inet_sctp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -135,7 +135,7 @@ connect_get_assoc(S, Addr, Port, Active, Timer) ->
 	{sctp,S,Addr,Port,{_,#sctp_assoc_change{state=St}=Ev}} ->
 	    case Active of
 		once ->
-		    prim_inet:setopt(S, active, once);
+		    ok = prim_inet:setopt(S, active, once);
 		_ -> ok
 	    end,
 	    if St =:= comm_up ->
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index 8005eff58c..63f236b069 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -119,7 +119,7 @@ accept_loop(Kernel, Listen) ->
     case inet_tcp:accept(Listen) of
 	{ok, Socket} ->
 	    Kernel ! {accept,self(),Socket,inet,tcp},
-	    controller(Kernel, Socket),
+	    _ = controller(Kernel, Socket),
 	    accept_loop(Kernel, Listen);
 	Error ->
 	    exit(Error)
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 54628800a8..f8f4cc1ec2 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The 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,12 +16,10 @@
 %%
 %% %CopyrightEnd%
 {"%VSN%",
- %% Up from - max two major revisions back
- [{<<"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\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14
+ %% Up from - max one major revision back
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16
+ %% Down to - max one major revision back
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16
 }.
diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 1e07620a3e..ecdb32424a 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,8 +32,13 @@ start(_, []) ->
     case supervisor:start_link({local, kernel_sup}, kernel, []) of
 	{ok, Pid} ->
 	    Type = get_error_logger_type(),
-	    error_logger:swap_handler(Type),
-	    {ok, Pid, []};
+            case error_logger:swap_handler(Type) of
+                ok -> {ok, Pid, []};
+                Error ->
+                    %% Not necessary since the node will crash anyway:
+                    exit(Pid, shutdown),
+                    Error
+            end;
 	Error -> Error
     end.
 
diff --git a/lib/kernel/src/kernel_config.erl b/lib/kernel/src/kernel_config.erl
index 48141cfa03..56defcb167 100644
--- a/lib/kernel/src/kernel_config.erl
+++ b/lib/kernel/src/kernel_config.erl
@@ -121,7 +121,7 @@ send_timeout(Timeout, Pid) ->
     end.
 
 wait_nodes(Mandatory, Optional) ->
-    net_kernel:monitor_nodes(true),
+    ok = net_kernel:monitor_nodes(true),
     lists:foreach(fun(Node) -> 
 		     case net_adm:ping(Node) of
 			 pong -> self() ! {nodeup, Node};
@@ -129,7 +129,9 @@ wait_nodes(Mandatory, Optional) ->
 		     end
 		  end,
 		  Mandatory ++ Optional),
-    rec_nodes(Mandatory, Optional).
+    R = rec_nodes(Mandatory, Optional),
+    ok = net_kernel:monitor_nodes(false),
+    R.
 
 rec_nodes([], []) -> ok;
 rec_nodes(Mandatory, Optional) ->
diff --git a/lib/kernel/src/net_adm.erl b/lib/kernel/src/net_adm.erl
index 9b2dac9544..3f5eac7822 100644
--- a/lib/kernel/src/net_adm.erl
+++ b/lib/kernel/src/net_adm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,7 +133,7 @@ dns_hostname(Hostname) ->
 -spec ping_list([atom()]) -> [atom()].
 
 ping_list(Nodelist) ->
-    net_kernel:monitor_nodes(true),
+    ok = net_kernel:monitor_nodes(true),
     Sofar = ping_first(Nodelist, nodes()),
     collect_new(Sofar, Nodelist).
 
@@ -159,7 +159,7 @@ collect_new(Sofar, Nodelist) ->
 		    collect_new([Node | Sofar], Nodelist)
 	    end
     after 3000 ->
-	    net_kernel:monitor_nodes(false),
+	    ok = net_kernel:monitor_nodes(false),
 	    Sofar
     end.
 
diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index dd0071b914..04a0d94ebf 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -306,21 +306,21 @@ do_connect(Node, Type, WaitForBarred) -> %% Type = normal | hidden
     end.
 
 passive_connect_monitor(Parent, Node) ->
-    monitor_nodes(true,[{node_type,all}]),
+    ok = monitor_nodes(true,[{node_type,all}]),
     case lists:member(Node,nodes([connected])) of
 	true ->
-	    monitor_nodes(false,[{node_type,all}]),
+	    ok = monitor_nodes(false,[{node_type,all}]),
 	    Parent ! {self(),true};
 	_ ->
 	    Ref = make_ref(),
 	    Tref = erlang:send_after(connecttime(),self(),Ref),
 	    receive
 		Ref ->
-		    monitor_nodes(false,[{node_type,all}]),
+		    ok = monitor_nodes(false,[{node_type,all}]),
 		    Parent ! {self(), false};
 		{nodeup,Node,_} ->
-		    monitor_nodes(false,[{node_type,all}]),
-		    erlang:cancel_timer(Tref),
+		    ok = monitor_nodes(false,[{node_type,all}]),
+		    _ = erlang:cancel_timer(Tref),
 		    Parent ! {self(),true}
 	    end
     end.
@@ -734,7 +734,7 @@ handle_info(transition_period_end,
 				       how = How}} = State) ->
     ?tckr_dbg(transition_period_ended),
     case How of
-	shorter -> Tckr ! {new_ticktime, T};
+	shorter -> Tckr ! {new_ticktime, T}, done;
 	_       -> done
     end,
     {noreply,State#state{tick = #tick{ticker = Tckr, time = T}}};
@@ -1573,9 +1573,10 @@ async_gen_server_reply(From, Msg) ->
         ok ->
             ok;
         nosuspend ->
-            spawn(fun() -> catch erlang:send(Pid, M, [noconnect]) end);
+            _ = spawn(fun() -> catch erlang:send(Pid, M, [noconnect]) end),
+	    ok;
         noconnect ->
             ok; % The gen module takes care of this case.
-        {'EXIT', _}=EXIT ->
-            EXIT
+        {'EXIT', _} ->
+            ok
     end.
diff --git a/lib/kernel/src/os.erl b/lib/kernel/src/os.erl
index ded03361ee..9ffa9adeab 100644
--- a/lib/kernel/src/os.erl
+++ b/lib/kernel/src/os.erl
@@ -26,7 +26,7 @@
 
 %%% BIFs
 
--export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0]).
+-export([getenv/0, getenv/1, getpid/0, putenv/2, timestamp/0, unsetenv/1]).
 
 -spec getenv() -> [string()].
 
@@ -58,6 +58,12 @@ putenv(_, _) ->
 timestamp() ->
     erlang:nif_error(undef).
 
+-spec unsetenv(VarName) -> true when
+      VarName :: string().
+
+unsetenv(_) ->
+    erlang:nif_error(undef).
+
 %%% End of BIFs
 
 -spec type() -> {Osfamily, Osname} when
@@ -183,20 +189,25 @@ extensions() ->
       Command :: atom() | io_lib:chars().
 cmd(Cmd) ->
     validate(Cmd),
-    case type() of
-	{unix, _} ->
-	    unix_cmd(Cmd);
-	{win32, Wtype} ->
-	    Command0 = case {os:getenv("COMSPEC"),Wtype} of
-			  {false,windows} -> lists:concat(["command.com /c", Cmd]);
-			  {false,_} -> lists:concat(["cmd /c", Cmd]);
-			  {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
-		      end,
-            %% open_port/2 awaits string() in Command, but io_lib:chars() can be
-            %% deep lists according to io_lib module description.
-            Command = lists:flatten(Command0),
-	    Port = open_port({spawn, Command}, [stream, in, eof, hide]),
-	    get_data(Port, [])
+    Bytes = case type() of
+		{unix, _} ->
+		    unix_cmd(Cmd);
+		{win32, Wtype} ->
+		    Command0 = case {os:getenv("COMSPEC"),Wtype} of
+				  {false,windows} -> lists:concat(["command.com /c", Cmd]);
+				  {false,_} -> lists:concat(["cmd /c", Cmd]);
+				  {Cspec,_} -> lists:concat([Cspec," /c",Cmd])
+			      end,
+		    %% open_port/2 awaits string() in Command, but io_lib:chars() can be
+		    %% deep lists according to io_lib module description.
+		    Command = lists:flatten(Command0),
+		    Port = open_port({spawn, Command}, [stream, in, eof, hide]),
+		    get_data(Port, [])
+	    end,
+    String = unicode:characters_to_list(list_to_binary(Bytes)),
+    if  %% Convert to unicode list if possible otherwise return bytes
+	is_list(String) -> String;
+	true -> Bytes
     end.
 
 unix_cmd(Cmd) ->
@@ -278,8 +289,8 @@ start_port_srv_handle({Ref,Client}) ->
 		error:Reason ->
 		    {Reason,erlang:get_stacktrace()}
 	    end,
-    Client ! {Ref,Reply}.
-
+    Client ! {Ref,Reply},
+    ok.
 
 start_port_srv_loop() ->
     receive
@@ -287,7 +298,7 @@ start_port_srv_loop() ->
 				     is_pid(Client) ->
 	    start_port_srv_handle(Request);
 	_Junk ->
-	    ignore
+	    ok
     end,
     start_port_srv_loop().
 
@@ -337,7 +348,7 @@ mk_cmd(Cmd) when is_atom(Cmd) ->		% backward comp.
 mk_cmd(Cmd) ->
     %% We insert a new line after the command, in case the command
     %% contains a comment character.
-    io_lib:format("(~ts\n) </dev/null; echo  \"\^D\"\n", [Cmd]).
+    [$(, unicode:characters_to_binary(Cmd), "\n) </dev/null; echo  \"\^D\"\n"].
 
 
 validate(Atom) when is_atom(Atom) ->
@@ -345,7 +356,7 @@ validate(Atom) when is_atom(Atom) ->
 validate(List) when is_list(List) ->
     validate1(List).
 
-validate1([C|Rest]) when is_integer(C), 0 =< C, C < 256 ->
+validate1([C|Rest]) when is_integer(C) ->
     validate1(Rest);
 validate1([List|Rest]) when is_list(List) ->
     validate1(List),
diff --git a/lib/kernel/src/pg2.erl b/lib/kernel/src/pg2.erl
index 1ff10eb303..b562d4ffd2 100644
--- a/lib/kernel/src/pg2.erl
+++ b/lib/kernel/src/pg2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The 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,7 +45,7 @@ start() ->
 -spec create(Name :: name()) -> 'ok'.
 
 create(Name) ->
-    ensure_started(),
+    _ = ensure_started(),
     case ets:member(pg2_table, {group, Name}) of
         false ->
             global:trans({{?MODULE, Name}, self()},
@@ -60,7 +60,7 @@ create(Name) ->
 -spec delete(Name :: name()) -> 'ok'.
 
 delete(Name) ->
-    ensure_started(),
+    _ = ensure_started(),
     global:trans({{?MODULE, Name}, self()},
                  fun() ->
                          gen_server:multi_call(?MODULE, {delete, Name})
@@ -71,7 +71,7 @@ delete(Name) ->
       when Name :: name().
 
 join(Name, Pid) when is_pid(Pid) ->
-    ensure_started(),
+    _ = ensure_started(),
     case ets:member(pg2_table, {group, Name}) of
         false ->
             {error, {no_such_group, Name}};
@@ -88,7 +88,7 @@ join(Name, Pid) when is_pid(Pid) ->
       when Name :: name().
 
 leave(Name, Pid) when is_pid(Pid) ->
-    ensure_started(),
+    _ = ensure_started(),
     case ets:member(pg2_table, {group, Name}) of
         false ->
             {error, {no_such_group, Name}};
@@ -105,7 +105,7 @@ leave(Name, Pid) when is_pid(Pid) ->
       when Name :: name().
 
 get_members(Name) ->
-    ensure_started(),
+    _ = ensure_started(),
     case ets:member(pg2_table, {group, Name}) of
         true ->
             group_members(Name);
@@ -117,7 +117,7 @@ get_members(Name) ->
       when Name :: name().
 
 get_local_members(Name) ->
-    ensure_started(),
+    _ = ensure_started(),
     case ets:member(pg2_table, {group, Name}) of
         true ->
             local_group_members(Name);
@@ -128,7 +128,7 @@ get_local_members(Name) ->
 -spec which_groups() -> [Name :: name()].
 
 which_groups() ->
-    ensure_started(),
+    _ = ensure_started(),
     all_groups().
 
 -spec get_closest_pid(Name) ->  pid() | {'error', Reason} when
@@ -165,7 +165,7 @@ get_closest_pid(Name) ->
 
 init([]) ->
     Ns = nodes(),
-    net_kernel:monitor_nodes(true),
+    ok = net_kernel:monitor_nodes(true),
     lists:foreach(fun(N) ->
                           {?MODULE, N} ! {new_pg2, node()},
                           self() ! {nodeup, N}
@@ -283,7 +283,7 @@ member_died(Ref) ->
 
 join_group(Name, Pid) ->
     Ref_Pid = {ref, Pid}, 
-    try _ = ets:update_counter(pg2_table, Ref_Pid, {4, +1})
+    try _ = ets:update_counter(pg2_table, Ref_Pid, {4, +1}), true
     catch _:_ ->
             {RPid, Ref} = do_monitor(Pid),
             true = ets:insert(pg2_table, {Ref_Pid, RPid, Ref, 1}),
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index ced6f47bfe..2300b7e901 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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 @@
 
 %%------------------------------------------------------------------------
 
--type state() :: gb_tree().
+-type state() :: gb_trees:tree(pid(), {pid(), reference()}).
 
 %%------------------------------------------------------------------------
 
@@ -158,20 +158,20 @@ handle_info({Caller, {reply, Reply}}, S) ->
 	    {noreply, S}
     end;
 handle_info({From, {sbcast, Name, Msg}}, S) ->
-    case catch Name ! Msg of  %% use catch to get the printout
-	{'EXIT', _} ->
-	    From ! {?NAME, node(), {nonexisting_name, Name}};
-	_ -> 
-	    From ! {?NAME, node(), node()}
-    end,
+    _ = case catch Name ! Msg of  %% use catch to get the printout
+            {'EXIT', _} ->
+                From ! {?NAME, node(), {nonexisting_name, Name}};
+            _ ->
+                From ! {?NAME, node(), node()}
+        end,
     {noreply, S};
 handle_info({From, {send, Name, Msg}}, S) ->
-    case catch Name ! {From, Msg} of %% use catch to get the printout
-	{'EXIT', _} ->
-	    From ! {?NAME, node(), {nonexisting_name, Name}};
-	_ ->
-	    ok    %% It's up to Name to respond !!!!!
-    end,
+    _ = case catch Name ! {From, Msg} of %% use catch to get the printout
+            {'EXIT', _} ->
+                From ! {?NAME, node(), {nonexisting_name, Name}};
+            _ ->
+                ok    %% It's up to Name to respond !!!!!
+        end,
     {noreply, S};
 handle_info({From, {call,Mod,Fun,Args,Gleader}}, S) ->
     %% Special for hidden C node's, uugh ...
@@ -407,7 +407,7 @@ cast(Node, Mod, Fun, Args) ->
     true.
 
 
-%% Asynchronous broadcast, returns nothing, it's just send'n prey
+%% Asynchronous broadcast, returns nothing, it's just send 'n' pray
 -spec abcast(Name, Msg) -> abcast when
       Name :: atom(),
       Msg :: term().
@@ -423,7 +423,7 @@ abcast(Name, Mess) ->
 abcast([Node|Tail], Name, Mess) ->
     Dest = {Name,Node},
     case catch erlang:send(Dest, Mess, [noconnect]) of
-	noconnect -> spawn(erlang, send, [Dest,Mess]);
+	noconnect -> spawn(erlang, send, [Dest,Mess]), ok;
 	_ -> ok
     end,
     abcast(Tail, Name, Mess);
diff --git a/lib/kernel/src/seq_trace.erl b/lib/kernel/src/seq_trace.erl
index a90b7b07c8..38a61f4644 100644
--- a/lib/kernel/src/seq_trace.erl
+++ b/lib/kernel/src/seq_trace.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The 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 @@ get_system_tracer() ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 set_token2([{Type,Val}|T]) ->
-    erlang:seq_trace(Type, Val),
+    _ = erlang:seq_trace(Type, Val),
     set_token2(T);
 set_token2([]) ->
     ok.
diff --git a/lib/kernel/src/standard_error.erl b/lib/kernel/src/standard_error.erl
index e41dcd01fc..10cf77e0d4 100644
--- a/lib/kernel/src/standard_error.erl
+++ b/lib/kernel/src/standard_error.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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 @@ run(P) ->
 server_loop(Port) ->
     receive
 	{io_request,From,ReplyAs,Request} when is_pid(From) ->
-	    do_io_request(Request, From, ReplyAs, Port),
+	    _ = do_io_request(Request, From, ReplyAs, Port),
 	    server_loop(Port);
 	{'EXIT',Port,badsig} ->			% Ignore badsig errors
 	    server_loop(Port);
@@ -175,7 +175,7 @@ io_reply(From, ReplyAs, Reply) ->
 
 %% put_chars
 put_chars(Chars, Port) when is_binary(Chars) ->
-    put_port(Chars, Port),
+    _ = put_port(Chars, Port),
     {ok,ok};
 put_chars(Chars, Port) ->
     case catch list_to_binary(Chars) of
diff --git a/lib/kernel/src/user.erl b/lib/kernel/src/user.erl
index c897d46bc2..40376ef752 100644
--- a/lib/kernel/src/user.erl
+++ b/lib/kernel/src/user.erl
@@ -103,11 +103,11 @@ catch_loop(Port, Shell, Q) ->
 	{unknown_exit,{Shell,Reason},_} ->		 % shell has exited
 	    case Reason of
 		normal ->
-		    put_chars("*** ", Port, []);
+                    put_port(<<"*** ">>, Port);
 		_ ->
-		    put_chars("*** ERROR: ", Port, [])
+                    put_port(<<"*** ERROR: ">>, Port)
 	    end,
-	    put_chars("Shell process terminated! ***\n", Port, []),
+	    put_port(<<"Shell process terminated! ***\n">>, Port),
 	    catch_loop(Port, start_new_shell());
 	{unknown_exit,_,Q1} ->
 	    catch_loop(Port, Shell, Q1);	     
@@ -181,7 +181,7 @@ get_fd_geometry(Port) ->
 do_io_request(Req, From, ReplyAs, Port, Q0) ->
     case io_request(Req, Port, Q0) of
 	{_Status,Reply,Q1} ->
-	    io_reply(From, ReplyAs, Reply),
+	    _ = io_reply(From, ReplyAs, Reply),
 	    Q1;
 	{exit,What} ->
 	    ok = send_port(Port, close),
diff --git a/lib/kernel/src/user_drv.erl b/lib/kernel/src/user_drv.erl
index bb654495d3..a91c23539d 100644
--- a/lib/kernel/src/user_drv.erl
+++ b/lib/kernel/src/user_drv.erl
@@ -418,7 +418,7 @@ list_commands(Iport, Oport) ->
 		  true -> 
 		      [];
 		  false ->
-		      [{put_chars,unicode,"  q        - quit erlang\n"}]
+		      [{put_chars, unicode,"  q                 - quit erlang\n"}]
 	      end,
     io_requests([{put_chars, unicode,"  c [nn]            - connect to job\n"},
 		 {put_chars, unicode,"  i [nn]            - interrupt job\n"},
@@ -488,21 +488,19 @@ set_unicode_state(Iport, Bool) ->
 
 %% io_request(Request, InPort, OutPort)
 %% io_requests(Requests, InPort, OutPort)
-
-io_request({put_chars, unicode,Cs}, _Iport, Oport) ->
-    Oport ! {self(),{command,[?OP_PUTC|unicode:characters_to_binary(Cs,utf8)]}};
-io_request({move_rel,N}, _Iport, Oport) ->
-    Oport ! {self(),{command,[?OP_MOVE|put_int16(N, [])]}};
-io_request({insert_chars,unicode,Cs}, _Iport, Oport) ->
-    Oport ! {self(),{command,[?OP_INSC|unicode:characters_to_binary(Cs,utf8)]}};
-io_request({delete_chars,N}, _Iport, Oport) ->
-    Oport ! {self(),{command,[?OP_DELC|put_int16(N, [])]}};
-io_request(beep, _Iport, Oport) ->
-    Oport ! {self(),{command,[?OP_BEEP]}};
-io_request({requests,Rs}, Iport, Oport) ->
-    io_requests(Rs, Iport, Oport);
-io_request(_R, _Iport, _Oport) ->
-    ok.
+%% Note: InPort is unused.
+
+io_request(Request, Iport, Oport) ->
+    try io_command(Request) of
+        Command ->
+            Oport ! {self(),Command},
+            ok
+    catch
+        {requests,Rs} ->
+            io_requests(Rs, Iport, Oport);
+        _ ->
+            ok
+    end.
 
 io_requests([R|Rs], Iport, Oport) ->
     io_request(R, Iport, Oport),
@@ -513,6 +511,19 @@ io_requests([], _Iport, _Oport) ->
 put_int16(N, Tail) ->
     [(N bsr 8)band 255,N band 255|Tail].
 
+io_command({put_chars, unicode,Cs}) ->
+    {command,[?OP_PUTC|unicode:characters_to_binary(Cs,utf8)]};
+io_command({move_rel,N}) ->
+    {command,[?OP_MOVE|put_int16(N, [])]};
+io_command({insert_chars,unicode,Cs}) ->
+    {command,[?OP_INSC|unicode:characters_to_binary(Cs,utf8)]};
+io_command({delete_chars,N}) ->
+    {command,[?OP_DELC|put_int16(N, [])]};
+io_command(beep) ->
+    {command,[?OP_BEEP]};
+io_command(Else) ->
+    throw(Else).
+
 %% gr_new()
 %% gr_get_num(Group, Index)
 %% gr_get_info(Group, Pid)
diff --git a/lib/kernel/src/wrap_log_reader.erl b/lib/kernel/src/wrap_log_reader.erl
index 689269fc28..7e1f4aa07f 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %%
 %% The 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,7 +149,7 @@ open_int(File, FileNo, FirstFileNo) ->
 		{ok, Head} ->
 		    case disk_log_1:is_head(Head) of
 			no ->
-			    file:close(Fd),
+			    _ = file:close(Fd),
 			    {error, {not_a_log_file, FName}};
 			_ -> % yes or yes_not_closed
 			    case last_mod_time(FName) of
@@ -161,12 +161,12 @@ open_int(File, FileNo, FirstFileNo) ->
 						      first_no = FirstFileNo},
 				    {ok, WR};
 				{error, E} ->
-				    file:close(Fd),
+				    _ = file:close(Fd),
 				    {error, {file_error, FName, E}}
 			    end
 		    end;
 		_Other ->
-		    file:close(Fd),
+		    _ = file:close(Fd),
 		    {error, {not_a_log_file, FName}}
 	    end;
 	_Other ->
@@ -280,7 +280,7 @@ read_next_file(WR, N, NewFileNo, Bad) ->
 		true -> 
 		    case open_int(File, NewFileNo, FirstFileNo) of
 			{ok, NWR} ->
-			    close(WR), %% Now we can safely close the old file.
+			    _ = close(WR), %% Now we can safely close the old file.
 			    chunk(NWR, N, Bad);
 			Error ->
 			    Error
diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index cb11d4e899..f1b8a105ed 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -145,7 +145,7 @@ release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)"
 	$(INSTALL_DATA) $(APP_FILES) "$(RELSYSDIR)"
-	$(INSTALL_DATA) kernel.spec  $(EMAKEFILE)\
+	$(INSTALL_DATA) kernel.spec kernel_smoke.spec  $(EMAKEFILE)\
 		$(COVERFILE) "$(RELSYSDIR)"
 	chmod -R u+w "$(RELSYSDIR)"
 	@tar cf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/lib/kernel/test/application_SUITE.erl b/lib/kernel/test/application_SUITE.erl
index 1ff291be54..c6cbd1a0ef 100644
--- a/lib/kernel/test/application_SUITE.erl
+++ b/lib/kernel/test/application_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %% 
 %% The 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,10 @@
 	 permit_false_start_local/1, permit_false_start_dist/1, script_start/1, 
 	 nodedown_start/1, init2973/0, loop2973/0, loop5606/1]).
 
--export([config_change/1,
+-export([config_change/1, persistent_env/1,
 	 distr_changed_tc1/1, distr_changed_tc2/1,
-	 ensure_started/1,
-	 shutdown_func/1, do_shutdown/1, shutdown_timeout/1]).
+	 ensure_started/1, ensure_all_started/1,
+	 shutdown_func/1, do_shutdown/1, shutdown_timeout/1, shutdown_deadlock/1]).
 
 -define(TESTCASE, testcase_name).
 -define(testcase, ?config(?TESTCASE, Config)).
@@ -52,8 +52,10 @@ all() ->
     [failover, failover_comp, permissions, load,
      load_use_cache, ensure_started, {group, reported_bugs}, start_phases,
      script_start, nodedown_start, permit_false_start_local,
-     permit_false_start_dist, get_key, get_env,
-     {group, distr_changed}, config_change, shutdown_func, shutdown_timeout].
+     permit_false_start_dist, get_key, get_env, ensure_all_started,
+     {group, distr_changed}, config_change, shutdown_func, shutdown_timeout,
+     shutdown_deadlock,
+     persistent_env].
 
 groups() -> 
     [{reported_bugs, [],
@@ -960,7 +962,7 @@ nodedown_start(Conf) when is_list(Conf) ->
 
 ensure_started(suite) -> [];
 ensure_started(doc) -> ["Test application:ensure_started/1."];
-ensure_started(Conf) ->
+ensure_started(_Conf) ->
 
     {ok, Fd} = file:open("app1.app", [write]),
     w_app1(Fd),
@@ -978,6 +980,85 @@ ensure_started(Conf) ->
     ok = application:unload(app1),
     ok.
 
+ensure_all_started(suite) -> [];
+ensure_all_started(doc) -> ["Test application:ensure_all_started/1-2."];
+ensure_all_started(_Conf) ->
+
+    {ok, Fd1} = file:open("app1.app", [write]),
+    w_app1(Fd1),
+    file:close(Fd1),
+    {ok, Fd9} = file:open("app9.app", [write]),
+    w_app9(Fd9),
+    file:close(Fd9),
+    {ok, Fd10} = file:open("app10.app", [write]),
+    w_app10_dep9(Fd10),
+    file:close(Fd10),
+    {ok, FdErr} = file:open("app_chain_error.app", [write]),
+    w_app(FdErr, app_chain_error()),
+    file:close(FdErr),
+    {ok, FdErr2} = file:open("app_chain_error2.app", [write]),
+    w_app(FdErr2, app_chain_error2()),
+    file:close(FdErr2),
+
+    %% Single app start/stop
+    false = lists:keyfind(app1, 1, application:which_applications()),
+    {ok, [app1]} = application:ensure_all_started(app1), % app1 started
+    {app1, _, _} = lists:keyfind(app1, 1, application:which_applications()),
+    {ok, []} = application:ensure_all_started(app1), % no start needed
+    ok = application:stop(app1),
+    false = lists:keyfind(app1, 1, application:which_applications()),
+    ok = application:unload(app1),
+
+    %% App or dependency not found.
+    Name = hopefully_not_an_existing_app_file,
+    {error,{Name, {"no such file or directory", _ }}} =
+	application:ensure_all_started(Name),
+
+    %% Start dependencies.
+    {error, {not_started, app9}} = application:start(app10),
+    {ok, [app9,app10]} = application:ensure_all_started(app10, temporary),
+    {app9, _, _} = lists:keyfind(app9, 1, application:which_applications()),
+    {app10, _, _} = lists:keyfind(app10, 1, application:which_applications()),
+    %% Only report apps/dependencies that actually needed to start
+    ok = application:stop(app10),
+    ok = application:unload(app10),
+    {ok, [app10]} = application:ensure_all_started(app10, temporary),
+    ok = application:stop(app9),
+    ok = application:unload(app9),
+    ok = application:stop(app10),
+    ok = application:unload(app10),
+
+    %% Deeper failure chain. We have the following dependencies:
+    %% app_chain_error -> app_chain_error2
+    %% app_chain_error2 -> app10
+    %% app_chain_error2 -> hopefully_not_an_existing_app
+    %% app10 -> app 9
+    %% First we have none running and we expect to have neither app9
+    %% nor app10 running after failing to start
+    %% hopefully_not_an_existing_app
+    {error, {hopefully_not_an_existing_app, {"no such file or directory", _}}}=
+	application:ensure_all_started(app_chain_error),
+    false = lists:keyfind(app9, 1, application:which_applications()),
+    false = lists:keyfind(app10, 1, application:which_applications()),
+    false = lists:keyfind(app_chain_error2,1,application:which_applications()),
+    false = lists:keyfind(app_chain_error, 1, application:which_applications()),
+    %% Here we will have app9 already running, and app10 should be
+    %% able to boot fine.
+    %% In this dependency failing, we expect app9 to still be running, but
+    %% not app10 after failing to start hopefully_not_an_existing_app
+    {ok, [app9]} = application:ensure_all_started(app9, temporary),
+    {error, {hopefully_not_an_existing_app, {"no such file or directory", _}}}=
+	application:ensure_all_started(app_chain_error),
+    {app9, _, _} = lists:keyfind(app9, 1, application:which_applications()),
+    false = lists:keyfind(app10, 1, application:which_applications()),
+    false = lists:keyfind(app_chain_error2,1,application:which_applications()),
+    false = lists:keyfind(app_chain_error, 1, application:which_applications()),
+    ok = application:stop(app9),
+    ok = application:unload(app9),
+    ok = application:unload(app10),
+    ok = application:unload(app_chain_error2),
+    ok = application:unload(app_chain_error),
+    ok.
 
 %%%-----------------------------------------------------------------
 %%% Testing of reported bugs and other tickets.
@@ -1908,6 +1989,50 @@ get_appls([_ | T], Res) ->
 get_appls([], Res) ->
     Res.
 
+persistent_env(suite) ->
+    [];
+persistent_env(doc) ->
+    ["Test set_env/4 and unset_env/3 with persistent true"];
+persistent_env(Conf) when is_list(Conf) ->
+    ok = application:set_env(appinc, own2, persist, [{persistent, true}]),
+    ok = application:set_env(appinc, key1, persist, [{persistent, true}]),
+
+    %% own_env1 and own2 are set in appinc
+    ok = application:load(appinc()),
+    {ok, value1} = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, key1),
+
+    %% Changing the environment after loaded reflects and should persist
+    ok = application:set_env(appinc, own_env1, persist, [{persistent, true}]),
+    {ok, persist} = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, key1),
+
+    %% On reload, own_env1, own2 and key1 should all persist
+    ok = application:unload(appinc),
+    ok = application:load(appinc()),
+    {ok, persist} = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    {ok, persist} = application:get_env(appinc, key1),
+
+    %% Unset own_env1 and key1, own2 should still persist
+    ok = application:unset_env(appinc, own_env1, [{persistent, true}]),
+    ok = application:unset_env(appinc, key1, [{persistent, true}]),
+    undefined = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    undefined = application:get_env(appinc, key1),
+
+    %% own_env1 should be back to its application value on reload
+    ok = application:unload(appinc),
+    ok = application:load(appinc()),
+    {ok, value1} = application:get_env(appinc, own_env1),
+    {ok, persist} = application:get_env(appinc, own2),
+    undefined = application:get_env(appinc, key1),
+
+    %% Clean up
+    ok = application:unload(appinc).
+
 %%%-----------------------------------------------------------------
 %%% Tests the 'shutdown_func' kernel config parameter
 %%%-----------------------------------------------------------------
@@ -1972,7 +2097,32 @@ shutdown_timeout(Config) when is_list(Config) ->
     end,
     ok.
 
+%%%-----------------------------------------------------------------
+%%% Provokes a (previous) application shutdown deadlock
+%%%-----------------------------------------------------------------
+shutdown_deadlock(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir,Config),
+    code:add_path(filename:join([DataDir,deadlock])),
+    %% ok = rpc:call(Cp1, application, start, [sasl]),
+    ok = application:start(deadlock),
+    Tester = self(),
+    application:set_env(deadlock, fail_stop, Tester),
+    spawn(fun() -> Tester ! {stop, application:stop(deadlock)} end),
 
+    receive
+	{deadlock, Server} ->
+	    spawn(fun() ->
+			  Master = application_controller:get_master(deadlock),
+			  Child = application_master:get_child(Master),
+			  Tester ! {child, Child}
+		  end),
+	    timer:sleep(100),
+	    erlang:display({self(), "Sending Continue", Server}),
+	    Server ! continue
+    end,
+    [_|_] = application:which_applications(),
+    application:unload(deadlock), % clean up!
+    ok.
 
 
 %%-----------------------------------------------------------------
@@ -2125,6 +2275,24 @@ app_start_error() ->
       {applications, [kernel]},
       {mod, {app_start_error, []}}]}.
 
+app_chain_error() ->
+    {application, app_chain_error,
+     [{description, "ERTS  CXC 138 ce"},
+      {vsn, "2.0"},
+      {modules, []},
+      {registered, []},
+      {applications, [kernel, app_chain_error2]},
+      {mod, {ch_sup, {app_chain_error, 20,20}}}]}.
+
+app_chain_error2() ->
+    {application, app_chain_error2,
+     [{description, "ERTS  CXC 138 ce2"},
+      {vsn, "2.0"},
+      {modules, []},
+      {registered, []},
+      {applications, [kernel, app10, hopefully_not_an_existing_app]},
+      {mod, {ch_sup, {app_chain_error2, 21,21}}}]}.
+
 app_group_leader() ->
     {application, group_leader,
      [{description, "GROUP_LEADER  CXC 138 11"},
@@ -2374,6 +2542,12 @@ w_app7(Fd) ->
 w_app8(Fd) ->
     io:format(Fd, "~p.\n", [app8()]).
 
+w_app9(Fd) ->
+    io:format(Fd, "~p.\n", [app9()]).
+
+w_app10_dep9(Fd) ->
+    io:format(Fd, "~p.\n", [app10_dep9()]).
+
 w_app_start_error(Fd) ->
     io:format(Fd, "~p.\n", [app_start_error()]).
 
diff --git a/lib/kernel/test/application_SUITE_data/deadlock/deadlock.app b/lib/kernel/test/application_SUITE_data/deadlock/deadlock.app
index 0c1001bed6..233c7a3f76 100644
--- a/lib/kernel/test/application_SUITE_data/deadlock/deadlock.app
+++ b/lib/kernel/test/application_SUITE_data/deadlock/deadlock.app
@@ -4,5 +4,5 @@
   {applications, [kernel, stdlib, sasl]},
   {modules, [deadlock]},
   {mod, {deadlock, []}},
-  {env, [{fail_start, false}]}
+  {env, [{fail_start, false}, {fail_stop, false}]}
 ]}.
diff --git a/lib/kernel/test/application_SUITE_data/deadlock/deadlock.erl b/lib/kernel/test/application_SUITE_data/deadlock/deadlock.erl
index 5f68bf9078..3ef6105371 100644
--- a/lib/kernel/test/application_SUITE_data/deadlock/deadlock.erl
+++ b/lib/kernel/test/application_SUITE_data/deadlock/deadlock.erl
@@ -21,7 +21,7 @@ init([sup]) ->
     {ok, {{one_for_one, 5, 10}, [
         {
             sasl_syslog_dm, {?MODULE, start_link, []},
-            permanent, brutal_kill, worker,
+            permanent, 25000, worker,
             [deadlock]
         }
     ]}};
@@ -32,6 +32,8 @@ init([sup]) ->
 init([child]) ->
     case application:get_env(deadlock, fail_start) of
         {ok, false} ->
+	    process_flag(trap_exit, true),
+	    io:format("~p: Traps exit~n",[?MODULE]),
             %% we must not fail on the first init, otherwise supervisor
             %% terminates immediately
             {ok, []};
@@ -50,6 +52,14 @@ handle_info(_Msg, State) ->
     {noreply, State}.
 
 terminate(_Reason, _State) ->
+    case application:get_env(deadlock, fail_stop) of
+        {ok, false} -> ok;
+        {ok, Tester}  ->
+	    Tester ! {deadlock, self()},
+	    io:format("~p: Waiting in terminate (~p)~n",[?MODULE,Tester]),
+	    receive continue -> ok end
+    end,
+    io:format("~p: terminates~n", [?MODULE]),
     ok.
 
 code_change(_OldVsn, State, _Extra) ->
diff --git a/lib/kernel/test/code_SUITE.erl b/lib/kernel/test/code_SUITE.erl
index fc17db2745..42b81d16b3 100644
--- a/lib/kernel/test/code_SUITE.erl
+++ b/lib/kernel/test/code_SUITE.erl
@@ -23,7 +23,8 @@
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([set_path/1, get_path/1, add_path/1, add_paths/1, del_path/1,
 	 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,
+	 delete/1, purge/1, purge_many_exits/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,
@@ -35,7 +36,7 @@
 	 on_load_embedded/1, on_load_errors/1, big_boot_embedded/1,
 	 native_early_modules/1, get_mode/1]).
 
--export([init_per_testcase/2, end_per_testcase/2, 
+-export([init_per_testcase/2, end_per_testcase/2,
 	 init_per_suite/1, end_per_suite/1,
 	 sticky_compiler/1]).
 
@@ -48,10 +49,10 @@
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> 
+all() ->
     [set_path, get_path, add_path, add_paths, del_path,
      replace_path, load_file, load_abs, ensure_loaded,
-     delete, purge, soft_purge, is_loaded, all_loaded,
+     delete, purge, purge_many_exits, soft_purge, is_loaded, all_loaded,
      load_binary, dir_req, object_code, set_path_file,
      upgrade,
      pa_pz_option, add_del_path, dir_disappeared,
@@ -62,7 +63,7 @@ all() ->
      on_load_binary, on_load_embedded, on_load_errors,
      big_boot_embedded, native_early_modules, get_mode].
 
-groups() -> 
+groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
@@ -76,10 +77,10 @@ init_per_suite(Config) ->
     %% the module name does not match the filename, so
     %% we must compile to a binary and write the Beam file
     %% ourselves.
-    ?line Dir = filename:dirname(code:which(?MODULE)),
-    ?line File = filename:join(Dir, "code_a_test"),
-    ?line {ok,code_b_test,Code} = compile:file(File, [binary]),
-    ?line ok = file:write_file(File++".beam", Code),
+    Dir = filename:dirname(code:which(?MODULE)),
+    File = filename:join(Dir, "code_a_test"),
+    {ok,code_b_test,Code} = compile:file(File, [binary]),
+    ok = file:write_file(File++".beam", Code),
     Config.
 
 end_per_suite(Config) ->
@@ -98,7 +99,7 @@ init_per_testcase(_Func, Config) ->
     P=code:get_path(),
     [{watchdog, Dog}, {code_path, P}|Config].
 
-end_per_testcase(TC, Config) when TC == mult_lib_roots; 
+end_per_testcase(TC, Config) when TC == mult_lib_roots;
 				  TC == big_boot_embedded ->
     {ok, HostName} = inet:gethostname(),
     NodeName = list_to_atom(atom_to_list(TC)++"@"++HostName),
@@ -121,51 +122,49 @@ set_path(doc) -> [];
 set_path(Config) when is_list(Config) ->
     P = code:get_path(),
     NonExDir = filename:join(?config(priv_dir, Config), ?t:temp_name("hej")),
-    ?line {'EXIT',_} = (catch code:set_path({a})),
-    ?line {error, bad_directory} = (catch code:set_path([{a}])),
-    ?line {error, bad_directory} = code:set_path(NonExDir),
-    ?line P = code:get_path(), % still the same path.
-    ?line true = code:set_path(P), % set the same path again.
-    ?line P = code:get_path(), % still the same path.
+    {'EXIT',_} = (catch code:set_path({a})),
+    {error, bad_directory} = (catch code:set_path([{a}])),
+    {error, bad_directory} = code:set_path(NonExDir),
+    P = code:get_path(), % still the same path.
+    true = code:set_path(P), % set the same path again.
+    P = code:get_path(), % still the same path.
     LibDir = code:lib_dir(),
-    ?line true = code:set_path([LibDir | P]),
-    ?line [LibDir | P] = code:get_path(),
-    ?line true = code:set_path([LibDir]),
-    ?line [LibDir] = code:get_path(),
+    true = code:set_path([LibDir | P]),
+    [LibDir | P] = code:get_path(),
+    true = code:set_path([LibDir]),
+    [LibDir] = code:get_path(),
     ok.
 
 get_path(suite) -> [];
 get_path(doc) -> [];
 get_path(Config) when is_list(Config) ->
-    ?line P = code:get_path(),
+    P = code:get_path(),
     % test that all directories are strings (lists).
-    ?line [] = lists:filter(fun(Dir) when is_list(Dir) ->
-				    false;
-			       (_) ->
-				    true
-			    end,
-			    P),
+    [] = lists:filter(fun
+	    (Dir) when is_list(Dir) -> false;
+	    (_) -> true
+	end, P),
     ok.
 
 add_path(suite) -> [];
 add_path(doc) -> [];
 add_path(Config) when is_list(Config) ->
     P = code:get_path(),
-    ?line {'EXIT',_} = (catch code:add_path({})),
-    ?line {'EXIT',_} = (catch code:add_patha({})),
-    ?line {'EXIT',_} = (catch code:add_pathz({})),
-    ?line {error, bad_directory} = code:add_path("xyz"),
-    ?line {error, bad_directory} = code:add_patha("xyz"),
-    ?line {error, bad_directory} = code:add_pathz("xyz"),
+    {'EXIT',_} = (catch code:add_path({})),
+    {'EXIT',_} = (catch code:add_patha({})),
+    {'EXIT',_} = (catch code:add_pathz({})),
+    {error, bad_directory} = code:add_path("xyz"),
+    {error, bad_directory} = code:add_patha("xyz"),
+    {error, bad_directory} = code:add_pathz("xyz"),
     LibDir = code:lib_dir(),
-    ?line true = code:add_path(LibDir),
-    ?line LibDir = lists:last(code:get_path()),
+    true = code:add_path(LibDir),
+    LibDir = lists:last(code:get_path()),
     code:set_path(P),
-    ?line true = code:add_pathz(LibDir),
-    ?line LibDir = lists:last(code:get_path()),
+    true = code:add_pathz(LibDir),
+    LibDir = lists:last(code:get_path()),
     code:set_path(P),
-    ?line true = code:add_patha(LibDir),
-    ?line [LibDir|_] = code:get_path(),
+    true = code:add_patha(LibDir),
+    [LibDir|_] = code:get_path(),
     code:set_path(P),
     ok.
 
@@ -173,134 +172,134 @@ add_paths(suite) -> [];
 add_paths(doc) -> [];
 add_paths(Config) when is_list(Config) ->
     P = code:get_path(),
-    ?line ok = code:add_paths([{}]),
-    ?line ok = code:add_pathsa([{}]),
-    ?line ok = code:add_pathsz([{}]),
-    ?line ok = code:add_paths(["xyz"]),
-    ?line ok = code:add_pathsa(["xyz"]),
-    ?line ok = code:add_pathsz(["xyz"]),
+    ok = code:add_paths([{}]),
+    ok = code:add_pathsa([{}]),
+    ok = code:add_pathsz([{}]),
+    ok = code:add_paths(["xyz"]),
+    ok = code:add_pathsa(["xyz"]),
+    ok = code:add_pathsz(["xyz"]),
     P = code:get_path(), % check that no directory is added.
 
     LibDir = code:lib_dir(),
-    ?line ok = code:add_paths([LibDir]),
-    ?line LibDir = lists:last(code:get_path()),
+    ok = code:add_paths([LibDir]),
+    LibDir = lists:last(code:get_path()),
     code:set_path(P),
-    ?line ok = code:add_pathsz([LibDir]),
-    ?line LibDir = lists:last(code:get_path()),
+    ok = code:add_pathsz([LibDir]),
+    LibDir = lists:last(code:get_path()),
     code:set_path(P),
-    ?line ok = code:add_pathsa([LibDir]),
-    ?line [LibDir|P] = code:get_path(),
+    ok = code:add_pathsa([LibDir]),
+    [LibDir|P] = code:get_path(),
     code:set_path(P),
 
     RootDir = code:root_dir(),
     Res = P ++ [LibDir, RootDir],
-    ?line ok = code:add_paths([LibDir, RootDir]),
-    ?line Res = code:get_path(),
+    ok = code:add_paths([LibDir, RootDir]),
+    Res = code:get_path(),
     code:set_path(P),
-    ?line ok = code:add_pathsz([LibDir, RootDir]),
-    ?line Res = code:get_path(),
+    ok = code:add_pathsz([LibDir, RootDir]),
+    Res = code:get_path(),
     code:set_path(P),
-    ?line ok = code:add_pathsa([LibDir, RootDir]),
-    ?line [RootDir, LibDir|P] = code:get_path(),
+    ok = code:add_pathsa([LibDir, RootDir]),
+    [RootDir, LibDir|P] = code:get_path(),
     code:set_path(P),
 
-    ?line ok = code:add_paths([LibDir, "xyz"]),
+    ok = code:add_paths([LibDir, "xyz"]),
     Res1 = P ++ [LibDir],
-    ?line Res1 = code:get_path(),
+    Res1 = code:get_path(),
     code:set_path(P),
-    ?line ok = code:add_pathsz([LibDir, "xyz"]),
-    ?line Res1 = code:get_path(),
+    ok = code:add_pathsz([LibDir, "xyz"]),
+    Res1 = code:get_path(),
     code:set_path(P),
-    ?line ok = code:add_pathsa([LibDir, "xyz"]),
-    ?line [LibDir|P] = code:get_path(),
+    ok = code:add_pathsa([LibDir, "xyz"]),
+    [LibDir|P] = code:get_path(),
     code:set_path(P),
     ok.
 
 del_path(suite) -> [];
 del_path(doc) -> [];
 del_path(Config) when is_list(Config) ->
-    ?line P = code:get_path(),
+    P = code:get_path(),
     test_server:format("Initial code:get_path()=~p~n",[P]),
-    ?line {'EXIT',_} = (catch code:del_path(3)),
-    ?line false = code:del_path(my_dummy_name),
-    ?line false = code:del_path("/kdlk/my_dummy_dir"),
+    {'EXIT',_} = (catch code:del_path(3)),
+    false = code:del_path(my_dummy_name),
+    false = code:del_path("/kdlk/my_dummy_dir"),
     Dir = filename:join([code:lib_dir(kernel),"ebin"]),
     test_server:format("kernel dir: ~p~n",[Dir]),
 
 
-    ?line true = code:del_path(kernel),
+    true = code:del_path(kernel),
     NewP = code:get_path(),
     test_server:format("Path after removing 'kernel':~p~n",[NewP]),
     ReferenceP = lists:delete(Dir,P),
     test_server:format("Reference path:~p~n",[ReferenceP]),
-    ?line NewP = ReferenceP, % check that dir is deleted
+    NewP = ReferenceP, % check that dir is deleted
 
     code:set_path(P),
-    ?line true = code:del_path(Dir),
+    true = code:del_path(Dir),
     NewP1 = code:get_path(),
-    ?line NewP1 = lists:delete(Dir,P), % check that dir is deleted
+    NewP1 = lists:delete(Dir,P), % check that dir is deleted
     code:set_path(P),
     ok.
 
 replace_path(suite) -> [];
 replace_path(doc) -> [];
 replace_path(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line P = code:get_path(),
-    ?line {'EXIT',_} = (catch code:replace_path(3,"")),
-    ?line {error, bad_name} = code:replace_path(dummy_name,""),
-    ?line {error, bad_name} = code:replace_path(kernel,
+    PrivDir = ?config(priv_dir, Config),
+    P = code:get_path(),
+    {'EXIT',_} = (catch code:replace_path(3,"")),
+    {error, bad_name} = code:replace_path(dummy_name,""),
+    {error, bad_name} = code:replace_path(kernel,
 						"/kdlk/my_dummy_dir"),
-    ?line {error, bad_directory} = code:replace_path(kernel,
+    {error, bad_directory} = code:replace_path(kernel,
 						     "/kdlk/kernel-1.2"),
-    ?line P = code:get_path(), % Check that path is not changed.
+    P = code:get_path(), % Check that path is not changed.
 
-    ?line ok = file:set_cwd(PrivDir),
+    ok = file:set_cwd(PrivDir),
 
     %% Replace an existing application.
 
     file:make_dir("./kernel-2.11"),
     {ok, Cwd} = file:get_cwd(),
     NewDir = Cwd ++ "/kernel-2.11",
-    ?line true = code:replace_path(kernel, NewDir),
-    ?line NewDir = code:lib_dir(kernel),
-    ?line true = code:set_path(P),			%Reset path
-    ?line ok = file:del_dir("./kernel-2.11"),
+    true = code:replace_path(kernel, NewDir),
+    NewDir = code:lib_dir(kernel),
+    true = code:set_path(P),			%Reset path
+    ok = file:del_dir("./kernel-2.11"),
 
     %% Add a completly new application.
 
     NewAppName = 'blurf_blarfer',
-    ?line NewAppDir = filename:join(Cwd, atom_to_list(NewAppName) ++ "-6.33.1"),
-    ?line ok = file:make_dir(NewAppDir),
-    ?line true = code:replace_path(NewAppName, NewAppDir),
-    ?line NewAppDir = code:lib_dir(NewAppName),
-    ?line NewAppDir = lists:last(code:get_path()),
-    ?line true = code:set_path(P),			%Reset path
-    ?line ok = file:del_dir(NewAppDir),
+    NewAppDir = filename:join(Cwd, atom_to_list(NewAppName) ++ "-6.33.1"),
+    ok = file:make_dir(NewAppDir),
+    true = code:replace_path(NewAppName, NewAppDir),
+    NewAppDir = code:lib_dir(NewAppName),
+    NewAppDir = lists:last(code:get_path()),
+    true = code:set_path(P),			%Reset path
+    ok = file:del_dir(NewAppDir),
 
     ok.
 
 dir_disappeared(suite) -> [];
 dir_disappeared(doc) -> ["OTP-3977"];
 dir_disappeared(Config) when is_list(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Dir = filename:join(PrivDir, "temp"),
-    ?line ok = file:make_dir(Dir),
-    ?line true = code:add_path(Dir),
-    ?line ok = file:del_dir(Dir),
-    ?line non_existing = code:which(bubbelskrammel),
+    PrivDir = ?config(priv_dir, Config),
+    Dir = filename:join(PrivDir, "temp"),
+    ok = file:make_dir(Dir),
+    true = code:add_path(Dir),
+    ok = file:del_dir(Dir),
+    non_existing = code:which(bubbelskrammel),
     ok.
 
 load_file(suite) -> [];
 load_file(doc) -> [];
 load_file(Config) when is_list(Config) ->
-    ?line {error, nofile} = code:load_file(duuuumy_mod),
-    ?line {error, badfile} = code:load_file(code_a_test),
-    ?line {'EXIT', _} = (catch code:load_file(123)),
-    ?line {module, code_b_test} = code:load_file(code_b_test),
+    {error, nofile} = code:load_file(duuuumy_mod),
+    {error, badfile} = code:load_file(code_a_test),
+    {'EXIT', _} = (catch code:load_file(123)),
+    {module, code_b_test} = code:load_file(code_b_test),
     TestDir = test_dir(),
     code:stick_dir(TestDir),
-    ?line {error, sticky_directory} = code:load_file(code_b_test),
+    {error, sticky_directory} = code:load_file(code_b_test),
     code:unstick_dir(TestDir),
     ok.
 
@@ -311,30 +310,30 @@ load_abs(suite) -> [];
 load_abs(doc) -> [];
 load_abs(Config) when is_list(Config) ->
     TestDir = test_dir(),
-    ?line {error, nofile} = code:load_abs(TestDir ++ "/duuuumy_mod"),
-    ?line {error, badfile} = code:load_abs(TestDir ++ "/code_a_test"),
-    ?line {'EXIT', _} = (catch code:load_abs({})),
-    ?line {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
+    {error, nofile} = code:load_abs(TestDir ++ "/duuuumy_mod"),
+    {error, badfile} = code:load_abs(TestDir ++ "/code_a_test"),
+    {'EXIT', _} = (catch code:load_abs({})),
+    {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
     code:stick_dir(TestDir),
-    ?line {error, sticky_directory} = code:load_abs(TestDir ++ "/code_b_test"),
+    {error, sticky_directory} = code:load_abs(TestDir ++ "/code_b_test"),
     code:unstick_dir(TestDir),
     ok.
 
 ensure_loaded(suite) -> [];
 ensure_loaded(doc) -> [];
 ensure_loaded(Config) when is_list(Config) ->
-    ?line {module, lists} = code:ensure_loaded(lists),
+    {module, lists} = code:ensure_loaded(lists),
     case init:get_argument(mode) of
 	{ok, [["embedded"]]} ->
-	    ?line {error, embedded} = code:ensure_loaded(code_b_test),
-	    ?line {error, badarg} = code:ensure_loaded(34),
+	    {error, embedded} = code:ensure_loaded(code_b_test),
+	    {error, badarg} = code:ensure_loaded(34),
 	    ok;
 	_ ->
-	    ?line {error, nofile} = code:ensure_loaded(duuuumy_mod),
-	    ?line {error, badfile} = code:ensure_loaded(code_a_test),
-	    ?line {'EXIT', _} = (catch code:ensure_loaded(34)),
-	    ?line {module, code_b_test} = code:ensure_loaded(code_b_test),
-	    ?line {module, code_b_test} = code:ensure_loaded(code_b_test),
+	    {error, nofile} = code:ensure_loaded(duuuumy_mod),
+	    {error, badfile} = code:ensure_loaded(code_a_test),
+	    {'EXIT', _} = (catch code:ensure_loaded(34)),
+	    {module, code_b_test} = code:ensure_loaded(code_b_test),
+	    {module, code_b_test} = code:ensure_loaded(code_b_test),
 	    ok
     end.
 
@@ -343,15 +342,15 @@ delete(doc) -> [];
 delete(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
-    ?line Pid = code_b_test:do_spawn(),
-    ?line true = code:delete(code_b_test),
-    ?line {'EXIT',_} = (catch code:delete(122)),
-    ?line false = code_b_test:check_exit(Pid),
-    ?line false = code:delete(code_b_test),
-    ?line false = code_b_test:check_exit(Pid),
+    Pid = code_b_test:do_spawn(),
+    true = code:delete(code_b_test),
+    {'EXIT',_} = (catch code:delete(122)),
+    false = code_b_test:check_exit(Pid),
+    false = code:delete(code_b_test),
+    false = code_b_test:check_exit(Pid),
     exit(Pid,kill),
-    ?line true = code_b_test:check_exit(Pid),
-    ?line false = code:delete(code_b_test),
+    true = code_b_test:check_exit(Pid),
+    false = code:delete(code_b_test),
     code:purge(code_b_test),
     process_flag(trap_exit, OldFlag),
     ok.
@@ -361,31 +360,67 @@ purge(doc) -> [];
 purge(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
-    ?line {'EXIT',_} = (catch code:purge({})),
-    ?line false = code:purge(code_b_test),
-    ?line Pid = code_b_test:do_spawn(),
-    ?line true = code:delete(code_b_test),
-    ?line false = code_b_test:check_exit(Pid),
-    ?line true = code:purge(code_b_test),
-    ?line true = code_b_test:check_exit(Pid),
+    {'EXIT',_} = (catch code:purge({})),
+    false = code:purge(code_b_test),
+    Pid = code_b_test:do_spawn(),
+    true = code:delete(code_b_test),
+    false = code_b_test:check_exit(Pid),
+    true = code:purge(code_b_test),
+    true = code_b_test:check_exit(Pid),
     process_flag(trap_exit, OldFlag),
     ok.
 
+purge_many_exits(Config) when is_list(Config) ->
+    OldFlag = process_flag(trap_exit, true),
+    code:purge(code_b_test),
+    {'EXIT',_} = (catch code:purge({})),
+    false = code:purge(code_b_test),
+    TPids = lists:map(fun (_) ->
+			      {code_b_test:do_spawn(),
+			       spawn_link(fun () ->
+						  receive
+						  after infinity -> ok
+						  end
+					  end)}
+			 end,
+			 lists:seq(1, 1000)),
+    % Give them time to start...
+    receive after 1000 -> ok end,
+    true = code:delete(code_b_test),
+    lists:foreach(fun ({Pid1, Pid2}) ->
+			  true = erlang:is_process_alive(Pid1),
+			  false = code_b_test:check_exit(Pid1),
+			  true = erlang:is_process_alive(Pid2)
+		  end, TPids),
+    true = code:purge(code_b_test),
+    lists:foreach(fun ({Pid1, Pid2}) ->
+			  false = erlang:is_process_alive(Pid1),
+			  true = code_b_test:check_exit(Pid1),
+			  true = erlang:is_process_alive(Pid2),
+			  exit(Pid2, kill)
+		  end, TPids),
+    lists:foreach(fun ({_Pid1, Pid2}) ->
+			  receive {'EXIT', Pid2, _} -> ok end
+		  end, TPids),
+    process_flag(trap_exit, OldFlag),
+    ok.
+
+
 soft_purge(suite) -> [];
 soft_purge(doc) -> [];
 soft_purge(Config) when is_list(Config) ->
     OldFlag = process_flag(trap_exit, true),
     code:purge(code_b_test),
-    ?line {'EXIT',_} = (catch code:soft_purge(23)),
-    ?line true = code:soft_purge(code_b_test),
-    ?line Pid = code_b_test:do_spawn(),
-    ?line true = code:delete(code_b_test),
-    ?line false = code_b_test:check_exit(Pid),
-    ?line false = code:soft_purge(code_b_test),
-    ?line false = code_b_test:check_exit(Pid),
+    {'EXIT',_} = (catch code:soft_purge(23)),
+    true = code:soft_purge(code_b_test),
+    Pid = code_b_test:do_spawn(),
+    true = code:delete(code_b_test),
+    false = code_b_test:check_exit(Pid),
+    false = code:soft_purge(code_b_test),
+    false = code_b_test:check_exit(Pid),
     exit(Pid,kill),
-    ?line true = code_b_test:check_exit(Pid),
-    ?line true = code:soft_purge(code_b_test),
+    true = code_b_test:check_exit(Pid),
+    true = code:soft_purge(code_b_test),
     process_flag(trap_exit, OldFlag),
     ok.
 
@@ -394,12 +429,12 @@ is_loaded(doc) -> [];
 is_loaded(Config) when is_list(Config) ->
     code:purge(code_b_test),
     code:delete(code_b_test),
-    ?line false = code:is_loaded(duuuuuumy_mod),
-    ?line {'EXIT',_} = (catch code:is_loaded(23)),
-    ?line {file, preloaded} = code:is_loaded(init),
+    false = code:is_loaded(duuuuuumy_mod),
+    {'EXIT',_} = (catch code:is_loaded(23)),
+    {file, preloaded} = code:is_loaded(init),
     TestDir = test_dir(),
-    ?line {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
-    ?line {file, _Loaded} = code:is_loaded(code_b_test),
+    {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
+    {file, _Loaded} = code:is_loaded(code_b_test),
     code:purge(code_b_test),
     code:delete(code_b_test),
     ok.
@@ -413,21 +448,19 @@ all_loaded(Config) when is_list(Config) ->
     end.
 
 all_loaded_1() ->
-    ?line Preloaded = [{M,preloaded} || M <- lists:sort(erlang:pre_loaded())],
+    Preloaded = [{M,preloaded} || M <- lists:sort(erlang:pre_loaded())],
 
-    ?line Loaded0 = lists:sort(code:all_loaded()),
-    ?line all_unique(Loaded0),
-    ?line Loaded1 = lists:keysort(2, Loaded0),
-    ?line Loaded2 = match_and_remove(Preloaded, Loaded1),
+    Loaded0 = lists:sort(code:all_loaded()),
+    all_unique(Loaded0),
+    Loaded1 = lists:keysort(2, Loaded0),
+    Loaded2 = match_and_remove(Preloaded, Loaded1),
 
     ObjExt = code:objfile_extension(),
-    ?line [] = lists:filter(fun({Mod,AbsName}) when is_atom(Mod),
-                                                    is_list(AbsName) ->
-                                    Mod =/= list_to_atom(filename:basename(AbsName,
-                                                                           ObjExt));
-			       (_) -> true
-			    end,
-			    Loaded2),
+    [] = lists:filter(fun
+	    ({Mod,AbsName}) when is_atom(Mod), is_list(AbsName) ->
+		Mod =/= list_to_atom(filename:basename(AbsName, ObjExt));
+	    (_) -> true
+	end, Loaded2),
     ok.
 
 match_and_remove([], List) -> List;
@@ -442,19 +475,19 @@ load_binary(doc) -> [];
 load_binary(Config) when is_list(Config) ->
     TestDir = test_dir(),
     File = TestDir ++ "/code_b_test" ++ code:objfile_extension(),
-    ?line {ok,Bin} = file:read_file(File),
-    ?line {'EXIT',_} = (catch code:load_binary(12, File, Bin)),
-    ?line {'EXIT',_} = (catch code:load_binary(code_b_test, 12, Bin)),
-    ?line {'EXIT',_} = (catch code:load_binary(code_b_test, File, 12)),
-    ?line {module, code_b_test} = code:load_binary(code_b_test, File, Bin),
+    {ok,Bin} = file:read_file(File),
+    {'EXIT',_} = (catch code:load_binary(12, File, Bin)),
+    {'EXIT',_} = (catch code:load_binary(code_b_test, 12, Bin)),
+    {'EXIT',_} = (catch code:load_binary(code_b_test, File, 12)),
+    {module, code_b_test} = code:load_binary(code_b_test, File, Bin),
     code:stick_dir(TestDir),
-    ?line {error, sticky_directory} = code:load_binary(code_b_test, File, Bin),
+    {error, sticky_directory} = code:load_binary(code_b_test, File, Bin),
     code:unstick_dir(TestDir),
     code:purge(code_b_test),
     code:delete(code_b_test),
     ok.
 
-upgrade(Config) ->    
+upgrade(Config) ->
     DataDir = ?config(data_dir, Config),
 
     %%T = [beam, hipe],
@@ -462,28 +495,28 @@ upgrade(Config) ->
 
     [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),        
+    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,
+	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,
+	beam -> [];
+	hipe -> [native]
+    end,
     CompOpts = [binary, report] ++ Target ++ Version,
 
     Src = filename:join(Dir, atom_to_list(Mod) ++ ".erl"),
@@ -497,17 +530,17 @@ compile_load(Mod, Dir, Ver, CodeType) ->
 dir_req(suite) -> [];
 dir_req(doc) -> [];
 dir_req(Config) when is_list(Config) ->
-    ?line {ok,[[Root0]]} = init:get_argument(root),
-    ?line Root = filename:join([Root0]),	% Normalised form.
-    ?line Root = code:root_dir(),
+    {ok,[[Root0]]} = init:get_argument(root),
+    Root = filename:join([Root0]),	% Normalised form.
+    Root = code:root_dir(),
     LibDir = Root ++ "/lib",
-    ?line LibDir = code:lib_dir(),
-    ?line code:compiler_dir(),
-    ?line {error, bad_name} = code:lib_dir(duuumy),
-    ?line KernLib = code:lib_dir(kernel),
-    ?line Priv = KernLib ++ "/priv",
-    ?line Priv = code:priv_dir(kernel),
-    ?line {error, bad_name} = code:priv_dir(duuumy),
+    LibDir = code:lib_dir(),
+    code:compiler_dir(),
+    {error, bad_name} = code:lib_dir(duuumy),
+    KernLib = code:lib_dir(kernel),
+    Priv = KernLib ++ "/priv",
+    Priv = code:priv_dir(kernel),
+    {error, bad_name} = code:priv_dir(duuumy),
     ok.
 
 object_code(suite) -> [];
@@ -517,19 +550,19 @@ object_code(Config) when is_list(Config) ->
     P = code:get_path(),
     P = code:get_path(),
     code:add_path(TestDir),
-    ?line {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
+    {module, code_b_test} = code:load_abs(TestDir ++ "/code_b_test"),
     LoadedFile = filename:absname(TestDir ++ "/code_b_test" ++
 				  code:objfile_extension()),
-    ?line case code:get_object_code(code_b_test) of
+    case code:get_object_code(code_b_test) of
 	      {code_b_test,Bin,LoadedFile} when is_binary(Bin) ->
 		  ok
 	  end,
     code:purge(code_b_test),
     code:delete(code_b_test),
-    ?line error = code:get_object_code(dddddddduuuuuuumy),
-    ?line {'EXIT',_} = (catch code:get_object_code(23)),
-    ?line code:set_path(P),
-    ?line P=code:get_path(),
+    error = code:get_object_code(dddddddduuuuuuumy),
+    {'EXIT',_} = (catch code:get_object_code(23)),
+    code:set_path(P),
+    P=code:get_path(),
     ok.
 
 set_path_file(suite) -> [];
@@ -537,17 +570,17 @@ set_path_file(doc) -> ["Test that set_path does not accept ",
 		       "files as pathnames (known previous bug)"];
 set_path_file(Config) when is_list(Config) ->
     File=filename:join(?config(priv_dir, Config), "testfil"),
-    ?line ok=file:write_file(File, list_to_binary("lite data")),
-    ?line {error, bad_directory}=code:set_path([File]).
+    ok=file:write_file(File, list_to_binary("lite data")),
+    {error, bad_directory}=code:set_path([File]).
 
 sticky_dir(suite) -> [];
 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++"\""}]),
+    {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]),
+    Ret=rpc:call(Node, ?MODULE, sticky_compiler, [File]),
     case Ret of
 	fail ->
 	    ?t:fail("c:c allowed a sticky module to be compiled and loaded.");
@@ -607,70 +640,70 @@ add_del_path(Config) when is_list(Config) ->
     Dir1 = filename:join(DDir,"dummy_app-1.0/ebin"),
     Dir2 = filename:join(DDir,"dummy_app-2.0/ebin"),
     code:add_patha(Dir1),
-    ?line PrivDir1 = filename:join(DDir,"dummy_app-1.0/priv"),
-    ?line PrivDir1 = code:priv_dir(dummy_app),
-    ?line code:add_path(Dir2), % put last in path
-    ?line PrivDir1 = code:priv_dir(dummy_app),
-    ?line code:del_path(Dir2),
-    ?line PrivDir1 = code:priv_dir(dummy_app),
+    PrivDir1 = filename:join(DDir,"dummy_app-1.0/priv"),
+    PrivDir1 = code:priv_dir(dummy_app),
+    code:add_path(Dir2), % put last in path
+    PrivDir1 = code:priv_dir(dummy_app),
+    code:del_path(Dir2),
+    PrivDir1 = code:priv_dir(dummy_app),
     ok.
 
 
 clash(Config) when is_list(Config) ->
     DDir = ?config(data_dir,Config)++"clash/",
     P = code:get_path(),
-    [TestServerPath|_] = [Path || Path <- code:get_path(), 
-				  re:run(Path,"test_server/?$",[]) /= nomatch],
+    [TestServerPath|_] = [Path || Path <- code:get_path(),
+				  re:run(Path,"test_server/?$",[unicode]) /= nomatch],
 
     %% test non-clashing entries
 
     %% remove TestServerPath to prevent clash with test-server path
-    ?line true = code:del_path(TestServerPath),
-    ?line true = code:add_path(DDir++"foobar-0.1/ebin"),
-    ?line true = code:add_path(DDir++"zork-0.8/ebin"),
+    true = code:del_path(TestServerPath),
+    true = code:add_path(DDir++"foobar-0.1/ebin"),
+    true = code:add_path(DDir++"zork-0.8/ebin"),
     test_server:capture_start(),
-    ?line ok = code:clash(),
+    ok = code:clash(),
     test_server:capture_stop(),
-    ?line [OKMsg|_] = test_server:capture_get(),
-    ?line true = lists:prefix("** Found 0 name clashes", OKMsg),
-    ?line true = code:set_path(P),
+    [OKMsg|_] = test_server:capture_get(),
+    true = lists:prefix("** Found 0 name clashes", OKMsg),
+    true = code:set_path(P),
 
     %% test clashing entries
 
     %% remove TestServerPath to prevent clash with test-server path
-    ?line true = code:del_path(TestServerPath),
-    ?line true = code:add_path(DDir++"foobar-0.1/ebin"),
-    ?line true = code:add_path(DDir++"foobar-0.1.ez/foobar-0.1/ebin"),
+    true = code:del_path(TestServerPath),
+    true = code:add_path(DDir++"foobar-0.1/ebin"),
+    true = code:add_path(DDir++"foobar-0.1.ez/foobar-0.1/ebin"),
     test_server:capture_start(),
-    ?line ok = code:clash(),
+    ok = code:clash(),
     test_server:capture_stop(),
-    ?line [ClashMsg|_] = test_server:capture_get(),
-    ?line {match, [" hides "]} = re:run(ClashMsg, "\\*\\* .*( hides ).*",
+    [ClashMsg|_] = test_server:capture_get(),
+    {match, [" hides "]} = re:run(ClashMsg, "\\*\\* .*( hides ).*",
 					[{capture,all_but_first,list}]),
-    ?line true = code:set_path(P),
+    true = code:set_path(P),
 
     %% test "Bad path can't read"
 
     %% remove TestServerPath to prevent clash with test-server path
     Priv = ?config(priv_dir, Config),
-    ?line true = code:del_path(TestServerPath),
+    true = code:del_path(TestServerPath),
     TmpEzFile = Priv++"foobar-0.tmp.ez",
-    ?line {ok, _} = file:copy(DDir++"foobar-0.1.ez", TmpEzFile),
-    ?line true = code:add_path(TmpEzFile++"/foobar-0.1/ebin"),
+    {ok, _} = file:copy(DDir++"foobar-0.1.ez", TmpEzFile),
+    true = code:add_path(TmpEzFile++"/foobar-0.1/ebin"),
     case os:type() of
         {win32,_} ->
-	    %% The file wont be deleted on windows until it's closed, why we 
+	    %% The file wont be deleted on windows until it's closed, why we
 	    %% need to rename instead.
-	    ?line ok = file:rename(TmpEzFile,TmpEzFile++".moved");
+	    ok = file:rename(TmpEzFile,TmpEzFile++".moved");
 	 _ ->
-    	    ?line ok = file:delete(TmpEzFile)
+    	    ok = file:delete(TmpEzFile)
     end,
     test_server:capture_start(),
-    ?line ok = code:clash(),
+    ok = code:clash(),
     test_server:capture_stop(),
-    ?line [BadPathMsg|_] = test_server:capture_get(),
-    ?line true = lists:prefix("** Bad path can't read", BadPathMsg),
-    ?line true = code:set_path(P),
+    [BadPathMsg|_] = test_server:capture_get(),
+    true = lists:prefix("** Bad path can't read", BadPathMsg),
+    true = code:set_path(P),
     file:delete(TmpEzFile++".moved"), %% Only effect on windows
     ok.
 
@@ -687,7 +720,7 @@ ext_mod_dep(Config) when is_list(Config) ->
     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} -> 
+	{'EXIT', Reason} ->
 	    xref:stop(s),
 	    exit(Reason);
 	Else ->
@@ -699,7 +732,7 @@ ext_mod_dep(Config) when is_list(Config) ->
     end.
 
 ext_mod_dep2() ->
-    Exports0 = code_server:module_info(exports) -- 
+    Exports0 = code_server:module_info(exports) --
 	[{module_info,0},{module_info,1}],
     Exports = [{code_server,M,A} || {M,A} <- Exports0],
     case analyse(Exports, [], [], 0) of
@@ -709,17 +742,17 @@ ext_mod_dep2() ->
 	    {not_verified,ErrCnt}
     end.
 
-analyse([], [], Visited, ErrCnt) -> 
+analyse([], [], Visited, ErrCnt) ->
     {Visited,ErrCnt};
 analyse([], [This={M,F,A}|Path], Visited, ErrCnt0) ->
     %% The code_server has been granted to use the following modules,
-    %% These modules should be loaded by code.erl before 
+    %% These modules should be loaded by code.erl before
     %% the code_server is started.
     OK = [erlang, os, prim_file, erl_prim_loader, init, ets,
 	  code_server, lists, lists_sort, unicode, binary, filename,
 	  gb_sets, gb_trees, hipe_unified_loader, hipe_bifs,
 	  prim_zip, zlib],
-    ErrCnt1 = 
+    ErrCnt1 =
 	case lists:member(M, OK) or erlang:is_builtin(M,F,A) of
 	    true ->
 		0;
@@ -729,7 +762,7 @@ analyse([], [This={M,F,A}|Path], Visited, ErrCnt0) ->
     {Visited, ErrCnt1+ErrCnt0};
 analyse([MFA|R], Path, Visited0, ErrCnt0) ->
     case lists:member(MFA,Visited0) of
-	false -> 
+	false ->
 	    {Visited,ErrCnt1} = analyse2(MFA, Path, Visited0),
 	    analyse(R, Path, Visited, ErrCnt1+ErrCnt0);
 	true ->
@@ -814,7 +847,7 @@ check_funs({'$M_EXPR','$F_EXPR',_},
 	    {code_server,start_link,1}]) -> 0;
 check_funs({'$M_EXPR','$F_EXPR',_},
 	   [{erlang,spawn_link,1},{code_server,start_link,1}]) -> 0;
-check_funs({'$M_EXPR',module_info,1}, 
+check_funs({'$M_EXPR',module_info,1},
 	   [{hipe_unified_loader,patch_to_emu_step1,1} | _]) -> 0;
 check_funs({'$M_EXPR','$F_EXPR',2},
 	   [{lists,foldl,3},
@@ -829,7 +862,7 @@ check_funs({'$M_EXPR','$F_EXPR',1},
 check_funs({'$M_EXPR',warning_msg,2},
 	   [{code_server,finish_on_load_report,2} | _]) -> 0;
 %% This is cheating! /raimo
-%% 
+%%
 %% check_funs(This = {M,_,_}, Path) ->
 %%     case catch atom_to_list(M) of
 %% 	[$h,$i,$p,$e | _] ->
@@ -861,9 +894,9 @@ load_cached(suite) ->
 load_cached(doc) ->
     [];
 load_cached(Config) when is_list(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line WD = filename:dirname(code:which(?MODULE)),
-    ?line {ok,Node} = 
+    Priv = ?config(priv_dir, Config),
+    WD = filename:dirname(code:which(?MODULE)),
+    {ok,Node} =
 	?t:start_node(code_cache_node, peer, [{args,
 					       "-pa \"" ++ WD ++ "\""},
 					      {erl, [this]}]),
@@ -873,7 +906,7 @@ load_cached(Config) when is_list(Config) ->
 			       _ -> false
 			   end
 		   end,
-    ?line Tabs = rpc:call(Node, ets, all, []),
+    Tabs = rpc:call(Node, ets, all, []),
     case rpc:call(Node, lists, any, [CCTabCreated,Tabs]) of
 	true ->
 	    ?t:stop_node(Node),
@@ -881,25 +914,25 @@ load_cached(Config) when is_list(Config) ->
 	false ->
 	    ok
     end,
-    ?line rpc:call(Node, code, del_path, [Priv]),
-    ?line rpc:call(Node, code, add_pathz, [Priv]),
+    rpc:call(Node, code, del_path, [Priv]),
+    rpc:call(Node, code, add_pathz, [Priv]),
 
     FullModName = Priv ++ "/code_cache_test",
-    ?line {ok,Dev} = file:open(FullModName ++ ".erl", [write]),
-    ?line io:format(Dev, "-module(code_cache_test). -export([a/0]). a() -> ok.~n", []),
-    ?line ok = file:close(Dev),
-    ?line {ok,code_cache_test} = compile:file(FullModName, [{outdir,Priv}]),
+    {ok,Dev} = file:open(FullModName ++ ".erl", [write]),
+    io:format(Dev, "-module(code_cache_test). -export([a/0]). a() -> ok.~n", []),
+    ok = file:close(Dev),
+    {ok,code_cache_test} = compile:file(FullModName, [{outdir,Priv}]),
 
     F = fun load_loop/2,
     N = 1000,
-    ?line {T0,T1} = rpc:call(Node, erlang, apply, [F, [N,code_cache_test]]),
+    {T0,T1} = rpc:call(Node, erlang, apply, [F, [N,code_cache_test]]),
     TNoCache = now_diff(T1, T0),
-    ?line rpc:call(Node, code, rehash, []),
-    ?line {T2,T3} = rpc:call(Node, erlang, apply, [F, [N,code_cache_test]]),
-    ?line TCache = now_diff(T3, T2),
+    rpc:call(Node, code, rehash, []),
+    {T2,T3} = rpc:call(Node, erlang, apply, [F, [N,code_cache_test]]),
+    TCache = now_diff(T3, T2),
     AvgNoCache = TNoCache/N,
     AvgCache = TCache/N,
-    ?line io:format("Avg. load time (no_cache/cache): ~w/~w~n", [AvgNoCache,AvgCache]),
+    io:format("Avg. load time (no_cache/cache): ~w/~w~n", [AvgNoCache,AvgCache]),
     ?t:stop_node(Node),
     if AvgNoCache =< AvgCache ->
 	    ?t:fail("Cache not working properly.");
@@ -916,7 +949,7 @@ load_loop(N, M, T0) ->
     code:delete(M),
     code:purge(M),
     load_loop(N-1, M, T0).
-    
+
 now_diff({A2, B2, C2}, {A1, B1, C1}) ->
     ((A2-A1)*1000000 + B2-B1)*1000000 + C2-C1.
 
@@ -925,30 +958,30 @@ start_node_with_cache(suite) ->
 start_node_with_cache(doc) ->
     [];
 start_node_with_cache(Config) when is_list(Config) ->
-    ?line {ok,Node} = 
-	?t:start_node(code_cache_node, peer, [{args, 
+    {ok,Node} =
+	?t:start_node(code_cache_node, peer, [{args,
 					       "-code_path_cache"},
 					      {erl, [this]}]),
-    ?line Tabs = rpc:call(Node, ets, all, []),
+    Tabs = rpc:call(Node, ets, all, []),
     io:format("Tabs: ~w~n", [Tabs]),
     CCTabCreated = fun(Tab) ->
 			   case rpc:call(Node, ets, info, [Tab,name]) of
 			       code_cache -> true;
 			       _ -> false
 			   end
-		   end,    
-    ?line true = lists:any(CCTabCreated, Tabs),
+		   end,
+    true = lists:any(CCTabCreated, Tabs),
     ?t:stop_node(Node),
     ok.
-    
+
 add_and_rehash(suite) ->
     [];
 add_and_rehash(doc) ->
     [];
 add_and_rehash(Config) when is_list(Config) ->
-    ?line Priv = ?config(priv_dir, Config),
-    ?line WD = filename:dirname(code:which(?MODULE)),
-    ?line {ok,Node} = 
+    Priv = ?config(priv_dir, Config),
+    WD = filename:dirname(code:which(?MODULE)),
+    {ok,Node} =
 	?t:start_node(code_cache_node, peer, [{args,
 					       "-pa \"" ++ WD ++ "\""},
 					      {erl, [this]}]),
@@ -958,7 +991,7 @@ add_and_rehash(Config) when is_list(Config) ->
 			       _ -> false
 			   end
 		   end,
-    ?line Tabs0 = rpc:call(Node, ets, all, []),
+    Tabs0 = rpc:call(Node, ets, all, []),
     case rpc:call(Node, lists, any, [CCTabCreated,Tabs0]) of
 	true ->
 	    ?t:stop_node(Node),
@@ -966,36 +999,36 @@ add_and_rehash(Config) when is_list(Config) ->
 	false ->
 	    ok
     end,
-    ?line ok = rpc:call(Node, code, rehash, []),	             % create cache
-    ?line Tabs1 = rpc:call(Node, ets, all, []),
-    ?line true = rpc:call(Node, lists, any, [CCTabCreated,Tabs1]), % cache table created
-    ?line ok = rpc:call(Node, code, rehash, []),		             
+    ok = rpc:call(Node, code, rehash, []),	             % create cache
+    Tabs1 = rpc:call(Node, ets, all, []),
+    true = rpc:call(Node, lists, any, [CCTabCreated,Tabs1]), % cache table created
+    ok = rpc:call(Node, code, rehash, []),
     OkDir = filename:join(Priv, ""),
     BadDir = filename:join(Priv, "guggemuffsussiputt"),
-    ?line CP = [OkDir | rpc:call(Node, code, get_path, [])],
-    ?line true = rpc:call(Node, code, set_path, [CP]),
+    CP = [OkDir | rpc:call(Node, code, get_path, [])],
+    true = rpc:call(Node, code, set_path, [CP]),
     CP1 = [BadDir | CP],
-    ?line {error,_} = rpc:call(Node, code, set_path, [CP1]),
-    ?line true = rpc:call(Node, code, del_path, [OkDir]),    
-    ?line true = rpc:call(Node, code, add_path, [OkDir]),
-    ?line true = rpc:call(Node, code, add_path, [OkDir]),
-    ?line {error,_} = rpc:call(Node, code, add_path, [BadDir]),
-    ?line ok = rpc:call(Node, code, rehash, []),
+    {error,_} = rpc:call(Node, code, set_path, [CP1]),
+    true = rpc:call(Node, code, del_path, [OkDir]),
+    true = rpc:call(Node, code, add_path, [OkDir]),
+    true = rpc:call(Node, code, add_path, [OkDir]),
+    {error,_} = rpc:call(Node, code, add_path, [BadDir]),
+    ok = rpc:call(Node, code, rehash, []),
 
     ?t:stop_node(Node),
     ok.
-    
+
 where_is_file_no_cache(suite) ->
     [];
 where_is_file_no_cache(doc) ->
     [];
 where_is_file_no_cache(Config) when is_list(Config) ->
-    ?line {T,KernelBeamFile} = timer:tc(code, where_is_file, ["kernel.beam"]),
+    {T,KernelBeamFile} = timer:tc(code, where_is_file, ["kernel.beam"]),
     io:format("Load time: ~w ms~n", [T]),
-    ?line KernelEbinDir = filename:dirname(KernelBeamFile),
-    ?line AppFile = filename:join(KernelEbinDir, "kernel.app"),
-    ?line AppFile = code:where_is_file("kernel.app"),
-    ?line non_existing = code:where_is_file("kernel"), % no such file
+    KernelEbinDir = filename:dirname(KernelBeamFile),
+    AppFile = filename:join(KernelEbinDir, "kernel.app"),
+    AppFile = code:where_is_file("kernel.app"),
+    non_existing = code:where_is_file("kernel"), % no such file
     ok.
 
 where_is_file_cached(suite) ->
@@ -1003,97 +1036,97 @@ where_is_file_cached(suite) ->
 where_is_file_cached(doc) ->
     [];
 where_is_file_cached(Config) when is_list(Config) ->
-    ?line {ok,Node} = 
-	?t:start_node(code_cache_node, peer, [{args, 
+    {ok,Node} =
+	?t:start_node(code_cache_node, peer, [{args,
 					       "-code_path_cache"},
 					      {erl, [this]}]),
-    ?line Tabs = rpc:call(Node, ets, all, []),
+    Tabs = rpc:call(Node, ets, all, []),
     io:format("Tabs: ~w~n", [Tabs]),
     CCTabCreated = fun(Tab) ->
 			   case rpc:call(Node, ets, info, [Tab,name]) of
 			       code_cache -> true;
 			       _ -> false
 			   end
-		   end,    
-    ?line true = lists:any(CCTabCreated, Tabs),
-    ?line KernelBeamFile = rpc:call(Node, code, where_is_file, ["kernel.beam"]),
-    ?line {T,KernelBeamFile} = rpc:call(Node, timer, tc, [code,where_is_file,["kernel.beam"]]),
+		   end,
+    true = lists:any(CCTabCreated, Tabs),
+    KernelBeamFile = rpc:call(Node, code, where_is_file, ["kernel.beam"]),
+    {T,KernelBeamFile} = rpc:call(Node, timer, tc, [code,where_is_file,["kernel.beam"]]),
     io:format("Load time: ~w ms~n", [T]),
-    ?line KernelEbinDir = rpc:call(Node, filename, dirname, [KernelBeamFile]),
-    ?line AppFile = rpc:call(Node, filename, join, [KernelEbinDir,"kernel.app"]),
-    ?line AppFile = rpc:call(Node, code, where_is_file, ["kernel.app"]),
-    ?line non_existing = rpc:call(Node, code, where_is_file, ["kernel"]), % no such file
+    KernelEbinDir = rpc:call(Node, filename, dirname, [KernelBeamFile]),
+    AppFile = rpc:call(Node, filename, join, [KernelEbinDir,"kernel.app"]),
+    AppFile = rpc:call(Node, code, where_is_file, ["kernel.app"]),
+    non_existing = rpc:call(Node, code, where_is_file, ["kernel"]), % no such file
     ?t:stop_node(Node),
     ok.
-    
+
 
 purge_stacktrace(suite) ->
     [];
 purge_stacktrace(doc) ->
     ["Test that stacktrace is deleted when purging a referred module"];
 purge_stacktrace(Config) when is_list(Config) ->
-    ?line code:purge(code_b_test),
+    code:purge(code_b_test),
     try code_b_test:call(fun(b) -> ok end, a)
     catch
 	error:function_clause ->
-	    ?line code:load_file(code_b_test),
-	    ?line case erlang:get_stacktrace() of
+	    code:load_file(code_b_test),
+	    case erlang:get_stacktrace() of
 		      [{?MODULE,_,[a],_},
 		       {code_b_test,call,2,_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  ?line false = code:purge(code_b_test),
-			  ?line [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test),
+			  [] = erlang:get_stacktrace()
 		  end
     end,
     try code_b_test:call(nofun, 2)
     catch
 	error:function_clause ->
-	    ?line code:load_file(code_b_test),
-	    ?line case erlang:get_stacktrace() of
+	    code:load_file(code_b_test),
+	    case erlang:get_stacktrace() of
 		      [{code_b_test,call,[nofun,2],_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  ?line false = code:purge(code_b_test),
-			  ?line [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test),
+			  [] = erlang:get_stacktrace()
 		  end
     end,
     Args = [erlang,error,[badarg]],
     try code_b_test:call(erlang, error, [badarg,Args])
     catch
 	error:badarg ->
-	    ?line code:load_file(code_b_test),
-	    ?line case erlang:get_stacktrace() of
+	    code:load_file(code_b_test),
+	    case erlang:get_stacktrace() of
 		      [{code_b_test,call,Args,_},
 		       {?MODULE,purge_stacktrace,1,_}|_] ->
-			  ?line false = code:purge(code_b_test),
-			  ?line [] = erlang:get_stacktrace()
+			  false = code:purge(code_b_test),
+			  [] = erlang:get_stacktrace()
 		  end
     end,
     ok.
 
 mult_lib_roots(Config) when is_list(Config) ->
-    ?line DataDir = filename:join(?config(data_dir, Config), "mult_lib_roots"),
-    ?line mult_lib_compile(DataDir, "my_dummy_app-b/ebin/lists"),
-    ?line mult_lib_compile(DataDir,
+    DataDir = filename:join(?config(data_dir, Config), "mult_lib_roots"),
+    mult_lib_compile(DataDir, "my_dummy_app-b/ebin/lists"),
+    mult_lib_compile(DataDir,
 			   "my_dummy_app-c/ebin/code_SUITE_mult_root_module"),
 
     %% Set up ERL_LIBS and start a slave node.
     ErlLibs = filename:join(DataDir, "first_root") ++ mult_lib_sep() ++
 	filename:join(DataDir, "second_root"),
 
-    ?line {ok,Node} = 
+    {ok,Node} =
 	?t:start_node(mult_lib_roots, slave,
 		      [{args,"-env ERL_LIBS "++ErlLibs}]),
 
-    ?line TSPath = filename:dirname(code:which(test_server)),
-    ?line Path0 = rpc:call(Node, code, get_path, []),
-    ?line [TSPath,"."|Path1] = Path0,
-    ?line [Kernel|Path2] = Path1,
-    ?line [Stdlib|Path3] = Path2,
-    ?line mult_lib_verify_lib(Kernel, "kernel"),
-    ?line mult_lib_verify_lib(Stdlib, "stdlib"),
-    ?line [Lib1,Lib2,Lib3,Lib4,Lib5|Path] = Path3,
+    TSPath = filename:dirname(code:which(test_server)),
+    Path0 = rpc:call(Node, code, get_path, []),
+    [TSPath,"."|Path1] = Path0,
+    [Kernel|Path2] = Path1,
+    [Stdlib|Path3] = Path2,
+    mult_lib_verify_lib(Kernel, "kernel"),
+    mult_lib_verify_lib(Stdlib, "stdlib"),
+    [Lib1,Lib2,Lib3,Lib4,Lib5|Path] = Path3,
+
 
-    
     ["first_root/my_dummy_app-a/ebin",
      "first_root/my_dummy_app-b/ebin",
      "first_root/my_dummy_app-c/ebin",
@@ -1103,7 +1136,7 @@ mult_lib_roots(Config) when is_list(Config) ->
 	    E <- lists:sort([Lib1,Lib2,Lib3,Lib4,Lib5])],
     io:format("~p\n", [Path]),
 
-    ?line true = rpc:call(Node, code_SUITE_mult_root_module, works_fine, []),
+    true = rpc:call(Node, code_SUITE_mult_root_module, works_fine, []),
 
     ok.
 
@@ -1113,7 +1146,7 @@ mult_lib_compile(Root, Last) ->
     Dir = filename:dirname(Name),
     {ok,Mod} = compile:file(Name, [report,{outdir,Dir}]),
     ok.
-    
+
 mult_lib_sep() ->
     case os:type() of
 	{win32,_} -> ";";
@@ -1123,23 +1156,23 @@ mult_lib_sep() ->
 mult_lib_verify_lib(Path, Expected) ->
     Dir = filename:basename(filename:dirname(Path)),
     true = lists:prefix(Expected, Dir).
-    
+
 mult_lib_remove_prefix([H|T1], [H|T2]) ->
     mult_lib_remove_prefix(T1, T2);
 mult_lib_remove_prefix([$/|T], []) -> T.
 
 bad_erl_libs(Config) when is_list(Config) ->
-    ?line {ok,Node} = 
+    {ok,Node} =
 	?t:start_node(mult_lib_roots, slave,
 		      [{args,"-env ERL_LIBS "}]),
 
-    ?line ?t:stop_node(Node),
+    ?t:stop_node(Node),
 
-    ?line {ok,Node2} = 
+    {ok,Node2} =
 	?t:start_node(mult_lib_roots, slave,
 		      [{args,"-env ERL_LIBS /no/such/dir"}]),
 
-    ?line ?t:stop_node(Node2),
+    ?t:stop_node(Node2),
     ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1158,55 +1191,55 @@ do_code_archive(Config, Root, StripVsn) when is_list(Config) ->
     PrivDir = ?config(priv_dir, Config),
     App = code_archive_dict,
     VsnBase = atom_to_list(App) ++ "-1.0",
-    Base = 
+    Base =
 	case StripVsn of
 	    true  -> atom_to_list(App);
 	    false -> VsnBase
 	end,
     Ext = init:archive_extension(),
     RootDir = filename:join([PrivDir, Root]),
-    ?line ok = file:make_dir(RootDir),
+    ok = file:make_dir(RootDir),
     Archive = filename:join([RootDir, VsnBase ++ Ext]),
-    ?line {ok, _} = zip:create(Archive, [VsnBase],
+    {ok, _} = zip:create(Archive, [VsnBase],
 			       [{compress, []}, {cwd, DataDir}]),
-    ?line {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
+    {ok, _} = zip:extract(Archive, [{cwd, PrivDir}]),
 
     case StripVsn of
 	true ->
-	    ?line ok = file:rename(filename:join([PrivDir, VsnBase]),
+	    ok = file:rename(filename:join([PrivDir, VsnBase]),
 				   filename:join([PrivDir, Base]));
 	false ->
 	    ok
     end,
-	    
+
     io:format("DEBUG: ~p\n", [?LINE]),
     %% Compile the code
-    ?line ok = compile_app(PrivDir, Base),
-    
+    ok = compile_app(PrivDir, Base),
+
     %% Create the archive
-    ?line ok = file:delete(Archive),
-    ?line {ok, _} = zip:create(Archive, [Base],
+    ok = file:delete(Archive),
+    {ok, _} = zip:create(Archive, [Base],
 			       [{compress, []}, {cwd, PrivDir}]),
 
     %% Set up ERL_LIBS and start a slave node.
-    ?line {ok, Node} = 
+    {ok, Node} =
 	?t:start_node(code_archive, slave,
 		      [{args,"-env ERL_LIBS " ++ RootDir}]),
-    ?line CodePath = rpc:call(Node, code, get_path, []),
+    CodePath = rpc:call(Node, code, get_path, []),
     AppEbin = filename:join([Archive, Base, "ebin"]),
     io:format("AppEbin: ~p\n", [AppEbin]),
     io:format("CodePath: ~p\n", [CodePath]),
     io:format("Archive: ~p\n", [erl_prim_loader:read_file_info(Archive)]),
-    ?line true = lists:member(AppEbin, CodePath),
+    true = lists:member(AppEbin, CodePath),
 
     %% Start the app
-    ?line ok = rpc:call(Node, application, start, [App]),
-    
+    ok = rpc:call(Node, application, start, [App]),
+
     %% Access the app priv dir
     AppPrivDir = rpc:call(Node, code, priv_dir, [App]),
-    ?line AppPrivFile = filename:join([AppPrivDir, "code_archive.txt"]),
+    AppPrivFile = filename:join([AppPrivDir, "code_archive.txt"]),
     io:format("AppPrivFile: ~p\n", [AppPrivFile]),
-    ?line {ok, _Bin, _Path} =
+    {ok, _Bin, _Path} =
 	rpc:call(Node, erl_prim_loader, get_file, [AppPrivFile]),
 
     %% Use the app
@@ -1221,14 +1254,14 @@ do_code_archive(Config, Root, StripVsn) when is_list(Config) ->
     error =  rpc:call(Node, App, find, [Tab, Key]),
     ok =  rpc:call(Node, App, erase, [Tab]),
 
-    ?line ?t:stop_node(Node),
+    ?t:stop_node(Node),
     ok.
 
 compile_app(TopDir, AppName) ->
     AppDir = filename:join([TopDir, AppName]),
     SrcDir = filename:join([AppDir, "src"]),
     OutDir = filename:join([AppDir, "ebin"]),
-    ?line {ok, Files} = file:list_dir(SrcDir),
+    {ok, Files} = file:list_dir(SrcDir),
     compile_files(Files, SrcDir, OutDir).
 
 compile_files([File | Files], SrcDir, OutDir) ->
@@ -1253,27 +1286,27 @@ big_boot_embedded(doc) ->
     ["Test that a boot file with (almost) all of OTP can be used to start an"
      " embeddedd system."];
 big_boot_embedded(Config) when is_list(Config) ->
-    ?line {BootArg,AppsInBoot} = create_big_boot(Config),
-    ?line {ok, Node} = 
+    {BootArg,AppsInBoot} = create_big_boot(Config),
+    {ok, Node} =
 	?t:start_node(big_boot_embedded, slave,
 		      [{args,"-boot "++BootArg++" -mode embedded"}]),
-    ?line RemoteNodeApps = 
-	[ {X,Y} || {X,_,Y} <- 
+    RemoteNodeApps =
+	[ {X,Y} || {X,_,Y} <-
 		       rpc:call(Node,application,loaded_applications,[]) ],
-    ?line true = lists:sort(AppsInBoot) =:=  lists:sort(RemoteNodeApps),
+    true = lists:sort(AppsInBoot) =:=  lists:sort(RemoteNodeApps),
     ok.
 
 on_load(Config) when is_list(Config) ->
     Master = on_load_test_case_process,
 
-    ?line Data = filename:join([?config(data_dir, Config),"on_load"]),
-    ?line ok = file:set_cwd(Data),
-    ?line up_to_date = make:all([{d,'MASTER',Master}]),
+    Data = filename:join([?config(data_dir, Config),"on_load"]),
+    ok = file:set_cwd(Data),
+    up_to_date = make:all([{d,'MASTER',Master}]),
 
     %% Register a name for this process.
-    ?line register(Master, self()),
-    
-    ?line {_,Ref} = spawn_monitor(fun() ->
+    register(Master, self()),
+
+    {_,Ref} = spawn_monitor(fun() ->
 					  exit(on_load_a:data())
 				  end),
     receive
@@ -1285,8 +1318,8 @@ on_load(Config) when is_list(Config) ->
     receive
 	{on_load_c,PidC} -> ok
     end,
-    
-    ?line Refs = on_load_massive_spawn(lists:seq(1, 50)),
+
+    Refs = on_load_massive_spawn(lists:seq(1, 50)),
     receive after 7 -> ok end,
 
     PidC ! go,
@@ -1304,13 +1337,13 @@ on_load(Config) when is_list(Config) ->
 
     receive
 	{'DOWN',Ref,process,_,Res} ->
-	    ?line [a,b,c] = Res
+	    [a,b,c] = Res
     end,
 
     on_load_wait_for_all(Refs),
     receive
 	Any ->
-	    ?line ?t:fail({unexpected,Any})
+	    ?t:fail({unexpected,Any})
     after 10 ->
 	    ok
     end.
@@ -1377,13 +1410,13 @@ on_load_embedded(Config) when is_list(Config) ->
     end.
 
 on_load_embedded_1(Config) ->
-    ?line DataDir = ?config(data_dir, Config),
+    DataDir = ?config(data_dir, Config),
 
     %% Link the on_load_app application into the lib directory.
-    ?line LibRoot = code:lib_dir(),
-    ?line LinkName = filename:join(LibRoot, "on_load_app-1.0"),
-    ?line OnLoadApp = filename:join(DataDir, "on_load_app-1.0"),
-    ?line del_link(LinkName),
+    LibRoot = code:lib_dir(),
+    LinkName = filename:join(LibRoot, "on_load_app-1.0"),
+    OnLoadApp = filename:join(DataDir, "on_load_app-1.0"),
+    del_link(LinkName),
     io:format("LinkName :~p, OnLoadApp: ~p~n",[LinkName,OnLoadApp]),
     case file:make_symlink(OnLoadApp, LinkName) of
 	{error,enotsup} ->
@@ -1392,28 +1425,28 @@ on_load_embedded_1(Config) ->
     end,
 
     %% Compile the code.
-    ?line OnLoadAppEbin = filename:join(LinkName, "ebin"),
-    ?line {ok,_ } = compile:file(filename:join([OnLoadApp,"src",
+    OnLoadAppEbin = filename:join(LinkName, "ebin"),
+    {ok,_ } = compile:file(filename:join([OnLoadApp,"src",
 						"on_load_embedded"]),
 				 [{outdir,OnLoadAppEbin}]),
 
     %% Create and compile a boot file.
-    ?line true = code:add_pathz(OnLoadAppEbin),
+    true = code:add_pathz(OnLoadAppEbin),
     Options = case is_source_dir() of
 		  true -> [local];
 		  false -> []
 	      end,
-    ?line BootScript = create_boot(Config, Options),
-    ?line true = code:del_path(OnLoadAppEbin),
+    BootScript = create_boot(Config, Options),
+    true = code:del_path(OnLoadAppEbin),
 
     %% Start the node and check that the on_load function was run.
-    ?line {ok,Node} = start_node(on_load_embedded,
+    {ok,Node} = start_node(on_load_embedded,
 				 "-mode embedded -boot " ++ BootScript),
     ok = rpc:call(Node, on_load_embedded, status, []),
 
     %% Clean up.
-    ?line stop_node(Node),
-    ?line ok = del_link(LinkName).
+    stop_node(Node),
+    ok = del_link(LinkName).
 
 del_link(LinkName) ->
    case file:delete(LinkName) of
@@ -1421,100 +1454,94 @@ del_link(LinkName) ->
              file:del_dir(LinkName);
        Other ->
        	     Other
-   end.			   
+   end.
 
 create_boot(Config, Options) ->
-    ?line {ok, OldDir} = file:get_cwd(),
-    ?line {LatestDir,LatestName} = create_script(Config),
-    ?line ok = file:set_cwd(LatestDir),
-    ?line ok = systools:make_script(LatestName, Options),
-    ?line ok = file:set_cwd(OldDir),
+    {ok, OldDir} = file:get_cwd(),
+    {LatestDir,LatestName} = create_script(Config),
+    ok = file:set_cwd(LatestDir),
+    ok = systools:make_script(LatestName, Options),
+    ok = file:set_cwd(OldDir),
     filename:join(LatestDir, LatestName).
 
 create_script(Config) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Name = PrivDir ++ "on_load_test",
-    ?line Apps = application_controller:which_applications(),
-    ?line {value,{_,_,KernelVer}} = lists:keysearch(kernel, 1, Apps),
-    ?line {value,{_,_,StdlibVer}} = lists:keysearch(stdlib, 1, Apps),
-    ?line {ok,Fd} = file:open(Name ++ ".rel", [write]),
-    ?line io:format(Fd,
+    PrivDir = ?config(priv_dir, Config),
+    Name = PrivDir ++ "on_load_test",
+    Apps = application_controller:which_applications(),
+    {value,{_,_,KernelVer}} = lists:keysearch(kernel, 1, Apps),
+    {value,{_,_,StdlibVer}} = lists:keysearch(stdlib, 1, Apps),
+    {ok,Fd} = file:open(Name ++ ".rel", [write]),
+    io:format(Fd,
 		    "{release, {\"Test release 3\", \"P2A\"}, \n"
 		    " {erts, \"9.42\"}, \n"
 		    " [{kernel, \"~s\"}, {stdlib, \"~s\"},"
 		    " {on_load_app, \"1.0\"}]}.\n",
 		    [KernelVer,StdlibVer]),
-    ?line file:close(Fd),
+    file:close(Fd),
     {filename:dirname(Name),filename:basename(Name)}.
 
 create_big_boot(Config) ->
-    ?line {ok, OldDir} = file:get_cwd(),
-    ?line {Options,Local} = case is_source_dir() of 
-				true -> {[no_module_tests,local],true}; 
-				_ -> {[no_module_tests],false} 
+    {ok, OldDir} = file:get_cwd(),
+    {Options,Local} = case is_source_dir() of
+				true -> {[no_module_tests,local],true};
+				_ -> {[no_module_tests],false}
 			    end,
-    ?line {LatestDir,LatestName,Apps} = create_big_script(Config,Local),
-    ?line ok = file:set_cwd(LatestDir),
-    ?line ok = systools:make_script(LatestName, Options),
-    ?line ok = file:set_cwd(OldDir),
+    {LatestDir,LatestName,Apps} = create_big_script(Config,Local),
+    ok = file:set_cwd(LatestDir),
+    ok = systools:make_script(LatestName, Options),
+    ok = file:set_cwd(OldDir),
     {filename:join(LatestDir, LatestName),Apps}.
 
-% The following apps cannot be loaded 
+% The following apps cannot be loaded
 % hipe .app references (or can reference) files that have no
 % corresponding beam file (if hipe is not enabled)
-filter_app("hipe",_) ->
-    false;
+filter_app("hipe",_) -> false;
 % Dialyzer and typer depends on hipe
-filter_app("dialyzer",_) ->
-    false;
-filter_app("typer",_) ->
-    false;
+filter_app("dialyzer",_) -> false;
+filter_app("typer",_) -> false;
 % Orber requires explicit configuration
-filter_app("orber",_) ->
-    false;
+filter_app("orber",_) -> false;
 % cos* depends on orber
-filter_app("cos"++_,_) ->
-    false;
+filter_app("cos"++_,_) -> false;
 % ic has a mod instruction in the app file but no corresponding start function
-filter_app("ic",_) ->
-    false;
+filter_app("ic",_) -> false;
 % Netconf has some dependency that I really do not understand (maybe like orber)
-filter_app("netconf",_) ->
-    false;
+filter_app("netconf",_) -> false;
 % Safe has the same kind of error in the .app file as ic
-filter_app("safe",_) ->
-    false;
+filter_app("safe",_) -> false;
 % Comte cannot be started in the "usual" way
-filter_app("comte",_) ->
-    false;
+filter_app("comte",_) -> false;
 % OS_mon does not find it's port program when running cerl
-filter_app("os_mon",true) ->
-    false;
+filter_app("os_mon",true) -> false;
+% erts is not a "real" app either =/
+filter_app("erts",_) -> false;
 % Other apps should be OK.
-filter_app(_,_) ->
-    true.
+filter_app(_,_) -> true.
 create_big_script(Config,Local) ->
-    ?line PrivDir = ?config(priv_dir, Config),
-    ?line Name = filename:join(PrivDir,"full_script_test"),
-    ?line InitialApplications=application:loaded_applications(),
+    PrivDir = ?config(priv_dir, Config),
+    Name = filename:join(PrivDir,"full_script_test"),
+    InitialApplications=application:loaded_applications(),
     %% Applications left loaded by the application suite, unload them!
-    ?line UnloadFix=[app0,app1,app2,group_leader,app_start_error],
-    ?line [application:unload(Leftover) || 
+    UnloadFix=[app0,app1,app2,group_leader,app_start_error],
+    [application:unload(Leftover) ||
 	      Leftover <- UnloadFix,
 	      lists:keymember(Leftover,1,InitialApplications) ],
     %% Now we should have only "real" applications...
-    ?line [application:load(list_to_atom(Y)) || {match,[Y]} <- [ re:run(X,code:lib_dir()++"/"++"([^/-]*).*/ebin",[{capture,[1],list}]) || X <- code:get_path()],filter_app(Y,Local)],
-    ?line Apps = [ {N,V} || {N,_,V} <- application:loaded_applications()],
-    ?line {ok,Fd} = file:open(Name ++ ".rel", [write]),
-    ?line io:format(Fd,
+    [application:load(list_to_atom(Y))
+	|| {match,[Y]} <- [re:run(X,code:lib_dir()++"/"++"([^/-]*).*/ebin",
+		[{capture,[1],list},unicode]) ||
+	    X <- code:get_path()],filter_app(Y,Local)],
+    Apps = [ {N,V} || {N,_,V} <- application:loaded_applications()],
+    {ok,Fd} = file:open(Name ++ ".rel", [write]),
+    io:format(Fd,
 		    "{release, {\"Test release 3\", \"P2A\"}, \n"
 		    " {erts, \"9.42\"}, \n"
 		    " ~p}.\n",
 		    [Apps]),
-    ?line file:close(Fd),
-    ?line NewlyLoaded = 
+    file:close(Fd),
+    NewlyLoaded =
 	application:loaded_applications() -- InitialApplications,
-    ?line [ application:unload(N) || {N,_,_} <- NewlyLoaded],
+    [ application:unload(N) || {N,_,_} <- NewlyLoaded],
     {filename:dirname(Name),filename:basename(Name),Apps}.
 
 is_source_dir() ->
@@ -1523,35 +1550,35 @@ is_source_dir() ->
 
 on_load_errors(Config) when is_list(Config) ->
     Master = on_load_error_test_case_process,
-    ?line register(Master, self()),
+    register(Master, self()),
 
-    ?line Data = filename:join([?config(data_dir, Config),"on_load_errors"]),
-    ?line ok = file:set_cwd(Data),
-    ?line up_to_date = make:all([{d,'MASTER',Master}]),
+    Data = filename:join([?config(data_dir, Config),"on_load_errors"]),
+    ok = file:set_cwd(Data),
+    up_to_date = make:all([{d,'MASTER',Master}]),
 
-    ?line do_on_load_error(an_atom),
+    do_on_load_error(an_atom),
 
-    ?line error_logger:add_report_handler(?MODULE, self()),
+    error_logger:add_report_handler(?MODULE, self()),
 
-    ?line do_on_load_error({something,terrible,is,wrong}),
+    do_on_load_error({something,terrible,is,wrong}),
     receive
 	Any1 ->
-	    ?line {_, "The on_load function"++_,
+	    {_, "The on_load function"++_,
 		   [on_load_error,
 		    {something,terrible,is,wrong},_]} = Any1
     end,
 
-    ?line do_on_load_error(fail),		%Cause exception.
+    do_on_load_error(fail),		%Cause exception.
     receive
 	Any2 ->
-	    ?line {_, "The on_load function"++_,
+	    {_, "The on_load function"++_,
 		   [on_load_error,{failed,[_|_]},_]} = Any2
     end,
 
     %% There should be no more messages.
     receive
 	Unexpected ->
-	    ?line ?t:fail({unexpected,Unexpected})
+	    ?t:fail({unexpected,Unexpected})
     after 10 ->
 	    ok
     end,
@@ -1559,14 +1586,14 @@ on_load_errors(Config) when is_list(Config) ->
     ok.
 
 do_on_load_error(ReturnValue) ->
-    ?line {_,Ref} = spawn_monitor(fun() ->
+    {_,Ref} = spawn_monitor(fun() ->
 					  exit(on_load_error:main())
 				  end),
     receive {on_load_error,ErrorPid} -> ok end,
-    ?line ErrorPid ! ReturnValue,
+    ErrorPid ! ReturnValue,
     receive
 	{'DOWN',Ref,process,_,Exit} ->
-	    ?line {undef,[{on_load_error,main,[],_}|_]} = Exit
+	    {undef,[{on_load_error,main,[],_}|_]} = Exit
     end.
 
 native_early_modules(suite) -> [];
@@ -1580,10 +1607,10 @@ native_early_modules(Config) when is_list(Config) ->
     end.
 
 native_early_modules_1(Architecture) ->
-    ?line {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
-    ?line ChunkName = hipe_unified_loader:chunk_name(Architecture),
-    ?line NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
-    ?line IsHipeCompiled = case NativeChunk of
+    {lists, ListsBinary, _ListsFilename} = code:get_object_code(lists),
+    ChunkName = hipe_unified_loader:chunk_name(Architecture),
+    NativeChunk = beam_lib:chunks(ListsBinary, [ChunkName]),
+    IsHipeCompiled = case NativeChunk of
         {ok,{_,[{_,Bin}]}} when is_binary(Bin) -> true;
         {error, beam_lib, _} -> false
     end,
@@ -1591,10 +1618,10 @@ native_early_modules_1(Architecture) ->
         false ->
 	    {skip,"OTP apparently not configured with --enable-native-libs"};
         true ->
-            ?line true = lists:all(fun code:is_module_native/1,
-				   [ets,file,filename,gb_sets,gb_trees,
-				    %%hipe_unified_loader, no_native as workaround
-				    lists,os]),
+	    true = lists:all(fun code:is_module_native/1,
+		[ets,file,filename,gb_sets,gb_trees,
+		    %%hipe_unified_loader, no_native as workaround
+		    lists,os]),
             ok
     end.
 
diff --git a/lib/kernel/test/erl_prim_loader_SUITE.erl b/lib/kernel/test/erl_prim_loader_SUITE.erl
index 35502a1d27..b2ca3bdbc2 100644
--- a/lib/kernel/test/erl_prim_loader_SUITE.erl
+++ b/lib/kernel/test/erl_prim_loader_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The 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,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
 
--export([get_path/1, set_path/1, get_file/1,
+-export([get_path/1, set_path/1, get_file/1, normalize_and_backslash/1,
 	 inet_existing/1, inet_coming_up/1, inet_disconnects/1,
 	 multiple_slaves/1, file_requests/1,
 	 local_archive/1, remote_archive/1,
@@ -39,7 +39,8 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [get_path, set_path, get_file, inet_existing,
+    [get_path, set_path, get_file,
+     normalize_and_backslash, inet_existing,
      inet_coming_up, inet_disconnects, multiple_slaves,
      file_requests, local_archive, remote_archive,
      primary_archive, virtual_dir_in_archive].
@@ -107,6 +108,26 @@ get_file(Config) when is_list(Config) ->
     ?line error = erl_prim_loader:get_file({dummy}),
     ok.
 
+normalize_and_backslash(Config) ->
+    %% Test OTP-11170
+    case os:type() of
+	{win32,_} ->
+	    {skip, "not on windows"};
+	_ ->
+	    test_normalize_and_backslash(Config)
+    end.
+test_normalize_and_backslash(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    Dir = filename:join(PrivDir,"\\"),
+    File = filename:join(Dir,"file-OTP-11170"),
+    ok = file:make_dir(Dir),
+    ok = file:write_file(File,"a file to test OTP-11170"),
+    {ok,["file-OTP-11170"]} = file:list_dir(Dir),
+    {ok,["file-OTP-11170"]} = erl_prim_loader:list_dir(Dir),
+    ok = file:delete(File),
+    ok = file:del_dir(Dir),
+    ok.
+
 inet_existing(doc) -> ["Start a node using the 'inet' loading method, ",
 		       "from an already started boot server."];
 inet_existing(Config) when is_list(Config) ->
diff --git a/lib/kernel/test/file_SUITE.erl b/lib/kernel/test/file_SUITE.erl
index e4c8f0ffaf..c75639ae7e 100644
--- a/lib/kernel/test/file_SUITE.erl
+++ b/lib/kernel/test/file_SUITE.erl
@@ -805,6 +805,20 @@ new_modes(Config) when is_list(Config) ->
     ?line {ok, [$\[]} = ?FILE_MODULE:read(Fd6, 1),
     ?line ok = ?FILE_MODULE:close(Fd6),
 
+    %% write and sync
+    case ?FILE_MODULE:open(Name1, [write, sync]) of
+	{ok, Fd7} ->
+	    ok = io:write(Fd7, Marker),
+	    ok = io:put_chars(Fd7, ".\n"),
+	    ok = ?FILE_MODULE:close(Fd7),
+	    {ok, Fd8} = ?FILE_MODULE:open(Name1, [read]),
+	    {ok, Marker} = io:read(Fd8, prompt),
+	    ok = ?FILE_MODULE:close(Fd8);
+	{error, enotsup} ->
+	    %% for platforms that don't support the sync option
+	    ok
+    end,
+
     ?line [] = flush(),
     ?line test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/kernel/test/file_name_SUITE.erl b/lib/kernel/test/file_name_SUITE.erl
index 0c8082026a..9354af2e41 100644
--- a/lib/kernel/test/file_name_SUITE.erl
+++ b/lib/kernel/test/file_name_SUITE.erl
@@ -1,5 +1,4 @@
 -module(file_name_SUITE).
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/kernel/test/gen_sctp_SUITE.erl b/lib/kernel/test/gen_sctp_SUITE.erl
index e89cb44797..881aaed429 100644
--- a/lib/kernel/test/gen_sctp_SUITE.erl
+++ b/lib/kernel/test/gen_sctp_SUITE.erl
@@ -1,4 +1,4 @@
-%% 
+%%
 %% %CopyrightBegin%
 %%
 %% Copyright Ericsson AB 2007-2013. All Rights Reserved.
@@ -35,8 +35,11 @@
     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]).
+    basic_stream/1, xfer_stream_min/1, active_n/1,
+    peeloff_active_once/1, peeloff_active_true/1, peeloff_active_n/1,
+    buffers/1,
+    names_unihoming_ipv4/1, names_unihoming_ipv6/1,
+    names_multihoming_ipv4/1, names_multihoming_ipv6/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
@@ -46,9 +49,11 @@ all() ->
      open_multihoming_ipv4_socket,
      open_unihoming_ipv6_socket,
      open_multihoming_ipv6_socket,
-     open_multihoming_ipv4_and_ipv6_socket,
+     open_multihoming_ipv4_and_ipv6_socket, active_n,
      basic_stream, xfer_stream_min, peeloff_active_once,
-     peeloff_active_true, buffers].
+     peeloff_active_true, peeloff_active_n, buffers,
+     names_unihoming_ipv4, names_unihoming_ipv6,
+     names_multihoming_ipv4, names_multihoming_ipv6].
 
 groups() -> 
     [].
@@ -107,7 +112,7 @@ xfer_min(Config) when is_list(Config) ->
     ?line {ok,Sb} = gen_sctp:open([{type,seqpacket}]),
     ?line {ok,Pb} = inet:port(Sb),
     ?line ok = gen_sctp:listen(Sb, true),
-    
+
     ?line {ok,Sa} = gen_sctp:open(),
     ?line {ok,Pa} = inet:port(Sa),
     ?line {ok,#sctp_assoc_change{state=comm_up,
@@ -118,18 +123,18 @@ xfer_min(Config) when is_list(Config) ->
 	gen_sctp:connect(Sa, Loopback, Pb, []),
     ?line {SbAssocId,SaOutboundStreams,SaInboundStreams} =
 	case recv_event(log_ok(gen_sctp:recv(Sb, infinity))) of
-	      {Loopback,Pa,
-	       #sctp_assoc_change{state=comm_up,
-				  error=0,
-				  outbound_streams=SbOutboundStreams,
-				  inbound_streams=SbInboundStreams,
-				  assoc_id=AssocId}} ->
-		  {AssocId,SbInboundStreams,SbOutboundStreams};
-	      {Loopback,Pa,
-	       #sctp_paddr_change{state=addr_confirmed,
-				  addr={Loopback,Pa},
-				  error=0,
-				  assoc_id=AssocId}} ->
+	    {Loopback,Pa,
+	     #sctp_assoc_change{state=comm_up,
+				error=0,
+				outbound_streams=SbOutboundStreams,
+				inbound_streams=SbInboundStreams,
+				assoc_id=AssocId}} ->
+		{AssocId,SbInboundStreams,SbOutboundStreams};
+	    {Loopback,Pa,
+	     #sctp_paddr_change{state=addr_confirmed,
+				addr={Loopback,Pa},
+				error=0,
+				assoc_id=AssocId}} ->
 		{Loopback,Pa,
 		 #sctp_assoc_change{state=comm_up,
 				    error=0,
@@ -148,17 +153,20 @@ xfer_min(Config) when is_list(Config) ->
 				 assoc_id=SbAssocId}],
 	       Data} -> ok;
 	      Event1 ->
-		  {Loopback,Pa,
-		   #sctp_paddr_change{addr = {Loopback,_},
-				      state = addr_available,
-				      error = 0,
-				      assoc_id = SbAssocId}} =
-		      recv_event(Event1),
-		  {ok,{Loopback,
-		       Pa,
-		       [#sctp_sndrcvinfo{stream=Stream,
-					 assoc_id=SbAssocId}],
-		       Data}} =	gen_sctp:recv(Sb, infinity)
+		  case recv_event(Event1) of
+		      {Loopback,Pa,
+		       #sctp_paddr_change{addr = {Loopback,_},
+					  state = State,
+					  error = 0,
+					  assoc_id = SbAssocId}}
+			when State =:= addr_available;
+			     State =:= addr_confirmed ->
+			  {Loopback,
+			   Pa,
+			   [#sctp_sndrcvinfo{stream=Stream,
+					     assoc_id=SbAssocId}],
+			   Data} = log_ok(gen_sctp:recv(Sb, infinity))
+		  end
 	  end,
     ?line ok = gen_sctp:send(Sb, SbAssocId, 0, Data),
     ?line case log_ok(gen_sctp:recv(Sa, infinity)) of
@@ -197,7 +205,7 @@ xfer_min(Config) when is_list(Config) ->
 	recv_event(log_ok(gen_sctp:recv(Sb, infinity))),
     ?line ok = gen_sctp:close(Sa),
     ?line ok = gen_sctp:close(Sb),
-    
+
     ?line receive
 	      Msg -> test_server:fail({received,Msg})
 	  after 17 -> ok
@@ -216,7 +224,7 @@ xfer_active(Config) when is_list(Config) ->
     ?line {ok,Sb} = gen_sctp:open([{active,true}]),
     ?line {ok,Pb} = inet:port(Sb),
     ?line ok = gen_sctp:listen(Sb, true),
-    
+
     ?line {ok,Sa} = gen_sctp:open([{active,true}]),
     ?line {ok,Pa} = inet:port(Sa),
     ?line ok = gen_sctp:connect_init(Sa, Loopback, Pb, []),
@@ -348,7 +356,7 @@ def_sndrcvinfo(Config) when is_list(Config) ->
     %%
     ?line S1 =
 	log_ok(gen_sctp:open(
-	     0, [{sctp_default_send_param,#sctp_sndrcvinfo{ppid=17}}])),
+		 0, [{sctp_default_send_param,#sctp_sndrcvinfo{ppid=17}}])),
     ?LOGVAR(S1),
     ?line P1 =
 	log_ok(inet:port(S1)),
@@ -455,18 +463,22 @@ def_sndrcvinfo(Config) when is_list(Config) ->
 		   stream=1, ppid=0, context=0, assoc_id=S1AssocId}],
 	       <<"3: ",Data/binary>>} -> ok;
 	      Event2 ->
-		  {Loopback,P2,
-		   #sctp_paddr_change{
-			      addr={Loopback,_}, state=addr_available,
-			      error=0, assoc_id=S1AssocId}} =
-		      recv_event(Event2),
-		  ?line case log_ok(gen_sctp:recv(S1)) of
-			    {Loopback,P2,
-			     [#sctp_sndrcvinfo{
-				 stream=1, ppid=0, context=0,
-				 assoc_id=S1AssocId}],
-			     <<"3: ",Data/binary>>} -> ok
-			end
+		  case recv_event(Event2) of
+		      {Loopback,P2,
+		       #sctp_paddr_change{
+				  addr={Loopback,_},
+				  state=State,
+				  error=0, assoc_id=S1AssocId}}
+			when State =:= addr_available;
+			     State =:= addr_confirmed ->
+			  ?line case log_ok(gen_sctp:recv(S1)) of
+				    {Loopback,P2,
+				     [#sctp_sndrcvinfo{
+					 stream=1, ppid=0, context=0,
+					 assoc_id=S1AssocId}],
+				     <<"3: ",Data/binary>>} -> ok
+				end
+		  end
 	  end,
     ?line ok =
 	do_from_other_process(
@@ -509,6 +521,13 @@ log_ok(X) -> log(ok(X)).
 
 ok({ok,X}) -> X.
 
+err([], Result) ->
+    erlang:error(Result);
+err([Reason|_], {error,Reason}) ->
+    ok;
+err([_|Reasons], Result) ->
+    err(Reasons, Result).
+
 log(X) ->
     io:format("LOG[~w]: ~p~n", [self(),X]),
     X.
@@ -529,57 +548,57 @@ api_open_close(Config) when is_list(Config) ->
     ?line {ok,S1} = gen_sctp:open(0),
     ?line {ok,P}  = inet:port(S1),
     ?line ok      = gen_sctp:close(S1),
-    
+
     ?line {ok,S2} = gen_sctp:open(P),
     ?line {ok,P}  = inet:port(S2),
     ?line ok      = gen_sctp:close(S2),
-    
+
     ?line {ok,S3} = gen_sctp:open([{port,P}]),
     ?line {ok,P}  = inet:port(S3),
     ?line ok      = gen_sctp:close(S3),
-    
+
     ?line {ok,S4} = gen_sctp:open(P, []),
     ?line {ok,P}  = inet:port(S4),
     ?line ok      = gen_sctp:close(S4),
-    
+
     ?line {ok,S5} = gen_sctp:open(P, [{ifaddr,any}]),
     ?line {ok,P}  = inet:port(S5),
     ?line ok      = gen_sctp:close(S5),
 
     ?line ok      = gen_sctp:close(S5),
-    
+
     ?line try gen_sctp:close(0)
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open({})
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open(-1)
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open(65536)
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open(make_ref(), [])
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open(0, {})
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open(0, [make_ref()])
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open([{invalid_option,0}])
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line try gen_sctp:open(0, [{mode,invalid_mode}])
 	  catch error:badarg -> ok
 	  end,
@@ -591,11 +610,11 @@ api_listen(suite) ->
     [];
 api_listen(Config) when is_list(Config) ->
     ?line Localhost = {127,0,0,1},
-    
+
     ?line try gen_sctp:listen(0, true)
 	  catch error:badarg -> ok
 	  end,
-    
+
     ?line {ok,S} = gen_sctp:open(),
     ?line {ok,Pb} = inet:port(S),
     ?line try gen_sctp:listen(S, not_allowed_for_listen)
@@ -603,7 +622,7 @@ api_listen(Config) when is_list(Config) ->
 	  end,
     ?line ok = gen_sctp:close(S),
     ?line {error,closed} = gen_sctp:listen(S, true),
-    
+
     ?line {ok,Sb} = gen_sctp:open(Pb),
     ?line {ok,Sa} = gen_sctp:open(),
     ?line case gen_sctp:connect(Sa, localhost, Pb, []) of
@@ -615,8 +634,8 @@ api_listen(Config) when is_list(Config) ->
 		      gen_sctp:recv(Sa, infinity);
 	      {error,#sctp_assoc_change{state=cant_assoc}} ->
 		  ok%;
-	      %% {error,{Localhost,Pb,_,#sctp_assoc_change{state=cant_assoc}}} ->
-	      %% 	  ok
+		  %% {error,{Localhost,Pb,_,#sctp_assoc_change{state=cant_assoc}}} ->
+		  %% 	  ok
 	  end,
     ?line ok = gen_sctp:listen(Sb, true),
     ?line {ok,#sctp_assoc_change{state=comm_up,
@@ -767,6 +786,106 @@ implicit_inet6(S1, Addr) ->
 	  end,
     ?line ok = gen_sctp:close(S2).
 
+active_n(doc) ->
+    "Verify {active,N} socket management";
+active_n(suite) ->
+    [];
+active_n(Config) when is_list(Config) ->
+    N = 3,
+    S1 = ok(gen_sctp:open([{active,N}])),
+    [{active,N}] = ok(inet:getopts(S1, [active])),
+    ok = inet:setopts(S1, [{active,-N}]),
+    receive
+        {sctp_passive, S1} -> ok
+    after
+        5000 ->
+            exit({error,sctp_passive_failure})
+    end,
+    [{active,false}] = ok(inet:getopts(S1, [active])),
+    ok = inet:setopts(S1, [{active,0}]),
+    receive
+        {sctp_passive, S1} -> ok
+    after
+        5000 ->
+            exit({error,sctp_passive_failure})
+    end,
+    ok = inet:setopts(S1, [{active,32767}]),
+    {error,einval} = inet:setopts(S1, [{active,1}]),
+    {error,einval} = inet:setopts(S1, [{active,-32769}]),
+    ok = inet:setopts(S1, [{active,-32768}]),
+    receive
+        {sctp_passive, S1} -> ok
+    after
+        5000 ->
+            exit({error,sctp_passive_failure})
+    end,
+    [{active,false}] = ok(inet:getopts(S1, [active])),
+    ok = inet:setopts(S1, [{active,N}]),
+    ok = inet:setopts(S1, [{active,true}]),
+    [{active,true}] = ok(inet:getopts(S1, [active])),
+    receive
+        _ -> exit({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    ok = inet:setopts(S1, [{active,N}]),
+    ok = inet:setopts(S1, [{active,once}]),
+    [{active,once}] = ok(inet:getopts(S1, [active])),
+    receive
+        _ -> exit({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    {error,einval} = inet:setopts(S1, [{active,32768}]),
+    ok = inet:setopts(S1, [{active,false}]),
+    [{active,false}] = ok(inet:getopts(S1, [active])),
+    ok = gen_sctp:listen(S1, true),
+    S1Port = ok(inet:port(S1)),
+    S2 = ok(gen_sctp:open(0, [{active,false}])),
+    Assoc = ok(gen_sctp:connect(S2, "localhost", S1Port, [])),
+    ok = inet:setopts(S1, [{active,N}]),
+    [{active,N}] = ok(inet:getopts(S1, [active])),
+    LoopFun = fun(Count, Count, _Fn) ->
+		      receive
+			  {sctp_passive,S1} ->
+			      ok
+		      after
+			  5000 ->
+			      exit({error,timeout})
+		      end;
+		 (I, Count, Fn) ->
+		      Msg = list_to_binary("message "++integer_to_list(I)),
+		      ok = gen_sctp:send(S2, Assoc, 0, Msg),
+		      receive
+			  {sctp,S1,_,_,{[SR],Msg}} when is_record(SR, sctp_sndrcvinfo) ->
+			      Fn(I+1, Count, Fn);
+			  {sctp,S1,_,_,_} ->
+			      %% ignore non-data messages
+			      ok = inet:setopts(S1, [{active,1}]),
+			      Fn(I, Count, Fn);
+			  Other ->
+			      exit({unexpected, Other})
+		      after
+			  5000 ->
+			      exit({error,timeout})
+		      end
+	      end,
+    ok = LoopFun(1, N, LoopFun),
+    S3 = ok(gen_sctp:open([{active,0}])),
+    receive
+        {sctp_passive,S3} ->
+            [{active,false}] = ok(inet:getopts(S3, [active]))
+    after
+        5000 ->
+            exit({error,udp_passive})
+    end,
+    ok = gen_sctp:close(S3),
+    ok = gen_sctp:close(S2),
+    ok = gen_sctp:close(S1),
+    ok.
+
 basic_stream(doc) ->
     "Hello world stream socket";
 basic_stream(suite) ->
@@ -840,23 +959,36 @@ xfer_stream_min(Config) when is_list(Config) ->
     ?line SbOutboundStreams = SaInboundStreams,
     ?line ?LOGVAR(SbOutboundStreams),
     ?line ok = gen_sctp:send(Sa, SaAssocId, 0, Data),
-    ?line case gen_sctp:recv(Sb, infinity) of
-	      {ok,{Loopback,
+    ?line case log_ok(gen_sctp:recv(Sb, infinity)) of
+	      {Loopback,
+	       Pa,
+	       [#sctp_sndrcvinfo{stream=Stream,
+				 assoc_id=SbAssocId}],
+	       Data} -> ok;
+	      {Loopback,
+	       Pa,[],
+	       #sctp_paddr_change{addr = {Loopback,_},
+				  state = addr_available,
+				  error = 0,
+				  assoc_id = SbAssocId}} ->
+		  {Loopback,
 		   Pa,
 		   [#sctp_sndrcvinfo{stream=Stream,
 				     assoc_id=SbAssocId}],
-		   Data}} -> ok;
-	      {ok,{Loopback,
-		   Pa,[],
-		   #sctp_paddr_change{addr = {Loopback,_},
-				      state = addr_available,
-				      error = 0,
-				      assoc_id = SbAssocId}}} ->
-		  {ok,{Loopback,
-		       Pa,
-		       [#sctp_sndrcvinfo{stream=Stream,
-					 assoc_id=SbAssocId}],
-		       Data}} =	gen_sctp:recv(Sb, infinity)
+		   Data} = log_ok(gen_sctp:recv(Sb, infinity));
+	      {Loopback,
+	       Pa,
+	       [#sctp_sndrcvinfo{stream=Stream,
+				 assoc_id=SbAssocId}],
+	       #sctp_paddr_change{addr = {Loopback,_},
+				  state = addr_confirmed,
+				  error = 0,
+				  assoc_id = SbAssocId}} ->
+		  {Loopback,
+		   Pa,
+		   [#sctp_sndrcvinfo{stream=Stream,
+				     assoc_id=SbAssocId}],
+		   Data} = log_ok(gen_sctp:recv(Sb, infinity))
 	  end,
     ?line ok =
 	do_from_other_process(
@@ -941,6 +1073,14 @@ peeloff_active_true(suite) ->
 peeloff_active_true(Config) ->
     peeloff(Config, [{active,true}]).
 
+peeloff_active_n(doc) ->
+    "Peel off an SCTP stream socket ({active,N})";
+peeloff_active_n(suite) ->
+    [];
+
+peeloff_active_n(Config) ->
+    peeloff(Config, [{active,1}]).
+
 peeloff(Config, SockOpts) when is_list(Config) ->
     ?line Addr = {127,0,0,1},
     ?line Stream = 0,
@@ -972,10 +1112,10 @@ peeloff(Config, SockOpts) when is_list(Config) ->
     ?line ?LOGVAR(S2Ai),
     ?line S1Ai =
 	receive
-	      {S1,{Addr,P2,
-		   #sctp_assoc_change{
-			  state=comm_up,
-			  assoc_id=AssocId1}}} -> AssocId1
+	    {S1,{Addr,P2,
+		 #sctp_assoc_change{
+			state=comm_up,
+			assoc_id=AssocId1}}} -> AssocId1
 	after Timeout ->
 		socket_bailout([S1,S2])
 	end,
@@ -1003,8 +1143,8 @@ peeloff(Config, SockOpts) when is_list(Config) ->
     ?line P3 = case P3_X of 0 -> P1; _ -> P3_X end,
     ?line [{_,#sctp_paddrinfo{assoc_id=S3Ai,state=active}}] =
 	socket_call(S3,
-	    {getopts,[{sctp_get_peer_addr_info,
-		       #sctp_paddrinfo{address={Addr,P2}}}]}),
+		    {getopts,[{sctp_get_peer_addr_info,
+			       #sctp_paddrinfo{address={Addr,P2}}}]}),
     %%?line S3Ai = S1Ai,
     ?line ?LOGVAR(S3Ai),
     %%
@@ -1087,9 +1227,9 @@ buffers(Config) when is_list(Config) ->
     %%
     ?line socket_call(S1, {setopts,[{recbuf,Limit}]}),
     ?line Recbuf =
-	    case socket_call(S1, {getopts,[recbuf]}) of
-		[{recbuf,RB1}] when RB1 >= Limit -> RB1
-	    end,
+	case socket_call(S1, {getopts,[recbuf]}) of
+	    [{recbuf,RB1}] when RB1 >= Limit -> RB1
+	end,
     ?line Data = mk_data(Recbuf+Limit),
     ?line socket_call(S2, {setopts,[{sndbuf,Recbuf+Limit}]}),
     ?line socket_call(S2, {send,S2Ai,Stream,Data}),
@@ -1190,6 +1330,93 @@ open_multihoming_ipv4_and_ipv6_socket(Config) when is_list(Config) ->
 		  {skip, Reason}
 	  end.
 
+names_unihoming_ipv4(doc) ->
+    "Test inet:socknames/peernames on unihoming IPv4 sockets";
+names_unihoming_ipv4(suite) ->
+    [];
+names_unihoming_ipv4(Config) when is_list(Config) ->
+    ?line do_names(Config, inet, 1).
+
+names_unihoming_ipv6(doc) ->
+    "Test inet:socknames/peernames on unihoming IPv6 sockets";
+names_unihoming_ipv6(suite) ->
+    [];
+names_unihoming_ipv6(Config) when is_list(Config) ->
+    ?line do_names(Config, inet6, 1).
+
+names_multihoming_ipv4(doc) ->
+    "Test inet:socknames/peernames on multihoming IPv4 sockets";
+names_multihoming_ipv4(suite) ->
+    [];
+names_multihoming_ipv4(Config) when is_list(Config) ->
+    ?line do_names(Config, inet, 2).
+
+names_multihoming_ipv6(doc) ->
+    "Test inet:socknames/peernames on multihoming IPv6 sockets";
+names_multihoming_ipv6(suite) ->
+    [];
+names_multihoming_ipv6(Config) when is_list(Config) ->
+    ?line do_names(Config, inet6, 2).
+
+
+
+do_names(_, FamilySpec, AddressCount) ->
+    Fun =
+	fun (ServerSocket, _, ServerAssoc, ClientSocket, _, ClientAssoc) ->
+		?line ServerSocknamesNoassoc =
+		    lists:sort(ok(inet:socknames(ServerSocket))),
+		?line ?LOGVAR(ServerSocknamesNoassoc),
+		?line ServerSocknames =
+		    lists:sort(ok(inet:socknames(ServerSocket, ServerAssoc))),
+		?line ?LOGVAR(ServerSocknames),
+		?line [_|_] =
+		    ordsets:intersection
+		      (ServerSocknamesNoassoc, ServerSocknames),
+		?line ClientSocknamesNoassoc =
+		    lists:sort(ok(inet:socknames(ClientSocket))),
+		?line ?LOGVAR(ClientSocknamesNoassoc),
+		?line ClientSocknames =
+		    lists:sort(ok(inet:socknames(ClientSocket, ClientAssoc))),
+		?line ?LOGVAR(ClientSocknames),
+		?line [_|_] =
+		    ordsets:intersection
+		      (ClientSocknamesNoassoc, ClientSocknames),
+		?line err([einval,enotconn], inet:peernames(ServerSocket)),
+		?line ServerPeernames =
+		    lists:sort(ok(inet:peernames(ServerSocket, ServerAssoc))),
+		?line ?LOGVAR(ServerPeernames),
+		?line err([einval,enotconn], inet:peernames(ClientSocket)),
+		?line ClientPeernames =
+		    lists:sort(ok(inet:peernames(ClientSocket, ClientAssoc))),
+		?line ?LOGVAR(ClientPeernames),
+		?line ServerSocknames = ClientPeernames,
+		?line ClientSocknames = ServerPeernames,
+		?line {ok,Socket} =
+		    gen_sctp:peeloff(ServerSocket, ServerAssoc),
+		?line SocknamesNoassoc =
+		    lists:sort(ok(inet:socknames(Socket))),
+		?line ?LOGVAR(SocknamesNoassoc),
+		?line Socknames =
+		    lists:sort(ok(inet:socknames(Socket, ServerAssoc))),
+		?line ?LOGVAR(Socknames),
+		?line true =
+		    ordsets:is_subset(SocknamesNoassoc, Socknames),
+		?line Peernames =
+		    lists:sort(ok(inet:peernames(Socket, ServerAssoc))),
+		?line ?LOGVAR(Peernames),
+		?line ok = gen_sctp:close(Socket),
+		?line Socknames = ClientPeernames,
+		?line ClientSocknames = Peernames,
+		ok
+	end,
+    ?line case get_addrs_by_family(FamilySpec, AddressCount) of
+	      {ok, Addresses} when length(Addresses) =:= AddressCount ->
+		  ?line do_open_and_connect(Addresses, hd(Addresses), Fun);
+	      {error, Reason} ->
+		  {skip, Reason}
+	  end.
+
+
 
 get_addrs_by_family(Family, NumAddrs) ->
     case os:type() of
@@ -1274,6 +1501,10 @@ f(F, A) ->
     lists:flatten(io_lib:format(F, A)).
 
 do_open_and_connect(ServerAddresses, AddressToConnectTo) ->
+    ?line Fun = fun (_, _, _, _, _, _) -> ok end,
+    ?line do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun).
+%%
+do_open_and_connect(ServerAddresses, AddressToConnectTo, Fun) ->
     ?line ServerFamily = get_family_by_addrs(ServerAddresses),
     ?line io:format("Serving ~p addresses: ~p~n",
 		    [ServerFamily, ServerAddresses]),
@@ -1284,14 +1515,26 @@ do_open_and_connect(ServerAddresses, AddressToConnectTo) ->
     ?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])),
+    ?line ClientOpts =
+	[ClientFamily |
+	 case ClientFamily of
+	     inet6 ->
+		 [{ipv6_v6only,true}];
+	     _ ->
+		 []
+	 end],
+    ?line S2 = ok(gen_sctp:open(0, ClientOpts)),
+    log(open),
     %% Verify client can connect
-    ?line #sctp_assoc_change{state=comm_up} =
+    ?line #sctp_assoc_change{state=comm_up} = S2Assoc =
 	ok(gen_sctp:connect(S2, AddressToConnectTo, P1, [])),
+    log(comm_up),
     %% verify server side also receives comm_up from client
-    ?line recv_comm_up_eventually(S1),
+    ?line S1Assoc = recv_comm_up_eventually(S1),
+    ?line Result = Fun(S1, ServerFamily, S1Assoc, S2, ClientFamily, S2Assoc),
     ?line ok = gen_sctp:close(S2),
-    ?line ok = gen_sctp:close(S1).
+    ?line ok = gen_sctp:close(S1),
+    Result.
 
 %% If at least one of the addresses is an ipv6 address, return inet6, else inet.
 get_family_by_addrs(Addresses) ->
@@ -1306,9 +1549,11 @@ 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} ->
+	      {_Addr, _Port, _Info,
+	       #sctp_assoc_change{state=comm_up} = Assoc} ->
+		  Assoc;
+	      {_Addr, _Port, _Info, _OtherSctpMsg} = Msg ->
+		  ?line log({unexpected,Msg}),
 		  ?line recv_comm_up_eventually(S)
 	  end.
 
@@ -1367,10 +1612,10 @@ socket_bailout([]) ->
 
 socket_history({State,Flush}) ->
     {lists:keysort(
-      2,
-      lists:flatten(
-	[[{Key,Val} || Val <- Vals]
-	 || {Key,Vals} <- gb_trees:to_list(State)])),
+       2,
+       lists:flatten(
+	 [[{Key,Val} || Val <- Vals]
+	  || {Key,Vals} <- gb_trees:to_list(State)])),
      Flush}.
 
 s_handler(Socket) ->
@@ -1453,7 +1698,7 @@ s_loop(Socket, Timeout, Parent, Handler, State) ->
 		     #sctp_assoc_change{
 			    state=comm_up,
 			    inbound_streams=Is}}}|_]
-		 when 0 =< Stream, Stream < Is-> ok;
+		  when 0 =< Stream, Stream < Is-> ok;
 		[] -> ok
 	    end,
 	    Key = {msg,AssocId,Stream},
@@ -1473,7 +1718,7 @@ s_loop(Socket, Timeout, Parent, Handler, State) ->
 	    case {gb_get(Key, State),St} of
 		{[],_} -> ok;
 		{[{_,{Addr,Port,#sctp_assoc_change{state=comm_up}}}|_],_}
-		when St =:= comm_lost; St =:= shutdown_comp -> ok
+		  when St =:= comm_lost; St =:= shutdown_comp -> ok
 	    end,
 	    NewState = gb_push(Key, Val, State),
 	    Parent ! {self(),{Addr,Port,SAC}},
@@ -1489,8 +1734,9 @@ s_loop(Socket, Timeout, Parent, Handler, State) ->
 		[] -> ok
 	    end,
 	    case {gb_get({assoc_change,AssocId}, State),St} of
-		{[{_,{Addr,Port,#sctp_assoc_change{state=comm_up}}}|_],
-		 addr_available} -> ok;
+		{[{_,{Addr,Port,#sctp_assoc_change{state=comm_up}}}|_],_}
+		  when St =:= addr_available;
+		       St =:= addr_confirmed -> ok;
 		{[],addr_confirmed} -> ok
 	    end,
 	    Key = {paddr_change,AssocId},
@@ -1519,7 +1765,13 @@ s_loop(Socket, Timeout, Parent, Handler, State) ->
     end.
 
 again(Socket) ->
-    inet:setopts(Socket, [{active,once}]).
+    receive
+	{sctp_passive,Socket} ->
+	    [{active, false}] = ok(inet:getopts(Socket, [active])),
+	    ok = inet:setopts(Socket,[{active,1}])
+    after 0 ->
+	    ok = inet:setopts(Socket, [{active,once}])
+    end.
 
 gb_push(Key, Val, GBT) ->
     case gb_trees:lookup(Key, GBT) of
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index ee271fbdfa..ee8bfcceb1 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_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, 
 	 controlling_process/1, controlling_process_self/1,
-	 no_accept/1, close_with_pending_output/1,
+	 no_accept/1, close_with_pending_output/1, active_n/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,
@@ -70,7 +70,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [controlling_process, controlling_process_self, no_accept,
      close_with_pending_output, data_before_close,
-     iter_max_socks, passive_sockets,
+     iter_max_socks, passive_sockets, active_n,
      accept_closed_by_other_process, otp_3924, closed_socket,
      shutdown_active, shutdown_passive, shutdown_pending,
      default_options, http_bad_packet, busy_send,
@@ -407,6 +407,114 @@ send_loop(Sock, Data, Left) ->
     ok = gen_tcp:send(Sock, Data),
     send_loop(Sock, Data, Left-1).
 
+%% Test {active,N} option
+active_n(doc) ->
+    ["Verify operation of the {active,N} option."];
+active_n(suite) -> [];
+active_n(Config) when is_list(Config) ->
+    N = 3,
+    LS = ok(gen_tcp:listen(0, [{active,N}])),
+    [{active,N}] = ok(inet:getopts(LS, [active])),
+    ok = inet:setopts(LS, [{active,-N}]),
+    receive
+        {tcp_passive, LS} -> ok
+    after
+        5000 ->
+            exit({error,tcp_passive_failure})
+    end,
+    [{active,false}] = ok(inet:getopts(LS, [active])),
+    ok = inet:setopts(LS, [{active,0}]),
+    receive
+        {tcp_passive, LS} -> ok
+    after
+        5000 ->
+            exit({error,tcp_passive_failure})
+    end,
+    ok = inet:setopts(LS, [{active,32767}]),
+    {error,einval} = inet:setopts(LS, [{active,1}]),
+    {error,einval} = inet:setopts(LS, [{active,-32769}]),
+    ok = inet:setopts(LS, [{active,-32768}]),
+    receive
+        {tcp_passive, LS} -> ok
+    after
+        5000 ->
+            exit({error,tcp_passive_failure})
+    end,
+    [{active,false}] = ok(inet:getopts(LS, [active])),
+    ok = inet:setopts(LS, [{active,N}]),
+    ok = inet:setopts(LS, [{active,true}]),
+    [{active,true}] = ok(inet:getopts(LS, [active])),
+    receive
+        _ -> exit({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    ok = inet:setopts(LS, [{active,N}]),
+    ok = inet:setopts(LS, [{active,once}]),
+    [{active,once}] = ok(inet:getopts(LS, [active])),
+    receive
+        _ -> exit({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    {error,einval} = inet:setopts(LS, [{active,32768}]),
+    ok = inet:setopts(LS, [{active,false}]),
+    [{active,false}] = ok(inet:getopts(LS, [active])),
+    Port = ok(inet:port(LS)),
+    C = ok(gen_tcp:connect("localhost", Port, [{active,N}])),
+    [{active,N}] = ok(inet:getopts(C, [active])),
+    S = ok(gen_tcp:accept(LS)),
+    ok = inet:setopts(S, [{active,N}]),
+    [{active,N}] = ok(inet:getopts(S, [active])),
+    repeat(3,
+           fun(I) ->
+                   Msg = "message "++integer_to_list(I),
+                   ok = gen_tcp:send(C, Msg),
+                   receive
+                       {tcp,S,Msg} ->
+                           ok = gen_tcp:send(S, Msg)
+                   after
+                       5000 ->
+                           exit({error,timeout})
+                   end,
+                   receive
+                       {tcp,C,Msg} ->
+                           ok
+                   after
+                       5000 ->
+                           exit({error,timeout})
+                   end
+           end),
+    receive
+        {tcp_passive,S} ->
+            [{active,false}] = ok(inet:getopts(S, [active]))
+    after
+        5000 ->
+            exit({error,tcp_passive})
+    end,
+    receive
+        {tcp_passive,C} ->
+            [{active,false}] = ok(inet:getopts(C, [active]))
+    after
+        5000 ->
+            exit({error,tcp_passive})
+    end,
+    LS2 = ok(gen_tcp:listen(0, [{active,0}])),
+    receive
+        {tcp_passive,LS2} ->
+            [{active,false}] = ok(inet:getopts(LS2, [active]))
+    after
+        5000 ->
+            exit({error,tcp_passive})
+    end,
+    ok = gen_tcp:close(LS2),
+    ok = gen_tcp:close(C),
+    ok = gen_tcp:close(S),
+    ok = gen_tcp:close(LS),
+    ok.
+
 -define(OTP_3924_MAX_DELAY, 100).
 %% Taken out of the blue, but on intra host connections
 %% I expect propagation of a close to be quite fast
@@ -2659,3 +2767,5 @@ oct_aloop(S,X,Times) ->
 	    gen_tcp:close(S),
 	    closed
     end.
+
+ok({ok,V}) -> V.
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index cd768813cf..6bb41999c5 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The 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 +33,7 @@
 	 init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
--export([send_to_closed/1, 
+-export([send_to_closed/1, active_n/1,
 	 buffer_size/1, binary_passive_recv/1, bad_address/1,
 	 read_packets/1, open_fd/1, connect/1, implicit_inet6/1]).
 
@@ -43,7 +42,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() -> 
     [send_to_closed, buffer_size, binary_passive_recv,
      bad_address, read_packets, open_fd, connect,
-     implicit_inet6].
+     implicit_inet6, active_n].
 
 groups() -> 
     [].
@@ -466,6 +465,108 @@ open_fd(Config) when is_list(Config) ->
 	    ?t:fail(io_lib:format("~w", [flush()]))
     end.
 
+active_n(Config) when is_list(Config) ->
+    N = 3,
+    S1 = ok(gen_udp:open(0, [{active,N}])),
+    [{active,N}] = ok(inet:getopts(S1, [active])),
+    ok = inet:setopts(S1, [{active,-N}]),
+    receive
+        {udp_passive, S1} -> ok
+    after
+        5000 ->
+            exit({error,udp_passive_failure})
+    end,
+    [{active,false}] = ok(inet:getopts(S1, [active])),
+    ok = inet:setopts(S1, [{active,0}]),
+    receive
+        {udp_passive, S1} -> ok
+    after
+        5000 ->
+            exit({error,udp_passive_failure})
+    end,
+    ok = inet:setopts(S1, [{active,32767}]),
+    {error,einval} = inet:setopts(S1, [{active,1}]),
+    {error,einval} = inet:setopts(S1, [{active,-32769}]),
+    ok = inet:setopts(S1, [{active,-32768}]),
+    receive
+        {udp_passive, S1} -> ok
+    after
+        5000 ->
+            exit({error,udp_passive_failure})
+    end,
+    [{active,false}] = ok(inet:getopts(S1, [active])),
+    ok = inet:setopts(S1, [{active,N}]),
+    ok = inet:setopts(S1, [{active,true}]),
+    [{active,true}] = ok(inet:getopts(S1, [active])),
+    receive
+        _ -> exit({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    ok = inet:setopts(S1, [{active,N}]),
+    ok = inet:setopts(S1, [{active,once}]),
+    [{active,once}] = ok(inet:getopts(S1, [active])),
+    receive
+        _ -> exit({error,active_n})
+    after
+        0 ->
+            ok
+    end,
+    {error,einval} = inet:setopts(S1, [{active,32768}]),
+    ok = inet:setopts(S1, [{active,false}]),
+    [{active,false}] = ok(inet:getopts(S1, [active])),
+    S1Port = ok(inet:port(S1)),
+    S2 = ok(gen_udp:open(0, [{active,N}])),
+    S2Port = ok(inet:port(S2)),
+    [{active,N}] = ok(inet:getopts(S2, [active])),
+    ok = inet:setopts(S1, [{active,N}]),
+    [{active,N}] = ok(inet:getopts(S1, [active])),
+    lists:foreach(
+      fun(I) ->
+              Msg = "message "++integer_to_list(I),
+              ok = gen_udp:send(S2, "localhost", S1Port, Msg),
+              receive
+                  {udp,S1,_,S2Port,Msg} ->
+                      ok = gen_udp:send(S1, "localhost", S2Port, Msg)
+              after
+                  5000 ->
+                      exit({error,timeout})
+              end,
+              receive
+                  {udp,S2,_,S1Port,Msg} ->
+                      ok
+              after
+                  5000 ->
+                      exit({error,timeout})
+              end
+      end, lists:seq(1,N)),
+    receive
+        {udp_passive,S1} ->
+            [{active,false}] = ok(inet:getopts(S1, [active]))
+    after
+        5000 ->
+            exit({error,udp_passive})
+    end,
+    receive
+        {udp_passive,S2} ->
+            [{active,false}] = ok(inet:getopts(S2, [active]))
+    after
+        5000 ->
+            exit({error,udp_passive})
+    end,
+    S3 = ok(gen_udp:open(0, [{active,0}])),
+    receive
+        {udp_passive,S3} ->
+            [{active,false}] = ok(inet:getopts(S3, [active]))
+    after
+        5000 ->
+            exit({error,udp_passive})
+    end,
+    ok = gen_udp:close(S3),
+    ok = gen_udp:close(S2),
+    ok = gen_udp:close(S1),
+    ok.
 
 %
 % Utils
diff --git a/lib/kernel/test/global_SUITE_data/global_trace.erl b/lib/kernel/test/global_SUITE_data/global_trace.erl
index 00bacf8f54..1396d86c79 100644
--- a/lib/kernel/test/global_SUITE_data/global_trace.erl
+++ b/lib/kernel/test/global_SUITE_data/global_trace.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
diff --git a/lib/kernel/test/inet_SUITE.erl b/lib/kernel/test/inet_SUITE.erl
index 62ba95e1a3..ed43749cc0 100644
--- a/lib/kernel/test/inet_SUITE.erl
+++ b/lib/kernel/test/inet_SUITE.erl
@@ -38,10 +38,10 @@
 	 gethostnative_debug_level/0, gethostnative_debug_level/1,
 	 getif/1,
 	 getif_ifr_name_overflow/1,getservbyname_overflow/1, getifaddrs/1,
-	 parse_strict_address/1]).
+	 parse_strict_address/1, simple_netns/1]).
 
 -export([get_hosts/1, get_ipv6_hosts/1, parse_hosts/1, parse_address/1,
-	 kill_gethost/0, parallell_gethost/0]).
+	 kill_gethost/0, parallell_gethost/0, test_netns/0]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
@@ -53,7 +53,7 @@ all() ->
      t_gethostnative, gethostnative_parallell, cname_loop,
      gethostnative_debug_level, gethostnative_soft_restart,
      getif, getif_ifr_name_overflow, getservbyname_overflow,
-     getifaddrs, parse_strict_address].
+     getifaddrs, parse_strict_address, simple_netns].
 
 groups() -> 
     [{parse, [], [parse_hosts, parse_address]}].
@@ -226,7 +226,7 @@ t_gethostbyname_v6(Config) when is_list(Config) ->
 			     h_addr_list = [IP4]} = HEnt4,
 		    {ok,IP46} =
 			inet_parse:ipv6_address(
-			  "::ffff:" ++ inet_parse:ntoa(IP4)),
+			  "::ffff:" ++ inet:ntoa(IP4)),
 		    check_elems(
 		      [{HEnt#hostent.h_name,[Name,FullName]}])
 	    end,
@@ -246,7 +246,7 @@ t_gethostbyname_v6(Config) when is_list(Config) ->
 			     h_addr_list = [IP4F]} = HEnt4F,
 		    {ok,IP46F} =
 			inet_parse:ipv6_address(
-			  "::ffff:" ++ inet_parse:ntoa(IP4F)),
+			  "::ffff:" ++ inet:ntoa(IP4F)),
 		    check_elems(
 		      [{HEntF#hostent.h_name,[Name,FullName]}])
 	    end;
@@ -1099,3 +1099,96 @@ toupper([C|Cs]) when is_integer(C) ->
     end;
 toupper([]) ->
     [].
+
+
+simple_netns(Config) when is_list(Config) ->
+    {ok,U} = gen_udp:open(0),
+    case inet:setopts(U, [{netns,""}]) of
+	ok ->
+	    jog_netns_opt(U),
+	    ok = gen_udp:close(U),
+	    %%
+	    {ok,L} = gen_tcp:listen(0, []),
+	    jog_netns_opt(L),
+	    ok = gen_tcp:close(L),
+	    %%
+	    {ok,S} = gen_sctp:open(),
+	    jog_netns_opt(S),
+	    ok = gen_sctp:close(S);
+	{error,einval} ->
+	    {skip,"setns() not supported"}
+    end.
+
+jog_netns_opt(S) ->
+    %% This is just jogging the option mechanics
+    ok = inet:setopts(S, [{netns,""}]),
+    {ok,[{netns,""}]} = inet:getopts(S, [netns]),
+    ok = inet:setopts(S, [{netns,"/proc/self/ns/net"}]),
+    {ok,[{netns,"/proc/self/ns/net"}]} = inet:getopts(S, [netns]),
+    ok.
+
+
+%% Manual test to be run outside test_server in an emulator
+%% started by root, in a machine with setns() support...
+test_netns() ->
+    DefaultIF = v1,
+    DefaultIP = {192,168,1,17},
+    Namespace = "test",
+    NamespaceIF = v2,
+    NamespaceIP = {192,168,1,18},
+    %%
+    DefaultIPString = inet_parse:ntoa(DefaultIP),
+    NamespaceIPString = inet_parse:ntoa(NamespaceIP),
+    cmd("ip netns add ~s",
+	[Namespace]),
+    cmd("ip link add name ~w type veth peer name ~w netns ~s",
+        [DefaultIF,NamespaceIF,Namespace]),
+    cmd("ip netns exec ~s ip addr add ~s/30 dev ~w",
+	[Namespace,NamespaceIPString,NamespaceIF]),
+    cmd("ip netns exec ~s ip link set ~w up",
+	[Namespace,NamespaceIF]),
+    cmd("ip addr add ~s/30 dev ~w",
+	[DefaultIPString,DefaultIF]),
+    cmd("ip link set ~w up",
+	[DefaultIF]),
+    try test_netns(
+	  {DefaultIF,DefaultIP},
+	  filename:join("/var/run/netns/", Namespace),
+	  {NamespaceIF,NamespaceIP}) of
+	Result ->
+	    io:put_chars(["#### Test done",io_lib:nl()]),
+	    Result
+    after
+	cmd("ip link delete ~w type veth",
+	    [DefaultIF]),
+	cmd("ip netns delete ~s",
+	    [Namespace])
+    end.
+
+test_netns({DefaultIF,DefaultIP}, Namespace, {NamespaceIF,NamespaceIP}) ->
+    {ok,ListenSocket} = gen_tcp:listen(0, [{active,false}]),
+    {ok,[{addr,DefaultIP}]} = inet:ifget(ListenSocket, DefaultIF, [addr]),
+    {ok,ListenPort} = inet:port(ListenSocket),
+    {ok,ConnectSocket} =
+	gen_tcp:connect(
+	  DefaultIP, ListenPort, [{active,false},{netns,Namespace}], 3000),
+    {ok,[{addr,NamespaceIP}]} = inet:ifget(ConnectSocket, NamespaceIF, [addr]),
+    {ok,ConnectPort} = inet:port(ConnectSocket),
+    {ok,AcceptSocket} = gen_tcp:accept(ListenSocket, 0),
+    {ok,AcceptPort} = inet:port(AcceptSocket),
+    {ok,{NamespaceIP,ConnectPort}} = inet:peername(AcceptSocket),
+    {ok,{DefaultIP,AcceptPort}} = inet:peername(ConnectSocket),
+    ok = gen_tcp:send(ConnectSocket, "data"),
+    ok = gen_tcp:close(ConnectSocket),
+    {ok,"data"} = gen_tcp:recv(AcceptSocket, 4, 1000),
+    {error,closed} = gen_tcp:recv(AcceptSocket, 1, 1000),
+    ok = gen_tcp:close(AcceptSocket),
+    ok = gen_tcp:close(ListenSocket).
+
+cmd(Cmd, Args) ->
+    cmd(io_lib:format(Cmd, Args)).
+%%
+cmd(CmdString) ->
+    io:put_chars(["# ",CmdString,io_lib:nl()]),
+    io:put_chars([os:cmd(CmdString++" ; echo '  =>' $?")]),
+    ok.
diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index d7d9434b1f..a375adceea 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -22,7 +22,7 @@
 	 init_per_group/2,end_per_group/2, 
 	 get_columns_and_rows/1, exit_initial/1, job_control_local/1, 
 	 job_control_remote/1,
-	 job_control_remote_noshell/1]).
+	 job_control_remote_noshell/1,ctrl_keys/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
 %% For spawn
@@ -41,7 +41,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [get_columns_and_rows, exit_initial, job_control_local,
-     job_control_remote, job_control_remote_noshell].
+     job_control_remote, job_control_remote_noshell,
+     ctrl_keys].
 
 groups() -> 
     [].
@@ -289,7 +290,51 @@ job_control_remote_noshell(Config) when is_list(Config) ->
 	    ?line stop_noshell_node(NSNode),
 	    ?line Res
     end.
-	    
+
+ctrl_keys(suite) -> [];
+ctrl_keys(doc) -> ["Tests various control keys"];
+ctrl_keys(_Conf) when is_list(_Conf) ->
+    Cu=[$\^u],
+    Cw=[$\^w],
+    Home=[27,$O,$H],
+    End=[27,$O,$F],
+    rtnode([{putline,""},
+	    {putline,"2."},
+	    {getline,"2"},
+	    {putline,"\"hello "++Cw++"world\"."},	% test <CTRL>+W
+	    {getline,"\"world\""},
+	    {putline,"\"hello "++Cu++"\"world\"."},	% test <CTRL>+U
+	    {getline,"\"world\""},
+	    {putline,"world\"."++Home++"\"hello "},	% test <HOME>
+	    {getline,"\"hello world\""},
+	    {putline,"world"++Home++"\"hello "++End++"\"."},	% test <END>
+	    {getline,"\"hello world\""}]
+	    ++wordLeft()++wordRight(),[]).
+
+
+wordLeft() ->
+    L1=[27,27,$[,$D],
+    L2=[27]++"[5D",
+    L3=[27]++"[1;5D",
+    wordLeft(L1)++wordLeft(L2)++wordLeft(L3).
+
+wordLeft(Chars) ->
+    End=[27,$O,$F],
+    [{putline,"\"world\""++Chars++"hello "++End++"."},
+     {getline,"\"hello world\""}].
+
+wordRight() ->
+    R1=[27,27,$[,$C],
+    R2=[27]++"[5C",
+    R3=[27]++"[1;5C",
+    wordRight(R1)++wordRight(R2)++wordRight(R3).
+
+wordRight(Chars) ->
+    Home=[27,$O,$H],
+    [{putline,"world"++Home++"\"hello "++Chars++"\"."},
+     {getline,"\"hello world\""}].
+
+
 rtnode(C,N) ->
     rtnode(C,N,[]).
 rtnode(Commands,Nodename,ErlPrefix) ->
diff --git a/lib/kernel/test/kernel_SUITE.erl b/lib/kernel/test/kernel_SUITE.erl
index 0f29d895e5..78f5e93fc3 100644
--- a/lib/kernel/test/kernel_SUITE.erl
+++ b/lib/kernel/test/kernel_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
 %%
 %% The 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,9 +23,6 @@
 -include_lib("test_server/include/test_server.hrl").
 
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
-
 % Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
@@ -59,11 +56,8 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+end_per_testcase(_Case, _Config) ->
     ok.
 
 %
@@ -78,56 +72,80 @@ app_test(Config) when is_list(Config) ->
     ok.
 
 
-%% Test that appup allows upgrade from/downgrade to a maximum of two
-%% major releases back.
+%% Test that appup allows upgrade from/downgrade to a maximum of one
+%% major release back.
 appup_test(_Config) ->
-    application:load(kernel),
-    {_,_,Vsn} = lists:keyfind(kernel,1,application:loaded_applications()),
-    AppupFile = filename:join([code:lib_dir(kernel),ebin,"kernel.appup"]),
+    appup_tests(kernel,create_test_vsns(kernel)).
+
+appup_tests(_App,{[],[]}) ->
+    {skip,"no previous releases available"};
+appup_tests(App,{OkVsns,NokVsns}) ->
+    application:load(App),
+    {_,_,Vsn} = lists:keyfind(App,1,application:loaded_applications()),
+    AppupFileName = atom_to_list(App) ++ ".appup",
+    AppupFile = filename:join([code:lib_dir(App),ebin,AppupFileName]),
     {ok,[{Vsn,UpFrom,DownTo}=AppupScript]} = file:consult(AppupFile),
     ct:log("~p~n",[AppupScript]),
-    {OkVsns,NokVsns} = create_test_vsns(Vsn),
+    ct:log("Testing ok versions: ~p~n",[OkVsns]),
     check_appup(OkVsns,UpFrom,{ok,[restart_new_emulator]}),
     check_appup(OkVsns,DownTo,{ok,[restart_new_emulator]}),
+    ct:log("Testing not ok versions: ~p~n",[NokVsns]),
     check_appup(NokVsns,UpFrom,error),
     check_appup(NokVsns,DownTo,error),
     ok.
 
-create_test_vsns(Current) ->
-    [XStr,YStr|Rest] = string:tokens(Current,"."),
-    X = list_to_integer(XStr),
-    Y = list_to_integer(YStr),
-    SecondMajor = vsn(X,Y-2),
-    SecondMinor = SecondMajor ++ ".1.3",
-    FirstMajor = vsn(X,Y-1),
-    FirstMinor = FirstMajor ++ ".57",
-    ThisMajor = vsn(X,Y),
-    This =
-	case Rest of
-	    [] ->
-		[];
-	    ["1"] ->
-		[ThisMajor];
-	    _ ->
-		ThisMinor = ThisMajor ++ ".1",
-		[ThisMajor,ThisMinor]
+create_test_vsns(App) ->
+    This = erlang:system_info(otp_release),
+    FirstMajor = previous_major(This),
+    SecondMajor = previous_major(FirstMajor),
+    Ok = app_vsn(App,[FirstMajor]),
+    Nok0 = app_vsn(App,[SecondMajor]),
+    Nok = case Ok of
+	       [Ok1|_] ->
+		   [Ok1 ++ ",1" | Nok0]; % illegal
+	       _ ->
+		   Nok0
+	   end,
+    {Ok,Nok}.
+
+previous_major("17") ->
+    "r16";
+previous_major("r"++Rel) ->
+    "r"++previous_major(Rel);
+previous_major(Rel) ->
+    integer_to_list(list_to_integer(Rel)-1).
+
+app_vsn(App,[R|Rs]) ->
+    OldRel =
+	case test_server:is_release_available(R) of
+	    true ->
+		{release,R};
+	    false ->
+		case ct:get_config({otp_releases,list_to_atom(R)}) of
+		    undefined ->
+			false;
+		    Prog0 ->
+			case os:find_executable(Prog0) of
+			    false ->
+				false;
+			    Prog ->
+				{prog,Prog}
+			end
+		end
 	end,
-    OkVsns = This ++ [FirstMajor, FirstMinor, SecondMajor, SecondMinor],
-
-    ThirdMajor = vsn(X,Y-3),
-    ThirdMinor = ThirdMajor ++ ".10.12",
-    Illegal = ThisMajor ++ ",1",
-    Newer1Major = vsn(X,Y+1),
-    Newer1Minor = Newer1Major ++ ".1",
-    Newer2Major = ThisMajor ++ "1",
-    NokVsns = [ThirdMajor,ThirdMinor,
-	       Illegal,
-	       Newer1Major,Newer1Minor,
-	       Newer2Major],
-    {OkVsns,NokVsns}.
-
-vsn(X,Y) ->
-    integer_to_list(X) ++ "." ++ integer_to_list(Y).
+    case OldRel of
+	false ->
+	    app_vsn(App,Rs);
+	_ ->
+	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[OldRel]}]),
+	    _ = rpc:call(N,application,load,[App]),
+	    As = rpc:call(N,application,loaded_applications,[]),
+	    {_,_,V} = lists:keyfind(App,1,As),
+	    test_server:stop_node(N),
+	    [V|app_vsn(App,Rs)]
+    end;
+app_vsn(_App,[]) ->
+    [].
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
     case systools_relup:appup_search_for_version(Vsn, Instrs) of
diff --git a/lib/kernel/test/kernel_smoke.spec b/lib/kernel/test/kernel_smoke.spec
new file mode 100644
index 0000000000..e5d8273c56
--- /dev/null
+++ b/lib/kernel/test/kernel_smoke.spec
@@ -0,0 +1,9 @@
+{config, "../test_server/ts.config"}.
+{config, "../test_server/ts.unix.config"}.
+
+{cases,"../kernel_test", inet_SUITE,[t_gethostbyaddr,t_gethostbyname,
+	t_gethostbyaddr_v6,t_gethostbyname_v6,t_gethostnative,getifaddrs]}.
+{cases,"../kernel_test", inet_res_SUITE,[gethostbyaddr,gethostbyname,
+	gethostbyaddr_v6,gethostbyname_v6,basic]}.
+{cases,"../kernel_test", gen_tcp_echo_SUITE,[active_echo]}.
+{cases,"../kernel_test", heart_SUITE,[reboot]}.
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 73ed704ae3..9b474c4cdf 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -20,7 +20,7 @@
 
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1,
 	 init_per_group/2,end_per_group/2]).
--export([space_in_cwd/1, quoting/1, space_in_name/1, bad_command/1,
+-export([space_in_cwd/1, quoting/1, cmd_unicode/1, space_in_name/1, bad_command/1,
 	 find_executable/1, unix_comment_in_command/1, deep_list_command/1, evil/1]).
 
 -include_lib("test_server/include/test_server.hrl").
@@ -28,9 +28,8 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
-    [space_in_cwd, quoting, space_in_name, bad_command,
-     find_executable, unix_comment_in_command, deep_list_command,
-     evil].
+    [space_in_cwd, quoting, cmd_unicode, space_in_name, bad_command,
+     find_executable, unix_comment_in_command, deep_list_command, evil].
 
 groups() ->
     [].
@@ -95,6 +94,21 @@ quoting(Config) when is_list(Config) ->
     ?line [] = receive_all(),
     ok.
 
+
+cmd_unicode(doc) -> "Test that unicode arguments work.";
+cmd_unicode(suite) -> [];
+cmd_unicode(Config) when is_list(Config) ->
+    ?line DataDir = ?config(data_dir, Config),
+    ?line Echo = filename:join(DataDir, "my_echo"),
+
+    ?line comp("one", os:cmd(Echo ++ " one")),
+    ?line comp("one::two", os:cmd(Echo ++ " one two")),
+    ?line comp("åäö::ϼΩ", os:cmd(Echo ++ " åäö " ++ [1020, 937])),
+    ?t:sleep(5),
+    ?line [] = receive_all(),
+    ok.
+
+
 space_in_name(doc) ->
     "Test that program with a space in its name can be executed.";
 space_in_name(suite) -> [];
@@ -302,8 +316,8 @@ comp(Expected, Got) ->
 	Expected ->
 	    ok;
 	Other ->
-	    ok = io:format("Expected: ~s\n", [Expected]),
-	    ok = io:format("Got:      ~s\n", [Other]),
+	    ok = io:format("Expected: ~ts\n", [Expected]),
+	    ok = io:format("Got:      ~ts\n", [Other]),
 	    test_server:fail()
     end.
 
diff --git a/lib/kernel/test/os_SUITE_data/my_echo.c b/lib/kernel/test/os_SUITE_data/my_echo.c
index 2127511dd1..712c828bb5 100644
--- a/lib/kernel/test/os_SUITE_data/my_echo.c
+++ b/lib/kernel/test/os_SUITE_data/my_echo.c
@@ -1,3 +1,30 @@
+#ifdef __WIN32__
+#include <windows.h>
+
+int wmain(int argc, wchar_t **argv)
+{
+    char* sep = "";
+    int len;
+
+    /*
+     * Echo all arguments separated with '::', so that we can check that
+     * quotes are interpreted correctly.
+     */
+
+    while (argc-- > 1) {
+	char *utf8;
+	len = WideCharToMultiByte(CP_UTF8, 0, argv[1], -1, NULL, 0, NULL, NULL);
+	utf8 = malloc(len*sizeof(char));
+	WideCharToMultiByte(CP_UTF8, 0, argv++[1], -1, utf8, len, NULL, NULL);
+	printf("%s%s", sep, utf8);
+	free(utf8);
+	sep = "::";
+    }
+    putchar('\n');
+    return 0;
+}
+#else
+
 #include <stdio.h>
 
 int
@@ -17,3 +44,4 @@ main(int argc, char** argv)
     putchar('\n');
     return 0;
 }
+#endif
diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl
index 5c4437d4d3..615251a257 100644
--- a/lib/kernel/test/ram_file_SUITE.erl
+++ b/lib/kernel/test/ram_file_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
 %%
 %% The 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/kernel/test/sendfile_SUITE.erl b/lib/kernel/test/sendfile_SUITE.erl
index 4cf4c6489d..2c741232c4 100644
--- a/lib/kernel/test/sendfile_SUITE.erl
+++ b/lib/kernel/test/sendfile_SUITE.erl
@@ -24,7 +24,14 @@
 
 -compile(export_all).
 
-all() ->
+all() -> [{group,async_threads},
+	  {group,no_async_threads}].
+
+groups() ->
+    [{async_threads,[],tcs()},
+     {no_async_threads,[],tcs()}].
+
+tcs() ->
     [t_sendfile_small
      ,t_sendfile_big_all
      ,t_sendfile_big_size
@@ -33,6 +40,7 @@ all() ->
      ,t_sendfile_offset
      ,t_sendfile_sendafter
      ,t_sendfile_recvafter
+     ,t_sendfile_recvafter_remoteclose
      ,t_sendfile_sendduring
      ,t_sendfile_recvduring
      ,t_sendfile_closeduring
@@ -63,6 +71,14 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     file:delete(proplists:get_value(big_file, Config)).
 
+init_per_group(async_threads,Config) ->
+    [{sendfile_opts,[{use_threads,true}]}|Config];
+init_per_group(no_async_threads,Config) ->
+    [{sendfile_opts,[{use_threads,false}]}|Config].
+
+end_per_group(_,_Config) ->
+    ok.
+
 init_per_testcase(TC,Config) when TC == t_sendfile_recvduring;
 				  TC == t_sendfile_sendduring ->
     Filename = proplists:get_value(small_file, Config),
@@ -71,7 +87,7 @@ init_per_testcase(TC,Config) when TC == t_sendfile_recvduring;
 		   {_Size, Data} = sendfile_file_info(Filename),
 		   {ok,D} = file:open(Filename, [raw,binary,read]),
 		   prim_file:sendfile(D, Sock, 0, 0, 0,
-				      [],[],false,false,false),
+				      [],[],[]),
 		   Data
 	   end,
 
@@ -92,6 +108,7 @@ t_sendfile_small(Config) when is_list(Config) ->
 
     Send = fun(Sock) ->
 		   {Size, Data} = sendfile_file_info(Filename),
+		   %% Here we make sure to test the sendfile/2 api
 		   {ok, Size} = file:sendfile(Filename, Sock),
 		   Data
 	   end,
@@ -101,6 +118,7 @@ t_sendfile_small(Config) when is_list(Config) ->
 t_sendfile_many_small(Config) when is_list(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     error_logger:add_report_handler(?MODULE,[self()]),
 
@@ -109,7 +127,7 @@ t_sendfile_many_small(Config) when is_list(Config) ->
 		   N = 10000,
 		   {ok,D} = file:open(Filename,[read|FileOpts]),
 		   [begin
-			{ok,Size} = file:sendfile(D,Sock,0,0,[])
+			{ok,Size} = file:sendfile(D,Sock,0,0,SendfileOpts)
 		    end || _I <- lists:seq(1,N)],
 		   file:close(D),
 		   Size*N
@@ -127,11 +145,12 @@ t_sendfile_many_small(Config) when is_list(Config) ->
 
 t_sendfile_big_all(Config) when is_list(Config) ->
     Filename = proplists:get_value(big_file, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
 		       file:read_file_info(Filename),
-		   {ok, Size} = file:sendfile(Filename, Sock),
+		   {ok, Size} = sendfile(Filename, Sock, SendfileOpts),
 		   Size
 	   end,
 
@@ -140,12 +159,13 @@ t_sendfile_big_all(Config) when is_list(Config) ->
 t_sendfile_big_size(Config) ->
     Filename = proplists:get_value(big_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     SendAll = fun(Sock) ->
 		      {ok, #file_info{size = Size}} =
 			  file:read_file_info(Filename),
 		      {ok,D} = file:open(Filename,[read|FileOpts]),
-		      {ok, Size} = file:sendfile(D, Sock,0,Size,[]),
+		      {ok, Size} = file:sendfile(D, Sock,0,Size,SendfileOpts),
 		      Size
 	      end,
 
@@ -154,12 +174,13 @@ t_sendfile_big_size(Config) ->
 t_sendfile_partial(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     SendSingle = fun(Sock) ->
 			 {_Size, <<Data:5/binary,_/binary>>} =
 			     sendfile_file_info(Filename),
 			 {ok,D} = file:open(Filename,[read|FileOpts]),
-			 {ok,5} = file:sendfile(D,Sock,0,5,[]),
+			 {ok,5} = file:sendfile(D,Sock,0,5,SendfileOpts),
 			 file:close(D),
 			 Data
 		 end,
@@ -170,14 +191,14 @@ t_sendfile_partial(Config) ->
     {ok,D} = file:open(Filename,[read|FileOpts]),
     {ok, <<FData/binary>>} = file:read(D,5),
     FSend = fun(Sock) ->
-		    {ok,5} = file:sendfile(D,Sock,0,5,[]),
+		    {ok,5} = file:sendfile(D,Sock,0,5,SendfileOpts),
 		    FData
 	    end,
 
     ok = sendfile_send(FSend),
 
     SSend = fun(Sock) ->
-		    {ok,3} = file:sendfile(D,Sock,5,3,[]),
+		    {ok,3} = file:sendfile(D,Sock,5,3,SendfileOpts),
 		    SData
 	    end,
 
@@ -190,12 +211,13 @@ t_sendfile_partial(Config) ->
 t_sendfile_offset(Config) ->
     Filename = proplists:get_value(small_file, Config),
     FileOpts = proplists:get_value(file_opts, Config, []),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     Send = fun(Sock) ->
 		   {_Size, <<_:5/binary,Data:3/binary,_/binary>> = AllData} =
 		       sendfile_file_info(Filename),
 		   {ok,D} = file:open(Filename,[read|FileOpts]),
-		   {ok,3} = file:sendfile(D,Sock,5,3,[]),
+		   {ok,3} = file:sendfile(D,Sock,5,3,SendfileOpts),
 		   {ok, AllData} = file:read(D,100),
 		   file:close(D),
 		   Data
@@ -205,10 +227,11 @@ t_sendfile_offset(Config) ->
 
 t_sendfile_sendafter(Config) ->
     Filename = proplists:get_value(small_file, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     Send = fun(Sock) ->
 		   {Size, Data} = sendfile_file_info(Filename),
-		   {ok, Size} = file:sendfile(Filename, Sock),
+		   {ok, Size} = sendfile(Filename, Sock, SendfileOpts),
 		   ok = gen_tcp:send(Sock, <<2>>),
 		   <<Data/binary,2>>
 	   end,
@@ -217,10 +240,11 @@ t_sendfile_sendafter(Config) ->
 
 t_sendfile_recvafter(Config) ->
     Filename = proplists:get_value(small_file, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     Send = fun(Sock) ->
 		   {Size, Data} = sendfile_file_info(Filename),
-		   {ok, Size} = file:sendfile(Filename, Sock),
+		   {ok, Size} = sendfile(Filename, Sock, SendfileOpts),
 		   ok = gen_tcp:send(Sock, <<1>>),
 		   {ok,<<1>>} = gen_tcp:recv(Sock, 1),
 		   <<Data/binary,1>>
@@ -228,8 +252,28 @@ t_sendfile_recvafter(Config) ->
 
     ok = sendfile_send(Send).
 
+%% This tests specifically for a bug fixed in 17.0
+t_sendfile_recvafter_remoteclose(Config) ->
+    Filename = proplists:get_value(small_file, Config),
+
+    Send = fun(Sock, SFServer) ->
+		   {Size, _Data} = sendfile_file_info(Filename),
+		   {ok, Size} = file:sendfile(Filename, Sock),
+
+		   %% Make sure the remote end has been closed
+		   SFServer ! stop,
+		   timer:sleep(100),
+
+		   %% In the bug this returned {error,ebadf}
+		   {error,closed} = gen_tcp:recv(Sock, 1),
+		   -1
+	   end,
+
+    ok = sendfile_send({127,0,0,1},Send,0).
+
 t_sendfile_sendduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -238,7 +282,7 @@ t_sendfile_sendduring(Config) ->
 				      timer:sleep(50),
 				      ok = gen_tcp:send(Sock, <<2>>)
 			      end),
-		   {ok, Size} = file:sendfile(Filename, Sock),
+		   {ok, Size} = sendfile(Filename, Sock, SendfileOpts),
 		   Size+1
 	   end,
 
@@ -246,6 +290,7 @@ t_sendfile_sendduring(Config) ->
 
 t_sendfile_recvduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     Send = fun(Sock) ->
 		   {ok, #file_info{size = Size}} =
@@ -255,7 +300,7 @@ t_sendfile_recvduring(Config) ->
 				      ok = gen_tcp:send(Sock, <<1>>),
 				      {ok,<<1>>} = gen_tcp:recv(Sock, 1)
 			      end),
-		   {ok, Size} = file:sendfile(Filename, Sock),
+		   {ok, Size} = sendfile(Filename, Sock, SendfileOpts),
 		   timer:sleep(1000),
 		   Size+1
 	   end,
@@ -264,6 +309,7 @@ t_sendfile_recvduring(Config) ->
 
 t_sendfile_closeduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     Send = fun(Sock,SFServPid) ->
 		   spawn_link(fun() ->
@@ -272,13 +318,14 @@ t_sendfile_closeduring(Config) ->
 			      end),
 		   case erlang:system_info(thread_pool_size) of
 		       0 ->
-			   {error, closed} = file:sendfile(Filename, Sock);
+			   {error, closed} = sendfile(Filename, Sock,
+						      SendfileOpts);
 		       _Else ->
 			   %% This can return how much has been sent or
 			   %% {error,closed} depending on OS.
 			   %% How much is sent impossible to know as
 			   %%  the socket was closed mid sendfile
-			   case file:sendfile(Filename, Sock) of
+			   case sendfile(Filename, Sock, SendfileOpts) of
 			       {error, closed} ->
 				   ok;
 			       {ok, Size}  when is_integer(Size) ->
@@ -292,6 +339,7 @@ t_sendfile_closeduring(Config) ->
 
 t_sendfile_crashduring(Config) ->
     Filename = proplists:get_value(big_file, Config),
+    SendfileOpts = proplists:get_value(sendfile_opts, Config),
 
     error_logger:add_report_handler(?MODULE,[self()]),
 
@@ -300,7 +348,7 @@ t_sendfile_crashduring(Config) ->
 				      timer:sleep(50),
 				      exit(die)
 			      end),
-		   {error, closed} = file:sendfile(Filename, Sock),
+		   {error, closed} = sendfile(Filename, Sock, SendfileOpts),
 		   -1
 	   end,
     process_flag(trap_exit,true),
@@ -395,6 +443,16 @@ sendfile_file_info(File) ->
     {ok, Data} = file:read_file(File),
     {Size, Data}.
 
+sendfile(Filename,Sock,Opts) ->
+    case file:open(Filename, [read, raw, binary]) of
+	{error, Reason} ->
+	    {error, Reason};
+	{ok, Fd} ->
+	    Res = file:sendfile(Fd, Sock, 0, 0, Opts),
+	    _ = file:close(Fd),
+	    Res
+    end.
+
 
 %% Error handler 
 
diff --git a/lib/kernel/test/zlib_SUITE.erl b/lib/kernel/test/zlib_SUITE.erl
index bd237cb513..3be6f39d95 100644
--- a/lib/kernel/test/zlib_SUITE.erl
+++ b/lib/kernel/test/zlib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -178,7 +178,7 @@ api_deflateInit(Config) when is_list(Config) ->
 			  ?m(ok,zlib:close(Z))
 		  end, lists:seq(1,8)),
     
-    Strategies = [filtered,huffman_only,default],
+    Strategies = [filtered,huffman_only,rle,default],
     lists:foreach(fun(Strategy) ->
 			  ?line Z = zlib:open(),
 			  ?m(ok, zlib:deflateInit(Z,best_speed,deflated,-15,8,Strategy)),
@@ -220,7 +220,6 @@ api_deflateParams(Config) when is_list(Config) ->
     ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, none)),
     ?m(ok, zlib:deflateParams(Z1, best_compression, huffman_only)),
     ?m(_, zlib:deflate(Z1, <<1,1,1,1,1,1,1,1,1>>, sync)),
-    ?m({'EXIT',_}, zlib:deflateParams(Z1,best_speed, filtered)),
     ?m(ok, zlib:close(Z1)).
 
 api_deflate(doc) -> "Test deflate";
@@ -565,8 +564,8 @@ intro(Config) when is_list(Config) ->
 large_deflate(doc) -> "Test deflate large file, which had a bug reported on erlang-bugs";
 large_deflate(suite) -> [];
 large_deflate(Config) when is_list(Config) ->
-    large_deflate().
-large_deflate() ->
+    large_deflate_do().
+large_deflate_do() ->
     ?line Z = zlib:open(),
     ?line Plain = rand_bytes(zlib:getBufSize(Z)*5),
     ?line ok = zlib:deflateInit(Z),
@@ -899,7 +898,7 @@ worker(Seed, FnATpl, Parent) ->
     Parent ! self().
 
 worker_loop(0, _FnATpl) ->
-    large_deflate(), % the time consuming one as finale
+    large_deflate_do(), % the time consuming one as finale
     ok;
 worker_loop(N, FnATpl) ->
     {F,A} = element(random:uniform(size(FnATpl)),FnATpl),
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 96c1e3d83d..dd5316b825 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.16.3
+KERNEL_VSN = 3.0
diff --git a/lib/megaco/aclocal.m4 b/lib/megaco/aclocal.m4
index 25f40944e7..46b30a16b3 100644
--- a/lib/megaco/aclocal.m4
+++ b/lib/megaco/aclocal.m4
@@ -954,6 +954,40 @@ dnl
 AC_DEFUN(ERL_FIND_ETHR_LIB,
 [
 
+AC_ARG_ENABLE(native-ethr-impls,
+	      AS_HELP_STRING([--disable-native-ethr-impls],
+                             [disable native ethread implementations]),
+[ case "$enableval" in
+    no) disable_native_ethr_impls=yes ;;
+    *)  disable_native_ethr_impls=no ;;
+  esac ], disable_native_ethr_impls=no)
+
+test "X$disable_native_ethr_impls" = "Xyes" &&
+  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
+
+AC_ARG_ENABLE(x86-out-of-order,
+	      AS_HELP_STRING([--enable-x86-out-of-order],
+                             [enable x86/x84_64 out of order support (default disabled)]))
+
+AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
+	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
+			     [prefer gcc native ethread implementations]),
+[ case "$enableval" in
+    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
+    *)  enable_prefer_gcc_native_ethr_impls=no ;;
+  esac ], enable_prefer_gcc_native_ethr_impls=no)
+
+test $enable_prefer_gcc_native_ethr_impls = yes &&
+  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
+
+AC_ARG_WITH(libatomic_ops,
+	    AS_HELP_STRING([--with-libatomic_ops=PATH],
+			   [specify and prefer usage of libatomic_ops in the ethread library]))
+
+AC_ARG_WITH(with_sparc_memory_order,
+	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
+			   [specify sparc memory order (defaults to RMO)]))
+
 LM_CHECK_THR_LIB
 ERL_INTERNAL_LIBS
 
@@ -1003,40 +1037,44 @@ case "$THR_LIB_NAME" in
 
 	AC_DEFINE(ETHR_WIN32_THREADS, 1, [Define if you have win32 threads])
 
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
-
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    have_interlocked_op=no
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
+	fi
 	test "$ethr_have_native_atomics" = "yes" && ethr_have_native_spinlock=yes
 	;;
 
@@ -1303,93 +1341,98 @@ case "$THR_LIB_NAME" in
 	    int128="__int128_t"
 	fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+
+	    if test $int128 != no; then
+	        ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
+	    fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+	    AC_MSG_CHECKING([for a usable libatomic_ops implementation])
+	    case "x$with_libatomic_ops" in
+	        xno | xyes | x)
+	    	    libatomic_ops_include=
+	    	    ;;
+	        *)
+	    	    if test -d "${with_libatomic_ops}/include"; then
+	    	        libatomic_ops_include="-I$with_libatomic_ops/include"
+	    	        CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
+	    	    else
+	    	        AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
+	    	    fi;;
+	    esac
+	    ethr_have_libatomic_ops=no
+	    AC_TRY_LINK([#include "atomic_ops.h"],
+	    	        [
+	    	    	    volatile AO_t x;
+	    	    	    AO_t y;
+	    	    	    int z;
+
+	    	    	    AO_nop_full();
+	    	    	    AO_store(&x, (AO_t) 0);
+	    	    	    z = AO_load(&x);
+	    	    	    z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
+	    	        ],
+	    	        [ethr_have_native_atomics=yes
+	    	         ethr_have_libatomic_ops=yes])
+	    AC_MSG_RESULT([$ethr_have_libatomic_ops])
+	    if test $ethr_have_libatomic_ops = yes; then
+	        AC_CHECK_SIZEOF(AO_t, ,
+	    	    	        [
+	    	    	    	    #include <stdio.h>
+	    	    	    	    #include "atomic_ops.h"
+	    	    	        ])
+	        AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
+
+	        AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
+	        if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	    	    AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
+	        fi
+	        ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
+	    elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	        AC_MSG_ERROR([No usable libatomic_ops implementation found])
+	    fi
 
-	if test $int128 != no; then
-	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
-	fi
+	    case "$host_cpu" in
+	      sparc | sun4u | sparc64 | sun4v)
+	    	    case "$with_sparc_memory_order" in
+	    	        "TSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
+	    	        "PSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
+	    	        "RMO"|"")
+	    	    	    AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
+	    	        *)
+	    	    	    AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
+	    	    esac
+	    	    ethr_have_native_atomics=yes;; 
+	      i86pc | i*86 | x86_64 | amd64)
+	    	    if test "$enable_x86_out_of_order" = "yes"; then
+	    	    	    AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
+	    	    fi
+	    	    ethr_have_native_atomics=yes;;
+	      macppc | ppc | powerpc | "Power Macintosh")
+	    	    ethr_have_native_atomics=yes;;
+	      tile)
+	    	    ethr_have_native_atomics=yes;;
+	      *)
+	    	    ;;
+	    esac
 
-	AC_MSG_CHECKING([for a usable libatomic_ops implementation])
-	case "x$with_libatomic_ops" in
-	    xno | xyes | x)
-		libatomic_ops_include=
-		;;
-	    *)
-		if test -d "${with_libatomic_ops}/include"; then
-		    libatomic_ops_include="-I$with_libatomic_ops/include"
-		    CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
-		else
-		    AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
-		fi;;
-	esac
-	ethr_have_libatomic_ops=no
-	AC_TRY_LINK([#include "atomic_ops.h"],
-		    [
-			volatile AO_t x;
-			AO_t y;
-			int z;
-
-			AO_nop_full();
-			AO_store(&x, (AO_t) 0);
-			z = AO_load(&x);
-			z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
-		    ],
-		    [ethr_have_native_atomics=yes
-		     ethr_have_libatomic_ops=yes])
-	AC_MSG_RESULT([$ethr_have_libatomic_ops])
-	if test $ethr_have_libatomic_ops = yes; then
-	    AC_CHECK_SIZEOF(AO_t, ,
-			    [
-				#include <stdio.h>
-				#include "atomic_ops.h"
-			    ])
-	    AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
-
-	    AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
-	    if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-		AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
-	    fi
-	    ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
-	elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-	    AC_MSG_ERROR([No usable libatomic_ops implementation found])
 	fi
 
-	case "$host_cpu" in
-	  sparc | sun4u | sparc64 | sun4v)
-		case "$with_sparc_memory_order" in
-		    "TSO")
-			AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
-		    "PSO")
-			AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
-		    "RMO"|"")
-			AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
-		    *)
-			AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
-		esac
-		ethr_have_native_atomics=yes;; 
-	  i86pc | i*86 | x86_64 | amd64)
-		if test "$enable_x86_out_of_order" = "yes"; then
-			AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
-		fi
-		ethr_have_native_atomics=yes;;
-	  macppc | ppc | "Power Macintosh")
-		ethr_have_native_atomics=yes;;
-	  tile)
-		ethr_have_native_atomics=yes;;
-	  *)
-		;;
-	esac
-
 	test ethr_have_native_atomics = "yes" && ethr_have_native_spinlock=yes
 
 	dnl Restore LIBS
@@ -1451,40 +1494,6 @@ esac
 
 AC_C_DOUBLE_MIDDLE_ENDIAN
 
-AC_ARG_ENABLE(native-ethr-impls,
-	      AS_HELP_STRING([--disable-native-ethr-impls],
-                             [disable native ethread implementations]),
-[ case "$enableval" in
-    no) disable_native_ethr_impls=yes ;;
-    *)  disable_native_ethr_impls=no ;;
-  esac ], disable_native_ethr_impls=no)
-
-AC_ARG_ENABLE(x86-out-of-order,
-	      AS_HELP_STRING([--enable-x86-out-of-order],
-                             [enable x86/x84_64 out of order support (default disabled)]))
-
-test "X$disable_native_ethr_impls" = "Xyes" &&
-  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
-
-AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
-	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
-			     [prefer gcc native ethread implementations]),
-[ case "$enableval" in
-    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
-    *)  enable_prefer_gcc_native_ethr_impls=no ;;
-  esac ], enable_prefer_gcc_native_ethr_impls=no)
-
-test $enable_prefer_gcc_native_ethr_impls = yes &&
-  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
-
-AC_ARG_WITH(libatomic_ops,
-	    AS_HELP_STRING([--with-libatomic_ops=PATH],
-			   [specify and prefer usage of libatomic_ops in the ethread library]))
-
-AC_ARG_WITH(with_sparc_memory_order,
-	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
-			   [specify sparc memory order (defaults to RMO)]))
-
 ETHR_X86_SSE2_ASM=no
 case "$GCC-$ac_cv_sizeof_void_p-$host_cpu" in
   yes-4-i86pc | yes-4-i*86 | yes-4-x86_64 | yes-4-amd64)
diff --git a/lib/megaco/doc/src/book.xml b/lib/megaco/doc/src/book.xml
index c0ed250b7d..1a4f532a70 100644
--- a/lib/megaco/doc/src/book.xml
+++ b/lib/megaco/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/definitions/cite.defs.xml b/lib/megaco/doc/src/definitions/cite.defs.xml
index e54251fa24..8fb91e2b44 100644
--- a/lib/megaco/doc/src/definitions/cite.defs.xml
+++ b/lib/megaco/doc/src/definitions/cite.defs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE cites SYSTEM "cites.dtd">
 
 <cites>
diff --git a/lib/megaco/doc/src/definitions/term.defs b/lib/megaco/doc/src/definitions/term.defs
index 57379eaa5d..16212923ea 100644
--- a/lib/megaco/doc/src/definitions/term.defs
+++ b/lib/megaco/doc/src/definitions/term.defs
@@ -1,7 +1,6 @@
 [{"agent","agent","An entity that terminates a management protocol in the Network Element.","mbj"},
 {"API","API","Application Programming Interface. The interface towards an application. Usually this is a set of functions available, but can also be a set of messages sent to or from an application.","mbj"},
 {"application","application","A collection of resources which is required to offer a specific service.","mbj"},
-{"appmon","Application Monitor","A graphical node and application process tree viewer. See also appmon.","mbj"},
 {"Appmon","Appmon","Application name for the Application Monitor within Erlang/OTP. A graphical node and process viewer.","mbj"},
 {"app callback","application callback module","A module which is called when the application is started, and when it has stopped. Every application has one application callback module.","mbj"},
 {"AC","application controller","A process which coordinates all operations on applications.","mbj"},
@@ -136,7 +135,6 @@ the module Erlang in the application kernel","kenneth"},
 {"pattern matching","pattern matching","A basic mechanism in Erlang for assigning values to variables and for controlling the flow of a program.","kenneth"},
 {"permanent child","permanent child","A supervised process which always is restarted when it dies.","mbj"},
 {"Pid","Pid","Process Identifier. A data type in Erlang for storing process references. The process identity of the process displayed in the line.","kenneth"},
-{"Pman","Pman","Module and application name for the Process Trace Tool.","olin"},
 {"point","point","A unit used to indicate the size of a typeface. Equal to 1/72 inches.","jocke"},
 {"pointer","pointer","A pointer tells where data is stored. Memory pointers are not used in Erlang.","kent"},
 {"port","port","A data type in Erlang. Ports provide the basic mechanism for communication with the external world.","peterl"},
@@ -198,7 +196,6 @@ the module Erlang in the application kernel","kenneth"},
 {"Table Visualizer","Table Visualizer","A tool which enables the user to examine ETS and Mnesia tables.","olin"},
 {"temporary child","temporary child","A supervised process which is never restarted when it dies.","mbj"},
 {"term","term","The super type of all Erlang types.","kenneth"},
-{"Toolbar","Toolbar","A tool that provides an simplistic interface to the other various Erlang/OTP tools","olin"},
 {"tools","tools","An application within Erlang/OTP which contains the tools which are not applications themselves.","olin"},
 {"transaction","transaction","Transactions groups a set of database accesses into an atomic unit. All transactions has the ACID (atomicity, concistency, isolation and durability) properties.","hakan"},
 {"transient child","transient child","A supervised process which is restarted if it dies non-normally.","mbj"},
diff --git a/lib/megaco/doc/src/definitions/term.defs.xml b/lib/megaco/doc/src/definitions/term.defs.xml
index 1c80ee8d80..096720af84 100644
--- a/lib/megaco/doc/src/definitions/term.defs.xml
+++ b/lib/megaco/doc/src/definitions/term.defs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE terms SYSTEM "terms.dtd">
 
 <terms>
diff --git a/lib/megaco/doc/src/fascicules.xml b/lib/megaco/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/megaco/doc/src/fascicules.xml
+++ b/lib/megaco/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index 5dd622368c..dff1c3afc6 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_architecture.xml b/lib/megaco/doc/src/megaco_architecture.xml
index aeea17c5cf..6795cd17a1 100644
--- a/lib/megaco/doc/src/megaco_architecture.xml
+++ b/lib/megaco/doc/src/megaco_architecture.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_codec_meas.xml b/lib/megaco/doc/src/megaco_codec_meas.xml
index 68d0326239..c6d73fb518 100644
--- a/lib/megaco/doc/src/megaco_codec_meas.xml
+++ b/lib/megaco/doc/src/megaco_codec_meas.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_codec_mstone1.xml b/lib/megaco/doc/src/megaco_codec_mstone1.xml
index 5b0b410641..4c32d9f497 100644
--- a/lib/megaco/doc/src/megaco_codec_mstone1.xml
+++ b/lib/megaco/doc/src/megaco_codec_mstone1.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_codec_mstone2.xml b/lib/megaco/doc/src/megaco_codec_mstone2.xml
index 778e125a75..d86a540ec2 100644
--- a/lib/megaco/doc/src/megaco_codec_mstone2.xml
+++ b/lib/megaco/doc/src/megaco_codec_mstone2.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_codec_transform.xml b/lib/megaco/doc/src/megaco_codec_transform.xml
index 89ed3fd654..9257c3a80c 100644
--- a/lib/megaco/doc/src/megaco_codec_transform.xml
+++ b/lib/megaco/doc/src/megaco_codec_transform.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_debug.xml b/lib/megaco/doc/src/megaco_debug.xml
index 2523a3be86..5c0132b6ef 100644
--- a/lib/megaco/doc/src/megaco_debug.xml
+++ b/lib/megaco/doc/src/megaco_debug.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_edist_compress.xml b/lib/megaco/doc/src/megaco_edist_compress.xml
index 43e124ad3a..dca5046f6f 100644
--- a/lib/megaco/doc/src/megaco_edist_compress.xml
+++ b/lib/megaco/doc/src/megaco_edist_compress.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2009</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_encode.xml b/lib/megaco/doc/src/megaco_encode.xml
index 4b5adab262..2ceefed7e3 100644
--- a/lib/megaco/doc/src/megaco_encode.xml
+++ b/lib/megaco/doc/src/megaco_encode.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/megaco/doc/src/megaco_encoder.xml b/lib/megaco/doc/src/megaco_encoder.xml
index 07e5091f74..c7f7338204 100644
--- a/lib/megaco/doc/src/megaco_encoder.xml
+++ b/lib/megaco/doc/src/megaco_encoder.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_examples.xml b/lib/megaco/doc/src/megaco_examples.xml
index 8c85c1a0b4..2ab33795a8 100644
--- a/lib/megaco/doc/src/megaco_examples.xml
+++ b/lib/megaco/doc/src/megaco_examples.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_flex_scanner.xml b/lib/megaco/doc/src/megaco_flex_scanner.xml
index b79b6384df..7c32f1036b 100644
--- a/lib/megaco/doc/src/megaco_flex_scanner.xml
+++ b/lib/megaco/doc/src/megaco_flex_scanner.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_intro.xml b/lib/megaco/doc/src/megaco_intro.xml
index 507271bcd8..1399f28168 100644
--- a/lib/megaco/doc/src/megaco_intro.xml
+++ b/lib/megaco/doc/src/megaco_intro.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_mib.xml b/lib/megaco/doc/src/megaco_mib.xml
index f1abe08fb5..cdc8b2f491 100644
--- a/lib/megaco/doc/src/megaco_mib.xml
+++ b/lib/megaco/doc/src/megaco_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_performance.xml b/lib/megaco/doc/src/megaco_performance.xml
index eb3d852a19..18dbb84a68 100644
--- a/lib/megaco/doc/src/megaco_performance.xml
+++ b/lib/megaco/doc/src/megaco_performance.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_run.xml b/lib/megaco/doc/src/megaco_run.xml
index b723778890..5bec4d779e 100644
--- a/lib/megaco/doc/src/megaco_run.xml
+++ b/lib/megaco/doc/src/megaco_run.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_tcp.xml b/lib/megaco/doc/src/megaco_tcp.xml
index f4ccd97cee..7d487e0f91 100644
--- a/lib/megaco/doc/src/megaco_tcp.xml
+++ b/lib/megaco/doc/src/megaco_tcp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_transport.xml b/lib/megaco/doc/src/megaco_transport.xml
index 66ef85ff25..8c60b00569 100644
--- a/lib/megaco/doc/src/megaco_transport.xml
+++ b/lib/megaco/doc/src/megaco_transport.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_transport_mechanisms.xml b/lib/megaco/doc/src/megaco_transport_mechanisms.xml
index f384280561..c747732fe5 100644
--- a/lib/megaco/doc/src/megaco_transport_mechanisms.xml
+++ b/lib/megaco/doc/src/megaco_transport_mechanisms.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_udp.xml b/lib/megaco/doc/src/megaco_udp.xml
index ed554659b7..4352cc0430 100644
--- a/lib/megaco/doc/src/megaco_udp.xml
+++ b/lib/megaco/doc/src/megaco_udp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/megaco_user.xml b/lib/megaco/doc/src/megaco_user.xml
index 7987ed3392..44246935bb 100644
--- a/lib/megaco/doc/src/megaco_user.xml
+++ b/lib/megaco/doc/src/megaco_user.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 25edf8bb7d..f71166b1b1 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2013</year>
+      <year>2000</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,14 +13,14 @@
       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>Megaco Release Notes</title>
     <prepared>Lars Thors&eacute;n, H&aring;kan Mattsson, Micael Karlberg</prepared>
     <docno></docno>
@@ -29,12 +29,41 @@
     <file>notes.xml</file>
   </header>
   <p>This document describes the changes made to the Megaco system
-    from version to version. The intention of this document is to
-    list all incompatibilities as well as all enhancements and
-    bugfixes for every release of Megaco. Each release of Megaco
-    thus constitutes one section in this document. The title of each
-    section is the version number of Megaco.</p>
+  from version to version. The intention of this document is to
+  list all incompatibilities as well as all enhancements and
+  bugfixes for every release of Megaco. Each release of Megaco
+  thus constitutes one section in this document. The title of each
+  section is the version number of Megaco.</p>
+  
+  
+  <section><title>Megaco 3.17.0.3</title>
 
+    <section><title>Improvements and New Features</title>
+    <list>
+      <item>
+	<p>Updated doc files to utf8.</p>
+	<p>Own Id: OTP-10907</p>
+      </item>
+    </list>
+    </section>
+  
+  </section>
+
+  <section><title>Megaco 3.17.0.2</title>
+
+    <section><title>Improvements and New Features</title>
+    <list>
+      <item>
+	<p>
+	  Introduced functionality for inspection of system and
+	build configuration.</p>
+	<p>
+	Own Id: OTP-11196</p>
+      </item>
+    </list>
+    </section>
+  
+  </section>
 
   <section><title>Megaco 3.17.0.1</title>
 
diff --git a/lib/megaco/doc/src/notes_history.xml b/lib/megaco/doc/src/notes_history.xml
index 220ed4bbb1..48ffd7d97a 100644
--- a/lib/megaco/doc/src/notes_history.xml
+++ b/lib/megaco/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2010</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/part.xml b/lib/megaco/doc/src/part.xml
index a43720178d..ed7368468e 100644
--- a/lib/megaco/doc/src/part.xml
+++ b/lib/megaco/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/part_notes.xml b/lib/megaco/doc/src/part_notes.xml
index dfc01b54f6..6783dd8616 100644
--- a/lib/megaco/doc/src/part_notes.xml
+++ b/lib/megaco/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/part_notes_history.xml b/lib/megaco/doc/src/part_notes_history.xml
index 5186ea0fc1..e5b64c7cd3 100644
--- a/lib/megaco/doc/src/part_notes_history.xml
+++ b/lib/megaco/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/doc/src/ref_man.xml b/lib/megaco/doc/src/ref_man.xml
index b2bb1c046e..b7dbf66344 100644
--- a/lib/megaco/doc/src/ref_man.xml
+++ b/lib/megaco/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2009</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index b3659366a4..db59f55b55 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -165,11 +165,23 @@
 %%      |          |           |         |         |
 %%      v          v           v         v         v
 %%    3.17  <-  3.16.1  <-  3.15.2 <- 3.14.2 <- 3.11.4
+%%      | 
+%%      v 
+%%   3.17.0.1
+%%      | 
+%%      v 
+%%   3.17.0.2
+%%      | 
+%%      v 
+%%   3.17.0.3  
 %%
 %%
 
 {"%VSN%",
  [
+  {"3.17.0.2", []},
+  {"3.17.0.1", []},
+  {"3.17", []}, 
   {"3.16.0.3", 
    [
     {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_17}, 
@@ -178,6 +190,9 @@
   }
  ],
  [
+  {"3.17.0.2", []},
+  {"3.17.0.1", []},
+  {"3.17", []}, 
   {"3.16.0.3", 
    [
     {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_17}, 
diff --git a/lib/megaco/src/binary/depend.mk b/lib/megaco/src/binary/depend.mk
index b9b86d3183..4225bc69dc 100644
--- a/lib/megaco/src/binary/depend.mk
+++ b/lib/megaco/src/binary/depend.mk
@@ -28,7 +28,7 @@
 # This means that the ASN.1 runtime library will be inlined.
 #
 
-ASN1_CT_OPTS += +noobj
+ASN1_CT_OPTS += +noobj +legacy_erlang_types
 ifeq ($(MEGACO_INLINE_ASN1_RT),true)
 # We need atleast version 1.4.6 of the ANS.1 application
 ASN1_CT_OPTS += +inline
diff --git a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
index 8a4f4e7509..7d82262a59 100644
--- a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
+++ b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl
@@ -66,7 +66,7 @@ version_of(_EC, Binary, 3, [AsnModV1, AsnModV2, AsnModV3])
 version_of([], _Binary, Err) ->
     {error, {decode_failed, lists:reverse(Err)}};
 version_of([AsnMod|AsnMods], Binary, Errs) when is_atom(AsnMod) ->
-    case (catch asn1rt:decode(AsnMod, 'MegacoMessage', Binary)) of
+    case (catch AsnMod:decode('MegacoMessage', Binary)) of
 	{ok, M} ->
 	    V = (M#'MegacoMessage'.mess)#'Message'.version,
 	    {ok, V};
@@ -82,14 +82,14 @@ version_of([AsnMod|AsnMods], Binary, Errs) when is_atom(AsnMod) ->
 
 encode_message([native], MegaMsg, AsnMod, _TransMod, binary) 
   when is_record(MegaMsg, 'MegacoMessage') ->
-    asn1rt:encode(AsnMod, 'MegacoMessage', MegaMsg);
+    AsnMod:encode('MegacoMessage', MegaMsg);
 encode_message(EC, MegaMsg, AsnMod, TransMod, binary) 
   when is_list(EC) andalso is_record(MegaMsg, 'MegacoMessage') ->
     case (catch TransMod:tr_message(MegaMsg, encode, EC)) of
 	{'EXIT', Reason} ->
 	    {error, Reason};
 	MegaMsg2 ->
-	    asn1rt:encode(AsnMod, 'MegacoMessage', MegaMsg2)
+	    AsnMod:encode('MegacoMessage', MegaMsg2)
     end;
 encode_message(EC, MegaMsg, AsnMod, TransMod, io_list) ->
     case encode_message(EC, MegaMsg, AsnMod, TransMod, binary) of
@@ -276,7 +276,7 @@ decode_message_dynamic(_EC, _BadBin, _Mods, _Type) ->
 
 
 decode_message(EC, Bin, AsnMod, TransMod, _) ->
-    case asn1rt:decode(AsnMod, 'MegacoMessage', Bin) of
+    case AsnMod:decode('MegacoMessage', Bin) of
 	{ok, MegaMsg} ->
 	    case EC of
 		[native] ->
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index db956102a6..01d429d0ae 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2013. All Rights Reserved.
+# Copyright Ericsson AB 1997-2014. All Rights Reserved.
 #
 # The 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,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.17.0.1
+MEGACO_VSN  = 3.17.0.3
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/Mnesia_App_A.xml b/lib/mnesia/doc/src/Mnesia_App_A.xml
index 86e5b7d03c..62dbffa14a 100644
--- a/lib/mnesia/doc/src/Mnesia_App_A.xml
+++ b/lib/mnesia/doc/src/Mnesia_App_A.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_App_B.xmlsrc b/lib/mnesia/doc/src/Mnesia_App_B.xmlsrc
index 52f5e06d83..f02e424ca4 100644
--- a/lib/mnesia/doc/src/Mnesia_App_B.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_App_B.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_App_C.xmlsrc b/lib/mnesia/doc/src/Mnesia_App_C.xmlsrc
index d8916f25cb..f7fefa36c4 100644
--- a/lib/mnesia/doc/src/Mnesia_App_C.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_App_C.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_App_D.xmlsrc b/lib/mnesia/doc/src/Mnesia_App_D.xmlsrc
index d98680640d..b7a4c270ad 100644
--- a/lib/mnesia/doc/src/Mnesia_App_D.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_App_D.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap1.xml b/lib/mnesia/doc/src/Mnesia_chap1.xml
index 9af81c85cb..540008cdc5 100644
--- a/lib/mnesia/doc/src/Mnesia_chap1.xml
+++ b/lib/mnesia/doc/src/Mnesia_chap1.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
index 473b35b806..f464135a89 100644
--- a/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap2.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap3.xml b/lib/mnesia/doc/src/Mnesia_chap3.xml
index 5733aedbfd..d6b4a1c6a1 100644
--- a/lib/mnesia/doc/src/Mnesia_chap3.xml
+++ b/lib/mnesia/doc/src/Mnesia_chap3.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc
index 7e57c7ac02..a18f853662 100644
--- a/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap4.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
index 30a8991465..65b950bd46 100644
--- a/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap5.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc b/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
index ae41a216f4..4458cd3919 100644
--- a/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
+++ b/lib/mnesia/doc/src/Mnesia_chap7.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/Mnesia_chap8.xml b/lib/mnesia/doc/src/Mnesia_chap8.xml
index 3d2e23cf57..d35dd0c539 100644
--- a/lib/mnesia/doc/src/Mnesia_chap8.xml
+++ b/lib/mnesia/doc/src/Mnesia_chap8.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/book.xml b/lib/mnesia/doc/src/book.xml
index 5389e615c7..d200582a0f 100644
--- a/lib/mnesia/doc/src/book.xml
+++ b/lib/mnesia/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/fascicules.xml b/lib/mnesia/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/mnesia/doc/src/fascicules.xml
+++ b/lib/mnesia/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 20133cb6cb..72e9bd7e8f 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -1204,7 +1204,11 @@ mnesia:create_table(person,
       <desc>
         <p>Performs a user initiated dump of the local log file.
           This is usually not necessary since Mnesia, by default,
-          manages this automatically.</p>
+          manages this automatically.
+	  See configuration parameters
+	  <seealso marker="#dump_log_time_threshold">dump_log_time_threshold</seealso> and
+	   <seealso marker="#dump_log_write_threshold">dump_log_write_threshold</seealso>.
+	</p>
       </desc>
     </func>
     <func>
@@ -2208,6 +2212,18 @@ mnesia:create_table(employee,
       </desc>
     </func>
     <func>
+      <name>sync_log() -> ok | {error, Reason} </name>
+      <fsummary>Perform a file sync of the local log file.</fsummary>
+      <desc>
+        <p>Ensures that the local transaction log file is synced to disk.
+	On a single node system data written to disk tables, since the last dump,
+	can be lost in case of a power outage.
+	See <seealso marker="#dump_log/0">dump_log/0</seealso>.
+	</p>
+      </desc>
+    </func>
+
+    <func>
       <name>sync_transaction(Fun, [[, Args], Retries]) -> {aborted, Reason} | {atomic, ResultOfFun} </name>
       <fsummary>Synchronously execute a transaction.</fsummary>
       <desc>
@@ -2445,7 +2461,7 @@ mnesia:create_table(employee,
       <name>table(Tab [,[Option]]) -> QueryHandle </name>
       <fsummary>Return a QLC query handle.</fsummary>
       <desc>
-        <p>          <marker id="qlc_table"></marker>
+        <p><marker id="qlc_table"></marker>
 Returns a QLC (Query List Comprehension) query handle, see
           <seealso marker="stdlib:qlc">qlc(3)</seealso>.The module <c>qlc</c> implements a query language, it
           can use mnesia tables as sources of data. Calling
@@ -3015,6 +3031,7 @@ raise(Name, Amount) ->
           performed on the original data file. The default is <c>true</c></p>
       </item>
       <item>
+	<marker id=" dump_log_write_threshold"></marker>
         <p><c>-mnesia dump_log_write_threshold Max</c>, where
           <c>Max</c> is an integer which specifies the maximum number of writes
           allowed to the transaction log before a new dump of the log
@@ -3022,13 +3039,14 @@ raise(Name, Amount) ->
           </p>
       </item>
       <item>
+	<marker id=" dump_log_time_threshold"></marker>
         <p><c>-mnesia dump_log_time_threshold Max</c>,
           where <c>Max</c> is an integer which
           specifies the dump log interval in milliseconds. It defaults
           to 3 minutes. If a dump has not been performed within
           <c>dump_log_time_threshold</c> milliseconds, then a new dump is
           performed regardless of how many writes have been
-          performed. 
+          performed.
           </p>
       </item>
       <item>
diff --git a/lib/mnesia/doc/src/mnesia_frag_hash.xml b/lib/mnesia/doc/src/mnesia_frag_hash.xml
index 665796f20d..0d660925e7 100644
--- a/lib/mnesia/doc/src/mnesia_frag_hash.xml
+++ b/lib/mnesia/doc/src/mnesia_frag_hash.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/mnesia_registry.xml b/lib/mnesia/doc/src/mnesia_registry.xml
index e08f3a42fc..ad2b927315 100644
--- a/lib/mnesia/doc/src/mnesia_registry.xml
+++ b/lib/mnesia/doc/src/mnesia_registry.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1998</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 790f5d92b5..0e9131190d 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -38,7 +38,60 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.9</title>
+  <section><title>Mnesia 4.11</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a race in mnesia which could cause hanging
+	    transaction when sticky locks had been used. Thanks
+	    janchochol.</p>
+          <p>
+	    Own Id: OTP-11375</p>
+        </item>
+        <item>
+          <p>
+	    Fixed dirty_update_counter which could return ok, thanks
+	    Anton Ryabkov.</p>
+          <p>
+	    Own Id: OTP-11485</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix timing issues in checkpoint creation.</p>
+          <p>
+	    Own Id: OTP-10957</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a problem where the fallback BUP file is removed
+	    when calling mnesia:uninstall_fallback and mnesia is not
+	    started.</p>
+          <p>
+	    Own Id: OTP-11241</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -115,7 +168,7 @@
         <item>
           <p>
 	    Remove support for the query keyword and query
-	    expressions. Thanks to Lo�c Hoguin.</p>
+	    expressions. Thanks to Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-10729</p>
         </item>
@@ -352,7 +405,7 @@
 	    "-f" is a non-standard chmod option which at least SGI
 	    IRIX and HP UX do not support. As the only effect of the
 	    "-f" flag is to suppress warning messages, it can be
-	    safely omitted. (Thanks to Holger Wei�)</p>
+	    safely omitted. (Thanks to Holger Weiß)</p>
           <p>
 	    Own Id: OTP-9170</p>
         </item>
diff --git a/lib/mnesia/doc/src/notes_history.xml b/lib/mnesia/doc/src/notes_history.xml
index 0984e33376..28b30f000d 100644
--- a/lib/mnesia/doc/src/notes_history.xml
+++ b/lib/mnesia/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/part.xml b/lib/mnesia/doc/src/part.xml
index b9654a4207..2a16b0a791 100644
--- a/lib/mnesia/doc/src/part.xml
+++ b/lib/mnesia/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/part_notes.xml b/lib/mnesia/doc/src/part_notes.xml
index caa155585d..cad1b48ed5 100644
--- a/lib/mnesia/doc/src/part_notes.xml
+++ b/lib/mnesia/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/part_notes_history.xml b/lib/mnesia/doc/src/part_notes_history.xml
index e4621dbbf7..a97676050f 100644
--- a/lib/mnesia/doc/src/part_notes_history.xml
+++ b/lib/mnesia/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2004</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/doc/src/ref_man.xml b/lib/mnesia/doc/src/ref_man.xml
index 417423641d..e3c75be6e1 100644
--- a/lib/mnesia/doc/src/ref_man.xml
+++ b/lib/mnesia/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/mnesia/src/mnesia.appup.src b/lib/mnesia/src/mnesia.appup.src
index 355aafb215..c245299740 100644
--- a/lib/mnesia/src/mnesia.appup.src
+++ b/lib/mnesia/src/mnesia.appup.src
@@ -1,22 +1,16 @@
 %% -*- 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\\.1[0-9].*">>, [{restart_application, mnesia}]},
+  {<<"4\\.[5-9].*">>, [{restart_application, mnesia}]},
   {"4.4.19", [{restart_application, mnesia}]},
   {"4.4.18", [{restart_application, mnesia}]},
   {"4.4.17", [{restart_application, mnesia}]},
   {"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\\.1[0-9].*">>, [{restart_application, mnesia}]},
+  {<<"4\\.[5-9].*">>, [{restart_application, mnesia}]},
   {"4.4.19", [{restart_application, mnesia}]},
   {"4.4.18", [{restart_application, mnesia}]},
   {"4.4.17", [{restart_application, mnesia}]},
diff --git a/lib/mnesia/src/mnesia.erl b/lib/mnesia/src/mnesia.erl
index 70466d10d7..b7d80c1370 100644
--- a/lib/mnesia/src/mnesia.erl
+++ b/lib/mnesia/src/mnesia.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,7 +104,8 @@
 	 set_master_nodes/1, set_master_nodes/2,
 
 	 %% Misc admin
-	 dump_log/0, subscribe/1, unsubscribe/1, report_event/1,
+	 dump_log/0, sync_log/0,
+	 subscribe/1, unsubscribe/1, report_event/1,
 
 	 %% Snmp
 	 snmp_open_table/2, snmp_close_table/1,
@@ -1808,7 +1809,7 @@ do_dirty_rpc(Tab, Node, M, F, Args) ->
 	{badrpc, Reason} ->
 	    timer:sleep(20), %% Do not be too eager, and can't use yield on SMP
 	    %% Sync with mnesia_monitor
-	    try sys:get_status(mnesia_monitor) catch _:_ -> ok end,
+	    _ = try sys:get_status(mnesia_monitor) catch _:_ -> ok end,
 	    case mnesia_controller:call({check_w2r, Node, Tab}) of % Sync
 		NewNode when NewNode =:= Node ->
 		    ErrorTag = mnesia_lib:dirty_rpc_error_tag(Reason),
@@ -2554,6 +2555,9 @@ set_master_nodes(Tab, Nodes) ->
 dump_log() ->
     mnesia_controller:sync_dump_log(user).
 
+sync_log() ->
+    mnesia_monitor:sync_log(latest_log).
+
 subscribe(What) ->
     mnesia_subscr:subscribe(self(), What).
 
diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl
index fd87be1759..3b084e7371 100644
--- a/lib/mnesia/src/mnesia_bup.erl
+++ b/lib/mnesia/src/mnesia_bup.erl
@@ -1052,11 +1052,7 @@ local_uninstall_fallback(Master, FA) ->
             Tmp = FA2#fallback_args.fallback_tmp,
             Bup = FA2#fallback_args.fallback_bup,
             file:delete(Tmp),
-            Res =
-                case fallback_exists(Bup) of
-                    true -> file:delete(Bup);
-                    false -> ok
-                end,
+            Res = file:delete(Bup),
             ?eval_debug_fun({?MODULE, uninstall_fallback2, post_delete}, []),
             Master ! {self(), Res},
             unlink(Master),
diff --git a/lib/mnesia/src/mnesia_checkpoint.erl b/lib/mnesia/src/mnesia_checkpoint.erl
index eb8fe38908..173e3be2f5 100644
--- a/lib/mnesia/src/mnesia_checkpoint.erl
+++ b/lib/mnesia/src/mnesia_checkpoint.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013
 %% 
 %% The 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,7 @@
 	 tm_retain/5,
 	 tm_enter_pending/1,
 	 tm_enter_pending/3,
-	 tm_exit_pending/1,
-	 convert_cp_record/1
+	 tm_exit_pending/1
 	]).
 
 %% Public interface
@@ -88,25 +87,6 @@
 			  pid
 			 }).
 
-%% Old record definition
--record(checkpoint, {name,
-		     allow_remote,
-		     ram_overrides_dump,
-		     nodes,
-		     node,
-		     now,
-		     min,
-		     max,
-		     pending_tab,
-		     wait_for_old,
-		     is_activated,
-		     ignore_new,
-		     retainers,
-		     iterators,
-		     supervisor,
-		     pid
-		    }).
-
 -record(retainer, {cp_name, tab_name, store, writers = [], really_retain = true}).
 
 -record(iter, {tab_name, oid_tab, main_tab, retainer_tab, source, val, pid}).
@@ -129,15 +109,6 @@ tm_prepare(Cp) when is_record(Cp, checkpoint_args) ->
 	    start_retainer(Cp);
 	true ->
 	    {error, {already_exists, Name, node()}}
-    end;
-tm_prepare(Cp) when is_record(Cp, checkpoint) ->
-    %% Node with old protocol sent an old checkpoint record
-    %% and we have to convert it
-    case convert_cp_record(Cp) of
-	{ok, NewCp} ->
-	    tm_prepare(NewCp);
-	{error, Reason} ->
-	    {error, Reason}
     end.
 
 tm_mnesia_down(Node) ->
@@ -156,6 +127,7 @@ tm_enter_pending(Pending) ->
 tm_enter_pending([], Pending) ->
     Pending;
 tm_enter_pending([Tab | Tabs], Pending) ->
+    %% io:format("Add ~p ~p ~p~n",[Tab, Pending, hd(tl(element(2, process_info(self(), current_stacktrace))))]),
     catch ?ets_insert(Tab, Pending),
     tm_enter_pending(Tabs, Pending).
 
@@ -371,9 +343,7 @@ activate(Args) ->
     end.
 
 args2cp(Args) when is_list(Args)->
-    case catch lists:foldl(fun check_arg/2, #checkpoint_args{}, Args) of
-	{'EXIT', Reason} ->
-	    {error, Reason};
+    try lists:foldl(fun check_arg/2, #checkpoint_args{}, Args) of
 	Cp ->
 	    case check_tables(Cp) of
 		{error, Reason} ->
@@ -381,6 +351,10 @@ args2cp(Args) when is_list(Args)->
 		{ok, Overriders, AllTabs} ->
 		    arrange_retainers(Cp, Overriders, AllTabs)
 	    end
+    catch exit:Reason ->
+	    {error, Reason};
+	  error:Reason ->
+	    {error, Reason}
     end;
 args2cp(Args) ->
     {error, {badarg, Args}}.
@@ -390,10 +364,10 @@ check_arg({name, Name}, Cp) ->
 	true ->
 	    exit({already_exists, Name});
 	false ->
-	    case catch tab2retainer({foo, Name}) of
-		List when is_list(List) ->
-		    Cp#checkpoint_args{name = Name};
-		_ ->
+	    try
+		[_|_] = tab2retainer({foo, Name}),
+		Cp#checkpoint_args{name = Name}
+	    catch _:_ ->
 		    exit({badarg, Name})
 	    end
     end;
@@ -641,11 +615,7 @@ init(Cp) ->
     process_flag(priority, high), %% Needed dets files might starve the system
     Name = Cp#checkpoint_args.name,
     Props = [set, public, {keypos, 2}],
-    case catch ?ets_new_table(mnesia_pending_checkpoint, Props) of
-	{'EXIT', Reason} -> %% system limit
-	    Msg = "Cannot create an ets table for pending transactions",
-	    Error = {error, {system_limit, Name, Msg, Reason}},
-	    proc_lib:init_ack(Cp#checkpoint_args.supervisor, Error);
+    try ?ets_new_table(mnesia_pending_checkpoint, Props) of
 	PendingTab ->
 	    Rs = [prepare_tab(Cp, R) || R <- Cp#checkpoint_args.retainers],
 	    Cp2 = Cp#checkpoint_args{retainers = Rs,
@@ -658,6 +628,10 @@ init(Cp) ->
 	    dbg_out("Checkpoint ~p (~p) started~n", [Name, self()]),
 	    proc_lib:init_ack(Cp2#checkpoint_args.supervisor, {ok, self()}),
 	    retainer_loop(Cp2)
+    catch error:Reason -> %% system limit
+	    Msg = "Cannot create an ets table for pending transactions",
+	    Error = {error, {system_limit, Name, Msg, Reason}},
+	    proc_lib:init_ack(Cp#checkpoint_args.supervisor, Error)
     end.
     
 prepare_tab(Cp, R) ->
@@ -798,104 +772,142 @@ retainer_delete({dets, Store}) ->
     Fname = tab2retainer(Store),
     file:delete(Fname).
 
-retainer_loop(Cp) ->
-    Name = Cp#checkpoint_args.name,
+retainer_loop(Cp = #checkpoint_args{is_activated=false, name=Name}) ->
     receive
-	{_From, {retain, Tid, Tab, Key, OldRecs}}
-	when Cp#checkpoint_args.wait_for_old == [] ->
-	    R = val({Tab, {retainer, Name}}),
-	    PendingTab = Cp#checkpoint_args.pending_tab,
-	    case R#retainer.really_retain of
-		true when PendingTab =:= undefined ->
-		    Store = R#retainer.store,
-		    case retainer_get(Store, Key) of
-			[] ->  retainer_put(Store, {Tab, Key, OldRecs});
-			_ ->   already_retained
-		    end;
-		true ->
-		    case ets:member(PendingTab, Tid) of
-			true -> ignore;
-			false -> 
-			    Store = R#retainer.store,
-			    case retainer_get(Store, Key) of
-				[] ->  retainer_put(Store, {Tab, Key, OldRecs});
-				_ ->   already_retained
-			    end			
-		    end;
-		false ->
-		    ignore
-	    end,
-	    retainer_loop(Cp);
-	
 	%% Adm
+	{From, {activate, Pending}} ->
+            StillPending = mnesia_recover:still_pending(Pending),
+            enter_still_pending(StillPending, Cp#checkpoint_args.pending_tab),
+	    Local = [Tid || #tid{pid=Pid} = Tid <- StillPending, node(Pid) =/= node()],
+            Cp2 = maybe_activate(Cp#checkpoint_args{wait_for_old = Local}),
+
+            reply(From, Name, activated),
+	    retainer_loop(Cp2);
+
+	{_From, {exit_pending, Tid}} when is_list(Cp#checkpoint_args.wait_for_old) ->
+	    StillPending = lists:delete(Tid, Cp#checkpoint_args.wait_for_old),
+	    Cp2 = Cp#checkpoint_args{wait_for_old = StillPending},
+	    Cp3 = maybe_activate(Cp2),
+	    retainer_loop(Cp3);
+
 	{From, deactivate} ->
 	    do_stop(Cp),
 	    reply(From, Name, deactivated),
 	    unlink(From),
 	    exit(shutdown);
 
+	{From, get_checkpoint} ->
+	    reply(From, Name, Cp),
+	    retainer_loop(Cp);
+	{_From, {add_retainer, R, Node}} ->
+	    Cp2 = do_add_retainer(Cp, R, Node),
+	    retainer_loop(Cp2);
+
+	{From, collect_pending} ->
+	    PendingTab = Cp#checkpoint_args.pending_tab,
+	    del(pending_checkpoints, PendingTab),
+	    Pending = ?ets_match_object(PendingTab, '_'),
+	    reply(From, Name, {ok, Pending}),
+	    retainer_loop(Cp);
+
+	{_From, {mnesia_down, Node}} ->
+	    Cp2 = do_del_retainers(Cp, Node),
+	    retainer_loop(Cp2);
+
 	{'EXIT', Parent, _} when Parent == Cp#checkpoint_args.supervisor ->
 	    %% do_stop(Cp),
 	    %% assume that entire Mnesia is terminating
 	    exit(shutdown);
 
-	{_From, {mnesia_down, Node}} ->
-	    Cp2 = do_del_retainers(Cp, Node),
-	    retainer_loop(Cp2);
+	{'EXIT', From, _Reason} ->
+	    Iters = [Iter || Iter <- Cp#checkpoint_args.iterators,
+			     check_iter(From, Iter)],
+	    retainer_loop(Cp#checkpoint_args{iterators = Iters});
+
+	{system, From, Msg} ->
+	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
+	    sys:handle_system_msg(Msg, From, Cp#checkpoint_args.supervisor,
+				  ?MODULE, [], Cp)
+    end;
+
+retainer_loop(Cp = #checkpoint_args{name=Name}) ->
+    receive
+	{_From, {retain, Tid, Tab, Key, OldRecs}} ->
+	    R = val({Tab, {retainer, Name}}),
+	    PendingTab = Cp#checkpoint_args.pending_tab,
+	    case R#retainer.really_retain of
+		true ->
+		    Store = R#retainer.store,
+		    try true = ets:member(PendingTab, Tid),
+			 %% io:format("CP: ~p ~p ~p ~p~n",[true, Tab, Key, Tid]),
+			 case retainer_get(Store, Key) of
+			     [] -> ignore;
+			     _  -> ets:delete(element(2,Store), Key)
+			 end
+		    catch _:_ ->
+			    %% io:format("CP: ~p ~p ~p ~p~n",[false, Tab, Key, Tid]),
+			    case retainer_get(Store, Key) of
+				[] -> retainer_put(Store, {Tab, Key, OldRecs});
+				_  -> already_retained
+			    end
+		    end;
+		false ->
+		    ignore
+	    end,
+	    retainer_loop(Cp);
+
+	%% Adm
 	{From, get_checkpoint} ->
 	    reply(From, Name, Cp),
 	    retainer_loop(Cp);
-	{From, {add_copy, Tab, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
+	{From, {add_copy, Tab, Node}} ->
 	    {Res, Cp2} = do_add_copy(Cp, Tab, Node),
 	    reply(From, Name, Res),
 	    retainer_loop(Cp2);
-	{From, {del_copy, Tab, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
+	{From, {del_copy, Tab, Node}} ->
 	    Cp2 = do_del_copy(Cp, Tab, Node),
 	    reply(From, Name, ok),
 	    retainer_loop(Cp2);
-	{From, {change_copy, Tab, From, To}} when Cp#checkpoint_args.wait_for_old == [] ->
+	{From, {change_copy, Tab, From, To}} ->
 	    Cp2 = do_change_copy(Cp, Tab, From, To),
 	    reply(From, Name, ok),
 	    retainer_loop(Cp2);
 	{_From, {add_retainer, R, Node}} ->
 	    Cp2 = do_add_retainer(Cp, R, Node),
 	    retainer_loop(Cp2);
-	{_From, {del_retainer, R, Node}} when Cp#checkpoint_args.wait_for_old == [] ->
+	{_From, {del_retainer, R, Node}} ->
 	    Cp2 = do_del_retainer(Cp, R, Node),
 	    retainer_loop(Cp2);
 
 	%% Iteration
-	{From, {iter_begin, Iter}} when Cp#checkpoint_args.wait_for_old == [] ->
+	{From, {iter_begin, Iter}} ->
 	    Cp2 = iter_begin(Cp, From, Iter),
 	    retainer_loop(Cp2);
 
-	{From, {iter_end, Iter}} when Cp#checkpoint_args.wait_for_old == [] ->
+	{From, {iter_end, Iter}}  ->
 	    retainer_fixtable(Iter#iter.oid_tab, false),
 	    Iters = Cp#checkpoint_args.iterators -- [Iter],
 	    reply(From, Name, ok),
-	    retainer_loop(Cp#checkpoint_args{iterators = Iters});	
-
-	{_From, {exit_pending, Tid}}
-	    when is_list(Cp#checkpoint_args.wait_for_old) ->
-	    StillPending = lists:delete(Tid, Cp#checkpoint_args.wait_for_old),
-	    Cp2 = Cp#checkpoint_args{wait_for_old = StillPending},
-	    Cp3 = maybe_activate(Cp2),
-	    retainer_loop(Cp3);
+	    retainer_loop(Cp#checkpoint_args{iterators = Iters});
 
-	{From, collect_pending} ->
-	    PendingTab = Cp#checkpoint_args.pending_tab,
-	    del(pending_checkpoints, PendingTab),
-	    Pending = ?ets_match_object(PendingTab, '_'),
-	    reply(From, Name, {ok, Pending}),
+	{_From, {exit_pending, _Tid}} ->
 	    retainer_loop(Cp);
 
-	{From, {activate, Pending}} ->
-            StillPending = mnesia_recover:still_pending(Pending),
-            enter_still_pending(StillPending, Cp#checkpoint_args.pending_tab),
-            Cp2 = maybe_activate(Cp#checkpoint_args{wait_for_old = StillPending}),
-            reply(From, Name, activated),
+	{From, deactivate} ->
+	    do_stop(Cp),
+	    reply(From, Name, deactivated),
+	    unlink(From),
+	    exit(shutdown);
+
+	{_From, {mnesia_down, Node}} ->
+	    Cp2 = do_del_retainers(Cp, Node),
 	    retainer_loop(Cp2);
 
+	{'EXIT', Parent, _} when Parent == Cp#checkpoint_args.supervisor ->
+	    %% do_stop(Cp),
+	    %% assume that entire Mnesia is terminating
+	    exit(shutdown);
+
 	{'EXIT', From, _Reason} ->
 	    Iters = [Iter || Iter <- Cp#checkpoint_args.iterators,
 			     check_iter(From, Iter)],
@@ -903,13 +915,17 @@ retainer_loop(Cp) ->
 
 	{system, From, Msg} ->
 	    dbg_out("~p got {system, ~p, ~p}~n", [?MODULE, From, Msg]),
-	    sys:handle_system_msg(Msg, From, no_parent, ?MODULE, [], Cp)
+	    sys:handle_system_msg(Msg, From, Cp#checkpoint_args.supervisor,
+				  ?MODULE, [], Cp);
+	Msg ->
+	    dbg_out("~p got ~p~n", [?MODULE, Msg])
     end.
 
 maybe_activate(Cp)
-        when Cp#checkpoint_args.wait_for_old == [],
-             Cp#checkpoint_args.is_activated == false ->
-    Cp#checkpoint_args{pending_tab = undefined, is_activated = true};
+  when Cp#checkpoint_args.wait_for_old == [],
+       Cp#checkpoint_args.is_activated == false ->
+    Cp#checkpoint_args{%% pending_tab = undefined,
+		       is_activated = true};
 maybe_activate(Cp) ->
     Cp.
 
@@ -1226,65 +1242,6 @@ system_terminate(_Reason, _Parent,_Debug, Cp) ->
 system_code_change(Cp, _Module, _OldVsn, _Extra) ->
     {ok, Cp}.
 
-convert_cp_record(Cp) when is_record(Cp, checkpoint) ->
-    ROD = 
-	case Cp#checkpoint.ram_overrides_dump of
-	    true -> Cp#checkpoint.min ++ Cp#checkpoint.max;
-	    false -> []
-	end,
-
-    {ok, #checkpoint_args{name = Cp#checkpoint.name,
-			  allow_remote = Cp#checkpoint.name,
-			  ram_overrides_dump = ROD,
-			  nodes = Cp#checkpoint.nodes,
-			  node = Cp#checkpoint.node,
-			  now = Cp#checkpoint.now,
-			  cookie = ?unique_cookie,
-			  min = Cp#checkpoint.min,
-			  max = Cp#checkpoint.max,
-			  pending_tab = Cp#checkpoint.pending_tab,
-			  wait_for_old = Cp#checkpoint.wait_for_old,
-			  is_activated = Cp#checkpoint.is_activated,
-			  ignore_new = Cp#checkpoint.ignore_new,
-			  retainers = Cp#checkpoint.retainers,
-			  iterators = Cp#checkpoint.iterators,
-			  supervisor = Cp#checkpoint.supervisor,
-			  pid = Cp#checkpoint.pid
-			 }};
-convert_cp_record(Cp) when is_record(Cp, checkpoint_args) ->
-    AllTabs = Cp#checkpoint_args.min ++ Cp#checkpoint_args.max,
-    ROD = case Cp#checkpoint_args.ram_overrides_dump of
-	      [] -> 
-		  false;
-	      AllTabs -> 
-		  true;
-	      _ -> 
-		  error
-	  end,
-    if
-	ROD == error ->
-	    {error, {"Old node cannot handle new checkpoint protocol",
-		     ram_overrides_dump}};
-	true ->
-	    {ok, #checkpoint{name = Cp#checkpoint_args.name,
-			     allow_remote = Cp#checkpoint_args.name,
-			     ram_overrides_dump = ROD,
-			     nodes = Cp#checkpoint_args.nodes,
-			     node = Cp#checkpoint_args.node,
-			     now = Cp#checkpoint_args.now,
-			     min = Cp#checkpoint_args.min,
-			     max = Cp#checkpoint_args.max,
-			     pending_tab = Cp#checkpoint_args.pending_tab,
-			     wait_for_old = Cp#checkpoint_args.wait_for_old,
-			     is_activated = Cp#checkpoint_args.is_activated,
-			     ignore_new = Cp#checkpoint_args.ignore_new,
-			     retainers = Cp#checkpoint_args.retainers,
-			     iterators = Cp#checkpoint_args.iterators,
-			     supervisor = Cp#checkpoint_args.supervisor,
-			     pid = Cp#checkpoint_args.pid
-			    }}
-    end.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%
 
 val(Var) ->
diff --git a/lib/mnesia/src/mnesia_controller.erl b/lib/mnesia/src/mnesia_controller.erl
index 78f7bfa325..a83e55ac62 100644
--- a/lib/mnesia/src/mnesia_controller.erl
+++ b/lib/mnesia/src/mnesia_controller.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,7 +198,8 @@ sync_dump_log(InitBy) ->
     call({sync_dump_log, InitBy}).
 
 async_dump_log(InitBy) ->
-    ?SERVER_NAME ! {async_dump_log, InitBy}.
+    ?SERVER_NAME ! {async_dump_log, InitBy},
+    ok.
 
 %% Wait for tables to be active
 %% If needed, we will wait for Mnesia to start
@@ -293,10 +294,11 @@ update(Fun) ->
 
 
 mnesia_down(Node) ->
-    case cast({mnesia_down, Node}) of
-	{error, _} -> mnesia_monitor:mnesia_down(?SERVER_NAME, Node);
-	_Pid ->  ok
+    case whereis(?SERVER_NAME) of
+	undefined -> mnesia_monitor:mnesia_down(?SERVER_NAME, Node);
+	Pid -> gen_server:cast(Pid, {mnesia_down, Node})
     end.
+
 wait_for_schema_commit_lock() ->
     link(whereis(?SERVER_NAME)),
     unsafe_call(wait_for_schema_commit_lock).
@@ -467,7 +469,7 @@ connect_nodes2(Father, Ns, UserFun) ->
     process_flag(trap_exit, true),
     Res = try_merge_schema(New, [], UserFun),
     Msg = {schema_is_merged, [], late_merge, []},
-    multicall([node()|Ns], Msg),
+    _ = multicall([node()|Ns], Msg),
     After = val({current, db_nodes}),
     Father ! {?MODULE, self(), Res, mnesia_lib:intersect(Ns,After)},
     unlink(Father),
@@ -548,7 +550,7 @@ schema_is_merged() ->
 
 cast(Msg) ->
     case whereis(?SERVER_NAME) of
-	undefined ->{error, {node_not_running, node()}};
+	undefined -> ok;
 	Pid ->  gen_server:cast(Pid, Msg)
     end.
 
@@ -1789,7 +1791,7 @@ sync_and_block_table_whereabouts(Tab, ToNode, RemoteS, AccessMode) when Tab /= s
 	    true -> Current -- [ToNode];
 	    false -> Current
 	end,
-    remote_call(ToNode, block_table, [Tab]),
+    _ = remote_call(ToNode, block_table, [Tab]),
     [remote_call(Node, add_active_replica, [Tab, ToNode, RemoteS, AccessMode]) ||
 	Node <- [ToNode | Ns]],
     ok.
diff --git a/lib/mnesia/src/mnesia_dumper.erl b/lib/mnesia/src/mnesia_dumper.erl
index e2a0aa3bda..14665797a0 100644
--- a/lib/mnesia/src/mnesia_dumper.erl
+++ b/lib/mnesia/src/mnesia_dumper.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,7 +85,7 @@ adjust_log_writes(DoCast) ->
 	    %% Don't care if we lost a few writes
 	    mnesia_lib:set_counter(trans_log_writes_left, Max),
 	    Diff = Max - Left,
-	    mnesia_lib:incr_counter(trans_log_writes, Diff),
+	    _ = mnesia_lib:incr_counter(trans_log_writes, Diff),
 	    global:del_lock(Token, [node()])
     end.
 
@@ -451,7 +451,8 @@ disc_delete_table(Tab, Storage) ->
 		Storage == disc_only_copies; Tab == schema ->
 		    mnesia_monitor:unsafe_close_dets(Tab),
 		    Dat = mnesia_lib:tab2dat(Tab),
-		    file:delete(Dat);
+		    file:delete(Dat),
+		    ok;
 		true ->
 		    DclFile = mnesia_lib:tab2dcl(Tab),
 		    case get({?MODULE,Tab}) of
@@ -466,13 +467,14 @@ disc_delete_table(Tab, Storage) ->
 		    file:delete(DcdFile),
 		    ok
 	    end,
-	    erase({?MODULE, Tab});
+	    erase({?MODULE, Tab}),
+	    ok;
 	false ->
-	    ignore
+	    ok
     end.
 
 disc_delete_indecies(_Tab, _Cs, Storage) when Storage /= disc_only_copies ->
-    ignore;
+    ok;
 disc_delete_indecies(Tab, Cs, disc_only_copies) ->
     Indecies = Cs#cstruct.index,
     mnesia_index:del_transient(Tab, Indecies, disc_only_copies).
@@ -522,10 +524,11 @@ insert_op(Tid, _, {op, change_table_copy_type, N, FromS, ToS, TabDef}, InPlace,
 		{disc_copies, ram_copies} when Tab == schema ->
 		    mnesia_lib:set(use_dir, false),
 		    mnesia_monitor:unsafe_close_dets(Tab),
-		    file:delete(Dat);
+		    ok = file:delete(Dat);
 		{disc_copies, ram_copies} ->
-		    file:delete(Dcl),
-		    file:delete(Dcd);
+		    _ = file:delete(Dcl),
+		    _ = file:delete(Dcd),
+		    ok;
 		{ram_copies, disc_only_copies} ->
 		    ok = ensure_rename(Dmp, Dat),
 		    true = open_files(Tab, disc_only_copies, InPlace, InitBy),
@@ -544,7 +547,8 @@ insert_op(Tid, _, {op, change_table_copy_type, N, FromS, ToS, TabDef}, InPlace,
 			startup ->
 			    ignore;
 			_ ->
-			    mnesia_controller:get_disc_copy(Tab)
+			    mnesia_controller:get_disc_copy(Tab),
+			    ok
 		    end,
 		    disc_delete_table(Tab, disc_only_copies);
 		{disc_copies, disc_only_copies} ->
@@ -553,8 +557,9 @@ insert_op(Tid, _, {op, change_table_copy_type, N, FromS, ToS, TabDef}, InPlace,
 		    mnesia_schema:ram_delete_table(Tab, FromS),
 		    PosList = Cs#cstruct.index,
 		    mnesia_index:init_indecies(Tab, disc_only_copies, PosList),
-		    file:delete(Dcl),
-		    file:delete(Dcd);
+		    _ = file:delete(Dcl),
+		    _ = file:delete(Dcd),
+		    ok;
 		{disc_only_copies, disc_copies} ->
 		    mnesia_monitor:unsafe_close_dets(Tab),
 		    disc_delete_indecies(Tab, Cs, disc_only_copies),
diff --git a/lib/mnesia/src/mnesia_event.erl b/lib/mnesia/src/mnesia_event.erl
index 35fe2d4035..67ec9d7399 100644
--- a/lib/mnesia/src/mnesia_event.erl
+++ b/lib/mnesia/src/mnesia_event.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
 %% 
 %% The 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,7 +63,7 @@ handle_event(Event, State) ->
 %%-----------------------------------------------------------------
 
 handle_info(Msg, State) ->
-    handle_any_event(Msg, State),
+    {ok, _} = handle_any_event(Msg, State),
     {ok, State}.
 
 %%-----------------------------------------------------------------
diff --git a/lib/mnesia/src/mnesia_index.erl b/lib/mnesia/src/mnesia_index.erl
index 54db45e3ba..8fef611a48 100644
--- a/lib/mnesia/src/mnesia_index.erl
+++ b/lib/mnesia/src/mnesia_index.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -229,7 +229,7 @@ del_transient(Tab, Storage) ->
     PosList = val({Tab, index}),
     del_transient(Tab, PosList, Storage).
 
-del_transient(_, [], _) -> done;
+del_transient(_, [], _) -> ok;
 del_transient(Tab, [Pos | Tail], Storage) ->
     delete_transient_index(Tab, Pos, Storage),
     del_transient(Tab, Tail, Storage).
@@ -237,7 +237,7 @@ del_transient(Tab, [Pos | Tail], Storage) ->
 delete_transient_index(Tab, Pos, disc_only_copies) ->
     Tag = {Tab, index, Pos},
     mnesia_monitor:unsafe_close_dets(Tag),
-    file:delete(tab2filename(Tab, Pos)),
+    _ = file:delete(tab2filename(Tab, Pos)),
     del_index_info(Tab, Pos), %% Uses val(..)
     mnesia_lib:unset({Tab, {index, Pos}});
 
@@ -255,7 +255,7 @@ init_disc_index(_Tab, []) ->
 init_disc_index(Tab, [Pos | Tail]) when is_integer(Pos) ->
     Fn = tab2filename(Tab, Pos),
     IxTag = {Tab, index, Pos},
-    file:delete(Fn),
+    _ = file:delete(Fn),
     Args = [{file, Fn}, {keypos, 1}, {type, bag}],
     mnesia_monitor:open_dets(IxTag, Args),
     Storage = disc_only_copies,
diff --git a/lib/mnesia/src/mnesia_lib.erl b/lib/mnesia/src/mnesia_lib.erl
index ae6631646c..109e924971 100644
--- a/lib/mnesia/src/mnesia_lib.erl
+++ b/lib/mnesia/src/mnesia_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -296,11 +296,7 @@ active_here(Tab) ->
 not_active_here(Tab) ->
     not active_here(Tab).
 
-exists(Fname) ->
-    case file:open(Fname, [raw,read]) of
-	{ok, F} ->file:close(F), true;
-	_ -> false
-    end.
+exists(Fname) -> filelib:is_regular(Fname).
 
 dir() -> mnesia_monitor:get_env(dir).
 
@@ -596,7 +592,7 @@ coredump(CrashInfo) ->
     Core = mkcore(CrashInfo),
     Out = core_file(),
     important("Writing Mnesia core to file: ~p...~p~n", [Out, CrashInfo]),
-    file:write_file(Out, Core),
+    _ = file:write_file(Out, Core),
     Out.
 
 core_file() ->
@@ -620,7 +616,7 @@ mkcore(CrashInfo) ->
     Core = [
 	    CrashInfo,
 	    {time, {date(), time()}},
-	    {self, catch process_info(self())},
+	    {self, proc_dbg_info(self())},
 	    {nodes, catch rpc:multicall(Nodes, ?MODULE, get_node_number, [])},
 	    {applications, catch lists:sort(application:loaded_applications())},
 	    {flags, catch init:get_arguments()},
@@ -697,7 +693,7 @@ relatives() ->
     Info = fun(Name) ->
 		   case whereis(Name) of
 		       undefined -> false;
-		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
+		       Pid -> {true, {Name, Pid, proc_dbg_info(Pid)}}
 		   end
 	   end,
     lists:zf(Info, mnesia:ms()).
@@ -706,14 +702,14 @@ workers({workers, Loaders, Senders, Dumper}) ->
     Info = fun({Pid, {send_table, Tab, _Receiver, _St}}) ->
 		   case Pid of
 		       undefined -> false;
-		       Pid -> {true, {Pid, Tab, catch process_info(Pid)}}
+		       Pid -> {true, {Pid, Tab, proc_dbg_info(Pid)}}
 		   end;
 	      ({Pid, What}) when is_pid(Pid) ->
-		   {true, {Pid, What, catch process_info(Pid)}};
+		   {true, {Pid, What, proc_dbg_info(Pid)}};
 	      ({Name, Pid}) ->
 		   case Pid of
 		       undefined -> false;
-		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
+		       Pid -> {true, {Name, Pid, proc_dbg_info(Pid)}}
 		   end
 	   end,
     SInfo = lists:zf(Info, Senders),
@@ -727,13 +723,21 @@ locking_procs(LockList) when is_list(LockList) ->
 		   Pid = Tid#tid.pid,
 		   case node(Pid) == node() of
 		       true -> 
-			   {true, {Pid, catch process_info(Pid)}};
+			   {true, {Pid, proc_dbg_info(Pid)}};
 		       _ ->
 			   false
 		   end
 	   end,
     lists:zf(Info, UT).
 
+proc_dbg_info(Pid) ->
+    try
+	[process_info(Pid, current_stacktrace)|
+	 process_info(Pid)]
+    catch _:R ->
+	    [{process_info,crashed,R}]
+    end.
+
 view() ->
     Bin = mkcore({crashinfo, {"view only~n", []}}),
     vcore(Bin).
@@ -806,9 +810,9 @@ vcore(File) ->
 
 vcore_elem({schema_file, {ok, B}}) ->
     Fname = "/tmp/schema.DAT",
-    file:write_file(Fname, B),
-    dets:view(Fname),
-    file:delete(Fname);
+    _ = file:write_file(Fname, B),
+    _ = dets:view(Fname),
+    _ = file:delete(Fname);
 
 vcore_elem({logfile, {ok, BinList}}) ->
     Fun = fun({F, Info}) ->
@@ -922,7 +926,7 @@ random_time(Retries, _Counter0) ->
     case get(random_seed) of
 	undefined ->
 	    {X, Y, Z} = erlang:now(), %% time()
-	    random:seed(X, Y, Z),
+	    _ = random:seed(X, Y, Z),
 	    Time = Dup + random:uniform(MaxIntv),
 	    %%	    dbg_out("---random_test rs ~w max ~w val ~w---~n", [Retries, MaxIntv, Time]),
 	    Time;
@@ -958,20 +962,17 @@ report_system_event({'EXIT', Reason}, Event) ->
 	    unlink(Pid),
 
             %% We get an exit signal if server dies
-            receive
-                {'EXIT', Pid, _Reason} ->
-                    {error, {node_not_running, node()}}
-            after 0 ->
-		    gen_event:stop(mnesia_event),
-                    ok
+            receive {'EXIT', Pid, _Reason} -> ok
+            after 0 -> gen_event:stop(mnesia_event)
             end;
 
 	Error ->
 	    Msg = "Mnesia(~p): Cannot report event ~p: ~p (~p)~n",
 	    error_logger:format(Msg, [node(), Event, Reason, Error])
-    end;
+    end,
+    ok;
 report_system_event(_Res, _Event) ->
-    ignore.
+    ok.
 
 %% important messages are reported regardless of debug level
 important(Format, Args) ->
@@ -1025,8 +1026,8 @@ copy_file(From, To) ->
 	    case file:open(To, [raw, binary, write]) of
 		{ok, T} ->
 		    Res = copy_file_loop(F, T, 8000),
-		    file:close(F),
-		    file:close(T),
+		    ok = file:close(F),
+		    ok = file:close(T),
 		    Res;
 		{error, Reason} ->
 		    {error, Reason}
@@ -1038,7 +1039,7 @@ copy_file(From, To) ->
 copy_file_loop(F, T, ChunkSize) ->
     case file:read(F, ChunkSize) of
 	{ok, Bin} ->
-	    file:write(T, Bin),
+	    ok = file:write(T, Bin),
 	    copy_file_loop(F, T, ChunkSize);
 	eof ->
 	    ok;
@@ -1205,7 +1206,7 @@ dets_to_ets(Tabname, Tab, File, Type, Rep, Lock) ->
 			{keypos, 2}, {repair, Rep}]) of
 	{ok, Tabname} ->
 	    Res = dets:to_ets(Tabname, Tab),
-	    Close(Tabname),
+	    ok = Close(Tabname),
 	    trav_ret(Res, Tab);
 	Other ->
 	    Other
diff --git a/lib/mnesia/src/mnesia_locker.erl b/lib/mnesia/src/mnesia_locker.erl
index 14011003d3..32cea903c9 100644
--- a/lib/mnesia/src/mnesia_locker.erl
+++ b/lib/mnesia/src/mnesia_locker.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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 @@
 	 global_lock/5,
 	 ixrlock/5,
 	 init/1,
-	 mnesia_down/2,
 	 release_tid/1,
+	 mnesia_down/2,
 	 async_release_tid/2,
 	 send_release_tid/2,
 	 receive_release_tid_acc/2,
@@ -103,7 +103,8 @@ val(Var) ->
     end.
 
 reply(From, R) ->
-    From ! {?MODULE, node(), R}.
+    From ! {?MODULE, node(), R},
+    true. %% Quiets dialyzer
 
 l_request(Node, X, Store) ->
     {?MODULE, Node} ! {self(), X},
@@ -137,6 +138,17 @@ receive_release_tid_acc([Node | Nodes], Tid) ->
 receive_release_tid_acc([], _Tid) ->
     ok.
 
+mnesia_down(Node, Pending) ->
+    case whereis(?MODULE) of
+	undefined -> {error, node_not_running};
+	Pid ->
+	    Ref = make_ref(),
+	    Pid ! {{self(), Ref}, {release_remote_non_pending, Node, Pending}},
+	    receive   %% No need to wait for anything else if process dies we die soon
+		{Ref,ok} -> ok
+	    end
+    end.
+
 loop(State) ->
     receive
 	{From, {write, Tid, Oid}} ->
@@ -213,9 +225,9 @@ loop(State) ->
 	    reply(From, {tid_released, Tid}),
 	    loop(State);
 
-	{release_remote_non_pending, Node, Pending} ->
+	{{From, Ref},{release_remote_non_pending, Node, Pending}} ->
 	    release_remote_non_pending(Node, Pending),
-	    mnesia_monitor:mnesia_down(?MODULE, Node),
+	    From ! {Ref, ok},
 	    loop(State);
 
 	{'EXIT', Pid, _} when Pid == State#state.supervisor ->
@@ -653,19 +665,6 @@ ix_read_res(Tab,IxKey,Pos) ->
 %% ********************* end server code ********************
 %% The following code executes at the client side of a transactions
 
-mnesia_down(N, Pending) ->
-    case whereis(?MODULE) of
-	undefined ->
-	    %% Takes care of mnesia_down's in early startup
-	    mnesia_monitor:mnesia_down(?MODULE, N);
-	Pid ->
-	    %% Syncronously call needed in order to avoid
-	    %% race with mnesia_tm's coordinator processes
-	    %% that may restart and acquire new locks.
-	    %% mnesia_monitor ensures the sync.
-	    Pid ! {release_remote_non_pending, N, Pending}
-    end.
-
 %% Aquire a write lock, but do a read, used by
 %% mnesia:wread/1
 
diff --git a/lib/mnesia/src/mnesia_log.erl b/lib/mnesia/src/mnesia_log.erl
index 18303869ed..d2fd04a60b 100644
--- a/lib/mnesia/src/mnesia_log.erl
+++ b/lib/mnesia/src/mnesia_log.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -393,13 +393,15 @@ unsafe_close_log(Log) ->
 
 purge_some_logs() ->
     mnesia_monitor:unsafe_close_log(latest_log),
-    file:delete(latest_log_file()),
-    file:delete(decision_tab_file()).
+    _ = file:delete(latest_log_file()),
+    _ = file:delete(decision_tab_file()),
+    ok.
 
 purge_all_logs() ->
-    file:delete(previous_log_file()),
-    file:delete(latest_log_file()),
-    file:delete(decision_tab_file()).
+    _ = file:delete(previous_log_file()),
+    _ = file:delete(latest_log_file()),
+    _ = file:delete(decision_tab_file()),
+    ok.
 
 %% Prepare dump by renaming the open logfile if possible
 %% Returns a tuple on the following format: {Res, OpenLog}
diff --git a/lib/mnesia/src/mnesia_monitor.erl b/lib/mnesia/src/mnesia_monitor.erl
index 7a788238fc..6fc1a394a6 100644
--- a/lib/mnesia/src/mnesia_monitor.erl
+++ b/lib/mnesia/src/mnesia_monitor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,7 @@
 	 set_env/2,
 	 start/0,
 	 start_proc/4,
+	 sync_log/1,
 	 terminate_proc/3,
 	 unsafe_close_dets/1,
 	 unsafe_close_log/1,
@@ -78,7 +79,7 @@
 
 -record(state, {supervisor, pending_negotiators = [],
 		going_down = [], tm_started = false, early_connects = [],
-		connecting, mq = []}).
+		connecting, mq = [], remote_node_status = []}).
 
 -define(current_protocol_version,  {8,1}).
 
@@ -118,6 +119,9 @@ open_log(Args) ->
 reopen_log(Name, Fname, Head) ->
     unsafe_call({reopen_log, Name, Fname, Head}).
 
+sync_log(Name) ->
+    unsafe_call({sync_log, Name}).
+
 close_log(Name) ->
     unsafe_call({close_log, Name}).
 
@@ -202,7 +206,7 @@ needs_protocol_conversion(Node) ->
 
 cast(Msg) ->
     case whereis(?MODULE) of
-	undefined -> ignore;
+	undefined -> ok;
 	Pid ->  gen_server:cast(Pid, Msg)
     end.
 
@@ -382,6 +386,9 @@ handle_call({reopen_log, Name, Fname, Head}, _From, State) ->
  	    {noreply, State}
     end;
 
+handle_call({sync_log, Name}, _From, State) ->
+    {reply, disk_log:sync(Name), State};
+
 handle_call({close_log, Name}, _From, State) ->
     case disk_log:close(Name) of
 	ok ->
@@ -395,7 +402,7 @@ handle_call({close_log, Name}, _From, State) ->
     end;
 
 handle_call({unsafe_close_log, Name}, _From, State) ->
-    disk_log:close(Name),
+    _ = disk_log:close(Name),
     {reply, ok, State};
 
 handle_call({negotiate_protocol, Mon, _Version, _Protocols}, _From, State)
@@ -439,7 +446,7 @@ handle_call({negotiate_protocol, Nodes}, From, State) ->
     end;
 
 handle_call(init, _From, State) ->
-    net_kernel:monitor_nodes(true),
+    _ = net_kernel:monitor_nodes(true),
     EarlyNodes = State#state.early_connects,
     State2 = State#state{tm_started = true},
     {reply, EarlyNodes, State2};
@@ -482,27 +489,24 @@ handle_cast({mnesia_down, mnesia_controller, Node}, State) ->
     mnesia_tm:mnesia_down(Node),
     {noreply, State};
 
-handle_cast({mnesia_down, mnesia_tm, {Node, Pending}}, State) ->
-    mnesia_locker:mnesia_down(Node, Pending),
-    {noreply, State};
-
-handle_cast({mnesia_down, mnesia_locker, Node}, State) ->
+handle_cast({mnesia_down, mnesia_tm, Node}, State) ->
     Down = {mnesia_down, Node},
     mnesia_lib:report_system_event(Down),
     GoingDown = lists:delete(Node, State#state.going_down),
     State2 = State#state{going_down = GoingDown},
     Pending = State#state.pending_negotiators,
+    State3 = check_raise_conditon_nodeup(Node, State2),
     case lists:keysearch(Node, 1, Pending) of
 	{value, {Node, Mon, ReplyTo, Reply}} ->
 	    %% Late reply to remote monitor
 	    link(Mon),  %% link to remote Monitor
 	    gen_server:reply(ReplyTo, Reply),
 	    P2 = lists:keydelete(Node, 1,Pending),
-	    State3 = State2#state{pending_negotiators = P2},
-	    process_q(State3);
+	    State4 = State3#state{pending_negotiators = P2},
+	    process_q(State4);
 	false ->
 	    %% No pending remote monitors
-	    process_q(State2)
+	    process_q(State3)
     end;
 
 handle_cast({disconnect, Node}, State) ->
@@ -568,27 +572,18 @@ handle_info({protocol_negotiated, From,Res}, State) ->
     gen_server:reply(From, Res),
     process_q(State#state{connecting = undefined});
 
-handle_info({nodeup, Node}, State) ->
-    %% Ok, we are connected to yet another Erlang node
-    %% Let's check if Mnesia is running there in order
-    %% to detect if the network has been partitioned
-    %% due to communication failure.
-
-    HasDown   = mnesia_recover:has_mnesia_down(Node),
-    ImRunning = mnesia_lib:is_running(),
+handle_info({check_nodeup, Node}, State) ->
+    State2 = check_mnesia_down(Node, State),
+    {noreply, State2};
 
-    if
-	%% If I'm not running the test will be made later.
-	HasDown == true, ImRunning == yes ->
-	    spawn_link(?MODULE, detect_partitioned_network, [self(), Node]);
-	true ->
-	    ignore
-    end,
-    {noreply, State};
+handle_info({nodeup, Node}, State) ->
+    State2 = remote_node_status(Node, up, State),
+    State3 = check_mnesia_down(Node, State2),
+    {noreply, State3};
 
-handle_info({nodedown, _Node}, State) ->
-    %% Ignore, we are only caring about nodeup's
-    {noreply, State};
+handle_info({nodedown, Node}, State) ->
+    State2 = remote_node_status(Node, down, State),
+    {noreply, State2};
 
 handle_info({disk_log, _Node, Log, Info}, State) ->
     case Info of
@@ -830,3 +825,48 @@ report_inconsistency([{badrpc, _Reason} | Replies], Context, Status) ->
     report_inconsistency(Replies, Context, Status);
 report_inconsistency([], _Context, Status) ->
     Status.
+
+remote_node_status(Node, Status, State) ->
+    {ok, Nodes} = mnesia_schema:read_nodes(),
+    case lists:member(Node, Nodes) of
+	true ->
+	    update_node_status({Node, Status}, State);
+	_ ->
+	    State
+    end.
+
+update_node_status({Node, down}, State = #state{remote_node_status = RNodeS}) ->
+    RNodeS2 = lists:ukeymerge(1, [{Node, down}], RNodeS),
+    State#state{remote_node_status = RNodeS2};
+update_node_status({Node, up}, State = #state{remote_node_status = RNodeS}) ->
+    case lists:keyfind(Node, 1, RNodeS) of
+	{Node, down} ->
+	    RNodeS2 = lists:ukeymerge(1, [{Node, up}], RNodeS),
+	    State#state{remote_node_status = RNodeS2};
+	_ ->
+	    State
+    end.
+
+check_raise_conditon_nodeup(Node, State = #state{remote_node_status = RNodeS}) ->
+    case lists:keyfind(Node, 1, RNodeS) of
+	{Node, up} ->
+	    self() ! {check_nodeup, Node};
+	_ ->
+	    ignore
+    end,
+    State#state{remote_node_status = lists:keydelete(Node, 1, RNodeS)}.
+
+check_mnesia_down(Node, State = #state{remote_node_status = RNodeS}) ->
+    %% Check if the network has been partitioned
+    %% due to communication failure.
+
+    HasDown   = mnesia_recover:has_mnesia_down(Node),
+    ImRunning = mnesia_lib:is_running(),
+    if
+	%% If I'm not running the test will be made later.
+	HasDown == true, ImRunning == yes ->
+	    spawn_link(?MODULE, detect_partitioned_network, [self(), Node]),
+	    State#state{remote_node_status = lists:keydelete(Node, 1, RNodeS)};
+	true ->
+	    State
+    end.
diff --git a/lib/mnesia/src/mnesia_recover.erl b/lib/mnesia/src/mnesia_recover.erl
index 7aa03bda37..0548a25ebf 100644
--- a/lib/mnesia/src/mnesia_recover.erl
+++ b/lib/mnesia/src/mnesia_recover.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
 %%
 %% The 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/mnesia/src/mnesia_subscr.erl b/lib/mnesia/src/mnesia_subscr.erl
index 8f78dc55e8..9272211ad2 100644
--- a/lib/mnesia/src/mnesia_subscr.erl
+++ b/lib/mnesia/src/mnesia_subscr.erl
@@ -204,7 +204,9 @@ what(Tab, Tid, Obj, write, undefined) ->
 	    {mnesia_table_event, {write, Tab, Obj, Old, Tid}};
 	{'EXIT', _} ->
 	    ignore
-    end.
+    end;
+what(Tab, Tid, Obj, write, Old) ->
+    {mnesia_table_event, {write, Tab, Obj, Old, Tid}}.
 
 deliver(_, ignore) -> 
     ok;
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index e54e5c4e88..af658150da 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -181,9 +181,10 @@ mnesia_down(Node) ->
     %% mnesia_monitor takes care of the sync
     case whereis(?MODULE) of
 	undefined ->
-	    mnesia_monitor:mnesia_down(?MODULE, {Node, []});
+	    mnesia_monitor:mnesia_down(?MODULE, Node);
 	Pid ->
-	    Pid ! {mnesia_down, Node}
+	    Pid ! {mnesia_down, Node},
+	    ok
     end.
 
 prepare_checkpoint(Nodes, Cp) ->
@@ -403,7 +404,9 @@ doit_loop(#state{coordinators=Coordinators,participants=Participants,supervisor=
 	    Tids = gb_trees:keys(Participants),
 	    reconfigure_participants(N, gb_trees:values(Participants)),
 	    NewState = clear_fixtable(N, State),
-	    mnesia_monitor:mnesia_down(?MODULE, {N, Tids}),
+
+	    mnesia_locker:mnesia_down(N, Tids),
+	    mnesia_monitor:mnesia_down(?MODULE, N),
 	    doit_loop(NewState);
 
 	{From, {unblock_me, Tab}} ->
diff --git a/lib/mnesia/test/mnesia_SUITE.erl b/lib/mnesia/test/mnesia_SUITE.erl
index e0004ecb51..921ebb71e9 100644
--- a/lib/mnesia/test/mnesia_SUITE.erl
+++ b/lib/mnesia/test/mnesia_SUITE.erl
@@ -21,6 +21,7 @@
 -module(mnesia_SUITE).
 -author('[email protected]').
 -compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
 -include("mnesia_test_lib.hrl").
 
 init_per_testcase(Func, Conf) ->
@@ -50,7 +51,7 @@ suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames,2}]}]}].
 %% and do not involve the normal test machinery.
 
 all() -> 
-    [{group, light}, {group, medium}, {group, heavy},
+    [app, appup, {group, light}, {group, medium}, {group, heavy},
      clean_up_suite].
 
 groups() -> 
@@ -144,6 +145,18 @@ silly() ->
     
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%% Test structure of the mnesia application resource file
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(mnesia).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Test that all required versions have appup directives
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(mnesia).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 clean_up_suite(doc) -> ["Not a test case only kills mnesia and nodes, that where" 
 			"started during the tests"];
 clean_up_suite(suite) ->
diff --git a/lib/mnesia/test/mnesia_consistency_test.erl b/lib/mnesia/test/mnesia_consistency_test.erl
index 922b89ec2b..a76a0116d5 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The 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,6 @@ all() ->
      {group, consistency_after_move_replica},
      {group, consistency_after_transform_table},
      consistency_after_change_table_copy_type,
-     {group, consistency_after_fallback},
      {group, consistency_after_restore},
      consistency_after_rename_of_node,
      {group, checkpoint_retainer_consistency},
@@ -99,10 +98,14 @@ groups() ->
       [{group, updates_during_checkpoint_activation},
        {group, updates_during_checkpoint_iteration},
        {group, load_table_with_activated_checkpoint},
-       {group,
-	add_table_copy_to_table_checkpoint}]},
+       {group, add_table_copy_to_table_checkpoint},
+       {group, consistency_after_fallback}
+      ]},
      {updates_during_checkpoint_activation, [],
-      [updates_during_checkpoint_activation_2_ram,
+      [updates_during_checkpoint_activation_1_ram,
+       updates_during_checkpoint_activation_1_disc,
+       updates_during_checkpoint_activation_1_disc_only,
+       updates_during_checkpoint_activation_2_ram,
        updates_during_checkpoint_activation_2_disc,
        updates_during_checkpoint_activation_2_disc_only,
        updates_during_checkpoint_activation_3_ram,
@@ -730,6 +733,18 @@ consistency_after_rename_of_node(doc) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+updates_during_checkpoint_activation_1_ram(suite) -> [];
+updates_during_checkpoint_activation_1_ram(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(ram_copies, 1, Config).
+
+updates_during_checkpoint_activation_1_disc(suite) -> [];
+updates_during_checkpoint_activation_1_disc(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(disc_copies, 1, Config).
+
+updates_during_checkpoint_activation_1_disc_only(suite) -> [];
+updates_during_checkpoint_activation_1_disc_only(Config) when is_list(Config) ->
+    updates_during_checkpoint_activation(disc_only_copies, 1, Config).
+
 updates_during_checkpoint_activation_2_ram(suite) -> [];
 updates_during_checkpoint_activation_2_ram(Config) when is_list(Config) ->
     updates_during_checkpoint_activation(ram_copies, 2, Config).
@@ -771,7 +786,8 @@ updates_during_checkpoint_activation(ReplicaType,NodeConfig,Config) ->
     timer:sleep(timer:seconds(Delay)),
 
     {ok, CPName, _NodeList} =
-        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)}]),
+        mnesia:activate_checkpoint([{max, mnesia:system_info(tables)},
+				    {ram_overrides_dump, true}]),
     timer:sleep(timer:seconds(Delay)),
 
     %% Stop tpcb
diff --git a/lib/mnesia/test/mnesia_dirty_access_test.erl b/lib/mnesia/test/mnesia_dirty_access_test.erl
index 6017092095..519b4bb052 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The 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,6 +198,11 @@ dirty_update_counter(Config, Storage) ->
     ?match(1,  mnesia:dirty_update_counter({Tab, foo}, 1)),
     ?match([{Tab, foo,1}], mnesia:dirty_read({Tab,foo})),
 
+    ?match({ok,_}, mnesia:subscribe({table, Tab, detailed})),
+
+    ?match(2, mnesia:dirty_update_counter({Tab, foo}, 1)),
+    ?match([{Tab, foo,2}], mnesia:dirty_read({Tab,foo})),
+
     ?verify_mnesia(Nodes, []).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/mnesia/test/mnesia_durability_test.erl b/lib/mnesia/test/mnesia_durability_test.erl
index 4434abaa1e..366fda7044 100644
--- a/lib/mnesia/test/mnesia_durability_test.erl
+++ b/lib/mnesia/test/mnesia_durability_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
 %%
 %% The 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,19 +48,19 @@ groups() ->
        load_directly_when_all_are_ram_copiesB,
        {group, late_load_when_all_are_ram_copies_on_ram_nodes},
        load_when_last_replica_becomes_available,
-       load_when_we_have_down_from_all_other_replica_nodes,
+       load_when_down_from_all_other_replica_nodes,
        late_load_transforms_into_disc_load,
        late_load_leads_to_hanging,
        force_load_when_nobody_intents_to_load,
        force_load_when_someone_has_decided_to_load,
-       force_load_when_someone_else_already_has_loaded,
+       force_load_when_someone_else_has_loaded,
        force_load_when_we_has_loaded,
        force_load_on_a_non_local_table,
        force_load_when_the_table_does_not_exist,
        {group, load_tables_with_master_tables}]},
      {late_load_when_all_are_ram_copies_on_ram_nodes, [],
-      [late_load_when_all_are_ram_copies_on_ram_nodes1,
-       late_load_when_all_are_ram_copies_on_ram_nodes2]},
+      [late_load_all_ram_cs_ram_nodes1,
+       late_load_all_ram_cs_ram_nodes2]},
      {load_tables_with_master_tables, [],
       [master_nodes, starting_master_nodes,
        master_on_non_local_tables,
@@ -292,8 +292,8 @@ load_directly_when_all_are_ram_copiesB(Config) when is_list(Config) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-late_load_when_all_are_ram_copies_on_ram_nodes1(suite) -> [];
-late_load_when_all_are_ram_copies_on_ram_nodes1(Config) when is_list(Config) ->
+late_load_all_ram_cs_ram_nodes1(suite) -> [];
+late_load_all_ram_cs_ram_nodes1(Config) when is_list(Config) ->
     [N1, N2] = mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
 						  delete_schema,
 						  {reload_appls, [mnesia]}],
@@ -303,8 +303,8 @@ late_load_when_all_are_ram_copies_on_ram_nodes1(Config) when is_list(Config) ->
 				      2, Config, ?FILE, ?LINE),
     Res.
 
-late_load_when_all_are_ram_copies_on_ram_nodes2(suite) -> [];
-late_load_when_all_are_ram_copies_on_ram_nodes2(Config) when is_list(Config) ->
+late_load_all_ram_cs_ram_nodes2(suite) -> [];
+late_load_all_ram_cs_ram_nodes2(Config) when is_list(Config) ->
     [N1, N2, N3] = mnesia_test_lib:prepare_test_case([{init_test_case, [mnesia]},
 						      delete_schema,
 						      {reload_appls, [mnesia]}],
@@ -439,13 +439,13 @@ load_when_last_replica_becomes_available(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-load_when_we_have_down_from_all_other_replica_nodes(doc) ->
+load_when_down_from_all_other_replica_nodes(doc) ->
     ["The table can be loaded if this node was the last one surviving. ",
      "Check this by having N1, N2, N3 and a table replicated on all those ",
      "nodes. Then kill them in the N1, N2, N3 order. Then start N3 and ",
      "verify that the table is available with correct contents."];
-load_when_we_have_down_from_all_other_replica_nodes(suite) -> [];
-load_when_we_have_down_from_all_other_replica_nodes(Config) when is_list(Config) ->
+load_when_down_from_all_other_replica_nodes(suite) -> [];
+load_when_down_from_all_other_replica_nodes(Config) when is_list(Config) ->
     [N1, N2, N3] = Nodes = ?acquire_nodes(3, Config),
     ?match({atomic,ok},
            mnesia:create_table(test_rec,
@@ -773,14 +773,14 @@ wait_for_signal() ->
 	
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-force_load_when_someone_else_already_has_loaded(doc) ->
+force_load_when_someone_else_has_loaded(doc) ->
     ["Normal case. Do a force load when somebody else has loaded the table. ",
      "Start N1, N2, kill in N1, N2 order. Start N2 load the table, start N1 ",
      "force load. Did it work? (i.e: did N1 load the table from N2 as that",
      "one is the latest version and it is available on N2)"];
 
-force_load_when_someone_else_already_has_loaded(suite) -> [];
-force_load_when_someone_else_already_has_loaded(Config) when is_list(Config) ->
+force_load_when_someone_else_has_loaded(suite) -> [];
+force_load_when_someone_else_has_loaded(Config) when is_list(Config) ->
     [N1, N2] = Nodes = ?acquire_nodes(2, Config),
     Table = test_rec,
     Trec1 = #test_rec{key=1,val=111},
diff --git a/lib/mnesia/test/mnesia_evil_coverage_test.erl b/lib/mnesia/test/mnesia_evil_coverage_test.erl
index db23a39943..91820238e5 100644
--- a/lib/mnesia/test/mnesia_evil_coverage_test.erl
+++ b/lib/mnesia/test/mnesia_evil_coverage_test.erl
@@ -1869,14 +1869,19 @@ subscribe_extended(Config) when is_list(Config) ->
 	    {attributes, record_info(fields, tab)}],
     ?match({atomic, ok}, mnesia:create_table(Tab2, Def2)),
 
+    Tab3 = ctab,
+    Def3 = [{Storage, [N1, N2]}],
+    ?match({atomic, ok}, mnesia:create_table(Tab3, Def3)),
+
     ?match({ok, N1}, mnesia:subscribe({table, Tab1, detailed})),
     ?match({ok, N1}, mnesia:subscribe({table, Tab2, detailed})),
+    ?match({ok, N1}, mnesia:subscribe({table, Tab3, detailed})),
 
     ?match({error, {already_exists, _}}, mnesia:subscribe({table, Tab1, simple})),
     ?match({error, {badarg, {table, Tab1, bad}}}, mnesia:subscribe({table, Tab1, bad})),
 
     ?match({ok, N1}, mnesia:subscribe(activity)),
-    test_ext_sub(Tab1, Tab2),
+    test_ext_sub(Tab1, Tab2, Tab3),
     
     ?match({ok, N1}, mnesia:unsubscribe(activity)),
     ?match({ok, N1}, mnesia:subscribe({table, Tab1, detailed})),
@@ -1895,11 +1900,11 @@ subscribe_extended(Config) when is_list(Config) ->
 					     {max, [Tab1, Tab2]}]),
     ?match({ok, N1}, mnesia:subscribe({table, Tab2, detailed})),
     ?match({ok, N1}, mnesia:subscribe(activity)),
-    test_ext_sub(Tab1, Tab2),
+    test_ext_sub(Tab1, Tab2, Tab3),
 
     ?verify_mnesia(Nodes, []).
 
-test_ext_sub(Tab1, Tab2) ->    
+test_ext_sub(Tab1, Tab2, Tab3) ->
     %% The basics 
     Rec1 = {Tab1, 1, 0, 0},
     Rec2 = {Tab1, 1, 1, 0},
@@ -1940,7 +1945,6 @@ test_ext_sub(Tab1, Tab2) ->
     ?match({atomic, ok}, Delete(Tab1, 1)),
     ?match({mnesia_table_event, {delete, Tab1, {Tab1, 1}, [], {tid,_,S}}}, recv_event()),
     ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
-    
     ?match({ok, _N1}, mnesia:unsubscribe({table, Tab1, detailed})),
 
     %% BAG 
@@ -1969,6 +1973,17 @@ test_ext_sub(Tab1, Tab2) ->
     ?match({atomic, ok}, Delete(Tab2, 2)),
     ?match({mnesia_table_event, {delete, Tab2, {Tab2, 2}, [Rec4, Rec3], {tid,_,S}}}, recv_event()),
     ?match({mnesia_activity_event, {complete, {tid,_,S}}}, recv_event()),
+
+    %% COUNTERS
+
+    Rec5 = {Tab3, counter, 0},
+    ?match(ok, mnesia:dirty_write(Rec5)),
+    ?match({mnesia_table_event, {write, Tab3, Rec5, [], D}}, recv_event()),
+    ?match(1, mnesia:dirty_update_counter({Tab3, counter}, 1)),
+    ?match({mnesia_table_event, {write, Tab3, {Tab3,counter,1}, [Rec5], D}}, recv_event()),
+    ?match(ok, mnesia:dirty_delete({Tab3, counter})),
+    ?match({mnesia_table_event, {delete, Tab3, {Tab3,counter},
+				 [{Tab3,counter,1}], D}}, recv_event()),
     ok.
 
 
@@ -1987,7 +2002,7 @@ subscribe_standard(Config) when is_list(Config)->
     %% Check system events
     ?match({error, {badarg, foo}}, mnesia:unsubscribe(foo)),
     ?match({error, badarg}, mnesia:unsubscribe({table, foo})),
-    ?match(_, mnesia:unsubscribe(activity)),
+    mnesia:unsubscribe(activity),
 
     ?match({ok, N1}, mnesia:subscribe(system)),
     ?match({ok, N1}, mnesia:subscribe(activity)),
diff --git a/lib/mnesia/test/mnesia_frag_test.erl b/lib/mnesia/test/mnesia_frag_test.erl
index d3f6762af7..6695fbc880 100644
--- a/lib/mnesia/test/mnesia_frag_test.erl
+++ b/lib/mnesia/test/mnesia_frag_test.erl
@@ -461,7 +461,7 @@ nice_iter_access(Tab, FragNames, RawRead) ->
     ExpectedLast = lists:last(Keys),
     ?match(ExpectedLast, mnesia:last(Tab)),
     
-    ExpectedAllPrev = ['$end_of_table' | lists:reverse(tl(lists:reverse(Keys)))],
+    ExpectedAllPrev = ['$end_of_table' | lists:droplast(Keys)],
     ?match(ExpectedAllPrev, lists:map(fun(K) -> mnesia:prev(Tab, K) end, Keys)),
     
     ExpectedAllNext = tl(Keys) ++ ['$end_of_table'],
@@ -477,7 +477,7 @@ evil_iter_access(Tab, FragNames, RawRead) ->
     ExpectedLast = lists:last(Keys),
     ?match(ExpectedLast, mnesia:last(Tab)),
     
-    ExpectedAllPrev = ['$end_of_table' | lists:reverse(tl(lists:reverse(Keys)))],
+    ExpectedAllPrev = ['$end_of_table' | lists:droplast(Keys)],
     ?match(ExpectedAllPrev, lists:map(fun(K) -> mnesia:prev(Tab, K) end, Keys)),
     
     ExpectedAllNext = tl(Keys) ++ ['$end_of_table'],
diff --git a/lib/mnesia/test/mnesia_nice_coverage_test.erl b/lib/mnesia/test/mnesia_nice_coverage_test.erl
index 78eab67b11..4b28ac634f 100644
--- a/lib/mnesia/test/mnesia_nice_coverage_test.erl
+++ b/lib/mnesia/test/mnesia_nice_coverage_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -189,6 +189,7 @@ adm(Attrs, Node1, Node2) ->
     ?match({atomic, ok}, mnesia:move_table_copy(nice_tab, Node2, Node1)), 
 
     ?match(yes, mnesia:force_load_table(nice_counter_tab)), 
+    ?match(ok, mnesia:sync_log()),
     ?match(dumped, mnesia:dump_log()),
     ok.
 
diff --git a/lib/mnesia/test/mnesia_schema_recovery_test.erl b/lib/mnesia/test/mnesia_schema_recovery_test.erl
index 0fe26efd0b..2301b291c2 100644
--- a/lib/mnesia/test/mnesia_schema_recovery_test.erl
+++ b/lib/mnesia/test/mnesia_schema_recovery_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2014. All Rights Reserved.
 %%
 %% The 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,66 +49,69 @@ groups() ->
     [{interrupted_before_log_dump, [],
       [interrupted_before_create_ram,
        interrupted_before_create_disc,
-       interrupted_before_create_disc_only,
+       interrupted_before_create_do,
        interrupted_before_create_nostore,
        interrupted_before_delete_ram,
        interrupted_before_delete_disc,
-       interrupted_before_delete_disc_only,
-       interrupted_before_add_ram, interrupted_before_add_disc,
-       interrupted_before_add_disc_only,
+       interrupted_before_delete_do,
+       interrupted_before_add_ram,
+       interrupted_before_add_disc,
+       interrupted_before_add_do,
        interrupted_before_add_kill_copier,
        interrupted_before_move_ram,
        interrupted_before_move_disc,
-       interrupted_before_move_disc_only,
+       interrupted_before_move_do,
        interrupted_before_move_kill_copier,
        interrupted_before_delcopy_ram,
        interrupted_before_delcopy_disc,
-       interrupted_before_delcopy_disc_only,
+       interrupted_before_delcopy_do,
        interrupted_before_delcopy_kill_copier,
        interrupted_before_addindex_ram,
        interrupted_before_addindex_disc,
-       interrupted_before_addindex_disc_only,
+       interrupted_before_addindex_do,
        interrupted_before_delindex_ram,
        interrupted_before_delindex_disc,
-       interrupted_before_delindex_disc_only,
+       interrupted_before_delindex_do,
        interrupted_before_change_type_ram2disc,
-       interrupted_before_change_type_ram2disc_only,
+       interrupted_before_change_type_ram2do,
        interrupted_before_change_type_disc2ram,
-       interrupted_before_change_type_disc2disc_only,
-       interrupted_before_change_type_disc_only2ram,
-       interrupted_before_change_type_disc_only2disc,
+       interrupted_before_change_type_disc2do,
+       interrupted_before_change_type_do2ram,
+       interrupted_before_change_type_do2disc,
        interrupted_before_change_type_other_node,
        interrupted_before_change_schema_type]},
      {interrupted_after_log_dump, [],
       [interrupted_after_create_ram,
        interrupted_after_create_disc,
-       interrupted_after_create_disc_only,
+       interrupted_after_create_do,
        interrupted_after_create_nostore,
        interrupted_after_delete_ram,
        interrupted_after_delete_disc,
-       interrupted_after_delete_disc_only,
-       interrupted_after_add_ram, interrupted_after_add_disc,
-       interrupted_after_add_disc_only,
+       interrupted_after_delete_do,
+       interrupted_after_add_ram,
+       interrupted_after_add_disc,
+       interrupted_after_add_do,
        interrupted_after_add_kill_copier,
-       interrupted_after_move_ram, interrupted_after_move_disc,
-       interrupted_after_move_disc_only,
+       interrupted_after_move_ram,
+       interrupted_after_move_disc,
+       interrupted_after_move_do,
        interrupted_after_move_kill_copier,
        interrupted_after_delcopy_ram,
        interrupted_after_delcopy_disc,
-       interrupted_after_delcopy_disc_only,
+       interrupted_after_delcopy_do,
        interrupted_after_delcopy_kill_copier,
        interrupted_after_addindex_ram,
        interrupted_after_addindex_disc,
-       interrupted_after_addindex_disc_only,
+       interrupted_after_addindex_do,
        interrupted_after_delindex_ram,
        interrupted_after_delindex_disc,
-       interrupted_after_delindex_disc_only,
+       interrupted_after_delindex_do,
        interrupted_after_change_type_ram2disc,
-       interrupted_after_change_type_ram2disc_only,
+       interrupted_after_change_type_ram2do,
        interrupted_after_change_type_disc2ram,
-       interrupted_after_change_type_disc2disc_only,
-       interrupted_after_change_type_disc_only2ram,
-       interrupted_after_change_type_disc_only2disc,
+       interrupted_after_change_type_disc2do,
+       interrupted_after_change_type_do2ram,
+       interrupted_after_change_type_do2disc,
        interrupted_after_change_type_other_node,
        interrupted_after_change_schema_type]}].
 
@@ -128,8 +131,8 @@ interrupted_before_create_disc(Config) when is_list(Config) ->
     KillAt = {mnesia_dumper, dump_schema_op},
     interrupted_create(Config, disc_copies, all, KillAt).
 
-interrupted_before_create_disc_only(suite) -> [];
-interrupted_before_create_disc_only(Config) when is_list(Config) ->
+interrupted_before_create_do(suite) -> [];
+interrupted_before_create_do(Config) when is_list(Config) ->
     KillAt = {mnesia_dumper, dump_schema_op},
     interrupted_create(Config, disc_only_copies, all, KillAt).
 
@@ -148,8 +151,8 @@ interrupted_after_create_disc(Config) when is_list(Config) ->
     KillAt = {mnesia_dumper, post_dump},
     interrupted_create(Config, disc_copies, all, KillAt).
 
-interrupted_after_create_disc_only(suite) -> [];
-interrupted_after_create_disc_only(Config) when is_list(Config) ->
+interrupted_after_create_do(suite) -> [];
+interrupted_after_create_do(Config) when is_list(Config) ->
     KillAt = {mnesia_dumper, post_dump},
     interrupted_create(Config, disc_only_copies, all, KillAt).
 
@@ -204,8 +207,8 @@ interrupted_before_delete_disc(suite) -> [];
 interrupted_before_delete_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_delete(Config, disc_copies, Debug_Point).
-interrupted_before_delete_disc_only(suite) -> [];
-interrupted_before_delete_disc_only(Config) when is_list(Config) ->
+interrupted_before_delete_do(suite) -> [];
+interrupted_before_delete_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_delete(Config, disc_only_copies, Debug_Point).
 
@@ -217,8 +220,8 @@ interrupted_after_delete_disc(suite) -> [];
 interrupted_after_delete_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_delete(Config, disc_copies, Debug_Point).
-interrupted_after_delete_disc_only(suite) -> [];
-interrupted_after_delete_disc_only(Config) when is_list(Config) ->
+interrupted_after_delete_do(suite) -> [];
+interrupted_after_delete_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_delete(Config, disc_only_copies, Debug_Point).
 
@@ -249,8 +252,8 @@ interrupted_before_add_disc(suite) -> [];
 interrupted_before_add_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_add(Config, disc_copies, kill_reciever, Debug_Point).
-interrupted_before_add_disc_only(suite) -> [];
-interrupted_before_add_disc_only(Config) when is_list(Config) ->
+interrupted_before_add_do(suite) -> [];
+interrupted_before_add_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_add(Config, disc_only_copies, kill_reciever, Debug_Point).
 interrupted_before_add_kill_copier(suite) -> [];
@@ -266,8 +269,8 @@ interrupted_after_add_disc(suite) -> [];
 interrupted_after_add_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_add(Config, disc_copies, kill_reciever, Debug_Point).
-interrupted_after_add_disc_only(suite) -> [];
-interrupted_after_add_disc_only(Config) when is_list(Config) ->
+interrupted_after_add_do(suite) -> [];
+interrupted_after_add_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_add(Config, disc_only_copies, kill_reciever, Debug_Point).
 interrupted_after_add_kill_copier(suite) -> [];
@@ -327,8 +330,8 @@ interrupted_before_move_disc(suite) -> [];
 interrupted_before_move_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_move(Config, disc_copies, kill_reciever, Debug_Point).
-interrupted_before_move_disc_only(suite) -> [];
-interrupted_before_move_disc_only(Config) when is_list(Config) ->
+interrupted_before_move_do(suite) -> [];
+interrupted_before_move_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_move(Config, disc_only_copies, kill_reciever, Debug_Point).
 interrupted_before_move_kill_copier(suite) -> [];
@@ -344,8 +347,8 @@ interrupted_after_move_disc(suite) -> [];
 interrupted_after_move_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_move(Config, disc_copies, kill_reciever, Debug_Point).
-interrupted_after_move_disc_only(suite) -> [];
-interrupted_after_move_disc_only(Config) when is_list(Config) ->
+interrupted_after_move_do(suite) -> [];
+interrupted_after_move_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_move(Config, disc_only_copies, kill_reciever, Debug_Point).
 interrupted_after_move_kill_copier(suite) -> [];
@@ -408,8 +411,8 @@ interrupted_before_delcopy_disc(suite) -> [];
 interrupted_before_delcopy_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_delcopy(Config, disc_copies, kill_reciever, Debug_Point).
-interrupted_before_delcopy_disc_only(suite) -> [];
-interrupted_before_delcopy_disc_only(Config) when is_list(Config) ->
+interrupted_before_delcopy_do(suite) -> [];
+interrupted_before_delcopy_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_delcopy(Config, disc_only_copies, kill_reciever, Debug_Point).
 interrupted_before_delcopy_kill_copier(suite) -> [];
@@ -425,8 +428,8 @@ interrupted_after_delcopy_disc(suite) -> [];
 interrupted_after_delcopy_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_delcopy(Config, disc_copies, kill_reciever, Debug_Point).
-interrupted_after_delcopy_disc_only(suite) -> [];
-interrupted_after_delcopy_disc_only(Config) when is_list(Config) ->
+interrupted_after_delcopy_do(suite) -> [];
+interrupted_after_delcopy_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_delcopy(Config, disc_only_copies, kill_reciever, Debug_Point).
 interrupted_after_delcopy_kill_copier(suite) -> [];
@@ -487,8 +490,8 @@ interrupted_before_addindex_disc(suite) -> [];
 interrupted_before_addindex_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_addindex(Config, disc_copies, Debug_Point).
-interrupted_before_addindex_disc_only(suite) -> [];
-interrupted_before_addindex_disc_only(Config) when is_list(Config) ->
+interrupted_before_addindex_do(suite) -> [];
+interrupted_before_addindex_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_addindex(Config, disc_only_copies, Debug_Point).
 
@@ -500,8 +503,8 @@ interrupted_after_addindex_disc(suite) -> [];
 interrupted_after_addindex_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_addindex(Config, disc_copies, Debug_Point).
-interrupted_after_addindex_disc_only(suite) -> [];
-interrupted_after_addindex_disc_only(Config) when is_list(Config) ->
+interrupted_after_addindex_do(suite) -> [];
+interrupted_after_addindex_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_addindex(Config, disc_only_copies, Debug_Point).
 
@@ -555,8 +558,8 @@ interrupted_before_delindex_disc(suite) -> [];
 interrupted_before_delindex_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_delindex(Config, disc_copies, Debug_Point).
-interrupted_before_delindex_disc_only(suite) -> [];
-interrupted_before_delindex_disc_only(Config) when is_list(Config) ->
+interrupted_before_delindex_do(suite) -> [];
+interrupted_before_delindex_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_delindex(Config, disc_only_copies, Debug_Point).
 
@@ -568,8 +571,8 @@ interrupted_after_delindex_disc(suite) -> [];
 interrupted_after_delindex_disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_delindex(Config, disc_copies, Debug_Point).
-interrupted_after_delindex_disc_only(suite) -> [];
-interrupted_after_delindex_disc_only(Config) when is_list(Config) ->
+interrupted_after_delindex_do(suite) -> [];
+interrupted_after_delindex_do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_delindex(Config, disc_only_copies, Debug_Point).
 
@@ -613,24 +616,24 @@ interrupted_before_change_type_ram2disc(suite) -> [];
 interrupted_before_change_type_ram2disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_change_type(Config, ram_copies, disc_copies, changer, Debug_Point).
-interrupted_before_change_type_ram2disc_only(suite) -> [];
-interrupted_before_change_type_ram2disc_only(Config) when is_list(Config) ->
+interrupted_before_change_type_ram2do(suite) -> [];
+interrupted_before_change_type_ram2do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_change_type(Config, ram_copies, disc_only_copies, changer, Debug_Point).    
 interrupted_before_change_type_disc2ram(suite) -> [];
 interrupted_before_change_type_disc2ram(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_change_type(Config, disc_copies, ram_copies, changer, Debug_Point).
-interrupted_before_change_type_disc2disc_only(suite) -> [];
-interrupted_before_change_type_disc2disc_only(Config) when is_list(Config) ->
+interrupted_before_change_type_disc2do(suite) -> [];
+interrupted_before_change_type_disc2do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_change_type(Config, disc_copies, disc_only_copies, changer, Debug_Point).
-interrupted_before_change_type_disc_only2ram(suite) -> [];
-interrupted_before_change_type_disc_only2ram(Config) when is_list(Config) ->
+interrupted_before_change_type_do2ram(suite) -> [];
+interrupted_before_change_type_do2ram(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_change_type(Config, disc_only_copies, ram_copies, changer, Debug_Point).
-interrupted_before_change_type_disc_only2disc(suite) -> [];
-interrupted_before_change_type_disc_only2disc(Config) when is_list(Config) ->
+interrupted_before_change_type_do2disc(suite) -> [];
+interrupted_before_change_type_do2disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, dump_schema_op},    
     interrupted_change_type(Config, disc_only_copies, disc_copies, changer, Debug_Point).
 interrupted_before_change_type_other_node(suite) -> [];
@@ -642,24 +645,24 @@ interrupted_after_change_type_ram2disc(suite) -> [];
 interrupted_after_change_type_ram2disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_change_type(Config, ram_copies, disc_copies, changer, Debug_Point).
-interrupted_after_change_type_ram2disc_only(suite) -> [];
-interrupted_after_change_type_ram2disc_only(Config) when is_list(Config) ->
+interrupted_after_change_type_ram2do(suite) -> [];
+interrupted_after_change_type_ram2do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_change_type(Config, ram_copies, disc_only_copies, changer, Debug_Point).    
 interrupted_after_change_type_disc2ram(suite) -> [];
 interrupted_after_change_type_disc2ram(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_change_type(Config, disc_copies, ram_copies, changer, Debug_Point).
-interrupted_after_change_type_disc2disc_only(suite) -> [];
-interrupted_after_change_type_disc2disc_only(Config) when is_list(Config) ->
+interrupted_after_change_type_disc2do(suite) -> [];
+interrupted_after_change_type_disc2do(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_change_type(Config, disc_copies, disc_only_copies, changer, Debug_Point).
-interrupted_after_change_type_disc_only2ram(suite) -> [];
-interrupted_after_change_type_disc_only2ram(Config) when is_list(Config) ->
+interrupted_after_change_type_do2ram(suite) -> [];
+interrupted_after_change_type_do2ram(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_change_type(Config, disc_only_copies, ram_copies, changer, Debug_Point).
-interrupted_after_change_type_disc_only2disc(suite) -> [];
-interrupted_after_change_type_disc_only2disc(Config) when is_list(Config) ->
+interrupted_after_change_type_do2disc(suite) -> [];
+interrupted_after_change_type_do2disc(Config) when is_list(Config) ->
     Debug_Point = {mnesia_dumper, post_dump},    
     interrupted_change_type(Config, disc_only_copies, disc_copies, changer, Debug_Point).
 interrupted_after_change_type_other_node(suite) -> [];
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index d7a132bc1a..064ba43791 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.9
+MNESIA_VSN = 4.11
diff --git a/lib/observer/doc/src/Makefile b/lib/observer/doc/src/Makefile
index 0f564d3299..baeeeb1c65 100644
--- a/lib/observer/doc/src/Makefile
+++ b/lib/observer/doc/src/Makefile
@@ -34,6 +34,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
+XML_REF1_FILES = \
+	cdv.xml
 XML_REF3_FILES = \
 	crashdump.xml \
 	observer.xml \
@@ -59,19 +61,14 @@ BOOK_FILES = book.xml
 
 XML_FILES = \
 	$(BOOK_FILES) $(XML_CHAPTER_FILES) \
-	$(XML_PART_FILES) $(XML_REF3_FILES) \
+	$(XML_PART_FILES) $(XML_REF1_FILES) $(XML_REF3_FILES) \
 	$(XML_APPLICATION_FILES) $(XML_REF6_FILES)
 
-ONLY_HTML_FILE = \
-	crashdump_help.html
+ONLY_HTML_FILE =
 
 GIF_FILES = \
 	et_processes.gif \
 	et_modsprocs.gif \
-	etop_main.gif \
-	etop_5.gif \
-	etop_lines.gif \
-	etop_opt.gif \
 	note.gif
 
 # ----------------------------------------------------
@@ -81,6 +78,7 @@ HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
 
 INFO_FILE = ../../info
 
+MAN1_FILES = $(XML_REF1_FILES:%.xml=$(MAN1DIR)/%.1)
 MAN3_FILES = $(XML_REF3_FILES:%.xml=$(MAN3DIR)/%.3)
 MAN6_FILES = $(XML_REF6_FILES:%_app.xml=$(MAN6DIR)/%.6)
 
@@ -110,6 +108,7 @@ html: gifs $(HTML_REF_MAN_FILE) $(ONLY_HTML_FILE:%=$(HTMLDIR)/%)
 
 clean clean_docs:
 	rm -rf $(HTMLDIR)/*
+	rm -f $(MAN1DIR)/*
 	rm -f $(MAN3DIR)/*
 	rm -f $(MAN6DIR)/*
 	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
@@ -119,7 +118,7 @@ clean clean_docs:
 $(HTMLDIR)/$(ONLY_HTML_FILE):
 	$(INSTALL_DATA) $(ONLY_HTML_FILE) $@
 
-man: $(MAN3_FILES) $(MAN6_FILES)
+man: $(MAN1_FILES) $(MAN3_FILES) $(MAN6_FILES)
 
 gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
 
@@ -139,6 +138,8 @@ release_docs_spec: docs
 	$(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"
diff --git a/lib/observer/doc/src/book.xml b/lib/observer/doc/src/book.xml
index 7ecb153b2f..c47852e697 100644
--- a/lib/observer/doc/src/book.xml
+++ b/lib/observer/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/cdv.xml b/lib/observer/doc/src/cdv.xml
new file mode 100644
index 0000000000..fc8f16bc4e
--- /dev/null
+++ b/lib/observer/doc/src/cdv.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE comref SYSTEM "comref.dtd">
+
+<comref>
+  <header>
+    <copyright>
+      <year>2013</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>The cdv program</title>
+    <prepared>Siri Hansen</prepared>
+    <responsible>Siri Hansen</responsible>
+    <docno></docno>
+    <approved></approved>
+    <checked></checked>
+    <date>2013-10-015</date>
+    <rev>PA1</rev>
+    <file>cdv.xml</file>
+  </header>
+  <com>cdv</com>
+  <comsummary>Script used for starting the Crashdump Viewer from the
+  OS command line.
+  </comsummary>
+
+  <description>
+    <p>The <c>cdv</c> shell script can be found under the <c>priv</c>
+    directory of the <c>observer</c> application. The script is used
+    for starting the Crashdump Viewer tool from the OS command
+    line.</p>
+    <p>For Windows users, <c>cdv.bat</c> can be found in the same
+    location.</p>
+  </description>
+
+  <funcs>
+    <func>
+      <name>cdv [file]</name>
+      <fsummary>Start the Crashdump Viewer and load the given file.</fsummary>
+      <desc>
+	<p>The <c>file</c> arguments is optional. If not given, a file
+	dialog will pop up allowing the user to select a crashdump
+	from the file system.</p>
+      </desc>
+    </func>
+  </funcs>
+
+</comref>
diff --git a/lib/observer/doc/src/crashdump.xml b/lib/observer/doc/src/crashdump.xml
index b6056c2ed1..27e42e83b7 100644
--- a/lib/observer/doc/src/crashdump.xml
+++ b/lib/observer/doc/src/crashdump.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2003</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -31,13 +31,14 @@
     <checked></checked>
     <date>2003-03-10</date>
     <rev>PA1</rev>
-    <file>crashdump.sgml</file>
+    <file>crashdump.xml</file>
   </header>
   <module>crashdump_viewer</module>
-  <modulesummary>A HTML based tool for browsing Erlang crashdumps.</modulesummary>
+  <modulesummary>A WxWidgets based tool for browsing Erlang
+  crashdumps.</modulesummary>
   <description>
-    <p>The Crashdump Viewer is an HTML based tool for browsing Erlang
-      crashdumps. Crashdump Viewer runs under the WebTool application.</p>
+    <p>The Crashdump Viewer is a WxWidgets based tool for browsing Erlang
+      crashdumps.</p>
 
     <p>See the <seealso marker="crashdump_ug">user's guide</seealso>
     for more information about how to get started with the Crashdump
@@ -46,16 +47,26 @@
   <funcs>
     <func>
       <name>start() -> ok</name>
+      <name>start(File) -> ok</name>
       <fsummary>Start the crashdump_viewer</fsummary>
+      <type>
+        <v>File = string()</v>
+	<d>The file name of the crashdump.</d>
+      </type>
       <desc>
-        <p>This function starts the <c>crashdump_viewer</c>.</p>
+        <p>This function starts the <c>crashdump_viewer</c> GUI and
+        loads the given crashdump.</p>
+
+	<p>If <c>File</c> is not given, a file dialog will be opened
+	where the crashdump can be selected.</p>
       </desc>
     </func>
     <func>
       <name>stop() -> ok</name>
       <fsummary>Stop the crashdump_viewer</fsummary>
       <desc>
-        <p>This function stops the <c>crashdump_viewer</c>.</p>
+        <p>This function stops the <c>crashdump_viewer</c> and closes
+        all GUI windows.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/observer/doc/src/crashdump_help.html b/lib/observer/doc/src/crashdump_help.html
deleted file mode 100644
index 268b9495d6..0000000000
--- a/lib/observer/doc/src/crashdump_help.html
+++ /dev/null
@@ -1,307 +0,0 @@
-</<!doctype chapter PUBLIC "-//Stork//DTD chapter//EN">
-<!-- 
- ``The 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$
--->
-<html>
-<head>
-<title>Crashdump Viewer help</title>
-</head>
-<body BGCOLOR="#FFFFFF">
-<center>
-<a HREF="http://www.erlang.se"><img BORDER=0 ALT="[Erlang Systems]" 
-SRC="min_head.gif"></a>
-</center>
-<blockquote>
-  <h2>Information pages</h2>
-
-    <p>Each menu item points to an information page. If no information
-    is found for an item, the page will simply say "No information
-    found". The reason for not finding any information about an item
-    can be that the dump is truncated, that it is a dump from an old
-    OTP release in which this item was not written or that the item
-    simply wasn't present in the system at the point of failure.
-
-    <p>If the dump was truncated, a warning is displayed.
-
-    <p>Even if some information about an item exists, there might be
-    empty fields if the dump originates from an old OTP release.
-
-    <p>The value "-1" in any field means "unknown", and in most cases
-    it means that the dump was truncated somewhere around this field.
-
-    <p>Only some of the fields in the different information pages are
-    described here. These are fields that to not exist in the raw
-    crashdump, or in some way differs from the fields in the raw
-    crashdump. Details about other field can be found in the user's
-    guide for the Erlang runtime system, in the chapter "How to
-    interpret the Erlang crash dumps". A link to this chapter can be
-    found in the Crashdump Viewer's menu under documentation, and
-    there are also direct links from the specific sections below to
-    related information in "How to interpret the Erlang crash dumps".
-
-    <a NAME="general_info">
-    <h3>General information</h3>
-	
-      <p>This is the first page shown when a new dump is loaded into
-      the system. It shows a very short overview of the dump.
-
-      <p>'Node name' will only exist in dumps originating from OTP R9C
-      and later. 
-
-      <p>The following fields are not described in the Erlang runtime
-      system user's guide:
-
-      <dl>
-	<dt><strong>Crashdump created on</strong></dt>
-	<dd>Time of failure.</dd>
-
-	<dt><strong>Memory allocated</strong></dt>
-	<dd>The total number of bytes allocated, equivalent to
-	<code>c:memory(total)</code>. This will only be present in
-	dumps from OTP R9C and later.</dd>
-
-	<dt><strong>Memory maximum</strong></dt>
-	<dd>The maximum number of bytes that has been allocated
-	during the lifetime of the originating node. This will not be
-	present in dumps older than OTP R9C, and even in newer
-	releases it is only shown if the Erlang runtime system was run
-	instrumented.</dd>
-
-	<dt><strong>Atoms</strong></dt>
-	<dd>If at all available in the dump, this is the total
-	number of atoms in the atom table. If the size of the atom
-	table is not available, the number of atoms visible in the
-	dump is presented.</dd>
-
-	<dt><strong>Processes, ETS tables and Funs</strong></dt>
-	<dd>The number of processes, ETS tables and funs visible in
-	the dump.</dd>
-      </dl>
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#general_info>
-       More...</a>
-     </center>
-    
-
-    <a NAME="processes">
-    <h3>Processes</h3>
-	
-      <p>The Process Information page shows a list of all processes
-      found in the crashdump, including some short information about
-      each process. By default the processes are sorted by their
-      pids. To sort by other topic, click any heading in the process
-      table.
-
-      <p>Detailed information about a specific process is shown when
-      the pid is clicked.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#processes>
-       More...</a>
-     </center>
-
-    
-    
-    <a NAME="ports">
-    <h3>Ports</h3>
-      
-      <p>The port information page shows all port information found in
-      the dump.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#ports>
-       More...</a>
-     </center>
-
-    
-
-    <a NAME="ets_tables"><a NAME="internal_ets_tables">
-    <h3>ETS tables</h3>
-
-      <p>The ETS table information page shows all ETS table
-      information found in the dump. The 'Id' is the same as the
-      'Table' field found in the raw crashdump, and 'Memory' is the
-      'Words' field from the raw crashdump translated into
-      bytes. 'Type' is the type of table, and it can be either "hash"
-      or "tree". For tree tables there will be no value in the
-      'Bucket' field.
-
-      <p>Clicking a pid in the 'Owner' column takes you to the
-      detailed information about the process owning the ETS table.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#ets_tables>
-       More...</a>
-     </center>
-
-
-    <a NAME="timers">
-    <h3>Timers</h3>
-
-      <p>The timer information page shows all timer information found
-      in the dump.
-
-      <p>Clicking a pid in the 'Owner' column takes you to the
-      detailed information about the process owning the timer.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#timers>
-       More...</a>
-     </center>
-
-
-
-    <a NAME="funs">
-    <h3>Fun table</h3>
-
-      <p>The Fun table information page shows all Fun information
-      found in the dump. Fun information will only exist in dumps from
-      OTP R8B or later.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#funs>
-       More...</a>
-     </center>
-
-    
-
-    <a NAME="atoms">
-    <h3>Atoms</h3>
-
-      <p>The atoms information page lists all atoms found in the
-      dump. The last created atom is listed first.
-
-      <p>Note that if the dump is from OTP R8B or earlier, the raw
-      dump lists the atoms in the opposite order and the Crashdump
-      Viewer reverses them. This means that there is no problem if the
-      dump is not truncated. However, if the dump is truncated, the
-      last atoms might not be shown at all!!
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#atoms>
-       More...</a>
-     </center>
-
-
-    <a NAME="distribution_info">
-    <h3>Distribution information</h3>
-
-      <p>The distribution information page shows all distribution
-      information found in the dump.
-
-      <p>If the page shows "Not alive", it means that the node was not
-      distributed.
-
-      <p>It the node was distributed, all connected nodes are
-      shown. Visible nodes are alive nodes with a living connection to
-      the originating node. Hidden nodes are the same as visible
-      nodes, except they are started with the "-hidden" flag. Not
-      connected nodes are nodes that are not connected to the
-      originating node anymore, but references (i.e. process or port
-      identitifiers) exist.
-
-      <p>'Links/Monitors' may contain information about links or
-      monitors between processes on the originating node and the
-      connected node.
-
-      <p>'Extra Info' may contain debug information (i.e. special
-      information written if the emulator is debug compiled) or error
-      information.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#distribution_info>
-       More...</a>
-     </center>
-
-
-    <a NAME="loaded_modules">
-    <h3>Loaded modules</h3>
-
-      <p>The loaded modules information page shows all modules that
-      were loaded on the originating node, and the current size of the
-      code. If old code exsits, the old size is also shown.
-
-      <p>Detailed information about a specific module is shown when
-      the module name is clicked.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#loaded_modules>
-       More...</a>
-     </center>
-
-
-    <a NAME="internal_tables">
-    <h3>Internal tables</h3>
-
-      <p>Internal tables are shown in two information pages: hash
-      tables and index tables.
-
-     <center>
-       <a href=/crashdump_erts_doc/crash_dump.html#internal_tables>
-       More...</a>
-     </center>
-
-
-    <a NAME="memory">
-    <h3>Memory</h3>
-
-      <p>Memory information is divided into three pages.
-
-      <p>The first page, <strong>Memory</strong>, shows information
-      similar to what you can obtain on a living node with
-      <code>c:memory()</code>. This will only be present in dumps from
-      OTP R9C and later.  
-      <a href=/crashdump_erts_doc/crash_dump.html#memory>More...</a>
-
-      <p>The <strong>Allocated areas</strong> page shows information
-      similar to what you can obtain on a living node with
-      <code>erlang:system_info(allocated_areas)</code>. 
-      <a href=/crashdump_erts_doc/crash_dump.html#allocated_areas>More...</a>
-
-      <p>The <strong>Allocator information</strong> page shows
-      information about allocators. The contents of the page will vary
-      with the version. 
-      <a href=/crashdump_erts_doc/crash_dump.html#allocator>More...</a>
-
-     <center>
-       
-     </center>
-
-
-    <h3>Documentation</h3>
-
-      <p>'Crashdump Viewer help' is this document.
-
-      <p>'How to interpret Erlang crashdumps' is a document from the
-      Erlang runtime system describing details in the raw
-      crashdumps. Here you will also find information about each
-      single field in the different information pages.
-
-</blockquote>
-<center>
-<hr>
-<font SIZE=-1>
-
-Copyright &copy; 1991-2003
-<a HREF="http://www.erlang.se">Ericsson Utvecklings AB</a><br>
-<!--#include virtual="/ssi/otp_footer.html"-->
-</font>
-</center>
-</body>
-</html>
diff --git a/lib/observer/doc/src/crashdump_ug.xml b/lib/observer/doc/src/crashdump_ug.xml
index 8aef1ffdf0..d22fb4cc40 100644
--- a/lib/observer/doc/src/crashdump_ug.xml
+++ b/lib/observer/doc/src/crashdump_ug.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -13,12 +13,11 @@
       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>Crashdump Viewer</title>
@@ -31,9 +30,9 @@
 
   <section>
     <title>Introduction</title>
-    <p>The Crashdump Viewer is an HTML based tool for browsing Erlang
-      crashdumps. Crashdump Viewer runs under the WebTool application.
-      </p>
+    <p>The Crashdump Viewer is a WxWidgets based tool for browsing
+    Erlang crashdumps.
+    </p>
   </section>
 
   <section>
@@ -42,93 +41,357 @@
     <p>The easiest way to start Crashdump Viewer is to use the
     provided shell script named <c>cdv</c> with the full path to the
     erlang crashdump as an argument. The script can be found in the
-    priv directory of the <c>observer</c> application. This starts
-    WebTool, Crashdump Viewer and a web browser, and loads the given
-    file. The browser should then display a page named General
-    Information which shows a short summary of the information in
-    the crashdump.</p>
-
-    <p>The default browser is Internet Explorer on Windows, open on Mac OS X, 
-    or else Firefox. To use another browser, give the browser's start command
-    as the second argument to <c>cdv</c>. If the given browser name is
-    not known to Crashdump Viewer, the browser argument is executed as
-    a command with the start URL as the only argument.</p>
+    priv directory of the <c>observer</c> application. This starts the
+    Crashdump Viewer GUI and loads the given file. If no file name is
+    given, a file dialog will be opened where the file can be
+    selected.</p>
 
     <p>Under Windows the batch file <c>cdv.bat</c> can be used.</p>
 
     <p>It is also possible to start the Crashdump Viewer from within
     an erlang node by calling <seealso
-    marker="crashdump_viewer#start/0">crashdump_viewer:start/0</seealso>. This
-    will automatically start WebTool and display the web address where
-    WebTool can be found. See the documentation for the WebTool
-    application for further information about how to use WebTool.</p>
-
-    <p>Point your web browser to the address displayed, and you should
-      now see the start page of WebTool. At the top of the page, you
-      will see a link to "CrashDumpViewer". Click this link to get to
-      the start page for Crashdump Viewer. (Note that if webtool is on
-      localhost, you must configure your web browser to have direct
-      connection to the internet, or you must set no proxy for
-      localhost.)
-      </p>
-    <p>From the start page of Crashdump Viewer, push the "Load
-      Crashdump" button to load a crashdump into the tool. Then enter
-      the filename of the crashdump in the entry field and push the
-      "Ok" button. This will bring you to the General Information
-      page, i.e. the same page as the <c>cdv</c> script will open in
-      the browser.
-      </p>
-    <p>Crashdumps generated by OTP R9C and later are loaded directly
-      into the Crashdump Viewer, while dumps from earlier releases first
-      are translated by the Crashdump Translater. The Crashdump
-      Translater creates a new file with the same name as the original
-      crashdump, but with the extension <c>.translated</c>. If there is
-      no write access to the directory of the original file, you will be
-      asked to enter a new path and filename for the translated file.
-      </p>
+    marker="crashdump_viewer#start/0">crashdump_viewer:start/0</seealso>
+    or <seealso
+    marker="crashdump_viewer#start/1">crashdump_viewer:start/1</seealso>.</p>
   </section>
 
   <section>
-    <title>Navigating</title>
-    <p>The lefthand frame contains a menu. Menu folders can be
-      expanded and collapsed by clicking the folder picture. When a menu
-      item is clicked, the item information is shown in the big
-      information frame. 
-      </p>
-    <p>The filename frame above the information frame shows the full
-      name of the currently viewed Erlang crashdump.
-      </p>
-    <p>To load a new crashdump, click the "Load New Crashdump" button
-      in the menu frame.
-      </p>
-    <p>The various information shown in the information frame will
-      contain links to process identifiers (PIDs) and port
-      identifiers. Clicking one of these links will take you to the
-      detailed information page for the process or port in question. Use
-      the "Back" button in your browser to get back to the
-      startingpoint. If the process or port resided on a remote node,
-      there will be no information available. Clicking the link will
-      then take you to the information about the remote node.
-      </p>
+    <title>The graphical interface</title>
+
+    <p>The main window is opened when Crashdump Viewer has loaded a
+    crashdump. It contains a title bar, a menu bar, a number of
+    information panels and a status bar.</p>
+
+    <p>The title bar shows the name of the currently loaded
+    crashdump.</p>
+
+    <p>The menu bar contains a <em>File</em> menu and a <em>Help</em>
+    menu. From the File menu a new crashdump can be loaded or the tool
+    can be terminated. From the Help menu this user's guide and the
+    chapter "How to interpret the Erlang crash dumps" from the user's
+    guide for Erlang runtime system can be opened. "How to interpret
+    the Erlang crash dumps" describes the raw crashdumps in
+    detail. Here you will also find information about each single
+    field in the different information pages. This document can also
+    be found directly in the OTP online documentation, via the Erlang
+    runtime system user's guide.</p>
+
+    <p>The status bar at the bottom of the window will show a warning
+    if the currently loaded dump is truncated.</p>
+
+    <p>The centre area of the main window contains the information
+    panels. Each panel displays information about a specific item or a
+    list of items. A panel is selected by clicking the title of the
+    tab.</p>
+
+    <p>From panels that display lists of items, for example the
+    Processes- or the Ports panel, a new window with further
+    information can be opened by double clicking a row or by right
+    clicking the row and selecting an item from the drop down
+    menu. The new window is called a detail window. Detail windows can
+    be opened for processes, ports, nodes and modules.</p>
+
+    <p>The various information shown in a detail window might contain
+    links to processes or ports. Clicking one of these links will open
+    the detail window for the process or port in question. If the
+    process or port resided on a remote node, there will be no
+    information available. Clicking the link will then pop up a dialog
+    where you can choose whether to open the detail window for the
+    remote node or not.
+    </p>
+
+    <p>Some of the panels contain a left hand menu where sub items of
+    the panel's information area can be selected. Click on one of the
+    rows, and the information will be displayed in the right hand
+    information area.</p>
   </section>
 
   <section>
-    <title>Help</title>
-    <p>Further help on how to use the Crashdump Viewer tool can be
-      found in the tool's menu under 'Documentation':
-      </p>
-    <p>'Crashdump Viewer help' is a short document describing each
-      information page and any additional information that might occur,
-      compared to the raw dump described in 'How to interpret Erlang
-      crashdumps'.
-      </p>
-    <p>'How to interpret Erlang crashdumps' is a document from the
-      Erlang runtime system describing details in the raw
-      crashdumps. Here you will also find information about each single
-      field in the different information pages. This document can also
-      be found directly in the OTP online documentation, via the Erlang
-      runtime system user's guide.
-      </p>
+    <title>Data content</title>
+
+    <p>Each panel in the main window contains an information
+    page. If no information is found for an item, the page will be
+    empty. The reason for not finding any information about an item
+    can be that the dump is truncated, that it is a dump from an old
+    OTP release in which this item was not written or that the item
+    simply wasn't present in the system at the point of failure.</p>
+
+    <p>If the dump was truncated, a warning is displayed in the
+    status bar of the main window.</p>
+
+    <p>Even if some information about an item exists, there might be
+    empty fields if the dump originates from an old OTP release.</p>
+
+    <p>The value "-1" in any field means "unknown", and in most
+    cases it means that the dump was truncated somewhere around this
+    field.</p>
+
+    <p>The sections below describe some of the fields in the
+    different information panels. These are fields that do not exist
+    in the raw crashdump, or in some way differ from the fields in
+    the raw crashdump. Details about other fields can be found in
+    the user's guide for the Erlang runtime system, in the chapter
+    "How to interpret the Erlang crash dumps". That chapter can also
+    be opened from the Help menu in the Crashdump Viewer's main
+    window, and there are also direct links from the specific
+    sections below to related information in "How to interpret the
+    Erlang crash dumps".</p>
   </section>
-</chapter>
 
+  <section>
+    <marker id="general_info"/>
+    <title>General information</title>
+
+    <p>The <em>General information</em> panel shows a short overview
+    of the dump.</p>
+
+    <p>The following fields are not described in the Erlang runtime
+    system user's guide:</p>
+
+    <taglist>
+      <tag><em>Crashdump created on</em></tag>
+      <item>Time of failure.</item>
+
+      <tag><em>Memory allocated</em></tag>
+      <item>The total number of bytes allocated, equivalent to
+      <c>c:memory(total)</c>.</item>
+
+      <tag><em>Memory maximum</em></tag>
+      <item>The maximum number of bytes that has been allocated during
+      the lifetime of the originating node. This will only be shown if
+      the Erlang runtime system was run instrumented.</item>
+
+      <tag><em>Atoms</em></tag>
+      <item>If available in the dump, this is the total number of
+      atoms in the atom table. If the size of the atom table is not
+      available, the number of atoms visible in the dump is
+      presented.</item>
+
+      <tag><em>Processes, ETS tables and Funs</em></tag>
+      <item>The number of processes, ETS tables and funs visible in
+      the dump.</item>
+    </taglist>
+
+    <p>
+      <seealso marker="erts:crash_dump#general_info">More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="processes"/>
+    <title>Processes</title>
+
+    <p>The <em>Processes</em> panel shows a list of all processes
+    found in the crashdump, including some short information about
+    each process. By default the processes are sorted by their
+    pids. To sort by other topic, click the desired column
+    heading.</p>
+
+    <p>The <em>Memory</em> column shows the 'Memory' field which was
+    added to crashdumps in R16B01. This is the total amount of memory
+    used by the process. For crashdumps from earlier releases, this
+    column shows the 'Stack+heap' field. The value shown is always in
+    bytes.</p>
+
+    <p>To view detailed information about a specific process, double
+    click the row in the list or right click the row and select
+    "Properties for &lt;pid&gt;".</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#processes">More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="ports"/>
+    <title>Ports</title>
+
+    <p>The <em>Ports</em> panel is similar to the <em>Processes</em>
+    panel, except it lists all ports found in the crashdump.</p>
+
+    <p>To see more details about a specific port, dobule click the row
+    or right click it and select "Properties for &lt;port&gt;". From
+    the right click menu you can also select "Properties for
+    &lt;pid&gt;", where &lt;pid&gt; is the process connected to the
+    port.</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#ports">
+      More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="ets_tables"/><marker id="internal_ets_tables"/>
+    <title>ETS tables</title>
+
+    <p>The <em>ETS Tables</em> panel shows all ETS table information
+    found in the dump. The 'Id' is the same as the 'Table' field found
+    in the raw crashdump, and 'Memory' is the 'Words' field from the
+    raw crashdump translated into bytes. 'Type' is the type of table,
+    and it can be either "hash" or "tree". For tree tables there will
+    be no value in the 'Bucket' field.</p>
+
+    <p>To open the detailed information page about the owner process
+    of an ETS table, right click the row and select "Properties for
+    &lt;pid&gt;".</p>
+
+    <p>Double clicking a row in the ETS Tables panel has no
+    effect.</p>
+
+    <p>From the left hand menu you can also select to see internal ETS
+    tables.</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#ets_tables">
+      More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="timers"/>
+    <title>Timers</title>
+
+    <p>The <em>Timers</em> panel shows all timer information found in
+    the dump.</p>
+
+    <p>To open the detailed information page about the owner process
+    of a timer, right click the row and select "Properties for
+    &lt;pid&gt;".</p>
+
+    <p>Double clicking a row in the Timers panel has no effect.</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#timers">More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="funs"/>
+    <title>Funs</title>
+
+    <p>The <em>Funs</em> panel shows all Fun information found in the
+    dump.</p>
+
+    <p>To open the detailed information page about the module to which
+    the fun belongs, right click the row and select "Properties for
+    &lt;mod&gt;".</p>
+
+    <p>Double clicking a row in the Funs panel has no effect.</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#funs">More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="atoms"/>
+    <title>Atoms</title>
+
+    <p>The <em>Atoms</em> panel lists all atoms found in the dump. By
+    default the atoms are sorted in creation order from first to
+    last. This is opposite of the raw crashdump where atoms are listed
+    from last to first, meaning that if the dump was truncated in the
+    middle of the atom list only the last created atoms will be seen
+    in the <em>Atoms</em> panel.</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#atoms">More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="distribution_info"/>
+    <title>Nodes</title>
+
+    <p>The <em>Nodes</em> panel shows a list of all external erlang
+    nodes which are referenced from the crashdump.</p>
+
+    <p>If the page is empty it either means that the crashed node was
+    not distributed, that it was distributed but had no references to
+    other nodes or that the dump was truncated.</p>
+
+    <p>If the node was distributed, all referenced nodes are
+    shown. The column named <em>Connection type</em> shows if the node
+    is visible, hidden or not connected. Visible nodes are alive nodes
+    with a living connection to the originating node. Hidden nodes are
+    the same as visible nodes, except they are started with the
+    <c>-hidden</c> flag. Not connected nodes are nodes that are not
+    connected to the originating node anymore, but references
+    (i.e. process or port identifiers) exist.</p>
+
+    <p>To see more detailed information about a node, double click the
+    row or right click the row and select "Properties for node
+    &lt;node&gt;". From the right click menu you can also select
+    "Properties for &lt;port&gt;", to open the detailed information
+    window for the controlling port.</p>
+
+    <p>In the detailed information window for a node, any exsisting
+    links and monitors between processes on the originating node and
+    the connected node are shown. <em>Extra Info</em> may contain
+    debug information (i.e. special information written if the
+    emulator is debug compiled) or error information.</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#distribution_info">
+      More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="loaded_modules"/>
+    <title>Loaded modules</title>
+
+    <p>The <em>Modules</em> panel lists all modules that were loaded
+    on the originating node, and the current size of the code. If old
+    code exsits, the old size is also shown.</p>
+
+    <p>To see detailed information about a specific module, double
+    click the row or right click it and select "Properties for
+    &lt;mod&gt;".</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#loaded_modules">
+      More...</seealso>
+    </p>
+  </section>
+
+  <section>
+    <marker id="memory"/>
+    <title>Memory</title>
+
+    <p>The <em>Memory</em> panel shows memory and allocator
+    information. From the left hand menu you can select:</p>
+
+    <p>
+      <list>
+
+	<item><em>Memory</em> <seealso
+	marker="erts:crash_dump#memory">More...</seealso></item>
+
+	<item><em>Allocator Summary</em> - this page presents a
+	summary of values from all allocators below.</item>
+
+	<item><em>&lt;Allocator&gt;</em> - one entry per allocator
+	<seealso
+	marker="erts:crash_dump#allocator">More...</seealso></item>
+
+	<item><em>Allocated Areas</em> <seealso
+	marker="erts:crash_dump#allocated_areas">More...</seealso></item>
+
+      </list>
+    </p>
+  </section>
+
+  <section>
+    <marker id="internal_tables"/>
+    <title>Internal tables</title>
+
+    <p>On the <em>Internal Tables</em> panel you can choose from the
+    left hand menu to see hash tables or index tables.</p>
+
+    <p>
+      <seealso marker="erts:crash_dump#internal_tables">More...</seealso>
+    </p>
+  </section>
+</chapter>
diff --git a/lib/observer/doc/src/etop.xml b/lib/observer/doc/src/etop.xml
index af6bb2442b..9f3cdd6de8 100644
--- a/lib/observer/doc/src/etop.xml
+++ b/lib/observer/doc/src/etop.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -38,21 +38,19 @@
   <description>
 
     <p><c>etop</c> should be started with the provided scripts
-      <c>etop</c> and <c>getop</c> for text based and graphical
-      presentation respectively. This will start a hidden erlang node
+      <c>etop</c>. This will start a hidden erlang node
       which connects to the node to be measured. The measured node is
       given with the <c>-node</c> option. If the measured node has a
       different cookie than the default cookie for the user who
       invokes the script, the cookie must be explicitly given witht
       the <c>-setcookie</c> option.</p>
 
-    <p>Under Windows the batch files <c>etop.bat</c> and
-      <c>getop.bat</c> can be used.</p>
+    <p>Under Windows the batch file <c>etop.bat</c> can be used.</p>
 
     <p>The following configuration parameters exist for the
-    <c>etop</c> tool. When executing the <c>etop</c> or <c>getop</c>
-    scripts, these parameters can be given as command line options,
-    e.g. <c>getop -node testnode@myhost -setcookie MyCookie</c>.</p>
+    <c>etop</c> tool. When executing the <c>etop</c> script,
+    these parameters can be given as command line options,
+    e.g. <c>etop -node testnode@myhost -setcookie MyCookie</c>.</p>
     <taglist>
       <tag>node</tag>
       <item>The measured node.
@@ -103,11 +101,6 @@ Value: <c>on | off</c>      <br></br>
 Default: <c>on</c></item>
     </taglist>
 
-    <p>All interaction with <c>etop</c> when running the graphical
-      presentation should happen via the menus. For the text based
-      presentation the functions described below can be used.
-      </p>
-
     <p>See the <seealso marker="etop_ug">user's guide</seealso> for
     more information about the <c>etop</c> tool.</p>
 
@@ -118,7 +111,7 @@ Default: <c>on</c></item>
       <fsummary>Start etop</fsummary>
       <desc>
         <p>This function starts <c>etop</c>.
-        Note that etop is preferably started with the etop and getop scripts</p>
+        Note that etop is preferably started with the etop script.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/observer/doc/src/etop_5.gif b/lib/observer/doc/src/etop_5.gif
deleted file mode 100644
index 9650176366..0000000000
--- a/lib/observer/doc/src/etop_5.gif
+++ /dev/null
diff --git a/lib/observer/doc/src/etop_lines.gif b/lib/observer/doc/src/etop_lines.gif
deleted file mode 100644
index 10620a1155..0000000000
--- a/lib/observer/doc/src/etop_lines.gif
+++ /dev/null
diff --git a/lib/observer/doc/src/etop_main.gif b/lib/observer/doc/src/etop_main.gif
deleted file mode 100644
index 699cb986c8..0000000000
--- a/lib/observer/doc/src/etop_main.gif
+++ /dev/null
diff --git a/lib/observer/doc/src/etop_opt.gif b/lib/observer/doc/src/etop_opt.gif
deleted file mode 100644
index e420bff7f6..0000000000
--- a/lib/observer/doc/src/etop_opt.gif
+++ /dev/null
diff --git a/lib/observer/doc/src/etop_ug.xml b/lib/observer/doc/src/etop_ug.xml
index ccbb626465..c57df1d324 100644
--- a/lib/observer/doc/src/etop_ug.xml
+++ b/lib/observer/doc/src/etop_ug.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -39,9 +39,7 @@
 
   <section>
     <title>Output</title>
-    <p>The output from <c>etop</c> can be graphical or text based. 
-      </p>
-    <p>Text based it looks like this:</p>
+    <p>The output from <c>etop</c> looks like this:</p>
     <code type="none"><![CDATA[
 ========================================================================================
  tiger@durin                                                               13:40:32
@@ -63,10 +61,6 @@ Pid            Name or Initial Func    Time    Reds  Memory    MsgQ Current Func
 <127.137.0>    net_kernel:do_spawn_       0     553    5840       0 dbg:do_relay_1/1    
 ========================================================================================
     ]]></code>
-    <p>And graphically it looks like this:</p>
-    <image file="etop_main.gif">
-      <icaption>Graphical presentation of etop</icaption>
-    </image>
     <p>The header includes some system information:
       </p>
     <taglist>
@@ -102,9 +96,7 @@ Pid            Name or Initial Func    Time    Reds  Memory    MsgQ Current Func
 
   <section>
     <title>Start</title>
-    <p>To start etop with the graphical presentation, use the script
-      <c>getop</c> or the batch file <c>getop.bat</c>, e.g. <c>getop -node tiger@durin</c></p>
-    <p>To start etop with the text based presentation use the script
+    <p>To start etop use the script
       <c>etop</c> or the batch file <c>etop.bat</c>, e.g. <c>etop -node tiger@durin</c>,
       </p>
   </section>
@@ -115,30 +107,12 @@ Pid            Name or Initial Func    Time    Reds  Memory    MsgQ Current Func
       <c>-OptName Value</c> to the command line, e.g. <c>etop -node tiger@durin -setcookie mycookie -lines 15</c>.
       </p>
     <p>The parameters <c>lines</c>, <c>interval</c>, <c>accumulate</c>
-      and <c>sort</c> can be changed during runtime. Use the
-      <em>Options</em> menu with the graphical presentation or the
-      function <c>etop:config/2</c> with the text based presentation.
+      and <c>sort</c> can be changed during runtime by the
+      function <c>etop:config/2</c>.
       </p>
     <p>A list of all valid configuration parameters can be found in
       the reference manual for <c>etop</c>.
       </p>
-    <p>Note that it is even possible to change which information to
-      sort by by clicking the header line of the table in the graphical
-      presentation.
-      </p>
-
-    <section>
-      <title>Example: Change configuration with graphical presentation</title>
-      <image file="etop_opt.gif">
-        <icaption>Select the option to change from the Options menu.</icaption>
-      </image>
-      <image file="etop_lines.gif">
-        <icaption>Enter the new value in the popup window and click "Ok"</icaption>
-      </image>
-      <image file="etop_5.gif">
-        <icaption>The interface is updated with the new configuration</icaption>
-      </image>
-    </section>
 
     <section>
       <title>Example: Change configuration with text based presentation</title>
@@ -187,18 +161,14 @@ Pid            Name or Initial Func    Time    Reds  Memory    MsgQ Current Func
   <section>
     <title>Print to file</title>
     <p>At any time, the current <c>etop</c> display can be dumped to a
-      text file. Use <em>Dump to file</em> on the <em>File</em> menu
-      with the graphical presentation or the function <c>etop:dump/1</c>
-      with the text based presentation.
+      text file with the function <c>etop:dump/1</c>.
       </p>
   </section>
 
   <section>
     <title>Stop</title>
-    <p>To stop <c>etop</c>, use <em>Exit</em> on the <em>File</em>
-      menu for the graphical presentation, or the function
-      <c>etop:stop/0</c> with the text based presentation.
-      </p>
+    <p>Use the function <c>etop:stop/0</c> to stop <c>etop</c>.
+    </p>
   </section>
 </chapter>
 
diff --git a/lib/observer/doc/src/fascicules.xml b/lib/observer/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/observer/doc/src/fascicules.xml
+++ b/lib/observer/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index 34e87374a2..9de00b8c16 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,48 @@
   <p>This document describes the changes made to the Observer
     application.</p>
 
+<section><title>Observer 1.3.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The documentation for <c>ttb:tracer/2</c> incorrectly
+	    stated that there was an option named '<c>overload</c>',
+	    while the correct name used in the implementation is
+	    '<c>overload_check</c>'.</p>
+          <p>
+	    Own Id: OTP-11335 Aux Id: seq12385 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed typo in observer documentation. Thanks to Dave
+	    Parfitt.</p>
+          <p>
+	    Own Id: OTP-11475</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Observer 1.3.1.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 1.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -139,7 +181,7 @@
           <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>
+	    search. Thanks to Peti Gömori</p>
           <p>
 	    Own Id: OTP-10218</p>
         </item>
diff --git a/lib/observer/doc/src/notes_history.xml b/lib/observer/doc/src/notes_history.xml
index 2300983131..55e965022c 100644
--- a/lib/observer/doc/src/notes_history.xml
+++ b/lib/observer/doc/src/notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/observer.xml b/lib/observer/doc/src/observer.xml
index 03830f2b1c..315301e2c8 100644
--- a/lib/observer/doc/src/observer.xml
+++ b/lib/observer/doc/src/observer.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2011</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/observer_app.xml b/lib/observer/doc/src/observer_app.xml
index e643568a39..e4790ce98c 100644
--- a/lib/observer/doc/src/observer_app.xml
+++ b/lib/observer/doc/src/observer_app.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/observer_ug.xml b/lib/observer/doc/src/observer_ug.xml
index 569d72e71e..3aeaf1997a 100644
--- a/lib/observer/doc/src/observer_ug.xml
+++ b/lib/observer/doc/src/observer_ug.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2011</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/part.xml b/lib/observer/doc/src/part.xml
index 0d6aad09f2..c05f9bdf9c 100644
--- a/lib/observer/doc/src/part.xml
+++ b/lib/observer/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2011</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/part_notes.xml b/lib/observer/doc/src/part_notes.xml
index cd659395af..a900779e2f 100644
--- a/lib/observer/doc/src/part_notes.xml
+++ b/lib/observer/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/part_notes_history.xml b/lib/observer/doc/src/part_notes_history.xml
index 1ba0875fec..8f13861bb9 100644
--- a/lib/observer/doc/src/part_notes_history.xml
+++ b/lib/observer/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/observer/doc/src/ref_man.xml b/lib/observer/doc/src/ref_man.xml
index c33ce74141..c3805b2d86 100644
--- a/lib/observer/doc/src/ref_man.xml
+++ b/lib/observer/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2002</year><year>2011</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,5 +38,6 @@
   <xi:include href="ttb.xml"/>
   <xi:include href="etop.xml"/>
   <xi:include href="crashdump.xml"/>
+  <xi:include href="cdv.xml"/>
 </application>
 
diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml
index 4e63aecbf2..6e60a9cb3b 100644
--- a/lib/observer/doc/src/ttb.xml
+++ b/lib/observer/doc/src/ttb.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -105,8 +105,9 @@ ttb:p(all, call)</code>
         <v>Nodes   = atom() | [atom()] | all | existing | new</v>
         <v>Opts = Opt | [Opt]</v>
         <v>Opt = {file,Client} | {handler, FormatHandler} | {process_info,PI} |
-          shell | {shell, ShellSpec} | {timer, TimerSpec} | {overload, {MSec, Module, Function}}
-          | {flush, MSec} | resume | {resume, FetchTimeout}</v>
+          shell | {shell, ShellSpec} | {timer, TimerSpec} |
+	  {overload_check, {MSec, Module, Function}} |
+	{flush, MSec} | resume | {resume, FetchTimeout}</v>
         <v>TimerSpec = MSec | {MSec, StopOpts}</v>
         <v>MSec = FetchTimeout = integer()</v>
         <v>Module = Function = atom() </v>
@@ -158,7 +159,7 @@ ttb:p(all, call)</code>
           network communication are always present. The timer starts after
           <c>ttb:p/2</c> is issued, so you can set up your trace patterns before.
         </p>
-        <p>The <c>overload</c> option allows to enable overload
+        <p>The <c>overload_check</c> option allows to enable overload
           checking on the nodes under trace. <c>Module:Function(check)</c>
           is performed each <c>MSec</c> milliseconds. If the check returns
           <c>true</c>, the tracing is disabled on a given node.<br/>
diff --git a/lib/observer/doc/src/ttb_ug.xml b/lib/observer/doc/src/ttb_ug.xml
index 08093a9451..a1740b618e 100644
--- a/lib/observer/doc/src/ttb_ug.xml
+++ b/lib/observer/doc/src/ttb_ug.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2011</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -697,7 +697,7 @@ f3() ->
 (tiger@durin)6>ttb:stop({format, {handler, ttb:get_et_handler()}}).
 </code>
 
-      <p>This shoud render a result similar to the
+      <p>This should render a result similar to the
         following:
         </p>
       <p></p>
diff --git a/lib/observer/priv/bin/getop b/lib/observer/priv/bin/getop
deleted file mode 100755
index 5cd9bf3d76..0000000000
--- a/lib/observer/priv/bin/getop
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-
-NAME="etop"
-erl -sname $NAME -noinput -hidden -s etop -s erlang halt $@
diff --git a/lib/observer/priv/bin/getop.bat b/lib/observer/priv/bin/getop.bat
deleted file mode 100644
index 8b6f108f06..0000000000
--- a/lib/observer/priv/bin/getop.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-CALL werl -sname etop -noinput -hidden -s etop -s erlang halt %*
diff --git a/lib/observer/priv/erlang_observer.png b/lib/observer/priv/erlang_observer.png
index 01723d210b..cf900a29e6 100644
--- a/lib/observer/priv/erlang_observer.png
+++ b/lib/observer/priv/erlang_observer.png
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 42f5c19935..c120865213 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -36,15 +36,33 @@ RELSYSDIR = $(RELEASE_PATH)/lib/observer-$(VSN)
 
 MODULES= \
 	crashdump_viewer \
-	crashdump_viewer_html \
+	cdv_atom_cb \
+	cdv_bin_cb \
+	cdv_detail_wx \
+	cdv_dist_cb \
+	cdv_ets_cb \
+	cdv_fun_cb \
+	cdv_gen_cb \
+	cdv_html_wx \
+	cdv_info_wx \
+	cdv_int_tab_cb \
+	cdv_mem_cb \
+	cdv_mod_cb \
+	cdv_multi_wx \
+	cdv_port_cb \
+	cdv_proc_cb \
+	cdv_table_wx \
+	cdv_term_cb \
+	cdv_timer_cb \
+	cdv_virtual_list_wx \
+	cdv_wx \
 	etop \
-	etop_gui \
 	etop_tr \
 	etop_txt \
 	observer \
 	observer_app_wx \
+	observer_html_lib \
 	observer_lib \
-	observer_wx \
 	observer_perf_wx \
 	observer_pro_wx \
 	observer_procinfo \
@@ -53,6 +71,7 @@ MODULES= \
 	observer_traceoptions_wx \
 	observer_tv_table \
 	observer_tv_wx \
+	observer_wx \
 	ttb \
 	ttb_et
 
@@ -72,13 +91,12 @@ PRIVDIR= ../priv
 WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool $(PRIVDIR)/erlang_observer.png
 BINDIR= $(PRIVDIR)/bin
 ifeq ($(findstring win32,$(TARGET)),win32)
-WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/getop.bat $(BINDIR)/cdv.bat
+WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/cdv.bat
 else
 WIN32_EXECUTABLES=
 endif
 EXECUTABLES= \
 	$(BINDIR)/etop \
-	$(BINDIR)/getop \
 	$(BINDIR)/cdv \
 	$(WIN32_EXECUTABLES)
 CDVDIR= $(PRIVDIR)/crashdump_viewer
diff --git a/lib/observer/src/cdv_atom_cb.erl b/lib/observer/src/cdv_atom_cb.erl
new file mode 100644
index 0000000000..46fce81b52
--- /dev/null
+++ b/lib/observer/src/cdv_atom_cb.erl
@@ -0,0 +1,48 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_atom_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 format/1]).
+
+-include_lib("wx/include/wx.hrl").
+
+%% Defines
+-define(COL_ID, 0).
+-define(COL_ATOM, ?COL_ID+1).
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_ID);
+col_to_elem(Id) -> Id+1.
+
+col_spec() ->
+    [{"Creation order",   ?wxLIST_FORMAT_CENTER, 100},
+     {"Atom",             ?wxLIST_FORMAT_LEFT,  100}].
+
+get_info(_) ->
+    {ok,Info,TW} = crashdump_viewer:atoms(),
+    {Info,TW}.
+
+format({Bin,q}) when is_binary(Bin) ->
+    [$'|binary_to_list(Bin)];
+format({Bin,nq}) when is_binary(Bin) ->
+    lists:flatten(io_lib:format("~ts",[Bin]));
+format(D) ->
+    D.
diff --git a/lib/observer/src/cdv_bin_cb.erl b/lib/observer/src/cdv_bin_cb.erl
new file mode 100644
index 0000000000..d5fbceff1e
--- /dev/null
+++ b/lib/observer/src/cdv_bin_cb.erl
@@ -0,0 +1,82 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
+%%
+%% The 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(cdv_bin_cb).
+
+-export([get_details/1,
+	 detail_pages/0]).
+
+%% Callbacks for cdv_detail_wx
+get_details({Type, {T,Key}}) ->
+    [{Key,Term}] = ets:lookup(T,Key),
+    {ok,{"Expanded Binary", {Type, Term}, []}};
+get_details({cdv, Id}) ->
+    {ok,Bin} = crashdump_viewer:expand_binary(Id),
+    {ok,{"Expanded Binary", {cvd, Bin}, []}}.
+
+detail_pages() ->
+    [{"Binary", fun init_bin_page/2}].
+
+init_bin_page(Parent,{Type,Bin}) ->
+    cdv_multi_wx:start_link(
+      Parent,
+      [{"Format \~p",cdv_html_wx,{Type,format_bin_fun("~p",Bin)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_bin_fun("~tp",Bin)}},
+       {"Format \~w",cdv_html_wx,{Type,format_bin_fun("~w",Bin)}},
+       {"Format \~s",cdv_html_wx,{Type,format_bin_fun("~s",Bin)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_bin_fun("~ts",Bin)}},
+       {"Hex",cdv_html_wx,{Type,hex_binary_fun(Bin)}},
+       {"Term",cdv_html_wx,{Type,binary_to_term_fun(Bin)}}]).
+
+format_bin_fun(Format,Bin) ->
+    fun() ->
+	    try io_lib:format(Format,[Bin]) of
+		Str -> plain_html(lists:flatten(Str))
+	    catch error:badarg ->
+		    Warning = "This binary can not be formatted with " ++ Format,
+		    observer_html_lib:warning(Warning)
+	    end
+    end.
+
+binary_to_term_fun(Bin) ->
+    fun() ->
+	    try binary_to_term(Bin) of
+		Term -> plain_html(io_lib:format("~p",[Term]))
+	    catch error:badarg ->
+		    Warning = "This binary can not be coverted to an Erlang term",
+		    observer_html_lib:warning(Warning)
+	    end
+    end.
+
+-define(line_break,25).
+hex_binary_fun(Bin) ->
+    fun() ->
+	    S = "<<" ++ format_hex(Bin,?line_break) ++ ">>",
+	    plain_html(io_lib:format("~s",[S]))
+    end.
+
+format_hex(<<B1:4,B2:4>>,_) ->
+    [integer_to_list(B1,16),integer_to_list(B2,16)];
+format_hex(<<B1:4,B2:4,Bin/binary>>,0) ->
+    [integer_to_list(B1,16),integer_to_list(B2,16),$,,$\n,$\s,$\s
+     | format_hex(Bin,?line_break)];
+format_hex(<<B1:4,B2:4,Bin/binary>>,N) ->
+    [integer_to_list(B1,16),integer_to_list(B2,16),$,
+     | format_hex(Bin,N-1)].
+
+plain_html(Text) ->
+    observer_html_lib:plain_page(Text).
diff --git a/lib/observer/src/cdv_detail_wx.erl b/lib/observer/src/cdv_detail_wx.erl
new file mode 100644
index 0000000000..dc93507a36
--- /dev/null
+++ b/lib/observer/src/cdv_detail_wx.erl
@@ -0,0 +1,158 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_detail_wx).
+
+-behaviour(wx_object).
+
+-export([start_link/3]).
+
+-export([init/1, handle_event/2, handle_cast/2, terminate/2, code_change/3,
+	 handle_call/3, handle_info/2]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+-include("observer_defs.hrl").
+
+-record(state, {parent,
+		frame,
+		id,
+		pages=[]
+	       }).
+
+%% Defines
+-define(ID_NOTEBOOK, 604).
+
+%% Detail view
+start_link(Id, ParentFrame, Callback) ->
+    wx_object:start_link(?MODULE, [Id, ParentFrame, Callback, self()], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init([Id, ParentFrame, Callback, Parent]) ->
+    case Callback:get_details(Id) of
+	{ok,Details} ->
+	    init(Id,ParentFrame,Callback,Parent,Details);
+	{yes_no, Info, Fun} ->
+	    case observer_lib:display_yes_no_dialog(Info) of
+		?wxID_YES -> Fun();
+		?wxID_NO -> ok
+	    end,
+	    {stop,normal};
+	{info,Info} ->
+	    observer_lib:display_info_dialog(Info),
+	    {stop,normal}
+    end.
+
+init(Id,ParentFrame,Callback,Parent,{Title,Info,TW}) ->
+    Frame=wxFrame:new(ParentFrame, ?wxID_ANY, [Title],
+		      [{style, ?wxDEFAULT_FRAME_STYLE}, {size, {850,600}}]),
+    MenuBar = wxMenuBar:new(),
+    create_menus(MenuBar),
+    wxFrame:setMenuBar(Frame, MenuBar),
+
+    Panel = wxPanel:new(Frame, []),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    {InfoPanel,Pages} = create_pages(Panel,Callback:detail_pages(),[Info]),
+    wxSizer:add(Sizer, InfoPanel, [{proportion, 1}, {flag, ?wxEXPAND}]),
+
+    case TW of
+	[] ->
+	    undefined;
+	_ ->
+	    StatusBar = observer_lib:create_status_bar(Panel),
+	    wxSizer:add(Sizer, StatusBar, [{flag, ?wxEXPAND bor ?wxALL},
+					   {proportion, 0},
+					   {border,4}]),
+	    wxTextCtrl:writeText(StatusBar, TW),
+	    StatusBar
+    end,
+
+    wxPanel:setSizer(Panel, Sizer),
+
+    wxFrame:connect(Frame, close_window),
+    wxMenu:connect(Frame, command_menu_selected),
+    wxFrame:show(Frame),
+    {Frame, #state{parent=Parent,
+		   id=Id,
+		   frame=Frame,
+		   pages=Pages
+		  }}.
+
+create_pages(Panel,[{_PageTitle,Fun}],FunArgs) ->
+    %% Only one page - don't create notebook
+    Page = init_panel(Panel, Fun, FunArgs),
+    {Page,[Page]};
+create_pages(Panel,PageSpecs,FunArgs) ->
+    Notebook = wxNotebook:new(Panel, ?ID_NOTEBOOK, [{style, ?wxBK_DEFAULT}]),
+    Pages = [init_tab(Notebook, PageTitle, Fun, FunArgs)
+	     || {PageTitle,Fun} <- PageSpecs],
+    {Notebook, Pages}.
+
+init_tab(Notebook,Title,Fun,FunArgs) ->
+    Panel = init_panel(Notebook,Fun,FunArgs),
+    true = wxNotebook:addPage(Notebook, Panel, Title),
+    Panel.
+
+init_panel(ParentWin, Fun, FunArgs) ->
+    Panel  = wxScrolledWindow:new(ParentWin),
+    wxScrolledWindow:enableScrolling(Panel,true,true),
+    wxScrolledWindow:setScrollbars(Panel,1,1,0,0),
+    Sizer  = wxBoxSizer:new(?wxHORIZONTAL),
+    Window = apply(Fun, [Panel | FunArgs]),
+    wxSizer:add(Sizer, Window, [{flag, ?wxEXPAND bor ?wxALL},
+				{proportion, 1},
+				{border, 5}]),
+    wxPanel:setSizer(Panel, Sizer),
+    Panel.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%Callbacks%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+handle_event(#wx{event=#wxClose{type=close_window}}, State) ->
+    {stop, normal, State};
+
+handle_event(#wx{id=?wxID_CLOSE, event=#wxCommand{type=command_menu_selected}},
+	     State) ->
+    {stop, normal, State};
+
+handle_event(Event, _State) ->
+    error({unhandled_event, Event}).
+
+handle_info(_Info, State) ->
+    %% io:format("~p: ~p, Handle info: ~p~n", [?MODULE, ?LINE, _Info]),
+    {noreply, State}.
+
+handle_call(Call, From, _State) ->
+    error({unhandled_call, Call, From}).
+
+handle_cast(Cast, _State) ->
+    error({unhandled_cast, Cast}).
+
+terminate(_Reason, #state{parent=Parent,id=Id,frame=Frame}) ->
+    wx_object:cast(Parent,{detail_win_closed, Id}),
+    case Frame of
+	undefined ->  ok;
+	_ -> wxFrame:destroy(Frame)
+    end,
+    ok.
+
+code_change(_, _, State) ->
+    {ok, State}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+create_menus(MenuBar) ->
+    Menus = [{"File", [#create_menu{id=?wxID_CLOSE, text="Close"}]}],
+    observer_lib:create_menus(Menus, MenuBar, new_window).
diff --git a/lib/observer/src/cdv_dist_cb.erl b/lib/observer/src/cdv_dist_cb.erl
new file mode 100644
index 0000000000..3860324d6f
--- /dev/null
+++ b/lib/observer/src/cdv_dist_cb.erl
@@ -0,0 +1,91 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_dist_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 get_detail_cols/1,
+	 get_details/1,
+	 detail_pages/0]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+%% Columns
+-define(COL_NAME,  0).
+-define(COL_TYPE, ?COL_NAME+1).
+-define(COL_CTRL, ?COL_TYPE+1).
+-define(COL_CH,   ?COL_CTRL+1).
+-define(COL_CRE,  ?COL_CH+1).
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_CH);
+col_to_elem(?COL_NAME)  -> #nod.name;
+col_to_elem(?COL_CH)    -> #nod.channel;
+col_to_elem(?COL_CTRL)  -> #nod.controller;
+col_to_elem(?COL_CRE)   -> #nod.creation;
+col_to_elem(?COL_TYPE)  -> #nod.conn_type.
+
+col_spec() ->
+    [{"Name",            ?wxLIST_FORMAT_LEFT,   300},
+     {"Connection type", ?wxLIST_FORMAT_LEFT,   130},
+     {"Controller",      ?wxLIST_FORMAT_LEFT,   130},
+     {"Channel",         ?wxLIST_FORMAT_RIGHT,  80},
+     {"Creation",        ?wxLIST_FORMAT_RIGHT,  80}].
+
+get_info(_) ->
+    {ok,Info,TW} = crashdump_viewer:dist_info(),
+    {Info,TW}.
+
+get_detail_cols(_) ->
+    {[?COL_CH,?COL_CTRL],true}.
+
+%% Callbacks for cdv_detail_wx
+get_details(Id) ->
+    case crashdump_viewer:node_info(Id) of
+	{ok,Info,TW} ->
+	    Proplist = crashdump_viewer:to_proplist(record_info(fields,nod),Info),
+	    Title = io_lib:format("~s (~s)",[Info#nod.name,Id]),
+	    {ok,{Title,Proplist,TW}};
+	{error,not_found} ->
+	    Info = "The node you are searching for could not be found.",
+	    {info,Info}
+    end.
+
+detail_pages() ->
+    [{"General Information",   fun init_gen_page/2}].
+
+init_gen_page(Parent, Info) ->
+    Fields = info_fields(),
+    cdv_info_wx:start_link(Parent,{Fields,Info,[]}).
+
+%%%-----------------------------------------------------------------
+%%% Internal
+info_fields() ->
+    [{"Overview",
+      [{"Name",               name},
+       {"Type",               conn_type},
+       {"Channel",            channel},
+       {"Controller",         {click,controller}},
+       {"Creation",           creation},
+       {"Extra Info",         error}]},
+    {scroll_boxes,
+     [{"Remote Links",1,{click,remote_links}},
+      {"Remote Monitors",1,{click,remote_mon}},
+      {"Remote Monitored By",1,{click,remote_mon_by}}]}].
diff --git a/lib/observer/src/cdv_ets_cb.erl b/lib/observer/src/cdv_ets_cb.erl
new file mode 100644
index 0000000000..2a5c170e58
--- /dev/null
+++ b/lib/observer/src/cdv_ets_cb.erl
@@ -0,0 +1,67 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_ets_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 get_detail_cols/1]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+%% Defines
+-define(COL_ID,    0).
+-define(COL_NAME,  ?COL_ID+1).
+-define(COL_SLOT,  ?COL_NAME+1).
+-define(COL_OWNER, ?COL_SLOT+1).
+-define(COL_BUCK,  ?COL_OWNER+1).
+-define(COL_OBJ,   ?COL_BUCK+1).
+-define(COL_MEM,   ?COL_OBJ+1).
+-define(COL_TYPE,  ?COL_MEM+1).
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_ID);
+col_to_elem(?COL_ID)    -> #ets_table.id;
+col_to_elem(?COL_NAME)  -> #ets_table.name;
+col_to_elem(?COL_SLOT)  -> #ets_table.slot;
+col_to_elem(?COL_OWNER) -> #ets_table.pid;
+col_to_elem(?COL_TYPE)  -> #ets_table.type;
+col_to_elem(?COL_BUCK)  -> #ets_table.buckets;
+col_to_elem(?COL_OBJ)   -> #ets_table.size;
+col_to_elem(?COL_MEM)   -> #ets_table.memory.
+
+col_spec() ->
+    [{"Id",      ?wxLIST_FORMAT_LEFT,   200},
+     {"Name",    ?wxLIST_FORMAT_LEFT,   200},
+     {"Slot",    ?wxLIST_FORMAT_RIGHT,  50},
+     {"Owner",   ?wxLIST_FORMAT_CENTRE, 90},
+     {"Buckets", ?wxLIST_FORMAT_RIGHT,  50},
+     {"Objects", ?wxLIST_FORMAT_RIGHT,  50},
+     {"Memory",  ?wxLIST_FORMAT_RIGHT,  80},
+     {"Type",    ?wxLIST_FORMAT_LEFT,   50}
+    ].
+
+get_info(Owner) ->
+    {ok,Info,TW} = crashdump_viewer:ets_tables(Owner),
+    {Info,TW}.
+
+get_detail_cols(all) ->
+    {[?COL_OWNER],false};
+get_detail_cols(_) ->
+    {[],false}.
diff --git a/lib/observer/src/cdv_fun_cb.erl b/lib/observer/src/cdv_fun_cb.erl
new file mode 100644
index 0000000000..689ef0e3bb
--- /dev/null
+++ b/lib/observer/src/cdv_fun_cb.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_fun_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 get_detail_cols/1]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+%% Defines
+-define(COL_MOD,    0).
+-define(COL_UNIQ,  ?COL_MOD+1).
+-define(COL_INDEX,  ?COL_UNIQ+1).
+-define(COL_ADDR, ?COL_INDEX+1).
+-define(COL_NADDR,  ?COL_ADDR+1).
+-define(COL_REFC,  ?COL_NADDR+1).
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_MOD);
+col_to_elem(?COL_MOD)   -> #fu.module;
+col_to_elem(?COL_UNIQ)  -> #fu.uniq;
+col_to_elem(?COL_INDEX) -> #fu.index;
+col_to_elem(?COL_ADDR)  -> #fu.address;
+col_to_elem(?COL_NADDR) -> #fu.native_address;
+col_to_elem(?COL_REFC)  -> #fu.refc.
+
+col_spec() ->
+    [{"Module",         ?wxLIST_FORMAT_LEFT,   200},
+     {"Uniq",           ?wxLIST_FORMAT_RIGHT,  100},
+     {"Index",          ?wxLIST_FORMAT_RIGHT,  50},
+     {"Address",        ?wxLIST_FORMAT_LEFT,   120},
+     {"Native Address", ?wxLIST_FORMAT_LEFT,   120},
+     {"Refc",           ?wxLIST_FORMAT_RIGHT,  50}].
+
+get_info(_) ->
+    {ok,Info,TW} = crashdump_viewer:funs(),
+    {Info,TW}.
+
+get_detail_cols(_) ->
+    {[?COL_MOD],false}.
diff --git a/lib/observer/src/cdv_gen_cb.erl b/lib/observer/src/cdv_gen_cb.erl
new file mode 100644
index 0000000000..6be717d76d
--- /dev/null
+++ b/lib/observer/src/cdv_gen_cb.erl
@@ -0,0 +1,45 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%%
+%% The 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(cdv_gen_cb).
+
+-export([get_info/0]).
+
+-include("crashdump_viewer.hrl").
+
+get_info() ->
+    {ok,Info,TW} = crashdump_viewer:general_info(),
+    Fields = info_fields(),
+    Proplist =
+	crashdump_viewer:to_proplist(record_info(fields,general_info),Info),
+    {Fields,Proplist,TW}.
+
+info_fields() ->
+    [{"General Information",
+      [{"Slogan",slogan},
+       {"Node name",node_name},
+       {"Crashdump created on",created},
+       {"System version",system_vsn},
+       {"Compiled",compile_time},
+       {"Taints",taints},
+       {"Memory allocated",{bytes,mem_tot}},
+       {"Memory maximum",{bytes,mem_max}},
+       {"Atoms",num_atoms},
+       {"Processes",num_procs},
+       {"ETS tables",num_ets},
+       {"Timers",num_timers},
+       {"Funs",num_fun}]}].
diff --git a/lib/observer/src/cdv_html_wx.erl b/lib/observer/src/cdv_html_wx.erl
new file mode 100644
index 0000000000..b79c647f63
--- /dev/null
+++ b/lib/observer/src/cdv_html_wx.erl
@@ -0,0 +1,136 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
+%%
+%% The 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(cdv_html_wx).
+
+-behaviour(wx_object).
+
+-export([start_link/2]).
+%% wx_object callbacks
+-export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
+	 handle_event/2, handle_cast/2]).
+
+-include_lib("wx/include/wx.hrl").
+-include("observer_defs.hrl").
+
+%% Records
+-record(state,
+	{panel,
+	 app,         %% which tool is the user
+	 expand_table,
+	 expand_wins=[]}).
+
+start_link(ParentWin, Info) ->
+    wx_object:start_link(?MODULE, [ParentWin, Info], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init([ParentWin, {App, Fun}]) when is_function(Fun) ->
+    init([ParentWin, {App, Fun()}]);
+init([ParentWin, {expand,HtmlText,Tab}]) ->
+    init(ParentWin, HtmlText, Tab, cdv);
+init([ParentWin, {App, {expand,HtmlText,Tab}}]) ->
+    init(ParentWin, HtmlText, Tab, App);
+init([ParentWin, {App,HtmlText}]) ->
+    init(ParentWin, HtmlText, undefined, App);
+init([ParentWin, HtmlText]) ->
+    init(ParentWin, HtmlText, undefined, cdv).
+
+init(ParentWin, HtmlText, Tab, App) ->
+    HtmlWin = observer_lib:html_window(ParentWin),
+    wxHtmlWindow:setPage(HtmlWin,HtmlText),
+    {HtmlWin, #state{panel=HtmlWin,expand_table=Tab,app=App}}.
+
+%%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_info(active, State) ->
+    {noreply, State};
+
+handle_info(Info, State) ->
+    io:format("~p:~p: Unhandled info: ~p~n", [?MODULE, ?LINE, Info]),
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_, _, State) ->
+    {ok, State}.
+
+handle_call(Msg, _From, State) ->
+    io:format("~p~p: Unhandled Call ~p~n",[?MODULE, ?LINE, Msg]),
+    {reply, ok, State}.
+
+handle_cast({detail_win_closed, Id},#state{expand_wins=Opened0}=State) ->
+    Opened = lists:keydelete(Id, 1, Opened0),
+    {noreply, State#state{expand_wins=Opened}};
+
+handle_cast(Msg, State) ->
+    io:format("~p~p: Unhandled cast ~p~n",[?MODULE, ?LINE, Msg]),
+    {noreply, State}.
+
+handle_event(#wx{event=#wxHtmlLink{type=command_html_link_clicked,
+				   linkInfo=#wxHtmlLinkInfo{href=Target}}},
+	     #state{expand_table=Tab, app=App}=State) ->
+    NewState=
+	case Target of
+	    "#Binary?" ++ BinSpec ->
+		[{"offset",Off},{"size",Size},{"pos",Pos}] =
+		    httpd:parse_query(BinSpec),
+		Id = {cdv, {list_to_integer(Off),
+			    list_to_integer(Size),
+			    list_to_integer(Pos)}},
+		expand(Id,cdv_bin_cb,State);
+	    "#OBSBinary?" ++ BinSpec ->
+		[{"key1",Preview},{"key2",Size},{"key3",Hash}] =
+		    httpd:parse_query(BinSpec),
+		Id = {obs, {Tab, {list_to_integer(Preview),
+				  list_to_integer(Size),
+				  list_to_integer(Hash)}}},
+		expand(Id,cdv_bin_cb,State);
+	    "#Term?" ++ TermKeys ->
+		[{"key1",Key1},{"key2",Key2},{"key3",Key3}] =
+		    httpd:parse_query(TermKeys),
+		Id = {cdv, {Tab,{list_to_integer(Key1),
+				 list_to_integer(Key2),
+				 list_to_integer(Key3)}}},
+		expand(Id,cdv_term_cb,State);
+	    _ when App =:= obs ->
+		observer ! {open_link, Target};
+	    _ ->
+		cdv_virtual_list_wx:start_detail_win(Target),
+		State
+	end,
+    {noreply, NewState};
+
+handle_event(Event, State) ->
+    io:format("~p:~p: Unhandled event ~p\n", [?MODULE,?LINE,Event]),
+    {noreply, State}.
+
+%%%-----------------------------------------------------------------
+%%% Internal
+expand(Id,Callback,#state{expand_wins=Opened0}=State) ->
+    Opened =
+	case lists:keyfind(Id,1,Opened0) of
+	    false ->
+		EW = cdv_detail_wx:start_link(Id,State#state.panel,Callback),
+		wx_object:get_pid(EW) ! active,
+		[{Id,EW}|Opened0];
+	    {_,EW} ->
+		wxFrame:raise(EW),
+		Opened0
+	end,
+    State#state{expand_wins=Opened}.
diff --git a/lib/observer/src/cdv_info_wx.erl b/lib/observer/src/cdv_info_wx.erl
new file mode 100644
index 0000000000..59ce0cabb1
--- /dev/null
+++ b/lib/observer/src/cdv_info_wx.erl
@@ -0,0 +1,128 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%%
+%% The 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(cdv_info_wx).
+
+-behaviour(wx_object).
+
+-export([start_link/2]).
+%% wx_object callbacks
+-export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
+	 handle_event/2, handle_cast/2]).
+
+-include_lib("wx/include/wx.hrl").
+-include("observer_defs.hrl").
+
+%% Records
+-record(state,
+	{panel,
+	 sizer,
+	 fpanel,
+	 callback,
+	 trunc_warn=[]
+	}).
+
+start_link(ParentWin, Info) ->
+    wx_object:start_link(?MODULE, [ParentWin, Info], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init([ParentWin, Callback]) when is_atom(Callback) ->
+    {InfoFields,Info,TW} = Callback:get_info(),
+    {Panel,Sizer,FPanel} = create_box(ParentWin,InfoFields,Info),
+    {Panel,#state{panel=Panel,
+		  sizer=Sizer,
+		  fpanel=FPanel,
+		  callback=Callback,
+		  trunc_warn=TW}};
+
+init([ParentWin, {InfoFields,Info,TW}]) ->
+    {Panel,Sizer,FPanel} = create_box(ParentWin,InfoFields,Info),
+    {Panel, #state{panel=Panel,
+		   sizer=Sizer,
+		   fpanel=FPanel,
+		   trunc_warn=TW}}.
+
+%%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_info(active, State) ->
+    cdv_wx:set_status(State#state.trunc_warn),
+    {noreply, State};
+
+handle_info(Info, State) ->
+    io:format("~p:~p: Unhandled info: ~p~n", [?MODULE, ?LINE, Info]),
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_, _, State) ->
+    {ok, State}.
+
+handle_call(new_dump, _From, #state{callback=Callback,panel=Panel,
+				    sizer=Sizer,fpanel=FPanel} = State) ->
+    {InfoFields,Info,TW} = Callback:get_info(),
+    NewFPanel =
+	wx:batch(
+	  fun() ->
+		  wxWindow:destroy(FPanel),
+		  FP = create_field_panel(Panel,Sizer,InfoFields,Info),
+		  wxSizer:layout(Sizer),
+		  FP
+	  end),
+    {reply, ok, State#state{fpanel=NewFPanel,trunc_warn=TW}};
+
+handle_call(Msg, _From, State) ->
+    io:format("~p~p: Unhandled Call ~p~n",[?MODULE, ?LINE, Msg]),
+    {reply, ok, State}.
+
+handle_cast(Msg, State) ->
+    io:format("~p~p: Unhandled cast ~p~n",[?MODULE, ?LINE, Msg]),
+    {noreply, State}.
+
+handle_event(#wx{event=#wxMouse{type=left_down},userData=Target}, State) ->
+    cdv_virtual_list_wx:start_detail_win(Target),
+    {noreply, State};
+
+handle_event(#wx{obj=Obj,event=#wxMouse{type=enter_window}},State) ->
+    wxTextCtrl:setForegroundColour(Obj,{0,0,100,255}),
+    {noreply, State};
+
+handle_event(#wx{obj=Obj,event=#wxMouse{type=leave_window}},State) ->
+    wxTextCtrl:setForegroundColour(Obj,?wxBLUE),
+    {noreply, State};
+
+handle_event(Event, State) ->
+    io:format("~p:~p: Unhandled event ~p\n", [?MODULE,?LINE,Event]),
+    {noreply, State}.
+
+%%%-----------------------------------------------------------------
+%%% Internal
+create_box(ParentWin,InfoFields,Info) ->
+    Panel = wxPanel:new(ParentWin),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    FPanel = create_field_panel(Panel,Sizer,InfoFields,Info),
+    wxPanel:setSizer(Panel, Sizer),
+    {Panel,Sizer,FPanel}.
+
+create_field_panel(Panel,Sizer,InfoFields,Info0) ->
+    Info = observer_lib:fill_info(InfoFields, Info0),
+    {FPanel, _FSizer, _Fields} = observer_lib:display_info(Panel,Info),
+    BorderFlags = ?wxLEFT bor ?wxRIGHT,
+    wxSizer:add(Sizer, FPanel, [{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP},
+				{proportion, 0}, {border, 5}]),
+    FPanel.
diff --git a/lib/observer/src/cdv_int_tab_cb.erl b/lib/observer/src/cdv_int_tab_cb.erl
new file mode 100644
index 0000000000..31727391fe
--- /dev/null
+++ b/lib/observer/src/cdv_int_tab_cb.erl
@@ -0,0 +1,86 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%%
+%% The 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(cdv_int_tab_cb).
+
+-export([get_info/0]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+get_info() ->
+    observer_lib:report_progress({ok,"Processing internal tables"}),
+    HashInfo = get_hash_info(),
+    observer_lib:report_progress({ok,33}),
+    IndexInfo = get_index_info(),
+    observer_lib:report_progress({ok,66}),
+    IntEtsInfo = get_internal_ets_info(),
+    observer_lib:report_progress({ok,100}),
+    [{"Hash Tables",cdv_table_wx,HashInfo},
+     {"Index Tables",cdv_table_wx,IndexInfo},
+     {"Internal ETS Tables",cdv_table_wx,IntEtsInfo}].
+
+%%%-----------------------------------------------------------------
+%%% Hash tables
+get_hash_info() ->
+    {ok,Info0,TW} = crashdump_viewer:hash_tables(),
+    Columns = hash_columns(),
+    Info = [crashdump_viewer:to_value_list(R) || R <- Info0],
+    {Columns,Info,TW}.
+
+hash_columns() ->
+    [{"Name",   ?wxLIST_FORMAT_LEFT,  150},
+     {"Size",   ?wxLIST_FORMAT_RIGHT, 100},
+     {"Used",   ?wxLIST_FORMAT_RIGHT, 100},
+     {"Objects",?wxLIST_FORMAT_RIGHT, 100},
+     {"Depth",  ?wxLIST_FORMAT_RIGHT, 100}].
+
+%%%-----------------------------------------------------------------
+%%% Index tables
+get_index_info() ->
+    {ok,Info0,TW} = crashdump_viewer:index_tables(),
+    Columns = index_columns(),
+    Info = [crashdump_viewer:to_value_list(R) || R <- Info0],
+    {Columns,Info,TW}.
+
+index_columns() ->
+    [{"Name",   ?wxLIST_FORMAT_LEFT,  150},
+     {"Size",   ?wxLIST_FORMAT_RIGHT, 100},
+     {"Limit",  ?wxLIST_FORMAT_RIGHT, 100},
+     {"Used",   ?wxLIST_FORMAT_RIGHT, 100},
+     {"Rate",   ?wxLIST_FORMAT_RIGHT, 100},
+     {"Entries",?wxLIST_FORMAT_RIGHT, 100}].
+
+%%%-----------------------------------------------------------------
+%%% Internal ets tables
+get_internal_ets_info() ->
+    {ok,Info0,TW} = crashdump_viewer:internal_ets_tables(),
+    Columns = int_ets_columns(),
+    Info = [begin
+		[_,_|Data] = crashdump_viewer:to_value_list(R), %skip pid and slot
+		[Desc|Data]
+	    end || {Desc,R} <- Info0],
+    {Columns,Info,TW}.
+
+int_ets_columns() ->
+    [{"Description", ?wxLIST_FORMAT_LEFT,  170},
+     {"Id",          ?wxLIST_FORMAT_LEFT,  80},
+     {"Name",        ?wxLIST_FORMAT_LEFT,  80},
+     {"Type",        ?wxLIST_FORMAT_LEFT,  80},
+     {"Buckets",     ?wxLIST_FORMAT_RIGHT, 80},
+     {"Objects",     ?wxLIST_FORMAT_RIGHT, 80},
+     {"Memory",      ?wxLIST_FORMAT_RIGHT, 80}].
diff --git a/lib/observer/src/cdv_mem_cb.erl b/lib/observer/src/cdv_mem_cb.erl
new file mode 100644
index 0000000000..2b0809df13
--- /dev/null
+++ b/lib/observer/src/cdv_mem_cb.erl
@@ -0,0 +1,84 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%%
+%% The 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(cdv_mem_cb).
+
+-export([get_info/0]).
+
+-include("crashdump_viewer.hrl").
+-include_lib("wx/include/wx.hrl").
+
+get_info() ->
+    observer_lib:report_progress({ok,"Processing memory info"}),
+    MemInfo = get_mem_info(),
+    observer_lib:report_progress({ok,33}),
+    {AllocInfo,AllocTW} = get_alloc_info(),
+    observer_lib:report_progress({ok,66}),
+    AreaInfo = get_area_info(),
+    observer_lib:report_progress({ok,100}),
+    [{"Memory",cdv_info_wx,MemInfo}
+     | [{Title,cdv_table_wx,{Cols,Data,AllocTW}} ||
+	   {Title,Cols,Data} <- AllocInfo]] ++
+	[{"Allocated Areas",cdv_table_wx,AreaInfo}].
+
+
+%%%-----------------------------------------------------------------
+%%% Memory page
+get_mem_info() ->
+    {ok,Info,TW} = crashdump_viewer:memory(),
+    {[{"Memory Information",gen_mem_info_fields(Info)}],Info,TW}.
+
+gen_mem_info_fields([{Key,_}|T]) ->
+    [{upper(atom_to_list(Key)),{bytes,Key}}|gen_mem_info_fields(T)];
+gen_mem_info_fields([]) ->
+    [].
+
+upper(Key) ->
+    string:join([string:to_upper([H]) ++ T || 
+		    [H|T] <- string:tokens(Key,"_")]," ").
+
+
+%%%-----------------------------------------------------------------
+%%% Allocated areas page
+get_area_info() ->
+    {ok,Info0,TW} = crashdump_viewer:allocated_areas(),
+    Info = [tuple_to_list(R) || R <- Info0],
+    {area_columns(),Info,TW}.
+
+area_columns() ->
+    [{"",                 ?wxLIST_FORMAT_LEFT,  150},
+     {"Allocated (bytes)",?wxLIST_FORMAT_RIGHT, 150},
+     {"Used (bytes)",     ?wxLIST_FORMAT_RIGHT, 150}].
+
+%%%-----------------------------------------------------------------
+%%% Allocator page
+get_alloc_info() ->
+    {ok,Info,TW} = crashdump_viewer:allocator_info(),
+    {fix_alloc(Info),TW}.
+
+fix_alloc([{Title,Columns,Data}|Tables]) ->
+    [{Title,alloc_columns(Columns),
+     [[Key|Values] || {Key,Values} <- Data]} |
+     fix_alloc(Tables)];
+fix_alloc([{Title,[{_,V}|_]=Data}|Tables]) ->
+    fix_alloc([{Title,lists:duplicate(length(V),[]),Data}|Tables]);
+fix_alloc([]) ->
+    [].
+
+alloc_columns(Columns) ->
+    [{"",   ?wxLIST_FORMAT_LEFT,  180} |
+     [{Column, ?wxLIST_FORMAT_RIGHT, 140} || Column <- Columns]].
diff --git a/lib/observer/src/cdv_mod_cb.erl b/lib/observer/src/cdv_mod_cb.erl
new file mode 100644
index 0000000000..e829ff4fca
--- /dev/null
+++ b/lib/observer/src/cdv_mod_cb.erl
@@ -0,0 +1,102 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_mod_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 get_detail_cols/1,
+	 get_details/1,
+	 detail_pages/0,
+	 format/1]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+%% Defines
+-define(COL_ID,    0).
+-define(COL_CUR,  ?COL_ID+1).
+-define(COL_OLD,  ?COL_CUR+1).
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_ID);
+col_to_elem(?COL_ID)   -> #loaded_mod.mod;
+col_to_elem(?COL_CUR)  -> #loaded_mod.current_size;
+col_to_elem(?COL_OLD)  -> #loaded_mod.old_size.
+
+col_spec() ->
+    [{"Module",       ?wxLIST_FORMAT_LEFT,   300},
+     {"Current size", ?wxLIST_FORMAT_RIGHT,  80},
+     {"Old size",     ?wxLIST_FORMAT_RIGHT,  80}].
+
+get_info(_) ->
+    {ok,Info,TW} = crashdump_viewer:loaded_modules(),
+    {Info,TW}.
+
+get_detail_cols(_) ->
+    {[?COL_ID],true}.
+
+%% Callbacks for cdv_detail_wx
+get_details(Id) ->
+    {ok,Info,TW} = crashdump_viewer:loaded_mod_details(Id),
+    Proplist = crashdump_viewer:to_proplist(record_info(fields,loaded_mod),Info),
+    Title = io_lib:format("~s",[Info#loaded_mod.mod]),
+    {ok,{Title,Proplist,TW}}.
+
+detail_pages() ->
+    [{"General Information",      fun init_gen_page/2},
+     {"Current Attributes",       fun init_curr_attr_page/2},
+     {"Current Compilation Info", fun init_curr_comp_page/2},
+     {"Old Attributes",           fun init_old_attr_page/2},
+     {"Old Compilation Info",     fun init_old_comp_page/2}].
+
+init_gen_page(Parent, Info) ->
+    Fields = info_fields(),
+    cdv_info_wx:start_link(Parent,{Fields,Info,[]}).
+
+init_curr_attr_page(Parent, Info) ->
+    init_info_page(Parent, proplists:get_value(current_attrib,Info)).
+
+init_curr_comp_page(Parent, Info) ->
+    init_info_page(Parent, proplists:get_value(current_comp_info,Info)).
+
+init_old_attr_page(Parent, Info) ->
+    init_info_page(Parent, proplists:get_value(old_attrib,Info)).
+
+init_old_comp_page(Parent, Info) ->
+    init_info_page(Parent, proplists:get_value(old_comp_info,Info)).
+
+init_info_page(Parent, undefined) ->
+    init_info_page(Parent, "");
+init_info_page(Parent, String) ->
+    cdv_html_wx:start_link(Parent,observer_html_lib:plain_page(String)).
+
+format({Bin,q}) when is_binary(Bin) ->
+    [$'|binary_to_list(Bin)];
+format({Bin,nq}) when is_binary(Bin) ->
+    lists:flatten(io_lib:format("~ts",[Bin]));
+format(D) ->
+    D.
+
+%%%-----------------------------------------------------------------
+%%% Internal
+info_fields() ->
+    [{"Overview",
+      [{"Name",                     mod},
+       {"Current Size",             current_size},
+       {"Old Size",                 old_size}]}].
diff --git a/lib/observer/src/cdv_multi_wx.erl b/lib/observer/src/cdv_multi_wx.erl
new file mode 100644
index 0000000000..75c7f48fc2
--- /dev/null
+++ b/lib/observer/src/cdv_multi_wx.erl
@@ -0,0 +1,188 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%%
+%% The 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(cdv_multi_wx).
+
+-behaviour(wx_object).
+
+-export([start_link/2]).
+%% wx_object callbacks
+-export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
+	 handle_event/2, handle_cast/2]).
+
+-include_lib("wx/include/wx.hrl").
+-include("observer_defs.hrl").
+
+%% Records
+-record(state,
+	{main_panel,
+	 main_sizer,
+	 menu,
+	 menu_sizer,
+	 callback,
+	 pages,
+	 dyn_panel,
+	 dyn_sizer,
+	 dyn_page
+	}).
+
+start_link(Notebook, Info) ->
+    wx_object:start_link(?MODULE, [Notebook, Info], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init([Notebook, Callback]) when is_atom(Callback) ->
+    Pages = Callback:get_info(),
+    {MainPanel,State0} = init([Notebook, Pages]),
+    {MainPanel,State0#state{callback=Callback}};
+init([Notebook, Pages]) ->
+    MainPanel = wxPanel:new(Notebook),
+    Sizer = wxBoxSizer:new(?wxHORIZONTAL),
+    LeftMenuSizer = wxStaticBoxSizer:new(?wxVERTICAL,MainPanel,
+					 [{label,"Please select"}]),
+    LeftMenu = wxListBox:new(MainPanel,?wxID_ANY,
+			     [{style,?wxLB_SINGLE},
+			      {choices,[T || {T,_,_} <- Pages]}]),
+    wxListBox:setSelection(LeftMenu,0),
+    wxListBox:connect(LeftMenu, command_listbox_selected),
+    wxSizer:add(LeftMenuSizer,LeftMenu,[{flag,?wxEXPAND},{proportion,2}]),
+
+    DynPanel  = wxScrolledWindow:new(MainPanel),
+    wxScrolledWindow:enableScrolling(DynPanel,true,true),
+    wxScrolledWindow:setScrollbars(DynPanel,1,1,0,0),
+
+    BorderFlags = ?wxLEFT bor ?wxRIGHT,
+    wxSizer:add(Sizer, LeftMenuSizer,
+		[{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP},
+		 {proportion, 0}, {border, 5}]),
+    wxSizer:add(Sizer, DynPanel, [{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP},
+				  {proportion, 1}, {border, 5}]),
+    wxPanel:setSizer(MainPanel, Sizer),
+
+    State = load_dyn_page(#state{main_panel=MainPanel,
+				 main_sizer=Sizer,
+				 menu=LeftMenu,
+				 menu_sizer=LeftMenuSizer,
+				 pages=Pages,
+				 dyn_panel=DynPanel
+				}),
+    {MainPanel, State}.
+
+%%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_info(active, State) ->
+    NewState =
+	wx:batch(
+	  fun() ->
+		  update_dyn_page(State)
+	  end),
+    {noreply, NewState};
+
+handle_info(Info, State) ->
+    io:format("~p:~p: Unhandled info: ~p~n", [?MODULE, ?LINE, Info]),
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_, _, State) ->
+    {ok, State}.
+
+handle_call(new_dump, _From, State) ->
+    NewState =
+	wx:batch(
+	  fun() ->
+		  update_left_menu(State)
+	  end),
+    {reply, ok, NewState};
+
+handle_call(Msg, _From, State) ->
+    io:format("~p:~p: Unhandled Call ~p~n",[?MODULE, ?LINE, Msg]),
+    {reply, ok, State}.
+
+handle_cast(Msg, State) ->
+    io:format("~p:~p: Unhandled cast ~p~n",[?MODULE, ?LINE, Msg]),
+    {noreply, State}.
+
+handle_event(#wx{event=#wxCommand{type=command_listbox_selected,
+				  cmdString=[]}},
+	     State) ->
+    %% For some reason, the listbox sometimes gets an "unselect"
+    %% command like this during termination. Ignore!
+    {noreply, State};
+
+handle_event(#wx{event=#wxCommand{type=command_listbox_selected,
+				  cmdString=_DynName}},
+	     State) ->
+    NewState =
+	wx:batch(fun() ->
+			 update_dyn_page(State)
+		 end),
+    {noreply,NewState};
+
+handle_event(Event, State) ->
+    io:format("~p:~p: Unhandled event ~p\n", [?MODULE,?LINE,Event]),
+    {noreply, State}.
+
+%%%%%%%%%%%%%%%%%%%%%%% Internal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+update_left_menu(#state{main_panel=Panel,
+			callback=Callback,
+			menu=OldMenu,
+			menu_sizer=MenuSizer} = State) ->
+    Pages = Callback:get_info(),
+    wxListBox:disconnect(OldMenu),
+    wxWindow:destroy(OldMenu),
+    NewMenu = wxListBox:new(Panel,?wxID_ANY,
+			    [{style,?wxLB_SINGLE},
+			     {choices,[T || {T,_,_} <- Pages]}]),
+    wxListBox:setSelection(NewMenu,0),
+    wxListBox:connect(NewMenu, command_listbox_selected),
+    wxSizer:add(MenuSizer,NewMenu,[{flag,?wxEXPAND},{proportion,2}]),
+    wxSizer:layout(MenuSizer),
+    State#state{pages=Pages,menu=NewMenu}.
+
+update_dyn_page(#state{dyn_page=undefined} = State) ->
+    load_dyn_page(State);
+update_dyn_page(#state{dyn_page=OldDynPage,
+		       dyn_sizer=OldDynSizer} = State) ->
+    wxSizer:detach(OldDynSizer,OldDynPage),
+    wxWindow:destroy(OldDynPage),
+    load_dyn_page(State).
+
+load_dyn_page(#state{main_sizer=MainSizer,
+		     dyn_panel=DynPanel,
+		     menu=Menu,
+		     pages=Pages} = State) ->
+    %% Freeze and thaw causes a hang (and is not needed) on 2.9 and higher
+    DoFreeze = [?wxMAJOR_VERSION,?wxMINOR_VERSION] < [2,9],
+    DoFreeze andalso wxWindow:freeze(DynPanel),
+    Name = wxListBox:getStringSelection(Menu),
+    {Page,Sizer} = load_dyn_page(DynPanel,Name,Pages),
+    wxSizer:layout(MainSizer),
+    DoFreeze andalso wxWindow:thaw(DynPanel),
+    wx_object:get_pid(Page) ! active,
+    State#state{dyn_page=Page,dyn_sizer=Sizer}.
+
+load_dyn_page(Panel,Name,Pages) ->
+    Sizer = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label,Name}]),
+
+    {_,Callback,Info} = lists:keyfind(Name,1,Pages),
+    DynPage = Callback:start_link(Panel,Info),
+
+    wxSizer:add(Sizer,DynPage,[{flag, ?wxEXPAND}, {proportion, 1}]),
+    wxPanel:setSizerAndFit(Panel,Sizer,[{deleteOld,true}]),
+    {DynPage,Sizer}.
diff --git a/lib/observer/src/cdv_port_cb.erl b/lib/observer/src/cdv_port_cb.erl
new file mode 100644
index 0000000000..08488d3e34
--- /dev/null
+++ b/lib/observer/src/cdv_port_cb.erl
@@ -0,0 +1,103 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_port_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 get_detail_cols/1,
+	 get_details/1,
+	 detail_pages/0,
+	 format/1]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+%% Columns
+-define(COL_ID,  0).
+-define(COL_CONN, ?COL_ID+1).
+-define(COL_NAME, ?COL_CONN+1).
+-define(COL_CTRL, ?COL_NAME+1).
+-define(COL_SLOT, ?COL_CTRL+1).
+
+
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_ID);
+col_to_elem(?COL_ID)  -> #port.id;
+col_to_elem(?COL_CONN) -> #port.connected;
+col_to_elem(?COL_NAME)  -> #port.name;
+col_to_elem(?COL_CTRL) -> #port.controls;
+col_to_elem(?COL_SLOT) -> #port.slot.
+
+col_spec() ->
+    [{"Id", ?wxLIST_FORMAT_LEFT,  100},
+     {"Connected", ?wxLIST_FORMAT_LEFT, 120},
+     {"Name", ?wxLIST_FORMAT_LEFT, 150},
+     {"Controls", ?wxLIST_FORMAT_LEFT, 200},
+     {"Slot", ?wxLIST_FORMAT_RIGHT, 50}].
+
+get_info(_) ->
+    {ok,Info,TW} = crashdump_viewer:ports(),
+    {Info,TW}.
+
+get_detail_cols(_) ->
+    {[?COL_ID,?COL_CONN],true}.
+
+%% Callbacks for cdv_detail_wx
+get_details(Id) ->
+    case crashdump_viewer:port(Id) of
+	{ok,Info,TW} ->
+	    Proplist =
+		crashdump_viewer:to_proplist(record_info(fields,port),Info),
+	    {ok,{Id,Proplist,TW}};
+	{error,{other_node,NodeId}} ->
+	    Info = "The port you are searching for was residing on "
+		"a remote node. No port information is available. "
+		"Show information about the remote node?",
+	    Fun = fun() -> cdv_virtual_list_wx:start_detail_win(NodeId) end,
+	    {yes_no, Info, Fun};
+	{error,not_found} ->
+	    Info = "The port you are searching for could not be found.",
+	    {info,Info}
+    end.
+
+detail_pages() ->
+    [{"General Information",   fun init_gen_page/2}].
+
+init_gen_page(Parent, Info) ->
+    Fields = info_fields(),
+    cdv_info_wx:start_link(Parent,{Fields,Info,[]}).
+
+format({I1,I2}) ->
+    "#Port<"++integer_to_list(I1) ++ "." ++ integer_to_list(I2) ++ ">";
+format(D) ->
+    D.
+
+
+%%%-----------------------------------------------------------------
+%%% Internal
+info_fields() ->
+    [{"Overview",
+      [{"Name",             name},
+       {"Connected",        {click,connected}},
+       {"Slot",             slot},
+       {"Controls",         controls}]},
+    {scroll_boxes,
+     [{"Links",1,{click,links}},
+       {"Monitors",1,{click,monitors}}]}].
diff --git a/lib/observer/src/cdv_proc_cb.erl b/lib/observer/src/cdv_proc_cb.erl
new file mode 100644
index 0000000000..dfc2df9c4c
--- /dev/null
+++ b/lib/observer/src/cdv_proc_cb.erl
@@ -0,0 +1,156 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_proc_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 get_detail_cols/1,
+	 get_details/1,
+	 detail_pages/0]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+%% Columns
+-define(COL_ID,  0).
+-define(COL_NAME, ?COL_ID+1).
+-define(COL_STATE,?COL_NAME+1).
+-define(COL_REDS, ?COL_STATE+1).
+-define(COL_MEM,  ?COL_REDS+1).
+-define(COL_MSG,  ?COL_MEM+1).
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_ID);
+col_to_elem(?COL_ID)  -> #proc.pid;
+col_to_elem(?COL_NAME) -> #proc.name;
+col_to_elem(?COL_STATE) -> #proc.state;
+col_to_elem(?COL_MEM)  -> #proc.memory;
+col_to_elem(?COL_REDS) -> #proc.reds;
+col_to_elem(?COL_MSG)  -> #proc.msg_q_len.
+
+col_spec() ->
+    [{"Pid", ?wxLIST_FORMAT_CENTRE,  120},
+     {"Name or Initial Func", ?wxLIST_FORMAT_LEFT, 250},
+     {"State", ?wxLIST_FORMAT_LEFT, 100},
+     {"Reds", ?wxLIST_FORMAT_RIGHT, 80},
+     {"Memory", ?wxLIST_FORMAT_RIGHT, 80},
+     {"MsgQ",  ?wxLIST_FORMAT_RIGHT, 50}].
+
+get_info(_) ->
+    {ok,Info,TW} = crashdump_viewer:processes(),
+    {Info,TW}.
+
+get_detail_cols(_) ->
+    {[?COL_ID],true}.
+
+%% Callbacks for cdv_detail_wx
+get_details(Id) ->
+    case crashdump_viewer:proc_details(Id) of
+	{ok,Info,TW} ->
+	    %% The following table is used by observer_html_lib
+	    %% for storing expanded terms and it is read by
+	    %% cdv_html_wx when a link to an expandable term is clicked.
+	    Tab = ets:new(cdv_expand,[set,public]),
+	    Proplist0 =
+		crashdump_viewer:to_proplist(record_info(fields,proc),Info),
+	    Proplist = [{expand_table,Tab}|Proplist0],
+	    Title = io_lib:format("~s (~s)",[Info#proc.name, Id]),
+	    {ok,{Title,Proplist,TW}};
+	{error,{other_node,NodeId}} ->
+	    Info = "The process you are searching for was residing on "
+		"a remote node. No process information is available. "
+		"Show information about the remote node?",
+	    Fun = fun() -> cdv_virtual_list_wx:start_detail_win(NodeId) end,
+	    {yes_no, Info, Fun};
+	{error,not_found} ->
+	    Info = "The process you are searching for could not be found.",
+	    {info,Info}
+    end.
+
+detail_pages() ->
+    [{"General Information",   fun init_gen_page/2},
+     {"Messages",   fun init_message_page/2},
+     {"Dictionary", fun init_dict_page/2},
+     {"Stack Dump", fun init_stack_page/2},
+     {"ETS tables", fun init_ets_page/2},
+     {"Timers",     fun init_timer_page/2}].
+
+init_gen_page(Parent, Info) ->
+    Fields = info_fields(),
+    cdv_info_wx:start_link(Parent,{Fields,Info,[]}).
+
+init_message_page(Parent, Info) ->
+    init_memory_page(Parent, Info, msg_q, "MsgQueue").
+
+init_dict_page(Parent, Info) ->
+    init_memory_page(Parent, Info, dict, "Dictionary").
+
+init_stack_page(Parent, Info) ->
+    init_memory_page(Parent, Info, stack_dump, "StackDump").
+
+init_memory_page(Parent, Info0, Tag, Heading) ->
+    Info = proplists:get_value(Tag,Info0),
+    Tab = proplists:get_value(expand_table,Info0),
+    Html = observer_html_lib:expandable_term(Heading,Info,Tab),
+    cdv_html_wx:start_link(Parent,{expand,Html,Tab}).
+
+init_ets_page(Parent, Info) ->
+    Pid = proplists:get_value(pid,Info),
+    cdv_virtual_list_wx:start_link(Parent, cdv_ets_cb, Pid).
+
+init_timer_page(Parent, Info) ->
+    Pid = proplists:get_value(pid,Info),
+    cdv_virtual_list_wx:start_link(Parent, cdv_timer_cb, Pid).
+
+%%%-----------------------------------------------------------------
+%%% Internal
+info_fields() ->
+    [{"Overview",
+      [{"Initial Call",     init_func},
+       {dynamic,            current_func},
+       {"Registered Name",  name},
+       {"Status",           state},
+       {"Started",          start_time},
+       {"Parent",           {click,parent}},
+       {"Message Queue Len",msg_q_len},
+       {"Reductions",       reds},
+       {"Program counter",  prog_count},
+       {"Continuation pointer",cp},
+       {"Arity",arity}]},
+     {scroll_boxes,
+      [{"Last Calls",1,{plain,last_calls}}]},
+     {scroll_boxes,
+      [{"Links",1,{click,links}},
+       {"Monitors",2,{click,monitors}},
+       {"Monitored By",2,{click,mon_by}}]},
+     {"Memory and Garbage Collection",
+      [{"Memory",           memory},
+       {"Stack and Heap",   stack_heap},
+       {"Old Heap",         old_heap},
+       {"Heap Unused",      heap_unused},
+       {"Old Heap Unused",  old_heap_unused},
+       {"Number of Heap Fragements", num_heap_frag},
+       {"Heap Fragment Data",heap_frag_data},
+       {"New Heap Start",   new_heap_start},
+       {"New Heap Top",     new_heap_top},
+       {"Stack Top",        stack_top},
+       {"Stack End",        stack_end},
+       {"Old Heap Start",   old_heap_start},
+       {"Old Heap Top",     old_heap_top},
+       {"Old Heap End",     old_heap_end}]}].
diff --git a/lib/observer/src/cdv_table_wx.erl b/lib/observer/src/cdv_table_wx.erl
new file mode 100644
index 0000000000..f8943db17d
--- /dev/null
+++ b/lib/observer/src/cdv_table_wx.erl
@@ -0,0 +1,106 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%%
+%% The 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(cdv_table_wx).
+
+-behaviour(wx_object).
+
+-export([start_link/2]).
+%% wx_object callbacks
+-export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
+	 handle_event/2, handle_cast/2]).
+
+-include_lib("wx/include/wx.hrl").
+-include("observer_defs.hrl").
+
+%% Records
+-record(state,
+	{trunc_warn=[]}).
+
+start_link(ParentWin, Info) ->
+    wx_object:start_link(?MODULE, [ParentWin, Info], []).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init([ParentWin, Callback]) when is_atom(Callback) ->
+    {ok,TableInfo} = Callback:get_info(),
+    init([ParentWin, TableInfo]);
+
+init([ParentWin, {ColumnSpec,Info,TW}]) ->
+    Style0 = ?wxLC_REPORT bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES bor ?wxLC_VRULES,
+    Style =
+	case lists:all(fun({"",_,_}) -> true; (_) -> false end, ColumnSpec) of
+	    true -> Style0 bor ?wxLC_NO_HEADER;
+	    false -> Style0
+	end,
+    Grid = wxListCtrl:new(ParentWin, [{style, Style}]),
+    Li = wxListItem:new(),
+    AddListEntry = fun({Name, Align, DefSize}, Col) ->
+			   wxListItem:setText(Li, Name),
+			   wxListItem:setAlign(Li, Align),
+			   wxListCtrl:insertColumn(Grid, Col, Li),
+			   wxListCtrl:setColumnWidth(Grid, Col, DefSize),
+			   Col + 1
+		   end,
+    lists:foldl(AddListEntry, 0, ColumnSpec),
+    wxListItem:destroy(Li),
+    Insert = fun(RowData, Row) ->
+		     wxListCtrl:insertItem(Grid, Row, ""),
+		     set_items(Grid,Row,RowData,0),
+		     Row + 1
+	     end,
+    lists:foldl(Insert, 0, Info),
+    {Grid, #state{trunc_warn=TW}}.
+
+%%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_info(active, State) ->
+    cdv_wx:set_status(State#state.trunc_warn),
+    {noreply, State};
+
+handle_info(Info, State) ->
+    io:format("~p:~p: Unhandled info: ~p~n", [?MODULE, ?LINE, Info]),
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_, _, State) ->
+    {ok, State}.
+
+handle_call(Msg, _From, State) ->
+    io:format("~p~p: Unhandled Call ~p~n",[?MODULE, ?LINE, Msg]),
+    {reply, ok, State}.
+
+handle_cast(Msg, State) ->
+    io:format("~p~p: Unhandled cast ~p~n",[?MODULE, ?LINE, Msg]),
+    {noreply, State}.
+
+handle_event(Event, State) ->
+    io:format("~p:~p: Unhandled event ~p\n", [?MODULE,?LINE,Event]),
+    {noreply, State}.
+
+%%%%%%%%%%%%%%%%%%%%%%% Internal %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+set_items(Grid,Row,[Col|Cols],ColN) ->
+    Str = case Col of
+	      undefined -> "";
+	      _ -> observer_lib:to_str(Col)
+	  end,
+    wxListCtrl:setItem(Grid, Row, ColN, Str),
+    set_items(Grid,Row,Cols,ColN+1);
+set_items(_,_,[],_) ->
+    ok.
diff --git a/lib/observer/src/cdv_term_cb.erl b/lib/observer/src/cdv_term_cb.erl
new file mode 100644
index 0000000000..4451045012
--- /dev/null
+++ b/lib/observer/src/cdv_term_cb.erl
@@ -0,0 +1,76 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
+%%
+%% The 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(cdv_term_cb).
+
+-export([get_details/1,
+	 detail_pages/0]).
+
+%% Callbacks for cdv_detail_wx
+get_details({Type, {T,Key}}) ->
+    [{Key,Term}] = ets:lookup(T,Key),
+    {ok,{"Expanded Term", {Type,[Term, T]}, []}}.
+
+detail_pages() ->
+    [{"Term", fun init_term_page/2}].
+
+init_term_page(ParentWin, {Type, [Term, Tab]}) ->
+    Expanded = expand(Term, true),
+    BinSaved = expand(Term, Tab),
+    cdv_multi_wx:start_link(
+      ParentWin,
+      [{"Format \~p",cdv_html_wx,{Type, format_term_fun("~p",BinSaved,Tab)}},
+       {"Format \~tp",cdv_html_wx,{Type,format_term_fun("~tp",BinSaved,Tab)}},
+       {"Format \~w",cdv_html_wx,{Type,format_term_fun("~w",BinSaved,Tab)}},
+       {"Format \~s",cdv_html_wx,{Type,format_term_fun("~s",Expanded,Tab)}},
+       {"Format \~ts",cdv_html_wx,{Type,format_term_fun("~ts",Expanded,Tab)}}]).
+
+format_term_fun(Format,Term,Tab) ->
+    fun() ->
+	    try io_lib:format(Format,[Term]) of
+		Str -> {expand, plain_html(Str), Tab}
+	    catch error:badarg ->
+		    Warning = "This term can not be formatted with " ++ Format,
+		    observer_html_lib:warning(Warning)
+	    end
+    end.
+
+plain_html(Text) ->
+    observer_html_lib:plain_page(Text).
+
+expand(['#CDVBin',Offset,Size,Pos], true) ->
+    {ok,Bin} = crashdump_viewer:expand_binary({Offset,Size,Pos}),
+    Bin;
+expand(Bin, Tab) when is_binary(Bin), not is_boolean(Tab) ->
+    Size = byte_size(Bin),
+    PrevSize = min(Size, 10) * 8,
+    <<Preview:PrevSize, _/binary>> = Bin,
+    Hash = erlang:phash2(Bin),
+    Key = {Preview, Size, Hash},
+    ets:insert(Tab, {Key,Bin}),
+    ['#OBSBin',Preview,Size,Hash];
+expand([H|T], Expand) ->
+    case expand(T, Expand) of
+	ET when is_list(ET) ->
+	    [expand(H, Expand)|ET];
+        ET -> % The tail is an expanded binary - cannot append with |
+	    [expand(H, Expand),ET]
+    end;
+expand(Tuple, Expand) when is_tuple(Tuple) ->
+    list_to_tuple(expand(tuple_to_list(Tuple), Expand));
+expand(Term, _) ->
+    Term.
diff --git a/lib/observer/src/cdv_timer_cb.erl b/lib/observer/src/cdv_timer_cb.erl
new file mode 100644
index 0000000000..9cdbfa05a9
--- /dev/null
+++ b/lib/observer/src/cdv_timer_cb.erl
@@ -0,0 +1,51 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_timer_cb).
+
+-export([col_to_elem/1,
+	 col_spec/0,
+	 get_info/1,
+	 get_detail_cols/1]).
+
+-include_lib("wx/include/wx.hrl").
+-include("crashdump_viewer.hrl").
+
+%% Defines
+-define(COL_OWNER, 0).
+-define(COL_MSG,   ?COL_OWNER+1).
+-define(COL_TIME,  ?COL_MSG+1).
+
+%% Callbacks for cdv_virtual_list_wx
+col_to_elem(id) -> col_to_elem(?COL_OWNER);
+col_to_elem(?COL_OWNER) -> #timer.pid;
+col_to_elem(?COL_MSG)   -> #timer.msg;
+col_to_elem(?COL_TIME)  -> #timer.time.
+
+col_spec() ->
+    [{"Owner",      ?wxLIST_FORMAT_LEFT,   110},
+     {"Message",    ?wxLIST_FORMAT_LEFT,   400},
+     {"Time left (ms)",  ?wxLIST_FORMAT_RIGHT,  80}].
+
+get_info(Owner) ->
+    {ok,Info,TW} = crashdump_viewer:timers(Owner),
+    {Info,TW}.
+
+get_detail_cols(all) ->
+    {[?COL_OWNER],false};
+get_detail_cols(_) ->
+    {[],false}.
diff --git a/lib/observer/src/cdv_virtual_list_wx.erl b/lib/observer/src/cdv_virtual_list_wx.erl
new file mode 100644
index 0000000000..c5a7d9a2e5
--- /dev/null
+++ b/lib/observer/src/cdv_virtual_list_wx.erl
@@ -0,0 +1,414 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_virtual_list_wx).
+
+-behaviour(wx_object).
+
+-export([start_link/2, start_link/3, start_detail_win/1]).
+
+%% wx_object callbacks
+-export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
+	 handle_event/2, handle_cast/2]).
+
+-include_lib("wx/include/wx.hrl").
+-include("observer_defs.hrl").
+
+%% Defines
+-define(COL_ID,  0).
+-define(ID_DETAILS, 202).
+
+%% Records
+
+-record(sort,
+	{
+	  sort_key,
+	  sort_incr=true
+	}).
+
+-record(holder, {parent,
+		 info,
+		 last_row,
+		 sort,
+		 attrs,
+		 callback
+		}).
+
+-record(state, {grid,
+		panel,
+		detail_wins=[],
+		holder,
+		callback,
+		trunc_warn=[],
+		menu_cols=[],     % columns to show in right click menu
+		menu_items=[]}).  % right click menu items for the selected row
+
+start_link(ParentWin, Callback) ->
+    wx_object:start_link({local,Callback},?MODULE,
+			 [ParentWin, Callback, all], []).
+
+start_link(ParentWin, Callback, Owner) ->
+    wx_object:start_link(?MODULE, [ParentWin, Callback, Owner], []).
+
+start_detail_win(Id) ->
+    Callback =
+	case Id of
+	    "<"++_ ->
+		cdv_proc_cb;
+	    "#Port"++_ ->
+		cdv_port_cb;
+	    _ ->
+		case catch list_to_integer(Id) of
+		    NodeId when is_integer(NodeId) ->
+			cdv_dist_cb;
+		    _ ->
+			cdv_mod_cb
+		end
+	end,
+    start_detail_win(Callback,Id).
+start_detail_win(Callback,Id) ->
+    wx_object:cast(Callback,{start_detail_win,Id}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+init([ParentWin, Callback, Owner]) ->
+    {Holder,TW} = spawn_table_holder(Callback, Owner),
+    Panel = wxPanel:new(ParentWin),
+    {Grid,MenuCols}  = create_list_box(Panel, Holder, Callback, Owner),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    wxSizer:add(Sizer, Grid, [{flag, ?wxEXPAND bor ?wxALL},
+			      {proportion, 1},
+			      {border,4}]),
+
+    wxWindow:setSizer(Panel, Sizer),
+
+    State = #state{grid=Grid,
+		   panel=Panel,
+		   holder=Holder,
+		   callback=Callback,
+		   trunc_warn=TW,
+		   menu_cols=MenuCols
+		   },
+    {Panel, State}.
+
+%% UI-creation
+
+create_list_box(Panel, Holder, Callback, Owner) ->
+    Style =
+	?wxLC_SINGLE_SEL bor ?wxLC_REPORT bor ?wxLC_VIRTUAL bor
+	?wxLC_HRULES bor ?wxHSCROLL bor ?wxVSCROLL,
+    ListCtrl = wxListCtrl:new(Panel, [{style, Style},
+				      {onGetItemText,
+				       fun(_, Row, Col) ->
+					       call(Holder, {get_row, self(), Row, Col})
+				       end},
+				      {onGetItemAttr,
+				       fun(_, Item) ->
+					       call(Holder, {get_attr, self(), Item})
+				       end}
+				     ]),
+    Li = wxListItem:new(),
+    AddListEntry = fun({Name, Align, DefSize}, Col) ->
+			   wxListItem:setText(Li, Name),
+			   wxListItem:setAlign(Li, Align),
+			   wxListCtrl:insertColumn(ListCtrl, Col, Li),
+			   wxListCtrl:setColumnWidth(ListCtrl, Col, DefSize),
+			   Col + 1
+		   end,
+    ListItems = Callback:col_spec(),
+    lists:foldl(AddListEntry, 0, ListItems),
+    wxListItem:destroy(Li),
+
+    wxListCtrl:setItemCount(ListCtrl, 0),
+    wxListCtrl:connect(ListCtrl, size, [{skip, true}]),
+    wxListCtrl:connect(ListCtrl, command_list_col_click),
+
+
+    %% If detail pages can be opened from this list - catch double
+    %% click and right click
+    DetailCols =
+	case catch Callback:get_detail_cols(Owner) of
+	    {DC,DoubleClick} when is_list(DC), DC=/=[] ->
+		wxListCtrl:connect(ListCtrl, command_list_item_right_click),
+		if DoubleClick ->
+			wxListCtrl:connect(ListCtrl, command_list_item_activated);
+		   true ->
+			ok
+		end,
+		DC;
+	    _ ->
+		[]
+	end,
+
+    {ListCtrl,DetailCols}.
+
+do_start_detail_win(undefined, State) ->
+    State;
+do_start_detail_win(Id, #state{panel=Panel,detail_wins=Opened,
+			       callback=Callback}=State) ->
+    NewOpened =
+	case lists:keyfind(Id, 1, Opened) of
+	    false ->
+		case cdv_detail_wx:start_link(Id, Panel, Callback) of
+		    {error, _} ->
+			Opened;
+		    IW ->
+			[{Id, IW} | Opened]
+		end;
+	    {_, IW} ->
+		wxFrame:raise(IW),
+		Opened
+	end,
+    State#state{detail_wins=NewOpened}.
+
+call(Holder, What) when is_atom(Holder) ->
+    call(whereis(Holder), What);
+call(Holder, What) when is_pid(Holder) ->
+    Ref = erlang:monitor(process, Holder),
+    Holder ! What,
+    receive
+	{'DOWN', Ref, _, _, _} -> "";
+	{Holder, Res} ->
+	    erlang:demonitor(Ref),
+	    Res
+    after 5000 ->
+	    io:format("Hanging call ~p~n",[What]),
+	    ""
+    end;
+call(_,_) ->
+    "".
+
+
+%%%%%%%%%%%%%%%%%%%%%%% Callbacks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_info({holder_updated, Count}, State=#state{grid=Grid}) ->
+    wxListCtrl:setItemCount(Grid, Count),
+    Count > 0 andalso wxListCtrl:refreshItems(Grid, 0, Count-1),
+    {noreply, State};
+
+handle_info(active, State) ->
+    cdv_wx:set_status(State#state.trunc_warn),
+    {noreply, State};
+
+handle_info(Info, State) ->
+    io:format("~p:~p, Unexpected info: ~p~n", [?MODULE, ?LINE, Info]),
+    {noreply, State}.
+
+terminate(_Reason, #state{holder=Holder}) ->
+    Holder ! stop,
+    ok.
+
+code_change(_, _, State) ->
+    {ok, State}.
+
+handle_call(new_dump, _From,
+	    #state{grid=Grid,detail_wins=Opened,
+		   holder=Holder,callback=Callback}=State) ->
+    lists:foreach(fun({_Id, IW}) -> wxFrame:destroy(IW) end, Opened),
+    wxListCtrl:deleteAllItems(Grid),
+    Ref = erlang:monitor(process,Holder),
+    Holder ! stop,
+    receive {'DOWN',Ref,_,_,_} -> ok end,
+    {NewHolder,TW} = spawn_table_holder(Callback, all),
+    {reply, ok, State#state{detail_wins=[],holder=NewHolder,trunc_warn=TW}};
+
+handle_call(Msg, _From, State) ->
+    io:format("~p:~p: Unhandled call ~p~n",[?MODULE, ?LINE, Msg]),
+    {reply, ok, State}.
+
+handle_cast({start_detail_win,Id}, State) ->
+    State2 = do_start_detail_win(Id, State),
+    {noreply, State2};
+
+handle_cast({detail_win_closed, Id},#state{detail_wins=Opened}=State) ->
+    Opened2 = lists:keydelete(Id, 1, Opened),
+    {noreply, State#state{detail_wins=Opened2}};
+
+handle_cast(Msg, State) ->
+    io:format("~p:~p: Unhandled cast ~p~n", [?MODULE, ?LINE, Msg]),
+    {noreply, State}.
+
+%%%%%%%%%%%%%%%%%%%%LOOP%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+handle_event(#wx{id=MenuId,
+		 event=#wxCommand{type = command_menu_selected}},
+	     #state{menu_items=MenuItems} = State) ->
+    case lists:keyfind(MenuId,1,MenuItems) of
+	{MenuId,Id} ->
+	    start_detail_win(Id);
+	false ->
+	    ok
+    end,
+    {noreply, State};
+
+handle_event(#wx{event=#wxSize{size={W,_}}},
+	     #state{grid=Grid}=State) ->
+    observer_lib:set_listctrl_col_size(Grid, W),
+    {noreply, State};
+
+handle_event(#wx{event=#wxList{type=command_list_item_right_click,
+			       itemIndex=Row}},
+	     #state{panel=Panel, holder=Holder, menu_cols=MenuCols} = State) ->
+    Menu = wxMenu:new(),
+    MenuItems =
+	lists:flatmap(
+	  fun(Col) ->
+		  MenuId = ?ID_DETAILS + Col,
+		  ColText = call(Holder, {get_row, self(), Row, Col}),
+		  case ColText of
+		      "[]" -> [];
+		      _ ->
+			  What =
+			      case catch list_to_integer(ColText) of
+				  NodeId when is_integer(NodeId) ->
+				      "node " ++ ColText;
+				  _ ->
+				      ColText
+			      end,
+			  Text = "Properties for " ++ What,
+			  wxMenu:append(Menu, MenuId, Text),
+			  [{MenuId,ColText}]
+		  end
+	  end,
+	  MenuCols),
+    wxWindow:popupMenu(Panel, Menu),
+    wxMenu:destroy(Menu),
+    {noreply,State#state{menu_items=MenuItems}};
+
+handle_event(#wx{event=#wxList{type=command_list_col_click, col=Col}},
+	     #state{holder=Holder}=State) ->
+    Holder !  {change_sort, Col},
+    {noreply, State};
+
+handle_event(#wx{event=#wxList{type=command_list_item_activated,
+			       itemIndex=Row}},
+	     #state{holder=Holder} = State) ->
+    Id = call(Holder, {get_row, self(), Row, id}),
+    start_detail_win(Id),
+    {noreply, State};
+
+handle_event(Event, State) ->
+    io:format("~p:~p: handle event ~p\n", [?MODULE, ?LINE, Event]),
+    {noreply, State}.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%TABLE HOLDER%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+spawn_table_holder(Callback, Owner) ->
+    {Info,TW} = Callback:get_info(Owner),
+    Attrs = observer_lib:create_attrs(),
+    Parent = self(),
+    Holder =
+	case Owner of
+	    all ->
+		Name = list_to_atom(atom_to_list(Callback) ++ "__holder"),
+		spawn_link(
+		  fun() ->
+			  register(Name,self()),
+			  init_table_holder(Parent, Attrs, Callback, Info)
+		  end),
+		Name;
+	    _ ->
+		spawn_link(
+		  fun() ->
+			  init_table_holder(Parent, Attrs, Callback, Info)
+		  end)
+	end,
+    {Holder,TW}.
+
+init_table_holder(Parent, Attrs, Callback, InfoList0) ->
+    Sort = #sort{sort_key=Callback:col_to_elem(id)},
+    {_Sort, InfoList} = do_sort(Sort,InfoList0),
+    Info = array:from_list(InfoList),
+    NRows = array:size(Info),
+    Parent ! {holder_updated, NRows},
+    table_holder(#holder{parent=Parent,
+			 info=Info,
+			 sort=Sort,
+			 attrs=Attrs,
+			 callback=Callback}).
+
+table_holder(#holder{callback=Callback, attrs=Attrs}=S0) ->
+    receive
+	_M={get_row, From, Row, Col} ->
+	    %% erlang:display(_M),
+	    State = get_row(From, Row, Col, S0),
+	    table_holder(State);
+	_M={get_attr, From, Row} ->
+	    %% erlang:display(_M),
+	    get_attr(From, Row, Attrs),
+	    table_holder(S0);
+	_M={change_sort, Col} ->
+	    %% erlang:display(_M),
+	    State = change_sort(Callback:col_to_elem(Col), S0),
+	    table_holder(State);
+	stop ->
+	    ok;
+	What ->
+	    io:format("Table holder got ~p~n",[What]),
+	    table_holder(S0)
+    end.
+
+change_sort(Col, S0=#holder{parent=Parent, info=Info0, sort=Sort0}) ->
+    NRows = array:size(Info0),
+    InfoList0 = array:to_list(Info0),
+    {Sort, InfoList}=sort(Col, Sort0, InfoList0),
+    Info = array:from_list(InfoList),
+    Parent ! {holder_updated, NRows},
+    S0#holder{info=Info, last_row=undefined, sort=Sort}.
+
+sort(Col, Opt=#sort{sort_key=Col, sort_incr=Bool}, Table) ->
+    do_sort(Opt#sort{sort_incr=not Bool}, Table);
+sort(Col, Sort,Table) ->
+    do_sort(Sort#sort{sort_key=Col, sort_incr=true}, Table).
+
+do_sort(Sort=#sort{sort_key=Col, sort_incr=true}, Table) ->
+    {Sort, lists:keysort(Col, Table)};
+do_sort(Sort=#sort{sort_key=Col, sort_incr=false}, Table) ->
+    {Sort, lists:reverse(lists:keysort(Col, Table))}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+get_cell_data(Callback, ColNo, RowInfo) ->
+    case element(Callback:col_to_elem(ColNo), RowInfo) of
+	undefined -> "";
+	Cell -> try Callback:format(Cell) catch error:undef -> Cell end
+    end.
+
+get_row(From, Row, Col,
+	#holder{callback=Callback, last_row={Row,RowInfo}}=State) ->
+    Data = get_cell_data(Callback, Col, RowInfo),
+    From ! {self(), observer_lib:to_str(Data)},
+    State;
+get_row(From, Row, Col, #holder{callback=Callback, info=Info}=S0) ->
+    {Data,State} =
+	case Row >= array:size(Info) of
+	    true ->
+		{"",S0};
+	    false ->
+		RowInfo = array:get(Row, Info),
+		CellData = get_cell_data(Callback, Col, RowInfo),
+		{CellData,S0#holder{last_row={Row,RowInfo}}}
+	end,
+    From ! {self(), observer_lib:to_str(Data)},
+    State.
+
+get_attr(From, Row, Attrs) ->
+    Attribute = case Row rem 2 =:= 0 of
+		    true ->  Attrs#attrs.even;
+		    false -> Attrs#attrs.odd
+		end,
+    From ! {self(), Attribute}.
diff --git a/lib/observer/src/cdv_wx.erl b/lib/observer/src/cdv_wx.erl
new file mode 100644
index 0000000000..26df60b0a6
--- /dev/null
+++ b/lib/observer/src/cdv_wx.erl
@@ -0,0 +1,462 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(cdv_wx).
+-compile(export_all).
+-behaviour(wx_object).
+
+-export([start/1]).
+-export([get_attrib/1, set_status/1, create_txt_dialog/4]).
+
+-export([init/1, handle_event/2, handle_cast/2, terminate/2, code_change/3,
+	 handle_call/3, handle_info/2, check_page_title/1]).
+
+%% Includes
+-include_lib("wx/include/wx.hrl").
+-include_lib("kernel/include/file.hrl").
+
+-include("observer_defs.hrl").
+
+%% Defines
+
+-define(SERVER, cdv_wx).
+
+-define(ID_UG, 1).
+-define(ID_HOWTO, 2).
+-define(ID_NOTEBOOK, 3).
+
+-define(GEN_STR,   "General").
+-define(PRO_STR,   "Processes").
+-define(PORT_STR,  "Ports").
+-define(ETS_STR,   "ETS Tables").
+-define(TIMER_STR, "Timers").
+-define(FUN_STR,   "Funs").
+-define(ATOM_STR,  "Atoms").
+-define(DIST_STR,  "Nodes").
+-define(MOD_STR,   "Modules").
+-define(MEM_STR,   "Memory").
+-define(INT_STR,   "Internal Tables").
+
+%% Records
+-record(state,
+	{server,
+	 file,
+	 frame,
+	 menubar,
+	 menus = [],
+	 status_bar,
+	 notebook,
+	 main_panel,
+	 gen_panel,
+	 pro_panel,
+	 port_panel,
+	 ets_panel,
+	 timer_panel,
+	 fun_panel,
+	 atom_panel,
+	 dist_panel,
+	 mod_panel,
+	 mem_panel,
+	 int_panel,
+	 active_tab
+	}).
+
+start(File) ->
+    case wx_object:start(?MODULE, File, []) of
+	Err = {error, _} -> Err;
+	_Obj -> ok
+    end.
+
+get_attrib(What) ->
+    wx_object:call(?SERVER, {get_attrib, What}).
+
+set_status(What) ->
+    wx_object:cast(?SERVER, {status_bar, What}).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+init(File0) ->
+    register(?SERVER, self()),
+    wx:new(),
+
+    {ok,CdvServer} = crashdump_viewer:start_link(),
+
+    catch wxSystemOptions:setOption("mac.listctrl.always_use_generic", 1),
+    Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Crashdump Viewer",
+			[{size, {850, 600}}, {style, ?wxDEFAULT_FRAME_STYLE}]),
+    IconFile = filename:join(code:priv_dir(observer), "erlang_observer.png"),
+    Icon = wxIcon:new(IconFile, [{type,?wxBITMAP_TYPE_PNG}]),
+    wxFrame:setIcon(Frame, Icon),
+    wxIcon:destroy(Icon),
+
+    %% Setup panels
+    Panel = wxPanel:new(Frame, []),
+    Notebook = wxNotebook:new(Panel, ?ID_NOTEBOOK, [{style, ?wxBK_DEFAULT}]),
+
+    %% Setup "statusbar" to show warnings
+    StatusBar = observer_lib:create_status_bar(Panel),
+
+    %% Setup sizer create early to get it when window shows
+    MainSizer = wxBoxSizer:new(?wxVERTICAL),
+
+    wxSizer:add(MainSizer, Notebook, [{proportion, 1}, {flag, ?wxEXPAND}]),
+    wxSizer:add(MainSizer, StatusBar, [{flag, ?wxEXPAND bor ?wxALL},
+				       {proportion, 0},
+				       {border,4}]),
+    wxPanel:setSizer(Panel, MainSizer),
+
+    wxNotebook:connect(Notebook, command_notebook_page_changing),
+    wxFrame:connect(Frame, close_window, [{skip, true}]),
+    wxMenu:connect(Frame, command_menu_selected),
+
+    case load_dump(Frame,File0) of
+	{ok,File} ->
+	    %% Set window title
+	    T1 = "Crashdump Viewer: ",
+	    Title =
+		if length(File) > 70 ->
+			T1 ++ filename:basename(File);
+		   true ->
+			T1 ++ File
+		end,
+	    wxFrame:setTitle(Frame, Title),
+
+	    setup(#state{server=CdvServer,
+			 file=File,
+			 frame=Frame,
+			 status_bar=StatusBar,
+			 notebook=Notebook,
+			 main_panel=Panel});
+	error ->
+	    wxFrame:destroy(Frame),
+	    wx:destroy(),
+	    crashdump_viewer:stop(),
+	    ignore
+    end.
+
+setup(#state{frame=Frame, notebook=Notebook}=State) ->
+
+    %% Setup Menubar & Menus
+    MenuBar = wxMenuBar:new(),
+    DefMenus = default_menus(),
+    observer_lib:create_menus(DefMenus, MenuBar, default),
+    wxFrame:setMenuBar(Frame, MenuBar),
+
+    %% General information Panel
+    GenPanel = add_page(Notebook, ?GEN_STR, cdv_info_wx, cdv_gen_cb),
+
+    %% Process Panel
+    ProPanel = add_page(Notebook, ?PRO_STR, cdv_virtual_list_wx, cdv_proc_cb),
+
+    %% Port Panel
+    PortPanel = add_page(Notebook, ?PORT_STR, cdv_virtual_list_wx, cdv_port_cb),
+
+    %% Table Panel
+    EtsPanel = add_page(Notebook, ?ETS_STR, cdv_virtual_list_wx, cdv_ets_cb),
+
+    %% Timer Panel
+    TimerPanel = add_page(Notebook, ?TIMER_STR, cdv_virtual_list_wx,cdv_timer_cb),
+
+    %% Fun Panel
+    FunPanel = add_page(Notebook, ?FUN_STR, cdv_virtual_list_wx, cdv_fun_cb),
+
+    %% Atom Panel
+    AtomPanel = add_page(Notebook, ?ATOM_STR, cdv_virtual_list_wx, cdv_atom_cb),
+
+    %% Distribution Panel
+    DistPanel = add_page(Notebook, ?DIST_STR, cdv_virtual_list_wx, cdv_dist_cb),
+
+    %% Loaded Modules Panel
+    ModPanel = add_page(Notebook, ?MOD_STR, cdv_virtual_list_wx, cdv_mod_cb),
+
+    %% Memory Panel
+    MemPanel = add_page(Notebook, ?MEM_STR, cdv_multi_wx, cdv_mem_cb),
+
+    %% Memory Panel
+    IntPanel = add_page(Notebook, ?INT_STR, cdv_multi_wx, cdv_int_tab_cb),
+
+    %% Show the window
+    wxFrame:show(Frame),
+
+    GenPid = wx_object:get_pid(GenPanel),
+    GenPid ! active,
+    observer_lib:destroy_progress_dialog(),
+    process_flag(trap_exit, true),
+    {Frame, State#state{menubar = MenuBar,
+			gen_panel = GenPanel,
+			pro_panel = ProPanel,
+			port_panel = PortPanel,
+			ets_panel = EtsPanel,
+			timer_panel = TimerPanel,
+			fun_panel = FunPanel,
+			atom_panel = AtomPanel,
+			dist_panel = DistPanel,
+			mod_panel = ModPanel,
+			mem_panel = MemPanel,
+			int_panel = IntPanel,
+			active_tab = GenPid
+		       }}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%Callbacks
+handle_event(#wx{event=#wxNotebook{type=command_notebook_page_changing}},
+	     #state{active_tab=Previous} = State) ->
+    case get_active_pid(State) of
+	Previous -> {noreply, State};
+	Pid ->
+	    Pid ! active,
+	    {noreply, State#state{active_tab=Pid}}
+    end;
+
+handle_event(#wx{event = #wxClose{}}, State) ->
+    {stop, normal, State};
+
+handle_event(#wx{id = ?wxID_OPEN,
+		 event = #wxCommand{type = command_menu_selected}},
+	     State) ->
+    NewState =
+	case load_dump(State#state.frame,undefined) of
+	    {ok,File} ->
+		Panels = [State#state.gen_panel,
+			  State#state.pro_panel,
+			  State#state.port_panel,
+			  State#state.ets_panel,
+			  State#state.timer_panel,
+			  State#state.fun_panel,
+			  State#state.atom_panel,
+			  State#state.dist_panel,
+			  State#state.mod_panel,
+			  State#state.mem_panel,
+			  State#state.int_panel],
+		_ = [wx_object:call(Panel,new_dump) || Panel<-Panels],
+		wxNotebook:setSelection(State#state.notebook,0),
+		observer_lib:destroy_progress_dialog(),
+		State#state{file=File};
+	    error ->
+		State
+    end,
+    {noreply,NewState};
+
+handle_event(#wx{id = ?wxID_EXIT,
+		 event = #wxCommand{type = command_menu_selected}},
+	     State) ->
+    {stop, normal, State};
+
+handle_event(#wx{id = HelpId,
+		 event = #wxCommand{type = command_menu_selected}},
+	     State) when HelpId==?wxID_HELP; HelpId==?ID_UG; HelpId==?ID_HOWTO ->
+    Help = get_help_doc(HelpId),
+    wx_misc:launchDefaultBrowser(Help) orelse
+	create_txt_dialog(State#state.frame,
+			  "Could not launch browser: ~n " ++ Help,
+			  "Error", ?wxICON_ERROR),
+    {noreply, State};
+
+handle_event(#wx{id = ?wxID_ABOUT,
+		 event = #wxCommand{type = command_menu_selected}},
+	     State = #state{frame=Frame}) ->
+    AboutString = "Display information from an erlang crash dump",
+    Style = [{style, ?wxOK bor ?wxSTAY_ON_TOP},
+	     {caption, "About"}],
+    wxMessageDialog:showModal(wxMessageDialog:new(Frame, AboutString, Style)),
+    {noreply, State};
+
+handle_event(Event, State) ->
+    Pid = get_active_pid(State),
+    Pid ! Event,
+    {noreply, State}.
+
+handle_cast({status_bar, Msg}, State=#state{status_bar=SB}) ->
+    wxTextCtrl:clear(SB),
+    wxTextCtrl:writeText(SB, Msg),
+    {noreply, State};
+
+handle_cast(_Cast, State) ->
+    {noreply, State}.
+
+handle_call({get_attrib, Attrib}, _From, State) ->
+    {reply, get(Attrib), State};
+
+handle_call(_Msg, _From, State) ->
+    {reply, ok, State}.
+
+handle_info({'EXIT', Pid, normal}, #state{server=Pid}=State) ->
+    {stop, normal, State};
+
+handle_info({'EXIT', Pid, _Reason}, State) ->
+    io:format("Child (~s) crashed exiting:  ~p ~p~n",
+	      [pid2panel(Pid, State), Pid,_Reason]),
+    {stop, normal, State};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, #state{frame = Frame}) ->
+    wxFrame:destroy(Frame),
+    wx:destroy(),
+    crashdump_viewer:stop(),
+    ok.
+
+code_change(_, _, State) ->
+    {ok, State}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+add_page(Notebook,Title,Callback,Extra) ->
+    Panel = Callback:start_link(Notebook, Extra),
+    wxNotebook:addPage(Notebook, Panel, Title, []),
+    Panel.
+
+create_txt_dialog(Frame, Msg, Title, Style) ->
+    MD = wxMessageDialog:new(Frame, Msg, [{style, Style}]),
+    wxMessageDialog:setTitle(MD, Title),
+    wxDialog:showModal(MD),
+    wxDialog:destroy(MD).
+
+check_page_title(Notebook) ->
+    Selection = wxNotebook:getSelection(Notebook),
+    wxNotebook:getPageText(Notebook, Selection).
+
+get_active_pid(#state{notebook=Notebook, gen_panel=Gen, pro_panel=Pro,
+		      port_panel=Ports, ets_panel=Ets, timer_panel=Timers,
+		      fun_panel=Funs, atom_panel=Atoms, dist_panel=Dist,
+		      mod_panel=Mods, mem_panel=Mem, int_panel=Int
+		     }) ->
+    Panel = case check_page_title(Notebook) of
+		?GEN_STR -> Gen;
+		?PRO_STR -> Pro;
+		?PORT_STR -> Ports;
+		?ETS_STR -> Ets;
+		?TIMER_STR -> Timers;
+		?FUN_STR -> Funs;
+		?ATOM_STR -> Atoms;
+		?DIST_STR -> Dist;
+		?MOD_STR -> Mods;
+		?MEM_STR -> Mem;
+		?INT_STR -> Int
+	    end,
+    wx_object:get_pid(Panel).
+
+pid2panel(Pid, #state{gen_panel=Gen, pro_panel=Pro, port_panel=Ports,
+		      ets_panel=Ets, timer_panel=Timers, fun_panel=Funs,
+		      atom_panel=Atoms, dist_panel=Dist, mod_panel=Mods,
+		      mem_panel=Mem, int_panel=Int}) ->
+    case Pid of
+	Gen -> ?GEN_STR;
+	Pro -> ?PRO_STR;
+	Ports -> ?PORT_STR;
+	Ets -> ?ETS_STR;
+	Timers -> ?TIMER_STR;
+	Funs -> ?FUN_STR;
+	Atoms -> ?ATOM_STR;
+	Dist -> ?DIST_STR;
+	Mods -> ?MOD_STR;
+	Mem -> ?MEM_STR;
+	Int -> ?INT_STR;
+	_ -> "unknown"
+    end.
+
+default_menus() ->
+    Open  = #create_menu{id = ?wxID_OPEN, text = "Open new crash dump"},
+    Quit  = #create_menu{id = ?wxID_EXIT, text = "Quit"},
+    About = #create_menu{id = ?wxID_ABOUT, text = "About"},
+    Help  = #create_menu{id = ?wxID_HELP},
+    UG    = #create_menu{id = ?ID_UG, text = "Crashdump viewer user's guide"},
+    Howto = #create_menu{id = ?ID_HOWTO, text = "How to interpret crash dump"},
+    case os:type() =:= {unix, darwin} of
+	false ->
+	    FileMenu = {"File", [Open,Quit]},
+	    HelpMenu = {"Help", [About,Help,UG,Howto]},
+	    [FileMenu, HelpMenu];
+	true ->
+	    %% On Mac quit and about will be moved to the "default' place
+	    %% automagicly, so just add them to a menu that always exist.
+	    [{"File", [Open, About,Quit]}, {"&Help", [Help,UG,Howto]}] 
+    end.
+
+
+load_dump(Frame,undefined) ->
+    FD  =  wxFileDialog:new(wx:null(),
+			    [{style,?wxFD_OPEN bor ?wxFD_FILE_MUST_EXIST}]),
+    case wxFileDialog:showModal(FD) of
+	?wxID_OK ->
+	    Path = wxFileDialog:getPath(FD),
+	    wxDialog:destroy(FD),
+	    load_dump(Frame,Path);
+	_ ->
+	    wxDialog:destroy(FD),
+	    error
+    end;
+load_dump(Frame,FileName) ->
+    ok = observer_lib:display_progress_dialog("Crashdump Viewer",
+					      "Loading crashdump"),
+    crashdump_viewer:read_file(FileName),
+    case observer_lib:wait_for_progress() of
+	ok    ->
+	    %% Set window title
+	    T1 = "Crashdump Viewer: ",
+	    Title =
+		if length(FileName) > 70 ->
+			T1 ++ filename:basename(FileName);
+		   true ->
+			T1 ++ FileName
+		end,
+	    wxFrame:setTitle(Frame, Title),
+	    {ok,FileName};
+	error ->
+	    error
+    end.
+
+%%%-----------------------------------------------------------------
+%%% Find help document (HTML files)
+get_help_doc(HelpId) ->
+    Internal = get_internal_help_doc(HelpId),
+    case filelib:is_file(Internal) of
+	true -> Internal;
+	false -> get_external_help_doc(HelpId)
+    end.
+
+get_internal_help_doc(?ID_HOWTO) ->
+    filename:join(erts_doc_dir(),help_file(?ID_HOWTO));
+get_internal_help_doc(HelpId) ->
+    filename:join(observer_doc_dir(),help_file(HelpId)).
+
+get_external_help_doc(?ID_HOWTO) ->
+    filename:join("http://www.erlang.org/doc/apps/erts",help_file(?ID_HOWTO));
+get_external_help_doc(HelpId) ->
+    filename:join("http://www.erlang.org/doc/apps/observer",help_file(HelpId)).
+
+observer_doc_dir() ->
+    filename:join([code:lib_dir(observer),"doc","html"]).
+
+erts_doc_dir() ->
+    ErtsVsn = erlang:system_info(version),
+    RootDir = code:root_dir(),
+    VsnErtsDir = filename:join(RootDir,"erts-"++ErtsVsn),
+    DocDir = filename:join(["doc","html"]),
+    case filelib:is_dir(VsnErtsDir) of
+	true ->
+	    filename:join(VsnErtsDir,DocDir);
+	false ->
+	    %% So this can be run in source tree
+	    filename:join([RootDir,"erts",DocDir])
+    end.
+
+help_file(?wxID_HELP)  -> "crashdump_help.html";
+help_file(?ID_UG)    -> "crashdump_ug.html";
+help_file(?ID_HOWTO) -> "crash_dump.html".
diff --git a/lib/observer/src/crashdump_viewer.erl b/lib/observer/src/crashdump_viewer.erl
index e7d71c581e..a17efbccb0 100644
--- a/lib/observer/src/crashdump_viewer.erl
+++ b/lib/observer/src/crashdump_viewer.erl
@@ -20,80 +20,53 @@
 
 %% 
 %% This module is the main module in the crashdump viewer. It implements
-%% the server started by webtool and the API for the crashdump viewer tool.
-%% 
-%% All functions in the API except configData/0 and start_link/0 are 
-%% called from HTML pages via erl_scheme (mod_esi).
+%% the server backend for the crashdump viewer tool.
 %% 
 %% Tables
 %% ------
-%% cdv_menu_table: This table holds the menu which is presented in the left
-%% frame of the crashdump viewer page. Each element in the table represents
-%% one meny item, and the state of the item indicates if it is presently 
-%% visible or not.
-%% 
-%% cdv_dump_index_table: This table holds all tags read from the crashdump.
-%% Each tag indicates where the information about a specific item starts.
-%% The table entry for a tag includes the start position for this
-%% item-information. All tags start with a "=" at the beginning of
-%% a line.
+%% cdv_dump_index_table: This table holds all tags read from the
+%% crashdump.  Each tag indicates where the information about a
+%% specific item starts.  The table entry for a tag includes the start
+%% position for this item-information. In a crash dump file, all tags
+%% start with a "=" at the beginning of a line.
 %%
 %% Process state
 %% -------------
 %% file: The name of the crashdump currently viewed.
 %% dump_vsn: The version number of the crashdump
-%% procs_summary: Process summary represented by a list of 
-%% #proc records. This is used for efficiency reasons when sorting the
-%% process summary table instead of reading all processes from the
-%% dump again. Note that if the dump contains more than
-%% ?max_sort_process_num processes, the sort functionality is not
-%% available, and the procs_summary field in the state will have the
-%% value 'too_many'.
-%% sorted: string(), indicated what item was last sorted in process summary.
-%% This is needed so reverse sorting can be done.
-%% shared_heap: 'true' if crashdump comes from a system running shared heap,
-%% else 'false'.
 %% wordsize: 4 | 8, the number of bytes in a word.
 %% binaries: a gb_tree containing binaries or links to binaries in the dump
 %%
 
 %% User API
--export([start/0,stop/0,script_start/0,script_start/1]).
-
-%% Webtool API
--export([configData/0,
-	 start_link/0]).
--export([start_page/2,
-	 read_file_frame/2,
-	 read_file/2,
-	 redirect/2,
-	 filename_frame/2,
-	 menu_frame/2,
-	 initial_info_frame/2,
-	 toggle/2,
-	 general_info/2,
-	 processes/3,
-	 proc_details/2,
-	 port/2,
-	 ports/3,
-	 ets_tables/3,
-	 internal_ets_tables/2,
-	 timers/3,
-	 fun_table/3,
-	 atoms/3,
-	 dist_info/2,
-	 loaded_modules/3,
-	 loaded_mod_details/2,
-	 memory/2,
-	 allocated_areas/2,
-	 allocator_info/2,
-	 hash_tables/2,
-	 index_tables/2,
-	 sort_procs/3,
-	 expand/2,
-	 expand_binary/2,
-	 expand_memory/2]).
-
+-export([start/0,start/1,stop/0,script_start/0,script_start/1]).
+
+%% GUI API
+-export([start_link/0]).
+-export([read_file/1,
+	 general_info/0,
+	 processes/0,
+	 proc_details/1,
+	 port/1,
+	 ports/0,
+	 ets_tables/1,
+	 internal_ets_tables/0,
+	 timers/1,
+	 funs/0,
+	 atoms/0,
+	 dist_info/0,
+	 node_info/1,
+	 loaded_modules/0,
+	 loaded_mod_details/1,
+	 memory/0,
+	 allocated_areas/0,
+	 allocator_info/0,
+	 hash_tables/0,
+	 index_tables/0,
+	 expand_binary/1]).
+
+%% Library function
+-export([to_proplist/2, to_value_list/1]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, 
@@ -106,28 +79,11 @@
 -include_lib("kernel/include/file.hrl").
 -include_lib("stdlib/include/ms_transform.hrl").
 
--define(START_PAGE,"/cdv_erl/crashdump_viewer/start_page").
--define(READ_FILE_PAGE,"/cdv_erl/crashdump_viewer/read_file?path=").
 -define(SERVER, crashdump_viewer_server).
 -define(call_timeout,3600000).
 -define(chunk_size,1000). % number of bytes read from crashdump at a time
 -define(max_line_size,100). % max number of bytes (i.e. characters) the
 			    % line_head/1 function can return
--define(max_display_size,500). % max number of bytes that will be directly
-				% displayed. If e.g. msg_q is longer than
-				% this, it must be explicitly expanded.
--define(max_display_binary_size,50). % max size of a binary that will be
-				      % directly displayed.
--define(max_sort_process_num,10000). % Max number of processes that allows
-				    % sorting. If more than this number of 
-				    % processes exist, they will be displayed
-				    % in the order they are found in the log.
--define(items_chunk_size,?max_sort_process_num). % Number of items per chunk 
-						 % when page of many items
-						 % is displayed, e.g. processes,
-						 % timers, funs...
-						 % Must be equal to 
-						 % ?max_sort_process_num!
 -define(not_available,"N/A").
 
 
@@ -136,7 +92,6 @@
 -define(allocator,allocator).
 -define(atoms,atoms).
 -define(binary,binary).
--define(debug_proc_dictionary,debug_proc_dictionary).
 -define(ende,ende).
 -define(erl_crash_dump,erl_crash_dump).
 -define(ets,ets).
@@ -152,7 +107,6 @@
 -define(no_distribution,no_distribution).
 -define(node,node).
 -define(not_connected,not_connected).
--define(num_atoms,num_atoms).
 -define(old_instr_data,old_instr_data).
 -define(port,port).
 -define(proc,proc).
@@ -164,8 +118,7 @@
 -define(visible_node,visible_node).
 
 
--record(state,{file,dump_vsn,procs_summary,sorted,shared_heap=false,
-	       wordsize=4,num_atoms="unknown",binaries,bg_status}).
+-record(state,{file,dump_vsn,wordsize=4,num_atoms="unknown",binaries}).
 
 %%%-----------------------------------------------------------------
 %%% Debugging
@@ -198,133 +151,72 @@ stop_debug() ->
 %%%-----------------------------------------------------------------
 %%% User API
 start() ->
-    webtool:start(),
-    receive after 1000 -> ok end,
-    webtool:start_tools([],"app=crashdump_viewer"),
-    receive after 1000 -> ok end,
-    ok.
+    start(undefined).
+start(File) ->
+    cdv_wx:start(File).
 
 stop() ->
-    webtool:stop_tools([],"app=crashdump_viewer"),
-    webtool:stop().
+    case whereis(?SERVER) of
+	undefined ->
+	    ok;
+	Pid ->
+	    Ref = erlang:monitor(process,Pid),
+	    cast(stop),
+	    receive {'DOWN', Ref, process, Pid, _} -> ok end
+    end.
 
 %%%-----------------------------------------------------------------
 %%% Start crashdump_viewer via the cdv script located in
 %%% $OBSERVER_PRIV_DIR/bin
 script_start() ->
-    usage().
-script_start([File]) ->
-    DefaultBrowser =
-	case os:type() of
-	    {win32,_} -> iexplore;
-	    {unix,darwin} -> open;
-	    _ -> firefox
-	end,
-    script_start([File,DefaultBrowser]);
-script_start([FileAtom,Browser]) ->
+    do_script_start(fun() -> start() end),
+    erlang:halt().
+script_start([FileAtom]) ->
     File = atom_to_list(FileAtom),
     case filelib:is_regular(File) of
 	true ->
-	    io:format("Starting crashdump_viewer...\n"),
-	    start(),
-	    io:format("Reading crashdump..."),
-	    read_file(File),
-	    redirect([],[]),
-	    io:format("done\n"),
-	    start_browser(Browser);
+	    do_script_start(fun() -> start(File) end);
 	false ->
 	    io:format("cdv error: the given file does not exist\n"),
 	    usage()
-    end.
-
-start_browser(Browser) ->
-    PortStr = integer_to_list(gen_server:call(web_tool,get_port)),
-    Url = "http://localhost:" ++ PortStr ++ ?START_PAGE,
-    {OSType,_} = os:type(),
-    case Browser of
-	none ->
-	    ok;
-	iexplore when OSType == win32->
-	    io:format("Starting internet explorer...\n"),
-	    {ok,R} = win32reg:open(""),
-	    Key="\\local_machine\\SOFTWARE\\Microsoft\\IE Setup\\Setup",
-	    win32reg:change_key(R,Key),
-	    {ok,Val} = win32reg:value(R,"Path"),
-	    IExplore=filename:join(win32reg:expand(Val),"iexplore.exe"),
-	    os:cmd("\"" ++ IExplore ++ "\" " ++ Url);
-	_ when OSType == win32 ->
-	    io:format("Starting ~w...\n",[Browser]),
-	    os:cmd("\"" ++ atom_to_list(Browser) ++ "\" " ++ Url);
-	B when B==firefox; B==mozilla ->
-	    io:format("Sending URL to ~w...",[Browser]),
-	    BStr = atom_to_list(Browser),
-	    SendCmd = BStr ++ " -raise -remote \'openUrl(" ++ Url ++ ")\'",
-	    Port = open_port({spawn,SendCmd},[exit_status]),
-	    receive
-		{Port,{exit_status,0}} ->
-		    io:format("done\n");
-		{Port,{exit_status,_Error}} ->
-		    io:format(" not running, starting ~w...\n",[Browser]),
-		    os:cmd(BStr ++ " " ++ Url)
-	    after 5000 ->
-		    io:format(" failed, starting ~w...\n",[Browser]),
-		    erlang:port_close(Port),
-		    os:cmd(BStr ++ " " ++ Url)
-	    end;
-	_ ->
-	    io:format("Starting ~w...\n",[Browser]),
-	    os:cmd(atom_to_list(Browser) ++ " " ++ Url)
     end,
-    ok.
+    erlang:halt();
+script_start(_) ->
+    usage(),
+    erlang:halt().
+
+do_script_start(StartFun) ->
+    process_flag(trap_exit,true),
+    case StartFun() of
+	ok ->
+	    case whereis(cdv_wx) of
+		Pid when is_pid(Pid) ->
+		    link(Pid),
+		    receive
+			{'EXIT', Pid, normal} ->
+			    ok;
+			{'EXIT', Pid, Reason} ->
+			    io:format("\ncdv crash: ~p\n",[Reason])
+		    end;
+		_ ->
+		    io:format("\ncdv crash: ~p\n",[unknown_reason])
+	    end;
+	Error ->
+	    io:format("\ncdv start failed: ~p\n",[Error])
+    end.
 
 usage() ->
     io:format(
-      "\nusage: cdv file [ browser ]\n"
+      "usage: cdv [file]\n"
       "\tThe \'file\' must be an existing erlang crash dump.\n"
-      "\tDefault browser is \'iexplore\' (Internet Explorer) on Windows,\n"
-      "\t\'open\' on Mac OS X, or else \'firefox\'.\n",
+      "\tIf omitted a file dialog will be opened.\n",
       []).
 
-
-
-
-%%%-----------------------------------------------------------------
-%%% Return config data used by webtool
-configData() ->
-    Dir = filename:join(code:priv_dir(observer),"crashdump_viewer"),
-    {crashdump_viewer,
-     [{web_data,{"CrashDumpViewer",?START_PAGE}},
-      {alias,{"/crashdump_viewer",Dir}},
-      {alias,{"/crashdump_erts_doc",erts_docdir()}},
-      {alias,{"/crashdump_doc",cdv_docdir()}},
-      {alias,{erl_alias,"/cdv_erl",[?MODULE]}},
-      {start,{child,{{local,?SERVER},
-		     {?MODULE,start_link,[]},
-		     permanent,100,worker,[?MODULE]}}}
-	      ]}.
-
-erts_docdir() ->
-    ErtsVsn = erlang:system_info(version),
-    RootDir = code:root_dir(),
-    VsnErtsDir = filename:join(RootDir,"erts-"++ErtsVsn),
-    DocDir = filename:join(["doc","html"]),
-    case filelib:is_dir(VsnErtsDir) of
-	true ->
-	    filename:join(VsnErtsDir,DocDir);
-	false ->
-	    %% So this can be run in clearcase
-	    filename:join([RootDir,"erts",DocDir])
-    end.
-
-cdv_docdir() ->
-    ObserverDir = code:lib_dir(observer),
-    filename:join([ObserverDir,"doc","html"]).
-
 %%====================================================================
 %% External functions
 %%====================================================================
 %%%--------------------------------------------------------------------
-%%% Start the server
+%%% Start the server - called by cdv_wx
 start_link() ->
     case whereis(?SERVER) of
 	undefined ->
@@ -334,119 +226,63 @@ start_link() ->
     end.
 
 %%%-----------------------------------------------------------------
-%%% If crashdump_viewer is just started, show welcome frame. Else
-%%% show menu and general_info
-start_page(_Env,_Input) ->
-    call(start_page).
-
-%%%-----------------------------------------------------------------
-%%% Display the form for entering the file name for the crashdump
-%%% to view.
-read_file_frame(_Env,_Input) ->
-    crashdump_viewer_html:read_file_frame().
-
-%%%-----------------------------------------------------------------
-%%% Called when the 'ok' button is clicked after entering the dump
-%%% file name.
-read_file(_Env,Input) ->
-    call({read_file,Input}).
-
-%%%-----------------------------------------------------------------
-%%% The topmost frame of the main page. Called when a crashdump is
-%%% loaded.
-filename_frame(_Env,_Input) ->
-    call(filename_frame).
-
-%%%-----------------------------------------------------------------
-%%% The initial information frame. Called when a crashdump is loaded.
-initial_info_frame(_Env,_Input) ->
-    call(initial_info_frame).
-
-%%%-----------------------------------------------------------------
-%%% The left frame of the main page. Called when a crashdump is
-%%% loaded.
-menu_frame(_Env,_Input) ->
-    crashdump_viewer_html:menu_frame().
-
-%%%-----------------------------------------------------------------
-%%% Called when the collapsed or exploded picture in the menu is 
-%%% clicked.
-toggle(_Env,Input) ->
-    call({toggle,Input}).
+%%% Called by cdv_wx
+read_file(File) ->
+    cast({read_file,File}).
 
 %%%-----------------------------------------------------------------
-%%% The following functions are called when menu items are clicked.
-general_info(_Env,_Input) ->
+%%% The following functions are called when the different tabs are
+%%% created
+general_info() ->
     call(general_info).
-processes(SessionId,_Env,_Input) ->
-    call({procs_summary,SessionId}).
-ports(SessionId,_Env,_Input) ->
-    call({ports,SessionId}).
-ets_tables(SessionId,_Env,Input) ->
-    call({ets_tables,SessionId,Input}).
-internal_ets_tables(_Env,_Input) ->
+processes() ->
+    call(procs_summary).
+ports() ->
+    call(ports).
+ets_tables(Owner) ->
+    call({ets_tables,Owner}).
+internal_ets_tables() ->
     call(internal_ets_tables).
-timers(SessionId,_Env,Input) ->
-    call({timers,SessionId,Input}).
-fun_table(SessionId,_Env,_Input) ->
-    call({funs,SessionId}).
-atoms(SessionId,_Env,_Input) ->
-    call({atoms,SessionId}).
-dist_info(_Env,_Input) ->
+timers(Owner) ->
+    call({timers,Owner}).
+funs() ->
+    call(funs).
+atoms() ->
+    call(atoms).
+dist_info() ->
     call(dist_info).
-loaded_modules(SessionId,_Env,_Input) ->
-    call({loaded_mods,SessionId}).
-loaded_mod_details(_Env,Input) ->
-    call({loaded_mod_details,Input}).
-memory(_Env,_Input) ->
+node_info(Channel) ->
+    call({node_info,Channel}).
+loaded_modules() ->
+    call(loaded_mods).
+loaded_mod_details(Mod) ->
+    call({loaded_mod_details,Mod}).
+memory() ->
     call(memory).
-allocated_areas(_Env,_Input) ->
+allocated_areas() ->
     call(allocated_areas).
-allocator_info(_Env,_Input) ->
+allocator_info() ->
     call(allocator_info).
-hash_tables(_Env,_Input) ->
+hash_tables() ->
     call(hash_tables).
-index_tables(_Env,_Input) ->
+index_tables() ->
     call(index_tables).
 
 %%%-----------------------------------------------------------------
 %%% Called when a link to a process (Pid) is clicked.
-proc_details(_Env,Input) ->
-    call({proc_details,Input}).
-
-%%%-----------------------------------------------------------------
-%%% Called when one of the headings in the process summary table are
-%%% clicked. It sorts the processes by the clicked heading.
-sort_procs(SessionId,_Env,Input) ->
-    call({sort_procs,SessionId,Input}).
+proc_details(Pid) ->
+    call({proc_details,Pid}).
 
 %%%-----------------------------------------------------------------
 %%% Called when a link to a port is clicked.
-port(_Env,Input) ->
-    call({port,Input}).
-
-%%%-----------------------------------------------------------------
-%%% Called when the "Expand" link in a call stack (Last Calls) is
-%%% clicked.
-expand(_Env,Input) ->
-    call({expand,Input}).
-
-%%%-----------------------------------------------------------------
-%%% Called when the "Expand" link in a stack dump, message queue or 
-%%% dictionary is clicked.
-expand_memory(_Env,Input) ->
-    call({expand_memory,Input}).
+port(Id) ->
+    call({port,Id}).
 
 %%%-----------------------------------------------------------------
-%%% Called when "<< xxx bytes>>" link in a stack dump, message queue or 
-%%% dictionary is clicked.
-expand_binary(_Env,Input) ->
-    call({expand_binary,Input}).
-
-%%%-----------------------------------------------------------------
-%%% Called on regular intervals while waiting for a dump to be read
-redirect(_Env,_Input) ->
-    call(redirect).
+%%% Called when "<< xxx bytes>>" link is clicket to open a new window
+%%% displaying the whole binary.
+expand_binary(Pos) ->
+    call({expand_binary,Pos}).
 
 %%====================================================================
 %% Server functions
@@ -461,7 +297,6 @@ redirect(_Env,_Input) ->
 %%          {stop, Reason}
 %%--------------------------------------------------------------------
 init([]) ->
-    ets:new(cdv_menu_table,[set,named_table,{keypos,#menu_item.index},public]),
     ets:new(cdv_dump_index_table,[ordered_set,named_table,public]),
     {ok, #state{}}.
 
@@ -475,223 +310,125 @@ init([]) ->
 %%          {stop, Reason, Reply, State}   | (terminate/2 is called)
 %%          {stop, Reason, State}            (terminate/2 is called)
 %%--------------------------------------------------------------------
-handle_call(start_page,_From,State=#state{file=undefined,bg_status=undefined})->
-    Reply = crashdump_viewer_html:welcome(),
-    {reply,Reply,State};
-handle_call(start_page, _From, State=#state{file=undefined,bg_status={done,Page}}) ->
-    {reply,Page,State};
-handle_call(start_page, _From, State=#state{file=undefined,bg_status=Status}) ->
-    Reply = crashdump_viewer_html:redirect(Status),
-    {reply,Reply,State};
-handle_call(start_page, _From, State) ->
-    Reply = crashdump_viewer_html:start_page(),
-    {reply,Reply,State};
-handle_call({read_file,Input}, _From, _State) ->
-    {ok,File} = get_value("path",httpd:parse_query(Input)),
-    spawn_link(fun() -> read_file(File) end),
-    Status = background_status(reading,File),
-    Reply = crashdump_viewer_html:redirect(Status),
-    {reply, Reply, #state{bg_status=Status}};
-handle_call(redirect,_From, State=#state{bg_status={done,Page}}) ->
-    {reply, Page, State#state{bg_status=undefined}};   
-handle_call(redirect,_From, State=#state{bg_status=Status}) ->
-    Reply = crashdump_viewer_html:redirect(Status),
-    {reply, Reply, State};
-handle_call(filename_frame,_From,State=#state{file=File}) ->
-    Reply = crashdump_viewer_html:filename_frame(File),
-    {reply,Reply,State};
-handle_call(initial_info_frame,_From,State=#state{file=File}) ->
+handle_call(general_info,_From,State=#state{file=File}) ->
     GenInfo = general_info(File),
-    [{DumpVsn,_}] = lookup_index(?erl_crash_dump),
     NumAtoms = GenInfo#general_info.num_atoms,
-    {WS,SH} = parse_vsn_str(GenInfo#general_info.system_vsn,4,false),
-    NumProcs = list_to_integer(GenInfo#general_info.num_procs),
-    ProcsSummary = 
-	if NumProcs > ?max_sort_process_num -> too_many;
-	   true -> State#state.procs_summary
-	end,
-    NewState = State#state{dump_vsn=[list_to_integer(L) ||
-					L<-string:tokens(DumpVsn,".")],
-			   shared_heap=SH,
-			   wordsize=WS,
-			   num_atoms=NumAtoms,
-			   procs_summary=ProcsSummary},
-    Reply = crashdump_viewer_html:general_info(GenInfo),
-    {reply,Reply,NewState};
-handle_call({toggle,Input},_From,State) ->
-    {ok,Index} = get_value("index",httpd:parse_query(Input)),
-    do_toggle(list_to_integer(Index)),
-    Reply = crashdump_viewer_html:menu_frame(),
-    {reply,Reply,State};
-handle_call({expand,Input},_From,State=#state{file=File}) ->
-    [{"pos",Pos},{"size",Size},{"what",What},{"truncated",Truncated}] = 
-	httpd:parse_query(Input),
-    Expanded = get_expanded(File,list_to_integer(Pos),list_to_integer(Size)),
-    TruncText = if Truncated=="true" -> "WARNING: This term is truncated!\n\n";
-		   true -> ""
-		end,
-    Reply = 
-	case {Truncated,What} of
-	    {_,"LastCalls"} ->
-		LastCalls = replace_all($ ,$\n,Expanded,[]),
-		crashdump_viewer_html:info_page(What,[TruncText,LastCalls]);
-	    {_,"StackDump"} ->
-		crashdump_viewer_html:info_page(What,[TruncText,Expanded]);
-	    {"false",_} ->
-		crashdump_viewer_html:pretty_info_page(What,Expanded);
-	    {"true",_} ->
-		crashdump_viewer_html:info_page(What,[TruncText,Expanded])
-	end,
-    {reply,Reply,State};
-handle_call({expand_memory,Input},_From,State=#state{file=File,binaries=B}) ->
-    [{"pid",Pid},{"what",What}] = httpd:parse_query(Input),
-    Reply = 
-	case truncated_warning([{?proc,Pid}]) of
-	    [] ->
-		Expanded = expand_memory(File,What,Pid,B),
-		crashdump_viewer_html:expanded_memory(What,Expanded);
-	    _TW ->
-		Info = 
-		    "The crashdump is truncated in the middle of this "
-		    "process' memory information, so this information "
-		    "can not be extracted.",
-		crashdump_viewer_html:info_page(What,Info)
-	end,
-    {reply,Reply,State};
-handle_call({expand_binary,Input},_From,State=#state{file=File}) ->
-    [{"pos",Pos0}] = httpd:parse_query(Input),
-    Pos = list_to_integer(Pos0),
+    WS = parse_vsn_str(GenInfo#general_info.system_vsn,4),
+    TW = case get(truncated) of
+	     true -> ["WARNING: The crash dump is truncated. "
+		      "Some information might be missing."];
+	     false -> []
+	 end,
+    {reply,{ok,GenInfo,TW},State#state{wordsize=WS, num_atoms=NumAtoms}};
+handle_call({expand_binary,{Offset,Size,Pos}},_From,State=#state{file=File}) ->
     Fd = open(File),
     pos_bof(Fd,Pos),
-    {Bin,_Line} = get_binary(val(Fd)),
+    {Bin,_Line} = get_binary(Offset,Size,val(Fd)),
     close(Fd),
-    Reply=crashdump_viewer_html:expanded_binary(io_lib:format("~p",[Bin])),
-    {reply,Reply,State};
-handle_call(general_info,_From,State=#state{file=File}) ->
-    GenInfo=general_info(File),
-    Reply = crashdump_viewer_html:general_info(GenInfo),
-    {reply,Reply,State};
-handle_call({procs_summary,SessionId},_From,State) ->
-    TW = truncated_warning([?proc]),
-    NewState = procs_summary(SessionId,TW,"pid",State#state{sorted=undefined}),
-    {reply,ok,NewState};
-handle_call({sort_procs,SessionId,Input}, _From, State) ->
-    {ok,Sort} = get_value("sort",httpd:parse_query(Input)),
+    {reply,{ok,Bin},State};
+handle_call(procs_summary,_From,State=#state{file=File,wordsize=WS}) ->
     TW = truncated_warning([?proc]),
-    NewState = procs_summary(SessionId,TW,Sort,State),
-    {reply,ok,NewState};
-handle_call({proc_details,Input},_From,State=#state{file=File,shared_heap=SH}) ->
-    {ok,Pid} = get_value("pid",httpd:parse_query(Input)),
+    Procs = procs_summary(File,WS),
+    {reply,{ok,Procs,TW},State};
+handle_call({proc_details,Pid},_From,
+	    State=#state{file=File,wordsize=WS,dump_vsn=DumpVsn,binaries=B})->
     Reply = 
-	case get_proc_details(File,Pid,State#state.dump_vsn) of
-	    {ok,Proc} -> 
-		TW = truncated_warning([{?proc,Pid}]),
-		crashdump_viewer_html:proc_details(Pid,Proc,TW,SH);
-	    {other_node,Node} -> 
-		TW = truncated_warning([?visible_node,
-					?hidden_node,
-					?not_connected]),
-		crashdump_viewer_html:nods(Node,TW);
-	    not_found -> 
-		crashdump_viewer_html:info_page(["Could not find process: ",
-						 Pid],?space)
+	case get_proc_details(File,Pid,WS,DumpVsn,B) of
+	    {ok,Proc,TW} ->
+		{ok,Proc,TW};
+	    Other ->
+		{error,Other}
 	end,
     {reply, Reply, State};
-handle_call({port,Input},_From,State=#state{file=File}) ->
-    {ok,P} = get_value("port",httpd:parse_query(Input)),
-    Id = [$#|P],
+handle_call({port,Id},_From,State=#state{file=File}) ->
     Reply = 
 	case get_port(File,Id) of
 	    {ok,PortInfo} ->
 		TW = truncated_warning([{?port,Id}]),
-		crashdump_viewer_html:port(Id,PortInfo,TW);
-	    {other_node,Node} ->
-		TW = truncated_warning([?visible_node,
-					?hidden_node,
-					?not_connected]),
-		crashdump_viewer_html:nods(Node,TW);
-	    not_found -> 
-		crashdump_viewer_html:info_page(
-		  ["Could not find port: ",Id],?space)
+		{ok,PortInfo,TW};
+	    Other ->
+		{error,Other}
 	end,
     {reply,Reply,State};
-handle_call({ports,SessionId},_From,State=#state{file=File}) ->
+handle_call(ports,_From,State=#state{file=File}) ->
     TW = truncated_warning([?port]),
-    get_ports(SessionId,File,TW),
-    {reply,ok,State};
-handle_call({ets_tables,SessionId,Input},_From,State=#state{file=File,wordsize=WS}) ->
-    {Pid,Heading} = 
-	case get_value("pid",httpd:parse_query(Input)) of
-	    {ok,P} -> 
-		{P,["ETS Tables for Process ",P]};
-	    error -> 
-		{'$2',"ETS Table Information"}
+    Ports = get_ports(File),
+    {reply,{ok,Ports,TW},State};
+handle_call({ets_tables,Pid0},_From,State=#state{file=File,wordsize=WS}) ->
+    Pid =
+	case Pid0 of
+	    all -> '$2';
+	    _ -> Pid0
 	end,
     TW = truncated_warning([?ets]),
-    get_ets_tables(SessionId,File,Heading,TW,Pid,WS),
-    {reply,ok,State};
+    Ets = get_ets_tables(File,Pid,WS),
+    {reply,{ok,Ets,TW},State};
 handle_call(internal_ets_tables,_From,State=#state{file=File,wordsize=WS}) ->
     InternalEts = get_internal_ets_tables(File,WS),
     TW = truncated_warning([?internal_ets]),
-    Reply = crashdump_viewer_html:internal_ets_tables(InternalEts,TW),
-    {reply,Reply,State};
-handle_call({timers,SessionId,Input},_From,State=#state{file=File}) ->
-    {Pid,Heading} = 
-	case get_value("pid",httpd:parse_query(Input)) of
-	    {ok,P} -> {P,["Timers for Process ",P]};
-	    error -> {'$2',"Timer Information"}
+    {reply,{ok,InternalEts,TW},State};
+handle_call({timers,Pid0},_From,State=#state{file=File}) ->
+    Pid =
+	case Pid0 of
+	    all -> '$2';
+	    _ -> Pid0
 	end,
     TW = truncated_warning([?timer]),
-    get_timers(SessionId,File,Heading,TW,Pid),
-    {reply,ok,State};
+    Timers = get_timers(File,Pid),
+    {reply,{ok,Timers,TW},State};
 handle_call(dist_info,_From,State=#state{file=File}) ->
-    Nods=nods(File),
     TW = truncated_warning([?visible_node,?hidden_node,?not_connected]),
-    Reply = crashdump_viewer_html:nods(Nods,TW),
+    Nods=nods(File),
+    {reply,{ok,Nods,TW},State};
+handle_call({node_info,Channel},_From,State=#state{file=File}) ->
+    Reply =
+	case get_node(File,Channel) of
+	    {ok,Nod} ->
+		TW = truncated_warning([?visible_node,
+					?hidden_node,
+					?not_connected]),
+		{ok,Nod,TW};
+	    {error,Other} ->
+		{error,Other}
+	end,
     {reply,Reply,State};
-handle_call({loaded_mods,SessionId},_From,State=#state{file=File}) ->
+handle_call(loaded_mods,_From,State=#state{file=File}) ->
     TW = truncated_warning([?mod]),
-    loaded_mods(SessionId,File,TW),
-    {reply,ok,State};
-handle_call({loaded_mod_details,Input},_From,State=#state{file=File}) ->
-    {ok,Mod} = get_value("mod",httpd:parse_query(Input)),
-    ModInfo = get_loaded_mod_details(File,Mod),
+    {_CC,_OC,Mods} = loaded_mods(File),
+    {reply,{ok,Mods,TW},State};
+handle_call({loaded_mod_details,Mod},_From,State=#state{file=File}) ->
     TW = truncated_warning([{?mod,Mod}]),
-    Reply = crashdump_viewer_html:loaded_mod_details(ModInfo,TW),
-    {reply,Reply,State};
-handle_call({funs,SessionId},_From,State=#state{file=File}) ->
+    ModInfo = get_loaded_mod_details(File,Mod),
+    {reply,{ok,ModInfo,TW},State};
+handle_call(funs,_From,State=#state{file=File}) ->
     TW = truncated_warning([?fu]),
-    funs(SessionId,File,TW),
-    {reply,ok,State};
-handle_call({atoms,SessionId},_From,State=#state{file=File,num_atoms=Num}) ->
-    TW = truncated_warning([?atoms,?num_atoms]),
-    atoms(SessionId,File,TW,Num),
-    {reply,ok,State};
+    Funs = funs(File),
+    {reply,{ok,Funs,TW},State};
+handle_call(atoms,_From,State=#state{file=File,num_atoms=NumAtoms0}) ->
+    TW = truncated_warning([?atoms]),
+    NumAtoms = try list_to_integer(NumAtoms0) catch error:badarg -> -1 end,
+    Atoms = atoms(File,NumAtoms),
+    {reply,{ok,Atoms,TW},State};
 handle_call(memory,_From,State=#state{file=File}) ->
     Memory=memory(File),
     TW = truncated_warning([?memory]),
-    Reply = crashdump_viewer_html:memory(Memory,TW),
-    {reply,Reply,State};
+    {reply,{ok,Memory,TW},State};
 handle_call(allocated_areas,_From,State=#state{file=File}) ->
     AllocatedAreas=allocated_areas(File),
     TW = truncated_warning([?allocated_areas]),
-    Reply = crashdump_viewer_html:allocated_areas(AllocatedAreas,TW),
-    {reply,Reply,State};
+    {reply,{ok,AllocatedAreas,TW},State};
 handle_call(allocator_info,_From,State=#state{file=File}) ->
     SlAlloc=allocator_info(File),
     TW = truncated_warning([?allocator]),
-    Reply = crashdump_viewer_html:allocator_info(SlAlloc,TW),
-    {reply,Reply,State};
+    {reply,{ok,SlAlloc,TW},State};
 handle_call(hash_tables,_From,State=#state{file=File}) ->
     HashTables=hash_tables(File),
     TW = truncated_warning([?hash_table,?index_table]),
-    Reply = crashdump_viewer_html:hash_tables(HashTables,TW),
-    {reply,Reply,State};
+    {reply,{ok,HashTables,TW},State};
 handle_call(index_tables,_From,State=#state{file=File}) ->
     IndexTables=index_tables(File),
     TW = truncated_warning([?hash_table,?index_table]),
-    Reply = crashdump_viewer_html:index_tables(IndexTables,TW),
-    {reply,Reply,State}.
+    {reply,{ok,IndexTables,TW},State}.
 
 
 
@@ -702,11 +439,18 @@ handle_call(index_tables,_From,State=#state{file=File}) ->
 %%          {noreply, State, Timeout} |
 %%          {stop, Reason, State}            (terminate/2 is called)
 %%--------------------------------------------------------------------
-handle_cast({background_done,{Page,File,Binaries},Dict}, State) ->
-    lists:foreach(fun({Key,Val}) -> put(Key,Val) end, Dict),
-    {noreply, State#state{file=File,binaries=Binaries,bg_status={done,Page}}};
-handle_cast({background_status,Status}, State) ->
-    {noreply, State#state{bg_status=Status}}.
+handle_cast({read_file,File}, _State) ->
+    case do_read_file(File) of
+	{ok,Binaries,DumpVsn} ->
+	    observer_lib:report_progress({ok,done}),
+	    {noreply, #state{file=File,binaries=Binaries,dump_vsn=DumpVsn}};
+	Error ->
+	    end_progress(Error),
+	    {noreply, #state{}}
+    end;
+handle_cast(stop,State) ->
+    {stop,normal,State}.
+
 
 %%--------------------------------------------------------------------
 %% Function: handle_info/2
@@ -791,24 +535,6 @@ compare_pid("<"++Id,"<"++OtherId) ->
 compare_pid(_,_) ->
     false.
 
-background_status(Action,File) ->
-    SizeInfo = filesizeinfo(File), 
-    background_status(Action,File,SizeInfo).
-
-background_status(processing,File,SizeInfo) ->
-    "Processing " ++ File ++ SizeInfo;
-background_status(reading,File,SizeInfo) ->
-    "Reading file " ++ File ++ SizeInfo.
-
-filesizeinfo(File) ->
-    case file:read_file_info(File) of
-	{ok,#file_info{size=Size}} -> 
-	    " (" ++ integer_to_list(Size) ++ " bytes)";
-	_X ->
-	    ""
-    end.
-
-
 open(File) ->
     {ok,Fd} = file:open(File,[read,read_ahead,raw,binary]),
     Fd.
@@ -861,6 +587,18 @@ get_chunk(Fd) ->
 	    {ok,Bin}
     end.
 
+%% Read and report progress
+progress_read(Fd) ->
+    {R,Bytes} =
+	case read(Fd) of
+	    {ok,Bin} ->
+		{{ok,Bin},byte_size(Bin)};
+	    Other ->
+		{Other,0}
+	end,
+    update_progress(Bytes),
+    R.
+
 read(Fd) ->
     file:read(Fd,?chunk_size).
 
@@ -962,73 +700,30 @@ get_rest_of_line_1(Fd, <<>>, Acc) ->
 	eof -> {eof,lists:reverse(Acc)}
     end.
 
-count_rest_of_line(Fd) ->
+get_lines_to_empty(Fd) ->
     case get_chunk(Fd) of
-	{ok,Bin} -> count_rest_of_line(Fd,Bin,0);
-	eof -> {eof,0}
-    end.
-count_rest_of_line(Fd,<<$\n:8,Bin/binary>>,N) ->
-    put_chunk(Fd,Bin),
-    N;
-count_rest_of_line(Fd,<<$\r:8,Bin/binary>>,N) ->
-    count_rest_of_line(Fd,Bin,N);
-count_rest_of_line(Fd,<<_Char:8,Bin/binary>>,N) ->
-    count_rest_of_line(Fd,Bin,N+1);
-count_rest_of_line(Fd,<<>>,N) ->
-    case get_chunk(Fd) of
-	{ok,Bin} -> count_rest_of_line(Fd,Bin,N);
-	eof -> {eof,N}
-    end.
-
-get_n_lines_of_tag(Fd,N) ->
-    case get_chunk(Fd) of
-	{ok,Bin} -> 
-	    {AllOrPart,Rest,Lines} = get_n_lines_of_tag(Fd,N,Bin,[]),
-	    {AllOrPart,N-Rest,Lines};
+	{ok,Bin} ->
+	    get_lines_to_empty(Fd,Bin,[],[]);
 	eof ->
-	    empty
-    end.
-get_n_lines_of_tag(Fd,N,<<"\n=",_/binary>>=Bin,Acc) ->
-    put_chunk(Fd,Bin),
-    {all,N-1,lists:reverse(Acc)};
-get_n_lines_of_tag(Fd,0,Bin,Acc) ->
-    put_chunk(Fd,Bin),
-    {part,0,lists:reverse(Acc)};
-get_n_lines_of_tag(Fd,N,<<$\n:8,Bin/binary>>,Acc) ->
-    get_n_lines_of_tag(Fd,N-1,Bin,[$\n|Acc]);
-get_n_lines_of_tag(Fd,N,<<$\r:8,Bin/binary>>,Acc) ->
-    get_n_lines_of_tag(Fd,N,Bin,Acc);
-get_n_lines_of_tag(Fd,N,<<Char:8,Bin/binary>>,Acc) ->
-    get_n_lines_of_tag(Fd,N,Bin,[Char|Acc]);
-get_n_lines_of_tag(Fd,N,<<>>,Acc) ->
-    case get_chunk(Fd) of
-	{ok,Bin} -> 
-	    get_n_lines_of_tag(Fd,N,Bin,Acc);
-	eof -> 
-	    case Acc of
-		[$\n|_] ->
-		    {all,N,lists:reverse(Acc)};
-		_ ->
-		    {all,N-1,lists:reverse(Acc)}
-	    end
-    end.
-
-count_rest_of_tag(Fd) ->
-    case get_chunk(Fd) of
-	{ok,Bin} -> count_rest_of_tag(Fd,Bin,0);
-	eof -> 0
+	    []
     end.
-count_rest_of_tag(Fd,<<"\n=",Bin/binary>>,N) ->
+get_lines_to_empty(Fd,<<$\n:8,Bin/binary>>,[],Lines) ->
     put_chunk(Fd,Bin),
-    N;
-count_rest_of_tag(Fd,<<$\r:8,Bin/binary>>,N) ->
-    count_rest_of_tag(Fd,Bin,N);
-count_rest_of_tag(Fd,<<_Char:8,Bin/binary>>,N) ->
-    count_rest_of_tag(Fd,Bin,N+1);
-count_rest_of_tag(Fd,<<>>,N) ->
+    lists:reverse(Lines);
+get_lines_to_empty(Fd,<<$\n:8,Bin/binary>>,Acc,Lines) ->
+    get_lines_to_empty(Fd,Bin,[],[lists:reverse(Acc)|Lines]);
+get_lines_to_empty(Fd,<<$\r:8,Bin/binary>>,Acc,Lines) ->
+    get_lines_to_empty(Fd,Bin,Acc,Lines);
+get_lines_to_empty(Fd,<<$\s:8,Bin/binary>>,[],Lines) ->
+    get_lines_to_empty(Fd,Bin,[],Lines);
+get_lines_to_empty(Fd,<<Char:8,Bin/binary>>,Acc,Lines) ->
+    get_lines_to_empty(Fd,Bin,[Char|Acc],Lines);
+get_lines_to_empty(Fd,<<>>,Acc,Lines) ->
     case get_chunk(Fd) of
-	{ok,Bin} -> count_rest_of_tag(Fd,Bin,N);
-	eof -> N
+	{ok,Bin} ->
+	    get_lines_to_empty(Fd,Bin,Acc,Lines);
+	eof ->
+	    lists:reverse(Lines,[lists:reverse(Acc)])
     end.
 
 split(Str) ->
@@ -1046,150 +741,32 @@ split(Char,[H|T],Acc) ->
 split(_Char,[],Acc) ->
     {lists:reverse(Acc),[]}.
 
-size_or_term(Fd) ->
-    size_or_term(Fd,get(pos)).
-size_or_term(Fd,Pos) ->
-    case count_rest_of_line(Fd) of
-	{eof,Size} ->
-	    {size,true,Size,Pos};
-	Size when Size > ?max_display_size ->
-	    {size,false,Size,Pos};
-	_Size ->
-	    {ok,Pos} = pos_bof(Fd,Pos),
-	    val(Fd)
-    end.
-
 %%%-----------------------------------------------------------------
 %%% 
-get_value(Key,List) ->
-    case lists:keysearch(Key,1,List) of
-	{value,{Key,Value}} -> {ok,Value};
-	false -> error
-    end.
-
-parse_vsn_str([],WS,false) ->
-    %% If the log is translated, crashdump_translate might have written
-    %% shared_heap=true in dictionary.
-    case erase(shared_heap) of
-	true -> {WS,true};
-	_ -> {WS,false}
-    end;
-parse_vsn_str([],WS,SH) ->
-    {WS,SH};
-parse_vsn_str(Str,WS,SH) ->
+parse_vsn_str([],WS) ->
+    WS;
+parse_vsn_str(Str,WS) ->
     case Str of
-	"[64-bit]" ++ Rest ->
-	    case SH of
-		false ->
-		    parse_vsn_str(Rest,8,false);
-		_ ->
-		    {8,SH}
-	    end;
-	"[shared heap]" ++ Rest ->
-	    case WS of
-		4 -> 
-		    parse_vsn_str(Rest,WS,true);
-		_ ->
-		    {WS,true}
-	    end;
+	"[64-bit]" ++ _Rest ->
+	    8;
 	[_Char|Rest] ->
-	    parse_vsn_str(Rest,WS,SH)
+	    parse_vsn_str(Rest,WS)
     end.
 
 
 %%%-----------------------------------------------------------------
-%%% 
-initial_menu() ->
-    insert_items(
-      [menu_item(0, {"./general_info","General information"},0),
-       menu_item(0, {"./processes","Processes"}, 0),
-       menu_item(0, {"./ports","Ports"}, 0),
-       menu_item(2, "ETS tables", 0),
-       menu_item(0, {"./ets_tables","ETS tables"}, 1),
-       menu_item(0, {"./internal_ets_tables","Internal ETS tables"}, 1),
-       menu_item(0, {"./timers","Timers"}, 0),
-       menu_item(0, {"./fun_table","Fun table"}, 0),
-       menu_item(0, {"./atoms","Atoms"}, 0),
-       menu_item(0, {"./dist_info","Distribution information"}, 0),
-       menu_item(0, {"./loaded_modules","Loaded modules"}, 0),
-       menu_item(2, "Internal Tables", 0),
-       menu_item(0, {"./hash_tables","Hash tables"}, 1),
-       menu_item(0, {"./index_tables","Index tables"}, 1),
-       menu_item(3, "Memory information", 0),
-       menu_item(0, {"./memory","Memory"}, 1),
-       menu_item(0, {"./allocated_areas","Allocated areas"}, 1),
-       menu_item(0, {"./allocator_info","Allocator information"}, 1),
-       menu_item(2, "Documentation", 0),
-       menu_item(0, {"/crashdump_doc/crashdump_help.html",
-		     "Crashdump Viewer help"}, 1,"doc"),
-       menu_item(0, {"/crashdump_erts_doc/crash_dump.html",
-		     "How to interpret Erlang crashdumps"}, 1,"doc")]).
-    
-menu_item(Children,Text,Depth) ->
-    menu_item(Children,Text,Depth,"main").
-menu_item(Children,Text,Depth,Target) ->
-    #menu_item{picture=get_pic(Children),
-	       text=Text,
-	       depth=Depth,
-	       children=Children,
-	       state=if Depth==0 -> true; true -> false end,
-	       target=Target}.
-
-insert_items(Items) ->
-    insert_items(Items,1).
-insert_items([Item|Items],Index) ->
-    ets:insert(cdv_menu_table,Item#menu_item{index=Index}),
-    insert_items(Items,Index+1);
-insert_items([],_) ->
-    ok.
-
-get_pic(0) ->
-    "";
-get_pic(_) ->
-     "/crashdump_viewer/collapsd.gif".
-
-do_toggle(Index) ->
-    [Item]= ets:lookup(cdv_menu_table,Index),
-    case toggle_children(Index,Index+Item#menu_item.children,
-			 Item#menu_item.depth+1,undefined) of
-	true ->
-	    ets:insert(cdv_menu_table,
-		       Item#menu_item{picture=
-				      "/crashdump_viewer/exploded.gif"});
-	false ->
-	    ets:insert(cdv_menu_table,
-		       Item#menu_item{picture=
-				      "/crashdump_viewer/collapsd.gif"})
-    end.
-
-toggle_children(Index,Max,_Depth,ToggleState) when Index>Max->
-    ToggleState;
-toggle_children(Index,Max,Depth,ToggleState) ->
-    case ets:lookup(cdv_menu_table,Index+1) of
-	[#menu_item{depth=Depth}=Child] ->
-	    NewState =  not Child#menu_item.state,
-	    ets:insert(cdv_menu_table,Child#menu_item{state=NewState}),
-	    toggle_children(Index+1,Max,Depth,NewState);
-	_ ->
-	    toggle_children(Index+1,Max,Depth,ToggleState)
-    end.
-
-%%%-----------------------------------------------------------------
 %%% Traverse crash dump and insert index in table for each heading
-%%% 
-%%% This function is executed in a background process in order to
-%%% avoid a timeout in the web browser. The browser displays "Please
-%%% wait..." while this is going on.
 %%%
-%%% Variable written to process dictionary in this function are copied
-%%% to the crashdump_viewer_server when the function is completed (see
-%%% background_done/1).
-read_file(File) ->
+%%% Progress is reported during the time and MUST be checked with
+%%% crashdump_viewer:get_progress/0 until it returns {ok,done}.
+do_read_file(File) ->
     case file:read_file_info(File) of
-	{ok,#file_info{type=regular,access=FileA}} when FileA=:=read;
-							FileA=:=read_write ->
+	{ok,#file_info{type=regular,
+		       access=FileA,
+		       size=Size}} when FileA=:=read; FileA=:=read_write ->
 	    Fd = open(File),
-	    case read(Fd) of
+	    init_progress("Reading file",Size),
+	    case progress_read(Fd) of
 		{ok,<<$=:8,TagAndRest/binary>>} ->
 		    {Tag,Id,Rest,N1} = tag(Fd,TagAndRest,1),
 		    case Tag of
@@ -1197,41 +774,40 @@ read_file(File) ->
 			    reset_index_table(),
 			    insert_index(Tag,Id,N1+1),
 			    put(last_tag,{Tag,""}),
-			    Status = background_status(processing,File),
-			    background_status(Status),
 			    indexify(Fd,Rest,N1),
+			    end_progress(),
 			    check_if_truncated(),
-			    initial_menu(),
-			    Binaries = read_binaries(Fd),
-			    R = crashdump_viewer_html:start_page(),
+			    [{DumpVsn0,_}] = lookup_index(?erl_crash_dump),
+			    DumpVsn = [list_to_integer(L) ||
+					L<-string:tokens(DumpVsn0,".")],
+			    Binaries = read_binaries(Fd,DumpVsn),
 			    close(Fd),
-			    background_done({R,File,Binaries});
+			    {ok,Binaries,DumpVsn};
 			_Other ->
-			    R = crashdump_viewer_html:error(
+			    R = io_lib:format(
 				  "~s is not an Erlang crash dump~n",
 				  [File]),
 			    close(Fd),
-			    background_done({R,undefined,undefined})
+			    {error,R}
 		    end;
 		{ok,<<"<Erlang crash dump>",_Rest/binary>>} -> 
 		    %% old version - no longer supported
-		    R = crashdump_viewer_html:error(
+		    R = io_lib:format(
 			  "The crashdump ~s is in the pre-R10B format, "
 			  "which is no longer supported.~n",
-			  [File]),
+			     [File]),
 		    close(Fd),
-		    background_done({R,undefined,undefined});
+		    {error,R};
 		_Other ->
-		    R = crashdump_viewer_html:error(
+		    R = io_lib:format(
 			  "~s is not an Erlang crash dump~n",
 			  [File]),
 		    close(Fd),
-		    background_done({R,undefined,undefined})
+		    {error,R}
 	    end;
 	_other ->
-	    R = crashdump_viewer_html:error("~s is not an Erlang crash dump~n",
-					    [File]),
-	    background_done({R,undefined,undefined})
+	    R = io_lib:format("~s is not an Erlang crash dump~n",[File]),
+	    {error,R}
     end.
 
 indexify(Fd,Bin,N) ->
@@ -1244,7 +820,7 @@ indexify(Fd,Bin,N) ->
 	    put(last_tag,{Tag,Id}),
 	    indexify(Fd,Rest,N1);
 	nomatch ->
-	    case read(Fd) of
+	    case progress_read(Fd) of
 		{ok,Chunk0} when is_binary(Chunk0) ->
 		    {Chunk,N1} =
 			case binary:last(Bin) of
@@ -1272,7 +848,7 @@ tag(Fd,<<Char:8,Rest/binary>>,N,Gat,Di,tag) ->
 tag(Fd,<<Char:8,Rest/binary>>,N,Gat,Di,id) ->
     tag(Fd,Rest,N+1,Gat,[Char|Di],id);
 tag(Fd,<<>>,N,Gat,Di,Now) ->
-    case read(Fd) of
+    case progress_read(Fd) of
 	{ok,Chunk} when is_binary(Chunk) ->
 	    tag(Fd,Chunk,N,Gat,Di,Now);
         eof ->
@@ -1304,21 +880,12 @@ find_truncated_proc({Tag,Pid}) ->
 is_proc_tag(Tag)  when Tag==?proc;
 		       Tag==?proc_dictionary;
 		       Tag==?proc_messages;
-		       Tag==?debug_proc_dictionary;
 		       Tag==?proc_stack;
 		       Tag==?proc_heap ->
     true;
 is_proc_tag(_) ->
     false.
 
-%%% Inform the crashdump_viewer_server that a background job is completed.
-background_done(Result) ->
-    Dict = get(),
-    cast({background_done,Result,Dict}).    
-
-background_status(Status) ->
-    cast({background_status,Status}).
-
 %%%-----------------------------------------------------------------
 %%% Functions for reading information from the dump
 general_info(File) ->
@@ -1330,22 +897,18 @@ general_info(File) ->
 		  WholeLine -> WholeLine
 	      end,
 
-    GI0 = get_general_info(Fd,#general_info{created=Created}),
-    GI = case GI0#general_info.num_atoms of
-	    ?space -> GI0#general_info{num_atoms=get_num_atoms(Fd)};
-	    _ -> GI0
-	end,
+    GI = get_general_info(Fd,#general_info{created=Created}),
 
     {MemTot,MemMax} = 
 	case lookup_index(?memory) of
 	    [{_,MemStart}] ->
 		pos_bof(Fd,MemStart),
 		Memory = get_meminfo(Fd,[]),
-		Tot = case lists:keysearch("total",1,Memory) of
+		Tot = case lists:keysearch(total,1,Memory) of
 			  {value,{_,T}} -> T;
 			  false -> ""
 		      end,
-		Max = case lists:keysearch("maximum",1,Memory) of
+		Max = case lists:keysearch(maximum,1,Memory) of
 			  {value,{_,M}} -> M;
 			  false -> ""
 		      end,
@@ -1408,269 +971,210 @@ get_general_info(Fd,GenInfo) ->
 	    GenInfo
     end.
 
-get_num_atoms(Fd) ->
-    case lookup_index(?hash_table,"atom_tab") of
-	[{_,Pos}] -> 
-	    pos_bof(Fd,Pos),
-	    skip_rest_of_line(Fd), % size
-	    skip_rest_of_line(Fd), % used
-	    case line_head(Fd) of
-		"objs" ->
-		    val(Fd);
-		_1 ->
-		    get_num_atoms2()
-	    end;
-	[] ->
-	    get_num_atoms2()
-    end.
-get_num_atoms2() ->
-    case lookup_index(?num_atoms) of
-	[] -> 
-	    ?space;
-	[{NA,_Pos}] -> 
-	    %% If dump is translated this will exist
-	    case get(truncated) of
-		true ->
-		    [NA," (visible in dump)"]; % might be more
-		false ->
-		    NA
-	    end
-    end.
-
 count() ->
     {count_index(?proc),count_index(?ets),count_index(?fu),count_index(?timer)}.
 
 
 %%-----------------------------------------------------------------
 %% Page with all processes
-%%
-%% If there are less than ?max_sort_process_num processes in the dump,
-%% we will store the list of processes in the server state in order to
-%% allow sorting according to the different columns of the
-%% table. Since ?max_sort_process_num=:=?items_chunk_size, there will
-%% never be more than one chunk in this case.
-%% 
-%% If there are more than ?max_sort_process_num processes in the dump,
-%% no sorting will be allowed, and the processes must be read (chunk
-%% by chunk) from the file each time the page is opened. This is to
-%% avoid really big data in the server state.
-procs_summary(SessionId,TW,_,State=#state{procs_summary=too_many}) ->
-    chunk_page(SessionId,State#state.file,TW,?proc,processes,
-	       {no_sort,State#state.shared_heap,State#state.dump_vsn},
-	       procs_summary_parsefun()),
-    State;
-procs_summary(SessionId,TW,SortOn,State) ->
-    ProcsSummary = 
-	case State#state.procs_summary of
-	    undefined -> % first time - read from file
-		Fd = open(State#state.file),
-		{PS,_}=lookup_and_parse_index_chunk(first_chunk_pointer(?proc),
-						    Fd,procs_summary_parsefun()),
-		close(Fd),
-		PS;
-	    PS ->
-		PS
-	end,
-    {SortedPS,NewSorted} = do_sort_procs(SortOn,ProcsSummary,State),
-    HtmlInfo = 
-	crashdump_viewer_html:chunk_page(processes,SessionId,TW,
-					 {SortOn,
-					  State#state.shared_heap,
-					  State#state.dump_vsn},
-					 SortedPS),
-    crashdump_viewer_html:chunk(SessionId,done,HtmlInfo),
-    State#state{procs_summary=ProcsSummary,sorted=NewSorted}.
-
-procs_summary_parsefun() ->
-    fun(Fd,Pid) -> 
-	    get_procinfo(Fd,fun main_procinfo/4,#proc{pid=Pid}) 
-    end.
+procs_summary(File,WS) ->
+    ParseFun = fun(Fd,Pid) ->
+		       Proc = get_procinfo(Fd,fun main_procinfo/5,
+					   #proc{pid=list_to_pid(Pid)},WS),
+		       case Proc#proc.memory of
+			   undefined -> Proc#proc{memory=Proc#proc.stack_heap};
+			   _ -> Proc
+		       end
+	       end,
+    lookup_and_parse_index(File,?proc,ParseFun,"processes").
 
 %%-----------------------------------------------------------------
 %% Page with one process
-get_proc_details(File,Pid,DumpVsn) ->
+get_proc_details(File,Pid,WS,DumpVsn,Binaries) ->
     case lookup_index(?proc,Pid) of
 	[{_,Start}] ->
 	    Fd = open(File),
-	    pos_bof(Fd,Start),
-	    Proc0 = 
-		case DumpVsn of
-		    [0,0] ->
-			%% Old version (translated)
-			#proc{pid=Pid};
-		    _ ->
-			#proc{pid=Pid,
-			      stack_dump=if_exist(?proc_stack,Pid),
-			      msg_q=if_exist(?proc_messages,Pid),
-			      dict=if_exist(?proc_dictionary,Pid),
-			      debug_dict=if_exist(?debug_proc_dictionary,Pid)}
+	    {{Stack,MsgQ,Dict},TW} =
+		case truncated_warning([{?proc,Pid}]) of
+		    [] ->
+			{expand_memory(Fd,Pid,DumpVsn,Binaries),[]};
+		    TW0 ->
+			{{[],[],[]},TW0}
 		end,
-	    Proc = get_procinfo(Fd,fun all_procinfo/4,Proc0),
+	    pos_bof(Fd,Start),
+	    Proc0 = #proc{pid=Pid,stack_dump=Stack,msg_q=MsgQ,dict=Dict},
+	    Proc = get_procinfo(Fd,fun all_procinfo/5,Proc0,WS),
 	    close(Fd),
-	    {ok,Proc};
+	    {ok,Proc,TW};
 	_ ->
-	    case maybe_other_node(File,Pid) of
-		{other_node,Type,Node} -> 
-		    Info = "The process you are searching for was residing on "
-			"a remote node. No process information is available. "
-			"Information about the remote node is show below.",
-		    {other_node,{Type,Info,Node}};
-		not_found ->
-		    not_found
-	    end
-    end.
-
-if_exist(Tag,Key) ->
-    case count_index(Tag,Key) of
-	0 -> 
-	    Tag1 = 
-		case is_proc_tag(Tag) of
-		    true -> ?proc;
-		    false -> Tag
-		end,
-	    case truncated_here({Tag1,Key}) of
-		true -> truncated;
-		false -> ?space
-	    end;
-	_ -> 
-	    expand
+	    maybe_other_node(Pid)
     end.
 
-get_procinfo(Fd,Fun,Proc) ->
+get_procinfo(Fd,Fun,Proc,WS) ->
     case line_head(Fd) of
 	"State" ->
 	    State = case val(Fd) of
 			"Garbing" -> "Garbing\n(limited info)";
 			State0 -> State0
 		    end,
-	    get_procinfo(Fd,Fun,Proc#proc{state=State});
+	    get_procinfo(Fd,Fun,Proc#proc{state=State},WS);
 	"Name" ->
-	    get_procinfo(Fd,Fun,Proc#proc{name=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{name=val(Fd)},WS);
 	"Spawned as" ->
 	    IF = val(Fd),
 	    case Proc#proc.name of
-		?space ->
-		    get_procinfo(Fd,Fun,Proc#proc{name=IF,init_func=IF});
+		undefined ->
+		    get_procinfo(Fd,Fun,Proc#proc{name=IF,init_func=IF},WS);
 		_ ->
-		    get_procinfo(Fd,Fun,Proc#proc{init_func=IF})
+		    get_procinfo(Fd,Fun,Proc#proc{init_func=IF},WS)
 	    end;
+	"Message queue length" ->
+	    %% stored as integer so we can sort on it
+	    get_procinfo(Fd,Fun,Proc#proc{msg_q_len=list_to_integer(val(Fd))},WS);
+	"Reductions" ->
+	    %% stored as integer so we can sort on it
+	    get_procinfo(Fd,Fun,Proc#proc{reds=list_to_integer(val(Fd))},WS);
+	"Stack+heap" ->
+	    %% stored as integer so we can sort on it
+	    get_procinfo(Fd,Fun,Proc#proc{stack_heap=
+					  list_to_integer(val(Fd))*WS},WS);
+	"Memory" ->
+	    %% stored as integer so we can sort on it
+	    get_procinfo(Fd,Fun,Proc#proc{memory=list_to_integer(val(Fd))},WS);
+	{eof,_} ->
+	    Proc; % truncated file
+	Other ->
+	    Fun(Fd,Fun,Proc,WS,Other)
+    end.
+
+main_procinfo(Fd,Fun,Proc,WS,LineHead) ->
+    case LineHead of
+	"=" ++ _next_tag ->
+	    Proc;
+	"arity = " ++ _ ->
+	    %%! Temporary workaround
+	    get_procinfo(Fd,Fun,Proc,WS);
+	_Other ->
+	    skip_rest_of_line(Fd),
+	    get_procinfo(Fd,Fun,Proc,WS)
+    end.
+all_procinfo(Fd,Fun,Proc,WS,LineHead) ->
+    case LineHead of
+	%% - START - moved from get_procinfo -
 	"Spawned by" ->
 	    case val(Fd) of
 		"[]" ->
-		    get_procinfo(Fd,Fun,Proc);
+		    get_procinfo(Fd,Fun,Proc,WS);
 		Parent ->
-		    get_procinfo(Fd,Fun,Proc#proc{parent=Parent})
+		    get_procinfo(Fd,Fun,Proc#proc{parent=Parent},WS)
 	    end;
 	"Started" ->
-	    get_procinfo(Fd,Fun,Proc#proc{start_time=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{start_time=val(Fd)},WS);
 	"Last scheduled in for" ->
 	    get_procinfo(Fd,Fun,Proc#proc{current_func=
 					  {"Last scheduled in for",
-					   val(Fd)}});
+					   val(Fd)}},WS);
 	"Current call" ->
 	    get_procinfo(Fd,Fun,Proc#proc{current_func={"Current call",
-							val(Fd)}});
-	"Message queue length" -> 
-	    %% stored as integer so we can sort on it
-	    get_procinfo(Fd,Fun,Proc#proc{msg_q_len=list_to_integer(val(Fd))});
-	"Reductions" ->
-	    %% stored as integer so we can sort on it
-	    get_procinfo(Fd,Fun,Proc#proc{reds=list_to_integer(val(Fd))});
+							val(Fd)}},WS);
 	"Number of heap fragments" ->
-	    get_procinfo(Fd,Fun,Proc#proc{num_heap_frag=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{num_heap_frag=val(Fd)},WS);
 	"Heap fragment data" ->
-	    get_procinfo(Fd,Fun,Proc#proc{heap_frag_data=val(Fd)});
-	Stack when Stack=:="Stack+heap"; Stack=:="Stack" ->
-	    %% stored as integer so we can sort on it
-	    get_procinfo(Fd,Fun,Proc#proc{stack_heap=
-					  list_to_integer(val(Fd))});
+	    get_procinfo(Fd,Fun,Proc#proc{heap_frag_data=val(Fd)},WS);
 	"OldHeap" ->
-	    get_procinfo(Fd,Fun,Proc#proc{old_heap=val(Fd)});
+	    Bytes = list_to_integer(val(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{old_heap=Bytes},WS);
 	"Heap unused" ->
-	    get_procinfo(Fd,Fun,Proc#proc{heap_unused=val(Fd)});
+	    Bytes = list_to_integer(val(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{heap_unused=Bytes},WS);
 	"OldHeap unused" ->
-	    get_procinfo(Fd,Fun,Proc#proc{old_heap_unused=val(Fd)});
+	    Bytes = list_to_integer(val(Fd))*WS,
+	    get_procinfo(Fd,Fun,Proc#proc{old_heap_unused=Bytes},WS);
 	"New heap start" ->
-	    get_procinfo(Fd,Fun,Proc#proc{new_heap_start=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{new_heap_start=val(Fd)},WS);
 	"New heap top" ->
-	    get_procinfo(Fd,Fun,Proc#proc{new_heap_top=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{new_heap_top=val(Fd)},WS);
 	"Stack top" ->
-	    get_procinfo(Fd,Fun,Proc#proc{stack_top=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{stack_top=val(Fd)},WS);
 	"Stack end" ->
-	    get_procinfo(Fd,Fun,Proc#proc{stack_end=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{stack_end=val(Fd)},WS);
 	"Old heap start" ->
-	    get_procinfo(Fd,Fun,Proc#proc{old_heap_start=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{old_heap_start=val(Fd)},WS);
 	"Old heap top" ->
-	    get_procinfo(Fd,Fun,Proc#proc{old_heap_top=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{old_heap_top=val(Fd)},WS);
 	"Old heap end" ->
-	    get_procinfo(Fd,Fun,Proc#proc{old_heap_end=val(Fd)});
-	"Memory" ->
-	    %% stored as integer so we can sort on it
-	    get_procinfo(Fd,Fun,Proc#proc{memory=list_to_integer(val(Fd))});
-	{eof,_} ->
-	    Proc; % truncated file
-	Other ->
-	    Fun(Fd,Fun,Proc,Other)
-    end.
-
-main_procinfo(Fd,Fun,Proc,LineHead) ->
-    case LineHead of
-	"Stack dump" ->
-	    %% This is the last element in older dumps (DumpVsn=0.0)
-	    Proc;
-	"=" ++ _next_tag ->
-	    %% DumpVsn=0.1 or newer: No stack dump here
-	    Proc;
-	"arity = " ++ _ ->
-	    %%! Temporary workaround
-	    get_procinfo(Fd,Fun,Proc);	
-	_Other ->
-	    skip_rest_of_line(Fd),
-	    get_procinfo(Fd,Fun,Proc)
-    end.
-all_procinfo(Fd,Fun,Proc,LineHead) ->
-    case LineHead of
-	"Message queue" -> 
-	    get_procinfo(Fd,Fun,Proc#proc{msg_q=size_or_term(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{old_heap_end=val(Fd)},WS);
+	%% - END - moved from get_procinfo -
 	"Last calls" ->
-	    R = case size_or_term(Fd) of
-		    SizeThing when is_tuple(SizeThing) ->
-			Proc#proc{last_calls=SizeThing};
-		    Term ->
-			Proc#proc{last_calls=replace_all($ ,$\n,Term,[])}
-		end,
-	    get_procinfo(Fd,Fun,R);
+	    get_procinfo(Fd,Fun,Proc#proc{last_calls=get_lines_to_empty(Fd)},WS);
 	"Link list" ->
-	    get_procinfo(Fd,Fun,Proc#proc{links=val(Fd)});
+	    {Links,Monitors,MonitoredBy} = parse_link_list(val(Fd),[],[],[]),
+	    get_procinfo(Fd,Fun,Proc#proc{links=Links,
+					  monitors=Monitors,
+					  mon_by=MonitoredBy},WS);
 	"Program counter" ->
-	    get_procinfo(Fd,Fun,Proc#proc{prog_count=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{prog_count=val(Fd)},WS);
 	"CP" ->
-	    get_procinfo(Fd,Fun,Proc#proc{cp=val(Fd)});
+	    get_procinfo(Fd,Fun,Proc#proc{cp=val(Fd)},WS);
 	"arity = " ++ Arity ->
 	    %%! Temporary workaround
-	    get_procinfo(Fd,Fun,Proc#proc{arity=Arity--"\r\n"});
-	"Dictionary" ->
-	    get_procinfo(Fd,Fun,Proc#proc{dict=size_or_term(Fd)});
-	"$Dictionary" ->
-	    get_procinfo(Fd,Fun,Proc#proc{debug_dict=size_or_term(Fd)});
-	"Stack dump" ->
-	    %% This is the last element in older dumps (DumpVsn=0.0)
-	    get_stack_dump(Fd,Proc);
+	    get_procinfo(Fd,Fun,Proc#proc{arity=Arity--"\r\n"},WS);
 	"=" ++ _next_tag ->
-	    %% DumpVsn=0.1 or newer: No stack dump here
 	    Proc;
 	Other ->
 	    unexpected(Fd,Other,"process info"),
-	    get_procinfo(Fd,Fun,Proc)
+	    get_procinfo(Fd,Fun,Proc,WS)
+    end.
+
+parse_link_list([SB|Str],Links,Monitors,MonitoredBy) when SB==$[; SB==$] ->
+    parse_link_list(Str,Links,Monitors,MonitoredBy);
+parse_link_list("#Port"++_=Str,Links,Monitors,MonitoredBy) ->
+    {Link,Rest} = parse_port(Str),
+    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
+parse_link_list("<"++_=Str,Links,Monitors,MonitoredBy) ->
+    {Link,Rest} = parse_pid(Str),
+    parse_link_list(Rest,[Link|Links],Monitors,MonitoredBy);
+parse_link_list("{to,"++Str,Links,Monitors,MonitoredBy) ->
+    {Mon,Rest} = parse_monitor(Str),
+    parse_link_list(Rest,Links,[Mon|Monitors],MonitoredBy);
+parse_link_list("{from,"++Str,Links,Monitors,MonitoredBy) ->
+    {Mon,Rest} = parse_monitor(Str),
+    parse_link_list(Rest,Links,Monitors,[Mon|MonitoredBy]);
+parse_link_list(", "++Rest,Links,Monitors,MonitoredBy) ->
+    parse_link_list(Rest,Links,Monitors,MonitoredBy);
+parse_link_list([],Links,Monitors,MonitoredBy) ->
+    {lists:reverse(Links),lists:reverse(Monitors),lists:reverse(MonitoredBy)}.
+
+parse_port(Str) ->
+    {Port,Rest} = parse_link(Str,[]),
+    {{Port,Port},Rest}.
+
+parse_pid(Str) ->
+    {Pid,Rest} = parse_link(Str,[]),
+    {{Pid,Pid},Rest}.
+
+parse_monitor(Str) ->
+    case parse_link(Str,[]) of
+	{Pid,","++Rest1} ->
+	    case parse_link(Rest1,[]) of
+		{Ref,"}"++Rest2} ->
+		    {{Pid,Pid++" ("++Ref++")"},Rest2};
+		{Ref,[]} ->
+		    {{Pid,Pid++" ("++Ref++")"},[]}
+	    end;
+	{Pid,[]} ->
+	    {{Pid,Pid++" (unknown_ref)"},[]}
     end.
 
-get_stack_dump(Fd,Proc) ->
-    %% Always show stackdump as "Expand" link
-    Pos = get(pos),
-    Size = count_rest_of_tag(Fd),
-    Proc#proc{stack_dump={size,true,Size,Pos}}.
+parse_link(">"++Rest,Acc) ->
+    {lists:reverse(Acc,">"),Rest};
+parse_link([H|T],Acc) ->
+    parse_link(T,[H|Acc]);
+parse_link([],Acc) ->
+    %% truncated
+    {lists:reverse(Acc),[]}.
 
-maybe_other_node(File,Id) ->
+maybe_other_node(Id) ->
     Channel = 
 	case split($.,Id) of
 	    {"<" ++ N, _Rest} ->
@@ -1688,99 +1192,77 @@ maybe_other_node(File,Id) ->
 	   end),
     
     case ets:select(cdv_dump_index_table,Ms) of
-	[] -> 
+	[] ->
 	    not_found;
-	[{Type,Pos}] -> 
-	    Fd = open(File),
-	    NodeInfo = get_nodeinfo(Fd,Channel,Pos),
-	    close(Fd),
-	    {other_node,Type,NodeInfo}
+	[_] ->
+	    {other_node,Channel}
     end.
 
 
-expand_memory(File,What,Pid,Binaries) ->
-    Fd = open(File),
+expand_memory(Fd,Pid,DumpVsn,Binaries) ->
+    BinAddrAdj = get_bin_addr_adj(DumpVsn),
     put(fd,Fd),
-    Dict = read_heap(Fd,Pid,Binaries),
-    Expanded = 
-	case What of
-	    "StackDump" -> read_stack_dump(Fd,Pid,Dict);
-	    "MsgQueue" -> read_messages(Fd,Pid,Dict);
-	    "Dictionary" -> read_dictionary(Fd,?proc_dictionary,Pid,Dict);
-	    "DebugDictionary" -> read_dictionary(Fd,?debug_proc_dictionary,Pid,Dict)
-	end,
+    Dict = read_heap(Fd,Pid,BinAddrAdj,Binaries),
+    Expanded = {read_stack_dump(Fd,Pid,BinAddrAdj,Dict),
+		read_messages(Fd,Pid,BinAddrAdj,Dict),
+		read_dictionary(Fd,Pid,BinAddrAdj,Dict)},
     erase(fd),
-    close(Fd),
     Expanded.
-    
+
+%%%-----------------------------------------------------------------
+%%% This is a workaround for a bug in dump versions prior to 0.3:
+%%% Addresses were truncated to 32 bits. This could cause binaries to
+%%% get the same address as heap terms in the dump. To work around it
+%%% we always store binaries on very high addresses in the gb_tree.
+get_bin_addr_adj(DumpVsn) when DumpVsn < [0,3] ->
+    16#f bsl 64;
+get_bin_addr_adj(_) ->
+    0.
+
 %%%
 %%% Read binaries.
 %%%
-read_binaries(Fd) ->
+read_binaries(Fd,DumpVsn) ->
     AllBinaries = lookup_index(?binary),
-    read_binaries(Fd,AllBinaries, gb_trees:empty()).
-
-read_binaries(Fd,[{Addr0,Pos}|Bins],Dict0) ->
-    pos_bof(Fd,Pos),
-    {Addr,_} = get_hex(Addr0),
-    Dict = 
-	case line_head(Fd) of
-	    {eof,_} ->
-		gb_trees:enter(Addr,'#CDVTruncatedBinary',Dict0);
-	    Size0 ->
-		{Size,_} = get_hex(Size0),
-		if Size > ?max_display_binary_size ->
-			gb_trees:enter(Addr,{'#CDVTooBig',binary,Pos},Dict0);
-		   true ->
-			pos_bof(Fd,Pos),
-			Line = val(Fd),
-			parse_binary(Addr,Line,Dict0)
-		end
-	end,
-    read_binaries(Fd,Bins,Dict);
-read_binaries(_Fd,[],Dict) ->
-    Dict.
-
-parse_binary(Addr, Line0, Dict) ->
-    case get_hex(Line0) of
-	{N,":"++Line1} ->
-	    {Bin,Line} = get_binary(N, Line1, []),
-	    [] = skip_blanks(Line),
-	    gb_trees:enter(Addr, Bin, Dict);
-	{_N,[]} ->
-	    %% If the dump is truncated before the ':' in this line, then
-	    %% line_head/1 might not discover it (if a \n has been inserted
-	    %% somehow???)
-	    gb_trees:enter(Addr,'#CDVTruncatedBinary',Dict)
-    end.
-
-
+    AddrAdj = get_bin_addr_adj(DumpVsn),
+    Fun = fun({Addr0,Pos},Dict0) ->
+		  pos_bof(Fd,Pos),
+		  {HexAddr,_} = get_hex(Addr0),
+		  Addr = HexAddr bor AddrAdj,
+		  Bin =
+		      case line_head(Fd) of
+			  {eof,_} -> '#CDVTruncatedBinary';
+			  _Size   -> {'#CDVBin',Pos}
+		      end,
+		  gb_trees:enter(Addr,Bin,Dict0)
+	  end,
+    progress_foldl("Processing binaries",Fun,gb_trees:empty(),AllBinaries).
 
 %%%
 %%% Read top level section.
 %%%
 
-read_stack_dump(Fd,Pid,Dict) ->
+read_stack_dump(Fd,Pid,BinAddrAdj,Dict) ->
     case lookup_index(?proc_stack,Pid) of
 	[{_,Start}] ->
 	    pos_bof(Fd,Start),
-	    read_stack_dump1(Fd,Dict,[]);
+	    read_stack_dump1(Fd,BinAddrAdj,Dict,[]);
 	[] ->
 	    []
     end.
-read_stack_dump1(Fd,Dict,Acc) ->
+read_stack_dump1(Fd,BinAddrAdj,Dict,Acc) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case val(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
 	Line ->
-	    Stack = parse_top(Line,Dict),
-	    read_stack_dump1(Fd,Dict,[Stack|Acc])
+	    Stack = parse_top(Line,BinAddrAdj,Dict),
+	    read_stack_dump1(Fd,BinAddrAdj,Dict,[Stack|Acc])
     end.
 
-parse_top(Line0, D) ->
+parse_top(Line0, BinAddrAdj, D) ->
     {Label,Line1} = get_label(Line0),
-    {Term,Line,D} = parse_term(Line1, D),
+    {Term,Line,D} = parse_term(Line1, BinAddrAdj, D),
     [] = skip_blanks(Line),
     {Label,Term}.
 
@@ -1788,27 +1270,27 @@ parse_top(Line0, D) ->
 %%% Read message queue.
 %%%
 
-read_messages(Fd,Pid,Dict) ->
+read_messages(Fd,Pid,BinAddrAdj,Dict) ->
     case lookup_index(?proc_messages,Pid) of
 	[{_,Start}] ->
 	    pos_bof(Fd,Start),
-	    read_messages1(Fd,Dict,[]);
+	    read_messages1(Fd,BinAddrAdj,Dict,[]);
 	[] ->
 	    []
     end.
-read_messages1(Fd,Dict,Acc) ->
+read_messages1(Fd,BinAddrAdj,Dict,Acc) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case val(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
 	Line ->
-	    Msg = parse_message(Line,Dict),
-	    read_messages1(Fd,Dict,[Msg|Acc])
+	    Msg = parse_message(Line,BinAddrAdj,Dict),
+	    read_messages1(Fd,BinAddrAdj,Dict,[Msg|Acc])
     end.
     
-parse_message(Line0, D) ->
-    {Msg,":"++Line1,_} = parse_term(Line0, D),
-    {Token,Line,_} = parse_term(Line1, D),
+parse_message(Line0, BinAddrAdj, D) ->
+    {Msg,":"++Line1,_} = parse_term(Line0, BinAddrAdj, D),
+    {Token,Line,_} = parse_term(Line1, BinAddrAdj, D),
     [] = skip_blanks(Line),
     {Msg,Token}.
     
@@ -1816,26 +1298,26 @@ parse_message(Line0, D) ->
 %%% Read process dictionary
 %%%
 
-read_dictionary(Fd,Tag,Pid,Dict) ->
-    case lookup_index(Tag,Pid) of
+read_dictionary(Fd,Pid,BinAddrAdj,Dict) ->
+    case lookup_index(?proc_dictionary,Pid) of
 	[{_,Start}] ->
 	    pos_bof(Fd,Start),
-	    read_dictionary1(Fd,Dict,[]);
+	    read_dictionary1(Fd,BinAddrAdj,Dict,[]);
 	[] ->
 	    []
     end.
-read_dictionary1(Fd,Dict,Acc) ->
+read_dictionary1(Fd,BinAddrAdj,Dict,Acc) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case val(Fd) of
 	"=" ++ _next_tag ->
 	    lists:reverse(Acc);
 	Line ->
-	    Msg = parse_dictionary(Line,Dict),
-	    read_dictionary1(Fd,Dict,[Msg|Acc])
+	    Msg = parse_dictionary(Line,BinAddrAdj,Dict),
+	    read_dictionary1(Fd,BinAddrAdj,Dict,[Msg|Acc])
     end.
     
-parse_dictionary(Line0, D) ->
-    {Entry,Line,_} = parse_term(Line0, D),
+parse_dictionary(Line0, BinAddrAdj, D) ->
+    {Entry,Line,_} = parse_term(Line0, BinAddrAdj, D),
     [] = skip_blanks(Line),
     Entry.
     
@@ -1843,16 +1325,16 @@ parse_dictionary(Line0, D) ->
 %%% Read heap data.
 %%%
 
-read_heap(Fd,Pid,Dict0) ->
+read_heap(Fd,Pid,BinAddrAdj,Dict0) ->
     case lookup_index(?proc_heap,Pid) of
 	[{_,Pos}] ->
 	    pos_bof(Fd,Pos),
-	    read_heap(Dict0);
+	    read_heap(BinAddrAdj,Dict0);
 	[] ->
 	    Dict0
     end.
 
-read_heap(Dict0) ->
+read_heap(BinAddrAdj,Dict0) ->
     %% This function is never called if the dump is truncated in {?proc_heap,Pid}
     case get(fd) of
 	end_of_heap ->
@@ -1863,68 +1345,18 @@ read_heap(Dict0) ->
 		    put(fd, end_of_heap),
 		    Dict0;
 		Line ->
-		    Dict = parse(Line,Dict0),
-		    read_heap(Dict)
+		    Dict = parse(Line,BinAddrAdj,Dict0),
+		    read_heap(BinAddrAdj,Dict)
 	    end
     end.
 
-parse(Line0, Dict0) ->
+parse(Line0, BinAddrAdj, Dict0) ->
     {Addr,":"++Line1} = get_hex(Line0),
-    {_Term,Line,Dict} = parse_heap_term(Line1, Addr, Dict0),
+    {_Term,Line,Dict} = parse_heap_term(Line1, Addr, BinAddrAdj, Dict0),
     [] = skip_blanks(Line),
     Dict.
 
 
-do_sort_procs("state",Procs,#state{sorted="state"}) ->
-    {lists:reverse(lists:keysort(#proc.state,Procs)),"rstate"};
-do_sort_procs("state",Procs,_) ->
-    {lists:keysort(#proc.state,Procs),"state"};
-do_sort_procs("pid",Procs,#state{sorted="pid"}) ->
-    {lists:reverse(Procs),"rpid"};
-do_sort_procs("pid",Procs,_) ->
-    {Procs,"pid"};
-do_sort_procs("msg_q_len",Procs,#state{sorted="msg_q_len"}) ->
-    {lists:keysort(#proc.msg_q_len,Procs),"rmsg_q_len"};
-do_sort_procs("msg_q_len",Procs,_) ->
-    {lists:reverse(lists:keysort(#proc.msg_q_len,Procs)),"msg_q_len"};
-do_sort_procs("reds",Procs,#state{sorted="reds"}) ->
-    {lists:keysort(#proc.reds,Procs),"rreds"};
-do_sort_procs("reds",Procs,_) ->
-    {lists:reverse(lists:keysort(#proc.reds,Procs)),"reds"};
-do_sort_procs("mem",Procs,#state{sorted="mem",dump_vsn=DumpVsn}) ->
-    KeyPos = if DumpVsn>=?r16b01_dump_vsn -> #proc.memory;
-		true -> #proc.stack_heap
-	     end,
-    {lists:keysort(KeyPos,Procs),"rmem"};
-do_sort_procs("mem",Procs,#state{dump_vsn=DumpVsn}) ->
-    KeyPos = if DumpVsn>=?r16b01_dump_vsn -> #proc.memory;
-		true -> #proc.stack_heap
-	     end,
-    {lists:reverse(lists:keysort(KeyPos,Procs)),"mem"};
-do_sort_procs("init_func",Procs,#state{sorted="init_func"}) ->
-    {lists:reverse(lists:keysort(#proc.init_func,Procs)),"rinit_func"};
-do_sort_procs("init_func",Procs,_) ->
-    {lists:keysort(#proc.init_func,Procs),"init_func"};
-do_sort_procs("name_func",Procs,#state{sorted="name_func"}) ->
-    {lists:reverse(lists:keysort(#proc.name,Procs)),"rname_func"};
-do_sort_procs("name_func",Procs,_) ->
-    {lists:keysort(#proc.name,Procs),"name_func"};
-do_sort_procs("name",Procs,#state{sorted=Sorted}) ->
-    {No,Yes} = 
-	lists:foldl(fun(P,{N,Y}) ->
-			    case P#proc.name of
-				?space -> {[P|N],Y};
-				_other -> {N,[P|Y]}
-			    end
-		    end,
-		    {[],[]},
-		    Procs),
-    Result = lists:keysort(#proc.name,Yes) ++ No,
-    case Sorted of
-	"name" -> {lists:reverse(Result),"rname"};
-	_ -> {Result,"name"}
-    end.
-    
 %%-----------------------------------------------------------------
 %% Page with one port
 get_port(File,Port) ->
@@ -1936,46 +1368,59 @@ get_port(File,Port) ->
 	    close(Fd),
 	    {ok,R};
 	[] ->
-	    case maybe_other_node(File,Port) of
-		{other_node,Type,Node} -> 
-		    Info = "The port you are searching for was residing on "
-			"a remote node. No port information is available. "
-			"Information about the remote node is show below.",
-		    {other_node,{Type,Info,Node}};
-		not_found ->
-		    not_found
-	    end
+	    maybe_other_node(Port)
     end.
 
 %%-----------------------------------------------------------------
 %% Page with all ports
-get_ports(SessionId,File,TW) ->
-    ParseFun = fun(Fd,Id) -> get_portinfo(Fd,#port{id=Id}) end,
-    chunk_page(SessionId,File,TW,?port,ports,[],ParseFun).
+get_ports(File) ->
+    ParseFun = fun(Fd,Id) -> get_portinfo(Fd,#port{id=port_to_tuple(Id)}) end,
+    lookup_and_parse_index(File,?port,ParseFun,"ports").
+
+%% Converting port string to tuple to secure correct sorting. This is
+%% converted back in cdv_port_cb:format/1.
+port_to_tuple("#Port<"++Port) ->
+    [I1,I2] = string:tokens(Port,".>"),
+    {list_to_integer(I1),list_to_integer(I2)}.
 
 get_portinfo(Fd,Port) ->
     case line_head(Fd) of
 	"Slot" ->
-	    get_portinfo(Fd,Port#port{slot=val(Fd)});
+	    %% stored as integer so we can sort on it
+	    get_portinfo(Fd,Port#port{slot=list_to_integer(val(Fd))});
 	"Connected" ->
-	    get_portinfo(Fd,Port#port{connected=val(Fd)});
+	    %% stored as pid so we can sort on it
+	    Connected0 = val(Fd),
+	    Connected =
+		try list_to_pid(Connected0)
+		catch error:badarg -> Connected0
+		end,
+	    get_portinfo(Fd,Port#port{connected=Connected});
 	"Links" ->
-	    get_portinfo(Fd,Port#port{links=val(Fd)});
+	    Pids = split_pid_list_no_space(val(Fd)),
+	    Links = [{Pid,Pid} || Pid <- Pids],
+	    get_portinfo(Fd,Port#port{links=Links});
 	"Registered as" ->
 	    get_portinfo(Fd,Port#port{name=val(Fd)});
 	"Monitors" ->
-	    get_portinfo(Fd,Port#port{monitors=val(Fd)});
+	    Monitors0 = string:tokens(val(Fd),"()"),
+	    Monitors = [begin
+			    [Pid,Ref] = string:tokens(Mon,","),
+			    {Pid,Pid++" ("++Ref++")"}
+			end || Mon <- Monitors0],
+	    get_portinfo(Fd,Port#port{monitors=Monitors});
 	"Port controls linked-in driver" ->
-	    get_portinfo(Fd,Port#port{controls=["Linked in driver: " |
-						val(Fd)]});
+	    Str = lists:flatten(["Linked in driver: " | val(Fd)]),
+	    get_portinfo(Fd,Port#port{controls=Str});
 	"Port controls external process" ->
-	    get_portinfo(Fd,Port#port{controls=["External proc: " | val(Fd)]});
+	    Str = lists:flatten(["External proc: " | val(Fd)]),
+	    get_portinfo(Fd,Port#port{controls=Str});
 	"Port is a file" ->
-	    get_portinfo(Fd,Port#port{controls=["File: "| val(Fd)]});
+	    Str = lists:flatten(["File: "| val(Fd)]),
+	    get_portinfo(Fd,Port#port{controls=Str});
 	"Port is UNIX fd not opened by emulator" ->
-	    get_portinfo(Fd,Port#port{
-			      controls=["UNIX fd not opened by emulator: "| 
-					val(Fd)]});
+	    Str = lists:flatten(["UNIX fd not opened by emulator: "| val(Fd)]),
+	    get_portinfo(Fd,Port#port{controls=Str});
 	"=" ++ _next_tag ->
 	    Port;
 	Other ->
@@ -1983,17 +1428,27 @@ get_portinfo(Fd,Port) ->
 	    Port
     end.
 
+split_pid_list_no_space(String) ->
+    split_pid_list_no_space(String,[],[]).
+split_pid_list_no_space([$>|Rest],Acc,Pids) ->
+    split_pid_list_no_space(Rest,[],[lists:reverse(Acc,[$>])|Pids]);
+split_pid_list_no_space([H|T],Acc,Pids) ->
+    split_pid_list_no_space(T,[H|Acc],Pids);
+split_pid_list_no_space([],[],Pids) ->
+    lists:reverse(Pids).
 
 %%-----------------------------------------------------------------
 %% Page with external ets tables
-get_ets_tables(SessionId,File,Heading,TW,Pid,WS) ->
-    ParseFun = fun(Fd,Id) -> get_etsinfo(Fd,#ets_table{pid=Id},WS) end,
-    chunk_page(SessionId,File,TW,{?ets,Pid},ets_tables,Heading,ParseFun).
+get_ets_tables(File,Pid,WS) ->
+    ParseFun = fun(Fd,Id) ->
+		       get_etsinfo(Fd,#ets_table{pid=list_to_pid(Id)},WS)
+	       end,
+    lookup_and_parse_index(File,{?ets,Pid},ParseFun,"ets").
 
 get_etsinfo(Fd,EtsTable,WS) ->
     case line_head(Fd) of
 	"Slot" ->
-	    get_etsinfo(Fd,EtsTable#ets_table{slot=val(Fd)},WS);
+	    get_etsinfo(Fd,EtsTable#ets_table{slot=list_to_integer(val(Fd))},WS);
 	"Table" ->
 	    get_etsinfo(Fd,EtsTable#ets_table{id=val(Fd)},WS);
 	"Name" ->
@@ -2002,15 +1457,18 @@ get_etsinfo(Fd,EtsTable,WS) ->
 	    skip_rest_of_line(Fd),
 	    get_etsinfo(Fd,EtsTable#ets_table{type="tree",buckets="-"},WS);
 	"Buckets" ->
-	    get_etsinfo(Fd,EtsTable#ets_table{buckets=val(Fd)},WS);
+	    %% A bug in erl_db_hash.c prints a space after the buckets
+	    %% - need to strip the string to make list_to_integer/1 happy.
+	    Buckets = list_to_integer(string:strip(val(Fd))),
+	    get_etsinfo(Fd,EtsTable#ets_table{buckets=Buckets},WS);
 	"Objects" ->
-	    get_etsinfo(Fd,EtsTable#ets_table{size=val(Fd)},WS);
+	    get_etsinfo(Fd,EtsTable#ets_table{size=list_to_integer(val(Fd))},WS);
 	"Words" ->
 	    Words = list_to_integer(val(Fd)),
 	    Bytes = 
 		case Words of
-		    -1 -> "-1"; % probably truncated
-		    _ -> integer_to_list(Words * WS)
+		    -1 -> -1; % probably truncated
+		    _ -> Words * WS
 		end,
 	    get_etsinfo(Fd,EtsTable#ets_table{memory=Bytes},WS);
 	"=" ++ _next_tag ->
@@ -2036,16 +1494,17 @@ get_internal_ets_tables(File,WS) ->
 
 %%-----------------------------------------------------------------
 %% Page with list of all timers 
-get_timers(SessionId,File,Heading,TW,Pid) ->
-    ParseFun = fun(Fd,Id) -> get_timerinfo_1(Fd,#timer{pid=Id}) end,
-    chunk_page(SessionId,File,TW,{?timer,Pid},timers,Heading,ParseFun).
+get_timers(File,Pid) ->
+    ParseFun = fun(Fd,Id) -> get_timerinfo_1(Fd,#timer{pid=list_to_pid(Id)}) end,
+    lookup_and_parse_index(File,{?timer,Pid},ParseFun,"timers").
 
 get_timerinfo_1(Fd,Timer) ->
     case line_head(Fd) of
 	"Message" ->
 	    get_timerinfo_1(Fd,Timer#timer{msg=val(Fd)});
 	"Time left" ->
-	    get_timerinfo_1(Fd,Timer#timer{time=val(Fd)});
+	    TimeLeft = list_to_integer(val(Fd) -- " ms"),
+	    get_timerinfo_1(Fd,Timer#timer{time=TimeLeft});
 	"=" ++ _next_tag ->
 	    Timer;
 	Other ->
@@ -2054,6 +1513,28 @@ get_timerinfo_1(Fd,Timer) ->
     end.
 
 %%-----------------------------------------------------------------
+%% Page with information about a node in the distribution
+get_node(File,Channel) ->
+    Ms = ets:fun2ms(
+	   fun({{Tag,Start},Ch}) when Tag=:=?visible_node, Ch=:=Channel ->
+		   {visible,Start};
+	      ({{Tag,Start},Ch}) when Tag=:=?hidden_node, Ch=:=Channel ->
+		   {hidden,Start};
+	      ({{Tag,Start},Ch}) when Tag=:=?not_connected, Ch=:=Channel ->
+		   {not_connected,Start}
+	   end),
+
+    case ets:select(cdv_dump_index_table,Ms) of
+	[] ->
+	    {error,not_found};
+	[{Type,Pos}] ->
+	    Fd = open(File),
+	    NodeInfo = get_nodeinfo(Fd,Channel,Type,Pos),
+	    close(Fd),
+	    {ok,NodeInfo}
+    end.
+
+%%-----------------------------------------------------------------
 %% Page with information about the erlang distribution
 nods(File) ->
     case lookup_index(?no_distribution) of
@@ -2064,28 +1545,29 @@ nods(File) ->
 	    Fd = open(File),
 	    Visible = lists:map(
 			fun({Channel,Start}) -> 
-				get_nodeinfo(Fd,Channel,Start)
+				get_nodeinfo(Fd,Channel,visible,Start)
 			end, 
 			V),
 	    Hidden = lists:map(
 		       fun({Channel,Start}) -> 
-			       get_nodeinfo(Fd,Channel,Start)
+			       get_nodeinfo(Fd,Channel,hidden,Start)
 		       end, 
 		       H),
 	    NotConnected = lists:map(
 			     fun({Channel,Start}) -> 
-				     get_nodeinfo(Fd,Channel,Start)
+				     get_nodeinfo(Fd,Channel,not_connected,Start)
 			     end, 
 			     N),
 	    close(Fd),
-	    {Visible,Hidden,NotConnected};
+	    Visible++Hidden++NotConnected;
 	[_] ->
-	    no_distribution
+	    %% no_distribution
+	    []
     end.
 
-get_nodeinfo(Fd,Channel,Start) ->
+get_nodeinfo(Fd,Channel,Type,Start) ->
     pos_bof(Fd,Start),
-    get_nodeinfo(Fd,#nod{channel=Channel}).
+    get_nodeinfo(Fd,#nod{channel=list_to_integer(Channel),conn_type=Type}).
 
 get_nodeinfo(Fd,Nod) ->
     case line_head(Fd) of
@@ -2094,21 +1576,27 @@ get_nodeinfo(Fd,Nod) ->
 	"Controller" ->
 	    get_nodeinfo(Fd,Nod#nod{controller=val(Fd)});
 	"Creation" ->
-	    get_nodeinfo(Fd,Nod#nod{creation=val(Fd)});
+	    get_nodeinfo(Fd,Nod#nod{creation=list_to_integer(val(Fd))});
 	"Remote link" ->
 	    Procs = val(Fd), % e.g. "<0.31.0> <4322.54.0>"
-	    RemoteLinks = Nod#nod.remote_links,
-	    get_nodeinfo(Fd,Nod#nod{remote_links=[split(Procs)|RemoteLinks]});
+	    {Local,Remote} = split(Procs),
+	    Str = Local++" <-> "++Remote,
+	    NewRemLinks = [{Local,Str} | Nod#nod.remote_links],
+	    get_nodeinfo(Fd,Nod#nod{remote_links=NewRemLinks});
 	"Remote monitoring" ->
 	    Procs = val(Fd), % e.g. "<0.31.0> <4322.54.0>"
-	    RemoteMon = Nod#nod.remote_mon,
-	    get_nodeinfo(Fd,Nod#nod{remote_mon=[split(Procs)|RemoteMon]});
+	    {Local,Remote} = split(Procs),
+	    Str = Local++" -> "++Remote,
+	    NewRemMon = [{Local,Str} | Nod#nod.remote_mon],
+	    get_nodeinfo(Fd,Nod#nod{remote_mon=NewRemMon});
 	"Remotely monitored by" ->
 	    Procs = val(Fd), % e.g. "<0.31.0> <4322.54.0>"
-	    RemoteMonBy = Nod#nod.remote_mon_by,
-	    get_nodeinfo(Fd,Nod#nod{remote_mon_by=[split(Procs)|RemoteMonBy]});
+	    {Local,Remote} = split(Procs),
+	    Str = Local++" <- "++Remote,
+	    NewRemMonBy = [{Local,Str} | Nod#nod.remote_mon_by],
+	    get_nodeinfo(Fd,Nod#nod{remote_mon_by=NewRemMonBy});
 	"Error" ->
-	    get_nodeinfo(Fd,Nod#nod{error=val(Fd)});	    
+	    get_nodeinfo(Fd,Nod#nod{error="ERROR: "++val(Fd)});
 	"=" ++ _next_tag ->
 	    Nod;
 	Other ->
@@ -2129,10 +1617,11 @@ get_loaded_mod_details(File,Mod) ->
 
 %%-----------------------------------------------------------------
 %% Page with list of all loaded modules
-loaded_mods(SessionId,File,TW) ->
+loaded_mods(File) ->
     ParseFun = 
 	fun(Fd,Id) -> 
-		get_loaded_mod_info(Fd,#loaded_mod{mod=Id},
+		get_loaded_mod_info(Fd,
+				    #loaded_mod{mod=get_atom(list_to_binary(Id))},
 				    fun main_modinfo/3) 
 	end,
     {CC,OC} = 
@@ -2146,7 +1635,7 @@ loaded_mods(SessionId,File,TW) ->
 	    [] ->
 		{"unknown","unknown"}
     end,
-    chunk_page(SessionId,File,TW,?mod,loaded_mods,{CC,OC},ParseFun).
+    {CC,OC,lookup_and_parse_index(File,?mod,ParseFun,"modules")}.
 
 get_loaded_mod_totals(Fd,{CC,OC}) ->
     case line_head(Fd) of
@@ -2164,9 +1653,11 @@ get_loaded_mod_totals(Fd,{CC,OC}) ->
 get_loaded_mod_info(Fd,LM,Fun) ->
     case line_head(Fd) of
 	"Current size" ->
-	    get_loaded_mod_info(Fd,LM#loaded_mod{current_size=val(Fd)},Fun);
+	    CS = list_to_integer(val(Fd)),
+	    get_loaded_mod_info(Fd,LM#loaded_mod{current_size=CS},Fun);
 	"Old size" ->
-	    get_loaded_mod_info(Fd,LM#loaded_mod{old_size=val(Fd)},Fun);
+	    OS = list_to_integer(val(Fd)),
+	    get_loaded_mod_info(Fd,LM#loaded_mod{old_size=OS},Fun);
 	"=" ++ _next_tag ->
 	    LM;
 	{eof,_} ->
@@ -2229,24 +1720,24 @@ hex_to_dec(N) -> list_to_integer(N).
 
 %%-----------------------------------------------------------------
 %% Page with list of all funs
-funs(SessionId,File,TW) ->
+funs(File) ->
     ParseFun = fun(Fd,_Id) -> get_funinfo(Fd,#fu{}) end,
-    chunk_page(SessionId,File,TW,?fu,funs,[],ParseFun).
+    lookup_and_parse_index(File,?fu,ParseFun,"funs").
 
 get_funinfo(Fd,Fu) ->
     case line_head(Fd) of
 	"Module" ->
 	    get_funinfo(Fd,Fu#fu{module=val(Fd)});
 	"Uniq" ->
-	    get_funinfo(Fd,Fu#fu{uniq=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{uniq=list_to_integer(val(Fd))});
 	"Index" ->
-	    get_funinfo(Fd,Fu#fu{index=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{index=list_to_integer(val(Fd))});
 	"Address" ->
 	    get_funinfo(Fd,Fu#fu{address=val(Fd)});
 	"Native_address" ->
 	    get_funinfo(Fd,Fu#fu{native_address=val(Fd)});
 	"Refc" ->
-	    get_funinfo(Fd,Fu#fu{refc=val(Fd)});
+	    get_funinfo(Fd,Fu#fu{refc=list_to_integer(val(Fd))});
 	"=" ++ _next_tag ->
 	    Fu;
 	Other ->
@@ -2256,45 +1747,54 @@ get_funinfo(Fd,Fu) ->
 
 %%-----------------------------------------------------------------
 %% Page with list of all atoms
-atoms(SessionId,File,TW,Num) ->
+atoms(File,NumAtoms) ->
     case lookup_index(?atoms) of
 	[{_Id,Start}] ->
 	    Fd = open(File),
 	    pos_bof(Fd,Start),
-	    case get_atoms(Fd,?items_chunk_size) of
-		{Atoms,Cont} ->
-		    crashdump_viewer_html:atoms(SessionId,TW,Num,Atoms),
-		    atoms_chunks(Fd,SessionId,Cont);
-		done ->
-		    crashdump_viewer_html:atoms(SessionId,TW,Num,done)
-	    end;
+	    get_atoms(Fd,NumAtoms);
 	_ ->
-	    crashdump_viewer_html:atoms(SessionId,TW,Num,done)
+	    []
     end.
 
-get_atoms(Fd,Number) ->
-    case get_n_lines_of_tag(Fd,Number) of
-	{all,_,Lines} ->
-	    close(Fd),
-	    {Lines,done};
-	{part,_,Lines} ->
-	    {Lines,Number};
-	empty ->
-	    close(Fd),
-	    done
+get_atoms(Fd,NumAtoms) ->
+    case get_chunk(Fd) of
+	{ok,Bin} ->
+	    init_progress("Processing atoms",NumAtoms),
+	    get_atoms(Fd,Bin,NumAtoms,[]);
+	eof ->
+	    []
     end.
 
-atoms_chunks(_Fd,SessionId,done) ->
-    crashdump_viewer_html:atoms_chunk(SessionId,done);
-atoms_chunks(Fd,SessionId,Number) ->
-    case get_atoms(Fd,Number) of
-	{Atoms,Cont} ->
-	    crashdump_viewer_html:atoms_chunk(SessionId,Atoms),
-	    atoms_chunks(Fd,SessionId,Cont);
-	done ->
-	    atoms_chunks(Fd,SessionId,done)
-    end.
 
+%% Atoms are written one per line in the crash dump, in creation order
+%% from last to first.
+get_atoms(Fd,Bin,NumAtoms,Atoms) ->
+    Bins = binary:split(Bin,<<"\n">>,[global]),
+    get_atoms1(Fd,Bins,NumAtoms,Atoms).
+
+get_atoms1(_Fd,[<<"=",_/binary>>|_],_N,Atoms) ->
+    end_progress(),
+    Atoms;
+get_atoms1(Fd,[LastBin],N,Atoms) ->
+    case get_chunk(Fd) of
+	{ok,Bin0} ->
+	    get_atoms(Fd,<<LastBin/binary,Bin0/binary>>,N,Atoms);
+	eof ->
+	    end_progress(),
+	    [{N,get_atom(LastBin)}|Atoms]
+    end;
+get_atoms1(Fd,[Bin|Bins],N,Atoms) ->
+    update_progress(),
+    get_atoms1(Fd,Bins,N-1,[{N,get_atom(Bin)}|Atoms]).
+
+%% This ensures sorting according to first actual letter in the atom,
+%% disregarding possible single quote. It is formatted back to correct
+%% syntax in cdv_atom_cb:format/1
+get_atom(<<"\'",Atom/binary>>) ->
+    {Atom,q}; % quoted
+get_atom(Atom) when is_binary(Atom) ->
+    {Atom,nq}. % not quoted
 
 %%-----------------------------------------------------------------
 %% Page with memory information
@@ -2317,7 +1817,7 @@ get_meminfo(Fd,Acc) ->
 	{eof,_last_line} ->
 	    lists:reverse(Acc);
 	Key ->
-	    get_meminfo(Fd,[{Key,val(Fd)}|Acc])
+	    get_meminfo(Fd,[{list_to_atom(Key),val(Fd)}|Acc])
     end.
 
 %%-----------------------------------------------------------------
@@ -2345,7 +1845,7 @@ get_allocareainfo(Fd,Acc) ->
 	    AllocInfo =
 		case split(Val) of
 		    {Alloc,[]} ->
-			{Key,Alloc,?space};
+			{Key,Alloc,""};
 		    {Alloc,Used} ->
 			{Key,Alloc,Used}
 		end,
@@ -2361,7 +1861,7 @@ allocator_info(File) ->
 	AllAllocators ->
 	    Fd = open(File),
 	    R = lists:map(fun({Heading,Start}) ->
-				  {Heading,get_allocatorinfo(Fd,Start)} 
+				  {Heading,get_allocatorinfo(Fd,Start)}
 			  end, 
 			  AllAllocators),
 	    close(Fd),
@@ -2370,17 +1870,19 @@ allocator_info(File) ->
 
 get_allocatorinfo(Fd,Start) ->
     pos_bof(Fd,Start),
-    get_allocatorinfo1(Fd,[]).
+    get_allocatorinfo1(Fd,[],0).
 
-get_allocatorinfo1(Fd,Acc) ->
+get_allocatorinfo1(Fd,Acc,Max) ->
     case line_head(Fd) of
 	"=" ++ _next_tag ->
-	    lists:reverse(Acc);
+	    pad_and_reverse(Acc,Max,[]);
 	{eof,_last_line} ->
-	    lists:reverse(Acc);
+	    pad_and_reverse(Acc,Max,[]);
 	Key ->
 	    Values = get_all_vals(val(Fd),[]),
-	    get_allocatorinfo1(Fd,[{Key,Values}|Acc])
+	    L = length(Values),
+	    Max1 = if L > Max -> L; true -> Max end,
+	    get_allocatorinfo1(Fd,[{Key,Values}|Acc],Max1)
     end.
 	    
 get_all_vals([$ |Rest],Acc) ->
@@ -2390,6 +1892,16 @@ get_all_vals([],Acc) ->
 get_all_vals([Char|Rest],Acc) ->
     get_all_vals(Rest,[Char|Acc]).
 
+%% Make sure all V have the same length by padding with "".
+pad_and_reverse([{K,V}|T],Len,Rev) ->
+    VLen = length(V),
+    V1 = if VLen == Len -> V;
+	    true -> V ++ lists:duplicate(Len-VLen,"")
+	 end,
+    pad_and_reverse(T,Len,[{K,V1}|Rev]);
+pad_and_reverse([],_,Rev) ->
+    Rev.
+
 %% Calculate allocator summary:
 %%
 %% System totals:
@@ -2473,7 +1985,8 @@ allocator_summary(Allocators) ->
 	    {TBS,TCS} ->
 		{integer_to_list(TBS),integer_to_list(TCS)}
 	end,
-    {{"Summary",["blocks size","carriers size","mseg carriers size"]},
+    {"Allocator Summary",
+     ["blocks size","carriers size","mseg carriers size"],
      [{"total",[TotalBS,TotalCS,TotalMCS]} |
       format_allocator_summary(lists:reverse(TypeTotals))]}.
 
@@ -2673,142 +2186,120 @@ get_indextableinfo1(Fd,IndexTable) ->
 	    IndexTable
     end.
 
-    
-
-
-
-%%-----------------------------------------------------------------
-%% Expand a set of data which was shown in a truncated form on
-get_expanded(File,Pos,Size) ->
-    Fd = open(File),
-    R = case file:pread(Fd,Pos,Size) of
-	    {ok,Bin}->
-		binary_to_list(Bin);
-	    eof ->
-		?space
-	end,
-    close(Fd),
-    R.
-
-
-replace_all(From,To,[From|Rest],Acc) ->
-    replace_all(From,To,Rest,[To|Acc]);
-replace_all(From,To,[Char|Rest],Acc) ->
-    replace_all(From,To,Rest,[Char|Acc]);
-replace_all(_From,_To,[],Acc) ->
-    lists:reverse(Acc).
-
-
 %%%-----------------------------------------------------------------
 %%% Parse memory in crashdump version 0.1 and newer
 %%%
-parse_heap_term([$l|Line0], Addr, D0) ->	%Cons cell.
-    {H,"|"++Line1,D1} = parse_term(Line0, D0),
-    {T,Line,D2} = parse_term(Line1, D1),
+parse_heap_term([$l|Line0], Addr, BinAddrAdj, D0) ->	%Cons cell.
+    {H,"|"++Line1,D1} = parse_term(Line0, BinAddrAdj, D0),
+    {T,Line,D2} = parse_term(Line1, BinAddrAdj, D1),
     Term = [H|T],
     D = gb_trees:insert(Addr, Term, D2),
     {Term,Line,D};
-parse_heap_term([$t|Line0], Addr, D) ->		%Tuple
+parse_heap_term([$t|Line0], Addr, BinAddrAdj, D) ->	%Tuple
     {N,":"++Line} = get_hex(Line0),
-    parse_tuple(N, Line, Addr, D, []);
-parse_heap_term([$F|Line0], Addr, D0) ->	%Float
+    parse_tuple(N, Line, Addr, BinAddrAdj, D, []);
+parse_heap_term([$F|Line0], Addr, _BinAddrAdj, D0) ->	%Float
     {N,":"++Line1} = get_hex(Line0),
     {Chars,Line} = get_chars(N, Line1),
     Term = list_to_float(Chars),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("B16#"++Line0, Addr, D0) ->	%Positive big number.
+parse_heap_term("B16#"++Line0, Addr, _BinAddrAdj, D0) -> %Positive big number.
     {Term,Line} = get_hex(Line0),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("B-16#"++Line0, Addr, D0) ->	%Negative big number
+parse_heap_term("B-16#"++Line0, Addr, _BinAddrAdj, D0) -> %Negative big number
     {Term0,Line} = get_hex(Line0),
     Term = -Term0,
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("B"++Line0, Addr, D0) ->	%Decimal big num (new in R10B-something).
+parse_heap_term("B"++Line0, Addr, _BinAddrAdj, D0) ->	%Decimal big num
     case string:to_integer(Line0) of
 	{Int,Line} when is_integer(Int) ->
 	    D = gb_trees:insert(Addr, Int, D0),
 	    {Int,Line,D}
     end;
-parse_heap_term([$P|Line0], Addr, D0) ->	% External Pid.
+parse_heap_term([$P|Line0], Addr, _BinAddrAdj, D0) ->	% External Pid.
     {Pid0,Line} = get_id(Line0),
-    Pid = "#CDVPid"++Pid0,
+    Pid = ['#CDVPid'|Pid0],
     D = gb_trees:insert(Addr, Pid, D0),
     {Pid,Line,D};
-parse_heap_term([$p|Line0], Addr, D0) ->        % External Port.
+parse_heap_term([$p|Line0], Addr, _BinAddrAdj, D0) ->   % External Port.
     {Port0,Line} = get_id(Line0),
-    Port = "#CDVPort"++Port0,
+    Port = ['#CDVPort'|Port0],
     D = gb_trees:insert(Addr, Port, D0),
     {Port,Line,D};
-parse_heap_term("E"++Line0, Addr, D0) ->	%Term encoded in external format.
+parse_heap_term("E"++Line0, Addr, _BinAddrAdj, D0) ->	%Term encoded in external format.
     {Bin,Line} = get_binary(Line0),
     Term = binary_to_term(Bin),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("Yh"++Line0, Addr, D0) ->	%Heap binary.
+parse_heap_term("Yh"++Line0, Addr, _BinAddrAdj, D0) ->	%Heap binary.
     {Term,Line} = get_binary(Line0),
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("Yc"++Line0, Addr, D0) ->	%Reference-counted binary.
-    {Binp,":"++Line1} = get_hex(Line0),
-    {First,":"++Line2} = get_hex(Line1),
+parse_heap_term("Yc"++Line0, Addr, BinAddrAdj, D0) ->	%Reference-counted binary.
+    {Binp0,":"++Line1} = get_hex(Line0),
+    {Offset,":"++Line2} = get_hex(Line1),
     {Sz,Line} = get_hex(Line2),
+    Binp = Binp0 bor BinAddrAdj,
     Term = case gb_trees:lookup(Binp, D0) of
-	       {value,<<_:First/binary,T:Sz/binary,_/binary>>} -> T;
-	       {value,{'#CDVTooBig',binary,Pos}} -> cdvbin(Sz,Pos);
-	       {value,'#CDVTruncatedBinary'} -> '#CDVTruncatedBinary';
+	       {value,Bin} -> cdvbin(Offset,Sz,Bin);
 	       none -> '#CDVNonexistingBinary'
 	   end,
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D};
-parse_heap_term("Ys"++Line0, Addr, D0) ->	%Sub binary.
-    {Binp,":"++Line1} = get_hex(Line0),
-    {First,":"++Line2} = get_hex(Line1),
+parse_heap_term("Ys"++Line0, Addr, BinAddrAdj, D0) ->	%Sub binary.
+    {Binp0,":"++Line1} = get_hex(Line0),
+    {Offset,":"++Line2} = get_hex(Line1),
     {Sz,Line} = get_hex(Line2),
+    Binp = Binp0 bor BinAddrAdj,
     Term = case gb_trees:lookup(Binp, D0) of
-	       {value,<<_:First/binary,T:Sz/binary,_/binary>>} -> T;
-	       {value,{'#CDVTooBig',binary,Pos}} -> cdvbin(Sz,Pos);
-	       {value,'#CDVTruncatedBinary'} -> '#CDVTruncatedBinary';
+	       {value,Bin} -> cdvbin(Offset,Sz,Bin);
+	       none when Binp0=/=Binp ->
+		   %% Might it be on the heap?
+		   case gb_trees:lookup(Binp0, D0) of
+		       {value,Bin} -> cdvbin(Offset,Sz,Bin);
+		       none -> '#CDVNonexistingBinary'
+		   end;
 	       none -> '#CDVNonexistingBinary'
 	   end,
     D = gb_trees:insert(Addr, Term, D0),
     {Term,Line,D}.
 
 
-parse_tuple(0, Line, Addr, D0, Acc) ->
+parse_tuple(0, Line, Addr, _, D0, Acc) ->
     Tuple = list_to_tuple(lists:reverse(Acc)),
     D = gb_trees:insert(Addr, Tuple, D0),
     {Tuple,Line,D};
-parse_tuple(N, Line0, Addr, D0, Acc) ->
-    case parse_term(Line0, D0) of
+parse_tuple(N, Line0, Addr, BinAddrAdj, D0, Acc) ->
+    case parse_term(Line0, BinAddrAdj, D0) of
 	{Term,[$,|Line],D} when N > 1 ->
-	    parse_tuple(N-1, Line, Addr, D, [Term|Acc]);
+	    parse_tuple(N-1, Line, Addr, BinAddrAdj, D, [Term|Acc]);
 	{Term,Line,D}->
-	    parse_tuple(N-1, Line, Addr, D, [Term|Acc])
+	    parse_tuple(N-1, Line, Addr, BinAddrAdj, D, [Term|Acc])
     end.
 
-parse_term([$H|Line0], D) ->			%Pointer to heap term.
+parse_term([$H|Line0], BinAddrAdj, D) ->        %Pointer to heap term.
     {Ptr,Line} = get_hex(Line0),
-    deref_ptr(Ptr, Line, D);
-parse_term([$N|Line], D) ->			%[] (nil).
+    deref_ptr(Ptr, Line, BinAddrAdj, D);
+parse_term([$N|Line], _, D) ->			%[] (nil).
     {[],Line,D};
-parse_term([$I|Line0], D) ->			%Small.
+parse_term([$I|Line0], _, D) ->			%Small.
     {Int,Line} = string:to_integer(Line0),
     {Int,Line,D};
-parse_term([$A|_]=Line, D) ->			%Atom.
+parse_term([$A|_]=Line, _, D) ->		%Atom.
     parse_atom(Line, D);
-parse_term([$P|Line0], D) ->			%Pid.
+parse_term([$P|Line0], _, D) ->			%Pid.
     {Pid,Line} = get_id(Line0),
-    {"#CDVPid"++Pid,Line,D};
-parse_term([$p|Line0], D) ->			%Port.
+    {['#CDVPid'|Pid],Line,D};
+parse_term([$p|Line0], _, D) ->			%Port.
     {Port,Line} = get_id(Line0),
-    {"#CDVPort"++Port,Line,D};
-parse_term([$S|Str0], D) ->			%Information string.
+    {['#CDVPort'|Port],Line,D};
+parse_term([$S|Str0], _, D) ->			%Information string.
     Str = lists:reverse(skip_blanks(lists:reverse(Str0))),
     {Str,[],D};
-parse_term([$D|Line0], D) ->                    %DistExternal
+parse_term([$D|Line0], _, D) ->                 %DistExternal
     try
 	{AttabSize,":"++Line1} = get_hex(Line0),
 	{Attab, "E"++Line2} = parse_atom_translation_table(AttabSize, Line1, []),
@@ -2848,7 +2339,7 @@ parse_atom_translation_table(N, Line0, As) ->
     
     
 
-deref_ptr(Ptr, Line, D0) ->
+deref_ptr(Ptr, Line, BinAddrAdj, D0) ->
     case gb_trees:lookup(Ptr, D0) of
 	{value,Term} ->
 	    {Term,Line,D0};
@@ -2860,10 +2351,10 @@ deref_ptr(Ptr, Line, D0) ->
 		    case val(Fd) of
 			"="++_ ->
 			    put(fd, end_of_heap),
-			    deref_ptr(Ptr, Line, D0);
+			    deref_ptr(Ptr, Line, BinAddrAdj, D0);
 			L ->
-			    D = parse(L, D0),
-			    deref_ptr(Ptr, Line, D)
+			    D = parse(L, BinAddrAdj, D0),
+			    deref_ptr(Ptr, Line, BinAddrAdj, D)
 		    end
 	    end
     end.
@@ -2901,13 +2392,16 @@ get_chars(0, Line, Acc) ->
 get_chars(N, [H|T], Acc) ->
     get_chars(N-1, T, [H|Acc]).
 
-get_id(Line) ->
-    get_id(Line, []).
+get_id(Line0) ->
+    [$<|Line] = lists:dropwhile(fun($<) -> false; (_) -> true end,Line0),
+    get_id(Line, [], []).
 
-get_id([$>|Line], Acc) ->
-    {lists:reverse(Acc, [$>]),Line};
-get_id([H|T], Acc) ->
-    get_id(T, [H|Acc]).
+get_id([$>|Line], Acc, Id) ->
+    {lists:reverse(Id,[list_to_integer(lists:reverse(Acc))]),Line};
+get_id([$.|Line], Acc, Id) ->
+    get_id(Line,[],[list_to_integer(lists:reverse(Acc))|Id]);
+get_id([H|T], Acc, Id) ->
+    get_id(T, [H|Acc], Id).
 
 get_label(L) ->
     get_label(L, []).
@@ -2925,19 +2419,26 @@ get_label([H|T], Acc) ->
 
 get_binary(Line0) ->
     {N,":"++Line} = get_hex(Line0),
-    get_binary(N, Line, []).
+    do_get_binary(N, Line, []).
+
+get_binary(Offset,Size,Line0) ->
+    {_N,":"++Line} = get_hex(Line0),
+    do_get_binary(Size, lists:sublist(Line,(Offset*2)+1,Size*2), []).
 
-get_binary(0, Line, Acc) ->
+do_get_binary(0, Line, Acc) ->
     {list_to_binary(lists:reverse(Acc)),Line};
-get_binary(N, [A,B|Line], Acc) ->
+do_get_binary(N, [A,B|Line], Acc) ->
     Byte = (get_hex_digit(A) bsl 4) bor get_hex_digit(B),
-    get_binary(N-1, Line, [Byte|Acc]);
-get_binary(_N, [], _Acc) ->
+    do_get_binary(N-1, Line, [Byte|Acc]);
+do_get_binary(_N, [], _Acc) ->
     {'#CDVTruncatedBinary',[]}.
 
-cdvbin(Sz,Pos) ->
-    "#CDVBin<"++integer_to_list(Sz)++","++integer_to_list(Pos)++">".
-
+cdvbin(Offset,Size,{'#CDVBin',Pos}) ->
+    ['#CDVBin',Offset,Size,Pos];
+cdvbin(Offset,Size,['#CDVBin',_,_,Pos]) ->
+    ['#CDVBin',Offset,Size,Pos];
+cdvbin(_,_,'#CDVTruncatedBinary') ->
+    '#CDVTruncatedBinary'.
 
 %%-----------------------------------------------------------------
 %% Functions for accessing the cdv_dump_index_table
@@ -2947,29 +2448,15 @@ reset_index_table() ->
 insert_index(Tag,Id,Pos) ->
     ets:insert(cdv_dump_index_table,{{Tag,Pos},Id}).
 
+lookup_index({Tag,Id}) ->
+    lookup_index(Tag,Id);
 lookup_index(Tag) ->
     lookup_index(Tag,'$2').
 lookup_index(Tag,Id) ->
     ets:select(cdv_dump_index_table,[{{{Tag,'$1'},Id},[],[{{Id,'$1'}}]}]).
 
-lookup_index_chunk({'#CDVFirstChunk',Tag,Id}) ->
-    ets:select(cdv_dump_index_table,
-	       [{{{Tag,'$1'},Id},[],[{{Id,'$1'}}]}],
-	       ?items_chunk_size);
-lookup_index_chunk(Cont) ->
-    ets:select(Cont).
-
-%% Create a tag which can be used instead of an ets Continuation for
-%% the first call to lookup_index_chunk.
-first_chunk_pointer({Tag,Id}) ->
-    {'#CDVFirstChunk',Tag,Id};
-first_chunk_pointer(Tag) ->
-    first_chunk_pointer({Tag,'$2'}).
-
 count_index(Tag) ->
     ets:select_count(cdv_dump_index_table,[{{{Tag,'_'},'_'},[],[true]}]).
-count_index(Tag,Id) ->
-    ets:select_count(cdv_dump_index_table,[{{{Tag,'_'},Id},[],[true]}]).
 
 
 %%-----------------------------------------------------------------
@@ -2979,7 +2466,6 @@ tag_to_atom("allocated_areas") -> ?allocated_areas;
 tag_to_atom("allocator") -> ?allocator;
 tag_to_atom("atoms") -> ?atoms;
 tag_to_atom("binary") -> ?binary;
-tag_to_atom("debug_proc_dictionary") -> ?debug_proc_dictionary;
 tag_to_atom("end") -> ?ende;
 tag_to_atom("erl_crash_dump") -> ?erl_crash_dump;
 tag_to_atom("ets") -> ?ets;
@@ -2995,7 +2481,6 @@ tag_to_atom("mod") -> ?mod;
 tag_to_atom("no_distribution") -> ?no_distribution;
 tag_to_atom("node") -> ?node;
 tag_to_atom("not_connected") -> ?not_connected;
-tag_to_atom("num_atoms") -> ?num_atoms;
 tag_to_atom("old_instr_data") -> ?old_instr_data;
 tag_to_atom("port") -> ?port;
 tag_to_atom("proc") -> ?proc;
@@ -3010,37 +2495,133 @@ tag_to_atom(UnknownTag) ->
     list_to_atom(UnknownTag).
 
 %%%-----------------------------------------------------------------
-%%% Create a page by sending chunk by chunk to crashdump_viewer_html
-chunk_page(SessionId,File,TW,What,HtmlCB,HtmlExtra,ParseFun) ->
+%%% Fetch next chunk from crashdump file
+lookup_and_parse_index(File,What,ParseFun,Str) when is_list(File) ->
+    Indices = lookup_index(What),
+    Fun  = fun(Fd,{Id,Start}) ->
+		   pos_bof(Fd,Start),
+		   ParseFun(Fd,Id)
+	   end,
+    Report = "Processing " ++ Str,
+    progress_pmap(Report,File,Fun,Indices).
+
+%%%-----------------------------------------------------------------
+%%% Convert a record to a proplist
+to_proplist(Fields,Record) ->
+    Values = to_value_list(Record),
+    lists:zip(Fields,Values).
+
+%%%-----------------------------------------------------------------
+%%% Convert a record to a simple list of field values
+to_value_list(Record) ->
+    [_RecordName|Values] = tuple_to_list(Record),
+    Values.
+
+%%%-----------------------------------------------------------------
+%%% Fold over List and report progress in percent.
+%%% Report is the text to be presented in the progress dialog.
+%%% Acc0 is the initial accumulator and will be passed to Fun as the
+%%% second arguement, i.e. Fun = fun(Item,Acc) -> NewAcc end.
+progress_foldl(Report,Fun,Acc0,List) ->
+    init_progress(Report, length(List)),
+    progress_foldl1(Fun,Acc0,List).
+
+progress_foldl1(Fun,Acc,[H|T]) ->
+    update_progress(),
+    progress_foldl1(Fun,Fun(H,Acc),T);
+progress_foldl1(_Fun,Acc,[]) ->
+    end_progress(),
+    Acc.
+
+
+%%%-----------------------------------------------------------------
+%%% Map over List and report progress in percent.
+%%% Report is the text to be presented in the progress dialog.
+%%% Distribute the load over a number of processes, and File is opened
+%%% on each process and passed to the Fun as first argument.
+%%% I.e. Fun = fun(Fd,Item) -> ItemResult end.
+progress_pmap(Report,File,Fun,List) ->
+    NTot = length(List),
+    NProcs = erlang:system_info(schedulers) * 2,
+    NPerProc = (NTot div NProcs) + 1,
+
+    %% Worker processes send message to collector for each ReportInterval.
+    ReportInterval = (NTot div 100) + 1,
+
+    %% Progress reporter on collector process reports 1 percent for
+    %% each message from worker process.
+    init_progress(Report,99),
+
+    Collector = self(),
+    {[],Pids} =
+	lists:foldl(
+	  fun(_,{L,Ps}) ->
+		  {L1,L2} = if length(L)>=NPerProc -> lists:split(NPerProc,L);
+			       true -> {L,[]} % last chunk
+			    end,
+		  P = spawn(
+			fun() ->
+				progress_map(Collector,ReportInterval,File,Fun,L1)
+			end),
+		  erlang:monitor(process,P),
+		  {L2,[P|Ps]}
+	  end,
+	  {List,[]},
+	  lists:seq(1,NProcs)),
+    collect(Pids,[]).
+
+progress_map(Collector,ReportInterval,File,Fun,List) ->
     Fd = open(File),
-    case lookup_and_parse_index_chunk(first_chunk_pointer(What),Fd,ParseFun) of
-	done ->
-	    crashdump_viewer_html:chunk_page(HtmlCB,SessionId,TW,HtmlExtra,done);
-	{Chunk,Cont} ->
-	    HtmlInfo = crashdump_viewer_html:chunk_page(
-			     HtmlCB,
-			     SessionId,TW,HtmlExtra,Chunk),
-	    chunk_page_1(Fd,HtmlInfo,SessionId,ParseFun,
-			 lookup_and_parse_index_chunk(Cont,Fd,ParseFun))
-    end.
-
-chunk_page_1(_Fd,HtmlInfo,SessionId,_ParseFun,done) ->
-    crashdump_viewer_html:chunk(SessionId,done,HtmlInfo);
-chunk_page_1(Fd,HtmlInfo,SessionId,ParseFun,{Chunk,Cont}) ->
-    crashdump_viewer_html:chunk(SessionId,Chunk,HtmlInfo),
-    chunk_page_1(Fd,HtmlInfo,SessionId,ParseFun,
-		 lookup_and_parse_index_chunk(Cont,Fd,ParseFun)).
-
-lookup_and_parse_index_chunk(Pointer,Fd,ParseFun) ->
-    case lookup_index_chunk(Pointer) of
-	'$end_of_table' ->
-	    close(Fd),
-	    done;
-	{Chunk,Cont} ->
-	    R = lists:map(fun({Id,Start}) ->
-				  pos_bof(Fd,Start),
-				  ParseFun(Fd,Id)
-			  end,
-			  Chunk),
-	    {R,Cont}
+    init_progress(ReportInterval, fun(_) -> Collector ! progress end, ok),
+    progress_map(Fd,Fun,List,[]).
+progress_map(Fd,Fun,[H|T],Acc) ->
+    update_progress(),
+    progress_map(Fd,Fun,T,[Fun(Fd,H)|Acc]);
+progress_map(Fd,_Fun,[],Acc) ->
+    close(Fd),
+    exit({pmap_done,Acc}).
+
+collect([],Acc) ->
+    end_progress(),
+    lists:append(Acc);
+collect(Pids,Acc) ->
+    receive
+	progress ->
+	    update_progress(),
+	    collect(Pids,Acc);
+	{'DOWN', _Ref, process, Pid, {pmap_done,Result}} ->
+	    collect(lists:delete(Pid,Pids),[Result|Acc])
     end.
+
+%%%-----------------------------------------------------------------
+%%% Help functions for progress reporting
+
+%% Set text in progress dialog and initialize the progress counter
+init_progress(Report,N) ->
+    observer_lib:report_progress({ok,Report}),
+    Interval = (N div 100) + 1,
+    Fun = fun(P0) -> P=P0+1,observer_lib:report_progress({ok,P}),P end,
+    init_progress(Interval,Fun,0).
+init_progress(Interval,Fun,Acc) ->
+    put(progress,{Interval,Interval,Fun,Acc}),
+    ok.
+
+%% Count progress and report on given interval
+update_progress() ->
+    update_progress(1).
+update_progress(Processed) ->
+    do_update_progress(get(progress),Processed).
+
+do_update_progress({Count,Interval,Fun,Acc},Processed) when Processed>Count ->
+    do_update_progress({Interval,Interval,Fun,Fun(Acc)},Processed-Count);
+do_update_progress({Count,Interval,Fun,Acc},Processed) ->
+    put(progress,{Count-Processed,Interval,Fun,Acc}),
+    ok.
+
+%% End progress reporting for this item
+end_progress() ->
+    end_progress({ok,100}).
+end_progress(Report) ->
+    observer_lib:report_progress(Report),
+    erase(progress),
+    ok.
diff --git a/lib/observer/src/crashdump_viewer.hrl b/lib/observer/src/crashdump_viewer.hrl
index 2e0ea5cf96..ae288ed573 100644
--- a/lib/observer/src/crashdump_viewer.hrl
+++ b/lib/observer/src/crashdump_viewer.hrl
@@ -16,7 +16,7 @@
 %% 
 %% %CopyrightEnd%
 %%
--define(space, "&nbsp;").
+-define(space, undefined).
 -define(unknown, "unknown").
 -define(r16b01_dump_vsn, [0,2]). % =erl_crash_dump:0.2
 
@@ -24,28 +24,28 @@
 
 -record(general_info,
 	{created,
-	 slogan=?space,
-	 system_vsn=?space,
-	 compile_time=?space,
-	 taints=?space,
-	 node_name=?space,
-	 num_atoms=?space,
-	 num_procs=?space,
-	 num_ets=?space,
-	 num_timers=?space,
-	 num_fun=?space,
-	 mem_tot=?space,
-	 mem_max=?space,
-	 instr_info=?space}).
+	 slogan,
+	 system_vsn,
+	 compile_time,
+	 taints,
+	 node_name,
+	 num_atoms,
+	 num_procs,
+	 num_ets,
+	 num_timers,
+	 num_fun,
+	 mem_tot,
+	 mem_max,
+	 instr_info}).
 
 -record(proc,
 	%% Initial data according to the follwoing:
 	%% 
-	%% msg_q_len, reds and stack_heap are integers because it must 
+	%% msg_q_len, reds, memory and stack_heap are integers because it must
 	%% be possible to sort on them. All other fields are strings
 	%%
-	%% for old dumps start_time, parent and number of heap frament
-	%% does not exist
+	%% for old dumps start_time, parent and number of heap framents
+	%% do not exist
 	%%
 	%% current_func can be both "current function" and
 	%% "last scheduled in for"
@@ -54,100 +54,102 @@
 	%% displayed as a link to "Expand" (if dump is from OTP R9B 
 	%% or newer)
 	{pid,
-	 name=?space,
-	 init_func=?space,
+	 name,
+	 init_func,
 	 parent=?unknown,
 	 start_time=?unknown,
-	 state=?space,
-	 current_func={"Current Function",?space},
+	 state,
+	 current_func,
 	 msg_q_len=0,
-	 msg_q=?space,
-	 last_calls=?space,
-	 links=?space,
-	 prog_count=?space,
-	 cp=?space,
-	 arity=?space,
-	 dict=?space,
-	 debug_dict=?space,
+	 msg_q,
+	 last_calls,
+	 links,
+	 monitors,
+	 mon_by,
+	 prog_count,
+	 cp,
+	 arity,
+	 dict,
 	 reds=0,
 	 num_heap_frag=?unknown,
-	 heap_frag_data=?space,
+	 heap_frag_data,
 	 stack_heap=0,
-	 old_heap=?space,
-	 heap_unused=?space,
-	 old_heap_unused=?space,
-	 new_heap_start=?space,
-	 new_heap_top=?space,
-	 stack_top=?space,
-	 stack_end=?space,
-	 old_heap_start=?space,
-	 old_heap_top=?space,
-	 old_heap_end=?space,
+	 old_heap,
+	 heap_unused,
+	 old_heap_unused,
+	 new_heap_start,
+	 new_heap_top,
+	 stack_top,
+	 stack_end,
+	 old_heap_start,
+	 old_heap_top,
+	 old_heap_end,
 	 memory,
-	 stack_dump=?space}).
+	 stack_dump}).
 
 -record(port,
 	{id,
-	 slot=?space,
-	 connected=?space,
-	 links=?space,
-	 name=?space,
-	 monitors=?space,
-	 controls=?space}).
+	 slot,
+	 connected,
+	 links,
+	 name,
+	 monitors,
+	 controls}).
 
 -record(ets_table,
 	{pid,
-	 slot=?space,
-	 id=?space,
-	 name=?space,
+	 slot,
+	 id,
+	 name,
 	 type="hash",
-	 buckets=?space,
-	 size=?space,
-	 memory=?space}).
+	 buckets,
+	 size,
+	 memory}).
 
 -record(timer,
 	{pid,
-	 msg=?space,
-	 time=?space}).
+	 msg,
+	 time}).
 
 -record(fu,
-	{module=?space,
-	 uniq=?space,
-	 index=?space,
-	 address=?space,
-	 native_address=?space,
-	 refc=?space}).
+	{module,
+	 uniq,
+	 index,
+	 address,
+	 native_address,
+	 refc}).
 
 -record(nod,
-	{name=?space,
+	{name,
 	 channel,
-	 controller=?space,
-	 creation=?space,
-	 remote_links=?space,
-	 remote_mon=?space,
-	 remote_mon_by=?space,
-	 error=?space}).
+	 conn_type,
+	 controller,
+	 creation,
+	 remote_links=[],
+	 remote_mon=[],
+	 remote_mon_by=[],
+	 error}).
 
 -record(loaded_mod,
 	{mod,
-	 current_size=?space,
-	 current_attrib=?space,
-	 current_comp_info=?space,
-	 old_size=?space,
-	 old_attrib=?space,
-	 old_comp_info=?space}).
+	 current_size,
+	 current_attrib,
+	 current_comp_info,
+	 old_size,
+	 old_attrib,
+	 old_comp_info}).
 
 -record(hash_table,
 	{name,
-	 size=?space,
-	 used=?space,
-	 objs=?space,
-	 depth=?space}).
+	 size,
+	 used,
+	 objs,
+	 depth}).
 
 -record(index_table,
 	{name,
-	 size=?space,
-	 used=?space,
-	 limit=?space,
-	 rate=?space,
-	 entries=?space}).
+	 size,
+	 limit,
+	 used,
+	 rate,
+	 entries}).
diff --git a/lib/observer/src/crashdump_viewer_html.erl b/lib/observer/src/crashdump_viewer_html.erl
deleted file mode 100644
index 93c1a842b5..0000000000
--- a/lib/observer/src/crashdump_viewer_html.erl
+++ /dev/null
@@ -1,1440 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
-%% 
-%% The 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(crashdump_viewer_html).
-
-%% 
-%% This module implements the HTML generation for the crashdump
-%% viewer. No logic or states are kept by this module.
-%%
-
--export([welcome/0,
-	 read_file_frame/0,
-	 redirect/1,
-	 start_page/0,
-	 filename_frame/1,
-	 menu_frame/0,
-	 general_info/1,
-	 pretty_info_page/2,
-	 info_page/2,
-	 proc_details/4,
-	 expanded_memory/2,
-	 expanded_binary/1,
-	 port/3,
-	 internal_ets_tables/2,
-	 nods/2,
-	 loaded_mod_details/2,
-	 atoms/4,
-	 atoms_chunk/2,
-	 memory/2,
-	 allocated_areas/2,
-	 allocator_info/2,
-	 hash_tables/2,
-	 index_tables/2,
-	 error/2,
-	 chunk_page/5,
-	 chunk/3]).
-
--include("crashdump_viewer.hrl").
-
-%%%-----------------------------------------------------------------
-%%% Welcome frame
-welcome() ->
-    header(body(welcome_body())).
-
-welcome_body() ->
-    table(
-      "WIDTH=100% HEIGHT=60%",
-      [tr("VALIGN=middle",
-	  td("ALIGN=center",
-	     font("SIZE=6",
-		  ["Welcome to the Web Based",br(),
-		   "Erlang Crash Dump Analyser"]))),
-       tr("VALIGN=middle",
-	  td("ALIGN=center",
-	     form(["name=load_new ACTION=\"./read_file_frame\""],
-		  input(["TYPE=submit VALUE=\"Load Crashdump\""]))))]).
-
-%%%-----------------------------------------------------------------
-%%% Present a form to enter file name of erlang crash dump
-read_file_frame() ->
-    header("Read File",body(read_file_frame_body())).
-
-
-read_file_frame_body() ->
-    %% Using a plain text input field instead of a file input field
-    %% (e.g. <INPUT TYPE=file NAME=pathj SIZE=40">) because most
-    %% browsers can not forward the full path from this dialog even if
-    %% the browser is running on localhost (Ref 'fakepath'-problem)
-    Entry = input("TYPE=text NAME=path SIZE=60"),
-    Form = 
-	form(
-	  "NAME=read_file_form METHOD=post ACTION=\"./read_file\"",
-	  table(
-	    "BORDER=0",
-	    [tr(td("COLSPAN=2","Enter file to analyse")),
-	     tr(
-	       [td(Entry),
-		td("ALIGN=center",input("TYPE=submit VALUE=Ok"))])])),
-    table(
-      "WIDTH=100% HEIGHT=60%",
-      tr("VALIGN=middle",
-	 td("ALIGN=center",Form))).
-
-
-%%%-----------------------------------------------------------------
-%%% Display "Please wait..." while crashdump is being read
-redirect(Status) ->
-    Head = ["<META HTTP-EQUIV=\"refresh\" CONTENT=\"3; URL=./redirect\">"],
-    header("Please wait...",Head,body([Status,br(),"Please wait..."])).
-
-%%%-----------------------------------------------------------------
-%%% Frameset containing "filename", "menu", and "main" frames
-start_page() ->
-    header("Crashdump Viewer Start Page",start_page_frameset()).
-
-start_page_frameset() ->
-    frameset(
-      "ROWS=\"70,*\"",
-      [frame(["NAME=\"filename\" SRC=\"./filename_frame\""]),
-       frameset(
-	 "COLS=\"200,*\"",
-	 [frame(["NAME=\"menu\" ",
-		 "SRC=\"/cdv_erl/crashdump_viewer/menu_frame\""]),
-	  frame("NAME=\"main\" SRC=\"./initial_info_frame\"")])]).
-
-
-
-%%%-----------------------------------------------------------------
-%%% Topmost frame presents the filename of the crashdump currently
-%%% viewed
-filename_frame(File) ->
-    header("Filename",body(filename_body(File))).
-
-filename_body(File) ->
-    p("ALIGN=center",[b("Crashdump currently viewed:"),br(),File]).
-    
-
-%%%-----------------------------------------------------------------
-%%% Left frame displays the menu
-menu_frame() ->
-    header("Menu", body(menu_body())).
-
-menu_body() ->
-    [p(format_items(1,ets:info(cdv_menu_table,size),true)), 
-     p([br(),
-	form(["name=load_new ACTION=\"./read_file_frame\" ",
-	      "TARGET=app_frame"],
-	     input("TYPE=submit VALUE=\"Load New Crashdump\""))])].
-
-format_items(I,Max,_ParentState) when I>Max->
-    [];
-format_items(I,Max,ParentState) when I=<Max->
-    case ets:lookup(cdv_menu_table,I) of
-	[] -> [];
-	[#menu_item{state=false,children=0}] ->
-	    format_items(I+1,Max,ParentState);
-	[#menu_item{state=false,children=Children}] ->
-	    format_items(I+Children+1,Max,arentState);
-	[Item=#menu_item{state=true,children=0}] when ParentState ->
-	    This = format_item(Item),
-	    [This|format_items(I+1,Max,ParentState)];
-	[Item=#menu_item{state=true,children=Children}] when ParentState ->
-	    This = format_item(Item),
-	    Ch = format_items(I+1,I+Children,true),
-	    [[This | Ch] | format_items(I+Children+1,Max,ParentState)]
-    end.
-
-format_item(Item) ->
-    [lists:duplicate(Item#menu_item.depth*5,?space),
-     format_picture(Item#menu_item.index,
-		    Item#menu_item.picture,
-		    Item#menu_item.children), 
-     format_title(Item#menu_item.text,Item#menu_item.target), 
-     br()].
-
-format_picture(_Index,Picture,0) ->
-    img(Picture);
-format_picture(Index,Picture,_Children) ->
-    href( ["./toggle?index=", integer_to_list(Index)], img(Picture)).
-
-format_title({Link,Text},Target) ->
-    href(["TARGET=\"",Target,"\""],Link,Text);
-format_title(Text,_Type) ->
-    Text.
-
-%%%-----------------------------------------------------------------
-%%% Display the general information
-general_info(GenInfo) ->
-    Heading = "General Information",
-    header(Heading,body(general_info_body(Heading,GenInfo))).
-
-general_info_body(Heading,GenInfo) ->
-    TruncatedInfo = 
-	case get(truncated) of
-	    true ->
-		p(font("SIZE=\"+1\" COLOR=\"#FF0000\"",
-		       b(["WARNING:",br(),
-			  "The crashdump is truncated",br(),
-			  "Some information might be missing",br()])));
-	    false ->
-		""
-	end,
-
-    [heading(Heading,"general_info"),
-     TruncatedInfo,
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Slogan"),
-	    td(GenInfo#general_info.slogan)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Node name"),
-	    td(GenInfo#general_info.node_name)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Crashdump created on"),
-	    td(GenInfo#general_info.created)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","System version"),
-	    td(GenInfo#general_info.system_vsn)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Compiled"),
-	    td(GenInfo#general_info.compile_time)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Taints"),
-	    td(GenInfo#general_info.taints)]),
-	case GenInfo#general_info.mem_tot of
-	    "" -> "";
-	    MemTot ->
-		tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Memory allocated"),
-		    td([MemTot," bytes"])])
-	end,
-	case GenInfo#general_info.mem_max of
-	    "" -> "";
-	    MemMax ->
-		tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Memory maximum"),
-		    td([MemMax," bytes"])])
-	end,
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Atoms"),
-	    td(GenInfo#general_info.num_atoms)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Processes"),
-	    td(GenInfo#general_info.num_procs)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","ETS tables"),
-	    td(GenInfo#general_info.num_ets)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Timers"),
-	    td(GenInfo#general_info.num_timers)]),
-	tr([th("ALIGN=left BGCOLOR=\"#8899AA\"","Funs"),
-	    td(GenInfo#general_info.num_fun)])]),
-     case GenInfo#general_info.instr_info of
-	 old_instr_data ->
-	     [br(),br(),
-	      font("COLOR=\"#FF0000\"",
-		   ["Instrumentation information is found at the end of ",br(),
-		    "the dump. The information has an old format, and ",br(),
-		    "is not presented in this tool. Please read the ",br(),
-		    "crashdump manually to see this information."])];
-	 instr_data ->
-	     [br(),br(),
-	      font("COLOR=\"#FF0000\"",
-		   ["Instrumentation information is found at the end of ",br(),
-		    "the dump. The information is not presented in this ",br(),
-		    "tool. Please read the crashdump manually to see",br(),
-		    "this information."])];	     
-	 false ->
-	     []
-     end].
-
-%%%-----------------------------------------------------------------
-%%% Display an error message
-error(Text,Args) ->
-    Str = io_lib:format(Text,Args),
-    header(body(error_body(Str))).
-
-error_body(Str) ->
-    [h1("An error occured:"),Str,"\n"].
-
-
-%%%-----------------------------------------------------------------
-%%% Display the given information as is
-info_page(Heading,Info) ->
-    info_page(Heading,Info,[]).
-info_page(Heading,Info,TW) ->
-    header(Heading,body(info_body(Heading,Info,TW))).
-    
-info_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No information was found\n"];
-info_body(Heading,Info,TW) ->
-    [h1(Heading),
-     warn(TW),
-     pre(href_proc_port(lists:flatten(Info)))].
-    
-%%%-----------------------------------------------------------------
-%%% Pretty print the given information
-pretty_info_page(Heading,Info) ->
-    header(Heading,body(pretty_info_body(Heading,Info))).
-    
-pretty_info_body(Heading,[]) ->
-    [h1(Heading),
-     "No information was found\n"];
-pretty_info_body(Heading,Info) ->
-    [h1(Heading),
-     pre(pretty_format(Info))].
-    
-%%%-----------------------------------------------------------------
-%%% Print details for one process
-proc_details(Pid,Proc,TW,SharedHeap) ->
-    Script = 
-"<SCRIPT type=\"text/javascript\">
-   function popup() {
-     window.open(\"\",\"expanded\",'resizable=yes,scrollbars=yes')
-}  
-</SCRIPT>\n",
-    
-    Heading = ["Process ", Pid],
-    header(Heading,Script,body(proc_details_body(Heading,Proc,TW,SharedHeap))).
-
-proc_details_body(Heading,Proc,TW,SharedHeap) ->
-    Pid = Proc#proc.pid,
-    Name = if Proc#proc.name==Proc#proc.init_func -> ?space;
-	      true -> Proc#proc.name
-	   end,
-    [help("processes"),
-     warn(TW),
-     table(
-       "BORDER=4 COLS=4 WIDTH=\"100%\"",
-       [tr(
-	  "BGCOLOR=\"#8899AA\"",
-	  [td("COLSPAN=4 ALIGN=center",Heading)]),
-	tr(
-	  [td("NOWRAP=true",b("Name")),
-	   td("COLSPAN=1",Name),
-	   td("NOWRAP=true",b("Spawned as")),
-	   td("COLSPAN=1",Proc#proc.init_func)]),
-	tr(
-	  [td("NOWRAP=true",b("State")),
-	   td("COLSPAN=1",Proc#proc.state),
-	   td("NOWRAP=true",b(element(1,Proc#proc.current_func))),
-	   td("COLSPAN=1",element(2,Proc#proc.current_func))]),
-	tr(
-	  [td("NOWRAP=true",b("Started")),
-	   td("COLSPAN=1",Proc#proc.start_time),
-	   td("NOWRAP=true",b("Spawned by")),
-	   td("COLSPAN=1",href_proc_port(Proc#proc.parent))]),
-	tr(
-	  [td("NOWRAP=true",b("Reductions")),
-	   td("COLSPAN=1",integer_to_list(Proc#proc.reds))] ++
-	      case Proc#proc.memory of
-		  undefined -> []; % before R16B01
-		  Mem ->
-		      [td("NOWRAP=true",b("Memory (bytes)")),
-		       td("COLSPAN=1",integer_to_list(Mem))]
-	      end),
-	if SharedHeap ->
-		Stack = case Proc#proc.stack_heap of
-			    -1 -> "unknown";
-			    S -> integer_to_list(S)
-			end,
-		tr(
-		  [td("NOWRAP=true",b("Stack")),
-		   td("COLSPAN=3",Stack)]);
-	   true ->
-		[tr(
-		   [td("NOWRAP=true",b("Stack+heap")),
-		    td(integer_to_list(Proc#proc.stack_heap)),
-		    td("NOWRAP=true",b("OldHeap")),
-		    td(Proc#proc.old_heap)]),
-		 tr(
-		   [td("NOWRAP=true",b("Heap unused")),
-		    td(Proc#proc.heap_unused),
-		    td("NOWRAP=true",b("OldHeap unused")),
-		    td(Proc#proc.old_heap_unused)]),
-		 tr(
-		   [td("NOWRAP=true",b("Number of heap fragments")),
-		    td(Proc#proc.num_heap_frag),
-		    td("NOWRAP=true",b("Heap fragment data")),
-		    td(Proc#proc.heap_frag_data)])]
-	end,
-	case Proc#proc.new_heap_start of
-	    ?space -> "";
-	    _ ->
-		%% Garbing
-		[tr(
-		   [td("NOWRAP=true",b("New heap start")),
-		    td("COLSPAN=1",Proc#proc.new_heap_start),
-		    td("NOWRAP=true",b("New heap top")),
-		    td("COLSPAN=1",Proc#proc.new_heap_top)]),
-		 tr(
-		   [td("NOWRAP=true",b("Stack top")),
-		    td("COLSPAN=1",Proc#proc.stack_top),
-		    td("NOWRAP=true",b("Stack end")),
-		    td("COLSPAN=1",Proc#proc.stack_end)]),
-		 tr(
-		   [td("NOWRAP=true",b("Old heap start")),
-		    td("COLSPAN=1",Proc#proc.old_heap_start),
-		    td("NOWRAP=true",b("Old heap top")),
-		    td("COLSPAN=1",Proc#proc.old_heap_top)]),
-		 tr(
-		   [td("NOWRAP=true",b("Old heap end")),
-		    td("COLSPAN=3",Proc#proc.old_heap_end)])]
-	end,
-	case Proc#proc.prog_count of
-	    ?space -> "";
-	    _ ->
-		[tr(
-		   [td("NOWRAP=true",b("Program counter")),
-		    td("COLSPAN=3",Proc#proc.prog_count)]),
-		 tr(
-		   [td("NOWRAP=true",b("Continuation pointer")),
-		    td("COLSPAN=3",Proc#proc.cp)]),
-		 tr(
-		   [td("NOWRAP=true",b("Arity")),
-		    td("COLSPAN=3",Proc#proc.arity)])]
-	end,
-	tr(
-	  [td("NOWRAP=true",b("Link list")),
-	   td("COLSPAN=3",href_proc_port(Proc#proc.links))]),
-
-	tr(
-	  [td("NOWRAP=true",b("Msg queue length")),
-	   td("COLSPAN=3",integer_to_list(Proc#proc.msg_q_len))]),
-
-	%% These are displayed only if data exist
-	display_or_link_to_expand("MsgQueue",Proc#proc.msg_q,Pid),
-	display_or_link_to_expand("Dictionary",Proc#proc.dict,Pid),
-	display_or_link_to_expand("DebugDictionary",Proc#proc.debug_dict,Pid),
-	display_or_link_to_expand("LastCalls",Proc#proc.last_calls,Pid),
-	display_or_link_to_expand("StackDump",Proc#proc.stack_dump,Pid)]),
-
-     p([href(["./ets_tables?pid=",Proc#proc.pid],
-	     "ETS tables owned by this process"),
-	"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;",
-	href(["./timers?pid=",Proc#proc.pid],
-	     "Timers owned by this process")])].
-
-display_or_link_to_expand(Heading,Data,Pid) ->
-    case Data of
-	expand ->
-	    link_to_read_memory(Heading,Pid);	    
- 	truncated -> 
- 	    Text = font("COLOR=\"#FF0000\"",
-			"The dump is truncated, no data available"),
- 	    tr(
- 	      [td("NOWRAP=true VALIGN=top",b(Heading)),
- 	       td("COLSPAN=3",Text)]);
-	?space -> 
-	    "";
-	{size,Truncated,Size,Pos} ->
-	    %% Too much data, or truncated data - 
-	    %% display a link to expand it
-	    tr(
-	      [td("NOWRAP=true",b(Heading)),
-	       td("COLSPAN=3",
-		  href("TARGET=\"expanded\" onClick=popup()",
-		       ["./expand?pos=",integer_to_list(Pos),
-			"&size=",integer_to_list(Size),
-			"&what=",Heading,
-			"&truncated=",atom_to_list(Truncated)],
-		       ["Expand (",integer_to_list(Size)," bytes)"]))]);
-	_ ->
-	    %% Not too much Data - display it
-	    tr(
-	      [td("NOWRAP=true VALIGN=top",b(Heading)),
-	       td("COLSPAN=3",pre(format(Heading,Data)))])
-    end.
-
-link_to_read_memory(Heading,Pid) ->
-    tr(
-      [td("NOWRAP=true",b(Heading)),
-       td("COLSPAN=3",
-	  href("TARGET=\"expanded\" onClick=popup()",
-	       ["./expand_memory?pid=",Pid,
-		"&what=",Heading],
-	       ["Expand ", Heading]))]).
-
-format("LastCalls",Data) ->
-    Data;
-format("StackDump",Data) ->
-    Data;
-format(_Heading,Data) ->
-    pretty_format(Data).
-    
-
-
-%%%-----------------------------------------------------------------
-%%% Expanded memory
-expanded_memory(Heading,Expanded) ->
-    header(Heading,body(expanded_memory_body(Heading,Expanded))).
-    
-expanded_memory_body(Heading,[]) ->
-    [heading(Heading,"processes"),
-     case Heading of
-	 "MsgQueue" -> "No messages were found";
-	 "StackDump" -> "No stack dump was found";
-	 "Dictionary" -> "No dictionary was found";
-	 "DebugDictionary" -> "No debug dictionary was found"
-     end];
-expanded_memory_body(Heading,Expanded) ->
-    [heading(Heading,"processes"),
-     case Heading of
-	 "MsgQueue" ->
-	     table(
-	       "BORDER=4 CELLPADDING=4",
-	       [tr(
-		  [th("Message"),
-		   th("SeqTraceToken")]) |
-		lists:map(fun(Msg) -> msgq_table(Msg) end, Expanded)]);
-	 "StackDump" ->
-	     table(
-	       "BORDER=4 CELLPADDING=4",
-	       [tr(
-		  [th("Label"),
-		   th("Term")]) |
-		lists:map(fun(Entry) -> stackdump_table(Entry) end, Expanded)]);
-	 _ ->
-	     table(
-	       "BORDER=4 CELLPADDING=4",
-	       [tr(
-		  [th("Key"),
-		   th("Value")]) |
-		lists:map(fun(Entry) -> dict_table(Entry) end, Expanded)])
-     end].
-
-msgq_table({Msg0,Token0}) ->
-    Token = case Token0 of
-		[] -> ?space;
-		_ -> io_lib:fwrite("~w",[Token0])
-	    end,
-    Msg = href_proc_port(lists:flatten(io_lib:format("~p",[Msg0]))),
-    tr([td(pre(Msg)), td(Token)]).
-    
-stackdump_table({Label0,Term0}) ->
-    Label = io_lib:format("~w",[Label0]),
-    Term = href_proc_port(lists:flatten(io_lib:format("~p",[Term0]))),
-    tr([td("VALIGN=top",Label), td(pre(Term))]).
-    
-dict_table({Key0,Value0}) ->
-    Key = href_proc_port(lists:flatten(io_lib:format("~p",[Key0]))),
-    Value = href_proc_port(lists:flatten(io_lib:format("~p",[Value0]))),
-    tr([td("VALIGN=top",pre(Key)), td(pre(Value))]).
-
-
-%%%-----------------------------------------------------------------
-%%% Display an expanded binary, i.e. the whole binary, not just the
-%%% size of it.
-expanded_binary(Bin) ->
-    Heading = "Expanded binary",
-    header(Heading,body(expanded_binary_body(Heading,Bin))).
-    
-expanded_binary_body(Heading,Bin) ->
-    [h1(Heading),
-     pre(href_proc_port(lists:flatten(Bin))),
-     br(),br(),
-     href("javascript:history.go(-1)","BACK")].
-    
-%%%-----------------------------------------------------------------
-%%% Print info for one port
-port(Heading,Port,TW) ->
-    header(Heading,body(port_body(Heading,Port,TW))).
-    
-port_body(Heading,Port,TW) ->
-    [heading(Heading,"ports"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr([th(Head) || Head <- port_table_head()]), ports_table(Port)])].
-
-%%%-----------------------------------------------------------------
-%%% Print table of internal ETS tables
-internal_ets_tables(InternalEts,TW) ->
-    Heading = "Internal ETS tables",
-    header(Heading,body(internal_ets_tables_body(Heading,InternalEts,TW))).
-    
-internal_ets_tables_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No internal ETS tables were found\n"];
-internal_ets_tables_body(Heading,InternalEts,TW) ->
-    [heading(Heading,"internal_ets_tables"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(
-	  [th("Description"),
-	   th("Id"),
-	   th("Name"),
-	   th("Type"),
-	   th("Buckets"),
-	   th("Objects"),
-	   th("Memory (bytes)")]) |
-	lists:map(fun(InternalEtsTable) -> 
-			  internal_ets_tables_table1(InternalEtsTable)
-		  end,
-		  InternalEts)])].
-
-internal_ets_tables_table1({Descr,InternalEtsTable}) ->
-    #ets_table{id=Id,name=Name,type=Type,buckets=Buckets,
-	       size=Size,memory=Memory} = InternalEtsTable,
-    tr(
-      [td(Descr),
-       td(Id),
-       td(Name),
-       td(Type),
-       td("ALIGN=right",Buckets),
-       td("ALIGN=right",Size),
-       td("ALIGN=right",Memory)]).
-
-%%%-----------------------------------------------------------------
-%%% Print table of nodes in distribution
-nods(Nods,TW) ->
-    header("Distribution Information",body(nodes_body(Nods,TW))).
-    
-nodes_body(no_distribution,_TW) ->
-    [heading("Distribution Information","distribution_info"),
-     "Not alive\n"];
-nodes_body({Type,Info,Node},TW) when is_record(Node,nod) ->
-    %% Display only one node - used when a pid or port on a remote
-    %% node is clicked.
-    [heading("Remote Node","distribution_info"),
-     warn(TW),
-     Info,
-     make_nodes_table(Type,[Node])];
-nodes_body({Visible,Hidden,NotConnected},TW) ->
-    %% Display all nodes - this is the complete distribution info
-    [heading("Distribution Information","distribution_info"),
-     warn(TW),
-     make_nodes_table("Visible Nodes",Visible),
-     make_nodes_table("Hidden Nodes",Hidden),
-     make_nodes_table("Not Connected Nodes",NotConnected)].
-
-make_nodes_table(Text,[]) ->
-    p(["No \"",Text,"\" were found"]);
-make_nodes_table(Text,Nodes) ->
-    p(table(
-	"BORDER=4 CELLPADDING=4",
-	[nodes_table_heading(Text),
-	 lists:map(fun(Node) -> nodes_table_row(Node) end, Nodes)])).
-    
-nodes_table_heading(Text) ->
-    [tr("BGCOLOR=\"#8899AA\"",[th("COLSPAN=6",Text)]),
-     tr([th("Name"),
-	 th("Channel"),
-	 th("Controller"),
-	 th("Creation(s)"),
-	 th("Links/Monitors"),
-	 th("Extra info")])].
-
-nodes_table_row(Node) ->
-    #nod{name=Name,channel=Channel,controller=Controller,creation=Creation,
-	 remote_links=Links,remote_mon=Mon,remote_mon_by=MonBy,error=Error}=Node,
-    tr(
-      [td(maybe_refcount(Name)),
-       td("ALIGN=right",Channel),
-       td(href_proc_port(Controller)),
-       td("ALIGN=right",break_lines_creation(Creation)),
-       td(format_links_and_monitors(Links,Mon,MonBy)),
-       td(format_extra_info(Error))]).
-
-maybe_refcount(Name) ->
-    maybe_refcount(Name, []).
-maybe_refcount([$ ,$( | Rest], Acc) ->
-    [lists:reverse(Acc),br(),[$(|Rest]];
-maybe_refcount([Char | Rest], Acc) ->
-    maybe_refcount(Rest, [Char | Acc]);
-maybe_refcount([],Acc) ->
-    lists:reverse(Acc).
-
-break_lines_creation(Creation) ->
-    break_lines_creation(Creation,[]).
-break_lines_creation([$ ,$( | Rest1], Acc) ->
-    {RefCount,Rest2} = to_end_par(Rest1,[$(,$ ]),
-    [lists:reverse(Acc),RefCount,br(),break_lines_creation(Rest2)];
-break_lines_creation([$ | Rest], Acc) ->
-    [lists:reverse(Acc),br(),break_lines_creation(Rest)];    
-break_lines_creation([Char | Rest], Acc) ->
-    break_lines_creation(Rest, [Char | Acc]);
-break_lines_creation([],Acc) ->
-    lists:reverse(Acc).
-
-to_end_par([$),$ | Rest], Acc) ->
-    {lists:reverse([$) | Acc]),Rest};
-to_end_par([$) | Rest], Acc) ->
-    {lists:reverse([$) | Acc]),Rest};
-to_end_par([Char | Rest], Acc) ->
-    to_end_par(Rest, [Char | Acc]);
-to_end_par([],Acc) ->
-    {lists:reverse(Acc),[]}.
-    
-
-format_links_and_monitors(?space,?space,?space) ->
-    ?space;
-format_links_and_monitors(Links,Mon,MonBy) ->
-    [format_links_and_monitors(Links," is linked to "),
-     format_links_and_monitors(Mon," is monitoring "),
-     format_links_and_monitors(MonBy," is monitored by ")].
-
-format_links_and_monitors(?space,_Text) ->
-    "";
-format_links_and_monitors([{Local,Remote}|Rest],Text) ->
-    [[href_proc_port(Local),Text,href_proc_port(Remote),br()] |
-     format_links_and_monitors(Rest,Text)];
-format_links_and_monitors([],_Text) ->
-    [].
-
-format_extra_info(?space) ->
-    ?space;
-format_extra_info(Error) ->
-     case Error of
-	 ?space -> "";
-	 _ -> font("COLOR=\"#FF0000\"",["ERROR: ",Error,"\n"])
-     end.
-
-%%%-----------------------------------------------------------------
-%%% Print detailed information about one module
-loaded_mod_details(ModInfo,TW) ->
-    header(ModInfo#loaded_mod.mod,body(loaded_mod_details_body(ModInfo,TW))).
-    
-loaded_mod_details_body(ModInfo,TW) ->
-    #loaded_mod{mod=Mod,current_size=CS,current_attrib=CA,
-		current_comp_info=CCI,old_size=OS,
-		old_attrib=OA,old_comp_info=OCI} = ModInfo,
-    [help("loaded_modules"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(th("BGCOLOR=\"#8899AA\" COLSPAN=3",
-	      ["Module: ",Mod])),
-	tr([td(?space),th("Current"),th("Old")]),
-	tr([th("ALIGN=left","Size (bytes)"),
-	    td(CS),
-	    td(OS)]),
-	tr([th("ALIGN=left","Attributes"),
-	    td(pre(CA)),
-	    td(pre(OA))]),
-	tr([th("ALIGN=left","Compilation info"),
-	    td(pre(CCI)),
-	    td(pre(OCI))])])].
-    
-
-%%%-----------------------------------------------------------------
-%%% Print atoms
-atoms(SessionId,TW,Num,FirstChunk) ->
-    Heading = "Atoms",
-    case FirstChunk of
-	done ->
-	    deliver_first(SessionId,[start_html_page(Heading),
-				     h1(Heading),
-				     warn(TW),
-				     "No atoms were found in log",br(),
-				     "Total number of atoms in node was ", Num, 
-				     br()]);
-	_ ->
-	    deliver_first(SessionId,[start_html_page(Heading),
-				     heading(Heading,"atoms"),
-				     warn(TW),
-				     "Total number of atoms in node was ", Num, 
-				     br(),
-				     "The last created atom is shown first",
-				     br(),
-				     start_pre()]),
-	    atoms_chunk(SessionId,FirstChunk)
-    end.
-	    
-atoms_chunk(SessionId,done) ->
-    deliver(SessionId,[stop_pre(),stop_html_page()]);
-atoms_chunk(SessionId,Atoms) ->
-    deliver(SessionId,Atoms).
-
-%%%-----------------------------------------------------------------
-%%% Print memory information
-memory(Memory,TW) ->
-    Heading = "Memory Information",
-    header(Heading,body(memory_body(Heading,Memory,TW))).
-
-memory_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No memory information was found\n"];
-memory_body(Heading,Memory,TW) ->
-    [heading(Heading,"memory"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr("BGCOLOR=\"#8899AA\"",
-	  [th(?space),
-	   th("Bytes")]) |
-	lists:map(fun(Entry) -> memory_table(Entry) end, Memory)])].
-
-memory_table({Key,Value}) ->
-    tr([th("ALIGN=left",Key),td("ALIGN=right",Value)]).
-
-%%%-----------------------------------------------------------------
-%%% Print allocated areas information
-allocated_areas(AllocatedAreas,TW) ->
-    Heading = "Information about allocated areas",
-    header(Heading,body(allocated_areas_body(Heading,AllocatedAreas,TW))).
-
-allocated_areas_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No information was found about allocated areas\n"];
-allocated_areas_body(Heading,AllocatedAreas,TW) ->
-    [heading(Heading,"memory"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr("BGCOLOR=\"#8899AA\"",
-	  [th(?space),
-	   th("Allocated (bytes)"),
-	   th("Used (bytes)")]) | 
-	lists:map(fun(Entry) -> allocated_areas_table(Entry) end,
-		  AllocatedAreas)])].
-
-allocated_areas_table({Key,Alloc,Used}) ->
-    tr(
-      [th("ALIGN=left",Key),
-       td("ALIGN=right",Alloc),
-       td("ALIGN=right",Used)]).
-
-
-%%%-----------------------------------------------------------------
-%%% Print allocator_info information
-allocator_info(Allocators,TW) ->
-    Heading = "Allocator Information",
-    header(Heading,body(allocator_info_body(Heading,Allocators,TW))).
-
-allocator_info_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No information was found about allocators\n"];
-allocator_info_body(Heading,Allocators,TW) ->
-    [heading(Heading,"memory"),
-     warn(TW),
-     p(b("Sizes are in bytes")),
-     lists:map(fun({Head,Allocator}) ->
-		       TableHead =
-			   case Head of
-			       {SubTitle,Columns} ->
-				   tr("BGCOLOR=\"#8899AA\"",
-				      [th("ALIGN=left",
-					  font("SIZE=+1",SubTitle)) |
-				       lists:map(
-					 fun(CH) ->
-						 th("ALIGN=right",CH)
-					 end,
-					 Columns)]);
-			       SubTitle ->
-				   tr("BGCOLOR=\"#8899AA\"",
-				      th("COLSPAN=10 ALIGN=left",
-					 font("SIZE=+1",SubTitle)))
-			   end,
-		       [table(
-			  "BORDER=4 CELLPADDING=4",
-			  [TableHead |
-			   lists:map(
-			     fun({Key,Values}) -> 
-				     tr([th("ALIGN=left",Key) |
-					 lists:map(
-					   fun(Val) ->
-						   td("ALIGN=right",Val)
-					   end,Values)])
-			     end, 
-			     Allocator)]),
-			br(),br()]
-	       end,
-	       Allocators)].
-
-%%%-----------------------------------------------------------------
-%%% Print informatin about internal tables
-hash_tables(HashTables,TW) ->
-    Heading = "Hash Table Information",
-    header(Heading,body(hash_tables_body(Heading,HashTables,TW))).
-    
-hash_tables_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No hash table information was found\n"];
-hash_tables_body(Heading,HashTables,TW) ->
-    [heading(Heading,"internal_tables"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(
-	  [th("Name"),
-	   th("Size"),
-	   th("Used"),
-	   th("Objects"),
-	   th("Depth")]) |
-	lists:map(fun(HashTable) -> hash_tables_table(HashTable) end,
-		  HashTables)])].
-
-hash_tables_table(HashTable) ->
-    #hash_table{name=Name,size=Size,used=Used,objs=Objs,depth=Depth}=HashTable,
-    tr(
-      [td(Name),
-       td("ALIGN=right",Size),
-       td("ALIGN=right",Used),
-       td("ALIGN=right",Objs),
-       td("ALIGN=right",Depth)]).
-
-index_tables(IndexTables,TW) ->
-    Heading = "Index Table Information",
-    header(Heading,body(index_tables_body(Heading,IndexTables,TW))).
-    
-index_tables_body(Heading,[],TW) ->
-    [h1(Heading),
-     warn(TW),
-     "No index table information was found\n"];
-index_tables_body(Heading,IndexTables,TW) ->
-    [heading(Heading,"internal_tables"),
-     warn(TW),
-     table(
-       "BORDER=4 CELLPADDING=4",
-       [tr(
-	  [th("Name"),
-	   th("Size"),
-	   th("Limit"),
-	   th("Used"),
-	   th("Rate"),
-	   th("Entries")]) |
-	lists:map(fun(IndexTable) -> index_tables_table(IndexTable) end,
-		  IndexTables)])].
-
-index_tables_table(IndexTable) ->
-    #index_table{name=Name,size=Size,limit=Limit,used=Used,
-		 rate=Rate,entries=Entries} = IndexTable,
-    tr(
-      [td(Name),
-       td("ALIGN=right",Size),
-       td("ALIGN=right",Limit),
-       td("ALIGN=right",Used),
-       td("ALIGN=right",Rate),
-       td("ALIGN=right",Entries)]).
-
-%%%-----------------------------------------------------------------
-%%% Internal library
-start_html_page(Title) ->
-    [only_http_header(),
-     start_html(),
-     only_html_header(Title),
-     start_html_body()].
-
-stop_html_page() ->
-    [stop_html_body(),
-     stop_html()].
-
-only_http_header() ->
-    ["Pragma:no-cache\r\n",
-     "Content-type: text/html\r\n\r\n"].
-
-only_html_header(Title) -> 
-    only_html_header(Title,"").
-only_html_header(Title,JavaScript) ->    
-    ["<HEAD>\n",
-     "<TITLE>", Title,  "</TITLE>\n",
-     JavaScript,
-     "</HEAD>\n"].
-
-start_html() ->
-    "<HTML>\n".
-stop_html() ->
-    "</HTML>".
-start_html_body() ->
-    "<BODY BGCOLOR=\"#FFFFFF\">\n".
-stop_html_body() ->
-    "</BODY>\n".
-
-header(Body) ->
-    header("","",Body).
-header(Title,Body) ->
-    header(Title,"",Body).
-header(Title,JavaScript,Body) ->
-    [only_http_header(),
-     html_header(Title,JavaScript,Body)].
-
-html_header(Title,JavaScript,Body) ->    
-    [start_html(),
-     only_html_header(Title,JavaScript),
-     Body,
-     stop_html()].
-
-body(Text) ->
-    [start_html_body(),
-     Text,
-     stop_html_body()].
-
-frameset(Args,Frames) ->
-    ["<FRAMESET ",Args,">\n", Frames, "\n</FRAMESET>\n"].
-frame(Args) ->
-    ["<FRAME ",Args, ">\n"].
-
-start_visible_table() ->
-    start_table("BORDER=\"4\" CELLPADDING=\"4\"").
-start_visible_table(ColTitles) ->
-    [start_visible_table(),
-     tr([th(ColTitle) || ColTitle <- ColTitles])].
-
-start_table(Args) ->
-    ["<TABLE ", Args, ">\n"].
-stop_table() ->
-    "</TABLE>\n".
-
-table(Args,Text) ->
-    [start_table(Args), Text, stop_table()].
-tr(Text) ->
-    ["<TR>\n", Text, "\n</TR>\n"].
-tr(Args,Text) ->
-    ["<TR ", Args, ">\n", Text, "\n</TR>\n"].
-th(Text) ->
-    ["<TH>", Text, "</TH>"].
-th(Args,Text) ->
-    ["<TH ", Args, ">\n", Text, "\n</TH>\n"].
-td(Text) ->
-    ["<TD>", Text, "</TD>"].
-td(Args,Text) ->
-    ["<TD ", Args, ">", Text, "</TD>"].
-
-b(Text) ->
-    ["<B>",Text,"</B>"].
-em(Text) ->    
-    ["<EM>",Text,"</EM>\n"].
-start_pre() ->
-    "<PRE>".
-stop_pre() ->
-    "</PRE>".
-pre(Text) ->
-    [start_pre(),Text,stop_pre()].
-href(Link,Text) ->
-    ["<A HREF=\"",Link,"\">",Text,"</A>"].
-href(Args,Link,Text) ->
-    ["<A HREF=\"",Link,"\" ",Args,">",Text,"</A>"].
-img("") ->
-    "";
-img(Picture) ->
-    ["<IMG SRC=\"", Picture, "\" BORDER=0>"].
-form(Args,Text) ->
-    ["<FORM ",Args,">\n",Text,"\n</FORM>\n"].
-input(Args) ->
-    ["<INPUT ", Args, ">\n"].
-h1(Text) ->
-    ["<H1>",Text,"</H1>\n"].
-font(Args,Text) ->
-    ["<FONT ",Args,">\n",Text,"\n</FONT>\n"].
-p(Text) ->    
-    ["<P>",Text,"</P>\n"].
-p(Args, Text) ->    
-    ["<P ", Args, ">",Text,"</P>\n"].
-br() ->
-    "<BR>\n".
-
-
-%% In all the following, "<" is changed to "&lt;" and ">" is changed to "&gt;"
-href_proc_port(Text) ->
-    href_proc_port(Text,[]).
-href_proc_port([$#,$R,$e,$f,$<|T],Acc) ->
-    %% No links to refs
-    href_proc_port(T,[$;,$t,$l,$&,$f,$e,$R,$#|Acc]);
-href_proc_port([$#,$F,$u,$n,$<|T],Acc) ->
-    %% No links to funs
-    href_proc_port(T,[$;,$t,$l,$&,$n,$u,$F,$#|Acc]);
-href_proc_port([$#,$P,$o,$r,$t,$<|T],Acc) ->
-    {[$#|Port]=HashPort,Rest} = to_gt(T,[$;,$t,$l,$&,$t,$r,$o,$P,$#]),
-    href_proc_port(Rest,[href("TARGET=\"main\"",
-			      ["./port?port=",Port],HashPort)|Acc]);
-href_proc_port([$<,$<|T],Acc) ->
-    %% No links to binaries
-    href_proc_port(T,[$;,$t,$l,$&,$;,$t,$l,$&|Acc]);
-href_proc_port([$<,C|T],Acc) when $0 =< C, C =< $9 ->
-    %% Pid
-    {Pid,Rest} = to_gt(T,[C,$;,$t,$l,$&]),
-    href_proc_port(Rest,[href("TARGET=\"main\"",
-			      ["./proc_details?pid=",Pid],Pid)|Acc]);
-href_proc_port([$",$#,$C,$D,$V,$B,$i,$n,$<|T],Acc) ->
-    %% Binary written by crashdump_viewer:parse_heap_term(...)
-    {SizeAndPos,[$"|Rest]} = split($>,T),
-    {Size,Pos} = split($,,SizeAndPos),
-    href_proc_port(Rest,[href("TARGET=\"expanded\"",
-			      ["./expand_binary?pos=",Pos],
-			      ["&lt;&lt; ",Size," bytes &gt;&gt;"]) | Acc]);
-href_proc_port([$",$#,$C,$D,$V,$P,$o,$r,$t,$<|T],Acc) ->
-    %% Port written by crashdump_viewer:parse_term(...)
-    {[$#|Port]=HashPort,[$"|Rest]} = to_gt(T,[$;,$t,$l,$&,$t,$r,$o,$P,$#]),
-    href_proc_port(Rest,[href("TARGET=\"main\"",
-			      ["./port?port=",Port],HashPort)|Acc]);
-href_proc_port([$",$#,$C,$D,$V,$P,$i,$d,$<|T],Acc) ->
-    %% Pid written by crashdump_viewer:parse_term(...)
-    {Pid,[$"|Rest]} = to_gt(T,[$;,$t,$l,$&]),
-    href_proc_port(Rest,[href("TARGET=\"main\"",
-			      ["./proc_details?pid=",Pid],Pid)|Acc]);
-href_proc_port([$',$#,$C,$D,$V,$I,$n,$c,$o,$m,$p,$l,$e,$t,$e,$H,$e,$a,$p,$'|T],
-	       Acc)->
-    %% The heap is incomplete! Written by crashdump_viewer:deref_pts(...)
-    IH = lists:reverse(
-	   lists:flatten(
-	     "<FONT COLOR=\"#FF0000\">...(Incomplete Heap)</FONT>")),
-    href_proc_port(T,IH++Acc);
-href_proc_port([$',$#,$C,$D,$V,$T,$r,$u,$n,$c,$a,$t,$e,$d,$B,$i,$n,$a,$r,$y,$'
-		|T], Acc)->
-    %% A binary which is truncated! Written by 
-    %% crashdump_viewer:parse_heap_term(...)
-    IH = lists:reverse(
-	   lists:flatten(
-	     "<FONT COLOR=\"#FF0000\">&lt;&lt;...(Truncated Binary)&gt;&gt;"
-	     "</FONT>")),
-    href_proc_port(T,IH++Acc);
-href_proc_port([$',$#,$C,$D,$V,$N,$o,$n,$e,$x,$i,$s,$t,$i,$n,$g,$B,$i,$n,$a,$r,
-		$y,$'|T], Acc)->
-    %% A binary which could not be found in the dump! Written by 
-    %% crashdump_viewer:parse_heap_term(...)
-    IH = lists:reverse(
-	   lists:flatten(
-	     "<FONT COLOR=\"#FF0000\">&lt;&lt;...(Nonexisting Binary)&gt;&gt;"
-	     "</FONT>")),
-    href_proc_port(T,IH++Acc);
-href_proc_port([$<|T],Acc) ->
-    href_proc_port(T,[$;,$t,$l,$&|Acc]);
-href_proc_port([$>|T],Acc) ->
-    href_proc_port(T,[$;,$t,$g,$&|Acc]);
-href_proc_port([H|T],Acc) ->
-    href_proc_port(T,[H|Acc]);
-href_proc_port([],Acc) ->
-    lists:reverse(Acc).
-
-to_gt(Str,Acc) ->
-    {Match,Rest} = to_gt_noreverse(Str,Acc),
-    {lists:reverse(Match),Rest}.
-to_gt_noreverse([$>|T],Acc) ->
-    {[$;,$t,$g,$&|Acc],T};
-to_gt_noreverse([H|T],Acc) ->
-    to_gt_noreverse(T,[H|Acc]);
-to_gt_noreverse([],Acc) ->
-    {Acc,[]}.
-
-split(Char,Str) ->
-    split(Char,Str,[]).
-split(Char,[Char|Str],Acc) -> % match Char
-    {lists:reverse(Acc),Str};
-split(Char,[H|T],Acc) ->
-    split(Char,T,[H|Acc]).
-
-
-warn([]) ->
-    [];
-warn(Warning) ->
-    font("COLOR=\"#FF0000\"",p([Warning,br(),br()])).
-
-heading(Heading,HelpMarker) ->
-    [font("SIZE=+2",b(Heading)),?space,?space,help(HelpMarker)].
-
-help(HelpMarker) ->
-    [href("TARGET=doc",
-	  ["/crashdump_doc/crashdump_help.html#",HelpMarker],
-	  "Help"),
-     br(),br()].
-
-%%%-----------------------------------------------------------------
-%%% This function pretty formats a string which contains erlang
-%%% terms (e.g. the message queue).
-%%% In all the following, "<" is changed to "&lt;" and ">" is changed to "&gt;"
-pretty_format(In) ->
-    case catch scan(In,[],initial,[]) of
-	{'EXIT',_Reason} ->
-	    %% Probably a truncated file, so the erlang term is not complete
-	    [font("COLOR=\"#FF0000\"","(This term might be truncated)"),
-	     href_proc_port(lists:flatten(In))];
-	{[R],_,Insrt} ->
-	    InsrtString = lists:flatten(io_lib:format("~p",[R])),
-	    lists:flatten(replace_insrt(lists:reverse(InsrtString),Insrt,[]))
-    end.
-
-%% Finish term
-scan(In,Acc,list,Insrt) when hd(In)==$] ->
-    {lists:reverse(Acc),tl(In),Insrt};    
-scan(In,Acc,tuple,Insrt) when hd(In)==$} ->
-    {list_to_tuple(lists:reverse(Acc)),tl(In),Insrt};    
-scan(In,Acc,atom,Insrt) when In==[];hd(In)==$,;hd(In)==$];hd(In)==$} ->
-    {list_to_atom(lists:reverse(Acc)),In,Insrt};
-scan(In,Acc,float,Insrt) when In==[];hd(In)==$,;hd(In)==$];hd(In)==$} ->
-    {list_to_float(lists:reverse(Acc)),In,Insrt};
-scan(In,Acc,integer,Insrt) when In==[];hd(In)==$,;hd(In)==$];hd(In)==$} ->
-     {list_to_integer(lists:reverse(Acc)),In,Insrt};
-scan([$"|In],Acc,string,Insrt) when In==[];hd(In)==$,;hd(In)==$];hd(In)==$} -> 
-    {lists:reverse(Acc),In,Insrt};
-scan([$>|In],Acc,special,Insrt) when In==[];hd(In)==$,;hd(In)==$];hd(In)==$} ->
-    %% pid, ref, port, fun
-    {lists:reverse([$;,$t,$g,$&|Acc]),In,Insrt};
-scan([$}|In],Acc,special,Insrt) when In==[];hd(In)==$,;hd(In)==$];hd(In)==$} ->
-    %% bignum integer, e.g. #integer(2) = {2452,4324}
-    {lists:reverse([$}|Acc]),In,Insrt};
-scan([$,|In],Acc,Cur,Insrt) when Cur/=string,Cur/=special ->
-    scan(In,Acc,Cur,Insrt);
-
-%% In the middle of an atom
-scan([$'|In],Acc,Cur,Insrt) when Cur==atom ->
-    %% all $' are removed. They are added again by list_to_atom,
-    %% so if we don't remove them we will get two of them.
-    scan(In,Acc,Cur,Insrt);
-
-%% A $. in the middle of an integer - turn to float
-scan([C|T],Acc,integer,Insrt) when C==$. ->
-    scan(T,[C|Acc],float,Insrt);
-
-%% In the middle of an atom, integer, float or string
-scan([$<|T],Acc,Cur,Insrt) when Cur==atom;Cur==string;Cur==special ->
-    scan(T,[$;,$t,$l,$&|Acc],Cur,Insrt);
-scan([$>|T],Acc,Cur,Insrt) when Cur==atom;Cur==string ->
-    scan(T,[$;,$t,$g,$&|Acc],Cur,Insrt);
-scan([C|T],Acc,Cur,Insrt) when Cur==atom;Cur==integer;Cur==float;Cur==string;Cur==special ->
-    scan(T,[C|Acc],Cur,Insrt);
-
-%% Start list
-scan([$[|T],Acc,Cur,Insrt0) ->
-    {L,Rest,Insrt} = scan(T,[],list,Insrt0),
-    scan(Rest,[L|Acc],Cur,Insrt);
-
-%% Star tuple
-scan([${|T],Acc,Cur,Insrt0) ->
-    {Tuple,Rest,Insrt} = scan(T,[],tuple,Insrt0),
-    scan(Rest,[Tuple|Acc],Cur,Insrt);
-
-%% Star string
-scan([$"|T],Acc,Cur,Insrt0) ->
-    {String,Rest,Insrt} = scan(T,[],string,Insrt0),
-    scan(Rest,[String|Acc],Cur,Insrt);
-
-%% Start atom
-scan([$'|T],Acc,Cur,Insrt0) ->
-    %% all $' are removed. They are added again by list_to_atom,
-    %% so if we don't remove them we will get two of them.
-    {Atom,Rest,Insrt} = scan(T,[],atom,Insrt0),
-    scan(Rest,[Atom|Acc],Cur,Insrt);
-scan([C|T],Acc,Cur,Insrt0) when C>=$A,C=<$Z;C>=$a,C=<$z;C==$'->
-    {Atom,Rest,Insrt} = scan(T,[C],atom,Insrt0),
-    scan(Rest,[Atom|Acc],Cur,Insrt);
-
-%% Start integer or float
-scan([C|T],Acc,Cur,Insrt0) when C>=$0,C=<$9;C==$- ->
-    {Num,Rest,Insrt} = scan(T,[C],integer,Insrt0), % can later change to float
-    scan(Rest,[Num|Acc],Cur,Insrt);
-
-%% Start Pid/Port/Ref/Fun/Binary
-scan([$<|T],Acc,Cur,Insrt0) ->
-    {Special,Rest,Insrt} = scan(T,[$;,$t,$l,$&],special,Insrt0),
-    scan(Rest,['$insrt'|Acc],Cur,[Special|Insrt]);
-scan([$#|T],Acc,Cur,Insrt0) ->
-    {Special,Rest,Insrt} = scan(T,[$#],special,Insrt0),
-    scan(Rest,['$insrt'|Acc],Cur,[Special|Insrt]);
-
-
-%% done
-scan([],Acc,initial,Insrt) ->
-    {Acc,[],Insrt}.
-
-
-replace_insrt("'trsni$'"++Rest,[H|T],Acc) -> % the list is reversed here!
-    Special = 
-	case H of
-	    "&lt;&lt;" ++ _Binary -> 
-		H;
-	    "&lt;" ++ _Pid -> 
-		href("TARGET=\"main\"",["./proc_details?pid=",H],H);
-	    "#Port&lt;" ++ Port -> 
-		href("TARGET=\"main\"",["./port?port=","Port&lt;"++Port],H);
-	    "#" ++ _other -> 
-		H
-	end,
-    replace_insrt(Rest,T,[Special|Acc]);
-replace_insrt([H|T],Insrt,Acc) ->
-    replace_insrt(T,Insrt,[H|Acc]);
-replace_insrt([],[],Acc) ->
-    Acc.
-
-%%%-----------------------------------------------------------------
-%%% Create a page with one table by delivering chunk by chunk to
-%%% inets. crashdump_viewer first calls chunk_page/5 once, then
-%%% chunk/3 multiple times until all data is delivered.
-chunk_page(processes,SessionId,TW,{Sorted,SharedHeap,DumpVsn},FirstChunk) ->
-    Columns = procs_summary_table_head(Sorted,SharedHeap,DumpVsn),
-    chunk_page(SessionId, "Process Information", TW, FirstChunk,
-	       "processes", Columns, fun procs_summary_table/1);
-chunk_page(ports,SessionId,TW,_,FirstChunk) ->
-    chunk_page(SessionId, "Port Information", TW, FirstChunk,
-	       "ports", port_table_head(), fun ports_table/1);
-chunk_page(ets_tables,SessionId,TW,Heading,FirstChunk) ->
-    Columns = ["Owner",
-	       "Slot",
-	       "Id",
-	       "Name",
-	       "Type",
-	       "Buckets",
-	       "Objects",
-	       "Memory (bytes)"],
-    chunk_page(SessionId, Heading, TW, FirstChunk,
-	       "ets_tables", Columns, fun ets_tables_table/1);
-chunk_page(timers,SessionId,TW,Heading,FirstChunk) ->
-    chunk_page(SessionId, Heading, TW, FirstChunk, "timers",
-	       ["Owner","Message","Time left"], fun timers_table/1);
-chunk_page(loaded_mods,SessionId,TW,{CC,OC},FirstChunk) ->
-    TotalsInfo = p([b("Current code: "),CC," bytes",br(),
-		    b("Old code: "),OC," bytes"]),
-    Columns = ["Module","Current size (bytes)","Old size (bytes)"],
-    chunk_page(SessionId, "Loaded Modules Information", TW, FirstChunk,
-	       "loaded_modules", TotalsInfo,Columns, fun loaded_mods_table/1);
-chunk_page(funs,SessionId, TW, _, FirstChunk) ->
-    Columns = ["Module",
-	       "Uniq",
-	       "Index",
-	       "Address",
-	       "Native_address",
-	       "Refc"],
-    chunk_page(SessionId, "Fun Information", TW, FirstChunk,
-	       "funs", Columns, fun funs_table/1).
-
-chunk_page(SessionId,Heading,TW,FirstChunk,Type,TableColumns,TableFun) ->
-    chunk_page(SessionId,Heading,TW,FirstChunk,Type,[],TableColumns,TableFun).
-chunk_page(SessionId,Heading,TW,done,Type,_TotalsInfo,_TableColumns,_TableFun) ->
-    no_info_found(SessionId,Heading,TW,Type);
-chunk_page(SessionId,Heading,TW,FirstChunk,Type,TotalsInfo,TableColumns,TableFun) ->
-    deliver_first(SessionId,[start_html_page(Heading),
-			     heading(Heading,Type),
-			     warn(TW),
-			     TotalsInfo,
-			     start_visible_table(TableColumns)]),
-    chunk(SessionId,FirstChunk,TableFun),
-    TableFun.
-
-no_info_found(SessionId, Heading, TW, Type) ->
-    Info = ["No ", Type, " were found\n"],
-    deliver_first(SessionId,[start_html_page(Heading),
-			     h1(Heading),
-			     warn(TW),
-			     Info,
-			     stop_html_page()]).
-
-chunk(SessionId, done, _TableFun) ->
-    deliver(SessionId,[stop_table(),stop_html_page()]);
-chunk(SessionId, Items, TableFun) ->
-    deliver(SessionId, [lists:map(TableFun, Items),
-			stop_table(), %! Will produce an empty table at the end
-			start_visible_table()]). % of the page :(
-
-%%%-----------------------------------------------------------------
-%%% Deliver part of a page to inets
-%%% The first part, which includes the HTTP header, must always be
-%%% delivered as a string (i.e. no binaries). The rest of the page is
-%%% better delivered as binaries in order to avoid data copying.
-deliver_first(SessionId,String) ->
-    mod_esi:deliver(SessionId,String).
-deliver(SessionId,IoList) ->
-    mod_esi:deliver(SessionId,[list_to_binary(IoList)]).
-
-
-%%%-----------------------------------------------------------------
-%%% Page specific stuff for chunk pages
-procs_summary_table_head(Sorted,SharedHeap,DumpVsn) ->
-    MemHeading =
-	if DumpVsn>=?r16b01_dump_vsn ->
-		"Memory (bytes)";
-	   true ->
-		if SharedHeap ->
-			"Stack";
-		   true ->
-			"Stack+heap"
-		end
-	end,
-    [procs_summary_table_head1("pid","Pid",Sorted),
-     procs_summary_table_head1("name_func","Name/Spawned as",Sorted),
-     procs_summary_table_head1("state","State",Sorted),
-     procs_summary_table_head1("reds","Reductions",Sorted),
-     procs_summary_table_head1("mem",MemHeading,Sorted),
-     procs_summary_table_head1("msg_q_len","MsgQ Length",Sorted)].
-
-procs_summary_table_head1(_,Text,no_sort) ->
-    Text;
-procs_summary_table_head1(Sorted,Text,Sorted) ->
-    %% Mark the sorted column (bigger and italic)
-    font("SIZE=\"+1\"",em(href("./sort_procs?sort="++Sorted,Text)));
-procs_summary_table_head1(SortOn,Text,_Sorted) ->
-    href("./sort_procs?sort="++SortOn,Text).
-
-procs_summary_table(Proc) ->
-    #proc{pid=Pid,name=Name,state=State,
-	  reds=Reds,stack_heap=Stack,memory=Memory,msg_q_len=MsgQLen}=Proc,
-    Mem =
-	case Memory of
-	    undefined -> % assuming pre-R16B01
-		case Stack of
-		    -1 -> "unknown";
-		    _ -> integer_to_list(Stack)
-		end;
-	    _ ->
-		integer_to_list(Memory)
-	end,
-    tr(
-      [td(href(["./proc_details?pid=",Pid],Pid)),
-       td(Name),
-       td(State),
-       td("ALIGN=right",integer_to_list(Reds)),
-       td("ALIGN=right",Mem),
-       td("ALIGN=right",integer_to_list(MsgQLen))]).
-
-port_table_head() ->
-    ["Id","Slot","Connected","Links","Name","Monitors","Controls"].
-
-ports_table(Port) ->
-    #port{id=Id,slot=Slot,connected=Connected,links=Links,name=Name,
-	  monitors=Monitors,controls=Controls}=Port,
-    tr(
-      [td(Id),
-       td("ALIGN=right",Slot),
-       td(href_proc_port(Connected)),
-       td(href_proc_port(Links)),
-       td(Name),
-       td(href_proc_port(Monitors)),
-       td(Controls)]).
-
-ets_tables_table(EtsTable) ->
-    #ets_table{pid=Pid,slot=Slot,id=Id,name=Name,type=Type,
-	       buckets=Buckets,size=Size,memory=Memory} = EtsTable,
-    tr(
-      [td(href_proc_port(Pid)),
-       td(Slot),
-       td(Id),
-       td(Name),
-       td(Type),
-       td("ALIGN=right",Buckets),
-       td("ALIGN=right",Size),
-       td("ALIGN=right",Memory)]).
-
-timers_table(Timer) ->
-    #timer{pid=Pid,msg=Msg,time=Time}=Timer,
-    tr(
-      [td(href_proc_port(Pid)),
-       td(Msg),
-       td("ALIGN=right",Time)]).
-
-loaded_mods_table(#loaded_mod{mod=Mod,current_size=CS,old_size=OS}) ->
-    tr([td(href(["loaded_mod_details?mod=",http_uri:encode(Mod)],Mod)),
-	td("ALIGN=right",CS),
-	td("ALIGN=right",OS)]).
-
-funs_table(Fu) ->
-    #fu{module=Module,uniq=Uniq,index=Index,address=Address,
-	native_address=NativeAddress,refc=Refc}=Fu,
-    tr(
-      [td(Module),
-       td("ALIGN=right",Uniq),
-       td("ALIGN=right",Index),
-       td(Address),
-       td(NativeAddress),
-       td("ALIGN=right",Refc)]).
diff --git a/lib/observer/src/etop.erl b/lib/observer/src/etop.erl
index 2610060eae..96a18cf450 100644
--- a/lib/observer/src/etop.erl
+++ b/lib/observer/src/etop.erl
@@ -44,9 +44,6 @@ help() ->
       "  sort        runtime | reductions | memory | msg_q~n"
       "                         What information to sort by~n"
       "                         Default: runtime (reductions if tracing=off)~n"
-      "  output      graphical | text~n"
-      "                         How to present results~n"
-      "                         Default: graphical~n"
       "  tracing     on | off   etop uses the erlang trace facility, and thus~n"
       "                         no other tracing is possible on the node while~n"
       "                         etop is running, unless this option is set to~n"
@@ -317,7 +314,7 @@ handle_args([_| R], C) ->
 handle_args([], C) ->
     C.
 
-output(graphical) -> etop_gui;
+output(graphical) -> exit({deprecated, "Use observer instead"});
 output(text) -> etop_txt.
 
 
diff --git a/lib/observer/src/etop_defs.hrl b/lib/observer/src/etop_defs.hrl
index 664de61973..720fb50b5a 100644
--- a/lib/observer/src/etop_defs.hrl
+++ b/lib/observer/src/etop_defs.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
 %% 
 %% The 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,8 @@
 	"        procs~8w                        processes~8w    code     ~8w~n"
 	"        runq ~8w                        atom     ~8w    ets      ~8w~n").
 
--record(opts, {node=node(), port = 8415, accum = false, intv = 5000, lines = 10, 
+-record(opts, {node=node(), port = 8415, accum = false, intv = 5000, lines = 10,
 	       width = 700, height = 340, sort = runtime, tracing = on,
 	       %% Other state information
-	       out_mod=etop_gui, out_proc, server, host, tracer, store, 
+	       out_mod=etop_txt, out_proc, server, host, tracer, store,
 	       accum_tab, remote}).
diff --git a/lib/observer/src/etop_gui.erl b/lib/observer/src/etop_gui.erl
deleted file mode 100644
index 3971646abc..0000000000
--- a/lib/observer/src/etop_gui.erl
+++ /dev/null
@@ -1,374 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
-%% 
-%% The 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(etop_gui).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,create,4}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
-
--author('[email protected]').
-
--export([init/1,stop/1]).
--export([formatmfa/1,to_list/1]).% For etop_txt
-
--include("etop.hrl").
--include("etop_defs.hrl").
-
--import(etop, [loadinfo/1, meminfo/2, getopt/2]).
-
-%% Heights
--define(BarH, 28).      % height of menubar
--define(LabelH, 90).    % height of label with system info
--define(GridLineH, 21). % height of one line in the table (grid)
-
-%% Column numbers for grid - click to sort
--define(TimeCol, 3).
--define(RedsCol, 4).
--define(MemCol, 5).
--define(MsgQCol, 6).
-
-%% Font
--define(Normal, {screen,12}).
--define(Bold, {screen,bold,12}).
-
-
-%% -----------------------------------------------------------------------------
-stop(_) -> ok.
-
-init(Config) ->
-    S = gs:start(),
-    Width  = getopt(width, Config),
-    TotLines = getopt(lines,Config)+1,
-
-    %% Max number of processes shown in window at startup is 10
-    %% If less than 10 lines is specified, window size fits number of lines
-    WinH = if TotLines > 11 -> 11*?GridLineH + ?BarH + ?LabelH;
-	      true -> TotLines*?GridLineH + ?BarH + ?LabelH
-	   end,
-    Win    = gs:create(window, S, 
-		       [{title, "Erlang Top"},
-			{map, true}, %% While debugging
-			{configure, true},
-			{width, Width}, {height, WinH}]),
-    Bar  = gs:create(menubar, Win, []),
-        
-    FileButt    = gs:create(menubutton, Bar, [{label,{text, " File "}}]),
-    OptionsButt = gs:create(menubutton, Bar, [{label,{text, " Options "}}]),
-    File        = gs:create(menu, FileButt, []),
-    Options     = gs:create(menu, OptionsButt, []),
-    gse:named_menuitem(refresh, File,
-		       [{label,{text," Refresh "}}]),
-    gse:named_menuitem(dump, File,
-		       [{label,{text," Dump to file "}}]),
-    gse:named_menuitem(exit, File,
-		       [{label,{text," Exit "}}]),
-    
-    gse:named_menuitem(accum, Options,
-		       [{label,{text, " Accumulate "}}, 
-			{itemtype, check}]),
-    gse:named_menuitem(intv, Options,
-    		       [{label,{text, " Update Interval "}}]),
-    gse:named_menuitem(lines, Options,
-    		       [{label,{text, " Number of Lines "}}]),
-    Sort = gse:named_menuitem(sort, Options,
-			      [{label,{text, " Sort "}},
-			       {itemtype,cascade}]),
-    SortMenu = gse:create(menu, Sort, []),
-    gse:named_menuitem(runtime, SortMenu,
-    		       [{label,{text, " Time "}},
-			{itemtype,radio},{group,gr1}]),
-    gse:named_menuitem(memory, SortMenu,
-    		       [{label,{text, " Memory "}},
-			{itemtype,radio},{group,gr1}]),
-    gse:named_menuitem(reductions, SortMenu,
-    		       [{label,{text, " Reductions "}},
-			{itemtype,radio},{group,gr1}]),
-    gse:named_menuitem(msg_q, SortMenu,
-    		       [{label,{text, " Message Queue "}},
-			{itemtype,radio},{group,gr1}]),
-    
-    SysInfo = gs:create(label,Win,[{x, 0}, {y, ?BarH},{align,sw},
-				   {width, Width},{height,?LabelH}]),
-
-    {GridH,VScroll} = calc_grid_h(WinH,TotLines),
-    Grid = gse:grid(Win, 
-		    [{x, 0}, {y, ?BarH+?LabelH},
-		     {width, Width},
-		     {height, GridH},
-		     {hscroll, false},
-		     {vscroll, VScroll},
-		     {columnwidths, calc_column_w(Width)},
-		     {rows, {1, TotLines}},
-		     {font,?Normal}]),
-    
-    %% Header line
-    GL1  = gse:gridline(Grid, [{{text, 1}, "PID"},
-			       {{text, 2}, "Name or Initial Function"},
-			       {{text, ?TimeCol}, "Time(us)"},
-			       {{text, ?RedsCol}, "Reds"},
-			       {{text, ?MemCol}, "Memory"},
-			       {{text, ?MsgQCol}, "MsgQ"},
-			       {{text, 7}, "Current Function"},
-			       {bg, lightblue},
-			       {row, 1},
-			       {click, true}]),
-
-    config_sort(GL1,getopt(sort,Config)),
-    Info = do_update(Grid, SysInfo, Config),
-    
-    get_event(Info, Win, Grid, GL1, SysInfo, Config).
-
-calc_column_w(W) ->
-    %% W = [2x, 3x, 1x, 1x, 1x, 1x, 3x] = 12x
-    RW = W-9, % just to make nice small margins on each side of grid
-    X =  RW div 12,
-    [2*X, 3*X, X, X, X, X, 3*X + (RW - 12*X)].   
-
-config_sort(GL1,Sort) ->
-    gs:config(Sort,[{select,true}]),
-    lists:foreach(fun(S) -> 
-			  gs:config(GL1,[{{font,S},?Normal}])
-		  end,
-		  [?TimeCol,?MemCol,?RedsCol,?MsgQCol]),
-    case Sort of
-	runtime -> gs:config(GL1,{{font,?TimeCol},?Bold});
-	memory -> gs:config(GL1,{{font,?MemCol},?Bold});
-	reductions -> gs:config(GL1,{{font,?RedsCol},?Bold});
-	msg_q -> gs:config(GL1,{{font,?MsgQCol},?Bold})
-    end.
-
-config_lines(Win,Grid,TotLines) ->
-    OldGridH = gs:read(Grid,height),
-    NewLinesH = TotLines*?GridLineH,
-    if  NewLinesH =< OldGridH -> 
-	    gs:config(Win,[{height,NewLinesH+?BarH+?LabelH}]),
-	    gs:config(Grid,[{rows,{1,TotLines}},
-			    {height,NewLinesH},
-			    {vscroll,false}]);
-	true ->
-	    gs:config(Grid,[{rows,{1,TotLines}},{vscroll,right}])
-    end.
-
-calc_grid_h(WinH,TotLines) ->
-    LeftInWin = WinH - ?BarH - ?LabelH,
-    TotGrid = TotLines * ?GridLineH,
-    if LeftInWin >= TotGrid ->
-	    {TotGrid,false};
-       true ->
-	    {LeftInWin,right}
-    end.
-
-set_win_h(Win,OrigH,TotLines) ->
-    TotH = TotLines*?GridLineH + ?BarH + ?LabelH,
-    if TotH >= OrigH -> OrigH;
-       true -> gs:config(Win,[{height,TotH}]),
-	       TotH
-    end.
-
-get_event(Info, Win, Grid, GL1, SysInfo, Config) ->
-    receive 
-	{gs, Win, configure,[],[W,H,_,_]} ->
-	    TotLines = getopt(lines,Config)+1,
-	    %% Will not make window higher than total number of lines
-	    RealWinH = set_win_h(Win,H,TotLines),
-	    {GridH,VScroll} = calc_grid_h(RealWinH,TotLines),
-	    gs:config(Grid, [{width, W},
-			     {columnwidths, calc_column_w(W)},
-			     {height,GridH}, {vscroll,VScroll}]),
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);	
-	{gs, refresh, _, _, _} ->
-	    Info1 = do_update(Grid, SysInfo, Config),
-	    get_event(Info1, Win, Grid, GL1, SysInfo, Config);
-	{gs, dump, _, _, _} ->
-	    case pop(Win,dump) of
-		{ok,File} -> etop:dump(File);
-		{error,cancel} -> ok
-	    end,
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);
-	{gs, Win, destroy, _, _} ->
-	    normal;
-	{gs, exit, _, _, _} ->
-	    ok;
-	{gs, accum, _, _, _} ->
-	    Old = getopt(accum,Config),
-	    etop:config(accumulate,not Old),
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);	
-	{gs,intv,_,_,_} ->
-	    case pop(Win,interval) of
-		{ok,Intv} -> etop:config(interval,list_to_integer(Intv));
-		{error,cancel} -> ok
-	    end,
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);
-	{gs,lines,_,_,_} ->
-	    case pop(Win,lines) of
-		{ok,Lines} -> etop:config(lines,list_to_integer(Lines));
-		{error,cancel} -> ok
-	    end,
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);
-	{gs,Sort,_,_,_} when Sort=:=runtime; 
-			     Sort=:=memory; 
-			     Sort=:=reductions; 
-			     Sort=:=msg_q ->
-	    etop:config(sort,Sort),
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);	
-	{gs,GL1,click,_,[Col,1,_]} -> 
-	    case Col of 
-		?TimeCol -> etop:config(sort, runtime); 
-		?MemCol -> etop:config(sort, memory); 
-		?RedsCol -> etop:config(sort, reductions); 
-		?MsgQCol -> etop:config(sort, msg_q);
-		_other -> ignore
-	    end,
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);	
-	{config,{Key,Value},Config1} ->
-	    case Key of
-		lines -> config_lines(Win,Grid,Value+1);
-		sort -> config_sort(GL1,Value);
-		accumulate -> gs:config(accum,[{select,Value}]);
-		_ -> ok
-	    end,
-	    Info1 = do_update(Grid, SysInfo, Config1),
-	    get_event(Info1, Win, Grid, GL1, SysInfo, Config1);
-	{dump,Fd} -> 
-	    etop_txt:do_update(Fd,Info,Config),
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config);
-	Msg ->
-	    io:format("~p got unexpected msg ~p~n", [?MODULE, Msg]),
-	    get_event(Info, Win, Grid, GL1, SysInfo, Config)
-    after getopt(intv,Config) ->
-	    Info1 = do_update(Grid, SysInfo, Config),
-	    get_event(Info1, Win, Grid, GL1, SysInfo, Config)
-    end.
-
-do_update(Grid, SysInfo, Config) ->
-    Info = etop:update(Config),
-    Lines = makegridlines(Info#etop_info.procinfo, Grid, 2),
-    clear_lines(Lines, getopt(lines,Config) + 1, Grid),
-    makesysinfo(getopt(node,Config),Info,SysInfo),
-    Info.
-
-%clear_lines(From, To, _Grid) when From > To -> ok;
-clear_lines(From, To, Grid) ->
-    case gs:read(Grid, {obj_at_row, From}) of
-	undefined ->
-	    ok;
-	GridLine ->
-	    gs:destroy(GridLine),
-	    clear_lines(From + 1, To, Grid)
-    end.
-    
-formatmfa({M, F, A}) ->
-    io_lib:format("~w:~w/~w",[M, F, A]);
-formatmfa(Other) ->
-    %% E.g. when running hipe - the current_function for some
-    %% processes will be 'undefined'
-    io_lib:format("~w",[Other]).
-
-
-makegridlines([#etop_proc_info{pid=Pid,
-			       mem=Mem,
-			       reds=Reds,
-			       name=Name,
-			       runtime=Time,
-			       cf=MFA,
-			       mq=MQ}
-	       |T], Grid, Count) ->
-    update_gl(Grid, Count, [{{text, 1}, pid_to_list(Pid)},
-			    {{text, 2}, to_list(Name)},
-			    {{text, ?TimeCol}, 
-			     if is_integer(Time)->integer_to_list(Time);
-				true -> Time
-			     end},
-			    {{text, ?RedsCol}, integer_to_list(Reds)},
-			    {{text, ?MemCol}, integer_to_list(Mem)},
-			    {{text, ?MsgQCol}, integer_to_list(MQ)},
-			    {{text, 7}, formatmfa(MFA)},
-			    {row, Count}, {click, false}]), 
-     makegridlines(T, Grid, Count + 1);
-makegridlines([],_Grid,Count) ->
-    Count.
-
-update_gl(Grid, Row, GL) ->
-    case gs:read(Grid, {obj_at_row, Row}) of
-	undefined ->
-	    gse:gridline(Grid,[{row, Row}|GL]);
-	GridLine ->
-	    gs:config(GridLine,GL)
-    end.
-
-to_list(Name) when is_atom(Name) -> atom_to_list(Name);
-to_list({_M,_F,_A}=MFA) -> formatmfa(MFA).
-
-
-makesysinfo(Node,Info,SysInfo) ->
-    {Cpu,NProcs,RQ,Clock} = loadinfo(Info),
-    case Info#etop_info.memi of
-	undefined ->
-	    Str = "No memory information is available.";
-	Memi ->
-	    [Tot,Procs,Atom,Bin,Code,Ets] = 
-		meminfo(Memi, [total,processes,atom,binary,code,ets]),
-	    Str = io_lib:fwrite(?SYSFORM,
-				[Node,Clock,
-				 Cpu,Tot,Bin,
-				 NProcs,Procs,Code,
-				 RQ,Atom,Ets])
-    end,
-    gs:config(SysInfo,[{label,{text,Str}},{font,?Normal}]).
-
-
-pop(Win,Key) ->
-    Pop = gs:create(window,Win,[{title,"Config"},
-			     {width,160},{height,100}]),
-    gs:create(label,Pop,[{label,{text,txt(Key)}},
-			 {width,160}]),
-    gs:create(entry,entry,Pop,[{x,10},{y,30},{width,130},
-			       {keypress,true}]),
-    gs:create(button,ok,Pop,[{width,45},{y,60},{x,10},
-			     {label,{text,"Ok"}}]),
-    gs:create(button,cancel,Pop,[{width,60},{y,60},{x,80},
-				 {label,{text,"Cancel"}}]),
-    gs:config(Pop,{map,true}),
-    pop_loop(Pop).
-
-pop_loop(Pop) ->
-    receive
-	{gs,entry,keypress,_,['Return'|_]} ->
-	    Str = gs:read(entry,text),
-	    gs:destroy(Pop),
-	    {ok,Str};
-	{gs,entry,keypress,_,_} -> % all other keypresses
-	    pop_loop(Pop);
-	{gs,ok,click,_,_} ->
-	    Str = gs:read(entry,text),
-	    gs:destroy(Pop),
-	    {ok,Str};
-	{gs,cancel,click,_,_} ->
-	    gs:destroy(Pop),
-	    {error,cancel};
-	X ->
-	    io:format("Got X=~w~n",[X]),
-	    pop_loop(Pop)
-    end.
-
-txt(interval) -> "Enter new interval:";
-txt(lines) -> "Enter number of lines:";
-txt(dump) -> "Enter file name:".
diff --git a/lib/observer/src/etop_tr.erl b/lib/observer/src/etop_tr.erl
index dd326fe639..e6c69e4e1e 100644
--- a/lib/observer/src/etop_tr.erl
+++ b/lib/observer/src/etop_tr.erl
@@ -59,7 +59,7 @@ reader(Config) ->
     Port = getopt(port, Config),    
     
     {ok, Sock} = gen_tcp:connect(Host, Port, [{active, false}]),
-    spawn_link(fun() -> reader_init(Sock,getopt(store,Config),nopid) end).
+    spawn_link(fun() -> reader_init(Sock,getopt(store,Config),[]) end).
 
 
 %%%%%%%%%%%%%%   Socket reader %%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -73,24 +73,30 @@ reader(Sock, Store, Last) ->
     New = handle_data(Last, Data, Store),
     reader(Sock, Store, New).
 
-handle_data(_, {_, Pid, in, _, Time}, _) ->
-    {Pid,Time};
-handle_data({Pid,Time1}, {_, Pid, out, _, Time2}, Store) ->
-    Elapsed = elapsed(Time1, Time2),
-    case ets:member(Store,Pid) of
-	true -> ets:update_counter(Store, Pid, Elapsed);
-	false -> ets:insert(Store,{Pid,Elapsed})
-    end,
-    nopid;
+handle_data(Last, {_, Pid, in, _, Time}, _) ->
+    [{Pid,Time}|Last];
+handle_data([], {_, _, out, _, _}, _Store) ->
+    %% ignore - there was probably just a 'drop'
+    [];
+handle_data(Last, {_, Pid, out, _, Time2} = G, Store) ->
+    case lists:keytake(Pid, 1, Last) of
+         {_, {_, Time1}, New} ->
+             Elapsed = elapsed(Time1, Time2),
+             case ets:member(Store,Pid) of
+                  true -> ets:update_counter(Store, Pid, Elapsed);
+                  false -> ets:insert(Store,{Pid,Elapsed})
+             end,
+             New;
+         false ->
+             io:format("Erlang top got garbage ~p~n", [G]),
+             Last
+    end;
 handle_data(_W, {drop, D}, _) ->  %% Error case we are missing data here!
     io:format("Erlang top dropped data ~p~n", [D]),
-    nopid;
-handle_data(nopid, {_, _, out, _, _}, _Store) ->
-    %% ignore - there was probably just a 'drop'
-    nopid;
-handle_data(_, G, _) ->
+    [];
+handle_data(Last, G, _) ->
     io:format("Erlang top got garbage ~p~n", [G]),
-    nopid.
+    Last.
 
 elapsed({Me1, S1, Mi1}, {Me2, S2, Mi2}) ->
     Me = (Me2 - Me1) * 1000000,
diff --git a/lib/observer/src/etop_txt.erl b/lib/observer/src/etop_txt.erl
index d0612f15b4..f048ff17ca 100644
--- a/lib/observer/src/etop_txt.erl
+++ b/lib/observer/src/etop_txt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
 %% 
 %% The 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,6 @@
 -include("etop_defs.hrl").
 
 -import(etop,[loadinfo/1,meminfo/2]).
--import(etop_gui,[formatmfa/1,to_list/1]).
 
 -define(PROCFORM,"~-15w~-20s~8w~8w~8w~8w ~-20s~n").
 
@@ -99,3 +98,13 @@ writepinfo(Fd,[#etop_proc_info{pid=Pid,
 writepinfo(_Fd,[]) ->
     ok.
 
+
+formatmfa({M, F, A}) ->
+    io_lib:format("~w:~w/~w",[M, F, A]);
+formatmfa(Other) ->
+    %% E.g. when running hipe - the current_function for some
+    %% processes will be 'undefined'
+    io_lib:format("~w",[Other]).
+
+to_list(Name) when is_atom(Name) -> atom_to_list(Name);
+to_list({_M,_F,_A}=MFA) -> formatmfa(MFA).
diff --git a/lib/observer/src/observer.app.src b/lib/observer/src/observer.app.src
index e881cb3c97..f14f0ee849 100644
--- a/lib/observer/src/observer.app.src
+++ b/lib/observer/src/observer.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
 %% 
 %% The 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,13 +20,32 @@
    [{description, "OBSERVER version 1"},
     {vsn, "%VSN%"},
     {modules, [crashdump_viewer,
-	       crashdump_viewer_html,
+	       cdv_atom_cb,
+	       cdv_bin_cb,
+	       cdv_detail_wx,
+	       cdv_dist_cb,
+	       cdv_ets_cb,
+	       cdv_fun_cb,
+	       cdv_gen_cb,
+	       cdv_html_wx,
+	       cdv_info_wx,
+	       cdv_int_tab_cb,
+	       cdv_mem_cb,
+	       cdv_mod_cb,
+	       cdv_multi_wx,
+	       cdv_port_cb,
+	       cdv_proc_cb,
+	       cdv_table_wx,
+	       cdv_term_cb,
+	       cdv_timer_cb,
+	       cdv_virtual_list_wx,
+	       cdv_wx,
 	       etop,
-	       etop_gui,
 	       etop_tr,
 	       etop_txt,
 	       observer,
 	       observer_app_wx,
+	       observer_html_lib,
 	       observer_lib,
 	       observer_perf_wx,
 	       observer_pro_wx,
diff --git a/lib/observer/src/observer.appup.src b/lib/observer/src/observer.appup.src
index 1d5a0d93f5..9fde365ff3 100644
--- a/lib/observer/src/observer.appup.src
+++ b/lib/observer/src/observer.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %% 
 %% The 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,5 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-{"%VSN%",[],[]}.
+{"%VSN%",
+ [{<<".*">>,[{restart_application, observer}]}],
+ [{<<".*">>,[{restart_application, observer}]}]
+}.
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl
index 72bafcc5e0..a8ace10275 100644
--- a/lib/observer/src/observer_app_wx.erl
+++ b/lib/observer/src/observer_app_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The 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,7 +81,7 @@ init([Notebook, Parent]) ->
 				  ]),
     Main = wxBoxSizer:new(?wxHORIZONTAL),
     Splitter = wxSplitterWindow:new(Panel, [{size, wxWindow:getClientSize(Panel)},
-					    {style, ?wxSP_LIVE_UPDATE},
+					    {style, ?SASH_STYLE},
 					    {id, 2}
 					   ]),
     Apps = wxListBox:new(Splitter, 3, []),
@@ -178,11 +178,16 @@ handle_event(#wx{id=Id, event=_Sz=#wxSize{size=Size}},
     {noreply, State};
 
 handle_event(#wx{event=#wxMouse{type=Type, x=X0, y=Y0}},
-	     S0=#state{app=#app{ptree=Tree}, app_w=AppWin}) ->
-    {X,Y} = wxScrolledWindow:calcUnscrolledPosition(AppWin, X0, Y0),
-    Hit   = locate_node(X,Y, [Tree]),
-    State = handle_mouse_click(Hit, Type, S0),
-    {noreply, State};
+	     S0=#state{app=App, app_w=AppWin}) ->
+    case App of
+	#app{ptree=Tree} ->
+	    {X,Y} = wxScrolledWindow:calcUnscrolledPosition(AppWin, X0, Y0),
+	    Hit   = locate_node(X,Y, [Tree]),
+	    State = handle_mouse_click(Hit, Type, S0),
+	    {noreply, State};
+	_ ->
+	    {noreply, S0}
+    end;
 
 handle_event(#wx{event=#wxCommand{type=command_menu_selected}},
 	     State = #state{sel=undefined}) ->
@@ -190,8 +195,8 @@ handle_event(#wx{event=#wxCommand{type=command_menu_selected}},
     {noreply, State};
 
 handle_event(#wx{id=?ID_PROC_INFO, event=#wxCommand{type=command_menu_selected}},
-	     State = #state{panel=Panel, sel={#box{s1=#str{pid=Pid}},_}}) ->
-    observer_procinfo:start(Pid, Panel, self()),
+	     State = #state{sel={#box{s1=#str{pid=Pid}},_}}) ->
+    observer ! {open_link, Pid},
     {noreply, State};
 
 handle_event(#wx{id=?ID_PROC_MSG, event=#wxCommand{type=command_menu_selected}},
@@ -337,8 +342,8 @@ code_change(_, _, State) ->
 handle_mouse_click(Node = {#box{s1=#str{pid=Pid}},_}, Type,
 		   State=#state{app_w=AppWin,panel=Panel}) ->
     case Type of
-	left_dclick -> observer_procinfo:start(Pid, Panel, self());
-	right_down ->    popup_menu(Panel);
+	left_dclick -> observer ! {open_link, Pid};
+	right_down  -> popup_menu(Panel);
 	_ ->           ok
     end,
     observer_wx:set_status(io_lib:format("Pid: ~p", [Pid])),
diff --git a/lib/observer/src/observer_defs.hrl b/lib/observer/src/observer_defs.hrl
index 586e7bbff9..3adc358b95 100644
--- a/lib/observer/src/observer_defs.hrl
+++ b/lib/observer/src/observer_defs.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The 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,13 +35,16 @@
 	 check = false
 	}).
 
--record(attrs, {even, odd, deleted, changed, searched}).
+-record(attrs, {even, odd, searched, deleted, changed_odd, changed_even, new_odd, new_even}).
 -define(EVEN(Row), ((Row rem 2) =:= 0)).
 -define(BG_EVEN,    {230,230,250}).
 -define(BG_ODD,     {255,255,255}).
 -define(BG_DELETED, {100,100,100}).
--define(FG_DELETED, {240,30,30}).
+-define(FG_DELETED, {230,230,230}).
 -define(BG_SEARCHED,{235,215,90}).
--define(BG_CHANGED, {230,230,250}).
+-define(BG_CHANGED, {184,207,184}).
+-define(BG_NEW,     {123,168,123}).
 
 -define(LCTRL_WDECR, 4). %% Remove some pixels in column width to avoid creating unnecessary scrollbar
+
+-define(SASH_STYLE, ?wxSP_LIVE_UPDATE bor ?wxSP_NOBORDER bor ?wxSP_3DSASH).
diff --git a/lib/observer/src/observer_html_lib.erl b/lib/observer/src/observer_html_lib.erl
new file mode 100644
index 0000000000..c279218707
--- /dev/null
+++ b/lib/observer/src/observer_html_lib.erl
@@ -0,0 +1,407 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
+%% 
+%% The 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(observer_html_lib).
+
+%% 
+%% This module implements the HTML generation for the crashdump
+%% viewer. No logic or states are kept by this module.
+%%
+
+-export([plain_page/1,
+	 expandable_term/3,
+	 warning/1]).
+
+-include("crashdump_viewer.hrl").
+-include("observer_defs.hrl").
+
+%%%-----------------------------------------------------------------
+%%% Display the given information as is, no heading
+%%% Empty body if no info exists.
+warning(Info) ->
+    header(body(warning_body(Info))).
+
+warning_body(Info) ->
+    [warn(Info)].
+
+%%%-----------------------------------------------------------------
+%%% Display the given information as is, no heading
+%%% Empty body if no info exists.
+plain_page(Info) ->
+    header(body(plain_body(Info))).
+
+plain_body(Info) ->
+    [pre(href_proc_port(lists:flatten(Info)))].
+
+%%%-----------------------------------------------------------------
+%%% Expanded memory
+expandable_term(Heading,Expanded,Tab) ->
+    header(Heading,body(expandable_term_body(Heading,Expanded,Tab))).
+    
+expandable_term_body(Heading,[],_Tab) ->
+    [case Heading of
+	 "MsgQueue" -> "No messages were found";
+	 "Message Queue" -> "No messages were found";
+	 "StackDump"  -> "No stack dump was found";
+	 "Dictionary" -> "No dictionary was found";
+	 "ProcState"  -> "Information could not be retrieved,"
+			     " system messages may not be handled by this process."
+     end];
+expandable_term_body(Heading,Expanded,Tab) ->
+    Attr = "BORDER=0 CELLPADDING=0 CELLSPACING=1 WIDTH=100%",
+    [case Heading of
+	 "MsgQueue" ->
+	     table(Attr,
+		   [tr(
+		      [th("WIDTH=70%","Message"),
+		       th("WIDTH=30%","SeqTraceToken")]) |
+		    element(1, lists:mapfoldl(fun(Msg, Even) ->
+						      {msgq_table(Tab, Msg, Even),
+						       not Even}
+					      end,
+					      true, Expanded))]);
+	 "Message Queue" ->
+	     table(Attr,
+		   [tr(
+		      [th("WIDTH=10%","Id"),
+		       th("WIDTH=90%","Message")]) |
+		    element(1, lists:mapfoldl(fun(Msg, {Even,N}) ->
+						      {msgq_table(Tab, Msg, N, Even),
+						       {not Even, N+1}}
+					      end,
+					      {true,1}, Expanded))]);
+	 "StackDump" ->
+	     table(Attr,
+		   [tr(
+		      [th("WIDTH=20%","Label"),
+		       th("WIDTH=80%","Term")]) |
+		    element(1, lists:mapfoldl(fun(Entry, Even) ->
+						      {stackdump_table(Tab, Entry, Even),
+						       not Even}
+					      end, true, Expanded))]);
+	 "ProcState" ->
+	     table(Attr,
+		   [tr(
+		      [th("WIDTH=20%","Label"),
+		       th("WIDTH=80%","Information")]) |
+		    element(1, lists:mapfoldl(fun(Entry, Even) ->
+						      {proc_state(Tab, Entry,Even),
+						       not Even}
+					      end, true, Expanded))]);
+	 _ ->
+	     table(Attr,
+		   [tr(
+		      [th("WIDTH=30%","Key"),
+		       th("WIDTH=70%","Value")]) |
+		    element(1, lists:mapfoldl(fun(Entry, Even) ->
+						      {dict_table(Tab, Entry,Even),
+						       not Even}
+					      end, true, Expanded))])
+     end].
+
+msgq_table(Tab,{Msg0,Token0}, Even) ->
+    Token = case Token0 of
+		[] -> "";
+		_ -> io_lib:fwrite("~w",[Token0])
+	    end,
+    Msg = all_or_expand(Tab,Msg0),
+    tr(color(Even),[td(pre(Msg)), td(Token)]).
+
+msgq_table(Tab,Msg0, Id, Even) ->
+    Msg = all_or_expand(Tab,Msg0),
+    tr(color(Even),[td(integer_to_list(Id)), td(pre(Msg))]).
+
+stackdump_table(Tab,{Label0,Term0},Even) ->
+    Label = io_lib:format("~w",[Label0]),
+    Term = all_or_expand(Tab,Term0),
+    tr(color(Even), [td("VALIGN=center",pre(Label)), td(pre(Term))]).
+
+dict_table(Tab,{Key0,Value0}, Even) ->
+    Key = all_or_expand(Tab,Key0),
+    Value = all_or_expand(Tab,Value0),
+    tr(color(Even), [td("VALIGN=center",pre(Key)), td(pre(Value))]).
+
+proc_state(Tab,{Key0,Value0}, Even) ->
+    Key = lists:flatten(io_lib:format("~s",[Key0])),
+    Value = all_or_expand(Tab,Value0),
+    tr(color(Even), [td("VALIGN=center",Key), td(pre(Value))]).
+
+all_or_expand(Tab,Term) ->
+    Preview = io_lib:format("~P",[Term,8]),
+    Check = io_lib:format("~P",[Term,100]),
+    Exp = Preview=/=Check,
+    all_or_expand(Tab,Term,Preview,Exp).
+all_or_expand(_Tab,Term,Str,false)
+  when not is_binary(Term) ->
+    href_proc_port(lists:flatten(Str));
+all_or_expand(Tab,Term,Preview,true)
+  when not is_binary(Term) ->
+    Key = {Key1,Key2,Key3} = now(),
+    ets:insert(Tab,{Key,Term}),
+    [href_proc_port(lists:flatten(Preview), false), $\n,
+     href("TARGET=\"expanded\"",
+	  ["#Term?key1="++integer_to_list(Key1)++
+	       "&key2="++integer_to_list(Key2)++
+	       "&key3="++integer_to_list(Key3)],
+	  "Click to expand above term")];
+all_or_expand(Tab,Bin,_PreviewStr,_Expand)
+  when is_binary(Bin) ->
+    Size = byte_size(Bin),
+    PrevSize = min(Size, 10) * 8,
+    <<Preview:PrevSize, _/binary>> = Bin,
+    Hash = erlang:phash2(Bin),
+    Key = {Preview, Size, Hash},
+    ets:insert(Tab,{Key,Bin}),
+    Term = io_lib:format("~p", [['#OBSBin',Preview,Size,Hash]]),
+    href_proc_port(lists:flatten(Term), true).
+
+color(true) -> io_lib:format("BGCOLOR=\"#~2.16.0B~2.16.0B~2.16.0B\"", tuple_to_list(?BG_EVEN));
+color(false) -> io_lib:format("BGCOLOR=\"#~2.16.0B~2.16.0B~2.16.0B\"", tuple_to_list(?BG_ODD)).
+
+%%%-----------------------------------------------------------------
+%%% Internal library
+start_html() ->
+    "<HTML>\n".
+stop_html() ->
+    "</HTML>".
+start_html_body() ->
+    "<BODY BGCOLOR=\"#FFFFFF\">\n".
+stop_html_body() ->
+    "</BODY>\n".
+
+header(Body) ->
+    header("","",Body).
+header(Title,Body) ->
+    header(Title,"",Body).
+header(Title,JavaScript,Body) ->
+    [%only_http_header(),
+     html_header(Title,JavaScript,Body)].
+
+html_header(Title,JavaScript,Body) ->    
+    [start_html(),
+     only_html_header(Title,JavaScript),
+     Body,
+     stop_html()].
+
+only_html_header(Title,JavaScript) ->
+    ["<HEAD>\n",
+     "<TITLE>", Title,  "</TITLE>\n",
+     JavaScript,
+     "</HEAD>\n"].
+
+body(Text) ->
+    [start_html_body(),
+     Text,
+     stop_html_body()].
+
+start_table(Args) ->
+    ["<TABLE ", Args, ">\n"].
+stop_table() ->
+    "</TABLE>\n".
+
+table(Args,Text) ->
+    [start_table(Args), Text, stop_table()].
+tr(Text) ->
+    ["<TR>\n", Text, "\n</TR>\n"].
+tr(Args,Text) ->
+    ["<TR ", Args, ">\n", Text, "\n</TR>\n"].
+th(Args,Text) ->
+    ["<TH ", Args, ">\n", Text, "\n</TH>\n"].
+td(Text) ->
+    ["<TD>", Text, "</TD>"].
+td(Args,Text) ->
+    ["<TD ", Args, ">", Text, "</TD>"].
+
+start_pre() ->
+    "<PRE>".
+stop_pre() ->
+    "</PRE>".
+pre(Text) ->
+    [start_pre(),Text,stop_pre()].
+href(Link,Text) ->
+    ["<A HREF=\"",Link,"\">",Text,"</A>"].
+href(Args,Link,Text) ->
+    ["<A HREF=\"",Link,"\" ",Args,">",Text,"</A>"].
+font(Args,Text) ->
+    ["<FONT ",Args,">\n",Text,"\n</FONT>\n"].
+p(Text) ->
+    ["<P>",Text,"</P>\n"].
+br() ->
+    "<BR>\n".
+
+
+%% In all the following, "<" is changed to "&lt;" and ">" is changed to "&gt;"
+href_proc_port(Text) ->
+    href_proc_port(Text,true).
+href_proc_port(Text,LinkToBin) ->
+    href_proc_port(Text,[],LinkToBin).
+href_proc_port("#Ref<"++T,Acc,LTB) ->
+    %% No links to refs
+    href_proc_port(T,["#Ref&lt;"|Acc],LTB);
+href_proc_port("#Fun<"++T,Acc,LTB) ->
+    %% No links to funs
+    href_proc_port(T,["#Fun&lt;"|Acc],LTB);
+href_proc_port("#Port<"++T,Acc,LTB) ->
+    {Port0,Rest} = split($>,T),
+    Port = "#Port&lt;"++Port0 ++ "&gt;",
+    href_proc_port(Rest,[href(Port,Port)|Acc],LTB);
+href_proc_port("<<"++T,Acc,LTB) ->
+    %% No links to binaries
+    href_proc_port(T,["&lt;&lt;"|Acc],LTB);
+href_proc_port("<"++([C|_]=T),Acc,LTB) when $0 =< C, C =< $9 ->
+    %% Pid
+    {Pid0,Rest} = split($>,T),
+    Pid = "&lt;" ++ Pid0 ++ "&gt",
+    href_proc_port(Rest,[href(Pid,Pid)|Acc],LTB);
+href_proc_port("['#CDVBin'"++T,Acc,LTB) ->
+    %% Binary written by crashdump_viewer:parse_heap_term(...)
+    href_proc_bin(cdv, T, Acc, LTB);
+href_proc_port("['#OBSBin'"++T,Acc,LTB) ->
+    %% Binary written by crashdump_viewer:parse_heap_term(...)
+    href_proc_bin(obs, T, Acc, LTB);
+href_proc_port("['#CDVPort'"++T,Acc,LTB) ->
+    %% Port written by crashdump_viewer:parse_term(...)
+    {Port0,Rest} = split($],T),
+    PortStr=
+	case string:tokens(Port0,",.|") of
+	    [X,Y] ->
+		Port = "#Port&lt;"++X++"."++Y++"&gt;",
+		href(Port,Port);
+	Ns ->
+		"#Port&lt;" ++ string:join(Ns,".") ++"...&gt;"
+    end,
+    href_proc_port(Rest,[PortStr|Acc],LTB);
+href_proc_port("['#CDVPid'"++T,Acc,LTB) ->
+    %% Pid written by crashdump_viewer:parse_term(...)
+    {Pid0,Rest} = split($],T),
+    PidStr =
+	case string:tokens(Pid0,",.|") of
+	    [X,Y,Z] ->
+		Pid = "&lt;"++X++"."++Y++"."++Z++"&gt;",
+		href(Pid,Pid);
+	    Ns ->
+		"&lt;" ++ string:join(Ns,".") ++ "...&gt;"
+	end,
+    href_proc_port(Rest,[PidStr|Acc],LTB);
+href_proc_port("'#CDVIncompleteHeap'"++T,Acc,LTB)->
+    %% The heap is incomplete! Written by crashdump_viewer:deref_pts(...)
+    IH = lists:reverse(
+	   lists:flatten(
+	     "<FONT COLOR=\"#FF0000\">...(Incomplete Heap)</FONT>")),
+    href_proc_port(T,IH++Acc,LTB);
+href_proc_port("'#CDVTruncatedBinary'"++T,Acc,LTB)->
+    %% A binary which is truncated! Written by 
+    %% crashdump_viewer:parse_heap_term(...)
+    IH = lists:reverse(
+	   lists:flatten(
+	     "<FONT COLOR=\"#FF0000\">&lt;&lt;...(Truncated Binary)&gt;&gt;"
+	     "</FONT>")),
+    href_proc_port(T,IH++Acc,LTB);
+href_proc_port("'#CDVNonexistingBinary'"++T,Acc,LTB)->
+    %% A binary which could not be found in the dump! Written by 
+    %% crashdump_viewer:parse_heap_term(...)
+    IH = lists:reverse(
+	   lists:flatten(
+	     "<FONT COLOR=\"#FF0000\">&lt;&lt;...(Nonexisting Binary)&gt;&gt;"
+	     "</FONT>")),
+    href_proc_port(T,IH++Acc,LTB);
+href_proc_port("<"++T,Acc,LTB) ->
+    href_proc_port(T,["&lt;"|Acc],LTB);
+href_proc_port(">"++T,Acc,LTB) ->
+    href_proc_port(T,["&gt;"|Acc],LTB);
+href_proc_port([H|T],Acc,LTB) ->
+    href_proc_port(T,[H|Acc],LTB);
+href_proc_port([],Acc,_) ->
+    lists:reverse(Acc).
+
+href_proc_bin(From, T, Acc, LTB) ->
+    {OffsetSizePos,Rest} = split($],T),
+    BinStr =
+	case string:tokens(OffsetSizePos,",.| \n") of
+	    [Offset,SizeStr,Pos] when From =:= cdv ->
+		Id = {list_to_integer(Offset),10,list_to_integer(Pos)},
+		{ok,PreviewBin} = crashdump_viewer:expand_binary(Id),
+		PreviewStr = preview_string(list_to_integer(SizeStr), PreviewBin),
+		if LTB ->
+			href("TARGET=\"expanded\"",
+			     ["#Binary?offset="++Offset++
+				  "&size="++SizeStr++
+				  "&pos="++Pos],
+			     PreviewStr);
+		   true ->
+			PreviewStr
+		end;
+	    [Preview,SizeStr,Md5] when From =:= obs ->
+		Size = list_to_integer(SizeStr),
+		PrevSize =  min(Size, 10) * 8,
+		PreviewStr = preview_string(Size,
+					    <<(list_to_integer(Preview)):PrevSize>>),
+		if LTB ->
+			href("TARGET=\"expanded\"",
+			     ["#OBSBinary?key1="++Preview++
+				  "&key2="++SizeStr++
+				  "&key3="++Md5],
+			     PreviewStr);
+		   true ->
+			PreviewStr
+		end;
+	    _ ->
+		"&lt;&lt; ... &gt;&gt;"
+	end,
+    href_proc_port(Rest,[BinStr|Acc],LTB).
+
+preview_string(Size, PreviewBin) when Size > 10 ->
+    ["&lt;&lt;",
+     remove_lgt(io_lib:format("~p",[PreviewBin])),
+     "...(",
+     observer_lib:to_str({bytes,Size}),
+     ")",
+     "&gt;&gt"];
+preview_string(_, PreviewBin) ->
+    ["&lt;&lt;",
+     remove_lgt(io_lib:format("~p",[PreviewBin])),
+     "&gt;&gt"].
+
+remove_lgt(Deep) ->
+    remove_lgt_1(lists:flatten(Deep)).
+
+remove_lgt_1([$<,$<|Rest]) ->
+    [$>,$>|BinStr] = lists:reverse(Rest),
+    replace_lgt(lists:reverse(BinStr)).
+
+replace_lgt([$<|R]) ->
+    ["&lt;"|replace_lgt(R)];
+replace_lgt([$>|R]) ->
+    ["&gt;"|replace_lgt(R)];
+replace_lgt([L=[_|_]|R]) ->
+    [replace_lgt(L)|replace_lgt(R)];
+replace_lgt([A|R]) ->
+    [A|replace_lgt(R)];
+replace_lgt([]) -> [].
+
+split(Char,Str) ->
+    split(Char,Str,[]).
+split(Char,[Char|Str],Acc) -> % match Char
+    {lists:reverse(Acc),Str};
+split(Char,[H|T],Acc) ->
+    split(Char,T,[H|Acc]).
+
+warn([]) ->
+    [];
+warn(Warning) ->
+    font("COLOR=\"#FF0000\"",p([Warning,br(),br()])).
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index f7712cf3da..cedaf7d2b8 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
 %%
 %% The 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,17 +19,26 @@
 -module(observer_lib).
 
 -export([get_wx_parent/1,
-	 display_info_dialog/1, user_term/3, user_term_multiline/3,
+	 display_info_dialog/1, display_yes_no_dialog/1,
+	 display_progress_dialog/2, destroy_progress_dialog/0,
+	 wait_for_progress/0, report_progress/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,
 	 create_attrs/0,
-	 set_listctrl_col_size/2
+	 set_listctrl_col_size/2,
+	 create_status_bar/1,
+	 html_window/1, html_window/2
 	]).
 
 -include_lib("wx/include/wx.hrl").
 -include("observer_defs.hrl").
 
+-define(SINGLE_LINE_STYLE, ?wxBORDER_NONE bor ?wxTE_READONLY bor ?wxTE_RICH2).
+-define(MULTI_LINE_STYLE, ?SINGLE_LINE_STYLE bor ?wxTE_MULTILINE).
+
+
 get_wx_parent(Window) ->
     Parent = wxWindow:getParent(Window),
     case wx:is_null(Parent) of
@@ -96,11 +105,19 @@ setup_timer(Bool, {Timer, Old}) ->
     setup_timer(Bool, {false, Old}).
 
 display_info_dialog(Str) ->
-    Dlg = wxMessageDialog:new(wx:null(), Str),
+    display_info_dialog("",Str).
+display_info_dialog(Title,Str) ->
+    Dlg = wxMessageDialog:new(wx:null(), Str, [{caption,Title}]),
     wxMessageDialog:showModal(Dlg),
     wxMessageDialog:destroy(Dlg),
     ok.
 
+display_yes_no_dialog(Str) ->
+    Dlg = wxMessageDialog:new(wx:null(), Str, [{style,?wxYES_NO}]),
+    R = wxMessageDialog:showModal(Dlg),
+    wxMessageDialog:destroy(Dlg),
+    R.
+
 %% display_info(Parent, [{Title, [{Label, Info}]}]) -> {Panel, Sizer, InfoFieldsToUpdate}
 display_info(Frame, Info) ->
     Panel = wxPanel:new(Frame),
@@ -108,24 +125,50 @@ display_info(Frame, Info) ->
     Sizer = wxBoxSizer:new(?wxVERTICAL),
     wxSizer:addSpacer(Sizer, 5),
     Add = fun(BoxInfo) ->
-		  {Box, InfoFs} = create_box(Panel, BoxInfo),
-		  wxSizer:add(Sizer, Box, [{flag, ?wxEXPAND bor ?wxALL},
-					   {border, 5}]),
-		  wxSizer:addSpacer(Sizer, 5),
-		  InfoFs
+		  case create_box(Panel, BoxInfo) of
+		      {Box, InfoFs} ->
+			  wxSizer:add(Sizer, Box, [{flag, ?wxEXPAND bor ?wxALL},
+						   {border, 5}]),
+			  wxSizer:addSpacer(Sizer, 5),
+			  InfoFs;
+		      undefined ->
+			  []
+		  end
 	  end,
     InfoFs = [Add(I) || I <- Info],
     wxWindow:setSizerAndFit(Panel, Sizer),
     {Panel, Sizer, InfoFs}.
 
+fill_info([{dynamic, Key}|Rest], Data)
+  when is_atom(Key); is_function(Key) ->
+    %% Special case used by crashdump_viewer when the value decides
+    %% which header to use
+    case get_value(Key, Data) of
+	undefined -> [undefined | fill_info(Rest, Data)];
+	{Str,Value} -> [{Str, Value} | fill_info(Rest, Data)]
+    end;
 fill_info([{Str, Key}|Rest], Data) when is_atom(Key); is_function(Key) ->
-    [{Str, get_value(Key, Data)} | fill_info(Rest, Data)];
+    case get_value(Key, Data) of
+	undefined -> [undefined | fill_info(Rest, Data)];
+	Value -> [{Str, Value} | fill_info(Rest, Data)]
+    end;
+fill_info([{Str,Attrib,Key}|Rest], Data) when is_atom(Key); is_function(Key) ->
+    case get_value(Key, Data) of
+	undefined -> [undefined | fill_info(Rest, Data)];
+	Value -> [{Str,Attrib,Value} | fill_info(Rest, Data)]
+    end;
 fill_info([{Str, {Format, Key}}|Rest], Data)
   when is_atom(Key); is_function(Key), is_atom(Format) ->
     case get_value(Key, Data) of
-	undefined -> [{Str, undefined} | fill_info(Rest, Data)];
+	undefined -> [undefined | fill_info(Rest, Data)];
 	Value -> [{Str, {Format, Value}} | fill_info(Rest, Data)]
     end;
+fill_info([{Str, Attrib, {Format, Key}}|Rest], Data)
+  when is_atom(Key); is_function(Key), is_atom(Format) ->
+    case get_value(Key, Data) of
+	undefined -> [undefined | fill_info(Rest, Data)];
+	Value -> [{Str, Attrib, {Format, Value}} | fill_info(Rest, Data)]
+    end;
 fill_info([{Str,SubStructure}|Rest], Data) when is_list(SubStructure) ->
     [{Str, fill_info(SubStructure, Data)}|fill_info(Rest,Data)];
 fill_info([{Str,Attrib,SubStructure}|Rest], Data) ->
@@ -146,23 +189,49 @@ update_info([Fields|Fs], [{_Header, _Attrib, SubStructure}| Rest]) ->
 update_info([], []) ->
     ok.
 
+update_info2([undefined|Fs], [_|Rest]) ->
+    update_info2(Fs, Rest);
+update_info2([Scroll = {_, _, _}|Fs], [{_, NewInfo}|Rest]) ->
+    update_scroll_boxes(Scroll, NewInfo),
+    update_info2(Fs, Rest);
+update_info2([Field|Fs], [{_Str, {click, Value}}|Rest]) ->
+    wxTextCtrl:setValue(Field, to_str(Value)),
+    update_info2(Fs, Rest);
 update_info2([Field|Fs], [{_Str, Value}|Rest]) ->
-    wxStaticText:setLabel(Field, to_str(Value)),
+    wxTextCtrl:setValue(Field, to_str(Value)),
+    update_info2(Fs, Rest);
+update_info2([Field|Fs], [undefined|Rest]) ->
+    wxTextCtrl:setValue(Field, ""),
     update_info2(Fs, Rest);
 update_info2([], []) -> ok.
 
+update_scroll_boxes({_, _, 0}, {_, []}) -> ok;
+update_scroll_boxes({Win, Sizer, _}, {Type, List}) ->
+    [wxSizerItem:deleteWindows(Child) ||  Child <- wxSizer:getChildren(Sizer)],
+    BC = wxWindow:getBackgroundColour(Win),
+    Cursor = wxCursor:new(?wxCURSOR_HAND),
+    add_entries(Type, List, Win, Sizer, BC, Cursor),
+    wxCursor:destroy(Cursor),
+    wxSizer:recalcSizes(Sizer),
+    wxWindow:refresh(Win),
+    ok.
 
 to_str(Value) when is_atom(Value) ->
     atom_to_list(Value);
+to_str({Unit, X}) when (Unit==bytes orelse Unit==time_ms) andalso is_list(X) ->
+    try list_to_integer(X) of
+	B -> to_str({Unit,B})
+    catch error:badarg -> X
+    end;
 to_str({bytes, B}) ->
     KB = B div 1024,
     MB = KB div 1024,
     GB = MB div 1024,
     if
-	GB > 10 -> integer_to_list(GB) ++ " gB";
-	MB > 10 -> integer_to_list(MB) ++ " mB";
+	GB > 10 -> integer_to_list(GB) ++ " GB";
+	MB > 10 -> integer_to_list(MB) ++ " MB";
 	KB >  0 -> integer_to_list(KB) ++ " kB";
-	true -> integer_to_list(B) ++ " B "
+	true -> integer_to_list(B) ++ " B"
     end;
 to_str({time_ms, MS}) ->
     S = MS div 1000,
@@ -207,27 +276,23 @@ create_menus(Menus, MenuBar, Type) ->
 		  create_menu(Tag, Ms, Index, MenuBar, Type)
 	  end,
     [{First, _}|_] = Menus,
-    OnMac = os:type() =:= {unix, darwin},
     Index = if Type =:= default -> 0;
 	       First =:= "File" -> 0;
-	       OnMac -> 0;
 	       true -> 1
 	    end,
     wx:foldl(Add, Index, Menus),
     ok.
 
 create_menu("File", MenuItems, Index, MenuBar, Type) ->
-    OnMac = os:type() =:= {unix, darwin},
-    if OnMac, Type =:= default ->
-	    Index;
-       not OnMac, Type =:= plugin ->
+    if
+	Type =:= plugin ->
 	    MenuId = wxMenuBar:findMenu(MenuBar, "File"),
 	    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
 	    lists:foldl(fun(Record, N) ->
 				create_menu_item(Record, Menu, N)
 			end, 0, MenuItems),
 	    Index + 1;
-       true ->
+	true ->
 	    Menu = wxMenu:new(),
 	    lists:foldl(fun(Record, N) ->
 				create_menu_item(Record, Menu, N)
@@ -279,36 +344,188 @@ create_attrs() ->
     #attrs{even = wxListItemAttr:new(Text, ?BG_EVEN, Font),
 	   odd  = wxListItemAttr:new(Text, ?BG_ODD, Font),
 	   deleted = wxListItemAttr:new(?FG_DELETED, ?BG_DELETED, Font),
-	   changed = wxListItemAttr:new(Text, ?BG_CHANGED, Font),
+	   changed_even = wxListItemAttr:new(Text, mix(?BG_CHANGED,?BG_EVEN), Font),
+	   changed_odd  = wxListItemAttr:new(Text, mix(?BG_CHANGED,?BG_ODD), Font),
+	   new_even = wxListItemAttr:new(Text, mix(?BG_NEW,?BG_EVEN), Font),
+	   new_odd  = wxListItemAttr:new(Text, mix(?BG_NEW, ?BG_ODD), Font),
 	   searched = wxListItemAttr:new(Text, ?BG_SEARCHED, Font)
 	  }.
 
+mix(RGB,_) -> RGB.
+
+%% mix({R,G,B},{MR,MG,MB}) ->
+%%     {trunc(R*MR/255), trunc(G*MG/255), trunc(B*MB/255)}.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 get_box_info({Title, List}) when is_list(List) -> {Title, ?wxALIGN_LEFT, List};
 get_box_info({Title, left, List}) -> {Title, ?wxALIGN_LEFT, List};
 get_box_info({Title, right, List}) -> {Title, ?wxALIGN_RIGHT, List}.
 
+add_box(Panel, OuterBox, Cursor, Title, Proportion, {Format, List}) ->
+    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title}]),
+    Scroll = wxScrolledWindow:new(Panel),
+    wxScrolledWindow:enableScrolling(Scroll,true,true),
+    wxScrolledWindow:setScrollbars(Scroll,1,1,0,0),
+    ScrollSizer  = wxBoxSizer:new(?wxVERTICAL),
+    wxScrolledWindow:setSizer(Scroll, ScrollSizer),
+    BC = wxWindow:getBackgroundColour(Panel),
+    wxWindow:setBackgroundColour(Scroll,BC),
+    add_entries(Format, List, Scroll, ScrollSizer, BC, Cursor),
+    wxSizer:add(Box,Scroll,[{proportion,1},{flag,?wxEXPAND}]),
+    wxSizer:add(OuterBox,Box,[{proportion,Proportion},{flag,?wxEXPAND}]),
+    {Scroll,ScrollSizer,length(List)}.
+
+add_entries(click, List, Scroll, ScrollSizer, BC, Cursor) ->
+    Add = fun(Link) ->
+		  TC = link_entry(Scroll, Link, Cursor),
+		  wxWindow:setBackgroundColour(TC,BC),
+		  wxSizer:add(ScrollSizer,TC,[{flag,?wxEXPAND}])
+	  end,
+    [Add(Link) || Link <- List];
+add_entries(plain, List, Scroll, ScrollSizer, _, _) ->
+    Add = fun(String) ->
+		  TC = wxTextCtrl:new(Scroll, ?wxID_ANY,
+				      [{style,?SINGLE_LINE_STYLE},
+				       {value,String}]),
+		  wxSizer:add(ScrollSizer,TC,[{flag,?wxEXPAND}])
+	  end,
+    [Add(String) || String <- List].
+
+
+create_box(_Panel, {scroll_boxes,[]}) ->
+    undefined;
+create_box(Panel, {scroll_boxes,Data}) ->
+    OuterBox = wxBoxSizer:new(?wxHORIZONTAL),
+    Cursor = wxCursor:new(?wxCURSOR_HAND),
+    AddBox = fun({Title,Proportion,Format = {_,_}}) ->
+		     add_box(Panel, OuterBox, Cursor, Title, Proportion, Format);
+		({Title, Format = {_,_}}) ->
+		     add_box(Panel, OuterBox, Cursor, Title, 1, Format);
+		(undefined) ->
+		     undefined
+	     end,
+    Boxes = [AddBox(Entry) || Entry <- Data],
+    wxCursor:destroy(Cursor),
+
+    MaxL = lists:foldl(fun({_,_,L},Max) when L>Max -> L;
+			  (_,Max) -> Max
+		       end,
+		       0,
+		       Boxes),
+
+    Dummy = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?SINGLE_LINE_STYLE}]),
+    {_,H} = wxWindow:getSize(Dummy),
+    wxTextCtrl:destroy(Dummy),
+
+    MaxH = if MaxL > 8 -> 8*H;
+	      true -> MaxL*H
+	   end,
+    [wxWindow:setMinSize(B,{0,MaxH}) || {B,_,_} <- Boxes],
+    wxSizer:layout(OuterBox),
+    {OuterBox, Boxes};
+
 create_box(Panel, Data) ->
     {Title, Align, Info} = get_box_info(Data),
-    Box = wxStaticBoxSizer:new(?wxHORIZONTAL, Panel, [{label, Title}]),
-    Left  = wxBoxSizer:new(?wxVERTICAL),
-    Right = wxBoxSizer:new(?wxVERTICAL),
-    Expand    = [{flag, ?wxEXPAND}],
-    ExpAlign  = [{flag, Align}],
-    AddRow = fun({Desc, Value}) ->
-		     wxSizer:add(Left, wxStaticText:new(Panel, ?wxID_ANY, Desc ++ ":"), Expand),
-		     Field = wxStaticText:new(Panel, ?wxID_ANY, to_str(Value)),
-		     wxSizer:add(Right, Field, ExpAlign),
-		     Field
+    Box = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, Title}]),
+    LeftSize = get_max_size(Panel,Info),
+    LeftProportion = [{proportion,0}],
+    RightProportion = [{proportion,1}, {flag, Align bor ?wxEXPAND}],
+    AddRow = fun({Desc0, Value0}) ->
+		     Desc = Desc0++":",
+		     Line = wxBoxSizer:new(?wxHORIZONTAL),
+		     wxSizer:add(Line,
+				 wxTextCtrl:new(Panel, ?wxID_ANY,
+						[{style,?SINGLE_LINE_STYLE},
+						 {size,LeftSize},
+						 {value,Desc}]),
+				 LeftProportion),
+		     Field =
+			 case Value0 of
+			     {click,"unknown"} ->
+				 wxTextCtrl:new(Panel, ?wxID_ANY,
+						[{style,?SINGLE_LINE_STYLE},
+						 {value,"unknown"}]);
+			     {click,Value} ->
+				 link_entry(Panel,Value);
+			     _ ->
+				 Value = to_str(Value0),
+				 TCtrl = wxTextCtrl:new(Panel, ?wxID_ANY,
+							[{style,?SINGLE_LINE_STYLE},
+							 {value,Value}]),
+				 length(Value) > 50 andalso
+				     wxWindow:setToolTip(TCtrl,wxToolTip:new(Value)),
+				 TCtrl
+			 end,
+		     wxSizer:add(Line, 10, 0), % space of size 10 horisontally
+		     wxSizer:add(Line, Field, RightProportion),
+
+		     {_,H,_,_} = wxTextCtrl:getTextExtent(Field,"Wj"),
+		     wxTextCtrl:setMinSize(Field,{0,H}),
+
+		     wxSizer:add(Box, Line, [{proportion,0},{flag,?wxEXPAND}]),
+		     Field;
+		(undefined) ->
+		     undefined
 	     end,
     InfoFields = [AddRow(Entry) || Entry <- Info],
-    wxSizer:add(Box, Left),
-    wxSizer:addSpacer(Box, 10),
-    wxSizer:add(Box, Right),
-    wxSizer:addSpacer(Box, 30),
     {Box, InfoFields}.
 
+link_entry(Panel, Link) ->
+    Cursor = wxCursor:new(?wxCURSOR_HAND),
+    TC = link_entry2(Panel, to_link(Link), Cursor),
+    wxCursor:destroy(Cursor),
+    TC.
+link_entry(Panel, Link, Cursor) ->
+    link_entry2(Panel, to_link(Link), Cursor).
+
+link_entry2(Panel,{Target,Str},Cursor) ->
+    TC = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?SINGLE_LINE_STYLE}]),
+    wxTextCtrl:setForegroundColour(TC,?wxBLUE),
+    wxTextCtrl:appendText(TC, Str),
+    wxWindow:setCursor(TC, Cursor),
+    wxTextCtrl:connect(TC, left_down, [{userData,Target}]),
+    wxTextCtrl:connect(TC, enter_window),
+    wxTextCtrl:connect(TC, leave_window),
+    ToolTip = wxToolTip:new("Click to see properties for " ++ Str),
+    wxWindow:setToolTip(TC, ToolTip),
+    TC.
+
+to_link(Tuple = {_Target, _Str}) ->
+    Tuple;
+to_link(Target0) ->
+    Target=to_str(Target0),
+    {Target, Target}.
+
+html_window(Panel) ->
+    Win = wxHtmlWindow:new(Panel, [{style, ?wxHW_SCROLLBAR_AUTO}]),
+    %% wxHtmlWindow:setFonts(Win, "", FixedName),
+    wxHtmlWindow:connect(Win,command_html_link_clicked),
+    Win.
+
+html_window(Panel, Html) ->
+    Win = html_window(Panel),
+    wxHtmlWindow:setPage(Win, Html),
+    Win.
+
+get_max_size(Panel,Info) ->
+    Txt = wxTextCtrl:new(Panel, ?wxID_ANY, []),
+    Size = get_max_size(Txt,Info,0,0),
+    wxTextCtrl:destroy(Txt),
+    Size.
+
+get_max_size(Txt,[{Desc,_}|Info],MaxX,MaxY) ->
+    {X,Y,_,_} = wxTextCtrl:getTextExtent(Txt,Desc++":"),
+    if X>MaxX ->
+	    get_max_size(Txt,Info,X,Y);
+       true ->
+	    get_max_size(Txt,Info,MaxX,MaxY)
+    end;
+get_max_size(Txt,[undefined|Info],MaxX,MaxY) ->
+    get_max_size(Txt,Info,MaxX,MaxY);
+get_max_size(_,[],X,_Y) ->
+    {X+2,-1}.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 set_listctrl_col_size(LCtrl, Total) ->
     wx:batch(fun() -> calc_last(LCtrl, Total) end).
@@ -326,10 +543,7 @@ calc_last(LCtrl, _Total) ->
 scroll_size(LCtrl) ->
     case os:type() of
 	{win32, nt} -> 0;
-	{unix, darwin} ->
-	    %% I can't figure out is there is a visible scrollbar
-	    %% Always make room for it
-	    wxSystemSettings:getMetric(?wxSYS_VSCROLL_X);
+	{unix, darwin} -> 0; %% Always 0 in wxWidgets-3.0
 	_ ->
 	    case wxWindow:hasScrollbar(LCtrl, ?wxVERTICAL) of
 		true -> wxSystemSettings:getMetric(?wxSYS_VSCROLL_X);
@@ -430,3 +644,108 @@ ensure_last_is_dot(String) ->
 	false ->
 	    String ++ "."
     end.
+
+%%%-----------------------------------------------------------------
+%%% Status bar for warnings
+create_status_bar(Panel) ->
+    StatusStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY bor ?wxTE_RICH2,
+    Red = wxTextAttr:new(?wxRED),
+
+    %% wxTextCtrl:setSize/3 does not work, so we must create a dummy
+    %% text ctrl first to get the size of the text, then set it when
+    %% creating the real text ctrl.
+    Dummy = wxTextCtrl:new(Panel, ?wxID_ANY,[{style,StatusStyle}]),
+    {X,Y,_,_} = wxTextCtrl:getTextExtent(Dummy,"WARNING"),
+    wxTextCtrl:destroy(Dummy),
+    StatusBar = wxTextCtrl:new(Panel, ?wxID_ANY,
+			 [{style,StatusStyle},
+			  {size,{X,Y+2}}]), % Y+2 to avoid scrollbar
+    wxTextCtrl:setDefaultStyle(StatusBar,Red),
+    wxTextAttr:destroy(Red),
+    StatusBar.
+
+%%%-----------------------------------------------------------------
+%%% Progress dialog
+-define(progress_handler,cdv_progress_handler).
+display_progress_dialog(Title,Str) ->
+    Caller = self(),
+    Env = wx:get_env(),
+    spawn_link(fun() ->
+		       progress_handler(Caller,Env,Title,Str)
+	       end),
+    ok.
+
+wait_for_progress() ->
+    receive
+	continue ->
+	    ok;
+	Error ->
+	    Error
+    end.
+
+destroy_progress_dialog() ->
+    report_progress(finish).
+
+report_progress(Progress) ->
+    case whereis(?progress_handler) of
+	Pid when is_pid(Pid) ->
+	    Pid ! {progress,Progress},
+	    ok;
+	_ ->
+	    ok
+    end.
+
+progress_handler(Caller,Env,Title,Str) ->
+    register(?progress_handler,self()),
+    wx:set_env(Env),
+    PD = progress_dialog(Env,Title,Str),
+    try progress_loop(Title,PD,Caller)
+    catch closed -> normal end.
+
+progress_loop(Title,PD,Caller) ->
+    receive
+	{progress,{ok,done}} -> % to make wait_for_progress/0 return
+	    Caller ! continue,
+	    progress_loop(Title,PD,Caller);
+	{progress,{ok,Percent}} when is_integer(Percent) ->
+	    update_progress(PD,Percent),
+	    progress_loop(Title,PD,Caller);
+	{progress,{ok,Msg}} ->
+	    update_progress_text(PD,Msg),
+	    progress_loop(Title,PD,Caller);
+	{progress,{error, Reason}} ->
+	    finish_progress(PD),
+	    FailMsg =
+		if is_list(Reason) -> Reason;
+		   true -> file:format_error(Reason)
+		end,
+	    display_info_dialog("Crashdump Viewer Error",FailMsg),
+	    Caller ! error,
+	    unregister(?progress_handler),
+	    unlink(Caller);
+	{progress,finish} ->
+	    finish_progress(PD),
+	    unregister(?progress_handler),
+	    unlink(Caller)
+    end.
+
+progress_dialog(_Env,Title,Str) ->
+    PD = wxProgressDialog:new(Title,Str,
+			      [{maximum,101},
+			       {style,
+				?wxPD_APP_MODAL bor
+				    ?wxPD_SMOOTH bor
+				    ?wxPD_AUTO_HIDE}]),
+    wxProgressDialog:setMinSize(PD,{200,-1}),
+    PD.
+
+update_progress(PD,Value) ->
+    try wxProgressDialog:update(PD,Value)
+    catch _:_ -> throw(closed) %% Port or window have died
+    end.
+update_progress_text(PD,Text) ->
+    try wxProgressDialog:update(PD,0,[{newmsg,Text}])
+    catch _:_ -> throw(closed) %% Port or window have died
+    end.
+finish_progress(PD) ->
+    wxProgressDialog:destroy(PD).
diff --git a/lib/observer/src/observer_perf_wx.erl b/lib/observer/src/observer_perf_wx.erl
index 54c98f3ba3..8173349ed7 100644
--- a/lib/observer/src/observer_perf_wx.erl
+++ b/lib/observer/src/observer_perf_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -283,7 +283,12 @@ mem_types() ->
 
 lmax([]) -> 0;
 lmax(List) ->
-    lists:max([lists:max(tuple_to_list(T)) || T <- List]).
+    Max = [lists:max(tuple_to_list(T)) || T <- List,
+					  tuple_size(T) > 0],
+    case Max of
+	[] -> 0;
+	_ -> lists:max(Max)
+    end.
 
 calc_delta([{Id, WN, TN}|Ss], [{Id, WP, TP}|Ps]) ->
     [100*(WN-WP) div (TN-TP)|calc_delta(Ss, Ps)];
@@ -301,25 +306,23 @@ draw(Offset, Id, DC, Panel, Paint=#paint{pens=Pens, small=Small}, Data, Active)
     {X0,Y0,WS,HS} = draw_borders(Id, NoGraphs, DC, Size, Max, Paint),
     Last = 60*WS+X0-1,
     Start = max(61-Len, 0)*WS+X0 - Offset*WS,
-    case Hs of
-	[] -> ignore;
-	[_] -> ignore;
-	_ ->
+    Samples = length(Hs),
+    case Active andalso Samples > 1 andalso NoGraphs > 0 of
+	true ->
 	    Draw = fun(N) ->
 			   Lines = make_lines(Hs, Start, N, {X0,Max*HS,Last}, Y0, WS, HS),
 			   setPen(DC, element(1+ ((N-1) rem tuple_size(Pens)), Pens)),
 			   strokeLines(DC, Lines),
 			   N+1
 		   end,
-	    [Draw(I) || I <- lists:seq(NoGraphs, 1, -1)]
-    end,
-    case Active of
+	    [Draw(I) || I <- lists:seq(NoGraphs, 1, -1)];
 	false ->
-	    NotActive = "Service not available",
+	    Info = case Active andalso Samples =< 1 of
+		       true -> "Waiting on data";
+		       false -> "Information not available"
+		   end,
 	    setFont(DC, Small, {0,0,0}),
-	    drawText(DC, NotActive, X0 + 100, element(2,Size) div 2);
-	true ->
-	    ignore
+	    drawText(DC, Info, X0 + 100, element(2,Size) div 2)
     end,
     ok.
 
diff --git a/lib/observer/src/observer_pro_wx.erl b/lib/observer/src/observer_pro_wx.erl
index 9aaf648ea2..0be8c18893 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The 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 @@
 
 -record(holder, {parent,
 		 info,
+		 etop,
 		 sort=#sort{},
 		 accum=[],
 		 attrs,
@@ -191,20 +192,16 @@ dump_to_file(Parent, FileName, Holder) ->
 start_procinfo(undefined, _Frame, Opened) ->
     Opened;
 start_procinfo(Pid, Frame, 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]
+    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.
-    %%;
-    %% 	{_, PI} ->
-    %% 	    wxFrame:raise(PI),
-    %% 	    Opened
-    %% end.
 
 call(Holder, What) ->
     Ref = erlang:monitor(process, Holder),
@@ -235,9 +232,14 @@ handle_info(refresh_interval, #state{holder=Holder}=State) ->
 
 handle_info({procinfo_menu_closed, Pid},
 	    #state{procinfo_menu_pids=Opened}=State) ->
-    NewPids = lists:delete(Pid, Opened),
+    NewPids = lists:keydelete(Pid, 1, Opened),
     {noreply, State#state{procinfo_menu_pids=NewPids}};
 
+handle_info({procinfo_open, Pid},
+	    #state{panel=Panel, procinfo_menu_pids=Opened}=State) ->
+    Opened2 = start_procinfo(Pid, Panel, Opened),
+    {noreply, State#state{procinfo_menu_pids=Opened2}};
+
 handle_info({active, Node},
 	    #state{holder=Holder, timer=Timer, parent=Parent}=State) ->
     create_pro_menu(Parent, Holder),
@@ -378,8 +380,7 @@ handle_event(#wx{event=#wxList{type=command_list_col_click, col=Col}},
 
 handle_event(#wx{event=#wxList{type=command_list_item_activated}},
 	     #state{panel=Panel, procinfo_menu_pids=Opened,
-		    sel={_, [Pid|_]}}=State)
-  when Pid =/= undefined ->
+		    sel={_, [Pid|_]}}=State) ->
     Opened2 = start_procinfo(Pid, Panel, Opened),
     {noreply, State#state{procinfo_menu_pids=Opened2}};
 
@@ -435,13 +436,14 @@ set_focus([Old|_], [New|_], Grid) ->
 init_table_holder(Parent, Attrs) ->
     Backend = spawn_link(node(), observer_backend,etop_collect,[self()]),
     table_holder(#holder{parent=Parent,
-			 info=#etop_info{procinfo=[]},
+			 etop=#etop_info{},
+			 info=array:new(),
 			 node=node(),
 			 backend_pid=Backend,
 			 attrs=Attrs
 			}).
 
-table_holder(#holder{info=#etop_info{procinfo=Info}, attrs=Attrs,
+table_holder(#holder{info=Info, attrs=Attrs,
 		     node=Node, backend_pid=Backend}=S0) ->
     receive
 	{get_row, From, Row, Col} ->
@@ -488,7 +490,8 @@ table_holder(#holder{info=#etop_info{procinfo=Info}, attrs=Attrs,
 	    From ! {self(), S0#holder.accum == true},
 	    table_holder(S0);
 	{dump, Fd} ->
-	    etop_txt:do_update(Fd, S0#holder.info, #opts{node=Node}),
+	    EtopInfo = (S0#holder.etop)#etop_info{procinfo=array:to_list(Info)},
+	    etop_txt:do_update(Fd, EtopInfo, #opts{node=Node}),
 	    file:close(Fd),
 	    table_holder(S0);
 	stop ->
@@ -498,23 +501,23 @@ table_holder(#holder{info=#etop_info{procinfo=Info}, attrs=Attrs,
 	    table_holder(S0)
     end.
 
-change_sort(Col, S0=#holder{parent=Parent, info=EI=#etop_info{procinfo=Data}, sort=Sort0}) ->
+change_sort(Col, S0=#holder{parent=Parent, info=Data, sort=Sort0}) ->
     {Sort, ProcInfo}=sort(Col, Sort0, Data),
-    Parent ! {holder_updated, length(Data)},
-    S0#holder{info=EI#etop_info{procinfo=ProcInfo}, sort=Sort}.
+    Parent ! {holder_updated, array:size(Data)},
+    S0#holder{info=ProcInfo, sort=Sort}.
 
 change_accum(true, S0) ->
     S0#holder{accum=true};
-change_accum(false, S0=#holder{info=#etop_info{procinfo=Info}}) ->
+change_accum(false, S0=#holder{info=Info}) ->
     self() ! refresh,
-    S0#holder{accum=lists:sort(Info)}.
+    S0#holder{accum=lists:sort(array:to_list(Info))}.
 
 handle_update(EI=#etop_info{procinfo=ProcInfo0},
 	      S0=#holder{parent=Parent, sort=Sort=#sort{sort_key=KeyField}}) ->
     {ProcInfo1, S1} = accum(ProcInfo0, S0),
     {_SO, ProcInfo} = sort(KeyField, Sort#sort{sort_key=undefined}, ProcInfo1),
-    Parent ! {holder_updated, length(ProcInfo)},
-    S1#holder{info=EI#etop_info{procinfo=ProcInfo}}.
+    Parent ! {holder_updated, array:size(ProcInfo)},
+    S1#holder{info=ProcInfo, etop=EI#etop_info{procinfo=[]}}.
 
 accum(ProcInfo, State=#holder{accum=true}) ->
     {ProcInfo, State};
@@ -532,12 +535,18 @@ accum2([PI|PIs], Old, Acc) ->
     accum2(PIs, Old, [PI|Acc]);
 accum2([], _, Acc) -> Acc.
 
+sort(Col, Opt, Table)
+  when not is_list(Table) ->
+    sort(Col,Opt,array:to_list(Table));
 sort(Col, Opt=#sort{sort_key=Col, sort_incr=Bool}, Table) ->
-    {Opt#sort{sort_incr=not Bool}, lists:reverse(Table)};
+    {Opt#sort{sort_incr=not Bool},
+     array:from_list(lists:reverse(Table))};
 sort(Col, S=#sort{sort_incr=true}, Table) ->
-    {S#sort{sort_key=Col}, lists:keysort(col_to_element(Col), Table)};
+    {S#sort{sort_key=Col},
+     array:from_list(lists:keysort(col_to_element(Col), Table))};
 sort(Col, S=#sort{sort_incr=false}, Table) ->
-    {S#sort{sort_key=Col}, lists:reverse(lists:keysort(col_to_element(Col), Table))}.
+    {S#sort{sort_key=Col},
+     array:from_list(lists:reverse(lists:keysort(col_to_element(Col), Table)))}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -552,40 +561,50 @@ col_to_element(?COL_FUN)  -> #etop_proc_info.cf;
 col_to_element(?COL_MSG)  -> #etop_proc_info.mq.
 
 get_pids(From, Indices, ProcInfo) ->
-    Processes = [(lists:nth(I+1, ProcInfo))#etop_proc_info.pid || I <- Indices],
+    Processes = [(array:get(I, ProcInfo))#etop_proc_info.pid || I <- Indices],
     From ! {self(), Processes}.
 
 get_name_or_pid(From, Indices, ProcInfo) ->
     Get = fun(#etop_proc_info{name=Name}) when is_atom(Name) -> Name;
 	     (#etop_proc_info{pid=Pid}) -> Pid
 	  end,
-    Processes = [Get(lists:nth(I+1, ProcInfo)) || I <- Indices],
+    Processes = [Get(array:get(I, ProcInfo)) || I <- Indices],
     From ! {self(), Processes}.
 
-
 get_row(From, Row, pid, Info) ->
     Pid = case Row =:= -1 of
 	      true ->  {error, undefined};
-	      false -> {ok, get_procinfo_data(?COL_PID, lists:nth(Row+1, Info))}
+	      false -> {ok, get_procinfo_data(?COL_PID, array:get(Row, Info))}
 	  end,
     From ! {self(), Pid};
 get_row(From, Row, Col, Info) ->
-    Data = case Row+1 > length(Info) of
+    Data = case Row > array:size(Info) of
 	       true ->
 		   "";
 	       false ->
-		   ProcInfo = lists:nth(Row+1, Info),
+		   ProcInfo = array:get(Row, Info),
 		   get_procinfo_data(Col, ProcInfo)
 	   end,
     From ! {self(), observer_lib:to_str(Data)}.
 
 get_rows_from_pids(From, Pids0, Info) ->
-    Res = lists:foldl(fun(Pid, Data = {Ids, Pids}) ->
-			      case index(Pid, Info, 0) of
-				  false -> Data;
-				  Index -> {[Index|Ids], [Pid|Pids]}
-			      end
-		      end, {[],[]}, Pids0),
+    Search = fun(Idx, #etop_proc_info{pid=Pid}, Acc0={Pick0, {Idxs, Pids}}) ->
+		     case ordsets:is_element(Pid, Pick0) of
+			 true ->
+			     Acc = {[Idx|Idxs],[Pid|Pids]},
+			     Pick = ordsets:del_element(Pid, Pick0),
+			     case Pick =:= [] of
+				 true -> throw(Acc);
+				 false -> {Pick, Acc}
+			     end;
+			 false -> Acc0
+		     end
+	     end,
+    Res = try
+	      {_, R} = array:foldl(Search, {ordsets:from_list(Pids0), {[],[]}}, Info),
+	      R
+	  catch R0 -> R0
+	  end,
     From ! {self(), Res}.
 
 get_attr(From, Row, Attrs) ->
@@ -594,7 +613,3 @@ get_attr(From, Row, Attrs) ->
 		    false -> Attrs#attrs.odd
 		end,
     From ! {self(), Attribute}.
-
-index(Pid, [#etop_proc_info{pid=Pid}|_], Index) -> Index;
-index(Pid, [_|PI], Index) -> index(Pid, PI, Index+1);
-index(_, _, _) -> false.
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index 98d0403139..3ffa5fc77d 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
 %%
 %% The 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,7 +35,9 @@
 -record(state, {parent,
 		frame,
 		pid,
-		pages=[]
+		pages=[],
+		expand_table,
+		expand_wins=[]
 	       }).
 
 -record(worker, {panel, callback}).
@@ -47,6 +49,7 @@ start(Process, ParentFrame, Parent) ->
 
 init([Pid, ParentFrame, Parent]) ->
     try
+	Table = ets:new(observer_expand,[set,public]),
 	Title=case observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, registered_name]) of
 		  [] -> io_lib:format("~p",[Pid]);
 		  {registered_name, Registered} -> io_lib:format("~p (~p)",[Registered, Pid]);
@@ -60,11 +63,11 @@ init([Pid, ParentFrame, Parent]) ->
 
 	Notebook = wxNotebook:new(Frame, ?ID_NOTEBOOK, [{style, ?wxBK_DEFAULT}]),
 
-	ProcessPage = init_panel(Notebook, "Process Information", Pid, fun init_process_page/2),
-	MessagePage = init_panel(Notebook, "Messages", Pid, fun init_message_page/2),
-	DictPage    = init_panel(Notebook, "Dictionary", Pid, fun init_dict_page/2),
-	StackPage   = init_panel(Notebook, "Stack Trace", Pid, fun init_stack_page/2),
-	StatePage   = init_panel(Notebook, "State", Pid, fun init_state_page/2),
+	ProcessPage = init_panel(Notebook, "Process Information", [Pid], fun init_process_page/2),
+	MessagePage = init_panel(Notebook, "Messages", [Pid,Table], fun init_message_page/3),
+	DictPage    = init_panel(Notebook, "Dictionary", [Pid,Table], fun init_dict_page/3),
+	StackPage   = init_panel(Notebook, "Stack Trace", [Pid], fun init_stack_page/2),
+	StatePage   = init_panel(Notebook, "State", [Pid,Table], fun init_state_page/3),
 
 	wxFrame:connect(Frame, close_window),
 	wxMenu:connect(Frame, command_menu_selected),
@@ -73,7 +76,8 @@ init([Pid, ParentFrame, Parent]) ->
 	{Frame, #state{parent=Parent,
 		       pid=Pid,
 		       frame=Frame,
-		       pages=[ProcessPage,MessagePage,DictPage,StackPage,StatePage]
+		       pages=[ProcessPage,MessagePage,DictPage,StackPage,StatePage],
+		       expand_table=Table
 		      }}
     catch error:{badrpc, _} ->
 	    observer_wx:return_to_localnode(ParentFrame, node(Pid)),
@@ -83,10 +87,10 @@ init([Pid, ParentFrame, Parent]) ->
 	    {stop, normal}
     end.
 
-init_panel(Notebook, Str, Pid, Fun) ->
+init_panel(Notebook, Str, FunArgs, Fun) ->
     Panel  = wxPanel:new(Notebook),
     Sizer  = wxBoxSizer:new(?wxHORIZONTAL),
-    {Window,Callback} = Fun(Panel, Pid),
+    {Window,Callback} = apply(Fun,[Panel|FunArgs]),
     wxSizer:add(Sizer, Window, [{flag, ?wxEXPAND bor ?wxALL}, {proportion, 1}, {border, 5}]),
     wxPanel:setSizer(Panel, Sizer),
     true = wxNotebook:addPage(Notebook, Panel, Str),
@@ -99,13 +103,58 @@ 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{frame=Frame, pid=Pid, pages=Pages}=State) ->
+handle_event(#wx{id=?REFRESH}, #state{frame=Frame, pid=Pid, pages=Pages, expand_table=T}=State) ->
+    ets:delete_all_objects(T),
     try [(W#worker.callback)() || W <- Pages]
     catch process_undefined ->
 	    wxFrame:setTitle(Frame, io_lib:format("*DEAD* ~p",[Pid]))
     end,
     {noreply, State};
 
+handle_event(#wx{event=#wxMouse{type=left_down}, userData=TargetPid}, State) ->
+    observer ! {open_link, TargetPid},
+    {noreply, State};
+
+handle_event(#wx{obj=Obj, event=#wxMouse{type=enter_window}}, State) ->
+    wxTextCtrl:setForegroundColour(Obj,{0,0,100,255}),
+    {noreply, State};
+
+handle_event(#wx{obj=Obj, event=#wxMouse{type=leave_window}}, State) ->
+    wxTextCtrl:setForegroundColour(Obj,?wxBLUE),
+    {noreply, State};
+
+handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Href}}},
+	     #state{frame=Frame,expand_table=T,expand_wins=Opened0}=State) ->
+    {Type, Rest} = case Href of
+		       "#Term?"++Keys   -> {cdv_term_cb, Keys};
+		       "#OBSBinary?"++Keys -> {cdv_bin_cb, Keys};
+		       _ -> {other, Href}
+		   end,
+    case Type of
+	other ->
+	    observer ! {open_link, Href},
+	    {noreply, State};
+	Callback ->
+	    [{"key1",Key1},{"key2",Key2},{"key3",Key3}] = httpd:parse_query(Rest),
+	    Id = {obs, {T,{list_to_integer(Key1),
+			   list_to_integer(Key2),
+			   list_to_integer(Key3)}}},
+	    Opened =
+		case lists:keyfind(Id,1,Opened0) of
+		    false ->
+			Win = cdv_detail_wx:start_link(Id,Frame,Callback),
+			[{Id,Win}|Opened0];
+		    {_,Win} ->
+			wxFrame:raise(Win),
+			Opened0
+		end,
+	    {noreply,State#state{expand_wins=Opened}}
+    end;
+
+handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Info}}}, State) ->
+    observer ! {open_link, Info},
+    {noreply, State};
+
 handle_event(Event, _State) ->
     error({unhandled_event, Event}).
 
@@ -116,10 +165,15 @@ handle_info(_Info, State) ->
 handle_call(Call, From, _State) ->
     error({unhandled_call, Call, From}).
 
+handle_cast({detail_win_closed,Id}, #state{expand_wins=Opened0}=State) ->
+    Opened = lists:keydelete(Id,1,Opened0),
+    {noreply,State#state{expand_wins=Opened}};
+
 handle_cast(Cast, _State) ->
     error({unhandled_cast, Cast}).
 
-terminate(_Reason, #state{parent=Parent,pid=Pid,frame=Frame}) ->
+terminate(_Reason, #state{parent=Parent,pid=Pid,frame=Frame,expand_table=T}) ->
+    T=/=undefined andalso ets:delete(T),
     Parent ! {procinfo_menu_closed, Pid},
     case Frame of
 	undefined ->  ok;
@@ -139,58 +193,37 @@ init_process_page(Panel, Pid) ->
 		     observer_lib:update_info(UpFields, Fields)
 	     end}.
 
-init_text_page(Parent) ->
-    Style = ?wxTE_MULTILINE bor ?wxTE_RICH2 bor ?wxTE_READONLY,
-    Text = wxTextCtrl:new(Parent, ?wxID_ANY, [{style, Style}]),
-    Font = observer_wx:get_attrib({font, fixed}),
-    Attr = wxTextAttr:new(?wxBLACK, [{font, Font}]),
-    true = wxTextCtrl:setDefaultStyle(Text, Attr),
-    wxTextAttr:destroy(Attr),
-    Text.
-
-init_message_page(Parent, Pid) ->
-    Text = init_text_page(Parent),
-    Format = fun(Message, Number) ->
-		     {io_lib:format("~-4.w ~p~n", [Number, Message]),
-		      Number+1}
-	     end,
+
+init_message_page(Parent, Pid, Table) ->
+    Win = observer_lib:html_window(Parent),
     Update = fun() ->
 		     case observer_wx:try_rpc(node(Pid), erlang, process_info,
 					      [Pid, messages])
 		     of
-			 {messages,RawMessages} ->
-			     {Messages,_} = lists:mapfoldl(Format, 1, RawMessages),
-			     Last = wxTextCtrl:getLastPosition(Text),
-			     wxTextCtrl:remove(Text, 0, Last),
-			     case Messages =:= [] of
-				 true ->
-				     wxTextCtrl:writeText(Text, "No messages");
-				 false ->
-				     wxTextCtrl:writeText(Text, Messages)
-			     end;
+			 {messages, Messages} ->
+			     Html = observer_html_lib:expandable_term("Message Queue", Messages, Table),
+			     wxHtmlWindow:setPage(Win, Html);
 			 _ ->
 			     throw(process_undefined)
 		     end
 	     end,
     Update(),
-    {Text, Update}.
+    {Win, Update}.
 
-init_dict_page(Parent, Pid) ->
-    Text = init_text_page(Parent),
+init_dict_page(Parent, Pid, Table) ->
+    Win = observer_lib:html_window(Parent),
     Update = fun() ->
 		     case observer_wx:try_rpc(node(Pid), erlang, process_info, [Pid, dictionary])
 		     of
-			 {dictionary,RawDict} ->
-			     Dict = [io_lib:format("~-20.w ~p~n", [K, V]) || {K, V} <- RawDict],
-			     Last = wxTextCtrl:getLastPosition(Text),
-			     wxTextCtrl:remove(Text, 0, Last),
-			     wxTextCtrl:writeText(Text, Dict);
+			 {dictionary,Dict} ->
+			     Html = observer_html_lib:expandable_term("Dictionary", Dict, Table),
+			     wxHtmlWindow:setPage(Win, Html);
 			 _ ->
 			     throw(process_undefined)
 		     end
 	     end,
     Update(),
-    {Text, Update}.
+    {Win, Update}.
 
 init_stack_page(Parent, Pid) ->
     LCtrl = wxListCtrl:new(Parent, [{style, ?wxLC_REPORT bor ?wxLC_HRULES}]),
@@ -236,58 +269,58 @@ init_stack_page(Parent, Pid) ->
     Update(),
     {LCtrl, Update}.
 
-
-init_state_page(Parent, Pid) ->
-    Text = init_text_page(Parent),
+init_state_page(Parent, Pid, Table) ->
+    Win = observer_lib:html_window(Parent),
     Update = fun() ->
-		     %% First, test if sys:get_status/2 have any chance to return an answer
-		     case rpc:call(node(Pid), proc_lib, translate_initial_call, [Pid])
-		     of
-			 %% Not a gen process
-			 {proc_lib,init_p,5} -> Misc = [{"Information", "Not available"}];
-			 %% May be a gen process
-			 {M, _F, _A} ->
-			     %% Get the behavio(u)r
-			     I = rpc:call(node(Pid), M, module_info, [attributes]),
-			     case lists:keyfind(behaviour, 1, I) of
-				 false -> case lists:keyfind(behavior, 1, I) of
-					      false		-> B = undefined;
-					      {behavior, [B]}	-> B
-					  end;
-				 {behaviour, [B]} -> B
-			     end,
-			     %% but not sure that system messages are treated by this process
-			     %% so using a rpc with a small timeout in order not to lag the display
-			     case rpc:call(node(Pid), sys, get_status, [Pid, 200])
-			     of
-				 {status, _, {module, _}, [_PDict, _SysState, _Parent, _Dbg,
-							   [Header,{data, First},{data, Second}]]} ->
-				     Misc = [{"Behaviour", B}] ++ [Header] ++ First ++ Second;
-				 {status, _, {module, _}, [_PDict, _SysState, _Parent, _Dbg,
-							   [Header,{data, First}, OtherFormat]]} ->
-				     Misc = [{"Behaviour", B}] ++ [Header] ++ First ++ [{"State",OtherFormat}];
-				 {status, _, {module, _}, [_PDict, _SysState, _Parent, _Dbg,
-							   OtherFormat]} ->
-				     %% Formatted status ?
-				     case lists:keyfind(format_status, 1, rpc:call(node(Pid), M, module_info, [exports])) of
-					 false	-> Opt = {"Format", unknown};
-					 _	-> Opt = {"Format", overriden}
-				     end,
-				     Misc = [{"Behaviour", B}] ++ [Opt, {"State",OtherFormat}];
-				 {badrpc,{'EXIT',{timeout, _}}} ->
-				     Misc = [{"Information","Timed out"},
-					     {"Tip","system messages are probably not treated by this process"}]
-			     end;
-			 _ -> Misc=[], throw(process_undefined)
-		     end,
-		     Dict = [io_lib:format("~-20.s ~tp~n", [K, V]) || {K, V} <- Misc],
-		     Last = wxTextCtrl:getLastPosition(Text),
-		     wxTextCtrl:remove(Text, 0, Last),
-		     wxTextCtrl:writeText(Text, Dict)
+		     StateInfo = fetch_state_info(Pid),
+		     Html = observer_html_lib:expandable_term("ProcState", StateInfo, Table),
+		     wxHtmlWindow:setPage(Win, Html)
 	     end,
     Update(),
-    {Text, Update}.
+    {Win, Update}.
+
+fetch_state_info(Pid) ->
+    %% First, test if sys:get_status/2 have any chance to return an answer
+    case rpc:call(node(Pid), proc_lib, translate_initial_call, [Pid]) of
+	%% Not a gen process
+	{proc_lib,init_p,5} -> [];
+	%% May be a gen process
+	{M, _F, _A} -> fetch_state_info2(Pid, M);
+	_ -> throw(process_undefined)
+    end.
 
+fetch_state_info2(Pid, M) ->
+    %% Get the behavio(u)r
+    I = rpc:call(node(Pid), M, module_info, [attributes]),
+    case lists:keyfind(behaviour, 1, I) of
+	false -> case lists:keyfind(behavior, 1, I) of
+		     false		-> B = undefined;
+		     {behavior, [B]}	-> B
+		 end;
+	{behaviour, [B]} -> B
+    end,
+    %% but not sure that system messages are treated by this process
+    %% so using a rpc with a small timeout in order not to lag the display
+    case rpc:call(node(Pid), sys, get_status, [Pid, 200])
+    of
+	{status, _, {module, _},
+	 [_PDict, _SysState, _Parent, _Dbg,
+	  [Header,{data, First},{data, Second}]]} ->
+	    [{"Behaviour", B}, Header] ++ First ++ Second;
+	{status, _, {module, _},
+	 [_PDict, _SysState, _Parent, _Dbg,
+	  [Header,{data, First}, OtherFormat]]} ->
+	    [{"Behaviour", B}, Header] ++ First ++ [{"State",OtherFormat}];
+	{status, _, {module, _},
+	 [_PDict, _SysState, _Parent, _Dbg, OtherFormat]} ->
+	    %% Formatted status ?
+	    case lists:keyfind(format_status, 1, rpc:call(node(Pid), M, module_info, [exports])) of
+		false	-> Opt = {"Format", unknown};
+		_	-> Opt = {"Format", overriden}
+	    end,
+	    [{"Behaviour", B}, Opt, {"State",OtherFormat}];
+	{badrpc,{'EXIT',{timeout, _}}} -> []
+    end.
 
 create_menus(MenuBar) ->
     Menus = [{"File", [#create_menu{id=?wxID_CLOSE, text="Close"}]},
@@ -301,6 +334,7 @@ process_info_fields(Pid) ->
 		{"Registered Name",  registered_name},
 		{"Status",           status},
 		{"Message Queue Len",message_queue_len},
+		{"Group Leader",     {click, group_leader}},
 		{"Priority",         priority},
 		{"Trap Exit",        trap_exit},
 		{"Reductions",       reductions},
@@ -311,11 +345,10 @@ process_info_fields(Pid) ->
 		{"Suspending",       suspending},
 		{"Sequential Trace Token", sequential_trace_token},
 		{"Error Handler",    error_handler}]},
-	      {"Connections",
-	       [{"Group Leader",     group_leader},
-		{"Links",            links},
-		{"Monitors",         monitors},
-		{"Monitored by",     monitored_by}]},
+	      {scroll_boxes,
+	       [{"Links",            {click, links}},
+		{"Monitors",         {click, filter_monitor_info()}},
+		{"Monitored by",     {click, monitored_by}}]},
 	      {"Memory and Garbage Collection", right,
 	       [{"Memory",           {bytes, memory}},
 		{"Stack and Heaps",  {bytes, total_heap_size}},
@@ -365,3 +398,9 @@ get_gc_info(Arg) ->
 	    GC = proplists:get_value(garbage_collection, Data),
 	    proplists:get_value(Arg, GC)
     end.
+
+filter_monitor_info() ->
+    fun(Data) ->
+	    Ms = proplists:get_value(monitors, Data),
+	    [Pid || {process, Pid} <- Ms]
+    end.
diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl
index 31800cf12a..f989f9cf97 100644
--- a/lib/observer/src/observer_sys_wx.erl
+++ b/lib/observer/src/observer_sys_wx.erl
@@ -60,10 +60,10 @@ init([Notebook, Parent]) ->
     wxSizer:add(TopSizer, FPanel0, [{flag, ?wxEXPAND}, {proportion, 1}]),
     wxSizer:add(TopSizer, FPanel1, [{flag, ?wxEXPAND}, {proportion, 1}]),
     BorderFlags = ?wxLEFT bor ?wxRIGHT,
-    MemoryInfo = create_mem_info(Panel, AllocInfo),
+    {MemPanel, MemoryInfo} = create_mem_info(Panel, AllocInfo),
     wxSizer:add(Sizer, TopSizer, [{flag, ?wxEXPAND bor BorderFlags bor ?wxTOP},
 				  {proportion, 0}, {border, 5}]),
-    wxSizer:add(Sizer, MemoryInfo, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM},
+    wxSizer:add(Sizer, MemPanel, [{flag, ?wxEXPAND bor BorderFlags bor ?wxBOTTOM},
 				    {proportion, 1}, {border, 5}]),
     wxPanel:setSizer(Panel, Sizer),
     Timer = observer_lib:start_timer(10),
@@ -86,7 +86,9 @@ update_syspage(#sys_wx_state{node = Node, fields=Fields, sizer=Sizer, alloc=Allo
     update_alloc(AllocCtrl, AllocInfo),
     wxSizer:layout(Sizer).
 
-create_mem_info(Panel, Fields) ->
+create_mem_info(Parent, Fields) ->
+    Panel = wxPanel:new(Parent),
+    wxWindow:setBackgroundColour(Panel, {255,255,255}),
     Style = ?wxLC_REPORT bor ?wxLC_SINGLE_SEL bor ?wxLC_HRULES bor ?wxLC_VRULES,
     Grid = wxListCtrl:new(Panel, [{style, Style}]),
     Li = wxListItem:new(),
@@ -103,7 +105,12 @@ create_mem_info(Panel, Fields) ->
     lists:foldl(AddListEntry, 0, ListItems),
     wxListItem:destroy(Li),
     update_alloc(Grid, Fields),
-    Grid.
+
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    wxSizer:add(Sizer, Grid, [{flag, ?wxEXPAND bor ?wxLEFT bor ?wxRIGHT},
+			      {border, 5}, {proportion, 1}]),
+    wxWindow:setSizerAndFit(Panel, Sizer),
+    {Panel, Grid}.
 
 update_alloc(Grid, AllocInfo) ->
     Fields = alloc_info(AllocInfo, [], 0, 0, true),
@@ -167,9 +174,12 @@ info_fields() ->
 	      {"Async thread pool size",  thread_pool_size}
 	     ]},
 	    {"CPU's and Threads",
-	     [{"System Logical CPU's", logical_processors},
-	      {"Erlang Logical CPU's", logical_processors_online},
-	      {"Used Logical CPU's", logical_processors_available}
+	     [{"Logical CPU's", logical_processors},
+	      {"Online Logical CPU's", logical_processors_online},
+	      {"Available Logical CPU's", logical_processors_available},
+	      {"Schedulers", schedulers},
+	      {"Online schedulers", schedulers_online},
+	      {"Available schedulers", schedulers_available}
 	     ]}
 	   ],
     Stat = [{"Memory Usage", right,
diff --git a/lib/observer/src/observer_trace_wx.erl b/lib/observer/src/observer_trace_wx.erl
index f2a1084f85..2878842c23 100644
--- a/lib/observer/src/observer_trace_wx.erl
+++ b/lib/observer/src/observer_trace_wx.erl
@@ -84,7 +84,8 @@ create_window(Notebook, ParentPid) ->
     %% Create the window
     Panel = wxPanel:new(Notebook, [{size, wxWindow:getClientSize(Notebook)}]),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
-    Splitter = wxSplitterWindow:new(Panel, [{size, wxWindow:getClientSize(Panel)}]),
+    Splitter = wxSplitterWindow:new(Panel, [{size, wxWindow:getClientSize(Panel)},
+					    {style, ?SASH_STYLE}]),
     {NodeProcView, NodeView, ProcessView} = create_process_view(Splitter),
     {MatchSpecView,ModView,FuncView} = create_matchspec_view(Splitter),
     wxSplitterWindow:setSashGravity(Splitter, 0.5),
@@ -120,7 +121,7 @@ create_process_view(Parent) ->
     Panel  = wxPanel:new(Parent),
     MainSz = wxBoxSizer:new(?wxHORIZONTAL),
     Style = ?wxLC_REPORT bor ?wxLC_HRULES,
-    Splitter = wxSplitterWindow:new(Panel, []),
+    Splitter = wxSplitterWindow:new(Panel, [{style, ?SASH_STYLE}]),
     Nodes = wxListCtrl:new(Splitter, [{winid, ?NODES_WIN}, {style, Style}]),
     Procs = wxListCtrl:new(Splitter, [{winid, ?PROC_WIN}, {style, Style}]),
     Li = wxListItem:new(),
@@ -157,7 +158,7 @@ create_matchspec_view(Parent) ->
     Panel  = wxPanel:new(Parent),
     MainSz = wxBoxSizer:new(?wxHORIZONTAL),
     Style = ?wxLC_REPORT bor ?wxLC_HRULES,
-    Splitter = wxSplitterWindow:new(Panel, []),
+    Splitter = wxSplitterWindow:new(Panel, [{style, ?SASH_STYLE}]),
     Modules = wxListCtrl:new(Splitter, [{winid, ?MODULES_WIN}, {style, Style}]),
     Funcs   = wxListCtrl:new(Splitter, [{winid, ?FUNCS_WIN}, {style, Style}]),
     Li = wxListItem:new(),
diff --git a/lib/observer/src/observer_tv_table.erl b/lib/observer/src/observer_tv_table.erl
index b4832d9599..59fe5b5670 100644
--- a/lib/observer/src/observer_tv_table.erl
+++ b/lib/observer/src/observer_tv_table.erl
@@ -98,7 +98,7 @@ init([Parent, Opts]) ->
 		ets -> "TV Ets: " ++ Title0;
 		mnesia -> "TV Mnesia: " ++ Title0
 	    end,
-    Frame = wxFrame:new(Parent, ?wxID_ANY, Title, [{size, {800, 300}}]),
+    Frame = wxFrame:new(Parent, ?wxID_ANY, Title, [{size, {800, 600}}]),
     IconFile = filename:join(code:priv_dir(observer), "erlang_observer.png"),
     Icon = wxIcon:new(IconFile, [{type,?wxBITMAP_TYPE_PNG}]),
     wxFrame:setIcon(Frame, Icon),
@@ -261,11 +261,12 @@ handle_event(#wx{id=?ID_EDIT}, State = #state{selected=Index}) ->
 handle_event(#wx{id=?ID_DELETE}, State = #state{selected=undefined}) ->
     {noreply, State};
 handle_event(#wx{id=?ID_DELETE},
-	     State = #state{pid=Pid, status=StatusBar, selected=Index}) ->
+	     State = #state{grid=Grid, pid=Pid, status=StatusBar, selected=Index}) ->
     Str = get_row(Pid, Index, all),
     Pid ! {delete, Index},
     wxStatusBar:setStatusText(StatusBar, io_lib:format("Deleted object: ~s",[Str])),
-    {noreply, State};
+    wxListCtrl:setItemState(Grid, Index, 0, ?wxLIST_STATE_FOCUSED),
+    {noreply, State#state{selected=undefined}};
 
 handle_event(#wx{id=?wxID_CLOSE}, State = #state{frame=Frame}) ->
     wxFrame:destroy(Frame),
@@ -279,8 +280,8 @@ handle_event(#wx{id=?GOTO_ENTRY, event=#wxCommand{cmdString=Str}},
 	     State = #state{grid=Grid}) ->
     try
 	Row0 = list_to_integer(Str),
-	Row1 = min(0, Row0),
-	Row  = max(wxListCtrl:getItemCount(Grid)-1,Row1),
+	Row1 = max(0, Row0),
+	Row  = min(wxListCtrl:getItemCount(Grid)-1,Row1),
 	wxListCtrl:ensureVisible(Grid, Row),
 	ok
     catch _:_ -> ok
@@ -289,7 +290,9 @@ handle_event(#wx{id=?GOTO_ENTRY, event=#wxCommand{cmdString=Str}},
 
 %% Search functionality
 handle_event(#wx{id=?ID_SEARCH},
-	     State = #state{sizer=Sz, search=Search}) ->
+	     State = #state{grid=Grid, sizer=Sz, search=Search, selected=Index}) ->
+    is_integer(Index) andalso
+	wxListCtrl:setItemState(Grid, Index, 0, ?wxLIST_STATE_FOCUSED),
     wxSizer:show(Sz, Search#search.win),
     wxWindow:setFocus(Search#search.search),
     wxSizer:layout(Sz),
@@ -321,7 +324,7 @@ handle_event(#wx{id=?SEARCH_ENTRY, event=#wxCommand{type=command_text_enter,cmdS
     Pid ! {mark_search_hit, false},
     case search(Pid, Str, Pos, Dir, Case) of
 	false ->
-	    wxStatusBar:setStatusText(SB, "Not found"),
+	    wxStatusBar:setStatusText(SB, io_lib:format("Not found (regexp): ~s",[Str])),
 	    Pid ! {mark_search_hit, Find#find.start},
 	    wxListCtrl:refreshItem(Grid, Find#find.start),
 	    {noreply, State#state{search=Search#search{find=Find#find{found=false}}}};
@@ -355,7 +358,7 @@ handle_event(#wx{id=?SEARCH_ENTRY, event=#wxCommand{cmdString=Str}},
 	Pid ! {mark_search_hit, false},
 	case search(Pid, Str, Cont#find.start, Dir, Case) of
 	    false ->
-		wxStatusBar:setStatusText(SB, "Not found"),
+		wxStatusBar:setStatusText(SB, io_lib:format("Not found (regexp): ~s",[Str])),
 		{noreply, State};
 	    Row ->
 		wxListCtrl:ensureVisible(Grid, Row),
@@ -402,8 +405,11 @@ handle_info({new_cols, New}, State = #state{grid=Grid, columns=Cols0}) ->
     Cols = add_columns(Grid, Cols0, New),
     {noreply, State#state{columns=Cols}};
 
+handle_info({refresh, Min, Min}, State = #state{grid=Grid}) ->
+    wxListCtrl:refreshItem(Grid, Min), %% Avoid assert in wx below if Max is 0
+    {noreply, State};
 handle_info({refresh, Min, Max}, State = #state{grid=Grid}) ->
-    Max > 0 andalso wxListCtrl:refreshItems(Grid, Min, Max),
+    wxListCtrl:refreshItems(Grid, Min, Max),
     {noreply, State};
 
 handle_info(refresh_interval, State = #state{pid=Pid}) ->
@@ -426,10 +432,14 @@ handle_info(_Event, State) ->
 
 terminate(_Event, #state{pid=Pid, attrs=Attrs}) ->
     %% ListItemAttr are not auto deleted
-    #attrs{odd=Odd, deleted=D, changed=Ch, searched=S} = Attrs,
-    wxListItemAttr:destroy(Odd),
+    #attrs{odd=Odd, even=Even, deleted=D, searched=S,
+	   changed_odd=Ch1, changed_even=Ch2,
+	   new_odd=New1, new_even=New2
+	  } = Attrs,
+    wxListItemAttr:destroy(Odd), wxListItemAttr:destroy(Even),
     wxListItemAttr:destroy(D),
-    wxListItemAttr:destroy(Ch),
+    wxListItemAttr:destroy(Ch1),wxListItemAttr:destroy(Ch2),
+    wxListItemAttr:destroy(New1),wxListItemAttr:destroy(New2),
     wxListItemAttr:destroy(S),
     unlink(Pid),
     exit(Pid, window_closed),
@@ -473,7 +483,7 @@ search(Table, Str, Row, Dir, Case) ->
     end.
 
 -record(holder, {node, parent, pid,
-		 table=[], n=0, columns,
+		 table=array:new(), n=0, columns,
 		 temp=[],
 		 search,
 		 source, tabid,
@@ -507,6 +517,7 @@ table_holder(S0 = #holder{parent=Parent, pid=Pid, table=Table}) ->
 	    S1 = handle_new_data_chunk(Data, S0),
 	    table_holder(S1);
 	{sort, Col} ->
+	    Parent ! {refresh, 0, S0#holder.n-1},
 	    table_holder(sort(Col, S0));
 	{search, Data} ->
 	    table_holder(search(Data, S0));
@@ -530,11 +541,14 @@ table_holder(S0 = #holder{parent=Parent, pid=Pid, table=Table}) ->
 	    table_holder(S0);
 	What ->
 	    io:format("Table holder got ~p~n",[What]),
+	    Parent ! {refresh, 0, S0#holder.n-1},
 	    table_holder(S0)
     end.
 
 handle_new_data_chunk(Data, S0 = #holder{columns=Cols, parent=Parent}) ->
-    S1 = #holder{columns=NewCols} = handle_new_data_chunk2(Data, S0),
+    S1 = #holder{n=N,columns=NewCols} = handle_new_data_chunk2(Data, S0),
+    Parent ! {no_rows, N},
+    Parent ! {refresh, 0, N-1},
     case NewCols =:= Cols of
 	true -> S1;
 	false ->
@@ -543,15 +557,12 @@ handle_new_data_chunk(Data, S0 = #holder{columns=Cols, parent=Parent}) ->
     end.
 
 handle_new_data_chunk2('$end_of_table',
-		       S0 = #holder{parent=Parent, sort=Opt,
-				    key=Key,
+		       S0 = #holder{sort=Opt0, key=Key,
 				    table=Old, temp=New}) ->
-    Table = merge(Old, New, Key),
-    N = length(Table),
-    Parent ! {no_rows, N},
-    sort(Opt#opt.sort_key, S0#holder{n=N, pid=undefine,
-				     sort=Opt#opt{sort_key = undefined},
-				     table=Table, temp=[]});
+    Merged = merge(array:to_list(Old), New, Key),
+    {Opt,Sorted} = sort(Opt0#opt.sort_key, Opt0#opt{sort_key = undefined}, Merged),
+    SortedA = array:from_list(Sorted),
+    S0#holder{sort=Opt, table=SortedA, n=array:size(SortedA), temp=[], pid=undefined};
 handle_new_data_chunk2(Data, S0 = #holder{columns=Cols0, source=ets, temp=Tab0}) ->
     {Tab, Cols} = parse_ets_data(Data, Cols0, Tab0),
     S0#holder{columns=Cols, temp=Tab};
@@ -566,10 +577,9 @@ parse_ets_data([Recs|Rs], C0, Tab0) ->
 parse_ets_data([], Cols, Tab) ->
     {Tab, Cols}.
 
-sort(Col, S=#holder{n=N, parent=Parent, sort=Opt0, table=Table0}) ->
-    {Opt, Table} = sort(Col, Opt0, Table0),
-    Parent ! {refresh, 0, N-1},
-    S#holder{sort=Opt, table=Table}.
+sort(Col, S=#holder{sort=Opt0, table=Table0}) ->
+    {Opt, Table} = sort(Col, Opt0, array:to_list(Table0)),
+    S#holder{sort=Opt, table=array:from_list(Table)}.
 
 sort(Col, Opt = #opt{sort_key=Col, sort_incr=Bool}, Table) ->
     {Opt#opt{sort_incr=not Bool}, lists:reverse(Table)};
@@ -597,7 +607,7 @@ keysort(Col, Table) ->
     lists:sort(Sort, Table).
 
 search([Str, Row, Dir0, CaseSens],
-       S=#holder{parent=Parent, table=Table0}) ->
+       S=#holder{parent=Parent, n=N, table=Table}) ->
     Opt = case CaseSens of
 	      true -> [];
 	      false -> [caseless]
@@ -607,32 +617,26 @@ search([Str, Row, Dir0, CaseSens],
 	      false -> -1
 	  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);
+	      {ok, Re} -> re_search(Row, Dir, N, Re, Table);
 	      {error, _} -> false
 	  end,
     Parent ! {self(), Res},
     S#holder{search=Res}.
 
-search(Row, Dir, Re, [ [Term|_] |Table]) ->
+re_search(Row, Dir, N, Re, Table) when Row >= 0, Row < N ->
+    [Term|_] = array:get(Row, Table),
     Str = format(Term),
     Res = re:run(Str, Re),
     case Res of
-	nomatch -> search(Row+Dir, Dir, Re, Table);
-	{match,_} -> Row
+	nomatch -> re_search(Row+Dir, Dir, N, Re, Table);
+	{match,_} ->
+	    Row
     end;
-search(_, _, _, []) ->
+re_search(_, _, _, _, _) ->
     false.
 
 get_row(From, Row, Col, Table) ->
-    case lists:nth(Row+1, Table) of
+    case array:get(Row, Table) of
 	[Object|_] when Col =:= all ->
 	    From ! {self(), format(Object)};
 	[Object|_] when Col =:= all_multiline ->
@@ -647,14 +651,15 @@ get_attr(From, Row, #holder{attrs=Attrs, search=Row}) ->
     What = Attrs#attrs.searched,
     From ! {self(), What};
 get_attr(From, Row, #holder{table=Table, attrs=Attrs}) ->
-    What = case lists:nth(Row+1, Table) of
+    Odd = (Row rem 2) > 0,
+    What = case array:get(Row, Table) of
 	       [_|deleted]  -> Attrs#attrs.deleted;
-	       [_|changed]  -> Attrs#attrs.changed;
-	       [_|new]      -> Attrs#attrs.changed;
-	       _ when (Row rem 2) > 0 ->
-		   Attrs#attrs.odd;
-	       _ ->
-		   Attrs#attrs.even
+	       [_|changed] when Odd -> Attrs#attrs.changed_odd;
+	       [_|changed] -> Attrs#attrs.changed_even;
+	       [_|new] when Odd -> Attrs#attrs.new_odd;
+	       [_|new] -> Attrs#attrs.new_even;
+	       _ when Odd -> Attrs#attrs.odd;
+	       _ ->  Attrs#attrs.even
 	   end,
     From ! {self(), What}.
 
@@ -665,19 +670,29 @@ merge(Old, New, Key) ->
 
 merge2([[Obj|_]|Old], [Obj|New], Key) ->
     [[Obj]|merge2(Old, New, Key)];
-merge2([[A|_]|Old], [B|New], Key)
+merge2([[A|Op]|Old], [B|New], Key)
   when element(Key, A) == element(Key, B) ->
-    [[B|changed]|merge2(Old, New, Key)];
-merge2([[A|_]|Old], New = [B|_], Key)
+    case Op of
+	deleted ->
+	    [[B|new]|merge2(Old, New, Key)];
+	_ ->
+	    [[B|changed]|merge2(Old, New, Key)]
+    end;
+merge2([[A|Op]|Old], New = [B|_], Key)
   when element(Key, A) < element(Key, B) ->
-    [[A|deleted]|merge2(Old, New, Key)];
+    case Op of
+	deleted -> merge2(Old, New, Key);
+	_ -> [[A|deleted]|merge2(Old, New, Key)]
+    end;
 merge2(Old = [[A|_]|_], [B|New], Key)
   when element(Key, A) > element(Key, B) ->
     [[B|new]|merge2(Old, New, Key)];
 merge2([], New, _Key) ->
     [[N|new] || N <- New];
 merge2(Old, [], _Key) ->
-    [[O|deleted] || [O|_] <- Old].
+    lists:foldl(fun([_O|deleted], Acc) -> Acc;
+		   ([O|_], Acc) -> [[O|deleted]|Acc]
+		end, [], Old).
 
 
 delete_row(Row, S0 = #holder{parent=Parent}) ->
@@ -691,7 +706,7 @@ delete_row(Row, S0 = #holder{parent=Parent}) ->
 
 delete(Row, #holder{tabid=Id, table=Table,
 		    source=Source, node=Node}) ->
-    [Object|_] = lists:nth(Row+1, Table),
+    [Object|_] = array:get(Row, Table),
     try
 	case Source of
 	    ets ->
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index 47740581f0..ecb8e132fe 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
 %%
 %% The 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,6 +36,7 @@
 -define(ID_PING, 1).
 -define(ID_CONNECT, 2).
 -define(ID_NOTEBOOK, 3).
+-define(ID_CDV,      4).
 
 -define(FIRST_NODES_MENU_ID, 1000).
 -define(LAST_NODES_MENU_ID,  2000).
@@ -131,6 +132,9 @@ setup(#state{frame = Frame} = State) ->
     wxMenu:connect(Frame, command_menu_selected),
     wxFrame:show(Frame),
 
+    %% Freeze and thaw is buggy currently
+    DoFreeze = [?wxMAJOR_VERSION,?wxMINOR_VERSION] < [2,9],
+    DoFreeze andalso wxWindow:freeze(Panel),
     %% I postpone the creation of the other tabs so they can query/use
     %% the window size
 
@@ -154,9 +158,12 @@ setup(#state{frame = Frame} = State) ->
     TracePanel = observer_trace_wx:start_link(Notebook, self()),
     wxNotebook:addPage(Notebook, TracePanel, ?TRACE_STR, []),
 
-
-    %% Force redraw (window needs it)
+    %% Force redraw (windows needs it)
     wxWindow:refresh(Panel),
+    DoFreeze andalso wxWindow:thaw(Panel),
+
+    wxFrame:raise(Frame),
+    wxFrame:setFocus(Frame),
 
     SysPid = wx_object:get_pid(SysPanel),
     SysPid ! {active, node()},
@@ -206,6 +213,10 @@ handle_event(#wx{event=#wxNotebook{type=command_notebook_page_changing}},
 handle_event(#wx{event = #wxClose{}}, State) ->
     {stop, normal, State};
 
+handle_event(#wx{id = ?ID_CDV, event = #wxCommand{type = command_menu_selected}}, State) ->
+    spawn(crashdump_viewer, start, []),
+    {noreply, State};
+
 handle_event(#wx{id = ?wxID_EXIT, event = #wxCommand{type = command_menu_selected}}, State) ->
     {stop, normal, State};
 
@@ -340,6 +351,22 @@ handle_info({nodedown, Node},
     create_txt_dialog(Frame, Msg, "Node down", ?wxICON_EXCLAMATION),
     {noreply, State3};
 
+handle_info({open_link, Pid0}, State = #state{pro_panel=ProcViewer, frame=Frame}) ->
+    Pid = case Pid0 of
+	      [_|_] -> try list_to_pid(Pid0) catch _:_ -> Pid0 end;
+	      _ -> Pid0
+	  end,
+    %% Forward to process tab
+    case is_pid(Pid) of
+	true  -> wx_object:get_pid(ProcViewer) ! {procinfo_open, Pid};
+	false ->
+	    Msg = io_lib:format("Information about ~p is not available or implemented",[Pid]),
+	    Info = wxMessageDialog:new(Frame, Msg),
+	    wxMessageDialog:showModal(Info),
+	    wxMessageDialog:destroy(Info)
+    end,
+    {noreply, State};
+
 handle_info({'EXIT', Pid, _Reason}, State) ->
     io:format("Child (~s) crashed exiting:  ~p ~p~n",
 	      [pid2panel(Pid, State), Pid,_Reason]),
@@ -517,9 +544,11 @@ create_connect_dialog(connect, #state{frame = Frame}) ->
     end.
 
 default_menus(NodesMenuItems) ->
+    CDV   = #create_menu{id = ?ID_CDV, text = "Examine Crashdump"},
     Quit  = #create_menu{id = ?wxID_EXIT, text = "Quit"},
     About = #create_menu{id = ?wxID_ABOUT, text = "About"},
     Help  = #create_menu{id = ?wxID_HELP},
+    FileMenu = {"File", [CDV, Quit]},
     NodeMenu = case erlang:is_alive() of
 		   true ->  {"Nodes", NodesMenuItems ++
 				 [#create_menu{id = ?ID_PING, text = "Connect Node"}]};
@@ -528,15 +557,15 @@ default_menus(NodesMenuItems) ->
 	       end,
     case os:type() =:= {unix, darwin} of
 	false ->
-	    FileMenu = {"File", [Quit]},
+	    FileMenu = {"File", [CDV, Quit]},
 	    HelpMenu = {"Help", [About,Help]},
 	    [FileMenu, NodeMenu, HelpMenu];
 	true ->
 	    %% On Mac quit and about will be moved to the "default' place
 	    %% automagicly, so just add them to a menu that always exist.
 	    %% But not to the help menu for some reason
-	    {Tag, Menus} = NodeMenu,
-	    [{Tag, Menus ++ [Quit,About]}, {"&Help", [Help]}]
+	    {Tag, Menus} = FileMenu,
+	    [{Tag, Menus ++ [About]}, NodeMenu, {"&Help", [Help]}]
     end.
 
 clean_menus(Menus, MenuBar) ->
@@ -550,13 +579,6 @@ remove_menu_items([{MenuStr = "File", Menus}|Rest], MenuBar) ->
 	    Menu = wxMenuBar:getMenu(MenuBar, MenuId),
 	    Items = [wxMenu:findItem(Menu, Tag) || #create_menu{text=Tag} <- Menus],
 	    [wxMenu:delete(Menu, MItem) || MItem <- Items],
-	    case os:type() =:= {unix, darwin} of
-	    	true ->
-	    	    wxMenuBar:remove(MenuBar, MenuId),
-	    	    wxMenu:destroy(Menu);
-	    	false ->
-	    	    ignore
-	    end,
 	    remove_menu_items(Rest, MenuBar)
     end;
 remove_menu_items([{"Nodes", _}|_], _MB) ->
diff --git a/lib/observer/test/crashdump_helper.erl b/lib/observer/test/crashdump_helper.erl
index 520fcdfd0d..40dbe28d46 100644
--- a/lib/observer/test/crashdump_helper.erl
+++ b/lib/observer/test/crashdump_helper.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The 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,15 +23,15 @@
 -include("test_server.hrl").
 
 n1_proc(N2,Creator) ->
-    spawn(fun() -> n1_proc(Creator,N2,x,[]) end).
-n1_proc(Creator,N2,P2,L) when P2==x;length(L)<2->
+    spawn(fun() -> n1_proc(Creator,N2,x,y,[]) end).
+n1_proc(Creator,N2,Pid2,Port2,L) when Pid2==x;length(L)<2->
     receive 
-	{N2,P} ->
-	    n1_proc(Creator,N2,P,L);
+	{N2,Pid,Port} ->
+	    n1_proc(Creator,N2,Pid,Port,L);
 	P ->
-	    n1_proc(Creator,N2,P2,[P|L])
+	    n1_proc(Creator,N2,Pid2,Port2,[P|L])
     end;
-n1_proc(Creator,_N2,P2,_L) ->
+n1_proc(Creator,_N2,Pid2,Port2,_L) ->
     register(aaaaaaaa,self()),
     process_flag(save_calls,3),
     ets:new(cdv_test_ordset_table,[ordered_set]),
@@ -42,20 +42,50 @@ n1_proc(Creator,_N2,P2,_L) ->
     Pid = self(),
     Bin = list_to_binary(lists:seq(1, 255)),
     SubBin = element(1, split_binary(element(2, split_binary(Bin, 8)), 17)),
-    DictionaryValue = {"list",atom,42,54.654,math:pow(2,1023),{},
-		       Port,Fun,Ref,Pid,
-		       Bin,SubBin,83974938738373873,-38748762783736367},
-    put(dictionary_key,DictionaryValue),
-    spawn(fun() -> register(aaaaaaab,self()),
-		   receive after infinity -> ok end 
-	  end),
-    link(P2),
+
+    register(named_port,Port),
+
+    %% Dictionary
+    put(list,"list"),
+    put(atom,atom),
+    put(integer,42),
+    put(float,54.654),
+    put(big_float,math:pow(2,1023)),
+    put(tuple,{1,2,{}}),
+    put(port,Port),
+    put('fun',Fun),
+    put(ref,Ref),
+    put(pid,Pid),
+    put(bin,Bin),
+    put(sub_bin,SubBin),
+    put(bignum,83974938738373873),
+    put(neg_bignum,-38748762783736367),
+    put(ext_pid,Pid2),
+    put(ext_port,Port2),
+
+    %% Message queue
+    L = lists:seq(0,255),
+    BigMsg = {message,list_to_binary(L),L},
+    Port = hd(erlang:ports()),
+    self() ! {short,message,1,2.5,"hello world",Port,{}},
+    self() ! BigMsg,
+
+    OtherPid = spawn(fun() -> register(aaaaaaab,self()),
+			      receive after infinity -> ok end
+		     end),
+    link(OtherPid), % own node
+    link(Pid2),     % external node
+    erlang:monitor(process,OtherPid),
+    erlang:monitor(process,Pid2),
+
+    code:load_file(?MODULE),
+
     Creator ! {self(),done},
     receive after infinity -> ok end.
 
 remote_proc(P1,Creator) ->
     spawn(fun() ->
-		  P1 ! {node(),self()},
+		  P1 ! {node(),self(),hd(erlang:ports())},
 		  Creator ! {self(),done},
 		  receive after infinity -> ok end
 	  end).
diff --git a/lib/observer/test/crashdump_viewer_SUITE.erl b/lib/observer/test/crashdump_viewer_SUITE.erl
index 4c04126d4f..7a582436b4 100644
--- a/lib/observer/test/crashdump_viewer_SUITE.erl
+++ b/lib/observer/test/crashdump_viewer_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %%
 %% The 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,9 +19,11 @@
 
 -module(crashdump_viewer_SUITE).
 
+-include_lib("observer/src/crashdump_viewer.hrl").
+
 %% Test functions
 -export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,
-	 translate/1,start/1,fini/1,load_file/1,
+	 start_stop/1,load_file/1,not_found_items/1,
 	 non_existing/1,not_a_crashdump/1,old_crashdump/1]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -30,22 +32,39 @@
 -include("test_server_line.hrl").
 -include_lib("kernel/include/file.hrl").
 
--include_lib("stdlib/include/ms_transform.hrl").
-
--define(default_timeout, ?t:minutes(30)).
--define(sl_alloc_vsns,[r9b]).
 -define(failed_file,"failed-cases.txt").
+-define(helper_mod,crashdump_helper).
+
+
 
+init_per_testcase(start_stop, Config) ->
+    catch crashdump_viewer:stop(),
+    try
+	case os:type() of
+	    {unix,darwin} ->
+		exit("Can not test on MacOSX");
+	    {unix, _} ->
+		io:format("DISPLAY ~s~n", [os:getenv("DISPLAY")]),
+		case ct:get_config(xserver, none) of
+		    none -> ignore;
+		    Server -> os:putenv("DISPLAY", Server)
+		end;
+	    _ -> ignore
+	end,
+	wx:new(),
+	wx:destroy(),
+	Config
+    catch
+	_:undef ->
+	    {skipped, "No wx compiled for this platform"};
+	_:Reason ->
+	    SkipReason = io_lib:format("Start wx failed: ~p", [Reason]),
+	    {skipped, lists:flatten(SkipReason)}
+    end;
 init_per_testcase(_Case, Config) ->
-    DataDir = ?config(data_dir,Config),
-    Fs = filelib:wildcard(filename:join(DataDir,"*translated*")),
-    lists:foreach(fun(F) -> file:delete(F) end,Fs),
     catch crashdump_viewer:stop(),
-    Dog = ?t:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
+    Config.
 end_per_testcase(Case, Config) ->
-    Dog=?config(watchdog, Config),
-    ?t:timetrap_cancel(Dog),
     case ?config(tc_status,Config) of
 	ok ->
 	    ok;
@@ -60,8 +79,13 @@ end_per_testcase(Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [translate, load_file, non_existing, not_a_crashdump,
-     old_crashdump].
+    [start_stop,
+     non_existing,
+     not_a_crashdump,
+     old_crashdump,
+     load_file,
+     not_found_items
+    ].
 
 groups() -> 
     [].
@@ -73,18 +97,13 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-init_per_suite(doc) ->
-    ["Create a lot of crashdumps which can be used in the testcases below"];
+%% Create a lot of crashdumps which can be used in the testcases below
 init_per_suite(Config) when is_list(Config) ->
-    Dog = ?t:timetrap(?default_timeout),
     delete_saved(Config),
-    application:start(inets), % will be using the http client later
-    httpc:set_options([{ipfamily,inet6fb4}]),
     DataDir = ?config(data_dir,Config),
-    Rels = [R || R <- [r14b,r15b], ?t:is_release_available(R)] ++ [current],
+    Rels = [R || R <- [r15b,r16b], ?t:is_release_available(R)] ++ [current],
     io:format("Creating crash dumps for the following releases: ~p", [Rels]),
     AllDumps = create_dumps(DataDir,Rels),
-    ?t:timetrap_cancel(Dog),
     [{dumps,AllDumps}|Config].
 
 delete_saved(Config) ->
@@ -97,54 +116,64 @@ delete_saved(Config) ->
     ok.
 
 
-translate(suite) ->
-    [];
-translate(doc) ->
-    ["Test that crash dumps from OTP R9B can be translated"];
-translate(Config) when is_list(Config) ->
-    DataDir = ?config(data_dir,Config),
-    OutFile = filename:join(DataDir,"translated"),
-    
-    R9BFiles = filelib:wildcard(filename:join(DataDir,"r9b_dump.*")),
-    AllFiles = R9BFiles,
-    lists:foreach(
-      fun(File) ->
-	      io:format("Translating file: ~s~n",[File]),
-	      ok = crashdump_translate:old2new(File,OutFile),
-	      check_result(File,OutFile)
-      end,
-      AllFiles),
-    ok.
+start_stop(Config) when is_list(Config) ->
+    Dump = hd(?config(dumps,Config)),
+    timer:sleep(1000),
 
-start(suite) ->
-    [];
-start(doc) ->
-    ["Test start and stop of the Crashdump Viewer"];
-start(Config) when is_list(Config) ->
-    %% Set a much shorter timeout here... We don't have all the time in world.
-    AngryDog = ?t:timetrap(?t:seconds(30)),
-    Port = start_cdv(),
+    ProcsBefore = length(processes()),
+    ok = crashdump_viewer:start(Dump),
     true = is_pid(whereis(crashdump_viewer_server)),
-    true = is_pid(whereis(web_tool)),
-    Html = contents(Port,"start_page"),
-    "Welcome to the Web BasedErlang Crash Dump Analyser" = strip(Html),
+    true = is_pid(whereis(cdv_wx)),
+    true = is_pid(whereis(cdv_proc_cb)),
+    true = is_pid(whereis(cdv_port_cb)),
+    true = is_pid(whereis(cdv_ets_cb)),
+    true = is_pid(whereis(cdv_timer_cb)),
+    true = is_pid(whereis(cdv_fun_cb)),
+    true = is_pid(whereis(cdv_atom_cb)),
+    true = is_pid(whereis(cdv_dist_cb)),
+    true = is_pid(whereis(cdv_mod_cb)),
+    timer:sleep(5000), % give some time to live
     ok = crashdump_viewer:stop(),
-    timer:sleep(10), % give some time to stop
+    timer:sleep(1000), % give some time to stop
     undefined = whereis(crashdump_viewer_server),
-    undefined = whereis(web_tool),
-    Url = cdv_url(Port,"start_page"),
-    {error,_} = httpc:request(Url),
-%    exit(whereis(httpc_manager),kill),
-    ?t:timetrap_cancel(AngryDog),
+    undefined = whereis(cdv_wx),
+    ProcsAfter=length(processes()),
+    ProcsAfter=ProcsBefore,
     ok.
 
-fini(Config) when is_list(Config) ->
-    ok.
+%% Try to load nonexisting file
+non_existing(Config) when is_list(Config) ->
+    ExpectedReason = "non-existing-file is not an Erlang crash dump\n",
+    {error, ExpectedReason} = start_backend("non-existing-file"),
+    ok = crashdump_viewer:stop().
+
+%% Try to load a crashdump of old (earlier than OTP R10B) format
+old_crashdump(Config) when is_list(Config) ->
+    DataDir = ?config(data_dir,Config),
+    OldFile = filename:join(DataDir,"old_format.dump"),
+    ExpectedReason = "The crashdump " ++ OldFile ++
+	" is in the pre-R10B format, which is no longer supported.\n",
+    {error, ExpectedReason} = start_backend(OldFile),
+    ok = crashdump_viewer:stop().
+
+%% Try to load a file which is not an erlang crashdump
+not_a_crashdump(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    F1 = filename:join(PrivDir,"f1"),
+    F2 = filename:join(PrivDir,"f2"),
+
+    file:write_file(F1,"=unexpected_tag:xyz"),
+    file:write_file(F2,""),
+
+    ExpReason1 = F1 ++ " is not an Erlang crash dump\n",
+    ExpReason2 = F2 ++ " is not an Erlang crash dump\n",
 
-load_file(suite) ->
-    [];
-load_file(doc) ->
-    ["Load files into the tool and view all pages"];
+    {error,ExpReason1} = start_backend(F1),
+    {error,ExpReason2} = start_backend(F2),
+
+    ok = crashdump_viewer:stop().
+
+%% Load files into the tool and view all pages
 load_file(Config) when is_list(Config) ->
     case ?t:is_debug() of
 	true ->
@@ -156,65 +185,33 @@ load_file(Config) when is_list(Config) ->
 
 load_file_1(Config) ->
     DataDir = ?config(data_dir,Config),
-    Port = start_cdv(),
+    crashdump_viewer:start_link(),
 
+    %% Read both created and predefined dumps
     AllFiles = filelib:wildcard(filename:join(DataDir,"r*_dump.*")),
     lists:foreach(
       fun(File) ->
-	      browse_file(Port,File),
-	      special(Port,File)
+	      Content = browse_file(File),
+	      special(File,Content)
       end,
       AllFiles),
     ok = crashdump_viewer:stop().
 
-non_existing(suite) ->
-    [];
-non_existing(doc) ->
-    ["Try to load nonexisting file"];
-non_existing(Config) when is_list(Config) ->
-    Port = start_cdv(),
-    Url = "http://localhost:"++Port++"/cdv_erl/crashdump_viewer/read_file",
-    Html = request_sync(post,{Url,[],[],"path=nonexistingfile"}),
-    "Please wait..." = title(Html),
-    "An error occured:nonexistingfile is not an Erlang crash dump" = 
-	strip(wait(10,Port,"redirect")),
-    ok = crashdump_viewer:stop().
+%% Try to lookup nonexisting process, port and node
+not_found_items(Config) ->
+    Dump = hd(?config(dumps,Config)),
 
-old_crashdump(doc) ->
-    ["Try to load nonexisting file"];
-old_crashdump(Config) when is_list(Config) ->
-    Port = start_cdv(),
-    DataDir = ?config(data_dir, Config),
-    OldCrashDump = filename:join(DataDir, "old_format.dump"),
-    Url = "http://localhost:"++Port++"/cdv_erl/crashdump_viewer/read_file",
-    Html = request_sync(post,{Url,[],[],"path="++OldCrashDump}),
-    "Please wait..." = title(Html),
-    Str = "An error occured:The crashdump "++OldCrashDump++
-	" is in the pre-R10B format, which is no longer supported.",
-    Str = strip(wait(10,Port,"redirect")),
-    ok = crashdump_viewer:stop().
+    ok = start_backend(Dump),
 
+    {ok,#general_info{},_} = crashdump_viewer:general_info(),
 
-not_a_crashdump(suite) ->
-    [];
-not_a_crashdump(doc) ->
-    ["Try to load a file which is not an erlang crashdump"];
-not_a_crashdump(Config) when is_list(Config) ->
-    Port = start_cdv(),
-    NoCrashdump = code:which(?MODULE),
-    Url = "http://localhost:"++Port++"/cdv_erl/crashdump_viewer/read_file",
-    Html = request_sync(post,{Url,[],[],"path="++NoCrashdump}),
-    "Please wait..." = title(Html),
-    Str = "An error occured:"++NoCrashdump++" is not an Erlang crash dump",
-    Str = strip(wait(10,Port,"redirect")),
-    ok = crashdump_viewer:stop(),
-%    exit(whereis(httpc_manager),kill),
-    ok.
-    
+    {error,not_found} = crashdump_viewer:proc_details("<1111.1111.1111>"),
+    {error,not_found} = crashdump_viewer:port("#Port<1111.1111>"),
+    {error,not_found} = crashdump_viewer:node_info("1111"),
 
+    ok = crashdump_viewer:stop().
 
-end_per_suite(doc) ->
-    ["Remove generated crashdumps"];
+%% Remove generated crashdumps
 end_per_suite(Config) when is_list(Config) ->
     Dumps = ?config(dumps,Config),
     DataDir = ?config(data_dir,Config),
@@ -240,387 +237,165 @@ end_per_suite(Config) when is_list(Config) ->
 
 %%%-----------------------------------------------------------------
 %%% Internal
-start_cdv() ->
-    ?t:capture_start(),
-    ok = crashdump_viewer:start(),
-    "WebTool is available at http://localhost:" ++ Where = 
-	lists:flatten(?t:capture_get()),
-    ?t:capture_stop(),
-    [Port|_] = string:tokens(Where,"/"),
-    Port.
-
-
-check_result(File,OutFile) ->
-    {ok,#file_info{size=FS}} = file:read_file_info(File),
-    {ok,#file_info{size=OFS}} = file:read_file_info(OutFile),
-    Rel = 
-	if OFS > 0 -> FS/OFS;
-	   true -> 1.25
-	end,
-    if Rel>0.75, Rel<1.25 -> ok;
-       true -> ?t:fail({unreasonable_size,File,FS,OFS})
-    end,
-    {ok,Fd} = file:open(OutFile,[read]),
-    "=erl_crash_dump:0.0\n" = io:get_line(Fd,''),
-    case is_truncated(File) of
-	true ->
-	    ok;
-	false ->
-	    {ok,_} = file:position(Fd,{eof,-5}),
-	    case io:get_line(Fd,'') of
-		"=end\n"  -> ok;
-		Other -> ?t:fail({truncated,File,Other})
-	    end
-    end,
-    ok = file:close(Fd).
-
-
-%% Read a page and check that the page title matches Title
-contents(Port,Link) ->
-    Url = cdv_url(Port,Link),
-    request_sync(get,{Url,[]}).
-
-cdv_url(Port,Link) ->
-    "http://localhost:" ++ Port ++ "/cdv_erl/crashdump_viewer/" ++ Link.
-
-request_sync(Method,HTTPReqCont) ->
-    case httpc:request(Method,
-		      HTTPReqCont,
-		      [{timeout,30000}],
-		      [{full_result, false}]) of
-	{ok,{200,Html}} ->
-	    Html;
-	{ok,{Code,Html}} ->
-	    io:format("~s\n", [Html]),
-	    io:format("Received ~w from httpc:request(...) with\nMethod=~w\n"
-		      "HTTPReqCont=~p\n",
-		      [Code,Method,HTTPReqCont]),
-	    ?t:fail();
-	Other ->
-	    io:format(
-	      "Received ~w from httpc:request(...) with\nMethod=~w\n"
-	      "HTTPReqCont=~p\n",
-	      [Other,Method,HTTPReqCont]),
-	    ?t:fail()
-    end.
-
-
+%%%-----------------------------------------------------------------
+%%% Start the crashdump_viewer backend and load a dump
+start_backend(File) ->
+    crashdump_viewer:start_link(),
+    register_progress_handler(),
+    ok = crashdump_viewer:read_file(File),
+    wait_for_progress_done().
 
+%%%-----------------------------------------------------------------
+%%% Simulate the progress handler in observer_lib
+register_progress_handler() ->
+    register(cdv_progress_handler,self()).
 
-strip([$<|Html]) ->
-    strip(drop_tag(Html));
-strip([$\n|Html]) -> 
-    strip(Html);
-strip([X|Html]) ->
-    [X|strip(Html)];
-strip([]) ->
-    [].
-drop_tag([$>|Html]) ->
-    Html;
-drop_tag([_|Html]) ->
-    drop_tag(Html).
-
-title(Port,Link,Title) ->
-    Html = contents(Port,Link),
-    Title = title(Html).
-
-wait(0,_Port,Link) ->
-    ?t:fail({wait,Link,timeout});
-wait(Time,Port,Link) ->
-    Html = contents(Port,Link),
-    case title(Html) of
-	"Please wait..." ->
-	    timer:sleep(1000),
-	    wait(Time-1,Port,Link);
-	_Title ->
-	    Html
+wait_for_progress_done() ->
+    receive
+	{progress,{error,Reason}} ->
+	    unregister(cdv_progress_handler),
+	    {error,lists:flatten(Reason)};
+	{progress,{ok,done}} ->
+	    unregister(cdv_progress_handler),
+	    ok;
+	{progress,_} ->
+	    wait_for_progress_done()
     end.
 
-title([$<,$T,$I,$T,$L,$E,$>|Html]) ->
-    title_end(Html);
-title([_|Html]) ->
-    title(Html);
-title([]) ->
-    [].
-
-title_end([$<,$/,$T,$I,$T,$L,$E,$>|_]) ->
-    [];
-title_end([X|Html]) ->
-    [X|title_end(Html)].
-
-
 %%%-----------------------------------------------------------------
 %%% General check of what is displayed for a dump
-browse_file(Port,File) ->
+browse_file(File) ->
     io:format("Browsing file: ~s~n",[File]),
 
-    %% The page where a filename can be entered
-    title(Port,"read_file_frame","Read File"),
-
-    %% Load a file
-    Url = "http://localhost:"++Port++"/cdv_erl/crashdump_viewer/read_file",
-    Html = request_sync(post,{Url,[],[],"path="++File}),
-    "Please wait..." = title(Html),
-    "Crashdump Viewer Start Page" = title(wait(10,Port,"start_page")),
-    
-    %% The frame with the initial information for a dump
-    title(Port,"initial_info_frame","General Information"),
-    
-    %% Topmost frame of the page
-    FilenameFrame = contents(Port,"filename_frame"),
-    Match = "FilenameCrashdump currently viewed:" ++ File,
-    true = lists:prefix(Match,strip(FilenameFrame)),
-    
-    %% Toggle a menu item and check that it explodes/collapses
-    title(Port,"menu_frame","Menu"),
-    exploded = toggle_menu(Port),
-    collapsed = toggle_menu(Port),
-    
-    %% Open each page in menu and check that correct title is shown
-    title(Port,"general_info","General Information"),
-    title(Port,"processes","Process Information"),
-    title(Port,"sort_procs?sort=state","Process Information"),
-    title(Port,"sort_procs?sort=state","Process Information"),
-    title(Port,"sort_procs?sort=pid","Process Information"),
-    title(Port,"sort_procs?sort=pid","Process Information"),
-    title(Port,"sort_procs?sort=msg_q_len","Process Information"),
-    title(Port,"sort_procs?sort=msg_q_len","Process Information"),
-    title(Port,"sort_procs?sort=reds","Process Information"),
-    title(Port,"sort_procs?sort=reds","Process Information"),
-    title(Port,"sort_procs?sort=mem","Process Information"),
-    title(Port,"sort_procs?sort=mem","Process Information"),
-    title(Port,"sort_procs?sort=name","Process Information"),
-    title(Port,"sort_procs?sort=name","Process Information"),
-    title(Port,"sort_procs?sort=init_func","Process Information"),
-    title(Port,"sort_procs?sort=init_func","Process Information"),
-    title(Port,"ports","Port Information"),
-    title(Port,"ets_tables","ETS Table Information"),
-    title(Port,"timers","Timer Information"),
-    title(Port,"fun_table","Fun Information"),
-    title(Port,"atoms","Atoms"),
-    title(Port,"dist_info","Distribution Information"),
-    title(Port,"loaded_modules","Loaded Modules Information"),
-    title(Port,"hash_tables","Hash Table Information"),
-    title(Port,"index_tables","Index Table Information"),
-    title(Port,"memory","Memory Information"),
-    title(Port,"allocated_areas","Information about allocated areas"),
-    title(Port,"allocator_info","Allocator Information"),
-    
-    case is_truncated(File) of
-	true ->
-	    ok;
-	_ ->
-	    proc_details(Port),
-	    port_details(Port),
-	    title(Port,"loaded_mod_details?mod=kernel","kernel")
-    end,
-    
-    ok.
-
-
-special(Port,File) ->
+    ok = start_backend(File),
+
+    {ok,_GI=#general_info{},_GenTW} = crashdump_viewer:general_info(),
+    {ok,Procs,_ProcsTW} = crashdump_viewer:processes(),
+    {ok,Ports,_PortsTW} = crashdump_viewer:ports(),
+    {ok,_Ets,_EtsTW} = crashdump_viewer:ets_tables(all),
+    {ok,_IntEts,_IntEtsTW} = crashdump_viewer:internal_ets_tables(),
+    {ok,_Timers,_TimersTW} = crashdump_viewer:timers(all),
+    {ok,_Funs,_FunsTW} = crashdump_viewer:funs(),
+    {ok,_Atoms,_AtomsTW} = crashdump_viewer:atoms(),
+    {ok,Nodes,_NodesTW} = crashdump_viewer:dist_info(),
+    {ok,Mods,_ModsTW} = crashdump_viewer:loaded_modules(),
+    {ok,_Mem,_MemTW} = crashdump_viewer:memory(),
+    {ok,_AllocAreas,_AreaTW} = crashdump_viewer:allocated_areas(),
+    {ok,_AllocINfo,_AllocInfoTW} = crashdump_viewer:allocator_info(),
+    {ok,_HashTabs,_HashTabsTW} = crashdump_viewer:hash_tables(),
+    {ok,_IndexTabs,_IndexTabsTW} = crashdump_viewer:index_tables(),
+
+    lookat_all_pids(Procs),
+    lookat_all_ports(Ports),
+    lookat_all_mods(Mods),
+    lookat_all_nodes(Nodes),
+
+    Procs. % used as second arg to special/2
+
+special(File,Procs) ->
     case filename:extension(File) of
 	".full_dist" ->
-	    contents(Port,"processes"),
-	    AllProcs = contents(Port,"sort_procs?sort=name"),
-
 	    %% I registered a process as aaaaaaaa in the full_dist dumps 
 	    %% to make sure it will be the first in the list when sorted
 	    %% on names. There are some special data here, so I'll thoroughly
 	    %% read the process details for this process. Other processes
 	    %% are just briefly traversed.
-	    {Pid,Rest1} = get_first_process(AllProcs),
-	    
-	    ProcDetails = contents(Port,"proc_details?pid=" ++ Pid),
-	    ProcTitle = "Process " ++ Pid,
-	    ProcTitle = title(ProcDetails),
-	    title(Port,"ets_tables?pid="++Pid,"ETS Tables for Process "++Pid),
-	    title(Port,"timers?pid="++Pid,"Timers for Process "++Pid),
-
-	    case filename:basename(File) of
-		"r10b_dump.full_dist" ->
-		    [MsgQueueLink,DictLink,StackDumpLink] = 
-			expand_memory_links(ProcDetails),
-		    MsgQueue = contents(Port,MsgQueueLink),
-		    "MsgQueue" = title(MsgQueue),
-		    title(Port,DictLink,"Dictionary"),
-		    title(Port,StackDumpLink,"StackDump"),
-		    
-		    ExpandBinaryLink = expand_binary_link(MsgQueue),
-		    title(Port,ExpandBinaryLink,"Expanded binary"),
-		    lookat_all_pids(Port,Rest1);
-		_ ->
-		    ok
-	    end;
-	".strangemodname" ->
-	    AllMods = contents(Port,"loaded_modules"),
-	    open_all_modules(Port,AllMods),
+	    [#proc{pid=Pid0}|_Rest] = lists:keysort(#proc.name,Procs),
+	    Pid = pid_to_list(Pid0),
+	    {ok,ProcDetails=#proc{},[]} = crashdump_viewer:proc_details(Pid),
+
+	    #proc{dict=Dict} = ProcDetails,
+
+	    ['#CDVBin',Offset,Size,Pos] = proplists:get_value(bin,Dict),
+	    {ok,<<_:Size/binary>>} =
+		crashdump_viewer:expand_binary({Offset,Size,Pos}),
+	    {ok,'#CDVTruncatedBinary'} =
+		crashdump_viewer:expand_binary({Offset,Size+1,Pos}),
+	    ['#CDVBin',SOffset,SSize,SPos] = proplists:get_value(sub_bin,Dict),
+	    {ok,<<_:SSize/binary>>} =
+		crashdump_viewer:expand_binary({SOffset,SSize,SPos}),
+
+	    ['#CDVPid',X1,Y1,Z1] = proplists:get_value(ext_pid,Dict),
+	    ChannelStr1 = integer_to_list(X1),
+	    ExtPid =
+		"<" ++ ChannelStr1 ++ "." ++
+		integer_to_list(Y1) ++ "." ++
+		integer_to_list(Z1) ++ ">",
+	    {error,{other_node,ChannelStr1}} =
+		crashdump_viewer:proc_details(ExtPid),
+
+	    ['#CDVPort',X2,Y2] = proplists:get_value(port,Dict),
+	    ChannelStr2 = integer_to_list(X2),
+	    Port = "#Port<"++ChannelStr2++"."++integer_to_list(Y2)++">",
+	    {ok,_PortDetails=#port{},[]} = crashdump_viewer:port(Port),
+
+	    ['#CDVPort',X3,Y3] = proplists:get_value(ext_port,Dict),
+	    ChannelStr3 = integer_to_list(X3),
+	    ExtPort = "#Port<"++ChannelStr3++"."++integer_to_list(Y3)++">",
+	    {error,{other_node,ChannelStr3}} = crashdump_viewer:port(ExtPort),
+
+	    {ok,[_Ets=#ets_table{}],[]} = crashdump_viewer:ets_tables(Pid),
+	    {ok,[_Timer=#timer{}],[]} = crashdump_viewer:timers(Pid),
+
+	    {ok,Mod1=#loaded_mod{},[]} =
+		crashdump_viewer:loaded_mod_details(atom_to_list(?helper_mod)),
+	    #loaded_mod{current_size=CS, old_size=OS,
+			old_attrib=A,old_comp_info=C}=Mod1,
+	    true = is_integer(CS),
+	    true = (CS==OS),
+	    true = (A=/=undefined),
+	    true = (C=/=undefined),
+	    {ok,Mod2=#loaded_mod{},[]} =
+		crashdump_viewer:loaded_mod_details("application"),
+	    #loaded_mod{old_size="No old code exists",
+			old_attrib=undefined,
+			old_comp_info=undefined}=Mod2,
 	    ok;
-	%%! No longer needed - all atoms are shown on one page!!
-	%% ".250atoms" ->
-	%%     Html1 = contents(Port,"atoms"),
-	%%     NextLink1 = next_link(Html1),
-	%%     "Atoms" = title(Html1),
-	%%     Html2 = contents(Port,NextLink1),
-	%%     NextLink2 = next_link(Html2),
-	%%     "Atoms" = title(Html2),
-	%%     Html3 = contents(Port,NextLink2),
-	%%     "" = next_link(Html3),
-	%%     "Atoms" = title(Html3);
-	_ ->
-	    ok
-    end,
-    case filename:basename(File) of
-	"r10b_dump." ++ _ ->
-	    lookat_all_pids(Port,contents(Port,"processes"));
-	"r11b_dump." ++ _ ->
-	    lookat_all_pids(Port,contents(Port,"processes"));
+	%% ".strangemodname" ->
+	%%     {ok,Mods,[]} = crashdump_viewer:loaded_modules(),
+	%%     lookat_all_mods(Mods),
+	%%     ok;
+	%% ".sort" ->
+	%%     %% sort ports, atoms and modules ????
+	%%     ok;
+	%% ".trunc" ->
+	%%     %% ????
+	%%     ok;
 	_ ->
 	    ok
     end,
     ok.
 
 
-lookat_all_pids(Port,Pids) ->
-    case get_first_process(Pids) of
-	{Pid,Rest} ->
-	    ProcDetails = contents(Port,"proc_details?pid=" ++ Pid),
-	    ProcTitle = "Process " ++ Pid,
-	    ProcTitle = title(ProcDetails),
-	    title(Port,"ets_tables?pid="++Pid,"ETS Tables for Process "++Pid),
-	    title(Port,"timers?pid="++Pid,"Timers for Process "++Pid),
-	    
-	    MemoryLinks = expand_memory_links(ProcDetails),
-	    lists:foreach(
-	      fun(Link) ->
-		      Cont = contents(Port,Link),
-		      true = lists:member(title(Cont),
-					  ["MsgQueue",
-					   "Dictionary",
-					   "StackDump"])
-	      end,
-	      MemoryLinks),
-	    lookat_all_pids(Port,Rest);
-	false ->
-	    ok
-    end.
-
-
-get_first_process([]) ->
-    false;
-get_first_process(Html) ->
-    case Html of
-	"<TD><A HREF=\"./proc_details?pid=" ++ Rest ->
-	    {string:sub_word(Rest,1,$"),Rest};
-	[_H|T] ->
-	    get_first_process(T)
-    end.
-	
-expand_memory_links(Html) ->
-    case Html of
-	"<B>MsgQueue</B></TD><TD COLSPAN=3><A HREF=\"./" ++ Rest ->
-	    [string:sub_word(Rest,1,$")|expand_memory_links(Rest)];
-	"<B>Dictionary</B></TD><TD COLSPAN=3><A HREF=\"./" ++ Rest ->
-	    [string:sub_word(Rest,1,$")|expand_memory_links(Rest)];
-	"<B>StackDump</B></TD><TD COLSPAN=3><A HREF=\"./" ++ Rest ->
-	    [string:sub_word(Rest,1,$")];
-	[_H|T] ->
-	    expand_memory_links(T);
-	[] ->
-	    []
-    end.
-
-expand_binary_link(Html) ->
-    case Html of
-	"<A HREF=\"./expand_binary?pos=" ++ Rest ->
-	    "expand_binary?pos=" ++ string:sub_word(Rest,1,$");
-	[_H|T] ->
-	    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
-%% 	"<A HREF=\"./next?pos=" ++ Rest ->
-%% 	    "next?pos=" ++ string:sub_word(Rest,1,$");
-%% 	[_H|T] ->
-%% 	    next_link(T);
-%% 	[] ->
-%% 	    []
-%%     end.
-
-
-
-toggle_menu(Port) ->
-    Html = contents(Port,"toggle?index=4"),
-    check_toggle(Html).
-
-check_toggle(Html) ->
-    case Html of
-	"<A HREF=\"./toggle?index=4\"><IMG SRC=\"/crashdump_viewer/collapsd.gif\"" ++ _ ->
-	    collapsed;
-	"<A HREF=\"./toggle?index=4\"><IMG SRC=\"/crashdump_viewer/exploded.gif\"" ++ _ ->
-	    exploded;
-	[_H|T] ->
-	    check_toggle(T)
-    end.
-	    
-
-proc_details(Port) ->
-    ProcDetails = contents(Port,"proc_details?pid=<0.0.0>"),
-    "Process <0.0.0>" = title(ProcDetails),
-
-    ExpandLink = expand_link(ProcDetails),
-    title(Port,ExpandLink,"StackDump"),
-
-    Unknown = contents(Port,"proc_details?pid=<0.9999.0>"),
-    "Could not find process: <0.9999.0>" = title(Unknown).
-
-expand_link(Html) ->
-    case Html of
-	"<B>StackDump</B></TD><TD COLSPAN=3><A HREF=\"./" ++ Rest ->
-	    string:sub_word(Rest,1,$");
-	[_H|T] ->
-	    expand_link(T)
-    end.
-
-
-port_details(Port) ->
-    Port0 = contents(Port,"port?port=Port<0.0>"),
-    Port1 = contents(Port,"port?port=Port<0.1>"),
-    case title(Port0) of
-	"#Port<0.0>" -> % R16 or later
-	    "Could not find port: #Port<0.1>" = title(Port1);
-	"Could not find port: #Port<0.0>" -> % R15 or earlier
-	    "#Port<0.1>" = title(Port1)
-    end.
-
-is_truncated(File) ->
-    case filename:extension(filename:rootname(File)) of
-	".trunc" -> true;
-	_ -> false
-    end.
-
+lookat_all_pids([]) ->
+    ok;
+lookat_all_pids([#proc{pid=Pid0}|Procs]) ->
+    Pid = pid_to_list(Pid0),
+    {ok,_ProcDetails=#proc{},_ProcTW} = crashdump_viewer:proc_details(Pid),
+    {ok,_Ets,_EtsTW} = crashdump_viewer:ets_tables(Pid),
+    {ok,_Timers,_TimersTW} = crashdump_viewer:timers(Pid),
+    lookat_all_pids(Procs).
+
+lookat_all_ports([]) ->
+    ok;
+lookat_all_ports([#port{id=Port0}|Procs]) ->
+    Port = cdv_port_cb:format(Port0),
+    {ok,_PortDetails=#port{},_PortTW} = crashdump_viewer:port(Port),
+    lookat_all_ports(Procs).
+
+lookat_all_mods([]) ->
+    ok;
+lookat_all_mods([#loaded_mod{mod=ModId}|Mods]) ->
+    ModName = cdv_mod_cb:format(ModId),
+    {ok,_Mod=#loaded_mod{},_ModTW} = crashdump_viewer:loaded_mod_details(ModName),
+    lookat_all_mods(Mods).
+
+lookat_all_nodes([]) ->
+    ok;
+lookat_all_nodes([#nod{channel=Channel0}|Nodes]) ->
+    Channel = integer_to_list(Channel0),
+    {ok,_Node=#nod{},_NodeTW} = crashdump_viewer:node_info(Channel),
+    lookat_all_nodes(Nodes).
 
 %%%-----------------------------------------------------------------
 %%% 
@@ -629,22 +404,13 @@ create_dumps(DataDir,Rels) ->
 create_dumps(DataDir,[Rel|Rels],Acc) ->
     Fun = fun() -> do_create_dumps(DataDir,Rel) end,
     Pa = filename:dirname(code:which(?MODULE)),
-    {SlAllocDumps,Dumps,DosDump} = 
+    {Dumps,DosDump} =
 	?t:run_on_shielded_node(Fun, compat_rel(Rel) ++ "-pa \"" ++ Pa ++ "\""),
-    create_dumps(DataDir,Rels,SlAllocDumps ++ Dumps ++ Acc ++ DosDump);
+    create_dumps(DataDir,Rels,Dumps ++ Acc ++ DosDump);
 create_dumps(_DataDir,[],Acc) ->
     Acc.
 
 do_create_dumps(DataDir,Rel) ->
-    SlAllocDumps = 
-	case lists:member(Rel,?sl_alloc_vsns) of
-	    true ->
-		[dump_with_args(DataDir,Rel,"no_sl_alloc","+Se false"),
-		 dump_with_args(DataDir,Rel,"sl_alloc_1","+Se true +Sr 1"),
-		 dump_with_args(DataDir,Rel,"sl_alloc_2","+Se true +Sr 2")];
-	    false ->
-		[]
-	end,
     CD1 = full_dist_dump(DataDir,Rel),
     CD2 = dump_with_args(DataDir,Rel,"port_is_unix_fd","-oldshell"),
     DosDump = 
@@ -656,9 +422,9 @@ do_create_dumps(DataDir,Rel) ->
 	current ->
 	    CD3 = dump_with_args(DataDir,Rel,"instr","+Mim true"),
 	    CD4 = dump_with_strange_module_name(DataDir,Rel,"strangemodname"),
-	    {SlAllocDumps, [CD1,CD2,CD3,CD4], DosDump};
+	    {[CD1,CD2,CD3,CD4], DosDump};
 	_ ->
-	    {SlAllocDumps, [CD1,CD2], DosDump}
+	    {[CD1,CD2], DosDump}
     end.
 
 
@@ -674,23 +440,17 @@ full_dist_dump(DataDir,Rel) ->
     {ok,N4} = ?t:start_node(n4,peer,Opt ++ [{args,"-hidden " ++ Pz}]),
     Creator = self(),
 
-    HelperMod = crashdump_helper,
-    
-    P1 = rpc:call(N1,HelperMod,n1_proc,[N2,Creator]),
-    P2 = rpc:call(N2,HelperMod,remote_proc,[P1,Creator]),
-    P3 = rpc:call(N3,HelperMod,remote_proc,[P1,Creator]),
-    P4 = rpc:call(N4,HelperMod,remote_proc,[P1,Creator]),
+    P1 = rpc:call(N1,?helper_mod,n1_proc,[N2,Creator]),
+    P2 = rpc:call(N2,?helper_mod,remote_proc,[P1,Creator]),
+    P3 = rpc:call(N3,?helper_mod,remote_proc,[P1,Creator]),
+    P4 = rpc:call(N4,?helper_mod,remote_proc,[P1,Creator]),
     
     get_response(P2),
     get_response(P3),
     get_response(P4),
     get_response(P1),
 
-    L = lists:seq(0,255),
-    BigMsg = {message,list_to_binary(L),L},    
-    Port = hd(erlang:ports()),
-    {aaaaaaaa,N1} ! {short,message,1,2.5,"hello world",Port,{}},
-    {aaaaaaaa,N1} ! BigMsg,
+    {aaaaaaaa,N1} ! {hello,from,other,node}, % distribution message
     
     ?t:stop_node(N3),
     DumpName = "full_dist",
@@ -800,6 +560,7 @@ rel_opt(Rel) ->
 	r13b -> [{erl,[{release,"r13b_patched"}]}];
 	r14b -> [{erl,[{release,"r14b_latest"}]}]; %naming convention changed
 	r15b -> [{erl,[{release,"r15b_latest"}]}];
+	r16b -> [{erl,[{release,"r16b_latest"}]}];
 	current -> []
     end.
 
@@ -813,7 +574,8 @@ dump_prefix(Rel) ->
 	r13b -> "r13b_dump.";
 	r14b -> "r14b_dump.";
 	r15b -> "r15b_dump.";
-	current -> "r16b_dump."
+	r16b -> "r16b_dump.";
+	current -> "r17b_dump."
     end.
 
 compat_rel(Rel) ->
@@ -826,5 +588,6 @@ compat_rel(Rel) ->
 	r13b -> "+R13 ";
 	r14b -> "+R14 ";
 	r15b -> "+R15 ";
+	r16b -> "+R16 ";
 	current -> ""
     end.
diff --git a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.100atoms b/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.100atoms
deleted file mode 100644
index 921c27bd0e..0000000000
--- a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.100atoms
+++ /dev/null
@@ -1,13135 +0,0 @@
-=erl_crash_dump:0.1
-Wed Apr 21 13:22:44 2004
-Slogan: eheap_alloc: Cannot allocate 785672 bytes of memory (of type "heap").
-System version: Erlang (BEAM) emulator version 5.4 [source] [hipe] [threads:0]
-Compiled: Thu Dec 18 14:07:45 2003
-Atoms: 5614
-=memory
-total: 653336887
-processes: 1768396
-processes_used: 1765460
-system: 651568491
-atom: 244837
-atom_used: 237116
-binary: 648618369
-code: 2158413
-ets: 225620
-=hash_table:atom_tab
-size: 4813
-used: 3304
-objs: 5614
-depth: 7
-=index_table:atom_tab
-size: 5700
-limit: 1048576
-used: 5614
-rate: 100
-=hash_table:module_code
-size: 97
-used: 69
-objs: 107
-depth: 5
-=index_table:module_code
-size: 110
-limit: 65536
-used: 107
-rate: 10
-=hash_table:export_list
-size: 2411
-used: 1674
-objs: 2843
-depth: 6
-=index_table:export_list
-size: 2900
-limit: 65536
-used: 2843
-rate: 100
-=hash_table:process_reg
-size: 47
-used: 16
-objs: 23
-depth: 3
-=hash_table:fun_table
-size: 397
-used: 261
-objs: 400
-depth: 4
-=hash_table:node_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=hash_table:dist_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=allocated_areas
-processes: 1765460 1768396
-ets: 225620
-sys_misc: 24634
-static: 295033
-atom_space: 65544 57967
-binary: 648618369
-atom_table: 42141
-module_table: 920
-export_table: 21336
-register_table: 252
-fun_table: 1650
-module_refs: 1024
-loaded_code: 1968915
-dist_table: 159
-node_table: 131
-bits_bufs_size: 19
-bif_timer: 13392
-link_lh: 0
-dist_buf: 0
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:sys_alloc
-option e: true
-option m: libc
-=allocator:temp_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 90
-option rsbcmt: 80
-option mmbcs: 65536
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: af
-mbcs blocks: 0 9 9
-mbcs blocks size: 0 35376 35376
-mbcs carriers: 1 1 1
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 65568 65568 65568
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 65568
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-temp_alloc calls: 6155
-temp_free calls: 6155
-temp_realloc calls: 29
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 1
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:sl_alloc
-option e: false
-=allocator:std_alloc
-option e: false
-=allocator:ll_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 4294967295
-option asbcst: 0
-option rsbcst: 0
-option rsbcmt: 0
-option mmbcs: 2097152
-option mmsbc: 0
-option mmmbc: 0
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: aobf
-mbcs blocks: 592 592 592
-mbcs blocks size: 2838520 2863304 2863304
-mbcs carriers: 2 2 2
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 2
-mbcs carriers size: 3145760 3145760 3145760
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 3145760
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-ll_alloc calls: 592
-ll_free calls: 0
-ll_realloc calls: 235
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 2
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:eheap_alloc
-versions: 2.1 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 50
-option rsbcmt: 80
-option mmbcs: 524288
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option mbsd: 3
-option as: gf
-mbcs blocks: 56 102 102
-mbcs blocks size: 833280 1638920 1638920
-mbcs carriers: 2 3 3
-mbcs mseg carriers: 1
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 1998880 3047456 3047456
-mbcs mseg carriers size: 1474560
-mbcs sys_alloc carriers size: 524320
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-eheap_alloc calls: 6971
-eheap_free calls: 6914
-eheap_realloc calls: 461
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-sys_alloc calls: 3
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:binary_alloc
-option e: false
-=allocator:ets_alloc
-option e: false
-=allocator:fix_alloc
-option e: true
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:mseg_alloc
-version: 0.9
-option amcbf: 4194304
-option rmcbf: 20
-option mcs: 5
-option cci: 1000
-cached_segments: 0
-cache_hits: 13
-segments: 2
-segments_watermark: 2
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-mseg_create calls: 4
-mseg_destroy calls: 1
-mseg_clear_cache calls: 6
-mseg_check_cache calls: 2
-=allocator:alloc_util
-option mmc: 1024
-option ycs: 1048576
-=allocator:instr
-option m: false
-option s: false
-option t: false
-=proc:<0.0.0>
-State: Waiting
-Name: init
-Spawned as: otp_ring0:start/2
-Spawned by: []
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.5.0>,<0.4.0>,<0.2.0>]
-Reductions: 3851
-Stack+heap: 377
-OldHeap: 610
-Heap unused: 53
-OldHeap unused: 610
-Program counter: 0x1f496c (init:loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.2.0>
-State: Waiting
-Name: erl_prim_loader
-Spawned as: erlang:apply/2
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.0.0>,#Port<0.2>]
-Reductions: 201036
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 923
-OldHeap unused: 987
-Program counter: 0x20cc94 (erl_prim_loader:loop/3 + 52)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.4.0>
-State: Waiting
-Name: error_logger
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.0.0>]
-Reductions: 296
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 851
-OldHeap unused: 0
-Program counter: 0x21f5b8 (gen_event:loop/4 + 40)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.5.0>
-State: Waiting
-Name: application_controller
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.7.0>,<0.0.0>]
-Reductions: 1508
-Stack+heap: 1597
-OldHeap: 0
-Heap unused: 835
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.7.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.6.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.8.0>,<0.5.0>]
-Reductions: 23
-Stack+heap: 377
-OldHeap: 0
-Heap unused: 79
-OldHeap unused: 0
-Program counter: 0x248d04 (application_master:main_loop/2 + 28)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.8.0>
-State: Waiting
-Spawned as: application_master:start_it/4
-Spawned by: <0.7.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>,<0.7.0>]
-Reductions: 91
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 177
-OldHeap unused: 0
-Program counter: 0x24a26c (application_master:loop_it/4 + 40)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.9.0>
-State: Waiting
-Name: kernel_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.8.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.24.0>,<0.23.0>,<0.19.0>,<0.18.0>,<0.17.0>,<0.16.0>,<0.15.0>,<0.14.0>,<0.11.0>,<0.10.0>,<0.8.0>]
-Reductions: 7402
-Stack+heap: 610
-OldHeap: 987
-Heap unused: 311
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.10.0>
-State: Waiting
-Name: rex
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 44
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 144
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.11.0>
-State: Waiting
-Name: global_name_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.13.0>,<0.12.0>,<0.9.0>]
-Reductions: 47
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 98
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.12.0>
-State: Waiting
-Spawned as: global:init_the_locker/1
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 3
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 227
-OldHeap unused: 0
-Program counter: 0x261340 (global:loop_the_locker/2 + 92)
-CP: 0x261184 (global:init_the_locker/1 + 112)
-arity = 0
-=proc:<0.13.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 4
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 221
-OldHeap unused: 0
-Program counter: 0x265288 (global:collect_deletions/2 + 76)
-CP: 0x2651ac (global:loop_the_deleter/1 + 36)
-arity = 0
-=proc:<0.14.0>
-State: Waiting
-Name: inet_db
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 376
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 30
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.15.0>
-State: Waiting
-Name: global_group
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 71
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 92
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.16.0>
-State: Waiting
-Name: file_server_2
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 119
-Link list: [{from,<0.17.0>,#Ref<0.0.0.22>},#Port<0.4>,<0.9.0>]
-Reductions: 83605
-Stack+heap: 4181
-OldHeap: 4181
-Heap unused: 1720
-OldHeap unused: 4181
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.17.0>
-State: Waiting
-Name: file_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.16.0>,#Ref<0.0.0.22>},<0.9.0>]
-Reductions: 12
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 207
-OldHeap unused: 0
-Program counter: 0x2a18e8 (old_file_server:relay_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.18.0>
-State: Waiting
-Name: code_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 108900
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 4389
-OldHeap unused: 6765
-Program counter: 0x2a6e64 (code_server:loop/1 + 64)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.19.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.9.0>]
-Reductions: 74
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 180
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.20.0>
-State: Waiting
-Spawned as: user_drv:server/2
-Spawned by: <0.19.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.22.0>,<0.21.0>,#Port<0.72>]
-Reductions: 596
-Stack+heap: 233
-OldHeap: 377
-Heap unused: 214
-OldHeap unused: 377
-Program counter: 0x2ca4e0 (user_drv:server_loop/5 + 56)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.21.0>
-State: Waiting
-Name: user
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.4.0>,<0.19.0>,<0.20.0>]
-Reductions: 26
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 202
-OldHeap unused: 0
-Program counter: 0x2cd9d8 (group:server_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.22.0>
-State: Waiting
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{from,<0.49.0>,#Ref<0.0.0.307>},<0.25.0>,<0.20.0>]
-Reductions: 1244
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 40
-OldHeap unused: 233
-Program counter: 0x2cf238 (group:get_line1/3 + 1652)
-CP: 0x2cf230 (group:get_line1/3 + 1644)
-arity = 0
-=proc:<0.23.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 45
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 63
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.24.0>
-State: Waiting
-Name: kernel_safe_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.31.0>,<0.9.0>]
-Reductions: 133
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 198
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.25.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.22.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.49.0>,<0.27.0>,<0.22.0>]
-Reductions: 161
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 169
-OldHeap unused: 0
-Program counter: 0x2e0d00 (shell:get_command1/4 + 40)
-CP: 0x2e06fc (shell:server_loop/6 + 140)
-arity = 0
-=proc:<0.27.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.25.0>]
-Reductions: 506
-Stack+heap: 4181
-OldHeap: 0
-Heap unused: 1131
-OldHeap unused: 0
-Program counter: 0x2e2bbc (shell:eval_loop/2 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.31.0>
-State: Waiting
-Name: inet_gethost_native_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.24.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.32.0>,<0.24.0>]
-Reductions: 49
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 87
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.32.0>
-State: Waiting
-Name: inet_gethost_native
-Spawned as: inet_gethost_native:server_init/2
-Spawned by: <0.31.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 118
-Link list: [#Port<0.105>,<0.31.0>]
-Reductions: 65
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 13
-OldHeap unused: 0
-Program counter: 0x4ad840 (inet_gethost_native:main_loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.33.0>
-State: Waiting
-Name: web_tool
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.27.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.41.0>]
-Reductions: 131773
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 2941
-OldHeap unused: 6765
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.41.0>
-State: Waiting
-Name: websup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.48.0>,<0.33.0>]
-Reductions: 118
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 205
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.43.0>
-State: Waiting
-Name: httpd_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.46.0>,<0.45.0>,<0.44.0>]
-Reductions: 1220
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 277
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.44.0>
-State: Waiting
-Name: httpd_acc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.47.0>,<0.43.0>]
-Reductions: 147
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 77
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.45.0>
-State: Waiting
-Name: httpd_misc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 52
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 80
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.46.0>
-State: Waiting
-Name: httpd__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 2905
-Stack+heap: 6765
-OldHeap: 10946
-Heap unused: 138
-OldHeap unused: 10946
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.47.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.44.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [#Port<0.161>,#Port<0.141>,<0.44.0>]
-Reductions: 874
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 190
-OldHeap unused: 233
-Program counter: 0x1fe798 (prim_inet:accept0/2 + 96)
-CP: 0x1feb04 (prim_inet:async_accept/2 + 380)
-arity = 0
-=proc:<0.48.0>
-State: Waiting
-Name: crashdump_viewer_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.41.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.56.0>,<0.41.0>]
-Reductions: 1913
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 524
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.49.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.22.0>,#Ref<0.0.0.307>},<0.25.0>]
-Reductions: 15
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 190
-OldHeap unused: 0
-Program counter: 0x301d58 (io:wait_io_mon_reply/2 + 28)
-CP: 0x30174c (io:parse_erl_exprs/3 + 92)
-arity = 0
-=proc:<0.56.0>
-State: Garbing
-Spawned as: erlang:apply/2
-Last scheduled in for: erlang:garbage_collect/0
-Spawned by: <0.48.0>
-Started: Wed Apr 21 13:22:27 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 121
-Link list: [#Port<0.158>,#Port<0.157>,<0.48.0>]
-Reductions: 2420470
-Stack+heap: 121393
-OldHeap: 0
-Heap unused: 22172
-OldHeap unused: 0
-New heap start: FE5768E0
-New heap top: FE5D7734
-Stack top: FE5ED130
-Stack end: FE5ED1A4
-Old heap start: 0
-Old heap top: 0
-Old heap end: 0
-Program counter: 0x1a4980 (unknown function)
-CP: 0x20710c (prim_file:read/2 + 436)
-=port:#Port<0.1>
-Slot: 1
-Connected: #Port<0.0>
-Port controls linked-in driver: async
-=port:#Port<0.2>
-Slot: 2
-Connected: <0.2.0>
-Links: <0.2.0>
-Port controls linked-in driver: efile
-=port:#Port<0.4>
-Slot: 4
-Connected: <0.16.0>
-Links: <0.16.0>
-Port controls linked-in driver: efile
-=port:#Port<0.72>
-Slot: 72
-Connected: <0.20.0>
-Links: <0.20.0>
-Port controls linked-in driver: tty_sl -c -e
-=port:#Port<0.105>
-Slot: 105
-Connected: <0.32.0>
-Links: <0.32.0>
-Port controls external process: inet_gethost 4 
-=port:#Port<0.141>
-Slot: 141
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=port:#Port<0.157>
-Slot: 157
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.158>
-Slot: 158
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.161>
-Slot: 161
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=ets:<0.18.0>
-Slot: 9
-Table: 9
-Name: code
-Buckets: 256 
-Objects: 289
-Words: 14108
-=ets:<0.18.0>
-Slot: 10
-Table: 10
-Name: code_names
-Buckets: 256 
-Objects: 47
-Words: 4334
-=ets:<0.32.0>
-Slot: 11
-Table: 11
-Name: ign_requests
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.32.0>
-Slot: 12
-Table: 12
-Name: ign_req_index
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.33.0>
-Slot: 13
-Table: 13
-Name: app_data
-Buckets: 256 
-Objects: 7
-Words: 952
-=ets:<0.46.0>
-Slot: 15
-Table: 15
-Name: httpd_mime__127_0_0_1__8888
-Buckets: 256 
-Objects: 105
-Words: 5742
-=ets:<0.11.0>
-Slot: 84
-Table: global_names
-Name: global_names
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 95
-Table: global_locks
-Name: global_locks
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 96
-Table: global_names_ext
-Name: global_names_ext
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.14.0>
-Slot: 316
-Table: inet_cache
-Name: inet_cache
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 340
-Table: cdv_menu_table
-Name: cdv_menu_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 341
-Table: cdv_dump_index_table
-Name: cdv_dump_index_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 342
-Table: cdv_decode_heap_table
-Name: cdv_decode_heap_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.16.0>
-Slot: 780
-Table: file_io_servers
-Name: file_io_servers
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.46.0>
-Slot: 984
-Table: httpd_conf__127_0_0_1__8888
-Name: httpd_conf__127_0_0_1__8888
-Buckets: 256 
-Objects: 17
-Words: 1176
-=ets:<0.14.0>
-Slot: 1342
-Table: inet_hosts
-Name: inet_hosts
-Buckets: 256 
-Objects: 4
-Words: 421
-=ets:<0.14.0>
-Slot: 1362
-Table: inet_db
-Name: inet_db
-Buckets: 256 
-Objects: 20
-Words: 671
-=ets:<0.5.0>
-Slot: 1655
-Table: ac_tab
-Name: ac_tab
-Buckets: 256 
-Objects: 6
-Words: 843
-=timer:<0.14.0>
-Message: refresh_timeout
-Time left: 3565692 ms
-=node:'nonode@nohost'
-=no_distribution
-=loaded_modules
-Current code: 1968915
-Old code: 0
-=mod:otp_ring0
-Current size: 489
-=mod:init
-Current size: 30110
-=mod:prim_inet
-Current size: 35532
-=mod:prim_file
-Current size: 24965
-=mod:erl_prim_loader
-Current size: 19607
-=mod:erlang
-Current size: 11137
-=mod:error_handler
-Current size: 2389
-Current attributes: 836C00000001680264000376736E6C000000016E100030769A34345F26EF6D3433254FF2AE576A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161216802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F68616E646C65722E65726C6A
-=mod:heart
-Current size: 6687
-Current attributes: 836C00000001680264000376736E6C000000016E10003094F7BECF345494DDBB4D7186E694186A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261086802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F68656172742E65726C6A
-=mod:error_logger
-Current size: 7051
-Current attributes: 836C00000001680264000376736E6C000000016E10004E3347F841DEAE2EB6A74389E6E127146A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161246802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F6C6F676765722E65726C6A
-=mod:gen_event
-Current size: 18288
-Current attributes: 836C00000001680264000376736E6C000000016E1000336F22DF1EA75E0EA4AE65D3B8C34F946A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61346802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F6576656E742E65726C6A
-=mod:gen
-Current size: 7129
-Current attributes: 836C00000001680264000376736E6C000000016E10007BE6AEB66EF48D8B33323C89C9936A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61316802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E2E65726C6A
-=mod:proc_lib
-Current size: 11658
-Current attributes: 836C00000001680264000376736E6C000000016E10005C589A8C9BD2E1F2E895E765CAE983406A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E612D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F70726F635F6C69622E65726C6A
-=mod:application_controller
-Current size: 55249
-Current attributes: 836C00000002680264000376736E6C000000016E10003372E1AB0410565065FA086086A721316A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061246802640006736F757263656B003D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F636F6E74726F6C6C65722E65726C6A
-=mod:gen_server
-Current size: 18728
-Current attributes: 836C00000001680264000376736E6C000000016E10004C5E93533036DAC7698FC4112F59CF236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61396802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F7365727665722E65726C6A
-=mod:sys
-Current size: 11589
-Current attributes: 836C00000001680264000376736E6C000000016E1000E12B0E8267551204BD5924BAB9629ADF6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61176802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7379732E65726C6A
-=mod:lists
-Current size: 18638
-Current attributes: 836C00000002680264000376736E6C000000016E10001E95B32C30E4CDAF0BDD1ABA58CBB5F36A680264000A646570726563617465646C0000000B68026400066B65796D617061046802640003616C6C61036802640003616E79610368026400036D617061036802640007666C61746D617061036802640005666F6C646C61046802640005666F6C64726104680264000666696C746572610368026400086D6170666F6C646C610468026400086D6170666F6C647261046802640007666F726561636861036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61116802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374732E65726C6A
-=mod:application
-Current size: 2666
-Current attributes: 836C00000001680264000376736E6C000000016E1000C0C5A7B67B306300FEFF9D91AA50ECB36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130611F6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E2E65726C6A
-=mod:application_master
-Current size: 10912
-Current attributes: 836C00000001680264000376736E6C000000016E1000360420F5CEB80AD7DD51B3A8A0E2AFA26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061266802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F6D61737465722E65726C6A
-=mod:kernel
-Current size: 7639
-Current attributes: 836C00000002680264000376736E6C000000016E10004D418ACCB0F948D4D3CA6B9A81B462746A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261336802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C2E65726C6A
-=mod:supervisor
-Current size: 24469
-Current attributes: 836C00000002680264000376736E6C000000016E1000979F65727577135484BE0892A35087CC6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61126802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F722E65726C6A
-=mod:rpc
-Current size: 14539
-Current attributes: 836C00000002680264000376736E6C000000016E10008C5D6242D36B3201E3B11E82D5E1581E6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133610F6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7270632E65726C6A
-=mod:gb_trees
-Current size: 8274
-Current attributes: 836C00000001680264000376736E6C000000016E1000094BEFDE7B866EF2CB6FCD895AC2EE056A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67625F74726565732E65726C6A
-=mod:global
-Current size: 40753
-Current attributes: 836C00000002680264000376736E6C000000016E10001D02C89BDE6CB2052F099894683C14CA6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161386802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C2E65726C6A
-=mod:inet_db
-Current size: 34555
-Current attributes: 836C00000001680264000376736E6C000000016E1000C1CF6A6F2E83D4EBC23D2CCECBF376226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132611A6802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F64622E65726C6A
-=mod:inet_config
-Current size: 13575
-Current attributes: 836C00000001680264000376736E6C000000016E1000650F6571C03BC9C16BB7973A747565066A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261166802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F636F6E6669672E65726C6A
-=mod:os
-Current size: 5997
-Current attributes: 836C00000001680264000376736E6C000000016E100017144CD766A604A9DFBA0B58C8FCA78B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361056802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F732E65726C6A
-=mod:inet_udp
-Current size: 2451
-Current attributes: 836C00000001680264000376736E6C000000016E1000ACB163E87A687A6683B50B331C6E289B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261306802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7564702E65726C6A
-=mod:inet
-Current size: 28288
-Current attributes: 836C00000001680264000376736E6C000000016E10009B9AD400F0BAF6AAF17A4788A4EFF11E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132610C6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65742E65726C6A
-=mod:inet_parse
-Current size: 21928
-Current attributes: 836C00000001680264000376736E6C000000016E1000E0E65454C096847749930EDC1C53C80B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261266802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F70617273652E65726C6A
-=mod:filename
-Current size: 17411
-Current attributes: 836C00000001680264000376736E6C000000016E100068085214F459D51A3E08819BF8D7698A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61296802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656E616D652E65726C6A
-=mod:inet_hosts
-Current size: 3745
-Current attributes: 836C00000001680264000376736E6C000000016E1000E7430304E86230057150DEE5D279881F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261226802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F686F7374732E65726C6A
-=mod:erl_distribution
-Current size: 2512
-Current attributes: 836C00000002680264000376736E6C000000016E1000CDE49D63ACA767E0D49679657E99D2046A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161186802640006736F757263656B00372F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F65726C5F646973747269627574696F6E2E65726C6A
-=mod:global_group
-Current size: 30960
-Current attributes: 836C00000002680264000376736E6C000000016E10008ECE759E5920988CA3ACFF34B32F86736A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131613B6802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C5F67726F75702E65726C6A
-=mod:net_kernel
-Current size: 37648
-Current attributes: 836C00000002680264000376736E6C000000016E1000967CE7DE41F9B39906CCCF3225E6E5286A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361026802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6E65745F6B65726E656C2E65726C6A
-=mod:file_server
-Current size: 8372
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF90906EC6204204AC0A77C4A25B65236A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612D6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F7365727665722E65726C6A
-=mod:old_file_server
-Current size: 3074
-Current attributes: 836C00000001680264000376736E6C000000016E1000C802085DD76D4EFBA6A8F528FECB94B36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612F6802640006736F757263656B00362F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F6C645F66696C655F7365727665722E65726C6A
-=mod:code
-Current size: 7419
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE618E3041C8E3807A3719CD5140DF5E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130612E6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64652E65726C6A
-=mod:code_server
-Current size: 30811
-Current attributes: 836C00000001680264000376736E6C000000016E0F00BFB96248C2CA8601B4CB7F543F52E26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061346802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F7365727665722E65726C6A
-=mod:code_aux
-Current size: 1736
-Current attributes: 836C00000001680264000376736E6C000000016E10007A90DB53FCCECD52504F20E7A3B6BAE26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061316802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F6175782E65726C6A
-=mod:packages
-Current size: 3119
-Current attributes: 836C00000001680264000376736E6C000000016E1000044DC8EEB65F178AE23EF2465E1954496A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361076802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7061636B616765732E65726C6A
-=mod:hipe_unified_loader
-Current size: 37330
-Current attributes: 836C00000001680264000376736E6C000000016E1000DABD57945702E56F4B3AA7B7B19C1D166A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361326802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F756E69666965645F6C6F616465722E65726C6A
-=mod:hipe_sparc_loader
-Current size: 1821
-Current attributes: 836C00000001680264000376736E6C000000016E1000582BC55E9FADFF879C2C45D25A6CB7E56A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F6D61696E6802640001696B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F72746C6802640001696B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F737061726364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133612B6802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F73706172635F6C6F616465722E65726C6A
-=mod:ets
-Current size: 16577
-Current attributes: 836C00000002680264000376736E6C000000016E100033D982AC91129E5FC35E0AC3337A4EB56A680264000A646570726563617465646C0000000168026400086669787461626C6561026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D611C6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6574732E65726C6A
-=mod:lists_sort
-Current size: 38692
-Current attributes: 836C00000001680264000376736E6C000000016E1000E17EC92FA9AA3199DD71701C215044616A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000B68026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736802640006696E6C696E656C0000000468026400096D65726765335F3132610768026400096D65726765335F32316107680264000A726D65726765335F31326107680264000A726D65726765335F323161076A6802640006696E6C696E656C00000004680264000A756D65726765335F31326108680264000A756D65726765335F32316108680264000C72756D65726765335F3132616107680264000C72756D65726765335F31326261086A6802640006696E6C696E656C00000004680264000C6B65796D65726765335F3132610C680264000C6B65796D65726765335F3231610C680264000D726B65796D65726765335F3132610C680264000D726B65796D65726765335F3231610C6A6802640006696E6C696E656C00000006680264000D756B65796D65726765335F3132610D680264000D756B65796D65726765335F3231610D680264000F72756B65796D65726765335F313261610B680264000F72756B65796D65726765335F323161610D680264000F72756B65796D65726765335F313262610D680264000F72756B65796D65726765335F323162610C6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61166802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374735F736F72742E65726C6A
-=mod:user_sup
-Current size: 2355
-Current attributes: 836C00000002680264000376736E6C000000016E100074BA860804CB4D60D6908C705E6544BD6A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361246802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F7375702E65726C6A
-=mod:supervisor_bridge
-Current size: 2944
-Current attributes: 836C00000002680264000376736E6C000000016E10001590DDC10CF8A9D09763CDB7479678ED6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61156802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F725F6272696467652E65726C6A
-=mod:user_drv
-Current size: 14630
-Current attributes: 836C00000001680264000376736E6C000000016E1000F29F3B193A1EB1ADA9975D97E51BF0E86A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361216802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F6472762E65726C6A
-=mod:group
-Current size: 10165
-Current attributes: 836C00000001680264000376736E6C000000016E1000F6427D0DA330BBFAD5D4C19058516FF36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261066802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67726F75702E65726C6A
-=mod:io_lib
-Current size: 12601
-Current attributes: 836C00000002680264000376736E6C000000016E10004160DD78F37EE7C72F7C5B6A751DB7F56A680264000A646570726563617465646C0000000468026400047363616E610168026400047363616E610268026400047363616E6103680264000D72657365727665645F776F726461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61036802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69622E65726C6A
-=mod:edlin
-Current size: 18178
-Current attributes: 836C00000001680264000376736E6C000000016E100035D752FCBA8ED7F4D26990EF3E6A1A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65646C696E2E65726C6A
-=mod:io_lib_format
-Current size: 16189
-Current attributes: 836C00000001680264000376736E6C000000016E10004F382F327C456F83F33C3D5EBFBD87906A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61066802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F666F726D61742E65726C6A
-=mod:kernel_config
-Current size: 3295
-Current attributes: 836C00000002680264000376736E6C000000016E100077B8EE6C9E95FBBE5DB0371F6DB235226A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261356802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C5F636F6E6669672E65726C6A
-=mod:shell
-Current size: 22571
-Current attributes: 836C00000001680264000376736E6C000000016E10007D1354325618EB98A5BD4E8F41E6A0226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7368656C6C2E65726C6A
-=mod:error_logger_tty_h
-Current size: 7773
-Current attributes: 836C00000002680264000376736E6C000000016E10001502D55D6C1777F07E2E05CDD91D16986A68026400096265686176696F75726C0000000164000967656E5F6576656E746A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61196802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6572726F725F6C6F676765725F7474795F682E65726C6A
-=mod:erl_eval
-Current size: 33481
-Current attributes: 836C00000002680264000376736E6C000000016E1000D06903753C86BBC49A5CBD789CCB09B66A680264000A646570726563617465646C00000004680264000373657161026802640003736571610368026400086172675F6C697374610268026400086172675F6C69737461036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C610D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6576616C2E65726C6A
-=mod:orddict
-Current size: 4872
-Current attributes: 836C00000002680264000376736E6C000000016E100078DCF69F3949D79BC54168266A3ABF566A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61236802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264646963742E65726C6A
-=mod:c
-Current size: 19555
-Current attributes: 836C00000001680264000376736E6C000000016E10003FACCF5DE16ABBC988ABF0811980C33B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61136802640006736F757263656B00282F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F632E65726C6A
-=mod:io
-Current size: 7417
-Current attributes: 836C00000002680264000376736E6C000000016E1000E2F2A6094B3C3D945865225D0620E7546A680264000A646570726563617465646C00000007680264000B70617273655F65787072736102680264000C7363616E5F65726C5F7365716101680264000C7363616E5F65726C5F7365716102680264000C7363616E5F65726C5F7365716103680264000D70617273655F65726C5F7365716101680264000D70617273655F65726C5F7365716102680264000D70617273655F65726C5F73657161036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61006802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F2E65726C6A
-=mod:file
-Current size: 20795
-Current attributes: 836C00000002680264000376736E6C000000016E1000D291AF77EE8B08B792B7FE99274504506A680264000A646570726563617465646C00000001680264000966696C655F696E666F61016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161276802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C652E65726C6A
-=mod:file_io_server
-Current size: 12071
-Current attributes: 836C00000001680264000376736E6C000000016E1000A5A8C4E2B2646855AD5C617CB216CB966A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612A6802640006736F757263656B00352F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F696F5F7365727665722E65726C6A
-=mod:erl_scan
-Current size: 21891
-Current attributes: 836C00000001680264000376736E6C000000016E100094F386F0C378B258E5D9CEADD4F03B6A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61116802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F7363616E2E65726C6A
-=mod:erl_parse
-Current size: 161233
-Current attributes: 836C00000001680264000376736E6C000000016E10000E8CBC32C293BFC1FBC721CE918062236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000968026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F76617273640006696E6C696E656802640004686970656C000000016802640008726567616C6C6F6364000B6C696E6561725F7363616E6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61076802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F70617273652E65726C6A
-=mod:erl_lint
-Current size: 73159
-Current attributes: 836C00000001680264000376736E6C000000016E1000D1D2A7D6DDFD1195CB180993C76FD2CD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61156802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6C696E742E65726C6A
-=mod:ordsets
-Current size: 3257
-Current attributes: 836C00000002680264000376736E6C000000016E1000FD39D8FD846511128F5670BA28600F676A680264000A646570726563617465646C0000000468026400076E65775F7365746100680264000B7365745F746F5F6C6973746101680264000B6C6973745F746F5F7365746101680264000673756273657461026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61256802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264736574732E65726C6A
-=mod:dict
-Current size: 15637
-Current attributes: 836C00000002680264000376736E6C000000016E1000BC846E7EF85045A5D76190CE9B1AE97C6A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61356802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F646963742E65726C6A
-=mod:otp_internal
-Current size: 7133
-Current attributes: 836C00000001680264000376736E6C000000016E1000DC494F64DE590AFC4919DFEB0EB026B66A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61206802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F74705F696E7465726E616C2E65726C6A
-=mod:user_default
-Current size: 1261
-Current attributes: 836C00000002680264000376736E6C000000016E1000505078ACD9B84D514FC6DA2BE249E6756A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612C61126802640006736F757263656B00222F686F6D652F736972692F65726C616E672F757365725F64656661756C742E65726C6A
-=mod:tt
-Current size: 2959
-Current attributes: 836C00000002680264000376736E6C000000016E10001D71FD5A55D3BCBF06BFEDF2426C3C386A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612B610C6802640006736F757263656B00182F686F6D652F736972692F65726C616E672F74742E65726C6A
-=mod:distel
-Current size: 18214
-Current attributes: 836C00000002680264000376736E6C000000016E1000CC9C9EF141459249C1CCA00993B2E29A6A6802640006617574686F726C000000016400116C756B6540626C75657461696C2E636F6D6A6A
-Current compilation info: 836C0000000368026400076F7074696F6E736C0000000664000276336400107761726E5F756E757365645F7661727364000A64656275675F696E666F68026400066F75746469726B00046562696E68026400036377646B001C2F6C6469736B2F736972692F746F6F6C732F64697374656C2D332E3164000A6578706F72745F616C6C6A680264000776657273696F6E6B0003342E31680264000474696D65680662000007D2610B6114610B610361336A
-=mod:crashdump_viewer
-Current size: 125756
-Current attributes: 836C00000001680264000376736E6C000000016E10002DC5D9D96190A2D5F27FAC3FA3D5C7956A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611B61366802640006736F757263656B00362F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765722E65726C6A
-=mod:webtool
-Current size: 29229
-Current attributes: 836C00000002680264000376736E6C000000016E10008AEEF06B60527A3390CBC2C98083CC0A6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104610661086106612D6802640006736F757263656B002C2F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C2E65726C6A
-=mod:gen_tcp
-Current size: 3574
-Current attributes: 836C00000001680264000376736E6C000000016E1000C965E4EAFDAA94D7F21EDCBE30B21E7B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161316802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67656E5F7463702E65726C6A
-=mod:inet_tcp
-Current size: 2743
-Current attributes: 836C00000001680264000376736E6C000000016E1000C4AFE0B49768E4CF78B2C42EA1D3DB7F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7463702E65726C6A
-=mod:inet_gethost_native
-Current size: 15611
-Current attributes: 836C00000002680264000376736E6C000000016E10005D8CD4277D0BD2425B9C26036AE314506A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261206802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F676574686F73745F6E61746976652E65726C6A
-=mod:filelib
-Current size: 7202
-Current attributes: 836C00000001680264000376736E6C000000016E10007B42AA23FF99DF2CD9D586635B77556A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61266802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656C69622E65726C6A
-=mod:httpd_util
-Current size: 24068
-Current attributes: 836C00000002680264000376736E6C000000016E10008D99E096221B88D542E52CB9C8377F6D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128613B6802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7574696C2E65726C6A
-=mod:webtool_sup
-Current size: 695
-Current attributes: 836C00000002680264000376736E6C000000016E1000FA5449E12816CF3AD0A3085BB26CDB9B6A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000468026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461066108610761236802640006736F757263656B00302F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C5F7375702E65726C6A
-=mod:httpd_conf
-Current size: 33659
-Current attributes: 836C00000002680264000376736E6C000000016E1000E3198FBDC73BC48CB7D0C1C762B8F1AB6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861116802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F636F6E662E65726C6A
-=mod:regexp
-Current size: 13698
-Current attributes: 836C00000001680264000376736E6C000000016E10009DD44F3D02F8328BE3ABF4DDA89E0CAE6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61376802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7265676578702E65726C6A
-=mod:string
-Current size: 7740
-Current attributes: 836C00000002680264000376736E6C000000016E10005521DDF38903D46D7C53DB864266F7456A680264000A646570726563617465646C00000007680264000C72655F73685F746F5F61776B6101680264000872655F70617273656101680264000872655F6D617463686102680264000672655F7375626103680264000772655F677375626103680264000872655F73706C697461026802640005696E64657861026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F610F6802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F737472696E672E65726C6A
-=mod:httpd
-Current size: 7563
-Current attributes: 836C00000002680264000376736E6C000000016E1000BFD190D951EB3CAD2CC72ADEF20886906A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861036802640006736F757263656B002C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470642E65726C6A
-=mod:httpd_sup
-Current size: 4068
-Current attributes: 836C00000003680264000376736E6C000000016E10007FA5C790118F18F3D20A2BFAF0229F0A6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861366802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7375702E65726C6A
-=mod:httpd_acceptor_sup
-Current size: 2161
-Current attributes: 836C00000003680264000376736E6C000000016E10003E6F9289B64C13F1EC8A1184BACF055F6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128610C6802640006736F757263656B00392F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F725F7375702E65726C6A
-=mod:httpd_verbosity
-Current size: 2672
-Current attributes: 836C00000002680264000376736E6C000000016E100018B6F407D391872421748F87877DAAF36A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961036802640006736F757263656B00362F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F766572626F736974792E65726C6A
-=mod:timer
-Current size: 8223
-Current attributes: 836C00000001680264000376736E6C000000016E10001D0D64DB1B923D1B3B9497655C43B4AD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F611A6802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F74696D65722E65726C6A
-=mod:httpd_misc_sup
-Current size: 2066
-Current attributes: 836C00000003680264000376736E6C000000016E100092342F38AC16C074DDC21532FBFB52C26A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611F6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D6973635F7375702E65726C6A
-=mod:httpd_manager
-Current size: 28916
-Current attributes: 836C00000003680264000376736E6C000000016E100013F7A1E6A4B6407A0A1892A794EE10A36A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611B6802640006736F757263656B00342F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D616E616765722E65726C6A
-=mod:mod_alias
-Current size: 6720
-Current attributes: 836C00000002680264000376736E6C000000016E10002F35C36060B4AC45474440381D146AB96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961106802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616C6961732E65726C6A
-=mod:mod_auth
-Current size: 25168
-Current attributes: 836C00000002680264000376736E6C000000016E100083F3CA0C7A3E7B5E19A635A7F916595D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961166802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F617574682E65726C6A
-=mod:mod_esi
-Current size: 22534
-Current attributes: 836C00000002680264000376736E6C000000016E1000513E3FF733E1E6592B86CB55B9C14E086A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61026802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6573692E65726C6A
-=mod:mod_actions
-Current size: 3625
-Current attributes: 836C00000002680264000376736E6C000000016E10008E5437921662830490CA76DFF88548966A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066129610C6802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616374696F6E732E65726C6A
-=mod:mod_cgi
-Current size: 25891
-Current attributes: 836C00000002680264000376736E6C000000016E1000F91D405488188F1BD25110B4ED9EE8786A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961306802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6367692E65726C6A
-=mod:mod_include
-Current size: 34923
-Current attributes: 836C00000002680264000376736E6C000000016E1000B9CCE88D63DD6AC49D5DF533C46B97D56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61176802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F696E636C7564652E65726C6A
-=mod:mod_dir
-Current size: 13488
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF620CB4B5DE5586ED681347496DA1C86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961356802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469722E65726C6A
-=mod:mod_get
-Current size: 4672
-Current attributes: 836C00000002680264000376736E6C000000016E1000AD2730B6BE6AF875A500AF4857C4D7F86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61076802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6765742E65726C6A
-=mod:mod_head
-Current size: 3074
-Current attributes: 836C00000002680264000376736E6C000000016E1000CAF803B9FA6A28D4153BC109B00D7DF96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A610B6802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F686561642E65726C6A
-=mod:mod_log
-Current size: 8546
-Current attributes: 836C00000002680264000376736E6C000000016E1000F9664B54861260DEA081249379219AF86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A611B6802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6C6F672E65726C6A
-=mod:mod_disk_log
-Current size: 15160
-Current attributes: 836C00000002680264000376736E6C000000016E1000DDA1E88A9C423A2866B56425DF36F5C66A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961396802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469736B5F6C6F672E65726C6A
-=mod:httpd_socket
-Current size: 7426
-Current attributes: 836C00000002680264000376736E6C000000016E1000B831219096661E4D2E200A07C4A9A7776A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861326802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F736F636B65742E65726C6A
-=mod:httpd_acceptor
-Current size: 4472
-Current attributes: 836C00000002680264000376736E6C000000016E1000A501686DF4E4053E7D978E0CA162BEC56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861076802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F722E65726C6A
-=mod:io_lib_pretty
-Current size: 8171
-Current attributes: 836C00000001680264000376736E6C000000016E1000CD397E11D2D380D02A4BC6EE309B98CB6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E610C6802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F7072657474792E65726C6A
-=mod:httpd_request_handler
-Current size: 26393
-Current attributes: 836C00000002680264000376736E6C000000016E100021C280A5EB5B9CCD00A2C418A341202A6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861296802640006736F757263656B003C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726571756573745F68616E646C65722E65726C6A
-=mod:calendar
-Current size: 7158
-Current attributes: 836C00000002680264000376736E6C000000016E10008C44498546709037F8D72DA4AF8B7FB76A680264000A646570726563617465646C00000001680264001C6C6F63616C5F74696D655F746F5F756E6976657273616C5F74696D6561016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61166802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F63616C656E6461722E65726C6A
-=mod:httpd_parse
-Current size: 9977
-Current attributes: 836C00000002680264000376736E6C000000016E1000174653BAA652261FEB44FFDED99E50B76A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861246802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F70617273652E65726C6A
-=mod:httpd_response
-Current size: 13535
-Current attributes: 836C00000002680264000376736E6C000000016E1000785B247D894BA08A40D814EF11F848976A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128612D6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726573706F6E73652E65726C6A
-=mod:crashdump_viewer_html
-Current size: 68343
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE414770FDB0806C5583FF8D6D71DC766A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611C61026802640006736F757263656B003B2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765725F68746D6C2E65726C6A
-=mod:crashdump_translate
-Current size: 89840
-Current attributes: 836C00000001680264000376736E6C000000016E100038F332287181E933A76CEF4799BDB6416A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000668026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461046115610B611661106802640006736F757263656B00392F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7472616E736C6174652E65726C6A
-=fun
-Module: crashdump_viewer_html
-Uniq: 9122590
-Index: 0
-Address: 526308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 77168418
-Index: 14
-Address: 26541c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 88083515
-Index: 9
-Address: 284c30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 36747896
-Index: 4
-Address: 26df84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 80395734
-Index: 8
-Address: 265838
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 103184573
-Index: 5
-Address: 2fa59c
-Native_address: bce80
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 88265811
-Index: 24
-Address: 34f6a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 9644262
-Index: 2
-Address: 292cec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 100885585
-Index: 0
-Address: 29eb2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 128335479
-Index: 6
-Address: 26de84
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 42988083
-Index: 1
-Address: 210c14
-Native_address: bcf04
-Refc: 1
-=fun
-Module: dict
-Uniq: 7105125
-Index: 7
-Address: 354f84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 29030584
-Index: 8
-Address: 234978
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 29214351
-Index: 2
-Address: 285660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 5158633
-Index: 4
-Address: 274034
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 74624950
-Index: 25
-Address: 34f63c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 6477018
-Index: 3
-Address: 2adb6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 117885138
-Index: 7
-Address: 2ffff8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 47566924
-Index: 6
-Address: 354fb8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 114637756
-Index: 12
-Address: 313c60
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121316204
-Index: 31
-Address: 313a68
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61363639
-Index: 12
-Address: 2ad6a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 116208699
-Index: 3
-Address: 274094
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 113750737
-Index: 0
-Address: 292d54
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 12853672
-Index: 0
-Address: 222e74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108046357
-Index: 12
-Address: 4ab0b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 111569299
-Index: 47
-Address: 34e80c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 20108653
-Index: 15
-Address: 2f9f94
-Native_address: bcea4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 45252965
-Index: 15
-Address: 313c0c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 12437425
-Index: 9
-Address: 4ab3e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 30942993
-Index: 22
-Address: 34f6ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 93430337
-Index: 3
-Address: 33b100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 6604883
-Index: 2
-Address: 33b16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 36867745
-Index: 5
-Address: 255e28
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 90563105
-Index: 1
-Address: 285708
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 18519297
-Index: 7
-Address: 26ddfc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8058975
-Index: 16
-Address: 4a36b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 30694569
-Index: 7
-Address: 27d018
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 76933943
-Index: 0
-Address: 2741b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 9033258
-Index: 6
-Address: 4a4690
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 74851752
-Index: 5
-Address: 4a4798
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 50855382
-Index: 4
-Address: 2659a8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39211582
-Index: 52
-Address: 34e504
-Native_address: bceec
-Refc: 1
-=fun
-Module: file_server
-Uniq: 77665472
-Index: 0
-Address: 2a0dec
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 57487277
-Index: 8
-Address: 2fa3c4
-Native_address: bce94
-Refc: 1
-=fun
-Module: webtool
-Uniq: 87386575
-Index: 11
-Address: 4ab1c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 58991950
-Index: 8
-Address: 4a4338
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 118859163
-Index: 17
-Address: 4a34d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 38265609
-Index: 12
-Address: 354dec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 56903339
-Index: 1
-Address: 2527c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 129504763
-Index: 0
-Address: 28aae8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 44817307
-Index: 10
-Address: 354e3c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 52856894
-Index: 41
-Address: 34eb70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22623360
-Index: 23
-Address: 34f5d4
-Native_address: bceec
-Refc: 1
-=fun
-Module: orddict
-Uniq: 34963136
-Index: 0
-Address: 2fbbbc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erlang
-Uniq: 24496633
-Index: 0
-Address: 213744
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 99313855
-Index: 27
-Address: 2f9914
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 99137703
-Index: 3
-Address: 4b5dfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 124043500
-Index: 3
-Address: 222b84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 102650878
-Index: 22
-Address: 313b48
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 13333720
-Index: 12
-Address: 34fb2c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 133457
-Index: 5
-Address: 292a80
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 64640983
-Index: 4
-Address: 29e944
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 7580218
-Index: 2
-Address: 255f08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 131850870
-Index: 59
-Address: 34e6b8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 56617403
-Index: 10
-Address: 284b40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108680306
-Index: 4
-Address: 4ab5e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 90880071
-Index: 2
-Address: 26e150
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_io_server
-Uniq: 23980778
-Index: 0
-Address: 30ac30
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 12006418
-Index: 19
-Address: 2f9d54
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 81701030
-Index: 8
-Address: 526228
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 71013875
-Index: 1
-Address: 4a4ddc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: distel
-Uniq: 87740845
-Index: 2
-Address: 35c0e0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 90782401
-Index: 17
-Address: 2f9e8c
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 133882676
-Index: 6
-Address: 2e52ac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 105698088
-Index: 3
-Address: 2855b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 58370899
-Index: 0
-Address: 27d370
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 15274536
-Index: 25
-Address: 2f9a94
-Native_address: bcef4
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 94349557
-Index: 0
-Address: 252844
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 33328185
-Index: 1
-Address: 33b1d8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86971387
-Index: 16
-Address: 313db0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 53364473
-Index: 38
-Address: 34ee84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 128145687
-Index: 0
-Address: 4ab944
-Native_address: bcee4
-Refc: 1
-=fun
-Module: c
-Uniq: 98651404
-Index: 10
-Address: 2fff20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 78224618
-Index: 0
-Address: 313dcc
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 40779085
-Index: 11
-Address: 2e50c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 93517350
-Index: 4
-Address: 300090
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 58551291
-Index: 0
-Address: 234f14
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 10055518
-Index: 17
-Address: 526170
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 15795706
-Index: 19
-Address: 313bd4
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 31129467
-Index: 13
-Address: 313c44
-Native_address: bced4
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 115635393
-Index: 0
-Address: 2a1a4c
-Native_address: bcf04
-Refc: 2
-=fun
-Module: erl_eval
-Uniq: 65839696
-Index: 22
-Address: 2f9c00
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 69275064
-Index: 28
-Address: 313aa0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 55938066
-Index: 11
-Address: 354d6c
-Native_address: bceec
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 22323433
-Index: 3
-Address: 252688
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 129726129
-Index: 29
-Address: 313abc
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 84346832
-Index: 0
-Address: 3550fc
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 102096820
-Index: 7
-Address: 2e5290
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 70385762
-Index: 11
-Address: 27cf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_cgi
-Uniq: 1483038
-Index: 0
-Address: 4ec2e8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 3664813
-Index: 1
-Address: 3550b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 131143671
-Index: 6
-Address: 27d08c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 46286977
-Index: 2
-Address: 2740b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_esi
-Uniq: 49099432
-Index: 0
-Address: 4e522c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 95764905
-Index: 2
-Address: 24aaa8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: packages
-Uniq: 62890926
-Index: 0
-Address: 2ae814
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 41564771
-Index: 35
-Address: 3139f8
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 95490768
-Index: 0
-Address: 4a4dc0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121559432
-Index: 3
-Address: 313d78
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_conf
-Uniq: 21152662
-Index: 0
-Address: 4be5a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 41630916
-Index: 5
-Address: 29e914
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 19747201
-Index: 5
-Address: 313d24
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 100584837
-Index: 36
-Address: 34f0f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 64635712
-Index: 15
-Address: 34f94c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 46398361
-Index: 3
-Address: 29e9a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86699817
-Index: 27
-Address: 313b2c
-Native_address: bced4
-Refc: 1
-=fun
-Module: distel
-Uniq: 40869731
-Index: 0
-Address: 35c12c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 83701641
-Index: 1
-Address: 27d33c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_auth
-Uniq: 85845790
-Index: 0
-Address: 4dfd84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 101292714
-Index: 9
-Address: 2e519c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 134173702
-Index: 1
-Address: 265b68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 92433687
-Index: 6
-Address: 2ad9f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 62315241
-Index: 8
-Address: 354f38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 11615541
-Index: 12
-Address: 265530
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 11160090
-Index: 2
-Address: 2b6bb4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 12116524
-Index: 15
-Address: 2342c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 61620901
-Index: 2
-Address: 4fc670
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 23665189
-Index: 12
-Address: 4a3b94
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 43844413
-Index: 0
-Address: 300100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 100514258
-Index: 6
-Address: 313d08
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 54271286
-Index: 17
-Address: 34f8a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 47017252
-Index: 3
-Address: 26dfa0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 1228304
-Index: 7
-Address: 4a45a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 127131470
-Index: 10
-Address: 2655a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_server
-Uniq: 22638227
-Index: 1
-Address: 2a0e20
-Native_address: bcf04
-Refc: 1
-=fun
-Module: code_server
-Uniq: 112704920
-Index: 15
-Address: 2ad488
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88302875
-Index: 2
-Address: 2fa76c
-Native_address: bceb4
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 85808984
-Index: 1
-Address: 28ab18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 106391799
-Index: 0
-Address: 33b22c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25830519
-Index: 5
-Address: 27d0c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 110491036
-Index: 1
-Address: 2e5398
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 13128736
-Index: 5
-Address: 52627c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 84644982
-Index: 21
-Address: 313b9c
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 120577486
-Index: 3
-Address: 34fffc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 4504456
-Index: 44
-Address: 34e938
-Native_address: bceec
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 28754183
-Index: 0
-Address: 500140
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 88043334
-Index: 14
-Address: 313c28
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61592373
-Index: 0
-Address: 2adc28
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74468346
-Index: 26
-Address: 313ad8
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69896253
-Index: 21
-Address: 2f9c40
-Native_address: bce80
-Refc: 1
-=fun
-Module: global_group
-Uniq: 59656873
-Index: 4
-Address: 292ac0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 103891261
-Index: 2
-Address: 4a4d70
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 89619733
-Index: 0
-Address: 4b5e64
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 133201466
-Index: 10
-Address: 2e5180
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 32159369
-Index: 2
-Address: 4ab820
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 76861396
-Index: 2
-Address: 2adbb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 48206487
-Index: 0
-Address: 4fc6f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 118996551
-Index: 28
-Address: 34f384
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 12593774
-Index: 50
-Address: 34e60c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 48542841
-Index: 1
-Address: 50e88c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56178490
-Index: 9
-Address: 4a420c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 88212576
-Index: 4
-Address: 35bf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 79562132
-Index: 29
-Address: 34f368
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 129524917
-Index: 32
-Address: 34f2c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54029891
-Index: 23
-Address: 2f9af0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 108872092
-Index: 4
-Address: 27d0f0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 40905124
-Index: 6
-Address: 234ac0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 50124876
-Index: 10
-Address: 2ad760
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 791358
-Index: 48
-Address: 34e7b0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 18404828
-Index: 24
-Address: 313af4
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 13278653
-Index: 1
-Address: 4b5e48
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 110307423
-Index: 13
-Address: 284a7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 99592247
-Index: 0
-Address: 256118
-Native_address: bcf04
-Refc: 1
-=fun
-Module: global
-Uniq: 99918211
-Index: 2
-Address: 265af4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 71442319
-Index: 27
-Address: 34f510
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 7612785
-Index: 13
-Address: 2fa0fc
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56095795
-Index: 15
-Address: 4a38a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 23626796
-Index: 25
-Address: 313b10
-Native_address: bced4
-Refc: 1
-=fun
-Module: file_server
-Uniq: 126074974
-Index: 2
-Address: 2a0cac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 104278122
-Index: 1
-Address: 274154
-Native_address: bcefc
-Refc: 1
-=fun
-Module: sys
-Uniq: 90854051
-Index: 0
-Address: 240344
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 113334594
-Index: 2
-Address: 313d5c
-Native_address: bced4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 8832142
-Index: 7
-Address: 284e30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9159706
-Index: 42
-Address: 34eb54
-Native_address: bceec
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 123946665
-Index: 8
-Address: 26e494
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3149789
-Index: 1
-Address: 5262d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 48288621
-Index: 11
-Address: 2ffed8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8953292
-Index: 20
-Address: 4a4d54
-Native_address: bcee4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9632158
-Index: 4
-Address: 34ff88
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 31111567
-Index: 7
-Address: 29e8c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 85307443
-Index: 10
-Address: 2fa29c
-Native_address: bcec4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 104417191
-Index: 7
-Address: 313cd0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 43625777
-Index: 5
-Address: 354fec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 92698798
-Index: 3
-Address: 4ab780
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 39074546
-Index: 6
-Address: 2fa54c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 71451126
-Index: 5
-Address: 234b98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 122084387
-Index: 6
-Address: 300038
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 9625924
-Index: 14
-Address: 284a60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 128777368
-Index: 11
-Address: 313c7c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 10203723
-Index: 7
-Address: 4ab4f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 35032400
-Index: 10
-Address: 313c98
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 17252586
-Index: 34
-Address: 313a14
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 7177165
-Index: 11
-Address: 2ad734
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 115778175
-Index: 3
-Address: 4a4930
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 96440880
-Index: 51
-Address: 34e590
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 68275407
-Index: 0
-Address: 2b7340
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88854488
-Index: 16
-Address: 2f9f04
-Native_address: bcebc
-Refc: 1
-=fun
-Module: global
-Uniq: 26353848
-Index: 13
-Address: 2654e8
-Native_address: bcf04
-Refc: 3
-=fun
-Module: global
-Uniq: 93414722
-Index: 11
-Address: 265568
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 11194189
-Index: 60
-Address: 34fe0c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 125189992
-Index: 8
-Address: 2fffdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 112472016
-Index: 2
-Address: 355088
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 104426442
-Index: 5
-Address: 2e52e0
-Native_address: bceec
-Refc: 1
-=fun
-Module: global
-Uniq: 17426458
-Index: 0
-Address: 265bc4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 81191039
-Index: 5
-Address: 2ada48
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 71765042
-Index: 5
-Address: 284f74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 85855821
-Index: 2
-Address: 1fa298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 70586122
-Index: 10
-Address: 4a3fe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 87067911
-Index: 49
-Address: 34e708
-Native_address: bcef4
-Refc: 1
-=fun
-Module: distel
-Uniq: 63126735
-Index: 1
-Address: 35c0fc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: c
-Uniq: 58270309
-Index: 1
-Address: 3000e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: ets
-Uniq: 80538457
-Index: 1
-Address: 2bc1a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 69827241
-Index: 9
-Address: 34fd70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 103968752
-Index: 3
-Address: 355054
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 117175573
-Index: 21
-Address: 34f728
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 57865450
-Index: 2
-Address: 2e537c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 14705965
-Index: 20
-Address: 313b80
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 85360931
-Index: 6
-Address: 4ab56c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: kernel_config
-Uniq: 41755598
-Index: 0
-Address: 2d9e20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 7110547
-Index: 37
-Address: 34ef14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 28091577
-Index: 16
-Address: 234244
-Native_address: bcef4
-Refc: 2
-=fun
-Module: code_server
-Uniq: 96448152
-Index: 14
-Address: 2ad4e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 40177568
-Index: 13
-Address: 4a39a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 31948320
-Index: 58
-Address: 34dfdc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 54153760
-Index: 7
-Address: 265854
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 60156260
-Index: 3
-Address: 5262b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 1010616
-Index: 2
-Address: 350064
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 96784459
-Index: 1
-Address: 1fa2b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 48691771
-Index: 18
-Address: 313bb8
-Native_address: bced4
-Refc: 1
-=fun
-Module: global
-Uniq: 26895060
-Index: 9
-Address: 265710
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 109625093
-Index: 7
-Address: 2ad8fc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 59436171
-Index: 1
-Address: 3500dc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 92768306
-Index: 9
-Address: 354f04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 106430008
-Index: 3
-Address: 292b38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 79749196
-Index: 6
-Address: 1fa01c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 6014929
-Index: 9
-Address: 2fa324
-Native_address: bceac
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 57051922
-Index: 7
-Address: 234a28
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 77043468
-Index: 6
-Address: 29e8e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 36176045
-Index: 9
-Address: 52620c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 35862809
-Index: 3
-Address: 255edc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113649451
-Index: 4
-Address: 2850a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 67943969
-Index: 5
-Address: 2658f4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 109003032
-Index: 16
-Address: 5260d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 104711447
-Index: 13
-Address: 525f5c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 107666872
-Index: 9
-Address: 27cfb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 89410000
-Index: 10
-Address: 5261f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 47356870
-Index: 11
-Address: 284ab4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17873449
-Index: 56
-Address: 34e1e8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 8839441
-Index: 33
-Address: 34f25c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 82513204
-Index: 2
-Address: 222c18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 5973059
-Index: 0
-Address: 24ab7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 127832132
-Index: 0
-Address: 4b065c
-Native_address: bcefc
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 39322658
-Index: 14
-Address: 525f40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_server
-Uniq: 100284021
-Index: 0
-Address: 23d288
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 17430070
-Index: 12
-Address: 284a98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 97509773
-Index: 3
-Address: 1fa27c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 32364818
-Index: 3
-Address: 35c050
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 58576084
-Index: 32
-Address: 313a4c
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 38384851
-Index: 14
-Address: 4a3988
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 14139883
-Index: 4
-Address: 234d78
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 122590256
-Index: 0
-Address: 2fa8b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 14705629
-Index: 11
-Address: 2fa22c
-Native_address: bcedc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 9273769
-Index: 4
-Address: 2fa684
-Native_address: bcee4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 87950142
-Index: 11
-Address: 5261d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 54913678
-Index: 1
-Address: 4fc6b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 28370334
-Index: 0
-Address: 26e4b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 24927227
-Index: 40
-Address: 34ed4c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 105437500
-Index: 33
-Address: 313a30
-Native_address: bced4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 10921695
-Index: 1
-Address: 234eac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 112431564
-Index: 55
-Address: 34e22c
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 129460863
-Index: 5
-Address: 4ab5c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 89001648
-Index: 3
-Address: 27d2ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 36199507
-Index: 8
-Address: 27cfe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 35620771
-Index: 2
-Address: 5262ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 83214871
-Index: 18
-Address: 2f9e34
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 122455383
-Index: 1
-Address: 2adc0c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22389488
-Index: 31
-Address: 34f1b8
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 41869059
-Index: 12
-Address: 2fa1d4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 18130505
-Index: 45
-Address: 34e904
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 107414126
-Index: 1
-Address: 2b706c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 116638945
-Index: 28
-Address: 2f98f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 48465762
-Index: 9
-Address: 2348c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 87633852
-Index: 0
-Address: 50e97c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 28213098
-Index: 8
-Address: 4ab42c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 123630574
-Index: 4
-Address: 222b58
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 127425508
-Index: 13
-Address: 354eb4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 95048118
-Index: 16
-Address: 2ad46c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 108661978
-Index: 19
-Address: 34f75c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 21272619
-Index: 13
-Address: 34fad8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29943747
-Index: 17
-Address: 313bf0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 120240397
-Index: 4
-Address: 313d94
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 124060676
-Index: 0
-Address: 350124
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 100975346
-Index: 6
-Address: 526260
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61421476
-Index: 4
-Address: 2ada9c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45197232
-Index: 7
-Address: 34fe5c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3151900
-Index: 15
-Address: 525f24
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 77509245
-Index: 2
-Address: 4b5e2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 94110229
-Index: 8
-Address: 2ad7e4
-Native_address: bcef4
-Refc: 3
-=fun
-Module: rpc
-Uniq: 101217130
-Index: 1
-Address: 2560c4
-Native_address: bcf04
-Refc: 1
-=fun
-Module: lists
-Uniq: 103647452
-Index: 0
-Address: 244b7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 37841211
-Index: 9
-Address: 2ad77c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 40109251
-Index: 54
-Address: 34e2b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 98012300
-Index: 0
-Address: 1fa2d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 73604759
-Index: 10
-Address: 4ab270
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 12042434
-Index: 1
-Address: 313d40
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 127137775
-Index: 4
-Address: 2e531c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 45498037
-Index: 12
-Address: 27cec0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 122441107
-Index: 34
-Address: 34f1d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70933889
-Index: 46
-Address: 34e8d0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 69850797
-Index: 2
-Address: 27d308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 103965539
-Index: 13
-Address: 234684
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29979659
-Index: 30
-Address: 313a84
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17148721
-Index: 20
-Address: 34f778
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_response
-Uniq: 100673049
-Index: 0
-Address: 5165dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 10508176
-Index: 1
-Address: 4b04dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32476064
-Index: 57
-Address: 34e1c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74835078
-Index: 9
-Address: 313cec
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 60689814
-Index: 19
-Address: 4a3b78
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39269715
-Index: 5
-Address: 34ff14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 112923172
-Index: 0
-Address: 2e5404
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43010824
-Index: 14
-Address: 2fa03c
-Native_address: bce8c
-Refc: 1
-=fun
-Module: global
-Uniq: 82495254
-Index: 3
-Address: 265ac8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 48568081
-Index: 8
-Address: 2e5220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 77236637
-Index: 7
-Address: 1fa000
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 109386574
-Index: 1
-Address: 2fa804
-Native_address: bce9c
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 42613220
-Index: 14
-Address: 34f980
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 67093144
-Index: 23
-Address: 313b64
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 86833790
-Index: 11
-Address: 34fbe8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 6344855
-Index: 1
-Address: 29eabc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 5149749
-Index: 35
-Address: 34f220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 93451769
-Index: 5
-Address: 1fa120
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 117428568
-Index: 11
-Address: 234758
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 15225890
-Index: 4
-Address: 526298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 120760477
-Index: 2
-Address: 234cdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 88561919
-Index: 3
-Address: 3000ac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 108931174
-Index: 8
-Address: 313cb4
-Native_address: bced4
-Refc: 1
-=fun
-Module: rpc
-Uniq: 122901192
-Index: 4
-Address: 255e44
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32985930
-Index: 10
-Address: 34fc40
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 97968498
-Index: 1
-Address: 292b7c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 45671671
-Index: 18
-Address: 4a32d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 117968056
-Index: 3
-Address: 2fa6ec
-Native_address: bcecc
-Refc: 1
-=fun
-Module: init
-Uniq: 108717591
-Index: 4
-Address: 1fa194
-Native_address: bcf04
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 15091954
-Index: 2
-Address: 2526dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 65707495
-Index: 6
-Address: 2658a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 34473969
-Index: 17
-Address: 2ad450
-Native_address: bcef4
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 124296602
-Index: 7
-Address: 526244
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 23074707
-Index: 15
-Address: 265460
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25972856
-Index: 10
-Address: 27cf74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43110452
-Index: 24
-Address: 2f9ad4
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 106445918
-Index: 13
-Address: 2ad660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 116071286
-Index: 12
-Address: 5261b8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 130814477
-Index: 8
-Address: 284cfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 121017037
-Index: 39
-Address: 34ed80
-Native_address: bcef4
-Refc: 1
-=fun
-Module: ets
-Uniq: 104895267
-Index: 0
-Address: 2bc1bc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 104682437
-Index: 11
-Address: 4a3de0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70248777
-Index: 30
-Address: 34f30c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 13274975
-Index: 5
-Address: 300074
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 98442771
-Index: 53
-Address: 34e2d0
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69829006
-Index: 7
-Address: 2fa47c
-Native_address: bce80
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 36444943
-Index: 1
-Address: 2a1a80
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 58719455
-Index: 26
-Address: 34f5f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: timer
-Uniq: 42505885
-Index: 0
-Address: 4cd62c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54682479
-Index: 20
-Address: 2f9d08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 86070332
-Index: 1
-Address: 222d7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 54728136
-Index: 9
-Address: 2fff68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 16474219
-Index: 3
-Address: 234c60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 108831556
-Index: 10
-Address: 234810
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 72053761
-Index: 16
-Address: 34f8ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 65127616
-Index: 2
-Address: 29ea04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 126167637
-Index: 14
-Address: 234640
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113704917
-Index: 0
-Address: 285788
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 75279647
-Index: 1
-Address: 500100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 119218247
-Index: 5
-Address: 26df68
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 85690044
-Index: 4
-Address: 4b5d6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 53075592
-Index: 1
-Address: 26e16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 39490182
-Index: 2
-Address: 3000c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 75189006
-Index: 12
-Address: 234714
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 14980808
-Index: 43
-Address: 34eb38
-Native_address: bceec
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 16463468
-Index: 4
-Address: 4a4914
-Native_address: bcee4
-Refc: 1
-=fun
-Module: dict
-Uniq: 99965326
-Index: 4
-Address: 355020
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 36900786
-Index: 6
-Address: 284f3c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45447147
-Index: 18
-Address: 34f794
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32353825
-Index: 6
-Address: 34fe78
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 134052338
-Index: 8
-Address: 34fdc0
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_master
-Uniq: 23840924
-Index: 1
-Address: 24aae0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108282500
-Index: 1
-Address: 4ab918
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 31081110
-Index: 0
-Address: 210c68
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54275742
-Index: 26
-Address: 2f9a4c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 45083091
-Index: 3
-Address: 2e5350
-Native_address: bcf04
-Refc: 3
-=proc_stack:<0.0.0>
-3a48bc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H371264
-=proc_heap:<0.0.0>
-371264:t9:A5:state,H3710D8,N,N,H3710F4,P<0.1.0>,H37128C,H3710FC,N
-3710FC:t2:H371138,H371140
-371140:lI80|H371194
-371194:lI49|H3711E0
-3711E0:lI48|H371204
-371204:lI66|N
-371138:lI79|H37118C
-37118C:lI84|H3711D8
-3711D8:lI80|H3711FC
-3711FC:lI32|H37120C
-37120C:lI32|H371214
-371214:lI65|H37121C
-37121C:lI80|H371224
-371224:lI78|H37122C
-37122C:lI32|H371234
-371234:lI49|H37123C
-37123C:lI56|H371244
-371244:lI49|H37124C
-37124C:lI32|H371254
-371254:lI48|H37125C
-37125C:lI49|N
-37128C:t2:A7:started,A7:started
-3710F4:lH371124|H371130
-371124:t2:A16:application_controller,P<0.5.0>
-371130:lH371178|H371184
-371178:t2:AC:error_logger,P<0.4.0>
-371184:lH3711CC|N
-3711CC:t2:AF:erl_prim_loader,P<0.2.0>
-3710D8:lH3710E0|H3710EC
-3710E0:t2:A5:-root,H371108
-371108:lH371148|N
-371148:Yh13:2F636C656172636173652F6F74702F65727473
-3710EC:lH371110|H37111C
-371110:t2:A9:-progname,H371164
-371164:lH37119C|N
-37119C:Yh1D:2F636C656172636173652F6F74702F657274732F62696E2F6365726C20
-37111C:lH37116C|N
-37116C:t2:A5:-home,H3711C4
-3711C4:lH3711E8|N
-3711E8:YhA:2F686F6D652F73697269
-=proc_stack:<0.2.0>
-38eca8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H367D20
-y1:P<0.1.0>
-y2:H367D28
-y3:A8:infinity
-=proc_heap:<0.2.0>
-367D20:lH367D48|H367D50
-367D48:lI47|H367D58
-367D58:lI99|H367D68
-367D68:lI108|H367D78
-367D78:lI101|H367D88
-367D88:lI97|H367D98
-367D98:lI114|H367DA8
-367DA8:lI99|H367DB8
-367DB8:lI97|H367DC8
-367DC8:lI115|H367DD8
-367DD8:lI101|H367DE8
-367DE8:lI47|H367DF8
-367DF8:lI111|H367E08
-367E08:lI116|H367E18
-367E18:lI112|H367E28
-367E28:lI47|H367E38
-367E38:lI101|H367E48
-367E48:lI114|H367E58
-367E58:lI116|H367E68
-367E68:lI115|H367E78
-367E78:lI47|H367E88
-367E88:lI108|H367E98
-367E98:lI105|H367EA8
-367EA8:lI98|H367EB8
-367EB8:lI47|H367EC8
-367EC8:lI107|H367ED8
-367ED8:lI101|H367EE8
-367EE8:lI114|H367EF8
-367EF8:lI110|H367F08
-367F08:lI101|H367F18
-367F18:lI108|H367F28
-367F28:lI47|H367F38
-367F38:lI101|H367F48
-367F48:lI98|H367F58
-367F58:lI105|H367F68
-367F68:lI110|N
-367D50:lH367D60|N
-367D60:lI47|H367D70
-367D70:lI99|H367D80
-367D80:lI108|H367D90
-367D90:lI101|H367DA0
-367DA0:lI97|H367DB0
-367DB0:lI114|H367DC0
-367DC0:lI99|H367DD0
-367DD0:lI97|H367DE0
-367DE0:lI115|H367DF0
-367DF0:lI101|H367E00
-367E00:lI47|H367E10
-367E10:lI111|H367E20
-367E20:lI116|H367E30
-367E30:lI112|H367E40
-367E40:lI47|H367E50
-367E50:lI101|H367E60
-367E60:lI114|H367E70
-367E70:lI116|H367E80
-367E80:lI115|H367E90
-367E90:lI47|H367EA0
-367EA0:lI108|H367EB0
-367EB0:lI105|H367EC0
-367EC0:lI98|H367ED0
-367ED0:lI47|H367EE0
-367EE0:lI115|H367EF0
-367EF0:lI116|H367F00
-367F00:lI100|H367F10
-367F10:lI108|H367F20
-367F20:lI105|H367F30
-367F30:lI98|H367F40
-367F40:lI47|H367F50
-367F50:lI101|H367F60
-367F60:lI98|H367F70
-367F70:lI105|H367F78
-367F78:lI110|N
-367D28:t7:A5:state,A5:efile,N,A4:none,p<0.2>,A8:infinity,A5:false
-=proc_dictionary:<0.4.0>
-H3AC588
-H3AC594
-=proc_stack:<0.4.0>
-3b2f14:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:H3B21E8
-y2:AC:error_logger
-y3:P<0.1.0>
-3b2f28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3AC5A8
-=proc_heap:<0.4.0>
-3B21E8:lH3B2144|H3B21E0
-3B2144:t5:A7:handler,AC:error_logger,A5:false,N,A5:false
-3B21E0:lH3B21BC|N
-3B21BC:t5:A7:handler,A12:error_logger_tty_h,A5:false,H3AC610,A5:false
-3AC610:t2:P<0.21.0>,AC:error_logger
-3AC5A8:lA9:gen_event|H3AC5E8
-3AC5E8:lP<0.1.0>|H3AC608
-3AC608:lP<0.1.0>|H3AC61C
-3AC61C:lH3AC624|H3AC630
-3AC624:t2:A5:local,AC:error_logger
-3AC630:lN|H3AC638
-3AC638:lN|H3AC640
-3AC640:lN|N
-3AC588:t2:AD:$initial_call,H3AC5B0
-3AC5B0:t3:A3:gen,A7:init_it,H3AC5A8
-3AC594:t2:AA:$ancestors,H3AC5C0
-3AC5C0:lP<0.1.0>|N
-=proc_dictionary:<0.5.0>
-H372E4C
-H372E58
-=proc_stack:<0.5.0>
-374704:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A16:application_controller
-y3:H3739F4
-y4:A16:application_controller
-y5:P<0.1.0>
-374720:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H372ED0
-=proc_heap:<0.5.0>
-3739F4:t9:A5:state,N,N,N,H373914,N,H373928,N,N
-373928:lH37391C|H372F54
-37391C:t2:A6:stdlib,A9:permanent
-372F54:lH372F90|N
-372F90:t2:A6:kernel,A9:permanent
-373914:lH373908|H372F4C
-373908:t2:A6:stdlib,A9:undefined
-372F4C:lH372F84|N
-372F84:t2:A6:kernel,P<0.7.0>
-372ED0:lAA:gen_server|H372F5C
-372F5C:lP<0.1.0>|H372F9C
-372F9C:lP<0.1.0>|H372FC4
-372FC4:lH372FEC|H372FF8
-372FEC:t2:A5:local,A16:application_controller
-372FF8:lA16:application_controller|H373018
-373018:lH373038|H373048
-373038:t3:AB:application,A6:kernel,H373060
-373060:lH373078|H373084
-373078:t2:AB:description,H37309C
-37309C:lI69|H3730C8
-3730C8:lI82|H3730FC
-3730FC:lI84|H373130
-373130:lI83|H37316C
-37316C:lI32|H3731A8
-3731A8:lI32|H3731E4
-3731E4:lI67|H373220
-373220:lI88|H37325C
-37325C:lI67|H37329C
-37329C:lI32|H3732D0
-3732D0:lI49|H3732FC
-3732FC:lI51|H373328
-373328:lI56|H373348
-373348:lI32|H373368
-373368:lI49|H373388
-373388:lI48|N
-373084:lH3730A4|H3730B0
-3730A4:t2:A3:vsn,H3730D0
-3730D0:lI50|H373104
-373104:lI46|H373138
-373138:lI57|N
-3730B0:lH3730D8|H3730E4
-3730D8:t2:A2:id,N
-3730E4:lH37310C|H373118
-37310C:t2:A7:modules,H373140
-373140:lAB:application|H373174
-373174:lA16:application_controller|H3731B0
-3731B0:lA12:application_master|H3731EC
-3731EC:lA13:application_starter|H373228
-373228:lA4:auth|H373264
-373264:lA4:code|H3732A4
-3732A4:lA8:code_aux|H3732D8
-3732D8:lA8:packages|H373304
-373304:lAB:code_server|H373330
-373330:lA9:dist_util|H373350
-373350:lAF:erl_boot_server|H373370
-373370:lA10:erl_distribution|H373390
-373390:lAF:erl_prim_loader|H3733A8
-3733A8:lA9:erl_reply|H3733C0
-3733C0:lA6:erlang|H3733D8
-3733D8:lAD:error_handler|H3733F0
-3733F0:lAC:error_logger|H373408
-373408:lA4:file|H373420
-373420:lAB:file_server|H373438
-373438:lAF:old_file_server|H373450
-373450:lAE:file_io_server|H373468
-373468:lA9:prim_file|H373480
-373480:lA6:global|H373498
-373498:lAC:global_group|H3734B0
-3734B0:lAD:global_search|H3734C8
-3734C8:lA5:group|H3734E0
-3734E0:lA5:heart|H3734F8
-3734F8:lA13:hipe_unified_loader|H373510
-373510:lA11:hipe_sparc_loader|H373520
-373520:lAF:hipe_x86_loader|H373530
-373530:lA9:inet6_tcp|H373540
-373540:lAE:inet6_tcp_dist|H373550
-373550:lA9:inet6_udp|H373560
-373560:lAB:inet_config|H373570
-373570:lAA:inet_hosts|H373580
-373580:lA13:inet_gethost_native|H373590
-373590:lAD:inet_tcp_dist|H3735A0
-3735A0:lA4:init|H3735B0
-3735B0:lA6:kernel|H3735C0
-3735C0:lAD:kernel_config|H3735D0
-3735D0:lA3:net|H3735E0
-3735E0:lA7:net_adm|H3735F0
-3735F0:lAA:net_kernel|H373600
-373600:lA2:os|H373610
-373610:lA8:ram_file|H373620
-373620:lA3:rpc|H373630
-373630:lA4:user|H373640
-373640:lA8:user_drv|H373650
-373650:lA8:user_sup|H373660
-373660:lA8:disk_log|H373670
-373670:lAA:disk_log_1|H373680
-373680:lAF:disk_log_server|H373690
-373690:lAC:disk_log_sup|H3736A0
-3736A0:lA7:dist_ac|H3736B0
-3736B0:lA8:erl_ddll|H3736C0
-3736C0:lA8:erl_epmd|H3736D0
-3736D0:lAA:erts_debug|H3736E0
-3736E0:lA7:gen_tcp|H3736F0
-3736F0:lA7:gen_udp|H373700
-373700:lA9:prim_inet|H373708
-373708:lA4:inet|H373710
-373710:lA7:inet_db|H373718
-373718:lA8:inet_dns|H373720
-373720:lAA:inet_parse|H373728
-373728:lA8:inet_res|H373730
-373730:lA8:inet_tcp|H373738
-373738:lA8:inet_udp|H373740
-373740:lA3:pg2|H373748
-373748:lA9:seq_trace|H373750
-373750:lA6:socks5|H373758
-373758:lAB:socks5_auth|H373760
-373760:lAA:socks5_tcp|H373768
-373768:lAA:socks5_udp|H373770
-373770:lAF:wrap_log_reader|H373778
-373778:lA4:zlib|H373780
-373780:lA9:otp_ring0|N
-373118:lH373148|H373154
-373148:t2:AA:registered,H37317C
-37317C:lA16:application_controller|H3731B8
-3731B8:lA9:erl_reply|H3731F4
-3731F4:lA4:auth|H373230
-373230:lAB:boot_server|H37326C
-37326C:lAB:code_server|H3732AC
-3732AC:lAF:disk_log_server|H3732E0
-3732E0:lAC:disk_log_sup|H37330C
-37330C:lAF:erl_prim_loader|H373338
-373338:lAC:error_logger|H373358
-373358:lAB:file_server|H373378
-373378:lAD:file_server_2|H373398
-373398:lAF:fixtable_server|H3733B0
-3733B0:lAC:global_group|H3733C8
-3733C8:lA12:global_name_server|H3733E0
-3733E0:lA5:heart|H3733F8
-3733F8:lA4:init|H373410
-373410:lAD:kernel_config|H373428
-373428:lAA:kernel_sup|H373440
-373440:lAA:net_kernel|H373458
-373458:lA7:net_sup|H373470
-373470:lA3:rex|H373488
-373488:lA4:user|H3734A0
-3734A0:lA9:os_server|H3734B8
-3734B8:lAB:ddll_server|H3734D0
-3734D0:lA8:erl_epmd|H3734E8
-3734E8:lA7:inet_db|H373500
-373500:lA3:pg2|N
-373154:lH373184|H373190
-373184:t2:AC:applications,N
-373190:lH3731C0|H3731CC
-3731C0:t2:A15:included_applications,N
-3731CC:lH3731FC|H373208
-3731FC:t2:A3:env,H373238
-373238:lH373274|N
-373274:t2:AC:error_logger,A3:tty
-373208:lH373240|H37324C
-373240:t2:AC:start_phases,A9:undefined
-37324C:lH373280|H37328C
-373280:t2:A4:maxT,A8:infinity
-37328C:lH3732B4|H3732C0
-3732B4:t2:A4:maxP,A8:infinity
-3732C0:lH3732E8|N
-3732E8:t2:A3:mod,H373314
-373314:t2:A6:kernel,N
-373048:lN|N
-372E4C:t2:AD:$initial_call,H372EE4
-372EE4:t3:A3:gen,A7:init_it,H372ED0
-372E58:t2:AA:$ancestors,H372EF4
-372EF4:lP<0.1.0>|N
-=proc_dictionary:<0.7.0>
-H369B78
-H369B5C
-=proc_stack:<0.7.0>
-369d64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:H369C2C
-y1:P<0.5.0>
-369d70:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A12:application_master
-y2:A4:init
-y3:H369B2C
-=proc_heap:<0.7.0>
-369C2C:t6:A5:state,P<0.8.0>,H3697B0,N,I0,P<0.0.0>
-3697B0:t9:A9:appl_data,A6:kernel,H369B14,A9:undefined,H3697D8,H369A3C,N,A8:infinity,A8:infinity
-369A3C:lAB:application|H369A34
-369A34:lA16:application_controller|H369A2C
-369A2C:lA12:application_master|H369A24
-369A24:lA13:application_starter|H369A1C
-369A1C:lA4:auth|H369A14
-369A14:lA4:code|H369A0C
-369A0C:lA8:code_aux|H369A04
-369A04:lA8:packages|H3699FC
-3699FC:lAB:code_server|H3699F4
-3699F4:lA9:dist_util|H3699EC
-3699EC:lAF:erl_boot_server|H3699E4
-3699E4:lA10:erl_distribution|H3699DC
-3699DC:lAF:erl_prim_loader|H3699D4
-3699D4:lA9:erl_reply|H3699CC
-3699CC:lA6:erlang|H3699C4
-3699C4:lAD:error_handler|H3699BC
-3699BC:lAC:error_logger|H3699B4
-3699B4:lA4:file|H3699AC
-3699AC:lAB:file_server|H3699A4
-3699A4:lAF:old_file_server|H36999C
-36999C:lAE:file_io_server|H369994
-369994:lA9:prim_file|H36998C
-36998C:lA6:global|H369984
-369984:lAC:global_group|H36997C
-36997C:lAD:global_search|H369974
-369974:lA5:group|H36996C
-36996C:lA5:heart|H369964
-369964:lA13:hipe_unified_loader|H36995C
-36995C:lA11:hipe_sparc_loader|H369954
-369954:lAF:hipe_x86_loader|H36994C
-36994C:lA9:inet6_tcp|H369944
-369944:lAE:inet6_tcp_dist|H36993C
-36993C:lA9:inet6_udp|H369934
-369934:lAB:inet_config|H36992C
-36992C:lAA:inet_hosts|H369924
-369924:lA13:inet_gethost_native|H36991C
-36991C:lAD:inet_tcp_dist|H369914
-369914:lA4:init|H36990C
-36990C:lA6:kernel|H369904
-369904:lAD:kernel_config|H3698FC
-3698FC:lA3:net|H3698F4
-3698F4:lA7:net_adm|H3698EC
-3698EC:lAA:net_kernel|H3698E4
-3698E4:lA2:os|H3698DC
-3698DC:lA8:ram_file|H3698D4
-3698D4:lA3:rpc|H3698CC
-3698CC:lA4:user|H3698C4
-3698C4:lA8:user_drv|H3698BC
-3698BC:lA8:user_sup|H3698B4
-3698B4:lA8:disk_log|H3698AC
-3698AC:lAA:disk_log_1|H3698A4
-3698A4:lAF:disk_log_server|H36989C
-36989C:lAC:disk_log_sup|H369894
-369894:lA7:dist_ac|H36988C
-36988C:lA8:erl_ddll|H369884
-369884:lA8:erl_epmd|H36987C
-36987C:lAA:erts_debug|H369874
-369874:lA7:gen_tcp|H36986C
-36986C:lA7:gen_udp|H369864
-369864:lA9:prim_inet|H36985C
-36985C:lA4:inet|H369854
-369854:lA7:inet_db|H36984C
-36984C:lA8:inet_dns|H369844
-369844:lAA:inet_parse|H36983C
-36983C:lA8:inet_res|H369834
-369834:lA8:inet_tcp|H36982C
-36982C:lA8:inet_udp|H369824
-369824:lA3:pg2|H36981C
-36981C:lA9:seq_trace|H369814
-369814:lA6:socks5|H36980C
-36980C:lAB:socks5_auth|H369804
-369804:lAA:socks5_tcp|H3697FC
-3697FC:lAA:socks5_udp|H3697F4
-3697F4:lAF:wrap_log_reader|H3697EC
-3697EC:lA4:zlib|H3697E4
-3697E4:lA9:otp_ring0|N
-3697D8:t2:A6:kernel,N
-369B14:lA16:application_controller|H369B0C
-369B0C:lA9:erl_reply|H369B04
-369B04:lA4:auth|H369AFC
-369AFC:lAB:boot_server|H369AF4
-369AF4:lAB:code_server|H369AEC
-369AEC:lAF:disk_log_server|H369AE4
-369AE4:lAC:disk_log_sup|H369ADC
-369ADC:lAF:erl_prim_loader|H369AD4
-369AD4:lAC:error_logger|H369ACC
-369ACC:lAB:file_server|H369AC4
-369AC4:lAD:file_server_2|H369ABC
-369ABC:lAF:fixtable_server|H369AB4
-369AB4:lAC:global_group|H369AAC
-369AAC:lA12:global_name_server|H369AA4
-369AA4:lA5:heart|H369A9C
-369A9C:lA4:init|H369A94
-369A94:lAD:kernel_config|H369A8C
-369A8C:lAA:kernel_sup|H369A84
-369A84:lAA:net_kernel|H369A7C
-369A7C:lA7:net_sup|H369A74
-369A74:lA3:rex|H369A6C
-369A6C:lA4:user|H369A64
-369A64:lA9:os_server|H369A5C
-369A5C:lAB:ddll_server|H369A54
-369A54:lA8:erl_epmd|H369A4C
-369A4C:lA7:inet_db|H369A44
-369A44:lA3:pg2|N
-369B2C:lP<0.5.0>|H369B24
-369B24:lP<0.6.0>|H3697A8
-3697A8:lH3697B0|H369B1C
-369B1C:lA6:normal|N
-369B78:t2:AD:$initial_call,H369B68
-369B68:t3:A12:application_master,A4:init,H369B2C
-369B5C:t2:AA:$ancestors,H369B54
-369B54:lP<0.6.0>|N
-=proc_stack:<0.8.0>
-384ec0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H384BDC
-y1:A6:kernel
-y2:P<0.9.0>
-y3:P<0.7.0>
-=proc_heap:<0.8.0>
-384BDC:t2:A5:state,A3:tty
-=proc_dictionary:<0.9.0>
-H376850
-H37685C
-=proc_stack:<0.9.0>
-36bde8:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36B8E8
-y4:AA:kernel_sup
-y5:P<0.8.0>
-36be04:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3768D4
-=proc_heap:<0.9.0>
-36B8E8:tA:A5:state,H376868,AB:one_for_all,H36B8D4,N,I0,I1,N,A6:kernel,N
-36B8D4:lH36B8B0|H36B6E8
-36B8B0:t8:A5:child,P<0.24.0>,AF:kernel_safe_sup,H376BF0,A9:permanent,A8:infinity,AA:supervisor,H376C00
-376C00:lA6:kernel|N
-376BF0:t3:AA:supervisor,AA:start_link,H376C08
-376C08:lH376C10|H376C1C
-376C10:t2:A5:local,AF:kernel_safe_sup
-376C1C:lA6:kernel|H376C24
-376C24:lA4:safe|N
-36B6E8:lH36B6C4|H36B490
-36B6C4:t8:A5:child,P<0.23.0>,AD:kernel_config,H376BB4,A9:permanent,I2000,A6:worker,H376BC4
-376BC4:lAD:kernel_config|N
-376BB4:t3:AD:kernel_config,AA:start_link,N
-36B490:lH36B498|H36B4BC
-36B498:t8:A5:child,P<0.19.0>,A4:user,H376B70,A9:temporary,I2000,AA:supervisor,H376B80
-376B80:lA8:user_sup|N
-376B70:t3:A8:user_sup,A5:start,N
-36B4BC:lH36B4C4|H376CB0
-36B4C4:t8:A5:child,P<0.18.0>,AB:code_server,H376B0C,A9:permanent,I2000,A6:worker,H376B1C
-376B1C:lA4:code|N
-376B0C:t3:A4:code,AA:start_link,N
-376CB0:lH376CB8|H376CDC
-376CB8:t8:A5:child,P<0.17.0>,AB:file_server,H376AB8,A9:permanent,I2000,A6:worker,H376AC8
-376AC8:lAF:old_file_server|N
-376AB8:t3:AF:old_file_server,AA:start_link,N
-376CDC:lH376CE4|H376C2C
-376CE4:t8:A5:child,P<0.16.0>,AD:file_server_2,H376A58,A9:permanent,I2000,A6:worker,H376A68
-376A68:lA4:file|H376AB0
-376AB0:lAB:file_server|H376B04
-376B04:lAE:file_io_server|H376B68
-376B68:lA9:prim_file|N
-376A58:t3:AB:file_server,AA:start_link,N
-376C2C:lH376C34|H376C58
-376C34:t8:A5:child,P<0.15.0>,AC:global_group,H3769F4,A9:permanent,I2000,A6:worker,H376A04
-376A04:lAC:global_group|N
-3769F4:t3:AC:global_group,AA:start_link,N
-376C58:lH376C60|H376C84
-376C60:t8:A5:child,A9:undefined,A7:net_sup,H37696C,A9:permanent,A8:infinity,AA:supervisor,H37697C
-37697C:lA10:erl_distribution|N
-37696C:t3:A10:erl_distribution,AA:start_link,N
-376C84:lH376C8C|H3768A0
-376C8C:t8:A5:child,P<0.14.0>,A7:inet_db,H3768F4,A9:permanent,I2000,A6:worker,H376904
-376904:lA7:inet_db|N
-3768F4:t3:A7:inet_db,AA:start_link,N
-3768A0:lH376938|H37695C
-376938:t8:A5:child,P<0.11.0>,A12:global_name_server,H3769B0,A9:permanent,I2000,A6:worker,H3769C0
-3769C0:lA6:global|N
-3769B0:t3:A6:global,AA:start_link,N
-37695C:lH3769C8|N
-3769C8:t8:A5:child,P<0.10.0>,A3:rex,H376A38,A9:permanent,I2000,A6:worker,H376A48
-376A48:lA3:rpc|N
-376A38:t3:A3:rpc,AA:start_link,N
-376868:t2:A5:local,AA:kernel_sup
-3768D4:lAA:gen_server|H376964
-376964:lP<0.8.0>|H3769EC
-3769EC:lP<0.8.0>|H376A50
-376A50:lH376A9C|H376AA8
-376A9C:t2:A5:local,AA:kernel_sup
-376AA8:lAA:supervisor|H376AFC
-376AFC:lH376B50|H376B60
-376B50:t3:H376868,A6:kernel,N
-376B60:lN|N
-376850:t2:AD:$initial_call,H3768DC
-3768DC:t3:A3:gen,A7:init_it,H3768D4
-37685C:t2:AA:$ancestors,H3768EC
-3768EC:lP<0.8.0>|N
-=proc_dictionary:<0.10.0>
-H367A10
-H3679F4
-=proc_stack:<0.10.0>
-367cec:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A3:rpc
-y3:H367AA8
-y4:A3:rex
-y5:P<0.9.0>
-367d08:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3679C4
-=proc_heap:<0.10.0>
-367AA8:t2:I0,A3:nil
-3679C4:lAA:gen_server|H3679BC
-3679BC:lP<0.9.0>|H3679B4
-3679B4:lP<0.9.0>|H367988
-367988:lH367990|H3679AC
-367990:t2:A5:local,A3:rex
-3679AC:lA3:rpc|H3679A4
-3679A4:lN|H36799C
-36799C:lN|N
-367A10:t2:AD:$initial_call,H367A00
-367A00:t3:A3:gen,A7:init_it,H3679C4
-3679F4:t2:AA:$ancestors,H3679EC
-3679EC:lAA:kernel_sup|H3679CC
-3679CC:lP<0.8.0>|N
-=proc_dictionary:<0.11.0>
-H36ADD8
-H36ADBC
-=proc_stack:<0.11.0>
-36b0b4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A6:global
-y3:H36AF0C
-y4:A12:global_name_server
-y5:P<0.9.0>
-36b0d0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36AD8C
-=proc_heap:<0.11.0>
-36AF0C:t9:A5:state,A4:true,N,N,N,N,AD:nonode@nohost,P<0.12.0>,P<0.13.0>
-36AD8C:lAA:gen_server|H36AD84
-36AD84:lP<0.9.0>|H36AD7C
-36AD7C:lP<0.9.0>|H36AD50
-36AD50:lH36AD58|H36AD74
-36AD58:t2:A5:local,A12:global_name_server
-36AD74:lA6:global|H36AD6C
-36AD6C:lN|H36AD64
-36AD64:lN|N
-36ADD8:t2:AD:$initial_call,H36ADC8
-36ADC8:t3:A3:gen,A7:init_it,H36AD8C
-36ADBC:t2:AA:$ancestors,H36ADB4
-36ADB4:lAA:kernel_sup|H36AD94
-36AD94:lP<0.8.0>|N
-=proc_stack:<0.12.0>
-36921c:SReturn addr 0x261184 (global:init_the_locker/1 + 112)
-y0:N
-y1:N
-y2:N
-y3:N
-y4:N
-y5:N
-y6:A8:infinity
-y7:H368EB0
-y8:P<0.11.0>
-369244:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-=proc_heap:<0.12.0>
-368EB0:t3:A5:multi,A9:undefined,N
-=proc_stack:<0.13.0>
-3695d0:SReturn addr 0x2651AC (global:loop_the_deleter/1 + 36)
-y0:A8:infinity
-y1:N
-y2:P<0.11.0>
-3695e0:SReturn addr 0x2654F8 (global:'-start_the_deleter/1-fun-0-'/1 + 20)
-y0:N
-y1:N
-y2:P<0.11.0>
-3695f0:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.13.0>
-=proc_dictionary:<0.14.0>
-H36A998
-H36A9A4
-=proc_stack:<0.14.0>
-372e0c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:inet_db
-y3:H36A9B0
-y4:A7:inet_db
-y5:P<0.9.0>
-372e28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36A9C8
-=proc_heap:<0.14.0>
-36A9B0:t5:A5:state,A7:inet_db,AA:inet_cache,AA:inet_hosts,H36A9E8
-36A9E8:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000060000000000000000
-36A9C8:lAA:gen_server|H36A9F8
-36A9F8:lP<0.9.0>|H36AA08
-36AA08:lP<0.9.0>|H36AA10
-36AA10:lH36AA18|H36AA24
-36AA18:t2:A5:local,A7:inet_db
-36AA24:lA7:inet_db|H36AA2C
-36AA2C:lN|H36AA34
-36AA34:lN|N
-36A998:t2:AD:$initial_call,H36A9D0
-36A9D0:t3:A3:gen,A7:init_it,H36A9C8
-36A9A4:t2:AA:$ancestors,H36A9E0
-36A9E0:lAA:kernel_sup|H36AA00
-36AA00:lP<0.8.0>|N
-=proc_dictionary:<0.15.0>
-H372788
-H3727F8
-H37276C
-H37280C
-H372820
-=proc_stack:<0.15.0>
-372a64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AC:global_group
-y3:H3728C8
-y4:AC:global_group
-y5:P<0.9.0>
-372a80:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37273C
-=proc_heap:<0.15.0>
-3728C8:tC:A5:state,A7:no_conf,A4:true,N,N,N,N,N,AD:nonode@nohost,N,A6:normal,A6:normal
-37273C:lAA:gen_server|H372734
-372734:lP<0.9.0>|H37272C
-37272C:lP<0.9.0>|H372700
-372700:lH372708|H372724
-372708:t2:A5:local,AC:global_group
-372724:lAC:global_group|H37271C
-37271C:lN|H372714
-372714:lN|N
-372788:t2:AD:$initial_call,H372778
-372778:t3:A3:gen,A7:init_it,H37273C
-3727F8:t2:A10:registered_names,H3727F0
-3727F0:lA9:undefined|N
-37276C:t2:AA:$ancestors,H372764
-372764:lAA:kernel_sup|H372744
-372744:lP<0.8.0>|N
-37280C:t2:A4:send,H372804
-372804:lA9:undefined|N
-372820:t2:AC:whereis_name,H372818
-372818:lA9:undefined|N
-=proc_dictionary:<0.16.0>
-H37B918
-H37B924
-=proc_stack:<0.16.0>
-3d303c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AB:file_server
-y3:p<0.4>
-y4:AD:file_server_2
-y5:P<0.9.0>
-3d3058:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37B930
-=proc_heap:<0.16.0>
-37B930:lAA:gen_server|H37B950
-37B950:lP<0.9.0>|H37B960
-37B960:lP<0.9.0>|H37B968
-37B968:lH37B970|H37B97C
-37B970:t2:A5:local,AD:file_server_2
-37B97C:lAB:file_server|H37B984
-37B984:lN|H37B98C
-37B98C:lN|N
-37B918:t2:AD:$initial_call,H37B938
-37B938:t3:A3:gen,A7:init_it,H37B930
-37B924:t2:AA:$ancestors,H37B948
-37B948:lAA:kernel_sup|H37B958
-37B958:lP<0.8.0>|N
-=proc_stack:<0.17.0>
-3763cc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H376084
-y1:P<0.16.0>
-y2:P<0.9.0>
-=proc_heap:<0.17.0>
-376084:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000160000000000000000
-=proc_stack:<0.18.0>
-3b98e8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H38AE84
-y1:P<0.9.0>
-=proc_heap:<0.18.0>
-38AE84:t8:A5:state,P<0.9.0>,H3873BC,H38AEB8,I9,I10,A8:no_cache,AB:interactive
-38AEB8:lH3873D4|H38AEE0
-3873D4:lI46|N
-38AEE0:lH3873EC|H38AF10
-3873EC:lI47|H387404
-387404:lI99|H387424
-387424:lI108|H38744C
-38744C:lI101|H38747C
-38747C:lI97|H3874B4
-3874B4:lI114|H3874F4
-3874F4:lI99|H38753C
-38753C:lI97|H38758C
-38758C:lI115|H3875E4
-3875E4:lI101|H387644
-387644:lI47|H3876AC
-3876AC:lI111|H38771C
-38771C:lI116|H387794
-387794:lI112|H387814
-387814:lI47|H38789C
-38789C:lI101|H38792C
-38792C:lI114|H3879BC
-3879BC:lI116|H387A54
-387A54:lI115|H387AF4
-387AF4:lI47|H387B9C
-387B9C:lI108|H387C4C
-387C4C:lI105|H387D04
-387D04:lI98|H387DC4
-387DC4:lI47|H387E8C
-387E8C:lI107|H387F5C
-387F5C:lI101|H388034
-388034:lI114|H388114
-388114:lI110|H3881FC
-3881FC:lI101|H3882EC
-3882EC:lI108|H3883E4
-3883E4:lI47|H3884E4
-3884E4:lI101|H3885EC
-3885EC:lI98|H3886FC
-3886FC:lI105|H388814
-388814:lI110|N
-38AF10:lH38740C|H38AF48
-38740C:lI47|H38742C
-38742C:lI99|H387454
-387454:lI108|H387484
-387484:lI101|H3874BC
-3874BC:lI97|H3874FC
-3874FC:lI114|H387544
-387544:lI99|H387594
-387594:lI97|H3875EC
-3875EC:lI115|H38764C
-38764C:lI101|H3876B4
-3876B4:lI47|H387724
-387724:lI111|H38779C
-38779C:lI116|H38781C
-38781C:lI112|H3878A4
-3878A4:lI47|H387934
-387934:lI101|H3879C4
-3879C4:lI114|H387A5C
-387A5C:lI116|H387AFC
-387AFC:lI115|H387BA4
-387BA4:lI47|H387C54
-387C54:lI108|H387D0C
-387D0C:lI105|H387DCC
-387DCC:lI98|H387E94
-387E94:lI47|H387F64
-387F64:lI115|H38803C
-38803C:lI116|H38811C
-38811C:lI100|H388204
-388204:lI108|H3882F4
-3882F4:lI105|H3883EC
-3883EC:lI98|H3884EC
-3884EC:lI47|H3885F4
-3885F4:lI101|H388704
-388704:lI98|H38881C
-38881C:lI105|H38892C
-38892C:lI110|N
-38AF48:lH387434|H38AF70
-387434:lI47|H38745C
-38745C:lI99|H38748C
-38748C:lI108|H3874C4
-3874C4:lI101|H387504
-387504:lI97|H38754C
-38754C:lI114|H38759C
-38759C:lI99|H3875F4
-3875F4:lI97|H387654
-387654:lI115|H3876BC
-3876BC:lI101|H38772C
-38772C:lI47|H3877A4
-3877A4:lI111|H387824
-387824:lI116|H3878AC
-3878AC:lI112|H38793C
-38793C:lI47|H3879CC
-3879CC:lI101|H387A64
-387A64:lI114|H387B04
-387B04:lI116|H387BAC
-387BAC:lI115|H387C5C
-387C5C:lI47|H387D14
-387D14:lI108|H387DD4
-387DD4:lI105|H387E9C
-387E9C:lI98|H387F6C
-387F6C:lI47|H388044
-388044:lI119|H388124
-388124:lI101|H38820C
-38820C:lI98|H3882FC
-3882FC:lI116|H3883F4
-3883F4:lI111|H3884F4
-3884F4:lI111|H3885FC
-3885FC:lI108|H38870C
-38870C:lI47|H388824
-388824:lI101|H388934
-388934:lI98|H388A44
-388A44:lI105|H388B54
-388B54:lI110|N
-38AF70:lH387464|H38AF98
-387464:lI47|H387494
-387494:lI99|H3874CC
-3874CC:lI108|H38750C
-38750C:lI101|H387554
-387554:lI97|H3875A4
-3875A4:lI114|H3875FC
-3875FC:lI99|H38765C
-38765C:lI97|H3876C4
-3876C4:lI115|H387734
-387734:lI101|H3877AC
-3877AC:lI47|H38782C
-38782C:lI111|H3878B4
-3878B4:lI116|H387944
-387944:lI112|H3879D4
-3879D4:lI47|H387A6C
-387A6C:lI101|H387B0C
-387B0C:lI114|H387BB4
-387BB4:lI116|H387C64
-387C64:lI115|H387D1C
-387D1C:lI47|H387DDC
-387DDC:lI108|H387EA4
-387EA4:lI105|H387F74
-387F74:lI98|H38804C
-38804C:lI47|H38812C
-38812C:lI116|H388214
-388214:lI118|H388304
-388304:lI47|H3883FC
-3883FC:lI101|H3884FC
-3884FC:lI98|H388604
-388604:lI105|H388714
-388714:lI110|N
-38AF98:lH38749C|H38AFC0
-38749C:lI47|H3874D4
-3874D4:lI99|H387514
-387514:lI108|H38755C
-38755C:lI101|H3875AC
-3875AC:lI97|H387604
-387604:lI114|H387664
-387664:lI99|H3876CC
-3876CC:lI97|H38773C
-38773C:lI115|H3877B4
-3877B4:lI101|H387834
-387834:lI47|H3878BC
-3878BC:lI111|H38794C
-38794C:lI116|H3879DC
-3879DC:lI112|H387A74
-387A74:lI47|H387B14
-387B14:lI101|H387BBC
-387BBC:lI114|H387C6C
-387C6C:lI116|H387D24
-387D24:lI115|H387DE4
-387DE4:lI47|H387EAC
-387EAC:lI108|H387F7C
-387F7C:lI105|H388054
-388054:lI98|H388134
-388134:lI47|H38821C
-38821C:lI116|H38830C
-38830C:lI115|H388404
-388404:lI112|H388504
-388504:lI47|H38860C
-38860C:lI101|H38871C
-38871C:lI98|H38882C
-38882C:lI105|H38893C
-38893C:lI110|N
-38AFC0:lH3874DC|H38AFE8
-3874DC:lI47|H38751C
-38751C:lI99|H387564
-387564:lI108|H3875B4
-3875B4:lI101|H38760C
-38760C:lI97|H38766C
-38766C:lI114|H3876D4
-3876D4:lI99|H387744
-387744:lI97|H3877BC
-3877BC:lI115|H38783C
-38783C:lI101|H3878C4
-3878C4:lI47|H387954
-387954:lI111|H3879E4
-3879E4:lI116|H387A7C
-387A7C:lI112|H387B1C
-387B1C:lI47|H387BC4
-387BC4:lI101|H387C74
-387C74:lI114|H387D2C
-387D2C:lI116|H387DEC
-387DEC:lI115|H387EB4
-387EB4:lI47|H387F84
-387F84:lI108|H38805C
-38805C:lI105|H38813C
-38813C:lI98|H388224
-388224:lI47|H388314
-388314:lI116|H38840C
-38840C:lI111|H38850C
-38850C:lI111|H388614
-388614:lI108|H388724
-388724:lI115|H388834
-388834:lI47|H388944
-388944:lI101|H388A4C
-388A4C:lI98|H388B5C
-388B5C:lI105|H388C6C
-388C6C:lI110|N
-38AFE8:lH387524|H38B008
-387524:lI47|H38756C
-38756C:lI99|H3875BC
-3875BC:lI108|H387614
-387614:lI101|H387674
-387674:lI97|H3876DC
-3876DC:lI114|H38774C
-38774C:lI99|H3877C4
-3877C4:lI97|H387844
-387844:lI115|H3878CC
-3878CC:lI101|H38795C
-38795C:lI47|H3879EC
-3879EC:lI111|H387A84
-387A84:lI116|H387B24
-387B24:lI112|H387BCC
-387BCC:lI47|H387C7C
-387C7C:lI101|H387D34
-387D34:lI114|H387DF4
-387DF4:lI116|H387EBC
-387EBC:lI115|H387F8C
-387F8C:lI47|H388064
-388064:lI108|H388144
-388144:lI105|H38822C
-38822C:lI98|H38831C
-38831C:lI47|H388414
-388414:lI116|H388514
-388514:lI111|H38861C
-38861C:lI111|H38872C
-38872C:lI108|H38883C
-38883C:lI98|H38894C
-38894C:lI97|H388A54
-388A54:lI114|H388B64
-388B64:lI47|H388C74
-388C74:lI101|H388D84
-388D84:lI98|H388E9C
-388E9C:lI105|H388FB4
-388FB4:lI110|N
-38B008:lH387574|H38B018
-387574:lI47|H3875C4
-3875C4:lI99|H38761C
-38761C:lI108|H38767C
-38767C:lI101|H3876E4
-3876E4:lI97|H387754
-387754:lI114|H3877CC
-3877CC:lI99|H38784C
-38784C:lI97|H3878D4
-3878D4:lI115|H387964
-387964:lI101|H3879F4
-3879F4:lI47|H387A8C
-387A8C:lI111|H387B2C
-387B2C:lI116|H387BD4
-387BD4:lI112|H387C84
-387C84:lI47|H387D3C
-387D3C:lI101|H387DFC
-387DFC:lI114|H387EC4
-387EC4:lI116|H387F94
-387F94:lI115|H38806C
-38806C:lI47|H38814C
-38814C:lI108|H388234
-388234:lI105|H388324
-388324:lI98|H38841C
-38841C:lI47|H38851C
-38851C:lI116|H388624
-388624:lI101|H388734
-388734:lI115|H388844
-388844:lI116|H388954
-388954:lI95|H388A5C
-388A5C:lI115|H388B6C
-388B6C:lI101|H388C7C
-388C7C:lI114|H388D8C
-388D8C:lI118|H388EA4
-388EA4:lI101|H388FBC
-388FBC:lI114|H3890D4
-3890D4:lI47|H3891EC
-3891EC:lI101|H3892FC
-3892FC:lI98|H38940C
-38940C:lI105|H38951C
-38951C:lI110|N
-38B018:lH3875CC|H38AE7C
-3875CC:lI47|H387624
-387624:lI99|H387684
-387684:lI108|H3876EC
-3876EC:lI101|H38775C
-38775C:lI97|H3877D4
-3877D4:lI114|H387854
-387854:lI99|H3878DC
-3878DC:lI97|H38796C
-38796C:lI115|H3879FC
-3879FC:lI101|H387A94
-387A94:lI47|H387B34
-387B34:lI111|H387BDC
-387BDC:lI116|H387C8C
-387C8C:lI112|H387D44
-387D44:lI47|H387E04
-387E04:lI101|H387ECC
-387ECC:lI114|H387F9C
-387F9C:lI116|H388074
-388074:lI115|H388154
-388154:lI47|H38823C
-38823C:lI108|H38832C
-38832C:lI105|H388424
-388424:lI98|H388524
-388524:lI47|H38862C
-38862C:lI115|H38873C
-38873C:lI115|H38884C
-38884C:lI108|H38895C
-38895C:lI47|H388A64
-388A64:lI101|H388B74
-388B74:lI98|H388C84
-388C84:lI105|H388D94
-388D94:lI110|N
-38AE7C:lH38762C|H38AEB0
-38762C:lI47|H38768C
-38768C:lI99|H3876F4
-3876F4:lI108|H387764
-387764:lI101|H3877DC
-3877DC:lI97|H38785C
-38785C:lI114|H3878E4
-3878E4:lI99|H387974
-387974:lI97|H387A04
-387A04:lI115|H387A9C
-387A9C:lI101|H387B3C
-387B3C:lI47|H387BE4
-387BE4:lI111|H387C94
-387C94:lI116|H387D4C
-387D4C:lI112|H387E0C
-387E0C:lI47|H387ED4
-387ED4:lI101|H387FA4
-387FA4:lI114|H38807C
-38807C:lI116|H38815C
-38815C:lI115|H388244
-388244:lI47|H388334
-388334:lI108|H38842C
-38842C:lI105|H38852C
-38852C:lI98|H388634
-388634:lI47|H388744
-388744:lI115|H388854
-388854:lI110|H388964
-388964:lI109|H388A6C
-388A6C:lI112|H388B7C
-388B7C:lI47|H388C8C
-388C8C:lI101|H388D9C
-388D9C:lI98|H388EAC
-388EAC:lI105|H388FC4
-388FC4:lI110|N
-38AEB0:lH387694|H38AED8
-387694:lI47|H3876FC
-3876FC:lI99|H38776C
-38776C:lI108|H3877E4
-3877E4:lI101|H387864
-387864:lI97|H3878EC
-3878EC:lI114|H38797C
-38797C:lI99|H387A0C
-387A0C:lI97|H387AA4
-387AA4:lI115|H387B44
-387B44:lI101|H387BEC
-387BEC:lI47|H387C9C
-387C9C:lI111|H387D54
-387D54:lI116|H387E14
-387E14:lI112|H387EDC
-387EDC:lI47|H387FAC
-387FAC:lI101|H388084
-388084:lI114|H388164
-388164:lI116|H38824C
-38824C:lI115|H38833C
-38833C:lI47|H388434
-388434:lI108|H388534
-388534:lI105|H38863C
-38863C:lI98|H38874C
-38874C:lI47|H38885C
-38885C:lI115|H38896C
-38896C:lI97|H388A74
-388A74:lI115|H388B84
-388B84:lI108|H388C94
-388C94:lI47|H388DA4
-388DA4:lI101|H388EB4
-388EB4:lI98|H388FCC
-388FCC:lI105|H3890DC
-3890DC:lI110|N
-38AED8:lH387704|H38AF08
-387704:lI47|H387774
-387774:lI99|H3877EC
-3877EC:lI108|H38786C
-38786C:lI101|H3878F4
-3878F4:lI97|H387984
-387984:lI114|H387A14
-387A14:lI99|H387AAC
-387AAC:lI97|H387B4C
-387B4C:lI115|H387BF4
-387BF4:lI101|H387CA4
-387CA4:lI47|H387D5C
-387D5C:lI111|H387E1C
-387E1C:lI116|H387EE4
-387EE4:lI112|H387FB4
-387FB4:lI47|H38808C
-38808C:lI101|H38816C
-38816C:lI114|H388254
-388254:lI116|H388344
-388344:lI115|H38843C
-38843C:lI47|H38853C
-38853C:lI108|H388644
-388644:lI105|H388754
-388754:lI98|H388864
-388864:lI47|H388974
-388974:lI114|H388A7C
-388A7C:lI117|H388B8C
-388B8C:lI110|H388C9C
-388C9C:lI116|H388DAC
-388DAC:lI105|H388EBC
-388EBC:lI109|H388FD4
-388FD4:lI101|H3890E4
-3890E4:lI95|H3891F4
-3891F4:lI116|H389304
-389304:lI111|H389414
-389414:lI111|H389524
-389524:lI108|H389624
-389624:lI115|H38971C
-38971C:lI47|H389814
-389814:lI101|H38990C
-38990C:lI98|H389A04
-389A04:lI105|H389AE4
-389AE4:lI110|N
-38AF08:lH38777C|H38AF40
-38777C:lI47|H3877F4
-3877F4:lI99|H387874
-387874:lI108|H3878FC
-3878FC:lI101|H38798C
-38798C:lI97|H387A1C
-387A1C:lI114|H387AB4
-387AB4:lI99|H387B54
-387B54:lI97|H387BFC
-387BFC:lI115|H387CAC
-387CAC:lI101|H387D64
-387D64:lI47|H387E24
-387E24:lI111|H387EEC
-387EEC:lI116|H387FBC
-387FBC:lI112|H388094
-388094:lI47|H388174
-388174:lI101|H38825C
-38825C:lI114|H38834C
-38834C:lI116|H388444
-388444:lI115|H388544
-388544:lI47|H38864C
-38864C:lI108|H38875C
-38875C:lI105|H38886C
-38886C:lI98|H38897C
-38897C:lI47|H388A84
-388A84:lI114|H388B94
-388B94:lI115|H388CA4
-388CA4:lI104|H388DB4
-388DB4:lI101|H388EC4
-388EC4:lI108|H388FDC
-388FDC:lI108|H3890EC
-3890EC:lI47|H3891FC
-3891FC:lI101|H38930C
-38930C:lI98|H38941C
-38941C:lI105|H38952C
-38952C:lI110|N
-38AF40:lH3877FC|H38AF68
-3877FC:lI47|H38787C
-38787C:lI99|H387904
-387904:lI108|H387994
-387994:lI101|H387A24
-387A24:lI97|H387ABC
-387ABC:lI114|H387B5C
-387B5C:lI99|H387C04
-387C04:lI97|H387CB4
-387CB4:lI115|H387D6C
-387D6C:lI101|H387E2C
-387E2C:lI47|H387EF4
-387EF4:lI111|H387FC4
-387FC4:lI116|H38809C
-38809C:lI112|H38817C
-38817C:lI47|H388264
-388264:lI101|H388354
-388354:lI114|H38844C
-38844C:lI116|H38854C
-38854C:lI115|H388654
-388654:lI47|H388764
-388764:lI108|H388874
-388874:lI105|H388984
-388984:lI98|H388A8C
-388A8C:lI47|H388B9C
-388B9C:lI112|H388CAC
-388CAC:lI109|H388DBC
-388DBC:lI97|H388ECC
-388ECC:lI110|H388FE4
-388FE4:lI47|H3890F4
-3890F4:lI101|H389204
-389204:lI98|H389314
-389314:lI105|H389424
-389424:lI110|N
-38AF68:lH387884|H38AF90
-387884:lI47|H38790C
-38790C:lI99|H38799C
-38799C:lI108|H387A2C
-387A2C:lI101|H387AC4
-387AC4:lI97|H387B64
-387B64:lI114|H387C0C
-387C0C:lI99|H387CBC
-387CBC:lI97|H387D74
-387D74:lI115|H387E34
-387E34:lI101|H387EFC
-387EFC:lI47|H387FCC
-387FCC:lI111|H3880A4
-3880A4:lI116|H388184
-388184:lI112|H38826C
-38826C:lI47|H38835C
-38835C:lI101|H388454
-388454:lI114|H388554
-388554:lI116|H38865C
-38865C:lI115|H38876C
-38876C:lI47|H38887C
-38887C:lI108|H38898C
-38898C:lI105|H388A94
-388A94:lI98|H388BA4
-388BA4:lI47|H388CB4
-388CB4:lI112|H388DC4
-388DC4:lI97|H388ED4
-388ED4:lI114|H388FEC
-388FEC:lI115|H3890FC
-3890FC:lI101|H38920C
-38920C:lI116|H38931C
-38931C:lI111|H38942C
-38942C:lI111|H389534
-389534:lI108|H38962C
-38962C:lI115|H389724
-389724:lI47|H38981C
-38981C:lI101|H389914
-389914:lI98|H389A0C
-389A0C:lI105|H389AEC
-389AEC:lI110|N
-38AF90:lH387914|H38AFB8
-387914:lI47|H3879A4
-3879A4:lI99|H387A34
-387A34:lI108|H387ACC
-387ACC:lI101|H387B6C
-387B6C:lI97|H387C14
-387C14:lI114|H387CC4
-387CC4:lI99|H387D7C
-387D7C:lI97|H387E3C
-387E3C:lI115|H387F04
-387F04:lI101|H387FD4
-387FD4:lI47|H3880AC
-3880AC:lI111|H38818C
-38818C:lI116|H388274
-388274:lI112|H388364
-388364:lI47|H38845C
-38845C:lI101|H38855C
-38855C:lI114|H388664
-388664:lI116|H388774
-388774:lI115|H388884
-388884:lI47|H388994
-388994:lI108|H388A9C
-388A9C:lI105|H388BAC
-388BAC:lI98|H388CBC
-388CBC:lI47|H388DCC
-388DCC:lI111|H388EDC
-388EDC:lI116|H388FF4
-388FF4:lI112|H389104
-389104:lI95|H389214
-389214:lI109|H389324
-389324:lI105|H389434
-389434:lI98|H38953C
-38953C:lI115|H389634
-389634:lI47|H38972C
-38972C:lI101|H389824
-389824:lI98|H38991C
-38991C:lI105|H389A14
-389A14:lI110|N
-38AFB8:lH3879AC|H38AFE0
-3879AC:lI47|H387A3C
-387A3C:lI99|H387AD4
-387AD4:lI108|H387B74
-387B74:lI101|H387C1C
-387C1C:lI97|H387CCC
-387CCC:lI114|H387D84
-387D84:lI99|H387E44
-387E44:lI97|H387F0C
-387F0C:lI115|H387FDC
-387FDC:lI101|H3880B4
-3880B4:lI47|H388194
-388194:lI111|H38827C
-38827C:lI116|H38836C
-38836C:lI112|H388464
-388464:lI47|H388564
-388564:lI101|H38866C
-38866C:lI114|H38877C
-38877C:lI116|H38888C
-38888C:lI115|H38899C
-38899C:lI47|H388AA4
-388AA4:lI108|H388BB4
-388BB4:lI105|H388CC4
-388CC4:lI98|H388DD4
-388DD4:lI47|H388EE4
-388EE4:lI111|H388FFC
-388FFC:lI115|H38910C
-38910C:lI95|H38921C
-38921C:lI109|H38932C
-38932C:lI111|H38943C
-38943C:lI110|H389544
-389544:lI47|H38963C
-38963C:lI101|H389734
-389734:lI98|H38982C
-38982C:lI105|H389924
-389924:lI110|N
-38AFE0:lH387A44|H38B000
-387A44:lI47|H387ADC
-387ADC:lI99|H387B7C
-387B7C:lI108|H387C24
-387C24:lI101|H387CD4
-387CD4:lI97|H387D8C
-387D8C:lI114|H387E4C
-387E4C:lI99|H387F14
-387F14:lI97|H387FE4
-387FE4:lI115|H3880BC
-3880BC:lI101|H38819C
-38819C:lI47|H388284
-388284:lI111|H388374
-388374:lI116|H38846C
-38846C:lI112|H38856C
-38856C:lI47|H388674
-388674:lI101|H388784
-388784:lI114|H388894
-388894:lI116|H3889A4
-3889A4:lI115|H388AAC
-388AAC:lI47|H388BBC
-388BBC:lI108|H388CCC
-388CCC:lI105|H388DDC
-388DDC:lI98|H388EEC
-388EEC:lI47|H389004
-389004:lI111|H389114
-389114:lI114|H389224
-389224:lI98|H389334
-389334:lI101|H389444
-389444:lI114|H38954C
-38954C:lI47|H389644
-389644:lI101|H38973C
-38973C:lI98|H389834
-389834:lI105|H38992C
-38992C:lI110|N
-38B000:lH387AE4|H38B010
-387AE4:lI47|H387B84
-387B84:lI99|H387C2C
-387C2C:lI108|H387CDC
-387CDC:lI101|H387D94
-387D94:lI97|H387E54
-387E54:lI114|H387F1C
-387F1C:lI99|H387FEC
-387FEC:lI97|H3880C4
-3880C4:lI115|H3881A4
-3881A4:lI101|H38828C
-38828C:lI47|H38837C
-38837C:lI111|H388474
-388474:lI116|H388574
-388574:lI112|H38867C
-38867C:lI47|H38878C
-38878C:lI101|H38889C
-38889C:lI114|H3889AC
-3889AC:lI116|H388AB4
-388AB4:lI115|H388BC4
-388BC4:lI47|H388CD4
-388CD4:lI108|H388DE4
-388DE4:lI105|H388EF4
-388EF4:lI98|H38900C
-38900C:lI47|H38911C
-38911C:lI111|H38922C
-38922C:lI100|H38933C
-38933C:lI98|H38944C
-38944C:lI99|H389554
-389554:lI47|H38964C
-38964C:lI101|H389744
-389744:lI98|H38983C
-38983C:lI105|H389934
-389934:lI110|N
-38B010:lH387B8C|H38B020
-387B8C:lI47|H387C34
-387C34:lI99|H387CE4
-387CE4:lI108|H387D9C
-387D9C:lI101|H387E5C
-387E5C:lI97|H387F24
-387F24:lI114|H387FF4
-387FF4:lI99|H3880CC
-3880CC:lI97|H3881AC
-3881AC:lI115|H388294
-388294:lI101|H388384
-388384:lI47|H38847C
-38847C:lI111|H38857C
-38857C:lI116|H388684
-388684:lI112|H388794
-388794:lI47|H3888A4
-3888A4:lI101|H3889B4
-3889B4:lI114|H388ABC
-388ABC:lI116|H388BCC
-388BCC:lI115|H388CDC
-388CDC:lI47|H388DEC
-388DEC:lI108|H388EFC
-388EFC:lI105|H389014
-389014:lI98|H389124
-389124:lI47|H389234
-389234:lI111|H389344
-389344:lI98|H389454
-389454:lI115|H38955C
-38955C:lI101|H389654
-389654:lI114|H38974C
-38974C:lI118|H389844
-389844:lI101|H38993C
-38993C:lI114|H389A1C
-389A1C:lI47|H389AF4
-389AF4:lI101|H389BBC
-389BBC:lI98|H389C84
-389C84:lI105|H389D4C
-389D4C:lI110|N
-38B020:lH387C3C|H38B028
-387C3C:lI47|H387CEC
-387CEC:lI99|H387DA4
-387DA4:lI108|H387E64
-387E64:lI101|H387F2C
-387F2C:lI97|H387FFC
-387FFC:lI114|H3880D4
-3880D4:lI99|H3881B4
-3881B4:lI97|H38829C
-38829C:lI115|H38838C
-38838C:lI101|H388484
-388484:lI47|H388584
-388584:lI111|H38868C
-38868C:lI116|H38879C
-38879C:lI112|H3888AC
-3888AC:lI47|H3889BC
-3889BC:lI101|H388AC4
-388AC4:lI114|H388BD4
-388BD4:lI116|H388CE4
-388CE4:lI115|H388DF4
-388DF4:lI47|H388F04
-388F04:lI108|H38901C
-38901C:lI105|H38912C
-38912C:lI98|H38923C
-38923C:lI47|H38934C
-38934C:lI109|H38945C
-38945C:lI110|H389564
-389564:lI101|H38965C
-38965C:lI115|H389754
-389754:lI105|H38984C
-38984C:lI97|H389944
-389944:lI95|H389A24
-389A24:lI115|H389AFC
-389AFC:lI101|H389BC4
-389BC4:lI115|H389C8C
-389C8C:lI115|H389D54
-389D54:lI105|H389E14
-389E14:lI111|H389ECC
-389ECC:lI110|H389F7C
-389F7C:lI47|H38A01C
-38A01C:lI101|H38A0AC
-38A0AC:lI98|H38A12C
-38A12C:lI105|H38A19C
-38A19C:lI110|N
-38B028:lH387CF4|H38B030
-387CF4:lI47|H387DAC
-387DAC:lI99|H387E6C
-387E6C:lI108|H387F34
-387F34:lI101|H388004
-388004:lI97|H3880DC
-3880DC:lI114|H3881BC
-3881BC:lI99|H3882A4
-3882A4:lI97|H388394
-388394:lI115|H38848C
-38848C:lI101|H38858C
-38858C:lI47|H388694
-388694:lI111|H3887A4
-3887A4:lI116|H3888B4
-3888B4:lI112|H3889C4
-3889C4:lI47|H388ACC
-388ACC:lI101|H388BDC
-388BDC:lI114|H388CEC
-388CEC:lI116|H388DFC
-388DFC:lI115|H388F0C
-388F0C:lI47|H389024
-389024:lI108|H389134
-389134:lI105|H389244
-389244:lI98|H389354
-389354:lI47|H389464
-389464:lI109|H38956C
-38956C:lI110|H389664
-389664:lI101|H38975C
-38975C:lI115|H389854
-389854:lI105|H38994C
-38994C:lI97|H389A2C
-389A2C:lI47|H389B04
-389B04:lI101|H389BCC
-389BCC:lI98|H389C94
-389C94:lI105|H389D5C
-389D5C:lI110|N
-38B030:lH387DB4|H38B038
-387DB4:lI47|H387E74
-387E74:lI99|H387F3C
-387F3C:lI108|H38800C
-38800C:lI101|H3880E4
-3880E4:lI97|H3881C4
-3881C4:lI114|H3882AC
-3882AC:lI99|H38839C
-38839C:lI97|H388494
-388494:lI115|H388594
-388594:lI101|H38869C
-38869C:lI47|H3887AC
-3887AC:lI111|H3888BC
-3888BC:lI116|H3889CC
-3889CC:lI112|H388AD4
-388AD4:lI47|H388BE4
-388BE4:lI101|H388CF4
-388CF4:lI114|H388E04
-388E04:lI116|H388F14
-388F14:lI115|H38902C
-38902C:lI47|H38913C
-38913C:lI108|H38924C
-38924C:lI105|H38935C
-38935C:lI98|H38946C
-38946C:lI47|H389574
-389574:lI109|H38966C
-38966C:lI110|H389764
-389764:lI101|H38985C
-38985C:lI109|H389954
-389954:lI111|H389A34
-389A34:lI115|H389B0C
-389B0C:lI121|H389BD4
-389BD4:lI110|H389C9C
-389C9C:lI101|H389D64
-389D64:lI47|H389E1C
-389E1C:lI101|H389ED4
-389ED4:lI98|H389F84
-389F84:lI105|H38A024
-38A024:lI110|N
-38B038:lH387E7C|H38B040
-387E7C:lI47|H387F44
-387F44:lI99|H388014
-388014:lI108|H3880EC
-3880EC:lI101|H3881CC
-3881CC:lI97|H3882B4
-3882B4:lI114|H3883A4
-3883A4:lI99|H38849C
-38849C:lI97|H38859C
-38859C:lI115|H3886A4
-3886A4:lI101|H3887B4
-3887B4:lI47|H3888C4
-3888C4:lI111|H3889D4
-3889D4:lI116|H388ADC
-388ADC:lI112|H388BEC
-388BEC:lI47|H388CFC
-388CFC:lI101|H388E0C
-388E0C:lI114|H388F1C
-388F1C:lI116|H389034
-389034:lI115|H389144
-389144:lI47|H389254
-389254:lI108|H389364
-389364:lI105|H389474
-389474:lI98|H38957C
-38957C:lI47|H389674
-389674:lI109|H38976C
-38976C:lI101|H389864
-389864:lI103|H38995C
-38995C:lI97|H389A3C
-389A3C:lI99|H389B14
-389B14:lI111|H389BDC
-389BDC:lI47|H389CA4
-389CA4:lI101|H389D6C
-389D6C:lI98|H389E24
-389E24:lI105|H389EDC
-389EDC:lI110|N
-38B040:lH387F4C|H38B048
-387F4C:lI47|H38801C
-38801C:lI99|H3880F4
-3880F4:lI108|H3881D4
-3881D4:lI101|H3882BC
-3882BC:lI97|H3883AC
-3883AC:lI114|H3884A4
-3884A4:lI99|H3885A4
-3885A4:lI97|H3886AC
-3886AC:lI115|H3887BC
-3887BC:lI101|H3888CC
-3888CC:lI47|H3889DC
-3889DC:lI111|H388AE4
-388AE4:lI116|H388BF4
-388BF4:lI112|H388D04
-388D04:lI47|H388E14
-388E14:lI101|H388F24
-388F24:lI114|H38903C
-38903C:lI116|H38914C
-38914C:lI115|H38925C
-38925C:lI47|H38936C
-38936C:lI108|H38947C
-38947C:lI105|H389584
-389584:lI98|H38967C
-38967C:lI47|H389774
-389774:lI106|H38986C
-38986C:lI105|H389964
-389964:lI110|H389A44
-389A44:lI116|H389B1C
-389B1C:lI101|H389BE4
-389BE4:lI114|H389CAC
-389CAC:lI102|H389D74
-389D74:lI97|H389E2C
-389E2C:lI99|H389EE4
-389EE4:lI101|N
-38B048:lH388024|H38B050
-388024:lI47|H3880FC
-3880FC:lI99|H3881DC
-3881DC:lI108|H3882C4
-3882C4:lI101|H3883B4
-3883B4:lI97|H3884AC
-3884AC:lI114|H3885AC
-3885AC:lI99|H3886B4
-3886B4:lI97|H3887C4
-3887C4:lI115|H3888D4
-3888D4:lI101|H3889E4
-3889E4:lI47|H388AEC
-388AEC:lI111|H388BFC
-388BFC:lI116|H388D0C
-388D0C:lI112|H388E1C
-388E1C:lI47|H388F2C
-388F2C:lI101|H389044
-389044:lI114|H389154
-389154:lI116|H389264
-389264:lI115|H389374
-389374:lI47|H389484
-389484:lI108|H38958C
-38958C:lI105|H389684
-389684:lI98|H38977C
-38977C:lI47|H389874
-389874:lI105|H38996C
-38996C:lI110|H389A4C
-389A4C:lI101|H389B24
-389B24:lI116|H389BEC
-389BEC:lI115|H389CB4
-389CB4:lI47|H389D7C
-389D7C:lI101|H389E34
-389E34:lI98|H389EEC
-389EEC:lI105|H389F8C
-389F8C:lI110|N
-38B050:lH388104|H38B058
-388104:lI47|H3881E4
-3881E4:lI99|H3882CC
-3882CC:lI108|H3883BC
-3883BC:lI101|H3884B4
-3884B4:lI97|H3885B4
-3885B4:lI114|H3886BC
-3886BC:lI99|H3887CC
-3887CC:lI97|H3888DC
-3888DC:lI115|H3889EC
-3889EC:lI101|H388AF4
-388AF4:lI47|H388C04
-388C04:lI111|H388D14
-388D14:lI116|H388E24
-388E24:lI112|H388F34
-388F34:lI47|H38904C
-38904C:lI101|H38915C
-38915C:lI114|H38926C
-38926C:lI116|H38937C
-38937C:lI115|H38948C
-38948C:lI47|H389594
-389594:lI108|H38968C
-38968C:lI105|H389784
-389784:lI98|H38987C
-38987C:lI47|H389974
-389974:lI105|H389A54
-389A54:lI99|H389B2C
-389B2C:lI47|H389BF4
-389BF4:lI101|H389CBC
-389CBC:lI98|H389D84
-389D84:lI105|H389E3C
-389E3C:lI110|N
-38B058:lH3881EC|H38B060
-3881EC:lI47|H3882D4
-3882D4:lI99|H3883C4
-3883C4:lI108|H3884BC
-3884BC:lI101|H3885BC
-3885BC:lI97|H3886C4
-3886C4:lI114|H3887D4
-3887D4:lI99|H3888E4
-3888E4:lI97|H3889F4
-3889F4:lI115|H388AFC
-388AFC:lI101|H388C0C
-388C0C:lI47|H388D1C
-388D1C:lI111|H388E2C
-388E2C:lI116|H388F3C
-388F3C:lI112|H389054
-389054:lI47|H389164
-389164:lI101|H389274
-389274:lI114|H389384
-389384:lI116|H389494
-389494:lI115|H38959C
-38959C:lI47|H389694
-389694:lI108|H38978C
-38978C:lI105|H389884
-389884:lI98|H38997C
-38997C:lI47|H389A5C
-389A5C:lI104|H389B34
-389B34:lI105|H389BFC
-389BFC:lI112|H389CC4
-389CC4:lI101|H389D8C
-389D8C:lI47|H389E44
-389E44:lI101|H389EF4
-389EF4:lI98|H389F94
-389F94:lI105|H38A02C
-38A02C:lI110|N
-38B060:lH3882DC|H38B068
-3882DC:lI47|H3883CC
-3883CC:lI99|H3884C4
-3884C4:lI108|H3885C4
-3885C4:lI101|H3886CC
-3886CC:lI97|H3887DC
-3887DC:lI114|H3888EC
-3888EC:lI99|H3889FC
-3889FC:lI97|H388B04
-388B04:lI115|H388C14
-388C14:lI101|H388D24
-388D24:lI47|H388E34
-388E34:lI111|H388F44
-388F44:lI116|H38905C
-38905C:lI112|H38916C
-38916C:lI47|H38927C
-38927C:lI101|H38938C
-38938C:lI114|H38949C
-38949C:lI116|H3895A4
-3895A4:lI115|H38969C
-38969C:lI47|H389794
-389794:lI108|H38988C
-38988C:lI105|H389984
-389984:lI98|H389A64
-389A64:lI47|H389B3C
-389B3C:lI103|H389C04
-389C04:lI115|H389CCC
-389CCC:lI47|H389D94
-389D94:lI101|H389E4C
-389E4C:lI98|H389EFC
-389EFC:lI105|H389F9C
-389F9C:lI110|N
-38B068:lH3883D4|H38B070
-3883D4:lI47|H3884CC
-3884CC:lI99|H3885CC
-3885CC:lI108|H3886D4
-3886D4:lI101|H3887E4
-3887E4:lI97|H3888F4
-3888F4:lI114|H388A04
-388A04:lI99|H388B0C
-388B0C:lI97|H388C1C
-388C1C:lI115|H388D2C
-388D2C:lI101|H388E3C
-388E3C:lI47|H388F4C
-388F4C:lI111|H389064
-389064:lI116|H389174
-389174:lI112|H389284
-389284:lI47|H389394
-389394:lI101|H3894A4
-3894A4:lI114|H3895AC
-3895AC:lI116|H3896A4
-3896A4:lI115|H38979C
-38979C:lI47|H389894
-389894:lI108|H38998C
-38998C:lI105|H389A6C
-389A6C:lI98|H389B44
-389B44:lI47|H389C0C
-389C0C:lI101|H389CD4
-389CD4:lI118|H389D9C
-389D9C:lI97|H389E54
-389E54:lI47|H389F04
-389F04:lI101|H389FA4
-389FA4:lI98|H38A034
-38A034:lI105|H38A0B4
-38A0B4:lI110|N
-38B070:lH3884D4|H38B078
-3884D4:lI47|H3885D4
-3885D4:lI99|H3886DC
-3886DC:lI108|H3887EC
-3887EC:lI101|H3888FC
-3888FC:lI97|H388A0C
-388A0C:lI114|H388B14
-388B14:lI99|H388C24
-388C24:lI97|H388D34
-388D34:lI115|H388E44
-388E44:lI101|H388F54
-388F54:lI47|H38906C
-38906C:lI111|H38917C
-38917C:lI116|H38928C
-38928C:lI112|H38939C
-38939C:lI47|H3894AC
-3894AC:lI101|H3895B4
-3895B4:lI114|H3896AC
-3896AC:lI116|H3897A4
-3897A4:lI115|H38989C
-38989C:lI47|H389994
-389994:lI108|H389A74
-389A74:lI105|H389B4C
-389B4C:lI98|H389C14
-389C14:lI47|H389CDC
-389CDC:lI101|H389DA4
-389DA4:lI116|H389E5C
-389E5C:lI47|H389F0C
-389F0C:lI101|H389FAC
-389FAC:lI98|H38A03C
-38A03C:lI105|H38A0BC
-38A0BC:lI110|N
-38B078:lH3885DC|H38B080
-3885DC:lI47|H3886E4
-3886E4:lI99|H3887F4
-3887F4:lI108|H388904
-388904:lI101|H388A14
-388A14:lI97|H388B1C
-388B1C:lI114|H388C2C
-388C2C:lI99|H388D3C
-388D3C:lI97|H388E4C
-388E4C:lI115|H388F5C
-388F5C:lI101|H389074
-389074:lI47|H389184
-389184:lI111|H389294
-389294:lI116|H3893A4
-3893A4:lI112|H3894B4
-3894B4:lI47|H3895BC
-3895BC:lI101|H3896B4
-3896B4:lI114|H3897AC
-3897AC:lI116|H3898A4
-3898A4:lI115|H38999C
-38999C:lI47|H389A7C
-389A7C:lI108|H389B54
-389B54:lI105|H389C1C
-389C1C:lI98|H389CE4
-389CE4:lI47|H389DAC
-389DAC:lI101|H389E64
-389E64:lI114|H389F14
-389F14:lI108|H389FB4
-389FB4:lI95|H38A044
-38A044:lI105|H38A0C4
-38A0C4:lI110|H38A134
-38A134:lI116|H38A1A4
-38A1A4:lI101|H38A20C
-38A20C:lI114|H38A274
-38A274:lI102|H38A2DC
-38A2DC:lI97|H38A344
-38A344:lI99|H38A3AC
-38A3AC:lI101|N
-38B080:lH3886EC|H38B088
-3886EC:lI47|H3887FC
-3887FC:lI99|H38890C
-38890C:lI108|H388A1C
-388A1C:lI101|H388B24
-388B24:lI97|H388C34
-388C34:lI114|H388D44
-388D44:lI99|H388E54
-388E54:lI97|H388F64
-388F64:lI115|H38907C
-38907C:lI101|H38918C
-38918C:lI47|H38929C
-38929C:lI111|H3893AC
-3893AC:lI116|H3894BC
-3894BC:lI112|H3895C4
-3895C4:lI47|H3896BC
-3896BC:lI101|H3897B4
-3897B4:lI114|H3898AC
-3898AC:lI116|H3899A4
-3899A4:lI115|H389A84
-389A84:lI47|H389B5C
-389B5C:lI108|H389C24
-389C24:lI105|H389CEC
-389CEC:lI98|H389DB4
-389DB4:lI47|H389E6C
-389E6C:lI100|H389F1C
-389F1C:lI101|H389FBC
-389FBC:lI98|H38A04C
-38A04C:lI117|H38A0CC
-38A0CC:lI103|H38A13C
-38A13C:lI103|H38A1AC
-38A1AC:lI101|H38A214
-38A214:lI114|H38A27C
-38A27C:lI47|H38A2E4
-38A2E4:lI101|H38A34C
-38A34C:lI98|H38A3B4
-38A3B4:lI105|H38A414
-38A414:lI110|N
-38B088:lH388804|H38B090
-388804:lI47|H388914
-388914:lI99|H388A24
-388A24:lI108|H388B2C
-388B2C:lI101|H388C3C
-388C3C:lI97|H388D4C
-388D4C:lI114|H388E5C
-388E5C:lI99|H388F6C
-388F6C:lI97|H389084
-389084:lI115|H389194
-389194:lI101|H3892A4
-3892A4:lI47|H3893B4
-3893B4:lI111|H3894C4
-3894C4:lI116|H3895CC
-3895CC:lI112|H3896C4
-3896C4:lI47|H3897BC
-3897BC:lI101|H3898B4
-3898B4:lI114|H3899AC
-3899AC:lI116|H389A8C
-389A8C:lI115|H389B64
-389B64:lI47|H389C2C
-389C2C:lI108|H389CF4
-389CF4:lI105|H389DBC
-389DBC:lI98|H389E74
-389E74:lI47|H389F24
-389F24:lI99|H389FC4
-389FC4:lI114|H38A054
-38A054:lI121|H38A0D4
-38A0D4:lI112|H38A144
-38A144:lI116|H38A1B4
-38A1B4:lI111|H38A21C
-38A21C:lI47|H38A284
-38A284:lI101|H38A2EC
-38A2EC:lI98|H38A354
-38A354:lI105|H38A3BC
-38A3BC:lI110|N
-38B090:lH38891C|H38B098
-38891C:lI47|H388A2C
-388A2C:lI99|H388B34
-388B34:lI108|H388C44
-388C44:lI101|H388D54
-388D54:lI97|H388E64
-388E64:lI114|H388F74
-388F74:lI99|H38908C
-38908C:lI97|H38919C
-38919C:lI115|H3892AC
-3892AC:lI101|H3893BC
-3893BC:lI47|H3894CC
-3894CC:lI111|H3895D4
-3895D4:lI116|H3896CC
-3896CC:lI112|H3897C4
-3897C4:lI47|H3898BC
-3898BC:lI101|H3899B4
-3899B4:lI114|H389A94
-389A94:lI116|H389B6C
-389B6C:lI115|H389C34
-389C34:lI47|H389CFC
-389CFC:lI108|H389DC4
-389DC4:lI105|H389E7C
-389E7C:lI98|H389F2C
-389F2C:lI47|H389FCC
-389FCC:lI99|H38A05C
-38A05C:lI111|H38A0DC
-38A0DC:lI115|H38A14C
-38A14C:lI84|H38A1BC
-38A1BC:lI114|H38A224
-38A224:lI97|H38A28C
-38A28C:lI110|H38A2F4
-38A2F4:lI115|H38A35C
-38A35C:lI97|H38A3C4
-38A3C4:lI99|H38A41C
-38A41C:lI116|H38A46C
-38A46C:lI105|H38A4BC
-38A4BC:lI111|H38A50C
-38A50C:lI110|H38A554
-38A554:lI115|H38A59C
-38A59C:lI47|H38A5E4
-38A5E4:lI101|H38A62C
-38A62C:lI98|H38A66C
-38A66C:lI105|H38A6A4
-38A6A4:lI110|N
-38B098:lH388A34|H38B0A0
-388A34:lI47|H388B3C
-388B3C:lI99|H388C4C
-388C4C:lI108|H388D5C
-388D5C:lI101|H388E6C
-388E6C:lI97|H388F7C
-388F7C:lI114|H389094
-389094:lI99|H3891A4
-3891A4:lI97|H3892B4
-3892B4:lI115|H3893C4
-3893C4:lI101|H3894D4
-3894D4:lI47|H3895DC
-3895DC:lI111|H3896D4
-3896D4:lI116|H3897CC
-3897CC:lI112|H3898C4
-3898C4:lI47|H3899BC
-3899BC:lI101|H389A9C
-389A9C:lI114|H389B74
-389B74:lI116|H389C3C
-389C3C:lI115|H389D04
-389D04:lI47|H389DCC
-389DCC:lI108|H389E84
-389E84:lI105|H389F34
-389F34:lI98|H389FD4
-389FD4:lI47|H38A064
-38A064:lI99|H38A0E4
-38A0E4:lI111|H38A154
-38A154:lI115|H38A1C4
-38A1C4:lI84|H38A22C
-38A22C:lI105|H38A294
-38A294:lI109|H38A2FC
-38A2FC:lI101|H38A364
-38A364:lI47|H38A3CC
-38A3CC:lI101|H38A424
-38A424:lI98|H38A474
-38A474:lI105|H38A4C4
-38A4C4:lI110|N
-38B0A0:lH388B44|H38B0A8
-388B44:lI47|H388C54
-388C54:lI99|H388D64
-388D64:lI108|H388E74
-388E74:lI101|H388F84
-388F84:lI97|H38909C
-38909C:lI114|H3891AC
-3891AC:lI99|H3892BC
-3892BC:lI97|H3893CC
-3893CC:lI115|H3894DC
-3894DC:lI101|H3895E4
-3895E4:lI47|H3896DC
-3896DC:lI111|H3897D4
-3897D4:lI116|H3898CC
-3898CC:lI112|H3899C4
-3899C4:lI47|H389AA4
-389AA4:lI101|H389B7C
-389B7C:lI114|H389C44
-389C44:lI116|H389D0C
-389D0C:lI115|H389DD4
-389DD4:lI47|H389E8C
-389E8C:lI108|H389F3C
-389F3C:lI105|H389FDC
-389FDC:lI98|H38A06C
-38A06C:lI47|H38A0EC
-38A0EC:lI99|H38A15C
-38A15C:lI111|H38A1CC
-38A1CC:lI115|H38A234
-38A234:lI80|H38A29C
-38A29C:lI114|H38A304
-38A304:lI111|H38A36C
-38A36C:lI112|H38A3D4
-38A3D4:lI101|H38A42C
-38A42C:lI114|H38A47C
-38A47C:lI116|H38A4CC
-38A4CC:lI121|H38A514
-38A514:lI47|H38A55C
-38A55C:lI101|H38A5A4
-38A5A4:lI98|H38A5EC
-38A5EC:lI105|H38A634
-38A634:lI110|N
-38B0A8:lH388C5C|H38B0B0
-388C5C:lI47|H388D6C
-388D6C:lI99|H388E7C
-388E7C:lI108|H388F8C
-388F8C:lI101|H3890A4
-3890A4:lI97|H3891B4
-3891B4:lI114|H3892C4
-3892C4:lI99|H3893D4
-3893D4:lI97|H3894E4
-3894E4:lI115|H3895EC
-3895EC:lI101|H3896E4
-3896E4:lI47|H3897DC
-3897DC:lI111|H3898D4
-3898D4:lI116|H3899CC
-3899CC:lI112|H389AAC
-389AAC:lI47|H389B84
-389B84:lI101|H389C4C
-389C4C:lI114|H389D14
-389D14:lI116|H389DDC
-389DDC:lI115|H389E94
-389E94:lI47|H389F44
-389F44:lI108|H389FE4
-389FE4:lI105|H38A074
-38A074:lI98|H38A0F4
-38A0F4:lI47|H38A164
-38A164:lI99|H38A1D4
-38A1D4:lI111|H38A23C
-38A23C:lI115|H38A2A4
-38A2A4:lI78|H38A30C
-38A30C:lI111|H38A374
-38A374:lI116|H38A3DC
-38A3DC:lI105|H38A434
-38A434:lI102|H38A484
-38A484:lI105|H38A4D4
-38A4D4:lI99|H38A51C
-38A51C:lI97|H38A564
-38A564:lI116|H38A5AC
-38A5AC:lI105|H38A5F4
-38A5F4:lI111|H38A63C
-38A63C:lI110|H38A674
-38A674:lI47|H38A6AC
-38A6AC:lI101|H38A6D4
-38A6D4:lI98|H38A6EC
-38A6EC:lI105|H38A704
-38A704:lI110|N
-38B0B0:lH388D74|H38B0B8
-388D74:lI47|H388E84
-388E84:lI99|H388F94
-388F94:lI108|H3890AC
-3890AC:lI101|H3891BC
-3891BC:lI97|H3892CC
-3892CC:lI114|H3893DC
-3893DC:lI99|H3894EC
-3894EC:lI97|H3895F4
-3895F4:lI115|H3896EC
-3896EC:lI101|H3897E4
-3897E4:lI47|H3898DC
-3898DC:lI111|H3899D4
-3899D4:lI116|H389AB4
-389AB4:lI112|H389B8C
-389B8C:lI47|H389C54
-389C54:lI101|H389D1C
-389D1C:lI114|H389DE4
-389DE4:lI116|H389E9C
-389E9C:lI115|H389F4C
-389F4C:lI47|H389FEC
-389FEC:lI108|H38A07C
-38A07C:lI105|H38A0FC
-38A0FC:lI98|H38A16C
-38A16C:lI47|H38A1DC
-38A1DC:lI99|H38A244
-38A244:lI111|H38A2AC
-38A2AC:lI115|H38A314
-38A314:lI70|H38A37C
-38A37C:lI105|H38A3E4
-38A3E4:lI108|H38A43C
-38A43C:lI101|H38A48C
-38A48C:lI84|H38A4DC
-38A4DC:lI114|H38A524
-38A524:lI97|H38A56C
-38A56C:lI110|H38A5B4
-38A5B4:lI115|H38A5FC
-38A5FC:lI102|H38A644
-38A644:lI101|H38A67C
-38A67C:lI114|H38A6B4
-38A6B4:lI47|H38A6DC
-38A6DC:lI101|H38A6F4
-38A6F4:lI98|H38A70C
-38A70C:lI105|H38A71C
-38A71C:lI110|N
-38B0B8:lH388E8C|H38B0C0
-388E8C:lI47|H388F9C
-388F9C:lI99|H3890B4
-3890B4:lI108|H3891C4
-3891C4:lI101|H3892D4
-3892D4:lI97|H3893E4
-3893E4:lI114|H3894F4
-3894F4:lI99|H3895FC
-3895FC:lI97|H3896F4
-3896F4:lI115|H3897EC
-3897EC:lI101|H3898E4
-3898E4:lI47|H3899DC
-3899DC:lI111|H389ABC
-389ABC:lI116|H389B94
-389B94:lI112|H389C5C
-389C5C:lI47|H389D24
-389D24:lI101|H389DEC
-389DEC:lI114|H389EA4
-389EA4:lI116|H389F54
-389F54:lI115|H389FF4
-389FF4:lI47|H38A084
-38A084:lI108|H38A104
-38A104:lI105|H38A174
-38A174:lI98|H38A1E4
-38A1E4:lI47|H38A24C
-38A24C:lI99|H38A2B4
-38A2B4:lI111|H38A31C
-38A31C:lI115|H38A384
-38A384:lI69|H38A3EC
-38A3EC:lI118|H38A444
-38A444:lI101|H38A494
-38A494:lI110|H38A4E4
-38A4E4:lI116|H38A52C
-38A52C:lI68|H38A574
-38A574:lI111|H38A5BC
-38A5BC:lI109|H38A604
-38A604:lI97|H38A64C
-38A64C:lI105|H38A684
-38A684:lI110|H38A6BC
-38A6BC:lI47|H38A6E4
-38A6E4:lI101|H38A6FC
-38A6FC:lI98|H38A714
-38A714:lI105|H38A724
-38A724:lI110|N
-38B0C0:lH388FA4|H38B0C8
-388FA4:lI47|H3890BC
-3890BC:lI99|H3891CC
-3891CC:lI108|H3892DC
-3892DC:lI101|H3893EC
-3893EC:lI97|H3894FC
-3894FC:lI114|H389604
-389604:lI99|H3896FC
-3896FC:lI97|H3897F4
-3897F4:lI115|H3898EC
-3898EC:lI101|H3899E4
-3899E4:lI47|H389AC4
-389AC4:lI111|H389B9C
-389B9C:lI116|H389C64
-389C64:lI112|H389D2C
-389D2C:lI47|H389DF4
-389DF4:lI101|H389EAC
-389EAC:lI114|H389F5C
-389F5C:lI116|H389FFC
-389FFC:lI115|H38A08C
-38A08C:lI47|H38A10C
-38A10C:lI108|H38A17C
-38A17C:lI105|H38A1EC
-38A1EC:lI98|H38A254
-38A254:lI47|H38A2BC
-38A2BC:lI99|H38A324
-38A324:lI111|H38A38C
-38A38C:lI115|H38A3F4
-38A3F4:lI69|H38A44C
-38A44C:lI118|H38A49C
-38A49C:lI101|H38A4EC
-38A4EC:lI110|H38A534
-38A534:lI116|H38A57C
-38A57C:lI47|H38A5C4
-38A5C4:lI101|H38A60C
-38A60C:lI98|H38A654
-38A654:lI105|H38A68C
-38A68C:lI110|N
-38B0C8:lH3890C4|H38B0D0
-3890C4:lI47|H3891D4
-3891D4:lI99|H3892E4
-3892E4:lI108|H3893F4
-3893F4:lI101|H389504
-389504:lI97|H38960C
-38960C:lI114|H389704
-389704:lI99|H3897FC
-3897FC:lI97|H3898F4
-3898F4:lI115|H3899EC
-3899EC:lI101|H389ACC
-389ACC:lI47|H389BA4
-389BA4:lI111|H389C6C
-389C6C:lI116|H389D34
-389D34:lI112|H389DFC
-389DFC:lI47|H389EB4
-389EB4:lI101|H389F64
-389F64:lI114|H38A004
-38A004:lI116|H38A094
-38A094:lI115|H38A114
-38A114:lI47|H38A184
-38A184:lI108|H38A1F4
-38A1F4:lI105|H38A25C
-38A25C:lI98|H38A2C4
-38A2C4:lI47|H38A32C
-38A32C:lI99|H38A394
-38A394:lI111|H38A3FC
-38A3FC:lI109|H38A454
-38A454:lI112|H38A4A4
-38A4A4:lI105|H38A4F4
-38A4F4:lI108|H38A53C
-38A53C:lI101|H38A584
-38A584:lI114|H38A5CC
-38A5CC:lI47|H38A614
-38A614:lI101|H38A65C
-38A65C:lI98|H38A694
-38A694:lI105|H38A6C4
-38A6C4:lI110|N
-38B0D0:lH3891DC|H38B0D8
-3891DC:lI47|H3892EC
-3892EC:lI99|H3893FC
-3893FC:lI108|H38950C
-38950C:lI101|H389614
-389614:lI97|H38970C
-38970C:lI114|H389804
-389804:lI99|H3898FC
-3898FC:lI97|H3899F4
-3899F4:lI115|H389AD4
-389AD4:lI101|H389BAC
-389BAC:lI47|H389C74
-389C74:lI111|H389D3C
-389D3C:lI116|H389E04
-389E04:lI112|H389EBC
-389EBC:lI47|H389F6C
-389F6C:lI101|H38A00C
-38A00C:lI114|H38A09C
-38A09C:lI116|H38A11C
-38A11C:lI115|H38A18C
-38A18C:lI47|H38A1FC
-38A1FC:lI108|H38A264
-38A264:lI105|H38A2CC
-38A2CC:lI98|H38A334
-38A334:lI47|H38A39C
-38A39C:lI97|H38A404
-38A404:lI115|H38A45C
-38A45C:lI110|H38A4AC
-38A4AC:lI49|H38A4FC
-38A4FC:lI47|H38A544
-38A544:lI101|H38A58C
-38A58C:lI98|H38A5D4
-38A5D4:lI105|H38A61C
-38A61C:lI110|N
-38B0D8:lH3892F4|H38B0E0
-3892F4:lI47|H389404
-389404:lI99|H389514
-389514:lI108|H38961C
-38961C:lI101|H389714
-389714:lI97|H38980C
-38980C:lI114|H389904
-389904:lI99|H3899FC
-3899FC:lI97|H389ADC
-389ADC:lI115|H389BB4
-389BB4:lI101|H389C7C
-389C7C:lI47|H389D44
-389D44:lI111|H389E0C
-389E0C:lI116|H389EC4
-389EC4:lI112|H389F74
-389F74:lI47|H38A014
-38A014:lI101|H38A0A4
-38A0A4:lI114|H38A124
-38A124:lI116|H38A194
-38A194:lI115|H38A204
-38A204:lI47|H38A26C
-38A26C:lI108|H38A2D4
-38A2D4:lI105|H38A33C
-38A33C:lI98|H38A3A4
-38A3A4:lI47|H38A40C
-38A40C:lI97|H38A464
-38A464:lI112|H38A4B4
-38A4B4:lI112|H38A504
-38A504:lI109|H38A54C
-38A54C:lI111|H38A594
-38A594:lI110|H38A5DC
-38A5DC:lI47|H38A624
-38A624:lI101|H38A664
-38A664:lI98|H38A69C
-38A69C:lI105|H38A6CC
-38A6CC:lI110|N
-38B0E0:lH38AA88|H38B0E8
-38AA88:lI47|H38AA90
-38AA90:lI104|H38AA98
-38AA98:lI111|H38AAA0
-38AAA0:lI109|H38AAA8
-38AAA8:lI101|H38AAB0
-38AAB0:lI47|H38AAB8
-38AAB8:lI115|H38AAC0
-38AAC0:lI105|H38AAC8
-38AAC8:lI114|H38AAD0
-38AAD0:lI105|H38AAD8
-38AAD8:lI47|H38AAE0
-38AAE0:lI101|H38AAE8
-38AAE8:lI114|H38AAF0
-38AAF0:lI108|H38AAF8
-38AAF8:lI97|H38AB00
-38AB00:lI110|H38AB08
-38AB08:lI103|N
-38B0E8:lH38AB1C|H38B0F0
-38AB1C:lI47|H38AB2C
-38AB2C:lI104|H38AB4C
-38AB4C:lI111|H38AB74
-38AB74:lI109|H38ABA4
-38ABA4:lI101|H38ABC4
-38ABC4:lI47|H38ABE4
-38ABE4:lI115|H38AC04
-38AC04:lI105|H38AC24
-38AC24:lI114|H38AC3C
-38AC3C:lI105|H38AC44
-38AC44:lI47|H38AC4C
-38AC4C:lI116|H38AC54
-38AC54:lI111|H38AC5C
-38AC5C:lI111|H38AC64
-38AC64:lI108|H38AC6C
-38AC6C:lI115|H38AC74
-38AC74:lI47|H38AC7C
-38AC7C:lI100|H38AC84
-38AC84:lI105|H38AC8C
-38AC8C:lI115|H38AC94
-38AC94:lI116|H38AC9C
-38AC9C:lI101|H38ACA4
-38ACA4:lI108|H38ACAC
-38ACAC:lI47|H38ACB4
-38ACB4:lI101|H38ACBC
-38ACBC:lI98|H38ACC4
-38ACC4:lI105|H38ACCC
-38ACCC:lI110|N
-38B0F0:lH38B0F8|N
-38B0F8:lI47|H38B100
-38B100:lI104|H38B108
-38B108:lI111|H38B110
-38B110:lI109|H38B118
-38B118:lI101|H38B120
-38B120:lI47|H38B128
-38B128:lI115|H38B130
-38B130:lI105|H38B138
-38B138:lI114|H38B140
-38B140:lI105|H38B148
-38B148:lI47|H38B150
-38B150:lI79|H38B158
-38B158:lI84|H38B160
-38B160:lI80|H38B168
-38B168:lI47|H38B170
-38B170:lI103|H38B178
-38B178:lI112|H38B180
-38B180:lI114|H38B188
-38B188:lI115|H38B190
-38B190:lI95|H38B198
-38B198:lI116|H38B1A0
-38B1A0:lI114|H38B1A8
-38B1A8:lI97|H38B1B0
-38B1B0:lI99|H38B1B8
-38B1B8:lI101|H38B1C0
-38B1C0:lI47|H38B1C8
-38B1C8:lI106|H38B1D0
-38B1D0:lI97|H38B1D8
-38B1D8:lI110|N
-3873BC:lI47|H3873CC
-3873CC:lI99|H3873E4
-3873E4:lI108|H3873FC
-3873FC:lI101|H38741C
-38741C:lI97|H387444
-387444:lI114|H387474
-387474:lI99|H3874AC
-3874AC:lI97|H3874EC
-3874EC:lI115|H387534
-387534:lI101|H387584
-387584:lI47|H3875DC
-3875DC:lI111|H38763C
-38763C:lI116|H3876A4
-3876A4:lI112|H387714
-387714:lI47|H38778C
-38778C:lI101|H38780C
-38780C:lI114|H387894
-387894:lI116|H387924
-387924:lI115|N
-=proc_dictionary:<0.19.0>
-H370244
-H370250
-=proc_stack:<0.19.0>
-36b45c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36B17C
-y4:P<0.19.0>
-y5:P<0.9.0>
-36b478:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37025C
-=proc_heap:<0.19.0>
-36B17C:t5:A5:state,A8:user_sup,P<0.21.0>,P<0.21.0>,H370238
-370238:t2:P<0.19.0>,A8:user_sup
-37025C:lAA:gen_server|H37027C
-37027C:lP<0.9.0>|H37028C
-37028C:lP<0.9.0>|H370294
-370294:lA11:supervisor_bridge|H37029C
-37029C:lH3702A4|H3702AC
-3702A4:lA8:user_sup|H3702B4
-3702B4:lN|H3702BC
-3702BC:lA4:self|N
-3702AC:lN|N
-370244:t2:AD:$initial_call,H370264
-370264:t3:A3:gen,A7:init_it,H37025C
-370250:t2:AA:$ancestors,H370274
-370274:lAA:kernel_sup|H370284
-370284:lP<0.8.0>|N
-=proc_dictionary:<0.20.0>
-H36F8A8
-=proc_stack:<0.20.0>
-36a714:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:H36F8C4
-y3:P<0.21.0>
-y4:P<0.22.0>
-y5:p<0.72>
-y6:p<0.72>
-=proc_heap:<0.20.0>
-36F8C4:t4:I3,I2,P<0.22.0>,H36F8F0
-36F8F0:lH36F900|H36F910
-36F900:t3:I1,P<0.21.0>,H36F920
-36F920:t0:
-36F910:lH36F924|N
-36F924:t3:I2,P<0.22.0>,H36F93C
-36F93C:t3:A5:shell,A5:start,N
-36F8A8:t2:A3:eof,A5:false
-=proc_dictionary:<0.21.0>
-H3709DC
-H3709D0
-H3709F8
-=proc_stack:<0.21.0>
-370d1c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:A9:undefined
-y2:P<0.20.0>
-=proc_heap:<0.21.0>
-3709DC:t2:AB:line_buffer,N
-3709D0:t2:AB:kill_buffer,N
-3709F8:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.22.0>
-H370D44
-H370D60
-H370D7C
-H370D38
-=proc_stack:<0.22.0>
-374a88:SReturn addr 0x2CE718 (group:get_chars_loop/7 + 80)
-y0:N
-y1:N
-y2:A8:infinity
-y3:H374A00
-y4:P<0.20.0>
-y5:H374A28
-374aa4:SReturn addr 0x2CDC18 (group:io_request/5 + 48)
-y0:H37499C
-y1:A6:io_lib
-y2:A9:get_until
-y3:H3748B8
-y4:P<0.20.0>
-y5:A5:start
-374ac0:SReturn addr 0x2CDB2C (group:server_loop/3 + 372)
-y0:P<0.49.0>
-y1:P<0.22.0>
-374acc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:P<0.25.0>
-y2:P<0.20.0>
-=proc_heap:<0.22.0>
-374A00:t4:A4:line,H37499C,H3749A4,A4:none
-3749A4:t2:N,N
-37499C:lI50|H374994
-374994:lI62|H37498C
-37498C:lI32|N
-374A28:t4:A5:stack,H370D58,H374A24,N
-374A24:t0:
-370D58:lH370D74|N
-370D74:lI99|H370D88
-370D88:lI114|H370D90
-370D90:lI97|H370D98
-370D98:lI115|H370DA0
-370DA0:lI104|H370DA8
-370DA8:lI100|H370DB0
-370DB0:lI117|H370DB8
-370DB8:lI109|H370DC0
-370DC0:lI112|H370DC8
-370DC8:lI95|H370DD0
-370DD0:lI118|H370DD8
-370DD8:lI105|H370DE0
-370DE0:lI101|H370DE8
-370DE8:lI119|H370DF0
-370DF0:lI101|H370DF8
-370DF8:lI114|H370E00
-370E00:lI58|H370E08
-370E08:lI115|H370E10
-370E10:lI116|H370E18
-370E18:lI97|H370E20
-370E20:lI114|H370E28
-370E28:lI116|H370E30
-370E30:lI40|H370E38
-370E38:lI41|H370E40
-370E40:lI46|H370E48
-370E48:lI10|N
-3748B8:t3:A8:erl_scan,A6:tokens,H3748B0
-3748B0:lI1|N
-370D44:t2:AB:line_buffer,H370D58
-370D60:t2:A5:shell,P<0.25.0>
-370D7C:t2:AB:kill_buffer,N
-370D38:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.23.0>
-H376464
-H376448
-=proc_stack:<0.23.0>
-376754:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:kernel_config
-y3:N
-y4:P<0.23.0>
-y5:P<0.9.0>
-376770:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H376418
-=proc_heap:<0.23.0>
-376418:lAA:gen_server|H376410
-376410:lP<0.9.0>|H376408
-376408:lP<0.9.0>|H376400
-376400:lAD:kernel_config|H3763F8
-3763F8:lN|H3763F0
-3763F0:lN|N
-376464:t2:AD:$initial_call,H376454
-376454:t3:A3:gen,A7:init_it,H376418
-376448:t2:AA:$ancestors,H376440
-376440:lAA:kernel_sup|H376420
-376420:lP<0.8.0>|N
-=proc_dictionary:<0.24.0>
-H3705E0
-H3705EC
-=proc_stack:<0.24.0>
-36f38c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F018
-y4:AF:kernel_safe_sup
-y5:P<0.9.0>
-36f3a8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37063C
-=proc_heap:<0.24.0>
-36F018:tA:A5:state,H370644,AB:one_for_one,H36F044,N,I4,I3600,N,A6:kernel,A4:safe
-36F044:lH36F04C|N
-36F04C:t8:A5:child,P<0.31.0>,A17:inet_gethost_native_sup,H370650,A9:temporary,I1000,A6:worker,H370660
-370660:lA13:inet_gethost_native|N
-370650:t3:A13:inet_gethost_native,AA:start_link,N
-370644:t2:A5:local,AF:kernel_safe_sup
-37063C:lAA:gen_server|H3706AC
-3706AC:lP<0.9.0>|H3706BC
-3706BC:lP<0.9.0>|H3706C4
-3706C4:lH3706CC|H3706D8
-3706CC:t2:A5:local,AF:kernel_safe_sup
-3706D8:lAA:supervisor|H3706E0
-3706E0:lH3706E8|H3706F8
-3706E8:t3:H370644,A6:kernel,A4:safe
-3706F8:lN|N
-3705E0:t2:AD:$initial_call,H370668
-370668:t3:A3:gen,A7:init_it,H37063C
-3705EC:t2:AA:$ancestors,H370678
-370678:lAA:kernel_sup|H3706B4
-3706B4:lP<0.8.0>|N
-=proc_dictionary:<0.25.0>
-H36E304
-H36E31C
-=proc_stack:<0.25.0>
-36e610:SReturn addr 0x2E06FC (shell:server_loop/6 + 140)
-y0:N
-y1:N
-y2:P<0.27.0>
-y3:P<0.49.0>
-36e624:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:I2
-y3:I1
-y4:N
-y5:N
-y6:N
-y7:I20
-y8:I20
-=proc_heap:<0.25.0>
-36E304:t2:H36E2F8,H36E2A8
-36E2A8:lH36E2B0|N
-36E2B0:t4:A4:call,I1,H36E2C4,N
-36E2C4:t4:A6:remote,I1,H36E2D8,H36E2E8
-36E2E8:t3:A4:atom,I1,A5:start
-36E2D8:t3:A4:atom,I1,A10:crashdump_viewer
-36E2F8:t2:A7:command,I1
-36E31C:t2:H36E310,A2:ok
-36E310:t2:A6:result,I1
-=proc_stack:<0.27.0>
-3bda3c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:P<0.25.0>
-=proc_heap:<0.27.0>
-=proc_dictionary:<0.31.0>
-H36DA24
-H36DA08
-=proc_stack:<0.31.0>
-36dcd4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36DB68
-y4:A17:inet_gethost_native_sup
-y5:P<0.24.0>
-36dcf0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36D9D0
-=proc_heap:<0.31.0>
-36DB68:t5:A5:state,A13:inet_gethost_native,P<0.32.0>,P<0.32.0>,H36D994
-36D994:t2:A5:local,A17:inet_gethost_native_sup
-36D9D0:lAA:gen_server|H36D9C8
-36D9C8:lP<0.24.0>|H36D9C0
-36D9C0:lP<0.24.0>|H36D970
-36D970:lH36D980|H36D9B8
-36D980:t2:A5:local,A17:inet_gethost_native_sup
-36D9B8:lA11:supervisor_bridge|H36D978
-36D978:lH36D9A8|H36D9B0
-36D9A8:lA13:inet_gethost_native|H36D9A0
-36D9A0:lN|H36D98C
-36D98C:lH36D994|N
-36D9B0:lN|N
-36DA24:t2:AD:$initial_call,H36DA14
-36DA14:t3:A3:gen,A7:init_it,H36D9D0
-36DA08:t2:AA:$ancestors,H36DA00
-36DA00:lAF:kernel_safe_sup|H36D9E0
-36D9E0:lAA:kernel_sup|H36D9D8
-36D9D8:lP<0.8.0>|N
-=proc_dictionary:<0.32.0>
-H36CFD4
-H36D0BC
-=proc_stack:<0.32.0>
-36d12c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H36CF18
-=proc_heap:<0.32.0>
-36CF18:t8:A5:state,p<0.105>,I8000,I11,I12,P<0.31.0>,I4,H36CEF0
-36CEF0:t9:AA:statistics,I0,I0,I0,I0,I0,I0,I0,I0
-36CFD4:t2:A3:rid,I1
-36D0BC:t2:AC:num_requests,I0
-=proc_dictionary:<0.33.0>
-H3905C4
-H3905D0
-=proc_stack:<0.33.0>
-3ceee4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:webtool
-y3:H3C8570
-y4:A8:web_tool
-y5:P<0.33.0>
-3cef00:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3905FC
-=proc_heap:<0.33.0>
-3C8570:t6:A5:state,H3905EC,I13,P<0.41.0>,H3905F4,H3C85D4
-3C85D4:lA10:crashdump_viewer|N
-3905F4:lH390650|H39065C
-390650:t2:A4:port,I8888
-39065C:lH3906C8|H3906D4
-3906C8:t2:AC:bind_address,H390760
-390760:t4:I127,I0,I0,I1
-3906D4:lH390774|H390780
-390774:t2:AB:server_name,H39082C
-39082C:lI108|H390908
-390908:lI111|H3909DC
-3909DC:lI99|H390AC0
-390AC0:lI97|H390B98
-390B98:lI108|H390C78
-390C78:lI104|H390D58
-390D58:lI111|H390E2C
-390E2C:lI115|H390F10
-390F10:lI116|N
-390780:lH390834|H390840
-390834:t2:AE:max_header_siz,I1024
-390840:lH390910|H39091C
-390910:t2:A11:max_header_action,A8:reply414
-39091C:lH3909E4|H3909F0
-3909E4:t2:A8:com_type,A7:ip_comm
-3909F0:lH390AC8|H390AD4
-390AC8:t2:A7:modules,H390BA0
-390BA0:lA9:mod_alias|H390C80
-390C80:lA8:mod_auth|H390D60
-390D60:lA7:mod_esi|H390E34
-390E34:lAB:mod_actions|H390F18
-390F18:lA7:mod_cgi|H390FF4
-390FF4:lAB:mod_include|H3910D8
-3910D8:lA7:mod_dir|H3911B4
-3911B4:lA7:mod_get|H3912A0
-3912A0:lA8:mod_head|H39139C
-39139C:lA7:mod_log|H3914A0
-3914A0:lAC:mod_disk_log|N
-390AD4:lH390BA8|H390BB4
-390BA8:t2:AF:directory_index,H390C88
-390C88:lH390D68|N
-390D68:lI105|H390E3C
-390E3C:lI110|H390F20
-390F20:lI100|H390FFC
-390FFC:lI101|H3910E0
-3910E0:lI120|H3911BC
-3911BC:lI46|H3912A8
-3912A8:lI104|H3913A4
-3913A4:lI116|H3914A8
-3914A8:lI109|H39159C
-39159C:lI108|N
-390BB4:lH390C90|N
-390C90:t2:AC:default_type,H390D70
-390D70:lI116|H390E44
-390E44:lI101|H390F28
-390F28:lI120|H391004
-391004:lI116|H3910E8
-3910E8:lI47|H3911C4
-3911C4:lI112|H3912B0
-3912B0:lI108|H3913AC
-3913AC:lI97|H3914B0
-3914B0:lI105|H3915A4
-3915A4:lI110|N
-3905EC:lI47|H390648
-390648:lI99|H3906C0
-3906C0:lI108|H390758
-390758:lI101|H390824
-390824:lI97|H390900
-390900:lI114|H3909D4
-3909D4:lI99|H390AB8
-390AB8:lI97|H390B90
-390B90:lI115|H390C70
-390C70:lI101|H390D50
-390D50:lI47|H390E24
-390E24:lI111|H390F08
-390F08:lI116|H390FEC
-390FEC:lI112|H3910D0
-3910D0:lI47|H3911AC
-3911AC:lI101|H391298
-391298:lI114|H391394
-391394:lI116|H391498
-391498:lI115|H391594
-391594:lI47|H391680
-391680:lI108|H39175C
-39175C:lI105|H391840
-391840:lI98|H391924
-391924:lI47|H3919F8
-3919F8:lI119|H391AC4
-391AC4:lI101|H391B90
-391B90:lI98|H391C54
-391C54:lI116|H391D18
-391D18:lI111|H391DD4
-391DD4:lI111|H391E90
-391E90:lI108|H391F5C
-391F5C:lI47|H392030
-392030:lI112|H3920EC
-3920EC:lI114|H3921A8
-3921A8:lI105|H392264
-392264:lI118|N
-3905FC:lAA:gen_server|H390664
-390664:lP<0.27.0>|H3906DC
-3906DC:lA4:self|H390788
-390788:lH390848|H390854
-390848:t2:A5:local,A8:web_tool
-390854:lA7:webtool|H390924
-390924:lH3909F8|H390A04
-3909F8:t2:H3905EC,H3905F4
-390A04:lN|N
-3905C4:t2:AD:$initial_call,H390614
-390614:t3:A3:gen,A7:init_it,H3905FC
-3905D0:t2:AA:$ancestors,H390624
-390624:lP<0.27.0>|N
-=proc_dictionary:<0.41.0>
-H36DF0C
-H36DF18
-=proc_stack:<0.41.0>
-36eda4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36EA3C
-y4:A6:websup
-y5:P<0.33.0>
-36edc0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36DF24
-=proc_heap:<0.41.0>
-36EA3C:tA:A5:state,H36DF2C,AB:one_for_one,H36EA68,N,I100,I10,N,AB:webtool_sup,N
-36EA68:lH36EA70|N
-36EA70:t8:A5:child,P<0.48.0>,H36DF38,H36DF44,A9:permanent,I100,A6:worker,H36DF54
-36DF54:lA10:crashdump_viewer|N
-36DF44:t3:A10:crashdump_viewer,AA:start_link,N
-36DF38:t2:A5:local,A17:crashdump_viewer_server
-36DF2C:t2:A5:local,A6:websup
-36DF24:lAA:gen_server|H36DF84
-36DF84:lP<0.33.0>|H36DF94
-36DF94:lP<0.33.0>|H36DF9C
-36DF9C:lH36DFA4|H36DFB0
-36DFA4:t2:A5:local,A6:websup
-36DFB0:lAA:supervisor|H36DFB8
-36DFB8:lH36DFC0|H36DFD0
-36DFC0:t3:H36DF2C,AB:webtool_sup,N
-36DFD0:lN|N
-36DF0C:t2:AD:$initial_call,H36DF6C
-36DF6C:t3:A3:gen,A7:init_it,H36DF24
-36DF18:t2:AA:$ancestors,H36DF7C
-36DF7C:lA8:web_tool|H36DF8C
-36DF8C:lP<0.27.0>|N
-=proc_dictionary:<0.43.0>
-H39D940
-H39D94C
-=proc_stack:<0.43.0>
-3a42ac:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H3A3E34
-y4:A1A:httpd_sup__127_0_0_1__8888
-y5:P<0.33.0>
-3a42c8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H39D9CC
-=proc_heap:<0.43.0>
-3A3E34:tA:A5:state,H39D960,AB:one_for_one,H3A3E20,N,I0,I1,N,A9:httpd_sup,H39DA88
-39DA88:lA9:undefined|H39DB18
-39DB18:lH39DB50|H39DB58
-39DB50:lH39DB88|H39DB94
-39DB88:t2:AB:server_root,H39DBD0
-39DBD0:lI47|H39DC0C
-39DC0C:lI99|H39DC50
-39DC50:lI108|H39DC84
-39DC84:lI101|H39DCC4
-39DCC4:lI97|H39DD28
-39DD28:lI114|H39DD90
-39DD90:lI99|H39DE00
-39DE00:lI97|H39DE78
-39DE78:lI115|H39DF00
-39DF00:lI101|H39DF90
-39DF90:lI47|H39E038
-39E038:lI111|H39E0E8
-39E0E8:lI116|H39E1AC
-39E1AC:lI112|H39E288
-39E288:lI47|H39E37C
-39E37C:lI101|H39E478
-39E478:lI114|H39E580
-39E580:lI116|H39E69C
-39E69C:lI115|H39E7B0
-39E7B0:lI47|H39E8C4
-39E8C4:lI108|H39E9D8
-39E9D8:lI105|H39EACC
-39EACC:lI98|H39EBC0
-39EBC0:lI47|H39ECB4
-39ECB4:lI119|H39EDA8
-39EDA8:lI101|H39EE7C
-39EE7C:lI98|H39EF50
-39EF50:lI116|H39F02C
-39F02C:lI111|H39F110
-39F110:lI111|H39F1E4
-39F1E4:lI108|H39F2B0
-39F2B0:lI47|H39F36C
-39F36C:lI112|H39F430
-39F430:lI114|H39F4FC
-39F4FC:lI105|H39F5C0
-39F5C0:lI118|H39F694
-39F694:lI47|H39F768
-39F768:lI114|H39F83C
-39F83C:lI111|H39F920
-39F920:lI111|H39F9FC
-39F9FC:lI116|N
-39DB94:lH39DBD8|H39DBE4
-39DBD8:t2:AD:document_root,H39DC14
-39DC14:lI47|H39DC58
-39DC58:lI99|H39DC8C
-39DC8C:lI108|H39DCCC
-39DCCC:lI101|H39DD30
-39DD30:lI97|H39DD98
-39DD98:lI114|H39DE08
-39DE08:lI99|H39DE80
-39DE80:lI97|H39DF08
-39DF08:lI115|H39DF98
-39DF98:lI101|H39E040
-39E040:lI47|H39E0F0
-39E0F0:lI111|H39E1B4
-39E1B4:lI116|H39E290
-39E290:lI112|H39E384
-39E384:lI47|H39E480
-39E480:lI101|H39E588
-39E588:lI114|H39E6A4
-39E6A4:lI116|H39E7B8
-39E7B8:lI115|H39E8CC
-39E8CC:lI47|H39E9E0
-39E9E0:lI108|H39EAD4
-39EAD4:lI105|H39EBC8
-39EBC8:lI98|H39ECBC
-39ECBC:lI47|H39EDB0
-39EDB0:lI119|H39EE84
-39EE84:lI101|H39EF58
-39EF58:lI98|H39F034
-39F034:lI116|H39F118
-39F118:lI111|H39F1EC
-39F1EC:lI111|H39F2B8
-39F2B8:lI108|H39F374
-39F374:lI47|H39F438
-39F438:lI112|H39F504
-39F504:lI114|H39F5C8
-39F5C8:lI105|H39F69C
-39F69C:lI118|H39F770
-39F770:lI47|H39F844
-39F844:lI114|H39F928
-39F928:lI111|H39FA04
-39FA04:lI111|H39FAD8
-39FAD8:lI116|H39FBB4
-39FBB4:lI47|H39FC80
-39FC80:lI100|H39FD44
-39FD44:lI111|H39FE10
-39FE10:lI99|N
-39DBE4:lH39DC1C|H39DC28
-39DC1C:t2:AA:mime_types,H39DC60
-39DC60:lH39DC94|H39DCA0
-39DC94:t2:H39DCD4,H39DCDC
-39DCDC:lI120|H39DD40
-39DD40:lI45|H39DDA8
-39DDA8:lI119|H39DE10
-39DE10:lI111|H39DE88
-39DE88:lI114|H39DF10
-39DF10:lI108|H39DFA0
-39DFA0:lI100|H39E048
-39E048:lI47|H39E0F8
-39E0F8:lI120|H39E1BC
-39E1BC:lI45|H39E298
-39E298:lI118|H39E38C
-39E38C:lI114|H39E488
-39E488:lI109|H39E590
-39E590:lI108|N
-39DCD4:lI119|H39DD38
-39DD38:lI114|H39DDA0
-39DDA0:lI108|N
-39DCA0:lH39DCE4|H39DCF0
-39DCE4:t2:H39DD48,H39DD50
-39DD50:lI120|H39DDB8
-39DDB8:lI45|H39DE20
-39DE20:lI119|H39DE98
-39DE98:lI111|H39DF18
-39DF18:lI114|H39DFA8
-39DFA8:lI108|H39E050
-39E050:lI100|H39E100
-39E100:lI47|H39E1C4
-39E1C4:lI120|H39E2A0
-39E2A0:lI45|H39E394
-39E394:lI118|H39E490
-39E490:lI114|H39E598
-39E598:lI109|H39E6AC
-39E6AC:lI108|N
-39DD48:lI118|H39DDB0
-39DDB0:lI114|H39DE18
-39DE18:lI109|H39DE90
-39DE90:lI108|N
-39DCF0:lH39DD58|H39DD64
-39DD58:t2:H39DDC0,H39DDC8
-39DDC8:lI120|H39DE30
-39DE30:lI45|H39DEA8
-39DEA8:lI99|H39DF20
-39DF20:lI111|H39DFB0
-39DFB0:lI110|H39E058
-39E058:lI102|H39E108
-39E108:lI101|H39E1CC
-39E1CC:lI114|H39E2A8
-39E2A8:lI101|H39E39C
-39E39C:lI110|H39E498
-39E498:lI99|H39E5A0
-39E5A0:lI101|H39E6B4
-39E6B4:lI47|H39E7C0
-39E7C0:lI120|H39E8D4
-39E8D4:lI45|H39E9E8
-39E9E8:lI99|H39EADC
-39EADC:lI111|H39EBD0
-39EBD0:lI111|H39ECC4
-39ECC4:lI108|H39EDB8
-39EDB8:lI116|H39EE8C
-39EE8C:lI97|H39EF60
-39EF60:lI108|H39F03C
-39F03C:lI107|N
-39DDC0:lI105|H39DE28
-39DE28:lI99|H39DEA0
-39DEA0:lI101|N
-39DD64:lH39DDD0|H39DDDC
-39DDD0:t2:H39DE38,H39DE40
-39DE40:lI118|H39DEB8
-39DEB8:lI105|H39DF30
-39DF30:lI100|H39DFC0
-39DFC0:lI101|H39E068
-39E068:lI111|H39E110
-39E110:lI47|H39E1D4
-39E1D4:lI120|H39E2B0
-39E2B0:lI45|H39E3A4
-39E3A4:lI115|H39E4A0
-39E4A0:lI103|H39E5A8
-39E5A8:lI105|H39E6BC
-39E6BC:lI45|H39E7C8
-39E7C8:lI109|H39E8DC
-39E8DC:lI111|H39E9F0
-39E9F0:lI118|H39EAE4
-39EAE4:lI105|H39EBD8
-39EBD8:lI101|N
-39DE38:lI109|H39DEB0
-39DEB0:lI111|H39DF28
-39DF28:lI118|H39DFB8
-39DFB8:lI105|H39E060
-39E060:lI101|N
-39DDDC:lH39DE48|H39DE54
-39DE48:t2:H39DEC0,H39DEC8
-39DEC8:lI118|H39DF40
-39DF40:lI105|H39DFD0
-39DFD0:lI100|H39E070
-39E070:lI101|H39E118
-39E118:lI111|H39E1DC
-39E1DC:lI47|H39E2B8
-39E2B8:lI120|H39E3AC
-39E3AC:lI45|H39E4A8
-39E4A8:lI109|H39E5B0
-39E5B0:lI115|H39E6C4
-39E6C4:lI118|H39E7D0
-39E7D0:lI105|H39E8E4
-39E8E4:lI100|H39E9F8
-39E9F8:lI101|H39EAEC
-39EAEC:lI111|N
-39DEC0:lI97|H39DF38
-39DF38:lI118|H39DFC8
-39DFC8:lI105|N
-39DE54:lH39DED0|H39DEDC
-39DED0:t2:H39DF48,H39DF50
-39DF50:lI118|H39DFE0
-39DFE0:lI105|H39E078
-39E078:lI100|H39E120
-39E120:lI101|H39E1E4
-39E1E4:lI111|H39E2C0
-39E2C0:lI47|H39E3B4
-39E3B4:lI113|H39E4B0
-39E4B0:lI117|H39E5B8
-39E5B8:lI105|H39E6CC
-39E6CC:lI99|H39E7D8
-39E7D8:lI107|H39E8EC
-39E8EC:lI116|H39EA00
-39EA00:lI105|H39EAF4
-39EAF4:lI109|H39EBE0
-39EBE0:lI101|N
-39DF48:lI113|H39DFD8
-39DFD8:lI116|N
-39DEDC:lH39DF58|H39DF64
-39DF58:t2:H39DFE8,H39DFF0
-39DFF0:lI118|H39E088
-39E088:lI105|H39E130
-39E130:lI100|H39E1EC
-39E1EC:lI101|H39E2C8
-39E2C8:lI111|H39E3BC
-39E3BC:lI47|H39E4B8
-39E4B8:lI113|H39E5C0
-39E5C0:lI117|H39E6D4
-39E6D4:lI105|H39E7E0
-39E7E0:lI99|H39E8F4
-39E8F4:lI107|H39EA08
-39EA08:lI116|H39EAFC
-39EAFC:lI105|H39EBE8
-39EBE8:lI109|H39ECCC
-39ECCC:lI101|N
-39DFE8:lI109|H39E080
-39E080:lI111|H39E128
-39E128:lI118|N
-39DF64:lH39DFF8|H39E004
-39DFF8:t2:H39E090,H39E098
-39E098:lI118|H39E140
-39E140:lI105|H39E1FC
-39E1FC:lI100|H39E2D8
-39E2D8:lI101|H39E3C4
-39E3C4:lI111|H39E4C0
-39E4C0:lI47|H39E5C8
-39E5C8:lI109|H39E6DC
-39E6DC:lI112|H39E7E8
-39E7E8:lI101|H39E8FC
-39E8FC:lI103|N
-39E090:lI109|H39E138
-39E138:lI112|H39E1F4
-39E1F4:lI101|H39E2D0
-39E2D0:lI103|N
-39E004:lH39E0A0|H39E0AC
-39E0A0:t2:H39E148,H39E150
-39E150:lI118|H39E20C
-39E20C:lI105|H39E2E8
-39E2E8:lI100|H39E3CC
-39E3CC:lI101|H39E4C8
-39E4C8:lI111|H39E5D0
-39E5D0:lI47|H39E6E4
-39E6E4:lI109|H39E7F0
-39E7F0:lI112|H39E904
-39E904:lI101|H39EA10
-39EA10:lI103|N
-39E148:lI109|H39E204
-39E204:lI112|H39E2E0
-39E2E0:lI103|N
-39E0AC:lH39E158|H39E164
-39E158:t2:H39E214,H39E21C
-39E21C:lI118|H39E2F8
-39E2F8:lI105|H39E3DC
-39E3DC:lI100|H39E4D0
-39E4D0:lI101|H39E5D8
-39E5D8:lI111|H39E6EC
-39E6EC:lI47|H39E7F8
-39E7F8:lI109|H39E90C
-39E90C:lI112|H39EA18
-39EA18:lI101|H39EB04
-39EB04:lI103|N
-39E214:lI109|H39E2F0
-39E2F0:lI112|H39E3D4
-39E3D4:lI101|N
-39E164:lH39E224|H39E230
-39E224:t2:H39E300,H39E308
-39E308:lI116|H39E3EC
-39E3EC:lI101|H39E4E0
-39E4E0:lI120|H39E5E8
-39E5E8:lI116|H39E6F4
-39E6F4:lI47|H39E800
-39E800:lI120|H39E914
-39E914:lI45|H39EA20
-39EA20:lI115|H39EB0C
-39EB0C:lI103|H39EBF0
-39EBF0:lI109|H39ECD4
-39ECD4:lI108|N
-39E300:lI115|H39E3E4
-39E3E4:lI103|H39E4D8
-39E4D8:lI109|H39E5E0
-39E5E0:lI108|N
-39E230:lH39E310|H39E31C
-39E310:t2:H39E3F4,H39E3FC
-39E3FC:lI116|H39E4F0
-39E4F0:lI101|H39E5F8
-39E5F8:lI120|H39E6FC
-39E6FC:lI116|H39E808
-39E808:lI47|H39E91C
-39E91C:lI120|H39EA28
-39EA28:lI45|H39EB14
-39EB14:lI115|H39EBF8
-39EBF8:lI103|H39ECDC
-39ECDC:lI109|H39EDC0
-39EDC0:lI108|N
-39E3F4:lI115|H39E4E8
-39E4E8:lI103|H39E5F0
-39E5F0:lI109|N
-39E31C:lH39E404|H39E410
-39E404:t2:H39E4F8,H39E500
-39E500:lI116|H39E608
-39E608:lI101|H39E70C
-39E70C:lI120|H39E810
-39E810:lI116|H39E924
-39E924:lI47|H39EA30
-39EA30:lI120|H39EB1C
-39EB1C:lI45|H39EC00
-39EC00:lI115|H39ECE4
-39ECE4:lI101|H39EDC8
-39EDC8:lI116|H39EE94
-39EE94:lI101|H39EF68
-39EF68:lI120|H39F044
-39F044:lI116|N
-39E4F8:lI101|H39E600
-39E600:lI116|H39E704
-39E704:lI120|N
-39E410:lH39E508|H39E514
-39E508:t2:H39E610,H39E618
-39E618:lI116|H39E71C
-39E71C:lI101|H39E820
-39E820:lI120|H39E92C
-39E92C:lI116|H39EA38
-39EA38:lI47|H39EB24
-39EB24:lI116|H39EC08
-39EC08:lI97|H39ECEC
-39ECEC:lI98|H39EDD0
-39EDD0:lI45|H39EE9C
-39EE9C:lI115|H39EF70
-39EF70:lI101|H39F04C
-39F04C:lI112|H39F120
-39F120:lI97|H39F1F4
-39F1F4:lI114|H39F2C0
-39F2C0:lI97|H39F37C
-39F37C:lI116|H39F440
-39F440:lI101|H39F50C
-39F50C:lI100|H39F5D0
-39F5D0:lI45|H39F6A4
-39F6A4:lI118|H39F778
-39F778:lI97|H39F84C
-39F84C:lI108|H39F930
-39F930:lI117|H39FA0C
-39FA0C:lI101|H39FAE0
-39FAE0:lI115|N
-39E610:lI116|H39E714
-39E714:lI115|H39E818
-39E818:lI118|N
-39E514:lH39E620|H39E62C
-39E620:t2:H39E724,H39E72C
-39E72C:lI116|H39E830
-39E830:lI101|H39E93C
-39E93C:lI120|H39EA40
-39EA40:lI116|H39EB2C
-39EB2C:lI47|H39EC10
-39EC10:lI114|H39ECF4
-39ECF4:lI105|H39EDD8
-39EDD8:lI99|H39EEA4
-39EEA4:lI104|H39EF78
-39EF78:lI116|H39F054
-39F054:lI101|H39F128
-39F128:lI120|H39F1FC
-39F1FC:lI116|N
-39E724:lI114|H39E828
-39E828:lI116|H39E934
-39E934:lI120|N
-39E62C:lH39E734|H39E740
-39E734:t2:H39E838,H39E840
-39E840:lI116|H39E94C
-39E94C:lI101|H39EA50
-39EA50:lI120|H39EB34
-39EB34:lI116|H39EC18
-39EC18:lI47|H39ECFC
-39ECFC:lI112|H39EDE0
-39EDE0:lI108|H39EEAC
-39EEAC:lI97|H39EF80
-39EF80:lI105|H39F05C
-39F05C:lI110|N
-39E838:lI116|H39E944
-39E944:lI120|H39EA48
-39EA48:lI116|N
-39E740:lH39E848|H39E854
-39E848:t2:H39E954,H39E95C
-39E95C:lI116|H39EA60
-39EA60:lI101|H39EB44
-39EB44:lI120|H39EC28
-39EC28:lI116|H39ED0C
-39ED0C:lI47|H39EDE8
-39EDE8:lI120|H39EEB4
-39EEB4:lI45|H39EF88
-39EF88:lI115|H39F064
-39F064:lI101|H39F130
-39F130:lI114|H39F204
-39F204:lI118|H39F2C8
-39F2C8:lI101|H39F384
-39F384:lI114|H39F448
-39F448:lI45|H39F514
-39F514:lI112|H39F5D8
-39F5D8:lI97|H39F6AC
-39F6AC:lI114|H39F780
-39F780:lI115|H39F854
-39F854:lI101|H39F938
-39F938:lI100|H39FA14
-39FA14:lI45|H39FAE8
-39FAE8:lI104|H39FBBC
-39FBBC:lI116|H39FC88
-39FC88:lI109|H39FD4C
-39FD4C:lI108|N
-39E954:lI115|H39EA58
-39EA58:lI104|H39EB3C
-39EB3C:lI116|H39EC20
-39EC20:lI109|H39ED04
-39ED04:lI108|N
-39E854:lH39E964|H39E970
-39E964:t2:H39EA68,H39EA70
-39EA70:lI116|H39EB54
-39EB54:lI101|H39EC38
-39EC38:lI120|H39ED1C
-39ED1C:lI116|H39EDF0
-39EDF0:lI47|H39EEBC
-39EEBC:lI104|H39EF90
-39EF90:lI116|H39F06C
-39F06C:lI109|H39F138
-39F138:lI108|N
-39EA68:lI104|H39EB4C
-39EB4C:lI116|H39EC30
-39EC30:lI109|H39ED14
-39ED14:lI108|N
-39E970:lH39EA78|H39EA84
-39EA78:t2:H39EB5C,H39EB64
-39EB64:lI116|H39EC48
-39EC48:lI101|H39ED2C
-39ED2C:lI120|H39EDF8
-39EDF8:lI116|H39EEC4
-39EEC4:lI47|H39EF98
-39EF98:lI104|H39F074
-39F074:lI116|H39F140
-39F140:lI109|H39F20C
-39F20C:lI108|N
-39EB5C:lI104|H39EC40
-39EC40:lI116|H39ED24
-39ED24:lI109|N
-39EA84:lH39EB6C|H39EB78
-39EB6C:t2:H39EC50,H39EC58
-39EC58:lI105|H39ED3C
-39ED3C:lI109|H39EE08
-39EE08:lI97|H39EECC
-39EECC:lI103|H39EFA0
-39EFA0:lI101|H39F07C
-39F07C:lI47|H39F148
-39F148:lI120|H39F214
-39F214:lI45|H39F2D0
-39F2D0:lI120|H39F38C
-39F38C:lI119|H39F450
-39F450:lI105|H39F51C
-39F51C:lI110|H39F5E0
-39F5E0:lI100|H39F6B4
-39F6B4:lI111|H39F788
-39F788:lI119|H39F85C
-39F85C:lI100|H39F940
-39F940:lI117|H39FA1C
-39FA1C:lI109|H39FAF0
-39FAF0:lI112|N
-39EC50:lI120|H39ED34
-39ED34:lI119|H39EE00
-39EE00:lI100|N
-39EB78:lH39EC60|H39EC6C
-39EC60:t2:H39ED44,H39ED4C
-39ED4C:lI105|H39EE18
-39EE18:lI109|H39EEDC
-39EEDC:lI97|H39EFA8
-39EFA8:lI103|H39F084
-39F084:lI101|H39F150
-39F150:lI47|H39F21C
-39F21C:lI120|H39F2D8
-39F2D8:lI45|H39F394
-39F394:lI120|H39F458
-39F458:lI112|H39F524
-39F524:lI105|H39F5E8
-39F5E8:lI120|H39F6BC
-39F6BC:lI109|H39F790
-39F790:lI97|H39F864
-39F864:lI112|N
-39ED44:lI120|H39EE10
-39EE10:lI112|H39EED4
-39EED4:lI109|N
-39EC6C:lH39ED54|H39ED60
-39ED54:t2:H39EE20,H39EE28
-39EE28:lI105|H39EEEC
-39EEEC:lI109|H39EFB8
-39EFB8:lI97|H39F08C
-39F08C:lI103|H39F158
-39F158:lI101|H39F224
-39F224:lI47|H39F2E0
-39F2E0:lI120|H39F39C
-39F39C:lI45|H39F460
-39F460:lI120|H39F52C
-39F52C:lI98|H39F5F0
-39F5F0:lI105|H39F6C4
-39F6C4:lI116|H39F798
-39F798:lI109|H39F86C
-39F86C:lI97|H39F948
-39F948:lI112|N
-39EE20:lI120|H39EEE4
-39EEE4:lI98|H39EFB0
-39EFB0:lI109|N
-39ED60:lH39EE30|H39EE3C
-39EE30:t2:H39EEF4,H39EEFC
-39EEFC:lI105|H39EFC8
-39EFC8:lI109|H39F09C
-39F09C:lI97|H39F160
-39F160:lI103|H39F22C
-39F22C:lI101|H39F2E8
-39F2E8:lI47|H39F3A4
-39F3A4:lI120|H39F468
-39F468:lI45|H39F534
-39F534:lI114|H39F5F8
-39F5F8:lI103|H39F6CC
-39F6CC:lI98|N
-39EEF4:lI114|H39EFC0
-39EFC0:lI103|H39F094
-39F094:lI98|N
-39EE3C:lH39EF04|H39EF10
-39EF04:t2:H39EFD0,H39EFD8
-39EFD8:lI105|H39F0AC
-39F0AC:lI109|H39F170
-39F170:lI97|H39F234
-39F234:lI103|H39F2F0
-39F2F0:lI101|H39F3AC
-39F3AC:lI47|H39F470
-39F470:lI120|H39F53C
-39F53C:lI45|H39F600
-39F600:lI112|H39F6D4
-39F6D4:lI111|H39F7A0
-39F7A0:lI114|H39F874
-39F874:lI116|H39F950
-39F950:lI97|H39FA24
-39FA24:lI98|H39FAF8
-39FAF8:lI108|H39FBC4
-39FBC4:lI101|H39FC90
-39FC90:lI45|H39FD54
-39FD54:lI112|H39FE18
-39FE18:lI105|H39FECC
-39FECC:lI120|H39FF88
-39FF88:lI109|H3A003C
-3A003C:lI97|H3A00E8
-3A00E8:lI112|N
-39EFD0:lI112|H39F0A4
-39F0A4:lI112|H39F168
-39F168:lI109|N
-39EF10:lH39EFE0|H39EFEC
-39EFE0:t2:H39F0B4,H39F0BC
-39F0BC:lI105|H39F180
-39F180:lI109|H39F244
-39F244:lI97|H39F2F8
-39F2F8:lI103|H39F3B4
-39F3B4:lI101|H39F478
-39F478:lI47|H39F544
-39F544:lI120|H39F608
-39F608:lI45|H39F6DC
-39F6DC:lI112|H39F7A8
-39F7A8:lI111|H39F87C
-39F87C:lI114|H39F958
-39F958:lI116|H39FA2C
-39FA2C:lI97|H39FB00
-39FB00:lI98|H39FBCC
-39FBCC:lI108|H39FC98
-39FC98:lI101|H39FD5C
-39FD5C:lI45|H39FE20
-39FE20:lI103|H39FED4
-39FED4:lI114|H39FF90
-39FF90:lI97|H3A0044
-3A0044:lI121|H3A00F0
-3A00F0:lI109|H3A0194
-3A0194:lI97|H3A0248
-3A0248:lI112|N
-39F0B4:lI112|H39F178
-39F178:lI103|H39F23C
-39F23C:lI109|N
-39EFEC:lH39F0C4|H39F0D0
-39F0C4:t2:H39F188,H39F190
-39F190:lI105|H39F254
-39F254:lI109|H39F308
-39F308:lI97|H39F3BC
-39F3BC:lI103|H39F480
-39F480:lI101|H39F54C
-39F54C:lI47|H39F610
-39F610:lI120|H39F6E4
-39F6E4:lI45|H39F7B0
-39F7B0:lI112|H39F884
-39F884:lI111|H39F960
-39F960:lI114|H39FA34
-39FA34:lI116|H39FB08
-39FB08:lI97|H39FBD4
-39FBD4:lI98|H39FCA0
-39FCA0:lI108|H39FD64
-39FD64:lI101|H39FE28
-39FE28:lI45|H39FEDC
-39FEDC:lI98|H39FF98
-39FF98:lI105|H3A004C
-3A004C:lI116|H3A00F8
-3A00F8:lI109|H3A019C
-3A019C:lI97|H3A0250
-3A0250:lI112|N
-39F188:lI112|H39F24C
-39F24C:lI98|H39F300
-39F300:lI109|N
-39F0D0:lH39F198|H39F1A4
-39F198:t2:H39F25C,H39F264
-39F264:lI105|H39F318
-39F318:lI109|H39F3CC
-39F3CC:lI97|H39F488
-39F488:lI103|H39F554
-39F554:lI101|H39F618
-39F618:lI47|H39F6EC
-39F6EC:lI120|H39F7B8
-39F7B8:lI45|H39F88C
-39F88C:lI112|H39F968
-39F968:lI111|H39FA3C
-39FA3C:lI114|H39FB10
-39FB10:lI116|H39FBDC
-39FBDC:lI97|H39FCA8
-39FCA8:lI98|H39FD6C
-39FD6C:lI108|H39FE30
-39FE30:lI101|H39FEE4
-39FEE4:lI45|H39FFA0
-39FFA0:lI97|H3A0054
-3A0054:lI110|H3A0100
-3A0100:lI121|H3A01A4
-3A01A4:lI109|H3A0258
-3A0258:lI97|H3A0304
-3A0304:lI112|N
-39F25C:lI112|H39F310
-39F310:lI110|H39F3C4
-39F3C4:lI109|N
-39F1A4:lH39F26C|H39F278
-39F26C:t2:H39F320,H39F328
-39F328:lI105|H39F3DC
-39F3DC:lI109|H39F498
-39F498:lI97|H39F55C
-39F55C:lI103|H39F620
-39F620:lI101|H39F6F4
-39F6F4:lI47|H39F7C0
-39F7C0:lI120|H39F894
-39F894:lI45|H39F970
-39F970:lI99|H39FA44
-39FA44:lI109|H39FB18
-39FB18:lI117|H39FBE4
-39FBE4:lI45|H39FCB0
-39FCB0:lI114|H39FD74
-39FD74:lI97|H39FE38
-39FE38:lI115|H39FEEC
-39FEEC:lI116|H39FFA8
-39FFA8:lI101|H3A005C
-3A005C:lI114|N
-39F320:lI114|H39F3D4
-39F3D4:lI97|H39F490
-39F490:lI115|N
-39F278:lH39F330|H39F33C
-39F330:t2:H39F3E4,H39F3EC
-39F3EC:lI105|H39F4A8
-39F4A8:lI109|H39F56C
-39F56C:lI97|H39F630
-39F630:lI103|H39F6FC
-39F6FC:lI101|H39F7C8
-39F7C8:lI47|H39F89C
-39F89C:lI116|H39F978
-39F978:lI105|H39FA4C
-39FA4C:lI102|H39FB20
-39FB20:lI102|N
-39F3E4:lI116|H39F4A0
-39F4A0:lI105|H39F564
-39F564:lI102|H39F628
-39F628:lI102|N
-39F33C:lH39F3F4|H39F400
-39F3F4:t2:H39F4B0,H39F4B8
-39F4B8:lI105|H39F57C
-39F57C:lI109|H39F640
-39F640:lI97|H39F704
-39F704:lI103|H39F7D0
-39F7D0:lI101|H39F8A4
-39F8A4:lI47|H39F980
-39F980:lI116|H39FA54
-39FA54:lI105|H39FB28
-39FB28:lI102|H39FBEC
-39FBEC:lI102|N
-39F4B0:lI116|H39F574
-39F574:lI105|H39F638
-39F638:lI102|N
-39F400:lH39F4C0|H39F4CC
-39F4C0:t2:H39F584,H39F58C
-39F58C:lI105|H39F650
-39F650:lI109|H39F714
-39F714:lI97|H39F7D8
-39F7D8:lI103|H39F8AC
-39F8AC:lI101|H39F988
-39F988:lI47|H39FA5C
-39FA5C:lI112|H39FB30
-39FB30:lI110|H39FBF4
-39FBF4:lI103|N
-39F584:lI112|H39F648
-39F648:lI110|H39F70C
-39F70C:lI103|N
-39F4CC:lH39F594|H39F5A0
-39F594:t2:H39F658,H39F660
-39F660:lI105|H39F724
-39F724:lI109|H39F7E8
-39F7E8:lI97|H39F8BC
-39F8BC:lI103|H39F990
-39F990:lI101|H39FA64
-39FA64:lI47|H39FB38
-39FB38:lI106|H39FBFC
-39FBFC:lI112|H39FCB8
-39FCB8:lI101|H39FD7C
-39FD7C:lI103|N
-39F658:lI106|H39F71C
-39F71C:lI112|H39F7E0
-39F7E0:lI101|H39F8B4
-39F8B4:lI103|N
-39F5A0:lH39F668|H39F674
-39F668:t2:H39F72C,H39F734
-39F734:lI105|H39F7F8
-39F7F8:lI109|H39F8CC
-39F8CC:lI97|H39F998
-39F998:lI103|H39FA6C
-39FA6C:lI101|H39FB40
-39FB40:lI47|H39FC04
-39FC04:lI106|H39FCC0
-39FCC0:lI112|H39FD84
-39FD84:lI101|H39FE40
-39FE40:lI103|N
-39F72C:lI106|H39F7F0
-39F7F0:lI112|H39F8C4
-39F8C4:lI103|N
-39F674:lH39F73C|H39F748
-39F73C:t2:H39F800,H39F808
-39F808:lI105|H39F8DC
-39F8DC:lI109|H39F9A8
-39F9A8:lI97|H39FA74
-39FA74:lI103|H39FB48
-39FB48:lI101|H39FC0C
-39FC0C:lI47|H39FCC8
-39FCC8:lI106|H39FD8C
-39FD8C:lI112|H39FE48
-39FE48:lI101|H39FEF4
-39FEF4:lI103|N
-39F800:lI106|H39F8D4
-39F8D4:lI112|H39F9A0
-39F9A0:lI101|N
-39F748:lH39F810|H39F81C
-39F810:t2:H39F8E4,H39F8EC
-39F8EC:lI105|H39F9B8
-39F9B8:lI109|H39FA84
-39FA84:lI97|H39FB50
-39FB50:lI103|H39FC14
-39FC14:lI101|H39FCD0
-39FCD0:lI47|H39FD94
-39FD94:lI105|H39FE50
-39FE50:lI101|H39FEFC
-39FEFC:lI102|N
-39F8E4:lI105|H39F9B0
-39F9B0:lI101|H39FA7C
-39FA7C:lI102|N
-39F81C:lH39F8F4|H39F900
-39F8F4:t2:H39F9C0,H39F9C8
-39F9C8:lI105|H39FA94
-39FA94:lI109|H39FB60
-39FB60:lI97|H39FC1C
-39FC1C:lI103|H39FCD8
-39FCD8:lI101|H39FD9C
-39FD9C:lI47|H39FE58
-39FE58:lI103|H39FF04
-39FF04:lI105|H39FFB0
-39FFB0:lI102|N
-39F9C0:lI103|H39FA8C
-39FA8C:lI105|H39FB58
-39FB58:lI102|N
-39F900:lH39F9D0|H39F9DC
-39F9D0:t2:H39FA9C,H39FAA4
-39FAA4:lI99|H39FB70
-39FB70:lI104|H39FC2C
-39FC2C:lI101|H39FCE0
-39FCE0:lI109|H39FDA4
-39FDA4:lI105|H39FE60
-39FE60:lI99|H39FF0C
-39FF0C:lI97|H39FFB8
-39FFB8:lI108|H3A0064
-3A0064:lI47|H3A0108
-3A0108:lI120|H3A01AC
-3A01AC:lI45|H3A0260
-3A0260:lI112|H3A030C
-3A030C:lI100|H3A03B8
-3A03B8:lI98|N
-39FA9C:lI112|H39FB68
-39FB68:lI100|H39FC24
-39FC24:lI98|N
-39F9DC:lH39FAAC|H39FAB8
-39FAAC:t2:H39FB78,H39FB80
-39FB80:lI99|H39FC3C
-39FC3C:lI104|H39FCF0
-39FCF0:lI101|H39FDAC
-39FDAC:lI109|H39FE68
-39FE68:lI105|H39FF14
-39FF14:lI99|H39FFC0
-39FFC0:lI97|H3A006C
-3A006C:lI108|H3A0110
-3A0110:lI47|H3A01B4
-3A01B4:lI120|H3A0268
-3A0268:lI45|H3A0314
-3A0314:lI112|H3A03C0
-3A03C0:lI100|H3A0454
-3A0454:lI98|N
-39FB78:lI120|H39FC34
-39FC34:lI121|H39FCE8
-39FCE8:lI122|N
-39FAB8:lH39FB88|H39FB94
-39FB88:t2:H39FC44,H39FC4C
-39FC4C:lI97|H39FD00
-39FD00:lI117|H39FDBC
-39FDBC:lI100|H39FE70
-39FE70:lI105|H39FF1C
-39FF1C:lI111|H39FFC8
-39FFC8:lI47|H3A0074
-3A0074:lI120|H3A0118
-3A0118:lI45|H3A01BC
-3A01BC:lI119|H3A0270
-3A0270:lI97|H3A031C
-3A031C:lI118|N
-39FC44:lI119|H39FCF8
-39FCF8:lI97|H39FDB4
-39FDB4:lI118|N
-39FB94:lH39FC54|H39FC60
-39FC54:t2:H39FD08,H39FD10
-39FD10:lI97|H39FDCC
-39FDCC:lI117|H39FE78
-39FE78:lI100|H39FF24
-39FF24:lI105|H39FFD0
-39FFD0:lI111|H3A007C
-3A007C:lI47|H3A0120
-3A0120:lI120|H3A01C4
-3A01C4:lI45|H3A0278
-3A0278:lI114|H3A0324
-3A0324:lI101|H3A03C8
-3A03C8:lI97|H3A045C
-3A045C:lI108|H3A04F8
-3A04F8:lI97|H3A059C
-3A059C:lI117|H3A0648
-3A0648:lI100|H3A06F4
-3A06F4:lI105|H3A07A0
-3A07A0:lI111|N
-39FD08:lI114|H39FDC4
-39FDC4:lI97|N
-39FC60:lH39FD18|H39FD24
-39FD18:t2:H39FDD4,H39FDDC
-39FDDC:lI97|H39FE88
-39FE88:lI117|H39FF34
-39FF34:lI100|H39FFD8
-39FFD8:lI105|H3A0084
-3A0084:lI111|H3A0128
-3A0128:lI47|H3A01CC
-3A01CC:lI120|H3A0280
-3A0280:lI45|H3A032C
-3A032C:lI112|H3A03D0
-3A03D0:lI110|H3A0464
-3A0464:lI45|H3A0500
-3A0500:lI114|H3A05A4
-3A05A4:lI101|H3A0650
-3A0650:lI97|H3A06FC
-3A06FC:lI108|H3A07A8
-3A07A8:lI97|H3A0844
-3A0844:lI117|H3A08D0
-3A08D0:lI100|H3A0964
-3A0964:lI105|H3A09F8
-3A09F8:lI111|H3A0A94
-3A0A94:lI45|H3A0B40
-3A0B40:lI112|H3A0BEC
-3A0BEC:lI108|H3A0CA8
-3A0CA8:lI117|H3A0D64
-3A0D64:lI103|H3A0E18
-3A0E18:lI105|H3A0ECC
-3A0ECC:lI110|N
-39FDD4:lI114|H39FE80
-39FE80:lI112|H39FF2C
-39FF2C:lI109|N
-39FD24:lH39FDE4|H39FDF0
-39FDE4:t2:H39FE90,H39FE98
-39FE98:lI97|H39FF44
-39FF44:lI117|H39FFE8
-39FFE8:lI100|H3A008C
-3A008C:lI105|H3A0130
-3A0130:lI111|H3A01D4
-3A01D4:lI47|H3A0288
-3A0288:lI120|H3A0334
-3A0334:lI45|H3A03D8
-3A03D8:lI112|H3A046C
-3A046C:lI110|H3A0508
-3A0508:lI45|H3A05AC
-3A05AC:lI114|H3A0658
-3A0658:lI101|H3A0704
-3A0704:lI97|H3A07B0
-3A07B0:lI108|H3A084C
-3A084C:lI97|H3A08D8
-3A08D8:lI117|H3A096C
-3A096C:lI100|H3A0A00
-3A0A00:lI105|H3A0A9C
-3A0A9C:lI111|N
-39FE90:lI114|H39FF3C
-39FF3C:lI97|H39FFE0
-39FFE0:lI109|N
-39FDF0:lH39FEA0|H39FEAC
-39FEA0:t2:H39FF4C,H39FF54
-39FF54:lI97|H39FFF8
-39FFF8:lI117|H3A009C
-3A009C:lI100|H3A0138
-3A0138:lI105|H3A01DC
-3A01DC:lI111|H3A0290
-3A0290:lI47|H3A033C
-3A033C:lI120|H3A03E0
-3A03E0:lI45|H3A0474
-3A0474:lI97|H3A0510
-3A0510:lI105|H3A05B4
-3A05B4:lI102|H3A0660
-3A0660:lI102|N
-39FF4C:lI97|H39FFF0
-39FFF0:lI105|H3A0094
-3A0094:lI102|N
-39FEAC:lH39FF5C|H39FF68
-39FF5C:t2:H3A0000,H3A0008
-3A0008:lI97|H3A00AC
-3A00AC:lI117|H3A0148
-3A0148:lI100|H3A01EC
-3A01EC:lI105|H3A0298
-3A0298:lI111|H3A0344
-3A0344:lI47|H3A03E8
-3A03E8:lI120|H3A047C
-3A047C:lI45|H3A0518
-3A0518:lI97|H3A05BC
-3A05BC:lI105|H3A0668
-3A0668:lI102|H3A070C
-3A070C:lI102|N
-3A0000:lI97|H3A00A4
-3A00A4:lI105|H3A0140
-3A0140:lI102|H3A01E4
-3A01E4:lI102|N
-39FF68:lH3A0010|H3A001C
-3A0010:t2:H3A00B4,H3A00BC
-3A00BC:lI97|H3A0158
-3A0158:lI117|H3A01FC
-3A01FC:lI100|H3A02A8
-3A02A8:lI105|H3A034C
-3A034C:lI111|H3A03F0
-3A03F0:lI47|H3A0484
-3A0484:lI120|H3A0520
-3A0520:lI45|H3A05C4
-3A05C4:lI97|H3A0670
-3A0670:lI105|H3A0714
-3A0714:lI102|H3A07B8
-3A07B8:lI102|N
-3A00B4:lI97|H3A0150
-3A0150:lI105|H3A01F4
-3A01F4:lI102|H3A02A0
-3A02A0:lI99|N
-3A001C:lH3A00C4|H3A00D0
-3A00C4:t2:H3A0160,H3A0168
-3A0168:lI97|H3A020C
-3A020C:lI117|H3A02B8
-3A02B8:lI100|H3A035C
-3A035C:lI105|H3A03F8
-3A03F8:lI111|H3A048C
-3A048C:lI47|H3A0528
-3A0528:lI109|H3A05CC
-3A05CC:lI112|H3A0678
-3A0678:lI101|H3A071C
-3A071C:lI103|N
-3A0160:lI109|H3A0204
-3A0204:lI112|H3A02B0
-3A02B0:lI103|H3A0354
-3A0354:lI97|N
-3A00D0:lH3A0170|H3A017C
-3A0170:t2:H3A0214,H3A021C
-3A021C:lI97|H3A02C8
-3A02C8:lI117|H3A036C
-3A036C:lI100|H3A0400
-3A0400:lI105|H3A0494
-3A0494:lI111|H3A0530
-3A0530:lI47|H3A05D4
-3A05D4:lI109|H3A0680
-3A0680:lI112|H3A0724
-3A0724:lI101|H3A07C0
-3A07C0:lI103|N
-3A0214:lI109|H3A02C0
-3A02C0:lI112|H3A0364
-3A0364:lI50|N
-3A017C:lH3A0224|H3A0230
-3A0224:t2:H3A02D0,H3A02D8
-3A02D8:lI97|H3A037C
-3A037C:lI117|H3A0408
-3A0408:lI100|H3A049C
-3A049C:lI105|H3A0538
-3A0538:lI111|H3A05DC
-3A05DC:lI47|H3A0688
-3A0688:lI98|H3A072C
-3A072C:lI97|H3A07C8
-3A07C8:lI115|H3A0854
-3A0854:lI105|H3A08E0
-3A08E0:lI99|N
-3A02D0:lI97|H3A0374
-3A0374:lI117|N
-3A0230:lH3A02E0|H3A02EC
-3A02E0:t2:H3A0384,H3A038C
-3A038C:lI97|H3A0418
-3A0418:lI117|H3A04AC
-3A04AC:lI100|H3A0540
-3A0540:lI105|H3A05E4
-3A05E4:lI111|H3A0690
-3A0690:lI47|H3A0734
-3A0734:lI98|H3A07D0
-3A07D0:lI97|H3A085C
-3A085C:lI115|H3A08E8
-3A08E8:lI105|H3A0974
-3A0974:lI99|N
-3A0384:lI115|H3A0410
-3A0410:lI110|H3A04A4
-3A04A4:lI100|N
-3A02EC:lH3A0394|H3A03A0
-3A0394:t2:H3A0420,H3A0428
-3A0428:lI97|H3A04BC
-3A04BC:lI112|H3A0550
-3A0550:lI112|H3A05EC
-3A05EC:lI108|H3A0698
-3A0698:lI105|H3A073C
-3A073C:lI99|H3A07D8
-3A07D8:lI97|H3A0864
-3A0864:lI116|H3A08F0
-3A08F0:lI105|H3A097C
-3A097C:lI111|H3A0A08
-3A0A08:lI110|H3A0AA4
-3A0AA4:lI47|H3A0B48
-3A0B48:lI122|H3A0BF4
-3A0BF4:lI105|H3A0CB0
-3A0CB0:lI112|N
-3A0420:lI122|H3A04B4
-3A04B4:lI105|H3A0548
-3A0548:lI112|N
-3A03A0:lH3A0430|H3A043C
-3A0430:t2:H3A04C4,H3A04CC
-3A04CC:lI97|H3A0560
-3A0560:lI112|H3A05FC
-3A05FC:lI112|H3A06A0
-3A06A0:lI108|H3A0744
-3A0744:lI105|H3A07E0
-3A07E0:lI99|H3A086C
-3A086C:lI97|H3A08F8
-3A08F8:lI116|H3A0984
-3A0984:lI105|H3A0A10
-3A0A10:lI111|H3A0AAC
-3A0AAC:lI110|H3A0B50
-3A0B50:lI47|H3A0BFC
-3A0BFC:lI120|H3A0CB8
-3A0CB8:lI45|H3A0D6C
-3A0D6C:lI119|H3A0E20
-3A0E20:lI97|H3A0ED4
-3A0ED4:lI105|H3A0F90
-3A0F90:lI115|H3A105C
-3A105C:lI45|H3A1130
-3A1130:lI115|H3A1204
-3A1204:lI111|H3A12D0
-3A12D0:lI117|H3A13A4
-3A13A4:lI114|H3A1480
-3A1480:lI99|H3A1564
-3A1564:lI101|N
-3A04C4:lI115|H3A0558
-3A0558:lI114|H3A05F4
-3A05F4:lI99|N
-3A043C:lH3A04D4|H3A04E0
-3A04D4:t2:H3A0568,H3A0570
-3A0570:lI97|H3A060C
-3A060C:lI112|H3A06B0
-3A06B0:lI112|H3A0754
-3A0754:lI108|H3A07F0
-3A07F0:lI105|H3A0874
-3A0874:lI99|H3A0900
-3A0900:lI97|H3A098C
-3A098C:lI116|H3A0A18
-3A0A18:lI105|H3A0AB4
-3A0AB4:lI111|H3A0B58
-3A0B58:lI110|H3A0C04
-3A0C04:lI47|H3A0CC0
-3A0CC0:lI120|H3A0D74
-3A0D74:lI45|H3A0E28
-3A0E28:lI117|H3A0EDC
-3A0EDC:lI115|H3A0F98
-3A0F98:lI116|H3A1064
-3A1064:lI97|H3A1138
-3A1138:lI114|N
-3A0568:lI117|H3A0604
-3A0604:lI115|H3A06A8
-3A06A8:lI116|H3A074C
-3A074C:lI97|H3A07E8
-3A07E8:lI114|N
-3A04E0:lH3A0578|H3A0584
-3A0578:t2:H3A0614,H3A061C
-3A061C:lI97|H3A06C0
-3A06C0:lI112|H3A075C
-3A075C:lI112|H3A07F8
-3A07F8:lI108|H3A087C
-3A087C:lI105|H3A0908
-3A0908:lI99|H3A0994
-3A0994:lI97|H3A0A20
-3A0A20:lI116|H3A0ABC
-3A0ABC:lI105|H3A0B60
-3A0B60:lI111|H3A0C0C
-3A0C0C:lI110|H3A0CC8
-3A0CC8:lI47|H3A0D7C
-3A0D7C:lI120|H3A0E30
-3A0E30:lI45|H3A0EE4
-3A0EE4:lI116|H3A0FA0
-3A0FA0:lI114|H3A106C
-3A106C:lI111|H3A1140
-3A1140:lI102|H3A120C
-3A120C:lI102|H3A12D8
-3A12D8:lI45|H3A13AC
-3A13AC:lI109|H3A1488
-3A1488:lI115|N
-3A0614:lI109|H3A06B8
-3A06B8:lI115|N
-3A0584:lH3A0624|H3A0630
-3A0624:t2:H3A06C8,H3A06D0
-3A06D0:lI97|H3A076C
-3A076C:lI112|H3A0800
-3A0800:lI112|H3A0884
-3A0884:lI108|H3A0910
-3A0910:lI105|H3A099C
-3A099C:lI99|H3A0A28
-3A0A28:lI97|H3A0AC4
-3A0AC4:lI116|H3A0B68
-3A0B68:lI105|H3A0C14
-3A0C14:lI111|H3A0CD0
-3A0CD0:lI110|H3A0D84
-3A0D84:lI47|H3A0E38
-3A0E38:lI120|H3A0EEC
-3A0EEC:lI45|H3A0FA8
-3A0FA8:lI116|H3A1074
-3A1074:lI114|H3A1148
-3A1148:lI111|H3A1214
-3A1214:lI102|H3A12E0
-3A12E0:lI102|H3A13B4
-3A13B4:lI45|H3A1490
-3A1490:lI109|H3A156C
-3A156C:lI101|N
-3A06C8:lI109|H3A0764
-3A0764:lI101|N
-3A0630:lH3A06D8|H3A06E4
-3A06D8:t2:H3A0774,H3A077C
-3A077C:lI97|H3A0810
-3A0810:lI112|H3A0894
-3A0894:lI112|H3A0918
-3A0918:lI108|H3A09A4
-3A09A4:lI105|H3A0A30
-3A0A30:lI99|H3A0ACC
-3A0ACC:lI97|H3A0B70
-3A0B70:lI116|H3A0C1C
-3A0C1C:lI105|H3A0CD8
-3A0CD8:lI111|H3A0D8C
-3A0D8C:lI110|H3A0E40
-3A0E40:lI47|H3A0EF4
-3A0EF4:lI120|H3A0FB0
-3A0FB0:lI45|H3A107C
-3A107C:lI116|H3A1150
-3A1150:lI114|H3A121C
-3A121C:lI111|H3A12E8
-3A12E8:lI102|H3A13BC
-3A13BC:lI102|H3A1498
-3A1498:lI45|H3A1574
-3A1574:lI109|H3A1648
-3A1648:lI97|H3A171C
-3A171C:lI110|N
-3A0774:lI109|H3A0808
-3A0808:lI97|H3A088C
-3A088C:lI110|N
-3A06E4:lH3A0784|H3A0790
-3A0784:t2:H3A0818,H3A0820
-3A0820:lI97|H3A089C
-3A089C:lI112|H3A0920
-3A0920:lI112|H3A09AC
-3A09AC:lI108|H3A0A38
-3A0A38:lI105|H3A0AD4
-3A0AD4:lI99|H3A0B78
-3A0B78:lI97|H3A0C24
-3A0C24:lI116|H3A0CE0
-3A0CE0:lI105|H3A0D94
-3A0D94:lI111|H3A0E48
-3A0E48:lI110|H3A0EFC
-3A0EFC:lI47|H3A0FB8
-3A0FB8:lI120|H3A1084
-3A1084:lI45|H3A1158
-3A1158:lI116|H3A1224
-3A1224:lI114|H3A12F0
-3A12F0:lI111|H3A13C4
-3A13C4:lI102|H3A14A0
-3A14A0:lI102|N
-3A0818:lI116|N
-3A0790:lH3A0828|H3A0834
-3A0828:t2:H3A08A4,H3A08AC
-3A08AC:lI97|H3A0930
-3A0930:lI112|H3A09B4
-3A09B4:lI112|H3A0A40
-3A0A40:lI108|H3A0ADC
-3A0ADC:lI105|H3A0B80
-3A0B80:lI99|H3A0C2C
-3A0C2C:lI97|H3A0CE8
-3A0CE8:lI116|H3A0D9C
-3A0D9C:lI105|H3A0E50
-3A0E50:lI111|H3A0F04
-3A0F04:lI110|H3A0FC0
-3A0FC0:lI47|H3A108C
-3A108C:lI120|H3A1160
-3A1160:lI45|H3A122C
-3A122C:lI116|H3A12F8
-3A12F8:lI114|H3A13CC
-3A13CC:lI111|H3A14A8
-3A14A8:lI102|H3A157C
-3A157C:lI102|N
-3A08A4:lI116|H3A0928
-3A0928:lI114|N
-3A0834:lH3A08B4|H3A08C0
-3A08B4:t2:H3A0938,H3A0940
-3A0940:lI97|H3A09C4
-3A09C4:lI112|H3A0A50
-3A0A50:lI112|H3A0AEC
-3A0AEC:lI108|H3A0B88
-3A0B88:lI105|H3A0C34
-3A0C34:lI99|H3A0CF0
-3A0CF0:lI97|H3A0DA4
-3A0DA4:lI116|H3A0E58
-3A0E58:lI105|H3A0F0C
-3A0F0C:lI111|H3A0FC8
-3A0FC8:lI110|H3A1094
-3A1094:lI47|H3A1168
-3A1168:lI120|H3A1234
-3A1234:lI45|H3A1300
-3A1300:lI116|H3A13D4
-3A13D4:lI114|H3A14B0
-3A14B0:lI111|H3A1584
-3A1584:lI102|H3A1650
-3A1650:lI102|N
-3A0938:lI114|H3A09BC
-3A09BC:lI111|H3A0A48
-3A0A48:lI102|H3A0AE4
-3A0AE4:lI102|N
-3A08C0:lH3A0948|H3A0954
-3A0948:t2:H3A09CC,H3A09D4
-3A09D4:lI97|H3A0A60
-3A0A60:lI112|H3A0AFC
-3A0AFC:lI112|H3A0B98
-3A0B98:lI108|H3A0C44
-3A0C44:lI105|H3A0D00
-3A0D00:lI99|H3A0DB4
-3A0DB4:lI97|H3A0E60
-3A0E60:lI116|H3A0F14
-3A0F14:lI105|H3A0FD0
-3A0FD0:lI111|H3A109C
-3A109C:lI110|H3A1170
-3A1170:lI47|H3A123C
-3A123C:lI120|H3A1308
-3A1308:lI45|H3A13DC
-3A13DC:lI116|H3A14B8
-3A14B8:lI101|H3A158C
-3A158C:lI120|H3A1658
-3A1658:lI105|H3A1724
-3A1724:lI110|H3A17E8
-3A17E8:lI102|H3A18AC
-3A18AC:lI111|N
-3A09CC:lI116|H3A0A58
-3A0A58:lI101|H3A0AF4
-3A0AF4:lI120|H3A0B90
-3A0B90:lI105|H3A0C3C
-3A0C3C:lI110|H3A0CF8
-3A0CF8:lI102|H3A0DAC
-3A0DAC:lI111|N
-3A0954:lH3A09DC|H3A09E8
-3A09DC:t2:H3A0A68,H3A0A70
-3A0A70:lI97|H3A0B0C
-3A0B0C:lI112|H3A0BA8
-3A0BA8:lI112|H3A0C54
-3A0C54:lI108|H3A0D08
-3A0D08:lI105|H3A0DBC
-3A0DBC:lI99|H3A0E68
-3A0E68:lI97|H3A0F1C
-3A0F1C:lI116|H3A0FD8
-3A0FD8:lI105|H3A10A4
-3A10A4:lI111|H3A1178
-3A1178:lI110|H3A1244
-3A1244:lI47|H3A1310
-3A1310:lI120|H3A13E4
-3A13E4:lI45|H3A14C0
-3A14C0:lI116|H3A1594
-3A1594:lI101|H3A1660
-3A1660:lI120|H3A172C
-3A172C:lI105|H3A17F0
-3A17F0:lI110|H3A18B4
-3A18B4:lI102|H3A1970
-3A1970:lI111|N
-3A0A68:lI116|H3A0B04
-3A0B04:lI101|H3A0BA0
-3A0BA0:lI120|H3A0C4C
-3A0C4C:lI105|N
-3A09E8:lH3A0A78|H3A0A84
-3A0A78:t2:H3A0B14,H3A0B1C
-3A0B1C:lI97|H3A0BB8
-3A0BB8:lI112|H3A0C64
-3A0C64:lI112|H3A0D10
-3A0D10:lI108|H3A0DC4
-3A0DC4:lI105|H3A0E70
-3A0E70:lI99|H3A0F24
-3A0F24:lI97|H3A0FE0
-3A0FE0:lI116|H3A10AC
-3A10AC:lI105|H3A1180
-3A1180:lI111|H3A124C
-3A124C:lI110|H3A1318
-3A1318:lI47|H3A13EC
-3A13EC:lI120|H3A14C8
-3A14C8:lI45|H3A159C
-3A159C:lI116|H3A1668
-3A1668:lI101|H3A1734
-3A1734:lI120|N
-3A0B14:lI116|H3A0BB0
-3A0BB0:lI101|H3A0C5C
-3A0C5C:lI120|N
-3A0A84:lH3A0B24|H3A0B30
-3A0B24:t2:H3A0BC0,H3A0BC8
-3A0BC8:lI97|H3A0C74
-3A0C74:lI112|H3A0D20
-3A0D20:lI112|H3A0DCC
-3A0DCC:lI108|H3A0E78
-3A0E78:lI105|H3A0F2C
-3A0F2C:lI99|H3A0FE8
-3A0FE8:lI97|H3A10B4
-3A10B4:lI116|H3A1188
-3A1188:lI105|H3A1254
-3A1254:lI111|H3A1320
-3A1320:lI110|H3A13F4
-3A13F4:lI47|H3A14D0
-3A14D0:lI120|H3A15A4
-3A15A4:lI45|H3A1670
-3A1670:lI116|H3A173C
-3A173C:lI99|H3A17F8
-3A17F8:lI108|N
-3A0BC0:lI116|H3A0C6C
-3A0C6C:lI99|H3A0D18
-3A0D18:lI108|N
-3A0B30:lH3A0BD0|H3A0BDC
-3A0BD0:t2:H3A0C7C,H3A0C84
-3A0C84:lI97|H3A0D30
-3A0D30:lI112|H3A0DDC
-3A0DDC:lI112|H3A0E80
-3A0E80:lI108|H3A0F34
-3A0F34:lI105|H3A0FF0
-3A0FF0:lI99|H3A10BC
-3A10BC:lI97|H3A1190
-3A1190:lI116|H3A125C
-3A125C:lI105|H3A1328
-3A1328:lI111|H3A13FC
-3A13FC:lI110|H3A14D8
-3A14D8:lI47|H3A15AC
-3A15AC:lI120|H3A1678
-3A1678:lI45|H3A1744
-3A1744:lI116|H3A1800
-3A1800:lI97|H3A18BC
-3A18BC:lI114|N
-3A0C7C:lI116|H3A0D28
-3A0D28:lI97|H3A0DD4
-3A0DD4:lI114|N
-3A0BDC:lH3A0C8C|H3A0C98
-3A0C8C:t2:H3A0D38,H3A0D40
-3A0D40:lI97|H3A0DEC
-3A0DEC:lI112|H3A0E90
-3A0E90:lI112|H3A0F44
-3A0F44:lI108|H3A1000
-3A1000:lI105|H3A10CC
-3A10CC:lI99|H3A1198
-3A1198:lI97|H3A1264
-3A1264:lI116|H3A1330
-3A1330:lI105|H3A1404
-3A1404:lI111|H3A14E0
-3A14E0:lI110|H3A15B4
-3A15B4:lI47|H3A1680
-3A1680:lI120|H3A174C
-3A174C:lI45|H3A1808
-3A1808:lI115|H3A18C4
-3A18C4:lI118|H3A1978
-3A1978:lI52|H3A1A2C
-3A1A2C:lI99|H3A1AE0
-3A1AE0:lI114|H3A1BA4
-3A1BA4:lI99|N
-3A0D38:lI115|H3A0DE4
-3A0DE4:lI118|H3A0E88
-3A0E88:lI52|H3A0F3C
-3A0F3C:lI99|H3A0FF8
-3A0FF8:lI114|H3A10C4
-3A10C4:lI99|N
-3A0C98:lH3A0D48|H3A0D54
-3A0D48:t2:H3A0DF4,H3A0DFC
-3A0DFC:lI97|H3A0EA0
-3A0EA0:lI112|H3A0F54
-3A0F54:lI112|H3A1010
-3A1010:lI108|H3A10DC
-3A10DC:lI105|H3A11A8
-3A11A8:lI99|H3A1274
-3A1274:lI97|H3A1338
-3A1338:lI116|H3A140C
-3A140C:lI105|H3A14E8
-3A14E8:lI111|H3A15BC
-3A15BC:lI110|H3A1688
-3A1688:lI47|H3A1754
-3A1754:lI120|H3A1810
-3A1810:lI45|H3A18CC
-3A18CC:lI115|H3A1980
-3A1980:lI118|H3A1A34
-3A1A34:lI52|H3A1AE8
-3A1AE8:lI99|H3A1BAC
-3A1BAC:lI112|H3A1C78
-3A1C78:lI105|H3A1D3C
-3A1D3C:lI111|N
-3A0DF4:lI115|H3A0E98
-3A0E98:lI118|H3A0F4C
-3A0F4C:lI52|H3A1008
-3A1008:lI99|H3A10D4
-3A10D4:lI112|H3A11A0
-3A11A0:lI105|H3A126C
-3A126C:lI111|N
-3A0D54:lH3A0E04|H3A0E10
-3A0E04:t2:H3A0EA8,H3A0EB0
-3A0EB0:lI97|H3A0F64
-3A0F64:lI112|H3A1020
-3A1020:lI112|H3A10E4
-3A10E4:lI108|H3A11B0
-3A11B0:lI105|H3A127C
-3A127C:lI99|H3A1340
-3A1340:lI97|H3A1414
-3A1414:lI116|H3A14F0
-3A14F0:lI105|H3A15C4
-3A15C4:lI111|H3A1690
-3A1690:lI110|H3A175C
-3A175C:lI47|H3A1818
-3A1818:lI120|H3A18D4
-3A18D4:lI45|H3A1988
-3A1988:lI115|H3A1A3C
-3A1A3C:lI116|H3A1AF0
-3A1AF0:lI117|H3A1BB4
-3A1BB4:lI102|H3A1C80
-3A1C80:lI102|H3A1D44
-3A1D44:lI105|H3A1E00
-3A1E00:lI116|N
-3A0EA8:lI115|H3A0F5C
-3A0F5C:lI105|H3A1018
-3A1018:lI116|N
-3A0E10:lH3A0EB8|H3A0EC4
-3A0EB8:t2:H3A0F6C,H3A0F74
-3A0F74:lI97|H3A1030
-3A1030:lI112|H3A10F4
-3A10F4:lI112|H3A11C0
-3A11C0:lI108|H3A1284
-3A1284:lI105|H3A1348
-3A1348:lI99|H3A141C
-3A141C:lI97|H3A14F8
-3A14F8:lI116|H3A15CC
-3A15CC:lI105|H3A1698
-3A1698:lI111|H3A1764
-3A1764:lI110|H3A1820
-3A1820:lI47|H3A18DC
-3A18DC:lI120|H3A1990
-3A1990:lI45|H3A1A44
-3A1A44:lI115|H3A1AF8
-3A1AF8:lI104|H3A1BBC
-3A1BBC:lI97|H3A1C88
-3A1C88:lI114|N
-3A0F6C:lI115|H3A1028
-3A1028:lI104|H3A10EC
-3A10EC:lI97|H3A11B8
-3A11B8:lI114|N
-3A0EC4:lH3A0F7C|H3A0F88
-3A0F7C:t2:H3A1038,H3A1040
-3A1040:lI97|H3A1104
-3A1104:lI112|H3A11C8
-3A11C8:lI112|H3A128C
-3A128C:lI108|H3A1350
-3A1350:lI105|H3A1424
-3A1424:lI99|H3A1500
-3A1500:lI97|H3A15D4
-3A15D4:lI116|H3A16A0
-3A16A0:lI105|H3A176C
-3A176C:lI111|H3A1828
-3A1828:lI110|H3A18E4
-3A18E4:lI47|H3A1998
-3A1998:lI120|H3A1A4C
-3A1A4C:lI45|H3A1B00
-3A1B00:lI115|H3A1BC4
-3A1BC4:lI104|N
-3A1038:lI115|H3A10FC
-3A10FC:lI104|N
-3A0F88:lH3A1048|H3A1054
-3A1048:t2:H3A110C,H3A1114
-3A1114:lI97|H3A11D8
-3A11D8:lI112|H3A1294
-3A1294:lI112|H3A1358
-3A1358:lI108|H3A142C
-3A142C:lI105|H3A1508
-3A1508:lI99|H3A15DC
-3A15DC:lI97|H3A16A8
-3A16A8:lI116|H3A1774
-3A1774:lI105|H3A1830
-3A1830:lI111|H3A18EC
-3A18EC:lI110|H3A19A0
-3A19A0:lI47|H3A1A54
-3A1A54:lI120|H3A1B08
-3A1B08:lI45|H3A1BCC
-3A1BCC:lI110|H3A1C90
-3A1C90:lI101|H3A1D4C
-3A1D4C:lI116|H3A1E08
-3A1E08:lI99|H3A1EC4
-3A1EC4:lI100|H3A1F88
-3A1F88:lI102|N
-3A110C:lI110|H3A11D0
-3A11D0:lI99|N
-3A1054:lH3A111C|H3A1128
-3A111C:t2:H3A11E0,H3A11E8
-3A11E8:lI97|H3A12A4
-3A12A4:lI112|H3A1368
-3A1368:lI112|H3A1434
-3A1434:lI108|H3A1510
-3A1510:lI105|H3A15E4
-3A15E4:lI99|H3A16B0
-3A16B0:lI97|H3A177C
-3A177C:lI116|H3A1838
-3A1838:lI105|H3A18F4
-3A18F4:lI111|H3A19A8
-3A19A8:lI110|H3A1A5C
-3A1A5C:lI47|H3A1B10
-3A1B10:lI120|H3A1BD4
-3A1BD4:lI45|H3A1C98
-3A1C98:lI110|H3A1D54
-3A1D54:lI101|H3A1E10
-3A1E10:lI116|H3A1ECC
-3A1ECC:lI99|H3A1F90
-3A1F90:lI100|H3A2044
-3A2044:lI102|N
-3A11E0:lI99|H3A129C
-3A129C:lI100|H3A1360
-3A1360:lI102|N
-3A1128:lH3A11F0|H3A11FC
-3A11F0:t2:H3A12AC,H3A12B4
-3A12B4:lI97|H3A1378
-3A1378:lI112|H3A1444
-3A1444:lI112|H3A1518
-3A1518:lI108|H3A15EC
-3A15EC:lI105|H3A16B8
-3A16B8:lI99|H3A1784
-3A1784:lI97|H3A1840
-3A1840:lI116|H3A18FC
-3A18FC:lI105|H3A19B0
-3A19B0:lI111|H3A1A64
-3A1A64:lI110|H3A1B18
-3A1B18:lI47|H3A1BDC
-3A1BDC:lI120|H3A1CA0
-3A1CA0:lI45|H3A1D5C
-3A1D5C:lI109|H3A1E18
-3A1E18:lI105|H3A1ED4
-3A1ED4:lI102|N
-3A12AC:lI109|H3A1370
-3A1370:lI105|H3A143C
-3A143C:lI102|N
-3A11FC:lH3A12BC|H3A12C8
-3A12BC:t2:H3A1380,H3A1388
-3A1388:lI97|H3A1454
-3A1454:lI112|H3A1528
-3A1528:lI112|H3A15FC
-3A15FC:lI108|H3A16C8
-3A16C8:lI105|H3A178C
-3A178C:lI99|H3A1848
-3A1848:lI97|H3A1904
-3A1904:lI116|H3A19B8
-3A19B8:lI105|H3A1A6C
-3A1A6C:lI111|H3A1B20
-3A1B20:lI110|H3A1BE4
-3A1BE4:lI47|H3A1CA8
-3A1CA8:lI120|H3A1D64
-3A1D64:lI45|H3A1E20
-3A1E20:lI108|H3A1EDC
-3A1EDC:lI97|H3A1F98
-3A1F98:lI116|H3A204C
-3A204C:lI101|H3A2108
-3A2108:lI120|N
-3A1380:lI108|H3A144C
-3A144C:lI97|H3A1520
-3A1520:lI116|H3A15F4
-3A15F4:lI101|H3A16C0
-3A16C0:lI120|N
-3A12C8:lH3A1390|H3A139C
-3A1390:t2:H3A145C,H3A1464
-3A1464:lI97|H3A1538
-3A1538:lI112|H3A160C
-3A160C:lI112|H3A16D0
-3A16D0:lI108|H3A1794
-3A1794:lI105|H3A1850
-3A1850:lI99|H3A190C
-3A190C:lI97|H3A19C0
-3A19C0:lI116|H3A1A74
-3A1A74:lI105|H3A1B28
-3A1B28:lI111|H3A1BEC
-3A1BEC:lI110|H3A1CB0
-3A1CB0:lI47|H3A1D6C
-3A1D6C:lI120|H3A1E28
-3A1E28:lI45|H3A1EE4
-3A1EE4:lI107|H3A1FA0
-3A1FA0:lI111|H3A2054
-3A2054:lI97|H3A2110
-3A2110:lI110|N
-3A145C:lI115|H3A1530
-3A1530:lI107|H3A1604
-3A1604:lI112|N
-3A139C:lH3A146C|H3A1478
-3A146C:t2:H3A1540,H3A1548
-3A1548:lI97|H3A161C
-3A161C:lI112|H3A16E0
-3A16E0:lI112|H3A179C
-3A179C:lI108|H3A1858
-3A1858:lI105|H3A1914
-3A1914:lI99|H3A19C8
-3A19C8:lI97|H3A1A7C
-3A1A7C:lI116|H3A1B30
-3A1B30:lI105|H3A1BF4
-3A1BF4:lI111|H3A1CB8
-3A1CB8:lI110|H3A1D74
-3A1D74:lI47|H3A1E30
-3A1E30:lI120|H3A1EEC
-3A1EEC:lI45|H3A1FA8
-3A1FA8:lI107|H3A205C
-3A205C:lI111|H3A2118
-3A2118:lI97|H3A21CC
-3A21CC:lI110|N
-3A1540:lI115|H3A1614
-3A1614:lI107|H3A16D8
-3A16D8:lI100|N
-3A1478:lH3A1550|H3A155C
-3A1550:t2:H3A1624,H3A162C
-3A162C:lI97|H3A16F0
-3A16F0:lI112|H3A17AC
-3A17AC:lI112|H3A1860
-3A1860:lI108|H3A191C
-3A191C:lI105|H3A19D0
-3A19D0:lI99|H3A1A84
-3A1A84:lI97|H3A1B38
-3A1B38:lI116|H3A1BFC
-3A1BFC:lI105|H3A1CC0
-3A1CC0:lI111|H3A1D7C
-3A1D7C:lI110|H3A1E38
-3A1E38:lI47|H3A1EF4
-3A1EF4:lI120|H3A1FB0
-3A1FB0:lI45|H3A2064
-3A2064:lI107|H3A2120
-3A2120:lI111|H3A21D4
-3A21D4:lI97|H3A2288
-3A2288:lI110|N
-3A1624:lI115|H3A16E8
-3A16E8:lI107|H3A17A4
-3A17A4:lI116|N
-3A155C:lH3A1634|H3A1640
-3A1634:t2:H3A16F8,H3A1700
-3A1700:lI97|H3A17BC
-3A17BC:lI112|H3A1870
-3A1870:lI112|H3A1924
-3A1924:lI108|H3A19D8
-3A19D8:lI105|H3A1A8C
-3A1A8C:lI99|H3A1B40
-3A1B40:lI97|H3A1C04
-3A1C04:lI116|H3A1CC8
-3A1CC8:lI105|H3A1D84
-3A1D84:lI111|H3A1E40
-3A1E40:lI110|H3A1EFC
-3A1EFC:lI47|H3A1FB8
-3A1FB8:lI120|H3A206C
-3A206C:lI45|H3A2128
-3A2128:lI107|H3A21DC
-3A21DC:lI111|H3A2290
-3A2290:lI97|H3A234C
-3A234C:lI110|N
-3A16F8:lI115|H3A17B4
-3A17B4:lI107|H3A1868
-3A1868:lI109|N
-3A1640:lH3A1708|H3A1714
-3A1708:t2:H3A17C4,H3A17CC
-3A17CC:lI97|H3A1880
-3A1880:lI112|H3A1934
-3A1934:lI112|H3A19E0
-3A19E0:lI108|H3A1A94
-3A1A94:lI105|H3A1B48
-3A1B48:lI99|H3A1C0C
-3A1C0C:lI97|H3A1CD0
-3A1CD0:lI116|H3A1D8C
-3A1D8C:lI105|H3A1E48
-3A1E48:lI111|H3A1F04
-3A1F04:lI110|H3A1FC0
-3A1FC0:lI47|H3A2074
-3A2074:lI120|H3A2130
-3A2130:lI45|H3A21E4
-3A21E4:lI104|H3A2298
-3A2298:lI116|H3A2354
-3A2354:lI116|H3A2410
-3A2410:lI112|H3A24C4
-3A24C4:lI100|H3A2580
-3A2580:lI45|H3A263C
-3A263C:lI99|H3A2700
-3A2700:lI103|H3A27BC
-3A27BC:lI105|N
-3A17C4:lI99|H3A1878
-3A1878:lI103|H3A192C
-3A192C:lI105|N
-3A1714:lH3A17D4|H3A17E0
-3A17D4:t2:H3A1888,H3A1890
-3A1890:lI97|H3A1944
-3A1944:lI112|H3A19F0
-3A19F0:lI112|H3A1A9C
-3A1A9C:lI108|H3A1B50
-3A1B50:lI105|H3A1C14
-3A1C14:lI99|H3A1CD8
-3A1CD8:lI97|H3A1D94
-3A1D94:lI116|H3A1E50
-3A1E50:lI105|H3A1F0C
-3A1F0C:lI111|H3A1FC8
-3A1FC8:lI110|H3A207C
-3A207C:lI47|H3A2138
-3A2138:lI120|H3A21EC
-3A21EC:lI45|H3A22A0
-3A22A0:lI104|H3A235C
-3A235C:lI100|H3A2418
-3A2418:lI102|N
-3A1888:lI104|H3A193C
-3A193C:lI100|H3A19E8
-3A19E8:lI102|N
-3A17E0:lH3A1898|H3A18A4
-3A1898:t2:H3A194C,H3A1954
-3A1954:lI97|H3A1A00
-3A1A00:lI112|H3A1AA4
-3A1AA4:lI112|H3A1B58
-3A1B58:lI108|H3A1C1C
-3A1C1C:lI105|H3A1CE0
-3A1CE0:lI99|H3A1D9C
-3A1D9C:lI97|H3A1E58
-3A1E58:lI116|H3A1F14
-3A1F14:lI105|H3A1FD0
-3A1FD0:lI111|H3A2084
-3A2084:lI110|H3A2140
-3A2140:lI47|H3A21F4
-3A21F4:lI120|H3A22A8
-3A22A8:lI45|H3A2364
-3A2364:lI103|H3A2420
-3A2420:lI122|H3A24CC
-3A24CC:lI105|H3A2588
-3A2588:lI112|N
-3A194C:lI103|H3A19F8
-3A19F8:lI122|N
-3A18A4:lH3A195C|H3A1968
-3A195C:t2:H3A1A08,H3A1A10
-3A1A10:lI97|H3A1AB4
-3A1AB4:lI112|H3A1B68
-3A1B68:lI112|H3A1C2C
-3A1C2C:lI108|H3A1CE8
-3A1CE8:lI105|H3A1DA4
-3A1DA4:lI99|H3A1E60
-3A1E60:lI97|H3A1F1C
-3A1F1C:lI116|H3A1FD8
-3A1FD8:lI105|H3A208C
-3A208C:lI111|H3A2148
-3A2148:lI110|H3A21FC
-3A21FC:lI47|H3A22B0
-3A22B0:lI120|H3A236C
-3A236C:lI45|H3A2428
-3A2428:lI103|H3A24D4
-3A24D4:lI116|H3A2590
-3A2590:lI97|H3A2644
-3A2644:lI114|N
-3A1A08:lI103|H3A1AAC
-3A1AAC:lI116|H3A1B60
-3A1B60:lI97|H3A1C24
-3A1C24:lI114|N
-3A1968:lH3A1A18|H3A1A24
-3A1A18:t2:H3A1ABC,H3A1AC4
-3A1AC4:lI97|H3A1B78
-3A1B78:lI112|H3A1C3C
-3A1C3C:lI112|H3A1CF0
-3A1CF0:lI108|H3A1DAC
-3A1DAC:lI105|H3A1E68
-3A1E68:lI99|H3A1F24
-3A1F24:lI97|H3A1FE0
-3A1FE0:lI116|H3A2094
-3A2094:lI105|H3A2150
-3A2150:lI111|H3A2204
-3A2204:lI110|H3A22B8
-3A22B8:lI47|H3A2374
-3A2374:lI120|H3A2430
-3A2430:lI45|H3A24DC
-3A24DC:lI100|H3A2598
-3A2598:lI118|H3A264C
-3A264C:lI105|N
-3A1ABC:lI100|H3A1B70
-3A1B70:lI118|H3A1C34
-3A1C34:lI105|N
-3A1A24:lH3A1ACC|H3A1AD8
-3A1ACC:t2:H3A1B80,H3A1B88
-3A1B88:lI97|H3A1C4C
-3A1C4C:lI112|H3A1D00
-3A1D00:lI112|H3A1DB4
-3A1DB4:lI108|H3A1E70
-3A1E70:lI105|H3A1F2C
-3A1F2C:lI99|H3A1FE8
-3A1FE8:lI97|H3A209C
-3A209C:lI116|H3A2158
-3A2158:lI105|H3A220C
-3A220C:lI111|H3A22C0
-3A22C0:lI110|H3A237C
-3A237C:lI47|H3A2438
-3A2438:lI120|H3A24E4
-3A24E4:lI45|H3A25A0
-3A25A0:lI100|H3A2654
-3A2654:lI105|H3A2708
-3A2708:lI114|H3A27C4
-3A27C4:lI101|H3A2880
-3A2880:lI99|H3A2944
-3A2944:lI116|H3A2A10
-3A2A10:lI111|H3A2ADC
-3A2ADC:lI114|N
-3A1B80:lI100|H3A1C44
-3A1C44:lI99|H3A1CF8
-3A1CF8:lI114|N
-3A1AD8:lH3A1B90|H3A1B9C
-3A1B90:t2:H3A1C54,H3A1C5C
-3A1C5C:lI97|H3A1D10
-3A1D10:lI112|H3A1DC4
-3A1DC4:lI112|H3A1E78
-3A1E78:lI108|H3A1F34
-3A1F34:lI105|H3A1FF0
-3A1FF0:lI99|H3A20A4
-3A20A4:lI97|H3A2160
-3A2160:lI116|H3A2214
-3A2214:lI105|H3A22C8
-3A22C8:lI111|H3A2384
-3A2384:lI110|H3A2440
-3A2440:lI47|H3A24EC
-3A24EC:lI120|H3A25A8
-3A25A8:lI45|H3A265C
-3A265C:lI100|H3A2710
-3A2710:lI105|H3A27CC
-3A27CC:lI114|H3A2888
-3A2888:lI101|H3A294C
-3A294C:lI99|H3A2A18
-3A2A18:lI116|H3A2AE4
-3A2AE4:lI111|H3A2BB0
-3A2BB0:lI114|N
-3A1C54:lI100|H3A1D08
-3A1D08:lI105|H3A1DBC
-3A1DBC:lI114|N
-3A1B9C:lH3A1C64|H3A1C70
-3A1C64:t2:H3A1D18,H3A1D20
-3A1D20:lI97|H3A1DD4
-3A1DD4:lI112|H3A1E88
-3A1E88:lI112|H3A1F3C
-3A1F3C:lI108|H3A1FF8
-3A1FF8:lI105|H3A20AC
-3A20AC:lI99|H3A2168
-3A2168:lI97|H3A221C
-3A221C:lI116|H3A22D0
-3A22D0:lI105|H3A238C
-3A238C:lI111|H3A2448
-3A2448:lI110|H3A24F4
-3A24F4:lI47|H3A25B0
-3A25B0:lI120|H3A2664
-3A2664:lI45|H3A2718
-3A2718:lI100|H3A27D4
-3A27D4:lI105|H3A2890
-3A2890:lI114|H3A2954
-3A2954:lI101|H3A2A20
-3A2A20:lI99|H3A2AEC
-3A2AEC:lI116|H3A2BB8
-3A2BB8:lI111|H3A2C74
-3A2C74:lI114|N
-3A1D18:lI100|H3A1DCC
-3A1DCC:lI120|H3A1E80
-3A1E80:lI114|N
-3A1C70:lH3A1D28|H3A1D34
-3A1D28:t2:H3A1DDC,H3A1DE4
-3A1DE4:lI97|H3A1E98
-3A1E98:lI112|H3A1F4C
-3A1F4C:lI112|H3A2000
-3A2000:lI108|H3A20B4
-3A20B4:lI105|H3A2170
-3A2170:lI99|H3A2224
-3A2224:lI97|H3A22D8
-3A22D8:lI116|H3A2394
-3A2394:lI105|H3A2450
-3A2450:lI111|H3A24FC
-3A24FC:lI110|H3A25B8
-3A25B8:lI47|H3A266C
-3A266C:lI120|H3A2720
-3A2720:lI45|H3A27DC
-3A27DC:lI99|H3A2898
-3A2898:lI115|H3A295C
-3A295C:lI104|N
-3A1DDC:lI99|H3A1E90
-3A1E90:lI115|H3A1F44
-3A1F44:lI104|N
-3A1D34:lH3A1DEC|H3A1DF8
-3A1DEC:t2:H3A1EA0,H3A1EA8
-3A1EA8:lI97|H3A1F5C
-3A1F5C:lI112|H3A2010
-3A2010:lI112|H3A20C4
-3A20C4:lI108|H3A2178
-3A2178:lI105|H3A222C
-3A222C:lI99|H3A22E0
-3A22E0:lI97|H3A239C
-3A239C:lI116|H3A2458
-3A2458:lI105|H3A2504
-3A2504:lI111|H3A25C0
-3A25C0:lI110|H3A2674
-3A2674:lI47|H3A2728
-3A2728:lI120|H3A27E4
-3A27E4:lI45|H3A28A0
-3A28A0:lI99|H3A2964
-3A2964:lI112|H3A2A28
-3A2A28:lI105|H3A2AF4
-3A2AF4:lI111|N
-3A1EA0:lI99|H3A1F54
-3A1F54:lI112|H3A2008
-3A2008:lI105|H3A20BC
-3A20BC:lI111|N
-3A1DF8:lH3A1EB0|H3A1EBC
-3A1EB0:t2:H3A1F64,H3A1F6C
-3A1F6C:lI97|H3A2018
-3A2018:lI112|H3A20CC
-3A20CC:lI112|H3A2180
-3A2180:lI108|H3A2234
-3A2234:lI105|H3A22E8
-3A22E8:lI99|H3A23A4
-3A23A4:lI97|H3A2460
-3A2460:lI116|H3A250C
-3A250C:lI105|H3A25C8
-3A25C8:lI111|H3A267C
-3A267C:lI110|H3A2730
-3A2730:lI47|H3A27EC
-3A27EC:lI120|H3A28A8
-3A28A8:lI45|H3A296C
-3A296C:lI99|H3A2A30
-3A2A30:lI111|H3A2AFC
-3A2AFC:lI109|H3A2BC0
-3A2BC0:lI112|H3A2C7C
-3A2C7C:lI114|H3A2D2C
-3A2D2C:lI101|H3A2DD4
-3A2DD4:lI115|H3A2E6C
-3A2E6C:lI115|N
-3A1F64:lI90|N
-3A1EBC:lH3A1F74|H3A1F80
-3A1F74:t2:H3A2020,H3A2028
-3A2028:lI97|H3A20DC
-3A20DC:lI112|H3A2190
-3A2190:lI112|H3A223C
-3A223C:lI108|H3A22F0
-3A22F0:lI105|H3A23AC
-3A23AC:lI99|H3A2468
-3A2468:lI97|H3A2514
-3A2514:lI116|H3A25D0
-3A25D0:lI105|H3A2684
-3A2684:lI111|H3A2738
-3A2738:lI110|H3A27F4
-3A27F4:lI47|H3A28B0
-3A28B0:lI120|H3A2974
-3A2974:lI45|H3A2A38
-3A2A38:lI99|H3A2B04
-3A2B04:lI100|H3A2BC8
-3A2BC8:lI108|H3A2C84
-3A2C84:lI105|H3A2D34
-3A2D34:lI110|H3A2DDC
-3A2DDC:lI107|N
-3A2020:lI118|H3A20D4
-3A20D4:lI99|H3A2188
-3A2188:lI100|N
-3A1F80:lH3A2030|H3A203C
-3A2030:t2:H3A20E4,H3A20EC
-3A20EC:lI97|H3A21A0
-3A21A0:lI112|H3A224C
-3A224C:lI112|H3A2300
-3A2300:lI108|H3A23BC
-3A23BC:lI105|H3A2470
-3A2470:lI99|H3A251C
-3A251C:lI97|H3A25D8
-3A25D8:lI116|H3A268C
-3A268C:lI105|H3A2740
-3A2740:lI111|H3A27FC
-3A27FC:lI110|H3A28B8
-3A28B8:lI47|H3A297C
-3A297C:lI120|H3A2A40
-3A2A40:lI45|H3A2B0C
-3A2B0C:lI98|H3A2BD0
-3A2BD0:lI99|H3A2C8C
-3A2C8C:lI112|H3A2D3C
-3A2D3C:lI105|H3A2DE4
-3A2DE4:lI111|N
-3A20E4:lI98|H3A2198
-3A2198:lI99|H3A2244
-3A2244:lI112|H3A22F8
-3A22F8:lI105|H3A23B4
-3A23B4:lI111|N
-3A203C:lH3A20F4|H3A2100
-3A20F4:t2:H3A21A8,H3A21B0
-3A21B0:lI97|H3A225C
-3A225C:lI112|H3A2310
-3A2310:lI112|H3A23C4
-3A23C4:lI108|H3A2478
-3A2478:lI105|H3A2524
-3A2524:lI99|H3A25E0
-3A25E0:lI97|H3A2694
-3A2694:lI116|H3A2748
-3A2748:lI105|H3A2804
-3A2804:lI111|H3A28C0
-3A28C0:lI110|H3A2984
-3A2984:lI47|H3A2A48
-3A2A48:lI114|H3A2B14
-3A2B14:lI116|H3A2BD8
-3A2BD8:lI102|N
-3A21A8:lI114|H3A2254
-3A2254:lI116|H3A2308
-3A2308:lI102|N
-3A2100:lH3A21B8|H3A21C4
-3A21B8:t2:H3A2264,H3A226C
-3A226C:lI97|H3A2320
-3A2320:lI112|H3A23D4
-3A23D4:lI112|H3A2480
-3A2480:lI108|H3A252C
-3A252C:lI105|H3A25E8
-3A25E8:lI99|H3A269C
-3A269C:lI97|H3A2750
-3A2750:lI116|H3A280C
-3A280C:lI105|H3A28C8
-3A28C8:lI111|H3A298C
-3A298C:lI110|H3A2A50
-3A2A50:lI47|H3A2B1C
-3A2B1C:lI112|H3A2BE0
-3A2BE0:lI111|H3A2C94
-3A2C94:lI119|H3A2D44
-3A2D44:lI101|H3A2DEC
-3A2DEC:lI114|H3A2E74
-3A2E74:lI112|H3A2EEC
-3A2EEC:lI111|H3A2F64
-3A2F64:lI105|H3A2FD4
-3A2FD4:lI110|H3A303C
-3A303C:lI116|N
-3A2264:lI112|H3A2318
-3A2318:lI112|H3A23CC
-3A23CC:lI116|N
-3A21C4:lH3A2274|H3A2280
-3A2274:t2:H3A2328,H3A2330
-3A2330:lI97|H3A23E4
-3A23E4:lI112|H3A2488
-3A2488:lI112|H3A2534
-3A2534:lI108|H3A25F0
-3A25F0:lI105|H3A26A4
-3A26A4:lI99|H3A2758
-3A2758:lI97|H3A2814
-3A2814:lI116|H3A28D0
-3A28D0:lI105|H3A2994
-3A2994:lI111|H3A2A58
-3A2A58:lI110|H3A2B24
-3A2B24:lI47|H3A2BE8
-3A2BE8:lI112|H3A2C9C
-3A2C9C:lI111|H3A2D4C
-3A2D4C:lI115|H3A2DF4
-3A2DF4:lI116|H3A2E7C
-3A2E7C:lI115|H3A2EF4
-3A2EF4:lI99|H3A2F6C
-3A2F6C:lI114|H3A2FDC
-3A2FDC:lI105|H3A3044
-3A3044:lI112|H3A30A4
-3A30A4:lI116|N
-3A2328:lI97|H3A23DC
-3A23DC:lI105|N
-3A2280:lH3A2338|H3A2344
-3A2338:t2:H3A23EC,H3A23F4
-3A23F4:lI97|H3A2498
-3A2498:lI112|H3A2544
-3A2544:lI112|H3A25F8
-3A25F8:lI108|H3A26AC
-3A26AC:lI105|H3A2760
-3A2760:lI99|H3A281C
-3A281C:lI97|H3A28D8
-3A28D8:lI116|H3A299C
-3A299C:lI105|H3A2A60
-3A2A60:lI111|H3A2B2C
-3A2B2C:lI110|H3A2BF0
-3A2BF0:lI47|H3A2CA4
-3A2CA4:lI112|H3A2D54
-3A2D54:lI111|H3A2DFC
-3A2DFC:lI115|H3A2E84
-3A2E84:lI116|H3A2EFC
-3A2EFC:lI115|H3A2F74
-3A2F74:lI99|H3A2FE4
-3A2FE4:lI114|H3A304C
-3A304C:lI105|H3A30AC
-3A30AC:lI112|H3A3104
-3A3104:lI116|N
-3A23EC:lI101|H3A2490
-3A2490:lI112|H3A253C
-3A253C:lI115|N
-3A2344:lH3A23FC|H3A2408
-3A23FC:t2:H3A24A0,H3A24A8
-3A24A8:lI97|H3A2554
-3A2554:lI112|H3A2600
-3A2600:lI112|H3A26B4
-3A26B4:lI108|H3A2768
-3A2768:lI105|H3A2824
-3A2824:lI99|H3A28E0
-3A28E0:lI97|H3A29A4
-3A29A4:lI116|H3A2A68
-3A2A68:lI105|H3A2B34
-3A2B34:lI111|H3A2BF8
-3A2BF8:lI110|H3A2CAC
-3A2CAC:lI47|H3A2D5C
-3A2D5C:lI112|H3A2E04
-3A2E04:lI111|H3A2E8C
-3A2E8C:lI115|H3A2F04
-3A2F04:lI116|H3A2F7C
-3A2F7C:lI115|H3A2FEC
-3A2FEC:lI99|H3A3054
-3A3054:lI114|H3A30B4
-3A30B4:lI105|H3A310C
-3A310C:lI112|H3A315C
-3A315C:lI116|N
-3A24A0:lI112|H3A254C
-3A254C:lI115|N
-3A2408:lH3A24B0|H3A24BC
-3A24B0:t2:H3A255C,H3A2564
-3A2564:lI97|H3A2610
-3A2610:lI112|H3A26C4
-3A26C4:lI112|H3A2770
-3A2770:lI108|H3A282C
-3A282C:lI105|H3A28E8
-3A28E8:lI99|H3A29AC
-3A29AC:lI97|H3A2A70
-3A2A70:lI116|H3A2B3C
-3A2B3C:lI105|H3A2C00
-3A2C00:lI111|H3A2CB4
-3A2CB4:lI110|H3A2D64
-3A2D64:lI47|H3A2E0C
-3A2E0C:lI112|H3A2E94
-3A2E94:lI100|H3A2F0C
-3A2F0C:lI102|N
-3A255C:lI112|H3A2608
-3A2608:lI100|H3A26BC
-3A26BC:lI102|N
-3A24BC:lH3A256C|H3A2578
-3A256C:t2:H3A2618,H3A2620
-3A2620:lI97|H3A26D4
-3A26D4:lI112|H3A2780
-3A2780:lI112|H3A2834
-3A2834:lI108|H3A28F0
-3A28F0:lI105|H3A29B4
-3A29B4:lI99|H3A2A78
-3A2A78:lI97|H3A2B44
-3A2B44:lI116|H3A2C08
-3A2C08:lI105|H3A2CBC
-3A2CBC:lI111|H3A2D6C
-3A2D6C:lI110|H3A2E14
-3A2E14:lI47|H3A2E9C
-3A2E9C:lI111|H3A2F14
-3A2F14:lI100|H3A2F84
-3A2F84:lI97|N
-3A2618:lI111|H3A26CC
-3A26CC:lI100|H3A2778
-3A2778:lI97|N
-3A2578:lH3A2628|H3A2634
-3A2628:t2:H3A26DC,H3A26E4
-3A26E4:lI97|H3A2790
-3A2790:lI112|H3A2844
-3A2844:lI112|H3A28F8
-3A28F8:lI108|H3A29BC
-3A29BC:lI105|H3A2A80
-3A2A80:lI99|H3A2B4C
-3A2B4C:lI97|H3A2C10
-3A2C10:lI116|H3A2CC4
-3A2CC4:lI105|H3A2D74
-3A2D74:lI111|H3A2E1C
-3A2E1C:lI110|H3A2EA4
-3A2EA4:lI47|H3A2F1C
-3A2F1C:lI111|H3A2F8C
-3A2F8C:lI99|H3A2FF4
-3A2FF4:lI116|H3A305C
-3A305C:lI101|H3A30BC
-3A30BC:lI116|H3A3114
-3A3114:lI45|H3A3164
-3A3164:lI115|H3A31AC
-3A31AC:lI116|H3A31F4
-3A31F4:lI114|H3A323C
-3A323C:lI101|H3A3284
-3A3284:lI97|H3A32CC
-3A32CC:lI109|N
-3A26DC:lI98|H3A2788
-3A2788:lI105|H3A283C
-3A283C:lI110|N
-3A2634:lH3A26EC|H3A26F8
-3A26EC:t2:H3A2798,H3A27A0
-3A27A0:lI97|H3A2854
-3A2854:lI112|H3A2908
-3A2908:lI112|H3A29C4
-3A29C4:lI108|H3A2A88
-3A2A88:lI105|H3A2B54
-3A2B54:lI99|H3A2C18
-3A2C18:lI97|H3A2CCC
-3A2CCC:lI116|H3A2D7C
-3A2D7C:lI105|H3A2E24
-3A2E24:lI111|H3A2EAC
-3A2EAC:lI110|H3A2F24
-3A2F24:lI47|H3A2F94
-3A2F94:lI111|H3A2FFC
-3A2FFC:lI99|H3A3064
-3A3064:lI116|H3A30C4
-3A30C4:lI101|H3A311C
-3A311C:lI116|H3A316C
-3A316C:lI45|H3A31B4
-3A31B4:lI115|H3A31FC
-3A31FC:lI116|H3A3244
-3A3244:lI114|H3A328C
-3A328C:lI101|H3A32D4
-3A32D4:lI97|H3A3314
-3A3314:lI109|N
-3A2798:lI100|H3A284C
-3A284C:lI109|H3A2900
-3A2900:lI115|N
-3A26F8:lH3A27A8|H3A27B4
-3A27A8:t2:H3A285C,H3A2864
-3A2864:lI97|H3A2918
-3A2918:lI112|H3A29D4
-3A29D4:lI112|H3A2A90
-3A2A90:lI108|H3A2B5C
-3A2B5C:lI105|H3A2C20
-3A2C20:lI99|H3A2CD4
-3A2CD4:lI97|H3A2D84
-3A2D84:lI116|H3A2E2C
-3A2E2C:lI105|H3A2EB4
-3A2EB4:lI111|H3A2F2C
-3A2F2C:lI110|H3A2F9C
-3A2F9C:lI47|H3A3004
-3A3004:lI111|H3A306C
-3A306C:lI99|H3A30CC
-3A30CC:lI116|H3A3124
-3A3124:lI101|H3A3174
-3A3174:lI116|H3A31BC
-3A31BC:lI45|H3A3204
-3A3204:lI115|H3A324C
-3A324C:lI116|H3A3294
-3A3294:lI114|H3A32DC
-3A32DC:lI101|H3A331C
-3A331C:lI97|H3A334C
-3A334C:lI109|N
-3A285C:lI108|H3A2910
-3A2910:lI104|H3A29CC
-3A29CC:lI97|N
-3A27B4:lH3A286C|H3A2878
-3A286C:t2:H3A2920,H3A2928
-3A2928:lI97|H3A29E4
-3A29E4:lI112|H3A2AA0
-3A2AA0:lI112|H3A2B64
-3A2B64:lI108|H3A2C28
-3A2C28:lI105|H3A2CDC
-3A2CDC:lI99|H3A2D8C
-3A2D8C:lI97|H3A2E34
-3A2E34:lI116|H3A2EBC
-3A2EBC:lI105|H3A2F34
-3A2F34:lI111|H3A2FA4
-3A2FA4:lI110|H3A300C
-3A300C:lI47|H3A3074
-3A3074:lI111|H3A30D4
-3A30D4:lI99|H3A312C
-3A312C:lI116|H3A317C
-3A317C:lI101|H3A31C4
-3A31C4:lI116|H3A320C
-3A320C:lI45|H3A3254
-3A3254:lI115|H3A329C
-3A329C:lI116|H3A32E4
-3A32E4:lI114|H3A3324
-3A3324:lI101|H3A3354
-3A3354:lI97|H3A337C
-3A337C:lI109|N
-3A2920:lI108|H3A29DC
-3A29DC:lI122|H3A2A98
-3A2A98:lI104|N
-3A2878:lH3A2930|H3A293C
-3A2930:t2:H3A29EC,H3A29F4
-3A29F4:lI97|H3A2AB0
-3A2AB0:lI112|H3A2B74
-3A2B74:lI112|H3A2C30
-3A2C30:lI108|H3A2CE4
-3A2CE4:lI105|H3A2D94
-3A2D94:lI99|H3A2E3C
-3A2E3C:lI97|H3A2EC4
-3A2EC4:lI116|H3A2F3C
-3A2F3C:lI105|H3A2FAC
-3A2FAC:lI111|H3A3014
-3A3014:lI110|H3A307C
-3A307C:lI47|H3A30DC
-3A30DC:lI111|H3A3134
-3A3134:lI99|H3A3184
-3A3184:lI116|H3A31CC
-3A31CC:lI101|H3A3214
-3A3214:lI116|H3A325C
-3A325C:lI45|H3A32A4
-3A32A4:lI115|H3A32EC
-3A32EC:lI116|H3A332C
-3A332C:lI114|H3A335C
-3A335C:lI101|H3A3384
-3A3384:lI97|H3A33A4
-3A33A4:lI109|N
-3A29EC:lI101|H3A2AA8
-3A2AA8:lI120|H3A2B6C
-3A2B6C:lI101|N
-3A293C:lH3A29FC|H3A2A08
-3A29FC:t2:H3A2AB8,H3A2AC0
-3A2AC0:lI97|H3A2B84
-3A2B84:lI112|H3A2C40
-3A2C40:lI112|H3A2CF4
-3A2CF4:lI108|H3A2DA4
-3A2DA4:lI105|H3A2E44
-3A2E44:lI99|H3A2ECC
-3A2ECC:lI97|H3A2F44
-3A2F44:lI116|H3A2FB4
-3A2FB4:lI105|H3A301C
-3A301C:lI111|H3A3084
-3A3084:lI110|H3A30E4
-3A30E4:lI47|H3A313C
-3A313C:lI111|H3A318C
-3A318C:lI99|H3A31D4
-3A31D4:lI116|H3A321C
-3A321C:lI101|H3A3264
-3A3264:lI116|H3A32AC
-3A32AC:lI45|H3A32F4
-3A32F4:lI115|H3A3334
-3A3334:lI116|H3A3364
-3A3364:lI114|H3A338C
-3A338C:lI101|H3A33AC
-3A33AC:lI97|H3A33C4
-3A33C4:lI109|N
-3A2AB8:lI99|H3A2B7C
-3A2B7C:lI108|H3A2C38
-3A2C38:lI97|H3A2CEC
-3A2CEC:lI115|H3A2D9C
-3A2D9C:lI115|N
-3A2A08:lH3A2AC8|H3A2AD4
-3A2AC8:t2:H3A2B8C,H3A2B94
-3A2B94:lI97|H3A2C50
-3A2C50:lI112|H3A2D04
-3A2D04:lI112|H3A2DAC
-3A2DAC:lI108|H3A2E4C
-3A2E4C:lI105|H3A2ED4
-3A2ED4:lI99|H3A2F4C
-3A2F4C:lI97|H3A2FBC
-3A2FBC:lI116|H3A3024
-3A3024:lI105|H3A308C
-3A308C:lI111|H3A30EC
-3A30EC:lI110|H3A3144
-3A3144:lI47|H3A3194
-3A3194:lI109|H3A31DC
-3A31DC:lI115|H3A3224
-3A3224:lI119|H3A326C
-3A326C:lI111|H3A32B4
-3A32B4:lI114|H3A32FC
-3A32FC:lI100|N
-3A2B8C:lI100|H3A2C48
-3A2C48:lI111|H3A2CFC
-3A2CFC:lI99|N
-3A2AD4:lH3A2B9C|H3A2BA8
-3A2B9C:t2:H3A2C58,H3A2C60
-3A2C60:lI97|H3A2D14
-3A2D14:lI112|H3A2DBC
-3A2DBC:lI112|H3A2E54
-3A2E54:lI108|H3A2EDC
-3A2EDC:lI105|H3A2F54
-3A2F54:lI99|H3A2FC4
-3A2FC4:lI97|H3A302C
-3A302C:lI116|H3A3094
-3A3094:lI105|H3A30F4
-3A30F4:lI111|H3A314C
-3A314C:lI110|H3A319C
-3A319C:lI47|H3A31E4
-3A31E4:lI109|H3A322C
-3A322C:lI97|H3A3274
-3A3274:lI99|H3A32BC
-3A32BC:lI45|H3A3304
-3A3304:lI99|H3A333C
-3A333C:lI111|H3A336C
-3A336C:lI109|H3A3394
-3A3394:lI112|H3A33B4
-3A33B4:lI97|H3A33CC
-3A33CC:lI99|H3A33DC
-3A33DC:lI116|H3A33EC
-3A33EC:lI112|H3A33FC
-3A33FC:lI114|H3A340C
-3A340C:lI111|N
-3A2C58:lI99|H3A2D0C
-3A2D0C:lI112|H3A2DB4
-3A2DB4:lI116|N
-3A2BA8:lH3A2C68|N
-3A2C68:t2:H3A2D1C,H3A2D24
-3A2D24:lI97|H3A2DCC
-3A2DCC:lI112|H3A2E64
-3A2E64:lI112|H3A2EE4
-3A2EE4:lI108|H3A2F5C
-3A2F5C:lI105|H3A2FCC
-3A2FCC:lI99|H3A3034
-3A3034:lI97|H3A309C
-3A309C:lI116|H3A30FC
-3A30FC:lI105|H3A3154
-3A3154:lI111|H3A31A4
-3A31A4:lI110|H3A31EC
-3A31EC:lI47|H3A3234
-3A3234:lI109|H3A327C
-3A327C:lI97|H3A32C4
-3A32C4:lI99|H3A330C
-3A330C:lI45|H3A3344
-3A3344:lI98|H3A3374
-3A3374:lI105|H3A339C
-3A339C:lI110|H3A33BC
-3A33BC:lI104|H3A33D4
-3A33D4:lI101|H3A33E4
-3A33E4:lI120|H3A33F4
-3A33F4:lI52|H3A3404
-3A3404:lI48|N
-3A2D1C:lI104|H3A2DC4
-3A2DC4:lI113|H3A2E5C
-3A2E5C:lI120|N
-39DC28:lH39DC68|H39DC74
-39DC68:t2:A4:port,I8888
-39DC74:lH39DCA8|H39DCB4
-39DCA8:t2:AC:bind_address,H39DCF8
-39DCF8:t4:I127,I0,I0,I1
-39DCB4:lH39DD0C|H39DD18
-39DD0C:t2:AB:server_name,H39DD6C
-39DD6C:lI108|H39DDE4
-39DDE4:lI111|H39DE5C
-39DE5C:lI99|H39DEE4
-39DEE4:lI97|H39DF6C
-39DF6C:lI108|H39E00C
-39E00C:lI104|H39E0B4
-39E0B4:lI111|H39E16C
-39E16C:lI115|H39E238
-39E238:lI116|N
-39DD18:lH39DD74|H39DD80
-39DD74:t2:AE:max_header_siz,I1024
-39DD80:lH39DDEC|H39DDF8
-39DDEC:t2:A11:max_header_action,A8:reply414
-39DDF8:lH39DE64|H39DE70
-39DE64:t2:A8:com_type,A7:ip_comm
-39DE70:lH39DEEC|H39DEF8
-39DEEC:t2:A7:modules,H39DF74
-39DF74:lA9:mod_alias|H39E014
-39E014:lA8:mod_auth|H39E0BC
-39E0BC:lA7:mod_esi|H39E174
-39E174:lAB:mod_actions|H39E240
-39E240:lA7:mod_cgi|H39E324
-39E324:lAB:mod_include|H39E418
-39E418:lA7:mod_dir|H39E51C
-39E51C:lA7:mod_get|H39E634
-39E634:lA8:mod_head|H39E748
-39E748:lA7:mod_log|H39E85C
-39E85C:lAC:mod_disk_log|N
-39DEF8:lH39DF7C|H39DF88
-39DF7C:t2:AF:directory_index,H39E01C
-39E01C:lH39E0C4|N
-39E0C4:lI105|H39E17C
-39E17C:lI110|H39E248
-39E248:lI100|H39E32C
-39E32C:lI101|H39E420
-39E420:lI120|H39E524
-39E524:lI46|H39E63C
-39E63C:lI104|H39E750
-39E750:lI116|H39E864
-39E864:lI109|H39E978
-39E978:lI108|N
-39DF88:lH39E024|H39E030
-39E024:t2:AC:default_type,H39E0CC
-39E0CC:lI116|H39E184
-39E184:lI101|H39E250
-39E250:lI120|H39E334
-39E334:lI116|H39E428
-39E428:lI47|H39E52C
-39E52C:lI112|H39E644
-39E644:lI108|H39E758
-39E758:lI97|H39E86C
-39E86C:lI105|H39E980
-39E980:lI110|N
-39E030:lH39E0D4|H39E0E0
-39E0D4:t2:A10:erl_script_alias,H39E18C
-39E18C:t2:H39E258,H39E260
-39E260:lH39E344|N
-39E344:lI119|H39E438
-39E438:lI101|H39E53C
-39E53C:lI98|H39E654
-39E654:lI116|H39E768
-39E768:lI111|H39E87C
-39E87C:lI111|H39E990
-39E990:lI108|N
-39E258:lI47|H39E33C
-39E33C:lI119|H39E430
-39E430:lI101|H39E534
-39E534:lI98|H39E64C
-39E64C:lI116|H39E760
-39E760:lI111|H39E874
-39E874:lI111|H39E988
-39E988:lI108|N
-39E0E0:lH39E198|H39E1A4
-39E198:t2:A5:alias,H39E268
-39E268:t2:H39E34C,H39E354
-39E354:lI47|H39E448
-39E448:lI99|H39E54C
-39E54C:lI108|H39E664
-39E664:lI101|H39E778
-39E778:lI97|H39E88C
-39E88C:lI114|H39E9A0
-39E9A0:lI99|H39EA94
-39EA94:lI97|H39EB88
-39EB88:lI115|H39EC7C
-39EC7C:lI101|H39ED70
-39ED70:lI47|H39EE4C
-39EE4C:lI111|H39EF20
-39EF20:lI116|H39EFFC
-39EFFC:lI112|H39F0E0
-39F0E0:lI47|H39F1B4
-39F1B4:lI101|H39F288
-39F288:lI114|H39F344
-39F344:lI116|H39F408
-39F408:lI115|H39F4D4
-39F4D4:lI47|H39F5A8
-39F5A8:lI108|H39F67C
-39F67C:lI105|H39F750
-39F750:lI98|H39F824
-39F824:lI47|H39F908
-39F908:lI111|H39F9E4
-39F9E4:lI98|H39FAC0
-39FAC0:lI115|H39FB9C
-39FB9C:lI101|H39FC68
-39FC68:lI114|H39FD2C
-39FD2C:lI118|H39FDF8
-39FDF8:lI101|H39FEB4
-39FEB4:lI114|H39FF70
-39FF70:lI47|H3A0024
-3A0024:lI112|H3A00D8
-3A00D8:lI114|H3A0184
-3A0184:lI105|H3A0238
-3A0238:lI118|H3A02F4
-3A02F4:lI47|H3A03A8
-3A03A8:lI99|H3A0444
-3A0444:lI114|H3A04E8
-3A04E8:lI97|H3A058C
-3A058C:lI115|H3A0638
-3A0638:lI104|H3A06EC
-3A06EC:lI100|H3A0798
-3A0798:lI117|H3A083C
-3A083C:lI109|H3A08C8
-3A08C8:lI112|H3A095C
-3A095C:lI95|H3A09F0
-3A09F0:lI118|H3A0A8C
-3A0A8C:lI105|H3A0B38
-3A0B38:lI101|H3A0BE4
-3A0BE4:lI119|H3A0CA0
-3A0CA0:lI101|H3A0D5C
-3A0D5C:lI114|N
-39E34C:lI47|H39E440
-39E440:lI99|H39E544
-39E544:lI114|H39E65C
-39E65C:lI97|H39E770
-39E770:lI115|H39E884
-39E884:lI104|H39E998
-39E998:lI100|H39EA8C
-39EA8C:lI117|H39EB80
-39EB80:lI109|H39EC74
-39EC74:lI112|H39ED68
-39ED68:lI95|H39EE44
-39EE44:lI118|H39EF18
-39EF18:lI105|H39EFF4
-39EFF4:lI101|H39F0D8
-39F0D8:lI119|H39F1AC
-39F1AC:lI101|H39F280
-39F280:lI114|N
-39E1A4:lH39E274|H39E280
-39E274:t2:A5:alias,H39E35C
-39E35C:t2:H39E450,H39E458
-39E458:lI47|H39E55C
-39E55C:lI99|H39E674
-39E674:lI108|H39E788
-39E788:lI101|H39E89C
-39E89C:lI97|H39E9B0
-39E9B0:lI114|H39EAA4
-39EAA4:lI99|H39EB98
-39EB98:lI97|H39EC8C
-39EC8C:lI115|H39ED80
-39ED80:lI101|H39EE5C
-39EE5C:lI47|H39EF30
-39EF30:lI111|H39F00C
-39F00C:lI116|H39F0F0
-39F0F0:lI112|H39F1C4
-39F1C4:lI47|H39F298
-39F298:lI101|H39F354
-39F354:lI114|H39F418
-39F418:lI116|H39F4E4
-39F4E4:lI115|H39F5B0
-39F5B0:lI47|H39F684
-39F684:lI101|H39F758
-39F758:lI114|H39F82C
-39F82C:lI116|H39F910
-39F910:lI115|H39F9EC
-39F9EC:lI47|H39FAC8
-39FAC8:lI100|H39FBA4
-39FBA4:lI111|H39FC70
-39FC70:lI99|H39FD34
-39FD34:lI47|H39FE00
-39FE00:lI104|H39FEBC
-39FEBC:lI116|H39FF78
-39FF78:lI109|H3A002C
-3A002C:lI108|N
-39E450:lI47|H39E554
-39E554:lI99|H39E66C
-39E66C:lI114|H39E780
-39E780:lI97|H39E894
-39E894:lI115|H39E9A8
-39E9A8:lI104|H39EA9C
-39EA9C:lI100|H39EB90
-39EB90:lI117|H39EC84
-39EC84:lI109|H39ED78
-39ED78:lI112|H39EE54
-39EE54:lI95|H39EF28
-39EF28:lI101|H39F004
-39F004:lI114|H39F0E8
-39F0E8:lI116|H39F1BC
-39F1BC:lI115|H39F290
-39F290:lI95|H39F34C
-39F34C:lI100|H39F410
-39F410:lI111|H39F4DC
-39F4DC:lI99|N
-39E280:lH39E368|H39E374
-39E368:t2:A5:alias,H39E460
-39E460:t2:H39E564,H39E56C
-39E56C:lI47|H39E684
-39E684:lI99|H39E798
-39E798:lI108|H39E8AC
-39E8AC:lI101|H39E9C0
-39E9C0:lI97|H39EAB4
-39EAB4:lI114|H39EBA8
-39EBA8:lI99|H39EC9C
-39EC9C:lI97|H39ED90
-39ED90:lI115|H39EE6C
-39EE6C:lI101|H39EF40
-39EF40:lI47|H39F01C
-39F01C:lI111|H39F100
-39F100:lI116|H39F1D4
-39F1D4:lI112|H39F2A0
-39F2A0:lI47|H39F35C
-39F35C:lI101|H39F420
-39F420:lI114|H39F4EC
-39F4EC:lI116|H39F5B8
-39F5B8:lI115|H39F68C
-39F68C:lI47|H39F760
-39F760:lI108|H39F834
-39F834:lI105|H39F918
-39F918:lI98|H39F9F4
-39F9F4:lI47|H39FAD0
-39FAD0:lI111|H39FBAC
-39FBAC:lI98|H39FC78
-39FC78:lI115|H39FD3C
-39FD3C:lI101|H39FE08
-39FE08:lI114|H39FEC4
-39FEC4:lI118|H39FF80
-39FF80:lI101|H3A0034
-3A0034:lI114|H3A00E0
-3A00E0:lI47|H3A018C
-3A018C:lI100|H3A0240
-3A0240:lI111|H3A02FC
-3A02FC:lI99|H3A03B0
-3A03B0:lI47|H3A044C
-3A044C:lI104|H3A04F0
-3A04F0:lI116|H3A0594
-3A0594:lI109|H3A0640
-3A0640:lI108|N
-39E564:lI47|H39E67C
-39E67C:lI99|H39E790
-39E790:lI114|H39E8A4
-39E8A4:lI97|H39E9B8
-39E9B8:lI115|H39EAAC
-39EAAC:lI104|H39EBA0
-39EBA0:lI100|H39EC94
-39EC94:lI117|H39ED88
-39ED88:lI109|H39EE64
-39EE64:lI112|H39EF38
-39EF38:lI95|H39F014
-39F014:lI100|H39F0F8
-39F0F8:lI111|H39F1CC
-39F1CC:lI99|N
-39E374:lH39E46C|N
-39E46C:t2:A10:erl_script_alias,H39E574
-39E574:t2:H39E68C,H39E694
-39E694:lH39E7A8|N
-39E7A8:lI99|H39E8BC
-39E8BC:lI114|H39E9D0
-39E9D0:lI97|H39EAC4
-39EAC4:lI115|H39EBB8
-39EBB8:lI104|H39ECAC
-39ECAC:lI100|H39EDA0
-39EDA0:lI117|H39EE74
-39EE74:lI109|H39EF48
-39EF48:lI112|H39F024
-39F024:lI95|H39F108
-39F108:lI118|H39F1DC
-39F1DC:lI105|H39F2A8
-39F2A8:lI101|H39F364
-39F364:lI119|H39F428
-39F428:lI101|H39F4F4
-39F4F4:lI114|N
-39E68C:lI47|H39E7A0
-39E7A0:lI99|H39E8B4
-39E8B4:lI100|H39E9C8
-39E9C8:lI118|H39EABC
-39EABC:lI95|H39EBB0
-39EBB0:lI101|H39ECA4
-39ECA4:lI114|H39ED98
-39ED98:lI108|N
-39DB58:lN|H39DB9C
-39DB9C:lH39D9FC|H39DBEC
-39D9FC:t4:I127,I0,I0,I1
-39DBEC:lI8888|N
-3A3E20:lH3A3DFC|H3A3704
-3A3DFC:t8:A5:child,P<0.46.0>,H39DAC8,H39DAD8,A9:permanent,I2000,A6:worker,H39DAE8
-39DAE8:lAD:httpd_manager|H39DB38
-39DB38:lAA:gen_server|N
-39DAD8:t3:AD:httpd_manager,AA:start_link,H39DB30
-39DB30:lA9:undefined|H39DB78
-39DB78:lH39DB50|H39DBC0
-39DBC0:lN|N
-39DAC8:t3:AD:httpd_manager,H39D9FC,I8888
-3A3704:lH3A36E0|H39D998
-3A36E0:t8:A5:child,P<0.45.0>,H39DA18,H39DA28,A9:permanent,I2000,AA:supervisor,H39DA38
-39DA38:lAE:httpd_misc_sup|H39DAC0
-39DAC0:lAA:supervisor|N
-39DA28:t3:AE:httpd_misc_sup,A5:start,H39D958
-39D958:lH39D9FC|H39DA10
-39DA10:lI8888|H39DAB8
-39DAB8:lA7:silence|N
-39DA18:t3:AE:httpd_misc_sup,H39D9FC,I8888
-39D998:lH39DA64|N
-39DA64:t8:A5:child,P<0.44.0>,H39DAF0,H39DB00,A9:permanent,I2000,AA:supervisor,H39DB10
-39DB10:lA12:httpd_acceptor_sup|H39DB48
-39DB48:lAA:supervisor|N
-39DB00:t3:A12:httpd_acceptor_sup,A5:start,H39DB40
-39DB40:lH39D9FC|H39DB80
-39DB80:lI8888|H39DBC8
-39DBC8:lA7:silence|N
-39DAF0:t3:A12:httpd_acceptor_sup,H39D9FC,I8888
-39D960:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39D9CC:lAA:gen_server|H39DA90
-39DA90:lP<0.33.0>|H39DB20
-39DB20:lP<0.33.0>|H39DB60
-39DB60:lH39DBA4|H39DBB0
-39DBA4:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39DBB0:lAA:supervisor|H39DBF4
-39DBF4:lH39DC30|H39DC40
-39DC30:t3:H39D960,A9:httpd_sup,H39DA88
-39DC40:lN|N
-39D940:t2:AD:$initial_call,H39D9E4
-39D9E4:t3:A3:gen,A7:init_it,H39D9CC
-39D94C:t2:AA:$ancestors,H39D9F4
-39D9F4:lA8:web_tool|H39DAB0
-39DAB0:lP<0.27.0>|N
-=proc_dictionary:<0.44.0>
-H3756A8
-H3756B4
-H3756C0
-H3756CC
-=proc_stack:<0.44.0>
-36c194:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36C030
-y4:A1E:httpd_acc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36c1b0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H375710
-=proc_heap:<0.44.0>
-36C030:tA:A5:state,H3756D8,AB:one_for_one,H36C028,N,I500,I100,N,A12:httpd_acceptor_sup,H375730
-375730:lA7:silence|N
-36C028:lH36C004|N
-36C004:t8:A5:child,P<0.47.0>,H36BE80,H36BE90,A9:permanent,I1000,A6:worker,H36BEA0
-36BEA0:lAE:httpd_acceptor|N
-36BE90:t3:AE:httpd_acceptor,AA:start_link,H36BEE8
-36BEE8:lP<0.46.0>|H36BEF0
-36BEF0:lA7:ip_comm|H36BEF8
-36BEF8:lH36BF00|H36BF14
-36BF00:t4:I127,I0,I0,I1
-36BF14:lI8888|H36BF1C
-36BF1C:lA1B:httpd_conf__127_0_0_1__8888|H36BF24
-36BF24:lA7:silence|N
-36BE80:t3:AE:httpd_acceptor,H36BED4,I8888
-36BED4:t4:I127,I0,I0,I1
-3756D8:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-375710:lAA:gen_server|H375738
-375738:lP<0.43.0>|H375748
-375748:lP<0.43.0>|H375758
-375758:lH375760|H37576C
-375760:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-37576C:lAA:supervisor|H375774
-375774:lH37577C|H37578C
-37577C:t3:H3756D8,A12:httpd_acceptor_sup,H375730
-37578C:lN|N
-3756A8:t2:AD:$initial_call,H375718
-375718:t3:A3:gen,A7:init_it,H375710
-3756B4:t2:A9:verbosity,A7:silence
-3756C0:t2:AA:$ancestors,H375728
-375728:lA1A:httpd_sup__127_0_0_1__8888|H375740
-375740:lA8:web_tool|H375750
-375750:lP<0.27.0>|N
-3756CC:t2:A5:sname,A7:acc_sup
-=proc_dictionary:<0.45.0>
-H36F484
-H36F4F4
-H36F468
-H36F500
-=proc_stack:<0.45.0>
-36f734:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F5D0
-y4:A1F:httpd_misc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36f750:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36F430
-=proc_heap:<0.45.0>
-36F5D0:tA:A5:state,H36F3FC,AB:one_for_one,N,N,I0,I1,N,AE:httpd_misc_sup,H36F408
-36F408:lA7:silence|N
-36F3FC:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F430:lAA:gen_server|H36F428
-36F428:lP<0.43.0>|H36F420
-36F420:lP<0.43.0>|H36F3D0
-36F3D0:lH36F3E0|H36F418
-36F3E0:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F418:lAA:supervisor|H36F3D8
-36F3D8:lH36F3EC|H36F410
-36F3EC:t3:H36F3FC,AE:httpd_misc_sup,H36F408
-36F410:lN|N
-36F484:t2:AD:$initial_call,H36F474
-36F474:t3:A3:gen,A7:init_it,H36F430
-36F4F4:t2:A9:verbosity,A7:silence
-36F468:t2:AA:$ancestors,H36F460
-36F460:lA1A:httpd_sup__127_0_0_1__8888|H36F440
-36F440:lA8:web_tool|H36F438
-36F438:lP<0.27.0>|N
-36F500:t2:A5:sname,A8:misc_sup
-=proc_dictionary:<0.46.0>
-H3BDA50
-H3BDA5C
-H3BDAC8
-H3BDB28
-H3BDB9C
-H3BDC00
-H3BDADC
-H3BDB3C
-=proc_stack:<0.46.0>
-39d8f4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:httpd_manager
-y3:H39D5A4
-y4:A16:httpd__127_0_0_1__8888
-y5:P<0.43.0>
-39d910:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3BDAB0
-=proc_heap:<0.46.0>
-39D5A4:t9:A5:state,A7:ip_comm,A9:undefined,A1B:httpd_conf__127_0_0_1__8888,N,A9:unblocked,A9:undefined,A9:undefined,H39D430
-39D430:lH39BF40|H39D428
-39BF40:t2:A8:max_conn,I1
-39D428:lH39BC80|H39D420
-39BC80:t2:AF:last_heavy_load,A5:never
-39D420:lH39D414|N
-39D414:t2:AF:last_connection,H39D408
-39D408:t2:H39D3E8,H39D3F8
-39D3F8:t3:I11,I22,I34
-39D3E8:t3:I2004,I4,I21
-3BDAB0:lAA:gen_server|H3BDB20
-3BDB20:lP<0.43.0>|H3BDB94
-3BDB94:lP<0.43.0>|H3BDBF8
-3BDBF8:lH3BDC48|H3BDC54
-3BDC48:t2:A5:local,A16:httpd__127_0_0_1__8888
-3BDC54:lAD:httpd_manager|H3BDCAC
-3BDCAC:lH3BDD14|H3BDD1C
-3BDD14:lA9:undefined|H3BDD9C
-3BDD9C:lH3BDA84|H3BDE2C
-3BDA84:lH3BDAF0|H3BDAFC
-3BDAF0:t2:AB:server_root,H3BDB48
-3BDB48:lI47|H3BDBB0
-3BDBB0:lI99|H3BDC0C
-3BDC0C:lI108|H3BDC64
-3BDC64:lI101|H3BDCBC
-3BDCBC:lI97|H3BDD2C
-3BDD2C:lI114|H3BDDA4
-3BDDA4:lI99|H3BDE34
-3BDE34:lI97|H3BDED4
-3BDED4:lI115|H3BDF90
-3BDF90:lI101|H3BE054
-3BE054:lI47|H3BE128
-3BE128:lI111|H3BE204
-3BE204:lI116|H3BE2EC
-3BE2EC:lI112|H3BE3E0
-3BE3E0:lI47|H3BE4E4
-3BE4E4:lI101|H3BE5E8
-3BE5E8:lI114|H3BE6EC
-3BE6EC:lI116|H3BE7E0
-3BE7E0:lI115|H3BE8CC
-3BE8CC:lI47|H3BE9B8
-3BE9B8:lI108|H3BEAAC
-3BEAAC:lI105|H3BEB98
-3BEB98:lI98|H3BEC84
-3BEC84:lI47|H3BED70
-3BED70:lI119|H3BEE5C
-3BEE5C:lI101|H3BEF30
-3BEF30:lI98|H3BEFFC
-3BEFFC:lI116|H3BF0C8
-3BF0C8:lI111|H3BF19C
-3BF19C:lI111|H3BF260
-3BF260:lI108|H3BF314
-3BF314:lI47|H3BF3C0
-3BF3C0:lI112|H3BF474
-3BF474:lI114|H3BF530
-3BF530:lI105|H3BF5F4
-3BF5F4:lI118|H3BF6C8
-3BF6C8:lI47|H3BF79C
-3BF79C:lI114|H3BF870
-3BF870:lI111|H3BF954
-3BF954:lI111|H3BFA30
-3BFA30:lI116|N
-3BDAFC:lH3BDB50|H3BDB5C
-3BDB50:t2:AD:document_root,H3BDBB8
-3BDBB8:lI47|H3BDC14
-3BDC14:lI99|H3BDC6C
-3BDC6C:lI108|H3BDCC4
-3BDCC4:lI101|H3BDD34
-3BDD34:lI97|H3BDDAC
-3BDDAC:lI114|H3BDE3C
-3BDE3C:lI99|H3BDEDC
-3BDEDC:lI97|H3BDF98
-3BDF98:lI115|H3BE05C
-3BE05C:lI101|H3BE130
-3BE130:lI47|H3BE20C
-3BE20C:lI111|H3BE2F4
-3BE2F4:lI116|H3BE3E8
-3BE3E8:lI112|H3BE4EC
-3BE4EC:lI47|H3BE5F0
-3BE5F0:lI101|H3BE6F4
-3BE6F4:lI114|H3BE7E8
-3BE7E8:lI116|H3BE8D4
-3BE8D4:lI115|H3BE9C0
-3BE9C0:lI47|H3BEAB4
-3BEAB4:lI108|H3BEBA0
-3BEBA0:lI105|H3BEC8C
-3BEC8C:lI98|H3BED78
-3BED78:lI47|H3BEE64
-3BEE64:lI119|H3BEF38
-3BEF38:lI101|H3BF004
-3BF004:lI98|H3BF0D0
-3BF0D0:lI116|H3BF1A4
-3BF1A4:lI111|H3BF268
-3BF268:lI111|H3BF31C
-3BF31C:lI108|H3BF3C8
-3BF3C8:lI47|H3BF47C
-3BF47C:lI112|H3BF538
-3BF538:lI114|H3BF5FC
-3BF5FC:lI105|H3BF6D0
-3BF6D0:lI118|H3BF7A4
-3BF7A4:lI47|H3BF878
-3BF878:lI114|H3BF95C
-3BF95C:lI111|H3BFA38
-3BFA38:lI111|H3BFB0C
-3BFB0C:lI116|H3BFBE8
-3BFBE8:lI47|H3BFCB4
-3BFCB4:lI100|H3BFD78
-3BFD78:lI111|H3BFE3C
-3BFE3C:lI99|N
-3BDB5C:lH3BDBC0|H3BDBCC
-3BDBC0:t2:AA:mime_types,H3BDC1C
-3BDC1C:lH3BDC74|H3BDC80
-3BDC74:t2:H3BDCCC,H3BDCD4
-3BDCD4:lI120|H3BDD44
-3BDD44:lI45|H3BDDBC
-3BDDBC:lI119|H3BDE44
-3BDE44:lI111|H3BDEE4
-3BDEE4:lI114|H3BDFA0
-3BDFA0:lI108|H3BE064
-3BE064:lI100|H3BE138
-3BE138:lI47|H3BE214
-3BE214:lI120|H3BE2FC
-3BE2FC:lI45|H3BE3F0
-3BE3F0:lI118|H3BE4F4
-3BE4F4:lI114|H3BE5F8
-3BE5F8:lI109|H3BE6FC
-3BE6FC:lI108|N
-3BDCCC:lI119|H3BDD3C
-3BDD3C:lI114|H3BDDB4
-3BDDB4:lI108|N
-3BDC80:lH3BDCDC|H3BDCE8
-3BDCDC:t2:H3BDD4C,H3BDD54
-3BDD54:lI120|H3BDDCC
-3BDDCC:lI45|H3BDE54
-3BDE54:lI119|H3BDEF4
-3BDEF4:lI111|H3BDFA8
-3BDFA8:lI114|H3BE06C
-3BE06C:lI108|H3BE140
-3BE140:lI100|H3BE21C
-3BE21C:lI47|H3BE304
-3BE304:lI120|H3BE3F8
-3BE3F8:lI45|H3BE4FC
-3BE4FC:lI118|H3BE600
-3BE600:lI114|H3BE704
-3BE704:lI109|H3BE7F0
-3BE7F0:lI108|N
-3BDD4C:lI118|H3BDDC4
-3BDDC4:lI114|H3BDE4C
-3BDE4C:lI109|H3BDEEC
-3BDEEC:lI108|N
-3BDCE8:lH3BDD5C|H3BDD68
-3BDD5C:t2:H3BDDD4,H3BDDDC
-3BDDDC:lI120|H3BDE64
-3BDE64:lI45|H3BDF04
-3BDF04:lI99|H3BDFB0
-3BDFB0:lI111|H3BE074
-3BE074:lI110|H3BE148
-3BE148:lI102|H3BE224
-3BE224:lI101|H3BE30C
-3BE30C:lI114|H3BE400
-3BE400:lI101|H3BE504
-3BE504:lI110|H3BE608
-3BE608:lI99|H3BE70C
-3BE70C:lI101|H3BE7F8
-3BE7F8:lI47|H3BE8DC
-3BE8DC:lI120|H3BE9C8
-3BE9C8:lI45|H3BEABC
-3BEABC:lI99|H3BEBA8
-3BEBA8:lI111|H3BEC94
-3BEC94:lI111|H3BED80
-3BED80:lI108|H3BEE6C
-3BEE6C:lI116|H3BEF40
-3BEF40:lI97|H3BF00C
-3BF00C:lI108|H3BF0D8
-3BF0D8:lI107|N
-3BDDD4:lI105|H3BDE5C
-3BDE5C:lI99|H3BDEFC
-3BDEFC:lI101|N
-3BDD68:lH3BDDE4|H3BDDF0
-3BDDE4:t2:H3BDE6C,H3BDE74
-3BDE74:lI118|H3BDF14
-3BDF14:lI105|H3BDFC0
-3BDFC0:lI100|H3BE084
-3BE084:lI101|H3BE158
-3BE158:lI111|H3BE22C
-3BE22C:lI47|H3BE314
-3BE314:lI120|H3BE408
-3BE408:lI45|H3BE50C
-3BE50C:lI115|H3BE610
-3BE610:lI103|H3BE714
-3BE714:lI105|H3BE800
-3BE800:lI45|H3BE8E4
-3BE8E4:lI109|H3BE9D0
-3BE9D0:lI111|H3BEAC4
-3BEAC4:lI118|H3BEBB0
-3BEBB0:lI105|H3BEC9C
-3BEC9C:lI101|N
-3BDE6C:lI109|H3BDF0C
-3BDF0C:lI111|H3BDFB8
-3BDFB8:lI118|H3BE07C
-3BE07C:lI105|H3BE150
-3BE150:lI101|N
-3BDDF0:lH3BDE7C|H3BDE88
-3BDE7C:t2:H3BDF1C,H3BDF24
-3BDF24:lI118|H3BDFD0
-3BDFD0:lI105|H3BE094
-3BE094:lI100|H3BE160
-3BE160:lI101|H3BE234
-3BE234:lI111|H3BE31C
-3BE31C:lI47|H3BE410
-3BE410:lI120|H3BE514
-3BE514:lI45|H3BE618
-3BE618:lI109|H3BE71C
-3BE71C:lI115|H3BE808
-3BE808:lI118|H3BE8EC
-3BE8EC:lI105|H3BE9D8
-3BE9D8:lI100|H3BEACC
-3BEACC:lI101|H3BEBB8
-3BEBB8:lI111|N
-3BDF1C:lI97|H3BDFC8
-3BDFC8:lI118|H3BE08C
-3BE08C:lI105|N
-3BDE88:lH3BDF2C|H3BDF38
-3BDF2C:t2:H3BDFD8,H3BDFE0
-3BDFE0:lI118|H3BE0A4
-3BE0A4:lI105|H3BE168
-3BE168:lI100|H3BE23C
-3BE23C:lI101|H3BE324
-3BE324:lI111|H3BE418
-3BE418:lI47|H3BE51C
-3BE51C:lI113|H3BE620
-3BE620:lI117|H3BE724
-3BE724:lI105|H3BE810
-3BE810:lI99|H3BE8F4
-3BE8F4:lI107|H3BE9E0
-3BE9E0:lI116|H3BEAD4
-3BEAD4:lI105|H3BEBC0
-3BEBC0:lI109|H3BECA4
-3BECA4:lI101|N
-3BDFD8:lI113|H3BE09C
-3BE09C:lI116|N
-3BDF38:lH3BDFE8|H3BDFF4
-3BDFE8:t2:H3BE0AC,H3BE0B4
-3BE0B4:lI118|H3BE178
-3BE178:lI105|H3BE24C
-3BE24C:lI100|H3BE32C
-3BE32C:lI101|H3BE420
-3BE420:lI111|H3BE524
-3BE524:lI47|H3BE628
-3BE628:lI113|H3BE72C
-3BE72C:lI117|H3BE818
-3BE818:lI105|H3BE8FC
-3BE8FC:lI99|H3BE9E8
-3BE9E8:lI107|H3BEADC
-3BEADC:lI116|H3BEBC8
-3BEBC8:lI105|H3BECAC
-3BECAC:lI109|H3BED88
-3BED88:lI101|N
-3BE0AC:lI109|H3BE170
-3BE170:lI111|H3BE244
-3BE244:lI118|N
-3BDFF4:lH3BE0BC|H3BE0C8
-3BE0BC:t2:H3BE180,H3BE188
-3BE188:lI118|H3BE25C
-3BE25C:lI105|H3BE33C
-3BE33C:lI100|H3BE430
-3BE430:lI101|H3BE52C
-3BE52C:lI111|H3BE630
-3BE630:lI47|H3BE734
-3BE734:lI109|H3BE820
-3BE820:lI112|H3BE904
-3BE904:lI101|H3BE9F0
-3BE9F0:lI103|N
-3BE180:lI109|H3BE254
-3BE254:lI112|H3BE334
-3BE334:lI101|H3BE428
-3BE428:lI103|N
-3BE0C8:lH3BE190|H3BE19C
-3BE190:t2:H3BE264,H3BE26C
-3BE26C:lI118|H3BE34C
-3BE34C:lI105|H3BE440
-3BE440:lI100|H3BE534
-3BE534:lI101|H3BE638
-3BE638:lI111|H3BE73C
-3BE73C:lI47|H3BE828
-3BE828:lI109|H3BE90C
-3BE90C:lI112|H3BE9F8
-3BE9F8:lI101|H3BEAE4
-3BEAE4:lI103|N
-3BE264:lI109|H3BE344
-3BE344:lI112|H3BE438
-3BE438:lI103|N
-3BE19C:lH3BE274|H3BE280
-3BE274:t2:H3BE354,H3BE35C
-3BE35C:lI118|H3BE450
-3BE450:lI105|H3BE544
-3BE544:lI100|H3BE640
-3BE640:lI101|H3BE744
-3BE744:lI111|H3BE830
-3BE830:lI47|H3BE914
-3BE914:lI109|H3BEA00
-3BEA00:lI112|H3BEAEC
-3BEAEC:lI101|H3BEBD0
-3BEBD0:lI103|N
-3BE354:lI109|H3BE448
-3BE448:lI112|H3BE53C
-3BE53C:lI101|N
-3BE280:lH3BE364|H3BE370
-3BE364:t2:H3BE458,H3BE460
-3BE460:lI116|H3BE554
-3BE554:lI101|H3BE650
-3BE650:lI120|H3BE754
-3BE754:lI116|H3BE838
-3BE838:lI47|H3BE91C
-3BE91C:lI120|H3BEA08
-3BEA08:lI45|H3BEAF4
-3BEAF4:lI115|H3BEBD8
-3BEBD8:lI103|H3BECB4
-3BECB4:lI109|H3BED90
-3BED90:lI108|N
-3BE458:lI115|H3BE54C
-3BE54C:lI103|H3BE648
-3BE648:lI109|H3BE74C
-3BE74C:lI108|N
-3BE370:lH3BE468|H3BE474
-3BE468:t2:H3BE55C,H3BE564
-3BE564:lI116|H3BE660
-3BE660:lI101|H3BE764
-3BE764:lI120|H3BE840
-3BE840:lI116|H3BE924
-3BE924:lI47|H3BEA10
-3BEA10:lI120|H3BEAFC
-3BEAFC:lI45|H3BEBE0
-3BEBE0:lI115|H3BECBC
-3BECBC:lI103|H3BED98
-3BED98:lI109|H3BEE74
-3BEE74:lI108|N
-3BE55C:lI115|H3BE658
-3BE658:lI103|H3BE75C
-3BE75C:lI109|N
-3BE474:lH3BE56C|H3BE578
-3BE56C:t2:H3BE668,H3BE670
-3BE670:lI116|H3BE774
-3BE774:lI101|H3BE850
-3BE850:lI120|H3BE92C
-3BE92C:lI116|H3BEA18
-3BEA18:lI47|H3BEB04
-3BEB04:lI120|H3BEBE8
-3BEBE8:lI45|H3BECC4
-3BECC4:lI115|H3BEDA0
-3BEDA0:lI101|H3BEE7C
-3BEE7C:lI116|H3BEF48
-3BEF48:lI101|H3BF014
-3BF014:lI120|H3BF0E0
-3BF0E0:lI116|N
-3BE668:lI101|H3BE76C
-3BE76C:lI116|H3BE848
-3BE848:lI120|N
-3BE578:lH3BE678|H3BE684
-3BE678:t2:H3BE77C,H3BE784
-3BE784:lI116|H3BE860
-3BE860:lI101|H3BE93C
-3BE93C:lI120|H3BEA20
-3BEA20:lI116|H3BEB0C
-3BEB0C:lI47|H3BEBF0
-3BEBF0:lI116|H3BECCC
-3BECCC:lI97|H3BEDA8
-3BEDA8:lI98|H3BEE84
-3BEE84:lI45|H3BEF50
-3BEF50:lI115|H3BF01C
-3BF01C:lI101|H3BF0E8
-3BF0E8:lI112|H3BF1AC
-3BF1AC:lI97|H3BF270
-3BF270:lI114|H3BF324
-3BF324:lI97|H3BF3D0
-3BF3D0:lI116|H3BF484
-3BF484:lI101|H3BF540
-3BF540:lI100|H3BF604
-3BF604:lI45|H3BF6D8
-3BF6D8:lI118|H3BF7AC
-3BF7AC:lI97|H3BF880
-3BF880:lI108|H3BF964
-3BF964:lI117|H3BFA40
-3BFA40:lI101|H3BFB14
-3BFB14:lI115|N
-3BE77C:lI116|H3BE858
-3BE858:lI115|H3BE934
-3BE934:lI118|N
-3BE684:lH3BE78C|H3BE798
-3BE78C:t2:H3BE868,H3BE870
-3BE870:lI116|H3BE94C
-3BE94C:lI101|H3BEA30
-3BEA30:lI120|H3BEB14
-3BEB14:lI116|H3BEBF8
-3BEBF8:lI47|H3BECD4
-3BECD4:lI114|H3BEDB0
-3BEDB0:lI105|H3BEE8C
-3BEE8C:lI99|H3BEF58
-3BEF58:lI104|H3BF024
-3BF024:lI116|H3BF0F0
-3BF0F0:lI101|H3BF1B4
-3BF1B4:lI120|H3BF278
-3BF278:lI116|N
-3BE868:lI114|H3BE944
-3BE944:lI116|H3BEA28
-3BEA28:lI120|N
-3BE798:lH3BE878|H3BE884
-3BE878:t2:H3BE954,H3BE95C
-3BE95C:lI116|H3BEA40
-3BEA40:lI101|H3BEB24
-3BEB24:lI120|H3BEC00
-3BEC00:lI116|H3BECDC
-3BECDC:lI47|H3BEDB8
-3BEDB8:lI112|H3BEE94
-3BEE94:lI108|H3BEF60
-3BEF60:lI97|H3BF02C
-3BF02C:lI105|H3BF0F8
-3BF0F8:lI110|N
-3BE954:lI116|H3BEA38
-3BEA38:lI120|H3BEB1C
-3BEB1C:lI116|N
-3BE884:lH3BE964|H3BE970
-3BE964:t2:H3BEA48,H3BEA50
-3BEA50:lI116|H3BEB34
-3BEB34:lI101|H3BEC10
-3BEC10:lI120|H3BECEC
-3BECEC:lI116|H3BEDC8
-3BEDC8:lI47|H3BEE9C
-3BEE9C:lI120|H3BEF68
-3BEF68:lI45|H3BF034
-3BF034:lI115|H3BF100
-3BF100:lI101|H3BF1BC
-3BF1BC:lI114|H3BF280
-3BF280:lI118|H3BF32C
-3BF32C:lI101|H3BF3D8
-3BF3D8:lI114|H3BF48C
-3BF48C:lI45|H3BF548
-3BF548:lI112|H3BF60C
-3BF60C:lI97|H3BF6E0
-3BF6E0:lI114|H3BF7B4
-3BF7B4:lI115|H3BF888
-3BF888:lI101|H3BF96C
-3BF96C:lI100|H3BFA48
-3BFA48:lI45|H3BFB1C
-3BFB1C:lI104|H3BFBF0
-3BFBF0:lI116|H3BFCBC
-3BFCBC:lI109|H3BFD80
-3BFD80:lI108|N
-3BEA48:lI115|H3BEB2C
-3BEB2C:lI104|H3BEC08
-3BEC08:lI116|H3BECE4
-3BECE4:lI109|H3BEDC0
-3BEDC0:lI108|N
-3BE970:lH3BEA58|H3BEA64
-3BEA58:t2:H3BEB3C,H3BEB44
-3BEB44:lI116|H3BEC20
-3BEC20:lI101|H3BECFC
-3BECFC:lI120|H3BEDD8
-3BEDD8:lI116|H3BEEA4
-3BEEA4:lI47|H3BEF70
-3BEF70:lI104|H3BF03C
-3BF03C:lI116|H3BF108
-3BF108:lI109|H3BF1C4
-3BF1C4:lI108|N
-3BEB3C:lI104|H3BEC18
-3BEC18:lI116|H3BECF4
-3BECF4:lI109|H3BEDD0
-3BEDD0:lI108|N
-3BEA64:lH3BEB4C|H3BEB58
-3BEB4C:t2:H3BEC28,H3BEC30
-3BEC30:lI116|H3BED0C
-3BED0C:lI101|H3BEDE8
-3BEDE8:lI120|H3BEEAC
-3BEEAC:lI116|H3BEF78
-3BEF78:lI47|H3BF044
-3BF044:lI104|H3BF110
-3BF110:lI116|H3BF1CC
-3BF1CC:lI109|H3BF288
-3BF288:lI108|N
-3BEC28:lI104|H3BED04
-3BED04:lI116|H3BEDE0
-3BEDE0:lI109|N
-3BEB58:lH3BEC38|H3BEC44
-3BEC38:t2:H3BED14,H3BED1C
-3BED1C:lI105|H3BEDF8
-3BEDF8:lI109|H3BEEBC
-3BEEBC:lI97|H3BEF80
-3BEF80:lI103|H3BF04C
-3BF04C:lI101|H3BF118
-3BF118:lI47|H3BF1D4
-3BF1D4:lI120|H3BF290
-3BF290:lI45|H3BF334
-3BF334:lI120|H3BF3E0
-3BF3E0:lI119|H3BF494
-3BF494:lI105|H3BF550
-3BF550:lI110|H3BF614
-3BF614:lI100|H3BF6E8
-3BF6E8:lI111|H3BF7BC
-3BF7BC:lI119|H3BF890
-3BF890:lI100|H3BF974
-3BF974:lI117|H3BFA50
-3BFA50:lI109|H3BFB24
-3BFB24:lI112|N
-3BED14:lI120|H3BEDF0
-3BEDF0:lI119|H3BEEB4
-3BEEB4:lI100|N
-3BEC44:lH3BED24|H3BED30
-3BED24:t2:H3BEE00,H3BEE08
-3BEE08:lI105|H3BEECC
-3BEECC:lI109|H3BEF90
-3BEF90:lI97|H3BF054
-3BF054:lI103|H3BF120
-3BF120:lI101|H3BF1DC
-3BF1DC:lI47|H3BF298
-3BF298:lI120|H3BF33C
-3BF33C:lI45|H3BF3E8
-3BF3E8:lI120|H3BF49C
-3BF49C:lI112|H3BF558
-3BF558:lI105|H3BF61C
-3BF61C:lI120|H3BF6F0
-3BF6F0:lI109|H3BF7C4
-3BF7C4:lI97|H3BF898
-3BF898:lI112|N
-3BEE00:lI120|H3BEEC4
-3BEEC4:lI112|H3BEF88
-3BEF88:lI109|N
-3BED30:lH3BEE10|H3BEE1C
-3BEE10:t2:H3BEED4,H3BEEDC
-3BEEDC:lI105|H3BEFA0
-3BEFA0:lI109|H3BF064
-3BF064:lI97|H3BF128
-3BF128:lI103|H3BF1E4
-3BF1E4:lI101|H3BF2A0
-3BF2A0:lI47|H3BF344
-3BF344:lI120|H3BF3F0
-3BF3F0:lI45|H3BF4A4
-3BF4A4:lI120|H3BF560
-3BF560:lI98|H3BF624
-3BF624:lI105|H3BF6F8
-3BF6F8:lI116|H3BF7CC
-3BF7CC:lI109|H3BF8A0
-3BF8A0:lI97|H3BF97C
-3BF97C:lI112|N
-3BEED4:lI120|H3BEF98
-3BEF98:lI98|H3BF05C
-3BF05C:lI109|N
-3BEE1C:lH3BEEE4|H3BEEF0
-3BEEE4:t2:H3BEFA8,H3BEFB0
-3BEFB0:lI105|H3BF074
-3BF074:lI109|H3BF138
-3BF138:lI97|H3BF1EC
-3BF1EC:lI103|H3BF2A8
-3BF2A8:lI101|H3BF34C
-3BF34C:lI47|H3BF3F8
-3BF3F8:lI120|H3BF4AC
-3BF4AC:lI45|H3BF568
-3BF568:lI114|H3BF62C
-3BF62C:lI103|H3BF700
-3BF700:lI98|N
-3BEFA8:lI114|H3BF06C
-3BF06C:lI103|H3BF130
-3BF130:lI98|N
-3BEEF0:lH3BEFB8|H3BEFC4
-3BEFB8:t2:H3BF07C,H3BF084
-3BF084:lI105|H3BF148
-3BF148:lI109|H3BF1FC
-3BF1FC:lI97|H3BF2B0
-3BF2B0:lI103|H3BF354
-3BF354:lI101|H3BF400
-3BF400:lI47|H3BF4B4
-3BF4B4:lI120|H3BF570
-3BF570:lI45|H3BF634
-3BF634:lI112|H3BF708
-3BF708:lI111|H3BF7D4
-3BF7D4:lI114|H3BF8A8
-3BF8A8:lI116|H3BF984
-3BF984:lI97|H3BFA58
-3BFA58:lI98|H3BFB2C
-3BFB2C:lI108|H3BFBF8
-3BFBF8:lI101|H3BFCC4
-3BFCC4:lI45|H3BFD88
-3BFD88:lI112|H3BFE44
-3BFE44:lI105|H3BFEF0
-3BFEF0:lI120|H3BFFA4
-3BFFA4:lI109|H3C0050
-3C0050:lI97|H3C00FC
-3C00FC:lI112|N
-3BF07C:lI112|H3BF140
-3BF140:lI112|H3BF1F4
-3BF1F4:lI109|N
-3BEFC4:lH3BF08C|H3BF098
-3BF08C:t2:H3BF150,H3BF158
-3BF158:lI105|H3BF20C
-3BF20C:lI109|H3BF2C0
-3BF2C0:lI97|H3BF35C
-3BF35C:lI103|H3BF408
-3BF408:lI101|H3BF4BC
-3BF4BC:lI47|H3BF578
-3BF578:lI120|H3BF63C
-3BF63C:lI45|H3BF710
-3BF710:lI112|H3BF7DC
-3BF7DC:lI111|H3BF8B0
-3BF8B0:lI114|H3BF98C
-3BF98C:lI116|H3BFA60
-3BFA60:lI97|H3BFB34
-3BFB34:lI98|H3BFC00
-3BFC00:lI108|H3BFCCC
-3BFCCC:lI101|H3BFD90
-3BFD90:lI45|H3BFE4C
-3BFE4C:lI103|H3BFEF8
-3BFEF8:lI114|H3BFFAC
-3BFFAC:lI97|H3C0058
-3C0058:lI121|H3C0104
-3C0104:lI109|H3C01A8
-3C01A8:lI97|H3C025C
-3C025C:lI112|N
-3BF150:lI112|H3BF204
-3BF204:lI103|H3BF2B8
-3BF2B8:lI109|N
-3BF098:lH3BF160|H3BF16C
-3BF160:t2:H3BF214,H3BF21C
-3BF21C:lI105|H3BF2D0
-3BF2D0:lI109|H3BF36C
-3BF36C:lI97|H3BF410
-3BF410:lI103|H3BF4C4
-3BF4C4:lI101|H3BF580
-3BF580:lI47|H3BF644
-3BF644:lI120|H3BF718
-3BF718:lI45|H3BF7E4
-3BF7E4:lI112|H3BF8B8
-3BF8B8:lI111|H3BF994
-3BF994:lI114|H3BFA68
-3BFA68:lI116|H3BFB3C
-3BFB3C:lI97|H3BFC08
-3BFC08:lI98|H3BFCD4
-3BFCD4:lI108|H3BFD98
-3BFD98:lI101|H3BFE54
-3BFE54:lI45|H3BFF00
-3BFF00:lI98|H3BFFB4
-3BFFB4:lI105|H3C0060
-3C0060:lI116|H3C010C
-3C010C:lI109|H3C01B0
-3C01B0:lI97|H3C0264
-3C0264:lI112|N
-3BF214:lI112|H3BF2C8
-3BF2C8:lI98|H3BF364
-3BF364:lI109|N
-3BF16C:lH3BF224|H3BF230
-3BF224:t2:H3BF2D8,H3BF2E0
-3BF2E0:lI105|H3BF37C
-3BF37C:lI109|H3BF420
-3BF420:lI97|H3BF4CC
-3BF4CC:lI103|H3BF588
-3BF588:lI101|H3BF64C
-3BF64C:lI47|H3BF720
-3BF720:lI120|H3BF7EC
-3BF7EC:lI45|H3BF8C0
-3BF8C0:lI112|H3BF99C
-3BF99C:lI111|H3BFA70
-3BFA70:lI114|H3BFB44
-3BFB44:lI116|H3BFC10
-3BFC10:lI97|H3BFCDC
-3BFCDC:lI98|H3BFDA0
-3BFDA0:lI108|H3BFE5C
-3BFE5C:lI101|H3BFF08
-3BFF08:lI45|H3BFFBC
-3BFFBC:lI97|H3C0068
-3C0068:lI110|H3C0114
-3C0114:lI121|H3C01B8
-3C01B8:lI109|H3C026C
-3C026C:lI97|H3C0318
-3C0318:lI112|N
-3BF2D8:lI112|H3BF374
-3BF374:lI110|H3BF418
-3BF418:lI109|N
-3BF230:lH3BF2E8|H3BF2F4
-3BF2E8:t2:H3BF384,H3BF38C
-3BF38C:lI105|H3BF430
-3BF430:lI109|H3BF4DC
-3BF4DC:lI97|H3BF590
-3BF590:lI103|H3BF654
-3BF654:lI101|H3BF728
-3BF728:lI47|H3BF7F4
-3BF7F4:lI120|H3BF8C8
-3BF8C8:lI45|H3BF9A4
-3BF9A4:lI99|H3BFA78
-3BFA78:lI109|H3BFB4C
-3BFB4C:lI117|H3BFC18
-3BFC18:lI45|H3BFCE4
-3BFCE4:lI114|H3BFDA8
-3BFDA8:lI97|H3BFE64
-3BFE64:lI115|H3BFF10
-3BFF10:lI116|H3BFFC4
-3BFFC4:lI101|H3C0070
-3C0070:lI114|N
-3BF384:lI114|H3BF428
-3BF428:lI97|H3BF4D4
-3BF4D4:lI115|N
-3BF2F4:lH3BF394|H3BF3A0
-3BF394:t2:H3BF438,H3BF440
-3BF440:lI105|H3BF4EC
-3BF4EC:lI109|H3BF5A0
-3BF5A0:lI97|H3BF664
-3BF664:lI103|H3BF730
-3BF730:lI101|H3BF7FC
-3BF7FC:lI47|H3BF8D0
-3BF8D0:lI116|H3BF9AC
-3BF9AC:lI105|H3BFA80
-3BFA80:lI102|H3BFB54
-3BFB54:lI102|N
-3BF438:lI116|H3BF4E4
-3BF4E4:lI105|H3BF598
-3BF598:lI102|H3BF65C
-3BF65C:lI102|N
-3BF3A0:lH3BF448|H3BF454
-3BF448:t2:H3BF4F4,H3BF4FC
-3BF4FC:lI105|H3BF5B0
-3BF5B0:lI109|H3BF674
-3BF674:lI97|H3BF738
-3BF738:lI103|H3BF804
-3BF804:lI101|H3BF8D8
-3BF8D8:lI47|H3BF9B4
-3BF9B4:lI116|H3BFA88
-3BFA88:lI105|H3BFB5C
-3BFB5C:lI102|H3BFC20
-3BFC20:lI102|N
-3BF4F4:lI116|H3BF5A8
-3BF5A8:lI105|H3BF66C
-3BF66C:lI102|N
-3BF454:lH3BF504|H3BF510
-3BF504:t2:H3BF5B8,H3BF5C0
-3BF5C0:lI105|H3BF684
-3BF684:lI109|H3BF748
-3BF748:lI97|H3BF80C
-3BF80C:lI103|H3BF8E0
-3BF8E0:lI101|H3BF9BC
-3BF9BC:lI47|H3BFA90
-3BFA90:lI112|H3BFB64
-3BFB64:lI110|H3BFC28
-3BFC28:lI103|N
-3BF5B8:lI112|H3BF67C
-3BF67C:lI110|H3BF740
-3BF740:lI103|N
-3BF510:lH3BF5C8|H3BF5D4
-3BF5C8:t2:H3BF68C,H3BF694
-3BF694:lI105|H3BF758
-3BF758:lI109|H3BF81C
-3BF81C:lI97|H3BF8F0
-3BF8F0:lI103|H3BF9C4
-3BF9C4:lI101|H3BFA98
-3BFA98:lI47|H3BFB6C
-3BFB6C:lI106|H3BFC30
-3BFC30:lI112|H3BFCEC
-3BFCEC:lI101|H3BFDB0
-3BFDB0:lI103|N
-3BF68C:lI106|H3BF750
-3BF750:lI112|H3BF814
-3BF814:lI101|H3BF8E8
-3BF8E8:lI103|N
-3BF5D4:lH3BF69C|H3BF6A8
-3BF69C:t2:H3BF760,H3BF768
-3BF768:lI105|H3BF82C
-3BF82C:lI109|H3BF900
-3BF900:lI97|H3BF9CC
-3BF9CC:lI103|H3BFAA0
-3BFAA0:lI101|H3BFB74
-3BFB74:lI47|H3BFC38
-3BFC38:lI106|H3BFCF4
-3BFCF4:lI112|H3BFDB8
-3BFDB8:lI101|H3BFE6C
-3BFE6C:lI103|N
-3BF760:lI106|H3BF824
-3BF824:lI112|H3BF8F8
-3BF8F8:lI103|N
-3BF6A8:lH3BF770|H3BF77C
-3BF770:t2:H3BF834,H3BF83C
-3BF83C:lI105|H3BF910
-3BF910:lI109|H3BF9DC
-3BF9DC:lI97|H3BFAA8
-3BFAA8:lI103|H3BFB7C
-3BFB7C:lI101|H3BFC40
-3BFC40:lI47|H3BFCFC
-3BFCFC:lI106|H3BFDC0
-3BFDC0:lI112|H3BFE74
-3BFE74:lI101|H3BFF18
-3BFF18:lI103|N
-3BF834:lI106|H3BF908
-3BF908:lI112|H3BF9D4
-3BF9D4:lI101|N
-3BF77C:lH3BF844|H3BF850
-3BF844:t2:H3BF918,H3BF920
-3BF920:lI105|H3BF9EC
-3BF9EC:lI109|H3BFAB8
-3BFAB8:lI97|H3BFB84
-3BFB84:lI103|H3BFC48
-3BFC48:lI101|H3BFD04
-3BFD04:lI47|H3BFDC8
-3BFDC8:lI105|H3BFE7C
-3BFE7C:lI101|H3BFF20
-3BFF20:lI102|N
-3BF918:lI105|H3BF9E4
-3BF9E4:lI101|H3BFAB0
-3BFAB0:lI102|N
-3BF850:lH3BF928|H3BF934
-3BF928:t2:H3BF9F4,H3BF9FC
-3BF9FC:lI105|H3BFAC8
-3BFAC8:lI109|H3BFB94
-3BFB94:lI97|H3BFC50
-3BFC50:lI103|H3BFD0C
-3BFD0C:lI101|H3BFDD0
-3BFDD0:lI47|H3BFE84
-3BFE84:lI103|H3BFF28
-3BFF28:lI105|H3BFFCC
-3BFFCC:lI102|N
-3BF9F4:lI103|H3BFAC0
-3BFAC0:lI105|H3BFB8C
-3BFB8C:lI102|N
-3BF934:lH3BFA04|H3BFA10
-3BFA04:t2:H3BFAD0,H3BFAD8
-3BFAD8:lI99|H3BFBA4
-3BFBA4:lI104|H3BFC60
-3BFC60:lI101|H3BFD14
-3BFD14:lI109|H3BFDD8
-3BFDD8:lI105|H3BFE8C
-3BFE8C:lI99|H3BFF30
-3BFF30:lI97|H3BFFD4
-3BFFD4:lI108|H3C0078
-3C0078:lI47|H3C011C
-3C011C:lI120|H3C01C0
-3C01C0:lI45|H3C0274
-3C0274:lI112|H3C0320
-3C0320:lI100|H3C03CC
-3C03CC:lI98|N
-3BFAD0:lI112|H3BFB9C
-3BFB9C:lI100|H3BFC58
-3BFC58:lI98|N
-3BFA10:lH3BFAE0|H3BFAEC
-3BFAE0:t2:H3BFBAC,H3BFBB4
-3BFBB4:lI99|H3BFC70
-3BFC70:lI104|H3BFD24
-3BFD24:lI101|H3BFDE0
-3BFDE0:lI109|H3BFE94
-3BFE94:lI105|H3BFF38
-3BFF38:lI99|H3BFFDC
-3BFFDC:lI97|H3C0080
-3C0080:lI108|H3C0124
-3C0124:lI47|H3C01C8
-3C01C8:lI120|H3C027C
-3C027C:lI45|H3C0328
-3C0328:lI112|H3C03D4
-3C03D4:lI100|H3C0460
-3C0460:lI98|N
-3BFBAC:lI120|H3BFC68
-3BFC68:lI121|H3BFD1C
-3BFD1C:lI122|N
-3BFAEC:lH3BFBBC|H3BFBC8
-3BFBBC:t2:H3BFC78,H3BFC80
-3BFC80:lI97|H3BFD34
-3BFD34:lI117|H3BFDF0
-3BFDF0:lI100|H3BFE9C
-3BFE9C:lI105|H3BFF40
-3BFF40:lI111|H3BFFE4
-3BFFE4:lI47|H3C0088
-3C0088:lI120|H3C012C
-3C012C:lI45|H3C01D0
-3C01D0:lI119|H3C0284
-3C0284:lI97|H3C0330
-3C0330:lI118|N
-3BFC78:lI119|H3BFD2C
-3BFD2C:lI97|H3BFDE8
-3BFDE8:lI118|N
-3BFBC8:lH3BFC88|H3BFC94
-3BFC88:t2:H3BFD3C,H3BFD44
-3BFD44:lI97|H3BFE00
-3BFE00:lI117|H3BFEA4
-3BFEA4:lI100|H3BFF48
-3BFF48:lI105|H3BFFEC
-3BFFEC:lI111|H3C0090
-3C0090:lI47|H3C0134
-3C0134:lI120|H3C01D8
-3C01D8:lI45|H3C028C
-3C028C:lI114|H3C0338
-3C0338:lI101|H3C03DC
-3C03DC:lI97|H3C0468
-3C0468:lI108|H3C04FC
-3C04FC:lI97|H3C0598
-3C0598:lI117|H3C063C
-3C063C:lI100|H3C06E8
-3C06E8:lI105|H3C0794
-3C0794:lI111|N
-3BFD3C:lI114|H3BFDF8
-3BFDF8:lI97|N
-3BFC94:lH3BFD4C|H3BFD58
-3BFD4C:t2:H3BFE08,H3BFE10
-3BFE10:lI97|H3BFEB4
-3BFEB4:lI117|H3BFF58
-3BFF58:lI100|H3BFFF4
-3BFFF4:lI105|H3C0098
-3C0098:lI111|H3C013C
-3C013C:lI47|H3C01E0
-3C01E0:lI120|H3C0294
-3C0294:lI45|H3C0340
-3C0340:lI112|H3C03E4
-3C03E4:lI110|H3C0470
-3C0470:lI45|H3C0504
-3C0504:lI114|H3C05A0
-3C05A0:lI101|H3C0644
-3C0644:lI97|H3C06F0
-3C06F0:lI108|H3C079C
-3C079C:lI97|H3C0838
-3C0838:lI117|H3C08C4
-3C08C4:lI100|H3C0958
-3C0958:lI105|H3C09EC
-3C09EC:lI111|H3C0A88
-3C0A88:lI45|H3C0B2C
-3C0B2C:lI112|H3C0BD0
-3C0BD0:lI108|H3C0C84
-3C0C84:lI117|H3C0D38
-3C0D38:lI103|H3C0DEC
-3C0DEC:lI105|H3C0EA0
-3C0EA0:lI110|N
-3BFE08:lI114|H3BFEAC
-3BFEAC:lI112|H3BFF50
-3BFF50:lI109|N
-3BFD58:lH3BFE18|H3BFE24
-3BFE18:t2:H3BFEBC,H3BFEC4
-3BFEC4:lI97|H3BFF68
-3BFF68:lI117|H3C0004
-3C0004:lI100|H3C00A0
-3C00A0:lI105|H3C0144
-3C0144:lI111|H3C01E8
-3C01E8:lI47|H3C029C
-3C029C:lI120|H3C0348
-3C0348:lI45|H3C03EC
-3C03EC:lI112|H3C0478
-3C0478:lI110|H3C050C
-3C050C:lI45|H3C05A8
-3C05A8:lI114|H3C064C
-3C064C:lI101|H3C06F8
-3C06F8:lI97|H3C07A4
-3C07A4:lI108|H3C0840
-3C0840:lI97|H3C08CC
-3C08CC:lI117|H3C0960
-3C0960:lI100|H3C09F4
-3C09F4:lI105|H3C0A90
-3C0A90:lI111|N
-3BFEBC:lI114|H3BFF60
-3BFF60:lI97|H3BFFFC
-3BFFFC:lI109|N
-3BFE24:lH3BFECC|H3BFED8
-3BFECC:t2:H3BFF70,H3BFF78
-3BFF78:lI97|H3C0014
-3C0014:lI117|H3C00B0
-3C00B0:lI100|H3C014C
-3C014C:lI105|H3C01F0
-3C01F0:lI111|H3C02A4
-3C02A4:lI47|H3C0350
-3C0350:lI120|H3C03F4
-3C03F4:lI45|H3C0480
-3C0480:lI97|H3C0514
-3C0514:lI105|H3C05B0
-3C05B0:lI102|H3C0654
-3C0654:lI102|N
-3BFF70:lI97|H3C000C
-3C000C:lI105|H3C00A8
-3C00A8:lI102|N
-3BFED8:lH3BFF80|H3BFF8C
-3BFF80:t2:H3C001C,H3C0024
-3C0024:lI97|H3C00C0
-3C00C0:lI117|H3C015C
-3C015C:lI100|H3C0200
-3C0200:lI105|H3C02AC
-3C02AC:lI111|H3C0358
-3C0358:lI47|H3C03FC
-3C03FC:lI120|H3C0488
-3C0488:lI45|H3C051C
-3C051C:lI97|H3C05B8
-3C05B8:lI105|H3C065C
-3C065C:lI102|H3C0700
-3C0700:lI102|N
-3C001C:lI97|H3C00B8
-3C00B8:lI105|H3C0154
-3C0154:lI102|H3C01F8
-3C01F8:lI102|N
-3BFF8C:lH3C002C|H3C0038
-3C002C:t2:H3C00C8,H3C00D0
-3C00D0:lI97|H3C016C
-3C016C:lI117|H3C0210
-3C0210:lI100|H3C02BC
-3C02BC:lI105|H3C0360
-3C0360:lI111|H3C0404
-3C0404:lI47|H3C0490
-3C0490:lI120|H3C0524
-3C0524:lI45|H3C05C0
-3C05C0:lI97|H3C0664
-3C0664:lI105|H3C0708
-3C0708:lI102|H3C07AC
-3C07AC:lI102|N
-3C00C8:lI97|H3C0164
-3C0164:lI105|H3C0208
-3C0208:lI102|H3C02B4
-3C02B4:lI99|N
-3C0038:lH3C00D8|H3C00E4
-3C00D8:t2:H3C0174,H3C017C
-3C017C:lI97|H3C0220
-3C0220:lI117|H3C02CC
-3C02CC:lI100|H3C0370
-3C0370:lI105|H3C040C
-3C040C:lI111|H3C0498
-3C0498:lI47|H3C052C
-3C052C:lI109|H3C05C8
-3C05C8:lI112|H3C066C
-3C066C:lI101|H3C0710
-3C0710:lI103|N
-3C0174:lI109|H3C0218
-3C0218:lI112|H3C02C4
-3C02C4:lI103|H3C0368
-3C0368:lI97|N
-3C00E4:lH3C0184|H3C0190
-3C0184:t2:H3C0228,H3C0230
-3C0230:lI97|H3C02DC
-3C02DC:lI117|H3C0380
-3C0380:lI100|H3C0414
-3C0414:lI105|H3C04A0
-3C04A0:lI111|H3C0534
-3C0534:lI47|H3C05D0
-3C05D0:lI109|H3C0674
-3C0674:lI112|H3C0718
-3C0718:lI101|H3C07B4
-3C07B4:lI103|N
-3C0228:lI109|H3C02D4
-3C02D4:lI112|H3C0378
-3C0378:lI50|N
-3C0190:lH3C0238|H3C0244
-3C0238:t2:H3C02E4,H3C02EC
-3C02EC:lI97|H3C0390
-3C0390:lI117|H3C041C
-3C041C:lI100|H3C04A8
-3C04A8:lI105|H3C053C
-3C053C:lI111|H3C05D8
-3C05D8:lI47|H3C067C
-3C067C:lI98|H3C0720
-3C0720:lI97|H3C07BC
-3C07BC:lI115|H3C0848
-3C0848:lI105|H3C08D4
-3C08D4:lI99|N
-3C02E4:lI97|H3C0388
-3C0388:lI117|N
-3C0244:lH3C02F4|H3C0300
-3C02F4:t2:H3C0398,H3C03A0
-3C03A0:lI97|H3C042C
-3C042C:lI117|H3C04B8
-3C04B8:lI100|H3C0544
-3C0544:lI105|H3C05E0
-3C05E0:lI111|H3C0684
-3C0684:lI47|H3C0728
-3C0728:lI98|H3C07C4
-3C07C4:lI97|H3C0850
-3C0850:lI115|H3C08DC
-3C08DC:lI105|H3C0968
-3C0968:lI99|N
-3C0398:lI115|H3C0424
-3C0424:lI110|H3C04B0
-3C04B0:lI100|N
-3C0300:lH3C03A8|H3C03B4
-3C03A8:t2:H3C0434,H3C043C
-3C043C:lI97|H3C04C8
-3C04C8:lI112|H3C0554
-3C0554:lI112|H3C05E8
-3C05E8:lI108|H3C068C
-3C068C:lI105|H3C0730
-3C0730:lI99|H3C07CC
-3C07CC:lI97|H3C0858
-3C0858:lI116|H3C08E4
-3C08E4:lI105|H3C0970
-3C0970:lI111|H3C09FC
-3C09FC:lI110|H3C0A98
-3C0A98:lI47|H3C0B34
-3C0B34:lI122|H3C0BD8
-3C0BD8:lI105|H3C0C8C
-3C0C8C:lI112|N
-3C0434:lI122|H3C04C0
-3C04C0:lI105|H3C054C
-3C054C:lI112|N
-3C03B4:lH3C0444|H3C0450
-3C0444:t2:H3C04D0,H3C04D8
-3C04D8:lI97|H3C0564
-3C0564:lI112|H3C05F8
-3C05F8:lI112|H3C0694
-3C0694:lI108|H3C0738
-3C0738:lI105|H3C07D4
-3C07D4:lI99|H3C0860
-3C0860:lI97|H3C08EC
-3C08EC:lI116|H3C0978
-3C0978:lI105|H3C0A04
-3C0A04:lI111|H3C0AA0
-3C0AA0:lI110|H3C0B3C
-3C0B3C:lI47|H3C0BE0
-3C0BE0:lI120|H3C0C94
-3C0C94:lI45|H3C0D40
-3C0D40:lI119|H3C0DF4
-3C0DF4:lI97|H3C0EA8
-3C0EA8:lI105|H3C0F64
-3C0F64:lI115|H3C1030
-3C1030:lI45|H3C1104
-3C1104:lI115|H3C11D8
-3C11D8:lI111|H3C12A4
-3C12A4:lI117|H3C1378
-3C1378:lI114|H3C1454
-3C1454:lI99|H3C1538
-3C1538:lI101|N
-3C04D0:lI115|H3C055C
-3C055C:lI114|H3C05F0
-3C05F0:lI99|N
-3C0450:lH3C04E0|H3C04EC
-3C04E0:t2:H3C056C,H3C0574
-3C0574:lI97|H3C0608
-3C0608:lI112|H3C06A4
-3C06A4:lI112|H3C0748
-3C0748:lI108|H3C07E4
-3C07E4:lI105|H3C0868
-3C0868:lI99|H3C08F4
-3C08F4:lI97|H3C0980
-3C0980:lI116|H3C0A0C
-3C0A0C:lI105|H3C0AA8
-3C0AA8:lI111|H3C0B44
-3C0B44:lI110|H3C0BE8
-3C0BE8:lI47|H3C0C9C
-3C0C9C:lI120|H3C0D48
-3C0D48:lI45|H3C0DFC
-3C0DFC:lI117|H3C0EB0
-3C0EB0:lI115|H3C0F6C
-3C0F6C:lI116|H3C1038
-3C1038:lI97|H3C110C
-3C110C:lI114|N
-3C056C:lI117|H3C0600
-3C0600:lI115|H3C069C
-3C069C:lI116|H3C0740
-3C0740:lI97|H3C07DC
-3C07DC:lI114|N
-3C04EC:lH3C057C|H3C0588
-3C057C:t2:H3C0610,H3C0618
-3C0618:lI97|H3C06B4
-3C06B4:lI112|H3C0750
-3C0750:lI112|H3C07EC
-3C07EC:lI108|H3C0870
-3C0870:lI105|H3C08FC
-3C08FC:lI99|H3C0988
-3C0988:lI97|H3C0A14
-3C0A14:lI116|H3C0AB0
-3C0AB0:lI105|H3C0B4C
-3C0B4C:lI111|H3C0BF0
-3C0BF0:lI110|H3C0CA4
-3C0CA4:lI47|H3C0D50
-3C0D50:lI120|H3C0E04
-3C0E04:lI45|H3C0EB8
-3C0EB8:lI116|H3C0F74
-3C0F74:lI114|H3C1040
-3C1040:lI111|H3C1114
-3C1114:lI102|H3C11E0
-3C11E0:lI102|H3C12AC
-3C12AC:lI45|H3C1380
-3C1380:lI109|H3C145C
-3C145C:lI115|N
-3C0610:lI109|H3C06AC
-3C06AC:lI115|N
-3C0588:lH3C0620|H3C062C
-3C0620:t2:H3C06BC,H3C06C4
-3C06C4:lI97|H3C0760
-3C0760:lI112|H3C07F4
-3C07F4:lI112|H3C0878
-3C0878:lI108|H3C0904
-3C0904:lI105|H3C0990
-3C0990:lI99|H3C0A1C
-3C0A1C:lI97|H3C0AB8
-3C0AB8:lI116|H3C0B54
-3C0B54:lI105|H3C0BF8
-3C0BF8:lI111|H3C0CAC
-3C0CAC:lI110|H3C0D58
-3C0D58:lI47|H3C0E0C
-3C0E0C:lI120|H3C0EC0
-3C0EC0:lI45|H3C0F7C
-3C0F7C:lI116|H3C1048
-3C1048:lI114|H3C111C
-3C111C:lI111|H3C11E8
-3C11E8:lI102|H3C12B4
-3C12B4:lI102|H3C1388
-3C1388:lI45|H3C1464
-3C1464:lI109|H3C1540
-3C1540:lI101|N
-3C06BC:lI109|H3C0758
-3C0758:lI101|N
-3C062C:lH3C06CC|H3C06D8
-3C06CC:t2:H3C0768,H3C0770
-3C0770:lI97|H3C0804
-3C0804:lI112|H3C0888
-3C0888:lI112|H3C090C
-3C090C:lI108|H3C0998
-3C0998:lI105|H3C0A24
-3C0A24:lI99|H3C0AC0
-3C0AC0:lI97|H3C0B5C
-3C0B5C:lI116|H3C0C00
-3C0C00:lI105|H3C0CB4
-3C0CB4:lI111|H3C0D60
-3C0D60:lI110|H3C0E14
-3C0E14:lI47|H3C0EC8
-3C0EC8:lI120|H3C0F84
-3C0F84:lI45|H3C1050
-3C1050:lI116|H3C1124
-3C1124:lI114|H3C11F0
-3C11F0:lI111|H3C12BC
-3C12BC:lI102|H3C1390
-3C1390:lI102|H3C146C
-3C146C:lI45|H3C1548
-3C1548:lI109|H3C161C
-3C161C:lI97|H3C16F0
-3C16F0:lI110|N
-3C0768:lI109|H3C07FC
-3C07FC:lI97|H3C0880
-3C0880:lI110|N
-3C06D8:lH3C0778|H3C0784
-3C0778:t2:H3C080C,H3C0814
-3C0814:lI97|H3C0890
-3C0890:lI112|H3C0914
-3C0914:lI112|H3C09A0
-3C09A0:lI108|H3C0A2C
-3C0A2C:lI105|H3C0AC8
-3C0AC8:lI99|H3C0B64
-3C0B64:lI97|H3C0C08
-3C0C08:lI116|H3C0CBC
-3C0CBC:lI105|H3C0D68
-3C0D68:lI111|H3C0E1C
-3C0E1C:lI110|H3C0ED0
-3C0ED0:lI47|H3C0F8C
-3C0F8C:lI120|H3C1058
-3C1058:lI45|H3C112C
-3C112C:lI116|H3C11F8
-3C11F8:lI114|H3C12C4
-3C12C4:lI111|H3C1398
-3C1398:lI102|H3C1474
-3C1474:lI102|N
-3C080C:lI116|N
-3C0784:lH3C081C|H3C0828
-3C081C:t2:H3C0898,H3C08A0
-3C08A0:lI97|H3C0924
-3C0924:lI112|H3C09A8
-3C09A8:lI112|H3C0A34
-3C0A34:lI108|H3C0AD0
-3C0AD0:lI105|H3C0B6C
-3C0B6C:lI99|H3C0C10
-3C0C10:lI97|H3C0CC4
-3C0CC4:lI116|H3C0D70
-3C0D70:lI105|H3C0E24
-3C0E24:lI111|H3C0ED8
-3C0ED8:lI110|H3C0F94
-3C0F94:lI47|H3C1060
-3C1060:lI120|H3C1134
-3C1134:lI45|H3C1200
-3C1200:lI116|H3C12CC
-3C12CC:lI114|H3C13A0
-3C13A0:lI111|H3C147C
-3C147C:lI102|H3C1550
-3C1550:lI102|N
-3C0898:lI116|H3C091C
-3C091C:lI114|N
-3C0828:lH3C08A8|H3C08B4
-3C08A8:t2:H3C092C,H3C0934
-3C0934:lI97|H3C09B8
-3C09B8:lI112|H3C0A44
-3C0A44:lI112|H3C0AE0
-3C0AE0:lI108|H3C0B74
-3C0B74:lI105|H3C0C18
-3C0C18:lI99|H3C0CCC
-3C0CCC:lI97|H3C0D78
-3C0D78:lI116|H3C0E2C
-3C0E2C:lI105|H3C0EE0
-3C0EE0:lI111|H3C0F9C
-3C0F9C:lI110|H3C1068
-3C1068:lI47|H3C113C
-3C113C:lI120|H3C1208
-3C1208:lI45|H3C12D4
-3C12D4:lI116|H3C13A8
-3C13A8:lI114|H3C1484
-3C1484:lI111|H3C1558
-3C1558:lI102|H3C1624
-3C1624:lI102|N
-3C092C:lI114|H3C09B0
-3C09B0:lI111|H3C0A3C
-3C0A3C:lI102|H3C0AD8
-3C0AD8:lI102|N
-3C08B4:lH3C093C|H3C0948
-3C093C:t2:H3C09C0,H3C09C8
-3C09C8:lI97|H3C0A54
-3C0A54:lI112|H3C0AF0
-3C0AF0:lI112|H3C0B84
-3C0B84:lI108|H3C0C28
-3C0C28:lI105|H3C0CDC
-3C0CDC:lI99|H3C0D88
-3C0D88:lI97|H3C0E34
-3C0E34:lI116|H3C0EE8
-3C0EE8:lI105|H3C0FA4
-3C0FA4:lI111|H3C1070
-3C1070:lI110|H3C1144
-3C1144:lI47|H3C1210
-3C1210:lI120|H3C12DC
-3C12DC:lI45|H3C13B0
-3C13B0:lI116|H3C148C
-3C148C:lI101|H3C1560
-3C1560:lI120|H3C162C
-3C162C:lI105|H3C16F8
-3C16F8:lI110|H3C17BC
-3C17BC:lI102|H3C1880
-3C1880:lI111|N
-3C09C0:lI116|H3C0A4C
-3C0A4C:lI101|H3C0AE8
-3C0AE8:lI120|H3C0B7C
-3C0B7C:lI105|H3C0C20
-3C0C20:lI110|H3C0CD4
-3C0CD4:lI102|H3C0D80
-3C0D80:lI111|N
-3C0948:lH3C09D0|H3C09DC
-3C09D0:t2:H3C0A5C,H3C0A64
-3C0A64:lI97|H3C0B00
-3C0B00:lI112|H3C0B94
-3C0B94:lI112|H3C0C38
-3C0C38:lI108|H3C0CE4
-3C0CE4:lI105|H3C0D90
-3C0D90:lI99|H3C0E3C
-3C0E3C:lI97|H3C0EF0
-3C0EF0:lI116|H3C0FAC
-3C0FAC:lI105|H3C1078
-3C1078:lI111|H3C114C
-3C114C:lI110|H3C1218
-3C1218:lI47|H3C12E4
-3C12E4:lI120|H3C13B8
-3C13B8:lI45|H3C1494
-3C1494:lI116|H3C1568
-3C1568:lI101|H3C1634
-3C1634:lI120|H3C1700
-3C1700:lI105|H3C17C4
-3C17C4:lI110|H3C1888
-3C1888:lI102|H3C1944
-3C1944:lI111|N
-3C0A5C:lI116|H3C0AF8
-3C0AF8:lI101|H3C0B8C
-3C0B8C:lI120|H3C0C30
-3C0C30:lI105|N
-3C09DC:lH3C0A6C|H3C0A78
-3C0A6C:t2:H3C0B08,H3C0B10
-3C0B10:lI97|H3C0BA4
-3C0BA4:lI112|H3C0C48
-3C0C48:lI112|H3C0CEC
-3C0CEC:lI108|H3C0D98
-3C0D98:lI105|H3C0E44
-3C0E44:lI99|H3C0EF8
-3C0EF8:lI97|H3C0FB4
-3C0FB4:lI116|H3C1080
-3C1080:lI105|H3C1154
-3C1154:lI111|H3C1220
-3C1220:lI110|H3C12EC
-3C12EC:lI47|H3C13C0
-3C13C0:lI120|H3C149C
-3C149C:lI45|H3C1570
-3C1570:lI116|H3C163C
-3C163C:lI101|H3C1708
-3C1708:lI120|N
-3C0B08:lI116|H3C0B9C
-3C0B9C:lI101|H3C0C40
-3C0C40:lI120|N
-3C0A78:lH3C0B18|H3C0B24
-3C0B18:t2:H3C0BAC,H3C0BB4
-3C0BB4:lI97|H3C0C58
-3C0C58:lI112|H3C0CFC
-3C0CFC:lI112|H3C0DA0
-3C0DA0:lI108|H3C0E4C
-3C0E4C:lI105|H3C0F00
-3C0F00:lI99|H3C0FBC
-3C0FBC:lI97|H3C1088
-3C1088:lI116|H3C115C
-3C115C:lI105|H3C1228
-3C1228:lI111|H3C12F4
-3C12F4:lI110|H3C13C8
-3C13C8:lI47|H3C14A4
-3C14A4:lI120|H3C1578
-3C1578:lI45|H3C1644
-3C1644:lI116|H3C1710
-3C1710:lI99|H3C17CC
-3C17CC:lI108|N
-3C0BAC:lI116|H3C0C50
-3C0C50:lI99|H3C0CF4
-3C0CF4:lI108|N
-3C0B24:lH3C0BBC|H3C0BC8
-3C0BBC:t2:H3C0C60,H3C0C68
-3C0C68:lI97|H3C0D0C
-3C0D0C:lI112|H3C0DB0
-3C0DB0:lI112|H3C0E54
-3C0E54:lI108|H3C0F08
-3C0F08:lI105|H3C0FC4
-3C0FC4:lI99|H3C1090
-3C1090:lI97|H3C1164
-3C1164:lI116|H3C1230
-3C1230:lI105|H3C12FC
-3C12FC:lI111|H3C13D0
-3C13D0:lI110|H3C14AC
-3C14AC:lI47|H3C1580
-3C1580:lI120|H3C164C
-3C164C:lI45|H3C1718
-3C1718:lI116|H3C17D4
-3C17D4:lI97|H3C1890
-3C1890:lI114|N
-3C0C60:lI116|H3C0D04
-3C0D04:lI97|H3C0DA8
-3C0DA8:lI114|N
-3C0BC8:lH3C0C70|H3C0C7C
-3C0C70:t2:H3C0D14,H3C0D1C
-3C0D1C:lI97|H3C0DC0
-3C0DC0:lI112|H3C0E64
-3C0E64:lI112|H3C0F18
-3C0F18:lI108|H3C0FD4
-3C0FD4:lI105|H3C10A0
-3C10A0:lI99|H3C116C
-3C116C:lI97|H3C1238
-3C1238:lI116|H3C1304
-3C1304:lI105|H3C13D8
-3C13D8:lI111|H3C14B4
-3C14B4:lI110|H3C1588
-3C1588:lI47|H3C1654
-3C1654:lI120|H3C1720
-3C1720:lI45|H3C17DC
-3C17DC:lI115|H3C1898
-3C1898:lI118|H3C194C
-3C194C:lI52|H3C1A00
-3C1A00:lI99|H3C1AB4
-3C1AB4:lI114|H3C1B78
-3C1B78:lI99|N
-3C0D14:lI115|H3C0DB8
-3C0DB8:lI118|H3C0E5C
-3C0E5C:lI52|H3C0F10
-3C0F10:lI99|H3C0FCC
-3C0FCC:lI114|H3C1098
-3C1098:lI99|N
-3C0C7C:lH3C0D24|H3C0D30
-3C0D24:t2:H3C0DC8,H3C0DD0
-3C0DD0:lI97|H3C0E74
-3C0E74:lI112|H3C0F28
-3C0F28:lI112|H3C0FE4
-3C0FE4:lI108|H3C10B0
-3C10B0:lI105|H3C117C
-3C117C:lI99|H3C1248
-3C1248:lI97|H3C130C
-3C130C:lI116|H3C13E0
-3C13E0:lI105|H3C14BC
-3C14BC:lI111|H3C1590
-3C1590:lI110|H3C165C
-3C165C:lI47|H3C1728
-3C1728:lI120|H3C17E4
-3C17E4:lI45|H3C18A0
-3C18A0:lI115|H3C1954
-3C1954:lI118|H3C1A08
-3C1A08:lI52|H3C1ABC
-3C1ABC:lI99|H3C1B80
-3C1B80:lI112|H3C1C4C
-3C1C4C:lI105|H3C1D10
-3C1D10:lI111|N
-3C0DC8:lI115|H3C0E6C
-3C0E6C:lI118|H3C0F20
-3C0F20:lI52|H3C0FDC
-3C0FDC:lI99|H3C10A8
-3C10A8:lI112|H3C1174
-3C1174:lI105|H3C1240
-3C1240:lI111|N
-3C0D30:lH3C0DD8|H3C0DE4
-3C0DD8:t2:H3C0E7C,H3C0E84
-3C0E84:lI97|H3C0F38
-3C0F38:lI112|H3C0FF4
-3C0FF4:lI112|H3C10B8
-3C10B8:lI108|H3C1184
-3C1184:lI105|H3C1250
-3C1250:lI99|H3C1314
-3C1314:lI97|H3C13E8
-3C13E8:lI116|H3C14C4
-3C14C4:lI105|H3C1598
-3C1598:lI111|H3C1664
-3C1664:lI110|H3C1730
-3C1730:lI47|H3C17EC
-3C17EC:lI120|H3C18A8
-3C18A8:lI45|H3C195C
-3C195C:lI115|H3C1A10
-3C1A10:lI116|H3C1AC4
-3C1AC4:lI117|H3C1B88
-3C1B88:lI102|H3C1C54
-3C1C54:lI102|H3C1D18
-3C1D18:lI105|H3C1DD4
-3C1DD4:lI116|N
-3C0E7C:lI115|H3C0F30
-3C0F30:lI105|H3C0FEC
-3C0FEC:lI116|N
-3C0DE4:lH3C0E8C|H3C0E98
-3C0E8C:t2:H3C0F40,H3C0F48
-3C0F48:lI97|H3C1004
-3C1004:lI112|H3C10C8
-3C10C8:lI112|H3C1194
-3C1194:lI108|H3C1258
-3C1258:lI105|H3C131C
-3C131C:lI99|H3C13F0
-3C13F0:lI97|H3C14CC
-3C14CC:lI116|H3C15A0
-3C15A0:lI105|H3C166C
-3C166C:lI111|H3C1738
-3C1738:lI110|H3C17F4
-3C17F4:lI47|H3C18B0
-3C18B0:lI120|H3C1964
-3C1964:lI45|H3C1A18
-3C1A18:lI115|H3C1ACC
-3C1ACC:lI104|H3C1B90
-3C1B90:lI97|H3C1C5C
-3C1C5C:lI114|N
-3C0F40:lI115|H3C0FFC
-3C0FFC:lI104|H3C10C0
-3C10C0:lI97|H3C118C
-3C118C:lI114|N
-3C0E98:lH3C0F50|H3C0F5C
-3C0F50:t2:H3C100C,H3C1014
-3C1014:lI97|H3C10D8
-3C10D8:lI112|H3C119C
-3C119C:lI112|H3C1260
-3C1260:lI108|H3C1324
-3C1324:lI105|H3C13F8
-3C13F8:lI99|H3C14D4
-3C14D4:lI97|H3C15A8
-3C15A8:lI116|H3C1674
-3C1674:lI105|H3C1740
-3C1740:lI111|H3C17FC
-3C17FC:lI110|H3C18B8
-3C18B8:lI47|H3C196C
-3C196C:lI120|H3C1A20
-3C1A20:lI45|H3C1AD4
-3C1AD4:lI115|H3C1B98
-3C1B98:lI104|N
-3C100C:lI115|H3C10D0
-3C10D0:lI104|N
-3C0F5C:lH3C101C|H3C1028
-3C101C:t2:H3C10E0,H3C10E8
-3C10E8:lI97|H3C11AC
-3C11AC:lI112|H3C1268
-3C1268:lI112|H3C132C
-3C132C:lI108|H3C1400
-3C1400:lI105|H3C14DC
-3C14DC:lI99|H3C15B0
-3C15B0:lI97|H3C167C
-3C167C:lI116|H3C1748
-3C1748:lI105|H3C1804
-3C1804:lI111|H3C18C0
-3C18C0:lI110|H3C1974
-3C1974:lI47|H3C1A28
-3C1A28:lI120|H3C1ADC
-3C1ADC:lI45|H3C1BA0
-3C1BA0:lI110|H3C1C64
-3C1C64:lI101|H3C1D20
-3C1D20:lI116|H3C1DDC
-3C1DDC:lI99|H3C1E98
-3C1E98:lI100|H3C1F5C
-3C1F5C:lI102|N
-3C10E0:lI110|H3C11A4
-3C11A4:lI99|N
-3C1028:lH3C10F0|H3C10FC
-3C10F0:t2:H3C11B4,H3C11BC
-3C11BC:lI97|H3C1278
-3C1278:lI112|H3C133C
-3C133C:lI112|H3C1408
-3C1408:lI108|H3C14E4
-3C14E4:lI105|H3C15B8
-3C15B8:lI99|H3C1684
-3C1684:lI97|H3C1750
-3C1750:lI116|H3C180C
-3C180C:lI105|H3C18C8
-3C18C8:lI111|H3C197C
-3C197C:lI110|H3C1A30
-3C1A30:lI47|H3C1AE4
-3C1AE4:lI120|H3C1BA8
-3C1BA8:lI45|H3C1C6C
-3C1C6C:lI110|H3C1D28
-3C1D28:lI101|H3C1DE4
-3C1DE4:lI116|H3C1EA0
-3C1EA0:lI99|H3C1F64
-3C1F64:lI100|H3C2018
-3C2018:lI102|N
-3C11B4:lI99|H3C1270
-3C1270:lI100|H3C1334
-3C1334:lI102|N
-3C10FC:lH3C11C4|H3C11D0
-3C11C4:t2:H3C1280,H3C1288
-3C1288:lI97|H3C134C
-3C134C:lI112|H3C1418
-3C1418:lI112|H3C14EC
-3C14EC:lI108|H3C15C0
-3C15C0:lI105|H3C168C
-3C168C:lI99|H3C1758
-3C1758:lI97|H3C1814
-3C1814:lI116|H3C18D0
-3C18D0:lI105|H3C1984
-3C1984:lI111|H3C1A38
-3C1A38:lI110|H3C1AEC
-3C1AEC:lI47|H3C1BB0
-3C1BB0:lI120|H3C1C74
-3C1C74:lI45|H3C1D30
-3C1D30:lI109|H3C1DEC
-3C1DEC:lI105|H3C1EA8
-3C1EA8:lI102|N
-3C1280:lI109|H3C1344
-3C1344:lI105|H3C1410
-3C1410:lI102|N
-3C11D0:lH3C1290|H3C129C
-3C1290:t2:H3C1354,H3C135C
-3C135C:lI97|H3C1428
-3C1428:lI112|H3C14FC
-3C14FC:lI112|H3C15D0
-3C15D0:lI108|H3C169C
-3C169C:lI105|H3C1760
-3C1760:lI99|H3C181C
-3C181C:lI97|H3C18D8
-3C18D8:lI116|H3C198C
-3C198C:lI105|H3C1A40
-3C1A40:lI111|H3C1AF4
-3C1AF4:lI110|H3C1BB8
-3C1BB8:lI47|H3C1C7C
-3C1C7C:lI120|H3C1D38
-3C1D38:lI45|H3C1DF4
-3C1DF4:lI108|H3C1EB0
-3C1EB0:lI97|H3C1F6C
-3C1F6C:lI116|H3C2020
-3C2020:lI101|H3C20DC
-3C20DC:lI120|N
-3C1354:lI108|H3C1420
-3C1420:lI97|H3C14F4
-3C14F4:lI116|H3C15C8
-3C15C8:lI101|H3C1694
-3C1694:lI120|N
-3C129C:lH3C1364|H3C1370
-3C1364:t2:H3C1430,H3C1438
-3C1438:lI97|H3C150C
-3C150C:lI112|H3C15E0
-3C15E0:lI112|H3C16A4
-3C16A4:lI108|H3C1768
-3C1768:lI105|H3C1824
-3C1824:lI99|H3C18E0
-3C18E0:lI97|H3C1994
-3C1994:lI116|H3C1A48
-3C1A48:lI105|H3C1AFC
-3C1AFC:lI111|H3C1BC0
-3C1BC0:lI110|H3C1C84
-3C1C84:lI47|H3C1D40
-3C1D40:lI120|H3C1DFC
-3C1DFC:lI45|H3C1EB8
-3C1EB8:lI107|H3C1F74
-3C1F74:lI111|H3C2028
-3C2028:lI97|H3C20E4
-3C20E4:lI110|N
-3C1430:lI115|H3C1504
-3C1504:lI107|H3C15D8
-3C15D8:lI112|N
-3C1370:lH3C1440|H3C144C
-3C1440:t2:H3C1514,H3C151C
-3C151C:lI97|H3C15F0
-3C15F0:lI112|H3C16B4
-3C16B4:lI112|H3C1770
-3C1770:lI108|H3C182C
-3C182C:lI105|H3C18E8
-3C18E8:lI99|H3C199C
-3C199C:lI97|H3C1A50
-3C1A50:lI116|H3C1B04
-3C1B04:lI105|H3C1BC8
-3C1BC8:lI111|H3C1C8C
-3C1C8C:lI110|H3C1D48
-3C1D48:lI47|H3C1E04
-3C1E04:lI120|H3C1EC0
-3C1EC0:lI45|H3C1F7C
-3C1F7C:lI107|H3C2030
-3C2030:lI111|H3C20EC
-3C20EC:lI97|H3C21A0
-3C21A0:lI110|N
-3C1514:lI115|H3C15E8
-3C15E8:lI107|H3C16AC
-3C16AC:lI100|N
-3C144C:lH3C1524|H3C1530
-3C1524:t2:H3C15F8,H3C1600
-3C1600:lI97|H3C16C4
-3C16C4:lI112|H3C1780
-3C1780:lI112|H3C1834
-3C1834:lI108|H3C18F0
-3C18F0:lI105|H3C19A4
-3C19A4:lI99|H3C1A58
-3C1A58:lI97|H3C1B0C
-3C1B0C:lI116|H3C1BD0
-3C1BD0:lI105|H3C1C94
-3C1C94:lI111|H3C1D50
-3C1D50:lI110|H3C1E0C
-3C1E0C:lI47|H3C1EC8
-3C1EC8:lI120|H3C1F84
-3C1F84:lI45|H3C2038
-3C2038:lI107|H3C20F4
-3C20F4:lI111|H3C21A8
-3C21A8:lI97|H3C225C
-3C225C:lI110|N
-3C15F8:lI115|H3C16BC
-3C16BC:lI107|H3C1778
-3C1778:lI116|N
-3C1530:lH3C1608|H3C1614
-3C1608:t2:H3C16CC,H3C16D4
-3C16D4:lI97|H3C1790
-3C1790:lI112|H3C1844
-3C1844:lI112|H3C18F8
-3C18F8:lI108|H3C19AC
-3C19AC:lI105|H3C1A60
-3C1A60:lI99|H3C1B14
-3C1B14:lI97|H3C1BD8
-3C1BD8:lI116|H3C1C9C
-3C1C9C:lI105|H3C1D58
-3C1D58:lI111|H3C1E14
-3C1E14:lI110|H3C1ED0
-3C1ED0:lI47|H3C1F8C
-3C1F8C:lI120|H3C2040
-3C2040:lI45|H3C20FC
-3C20FC:lI107|H3C21B0
-3C21B0:lI111|H3C2264
-3C2264:lI97|H3C2320
-3C2320:lI110|N
-3C16CC:lI115|H3C1788
-3C1788:lI107|H3C183C
-3C183C:lI109|N
-3C1614:lH3C16DC|H3C16E8
-3C16DC:t2:H3C1798,H3C17A0
-3C17A0:lI97|H3C1854
-3C1854:lI112|H3C1908
-3C1908:lI112|H3C19B4
-3C19B4:lI108|H3C1A68
-3C1A68:lI105|H3C1B1C
-3C1B1C:lI99|H3C1BE0
-3C1BE0:lI97|H3C1CA4
-3C1CA4:lI116|H3C1D60
-3C1D60:lI105|H3C1E1C
-3C1E1C:lI111|H3C1ED8
-3C1ED8:lI110|H3C1F94
-3C1F94:lI47|H3C2048
-3C2048:lI120|H3C2104
-3C2104:lI45|H3C21B8
-3C21B8:lI104|H3C226C
-3C226C:lI116|H3C2328
-3C2328:lI116|H3C23E4
-3C23E4:lI112|H3C2498
-3C2498:lI100|H3C2554
-3C2554:lI45|H3C2610
-3C2610:lI99|H3C26D4
-3C26D4:lI103|H3C2790
-3C2790:lI105|N
-3C1798:lI99|H3C184C
-3C184C:lI103|H3C1900
-3C1900:lI105|N
-3C16E8:lH3C17A8|H3C17B4
-3C17A8:t2:H3C185C,H3C1864
-3C1864:lI97|H3C1918
-3C1918:lI112|H3C19C4
-3C19C4:lI112|H3C1A70
-3C1A70:lI108|H3C1B24
-3C1B24:lI105|H3C1BE8
-3C1BE8:lI99|H3C1CAC
-3C1CAC:lI97|H3C1D68
-3C1D68:lI116|H3C1E24
-3C1E24:lI105|H3C1EE0
-3C1EE0:lI111|H3C1F9C
-3C1F9C:lI110|H3C2050
-3C2050:lI47|H3C210C
-3C210C:lI120|H3C21C0
-3C21C0:lI45|H3C2274
-3C2274:lI104|H3C2330
-3C2330:lI100|H3C23EC
-3C23EC:lI102|N
-3C185C:lI104|H3C1910
-3C1910:lI100|H3C19BC
-3C19BC:lI102|N
-3C17B4:lH3C186C|H3C1878
-3C186C:t2:H3C1920,H3C1928
-3C1928:lI97|H3C19D4
-3C19D4:lI112|H3C1A78
-3C1A78:lI112|H3C1B2C
-3C1B2C:lI108|H3C1BF0
-3C1BF0:lI105|H3C1CB4
-3C1CB4:lI99|H3C1D70
-3C1D70:lI97|H3C1E2C
-3C1E2C:lI116|H3C1EE8
-3C1EE8:lI105|H3C1FA4
-3C1FA4:lI111|H3C2058
-3C2058:lI110|H3C2114
-3C2114:lI47|H3C21C8
-3C21C8:lI120|H3C227C
-3C227C:lI45|H3C2338
-3C2338:lI103|H3C23F4
-3C23F4:lI122|H3C24A0
-3C24A0:lI105|H3C255C
-3C255C:lI112|N
-3C1920:lI103|H3C19CC
-3C19CC:lI122|N
-3C1878:lH3C1930|H3C193C
-3C1930:t2:H3C19DC,H3C19E4
-3C19E4:lI97|H3C1A88
-3C1A88:lI112|H3C1B3C
-3C1B3C:lI112|H3C1C00
-3C1C00:lI108|H3C1CBC
-3C1CBC:lI105|H3C1D78
-3C1D78:lI99|H3C1E34
-3C1E34:lI97|H3C1EF0
-3C1EF0:lI116|H3C1FAC
-3C1FAC:lI105|H3C2060
-3C2060:lI111|H3C211C
-3C211C:lI110|H3C21D0
-3C21D0:lI47|H3C2284
-3C2284:lI120|H3C2340
-3C2340:lI45|H3C23FC
-3C23FC:lI103|H3C24A8
-3C24A8:lI116|H3C2564
-3C2564:lI97|H3C2618
-3C2618:lI114|N
-3C19DC:lI103|H3C1A80
-3C1A80:lI116|H3C1B34
-3C1B34:lI97|H3C1BF8
-3C1BF8:lI114|N
-3C193C:lH3C19EC|H3C19F8
-3C19EC:t2:H3C1A90,H3C1A98
-3C1A98:lI97|H3C1B4C
-3C1B4C:lI112|H3C1C10
-3C1C10:lI112|H3C1CC4
-3C1CC4:lI108|H3C1D80
-3C1D80:lI105|H3C1E3C
-3C1E3C:lI99|H3C1EF8
-3C1EF8:lI97|H3C1FB4
-3C1FB4:lI116|H3C2068
-3C2068:lI105|H3C2124
-3C2124:lI111|H3C21D8
-3C21D8:lI110|H3C228C
-3C228C:lI47|H3C2348
-3C2348:lI120|H3C2404
-3C2404:lI45|H3C24B0
-3C24B0:lI100|H3C256C
-3C256C:lI118|H3C2620
-3C2620:lI105|N
-3C1A90:lI100|H3C1B44
-3C1B44:lI118|H3C1C08
-3C1C08:lI105|N
-3C19F8:lH3C1AA0|H3C1AAC
-3C1AA0:t2:H3C1B54,H3C1B5C
-3C1B5C:lI97|H3C1C20
-3C1C20:lI112|H3C1CD4
-3C1CD4:lI112|H3C1D88
-3C1D88:lI108|H3C1E44
-3C1E44:lI105|H3C1F00
-3C1F00:lI99|H3C1FBC
-3C1FBC:lI97|H3C2070
-3C2070:lI116|H3C212C
-3C212C:lI105|H3C21E0
-3C21E0:lI111|H3C2294
-3C2294:lI110|H3C2350
-3C2350:lI47|H3C240C
-3C240C:lI120|H3C24B8
-3C24B8:lI45|H3C2574
-3C2574:lI100|H3C2628
-3C2628:lI105|H3C26DC
-3C26DC:lI114|H3C2798
-3C2798:lI101|H3C2854
-3C2854:lI99|H3C2918
-3C2918:lI116|H3C29E4
-3C29E4:lI111|H3C2AB0
-3C2AB0:lI114|N
-3C1B54:lI100|H3C1C18
-3C1C18:lI99|H3C1CCC
-3C1CCC:lI114|N
-3C1AAC:lH3C1B64|H3C1B70
-3C1B64:t2:H3C1C28,H3C1C30
-3C1C30:lI97|H3C1CE4
-3C1CE4:lI112|H3C1D98
-3C1D98:lI112|H3C1E4C
-3C1E4C:lI108|H3C1F08
-3C1F08:lI105|H3C1FC4
-3C1FC4:lI99|H3C2078
-3C2078:lI97|H3C2134
-3C2134:lI116|H3C21E8
-3C21E8:lI105|H3C229C
-3C229C:lI111|H3C2358
-3C2358:lI110|H3C2414
-3C2414:lI47|H3C24C0
-3C24C0:lI120|H3C257C
-3C257C:lI45|H3C2630
-3C2630:lI100|H3C26E4
-3C26E4:lI105|H3C27A0
-3C27A0:lI114|H3C285C
-3C285C:lI101|H3C2920
-3C2920:lI99|H3C29EC
-3C29EC:lI116|H3C2AB8
-3C2AB8:lI111|H3C2B84
-3C2B84:lI114|N
-3C1C28:lI100|H3C1CDC
-3C1CDC:lI105|H3C1D90
-3C1D90:lI114|N
-3C1B70:lH3C1C38|H3C1C44
-3C1C38:t2:H3C1CEC,H3C1CF4
-3C1CF4:lI97|H3C1DA8
-3C1DA8:lI112|H3C1E5C
-3C1E5C:lI112|H3C1F10
-3C1F10:lI108|H3C1FCC
-3C1FCC:lI105|H3C2080
-3C2080:lI99|H3C213C
-3C213C:lI97|H3C21F0
-3C21F0:lI116|H3C22A4
-3C22A4:lI105|H3C2360
-3C2360:lI111|H3C241C
-3C241C:lI110|H3C24C8
-3C24C8:lI47|H3C2584
-3C2584:lI120|H3C2638
-3C2638:lI45|H3C26EC
-3C26EC:lI100|H3C27A8
-3C27A8:lI105|H3C2864
-3C2864:lI114|H3C2928
-3C2928:lI101|H3C29F4
-3C29F4:lI99|H3C2AC0
-3C2AC0:lI116|H3C2B8C
-3C2B8C:lI111|H3C2C48
-3C2C48:lI114|N
-3C1CEC:lI100|H3C1DA0
-3C1DA0:lI120|H3C1E54
-3C1E54:lI114|N
-3C1C44:lH3C1CFC|H3C1D08
-3C1CFC:t2:H3C1DB0,H3C1DB8
-3C1DB8:lI97|H3C1E6C
-3C1E6C:lI112|H3C1F20
-3C1F20:lI112|H3C1FD4
-3C1FD4:lI108|H3C2088
-3C2088:lI105|H3C2144
-3C2144:lI99|H3C21F8
-3C21F8:lI97|H3C22AC
-3C22AC:lI116|H3C2368
-3C2368:lI105|H3C2424
-3C2424:lI111|H3C24D0
-3C24D0:lI110|H3C258C
-3C258C:lI47|H3C2640
-3C2640:lI120|H3C26F4
-3C26F4:lI45|H3C27B0
-3C27B0:lI99|H3C286C
-3C286C:lI115|H3C2930
-3C2930:lI104|N
-3C1DB0:lI99|H3C1E64
-3C1E64:lI115|H3C1F18
-3C1F18:lI104|N
-3C1D08:lH3C1DC0|H3C1DCC
-3C1DC0:t2:H3C1E74,H3C1E7C
-3C1E7C:lI97|H3C1F30
-3C1F30:lI112|H3C1FE4
-3C1FE4:lI112|H3C2098
-3C2098:lI108|H3C214C
-3C214C:lI105|H3C2200
-3C2200:lI99|H3C22B4
-3C22B4:lI97|H3C2370
-3C2370:lI116|H3C242C
-3C242C:lI105|H3C24D8
-3C24D8:lI111|H3C2594
-3C2594:lI110|H3C2648
-3C2648:lI47|H3C26FC
-3C26FC:lI120|H3C27B8
-3C27B8:lI45|H3C2874
-3C2874:lI99|H3C2938
-3C2938:lI112|H3C29FC
-3C29FC:lI105|H3C2AC8
-3C2AC8:lI111|N
-3C1E74:lI99|H3C1F28
-3C1F28:lI112|H3C1FDC
-3C1FDC:lI105|H3C2090
-3C2090:lI111|N
-3C1DCC:lH3C1E84|H3C1E90
-3C1E84:t2:H3C1F38,H3C1F40
-3C1F40:lI97|H3C1FEC
-3C1FEC:lI112|H3C20A0
-3C20A0:lI112|H3C2154
-3C2154:lI108|H3C2208
-3C2208:lI105|H3C22BC
-3C22BC:lI99|H3C2378
-3C2378:lI97|H3C2434
-3C2434:lI116|H3C24E0
-3C24E0:lI105|H3C259C
-3C259C:lI111|H3C2650
-3C2650:lI110|H3C2704
-3C2704:lI47|H3C27C0
-3C27C0:lI120|H3C287C
-3C287C:lI45|H3C2940
-3C2940:lI99|H3C2A04
-3C2A04:lI111|H3C2AD0
-3C2AD0:lI109|H3C2B94
-3C2B94:lI112|H3C2C50
-3C2C50:lI114|H3C2D00
-3C2D00:lI101|H3C2DA8
-3C2DA8:lI115|H3C2E40
-3C2E40:lI115|N
-3C1F38:lI90|N
-3C1E90:lH3C1F48|H3C1F54
-3C1F48:t2:H3C1FF4,H3C1FFC
-3C1FFC:lI97|H3C20B0
-3C20B0:lI112|H3C2164
-3C2164:lI112|H3C2210
-3C2210:lI108|H3C22C4
-3C22C4:lI105|H3C2380
-3C2380:lI99|H3C243C
-3C243C:lI97|H3C24E8
-3C24E8:lI116|H3C25A4
-3C25A4:lI105|H3C2658
-3C2658:lI111|H3C270C
-3C270C:lI110|H3C27C8
-3C27C8:lI47|H3C2884
-3C2884:lI120|H3C2948
-3C2948:lI45|H3C2A0C
-3C2A0C:lI99|H3C2AD8
-3C2AD8:lI100|H3C2B9C
-3C2B9C:lI108|H3C2C58
-3C2C58:lI105|H3C2D08
-3C2D08:lI110|H3C2DB0
-3C2DB0:lI107|N
-3C1FF4:lI118|H3C20A8
-3C20A8:lI99|H3C215C
-3C215C:lI100|N
-3C1F54:lH3C2004|H3C2010
-3C2004:t2:H3C20B8,H3C20C0
-3C20C0:lI97|H3C2174
-3C2174:lI112|H3C2220
-3C2220:lI112|H3C22D4
-3C22D4:lI108|H3C2390
-3C2390:lI105|H3C2444
-3C2444:lI99|H3C24F0
-3C24F0:lI97|H3C25AC
-3C25AC:lI116|H3C2660
-3C2660:lI105|H3C2714
-3C2714:lI111|H3C27D0
-3C27D0:lI110|H3C288C
-3C288C:lI47|H3C2950
-3C2950:lI120|H3C2A14
-3C2A14:lI45|H3C2AE0
-3C2AE0:lI98|H3C2BA4
-3C2BA4:lI99|H3C2C60
-3C2C60:lI112|H3C2D10
-3C2D10:lI105|H3C2DB8
-3C2DB8:lI111|N
-3C20B8:lI98|H3C216C
-3C216C:lI99|H3C2218
-3C2218:lI112|H3C22CC
-3C22CC:lI105|H3C2388
-3C2388:lI111|N
-3C2010:lH3C20C8|H3C20D4
-3C20C8:t2:H3C217C,H3C2184
-3C2184:lI97|H3C2230
-3C2230:lI112|H3C22E4
-3C22E4:lI112|H3C2398
-3C2398:lI108|H3C244C
-3C244C:lI105|H3C24F8
-3C24F8:lI99|H3C25B4
-3C25B4:lI97|H3C2668
-3C2668:lI116|H3C271C
-3C271C:lI105|H3C27D8
-3C27D8:lI111|H3C2894
-3C2894:lI110|H3C2958
-3C2958:lI47|H3C2A1C
-3C2A1C:lI114|H3C2AE8
-3C2AE8:lI116|H3C2BAC
-3C2BAC:lI102|N
-3C217C:lI114|H3C2228
-3C2228:lI116|H3C22DC
-3C22DC:lI102|N
-3C20D4:lH3C218C|H3C2198
-3C218C:t2:H3C2238,H3C2240
-3C2240:lI97|H3C22F4
-3C22F4:lI112|H3C23A8
-3C23A8:lI112|H3C2454
-3C2454:lI108|H3C2500
-3C2500:lI105|H3C25BC
-3C25BC:lI99|H3C2670
-3C2670:lI97|H3C2724
-3C2724:lI116|H3C27E0
-3C27E0:lI105|H3C289C
-3C289C:lI111|H3C2960
-3C2960:lI110|H3C2A24
-3C2A24:lI47|H3C2AF0
-3C2AF0:lI112|H3C2BB4
-3C2BB4:lI111|H3C2C68
-3C2C68:lI119|H3C2D18
-3C2D18:lI101|H3C2DC0
-3C2DC0:lI114|H3C2E48
-3C2E48:lI112|H3C2EC0
-3C2EC0:lI111|H3C2F38
-3C2F38:lI105|H3C2FA8
-3C2FA8:lI110|H3C3010
-3C3010:lI116|N
-3C2238:lI112|H3C22EC
-3C22EC:lI112|H3C23A0
-3C23A0:lI116|N
-3C2198:lH3C2248|H3C2254
-3C2248:t2:H3C22FC,H3C2304
-3C2304:lI97|H3C23B8
-3C23B8:lI112|H3C245C
-3C245C:lI112|H3C2508
-3C2508:lI108|H3C25C4
-3C25C4:lI105|H3C2678
-3C2678:lI99|H3C272C
-3C272C:lI97|H3C27E8
-3C27E8:lI116|H3C28A4
-3C28A4:lI105|H3C2968
-3C2968:lI111|H3C2A2C
-3C2A2C:lI110|H3C2AF8
-3C2AF8:lI47|H3C2BBC
-3C2BBC:lI112|H3C2C70
-3C2C70:lI111|H3C2D20
-3C2D20:lI115|H3C2DC8
-3C2DC8:lI116|H3C2E50
-3C2E50:lI115|H3C2EC8
-3C2EC8:lI99|H3C2F40
-3C2F40:lI114|H3C2FB0
-3C2FB0:lI105|H3C3018
-3C3018:lI112|H3C3078
-3C3078:lI116|N
-3C22FC:lI97|H3C23B0
-3C23B0:lI105|N
-3C2254:lH3C230C|H3C2318
-3C230C:t2:H3C23C0,H3C23C8
-3C23C8:lI97|H3C246C
-3C246C:lI112|H3C2518
-3C2518:lI112|H3C25CC
-3C25CC:lI108|H3C2680
-3C2680:lI105|H3C2734
-3C2734:lI99|H3C27F0
-3C27F0:lI97|H3C28AC
-3C28AC:lI116|H3C2970
-3C2970:lI105|H3C2A34
-3C2A34:lI111|H3C2B00
-3C2B00:lI110|H3C2BC4
-3C2BC4:lI47|H3C2C78
-3C2C78:lI112|H3C2D28
-3C2D28:lI111|H3C2DD0
-3C2DD0:lI115|H3C2E58
-3C2E58:lI116|H3C2ED0
-3C2ED0:lI115|H3C2F48
-3C2F48:lI99|H3C2FB8
-3C2FB8:lI114|H3C3020
-3C3020:lI105|H3C3080
-3C3080:lI112|H3C30D8
-3C30D8:lI116|N
-3C23C0:lI101|H3C2464
-3C2464:lI112|H3C2510
-3C2510:lI115|N
-3C2318:lH3C23D0|H3C23DC
-3C23D0:t2:H3C2474,H3C247C
-3C247C:lI97|H3C2528
-3C2528:lI112|H3C25D4
-3C25D4:lI112|H3C2688
-3C2688:lI108|H3C273C
-3C273C:lI105|H3C27F8
-3C27F8:lI99|H3C28B4
-3C28B4:lI97|H3C2978
-3C2978:lI116|H3C2A3C
-3C2A3C:lI105|H3C2B08
-3C2B08:lI111|H3C2BCC
-3C2BCC:lI110|H3C2C80
-3C2C80:lI47|H3C2D30
-3C2D30:lI112|H3C2DD8
-3C2DD8:lI111|H3C2E60
-3C2E60:lI115|H3C2ED8
-3C2ED8:lI116|H3C2F50
-3C2F50:lI115|H3C2FC0
-3C2FC0:lI99|H3C3028
-3C3028:lI114|H3C3088
-3C3088:lI105|H3C30E0
-3C30E0:lI112|H3C3130
-3C3130:lI116|N
-3C2474:lI112|H3C2520
-3C2520:lI115|N
-3C23DC:lH3C2484|H3C2490
-3C2484:t2:H3C2530,H3C2538
-3C2538:lI97|H3C25E4
-3C25E4:lI112|H3C2698
-3C2698:lI112|H3C2744
-3C2744:lI108|H3C2800
-3C2800:lI105|H3C28BC
-3C28BC:lI99|H3C2980
-3C2980:lI97|H3C2A44
-3C2A44:lI116|H3C2B10
-3C2B10:lI105|H3C2BD4
-3C2BD4:lI111|H3C2C88
-3C2C88:lI110|H3C2D38
-3C2D38:lI47|H3C2DE0
-3C2DE0:lI112|H3C2E68
-3C2E68:lI100|H3C2EE0
-3C2EE0:lI102|N
-3C2530:lI112|H3C25DC
-3C25DC:lI100|H3C2690
-3C2690:lI102|N
-3C2490:lH3C2540|H3C254C
-3C2540:t2:H3C25EC,H3C25F4
-3C25F4:lI97|H3C26A8
-3C26A8:lI112|H3C2754
-3C2754:lI112|H3C2808
-3C2808:lI108|H3C28C4
-3C28C4:lI105|H3C2988
-3C2988:lI99|H3C2A4C
-3C2A4C:lI97|H3C2B18
-3C2B18:lI116|H3C2BDC
-3C2BDC:lI105|H3C2C90
-3C2C90:lI111|H3C2D40
-3C2D40:lI110|H3C2DE8
-3C2DE8:lI47|H3C2E70
-3C2E70:lI111|H3C2EE8
-3C2EE8:lI100|H3C2F58
-3C2F58:lI97|N
-3C25EC:lI111|H3C26A0
-3C26A0:lI100|H3C274C
-3C274C:lI97|N
-3C254C:lH3C25FC|H3C2608
-3C25FC:t2:H3C26B0,H3C26B8
-3C26B8:lI97|H3C2764
-3C2764:lI112|H3C2818
-3C2818:lI112|H3C28CC
-3C28CC:lI108|H3C2990
-3C2990:lI105|H3C2A54
-3C2A54:lI99|H3C2B20
-3C2B20:lI97|H3C2BE4
-3C2BE4:lI116|H3C2C98
-3C2C98:lI105|H3C2D48
-3C2D48:lI111|H3C2DF0
-3C2DF0:lI110|H3C2E78
-3C2E78:lI47|H3C2EF0
-3C2EF0:lI111|H3C2F60
-3C2F60:lI99|H3C2FC8
-3C2FC8:lI116|H3C3030
-3C3030:lI101|H3C3090
-3C3090:lI116|H3C30E8
-3C30E8:lI45|H3C3138
-3C3138:lI115|H3C3180
-3C3180:lI116|H3C31C8
-3C31C8:lI114|H3C3210
-3C3210:lI101|H3C3258
-3C3258:lI97|H3C32A0
-3C32A0:lI109|N
-3C26B0:lI98|H3C275C
-3C275C:lI105|H3C2810
-3C2810:lI110|N
-3C2608:lH3C26C0|H3C26CC
-3C26C0:t2:H3C276C,H3C2774
-3C2774:lI97|H3C2828
-3C2828:lI112|H3C28DC
-3C28DC:lI112|H3C2998
-3C2998:lI108|H3C2A5C
-3C2A5C:lI105|H3C2B28
-3C2B28:lI99|H3C2BEC
-3C2BEC:lI97|H3C2CA0
-3C2CA0:lI116|H3C2D50
-3C2D50:lI105|H3C2DF8
-3C2DF8:lI111|H3C2E80
-3C2E80:lI110|H3C2EF8
-3C2EF8:lI47|H3C2F68
-3C2F68:lI111|H3C2FD0
-3C2FD0:lI99|H3C3038
-3C3038:lI116|H3C3098
-3C3098:lI101|H3C30F0
-3C30F0:lI116|H3C3140
-3C3140:lI45|H3C3188
-3C3188:lI115|H3C31D0
-3C31D0:lI116|H3C3218
-3C3218:lI114|H3C3260
-3C3260:lI101|H3C32A8
-3C32A8:lI97|H3C32E8
-3C32E8:lI109|N
-3C276C:lI100|H3C2820
-3C2820:lI109|H3C28D4
-3C28D4:lI115|N
-3C26CC:lH3C277C|H3C2788
-3C277C:t2:H3C2830,H3C2838
-3C2838:lI97|H3C28EC
-3C28EC:lI112|H3C29A8
-3C29A8:lI112|H3C2A64
-3C2A64:lI108|H3C2B30
-3C2B30:lI105|H3C2BF4
-3C2BF4:lI99|H3C2CA8
-3C2CA8:lI97|H3C2D58
-3C2D58:lI116|H3C2E00
-3C2E00:lI105|H3C2E88
-3C2E88:lI111|H3C2F00
-3C2F00:lI110|H3C2F70
-3C2F70:lI47|H3C2FD8
-3C2FD8:lI111|H3C3040
-3C3040:lI99|H3C30A0
-3C30A0:lI116|H3C30F8
-3C30F8:lI101|H3C3148
-3C3148:lI116|H3C3190
-3C3190:lI45|H3C31D8
-3C31D8:lI115|H3C3220
-3C3220:lI116|H3C3268
-3C3268:lI114|H3C32B0
-3C32B0:lI101|H3C32F0
-3C32F0:lI97|H3C3320
-3C3320:lI109|N
-3C2830:lI108|H3C28E4
-3C28E4:lI104|H3C29A0
-3C29A0:lI97|N
-3C2788:lH3C2840|H3C284C
-3C2840:t2:H3C28F4,H3C28FC
-3C28FC:lI97|H3C29B8
-3C29B8:lI112|H3C2A74
-3C2A74:lI112|H3C2B38
-3C2B38:lI108|H3C2BFC
-3C2BFC:lI105|H3C2CB0
-3C2CB0:lI99|H3C2D60
-3C2D60:lI97|H3C2E08
-3C2E08:lI116|H3C2E90
-3C2E90:lI105|H3C2F08
-3C2F08:lI111|H3C2F78
-3C2F78:lI110|H3C2FE0
-3C2FE0:lI47|H3C3048
-3C3048:lI111|H3C30A8
-3C30A8:lI99|H3C3100
-3C3100:lI116|H3C3150
-3C3150:lI101|H3C3198
-3C3198:lI116|H3C31E0
-3C31E0:lI45|H3C3228
-3C3228:lI115|H3C3270
-3C3270:lI116|H3C32B8
-3C32B8:lI114|H3C32F8
-3C32F8:lI101|H3C3328
-3C3328:lI97|H3C3350
-3C3350:lI109|N
-3C28F4:lI108|H3C29B0
-3C29B0:lI122|H3C2A6C
-3C2A6C:lI104|N
-3C284C:lH3C2904|H3C2910
-3C2904:t2:H3C29C0,H3C29C8
-3C29C8:lI97|H3C2A84
-3C2A84:lI112|H3C2B48
-3C2B48:lI112|H3C2C04
-3C2C04:lI108|H3C2CB8
-3C2CB8:lI105|H3C2D68
-3C2D68:lI99|H3C2E10
-3C2E10:lI97|H3C2E98
-3C2E98:lI116|H3C2F10
-3C2F10:lI105|H3C2F80
-3C2F80:lI111|H3C2FE8
-3C2FE8:lI110|H3C3050
-3C3050:lI47|H3C30B0
-3C30B0:lI111|H3C3108
-3C3108:lI99|H3C3158
-3C3158:lI116|H3C31A0
-3C31A0:lI101|H3C31E8
-3C31E8:lI116|H3C3230
-3C3230:lI45|H3C3278
-3C3278:lI115|H3C32C0
-3C32C0:lI116|H3C3300
-3C3300:lI114|H3C3330
-3C3330:lI101|H3C3358
-3C3358:lI97|H3C3378
-3C3378:lI109|N
-3C29C0:lI101|H3C2A7C
-3C2A7C:lI120|H3C2B40
-3C2B40:lI101|N
-3C2910:lH3C29D0|H3C29DC
-3C29D0:t2:H3C2A8C,H3C2A94
-3C2A94:lI97|H3C2B58
-3C2B58:lI112|H3C2C14
-3C2C14:lI112|H3C2CC8
-3C2CC8:lI108|H3C2D78
-3C2D78:lI105|H3C2E18
-3C2E18:lI99|H3C2EA0
-3C2EA0:lI97|H3C2F18
-3C2F18:lI116|H3C2F88
-3C2F88:lI105|H3C2FF0
-3C2FF0:lI111|H3C3058
-3C3058:lI110|H3C30B8
-3C30B8:lI47|H3C3110
-3C3110:lI111|H3C3160
-3C3160:lI99|H3C31A8
-3C31A8:lI116|H3C31F0
-3C31F0:lI101|H3C3238
-3C3238:lI116|H3C3280
-3C3280:lI45|H3C32C8
-3C32C8:lI115|H3C3308
-3C3308:lI116|H3C3338
-3C3338:lI114|H3C3360
-3C3360:lI101|H3C3380
-3C3380:lI97|H3C3398
-3C3398:lI109|N
-3C2A8C:lI99|H3C2B50
-3C2B50:lI108|H3C2C0C
-3C2C0C:lI97|H3C2CC0
-3C2CC0:lI115|H3C2D70
-3C2D70:lI115|N
-3C29DC:lH3C2A9C|H3C2AA8
-3C2A9C:t2:H3C2B60,H3C2B68
-3C2B68:lI97|H3C2C24
-3C2C24:lI112|H3C2CD8
-3C2CD8:lI112|H3C2D80
-3C2D80:lI108|H3C2E20
-3C2E20:lI105|H3C2EA8
-3C2EA8:lI99|H3C2F20
-3C2F20:lI97|H3C2F90
-3C2F90:lI116|H3C2FF8
-3C2FF8:lI105|H3C3060
-3C3060:lI111|H3C30C0
-3C30C0:lI110|H3C3118
-3C3118:lI47|H3C3168
-3C3168:lI109|H3C31B0
-3C31B0:lI115|H3C31F8
-3C31F8:lI119|H3C3240
-3C3240:lI111|H3C3288
-3C3288:lI114|H3C32D0
-3C32D0:lI100|N
-3C2B60:lI100|H3C2C1C
-3C2C1C:lI111|H3C2CD0
-3C2CD0:lI99|N
-3C2AA8:lH3C2B70|H3C2B7C
-3C2B70:t2:H3C2C2C,H3C2C34
-3C2C34:lI97|H3C2CE8
-3C2CE8:lI112|H3C2D90
-3C2D90:lI112|H3C2E28
-3C2E28:lI108|H3C2EB0
-3C2EB0:lI105|H3C2F28
-3C2F28:lI99|H3C2F98
-3C2F98:lI97|H3C3000
-3C3000:lI116|H3C3068
-3C3068:lI105|H3C30C8
-3C30C8:lI111|H3C3120
-3C3120:lI110|H3C3170
-3C3170:lI47|H3C31B8
-3C31B8:lI109|H3C3200
-3C3200:lI97|H3C3248
-3C3248:lI99|H3C3290
-3C3290:lI45|H3C32D8
-3C32D8:lI99|H3C3310
-3C3310:lI111|H3C3340
-3C3340:lI109|H3C3368
-3C3368:lI112|H3C3388
-3C3388:lI97|H3C33A0
-3C33A0:lI99|H3C33B0
-3C33B0:lI116|H3C33C0
-3C33C0:lI112|H3C33D0
-3C33D0:lI114|H3C33E0
-3C33E0:lI111|N
-3C2C2C:lI99|H3C2CE0
-3C2CE0:lI112|H3C2D88
-3C2D88:lI116|N
-3C2B7C:lH3C2C3C|N
-3C2C3C:t2:H3C2CF0,H3C2CF8
-3C2CF8:lI97|H3C2DA0
-3C2DA0:lI112|H3C2E38
-3C2E38:lI112|H3C2EB8
-3C2EB8:lI108|H3C2F30
-3C2F30:lI105|H3C2FA0
-3C2FA0:lI99|H3C3008
-3C3008:lI97|H3C3070
-3C3070:lI116|H3C30D0
-3C30D0:lI105|H3C3128
-3C3128:lI111|H3C3178
-3C3178:lI110|H3C31C0
-3C31C0:lI47|H3C3208
-3C3208:lI109|H3C3250
-3C3250:lI97|H3C3298
-3C3298:lI99|H3C32E0
-3C32E0:lI45|H3C3318
-3C3318:lI98|H3C3348
-3C3348:lI105|H3C3370
-3C3370:lI110|H3C3390
-3C3390:lI104|H3C33A8
-3C33A8:lI101|H3C33B8
-3C33B8:lI120|H3C33C8
-3C33C8:lI52|H3C33D8
-3C33D8:lI48|N
-3C2CF0:lI104|H3C2D98
-3C2D98:lI113|H3C2E30
-3C2E30:lI120|N
-3BDBCC:lH3BDA78|H3BDA8C
-3BDA78:t2:A4:port,I8888
-3BDA8C:lH3BDB04|H3BDB10
-3BDB04:t2:AC:bind_address,H3BDB64
-3BDB64:t4:I127,I0,I0,I1
-3BDB10:lH3BDB78|H3BDB84
-3BDB78:t2:AB:server_name,H3BDBD4
-3BDBD4:lI108|H3BDC24
-3BDC24:lI111|H3BDC88
-3BDC88:lI99|H3BDCF0
-3BDCF0:lI97|H3BDD70
-3BDD70:lI108|H3BDDF8
-3BDDF8:lI104|H3BDE90
-3BDE90:lI111|H3BDF40
-3BDF40:lI115|H3BDFFC
-3BDFFC:lI116|N
-3BDB84:lH3BDBDC|H3BDBE8
-3BDBDC:t2:AE:max_header_siz,I1024
-3BDBE8:lH3BDC2C|H3BDC38
-3BDC2C:t2:A11:max_header_action,A8:reply414
-3BDC38:lH3BDC90|H3BDC9C
-3BDC90:t2:A8:com_type,A7:ip_comm
-3BDC9C:lH3BDCF8|H3BDD04
-3BDCF8:t2:A7:modules,H3BDD78
-3BDD78:lA9:mod_alias|H3BDE00
-3BDE00:lA8:mod_auth|H3BDE98
-3BDE98:lA7:mod_esi|H3BDF48
-3BDF48:lAB:mod_actions|H3BE004
-3BE004:lA7:mod_cgi|H3BE0D0
-3BE0D0:lAB:mod_include|H3BE1A4
-3BE1A4:lA7:mod_dir|H3BE288
-3BE288:lA7:mod_get|H3BE378
-3BE378:lA8:mod_head|H3BE47C
-3BE47C:lA7:mod_log|H3BE580
-3BE580:lAC:mod_disk_log|N
-3BDD04:lH3BDD80|H3BDD8C
-3BDD80:t2:AF:directory_index,H3BDE08
-3BDE08:lH3BDEA0|N
-3BDEA0:lI105|H3BDF50
-3BDF50:lI110|H3BE00C
-3BE00C:lI100|H3BE0D8
-3BE0D8:lI101|H3BE1AC
-3BE1AC:lI120|H3BE290
-3BE290:lI46|H3BE380
-3BE380:lI104|H3BE484
-3BE484:lI116|H3BE588
-3BE588:lI109|H3BE68C
-3BE68C:lI108|N
-3BDD8C:lH3BDE10|H3BDE1C
-3BDE10:t2:AC:default_type,H3BDEA8
-3BDEA8:lI116|H3BDF58
-3BDF58:lI101|H3BE014
-3BE014:lI120|H3BE0E0
-3BE0E0:lI116|H3BE1B4
-3BE1B4:lI47|H3BE298
-3BE298:lI112|H3BE388
-3BE388:lI108|H3BE48C
-3BE48C:lI97|H3BE590
-3BE590:lI105|H3BE694
-3BE694:lI110|N
-3BDE1C:lH3BDEB0|H3BDEBC
-3BDEB0:t2:A10:erl_script_alias,H3BDF60
-3BDF60:t2:H3BE01C,H3BE024
-3BE024:lH3BE0F0|N
-3BE0F0:lI119|H3BE1C4
-3BE1C4:lI101|H3BE2A8
-3BE2A8:lI98|H3BE398
-3BE398:lI116|H3BE49C
-3BE49C:lI111|H3BE5A0
-3BE5A0:lI111|H3BE6A4
-3BE6A4:lI108|N
-3BE01C:lI47|H3BE0E8
-3BE0E8:lI119|H3BE1BC
-3BE1BC:lI101|H3BE2A0
-3BE2A0:lI98|H3BE390
-3BE390:lI116|H3BE494
-3BE494:lI111|H3BE598
-3BE598:lI111|H3BE69C
-3BE69C:lI108|N
-3BDEBC:lH3BDF6C|H3BDF78
-3BDF6C:t2:A5:alias,H3BE02C
-3BE02C:t2:H3BE0F8,H3BE100
-3BE100:lI47|H3BE1D4
-3BE1D4:lI99|H3BE2B8
-3BE2B8:lI108|H3BE3A8
-3BE3A8:lI101|H3BE4AC
-3BE4AC:lI97|H3BE5B0
-3BE5B0:lI114|H3BE6B4
-3BE6B4:lI99|H3BE7A8
-3BE7A8:lI97|H3BE894
-3BE894:lI115|H3BE980
-3BE980:lI101|H3BEA74
-3BEA74:lI47|H3BEB68
-3BEB68:lI111|H3BEC54
-3BEC54:lI116|H3BED40
-3BED40:lI112|H3BEE2C
-3BEE2C:lI47|H3BEF00
-3BEF00:lI101|H3BEFD4
-3BEFD4:lI114|H3BF0A0
-3BF0A0:lI116|H3BF174
-3BF174:lI115|H3BF238
-3BF238:lI47|H3BF2FC
-3BF2FC:lI108|H3BF3A8
-3BF3A8:lI105|H3BF45C
-3BF45C:lI98|H3BF518
-3BF518:lI47|H3BF5DC
-3BF5DC:lI111|H3BF6B0
-3BF6B0:lI98|H3BF784
-3BF784:lI115|H3BF858
-3BF858:lI101|H3BF93C
-3BF93C:lI114|H3BFA18
-3BFA18:lI118|H3BFAF4
-3BFAF4:lI101|H3BFBD0
-3BFBD0:lI114|H3BFC9C
-3BFC9C:lI47|H3BFD60
-3BFD60:lI112|H3BFE2C
-3BFE2C:lI114|H3BFEE0
-3BFEE0:lI105|H3BFF94
-3BFF94:lI118|H3C0040
-3C0040:lI47|H3C00EC
-3C00EC:lI99|H3C0198
-3C0198:lI114|H3C024C
-3C024C:lI97|H3C0308
-3C0308:lI115|H3C03BC
-3C03BC:lI104|H3C0458
-3C0458:lI100|H3C04F4
-3C04F4:lI117|H3C0590
-3C0590:lI109|H3C0634
-3C0634:lI112|H3C06E0
-3C06E0:lI95|H3C078C
-3C078C:lI118|H3C0830
-3C0830:lI105|H3C08BC
-3C08BC:lI101|H3C0950
-3C0950:lI119|H3C09E4
-3C09E4:lI101|H3C0A80
-3C0A80:lI114|N
-3BE0F8:lI47|H3BE1CC
-3BE1CC:lI99|H3BE2B0
-3BE2B0:lI114|H3BE3A0
-3BE3A0:lI97|H3BE4A4
-3BE4A4:lI115|H3BE5A8
-3BE5A8:lI104|H3BE6AC
-3BE6AC:lI100|H3BE7A0
-3BE7A0:lI117|H3BE88C
-3BE88C:lI109|H3BE978
-3BE978:lI112|H3BEA6C
-3BEA6C:lI95|H3BEB60
-3BEB60:lI118|H3BEC4C
-3BEC4C:lI105|H3BED38
-3BED38:lI101|H3BEE24
-3BEE24:lI119|H3BEEF8
-3BEEF8:lI101|H3BEFCC
-3BEFCC:lI114|N
-3BDF78:lH3BE038|H3BE044
-3BE038:t2:A5:alias,H3BE108
-3BE108:t2:H3BE1DC,H3BE1E4
-3BE1E4:lI47|H3BE2C8
-3BE2C8:lI99|H3BE3B8
-3BE3B8:lI108|H3BE4BC
-3BE4BC:lI101|H3BE5C0
-3BE5C0:lI97|H3BE6C4
-3BE6C4:lI114|H3BE7B8
-3BE7B8:lI99|H3BE8A4
-3BE8A4:lI97|H3BE990
-3BE990:lI115|H3BEA84
-3BEA84:lI101|H3BEB78
-3BEB78:lI47|H3BEC64
-3BEC64:lI111|H3BED50
-3BED50:lI116|H3BEE3C
-3BEE3C:lI112|H3BEF10
-3BEF10:lI47|H3BEFE4
-3BEFE4:lI101|H3BF0B0
-3BF0B0:lI114|H3BF184
-3BF184:lI116|H3BF248
-3BF248:lI115|H3BF304
-3BF304:lI47|H3BF3B0
-3BF3B0:lI101|H3BF464
-3BF464:lI114|H3BF520
-3BF520:lI116|H3BF5E4
-3BF5E4:lI115|H3BF6B8
-3BF6B8:lI47|H3BF78C
-3BF78C:lI100|H3BF860
-3BF860:lI111|H3BF944
-3BF944:lI99|H3BFA20
-3BFA20:lI47|H3BFAFC
-3BFAFC:lI104|H3BFBD8
-3BFBD8:lI116|H3BFCA4
-3BFCA4:lI109|H3BFD68
-3BFD68:lI108|N
-3BE1DC:lI47|H3BE2C0
-3BE2C0:lI99|H3BE3B0
-3BE3B0:lI114|H3BE4B4
-3BE4B4:lI97|H3BE5B8
-3BE5B8:lI115|H3BE6BC
-3BE6BC:lI104|H3BE7B0
-3BE7B0:lI100|H3BE89C
-3BE89C:lI117|H3BE988
-3BE988:lI109|H3BEA7C
-3BEA7C:lI112|H3BEB70
-3BEB70:lI95|H3BEC5C
-3BEC5C:lI101|H3BED48
-3BED48:lI114|H3BEE34
-3BEE34:lI116|H3BEF08
-3BEF08:lI115|H3BEFDC
-3BEFDC:lI95|H3BF0A8
-3BF0A8:lI100|H3BF17C
-3BF17C:lI111|H3BF240
-3BF240:lI99|N
-3BE044:lH3BE114|H3BE120
-3BE114:t2:A5:alias,H3BE1EC
-3BE1EC:t2:H3BE2D0,H3BE2D8
-3BE2D8:lI47|H3BE3C8
-3BE3C8:lI99|H3BE4CC
-3BE4CC:lI108|H3BE5D0
-3BE5D0:lI101|H3BE6D4
-3BE6D4:lI97|H3BE7C8
-3BE7C8:lI114|H3BE8B4
-3BE8B4:lI99|H3BE9A0
-3BE9A0:lI97|H3BEA94
-3BEA94:lI115|H3BEB88
-3BEB88:lI101|H3BEC74
-3BEC74:lI47|H3BED60
-3BED60:lI111|H3BEE4C
-3BEE4C:lI116|H3BEF20
-3BEF20:lI112|H3BEFEC
-3BEFEC:lI47|H3BF0B8
-3BF0B8:lI101|H3BF18C
-3BF18C:lI114|H3BF250
-3BF250:lI116|H3BF30C
-3BF30C:lI115|H3BF3B8
-3BF3B8:lI47|H3BF46C
-3BF46C:lI108|H3BF528
-3BF528:lI105|H3BF5EC
-3BF5EC:lI98|H3BF6C0
-3BF6C0:lI47|H3BF794
-3BF794:lI111|H3BF868
-3BF868:lI98|H3BF94C
-3BF94C:lI115|H3BFA28
-3BFA28:lI101|H3BFB04
-3BFB04:lI114|H3BFBE0
-3BFBE0:lI118|H3BFCAC
-3BFCAC:lI101|H3BFD70
-3BFD70:lI114|H3BFE34
-3BFE34:lI47|H3BFEE8
-3BFEE8:lI100|H3BFF9C
-3BFF9C:lI111|H3C0048
-3C0048:lI99|H3C00F4
-3C00F4:lI47|H3C01A0
-3C01A0:lI104|H3C0254
-3C0254:lI116|H3C0310
-3C0310:lI109|H3C03C4
-3C03C4:lI108|N
-3BE2D0:lI47|H3BE3C0
-3BE3C0:lI99|H3BE4C4
-3BE4C4:lI114|H3BE5C8
-3BE5C8:lI97|H3BE6CC
-3BE6CC:lI115|H3BE7C0
-3BE7C0:lI104|H3BE8AC
-3BE8AC:lI100|H3BE998
-3BE998:lI117|H3BEA8C
-3BEA8C:lI109|H3BEB80
-3BEB80:lI112|H3BEC6C
-3BEC6C:lI95|H3BED58
-3BED58:lI100|H3BEE44
-3BEE44:lI111|H3BEF18
-3BEF18:lI99|N
-3BE120:lH3BE1F8|N
-3BE1F8:t2:A10:erl_script_alias,H3BE2E0
-3BE2E0:t2:H3BE3D0,H3BE3D8
-3BE3D8:lH3BE4DC|N
-3BE4DC:lI99|H3BE5E0
-3BE5E0:lI114|H3BE6E4
-3BE6E4:lI97|H3BE7D8
-3BE7D8:lI115|H3BE8C4
-3BE8C4:lI104|H3BE9B0
-3BE9B0:lI100|H3BEAA4
-3BEAA4:lI117|H3BEB90
-3BEB90:lI109|H3BEC7C
-3BEC7C:lI112|H3BED68
-3BED68:lI95|H3BEE54
-3BEE54:lI118|H3BEF28
-3BEF28:lI105|H3BEFF4
-3BEFF4:lI101|H3BF0C0
-3BF0C0:lI119|H3BF194
-3BF194:lI101|H3BF258
-3BF258:lI114|N
-3BE3D0:lI47|H3BE4D4
-3BE4D4:lI99|H3BE5D8
-3BE5D8:lI100|H3BE6DC
-3BE6DC:lI118|H3BE7D0
-3BE7D0:lI95|H3BE8BC
-3BE8BC:lI101|H3BE9A8
-3BE9A8:lI114|H3BEA9C
-3BEA9C:lI108|N
-3BDE2C:lH3BDA9C|H3BDECC
-3BDA9C:t4:I127,I0,I0,I1
-3BDECC:lI8888|H3BDF88
-3BDF88:lN|N
-3BDD1C:lN|N
-3BDA50:t2:AD:$initial_call,H3BDAB8
-3BDAB8:t3:A3:gen,A7:init_it,H3BDAB0
-3BDA5C:t2:A9:verbosity,A7:silence
-3BDAC8:t2:AE:auth_verbosity,A7:silence
-3BDB28:t2:A12:security_verbosity,A7:silence
-3BDB9C:t2:A12:acceptor_verbosity,A7:silence
-3BDC00:t2:AA:$ancestors,H3BDC5C
-3BDC5C:lA1A:httpd_sup__127_0_0_1__8888|H3BDCB4
-3BDCB4:lA8:web_tool|H3BDD24
-3BDD24:lP<0.27.0>|N
-3BDADC:t2:A19:request_handler_verbosity,A7:silence
-3BDB3C:t2:A5:sname,A3:man
-=proc_dictionary:<0.47.0>
-H36E688
-H36E694
-H36E6A0
-H36E6AC
-=proc_stack:<0.47.0>
-36c520:SReturn addr 0x362C9C (inet_tcp:accept/2 + 20)
-y0:I5
-y1:p<0.161>
-y2:p<0.141>
-36c530:SReturn addr 0x500C5C (httpd_socket:accept/3 + 280)
-y0:N
-36c538:SReturn addr 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y0:N
-36c540:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:SCatch 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y1:P<0.46.0>
-y2:A7:ip_comm
-y3:p<0.141>
-y4:A1B:httpd_conf__127_0_0_1__8888
-36c558:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:AE:httpd_acceptor
-y2:A8:acceptor
-y3:H36E6C8
-=proc_heap:<0.47.0>
-36E6C8:lP<0.44.0>|H36E724
-36E724:lP<0.46.0>|H36E748
-36E748:lA7:ip_comm|H36E760
-36E760:lH36E6D0|H36E778
-36E6D0:t4:I127,I0,I0,I1
-36E778:lI8888|H36E788
-36E788:lA1B:httpd_conf__127_0_0_1__8888|H36E798
-36E798:lA7:silence|N
-36E688:t2:AD:$initial_call,H36E6F0
-36E6F0:t3:AE:httpd_acceptor,A8:acceptor,H36E6C8
-36E694:t2:A9:verbosity,A7:silence
-36E6A0:t2:AA:$ancestors,H36E700
-36E700:lA1E:httpd_acc_sup__127_0_0_1__8888|H36E72C
-36E72C:lA1A:httpd_sup__127_0_0_1__8888|H36E750
-36E750:lA8:web_tool|H36E768
-36E768:lP<0.27.0>|N
-36E6AC:t2:A5:sname,A3:acc
-=proc_dictionary:<0.48.0>
-H385E48
-H385E54
-=proc_stack:<0.48.0>
-3ac1bc:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A10:crashdump_viewer
-y3:H3AB280
-y4:A17:crashdump_viewer_server
-y5:P<0.41.0>
-3ac1d8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H385E90
-=proc_heap:<0.48.0>
-3AB280:t8:A5:state,A9:undefined,A9:undefined,A9:undefined,A5:false,I4,A9:undefined,P<0.56.0>
-385E90:lAA:gen_server|H385ED8
-385ED8:lP<0.41.0>|H385F10
-385F10:lP<0.41.0>|H385F58
-385F58:lH385FA8|H385FB4
-385FA8:t2:A5:local,A17:crashdump_viewer_server
-385FB4:lA10:crashdump_viewer|H386014
-386014:lN|H38606C
-38606C:lN|N
-385E48:t2:AD:$initial_call,H385EB0
-385EB0:t3:A3:gen,A7:init_it,H385E90
-385E54:t2:AA:$ancestors,H385EC0
-385EC0:lA6:websup|H385F08
-385F08:lA8:web_tool|H385F50
-385F50:lP<0.27.0>|N
-=proc_stack:<0.49.0>
-36a114:SReturn addr 0x30174C (io:parse_erl_exprs/3 + 92)
-y0:H369E10
-y1:P<0.22.0>
-36a120:SReturn addr 0x2E5360 (shell:'-get_command/4-fun-0-'/1 + 20)
-y0:N
-36a128:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.49.0>
-369E10:E21:8372000364000D6E6F6E6F6465406E6F686F737400000001330000000000000000
-=atoms
-http_cache_control
-copy_word
-drop_line
-copy_line
-write_rest_of_line
-drop_to_empty_line
-read_to_empty_line_reverse
-set_pos
-read_line_backwards
-jumped
-jump_to_empty_line_or_eof
-get_pos
-translate_atoms
-translate_fun
-translate_funs
-translate_loaded_modules2
-translate_loaded_modules_totals
-translate_loaded_modules
-translate_links
-get_all_creations
-translate_node_info2
-translate_node_info
-translate_dist_info2
-translate_dist_info
-get_msg
-translate_timers
-translate_ets
-translate_ets_tables
-do_translate_sl_alloc_r7_r8
-translate_sl_alloc_r7_r8
-translate_sl_alloc_line
-do_translate_sl_alloc
-translate_sl_alloc
-translate_memory_and_allocated_area_r9b
-translate_allocated_areas
-translate_internal_table_line
-translate_index_table
-translate_hash_table
-translate_internal_tables
-translate_ports
-write_last_calls
-write_msg_q_stuff
-translate_process
-translate_processes
-erts_vsn
-translate_summary
-'Send'
-erl_crash_dump
-internal_tables
-mods
-zombies
-http_content_length
-http_content_type
-'-procs_summary_body/5-fun-0-'
-'-expanded_memory_body/2-fun-0-'
-'-expanded_memory_body/2-fun-1-'
-'-expanded_memory_body/2-fun-2-'
-'-ports_body/3-fun-0-'
-'-ets_tables_body/4-fun-0-'
-'-internal_ets_tables_table/1-fun-0-'
-'-timers_body/3-fun-0-'
-'-make_nodes_table/2-fun-0-'
-'-loaded_mods_body/5-fun-0-'
-'-funs_body/3-fun-0-'
-'-memory_body/3-fun-0-'
-'-allocated_areas_body/3-fun-0-'
-'-allocator_info_body/3-fun-0-'
-'-allocator_info_body/3-fun-1-'
-'-allocator_info_body/3-fun-2-'
-'-hash_tables_body/3-fun-0-'
-'-index_tables_body/3-fun-0-'
-enter_write_file
-replace_insrt
-'$insrt'
-special
-initial
-pretty_format
-heading
-to_gt_noreverse
-to_gt
-href_proc_port
-br
-font
-h2
-h1
-img
-href
-pre
-em
-td
-th
-tr
-frame
-frameset
-html_header
-index_tables_table
-index_tables_body
-hash_tables_table
-hash_tables_body
-allocator_info_body
\ No newline at end of file
diff --git a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.250atoms b/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.250atoms
deleted file mode 100644
index ce3e5d8228..0000000000
--- a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.250atoms
+++ /dev/null
@@ -1,13285 +0,0 @@
-=erl_crash_dump:0.1
-Wed Apr 21 13:22:44 2004
-Slogan: eheap_alloc: Cannot allocate 785672 bytes of memory (of type "heap").
-System version: Erlang (BEAM) emulator version 5.4 [source] [hipe] [threads:0]
-Compiled: Thu Dec 18 14:07:45 2003
-Atoms: 5614
-=memory
-total: 653336887
-processes: 1768396
-processes_used: 1765460
-system: 651568491
-atom: 244837
-atom_used: 237116
-binary: 648618369
-code: 2158413
-ets: 225620
-=hash_table:atom_tab
-size: 4813
-used: 3304
-objs: 5614
-depth: 7
-=index_table:atom_tab
-size: 5700
-limit: 1048576
-used: 5614
-rate: 100
-=hash_table:module_code
-size: 97
-used: 69
-objs: 107
-depth: 5
-=index_table:module_code
-size: 110
-limit: 65536
-used: 107
-rate: 10
-=hash_table:export_list
-size: 2411
-used: 1674
-objs: 2843
-depth: 6
-=index_table:export_list
-size: 2900
-limit: 65536
-used: 2843
-rate: 100
-=hash_table:process_reg
-size: 47
-used: 16
-objs: 23
-depth: 3
-=hash_table:fun_table
-size: 397
-used: 261
-objs: 400
-depth: 4
-=hash_table:node_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=hash_table:dist_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=allocated_areas
-processes: 1765460 1768396
-ets: 225620
-sys_misc: 24634
-static: 295033
-atom_space: 65544 57967
-binary: 648618369
-atom_table: 42141
-module_table: 920
-export_table: 21336
-register_table: 252
-fun_table: 1650
-module_refs: 1024
-loaded_code: 1968915
-dist_table: 159
-node_table: 131
-bits_bufs_size: 19
-bif_timer: 13392
-link_lh: 0
-dist_buf: 0
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:sys_alloc
-option e: true
-option m: libc
-=allocator:temp_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 90
-option rsbcmt: 80
-option mmbcs: 65536
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: af
-mbcs blocks: 0 9 9
-mbcs blocks size: 0 35376 35376
-mbcs carriers: 1 1 1
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 65568 65568 65568
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 65568
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-temp_alloc calls: 6155
-temp_free calls: 6155
-temp_realloc calls: 29
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 1
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:sl_alloc
-option e: false
-=allocator:std_alloc
-option e: false
-=allocator:ll_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 4294967295
-option asbcst: 0
-option rsbcst: 0
-option rsbcmt: 0
-option mmbcs: 2097152
-option mmsbc: 0
-option mmmbc: 0
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: aobf
-mbcs blocks: 592 592 592
-mbcs blocks size: 2838520 2863304 2863304
-mbcs carriers: 2 2 2
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 2
-mbcs carriers size: 3145760 3145760 3145760
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 3145760
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-ll_alloc calls: 592
-ll_free calls: 0
-ll_realloc calls: 235
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 2
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:eheap_alloc
-versions: 2.1 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 50
-option rsbcmt: 80
-option mmbcs: 524288
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option mbsd: 3
-option as: gf
-mbcs blocks: 56 102 102
-mbcs blocks size: 833280 1638920 1638920
-mbcs carriers: 2 3 3
-mbcs mseg carriers: 1
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 1998880 3047456 3047456
-mbcs mseg carriers size: 1474560
-mbcs sys_alloc carriers size: 524320
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-eheap_alloc calls: 6971
-eheap_free calls: 6914
-eheap_realloc calls: 461
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-sys_alloc calls: 3
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:binary_alloc
-option e: false
-=allocator:ets_alloc
-option e: false
-=allocator:fix_alloc
-option e: true
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:mseg_alloc
-version: 0.9
-option amcbf: 4194304
-option rmcbf: 20
-option mcs: 5
-option cci: 1000
-cached_segments: 0
-cache_hits: 13
-segments: 2
-segments_watermark: 2
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-mseg_create calls: 4
-mseg_destroy calls: 1
-mseg_clear_cache calls: 6
-mseg_check_cache calls: 2
-=allocator:alloc_util
-option mmc: 1024
-option ycs: 1048576
-=allocator:instr
-option m: false
-option s: false
-option t: false
-=proc:<0.0.0>
-State: Waiting
-Name: init
-Spawned as: otp_ring0:start/2
-Spawned by: []
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.5.0>,<0.4.0>,<0.2.0>]
-Reductions: 3851
-Stack+heap: 377
-OldHeap: 610
-Heap unused: 53
-OldHeap unused: 610
-Program counter: 0x1f496c (init:loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.2.0>
-State: Waiting
-Name: erl_prim_loader
-Spawned as: erlang:apply/2
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.0.0>,#Port<0.2>]
-Reductions: 201036
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 923
-OldHeap unused: 987
-Program counter: 0x20cc94 (erl_prim_loader:loop/3 + 52)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.4.0>
-State: Waiting
-Name: error_logger
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.0.0>]
-Reductions: 296
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 851
-OldHeap unused: 0
-Program counter: 0x21f5b8 (gen_event:loop/4 + 40)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.5.0>
-State: Waiting
-Name: application_controller
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.7.0>,<0.0.0>]
-Reductions: 1508
-Stack+heap: 1597
-OldHeap: 0
-Heap unused: 835
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.7.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.6.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.8.0>,<0.5.0>]
-Reductions: 23
-Stack+heap: 377
-OldHeap: 0
-Heap unused: 79
-OldHeap unused: 0
-Program counter: 0x248d04 (application_master:main_loop/2 + 28)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.8.0>
-State: Waiting
-Spawned as: application_master:start_it/4
-Spawned by: <0.7.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>,<0.7.0>]
-Reductions: 91
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 177
-OldHeap unused: 0
-Program counter: 0x24a26c (application_master:loop_it/4 + 40)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.9.0>
-State: Waiting
-Name: kernel_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.8.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.24.0>,<0.23.0>,<0.19.0>,<0.18.0>,<0.17.0>,<0.16.0>,<0.15.0>,<0.14.0>,<0.11.0>,<0.10.0>,<0.8.0>]
-Reductions: 7402
-Stack+heap: 610
-OldHeap: 987
-Heap unused: 311
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.10.0>
-State: Waiting
-Name: rex
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 44
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 144
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.11.0>
-State: Waiting
-Name: global_name_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.13.0>,<0.12.0>,<0.9.0>]
-Reductions: 47
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 98
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.12.0>
-State: Waiting
-Spawned as: global:init_the_locker/1
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 3
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 227
-OldHeap unused: 0
-Program counter: 0x261340 (global:loop_the_locker/2 + 92)
-CP: 0x261184 (global:init_the_locker/1 + 112)
-arity = 0
-=proc:<0.13.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 4
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 221
-OldHeap unused: 0
-Program counter: 0x265288 (global:collect_deletions/2 + 76)
-CP: 0x2651ac (global:loop_the_deleter/1 + 36)
-arity = 0
-=proc:<0.14.0>
-State: Waiting
-Name: inet_db
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 376
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 30
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.15.0>
-State: Waiting
-Name: global_group
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 71
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 92
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.16.0>
-State: Waiting
-Name: file_server_2
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 119
-Link list: [{from,<0.17.0>,#Ref<0.0.0.22>},#Port<0.4>,<0.9.0>]
-Reductions: 83605
-Stack+heap: 4181
-OldHeap: 4181
-Heap unused: 1720
-OldHeap unused: 4181
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.17.0>
-State: Waiting
-Name: file_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.16.0>,#Ref<0.0.0.22>},<0.9.0>]
-Reductions: 12
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 207
-OldHeap unused: 0
-Program counter: 0x2a18e8 (old_file_server:relay_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.18.0>
-State: Waiting
-Name: code_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 108900
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 4389
-OldHeap unused: 6765
-Program counter: 0x2a6e64 (code_server:loop/1 + 64)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.19.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.9.0>]
-Reductions: 74
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 180
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.20.0>
-State: Waiting
-Spawned as: user_drv:server/2
-Spawned by: <0.19.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.22.0>,<0.21.0>,#Port<0.72>]
-Reductions: 596
-Stack+heap: 233
-OldHeap: 377
-Heap unused: 214
-OldHeap unused: 377
-Program counter: 0x2ca4e0 (user_drv:server_loop/5 + 56)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.21.0>
-State: Waiting
-Name: user
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.4.0>,<0.19.0>,<0.20.0>]
-Reductions: 26
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 202
-OldHeap unused: 0
-Program counter: 0x2cd9d8 (group:server_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.22.0>
-State: Waiting
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{from,<0.49.0>,#Ref<0.0.0.307>},<0.25.0>,<0.20.0>]
-Reductions: 1244
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 40
-OldHeap unused: 233
-Program counter: 0x2cf238 (group:get_line1/3 + 1652)
-CP: 0x2cf230 (group:get_line1/3 + 1644)
-arity = 0
-=proc:<0.23.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 45
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 63
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.24.0>
-State: Waiting
-Name: kernel_safe_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.31.0>,<0.9.0>]
-Reductions: 133
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 198
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.25.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.22.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.49.0>,<0.27.0>,<0.22.0>]
-Reductions: 161
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 169
-OldHeap unused: 0
-Program counter: 0x2e0d00 (shell:get_command1/4 + 40)
-CP: 0x2e06fc (shell:server_loop/6 + 140)
-arity = 0
-=proc:<0.27.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.25.0>]
-Reductions: 506
-Stack+heap: 4181
-OldHeap: 0
-Heap unused: 1131
-OldHeap unused: 0
-Program counter: 0x2e2bbc (shell:eval_loop/2 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.31.0>
-State: Waiting
-Name: inet_gethost_native_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.24.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.32.0>,<0.24.0>]
-Reductions: 49
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 87
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.32.0>
-State: Waiting
-Name: inet_gethost_native
-Spawned as: inet_gethost_native:server_init/2
-Spawned by: <0.31.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 118
-Link list: [#Port<0.105>,<0.31.0>]
-Reductions: 65
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 13
-OldHeap unused: 0
-Program counter: 0x4ad840 (inet_gethost_native:main_loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.33.0>
-State: Waiting
-Name: web_tool
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.27.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.41.0>]
-Reductions: 131773
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 2941
-OldHeap unused: 6765
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.41.0>
-State: Waiting
-Name: websup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.48.0>,<0.33.0>]
-Reductions: 118
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 205
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.43.0>
-State: Waiting
-Name: httpd_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.46.0>,<0.45.0>,<0.44.0>]
-Reductions: 1220
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 277
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.44.0>
-State: Waiting
-Name: httpd_acc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.47.0>,<0.43.0>]
-Reductions: 147
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 77
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.45.0>
-State: Waiting
-Name: httpd_misc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 52
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 80
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.46.0>
-State: Waiting
-Name: httpd__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 2905
-Stack+heap: 6765
-OldHeap: 10946
-Heap unused: 138
-OldHeap unused: 10946
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.47.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.44.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [#Port<0.161>,#Port<0.141>,<0.44.0>]
-Reductions: 874
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 190
-OldHeap unused: 233
-Program counter: 0x1fe798 (prim_inet:accept0/2 + 96)
-CP: 0x1feb04 (prim_inet:async_accept/2 + 380)
-arity = 0
-=proc:<0.48.0>
-State: Waiting
-Name: crashdump_viewer_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.41.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.56.0>,<0.41.0>]
-Reductions: 1913
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 524
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.49.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.22.0>,#Ref<0.0.0.307>},<0.25.0>]
-Reductions: 15
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 190
-OldHeap unused: 0
-Program counter: 0x301d58 (io:wait_io_mon_reply/2 + 28)
-CP: 0x30174c (io:parse_erl_exprs/3 + 92)
-arity = 0
-=proc:<0.56.0>
-State: Garbing
-Spawned as: erlang:apply/2
-Last scheduled in for: erlang:garbage_collect/0
-Spawned by: <0.48.0>
-Started: Wed Apr 21 13:22:27 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 121
-Link list: [#Port<0.158>,#Port<0.157>,<0.48.0>]
-Reductions: 2420470
-Stack+heap: 121393
-OldHeap: 0
-Heap unused: 22172
-OldHeap unused: 0
-New heap start: FE5768E0
-New heap top: FE5D7734
-Stack top: FE5ED130
-Stack end: FE5ED1A4
-Old heap start: 0
-Old heap top: 0
-Old heap end: 0
-Program counter: 0x1a4980 (unknown function)
-CP: 0x20710c (prim_file:read/2 + 436)
-=port:#Port<0.1>
-Slot: 1
-Connected: #Port<0.0>
-Port controls linked-in driver: async
-=port:#Port<0.2>
-Slot: 2
-Connected: <0.2.0>
-Links: <0.2.0>
-Port controls linked-in driver: efile
-=port:#Port<0.4>
-Slot: 4
-Connected: <0.16.0>
-Links: <0.16.0>
-Port controls linked-in driver: efile
-=port:#Port<0.72>
-Slot: 72
-Connected: <0.20.0>
-Links: <0.20.0>
-Port controls linked-in driver: tty_sl -c -e
-=port:#Port<0.105>
-Slot: 105
-Connected: <0.32.0>
-Links: <0.32.0>
-Port controls external process: inet_gethost 4 
-=port:#Port<0.141>
-Slot: 141
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=port:#Port<0.157>
-Slot: 157
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.158>
-Slot: 158
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.161>
-Slot: 161
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=ets:<0.18.0>
-Slot: 9
-Table: 9
-Name: code
-Buckets: 256 
-Objects: 289
-Words: 14108
-=ets:<0.18.0>
-Slot: 10
-Table: 10
-Name: code_names
-Buckets: 256 
-Objects: 47
-Words: 4334
-=ets:<0.32.0>
-Slot: 11
-Table: 11
-Name: ign_requests
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.32.0>
-Slot: 12
-Table: 12
-Name: ign_req_index
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.33.0>
-Slot: 13
-Table: 13
-Name: app_data
-Buckets: 256 
-Objects: 7
-Words: 952
-=ets:<0.46.0>
-Slot: 15
-Table: 15
-Name: httpd_mime__127_0_0_1__8888
-Buckets: 256 
-Objects: 105
-Words: 5742
-=ets:<0.11.0>
-Slot: 84
-Table: global_names
-Name: global_names
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 95
-Table: global_locks
-Name: global_locks
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 96
-Table: global_names_ext
-Name: global_names_ext
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.14.0>
-Slot: 316
-Table: inet_cache
-Name: inet_cache
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 340
-Table: cdv_menu_table
-Name: cdv_menu_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 341
-Table: cdv_dump_index_table
-Name: cdv_dump_index_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 342
-Table: cdv_decode_heap_table
-Name: cdv_decode_heap_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.16.0>
-Slot: 780
-Table: file_io_servers
-Name: file_io_servers
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.46.0>
-Slot: 984
-Table: httpd_conf__127_0_0_1__8888
-Name: httpd_conf__127_0_0_1__8888
-Buckets: 256 
-Objects: 17
-Words: 1176
-=ets:<0.14.0>
-Slot: 1342
-Table: inet_hosts
-Name: inet_hosts
-Buckets: 256 
-Objects: 4
-Words: 421
-=ets:<0.14.0>
-Slot: 1362
-Table: inet_db
-Name: inet_db
-Buckets: 256 
-Objects: 20
-Words: 671
-=ets:<0.5.0>
-Slot: 1655
-Table: ac_tab
-Name: ac_tab
-Buckets: 256 
-Objects: 6
-Words: 843
-=timer:<0.14.0>
-Message: refresh_timeout
-Time left: 3565692 ms
-=node:'nonode@nohost'
-=no_distribution
-=loaded_modules
-Current code: 1968915
-Old code: 0
-=mod:otp_ring0
-Current size: 489
-=mod:init
-Current size: 30110
-=mod:prim_inet
-Current size: 35532
-=mod:prim_file
-Current size: 24965
-=mod:erl_prim_loader
-Current size: 19607
-=mod:erlang
-Current size: 11137
-=mod:error_handler
-Current size: 2389
-Current attributes: 836C00000001680264000376736E6C000000016E100030769A34345F26EF6D3433254FF2AE576A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161216802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F68616E646C65722E65726C6A
-=mod:heart
-Current size: 6687
-Current attributes: 836C00000001680264000376736E6C000000016E10003094F7BECF345494DDBB4D7186E694186A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261086802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F68656172742E65726C6A
-=mod:error_logger
-Current size: 7051
-Current attributes: 836C00000001680264000376736E6C000000016E10004E3347F841DEAE2EB6A74389E6E127146A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161246802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F6C6F676765722E65726C6A
-=mod:gen_event
-Current size: 18288
-Current attributes: 836C00000001680264000376736E6C000000016E1000336F22DF1EA75E0EA4AE65D3B8C34F946A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61346802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F6576656E742E65726C6A
-=mod:gen
-Current size: 7129
-Current attributes: 836C00000001680264000376736E6C000000016E10007BE6AEB66EF48D8B33323C89C9936A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61316802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E2E65726C6A
-=mod:proc_lib
-Current size: 11658
-Current attributes: 836C00000001680264000376736E6C000000016E10005C589A8C9BD2E1F2E895E765CAE983406A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E612D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F70726F635F6C69622E65726C6A
-=mod:application_controller
-Current size: 55249
-Current attributes: 836C00000002680264000376736E6C000000016E10003372E1AB0410565065FA086086A721316A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061246802640006736F757263656B003D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F636F6E74726F6C6C65722E65726C6A
-=mod:gen_server
-Current size: 18728
-Current attributes: 836C00000001680264000376736E6C000000016E10004C5E93533036DAC7698FC4112F59CF236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61396802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F7365727665722E65726C6A
-=mod:sys
-Current size: 11589
-Current attributes: 836C00000001680264000376736E6C000000016E1000E12B0E8267551204BD5924BAB9629ADF6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61176802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7379732E65726C6A
-=mod:lists
-Current size: 18638
-Current attributes: 836C00000002680264000376736E6C000000016E10001E95B32C30E4CDAF0BDD1ABA58CBB5F36A680264000A646570726563617465646C0000000B68026400066B65796D617061046802640003616C6C61036802640003616E79610368026400036D617061036802640007666C61746D617061036802640005666F6C646C61046802640005666F6C64726104680264000666696C746572610368026400086D6170666F6C646C610468026400086D6170666F6C647261046802640007666F726561636861036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61116802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374732E65726C6A
-=mod:application
-Current size: 2666
-Current attributes: 836C00000001680264000376736E6C000000016E1000C0C5A7B67B306300FEFF9D91AA50ECB36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130611F6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E2E65726C6A
-=mod:application_master
-Current size: 10912
-Current attributes: 836C00000001680264000376736E6C000000016E1000360420F5CEB80AD7DD51B3A8A0E2AFA26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061266802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F6D61737465722E65726C6A
-=mod:kernel
-Current size: 7639
-Current attributes: 836C00000002680264000376736E6C000000016E10004D418ACCB0F948D4D3CA6B9A81B462746A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261336802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C2E65726C6A
-=mod:supervisor
-Current size: 24469
-Current attributes: 836C00000002680264000376736E6C000000016E1000979F65727577135484BE0892A35087CC6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61126802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F722E65726C6A
-=mod:rpc
-Current size: 14539
-Current attributes: 836C00000002680264000376736E6C000000016E10008C5D6242D36B3201E3B11E82D5E1581E6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133610F6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7270632E65726C6A
-=mod:gb_trees
-Current size: 8274
-Current attributes: 836C00000001680264000376736E6C000000016E1000094BEFDE7B866EF2CB6FCD895AC2EE056A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67625F74726565732E65726C6A
-=mod:global
-Current size: 40753
-Current attributes: 836C00000002680264000376736E6C000000016E10001D02C89BDE6CB2052F099894683C14CA6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161386802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C2E65726C6A
-=mod:inet_db
-Current size: 34555
-Current attributes: 836C00000001680264000376736E6C000000016E1000C1CF6A6F2E83D4EBC23D2CCECBF376226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132611A6802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F64622E65726C6A
-=mod:inet_config
-Current size: 13575
-Current attributes: 836C00000001680264000376736E6C000000016E1000650F6571C03BC9C16BB7973A747565066A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261166802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F636F6E6669672E65726C6A
-=mod:os
-Current size: 5997
-Current attributes: 836C00000001680264000376736E6C000000016E100017144CD766A604A9DFBA0B58C8FCA78B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361056802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F732E65726C6A
-=mod:inet_udp
-Current size: 2451
-Current attributes: 836C00000001680264000376736E6C000000016E1000ACB163E87A687A6683B50B331C6E289B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261306802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7564702E65726C6A
-=mod:inet
-Current size: 28288
-Current attributes: 836C00000001680264000376736E6C000000016E10009B9AD400F0BAF6AAF17A4788A4EFF11E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132610C6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65742E65726C6A
-=mod:inet_parse
-Current size: 21928
-Current attributes: 836C00000001680264000376736E6C000000016E1000E0E65454C096847749930EDC1C53C80B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261266802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F70617273652E65726C6A
-=mod:filename
-Current size: 17411
-Current attributes: 836C00000001680264000376736E6C000000016E100068085214F459D51A3E08819BF8D7698A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61296802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656E616D652E65726C6A
-=mod:inet_hosts
-Current size: 3745
-Current attributes: 836C00000001680264000376736E6C000000016E1000E7430304E86230057150DEE5D279881F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261226802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F686F7374732E65726C6A
-=mod:erl_distribution
-Current size: 2512
-Current attributes: 836C00000002680264000376736E6C000000016E1000CDE49D63ACA767E0D49679657E99D2046A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161186802640006736F757263656B00372F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F65726C5F646973747269627574696F6E2E65726C6A
-=mod:global_group
-Current size: 30960
-Current attributes: 836C00000002680264000376736E6C000000016E10008ECE759E5920988CA3ACFF34B32F86736A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131613B6802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C5F67726F75702E65726C6A
-=mod:net_kernel
-Current size: 37648
-Current attributes: 836C00000002680264000376736E6C000000016E1000967CE7DE41F9B39906CCCF3225E6E5286A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361026802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6E65745F6B65726E656C2E65726C6A
-=mod:file_server
-Current size: 8372
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF90906EC6204204AC0A77C4A25B65236A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612D6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F7365727665722E65726C6A
-=mod:old_file_server
-Current size: 3074
-Current attributes: 836C00000001680264000376736E6C000000016E1000C802085DD76D4EFBA6A8F528FECB94B36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612F6802640006736F757263656B00362F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F6C645F66696C655F7365727665722E65726C6A
-=mod:code
-Current size: 7419
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE618E3041C8E3807A3719CD5140DF5E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130612E6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64652E65726C6A
-=mod:code_server
-Current size: 30811
-Current attributes: 836C00000001680264000376736E6C000000016E0F00BFB96248C2CA8601B4CB7F543F52E26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061346802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F7365727665722E65726C6A
-=mod:code_aux
-Current size: 1736
-Current attributes: 836C00000001680264000376736E6C000000016E10007A90DB53FCCECD52504F20E7A3B6BAE26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061316802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F6175782E65726C6A
-=mod:packages
-Current size: 3119
-Current attributes: 836C00000001680264000376736E6C000000016E1000044DC8EEB65F178AE23EF2465E1954496A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361076802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7061636B616765732E65726C6A
-=mod:hipe_unified_loader
-Current size: 37330
-Current attributes: 836C00000001680264000376736E6C000000016E1000DABD57945702E56F4B3AA7B7B19C1D166A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361326802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F756E69666965645F6C6F616465722E65726C6A
-=mod:hipe_sparc_loader
-Current size: 1821
-Current attributes: 836C00000001680264000376736E6C000000016E1000582BC55E9FADFF879C2C45D25A6CB7E56A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F6D61696E6802640001696B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F72746C6802640001696B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F737061726364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133612B6802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F73706172635F6C6F616465722E65726C6A
-=mod:ets
-Current size: 16577
-Current attributes: 836C00000002680264000376736E6C000000016E100033D982AC91129E5FC35E0AC3337A4EB56A680264000A646570726563617465646C0000000168026400086669787461626C6561026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D611C6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6574732E65726C6A
-=mod:lists_sort
-Current size: 38692
-Current attributes: 836C00000001680264000376736E6C000000016E1000E17EC92FA9AA3199DD71701C215044616A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000B68026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736802640006696E6C696E656C0000000468026400096D65726765335F3132610768026400096D65726765335F32316107680264000A726D65726765335F31326107680264000A726D65726765335F323161076A6802640006696E6C696E656C00000004680264000A756D65726765335F31326108680264000A756D65726765335F32316108680264000C72756D65726765335F3132616107680264000C72756D65726765335F31326261086A6802640006696E6C696E656C00000004680264000C6B65796D65726765335F3132610C680264000C6B65796D65726765335F3231610C680264000D726B65796D65726765335F3132610C680264000D726B65796D65726765335F3231610C6A6802640006696E6C696E656C00000006680264000D756B65796D65726765335F3132610D680264000D756B65796D65726765335F3231610D680264000F72756B65796D65726765335F313261610B680264000F72756B65796D65726765335F323161610D680264000F72756B65796D65726765335F313262610D680264000F72756B65796D65726765335F323162610C6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61166802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374735F736F72742E65726C6A
-=mod:user_sup
-Current size: 2355
-Current attributes: 836C00000002680264000376736E6C000000016E100074BA860804CB4D60D6908C705E6544BD6A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361246802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F7375702E65726C6A
-=mod:supervisor_bridge
-Current size: 2944
-Current attributes: 836C00000002680264000376736E6C000000016E10001590DDC10CF8A9D09763CDB7479678ED6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61156802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F725F6272696467652E65726C6A
-=mod:user_drv
-Current size: 14630
-Current attributes: 836C00000001680264000376736E6C000000016E1000F29F3B193A1EB1ADA9975D97E51BF0E86A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361216802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F6472762E65726C6A
-=mod:group
-Current size: 10165
-Current attributes: 836C00000001680264000376736E6C000000016E1000F6427D0DA330BBFAD5D4C19058516FF36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261066802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67726F75702E65726C6A
-=mod:io_lib
-Current size: 12601
-Current attributes: 836C00000002680264000376736E6C000000016E10004160DD78F37EE7C72F7C5B6A751DB7F56A680264000A646570726563617465646C0000000468026400047363616E610168026400047363616E610268026400047363616E6103680264000D72657365727665645F776F726461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61036802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69622E65726C6A
-=mod:edlin
-Current size: 18178
-Current attributes: 836C00000001680264000376736E6C000000016E100035D752FCBA8ED7F4D26990EF3E6A1A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65646C696E2E65726C6A
-=mod:io_lib_format
-Current size: 16189
-Current attributes: 836C00000001680264000376736E6C000000016E10004F382F327C456F83F33C3D5EBFBD87906A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61066802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F666F726D61742E65726C6A
-=mod:kernel_config
-Current size: 3295
-Current attributes: 836C00000002680264000376736E6C000000016E100077B8EE6C9E95FBBE5DB0371F6DB235226A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261356802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C5F636F6E6669672E65726C6A
-=mod:shell
-Current size: 22571
-Current attributes: 836C00000001680264000376736E6C000000016E10007D1354325618EB98A5BD4E8F41E6A0226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7368656C6C2E65726C6A
-=mod:error_logger_tty_h
-Current size: 7773
-Current attributes: 836C00000002680264000376736E6C000000016E10001502D55D6C1777F07E2E05CDD91D16986A68026400096265686176696F75726C0000000164000967656E5F6576656E746A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61196802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6572726F725F6C6F676765725F7474795F682E65726C6A
-=mod:erl_eval
-Current size: 33481
-Current attributes: 836C00000002680264000376736E6C000000016E1000D06903753C86BBC49A5CBD789CCB09B66A680264000A646570726563617465646C00000004680264000373657161026802640003736571610368026400086172675F6C697374610268026400086172675F6C69737461036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C610D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6576616C2E65726C6A
-=mod:orddict
-Current size: 4872
-Current attributes: 836C00000002680264000376736E6C000000016E100078DCF69F3949D79BC54168266A3ABF566A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61236802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264646963742E65726C6A
-=mod:c
-Current size: 19555
-Current attributes: 836C00000001680264000376736E6C000000016E10003FACCF5DE16ABBC988ABF0811980C33B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61136802640006736F757263656B00282F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F632E65726C6A
-=mod:io
-Current size: 7417
-Current attributes: 836C00000002680264000376736E6C000000016E1000E2F2A6094B3C3D945865225D0620E7546A680264000A646570726563617465646C00000007680264000B70617273655F65787072736102680264000C7363616E5F65726C5F7365716101680264000C7363616E5F65726C5F7365716102680264000C7363616E5F65726C5F7365716103680264000D70617273655F65726C5F7365716101680264000D70617273655F65726C5F7365716102680264000D70617273655F65726C5F73657161036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61006802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F2E65726C6A
-=mod:file
-Current size: 20795
-Current attributes: 836C00000002680264000376736E6C000000016E1000D291AF77EE8B08B792B7FE99274504506A680264000A646570726563617465646C00000001680264000966696C655F696E666F61016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161276802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C652E65726C6A
-=mod:file_io_server
-Current size: 12071
-Current attributes: 836C00000001680264000376736E6C000000016E1000A5A8C4E2B2646855AD5C617CB216CB966A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612A6802640006736F757263656B00352F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F696F5F7365727665722E65726C6A
-=mod:erl_scan
-Current size: 21891
-Current attributes: 836C00000001680264000376736E6C000000016E100094F386F0C378B258E5D9CEADD4F03B6A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61116802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F7363616E2E65726C6A
-=mod:erl_parse
-Current size: 161233
-Current attributes: 836C00000001680264000376736E6C000000016E10000E8CBC32C293BFC1FBC721CE918062236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000968026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F76617273640006696E6C696E656802640004686970656C000000016802640008726567616C6C6F6364000B6C696E6561725F7363616E6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61076802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F70617273652E65726C6A
-=mod:erl_lint
-Current size: 73159
-Current attributes: 836C00000001680264000376736E6C000000016E1000D1D2A7D6DDFD1195CB180993C76FD2CD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61156802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6C696E742E65726C6A
-=mod:ordsets
-Current size: 3257
-Current attributes: 836C00000002680264000376736E6C000000016E1000FD39D8FD846511128F5670BA28600F676A680264000A646570726563617465646C0000000468026400076E65775F7365746100680264000B7365745F746F5F6C6973746101680264000B6C6973745F746F5F7365746101680264000673756273657461026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61256802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264736574732E65726C6A
-=mod:dict
-Current size: 15637
-Current attributes: 836C00000002680264000376736E6C000000016E1000BC846E7EF85045A5D76190CE9B1AE97C6A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61356802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F646963742E65726C6A
-=mod:otp_internal
-Current size: 7133
-Current attributes: 836C00000001680264000376736E6C000000016E1000DC494F64DE590AFC4919DFEB0EB026B66A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61206802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F74705F696E7465726E616C2E65726C6A
-=mod:user_default
-Current size: 1261
-Current attributes: 836C00000002680264000376736E6C000000016E1000505078ACD9B84D514FC6DA2BE249E6756A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612C61126802640006736F757263656B00222F686F6D652F736972692F65726C616E672F757365725F64656661756C742E65726C6A
-=mod:tt
-Current size: 2959
-Current attributes: 836C00000002680264000376736E6C000000016E10001D71FD5A55D3BCBF06BFEDF2426C3C386A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612B610C6802640006736F757263656B00182F686F6D652F736972692F65726C616E672F74742E65726C6A
-=mod:distel
-Current size: 18214
-Current attributes: 836C00000002680264000376736E6C000000016E1000CC9C9EF141459249C1CCA00993B2E29A6A6802640006617574686F726C000000016400116C756B6540626C75657461696C2E636F6D6A6A
-Current compilation info: 836C0000000368026400076F7074696F6E736C0000000664000276336400107761726E5F756E757365645F7661727364000A64656275675F696E666F68026400066F75746469726B00046562696E68026400036377646B001C2F6C6469736B2F736972692F746F6F6C732F64697374656C2D332E3164000A6578706F72745F616C6C6A680264000776657273696F6E6B0003342E31680264000474696D65680662000007D2610B6114610B610361336A
-=mod:crashdump_viewer
-Current size: 125756
-Current attributes: 836C00000001680264000376736E6C000000016E10002DC5D9D96190A2D5F27FAC3FA3D5C7956A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611B61366802640006736F757263656B00362F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765722E65726C6A
-=mod:webtool
-Current size: 29229
-Current attributes: 836C00000002680264000376736E6C000000016E10008AEEF06B60527A3390CBC2C98083CC0A6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104610661086106612D6802640006736F757263656B002C2F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C2E65726C6A
-=mod:gen_tcp
-Current size: 3574
-Current attributes: 836C00000001680264000376736E6C000000016E1000C965E4EAFDAA94D7F21EDCBE30B21E7B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161316802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67656E5F7463702E65726C6A
-=mod:inet_tcp
-Current size: 2743
-Current attributes: 836C00000001680264000376736E6C000000016E1000C4AFE0B49768E4CF78B2C42EA1D3DB7F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7463702E65726C6A
-=mod:inet_gethost_native
-Current size: 15611
-Current attributes: 836C00000002680264000376736E6C000000016E10005D8CD4277D0BD2425B9C26036AE314506A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261206802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F676574686F73745F6E61746976652E65726C6A
-=mod:filelib
-Current size: 7202
-Current attributes: 836C00000001680264000376736E6C000000016E10007B42AA23FF99DF2CD9D586635B77556A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61266802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656C69622E65726C6A
-=mod:httpd_util
-Current size: 24068
-Current attributes: 836C00000002680264000376736E6C000000016E10008D99E096221B88D542E52CB9C8377F6D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128613B6802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7574696C2E65726C6A
-=mod:webtool_sup
-Current size: 695
-Current attributes: 836C00000002680264000376736E6C000000016E1000FA5449E12816CF3AD0A3085BB26CDB9B6A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000468026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461066108610761236802640006736F757263656B00302F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C5F7375702E65726C6A
-=mod:httpd_conf
-Current size: 33659
-Current attributes: 836C00000002680264000376736E6C000000016E1000E3198FBDC73BC48CB7D0C1C762B8F1AB6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861116802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F636F6E662E65726C6A
-=mod:regexp
-Current size: 13698
-Current attributes: 836C00000001680264000376736E6C000000016E10009DD44F3D02F8328BE3ABF4DDA89E0CAE6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61376802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7265676578702E65726C6A
-=mod:string
-Current size: 7740
-Current attributes: 836C00000002680264000376736E6C000000016E10005521DDF38903D46D7C53DB864266F7456A680264000A646570726563617465646C00000007680264000C72655F73685F746F5F61776B6101680264000872655F70617273656101680264000872655F6D617463686102680264000672655F7375626103680264000772655F677375626103680264000872655F73706C697461026802640005696E64657861026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F610F6802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F737472696E672E65726C6A
-=mod:httpd
-Current size: 7563
-Current attributes: 836C00000002680264000376736E6C000000016E1000BFD190D951EB3CAD2CC72ADEF20886906A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861036802640006736F757263656B002C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470642E65726C6A
-=mod:httpd_sup
-Current size: 4068
-Current attributes: 836C00000003680264000376736E6C000000016E10007FA5C790118F18F3D20A2BFAF0229F0A6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861366802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7375702E65726C6A
-=mod:httpd_acceptor_sup
-Current size: 2161
-Current attributes: 836C00000003680264000376736E6C000000016E10003E6F9289B64C13F1EC8A1184BACF055F6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128610C6802640006736F757263656B00392F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F725F7375702E65726C6A
-=mod:httpd_verbosity
-Current size: 2672
-Current attributes: 836C00000002680264000376736E6C000000016E100018B6F407D391872421748F87877DAAF36A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961036802640006736F757263656B00362F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F766572626F736974792E65726C6A
-=mod:timer
-Current size: 8223
-Current attributes: 836C00000001680264000376736E6C000000016E10001D0D64DB1B923D1B3B9497655C43B4AD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F611A6802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F74696D65722E65726C6A
-=mod:httpd_misc_sup
-Current size: 2066
-Current attributes: 836C00000003680264000376736E6C000000016E100092342F38AC16C074DDC21532FBFB52C26A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611F6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D6973635F7375702E65726C6A
-=mod:httpd_manager
-Current size: 28916
-Current attributes: 836C00000003680264000376736E6C000000016E100013F7A1E6A4B6407A0A1892A794EE10A36A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611B6802640006736F757263656B00342F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D616E616765722E65726C6A
-=mod:mod_alias
-Current size: 6720
-Current attributes: 836C00000002680264000376736E6C000000016E10002F35C36060B4AC45474440381D146AB96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961106802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616C6961732E65726C6A
-=mod:mod_auth
-Current size: 25168
-Current attributes: 836C00000002680264000376736E6C000000016E100083F3CA0C7A3E7B5E19A635A7F916595D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961166802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F617574682E65726C6A
-=mod:mod_esi
-Current size: 22534
-Current attributes: 836C00000002680264000376736E6C000000016E1000513E3FF733E1E6592B86CB55B9C14E086A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61026802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6573692E65726C6A
-=mod:mod_actions
-Current size: 3625
-Current attributes: 836C00000002680264000376736E6C000000016E10008E5437921662830490CA76DFF88548966A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066129610C6802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616374696F6E732E65726C6A
-=mod:mod_cgi
-Current size: 25891
-Current attributes: 836C00000002680264000376736E6C000000016E1000F91D405488188F1BD25110B4ED9EE8786A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961306802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6367692E65726C6A
-=mod:mod_include
-Current size: 34923
-Current attributes: 836C00000002680264000376736E6C000000016E1000B9CCE88D63DD6AC49D5DF533C46B97D56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61176802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F696E636C7564652E65726C6A
-=mod:mod_dir
-Current size: 13488
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF620CB4B5DE5586ED681347496DA1C86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961356802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469722E65726C6A
-=mod:mod_get
-Current size: 4672
-Current attributes: 836C00000002680264000376736E6C000000016E1000AD2730B6BE6AF875A500AF4857C4D7F86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61076802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6765742E65726C6A
-=mod:mod_head
-Current size: 3074
-Current attributes: 836C00000002680264000376736E6C000000016E1000CAF803B9FA6A28D4153BC109B00D7DF96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A610B6802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F686561642E65726C6A
-=mod:mod_log
-Current size: 8546
-Current attributes: 836C00000002680264000376736E6C000000016E1000F9664B54861260DEA081249379219AF86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A611B6802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6C6F672E65726C6A
-=mod:mod_disk_log
-Current size: 15160
-Current attributes: 836C00000002680264000376736E6C000000016E1000DDA1E88A9C423A2866B56425DF36F5C66A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961396802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469736B5F6C6F672E65726C6A
-=mod:httpd_socket
-Current size: 7426
-Current attributes: 836C00000002680264000376736E6C000000016E1000B831219096661E4D2E200A07C4A9A7776A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861326802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F736F636B65742E65726C6A
-=mod:httpd_acceptor
-Current size: 4472
-Current attributes: 836C00000002680264000376736E6C000000016E1000A501686DF4E4053E7D978E0CA162BEC56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861076802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F722E65726C6A
-=mod:io_lib_pretty
-Current size: 8171
-Current attributes: 836C00000001680264000376736E6C000000016E1000CD397E11D2D380D02A4BC6EE309B98CB6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E610C6802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F7072657474792E65726C6A
-=mod:httpd_request_handler
-Current size: 26393
-Current attributes: 836C00000002680264000376736E6C000000016E100021C280A5EB5B9CCD00A2C418A341202A6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861296802640006736F757263656B003C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726571756573745F68616E646C65722E65726C6A
-=mod:calendar
-Current size: 7158
-Current attributes: 836C00000002680264000376736E6C000000016E10008C44498546709037F8D72DA4AF8B7FB76A680264000A646570726563617465646C00000001680264001C6C6F63616C5F74696D655F746F5F756E6976657273616C5F74696D6561016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61166802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F63616C656E6461722E65726C6A
-=mod:httpd_parse
-Current size: 9977
-Current attributes: 836C00000002680264000376736E6C000000016E1000174653BAA652261FEB44FFDED99E50B76A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861246802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F70617273652E65726C6A
-=mod:httpd_response
-Current size: 13535
-Current attributes: 836C00000002680264000376736E6C000000016E1000785B247D894BA08A40D814EF11F848976A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128612D6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726573706F6E73652E65726C6A
-=mod:crashdump_viewer_html
-Current size: 68343
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE414770FDB0806C5583FF8D6D71DC766A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611C61026802640006736F757263656B003B2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765725F68746D6C2E65726C6A
-=mod:crashdump_translate
-Current size: 89840
-Current attributes: 836C00000001680264000376736E6C000000016E100038F332287181E933A76CEF4799BDB6416A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000668026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461046115610B611661106802640006736F757263656B00392F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7472616E736C6174652E65726C6A
-=fun
-Module: crashdump_viewer_html
-Uniq: 9122590
-Index: 0
-Address: 526308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 77168418
-Index: 14
-Address: 26541c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 88083515
-Index: 9
-Address: 284c30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 36747896
-Index: 4
-Address: 26df84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 80395734
-Index: 8
-Address: 265838
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 103184573
-Index: 5
-Address: 2fa59c
-Native_address: bce80
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 88265811
-Index: 24
-Address: 34f6a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 9644262
-Index: 2
-Address: 292cec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 100885585
-Index: 0
-Address: 29eb2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 128335479
-Index: 6
-Address: 26de84
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 42988083
-Index: 1
-Address: 210c14
-Native_address: bcf04
-Refc: 1
-=fun
-Module: dict
-Uniq: 7105125
-Index: 7
-Address: 354f84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 29030584
-Index: 8
-Address: 234978
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 29214351
-Index: 2
-Address: 285660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 5158633
-Index: 4
-Address: 274034
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 74624950
-Index: 25
-Address: 34f63c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 6477018
-Index: 3
-Address: 2adb6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 117885138
-Index: 7
-Address: 2ffff8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 47566924
-Index: 6
-Address: 354fb8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 114637756
-Index: 12
-Address: 313c60
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121316204
-Index: 31
-Address: 313a68
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61363639
-Index: 12
-Address: 2ad6a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 116208699
-Index: 3
-Address: 274094
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 113750737
-Index: 0
-Address: 292d54
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 12853672
-Index: 0
-Address: 222e74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108046357
-Index: 12
-Address: 4ab0b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 111569299
-Index: 47
-Address: 34e80c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 20108653
-Index: 15
-Address: 2f9f94
-Native_address: bcea4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 45252965
-Index: 15
-Address: 313c0c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 12437425
-Index: 9
-Address: 4ab3e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 30942993
-Index: 22
-Address: 34f6ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 93430337
-Index: 3
-Address: 33b100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 6604883
-Index: 2
-Address: 33b16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 36867745
-Index: 5
-Address: 255e28
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 90563105
-Index: 1
-Address: 285708
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 18519297
-Index: 7
-Address: 26ddfc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8058975
-Index: 16
-Address: 4a36b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 30694569
-Index: 7
-Address: 27d018
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 76933943
-Index: 0
-Address: 2741b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 9033258
-Index: 6
-Address: 4a4690
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 74851752
-Index: 5
-Address: 4a4798
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 50855382
-Index: 4
-Address: 2659a8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39211582
-Index: 52
-Address: 34e504
-Native_address: bceec
-Refc: 1
-=fun
-Module: file_server
-Uniq: 77665472
-Index: 0
-Address: 2a0dec
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 57487277
-Index: 8
-Address: 2fa3c4
-Native_address: bce94
-Refc: 1
-=fun
-Module: webtool
-Uniq: 87386575
-Index: 11
-Address: 4ab1c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 58991950
-Index: 8
-Address: 4a4338
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 118859163
-Index: 17
-Address: 4a34d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 38265609
-Index: 12
-Address: 354dec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 56903339
-Index: 1
-Address: 2527c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 129504763
-Index: 0
-Address: 28aae8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 44817307
-Index: 10
-Address: 354e3c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 52856894
-Index: 41
-Address: 34eb70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22623360
-Index: 23
-Address: 34f5d4
-Native_address: bceec
-Refc: 1
-=fun
-Module: orddict
-Uniq: 34963136
-Index: 0
-Address: 2fbbbc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erlang
-Uniq: 24496633
-Index: 0
-Address: 213744
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 99313855
-Index: 27
-Address: 2f9914
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 99137703
-Index: 3
-Address: 4b5dfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 124043500
-Index: 3
-Address: 222b84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 102650878
-Index: 22
-Address: 313b48
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 13333720
-Index: 12
-Address: 34fb2c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 133457
-Index: 5
-Address: 292a80
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 64640983
-Index: 4
-Address: 29e944
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 7580218
-Index: 2
-Address: 255f08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 131850870
-Index: 59
-Address: 34e6b8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 56617403
-Index: 10
-Address: 284b40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108680306
-Index: 4
-Address: 4ab5e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 90880071
-Index: 2
-Address: 26e150
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_io_server
-Uniq: 23980778
-Index: 0
-Address: 30ac30
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 12006418
-Index: 19
-Address: 2f9d54
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 81701030
-Index: 8
-Address: 526228
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 71013875
-Index: 1
-Address: 4a4ddc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: distel
-Uniq: 87740845
-Index: 2
-Address: 35c0e0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 90782401
-Index: 17
-Address: 2f9e8c
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 133882676
-Index: 6
-Address: 2e52ac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 105698088
-Index: 3
-Address: 2855b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 58370899
-Index: 0
-Address: 27d370
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 15274536
-Index: 25
-Address: 2f9a94
-Native_address: bcef4
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 94349557
-Index: 0
-Address: 252844
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 33328185
-Index: 1
-Address: 33b1d8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86971387
-Index: 16
-Address: 313db0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 53364473
-Index: 38
-Address: 34ee84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 128145687
-Index: 0
-Address: 4ab944
-Native_address: bcee4
-Refc: 1
-=fun
-Module: c
-Uniq: 98651404
-Index: 10
-Address: 2fff20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 78224618
-Index: 0
-Address: 313dcc
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 40779085
-Index: 11
-Address: 2e50c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 93517350
-Index: 4
-Address: 300090
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 58551291
-Index: 0
-Address: 234f14
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 10055518
-Index: 17
-Address: 526170
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 15795706
-Index: 19
-Address: 313bd4
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 31129467
-Index: 13
-Address: 313c44
-Native_address: bced4
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 115635393
-Index: 0
-Address: 2a1a4c
-Native_address: bcf04
-Refc: 2
-=fun
-Module: erl_eval
-Uniq: 65839696
-Index: 22
-Address: 2f9c00
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 69275064
-Index: 28
-Address: 313aa0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 55938066
-Index: 11
-Address: 354d6c
-Native_address: bceec
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 22323433
-Index: 3
-Address: 252688
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 129726129
-Index: 29
-Address: 313abc
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 84346832
-Index: 0
-Address: 3550fc
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 102096820
-Index: 7
-Address: 2e5290
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 70385762
-Index: 11
-Address: 27cf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_cgi
-Uniq: 1483038
-Index: 0
-Address: 4ec2e8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 3664813
-Index: 1
-Address: 3550b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 131143671
-Index: 6
-Address: 27d08c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 46286977
-Index: 2
-Address: 2740b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_esi
-Uniq: 49099432
-Index: 0
-Address: 4e522c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 95764905
-Index: 2
-Address: 24aaa8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: packages
-Uniq: 62890926
-Index: 0
-Address: 2ae814
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 41564771
-Index: 35
-Address: 3139f8
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 95490768
-Index: 0
-Address: 4a4dc0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121559432
-Index: 3
-Address: 313d78
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_conf
-Uniq: 21152662
-Index: 0
-Address: 4be5a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 41630916
-Index: 5
-Address: 29e914
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 19747201
-Index: 5
-Address: 313d24
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 100584837
-Index: 36
-Address: 34f0f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 64635712
-Index: 15
-Address: 34f94c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 46398361
-Index: 3
-Address: 29e9a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86699817
-Index: 27
-Address: 313b2c
-Native_address: bced4
-Refc: 1
-=fun
-Module: distel
-Uniq: 40869731
-Index: 0
-Address: 35c12c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 83701641
-Index: 1
-Address: 27d33c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_auth
-Uniq: 85845790
-Index: 0
-Address: 4dfd84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 101292714
-Index: 9
-Address: 2e519c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 134173702
-Index: 1
-Address: 265b68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 92433687
-Index: 6
-Address: 2ad9f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 62315241
-Index: 8
-Address: 354f38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 11615541
-Index: 12
-Address: 265530
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 11160090
-Index: 2
-Address: 2b6bb4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 12116524
-Index: 15
-Address: 2342c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 61620901
-Index: 2
-Address: 4fc670
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 23665189
-Index: 12
-Address: 4a3b94
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 43844413
-Index: 0
-Address: 300100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 100514258
-Index: 6
-Address: 313d08
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 54271286
-Index: 17
-Address: 34f8a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 47017252
-Index: 3
-Address: 26dfa0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 1228304
-Index: 7
-Address: 4a45a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 127131470
-Index: 10
-Address: 2655a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_server
-Uniq: 22638227
-Index: 1
-Address: 2a0e20
-Native_address: bcf04
-Refc: 1
-=fun
-Module: code_server
-Uniq: 112704920
-Index: 15
-Address: 2ad488
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88302875
-Index: 2
-Address: 2fa76c
-Native_address: bceb4
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 85808984
-Index: 1
-Address: 28ab18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 106391799
-Index: 0
-Address: 33b22c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25830519
-Index: 5
-Address: 27d0c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 110491036
-Index: 1
-Address: 2e5398
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 13128736
-Index: 5
-Address: 52627c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 84644982
-Index: 21
-Address: 313b9c
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 120577486
-Index: 3
-Address: 34fffc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 4504456
-Index: 44
-Address: 34e938
-Native_address: bceec
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 28754183
-Index: 0
-Address: 500140
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 88043334
-Index: 14
-Address: 313c28
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61592373
-Index: 0
-Address: 2adc28
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74468346
-Index: 26
-Address: 313ad8
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69896253
-Index: 21
-Address: 2f9c40
-Native_address: bce80
-Refc: 1
-=fun
-Module: global_group
-Uniq: 59656873
-Index: 4
-Address: 292ac0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 103891261
-Index: 2
-Address: 4a4d70
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 89619733
-Index: 0
-Address: 4b5e64
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 133201466
-Index: 10
-Address: 2e5180
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 32159369
-Index: 2
-Address: 4ab820
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 76861396
-Index: 2
-Address: 2adbb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 48206487
-Index: 0
-Address: 4fc6f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 118996551
-Index: 28
-Address: 34f384
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 12593774
-Index: 50
-Address: 34e60c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 48542841
-Index: 1
-Address: 50e88c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56178490
-Index: 9
-Address: 4a420c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 88212576
-Index: 4
-Address: 35bf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 79562132
-Index: 29
-Address: 34f368
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 129524917
-Index: 32
-Address: 34f2c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54029891
-Index: 23
-Address: 2f9af0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 108872092
-Index: 4
-Address: 27d0f0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 40905124
-Index: 6
-Address: 234ac0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 50124876
-Index: 10
-Address: 2ad760
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 791358
-Index: 48
-Address: 34e7b0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 18404828
-Index: 24
-Address: 313af4
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 13278653
-Index: 1
-Address: 4b5e48
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 110307423
-Index: 13
-Address: 284a7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 99592247
-Index: 0
-Address: 256118
-Native_address: bcf04
-Refc: 1
-=fun
-Module: global
-Uniq: 99918211
-Index: 2
-Address: 265af4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 71442319
-Index: 27
-Address: 34f510
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 7612785
-Index: 13
-Address: 2fa0fc
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56095795
-Index: 15
-Address: 4a38a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 23626796
-Index: 25
-Address: 313b10
-Native_address: bced4
-Refc: 1
-=fun
-Module: file_server
-Uniq: 126074974
-Index: 2
-Address: 2a0cac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 104278122
-Index: 1
-Address: 274154
-Native_address: bcefc
-Refc: 1
-=fun
-Module: sys
-Uniq: 90854051
-Index: 0
-Address: 240344
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 113334594
-Index: 2
-Address: 313d5c
-Native_address: bced4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 8832142
-Index: 7
-Address: 284e30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9159706
-Index: 42
-Address: 34eb54
-Native_address: bceec
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 123946665
-Index: 8
-Address: 26e494
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3149789
-Index: 1
-Address: 5262d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 48288621
-Index: 11
-Address: 2ffed8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8953292
-Index: 20
-Address: 4a4d54
-Native_address: bcee4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9632158
-Index: 4
-Address: 34ff88
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 31111567
-Index: 7
-Address: 29e8c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 85307443
-Index: 10
-Address: 2fa29c
-Native_address: bcec4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 104417191
-Index: 7
-Address: 313cd0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 43625777
-Index: 5
-Address: 354fec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 92698798
-Index: 3
-Address: 4ab780
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 39074546
-Index: 6
-Address: 2fa54c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 71451126
-Index: 5
-Address: 234b98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 122084387
-Index: 6
-Address: 300038
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 9625924
-Index: 14
-Address: 284a60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 128777368
-Index: 11
-Address: 313c7c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 10203723
-Index: 7
-Address: 4ab4f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 35032400
-Index: 10
-Address: 313c98
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 17252586
-Index: 34
-Address: 313a14
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 7177165
-Index: 11
-Address: 2ad734
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 115778175
-Index: 3
-Address: 4a4930
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 96440880
-Index: 51
-Address: 34e590
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 68275407
-Index: 0
-Address: 2b7340
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88854488
-Index: 16
-Address: 2f9f04
-Native_address: bcebc
-Refc: 1
-=fun
-Module: global
-Uniq: 26353848
-Index: 13
-Address: 2654e8
-Native_address: bcf04
-Refc: 3
-=fun
-Module: global
-Uniq: 93414722
-Index: 11
-Address: 265568
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 11194189
-Index: 60
-Address: 34fe0c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 125189992
-Index: 8
-Address: 2fffdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 112472016
-Index: 2
-Address: 355088
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 104426442
-Index: 5
-Address: 2e52e0
-Native_address: bceec
-Refc: 1
-=fun
-Module: global
-Uniq: 17426458
-Index: 0
-Address: 265bc4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 81191039
-Index: 5
-Address: 2ada48
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 71765042
-Index: 5
-Address: 284f74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 85855821
-Index: 2
-Address: 1fa298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 70586122
-Index: 10
-Address: 4a3fe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 87067911
-Index: 49
-Address: 34e708
-Native_address: bcef4
-Refc: 1
-=fun
-Module: distel
-Uniq: 63126735
-Index: 1
-Address: 35c0fc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: c
-Uniq: 58270309
-Index: 1
-Address: 3000e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: ets
-Uniq: 80538457
-Index: 1
-Address: 2bc1a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 69827241
-Index: 9
-Address: 34fd70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 103968752
-Index: 3
-Address: 355054
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 117175573
-Index: 21
-Address: 34f728
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 57865450
-Index: 2
-Address: 2e537c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 14705965
-Index: 20
-Address: 313b80
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 85360931
-Index: 6
-Address: 4ab56c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: kernel_config
-Uniq: 41755598
-Index: 0
-Address: 2d9e20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 7110547
-Index: 37
-Address: 34ef14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 28091577
-Index: 16
-Address: 234244
-Native_address: bcef4
-Refc: 2
-=fun
-Module: code_server
-Uniq: 96448152
-Index: 14
-Address: 2ad4e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 40177568
-Index: 13
-Address: 4a39a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 31948320
-Index: 58
-Address: 34dfdc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 54153760
-Index: 7
-Address: 265854
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 60156260
-Index: 3
-Address: 5262b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 1010616
-Index: 2
-Address: 350064
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 96784459
-Index: 1
-Address: 1fa2b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 48691771
-Index: 18
-Address: 313bb8
-Native_address: bced4
-Refc: 1
-=fun
-Module: global
-Uniq: 26895060
-Index: 9
-Address: 265710
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 109625093
-Index: 7
-Address: 2ad8fc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 59436171
-Index: 1
-Address: 3500dc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 92768306
-Index: 9
-Address: 354f04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 106430008
-Index: 3
-Address: 292b38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 79749196
-Index: 6
-Address: 1fa01c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 6014929
-Index: 9
-Address: 2fa324
-Native_address: bceac
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 57051922
-Index: 7
-Address: 234a28
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 77043468
-Index: 6
-Address: 29e8e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 36176045
-Index: 9
-Address: 52620c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 35862809
-Index: 3
-Address: 255edc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113649451
-Index: 4
-Address: 2850a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 67943969
-Index: 5
-Address: 2658f4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 109003032
-Index: 16
-Address: 5260d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 104711447
-Index: 13
-Address: 525f5c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 107666872
-Index: 9
-Address: 27cfb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 89410000
-Index: 10
-Address: 5261f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 47356870
-Index: 11
-Address: 284ab4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17873449
-Index: 56
-Address: 34e1e8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 8839441
-Index: 33
-Address: 34f25c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 82513204
-Index: 2
-Address: 222c18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 5973059
-Index: 0
-Address: 24ab7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 127832132
-Index: 0
-Address: 4b065c
-Native_address: bcefc
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 39322658
-Index: 14
-Address: 525f40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_server
-Uniq: 100284021
-Index: 0
-Address: 23d288
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 17430070
-Index: 12
-Address: 284a98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 97509773
-Index: 3
-Address: 1fa27c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 32364818
-Index: 3
-Address: 35c050
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 58576084
-Index: 32
-Address: 313a4c
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 38384851
-Index: 14
-Address: 4a3988
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 14139883
-Index: 4
-Address: 234d78
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 122590256
-Index: 0
-Address: 2fa8b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 14705629
-Index: 11
-Address: 2fa22c
-Native_address: bcedc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 9273769
-Index: 4
-Address: 2fa684
-Native_address: bcee4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 87950142
-Index: 11
-Address: 5261d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 54913678
-Index: 1
-Address: 4fc6b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 28370334
-Index: 0
-Address: 26e4b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 24927227
-Index: 40
-Address: 34ed4c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 105437500
-Index: 33
-Address: 313a30
-Native_address: bced4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 10921695
-Index: 1
-Address: 234eac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 112431564
-Index: 55
-Address: 34e22c
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 129460863
-Index: 5
-Address: 4ab5c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 89001648
-Index: 3
-Address: 27d2ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 36199507
-Index: 8
-Address: 27cfe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 35620771
-Index: 2
-Address: 5262ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 83214871
-Index: 18
-Address: 2f9e34
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 122455383
-Index: 1
-Address: 2adc0c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22389488
-Index: 31
-Address: 34f1b8
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 41869059
-Index: 12
-Address: 2fa1d4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 18130505
-Index: 45
-Address: 34e904
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 107414126
-Index: 1
-Address: 2b706c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 116638945
-Index: 28
-Address: 2f98f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 48465762
-Index: 9
-Address: 2348c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 87633852
-Index: 0
-Address: 50e97c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 28213098
-Index: 8
-Address: 4ab42c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 123630574
-Index: 4
-Address: 222b58
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 127425508
-Index: 13
-Address: 354eb4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 95048118
-Index: 16
-Address: 2ad46c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 108661978
-Index: 19
-Address: 34f75c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 21272619
-Index: 13
-Address: 34fad8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29943747
-Index: 17
-Address: 313bf0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 120240397
-Index: 4
-Address: 313d94
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 124060676
-Index: 0
-Address: 350124
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 100975346
-Index: 6
-Address: 526260
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61421476
-Index: 4
-Address: 2ada9c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45197232
-Index: 7
-Address: 34fe5c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3151900
-Index: 15
-Address: 525f24
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 77509245
-Index: 2
-Address: 4b5e2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 94110229
-Index: 8
-Address: 2ad7e4
-Native_address: bcef4
-Refc: 3
-=fun
-Module: rpc
-Uniq: 101217130
-Index: 1
-Address: 2560c4
-Native_address: bcf04
-Refc: 1
-=fun
-Module: lists
-Uniq: 103647452
-Index: 0
-Address: 244b7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 37841211
-Index: 9
-Address: 2ad77c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 40109251
-Index: 54
-Address: 34e2b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 98012300
-Index: 0
-Address: 1fa2d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 73604759
-Index: 10
-Address: 4ab270
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 12042434
-Index: 1
-Address: 313d40
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 127137775
-Index: 4
-Address: 2e531c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 45498037
-Index: 12
-Address: 27cec0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 122441107
-Index: 34
-Address: 34f1d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70933889
-Index: 46
-Address: 34e8d0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 69850797
-Index: 2
-Address: 27d308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 103965539
-Index: 13
-Address: 234684
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29979659
-Index: 30
-Address: 313a84
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17148721
-Index: 20
-Address: 34f778
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_response
-Uniq: 100673049
-Index: 0
-Address: 5165dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 10508176
-Index: 1
-Address: 4b04dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32476064
-Index: 57
-Address: 34e1c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74835078
-Index: 9
-Address: 313cec
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 60689814
-Index: 19
-Address: 4a3b78
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39269715
-Index: 5
-Address: 34ff14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 112923172
-Index: 0
-Address: 2e5404
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43010824
-Index: 14
-Address: 2fa03c
-Native_address: bce8c
-Refc: 1
-=fun
-Module: global
-Uniq: 82495254
-Index: 3
-Address: 265ac8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 48568081
-Index: 8
-Address: 2e5220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 77236637
-Index: 7
-Address: 1fa000
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 109386574
-Index: 1
-Address: 2fa804
-Native_address: bce9c
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 42613220
-Index: 14
-Address: 34f980
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 67093144
-Index: 23
-Address: 313b64
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 86833790
-Index: 11
-Address: 34fbe8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 6344855
-Index: 1
-Address: 29eabc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 5149749
-Index: 35
-Address: 34f220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 93451769
-Index: 5
-Address: 1fa120
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 117428568
-Index: 11
-Address: 234758
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 15225890
-Index: 4
-Address: 526298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 120760477
-Index: 2
-Address: 234cdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 88561919
-Index: 3
-Address: 3000ac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 108931174
-Index: 8
-Address: 313cb4
-Native_address: bced4
-Refc: 1
-=fun
-Module: rpc
-Uniq: 122901192
-Index: 4
-Address: 255e44
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32985930
-Index: 10
-Address: 34fc40
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 97968498
-Index: 1
-Address: 292b7c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 45671671
-Index: 18
-Address: 4a32d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 117968056
-Index: 3
-Address: 2fa6ec
-Native_address: bcecc
-Refc: 1
-=fun
-Module: init
-Uniq: 108717591
-Index: 4
-Address: 1fa194
-Native_address: bcf04
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 15091954
-Index: 2
-Address: 2526dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 65707495
-Index: 6
-Address: 2658a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 34473969
-Index: 17
-Address: 2ad450
-Native_address: bcef4
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 124296602
-Index: 7
-Address: 526244
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 23074707
-Index: 15
-Address: 265460
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25972856
-Index: 10
-Address: 27cf74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43110452
-Index: 24
-Address: 2f9ad4
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 106445918
-Index: 13
-Address: 2ad660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 116071286
-Index: 12
-Address: 5261b8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 130814477
-Index: 8
-Address: 284cfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 121017037
-Index: 39
-Address: 34ed80
-Native_address: bcef4
-Refc: 1
-=fun
-Module: ets
-Uniq: 104895267
-Index: 0
-Address: 2bc1bc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 104682437
-Index: 11
-Address: 4a3de0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70248777
-Index: 30
-Address: 34f30c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 13274975
-Index: 5
-Address: 300074
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 98442771
-Index: 53
-Address: 34e2d0
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69829006
-Index: 7
-Address: 2fa47c
-Native_address: bce80
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 36444943
-Index: 1
-Address: 2a1a80
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 58719455
-Index: 26
-Address: 34f5f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: timer
-Uniq: 42505885
-Index: 0
-Address: 4cd62c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54682479
-Index: 20
-Address: 2f9d08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 86070332
-Index: 1
-Address: 222d7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 54728136
-Index: 9
-Address: 2fff68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 16474219
-Index: 3
-Address: 234c60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 108831556
-Index: 10
-Address: 234810
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 72053761
-Index: 16
-Address: 34f8ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 65127616
-Index: 2
-Address: 29ea04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 126167637
-Index: 14
-Address: 234640
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113704917
-Index: 0
-Address: 285788
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 75279647
-Index: 1
-Address: 500100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 119218247
-Index: 5
-Address: 26df68
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 85690044
-Index: 4
-Address: 4b5d6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 53075592
-Index: 1
-Address: 26e16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 39490182
-Index: 2
-Address: 3000c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 75189006
-Index: 12
-Address: 234714
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 14980808
-Index: 43
-Address: 34eb38
-Native_address: bceec
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 16463468
-Index: 4
-Address: 4a4914
-Native_address: bcee4
-Refc: 1
-=fun
-Module: dict
-Uniq: 99965326
-Index: 4
-Address: 355020
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 36900786
-Index: 6
-Address: 284f3c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45447147
-Index: 18
-Address: 34f794
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32353825
-Index: 6
-Address: 34fe78
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 134052338
-Index: 8
-Address: 34fdc0
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_master
-Uniq: 23840924
-Index: 1
-Address: 24aae0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108282500
-Index: 1
-Address: 4ab918
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 31081110
-Index: 0
-Address: 210c68
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54275742
-Index: 26
-Address: 2f9a4c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 45083091
-Index: 3
-Address: 2e5350
-Native_address: bcf04
-Refc: 3
-=proc_stack:<0.0.0>
-3a48bc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H371264
-=proc_heap:<0.0.0>
-371264:t9:A5:state,H3710D8,N,N,H3710F4,P<0.1.0>,H37128C,H3710FC,N
-3710FC:t2:H371138,H371140
-371140:lI80|H371194
-371194:lI49|H3711E0
-3711E0:lI48|H371204
-371204:lI66|N
-371138:lI79|H37118C
-37118C:lI84|H3711D8
-3711D8:lI80|H3711FC
-3711FC:lI32|H37120C
-37120C:lI32|H371214
-371214:lI65|H37121C
-37121C:lI80|H371224
-371224:lI78|H37122C
-37122C:lI32|H371234
-371234:lI49|H37123C
-37123C:lI56|H371244
-371244:lI49|H37124C
-37124C:lI32|H371254
-371254:lI48|H37125C
-37125C:lI49|N
-37128C:t2:A7:started,A7:started
-3710F4:lH371124|H371130
-371124:t2:A16:application_controller,P<0.5.0>
-371130:lH371178|H371184
-371178:t2:AC:error_logger,P<0.4.0>
-371184:lH3711CC|N
-3711CC:t2:AF:erl_prim_loader,P<0.2.0>
-3710D8:lH3710E0|H3710EC
-3710E0:t2:A5:-root,H371108
-371108:lH371148|N
-371148:Yh13:2F636C656172636173652F6F74702F65727473
-3710EC:lH371110|H37111C
-371110:t2:A9:-progname,H371164
-371164:lH37119C|N
-37119C:Yh1D:2F636C656172636173652F6F74702F657274732F62696E2F6365726C20
-37111C:lH37116C|N
-37116C:t2:A5:-home,H3711C4
-3711C4:lH3711E8|N
-3711E8:YhA:2F686F6D652F73697269
-=proc_stack:<0.2.0>
-38eca8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H367D20
-y1:P<0.1.0>
-y2:H367D28
-y3:A8:infinity
-=proc_heap:<0.2.0>
-367D20:lH367D48|H367D50
-367D48:lI47|H367D58
-367D58:lI99|H367D68
-367D68:lI108|H367D78
-367D78:lI101|H367D88
-367D88:lI97|H367D98
-367D98:lI114|H367DA8
-367DA8:lI99|H367DB8
-367DB8:lI97|H367DC8
-367DC8:lI115|H367DD8
-367DD8:lI101|H367DE8
-367DE8:lI47|H367DF8
-367DF8:lI111|H367E08
-367E08:lI116|H367E18
-367E18:lI112|H367E28
-367E28:lI47|H367E38
-367E38:lI101|H367E48
-367E48:lI114|H367E58
-367E58:lI116|H367E68
-367E68:lI115|H367E78
-367E78:lI47|H367E88
-367E88:lI108|H367E98
-367E98:lI105|H367EA8
-367EA8:lI98|H367EB8
-367EB8:lI47|H367EC8
-367EC8:lI107|H367ED8
-367ED8:lI101|H367EE8
-367EE8:lI114|H367EF8
-367EF8:lI110|H367F08
-367F08:lI101|H367F18
-367F18:lI108|H367F28
-367F28:lI47|H367F38
-367F38:lI101|H367F48
-367F48:lI98|H367F58
-367F58:lI105|H367F68
-367F68:lI110|N
-367D50:lH367D60|N
-367D60:lI47|H367D70
-367D70:lI99|H367D80
-367D80:lI108|H367D90
-367D90:lI101|H367DA0
-367DA0:lI97|H367DB0
-367DB0:lI114|H367DC0
-367DC0:lI99|H367DD0
-367DD0:lI97|H367DE0
-367DE0:lI115|H367DF0
-367DF0:lI101|H367E00
-367E00:lI47|H367E10
-367E10:lI111|H367E20
-367E20:lI116|H367E30
-367E30:lI112|H367E40
-367E40:lI47|H367E50
-367E50:lI101|H367E60
-367E60:lI114|H367E70
-367E70:lI116|H367E80
-367E80:lI115|H367E90
-367E90:lI47|H367EA0
-367EA0:lI108|H367EB0
-367EB0:lI105|H367EC0
-367EC0:lI98|H367ED0
-367ED0:lI47|H367EE0
-367EE0:lI115|H367EF0
-367EF0:lI116|H367F00
-367F00:lI100|H367F10
-367F10:lI108|H367F20
-367F20:lI105|H367F30
-367F30:lI98|H367F40
-367F40:lI47|H367F50
-367F50:lI101|H367F60
-367F60:lI98|H367F70
-367F70:lI105|H367F78
-367F78:lI110|N
-367D28:t7:A5:state,A5:efile,N,A4:none,p<0.2>,A8:infinity,A5:false
-=proc_dictionary:<0.4.0>
-H3AC588
-H3AC594
-=proc_stack:<0.4.0>
-3b2f14:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:H3B21E8
-y2:AC:error_logger
-y3:P<0.1.0>
-3b2f28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3AC5A8
-=proc_heap:<0.4.0>
-3B21E8:lH3B2144|H3B21E0
-3B2144:t5:A7:handler,AC:error_logger,A5:false,N,A5:false
-3B21E0:lH3B21BC|N
-3B21BC:t5:A7:handler,A12:error_logger_tty_h,A5:false,H3AC610,A5:false
-3AC610:t2:P<0.21.0>,AC:error_logger
-3AC5A8:lA9:gen_event|H3AC5E8
-3AC5E8:lP<0.1.0>|H3AC608
-3AC608:lP<0.1.0>|H3AC61C
-3AC61C:lH3AC624|H3AC630
-3AC624:t2:A5:local,AC:error_logger
-3AC630:lN|H3AC638
-3AC638:lN|H3AC640
-3AC640:lN|N
-3AC588:t2:AD:$initial_call,H3AC5B0
-3AC5B0:t3:A3:gen,A7:init_it,H3AC5A8
-3AC594:t2:AA:$ancestors,H3AC5C0
-3AC5C0:lP<0.1.0>|N
-=proc_dictionary:<0.5.0>
-H372E4C
-H372E58
-=proc_stack:<0.5.0>
-374704:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A16:application_controller
-y3:H3739F4
-y4:A16:application_controller
-y5:P<0.1.0>
-374720:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H372ED0
-=proc_heap:<0.5.0>
-3739F4:t9:A5:state,N,N,N,H373914,N,H373928,N,N
-373928:lH37391C|H372F54
-37391C:t2:A6:stdlib,A9:permanent
-372F54:lH372F90|N
-372F90:t2:A6:kernel,A9:permanent
-373914:lH373908|H372F4C
-373908:t2:A6:stdlib,A9:undefined
-372F4C:lH372F84|N
-372F84:t2:A6:kernel,P<0.7.0>
-372ED0:lAA:gen_server|H372F5C
-372F5C:lP<0.1.0>|H372F9C
-372F9C:lP<0.1.0>|H372FC4
-372FC4:lH372FEC|H372FF8
-372FEC:t2:A5:local,A16:application_controller
-372FF8:lA16:application_controller|H373018
-373018:lH373038|H373048
-373038:t3:AB:application,A6:kernel,H373060
-373060:lH373078|H373084
-373078:t2:AB:description,H37309C
-37309C:lI69|H3730C8
-3730C8:lI82|H3730FC
-3730FC:lI84|H373130
-373130:lI83|H37316C
-37316C:lI32|H3731A8
-3731A8:lI32|H3731E4
-3731E4:lI67|H373220
-373220:lI88|H37325C
-37325C:lI67|H37329C
-37329C:lI32|H3732D0
-3732D0:lI49|H3732FC
-3732FC:lI51|H373328
-373328:lI56|H373348
-373348:lI32|H373368
-373368:lI49|H373388
-373388:lI48|N
-373084:lH3730A4|H3730B0
-3730A4:t2:A3:vsn,H3730D0
-3730D0:lI50|H373104
-373104:lI46|H373138
-373138:lI57|N
-3730B0:lH3730D8|H3730E4
-3730D8:t2:A2:id,N
-3730E4:lH37310C|H373118
-37310C:t2:A7:modules,H373140
-373140:lAB:application|H373174
-373174:lA16:application_controller|H3731B0
-3731B0:lA12:application_master|H3731EC
-3731EC:lA13:application_starter|H373228
-373228:lA4:auth|H373264
-373264:lA4:code|H3732A4
-3732A4:lA8:code_aux|H3732D8
-3732D8:lA8:packages|H373304
-373304:lAB:code_server|H373330
-373330:lA9:dist_util|H373350
-373350:lAF:erl_boot_server|H373370
-373370:lA10:erl_distribution|H373390
-373390:lAF:erl_prim_loader|H3733A8
-3733A8:lA9:erl_reply|H3733C0
-3733C0:lA6:erlang|H3733D8
-3733D8:lAD:error_handler|H3733F0
-3733F0:lAC:error_logger|H373408
-373408:lA4:file|H373420
-373420:lAB:file_server|H373438
-373438:lAF:old_file_server|H373450
-373450:lAE:file_io_server|H373468
-373468:lA9:prim_file|H373480
-373480:lA6:global|H373498
-373498:lAC:global_group|H3734B0
-3734B0:lAD:global_search|H3734C8
-3734C8:lA5:group|H3734E0
-3734E0:lA5:heart|H3734F8
-3734F8:lA13:hipe_unified_loader|H373510
-373510:lA11:hipe_sparc_loader|H373520
-373520:lAF:hipe_x86_loader|H373530
-373530:lA9:inet6_tcp|H373540
-373540:lAE:inet6_tcp_dist|H373550
-373550:lA9:inet6_udp|H373560
-373560:lAB:inet_config|H373570
-373570:lAA:inet_hosts|H373580
-373580:lA13:inet_gethost_native|H373590
-373590:lAD:inet_tcp_dist|H3735A0
-3735A0:lA4:init|H3735B0
-3735B0:lA6:kernel|H3735C0
-3735C0:lAD:kernel_config|H3735D0
-3735D0:lA3:net|H3735E0
-3735E0:lA7:net_adm|H3735F0
-3735F0:lAA:net_kernel|H373600
-373600:lA2:os|H373610
-373610:lA8:ram_file|H373620
-373620:lA3:rpc|H373630
-373630:lA4:user|H373640
-373640:lA8:user_drv|H373650
-373650:lA8:user_sup|H373660
-373660:lA8:disk_log|H373670
-373670:lAA:disk_log_1|H373680
-373680:lAF:disk_log_server|H373690
-373690:lAC:disk_log_sup|H3736A0
-3736A0:lA7:dist_ac|H3736B0
-3736B0:lA8:erl_ddll|H3736C0
-3736C0:lA8:erl_epmd|H3736D0
-3736D0:lAA:erts_debug|H3736E0
-3736E0:lA7:gen_tcp|H3736F0
-3736F0:lA7:gen_udp|H373700
-373700:lA9:prim_inet|H373708
-373708:lA4:inet|H373710
-373710:lA7:inet_db|H373718
-373718:lA8:inet_dns|H373720
-373720:lAA:inet_parse|H373728
-373728:lA8:inet_res|H373730
-373730:lA8:inet_tcp|H373738
-373738:lA8:inet_udp|H373740
-373740:lA3:pg2|H373748
-373748:lA9:seq_trace|H373750
-373750:lA6:socks5|H373758
-373758:lAB:socks5_auth|H373760
-373760:lAA:socks5_tcp|H373768
-373768:lAA:socks5_udp|H373770
-373770:lAF:wrap_log_reader|H373778
-373778:lA4:zlib|H373780
-373780:lA9:otp_ring0|N
-373118:lH373148|H373154
-373148:t2:AA:registered,H37317C
-37317C:lA16:application_controller|H3731B8
-3731B8:lA9:erl_reply|H3731F4
-3731F4:lA4:auth|H373230
-373230:lAB:boot_server|H37326C
-37326C:lAB:code_server|H3732AC
-3732AC:lAF:disk_log_server|H3732E0
-3732E0:lAC:disk_log_sup|H37330C
-37330C:lAF:erl_prim_loader|H373338
-373338:lAC:error_logger|H373358
-373358:lAB:file_server|H373378
-373378:lAD:file_server_2|H373398
-373398:lAF:fixtable_server|H3733B0
-3733B0:lAC:global_group|H3733C8
-3733C8:lA12:global_name_server|H3733E0
-3733E0:lA5:heart|H3733F8
-3733F8:lA4:init|H373410
-373410:lAD:kernel_config|H373428
-373428:lAA:kernel_sup|H373440
-373440:lAA:net_kernel|H373458
-373458:lA7:net_sup|H373470
-373470:lA3:rex|H373488
-373488:lA4:user|H3734A0
-3734A0:lA9:os_server|H3734B8
-3734B8:lAB:ddll_server|H3734D0
-3734D0:lA8:erl_epmd|H3734E8
-3734E8:lA7:inet_db|H373500
-373500:lA3:pg2|N
-373154:lH373184|H373190
-373184:t2:AC:applications,N
-373190:lH3731C0|H3731CC
-3731C0:t2:A15:included_applications,N
-3731CC:lH3731FC|H373208
-3731FC:t2:A3:env,H373238
-373238:lH373274|N
-373274:t2:AC:error_logger,A3:tty
-373208:lH373240|H37324C
-373240:t2:AC:start_phases,A9:undefined
-37324C:lH373280|H37328C
-373280:t2:A4:maxT,A8:infinity
-37328C:lH3732B4|H3732C0
-3732B4:t2:A4:maxP,A8:infinity
-3732C0:lH3732E8|N
-3732E8:t2:A3:mod,H373314
-373314:t2:A6:kernel,N
-373048:lN|N
-372E4C:t2:AD:$initial_call,H372EE4
-372EE4:t3:A3:gen,A7:init_it,H372ED0
-372E58:t2:AA:$ancestors,H372EF4
-372EF4:lP<0.1.0>|N
-=proc_dictionary:<0.7.0>
-H369B78
-H369B5C
-=proc_stack:<0.7.0>
-369d64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:H369C2C
-y1:P<0.5.0>
-369d70:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A12:application_master
-y2:A4:init
-y3:H369B2C
-=proc_heap:<0.7.0>
-369C2C:t6:A5:state,P<0.8.0>,H3697B0,N,I0,P<0.0.0>
-3697B0:t9:A9:appl_data,A6:kernel,H369B14,A9:undefined,H3697D8,H369A3C,N,A8:infinity,A8:infinity
-369A3C:lAB:application|H369A34
-369A34:lA16:application_controller|H369A2C
-369A2C:lA12:application_master|H369A24
-369A24:lA13:application_starter|H369A1C
-369A1C:lA4:auth|H369A14
-369A14:lA4:code|H369A0C
-369A0C:lA8:code_aux|H369A04
-369A04:lA8:packages|H3699FC
-3699FC:lAB:code_server|H3699F4
-3699F4:lA9:dist_util|H3699EC
-3699EC:lAF:erl_boot_server|H3699E4
-3699E4:lA10:erl_distribution|H3699DC
-3699DC:lAF:erl_prim_loader|H3699D4
-3699D4:lA9:erl_reply|H3699CC
-3699CC:lA6:erlang|H3699C4
-3699C4:lAD:error_handler|H3699BC
-3699BC:lAC:error_logger|H3699B4
-3699B4:lA4:file|H3699AC
-3699AC:lAB:file_server|H3699A4
-3699A4:lAF:old_file_server|H36999C
-36999C:lAE:file_io_server|H369994
-369994:lA9:prim_file|H36998C
-36998C:lA6:global|H369984
-369984:lAC:global_group|H36997C
-36997C:lAD:global_search|H369974
-369974:lA5:group|H36996C
-36996C:lA5:heart|H369964
-369964:lA13:hipe_unified_loader|H36995C
-36995C:lA11:hipe_sparc_loader|H369954
-369954:lAF:hipe_x86_loader|H36994C
-36994C:lA9:inet6_tcp|H369944
-369944:lAE:inet6_tcp_dist|H36993C
-36993C:lA9:inet6_udp|H369934
-369934:lAB:inet_config|H36992C
-36992C:lAA:inet_hosts|H369924
-369924:lA13:inet_gethost_native|H36991C
-36991C:lAD:inet_tcp_dist|H369914
-369914:lA4:init|H36990C
-36990C:lA6:kernel|H369904
-369904:lAD:kernel_config|H3698FC
-3698FC:lA3:net|H3698F4
-3698F4:lA7:net_adm|H3698EC
-3698EC:lAA:net_kernel|H3698E4
-3698E4:lA2:os|H3698DC
-3698DC:lA8:ram_file|H3698D4
-3698D4:lA3:rpc|H3698CC
-3698CC:lA4:user|H3698C4
-3698C4:lA8:user_drv|H3698BC
-3698BC:lA8:user_sup|H3698B4
-3698B4:lA8:disk_log|H3698AC
-3698AC:lAA:disk_log_1|H3698A4
-3698A4:lAF:disk_log_server|H36989C
-36989C:lAC:disk_log_sup|H369894
-369894:lA7:dist_ac|H36988C
-36988C:lA8:erl_ddll|H369884
-369884:lA8:erl_epmd|H36987C
-36987C:lAA:erts_debug|H369874
-369874:lA7:gen_tcp|H36986C
-36986C:lA7:gen_udp|H369864
-369864:lA9:prim_inet|H36985C
-36985C:lA4:inet|H369854
-369854:lA7:inet_db|H36984C
-36984C:lA8:inet_dns|H369844
-369844:lAA:inet_parse|H36983C
-36983C:lA8:inet_res|H369834
-369834:lA8:inet_tcp|H36982C
-36982C:lA8:inet_udp|H369824
-369824:lA3:pg2|H36981C
-36981C:lA9:seq_trace|H369814
-369814:lA6:socks5|H36980C
-36980C:lAB:socks5_auth|H369804
-369804:lAA:socks5_tcp|H3697FC
-3697FC:lAA:socks5_udp|H3697F4
-3697F4:lAF:wrap_log_reader|H3697EC
-3697EC:lA4:zlib|H3697E4
-3697E4:lA9:otp_ring0|N
-3697D8:t2:A6:kernel,N
-369B14:lA16:application_controller|H369B0C
-369B0C:lA9:erl_reply|H369B04
-369B04:lA4:auth|H369AFC
-369AFC:lAB:boot_server|H369AF4
-369AF4:lAB:code_server|H369AEC
-369AEC:lAF:disk_log_server|H369AE4
-369AE4:lAC:disk_log_sup|H369ADC
-369ADC:lAF:erl_prim_loader|H369AD4
-369AD4:lAC:error_logger|H369ACC
-369ACC:lAB:file_server|H369AC4
-369AC4:lAD:file_server_2|H369ABC
-369ABC:lAF:fixtable_server|H369AB4
-369AB4:lAC:global_group|H369AAC
-369AAC:lA12:global_name_server|H369AA4
-369AA4:lA5:heart|H369A9C
-369A9C:lA4:init|H369A94
-369A94:lAD:kernel_config|H369A8C
-369A8C:lAA:kernel_sup|H369A84
-369A84:lAA:net_kernel|H369A7C
-369A7C:lA7:net_sup|H369A74
-369A74:lA3:rex|H369A6C
-369A6C:lA4:user|H369A64
-369A64:lA9:os_server|H369A5C
-369A5C:lAB:ddll_server|H369A54
-369A54:lA8:erl_epmd|H369A4C
-369A4C:lA7:inet_db|H369A44
-369A44:lA3:pg2|N
-369B2C:lP<0.5.0>|H369B24
-369B24:lP<0.6.0>|H3697A8
-3697A8:lH3697B0|H369B1C
-369B1C:lA6:normal|N
-369B78:t2:AD:$initial_call,H369B68
-369B68:t3:A12:application_master,A4:init,H369B2C
-369B5C:t2:AA:$ancestors,H369B54
-369B54:lP<0.6.0>|N
-=proc_stack:<0.8.0>
-384ec0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H384BDC
-y1:A6:kernel
-y2:P<0.9.0>
-y3:P<0.7.0>
-=proc_heap:<0.8.0>
-384BDC:t2:A5:state,A3:tty
-=proc_dictionary:<0.9.0>
-H376850
-H37685C
-=proc_stack:<0.9.0>
-36bde8:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36B8E8
-y4:AA:kernel_sup
-y5:P<0.8.0>
-36be04:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3768D4
-=proc_heap:<0.9.0>
-36B8E8:tA:A5:state,H376868,AB:one_for_all,H36B8D4,N,I0,I1,N,A6:kernel,N
-36B8D4:lH36B8B0|H36B6E8
-36B8B0:t8:A5:child,P<0.24.0>,AF:kernel_safe_sup,H376BF0,A9:permanent,A8:infinity,AA:supervisor,H376C00
-376C00:lA6:kernel|N
-376BF0:t3:AA:supervisor,AA:start_link,H376C08
-376C08:lH376C10|H376C1C
-376C10:t2:A5:local,AF:kernel_safe_sup
-376C1C:lA6:kernel|H376C24
-376C24:lA4:safe|N
-36B6E8:lH36B6C4|H36B490
-36B6C4:t8:A5:child,P<0.23.0>,AD:kernel_config,H376BB4,A9:permanent,I2000,A6:worker,H376BC4
-376BC4:lAD:kernel_config|N
-376BB4:t3:AD:kernel_config,AA:start_link,N
-36B490:lH36B498|H36B4BC
-36B498:t8:A5:child,P<0.19.0>,A4:user,H376B70,A9:temporary,I2000,AA:supervisor,H376B80
-376B80:lA8:user_sup|N
-376B70:t3:A8:user_sup,A5:start,N
-36B4BC:lH36B4C4|H376CB0
-36B4C4:t8:A5:child,P<0.18.0>,AB:code_server,H376B0C,A9:permanent,I2000,A6:worker,H376B1C
-376B1C:lA4:code|N
-376B0C:t3:A4:code,AA:start_link,N
-376CB0:lH376CB8|H376CDC
-376CB8:t8:A5:child,P<0.17.0>,AB:file_server,H376AB8,A9:permanent,I2000,A6:worker,H376AC8
-376AC8:lAF:old_file_server|N
-376AB8:t3:AF:old_file_server,AA:start_link,N
-376CDC:lH376CE4|H376C2C
-376CE4:t8:A5:child,P<0.16.0>,AD:file_server_2,H376A58,A9:permanent,I2000,A6:worker,H376A68
-376A68:lA4:file|H376AB0
-376AB0:lAB:file_server|H376B04
-376B04:lAE:file_io_server|H376B68
-376B68:lA9:prim_file|N
-376A58:t3:AB:file_server,AA:start_link,N
-376C2C:lH376C34|H376C58
-376C34:t8:A5:child,P<0.15.0>,AC:global_group,H3769F4,A9:permanent,I2000,A6:worker,H376A04
-376A04:lAC:global_group|N
-3769F4:t3:AC:global_group,AA:start_link,N
-376C58:lH376C60|H376C84
-376C60:t8:A5:child,A9:undefined,A7:net_sup,H37696C,A9:permanent,A8:infinity,AA:supervisor,H37697C
-37697C:lA10:erl_distribution|N
-37696C:t3:A10:erl_distribution,AA:start_link,N
-376C84:lH376C8C|H3768A0
-376C8C:t8:A5:child,P<0.14.0>,A7:inet_db,H3768F4,A9:permanent,I2000,A6:worker,H376904
-376904:lA7:inet_db|N
-3768F4:t3:A7:inet_db,AA:start_link,N
-3768A0:lH376938|H37695C
-376938:t8:A5:child,P<0.11.0>,A12:global_name_server,H3769B0,A9:permanent,I2000,A6:worker,H3769C0
-3769C0:lA6:global|N
-3769B0:t3:A6:global,AA:start_link,N
-37695C:lH3769C8|N
-3769C8:t8:A5:child,P<0.10.0>,A3:rex,H376A38,A9:permanent,I2000,A6:worker,H376A48
-376A48:lA3:rpc|N
-376A38:t3:A3:rpc,AA:start_link,N
-376868:t2:A5:local,AA:kernel_sup
-3768D4:lAA:gen_server|H376964
-376964:lP<0.8.0>|H3769EC
-3769EC:lP<0.8.0>|H376A50
-376A50:lH376A9C|H376AA8
-376A9C:t2:A5:local,AA:kernel_sup
-376AA8:lAA:supervisor|H376AFC
-376AFC:lH376B50|H376B60
-376B50:t3:H376868,A6:kernel,N
-376B60:lN|N
-376850:t2:AD:$initial_call,H3768DC
-3768DC:t3:A3:gen,A7:init_it,H3768D4
-37685C:t2:AA:$ancestors,H3768EC
-3768EC:lP<0.8.0>|N
-=proc_dictionary:<0.10.0>
-H367A10
-H3679F4
-=proc_stack:<0.10.0>
-367cec:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A3:rpc
-y3:H367AA8
-y4:A3:rex
-y5:P<0.9.0>
-367d08:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3679C4
-=proc_heap:<0.10.0>
-367AA8:t2:I0,A3:nil
-3679C4:lAA:gen_server|H3679BC
-3679BC:lP<0.9.0>|H3679B4
-3679B4:lP<0.9.0>|H367988
-367988:lH367990|H3679AC
-367990:t2:A5:local,A3:rex
-3679AC:lA3:rpc|H3679A4
-3679A4:lN|H36799C
-36799C:lN|N
-367A10:t2:AD:$initial_call,H367A00
-367A00:t3:A3:gen,A7:init_it,H3679C4
-3679F4:t2:AA:$ancestors,H3679EC
-3679EC:lAA:kernel_sup|H3679CC
-3679CC:lP<0.8.0>|N
-=proc_dictionary:<0.11.0>
-H36ADD8
-H36ADBC
-=proc_stack:<0.11.0>
-36b0b4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A6:global
-y3:H36AF0C
-y4:A12:global_name_server
-y5:P<0.9.0>
-36b0d0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36AD8C
-=proc_heap:<0.11.0>
-36AF0C:t9:A5:state,A4:true,N,N,N,N,AD:nonode@nohost,P<0.12.0>,P<0.13.0>
-36AD8C:lAA:gen_server|H36AD84
-36AD84:lP<0.9.0>|H36AD7C
-36AD7C:lP<0.9.0>|H36AD50
-36AD50:lH36AD58|H36AD74
-36AD58:t2:A5:local,A12:global_name_server
-36AD74:lA6:global|H36AD6C
-36AD6C:lN|H36AD64
-36AD64:lN|N
-36ADD8:t2:AD:$initial_call,H36ADC8
-36ADC8:t3:A3:gen,A7:init_it,H36AD8C
-36ADBC:t2:AA:$ancestors,H36ADB4
-36ADB4:lAA:kernel_sup|H36AD94
-36AD94:lP<0.8.0>|N
-=proc_stack:<0.12.0>
-36921c:SReturn addr 0x261184 (global:init_the_locker/1 + 112)
-y0:N
-y1:N
-y2:N
-y3:N
-y4:N
-y5:N
-y6:A8:infinity
-y7:H368EB0
-y8:P<0.11.0>
-369244:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-=proc_heap:<0.12.0>
-368EB0:t3:A5:multi,A9:undefined,N
-=proc_stack:<0.13.0>
-3695d0:SReturn addr 0x2651AC (global:loop_the_deleter/1 + 36)
-y0:A8:infinity
-y1:N
-y2:P<0.11.0>
-3695e0:SReturn addr 0x2654F8 (global:'-start_the_deleter/1-fun-0-'/1 + 20)
-y0:N
-y1:N
-y2:P<0.11.0>
-3695f0:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.13.0>
-=proc_dictionary:<0.14.0>
-H36A998
-H36A9A4
-=proc_stack:<0.14.0>
-372e0c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:inet_db
-y3:H36A9B0
-y4:A7:inet_db
-y5:P<0.9.0>
-372e28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36A9C8
-=proc_heap:<0.14.0>
-36A9B0:t5:A5:state,A7:inet_db,AA:inet_cache,AA:inet_hosts,H36A9E8
-36A9E8:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000060000000000000000
-36A9C8:lAA:gen_server|H36A9F8
-36A9F8:lP<0.9.0>|H36AA08
-36AA08:lP<0.9.0>|H36AA10
-36AA10:lH36AA18|H36AA24
-36AA18:t2:A5:local,A7:inet_db
-36AA24:lA7:inet_db|H36AA2C
-36AA2C:lN|H36AA34
-36AA34:lN|N
-36A998:t2:AD:$initial_call,H36A9D0
-36A9D0:t3:A3:gen,A7:init_it,H36A9C8
-36A9A4:t2:AA:$ancestors,H36A9E0
-36A9E0:lAA:kernel_sup|H36AA00
-36AA00:lP<0.8.0>|N
-=proc_dictionary:<0.15.0>
-H372788
-H3727F8
-H37276C
-H37280C
-H372820
-=proc_stack:<0.15.0>
-372a64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AC:global_group
-y3:H3728C8
-y4:AC:global_group
-y5:P<0.9.0>
-372a80:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37273C
-=proc_heap:<0.15.0>
-3728C8:tC:A5:state,A7:no_conf,A4:true,N,N,N,N,N,AD:nonode@nohost,N,A6:normal,A6:normal
-37273C:lAA:gen_server|H372734
-372734:lP<0.9.0>|H37272C
-37272C:lP<0.9.0>|H372700
-372700:lH372708|H372724
-372708:t2:A5:local,AC:global_group
-372724:lAC:global_group|H37271C
-37271C:lN|H372714
-372714:lN|N
-372788:t2:AD:$initial_call,H372778
-372778:t3:A3:gen,A7:init_it,H37273C
-3727F8:t2:A10:registered_names,H3727F0
-3727F0:lA9:undefined|N
-37276C:t2:AA:$ancestors,H372764
-372764:lAA:kernel_sup|H372744
-372744:lP<0.8.0>|N
-37280C:t2:A4:send,H372804
-372804:lA9:undefined|N
-372820:t2:AC:whereis_name,H372818
-372818:lA9:undefined|N
-=proc_dictionary:<0.16.0>
-H37B918
-H37B924
-=proc_stack:<0.16.0>
-3d303c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AB:file_server
-y3:p<0.4>
-y4:AD:file_server_2
-y5:P<0.9.0>
-3d3058:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37B930
-=proc_heap:<0.16.0>
-37B930:lAA:gen_server|H37B950
-37B950:lP<0.9.0>|H37B960
-37B960:lP<0.9.0>|H37B968
-37B968:lH37B970|H37B97C
-37B970:t2:A5:local,AD:file_server_2
-37B97C:lAB:file_server|H37B984
-37B984:lN|H37B98C
-37B98C:lN|N
-37B918:t2:AD:$initial_call,H37B938
-37B938:t3:A3:gen,A7:init_it,H37B930
-37B924:t2:AA:$ancestors,H37B948
-37B948:lAA:kernel_sup|H37B958
-37B958:lP<0.8.0>|N
-=proc_stack:<0.17.0>
-3763cc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H376084
-y1:P<0.16.0>
-y2:P<0.9.0>
-=proc_heap:<0.17.0>
-376084:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000160000000000000000
-=proc_stack:<0.18.0>
-3b98e8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H38AE84
-y1:P<0.9.0>
-=proc_heap:<0.18.0>
-38AE84:t8:A5:state,P<0.9.0>,H3873BC,H38AEB8,I9,I10,A8:no_cache,AB:interactive
-38AEB8:lH3873D4|H38AEE0
-3873D4:lI46|N
-38AEE0:lH3873EC|H38AF10
-3873EC:lI47|H387404
-387404:lI99|H387424
-387424:lI108|H38744C
-38744C:lI101|H38747C
-38747C:lI97|H3874B4
-3874B4:lI114|H3874F4
-3874F4:lI99|H38753C
-38753C:lI97|H38758C
-38758C:lI115|H3875E4
-3875E4:lI101|H387644
-387644:lI47|H3876AC
-3876AC:lI111|H38771C
-38771C:lI116|H387794
-387794:lI112|H387814
-387814:lI47|H38789C
-38789C:lI101|H38792C
-38792C:lI114|H3879BC
-3879BC:lI116|H387A54
-387A54:lI115|H387AF4
-387AF4:lI47|H387B9C
-387B9C:lI108|H387C4C
-387C4C:lI105|H387D04
-387D04:lI98|H387DC4
-387DC4:lI47|H387E8C
-387E8C:lI107|H387F5C
-387F5C:lI101|H388034
-388034:lI114|H388114
-388114:lI110|H3881FC
-3881FC:lI101|H3882EC
-3882EC:lI108|H3883E4
-3883E4:lI47|H3884E4
-3884E4:lI101|H3885EC
-3885EC:lI98|H3886FC
-3886FC:lI105|H388814
-388814:lI110|N
-38AF10:lH38740C|H38AF48
-38740C:lI47|H38742C
-38742C:lI99|H387454
-387454:lI108|H387484
-387484:lI101|H3874BC
-3874BC:lI97|H3874FC
-3874FC:lI114|H387544
-387544:lI99|H387594
-387594:lI97|H3875EC
-3875EC:lI115|H38764C
-38764C:lI101|H3876B4
-3876B4:lI47|H387724
-387724:lI111|H38779C
-38779C:lI116|H38781C
-38781C:lI112|H3878A4
-3878A4:lI47|H387934
-387934:lI101|H3879C4
-3879C4:lI114|H387A5C
-387A5C:lI116|H387AFC
-387AFC:lI115|H387BA4
-387BA4:lI47|H387C54
-387C54:lI108|H387D0C
-387D0C:lI105|H387DCC
-387DCC:lI98|H387E94
-387E94:lI47|H387F64
-387F64:lI115|H38803C
-38803C:lI116|H38811C
-38811C:lI100|H388204
-388204:lI108|H3882F4
-3882F4:lI105|H3883EC
-3883EC:lI98|H3884EC
-3884EC:lI47|H3885F4
-3885F4:lI101|H388704
-388704:lI98|H38881C
-38881C:lI105|H38892C
-38892C:lI110|N
-38AF48:lH387434|H38AF70
-387434:lI47|H38745C
-38745C:lI99|H38748C
-38748C:lI108|H3874C4
-3874C4:lI101|H387504
-387504:lI97|H38754C
-38754C:lI114|H38759C
-38759C:lI99|H3875F4
-3875F4:lI97|H387654
-387654:lI115|H3876BC
-3876BC:lI101|H38772C
-38772C:lI47|H3877A4
-3877A4:lI111|H387824
-387824:lI116|H3878AC
-3878AC:lI112|H38793C
-38793C:lI47|H3879CC
-3879CC:lI101|H387A64
-387A64:lI114|H387B04
-387B04:lI116|H387BAC
-387BAC:lI115|H387C5C
-387C5C:lI47|H387D14
-387D14:lI108|H387DD4
-387DD4:lI105|H387E9C
-387E9C:lI98|H387F6C
-387F6C:lI47|H388044
-388044:lI119|H388124
-388124:lI101|H38820C
-38820C:lI98|H3882FC
-3882FC:lI116|H3883F4
-3883F4:lI111|H3884F4
-3884F4:lI111|H3885FC
-3885FC:lI108|H38870C
-38870C:lI47|H388824
-388824:lI101|H388934
-388934:lI98|H388A44
-388A44:lI105|H388B54
-388B54:lI110|N
-38AF70:lH387464|H38AF98
-387464:lI47|H387494
-387494:lI99|H3874CC
-3874CC:lI108|H38750C
-38750C:lI101|H387554
-387554:lI97|H3875A4
-3875A4:lI114|H3875FC
-3875FC:lI99|H38765C
-38765C:lI97|H3876C4
-3876C4:lI115|H387734
-387734:lI101|H3877AC
-3877AC:lI47|H38782C
-38782C:lI111|H3878B4
-3878B4:lI116|H387944
-387944:lI112|H3879D4
-3879D4:lI47|H387A6C
-387A6C:lI101|H387B0C
-387B0C:lI114|H387BB4
-387BB4:lI116|H387C64
-387C64:lI115|H387D1C
-387D1C:lI47|H387DDC
-387DDC:lI108|H387EA4
-387EA4:lI105|H387F74
-387F74:lI98|H38804C
-38804C:lI47|H38812C
-38812C:lI116|H388214
-388214:lI118|H388304
-388304:lI47|H3883FC
-3883FC:lI101|H3884FC
-3884FC:lI98|H388604
-388604:lI105|H388714
-388714:lI110|N
-38AF98:lH38749C|H38AFC0
-38749C:lI47|H3874D4
-3874D4:lI99|H387514
-387514:lI108|H38755C
-38755C:lI101|H3875AC
-3875AC:lI97|H387604
-387604:lI114|H387664
-387664:lI99|H3876CC
-3876CC:lI97|H38773C
-38773C:lI115|H3877B4
-3877B4:lI101|H387834
-387834:lI47|H3878BC
-3878BC:lI111|H38794C
-38794C:lI116|H3879DC
-3879DC:lI112|H387A74
-387A74:lI47|H387B14
-387B14:lI101|H387BBC
-387BBC:lI114|H387C6C
-387C6C:lI116|H387D24
-387D24:lI115|H387DE4
-387DE4:lI47|H387EAC
-387EAC:lI108|H387F7C
-387F7C:lI105|H388054
-388054:lI98|H388134
-388134:lI47|H38821C
-38821C:lI116|H38830C
-38830C:lI115|H388404
-388404:lI112|H388504
-388504:lI47|H38860C
-38860C:lI101|H38871C
-38871C:lI98|H38882C
-38882C:lI105|H38893C
-38893C:lI110|N
-38AFC0:lH3874DC|H38AFE8
-3874DC:lI47|H38751C
-38751C:lI99|H387564
-387564:lI108|H3875B4
-3875B4:lI101|H38760C
-38760C:lI97|H38766C
-38766C:lI114|H3876D4
-3876D4:lI99|H387744
-387744:lI97|H3877BC
-3877BC:lI115|H38783C
-38783C:lI101|H3878C4
-3878C4:lI47|H387954
-387954:lI111|H3879E4
-3879E4:lI116|H387A7C
-387A7C:lI112|H387B1C
-387B1C:lI47|H387BC4
-387BC4:lI101|H387C74
-387C74:lI114|H387D2C
-387D2C:lI116|H387DEC
-387DEC:lI115|H387EB4
-387EB4:lI47|H387F84
-387F84:lI108|H38805C
-38805C:lI105|H38813C
-38813C:lI98|H388224
-388224:lI47|H388314
-388314:lI116|H38840C
-38840C:lI111|H38850C
-38850C:lI111|H388614
-388614:lI108|H388724
-388724:lI115|H388834
-388834:lI47|H388944
-388944:lI101|H388A4C
-388A4C:lI98|H388B5C
-388B5C:lI105|H388C6C
-388C6C:lI110|N
-38AFE8:lH387524|H38B008
-387524:lI47|H38756C
-38756C:lI99|H3875BC
-3875BC:lI108|H387614
-387614:lI101|H387674
-387674:lI97|H3876DC
-3876DC:lI114|H38774C
-38774C:lI99|H3877C4
-3877C4:lI97|H387844
-387844:lI115|H3878CC
-3878CC:lI101|H38795C
-38795C:lI47|H3879EC
-3879EC:lI111|H387A84
-387A84:lI116|H387B24
-387B24:lI112|H387BCC
-387BCC:lI47|H387C7C
-387C7C:lI101|H387D34
-387D34:lI114|H387DF4
-387DF4:lI116|H387EBC
-387EBC:lI115|H387F8C
-387F8C:lI47|H388064
-388064:lI108|H388144
-388144:lI105|H38822C
-38822C:lI98|H38831C
-38831C:lI47|H388414
-388414:lI116|H388514
-388514:lI111|H38861C
-38861C:lI111|H38872C
-38872C:lI108|H38883C
-38883C:lI98|H38894C
-38894C:lI97|H388A54
-388A54:lI114|H388B64
-388B64:lI47|H388C74
-388C74:lI101|H388D84
-388D84:lI98|H388E9C
-388E9C:lI105|H388FB4
-388FB4:lI110|N
-38B008:lH387574|H38B018
-387574:lI47|H3875C4
-3875C4:lI99|H38761C
-38761C:lI108|H38767C
-38767C:lI101|H3876E4
-3876E4:lI97|H387754
-387754:lI114|H3877CC
-3877CC:lI99|H38784C
-38784C:lI97|H3878D4
-3878D4:lI115|H387964
-387964:lI101|H3879F4
-3879F4:lI47|H387A8C
-387A8C:lI111|H387B2C
-387B2C:lI116|H387BD4
-387BD4:lI112|H387C84
-387C84:lI47|H387D3C
-387D3C:lI101|H387DFC
-387DFC:lI114|H387EC4
-387EC4:lI116|H387F94
-387F94:lI115|H38806C
-38806C:lI47|H38814C
-38814C:lI108|H388234
-388234:lI105|H388324
-388324:lI98|H38841C
-38841C:lI47|H38851C
-38851C:lI116|H388624
-388624:lI101|H388734
-388734:lI115|H388844
-388844:lI116|H388954
-388954:lI95|H388A5C
-388A5C:lI115|H388B6C
-388B6C:lI101|H388C7C
-388C7C:lI114|H388D8C
-388D8C:lI118|H388EA4
-388EA4:lI101|H388FBC
-388FBC:lI114|H3890D4
-3890D4:lI47|H3891EC
-3891EC:lI101|H3892FC
-3892FC:lI98|H38940C
-38940C:lI105|H38951C
-38951C:lI110|N
-38B018:lH3875CC|H38AE7C
-3875CC:lI47|H387624
-387624:lI99|H387684
-387684:lI108|H3876EC
-3876EC:lI101|H38775C
-38775C:lI97|H3877D4
-3877D4:lI114|H387854
-387854:lI99|H3878DC
-3878DC:lI97|H38796C
-38796C:lI115|H3879FC
-3879FC:lI101|H387A94
-387A94:lI47|H387B34
-387B34:lI111|H387BDC
-387BDC:lI116|H387C8C
-387C8C:lI112|H387D44
-387D44:lI47|H387E04
-387E04:lI101|H387ECC
-387ECC:lI114|H387F9C
-387F9C:lI116|H388074
-388074:lI115|H388154
-388154:lI47|H38823C
-38823C:lI108|H38832C
-38832C:lI105|H388424
-388424:lI98|H388524
-388524:lI47|H38862C
-38862C:lI115|H38873C
-38873C:lI115|H38884C
-38884C:lI108|H38895C
-38895C:lI47|H388A64
-388A64:lI101|H388B74
-388B74:lI98|H388C84
-388C84:lI105|H388D94
-388D94:lI110|N
-38AE7C:lH38762C|H38AEB0
-38762C:lI47|H38768C
-38768C:lI99|H3876F4
-3876F4:lI108|H387764
-387764:lI101|H3877DC
-3877DC:lI97|H38785C
-38785C:lI114|H3878E4
-3878E4:lI99|H387974
-387974:lI97|H387A04
-387A04:lI115|H387A9C
-387A9C:lI101|H387B3C
-387B3C:lI47|H387BE4
-387BE4:lI111|H387C94
-387C94:lI116|H387D4C
-387D4C:lI112|H387E0C
-387E0C:lI47|H387ED4
-387ED4:lI101|H387FA4
-387FA4:lI114|H38807C
-38807C:lI116|H38815C
-38815C:lI115|H388244
-388244:lI47|H388334
-388334:lI108|H38842C
-38842C:lI105|H38852C
-38852C:lI98|H388634
-388634:lI47|H388744
-388744:lI115|H388854
-388854:lI110|H388964
-388964:lI109|H388A6C
-388A6C:lI112|H388B7C
-388B7C:lI47|H388C8C
-388C8C:lI101|H388D9C
-388D9C:lI98|H388EAC
-388EAC:lI105|H388FC4
-388FC4:lI110|N
-38AEB0:lH387694|H38AED8
-387694:lI47|H3876FC
-3876FC:lI99|H38776C
-38776C:lI108|H3877E4
-3877E4:lI101|H387864
-387864:lI97|H3878EC
-3878EC:lI114|H38797C
-38797C:lI99|H387A0C
-387A0C:lI97|H387AA4
-387AA4:lI115|H387B44
-387B44:lI101|H387BEC
-387BEC:lI47|H387C9C
-387C9C:lI111|H387D54
-387D54:lI116|H387E14
-387E14:lI112|H387EDC
-387EDC:lI47|H387FAC
-387FAC:lI101|H388084
-388084:lI114|H388164
-388164:lI116|H38824C
-38824C:lI115|H38833C
-38833C:lI47|H388434
-388434:lI108|H388534
-388534:lI105|H38863C
-38863C:lI98|H38874C
-38874C:lI47|H38885C
-38885C:lI115|H38896C
-38896C:lI97|H388A74
-388A74:lI115|H388B84
-388B84:lI108|H388C94
-388C94:lI47|H388DA4
-388DA4:lI101|H388EB4
-388EB4:lI98|H388FCC
-388FCC:lI105|H3890DC
-3890DC:lI110|N
-38AED8:lH387704|H38AF08
-387704:lI47|H387774
-387774:lI99|H3877EC
-3877EC:lI108|H38786C
-38786C:lI101|H3878F4
-3878F4:lI97|H387984
-387984:lI114|H387A14
-387A14:lI99|H387AAC
-387AAC:lI97|H387B4C
-387B4C:lI115|H387BF4
-387BF4:lI101|H387CA4
-387CA4:lI47|H387D5C
-387D5C:lI111|H387E1C
-387E1C:lI116|H387EE4
-387EE4:lI112|H387FB4
-387FB4:lI47|H38808C
-38808C:lI101|H38816C
-38816C:lI114|H388254
-388254:lI116|H388344
-388344:lI115|H38843C
-38843C:lI47|H38853C
-38853C:lI108|H388644
-388644:lI105|H388754
-388754:lI98|H388864
-388864:lI47|H388974
-388974:lI114|H388A7C
-388A7C:lI117|H388B8C
-388B8C:lI110|H388C9C
-388C9C:lI116|H388DAC
-388DAC:lI105|H388EBC
-388EBC:lI109|H388FD4
-388FD4:lI101|H3890E4
-3890E4:lI95|H3891F4
-3891F4:lI116|H389304
-389304:lI111|H389414
-389414:lI111|H389524
-389524:lI108|H389624
-389624:lI115|H38971C
-38971C:lI47|H389814
-389814:lI101|H38990C
-38990C:lI98|H389A04
-389A04:lI105|H389AE4
-389AE4:lI110|N
-38AF08:lH38777C|H38AF40
-38777C:lI47|H3877F4
-3877F4:lI99|H387874
-387874:lI108|H3878FC
-3878FC:lI101|H38798C
-38798C:lI97|H387A1C
-387A1C:lI114|H387AB4
-387AB4:lI99|H387B54
-387B54:lI97|H387BFC
-387BFC:lI115|H387CAC
-387CAC:lI101|H387D64
-387D64:lI47|H387E24
-387E24:lI111|H387EEC
-387EEC:lI116|H387FBC
-387FBC:lI112|H388094
-388094:lI47|H388174
-388174:lI101|H38825C
-38825C:lI114|H38834C
-38834C:lI116|H388444
-388444:lI115|H388544
-388544:lI47|H38864C
-38864C:lI108|H38875C
-38875C:lI105|H38886C
-38886C:lI98|H38897C
-38897C:lI47|H388A84
-388A84:lI114|H388B94
-388B94:lI115|H388CA4
-388CA4:lI104|H388DB4
-388DB4:lI101|H388EC4
-388EC4:lI108|H388FDC
-388FDC:lI108|H3890EC
-3890EC:lI47|H3891FC
-3891FC:lI101|H38930C
-38930C:lI98|H38941C
-38941C:lI105|H38952C
-38952C:lI110|N
-38AF40:lH3877FC|H38AF68
-3877FC:lI47|H38787C
-38787C:lI99|H387904
-387904:lI108|H387994
-387994:lI101|H387A24
-387A24:lI97|H387ABC
-387ABC:lI114|H387B5C
-387B5C:lI99|H387C04
-387C04:lI97|H387CB4
-387CB4:lI115|H387D6C
-387D6C:lI101|H387E2C
-387E2C:lI47|H387EF4
-387EF4:lI111|H387FC4
-387FC4:lI116|H38809C
-38809C:lI112|H38817C
-38817C:lI47|H388264
-388264:lI101|H388354
-388354:lI114|H38844C
-38844C:lI116|H38854C
-38854C:lI115|H388654
-388654:lI47|H388764
-388764:lI108|H388874
-388874:lI105|H388984
-388984:lI98|H388A8C
-388A8C:lI47|H388B9C
-388B9C:lI112|H388CAC
-388CAC:lI109|H388DBC
-388DBC:lI97|H388ECC
-388ECC:lI110|H388FE4
-388FE4:lI47|H3890F4
-3890F4:lI101|H389204
-389204:lI98|H389314
-389314:lI105|H389424
-389424:lI110|N
-38AF68:lH387884|H38AF90
-387884:lI47|H38790C
-38790C:lI99|H38799C
-38799C:lI108|H387A2C
-387A2C:lI101|H387AC4
-387AC4:lI97|H387B64
-387B64:lI114|H387C0C
-387C0C:lI99|H387CBC
-387CBC:lI97|H387D74
-387D74:lI115|H387E34
-387E34:lI101|H387EFC
-387EFC:lI47|H387FCC
-387FCC:lI111|H3880A4
-3880A4:lI116|H388184
-388184:lI112|H38826C
-38826C:lI47|H38835C
-38835C:lI101|H388454
-388454:lI114|H388554
-388554:lI116|H38865C
-38865C:lI115|H38876C
-38876C:lI47|H38887C
-38887C:lI108|H38898C
-38898C:lI105|H388A94
-388A94:lI98|H388BA4
-388BA4:lI47|H388CB4
-388CB4:lI112|H388DC4
-388DC4:lI97|H388ED4
-388ED4:lI114|H388FEC
-388FEC:lI115|H3890FC
-3890FC:lI101|H38920C
-38920C:lI116|H38931C
-38931C:lI111|H38942C
-38942C:lI111|H389534
-389534:lI108|H38962C
-38962C:lI115|H389724
-389724:lI47|H38981C
-38981C:lI101|H389914
-389914:lI98|H389A0C
-389A0C:lI105|H389AEC
-389AEC:lI110|N
-38AF90:lH387914|H38AFB8
-387914:lI47|H3879A4
-3879A4:lI99|H387A34
-387A34:lI108|H387ACC
-387ACC:lI101|H387B6C
-387B6C:lI97|H387C14
-387C14:lI114|H387CC4
-387CC4:lI99|H387D7C
-387D7C:lI97|H387E3C
-387E3C:lI115|H387F04
-387F04:lI101|H387FD4
-387FD4:lI47|H3880AC
-3880AC:lI111|H38818C
-38818C:lI116|H388274
-388274:lI112|H388364
-388364:lI47|H38845C
-38845C:lI101|H38855C
-38855C:lI114|H388664
-388664:lI116|H388774
-388774:lI115|H388884
-388884:lI47|H388994
-388994:lI108|H388A9C
-388A9C:lI105|H388BAC
-388BAC:lI98|H388CBC
-388CBC:lI47|H388DCC
-388DCC:lI111|H388EDC
-388EDC:lI116|H388FF4
-388FF4:lI112|H389104
-389104:lI95|H389214
-389214:lI109|H389324
-389324:lI105|H389434
-389434:lI98|H38953C
-38953C:lI115|H389634
-389634:lI47|H38972C
-38972C:lI101|H389824
-389824:lI98|H38991C
-38991C:lI105|H389A14
-389A14:lI110|N
-38AFB8:lH3879AC|H38AFE0
-3879AC:lI47|H387A3C
-387A3C:lI99|H387AD4
-387AD4:lI108|H387B74
-387B74:lI101|H387C1C
-387C1C:lI97|H387CCC
-387CCC:lI114|H387D84
-387D84:lI99|H387E44
-387E44:lI97|H387F0C
-387F0C:lI115|H387FDC
-387FDC:lI101|H3880B4
-3880B4:lI47|H388194
-388194:lI111|H38827C
-38827C:lI116|H38836C
-38836C:lI112|H388464
-388464:lI47|H388564
-388564:lI101|H38866C
-38866C:lI114|H38877C
-38877C:lI116|H38888C
-38888C:lI115|H38899C
-38899C:lI47|H388AA4
-388AA4:lI108|H388BB4
-388BB4:lI105|H388CC4
-388CC4:lI98|H388DD4
-388DD4:lI47|H388EE4
-388EE4:lI111|H388FFC
-388FFC:lI115|H38910C
-38910C:lI95|H38921C
-38921C:lI109|H38932C
-38932C:lI111|H38943C
-38943C:lI110|H389544
-389544:lI47|H38963C
-38963C:lI101|H389734
-389734:lI98|H38982C
-38982C:lI105|H389924
-389924:lI110|N
-38AFE0:lH387A44|H38B000
-387A44:lI47|H387ADC
-387ADC:lI99|H387B7C
-387B7C:lI108|H387C24
-387C24:lI101|H387CD4
-387CD4:lI97|H387D8C
-387D8C:lI114|H387E4C
-387E4C:lI99|H387F14
-387F14:lI97|H387FE4
-387FE4:lI115|H3880BC
-3880BC:lI101|H38819C
-38819C:lI47|H388284
-388284:lI111|H388374
-388374:lI116|H38846C
-38846C:lI112|H38856C
-38856C:lI47|H388674
-388674:lI101|H388784
-388784:lI114|H388894
-388894:lI116|H3889A4
-3889A4:lI115|H388AAC
-388AAC:lI47|H388BBC
-388BBC:lI108|H388CCC
-388CCC:lI105|H388DDC
-388DDC:lI98|H388EEC
-388EEC:lI47|H389004
-389004:lI111|H389114
-389114:lI114|H389224
-389224:lI98|H389334
-389334:lI101|H389444
-389444:lI114|H38954C
-38954C:lI47|H389644
-389644:lI101|H38973C
-38973C:lI98|H389834
-389834:lI105|H38992C
-38992C:lI110|N
-38B000:lH387AE4|H38B010
-387AE4:lI47|H387B84
-387B84:lI99|H387C2C
-387C2C:lI108|H387CDC
-387CDC:lI101|H387D94
-387D94:lI97|H387E54
-387E54:lI114|H387F1C
-387F1C:lI99|H387FEC
-387FEC:lI97|H3880C4
-3880C4:lI115|H3881A4
-3881A4:lI101|H38828C
-38828C:lI47|H38837C
-38837C:lI111|H388474
-388474:lI116|H388574
-388574:lI112|H38867C
-38867C:lI47|H38878C
-38878C:lI101|H38889C
-38889C:lI114|H3889AC
-3889AC:lI116|H388AB4
-388AB4:lI115|H388BC4
-388BC4:lI47|H388CD4
-388CD4:lI108|H388DE4
-388DE4:lI105|H388EF4
-388EF4:lI98|H38900C
-38900C:lI47|H38911C
-38911C:lI111|H38922C
-38922C:lI100|H38933C
-38933C:lI98|H38944C
-38944C:lI99|H389554
-389554:lI47|H38964C
-38964C:lI101|H389744
-389744:lI98|H38983C
-38983C:lI105|H389934
-389934:lI110|N
-38B010:lH387B8C|H38B020
-387B8C:lI47|H387C34
-387C34:lI99|H387CE4
-387CE4:lI108|H387D9C
-387D9C:lI101|H387E5C
-387E5C:lI97|H387F24
-387F24:lI114|H387FF4
-387FF4:lI99|H3880CC
-3880CC:lI97|H3881AC
-3881AC:lI115|H388294
-388294:lI101|H388384
-388384:lI47|H38847C
-38847C:lI111|H38857C
-38857C:lI116|H388684
-388684:lI112|H388794
-388794:lI47|H3888A4
-3888A4:lI101|H3889B4
-3889B4:lI114|H388ABC
-388ABC:lI116|H388BCC
-388BCC:lI115|H388CDC
-388CDC:lI47|H388DEC
-388DEC:lI108|H388EFC
-388EFC:lI105|H389014
-389014:lI98|H389124
-389124:lI47|H389234
-389234:lI111|H389344
-389344:lI98|H389454
-389454:lI115|H38955C
-38955C:lI101|H389654
-389654:lI114|H38974C
-38974C:lI118|H389844
-389844:lI101|H38993C
-38993C:lI114|H389A1C
-389A1C:lI47|H389AF4
-389AF4:lI101|H389BBC
-389BBC:lI98|H389C84
-389C84:lI105|H389D4C
-389D4C:lI110|N
-38B020:lH387C3C|H38B028
-387C3C:lI47|H387CEC
-387CEC:lI99|H387DA4
-387DA4:lI108|H387E64
-387E64:lI101|H387F2C
-387F2C:lI97|H387FFC
-387FFC:lI114|H3880D4
-3880D4:lI99|H3881B4
-3881B4:lI97|H38829C
-38829C:lI115|H38838C
-38838C:lI101|H388484
-388484:lI47|H388584
-388584:lI111|H38868C
-38868C:lI116|H38879C
-38879C:lI112|H3888AC
-3888AC:lI47|H3889BC
-3889BC:lI101|H388AC4
-388AC4:lI114|H388BD4
-388BD4:lI116|H388CE4
-388CE4:lI115|H388DF4
-388DF4:lI47|H388F04
-388F04:lI108|H38901C
-38901C:lI105|H38912C
-38912C:lI98|H38923C
-38923C:lI47|H38934C
-38934C:lI109|H38945C
-38945C:lI110|H389564
-389564:lI101|H38965C
-38965C:lI115|H389754
-389754:lI105|H38984C
-38984C:lI97|H389944
-389944:lI95|H389A24
-389A24:lI115|H389AFC
-389AFC:lI101|H389BC4
-389BC4:lI115|H389C8C
-389C8C:lI115|H389D54
-389D54:lI105|H389E14
-389E14:lI111|H389ECC
-389ECC:lI110|H389F7C
-389F7C:lI47|H38A01C
-38A01C:lI101|H38A0AC
-38A0AC:lI98|H38A12C
-38A12C:lI105|H38A19C
-38A19C:lI110|N
-38B028:lH387CF4|H38B030
-387CF4:lI47|H387DAC
-387DAC:lI99|H387E6C
-387E6C:lI108|H387F34
-387F34:lI101|H388004
-388004:lI97|H3880DC
-3880DC:lI114|H3881BC
-3881BC:lI99|H3882A4
-3882A4:lI97|H388394
-388394:lI115|H38848C
-38848C:lI101|H38858C
-38858C:lI47|H388694
-388694:lI111|H3887A4
-3887A4:lI116|H3888B4
-3888B4:lI112|H3889C4
-3889C4:lI47|H388ACC
-388ACC:lI101|H388BDC
-388BDC:lI114|H388CEC
-388CEC:lI116|H388DFC
-388DFC:lI115|H388F0C
-388F0C:lI47|H389024
-389024:lI108|H389134
-389134:lI105|H389244
-389244:lI98|H389354
-389354:lI47|H389464
-389464:lI109|H38956C
-38956C:lI110|H389664
-389664:lI101|H38975C
-38975C:lI115|H389854
-389854:lI105|H38994C
-38994C:lI97|H389A2C
-389A2C:lI47|H389B04
-389B04:lI101|H389BCC
-389BCC:lI98|H389C94
-389C94:lI105|H389D5C
-389D5C:lI110|N
-38B030:lH387DB4|H38B038
-387DB4:lI47|H387E74
-387E74:lI99|H387F3C
-387F3C:lI108|H38800C
-38800C:lI101|H3880E4
-3880E4:lI97|H3881C4
-3881C4:lI114|H3882AC
-3882AC:lI99|H38839C
-38839C:lI97|H388494
-388494:lI115|H388594
-388594:lI101|H38869C
-38869C:lI47|H3887AC
-3887AC:lI111|H3888BC
-3888BC:lI116|H3889CC
-3889CC:lI112|H388AD4
-388AD4:lI47|H388BE4
-388BE4:lI101|H388CF4
-388CF4:lI114|H388E04
-388E04:lI116|H388F14
-388F14:lI115|H38902C
-38902C:lI47|H38913C
-38913C:lI108|H38924C
-38924C:lI105|H38935C
-38935C:lI98|H38946C
-38946C:lI47|H389574
-389574:lI109|H38966C
-38966C:lI110|H389764
-389764:lI101|H38985C
-38985C:lI109|H389954
-389954:lI111|H389A34
-389A34:lI115|H389B0C
-389B0C:lI121|H389BD4
-389BD4:lI110|H389C9C
-389C9C:lI101|H389D64
-389D64:lI47|H389E1C
-389E1C:lI101|H389ED4
-389ED4:lI98|H389F84
-389F84:lI105|H38A024
-38A024:lI110|N
-38B038:lH387E7C|H38B040
-387E7C:lI47|H387F44
-387F44:lI99|H388014
-388014:lI108|H3880EC
-3880EC:lI101|H3881CC
-3881CC:lI97|H3882B4
-3882B4:lI114|H3883A4
-3883A4:lI99|H38849C
-38849C:lI97|H38859C
-38859C:lI115|H3886A4
-3886A4:lI101|H3887B4
-3887B4:lI47|H3888C4
-3888C4:lI111|H3889D4
-3889D4:lI116|H388ADC
-388ADC:lI112|H388BEC
-388BEC:lI47|H388CFC
-388CFC:lI101|H388E0C
-388E0C:lI114|H388F1C
-388F1C:lI116|H389034
-389034:lI115|H389144
-389144:lI47|H389254
-389254:lI108|H389364
-389364:lI105|H389474
-389474:lI98|H38957C
-38957C:lI47|H389674
-389674:lI109|H38976C
-38976C:lI101|H389864
-389864:lI103|H38995C
-38995C:lI97|H389A3C
-389A3C:lI99|H389B14
-389B14:lI111|H389BDC
-389BDC:lI47|H389CA4
-389CA4:lI101|H389D6C
-389D6C:lI98|H389E24
-389E24:lI105|H389EDC
-389EDC:lI110|N
-38B040:lH387F4C|H38B048
-387F4C:lI47|H38801C
-38801C:lI99|H3880F4
-3880F4:lI108|H3881D4
-3881D4:lI101|H3882BC
-3882BC:lI97|H3883AC
-3883AC:lI114|H3884A4
-3884A4:lI99|H3885A4
-3885A4:lI97|H3886AC
-3886AC:lI115|H3887BC
-3887BC:lI101|H3888CC
-3888CC:lI47|H3889DC
-3889DC:lI111|H388AE4
-388AE4:lI116|H388BF4
-388BF4:lI112|H388D04
-388D04:lI47|H388E14
-388E14:lI101|H388F24
-388F24:lI114|H38903C
-38903C:lI116|H38914C
-38914C:lI115|H38925C
-38925C:lI47|H38936C
-38936C:lI108|H38947C
-38947C:lI105|H389584
-389584:lI98|H38967C
-38967C:lI47|H389774
-389774:lI106|H38986C
-38986C:lI105|H389964
-389964:lI110|H389A44
-389A44:lI116|H389B1C
-389B1C:lI101|H389BE4
-389BE4:lI114|H389CAC
-389CAC:lI102|H389D74
-389D74:lI97|H389E2C
-389E2C:lI99|H389EE4
-389EE4:lI101|N
-38B048:lH388024|H38B050
-388024:lI47|H3880FC
-3880FC:lI99|H3881DC
-3881DC:lI108|H3882C4
-3882C4:lI101|H3883B4
-3883B4:lI97|H3884AC
-3884AC:lI114|H3885AC
-3885AC:lI99|H3886B4
-3886B4:lI97|H3887C4
-3887C4:lI115|H3888D4
-3888D4:lI101|H3889E4
-3889E4:lI47|H388AEC
-388AEC:lI111|H388BFC
-388BFC:lI116|H388D0C
-388D0C:lI112|H388E1C
-388E1C:lI47|H388F2C
-388F2C:lI101|H389044
-389044:lI114|H389154
-389154:lI116|H389264
-389264:lI115|H389374
-389374:lI47|H389484
-389484:lI108|H38958C
-38958C:lI105|H389684
-389684:lI98|H38977C
-38977C:lI47|H389874
-389874:lI105|H38996C
-38996C:lI110|H389A4C
-389A4C:lI101|H389B24
-389B24:lI116|H389BEC
-389BEC:lI115|H389CB4
-389CB4:lI47|H389D7C
-389D7C:lI101|H389E34
-389E34:lI98|H389EEC
-389EEC:lI105|H389F8C
-389F8C:lI110|N
-38B050:lH388104|H38B058
-388104:lI47|H3881E4
-3881E4:lI99|H3882CC
-3882CC:lI108|H3883BC
-3883BC:lI101|H3884B4
-3884B4:lI97|H3885B4
-3885B4:lI114|H3886BC
-3886BC:lI99|H3887CC
-3887CC:lI97|H3888DC
-3888DC:lI115|H3889EC
-3889EC:lI101|H388AF4
-388AF4:lI47|H388C04
-388C04:lI111|H388D14
-388D14:lI116|H388E24
-388E24:lI112|H388F34
-388F34:lI47|H38904C
-38904C:lI101|H38915C
-38915C:lI114|H38926C
-38926C:lI116|H38937C
-38937C:lI115|H38948C
-38948C:lI47|H389594
-389594:lI108|H38968C
-38968C:lI105|H389784
-389784:lI98|H38987C
-38987C:lI47|H389974
-389974:lI105|H389A54
-389A54:lI99|H389B2C
-389B2C:lI47|H389BF4
-389BF4:lI101|H389CBC
-389CBC:lI98|H389D84
-389D84:lI105|H389E3C
-389E3C:lI110|N
-38B058:lH3881EC|H38B060
-3881EC:lI47|H3882D4
-3882D4:lI99|H3883C4
-3883C4:lI108|H3884BC
-3884BC:lI101|H3885BC
-3885BC:lI97|H3886C4
-3886C4:lI114|H3887D4
-3887D4:lI99|H3888E4
-3888E4:lI97|H3889F4
-3889F4:lI115|H388AFC
-388AFC:lI101|H388C0C
-388C0C:lI47|H388D1C
-388D1C:lI111|H388E2C
-388E2C:lI116|H388F3C
-388F3C:lI112|H389054
-389054:lI47|H389164
-389164:lI101|H389274
-389274:lI114|H389384
-389384:lI116|H389494
-389494:lI115|H38959C
-38959C:lI47|H389694
-389694:lI108|H38978C
-38978C:lI105|H389884
-389884:lI98|H38997C
-38997C:lI47|H389A5C
-389A5C:lI104|H389B34
-389B34:lI105|H389BFC
-389BFC:lI112|H389CC4
-389CC4:lI101|H389D8C
-389D8C:lI47|H389E44
-389E44:lI101|H389EF4
-389EF4:lI98|H389F94
-389F94:lI105|H38A02C
-38A02C:lI110|N
-38B060:lH3882DC|H38B068
-3882DC:lI47|H3883CC
-3883CC:lI99|H3884C4
-3884C4:lI108|H3885C4
-3885C4:lI101|H3886CC
-3886CC:lI97|H3887DC
-3887DC:lI114|H3888EC
-3888EC:lI99|H3889FC
-3889FC:lI97|H388B04
-388B04:lI115|H388C14
-388C14:lI101|H388D24
-388D24:lI47|H388E34
-388E34:lI111|H388F44
-388F44:lI116|H38905C
-38905C:lI112|H38916C
-38916C:lI47|H38927C
-38927C:lI101|H38938C
-38938C:lI114|H38949C
-38949C:lI116|H3895A4
-3895A4:lI115|H38969C
-38969C:lI47|H389794
-389794:lI108|H38988C
-38988C:lI105|H389984
-389984:lI98|H389A64
-389A64:lI47|H389B3C
-389B3C:lI103|H389C04
-389C04:lI115|H389CCC
-389CCC:lI47|H389D94
-389D94:lI101|H389E4C
-389E4C:lI98|H389EFC
-389EFC:lI105|H389F9C
-389F9C:lI110|N
-38B068:lH3883D4|H38B070
-3883D4:lI47|H3884CC
-3884CC:lI99|H3885CC
-3885CC:lI108|H3886D4
-3886D4:lI101|H3887E4
-3887E4:lI97|H3888F4
-3888F4:lI114|H388A04
-388A04:lI99|H388B0C
-388B0C:lI97|H388C1C
-388C1C:lI115|H388D2C
-388D2C:lI101|H388E3C
-388E3C:lI47|H388F4C
-388F4C:lI111|H389064
-389064:lI116|H389174
-389174:lI112|H389284
-389284:lI47|H389394
-389394:lI101|H3894A4
-3894A4:lI114|H3895AC
-3895AC:lI116|H3896A4
-3896A4:lI115|H38979C
-38979C:lI47|H389894
-389894:lI108|H38998C
-38998C:lI105|H389A6C
-389A6C:lI98|H389B44
-389B44:lI47|H389C0C
-389C0C:lI101|H389CD4
-389CD4:lI118|H389D9C
-389D9C:lI97|H389E54
-389E54:lI47|H389F04
-389F04:lI101|H389FA4
-389FA4:lI98|H38A034
-38A034:lI105|H38A0B4
-38A0B4:lI110|N
-38B070:lH3884D4|H38B078
-3884D4:lI47|H3885D4
-3885D4:lI99|H3886DC
-3886DC:lI108|H3887EC
-3887EC:lI101|H3888FC
-3888FC:lI97|H388A0C
-388A0C:lI114|H388B14
-388B14:lI99|H388C24
-388C24:lI97|H388D34
-388D34:lI115|H388E44
-388E44:lI101|H388F54
-388F54:lI47|H38906C
-38906C:lI111|H38917C
-38917C:lI116|H38928C
-38928C:lI112|H38939C
-38939C:lI47|H3894AC
-3894AC:lI101|H3895B4
-3895B4:lI114|H3896AC
-3896AC:lI116|H3897A4
-3897A4:lI115|H38989C
-38989C:lI47|H389994
-389994:lI108|H389A74
-389A74:lI105|H389B4C
-389B4C:lI98|H389C14
-389C14:lI47|H389CDC
-389CDC:lI101|H389DA4
-389DA4:lI116|H389E5C
-389E5C:lI47|H389F0C
-389F0C:lI101|H389FAC
-389FAC:lI98|H38A03C
-38A03C:lI105|H38A0BC
-38A0BC:lI110|N
-38B078:lH3885DC|H38B080
-3885DC:lI47|H3886E4
-3886E4:lI99|H3887F4
-3887F4:lI108|H388904
-388904:lI101|H388A14
-388A14:lI97|H388B1C
-388B1C:lI114|H388C2C
-388C2C:lI99|H388D3C
-388D3C:lI97|H388E4C
-388E4C:lI115|H388F5C
-388F5C:lI101|H389074
-389074:lI47|H389184
-389184:lI111|H389294
-389294:lI116|H3893A4
-3893A4:lI112|H3894B4
-3894B4:lI47|H3895BC
-3895BC:lI101|H3896B4
-3896B4:lI114|H3897AC
-3897AC:lI116|H3898A4
-3898A4:lI115|H38999C
-38999C:lI47|H389A7C
-389A7C:lI108|H389B54
-389B54:lI105|H389C1C
-389C1C:lI98|H389CE4
-389CE4:lI47|H389DAC
-389DAC:lI101|H389E64
-389E64:lI114|H389F14
-389F14:lI108|H389FB4
-389FB4:lI95|H38A044
-38A044:lI105|H38A0C4
-38A0C4:lI110|H38A134
-38A134:lI116|H38A1A4
-38A1A4:lI101|H38A20C
-38A20C:lI114|H38A274
-38A274:lI102|H38A2DC
-38A2DC:lI97|H38A344
-38A344:lI99|H38A3AC
-38A3AC:lI101|N
-38B080:lH3886EC|H38B088
-3886EC:lI47|H3887FC
-3887FC:lI99|H38890C
-38890C:lI108|H388A1C
-388A1C:lI101|H388B24
-388B24:lI97|H388C34
-388C34:lI114|H388D44
-388D44:lI99|H388E54
-388E54:lI97|H388F64
-388F64:lI115|H38907C
-38907C:lI101|H38918C
-38918C:lI47|H38929C
-38929C:lI111|H3893AC
-3893AC:lI116|H3894BC
-3894BC:lI112|H3895C4
-3895C4:lI47|H3896BC
-3896BC:lI101|H3897B4
-3897B4:lI114|H3898AC
-3898AC:lI116|H3899A4
-3899A4:lI115|H389A84
-389A84:lI47|H389B5C
-389B5C:lI108|H389C24
-389C24:lI105|H389CEC
-389CEC:lI98|H389DB4
-389DB4:lI47|H389E6C
-389E6C:lI100|H389F1C
-389F1C:lI101|H389FBC
-389FBC:lI98|H38A04C
-38A04C:lI117|H38A0CC
-38A0CC:lI103|H38A13C
-38A13C:lI103|H38A1AC
-38A1AC:lI101|H38A214
-38A214:lI114|H38A27C
-38A27C:lI47|H38A2E4
-38A2E4:lI101|H38A34C
-38A34C:lI98|H38A3B4
-38A3B4:lI105|H38A414
-38A414:lI110|N
-38B088:lH388804|H38B090
-388804:lI47|H388914
-388914:lI99|H388A24
-388A24:lI108|H388B2C
-388B2C:lI101|H388C3C
-388C3C:lI97|H388D4C
-388D4C:lI114|H388E5C
-388E5C:lI99|H388F6C
-388F6C:lI97|H389084
-389084:lI115|H389194
-389194:lI101|H3892A4
-3892A4:lI47|H3893B4
-3893B4:lI111|H3894C4
-3894C4:lI116|H3895CC
-3895CC:lI112|H3896C4
-3896C4:lI47|H3897BC
-3897BC:lI101|H3898B4
-3898B4:lI114|H3899AC
-3899AC:lI116|H389A8C
-389A8C:lI115|H389B64
-389B64:lI47|H389C2C
-389C2C:lI108|H389CF4
-389CF4:lI105|H389DBC
-389DBC:lI98|H389E74
-389E74:lI47|H389F24
-389F24:lI99|H389FC4
-389FC4:lI114|H38A054
-38A054:lI121|H38A0D4
-38A0D4:lI112|H38A144
-38A144:lI116|H38A1B4
-38A1B4:lI111|H38A21C
-38A21C:lI47|H38A284
-38A284:lI101|H38A2EC
-38A2EC:lI98|H38A354
-38A354:lI105|H38A3BC
-38A3BC:lI110|N
-38B090:lH38891C|H38B098
-38891C:lI47|H388A2C
-388A2C:lI99|H388B34
-388B34:lI108|H388C44
-388C44:lI101|H388D54
-388D54:lI97|H388E64
-388E64:lI114|H388F74
-388F74:lI99|H38908C
-38908C:lI97|H38919C
-38919C:lI115|H3892AC
-3892AC:lI101|H3893BC
-3893BC:lI47|H3894CC
-3894CC:lI111|H3895D4
-3895D4:lI116|H3896CC
-3896CC:lI112|H3897C4
-3897C4:lI47|H3898BC
-3898BC:lI101|H3899B4
-3899B4:lI114|H389A94
-389A94:lI116|H389B6C
-389B6C:lI115|H389C34
-389C34:lI47|H389CFC
-389CFC:lI108|H389DC4
-389DC4:lI105|H389E7C
-389E7C:lI98|H389F2C
-389F2C:lI47|H389FCC
-389FCC:lI99|H38A05C
-38A05C:lI111|H38A0DC
-38A0DC:lI115|H38A14C
-38A14C:lI84|H38A1BC
-38A1BC:lI114|H38A224
-38A224:lI97|H38A28C
-38A28C:lI110|H38A2F4
-38A2F4:lI115|H38A35C
-38A35C:lI97|H38A3C4
-38A3C4:lI99|H38A41C
-38A41C:lI116|H38A46C
-38A46C:lI105|H38A4BC
-38A4BC:lI111|H38A50C
-38A50C:lI110|H38A554
-38A554:lI115|H38A59C
-38A59C:lI47|H38A5E4
-38A5E4:lI101|H38A62C
-38A62C:lI98|H38A66C
-38A66C:lI105|H38A6A4
-38A6A4:lI110|N
-38B098:lH388A34|H38B0A0
-388A34:lI47|H388B3C
-388B3C:lI99|H388C4C
-388C4C:lI108|H388D5C
-388D5C:lI101|H388E6C
-388E6C:lI97|H388F7C
-388F7C:lI114|H389094
-389094:lI99|H3891A4
-3891A4:lI97|H3892B4
-3892B4:lI115|H3893C4
-3893C4:lI101|H3894D4
-3894D4:lI47|H3895DC
-3895DC:lI111|H3896D4
-3896D4:lI116|H3897CC
-3897CC:lI112|H3898C4
-3898C4:lI47|H3899BC
-3899BC:lI101|H389A9C
-389A9C:lI114|H389B74
-389B74:lI116|H389C3C
-389C3C:lI115|H389D04
-389D04:lI47|H389DCC
-389DCC:lI108|H389E84
-389E84:lI105|H389F34
-389F34:lI98|H389FD4
-389FD4:lI47|H38A064
-38A064:lI99|H38A0E4
-38A0E4:lI111|H38A154
-38A154:lI115|H38A1C4
-38A1C4:lI84|H38A22C
-38A22C:lI105|H38A294
-38A294:lI109|H38A2FC
-38A2FC:lI101|H38A364
-38A364:lI47|H38A3CC
-38A3CC:lI101|H38A424
-38A424:lI98|H38A474
-38A474:lI105|H38A4C4
-38A4C4:lI110|N
-38B0A0:lH388B44|H38B0A8
-388B44:lI47|H388C54
-388C54:lI99|H388D64
-388D64:lI108|H388E74
-388E74:lI101|H388F84
-388F84:lI97|H38909C
-38909C:lI114|H3891AC
-3891AC:lI99|H3892BC
-3892BC:lI97|H3893CC
-3893CC:lI115|H3894DC
-3894DC:lI101|H3895E4
-3895E4:lI47|H3896DC
-3896DC:lI111|H3897D4
-3897D4:lI116|H3898CC
-3898CC:lI112|H3899C4
-3899C4:lI47|H389AA4
-389AA4:lI101|H389B7C
-389B7C:lI114|H389C44
-389C44:lI116|H389D0C
-389D0C:lI115|H389DD4
-389DD4:lI47|H389E8C
-389E8C:lI108|H389F3C
-389F3C:lI105|H389FDC
-389FDC:lI98|H38A06C
-38A06C:lI47|H38A0EC
-38A0EC:lI99|H38A15C
-38A15C:lI111|H38A1CC
-38A1CC:lI115|H38A234
-38A234:lI80|H38A29C
-38A29C:lI114|H38A304
-38A304:lI111|H38A36C
-38A36C:lI112|H38A3D4
-38A3D4:lI101|H38A42C
-38A42C:lI114|H38A47C
-38A47C:lI116|H38A4CC
-38A4CC:lI121|H38A514
-38A514:lI47|H38A55C
-38A55C:lI101|H38A5A4
-38A5A4:lI98|H38A5EC
-38A5EC:lI105|H38A634
-38A634:lI110|N
-38B0A8:lH388C5C|H38B0B0
-388C5C:lI47|H388D6C
-388D6C:lI99|H388E7C
-388E7C:lI108|H388F8C
-388F8C:lI101|H3890A4
-3890A4:lI97|H3891B4
-3891B4:lI114|H3892C4
-3892C4:lI99|H3893D4
-3893D4:lI97|H3894E4
-3894E4:lI115|H3895EC
-3895EC:lI101|H3896E4
-3896E4:lI47|H3897DC
-3897DC:lI111|H3898D4
-3898D4:lI116|H3899CC
-3899CC:lI112|H389AAC
-389AAC:lI47|H389B84
-389B84:lI101|H389C4C
-389C4C:lI114|H389D14
-389D14:lI116|H389DDC
-389DDC:lI115|H389E94
-389E94:lI47|H389F44
-389F44:lI108|H389FE4
-389FE4:lI105|H38A074
-38A074:lI98|H38A0F4
-38A0F4:lI47|H38A164
-38A164:lI99|H38A1D4
-38A1D4:lI111|H38A23C
-38A23C:lI115|H38A2A4
-38A2A4:lI78|H38A30C
-38A30C:lI111|H38A374
-38A374:lI116|H38A3DC
-38A3DC:lI105|H38A434
-38A434:lI102|H38A484
-38A484:lI105|H38A4D4
-38A4D4:lI99|H38A51C
-38A51C:lI97|H38A564
-38A564:lI116|H38A5AC
-38A5AC:lI105|H38A5F4
-38A5F4:lI111|H38A63C
-38A63C:lI110|H38A674
-38A674:lI47|H38A6AC
-38A6AC:lI101|H38A6D4
-38A6D4:lI98|H38A6EC
-38A6EC:lI105|H38A704
-38A704:lI110|N
-38B0B0:lH388D74|H38B0B8
-388D74:lI47|H388E84
-388E84:lI99|H388F94
-388F94:lI108|H3890AC
-3890AC:lI101|H3891BC
-3891BC:lI97|H3892CC
-3892CC:lI114|H3893DC
-3893DC:lI99|H3894EC
-3894EC:lI97|H3895F4
-3895F4:lI115|H3896EC
-3896EC:lI101|H3897E4
-3897E4:lI47|H3898DC
-3898DC:lI111|H3899D4
-3899D4:lI116|H389AB4
-389AB4:lI112|H389B8C
-389B8C:lI47|H389C54
-389C54:lI101|H389D1C
-389D1C:lI114|H389DE4
-389DE4:lI116|H389E9C
-389E9C:lI115|H389F4C
-389F4C:lI47|H389FEC
-389FEC:lI108|H38A07C
-38A07C:lI105|H38A0FC
-38A0FC:lI98|H38A16C
-38A16C:lI47|H38A1DC
-38A1DC:lI99|H38A244
-38A244:lI111|H38A2AC
-38A2AC:lI115|H38A314
-38A314:lI70|H38A37C
-38A37C:lI105|H38A3E4
-38A3E4:lI108|H38A43C
-38A43C:lI101|H38A48C
-38A48C:lI84|H38A4DC
-38A4DC:lI114|H38A524
-38A524:lI97|H38A56C
-38A56C:lI110|H38A5B4
-38A5B4:lI115|H38A5FC
-38A5FC:lI102|H38A644
-38A644:lI101|H38A67C
-38A67C:lI114|H38A6B4
-38A6B4:lI47|H38A6DC
-38A6DC:lI101|H38A6F4
-38A6F4:lI98|H38A70C
-38A70C:lI105|H38A71C
-38A71C:lI110|N
-38B0B8:lH388E8C|H38B0C0
-388E8C:lI47|H388F9C
-388F9C:lI99|H3890B4
-3890B4:lI108|H3891C4
-3891C4:lI101|H3892D4
-3892D4:lI97|H3893E4
-3893E4:lI114|H3894F4
-3894F4:lI99|H3895FC
-3895FC:lI97|H3896F4
-3896F4:lI115|H3897EC
-3897EC:lI101|H3898E4
-3898E4:lI47|H3899DC
-3899DC:lI111|H389ABC
-389ABC:lI116|H389B94
-389B94:lI112|H389C5C
-389C5C:lI47|H389D24
-389D24:lI101|H389DEC
-389DEC:lI114|H389EA4
-389EA4:lI116|H389F54
-389F54:lI115|H389FF4
-389FF4:lI47|H38A084
-38A084:lI108|H38A104
-38A104:lI105|H38A174
-38A174:lI98|H38A1E4
-38A1E4:lI47|H38A24C
-38A24C:lI99|H38A2B4
-38A2B4:lI111|H38A31C
-38A31C:lI115|H38A384
-38A384:lI69|H38A3EC
-38A3EC:lI118|H38A444
-38A444:lI101|H38A494
-38A494:lI110|H38A4E4
-38A4E4:lI116|H38A52C
-38A52C:lI68|H38A574
-38A574:lI111|H38A5BC
-38A5BC:lI109|H38A604
-38A604:lI97|H38A64C
-38A64C:lI105|H38A684
-38A684:lI110|H38A6BC
-38A6BC:lI47|H38A6E4
-38A6E4:lI101|H38A6FC
-38A6FC:lI98|H38A714
-38A714:lI105|H38A724
-38A724:lI110|N
-38B0C0:lH388FA4|H38B0C8
-388FA4:lI47|H3890BC
-3890BC:lI99|H3891CC
-3891CC:lI108|H3892DC
-3892DC:lI101|H3893EC
-3893EC:lI97|H3894FC
-3894FC:lI114|H389604
-389604:lI99|H3896FC
-3896FC:lI97|H3897F4
-3897F4:lI115|H3898EC
-3898EC:lI101|H3899E4
-3899E4:lI47|H389AC4
-389AC4:lI111|H389B9C
-389B9C:lI116|H389C64
-389C64:lI112|H389D2C
-389D2C:lI47|H389DF4
-389DF4:lI101|H389EAC
-389EAC:lI114|H389F5C
-389F5C:lI116|H389FFC
-389FFC:lI115|H38A08C
-38A08C:lI47|H38A10C
-38A10C:lI108|H38A17C
-38A17C:lI105|H38A1EC
-38A1EC:lI98|H38A254
-38A254:lI47|H38A2BC
-38A2BC:lI99|H38A324
-38A324:lI111|H38A38C
-38A38C:lI115|H38A3F4
-38A3F4:lI69|H38A44C
-38A44C:lI118|H38A49C
-38A49C:lI101|H38A4EC
-38A4EC:lI110|H38A534
-38A534:lI116|H38A57C
-38A57C:lI47|H38A5C4
-38A5C4:lI101|H38A60C
-38A60C:lI98|H38A654
-38A654:lI105|H38A68C
-38A68C:lI110|N
-38B0C8:lH3890C4|H38B0D0
-3890C4:lI47|H3891D4
-3891D4:lI99|H3892E4
-3892E4:lI108|H3893F4
-3893F4:lI101|H389504
-389504:lI97|H38960C
-38960C:lI114|H389704
-389704:lI99|H3897FC
-3897FC:lI97|H3898F4
-3898F4:lI115|H3899EC
-3899EC:lI101|H389ACC
-389ACC:lI47|H389BA4
-389BA4:lI111|H389C6C
-389C6C:lI116|H389D34
-389D34:lI112|H389DFC
-389DFC:lI47|H389EB4
-389EB4:lI101|H389F64
-389F64:lI114|H38A004
-38A004:lI116|H38A094
-38A094:lI115|H38A114
-38A114:lI47|H38A184
-38A184:lI108|H38A1F4
-38A1F4:lI105|H38A25C
-38A25C:lI98|H38A2C4
-38A2C4:lI47|H38A32C
-38A32C:lI99|H38A394
-38A394:lI111|H38A3FC
-38A3FC:lI109|H38A454
-38A454:lI112|H38A4A4
-38A4A4:lI105|H38A4F4
-38A4F4:lI108|H38A53C
-38A53C:lI101|H38A584
-38A584:lI114|H38A5CC
-38A5CC:lI47|H38A614
-38A614:lI101|H38A65C
-38A65C:lI98|H38A694
-38A694:lI105|H38A6C4
-38A6C4:lI110|N
-38B0D0:lH3891DC|H38B0D8
-3891DC:lI47|H3892EC
-3892EC:lI99|H3893FC
-3893FC:lI108|H38950C
-38950C:lI101|H389614
-389614:lI97|H38970C
-38970C:lI114|H389804
-389804:lI99|H3898FC
-3898FC:lI97|H3899F4
-3899F4:lI115|H389AD4
-389AD4:lI101|H389BAC
-389BAC:lI47|H389C74
-389C74:lI111|H389D3C
-389D3C:lI116|H389E04
-389E04:lI112|H389EBC
-389EBC:lI47|H389F6C
-389F6C:lI101|H38A00C
-38A00C:lI114|H38A09C
-38A09C:lI116|H38A11C
-38A11C:lI115|H38A18C
-38A18C:lI47|H38A1FC
-38A1FC:lI108|H38A264
-38A264:lI105|H38A2CC
-38A2CC:lI98|H38A334
-38A334:lI47|H38A39C
-38A39C:lI97|H38A404
-38A404:lI115|H38A45C
-38A45C:lI110|H38A4AC
-38A4AC:lI49|H38A4FC
-38A4FC:lI47|H38A544
-38A544:lI101|H38A58C
-38A58C:lI98|H38A5D4
-38A5D4:lI105|H38A61C
-38A61C:lI110|N
-38B0D8:lH3892F4|H38B0E0
-3892F4:lI47|H389404
-389404:lI99|H389514
-389514:lI108|H38961C
-38961C:lI101|H389714
-389714:lI97|H38980C
-38980C:lI114|H389904
-389904:lI99|H3899FC
-3899FC:lI97|H389ADC
-389ADC:lI115|H389BB4
-389BB4:lI101|H389C7C
-389C7C:lI47|H389D44
-389D44:lI111|H389E0C
-389E0C:lI116|H389EC4
-389EC4:lI112|H389F74
-389F74:lI47|H38A014
-38A014:lI101|H38A0A4
-38A0A4:lI114|H38A124
-38A124:lI116|H38A194
-38A194:lI115|H38A204
-38A204:lI47|H38A26C
-38A26C:lI108|H38A2D4
-38A2D4:lI105|H38A33C
-38A33C:lI98|H38A3A4
-38A3A4:lI47|H38A40C
-38A40C:lI97|H38A464
-38A464:lI112|H38A4B4
-38A4B4:lI112|H38A504
-38A504:lI109|H38A54C
-38A54C:lI111|H38A594
-38A594:lI110|H38A5DC
-38A5DC:lI47|H38A624
-38A624:lI101|H38A664
-38A664:lI98|H38A69C
-38A69C:lI105|H38A6CC
-38A6CC:lI110|N
-38B0E0:lH38AA88|H38B0E8
-38AA88:lI47|H38AA90
-38AA90:lI104|H38AA98
-38AA98:lI111|H38AAA0
-38AAA0:lI109|H38AAA8
-38AAA8:lI101|H38AAB0
-38AAB0:lI47|H38AAB8
-38AAB8:lI115|H38AAC0
-38AAC0:lI105|H38AAC8
-38AAC8:lI114|H38AAD0
-38AAD0:lI105|H38AAD8
-38AAD8:lI47|H38AAE0
-38AAE0:lI101|H38AAE8
-38AAE8:lI114|H38AAF0
-38AAF0:lI108|H38AAF8
-38AAF8:lI97|H38AB00
-38AB00:lI110|H38AB08
-38AB08:lI103|N
-38B0E8:lH38AB1C|H38B0F0
-38AB1C:lI47|H38AB2C
-38AB2C:lI104|H38AB4C
-38AB4C:lI111|H38AB74
-38AB74:lI109|H38ABA4
-38ABA4:lI101|H38ABC4
-38ABC4:lI47|H38ABE4
-38ABE4:lI115|H38AC04
-38AC04:lI105|H38AC24
-38AC24:lI114|H38AC3C
-38AC3C:lI105|H38AC44
-38AC44:lI47|H38AC4C
-38AC4C:lI116|H38AC54
-38AC54:lI111|H38AC5C
-38AC5C:lI111|H38AC64
-38AC64:lI108|H38AC6C
-38AC6C:lI115|H38AC74
-38AC74:lI47|H38AC7C
-38AC7C:lI100|H38AC84
-38AC84:lI105|H38AC8C
-38AC8C:lI115|H38AC94
-38AC94:lI116|H38AC9C
-38AC9C:lI101|H38ACA4
-38ACA4:lI108|H38ACAC
-38ACAC:lI47|H38ACB4
-38ACB4:lI101|H38ACBC
-38ACBC:lI98|H38ACC4
-38ACC4:lI105|H38ACCC
-38ACCC:lI110|N
-38B0F0:lH38B0F8|N
-38B0F8:lI47|H38B100
-38B100:lI104|H38B108
-38B108:lI111|H38B110
-38B110:lI109|H38B118
-38B118:lI101|H38B120
-38B120:lI47|H38B128
-38B128:lI115|H38B130
-38B130:lI105|H38B138
-38B138:lI114|H38B140
-38B140:lI105|H38B148
-38B148:lI47|H38B150
-38B150:lI79|H38B158
-38B158:lI84|H38B160
-38B160:lI80|H38B168
-38B168:lI47|H38B170
-38B170:lI103|H38B178
-38B178:lI112|H38B180
-38B180:lI114|H38B188
-38B188:lI115|H38B190
-38B190:lI95|H38B198
-38B198:lI116|H38B1A0
-38B1A0:lI114|H38B1A8
-38B1A8:lI97|H38B1B0
-38B1B0:lI99|H38B1B8
-38B1B8:lI101|H38B1C0
-38B1C0:lI47|H38B1C8
-38B1C8:lI106|H38B1D0
-38B1D0:lI97|H38B1D8
-38B1D8:lI110|N
-3873BC:lI47|H3873CC
-3873CC:lI99|H3873E4
-3873E4:lI108|H3873FC
-3873FC:lI101|H38741C
-38741C:lI97|H387444
-387444:lI114|H387474
-387474:lI99|H3874AC
-3874AC:lI97|H3874EC
-3874EC:lI115|H387534
-387534:lI101|H387584
-387584:lI47|H3875DC
-3875DC:lI111|H38763C
-38763C:lI116|H3876A4
-3876A4:lI112|H387714
-387714:lI47|H38778C
-38778C:lI101|H38780C
-38780C:lI114|H387894
-387894:lI116|H387924
-387924:lI115|N
-=proc_dictionary:<0.19.0>
-H370244
-H370250
-=proc_stack:<0.19.0>
-36b45c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36B17C
-y4:P<0.19.0>
-y5:P<0.9.0>
-36b478:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37025C
-=proc_heap:<0.19.0>
-36B17C:t5:A5:state,A8:user_sup,P<0.21.0>,P<0.21.0>,H370238
-370238:t2:P<0.19.0>,A8:user_sup
-37025C:lAA:gen_server|H37027C
-37027C:lP<0.9.0>|H37028C
-37028C:lP<0.9.0>|H370294
-370294:lA11:supervisor_bridge|H37029C
-37029C:lH3702A4|H3702AC
-3702A4:lA8:user_sup|H3702B4
-3702B4:lN|H3702BC
-3702BC:lA4:self|N
-3702AC:lN|N
-370244:t2:AD:$initial_call,H370264
-370264:t3:A3:gen,A7:init_it,H37025C
-370250:t2:AA:$ancestors,H370274
-370274:lAA:kernel_sup|H370284
-370284:lP<0.8.0>|N
-=proc_dictionary:<0.20.0>
-H36F8A8
-=proc_stack:<0.20.0>
-36a714:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:H36F8C4
-y3:P<0.21.0>
-y4:P<0.22.0>
-y5:p<0.72>
-y6:p<0.72>
-=proc_heap:<0.20.0>
-36F8C4:t4:I3,I2,P<0.22.0>,H36F8F0
-36F8F0:lH36F900|H36F910
-36F900:t3:I1,P<0.21.0>,H36F920
-36F920:t0:
-36F910:lH36F924|N
-36F924:t3:I2,P<0.22.0>,H36F93C
-36F93C:t3:A5:shell,A5:start,N
-36F8A8:t2:A3:eof,A5:false
-=proc_dictionary:<0.21.0>
-H3709DC
-H3709D0
-H3709F8
-=proc_stack:<0.21.0>
-370d1c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:A9:undefined
-y2:P<0.20.0>
-=proc_heap:<0.21.0>
-3709DC:t2:AB:line_buffer,N
-3709D0:t2:AB:kill_buffer,N
-3709F8:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.22.0>
-H370D44
-H370D60
-H370D7C
-H370D38
-=proc_stack:<0.22.0>
-374a88:SReturn addr 0x2CE718 (group:get_chars_loop/7 + 80)
-y0:N
-y1:N
-y2:A8:infinity
-y3:H374A00
-y4:P<0.20.0>
-y5:H374A28
-374aa4:SReturn addr 0x2CDC18 (group:io_request/5 + 48)
-y0:H37499C
-y1:A6:io_lib
-y2:A9:get_until
-y3:H3748B8
-y4:P<0.20.0>
-y5:A5:start
-374ac0:SReturn addr 0x2CDB2C (group:server_loop/3 + 372)
-y0:P<0.49.0>
-y1:P<0.22.0>
-374acc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:P<0.25.0>
-y2:P<0.20.0>
-=proc_heap:<0.22.0>
-374A00:t4:A4:line,H37499C,H3749A4,A4:none
-3749A4:t2:N,N
-37499C:lI50|H374994
-374994:lI62|H37498C
-37498C:lI32|N
-374A28:t4:A5:stack,H370D58,H374A24,N
-374A24:t0:
-370D58:lH370D74|N
-370D74:lI99|H370D88
-370D88:lI114|H370D90
-370D90:lI97|H370D98
-370D98:lI115|H370DA0
-370DA0:lI104|H370DA8
-370DA8:lI100|H370DB0
-370DB0:lI117|H370DB8
-370DB8:lI109|H370DC0
-370DC0:lI112|H370DC8
-370DC8:lI95|H370DD0
-370DD0:lI118|H370DD8
-370DD8:lI105|H370DE0
-370DE0:lI101|H370DE8
-370DE8:lI119|H370DF0
-370DF0:lI101|H370DF8
-370DF8:lI114|H370E00
-370E00:lI58|H370E08
-370E08:lI115|H370E10
-370E10:lI116|H370E18
-370E18:lI97|H370E20
-370E20:lI114|H370E28
-370E28:lI116|H370E30
-370E30:lI40|H370E38
-370E38:lI41|H370E40
-370E40:lI46|H370E48
-370E48:lI10|N
-3748B8:t3:A8:erl_scan,A6:tokens,H3748B0
-3748B0:lI1|N
-370D44:t2:AB:line_buffer,H370D58
-370D60:t2:A5:shell,P<0.25.0>
-370D7C:t2:AB:kill_buffer,N
-370D38:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.23.0>
-H376464
-H376448
-=proc_stack:<0.23.0>
-376754:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:kernel_config
-y3:N
-y4:P<0.23.0>
-y5:P<0.9.0>
-376770:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H376418
-=proc_heap:<0.23.0>
-376418:lAA:gen_server|H376410
-376410:lP<0.9.0>|H376408
-376408:lP<0.9.0>|H376400
-376400:lAD:kernel_config|H3763F8
-3763F8:lN|H3763F0
-3763F0:lN|N
-376464:t2:AD:$initial_call,H376454
-376454:t3:A3:gen,A7:init_it,H376418
-376448:t2:AA:$ancestors,H376440
-376440:lAA:kernel_sup|H376420
-376420:lP<0.8.0>|N
-=proc_dictionary:<0.24.0>
-H3705E0
-H3705EC
-=proc_stack:<0.24.0>
-36f38c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F018
-y4:AF:kernel_safe_sup
-y5:P<0.9.0>
-36f3a8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37063C
-=proc_heap:<0.24.0>
-36F018:tA:A5:state,H370644,AB:one_for_one,H36F044,N,I4,I3600,N,A6:kernel,A4:safe
-36F044:lH36F04C|N
-36F04C:t8:A5:child,P<0.31.0>,A17:inet_gethost_native_sup,H370650,A9:temporary,I1000,A6:worker,H370660
-370660:lA13:inet_gethost_native|N
-370650:t3:A13:inet_gethost_native,AA:start_link,N
-370644:t2:A5:local,AF:kernel_safe_sup
-37063C:lAA:gen_server|H3706AC
-3706AC:lP<0.9.0>|H3706BC
-3706BC:lP<0.9.0>|H3706C4
-3706C4:lH3706CC|H3706D8
-3706CC:t2:A5:local,AF:kernel_safe_sup
-3706D8:lAA:supervisor|H3706E0
-3706E0:lH3706E8|H3706F8
-3706E8:t3:H370644,A6:kernel,A4:safe
-3706F8:lN|N
-3705E0:t2:AD:$initial_call,H370668
-370668:t3:A3:gen,A7:init_it,H37063C
-3705EC:t2:AA:$ancestors,H370678
-370678:lAA:kernel_sup|H3706B4
-3706B4:lP<0.8.0>|N
-=proc_dictionary:<0.25.0>
-H36E304
-H36E31C
-=proc_stack:<0.25.0>
-36e610:SReturn addr 0x2E06FC (shell:server_loop/6 + 140)
-y0:N
-y1:N
-y2:P<0.27.0>
-y3:P<0.49.0>
-36e624:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:I2
-y3:I1
-y4:N
-y5:N
-y6:N
-y7:I20
-y8:I20
-=proc_heap:<0.25.0>
-36E304:t2:H36E2F8,H36E2A8
-36E2A8:lH36E2B0|N
-36E2B0:t4:A4:call,I1,H36E2C4,N
-36E2C4:t4:A6:remote,I1,H36E2D8,H36E2E8
-36E2E8:t3:A4:atom,I1,A5:start
-36E2D8:t3:A4:atom,I1,A10:crashdump_viewer
-36E2F8:t2:A7:command,I1
-36E31C:t2:H36E310,A2:ok
-36E310:t2:A6:result,I1
-=proc_stack:<0.27.0>
-3bda3c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:P<0.25.0>
-=proc_heap:<0.27.0>
-=proc_dictionary:<0.31.0>
-H36DA24
-H36DA08
-=proc_stack:<0.31.0>
-36dcd4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36DB68
-y4:A17:inet_gethost_native_sup
-y5:P<0.24.0>
-36dcf0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36D9D0
-=proc_heap:<0.31.0>
-36DB68:t5:A5:state,A13:inet_gethost_native,P<0.32.0>,P<0.32.0>,H36D994
-36D994:t2:A5:local,A17:inet_gethost_native_sup
-36D9D0:lAA:gen_server|H36D9C8
-36D9C8:lP<0.24.0>|H36D9C0
-36D9C0:lP<0.24.0>|H36D970
-36D970:lH36D980|H36D9B8
-36D980:t2:A5:local,A17:inet_gethost_native_sup
-36D9B8:lA11:supervisor_bridge|H36D978
-36D978:lH36D9A8|H36D9B0
-36D9A8:lA13:inet_gethost_native|H36D9A0
-36D9A0:lN|H36D98C
-36D98C:lH36D994|N
-36D9B0:lN|N
-36DA24:t2:AD:$initial_call,H36DA14
-36DA14:t3:A3:gen,A7:init_it,H36D9D0
-36DA08:t2:AA:$ancestors,H36DA00
-36DA00:lAF:kernel_safe_sup|H36D9E0
-36D9E0:lAA:kernel_sup|H36D9D8
-36D9D8:lP<0.8.0>|N
-=proc_dictionary:<0.32.0>
-H36CFD4
-H36D0BC
-=proc_stack:<0.32.0>
-36d12c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H36CF18
-=proc_heap:<0.32.0>
-36CF18:t8:A5:state,p<0.105>,I8000,I11,I12,P<0.31.0>,I4,H36CEF0
-36CEF0:t9:AA:statistics,I0,I0,I0,I0,I0,I0,I0,I0
-36CFD4:t2:A3:rid,I1
-36D0BC:t2:AC:num_requests,I0
-=proc_dictionary:<0.33.0>
-H3905C4
-H3905D0
-=proc_stack:<0.33.0>
-3ceee4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:webtool
-y3:H3C8570
-y4:A8:web_tool
-y5:P<0.33.0>
-3cef00:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3905FC
-=proc_heap:<0.33.0>
-3C8570:t6:A5:state,H3905EC,I13,P<0.41.0>,H3905F4,H3C85D4
-3C85D4:lA10:crashdump_viewer|N
-3905F4:lH390650|H39065C
-390650:t2:A4:port,I8888
-39065C:lH3906C8|H3906D4
-3906C8:t2:AC:bind_address,H390760
-390760:t4:I127,I0,I0,I1
-3906D4:lH390774|H390780
-390774:t2:AB:server_name,H39082C
-39082C:lI108|H390908
-390908:lI111|H3909DC
-3909DC:lI99|H390AC0
-390AC0:lI97|H390B98
-390B98:lI108|H390C78
-390C78:lI104|H390D58
-390D58:lI111|H390E2C
-390E2C:lI115|H390F10
-390F10:lI116|N
-390780:lH390834|H390840
-390834:t2:AE:max_header_siz,I1024
-390840:lH390910|H39091C
-390910:t2:A11:max_header_action,A8:reply414
-39091C:lH3909E4|H3909F0
-3909E4:t2:A8:com_type,A7:ip_comm
-3909F0:lH390AC8|H390AD4
-390AC8:t2:A7:modules,H390BA0
-390BA0:lA9:mod_alias|H390C80
-390C80:lA8:mod_auth|H390D60
-390D60:lA7:mod_esi|H390E34
-390E34:lAB:mod_actions|H390F18
-390F18:lA7:mod_cgi|H390FF4
-390FF4:lAB:mod_include|H3910D8
-3910D8:lA7:mod_dir|H3911B4
-3911B4:lA7:mod_get|H3912A0
-3912A0:lA8:mod_head|H39139C
-39139C:lA7:mod_log|H3914A0
-3914A0:lAC:mod_disk_log|N
-390AD4:lH390BA8|H390BB4
-390BA8:t2:AF:directory_index,H390C88
-390C88:lH390D68|N
-390D68:lI105|H390E3C
-390E3C:lI110|H390F20
-390F20:lI100|H390FFC
-390FFC:lI101|H3910E0
-3910E0:lI120|H3911BC
-3911BC:lI46|H3912A8
-3912A8:lI104|H3913A4
-3913A4:lI116|H3914A8
-3914A8:lI109|H39159C
-39159C:lI108|N
-390BB4:lH390C90|N
-390C90:t2:AC:default_type,H390D70
-390D70:lI116|H390E44
-390E44:lI101|H390F28
-390F28:lI120|H391004
-391004:lI116|H3910E8
-3910E8:lI47|H3911C4
-3911C4:lI112|H3912B0
-3912B0:lI108|H3913AC
-3913AC:lI97|H3914B0
-3914B0:lI105|H3915A4
-3915A4:lI110|N
-3905EC:lI47|H390648
-390648:lI99|H3906C0
-3906C0:lI108|H390758
-390758:lI101|H390824
-390824:lI97|H390900
-390900:lI114|H3909D4
-3909D4:lI99|H390AB8
-390AB8:lI97|H390B90
-390B90:lI115|H390C70
-390C70:lI101|H390D50
-390D50:lI47|H390E24
-390E24:lI111|H390F08
-390F08:lI116|H390FEC
-390FEC:lI112|H3910D0
-3910D0:lI47|H3911AC
-3911AC:lI101|H391298
-391298:lI114|H391394
-391394:lI116|H391498
-391498:lI115|H391594
-391594:lI47|H391680
-391680:lI108|H39175C
-39175C:lI105|H391840
-391840:lI98|H391924
-391924:lI47|H3919F8
-3919F8:lI119|H391AC4
-391AC4:lI101|H391B90
-391B90:lI98|H391C54
-391C54:lI116|H391D18
-391D18:lI111|H391DD4
-391DD4:lI111|H391E90
-391E90:lI108|H391F5C
-391F5C:lI47|H392030
-392030:lI112|H3920EC
-3920EC:lI114|H3921A8
-3921A8:lI105|H392264
-392264:lI118|N
-3905FC:lAA:gen_server|H390664
-390664:lP<0.27.0>|H3906DC
-3906DC:lA4:self|H390788
-390788:lH390848|H390854
-390848:t2:A5:local,A8:web_tool
-390854:lA7:webtool|H390924
-390924:lH3909F8|H390A04
-3909F8:t2:H3905EC,H3905F4
-390A04:lN|N
-3905C4:t2:AD:$initial_call,H390614
-390614:t3:A3:gen,A7:init_it,H3905FC
-3905D0:t2:AA:$ancestors,H390624
-390624:lP<0.27.0>|N
-=proc_dictionary:<0.41.0>
-H36DF0C
-H36DF18
-=proc_stack:<0.41.0>
-36eda4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36EA3C
-y4:A6:websup
-y5:P<0.33.0>
-36edc0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36DF24
-=proc_heap:<0.41.0>
-36EA3C:tA:A5:state,H36DF2C,AB:one_for_one,H36EA68,N,I100,I10,N,AB:webtool_sup,N
-36EA68:lH36EA70|N
-36EA70:t8:A5:child,P<0.48.0>,H36DF38,H36DF44,A9:permanent,I100,A6:worker,H36DF54
-36DF54:lA10:crashdump_viewer|N
-36DF44:t3:A10:crashdump_viewer,AA:start_link,N
-36DF38:t2:A5:local,A17:crashdump_viewer_server
-36DF2C:t2:A5:local,A6:websup
-36DF24:lAA:gen_server|H36DF84
-36DF84:lP<0.33.0>|H36DF94
-36DF94:lP<0.33.0>|H36DF9C
-36DF9C:lH36DFA4|H36DFB0
-36DFA4:t2:A5:local,A6:websup
-36DFB0:lAA:supervisor|H36DFB8
-36DFB8:lH36DFC0|H36DFD0
-36DFC0:t3:H36DF2C,AB:webtool_sup,N
-36DFD0:lN|N
-36DF0C:t2:AD:$initial_call,H36DF6C
-36DF6C:t3:A3:gen,A7:init_it,H36DF24
-36DF18:t2:AA:$ancestors,H36DF7C
-36DF7C:lA8:web_tool|H36DF8C
-36DF8C:lP<0.27.0>|N
-=proc_dictionary:<0.43.0>
-H39D940
-H39D94C
-=proc_stack:<0.43.0>
-3a42ac:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H3A3E34
-y4:A1A:httpd_sup__127_0_0_1__8888
-y5:P<0.33.0>
-3a42c8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H39D9CC
-=proc_heap:<0.43.0>
-3A3E34:tA:A5:state,H39D960,AB:one_for_one,H3A3E20,N,I0,I1,N,A9:httpd_sup,H39DA88
-39DA88:lA9:undefined|H39DB18
-39DB18:lH39DB50|H39DB58
-39DB50:lH39DB88|H39DB94
-39DB88:t2:AB:server_root,H39DBD0
-39DBD0:lI47|H39DC0C
-39DC0C:lI99|H39DC50
-39DC50:lI108|H39DC84
-39DC84:lI101|H39DCC4
-39DCC4:lI97|H39DD28
-39DD28:lI114|H39DD90
-39DD90:lI99|H39DE00
-39DE00:lI97|H39DE78
-39DE78:lI115|H39DF00
-39DF00:lI101|H39DF90
-39DF90:lI47|H39E038
-39E038:lI111|H39E0E8
-39E0E8:lI116|H39E1AC
-39E1AC:lI112|H39E288
-39E288:lI47|H39E37C
-39E37C:lI101|H39E478
-39E478:lI114|H39E580
-39E580:lI116|H39E69C
-39E69C:lI115|H39E7B0
-39E7B0:lI47|H39E8C4
-39E8C4:lI108|H39E9D8
-39E9D8:lI105|H39EACC
-39EACC:lI98|H39EBC0
-39EBC0:lI47|H39ECB4
-39ECB4:lI119|H39EDA8
-39EDA8:lI101|H39EE7C
-39EE7C:lI98|H39EF50
-39EF50:lI116|H39F02C
-39F02C:lI111|H39F110
-39F110:lI111|H39F1E4
-39F1E4:lI108|H39F2B0
-39F2B0:lI47|H39F36C
-39F36C:lI112|H39F430
-39F430:lI114|H39F4FC
-39F4FC:lI105|H39F5C0
-39F5C0:lI118|H39F694
-39F694:lI47|H39F768
-39F768:lI114|H39F83C
-39F83C:lI111|H39F920
-39F920:lI111|H39F9FC
-39F9FC:lI116|N
-39DB94:lH39DBD8|H39DBE4
-39DBD8:t2:AD:document_root,H39DC14
-39DC14:lI47|H39DC58
-39DC58:lI99|H39DC8C
-39DC8C:lI108|H39DCCC
-39DCCC:lI101|H39DD30
-39DD30:lI97|H39DD98
-39DD98:lI114|H39DE08
-39DE08:lI99|H39DE80
-39DE80:lI97|H39DF08
-39DF08:lI115|H39DF98
-39DF98:lI101|H39E040
-39E040:lI47|H39E0F0
-39E0F0:lI111|H39E1B4
-39E1B4:lI116|H39E290
-39E290:lI112|H39E384
-39E384:lI47|H39E480
-39E480:lI101|H39E588
-39E588:lI114|H39E6A4
-39E6A4:lI116|H39E7B8
-39E7B8:lI115|H39E8CC
-39E8CC:lI47|H39E9E0
-39E9E0:lI108|H39EAD4
-39EAD4:lI105|H39EBC8
-39EBC8:lI98|H39ECBC
-39ECBC:lI47|H39EDB0
-39EDB0:lI119|H39EE84
-39EE84:lI101|H39EF58
-39EF58:lI98|H39F034
-39F034:lI116|H39F118
-39F118:lI111|H39F1EC
-39F1EC:lI111|H39F2B8
-39F2B8:lI108|H39F374
-39F374:lI47|H39F438
-39F438:lI112|H39F504
-39F504:lI114|H39F5C8
-39F5C8:lI105|H39F69C
-39F69C:lI118|H39F770
-39F770:lI47|H39F844
-39F844:lI114|H39F928
-39F928:lI111|H39FA04
-39FA04:lI111|H39FAD8
-39FAD8:lI116|H39FBB4
-39FBB4:lI47|H39FC80
-39FC80:lI100|H39FD44
-39FD44:lI111|H39FE10
-39FE10:lI99|N
-39DBE4:lH39DC1C|H39DC28
-39DC1C:t2:AA:mime_types,H39DC60
-39DC60:lH39DC94|H39DCA0
-39DC94:t2:H39DCD4,H39DCDC
-39DCDC:lI120|H39DD40
-39DD40:lI45|H39DDA8
-39DDA8:lI119|H39DE10
-39DE10:lI111|H39DE88
-39DE88:lI114|H39DF10
-39DF10:lI108|H39DFA0
-39DFA0:lI100|H39E048
-39E048:lI47|H39E0F8
-39E0F8:lI120|H39E1BC
-39E1BC:lI45|H39E298
-39E298:lI118|H39E38C
-39E38C:lI114|H39E488
-39E488:lI109|H39E590
-39E590:lI108|N
-39DCD4:lI119|H39DD38
-39DD38:lI114|H39DDA0
-39DDA0:lI108|N
-39DCA0:lH39DCE4|H39DCF0
-39DCE4:t2:H39DD48,H39DD50
-39DD50:lI120|H39DDB8
-39DDB8:lI45|H39DE20
-39DE20:lI119|H39DE98
-39DE98:lI111|H39DF18
-39DF18:lI114|H39DFA8
-39DFA8:lI108|H39E050
-39E050:lI100|H39E100
-39E100:lI47|H39E1C4
-39E1C4:lI120|H39E2A0
-39E2A0:lI45|H39E394
-39E394:lI118|H39E490
-39E490:lI114|H39E598
-39E598:lI109|H39E6AC
-39E6AC:lI108|N
-39DD48:lI118|H39DDB0
-39DDB0:lI114|H39DE18
-39DE18:lI109|H39DE90
-39DE90:lI108|N
-39DCF0:lH39DD58|H39DD64
-39DD58:t2:H39DDC0,H39DDC8
-39DDC8:lI120|H39DE30
-39DE30:lI45|H39DEA8
-39DEA8:lI99|H39DF20
-39DF20:lI111|H39DFB0
-39DFB0:lI110|H39E058
-39E058:lI102|H39E108
-39E108:lI101|H39E1CC
-39E1CC:lI114|H39E2A8
-39E2A8:lI101|H39E39C
-39E39C:lI110|H39E498
-39E498:lI99|H39E5A0
-39E5A0:lI101|H39E6B4
-39E6B4:lI47|H39E7C0
-39E7C0:lI120|H39E8D4
-39E8D4:lI45|H39E9E8
-39E9E8:lI99|H39EADC
-39EADC:lI111|H39EBD0
-39EBD0:lI111|H39ECC4
-39ECC4:lI108|H39EDB8
-39EDB8:lI116|H39EE8C
-39EE8C:lI97|H39EF60
-39EF60:lI108|H39F03C
-39F03C:lI107|N
-39DDC0:lI105|H39DE28
-39DE28:lI99|H39DEA0
-39DEA0:lI101|N
-39DD64:lH39DDD0|H39DDDC
-39DDD0:t2:H39DE38,H39DE40
-39DE40:lI118|H39DEB8
-39DEB8:lI105|H39DF30
-39DF30:lI100|H39DFC0
-39DFC0:lI101|H39E068
-39E068:lI111|H39E110
-39E110:lI47|H39E1D4
-39E1D4:lI120|H39E2B0
-39E2B0:lI45|H39E3A4
-39E3A4:lI115|H39E4A0
-39E4A0:lI103|H39E5A8
-39E5A8:lI105|H39E6BC
-39E6BC:lI45|H39E7C8
-39E7C8:lI109|H39E8DC
-39E8DC:lI111|H39E9F0
-39E9F0:lI118|H39EAE4
-39EAE4:lI105|H39EBD8
-39EBD8:lI101|N
-39DE38:lI109|H39DEB0
-39DEB0:lI111|H39DF28
-39DF28:lI118|H39DFB8
-39DFB8:lI105|H39E060
-39E060:lI101|N
-39DDDC:lH39DE48|H39DE54
-39DE48:t2:H39DEC0,H39DEC8
-39DEC8:lI118|H39DF40
-39DF40:lI105|H39DFD0
-39DFD0:lI100|H39E070
-39E070:lI101|H39E118
-39E118:lI111|H39E1DC
-39E1DC:lI47|H39E2B8
-39E2B8:lI120|H39E3AC
-39E3AC:lI45|H39E4A8
-39E4A8:lI109|H39E5B0
-39E5B0:lI115|H39E6C4
-39E6C4:lI118|H39E7D0
-39E7D0:lI105|H39E8E4
-39E8E4:lI100|H39E9F8
-39E9F8:lI101|H39EAEC
-39EAEC:lI111|N
-39DEC0:lI97|H39DF38
-39DF38:lI118|H39DFC8
-39DFC8:lI105|N
-39DE54:lH39DED0|H39DEDC
-39DED0:t2:H39DF48,H39DF50
-39DF50:lI118|H39DFE0
-39DFE0:lI105|H39E078
-39E078:lI100|H39E120
-39E120:lI101|H39E1E4
-39E1E4:lI111|H39E2C0
-39E2C0:lI47|H39E3B4
-39E3B4:lI113|H39E4B0
-39E4B0:lI117|H39E5B8
-39E5B8:lI105|H39E6CC
-39E6CC:lI99|H39E7D8
-39E7D8:lI107|H39E8EC
-39E8EC:lI116|H39EA00
-39EA00:lI105|H39EAF4
-39EAF4:lI109|H39EBE0
-39EBE0:lI101|N
-39DF48:lI113|H39DFD8
-39DFD8:lI116|N
-39DEDC:lH39DF58|H39DF64
-39DF58:t2:H39DFE8,H39DFF0
-39DFF0:lI118|H39E088
-39E088:lI105|H39E130
-39E130:lI100|H39E1EC
-39E1EC:lI101|H39E2C8
-39E2C8:lI111|H39E3BC
-39E3BC:lI47|H39E4B8
-39E4B8:lI113|H39E5C0
-39E5C0:lI117|H39E6D4
-39E6D4:lI105|H39E7E0
-39E7E0:lI99|H39E8F4
-39E8F4:lI107|H39EA08
-39EA08:lI116|H39EAFC
-39EAFC:lI105|H39EBE8
-39EBE8:lI109|H39ECCC
-39ECCC:lI101|N
-39DFE8:lI109|H39E080
-39E080:lI111|H39E128
-39E128:lI118|N
-39DF64:lH39DFF8|H39E004
-39DFF8:t2:H39E090,H39E098
-39E098:lI118|H39E140
-39E140:lI105|H39E1FC
-39E1FC:lI100|H39E2D8
-39E2D8:lI101|H39E3C4
-39E3C4:lI111|H39E4C0
-39E4C0:lI47|H39E5C8
-39E5C8:lI109|H39E6DC
-39E6DC:lI112|H39E7E8
-39E7E8:lI101|H39E8FC
-39E8FC:lI103|N
-39E090:lI109|H39E138
-39E138:lI112|H39E1F4
-39E1F4:lI101|H39E2D0
-39E2D0:lI103|N
-39E004:lH39E0A0|H39E0AC
-39E0A0:t2:H39E148,H39E150
-39E150:lI118|H39E20C
-39E20C:lI105|H39E2E8
-39E2E8:lI100|H39E3CC
-39E3CC:lI101|H39E4C8
-39E4C8:lI111|H39E5D0
-39E5D0:lI47|H39E6E4
-39E6E4:lI109|H39E7F0
-39E7F0:lI112|H39E904
-39E904:lI101|H39EA10
-39EA10:lI103|N
-39E148:lI109|H39E204
-39E204:lI112|H39E2E0
-39E2E0:lI103|N
-39E0AC:lH39E158|H39E164
-39E158:t2:H39E214,H39E21C
-39E21C:lI118|H39E2F8
-39E2F8:lI105|H39E3DC
-39E3DC:lI100|H39E4D0
-39E4D0:lI101|H39E5D8
-39E5D8:lI111|H39E6EC
-39E6EC:lI47|H39E7F8
-39E7F8:lI109|H39E90C
-39E90C:lI112|H39EA18
-39EA18:lI101|H39EB04
-39EB04:lI103|N
-39E214:lI109|H39E2F0
-39E2F0:lI112|H39E3D4
-39E3D4:lI101|N
-39E164:lH39E224|H39E230
-39E224:t2:H39E300,H39E308
-39E308:lI116|H39E3EC
-39E3EC:lI101|H39E4E0
-39E4E0:lI120|H39E5E8
-39E5E8:lI116|H39E6F4
-39E6F4:lI47|H39E800
-39E800:lI120|H39E914
-39E914:lI45|H39EA20
-39EA20:lI115|H39EB0C
-39EB0C:lI103|H39EBF0
-39EBF0:lI109|H39ECD4
-39ECD4:lI108|N
-39E300:lI115|H39E3E4
-39E3E4:lI103|H39E4D8
-39E4D8:lI109|H39E5E0
-39E5E0:lI108|N
-39E230:lH39E310|H39E31C
-39E310:t2:H39E3F4,H39E3FC
-39E3FC:lI116|H39E4F0
-39E4F0:lI101|H39E5F8
-39E5F8:lI120|H39E6FC
-39E6FC:lI116|H39E808
-39E808:lI47|H39E91C
-39E91C:lI120|H39EA28
-39EA28:lI45|H39EB14
-39EB14:lI115|H39EBF8
-39EBF8:lI103|H39ECDC
-39ECDC:lI109|H39EDC0
-39EDC0:lI108|N
-39E3F4:lI115|H39E4E8
-39E4E8:lI103|H39E5F0
-39E5F0:lI109|N
-39E31C:lH39E404|H39E410
-39E404:t2:H39E4F8,H39E500
-39E500:lI116|H39E608
-39E608:lI101|H39E70C
-39E70C:lI120|H39E810
-39E810:lI116|H39E924
-39E924:lI47|H39EA30
-39EA30:lI120|H39EB1C
-39EB1C:lI45|H39EC00
-39EC00:lI115|H39ECE4
-39ECE4:lI101|H39EDC8
-39EDC8:lI116|H39EE94
-39EE94:lI101|H39EF68
-39EF68:lI120|H39F044
-39F044:lI116|N
-39E4F8:lI101|H39E600
-39E600:lI116|H39E704
-39E704:lI120|N
-39E410:lH39E508|H39E514
-39E508:t2:H39E610,H39E618
-39E618:lI116|H39E71C
-39E71C:lI101|H39E820
-39E820:lI120|H39E92C
-39E92C:lI116|H39EA38
-39EA38:lI47|H39EB24
-39EB24:lI116|H39EC08
-39EC08:lI97|H39ECEC
-39ECEC:lI98|H39EDD0
-39EDD0:lI45|H39EE9C
-39EE9C:lI115|H39EF70
-39EF70:lI101|H39F04C
-39F04C:lI112|H39F120
-39F120:lI97|H39F1F4
-39F1F4:lI114|H39F2C0
-39F2C0:lI97|H39F37C
-39F37C:lI116|H39F440
-39F440:lI101|H39F50C
-39F50C:lI100|H39F5D0
-39F5D0:lI45|H39F6A4
-39F6A4:lI118|H39F778
-39F778:lI97|H39F84C
-39F84C:lI108|H39F930
-39F930:lI117|H39FA0C
-39FA0C:lI101|H39FAE0
-39FAE0:lI115|N
-39E610:lI116|H39E714
-39E714:lI115|H39E818
-39E818:lI118|N
-39E514:lH39E620|H39E62C
-39E620:t2:H39E724,H39E72C
-39E72C:lI116|H39E830
-39E830:lI101|H39E93C
-39E93C:lI120|H39EA40
-39EA40:lI116|H39EB2C
-39EB2C:lI47|H39EC10
-39EC10:lI114|H39ECF4
-39ECF4:lI105|H39EDD8
-39EDD8:lI99|H39EEA4
-39EEA4:lI104|H39EF78
-39EF78:lI116|H39F054
-39F054:lI101|H39F128
-39F128:lI120|H39F1FC
-39F1FC:lI116|N
-39E724:lI114|H39E828
-39E828:lI116|H39E934
-39E934:lI120|N
-39E62C:lH39E734|H39E740
-39E734:t2:H39E838,H39E840
-39E840:lI116|H39E94C
-39E94C:lI101|H39EA50
-39EA50:lI120|H39EB34
-39EB34:lI116|H39EC18
-39EC18:lI47|H39ECFC
-39ECFC:lI112|H39EDE0
-39EDE0:lI108|H39EEAC
-39EEAC:lI97|H39EF80
-39EF80:lI105|H39F05C
-39F05C:lI110|N
-39E838:lI116|H39E944
-39E944:lI120|H39EA48
-39EA48:lI116|N
-39E740:lH39E848|H39E854
-39E848:t2:H39E954,H39E95C
-39E95C:lI116|H39EA60
-39EA60:lI101|H39EB44
-39EB44:lI120|H39EC28
-39EC28:lI116|H39ED0C
-39ED0C:lI47|H39EDE8
-39EDE8:lI120|H39EEB4
-39EEB4:lI45|H39EF88
-39EF88:lI115|H39F064
-39F064:lI101|H39F130
-39F130:lI114|H39F204
-39F204:lI118|H39F2C8
-39F2C8:lI101|H39F384
-39F384:lI114|H39F448
-39F448:lI45|H39F514
-39F514:lI112|H39F5D8
-39F5D8:lI97|H39F6AC
-39F6AC:lI114|H39F780
-39F780:lI115|H39F854
-39F854:lI101|H39F938
-39F938:lI100|H39FA14
-39FA14:lI45|H39FAE8
-39FAE8:lI104|H39FBBC
-39FBBC:lI116|H39FC88
-39FC88:lI109|H39FD4C
-39FD4C:lI108|N
-39E954:lI115|H39EA58
-39EA58:lI104|H39EB3C
-39EB3C:lI116|H39EC20
-39EC20:lI109|H39ED04
-39ED04:lI108|N
-39E854:lH39E964|H39E970
-39E964:t2:H39EA68,H39EA70
-39EA70:lI116|H39EB54
-39EB54:lI101|H39EC38
-39EC38:lI120|H39ED1C
-39ED1C:lI116|H39EDF0
-39EDF0:lI47|H39EEBC
-39EEBC:lI104|H39EF90
-39EF90:lI116|H39F06C
-39F06C:lI109|H39F138
-39F138:lI108|N
-39EA68:lI104|H39EB4C
-39EB4C:lI116|H39EC30
-39EC30:lI109|H39ED14
-39ED14:lI108|N
-39E970:lH39EA78|H39EA84
-39EA78:t2:H39EB5C,H39EB64
-39EB64:lI116|H39EC48
-39EC48:lI101|H39ED2C
-39ED2C:lI120|H39EDF8
-39EDF8:lI116|H39EEC4
-39EEC4:lI47|H39EF98
-39EF98:lI104|H39F074
-39F074:lI116|H39F140
-39F140:lI109|H39F20C
-39F20C:lI108|N
-39EB5C:lI104|H39EC40
-39EC40:lI116|H39ED24
-39ED24:lI109|N
-39EA84:lH39EB6C|H39EB78
-39EB6C:t2:H39EC50,H39EC58
-39EC58:lI105|H39ED3C
-39ED3C:lI109|H39EE08
-39EE08:lI97|H39EECC
-39EECC:lI103|H39EFA0
-39EFA0:lI101|H39F07C
-39F07C:lI47|H39F148
-39F148:lI120|H39F214
-39F214:lI45|H39F2D0
-39F2D0:lI120|H39F38C
-39F38C:lI119|H39F450
-39F450:lI105|H39F51C
-39F51C:lI110|H39F5E0
-39F5E0:lI100|H39F6B4
-39F6B4:lI111|H39F788
-39F788:lI119|H39F85C
-39F85C:lI100|H39F940
-39F940:lI117|H39FA1C
-39FA1C:lI109|H39FAF0
-39FAF0:lI112|N
-39EC50:lI120|H39ED34
-39ED34:lI119|H39EE00
-39EE00:lI100|N
-39EB78:lH39EC60|H39EC6C
-39EC60:t2:H39ED44,H39ED4C
-39ED4C:lI105|H39EE18
-39EE18:lI109|H39EEDC
-39EEDC:lI97|H39EFA8
-39EFA8:lI103|H39F084
-39F084:lI101|H39F150
-39F150:lI47|H39F21C
-39F21C:lI120|H39F2D8
-39F2D8:lI45|H39F394
-39F394:lI120|H39F458
-39F458:lI112|H39F524
-39F524:lI105|H39F5E8
-39F5E8:lI120|H39F6BC
-39F6BC:lI109|H39F790
-39F790:lI97|H39F864
-39F864:lI112|N
-39ED44:lI120|H39EE10
-39EE10:lI112|H39EED4
-39EED4:lI109|N
-39EC6C:lH39ED54|H39ED60
-39ED54:t2:H39EE20,H39EE28
-39EE28:lI105|H39EEEC
-39EEEC:lI109|H39EFB8
-39EFB8:lI97|H39F08C
-39F08C:lI103|H39F158
-39F158:lI101|H39F224
-39F224:lI47|H39F2E0
-39F2E0:lI120|H39F39C
-39F39C:lI45|H39F460
-39F460:lI120|H39F52C
-39F52C:lI98|H39F5F0
-39F5F0:lI105|H39F6C4
-39F6C4:lI116|H39F798
-39F798:lI109|H39F86C
-39F86C:lI97|H39F948
-39F948:lI112|N
-39EE20:lI120|H39EEE4
-39EEE4:lI98|H39EFB0
-39EFB0:lI109|N
-39ED60:lH39EE30|H39EE3C
-39EE30:t2:H39EEF4,H39EEFC
-39EEFC:lI105|H39EFC8
-39EFC8:lI109|H39F09C
-39F09C:lI97|H39F160
-39F160:lI103|H39F22C
-39F22C:lI101|H39F2E8
-39F2E8:lI47|H39F3A4
-39F3A4:lI120|H39F468
-39F468:lI45|H39F534
-39F534:lI114|H39F5F8
-39F5F8:lI103|H39F6CC
-39F6CC:lI98|N
-39EEF4:lI114|H39EFC0
-39EFC0:lI103|H39F094
-39F094:lI98|N
-39EE3C:lH39EF04|H39EF10
-39EF04:t2:H39EFD0,H39EFD8
-39EFD8:lI105|H39F0AC
-39F0AC:lI109|H39F170
-39F170:lI97|H39F234
-39F234:lI103|H39F2F0
-39F2F0:lI101|H39F3AC
-39F3AC:lI47|H39F470
-39F470:lI120|H39F53C
-39F53C:lI45|H39F600
-39F600:lI112|H39F6D4
-39F6D4:lI111|H39F7A0
-39F7A0:lI114|H39F874
-39F874:lI116|H39F950
-39F950:lI97|H39FA24
-39FA24:lI98|H39FAF8
-39FAF8:lI108|H39FBC4
-39FBC4:lI101|H39FC90
-39FC90:lI45|H39FD54
-39FD54:lI112|H39FE18
-39FE18:lI105|H39FECC
-39FECC:lI120|H39FF88
-39FF88:lI109|H3A003C
-3A003C:lI97|H3A00E8
-3A00E8:lI112|N
-39EFD0:lI112|H39F0A4
-39F0A4:lI112|H39F168
-39F168:lI109|N
-39EF10:lH39EFE0|H39EFEC
-39EFE0:t2:H39F0B4,H39F0BC
-39F0BC:lI105|H39F180
-39F180:lI109|H39F244
-39F244:lI97|H39F2F8
-39F2F8:lI103|H39F3B4
-39F3B4:lI101|H39F478
-39F478:lI47|H39F544
-39F544:lI120|H39F608
-39F608:lI45|H39F6DC
-39F6DC:lI112|H39F7A8
-39F7A8:lI111|H39F87C
-39F87C:lI114|H39F958
-39F958:lI116|H39FA2C
-39FA2C:lI97|H39FB00
-39FB00:lI98|H39FBCC
-39FBCC:lI108|H39FC98
-39FC98:lI101|H39FD5C
-39FD5C:lI45|H39FE20
-39FE20:lI103|H39FED4
-39FED4:lI114|H39FF90
-39FF90:lI97|H3A0044
-3A0044:lI121|H3A00F0
-3A00F0:lI109|H3A0194
-3A0194:lI97|H3A0248
-3A0248:lI112|N
-39F0B4:lI112|H39F178
-39F178:lI103|H39F23C
-39F23C:lI109|N
-39EFEC:lH39F0C4|H39F0D0
-39F0C4:t2:H39F188,H39F190
-39F190:lI105|H39F254
-39F254:lI109|H39F308
-39F308:lI97|H39F3BC
-39F3BC:lI103|H39F480
-39F480:lI101|H39F54C
-39F54C:lI47|H39F610
-39F610:lI120|H39F6E4
-39F6E4:lI45|H39F7B0
-39F7B0:lI112|H39F884
-39F884:lI111|H39F960
-39F960:lI114|H39FA34
-39FA34:lI116|H39FB08
-39FB08:lI97|H39FBD4
-39FBD4:lI98|H39FCA0
-39FCA0:lI108|H39FD64
-39FD64:lI101|H39FE28
-39FE28:lI45|H39FEDC
-39FEDC:lI98|H39FF98
-39FF98:lI105|H3A004C
-3A004C:lI116|H3A00F8
-3A00F8:lI109|H3A019C
-3A019C:lI97|H3A0250
-3A0250:lI112|N
-39F188:lI112|H39F24C
-39F24C:lI98|H39F300
-39F300:lI109|N
-39F0D0:lH39F198|H39F1A4
-39F198:t2:H39F25C,H39F264
-39F264:lI105|H39F318
-39F318:lI109|H39F3CC
-39F3CC:lI97|H39F488
-39F488:lI103|H39F554
-39F554:lI101|H39F618
-39F618:lI47|H39F6EC
-39F6EC:lI120|H39F7B8
-39F7B8:lI45|H39F88C
-39F88C:lI112|H39F968
-39F968:lI111|H39FA3C
-39FA3C:lI114|H39FB10
-39FB10:lI116|H39FBDC
-39FBDC:lI97|H39FCA8
-39FCA8:lI98|H39FD6C
-39FD6C:lI108|H39FE30
-39FE30:lI101|H39FEE4
-39FEE4:lI45|H39FFA0
-39FFA0:lI97|H3A0054
-3A0054:lI110|H3A0100
-3A0100:lI121|H3A01A4
-3A01A4:lI109|H3A0258
-3A0258:lI97|H3A0304
-3A0304:lI112|N
-39F25C:lI112|H39F310
-39F310:lI110|H39F3C4
-39F3C4:lI109|N
-39F1A4:lH39F26C|H39F278
-39F26C:t2:H39F320,H39F328
-39F328:lI105|H39F3DC
-39F3DC:lI109|H39F498
-39F498:lI97|H39F55C
-39F55C:lI103|H39F620
-39F620:lI101|H39F6F4
-39F6F4:lI47|H39F7C0
-39F7C0:lI120|H39F894
-39F894:lI45|H39F970
-39F970:lI99|H39FA44
-39FA44:lI109|H39FB18
-39FB18:lI117|H39FBE4
-39FBE4:lI45|H39FCB0
-39FCB0:lI114|H39FD74
-39FD74:lI97|H39FE38
-39FE38:lI115|H39FEEC
-39FEEC:lI116|H39FFA8
-39FFA8:lI101|H3A005C
-3A005C:lI114|N
-39F320:lI114|H39F3D4
-39F3D4:lI97|H39F490
-39F490:lI115|N
-39F278:lH39F330|H39F33C
-39F330:t2:H39F3E4,H39F3EC
-39F3EC:lI105|H39F4A8
-39F4A8:lI109|H39F56C
-39F56C:lI97|H39F630
-39F630:lI103|H39F6FC
-39F6FC:lI101|H39F7C8
-39F7C8:lI47|H39F89C
-39F89C:lI116|H39F978
-39F978:lI105|H39FA4C
-39FA4C:lI102|H39FB20
-39FB20:lI102|N
-39F3E4:lI116|H39F4A0
-39F4A0:lI105|H39F564
-39F564:lI102|H39F628
-39F628:lI102|N
-39F33C:lH39F3F4|H39F400
-39F3F4:t2:H39F4B0,H39F4B8
-39F4B8:lI105|H39F57C
-39F57C:lI109|H39F640
-39F640:lI97|H39F704
-39F704:lI103|H39F7D0
-39F7D0:lI101|H39F8A4
-39F8A4:lI47|H39F980
-39F980:lI116|H39FA54
-39FA54:lI105|H39FB28
-39FB28:lI102|H39FBEC
-39FBEC:lI102|N
-39F4B0:lI116|H39F574
-39F574:lI105|H39F638
-39F638:lI102|N
-39F400:lH39F4C0|H39F4CC
-39F4C0:t2:H39F584,H39F58C
-39F58C:lI105|H39F650
-39F650:lI109|H39F714
-39F714:lI97|H39F7D8
-39F7D8:lI103|H39F8AC
-39F8AC:lI101|H39F988
-39F988:lI47|H39FA5C
-39FA5C:lI112|H39FB30
-39FB30:lI110|H39FBF4
-39FBF4:lI103|N
-39F584:lI112|H39F648
-39F648:lI110|H39F70C
-39F70C:lI103|N
-39F4CC:lH39F594|H39F5A0
-39F594:t2:H39F658,H39F660
-39F660:lI105|H39F724
-39F724:lI109|H39F7E8
-39F7E8:lI97|H39F8BC
-39F8BC:lI103|H39F990
-39F990:lI101|H39FA64
-39FA64:lI47|H39FB38
-39FB38:lI106|H39FBFC
-39FBFC:lI112|H39FCB8
-39FCB8:lI101|H39FD7C
-39FD7C:lI103|N
-39F658:lI106|H39F71C
-39F71C:lI112|H39F7E0
-39F7E0:lI101|H39F8B4
-39F8B4:lI103|N
-39F5A0:lH39F668|H39F674
-39F668:t2:H39F72C,H39F734
-39F734:lI105|H39F7F8
-39F7F8:lI109|H39F8CC
-39F8CC:lI97|H39F998
-39F998:lI103|H39FA6C
-39FA6C:lI101|H39FB40
-39FB40:lI47|H39FC04
-39FC04:lI106|H39FCC0
-39FCC0:lI112|H39FD84
-39FD84:lI101|H39FE40
-39FE40:lI103|N
-39F72C:lI106|H39F7F0
-39F7F0:lI112|H39F8C4
-39F8C4:lI103|N
-39F674:lH39F73C|H39F748
-39F73C:t2:H39F800,H39F808
-39F808:lI105|H39F8DC
-39F8DC:lI109|H39F9A8
-39F9A8:lI97|H39FA74
-39FA74:lI103|H39FB48
-39FB48:lI101|H39FC0C
-39FC0C:lI47|H39FCC8
-39FCC8:lI106|H39FD8C
-39FD8C:lI112|H39FE48
-39FE48:lI101|H39FEF4
-39FEF4:lI103|N
-39F800:lI106|H39F8D4
-39F8D4:lI112|H39F9A0
-39F9A0:lI101|N
-39F748:lH39F810|H39F81C
-39F810:t2:H39F8E4,H39F8EC
-39F8EC:lI105|H39F9B8
-39F9B8:lI109|H39FA84
-39FA84:lI97|H39FB50
-39FB50:lI103|H39FC14
-39FC14:lI101|H39FCD0
-39FCD0:lI47|H39FD94
-39FD94:lI105|H39FE50
-39FE50:lI101|H39FEFC
-39FEFC:lI102|N
-39F8E4:lI105|H39F9B0
-39F9B0:lI101|H39FA7C
-39FA7C:lI102|N
-39F81C:lH39F8F4|H39F900
-39F8F4:t2:H39F9C0,H39F9C8
-39F9C8:lI105|H39FA94
-39FA94:lI109|H39FB60
-39FB60:lI97|H39FC1C
-39FC1C:lI103|H39FCD8
-39FCD8:lI101|H39FD9C
-39FD9C:lI47|H39FE58
-39FE58:lI103|H39FF04
-39FF04:lI105|H39FFB0
-39FFB0:lI102|N
-39F9C0:lI103|H39FA8C
-39FA8C:lI105|H39FB58
-39FB58:lI102|N
-39F900:lH39F9D0|H39F9DC
-39F9D0:t2:H39FA9C,H39FAA4
-39FAA4:lI99|H39FB70
-39FB70:lI104|H39FC2C
-39FC2C:lI101|H39FCE0
-39FCE0:lI109|H39FDA4
-39FDA4:lI105|H39FE60
-39FE60:lI99|H39FF0C
-39FF0C:lI97|H39FFB8
-39FFB8:lI108|H3A0064
-3A0064:lI47|H3A0108
-3A0108:lI120|H3A01AC
-3A01AC:lI45|H3A0260
-3A0260:lI112|H3A030C
-3A030C:lI100|H3A03B8
-3A03B8:lI98|N
-39FA9C:lI112|H39FB68
-39FB68:lI100|H39FC24
-39FC24:lI98|N
-39F9DC:lH39FAAC|H39FAB8
-39FAAC:t2:H39FB78,H39FB80
-39FB80:lI99|H39FC3C
-39FC3C:lI104|H39FCF0
-39FCF0:lI101|H39FDAC
-39FDAC:lI109|H39FE68
-39FE68:lI105|H39FF14
-39FF14:lI99|H39FFC0
-39FFC0:lI97|H3A006C
-3A006C:lI108|H3A0110
-3A0110:lI47|H3A01B4
-3A01B4:lI120|H3A0268
-3A0268:lI45|H3A0314
-3A0314:lI112|H3A03C0
-3A03C0:lI100|H3A0454
-3A0454:lI98|N
-39FB78:lI120|H39FC34
-39FC34:lI121|H39FCE8
-39FCE8:lI122|N
-39FAB8:lH39FB88|H39FB94
-39FB88:t2:H39FC44,H39FC4C
-39FC4C:lI97|H39FD00
-39FD00:lI117|H39FDBC
-39FDBC:lI100|H39FE70
-39FE70:lI105|H39FF1C
-39FF1C:lI111|H39FFC8
-39FFC8:lI47|H3A0074
-3A0074:lI120|H3A0118
-3A0118:lI45|H3A01BC
-3A01BC:lI119|H3A0270
-3A0270:lI97|H3A031C
-3A031C:lI118|N
-39FC44:lI119|H39FCF8
-39FCF8:lI97|H39FDB4
-39FDB4:lI118|N
-39FB94:lH39FC54|H39FC60
-39FC54:t2:H39FD08,H39FD10
-39FD10:lI97|H39FDCC
-39FDCC:lI117|H39FE78
-39FE78:lI100|H39FF24
-39FF24:lI105|H39FFD0
-39FFD0:lI111|H3A007C
-3A007C:lI47|H3A0120
-3A0120:lI120|H3A01C4
-3A01C4:lI45|H3A0278
-3A0278:lI114|H3A0324
-3A0324:lI101|H3A03C8
-3A03C8:lI97|H3A045C
-3A045C:lI108|H3A04F8
-3A04F8:lI97|H3A059C
-3A059C:lI117|H3A0648
-3A0648:lI100|H3A06F4
-3A06F4:lI105|H3A07A0
-3A07A0:lI111|N
-39FD08:lI114|H39FDC4
-39FDC4:lI97|N
-39FC60:lH39FD18|H39FD24
-39FD18:t2:H39FDD4,H39FDDC
-39FDDC:lI97|H39FE88
-39FE88:lI117|H39FF34
-39FF34:lI100|H39FFD8
-39FFD8:lI105|H3A0084
-3A0084:lI111|H3A0128
-3A0128:lI47|H3A01CC
-3A01CC:lI120|H3A0280
-3A0280:lI45|H3A032C
-3A032C:lI112|H3A03D0
-3A03D0:lI110|H3A0464
-3A0464:lI45|H3A0500
-3A0500:lI114|H3A05A4
-3A05A4:lI101|H3A0650
-3A0650:lI97|H3A06FC
-3A06FC:lI108|H3A07A8
-3A07A8:lI97|H3A0844
-3A0844:lI117|H3A08D0
-3A08D0:lI100|H3A0964
-3A0964:lI105|H3A09F8
-3A09F8:lI111|H3A0A94
-3A0A94:lI45|H3A0B40
-3A0B40:lI112|H3A0BEC
-3A0BEC:lI108|H3A0CA8
-3A0CA8:lI117|H3A0D64
-3A0D64:lI103|H3A0E18
-3A0E18:lI105|H3A0ECC
-3A0ECC:lI110|N
-39FDD4:lI114|H39FE80
-39FE80:lI112|H39FF2C
-39FF2C:lI109|N
-39FD24:lH39FDE4|H39FDF0
-39FDE4:t2:H39FE90,H39FE98
-39FE98:lI97|H39FF44
-39FF44:lI117|H39FFE8
-39FFE8:lI100|H3A008C
-3A008C:lI105|H3A0130
-3A0130:lI111|H3A01D4
-3A01D4:lI47|H3A0288
-3A0288:lI120|H3A0334
-3A0334:lI45|H3A03D8
-3A03D8:lI112|H3A046C
-3A046C:lI110|H3A0508
-3A0508:lI45|H3A05AC
-3A05AC:lI114|H3A0658
-3A0658:lI101|H3A0704
-3A0704:lI97|H3A07B0
-3A07B0:lI108|H3A084C
-3A084C:lI97|H3A08D8
-3A08D8:lI117|H3A096C
-3A096C:lI100|H3A0A00
-3A0A00:lI105|H3A0A9C
-3A0A9C:lI111|N
-39FE90:lI114|H39FF3C
-39FF3C:lI97|H39FFE0
-39FFE0:lI109|N
-39FDF0:lH39FEA0|H39FEAC
-39FEA0:t2:H39FF4C,H39FF54
-39FF54:lI97|H39FFF8
-39FFF8:lI117|H3A009C
-3A009C:lI100|H3A0138
-3A0138:lI105|H3A01DC
-3A01DC:lI111|H3A0290
-3A0290:lI47|H3A033C
-3A033C:lI120|H3A03E0
-3A03E0:lI45|H3A0474
-3A0474:lI97|H3A0510
-3A0510:lI105|H3A05B4
-3A05B4:lI102|H3A0660
-3A0660:lI102|N
-39FF4C:lI97|H39FFF0
-39FFF0:lI105|H3A0094
-3A0094:lI102|N
-39FEAC:lH39FF5C|H39FF68
-39FF5C:t2:H3A0000,H3A0008
-3A0008:lI97|H3A00AC
-3A00AC:lI117|H3A0148
-3A0148:lI100|H3A01EC
-3A01EC:lI105|H3A0298
-3A0298:lI111|H3A0344
-3A0344:lI47|H3A03E8
-3A03E8:lI120|H3A047C
-3A047C:lI45|H3A0518
-3A0518:lI97|H3A05BC
-3A05BC:lI105|H3A0668
-3A0668:lI102|H3A070C
-3A070C:lI102|N
-3A0000:lI97|H3A00A4
-3A00A4:lI105|H3A0140
-3A0140:lI102|H3A01E4
-3A01E4:lI102|N
-39FF68:lH3A0010|H3A001C
-3A0010:t2:H3A00B4,H3A00BC
-3A00BC:lI97|H3A0158
-3A0158:lI117|H3A01FC
-3A01FC:lI100|H3A02A8
-3A02A8:lI105|H3A034C
-3A034C:lI111|H3A03F0
-3A03F0:lI47|H3A0484
-3A0484:lI120|H3A0520
-3A0520:lI45|H3A05C4
-3A05C4:lI97|H3A0670
-3A0670:lI105|H3A0714
-3A0714:lI102|H3A07B8
-3A07B8:lI102|N
-3A00B4:lI97|H3A0150
-3A0150:lI105|H3A01F4
-3A01F4:lI102|H3A02A0
-3A02A0:lI99|N
-3A001C:lH3A00C4|H3A00D0
-3A00C4:t2:H3A0160,H3A0168
-3A0168:lI97|H3A020C
-3A020C:lI117|H3A02B8
-3A02B8:lI100|H3A035C
-3A035C:lI105|H3A03F8
-3A03F8:lI111|H3A048C
-3A048C:lI47|H3A0528
-3A0528:lI109|H3A05CC
-3A05CC:lI112|H3A0678
-3A0678:lI101|H3A071C
-3A071C:lI103|N
-3A0160:lI109|H3A0204
-3A0204:lI112|H3A02B0
-3A02B0:lI103|H3A0354
-3A0354:lI97|N
-3A00D0:lH3A0170|H3A017C
-3A0170:t2:H3A0214,H3A021C
-3A021C:lI97|H3A02C8
-3A02C8:lI117|H3A036C
-3A036C:lI100|H3A0400
-3A0400:lI105|H3A0494
-3A0494:lI111|H3A0530
-3A0530:lI47|H3A05D4
-3A05D4:lI109|H3A0680
-3A0680:lI112|H3A0724
-3A0724:lI101|H3A07C0
-3A07C0:lI103|N
-3A0214:lI109|H3A02C0
-3A02C0:lI112|H3A0364
-3A0364:lI50|N
-3A017C:lH3A0224|H3A0230
-3A0224:t2:H3A02D0,H3A02D8
-3A02D8:lI97|H3A037C
-3A037C:lI117|H3A0408
-3A0408:lI100|H3A049C
-3A049C:lI105|H3A0538
-3A0538:lI111|H3A05DC
-3A05DC:lI47|H3A0688
-3A0688:lI98|H3A072C
-3A072C:lI97|H3A07C8
-3A07C8:lI115|H3A0854
-3A0854:lI105|H3A08E0
-3A08E0:lI99|N
-3A02D0:lI97|H3A0374
-3A0374:lI117|N
-3A0230:lH3A02E0|H3A02EC
-3A02E0:t2:H3A0384,H3A038C
-3A038C:lI97|H3A0418
-3A0418:lI117|H3A04AC
-3A04AC:lI100|H3A0540
-3A0540:lI105|H3A05E4
-3A05E4:lI111|H3A0690
-3A0690:lI47|H3A0734
-3A0734:lI98|H3A07D0
-3A07D0:lI97|H3A085C
-3A085C:lI115|H3A08E8
-3A08E8:lI105|H3A0974
-3A0974:lI99|N
-3A0384:lI115|H3A0410
-3A0410:lI110|H3A04A4
-3A04A4:lI100|N
-3A02EC:lH3A0394|H3A03A0
-3A0394:t2:H3A0420,H3A0428
-3A0428:lI97|H3A04BC
-3A04BC:lI112|H3A0550
-3A0550:lI112|H3A05EC
-3A05EC:lI108|H3A0698
-3A0698:lI105|H3A073C
-3A073C:lI99|H3A07D8
-3A07D8:lI97|H3A0864
-3A0864:lI116|H3A08F0
-3A08F0:lI105|H3A097C
-3A097C:lI111|H3A0A08
-3A0A08:lI110|H3A0AA4
-3A0AA4:lI47|H3A0B48
-3A0B48:lI122|H3A0BF4
-3A0BF4:lI105|H3A0CB0
-3A0CB0:lI112|N
-3A0420:lI122|H3A04B4
-3A04B4:lI105|H3A0548
-3A0548:lI112|N
-3A03A0:lH3A0430|H3A043C
-3A0430:t2:H3A04C4,H3A04CC
-3A04CC:lI97|H3A0560
-3A0560:lI112|H3A05FC
-3A05FC:lI112|H3A06A0
-3A06A0:lI108|H3A0744
-3A0744:lI105|H3A07E0
-3A07E0:lI99|H3A086C
-3A086C:lI97|H3A08F8
-3A08F8:lI116|H3A0984
-3A0984:lI105|H3A0A10
-3A0A10:lI111|H3A0AAC
-3A0AAC:lI110|H3A0B50
-3A0B50:lI47|H3A0BFC
-3A0BFC:lI120|H3A0CB8
-3A0CB8:lI45|H3A0D6C
-3A0D6C:lI119|H3A0E20
-3A0E20:lI97|H3A0ED4
-3A0ED4:lI105|H3A0F90
-3A0F90:lI115|H3A105C
-3A105C:lI45|H3A1130
-3A1130:lI115|H3A1204
-3A1204:lI111|H3A12D0
-3A12D0:lI117|H3A13A4
-3A13A4:lI114|H3A1480
-3A1480:lI99|H3A1564
-3A1564:lI101|N
-3A04C4:lI115|H3A0558
-3A0558:lI114|H3A05F4
-3A05F4:lI99|N
-3A043C:lH3A04D4|H3A04E0
-3A04D4:t2:H3A0568,H3A0570
-3A0570:lI97|H3A060C
-3A060C:lI112|H3A06B0
-3A06B0:lI112|H3A0754
-3A0754:lI108|H3A07F0
-3A07F0:lI105|H3A0874
-3A0874:lI99|H3A0900
-3A0900:lI97|H3A098C
-3A098C:lI116|H3A0A18
-3A0A18:lI105|H3A0AB4
-3A0AB4:lI111|H3A0B58
-3A0B58:lI110|H3A0C04
-3A0C04:lI47|H3A0CC0
-3A0CC0:lI120|H3A0D74
-3A0D74:lI45|H3A0E28
-3A0E28:lI117|H3A0EDC
-3A0EDC:lI115|H3A0F98
-3A0F98:lI116|H3A1064
-3A1064:lI97|H3A1138
-3A1138:lI114|N
-3A0568:lI117|H3A0604
-3A0604:lI115|H3A06A8
-3A06A8:lI116|H3A074C
-3A074C:lI97|H3A07E8
-3A07E8:lI114|N
-3A04E0:lH3A0578|H3A0584
-3A0578:t2:H3A0614,H3A061C
-3A061C:lI97|H3A06C0
-3A06C0:lI112|H3A075C
-3A075C:lI112|H3A07F8
-3A07F8:lI108|H3A087C
-3A087C:lI105|H3A0908
-3A0908:lI99|H3A0994
-3A0994:lI97|H3A0A20
-3A0A20:lI116|H3A0ABC
-3A0ABC:lI105|H3A0B60
-3A0B60:lI111|H3A0C0C
-3A0C0C:lI110|H3A0CC8
-3A0CC8:lI47|H3A0D7C
-3A0D7C:lI120|H3A0E30
-3A0E30:lI45|H3A0EE4
-3A0EE4:lI116|H3A0FA0
-3A0FA0:lI114|H3A106C
-3A106C:lI111|H3A1140
-3A1140:lI102|H3A120C
-3A120C:lI102|H3A12D8
-3A12D8:lI45|H3A13AC
-3A13AC:lI109|H3A1488
-3A1488:lI115|N
-3A0614:lI109|H3A06B8
-3A06B8:lI115|N
-3A0584:lH3A0624|H3A0630
-3A0624:t2:H3A06C8,H3A06D0
-3A06D0:lI97|H3A076C
-3A076C:lI112|H3A0800
-3A0800:lI112|H3A0884
-3A0884:lI108|H3A0910
-3A0910:lI105|H3A099C
-3A099C:lI99|H3A0A28
-3A0A28:lI97|H3A0AC4
-3A0AC4:lI116|H3A0B68
-3A0B68:lI105|H3A0C14
-3A0C14:lI111|H3A0CD0
-3A0CD0:lI110|H3A0D84
-3A0D84:lI47|H3A0E38
-3A0E38:lI120|H3A0EEC
-3A0EEC:lI45|H3A0FA8
-3A0FA8:lI116|H3A1074
-3A1074:lI114|H3A1148
-3A1148:lI111|H3A1214
-3A1214:lI102|H3A12E0
-3A12E0:lI102|H3A13B4
-3A13B4:lI45|H3A1490
-3A1490:lI109|H3A156C
-3A156C:lI101|N
-3A06C8:lI109|H3A0764
-3A0764:lI101|N
-3A0630:lH3A06D8|H3A06E4
-3A06D8:t2:H3A0774,H3A077C
-3A077C:lI97|H3A0810
-3A0810:lI112|H3A0894
-3A0894:lI112|H3A0918
-3A0918:lI108|H3A09A4
-3A09A4:lI105|H3A0A30
-3A0A30:lI99|H3A0ACC
-3A0ACC:lI97|H3A0B70
-3A0B70:lI116|H3A0C1C
-3A0C1C:lI105|H3A0CD8
-3A0CD8:lI111|H3A0D8C
-3A0D8C:lI110|H3A0E40
-3A0E40:lI47|H3A0EF4
-3A0EF4:lI120|H3A0FB0
-3A0FB0:lI45|H3A107C
-3A107C:lI116|H3A1150
-3A1150:lI114|H3A121C
-3A121C:lI111|H3A12E8
-3A12E8:lI102|H3A13BC
-3A13BC:lI102|H3A1498
-3A1498:lI45|H3A1574
-3A1574:lI109|H3A1648
-3A1648:lI97|H3A171C
-3A171C:lI110|N
-3A0774:lI109|H3A0808
-3A0808:lI97|H3A088C
-3A088C:lI110|N
-3A06E4:lH3A0784|H3A0790
-3A0784:t2:H3A0818,H3A0820
-3A0820:lI97|H3A089C
-3A089C:lI112|H3A0920
-3A0920:lI112|H3A09AC
-3A09AC:lI108|H3A0A38
-3A0A38:lI105|H3A0AD4
-3A0AD4:lI99|H3A0B78
-3A0B78:lI97|H3A0C24
-3A0C24:lI116|H3A0CE0
-3A0CE0:lI105|H3A0D94
-3A0D94:lI111|H3A0E48
-3A0E48:lI110|H3A0EFC
-3A0EFC:lI47|H3A0FB8
-3A0FB8:lI120|H3A1084
-3A1084:lI45|H3A1158
-3A1158:lI116|H3A1224
-3A1224:lI114|H3A12F0
-3A12F0:lI111|H3A13C4
-3A13C4:lI102|H3A14A0
-3A14A0:lI102|N
-3A0818:lI116|N
-3A0790:lH3A0828|H3A0834
-3A0828:t2:H3A08A4,H3A08AC
-3A08AC:lI97|H3A0930
-3A0930:lI112|H3A09B4
-3A09B4:lI112|H3A0A40
-3A0A40:lI108|H3A0ADC
-3A0ADC:lI105|H3A0B80
-3A0B80:lI99|H3A0C2C
-3A0C2C:lI97|H3A0CE8
-3A0CE8:lI116|H3A0D9C
-3A0D9C:lI105|H3A0E50
-3A0E50:lI111|H3A0F04
-3A0F04:lI110|H3A0FC0
-3A0FC0:lI47|H3A108C
-3A108C:lI120|H3A1160
-3A1160:lI45|H3A122C
-3A122C:lI116|H3A12F8
-3A12F8:lI114|H3A13CC
-3A13CC:lI111|H3A14A8
-3A14A8:lI102|H3A157C
-3A157C:lI102|N
-3A08A4:lI116|H3A0928
-3A0928:lI114|N
-3A0834:lH3A08B4|H3A08C0
-3A08B4:t2:H3A0938,H3A0940
-3A0940:lI97|H3A09C4
-3A09C4:lI112|H3A0A50
-3A0A50:lI112|H3A0AEC
-3A0AEC:lI108|H3A0B88
-3A0B88:lI105|H3A0C34
-3A0C34:lI99|H3A0CF0
-3A0CF0:lI97|H3A0DA4
-3A0DA4:lI116|H3A0E58
-3A0E58:lI105|H3A0F0C
-3A0F0C:lI111|H3A0FC8
-3A0FC8:lI110|H3A1094
-3A1094:lI47|H3A1168
-3A1168:lI120|H3A1234
-3A1234:lI45|H3A1300
-3A1300:lI116|H3A13D4
-3A13D4:lI114|H3A14B0
-3A14B0:lI111|H3A1584
-3A1584:lI102|H3A1650
-3A1650:lI102|N
-3A0938:lI114|H3A09BC
-3A09BC:lI111|H3A0A48
-3A0A48:lI102|H3A0AE4
-3A0AE4:lI102|N
-3A08C0:lH3A0948|H3A0954
-3A0948:t2:H3A09CC,H3A09D4
-3A09D4:lI97|H3A0A60
-3A0A60:lI112|H3A0AFC
-3A0AFC:lI112|H3A0B98
-3A0B98:lI108|H3A0C44
-3A0C44:lI105|H3A0D00
-3A0D00:lI99|H3A0DB4
-3A0DB4:lI97|H3A0E60
-3A0E60:lI116|H3A0F14
-3A0F14:lI105|H3A0FD0
-3A0FD0:lI111|H3A109C
-3A109C:lI110|H3A1170
-3A1170:lI47|H3A123C
-3A123C:lI120|H3A1308
-3A1308:lI45|H3A13DC
-3A13DC:lI116|H3A14B8
-3A14B8:lI101|H3A158C
-3A158C:lI120|H3A1658
-3A1658:lI105|H3A1724
-3A1724:lI110|H3A17E8
-3A17E8:lI102|H3A18AC
-3A18AC:lI111|N
-3A09CC:lI116|H3A0A58
-3A0A58:lI101|H3A0AF4
-3A0AF4:lI120|H3A0B90
-3A0B90:lI105|H3A0C3C
-3A0C3C:lI110|H3A0CF8
-3A0CF8:lI102|H3A0DAC
-3A0DAC:lI111|N
-3A0954:lH3A09DC|H3A09E8
-3A09DC:t2:H3A0A68,H3A0A70
-3A0A70:lI97|H3A0B0C
-3A0B0C:lI112|H3A0BA8
-3A0BA8:lI112|H3A0C54
-3A0C54:lI108|H3A0D08
-3A0D08:lI105|H3A0DBC
-3A0DBC:lI99|H3A0E68
-3A0E68:lI97|H3A0F1C
-3A0F1C:lI116|H3A0FD8
-3A0FD8:lI105|H3A10A4
-3A10A4:lI111|H3A1178
-3A1178:lI110|H3A1244
-3A1244:lI47|H3A1310
-3A1310:lI120|H3A13E4
-3A13E4:lI45|H3A14C0
-3A14C0:lI116|H3A1594
-3A1594:lI101|H3A1660
-3A1660:lI120|H3A172C
-3A172C:lI105|H3A17F0
-3A17F0:lI110|H3A18B4
-3A18B4:lI102|H3A1970
-3A1970:lI111|N
-3A0A68:lI116|H3A0B04
-3A0B04:lI101|H3A0BA0
-3A0BA0:lI120|H3A0C4C
-3A0C4C:lI105|N
-3A09E8:lH3A0A78|H3A0A84
-3A0A78:t2:H3A0B14,H3A0B1C
-3A0B1C:lI97|H3A0BB8
-3A0BB8:lI112|H3A0C64
-3A0C64:lI112|H3A0D10
-3A0D10:lI108|H3A0DC4
-3A0DC4:lI105|H3A0E70
-3A0E70:lI99|H3A0F24
-3A0F24:lI97|H3A0FE0
-3A0FE0:lI116|H3A10AC
-3A10AC:lI105|H3A1180
-3A1180:lI111|H3A124C
-3A124C:lI110|H3A1318
-3A1318:lI47|H3A13EC
-3A13EC:lI120|H3A14C8
-3A14C8:lI45|H3A159C
-3A159C:lI116|H3A1668
-3A1668:lI101|H3A1734
-3A1734:lI120|N
-3A0B14:lI116|H3A0BB0
-3A0BB0:lI101|H3A0C5C
-3A0C5C:lI120|N
-3A0A84:lH3A0B24|H3A0B30
-3A0B24:t2:H3A0BC0,H3A0BC8
-3A0BC8:lI97|H3A0C74
-3A0C74:lI112|H3A0D20
-3A0D20:lI112|H3A0DCC
-3A0DCC:lI108|H3A0E78
-3A0E78:lI105|H3A0F2C
-3A0F2C:lI99|H3A0FE8
-3A0FE8:lI97|H3A10B4
-3A10B4:lI116|H3A1188
-3A1188:lI105|H3A1254
-3A1254:lI111|H3A1320
-3A1320:lI110|H3A13F4
-3A13F4:lI47|H3A14D0
-3A14D0:lI120|H3A15A4
-3A15A4:lI45|H3A1670
-3A1670:lI116|H3A173C
-3A173C:lI99|H3A17F8
-3A17F8:lI108|N
-3A0BC0:lI116|H3A0C6C
-3A0C6C:lI99|H3A0D18
-3A0D18:lI108|N
-3A0B30:lH3A0BD0|H3A0BDC
-3A0BD0:t2:H3A0C7C,H3A0C84
-3A0C84:lI97|H3A0D30
-3A0D30:lI112|H3A0DDC
-3A0DDC:lI112|H3A0E80
-3A0E80:lI108|H3A0F34
-3A0F34:lI105|H3A0FF0
-3A0FF0:lI99|H3A10BC
-3A10BC:lI97|H3A1190
-3A1190:lI116|H3A125C
-3A125C:lI105|H3A1328
-3A1328:lI111|H3A13FC
-3A13FC:lI110|H3A14D8
-3A14D8:lI47|H3A15AC
-3A15AC:lI120|H3A1678
-3A1678:lI45|H3A1744
-3A1744:lI116|H3A1800
-3A1800:lI97|H3A18BC
-3A18BC:lI114|N
-3A0C7C:lI116|H3A0D28
-3A0D28:lI97|H3A0DD4
-3A0DD4:lI114|N
-3A0BDC:lH3A0C8C|H3A0C98
-3A0C8C:t2:H3A0D38,H3A0D40
-3A0D40:lI97|H3A0DEC
-3A0DEC:lI112|H3A0E90
-3A0E90:lI112|H3A0F44
-3A0F44:lI108|H3A1000
-3A1000:lI105|H3A10CC
-3A10CC:lI99|H3A1198
-3A1198:lI97|H3A1264
-3A1264:lI116|H3A1330
-3A1330:lI105|H3A1404
-3A1404:lI111|H3A14E0
-3A14E0:lI110|H3A15B4
-3A15B4:lI47|H3A1680
-3A1680:lI120|H3A174C
-3A174C:lI45|H3A1808
-3A1808:lI115|H3A18C4
-3A18C4:lI118|H3A1978
-3A1978:lI52|H3A1A2C
-3A1A2C:lI99|H3A1AE0
-3A1AE0:lI114|H3A1BA4
-3A1BA4:lI99|N
-3A0D38:lI115|H3A0DE4
-3A0DE4:lI118|H3A0E88
-3A0E88:lI52|H3A0F3C
-3A0F3C:lI99|H3A0FF8
-3A0FF8:lI114|H3A10C4
-3A10C4:lI99|N
-3A0C98:lH3A0D48|H3A0D54
-3A0D48:t2:H3A0DF4,H3A0DFC
-3A0DFC:lI97|H3A0EA0
-3A0EA0:lI112|H3A0F54
-3A0F54:lI112|H3A1010
-3A1010:lI108|H3A10DC
-3A10DC:lI105|H3A11A8
-3A11A8:lI99|H3A1274
-3A1274:lI97|H3A1338
-3A1338:lI116|H3A140C
-3A140C:lI105|H3A14E8
-3A14E8:lI111|H3A15BC
-3A15BC:lI110|H3A1688
-3A1688:lI47|H3A1754
-3A1754:lI120|H3A1810
-3A1810:lI45|H3A18CC
-3A18CC:lI115|H3A1980
-3A1980:lI118|H3A1A34
-3A1A34:lI52|H3A1AE8
-3A1AE8:lI99|H3A1BAC
-3A1BAC:lI112|H3A1C78
-3A1C78:lI105|H3A1D3C
-3A1D3C:lI111|N
-3A0DF4:lI115|H3A0E98
-3A0E98:lI118|H3A0F4C
-3A0F4C:lI52|H3A1008
-3A1008:lI99|H3A10D4
-3A10D4:lI112|H3A11A0
-3A11A0:lI105|H3A126C
-3A126C:lI111|N
-3A0D54:lH3A0E04|H3A0E10
-3A0E04:t2:H3A0EA8,H3A0EB0
-3A0EB0:lI97|H3A0F64
-3A0F64:lI112|H3A1020
-3A1020:lI112|H3A10E4
-3A10E4:lI108|H3A11B0
-3A11B0:lI105|H3A127C
-3A127C:lI99|H3A1340
-3A1340:lI97|H3A1414
-3A1414:lI116|H3A14F0
-3A14F0:lI105|H3A15C4
-3A15C4:lI111|H3A1690
-3A1690:lI110|H3A175C
-3A175C:lI47|H3A1818
-3A1818:lI120|H3A18D4
-3A18D4:lI45|H3A1988
-3A1988:lI115|H3A1A3C
-3A1A3C:lI116|H3A1AF0
-3A1AF0:lI117|H3A1BB4
-3A1BB4:lI102|H3A1C80
-3A1C80:lI102|H3A1D44
-3A1D44:lI105|H3A1E00
-3A1E00:lI116|N
-3A0EA8:lI115|H3A0F5C
-3A0F5C:lI105|H3A1018
-3A1018:lI116|N
-3A0E10:lH3A0EB8|H3A0EC4
-3A0EB8:t2:H3A0F6C,H3A0F74
-3A0F74:lI97|H3A1030
-3A1030:lI112|H3A10F4
-3A10F4:lI112|H3A11C0
-3A11C0:lI108|H3A1284
-3A1284:lI105|H3A1348
-3A1348:lI99|H3A141C
-3A141C:lI97|H3A14F8
-3A14F8:lI116|H3A15CC
-3A15CC:lI105|H3A1698
-3A1698:lI111|H3A1764
-3A1764:lI110|H3A1820
-3A1820:lI47|H3A18DC
-3A18DC:lI120|H3A1990
-3A1990:lI45|H3A1A44
-3A1A44:lI115|H3A1AF8
-3A1AF8:lI104|H3A1BBC
-3A1BBC:lI97|H3A1C88
-3A1C88:lI114|N
-3A0F6C:lI115|H3A1028
-3A1028:lI104|H3A10EC
-3A10EC:lI97|H3A11B8
-3A11B8:lI114|N
-3A0EC4:lH3A0F7C|H3A0F88
-3A0F7C:t2:H3A1038,H3A1040
-3A1040:lI97|H3A1104
-3A1104:lI112|H3A11C8
-3A11C8:lI112|H3A128C
-3A128C:lI108|H3A1350
-3A1350:lI105|H3A1424
-3A1424:lI99|H3A1500
-3A1500:lI97|H3A15D4
-3A15D4:lI116|H3A16A0
-3A16A0:lI105|H3A176C
-3A176C:lI111|H3A1828
-3A1828:lI110|H3A18E4
-3A18E4:lI47|H3A1998
-3A1998:lI120|H3A1A4C
-3A1A4C:lI45|H3A1B00
-3A1B00:lI115|H3A1BC4
-3A1BC4:lI104|N
-3A1038:lI115|H3A10FC
-3A10FC:lI104|N
-3A0F88:lH3A1048|H3A1054
-3A1048:t2:H3A110C,H3A1114
-3A1114:lI97|H3A11D8
-3A11D8:lI112|H3A1294
-3A1294:lI112|H3A1358
-3A1358:lI108|H3A142C
-3A142C:lI105|H3A1508
-3A1508:lI99|H3A15DC
-3A15DC:lI97|H3A16A8
-3A16A8:lI116|H3A1774
-3A1774:lI105|H3A1830
-3A1830:lI111|H3A18EC
-3A18EC:lI110|H3A19A0
-3A19A0:lI47|H3A1A54
-3A1A54:lI120|H3A1B08
-3A1B08:lI45|H3A1BCC
-3A1BCC:lI110|H3A1C90
-3A1C90:lI101|H3A1D4C
-3A1D4C:lI116|H3A1E08
-3A1E08:lI99|H3A1EC4
-3A1EC4:lI100|H3A1F88
-3A1F88:lI102|N
-3A110C:lI110|H3A11D0
-3A11D0:lI99|N
-3A1054:lH3A111C|H3A1128
-3A111C:t2:H3A11E0,H3A11E8
-3A11E8:lI97|H3A12A4
-3A12A4:lI112|H3A1368
-3A1368:lI112|H3A1434
-3A1434:lI108|H3A1510
-3A1510:lI105|H3A15E4
-3A15E4:lI99|H3A16B0
-3A16B0:lI97|H3A177C
-3A177C:lI116|H3A1838
-3A1838:lI105|H3A18F4
-3A18F4:lI111|H3A19A8
-3A19A8:lI110|H3A1A5C
-3A1A5C:lI47|H3A1B10
-3A1B10:lI120|H3A1BD4
-3A1BD4:lI45|H3A1C98
-3A1C98:lI110|H3A1D54
-3A1D54:lI101|H3A1E10
-3A1E10:lI116|H3A1ECC
-3A1ECC:lI99|H3A1F90
-3A1F90:lI100|H3A2044
-3A2044:lI102|N
-3A11E0:lI99|H3A129C
-3A129C:lI100|H3A1360
-3A1360:lI102|N
-3A1128:lH3A11F0|H3A11FC
-3A11F0:t2:H3A12AC,H3A12B4
-3A12B4:lI97|H3A1378
-3A1378:lI112|H3A1444
-3A1444:lI112|H3A1518
-3A1518:lI108|H3A15EC
-3A15EC:lI105|H3A16B8
-3A16B8:lI99|H3A1784
-3A1784:lI97|H3A1840
-3A1840:lI116|H3A18FC
-3A18FC:lI105|H3A19B0
-3A19B0:lI111|H3A1A64
-3A1A64:lI110|H3A1B18
-3A1B18:lI47|H3A1BDC
-3A1BDC:lI120|H3A1CA0
-3A1CA0:lI45|H3A1D5C
-3A1D5C:lI109|H3A1E18
-3A1E18:lI105|H3A1ED4
-3A1ED4:lI102|N
-3A12AC:lI109|H3A1370
-3A1370:lI105|H3A143C
-3A143C:lI102|N
-3A11FC:lH3A12BC|H3A12C8
-3A12BC:t2:H3A1380,H3A1388
-3A1388:lI97|H3A1454
-3A1454:lI112|H3A1528
-3A1528:lI112|H3A15FC
-3A15FC:lI108|H3A16C8
-3A16C8:lI105|H3A178C
-3A178C:lI99|H3A1848
-3A1848:lI97|H3A1904
-3A1904:lI116|H3A19B8
-3A19B8:lI105|H3A1A6C
-3A1A6C:lI111|H3A1B20
-3A1B20:lI110|H3A1BE4
-3A1BE4:lI47|H3A1CA8
-3A1CA8:lI120|H3A1D64
-3A1D64:lI45|H3A1E20
-3A1E20:lI108|H3A1EDC
-3A1EDC:lI97|H3A1F98
-3A1F98:lI116|H3A204C
-3A204C:lI101|H3A2108
-3A2108:lI120|N
-3A1380:lI108|H3A144C
-3A144C:lI97|H3A1520
-3A1520:lI116|H3A15F4
-3A15F4:lI101|H3A16C0
-3A16C0:lI120|N
-3A12C8:lH3A1390|H3A139C
-3A1390:t2:H3A145C,H3A1464
-3A1464:lI97|H3A1538
-3A1538:lI112|H3A160C
-3A160C:lI112|H3A16D0
-3A16D0:lI108|H3A1794
-3A1794:lI105|H3A1850
-3A1850:lI99|H3A190C
-3A190C:lI97|H3A19C0
-3A19C0:lI116|H3A1A74
-3A1A74:lI105|H3A1B28
-3A1B28:lI111|H3A1BEC
-3A1BEC:lI110|H3A1CB0
-3A1CB0:lI47|H3A1D6C
-3A1D6C:lI120|H3A1E28
-3A1E28:lI45|H3A1EE4
-3A1EE4:lI107|H3A1FA0
-3A1FA0:lI111|H3A2054
-3A2054:lI97|H3A2110
-3A2110:lI110|N
-3A145C:lI115|H3A1530
-3A1530:lI107|H3A1604
-3A1604:lI112|N
-3A139C:lH3A146C|H3A1478
-3A146C:t2:H3A1540,H3A1548
-3A1548:lI97|H3A161C
-3A161C:lI112|H3A16E0
-3A16E0:lI112|H3A179C
-3A179C:lI108|H3A1858
-3A1858:lI105|H3A1914
-3A1914:lI99|H3A19C8
-3A19C8:lI97|H3A1A7C
-3A1A7C:lI116|H3A1B30
-3A1B30:lI105|H3A1BF4
-3A1BF4:lI111|H3A1CB8
-3A1CB8:lI110|H3A1D74
-3A1D74:lI47|H3A1E30
-3A1E30:lI120|H3A1EEC
-3A1EEC:lI45|H3A1FA8
-3A1FA8:lI107|H3A205C
-3A205C:lI111|H3A2118
-3A2118:lI97|H3A21CC
-3A21CC:lI110|N
-3A1540:lI115|H3A1614
-3A1614:lI107|H3A16D8
-3A16D8:lI100|N
-3A1478:lH3A1550|H3A155C
-3A1550:t2:H3A1624,H3A162C
-3A162C:lI97|H3A16F0
-3A16F0:lI112|H3A17AC
-3A17AC:lI112|H3A1860
-3A1860:lI108|H3A191C
-3A191C:lI105|H3A19D0
-3A19D0:lI99|H3A1A84
-3A1A84:lI97|H3A1B38
-3A1B38:lI116|H3A1BFC
-3A1BFC:lI105|H3A1CC0
-3A1CC0:lI111|H3A1D7C
-3A1D7C:lI110|H3A1E38
-3A1E38:lI47|H3A1EF4
-3A1EF4:lI120|H3A1FB0
-3A1FB0:lI45|H3A2064
-3A2064:lI107|H3A2120
-3A2120:lI111|H3A21D4
-3A21D4:lI97|H3A2288
-3A2288:lI110|N
-3A1624:lI115|H3A16E8
-3A16E8:lI107|H3A17A4
-3A17A4:lI116|N
-3A155C:lH3A1634|H3A1640
-3A1634:t2:H3A16F8,H3A1700
-3A1700:lI97|H3A17BC
-3A17BC:lI112|H3A1870
-3A1870:lI112|H3A1924
-3A1924:lI108|H3A19D8
-3A19D8:lI105|H3A1A8C
-3A1A8C:lI99|H3A1B40
-3A1B40:lI97|H3A1C04
-3A1C04:lI116|H3A1CC8
-3A1CC8:lI105|H3A1D84
-3A1D84:lI111|H3A1E40
-3A1E40:lI110|H3A1EFC
-3A1EFC:lI47|H3A1FB8
-3A1FB8:lI120|H3A206C
-3A206C:lI45|H3A2128
-3A2128:lI107|H3A21DC
-3A21DC:lI111|H3A2290
-3A2290:lI97|H3A234C
-3A234C:lI110|N
-3A16F8:lI115|H3A17B4
-3A17B4:lI107|H3A1868
-3A1868:lI109|N
-3A1640:lH3A1708|H3A1714
-3A1708:t2:H3A17C4,H3A17CC
-3A17CC:lI97|H3A1880
-3A1880:lI112|H3A1934
-3A1934:lI112|H3A19E0
-3A19E0:lI108|H3A1A94
-3A1A94:lI105|H3A1B48
-3A1B48:lI99|H3A1C0C
-3A1C0C:lI97|H3A1CD0
-3A1CD0:lI116|H3A1D8C
-3A1D8C:lI105|H3A1E48
-3A1E48:lI111|H3A1F04
-3A1F04:lI110|H3A1FC0
-3A1FC0:lI47|H3A2074
-3A2074:lI120|H3A2130
-3A2130:lI45|H3A21E4
-3A21E4:lI104|H3A2298
-3A2298:lI116|H3A2354
-3A2354:lI116|H3A2410
-3A2410:lI112|H3A24C4
-3A24C4:lI100|H3A2580
-3A2580:lI45|H3A263C
-3A263C:lI99|H3A2700
-3A2700:lI103|H3A27BC
-3A27BC:lI105|N
-3A17C4:lI99|H3A1878
-3A1878:lI103|H3A192C
-3A192C:lI105|N
-3A1714:lH3A17D4|H3A17E0
-3A17D4:t2:H3A1888,H3A1890
-3A1890:lI97|H3A1944
-3A1944:lI112|H3A19F0
-3A19F0:lI112|H3A1A9C
-3A1A9C:lI108|H3A1B50
-3A1B50:lI105|H3A1C14
-3A1C14:lI99|H3A1CD8
-3A1CD8:lI97|H3A1D94
-3A1D94:lI116|H3A1E50
-3A1E50:lI105|H3A1F0C
-3A1F0C:lI111|H3A1FC8
-3A1FC8:lI110|H3A207C
-3A207C:lI47|H3A2138
-3A2138:lI120|H3A21EC
-3A21EC:lI45|H3A22A0
-3A22A0:lI104|H3A235C
-3A235C:lI100|H3A2418
-3A2418:lI102|N
-3A1888:lI104|H3A193C
-3A193C:lI100|H3A19E8
-3A19E8:lI102|N
-3A17E0:lH3A1898|H3A18A4
-3A1898:t2:H3A194C,H3A1954
-3A1954:lI97|H3A1A00
-3A1A00:lI112|H3A1AA4
-3A1AA4:lI112|H3A1B58
-3A1B58:lI108|H3A1C1C
-3A1C1C:lI105|H3A1CE0
-3A1CE0:lI99|H3A1D9C
-3A1D9C:lI97|H3A1E58
-3A1E58:lI116|H3A1F14
-3A1F14:lI105|H3A1FD0
-3A1FD0:lI111|H3A2084
-3A2084:lI110|H3A2140
-3A2140:lI47|H3A21F4
-3A21F4:lI120|H3A22A8
-3A22A8:lI45|H3A2364
-3A2364:lI103|H3A2420
-3A2420:lI122|H3A24CC
-3A24CC:lI105|H3A2588
-3A2588:lI112|N
-3A194C:lI103|H3A19F8
-3A19F8:lI122|N
-3A18A4:lH3A195C|H3A1968
-3A195C:t2:H3A1A08,H3A1A10
-3A1A10:lI97|H3A1AB4
-3A1AB4:lI112|H3A1B68
-3A1B68:lI112|H3A1C2C
-3A1C2C:lI108|H3A1CE8
-3A1CE8:lI105|H3A1DA4
-3A1DA4:lI99|H3A1E60
-3A1E60:lI97|H3A1F1C
-3A1F1C:lI116|H3A1FD8
-3A1FD8:lI105|H3A208C
-3A208C:lI111|H3A2148
-3A2148:lI110|H3A21FC
-3A21FC:lI47|H3A22B0
-3A22B0:lI120|H3A236C
-3A236C:lI45|H3A2428
-3A2428:lI103|H3A24D4
-3A24D4:lI116|H3A2590
-3A2590:lI97|H3A2644
-3A2644:lI114|N
-3A1A08:lI103|H3A1AAC
-3A1AAC:lI116|H3A1B60
-3A1B60:lI97|H3A1C24
-3A1C24:lI114|N
-3A1968:lH3A1A18|H3A1A24
-3A1A18:t2:H3A1ABC,H3A1AC4
-3A1AC4:lI97|H3A1B78
-3A1B78:lI112|H3A1C3C
-3A1C3C:lI112|H3A1CF0
-3A1CF0:lI108|H3A1DAC
-3A1DAC:lI105|H3A1E68
-3A1E68:lI99|H3A1F24
-3A1F24:lI97|H3A1FE0
-3A1FE0:lI116|H3A2094
-3A2094:lI105|H3A2150
-3A2150:lI111|H3A2204
-3A2204:lI110|H3A22B8
-3A22B8:lI47|H3A2374
-3A2374:lI120|H3A2430
-3A2430:lI45|H3A24DC
-3A24DC:lI100|H3A2598
-3A2598:lI118|H3A264C
-3A264C:lI105|N
-3A1ABC:lI100|H3A1B70
-3A1B70:lI118|H3A1C34
-3A1C34:lI105|N
-3A1A24:lH3A1ACC|H3A1AD8
-3A1ACC:t2:H3A1B80,H3A1B88
-3A1B88:lI97|H3A1C4C
-3A1C4C:lI112|H3A1D00
-3A1D00:lI112|H3A1DB4
-3A1DB4:lI108|H3A1E70
-3A1E70:lI105|H3A1F2C
-3A1F2C:lI99|H3A1FE8
-3A1FE8:lI97|H3A209C
-3A209C:lI116|H3A2158
-3A2158:lI105|H3A220C
-3A220C:lI111|H3A22C0
-3A22C0:lI110|H3A237C
-3A237C:lI47|H3A2438
-3A2438:lI120|H3A24E4
-3A24E4:lI45|H3A25A0
-3A25A0:lI100|H3A2654
-3A2654:lI105|H3A2708
-3A2708:lI114|H3A27C4
-3A27C4:lI101|H3A2880
-3A2880:lI99|H3A2944
-3A2944:lI116|H3A2A10
-3A2A10:lI111|H3A2ADC
-3A2ADC:lI114|N
-3A1B80:lI100|H3A1C44
-3A1C44:lI99|H3A1CF8
-3A1CF8:lI114|N
-3A1AD8:lH3A1B90|H3A1B9C
-3A1B90:t2:H3A1C54,H3A1C5C
-3A1C5C:lI97|H3A1D10
-3A1D10:lI112|H3A1DC4
-3A1DC4:lI112|H3A1E78
-3A1E78:lI108|H3A1F34
-3A1F34:lI105|H3A1FF0
-3A1FF0:lI99|H3A20A4
-3A20A4:lI97|H3A2160
-3A2160:lI116|H3A2214
-3A2214:lI105|H3A22C8
-3A22C8:lI111|H3A2384
-3A2384:lI110|H3A2440
-3A2440:lI47|H3A24EC
-3A24EC:lI120|H3A25A8
-3A25A8:lI45|H3A265C
-3A265C:lI100|H3A2710
-3A2710:lI105|H3A27CC
-3A27CC:lI114|H3A2888
-3A2888:lI101|H3A294C
-3A294C:lI99|H3A2A18
-3A2A18:lI116|H3A2AE4
-3A2AE4:lI111|H3A2BB0
-3A2BB0:lI114|N
-3A1C54:lI100|H3A1D08
-3A1D08:lI105|H3A1DBC
-3A1DBC:lI114|N
-3A1B9C:lH3A1C64|H3A1C70
-3A1C64:t2:H3A1D18,H3A1D20
-3A1D20:lI97|H3A1DD4
-3A1DD4:lI112|H3A1E88
-3A1E88:lI112|H3A1F3C
-3A1F3C:lI108|H3A1FF8
-3A1FF8:lI105|H3A20AC
-3A20AC:lI99|H3A2168
-3A2168:lI97|H3A221C
-3A221C:lI116|H3A22D0
-3A22D0:lI105|H3A238C
-3A238C:lI111|H3A2448
-3A2448:lI110|H3A24F4
-3A24F4:lI47|H3A25B0
-3A25B0:lI120|H3A2664
-3A2664:lI45|H3A2718
-3A2718:lI100|H3A27D4
-3A27D4:lI105|H3A2890
-3A2890:lI114|H3A2954
-3A2954:lI101|H3A2A20
-3A2A20:lI99|H3A2AEC
-3A2AEC:lI116|H3A2BB8
-3A2BB8:lI111|H3A2C74
-3A2C74:lI114|N
-3A1D18:lI100|H3A1DCC
-3A1DCC:lI120|H3A1E80
-3A1E80:lI114|N
-3A1C70:lH3A1D28|H3A1D34
-3A1D28:t2:H3A1DDC,H3A1DE4
-3A1DE4:lI97|H3A1E98
-3A1E98:lI112|H3A1F4C
-3A1F4C:lI112|H3A2000
-3A2000:lI108|H3A20B4
-3A20B4:lI105|H3A2170
-3A2170:lI99|H3A2224
-3A2224:lI97|H3A22D8
-3A22D8:lI116|H3A2394
-3A2394:lI105|H3A2450
-3A2450:lI111|H3A24FC
-3A24FC:lI110|H3A25B8
-3A25B8:lI47|H3A266C
-3A266C:lI120|H3A2720
-3A2720:lI45|H3A27DC
-3A27DC:lI99|H3A2898
-3A2898:lI115|H3A295C
-3A295C:lI104|N
-3A1DDC:lI99|H3A1E90
-3A1E90:lI115|H3A1F44
-3A1F44:lI104|N
-3A1D34:lH3A1DEC|H3A1DF8
-3A1DEC:t2:H3A1EA0,H3A1EA8
-3A1EA8:lI97|H3A1F5C
-3A1F5C:lI112|H3A2010
-3A2010:lI112|H3A20C4
-3A20C4:lI108|H3A2178
-3A2178:lI105|H3A222C
-3A222C:lI99|H3A22E0
-3A22E0:lI97|H3A239C
-3A239C:lI116|H3A2458
-3A2458:lI105|H3A2504
-3A2504:lI111|H3A25C0
-3A25C0:lI110|H3A2674
-3A2674:lI47|H3A2728
-3A2728:lI120|H3A27E4
-3A27E4:lI45|H3A28A0
-3A28A0:lI99|H3A2964
-3A2964:lI112|H3A2A28
-3A2A28:lI105|H3A2AF4
-3A2AF4:lI111|N
-3A1EA0:lI99|H3A1F54
-3A1F54:lI112|H3A2008
-3A2008:lI105|H3A20BC
-3A20BC:lI111|N
-3A1DF8:lH3A1EB0|H3A1EBC
-3A1EB0:t2:H3A1F64,H3A1F6C
-3A1F6C:lI97|H3A2018
-3A2018:lI112|H3A20CC
-3A20CC:lI112|H3A2180
-3A2180:lI108|H3A2234
-3A2234:lI105|H3A22E8
-3A22E8:lI99|H3A23A4
-3A23A4:lI97|H3A2460
-3A2460:lI116|H3A250C
-3A250C:lI105|H3A25C8
-3A25C8:lI111|H3A267C
-3A267C:lI110|H3A2730
-3A2730:lI47|H3A27EC
-3A27EC:lI120|H3A28A8
-3A28A8:lI45|H3A296C
-3A296C:lI99|H3A2A30
-3A2A30:lI111|H3A2AFC
-3A2AFC:lI109|H3A2BC0
-3A2BC0:lI112|H3A2C7C
-3A2C7C:lI114|H3A2D2C
-3A2D2C:lI101|H3A2DD4
-3A2DD4:lI115|H3A2E6C
-3A2E6C:lI115|N
-3A1F64:lI90|N
-3A1EBC:lH3A1F74|H3A1F80
-3A1F74:t2:H3A2020,H3A2028
-3A2028:lI97|H3A20DC
-3A20DC:lI112|H3A2190
-3A2190:lI112|H3A223C
-3A223C:lI108|H3A22F0
-3A22F0:lI105|H3A23AC
-3A23AC:lI99|H3A2468
-3A2468:lI97|H3A2514
-3A2514:lI116|H3A25D0
-3A25D0:lI105|H3A2684
-3A2684:lI111|H3A2738
-3A2738:lI110|H3A27F4
-3A27F4:lI47|H3A28B0
-3A28B0:lI120|H3A2974
-3A2974:lI45|H3A2A38
-3A2A38:lI99|H3A2B04
-3A2B04:lI100|H3A2BC8
-3A2BC8:lI108|H3A2C84
-3A2C84:lI105|H3A2D34
-3A2D34:lI110|H3A2DDC
-3A2DDC:lI107|N
-3A2020:lI118|H3A20D4
-3A20D4:lI99|H3A2188
-3A2188:lI100|N
-3A1F80:lH3A2030|H3A203C
-3A2030:t2:H3A20E4,H3A20EC
-3A20EC:lI97|H3A21A0
-3A21A0:lI112|H3A224C
-3A224C:lI112|H3A2300
-3A2300:lI108|H3A23BC
-3A23BC:lI105|H3A2470
-3A2470:lI99|H3A251C
-3A251C:lI97|H3A25D8
-3A25D8:lI116|H3A268C
-3A268C:lI105|H3A2740
-3A2740:lI111|H3A27FC
-3A27FC:lI110|H3A28B8
-3A28B8:lI47|H3A297C
-3A297C:lI120|H3A2A40
-3A2A40:lI45|H3A2B0C
-3A2B0C:lI98|H3A2BD0
-3A2BD0:lI99|H3A2C8C
-3A2C8C:lI112|H3A2D3C
-3A2D3C:lI105|H3A2DE4
-3A2DE4:lI111|N
-3A20E4:lI98|H3A2198
-3A2198:lI99|H3A2244
-3A2244:lI112|H3A22F8
-3A22F8:lI105|H3A23B4
-3A23B4:lI111|N
-3A203C:lH3A20F4|H3A2100
-3A20F4:t2:H3A21A8,H3A21B0
-3A21B0:lI97|H3A225C
-3A225C:lI112|H3A2310
-3A2310:lI112|H3A23C4
-3A23C4:lI108|H3A2478
-3A2478:lI105|H3A2524
-3A2524:lI99|H3A25E0
-3A25E0:lI97|H3A2694
-3A2694:lI116|H3A2748
-3A2748:lI105|H3A2804
-3A2804:lI111|H3A28C0
-3A28C0:lI110|H3A2984
-3A2984:lI47|H3A2A48
-3A2A48:lI114|H3A2B14
-3A2B14:lI116|H3A2BD8
-3A2BD8:lI102|N
-3A21A8:lI114|H3A2254
-3A2254:lI116|H3A2308
-3A2308:lI102|N
-3A2100:lH3A21B8|H3A21C4
-3A21B8:t2:H3A2264,H3A226C
-3A226C:lI97|H3A2320
-3A2320:lI112|H3A23D4
-3A23D4:lI112|H3A2480
-3A2480:lI108|H3A252C
-3A252C:lI105|H3A25E8
-3A25E8:lI99|H3A269C
-3A269C:lI97|H3A2750
-3A2750:lI116|H3A280C
-3A280C:lI105|H3A28C8
-3A28C8:lI111|H3A298C
-3A298C:lI110|H3A2A50
-3A2A50:lI47|H3A2B1C
-3A2B1C:lI112|H3A2BE0
-3A2BE0:lI111|H3A2C94
-3A2C94:lI119|H3A2D44
-3A2D44:lI101|H3A2DEC
-3A2DEC:lI114|H3A2E74
-3A2E74:lI112|H3A2EEC
-3A2EEC:lI111|H3A2F64
-3A2F64:lI105|H3A2FD4
-3A2FD4:lI110|H3A303C
-3A303C:lI116|N
-3A2264:lI112|H3A2318
-3A2318:lI112|H3A23CC
-3A23CC:lI116|N
-3A21C4:lH3A2274|H3A2280
-3A2274:t2:H3A2328,H3A2330
-3A2330:lI97|H3A23E4
-3A23E4:lI112|H3A2488
-3A2488:lI112|H3A2534
-3A2534:lI108|H3A25F0
-3A25F0:lI105|H3A26A4
-3A26A4:lI99|H3A2758
-3A2758:lI97|H3A2814
-3A2814:lI116|H3A28D0
-3A28D0:lI105|H3A2994
-3A2994:lI111|H3A2A58
-3A2A58:lI110|H3A2B24
-3A2B24:lI47|H3A2BE8
-3A2BE8:lI112|H3A2C9C
-3A2C9C:lI111|H3A2D4C
-3A2D4C:lI115|H3A2DF4
-3A2DF4:lI116|H3A2E7C
-3A2E7C:lI115|H3A2EF4
-3A2EF4:lI99|H3A2F6C
-3A2F6C:lI114|H3A2FDC
-3A2FDC:lI105|H3A3044
-3A3044:lI112|H3A30A4
-3A30A4:lI116|N
-3A2328:lI97|H3A23DC
-3A23DC:lI105|N
-3A2280:lH3A2338|H3A2344
-3A2338:t2:H3A23EC,H3A23F4
-3A23F4:lI97|H3A2498
-3A2498:lI112|H3A2544
-3A2544:lI112|H3A25F8
-3A25F8:lI108|H3A26AC
-3A26AC:lI105|H3A2760
-3A2760:lI99|H3A281C
-3A281C:lI97|H3A28D8
-3A28D8:lI116|H3A299C
-3A299C:lI105|H3A2A60
-3A2A60:lI111|H3A2B2C
-3A2B2C:lI110|H3A2BF0
-3A2BF0:lI47|H3A2CA4
-3A2CA4:lI112|H3A2D54
-3A2D54:lI111|H3A2DFC
-3A2DFC:lI115|H3A2E84
-3A2E84:lI116|H3A2EFC
-3A2EFC:lI115|H3A2F74
-3A2F74:lI99|H3A2FE4
-3A2FE4:lI114|H3A304C
-3A304C:lI105|H3A30AC
-3A30AC:lI112|H3A3104
-3A3104:lI116|N
-3A23EC:lI101|H3A2490
-3A2490:lI112|H3A253C
-3A253C:lI115|N
-3A2344:lH3A23FC|H3A2408
-3A23FC:t2:H3A24A0,H3A24A8
-3A24A8:lI97|H3A2554
-3A2554:lI112|H3A2600
-3A2600:lI112|H3A26B4
-3A26B4:lI108|H3A2768
-3A2768:lI105|H3A2824
-3A2824:lI99|H3A28E0
-3A28E0:lI97|H3A29A4
-3A29A4:lI116|H3A2A68
-3A2A68:lI105|H3A2B34
-3A2B34:lI111|H3A2BF8
-3A2BF8:lI110|H3A2CAC
-3A2CAC:lI47|H3A2D5C
-3A2D5C:lI112|H3A2E04
-3A2E04:lI111|H3A2E8C
-3A2E8C:lI115|H3A2F04
-3A2F04:lI116|H3A2F7C
-3A2F7C:lI115|H3A2FEC
-3A2FEC:lI99|H3A3054
-3A3054:lI114|H3A30B4
-3A30B4:lI105|H3A310C
-3A310C:lI112|H3A315C
-3A315C:lI116|N
-3A24A0:lI112|H3A254C
-3A254C:lI115|N
-3A2408:lH3A24B0|H3A24BC
-3A24B0:t2:H3A255C,H3A2564
-3A2564:lI97|H3A2610
-3A2610:lI112|H3A26C4
-3A26C4:lI112|H3A2770
-3A2770:lI108|H3A282C
-3A282C:lI105|H3A28E8
-3A28E8:lI99|H3A29AC
-3A29AC:lI97|H3A2A70
-3A2A70:lI116|H3A2B3C
-3A2B3C:lI105|H3A2C00
-3A2C00:lI111|H3A2CB4
-3A2CB4:lI110|H3A2D64
-3A2D64:lI47|H3A2E0C
-3A2E0C:lI112|H3A2E94
-3A2E94:lI100|H3A2F0C
-3A2F0C:lI102|N
-3A255C:lI112|H3A2608
-3A2608:lI100|H3A26BC
-3A26BC:lI102|N
-3A24BC:lH3A256C|H3A2578
-3A256C:t2:H3A2618,H3A2620
-3A2620:lI97|H3A26D4
-3A26D4:lI112|H3A2780
-3A2780:lI112|H3A2834
-3A2834:lI108|H3A28F0
-3A28F0:lI105|H3A29B4
-3A29B4:lI99|H3A2A78
-3A2A78:lI97|H3A2B44
-3A2B44:lI116|H3A2C08
-3A2C08:lI105|H3A2CBC
-3A2CBC:lI111|H3A2D6C
-3A2D6C:lI110|H3A2E14
-3A2E14:lI47|H3A2E9C
-3A2E9C:lI111|H3A2F14
-3A2F14:lI100|H3A2F84
-3A2F84:lI97|N
-3A2618:lI111|H3A26CC
-3A26CC:lI100|H3A2778
-3A2778:lI97|N
-3A2578:lH3A2628|H3A2634
-3A2628:t2:H3A26DC,H3A26E4
-3A26E4:lI97|H3A2790
-3A2790:lI112|H3A2844
-3A2844:lI112|H3A28F8
-3A28F8:lI108|H3A29BC
-3A29BC:lI105|H3A2A80
-3A2A80:lI99|H3A2B4C
-3A2B4C:lI97|H3A2C10
-3A2C10:lI116|H3A2CC4
-3A2CC4:lI105|H3A2D74
-3A2D74:lI111|H3A2E1C
-3A2E1C:lI110|H3A2EA4
-3A2EA4:lI47|H3A2F1C
-3A2F1C:lI111|H3A2F8C
-3A2F8C:lI99|H3A2FF4
-3A2FF4:lI116|H3A305C
-3A305C:lI101|H3A30BC
-3A30BC:lI116|H3A3114
-3A3114:lI45|H3A3164
-3A3164:lI115|H3A31AC
-3A31AC:lI116|H3A31F4
-3A31F4:lI114|H3A323C
-3A323C:lI101|H3A3284
-3A3284:lI97|H3A32CC
-3A32CC:lI109|N
-3A26DC:lI98|H3A2788
-3A2788:lI105|H3A283C
-3A283C:lI110|N
-3A2634:lH3A26EC|H3A26F8
-3A26EC:t2:H3A2798,H3A27A0
-3A27A0:lI97|H3A2854
-3A2854:lI112|H3A2908
-3A2908:lI112|H3A29C4
-3A29C4:lI108|H3A2A88
-3A2A88:lI105|H3A2B54
-3A2B54:lI99|H3A2C18
-3A2C18:lI97|H3A2CCC
-3A2CCC:lI116|H3A2D7C
-3A2D7C:lI105|H3A2E24
-3A2E24:lI111|H3A2EAC
-3A2EAC:lI110|H3A2F24
-3A2F24:lI47|H3A2F94
-3A2F94:lI111|H3A2FFC
-3A2FFC:lI99|H3A3064
-3A3064:lI116|H3A30C4
-3A30C4:lI101|H3A311C
-3A311C:lI116|H3A316C
-3A316C:lI45|H3A31B4
-3A31B4:lI115|H3A31FC
-3A31FC:lI116|H3A3244
-3A3244:lI114|H3A328C
-3A328C:lI101|H3A32D4
-3A32D4:lI97|H3A3314
-3A3314:lI109|N
-3A2798:lI100|H3A284C
-3A284C:lI109|H3A2900
-3A2900:lI115|N
-3A26F8:lH3A27A8|H3A27B4
-3A27A8:t2:H3A285C,H3A2864
-3A2864:lI97|H3A2918
-3A2918:lI112|H3A29D4
-3A29D4:lI112|H3A2A90
-3A2A90:lI108|H3A2B5C
-3A2B5C:lI105|H3A2C20
-3A2C20:lI99|H3A2CD4
-3A2CD4:lI97|H3A2D84
-3A2D84:lI116|H3A2E2C
-3A2E2C:lI105|H3A2EB4
-3A2EB4:lI111|H3A2F2C
-3A2F2C:lI110|H3A2F9C
-3A2F9C:lI47|H3A3004
-3A3004:lI111|H3A306C
-3A306C:lI99|H3A30CC
-3A30CC:lI116|H3A3124
-3A3124:lI101|H3A3174
-3A3174:lI116|H3A31BC
-3A31BC:lI45|H3A3204
-3A3204:lI115|H3A324C
-3A324C:lI116|H3A3294
-3A3294:lI114|H3A32DC
-3A32DC:lI101|H3A331C
-3A331C:lI97|H3A334C
-3A334C:lI109|N
-3A285C:lI108|H3A2910
-3A2910:lI104|H3A29CC
-3A29CC:lI97|N
-3A27B4:lH3A286C|H3A2878
-3A286C:t2:H3A2920,H3A2928
-3A2928:lI97|H3A29E4
-3A29E4:lI112|H3A2AA0
-3A2AA0:lI112|H3A2B64
-3A2B64:lI108|H3A2C28
-3A2C28:lI105|H3A2CDC
-3A2CDC:lI99|H3A2D8C
-3A2D8C:lI97|H3A2E34
-3A2E34:lI116|H3A2EBC
-3A2EBC:lI105|H3A2F34
-3A2F34:lI111|H3A2FA4
-3A2FA4:lI110|H3A300C
-3A300C:lI47|H3A3074
-3A3074:lI111|H3A30D4
-3A30D4:lI99|H3A312C
-3A312C:lI116|H3A317C
-3A317C:lI101|H3A31C4
-3A31C4:lI116|H3A320C
-3A320C:lI45|H3A3254
-3A3254:lI115|H3A329C
-3A329C:lI116|H3A32E4
-3A32E4:lI114|H3A3324
-3A3324:lI101|H3A3354
-3A3354:lI97|H3A337C
-3A337C:lI109|N
-3A2920:lI108|H3A29DC
-3A29DC:lI122|H3A2A98
-3A2A98:lI104|N
-3A2878:lH3A2930|H3A293C
-3A2930:t2:H3A29EC,H3A29F4
-3A29F4:lI97|H3A2AB0
-3A2AB0:lI112|H3A2B74
-3A2B74:lI112|H3A2C30
-3A2C30:lI108|H3A2CE4
-3A2CE4:lI105|H3A2D94
-3A2D94:lI99|H3A2E3C
-3A2E3C:lI97|H3A2EC4
-3A2EC4:lI116|H3A2F3C
-3A2F3C:lI105|H3A2FAC
-3A2FAC:lI111|H3A3014
-3A3014:lI110|H3A307C
-3A307C:lI47|H3A30DC
-3A30DC:lI111|H3A3134
-3A3134:lI99|H3A3184
-3A3184:lI116|H3A31CC
-3A31CC:lI101|H3A3214
-3A3214:lI116|H3A325C
-3A325C:lI45|H3A32A4
-3A32A4:lI115|H3A32EC
-3A32EC:lI116|H3A332C
-3A332C:lI114|H3A335C
-3A335C:lI101|H3A3384
-3A3384:lI97|H3A33A4
-3A33A4:lI109|N
-3A29EC:lI101|H3A2AA8
-3A2AA8:lI120|H3A2B6C
-3A2B6C:lI101|N
-3A293C:lH3A29FC|H3A2A08
-3A29FC:t2:H3A2AB8,H3A2AC0
-3A2AC0:lI97|H3A2B84
-3A2B84:lI112|H3A2C40
-3A2C40:lI112|H3A2CF4
-3A2CF4:lI108|H3A2DA4
-3A2DA4:lI105|H3A2E44
-3A2E44:lI99|H3A2ECC
-3A2ECC:lI97|H3A2F44
-3A2F44:lI116|H3A2FB4
-3A2FB4:lI105|H3A301C
-3A301C:lI111|H3A3084
-3A3084:lI110|H3A30E4
-3A30E4:lI47|H3A313C
-3A313C:lI111|H3A318C
-3A318C:lI99|H3A31D4
-3A31D4:lI116|H3A321C
-3A321C:lI101|H3A3264
-3A3264:lI116|H3A32AC
-3A32AC:lI45|H3A32F4
-3A32F4:lI115|H3A3334
-3A3334:lI116|H3A3364
-3A3364:lI114|H3A338C
-3A338C:lI101|H3A33AC
-3A33AC:lI97|H3A33C4
-3A33C4:lI109|N
-3A2AB8:lI99|H3A2B7C
-3A2B7C:lI108|H3A2C38
-3A2C38:lI97|H3A2CEC
-3A2CEC:lI115|H3A2D9C
-3A2D9C:lI115|N
-3A2A08:lH3A2AC8|H3A2AD4
-3A2AC8:t2:H3A2B8C,H3A2B94
-3A2B94:lI97|H3A2C50
-3A2C50:lI112|H3A2D04
-3A2D04:lI112|H3A2DAC
-3A2DAC:lI108|H3A2E4C
-3A2E4C:lI105|H3A2ED4
-3A2ED4:lI99|H3A2F4C
-3A2F4C:lI97|H3A2FBC
-3A2FBC:lI116|H3A3024
-3A3024:lI105|H3A308C
-3A308C:lI111|H3A30EC
-3A30EC:lI110|H3A3144
-3A3144:lI47|H3A3194
-3A3194:lI109|H3A31DC
-3A31DC:lI115|H3A3224
-3A3224:lI119|H3A326C
-3A326C:lI111|H3A32B4
-3A32B4:lI114|H3A32FC
-3A32FC:lI100|N
-3A2B8C:lI100|H3A2C48
-3A2C48:lI111|H3A2CFC
-3A2CFC:lI99|N
-3A2AD4:lH3A2B9C|H3A2BA8
-3A2B9C:t2:H3A2C58,H3A2C60
-3A2C60:lI97|H3A2D14
-3A2D14:lI112|H3A2DBC
-3A2DBC:lI112|H3A2E54
-3A2E54:lI108|H3A2EDC
-3A2EDC:lI105|H3A2F54
-3A2F54:lI99|H3A2FC4
-3A2FC4:lI97|H3A302C
-3A302C:lI116|H3A3094
-3A3094:lI105|H3A30F4
-3A30F4:lI111|H3A314C
-3A314C:lI110|H3A319C
-3A319C:lI47|H3A31E4
-3A31E4:lI109|H3A322C
-3A322C:lI97|H3A3274
-3A3274:lI99|H3A32BC
-3A32BC:lI45|H3A3304
-3A3304:lI99|H3A333C
-3A333C:lI111|H3A336C
-3A336C:lI109|H3A3394
-3A3394:lI112|H3A33B4
-3A33B4:lI97|H3A33CC
-3A33CC:lI99|H3A33DC
-3A33DC:lI116|H3A33EC
-3A33EC:lI112|H3A33FC
-3A33FC:lI114|H3A340C
-3A340C:lI111|N
-3A2C58:lI99|H3A2D0C
-3A2D0C:lI112|H3A2DB4
-3A2DB4:lI116|N
-3A2BA8:lH3A2C68|N
-3A2C68:t2:H3A2D1C,H3A2D24
-3A2D24:lI97|H3A2DCC
-3A2DCC:lI112|H3A2E64
-3A2E64:lI112|H3A2EE4
-3A2EE4:lI108|H3A2F5C
-3A2F5C:lI105|H3A2FCC
-3A2FCC:lI99|H3A3034
-3A3034:lI97|H3A309C
-3A309C:lI116|H3A30FC
-3A30FC:lI105|H3A3154
-3A3154:lI111|H3A31A4
-3A31A4:lI110|H3A31EC
-3A31EC:lI47|H3A3234
-3A3234:lI109|H3A327C
-3A327C:lI97|H3A32C4
-3A32C4:lI99|H3A330C
-3A330C:lI45|H3A3344
-3A3344:lI98|H3A3374
-3A3374:lI105|H3A339C
-3A339C:lI110|H3A33BC
-3A33BC:lI104|H3A33D4
-3A33D4:lI101|H3A33E4
-3A33E4:lI120|H3A33F4
-3A33F4:lI52|H3A3404
-3A3404:lI48|N
-3A2D1C:lI104|H3A2DC4
-3A2DC4:lI113|H3A2E5C
-3A2E5C:lI120|N
-39DC28:lH39DC68|H39DC74
-39DC68:t2:A4:port,I8888
-39DC74:lH39DCA8|H39DCB4
-39DCA8:t2:AC:bind_address,H39DCF8
-39DCF8:t4:I127,I0,I0,I1
-39DCB4:lH39DD0C|H39DD18
-39DD0C:t2:AB:server_name,H39DD6C
-39DD6C:lI108|H39DDE4
-39DDE4:lI111|H39DE5C
-39DE5C:lI99|H39DEE4
-39DEE4:lI97|H39DF6C
-39DF6C:lI108|H39E00C
-39E00C:lI104|H39E0B4
-39E0B4:lI111|H39E16C
-39E16C:lI115|H39E238
-39E238:lI116|N
-39DD18:lH39DD74|H39DD80
-39DD74:t2:AE:max_header_siz,I1024
-39DD80:lH39DDEC|H39DDF8
-39DDEC:t2:A11:max_header_action,A8:reply414
-39DDF8:lH39DE64|H39DE70
-39DE64:t2:A8:com_type,A7:ip_comm
-39DE70:lH39DEEC|H39DEF8
-39DEEC:t2:A7:modules,H39DF74
-39DF74:lA9:mod_alias|H39E014
-39E014:lA8:mod_auth|H39E0BC
-39E0BC:lA7:mod_esi|H39E174
-39E174:lAB:mod_actions|H39E240
-39E240:lA7:mod_cgi|H39E324
-39E324:lAB:mod_include|H39E418
-39E418:lA7:mod_dir|H39E51C
-39E51C:lA7:mod_get|H39E634
-39E634:lA8:mod_head|H39E748
-39E748:lA7:mod_log|H39E85C
-39E85C:lAC:mod_disk_log|N
-39DEF8:lH39DF7C|H39DF88
-39DF7C:t2:AF:directory_index,H39E01C
-39E01C:lH39E0C4|N
-39E0C4:lI105|H39E17C
-39E17C:lI110|H39E248
-39E248:lI100|H39E32C
-39E32C:lI101|H39E420
-39E420:lI120|H39E524
-39E524:lI46|H39E63C
-39E63C:lI104|H39E750
-39E750:lI116|H39E864
-39E864:lI109|H39E978
-39E978:lI108|N
-39DF88:lH39E024|H39E030
-39E024:t2:AC:default_type,H39E0CC
-39E0CC:lI116|H39E184
-39E184:lI101|H39E250
-39E250:lI120|H39E334
-39E334:lI116|H39E428
-39E428:lI47|H39E52C
-39E52C:lI112|H39E644
-39E644:lI108|H39E758
-39E758:lI97|H39E86C
-39E86C:lI105|H39E980
-39E980:lI110|N
-39E030:lH39E0D4|H39E0E0
-39E0D4:t2:A10:erl_script_alias,H39E18C
-39E18C:t2:H39E258,H39E260
-39E260:lH39E344|N
-39E344:lI119|H39E438
-39E438:lI101|H39E53C
-39E53C:lI98|H39E654
-39E654:lI116|H39E768
-39E768:lI111|H39E87C
-39E87C:lI111|H39E990
-39E990:lI108|N
-39E258:lI47|H39E33C
-39E33C:lI119|H39E430
-39E430:lI101|H39E534
-39E534:lI98|H39E64C
-39E64C:lI116|H39E760
-39E760:lI111|H39E874
-39E874:lI111|H39E988
-39E988:lI108|N
-39E0E0:lH39E198|H39E1A4
-39E198:t2:A5:alias,H39E268
-39E268:t2:H39E34C,H39E354
-39E354:lI47|H39E448
-39E448:lI99|H39E54C
-39E54C:lI108|H39E664
-39E664:lI101|H39E778
-39E778:lI97|H39E88C
-39E88C:lI114|H39E9A0
-39E9A0:lI99|H39EA94
-39EA94:lI97|H39EB88
-39EB88:lI115|H39EC7C
-39EC7C:lI101|H39ED70
-39ED70:lI47|H39EE4C
-39EE4C:lI111|H39EF20
-39EF20:lI116|H39EFFC
-39EFFC:lI112|H39F0E0
-39F0E0:lI47|H39F1B4
-39F1B4:lI101|H39F288
-39F288:lI114|H39F344
-39F344:lI116|H39F408
-39F408:lI115|H39F4D4
-39F4D4:lI47|H39F5A8
-39F5A8:lI108|H39F67C
-39F67C:lI105|H39F750
-39F750:lI98|H39F824
-39F824:lI47|H39F908
-39F908:lI111|H39F9E4
-39F9E4:lI98|H39FAC0
-39FAC0:lI115|H39FB9C
-39FB9C:lI101|H39FC68
-39FC68:lI114|H39FD2C
-39FD2C:lI118|H39FDF8
-39FDF8:lI101|H39FEB4
-39FEB4:lI114|H39FF70
-39FF70:lI47|H3A0024
-3A0024:lI112|H3A00D8
-3A00D8:lI114|H3A0184
-3A0184:lI105|H3A0238
-3A0238:lI118|H3A02F4
-3A02F4:lI47|H3A03A8
-3A03A8:lI99|H3A0444
-3A0444:lI114|H3A04E8
-3A04E8:lI97|H3A058C
-3A058C:lI115|H3A0638
-3A0638:lI104|H3A06EC
-3A06EC:lI100|H3A0798
-3A0798:lI117|H3A083C
-3A083C:lI109|H3A08C8
-3A08C8:lI112|H3A095C
-3A095C:lI95|H3A09F0
-3A09F0:lI118|H3A0A8C
-3A0A8C:lI105|H3A0B38
-3A0B38:lI101|H3A0BE4
-3A0BE4:lI119|H3A0CA0
-3A0CA0:lI101|H3A0D5C
-3A0D5C:lI114|N
-39E34C:lI47|H39E440
-39E440:lI99|H39E544
-39E544:lI114|H39E65C
-39E65C:lI97|H39E770
-39E770:lI115|H39E884
-39E884:lI104|H39E998
-39E998:lI100|H39EA8C
-39EA8C:lI117|H39EB80
-39EB80:lI109|H39EC74
-39EC74:lI112|H39ED68
-39ED68:lI95|H39EE44
-39EE44:lI118|H39EF18
-39EF18:lI105|H39EFF4
-39EFF4:lI101|H39F0D8
-39F0D8:lI119|H39F1AC
-39F1AC:lI101|H39F280
-39F280:lI114|N
-39E1A4:lH39E274|H39E280
-39E274:t2:A5:alias,H39E35C
-39E35C:t2:H39E450,H39E458
-39E458:lI47|H39E55C
-39E55C:lI99|H39E674
-39E674:lI108|H39E788
-39E788:lI101|H39E89C
-39E89C:lI97|H39E9B0
-39E9B0:lI114|H39EAA4
-39EAA4:lI99|H39EB98
-39EB98:lI97|H39EC8C
-39EC8C:lI115|H39ED80
-39ED80:lI101|H39EE5C
-39EE5C:lI47|H39EF30
-39EF30:lI111|H39F00C
-39F00C:lI116|H39F0F0
-39F0F0:lI112|H39F1C4
-39F1C4:lI47|H39F298
-39F298:lI101|H39F354
-39F354:lI114|H39F418
-39F418:lI116|H39F4E4
-39F4E4:lI115|H39F5B0
-39F5B0:lI47|H39F684
-39F684:lI101|H39F758
-39F758:lI114|H39F82C
-39F82C:lI116|H39F910
-39F910:lI115|H39F9EC
-39F9EC:lI47|H39FAC8
-39FAC8:lI100|H39FBA4
-39FBA4:lI111|H39FC70
-39FC70:lI99|H39FD34
-39FD34:lI47|H39FE00
-39FE00:lI104|H39FEBC
-39FEBC:lI116|H39FF78
-39FF78:lI109|H3A002C
-3A002C:lI108|N
-39E450:lI47|H39E554
-39E554:lI99|H39E66C
-39E66C:lI114|H39E780
-39E780:lI97|H39E894
-39E894:lI115|H39E9A8
-39E9A8:lI104|H39EA9C
-39EA9C:lI100|H39EB90
-39EB90:lI117|H39EC84
-39EC84:lI109|H39ED78
-39ED78:lI112|H39EE54
-39EE54:lI95|H39EF28
-39EF28:lI101|H39F004
-39F004:lI114|H39F0E8
-39F0E8:lI116|H39F1BC
-39F1BC:lI115|H39F290
-39F290:lI95|H39F34C
-39F34C:lI100|H39F410
-39F410:lI111|H39F4DC
-39F4DC:lI99|N
-39E280:lH39E368|H39E374
-39E368:t2:A5:alias,H39E460
-39E460:t2:H39E564,H39E56C
-39E56C:lI47|H39E684
-39E684:lI99|H39E798
-39E798:lI108|H39E8AC
-39E8AC:lI101|H39E9C0
-39E9C0:lI97|H39EAB4
-39EAB4:lI114|H39EBA8
-39EBA8:lI99|H39EC9C
-39EC9C:lI97|H39ED90
-39ED90:lI115|H39EE6C
-39EE6C:lI101|H39EF40
-39EF40:lI47|H39F01C
-39F01C:lI111|H39F100
-39F100:lI116|H39F1D4
-39F1D4:lI112|H39F2A0
-39F2A0:lI47|H39F35C
-39F35C:lI101|H39F420
-39F420:lI114|H39F4EC
-39F4EC:lI116|H39F5B8
-39F5B8:lI115|H39F68C
-39F68C:lI47|H39F760
-39F760:lI108|H39F834
-39F834:lI105|H39F918
-39F918:lI98|H39F9F4
-39F9F4:lI47|H39FAD0
-39FAD0:lI111|H39FBAC
-39FBAC:lI98|H39FC78
-39FC78:lI115|H39FD3C
-39FD3C:lI101|H39FE08
-39FE08:lI114|H39FEC4
-39FEC4:lI118|H39FF80
-39FF80:lI101|H3A0034
-3A0034:lI114|H3A00E0
-3A00E0:lI47|H3A018C
-3A018C:lI100|H3A0240
-3A0240:lI111|H3A02FC
-3A02FC:lI99|H3A03B0
-3A03B0:lI47|H3A044C
-3A044C:lI104|H3A04F0
-3A04F0:lI116|H3A0594
-3A0594:lI109|H3A0640
-3A0640:lI108|N
-39E564:lI47|H39E67C
-39E67C:lI99|H39E790
-39E790:lI114|H39E8A4
-39E8A4:lI97|H39E9B8
-39E9B8:lI115|H39EAAC
-39EAAC:lI104|H39EBA0
-39EBA0:lI100|H39EC94
-39EC94:lI117|H39ED88
-39ED88:lI109|H39EE64
-39EE64:lI112|H39EF38
-39EF38:lI95|H39F014
-39F014:lI100|H39F0F8
-39F0F8:lI111|H39F1CC
-39F1CC:lI99|N
-39E374:lH39E46C|N
-39E46C:t2:A10:erl_script_alias,H39E574
-39E574:t2:H39E68C,H39E694
-39E694:lH39E7A8|N
-39E7A8:lI99|H39E8BC
-39E8BC:lI114|H39E9D0
-39E9D0:lI97|H39EAC4
-39EAC4:lI115|H39EBB8
-39EBB8:lI104|H39ECAC
-39ECAC:lI100|H39EDA0
-39EDA0:lI117|H39EE74
-39EE74:lI109|H39EF48
-39EF48:lI112|H39F024
-39F024:lI95|H39F108
-39F108:lI118|H39F1DC
-39F1DC:lI105|H39F2A8
-39F2A8:lI101|H39F364
-39F364:lI119|H39F428
-39F428:lI101|H39F4F4
-39F4F4:lI114|N
-39E68C:lI47|H39E7A0
-39E7A0:lI99|H39E8B4
-39E8B4:lI100|H39E9C8
-39E9C8:lI118|H39EABC
-39EABC:lI95|H39EBB0
-39EBB0:lI101|H39ECA4
-39ECA4:lI114|H39ED98
-39ED98:lI108|N
-39DB58:lN|H39DB9C
-39DB9C:lH39D9FC|H39DBEC
-39D9FC:t4:I127,I0,I0,I1
-39DBEC:lI8888|N
-3A3E20:lH3A3DFC|H3A3704
-3A3DFC:t8:A5:child,P<0.46.0>,H39DAC8,H39DAD8,A9:permanent,I2000,A6:worker,H39DAE8
-39DAE8:lAD:httpd_manager|H39DB38
-39DB38:lAA:gen_server|N
-39DAD8:t3:AD:httpd_manager,AA:start_link,H39DB30
-39DB30:lA9:undefined|H39DB78
-39DB78:lH39DB50|H39DBC0
-39DBC0:lN|N
-39DAC8:t3:AD:httpd_manager,H39D9FC,I8888
-3A3704:lH3A36E0|H39D998
-3A36E0:t8:A5:child,P<0.45.0>,H39DA18,H39DA28,A9:permanent,I2000,AA:supervisor,H39DA38
-39DA38:lAE:httpd_misc_sup|H39DAC0
-39DAC0:lAA:supervisor|N
-39DA28:t3:AE:httpd_misc_sup,A5:start,H39D958
-39D958:lH39D9FC|H39DA10
-39DA10:lI8888|H39DAB8
-39DAB8:lA7:silence|N
-39DA18:t3:AE:httpd_misc_sup,H39D9FC,I8888
-39D998:lH39DA64|N
-39DA64:t8:A5:child,P<0.44.0>,H39DAF0,H39DB00,A9:permanent,I2000,AA:supervisor,H39DB10
-39DB10:lA12:httpd_acceptor_sup|H39DB48
-39DB48:lAA:supervisor|N
-39DB00:t3:A12:httpd_acceptor_sup,A5:start,H39DB40
-39DB40:lH39D9FC|H39DB80
-39DB80:lI8888|H39DBC8
-39DBC8:lA7:silence|N
-39DAF0:t3:A12:httpd_acceptor_sup,H39D9FC,I8888
-39D960:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39D9CC:lAA:gen_server|H39DA90
-39DA90:lP<0.33.0>|H39DB20
-39DB20:lP<0.33.0>|H39DB60
-39DB60:lH39DBA4|H39DBB0
-39DBA4:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39DBB0:lAA:supervisor|H39DBF4
-39DBF4:lH39DC30|H39DC40
-39DC30:t3:H39D960,A9:httpd_sup,H39DA88
-39DC40:lN|N
-39D940:t2:AD:$initial_call,H39D9E4
-39D9E4:t3:A3:gen,A7:init_it,H39D9CC
-39D94C:t2:AA:$ancestors,H39D9F4
-39D9F4:lA8:web_tool|H39DAB0
-39DAB0:lP<0.27.0>|N
-=proc_dictionary:<0.44.0>
-H3756A8
-H3756B4
-H3756C0
-H3756CC
-=proc_stack:<0.44.0>
-36c194:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36C030
-y4:A1E:httpd_acc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36c1b0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H375710
-=proc_heap:<0.44.0>
-36C030:tA:A5:state,H3756D8,AB:one_for_one,H36C028,N,I500,I100,N,A12:httpd_acceptor_sup,H375730
-375730:lA7:silence|N
-36C028:lH36C004|N
-36C004:t8:A5:child,P<0.47.0>,H36BE80,H36BE90,A9:permanent,I1000,A6:worker,H36BEA0
-36BEA0:lAE:httpd_acceptor|N
-36BE90:t3:AE:httpd_acceptor,AA:start_link,H36BEE8
-36BEE8:lP<0.46.0>|H36BEF0
-36BEF0:lA7:ip_comm|H36BEF8
-36BEF8:lH36BF00|H36BF14
-36BF00:t4:I127,I0,I0,I1
-36BF14:lI8888|H36BF1C
-36BF1C:lA1B:httpd_conf__127_0_0_1__8888|H36BF24
-36BF24:lA7:silence|N
-36BE80:t3:AE:httpd_acceptor,H36BED4,I8888
-36BED4:t4:I127,I0,I0,I1
-3756D8:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-375710:lAA:gen_server|H375738
-375738:lP<0.43.0>|H375748
-375748:lP<0.43.0>|H375758
-375758:lH375760|H37576C
-375760:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-37576C:lAA:supervisor|H375774
-375774:lH37577C|H37578C
-37577C:t3:H3756D8,A12:httpd_acceptor_sup,H375730
-37578C:lN|N
-3756A8:t2:AD:$initial_call,H375718
-375718:t3:A3:gen,A7:init_it,H375710
-3756B4:t2:A9:verbosity,A7:silence
-3756C0:t2:AA:$ancestors,H375728
-375728:lA1A:httpd_sup__127_0_0_1__8888|H375740
-375740:lA8:web_tool|H375750
-375750:lP<0.27.0>|N
-3756CC:t2:A5:sname,A7:acc_sup
-=proc_dictionary:<0.45.0>
-H36F484
-H36F4F4
-H36F468
-H36F500
-=proc_stack:<0.45.0>
-36f734:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F5D0
-y4:A1F:httpd_misc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36f750:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36F430
-=proc_heap:<0.45.0>
-36F5D0:tA:A5:state,H36F3FC,AB:one_for_one,N,N,I0,I1,N,AE:httpd_misc_sup,H36F408
-36F408:lA7:silence|N
-36F3FC:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F430:lAA:gen_server|H36F428
-36F428:lP<0.43.0>|H36F420
-36F420:lP<0.43.0>|H36F3D0
-36F3D0:lH36F3E0|H36F418
-36F3E0:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F418:lAA:supervisor|H36F3D8
-36F3D8:lH36F3EC|H36F410
-36F3EC:t3:H36F3FC,AE:httpd_misc_sup,H36F408
-36F410:lN|N
-36F484:t2:AD:$initial_call,H36F474
-36F474:t3:A3:gen,A7:init_it,H36F430
-36F4F4:t2:A9:verbosity,A7:silence
-36F468:t2:AA:$ancestors,H36F460
-36F460:lA1A:httpd_sup__127_0_0_1__8888|H36F440
-36F440:lA8:web_tool|H36F438
-36F438:lP<0.27.0>|N
-36F500:t2:A5:sname,A8:misc_sup
-=proc_dictionary:<0.46.0>
-H3BDA50
-H3BDA5C
-H3BDAC8
-H3BDB28
-H3BDB9C
-H3BDC00
-H3BDADC
-H3BDB3C
-=proc_stack:<0.46.0>
-39d8f4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:httpd_manager
-y3:H39D5A4
-y4:A16:httpd__127_0_0_1__8888
-y5:P<0.43.0>
-39d910:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3BDAB0
-=proc_heap:<0.46.0>
-39D5A4:t9:A5:state,A7:ip_comm,A9:undefined,A1B:httpd_conf__127_0_0_1__8888,N,A9:unblocked,A9:undefined,A9:undefined,H39D430
-39D430:lH39BF40|H39D428
-39BF40:t2:A8:max_conn,I1
-39D428:lH39BC80|H39D420
-39BC80:t2:AF:last_heavy_load,A5:never
-39D420:lH39D414|N
-39D414:t2:AF:last_connection,H39D408
-39D408:t2:H39D3E8,H39D3F8
-39D3F8:t3:I11,I22,I34
-39D3E8:t3:I2004,I4,I21
-3BDAB0:lAA:gen_server|H3BDB20
-3BDB20:lP<0.43.0>|H3BDB94
-3BDB94:lP<0.43.0>|H3BDBF8
-3BDBF8:lH3BDC48|H3BDC54
-3BDC48:t2:A5:local,A16:httpd__127_0_0_1__8888
-3BDC54:lAD:httpd_manager|H3BDCAC
-3BDCAC:lH3BDD14|H3BDD1C
-3BDD14:lA9:undefined|H3BDD9C
-3BDD9C:lH3BDA84|H3BDE2C
-3BDA84:lH3BDAF0|H3BDAFC
-3BDAF0:t2:AB:server_root,H3BDB48
-3BDB48:lI47|H3BDBB0
-3BDBB0:lI99|H3BDC0C
-3BDC0C:lI108|H3BDC64
-3BDC64:lI101|H3BDCBC
-3BDCBC:lI97|H3BDD2C
-3BDD2C:lI114|H3BDDA4
-3BDDA4:lI99|H3BDE34
-3BDE34:lI97|H3BDED4
-3BDED4:lI115|H3BDF90
-3BDF90:lI101|H3BE054
-3BE054:lI47|H3BE128
-3BE128:lI111|H3BE204
-3BE204:lI116|H3BE2EC
-3BE2EC:lI112|H3BE3E0
-3BE3E0:lI47|H3BE4E4
-3BE4E4:lI101|H3BE5E8
-3BE5E8:lI114|H3BE6EC
-3BE6EC:lI116|H3BE7E0
-3BE7E0:lI115|H3BE8CC
-3BE8CC:lI47|H3BE9B8
-3BE9B8:lI108|H3BEAAC
-3BEAAC:lI105|H3BEB98
-3BEB98:lI98|H3BEC84
-3BEC84:lI47|H3BED70
-3BED70:lI119|H3BEE5C
-3BEE5C:lI101|H3BEF30
-3BEF30:lI98|H3BEFFC
-3BEFFC:lI116|H3BF0C8
-3BF0C8:lI111|H3BF19C
-3BF19C:lI111|H3BF260
-3BF260:lI108|H3BF314
-3BF314:lI47|H3BF3C0
-3BF3C0:lI112|H3BF474
-3BF474:lI114|H3BF530
-3BF530:lI105|H3BF5F4
-3BF5F4:lI118|H3BF6C8
-3BF6C8:lI47|H3BF79C
-3BF79C:lI114|H3BF870
-3BF870:lI111|H3BF954
-3BF954:lI111|H3BFA30
-3BFA30:lI116|N
-3BDAFC:lH3BDB50|H3BDB5C
-3BDB50:t2:AD:document_root,H3BDBB8
-3BDBB8:lI47|H3BDC14
-3BDC14:lI99|H3BDC6C
-3BDC6C:lI108|H3BDCC4
-3BDCC4:lI101|H3BDD34
-3BDD34:lI97|H3BDDAC
-3BDDAC:lI114|H3BDE3C
-3BDE3C:lI99|H3BDEDC
-3BDEDC:lI97|H3BDF98
-3BDF98:lI115|H3BE05C
-3BE05C:lI101|H3BE130
-3BE130:lI47|H3BE20C
-3BE20C:lI111|H3BE2F4
-3BE2F4:lI116|H3BE3E8
-3BE3E8:lI112|H3BE4EC
-3BE4EC:lI47|H3BE5F0
-3BE5F0:lI101|H3BE6F4
-3BE6F4:lI114|H3BE7E8
-3BE7E8:lI116|H3BE8D4
-3BE8D4:lI115|H3BE9C0
-3BE9C0:lI47|H3BEAB4
-3BEAB4:lI108|H3BEBA0
-3BEBA0:lI105|H3BEC8C
-3BEC8C:lI98|H3BED78
-3BED78:lI47|H3BEE64
-3BEE64:lI119|H3BEF38
-3BEF38:lI101|H3BF004
-3BF004:lI98|H3BF0D0
-3BF0D0:lI116|H3BF1A4
-3BF1A4:lI111|H3BF268
-3BF268:lI111|H3BF31C
-3BF31C:lI108|H3BF3C8
-3BF3C8:lI47|H3BF47C
-3BF47C:lI112|H3BF538
-3BF538:lI114|H3BF5FC
-3BF5FC:lI105|H3BF6D0
-3BF6D0:lI118|H3BF7A4
-3BF7A4:lI47|H3BF878
-3BF878:lI114|H3BF95C
-3BF95C:lI111|H3BFA38
-3BFA38:lI111|H3BFB0C
-3BFB0C:lI116|H3BFBE8
-3BFBE8:lI47|H3BFCB4
-3BFCB4:lI100|H3BFD78
-3BFD78:lI111|H3BFE3C
-3BFE3C:lI99|N
-3BDB5C:lH3BDBC0|H3BDBCC
-3BDBC0:t2:AA:mime_types,H3BDC1C
-3BDC1C:lH3BDC74|H3BDC80
-3BDC74:t2:H3BDCCC,H3BDCD4
-3BDCD4:lI120|H3BDD44
-3BDD44:lI45|H3BDDBC
-3BDDBC:lI119|H3BDE44
-3BDE44:lI111|H3BDEE4
-3BDEE4:lI114|H3BDFA0
-3BDFA0:lI108|H3BE064
-3BE064:lI100|H3BE138
-3BE138:lI47|H3BE214
-3BE214:lI120|H3BE2FC
-3BE2FC:lI45|H3BE3F0
-3BE3F0:lI118|H3BE4F4
-3BE4F4:lI114|H3BE5F8
-3BE5F8:lI109|H3BE6FC
-3BE6FC:lI108|N
-3BDCCC:lI119|H3BDD3C
-3BDD3C:lI114|H3BDDB4
-3BDDB4:lI108|N
-3BDC80:lH3BDCDC|H3BDCE8
-3BDCDC:t2:H3BDD4C,H3BDD54
-3BDD54:lI120|H3BDDCC
-3BDDCC:lI45|H3BDE54
-3BDE54:lI119|H3BDEF4
-3BDEF4:lI111|H3BDFA8
-3BDFA8:lI114|H3BE06C
-3BE06C:lI108|H3BE140
-3BE140:lI100|H3BE21C
-3BE21C:lI47|H3BE304
-3BE304:lI120|H3BE3F8
-3BE3F8:lI45|H3BE4FC
-3BE4FC:lI118|H3BE600
-3BE600:lI114|H3BE704
-3BE704:lI109|H3BE7F0
-3BE7F0:lI108|N
-3BDD4C:lI118|H3BDDC4
-3BDDC4:lI114|H3BDE4C
-3BDE4C:lI109|H3BDEEC
-3BDEEC:lI108|N
-3BDCE8:lH3BDD5C|H3BDD68
-3BDD5C:t2:H3BDDD4,H3BDDDC
-3BDDDC:lI120|H3BDE64
-3BDE64:lI45|H3BDF04
-3BDF04:lI99|H3BDFB0
-3BDFB0:lI111|H3BE074
-3BE074:lI110|H3BE148
-3BE148:lI102|H3BE224
-3BE224:lI101|H3BE30C
-3BE30C:lI114|H3BE400
-3BE400:lI101|H3BE504
-3BE504:lI110|H3BE608
-3BE608:lI99|H3BE70C
-3BE70C:lI101|H3BE7F8
-3BE7F8:lI47|H3BE8DC
-3BE8DC:lI120|H3BE9C8
-3BE9C8:lI45|H3BEABC
-3BEABC:lI99|H3BEBA8
-3BEBA8:lI111|H3BEC94
-3BEC94:lI111|H3BED80
-3BED80:lI108|H3BEE6C
-3BEE6C:lI116|H3BEF40
-3BEF40:lI97|H3BF00C
-3BF00C:lI108|H3BF0D8
-3BF0D8:lI107|N
-3BDDD4:lI105|H3BDE5C
-3BDE5C:lI99|H3BDEFC
-3BDEFC:lI101|N
-3BDD68:lH3BDDE4|H3BDDF0
-3BDDE4:t2:H3BDE6C,H3BDE74
-3BDE74:lI118|H3BDF14
-3BDF14:lI105|H3BDFC0
-3BDFC0:lI100|H3BE084
-3BE084:lI101|H3BE158
-3BE158:lI111|H3BE22C
-3BE22C:lI47|H3BE314
-3BE314:lI120|H3BE408
-3BE408:lI45|H3BE50C
-3BE50C:lI115|H3BE610
-3BE610:lI103|H3BE714
-3BE714:lI105|H3BE800
-3BE800:lI45|H3BE8E4
-3BE8E4:lI109|H3BE9D0
-3BE9D0:lI111|H3BEAC4
-3BEAC4:lI118|H3BEBB0
-3BEBB0:lI105|H3BEC9C
-3BEC9C:lI101|N
-3BDE6C:lI109|H3BDF0C
-3BDF0C:lI111|H3BDFB8
-3BDFB8:lI118|H3BE07C
-3BE07C:lI105|H3BE150
-3BE150:lI101|N
-3BDDF0:lH3BDE7C|H3BDE88
-3BDE7C:t2:H3BDF1C,H3BDF24
-3BDF24:lI118|H3BDFD0
-3BDFD0:lI105|H3BE094
-3BE094:lI100|H3BE160
-3BE160:lI101|H3BE234
-3BE234:lI111|H3BE31C
-3BE31C:lI47|H3BE410
-3BE410:lI120|H3BE514
-3BE514:lI45|H3BE618
-3BE618:lI109|H3BE71C
-3BE71C:lI115|H3BE808
-3BE808:lI118|H3BE8EC
-3BE8EC:lI105|H3BE9D8
-3BE9D8:lI100|H3BEACC
-3BEACC:lI101|H3BEBB8
-3BEBB8:lI111|N
-3BDF1C:lI97|H3BDFC8
-3BDFC8:lI118|H3BE08C
-3BE08C:lI105|N
-3BDE88:lH3BDF2C|H3BDF38
-3BDF2C:t2:H3BDFD8,H3BDFE0
-3BDFE0:lI118|H3BE0A4
-3BE0A4:lI105|H3BE168
-3BE168:lI100|H3BE23C
-3BE23C:lI101|H3BE324
-3BE324:lI111|H3BE418
-3BE418:lI47|H3BE51C
-3BE51C:lI113|H3BE620
-3BE620:lI117|H3BE724
-3BE724:lI105|H3BE810
-3BE810:lI99|H3BE8F4
-3BE8F4:lI107|H3BE9E0
-3BE9E0:lI116|H3BEAD4
-3BEAD4:lI105|H3BEBC0
-3BEBC0:lI109|H3BECA4
-3BECA4:lI101|N
-3BDFD8:lI113|H3BE09C
-3BE09C:lI116|N
-3BDF38:lH3BDFE8|H3BDFF4
-3BDFE8:t2:H3BE0AC,H3BE0B4
-3BE0B4:lI118|H3BE178
-3BE178:lI105|H3BE24C
-3BE24C:lI100|H3BE32C
-3BE32C:lI101|H3BE420
-3BE420:lI111|H3BE524
-3BE524:lI47|H3BE628
-3BE628:lI113|H3BE72C
-3BE72C:lI117|H3BE818
-3BE818:lI105|H3BE8FC
-3BE8FC:lI99|H3BE9E8
-3BE9E8:lI107|H3BEADC
-3BEADC:lI116|H3BEBC8
-3BEBC8:lI105|H3BECAC
-3BECAC:lI109|H3BED88
-3BED88:lI101|N
-3BE0AC:lI109|H3BE170
-3BE170:lI111|H3BE244
-3BE244:lI118|N
-3BDFF4:lH3BE0BC|H3BE0C8
-3BE0BC:t2:H3BE180,H3BE188
-3BE188:lI118|H3BE25C
-3BE25C:lI105|H3BE33C
-3BE33C:lI100|H3BE430
-3BE430:lI101|H3BE52C
-3BE52C:lI111|H3BE630
-3BE630:lI47|H3BE734
-3BE734:lI109|H3BE820
-3BE820:lI112|H3BE904
-3BE904:lI101|H3BE9F0
-3BE9F0:lI103|N
-3BE180:lI109|H3BE254
-3BE254:lI112|H3BE334
-3BE334:lI101|H3BE428
-3BE428:lI103|N
-3BE0C8:lH3BE190|H3BE19C
-3BE190:t2:H3BE264,H3BE26C
-3BE26C:lI118|H3BE34C
-3BE34C:lI105|H3BE440
-3BE440:lI100|H3BE534
-3BE534:lI101|H3BE638
-3BE638:lI111|H3BE73C
-3BE73C:lI47|H3BE828
-3BE828:lI109|H3BE90C
-3BE90C:lI112|H3BE9F8
-3BE9F8:lI101|H3BEAE4
-3BEAE4:lI103|N
-3BE264:lI109|H3BE344
-3BE344:lI112|H3BE438
-3BE438:lI103|N
-3BE19C:lH3BE274|H3BE280
-3BE274:t2:H3BE354,H3BE35C
-3BE35C:lI118|H3BE450
-3BE450:lI105|H3BE544
-3BE544:lI100|H3BE640
-3BE640:lI101|H3BE744
-3BE744:lI111|H3BE830
-3BE830:lI47|H3BE914
-3BE914:lI109|H3BEA00
-3BEA00:lI112|H3BEAEC
-3BEAEC:lI101|H3BEBD0
-3BEBD0:lI103|N
-3BE354:lI109|H3BE448
-3BE448:lI112|H3BE53C
-3BE53C:lI101|N
-3BE280:lH3BE364|H3BE370
-3BE364:t2:H3BE458,H3BE460
-3BE460:lI116|H3BE554
-3BE554:lI101|H3BE650
-3BE650:lI120|H3BE754
-3BE754:lI116|H3BE838
-3BE838:lI47|H3BE91C
-3BE91C:lI120|H3BEA08
-3BEA08:lI45|H3BEAF4
-3BEAF4:lI115|H3BEBD8
-3BEBD8:lI103|H3BECB4
-3BECB4:lI109|H3BED90
-3BED90:lI108|N
-3BE458:lI115|H3BE54C
-3BE54C:lI103|H3BE648
-3BE648:lI109|H3BE74C
-3BE74C:lI108|N
-3BE370:lH3BE468|H3BE474
-3BE468:t2:H3BE55C,H3BE564
-3BE564:lI116|H3BE660
-3BE660:lI101|H3BE764
-3BE764:lI120|H3BE840
-3BE840:lI116|H3BE924
-3BE924:lI47|H3BEA10
-3BEA10:lI120|H3BEAFC
-3BEAFC:lI45|H3BEBE0
-3BEBE0:lI115|H3BECBC
-3BECBC:lI103|H3BED98
-3BED98:lI109|H3BEE74
-3BEE74:lI108|N
-3BE55C:lI115|H3BE658
-3BE658:lI103|H3BE75C
-3BE75C:lI109|N
-3BE474:lH3BE56C|H3BE578
-3BE56C:t2:H3BE668,H3BE670
-3BE670:lI116|H3BE774
-3BE774:lI101|H3BE850
-3BE850:lI120|H3BE92C
-3BE92C:lI116|H3BEA18
-3BEA18:lI47|H3BEB04
-3BEB04:lI120|H3BEBE8
-3BEBE8:lI45|H3BECC4
-3BECC4:lI115|H3BEDA0
-3BEDA0:lI101|H3BEE7C
-3BEE7C:lI116|H3BEF48
-3BEF48:lI101|H3BF014
-3BF014:lI120|H3BF0E0
-3BF0E0:lI116|N
-3BE668:lI101|H3BE76C
-3BE76C:lI116|H3BE848
-3BE848:lI120|N
-3BE578:lH3BE678|H3BE684
-3BE678:t2:H3BE77C,H3BE784
-3BE784:lI116|H3BE860
-3BE860:lI101|H3BE93C
-3BE93C:lI120|H3BEA20
-3BEA20:lI116|H3BEB0C
-3BEB0C:lI47|H3BEBF0
-3BEBF0:lI116|H3BECCC
-3BECCC:lI97|H3BEDA8
-3BEDA8:lI98|H3BEE84
-3BEE84:lI45|H3BEF50
-3BEF50:lI115|H3BF01C
-3BF01C:lI101|H3BF0E8
-3BF0E8:lI112|H3BF1AC
-3BF1AC:lI97|H3BF270
-3BF270:lI114|H3BF324
-3BF324:lI97|H3BF3D0
-3BF3D0:lI116|H3BF484
-3BF484:lI101|H3BF540
-3BF540:lI100|H3BF604
-3BF604:lI45|H3BF6D8
-3BF6D8:lI118|H3BF7AC
-3BF7AC:lI97|H3BF880
-3BF880:lI108|H3BF964
-3BF964:lI117|H3BFA40
-3BFA40:lI101|H3BFB14
-3BFB14:lI115|N
-3BE77C:lI116|H3BE858
-3BE858:lI115|H3BE934
-3BE934:lI118|N
-3BE684:lH3BE78C|H3BE798
-3BE78C:t2:H3BE868,H3BE870
-3BE870:lI116|H3BE94C
-3BE94C:lI101|H3BEA30
-3BEA30:lI120|H3BEB14
-3BEB14:lI116|H3BEBF8
-3BEBF8:lI47|H3BECD4
-3BECD4:lI114|H3BEDB0
-3BEDB0:lI105|H3BEE8C
-3BEE8C:lI99|H3BEF58
-3BEF58:lI104|H3BF024
-3BF024:lI116|H3BF0F0
-3BF0F0:lI101|H3BF1B4
-3BF1B4:lI120|H3BF278
-3BF278:lI116|N
-3BE868:lI114|H3BE944
-3BE944:lI116|H3BEA28
-3BEA28:lI120|N
-3BE798:lH3BE878|H3BE884
-3BE878:t2:H3BE954,H3BE95C
-3BE95C:lI116|H3BEA40
-3BEA40:lI101|H3BEB24
-3BEB24:lI120|H3BEC00
-3BEC00:lI116|H3BECDC
-3BECDC:lI47|H3BEDB8
-3BEDB8:lI112|H3BEE94
-3BEE94:lI108|H3BEF60
-3BEF60:lI97|H3BF02C
-3BF02C:lI105|H3BF0F8
-3BF0F8:lI110|N
-3BE954:lI116|H3BEA38
-3BEA38:lI120|H3BEB1C
-3BEB1C:lI116|N
-3BE884:lH3BE964|H3BE970
-3BE964:t2:H3BEA48,H3BEA50
-3BEA50:lI116|H3BEB34
-3BEB34:lI101|H3BEC10
-3BEC10:lI120|H3BECEC
-3BECEC:lI116|H3BEDC8
-3BEDC8:lI47|H3BEE9C
-3BEE9C:lI120|H3BEF68
-3BEF68:lI45|H3BF034
-3BF034:lI115|H3BF100
-3BF100:lI101|H3BF1BC
-3BF1BC:lI114|H3BF280
-3BF280:lI118|H3BF32C
-3BF32C:lI101|H3BF3D8
-3BF3D8:lI114|H3BF48C
-3BF48C:lI45|H3BF548
-3BF548:lI112|H3BF60C
-3BF60C:lI97|H3BF6E0
-3BF6E0:lI114|H3BF7B4
-3BF7B4:lI115|H3BF888
-3BF888:lI101|H3BF96C
-3BF96C:lI100|H3BFA48
-3BFA48:lI45|H3BFB1C
-3BFB1C:lI104|H3BFBF0
-3BFBF0:lI116|H3BFCBC
-3BFCBC:lI109|H3BFD80
-3BFD80:lI108|N
-3BEA48:lI115|H3BEB2C
-3BEB2C:lI104|H3BEC08
-3BEC08:lI116|H3BECE4
-3BECE4:lI109|H3BEDC0
-3BEDC0:lI108|N
-3BE970:lH3BEA58|H3BEA64
-3BEA58:t2:H3BEB3C,H3BEB44
-3BEB44:lI116|H3BEC20
-3BEC20:lI101|H3BECFC
-3BECFC:lI120|H3BEDD8
-3BEDD8:lI116|H3BEEA4
-3BEEA4:lI47|H3BEF70
-3BEF70:lI104|H3BF03C
-3BF03C:lI116|H3BF108
-3BF108:lI109|H3BF1C4
-3BF1C4:lI108|N
-3BEB3C:lI104|H3BEC18
-3BEC18:lI116|H3BECF4
-3BECF4:lI109|H3BEDD0
-3BEDD0:lI108|N
-3BEA64:lH3BEB4C|H3BEB58
-3BEB4C:t2:H3BEC28,H3BEC30
-3BEC30:lI116|H3BED0C
-3BED0C:lI101|H3BEDE8
-3BEDE8:lI120|H3BEEAC
-3BEEAC:lI116|H3BEF78
-3BEF78:lI47|H3BF044
-3BF044:lI104|H3BF110
-3BF110:lI116|H3BF1CC
-3BF1CC:lI109|H3BF288
-3BF288:lI108|N
-3BEC28:lI104|H3BED04
-3BED04:lI116|H3BEDE0
-3BEDE0:lI109|N
-3BEB58:lH3BEC38|H3BEC44
-3BEC38:t2:H3BED14,H3BED1C
-3BED1C:lI105|H3BEDF8
-3BEDF8:lI109|H3BEEBC
-3BEEBC:lI97|H3BEF80
-3BEF80:lI103|H3BF04C
-3BF04C:lI101|H3BF118
-3BF118:lI47|H3BF1D4
-3BF1D4:lI120|H3BF290
-3BF290:lI45|H3BF334
-3BF334:lI120|H3BF3E0
-3BF3E0:lI119|H3BF494
-3BF494:lI105|H3BF550
-3BF550:lI110|H3BF614
-3BF614:lI100|H3BF6E8
-3BF6E8:lI111|H3BF7BC
-3BF7BC:lI119|H3BF890
-3BF890:lI100|H3BF974
-3BF974:lI117|H3BFA50
-3BFA50:lI109|H3BFB24
-3BFB24:lI112|N
-3BED14:lI120|H3BEDF0
-3BEDF0:lI119|H3BEEB4
-3BEEB4:lI100|N
-3BEC44:lH3BED24|H3BED30
-3BED24:t2:H3BEE00,H3BEE08
-3BEE08:lI105|H3BEECC
-3BEECC:lI109|H3BEF90
-3BEF90:lI97|H3BF054
-3BF054:lI103|H3BF120
-3BF120:lI101|H3BF1DC
-3BF1DC:lI47|H3BF298
-3BF298:lI120|H3BF33C
-3BF33C:lI45|H3BF3E8
-3BF3E8:lI120|H3BF49C
-3BF49C:lI112|H3BF558
-3BF558:lI105|H3BF61C
-3BF61C:lI120|H3BF6F0
-3BF6F0:lI109|H3BF7C4
-3BF7C4:lI97|H3BF898
-3BF898:lI112|N
-3BEE00:lI120|H3BEEC4
-3BEEC4:lI112|H3BEF88
-3BEF88:lI109|N
-3BED30:lH3BEE10|H3BEE1C
-3BEE10:t2:H3BEED4,H3BEEDC
-3BEEDC:lI105|H3BEFA0
-3BEFA0:lI109|H3BF064
-3BF064:lI97|H3BF128
-3BF128:lI103|H3BF1E4
-3BF1E4:lI101|H3BF2A0
-3BF2A0:lI47|H3BF344
-3BF344:lI120|H3BF3F0
-3BF3F0:lI45|H3BF4A4
-3BF4A4:lI120|H3BF560
-3BF560:lI98|H3BF624
-3BF624:lI105|H3BF6F8
-3BF6F8:lI116|H3BF7CC
-3BF7CC:lI109|H3BF8A0
-3BF8A0:lI97|H3BF97C
-3BF97C:lI112|N
-3BEED4:lI120|H3BEF98
-3BEF98:lI98|H3BF05C
-3BF05C:lI109|N
-3BEE1C:lH3BEEE4|H3BEEF0
-3BEEE4:t2:H3BEFA8,H3BEFB0
-3BEFB0:lI105|H3BF074
-3BF074:lI109|H3BF138
-3BF138:lI97|H3BF1EC
-3BF1EC:lI103|H3BF2A8
-3BF2A8:lI101|H3BF34C
-3BF34C:lI47|H3BF3F8
-3BF3F8:lI120|H3BF4AC
-3BF4AC:lI45|H3BF568
-3BF568:lI114|H3BF62C
-3BF62C:lI103|H3BF700
-3BF700:lI98|N
-3BEFA8:lI114|H3BF06C
-3BF06C:lI103|H3BF130
-3BF130:lI98|N
-3BEEF0:lH3BEFB8|H3BEFC4
-3BEFB8:t2:H3BF07C,H3BF084
-3BF084:lI105|H3BF148
-3BF148:lI109|H3BF1FC
-3BF1FC:lI97|H3BF2B0
-3BF2B0:lI103|H3BF354
-3BF354:lI101|H3BF400
-3BF400:lI47|H3BF4B4
-3BF4B4:lI120|H3BF570
-3BF570:lI45|H3BF634
-3BF634:lI112|H3BF708
-3BF708:lI111|H3BF7D4
-3BF7D4:lI114|H3BF8A8
-3BF8A8:lI116|H3BF984
-3BF984:lI97|H3BFA58
-3BFA58:lI98|H3BFB2C
-3BFB2C:lI108|H3BFBF8
-3BFBF8:lI101|H3BFCC4
-3BFCC4:lI45|H3BFD88
-3BFD88:lI112|H3BFE44
-3BFE44:lI105|H3BFEF0
-3BFEF0:lI120|H3BFFA4
-3BFFA4:lI109|H3C0050
-3C0050:lI97|H3C00FC
-3C00FC:lI112|N
-3BF07C:lI112|H3BF140
-3BF140:lI112|H3BF1F4
-3BF1F4:lI109|N
-3BEFC4:lH3BF08C|H3BF098
-3BF08C:t2:H3BF150,H3BF158
-3BF158:lI105|H3BF20C
-3BF20C:lI109|H3BF2C0
-3BF2C0:lI97|H3BF35C
-3BF35C:lI103|H3BF408
-3BF408:lI101|H3BF4BC
-3BF4BC:lI47|H3BF578
-3BF578:lI120|H3BF63C
-3BF63C:lI45|H3BF710
-3BF710:lI112|H3BF7DC
-3BF7DC:lI111|H3BF8B0
-3BF8B0:lI114|H3BF98C
-3BF98C:lI116|H3BFA60
-3BFA60:lI97|H3BFB34
-3BFB34:lI98|H3BFC00
-3BFC00:lI108|H3BFCCC
-3BFCCC:lI101|H3BFD90
-3BFD90:lI45|H3BFE4C
-3BFE4C:lI103|H3BFEF8
-3BFEF8:lI114|H3BFFAC
-3BFFAC:lI97|H3C0058
-3C0058:lI121|H3C0104
-3C0104:lI109|H3C01A8
-3C01A8:lI97|H3C025C
-3C025C:lI112|N
-3BF150:lI112|H3BF204
-3BF204:lI103|H3BF2B8
-3BF2B8:lI109|N
-3BF098:lH3BF160|H3BF16C
-3BF160:t2:H3BF214,H3BF21C
-3BF21C:lI105|H3BF2D0
-3BF2D0:lI109|H3BF36C
-3BF36C:lI97|H3BF410
-3BF410:lI103|H3BF4C4
-3BF4C4:lI101|H3BF580
-3BF580:lI47|H3BF644
-3BF644:lI120|H3BF718
-3BF718:lI45|H3BF7E4
-3BF7E4:lI112|H3BF8B8
-3BF8B8:lI111|H3BF994
-3BF994:lI114|H3BFA68
-3BFA68:lI116|H3BFB3C
-3BFB3C:lI97|H3BFC08
-3BFC08:lI98|H3BFCD4
-3BFCD4:lI108|H3BFD98
-3BFD98:lI101|H3BFE54
-3BFE54:lI45|H3BFF00
-3BFF00:lI98|H3BFFB4
-3BFFB4:lI105|H3C0060
-3C0060:lI116|H3C010C
-3C010C:lI109|H3C01B0
-3C01B0:lI97|H3C0264
-3C0264:lI112|N
-3BF214:lI112|H3BF2C8
-3BF2C8:lI98|H3BF364
-3BF364:lI109|N
-3BF16C:lH3BF224|H3BF230
-3BF224:t2:H3BF2D8,H3BF2E0
-3BF2E0:lI105|H3BF37C
-3BF37C:lI109|H3BF420
-3BF420:lI97|H3BF4CC
-3BF4CC:lI103|H3BF588
-3BF588:lI101|H3BF64C
-3BF64C:lI47|H3BF720
-3BF720:lI120|H3BF7EC
-3BF7EC:lI45|H3BF8C0
-3BF8C0:lI112|H3BF99C
-3BF99C:lI111|H3BFA70
-3BFA70:lI114|H3BFB44
-3BFB44:lI116|H3BFC10
-3BFC10:lI97|H3BFCDC
-3BFCDC:lI98|H3BFDA0
-3BFDA0:lI108|H3BFE5C
-3BFE5C:lI101|H3BFF08
-3BFF08:lI45|H3BFFBC
-3BFFBC:lI97|H3C0068
-3C0068:lI110|H3C0114
-3C0114:lI121|H3C01B8
-3C01B8:lI109|H3C026C
-3C026C:lI97|H3C0318
-3C0318:lI112|N
-3BF2D8:lI112|H3BF374
-3BF374:lI110|H3BF418
-3BF418:lI109|N
-3BF230:lH3BF2E8|H3BF2F4
-3BF2E8:t2:H3BF384,H3BF38C
-3BF38C:lI105|H3BF430
-3BF430:lI109|H3BF4DC
-3BF4DC:lI97|H3BF590
-3BF590:lI103|H3BF654
-3BF654:lI101|H3BF728
-3BF728:lI47|H3BF7F4
-3BF7F4:lI120|H3BF8C8
-3BF8C8:lI45|H3BF9A4
-3BF9A4:lI99|H3BFA78
-3BFA78:lI109|H3BFB4C
-3BFB4C:lI117|H3BFC18
-3BFC18:lI45|H3BFCE4
-3BFCE4:lI114|H3BFDA8
-3BFDA8:lI97|H3BFE64
-3BFE64:lI115|H3BFF10
-3BFF10:lI116|H3BFFC4
-3BFFC4:lI101|H3C0070
-3C0070:lI114|N
-3BF384:lI114|H3BF428
-3BF428:lI97|H3BF4D4
-3BF4D4:lI115|N
-3BF2F4:lH3BF394|H3BF3A0
-3BF394:t2:H3BF438,H3BF440
-3BF440:lI105|H3BF4EC
-3BF4EC:lI109|H3BF5A0
-3BF5A0:lI97|H3BF664
-3BF664:lI103|H3BF730
-3BF730:lI101|H3BF7FC
-3BF7FC:lI47|H3BF8D0
-3BF8D0:lI116|H3BF9AC
-3BF9AC:lI105|H3BFA80
-3BFA80:lI102|H3BFB54
-3BFB54:lI102|N
-3BF438:lI116|H3BF4E4
-3BF4E4:lI105|H3BF598
-3BF598:lI102|H3BF65C
-3BF65C:lI102|N
-3BF3A0:lH3BF448|H3BF454
-3BF448:t2:H3BF4F4,H3BF4FC
-3BF4FC:lI105|H3BF5B0
-3BF5B0:lI109|H3BF674
-3BF674:lI97|H3BF738
-3BF738:lI103|H3BF804
-3BF804:lI101|H3BF8D8
-3BF8D8:lI47|H3BF9B4
-3BF9B4:lI116|H3BFA88
-3BFA88:lI105|H3BFB5C
-3BFB5C:lI102|H3BFC20
-3BFC20:lI102|N
-3BF4F4:lI116|H3BF5A8
-3BF5A8:lI105|H3BF66C
-3BF66C:lI102|N
-3BF454:lH3BF504|H3BF510
-3BF504:t2:H3BF5B8,H3BF5C0
-3BF5C0:lI105|H3BF684
-3BF684:lI109|H3BF748
-3BF748:lI97|H3BF80C
-3BF80C:lI103|H3BF8E0
-3BF8E0:lI101|H3BF9BC
-3BF9BC:lI47|H3BFA90
-3BFA90:lI112|H3BFB64
-3BFB64:lI110|H3BFC28
-3BFC28:lI103|N
-3BF5B8:lI112|H3BF67C
-3BF67C:lI110|H3BF740
-3BF740:lI103|N
-3BF510:lH3BF5C8|H3BF5D4
-3BF5C8:t2:H3BF68C,H3BF694
-3BF694:lI105|H3BF758
-3BF758:lI109|H3BF81C
-3BF81C:lI97|H3BF8F0
-3BF8F0:lI103|H3BF9C4
-3BF9C4:lI101|H3BFA98
-3BFA98:lI47|H3BFB6C
-3BFB6C:lI106|H3BFC30
-3BFC30:lI112|H3BFCEC
-3BFCEC:lI101|H3BFDB0
-3BFDB0:lI103|N
-3BF68C:lI106|H3BF750
-3BF750:lI112|H3BF814
-3BF814:lI101|H3BF8E8
-3BF8E8:lI103|N
-3BF5D4:lH3BF69C|H3BF6A8
-3BF69C:t2:H3BF760,H3BF768
-3BF768:lI105|H3BF82C
-3BF82C:lI109|H3BF900
-3BF900:lI97|H3BF9CC
-3BF9CC:lI103|H3BFAA0
-3BFAA0:lI101|H3BFB74
-3BFB74:lI47|H3BFC38
-3BFC38:lI106|H3BFCF4
-3BFCF4:lI112|H3BFDB8
-3BFDB8:lI101|H3BFE6C
-3BFE6C:lI103|N
-3BF760:lI106|H3BF824
-3BF824:lI112|H3BF8F8
-3BF8F8:lI103|N
-3BF6A8:lH3BF770|H3BF77C
-3BF770:t2:H3BF834,H3BF83C
-3BF83C:lI105|H3BF910
-3BF910:lI109|H3BF9DC
-3BF9DC:lI97|H3BFAA8
-3BFAA8:lI103|H3BFB7C
-3BFB7C:lI101|H3BFC40
-3BFC40:lI47|H3BFCFC
-3BFCFC:lI106|H3BFDC0
-3BFDC0:lI112|H3BFE74
-3BFE74:lI101|H3BFF18
-3BFF18:lI103|N
-3BF834:lI106|H3BF908
-3BF908:lI112|H3BF9D4
-3BF9D4:lI101|N
-3BF77C:lH3BF844|H3BF850
-3BF844:t2:H3BF918,H3BF920
-3BF920:lI105|H3BF9EC
-3BF9EC:lI109|H3BFAB8
-3BFAB8:lI97|H3BFB84
-3BFB84:lI103|H3BFC48
-3BFC48:lI101|H3BFD04
-3BFD04:lI47|H3BFDC8
-3BFDC8:lI105|H3BFE7C
-3BFE7C:lI101|H3BFF20
-3BFF20:lI102|N
-3BF918:lI105|H3BF9E4
-3BF9E4:lI101|H3BFAB0
-3BFAB0:lI102|N
-3BF850:lH3BF928|H3BF934
-3BF928:t2:H3BF9F4,H3BF9FC
-3BF9FC:lI105|H3BFAC8
-3BFAC8:lI109|H3BFB94
-3BFB94:lI97|H3BFC50
-3BFC50:lI103|H3BFD0C
-3BFD0C:lI101|H3BFDD0
-3BFDD0:lI47|H3BFE84
-3BFE84:lI103|H3BFF28
-3BFF28:lI105|H3BFFCC
-3BFFCC:lI102|N
-3BF9F4:lI103|H3BFAC0
-3BFAC0:lI105|H3BFB8C
-3BFB8C:lI102|N
-3BF934:lH3BFA04|H3BFA10
-3BFA04:t2:H3BFAD0,H3BFAD8
-3BFAD8:lI99|H3BFBA4
-3BFBA4:lI104|H3BFC60
-3BFC60:lI101|H3BFD14
-3BFD14:lI109|H3BFDD8
-3BFDD8:lI105|H3BFE8C
-3BFE8C:lI99|H3BFF30
-3BFF30:lI97|H3BFFD4
-3BFFD4:lI108|H3C0078
-3C0078:lI47|H3C011C
-3C011C:lI120|H3C01C0
-3C01C0:lI45|H3C0274
-3C0274:lI112|H3C0320
-3C0320:lI100|H3C03CC
-3C03CC:lI98|N
-3BFAD0:lI112|H3BFB9C
-3BFB9C:lI100|H3BFC58
-3BFC58:lI98|N
-3BFA10:lH3BFAE0|H3BFAEC
-3BFAE0:t2:H3BFBAC,H3BFBB4
-3BFBB4:lI99|H3BFC70
-3BFC70:lI104|H3BFD24
-3BFD24:lI101|H3BFDE0
-3BFDE0:lI109|H3BFE94
-3BFE94:lI105|H3BFF38
-3BFF38:lI99|H3BFFDC
-3BFFDC:lI97|H3C0080
-3C0080:lI108|H3C0124
-3C0124:lI47|H3C01C8
-3C01C8:lI120|H3C027C
-3C027C:lI45|H3C0328
-3C0328:lI112|H3C03D4
-3C03D4:lI100|H3C0460
-3C0460:lI98|N
-3BFBAC:lI120|H3BFC68
-3BFC68:lI121|H3BFD1C
-3BFD1C:lI122|N
-3BFAEC:lH3BFBBC|H3BFBC8
-3BFBBC:t2:H3BFC78,H3BFC80
-3BFC80:lI97|H3BFD34
-3BFD34:lI117|H3BFDF0
-3BFDF0:lI100|H3BFE9C
-3BFE9C:lI105|H3BFF40
-3BFF40:lI111|H3BFFE4
-3BFFE4:lI47|H3C0088
-3C0088:lI120|H3C012C
-3C012C:lI45|H3C01D0
-3C01D0:lI119|H3C0284
-3C0284:lI97|H3C0330
-3C0330:lI118|N
-3BFC78:lI119|H3BFD2C
-3BFD2C:lI97|H3BFDE8
-3BFDE8:lI118|N
-3BFBC8:lH3BFC88|H3BFC94
-3BFC88:t2:H3BFD3C,H3BFD44
-3BFD44:lI97|H3BFE00
-3BFE00:lI117|H3BFEA4
-3BFEA4:lI100|H3BFF48
-3BFF48:lI105|H3BFFEC
-3BFFEC:lI111|H3C0090
-3C0090:lI47|H3C0134
-3C0134:lI120|H3C01D8
-3C01D8:lI45|H3C028C
-3C028C:lI114|H3C0338
-3C0338:lI101|H3C03DC
-3C03DC:lI97|H3C0468
-3C0468:lI108|H3C04FC
-3C04FC:lI97|H3C0598
-3C0598:lI117|H3C063C
-3C063C:lI100|H3C06E8
-3C06E8:lI105|H3C0794
-3C0794:lI111|N
-3BFD3C:lI114|H3BFDF8
-3BFDF8:lI97|N
-3BFC94:lH3BFD4C|H3BFD58
-3BFD4C:t2:H3BFE08,H3BFE10
-3BFE10:lI97|H3BFEB4
-3BFEB4:lI117|H3BFF58
-3BFF58:lI100|H3BFFF4
-3BFFF4:lI105|H3C0098
-3C0098:lI111|H3C013C
-3C013C:lI47|H3C01E0
-3C01E0:lI120|H3C0294
-3C0294:lI45|H3C0340
-3C0340:lI112|H3C03E4
-3C03E4:lI110|H3C0470
-3C0470:lI45|H3C0504
-3C0504:lI114|H3C05A0
-3C05A0:lI101|H3C0644
-3C0644:lI97|H3C06F0
-3C06F0:lI108|H3C079C
-3C079C:lI97|H3C0838
-3C0838:lI117|H3C08C4
-3C08C4:lI100|H3C0958
-3C0958:lI105|H3C09EC
-3C09EC:lI111|H3C0A88
-3C0A88:lI45|H3C0B2C
-3C0B2C:lI112|H3C0BD0
-3C0BD0:lI108|H3C0C84
-3C0C84:lI117|H3C0D38
-3C0D38:lI103|H3C0DEC
-3C0DEC:lI105|H3C0EA0
-3C0EA0:lI110|N
-3BFE08:lI114|H3BFEAC
-3BFEAC:lI112|H3BFF50
-3BFF50:lI109|N
-3BFD58:lH3BFE18|H3BFE24
-3BFE18:t2:H3BFEBC,H3BFEC4
-3BFEC4:lI97|H3BFF68
-3BFF68:lI117|H3C0004
-3C0004:lI100|H3C00A0
-3C00A0:lI105|H3C0144
-3C0144:lI111|H3C01E8
-3C01E8:lI47|H3C029C
-3C029C:lI120|H3C0348
-3C0348:lI45|H3C03EC
-3C03EC:lI112|H3C0478
-3C0478:lI110|H3C050C
-3C050C:lI45|H3C05A8
-3C05A8:lI114|H3C064C
-3C064C:lI101|H3C06F8
-3C06F8:lI97|H3C07A4
-3C07A4:lI108|H3C0840
-3C0840:lI97|H3C08CC
-3C08CC:lI117|H3C0960
-3C0960:lI100|H3C09F4
-3C09F4:lI105|H3C0A90
-3C0A90:lI111|N
-3BFEBC:lI114|H3BFF60
-3BFF60:lI97|H3BFFFC
-3BFFFC:lI109|N
-3BFE24:lH3BFECC|H3BFED8
-3BFECC:t2:H3BFF70,H3BFF78
-3BFF78:lI97|H3C0014
-3C0014:lI117|H3C00B0
-3C00B0:lI100|H3C014C
-3C014C:lI105|H3C01F0
-3C01F0:lI111|H3C02A4
-3C02A4:lI47|H3C0350
-3C0350:lI120|H3C03F4
-3C03F4:lI45|H3C0480
-3C0480:lI97|H3C0514
-3C0514:lI105|H3C05B0
-3C05B0:lI102|H3C0654
-3C0654:lI102|N
-3BFF70:lI97|H3C000C
-3C000C:lI105|H3C00A8
-3C00A8:lI102|N
-3BFED8:lH3BFF80|H3BFF8C
-3BFF80:t2:H3C001C,H3C0024
-3C0024:lI97|H3C00C0
-3C00C0:lI117|H3C015C
-3C015C:lI100|H3C0200
-3C0200:lI105|H3C02AC
-3C02AC:lI111|H3C0358
-3C0358:lI47|H3C03FC
-3C03FC:lI120|H3C0488
-3C0488:lI45|H3C051C
-3C051C:lI97|H3C05B8
-3C05B8:lI105|H3C065C
-3C065C:lI102|H3C0700
-3C0700:lI102|N
-3C001C:lI97|H3C00B8
-3C00B8:lI105|H3C0154
-3C0154:lI102|H3C01F8
-3C01F8:lI102|N
-3BFF8C:lH3C002C|H3C0038
-3C002C:t2:H3C00C8,H3C00D0
-3C00D0:lI97|H3C016C
-3C016C:lI117|H3C0210
-3C0210:lI100|H3C02BC
-3C02BC:lI105|H3C0360
-3C0360:lI111|H3C0404
-3C0404:lI47|H3C0490
-3C0490:lI120|H3C0524
-3C0524:lI45|H3C05C0
-3C05C0:lI97|H3C0664
-3C0664:lI105|H3C0708
-3C0708:lI102|H3C07AC
-3C07AC:lI102|N
-3C00C8:lI97|H3C0164
-3C0164:lI105|H3C0208
-3C0208:lI102|H3C02B4
-3C02B4:lI99|N
-3C0038:lH3C00D8|H3C00E4
-3C00D8:t2:H3C0174,H3C017C
-3C017C:lI97|H3C0220
-3C0220:lI117|H3C02CC
-3C02CC:lI100|H3C0370
-3C0370:lI105|H3C040C
-3C040C:lI111|H3C0498
-3C0498:lI47|H3C052C
-3C052C:lI109|H3C05C8
-3C05C8:lI112|H3C066C
-3C066C:lI101|H3C0710
-3C0710:lI103|N
-3C0174:lI109|H3C0218
-3C0218:lI112|H3C02C4
-3C02C4:lI103|H3C0368
-3C0368:lI97|N
-3C00E4:lH3C0184|H3C0190
-3C0184:t2:H3C0228,H3C0230
-3C0230:lI97|H3C02DC
-3C02DC:lI117|H3C0380
-3C0380:lI100|H3C0414
-3C0414:lI105|H3C04A0
-3C04A0:lI111|H3C0534
-3C0534:lI47|H3C05D0
-3C05D0:lI109|H3C0674
-3C0674:lI112|H3C0718
-3C0718:lI101|H3C07B4
-3C07B4:lI103|N
-3C0228:lI109|H3C02D4
-3C02D4:lI112|H3C0378
-3C0378:lI50|N
-3C0190:lH3C0238|H3C0244
-3C0238:t2:H3C02E4,H3C02EC
-3C02EC:lI97|H3C0390
-3C0390:lI117|H3C041C
-3C041C:lI100|H3C04A8
-3C04A8:lI105|H3C053C
-3C053C:lI111|H3C05D8
-3C05D8:lI47|H3C067C
-3C067C:lI98|H3C0720
-3C0720:lI97|H3C07BC
-3C07BC:lI115|H3C0848
-3C0848:lI105|H3C08D4
-3C08D4:lI99|N
-3C02E4:lI97|H3C0388
-3C0388:lI117|N
-3C0244:lH3C02F4|H3C0300
-3C02F4:t2:H3C0398,H3C03A0
-3C03A0:lI97|H3C042C
-3C042C:lI117|H3C04B8
-3C04B8:lI100|H3C0544
-3C0544:lI105|H3C05E0
-3C05E0:lI111|H3C0684
-3C0684:lI47|H3C0728
-3C0728:lI98|H3C07C4
-3C07C4:lI97|H3C0850
-3C0850:lI115|H3C08DC
-3C08DC:lI105|H3C0968
-3C0968:lI99|N
-3C0398:lI115|H3C0424
-3C0424:lI110|H3C04B0
-3C04B0:lI100|N
-3C0300:lH3C03A8|H3C03B4
-3C03A8:t2:H3C0434,H3C043C
-3C043C:lI97|H3C04C8
-3C04C8:lI112|H3C0554
-3C0554:lI112|H3C05E8
-3C05E8:lI108|H3C068C
-3C068C:lI105|H3C0730
-3C0730:lI99|H3C07CC
-3C07CC:lI97|H3C0858
-3C0858:lI116|H3C08E4
-3C08E4:lI105|H3C0970
-3C0970:lI111|H3C09FC
-3C09FC:lI110|H3C0A98
-3C0A98:lI47|H3C0B34
-3C0B34:lI122|H3C0BD8
-3C0BD8:lI105|H3C0C8C
-3C0C8C:lI112|N
-3C0434:lI122|H3C04C0
-3C04C0:lI105|H3C054C
-3C054C:lI112|N
-3C03B4:lH3C0444|H3C0450
-3C0444:t2:H3C04D0,H3C04D8
-3C04D8:lI97|H3C0564
-3C0564:lI112|H3C05F8
-3C05F8:lI112|H3C0694
-3C0694:lI108|H3C0738
-3C0738:lI105|H3C07D4
-3C07D4:lI99|H3C0860
-3C0860:lI97|H3C08EC
-3C08EC:lI116|H3C0978
-3C0978:lI105|H3C0A04
-3C0A04:lI111|H3C0AA0
-3C0AA0:lI110|H3C0B3C
-3C0B3C:lI47|H3C0BE0
-3C0BE0:lI120|H3C0C94
-3C0C94:lI45|H3C0D40
-3C0D40:lI119|H3C0DF4
-3C0DF4:lI97|H3C0EA8
-3C0EA8:lI105|H3C0F64
-3C0F64:lI115|H3C1030
-3C1030:lI45|H3C1104
-3C1104:lI115|H3C11D8
-3C11D8:lI111|H3C12A4
-3C12A4:lI117|H3C1378
-3C1378:lI114|H3C1454
-3C1454:lI99|H3C1538
-3C1538:lI101|N
-3C04D0:lI115|H3C055C
-3C055C:lI114|H3C05F0
-3C05F0:lI99|N
-3C0450:lH3C04E0|H3C04EC
-3C04E0:t2:H3C056C,H3C0574
-3C0574:lI97|H3C0608
-3C0608:lI112|H3C06A4
-3C06A4:lI112|H3C0748
-3C0748:lI108|H3C07E4
-3C07E4:lI105|H3C0868
-3C0868:lI99|H3C08F4
-3C08F4:lI97|H3C0980
-3C0980:lI116|H3C0A0C
-3C0A0C:lI105|H3C0AA8
-3C0AA8:lI111|H3C0B44
-3C0B44:lI110|H3C0BE8
-3C0BE8:lI47|H3C0C9C
-3C0C9C:lI120|H3C0D48
-3C0D48:lI45|H3C0DFC
-3C0DFC:lI117|H3C0EB0
-3C0EB0:lI115|H3C0F6C
-3C0F6C:lI116|H3C1038
-3C1038:lI97|H3C110C
-3C110C:lI114|N
-3C056C:lI117|H3C0600
-3C0600:lI115|H3C069C
-3C069C:lI116|H3C0740
-3C0740:lI97|H3C07DC
-3C07DC:lI114|N
-3C04EC:lH3C057C|H3C0588
-3C057C:t2:H3C0610,H3C0618
-3C0618:lI97|H3C06B4
-3C06B4:lI112|H3C0750
-3C0750:lI112|H3C07EC
-3C07EC:lI108|H3C0870
-3C0870:lI105|H3C08FC
-3C08FC:lI99|H3C0988
-3C0988:lI97|H3C0A14
-3C0A14:lI116|H3C0AB0
-3C0AB0:lI105|H3C0B4C
-3C0B4C:lI111|H3C0BF0
-3C0BF0:lI110|H3C0CA4
-3C0CA4:lI47|H3C0D50
-3C0D50:lI120|H3C0E04
-3C0E04:lI45|H3C0EB8
-3C0EB8:lI116|H3C0F74
-3C0F74:lI114|H3C1040
-3C1040:lI111|H3C1114
-3C1114:lI102|H3C11E0
-3C11E0:lI102|H3C12AC
-3C12AC:lI45|H3C1380
-3C1380:lI109|H3C145C
-3C145C:lI115|N
-3C0610:lI109|H3C06AC
-3C06AC:lI115|N
-3C0588:lH3C0620|H3C062C
-3C0620:t2:H3C06BC,H3C06C4
-3C06C4:lI97|H3C0760
-3C0760:lI112|H3C07F4
-3C07F4:lI112|H3C0878
-3C0878:lI108|H3C0904
-3C0904:lI105|H3C0990
-3C0990:lI99|H3C0A1C
-3C0A1C:lI97|H3C0AB8
-3C0AB8:lI116|H3C0B54
-3C0B54:lI105|H3C0BF8
-3C0BF8:lI111|H3C0CAC
-3C0CAC:lI110|H3C0D58
-3C0D58:lI47|H3C0E0C
-3C0E0C:lI120|H3C0EC0
-3C0EC0:lI45|H3C0F7C
-3C0F7C:lI116|H3C1048
-3C1048:lI114|H3C111C
-3C111C:lI111|H3C11E8
-3C11E8:lI102|H3C12B4
-3C12B4:lI102|H3C1388
-3C1388:lI45|H3C1464
-3C1464:lI109|H3C1540
-3C1540:lI101|N
-3C06BC:lI109|H3C0758
-3C0758:lI101|N
-3C062C:lH3C06CC|H3C06D8
-3C06CC:t2:H3C0768,H3C0770
-3C0770:lI97|H3C0804
-3C0804:lI112|H3C0888
-3C0888:lI112|H3C090C
-3C090C:lI108|H3C0998
-3C0998:lI105|H3C0A24
-3C0A24:lI99|H3C0AC0
-3C0AC0:lI97|H3C0B5C
-3C0B5C:lI116|H3C0C00
-3C0C00:lI105|H3C0CB4
-3C0CB4:lI111|H3C0D60
-3C0D60:lI110|H3C0E14
-3C0E14:lI47|H3C0EC8
-3C0EC8:lI120|H3C0F84
-3C0F84:lI45|H3C1050
-3C1050:lI116|H3C1124
-3C1124:lI114|H3C11F0
-3C11F0:lI111|H3C12BC
-3C12BC:lI102|H3C1390
-3C1390:lI102|H3C146C
-3C146C:lI45|H3C1548
-3C1548:lI109|H3C161C
-3C161C:lI97|H3C16F0
-3C16F0:lI110|N
-3C0768:lI109|H3C07FC
-3C07FC:lI97|H3C0880
-3C0880:lI110|N
-3C06D8:lH3C0778|H3C0784
-3C0778:t2:H3C080C,H3C0814
-3C0814:lI97|H3C0890
-3C0890:lI112|H3C0914
-3C0914:lI112|H3C09A0
-3C09A0:lI108|H3C0A2C
-3C0A2C:lI105|H3C0AC8
-3C0AC8:lI99|H3C0B64
-3C0B64:lI97|H3C0C08
-3C0C08:lI116|H3C0CBC
-3C0CBC:lI105|H3C0D68
-3C0D68:lI111|H3C0E1C
-3C0E1C:lI110|H3C0ED0
-3C0ED0:lI47|H3C0F8C
-3C0F8C:lI120|H3C1058
-3C1058:lI45|H3C112C
-3C112C:lI116|H3C11F8
-3C11F8:lI114|H3C12C4
-3C12C4:lI111|H3C1398
-3C1398:lI102|H3C1474
-3C1474:lI102|N
-3C080C:lI116|N
-3C0784:lH3C081C|H3C0828
-3C081C:t2:H3C0898,H3C08A0
-3C08A0:lI97|H3C0924
-3C0924:lI112|H3C09A8
-3C09A8:lI112|H3C0A34
-3C0A34:lI108|H3C0AD0
-3C0AD0:lI105|H3C0B6C
-3C0B6C:lI99|H3C0C10
-3C0C10:lI97|H3C0CC4
-3C0CC4:lI116|H3C0D70
-3C0D70:lI105|H3C0E24
-3C0E24:lI111|H3C0ED8
-3C0ED8:lI110|H3C0F94
-3C0F94:lI47|H3C1060
-3C1060:lI120|H3C1134
-3C1134:lI45|H3C1200
-3C1200:lI116|H3C12CC
-3C12CC:lI114|H3C13A0
-3C13A0:lI111|H3C147C
-3C147C:lI102|H3C1550
-3C1550:lI102|N
-3C0898:lI116|H3C091C
-3C091C:lI114|N
-3C0828:lH3C08A8|H3C08B4
-3C08A8:t2:H3C092C,H3C0934
-3C0934:lI97|H3C09B8
-3C09B8:lI112|H3C0A44
-3C0A44:lI112|H3C0AE0
-3C0AE0:lI108|H3C0B74
-3C0B74:lI105|H3C0C18
-3C0C18:lI99|H3C0CCC
-3C0CCC:lI97|H3C0D78
-3C0D78:lI116|H3C0E2C
-3C0E2C:lI105|H3C0EE0
-3C0EE0:lI111|H3C0F9C
-3C0F9C:lI110|H3C1068
-3C1068:lI47|H3C113C
-3C113C:lI120|H3C1208
-3C1208:lI45|H3C12D4
-3C12D4:lI116|H3C13A8
-3C13A8:lI114|H3C1484
-3C1484:lI111|H3C1558
-3C1558:lI102|H3C1624
-3C1624:lI102|N
-3C092C:lI114|H3C09B0
-3C09B0:lI111|H3C0A3C
-3C0A3C:lI102|H3C0AD8
-3C0AD8:lI102|N
-3C08B4:lH3C093C|H3C0948
-3C093C:t2:H3C09C0,H3C09C8
-3C09C8:lI97|H3C0A54
-3C0A54:lI112|H3C0AF0
-3C0AF0:lI112|H3C0B84
-3C0B84:lI108|H3C0C28
-3C0C28:lI105|H3C0CDC
-3C0CDC:lI99|H3C0D88
-3C0D88:lI97|H3C0E34
-3C0E34:lI116|H3C0EE8
-3C0EE8:lI105|H3C0FA4
-3C0FA4:lI111|H3C1070
-3C1070:lI110|H3C1144
-3C1144:lI47|H3C1210
-3C1210:lI120|H3C12DC
-3C12DC:lI45|H3C13B0
-3C13B0:lI116|H3C148C
-3C148C:lI101|H3C1560
-3C1560:lI120|H3C162C
-3C162C:lI105|H3C16F8
-3C16F8:lI110|H3C17BC
-3C17BC:lI102|H3C1880
-3C1880:lI111|N
-3C09C0:lI116|H3C0A4C
-3C0A4C:lI101|H3C0AE8
-3C0AE8:lI120|H3C0B7C
-3C0B7C:lI105|H3C0C20
-3C0C20:lI110|H3C0CD4
-3C0CD4:lI102|H3C0D80
-3C0D80:lI111|N
-3C0948:lH3C09D0|H3C09DC
-3C09D0:t2:H3C0A5C,H3C0A64
-3C0A64:lI97|H3C0B00
-3C0B00:lI112|H3C0B94
-3C0B94:lI112|H3C0C38
-3C0C38:lI108|H3C0CE4
-3C0CE4:lI105|H3C0D90
-3C0D90:lI99|H3C0E3C
-3C0E3C:lI97|H3C0EF0
-3C0EF0:lI116|H3C0FAC
-3C0FAC:lI105|H3C1078
-3C1078:lI111|H3C114C
-3C114C:lI110|H3C1218
-3C1218:lI47|H3C12E4
-3C12E4:lI120|H3C13B8
-3C13B8:lI45|H3C1494
-3C1494:lI116|H3C1568
-3C1568:lI101|H3C1634
-3C1634:lI120|H3C1700
-3C1700:lI105|H3C17C4
-3C17C4:lI110|H3C1888
-3C1888:lI102|H3C1944
-3C1944:lI111|N
-3C0A5C:lI116|H3C0AF8
-3C0AF8:lI101|H3C0B8C
-3C0B8C:lI120|H3C0C30
-3C0C30:lI105|N
-3C09DC:lH3C0A6C|H3C0A78
-3C0A6C:t2:H3C0B08,H3C0B10
-3C0B10:lI97|H3C0BA4
-3C0BA4:lI112|H3C0C48
-3C0C48:lI112|H3C0CEC
-3C0CEC:lI108|H3C0D98
-3C0D98:lI105|H3C0E44
-3C0E44:lI99|H3C0EF8
-3C0EF8:lI97|H3C0FB4
-3C0FB4:lI116|H3C1080
-3C1080:lI105|H3C1154
-3C1154:lI111|H3C1220
-3C1220:lI110|H3C12EC
-3C12EC:lI47|H3C13C0
-3C13C0:lI120|H3C149C
-3C149C:lI45|H3C1570
-3C1570:lI116|H3C163C
-3C163C:lI101|H3C1708
-3C1708:lI120|N
-3C0B08:lI116|H3C0B9C
-3C0B9C:lI101|H3C0C40
-3C0C40:lI120|N
-3C0A78:lH3C0B18|H3C0B24
-3C0B18:t2:H3C0BAC,H3C0BB4
-3C0BB4:lI97|H3C0C58
-3C0C58:lI112|H3C0CFC
-3C0CFC:lI112|H3C0DA0
-3C0DA0:lI108|H3C0E4C
-3C0E4C:lI105|H3C0F00
-3C0F00:lI99|H3C0FBC
-3C0FBC:lI97|H3C1088
-3C1088:lI116|H3C115C
-3C115C:lI105|H3C1228
-3C1228:lI111|H3C12F4
-3C12F4:lI110|H3C13C8
-3C13C8:lI47|H3C14A4
-3C14A4:lI120|H3C1578
-3C1578:lI45|H3C1644
-3C1644:lI116|H3C1710
-3C1710:lI99|H3C17CC
-3C17CC:lI108|N
-3C0BAC:lI116|H3C0C50
-3C0C50:lI99|H3C0CF4
-3C0CF4:lI108|N
-3C0B24:lH3C0BBC|H3C0BC8
-3C0BBC:t2:H3C0C60,H3C0C68
-3C0C68:lI97|H3C0D0C
-3C0D0C:lI112|H3C0DB0
-3C0DB0:lI112|H3C0E54
-3C0E54:lI108|H3C0F08
-3C0F08:lI105|H3C0FC4
-3C0FC4:lI99|H3C1090
-3C1090:lI97|H3C1164
-3C1164:lI116|H3C1230
-3C1230:lI105|H3C12FC
-3C12FC:lI111|H3C13D0
-3C13D0:lI110|H3C14AC
-3C14AC:lI47|H3C1580
-3C1580:lI120|H3C164C
-3C164C:lI45|H3C1718
-3C1718:lI116|H3C17D4
-3C17D4:lI97|H3C1890
-3C1890:lI114|N
-3C0C60:lI116|H3C0D04
-3C0D04:lI97|H3C0DA8
-3C0DA8:lI114|N
-3C0BC8:lH3C0C70|H3C0C7C
-3C0C70:t2:H3C0D14,H3C0D1C
-3C0D1C:lI97|H3C0DC0
-3C0DC0:lI112|H3C0E64
-3C0E64:lI112|H3C0F18
-3C0F18:lI108|H3C0FD4
-3C0FD4:lI105|H3C10A0
-3C10A0:lI99|H3C116C
-3C116C:lI97|H3C1238
-3C1238:lI116|H3C1304
-3C1304:lI105|H3C13D8
-3C13D8:lI111|H3C14B4
-3C14B4:lI110|H3C1588
-3C1588:lI47|H3C1654
-3C1654:lI120|H3C1720
-3C1720:lI45|H3C17DC
-3C17DC:lI115|H3C1898
-3C1898:lI118|H3C194C
-3C194C:lI52|H3C1A00
-3C1A00:lI99|H3C1AB4
-3C1AB4:lI114|H3C1B78
-3C1B78:lI99|N
-3C0D14:lI115|H3C0DB8
-3C0DB8:lI118|H3C0E5C
-3C0E5C:lI52|H3C0F10
-3C0F10:lI99|H3C0FCC
-3C0FCC:lI114|H3C1098
-3C1098:lI99|N
-3C0C7C:lH3C0D24|H3C0D30
-3C0D24:t2:H3C0DC8,H3C0DD0
-3C0DD0:lI97|H3C0E74
-3C0E74:lI112|H3C0F28
-3C0F28:lI112|H3C0FE4
-3C0FE4:lI108|H3C10B0
-3C10B0:lI105|H3C117C
-3C117C:lI99|H3C1248
-3C1248:lI97|H3C130C
-3C130C:lI116|H3C13E0
-3C13E0:lI105|H3C14BC
-3C14BC:lI111|H3C1590
-3C1590:lI110|H3C165C
-3C165C:lI47|H3C1728
-3C1728:lI120|H3C17E4
-3C17E4:lI45|H3C18A0
-3C18A0:lI115|H3C1954
-3C1954:lI118|H3C1A08
-3C1A08:lI52|H3C1ABC
-3C1ABC:lI99|H3C1B80
-3C1B80:lI112|H3C1C4C
-3C1C4C:lI105|H3C1D10
-3C1D10:lI111|N
-3C0DC8:lI115|H3C0E6C
-3C0E6C:lI118|H3C0F20
-3C0F20:lI52|H3C0FDC
-3C0FDC:lI99|H3C10A8
-3C10A8:lI112|H3C1174
-3C1174:lI105|H3C1240
-3C1240:lI111|N
-3C0D30:lH3C0DD8|H3C0DE4
-3C0DD8:t2:H3C0E7C,H3C0E84
-3C0E84:lI97|H3C0F38
-3C0F38:lI112|H3C0FF4
-3C0FF4:lI112|H3C10B8
-3C10B8:lI108|H3C1184
-3C1184:lI105|H3C1250
-3C1250:lI99|H3C1314
-3C1314:lI97|H3C13E8
-3C13E8:lI116|H3C14C4
-3C14C4:lI105|H3C1598
-3C1598:lI111|H3C1664
-3C1664:lI110|H3C1730
-3C1730:lI47|H3C17EC
-3C17EC:lI120|H3C18A8
-3C18A8:lI45|H3C195C
-3C195C:lI115|H3C1A10
-3C1A10:lI116|H3C1AC4
-3C1AC4:lI117|H3C1B88
-3C1B88:lI102|H3C1C54
-3C1C54:lI102|H3C1D18
-3C1D18:lI105|H3C1DD4
-3C1DD4:lI116|N
-3C0E7C:lI115|H3C0F30
-3C0F30:lI105|H3C0FEC
-3C0FEC:lI116|N
-3C0DE4:lH3C0E8C|H3C0E98
-3C0E8C:t2:H3C0F40,H3C0F48
-3C0F48:lI97|H3C1004
-3C1004:lI112|H3C10C8
-3C10C8:lI112|H3C1194
-3C1194:lI108|H3C1258
-3C1258:lI105|H3C131C
-3C131C:lI99|H3C13F0
-3C13F0:lI97|H3C14CC
-3C14CC:lI116|H3C15A0
-3C15A0:lI105|H3C166C
-3C166C:lI111|H3C1738
-3C1738:lI110|H3C17F4
-3C17F4:lI47|H3C18B0
-3C18B0:lI120|H3C1964
-3C1964:lI45|H3C1A18
-3C1A18:lI115|H3C1ACC
-3C1ACC:lI104|H3C1B90
-3C1B90:lI97|H3C1C5C
-3C1C5C:lI114|N
-3C0F40:lI115|H3C0FFC
-3C0FFC:lI104|H3C10C0
-3C10C0:lI97|H3C118C
-3C118C:lI114|N
-3C0E98:lH3C0F50|H3C0F5C
-3C0F50:t2:H3C100C,H3C1014
-3C1014:lI97|H3C10D8
-3C10D8:lI112|H3C119C
-3C119C:lI112|H3C1260
-3C1260:lI108|H3C1324
-3C1324:lI105|H3C13F8
-3C13F8:lI99|H3C14D4
-3C14D4:lI97|H3C15A8
-3C15A8:lI116|H3C1674
-3C1674:lI105|H3C1740
-3C1740:lI111|H3C17FC
-3C17FC:lI110|H3C18B8
-3C18B8:lI47|H3C196C
-3C196C:lI120|H3C1A20
-3C1A20:lI45|H3C1AD4
-3C1AD4:lI115|H3C1B98
-3C1B98:lI104|N
-3C100C:lI115|H3C10D0
-3C10D0:lI104|N
-3C0F5C:lH3C101C|H3C1028
-3C101C:t2:H3C10E0,H3C10E8
-3C10E8:lI97|H3C11AC
-3C11AC:lI112|H3C1268
-3C1268:lI112|H3C132C
-3C132C:lI108|H3C1400
-3C1400:lI105|H3C14DC
-3C14DC:lI99|H3C15B0
-3C15B0:lI97|H3C167C
-3C167C:lI116|H3C1748
-3C1748:lI105|H3C1804
-3C1804:lI111|H3C18C0
-3C18C0:lI110|H3C1974
-3C1974:lI47|H3C1A28
-3C1A28:lI120|H3C1ADC
-3C1ADC:lI45|H3C1BA0
-3C1BA0:lI110|H3C1C64
-3C1C64:lI101|H3C1D20
-3C1D20:lI116|H3C1DDC
-3C1DDC:lI99|H3C1E98
-3C1E98:lI100|H3C1F5C
-3C1F5C:lI102|N
-3C10E0:lI110|H3C11A4
-3C11A4:lI99|N
-3C1028:lH3C10F0|H3C10FC
-3C10F0:t2:H3C11B4,H3C11BC
-3C11BC:lI97|H3C1278
-3C1278:lI112|H3C133C
-3C133C:lI112|H3C1408
-3C1408:lI108|H3C14E4
-3C14E4:lI105|H3C15B8
-3C15B8:lI99|H3C1684
-3C1684:lI97|H3C1750
-3C1750:lI116|H3C180C
-3C180C:lI105|H3C18C8
-3C18C8:lI111|H3C197C
-3C197C:lI110|H3C1A30
-3C1A30:lI47|H3C1AE4
-3C1AE4:lI120|H3C1BA8
-3C1BA8:lI45|H3C1C6C
-3C1C6C:lI110|H3C1D28
-3C1D28:lI101|H3C1DE4
-3C1DE4:lI116|H3C1EA0
-3C1EA0:lI99|H3C1F64
-3C1F64:lI100|H3C2018
-3C2018:lI102|N
-3C11B4:lI99|H3C1270
-3C1270:lI100|H3C1334
-3C1334:lI102|N
-3C10FC:lH3C11C4|H3C11D0
-3C11C4:t2:H3C1280,H3C1288
-3C1288:lI97|H3C134C
-3C134C:lI112|H3C1418
-3C1418:lI112|H3C14EC
-3C14EC:lI108|H3C15C0
-3C15C0:lI105|H3C168C
-3C168C:lI99|H3C1758
-3C1758:lI97|H3C1814
-3C1814:lI116|H3C18D0
-3C18D0:lI105|H3C1984
-3C1984:lI111|H3C1A38
-3C1A38:lI110|H3C1AEC
-3C1AEC:lI47|H3C1BB0
-3C1BB0:lI120|H3C1C74
-3C1C74:lI45|H3C1D30
-3C1D30:lI109|H3C1DEC
-3C1DEC:lI105|H3C1EA8
-3C1EA8:lI102|N
-3C1280:lI109|H3C1344
-3C1344:lI105|H3C1410
-3C1410:lI102|N
-3C11D0:lH3C1290|H3C129C
-3C1290:t2:H3C1354,H3C135C
-3C135C:lI97|H3C1428
-3C1428:lI112|H3C14FC
-3C14FC:lI112|H3C15D0
-3C15D0:lI108|H3C169C
-3C169C:lI105|H3C1760
-3C1760:lI99|H3C181C
-3C181C:lI97|H3C18D8
-3C18D8:lI116|H3C198C
-3C198C:lI105|H3C1A40
-3C1A40:lI111|H3C1AF4
-3C1AF4:lI110|H3C1BB8
-3C1BB8:lI47|H3C1C7C
-3C1C7C:lI120|H3C1D38
-3C1D38:lI45|H3C1DF4
-3C1DF4:lI108|H3C1EB0
-3C1EB0:lI97|H3C1F6C
-3C1F6C:lI116|H3C2020
-3C2020:lI101|H3C20DC
-3C20DC:lI120|N
-3C1354:lI108|H3C1420
-3C1420:lI97|H3C14F4
-3C14F4:lI116|H3C15C8
-3C15C8:lI101|H3C1694
-3C1694:lI120|N
-3C129C:lH3C1364|H3C1370
-3C1364:t2:H3C1430,H3C1438
-3C1438:lI97|H3C150C
-3C150C:lI112|H3C15E0
-3C15E0:lI112|H3C16A4
-3C16A4:lI108|H3C1768
-3C1768:lI105|H3C1824
-3C1824:lI99|H3C18E0
-3C18E0:lI97|H3C1994
-3C1994:lI116|H3C1A48
-3C1A48:lI105|H3C1AFC
-3C1AFC:lI111|H3C1BC0
-3C1BC0:lI110|H3C1C84
-3C1C84:lI47|H3C1D40
-3C1D40:lI120|H3C1DFC
-3C1DFC:lI45|H3C1EB8
-3C1EB8:lI107|H3C1F74
-3C1F74:lI111|H3C2028
-3C2028:lI97|H3C20E4
-3C20E4:lI110|N
-3C1430:lI115|H3C1504
-3C1504:lI107|H3C15D8
-3C15D8:lI112|N
-3C1370:lH3C1440|H3C144C
-3C1440:t2:H3C1514,H3C151C
-3C151C:lI97|H3C15F0
-3C15F0:lI112|H3C16B4
-3C16B4:lI112|H3C1770
-3C1770:lI108|H3C182C
-3C182C:lI105|H3C18E8
-3C18E8:lI99|H3C199C
-3C199C:lI97|H3C1A50
-3C1A50:lI116|H3C1B04
-3C1B04:lI105|H3C1BC8
-3C1BC8:lI111|H3C1C8C
-3C1C8C:lI110|H3C1D48
-3C1D48:lI47|H3C1E04
-3C1E04:lI120|H3C1EC0
-3C1EC0:lI45|H3C1F7C
-3C1F7C:lI107|H3C2030
-3C2030:lI111|H3C20EC
-3C20EC:lI97|H3C21A0
-3C21A0:lI110|N
-3C1514:lI115|H3C15E8
-3C15E8:lI107|H3C16AC
-3C16AC:lI100|N
-3C144C:lH3C1524|H3C1530
-3C1524:t2:H3C15F8,H3C1600
-3C1600:lI97|H3C16C4
-3C16C4:lI112|H3C1780
-3C1780:lI112|H3C1834
-3C1834:lI108|H3C18F0
-3C18F0:lI105|H3C19A4
-3C19A4:lI99|H3C1A58
-3C1A58:lI97|H3C1B0C
-3C1B0C:lI116|H3C1BD0
-3C1BD0:lI105|H3C1C94
-3C1C94:lI111|H3C1D50
-3C1D50:lI110|H3C1E0C
-3C1E0C:lI47|H3C1EC8
-3C1EC8:lI120|H3C1F84
-3C1F84:lI45|H3C2038
-3C2038:lI107|H3C20F4
-3C20F4:lI111|H3C21A8
-3C21A8:lI97|H3C225C
-3C225C:lI110|N
-3C15F8:lI115|H3C16BC
-3C16BC:lI107|H3C1778
-3C1778:lI116|N
-3C1530:lH3C1608|H3C1614
-3C1608:t2:H3C16CC,H3C16D4
-3C16D4:lI97|H3C1790
-3C1790:lI112|H3C1844
-3C1844:lI112|H3C18F8
-3C18F8:lI108|H3C19AC
-3C19AC:lI105|H3C1A60
-3C1A60:lI99|H3C1B14
-3C1B14:lI97|H3C1BD8
-3C1BD8:lI116|H3C1C9C
-3C1C9C:lI105|H3C1D58
-3C1D58:lI111|H3C1E14
-3C1E14:lI110|H3C1ED0
-3C1ED0:lI47|H3C1F8C
-3C1F8C:lI120|H3C2040
-3C2040:lI45|H3C20FC
-3C20FC:lI107|H3C21B0
-3C21B0:lI111|H3C2264
-3C2264:lI97|H3C2320
-3C2320:lI110|N
-3C16CC:lI115|H3C1788
-3C1788:lI107|H3C183C
-3C183C:lI109|N
-3C1614:lH3C16DC|H3C16E8
-3C16DC:t2:H3C1798,H3C17A0
-3C17A0:lI97|H3C1854
-3C1854:lI112|H3C1908
-3C1908:lI112|H3C19B4
-3C19B4:lI108|H3C1A68
-3C1A68:lI105|H3C1B1C
-3C1B1C:lI99|H3C1BE0
-3C1BE0:lI97|H3C1CA4
-3C1CA4:lI116|H3C1D60
-3C1D60:lI105|H3C1E1C
-3C1E1C:lI111|H3C1ED8
-3C1ED8:lI110|H3C1F94
-3C1F94:lI47|H3C2048
-3C2048:lI120|H3C2104
-3C2104:lI45|H3C21B8
-3C21B8:lI104|H3C226C
-3C226C:lI116|H3C2328
-3C2328:lI116|H3C23E4
-3C23E4:lI112|H3C2498
-3C2498:lI100|H3C2554
-3C2554:lI45|H3C2610
-3C2610:lI99|H3C26D4
-3C26D4:lI103|H3C2790
-3C2790:lI105|N
-3C1798:lI99|H3C184C
-3C184C:lI103|H3C1900
-3C1900:lI105|N
-3C16E8:lH3C17A8|H3C17B4
-3C17A8:t2:H3C185C,H3C1864
-3C1864:lI97|H3C1918
-3C1918:lI112|H3C19C4
-3C19C4:lI112|H3C1A70
-3C1A70:lI108|H3C1B24
-3C1B24:lI105|H3C1BE8
-3C1BE8:lI99|H3C1CAC
-3C1CAC:lI97|H3C1D68
-3C1D68:lI116|H3C1E24
-3C1E24:lI105|H3C1EE0
-3C1EE0:lI111|H3C1F9C
-3C1F9C:lI110|H3C2050
-3C2050:lI47|H3C210C
-3C210C:lI120|H3C21C0
-3C21C0:lI45|H3C2274
-3C2274:lI104|H3C2330
-3C2330:lI100|H3C23EC
-3C23EC:lI102|N
-3C185C:lI104|H3C1910
-3C1910:lI100|H3C19BC
-3C19BC:lI102|N
-3C17B4:lH3C186C|H3C1878
-3C186C:t2:H3C1920,H3C1928
-3C1928:lI97|H3C19D4
-3C19D4:lI112|H3C1A78
-3C1A78:lI112|H3C1B2C
-3C1B2C:lI108|H3C1BF0
-3C1BF0:lI105|H3C1CB4
-3C1CB4:lI99|H3C1D70
-3C1D70:lI97|H3C1E2C
-3C1E2C:lI116|H3C1EE8
-3C1EE8:lI105|H3C1FA4
-3C1FA4:lI111|H3C2058
-3C2058:lI110|H3C2114
-3C2114:lI47|H3C21C8
-3C21C8:lI120|H3C227C
-3C227C:lI45|H3C2338
-3C2338:lI103|H3C23F4
-3C23F4:lI122|H3C24A0
-3C24A0:lI105|H3C255C
-3C255C:lI112|N
-3C1920:lI103|H3C19CC
-3C19CC:lI122|N
-3C1878:lH3C1930|H3C193C
-3C1930:t2:H3C19DC,H3C19E4
-3C19E4:lI97|H3C1A88
-3C1A88:lI112|H3C1B3C
-3C1B3C:lI112|H3C1C00
-3C1C00:lI108|H3C1CBC
-3C1CBC:lI105|H3C1D78
-3C1D78:lI99|H3C1E34
-3C1E34:lI97|H3C1EF0
-3C1EF0:lI116|H3C1FAC
-3C1FAC:lI105|H3C2060
-3C2060:lI111|H3C211C
-3C211C:lI110|H3C21D0
-3C21D0:lI47|H3C2284
-3C2284:lI120|H3C2340
-3C2340:lI45|H3C23FC
-3C23FC:lI103|H3C24A8
-3C24A8:lI116|H3C2564
-3C2564:lI97|H3C2618
-3C2618:lI114|N
-3C19DC:lI103|H3C1A80
-3C1A80:lI116|H3C1B34
-3C1B34:lI97|H3C1BF8
-3C1BF8:lI114|N
-3C193C:lH3C19EC|H3C19F8
-3C19EC:t2:H3C1A90,H3C1A98
-3C1A98:lI97|H3C1B4C
-3C1B4C:lI112|H3C1C10
-3C1C10:lI112|H3C1CC4
-3C1CC4:lI108|H3C1D80
-3C1D80:lI105|H3C1E3C
-3C1E3C:lI99|H3C1EF8
-3C1EF8:lI97|H3C1FB4
-3C1FB4:lI116|H3C2068
-3C2068:lI105|H3C2124
-3C2124:lI111|H3C21D8
-3C21D8:lI110|H3C228C
-3C228C:lI47|H3C2348
-3C2348:lI120|H3C2404
-3C2404:lI45|H3C24B0
-3C24B0:lI100|H3C256C
-3C256C:lI118|H3C2620
-3C2620:lI105|N
-3C1A90:lI100|H3C1B44
-3C1B44:lI118|H3C1C08
-3C1C08:lI105|N
-3C19F8:lH3C1AA0|H3C1AAC
-3C1AA0:t2:H3C1B54,H3C1B5C
-3C1B5C:lI97|H3C1C20
-3C1C20:lI112|H3C1CD4
-3C1CD4:lI112|H3C1D88
-3C1D88:lI108|H3C1E44
-3C1E44:lI105|H3C1F00
-3C1F00:lI99|H3C1FBC
-3C1FBC:lI97|H3C2070
-3C2070:lI116|H3C212C
-3C212C:lI105|H3C21E0
-3C21E0:lI111|H3C2294
-3C2294:lI110|H3C2350
-3C2350:lI47|H3C240C
-3C240C:lI120|H3C24B8
-3C24B8:lI45|H3C2574
-3C2574:lI100|H3C2628
-3C2628:lI105|H3C26DC
-3C26DC:lI114|H3C2798
-3C2798:lI101|H3C2854
-3C2854:lI99|H3C2918
-3C2918:lI116|H3C29E4
-3C29E4:lI111|H3C2AB0
-3C2AB0:lI114|N
-3C1B54:lI100|H3C1C18
-3C1C18:lI99|H3C1CCC
-3C1CCC:lI114|N
-3C1AAC:lH3C1B64|H3C1B70
-3C1B64:t2:H3C1C28,H3C1C30
-3C1C30:lI97|H3C1CE4
-3C1CE4:lI112|H3C1D98
-3C1D98:lI112|H3C1E4C
-3C1E4C:lI108|H3C1F08
-3C1F08:lI105|H3C1FC4
-3C1FC4:lI99|H3C2078
-3C2078:lI97|H3C2134
-3C2134:lI116|H3C21E8
-3C21E8:lI105|H3C229C
-3C229C:lI111|H3C2358
-3C2358:lI110|H3C2414
-3C2414:lI47|H3C24C0
-3C24C0:lI120|H3C257C
-3C257C:lI45|H3C2630
-3C2630:lI100|H3C26E4
-3C26E4:lI105|H3C27A0
-3C27A0:lI114|H3C285C
-3C285C:lI101|H3C2920
-3C2920:lI99|H3C29EC
-3C29EC:lI116|H3C2AB8
-3C2AB8:lI111|H3C2B84
-3C2B84:lI114|N
-3C1C28:lI100|H3C1CDC
-3C1CDC:lI105|H3C1D90
-3C1D90:lI114|N
-3C1B70:lH3C1C38|H3C1C44
-3C1C38:t2:H3C1CEC,H3C1CF4
-3C1CF4:lI97|H3C1DA8
-3C1DA8:lI112|H3C1E5C
-3C1E5C:lI112|H3C1F10
-3C1F10:lI108|H3C1FCC
-3C1FCC:lI105|H3C2080
-3C2080:lI99|H3C213C
-3C213C:lI97|H3C21F0
-3C21F0:lI116|H3C22A4
-3C22A4:lI105|H3C2360
-3C2360:lI111|H3C241C
-3C241C:lI110|H3C24C8
-3C24C8:lI47|H3C2584
-3C2584:lI120|H3C2638
-3C2638:lI45|H3C26EC
-3C26EC:lI100|H3C27A8
-3C27A8:lI105|H3C2864
-3C2864:lI114|H3C2928
-3C2928:lI101|H3C29F4
-3C29F4:lI99|H3C2AC0
-3C2AC0:lI116|H3C2B8C
-3C2B8C:lI111|H3C2C48
-3C2C48:lI114|N
-3C1CEC:lI100|H3C1DA0
-3C1DA0:lI120|H3C1E54
-3C1E54:lI114|N
-3C1C44:lH3C1CFC|H3C1D08
-3C1CFC:t2:H3C1DB0,H3C1DB8
-3C1DB8:lI97|H3C1E6C
-3C1E6C:lI112|H3C1F20
-3C1F20:lI112|H3C1FD4
-3C1FD4:lI108|H3C2088
-3C2088:lI105|H3C2144
-3C2144:lI99|H3C21F8
-3C21F8:lI97|H3C22AC
-3C22AC:lI116|H3C2368
-3C2368:lI105|H3C2424
-3C2424:lI111|H3C24D0
-3C24D0:lI110|H3C258C
-3C258C:lI47|H3C2640
-3C2640:lI120|H3C26F4
-3C26F4:lI45|H3C27B0
-3C27B0:lI99|H3C286C
-3C286C:lI115|H3C2930
-3C2930:lI104|N
-3C1DB0:lI99|H3C1E64
-3C1E64:lI115|H3C1F18
-3C1F18:lI104|N
-3C1D08:lH3C1DC0|H3C1DCC
-3C1DC0:t2:H3C1E74,H3C1E7C
-3C1E7C:lI97|H3C1F30
-3C1F30:lI112|H3C1FE4
-3C1FE4:lI112|H3C2098
-3C2098:lI108|H3C214C
-3C214C:lI105|H3C2200
-3C2200:lI99|H3C22B4
-3C22B4:lI97|H3C2370
-3C2370:lI116|H3C242C
-3C242C:lI105|H3C24D8
-3C24D8:lI111|H3C2594
-3C2594:lI110|H3C2648
-3C2648:lI47|H3C26FC
-3C26FC:lI120|H3C27B8
-3C27B8:lI45|H3C2874
-3C2874:lI99|H3C2938
-3C2938:lI112|H3C29FC
-3C29FC:lI105|H3C2AC8
-3C2AC8:lI111|N
-3C1E74:lI99|H3C1F28
-3C1F28:lI112|H3C1FDC
-3C1FDC:lI105|H3C2090
-3C2090:lI111|N
-3C1DCC:lH3C1E84|H3C1E90
-3C1E84:t2:H3C1F38,H3C1F40
-3C1F40:lI97|H3C1FEC
-3C1FEC:lI112|H3C20A0
-3C20A0:lI112|H3C2154
-3C2154:lI108|H3C2208
-3C2208:lI105|H3C22BC
-3C22BC:lI99|H3C2378
-3C2378:lI97|H3C2434
-3C2434:lI116|H3C24E0
-3C24E0:lI105|H3C259C
-3C259C:lI111|H3C2650
-3C2650:lI110|H3C2704
-3C2704:lI47|H3C27C0
-3C27C0:lI120|H3C287C
-3C287C:lI45|H3C2940
-3C2940:lI99|H3C2A04
-3C2A04:lI111|H3C2AD0
-3C2AD0:lI109|H3C2B94
-3C2B94:lI112|H3C2C50
-3C2C50:lI114|H3C2D00
-3C2D00:lI101|H3C2DA8
-3C2DA8:lI115|H3C2E40
-3C2E40:lI115|N
-3C1F38:lI90|N
-3C1E90:lH3C1F48|H3C1F54
-3C1F48:t2:H3C1FF4,H3C1FFC
-3C1FFC:lI97|H3C20B0
-3C20B0:lI112|H3C2164
-3C2164:lI112|H3C2210
-3C2210:lI108|H3C22C4
-3C22C4:lI105|H3C2380
-3C2380:lI99|H3C243C
-3C243C:lI97|H3C24E8
-3C24E8:lI116|H3C25A4
-3C25A4:lI105|H3C2658
-3C2658:lI111|H3C270C
-3C270C:lI110|H3C27C8
-3C27C8:lI47|H3C2884
-3C2884:lI120|H3C2948
-3C2948:lI45|H3C2A0C
-3C2A0C:lI99|H3C2AD8
-3C2AD8:lI100|H3C2B9C
-3C2B9C:lI108|H3C2C58
-3C2C58:lI105|H3C2D08
-3C2D08:lI110|H3C2DB0
-3C2DB0:lI107|N
-3C1FF4:lI118|H3C20A8
-3C20A8:lI99|H3C215C
-3C215C:lI100|N
-3C1F54:lH3C2004|H3C2010
-3C2004:t2:H3C20B8,H3C20C0
-3C20C0:lI97|H3C2174
-3C2174:lI112|H3C2220
-3C2220:lI112|H3C22D4
-3C22D4:lI108|H3C2390
-3C2390:lI105|H3C2444
-3C2444:lI99|H3C24F0
-3C24F0:lI97|H3C25AC
-3C25AC:lI116|H3C2660
-3C2660:lI105|H3C2714
-3C2714:lI111|H3C27D0
-3C27D0:lI110|H3C288C
-3C288C:lI47|H3C2950
-3C2950:lI120|H3C2A14
-3C2A14:lI45|H3C2AE0
-3C2AE0:lI98|H3C2BA4
-3C2BA4:lI99|H3C2C60
-3C2C60:lI112|H3C2D10
-3C2D10:lI105|H3C2DB8
-3C2DB8:lI111|N
-3C20B8:lI98|H3C216C
-3C216C:lI99|H3C2218
-3C2218:lI112|H3C22CC
-3C22CC:lI105|H3C2388
-3C2388:lI111|N
-3C2010:lH3C20C8|H3C20D4
-3C20C8:t2:H3C217C,H3C2184
-3C2184:lI97|H3C2230
-3C2230:lI112|H3C22E4
-3C22E4:lI112|H3C2398
-3C2398:lI108|H3C244C
-3C244C:lI105|H3C24F8
-3C24F8:lI99|H3C25B4
-3C25B4:lI97|H3C2668
-3C2668:lI116|H3C271C
-3C271C:lI105|H3C27D8
-3C27D8:lI111|H3C2894
-3C2894:lI110|H3C2958
-3C2958:lI47|H3C2A1C
-3C2A1C:lI114|H3C2AE8
-3C2AE8:lI116|H3C2BAC
-3C2BAC:lI102|N
-3C217C:lI114|H3C2228
-3C2228:lI116|H3C22DC
-3C22DC:lI102|N
-3C20D4:lH3C218C|H3C2198
-3C218C:t2:H3C2238,H3C2240
-3C2240:lI97|H3C22F4
-3C22F4:lI112|H3C23A8
-3C23A8:lI112|H3C2454
-3C2454:lI108|H3C2500
-3C2500:lI105|H3C25BC
-3C25BC:lI99|H3C2670
-3C2670:lI97|H3C2724
-3C2724:lI116|H3C27E0
-3C27E0:lI105|H3C289C
-3C289C:lI111|H3C2960
-3C2960:lI110|H3C2A24
-3C2A24:lI47|H3C2AF0
-3C2AF0:lI112|H3C2BB4
-3C2BB4:lI111|H3C2C68
-3C2C68:lI119|H3C2D18
-3C2D18:lI101|H3C2DC0
-3C2DC0:lI114|H3C2E48
-3C2E48:lI112|H3C2EC0
-3C2EC0:lI111|H3C2F38
-3C2F38:lI105|H3C2FA8
-3C2FA8:lI110|H3C3010
-3C3010:lI116|N
-3C2238:lI112|H3C22EC
-3C22EC:lI112|H3C23A0
-3C23A0:lI116|N
-3C2198:lH3C2248|H3C2254
-3C2248:t2:H3C22FC,H3C2304
-3C2304:lI97|H3C23B8
-3C23B8:lI112|H3C245C
-3C245C:lI112|H3C2508
-3C2508:lI108|H3C25C4
-3C25C4:lI105|H3C2678
-3C2678:lI99|H3C272C
-3C272C:lI97|H3C27E8
-3C27E8:lI116|H3C28A4
-3C28A4:lI105|H3C2968
-3C2968:lI111|H3C2A2C
-3C2A2C:lI110|H3C2AF8
-3C2AF8:lI47|H3C2BBC
-3C2BBC:lI112|H3C2C70
-3C2C70:lI111|H3C2D20
-3C2D20:lI115|H3C2DC8
-3C2DC8:lI116|H3C2E50
-3C2E50:lI115|H3C2EC8
-3C2EC8:lI99|H3C2F40
-3C2F40:lI114|H3C2FB0
-3C2FB0:lI105|H3C3018
-3C3018:lI112|H3C3078
-3C3078:lI116|N
-3C22FC:lI97|H3C23B0
-3C23B0:lI105|N
-3C2254:lH3C230C|H3C2318
-3C230C:t2:H3C23C0,H3C23C8
-3C23C8:lI97|H3C246C
-3C246C:lI112|H3C2518
-3C2518:lI112|H3C25CC
-3C25CC:lI108|H3C2680
-3C2680:lI105|H3C2734
-3C2734:lI99|H3C27F0
-3C27F0:lI97|H3C28AC
-3C28AC:lI116|H3C2970
-3C2970:lI105|H3C2A34
-3C2A34:lI111|H3C2B00
-3C2B00:lI110|H3C2BC4
-3C2BC4:lI47|H3C2C78
-3C2C78:lI112|H3C2D28
-3C2D28:lI111|H3C2DD0
-3C2DD0:lI115|H3C2E58
-3C2E58:lI116|H3C2ED0
-3C2ED0:lI115|H3C2F48
-3C2F48:lI99|H3C2FB8
-3C2FB8:lI114|H3C3020
-3C3020:lI105|H3C3080
-3C3080:lI112|H3C30D8
-3C30D8:lI116|N
-3C23C0:lI101|H3C2464
-3C2464:lI112|H3C2510
-3C2510:lI115|N
-3C2318:lH3C23D0|H3C23DC
-3C23D0:t2:H3C2474,H3C247C
-3C247C:lI97|H3C2528
-3C2528:lI112|H3C25D4
-3C25D4:lI112|H3C2688
-3C2688:lI108|H3C273C
-3C273C:lI105|H3C27F8
-3C27F8:lI99|H3C28B4
-3C28B4:lI97|H3C2978
-3C2978:lI116|H3C2A3C
-3C2A3C:lI105|H3C2B08
-3C2B08:lI111|H3C2BCC
-3C2BCC:lI110|H3C2C80
-3C2C80:lI47|H3C2D30
-3C2D30:lI112|H3C2DD8
-3C2DD8:lI111|H3C2E60
-3C2E60:lI115|H3C2ED8
-3C2ED8:lI116|H3C2F50
-3C2F50:lI115|H3C2FC0
-3C2FC0:lI99|H3C3028
-3C3028:lI114|H3C3088
-3C3088:lI105|H3C30E0
-3C30E0:lI112|H3C3130
-3C3130:lI116|N
-3C2474:lI112|H3C2520
-3C2520:lI115|N
-3C23DC:lH3C2484|H3C2490
-3C2484:t2:H3C2530,H3C2538
-3C2538:lI97|H3C25E4
-3C25E4:lI112|H3C2698
-3C2698:lI112|H3C2744
-3C2744:lI108|H3C2800
-3C2800:lI105|H3C28BC
-3C28BC:lI99|H3C2980
-3C2980:lI97|H3C2A44
-3C2A44:lI116|H3C2B10
-3C2B10:lI105|H3C2BD4
-3C2BD4:lI111|H3C2C88
-3C2C88:lI110|H3C2D38
-3C2D38:lI47|H3C2DE0
-3C2DE0:lI112|H3C2E68
-3C2E68:lI100|H3C2EE0
-3C2EE0:lI102|N
-3C2530:lI112|H3C25DC
-3C25DC:lI100|H3C2690
-3C2690:lI102|N
-3C2490:lH3C2540|H3C254C
-3C2540:t2:H3C25EC,H3C25F4
-3C25F4:lI97|H3C26A8
-3C26A8:lI112|H3C2754
-3C2754:lI112|H3C2808
-3C2808:lI108|H3C28C4
-3C28C4:lI105|H3C2988
-3C2988:lI99|H3C2A4C
-3C2A4C:lI97|H3C2B18
-3C2B18:lI116|H3C2BDC
-3C2BDC:lI105|H3C2C90
-3C2C90:lI111|H3C2D40
-3C2D40:lI110|H3C2DE8
-3C2DE8:lI47|H3C2E70
-3C2E70:lI111|H3C2EE8
-3C2EE8:lI100|H3C2F58
-3C2F58:lI97|N
-3C25EC:lI111|H3C26A0
-3C26A0:lI100|H3C274C
-3C274C:lI97|N
-3C254C:lH3C25FC|H3C2608
-3C25FC:t2:H3C26B0,H3C26B8
-3C26B8:lI97|H3C2764
-3C2764:lI112|H3C2818
-3C2818:lI112|H3C28CC
-3C28CC:lI108|H3C2990
-3C2990:lI105|H3C2A54
-3C2A54:lI99|H3C2B20
-3C2B20:lI97|H3C2BE4
-3C2BE4:lI116|H3C2C98
-3C2C98:lI105|H3C2D48
-3C2D48:lI111|H3C2DF0
-3C2DF0:lI110|H3C2E78
-3C2E78:lI47|H3C2EF0
-3C2EF0:lI111|H3C2F60
-3C2F60:lI99|H3C2FC8
-3C2FC8:lI116|H3C3030
-3C3030:lI101|H3C3090
-3C3090:lI116|H3C30E8
-3C30E8:lI45|H3C3138
-3C3138:lI115|H3C3180
-3C3180:lI116|H3C31C8
-3C31C8:lI114|H3C3210
-3C3210:lI101|H3C3258
-3C3258:lI97|H3C32A0
-3C32A0:lI109|N
-3C26B0:lI98|H3C275C
-3C275C:lI105|H3C2810
-3C2810:lI110|N
-3C2608:lH3C26C0|H3C26CC
-3C26C0:t2:H3C276C,H3C2774
-3C2774:lI97|H3C2828
-3C2828:lI112|H3C28DC
-3C28DC:lI112|H3C2998
-3C2998:lI108|H3C2A5C
-3C2A5C:lI105|H3C2B28
-3C2B28:lI99|H3C2BEC
-3C2BEC:lI97|H3C2CA0
-3C2CA0:lI116|H3C2D50
-3C2D50:lI105|H3C2DF8
-3C2DF8:lI111|H3C2E80
-3C2E80:lI110|H3C2EF8
-3C2EF8:lI47|H3C2F68
-3C2F68:lI111|H3C2FD0
-3C2FD0:lI99|H3C3038
-3C3038:lI116|H3C3098
-3C3098:lI101|H3C30F0
-3C30F0:lI116|H3C3140
-3C3140:lI45|H3C3188
-3C3188:lI115|H3C31D0
-3C31D0:lI116|H3C3218
-3C3218:lI114|H3C3260
-3C3260:lI101|H3C32A8
-3C32A8:lI97|H3C32E8
-3C32E8:lI109|N
-3C276C:lI100|H3C2820
-3C2820:lI109|H3C28D4
-3C28D4:lI115|N
-3C26CC:lH3C277C|H3C2788
-3C277C:t2:H3C2830,H3C2838
-3C2838:lI97|H3C28EC
-3C28EC:lI112|H3C29A8
-3C29A8:lI112|H3C2A64
-3C2A64:lI108|H3C2B30
-3C2B30:lI105|H3C2BF4
-3C2BF4:lI99|H3C2CA8
-3C2CA8:lI97|H3C2D58
-3C2D58:lI116|H3C2E00
-3C2E00:lI105|H3C2E88
-3C2E88:lI111|H3C2F00
-3C2F00:lI110|H3C2F70
-3C2F70:lI47|H3C2FD8
-3C2FD8:lI111|H3C3040
-3C3040:lI99|H3C30A0
-3C30A0:lI116|H3C30F8
-3C30F8:lI101|H3C3148
-3C3148:lI116|H3C3190
-3C3190:lI45|H3C31D8
-3C31D8:lI115|H3C3220
-3C3220:lI116|H3C3268
-3C3268:lI114|H3C32B0
-3C32B0:lI101|H3C32F0
-3C32F0:lI97|H3C3320
-3C3320:lI109|N
-3C2830:lI108|H3C28E4
-3C28E4:lI104|H3C29A0
-3C29A0:lI97|N
-3C2788:lH3C2840|H3C284C
-3C2840:t2:H3C28F4,H3C28FC
-3C28FC:lI97|H3C29B8
-3C29B8:lI112|H3C2A74
-3C2A74:lI112|H3C2B38
-3C2B38:lI108|H3C2BFC
-3C2BFC:lI105|H3C2CB0
-3C2CB0:lI99|H3C2D60
-3C2D60:lI97|H3C2E08
-3C2E08:lI116|H3C2E90
-3C2E90:lI105|H3C2F08
-3C2F08:lI111|H3C2F78
-3C2F78:lI110|H3C2FE0
-3C2FE0:lI47|H3C3048
-3C3048:lI111|H3C30A8
-3C30A8:lI99|H3C3100
-3C3100:lI116|H3C3150
-3C3150:lI101|H3C3198
-3C3198:lI116|H3C31E0
-3C31E0:lI45|H3C3228
-3C3228:lI115|H3C3270
-3C3270:lI116|H3C32B8
-3C32B8:lI114|H3C32F8
-3C32F8:lI101|H3C3328
-3C3328:lI97|H3C3350
-3C3350:lI109|N
-3C28F4:lI108|H3C29B0
-3C29B0:lI122|H3C2A6C
-3C2A6C:lI104|N
-3C284C:lH3C2904|H3C2910
-3C2904:t2:H3C29C0,H3C29C8
-3C29C8:lI97|H3C2A84
-3C2A84:lI112|H3C2B48
-3C2B48:lI112|H3C2C04
-3C2C04:lI108|H3C2CB8
-3C2CB8:lI105|H3C2D68
-3C2D68:lI99|H3C2E10
-3C2E10:lI97|H3C2E98
-3C2E98:lI116|H3C2F10
-3C2F10:lI105|H3C2F80
-3C2F80:lI111|H3C2FE8
-3C2FE8:lI110|H3C3050
-3C3050:lI47|H3C30B0
-3C30B0:lI111|H3C3108
-3C3108:lI99|H3C3158
-3C3158:lI116|H3C31A0
-3C31A0:lI101|H3C31E8
-3C31E8:lI116|H3C3230
-3C3230:lI45|H3C3278
-3C3278:lI115|H3C32C0
-3C32C0:lI116|H3C3300
-3C3300:lI114|H3C3330
-3C3330:lI101|H3C3358
-3C3358:lI97|H3C3378
-3C3378:lI109|N
-3C29C0:lI101|H3C2A7C
-3C2A7C:lI120|H3C2B40
-3C2B40:lI101|N
-3C2910:lH3C29D0|H3C29DC
-3C29D0:t2:H3C2A8C,H3C2A94
-3C2A94:lI97|H3C2B58
-3C2B58:lI112|H3C2C14
-3C2C14:lI112|H3C2CC8
-3C2CC8:lI108|H3C2D78
-3C2D78:lI105|H3C2E18
-3C2E18:lI99|H3C2EA0
-3C2EA0:lI97|H3C2F18
-3C2F18:lI116|H3C2F88
-3C2F88:lI105|H3C2FF0
-3C2FF0:lI111|H3C3058
-3C3058:lI110|H3C30B8
-3C30B8:lI47|H3C3110
-3C3110:lI111|H3C3160
-3C3160:lI99|H3C31A8
-3C31A8:lI116|H3C31F0
-3C31F0:lI101|H3C3238
-3C3238:lI116|H3C3280
-3C3280:lI45|H3C32C8
-3C32C8:lI115|H3C3308
-3C3308:lI116|H3C3338
-3C3338:lI114|H3C3360
-3C3360:lI101|H3C3380
-3C3380:lI97|H3C3398
-3C3398:lI109|N
-3C2A8C:lI99|H3C2B50
-3C2B50:lI108|H3C2C0C
-3C2C0C:lI97|H3C2CC0
-3C2CC0:lI115|H3C2D70
-3C2D70:lI115|N
-3C29DC:lH3C2A9C|H3C2AA8
-3C2A9C:t2:H3C2B60,H3C2B68
-3C2B68:lI97|H3C2C24
-3C2C24:lI112|H3C2CD8
-3C2CD8:lI112|H3C2D80
-3C2D80:lI108|H3C2E20
-3C2E20:lI105|H3C2EA8
-3C2EA8:lI99|H3C2F20
-3C2F20:lI97|H3C2F90
-3C2F90:lI116|H3C2FF8
-3C2FF8:lI105|H3C3060
-3C3060:lI111|H3C30C0
-3C30C0:lI110|H3C3118
-3C3118:lI47|H3C3168
-3C3168:lI109|H3C31B0
-3C31B0:lI115|H3C31F8
-3C31F8:lI119|H3C3240
-3C3240:lI111|H3C3288
-3C3288:lI114|H3C32D0
-3C32D0:lI100|N
-3C2B60:lI100|H3C2C1C
-3C2C1C:lI111|H3C2CD0
-3C2CD0:lI99|N
-3C2AA8:lH3C2B70|H3C2B7C
-3C2B70:t2:H3C2C2C,H3C2C34
-3C2C34:lI97|H3C2CE8
-3C2CE8:lI112|H3C2D90
-3C2D90:lI112|H3C2E28
-3C2E28:lI108|H3C2EB0
-3C2EB0:lI105|H3C2F28
-3C2F28:lI99|H3C2F98
-3C2F98:lI97|H3C3000
-3C3000:lI116|H3C3068
-3C3068:lI105|H3C30C8
-3C30C8:lI111|H3C3120
-3C3120:lI110|H3C3170
-3C3170:lI47|H3C31B8
-3C31B8:lI109|H3C3200
-3C3200:lI97|H3C3248
-3C3248:lI99|H3C3290
-3C3290:lI45|H3C32D8
-3C32D8:lI99|H3C3310
-3C3310:lI111|H3C3340
-3C3340:lI109|H3C3368
-3C3368:lI112|H3C3388
-3C3388:lI97|H3C33A0
-3C33A0:lI99|H3C33B0
-3C33B0:lI116|H3C33C0
-3C33C0:lI112|H3C33D0
-3C33D0:lI114|H3C33E0
-3C33E0:lI111|N
-3C2C2C:lI99|H3C2CE0
-3C2CE0:lI112|H3C2D88
-3C2D88:lI116|N
-3C2B7C:lH3C2C3C|N
-3C2C3C:t2:H3C2CF0,H3C2CF8
-3C2CF8:lI97|H3C2DA0
-3C2DA0:lI112|H3C2E38
-3C2E38:lI112|H3C2EB8
-3C2EB8:lI108|H3C2F30
-3C2F30:lI105|H3C2FA0
-3C2FA0:lI99|H3C3008
-3C3008:lI97|H3C3070
-3C3070:lI116|H3C30D0
-3C30D0:lI105|H3C3128
-3C3128:lI111|H3C3178
-3C3178:lI110|H3C31C0
-3C31C0:lI47|H3C3208
-3C3208:lI109|H3C3250
-3C3250:lI97|H3C3298
-3C3298:lI99|H3C32E0
-3C32E0:lI45|H3C3318
-3C3318:lI98|H3C3348
-3C3348:lI105|H3C3370
-3C3370:lI110|H3C3390
-3C3390:lI104|H3C33A8
-3C33A8:lI101|H3C33B8
-3C33B8:lI120|H3C33C8
-3C33C8:lI52|H3C33D8
-3C33D8:lI48|N
-3C2CF0:lI104|H3C2D98
-3C2D98:lI113|H3C2E30
-3C2E30:lI120|N
-3BDBCC:lH3BDA78|H3BDA8C
-3BDA78:t2:A4:port,I8888
-3BDA8C:lH3BDB04|H3BDB10
-3BDB04:t2:AC:bind_address,H3BDB64
-3BDB64:t4:I127,I0,I0,I1
-3BDB10:lH3BDB78|H3BDB84
-3BDB78:t2:AB:server_name,H3BDBD4
-3BDBD4:lI108|H3BDC24
-3BDC24:lI111|H3BDC88
-3BDC88:lI99|H3BDCF0
-3BDCF0:lI97|H3BDD70
-3BDD70:lI108|H3BDDF8
-3BDDF8:lI104|H3BDE90
-3BDE90:lI111|H3BDF40
-3BDF40:lI115|H3BDFFC
-3BDFFC:lI116|N
-3BDB84:lH3BDBDC|H3BDBE8
-3BDBDC:t2:AE:max_header_siz,I1024
-3BDBE8:lH3BDC2C|H3BDC38
-3BDC2C:t2:A11:max_header_action,A8:reply414
-3BDC38:lH3BDC90|H3BDC9C
-3BDC90:t2:A8:com_type,A7:ip_comm
-3BDC9C:lH3BDCF8|H3BDD04
-3BDCF8:t2:A7:modules,H3BDD78
-3BDD78:lA9:mod_alias|H3BDE00
-3BDE00:lA8:mod_auth|H3BDE98
-3BDE98:lA7:mod_esi|H3BDF48
-3BDF48:lAB:mod_actions|H3BE004
-3BE004:lA7:mod_cgi|H3BE0D0
-3BE0D0:lAB:mod_include|H3BE1A4
-3BE1A4:lA7:mod_dir|H3BE288
-3BE288:lA7:mod_get|H3BE378
-3BE378:lA8:mod_head|H3BE47C
-3BE47C:lA7:mod_log|H3BE580
-3BE580:lAC:mod_disk_log|N
-3BDD04:lH3BDD80|H3BDD8C
-3BDD80:t2:AF:directory_index,H3BDE08
-3BDE08:lH3BDEA0|N
-3BDEA0:lI105|H3BDF50
-3BDF50:lI110|H3BE00C
-3BE00C:lI100|H3BE0D8
-3BE0D8:lI101|H3BE1AC
-3BE1AC:lI120|H3BE290
-3BE290:lI46|H3BE380
-3BE380:lI104|H3BE484
-3BE484:lI116|H3BE588
-3BE588:lI109|H3BE68C
-3BE68C:lI108|N
-3BDD8C:lH3BDE10|H3BDE1C
-3BDE10:t2:AC:default_type,H3BDEA8
-3BDEA8:lI116|H3BDF58
-3BDF58:lI101|H3BE014
-3BE014:lI120|H3BE0E0
-3BE0E0:lI116|H3BE1B4
-3BE1B4:lI47|H3BE298
-3BE298:lI112|H3BE388
-3BE388:lI108|H3BE48C
-3BE48C:lI97|H3BE590
-3BE590:lI105|H3BE694
-3BE694:lI110|N
-3BDE1C:lH3BDEB0|H3BDEBC
-3BDEB0:t2:A10:erl_script_alias,H3BDF60
-3BDF60:t2:H3BE01C,H3BE024
-3BE024:lH3BE0F0|N
-3BE0F0:lI119|H3BE1C4
-3BE1C4:lI101|H3BE2A8
-3BE2A8:lI98|H3BE398
-3BE398:lI116|H3BE49C
-3BE49C:lI111|H3BE5A0
-3BE5A0:lI111|H3BE6A4
-3BE6A4:lI108|N
-3BE01C:lI47|H3BE0E8
-3BE0E8:lI119|H3BE1BC
-3BE1BC:lI101|H3BE2A0
-3BE2A0:lI98|H3BE390
-3BE390:lI116|H3BE494
-3BE494:lI111|H3BE598
-3BE598:lI111|H3BE69C
-3BE69C:lI108|N
-3BDEBC:lH3BDF6C|H3BDF78
-3BDF6C:t2:A5:alias,H3BE02C
-3BE02C:t2:H3BE0F8,H3BE100
-3BE100:lI47|H3BE1D4
-3BE1D4:lI99|H3BE2B8
-3BE2B8:lI108|H3BE3A8
-3BE3A8:lI101|H3BE4AC
-3BE4AC:lI97|H3BE5B0
-3BE5B0:lI114|H3BE6B4
-3BE6B4:lI99|H3BE7A8
-3BE7A8:lI97|H3BE894
-3BE894:lI115|H3BE980
-3BE980:lI101|H3BEA74
-3BEA74:lI47|H3BEB68
-3BEB68:lI111|H3BEC54
-3BEC54:lI116|H3BED40
-3BED40:lI112|H3BEE2C
-3BEE2C:lI47|H3BEF00
-3BEF00:lI101|H3BEFD4
-3BEFD4:lI114|H3BF0A0
-3BF0A0:lI116|H3BF174
-3BF174:lI115|H3BF238
-3BF238:lI47|H3BF2FC
-3BF2FC:lI108|H3BF3A8
-3BF3A8:lI105|H3BF45C
-3BF45C:lI98|H3BF518
-3BF518:lI47|H3BF5DC
-3BF5DC:lI111|H3BF6B0
-3BF6B0:lI98|H3BF784
-3BF784:lI115|H3BF858
-3BF858:lI101|H3BF93C
-3BF93C:lI114|H3BFA18
-3BFA18:lI118|H3BFAF4
-3BFAF4:lI101|H3BFBD0
-3BFBD0:lI114|H3BFC9C
-3BFC9C:lI47|H3BFD60
-3BFD60:lI112|H3BFE2C
-3BFE2C:lI114|H3BFEE0
-3BFEE0:lI105|H3BFF94
-3BFF94:lI118|H3C0040
-3C0040:lI47|H3C00EC
-3C00EC:lI99|H3C0198
-3C0198:lI114|H3C024C
-3C024C:lI97|H3C0308
-3C0308:lI115|H3C03BC
-3C03BC:lI104|H3C0458
-3C0458:lI100|H3C04F4
-3C04F4:lI117|H3C0590
-3C0590:lI109|H3C0634
-3C0634:lI112|H3C06E0
-3C06E0:lI95|H3C078C
-3C078C:lI118|H3C0830
-3C0830:lI105|H3C08BC
-3C08BC:lI101|H3C0950
-3C0950:lI119|H3C09E4
-3C09E4:lI101|H3C0A80
-3C0A80:lI114|N
-3BE0F8:lI47|H3BE1CC
-3BE1CC:lI99|H3BE2B0
-3BE2B0:lI114|H3BE3A0
-3BE3A0:lI97|H3BE4A4
-3BE4A4:lI115|H3BE5A8
-3BE5A8:lI104|H3BE6AC
-3BE6AC:lI100|H3BE7A0
-3BE7A0:lI117|H3BE88C
-3BE88C:lI109|H3BE978
-3BE978:lI112|H3BEA6C
-3BEA6C:lI95|H3BEB60
-3BEB60:lI118|H3BEC4C
-3BEC4C:lI105|H3BED38
-3BED38:lI101|H3BEE24
-3BEE24:lI119|H3BEEF8
-3BEEF8:lI101|H3BEFCC
-3BEFCC:lI114|N
-3BDF78:lH3BE038|H3BE044
-3BE038:t2:A5:alias,H3BE108
-3BE108:t2:H3BE1DC,H3BE1E4
-3BE1E4:lI47|H3BE2C8
-3BE2C8:lI99|H3BE3B8
-3BE3B8:lI108|H3BE4BC
-3BE4BC:lI101|H3BE5C0
-3BE5C0:lI97|H3BE6C4
-3BE6C4:lI114|H3BE7B8
-3BE7B8:lI99|H3BE8A4
-3BE8A4:lI97|H3BE990
-3BE990:lI115|H3BEA84
-3BEA84:lI101|H3BEB78
-3BEB78:lI47|H3BEC64
-3BEC64:lI111|H3BED50
-3BED50:lI116|H3BEE3C
-3BEE3C:lI112|H3BEF10
-3BEF10:lI47|H3BEFE4
-3BEFE4:lI101|H3BF0B0
-3BF0B0:lI114|H3BF184
-3BF184:lI116|H3BF248
-3BF248:lI115|H3BF304
-3BF304:lI47|H3BF3B0
-3BF3B0:lI101|H3BF464
-3BF464:lI114|H3BF520
-3BF520:lI116|H3BF5E4
-3BF5E4:lI115|H3BF6B8
-3BF6B8:lI47|H3BF78C
-3BF78C:lI100|H3BF860
-3BF860:lI111|H3BF944
-3BF944:lI99|H3BFA20
-3BFA20:lI47|H3BFAFC
-3BFAFC:lI104|H3BFBD8
-3BFBD8:lI116|H3BFCA4
-3BFCA4:lI109|H3BFD68
-3BFD68:lI108|N
-3BE1DC:lI47|H3BE2C0
-3BE2C0:lI99|H3BE3B0
-3BE3B0:lI114|H3BE4B4
-3BE4B4:lI97|H3BE5B8
-3BE5B8:lI115|H3BE6BC
-3BE6BC:lI104|H3BE7B0
-3BE7B0:lI100|H3BE89C
-3BE89C:lI117|H3BE988
-3BE988:lI109|H3BEA7C
-3BEA7C:lI112|H3BEB70
-3BEB70:lI95|H3BEC5C
-3BEC5C:lI101|H3BED48
-3BED48:lI114|H3BEE34
-3BEE34:lI116|H3BEF08
-3BEF08:lI115|H3BEFDC
-3BEFDC:lI95|H3BF0A8
-3BF0A8:lI100|H3BF17C
-3BF17C:lI111|H3BF240
-3BF240:lI99|N
-3BE044:lH3BE114|H3BE120
-3BE114:t2:A5:alias,H3BE1EC
-3BE1EC:t2:H3BE2D0,H3BE2D8
-3BE2D8:lI47|H3BE3C8
-3BE3C8:lI99|H3BE4CC
-3BE4CC:lI108|H3BE5D0
-3BE5D0:lI101|H3BE6D4
-3BE6D4:lI97|H3BE7C8
-3BE7C8:lI114|H3BE8B4
-3BE8B4:lI99|H3BE9A0
-3BE9A0:lI97|H3BEA94
-3BEA94:lI115|H3BEB88
-3BEB88:lI101|H3BEC74
-3BEC74:lI47|H3BED60
-3BED60:lI111|H3BEE4C
-3BEE4C:lI116|H3BEF20
-3BEF20:lI112|H3BEFEC
-3BEFEC:lI47|H3BF0B8
-3BF0B8:lI101|H3BF18C
-3BF18C:lI114|H3BF250
-3BF250:lI116|H3BF30C
-3BF30C:lI115|H3BF3B8
-3BF3B8:lI47|H3BF46C
-3BF46C:lI108|H3BF528
-3BF528:lI105|H3BF5EC
-3BF5EC:lI98|H3BF6C0
-3BF6C0:lI47|H3BF794
-3BF794:lI111|H3BF868
-3BF868:lI98|H3BF94C
-3BF94C:lI115|H3BFA28
-3BFA28:lI101|H3BFB04
-3BFB04:lI114|H3BFBE0
-3BFBE0:lI118|H3BFCAC
-3BFCAC:lI101|H3BFD70
-3BFD70:lI114|H3BFE34
-3BFE34:lI47|H3BFEE8
-3BFEE8:lI100|H3BFF9C
-3BFF9C:lI111|H3C0048
-3C0048:lI99|H3C00F4
-3C00F4:lI47|H3C01A0
-3C01A0:lI104|H3C0254
-3C0254:lI116|H3C0310
-3C0310:lI109|H3C03C4
-3C03C4:lI108|N
-3BE2D0:lI47|H3BE3C0
-3BE3C0:lI99|H3BE4C4
-3BE4C4:lI114|H3BE5C8
-3BE5C8:lI97|H3BE6CC
-3BE6CC:lI115|H3BE7C0
-3BE7C0:lI104|H3BE8AC
-3BE8AC:lI100|H3BE998
-3BE998:lI117|H3BEA8C
-3BEA8C:lI109|H3BEB80
-3BEB80:lI112|H3BEC6C
-3BEC6C:lI95|H3BED58
-3BED58:lI100|H3BEE44
-3BEE44:lI111|H3BEF18
-3BEF18:lI99|N
-3BE120:lH3BE1F8|N
-3BE1F8:t2:A10:erl_script_alias,H3BE2E0
-3BE2E0:t2:H3BE3D0,H3BE3D8
-3BE3D8:lH3BE4DC|N
-3BE4DC:lI99|H3BE5E0
-3BE5E0:lI114|H3BE6E4
-3BE6E4:lI97|H3BE7D8
-3BE7D8:lI115|H3BE8C4
-3BE8C4:lI104|H3BE9B0
-3BE9B0:lI100|H3BEAA4
-3BEAA4:lI117|H3BEB90
-3BEB90:lI109|H3BEC7C
-3BEC7C:lI112|H3BED68
-3BED68:lI95|H3BEE54
-3BEE54:lI118|H3BEF28
-3BEF28:lI105|H3BEFF4
-3BEFF4:lI101|H3BF0C0
-3BF0C0:lI119|H3BF194
-3BF194:lI101|H3BF258
-3BF258:lI114|N
-3BE3D0:lI47|H3BE4D4
-3BE4D4:lI99|H3BE5D8
-3BE5D8:lI100|H3BE6DC
-3BE6DC:lI118|H3BE7D0
-3BE7D0:lI95|H3BE8BC
-3BE8BC:lI101|H3BE9A8
-3BE9A8:lI114|H3BEA9C
-3BEA9C:lI108|N
-3BDE2C:lH3BDA9C|H3BDECC
-3BDA9C:t4:I127,I0,I0,I1
-3BDECC:lI8888|H3BDF88
-3BDF88:lN|N
-3BDD1C:lN|N
-3BDA50:t2:AD:$initial_call,H3BDAB8
-3BDAB8:t3:A3:gen,A7:init_it,H3BDAB0
-3BDA5C:t2:A9:verbosity,A7:silence
-3BDAC8:t2:AE:auth_verbosity,A7:silence
-3BDB28:t2:A12:security_verbosity,A7:silence
-3BDB9C:t2:A12:acceptor_verbosity,A7:silence
-3BDC00:t2:AA:$ancestors,H3BDC5C
-3BDC5C:lA1A:httpd_sup__127_0_0_1__8888|H3BDCB4
-3BDCB4:lA8:web_tool|H3BDD24
-3BDD24:lP<0.27.0>|N
-3BDADC:t2:A19:request_handler_verbosity,A7:silence
-3BDB3C:t2:A5:sname,A3:man
-=proc_dictionary:<0.47.0>
-H36E688
-H36E694
-H36E6A0
-H36E6AC
-=proc_stack:<0.47.0>
-36c520:SReturn addr 0x362C9C (inet_tcp:accept/2 + 20)
-y0:I5
-y1:p<0.161>
-y2:p<0.141>
-36c530:SReturn addr 0x500C5C (httpd_socket:accept/3 + 280)
-y0:N
-36c538:SReturn addr 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y0:N
-36c540:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:SCatch 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y1:P<0.46.0>
-y2:A7:ip_comm
-y3:p<0.141>
-y4:A1B:httpd_conf__127_0_0_1__8888
-36c558:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:AE:httpd_acceptor
-y2:A8:acceptor
-y3:H36E6C8
-=proc_heap:<0.47.0>
-36E6C8:lP<0.44.0>|H36E724
-36E724:lP<0.46.0>|H36E748
-36E748:lA7:ip_comm|H36E760
-36E760:lH36E6D0|H36E778
-36E6D0:t4:I127,I0,I0,I1
-36E778:lI8888|H36E788
-36E788:lA1B:httpd_conf__127_0_0_1__8888|H36E798
-36E798:lA7:silence|N
-36E688:t2:AD:$initial_call,H36E6F0
-36E6F0:t3:AE:httpd_acceptor,A8:acceptor,H36E6C8
-36E694:t2:A9:verbosity,A7:silence
-36E6A0:t2:AA:$ancestors,H36E700
-36E700:lA1E:httpd_acc_sup__127_0_0_1__8888|H36E72C
-36E72C:lA1A:httpd_sup__127_0_0_1__8888|H36E750
-36E750:lA8:web_tool|H36E768
-36E768:lP<0.27.0>|N
-36E6AC:t2:A5:sname,A3:acc
-=proc_dictionary:<0.48.0>
-H385E48
-H385E54
-=proc_stack:<0.48.0>
-3ac1bc:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A10:crashdump_viewer
-y3:H3AB280
-y4:A17:crashdump_viewer_server
-y5:P<0.41.0>
-3ac1d8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H385E90
-=proc_heap:<0.48.0>
-3AB280:t8:A5:state,A9:undefined,A9:undefined,A9:undefined,A5:false,I4,A9:undefined,P<0.56.0>
-385E90:lAA:gen_server|H385ED8
-385ED8:lP<0.41.0>|H385F10
-385F10:lP<0.41.0>|H385F58
-385F58:lH385FA8|H385FB4
-385FA8:t2:A5:local,A17:crashdump_viewer_server
-385FB4:lA10:crashdump_viewer|H386014
-386014:lN|H38606C
-38606C:lN|N
-385E48:t2:AD:$initial_call,H385EB0
-385EB0:t3:A3:gen,A7:init_it,H385E90
-385E54:t2:AA:$ancestors,H385EC0
-385EC0:lA6:websup|H385F08
-385F08:lA8:web_tool|H385F50
-385F50:lP<0.27.0>|N
-=proc_stack:<0.49.0>
-36a114:SReturn addr 0x30174C (io:parse_erl_exprs/3 + 92)
-y0:H369E10
-y1:P<0.22.0>
-36a120:SReturn addr 0x2E5360 (shell:'-get_command/4-fun-0-'/1 + 20)
-y0:N
-36a128:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.49.0>
-369E10:E21:8372000364000D6E6F6E6F6465406E6F686F737400000001330000000000000000
-=atoms
-http_cache_control
-copy_word
-drop_line
-copy_line
-write_rest_of_line
-drop_to_empty_line
-read_to_empty_line_reverse
-set_pos
-read_line_backwards
-jumped
-jump_to_empty_line_or_eof
-get_pos
-translate_atoms
-translate_fun
-translate_funs
-translate_loaded_modules2
-translate_loaded_modules_totals
-translate_loaded_modules
-translate_links
-get_all_creations
-translate_node_info2
-translate_node_info
-translate_dist_info2
-translate_dist_info
-get_msg
-translate_timers
-translate_ets
-translate_ets_tables
-do_translate_sl_alloc_r7_r8
-translate_sl_alloc_r7_r8
-translate_sl_alloc_line
-do_translate_sl_alloc
-translate_sl_alloc
-translate_memory_and_allocated_area_r9b
-translate_allocated_areas
-translate_internal_table_line
-translate_index_table
-translate_hash_table
-translate_internal_tables
-translate_ports
-write_last_calls
-write_msg_q_stuff
-translate_process
-translate_processes
-erts_vsn
-translate_summary
-'Send'
-erl_crash_dump
-internal_tables
-mods
-zombies
-http_content_length
-http_content_type
-'-procs_summary_body/5-fun-0-'
-'-expanded_memory_body/2-fun-0-'
-'-expanded_memory_body/2-fun-1-'
-'-expanded_memory_body/2-fun-2-'
-'-ports_body/3-fun-0-'
-'-ets_tables_body/4-fun-0-'
-'-internal_ets_tables_table/1-fun-0-'
-'-timers_body/3-fun-0-'
-'-make_nodes_table/2-fun-0-'
-'-loaded_mods_body/5-fun-0-'
-'-funs_body/3-fun-0-'
-'-memory_body/3-fun-0-'
-'-allocated_areas_body/3-fun-0-'
-'-allocator_info_body/3-fun-0-'
-'-allocator_info_body/3-fun-1-'
-'-allocator_info_body/3-fun-2-'
-'-hash_tables_body/3-fun-0-'
-'-index_tables_body/3-fun-0-'
-enter_write_file
-replace_insrt
-'$insrt'
-special
-initial
-pretty_format
-heading
-to_gt_noreverse
-to_gt
-href_proc_port
-br
-font
-h2
-h1
-img
-href
-pre
-em
-td
-th
-tr
-frame
-frameset
-html_header
-index_tables_table
-index_tables_body
-hash_tables_table
-hash_tables_body
-allocator_info_body
-allocated_areas_table
-allocated_areas_body
-memory_table
-memory_body
-atoms_body
-funs_table
-funs_body
-loaded_mod_details_body
-loaded_mods_table
-loaded_mods_body
-format_extra_info
-format_links_and_monitors
-to_end_par
-break_lines_creation
-maybe_refcount
-nodes_table_row
-nodes_table_heading
-make_nodes_table
-nodes_body
-timers_table
-timers_body
-internal_ets_tables_table1
-internal_ets_tables_table
-ets_tables_table
-ets_tables_body
-ports_table
-ports_body
-expanded_binary_body
-dict_table
-stackdump_table
-msgq_table
-expanded_memory_body
-link_to_read_memory
-display_or_link_to_expand
-proc_details_body
-procs_summary_table
-summary_table_head
-procs_summary_body
-pretty_info_body
-info_body
-error_body
-general_info_body
-format_title
-format_picture
-format_item
-arentState
-format_items
-menu_body
-filename_body
-start_page_frameset
-get_translated_filename_frame_body
-read_file_frame_body
-welcome_body
-http_
-http_te
-http_connection
-http_if_modified_since
-http_referer
-http_accept_encoding
-http_accept
-http_host
-http_user_agent
-'-create_header1/3-fun-0-'
-send_response_old
-transform
-mapfilter
-create_header1
-accept_ranges
-cache_control
-pragma
-trailer
-etag
-retry_after
-content_encoding
-content_language
-content_location
-content_MD5
-content_range
-expires
-transfer_encoding
-get_connection
-bad_args
-send_header
-get_body
-traverse_modules
-formatAbsoluteURI
-removeServer
-formatRequestUri
-tagup_header
-verify_request
-split_lines
-find_content_type
-maybe_remove_nl
-get_persistens
-df
-dm
-dy
-year_day_to_date2
-year_day_to_date
-dty
-day_to_year
-valid_date1
-valid_date
-universal_time_to_local_time
-time_to_seconds
-seconds_to_time
-seconds_to_daystime
-now_to_local_time
-now_to_universal_time
-now_to_datetime
-last_day_of_the_month1
-last_day_of_the_month
-is_leap_year1
-is_leap_year
-gregorian_seconds_to_datetime
-gregorian_days_to_date
-date_to_gregorian_days
-'-parse_trailers/1-lc^0/1-0-'
-'-read_trailer_end/4-fun-0-'
-'-read_trailer_end/4-lc^0/1-0-'
-'-remove_newline/1-fun-0-'
-remove_newline
-close_sleep
-unknown_size
-send_read_status
-handle_read_error
-transfer_coding
-expect
-getTrailerField
-read_trailer
-get_chunk_size
-read_chunked_entity_body
-read_chunk_trailer
-read_trailer_end
-parse_trailers
-parse_chunk_trailer
-body_to_big
-parse_chunked_entity_body
-parse_chunk_size
-read_chunked_entity
-etimedout
-body_too_long
-unknown_coding
-chunked
-read_entity_body2
-no_expect_header
-http_1_0_expect_header
-read_entity_body
-header_too_long
-hsplit
\ No newline at end of file
diff --git a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.50atoms b/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.50atoms
deleted file mode 100644
index 78e301a6c7..0000000000
--- a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.50atoms
+++ /dev/null
@@ -1,13085 +0,0 @@
-=erl_crash_dump:0.1
-Wed Apr 21 13:22:44 2004
-Slogan: eheap_alloc: Cannot allocate 785672 bytes of memory (of type "heap").
-System version: Erlang (BEAM) emulator version 5.4 [source] [hipe] [threads:0]
-Compiled: Thu Dec 18 14:07:45 2003
-Atoms: 5614
-=memory
-total: 653336887
-processes: 1768396
-processes_used: 1765460
-system: 651568491
-atom: 244837
-atom_used: 237116
-binary: 648618369
-code: 2158413
-ets: 225620
-=hash_table:atom_tab
-size: 4813
-used: 3304
-objs: 5614
-depth: 7
-=index_table:atom_tab
-size: 5700
-limit: 1048576
-used: 5614
-rate: 100
-=hash_table:module_code
-size: 97
-used: 69
-objs: 107
-depth: 5
-=index_table:module_code
-size: 110
-limit: 65536
-used: 107
-rate: 10
-=hash_table:export_list
-size: 2411
-used: 1674
-objs: 2843
-depth: 6
-=index_table:export_list
-size: 2900
-limit: 65536
-used: 2843
-rate: 100
-=hash_table:process_reg
-size: 47
-used: 16
-objs: 23
-depth: 3
-=hash_table:fun_table
-size: 397
-used: 261
-objs: 400
-depth: 4
-=hash_table:node_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=hash_table:dist_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=allocated_areas
-processes: 1765460 1768396
-ets: 225620
-sys_misc: 24634
-static: 295033
-atom_space: 65544 57967
-binary: 648618369
-atom_table: 42141
-module_table: 920
-export_table: 21336
-register_table: 252
-fun_table: 1650
-module_refs: 1024
-loaded_code: 1968915
-dist_table: 159
-node_table: 131
-bits_bufs_size: 19
-bif_timer: 13392
-link_lh: 0
-dist_buf: 0
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:sys_alloc
-option e: true
-option m: libc
-=allocator:temp_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 90
-option rsbcmt: 80
-option mmbcs: 65536
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: af
-mbcs blocks: 0 9 9
-mbcs blocks size: 0 35376 35376
-mbcs carriers: 1 1 1
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 65568 65568 65568
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 65568
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-temp_alloc calls: 6155
-temp_free calls: 6155
-temp_realloc calls: 29
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 1
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:sl_alloc
-option e: false
-=allocator:std_alloc
-option e: false
-=allocator:ll_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 4294967295
-option asbcst: 0
-option rsbcst: 0
-option rsbcmt: 0
-option mmbcs: 2097152
-option mmsbc: 0
-option mmmbc: 0
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: aobf
-mbcs blocks: 592 592 592
-mbcs blocks size: 2838520 2863304 2863304
-mbcs carriers: 2 2 2
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 2
-mbcs carriers size: 3145760 3145760 3145760
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 3145760
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-ll_alloc calls: 592
-ll_free calls: 0
-ll_realloc calls: 235
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 2
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:eheap_alloc
-versions: 2.1 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 50
-option rsbcmt: 80
-option mmbcs: 524288
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option mbsd: 3
-option as: gf
-mbcs blocks: 56 102 102
-mbcs blocks size: 833280 1638920 1638920
-mbcs carriers: 2 3 3
-mbcs mseg carriers: 1
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 1998880 3047456 3047456
-mbcs mseg carriers size: 1474560
-mbcs sys_alloc carriers size: 524320
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-eheap_alloc calls: 6971
-eheap_free calls: 6914
-eheap_realloc calls: 461
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-sys_alloc calls: 3
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:binary_alloc
-option e: false
-=allocator:ets_alloc
-option e: false
-=allocator:fix_alloc
-option e: true
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:mseg_alloc
-version: 0.9
-option amcbf: 4194304
-option rmcbf: 20
-option mcs: 5
-option cci: 1000
-cached_segments: 0
-cache_hits: 13
-segments: 2
-segments_watermark: 2
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-mseg_create calls: 4
-mseg_destroy calls: 1
-mseg_clear_cache calls: 6
-mseg_check_cache calls: 2
-=allocator:alloc_util
-option mmc: 1024
-option ycs: 1048576
-=allocator:instr
-option m: false
-option s: false
-option t: false
-=proc:<0.0.0>
-State: Waiting
-Name: init
-Spawned as: otp_ring0:start/2
-Spawned by: []
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.5.0>,<0.4.0>,<0.2.0>]
-Reductions: 3851
-Stack+heap: 377
-OldHeap: 610
-Heap unused: 53
-OldHeap unused: 610
-Program counter: 0x1f496c (init:loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.2.0>
-State: Waiting
-Name: erl_prim_loader
-Spawned as: erlang:apply/2
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.0.0>,#Port<0.2>]
-Reductions: 201036
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 923
-OldHeap unused: 987
-Program counter: 0x20cc94 (erl_prim_loader:loop/3 + 52)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.4.0>
-State: Waiting
-Name: error_logger
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.0.0>]
-Reductions: 296
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 851
-OldHeap unused: 0
-Program counter: 0x21f5b8 (gen_event:loop/4 + 40)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.5.0>
-State: Waiting
-Name: application_controller
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.7.0>,<0.0.0>]
-Reductions: 1508
-Stack+heap: 1597
-OldHeap: 0
-Heap unused: 835
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.7.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.6.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.8.0>,<0.5.0>]
-Reductions: 23
-Stack+heap: 377
-OldHeap: 0
-Heap unused: 79
-OldHeap unused: 0
-Program counter: 0x248d04 (application_master:main_loop/2 + 28)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.8.0>
-State: Waiting
-Spawned as: application_master:start_it/4
-Spawned by: <0.7.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>,<0.7.0>]
-Reductions: 91
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 177
-OldHeap unused: 0
-Program counter: 0x24a26c (application_master:loop_it/4 + 40)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.9.0>
-State: Waiting
-Name: kernel_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.8.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.24.0>,<0.23.0>,<0.19.0>,<0.18.0>,<0.17.0>,<0.16.0>,<0.15.0>,<0.14.0>,<0.11.0>,<0.10.0>,<0.8.0>]
-Reductions: 7402
-Stack+heap: 610
-OldHeap: 987
-Heap unused: 311
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.10.0>
-State: Waiting
-Name: rex
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 44
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 144
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.11.0>
-State: Waiting
-Name: global_name_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.13.0>,<0.12.0>,<0.9.0>]
-Reductions: 47
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 98
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.12.0>
-State: Waiting
-Spawned as: global:init_the_locker/1
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 3
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 227
-OldHeap unused: 0
-Program counter: 0x261340 (global:loop_the_locker/2 + 92)
-CP: 0x261184 (global:init_the_locker/1 + 112)
-arity = 0
-=proc:<0.13.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 4
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 221
-OldHeap unused: 0
-Program counter: 0x265288 (global:collect_deletions/2 + 76)
-CP: 0x2651ac (global:loop_the_deleter/1 + 36)
-arity = 0
-=proc:<0.14.0>
-State: Waiting
-Name: inet_db
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 376
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 30
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.15.0>
-State: Waiting
-Name: global_group
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 71
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 92
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.16.0>
-State: Waiting
-Name: file_server_2
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 119
-Link list: [{from,<0.17.0>,#Ref<0.0.0.22>},#Port<0.4>,<0.9.0>]
-Reductions: 83605
-Stack+heap: 4181
-OldHeap: 4181
-Heap unused: 1720
-OldHeap unused: 4181
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.17.0>
-State: Waiting
-Name: file_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.16.0>,#Ref<0.0.0.22>},<0.9.0>]
-Reductions: 12
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 207
-OldHeap unused: 0
-Program counter: 0x2a18e8 (old_file_server:relay_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.18.0>
-State: Waiting
-Name: code_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 108900
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 4389
-OldHeap unused: 6765
-Program counter: 0x2a6e64 (code_server:loop/1 + 64)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.19.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.9.0>]
-Reductions: 74
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 180
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.20.0>
-State: Waiting
-Spawned as: user_drv:server/2
-Spawned by: <0.19.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.22.0>,<0.21.0>,#Port<0.72>]
-Reductions: 596
-Stack+heap: 233
-OldHeap: 377
-Heap unused: 214
-OldHeap unused: 377
-Program counter: 0x2ca4e0 (user_drv:server_loop/5 + 56)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.21.0>
-State: Waiting
-Name: user
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.4.0>,<0.19.0>,<0.20.0>]
-Reductions: 26
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 202
-OldHeap unused: 0
-Program counter: 0x2cd9d8 (group:server_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.22.0>
-State: Waiting
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{from,<0.49.0>,#Ref<0.0.0.307>},<0.25.0>,<0.20.0>]
-Reductions: 1244
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 40
-OldHeap unused: 233
-Program counter: 0x2cf238 (group:get_line1/3 + 1652)
-CP: 0x2cf230 (group:get_line1/3 + 1644)
-arity = 0
-=proc:<0.23.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 45
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 63
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.24.0>
-State: Waiting
-Name: kernel_safe_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.31.0>,<0.9.0>]
-Reductions: 133
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 198
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.25.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.22.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.49.0>,<0.27.0>,<0.22.0>]
-Reductions: 161
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 169
-OldHeap unused: 0
-Program counter: 0x2e0d00 (shell:get_command1/4 + 40)
-CP: 0x2e06fc (shell:server_loop/6 + 140)
-arity = 0
-=proc:<0.27.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.25.0>]
-Reductions: 506
-Stack+heap: 4181
-OldHeap: 0
-Heap unused: 1131
-OldHeap unused: 0
-Program counter: 0x2e2bbc (shell:eval_loop/2 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.31.0>
-State: Waiting
-Name: inet_gethost_native_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.24.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.32.0>,<0.24.0>]
-Reductions: 49
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 87
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.32.0>
-State: Waiting
-Name: inet_gethost_native
-Spawned as: inet_gethost_native:server_init/2
-Spawned by: <0.31.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 118
-Link list: [#Port<0.105>,<0.31.0>]
-Reductions: 65
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 13
-OldHeap unused: 0
-Program counter: 0x4ad840 (inet_gethost_native:main_loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.33.0>
-State: Waiting
-Name: web_tool
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.27.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.41.0>]
-Reductions: 131773
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 2941
-OldHeap unused: 6765
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.41.0>
-State: Waiting
-Name: websup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.48.0>,<0.33.0>]
-Reductions: 118
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 205
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.43.0>
-State: Waiting
-Name: httpd_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.46.0>,<0.45.0>,<0.44.0>]
-Reductions: 1220
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 277
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.44.0>
-State: Waiting
-Name: httpd_acc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.47.0>,<0.43.0>]
-Reductions: 147
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 77
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.45.0>
-State: Waiting
-Name: httpd_misc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 52
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 80
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.46.0>
-State: Waiting
-Name: httpd__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 2905
-Stack+heap: 6765
-OldHeap: 10946
-Heap unused: 138
-OldHeap unused: 10946
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.47.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.44.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [#Port<0.161>,#Port<0.141>,<0.44.0>]
-Reductions: 874
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 190
-OldHeap unused: 233
-Program counter: 0x1fe798 (prim_inet:accept0/2 + 96)
-CP: 0x1feb04 (prim_inet:async_accept/2 + 380)
-arity = 0
-=proc:<0.48.0>
-State: Waiting
-Name: crashdump_viewer_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.41.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.56.0>,<0.41.0>]
-Reductions: 1913
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 524
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.49.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.22.0>,#Ref<0.0.0.307>},<0.25.0>]
-Reductions: 15
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 190
-OldHeap unused: 0
-Program counter: 0x301d58 (io:wait_io_mon_reply/2 + 28)
-CP: 0x30174c (io:parse_erl_exprs/3 + 92)
-arity = 0
-=proc:<0.56.0>
-State: Garbing
-Spawned as: erlang:apply/2
-Last scheduled in for: erlang:garbage_collect/0
-Spawned by: <0.48.0>
-Started: Wed Apr 21 13:22:27 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 121
-Link list: [#Port<0.158>,#Port<0.157>,<0.48.0>]
-Reductions: 2420470
-Stack+heap: 121393
-OldHeap: 0
-Heap unused: 22172
-OldHeap unused: 0
-New heap start: FE5768E0
-New heap top: FE5D7734
-Stack top: FE5ED130
-Stack end: FE5ED1A4
-Old heap start: 0
-Old heap top: 0
-Old heap end: 0
-Program counter: 0x1a4980 (unknown function)
-CP: 0x20710c (prim_file:read/2 + 436)
-=port:#Port<0.1>
-Slot: 1
-Connected: #Port<0.0>
-Port controls linked-in driver: async
-=port:#Port<0.2>
-Slot: 2
-Connected: <0.2.0>
-Links: <0.2.0>
-Port controls linked-in driver: efile
-=port:#Port<0.4>
-Slot: 4
-Connected: <0.16.0>
-Links: <0.16.0>
-Port controls linked-in driver: efile
-=port:#Port<0.72>
-Slot: 72
-Connected: <0.20.0>
-Links: <0.20.0>
-Port controls linked-in driver: tty_sl -c -e
-=port:#Port<0.105>
-Slot: 105
-Connected: <0.32.0>
-Links: <0.32.0>
-Port controls external process: inet_gethost 4 
-=port:#Port<0.141>
-Slot: 141
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=port:#Port<0.157>
-Slot: 157
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.158>
-Slot: 158
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.161>
-Slot: 161
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=ets:<0.18.0>
-Slot: 9
-Table: 9
-Name: code
-Buckets: 256 
-Objects: 289
-Words: 14108
-=ets:<0.18.0>
-Slot: 10
-Table: 10
-Name: code_names
-Buckets: 256 
-Objects: 47
-Words: 4334
-=ets:<0.32.0>
-Slot: 11
-Table: 11
-Name: ign_requests
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.32.0>
-Slot: 12
-Table: 12
-Name: ign_req_index
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.33.0>
-Slot: 13
-Table: 13
-Name: app_data
-Buckets: 256 
-Objects: 7
-Words: 952
-=ets:<0.46.0>
-Slot: 15
-Table: 15
-Name: httpd_mime__127_0_0_1__8888
-Buckets: 256 
-Objects: 105
-Words: 5742
-=ets:<0.11.0>
-Slot: 84
-Table: global_names
-Name: global_names
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 95
-Table: global_locks
-Name: global_locks
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 96
-Table: global_names_ext
-Name: global_names_ext
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.14.0>
-Slot: 316
-Table: inet_cache
-Name: inet_cache
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 340
-Table: cdv_menu_table
-Name: cdv_menu_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 341
-Table: cdv_dump_index_table
-Name: cdv_dump_index_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 342
-Table: cdv_decode_heap_table
-Name: cdv_decode_heap_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.16.0>
-Slot: 780
-Table: file_io_servers
-Name: file_io_servers
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.46.0>
-Slot: 984
-Table: httpd_conf__127_0_0_1__8888
-Name: httpd_conf__127_0_0_1__8888
-Buckets: 256 
-Objects: 17
-Words: 1176
-=ets:<0.14.0>
-Slot: 1342
-Table: inet_hosts
-Name: inet_hosts
-Buckets: 256 
-Objects: 4
-Words: 421
-=ets:<0.14.0>
-Slot: 1362
-Table: inet_db
-Name: inet_db
-Buckets: 256 
-Objects: 20
-Words: 671
-=ets:<0.5.0>
-Slot: 1655
-Table: ac_tab
-Name: ac_tab
-Buckets: 256 
-Objects: 6
-Words: 843
-=timer:<0.14.0>
-Message: refresh_timeout
-Time left: 3565692 ms
-=node:'nonode@nohost'
-=no_distribution
-=loaded_modules
-Current code: 1968915
-Old code: 0
-=mod:otp_ring0
-Current size: 489
-=mod:init
-Current size: 30110
-=mod:prim_inet
-Current size: 35532
-=mod:prim_file
-Current size: 24965
-=mod:erl_prim_loader
-Current size: 19607
-=mod:erlang
-Current size: 11137
-=mod:error_handler
-Current size: 2389
-Current attributes: 836C00000001680264000376736E6C000000016E100030769A34345F26EF6D3433254FF2AE576A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161216802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F68616E646C65722E65726C6A
-=mod:heart
-Current size: 6687
-Current attributes: 836C00000001680264000376736E6C000000016E10003094F7BECF345494DDBB4D7186E694186A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261086802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F68656172742E65726C6A
-=mod:error_logger
-Current size: 7051
-Current attributes: 836C00000001680264000376736E6C000000016E10004E3347F841DEAE2EB6A74389E6E127146A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161246802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F6C6F676765722E65726C6A
-=mod:gen_event
-Current size: 18288
-Current attributes: 836C00000001680264000376736E6C000000016E1000336F22DF1EA75E0EA4AE65D3B8C34F946A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61346802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F6576656E742E65726C6A
-=mod:gen
-Current size: 7129
-Current attributes: 836C00000001680264000376736E6C000000016E10007BE6AEB66EF48D8B33323C89C9936A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61316802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E2E65726C6A
-=mod:proc_lib
-Current size: 11658
-Current attributes: 836C00000001680264000376736E6C000000016E10005C589A8C9BD2E1F2E895E765CAE983406A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E612D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F70726F635F6C69622E65726C6A
-=mod:application_controller
-Current size: 55249
-Current attributes: 836C00000002680264000376736E6C000000016E10003372E1AB0410565065FA086086A721316A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061246802640006736F757263656B003D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F636F6E74726F6C6C65722E65726C6A
-=mod:gen_server
-Current size: 18728
-Current attributes: 836C00000001680264000376736E6C000000016E10004C5E93533036DAC7698FC4112F59CF236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61396802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F7365727665722E65726C6A
-=mod:sys
-Current size: 11589
-Current attributes: 836C00000001680264000376736E6C000000016E1000E12B0E8267551204BD5924BAB9629ADF6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61176802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7379732E65726C6A
-=mod:lists
-Current size: 18638
-Current attributes: 836C00000002680264000376736E6C000000016E10001E95B32C30E4CDAF0BDD1ABA58CBB5F36A680264000A646570726563617465646C0000000B68026400066B65796D617061046802640003616C6C61036802640003616E79610368026400036D617061036802640007666C61746D617061036802640005666F6C646C61046802640005666F6C64726104680264000666696C746572610368026400086D6170666F6C646C610468026400086D6170666F6C647261046802640007666F726561636861036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61116802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374732E65726C6A
-=mod:application
-Current size: 2666
-Current attributes: 836C00000001680264000376736E6C000000016E1000C0C5A7B67B306300FEFF9D91AA50ECB36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130611F6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E2E65726C6A
-=mod:application_master
-Current size: 10912
-Current attributes: 836C00000001680264000376736E6C000000016E1000360420F5CEB80AD7DD51B3A8A0E2AFA26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061266802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F6D61737465722E65726C6A
-=mod:kernel
-Current size: 7639
-Current attributes: 836C00000002680264000376736E6C000000016E10004D418ACCB0F948D4D3CA6B9A81B462746A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261336802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C2E65726C6A
-=mod:supervisor
-Current size: 24469
-Current attributes: 836C00000002680264000376736E6C000000016E1000979F65727577135484BE0892A35087CC6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61126802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F722E65726C6A
-=mod:rpc
-Current size: 14539
-Current attributes: 836C00000002680264000376736E6C000000016E10008C5D6242D36B3201E3B11E82D5E1581E6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133610F6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7270632E65726C6A
-=mod:gb_trees
-Current size: 8274
-Current attributes: 836C00000001680264000376736E6C000000016E1000094BEFDE7B866EF2CB6FCD895AC2EE056A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67625F74726565732E65726C6A
-=mod:global
-Current size: 40753
-Current attributes: 836C00000002680264000376736E6C000000016E10001D02C89BDE6CB2052F099894683C14CA6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161386802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C2E65726C6A
-=mod:inet_db
-Current size: 34555
-Current attributes: 836C00000001680264000376736E6C000000016E1000C1CF6A6F2E83D4EBC23D2CCECBF376226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132611A6802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F64622E65726C6A
-=mod:inet_config
-Current size: 13575
-Current attributes: 836C00000001680264000376736E6C000000016E1000650F6571C03BC9C16BB7973A747565066A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261166802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F636F6E6669672E65726C6A
-=mod:os
-Current size: 5997
-Current attributes: 836C00000001680264000376736E6C000000016E100017144CD766A604A9DFBA0B58C8FCA78B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361056802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F732E65726C6A
-=mod:inet_udp
-Current size: 2451
-Current attributes: 836C00000001680264000376736E6C000000016E1000ACB163E87A687A6683B50B331C6E289B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261306802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7564702E65726C6A
-=mod:inet
-Current size: 28288
-Current attributes: 836C00000001680264000376736E6C000000016E10009B9AD400F0BAF6AAF17A4788A4EFF11E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132610C6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65742E65726C6A
-=mod:inet_parse
-Current size: 21928
-Current attributes: 836C00000001680264000376736E6C000000016E1000E0E65454C096847749930EDC1C53C80B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261266802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F70617273652E65726C6A
-=mod:filename
-Current size: 17411
-Current attributes: 836C00000001680264000376736E6C000000016E100068085214F459D51A3E08819BF8D7698A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61296802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656E616D652E65726C6A
-=mod:inet_hosts
-Current size: 3745
-Current attributes: 836C00000001680264000376736E6C000000016E1000E7430304E86230057150DEE5D279881F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261226802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F686F7374732E65726C6A
-=mod:erl_distribution
-Current size: 2512
-Current attributes: 836C00000002680264000376736E6C000000016E1000CDE49D63ACA767E0D49679657E99D2046A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161186802640006736F757263656B00372F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F65726C5F646973747269627574696F6E2E65726C6A
-=mod:global_group
-Current size: 30960
-Current attributes: 836C00000002680264000376736E6C000000016E10008ECE759E5920988CA3ACFF34B32F86736A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131613B6802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C5F67726F75702E65726C6A
-=mod:net_kernel
-Current size: 37648
-Current attributes: 836C00000002680264000376736E6C000000016E1000967CE7DE41F9B39906CCCF3225E6E5286A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361026802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6E65745F6B65726E656C2E65726C6A
-=mod:file_server
-Current size: 8372
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF90906EC6204204AC0A77C4A25B65236A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612D6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F7365727665722E65726C6A
-=mod:old_file_server
-Current size: 3074
-Current attributes: 836C00000001680264000376736E6C000000016E1000C802085DD76D4EFBA6A8F528FECB94B36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612F6802640006736F757263656B00362F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F6C645F66696C655F7365727665722E65726C6A
-=mod:code
-Current size: 7419
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE618E3041C8E3807A3719CD5140DF5E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130612E6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64652E65726C6A
-=mod:code_server
-Current size: 30811
-Current attributes: 836C00000001680264000376736E6C000000016E0F00BFB96248C2CA8601B4CB7F543F52E26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061346802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F7365727665722E65726C6A
-=mod:code_aux
-Current size: 1736
-Current attributes: 836C00000001680264000376736E6C000000016E10007A90DB53FCCECD52504F20E7A3B6BAE26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061316802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F6175782E65726C6A
-=mod:packages
-Current size: 3119
-Current attributes: 836C00000001680264000376736E6C000000016E1000044DC8EEB65F178AE23EF2465E1954496A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361076802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7061636B616765732E65726C6A
-=mod:hipe_unified_loader
-Current size: 37330
-Current attributes: 836C00000001680264000376736E6C000000016E1000DABD57945702E56F4B3AA7B7B19C1D166A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361326802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F756E69666965645F6C6F616465722E65726C6A
-=mod:hipe_sparc_loader
-Current size: 1821
-Current attributes: 836C00000001680264000376736E6C000000016E1000582BC55E9FADFF879C2C45D25A6CB7E56A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F6D61696E6802640001696B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F72746C6802640001696B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F737061726364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133612B6802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F73706172635F6C6F616465722E65726C6A
-=mod:ets
-Current size: 16577
-Current attributes: 836C00000002680264000376736E6C000000016E100033D982AC91129E5FC35E0AC3337A4EB56A680264000A646570726563617465646C0000000168026400086669787461626C6561026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D611C6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6574732E65726C6A
-=mod:lists_sort
-Current size: 38692
-Current attributes: 836C00000001680264000376736E6C000000016E1000E17EC92FA9AA3199DD71701C215044616A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000B68026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736802640006696E6C696E656C0000000468026400096D65726765335F3132610768026400096D65726765335F32316107680264000A726D65726765335F31326107680264000A726D65726765335F323161076A6802640006696E6C696E656C00000004680264000A756D65726765335F31326108680264000A756D65726765335F32316108680264000C72756D65726765335F3132616107680264000C72756D65726765335F31326261086A6802640006696E6C696E656C00000004680264000C6B65796D65726765335F3132610C680264000C6B65796D65726765335F3231610C680264000D726B65796D65726765335F3132610C680264000D726B65796D65726765335F3231610C6A6802640006696E6C696E656C00000006680264000D756B65796D65726765335F3132610D680264000D756B65796D65726765335F3231610D680264000F72756B65796D65726765335F313261610B680264000F72756B65796D65726765335F323161610D680264000F72756B65796D65726765335F313262610D680264000F72756B65796D65726765335F323162610C6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61166802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374735F736F72742E65726C6A
-=mod:user_sup
-Current size: 2355
-Current attributes: 836C00000002680264000376736E6C000000016E100074BA860804CB4D60D6908C705E6544BD6A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361246802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F7375702E65726C6A
-=mod:supervisor_bridge
-Current size: 2944
-Current attributes: 836C00000002680264000376736E6C000000016E10001590DDC10CF8A9D09763CDB7479678ED6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61156802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F725F6272696467652E65726C6A
-=mod:user_drv
-Current size: 14630
-Current attributes: 836C00000001680264000376736E6C000000016E1000F29F3B193A1EB1ADA9975D97E51BF0E86A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361216802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F6472762E65726C6A
-=mod:group
-Current size: 10165
-Current attributes: 836C00000001680264000376736E6C000000016E1000F6427D0DA330BBFAD5D4C19058516FF36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261066802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67726F75702E65726C6A
-=mod:io_lib
-Current size: 12601
-Current attributes: 836C00000002680264000376736E6C000000016E10004160DD78F37EE7C72F7C5B6A751DB7F56A680264000A646570726563617465646C0000000468026400047363616E610168026400047363616E610268026400047363616E6103680264000D72657365727665645F776F726461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61036802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69622E65726C6A
-=mod:edlin
-Current size: 18178
-Current attributes: 836C00000001680264000376736E6C000000016E100035D752FCBA8ED7F4D26990EF3E6A1A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65646C696E2E65726C6A
-=mod:io_lib_format
-Current size: 16189
-Current attributes: 836C00000001680264000376736E6C000000016E10004F382F327C456F83F33C3D5EBFBD87906A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61066802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F666F726D61742E65726C6A
-=mod:kernel_config
-Current size: 3295
-Current attributes: 836C00000002680264000376736E6C000000016E100077B8EE6C9E95FBBE5DB0371F6DB235226A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261356802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C5F636F6E6669672E65726C6A
-=mod:shell
-Current size: 22571
-Current attributes: 836C00000001680264000376736E6C000000016E10007D1354325618EB98A5BD4E8F41E6A0226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7368656C6C2E65726C6A
-=mod:error_logger_tty_h
-Current size: 7773
-Current attributes: 836C00000002680264000376736E6C000000016E10001502D55D6C1777F07E2E05CDD91D16986A68026400096265686176696F75726C0000000164000967656E5F6576656E746A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61196802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6572726F725F6C6F676765725F7474795F682E65726C6A
-=mod:erl_eval
-Current size: 33481
-Current attributes: 836C00000002680264000376736E6C000000016E1000D06903753C86BBC49A5CBD789CCB09B66A680264000A646570726563617465646C00000004680264000373657161026802640003736571610368026400086172675F6C697374610268026400086172675F6C69737461036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C610D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6576616C2E65726C6A
-=mod:orddict
-Current size: 4872
-Current attributes: 836C00000002680264000376736E6C000000016E100078DCF69F3949D79BC54168266A3ABF566A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61236802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264646963742E65726C6A
-=mod:c
-Current size: 19555
-Current attributes: 836C00000001680264000376736E6C000000016E10003FACCF5DE16ABBC988ABF0811980C33B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61136802640006736F757263656B00282F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F632E65726C6A
-=mod:io
-Current size: 7417
-Current attributes: 836C00000002680264000376736E6C000000016E1000E2F2A6094B3C3D945865225D0620E7546A680264000A646570726563617465646C00000007680264000B70617273655F65787072736102680264000C7363616E5F65726C5F7365716101680264000C7363616E5F65726C5F7365716102680264000C7363616E5F65726C5F7365716103680264000D70617273655F65726C5F7365716101680264000D70617273655F65726C5F7365716102680264000D70617273655F65726C5F73657161036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61006802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F2E65726C6A
-=mod:file
-Current size: 20795
-Current attributes: 836C00000002680264000376736E6C000000016E1000D291AF77EE8B08B792B7FE99274504506A680264000A646570726563617465646C00000001680264000966696C655F696E666F61016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161276802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C652E65726C6A
-=mod:file_io_server
-Current size: 12071
-Current attributes: 836C00000001680264000376736E6C000000016E1000A5A8C4E2B2646855AD5C617CB216CB966A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612A6802640006736F757263656B00352F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F696F5F7365727665722E65726C6A
-=mod:erl_scan
-Current size: 21891
-Current attributes: 836C00000001680264000376736E6C000000016E100094F386F0C378B258E5D9CEADD4F03B6A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61116802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F7363616E2E65726C6A
-=mod:erl_parse
-Current size: 161233
-Current attributes: 836C00000001680264000376736E6C000000016E10000E8CBC32C293BFC1FBC721CE918062236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000968026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F76617273640006696E6C696E656802640004686970656C000000016802640008726567616C6C6F6364000B6C696E6561725F7363616E6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61076802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F70617273652E65726C6A
-=mod:erl_lint
-Current size: 73159
-Current attributes: 836C00000001680264000376736E6C000000016E1000D1D2A7D6DDFD1195CB180993C76FD2CD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61156802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6C696E742E65726C6A
-=mod:ordsets
-Current size: 3257
-Current attributes: 836C00000002680264000376736E6C000000016E1000FD39D8FD846511128F5670BA28600F676A680264000A646570726563617465646C0000000468026400076E65775F7365746100680264000B7365745F746F5F6C6973746101680264000B6C6973745F746F5F7365746101680264000673756273657461026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61256802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264736574732E65726C6A
-=mod:dict
-Current size: 15637
-Current attributes: 836C00000002680264000376736E6C000000016E1000BC846E7EF85045A5D76190CE9B1AE97C6A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61356802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F646963742E65726C6A
-=mod:otp_internal
-Current size: 7133
-Current attributes: 836C00000001680264000376736E6C000000016E1000DC494F64DE590AFC4919DFEB0EB026B66A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61206802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F74705F696E7465726E616C2E65726C6A
-=mod:user_default
-Current size: 1261
-Current attributes: 836C00000002680264000376736E6C000000016E1000505078ACD9B84D514FC6DA2BE249E6756A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612C61126802640006736F757263656B00222F686F6D652F736972692F65726C616E672F757365725F64656661756C742E65726C6A
-=mod:tt
-Current size: 2959
-Current attributes: 836C00000002680264000376736E6C000000016E10001D71FD5A55D3BCBF06BFEDF2426C3C386A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612B610C6802640006736F757263656B00182F686F6D652F736972692F65726C616E672F74742E65726C6A
-=mod:distel
-Current size: 18214
-Current attributes: 836C00000002680264000376736E6C000000016E1000CC9C9EF141459249C1CCA00993B2E29A6A6802640006617574686F726C000000016400116C756B6540626C75657461696C2E636F6D6A6A
-Current compilation info: 836C0000000368026400076F7074696F6E736C0000000664000276336400107761726E5F756E757365645F7661727364000A64656275675F696E666F68026400066F75746469726B00046562696E68026400036377646B001C2F6C6469736B2F736972692F746F6F6C732F64697374656C2D332E3164000A6578706F72745F616C6C6A680264000776657273696F6E6B0003342E31680264000474696D65680662000007D2610B6114610B610361336A
-=mod:crashdump_viewer
-Current size: 125756
-Current attributes: 836C00000001680264000376736E6C000000016E10002DC5D9D96190A2D5F27FAC3FA3D5C7956A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611B61366802640006736F757263656B00362F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765722E65726C6A
-=mod:webtool
-Current size: 29229
-Current attributes: 836C00000002680264000376736E6C000000016E10008AEEF06B60527A3390CBC2C98083CC0A6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104610661086106612D6802640006736F757263656B002C2F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C2E65726C6A
-=mod:gen_tcp
-Current size: 3574
-Current attributes: 836C00000001680264000376736E6C000000016E1000C965E4EAFDAA94D7F21EDCBE30B21E7B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161316802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67656E5F7463702E65726C6A
-=mod:inet_tcp
-Current size: 2743
-Current attributes: 836C00000001680264000376736E6C000000016E1000C4AFE0B49768E4CF78B2C42EA1D3DB7F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7463702E65726C6A
-=mod:inet_gethost_native
-Current size: 15611
-Current attributes: 836C00000002680264000376736E6C000000016E10005D8CD4277D0BD2425B9C26036AE314506A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261206802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F676574686F73745F6E61746976652E65726C6A
-=mod:filelib
-Current size: 7202
-Current attributes: 836C00000001680264000376736E6C000000016E10007B42AA23FF99DF2CD9D586635B77556A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61266802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656C69622E65726C6A
-=mod:httpd_util
-Current size: 24068
-Current attributes: 836C00000002680264000376736E6C000000016E10008D99E096221B88D542E52CB9C8377F6D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128613B6802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7574696C2E65726C6A
-=mod:webtool_sup
-Current size: 695
-Current attributes: 836C00000002680264000376736E6C000000016E1000FA5449E12816CF3AD0A3085BB26CDB9B6A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000468026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461066108610761236802640006736F757263656B00302F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C5F7375702E65726C6A
-=mod:httpd_conf
-Current size: 33659
-Current attributes: 836C00000002680264000376736E6C000000016E1000E3198FBDC73BC48CB7D0C1C762B8F1AB6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861116802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F636F6E662E65726C6A
-=mod:regexp
-Current size: 13698
-Current attributes: 836C00000001680264000376736E6C000000016E10009DD44F3D02F8328BE3ABF4DDA89E0CAE6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61376802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7265676578702E65726C6A
-=mod:string
-Current size: 7740
-Current attributes: 836C00000002680264000376736E6C000000016E10005521DDF38903D46D7C53DB864266F7456A680264000A646570726563617465646C00000007680264000C72655F73685F746F5F61776B6101680264000872655F70617273656101680264000872655F6D617463686102680264000672655F7375626103680264000772655F677375626103680264000872655F73706C697461026802640005696E64657861026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F610F6802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F737472696E672E65726C6A
-=mod:httpd
-Current size: 7563
-Current attributes: 836C00000002680264000376736E6C000000016E1000BFD190D951EB3CAD2CC72ADEF20886906A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861036802640006736F757263656B002C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470642E65726C6A
-=mod:httpd_sup
-Current size: 4068
-Current attributes: 836C00000003680264000376736E6C000000016E10007FA5C790118F18F3D20A2BFAF0229F0A6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861366802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7375702E65726C6A
-=mod:httpd_acceptor_sup
-Current size: 2161
-Current attributes: 836C00000003680264000376736E6C000000016E10003E6F9289B64C13F1EC8A1184BACF055F6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128610C6802640006736F757263656B00392F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F725F7375702E65726C6A
-=mod:httpd_verbosity
-Current size: 2672
-Current attributes: 836C00000002680264000376736E6C000000016E100018B6F407D391872421748F87877DAAF36A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961036802640006736F757263656B00362F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F766572626F736974792E65726C6A
-=mod:timer
-Current size: 8223
-Current attributes: 836C00000001680264000376736E6C000000016E10001D0D64DB1B923D1B3B9497655C43B4AD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F611A6802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F74696D65722E65726C6A
-=mod:httpd_misc_sup
-Current size: 2066
-Current attributes: 836C00000003680264000376736E6C000000016E100092342F38AC16C074DDC21532FBFB52C26A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611F6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D6973635F7375702E65726C6A
-=mod:httpd_manager
-Current size: 28916
-Current attributes: 836C00000003680264000376736E6C000000016E100013F7A1E6A4B6407A0A1892A794EE10A36A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611B6802640006736F757263656B00342F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D616E616765722E65726C6A
-=mod:mod_alias
-Current size: 6720
-Current attributes: 836C00000002680264000376736E6C000000016E10002F35C36060B4AC45474440381D146AB96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961106802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616C6961732E65726C6A
-=mod:mod_auth
-Current size: 25168
-Current attributes: 836C00000002680264000376736E6C000000016E100083F3CA0C7A3E7B5E19A635A7F916595D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961166802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F617574682E65726C6A
-=mod:mod_esi
-Current size: 22534
-Current attributes: 836C00000002680264000376736E6C000000016E1000513E3FF733E1E6592B86CB55B9C14E086A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61026802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6573692E65726C6A
-=mod:mod_actions
-Current size: 3625
-Current attributes: 836C00000002680264000376736E6C000000016E10008E5437921662830490CA76DFF88548966A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066129610C6802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616374696F6E732E65726C6A
-=mod:mod_cgi
-Current size: 25891
-Current attributes: 836C00000002680264000376736E6C000000016E1000F91D405488188F1BD25110B4ED9EE8786A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961306802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6367692E65726C6A
-=mod:mod_include
-Current size: 34923
-Current attributes: 836C00000002680264000376736E6C000000016E1000B9CCE88D63DD6AC49D5DF533C46B97D56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61176802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F696E636C7564652E65726C6A
-=mod:mod_dir
-Current size: 13488
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF620CB4B5DE5586ED681347496DA1C86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961356802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469722E65726C6A
-=mod:mod_get
-Current size: 4672
-Current attributes: 836C00000002680264000376736E6C000000016E1000AD2730B6BE6AF875A500AF4857C4D7F86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61076802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6765742E65726C6A
-=mod:mod_head
-Current size: 3074
-Current attributes: 836C00000002680264000376736E6C000000016E1000CAF803B9FA6A28D4153BC109B00D7DF96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A610B6802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F686561642E65726C6A
-=mod:mod_log
-Current size: 8546
-Current attributes: 836C00000002680264000376736E6C000000016E1000F9664B54861260DEA081249379219AF86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A611B6802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6C6F672E65726C6A
-=mod:mod_disk_log
-Current size: 15160
-Current attributes: 836C00000002680264000376736E6C000000016E1000DDA1E88A9C423A2866B56425DF36F5C66A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961396802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469736B5F6C6F672E65726C6A
-=mod:httpd_socket
-Current size: 7426
-Current attributes: 836C00000002680264000376736E6C000000016E1000B831219096661E4D2E200A07C4A9A7776A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861326802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F736F636B65742E65726C6A
-=mod:httpd_acceptor
-Current size: 4472
-Current attributes: 836C00000002680264000376736E6C000000016E1000A501686DF4E4053E7D978E0CA162BEC56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861076802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F722E65726C6A
-=mod:io_lib_pretty
-Current size: 8171
-Current attributes: 836C00000001680264000376736E6C000000016E1000CD397E11D2D380D02A4BC6EE309B98CB6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E610C6802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F7072657474792E65726C6A
-=mod:httpd_request_handler
-Current size: 26393
-Current attributes: 836C00000002680264000376736E6C000000016E100021C280A5EB5B9CCD00A2C418A341202A6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861296802640006736F757263656B003C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726571756573745F68616E646C65722E65726C6A
-=mod:calendar
-Current size: 7158
-Current attributes: 836C00000002680264000376736E6C000000016E10008C44498546709037F8D72DA4AF8B7FB76A680264000A646570726563617465646C00000001680264001C6C6F63616C5F74696D655F746F5F756E6976657273616C5F74696D6561016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61166802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F63616C656E6461722E65726C6A
-=mod:httpd_parse
-Current size: 9977
-Current attributes: 836C00000002680264000376736E6C000000016E1000174653BAA652261FEB44FFDED99E50B76A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861246802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F70617273652E65726C6A
-=mod:httpd_response
-Current size: 13535
-Current attributes: 836C00000002680264000376736E6C000000016E1000785B247D894BA08A40D814EF11F848976A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128612D6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726573706F6E73652E65726C6A
-=mod:crashdump_viewer_html
-Current size: 68343
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE414770FDB0806C5583FF8D6D71DC766A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611C61026802640006736F757263656B003B2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765725F68746D6C2E65726C6A
-=mod:crashdump_translate
-Current size: 89840
-Current attributes: 836C00000001680264000376736E6C000000016E100038F332287181E933A76CEF4799BDB6416A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000668026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461046115610B611661106802640006736F757263656B00392F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7472616E736C6174652E65726C6A
-=fun
-Module: crashdump_viewer_html
-Uniq: 9122590
-Index: 0
-Address: 526308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 77168418
-Index: 14
-Address: 26541c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 88083515
-Index: 9
-Address: 284c30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 36747896
-Index: 4
-Address: 26df84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 80395734
-Index: 8
-Address: 265838
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 103184573
-Index: 5
-Address: 2fa59c
-Native_address: bce80
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 88265811
-Index: 24
-Address: 34f6a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 9644262
-Index: 2
-Address: 292cec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 100885585
-Index: 0
-Address: 29eb2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 128335479
-Index: 6
-Address: 26de84
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 42988083
-Index: 1
-Address: 210c14
-Native_address: bcf04
-Refc: 1
-=fun
-Module: dict
-Uniq: 7105125
-Index: 7
-Address: 354f84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 29030584
-Index: 8
-Address: 234978
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 29214351
-Index: 2
-Address: 285660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 5158633
-Index: 4
-Address: 274034
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 74624950
-Index: 25
-Address: 34f63c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 6477018
-Index: 3
-Address: 2adb6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 117885138
-Index: 7
-Address: 2ffff8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 47566924
-Index: 6
-Address: 354fb8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 114637756
-Index: 12
-Address: 313c60
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121316204
-Index: 31
-Address: 313a68
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61363639
-Index: 12
-Address: 2ad6a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 116208699
-Index: 3
-Address: 274094
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 113750737
-Index: 0
-Address: 292d54
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 12853672
-Index: 0
-Address: 222e74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108046357
-Index: 12
-Address: 4ab0b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 111569299
-Index: 47
-Address: 34e80c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 20108653
-Index: 15
-Address: 2f9f94
-Native_address: bcea4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 45252965
-Index: 15
-Address: 313c0c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 12437425
-Index: 9
-Address: 4ab3e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 30942993
-Index: 22
-Address: 34f6ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 93430337
-Index: 3
-Address: 33b100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 6604883
-Index: 2
-Address: 33b16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 36867745
-Index: 5
-Address: 255e28
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 90563105
-Index: 1
-Address: 285708
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 18519297
-Index: 7
-Address: 26ddfc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8058975
-Index: 16
-Address: 4a36b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 30694569
-Index: 7
-Address: 27d018
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 76933943
-Index: 0
-Address: 2741b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 9033258
-Index: 6
-Address: 4a4690
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 74851752
-Index: 5
-Address: 4a4798
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 50855382
-Index: 4
-Address: 2659a8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39211582
-Index: 52
-Address: 34e504
-Native_address: bceec
-Refc: 1
-=fun
-Module: file_server
-Uniq: 77665472
-Index: 0
-Address: 2a0dec
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 57487277
-Index: 8
-Address: 2fa3c4
-Native_address: bce94
-Refc: 1
-=fun
-Module: webtool
-Uniq: 87386575
-Index: 11
-Address: 4ab1c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 58991950
-Index: 8
-Address: 4a4338
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 118859163
-Index: 17
-Address: 4a34d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 38265609
-Index: 12
-Address: 354dec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 56903339
-Index: 1
-Address: 2527c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 129504763
-Index: 0
-Address: 28aae8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 44817307
-Index: 10
-Address: 354e3c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 52856894
-Index: 41
-Address: 34eb70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22623360
-Index: 23
-Address: 34f5d4
-Native_address: bceec
-Refc: 1
-=fun
-Module: orddict
-Uniq: 34963136
-Index: 0
-Address: 2fbbbc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erlang
-Uniq: 24496633
-Index: 0
-Address: 213744
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 99313855
-Index: 27
-Address: 2f9914
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 99137703
-Index: 3
-Address: 4b5dfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 124043500
-Index: 3
-Address: 222b84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 102650878
-Index: 22
-Address: 313b48
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 13333720
-Index: 12
-Address: 34fb2c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 133457
-Index: 5
-Address: 292a80
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 64640983
-Index: 4
-Address: 29e944
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 7580218
-Index: 2
-Address: 255f08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 131850870
-Index: 59
-Address: 34e6b8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 56617403
-Index: 10
-Address: 284b40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108680306
-Index: 4
-Address: 4ab5e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 90880071
-Index: 2
-Address: 26e150
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_io_server
-Uniq: 23980778
-Index: 0
-Address: 30ac30
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 12006418
-Index: 19
-Address: 2f9d54
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 81701030
-Index: 8
-Address: 526228
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 71013875
-Index: 1
-Address: 4a4ddc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: distel
-Uniq: 87740845
-Index: 2
-Address: 35c0e0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 90782401
-Index: 17
-Address: 2f9e8c
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 133882676
-Index: 6
-Address: 2e52ac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 105698088
-Index: 3
-Address: 2855b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 58370899
-Index: 0
-Address: 27d370
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 15274536
-Index: 25
-Address: 2f9a94
-Native_address: bcef4
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 94349557
-Index: 0
-Address: 252844
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 33328185
-Index: 1
-Address: 33b1d8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86971387
-Index: 16
-Address: 313db0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 53364473
-Index: 38
-Address: 34ee84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 128145687
-Index: 0
-Address: 4ab944
-Native_address: bcee4
-Refc: 1
-=fun
-Module: c
-Uniq: 98651404
-Index: 10
-Address: 2fff20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 78224618
-Index: 0
-Address: 313dcc
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 40779085
-Index: 11
-Address: 2e50c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 93517350
-Index: 4
-Address: 300090
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 58551291
-Index: 0
-Address: 234f14
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 10055518
-Index: 17
-Address: 526170
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 15795706
-Index: 19
-Address: 313bd4
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 31129467
-Index: 13
-Address: 313c44
-Native_address: bced4
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 115635393
-Index: 0
-Address: 2a1a4c
-Native_address: bcf04
-Refc: 2
-=fun
-Module: erl_eval
-Uniq: 65839696
-Index: 22
-Address: 2f9c00
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 69275064
-Index: 28
-Address: 313aa0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 55938066
-Index: 11
-Address: 354d6c
-Native_address: bceec
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 22323433
-Index: 3
-Address: 252688
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 129726129
-Index: 29
-Address: 313abc
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 84346832
-Index: 0
-Address: 3550fc
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 102096820
-Index: 7
-Address: 2e5290
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 70385762
-Index: 11
-Address: 27cf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_cgi
-Uniq: 1483038
-Index: 0
-Address: 4ec2e8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 3664813
-Index: 1
-Address: 3550b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 131143671
-Index: 6
-Address: 27d08c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 46286977
-Index: 2
-Address: 2740b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_esi
-Uniq: 49099432
-Index: 0
-Address: 4e522c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 95764905
-Index: 2
-Address: 24aaa8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: packages
-Uniq: 62890926
-Index: 0
-Address: 2ae814
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 41564771
-Index: 35
-Address: 3139f8
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 95490768
-Index: 0
-Address: 4a4dc0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121559432
-Index: 3
-Address: 313d78
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_conf
-Uniq: 21152662
-Index: 0
-Address: 4be5a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 41630916
-Index: 5
-Address: 29e914
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 19747201
-Index: 5
-Address: 313d24
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 100584837
-Index: 36
-Address: 34f0f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 64635712
-Index: 15
-Address: 34f94c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 46398361
-Index: 3
-Address: 29e9a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86699817
-Index: 27
-Address: 313b2c
-Native_address: bced4
-Refc: 1
-=fun
-Module: distel
-Uniq: 40869731
-Index: 0
-Address: 35c12c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 83701641
-Index: 1
-Address: 27d33c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_auth
-Uniq: 85845790
-Index: 0
-Address: 4dfd84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 101292714
-Index: 9
-Address: 2e519c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 134173702
-Index: 1
-Address: 265b68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 92433687
-Index: 6
-Address: 2ad9f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 62315241
-Index: 8
-Address: 354f38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 11615541
-Index: 12
-Address: 265530
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 11160090
-Index: 2
-Address: 2b6bb4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 12116524
-Index: 15
-Address: 2342c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 61620901
-Index: 2
-Address: 4fc670
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 23665189
-Index: 12
-Address: 4a3b94
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 43844413
-Index: 0
-Address: 300100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 100514258
-Index: 6
-Address: 313d08
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 54271286
-Index: 17
-Address: 34f8a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 47017252
-Index: 3
-Address: 26dfa0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 1228304
-Index: 7
-Address: 4a45a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 127131470
-Index: 10
-Address: 2655a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_server
-Uniq: 22638227
-Index: 1
-Address: 2a0e20
-Native_address: bcf04
-Refc: 1
-=fun
-Module: code_server
-Uniq: 112704920
-Index: 15
-Address: 2ad488
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88302875
-Index: 2
-Address: 2fa76c
-Native_address: bceb4
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 85808984
-Index: 1
-Address: 28ab18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 106391799
-Index: 0
-Address: 33b22c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25830519
-Index: 5
-Address: 27d0c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 110491036
-Index: 1
-Address: 2e5398
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 13128736
-Index: 5
-Address: 52627c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 84644982
-Index: 21
-Address: 313b9c
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 120577486
-Index: 3
-Address: 34fffc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 4504456
-Index: 44
-Address: 34e938
-Native_address: bceec
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 28754183
-Index: 0
-Address: 500140
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 88043334
-Index: 14
-Address: 313c28
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61592373
-Index: 0
-Address: 2adc28
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74468346
-Index: 26
-Address: 313ad8
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69896253
-Index: 21
-Address: 2f9c40
-Native_address: bce80
-Refc: 1
-=fun
-Module: global_group
-Uniq: 59656873
-Index: 4
-Address: 292ac0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 103891261
-Index: 2
-Address: 4a4d70
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 89619733
-Index: 0
-Address: 4b5e64
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 133201466
-Index: 10
-Address: 2e5180
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 32159369
-Index: 2
-Address: 4ab820
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 76861396
-Index: 2
-Address: 2adbb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 48206487
-Index: 0
-Address: 4fc6f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 118996551
-Index: 28
-Address: 34f384
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 12593774
-Index: 50
-Address: 34e60c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 48542841
-Index: 1
-Address: 50e88c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56178490
-Index: 9
-Address: 4a420c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 88212576
-Index: 4
-Address: 35bf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 79562132
-Index: 29
-Address: 34f368
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 129524917
-Index: 32
-Address: 34f2c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54029891
-Index: 23
-Address: 2f9af0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 108872092
-Index: 4
-Address: 27d0f0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 40905124
-Index: 6
-Address: 234ac0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 50124876
-Index: 10
-Address: 2ad760
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 791358
-Index: 48
-Address: 34e7b0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 18404828
-Index: 24
-Address: 313af4
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 13278653
-Index: 1
-Address: 4b5e48
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 110307423
-Index: 13
-Address: 284a7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 99592247
-Index: 0
-Address: 256118
-Native_address: bcf04
-Refc: 1
-=fun
-Module: global
-Uniq: 99918211
-Index: 2
-Address: 265af4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 71442319
-Index: 27
-Address: 34f510
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 7612785
-Index: 13
-Address: 2fa0fc
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56095795
-Index: 15
-Address: 4a38a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 23626796
-Index: 25
-Address: 313b10
-Native_address: bced4
-Refc: 1
-=fun
-Module: file_server
-Uniq: 126074974
-Index: 2
-Address: 2a0cac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 104278122
-Index: 1
-Address: 274154
-Native_address: bcefc
-Refc: 1
-=fun
-Module: sys
-Uniq: 90854051
-Index: 0
-Address: 240344
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 113334594
-Index: 2
-Address: 313d5c
-Native_address: bced4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 8832142
-Index: 7
-Address: 284e30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9159706
-Index: 42
-Address: 34eb54
-Native_address: bceec
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 123946665
-Index: 8
-Address: 26e494
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3149789
-Index: 1
-Address: 5262d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 48288621
-Index: 11
-Address: 2ffed8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8953292
-Index: 20
-Address: 4a4d54
-Native_address: bcee4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9632158
-Index: 4
-Address: 34ff88
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 31111567
-Index: 7
-Address: 29e8c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 85307443
-Index: 10
-Address: 2fa29c
-Native_address: bcec4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 104417191
-Index: 7
-Address: 313cd0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 43625777
-Index: 5
-Address: 354fec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 92698798
-Index: 3
-Address: 4ab780
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 39074546
-Index: 6
-Address: 2fa54c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 71451126
-Index: 5
-Address: 234b98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 122084387
-Index: 6
-Address: 300038
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 9625924
-Index: 14
-Address: 284a60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 128777368
-Index: 11
-Address: 313c7c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 10203723
-Index: 7
-Address: 4ab4f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 35032400
-Index: 10
-Address: 313c98
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 17252586
-Index: 34
-Address: 313a14
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 7177165
-Index: 11
-Address: 2ad734
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 115778175
-Index: 3
-Address: 4a4930
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 96440880
-Index: 51
-Address: 34e590
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 68275407
-Index: 0
-Address: 2b7340
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88854488
-Index: 16
-Address: 2f9f04
-Native_address: bcebc
-Refc: 1
-=fun
-Module: global
-Uniq: 26353848
-Index: 13
-Address: 2654e8
-Native_address: bcf04
-Refc: 3
-=fun
-Module: global
-Uniq: 93414722
-Index: 11
-Address: 265568
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 11194189
-Index: 60
-Address: 34fe0c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 125189992
-Index: 8
-Address: 2fffdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 112472016
-Index: 2
-Address: 355088
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 104426442
-Index: 5
-Address: 2e52e0
-Native_address: bceec
-Refc: 1
-=fun
-Module: global
-Uniq: 17426458
-Index: 0
-Address: 265bc4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 81191039
-Index: 5
-Address: 2ada48
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 71765042
-Index: 5
-Address: 284f74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 85855821
-Index: 2
-Address: 1fa298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 70586122
-Index: 10
-Address: 4a3fe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 87067911
-Index: 49
-Address: 34e708
-Native_address: bcef4
-Refc: 1
-=fun
-Module: distel
-Uniq: 63126735
-Index: 1
-Address: 35c0fc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: c
-Uniq: 58270309
-Index: 1
-Address: 3000e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: ets
-Uniq: 80538457
-Index: 1
-Address: 2bc1a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 69827241
-Index: 9
-Address: 34fd70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 103968752
-Index: 3
-Address: 355054
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 117175573
-Index: 21
-Address: 34f728
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 57865450
-Index: 2
-Address: 2e537c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 14705965
-Index: 20
-Address: 313b80
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 85360931
-Index: 6
-Address: 4ab56c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: kernel_config
-Uniq: 41755598
-Index: 0
-Address: 2d9e20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 7110547
-Index: 37
-Address: 34ef14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 28091577
-Index: 16
-Address: 234244
-Native_address: bcef4
-Refc: 2
-=fun
-Module: code_server
-Uniq: 96448152
-Index: 14
-Address: 2ad4e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 40177568
-Index: 13
-Address: 4a39a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 31948320
-Index: 58
-Address: 34dfdc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 54153760
-Index: 7
-Address: 265854
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 60156260
-Index: 3
-Address: 5262b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 1010616
-Index: 2
-Address: 350064
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 96784459
-Index: 1
-Address: 1fa2b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 48691771
-Index: 18
-Address: 313bb8
-Native_address: bced4
-Refc: 1
-=fun
-Module: global
-Uniq: 26895060
-Index: 9
-Address: 265710
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 109625093
-Index: 7
-Address: 2ad8fc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 59436171
-Index: 1
-Address: 3500dc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 92768306
-Index: 9
-Address: 354f04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 106430008
-Index: 3
-Address: 292b38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 79749196
-Index: 6
-Address: 1fa01c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 6014929
-Index: 9
-Address: 2fa324
-Native_address: bceac
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 57051922
-Index: 7
-Address: 234a28
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 77043468
-Index: 6
-Address: 29e8e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 36176045
-Index: 9
-Address: 52620c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 35862809
-Index: 3
-Address: 255edc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113649451
-Index: 4
-Address: 2850a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 67943969
-Index: 5
-Address: 2658f4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 109003032
-Index: 16
-Address: 5260d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 104711447
-Index: 13
-Address: 525f5c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 107666872
-Index: 9
-Address: 27cfb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 89410000
-Index: 10
-Address: 5261f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 47356870
-Index: 11
-Address: 284ab4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17873449
-Index: 56
-Address: 34e1e8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 8839441
-Index: 33
-Address: 34f25c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 82513204
-Index: 2
-Address: 222c18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 5973059
-Index: 0
-Address: 24ab7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 127832132
-Index: 0
-Address: 4b065c
-Native_address: bcefc
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 39322658
-Index: 14
-Address: 525f40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_server
-Uniq: 100284021
-Index: 0
-Address: 23d288
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 17430070
-Index: 12
-Address: 284a98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 97509773
-Index: 3
-Address: 1fa27c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 32364818
-Index: 3
-Address: 35c050
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 58576084
-Index: 32
-Address: 313a4c
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 38384851
-Index: 14
-Address: 4a3988
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 14139883
-Index: 4
-Address: 234d78
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 122590256
-Index: 0
-Address: 2fa8b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 14705629
-Index: 11
-Address: 2fa22c
-Native_address: bcedc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 9273769
-Index: 4
-Address: 2fa684
-Native_address: bcee4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 87950142
-Index: 11
-Address: 5261d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 54913678
-Index: 1
-Address: 4fc6b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 28370334
-Index: 0
-Address: 26e4b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 24927227
-Index: 40
-Address: 34ed4c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 105437500
-Index: 33
-Address: 313a30
-Native_address: bced4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 10921695
-Index: 1
-Address: 234eac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 112431564
-Index: 55
-Address: 34e22c
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 129460863
-Index: 5
-Address: 4ab5c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 89001648
-Index: 3
-Address: 27d2ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 36199507
-Index: 8
-Address: 27cfe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 35620771
-Index: 2
-Address: 5262ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 83214871
-Index: 18
-Address: 2f9e34
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 122455383
-Index: 1
-Address: 2adc0c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22389488
-Index: 31
-Address: 34f1b8
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 41869059
-Index: 12
-Address: 2fa1d4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 18130505
-Index: 45
-Address: 34e904
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 107414126
-Index: 1
-Address: 2b706c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 116638945
-Index: 28
-Address: 2f98f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 48465762
-Index: 9
-Address: 2348c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 87633852
-Index: 0
-Address: 50e97c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 28213098
-Index: 8
-Address: 4ab42c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 123630574
-Index: 4
-Address: 222b58
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 127425508
-Index: 13
-Address: 354eb4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 95048118
-Index: 16
-Address: 2ad46c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 108661978
-Index: 19
-Address: 34f75c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 21272619
-Index: 13
-Address: 34fad8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29943747
-Index: 17
-Address: 313bf0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 120240397
-Index: 4
-Address: 313d94
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 124060676
-Index: 0
-Address: 350124
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 100975346
-Index: 6
-Address: 526260
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61421476
-Index: 4
-Address: 2ada9c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45197232
-Index: 7
-Address: 34fe5c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3151900
-Index: 15
-Address: 525f24
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 77509245
-Index: 2
-Address: 4b5e2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 94110229
-Index: 8
-Address: 2ad7e4
-Native_address: bcef4
-Refc: 3
-=fun
-Module: rpc
-Uniq: 101217130
-Index: 1
-Address: 2560c4
-Native_address: bcf04
-Refc: 1
-=fun
-Module: lists
-Uniq: 103647452
-Index: 0
-Address: 244b7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 37841211
-Index: 9
-Address: 2ad77c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 40109251
-Index: 54
-Address: 34e2b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 98012300
-Index: 0
-Address: 1fa2d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 73604759
-Index: 10
-Address: 4ab270
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 12042434
-Index: 1
-Address: 313d40
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 127137775
-Index: 4
-Address: 2e531c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 45498037
-Index: 12
-Address: 27cec0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 122441107
-Index: 34
-Address: 34f1d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70933889
-Index: 46
-Address: 34e8d0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 69850797
-Index: 2
-Address: 27d308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 103965539
-Index: 13
-Address: 234684
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29979659
-Index: 30
-Address: 313a84
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17148721
-Index: 20
-Address: 34f778
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_response
-Uniq: 100673049
-Index: 0
-Address: 5165dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 10508176
-Index: 1
-Address: 4b04dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32476064
-Index: 57
-Address: 34e1c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74835078
-Index: 9
-Address: 313cec
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 60689814
-Index: 19
-Address: 4a3b78
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39269715
-Index: 5
-Address: 34ff14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 112923172
-Index: 0
-Address: 2e5404
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43010824
-Index: 14
-Address: 2fa03c
-Native_address: bce8c
-Refc: 1
-=fun
-Module: global
-Uniq: 82495254
-Index: 3
-Address: 265ac8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 48568081
-Index: 8
-Address: 2e5220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 77236637
-Index: 7
-Address: 1fa000
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 109386574
-Index: 1
-Address: 2fa804
-Native_address: bce9c
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 42613220
-Index: 14
-Address: 34f980
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 67093144
-Index: 23
-Address: 313b64
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 86833790
-Index: 11
-Address: 34fbe8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 6344855
-Index: 1
-Address: 29eabc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 5149749
-Index: 35
-Address: 34f220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 93451769
-Index: 5
-Address: 1fa120
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 117428568
-Index: 11
-Address: 234758
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 15225890
-Index: 4
-Address: 526298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 120760477
-Index: 2
-Address: 234cdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 88561919
-Index: 3
-Address: 3000ac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 108931174
-Index: 8
-Address: 313cb4
-Native_address: bced4
-Refc: 1
-=fun
-Module: rpc
-Uniq: 122901192
-Index: 4
-Address: 255e44
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32985930
-Index: 10
-Address: 34fc40
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 97968498
-Index: 1
-Address: 292b7c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 45671671
-Index: 18
-Address: 4a32d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 117968056
-Index: 3
-Address: 2fa6ec
-Native_address: bcecc
-Refc: 1
-=fun
-Module: init
-Uniq: 108717591
-Index: 4
-Address: 1fa194
-Native_address: bcf04
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 15091954
-Index: 2
-Address: 2526dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 65707495
-Index: 6
-Address: 2658a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 34473969
-Index: 17
-Address: 2ad450
-Native_address: bcef4
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 124296602
-Index: 7
-Address: 526244
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 23074707
-Index: 15
-Address: 265460
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25972856
-Index: 10
-Address: 27cf74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43110452
-Index: 24
-Address: 2f9ad4
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 106445918
-Index: 13
-Address: 2ad660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 116071286
-Index: 12
-Address: 5261b8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 130814477
-Index: 8
-Address: 284cfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 121017037
-Index: 39
-Address: 34ed80
-Native_address: bcef4
-Refc: 1
-=fun
-Module: ets
-Uniq: 104895267
-Index: 0
-Address: 2bc1bc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 104682437
-Index: 11
-Address: 4a3de0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70248777
-Index: 30
-Address: 34f30c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 13274975
-Index: 5
-Address: 300074
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 98442771
-Index: 53
-Address: 34e2d0
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69829006
-Index: 7
-Address: 2fa47c
-Native_address: bce80
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 36444943
-Index: 1
-Address: 2a1a80
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 58719455
-Index: 26
-Address: 34f5f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: timer
-Uniq: 42505885
-Index: 0
-Address: 4cd62c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54682479
-Index: 20
-Address: 2f9d08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 86070332
-Index: 1
-Address: 222d7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 54728136
-Index: 9
-Address: 2fff68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 16474219
-Index: 3
-Address: 234c60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 108831556
-Index: 10
-Address: 234810
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 72053761
-Index: 16
-Address: 34f8ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 65127616
-Index: 2
-Address: 29ea04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 126167637
-Index: 14
-Address: 234640
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113704917
-Index: 0
-Address: 285788
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 75279647
-Index: 1
-Address: 500100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 119218247
-Index: 5
-Address: 26df68
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 85690044
-Index: 4
-Address: 4b5d6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 53075592
-Index: 1
-Address: 26e16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 39490182
-Index: 2
-Address: 3000c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 75189006
-Index: 12
-Address: 234714
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 14980808
-Index: 43
-Address: 34eb38
-Native_address: bceec
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 16463468
-Index: 4
-Address: 4a4914
-Native_address: bcee4
-Refc: 1
-=fun
-Module: dict
-Uniq: 99965326
-Index: 4
-Address: 355020
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 36900786
-Index: 6
-Address: 284f3c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45447147
-Index: 18
-Address: 34f794
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32353825
-Index: 6
-Address: 34fe78
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 134052338
-Index: 8
-Address: 34fdc0
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_master
-Uniq: 23840924
-Index: 1
-Address: 24aae0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108282500
-Index: 1
-Address: 4ab918
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 31081110
-Index: 0
-Address: 210c68
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54275742
-Index: 26
-Address: 2f9a4c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 45083091
-Index: 3
-Address: 2e5350
-Native_address: bcf04
-Refc: 3
-=proc_stack:<0.0.0>
-3a48bc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H371264
-=proc_heap:<0.0.0>
-371264:t9:A5:state,H3710D8,N,N,H3710F4,P<0.1.0>,H37128C,H3710FC,N
-3710FC:t2:H371138,H371140
-371140:lI80|H371194
-371194:lI49|H3711E0
-3711E0:lI48|H371204
-371204:lI66|N
-371138:lI79|H37118C
-37118C:lI84|H3711D8
-3711D8:lI80|H3711FC
-3711FC:lI32|H37120C
-37120C:lI32|H371214
-371214:lI65|H37121C
-37121C:lI80|H371224
-371224:lI78|H37122C
-37122C:lI32|H371234
-371234:lI49|H37123C
-37123C:lI56|H371244
-371244:lI49|H37124C
-37124C:lI32|H371254
-371254:lI48|H37125C
-37125C:lI49|N
-37128C:t2:A7:started,A7:started
-3710F4:lH371124|H371130
-371124:t2:A16:application_controller,P<0.5.0>
-371130:lH371178|H371184
-371178:t2:AC:error_logger,P<0.4.0>
-371184:lH3711CC|N
-3711CC:t2:AF:erl_prim_loader,P<0.2.0>
-3710D8:lH3710E0|H3710EC
-3710E0:t2:A5:-root,H371108
-371108:lH371148|N
-371148:Yh13:2F636C656172636173652F6F74702F65727473
-3710EC:lH371110|H37111C
-371110:t2:A9:-progname,H371164
-371164:lH37119C|N
-37119C:Yh1D:2F636C656172636173652F6F74702F657274732F62696E2F6365726C20
-37111C:lH37116C|N
-37116C:t2:A5:-home,H3711C4
-3711C4:lH3711E8|N
-3711E8:YhA:2F686F6D652F73697269
-=proc_stack:<0.2.0>
-38eca8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H367D20
-y1:P<0.1.0>
-y2:H367D28
-y3:A8:infinity
-=proc_heap:<0.2.0>
-367D20:lH367D48|H367D50
-367D48:lI47|H367D58
-367D58:lI99|H367D68
-367D68:lI108|H367D78
-367D78:lI101|H367D88
-367D88:lI97|H367D98
-367D98:lI114|H367DA8
-367DA8:lI99|H367DB8
-367DB8:lI97|H367DC8
-367DC8:lI115|H367DD8
-367DD8:lI101|H367DE8
-367DE8:lI47|H367DF8
-367DF8:lI111|H367E08
-367E08:lI116|H367E18
-367E18:lI112|H367E28
-367E28:lI47|H367E38
-367E38:lI101|H367E48
-367E48:lI114|H367E58
-367E58:lI116|H367E68
-367E68:lI115|H367E78
-367E78:lI47|H367E88
-367E88:lI108|H367E98
-367E98:lI105|H367EA8
-367EA8:lI98|H367EB8
-367EB8:lI47|H367EC8
-367EC8:lI107|H367ED8
-367ED8:lI101|H367EE8
-367EE8:lI114|H367EF8
-367EF8:lI110|H367F08
-367F08:lI101|H367F18
-367F18:lI108|H367F28
-367F28:lI47|H367F38
-367F38:lI101|H367F48
-367F48:lI98|H367F58
-367F58:lI105|H367F68
-367F68:lI110|N
-367D50:lH367D60|N
-367D60:lI47|H367D70
-367D70:lI99|H367D80
-367D80:lI108|H367D90
-367D90:lI101|H367DA0
-367DA0:lI97|H367DB0
-367DB0:lI114|H367DC0
-367DC0:lI99|H367DD0
-367DD0:lI97|H367DE0
-367DE0:lI115|H367DF0
-367DF0:lI101|H367E00
-367E00:lI47|H367E10
-367E10:lI111|H367E20
-367E20:lI116|H367E30
-367E30:lI112|H367E40
-367E40:lI47|H367E50
-367E50:lI101|H367E60
-367E60:lI114|H367E70
-367E70:lI116|H367E80
-367E80:lI115|H367E90
-367E90:lI47|H367EA0
-367EA0:lI108|H367EB0
-367EB0:lI105|H367EC0
-367EC0:lI98|H367ED0
-367ED0:lI47|H367EE0
-367EE0:lI115|H367EF0
-367EF0:lI116|H367F00
-367F00:lI100|H367F10
-367F10:lI108|H367F20
-367F20:lI105|H367F30
-367F30:lI98|H367F40
-367F40:lI47|H367F50
-367F50:lI101|H367F60
-367F60:lI98|H367F70
-367F70:lI105|H367F78
-367F78:lI110|N
-367D28:t7:A5:state,A5:efile,N,A4:none,p<0.2>,A8:infinity,A5:false
-=proc_dictionary:<0.4.0>
-H3AC588
-H3AC594
-=proc_stack:<0.4.0>
-3b2f14:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:H3B21E8
-y2:AC:error_logger
-y3:P<0.1.0>
-3b2f28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3AC5A8
-=proc_heap:<0.4.0>
-3B21E8:lH3B2144|H3B21E0
-3B2144:t5:A7:handler,AC:error_logger,A5:false,N,A5:false
-3B21E0:lH3B21BC|N
-3B21BC:t5:A7:handler,A12:error_logger_tty_h,A5:false,H3AC610,A5:false
-3AC610:t2:P<0.21.0>,AC:error_logger
-3AC5A8:lA9:gen_event|H3AC5E8
-3AC5E8:lP<0.1.0>|H3AC608
-3AC608:lP<0.1.0>|H3AC61C
-3AC61C:lH3AC624|H3AC630
-3AC624:t2:A5:local,AC:error_logger
-3AC630:lN|H3AC638
-3AC638:lN|H3AC640
-3AC640:lN|N
-3AC588:t2:AD:$initial_call,H3AC5B0
-3AC5B0:t3:A3:gen,A7:init_it,H3AC5A8
-3AC594:t2:AA:$ancestors,H3AC5C0
-3AC5C0:lP<0.1.0>|N
-=proc_dictionary:<0.5.0>
-H372E4C
-H372E58
-=proc_stack:<0.5.0>
-374704:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A16:application_controller
-y3:H3739F4
-y4:A16:application_controller
-y5:P<0.1.0>
-374720:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H372ED0
-=proc_heap:<0.5.0>
-3739F4:t9:A5:state,N,N,N,H373914,N,H373928,N,N
-373928:lH37391C|H372F54
-37391C:t2:A6:stdlib,A9:permanent
-372F54:lH372F90|N
-372F90:t2:A6:kernel,A9:permanent
-373914:lH373908|H372F4C
-373908:t2:A6:stdlib,A9:undefined
-372F4C:lH372F84|N
-372F84:t2:A6:kernel,P<0.7.0>
-372ED0:lAA:gen_server|H372F5C
-372F5C:lP<0.1.0>|H372F9C
-372F9C:lP<0.1.0>|H372FC4
-372FC4:lH372FEC|H372FF8
-372FEC:t2:A5:local,A16:application_controller
-372FF8:lA16:application_controller|H373018
-373018:lH373038|H373048
-373038:t3:AB:application,A6:kernel,H373060
-373060:lH373078|H373084
-373078:t2:AB:description,H37309C
-37309C:lI69|H3730C8
-3730C8:lI82|H3730FC
-3730FC:lI84|H373130
-373130:lI83|H37316C
-37316C:lI32|H3731A8
-3731A8:lI32|H3731E4
-3731E4:lI67|H373220
-373220:lI88|H37325C
-37325C:lI67|H37329C
-37329C:lI32|H3732D0
-3732D0:lI49|H3732FC
-3732FC:lI51|H373328
-373328:lI56|H373348
-373348:lI32|H373368
-373368:lI49|H373388
-373388:lI48|N
-373084:lH3730A4|H3730B0
-3730A4:t2:A3:vsn,H3730D0
-3730D0:lI50|H373104
-373104:lI46|H373138
-373138:lI57|N
-3730B0:lH3730D8|H3730E4
-3730D8:t2:A2:id,N
-3730E4:lH37310C|H373118
-37310C:t2:A7:modules,H373140
-373140:lAB:application|H373174
-373174:lA16:application_controller|H3731B0
-3731B0:lA12:application_master|H3731EC
-3731EC:lA13:application_starter|H373228
-373228:lA4:auth|H373264
-373264:lA4:code|H3732A4
-3732A4:lA8:code_aux|H3732D8
-3732D8:lA8:packages|H373304
-373304:lAB:code_server|H373330
-373330:lA9:dist_util|H373350
-373350:lAF:erl_boot_server|H373370
-373370:lA10:erl_distribution|H373390
-373390:lAF:erl_prim_loader|H3733A8
-3733A8:lA9:erl_reply|H3733C0
-3733C0:lA6:erlang|H3733D8
-3733D8:lAD:error_handler|H3733F0
-3733F0:lAC:error_logger|H373408
-373408:lA4:file|H373420
-373420:lAB:file_server|H373438
-373438:lAF:old_file_server|H373450
-373450:lAE:file_io_server|H373468
-373468:lA9:prim_file|H373480
-373480:lA6:global|H373498
-373498:lAC:global_group|H3734B0
-3734B0:lAD:global_search|H3734C8
-3734C8:lA5:group|H3734E0
-3734E0:lA5:heart|H3734F8
-3734F8:lA13:hipe_unified_loader|H373510
-373510:lA11:hipe_sparc_loader|H373520
-373520:lAF:hipe_x86_loader|H373530
-373530:lA9:inet6_tcp|H373540
-373540:lAE:inet6_tcp_dist|H373550
-373550:lA9:inet6_udp|H373560
-373560:lAB:inet_config|H373570
-373570:lAA:inet_hosts|H373580
-373580:lA13:inet_gethost_native|H373590
-373590:lAD:inet_tcp_dist|H3735A0
-3735A0:lA4:init|H3735B0
-3735B0:lA6:kernel|H3735C0
-3735C0:lAD:kernel_config|H3735D0
-3735D0:lA3:net|H3735E0
-3735E0:lA7:net_adm|H3735F0
-3735F0:lAA:net_kernel|H373600
-373600:lA2:os|H373610
-373610:lA8:ram_file|H373620
-373620:lA3:rpc|H373630
-373630:lA4:user|H373640
-373640:lA8:user_drv|H373650
-373650:lA8:user_sup|H373660
-373660:lA8:disk_log|H373670
-373670:lAA:disk_log_1|H373680
-373680:lAF:disk_log_server|H373690
-373690:lAC:disk_log_sup|H3736A0
-3736A0:lA7:dist_ac|H3736B0
-3736B0:lA8:erl_ddll|H3736C0
-3736C0:lA8:erl_epmd|H3736D0
-3736D0:lAA:erts_debug|H3736E0
-3736E0:lA7:gen_tcp|H3736F0
-3736F0:lA7:gen_udp|H373700
-373700:lA9:prim_inet|H373708
-373708:lA4:inet|H373710
-373710:lA7:inet_db|H373718
-373718:lA8:inet_dns|H373720
-373720:lAA:inet_parse|H373728
-373728:lA8:inet_res|H373730
-373730:lA8:inet_tcp|H373738
-373738:lA8:inet_udp|H373740
-373740:lA3:pg2|H373748
-373748:lA9:seq_trace|H373750
-373750:lA6:socks5|H373758
-373758:lAB:socks5_auth|H373760
-373760:lAA:socks5_tcp|H373768
-373768:lAA:socks5_udp|H373770
-373770:lAF:wrap_log_reader|H373778
-373778:lA4:zlib|H373780
-373780:lA9:otp_ring0|N
-373118:lH373148|H373154
-373148:t2:AA:registered,H37317C
-37317C:lA16:application_controller|H3731B8
-3731B8:lA9:erl_reply|H3731F4
-3731F4:lA4:auth|H373230
-373230:lAB:boot_server|H37326C
-37326C:lAB:code_server|H3732AC
-3732AC:lAF:disk_log_server|H3732E0
-3732E0:lAC:disk_log_sup|H37330C
-37330C:lAF:erl_prim_loader|H373338
-373338:lAC:error_logger|H373358
-373358:lAB:file_server|H373378
-373378:lAD:file_server_2|H373398
-373398:lAF:fixtable_server|H3733B0
-3733B0:lAC:global_group|H3733C8
-3733C8:lA12:global_name_server|H3733E0
-3733E0:lA5:heart|H3733F8
-3733F8:lA4:init|H373410
-373410:lAD:kernel_config|H373428
-373428:lAA:kernel_sup|H373440
-373440:lAA:net_kernel|H373458
-373458:lA7:net_sup|H373470
-373470:lA3:rex|H373488
-373488:lA4:user|H3734A0
-3734A0:lA9:os_server|H3734B8
-3734B8:lAB:ddll_server|H3734D0
-3734D0:lA8:erl_epmd|H3734E8
-3734E8:lA7:inet_db|H373500
-373500:lA3:pg2|N
-373154:lH373184|H373190
-373184:t2:AC:applications,N
-373190:lH3731C0|H3731CC
-3731C0:t2:A15:included_applications,N
-3731CC:lH3731FC|H373208
-3731FC:t2:A3:env,H373238
-373238:lH373274|N
-373274:t2:AC:error_logger,A3:tty
-373208:lH373240|H37324C
-373240:t2:AC:start_phases,A9:undefined
-37324C:lH373280|H37328C
-373280:t2:A4:maxT,A8:infinity
-37328C:lH3732B4|H3732C0
-3732B4:t2:A4:maxP,A8:infinity
-3732C0:lH3732E8|N
-3732E8:t2:A3:mod,H373314
-373314:t2:A6:kernel,N
-373048:lN|N
-372E4C:t2:AD:$initial_call,H372EE4
-372EE4:t3:A3:gen,A7:init_it,H372ED0
-372E58:t2:AA:$ancestors,H372EF4
-372EF4:lP<0.1.0>|N
-=proc_dictionary:<0.7.0>
-H369B78
-H369B5C
-=proc_stack:<0.7.0>
-369d64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:H369C2C
-y1:P<0.5.0>
-369d70:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A12:application_master
-y2:A4:init
-y3:H369B2C
-=proc_heap:<0.7.0>
-369C2C:t6:A5:state,P<0.8.0>,H3697B0,N,I0,P<0.0.0>
-3697B0:t9:A9:appl_data,A6:kernel,H369B14,A9:undefined,H3697D8,H369A3C,N,A8:infinity,A8:infinity
-369A3C:lAB:application|H369A34
-369A34:lA16:application_controller|H369A2C
-369A2C:lA12:application_master|H369A24
-369A24:lA13:application_starter|H369A1C
-369A1C:lA4:auth|H369A14
-369A14:lA4:code|H369A0C
-369A0C:lA8:code_aux|H369A04
-369A04:lA8:packages|H3699FC
-3699FC:lAB:code_server|H3699F4
-3699F4:lA9:dist_util|H3699EC
-3699EC:lAF:erl_boot_server|H3699E4
-3699E4:lA10:erl_distribution|H3699DC
-3699DC:lAF:erl_prim_loader|H3699D4
-3699D4:lA9:erl_reply|H3699CC
-3699CC:lA6:erlang|H3699C4
-3699C4:lAD:error_handler|H3699BC
-3699BC:lAC:error_logger|H3699B4
-3699B4:lA4:file|H3699AC
-3699AC:lAB:file_server|H3699A4
-3699A4:lAF:old_file_server|H36999C
-36999C:lAE:file_io_server|H369994
-369994:lA9:prim_file|H36998C
-36998C:lA6:global|H369984
-369984:lAC:global_group|H36997C
-36997C:lAD:global_search|H369974
-369974:lA5:group|H36996C
-36996C:lA5:heart|H369964
-369964:lA13:hipe_unified_loader|H36995C
-36995C:lA11:hipe_sparc_loader|H369954
-369954:lAF:hipe_x86_loader|H36994C
-36994C:lA9:inet6_tcp|H369944
-369944:lAE:inet6_tcp_dist|H36993C
-36993C:lA9:inet6_udp|H369934
-369934:lAB:inet_config|H36992C
-36992C:lAA:inet_hosts|H369924
-369924:lA13:inet_gethost_native|H36991C
-36991C:lAD:inet_tcp_dist|H369914
-369914:lA4:init|H36990C
-36990C:lA6:kernel|H369904
-369904:lAD:kernel_config|H3698FC
-3698FC:lA3:net|H3698F4
-3698F4:lA7:net_adm|H3698EC
-3698EC:lAA:net_kernel|H3698E4
-3698E4:lA2:os|H3698DC
-3698DC:lA8:ram_file|H3698D4
-3698D4:lA3:rpc|H3698CC
-3698CC:lA4:user|H3698C4
-3698C4:lA8:user_drv|H3698BC
-3698BC:lA8:user_sup|H3698B4
-3698B4:lA8:disk_log|H3698AC
-3698AC:lAA:disk_log_1|H3698A4
-3698A4:lAF:disk_log_server|H36989C
-36989C:lAC:disk_log_sup|H369894
-369894:lA7:dist_ac|H36988C
-36988C:lA8:erl_ddll|H369884
-369884:lA8:erl_epmd|H36987C
-36987C:lAA:erts_debug|H369874
-369874:lA7:gen_tcp|H36986C
-36986C:lA7:gen_udp|H369864
-369864:lA9:prim_inet|H36985C
-36985C:lA4:inet|H369854
-369854:lA7:inet_db|H36984C
-36984C:lA8:inet_dns|H369844
-369844:lAA:inet_parse|H36983C
-36983C:lA8:inet_res|H369834
-369834:lA8:inet_tcp|H36982C
-36982C:lA8:inet_udp|H369824
-369824:lA3:pg2|H36981C
-36981C:lA9:seq_trace|H369814
-369814:lA6:socks5|H36980C
-36980C:lAB:socks5_auth|H369804
-369804:lAA:socks5_tcp|H3697FC
-3697FC:lAA:socks5_udp|H3697F4
-3697F4:lAF:wrap_log_reader|H3697EC
-3697EC:lA4:zlib|H3697E4
-3697E4:lA9:otp_ring0|N
-3697D8:t2:A6:kernel,N
-369B14:lA16:application_controller|H369B0C
-369B0C:lA9:erl_reply|H369B04
-369B04:lA4:auth|H369AFC
-369AFC:lAB:boot_server|H369AF4
-369AF4:lAB:code_server|H369AEC
-369AEC:lAF:disk_log_server|H369AE4
-369AE4:lAC:disk_log_sup|H369ADC
-369ADC:lAF:erl_prim_loader|H369AD4
-369AD4:lAC:error_logger|H369ACC
-369ACC:lAB:file_server|H369AC4
-369AC4:lAD:file_server_2|H369ABC
-369ABC:lAF:fixtable_server|H369AB4
-369AB4:lAC:global_group|H369AAC
-369AAC:lA12:global_name_server|H369AA4
-369AA4:lA5:heart|H369A9C
-369A9C:lA4:init|H369A94
-369A94:lAD:kernel_config|H369A8C
-369A8C:lAA:kernel_sup|H369A84
-369A84:lAA:net_kernel|H369A7C
-369A7C:lA7:net_sup|H369A74
-369A74:lA3:rex|H369A6C
-369A6C:lA4:user|H369A64
-369A64:lA9:os_server|H369A5C
-369A5C:lAB:ddll_server|H369A54
-369A54:lA8:erl_epmd|H369A4C
-369A4C:lA7:inet_db|H369A44
-369A44:lA3:pg2|N
-369B2C:lP<0.5.0>|H369B24
-369B24:lP<0.6.0>|H3697A8
-3697A8:lH3697B0|H369B1C
-369B1C:lA6:normal|N
-369B78:t2:AD:$initial_call,H369B68
-369B68:t3:A12:application_master,A4:init,H369B2C
-369B5C:t2:AA:$ancestors,H369B54
-369B54:lP<0.6.0>|N
-=proc_stack:<0.8.0>
-384ec0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H384BDC
-y1:A6:kernel
-y2:P<0.9.0>
-y3:P<0.7.0>
-=proc_heap:<0.8.0>
-384BDC:t2:A5:state,A3:tty
-=proc_dictionary:<0.9.0>
-H376850
-H37685C
-=proc_stack:<0.9.0>
-36bde8:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36B8E8
-y4:AA:kernel_sup
-y5:P<0.8.0>
-36be04:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3768D4
-=proc_heap:<0.9.0>
-36B8E8:tA:A5:state,H376868,AB:one_for_all,H36B8D4,N,I0,I1,N,A6:kernel,N
-36B8D4:lH36B8B0|H36B6E8
-36B8B0:t8:A5:child,P<0.24.0>,AF:kernel_safe_sup,H376BF0,A9:permanent,A8:infinity,AA:supervisor,H376C00
-376C00:lA6:kernel|N
-376BF0:t3:AA:supervisor,AA:start_link,H376C08
-376C08:lH376C10|H376C1C
-376C10:t2:A5:local,AF:kernel_safe_sup
-376C1C:lA6:kernel|H376C24
-376C24:lA4:safe|N
-36B6E8:lH36B6C4|H36B490
-36B6C4:t8:A5:child,P<0.23.0>,AD:kernel_config,H376BB4,A9:permanent,I2000,A6:worker,H376BC4
-376BC4:lAD:kernel_config|N
-376BB4:t3:AD:kernel_config,AA:start_link,N
-36B490:lH36B498|H36B4BC
-36B498:t8:A5:child,P<0.19.0>,A4:user,H376B70,A9:temporary,I2000,AA:supervisor,H376B80
-376B80:lA8:user_sup|N
-376B70:t3:A8:user_sup,A5:start,N
-36B4BC:lH36B4C4|H376CB0
-36B4C4:t8:A5:child,P<0.18.0>,AB:code_server,H376B0C,A9:permanent,I2000,A6:worker,H376B1C
-376B1C:lA4:code|N
-376B0C:t3:A4:code,AA:start_link,N
-376CB0:lH376CB8|H376CDC
-376CB8:t8:A5:child,P<0.17.0>,AB:file_server,H376AB8,A9:permanent,I2000,A6:worker,H376AC8
-376AC8:lAF:old_file_server|N
-376AB8:t3:AF:old_file_server,AA:start_link,N
-376CDC:lH376CE4|H376C2C
-376CE4:t8:A5:child,P<0.16.0>,AD:file_server_2,H376A58,A9:permanent,I2000,A6:worker,H376A68
-376A68:lA4:file|H376AB0
-376AB0:lAB:file_server|H376B04
-376B04:lAE:file_io_server|H376B68
-376B68:lA9:prim_file|N
-376A58:t3:AB:file_server,AA:start_link,N
-376C2C:lH376C34|H376C58
-376C34:t8:A5:child,P<0.15.0>,AC:global_group,H3769F4,A9:permanent,I2000,A6:worker,H376A04
-376A04:lAC:global_group|N
-3769F4:t3:AC:global_group,AA:start_link,N
-376C58:lH376C60|H376C84
-376C60:t8:A5:child,A9:undefined,A7:net_sup,H37696C,A9:permanent,A8:infinity,AA:supervisor,H37697C
-37697C:lA10:erl_distribution|N
-37696C:t3:A10:erl_distribution,AA:start_link,N
-376C84:lH376C8C|H3768A0
-376C8C:t8:A5:child,P<0.14.0>,A7:inet_db,H3768F4,A9:permanent,I2000,A6:worker,H376904
-376904:lA7:inet_db|N
-3768F4:t3:A7:inet_db,AA:start_link,N
-3768A0:lH376938|H37695C
-376938:t8:A5:child,P<0.11.0>,A12:global_name_server,H3769B0,A9:permanent,I2000,A6:worker,H3769C0
-3769C0:lA6:global|N
-3769B0:t3:A6:global,AA:start_link,N
-37695C:lH3769C8|N
-3769C8:t8:A5:child,P<0.10.0>,A3:rex,H376A38,A9:permanent,I2000,A6:worker,H376A48
-376A48:lA3:rpc|N
-376A38:t3:A3:rpc,AA:start_link,N
-376868:t2:A5:local,AA:kernel_sup
-3768D4:lAA:gen_server|H376964
-376964:lP<0.8.0>|H3769EC
-3769EC:lP<0.8.0>|H376A50
-376A50:lH376A9C|H376AA8
-376A9C:t2:A5:local,AA:kernel_sup
-376AA8:lAA:supervisor|H376AFC
-376AFC:lH376B50|H376B60
-376B50:t3:H376868,A6:kernel,N
-376B60:lN|N
-376850:t2:AD:$initial_call,H3768DC
-3768DC:t3:A3:gen,A7:init_it,H3768D4
-37685C:t2:AA:$ancestors,H3768EC
-3768EC:lP<0.8.0>|N
-=proc_dictionary:<0.10.0>
-H367A10
-H3679F4
-=proc_stack:<0.10.0>
-367cec:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A3:rpc
-y3:H367AA8
-y4:A3:rex
-y5:P<0.9.0>
-367d08:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3679C4
-=proc_heap:<0.10.0>
-367AA8:t2:I0,A3:nil
-3679C4:lAA:gen_server|H3679BC
-3679BC:lP<0.9.0>|H3679B4
-3679B4:lP<0.9.0>|H367988
-367988:lH367990|H3679AC
-367990:t2:A5:local,A3:rex
-3679AC:lA3:rpc|H3679A4
-3679A4:lN|H36799C
-36799C:lN|N
-367A10:t2:AD:$initial_call,H367A00
-367A00:t3:A3:gen,A7:init_it,H3679C4
-3679F4:t2:AA:$ancestors,H3679EC
-3679EC:lAA:kernel_sup|H3679CC
-3679CC:lP<0.8.0>|N
-=proc_dictionary:<0.11.0>
-H36ADD8
-H36ADBC
-=proc_stack:<0.11.0>
-36b0b4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A6:global
-y3:H36AF0C
-y4:A12:global_name_server
-y5:P<0.9.0>
-36b0d0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36AD8C
-=proc_heap:<0.11.0>
-36AF0C:t9:A5:state,A4:true,N,N,N,N,AD:nonode@nohost,P<0.12.0>,P<0.13.0>
-36AD8C:lAA:gen_server|H36AD84
-36AD84:lP<0.9.0>|H36AD7C
-36AD7C:lP<0.9.0>|H36AD50
-36AD50:lH36AD58|H36AD74
-36AD58:t2:A5:local,A12:global_name_server
-36AD74:lA6:global|H36AD6C
-36AD6C:lN|H36AD64
-36AD64:lN|N
-36ADD8:t2:AD:$initial_call,H36ADC8
-36ADC8:t3:A3:gen,A7:init_it,H36AD8C
-36ADBC:t2:AA:$ancestors,H36ADB4
-36ADB4:lAA:kernel_sup|H36AD94
-36AD94:lP<0.8.0>|N
-=proc_stack:<0.12.0>
-36921c:SReturn addr 0x261184 (global:init_the_locker/1 + 112)
-y0:N
-y1:N
-y2:N
-y3:N
-y4:N
-y5:N
-y6:A8:infinity
-y7:H368EB0
-y8:P<0.11.0>
-369244:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-=proc_heap:<0.12.0>
-368EB0:t3:A5:multi,A9:undefined,N
-=proc_stack:<0.13.0>
-3695d0:SReturn addr 0x2651AC (global:loop_the_deleter/1 + 36)
-y0:A8:infinity
-y1:N
-y2:P<0.11.0>
-3695e0:SReturn addr 0x2654F8 (global:'-start_the_deleter/1-fun-0-'/1 + 20)
-y0:N
-y1:N
-y2:P<0.11.0>
-3695f0:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.13.0>
-=proc_dictionary:<0.14.0>
-H36A998
-H36A9A4
-=proc_stack:<0.14.0>
-372e0c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:inet_db
-y3:H36A9B0
-y4:A7:inet_db
-y5:P<0.9.0>
-372e28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36A9C8
-=proc_heap:<0.14.0>
-36A9B0:t5:A5:state,A7:inet_db,AA:inet_cache,AA:inet_hosts,H36A9E8
-36A9E8:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000060000000000000000
-36A9C8:lAA:gen_server|H36A9F8
-36A9F8:lP<0.9.0>|H36AA08
-36AA08:lP<0.9.0>|H36AA10
-36AA10:lH36AA18|H36AA24
-36AA18:t2:A5:local,A7:inet_db
-36AA24:lA7:inet_db|H36AA2C
-36AA2C:lN|H36AA34
-36AA34:lN|N
-36A998:t2:AD:$initial_call,H36A9D0
-36A9D0:t3:A3:gen,A7:init_it,H36A9C8
-36A9A4:t2:AA:$ancestors,H36A9E0
-36A9E0:lAA:kernel_sup|H36AA00
-36AA00:lP<0.8.0>|N
-=proc_dictionary:<0.15.0>
-H372788
-H3727F8
-H37276C
-H37280C
-H372820
-=proc_stack:<0.15.0>
-372a64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AC:global_group
-y3:H3728C8
-y4:AC:global_group
-y5:P<0.9.0>
-372a80:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37273C
-=proc_heap:<0.15.0>
-3728C8:tC:A5:state,A7:no_conf,A4:true,N,N,N,N,N,AD:nonode@nohost,N,A6:normal,A6:normal
-37273C:lAA:gen_server|H372734
-372734:lP<0.9.0>|H37272C
-37272C:lP<0.9.0>|H372700
-372700:lH372708|H372724
-372708:t2:A5:local,AC:global_group
-372724:lAC:global_group|H37271C
-37271C:lN|H372714
-372714:lN|N
-372788:t2:AD:$initial_call,H372778
-372778:t3:A3:gen,A7:init_it,H37273C
-3727F8:t2:A10:registered_names,H3727F0
-3727F0:lA9:undefined|N
-37276C:t2:AA:$ancestors,H372764
-372764:lAA:kernel_sup|H372744
-372744:lP<0.8.0>|N
-37280C:t2:A4:send,H372804
-372804:lA9:undefined|N
-372820:t2:AC:whereis_name,H372818
-372818:lA9:undefined|N
-=proc_dictionary:<0.16.0>
-H37B918
-H37B924
-=proc_stack:<0.16.0>
-3d303c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AB:file_server
-y3:p<0.4>
-y4:AD:file_server_2
-y5:P<0.9.0>
-3d3058:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37B930
-=proc_heap:<0.16.0>
-37B930:lAA:gen_server|H37B950
-37B950:lP<0.9.0>|H37B960
-37B960:lP<0.9.0>|H37B968
-37B968:lH37B970|H37B97C
-37B970:t2:A5:local,AD:file_server_2
-37B97C:lAB:file_server|H37B984
-37B984:lN|H37B98C
-37B98C:lN|N
-37B918:t2:AD:$initial_call,H37B938
-37B938:t3:A3:gen,A7:init_it,H37B930
-37B924:t2:AA:$ancestors,H37B948
-37B948:lAA:kernel_sup|H37B958
-37B958:lP<0.8.0>|N
-=proc_stack:<0.17.0>
-3763cc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H376084
-y1:P<0.16.0>
-y2:P<0.9.0>
-=proc_heap:<0.17.0>
-376084:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000160000000000000000
-=proc_stack:<0.18.0>
-3b98e8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H38AE84
-y1:P<0.9.0>
-=proc_heap:<0.18.0>
-38AE84:t8:A5:state,P<0.9.0>,H3873BC,H38AEB8,I9,I10,A8:no_cache,AB:interactive
-38AEB8:lH3873D4|H38AEE0
-3873D4:lI46|N
-38AEE0:lH3873EC|H38AF10
-3873EC:lI47|H387404
-387404:lI99|H387424
-387424:lI108|H38744C
-38744C:lI101|H38747C
-38747C:lI97|H3874B4
-3874B4:lI114|H3874F4
-3874F4:lI99|H38753C
-38753C:lI97|H38758C
-38758C:lI115|H3875E4
-3875E4:lI101|H387644
-387644:lI47|H3876AC
-3876AC:lI111|H38771C
-38771C:lI116|H387794
-387794:lI112|H387814
-387814:lI47|H38789C
-38789C:lI101|H38792C
-38792C:lI114|H3879BC
-3879BC:lI116|H387A54
-387A54:lI115|H387AF4
-387AF4:lI47|H387B9C
-387B9C:lI108|H387C4C
-387C4C:lI105|H387D04
-387D04:lI98|H387DC4
-387DC4:lI47|H387E8C
-387E8C:lI107|H387F5C
-387F5C:lI101|H388034
-388034:lI114|H388114
-388114:lI110|H3881FC
-3881FC:lI101|H3882EC
-3882EC:lI108|H3883E4
-3883E4:lI47|H3884E4
-3884E4:lI101|H3885EC
-3885EC:lI98|H3886FC
-3886FC:lI105|H388814
-388814:lI110|N
-38AF10:lH38740C|H38AF48
-38740C:lI47|H38742C
-38742C:lI99|H387454
-387454:lI108|H387484
-387484:lI101|H3874BC
-3874BC:lI97|H3874FC
-3874FC:lI114|H387544
-387544:lI99|H387594
-387594:lI97|H3875EC
-3875EC:lI115|H38764C
-38764C:lI101|H3876B4
-3876B4:lI47|H387724
-387724:lI111|H38779C
-38779C:lI116|H38781C
-38781C:lI112|H3878A4
-3878A4:lI47|H387934
-387934:lI101|H3879C4
-3879C4:lI114|H387A5C
-387A5C:lI116|H387AFC
-387AFC:lI115|H387BA4
-387BA4:lI47|H387C54
-387C54:lI108|H387D0C
-387D0C:lI105|H387DCC
-387DCC:lI98|H387E94
-387E94:lI47|H387F64
-387F64:lI115|H38803C
-38803C:lI116|H38811C
-38811C:lI100|H388204
-388204:lI108|H3882F4
-3882F4:lI105|H3883EC
-3883EC:lI98|H3884EC
-3884EC:lI47|H3885F4
-3885F4:lI101|H388704
-388704:lI98|H38881C
-38881C:lI105|H38892C
-38892C:lI110|N
-38AF48:lH387434|H38AF70
-387434:lI47|H38745C
-38745C:lI99|H38748C
-38748C:lI108|H3874C4
-3874C4:lI101|H387504
-387504:lI97|H38754C
-38754C:lI114|H38759C
-38759C:lI99|H3875F4
-3875F4:lI97|H387654
-387654:lI115|H3876BC
-3876BC:lI101|H38772C
-38772C:lI47|H3877A4
-3877A4:lI111|H387824
-387824:lI116|H3878AC
-3878AC:lI112|H38793C
-38793C:lI47|H3879CC
-3879CC:lI101|H387A64
-387A64:lI114|H387B04
-387B04:lI116|H387BAC
-387BAC:lI115|H387C5C
-387C5C:lI47|H387D14
-387D14:lI108|H387DD4
-387DD4:lI105|H387E9C
-387E9C:lI98|H387F6C
-387F6C:lI47|H388044
-388044:lI119|H388124
-388124:lI101|H38820C
-38820C:lI98|H3882FC
-3882FC:lI116|H3883F4
-3883F4:lI111|H3884F4
-3884F4:lI111|H3885FC
-3885FC:lI108|H38870C
-38870C:lI47|H388824
-388824:lI101|H388934
-388934:lI98|H388A44
-388A44:lI105|H388B54
-388B54:lI110|N
-38AF70:lH387464|H38AF98
-387464:lI47|H387494
-387494:lI99|H3874CC
-3874CC:lI108|H38750C
-38750C:lI101|H387554
-387554:lI97|H3875A4
-3875A4:lI114|H3875FC
-3875FC:lI99|H38765C
-38765C:lI97|H3876C4
-3876C4:lI115|H387734
-387734:lI101|H3877AC
-3877AC:lI47|H38782C
-38782C:lI111|H3878B4
-3878B4:lI116|H387944
-387944:lI112|H3879D4
-3879D4:lI47|H387A6C
-387A6C:lI101|H387B0C
-387B0C:lI114|H387BB4
-387BB4:lI116|H387C64
-387C64:lI115|H387D1C
-387D1C:lI47|H387DDC
-387DDC:lI108|H387EA4
-387EA4:lI105|H387F74
-387F74:lI98|H38804C
-38804C:lI47|H38812C
-38812C:lI116|H388214
-388214:lI118|H388304
-388304:lI47|H3883FC
-3883FC:lI101|H3884FC
-3884FC:lI98|H388604
-388604:lI105|H388714
-388714:lI110|N
-38AF98:lH38749C|H38AFC0
-38749C:lI47|H3874D4
-3874D4:lI99|H387514
-387514:lI108|H38755C
-38755C:lI101|H3875AC
-3875AC:lI97|H387604
-387604:lI114|H387664
-387664:lI99|H3876CC
-3876CC:lI97|H38773C
-38773C:lI115|H3877B4
-3877B4:lI101|H387834
-387834:lI47|H3878BC
-3878BC:lI111|H38794C
-38794C:lI116|H3879DC
-3879DC:lI112|H387A74
-387A74:lI47|H387B14
-387B14:lI101|H387BBC
-387BBC:lI114|H387C6C
-387C6C:lI116|H387D24
-387D24:lI115|H387DE4
-387DE4:lI47|H387EAC
-387EAC:lI108|H387F7C
-387F7C:lI105|H388054
-388054:lI98|H388134
-388134:lI47|H38821C
-38821C:lI116|H38830C
-38830C:lI115|H388404
-388404:lI112|H388504
-388504:lI47|H38860C
-38860C:lI101|H38871C
-38871C:lI98|H38882C
-38882C:lI105|H38893C
-38893C:lI110|N
-38AFC0:lH3874DC|H38AFE8
-3874DC:lI47|H38751C
-38751C:lI99|H387564
-387564:lI108|H3875B4
-3875B4:lI101|H38760C
-38760C:lI97|H38766C
-38766C:lI114|H3876D4
-3876D4:lI99|H387744
-387744:lI97|H3877BC
-3877BC:lI115|H38783C
-38783C:lI101|H3878C4
-3878C4:lI47|H387954
-387954:lI111|H3879E4
-3879E4:lI116|H387A7C
-387A7C:lI112|H387B1C
-387B1C:lI47|H387BC4
-387BC4:lI101|H387C74
-387C74:lI114|H387D2C
-387D2C:lI116|H387DEC
-387DEC:lI115|H387EB4
-387EB4:lI47|H387F84
-387F84:lI108|H38805C
-38805C:lI105|H38813C
-38813C:lI98|H388224
-388224:lI47|H388314
-388314:lI116|H38840C
-38840C:lI111|H38850C
-38850C:lI111|H388614
-388614:lI108|H388724
-388724:lI115|H388834
-388834:lI47|H388944
-388944:lI101|H388A4C
-388A4C:lI98|H388B5C
-388B5C:lI105|H388C6C
-388C6C:lI110|N
-38AFE8:lH387524|H38B008
-387524:lI47|H38756C
-38756C:lI99|H3875BC
-3875BC:lI108|H387614
-387614:lI101|H387674
-387674:lI97|H3876DC
-3876DC:lI114|H38774C
-38774C:lI99|H3877C4
-3877C4:lI97|H387844
-387844:lI115|H3878CC
-3878CC:lI101|H38795C
-38795C:lI47|H3879EC
-3879EC:lI111|H387A84
-387A84:lI116|H387B24
-387B24:lI112|H387BCC
-387BCC:lI47|H387C7C
-387C7C:lI101|H387D34
-387D34:lI114|H387DF4
-387DF4:lI116|H387EBC
-387EBC:lI115|H387F8C
-387F8C:lI47|H388064
-388064:lI108|H388144
-388144:lI105|H38822C
-38822C:lI98|H38831C
-38831C:lI47|H388414
-388414:lI116|H388514
-388514:lI111|H38861C
-38861C:lI111|H38872C
-38872C:lI108|H38883C
-38883C:lI98|H38894C
-38894C:lI97|H388A54
-388A54:lI114|H388B64
-388B64:lI47|H388C74
-388C74:lI101|H388D84
-388D84:lI98|H388E9C
-388E9C:lI105|H388FB4
-388FB4:lI110|N
-38B008:lH387574|H38B018
-387574:lI47|H3875C4
-3875C4:lI99|H38761C
-38761C:lI108|H38767C
-38767C:lI101|H3876E4
-3876E4:lI97|H387754
-387754:lI114|H3877CC
-3877CC:lI99|H38784C
-38784C:lI97|H3878D4
-3878D4:lI115|H387964
-387964:lI101|H3879F4
-3879F4:lI47|H387A8C
-387A8C:lI111|H387B2C
-387B2C:lI116|H387BD4
-387BD4:lI112|H387C84
-387C84:lI47|H387D3C
-387D3C:lI101|H387DFC
-387DFC:lI114|H387EC4
-387EC4:lI116|H387F94
-387F94:lI115|H38806C
-38806C:lI47|H38814C
-38814C:lI108|H388234
-388234:lI105|H388324
-388324:lI98|H38841C
-38841C:lI47|H38851C
-38851C:lI116|H388624
-388624:lI101|H388734
-388734:lI115|H388844
-388844:lI116|H388954
-388954:lI95|H388A5C
-388A5C:lI115|H388B6C
-388B6C:lI101|H388C7C
-388C7C:lI114|H388D8C
-388D8C:lI118|H388EA4
-388EA4:lI101|H388FBC
-388FBC:lI114|H3890D4
-3890D4:lI47|H3891EC
-3891EC:lI101|H3892FC
-3892FC:lI98|H38940C
-38940C:lI105|H38951C
-38951C:lI110|N
-38B018:lH3875CC|H38AE7C
-3875CC:lI47|H387624
-387624:lI99|H387684
-387684:lI108|H3876EC
-3876EC:lI101|H38775C
-38775C:lI97|H3877D4
-3877D4:lI114|H387854
-387854:lI99|H3878DC
-3878DC:lI97|H38796C
-38796C:lI115|H3879FC
-3879FC:lI101|H387A94
-387A94:lI47|H387B34
-387B34:lI111|H387BDC
-387BDC:lI116|H387C8C
-387C8C:lI112|H387D44
-387D44:lI47|H387E04
-387E04:lI101|H387ECC
-387ECC:lI114|H387F9C
-387F9C:lI116|H388074
-388074:lI115|H388154
-388154:lI47|H38823C
-38823C:lI108|H38832C
-38832C:lI105|H388424
-388424:lI98|H388524
-388524:lI47|H38862C
-38862C:lI115|H38873C
-38873C:lI115|H38884C
-38884C:lI108|H38895C
-38895C:lI47|H388A64
-388A64:lI101|H388B74
-388B74:lI98|H388C84
-388C84:lI105|H388D94
-388D94:lI110|N
-38AE7C:lH38762C|H38AEB0
-38762C:lI47|H38768C
-38768C:lI99|H3876F4
-3876F4:lI108|H387764
-387764:lI101|H3877DC
-3877DC:lI97|H38785C
-38785C:lI114|H3878E4
-3878E4:lI99|H387974
-387974:lI97|H387A04
-387A04:lI115|H387A9C
-387A9C:lI101|H387B3C
-387B3C:lI47|H387BE4
-387BE4:lI111|H387C94
-387C94:lI116|H387D4C
-387D4C:lI112|H387E0C
-387E0C:lI47|H387ED4
-387ED4:lI101|H387FA4
-387FA4:lI114|H38807C
-38807C:lI116|H38815C
-38815C:lI115|H388244
-388244:lI47|H388334
-388334:lI108|H38842C
-38842C:lI105|H38852C
-38852C:lI98|H388634
-388634:lI47|H388744
-388744:lI115|H388854
-388854:lI110|H388964
-388964:lI109|H388A6C
-388A6C:lI112|H388B7C
-388B7C:lI47|H388C8C
-388C8C:lI101|H388D9C
-388D9C:lI98|H388EAC
-388EAC:lI105|H388FC4
-388FC4:lI110|N
-38AEB0:lH387694|H38AED8
-387694:lI47|H3876FC
-3876FC:lI99|H38776C
-38776C:lI108|H3877E4
-3877E4:lI101|H387864
-387864:lI97|H3878EC
-3878EC:lI114|H38797C
-38797C:lI99|H387A0C
-387A0C:lI97|H387AA4
-387AA4:lI115|H387B44
-387B44:lI101|H387BEC
-387BEC:lI47|H387C9C
-387C9C:lI111|H387D54
-387D54:lI116|H387E14
-387E14:lI112|H387EDC
-387EDC:lI47|H387FAC
-387FAC:lI101|H388084
-388084:lI114|H388164
-388164:lI116|H38824C
-38824C:lI115|H38833C
-38833C:lI47|H388434
-388434:lI108|H388534
-388534:lI105|H38863C
-38863C:lI98|H38874C
-38874C:lI47|H38885C
-38885C:lI115|H38896C
-38896C:lI97|H388A74
-388A74:lI115|H388B84
-388B84:lI108|H388C94
-388C94:lI47|H388DA4
-388DA4:lI101|H388EB4
-388EB4:lI98|H388FCC
-388FCC:lI105|H3890DC
-3890DC:lI110|N
-38AED8:lH387704|H38AF08
-387704:lI47|H387774
-387774:lI99|H3877EC
-3877EC:lI108|H38786C
-38786C:lI101|H3878F4
-3878F4:lI97|H387984
-387984:lI114|H387A14
-387A14:lI99|H387AAC
-387AAC:lI97|H387B4C
-387B4C:lI115|H387BF4
-387BF4:lI101|H387CA4
-387CA4:lI47|H387D5C
-387D5C:lI111|H387E1C
-387E1C:lI116|H387EE4
-387EE4:lI112|H387FB4
-387FB4:lI47|H38808C
-38808C:lI101|H38816C
-38816C:lI114|H388254
-388254:lI116|H388344
-388344:lI115|H38843C
-38843C:lI47|H38853C
-38853C:lI108|H388644
-388644:lI105|H388754
-388754:lI98|H388864
-388864:lI47|H388974
-388974:lI114|H388A7C
-388A7C:lI117|H388B8C
-388B8C:lI110|H388C9C
-388C9C:lI116|H388DAC
-388DAC:lI105|H388EBC
-388EBC:lI109|H388FD4
-388FD4:lI101|H3890E4
-3890E4:lI95|H3891F4
-3891F4:lI116|H389304
-389304:lI111|H389414
-389414:lI111|H389524
-389524:lI108|H389624
-389624:lI115|H38971C
-38971C:lI47|H389814
-389814:lI101|H38990C
-38990C:lI98|H389A04
-389A04:lI105|H389AE4
-389AE4:lI110|N
-38AF08:lH38777C|H38AF40
-38777C:lI47|H3877F4
-3877F4:lI99|H387874
-387874:lI108|H3878FC
-3878FC:lI101|H38798C
-38798C:lI97|H387A1C
-387A1C:lI114|H387AB4
-387AB4:lI99|H387B54
-387B54:lI97|H387BFC
-387BFC:lI115|H387CAC
-387CAC:lI101|H387D64
-387D64:lI47|H387E24
-387E24:lI111|H387EEC
-387EEC:lI116|H387FBC
-387FBC:lI112|H388094
-388094:lI47|H388174
-388174:lI101|H38825C
-38825C:lI114|H38834C
-38834C:lI116|H388444
-388444:lI115|H388544
-388544:lI47|H38864C
-38864C:lI108|H38875C
-38875C:lI105|H38886C
-38886C:lI98|H38897C
-38897C:lI47|H388A84
-388A84:lI114|H388B94
-388B94:lI115|H388CA4
-388CA4:lI104|H388DB4
-388DB4:lI101|H388EC4
-388EC4:lI108|H388FDC
-388FDC:lI108|H3890EC
-3890EC:lI47|H3891FC
-3891FC:lI101|H38930C
-38930C:lI98|H38941C
-38941C:lI105|H38952C
-38952C:lI110|N
-38AF40:lH3877FC|H38AF68
-3877FC:lI47|H38787C
-38787C:lI99|H387904
-387904:lI108|H387994
-387994:lI101|H387A24
-387A24:lI97|H387ABC
-387ABC:lI114|H387B5C
-387B5C:lI99|H387C04
-387C04:lI97|H387CB4
-387CB4:lI115|H387D6C
-387D6C:lI101|H387E2C
-387E2C:lI47|H387EF4
-387EF4:lI111|H387FC4
-387FC4:lI116|H38809C
-38809C:lI112|H38817C
-38817C:lI47|H388264
-388264:lI101|H388354
-388354:lI114|H38844C
-38844C:lI116|H38854C
-38854C:lI115|H388654
-388654:lI47|H388764
-388764:lI108|H388874
-388874:lI105|H388984
-388984:lI98|H388A8C
-388A8C:lI47|H388B9C
-388B9C:lI112|H388CAC
-388CAC:lI109|H388DBC
-388DBC:lI97|H388ECC
-388ECC:lI110|H388FE4
-388FE4:lI47|H3890F4
-3890F4:lI101|H389204
-389204:lI98|H389314
-389314:lI105|H389424
-389424:lI110|N
-38AF68:lH387884|H38AF90
-387884:lI47|H38790C
-38790C:lI99|H38799C
-38799C:lI108|H387A2C
-387A2C:lI101|H387AC4
-387AC4:lI97|H387B64
-387B64:lI114|H387C0C
-387C0C:lI99|H387CBC
-387CBC:lI97|H387D74
-387D74:lI115|H387E34
-387E34:lI101|H387EFC
-387EFC:lI47|H387FCC
-387FCC:lI111|H3880A4
-3880A4:lI116|H388184
-388184:lI112|H38826C
-38826C:lI47|H38835C
-38835C:lI101|H388454
-388454:lI114|H388554
-388554:lI116|H38865C
-38865C:lI115|H38876C
-38876C:lI47|H38887C
-38887C:lI108|H38898C
-38898C:lI105|H388A94
-388A94:lI98|H388BA4
-388BA4:lI47|H388CB4
-388CB4:lI112|H388DC4
-388DC4:lI97|H388ED4
-388ED4:lI114|H388FEC
-388FEC:lI115|H3890FC
-3890FC:lI101|H38920C
-38920C:lI116|H38931C
-38931C:lI111|H38942C
-38942C:lI111|H389534
-389534:lI108|H38962C
-38962C:lI115|H389724
-389724:lI47|H38981C
-38981C:lI101|H389914
-389914:lI98|H389A0C
-389A0C:lI105|H389AEC
-389AEC:lI110|N
-38AF90:lH387914|H38AFB8
-387914:lI47|H3879A4
-3879A4:lI99|H387A34
-387A34:lI108|H387ACC
-387ACC:lI101|H387B6C
-387B6C:lI97|H387C14
-387C14:lI114|H387CC4
-387CC4:lI99|H387D7C
-387D7C:lI97|H387E3C
-387E3C:lI115|H387F04
-387F04:lI101|H387FD4
-387FD4:lI47|H3880AC
-3880AC:lI111|H38818C
-38818C:lI116|H388274
-388274:lI112|H388364
-388364:lI47|H38845C
-38845C:lI101|H38855C
-38855C:lI114|H388664
-388664:lI116|H388774
-388774:lI115|H388884
-388884:lI47|H388994
-388994:lI108|H388A9C
-388A9C:lI105|H388BAC
-388BAC:lI98|H388CBC
-388CBC:lI47|H388DCC
-388DCC:lI111|H388EDC
-388EDC:lI116|H388FF4
-388FF4:lI112|H389104
-389104:lI95|H389214
-389214:lI109|H389324
-389324:lI105|H389434
-389434:lI98|H38953C
-38953C:lI115|H389634
-389634:lI47|H38972C
-38972C:lI101|H389824
-389824:lI98|H38991C
-38991C:lI105|H389A14
-389A14:lI110|N
-38AFB8:lH3879AC|H38AFE0
-3879AC:lI47|H387A3C
-387A3C:lI99|H387AD4
-387AD4:lI108|H387B74
-387B74:lI101|H387C1C
-387C1C:lI97|H387CCC
-387CCC:lI114|H387D84
-387D84:lI99|H387E44
-387E44:lI97|H387F0C
-387F0C:lI115|H387FDC
-387FDC:lI101|H3880B4
-3880B4:lI47|H388194
-388194:lI111|H38827C
-38827C:lI116|H38836C
-38836C:lI112|H388464
-388464:lI47|H388564
-388564:lI101|H38866C
-38866C:lI114|H38877C
-38877C:lI116|H38888C
-38888C:lI115|H38899C
-38899C:lI47|H388AA4
-388AA4:lI108|H388BB4
-388BB4:lI105|H388CC4
-388CC4:lI98|H388DD4
-388DD4:lI47|H388EE4
-388EE4:lI111|H388FFC
-388FFC:lI115|H38910C
-38910C:lI95|H38921C
-38921C:lI109|H38932C
-38932C:lI111|H38943C
-38943C:lI110|H389544
-389544:lI47|H38963C
-38963C:lI101|H389734
-389734:lI98|H38982C
-38982C:lI105|H389924
-389924:lI110|N
-38AFE0:lH387A44|H38B000
-387A44:lI47|H387ADC
-387ADC:lI99|H387B7C
-387B7C:lI108|H387C24
-387C24:lI101|H387CD4
-387CD4:lI97|H387D8C
-387D8C:lI114|H387E4C
-387E4C:lI99|H387F14
-387F14:lI97|H387FE4
-387FE4:lI115|H3880BC
-3880BC:lI101|H38819C
-38819C:lI47|H388284
-388284:lI111|H388374
-388374:lI116|H38846C
-38846C:lI112|H38856C
-38856C:lI47|H388674
-388674:lI101|H388784
-388784:lI114|H388894
-388894:lI116|H3889A4
-3889A4:lI115|H388AAC
-388AAC:lI47|H388BBC
-388BBC:lI108|H388CCC
-388CCC:lI105|H388DDC
-388DDC:lI98|H388EEC
-388EEC:lI47|H389004
-389004:lI111|H389114
-389114:lI114|H389224
-389224:lI98|H389334
-389334:lI101|H389444
-389444:lI114|H38954C
-38954C:lI47|H389644
-389644:lI101|H38973C
-38973C:lI98|H389834
-389834:lI105|H38992C
-38992C:lI110|N
-38B000:lH387AE4|H38B010
-387AE4:lI47|H387B84
-387B84:lI99|H387C2C
-387C2C:lI108|H387CDC
-387CDC:lI101|H387D94
-387D94:lI97|H387E54
-387E54:lI114|H387F1C
-387F1C:lI99|H387FEC
-387FEC:lI97|H3880C4
-3880C4:lI115|H3881A4
-3881A4:lI101|H38828C
-38828C:lI47|H38837C
-38837C:lI111|H388474
-388474:lI116|H388574
-388574:lI112|H38867C
-38867C:lI47|H38878C
-38878C:lI101|H38889C
-38889C:lI114|H3889AC
-3889AC:lI116|H388AB4
-388AB4:lI115|H388BC4
-388BC4:lI47|H388CD4
-388CD4:lI108|H388DE4
-388DE4:lI105|H388EF4
-388EF4:lI98|H38900C
-38900C:lI47|H38911C
-38911C:lI111|H38922C
-38922C:lI100|H38933C
-38933C:lI98|H38944C
-38944C:lI99|H389554
-389554:lI47|H38964C
-38964C:lI101|H389744
-389744:lI98|H38983C
-38983C:lI105|H389934
-389934:lI110|N
-38B010:lH387B8C|H38B020
-387B8C:lI47|H387C34
-387C34:lI99|H387CE4
-387CE4:lI108|H387D9C
-387D9C:lI101|H387E5C
-387E5C:lI97|H387F24
-387F24:lI114|H387FF4
-387FF4:lI99|H3880CC
-3880CC:lI97|H3881AC
-3881AC:lI115|H388294
-388294:lI101|H388384
-388384:lI47|H38847C
-38847C:lI111|H38857C
-38857C:lI116|H388684
-388684:lI112|H388794
-388794:lI47|H3888A4
-3888A4:lI101|H3889B4
-3889B4:lI114|H388ABC
-388ABC:lI116|H388BCC
-388BCC:lI115|H388CDC
-388CDC:lI47|H388DEC
-388DEC:lI108|H388EFC
-388EFC:lI105|H389014
-389014:lI98|H389124
-389124:lI47|H389234
-389234:lI111|H389344
-389344:lI98|H389454
-389454:lI115|H38955C
-38955C:lI101|H389654
-389654:lI114|H38974C
-38974C:lI118|H389844
-389844:lI101|H38993C
-38993C:lI114|H389A1C
-389A1C:lI47|H389AF4
-389AF4:lI101|H389BBC
-389BBC:lI98|H389C84
-389C84:lI105|H389D4C
-389D4C:lI110|N
-38B020:lH387C3C|H38B028
-387C3C:lI47|H387CEC
-387CEC:lI99|H387DA4
-387DA4:lI108|H387E64
-387E64:lI101|H387F2C
-387F2C:lI97|H387FFC
-387FFC:lI114|H3880D4
-3880D4:lI99|H3881B4
-3881B4:lI97|H38829C
-38829C:lI115|H38838C
-38838C:lI101|H388484
-388484:lI47|H388584
-388584:lI111|H38868C
-38868C:lI116|H38879C
-38879C:lI112|H3888AC
-3888AC:lI47|H3889BC
-3889BC:lI101|H388AC4
-388AC4:lI114|H388BD4
-388BD4:lI116|H388CE4
-388CE4:lI115|H388DF4
-388DF4:lI47|H388F04
-388F04:lI108|H38901C
-38901C:lI105|H38912C
-38912C:lI98|H38923C
-38923C:lI47|H38934C
-38934C:lI109|H38945C
-38945C:lI110|H389564
-389564:lI101|H38965C
-38965C:lI115|H389754
-389754:lI105|H38984C
-38984C:lI97|H389944
-389944:lI95|H389A24
-389A24:lI115|H389AFC
-389AFC:lI101|H389BC4
-389BC4:lI115|H389C8C
-389C8C:lI115|H389D54
-389D54:lI105|H389E14
-389E14:lI111|H389ECC
-389ECC:lI110|H389F7C
-389F7C:lI47|H38A01C
-38A01C:lI101|H38A0AC
-38A0AC:lI98|H38A12C
-38A12C:lI105|H38A19C
-38A19C:lI110|N
-38B028:lH387CF4|H38B030
-387CF4:lI47|H387DAC
-387DAC:lI99|H387E6C
-387E6C:lI108|H387F34
-387F34:lI101|H388004
-388004:lI97|H3880DC
-3880DC:lI114|H3881BC
-3881BC:lI99|H3882A4
-3882A4:lI97|H388394
-388394:lI115|H38848C
-38848C:lI101|H38858C
-38858C:lI47|H388694
-388694:lI111|H3887A4
-3887A4:lI116|H3888B4
-3888B4:lI112|H3889C4
-3889C4:lI47|H388ACC
-388ACC:lI101|H388BDC
-388BDC:lI114|H388CEC
-388CEC:lI116|H388DFC
-388DFC:lI115|H388F0C
-388F0C:lI47|H389024
-389024:lI108|H389134
-389134:lI105|H389244
-389244:lI98|H389354
-389354:lI47|H389464
-389464:lI109|H38956C
-38956C:lI110|H389664
-389664:lI101|H38975C
-38975C:lI115|H389854
-389854:lI105|H38994C
-38994C:lI97|H389A2C
-389A2C:lI47|H389B04
-389B04:lI101|H389BCC
-389BCC:lI98|H389C94
-389C94:lI105|H389D5C
-389D5C:lI110|N
-38B030:lH387DB4|H38B038
-387DB4:lI47|H387E74
-387E74:lI99|H387F3C
-387F3C:lI108|H38800C
-38800C:lI101|H3880E4
-3880E4:lI97|H3881C4
-3881C4:lI114|H3882AC
-3882AC:lI99|H38839C
-38839C:lI97|H388494
-388494:lI115|H388594
-388594:lI101|H38869C
-38869C:lI47|H3887AC
-3887AC:lI111|H3888BC
-3888BC:lI116|H3889CC
-3889CC:lI112|H388AD4
-388AD4:lI47|H388BE4
-388BE4:lI101|H388CF4
-388CF4:lI114|H388E04
-388E04:lI116|H388F14
-388F14:lI115|H38902C
-38902C:lI47|H38913C
-38913C:lI108|H38924C
-38924C:lI105|H38935C
-38935C:lI98|H38946C
-38946C:lI47|H389574
-389574:lI109|H38966C
-38966C:lI110|H389764
-389764:lI101|H38985C
-38985C:lI109|H389954
-389954:lI111|H389A34
-389A34:lI115|H389B0C
-389B0C:lI121|H389BD4
-389BD4:lI110|H389C9C
-389C9C:lI101|H389D64
-389D64:lI47|H389E1C
-389E1C:lI101|H389ED4
-389ED4:lI98|H389F84
-389F84:lI105|H38A024
-38A024:lI110|N
-38B038:lH387E7C|H38B040
-387E7C:lI47|H387F44
-387F44:lI99|H388014
-388014:lI108|H3880EC
-3880EC:lI101|H3881CC
-3881CC:lI97|H3882B4
-3882B4:lI114|H3883A4
-3883A4:lI99|H38849C
-38849C:lI97|H38859C
-38859C:lI115|H3886A4
-3886A4:lI101|H3887B4
-3887B4:lI47|H3888C4
-3888C4:lI111|H3889D4
-3889D4:lI116|H388ADC
-388ADC:lI112|H388BEC
-388BEC:lI47|H388CFC
-388CFC:lI101|H388E0C
-388E0C:lI114|H388F1C
-388F1C:lI116|H389034
-389034:lI115|H389144
-389144:lI47|H389254
-389254:lI108|H389364
-389364:lI105|H389474
-389474:lI98|H38957C
-38957C:lI47|H389674
-389674:lI109|H38976C
-38976C:lI101|H389864
-389864:lI103|H38995C
-38995C:lI97|H389A3C
-389A3C:lI99|H389B14
-389B14:lI111|H389BDC
-389BDC:lI47|H389CA4
-389CA4:lI101|H389D6C
-389D6C:lI98|H389E24
-389E24:lI105|H389EDC
-389EDC:lI110|N
-38B040:lH387F4C|H38B048
-387F4C:lI47|H38801C
-38801C:lI99|H3880F4
-3880F4:lI108|H3881D4
-3881D4:lI101|H3882BC
-3882BC:lI97|H3883AC
-3883AC:lI114|H3884A4
-3884A4:lI99|H3885A4
-3885A4:lI97|H3886AC
-3886AC:lI115|H3887BC
-3887BC:lI101|H3888CC
-3888CC:lI47|H3889DC
-3889DC:lI111|H388AE4
-388AE4:lI116|H388BF4
-388BF4:lI112|H388D04
-388D04:lI47|H388E14
-388E14:lI101|H388F24
-388F24:lI114|H38903C
-38903C:lI116|H38914C
-38914C:lI115|H38925C
-38925C:lI47|H38936C
-38936C:lI108|H38947C
-38947C:lI105|H389584
-389584:lI98|H38967C
-38967C:lI47|H389774
-389774:lI106|H38986C
-38986C:lI105|H389964
-389964:lI110|H389A44
-389A44:lI116|H389B1C
-389B1C:lI101|H389BE4
-389BE4:lI114|H389CAC
-389CAC:lI102|H389D74
-389D74:lI97|H389E2C
-389E2C:lI99|H389EE4
-389EE4:lI101|N
-38B048:lH388024|H38B050
-388024:lI47|H3880FC
-3880FC:lI99|H3881DC
-3881DC:lI108|H3882C4
-3882C4:lI101|H3883B4
-3883B4:lI97|H3884AC
-3884AC:lI114|H3885AC
-3885AC:lI99|H3886B4
-3886B4:lI97|H3887C4
-3887C4:lI115|H3888D4
-3888D4:lI101|H3889E4
-3889E4:lI47|H388AEC
-388AEC:lI111|H388BFC
-388BFC:lI116|H388D0C
-388D0C:lI112|H388E1C
-388E1C:lI47|H388F2C
-388F2C:lI101|H389044
-389044:lI114|H389154
-389154:lI116|H389264
-389264:lI115|H389374
-389374:lI47|H389484
-389484:lI108|H38958C
-38958C:lI105|H389684
-389684:lI98|H38977C
-38977C:lI47|H389874
-389874:lI105|H38996C
-38996C:lI110|H389A4C
-389A4C:lI101|H389B24
-389B24:lI116|H389BEC
-389BEC:lI115|H389CB4
-389CB4:lI47|H389D7C
-389D7C:lI101|H389E34
-389E34:lI98|H389EEC
-389EEC:lI105|H389F8C
-389F8C:lI110|N
-38B050:lH388104|H38B058
-388104:lI47|H3881E4
-3881E4:lI99|H3882CC
-3882CC:lI108|H3883BC
-3883BC:lI101|H3884B4
-3884B4:lI97|H3885B4
-3885B4:lI114|H3886BC
-3886BC:lI99|H3887CC
-3887CC:lI97|H3888DC
-3888DC:lI115|H3889EC
-3889EC:lI101|H388AF4
-388AF4:lI47|H388C04
-388C04:lI111|H388D14
-388D14:lI116|H388E24
-388E24:lI112|H388F34
-388F34:lI47|H38904C
-38904C:lI101|H38915C
-38915C:lI114|H38926C
-38926C:lI116|H38937C
-38937C:lI115|H38948C
-38948C:lI47|H389594
-389594:lI108|H38968C
-38968C:lI105|H389784
-389784:lI98|H38987C
-38987C:lI47|H389974
-389974:lI105|H389A54
-389A54:lI99|H389B2C
-389B2C:lI47|H389BF4
-389BF4:lI101|H389CBC
-389CBC:lI98|H389D84
-389D84:lI105|H389E3C
-389E3C:lI110|N
-38B058:lH3881EC|H38B060
-3881EC:lI47|H3882D4
-3882D4:lI99|H3883C4
-3883C4:lI108|H3884BC
-3884BC:lI101|H3885BC
-3885BC:lI97|H3886C4
-3886C4:lI114|H3887D4
-3887D4:lI99|H3888E4
-3888E4:lI97|H3889F4
-3889F4:lI115|H388AFC
-388AFC:lI101|H388C0C
-388C0C:lI47|H388D1C
-388D1C:lI111|H388E2C
-388E2C:lI116|H388F3C
-388F3C:lI112|H389054
-389054:lI47|H389164
-389164:lI101|H389274
-389274:lI114|H389384
-389384:lI116|H389494
-389494:lI115|H38959C
-38959C:lI47|H389694
-389694:lI108|H38978C
-38978C:lI105|H389884
-389884:lI98|H38997C
-38997C:lI47|H389A5C
-389A5C:lI104|H389B34
-389B34:lI105|H389BFC
-389BFC:lI112|H389CC4
-389CC4:lI101|H389D8C
-389D8C:lI47|H389E44
-389E44:lI101|H389EF4
-389EF4:lI98|H389F94
-389F94:lI105|H38A02C
-38A02C:lI110|N
-38B060:lH3882DC|H38B068
-3882DC:lI47|H3883CC
-3883CC:lI99|H3884C4
-3884C4:lI108|H3885C4
-3885C4:lI101|H3886CC
-3886CC:lI97|H3887DC
-3887DC:lI114|H3888EC
-3888EC:lI99|H3889FC
-3889FC:lI97|H388B04
-388B04:lI115|H388C14
-388C14:lI101|H388D24
-388D24:lI47|H388E34
-388E34:lI111|H388F44
-388F44:lI116|H38905C
-38905C:lI112|H38916C
-38916C:lI47|H38927C
-38927C:lI101|H38938C
-38938C:lI114|H38949C
-38949C:lI116|H3895A4
-3895A4:lI115|H38969C
-38969C:lI47|H389794
-389794:lI108|H38988C
-38988C:lI105|H389984
-389984:lI98|H389A64
-389A64:lI47|H389B3C
-389B3C:lI103|H389C04
-389C04:lI115|H389CCC
-389CCC:lI47|H389D94
-389D94:lI101|H389E4C
-389E4C:lI98|H389EFC
-389EFC:lI105|H389F9C
-389F9C:lI110|N
-38B068:lH3883D4|H38B070
-3883D4:lI47|H3884CC
-3884CC:lI99|H3885CC
-3885CC:lI108|H3886D4
-3886D4:lI101|H3887E4
-3887E4:lI97|H3888F4
-3888F4:lI114|H388A04
-388A04:lI99|H388B0C
-388B0C:lI97|H388C1C
-388C1C:lI115|H388D2C
-388D2C:lI101|H388E3C
-388E3C:lI47|H388F4C
-388F4C:lI111|H389064
-389064:lI116|H389174
-389174:lI112|H389284
-389284:lI47|H389394
-389394:lI101|H3894A4
-3894A4:lI114|H3895AC
-3895AC:lI116|H3896A4
-3896A4:lI115|H38979C
-38979C:lI47|H389894
-389894:lI108|H38998C
-38998C:lI105|H389A6C
-389A6C:lI98|H389B44
-389B44:lI47|H389C0C
-389C0C:lI101|H389CD4
-389CD4:lI118|H389D9C
-389D9C:lI97|H389E54
-389E54:lI47|H389F04
-389F04:lI101|H389FA4
-389FA4:lI98|H38A034
-38A034:lI105|H38A0B4
-38A0B4:lI110|N
-38B070:lH3884D4|H38B078
-3884D4:lI47|H3885D4
-3885D4:lI99|H3886DC
-3886DC:lI108|H3887EC
-3887EC:lI101|H3888FC
-3888FC:lI97|H388A0C
-388A0C:lI114|H388B14
-388B14:lI99|H388C24
-388C24:lI97|H388D34
-388D34:lI115|H388E44
-388E44:lI101|H388F54
-388F54:lI47|H38906C
-38906C:lI111|H38917C
-38917C:lI116|H38928C
-38928C:lI112|H38939C
-38939C:lI47|H3894AC
-3894AC:lI101|H3895B4
-3895B4:lI114|H3896AC
-3896AC:lI116|H3897A4
-3897A4:lI115|H38989C
-38989C:lI47|H389994
-389994:lI108|H389A74
-389A74:lI105|H389B4C
-389B4C:lI98|H389C14
-389C14:lI47|H389CDC
-389CDC:lI101|H389DA4
-389DA4:lI116|H389E5C
-389E5C:lI47|H389F0C
-389F0C:lI101|H389FAC
-389FAC:lI98|H38A03C
-38A03C:lI105|H38A0BC
-38A0BC:lI110|N
-38B078:lH3885DC|H38B080
-3885DC:lI47|H3886E4
-3886E4:lI99|H3887F4
-3887F4:lI108|H388904
-388904:lI101|H388A14
-388A14:lI97|H388B1C
-388B1C:lI114|H388C2C
-388C2C:lI99|H388D3C
-388D3C:lI97|H388E4C
-388E4C:lI115|H388F5C
-388F5C:lI101|H389074
-389074:lI47|H389184
-389184:lI111|H389294
-389294:lI116|H3893A4
-3893A4:lI112|H3894B4
-3894B4:lI47|H3895BC
-3895BC:lI101|H3896B4
-3896B4:lI114|H3897AC
-3897AC:lI116|H3898A4
-3898A4:lI115|H38999C
-38999C:lI47|H389A7C
-389A7C:lI108|H389B54
-389B54:lI105|H389C1C
-389C1C:lI98|H389CE4
-389CE4:lI47|H389DAC
-389DAC:lI101|H389E64
-389E64:lI114|H389F14
-389F14:lI108|H389FB4
-389FB4:lI95|H38A044
-38A044:lI105|H38A0C4
-38A0C4:lI110|H38A134
-38A134:lI116|H38A1A4
-38A1A4:lI101|H38A20C
-38A20C:lI114|H38A274
-38A274:lI102|H38A2DC
-38A2DC:lI97|H38A344
-38A344:lI99|H38A3AC
-38A3AC:lI101|N
-38B080:lH3886EC|H38B088
-3886EC:lI47|H3887FC
-3887FC:lI99|H38890C
-38890C:lI108|H388A1C
-388A1C:lI101|H388B24
-388B24:lI97|H388C34
-388C34:lI114|H388D44
-388D44:lI99|H388E54
-388E54:lI97|H388F64
-388F64:lI115|H38907C
-38907C:lI101|H38918C
-38918C:lI47|H38929C
-38929C:lI111|H3893AC
-3893AC:lI116|H3894BC
-3894BC:lI112|H3895C4
-3895C4:lI47|H3896BC
-3896BC:lI101|H3897B4
-3897B4:lI114|H3898AC
-3898AC:lI116|H3899A4
-3899A4:lI115|H389A84
-389A84:lI47|H389B5C
-389B5C:lI108|H389C24
-389C24:lI105|H389CEC
-389CEC:lI98|H389DB4
-389DB4:lI47|H389E6C
-389E6C:lI100|H389F1C
-389F1C:lI101|H389FBC
-389FBC:lI98|H38A04C
-38A04C:lI117|H38A0CC
-38A0CC:lI103|H38A13C
-38A13C:lI103|H38A1AC
-38A1AC:lI101|H38A214
-38A214:lI114|H38A27C
-38A27C:lI47|H38A2E4
-38A2E4:lI101|H38A34C
-38A34C:lI98|H38A3B4
-38A3B4:lI105|H38A414
-38A414:lI110|N
-38B088:lH388804|H38B090
-388804:lI47|H388914
-388914:lI99|H388A24
-388A24:lI108|H388B2C
-388B2C:lI101|H388C3C
-388C3C:lI97|H388D4C
-388D4C:lI114|H388E5C
-388E5C:lI99|H388F6C
-388F6C:lI97|H389084
-389084:lI115|H389194
-389194:lI101|H3892A4
-3892A4:lI47|H3893B4
-3893B4:lI111|H3894C4
-3894C4:lI116|H3895CC
-3895CC:lI112|H3896C4
-3896C4:lI47|H3897BC
-3897BC:lI101|H3898B4
-3898B4:lI114|H3899AC
-3899AC:lI116|H389A8C
-389A8C:lI115|H389B64
-389B64:lI47|H389C2C
-389C2C:lI108|H389CF4
-389CF4:lI105|H389DBC
-389DBC:lI98|H389E74
-389E74:lI47|H389F24
-389F24:lI99|H389FC4
-389FC4:lI114|H38A054
-38A054:lI121|H38A0D4
-38A0D4:lI112|H38A144
-38A144:lI116|H38A1B4
-38A1B4:lI111|H38A21C
-38A21C:lI47|H38A284
-38A284:lI101|H38A2EC
-38A2EC:lI98|H38A354
-38A354:lI105|H38A3BC
-38A3BC:lI110|N
-38B090:lH38891C|H38B098
-38891C:lI47|H388A2C
-388A2C:lI99|H388B34
-388B34:lI108|H388C44
-388C44:lI101|H388D54
-388D54:lI97|H388E64
-388E64:lI114|H388F74
-388F74:lI99|H38908C
-38908C:lI97|H38919C
-38919C:lI115|H3892AC
-3892AC:lI101|H3893BC
-3893BC:lI47|H3894CC
-3894CC:lI111|H3895D4
-3895D4:lI116|H3896CC
-3896CC:lI112|H3897C4
-3897C4:lI47|H3898BC
-3898BC:lI101|H3899B4
-3899B4:lI114|H389A94
-389A94:lI116|H389B6C
-389B6C:lI115|H389C34
-389C34:lI47|H389CFC
-389CFC:lI108|H389DC4
-389DC4:lI105|H389E7C
-389E7C:lI98|H389F2C
-389F2C:lI47|H389FCC
-389FCC:lI99|H38A05C
-38A05C:lI111|H38A0DC
-38A0DC:lI115|H38A14C
-38A14C:lI84|H38A1BC
-38A1BC:lI114|H38A224
-38A224:lI97|H38A28C
-38A28C:lI110|H38A2F4
-38A2F4:lI115|H38A35C
-38A35C:lI97|H38A3C4
-38A3C4:lI99|H38A41C
-38A41C:lI116|H38A46C
-38A46C:lI105|H38A4BC
-38A4BC:lI111|H38A50C
-38A50C:lI110|H38A554
-38A554:lI115|H38A59C
-38A59C:lI47|H38A5E4
-38A5E4:lI101|H38A62C
-38A62C:lI98|H38A66C
-38A66C:lI105|H38A6A4
-38A6A4:lI110|N
-38B098:lH388A34|H38B0A0
-388A34:lI47|H388B3C
-388B3C:lI99|H388C4C
-388C4C:lI108|H388D5C
-388D5C:lI101|H388E6C
-388E6C:lI97|H388F7C
-388F7C:lI114|H389094
-389094:lI99|H3891A4
-3891A4:lI97|H3892B4
-3892B4:lI115|H3893C4
-3893C4:lI101|H3894D4
-3894D4:lI47|H3895DC
-3895DC:lI111|H3896D4
-3896D4:lI116|H3897CC
-3897CC:lI112|H3898C4
-3898C4:lI47|H3899BC
-3899BC:lI101|H389A9C
-389A9C:lI114|H389B74
-389B74:lI116|H389C3C
-389C3C:lI115|H389D04
-389D04:lI47|H389DCC
-389DCC:lI108|H389E84
-389E84:lI105|H389F34
-389F34:lI98|H389FD4
-389FD4:lI47|H38A064
-38A064:lI99|H38A0E4
-38A0E4:lI111|H38A154
-38A154:lI115|H38A1C4
-38A1C4:lI84|H38A22C
-38A22C:lI105|H38A294
-38A294:lI109|H38A2FC
-38A2FC:lI101|H38A364
-38A364:lI47|H38A3CC
-38A3CC:lI101|H38A424
-38A424:lI98|H38A474
-38A474:lI105|H38A4C4
-38A4C4:lI110|N
-38B0A0:lH388B44|H38B0A8
-388B44:lI47|H388C54
-388C54:lI99|H388D64
-388D64:lI108|H388E74
-388E74:lI101|H388F84
-388F84:lI97|H38909C
-38909C:lI114|H3891AC
-3891AC:lI99|H3892BC
-3892BC:lI97|H3893CC
-3893CC:lI115|H3894DC
-3894DC:lI101|H3895E4
-3895E4:lI47|H3896DC
-3896DC:lI111|H3897D4
-3897D4:lI116|H3898CC
-3898CC:lI112|H3899C4
-3899C4:lI47|H389AA4
-389AA4:lI101|H389B7C
-389B7C:lI114|H389C44
-389C44:lI116|H389D0C
-389D0C:lI115|H389DD4
-389DD4:lI47|H389E8C
-389E8C:lI108|H389F3C
-389F3C:lI105|H389FDC
-389FDC:lI98|H38A06C
-38A06C:lI47|H38A0EC
-38A0EC:lI99|H38A15C
-38A15C:lI111|H38A1CC
-38A1CC:lI115|H38A234
-38A234:lI80|H38A29C
-38A29C:lI114|H38A304
-38A304:lI111|H38A36C
-38A36C:lI112|H38A3D4
-38A3D4:lI101|H38A42C
-38A42C:lI114|H38A47C
-38A47C:lI116|H38A4CC
-38A4CC:lI121|H38A514
-38A514:lI47|H38A55C
-38A55C:lI101|H38A5A4
-38A5A4:lI98|H38A5EC
-38A5EC:lI105|H38A634
-38A634:lI110|N
-38B0A8:lH388C5C|H38B0B0
-388C5C:lI47|H388D6C
-388D6C:lI99|H388E7C
-388E7C:lI108|H388F8C
-388F8C:lI101|H3890A4
-3890A4:lI97|H3891B4
-3891B4:lI114|H3892C4
-3892C4:lI99|H3893D4
-3893D4:lI97|H3894E4
-3894E4:lI115|H3895EC
-3895EC:lI101|H3896E4
-3896E4:lI47|H3897DC
-3897DC:lI111|H3898D4
-3898D4:lI116|H3899CC
-3899CC:lI112|H389AAC
-389AAC:lI47|H389B84
-389B84:lI101|H389C4C
-389C4C:lI114|H389D14
-389D14:lI116|H389DDC
-389DDC:lI115|H389E94
-389E94:lI47|H389F44
-389F44:lI108|H389FE4
-389FE4:lI105|H38A074
-38A074:lI98|H38A0F4
-38A0F4:lI47|H38A164
-38A164:lI99|H38A1D4
-38A1D4:lI111|H38A23C
-38A23C:lI115|H38A2A4
-38A2A4:lI78|H38A30C
-38A30C:lI111|H38A374
-38A374:lI116|H38A3DC
-38A3DC:lI105|H38A434
-38A434:lI102|H38A484
-38A484:lI105|H38A4D4
-38A4D4:lI99|H38A51C
-38A51C:lI97|H38A564
-38A564:lI116|H38A5AC
-38A5AC:lI105|H38A5F4
-38A5F4:lI111|H38A63C
-38A63C:lI110|H38A674
-38A674:lI47|H38A6AC
-38A6AC:lI101|H38A6D4
-38A6D4:lI98|H38A6EC
-38A6EC:lI105|H38A704
-38A704:lI110|N
-38B0B0:lH388D74|H38B0B8
-388D74:lI47|H388E84
-388E84:lI99|H388F94
-388F94:lI108|H3890AC
-3890AC:lI101|H3891BC
-3891BC:lI97|H3892CC
-3892CC:lI114|H3893DC
-3893DC:lI99|H3894EC
-3894EC:lI97|H3895F4
-3895F4:lI115|H3896EC
-3896EC:lI101|H3897E4
-3897E4:lI47|H3898DC
-3898DC:lI111|H3899D4
-3899D4:lI116|H389AB4
-389AB4:lI112|H389B8C
-389B8C:lI47|H389C54
-389C54:lI101|H389D1C
-389D1C:lI114|H389DE4
-389DE4:lI116|H389E9C
-389E9C:lI115|H389F4C
-389F4C:lI47|H389FEC
-389FEC:lI108|H38A07C
-38A07C:lI105|H38A0FC
-38A0FC:lI98|H38A16C
-38A16C:lI47|H38A1DC
-38A1DC:lI99|H38A244
-38A244:lI111|H38A2AC
-38A2AC:lI115|H38A314
-38A314:lI70|H38A37C
-38A37C:lI105|H38A3E4
-38A3E4:lI108|H38A43C
-38A43C:lI101|H38A48C
-38A48C:lI84|H38A4DC
-38A4DC:lI114|H38A524
-38A524:lI97|H38A56C
-38A56C:lI110|H38A5B4
-38A5B4:lI115|H38A5FC
-38A5FC:lI102|H38A644
-38A644:lI101|H38A67C
-38A67C:lI114|H38A6B4
-38A6B4:lI47|H38A6DC
-38A6DC:lI101|H38A6F4
-38A6F4:lI98|H38A70C
-38A70C:lI105|H38A71C
-38A71C:lI110|N
-38B0B8:lH388E8C|H38B0C0
-388E8C:lI47|H388F9C
-388F9C:lI99|H3890B4
-3890B4:lI108|H3891C4
-3891C4:lI101|H3892D4
-3892D4:lI97|H3893E4
-3893E4:lI114|H3894F4
-3894F4:lI99|H3895FC
-3895FC:lI97|H3896F4
-3896F4:lI115|H3897EC
-3897EC:lI101|H3898E4
-3898E4:lI47|H3899DC
-3899DC:lI111|H389ABC
-389ABC:lI116|H389B94
-389B94:lI112|H389C5C
-389C5C:lI47|H389D24
-389D24:lI101|H389DEC
-389DEC:lI114|H389EA4
-389EA4:lI116|H389F54
-389F54:lI115|H389FF4
-389FF4:lI47|H38A084
-38A084:lI108|H38A104
-38A104:lI105|H38A174
-38A174:lI98|H38A1E4
-38A1E4:lI47|H38A24C
-38A24C:lI99|H38A2B4
-38A2B4:lI111|H38A31C
-38A31C:lI115|H38A384
-38A384:lI69|H38A3EC
-38A3EC:lI118|H38A444
-38A444:lI101|H38A494
-38A494:lI110|H38A4E4
-38A4E4:lI116|H38A52C
-38A52C:lI68|H38A574
-38A574:lI111|H38A5BC
-38A5BC:lI109|H38A604
-38A604:lI97|H38A64C
-38A64C:lI105|H38A684
-38A684:lI110|H38A6BC
-38A6BC:lI47|H38A6E4
-38A6E4:lI101|H38A6FC
-38A6FC:lI98|H38A714
-38A714:lI105|H38A724
-38A724:lI110|N
-38B0C0:lH388FA4|H38B0C8
-388FA4:lI47|H3890BC
-3890BC:lI99|H3891CC
-3891CC:lI108|H3892DC
-3892DC:lI101|H3893EC
-3893EC:lI97|H3894FC
-3894FC:lI114|H389604
-389604:lI99|H3896FC
-3896FC:lI97|H3897F4
-3897F4:lI115|H3898EC
-3898EC:lI101|H3899E4
-3899E4:lI47|H389AC4
-389AC4:lI111|H389B9C
-389B9C:lI116|H389C64
-389C64:lI112|H389D2C
-389D2C:lI47|H389DF4
-389DF4:lI101|H389EAC
-389EAC:lI114|H389F5C
-389F5C:lI116|H389FFC
-389FFC:lI115|H38A08C
-38A08C:lI47|H38A10C
-38A10C:lI108|H38A17C
-38A17C:lI105|H38A1EC
-38A1EC:lI98|H38A254
-38A254:lI47|H38A2BC
-38A2BC:lI99|H38A324
-38A324:lI111|H38A38C
-38A38C:lI115|H38A3F4
-38A3F4:lI69|H38A44C
-38A44C:lI118|H38A49C
-38A49C:lI101|H38A4EC
-38A4EC:lI110|H38A534
-38A534:lI116|H38A57C
-38A57C:lI47|H38A5C4
-38A5C4:lI101|H38A60C
-38A60C:lI98|H38A654
-38A654:lI105|H38A68C
-38A68C:lI110|N
-38B0C8:lH3890C4|H38B0D0
-3890C4:lI47|H3891D4
-3891D4:lI99|H3892E4
-3892E4:lI108|H3893F4
-3893F4:lI101|H389504
-389504:lI97|H38960C
-38960C:lI114|H389704
-389704:lI99|H3897FC
-3897FC:lI97|H3898F4
-3898F4:lI115|H3899EC
-3899EC:lI101|H389ACC
-389ACC:lI47|H389BA4
-389BA4:lI111|H389C6C
-389C6C:lI116|H389D34
-389D34:lI112|H389DFC
-389DFC:lI47|H389EB4
-389EB4:lI101|H389F64
-389F64:lI114|H38A004
-38A004:lI116|H38A094
-38A094:lI115|H38A114
-38A114:lI47|H38A184
-38A184:lI108|H38A1F4
-38A1F4:lI105|H38A25C
-38A25C:lI98|H38A2C4
-38A2C4:lI47|H38A32C
-38A32C:lI99|H38A394
-38A394:lI111|H38A3FC
-38A3FC:lI109|H38A454
-38A454:lI112|H38A4A4
-38A4A4:lI105|H38A4F4
-38A4F4:lI108|H38A53C
-38A53C:lI101|H38A584
-38A584:lI114|H38A5CC
-38A5CC:lI47|H38A614
-38A614:lI101|H38A65C
-38A65C:lI98|H38A694
-38A694:lI105|H38A6C4
-38A6C4:lI110|N
-38B0D0:lH3891DC|H38B0D8
-3891DC:lI47|H3892EC
-3892EC:lI99|H3893FC
-3893FC:lI108|H38950C
-38950C:lI101|H389614
-389614:lI97|H38970C
-38970C:lI114|H389804
-389804:lI99|H3898FC
-3898FC:lI97|H3899F4
-3899F4:lI115|H389AD4
-389AD4:lI101|H389BAC
-389BAC:lI47|H389C74
-389C74:lI111|H389D3C
-389D3C:lI116|H389E04
-389E04:lI112|H389EBC
-389EBC:lI47|H389F6C
-389F6C:lI101|H38A00C
-38A00C:lI114|H38A09C
-38A09C:lI116|H38A11C
-38A11C:lI115|H38A18C
-38A18C:lI47|H38A1FC
-38A1FC:lI108|H38A264
-38A264:lI105|H38A2CC
-38A2CC:lI98|H38A334
-38A334:lI47|H38A39C
-38A39C:lI97|H38A404
-38A404:lI115|H38A45C
-38A45C:lI110|H38A4AC
-38A4AC:lI49|H38A4FC
-38A4FC:lI47|H38A544
-38A544:lI101|H38A58C
-38A58C:lI98|H38A5D4
-38A5D4:lI105|H38A61C
-38A61C:lI110|N
-38B0D8:lH3892F4|H38B0E0
-3892F4:lI47|H389404
-389404:lI99|H389514
-389514:lI108|H38961C
-38961C:lI101|H389714
-389714:lI97|H38980C
-38980C:lI114|H389904
-389904:lI99|H3899FC
-3899FC:lI97|H389ADC
-389ADC:lI115|H389BB4
-389BB4:lI101|H389C7C
-389C7C:lI47|H389D44
-389D44:lI111|H389E0C
-389E0C:lI116|H389EC4
-389EC4:lI112|H389F74
-389F74:lI47|H38A014
-38A014:lI101|H38A0A4
-38A0A4:lI114|H38A124
-38A124:lI116|H38A194
-38A194:lI115|H38A204
-38A204:lI47|H38A26C
-38A26C:lI108|H38A2D4
-38A2D4:lI105|H38A33C
-38A33C:lI98|H38A3A4
-38A3A4:lI47|H38A40C
-38A40C:lI97|H38A464
-38A464:lI112|H38A4B4
-38A4B4:lI112|H38A504
-38A504:lI109|H38A54C
-38A54C:lI111|H38A594
-38A594:lI110|H38A5DC
-38A5DC:lI47|H38A624
-38A624:lI101|H38A664
-38A664:lI98|H38A69C
-38A69C:lI105|H38A6CC
-38A6CC:lI110|N
-38B0E0:lH38AA88|H38B0E8
-38AA88:lI47|H38AA90
-38AA90:lI104|H38AA98
-38AA98:lI111|H38AAA0
-38AAA0:lI109|H38AAA8
-38AAA8:lI101|H38AAB0
-38AAB0:lI47|H38AAB8
-38AAB8:lI115|H38AAC0
-38AAC0:lI105|H38AAC8
-38AAC8:lI114|H38AAD0
-38AAD0:lI105|H38AAD8
-38AAD8:lI47|H38AAE0
-38AAE0:lI101|H38AAE8
-38AAE8:lI114|H38AAF0
-38AAF0:lI108|H38AAF8
-38AAF8:lI97|H38AB00
-38AB00:lI110|H38AB08
-38AB08:lI103|N
-38B0E8:lH38AB1C|H38B0F0
-38AB1C:lI47|H38AB2C
-38AB2C:lI104|H38AB4C
-38AB4C:lI111|H38AB74
-38AB74:lI109|H38ABA4
-38ABA4:lI101|H38ABC4
-38ABC4:lI47|H38ABE4
-38ABE4:lI115|H38AC04
-38AC04:lI105|H38AC24
-38AC24:lI114|H38AC3C
-38AC3C:lI105|H38AC44
-38AC44:lI47|H38AC4C
-38AC4C:lI116|H38AC54
-38AC54:lI111|H38AC5C
-38AC5C:lI111|H38AC64
-38AC64:lI108|H38AC6C
-38AC6C:lI115|H38AC74
-38AC74:lI47|H38AC7C
-38AC7C:lI100|H38AC84
-38AC84:lI105|H38AC8C
-38AC8C:lI115|H38AC94
-38AC94:lI116|H38AC9C
-38AC9C:lI101|H38ACA4
-38ACA4:lI108|H38ACAC
-38ACAC:lI47|H38ACB4
-38ACB4:lI101|H38ACBC
-38ACBC:lI98|H38ACC4
-38ACC4:lI105|H38ACCC
-38ACCC:lI110|N
-38B0F0:lH38B0F8|N
-38B0F8:lI47|H38B100
-38B100:lI104|H38B108
-38B108:lI111|H38B110
-38B110:lI109|H38B118
-38B118:lI101|H38B120
-38B120:lI47|H38B128
-38B128:lI115|H38B130
-38B130:lI105|H38B138
-38B138:lI114|H38B140
-38B140:lI105|H38B148
-38B148:lI47|H38B150
-38B150:lI79|H38B158
-38B158:lI84|H38B160
-38B160:lI80|H38B168
-38B168:lI47|H38B170
-38B170:lI103|H38B178
-38B178:lI112|H38B180
-38B180:lI114|H38B188
-38B188:lI115|H38B190
-38B190:lI95|H38B198
-38B198:lI116|H38B1A0
-38B1A0:lI114|H38B1A8
-38B1A8:lI97|H38B1B0
-38B1B0:lI99|H38B1B8
-38B1B8:lI101|H38B1C0
-38B1C0:lI47|H38B1C8
-38B1C8:lI106|H38B1D0
-38B1D0:lI97|H38B1D8
-38B1D8:lI110|N
-3873BC:lI47|H3873CC
-3873CC:lI99|H3873E4
-3873E4:lI108|H3873FC
-3873FC:lI101|H38741C
-38741C:lI97|H387444
-387444:lI114|H387474
-387474:lI99|H3874AC
-3874AC:lI97|H3874EC
-3874EC:lI115|H387534
-387534:lI101|H387584
-387584:lI47|H3875DC
-3875DC:lI111|H38763C
-38763C:lI116|H3876A4
-3876A4:lI112|H387714
-387714:lI47|H38778C
-38778C:lI101|H38780C
-38780C:lI114|H387894
-387894:lI116|H387924
-387924:lI115|N
-=proc_dictionary:<0.19.0>
-H370244
-H370250
-=proc_stack:<0.19.0>
-36b45c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36B17C
-y4:P<0.19.0>
-y5:P<0.9.0>
-36b478:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37025C
-=proc_heap:<0.19.0>
-36B17C:t5:A5:state,A8:user_sup,P<0.21.0>,P<0.21.0>,H370238
-370238:t2:P<0.19.0>,A8:user_sup
-37025C:lAA:gen_server|H37027C
-37027C:lP<0.9.0>|H37028C
-37028C:lP<0.9.0>|H370294
-370294:lA11:supervisor_bridge|H37029C
-37029C:lH3702A4|H3702AC
-3702A4:lA8:user_sup|H3702B4
-3702B4:lN|H3702BC
-3702BC:lA4:self|N
-3702AC:lN|N
-370244:t2:AD:$initial_call,H370264
-370264:t3:A3:gen,A7:init_it,H37025C
-370250:t2:AA:$ancestors,H370274
-370274:lAA:kernel_sup|H370284
-370284:lP<0.8.0>|N
-=proc_dictionary:<0.20.0>
-H36F8A8
-=proc_stack:<0.20.0>
-36a714:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:H36F8C4
-y3:P<0.21.0>
-y4:P<0.22.0>
-y5:p<0.72>
-y6:p<0.72>
-=proc_heap:<0.20.0>
-36F8C4:t4:I3,I2,P<0.22.0>,H36F8F0
-36F8F0:lH36F900|H36F910
-36F900:t3:I1,P<0.21.0>,H36F920
-36F920:t0:
-36F910:lH36F924|N
-36F924:t3:I2,P<0.22.0>,H36F93C
-36F93C:t3:A5:shell,A5:start,N
-36F8A8:t2:A3:eof,A5:false
-=proc_dictionary:<0.21.0>
-H3709DC
-H3709D0
-H3709F8
-=proc_stack:<0.21.0>
-370d1c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:A9:undefined
-y2:P<0.20.0>
-=proc_heap:<0.21.0>
-3709DC:t2:AB:line_buffer,N
-3709D0:t2:AB:kill_buffer,N
-3709F8:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.22.0>
-H370D44
-H370D60
-H370D7C
-H370D38
-=proc_stack:<0.22.0>
-374a88:SReturn addr 0x2CE718 (group:get_chars_loop/7 + 80)
-y0:N
-y1:N
-y2:A8:infinity
-y3:H374A00
-y4:P<0.20.0>
-y5:H374A28
-374aa4:SReturn addr 0x2CDC18 (group:io_request/5 + 48)
-y0:H37499C
-y1:A6:io_lib
-y2:A9:get_until
-y3:H3748B8
-y4:P<0.20.0>
-y5:A5:start
-374ac0:SReturn addr 0x2CDB2C (group:server_loop/3 + 372)
-y0:P<0.49.0>
-y1:P<0.22.0>
-374acc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:P<0.25.0>
-y2:P<0.20.0>
-=proc_heap:<0.22.0>
-374A00:t4:A4:line,H37499C,H3749A4,A4:none
-3749A4:t2:N,N
-37499C:lI50|H374994
-374994:lI62|H37498C
-37498C:lI32|N
-374A28:t4:A5:stack,H370D58,H374A24,N
-374A24:t0:
-370D58:lH370D74|N
-370D74:lI99|H370D88
-370D88:lI114|H370D90
-370D90:lI97|H370D98
-370D98:lI115|H370DA0
-370DA0:lI104|H370DA8
-370DA8:lI100|H370DB0
-370DB0:lI117|H370DB8
-370DB8:lI109|H370DC0
-370DC0:lI112|H370DC8
-370DC8:lI95|H370DD0
-370DD0:lI118|H370DD8
-370DD8:lI105|H370DE0
-370DE0:lI101|H370DE8
-370DE8:lI119|H370DF0
-370DF0:lI101|H370DF8
-370DF8:lI114|H370E00
-370E00:lI58|H370E08
-370E08:lI115|H370E10
-370E10:lI116|H370E18
-370E18:lI97|H370E20
-370E20:lI114|H370E28
-370E28:lI116|H370E30
-370E30:lI40|H370E38
-370E38:lI41|H370E40
-370E40:lI46|H370E48
-370E48:lI10|N
-3748B8:t3:A8:erl_scan,A6:tokens,H3748B0
-3748B0:lI1|N
-370D44:t2:AB:line_buffer,H370D58
-370D60:t2:A5:shell,P<0.25.0>
-370D7C:t2:AB:kill_buffer,N
-370D38:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.23.0>
-H376464
-H376448
-=proc_stack:<0.23.0>
-376754:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:kernel_config
-y3:N
-y4:P<0.23.0>
-y5:P<0.9.0>
-376770:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H376418
-=proc_heap:<0.23.0>
-376418:lAA:gen_server|H376410
-376410:lP<0.9.0>|H376408
-376408:lP<0.9.0>|H376400
-376400:lAD:kernel_config|H3763F8
-3763F8:lN|H3763F0
-3763F0:lN|N
-376464:t2:AD:$initial_call,H376454
-376454:t3:A3:gen,A7:init_it,H376418
-376448:t2:AA:$ancestors,H376440
-376440:lAA:kernel_sup|H376420
-376420:lP<0.8.0>|N
-=proc_dictionary:<0.24.0>
-H3705E0
-H3705EC
-=proc_stack:<0.24.0>
-36f38c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F018
-y4:AF:kernel_safe_sup
-y5:P<0.9.0>
-36f3a8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37063C
-=proc_heap:<0.24.0>
-36F018:tA:A5:state,H370644,AB:one_for_one,H36F044,N,I4,I3600,N,A6:kernel,A4:safe
-36F044:lH36F04C|N
-36F04C:t8:A5:child,P<0.31.0>,A17:inet_gethost_native_sup,H370650,A9:temporary,I1000,A6:worker,H370660
-370660:lA13:inet_gethost_native|N
-370650:t3:A13:inet_gethost_native,AA:start_link,N
-370644:t2:A5:local,AF:kernel_safe_sup
-37063C:lAA:gen_server|H3706AC
-3706AC:lP<0.9.0>|H3706BC
-3706BC:lP<0.9.0>|H3706C4
-3706C4:lH3706CC|H3706D8
-3706CC:t2:A5:local,AF:kernel_safe_sup
-3706D8:lAA:supervisor|H3706E0
-3706E0:lH3706E8|H3706F8
-3706E8:t3:H370644,A6:kernel,A4:safe
-3706F8:lN|N
-3705E0:t2:AD:$initial_call,H370668
-370668:t3:A3:gen,A7:init_it,H37063C
-3705EC:t2:AA:$ancestors,H370678
-370678:lAA:kernel_sup|H3706B4
-3706B4:lP<0.8.0>|N
-=proc_dictionary:<0.25.0>
-H36E304
-H36E31C
-=proc_stack:<0.25.0>
-36e610:SReturn addr 0x2E06FC (shell:server_loop/6 + 140)
-y0:N
-y1:N
-y2:P<0.27.0>
-y3:P<0.49.0>
-36e624:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:I2
-y3:I1
-y4:N
-y5:N
-y6:N
-y7:I20
-y8:I20
-=proc_heap:<0.25.0>
-36E304:t2:H36E2F8,H36E2A8
-36E2A8:lH36E2B0|N
-36E2B0:t4:A4:call,I1,H36E2C4,N
-36E2C4:t4:A6:remote,I1,H36E2D8,H36E2E8
-36E2E8:t3:A4:atom,I1,A5:start
-36E2D8:t3:A4:atom,I1,A10:crashdump_viewer
-36E2F8:t2:A7:command,I1
-36E31C:t2:H36E310,A2:ok
-36E310:t2:A6:result,I1
-=proc_stack:<0.27.0>
-3bda3c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:P<0.25.0>
-=proc_heap:<0.27.0>
-=proc_dictionary:<0.31.0>
-H36DA24
-H36DA08
-=proc_stack:<0.31.0>
-36dcd4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36DB68
-y4:A17:inet_gethost_native_sup
-y5:P<0.24.0>
-36dcf0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36D9D0
-=proc_heap:<0.31.0>
-36DB68:t5:A5:state,A13:inet_gethost_native,P<0.32.0>,P<0.32.0>,H36D994
-36D994:t2:A5:local,A17:inet_gethost_native_sup
-36D9D0:lAA:gen_server|H36D9C8
-36D9C8:lP<0.24.0>|H36D9C0
-36D9C0:lP<0.24.0>|H36D970
-36D970:lH36D980|H36D9B8
-36D980:t2:A5:local,A17:inet_gethost_native_sup
-36D9B8:lA11:supervisor_bridge|H36D978
-36D978:lH36D9A8|H36D9B0
-36D9A8:lA13:inet_gethost_native|H36D9A0
-36D9A0:lN|H36D98C
-36D98C:lH36D994|N
-36D9B0:lN|N
-36DA24:t2:AD:$initial_call,H36DA14
-36DA14:t3:A3:gen,A7:init_it,H36D9D0
-36DA08:t2:AA:$ancestors,H36DA00
-36DA00:lAF:kernel_safe_sup|H36D9E0
-36D9E0:lAA:kernel_sup|H36D9D8
-36D9D8:lP<0.8.0>|N
-=proc_dictionary:<0.32.0>
-H36CFD4
-H36D0BC
-=proc_stack:<0.32.0>
-36d12c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H36CF18
-=proc_heap:<0.32.0>
-36CF18:t8:A5:state,p<0.105>,I8000,I11,I12,P<0.31.0>,I4,H36CEF0
-36CEF0:t9:AA:statistics,I0,I0,I0,I0,I0,I0,I0,I0
-36CFD4:t2:A3:rid,I1
-36D0BC:t2:AC:num_requests,I0
-=proc_dictionary:<0.33.0>
-H3905C4
-H3905D0
-=proc_stack:<0.33.0>
-3ceee4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:webtool
-y3:H3C8570
-y4:A8:web_tool
-y5:P<0.33.0>
-3cef00:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3905FC
-=proc_heap:<0.33.0>
-3C8570:t6:A5:state,H3905EC,I13,P<0.41.0>,H3905F4,H3C85D4
-3C85D4:lA10:crashdump_viewer|N
-3905F4:lH390650|H39065C
-390650:t2:A4:port,I8888
-39065C:lH3906C8|H3906D4
-3906C8:t2:AC:bind_address,H390760
-390760:t4:I127,I0,I0,I1
-3906D4:lH390774|H390780
-390774:t2:AB:server_name,H39082C
-39082C:lI108|H390908
-390908:lI111|H3909DC
-3909DC:lI99|H390AC0
-390AC0:lI97|H390B98
-390B98:lI108|H390C78
-390C78:lI104|H390D58
-390D58:lI111|H390E2C
-390E2C:lI115|H390F10
-390F10:lI116|N
-390780:lH390834|H390840
-390834:t2:AE:max_header_siz,I1024
-390840:lH390910|H39091C
-390910:t2:A11:max_header_action,A8:reply414
-39091C:lH3909E4|H3909F0
-3909E4:t2:A8:com_type,A7:ip_comm
-3909F0:lH390AC8|H390AD4
-390AC8:t2:A7:modules,H390BA0
-390BA0:lA9:mod_alias|H390C80
-390C80:lA8:mod_auth|H390D60
-390D60:lA7:mod_esi|H390E34
-390E34:lAB:mod_actions|H390F18
-390F18:lA7:mod_cgi|H390FF4
-390FF4:lAB:mod_include|H3910D8
-3910D8:lA7:mod_dir|H3911B4
-3911B4:lA7:mod_get|H3912A0
-3912A0:lA8:mod_head|H39139C
-39139C:lA7:mod_log|H3914A0
-3914A0:lAC:mod_disk_log|N
-390AD4:lH390BA8|H390BB4
-390BA8:t2:AF:directory_index,H390C88
-390C88:lH390D68|N
-390D68:lI105|H390E3C
-390E3C:lI110|H390F20
-390F20:lI100|H390FFC
-390FFC:lI101|H3910E0
-3910E0:lI120|H3911BC
-3911BC:lI46|H3912A8
-3912A8:lI104|H3913A4
-3913A4:lI116|H3914A8
-3914A8:lI109|H39159C
-39159C:lI108|N
-390BB4:lH390C90|N
-390C90:t2:AC:default_type,H390D70
-390D70:lI116|H390E44
-390E44:lI101|H390F28
-390F28:lI120|H391004
-391004:lI116|H3910E8
-3910E8:lI47|H3911C4
-3911C4:lI112|H3912B0
-3912B0:lI108|H3913AC
-3913AC:lI97|H3914B0
-3914B0:lI105|H3915A4
-3915A4:lI110|N
-3905EC:lI47|H390648
-390648:lI99|H3906C0
-3906C0:lI108|H390758
-390758:lI101|H390824
-390824:lI97|H390900
-390900:lI114|H3909D4
-3909D4:lI99|H390AB8
-390AB8:lI97|H390B90
-390B90:lI115|H390C70
-390C70:lI101|H390D50
-390D50:lI47|H390E24
-390E24:lI111|H390F08
-390F08:lI116|H390FEC
-390FEC:lI112|H3910D0
-3910D0:lI47|H3911AC
-3911AC:lI101|H391298
-391298:lI114|H391394
-391394:lI116|H391498
-391498:lI115|H391594
-391594:lI47|H391680
-391680:lI108|H39175C
-39175C:lI105|H391840
-391840:lI98|H391924
-391924:lI47|H3919F8
-3919F8:lI119|H391AC4
-391AC4:lI101|H391B90
-391B90:lI98|H391C54
-391C54:lI116|H391D18
-391D18:lI111|H391DD4
-391DD4:lI111|H391E90
-391E90:lI108|H391F5C
-391F5C:lI47|H392030
-392030:lI112|H3920EC
-3920EC:lI114|H3921A8
-3921A8:lI105|H392264
-392264:lI118|N
-3905FC:lAA:gen_server|H390664
-390664:lP<0.27.0>|H3906DC
-3906DC:lA4:self|H390788
-390788:lH390848|H390854
-390848:t2:A5:local,A8:web_tool
-390854:lA7:webtool|H390924
-390924:lH3909F8|H390A04
-3909F8:t2:H3905EC,H3905F4
-390A04:lN|N
-3905C4:t2:AD:$initial_call,H390614
-390614:t3:A3:gen,A7:init_it,H3905FC
-3905D0:t2:AA:$ancestors,H390624
-390624:lP<0.27.0>|N
-=proc_dictionary:<0.41.0>
-H36DF0C
-H36DF18
-=proc_stack:<0.41.0>
-36eda4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36EA3C
-y4:A6:websup
-y5:P<0.33.0>
-36edc0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36DF24
-=proc_heap:<0.41.0>
-36EA3C:tA:A5:state,H36DF2C,AB:one_for_one,H36EA68,N,I100,I10,N,AB:webtool_sup,N
-36EA68:lH36EA70|N
-36EA70:t8:A5:child,P<0.48.0>,H36DF38,H36DF44,A9:permanent,I100,A6:worker,H36DF54
-36DF54:lA10:crashdump_viewer|N
-36DF44:t3:A10:crashdump_viewer,AA:start_link,N
-36DF38:t2:A5:local,A17:crashdump_viewer_server
-36DF2C:t2:A5:local,A6:websup
-36DF24:lAA:gen_server|H36DF84
-36DF84:lP<0.33.0>|H36DF94
-36DF94:lP<0.33.0>|H36DF9C
-36DF9C:lH36DFA4|H36DFB0
-36DFA4:t2:A5:local,A6:websup
-36DFB0:lAA:supervisor|H36DFB8
-36DFB8:lH36DFC0|H36DFD0
-36DFC0:t3:H36DF2C,AB:webtool_sup,N
-36DFD0:lN|N
-36DF0C:t2:AD:$initial_call,H36DF6C
-36DF6C:t3:A3:gen,A7:init_it,H36DF24
-36DF18:t2:AA:$ancestors,H36DF7C
-36DF7C:lA8:web_tool|H36DF8C
-36DF8C:lP<0.27.0>|N
-=proc_dictionary:<0.43.0>
-H39D940
-H39D94C
-=proc_stack:<0.43.0>
-3a42ac:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H3A3E34
-y4:A1A:httpd_sup__127_0_0_1__8888
-y5:P<0.33.0>
-3a42c8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H39D9CC
-=proc_heap:<0.43.0>
-3A3E34:tA:A5:state,H39D960,AB:one_for_one,H3A3E20,N,I0,I1,N,A9:httpd_sup,H39DA88
-39DA88:lA9:undefined|H39DB18
-39DB18:lH39DB50|H39DB58
-39DB50:lH39DB88|H39DB94
-39DB88:t2:AB:server_root,H39DBD0
-39DBD0:lI47|H39DC0C
-39DC0C:lI99|H39DC50
-39DC50:lI108|H39DC84
-39DC84:lI101|H39DCC4
-39DCC4:lI97|H39DD28
-39DD28:lI114|H39DD90
-39DD90:lI99|H39DE00
-39DE00:lI97|H39DE78
-39DE78:lI115|H39DF00
-39DF00:lI101|H39DF90
-39DF90:lI47|H39E038
-39E038:lI111|H39E0E8
-39E0E8:lI116|H39E1AC
-39E1AC:lI112|H39E288
-39E288:lI47|H39E37C
-39E37C:lI101|H39E478
-39E478:lI114|H39E580
-39E580:lI116|H39E69C
-39E69C:lI115|H39E7B0
-39E7B0:lI47|H39E8C4
-39E8C4:lI108|H39E9D8
-39E9D8:lI105|H39EACC
-39EACC:lI98|H39EBC0
-39EBC0:lI47|H39ECB4
-39ECB4:lI119|H39EDA8
-39EDA8:lI101|H39EE7C
-39EE7C:lI98|H39EF50
-39EF50:lI116|H39F02C
-39F02C:lI111|H39F110
-39F110:lI111|H39F1E4
-39F1E4:lI108|H39F2B0
-39F2B0:lI47|H39F36C
-39F36C:lI112|H39F430
-39F430:lI114|H39F4FC
-39F4FC:lI105|H39F5C0
-39F5C0:lI118|H39F694
-39F694:lI47|H39F768
-39F768:lI114|H39F83C
-39F83C:lI111|H39F920
-39F920:lI111|H39F9FC
-39F9FC:lI116|N
-39DB94:lH39DBD8|H39DBE4
-39DBD8:t2:AD:document_root,H39DC14
-39DC14:lI47|H39DC58
-39DC58:lI99|H39DC8C
-39DC8C:lI108|H39DCCC
-39DCCC:lI101|H39DD30
-39DD30:lI97|H39DD98
-39DD98:lI114|H39DE08
-39DE08:lI99|H39DE80
-39DE80:lI97|H39DF08
-39DF08:lI115|H39DF98
-39DF98:lI101|H39E040
-39E040:lI47|H39E0F0
-39E0F0:lI111|H39E1B4
-39E1B4:lI116|H39E290
-39E290:lI112|H39E384
-39E384:lI47|H39E480
-39E480:lI101|H39E588
-39E588:lI114|H39E6A4
-39E6A4:lI116|H39E7B8
-39E7B8:lI115|H39E8CC
-39E8CC:lI47|H39E9E0
-39E9E0:lI108|H39EAD4
-39EAD4:lI105|H39EBC8
-39EBC8:lI98|H39ECBC
-39ECBC:lI47|H39EDB0
-39EDB0:lI119|H39EE84
-39EE84:lI101|H39EF58
-39EF58:lI98|H39F034
-39F034:lI116|H39F118
-39F118:lI111|H39F1EC
-39F1EC:lI111|H39F2B8
-39F2B8:lI108|H39F374
-39F374:lI47|H39F438
-39F438:lI112|H39F504
-39F504:lI114|H39F5C8
-39F5C8:lI105|H39F69C
-39F69C:lI118|H39F770
-39F770:lI47|H39F844
-39F844:lI114|H39F928
-39F928:lI111|H39FA04
-39FA04:lI111|H39FAD8
-39FAD8:lI116|H39FBB4
-39FBB4:lI47|H39FC80
-39FC80:lI100|H39FD44
-39FD44:lI111|H39FE10
-39FE10:lI99|N
-39DBE4:lH39DC1C|H39DC28
-39DC1C:t2:AA:mime_types,H39DC60
-39DC60:lH39DC94|H39DCA0
-39DC94:t2:H39DCD4,H39DCDC
-39DCDC:lI120|H39DD40
-39DD40:lI45|H39DDA8
-39DDA8:lI119|H39DE10
-39DE10:lI111|H39DE88
-39DE88:lI114|H39DF10
-39DF10:lI108|H39DFA0
-39DFA0:lI100|H39E048
-39E048:lI47|H39E0F8
-39E0F8:lI120|H39E1BC
-39E1BC:lI45|H39E298
-39E298:lI118|H39E38C
-39E38C:lI114|H39E488
-39E488:lI109|H39E590
-39E590:lI108|N
-39DCD4:lI119|H39DD38
-39DD38:lI114|H39DDA0
-39DDA0:lI108|N
-39DCA0:lH39DCE4|H39DCF0
-39DCE4:t2:H39DD48,H39DD50
-39DD50:lI120|H39DDB8
-39DDB8:lI45|H39DE20
-39DE20:lI119|H39DE98
-39DE98:lI111|H39DF18
-39DF18:lI114|H39DFA8
-39DFA8:lI108|H39E050
-39E050:lI100|H39E100
-39E100:lI47|H39E1C4
-39E1C4:lI120|H39E2A0
-39E2A0:lI45|H39E394
-39E394:lI118|H39E490
-39E490:lI114|H39E598
-39E598:lI109|H39E6AC
-39E6AC:lI108|N
-39DD48:lI118|H39DDB0
-39DDB0:lI114|H39DE18
-39DE18:lI109|H39DE90
-39DE90:lI108|N
-39DCF0:lH39DD58|H39DD64
-39DD58:t2:H39DDC0,H39DDC8
-39DDC8:lI120|H39DE30
-39DE30:lI45|H39DEA8
-39DEA8:lI99|H39DF20
-39DF20:lI111|H39DFB0
-39DFB0:lI110|H39E058
-39E058:lI102|H39E108
-39E108:lI101|H39E1CC
-39E1CC:lI114|H39E2A8
-39E2A8:lI101|H39E39C
-39E39C:lI110|H39E498
-39E498:lI99|H39E5A0
-39E5A0:lI101|H39E6B4
-39E6B4:lI47|H39E7C0
-39E7C0:lI120|H39E8D4
-39E8D4:lI45|H39E9E8
-39E9E8:lI99|H39EADC
-39EADC:lI111|H39EBD0
-39EBD0:lI111|H39ECC4
-39ECC4:lI108|H39EDB8
-39EDB8:lI116|H39EE8C
-39EE8C:lI97|H39EF60
-39EF60:lI108|H39F03C
-39F03C:lI107|N
-39DDC0:lI105|H39DE28
-39DE28:lI99|H39DEA0
-39DEA0:lI101|N
-39DD64:lH39DDD0|H39DDDC
-39DDD0:t2:H39DE38,H39DE40
-39DE40:lI118|H39DEB8
-39DEB8:lI105|H39DF30
-39DF30:lI100|H39DFC0
-39DFC0:lI101|H39E068
-39E068:lI111|H39E110
-39E110:lI47|H39E1D4
-39E1D4:lI120|H39E2B0
-39E2B0:lI45|H39E3A4
-39E3A4:lI115|H39E4A0
-39E4A0:lI103|H39E5A8
-39E5A8:lI105|H39E6BC
-39E6BC:lI45|H39E7C8
-39E7C8:lI109|H39E8DC
-39E8DC:lI111|H39E9F0
-39E9F0:lI118|H39EAE4
-39EAE4:lI105|H39EBD8
-39EBD8:lI101|N
-39DE38:lI109|H39DEB0
-39DEB0:lI111|H39DF28
-39DF28:lI118|H39DFB8
-39DFB8:lI105|H39E060
-39E060:lI101|N
-39DDDC:lH39DE48|H39DE54
-39DE48:t2:H39DEC0,H39DEC8
-39DEC8:lI118|H39DF40
-39DF40:lI105|H39DFD0
-39DFD0:lI100|H39E070
-39E070:lI101|H39E118
-39E118:lI111|H39E1DC
-39E1DC:lI47|H39E2B8
-39E2B8:lI120|H39E3AC
-39E3AC:lI45|H39E4A8
-39E4A8:lI109|H39E5B0
-39E5B0:lI115|H39E6C4
-39E6C4:lI118|H39E7D0
-39E7D0:lI105|H39E8E4
-39E8E4:lI100|H39E9F8
-39E9F8:lI101|H39EAEC
-39EAEC:lI111|N
-39DEC0:lI97|H39DF38
-39DF38:lI118|H39DFC8
-39DFC8:lI105|N
-39DE54:lH39DED0|H39DEDC
-39DED0:t2:H39DF48,H39DF50
-39DF50:lI118|H39DFE0
-39DFE0:lI105|H39E078
-39E078:lI100|H39E120
-39E120:lI101|H39E1E4
-39E1E4:lI111|H39E2C0
-39E2C0:lI47|H39E3B4
-39E3B4:lI113|H39E4B0
-39E4B0:lI117|H39E5B8
-39E5B8:lI105|H39E6CC
-39E6CC:lI99|H39E7D8
-39E7D8:lI107|H39E8EC
-39E8EC:lI116|H39EA00
-39EA00:lI105|H39EAF4
-39EAF4:lI109|H39EBE0
-39EBE0:lI101|N
-39DF48:lI113|H39DFD8
-39DFD8:lI116|N
-39DEDC:lH39DF58|H39DF64
-39DF58:t2:H39DFE8,H39DFF0
-39DFF0:lI118|H39E088
-39E088:lI105|H39E130
-39E130:lI100|H39E1EC
-39E1EC:lI101|H39E2C8
-39E2C8:lI111|H39E3BC
-39E3BC:lI47|H39E4B8
-39E4B8:lI113|H39E5C0
-39E5C0:lI117|H39E6D4
-39E6D4:lI105|H39E7E0
-39E7E0:lI99|H39E8F4
-39E8F4:lI107|H39EA08
-39EA08:lI116|H39EAFC
-39EAFC:lI105|H39EBE8
-39EBE8:lI109|H39ECCC
-39ECCC:lI101|N
-39DFE8:lI109|H39E080
-39E080:lI111|H39E128
-39E128:lI118|N
-39DF64:lH39DFF8|H39E004
-39DFF8:t2:H39E090,H39E098
-39E098:lI118|H39E140
-39E140:lI105|H39E1FC
-39E1FC:lI100|H39E2D8
-39E2D8:lI101|H39E3C4
-39E3C4:lI111|H39E4C0
-39E4C0:lI47|H39E5C8
-39E5C8:lI109|H39E6DC
-39E6DC:lI112|H39E7E8
-39E7E8:lI101|H39E8FC
-39E8FC:lI103|N
-39E090:lI109|H39E138
-39E138:lI112|H39E1F4
-39E1F4:lI101|H39E2D0
-39E2D0:lI103|N
-39E004:lH39E0A0|H39E0AC
-39E0A0:t2:H39E148,H39E150
-39E150:lI118|H39E20C
-39E20C:lI105|H39E2E8
-39E2E8:lI100|H39E3CC
-39E3CC:lI101|H39E4C8
-39E4C8:lI111|H39E5D0
-39E5D0:lI47|H39E6E4
-39E6E4:lI109|H39E7F0
-39E7F0:lI112|H39E904
-39E904:lI101|H39EA10
-39EA10:lI103|N
-39E148:lI109|H39E204
-39E204:lI112|H39E2E0
-39E2E0:lI103|N
-39E0AC:lH39E158|H39E164
-39E158:t2:H39E214,H39E21C
-39E21C:lI118|H39E2F8
-39E2F8:lI105|H39E3DC
-39E3DC:lI100|H39E4D0
-39E4D0:lI101|H39E5D8
-39E5D8:lI111|H39E6EC
-39E6EC:lI47|H39E7F8
-39E7F8:lI109|H39E90C
-39E90C:lI112|H39EA18
-39EA18:lI101|H39EB04
-39EB04:lI103|N
-39E214:lI109|H39E2F0
-39E2F0:lI112|H39E3D4
-39E3D4:lI101|N
-39E164:lH39E224|H39E230
-39E224:t2:H39E300,H39E308
-39E308:lI116|H39E3EC
-39E3EC:lI101|H39E4E0
-39E4E0:lI120|H39E5E8
-39E5E8:lI116|H39E6F4
-39E6F4:lI47|H39E800
-39E800:lI120|H39E914
-39E914:lI45|H39EA20
-39EA20:lI115|H39EB0C
-39EB0C:lI103|H39EBF0
-39EBF0:lI109|H39ECD4
-39ECD4:lI108|N
-39E300:lI115|H39E3E4
-39E3E4:lI103|H39E4D8
-39E4D8:lI109|H39E5E0
-39E5E0:lI108|N
-39E230:lH39E310|H39E31C
-39E310:t2:H39E3F4,H39E3FC
-39E3FC:lI116|H39E4F0
-39E4F0:lI101|H39E5F8
-39E5F8:lI120|H39E6FC
-39E6FC:lI116|H39E808
-39E808:lI47|H39E91C
-39E91C:lI120|H39EA28
-39EA28:lI45|H39EB14
-39EB14:lI115|H39EBF8
-39EBF8:lI103|H39ECDC
-39ECDC:lI109|H39EDC0
-39EDC0:lI108|N
-39E3F4:lI115|H39E4E8
-39E4E8:lI103|H39E5F0
-39E5F0:lI109|N
-39E31C:lH39E404|H39E410
-39E404:t2:H39E4F8,H39E500
-39E500:lI116|H39E608
-39E608:lI101|H39E70C
-39E70C:lI120|H39E810
-39E810:lI116|H39E924
-39E924:lI47|H39EA30
-39EA30:lI120|H39EB1C
-39EB1C:lI45|H39EC00
-39EC00:lI115|H39ECE4
-39ECE4:lI101|H39EDC8
-39EDC8:lI116|H39EE94
-39EE94:lI101|H39EF68
-39EF68:lI120|H39F044
-39F044:lI116|N
-39E4F8:lI101|H39E600
-39E600:lI116|H39E704
-39E704:lI120|N
-39E410:lH39E508|H39E514
-39E508:t2:H39E610,H39E618
-39E618:lI116|H39E71C
-39E71C:lI101|H39E820
-39E820:lI120|H39E92C
-39E92C:lI116|H39EA38
-39EA38:lI47|H39EB24
-39EB24:lI116|H39EC08
-39EC08:lI97|H39ECEC
-39ECEC:lI98|H39EDD0
-39EDD0:lI45|H39EE9C
-39EE9C:lI115|H39EF70
-39EF70:lI101|H39F04C
-39F04C:lI112|H39F120
-39F120:lI97|H39F1F4
-39F1F4:lI114|H39F2C0
-39F2C0:lI97|H39F37C
-39F37C:lI116|H39F440
-39F440:lI101|H39F50C
-39F50C:lI100|H39F5D0
-39F5D0:lI45|H39F6A4
-39F6A4:lI118|H39F778
-39F778:lI97|H39F84C
-39F84C:lI108|H39F930
-39F930:lI117|H39FA0C
-39FA0C:lI101|H39FAE0
-39FAE0:lI115|N
-39E610:lI116|H39E714
-39E714:lI115|H39E818
-39E818:lI118|N
-39E514:lH39E620|H39E62C
-39E620:t2:H39E724,H39E72C
-39E72C:lI116|H39E830
-39E830:lI101|H39E93C
-39E93C:lI120|H39EA40
-39EA40:lI116|H39EB2C
-39EB2C:lI47|H39EC10
-39EC10:lI114|H39ECF4
-39ECF4:lI105|H39EDD8
-39EDD8:lI99|H39EEA4
-39EEA4:lI104|H39EF78
-39EF78:lI116|H39F054
-39F054:lI101|H39F128
-39F128:lI120|H39F1FC
-39F1FC:lI116|N
-39E724:lI114|H39E828
-39E828:lI116|H39E934
-39E934:lI120|N
-39E62C:lH39E734|H39E740
-39E734:t2:H39E838,H39E840
-39E840:lI116|H39E94C
-39E94C:lI101|H39EA50
-39EA50:lI120|H39EB34
-39EB34:lI116|H39EC18
-39EC18:lI47|H39ECFC
-39ECFC:lI112|H39EDE0
-39EDE0:lI108|H39EEAC
-39EEAC:lI97|H39EF80
-39EF80:lI105|H39F05C
-39F05C:lI110|N
-39E838:lI116|H39E944
-39E944:lI120|H39EA48
-39EA48:lI116|N
-39E740:lH39E848|H39E854
-39E848:t2:H39E954,H39E95C
-39E95C:lI116|H39EA60
-39EA60:lI101|H39EB44
-39EB44:lI120|H39EC28
-39EC28:lI116|H39ED0C
-39ED0C:lI47|H39EDE8
-39EDE8:lI120|H39EEB4
-39EEB4:lI45|H39EF88
-39EF88:lI115|H39F064
-39F064:lI101|H39F130
-39F130:lI114|H39F204
-39F204:lI118|H39F2C8
-39F2C8:lI101|H39F384
-39F384:lI114|H39F448
-39F448:lI45|H39F514
-39F514:lI112|H39F5D8
-39F5D8:lI97|H39F6AC
-39F6AC:lI114|H39F780
-39F780:lI115|H39F854
-39F854:lI101|H39F938
-39F938:lI100|H39FA14
-39FA14:lI45|H39FAE8
-39FAE8:lI104|H39FBBC
-39FBBC:lI116|H39FC88
-39FC88:lI109|H39FD4C
-39FD4C:lI108|N
-39E954:lI115|H39EA58
-39EA58:lI104|H39EB3C
-39EB3C:lI116|H39EC20
-39EC20:lI109|H39ED04
-39ED04:lI108|N
-39E854:lH39E964|H39E970
-39E964:t2:H39EA68,H39EA70
-39EA70:lI116|H39EB54
-39EB54:lI101|H39EC38
-39EC38:lI120|H39ED1C
-39ED1C:lI116|H39EDF0
-39EDF0:lI47|H39EEBC
-39EEBC:lI104|H39EF90
-39EF90:lI116|H39F06C
-39F06C:lI109|H39F138
-39F138:lI108|N
-39EA68:lI104|H39EB4C
-39EB4C:lI116|H39EC30
-39EC30:lI109|H39ED14
-39ED14:lI108|N
-39E970:lH39EA78|H39EA84
-39EA78:t2:H39EB5C,H39EB64
-39EB64:lI116|H39EC48
-39EC48:lI101|H39ED2C
-39ED2C:lI120|H39EDF8
-39EDF8:lI116|H39EEC4
-39EEC4:lI47|H39EF98
-39EF98:lI104|H39F074
-39F074:lI116|H39F140
-39F140:lI109|H39F20C
-39F20C:lI108|N
-39EB5C:lI104|H39EC40
-39EC40:lI116|H39ED24
-39ED24:lI109|N
-39EA84:lH39EB6C|H39EB78
-39EB6C:t2:H39EC50,H39EC58
-39EC58:lI105|H39ED3C
-39ED3C:lI109|H39EE08
-39EE08:lI97|H39EECC
-39EECC:lI103|H39EFA0
-39EFA0:lI101|H39F07C
-39F07C:lI47|H39F148
-39F148:lI120|H39F214
-39F214:lI45|H39F2D0
-39F2D0:lI120|H39F38C
-39F38C:lI119|H39F450
-39F450:lI105|H39F51C
-39F51C:lI110|H39F5E0
-39F5E0:lI100|H39F6B4
-39F6B4:lI111|H39F788
-39F788:lI119|H39F85C
-39F85C:lI100|H39F940
-39F940:lI117|H39FA1C
-39FA1C:lI109|H39FAF0
-39FAF0:lI112|N
-39EC50:lI120|H39ED34
-39ED34:lI119|H39EE00
-39EE00:lI100|N
-39EB78:lH39EC60|H39EC6C
-39EC60:t2:H39ED44,H39ED4C
-39ED4C:lI105|H39EE18
-39EE18:lI109|H39EEDC
-39EEDC:lI97|H39EFA8
-39EFA8:lI103|H39F084
-39F084:lI101|H39F150
-39F150:lI47|H39F21C
-39F21C:lI120|H39F2D8
-39F2D8:lI45|H39F394
-39F394:lI120|H39F458
-39F458:lI112|H39F524
-39F524:lI105|H39F5E8
-39F5E8:lI120|H39F6BC
-39F6BC:lI109|H39F790
-39F790:lI97|H39F864
-39F864:lI112|N
-39ED44:lI120|H39EE10
-39EE10:lI112|H39EED4
-39EED4:lI109|N
-39EC6C:lH39ED54|H39ED60
-39ED54:t2:H39EE20,H39EE28
-39EE28:lI105|H39EEEC
-39EEEC:lI109|H39EFB8
-39EFB8:lI97|H39F08C
-39F08C:lI103|H39F158
-39F158:lI101|H39F224
-39F224:lI47|H39F2E0
-39F2E0:lI120|H39F39C
-39F39C:lI45|H39F460
-39F460:lI120|H39F52C
-39F52C:lI98|H39F5F0
-39F5F0:lI105|H39F6C4
-39F6C4:lI116|H39F798
-39F798:lI109|H39F86C
-39F86C:lI97|H39F948
-39F948:lI112|N
-39EE20:lI120|H39EEE4
-39EEE4:lI98|H39EFB0
-39EFB0:lI109|N
-39ED60:lH39EE30|H39EE3C
-39EE30:t2:H39EEF4,H39EEFC
-39EEFC:lI105|H39EFC8
-39EFC8:lI109|H39F09C
-39F09C:lI97|H39F160
-39F160:lI103|H39F22C
-39F22C:lI101|H39F2E8
-39F2E8:lI47|H39F3A4
-39F3A4:lI120|H39F468
-39F468:lI45|H39F534
-39F534:lI114|H39F5F8
-39F5F8:lI103|H39F6CC
-39F6CC:lI98|N
-39EEF4:lI114|H39EFC0
-39EFC0:lI103|H39F094
-39F094:lI98|N
-39EE3C:lH39EF04|H39EF10
-39EF04:t2:H39EFD0,H39EFD8
-39EFD8:lI105|H39F0AC
-39F0AC:lI109|H39F170
-39F170:lI97|H39F234
-39F234:lI103|H39F2F0
-39F2F0:lI101|H39F3AC
-39F3AC:lI47|H39F470
-39F470:lI120|H39F53C
-39F53C:lI45|H39F600
-39F600:lI112|H39F6D4
-39F6D4:lI111|H39F7A0
-39F7A0:lI114|H39F874
-39F874:lI116|H39F950
-39F950:lI97|H39FA24
-39FA24:lI98|H39FAF8
-39FAF8:lI108|H39FBC4
-39FBC4:lI101|H39FC90
-39FC90:lI45|H39FD54
-39FD54:lI112|H39FE18
-39FE18:lI105|H39FECC
-39FECC:lI120|H39FF88
-39FF88:lI109|H3A003C
-3A003C:lI97|H3A00E8
-3A00E8:lI112|N
-39EFD0:lI112|H39F0A4
-39F0A4:lI112|H39F168
-39F168:lI109|N
-39EF10:lH39EFE0|H39EFEC
-39EFE0:t2:H39F0B4,H39F0BC
-39F0BC:lI105|H39F180
-39F180:lI109|H39F244
-39F244:lI97|H39F2F8
-39F2F8:lI103|H39F3B4
-39F3B4:lI101|H39F478
-39F478:lI47|H39F544
-39F544:lI120|H39F608
-39F608:lI45|H39F6DC
-39F6DC:lI112|H39F7A8
-39F7A8:lI111|H39F87C
-39F87C:lI114|H39F958
-39F958:lI116|H39FA2C
-39FA2C:lI97|H39FB00
-39FB00:lI98|H39FBCC
-39FBCC:lI108|H39FC98
-39FC98:lI101|H39FD5C
-39FD5C:lI45|H39FE20
-39FE20:lI103|H39FED4
-39FED4:lI114|H39FF90
-39FF90:lI97|H3A0044
-3A0044:lI121|H3A00F0
-3A00F0:lI109|H3A0194
-3A0194:lI97|H3A0248
-3A0248:lI112|N
-39F0B4:lI112|H39F178
-39F178:lI103|H39F23C
-39F23C:lI109|N
-39EFEC:lH39F0C4|H39F0D0
-39F0C4:t2:H39F188,H39F190
-39F190:lI105|H39F254
-39F254:lI109|H39F308
-39F308:lI97|H39F3BC
-39F3BC:lI103|H39F480
-39F480:lI101|H39F54C
-39F54C:lI47|H39F610
-39F610:lI120|H39F6E4
-39F6E4:lI45|H39F7B0
-39F7B0:lI112|H39F884
-39F884:lI111|H39F960
-39F960:lI114|H39FA34
-39FA34:lI116|H39FB08
-39FB08:lI97|H39FBD4
-39FBD4:lI98|H39FCA0
-39FCA0:lI108|H39FD64
-39FD64:lI101|H39FE28
-39FE28:lI45|H39FEDC
-39FEDC:lI98|H39FF98
-39FF98:lI105|H3A004C
-3A004C:lI116|H3A00F8
-3A00F8:lI109|H3A019C
-3A019C:lI97|H3A0250
-3A0250:lI112|N
-39F188:lI112|H39F24C
-39F24C:lI98|H39F300
-39F300:lI109|N
-39F0D0:lH39F198|H39F1A4
-39F198:t2:H39F25C,H39F264
-39F264:lI105|H39F318
-39F318:lI109|H39F3CC
-39F3CC:lI97|H39F488
-39F488:lI103|H39F554
-39F554:lI101|H39F618
-39F618:lI47|H39F6EC
-39F6EC:lI120|H39F7B8
-39F7B8:lI45|H39F88C
-39F88C:lI112|H39F968
-39F968:lI111|H39FA3C
-39FA3C:lI114|H39FB10
-39FB10:lI116|H39FBDC
-39FBDC:lI97|H39FCA8
-39FCA8:lI98|H39FD6C
-39FD6C:lI108|H39FE30
-39FE30:lI101|H39FEE4
-39FEE4:lI45|H39FFA0
-39FFA0:lI97|H3A0054
-3A0054:lI110|H3A0100
-3A0100:lI121|H3A01A4
-3A01A4:lI109|H3A0258
-3A0258:lI97|H3A0304
-3A0304:lI112|N
-39F25C:lI112|H39F310
-39F310:lI110|H39F3C4
-39F3C4:lI109|N
-39F1A4:lH39F26C|H39F278
-39F26C:t2:H39F320,H39F328
-39F328:lI105|H39F3DC
-39F3DC:lI109|H39F498
-39F498:lI97|H39F55C
-39F55C:lI103|H39F620
-39F620:lI101|H39F6F4
-39F6F4:lI47|H39F7C0
-39F7C0:lI120|H39F894
-39F894:lI45|H39F970
-39F970:lI99|H39FA44
-39FA44:lI109|H39FB18
-39FB18:lI117|H39FBE4
-39FBE4:lI45|H39FCB0
-39FCB0:lI114|H39FD74
-39FD74:lI97|H39FE38
-39FE38:lI115|H39FEEC
-39FEEC:lI116|H39FFA8
-39FFA8:lI101|H3A005C
-3A005C:lI114|N
-39F320:lI114|H39F3D4
-39F3D4:lI97|H39F490
-39F490:lI115|N
-39F278:lH39F330|H39F33C
-39F330:t2:H39F3E4,H39F3EC
-39F3EC:lI105|H39F4A8
-39F4A8:lI109|H39F56C
-39F56C:lI97|H39F630
-39F630:lI103|H39F6FC
-39F6FC:lI101|H39F7C8
-39F7C8:lI47|H39F89C
-39F89C:lI116|H39F978
-39F978:lI105|H39FA4C
-39FA4C:lI102|H39FB20
-39FB20:lI102|N
-39F3E4:lI116|H39F4A0
-39F4A0:lI105|H39F564
-39F564:lI102|H39F628
-39F628:lI102|N
-39F33C:lH39F3F4|H39F400
-39F3F4:t2:H39F4B0,H39F4B8
-39F4B8:lI105|H39F57C
-39F57C:lI109|H39F640
-39F640:lI97|H39F704
-39F704:lI103|H39F7D0
-39F7D0:lI101|H39F8A4
-39F8A4:lI47|H39F980
-39F980:lI116|H39FA54
-39FA54:lI105|H39FB28
-39FB28:lI102|H39FBEC
-39FBEC:lI102|N
-39F4B0:lI116|H39F574
-39F574:lI105|H39F638
-39F638:lI102|N
-39F400:lH39F4C0|H39F4CC
-39F4C0:t2:H39F584,H39F58C
-39F58C:lI105|H39F650
-39F650:lI109|H39F714
-39F714:lI97|H39F7D8
-39F7D8:lI103|H39F8AC
-39F8AC:lI101|H39F988
-39F988:lI47|H39FA5C
-39FA5C:lI112|H39FB30
-39FB30:lI110|H39FBF4
-39FBF4:lI103|N
-39F584:lI112|H39F648
-39F648:lI110|H39F70C
-39F70C:lI103|N
-39F4CC:lH39F594|H39F5A0
-39F594:t2:H39F658,H39F660
-39F660:lI105|H39F724
-39F724:lI109|H39F7E8
-39F7E8:lI97|H39F8BC
-39F8BC:lI103|H39F990
-39F990:lI101|H39FA64
-39FA64:lI47|H39FB38
-39FB38:lI106|H39FBFC
-39FBFC:lI112|H39FCB8
-39FCB8:lI101|H39FD7C
-39FD7C:lI103|N
-39F658:lI106|H39F71C
-39F71C:lI112|H39F7E0
-39F7E0:lI101|H39F8B4
-39F8B4:lI103|N
-39F5A0:lH39F668|H39F674
-39F668:t2:H39F72C,H39F734
-39F734:lI105|H39F7F8
-39F7F8:lI109|H39F8CC
-39F8CC:lI97|H39F998
-39F998:lI103|H39FA6C
-39FA6C:lI101|H39FB40
-39FB40:lI47|H39FC04
-39FC04:lI106|H39FCC0
-39FCC0:lI112|H39FD84
-39FD84:lI101|H39FE40
-39FE40:lI103|N
-39F72C:lI106|H39F7F0
-39F7F0:lI112|H39F8C4
-39F8C4:lI103|N
-39F674:lH39F73C|H39F748
-39F73C:t2:H39F800,H39F808
-39F808:lI105|H39F8DC
-39F8DC:lI109|H39F9A8
-39F9A8:lI97|H39FA74
-39FA74:lI103|H39FB48
-39FB48:lI101|H39FC0C
-39FC0C:lI47|H39FCC8
-39FCC8:lI106|H39FD8C
-39FD8C:lI112|H39FE48
-39FE48:lI101|H39FEF4
-39FEF4:lI103|N
-39F800:lI106|H39F8D4
-39F8D4:lI112|H39F9A0
-39F9A0:lI101|N
-39F748:lH39F810|H39F81C
-39F810:t2:H39F8E4,H39F8EC
-39F8EC:lI105|H39F9B8
-39F9B8:lI109|H39FA84
-39FA84:lI97|H39FB50
-39FB50:lI103|H39FC14
-39FC14:lI101|H39FCD0
-39FCD0:lI47|H39FD94
-39FD94:lI105|H39FE50
-39FE50:lI101|H39FEFC
-39FEFC:lI102|N
-39F8E4:lI105|H39F9B0
-39F9B0:lI101|H39FA7C
-39FA7C:lI102|N
-39F81C:lH39F8F4|H39F900
-39F8F4:t2:H39F9C0,H39F9C8
-39F9C8:lI105|H39FA94
-39FA94:lI109|H39FB60
-39FB60:lI97|H39FC1C
-39FC1C:lI103|H39FCD8
-39FCD8:lI101|H39FD9C
-39FD9C:lI47|H39FE58
-39FE58:lI103|H39FF04
-39FF04:lI105|H39FFB0
-39FFB0:lI102|N
-39F9C0:lI103|H39FA8C
-39FA8C:lI105|H39FB58
-39FB58:lI102|N
-39F900:lH39F9D0|H39F9DC
-39F9D0:t2:H39FA9C,H39FAA4
-39FAA4:lI99|H39FB70
-39FB70:lI104|H39FC2C
-39FC2C:lI101|H39FCE0
-39FCE0:lI109|H39FDA4
-39FDA4:lI105|H39FE60
-39FE60:lI99|H39FF0C
-39FF0C:lI97|H39FFB8
-39FFB8:lI108|H3A0064
-3A0064:lI47|H3A0108
-3A0108:lI120|H3A01AC
-3A01AC:lI45|H3A0260
-3A0260:lI112|H3A030C
-3A030C:lI100|H3A03B8
-3A03B8:lI98|N
-39FA9C:lI112|H39FB68
-39FB68:lI100|H39FC24
-39FC24:lI98|N
-39F9DC:lH39FAAC|H39FAB8
-39FAAC:t2:H39FB78,H39FB80
-39FB80:lI99|H39FC3C
-39FC3C:lI104|H39FCF0
-39FCF0:lI101|H39FDAC
-39FDAC:lI109|H39FE68
-39FE68:lI105|H39FF14
-39FF14:lI99|H39FFC0
-39FFC0:lI97|H3A006C
-3A006C:lI108|H3A0110
-3A0110:lI47|H3A01B4
-3A01B4:lI120|H3A0268
-3A0268:lI45|H3A0314
-3A0314:lI112|H3A03C0
-3A03C0:lI100|H3A0454
-3A0454:lI98|N
-39FB78:lI120|H39FC34
-39FC34:lI121|H39FCE8
-39FCE8:lI122|N
-39FAB8:lH39FB88|H39FB94
-39FB88:t2:H39FC44,H39FC4C
-39FC4C:lI97|H39FD00
-39FD00:lI117|H39FDBC
-39FDBC:lI100|H39FE70
-39FE70:lI105|H39FF1C
-39FF1C:lI111|H39FFC8
-39FFC8:lI47|H3A0074
-3A0074:lI120|H3A0118
-3A0118:lI45|H3A01BC
-3A01BC:lI119|H3A0270
-3A0270:lI97|H3A031C
-3A031C:lI118|N
-39FC44:lI119|H39FCF8
-39FCF8:lI97|H39FDB4
-39FDB4:lI118|N
-39FB94:lH39FC54|H39FC60
-39FC54:t2:H39FD08,H39FD10
-39FD10:lI97|H39FDCC
-39FDCC:lI117|H39FE78
-39FE78:lI100|H39FF24
-39FF24:lI105|H39FFD0
-39FFD0:lI111|H3A007C
-3A007C:lI47|H3A0120
-3A0120:lI120|H3A01C4
-3A01C4:lI45|H3A0278
-3A0278:lI114|H3A0324
-3A0324:lI101|H3A03C8
-3A03C8:lI97|H3A045C
-3A045C:lI108|H3A04F8
-3A04F8:lI97|H3A059C
-3A059C:lI117|H3A0648
-3A0648:lI100|H3A06F4
-3A06F4:lI105|H3A07A0
-3A07A0:lI111|N
-39FD08:lI114|H39FDC4
-39FDC4:lI97|N
-39FC60:lH39FD18|H39FD24
-39FD18:t2:H39FDD4,H39FDDC
-39FDDC:lI97|H39FE88
-39FE88:lI117|H39FF34
-39FF34:lI100|H39FFD8
-39FFD8:lI105|H3A0084
-3A0084:lI111|H3A0128
-3A0128:lI47|H3A01CC
-3A01CC:lI120|H3A0280
-3A0280:lI45|H3A032C
-3A032C:lI112|H3A03D0
-3A03D0:lI110|H3A0464
-3A0464:lI45|H3A0500
-3A0500:lI114|H3A05A4
-3A05A4:lI101|H3A0650
-3A0650:lI97|H3A06FC
-3A06FC:lI108|H3A07A8
-3A07A8:lI97|H3A0844
-3A0844:lI117|H3A08D0
-3A08D0:lI100|H3A0964
-3A0964:lI105|H3A09F8
-3A09F8:lI111|H3A0A94
-3A0A94:lI45|H3A0B40
-3A0B40:lI112|H3A0BEC
-3A0BEC:lI108|H3A0CA8
-3A0CA8:lI117|H3A0D64
-3A0D64:lI103|H3A0E18
-3A0E18:lI105|H3A0ECC
-3A0ECC:lI110|N
-39FDD4:lI114|H39FE80
-39FE80:lI112|H39FF2C
-39FF2C:lI109|N
-39FD24:lH39FDE4|H39FDF0
-39FDE4:t2:H39FE90,H39FE98
-39FE98:lI97|H39FF44
-39FF44:lI117|H39FFE8
-39FFE8:lI100|H3A008C
-3A008C:lI105|H3A0130
-3A0130:lI111|H3A01D4
-3A01D4:lI47|H3A0288
-3A0288:lI120|H3A0334
-3A0334:lI45|H3A03D8
-3A03D8:lI112|H3A046C
-3A046C:lI110|H3A0508
-3A0508:lI45|H3A05AC
-3A05AC:lI114|H3A0658
-3A0658:lI101|H3A0704
-3A0704:lI97|H3A07B0
-3A07B0:lI108|H3A084C
-3A084C:lI97|H3A08D8
-3A08D8:lI117|H3A096C
-3A096C:lI100|H3A0A00
-3A0A00:lI105|H3A0A9C
-3A0A9C:lI111|N
-39FE90:lI114|H39FF3C
-39FF3C:lI97|H39FFE0
-39FFE0:lI109|N
-39FDF0:lH39FEA0|H39FEAC
-39FEA0:t2:H39FF4C,H39FF54
-39FF54:lI97|H39FFF8
-39FFF8:lI117|H3A009C
-3A009C:lI100|H3A0138
-3A0138:lI105|H3A01DC
-3A01DC:lI111|H3A0290
-3A0290:lI47|H3A033C
-3A033C:lI120|H3A03E0
-3A03E0:lI45|H3A0474
-3A0474:lI97|H3A0510
-3A0510:lI105|H3A05B4
-3A05B4:lI102|H3A0660
-3A0660:lI102|N
-39FF4C:lI97|H39FFF0
-39FFF0:lI105|H3A0094
-3A0094:lI102|N
-39FEAC:lH39FF5C|H39FF68
-39FF5C:t2:H3A0000,H3A0008
-3A0008:lI97|H3A00AC
-3A00AC:lI117|H3A0148
-3A0148:lI100|H3A01EC
-3A01EC:lI105|H3A0298
-3A0298:lI111|H3A0344
-3A0344:lI47|H3A03E8
-3A03E8:lI120|H3A047C
-3A047C:lI45|H3A0518
-3A0518:lI97|H3A05BC
-3A05BC:lI105|H3A0668
-3A0668:lI102|H3A070C
-3A070C:lI102|N
-3A0000:lI97|H3A00A4
-3A00A4:lI105|H3A0140
-3A0140:lI102|H3A01E4
-3A01E4:lI102|N
-39FF68:lH3A0010|H3A001C
-3A0010:t2:H3A00B4,H3A00BC
-3A00BC:lI97|H3A0158
-3A0158:lI117|H3A01FC
-3A01FC:lI100|H3A02A8
-3A02A8:lI105|H3A034C
-3A034C:lI111|H3A03F0
-3A03F0:lI47|H3A0484
-3A0484:lI120|H3A0520
-3A0520:lI45|H3A05C4
-3A05C4:lI97|H3A0670
-3A0670:lI105|H3A0714
-3A0714:lI102|H3A07B8
-3A07B8:lI102|N
-3A00B4:lI97|H3A0150
-3A0150:lI105|H3A01F4
-3A01F4:lI102|H3A02A0
-3A02A0:lI99|N
-3A001C:lH3A00C4|H3A00D0
-3A00C4:t2:H3A0160,H3A0168
-3A0168:lI97|H3A020C
-3A020C:lI117|H3A02B8
-3A02B8:lI100|H3A035C
-3A035C:lI105|H3A03F8
-3A03F8:lI111|H3A048C
-3A048C:lI47|H3A0528
-3A0528:lI109|H3A05CC
-3A05CC:lI112|H3A0678
-3A0678:lI101|H3A071C
-3A071C:lI103|N
-3A0160:lI109|H3A0204
-3A0204:lI112|H3A02B0
-3A02B0:lI103|H3A0354
-3A0354:lI97|N
-3A00D0:lH3A0170|H3A017C
-3A0170:t2:H3A0214,H3A021C
-3A021C:lI97|H3A02C8
-3A02C8:lI117|H3A036C
-3A036C:lI100|H3A0400
-3A0400:lI105|H3A0494
-3A0494:lI111|H3A0530
-3A0530:lI47|H3A05D4
-3A05D4:lI109|H3A0680
-3A0680:lI112|H3A0724
-3A0724:lI101|H3A07C0
-3A07C0:lI103|N
-3A0214:lI109|H3A02C0
-3A02C0:lI112|H3A0364
-3A0364:lI50|N
-3A017C:lH3A0224|H3A0230
-3A0224:t2:H3A02D0,H3A02D8
-3A02D8:lI97|H3A037C
-3A037C:lI117|H3A0408
-3A0408:lI100|H3A049C
-3A049C:lI105|H3A0538
-3A0538:lI111|H3A05DC
-3A05DC:lI47|H3A0688
-3A0688:lI98|H3A072C
-3A072C:lI97|H3A07C8
-3A07C8:lI115|H3A0854
-3A0854:lI105|H3A08E0
-3A08E0:lI99|N
-3A02D0:lI97|H3A0374
-3A0374:lI117|N
-3A0230:lH3A02E0|H3A02EC
-3A02E0:t2:H3A0384,H3A038C
-3A038C:lI97|H3A0418
-3A0418:lI117|H3A04AC
-3A04AC:lI100|H3A0540
-3A0540:lI105|H3A05E4
-3A05E4:lI111|H3A0690
-3A0690:lI47|H3A0734
-3A0734:lI98|H3A07D0
-3A07D0:lI97|H3A085C
-3A085C:lI115|H3A08E8
-3A08E8:lI105|H3A0974
-3A0974:lI99|N
-3A0384:lI115|H3A0410
-3A0410:lI110|H3A04A4
-3A04A4:lI100|N
-3A02EC:lH3A0394|H3A03A0
-3A0394:t2:H3A0420,H3A0428
-3A0428:lI97|H3A04BC
-3A04BC:lI112|H3A0550
-3A0550:lI112|H3A05EC
-3A05EC:lI108|H3A0698
-3A0698:lI105|H3A073C
-3A073C:lI99|H3A07D8
-3A07D8:lI97|H3A0864
-3A0864:lI116|H3A08F0
-3A08F0:lI105|H3A097C
-3A097C:lI111|H3A0A08
-3A0A08:lI110|H3A0AA4
-3A0AA4:lI47|H3A0B48
-3A0B48:lI122|H3A0BF4
-3A0BF4:lI105|H3A0CB0
-3A0CB0:lI112|N
-3A0420:lI122|H3A04B4
-3A04B4:lI105|H3A0548
-3A0548:lI112|N
-3A03A0:lH3A0430|H3A043C
-3A0430:t2:H3A04C4,H3A04CC
-3A04CC:lI97|H3A0560
-3A0560:lI112|H3A05FC
-3A05FC:lI112|H3A06A0
-3A06A0:lI108|H3A0744
-3A0744:lI105|H3A07E0
-3A07E0:lI99|H3A086C
-3A086C:lI97|H3A08F8
-3A08F8:lI116|H3A0984
-3A0984:lI105|H3A0A10
-3A0A10:lI111|H3A0AAC
-3A0AAC:lI110|H3A0B50
-3A0B50:lI47|H3A0BFC
-3A0BFC:lI120|H3A0CB8
-3A0CB8:lI45|H3A0D6C
-3A0D6C:lI119|H3A0E20
-3A0E20:lI97|H3A0ED4
-3A0ED4:lI105|H3A0F90
-3A0F90:lI115|H3A105C
-3A105C:lI45|H3A1130
-3A1130:lI115|H3A1204
-3A1204:lI111|H3A12D0
-3A12D0:lI117|H3A13A4
-3A13A4:lI114|H3A1480
-3A1480:lI99|H3A1564
-3A1564:lI101|N
-3A04C4:lI115|H3A0558
-3A0558:lI114|H3A05F4
-3A05F4:lI99|N
-3A043C:lH3A04D4|H3A04E0
-3A04D4:t2:H3A0568,H3A0570
-3A0570:lI97|H3A060C
-3A060C:lI112|H3A06B0
-3A06B0:lI112|H3A0754
-3A0754:lI108|H3A07F0
-3A07F0:lI105|H3A0874
-3A0874:lI99|H3A0900
-3A0900:lI97|H3A098C
-3A098C:lI116|H3A0A18
-3A0A18:lI105|H3A0AB4
-3A0AB4:lI111|H3A0B58
-3A0B58:lI110|H3A0C04
-3A0C04:lI47|H3A0CC0
-3A0CC0:lI120|H3A0D74
-3A0D74:lI45|H3A0E28
-3A0E28:lI117|H3A0EDC
-3A0EDC:lI115|H3A0F98
-3A0F98:lI116|H3A1064
-3A1064:lI97|H3A1138
-3A1138:lI114|N
-3A0568:lI117|H3A0604
-3A0604:lI115|H3A06A8
-3A06A8:lI116|H3A074C
-3A074C:lI97|H3A07E8
-3A07E8:lI114|N
-3A04E0:lH3A0578|H3A0584
-3A0578:t2:H3A0614,H3A061C
-3A061C:lI97|H3A06C0
-3A06C0:lI112|H3A075C
-3A075C:lI112|H3A07F8
-3A07F8:lI108|H3A087C
-3A087C:lI105|H3A0908
-3A0908:lI99|H3A0994
-3A0994:lI97|H3A0A20
-3A0A20:lI116|H3A0ABC
-3A0ABC:lI105|H3A0B60
-3A0B60:lI111|H3A0C0C
-3A0C0C:lI110|H3A0CC8
-3A0CC8:lI47|H3A0D7C
-3A0D7C:lI120|H3A0E30
-3A0E30:lI45|H3A0EE4
-3A0EE4:lI116|H3A0FA0
-3A0FA0:lI114|H3A106C
-3A106C:lI111|H3A1140
-3A1140:lI102|H3A120C
-3A120C:lI102|H3A12D8
-3A12D8:lI45|H3A13AC
-3A13AC:lI109|H3A1488
-3A1488:lI115|N
-3A0614:lI109|H3A06B8
-3A06B8:lI115|N
-3A0584:lH3A0624|H3A0630
-3A0624:t2:H3A06C8,H3A06D0
-3A06D0:lI97|H3A076C
-3A076C:lI112|H3A0800
-3A0800:lI112|H3A0884
-3A0884:lI108|H3A0910
-3A0910:lI105|H3A099C
-3A099C:lI99|H3A0A28
-3A0A28:lI97|H3A0AC4
-3A0AC4:lI116|H3A0B68
-3A0B68:lI105|H3A0C14
-3A0C14:lI111|H3A0CD0
-3A0CD0:lI110|H3A0D84
-3A0D84:lI47|H3A0E38
-3A0E38:lI120|H3A0EEC
-3A0EEC:lI45|H3A0FA8
-3A0FA8:lI116|H3A1074
-3A1074:lI114|H3A1148
-3A1148:lI111|H3A1214
-3A1214:lI102|H3A12E0
-3A12E0:lI102|H3A13B4
-3A13B4:lI45|H3A1490
-3A1490:lI109|H3A156C
-3A156C:lI101|N
-3A06C8:lI109|H3A0764
-3A0764:lI101|N
-3A0630:lH3A06D8|H3A06E4
-3A06D8:t2:H3A0774,H3A077C
-3A077C:lI97|H3A0810
-3A0810:lI112|H3A0894
-3A0894:lI112|H3A0918
-3A0918:lI108|H3A09A4
-3A09A4:lI105|H3A0A30
-3A0A30:lI99|H3A0ACC
-3A0ACC:lI97|H3A0B70
-3A0B70:lI116|H3A0C1C
-3A0C1C:lI105|H3A0CD8
-3A0CD8:lI111|H3A0D8C
-3A0D8C:lI110|H3A0E40
-3A0E40:lI47|H3A0EF4
-3A0EF4:lI120|H3A0FB0
-3A0FB0:lI45|H3A107C
-3A107C:lI116|H3A1150
-3A1150:lI114|H3A121C
-3A121C:lI111|H3A12E8
-3A12E8:lI102|H3A13BC
-3A13BC:lI102|H3A1498
-3A1498:lI45|H3A1574
-3A1574:lI109|H3A1648
-3A1648:lI97|H3A171C
-3A171C:lI110|N
-3A0774:lI109|H3A0808
-3A0808:lI97|H3A088C
-3A088C:lI110|N
-3A06E4:lH3A0784|H3A0790
-3A0784:t2:H3A0818,H3A0820
-3A0820:lI97|H3A089C
-3A089C:lI112|H3A0920
-3A0920:lI112|H3A09AC
-3A09AC:lI108|H3A0A38
-3A0A38:lI105|H3A0AD4
-3A0AD4:lI99|H3A0B78
-3A0B78:lI97|H3A0C24
-3A0C24:lI116|H3A0CE0
-3A0CE0:lI105|H3A0D94
-3A0D94:lI111|H3A0E48
-3A0E48:lI110|H3A0EFC
-3A0EFC:lI47|H3A0FB8
-3A0FB8:lI120|H3A1084
-3A1084:lI45|H3A1158
-3A1158:lI116|H3A1224
-3A1224:lI114|H3A12F0
-3A12F0:lI111|H3A13C4
-3A13C4:lI102|H3A14A0
-3A14A0:lI102|N
-3A0818:lI116|N
-3A0790:lH3A0828|H3A0834
-3A0828:t2:H3A08A4,H3A08AC
-3A08AC:lI97|H3A0930
-3A0930:lI112|H3A09B4
-3A09B4:lI112|H3A0A40
-3A0A40:lI108|H3A0ADC
-3A0ADC:lI105|H3A0B80
-3A0B80:lI99|H3A0C2C
-3A0C2C:lI97|H3A0CE8
-3A0CE8:lI116|H3A0D9C
-3A0D9C:lI105|H3A0E50
-3A0E50:lI111|H3A0F04
-3A0F04:lI110|H3A0FC0
-3A0FC0:lI47|H3A108C
-3A108C:lI120|H3A1160
-3A1160:lI45|H3A122C
-3A122C:lI116|H3A12F8
-3A12F8:lI114|H3A13CC
-3A13CC:lI111|H3A14A8
-3A14A8:lI102|H3A157C
-3A157C:lI102|N
-3A08A4:lI116|H3A0928
-3A0928:lI114|N
-3A0834:lH3A08B4|H3A08C0
-3A08B4:t2:H3A0938,H3A0940
-3A0940:lI97|H3A09C4
-3A09C4:lI112|H3A0A50
-3A0A50:lI112|H3A0AEC
-3A0AEC:lI108|H3A0B88
-3A0B88:lI105|H3A0C34
-3A0C34:lI99|H3A0CF0
-3A0CF0:lI97|H3A0DA4
-3A0DA4:lI116|H3A0E58
-3A0E58:lI105|H3A0F0C
-3A0F0C:lI111|H3A0FC8
-3A0FC8:lI110|H3A1094
-3A1094:lI47|H3A1168
-3A1168:lI120|H3A1234
-3A1234:lI45|H3A1300
-3A1300:lI116|H3A13D4
-3A13D4:lI114|H3A14B0
-3A14B0:lI111|H3A1584
-3A1584:lI102|H3A1650
-3A1650:lI102|N
-3A0938:lI114|H3A09BC
-3A09BC:lI111|H3A0A48
-3A0A48:lI102|H3A0AE4
-3A0AE4:lI102|N
-3A08C0:lH3A0948|H3A0954
-3A0948:t2:H3A09CC,H3A09D4
-3A09D4:lI97|H3A0A60
-3A0A60:lI112|H3A0AFC
-3A0AFC:lI112|H3A0B98
-3A0B98:lI108|H3A0C44
-3A0C44:lI105|H3A0D00
-3A0D00:lI99|H3A0DB4
-3A0DB4:lI97|H3A0E60
-3A0E60:lI116|H3A0F14
-3A0F14:lI105|H3A0FD0
-3A0FD0:lI111|H3A109C
-3A109C:lI110|H3A1170
-3A1170:lI47|H3A123C
-3A123C:lI120|H3A1308
-3A1308:lI45|H3A13DC
-3A13DC:lI116|H3A14B8
-3A14B8:lI101|H3A158C
-3A158C:lI120|H3A1658
-3A1658:lI105|H3A1724
-3A1724:lI110|H3A17E8
-3A17E8:lI102|H3A18AC
-3A18AC:lI111|N
-3A09CC:lI116|H3A0A58
-3A0A58:lI101|H3A0AF4
-3A0AF4:lI120|H3A0B90
-3A0B90:lI105|H3A0C3C
-3A0C3C:lI110|H3A0CF8
-3A0CF8:lI102|H3A0DAC
-3A0DAC:lI111|N
-3A0954:lH3A09DC|H3A09E8
-3A09DC:t2:H3A0A68,H3A0A70
-3A0A70:lI97|H3A0B0C
-3A0B0C:lI112|H3A0BA8
-3A0BA8:lI112|H3A0C54
-3A0C54:lI108|H3A0D08
-3A0D08:lI105|H3A0DBC
-3A0DBC:lI99|H3A0E68
-3A0E68:lI97|H3A0F1C
-3A0F1C:lI116|H3A0FD8
-3A0FD8:lI105|H3A10A4
-3A10A4:lI111|H3A1178
-3A1178:lI110|H3A1244
-3A1244:lI47|H3A1310
-3A1310:lI120|H3A13E4
-3A13E4:lI45|H3A14C0
-3A14C0:lI116|H3A1594
-3A1594:lI101|H3A1660
-3A1660:lI120|H3A172C
-3A172C:lI105|H3A17F0
-3A17F0:lI110|H3A18B4
-3A18B4:lI102|H3A1970
-3A1970:lI111|N
-3A0A68:lI116|H3A0B04
-3A0B04:lI101|H3A0BA0
-3A0BA0:lI120|H3A0C4C
-3A0C4C:lI105|N
-3A09E8:lH3A0A78|H3A0A84
-3A0A78:t2:H3A0B14,H3A0B1C
-3A0B1C:lI97|H3A0BB8
-3A0BB8:lI112|H3A0C64
-3A0C64:lI112|H3A0D10
-3A0D10:lI108|H3A0DC4
-3A0DC4:lI105|H3A0E70
-3A0E70:lI99|H3A0F24
-3A0F24:lI97|H3A0FE0
-3A0FE0:lI116|H3A10AC
-3A10AC:lI105|H3A1180
-3A1180:lI111|H3A124C
-3A124C:lI110|H3A1318
-3A1318:lI47|H3A13EC
-3A13EC:lI120|H3A14C8
-3A14C8:lI45|H3A159C
-3A159C:lI116|H3A1668
-3A1668:lI101|H3A1734
-3A1734:lI120|N
-3A0B14:lI116|H3A0BB0
-3A0BB0:lI101|H3A0C5C
-3A0C5C:lI120|N
-3A0A84:lH3A0B24|H3A0B30
-3A0B24:t2:H3A0BC0,H3A0BC8
-3A0BC8:lI97|H3A0C74
-3A0C74:lI112|H3A0D20
-3A0D20:lI112|H3A0DCC
-3A0DCC:lI108|H3A0E78
-3A0E78:lI105|H3A0F2C
-3A0F2C:lI99|H3A0FE8
-3A0FE8:lI97|H3A10B4
-3A10B4:lI116|H3A1188
-3A1188:lI105|H3A1254
-3A1254:lI111|H3A1320
-3A1320:lI110|H3A13F4
-3A13F4:lI47|H3A14D0
-3A14D0:lI120|H3A15A4
-3A15A4:lI45|H3A1670
-3A1670:lI116|H3A173C
-3A173C:lI99|H3A17F8
-3A17F8:lI108|N
-3A0BC0:lI116|H3A0C6C
-3A0C6C:lI99|H3A0D18
-3A0D18:lI108|N
-3A0B30:lH3A0BD0|H3A0BDC
-3A0BD0:t2:H3A0C7C,H3A0C84
-3A0C84:lI97|H3A0D30
-3A0D30:lI112|H3A0DDC
-3A0DDC:lI112|H3A0E80
-3A0E80:lI108|H3A0F34
-3A0F34:lI105|H3A0FF0
-3A0FF0:lI99|H3A10BC
-3A10BC:lI97|H3A1190
-3A1190:lI116|H3A125C
-3A125C:lI105|H3A1328
-3A1328:lI111|H3A13FC
-3A13FC:lI110|H3A14D8
-3A14D8:lI47|H3A15AC
-3A15AC:lI120|H3A1678
-3A1678:lI45|H3A1744
-3A1744:lI116|H3A1800
-3A1800:lI97|H3A18BC
-3A18BC:lI114|N
-3A0C7C:lI116|H3A0D28
-3A0D28:lI97|H3A0DD4
-3A0DD4:lI114|N
-3A0BDC:lH3A0C8C|H3A0C98
-3A0C8C:t2:H3A0D38,H3A0D40
-3A0D40:lI97|H3A0DEC
-3A0DEC:lI112|H3A0E90
-3A0E90:lI112|H3A0F44
-3A0F44:lI108|H3A1000
-3A1000:lI105|H3A10CC
-3A10CC:lI99|H3A1198
-3A1198:lI97|H3A1264
-3A1264:lI116|H3A1330
-3A1330:lI105|H3A1404
-3A1404:lI111|H3A14E0
-3A14E0:lI110|H3A15B4
-3A15B4:lI47|H3A1680
-3A1680:lI120|H3A174C
-3A174C:lI45|H3A1808
-3A1808:lI115|H3A18C4
-3A18C4:lI118|H3A1978
-3A1978:lI52|H3A1A2C
-3A1A2C:lI99|H3A1AE0
-3A1AE0:lI114|H3A1BA4
-3A1BA4:lI99|N
-3A0D38:lI115|H3A0DE4
-3A0DE4:lI118|H3A0E88
-3A0E88:lI52|H3A0F3C
-3A0F3C:lI99|H3A0FF8
-3A0FF8:lI114|H3A10C4
-3A10C4:lI99|N
-3A0C98:lH3A0D48|H3A0D54
-3A0D48:t2:H3A0DF4,H3A0DFC
-3A0DFC:lI97|H3A0EA0
-3A0EA0:lI112|H3A0F54
-3A0F54:lI112|H3A1010
-3A1010:lI108|H3A10DC
-3A10DC:lI105|H3A11A8
-3A11A8:lI99|H3A1274
-3A1274:lI97|H3A1338
-3A1338:lI116|H3A140C
-3A140C:lI105|H3A14E8
-3A14E8:lI111|H3A15BC
-3A15BC:lI110|H3A1688
-3A1688:lI47|H3A1754
-3A1754:lI120|H3A1810
-3A1810:lI45|H3A18CC
-3A18CC:lI115|H3A1980
-3A1980:lI118|H3A1A34
-3A1A34:lI52|H3A1AE8
-3A1AE8:lI99|H3A1BAC
-3A1BAC:lI112|H3A1C78
-3A1C78:lI105|H3A1D3C
-3A1D3C:lI111|N
-3A0DF4:lI115|H3A0E98
-3A0E98:lI118|H3A0F4C
-3A0F4C:lI52|H3A1008
-3A1008:lI99|H3A10D4
-3A10D4:lI112|H3A11A0
-3A11A0:lI105|H3A126C
-3A126C:lI111|N
-3A0D54:lH3A0E04|H3A0E10
-3A0E04:t2:H3A0EA8,H3A0EB0
-3A0EB0:lI97|H3A0F64
-3A0F64:lI112|H3A1020
-3A1020:lI112|H3A10E4
-3A10E4:lI108|H3A11B0
-3A11B0:lI105|H3A127C
-3A127C:lI99|H3A1340
-3A1340:lI97|H3A1414
-3A1414:lI116|H3A14F0
-3A14F0:lI105|H3A15C4
-3A15C4:lI111|H3A1690
-3A1690:lI110|H3A175C
-3A175C:lI47|H3A1818
-3A1818:lI120|H3A18D4
-3A18D4:lI45|H3A1988
-3A1988:lI115|H3A1A3C
-3A1A3C:lI116|H3A1AF0
-3A1AF0:lI117|H3A1BB4
-3A1BB4:lI102|H3A1C80
-3A1C80:lI102|H3A1D44
-3A1D44:lI105|H3A1E00
-3A1E00:lI116|N
-3A0EA8:lI115|H3A0F5C
-3A0F5C:lI105|H3A1018
-3A1018:lI116|N
-3A0E10:lH3A0EB8|H3A0EC4
-3A0EB8:t2:H3A0F6C,H3A0F74
-3A0F74:lI97|H3A1030
-3A1030:lI112|H3A10F4
-3A10F4:lI112|H3A11C0
-3A11C0:lI108|H3A1284
-3A1284:lI105|H3A1348
-3A1348:lI99|H3A141C
-3A141C:lI97|H3A14F8
-3A14F8:lI116|H3A15CC
-3A15CC:lI105|H3A1698
-3A1698:lI111|H3A1764
-3A1764:lI110|H3A1820
-3A1820:lI47|H3A18DC
-3A18DC:lI120|H3A1990
-3A1990:lI45|H3A1A44
-3A1A44:lI115|H3A1AF8
-3A1AF8:lI104|H3A1BBC
-3A1BBC:lI97|H3A1C88
-3A1C88:lI114|N
-3A0F6C:lI115|H3A1028
-3A1028:lI104|H3A10EC
-3A10EC:lI97|H3A11B8
-3A11B8:lI114|N
-3A0EC4:lH3A0F7C|H3A0F88
-3A0F7C:t2:H3A1038,H3A1040
-3A1040:lI97|H3A1104
-3A1104:lI112|H3A11C8
-3A11C8:lI112|H3A128C
-3A128C:lI108|H3A1350
-3A1350:lI105|H3A1424
-3A1424:lI99|H3A1500
-3A1500:lI97|H3A15D4
-3A15D4:lI116|H3A16A0
-3A16A0:lI105|H3A176C
-3A176C:lI111|H3A1828
-3A1828:lI110|H3A18E4
-3A18E4:lI47|H3A1998
-3A1998:lI120|H3A1A4C
-3A1A4C:lI45|H3A1B00
-3A1B00:lI115|H3A1BC4
-3A1BC4:lI104|N
-3A1038:lI115|H3A10FC
-3A10FC:lI104|N
-3A0F88:lH3A1048|H3A1054
-3A1048:t2:H3A110C,H3A1114
-3A1114:lI97|H3A11D8
-3A11D8:lI112|H3A1294
-3A1294:lI112|H3A1358
-3A1358:lI108|H3A142C
-3A142C:lI105|H3A1508
-3A1508:lI99|H3A15DC
-3A15DC:lI97|H3A16A8
-3A16A8:lI116|H3A1774
-3A1774:lI105|H3A1830
-3A1830:lI111|H3A18EC
-3A18EC:lI110|H3A19A0
-3A19A0:lI47|H3A1A54
-3A1A54:lI120|H3A1B08
-3A1B08:lI45|H3A1BCC
-3A1BCC:lI110|H3A1C90
-3A1C90:lI101|H3A1D4C
-3A1D4C:lI116|H3A1E08
-3A1E08:lI99|H3A1EC4
-3A1EC4:lI100|H3A1F88
-3A1F88:lI102|N
-3A110C:lI110|H3A11D0
-3A11D0:lI99|N
-3A1054:lH3A111C|H3A1128
-3A111C:t2:H3A11E0,H3A11E8
-3A11E8:lI97|H3A12A4
-3A12A4:lI112|H3A1368
-3A1368:lI112|H3A1434
-3A1434:lI108|H3A1510
-3A1510:lI105|H3A15E4
-3A15E4:lI99|H3A16B0
-3A16B0:lI97|H3A177C
-3A177C:lI116|H3A1838
-3A1838:lI105|H3A18F4
-3A18F4:lI111|H3A19A8
-3A19A8:lI110|H3A1A5C
-3A1A5C:lI47|H3A1B10
-3A1B10:lI120|H3A1BD4
-3A1BD4:lI45|H3A1C98
-3A1C98:lI110|H3A1D54
-3A1D54:lI101|H3A1E10
-3A1E10:lI116|H3A1ECC
-3A1ECC:lI99|H3A1F90
-3A1F90:lI100|H3A2044
-3A2044:lI102|N
-3A11E0:lI99|H3A129C
-3A129C:lI100|H3A1360
-3A1360:lI102|N
-3A1128:lH3A11F0|H3A11FC
-3A11F0:t2:H3A12AC,H3A12B4
-3A12B4:lI97|H3A1378
-3A1378:lI112|H3A1444
-3A1444:lI112|H3A1518
-3A1518:lI108|H3A15EC
-3A15EC:lI105|H3A16B8
-3A16B8:lI99|H3A1784
-3A1784:lI97|H3A1840
-3A1840:lI116|H3A18FC
-3A18FC:lI105|H3A19B0
-3A19B0:lI111|H3A1A64
-3A1A64:lI110|H3A1B18
-3A1B18:lI47|H3A1BDC
-3A1BDC:lI120|H3A1CA0
-3A1CA0:lI45|H3A1D5C
-3A1D5C:lI109|H3A1E18
-3A1E18:lI105|H3A1ED4
-3A1ED4:lI102|N
-3A12AC:lI109|H3A1370
-3A1370:lI105|H3A143C
-3A143C:lI102|N
-3A11FC:lH3A12BC|H3A12C8
-3A12BC:t2:H3A1380,H3A1388
-3A1388:lI97|H3A1454
-3A1454:lI112|H3A1528
-3A1528:lI112|H3A15FC
-3A15FC:lI108|H3A16C8
-3A16C8:lI105|H3A178C
-3A178C:lI99|H3A1848
-3A1848:lI97|H3A1904
-3A1904:lI116|H3A19B8
-3A19B8:lI105|H3A1A6C
-3A1A6C:lI111|H3A1B20
-3A1B20:lI110|H3A1BE4
-3A1BE4:lI47|H3A1CA8
-3A1CA8:lI120|H3A1D64
-3A1D64:lI45|H3A1E20
-3A1E20:lI108|H3A1EDC
-3A1EDC:lI97|H3A1F98
-3A1F98:lI116|H3A204C
-3A204C:lI101|H3A2108
-3A2108:lI120|N
-3A1380:lI108|H3A144C
-3A144C:lI97|H3A1520
-3A1520:lI116|H3A15F4
-3A15F4:lI101|H3A16C0
-3A16C0:lI120|N
-3A12C8:lH3A1390|H3A139C
-3A1390:t2:H3A145C,H3A1464
-3A1464:lI97|H3A1538
-3A1538:lI112|H3A160C
-3A160C:lI112|H3A16D0
-3A16D0:lI108|H3A1794
-3A1794:lI105|H3A1850
-3A1850:lI99|H3A190C
-3A190C:lI97|H3A19C0
-3A19C0:lI116|H3A1A74
-3A1A74:lI105|H3A1B28
-3A1B28:lI111|H3A1BEC
-3A1BEC:lI110|H3A1CB0
-3A1CB0:lI47|H3A1D6C
-3A1D6C:lI120|H3A1E28
-3A1E28:lI45|H3A1EE4
-3A1EE4:lI107|H3A1FA0
-3A1FA0:lI111|H3A2054
-3A2054:lI97|H3A2110
-3A2110:lI110|N
-3A145C:lI115|H3A1530
-3A1530:lI107|H3A1604
-3A1604:lI112|N
-3A139C:lH3A146C|H3A1478
-3A146C:t2:H3A1540,H3A1548
-3A1548:lI97|H3A161C
-3A161C:lI112|H3A16E0
-3A16E0:lI112|H3A179C
-3A179C:lI108|H3A1858
-3A1858:lI105|H3A1914
-3A1914:lI99|H3A19C8
-3A19C8:lI97|H3A1A7C
-3A1A7C:lI116|H3A1B30
-3A1B30:lI105|H3A1BF4
-3A1BF4:lI111|H3A1CB8
-3A1CB8:lI110|H3A1D74
-3A1D74:lI47|H3A1E30
-3A1E30:lI120|H3A1EEC
-3A1EEC:lI45|H3A1FA8
-3A1FA8:lI107|H3A205C
-3A205C:lI111|H3A2118
-3A2118:lI97|H3A21CC
-3A21CC:lI110|N
-3A1540:lI115|H3A1614
-3A1614:lI107|H3A16D8
-3A16D8:lI100|N
-3A1478:lH3A1550|H3A155C
-3A1550:t2:H3A1624,H3A162C
-3A162C:lI97|H3A16F0
-3A16F0:lI112|H3A17AC
-3A17AC:lI112|H3A1860
-3A1860:lI108|H3A191C
-3A191C:lI105|H3A19D0
-3A19D0:lI99|H3A1A84
-3A1A84:lI97|H3A1B38
-3A1B38:lI116|H3A1BFC
-3A1BFC:lI105|H3A1CC0
-3A1CC0:lI111|H3A1D7C
-3A1D7C:lI110|H3A1E38
-3A1E38:lI47|H3A1EF4
-3A1EF4:lI120|H3A1FB0
-3A1FB0:lI45|H3A2064
-3A2064:lI107|H3A2120
-3A2120:lI111|H3A21D4
-3A21D4:lI97|H3A2288
-3A2288:lI110|N
-3A1624:lI115|H3A16E8
-3A16E8:lI107|H3A17A4
-3A17A4:lI116|N
-3A155C:lH3A1634|H3A1640
-3A1634:t2:H3A16F8,H3A1700
-3A1700:lI97|H3A17BC
-3A17BC:lI112|H3A1870
-3A1870:lI112|H3A1924
-3A1924:lI108|H3A19D8
-3A19D8:lI105|H3A1A8C
-3A1A8C:lI99|H3A1B40
-3A1B40:lI97|H3A1C04
-3A1C04:lI116|H3A1CC8
-3A1CC8:lI105|H3A1D84
-3A1D84:lI111|H3A1E40
-3A1E40:lI110|H3A1EFC
-3A1EFC:lI47|H3A1FB8
-3A1FB8:lI120|H3A206C
-3A206C:lI45|H3A2128
-3A2128:lI107|H3A21DC
-3A21DC:lI111|H3A2290
-3A2290:lI97|H3A234C
-3A234C:lI110|N
-3A16F8:lI115|H3A17B4
-3A17B4:lI107|H3A1868
-3A1868:lI109|N
-3A1640:lH3A1708|H3A1714
-3A1708:t2:H3A17C4,H3A17CC
-3A17CC:lI97|H3A1880
-3A1880:lI112|H3A1934
-3A1934:lI112|H3A19E0
-3A19E0:lI108|H3A1A94
-3A1A94:lI105|H3A1B48
-3A1B48:lI99|H3A1C0C
-3A1C0C:lI97|H3A1CD0
-3A1CD0:lI116|H3A1D8C
-3A1D8C:lI105|H3A1E48
-3A1E48:lI111|H3A1F04
-3A1F04:lI110|H3A1FC0
-3A1FC0:lI47|H3A2074
-3A2074:lI120|H3A2130
-3A2130:lI45|H3A21E4
-3A21E4:lI104|H3A2298
-3A2298:lI116|H3A2354
-3A2354:lI116|H3A2410
-3A2410:lI112|H3A24C4
-3A24C4:lI100|H3A2580
-3A2580:lI45|H3A263C
-3A263C:lI99|H3A2700
-3A2700:lI103|H3A27BC
-3A27BC:lI105|N
-3A17C4:lI99|H3A1878
-3A1878:lI103|H3A192C
-3A192C:lI105|N
-3A1714:lH3A17D4|H3A17E0
-3A17D4:t2:H3A1888,H3A1890
-3A1890:lI97|H3A1944
-3A1944:lI112|H3A19F0
-3A19F0:lI112|H3A1A9C
-3A1A9C:lI108|H3A1B50
-3A1B50:lI105|H3A1C14
-3A1C14:lI99|H3A1CD8
-3A1CD8:lI97|H3A1D94
-3A1D94:lI116|H3A1E50
-3A1E50:lI105|H3A1F0C
-3A1F0C:lI111|H3A1FC8
-3A1FC8:lI110|H3A207C
-3A207C:lI47|H3A2138
-3A2138:lI120|H3A21EC
-3A21EC:lI45|H3A22A0
-3A22A0:lI104|H3A235C
-3A235C:lI100|H3A2418
-3A2418:lI102|N
-3A1888:lI104|H3A193C
-3A193C:lI100|H3A19E8
-3A19E8:lI102|N
-3A17E0:lH3A1898|H3A18A4
-3A1898:t2:H3A194C,H3A1954
-3A1954:lI97|H3A1A00
-3A1A00:lI112|H3A1AA4
-3A1AA4:lI112|H3A1B58
-3A1B58:lI108|H3A1C1C
-3A1C1C:lI105|H3A1CE0
-3A1CE0:lI99|H3A1D9C
-3A1D9C:lI97|H3A1E58
-3A1E58:lI116|H3A1F14
-3A1F14:lI105|H3A1FD0
-3A1FD0:lI111|H3A2084
-3A2084:lI110|H3A2140
-3A2140:lI47|H3A21F4
-3A21F4:lI120|H3A22A8
-3A22A8:lI45|H3A2364
-3A2364:lI103|H3A2420
-3A2420:lI122|H3A24CC
-3A24CC:lI105|H3A2588
-3A2588:lI112|N
-3A194C:lI103|H3A19F8
-3A19F8:lI122|N
-3A18A4:lH3A195C|H3A1968
-3A195C:t2:H3A1A08,H3A1A10
-3A1A10:lI97|H3A1AB4
-3A1AB4:lI112|H3A1B68
-3A1B68:lI112|H3A1C2C
-3A1C2C:lI108|H3A1CE8
-3A1CE8:lI105|H3A1DA4
-3A1DA4:lI99|H3A1E60
-3A1E60:lI97|H3A1F1C
-3A1F1C:lI116|H3A1FD8
-3A1FD8:lI105|H3A208C
-3A208C:lI111|H3A2148
-3A2148:lI110|H3A21FC
-3A21FC:lI47|H3A22B0
-3A22B0:lI120|H3A236C
-3A236C:lI45|H3A2428
-3A2428:lI103|H3A24D4
-3A24D4:lI116|H3A2590
-3A2590:lI97|H3A2644
-3A2644:lI114|N
-3A1A08:lI103|H3A1AAC
-3A1AAC:lI116|H3A1B60
-3A1B60:lI97|H3A1C24
-3A1C24:lI114|N
-3A1968:lH3A1A18|H3A1A24
-3A1A18:t2:H3A1ABC,H3A1AC4
-3A1AC4:lI97|H3A1B78
-3A1B78:lI112|H3A1C3C
-3A1C3C:lI112|H3A1CF0
-3A1CF0:lI108|H3A1DAC
-3A1DAC:lI105|H3A1E68
-3A1E68:lI99|H3A1F24
-3A1F24:lI97|H3A1FE0
-3A1FE0:lI116|H3A2094
-3A2094:lI105|H3A2150
-3A2150:lI111|H3A2204
-3A2204:lI110|H3A22B8
-3A22B8:lI47|H3A2374
-3A2374:lI120|H3A2430
-3A2430:lI45|H3A24DC
-3A24DC:lI100|H3A2598
-3A2598:lI118|H3A264C
-3A264C:lI105|N
-3A1ABC:lI100|H3A1B70
-3A1B70:lI118|H3A1C34
-3A1C34:lI105|N
-3A1A24:lH3A1ACC|H3A1AD8
-3A1ACC:t2:H3A1B80,H3A1B88
-3A1B88:lI97|H3A1C4C
-3A1C4C:lI112|H3A1D00
-3A1D00:lI112|H3A1DB4
-3A1DB4:lI108|H3A1E70
-3A1E70:lI105|H3A1F2C
-3A1F2C:lI99|H3A1FE8
-3A1FE8:lI97|H3A209C
-3A209C:lI116|H3A2158
-3A2158:lI105|H3A220C
-3A220C:lI111|H3A22C0
-3A22C0:lI110|H3A237C
-3A237C:lI47|H3A2438
-3A2438:lI120|H3A24E4
-3A24E4:lI45|H3A25A0
-3A25A0:lI100|H3A2654
-3A2654:lI105|H3A2708
-3A2708:lI114|H3A27C4
-3A27C4:lI101|H3A2880
-3A2880:lI99|H3A2944
-3A2944:lI116|H3A2A10
-3A2A10:lI111|H3A2ADC
-3A2ADC:lI114|N
-3A1B80:lI100|H3A1C44
-3A1C44:lI99|H3A1CF8
-3A1CF8:lI114|N
-3A1AD8:lH3A1B90|H3A1B9C
-3A1B90:t2:H3A1C54,H3A1C5C
-3A1C5C:lI97|H3A1D10
-3A1D10:lI112|H3A1DC4
-3A1DC4:lI112|H3A1E78
-3A1E78:lI108|H3A1F34
-3A1F34:lI105|H3A1FF0
-3A1FF0:lI99|H3A20A4
-3A20A4:lI97|H3A2160
-3A2160:lI116|H3A2214
-3A2214:lI105|H3A22C8
-3A22C8:lI111|H3A2384
-3A2384:lI110|H3A2440
-3A2440:lI47|H3A24EC
-3A24EC:lI120|H3A25A8
-3A25A8:lI45|H3A265C
-3A265C:lI100|H3A2710
-3A2710:lI105|H3A27CC
-3A27CC:lI114|H3A2888
-3A2888:lI101|H3A294C
-3A294C:lI99|H3A2A18
-3A2A18:lI116|H3A2AE4
-3A2AE4:lI111|H3A2BB0
-3A2BB0:lI114|N
-3A1C54:lI100|H3A1D08
-3A1D08:lI105|H3A1DBC
-3A1DBC:lI114|N
-3A1B9C:lH3A1C64|H3A1C70
-3A1C64:t2:H3A1D18,H3A1D20
-3A1D20:lI97|H3A1DD4
-3A1DD4:lI112|H3A1E88
-3A1E88:lI112|H3A1F3C
-3A1F3C:lI108|H3A1FF8
-3A1FF8:lI105|H3A20AC
-3A20AC:lI99|H3A2168
-3A2168:lI97|H3A221C
-3A221C:lI116|H3A22D0
-3A22D0:lI105|H3A238C
-3A238C:lI111|H3A2448
-3A2448:lI110|H3A24F4
-3A24F4:lI47|H3A25B0
-3A25B0:lI120|H3A2664
-3A2664:lI45|H3A2718
-3A2718:lI100|H3A27D4
-3A27D4:lI105|H3A2890
-3A2890:lI114|H3A2954
-3A2954:lI101|H3A2A20
-3A2A20:lI99|H3A2AEC
-3A2AEC:lI116|H3A2BB8
-3A2BB8:lI111|H3A2C74
-3A2C74:lI114|N
-3A1D18:lI100|H3A1DCC
-3A1DCC:lI120|H3A1E80
-3A1E80:lI114|N
-3A1C70:lH3A1D28|H3A1D34
-3A1D28:t2:H3A1DDC,H3A1DE4
-3A1DE4:lI97|H3A1E98
-3A1E98:lI112|H3A1F4C
-3A1F4C:lI112|H3A2000
-3A2000:lI108|H3A20B4
-3A20B4:lI105|H3A2170
-3A2170:lI99|H3A2224
-3A2224:lI97|H3A22D8
-3A22D8:lI116|H3A2394
-3A2394:lI105|H3A2450
-3A2450:lI111|H3A24FC
-3A24FC:lI110|H3A25B8
-3A25B8:lI47|H3A266C
-3A266C:lI120|H3A2720
-3A2720:lI45|H3A27DC
-3A27DC:lI99|H3A2898
-3A2898:lI115|H3A295C
-3A295C:lI104|N
-3A1DDC:lI99|H3A1E90
-3A1E90:lI115|H3A1F44
-3A1F44:lI104|N
-3A1D34:lH3A1DEC|H3A1DF8
-3A1DEC:t2:H3A1EA0,H3A1EA8
-3A1EA8:lI97|H3A1F5C
-3A1F5C:lI112|H3A2010
-3A2010:lI112|H3A20C4
-3A20C4:lI108|H3A2178
-3A2178:lI105|H3A222C
-3A222C:lI99|H3A22E0
-3A22E0:lI97|H3A239C
-3A239C:lI116|H3A2458
-3A2458:lI105|H3A2504
-3A2504:lI111|H3A25C0
-3A25C0:lI110|H3A2674
-3A2674:lI47|H3A2728
-3A2728:lI120|H3A27E4
-3A27E4:lI45|H3A28A0
-3A28A0:lI99|H3A2964
-3A2964:lI112|H3A2A28
-3A2A28:lI105|H3A2AF4
-3A2AF4:lI111|N
-3A1EA0:lI99|H3A1F54
-3A1F54:lI112|H3A2008
-3A2008:lI105|H3A20BC
-3A20BC:lI111|N
-3A1DF8:lH3A1EB0|H3A1EBC
-3A1EB0:t2:H3A1F64,H3A1F6C
-3A1F6C:lI97|H3A2018
-3A2018:lI112|H3A20CC
-3A20CC:lI112|H3A2180
-3A2180:lI108|H3A2234
-3A2234:lI105|H3A22E8
-3A22E8:lI99|H3A23A4
-3A23A4:lI97|H3A2460
-3A2460:lI116|H3A250C
-3A250C:lI105|H3A25C8
-3A25C8:lI111|H3A267C
-3A267C:lI110|H3A2730
-3A2730:lI47|H3A27EC
-3A27EC:lI120|H3A28A8
-3A28A8:lI45|H3A296C
-3A296C:lI99|H3A2A30
-3A2A30:lI111|H3A2AFC
-3A2AFC:lI109|H3A2BC0
-3A2BC0:lI112|H3A2C7C
-3A2C7C:lI114|H3A2D2C
-3A2D2C:lI101|H3A2DD4
-3A2DD4:lI115|H3A2E6C
-3A2E6C:lI115|N
-3A1F64:lI90|N
-3A1EBC:lH3A1F74|H3A1F80
-3A1F74:t2:H3A2020,H3A2028
-3A2028:lI97|H3A20DC
-3A20DC:lI112|H3A2190
-3A2190:lI112|H3A223C
-3A223C:lI108|H3A22F0
-3A22F0:lI105|H3A23AC
-3A23AC:lI99|H3A2468
-3A2468:lI97|H3A2514
-3A2514:lI116|H3A25D0
-3A25D0:lI105|H3A2684
-3A2684:lI111|H3A2738
-3A2738:lI110|H3A27F4
-3A27F4:lI47|H3A28B0
-3A28B0:lI120|H3A2974
-3A2974:lI45|H3A2A38
-3A2A38:lI99|H3A2B04
-3A2B04:lI100|H3A2BC8
-3A2BC8:lI108|H3A2C84
-3A2C84:lI105|H3A2D34
-3A2D34:lI110|H3A2DDC
-3A2DDC:lI107|N
-3A2020:lI118|H3A20D4
-3A20D4:lI99|H3A2188
-3A2188:lI100|N
-3A1F80:lH3A2030|H3A203C
-3A2030:t2:H3A20E4,H3A20EC
-3A20EC:lI97|H3A21A0
-3A21A0:lI112|H3A224C
-3A224C:lI112|H3A2300
-3A2300:lI108|H3A23BC
-3A23BC:lI105|H3A2470
-3A2470:lI99|H3A251C
-3A251C:lI97|H3A25D8
-3A25D8:lI116|H3A268C
-3A268C:lI105|H3A2740
-3A2740:lI111|H3A27FC
-3A27FC:lI110|H3A28B8
-3A28B8:lI47|H3A297C
-3A297C:lI120|H3A2A40
-3A2A40:lI45|H3A2B0C
-3A2B0C:lI98|H3A2BD0
-3A2BD0:lI99|H3A2C8C
-3A2C8C:lI112|H3A2D3C
-3A2D3C:lI105|H3A2DE4
-3A2DE4:lI111|N
-3A20E4:lI98|H3A2198
-3A2198:lI99|H3A2244
-3A2244:lI112|H3A22F8
-3A22F8:lI105|H3A23B4
-3A23B4:lI111|N
-3A203C:lH3A20F4|H3A2100
-3A20F4:t2:H3A21A8,H3A21B0
-3A21B0:lI97|H3A225C
-3A225C:lI112|H3A2310
-3A2310:lI112|H3A23C4
-3A23C4:lI108|H3A2478
-3A2478:lI105|H3A2524
-3A2524:lI99|H3A25E0
-3A25E0:lI97|H3A2694
-3A2694:lI116|H3A2748
-3A2748:lI105|H3A2804
-3A2804:lI111|H3A28C0
-3A28C0:lI110|H3A2984
-3A2984:lI47|H3A2A48
-3A2A48:lI114|H3A2B14
-3A2B14:lI116|H3A2BD8
-3A2BD8:lI102|N
-3A21A8:lI114|H3A2254
-3A2254:lI116|H3A2308
-3A2308:lI102|N
-3A2100:lH3A21B8|H3A21C4
-3A21B8:t2:H3A2264,H3A226C
-3A226C:lI97|H3A2320
-3A2320:lI112|H3A23D4
-3A23D4:lI112|H3A2480
-3A2480:lI108|H3A252C
-3A252C:lI105|H3A25E8
-3A25E8:lI99|H3A269C
-3A269C:lI97|H3A2750
-3A2750:lI116|H3A280C
-3A280C:lI105|H3A28C8
-3A28C8:lI111|H3A298C
-3A298C:lI110|H3A2A50
-3A2A50:lI47|H3A2B1C
-3A2B1C:lI112|H3A2BE0
-3A2BE0:lI111|H3A2C94
-3A2C94:lI119|H3A2D44
-3A2D44:lI101|H3A2DEC
-3A2DEC:lI114|H3A2E74
-3A2E74:lI112|H3A2EEC
-3A2EEC:lI111|H3A2F64
-3A2F64:lI105|H3A2FD4
-3A2FD4:lI110|H3A303C
-3A303C:lI116|N
-3A2264:lI112|H3A2318
-3A2318:lI112|H3A23CC
-3A23CC:lI116|N
-3A21C4:lH3A2274|H3A2280
-3A2274:t2:H3A2328,H3A2330
-3A2330:lI97|H3A23E4
-3A23E4:lI112|H3A2488
-3A2488:lI112|H3A2534
-3A2534:lI108|H3A25F0
-3A25F0:lI105|H3A26A4
-3A26A4:lI99|H3A2758
-3A2758:lI97|H3A2814
-3A2814:lI116|H3A28D0
-3A28D0:lI105|H3A2994
-3A2994:lI111|H3A2A58
-3A2A58:lI110|H3A2B24
-3A2B24:lI47|H3A2BE8
-3A2BE8:lI112|H3A2C9C
-3A2C9C:lI111|H3A2D4C
-3A2D4C:lI115|H3A2DF4
-3A2DF4:lI116|H3A2E7C
-3A2E7C:lI115|H3A2EF4
-3A2EF4:lI99|H3A2F6C
-3A2F6C:lI114|H3A2FDC
-3A2FDC:lI105|H3A3044
-3A3044:lI112|H3A30A4
-3A30A4:lI116|N
-3A2328:lI97|H3A23DC
-3A23DC:lI105|N
-3A2280:lH3A2338|H3A2344
-3A2338:t2:H3A23EC,H3A23F4
-3A23F4:lI97|H3A2498
-3A2498:lI112|H3A2544
-3A2544:lI112|H3A25F8
-3A25F8:lI108|H3A26AC
-3A26AC:lI105|H3A2760
-3A2760:lI99|H3A281C
-3A281C:lI97|H3A28D8
-3A28D8:lI116|H3A299C
-3A299C:lI105|H3A2A60
-3A2A60:lI111|H3A2B2C
-3A2B2C:lI110|H3A2BF0
-3A2BF0:lI47|H3A2CA4
-3A2CA4:lI112|H3A2D54
-3A2D54:lI111|H3A2DFC
-3A2DFC:lI115|H3A2E84
-3A2E84:lI116|H3A2EFC
-3A2EFC:lI115|H3A2F74
-3A2F74:lI99|H3A2FE4
-3A2FE4:lI114|H3A304C
-3A304C:lI105|H3A30AC
-3A30AC:lI112|H3A3104
-3A3104:lI116|N
-3A23EC:lI101|H3A2490
-3A2490:lI112|H3A253C
-3A253C:lI115|N
-3A2344:lH3A23FC|H3A2408
-3A23FC:t2:H3A24A0,H3A24A8
-3A24A8:lI97|H3A2554
-3A2554:lI112|H3A2600
-3A2600:lI112|H3A26B4
-3A26B4:lI108|H3A2768
-3A2768:lI105|H3A2824
-3A2824:lI99|H3A28E0
-3A28E0:lI97|H3A29A4
-3A29A4:lI116|H3A2A68
-3A2A68:lI105|H3A2B34
-3A2B34:lI111|H3A2BF8
-3A2BF8:lI110|H3A2CAC
-3A2CAC:lI47|H3A2D5C
-3A2D5C:lI112|H3A2E04
-3A2E04:lI111|H3A2E8C
-3A2E8C:lI115|H3A2F04
-3A2F04:lI116|H3A2F7C
-3A2F7C:lI115|H3A2FEC
-3A2FEC:lI99|H3A3054
-3A3054:lI114|H3A30B4
-3A30B4:lI105|H3A310C
-3A310C:lI112|H3A315C
-3A315C:lI116|N
-3A24A0:lI112|H3A254C
-3A254C:lI115|N
-3A2408:lH3A24B0|H3A24BC
-3A24B0:t2:H3A255C,H3A2564
-3A2564:lI97|H3A2610
-3A2610:lI112|H3A26C4
-3A26C4:lI112|H3A2770
-3A2770:lI108|H3A282C
-3A282C:lI105|H3A28E8
-3A28E8:lI99|H3A29AC
-3A29AC:lI97|H3A2A70
-3A2A70:lI116|H3A2B3C
-3A2B3C:lI105|H3A2C00
-3A2C00:lI111|H3A2CB4
-3A2CB4:lI110|H3A2D64
-3A2D64:lI47|H3A2E0C
-3A2E0C:lI112|H3A2E94
-3A2E94:lI100|H3A2F0C
-3A2F0C:lI102|N
-3A255C:lI112|H3A2608
-3A2608:lI100|H3A26BC
-3A26BC:lI102|N
-3A24BC:lH3A256C|H3A2578
-3A256C:t2:H3A2618,H3A2620
-3A2620:lI97|H3A26D4
-3A26D4:lI112|H3A2780
-3A2780:lI112|H3A2834
-3A2834:lI108|H3A28F0
-3A28F0:lI105|H3A29B4
-3A29B4:lI99|H3A2A78
-3A2A78:lI97|H3A2B44
-3A2B44:lI116|H3A2C08
-3A2C08:lI105|H3A2CBC
-3A2CBC:lI111|H3A2D6C
-3A2D6C:lI110|H3A2E14
-3A2E14:lI47|H3A2E9C
-3A2E9C:lI111|H3A2F14
-3A2F14:lI100|H3A2F84
-3A2F84:lI97|N
-3A2618:lI111|H3A26CC
-3A26CC:lI100|H3A2778
-3A2778:lI97|N
-3A2578:lH3A2628|H3A2634
-3A2628:t2:H3A26DC,H3A26E4
-3A26E4:lI97|H3A2790
-3A2790:lI112|H3A2844
-3A2844:lI112|H3A28F8
-3A28F8:lI108|H3A29BC
-3A29BC:lI105|H3A2A80
-3A2A80:lI99|H3A2B4C
-3A2B4C:lI97|H3A2C10
-3A2C10:lI116|H3A2CC4
-3A2CC4:lI105|H3A2D74
-3A2D74:lI111|H3A2E1C
-3A2E1C:lI110|H3A2EA4
-3A2EA4:lI47|H3A2F1C
-3A2F1C:lI111|H3A2F8C
-3A2F8C:lI99|H3A2FF4
-3A2FF4:lI116|H3A305C
-3A305C:lI101|H3A30BC
-3A30BC:lI116|H3A3114
-3A3114:lI45|H3A3164
-3A3164:lI115|H3A31AC
-3A31AC:lI116|H3A31F4
-3A31F4:lI114|H3A323C
-3A323C:lI101|H3A3284
-3A3284:lI97|H3A32CC
-3A32CC:lI109|N
-3A26DC:lI98|H3A2788
-3A2788:lI105|H3A283C
-3A283C:lI110|N
-3A2634:lH3A26EC|H3A26F8
-3A26EC:t2:H3A2798,H3A27A0
-3A27A0:lI97|H3A2854
-3A2854:lI112|H3A2908
-3A2908:lI112|H3A29C4
-3A29C4:lI108|H3A2A88
-3A2A88:lI105|H3A2B54
-3A2B54:lI99|H3A2C18
-3A2C18:lI97|H3A2CCC
-3A2CCC:lI116|H3A2D7C
-3A2D7C:lI105|H3A2E24
-3A2E24:lI111|H3A2EAC
-3A2EAC:lI110|H3A2F24
-3A2F24:lI47|H3A2F94
-3A2F94:lI111|H3A2FFC
-3A2FFC:lI99|H3A3064
-3A3064:lI116|H3A30C4
-3A30C4:lI101|H3A311C
-3A311C:lI116|H3A316C
-3A316C:lI45|H3A31B4
-3A31B4:lI115|H3A31FC
-3A31FC:lI116|H3A3244
-3A3244:lI114|H3A328C
-3A328C:lI101|H3A32D4
-3A32D4:lI97|H3A3314
-3A3314:lI109|N
-3A2798:lI100|H3A284C
-3A284C:lI109|H3A2900
-3A2900:lI115|N
-3A26F8:lH3A27A8|H3A27B4
-3A27A8:t2:H3A285C,H3A2864
-3A2864:lI97|H3A2918
-3A2918:lI112|H3A29D4
-3A29D4:lI112|H3A2A90
-3A2A90:lI108|H3A2B5C
-3A2B5C:lI105|H3A2C20
-3A2C20:lI99|H3A2CD4
-3A2CD4:lI97|H3A2D84
-3A2D84:lI116|H3A2E2C
-3A2E2C:lI105|H3A2EB4
-3A2EB4:lI111|H3A2F2C
-3A2F2C:lI110|H3A2F9C
-3A2F9C:lI47|H3A3004
-3A3004:lI111|H3A306C
-3A306C:lI99|H3A30CC
-3A30CC:lI116|H3A3124
-3A3124:lI101|H3A3174
-3A3174:lI116|H3A31BC
-3A31BC:lI45|H3A3204
-3A3204:lI115|H3A324C
-3A324C:lI116|H3A3294
-3A3294:lI114|H3A32DC
-3A32DC:lI101|H3A331C
-3A331C:lI97|H3A334C
-3A334C:lI109|N
-3A285C:lI108|H3A2910
-3A2910:lI104|H3A29CC
-3A29CC:lI97|N
-3A27B4:lH3A286C|H3A2878
-3A286C:t2:H3A2920,H3A2928
-3A2928:lI97|H3A29E4
-3A29E4:lI112|H3A2AA0
-3A2AA0:lI112|H3A2B64
-3A2B64:lI108|H3A2C28
-3A2C28:lI105|H3A2CDC
-3A2CDC:lI99|H3A2D8C
-3A2D8C:lI97|H3A2E34
-3A2E34:lI116|H3A2EBC
-3A2EBC:lI105|H3A2F34
-3A2F34:lI111|H3A2FA4
-3A2FA4:lI110|H3A300C
-3A300C:lI47|H3A3074
-3A3074:lI111|H3A30D4
-3A30D4:lI99|H3A312C
-3A312C:lI116|H3A317C
-3A317C:lI101|H3A31C4
-3A31C4:lI116|H3A320C
-3A320C:lI45|H3A3254
-3A3254:lI115|H3A329C
-3A329C:lI116|H3A32E4
-3A32E4:lI114|H3A3324
-3A3324:lI101|H3A3354
-3A3354:lI97|H3A337C
-3A337C:lI109|N
-3A2920:lI108|H3A29DC
-3A29DC:lI122|H3A2A98
-3A2A98:lI104|N
-3A2878:lH3A2930|H3A293C
-3A2930:t2:H3A29EC,H3A29F4
-3A29F4:lI97|H3A2AB0
-3A2AB0:lI112|H3A2B74
-3A2B74:lI112|H3A2C30
-3A2C30:lI108|H3A2CE4
-3A2CE4:lI105|H3A2D94
-3A2D94:lI99|H3A2E3C
-3A2E3C:lI97|H3A2EC4
-3A2EC4:lI116|H3A2F3C
-3A2F3C:lI105|H3A2FAC
-3A2FAC:lI111|H3A3014
-3A3014:lI110|H3A307C
-3A307C:lI47|H3A30DC
-3A30DC:lI111|H3A3134
-3A3134:lI99|H3A3184
-3A3184:lI116|H3A31CC
-3A31CC:lI101|H3A3214
-3A3214:lI116|H3A325C
-3A325C:lI45|H3A32A4
-3A32A4:lI115|H3A32EC
-3A32EC:lI116|H3A332C
-3A332C:lI114|H3A335C
-3A335C:lI101|H3A3384
-3A3384:lI97|H3A33A4
-3A33A4:lI109|N
-3A29EC:lI101|H3A2AA8
-3A2AA8:lI120|H3A2B6C
-3A2B6C:lI101|N
-3A293C:lH3A29FC|H3A2A08
-3A29FC:t2:H3A2AB8,H3A2AC0
-3A2AC0:lI97|H3A2B84
-3A2B84:lI112|H3A2C40
-3A2C40:lI112|H3A2CF4
-3A2CF4:lI108|H3A2DA4
-3A2DA4:lI105|H3A2E44
-3A2E44:lI99|H3A2ECC
-3A2ECC:lI97|H3A2F44
-3A2F44:lI116|H3A2FB4
-3A2FB4:lI105|H3A301C
-3A301C:lI111|H3A3084
-3A3084:lI110|H3A30E4
-3A30E4:lI47|H3A313C
-3A313C:lI111|H3A318C
-3A318C:lI99|H3A31D4
-3A31D4:lI116|H3A321C
-3A321C:lI101|H3A3264
-3A3264:lI116|H3A32AC
-3A32AC:lI45|H3A32F4
-3A32F4:lI115|H3A3334
-3A3334:lI116|H3A3364
-3A3364:lI114|H3A338C
-3A338C:lI101|H3A33AC
-3A33AC:lI97|H3A33C4
-3A33C4:lI109|N
-3A2AB8:lI99|H3A2B7C
-3A2B7C:lI108|H3A2C38
-3A2C38:lI97|H3A2CEC
-3A2CEC:lI115|H3A2D9C
-3A2D9C:lI115|N
-3A2A08:lH3A2AC8|H3A2AD4
-3A2AC8:t2:H3A2B8C,H3A2B94
-3A2B94:lI97|H3A2C50
-3A2C50:lI112|H3A2D04
-3A2D04:lI112|H3A2DAC
-3A2DAC:lI108|H3A2E4C
-3A2E4C:lI105|H3A2ED4
-3A2ED4:lI99|H3A2F4C
-3A2F4C:lI97|H3A2FBC
-3A2FBC:lI116|H3A3024
-3A3024:lI105|H3A308C
-3A308C:lI111|H3A30EC
-3A30EC:lI110|H3A3144
-3A3144:lI47|H3A3194
-3A3194:lI109|H3A31DC
-3A31DC:lI115|H3A3224
-3A3224:lI119|H3A326C
-3A326C:lI111|H3A32B4
-3A32B4:lI114|H3A32FC
-3A32FC:lI100|N
-3A2B8C:lI100|H3A2C48
-3A2C48:lI111|H3A2CFC
-3A2CFC:lI99|N
-3A2AD4:lH3A2B9C|H3A2BA8
-3A2B9C:t2:H3A2C58,H3A2C60
-3A2C60:lI97|H3A2D14
-3A2D14:lI112|H3A2DBC
-3A2DBC:lI112|H3A2E54
-3A2E54:lI108|H3A2EDC
-3A2EDC:lI105|H3A2F54
-3A2F54:lI99|H3A2FC4
-3A2FC4:lI97|H3A302C
-3A302C:lI116|H3A3094
-3A3094:lI105|H3A30F4
-3A30F4:lI111|H3A314C
-3A314C:lI110|H3A319C
-3A319C:lI47|H3A31E4
-3A31E4:lI109|H3A322C
-3A322C:lI97|H3A3274
-3A3274:lI99|H3A32BC
-3A32BC:lI45|H3A3304
-3A3304:lI99|H3A333C
-3A333C:lI111|H3A336C
-3A336C:lI109|H3A3394
-3A3394:lI112|H3A33B4
-3A33B4:lI97|H3A33CC
-3A33CC:lI99|H3A33DC
-3A33DC:lI116|H3A33EC
-3A33EC:lI112|H3A33FC
-3A33FC:lI114|H3A340C
-3A340C:lI111|N
-3A2C58:lI99|H3A2D0C
-3A2D0C:lI112|H3A2DB4
-3A2DB4:lI116|N
-3A2BA8:lH3A2C68|N
-3A2C68:t2:H3A2D1C,H3A2D24
-3A2D24:lI97|H3A2DCC
-3A2DCC:lI112|H3A2E64
-3A2E64:lI112|H3A2EE4
-3A2EE4:lI108|H3A2F5C
-3A2F5C:lI105|H3A2FCC
-3A2FCC:lI99|H3A3034
-3A3034:lI97|H3A309C
-3A309C:lI116|H3A30FC
-3A30FC:lI105|H3A3154
-3A3154:lI111|H3A31A4
-3A31A4:lI110|H3A31EC
-3A31EC:lI47|H3A3234
-3A3234:lI109|H3A327C
-3A327C:lI97|H3A32C4
-3A32C4:lI99|H3A330C
-3A330C:lI45|H3A3344
-3A3344:lI98|H3A3374
-3A3374:lI105|H3A339C
-3A339C:lI110|H3A33BC
-3A33BC:lI104|H3A33D4
-3A33D4:lI101|H3A33E4
-3A33E4:lI120|H3A33F4
-3A33F4:lI52|H3A3404
-3A3404:lI48|N
-3A2D1C:lI104|H3A2DC4
-3A2DC4:lI113|H3A2E5C
-3A2E5C:lI120|N
-39DC28:lH39DC68|H39DC74
-39DC68:t2:A4:port,I8888
-39DC74:lH39DCA8|H39DCB4
-39DCA8:t2:AC:bind_address,H39DCF8
-39DCF8:t4:I127,I0,I0,I1
-39DCB4:lH39DD0C|H39DD18
-39DD0C:t2:AB:server_name,H39DD6C
-39DD6C:lI108|H39DDE4
-39DDE4:lI111|H39DE5C
-39DE5C:lI99|H39DEE4
-39DEE4:lI97|H39DF6C
-39DF6C:lI108|H39E00C
-39E00C:lI104|H39E0B4
-39E0B4:lI111|H39E16C
-39E16C:lI115|H39E238
-39E238:lI116|N
-39DD18:lH39DD74|H39DD80
-39DD74:t2:AE:max_header_siz,I1024
-39DD80:lH39DDEC|H39DDF8
-39DDEC:t2:A11:max_header_action,A8:reply414
-39DDF8:lH39DE64|H39DE70
-39DE64:t2:A8:com_type,A7:ip_comm
-39DE70:lH39DEEC|H39DEF8
-39DEEC:t2:A7:modules,H39DF74
-39DF74:lA9:mod_alias|H39E014
-39E014:lA8:mod_auth|H39E0BC
-39E0BC:lA7:mod_esi|H39E174
-39E174:lAB:mod_actions|H39E240
-39E240:lA7:mod_cgi|H39E324
-39E324:lAB:mod_include|H39E418
-39E418:lA7:mod_dir|H39E51C
-39E51C:lA7:mod_get|H39E634
-39E634:lA8:mod_head|H39E748
-39E748:lA7:mod_log|H39E85C
-39E85C:lAC:mod_disk_log|N
-39DEF8:lH39DF7C|H39DF88
-39DF7C:t2:AF:directory_index,H39E01C
-39E01C:lH39E0C4|N
-39E0C4:lI105|H39E17C
-39E17C:lI110|H39E248
-39E248:lI100|H39E32C
-39E32C:lI101|H39E420
-39E420:lI120|H39E524
-39E524:lI46|H39E63C
-39E63C:lI104|H39E750
-39E750:lI116|H39E864
-39E864:lI109|H39E978
-39E978:lI108|N
-39DF88:lH39E024|H39E030
-39E024:t2:AC:default_type,H39E0CC
-39E0CC:lI116|H39E184
-39E184:lI101|H39E250
-39E250:lI120|H39E334
-39E334:lI116|H39E428
-39E428:lI47|H39E52C
-39E52C:lI112|H39E644
-39E644:lI108|H39E758
-39E758:lI97|H39E86C
-39E86C:lI105|H39E980
-39E980:lI110|N
-39E030:lH39E0D4|H39E0E0
-39E0D4:t2:A10:erl_script_alias,H39E18C
-39E18C:t2:H39E258,H39E260
-39E260:lH39E344|N
-39E344:lI119|H39E438
-39E438:lI101|H39E53C
-39E53C:lI98|H39E654
-39E654:lI116|H39E768
-39E768:lI111|H39E87C
-39E87C:lI111|H39E990
-39E990:lI108|N
-39E258:lI47|H39E33C
-39E33C:lI119|H39E430
-39E430:lI101|H39E534
-39E534:lI98|H39E64C
-39E64C:lI116|H39E760
-39E760:lI111|H39E874
-39E874:lI111|H39E988
-39E988:lI108|N
-39E0E0:lH39E198|H39E1A4
-39E198:t2:A5:alias,H39E268
-39E268:t2:H39E34C,H39E354
-39E354:lI47|H39E448
-39E448:lI99|H39E54C
-39E54C:lI108|H39E664
-39E664:lI101|H39E778
-39E778:lI97|H39E88C
-39E88C:lI114|H39E9A0
-39E9A0:lI99|H39EA94
-39EA94:lI97|H39EB88
-39EB88:lI115|H39EC7C
-39EC7C:lI101|H39ED70
-39ED70:lI47|H39EE4C
-39EE4C:lI111|H39EF20
-39EF20:lI116|H39EFFC
-39EFFC:lI112|H39F0E0
-39F0E0:lI47|H39F1B4
-39F1B4:lI101|H39F288
-39F288:lI114|H39F344
-39F344:lI116|H39F408
-39F408:lI115|H39F4D4
-39F4D4:lI47|H39F5A8
-39F5A8:lI108|H39F67C
-39F67C:lI105|H39F750
-39F750:lI98|H39F824
-39F824:lI47|H39F908
-39F908:lI111|H39F9E4
-39F9E4:lI98|H39FAC0
-39FAC0:lI115|H39FB9C
-39FB9C:lI101|H39FC68
-39FC68:lI114|H39FD2C
-39FD2C:lI118|H39FDF8
-39FDF8:lI101|H39FEB4
-39FEB4:lI114|H39FF70
-39FF70:lI47|H3A0024
-3A0024:lI112|H3A00D8
-3A00D8:lI114|H3A0184
-3A0184:lI105|H3A0238
-3A0238:lI118|H3A02F4
-3A02F4:lI47|H3A03A8
-3A03A8:lI99|H3A0444
-3A0444:lI114|H3A04E8
-3A04E8:lI97|H3A058C
-3A058C:lI115|H3A0638
-3A0638:lI104|H3A06EC
-3A06EC:lI100|H3A0798
-3A0798:lI117|H3A083C
-3A083C:lI109|H3A08C8
-3A08C8:lI112|H3A095C
-3A095C:lI95|H3A09F0
-3A09F0:lI118|H3A0A8C
-3A0A8C:lI105|H3A0B38
-3A0B38:lI101|H3A0BE4
-3A0BE4:lI119|H3A0CA0
-3A0CA0:lI101|H3A0D5C
-3A0D5C:lI114|N
-39E34C:lI47|H39E440
-39E440:lI99|H39E544
-39E544:lI114|H39E65C
-39E65C:lI97|H39E770
-39E770:lI115|H39E884
-39E884:lI104|H39E998
-39E998:lI100|H39EA8C
-39EA8C:lI117|H39EB80
-39EB80:lI109|H39EC74
-39EC74:lI112|H39ED68
-39ED68:lI95|H39EE44
-39EE44:lI118|H39EF18
-39EF18:lI105|H39EFF4
-39EFF4:lI101|H39F0D8
-39F0D8:lI119|H39F1AC
-39F1AC:lI101|H39F280
-39F280:lI114|N
-39E1A4:lH39E274|H39E280
-39E274:t2:A5:alias,H39E35C
-39E35C:t2:H39E450,H39E458
-39E458:lI47|H39E55C
-39E55C:lI99|H39E674
-39E674:lI108|H39E788
-39E788:lI101|H39E89C
-39E89C:lI97|H39E9B0
-39E9B0:lI114|H39EAA4
-39EAA4:lI99|H39EB98
-39EB98:lI97|H39EC8C
-39EC8C:lI115|H39ED80
-39ED80:lI101|H39EE5C
-39EE5C:lI47|H39EF30
-39EF30:lI111|H39F00C
-39F00C:lI116|H39F0F0
-39F0F0:lI112|H39F1C4
-39F1C4:lI47|H39F298
-39F298:lI101|H39F354
-39F354:lI114|H39F418
-39F418:lI116|H39F4E4
-39F4E4:lI115|H39F5B0
-39F5B0:lI47|H39F684
-39F684:lI101|H39F758
-39F758:lI114|H39F82C
-39F82C:lI116|H39F910
-39F910:lI115|H39F9EC
-39F9EC:lI47|H39FAC8
-39FAC8:lI100|H39FBA4
-39FBA4:lI111|H39FC70
-39FC70:lI99|H39FD34
-39FD34:lI47|H39FE00
-39FE00:lI104|H39FEBC
-39FEBC:lI116|H39FF78
-39FF78:lI109|H3A002C
-3A002C:lI108|N
-39E450:lI47|H39E554
-39E554:lI99|H39E66C
-39E66C:lI114|H39E780
-39E780:lI97|H39E894
-39E894:lI115|H39E9A8
-39E9A8:lI104|H39EA9C
-39EA9C:lI100|H39EB90
-39EB90:lI117|H39EC84
-39EC84:lI109|H39ED78
-39ED78:lI112|H39EE54
-39EE54:lI95|H39EF28
-39EF28:lI101|H39F004
-39F004:lI114|H39F0E8
-39F0E8:lI116|H39F1BC
-39F1BC:lI115|H39F290
-39F290:lI95|H39F34C
-39F34C:lI100|H39F410
-39F410:lI111|H39F4DC
-39F4DC:lI99|N
-39E280:lH39E368|H39E374
-39E368:t2:A5:alias,H39E460
-39E460:t2:H39E564,H39E56C
-39E56C:lI47|H39E684
-39E684:lI99|H39E798
-39E798:lI108|H39E8AC
-39E8AC:lI101|H39E9C0
-39E9C0:lI97|H39EAB4
-39EAB4:lI114|H39EBA8
-39EBA8:lI99|H39EC9C
-39EC9C:lI97|H39ED90
-39ED90:lI115|H39EE6C
-39EE6C:lI101|H39EF40
-39EF40:lI47|H39F01C
-39F01C:lI111|H39F100
-39F100:lI116|H39F1D4
-39F1D4:lI112|H39F2A0
-39F2A0:lI47|H39F35C
-39F35C:lI101|H39F420
-39F420:lI114|H39F4EC
-39F4EC:lI116|H39F5B8
-39F5B8:lI115|H39F68C
-39F68C:lI47|H39F760
-39F760:lI108|H39F834
-39F834:lI105|H39F918
-39F918:lI98|H39F9F4
-39F9F4:lI47|H39FAD0
-39FAD0:lI111|H39FBAC
-39FBAC:lI98|H39FC78
-39FC78:lI115|H39FD3C
-39FD3C:lI101|H39FE08
-39FE08:lI114|H39FEC4
-39FEC4:lI118|H39FF80
-39FF80:lI101|H3A0034
-3A0034:lI114|H3A00E0
-3A00E0:lI47|H3A018C
-3A018C:lI100|H3A0240
-3A0240:lI111|H3A02FC
-3A02FC:lI99|H3A03B0
-3A03B0:lI47|H3A044C
-3A044C:lI104|H3A04F0
-3A04F0:lI116|H3A0594
-3A0594:lI109|H3A0640
-3A0640:lI108|N
-39E564:lI47|H39E67C
-39E67C:lI99|H39E790
-39E790:lI114|H39E8A4
-39E8A4:lI97|H39E9B8
-39E9B8:lI115|H39EAAC
-39EAAC:lI104|H39EBA0
-39EBA0:lI100|H39EC94
-39EC94:lI117|H39ED88
-39ED88:lI109|H39EE64
-39EE64:lI112|H39EF38
-39EF38:lI95|H39F014
-39F014:lI100|H39F0F8
-39F0F8:lI111|H39F1CC
-39F1CC:lI99|N
-39E374:lH39E46C|N
-39E46C:t2:A10:erl_script_alias,H39E574
-39E574:t2:H39E68C,H39E694
-39E694:lH39E7A8|N
-39E7A8:lI99|H39E8BC
-39E8BC:lI114|H39E9D0
-39E9D0:lI97|H39EAC4
-39EAC4:lI115|H39EBB8
-39EBB8:lI104|H39ECAC
-39ECAC:lI100|H39EDA0
-39EDA0:lI117|H39EE74
-39EE74:lI109|H39EF48
-39EF48:lI112|H39F024
-39F024:lI95|H39F108
-39F108:lI118|H39F1DC
-39F1DC:lI105|H39F2A8
-39F2A8:lI101|H39F364
-39F364:lI119|H39F428
-39F428:lI101|H39F4F4
-39F4F4:lI114|N
-39E68C:lI47|H39E7A0
-39E7A0:lI99|H39E8B4
-39E8B4:lI100|H39E9C8
-39E9C8:lI118|H39EABC
-39EABC:lI95|H39EBB0
-39EBB0:lI101|H39ECA4
-39ECA4:lI114|H39ED98
-39ED98:lI108|N
-39DB58:lN|H39DB9C
-39DB9C:lH39D9FC|H39DBEC
-39D9FC:t4:I127,I0,I0,I1
-39DBEC:lI8888|N
-3A3E20:lH3A3DFC|H3A3704
-3A3DFC:t8:A5:child,P<0.46.0>,H39DAC8,H39DAD8,A9:permanent,I2000,A6:worker,H39DAE8
-39DAE8:lAD:httpd_manager|H39DB38
-39DB38:lAA:gen_server|N
-39DAD8:t3:AD:httpd_manager,AA:start_link,H39DB30
-39DB30:lA9:undefined|H39DB78
-39DB78:lH39DB50|H39DBC0
-39DBC0:lN|N
-39DAC8:t3:AD:httpd_manager,H39D9FC,I8888
-3A3704:lH3A36E0|H39D998
-3A36E0:t8:A5:child,P<0.45.0>,H39DA18,H39DA28,A9:permanent,I2000,AA:supervisor,H39DA38
-39DA38:lAE:httpd_misc_sup|H39DAC0
-39DAC0:lAA:supervisor|N
-39DA28:t3:AE:httpd_misc_sup,A5:start,H39D958
-39D958:lH39D9FC|H39DA10
-39DA10:lI8888|H39DAB8
-39DAB8:lA7:silence|N
-39DA18:t3:AE:httpd_misc_sup,H39D9FC,I8888
-39D998:lH39DA64|N
-39DA64:t8:A5:child,P<0.44.0>,H39DAF0,H39DB00,A9:permanent,I2000,AA:supervisor,H39DB10
-39DB10:lA12:httpd_acceptor_sup|H39DB48
-39DB48:lAA:supervisor|N
-39DB00:t3:A12:httpd_acceptor_sup,A5:start,H39DB40
-39DB40:lH39D9FC|H39DB80
-39DB80:lI8888|H39DBC8
-39DBC8:lA7:silence|N
-39DAF0:t3:A12:httpd_acceptor_sup,H39D9FC,I8888
-39D960:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39D9CC:lAA:gen_server|H39DA90
-39DA90:lP<0.33.0>|H39DB20
-39DB20:lP<0.33.0>|H39DB60
-39DB60:lH39DBA4|H39DBB0
-39DBA4:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39DBB0:lAA:supervisor|H39DBF4
-39DBF4:lH39DC30|H39DC40
-39DC30:t3:H39D960,A9:httpd_sup,H39DA88
-39DC40:lN|N
-39D940:t2:AD:$initial_call,H39D9E4
-39D9E4:t3:A3:gen,A7:init_it,H39D9CC
-39D94C:t2:AA:$ancestors,H39D9F4
-39D9F4:lA8:web_tool|H39DAB0
-39DAB0:lP<0.27.0>|N
-=proc_dictionary:<0.44.0>
-H3756A8
-H3756B4
-H3756C0
-H3756CC
-=proc_stack:<0.44.0>
-36c194:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36C030
-y4:A1E:httpd_acc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36c1b0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H375710
-=proc_heap:<0.44.0>
-36C030:tA:A5:state,H3756D8,AB:one_for_one,H36C028,N,I500,I100,N,A12:httpd_acceptor_sup,H375730
-375730:lA7:silence|N
-36C028:lH36C004|N
-36C004:t8:A5:child,P<0.47.0>,H36BE80,H36BE90,A9:permanent,I1000,A6:worker,H36BEA0
-36BEA0:lAE:httpd_acceptor|N
-36BE90:t3:AE:httpd_acceptor,AA:start_link,H36BEE8
-36BEE8:lP<0.46.0>|H36BEF0
-36BEF0:lA7:ip_comm|H36BEF8
-36BEF8:lH36BF00|H36BF14
-36BF00:t4:I127,I0,I0,I1
-36BF14:lI8888|H36BF1C
-36BF1C:lA1B:httpd_conf__127_0_0_1__8888|H36BF24
-36BF24:lA7:silence|N
-36BE80:t3:AE:httpd_acceptor,H36BED4,I8888
-36BED4:t4:I127,I0,I0,I1
-3756D8:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-375710:lAA:gen_server|H375738
-375738:lP<0.43.0>|H375748
-375748:lP<0.43.0>|H375758
-375758:lH375760|H37576C
-375760:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-37576C:lAA:supervisor|H375774
-375774:lH37577C|H37578C
-37577C:t3:H3756D8,A12:httpd_acceptor_sup,H375730
-37578C:lN|N
-3756A8:t2:AD:$initial_call,H375718
-375718:t3:A3:gen,A7:init_it,H375710
-3756B4:t2:A9:verbosity,A7:silence
-3756C0:t2:AA:$ancestors,H375728
-375728:lA1A:httpd_sup__127_0_0_1__8888|H375740
-375740:lA8:web_tool|H375750
-375750:lP<0.27.0>|N
-3756CC:t2:A5:sname,A7:acc_sup
-=proc_dictionary:<0.45.0>
-H36F484
-H36F4F4
-H36F468
-H36F500
-=proc_stack:<0.45.0>
-36f734:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F5D0
-y4:A1F:httpd_misc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36f750:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36F430
-=proc_heap:<0.45.0>
-36F5D0:tA:A5:state,H36F3FC,AB:one_for_one,N,N,I0,I1,N,AE:httpd_misc_sup,H36F408
-36F408:lA7:silence|N
-36F3FC:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F430:lAA:gen_server|H36F428
-36F428:lP<0.43.0>|H36F420
-36F420:lP<0.43.0>|H36F3D0
-36F3D0:lH36F3E0|H36F418
-36F3E0:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F418:lAA:supervisor|H36F3D8
-36F3D8:lH36F3EC|H36F410
-36F3EC:t3:H36F3FC,AE:httpd_misc_sup,H36F408
-36F410:lN|N
-36F484:t2:AD:$initial_call,H36F474
-36F474:t3:A3:gen,A7:init_it,H36F430
-36F4F4:t2:A9:verbosity,A7:silence
-36F468:t2:AA:$ancestors,H36F460
-36F460:lA1A:httpd_sup__127_0_0_1__8888|H36F440
-36F440:lA8:web_tool|H36F438
-36F438:lP<0.27.0>|N
-36F500:t2:A5:sname,A8:misc_sup
-=proc_dictionary:<0.46.0>
-H3BDA50
-H3BDA5C
-H3BDAC8
-H3BDB28
-H3BDB9C
-H3BDC00
-H3BDADC
-H3BDB3C
-=proc_stack:<0.46.0>
-39d8f4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:httpd_manager
-y3:H39D5A4
-y4:A16:httpd__127_0_0_1__8888
-y5:P<0.43.0>
-39d910:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3BDAB0
-=proc_heap:<0.46.0>
-39D5A4:t9:A5:state,A7:ip_comm,A9:undefined,A1B:httpd_conf__127_0_0_1__8888,N,A9:unblocked,A9:undefined,A9:undefined,H39D430
-39D430:lH39BF40|H39D428
-39BF40:t2:A8:max_conn,I1
-39D428:lH39BC80|H39D420
-39BC80:t2:AF:last_heavy_load,A5:never
-39D420:lH39D414|N
-39D414:t2:AF:last_connection,H39D408
-39D408:t2:H39D3E8,H39D3F8
-39D3F8:t3:I11,I22,I34
-39D3E8:t3:I2004,I4,I21
-3BDAB0:lAA:gen_server|H3BDB20
-3BDB20:lP<0.43.0>|H3BDB94
-3BDB94:lP<0.43.0>|H3BDBF8
-3BDBF8:lH3BDC48|H3BDC54
-3BDC48:t2:A5:local,A16:httpd__127_0_0_1__8888
-3BDC54:lAD:httpd_manager|H3BDCAC
-3BDCAC:lH3BDD14|H3BDD1C
-3BDD14:lA9:undefined|H3BDD9C
-3BDD9C:lH3BDA84|H3BDE2C
-3BDA84:lH3BDAF0|H3BDAFC
-3BDAF0:t2:AB:server_root,H3BDB48
-3BDB48:lI47|H3BDBB0
-3BDBB0:lI99|H3BDC0C
-3BDC0C:lI108|H3BDC64
-3BDC64:lI101|H3BDCBC
-3BDCBC:lI97|H3BDD2C
-3BDD2C:lI114|H3BDDA4
-3BDDA4:lI99|H3BDE34
-3BDE34:lI97|H3BDED4
-3BDED4:lI115|H3BDF90
-3BDF90:lI101|H3BE054
-3BE054:lI47|H3BE128
-3BE128:lI111|H3BE204
-3BE204:lI116|H3BE2EC
-3BE2EC:lI112|H3BE3E0
-3BE3E0:lI47|H3BE4E4
-3BE4E4:lI101|H3BE5E8
-3BE5E8:lI114|H3BE6EC
-3BE6EC:lI116|H3BE7E0
-3BE7E0:lI115|H3BE8CC
-3BE8CC:lI47|H3BE9B8
-3BE9B8:lI108|H3BEAAC
-3BEAAC:lI105|H3BEB98
-3BEB98:lI98|H3BEC84
-3BEC84:lI47|H3BED70
-3BED70:lI119|H3BEE5C
-3BEE5C:lI101|H3BEF30
-3BEF30:lI98|H3BEFFC
-3BEFFC:lI116|H3BF0C8
-3BF0C8:lI111|H3BF19C
-3BF19C:lI111|H3BF260
-3BF260:lI108|H3BF314
-3BF314:lI47|H3BF3C0
-3BF3C0:lI112|H3BF474
-3BF474:lI114|H3BF530
-3BF530:lI105|H3BF5F4
-3BF5F4:lI118|H3BF6C8
-3BF6C8:lI47|H3BF79C
-3BF79C:lI114|H3BF870
-3BF870:lI111|H3BF954
-3BF954:lI111|H3BFA30
-3BFA30:lI116|N
-3BDAFC:lH3BDB50|H3BDB5C
-3BDB50:t2:AD:document_root,H3BDBB8
-3BDBB8:lI47|H3BDC14
-3BDC14:lI99|H3BDC6C
-3BDC6C:lI108|H3BDCC4
-3BDCC4:lI101|H3BDD34
-3BDD34:lI97|H3BDDAC
-3BDDAC:lI114|H3BDE3C
-3BDE3C:lI99|H3BDEDC
-3BDEDC:lI97|H3BDF98
-3BDF98:lI115|H3BE05C
-3BE05C:lI101|H3BE130
-3BE130:lI47|H3BE20C
-3BE20C:lI111|H3BE2F4
-3BE2F4:lI116|H3BE3E8
-3BE3E8:lI112|H3BE4EC
-3BE4EC:lI47|H3BE5F0
-3BE5F0:lI101|H3BE6F4
-3BE6F4:lI114|H3BE7E8
-3BE7E8:lI116|H3BE8D4
-3BE8D4:lI115|H3BE9C0
-3BE9C0:lI47|H3BEAB4
-3BEAB4:lI108|H3BEBA0
-3BEBA0:lI105|H3BEC8C
-3BEC8C:lI98|H3BED78
-3BED78:lI47|H3BEE64
-3BEE64:lI119|H3BEF38
-3BEF38:lI101|H3BF004
-3BF004:lI98|H3BF0D0
-3BF0D0:lI116|H3BF1A4
-3BF1A4:lI111|H3BF268
-3BF268:lI111|H3BF31C
-3BF31C:lI108|H3BF3C8
-3BF3C8:lI47|H3BF47C
-3BF47C:lI112|H3BF538
-3BF538:lI114|H3BF5FC
-3BF5FC:lI105|H3BF6D0
-3BF6D0:lI118|H3BF7A4
-3BF7A4:lI47|H3BF878
-3BF878:lI114|H3BF95C
-3BF95C:lI111|H3BFA38
-3BFA38:lI111|H3BFB0C
-3BFB0C:lI116|H3BFBE8
-3BFBE8:lI47|H3BFCB4
-3BFCB4:lI100|H3BFD78
-3BFD78:lI111|H3BFE3C
-3BFE3C:lI99|N
-3BDB5C:lH3BDBC0|H3BDBCC
-3BDBC0:t2:AA:mime_types,H3BDC1C
-3BDC1C:lH3BDC74|H3BDC80
-3BDC74:t2:H3BDCCC,H3BDCD4
-3BDCD4:lI120|H3BDD44
-3BDD44:lI45|H3BDDBC
-3BDDBC:lI119|H3BDE44
-3BDE44:lI111|H3BDEE4
-3BDEE4:lI114|H3BDFA0
-3BDFA0:lI108|H3BE064
-3BE064:lI100|H3BE138
-3BE138:lI47|H3BE214
-3BE214:lI120|H3BE2FC
-3BE2FC:lI45|H3BE3F0
-3BE3F0:lI118|H3BE4F4
-3BE4F4:lI114|H3BE5F8
-3BE5F8:lI109|H3BE6FC
-3BE6FC:lI108|N
-3BDCCC:lI119|H3BDD3C
-3BDD3C:lI114|H3BDDB4
-3BDDB4:lI108|N
-3BDC80:lH3BDCDC|H3BDCE8
-3BDCDC:t2:H3BDD4C,H3BDD54
-3BDD54:lI120|H3BDDCC
-3BDDCC:lI45|H3BDE54
-3BDE54:lI119|H3BDEF4
-3BDEF4:lI111|H3BDFA8
-3BDFA8:lI114|H3BE06C
-3BE06C:lI108|H3BE140
-3BE140:lI100|H3BE21C
-3BE21C:lI47|H3BE304
-3BE304:lI120|H3BE3F8
-3BE3F8:lI45|H3BE4FC
-3BE4FC:lI118|H3BE600
-3BE600:lI114|H3BE704
-3BE704:lI109|H3BE7F0
-3BE7F0:lI108|N
-3BDD4C:lI118|H3BDDC4
-3BDDC4:lI114|H3BDE4C
-3BDE4C:lI109|H3BDEEC
-3BDEEC:lI108|N
-3BDCE8:lH3BDD5C|H3BDD68
-3BDD5C:t2:H3BDDD4,H3BDDDC
-3BDDDC:lI120|H3BDE64
-3BDE64:lI45|H3BDF04
-3BDF04:lI99|H3BDFB0
-3BDFB0:lI111|H3BE074
-3BE074:lI110|H3BE148
-3BE148:lI102|H3BE224
-3BE224:lI101|H3BE30C
-3BE30C:lI114|H3BE400
-3BE400:lI101|H3BE504
-3BE504:lI110|H3BE608
-3BE608:lI99|H3BE70C
-3BE70C:lI101|H3BE7F8
-3BE7F8:lI47|H3BE8DC
-3BE8DC:lI120|H3BE9C8
-3BE9C8:lI45|H3BEABC
-3BEABC:lI99|H3BEBA8
-3BEBA8:lI111|H3BEC94
-3BEC94:lI111|H3BED80
-3BED80:lI108|H3BEE6C
-3BEE6C:lI116|H3BEF40
-3BEF40:lI97|H3BF00C
-3BF00C:lI108|H3BF0D8
-3BF0D8:lI107|N
-3BDDD4:lI105|H3BDE5C
-3BDE5C:lI99|H3BDEFC
-3BDEFC:lI101|N
-3BDD68:lH3BDDE4|H3BDDF0
-3BDDE4:t2:H3BDE6C,H3BDE74
-3BDE74:lI118|H3BDF14
-3BDF14:lI105|H3BDFC0
-3BDFC0:lI100|H3BE084
-3BE084:lI101|H3BE158
-3BE158:lI111|H3BE22C
-3BE22C:lI47|H3BE314
-3BE314:lI120|H3BE408
-3BE408:lI45|H3BE50C
-3BE50C:lI115|H3BE610
-3BE610:lI103|H3BE714
-3BE714:lI105|H3BE800
-3BE800:lI45|H3BE8E4
-3BE8E4:lI109|H3BE9D0
-3BE9D0:lI111|H3BEAC4
-3BEAC4:lI118|H3BEBB0
-3BEBB0:lI105|H3BEC9C
-3BEC9C:lI101|N
-3BDE6C:lI109|H3BDF0C
-3BDF0C:lI111|H3BDFB8
-3BDFB8:lI118|H3BE07C
-3BE07C:lI105|H3BE150
-3BE150:lI101|N
-3BDDF0:lH3BDE7C|H3BDE88
-3BDE7C:t2:H3BDF1C,H3BDF24
-3BDF24:lI118|H3BDFD0
-3BDFD0:lI105|H3BE094
-3BE094:lI100|H3BE160
-3BE160:lI101|H3BE234
-3BE234:lI111|H3BE31C
-3BE31C:lI47|H3BE410
-3BE410:lI120|H3BE514
-3BE514:lI45|H3BE618
-3BE618:lI109|H3BE71C
-3BE71C:lI115|H3BE808
-3BE808:lI118|H3BE8EC
-3BE8EC:lI105|H3BE9D8
-3BE9D8:lI100|H3BEACC
-3BEACC:lI101|H3BEBB8
-3BEBB8:lI111|N
-3BDF1C:lI97|H3BDFC8
-3BDFC8:lI118|H3BE08C
-3BE08C:lI105|N
-3BDE88:lH3BDF2C|H3BDF38
-3BDF2C:t2:H3BDFD8,H3BDFE0
-3BDFE0:lI118|H3BE0A4
-3BE0A4:lI105|H3BE168
-3BE168:lI100|H3BE23C
-3BE23C:lI101|H3BE324
-3BE324:lI111|H3BE418
-3BE418:lI47|H3BE51C
-3BE51C:lI113|H3BE620
-3BE620:lI117|H3BE724
-3BE724:lI105|H3BE810
-3BE810:lI99|H3BE8F4
-3BE8F4:lI107|H3BE9E0
-3BE9E0:lI116|H3BEAD4
-3BEAD4:lI105|H3BEBC0
-3BEBC0:lI109|H3BECA4
-3BECA4:lI101|N
-3BDFD8:lI113|H3BE09C
-3BE09C:lI116|N
-3BDF38:lH3BDFE8|H3BDFF4
-3BDFE8:t2:H3BE0AC,H3BE0B4
-3BE0B4:lI118|H3BE178
-3BE178:lI105|H3BE24C
-3BE24C:lI100|H3BE32C
-3BE32C:lI101|H3BE420
-3BE420:lI111|H3BE524
-3BE524:lI47|H3BE628
-3BE628:lI113|H3BE72C
-3BE72C:lI117|H3BE818
-3BE818:lI105|H3BE8FC
-3BE8FC:lI99|H3BE9E8
-3BE9E8:lI107|H3BEADC
-3BEADC:lI116|H3BEBC8
-3BEBC8:lI105|H3BECAC
-3BECAC:lI109|H3BED88
-3BED88:lI101|N
-3BE0AC:lI109|H3BE170
-3BE170:lI111|H3BE244
-3BE244:lI118|N
-3BDFF4:lH3BE0BC|H3BE0C8
-3BE0BC:t2:H3BE180,H3BE188
-3BE188:lI118|H3BE25C
-3BE25C:lI105|H3BE33C
-3BE33C:lI100|H3BE430
-3BE430:lI101|H3BE52C
-3BE52C:lI111|H3BE630
-3BE630:lI47|H3BE734
-3BE734:lI109|H3BE820
-3BE820:lI112|H3BE904
-3BE904:lI101|H3BE9F0
-3BE9F0:lI103|N
-3BE180:lI109|H3BE254
-3BE254:lI112|H3BE334
-3BE334:lI101|H3BE428
-3BE428:lI103|N
-3BE0C8:lH3BE190|H3BE19C
-3BE190:t2:H3BE264,H3BE26C
-3BE26C:lI118|H3BE34C
-3BE34C:lI105|H3BE440
-3BE440:lI100|H3BE534
-3BE534:lI101|H3BE638
-3BE638:lI111|H3BE73C
-3BE73C:lI47|H3BE828
-3BE828:lI109|H3BE90C
-3BE90C:lI112|H3BE9F8
-3BE9F8:lI101|H3BEAE4
-3BEAE4:lI103|N
-3BE264:lI109|H3BE344
-3BE344:lI112|H3BE438
-3BE438:lI103|N
-3BE19C:lH3BE274|H3BE280
-3BE274:t2:H3BE354,H3BE35C
-3BE35C:lI118|H3BE450
-3BE450:lI105|H3BE544
-3BE544:lI100|H3BE640
-3BE640:lI101|H3BE744
-3BE744:lI111|H3BE830
-3BE830:lI47|H3BE914
-3BE914:lI109|H3BEA00
-3BEA00:lI112|H3BEAEC
-3BEAEC:lI101|H3BEBD0
-3BEBD0:lI103|N
-3BE354:lI109|H3BE448
-3BE448:lI112|H3BE53C
-3BE53C:lI101|N
-3BE280:lH3BE364|H3BE370
-3BE364:t2:H3BE458,H3BE460
-3BE460:lI116|H3BE554
-3BE554:lI101|H3BE650
-3BE650:lI120|H3BE754
-3BE754:lI116|H3BE838
-3BE838:lI47|H3BE91C
-3BE91C:lI120|H3BEA08
-3BEA08:lI45|H3BEAF4
-3BEAF4:lI115|H3BEBD8
-3BEBD8:lI103|H3BECB4
-3BECB4:lI109|H3BED90
-3BED90:lI108|N
-3BE458:lI115|H3BE54C
-3BE54C:lI103|H3BE648
-3BE648:lI109|H3BE74C
-3BE74C:lI108|N
-3BE370:lH3BE468|H3BE474
-3BE468:t2:H3BE55C,H3BE564
-3BE564:lI116|H3BE660
-3BE660:lI101|H3BE764
-3BE764:lI120|H3BE840
-3BE840:lI116|H3BE924
-3BE924:lI47|H3BEA10
-3BEA10:lI120|H3BEAFC
-3BEAFC:lI45|H3BEBE0
-3BEBE0:lI115|H3BECBC
-3BECBC:lI103|H3BED98
-3BED98:lI109|H3BEE74
-3BEE74:lI108|N
-3BE55C:lI115|H3BE658
-3BE658:lI103|H3BE75C
-3BE75C:lI109|N
-3BE474:lH3BE56C|H3BE578
-3BE56C:t2:H3BE668,H3BE670
-3BE670:lI116|H3BE774
-3BE774:lI101|H3BE850
-3BE850:lI120|H3BE92C
-3BE92C:lI116|H3BEA18
-3BEA18:lI47|H3BEB04
-3BEB04:lI120|H3BEBE8
-3BEBE8:lI45|H3BECC4
-3BECC4:lI115|H3BEDA0
-3BEDA0:lI101|H3BEE7C
-3BEE7C:lI116|H3BEF48
-3BEF48:lI101|H3BF014
-3BF014:lI120|H3BF0E0
-3BF0E0:lI116|N
-3BE668:lI101|H3BE76C
-3BE76C:lI116|H3BE848
-3BE848:lI120|N
-3BE578:lH3BE678|H3BE684
-3BE678:t2:H3BE77C,H3BE784
-3BE784:lI116|H3BE860
-3BE860:lI101|H3BE93C
-3BE93C:lI120|H3BEA20
-3BEA20:lI116|H3BEB0C
-3BEB0C:lI47|H3BEBF0
-3BEBF0:lI116|H3BECCC
-3BECCC:lI97|H3BEDA8
-3BEDA8:lI98|H3BEE84
-3BEE84:lI45|H3BEF50
-3BEF50:lI115|H3BF01C
-3BF01C:lI101|H3BF0E8
-3BF0E8:lI112|H3BF1AC
-3BF1AC:lI97|H3BF270
-3BF270:lI114|H3BF324
-3BF324:lI97|H3BF3D0
-3BF3D0:lI116|H3BF484
-3BF484:lI101|H3BF540
-3BF540:lI100|H3BF604
-3BF604:lI45|H3BF6D8
-3BF6D8:lI118|H3BF7AC
-3BF7AC:lI97|H3BF880
-3BF880:lI108|H3BF964
-3BF964:lI117|H3BFA40
-3BFA40:lI101|H3BFB14
-3BFB14:lI115|N
-3BE77C:lI116|H3BE858
-3BE858:lI115|H3BE934
-3BE934:lI118|N
-3BE684:lH3BE78C|H3BE798
-3BE78C:t2:H3BE868,H3BE870
-3BE870:lI116|H3BE94C
-3BE94C:lI101|H3BEA30
-3BEA30:lI120|H3BEB14
-3BEB14:lI116|H3BEBF8
-3BEBF8:lI47|H3BECD4
-3BECD4:lI114|H3BEDB0
-3BEDB0:lI105|H3BEE8C
-3BEE8C:lI99|H3BEF58
-3BEF58:lI104|H3BF024
-3BF024:lI116|H3BF0F0
-3BF0F0:lI101|H3BF1B4
-3BF1B4:lI120|H3BF278
-3BF278:lI116|N
-3BE868:lI114|H3BE944
-3BE944:lI116|H3BEA28
-3BEA28:lI120|N
-3BE798:lH3BE878|H3BE884
-3BE878:t2:H3BE954,H3BE95C
-3BE95C:lI116|H3BEA40
-3BEA40:lI101|H3BEB24
-3BEB24:lI120|H3BEC00
-3BEC00:lI116|H3BECDC
-3BECDC:lI47|H3BEDB8
-3BEDB8:lI112|H3BEE94
-3BEE94:lI108|H3BEF60
-3BEF60:lI97|H3BF02C
-3BF02C:lI105|H3BF0F8
-3BF0F8:lI110|N
-3BE954:lI116|H3BEA38
-3BEA38:lI120|H3BEB1C
-3BEB1C:lI116|N
-3BE884:lH3BE964|H3BE970
-3BE964:t2:H3BEA48,H3BEA50
-3BEA50:lI116|H3BEB34
-3BEB34:lI101|H3BEC10
-3BEC10:lI120|H3BECEC
-3BECEC:lI116|H3BEDC8
-3BEDC8:lI47|H3BEE9C
-3BEE9C:lI120|H3BEF68
-3BEF68:lI45|H3BF034
-3BF034:lI115|H3BF100
-3BF100:lI101|H3BF1BC
-3BF1BC:lI114|H3BF280
-3BF280:lI118|H3BF32C
-3BF32C:lI101|H3BF3D8
-3BF3D8:lI114|H3BF48C
-3BF48C:lI45|H3BF548
-3BF548:lI112|H3BF60C
-3BF60C:lI97|H3BF6E0
-3BF6E0:lI114|H3BF7B4
-3BF7B4:lI115|H3BF888
-3BF888:lI101|H3BF96C
-3BF96C:lI100|H3BFA48
-3BFA48:lI45|H3BFB1C
-3BFB1C:lI104|H3BFBF0
-3BFBF0:lI116|H3BFCBC
-3BFCBC:lI109|H3BFD80
-3BFD80:lI108|N
-3BEA48:lI115|H3BEB2C
-3BEB2C:lI104|H3BEC08
-3BEC08:lI116|H3BECE4
-3BECE4:lI109|H3BEDC0
-3BEDC0:lI108|N
-3BE970:lH3BEA58|H3BEA64
-3BEA58:t2:H3BEB3C,H3BEB44
-3BEB44:lI116|H3BEC20
-3BEC20:lI101|H3BECFC
-3BECFC:lI120|H3BEDD8
-3BEDD8:lI116|H3BEEA4
-3BEEA4:lI47|H3BEF70
-3BEF70:lI104|H3BF03C
-3BF03C:lI116|H3BF108
-3BF108:lI109|H3BF1C4
-3BF1C4:lI108|N
-3BEB3C:lI104|H3BEC18
-3BEC18:lI116|H3BECF4
-3BECF4:lI109|H3BEDD0
-3BEDD0:lI108|N
-3BEA64:lH3BEB4C|H3BEB58
-3BEB4C:t2:H3BEC28,H3BEC30
-3BEC30:lI116|H3BED0C
-3BED0C:lI101|H3BEDE8
-3BEDE8:lI120|H3BEEAC
-3BEEAC:lI116|H3BEF78
-3BEF78:lI47|H3BF044
-3BF044:lI104|H3BF110
-3BF110:lI116|H3BF1CC
-3BF1CC:lI109|H3BF288
-3BF288:lI108|N
-3BEC28:lI104|H3BED04
-3BED04:lI116|H3BEDE0
-3BEDE0:lI109|N
-3BEB58:lH3BEC38|H3BEC44
-3BEC38:t2:H3BED14,H3BED1C
-3BED1C:lI105|H3BEDF8
-3BEDF8:lI109|H3BEEBC
-3BEEBC:lI97|H3BEF80
-3BEF80:lI103|H3BF04C
-3BF04C:lI101|H3BF118
-3BF118:lI47|H3BF1D4
-3BF1D4:lI120|H3BF290
-3BF290:lI45|H3BF334
-3BF334:lI120|H3BF3E0
-3BF3E0:lI119|H3BF494
-3BF494:lI105|H3BF550
-3BF550:lI110|H3BF614
-3BF614:lI100|H3BF6E8
-3BF6E8:lI111|H3BF7BC
-3BF7BC:lI119|H3BF890
-3BF890:lI100|H3BF974
-3BF974:lI117|H3BFA50
-3BFA50:lI109|H3BFB24
-3BFB24:lI112|N
-3BED14:lI120|H3BEDF0
-3BEDF0:lI119|H3BEEB4
-3BEEB4:lI100|N
-3BEC44:lH3BED24|H3BED30
-3BED24:t2:H3BEE00,H3BEE08
-3BEE08:lI105|H3BEECC
-3BEECC:lI109|H3BEF90
-3BEF90:lI97|H3BF054
-3BF054:lI103|H3BF120
-3BF120:lI101|H3BF1DC
-3BF1DC:lI47|H3BF298
-3BF298:lI120|H3BF33C
-3BF33C:lI45|H3BF3E8
-3BF3E8:lI120|H3BF49C
-3BF49C:lI112|H3BF558
-3BF558:lI105|H3BF61C
-3BF61C:lI120|H3BF6F0
-3BF6F0:lI109|H3BF7C4
-3BF7C4:lI97|H3BF898
-3BF898:lI112|N
-3BEE00:lI120|H3BEEC4
-3BEEC4:lI112|H3BEF88
-3BEF88:lI109|N
-3BED30:lH3BEE10|H3BEE1C
-3BEE10:t2:H3BEED4,H3BEEDC
-3BEEDC:lI105|H3BEFA0
-3BEFA0:lI109|H3BF064
-3BF064:lI97|H3BF128
-3BF128:lI103|H3BF1E4
-3BF1E4:lI101|H3BF2A0
-3BF2A0:lI47|H3BF344
-3BF344:lI120|H3BF3F0
-3BF3F0:lI45|H3BF4A4
-3BF4A4:lI120|H3BF560
-3BF560:lI98|H3BF624
-3BF624:lI105|H3BF6F8
-3BF6F8:lI116|H3BF7CC
-3BF7CC:lI109|H3BF8A0
-3BF8A0:lI97|H3BF97C
-3BF97C:lI112|N
-3BEED4:lI120|H3BEF98
-3BEF98:lI98|H3BF05C
-3BF05C:lI109|N
-3BEE1C:lH3BEEE4|H3BEEF0
-3BEEE4:t2:H3BEFA8,H3BEFB0
-3BEFB0:lI105|H3BF074
-3BF074:lI109|H3BF138
-3BF138:lI97|H3BF1EC
-3BF1EC:lI103|H3BF2A8
-3BF2A8:lI101|H3BF34C
-3BF34C:lI47|H3BF3F8
-3BF3F8:lI120|H3BF4AC
-3BF4AC:lI45|H3BF568
-3BF568:lI114|H3BF62C
-3BF62C:lI103|H3BF700
-3BF700:lI98|N
-3BEFA8:lI114|H3BF06C
-3BF06C:lI103|H3BF130
-3BF130:lI98|N
-3BEEF0:lH3BEFB8|H3BEFC4
-3BEFB8:t2:H3BF07C,H3BF084
-3BF084:lI105|H3BF148
-3BF148:lI109|H3BF1FC
-3BF1FC:lI97|H3BF2B0
-3BF2B0:lI103|H3BF354
-3BF354:lI101|H3BF400
-3BF400:lI47|H3BF4B4
-3BF4B4:lI120|H3BF570
-3BF570:lI45|H3BF634
-3BF634:lI112|H3BF708
-3BF708:lI111|H3BF7D4
-3BF7D4:lI114|H3BF8A8
-3BF8A8:lI116|H3BF984
-3BF984:lI97|H3BFA58
-3BFA58:lI98|H3BFB2C
-3BFB2C:lI108|H3BFBF8
-3BFBF8:lI101|H3BFCC4
-3BFCC4:lI45|H3BFD88
-3BFD88:lI112|H3BFE44
-3BFE44:lI105|H3BFEF0
-3BFEF0:lI120|H3BFFA4
-3BFFA4:lI109|H3C0050
-3C0050:lI97|H3C00FC
-3C00FC:lI112|N
-3BF07C:lI112|H3BF140
-3BF140:lI112|H3BF1F4
-3BF1F4:lI109|N
-3BEFC4:lH3BF08C|H3BF098
-3BF08C:t2:H3BF150,H3BF158
-3BF158:lI105|H3BF20C
-3BF20C:lI109|H3BF2C0
-3BF2C0:lI97|H3BF35C
-3BF35C:lI103|H3BF408
-3BF408:lI101|H3BF4BC
-3BF4BC:lI47|H3BF578
-3BF578:lI120|H3BF63C
-3BF63C:lI45|H3BF710
-3BF710:lI112|H3BF7DC
-3BF7DC:lI111|H3BF8B0
-3BF8B0:lI114|H3BF98C
-3BF98C:lI116|H3BFA60
-3BFA60:lI97|H3BFB34
-3BFB34:lI98|H3BFC00
-3BFC00:lI108|H3BFCCC
-3BFCCC:lI101|H3BFD90
-3BFD90:lI45|H3BFE4C
-3BFE4C:lI103|H3BFEF8
-3BFEF8:lI114|H3BFFAC
-3BFFAC:lI97|H3C0058
-3C0058:lI121|H3C0104
-3C0104:lI109|H3C01A8
-3C01A8:lI97|H3C025C
-3C025C:lI112|N
-3BF150:lI112|H3BF204
-3BF204:lI103|H3BF2B8
-3BF2B8:lI109|N
-3BF098:lH3BF160|H3BF16C
-3BF160:t2:H3BF214,H3BF21C
-3BF21C:lI105|H3BF2D0
-3BF2D0:lI109|H3BF36C
-3BF36C:lI97|H3BF410
-3BF410:lI103|H3BF4C4
-3BF4C4:lI101|H3BF580
-3BF580:lI47|H3BF644
-3BF644:lI120|H3BF718
-3BF718:lI45|H3BF7E4
-3BF7E4:lI112|H3BF8B8
-3BF8B8:lI111|H3BF994
-3BF994:lI114|H3BFA68
-3BFA68:lI116|H3BFB3C
-3BFB3C:lI97|H3BFC08
-3BFC08:lI98|H3BFCD4
-3BFCD4:lI108|H3BFD98
-3BFD98:lI101|H3BFE54
-3BFE54:lI45|H3BFF00
-3BFF00:lI98|H3BFFB4
-3BFFB4:lI105|H3C0060
-3C0060:lI116|H3C010C
-3C010C:lI109|H3C01B0
-3C01B0:lI97|H3C0264
-3C0264:lI112|N
-3BF214:lI112|H3BF2C8
-3BF2C8:lI98|H3BF364
-3BF364:lI109|N
-3BF16C:lH3BF224|H3BF230
-3BF224:t2:H3BF2D8,H3BF2E0
-3BF2E0:lI105|H3BF37C
-3BF37C:lI109|H3BF420
-3BF420:lI97|H3BF4CC
-3BF4CC:lI103|H3BF588
-3BF588:lI101|H3BF64C
-3BF64C:lI47|H3BF720
-3BF720:lI120|H3BF7EC
-3BF7EC:lI45|H3BF8C0
-3BF8C0:lI112|H3BF99C
-3BF99C:lI111|H3BFA70
-3BFA70:lI114|H3BFB44
-3BFB44:lI116|H3BFC10
-3BFC10:lI97|H3BFCDC
-3BFCDC:lI98|H3BFDA0
-3BFDA0:lI108|H3BFE5C
-3BFE5C:lI101|H3BFF08
-3BFF08:lI45|H3BFFBC
-3BFFBC:lI97|H3C0068
-3C0068:lI110|H3C0114
-3C0114:lI121|H3C01B8
-3C01B8:lI109|H3C026C
-3C026C:lI97|H3C0318
-3C0318:lI112|N
-3BF2D8:lI112|H3BF374
-3BF374:lI110|H3BF418
-3BF418:lI109|N
-3BF230:lH3BF2E8|H3BF2F4
-3BF2E8:t2:H3BF384,H3BF38C
-3BF38C:lI105|H3BF430
-3BF430:lI109|H3BF4DC
-3BF4DC:lI97|H3BF590
-3BF590:lI103|H3BF654
-3BF654:lI101|H3BF728
-3BF728:lI47|H3BF7F4
-3BF7F4:lI120|H3BF8C8
-3BF8C8:lI45|H3BF9A4
-3BF9A4:lI99|H3BFA78
-3BFA78:lI109|H3BFB4C
-3BFB4C:lI117|H3BFC18
-3BFC18:lI45|H3BFCE4
-3BFCE4:lI114|H3BFDA8
-3BFDA8:lI97|H3BFE64
-3BFE64:lI115|H3BFF10
-3BFF10:lI116|H3BFFC4
-3BFFC4:lI101|H3C0070
-3C0070:lI114|N
-3BF384:lI114|H3BF428
-3BF428:lI97|H3BF4D4
-3BF4D4:lI115|N
-3BF2F4:lH3BF394|H3BF3A0
-3BF394:t2:H3BF438,H3BF440
-3BF440:lI105|H3BF4EC
-3BF4EC:lI109|H3BF5A0
-3BF5A0:lI97|H3BF664
-3BF664:lI103|H3BF730
-3BF730:lI101|H3BF7FC
-3BF7FC:lI47|H3BF8D0
-3BF8D0:lI116|H3BF9AC
-3BF9AC:lI105|H3BFA80
-3BFA80:lI102|H3BFB54
-3BFB54:lI102|N
-3BF438:lI116|H3BF4E4
-3BF4E4:lI105|H3BF598
-3BF598:lI102|H3BF65C
-3BF65C:lI102|N
-3BF3A0:lH3BF448|H3BF454
-3BF448:t2:H3BF4F4,H3BF4FC
-3BF4FC:lI105|H3BF5B0
-3BF5B0:lI109|H3BF674
-3BF674:lI97|H3BF738
-3BF738:lI103|H3BF804
-3BF804:lI101|H3BF8D8
-3BF8D8:lI47|H3BF9B4
-3BF9B4:lI116|H3BFA88
-3BFA88:lI105|H3BFB5C
-3BFB5C:lI102|H3BFC20
-3BFC20:lI102|N
-3BF4F4:lI116|H3BF5A8
-3BF5A8:lI105|H3BF66C
-3BF66C:lI102|N
-3BF454:lH3BF504|H3BF510
-3BF504:t2:H3BF5B8,H3BF5C0
-3BF5C0:lI105|H3BF684
-3BF684:lI109|H3BF748
-3BF748:lI97|H3BF80C
-3BF80C:lI103|H3BF8E0
-3BF8E0:lI101|H3BF9BC
-3BF9BC:lI47|H3BFA90
-3BFA90:lI112|H3BFB64
-3BFB64:lI110|H3BFC28
-3BFC28:lI103|N
-3BF5B8:lI112|H3BF67C
-3BF67C:lI110|H3BF740
-3BF740:lI103|N
-3BF510:lH3BF5C8|H3BF5D4
-3BF5C8:t2:H3BF68C,H3BF694
-3BF694:lI105|H3BF758
-3BF758:lI109|H3BF81C
-3BF81C:lI97|H3BF8F0
-3BF8F0:lI103|H3BF9C4
-3BF9C4:lI101|H3BFA98
-3BFA98:lI47|H3BFB6C
-3BFB6C:lI106|H3BFC30
-3BFC30:lI112|H3BFCEC
-3BFCEC:lI101|H3BFDB0
-3BFDB0:lI103|N
-3BF68C:lI106|H3BF750
-3BF750:lI112|H3BF814
-3BF814:lI101|H3BF8E8
-3BF8E8:lI103|N
-3BF5D4:lH3BF69C|H3BF6A8
-3BF69C:t2:H3BF760,H3BF768
-3BF768:lI105|H3BF82C
-3BF82C:lI109|H3BF900
-3BF900:lI97|H3BF9CC
-3BF9CC:lI103|H3BFAA0
-3BFAA0:lI101|H3BFB74
-3BFB74:lI47|H3BFC38
-3BFC38:lI106|H3BFCF4
-3BFCF4:lI112|H3BFDB8
-3BFDB8:lI101|H3BFE6C
-3BFE6C:lI103|N
-3BF760:lI106|H3BF824
-3BF824:lI112|H3BF8F8
-3BF8F8:lI103|N
-3BF6A8:lH3BF770|H3BF77C
-3BF770:t2:H3BF834,H3BF83C
-3BF83C:lI105|H3BF910
-3BF910:lI109|H3BF9DC
-3BF9DC:lI97|H3BFAA8
-3BFAA8:lI103|H3BFB7C
-3BFB7C:lI101|H3BFC40
-3BFC40:lI47|H3BFCFC
-3BFCFC:lI106|H3BFDC0
-3BFDC0:lI112|H3BFE74
-3BFE74:lI101|H3BFF18
-3BFF18:lI103|N
-3BF834:lI106|H3BF908
-3BF908:lI112|H3BF9D4
-3BF9D4:lI101|N
-3BF77C:lH3BF844|H3BF850
-3BF844:t2:H3BF918,H3BF920
-3BF920:lI105|H3BF9EC
-3BF9EC:lI109|H3BFAB8
-3BFAB8:lI97|H3BFB84
-3BFB84:lI103|H3BFC48
-3BFC48:lI101|H3BFD04
-3BFD04:lI47|H3BFDC8
-3BFDC8:lI105|H3BFE7C
-3BFE7C:lI101|H3BFF20
-3BFF20:lI102|N
-3BF918:lI105|H3BF9E4
-3BF9E4:lI101|H3BFAB0
-3BFAB0:lI102|N
-3BF850:lH3BF928|H3BF934
-3BF928:t2:H3BF9F4,H3BF9FC
-3BF9FC:lI105|H3BFAC8
-3BFAC8:lI109|H3BFB94
-3BFB94:lI97|H3BFC50
-3BFC50:lI103|H3BFD0C
-3BFD0C:lI101|H3BFDD0
-3BFDD0:lI47|H3BFE84
-3BFE84:lI103|H3BFF28
-3BFF28:lI105|H3BFFCC
-3BFFCC:lI102|N
-3BF9F4:lI103|H3BFAC0
-3BFAC0:lI105|H3BFB8C
-3BFB8C:lI102|N
-3BF934:lH3BFA04|H3BFA10
-3BFA04:t2:H3BFAD0,H3BFAD8
-3BFAD8:lI99|H3BFBA4
-3BFBA4:lI104|H3BFC60
-3BFC60:lI101|H3BFD14
-3BFD14:lI109|H3BFDD8
-3BFDD8:lI105|H3BFE8C
-3BFE8C:lI99|H3BFF30
-3BFF30:lI97|H3BFFD4
-3BFFD4:lI108|H3C0078
-3C0078:lI47|H3C011C
-3C011C:lI120|H3C01C0
-3C01C0:lI45|H3C0274
-3C0274:lI112|H3C0320
-3C0320:lI100|H3C03CC
-3C03CC:lI98|N
-3BFAD0:lI112|H3BFB9C
-3BFB9C:lI100|H3BFC58
-3BFC58:lI98|N
-3BFA10:lH3BFAE0|H3BFAEC
-3BFAE0:t2:H3BFBAC,H3BFBB4
-3BFBB4:lI99|H3BFC70
-3BFC70:lI104|H3BFD24
-3BFD24:lI101|H3BFDE0
-3BFDE0:lI109|H3BFE94
-3BFE94:lI105|H3BFF38
-3BFF38:lI99|H3BFFDC
-3BFFDC:lI97|H3C0080
-3C0080:lI108|H3C0124
-3C0124:lI47|H3C01C8
-3C01C8:lI120|H3C027C
-3C027C:lI45|H3C0328
-3C0328:lI112|H3C03D4
-3C03D4:lI100|H3C0460
-3C0460:lI98|N
-3BFBAC:lI120|H3BFC68
-3BFC68:lI121|H3BFD1C
-3BFD1C:lI122|N
-3BFAEC:lH3BFBBC|H3BFBC8
-3BFBBC:t2:H3BFC78,H3BFC80
-3BFC80:lI97|H3BFD34
-3BFD34:lI117|H3BFDF0
-3BFDF0:lI100|H3BFE9C
-3BFE9C:lI105|H3BFF40
-3BFF40:lI111|H3BFFE4
-3BFFE4:lI47|H3C0088
-3C0088:lI120|H3C012C
-3C012C:lI45|H3C01D0
-3C01D0:lI119|H3C0284
-3C0284:lI97|H3C0330
-3C0330:lI118|N
-3BFC78:lI119|H3BFD2C
-3BFD2C:lI97|H3BFDE8
-3BFDE8:lI118|N
-3BFBC8:lH3BFC88|H3BFC94
-3BFC88:t2:H3BFD3C,H3BFD44
-3BFD44:lI97|H3BFE00
-3BFE00:lI117|H3BFEA4
-3BFEA4:lI100|H3BFF48
-3BFF48:lI105|H3BFFEC
-3BFFEC:lI111|H3C0090
-3C0090:lI47|H3C0134
-3C0134:lI120|H3C01D8
-3C01D8:lI45|H3C028C
-3C028C:lI114|H3C0338
-3C0338:lI101|H3C03DC
-3C03DC:lI97|H3C0468
-3C0468:lI108|H3C04FC
-3C04FC:lI97|H3C0598
-3C0598:lI117|H3C063C
-3C063C:lI100|H3C06E8
-3C06E8:lI105|H3C0794
-3C0794:lI111|N
-3BFD3C:lI114|H3BFDF8
-3BFDF8:lI97|N
-3BFC94:lH3BFD4C|H3BFD58
-3BFD4C:t2:H3BFE08,H3BFE10
-3BFE10:lI97|H3BFEB4
-3BFEB4:lI117|H3BFF58
-3BFF58:lI100|H3BFFF4
-3BFFF4:lI105|H3C0098
-3C0098:lI111|H3C013C
-3C013C:lI47|H3C01E0
-3C01E0:lI120|H3C0294
-3C0294:lI45|H3C0340
-3C0340:lI112|H3C03E4
-3C03E4:lI110|H3C0470
-3C0470:lI45|H3C0504
-3C0504:lI114|H3C05A0
-3C05A0:lI101|H3C0644
-3C0644:lI97|H3C06F0
-3C06F0:lI108|H3C079C
-3C079C:lI97|H3C0838
-3C0838:lI117|H3C08C4
-3C08C4:lI100|H3C0958
-3C0958:lI105|H3C09EC
-3C09EC:lI111|H3C0A88
-3C0A88:lI45|H3C0B2C
-3C0B2C:lI112|H3C0BD0
-3C0BD0:lI108|H3C0C84
-3C0C84:lI117|H3C0D38
-3C0D38:lI103|H3C0DEC
-3C0DEC:lI105|H3C0EA0
-3C0EA0:lI110|N
-3BFE08:lI114|H3BFEAC
-3BFEAC:lI112|H3BFF50
-3BFF50:lI109|N
-3BFD58:lH3BFE18|H3BFE24
-3BFE18:t2:H3BFEBC,H3BFEC4
-3BFEC4:lI97|H3BFF68
-3BFF68:lI117|H3C0004
-3C0004:lI100|H3C00A0
-3C00A0:lI105|H3C0144
-3C0144:lI111|H3C01E8
-3C01E8:lI47|H3C029C
-3C029C:lI120|H3C0348
-3C0348:lI45|H3C03EC
-3C03EC:lI112|H3C0478
-3C0478:lI110|H3C050C
-3C050C:lI45|H3C05A8
-3C05A8:lI114|H3C064C
-3C064C:lI101|H3C06F8
-3C06F8:lI97|H3C07A4
-3C07A4:lI108|H3C0840
-3C0840:lI97|H3C08CC
-3C08CC:lI117|H3C0960
-3C0960:lI100|H3C09F4
-3C09F4:lI105|H3C0A90
-3C0A90:lI111|N
-3BFEBC:lI114|H3BFF60
-3BFF60:lI97|H3BFFFC
-3BFFFC:lI109|N
-3BFE24:lH3BFECC|H3BFED8
-3BFECC:t2:H3BFF70,H3BFF78
-3BFF78:lI97|H3C0014
-3C0014:lI117|H3C00B0
-3C00B0:lI100|H3C014C
-3C014C:lI105|H3C01F0
-3C01F0:lI111|H3C02A4
-3C02A4:lI47|H3C0350
-3C0350:lI120|H3C03F4
-3C03F4:lI45|H3C0480
-3C0480:lI97|H3C0514
-3C0514:lI105|H3C05B0
-3C05B0:lI102|H3C0654
-3C0654:lI102|N
-3BFF70:lI97|H3C000C
-3C000C:lI105|H3C00A8
-3C00A8:lI102|N
-3BFED8:lH3BFF80|H3BFF8C
-3BFF80:t2:H3C001C,H3C0024
-3C0024:lI97|H3C00C0
-3C00C0:lI117|H3C015C
-3C015C:lI100|H3C0200
-3C0200:lI105|H3C02AC
-3C02AC:lI111|H3C0358
-3C0358:lI47|H3C03FC
-3C03FC:lI120|H3C0488
-3C0488:lI45|H3C051C
-3C051C:lI97|H3C05B8
-3C05B8:lI105|H3C065C
-3C065C:lI102|H3C0700
-3C0700:lI102|N
-3C001C:lI97|H3C00B8
-3C00B8:lI105|H3C0154
-3C0154:lI102|H3C01F8
-3C01F8:lI102|N
-3BFF8C:lH3C002C|H3C0038
-3C002C:t2:H3C00C8,H3C00D0
-3C00D0:lI97|H3C016C
-3C016C:lI117|H3C0210
-3C0210:lI100|H3C02BC
-3C02BC:lI105|H3C0360
-3C0360:lI111|H3C0404
-3C0404:lI47|H3C0490
-3C0490:lI120|H3C0524
-3C0524:lI45|H3C05C0
-3C05C0:lI97|H3C0664
-3C0664:lI105|H3C0708
-3C0708:lI102|H3C07AC
-3C07AC:lI102|N
-3C00C8:lI97|H3C0164
-3C0164:lI105|H3C0208
-3C0208:lI102|H3C02B4
-3C02B4:lI99|N
-3C0038:lH3C00D8|H3C00E4
-3C00D8:t2:H3C0174,H3C017C
-3C017C:lI97|H3C0220
-3C0220:lI117|H3C02CC
-3C02CC:lI100|H3C0370
-3C0370:lI105|H3C040C
-3C040C:lI111|H3C0498
-3C0498:lI47|H3C052C
-3C052C:lI109|H3C05C8
-3C05C8:lI112|H3C066C
-3C066C:lI101|H3C0710
-3C0710:lI103|N
-3C0174:lI109|H3C0218
-3C0218:lI112|H3C02C4
-3C02C4:lI103|H3C0368
-3C0368:lI97|N
-3C00E4:lH3C0184|H3C0190
-3C0184:t2:H3C0228,H3C0230
-3C0230:lI97|H3C02DC
-3C02DC:lI117|H3C0380
-3C0380:lI100|H3C0414
-3C0414:lI105|H3C04A0
-3C04A0:lI111|H3C0534
-3C0534:lI47|H3C05D0
-3C05D0:lI109|H3C0674
-3C0674:lI112|H3C0718
-3C0718:lI101|H3C07B4
-3C07B4:lI103|N
-3C0228:lI109|H3C02D4
-3C02D4:lI112|H3C0378
-3C0378:lI50|N
-3C0190:lH3C0238|H3C0244
-3C0238:t2:H3C02E4,H3C02EC
-3C02EC:lI97|H3C0390
-3C0390:lI117|H3C041C
-3C041C:lI100|H3C04A8
-3C04A8:lI105|H3C053C
-3C053C:lI111|H3C05D8
-3C05D8:lI47|H3C067C
-3C067C:lI98|H3C0720
-3C0720:lI97|H3C07BC
-3C07BC:lI115|H3C0848
-3C0848:lI105|H3C08D4
-3C08D4:lI99|N
-3C02E4:lI97|H3C0388
-3C0388:lI117|N
-3C0244:lH3C02F4|H3C0300
-3C02F4:t2:H3C0398,H3C03A0
-3C03A0:lI97|H3C042C
-3C042C:lI117|H3C04B8
-3C04B8:lI100|H3C0544
-3C0544:lI105|H3C05E0
-3C05E0:lI111|H3C0684
-3C0684:lI47|H3C0728
-3C0728:lI98|H3C07C4
-3C07C4:lI97|H3C0850
-3C0850:lI115|H3C08DC
-3C08DC:lI105|H3C0968
-3C0968:lI99|N
-3C0398:lI115|H3C0424
-3C0424:lI110|H3C04B0
-3C04B0:lI100|N
-3C0300:lH3C03A8|H3C03B4
-3C03A8:t2:H3C0434,H3C043C
-3C043C:lI97|H3C04C8
-3C04C8:lI112|H3C0554
-3C0554:lI112|H3C05E8
-3C05E8:lI108|H3C068C
-3C068C:lI105|H3C0730
-3C0730:lI99|H3C07CC
-3C07CC:lI97|H3C0858
-3C0858:lI116|H3C08E4
-3C08E4:lI105|H3C0970
-3C0970:lI111|H3C09FC
-3C09FC:lI110|H3C0A98
-3C0A98:lI47|H3C0B34
-3C0B34:lI122|H3C0BD8
-3C0BD8:lI105|H3C0C8C
-3C0C8C:lI112|N
-3C0434:lI122|H3C04C0
-3C04C0:lI105|H3C054C
-3C054C:lI112|N
-3C03B4:lH3C0444|H3C0450
-3C0444:t2:H3C04D0,H3C04D8
-3C04D8:lI97|H3C0564
-3C0564:lI112|H3C05F8
-3C05F8:lI112|H3C0694
-3C0694:lI108|H3C0738
-3C0738:lI105|H3C07D4
-3C07D4:lI99|H3C0860
-3C0860:lI97|H3C08EC
-3C08EC:lI116|H3C0978
-3C0978:lI105|H3C0A04
-3C0A04:lI111|H3C0AA0
-3C0AA0:lI110|H3C0B3C
-3C0B3C:lI47|H3C0BE0
-3C0BE0:lI120|H3C0C94
-3C0C94:lI45|H3C0D40
-3C0D40:lI119|H3C0DF4
-3C0DF4:lI97|H3C0EA8
-3C0EA8:lI105|H3C0F64
-3C0F64:lI115|H3C1030
-3C1030:lI45|H3C1104
-3C1104:lI115|H3C11D8
-3C11D8:lI111|H3C12A4
-3C12A4:lI117|H3C1378
-3C1378:lI114|H3C1454
-3C1454:lI99|H3C1538
-3C1538:lI101|N
-3C04D0:lI115|H3C055C
-3C055C:lI114|H3C05F0
-3C05F0:lI99|N
-3C0450:lH3C04E0|H3C04EC
-3C04E0:t2:H3C056C,H3C0574
-3C0574:lI97|H3C0608
-3C0608:lI112|H3C06A4
-3C06A4:lI112|H3C0748
-3C0748:lI108|H3C07E4
-3C07E4:lI105|H3C0868
-3C0868:lI99|H3C08F4
-3C08F4:lI97|H3C0980
-3C0980:lI116|H3C0A0C
-3C0A0C:lI105|H3C0AA8
-3C0AA8:lI111|H3C0B44
-3C0B44:lI110|H3C0BE8
-3C0BE8:lI47|H3C0C9C
-3C0C9C:lI120|H3C0D48
-3C0D48:lI45|H3C0DFC
-3C0DFC:lI117|H3C0EB0
-3C0EB0:lI115|H3C0F6C
-3C0F6C:lI116|H3C1038
-3C1038:lI97|H3C110C
-3C110C:lI114|N
-3C056C:lI117|H3C0600
-3C0600:lI115|H3C069C
-3C069C:lI116|H3C0740
-3C0740:lI97|H3C07DC
-3C07DC:lI114|N
-3C04EC:lH3C057C|H3C0588
-3C057C:t2:H3C0610,H3C0618
-3C0618:lI97|H3C06B4
-3C06B4:lI112|H3C0750
-3C0750:lI112|H3C07EC
-3C07EC:lI108|H3C0870
-3C0870:lI105|H3C08FC
-3C08FC:lI99|H3C0988
-3C0988:lI97|H3C0A14
-3C0A14:lI116|H3C0AB0
-3C0AB0:lI105|H3C0B4C
-3C0B4C:lI111|H3C0BF0
-3C0BF0:lI110|H3C0CA4
-3C0CA4:lI47|H3C0D50
-3C0D50:lI120|H3C0E04
-3C0E04:lI45|H3C0EB8
-3C0EB8:lI116|H3C0F74
-3C0F74:lI114|H3C1040
-3C1040:lI111|H3C1114
-3C1114:lI102|H3C11E0
-3C11E0:lI102|H3C12AC
-3C12AC:lI45|H3C1380
-3C1380:lI109|H3C145C
-3C145C:lI115|N
-3C0610:lI109|H3C06AC
-3C06AC:lI115|N
-3C0588:lH3C0620|H3C062C
-3C0620:t2:H3C06BC,H3C06C4
-3C06C4:lI97|H3C0760
-3C0760:lI112|H3C07F4
-3C07F4:lI112|H3C0878
-3C0878:lI108|H3C0904
-3C0904:lI105|H3C0990
-3C0990:lI99|H3C0A1C
-3C0A1C:lI97|H3C0AB8
-3C0AB8:lI116|H3C0B54
-3C0B54:lI105|H3C0BF8
-3C0BF8:lI111|H3C0CAC
-3C0CAC:lI110|H3C0D58
-3C0D58:lI47|H3C0E0C
-3C0E0C:lI120|H3C0EC0
-3C0EC0:lI45|H3C0F7C
-3C0F7C:lI116|H3C1048
-3C1048:lI114|H3C111C
-3C111C:lI111|H3C11E8
-3C11E8:lI102|H3C12B4
-3C12B4:lI102|H3C1388
-3C1388:lI45|H3C1464
-3C1464:lI109|H3C1540
-3C1540:lI101|N
-3C06BC:lI109|H3C0758
-3C0758:lI101|N
-3C062C:lH3C06CC|H3C06D8
-3C06CC:t2:H3C0768,H3C0770
-3C0770:lI97|H3C0804
-3C0804:lI112|H3C0888
-3C0888:lI112|H3C090C
-3C090C:lI108|H3C0998
-3C0998:lI105|H3C0A24
-3C0A24:lI99|H3C0AC0
-3C0AC0:lI97|H3C0B5C
-3C0B5C:lI116|H3C0C00
-3C0C00:lI105|H3C0CB4
-3C0CB4:lI111|H3C0D60
-3C0D60:lI110|H3C0E14
-3C0E14:lI47|H3C0EC8
-3C0EC8:lI120|H3C0F84
-3C0F84:lI45|H3C1050
-3C1050:lI116|H3C1124
-3C1124:lI114|H3C11F0
-3C11F0:lI111|H3C12BC
-3C12BC:lI102|H3C1390
-3C1390:lI102|H3C146C
-3C146C:lI45|H3C1548
-3C1548:lI109|H3C161C
-3C161C:lI97|H3C16F0
-3C16F0:lI110|N
-3C0768:lI109|H3C07FC
-3C07FC:lI97|H3C0880
-3C0880:lI110|N
-3C06D8:lH3C0778|H3C0784
-3C0778:t2:H3C080C,H3C0814
-3C0814:lI97|H3C0890
-3C0890:lI112|H3C0914
-3C0914:lI112|H3C09A0
-3C09A0:lI108|H3C0A2C
-3C0A2C:lI105|H3C0AC8
-3C0AC8:lI99|H3C0B64
-3C0B64:lI97|H3C0C08
-3C0C08:lI116|H3C0CBC
-3C0CBC:lI105|H3C0D68
-3C0D68:lI111|H3C0E1C
-3C0E1C:lI110|H3C0ED0
-3C0ED0:lI47|H3C0F8C
-3C0F8C:lI120|H3C1058
-3C1058:lI45|H3C112C
-3C112C:lI116|H3C11F8
-3C11F8:lI114|H3C12C4
-3C12C4:lI111|H3C1398
-3C1398:lI102|H3C1474
-3C1474:lI102|N
-3C080C:lI116|N
-3C0784:lH3C081C|H3C0828
-3C081C:t2:H3C0898,H3C08A0
-3C08A0:lI97|H3C0924
-3C0924:lI112|H3C09A8
-3C09A8:lI112|H3C0A34
-3C0A34:lI108|H3C0AD0
-3C0AD0:lI105|H3C0B6C
-3C0B6C:lI99|H3C0C10
-3C0C10:lI97|H3C0CC4
-3C0CC4:lI116|H3C0D70
-3C0D70:lI105|H3C0E24
-3C0E24:lI111|H3C0ED8
-3C0ED8:lI110|H3C0F94
-3C0F94:lI47|H3C1060
-3C1060:lI120|H3C1134
-3C1134:lI45|H3C1200
-3C1200:lI116|H3C12CC
-3C12CC:lI114|H3C13A0
-3C13A0:lI111|H3C147C
-3C147C:lI102|H3C1550
-3C1550:lI102|N
-3C0898:lI116|H3C091C
-3C091C:lI114|N
-3C0828:lH3C08A8|H3C08B4
-3C08A8:t2:H3C092C,H3C0934
-3C0934:lI97|H3C09B8
-3C09B8:lI112|H3C0A44
-3C0A44:lI112|H3C0AE0
-3C0AE0:lI108|H3C0B74
-3C0B74:lI105|H3C0C18
-3C0C18:lI99|H3C0CCC
-3C0CCC:lI97|H3C0D78
-3C0D78:lI116|H3C0E2C
-3C0E2C:lI105|H3C0EE0
-3C0EE0:lI111|H3C0F9C
-3C0F9C:lI110|H3C1068
-3C1068:lI47|H3C113C
-3C113C:lI120|H3C1208
-3C1208:lI45|H3C12D4
-3C12D4:lI116|H3C13A8
-3C13A8:lI114|H3C1484
-3C1484:lI111|H3C1558
-3C1558:lI102|H3C1624
-3C1624:lI102|N
-3C092C:lI114|H3C09B0
-3C09B0:lI111|H3C0A3C
-3C0A3C:lI102|H3C0AD8
-3C0AD8:lI102|N
-3C08B4:lH3C093C|H3C0948
-3C093C:t2:H3C09C0,H3C09C8
-3C09C8:lI97|H3C0A54
-3C0A54:lI112|H3C0AF0
-3C0AF0:lI112|H3C0B84
-3C0B84:lI108|H3C0C28
-3C0C28:lI105|H3C0CDC
-3C0CDC:lI99|H3C0D88
-3C0D88:lI97|H3C0E34
-3C0E34:lI116|H3C0EE8
-3C0EE8:lI105|H3C0FA4
-3C0FA4:lI111|H3C1070
-3C1070:lI110|H3C1144
-3C1144:lI47|H3C1210
-3C1210:lI120|H3C12DC
-3C12DC:lI45|H3C13B0
-3C13B0:lI116|H3C148C
-3C148C:lI101|H3C1560
-3C1560:lI120|H3C162C
-3C162C:lI105|H3C16F8
-3C16F8:lI110|H3C17BC
-3C17BC:lI102|H3C1880
-3C1880:lI111|N
-3C09C0:lI116|H3C0A4C
-3C0A4C:lI101|H3C0AE8
-3C0AE8:lI120|H3C0B7C
-3C0B7C:lI105|H3C0C20
-3C0C20:lI110|H3C0CD4
-3C0CD4:lI102|H3C0D80
-3C0D80:lI111|N
-3C0948:lH3C09D0|H3C09DC
-3C09D0:t2:H3C0A5C,H3C0A64
-3C0A64:lI97|H3C0B00
-3C0B00:lI112|H3C0B94
-3C0B94:lI112|H3C0C38
-3C0C38:lI108|H3C0CE4
-3C0CE4:lI105|H3C0D90
-3C0D90:lI99|H3C0E3C
-3C0E3C:lI97|H3C0EF0
-3C0EF0:lI116|H3C0FAC
-3C0FAC:lI105|H3C1078
-3C1078:lI111|H3C114C
-3C114C:lI110|H3C1218
-3C1218:lI47|H3C12E4
-3C12E4:lI120|H3C13B8
-3C13B8:lI45|H3C1494
-3C1494:lI116|H3C1568
-3C1568:lI101|H3C1634
-3C1634:lI120|H3C1700
-3C1700:lI105|H3C17C4
-3C17C4:lI110|H3C1888
-3C1888:lI102|H3C1944
-3C1944:lI111|N
-3C0A5C:lI116|H3C0AF8
-3C0AF8:lI101|H3C0B8C
-3C0B8C:lI120|H3C0C30
-3C0C30:lI105|N
-3C09DC:lH3C0A6C|H3C0A78
-3C0A6C:t2:H3C0B08,H3C0B10
-3C0B10:lI97|H3C0BA4
-3C0BA4:lI112|H3C0C48
-3C0C48:lI112|H3C0CEC
-3C0CEC:lI108|H3C0D98
-3C0D98:lI105|H3C0E44
-3C0E44:lI99|H3C0EF8
-3C0EF8:lI97|H3C0FB4
-3C0FB4:lI116|H3C1080
-3C1080:lI105|H3C1154
-3C1154:lI111|H3C1220
-3C1220:lI110|H3C12EC
-3C12EC:lI47|H3C13C0
-3C13C0:lI120|H3C149C
-3C149C:lI45|H3C1570
-3C1570:lI116|H3C163C
-3C163C:lI101|H3C1708
-3C1708:lI120|N
-3C0B08:lI116|H3C0B9C
-3C0B9C:lI101|H3C0C40
-3C0C40:lI120|N
-3C0A78:lH3C0B18|H3C0B24
-3C0B18:t2:H3C0BAC,H3C0BB4
-3C0BB4:lI97|H3C0C58
-3C0C58:lI112|H3C0CFC
-3C0CFC:lI112|H3C0DA0
-3C0DA0:lI108|H3C0E4C
-3C0E4C:lI105|H3C0F00
-3C0F00:lI99|H3C0FBC
-3C0FBC:lI97|H3C1088
-3C1088:lI116|H3C115C
-3C115C:lI105|H3C1228
-3C1228:lI111|H3C12F4
-3C12F4:lI110|H3C13C8
-3C13C8:lI47|H3C14A4
-3C14A4:lI120|H3C1578
-3C1578:lI45|H3C1644
-3C1644:lI116|H3C1710
-3C1710:lI99|H3C17CC
-3C17CC:lI108|N
-3C0BAC:lI116|H3C0C50
-3C0C50:lI99|H3C0CF4
-3C0CF4:lI108|N
-3C0B24:lH3C0BBC|H3C0BC8
-3C0BBC:t2:H3C0C60,H3C0C68
-3C0C68:lI97|H3C0D0C
-3C0D0C:lI112|H3C0DB0
-3C0DB0:lI112|H3C0E54
-3C0E54:lI108|H3C0F08
-3C0F08:lI105|H3C0FC4
-3C0FC4:lI99|H3C1090
-3C1090:lI97|H3C1164
-3C1164:lI116|H3C1230
-3C1230:lI105|H3C12FC
-3C12FC:lI111|H3C13D0
-3C13D0:lI110|H3C14AC
-3C14AC:lI47|H3C1580
-3C1580:lI120|H3C164C
-3C164C:lI45|H3C1718
-3C1718:lI116|H3C17D4
-3C17D4:lI97|H3C1890
-3C1890:lI114|N
-3C0C60:lI116|H3C0D04
-3C0D04:lI97|H3C0DA8
-3C0DA8:lI114|N
-3C0BC8:lH3C0C70|H3C0C7C
-3C0C70:t2:H3C0D14,H3C0D1C
-3C0D1C:lI97|H3C0DC0
-3C0DC0:lI112|H3C0E64
-3C0E64:lI112|H3C0F18
-3C0F18:lI108|H3C0FD4
-3C0FD4:lI105|H3C10A0
-3C10A0:lI99|H3C116C
-3C116C:lI97|H3C1238
-3C1238:lI116|H3C1304
-3C1304:lI105|H3C13D8
-3C13D8:lI111|H3C14B4
-3C14B4:lI110|H3C1588
-3C1588:lI47|H3C1654
-3C1654:lI120|H3C1720
-3C1720:lI45|H3C17DC
-3C17DC:lI115|H3C1898
-3C1898:lI118|H3C194C
-3C194C:lI52|H3C1A00
-3C1A00:lI99|H3C1AB4
-3C1AB4:lI114|H3C1B78
-3C1B78:lI99|N
-3C0D14:lI115|H3C0DB8
-3C0DB8:lI118|H3C0E5C
-3C0E5C:lI52|H3C0F10
-3C0F10:lI99|H3C0FCC
-3C0FCC:lI114|H3C1098
-3C1098:lI99|N
-3C0C7C:lH3C0D24|H3C0D30
-3C0D24:t2:H3C0DC8,H3C0DD0
-3C0DD0:lI97|H3C0E74
-3C0E74:lI112|H3C0F28
-3C0F28:lI112|H3C0FE4
-3C0FE4:lI108|H3C10B0
-3C10B0:lI105|H3C117C
-3C117C:lI99|H3C1248
-3C1248:lI97|H3C130C
-3C130C:lI116|H3C13E0
-3C13E0:lI105|H3C14BC
-3C14BC:lI111|H3C1590
-3C1590:lI110|H3C165C
-3C165C:lI47|H3C1728
-3C1728:lI120|H3C17E4
-3C17E4:lI45|H3C18A0
-3C18A0:lI115|H3C1954
-3C1954:lI118|H3C1A08
-3C1A08:lI52|H3C1ABC
-3C1ABC:lI99|H3C1B80
-3C1B80:lI112|H3C1C4C
-3C1C4C:lI105|H3C1D10
-3C1D10:lI111|N
-3C0DC8:lI115|H3C0E6C
-3C0E6C:lI118|H3C0F20
-3C0F20:lI52|H3C0FDC
-3C0FDC:lI99|H3C10A8
-3C10A8:lI112|H3C1174
-3C1174:lI105|H3C1240
-3C1240:lI111|N
-3C0D30:lH3C0DD8|H3C0DE4
-3C0DD8:t2:H3C0E7C,H3C0E84
-3C0E84:lI97|H3C0F38
-3C0F38:lI112|H3C0FF4
-3C0FF4:lI112|H3C10B8
-3C10B8:lI108|H3C1184
-3C1184:lI105|H3C1250
-3C1250:lI99|H3C1314
-3C1314:lI97|H3C13E8
-3C13E8:lI116|H3C14C4
-3C14C4:lI105|H3C1598
-3C1598:lI111|H3C1664
-3C1664:lI110|H3C1730
-3C1730:lI47|H3C17EC
-3C17EC:lI120|H3C18A8
-3C18A8:lI45|H3C195C
-3C195C:lI115|H3C1A10
-3C1A10:lI116|H3C1AC4
-3C1AC4:lI117|H3C1B88
-3C1B88:lI102|H3C1C54
-3C1C54:lI102|H3C1D18
-3C1D18:lI105|H3C1DD4
-3C1DD4:lI116|N
-3C0E7C:lI115|H3C0F30
-3C0F30:lI105|H3C0FEC
-3C0FEC:lI116|N
-3C0DE4:lH3C0E8C|H3C0E98
-3C0E8C:t2:H3C0F40,H3C0F48
-3C0F48:lI97|H3C1004
-3C1004:lI112|H3C10C8
-3C10C8:lI112|H3C1194
-3C1194:lI108|H3C1258
-3C1258:lI105|H3C131C
-3C131C:lI99|H3C13F0
-3C13F0:lI97|H3C14CC
-3C14CC:lI116|H3C15A0
-3C15A0:lI105|H3C166C
-3C166C:lI111|H3C1738
-3C1738:lI110|H3C17F4
-3C17F4:lI47|H3C18B0
-3C18B0:lI120|H3C1964
-3C1964:lI45|H3C1A18
-3C1A18:lI115|H3C1ACC
-3C1ACC:lI104|H3C1B90
-3C1B90:lI97|H3C1C5C
-3C1C5C:lI114|N
-3C0F40:lI115|H3C0FFC
-3C0FFC:lI104|H3C10C0
-3C10C0:lI97|H3C118C
-3C118C:lI114|N
-3C0E98:lH3C0F50|H3C0F5C
-3C0F50:t2:H3C100C,H3C1014
-3C1014:lI97|H3C10D8
-3C10D8:lI112|H3C119C
-3C119C:lI112|H3C1260
-3C1260:lI108|H3C1324
-3C1324:lI105|H3C13F8
-3C13F8:lI99|H3C14D4
-3C14D4:lI97|H3C15A8
-3C15A8:lI116|H3C1674
-3C1674:lI105|H3C1740
-3C1740:lI111|H3C17FC
-3C17FC:lI110|H3C18B8
-3C18B8:lI47|H3C196C
-3C196C:lI120|H3C1A20
-3C1A20:lI45|H3C1AD4
-3C1AD4:lI115|H3C1B98
-3C1B98:lI104|N
-3C100C:lI115|H3C10D0
-3C10D0:lI104|N
-3C0F5C:lH3C101C|H3C1028
-3C101C:t2:H3C10E0,H3C10E8
-3C10E8:lI97|H3C11AC
-3C11AC:lI112|H3C1268
-3C1268:lI112|H3C132C
-3C132C:lI108|H3C1400
-3C1400:lI105|H3C14DC
-3C14DC:lI99|H3C15B0
-3C15B0:lI97|H3C167C
-3C167C:lI116|H3C1748
-3C1748:lI105|H3C1804
-3C1804:lI111|H3C18C0
-3C18C0:lI110|H3C1974
-3C1974:lI47|H3C1A28
-3C1A28:lI120|H3C1ADC
-3C1ADC:lI45|H3C1BA0
-3C1BA0:lI110|H3C1C64
-3C1C64:lI101|H3C1D20
-3C1D20:lI116|H3C1DDC
-3C1DDC:lI99|H3C1E98
-3C1E98:lI100|H3C1F5C
-3C1F5C:lI102|N
-3C10E0:lI110|H3C11A4
-3C11A4:lI99|N
-3C1028:lH3C10F0|H3C10FC
-3C10F0:t2:H3C11B4,H3C11BC
-3C11BC:lI97|H3C1278
-3C1278:lI112|H3C133C
-3C133C:lI112|H3C1408
-3C1408:lI108|H3C14E4
-3C14E4:lI105|H3C15B8
-3C15B8:lI99|H3C1684
-3C1684:lI97|H3C1750
-3C1750:lI116|H3C180C
-3C180C:lI105|H3C18C8
-3C18C8:lI111|H3C197C
-3C197C:lI110|H3C1A30
-3C1A30:lI47|H3C1AE4
-3C1AE4:lI120|H3C1BA8
-3C1BA8:lI45|H3C1C6C
-3C1C6C:lI110|H3C1D28
-3C1D28:lI101|H3C1DE4
-3C1DE4:lI116|H3C1EA0
-3C1EA0:lI99|H3C1F64
-3C1F64:lI100|H3C2018
-3C2018:lI102|N
-3C11B4:lI99|H3C1270
-3C1270:lI100|H3C1334
-3C1334:lI102|N
-3C10FC:lH3C11C4|H3C11D0
-3C11C4:t2:H3C1280,H3C1288
-3C1288:lI97|H3C134C
-3C134C:lI112|H3C1418
-3C1418:lI112|H3C14EC
-3C14EC:lI108|H3C15C0
-3C15C0:lI105|H3C168C
-3C168C:lI99|H3C1758
-3C1758:lI97|H3C1814
-3C1814:lI116|H3C18D0
-3C18D0:lI105|H3C1984
-3C1984:lI111|H3C1A38
-3C1A38:lI110|H3C1AEC
-3C1AEC:lI47|H3C1BB0
-3C1BB0:lI120|H3C1C74
-3C1C74:lI45|H3C1D30
-3C1D30:lI109|H3C1DEC
-3C1DEC:lI105|H3C1EA8
-3C1EA8:lI102|N
-3C1280:lI109|H3C1344
-3C1344:lI105|H3C1410
-3C1410:lI102|N
-3C11D0:lH3C1290|H3C129C
-3C1290:t2:H3C1354,H3C135C
-3C135C:lI97|H3C1428
-3C1428:lI112|H3C14FC
-3C14FC:lI112|H3C15D0
-3C15D0:lI108|H3C169C
-3C169C:lI105|H3C1760
-3C1760:lI99|H3C181C
-3C181C:lI97|H3C18D8
-3C18D8:lI116|H3C198C
-3C198C:lI105|H3C1A40
-3C1A40:lI111|H3C1AF4
-3C1AF4:lI110|H3C1BB8
-3C1BB8:lI47|H3C1C7C
-3C1C7C:lI120|H3C1D38
-3C1D38:lI45|H3C1DF4
-3C1DF4:lI108|H3C1EB0
-3C1EB0:lI97|H3C1F6C
-3C1F6C:lI116|H3C2020
-3C2020:lI101|H3C20DC
-3C20DC:lI120|N
-3C1354:lI108|H3C1420
-3C1420:lI97|H3C14F4
-3C14F4:lI116|H3C15C8
-3C15C8:lI101|H3C1694
-3C1694:lI120|N
-3C129C:lH3C1364|H3C1370
-3C1364:t2:H3C1430,H3C1438
-3C1438:lI97|H3C150C
-3C150C:lI112|H3C15E0
-3C15E0:lI112|H3C16A4
-3C16A4:lI108|H3C1768
-3C1768:lI105|H3C1824
-3C1824:lI99|H3C18E0
-3C18E0:lI97|H3C1994
-3C1994:lI116|H3C1A48
-3C1A48:lI105|H3C1AFC
-3C1AFC:lI111|H3C1BC0
-3C1BC0:lI110|H3C1C84
-3C1C84:lI47|H3C1D40
-3C1D40:lI120|H3C1DFC
-3C1DFC:lI45|H3C1EB8
-3C1EB8:lI107|H3C1F74
-3C1F74:lI111|H3C2028
-3C2028:lI97|H3C20E4
-3C20E4:lI110|N
-3C1430:lI115|H3C1504
-3C1504:lI107|H3C15D8
-3C15D8:lI112|N
-3C1370:lH3C1440|H3C144C
-3C1440:t2:H3C1514,H3C151C
-3C151C:lI97|H3C15F0
-3C15F0:lI112|H3C16B4
-3C16B4:lI112|H3C1770
-3C1770:lI108|H3C182C
-3C182C:lI105|H3C18E8
-3C18E8:lI99|H3C199C
-3C199C:lI97|H3C1A50
-3C1A50:lI116|H3C1B04
-3C1B04:lI105|H3C1BC8
-3C1BC8:lI111|H3C1C8C
-3C1C8C:lI110|H3C1D48
-3C1D48:lI47|H3C1E04
-3C1E04:lI120|H3C1EC0
-3C1EC0:lI45|H3C1F7C
-3C1F7C:lI107|H3C2030
-3C2030:lI111|H3C20EC
-3C20EC:lI97|H3C21A0
-3C21A0:lI110|N
-3C1514:lI115|H3C15E8
-3C15E8:lI107|H3C16AC
-3C16AC:lI100|N
-3C144C:lH3C1524|H3C1530
-3C1524:t2:H3C15F8,H3C1600
-3C1600:lI97|H3C16C4
-3C16C4:lI112|H3C1780
-3C1780:lI112|H3C1834
-3C1834:lI108|H3C18F0
-3C18F0:lI105|H3C19A4
-3C19A4:lI99|H3C1A58
-3C1A58:lI97|H3C1B0C
-3C1B0C:lI116|H3C1BD0
-3C1BD0:lI105|H3C1C94
-3C1C94:lI111|H3C1D50
-3C1D50:lI110|H3C1E0C
-3C1E0C:lI47|H3C1EC8
-3C1EC8:lI120|H3C1F84
-3C1F84:lI45|H3C2038
-3C2038:lI107|H3C20F4
-3C20F4:lI111|H3C21A8
-3C21A8:lI97|H3C225C
-3C225C:lI110|N
-3C15F8:lI115|H3C16BC
-3C16BC:lI107|H3C1778
-3C1778:lI116|N
-3C1530:lH3C1608|H3C1614
-3C1608:t2:H3C16CC,H3C16D4
-3C16D4:lI97|H3C1790
-3C1790:lI112|H3C1844
-3C1844:lI112|H3C18F8
-3C18F8:lI108|H3C19AC
-3C19AC:lI105|H3C1A60
-3C1A60:lI99|H3C1B14
-3C1B14:lI97|H3C1BD8
-3C1BD8:lI116|H3C1C9C
-3C1C9C:lI105|H3C1D58
-3C1D58:lI111|H3C1E14
-3C1E14:lI110|H3C1ED0
-3C1ED0:lI47|H3C1F8C
-3C1F8C:lI120|H3C2040
-3C2040:lI45|H3C20FC
-3C20FC:lI107|H3C21B0
-3C21B0:lI111|H3C2264
-3C2264:lI97|H3C2320
-3C2320:lI110|N
-3C16CC:lI115|H3C1788
-3C1788:lI107|H3C183C
-3C183C:lI109|N
-3C1614:lH3C16DC|H3C16E8
-3C16DC:t2:H3C1798,H3C17A0
-3C17A0:lI97|H3C1854
-3C1854:lI112|H3C1908
-3C1908:lI112|H3C19B4
-3C19B4:lI108|H3C1A68
-3C1A68:lI105|H3C1B1C
-3C1B1C:lI99|H3C1BE0
-3C1BE0:lI97|H3C1CA4
-3C1CA4:lI116|H3C1D60
-3C1D60:lI105|H3C1E1C
-3C1E1C:lI111|H3C1ED8
-3C1ED8:lI110|H3C1F94
-3C1F94:lI47|H3C2048
-3C2048:lI120|H3C2104
-3C2104:lI45|H3C21B8
-3C21B8:lI104|H3C226C
-3C226C:lI116|H3C2328
-3C2328:lI116|H3C23E4
-3C23E4:lI112|H3C2498
-3C2498:lI100|H3C2554
-3C2554:lI45|H3C2610
-3C2610:lI99|H3C26D4
-3C26D4:lI103|H3C2790
-3C2790:lI105|N
-3C1798:lI99|H3C184C
-3C184C:lI103|H3C1900
-3C1900:lI105|N
-3C16E8:lH3C17A8|H3C17B4
-3C17A8:t2:H3C185C,H3C1864
-3C1864:lI97|H3C1918
-3C1918:lI112|H3C19C4
-3C19C4:lI112|H3C1A70
-3C1A70:lI108|H3C1B24
-3C1B24:lI105|H3C1BE8
-3C1BE8:lI99|H3C1CAC
-3C1CAC:lI97|H3C1D68
-3C1D68:lI116|H3C1E24
-3C1E24:lI105|H3C1EE0
-3C1EE0:lI111|H3C1F9C
-3C1F9C:lI110|H3C2050
-3C2050:lI47|H3C210C
-3C210C:lI120|H3C21C0
-3C21C0:lI45|H3C2274
-3C2274:lI104|H3C2330
-3C2330:lI100|H3C23EC
-3C23EC:lI102|N
-3C185C:lI104|H3C1910
-3C1910:lI100|H3C19BC
-3C19BC:lI102|N
-3C17B4:lH3C186C|H3C1878
-3C186C:t2:H3C1920,H3C1928
-3C1928:lI97|H3C19D4
-3C19D4:lI112|H3C1A78
-3C1A78:lI112|H3C1B2C
-3C1B2C:lI108|H3C1BF0
-3C1BF0:lI105|H3C1CB4
-3C1CB4:lI99|H3C1D70
-3C1D70:lI97|H3C1E2C
-3C1E2C:lI116|H3C1EE8
-3C1EE8:lI105|H3C1FA4
-3C1FA4:lI111|H3C2058
-3C2058:lI110|H3C2114
-3C2114:lI47|H3C21C8
-3C21C8:lI120|H3C227C
-3C227C:lI45|H3C2338
-3C2338:lI103|H3C23F4
-3C23F4:lI122|H3C24A0
-3C24A0:lI105|H3C255C
-3C255C:lI112|N
-3C1920:lI103|H3C19CC
-3C19CC:lI122|N
-3C1878:lH3C1930|H3C193C
-3C1930:t2:H3C19DC,H3C19E4
-3C19E4:lI97|H3C1A88
-3C1A88:lI112|H3C1B3C
-3C1B3C:lI112|H3C1C00
-3C1C00:lI108|H3C1CBC
-3C1CBC:lI105|H3C1D78
-3C1D78:lI99|H3C1E34
-3C1E34:lI97|H3C1EF0
-3C1EF0:lI116|H3C1FAC
-3C1FAC:lI105|H3C2060
-3C2060:lI111|H3C211C
-3C211C:lI110|H3C21D0
-3C21D0:lI47|H3C2284
-3C2284:lI120|H3C2340
-3C2340:lI45|H3C23FC
-3C23FC:lI103|H3C24A8
-3C24A8:lI116|H3C2564
-3C2564:lI97|H3C2618
-3C2618:lI114|N
-3C19DC:lI103|H3C1A80
-3C1A80:lI116|H3C1B34
-3C1B34:lI97|H3C1BF8
-3C1BF8:lI114|N
-3C193C:lH3C19EC|H3C19F8
-3C19EC:t2:H3C1A90,H3C1A98
-3C1A98:lI97|H3C1B4C
-3C1B4C:lI112|H3C1C10
-3C1C10:lI112|H3C1CC4
-3C1CC4:lI108|H3C1D80
-3C1D80:lI105|H3C1E3C
-3C1E3C:lI99|H3C1EF8
-3C1EF8:lI97|H3C1FB4
-3C1FB4:lI116|H3C2068
-3C2068:lI105|H3C2124
-3C2124:lI111|H3C21D8
-3C21D8:lI110|H3C228C
-3C228C:lI47|H3C2348
-3C2348:lI120|H3C2404
-3C2404:lI45|H3C24B0
-3C24B0:lI100|H3C256C
-3C256C:lI118|H3C2620
-3C2620:lI105|N
-3C1A90:lI100|H3C1B44
-3C1B44:lI118|H3C1C08
-3C1C08:lI105|N
-3C19F8:lH3C1AA0|H3C1AAC
-3C1AA0:t2:H3C1B54,H3C1B5C
-3C1B5C:lI97|H3C1C20
-3C1C20:lI112|H3C1CD4
-3C1CD4:lI112|H3C1D88
-3C1D88:lI108|H3C1E44
-3C1E44:lI105|H3C1F00
-3C1F00:lI99|H3C1FBC
-3C1FBC:lI97|H3C2070
-3C2070:lI116|H3C212C
-3C212C:lI105|H3C21E0
-3C21E0:lI111|H3C2294
-3C2294:lI110|H3C2350
-3C2350:lI47|H3C240C
-3C240C:lI120|H3C24B8
-3C24B8:lI45|H3C2574
-3C2574:lI100|H3C2628
-3C2628:lI105|H3C26DC
-3C26DC:lI114|H3C2798
-3C2798:lI101|H3C2854
-3C2854:lI99|H3C2918
-3C2918:lI116|H3C29E4
-3C29E4:lI111|H3C2AB0
-3C2AB0:lI114|N
-3C1B54:lI100|H3C1C18
-3C1C18:lI99|H3C1CCC
-3C1CCC:lI114|N
-3C1AAC:lH3C1B64|H3C1B70
-3C1B64:t2:H3C1C28,H3C1C30
-3C1C30:lI97|H3C1CE4
-3C1CE4:lI112|H3C1D98
-3C1D98:lI112|H3C1E4C
-3C1E4C:lI108|H3C1F08
-3C1F08:lI105|H3C1FC4
-3C1FC4:lI99|H3C2078
-3C2078:lI97|H3C2134
-3C2134:lI116|H3C21E8
-3C21E8:lI105|H3C229C
-3C229C:lI111|H3C2358
-3C2358:lI110|H3C2414
-3C2414:lI47|H3C24C0
-3C24C0:lI120|H3C257C
-3C257C:lI45|H3C2630
-3C2630:lI100|H3C26E4
-3C26E4:lI105|H3C27A0
-3C27A0:lI114|H3C285C
-3C285C:lI101|H3C2920
-3C2920:lI99|H3C29EC
-3C29EC:lI116|H3C2AB8
-3C2AB8:lI111|H3C2B84
-3C2B84:lI114|N
-3C1C28:lI100|H3C1CDC
-3C1CDC:lI105|H3C1D90
-3C1D90:lI114|N
-3C1B70:lH3C1C38|H3C1C44
-3C1C38:t2:H3C1CEC,H3C1CF4
-3C1CF4:lI97|H3C1DA8
-3C1DA8:lI112|H3C1E5C
-3C1E5C:lI112|H3C1F10
-3C1F10:lI108|H3C1FCC
-3C1FCC:lI105|H3C2080
-3C2080:lI99|H3C213C
-3C213C:lI97|H3C21F0
-3C21F0:lI116|H3C22A4
-3C22A4:lI105|H3C2360
-3C2360:lI111|H3C241C
-3C241C:lI110|H3C24C8
-3C24C8:lI47|H3C2584
-3C2584:lI120|H3C2638
-3C2638:lI45|H3C26EC
-3C26EC:lI100|H3C27A8
-3C27A8:lI105|H3C2864
-3C2864:lI114|H3C2928
-3C2928:lI101|H3C29F4
-3C29F4:lI99|H3C2AC0
-3C2AC0:lI116|H3C2B8C
-3C2B8C:lI111|H3C2C48
-3C2C48:lI114|N
-3C1CEC:lI100|H3C1DA0
-3C1DA0:lI120|H3C1E54
-3C1E54:lI114|N
-3C1C44:lH3C1CFC|H3C1D08
-3C1CFC:t2:H3C1DB0,H3C1DB8
-3C1DB8:lI97|H3C1E6C
-3C1E6C:lI112|H3C1F20
-3C1F20:lI112|H3C1FD4
-3C1FD4:lI108|H3C2088
-3C2088:lI105|H3C2144
-3C2144:lI99|H3C21F8
-3C21F8:lI97|H3C22AC
-3C22AC:lI116|H3C2368
-3C2368:lI105|H3C2424
-3C2424:lI111|H3C24D0
-3C24D0:lI110|H3C258C
-3C258C:lI47|H3C2640
-3C2640:lI120|H3C26F4
-3C26F4:lI45|H3C27B0
-3C27B0:lI99|H3C286C
-3C286C:lI115|H3C2930
-3C2930:lI104|N
-3C1DB0:lI99|H3C1E64
-3C1E64:lI115|H3C1F18
-3C1F18:lI104|N
-3C1D08:lH3C1DC0|H3C1DCC
-3C1DC0:t2:H3C1E74,H3C1E7C
-3C1E7C:lI97|H3C1F30
-3C1F30:lI112|H3C1FE4
-3C1FE4:lI112|H3C2098
-3C2098:lI108|H3C214C
-3C214C:lI105|H3C2200
-3C2200:lI99|H3C22B4
-3C22B4:lI97|H3C2370
-3C2370:lI116|H3C242C
-3C242C:lI105|H3C24D8
-3C24D8:lI111|H3C2594
-3C2594:lI110|H3C2648
-3C2648:lI47|H3C26FC
-3C26FC:lI120|H3C27B8
-3C27B8:lI45|H3C2874
-3C2874:lI99|H3C2938
-3C2938:lI112|H3C29FC
-3C29FC:lI105|H3C2AC8
-3C2AC8:lI111|N
-3C1E74:lI99|H3C1F28
-3C1F28:lI112|H3C1FDC
-3C1FDC:lI105|H3C2090
-3C2090:lI111|N
-3C1DCC:lH3C1E84|H3C1E90
-3C1E84:t2:H3C1F38,H3C1F40
-3C1F40:lI97|H3C1FEC
-3C1FEC:lI112|H3C20A0
-3C20A0:lI112|H3C2154
-3C2154:lI108|H3C2208
-3C2208:lI105|H3C22BC
-3C22BC:lI99|H3C2378
-3C2378:lI97|H3C2434
-3C2434:lI116|H3C24E0
-3C24E0:lI105|H3C259C
-3C259C:lI111|H3C2650
-3C2650:lI110|H3C2704
-3C2704:lI47|H3C27C0
-3C27C0:lI120|H3C287C
-3C287C:lI45|H3C2940
-3C2940:lI99|H3C2A04
-3C2A04:lI111|H3C2AD0
-3C2AD0:lI109|H3C2B94
-3C2B94:lI112|H3C2C50
-3C2C50:lI114|H3C2D00
-3C2D00:lI101|H3C2DA8
-3C2DA8:lI115|H3C2E40
-3C2E40:lI115|N
-3C1F38:lI90|N
-3C1E90:lH3C1F48|H3C1F54
-3C1F48:t2:H3C1FF4,H3C1FFC
-3C1FFC:lI97|H3C20B0
-3C20B0:lI112|H3C2164
-3C2164:lI112|H3C2210
-3C2210:lI108|H3C22C4
-3C22C4:lI105|H3C2380
-3C2380:lI99|H3C243C
-3C243C:lI97|H3C24E8
-3C24E8:lI116|H3C25A4
-3C25A4:lI105|H3C2658
-3C2658:lI111|H3C270C
-3C270C:lI110|H3C27C8
-3C27C8:lI47|H3C2884
-3C2884:lI120|H3C2948
-3C2948:lI45|H3C2A0C
-3C2A0C:lI99|H3C2AD8
-3C2AD8:lI100|H3C2B9C
-3C2B9C:lI108|H3C2C58
-3C2C58:lI105|H3C2D08
-3C2D08:lI110|H3C2DB0
-3C2DB0:lI107|N
-3C1FF4:lI118|H3C20A8
-3C20A8:lI99|H3C215C
-3C215C:lI100|N
-3C1F54:lH3C2004|H3C2010
-3C2004:t2:H3C20B8,H3C20C0
-3C20C0:lI97|H3C2174
-3C2174:lI112|H3C2220
-3C2220:lI112|H3C22D4
-3C22D4:lI108|H3C2390
-3C2390:lI105|H3C2444
-3C2444:lI99|H3C24F0
-3C24F0:lI97|H3C25AC
-3C25AC:lI116|H3C2660
-3C2660:lI105|H3C2714
-3C2714:lI111|H3C27D0
-3C27D0:lI110|H3C288C
-3C288C:lI47|H3C2950
-3C2950:lI120|H3C2A14
-3C2A14:lI45|H3C2AE0
-3C2AE0:lI98|H3C2BA4
-3C2BA4:lI99|H3C2C60
-3C2C60:lI112|H3C2D10
-3C2D10:lI105|H3C2DB8
-3C2DB8:lI111|N
-3C20B8:lI98|H3C216C
-3C216C:lI99|H3C2218
-3C2218:lI112|H3C22CC
-3C22CC:lI105|H3C2388
-3C2388:lI111|N
-3C2010:lH3C20C8|H3C20D4
-3C20C8:t2:H3C217C,H3C2184
-3C2184:lI97|H3C2230
-3C2230:lI112|H3C22E4
-3C22E4:lI112|H3C2398
-3C2398:lI108|H3C244C
-3C244C:lI105|H3C24F8
-3C24F8:lI99|H3C25B4
-3C25B4:lI97|H3C2668
-3C2668:lI116|H3C271C
-3C271C:lI105|H3C27D8
-3C27D8:lI111|H3C2894
-3C2894:lI110|H3C2958
-3C2958:lI47|H3C2A1C
-3C2A1C:lI114|H3C2AE8
-3C2AE8:lI116|H3C2BAC
-3C2BAC:lI102|N
-3C217C:lI114|H3C2228
-3C2228:lI116|H3C22DC
-3C22DC:lI102|N
-3C20D4:lH3C218C|H3C2198
-3C218C:t2:H3C2238,H3C2240
-3C2240:lI97|H3C22F4
-3C22F4:lI112|H3C23A8
-3C23A8:lI112|H3C2454
-3C2454:lI108|H3C2500
-3C2500:lI105|H3C25BC
-3C25BC:lI99|H3C2670
-3C2670:lI97|H3C2724
-3C2724:lI116|H3C27E0
-3C27E0:lI105|H3C289C
-3C289C:lI111|H3C2960
-3C2960:lI110|H3C2A24
-3C2A24:lI47|H3C2AF0
-3C2AF0:lI112|H3C2BB4
-3C2BB4:lI111|H3C2C68
-3C2C68:lI119|H3C2D18
-3C2D18:lI101|H3C2DC0
-3C2DC0:lI114|H3C2E48
-3C2E48:lI112|H3C2EC0
-3C2EC0:lI111|H3C2F38
-3C2F38:lI105|H3C2FA8
-3C2FA8:lI110|H3C3010
-3C3010:lI116|N
-3C2238:lI112|H3C22EC
-3C22EC:lI112|H3C23A0
-3C23A0:lI116|N
-3C2198:lH3C2248|H3C2254
-3C2248:t2:H3C22FC,H3C2304
-3C2304:lI97|H3C23B8
-3C23B8:lI112|H3C245C
-3C245C:lI112|H3C2508
-3C2508:lI108|H3C25C4
-3C25C4:lI105|H3C2678
-3C2678:lI99|H3C272C
-3C272C:lI97|H3C27E8
-3C27E8:lI116|H3C28A4
-3C28A4:lI105|H3C2968
-3C2968:lI111|H3C2A2C
-3C2A2C:lI110|H3C2AF8
-3C2AF8:lI47|H3C2BBC
-3C2BBC:lI112|H3C2C70
-3C2C70:lI111|H3C2D20
-3C2D20:lI115|H3C2DC8
-3C2DC8:lI116|H3C2E50
-3C2E50:lI115|H3C2EC8
-3C2EC8:lI99|H3C2F40
-3C2F40:lI114|H3C2FB0
-3C2FB0:lI105|H3C3018
-3C3018:lI112|H3C3078
-3C3078:lI116|N
-3C22FC:lI97|H3C23B0
-3C23B0:lI105|N
-3C2254:lH3C230C|H3C2318
-3C230C:t2:H3C23C0,H3C23C8
-3C23C8:lI97|H3C246C
-3C246C:lI112|H3C2518
-3C2518:lI112|H3C25CC
-3C25CC:lI108|H3C2680
-3C2680:lI105|H3C2734
-3C2734:lI99|H3C27F0
-3C27F0:lI97|H3C28AC
-3C28AC:lI116|H3C2970
-3C2970:lI105|H3C2A34
-3C2A34:lI111|H3C2B00
-3C2B00:lI110|H3C2BC4
-3C2BC4:lI47|H3C2C78
-3C2C78:lI112|H3C2D28
-3C2D28:lI111|H3C2DD0
-3C2DD0:lI115|H3C2E58
-3C2E58:lI116|H3C2ED0
-3C2ED0:lI115|H3C2F48
-3C2F48:lI99|H3C2FB8
-3C2FB8:lI114|H3C3020
-3C3020:lI105|H3C3080
-3C3080:lI112|H3C30D8
-3C30D8:lI116|N
-3C23C0:lI101|H3C2464
-3C2464:lI112|H3C2510
-3C2510:lI115|N
-3C2318:lH3C23D0|H3C23DC
-3C23D0:t2:H3C2474,H3C247C
-3C247C:lI97|H3C2528
-3C2528:lI112|H3C25D4
-3C25D4:lI112|H3C2688
-3C2688:lI108|H3C273C
-3C273C:lI105|H3C27F8
-3C27F8:lI99|H3C28B4
-3C28B4:lI97|H3C2978
-3C2978:lI116|H3C2A3C
-3C2A3C:lI105|H3C2B08
-3C2B08:lI111|H3C2BCC
-3C2BCC:lI110|H3C2C80
-3C2C80:lI47|H3C2D30
-3C2D30:lI112|H3C2DD8
-3C2DD8:lI111|H3C2E60
-3C2E60:lI115|H3C2ED8
-3C2ED8:lI116|H3C2F50
-3C2F50:lI115|H3C2FC0
-3C2FC0:lI99|H3C3028
-3C3028:lI114|H3C3088
-3C3088:lI105|H3C30E0
-3C30E0:lI112|H3C3130
-3C3130:lI116|N
-3C2474:lI112|H3C2520
-3C2520:lI115|N
-3C23DC:lH3C2484|H3C2490
-3C2484:t2:H3C2530,H3C2538
-3C2538:lI97|H3C25E4
-3C25E4:lI112|H3C2698
-3C2698:lI112|H3C2744
-3C2744:lI108|H3C2800
-3C2800:lI105|H3C28BC
-3C28BC:lI99|H3C2980
-3C2980:lI97|H3C2A44
-3C2A44:lI116|H3C2B10
-3C2B10:lI105|H3C2BD4
-3C2BD4:lI111|H3C2C88
-3C2C88:lI110|H3C2D38
-3C2D38:lI47|H3C2DE0
-3C2DE0:lI112|H3C2E68
-3C2E68:lI100|H3C2EE0
-3C2EE0:lI102|N
-3C2530:lI112|H3C25DC
-3C25DC:lI100|H3C2690
-3C2690:lI102|N
-3C2490:lH3C2540|H3C254C
-3C2540:t2:H3C25EC,H3C25F4
-3C25F4:lI97|H3C26A8
-3C26A8:lI112|H3C2754
-3C2754:lI112|H3C2808
-3C2808:lI108|H3C28C4
-3C28C4:lI105|H3C2988
-3C2988:lI99|H3C2A4C
-3C2A4C:lI97|H3C2B18
-3C2B18:lI116|H3C2BDC
-3C2BDC:lI105|H3C2C90
-3C2C90:lI111|H3C2D40
-3C2D40:lI110|H3C2DE8
-3C2DE8:lI47|H3C2E70
-3C2E70:lI111|H3C2EE8
-3C2EE8:lI100|H3C2F58
-3C2F58:lI97|N
-3C25EC:lI111|H3C26A0
-3C26A0:lI100|H3C274C
-3C274C:lI97|N
-3C254C:lH3C25FC|H3C2608
-3C25FC:t2:H3C26B0,H3C26B8
-3C26B8:lI97|H3C2764
-3C2764:lI112|H3C2818
-3C2818:lI112|H3C28CC
-3C28CC:lI108|H3C2990
-3C2990:lI105|H3C2A54
-3C2A54:lI99|H3C2B20
-3C2B20:lI97|H3C2BE4
-3C2BE4:lI116|H3C2C98
-3C2C98:lI105|H3C2D48
-3C2D48:lI111|H3C2DF0
-3C2DF0:lI110|H3C2E78
-3C2E78:lI47|H3C2EF0
-3C2EF0:lI111|H3C2F60
-3C2F60:lI99|H3C2FC8
-3C2FC8:lI116|H3C3030
-3C3030:lI101|H3C3090
-3C3090:lI116|H3C30E8
-3C30E8:lI45|H3C3138
-3C3138:lI115|H3C3180
-3C3180:lI116|H3C31C8
-3C31C8:lI114|H3C3210
-3C3210:lI101|H3C3258
-3C3258:lI97|H3C32A0
-3C32A0:lI109|N
-3C26B0:lI98|H3C275C
-3C275C:lI105|H3C2810
-3C2810:lI110|N
-3C2608:lH3C26C0|H3C26CC
-3C26C0:t2:H3C276C,H3C2774
-3C2774:lI97|H3C2828
-3C2828:lI112|H3C28DC
-3C28DC:lI112|H3C2998
-3C2998:lI108|H3C2A5C
-3C2A5C:lI105|H3C2B28
-3C2B28:lI99|H3C2BEC
-3C2BEC:lI97|H3C2CA0
-3C2CA0:lI116|H3C2D50
-3C2D50:lI105|H3C2DF8
-3C2DF8:lI111|H3C2E80
-3C2E80:lI110|H3C2EF8
-3C2EF8:lI47|H3C2F68
-3C2F68:lI111|H3C2FD0
-3C2FD0:lI99|H3C3038
-3C3038:lI116|H3C3098
-3C3098:lI101|H3C30F0
-3C30F0:lI116|H3C3140
-3C3140:lI45|H3C3188
-3C3188:lI115|H3C31D0
-3C31D0:lI116|H3C3218
-3C3218:lI114|H3C3260
-3C3260:lI101|H3C32A8
-3C32A8:lI97|H3C32E8
-3C32E8:lI109|N
-3C276C:lI100|H3C2820
-3C2820:lI109|H3C28D4
-3C28D4:lI115|N
-3C26CC:lH3C277C|H3C2788
-3C277C:t2:H3C2830,H3C2838
-3C2838:lI97|H3C28EC
-3C28EC:lI112|H3C29A8
-3C29A8:lI112|H3C2A64
-3C2A64:lI108|H3C2B30
-3C2B30:lI105|H3C2BF4
-3C2BF4:lI99|H3C2CA8
-3C2CA8:lI97|H3C2D58
-3C2D58:lI116|H3C2E00
-3C2E00:lI105|H3C2E88
-3C2E88:lI111|H3C2F00
-3C2F00:lI110|H3C2F70
-3C2F70:lI47|H3C2FD8
-3C2FD8:lI111|H3C3040
-3C3040:lI99|H3C30A0
-3C30A0:lI116|H3C30F8
-3C30F8:lI101|H3C3148
-3C3148:lI116|H3C3190
-3C3190:lI45|H3C31D8
-3C31D8:lI115|H3C3220
-3C3220:lI116|H3C3268
-3C3268:lI114|H3C32B0
-3C32B0:lI101|H3C32F0
-3C32F0:lI97|H3C3320
-3C3320:lI109|N
-3C2830:lI108|H3C28E4
-3C28E4:lI104|H3C29A0
-3C29A0:lI97|N
-3C2788:lH3C2840|H3C284C
-3C2840:t2:H3C28F4,H3C28FC
-3C28FC:lI97|H3C29B8
-3C29B8:lI112|H3C2A74
-3C2A74:lI112|H3C2B38
-3C2B38:lI108|H3C2BFC
-3C2BFC:lI105|H3C2CB0
-3C2CB0:lI99|H3C2D60
-3C2D60:lI97|H3C2E08
-3C2E08:lI116|H3C2E90
-3C2E90:lI105|H3C2F08
-3C2F08:lI111|H3C2F78
-3C2F78:lI110|H3C2FE0
-3C2FE0:lI47|H3C3048
-3C3048:lI111|H3C30A8
-3C30A8:lI99|H3C3100
-3C3100:lI116|H3C3150
-3C3150:lI101|H3C3198
-3C3198:lI116|H3C31E0
-3C31E0:lI45|H3C3228
-3C3228:lI115|H3C3270
-3C3270:lI116|H3C32B8
-3C32B8:lI114|H3C32F8
-3C32F8:lI101|H3C3328
-3C3328:lI97|H3C3350
-3C3350:lI109|N
-3C28F4:lI108|H3C29B0
-3C29B0:lI122|H3C2A6C
-3C2A6C:lI104|N
-3C284C:lH3C2904|H3C2910
-3C2904:t2:H3C29C0,H3C29C8
-3C29C8:lI97|H3C2A84
-3C2A84:lI112|H3C2B48
-3C2B48:lI112|H3C2C04
-3C2C04:lI108|H3C2CB8
-3C2CB8:lI105|H3C2D68
-3C2D68:lI99|H3C2E10
-3C2E10:lI97|H3C2E98
-3C2E98:lI116|H3C2F10
-3C2F10:lI105|H3C2F80
-3C2F80:lI111|H3C2FE8
-3C2FE8:lI110|H3C3050
-3C3050:lI47|H3C30B0
-3C30B0:lI111|H3C3108
-3C3108:lI99|H3C3158
-3C3158:lI116|H3C31A0
-3C31A0:lI101|H3C31E8
-3C31E8:lI116|H3C3230
-3C3230:lI45|H3C3278
-3C3278:lI115|H3C32C0
-3C32C0:lI116|H3C3300
-3C3300:lI114|H3C3330
-3C3330:lI101|H3C3358
-3C3358:lI97|H3C3378
-3C3378:lI109|N
-3C29C0:lI101|H3C2A7C
-3C2A7C:lI120|H3C2B40
-3C2B40:lI101|N
-3C2910:lH3C29D0|H3C29DC
-3C29D0:t2:H3C2A8C,H3C2A94
-3C2A94:lI97|H3C2B58
-3C2B58:lI112|H3C2C14
-3C2C14:lI112|H3C2CC8
-3C2CC8:lI108|H3C2D78
-3C2D78:lI105|H3C2E18
-3C2E18:lI99|H3C2EA0
-3C2EA0:lI97|H3C2F18
-3C2F18:lI116|H3C2F88
-3C2F88:lI105|H3C2FF0
-3C2FF0:lI111|H3C3058
-3C3058:lI110|H3C30B8
-3C30B8:lI47|H3C3110
-3C3110:lI111|H3C3160
-3C3160:lI99|H3C31A8
-3C31A8:lI116|H3C31F0
-3C31F0:lI101|H3C3238
-3C3238:lI116|H3C3280
-3C3280:lI45|H3C32C8
-3C32C8:lI115|H3C3308
-3C3308:lI116|H3C3338
-3C3338:lI114|H3C3360
-3C3360:lI101|H3C3380
-3C3380:lI97|H3C3398
-3C3398:lI109|N
-3C2A8C:lI99|H3C2B50
-3C2B50:lI108|H3C2C0C
-3C2C0C:lI97|H3C2CC0
-3C2CC0:lI115|H3C2D70
-3C2D70:lI115|N
-3C29DC:lH3C2A9C|H3C2AA8
-3C2A9C:t2:H3C2B60,H3C2B68
-3C2B68:lI97|H3C2C24
-3C2C24:lI112|H3C2CD8
-3C2CD8:lI112|H3C2D80
-3C2D80:lI108|H3C2E20
-3C2E20:lI105|H3C2EA8
-3C2EA8:lI99|H3C2F20
-3C2F20:lI97|H3C2F90
-3C2F90:lI116|H3C2FF8
-3C2FF8:lI105|H3C3060
-3C3060:lI111|H3C30C0
-3C30C0:lI110|H3C3118
-3C3118:lI47|H3C3168
-3C3168:lI109|H3C31B0
-3C31B0:lI115|H3C31F8
-3C31F8:lI119|H3C3240
-3C3240:lI111|H3C3288
-3C3288:lI114|H3C32D0
-3C32D0:lI100|N
-3C2B60:lI100|H3C2C1C
-3C2C1C:lI111|H3C2CD0
-3C2CD0:lI99|N
-3C2AA8:lH3C2B70|H3C2B7C
-3C2B70:t2:H3C2C2C,H3C2C34
-3C2C34:lI97|H3C2CE8
-3C2CE8:lI112|H3C2D90
-3C2D90:lI112|H3C2E28
-3C2E28:lI108|H3C2EB0
-3C2EB0:lI105|H3C2F28
-3C2F28:lI99|H3C2F98
-3C2F98:lI97|H3C3000
-3C3000:lI116|H3C3068
-3C3068:lI105|H3C30C8
-3C30C8:lI111|H3C3120
-3C3120:lI110|H3C3170
-3C3170:lI47|H3C31B8
-3C31B8:lI109|H3C3200
-3C3200:lI97|H3C3248
-3C3248:lI99|H3C3290
-3C3290:lI45|H3C32D8
-3C32D8:lI99|H3C3310
-3C3310:lI111|H3C3340
-3C3340:lI109|H3C3368
-3C3368:lI112|H3C3388
-3C3388:lI97|H3C33A0
-3C33A0:lI99|H3C33B0
-3C33B0:lI116|H3C33C0
-3C33C0:lI112|H3C33D0
-3C33D0:lI114|H3C33E0
-3C33E0:lI111|N
-3C2C2C:lI99|H3C2CE0
-3C2CE0:lI112|H3C2D88
-3C2D88:lI116|N
-3C2B7C:lH3C2C3C|N
-3C2C3C:t2:H3C2CF0,H3C2CF8
-3C2CF8:lI97|H3C2DA0
-3C2DA0:lI112|H3C2E38
-3C2E38:lI112|H3C2EB8
-3C2EB8:lI108|H3C2F30
-3C2F30:lI105|H3C2FA0
-3C2FA0:lI99|H3C3008
-3C3008:lI97|H3C3070
-3C3070:lI116|H3C30D0
-3C30D0:lI105|H3C3128
-3C3128:lI111|H3C3178
-3C3178:lI110|H3C31C0
-3C31C0:lI47|H3C3208
-3C3208:lI109|H3C3250
-3C3250:lI97|H3C3298
-3C3298:lI99|H3C32E0
-3C32E0:lI45|H3C3318
-3C3318:lI98|H3C3348
-3C3348:lI105|H3C3370
-3C3370:lI110|H3C3390
-3C3390:lI104|H3C33A8
-3C33A8:lI101|H3C33B8
-3C33B8:lI120|H3C33C8
-3C33C8:lI52|H3C33D8
-3C33D8:lI48|N
-3C2CF0:lI104|H3C2D98
-3C2D98:lI113|H3C2E30
-3C2E30:lI120|N
-3BDBCC:lH3BDA78|H3BDA8C
-3BDA78:t2:A4:port,I8888
-3BDA8C:lH3BDB04|H3BDB10
-3BDB04:t2:AC:bind_address,H3BDB64
-3BDB64:t4:I127,I0,I0,I1
-3BDB10:lH3BDB78|H3BDB84
-3BDB78:t2:AB:server_name,H3BDBD4
-3BDBD4:lI108|H3BDC24
-3BDC24:lI111|H3BDC88
-3BDC88:lI99|H3BDCF0
-3BDCF0:lI97|H3BDD70
-3BDD70:lI108|H3BDDF8
-3BDDF8:lI104|H3BDE90
-3BDE90:lI111|H3BDF40
-3BDF40:lI115|H3BDFFC
-3BDFFC:lI116|N
-3BDB84:lH3BDBDC|H3BDBE8
-3BDBDC:t2:AE:max_header_siz,I1024
-3BDBE8:lH3BDC2C|H3BDC38
-3BDC2C:t2:A11:max_header_action,A8:reply414
-3BDC38:lH3BDC90|H3BDC9C
-3BDC90:t2:A8:com_type,A7:ip_comm
-3BDC9C:lH3BDCF8|H3BDD04
-3BDCF8:t2:A7:modules,H3BDD78
-3BDD78:lA9:mod_alias|H3BDE00
-3BDE00:lA8:mod_auth|H3BDE98
-3BDE98:lA7:mod_esi|H3BDF48
-3BDF48:lAB:mod_actions|H3BE004
-3BE004:lA7:mod_cgi|H3BE0D0
-3BE0D0:lAB:mod_include|H3BE1A4
-3BE1A4:lA7:mod_dir|H3BE288
-3BE288:lA7:mod_get|H3BE378
-3BE378:lA8:mod_head|H3BE47C
-3BE47C:lA7:mod_log|H3BE580
-3BE580:lAC:mod_disk_log|N
-3BDD04:lH3BDD80|H3BDD8C
-3BDD80:t2:AF:directory_index,H3BDE08
-3BDE08:lH3BDEA0|N
-3BDEA0:lI105|H3BDF50
-3BDF50:lI110|H3BE00C
-3BE00C:lI100|H3BE0D8
-3BE0D8:lI101|H3BE1AC
-3BE1AC:lI120|H3BE290
-3BE290:lI46|H3BE380
-3BE380:lI104|H3BE484
-3BE484:lI116|H3BE588
-3BE588:lI109|H3BE68C
-3BE68C:lI108|N
-3BDD8C:lH3BDE10|H3BDE1C
-3BDE10:t2:AC:default_type,H3BDEA8
-3BDEA8:lI116|H3BDF58
-3BDF58:lI101|H3BE014
-3BE014:lI120|H3BE0E0
-3BE0E0:lI116|H3BE1B4
-3BE1B4:lI47|H3BE298
-3BE298:lI112|H3BE388
-3BE388:lI108|H3BE48C
-3BE48C:lI97|H3BE590
-3BE590:lI105|H3BE694
-3BE694:lI110|N
-3BDE1C:lH3BDEB0|H3BDEBC
-3BDEB0:t2:A10:erl_script_alias,H3BDF60
-3BDF60:t2:H3BE01C,H3BE024
-3BE024:lH3BE0F0|N
-3BE0F0:lI119|H3BE1C4
-3BE1C4:lI101|H3BE2A8
-3BE2A8:lI98|H3BE398
-3BE398:lI116|H3BE49C
-3BE49C:lI111|H3BE5A0
-3BE5A0:lI111|H3BE6A4
-3BE6A4:lI108|N
-3BE01C:lI47|H3BE0E8
-3BE0E8:lI119|H3BE1BC
-3BE1BC:lI101|H3BE2A0
-3BE2A0:lI98|H3BE390
-3BE390:lI116|H3BE494
-3BE494:lI111|H3BE598
-3BE598:lI111|H3BE69C
-3BE69C:lI108|N
-3BDEBC:lH3BDF6C|H3BDF78
-3BDF6C:t2:A5:alias,H3BE02C
-3BE02C:t2:H3BE0F8,H3BE100
-3BE100:lI47|H3BE1D4
-3BE1D4:lI99|H3BE2B8
-3BE2B8:lI108|H3BE3A8
-3BE3A8:lI101|H3BE4AC
-3BE4AC:lI97|H3BE5B0
-3BE5B0:lI114|H3BE6B4
-3BE6B4:lI99|H3BE7A8
-3BE7A8:lI97|H3BE894
-3BE894:lI115|H3BE980
-3BE980:lI101|H3BEA74
-3BEA74:lI47|H3BEB68
-3BEB68:lI111|H3BEC54
-3BEC54:lI116|H3BED40
-3BED40:lI112|H3BEE2C
-3BEE2C:lI47|H3BEF00
-3BEF00:lI101|H3BEFD4
-3BEFD4:lI114|H3BF0A0
-3BF0A0:lI116|H3BF174
-3BF174:lI115|H3BF238
-3BF238:lI47|H3BF2FC
-3BF2FC:lI108|H3BF3A8
-3BF3A8:lI105|H3BF45C
-3BF45C:lI98|H3BF518
-3BF518:lI47|H3BF5DC
-3BF5DC:lI111|H3BF6B0
-3BF6B0:lI98|H3BF784
-3BF784:lI115|H3BF858
-3BF858:lI101|H3BF93C
-3BF93C:lI114|H3BFA18
-3BFA18:lI118|H3BFAF4
-3BFAF4:lI101|H3BFBD0
-3BFBD0:lI114|H3BFC9C
-3BFC9C:lI47|H3BFD60
-3BFD60:lI112|H3BFE2C
-3BFE2C:lI114|H3BFEE0
-3BFEE0:lI105|H3BFF94
-3BFF94:lI118|H3C0040
-3C0040:lI47|H3C00EC
-3C00EC:lI99|H3C0198
-3C0198:lI114|H3C024C
-3C024C:lI97|H3C0308
-3C0308:lI115|H3C03BC
-3C03BC:lI104|H3C0458
-3C0458:lI100|H3C04F4
-3C04F4:lI117|H3C0590
-3C0590:lI109|H3C0634
-3C0634:lI112|H3C06E0
-3C06E0:lI95|H3C078C
-3C078C:lI118|H3C0830
-3C0830:lI105|H3C08BC
-3C08BC:lI101|H3C0950
-3C0950:lI119|H3C09E4
-3C09E4:lI101|H3C0A80
-3C0A80:lI114|N
-3BE0F8:lI47|H3BE1CC
-3BE1CC:lI99|H3BE2B0
-3BE2B0:lI114|H3BE3A0
-3BE3A0:lI97|H3BE4A4
-3BE4A4:lI115|H3BE5A8
-3BE5A8:lI104|H3BE6AC
-3BE6AC:lI100|H3BE7A0
-3BE7A0:lI117|H3BE88C
-3BE88C:lI109|H3BE978
-3BE978:lI112|H3BEA6C
-3BEA6C:lI95|H3BEB60
-3BEB60:lI118|H3BEC4C
-3BEC4C:lI105|H3BED38
-3BED38:lI101|H3BEE24
-3BEE24:lI119|H3BEEF8
-3BEEF8:lI101|H3BEFCC
-3BEFCC:lI114|N
-3BDF78:lH3BE038|H3BE044
-3BE038:t2:A5:alias,H3BE108
-3BE108:t2:H3BE1DC,H3BE1E4
-3BE1E4:lI47|H3BE2C8
-3BE2C8:lI99|H3BE3B8
-3BE3B8:lI108|H3BE4BC
-3BE4BC:lI101|H3BE5C0
-3BE5C0:lI97|H3BE6C4
-3BE6C4:lI114|H3BE7B8
-3BE7B8:lI99|H3BE8A4
-3BE8A4:lI97|H3BE990
-3BE990:lI115|H3BEA84
-3BEA84:lI101|H3BEB78
-3BEB78:lI47|H3BEC64
-3BEC64:lI111|H3BED50
-3BED50:lI116|H3BEE3C
-3BEE3C:lI112|H3BEF10
-3BEF10:lI47|H3BEFE4
-3BEFE4:lI101|H3BF0B0
-3BF0B0:lI114|H3BF184
-3BF184:lI116|H3BF248
-3BF248:lI115|H3BF304
-3BF304:lI47|H3BF3B0
-3BF3B0:lI101|H3BF464
-3BF464:lI114|H3BF520
-3BF520:lI116|H3BF5E4
-3BF5E4:lI115|H3BF6B8
-3BF6B8:lI47|H3BF78C
-3BF78C:lI100|H3BF860
-3BF860:lI111|H3BF944
-3BF944:lI99|H3BFA20
-3BFA20:lI47|H3BFAFC
-3BFAFC:lI104|H3BFBD8
-3BFBD8:lI116|H3BFCA4
-3BFCA4:lI109|H3BFD68
-3BFD68:lI108|N
-3BE1DC:lI47|H3BE2C0
-3BE2C0:lI99|H3BE3B0
-3BE3B0:lI114|H3BE4B4
-3BE4B4:lI97|H3BE5B8
-3BE5B8:lI115|H3BE6BC
-3BE6BC:lI104|H3BE7B0
-3BE7B0:lI100|H3BE89C
-3BE89C:lI117|H3BE988
-3BE988:lI109|H3BEA7C
-3BEA7C:lI112|H3BEB70
-3BEB70:lI95|H3BEC5C
-3BEC5C:lI101|H3BED48
-3BED48:lI114|H3BEE34
-3BEE34:lI116|H3BEF08
-3BEF08:lI115|H3BEFDC
-3BEFDC:lI95|H3BF0A8
-3BF0A8:lI100|H3BF17C
-3BF17C:lI111|H3BF240
-3BF240:lI99|N
-3BE044:lH3BE114|H3BE120
-3BE114:t2:A5:alias,H3BE1EC
-3BE1EC:t2:H3BE2D0,H3BE2D8
-3BE2D8:lI47|H3BE3C8
-3BE3C8:lI99|H3BE4CC
-3BE4CC:lI108|H3BE5D0
-3BE5D0:lI101|H3BE6D4
-3BE6D4:lI97|H3BE7C8
-3BE7C8:lI114|H3BE8B4
-3BE8B4:lI99|H3BE9A0
-3BE9A0:lI97|H3BEA94
-3BEA94:lI115|H3BEB88
-3BEB88:lI101|H3BEC74
-3BEC74:lI47|H3BED60
-3BED60:lI111|H3BEE4C
-3BEE4C:lI116|H3BEF20
-3BEF20:lI112|H3BEFEC
-3BEFEC:lI47|H3BF0B8
-3BF0B8:lI101|H3BF18C
-3BF18C:lI114|H3BF250
-3BF250:lI116|H3BF30C
-3BF30C:lI115|H3BF3B8
-3BF3B8:lI47|H3BF46C
-3BF46C:lI108|H3BF528
-3BF528:lI105|H3BF5EC
-3BF5EC:lI98|H3BF6C0
-3BF6C0:lI47|H3BF794
-3BF794:lI111|H3BF868
-3BF868:lI98|H3BF94C
-3BF94C:lI115|H3BFA28
-3BFA28:lI101|H3BFB04
-3BFB04:lI114|H3BFBE0
-3BFBE0:lI118|H3BFCAC
-3BFCAC:lI101|H3BFD70
-3BFD70:lI114|H3BFE34
-3BFE34:lI47|H3BFEE8
-3BFEE8:lI100|H3BFF9C
-3BFF9C:lI111|H3C0048
-3C0048:lI99|H3C00F4
-3C00F4:lI47|H3C01A0
-3C01A0:lI104|H3C0254
-3C0254:lI116|H3C0310
-3C0310:lI109|H3C03C4
-3C03C4:lI108|N
-3BE2D0:lI47|H3BE3C0
-3BE3C0:lI99|H3BE4C4
-3BE4C4:lI114|H3BE5C8
-3BE5C8:lI97|H3BE6CC
-3BE6CC:lI115|H3BE7C0
-3BE7C0:lI104|H3BE8AC
-3BE8AC:lI100|H3BE998
-3BE998:lI117|H3BEA8C
-3BEA8C:lI109|H3BEB80
-3BEB80:lI112|H3BEC6C
-3BEC6C:lI95|H3BED58
-3BED58:lI100|H3BEE44
-3BEE44:lI111|H3BEF18
-3BEF18:lI99|N
-3BE120:lH3BE1F8|N
-3BE1F8:t2:A10:erl_script_alias,H3BE2E0
-3BE2E0:t2:H3BE3D0,H3BE3D8
-3BE3D8:lH3BE4DC|N
-3BE4DC:lI99|H3BE5E0
-3BE5E0:lI114|H3BE6E4
-3BE6E4:lI97|H3BE7D8
-3BE7D8:lI115|H3BE8C4
-3BE8C4:lI104|H3BE9B0
-3BE9B0:lI100|H3BEAA4
-3BEAA4:lI117|H3BEB90
-3BEB90:lI109|H3BEC7C
-3BEC7C:lI112|H3BED68
-3BED68:lI95|H3BEE54
-3BEE54:lI118|H3BEF28
-3BEF28:lI105|H3BEFF4
-3BEFF4:lI101|H3BF0C0
-3BF0C0:lI119|H3BF194
-3BF194:lI101|H3BF258
-3BF258:lI114|N
-3BE3D0:lI47|H3BE4D4
-3BE4D4:lI99|H3BE5D8
-3BE5D8:lI100|H3BE6DC
-3BE6DC:lI118|H3BE7D0
-3BE7D0:lI95|H3BE8BC
-3BE8BC:lI101|H3BE9A8
-3BE9A8:lI114|H3BEA9C
-3BEA9C:lI108|N
-3BDE2C:lH3BDA9C|H3BDECC
-3BDA9C:t4:I127,I0,I0,I1
-3BDECC:lI8888|H3BDF88
-3BDF88:lN|N
-3BDD1C:lN|N
-3BDA50:t2:AD:$initial_call,H3BDAB8
-3BDAB8:t3:A3:gen,A7:init_it,H3BDAB0
-3BDA5C:t2:A9:verbosity,A7:silence
-3BDAC8:t2:AE:auth_verbosity,A7:silence
-3BDB28:t2:A12:security_verbosity,A7:silence
-3BDB9C:t2:A12:acceptor_verbosity,A7:silence
-3BDC00:t2:AA:$ancestors,H3BDC5C
-3BDC5C:lA1A:httpd_sup__127_0_0_1__8888|H3BDCB4
-3BDCB4:lA8:web_tool|H3BDD24
-3BDD24:lP<0.27.0>|N
-3BDADC:t2:A19:request_handler_verbosity,A7:silence
-3BDB3C:t2:A5:sname,A3:man
-=proc_dictionary:<0.47.0>
-H36E688
-H36E694
-H36E6A0
-H36E6AC
-=proc_stack:<0.47.0>
-36c520:SReturn addr 0x362C9C (inet_tcp:accept/2 + 20)
-y0:I5
-y1:p<0.161>
-y2:p<0.141>
-36c530:SReturn addr 0x500C5C (httpd_socket:accept/3 + 280)
-y0:N
-36c538:SReturn addr 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y0:N
-36c540:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:SCatch 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y1:P<0.46.0>
-y2:A7:ip_comm
-y3:p<0.141>
-y4:A1B:httpd_conf__127_0_0_1__8888
-36c558:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:AE:httpd_acceptor
-y2:A8:acceptor
-y3:H36E6C8
-=proc_heap:<0.47.0>
-36E6C8:lP<0.44.0>|H36E724
-36E724:lP<0.46.0>|H36E748
-36E748:lA7:ip_comm|H36E760
-36E760:lH36E6D0|H36E778
-36E6D0:t4:I127,I0,I0,I1
-36E778:lI8888|H36E788
-36E788:lA1B:httpd_conf__127_0_0_1__8888|H36E798
-36E798:lA7:silence|N
-36E688:t2:AD:$initial_call,H36E6F0
-36E6F0:t3:AE:httpd_acceptor,A8:acceptor,H36E6C8
-36E694:t2:A9:verbosity,A7:silence
-36E6A0:t2:AA:$ancestors,H36E700
-36E700:lA1E:httpd_acc_sup__127_0_0_1__8888|H36E72C
-36E72C:lA1A:httpd_sup__127_0_0_1__8888|H36E750
-36E750:lA8:web_tool|H36E768
-36E768:lP<0.27.0>|N
-36E6AC:t2:A5:sname,A3:acc
-=proc_dictionary:<0.48.0>
-H385E48
-H385E54
-=proc_stack:<0.48.0>
-3ac1bc:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A10:crashdump_viewer
-y3:H3AB280
-y4:A17:crashdump_viewer_server
-y5:P<0.41.0>
-3ac1d8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H385E90
-=proc_heap:<0.48.0>
-3AB280:t8:A5:state,A9:undefined,A9:undefined,A9:undefined,A5:false,I4,A9:undefined,P<0.56.0>
-385E90:lAA:gen_server|H385ED8
-385ED8:lP<0.41.0>|H385F10
-385F10:lP<0.41.0>|H385F58
-385F58:lH385FA8|H385FB4
-385FA8:t2:A5:local,A17:crashdump_viewer_server
-385FB4:lA10:crashdump_viewer|H386014
-386014:lN|H38606C
-38606C:lN|N
-385E48:t2:AD:$initial_call,H385EB0
-385EB0:t3:A3:gen,A7:init_it,H385E90
-385E54:t2:AA:$ancestors,H385EC0
-385EC0:lA6:websup|H385F08
-385F08:lA8:web_tool|H385F50
-385F50:lP<0.27.0>|N
-=proc_stack:<0.49.0>
-36a114:SReturn addr 0x30174C (io:parse_erl_exprs/3 + 92)
-y0:H369E10
-y1:P<0.22.0>
-36a120:SReturn addr 0x2E5360 (shell:'-get_command/4-fun-0-'/1 + 20)
-y0:N
-36a128:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.49.0>
-369E10:E21:8372000364000D6E6F6E6F6465406E6F686F737400000001330000000000000000
-=atoms
-http_cache_control
-copy_word
-drop_line
-copy_line
-write_rest_of_line
-drop_to_empty_line
-read_to_empty_line_reverse
-set_pos
-read_line_backwards
-jumped
-jump_to_empty_line_or_eof
-get_pos
-translate_atoms
-translate_fun
-translate_funs
-translate_loaded_modules2
-translate_loaded_modules_totals
-translate_loaded_modules
-translate_links
-get_all_creations
-translate_node_info2
-translate_node_info
-translate_dist_info2
-translate_dist_info
-get_msg
-translate_timers
-translate_ets
-translate_ets_tables
-do_translate_sl_alloc_r7_r8
-translate_sl_alloc_r7_r8
-translate_sl_alloc_line
-do_translate_sl_alloc
-translate_sl_alloc
-translate_memory_and_allocated_area_r9b
-translate_allocated_areas
-translate_internal_table_line
-translate_index_table
-translate_hash_table
-translate_internal_tables
-translate_ports
-write_last_calls
-write_msg_q_stuff
-translate_process
-translate_processes
-erts_vsn
-translate_summary
-'Send'
-erl_crash_dump
-internal_tables
-mods
diff --git a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.noatoms b/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.noatoms
deleted file mode 100644
index 9f20ef3e44..0000000000
--- a/lib/observer/test/crashdump_viewer_SUITE_data/r10b_dump.trunc.noatoms
+++ /dev/null
@@ -1,13035 +0,0 @@
-=erl_crash_dump:0.1
-Wed Apr 21 13:22:44 2004
-Slogan: eheap_alloc: Cannot allocate 785672 bytes of memory (of type "heap").
-System version: Erlang (BEAM) emulator version 5.4 [source] [hipe] [threads:0]
-Compiled: Thu Dec 18 14:07:45 2003
-Atoms: 5614
-=memory
-total: 653336887
-processes: 1768396
-processes_used: 1765460
-system: 651568491
-atom: 244837
-atom_used: 237116
-binary: 648618369
-code: 2158413
-ets: 225620
-=hash_table:atom_tab
-size: 4813
-used: 3304
-objs: 5614
-depth: 7
-=index_table:atom_tab
-size: 5700
-limit: 1048576
-used: 5614
-rate: 100
-=hash_table:module_code
-size: 97
-used: 69
-objs: 107
-depth: 5
-=index_table:module_code
-size: 110
-limit: 65536
-used: 107
-rate: 10
-=hash_table:export_list
-size: 2411
-used: 1674
-objs: 2843
-depth: 6
-=index_table:export_list
-size: 2900
-limit: 65536
-used: 2843
-rate: 100
-=hash_table:process_reg
-size: 47
-used: 16
-objs: 23
-depth: 3
-=hash_table:fun_table
-size: 397
-used: 261
-objs: 400
-depth: 4
-=hash_table:node_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=hash_table:dist_table
-size: 11
-used: 1
-objs: 1
-depth: 1
-=allocated_areas
-processes: 1765460 1768396
-ets: 225620
-sys_misc: 24634
-static: 295033
-atom_space: 65544 57967
-binary: 648618369
-atom_table: 42141
-module_table: 920
-export_table: 21336
-register_table: 252
-fun_table: 1650
-module_refs: 1024
-loaded_code: 1968915
-dist_table: 159
-node_table: 131
-bits_bufs_size: 19
-bif_timer: 13392
-link_lh: 0
-dist_buf: 0
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:sys_alloc
-option e: true
-option m: libc
-=allocator:temp_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 90
-option rsbcmt: 80
-option mmbcs: 65536
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: af
-mbcs blocks: 0 9 9
-mbcs blocks size: 0 35376 35376
-mbcs carriers: 1 1 1
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 65568 65568 65568
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 65568
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-temp_alloc calls: 6155
-temp_free calls: 6155
-temp_realloc calls: 29
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 1
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:sl_alloc
-option e: false
-=allocator:std_alloc
-option e: false
-=allocator:ll_alloc
-versions: 0.9 2.1
-option e: true
-option sbct: 4294967295
-option asbcst: 0
-option rsbcst: 0
-option rsbcmt: 0
-option mmbcs: 2097152
-option mmsbc: 0
-option mmmbc: 0
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option as: aobf
-mbcs blocks: 592 592 592
-mbcs blocks size: 2838520 2863304 2863304
-mbcs carriers: 2 2 2
-mbcs mseg carriers: 0
-mbcs sys_alloc carriers: 2
-mbcs carriers size: 3145760 3145760 3145760
-mbcs mseg carriers size: 0
-mbcs sys_alloc carriers size: 3145760
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-ll_alloc calls: 592
-ll_free calls: 0
-ll_realloc calls: 235
-mseg_alloc calls: 0
-mseg_dealloc calls: 0
-mseg_realloc calls: 0
-sys_alloc calls: 2
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:eheap_alloc
-versions: 2.1 2.1
-option e: true
-option sbct: 524288
-option asbcst: 4145152
-option rsbcst: 50
-option rsbcmt: 80
-option mmbcs: 524288
-option mmsbc: 256
-option mmmbc: 10
-option lmbcs: 5242880
-option smbcs: 1048576
-option mbcgs: 10
-option mbsd: 3
-option as: gf
-mbcs blocks: 56 102 102
-mbcs blocks size: 833280 1638920 1638920
-mbcs carriers: 2 3 3
-mbcs mseg carriers: 1
-mbcs sys_alloc carriers: 1
-mbcs carriers size: 1998880 3047456 3047456
-mbcs mseg carriers size: 1474560
-mbcs sys_alloc carriers size: 524320
-sbcs blocks: 0 0 0
-sbcs blocks size: 0 0 0
-sbcs carriers: 0 0 0
-sbcs mseg carriers: 0
-sbcs sys_alloc carriers: 0
-sbcs carriers size: 0 0 0
-sbcs mseg carriers size: 0
-sbcs sys_alloc carriers size: 0
-eheap_alloc calls: 6971
-eheap_free calls: 6914
-eheap_realloc calls: 461
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-sys_alloc calls: 3
-sys_free calls: 0
-sys_realloc calls: 0
-=allocator:binary_alloc
-option e: false
-=allocator:ets_alloc
-option e: false
-=allocator:fix_alloc
-option e: true
-proc: 15080 13576
-atom_entry: 137152 137008
-export_entry: 138448 137632
-module_entry: 4872 4352
-reg_proc: 1000 592
-link_nh: 2464 2080
-link_sh: 832 192
-proc_list: 24 24
-fun_entry: 22584 22584
-db_tab: 1632 1632
-=allocator:mseg_alloc
-version: 0.9
-option amcbf: 4194304
-option rmcbf: 20
-option mcs: 5
-option cci: 1000
-cached_segments: 0
-cache_hits: 13
-segments: 2
-segments_watermark: 2
-mseg_alloc calls: 16
-mseg_dealloc calls: 14
-mseg_realloc calls: 0
-mseg_create calls: 4
-mseg_destroy calls: 1
-mseg_clear_cache calls: 6
-mseg_check_cache calls: 2
-=allocator:alloc_util
-option mmc: 1024
-option ycs: 1048576
-=allocator:instr
-option m: false
-option s: false
-option t: false
-=proc:<0.0.0>
-State: Waiting
-Name: init
-Spawned as: otp_ring0:start/2
-Spawned by: []
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.5.0>,<0.4.0>,<0.2.0>]
-Reductions: 3851
-Stack+heap: 377
-OldHeap: 610
-Heap unused: 53
-OldHeap unused: 610
-Program counter: 0x1f496c (init:loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.2.0>
-State: Waiting
-Name: erl_prim_loader
-Spawned as: erlang:apply/2
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.0.0>,#Port<0.2>]
-Reductions: 201036
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 923
-OldHeap unused: 987
-Program counter: 0x20cc94 (erl_prim_loader:loop/3 + 52)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.4.0>
-State: Waiting
-Name: error_logger
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.0.0>]
-Reductions: 296
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 851
-OldHeap unused: 0
-Program counter: 0x21f5b8 (gen_event:loop/4 + 40)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.5.0>
-State: Waiting
-Name: application_controller
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.1.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.7.0>,<0.0.0>]
-Reductions: 1508
-Stack+heap: 1597
-OldHeap: 0
-Heap unused: 835
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.7.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.6.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.8.0>,<0.5.0>]
-Reductions: 23
-Stack+heap: 377
-OldHeap: 0
-Heap unused: 79
-OldHeap unused: 0
-Program counter: 0x248d04 (application_master:main_loop/2 + 28)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.8.0>
-State: Waiting
-Spawned as: application_master:start_it/4
-Spawned by: <0.7.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>,<0.7.0>]
-Reductions: 91
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 177
-OldHeap unused: 0
-Program counter: 0x24a26c (application_master:loop_it/4 + 40)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.9.0>
-State: Waiting
-Name: kernel_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.8.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.24.0>,<0.23.0>,<0.19.0>,<0.18.0>,<0.17.0>,<0.16.0>,<0.15.0>,<0.14.0>,<0.11.0>,<0.10.0>,<0.8.0>]
-Reductions: 7402
-Stack+heap: 610
-OldHeap: 987
-Heap unused: 311
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.10.0>
-State: Waiting
-Name: rex
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 44
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 144
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.11.0>
-State: Waiting
-Name: global_name_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.13.0>,<0.12.0>,<0.9.0>]
-Reductions: 47
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 98
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.12.0>
-State: Waiting
-Spawned as: global:init_the_locker/1
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 3
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 227
-OldHeap unused: 0
-Program counter: 0x261340 (global:loop_the_locker/2 + 92)
-CP: 0x261184 (global:init_the_locker/1 + 112)
-arity = 0
-=proc:<0.13.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.11.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.11.0>]
-Reductions: 4
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 221
-OldHeap unused: 0
-Program counter: 0x265288 (global:collect_deletions/2 + 76)
-CP: 0x2651ac (global:loop_the_deleter/1 + 36)
-arity = 0
-=proc:<0.14.0>
-State: Waiting
-Name: inet_db
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 376
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 30
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.15.0>
-State: Waiting
-Name: global_group
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 71
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 92
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.16.0>
-State: Waiting
-Name: file_server_2
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 119
-Link list: [{from,<0.17.0>,#Ref<0.0.0.22>},#Port<0.4>,<0.9.0>]
-Reductions: 83605
-Stack+heap: 4181
-OldHeap: 4181
-Heap unused: 1720
-OldHeap unused: 4181
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.17.0>
-State: Waiting
-Name: file_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.16.0>,#Ref<0.0.0.22>},<0.9.0>]
-Reductions: 12
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 207
-OldHeap unused: 0
-Program counter: 0x2a18e8 (old_file_server:relay_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.18.0>
-State: Waiting
-Name: code_server
-Spawned as: erlang:apply/2
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:07 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 108900
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 4389
-OldHeap unused: 6765
-Program counter: 0x2a6e64 (code_server:loop/1 + 64)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.19.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.21.0>,<0.9.0>]
-Reductions: 74
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 180
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.20.0>
-State: Waiting
-Spawned as: user_drv:server/2
-Spawned by: <0.19.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.22.0>,<0.21.0>,#Port<0.72>]
-Reductions: 596
-Stack+heap: 233
-OldHeap: 377
-Heap unused: 214
-OldHeap unused: 377
-Program counter: 0x2ca4e0 (user_drv:server_loop/5 + 56)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.21.0>
-State: Waiting
-Name: user
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.4.0>,<0.19.0>,<0.20.0>]
-Reductions: 26
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 202
-OldHeap unused: 0
-Program counter: 0x2cd9d8 (group:server_loop/3 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.22.0>
-State: Waiting
-Spawned as: group:server/2
-Spawned by: <0.20.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{from,<0.49.0>,#Ref<0.0.0.307>},<0.25.0>,<0.20.0>]
-Reductions: 1244
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 40
-OldHeap unused: 233
-Program counter: 0x2cf238 (group:get_line1/3 + 1652)
-CP: 0x2cf230 (group:get_line1/3 + 1644)
-arity = 0
-=proc:<0.23.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.9.0>]
-Reductions: 45
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 63
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.24.0>
-State: Waiting
-Name: kernel_safe_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.9.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.31.0>,<0.9.0>]
-Reductions: 133
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 198
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.25.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.22.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.49.0>,<0.27.0>,<0.22.0>]
-Reductions: 161
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 169
-OldHeap unused: 0
-Program counter: 0x2e0d00 (shell:get_command1/4 + 40)
-CP: 0x2e06fc (shell:server_loop/6 + 140)
-arity = 0
-=proc:<0.27.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:08 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.25.0>]
-Reductions: 506
-Stack+heap: 4181
-OldHeap: 0
-Heap unused: 1131
-OldHeap unused: 0
-Program counter: 0x2e2bbc (shell:eval_loop/2 + 32)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.31.0>
-State: Waiting
-Name: inet_gethost_native_sup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.24.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.32.0>,<0.24.0>]
-Reductions: 49
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 87
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.32.0>
-State: Waiting
-Name: inet_gethost_native
-Spawned as: inet_gethost_native:server_init/2
-Spawned by: <0.31.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 118
-Link list: [#Port<0.105>,<0.31.0>]
-Reductions: 65
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 13
-OldHeap unused: 0
-Program counter: 0x4ad840 (inet_gethost_native:main_loop/1 + 20)
-CP: 0x156f90 (<terminate process normally>)
-arity = 0
-=proc:<0.33.0>
-State: Waiting
-Name: web_tool
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.27.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.41.0>]
-Reductions: 131773
-Stack+heap: 6765
-OldHeap: 6765
-Heap unused: 2941
-OldHeap unused: 6765
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.41.0>
-State: Waiting
-Name: websup
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.48.0>,<0.33.0>]
-Reductions: 118
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 205
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.43.0>
-State: Waiting
-Name: httpd_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.33.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.46.0>,<0.45.0>,<0.44.0>]
-Reductions: 1220
-Stack+heap: 6765
-OldHeap: 0
-Heap unused: 277
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.44.0>
-State: Waiting
-Name: httpd_acc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.47.0>,<0.43.0>]
-Reductions: 147
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 77
-OldHeap unused: 233
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.45.0>
-State: Waiting
-Name: httpd_misc_sup__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 52
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 80
-OldHeap unused: 0
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.46.0>
-State: Waiting
-Name: httpd__127_0_0_1__8888
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.43.0>
-Started: Wed Apr 21 13:22:17 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.43.0>]
-Reductions: 2905
-Stack+heap: 6765
-OldHeap: 10946
-Heap unused: 138
-OldHeap unused: 10946
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.47.0>
-State: Waiting
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.44.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [#Port<0.161>,#Port<0.141>,<0.44.0>]
-Reductions: 874
-Stack+heap: 233
-OldHeap: 233
-Heap unused: 190
-OldHeap unused: 233
-Program counter: 0x1fe798 (prim_inet:accept0/2 + 96)
-CP: 0x1feb04 (prim_inet:async_accept/2 + 380)
-arity = 0
-=proc:<0.48.0>
-State: Waiting
-Name: crashdump_viewer_server
-Spawned as: proc_lib:init_p/5
-Spawned by: <0.41.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [<0.56.0>,<0.41.0>]
-Reductions: 1913
-Stack+heap: 987
-OldHeap: 987
-Heap unused: 524
-OldHeap unused: 987
-Program counter: 0x239d50 (gen_server:loop/6 + 52)
-CP: 0x225860 (proc_lib:init_p/5 + 164)
-arity = 0
-=proc:<0.49.0>
-State: Waiting
-Spawned as: erlang:apply/2
-Spawned by: <0.25.0>
-Started: Wed Apr 21 13:22:18 2004
-Message queue length: 0
-Number of heap fragments: 0
-Heap fragment data: 0
-Link list: [{to,<0.22.0>,#Ref<0.0.0.307>},<0.25.0>]
-Reductions: 15
-Stack+heap: 233
-OldHeap: 0
-Heap unused: 190
-OldHeap unused: 0
-Program counter: 0x301d58 (io:wait_io_mon_reply/2 + 28)
-CP: 0x30174c (io:parse_erl_exprs/3 + 92)
-arity = 0
-=proc:<0.56.0>
-State: Garbing
-Spawned as: erlang:apply/2
-Last scheduled in for: erlang:garbage_collect/0
-Spawned by: <0.48.0>
-Started: Wed Apr 21 13:22:27 2004
-Message queue length: 0
-Number of heap fragments: 1
-Heap fragment data: 121
-Link list: [#Port<0.158>,#Port<0.157>,<0.48.0>]
-Reductions: 2420470
-Stack+heap: 121393
-OldHeap: 0
-Heap unused: 22172
-OldHeap unused: 0
-New heap start: FE5768E0
-New heap top: FE5D7734
-Stack top: FE5ED130
-Stack end: FE5ED1A4
-Old heap start: 0
-Old heap top: 0
-Old heap end: 0
-Program counter: 0x1a4980 (unknown function)
-CP: 0x20710c (prim_file:read/2 + 436)
-=port:#Port<0.1>
-Slot: 1
-Connected: #Port<0.0>
-Port controls linked-in driver: async
-=port:#Port<0.2>
-Slot: 2
-Connected: <0.2.0>
-Links: <0.2.0>
-Port controls linked-in driver: efile
-=port:#Port<0.4>
-Slot: 4
-Connected: <0.16.0>
-Links: <0.16.0>
-Port controls linked-in driver: efile
-=port:#Port<0.72>
-Slot: 72
-Connected: <0.20.0>
-Links: <0.20.0>
-Port controls linked-in driver: tty_sl -c -e
-=port:#Port<0.105>
-Slot: 105
-Connected: <0.32.0>
-Links: <0.32.0>
-Port controls external process: inet_gethost 4 
-=port:#Port<0.141>
-Slot: 141
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=port:#Port<0.157>
-Slot: 157
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.158>
-Slot: 158
-Connected: <0.56.0>
-Links: <0.56.0>
-Port controls linked-in driver: efile
-=port:#Port<0.161>
-Slot: 161
-Connected: <0.47.0>
-Links: <0.47.0>
-Port controls linked-in driver: tcp_inet
-=ets:<0.18.0>
-Slot: 9
-Table: 9
-Name: code
-Buckets: 256 
-Objects: 289
-Words: 14108
-=ets:<0.18.0>
-Slot: 10
-Table: 10
-Name: code_names
-Buckets: 256 
-Objects: 47
-Words: 4334
-=ets:<0.32.0>
-Slot: 11
-Table: 11
-Name: ign_requests
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.32.0>
-Slot: 12
-Table: 12
-Name: ign_req_index
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.33.0>
-Slot: 13
-Table: 13
-Name: app_data
-Buckets: 256 
-Objects: 7
-Words: 952
-=ets:<0.46.0>
-Slot: 15
-Table: 15
-Name: httpd_mime__127_0_0_1__8888
-Buckets: 256 
-Objects: 105
-Words: 5742
-=ets:<0.11.0>
-Slot: 84
-Table: global_names
-Name: global_names
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 95
-Table: global_locks
-Name: global_locks
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.11.0>
-Slot: 96
-Table: global_names_ext
-Name: global_names_ext
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.14.0>
-Slot: 316
-Table: inet_cache
-Name: inet_cache
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 340
-Table: cdv_menu_table
-Name: cdv_menu_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 341
-Table: cdv_dump_index_table
-Name: cdv_dump_index_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.48.0>
-Slot: 342
-Table: cdv_decode_heap_table
-Name: cdv_decode_heap_table
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.16.0>
-Slot: 780
-Table: file_io_servers
-Name: file_io_servers
-Buckets: 256 
-Objects: 0
-Words: 277
-=ets:<0.46.0>
-Slot: 984
-Table: httpd_conf__127_0_0_1__8888
-Name: httpd_conf__127_0_0_1__8888
-Buckets: 256 
-Objects: 17
-Words: 1176
-=ets:<0.14.0>
-Slot: 1342
-Table: inet_hosts
-Name: inet_hosts
-Buckets: 256 
-Objects: 4
-Words: 421
-=ets:<0.14.0>
-Slot: 1362
-Table: inet_db
-Name: inet_db
-Buckets: 256 
-Objects: 20
-Words: 671
-=ets:<0.5.0>
-Slot: 1655
-Table: ac_tab
-Name: ac_tab
-Buckets: 256 
-Objects: 6
-Words: 843
-=timer:<0.14.0>
-Message: refresh_timeout
-Time left: 3565692 ms
-=node:'nonode@nohost'
-=no_distribution
-=loaded_modules
-Current code: 1968915
-Old code: 0
-=mod:otp_ring0
-Current size: 489
-=mod:init
-Current size: 30110
-=mod:prim_inet
-Current size: 35532
-=mod:prim_file
-Current size: 24965
-=mod:erl_prim_loader
-Current size: 19607
-=mod:erlang
-Current size: 11137
-=mod:error_handler
-Current size: 2389
-Current attributes: 836C00000001680264000376736E6C000000016E100030769A34345F26EF6D3433254FF2AE576A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161216802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F68616E646C65722E65726C6A
-=mod:heart
-Current size: 6687
-Current attributes: 836C00000001680264000376736E6C000000016E10003094F7BECF345494DDBB4D7186E694186A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261086802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F68656172742E65726C6A
-=mod:error_logger
-Current size: 7051
-Current attributes: 836C00000001680264000376736E6C000000016E10004E3347F841DEAE2EB6A74389E6E127146A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161246802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6572726F725F6C6F676765722E65726C6A
-=mod:gen_event
-Current size: 18288
-Current attributes: 836C00000001680264000376736E6C000000016E1000336F22DF1EA75E0EA4AE65D3B8C34F946A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61346802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F6576656E742E65726C6A
-=mod:gen
-Current size: 7129
-Current attributes: 836C00000001680264000376736E6C000000016E10007BE6AEB66EF48D8B33323C89C9936A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61316802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E2E65726C6A
-=mod:proc_lib
-Current size: 11658
-Current attributes: 836C00000001680264000376736E6C000000016E10005C589A8C9BD2E1F2E895E765CAE983406A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E612D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F70726F635F6C69622E65726C6A
-=mod:application_controller
-Current size: 55249
-Current attributes: 836C00000002680264000376736E6C000000016E10003372E1AB0410565065FA086086A721316A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061246802640006736F757263656B003D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F636F6E74726F6C6C65722E65726C6A
-=mod:gen_server
-Current size: 18728
-Current attributes: 836C00000001680264000376736E6C000000016E10004C5E93533036DAC7698FC4112F59CF236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61396802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67656E5F7365727665722E65726C6A
-=mod:sys
-Current size: 11589
-Current attributes: 836C00000001680264000376736E6C000000016E1000E12B0E8267551204BD5924BAB9629ADF6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61176802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7379732E65726C6A
-=mod:lists
-Current size: 18638
-Current attributes: 836C00000002680264000376736E6C000000016E10001E95B32C30E4CDAF0BDD1ABA58CBB5F36A680264000A646570726563617465646C0000000B68026400066B65796D617061046802640003616C6C61036802640003616E79610368026400036D617061036802640007666C61746D617061036802640005666F6C646C61046802640005666F6C64726104680264000666696C746572610368026400086D6170666F6C646C610468026400086D6170666F6C647261046802640007666F726561636861036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61116802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374732E65726C6A
-=mod:application
-Current size: 2666
-Current attributes: 836C00000001680264000376736E6C000000016E1000C0C5A7B67B306300FEFF9D91AA50ECB36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130611F6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E2E65726C6A
-=mod:application_master
-Current size: 10912
-Current attributes: 836C00000001680264000376736E6C000000016E1000360420F5CEB80AD7DD51B3A8A0E2AFA26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061266802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6170706C69636174696F6E5F6D61737465722E65726C6A
-=mod:kernel
-Current size: 7639
-Current attributes: 836C00000002680264000376736E6C000000016E10004D418ACCB0F948D4D3CA6B9A81B462746A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261336802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C2E65726C6A
-=mod:supervisor
-Current size: 24469
-Current attributes: 836C00000002680264000376736E6C000000016E1000979F65727577135484BE0892A35087CC6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61126802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F722E65726C6A
-=mod:rpc
-Current size: 14539
-Current attributes: 836C00000002680264000376736E6C000000016E10008C5D6242D36B3201E3B11E82D5E1581E6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133610F6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7270632E65726C6A
-=mod:gb_trees
-Current size: 8274
-Current attributes: 836C00000001680264000376736E6C000000016E1000094BEFDE7B866EF2CB6FCD895AC2EE056A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F67625F74726565732E65726C6A
-=mod:global
-Current size: 40753
-Current attributes: 836C00000002680264000376736E6C000000016E10001D02C89BDE6CB2052F099894683C14CA6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161386802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C2E65726C6A
-=mod:inet_db
-Current size: 34555
-Current attributes: 836C00000001680264000376736E6C000000016E1000C1CF6A6F2E83D4EBC23D2CCECBF376226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132611A6802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F64622E65726C6A
-=mod:inet_config
-Current size: 13575
-Current attributes: 836C00000001680264000376736E6C000000016E1000650F6571C03BC9C16BB7973A747565066A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261166802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F636F6E6669672E65726C6A
-=mod:os
-Current size: 5997
-Current attributes: 836C00000001680264000376736E6C000000016E100017144CD766A604A9DFBA0B58C8FCA78B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361056802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F732E65726C6A
-=mod:inet_udp
-Current size: 2451
-Current attributes: 836C00000001680264000376736E6C000000016E1000ACB163E87A687A6683B50B331C6E289B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261306802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7564702E65726C6A
-=mod:inet
-Current size: 28288
-Current attributes: 836C00000001680264000376736E6C000000016E10009B9AD400F0BAF6AAF17A4788A4EFF11E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132610C6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65742E65726C6A
-=mod:inet_parse
-Current size: 21928
-Current attributes: 836C00000001680264000376736E6C000000016E1000E0E65454C096847749930EDC1C53C80B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261266802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F70617273652E65726C6A
-=mod:filename
-Current size: 17411
-Current attributes: 836C00000001680264000376736E6C000000016E100068085214F459D51A3E08819BF8D7698A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61296802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656E616D652E65726C6A
-=mod:inet_hosts
-Current size: 3745
-Current attributes: 836C00000001680264000376736E6C000000016E1000E7430304E86230057150DEE5D279881F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261226802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F686F7374732E65726C6A
-=mod:erl_distribution
-Current size: 2512
-Current attributes: 836C00000002680264000376736E6C000000016E1000CDE49D63ACA767E0D49679657E99D2046A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161186802640006736F757263656B00372F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F65726C5F646973747269627574696F6E2E65726C6A
-=mod:global_group
-Current size: 30960
-Current attributes: 836C00000002680264000376736E6C000000016E10008ECE759E5920988CA3ACFF34B32F86736A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131613B6802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F676C6F62616C5F67726F75702E65726C6A
-=mod:net_kernel
-Current size: 37648
-Current attributes: 836C00000002680264000376736E6C000000016E1000967CE7DE41F9B39906CCCF3225E6E5286A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361026802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6E65745F6B65726E656C2E65726C6A
-=mod:file_server
-Current size: 8372
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF90906EC6204204AC0A77C4A25B65236A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612D6802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F7365727665722E65726C6A
-=mod:old_file_server
-Current size: 3074
-Current attributes: 836C00000001680264000376736E6C000000016E1000C802085DD76D4EFBA6A8F528FECB94B36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612F6802640006736F757263656B00362F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6F6C645F66696C655F7365727665722E65726C6A
-=mod:code
-Current size: 7419
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE618E3041C8E3807A3719CD5140DF5E6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6130612E6802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64652E65726C6A
-=mod:code_server
-Current size: 30811
-Current attributes: 836C00000001680264000376736E6C000000016E0F00BFB96248C2CA8601B4CB7F543F52E26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061346802640006736F757263656B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F7365727665722E65726C6A
-=mod:code_aux
-Current size: 1736
-Current attributes: 836C00000001680264000376736E6C000000016E10007A90DB53FCCECD52504F20E7A3B6BAE26A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613061316802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F636F64655F6175782E65726C6A
-=mod:packages
-Current size: 3119
-Current attributes: 836C00000001680264000376736E6C000000016E1000044DC8EEB65F178AE23EF2465E1954496A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361076802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F7061636B616765732E65726C6A
-=mod:hipe_unified_loader
-Current size: 37330
-Current attributes: 836C00000001680264000376736E6C000000016E1000DABD57945702E56F4B3AA7B7B19C1D166A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361326802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F756E69666965645F6C6F616465722E65726C6A
-=mod:hipe_sparc_loader
-Current size: 1821
-Current attributes: 836C00000001680264000376736E6C000000016E1000582BC55E9FADFF879C2C45D25A6CB7E56A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F6D61696E6802640001696B00312F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F72746C6802640001696B00332F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F2E2E2F686970652F737061726364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6133612B6802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F686970655F73706172635F6C6F616465722E65726C6A
-=mod:ets
-Current size: 16577
-Current attributes: 836C00000002680264000376736E6C000000016E100033D982AC91129E5FC35E0AC3337A4EB56A680264000A646570726563617465646C0000000168026400086669787461626C6561026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D611C6802640006736F757263656B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6574732E65726C6A
-=mod:lists_sort
-Current size: 38692
-Current attributes: 836C00000001680264000376736E6C000000016E1000E17EC92FA9AA3199DD71701C215044616A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000B68026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736802640006696E6C696E656C0000000468026400096D65726765335F3132610768026400096D65726765335F32316107680264000A726D65726765335F31326107680264000A726D65726765335F323161076A6802640006696E6C696E656C00000004680264000A756D65726765335F31326108680264000A756D65726765335F32316108680264000C72756D65726765335F3132616107680264000C72756D65726765335F31326261086A6802640006696E6C696E656C00000004680264000C6B65796D65726765335F3132610C680264000C6B65796D65726765335F3231610C680264000D726B65796D65726765335F3132610C680264000D726B65796D65726765335F3231610C6A6802640006696E6C696E656C00000006680264000D756B65796D65726765335F3132610D680264000D756B65796D65726765335F3231610D680264000F72756B65796D65726765335F313261610B680264000F72756B65796D65726765335F323161610D680264000F72756B65796D65726765335F313262610D680264000F72756B65796D65726765335F323162610C6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61166802640006736F757263656B00312F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6C697374735F736F72742E65726C6A
-=mod:user_sup
-Current size: 2355
-Current attributes: 836C00000002680264000376736E6C000000016E100074BA860804CB4D60D6908C705E6544BD6A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361246802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F7375702E65726C6A
-=mod:supervisor_bridge
-Current size: 2944
-Current attributes: 836C00000002680264000376736E6C000000016E10001590DDC10CF8A9D09763CDB7479678ED6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61156802640006736F757263656B00382F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F73757065727669736F725F6272696467652E65726C6A
-=mod:user_drv
-Current size: 14630
-Current attributes: 836C00000001680264000376736E6C000000016E1000F29F3B193A1EB1ADA9975D97E51BF0E86A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613361216802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F757365725F6472762E65726C6A
-=mod:group
-Current size: 10165
-Current attributes: 836C00000001680264000376736E6C000000016E1000F6427D0DA330BBFAD5D4C19058516FF36A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261066802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67726F75702E65726C6A
-=mod:io_lib
-Current size: 12601
-Current attributes: 836C00000002680264000376736E6C000000016E10004160DD78F37EE7C72F7C5B6A751DB7F56A680264000A646570726563617465646C0000000468026400047363616E610168026400047363616E610268026400047363616E6103680264000D72657365727665645F776F726461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61036802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69622E65726C6A
-=mod:edlin
-Current size: 18178
-Current attributes: 836C00000001680264000376736E6C000000016E100035D752FCBA8ED7F4D26990EF3E6A1A526A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65646C696E2E65726C6A
-=mod:io_lib_format
-Current size: 16189
-Current attributes: 836C00000001680264000376736E6C000000016E10004F382F327C456F83F33C3D5EBFBD87906A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61066802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F666F726D61742E65726C6A
-=mod:kernel_config
-Current size: 3295
-Current attributes: 836C00000002680264000376736E6C000000016E100077B8EE6C9E95FBBE5DB0371F6DB235226A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261356802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F6B65726E656C5F636F6E6669672E65726C6A
-=mod:shell
-Current size: 22571
-Current attributes: 836C00000001680264000376736E6C000000016E10007D1354325618EB98A5BD4E8F41E6A0226A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F61016802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7368656C6C2E65726C6A
-=mod:error_logger_tty_h
-Current size: 7773
-Current attributes: 836C00000002680264000376736E6C000000016E10001502D55D6C1777F07E2E05CDD91D16986A68026400096265686176696F75726C0000000164000967656E5F6576656E746A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61196802640006736F757263656B00392F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6572726F725F6C6F676765725F7474795F682E65726C6A
-=mod:erl_eval
-Current size: 33481
-Current attributes: 836C00000002680264000376736E6C000000016E1000D06903753C86BBC49A5CBD789CCB09B66A680264000A646570726563617465646C00000004680264000373657161026802640003736571610368026400086172675F6C697374610268026400086172675F6C69737461036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C610D6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6576616C2E65726C6A
-=mod:orddict
-Current size: 4872
-Current attributes: 836C00000002680264000376736E6C000000016E100078DCF69F3949D79BC54168266A3ABF566A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61236802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264646963742E65726C6A
-=mod:c
-Current size: 19555
-Current attributes: 836C00000001680264000376736E6C000000016E10003FACCF5DE16ABBC988ABF0811980C33B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61136802640006736F757263656B00282F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F632E65726C6A
-=mod:io
-Current size: 7417
-Current attributes: 836C00000002680264000376736E6C000000016E1000E2F2A6094B3C3D945865225D0620E7546A680264000A646570726563617465646C00000007680264000B70617273655F65787072736102680264000C7363616E5F65726C5F7365716101680264000C7363616E5F65726C5F7365716102680264000C7363616E5F65726C5F7365716103680264000D70617273655F65726C5F7365716101680264000D70617273655F65726C5F7365716102680264000D70617273655F65726C5F73657161036A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61006802640006736F757263656B00292F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F2E65726C6A
-=mod:file
-Current size: 20795
-Current attributes: 836C00000002680264000376736E6C000000016E1000D291AF77EE8B08B792B7FE99274504506A680264000A646570726563617465646C00000001680264000966696C655F696E666F61016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161276802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C652E65726C6A
-=mod:file_io_server
-Current size: 12071
-Current attributes: 836C00000001680264000376736E6C000000016E1000A5A8C4E2B2646855AD5C617CB216CB966A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6131612A6802640006736F757263656B00352F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F66696C655F696F5F7365727665722E65726C6A
-=mod:erl_scan
-Current size: 21891
-Current attributes: 836C00000001680264000376736E6C000000016E100094F386F0C378B258E5D9CEADD4F03B6A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61116802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F7363616E2E65726C6A
-=mod:erl_parse
-Current size: 161233
-Current attributes: 836C00000001680264000376736E6C000000016E10000E8CBC32C293BFC1FBC721CE918062236A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000968026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F76617273640006696E6C696E656802640004686970656C000000016802640008726567616C6C6F6364000B6C696E6561725F7363616E6A6A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61076802640006736F757263656B00302F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F70617273652E65726C6A
-=mod:erl_lint
-Current size: 73159
-Current attributes: 836C00000001680264000376736E6C000000016E1000D1D2A7D6DDFD1195CB180993C76FD2CD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612C61156802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F65726C5F6C696E742E65726C6A
-=mod:ordsets
-Current size: 3257
-Current attributes: 836C00000002680264000376736E6C000000016E1000FD39D8FD846511128F5670BA28600F676A680264000A646570726563617465646C0000000468026400076E65775F7365746100680264000B7365745F746F5F6C6973746101680264000B6C6973745F746F5F7365746101680264000673756273657461026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61256802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F7264736574732E65726C6A
-=mod:dict
-Current size: 15637
-Current attributes: 836C00000002680264000376736E6C000000016E1000BC846E7EF85045A5D76190CE9B1AE97C6A680264000A646570726563617465646C00000002680264000C646963745F746F5F6C6973746101680264000C6C6973745F746F5F6469637461016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61356802640006736F757263656B002B2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F646963742E65726C6A
-=mod:otp_internal
-Current size: 7133
-Current attributes: 836C00000001680264000376736E6C000000016E1000DC494F64DE590AFC4919DFEB0EB026B66A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61206802640006736F757263656B00332F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F6F74705F696E7465726E616C2E65726C6A
-=mod:user_default
-Current size: 1261
-Current attributes: 836C00000002680264000376736E6C000000016E1000505078ACD9B84D514FC6DA2BE249E6756A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612C61126802640006736F757263656B00222F686F6D652F736972692F65726C616E672F757365725F64656661756C742E65726C6A
-=mod:tt
-Current size: 2959
-Current attributes: 836C00000002680264000376736E6C000000016E10001D71FD5A55D3BCBF06BFEDF2426C3C386A6802640006617574686F726C0000000164001765656973686E6E406565692E6572696373736F6E2E73656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000368026400036377646B00112F686F6D652F736972692F65726C616E6768026400066F75746469726B00112F686F6D652F736972692F65726C616E676400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461036116610D612B610C6802640006736F757263656B00182F686F6D652F736972692F65726C616E672F74742E65726C6A
-=mod:distel
-Current size: 18214
-Current attributes: 836C00000002680264000376736E6C000000016E1000CC9C9EF141459249C1CCA00993B2E29A6A6802640006617574686F726C000000016400116C756B6540626C75657461696C2E636F6D6A6A
-Current compilation info: 836C0000000368026400076F7074696F6E736C0000000664000276336400107761726E5F756E757365645F7661727364000A64656275675F696E666F68026400066F75746469726B00046562696E68026400036377646B001C2F6C6469736B2F736972692F746F6F6C732F64697374656C2D332E3164000A6578706F72745F616C6C6A680264000776657273696F6E6B0003342E31680264000474696D65680662000007D2610B6114610B610361336A
-=mod:crashdump_viewer
-Current size: 125756
-Current attributes: 836C00000001680264000376736E6C000000016E10002DC5D9D96190A2D5F27FAC3FA3D5C7956A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611B61366802640006736F757263656B00362F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765722E65726C6A
-=mod:webtool
-Current size: 29229
-Current attributes: 836C00000002680264000376736E6C000000016E10008AEEF06B60527A3390CBC2C98083CC0A6A68026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F76617273680264000F70617273655F7472616E73666F726D64000C6D735F7472616E73666F726D6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104610661086106612D6802640006736F757263656B002C2F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C2E65726C6A
-=mod:gen_tcp
-Current size: 3574
-Current attributes: 836C00000001680264000376736E6C000000016E1000C965E4EAFDAA94D7F21EDCBE30B21E7B6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613161316802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F67656E5F7463702E65726C6A
-=mod:inet_tcp
-Current size: 2743
-Current attributes: 836C00000001680264000376736E6C000000016E1000C4AFE0B49768E4CF78B2C42EA1D3DB7F6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B6132612B6802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F7463702E65726C6A
-=mod:inet_gethost_native
-Current size: 15611
-Current attributes: 836C00000002680264000376736E6C000000016E10005D8CD4277D0BD2425B9C26036AE314506A68026400096265686176696F75726C0000000164001173757065727669736F725F6272696467656A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000568026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F2E2E2F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B613261206802640006736F757263656B003A2F636C656172636173652F6F74702F657274732F6C69622F6B65726E656C2F7372632F696E65745F676574686F73745F6E61746976652E65726C6A
-=mod:filelib
-Current size: 7202
-Current attributes: 836C00000001680264000376736E6C000000016E10007B42AA23FF99DF2CD9D586635B77556A6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612D61266802640006736F757263656B002E2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F66696C656C69622E65726C6A
-=mod:httpd_util
-Current size: 24068
-Current attributes: 836C00000002680264000376736E6C000000016E10008D99E096221B88D542E52CB9C8377F6D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128613B6802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7574696C2E65726C6A
-=mod:webtool_sup
-Current size: 695
-Current attributes: 836C00000002680264000376736E6C000000016E1000FA5449E12816CF3AD0A3085BB26CDB9B6A68026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000468026400036377646B00202F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F73726368026400066F75746469726B00282F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F2E2E2F6562696E64000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461066108610761236802640006736F757263656B00302F636C656172636173652F6F74702F746F6F6C732F776562746F6F6C2F7372632F776562746F6F6C5F7375702E65726C6A
-=mod:httpd_conf
-Current size: 33659
-Current attributes: 836C00000002680264000376736E6C000000016E1000E3198FBDC73BC48CB7D0C1C762B8F1AB6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861116802640006736F757263656B00312F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F636F6E662E65726C6A
-=mod:regexp
-Current size: 13698
-Current attributes: 836C00000001680264000376736E6C000000016E10009DD44F3D02F8328BE3ABF4DDA89E0CAE6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E61376802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F7265676578702E65726C6A
-=mod:string
-Current size: 7740
-Current attributes: 836C00000002680264000376736E6C000000016E10005521DDF38903D46D7C53DB864266F7456A680264000A646570726563617465646C00000007680264000C72655F73685F746F5F61776B6101680264000872655F70617273656101680264000872655F6D617463686102680264000672655F7375626103680264000772655F677375626103680264000872655F73706C697461026802640005696E64657861026A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F610F6802640006736F757263656B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F737472696E672E65726C6A
-=mod:httpd
-Current size: 7563
-Current attributes: 836C00000002680264000376736E6C000000016E1000BFD190D951EB3CAD2CC72ADEF20886906A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861036802640006736F757263656B002C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470642E65726C6A
-=mod:httpd_sup
-Current size: 4068
-Current attributes: 836C00000003680264000376736E6C000000016E10007FA5C790118F18F3D20A2BFAF0229F0A6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861366802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F7375702E65726C6A
-=mod:httpd_acceptor_sup
-Current size: 2161
-Current attributes: 836C00000003680264000376736E6C000000016E10003E6F9289B64C13F1EC8A1184BACF055F6A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128610C6802640006736F757263656B00392F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F725F7375702E65726C6A
-=mod:httpd_verbosity
-Current size: 2672
-Current attributes: 836C00000002680264000376736E6C000000016E100018B6F407D391872421748F87877DAAF36A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961036802640006736F757263656B00362F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F766572626F736974792E65726C6A
-=mod:timer
-Current size: 8223
-Current attributes: 836C00000001680264000376736E6C000000016E10001D0D64DB1B923D1B3B9497655C43B4AD6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612F611A6802640006736F757263656B002C2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F74696D65722E65726C6A
-=mod:httpd_misc_sup
-Current size: 2066
-Current attributes: 836C00000003680264000376736E6C000000016E100092342F38AC16C074DDC21532FBFB52C26A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A73757065727669736F726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611F6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D6973635F7375702E65726C6A
-=mod:httpd_manager
-Current size: 28916
-Current attributes: 836C00000003680264000376736E6C000000016E100013F7A1E6A4B6407A0A1892A794EE10A36A68026400076170705F76736E6B000B696E6574732D332E302E3768026400096265686176696F75726C0000000164000A67656E5F7365727665726A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128611B6802640006736F757263656B00342F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6D616E616765722E65726C6A
-=mod:mod_alias
-Current size: 6720
-Current attributes: 836C00000002680264000376736E6C000000016E10002F35C36060B4AC45474440381D146AB96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961106802640006736F757263656B00302F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616C6961732E65726C6A
-=mod:mod_auth
-Current size: 25168
-Current attributes: 836C00000002680264000376736E6C000000016E100083F3CA0C7A3E7B5E19A635A7F916595D6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961166802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F617574682E65726C6A
-=mod:mod_esi
-Current size: 22534
-Current attributes: 836C00000002680264000376736E6C000000016E1000513E3FF733E1E6592B86CB55B9C14E086A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61026802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6573692E65726C6A
-=mod:mod_actions
-Current size: 3625
-Current attributes: 836C00000002680264000376736E6C000000016E10008E5437921662830490CA76DFF88548966A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066129610C6802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F616374696F6E732E65726C6A
-=mod:mod_cgi
-Current size: 25891
-Current attributes: 836C00000002680264000376736E6C000000016E1000F91D405488188F1BD25110B4ED9EE8786A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961306802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6367692E65726C6A
-=mod:mod_include
-Current size: 34923
-Current attributes: 836C00000002680264000376736E6C000000016E1000B9CCE88D63DD6AC49D5DF533C46B97D56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61176802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F696E636C7564652E65726C6A
-=mod:mod_dir
-Current size: 13488
-Current attributes: 836C00000002680264000376736E6C000000016E1000EF620CB4B5DE5586ED681347496DA1C86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961356802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469722E65726C6A
-=mod:mod_get
-Current size: 4672
-Current attributes: 836C00000002680264000376736E6C000000016E1000AD2730B6BE6AF875A500AF4857C4D7F86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A61076802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6765742E65726C6A
-=mod:mod_head
-Current size: 3074
-Current attributes: 836C00000002680264000376736E6C000000016E1000CAF803B9FA6A28D4153BC109B00D7DF96A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A610B6802640006736F757263656B002F2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F686561642E65726C6A
-=mod:mod_log
-Current size: 8546
-Current attributes: 836C00000002680264000376736E6C000000016E1000F9664B54861260DEA081249379219AF86A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612A611B6802640006736F757263656B002E2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6C6F672E65726C6A
-=mod:mod_disk_log
-Current size: 15160
-Current attributes: 836C00000002680264000376736E6C000000016E1000DDA1E88A9C423A2866B56425DF36F5C66A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612961396802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F6D6F645F6469736B5F6C6F672E65726C6A
-=mod:httpd_socket
-Current size: 7426
-Current attributes: 836C00000002680264000376736E6C000000016E1000B831219096661E4D2E200A07C4A9A7776A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861326802640006736F757263656B00332F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F736F636B65742E65726C6A
-=mod:httpd_acceptor
-Current size: 4472
-Current attributes: 836C00000002680264000376736E6C000000016E1000A501686DF4E4053E7D978E0CA162BEC56A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861076802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F6163636570746F722E65726C6A
-=mod:io_lib_pretty
-Current size: 8171
-Current attributes: 836C00000001680264000376736E6C000000016E1000CD397E11D2D380D02A4BC6EE309B98CB6A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612E610C6802640006736F757263656B00342F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F696F5F6C69625F7072657474792E65726C6A
-=mod:httpd_request_handler
-Current size: 26393
-Current attributes: 836C00000002680264000376736E6C000000016E100021C280A5EB5B9CCD00A2C418A341202A6A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861296802640006736F757263656B003C2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726571756573745F68616E646C65722E65726C6A
-=mod:calendar
-Current size: 7158
-Current attributes: 836C00000002680264000376736E6C000000016E10008C44498546709037F8D72DA4AF8B7FB76A680264000A646570726563617465646C00000001680264001C6C6F63616C5F74696D655F746F5F756E6976657273616C5F74696D6561016A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00222F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F6562696E6802640001696B002D2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F696E636C7564656802640001696B00372F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F2E2E2F2E2E2F6B65726E656C2F696E636C7564656400107761726E5F756E757365645F7661727364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E31680264000474696D65680662000007D3610C6112610B612B61166802640006736F757263656B002F2F636C656172636173652F6F74702F657274732F6C69622F7374646C69622F7372632F63616C656E6461722E65726C6A
-=mod:httpd_parse
-Current size: 9977
-Current attributes: 836C00000002680264000376736E6C000000016E1000174653BAA652261FEB44FFDED99E50B76A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461156106612861246802640006736F757263656B00322F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F70617273652E65726C6A
-=mod:httpd_response
-Current size: 13535
-Current attributes: 836C00000002680264000376736E6C000000016E1000785B247D894BA08A40D814EF11F848976A68026400076170705F76736E6B000B696E6574732D332E302E376A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000868036400016464001164656661756C745F766572626F7369747964000773696C656E636568036400016464000F5345525645525F534F4654574152456B000B696E6574732F332E302E3768026400036377646B00222F636C656172636173652F6F74702F6C69627261726965732F696E6574732F73726368026400066F75746469726B002A2F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F2E2E2F6562696E6804640009617474726962757465640006696E736572746400076170705F76736E6B000B696E6574732D332E302E37680264000F70617273655F7472616E73666F726D6400127379735F7072655F6174747269627574657364000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D46104611561066128612D6802640006736F757263656B00352F636C656172636173652F6F74702F6C69627261726965732F696E6574732F7372632F68747470645F726573706F6E73652E65726C6A
-=mod:crashdump_viewer_html
-Current size: 68343
-Current attributes: 836C00000001680264000376736E6C000000016E1000AE414770FDB0806C5583FF8D6D71DC766A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000768026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6400107761726E5F756E757365645F766172736A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D4610461146108611C61026802640006736F757263656B003B2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7669657765725F68746D6C2E65726C6A
-=mod:crashdump_translate
-Current size: 89840
-Current attributes: 836C00000001680264000376736E6C000000016E100038F332287181E933A76CEF4799BDB6416A6A
-Current compilation info: 836C0000000468026400076F7074696F6E736C0000000668026400036377646B00212F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F73726368026400066F75746469726B00292F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F6562696E6802640001696B002C2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F696E636C7564656802640001696B00322F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F65742F696E636C7564656802640001696B003F2F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F2E2E2F2E2E2F2E2E2F6C69627261726965732F65742F696E636C75646564000A64656275675F696E666F6A680264000776657273696F6E6B0005342E322E32680264000474696D65680662000007D461046115610B611661106802640006736F757263656B00392F636C656172636173652F6F74702F746F6F6C732F6F627365727665722F7372632F637261736864756D705F7472616E736C6174652E65726C6A
-=fun
-Module: crashdump_viewer_html
-Uniq: 9122590
-Index: 0
-Address: 526308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 77168418
-Index: 14
-Address: 26541c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 88083515
-Index: 9
-Address: 284c30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 36747896
-Index: 4
-Address: 26df84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 80395734
-Index: 8
-Address: 265838
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 103184573
-Index: 5
-Address: 2fa59c
-Native_address: bce80
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 88265811
-Index: 24
-Address: 34f6a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 9644262
-Index: 2
-Address: 292cec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 100885585
-Index: 0
-Address: 29eb2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 128335479
-Index: 6
-Address: 26de84
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 42988083
-Index: 1
-Address: 210c14
-Native_address: bcf04
-Refc: 1
-=fun
-Module: dict
-Uniq: 7105125
-Index: 7
-Address: 354f84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 29030584
-Index: 8
-Address: 234978
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 29214351
-Index: 2
-Address: 285660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 5158633
-Index: 4
-Address: 274034
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 74624950
-Index: 25
-Address: 34f63c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 6477018
-Index: 3
-Address: 2adb6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 117885138
-Index: 7
-Address: 2ffff8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 47566924
-Index: 6
-Address: 354fb8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 114637756
-Index: 12
-Address: 313c60
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121316204
-Index: 31
-Address: 313a68
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61363639
-Index: 12
-Address: 2ad6a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 116208699
-Index: 3
-Address: 274094
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 113750737
-Index: 0
-Address: 292d54
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 12853672
-Index: 0
-Address: 222e74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108046357
-Index: 12
-Address: 4ab0b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 111569299
-Index: 47
-Address: 34e80c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 20108653
-Index: 15
-Address: 2f9f94
-Native_address: bcea4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 45252965
-Index: 15
-Address: 313c0c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 12437425
-Index: 9
-Address: 4ab3e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 30942993
-Index: 22
-Address: 34f6ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 93430337
-Index: 3
-Address: 33b100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 6604883
-Index: 2
-Address: 33b16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 36867745
-Index: 5
-Address: 255e28
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 90563105
-Index: 1
-Address: 285708
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 18519297
-Index: 7
-Address: 26ddfc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8058975
-Index: 16
-Address: 4a36b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 30694569
-Index: 7
-Address: 27d018
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 76933943
-Index: 0
-Address: 2741b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 9033258
-Index: 6
-Address: 4a4690
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 74851752
-Index: 5
-Address: 4a4798
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 50855382
-Index: 4
-Address: 2659a8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39211582
-Index: 52
-Address: 34e504
-Native_address: bceec
-Refc: 1
-=fun
-Module: file_server
-Uniq: 77665472
-Index: 0
-Address: 2a0dec
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 57487277
-Index: 8
-Address: 2fa3c4
-Native_address: bce94
-Refc: 1
-=fun
-Module: webtool
-Uniq: 87386575
-Index: 11
-Address: 4ab1c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 58991950
-Index: 8
-Address: 4a4338
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 118859163
-Index: 17
-Address: 4a34d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 38265609
-Index: 12
-Address: 354dec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 56903339
-Index: 1
-Address: 2527c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 129504763
-Index: 0
-Address: 28aae8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 44817307
-Index: 10
-Address: 354e3c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 52856894
-Index: 41
-Address: 34eb70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22623360
-Index: 23
-Address: 34f5d4
-Native_address: bceec
-Refc: 1
-=fun
-Module: orddict
-Uniq: 34963136
-Index: 0
-Address: 2fbbbc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erlang
-Uniq: 24496633
-Index: 0
-Address: 213744
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 99313855
-Index: 27
-Address: 2f9914
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 99137703
-Index: 3
-Address: 4b5dfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 124043500
-Index: 3
-Address: 222b84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 102650878
-Index: 22
-Address: 313b48
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 13333720
-Index: 12
-Address: 34fb2c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 133457
-Index: 5
-Address: 292a80
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 64640983
-Index: 4
-Address: 29e944
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 7580218
-Index: 2
-Address: 255f08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 131850870
-Index: 59
-Address: 34e6b8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 56617403
-Index: 10
-Address: 284b40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108680306
-Index: 4
-Address: 4ab5e0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 90880071
-Index: 2
-Address: 26e150
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_io_server
-Uniq: 23980778
-Index: 0
-Address: 30ac30
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 12006418
-Index: 19
-Address: 2f9d54
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 81701030
-Index: 8
-Address: 526228
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 71013875
-Index: 1
-Address: 4a4ddc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: distel
-Uniq: 87740845
-Index: 2
-Address: 35c0e0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 90782401
-Index: 17
-Address: 2f9e8c
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 133882676
-Index: 6
-Address: 2e52ac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 105698088
-Index: 3
-Address: 2855b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 58370899
-Index: 0
-Address: 27d370
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 15274536
-Index: 25
-Address: 2f9a94
-Native_address: bcef4
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 94349557
-Index: 0
-Address: 252844
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 33328185
-Index: 1
-Address: 33b1d8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86971387
-Index: 16
-Address: 313db0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 53364473
-Index: 38
-Address: 34ee84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 128145687
-Index: 0
-Address: 4ab944
-Native_address: bcee4
-Refc: 1
-=fun
-Module: c
-Uniq: 98651404
-Index: 10
-Address: 2fff20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 78224618
-Index: 0
-Address: 313dcc
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 40779085
-Index: 11
-Address: 2e50c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 93517350
-Index: 4
-Address: 300090
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 58551291
-Index: 0
-Address: 234f14
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 10055518
-Index: 17
-Address: 526170
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 15795706
-Index: 19
-Address: 313bd4
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 31129467
-Index: 13
-Address: 313c44
-Native_address: bced4
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 115635393
-Index: 0
-Address: 2a1a4c
-Native_address: bcf04
-Refc: 2
-=fun
-Module: erl_eval
-Uniq: 65839696
-Index: 22
-Address: 2f9c00
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 69275064
-Index: 28
-Address: 313aa0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 55938066
-Index: 11
-Address: 354d6c
-Native_address: bceec
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 22323433
-Index: 3
-Address: 252688
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 129726129
-Index: 29
-Address: 313abc
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 84346832
-Index: 0
-Address: 3550fc
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 102096820
-Index: 7
-Address: 2e5290
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 70385762
-Index: 11
-Address: 27cf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_cgi
-Uniq: 1483038
-Index: 0
-Address: 4ec2e8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 3664813
-Index: 1
-Address: 3550b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 131143671
-Index: 6
-Address: 27d08c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 46286977
-Index: 2
-Address: 2740b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_esi
-Uniq: 49099432
-Index: 0
-Address: 4e522c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 95764905
-Index: 2
-Address: 24aaa8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: packages
-Uniq: 62890926
-Index: 0
-Address: 2ae814
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 41564771
-Index: 35
-Address: 3139f8
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 95490768
-Index: 0
-Address: 4a4dc0
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 121559432
-Index: 3
-Address: 313d78
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_conf
-Uniq: 21152662
-Index: 0
-Address: 4be5a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 41630916
-Index: 5
-Address: 29e914
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 19747201
-Index: 5
-Address: 313d24
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 100584837
-Index: 36
-Address: 34f0f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 64635712
-Index: 15
-Address: 34f94c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 46398361
-Index: 3
-Address: 29e9a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 86699817
-Index: 27
-Address: 313b2c
-Native_address: bced4
-Refc: 1
-=fun
-Module: distel
-Uniq: 40869731
-Index: 0
-Address: 35c12c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 83701641
-Index: 1
-Address: 27d33c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_auth
-Uniq: 85845790
-Index: 0
-Address: 4dfd84
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 101292714
-Index: 9
-Address: 2e519c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 134173702
-Index: 1
-Address: 265b68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 92433687
-Index: 6
-Address: 2ad9f4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 62315241
-Index: 8
-Address: 354f38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 11615541
-Index: 12
-Address: 265530
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 11160090
-Index: 2
-Address: 2b6bb4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 12116524
-Index: 15
-Address: 2342c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 61620901
-Index: 2
-Address: 4fc670
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 23665189
-Index: 12
-Address: 4a3b94
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 43844413
-Index: 0
-Address: 300100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 100514258
-Index: 6
-Address: 313d08
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 54271286
-Index: 17
-Address: 34f8a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 47017252
-Index: 3
-Address: 26dfa0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 1228304
-Index: 7
-Address: 4a45a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 127131470
-Index: 10
-Address: 2655a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: file_server
-Uniq: 22638227
-Index: 1
-Address: 2a0e20
-Native_address: bcf04
-Refc: 1
-=fun
-Module: code_server
-Uniq: 112704920
-Index: 15
-Address: 2ad488
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88302875
-Index: 2
-Address: 2fa76c
-Native_address: bceb4
-Refc: 1
-=fun
-Module: inet_hosts
-Uniq: 85808984
-Index: 1
-Address: 28ab18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_parse
-Uniq: 106391799
-Index: 0
-Address: 33b22c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25830519
-Index: 5
-Address: 27d0c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 110491036
-Index: 1
-Address: 2e5398
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 13128736
-Index: 5
-Address: 52627c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 84644982
-Index: 21
-Address: 313b9c
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 120577486
-Index: 3
-Address: 34fffc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 4504456
-Index: 44
-Address: 34e938
-Native_address: bceec
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 28754183
-Index: 0
-Address: 500140
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 88043334
-Index: 14
-Address: 313c28
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61592373
-Index: 0
-Address: 2adc28
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74468346
-Index: 26
-Address: 313ad8
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69896253
-Index: 21
-Address: 2f9c40
-Native_address: bce80
-Refc: 1
-=fun
-Module: global_group
-Uniq: 59656873
-Index: 4
-Address: 292ac0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 103891261
-Index: 2
-Address: 4a4d70
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 89619733
-Index: 0
-Address: 4b5e64
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 133201466
-Index: 10
-Address: 2e5180
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 32159369
-Index: 2
-Address: 4ab820
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 76861396
-Index: 2
-Address: 2adbb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 48206487
-Index: 0
-Address: 4fc6f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 118996551
-Index: 28
-Address: 34f384
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 12593774
-Index: 50
-Address: 34e60c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 48542841
-Index: 1
-Address: 50e88c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56178490
-Index: 9
-Address: 4a420c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 88212576
-Index: 4
-Address: 35bf44
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 79562132
-Index: 29
-Address: 34f368
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 129524917
-Index: 32
-Address: 34f2c0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54029891
-Index: 23
-Address: 2f9af0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 108872092
-Index: 4
-Address: 27d0f0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 40905124
-Index: 6
-Address: 234ac0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 50124876
-Index: 10
-Address: 2ad760
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 791358
-Index: 48
-Address: 34e7b0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 18404828
-Index: 24
-Address: 313af4
-Native_address: bced4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 13278653
-Index: 1
-Address: 4b5e48
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 110307423
-Index: 13
-Address: 284a7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 99592247
-Index: 0
-Address: 256118
-Native_address: bcf04
-Refc: 1
-=fun
-Module: global
-Uniq: 99918211
-Index: 2
-Address: 265af4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 71442319
-Index: 27
-Address: 34f510
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 7612785
-Index: 13
-Address: 2fa0fc
-Native_address: bce80
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 56095795
-Index: 15
-Address: 4a38a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 23626796
-Index: 25
-Address: 313b10
-Native_address: bced4
-Refc: 1
-=fun
-Module: file_server
-Uniq: 126074974
-Index: 2
-Address: 2a0cac
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_config
-Uniq: 104278122
-Index: 1
-Address: 274154
-Native_address: bcefc
-Refc: 1
-=fun
-Module: sys
-Uniq: 90854051
-Index: 0
-Address: 240344
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 113334594
-Index: 2
-Address: 313d5c
-Native_address: bced4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 8832142
-Index: 7
-Address: 284e30
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9159706
-Index: 42
-Address: 34eb54
-Native_address: bceec
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 123946665
-Index: 8
-Address: 26e494
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3149789
-Index: 1
-Address: 5262d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 48288621
-Index: 11
-Address: 2ffed8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 8953292
-Index: 20
-Address: 4a4d54
-Native_address: bcee4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 9632158
-Index: 4
-Address: 34ff88
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 31111567
-Index: 7
-Address: 29e8c8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 85307443
-Index: 10
-Address: 2fa29c
-Native_address: bcec4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 104417191
-Index: 7
-Address: 313cd0
-Native_address: bced4
-Refc: 1
-=fun
-Module: dict
-Uniq: 43625777
-Index: 5
-Address: 354fec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 92698798
-Index: 3
-Address: 4ab780
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 39074546
-Index: 6
-Address: 2fa54c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 71451126
-Index: 5
-Address: 234b98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 122084387
-Index: 6
-Address: 300038
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 9625924
-Index: 14
-Address: 284a60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 128777368
-Index: 11
-Address: 313c7c
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 10203723
-Index: 7
-Address: 4ab4f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 35032400
-Index: 10
-Address: 313c98
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 17252586
-Index: 34
-Address: 313a14
-Native_address: bced4
-Refc: 1
-=fun
-Module: code_server
-Uniq: 7177165
-Index: 11
-Address: 2ad734
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 115778175
-Index: 3
-Address: 4a4930
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 96440880
-Index: 51
-Address: 34e590
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 68275407
-Index: 0
-Address: 2b7340
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 88854488
-Index: 16
-Address: 2f9f04
-Native_address: bcebc
-Refc: 1
-=fun
-Module: global
-Uniq: 26353848
-Index: 13
-Address: 2654e8
-Native_address: bcf04
-Refc: 3
-=fun
-Module: global
-Uniq: 93414722
-Index: 11
-Address: 265568
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 11194189
-Index: 60
-Address: 34fe0c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: c
-Uniq: 125189992
-Index: 8
-Address: 2fffdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 112472016
-Index: 2
-Address: 355088
-Native_address: bceec
-Refc: 1
-=fun
-Module: shell
-Uniq: 104426442
-Index: 5
-Address: 2e52e0
-Native_address: bceec
-Refc: 1
-=fun
-Module: global
-Uniq: 17426458
-Index: 0
-Address: 265bc4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 81191039
-Index: 5
-Address: 2ada48
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 71765042
-Index: 5
-Address: 284f74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 85855821
-Index: 2
-Address: 1fa298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 70586122
-Index: 10
-Address: 4a3fe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 87067911
-Index: 49
-Address: 34e708
-Native_address: bcef4
-Refc: 1
-=fun
-Module: distel
-Uniq: 63126735
-Index: 1
-Address: 35c0fc
-Native_address: bcf04
-Refc: 1
-=fun
-Module: c
-Uniq: 58270309
-Index: 1
-Address: 3000e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: ets
-Uniq: 80538457
-Index: 1
-Address: 2bc1a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 69827241
-Index: 9
-Address: 34fd70
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 103968752
-Index: 3
-Address: 355054
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 117175573
-Index: 21
-Address: 34f728
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 57865450
-Index: 2
-Address: 2e537c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 14705965
-Index: 20
-Address: 313b80
-Native_address: bced4
-Refc: 1
-=fun
-Module: webtool
-Uniq: 85360931
-Index: 6
-Address: 4ab56c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: kernel_config
-Uniq: 41755598
-Index: 0
-Address: 2d9e20
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 7110547
-Index: 37
-Address: 34ef14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 28091577
-Index: 16
-Address: 234244
-Native_address: bcef4
-Refc: 2
-=fun
-Module: code_server
-Uniq: 96448152
-Index: 14
-Address: 2ad4e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 40177568
-Index: 13
-Address: 4a39a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 31948320
-Index: 58
-Address: 34dfdc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global
-Uniq: 54153760
-Index: 7
-Address: 265854
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 60156260
-Index: 3
-Address: 5262b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 1010616
-Index: 2
-Address: 350064
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 96784459
-Index: 1
-Address: 1fa2b4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 48691771
-Index: 18
-Address: 313bb8
-Native_address: bced4
-Refc: 1
-=fun
-Module: global
-Uniq: 26895060
-Index: 9
-Address: 265710
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 109625093
-Index: 7
-Address: 2ad8fc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 59436171
-Index: 1
-Address: 3500dc
-Native_address: bcef4
-Refc: 1
-=fun
-Module: dict
-Uniq: 92768306
-Index: 9
-Address: 354f04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global_group
-Uniq: 106430008
-Index: 3
-Address: 292b38
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 79749196
-Index: 6
-Address: 1fa01c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 6014929
-Index: 9
-Address: 2fa324
-Native_address: bceac
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 57051922
-Index: 7
-Address: 234a28
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 77043468
-Index: 6
-Address: 29e8e4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 36176045
-Index: 9
-Address: 52620c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: rpc
-Uniq: 35862809
-Index: 3
-Address: 255edc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113649451
-Index: 4
-Address: 2850a0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 67943969
-Index: 5
-Address: 2658f4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 109003032
-Index: 16
-Address: 5260d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 104711447
-Index: 13
-Address: 525f5c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 107666872
-Index: 9
-Address: 27cfb0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 89410000
-Index: 10
-Address: 5261f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 47356870
-Index: 11
-Address: 284ab4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17873449
-Index: 56
-Address: 34e1e8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 8839441
-Index: 33
-Address: 34f25c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 82513204
-Index: 2
-Address: 222c18
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_master
-Uniq: 5973059
-Index: 0
-Address: 24ab7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 127832132
-Index: 0
-Address: 4b065c
-Native_address: bcefc
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 39322658
-Index: 14
-Address: 525f40
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_server
-Uniq: 100284021
-Index: 0
-Address: 23d288
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 17430070
-Index: 12
-Address: 284a98
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 97509773
-Index: 3
-Address: 1fa27c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: distel
-Uniq: 32364818
-Index: 3
-Address: 35c050
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 58576084
-Index: 32
-Address: 313a4c
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 38384851
-Index: 14
-Address: 4a3988
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 14139883
-Index: 4
-Address: 234d78
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 122590256
-Index: 0
-Address: 2fa8b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 14705629
-Index: 11
-Address: 2fa22c
-Native_address: bcedc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 9273769
-Index: 4
-Address: 2fa684
-Native_address: bcee4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 87950142
-Index: 11
-Address: 5261d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_log
-Uniq: 54913678
-Index: 1
-Address: 4fc6b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 28370334
-Index: 0
-Address: 26e4b0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 24927227
-Index: 40
-Address: 34ed4c
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 105437500
-Index: 33
-Address: 313a30
-Native_address: bced4
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 10921695
-Index: 1
-Address: 234eac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 112431564
-Index: 55
-Address: 34e22c
-Native_address: bceec
-Refc: 1
-=fun
-Module: webtool
-Uniq: 129460863
-Index: 5
-Address: 4ab5c4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 89001648
-Index: 3
-Address: 27d2ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 36199507
-Index: 8
-Address: 27cfe4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 35620771
-Index: 2
-Address: 5262ec
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 83214871
-Index: 18
-Address: 2f9e34
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 122455383
-Index: 1
-Address: 2adc0c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 22389488
-Index: 31
-Address: 34f1b8
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 41869059
-Index: 12
-Address: 2fa1d4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 18130505
-Index: 45
-Address: 34e904
-Native_address: bcefc
-Refc: 1
-=fun
-Module: hipe_unified_loader
-Uniq: 107414126
-Index: 1
-Address: 2b706c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 116638945
-Index: 28
-Address: 2f98f8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 48465762
-Index: 9
-Address: 2348c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_request_handler
-Uniq: 87633852
-Index: 0
-Address: 50e97c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 28213098
-Index: 8
-Address: 4ab42c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 123630574
-Index: 4
-Address: 222b58
-Native_address: bcefc
-Refc: 1
-=fun
-Module: dict
-Uniq: 127425508
-Index: 13
-Address: 354eb4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 95048118
-Index: 16
-Address: 2ad46c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 108661978
-Index: 19
-Address: 34f75c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 21272619
-Index: 13
-Address: 34fad8
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29943747
-Index: 17
-Address: 313bf0
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 120240397
-Index: 4
-Address: 313d94
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 124060676
-Index: 0
-Address: 350124
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 100975346
-Index: 6
-Address: 526260
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 61421476
-Index: 4
-Address: 2ada9c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45197232
-Index: 7
-Address: 34fe5c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 3151900
-Index: 15
-Address: 525f24
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 77509245
-Index: 2
-Address: 4b5e2c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 94110229
-Index: 8
-Address: 2ad7e4
-Native_address: bcef4
-Refc: 3
-=fun
-Module: rpc
-Uniq: 101217130
-Index: 1
-Address: 2560c4
-Native_address: bcf04
-Refc: 1
-=fun
-Module: lists
-Uniq: 103647452
-Index: 0
-Address: 244b7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 37841211
-Index: 9
-Address: 2ad77c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 40109251
-Index: 54
-Address: 34e2b4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: init
-Uniq: 98012300
-Index: 0
-Address: 1fa2d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 73604759
-Index: 10
-Address: 4ab270
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 12042434
-Index: 1
-Address: 313d40
-Native_address: bced4
-Refc: 1
-=fun
-Module: shell
-Uniq: 127137775
-Index: 4
-Address: 2e531c
-Native_address: bcf04
-Refc: 1
-=fun
-Module: inet
-Uniq: 45498037
-Index: 12
-Address: 27cec0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 122441107
-Index: 34
-Address: 34f1d4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70933889
-Index: 46
-Address: 34e8d0
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet
-Uniq: 69850797
-Index: 2
-Address: 27d308
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 103965539
-Index: 13
-Address: 234684
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 29979659
-Index: 30
-Address: 313a84
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 17148721
-Index: 20
-Address: 34f778
-Native_address: bcefc
-Refc: 1
-=fun
-Module: httpd_response
-Uniq: 100673049
-Index: 0
-Address: 5165dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_gethost_native
-Uniq: 10508176
-Index: 1
-Address: 4b04dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32476064
-Index: 57
-Address: 34e1c4
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 74835078
-Index: 9
-Address: 313cec
-Native_address: bced4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 60689814
-Index: 19
-Address: 4a3b78
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 39269715
-Index: 5
-Address: 34ff14
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 112923172
-Index: 0
-Address: 2e5404
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43010824
-Index: 14
-Address: 2fa03c
-Native_address: bce8c
-Refc: 1
-=fun
-Module: global
-Uniq: 82495254
-Index: 3
-Address: 265ac8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: shell
-Uniq: 48568081
-Index: 8
-Address: 2e5220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 77236637
-Index: 7
-Address: 1fa000
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 109386574
-Index: 1
-Address: 2fa804
-Native_address: bce9c
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 42613220
-Index: 14
-Address: 34f980
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 67093144
-Index: 23
-Address: 313b64
-Native_address: bced4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 86833790
-Index: 11
-Address: 34fbe8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 6344855
-Index: 1
-Address: 29eabc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 5149749
-Index: 35
-Address: 34f220
-Native_address: bcefc
-Refc: 1
-=fun
-Module: init
-Uniq: 93451769
-Index: 5
-Address: 1fa120
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 117428568
-Index: 11
-Address: 234758
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 15225890
-Index: 4
-Address: 526298
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 120760477
-Index: 2
-Address: 234cdc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 88561919
-Index: 3
-Address: 3000ac
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_scan
-Uniq: 108931174
-Index: 8
-Address: 313cb4
-Native_address: bced4
-Refc: 1
-=fun
-Module: rpc
-Uniq: 122901192
-Index: 4
-Address: 255e44
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32985930
-Index: 10
-Address: 34fc40
-Native_address: bcef4
-Refc: 1
-=fun
-Module: global_group
-Uniq: 97968498
-Index: 1
-Address: 292b7c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 45671671
-Index: 18
-Address: 4a32d0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 117968056
-Index: 3
-Address: 2fa6ec
-Native_address: bcecc
-Refc: 1
-=fun
-Module: init
-Uniq: 108717591
-Index: 4
-Address: 1fa194
-Native_address: bcf04
-Refc: 1
-=fun
-Module: supervisor
-Uniq: 15091954
-Index: 2
-Address: 2526dc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 65707495
-Index: 6
-Address: 2658a4
-Native_address: bcefc
-Refc: 1
-=fun
-Module: code_server
-Uniq: 34473969
-Index: 17
-Address: 2ad450
-Native_address: bcef4
-Refc: 2
-=fun
-Module: crashdump_viewer_html
-Uniq: 124296602
-Index: 7
-Address: 526244
-Native_address: bcefc
-Refc: 1
-=fun
-Module: global
-Uniq: 23074707
-Index: 15
-Address: 265460
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet
-Uniq: 25972856
-Index: 10
-Address: 27cf74
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 43110452
-Index: 24
-Address: 2f9ad4
-Native_address: bceec
-Refc: 1
-=fun
-Module: code_server
-Uniq: 106445918
-Index: 13
-Address: 2ad660
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer_html
-Uniq: 116071286
-Index: 12
-Address: 5261b8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 130814477
-Index: 8
-Address: 284cfc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 121017037
-Index: 39
-Address: 34ed80
-Native_address: bcef4
-Refc: 1
-=fun
-Module: ets
-Uniq: 104895267
-Index: 0
-Address: 2bc1bc
-Native_address: bcefc
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 104682437
-Index: 11
-Address: 4a3de0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 70248777
-Index: 30
-Address: 34f30c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 13274975
-Index: 5
-Address: 300074
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 98442771
-Index: 53
-Address: 34e2d0
-Native_address: bceec
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 69829006
-Index: 7
-Address: 2fa47c
-Native_address: bce80
-Refc: 1
-=fun
-Module: old_file_server
-Uniq: 36444943
-Index: 1
-Address: 2a1a80
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 58719455
-Index: 26
-Address: 34f5f0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: timer
-Uniq: 42505885
-Index: 0
-Address: 4cd62c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54682479
-Index: 20
-Address: 2f9d08
-Native_address: bcf04
-Refc: 1
-=fun
-Module: gen_event
-Uniq: 86070332
-Index: 1
-Address: 222d7c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 54728136
-Index: 9
-Address: 2fff68
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 16474219
-Index: 3
-Address: 234c60
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 108831556
-Index: 10
-Address: 234810
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 72053761
-Index: 16
-Address: 34f8ec
-Native_address: bcef4
-Refc: 1
-=fun
-Module: net_kernel
-Uniq: 65127616
-Index: 2
-Address: 29ea04
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 126167637
-Index: 14
-Address: 234640
-Native_address: bcef4
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 113704917
-Index: 0
-Address: 285788
-Native_address: bcefc
-Refc: 1
-=fun
-Module: mod_disk_log
-Uniq: 75279647
-Index: 1
-Address: 500100
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 119218247
-Index: 5
-Address: 26df68
-Native_address: bcef4
-Refc: 1
-=fun
-Module: httpd_util
-Uniq: 85690044
-Index: 4
-Address: 4b5d6c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_db
-Uniq: 53075592
-Index: 1
-Address: 26e16c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: c
-Uniq: 39490182
-Index: 2
-Address: 3000c8
-Native_address: bcefc
-Refc: 1
-=fun
-Module: application_controller
-Uniq: 75189006
-Index: 12
-Address: 234714
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 14980808
-Index: 43
-Address: 34eb38
-Native_address: bceec
-Refc: 1
-=fun
-Module: crashdump_viewer
-Uniq: 16463468
-Index: 4
-Address: 4a4914
-Native_address: bcee4
-Refc: 1
-=fun
-Module: dict
-Uniq: 99965326
-Index: 4
-Address: 355020
-Native_address: bcefc
-Refc: 1
-=fun
-Module: inet_parse
-Uniq: 36900786
-Index: 6
-Address: 284f3c
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 45447147
-Index: 18
-Address: 34f794
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 32353825
-Index: 6
-Address: 34fe78
-Native_address: bcef4
-Refc: 1
-=fun
-Module: erl_lint
-Uniq: 134052338
-Index: 8
-Address: 34fdc0
-Native_address: bceec
-Refc: 1
-=fun
-Module: application_master
-Uniq: 23840924
-Index: 1
-Address: 24aae0
-Native_address: bcefc
-Refc: 1
-=fun
-Module: webtool
-Uniq: 108282500
-Index: 1
-Address: 4ab918
-Native_address: bcefc
-Refc: 1
-=fun
-Module: erl_prim_loader
-Uniq: 31081110
-Index: 0
-Address: 210c68
-Native_address: bcf04
-Refc: 1
-=fun
-Module: erl_eval
-Uniq: 54275742
-Index: 26
-Address: 2f9a4c
-Native_address: bcef4
-Refc: 1
-=fun
-Module: shell
-Uniq: 45083091
-Index: 3
-Address: 2e5350
-Native_address: bcf04
-Refc: 3
-=proc_stack:<0.0.0>
-3a48bc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H371264
-=proc_heap:<0.0.0>
-371264:t9:A5:state,H3710D8,N,N,H3710F4,P<0.1.0>,H37128C,H3710FC,N
-3710FC:t2:H371138,H371140
-371140:lI80|H371194
-371194:lI49|H3711E0
-3711E0:lI48|H371204
-371204:lI66|N
-371138:lI79|H37118C
-37118C:lI84|H3711D8
-3711D8:lI80|H3711FC
-3711FC:lI32|H37120C
-37120C:lI32|H371214
-371214:lI65|H37121C
-37121C:lI80|H371224
-371224:lI78|H37122C
-37122C:lI32|H371234
-371234:lI49|H37123C
-37123C:lI56|H371244
-371244:lI49|H37124C
-37124C:lI32|H371254
-371254:lI48|H37125C
-37125C:lI49|N
-37128C:t2:A7:started,A7:started
-3710F4:lH371124|H371130
-371124:t2:A16:application_controller,P<0.5.0>
-371130:lH371178|H371184
-371178:t2:AC:error_logger,P<0.4.0>
-371184:lH3711CC|N
-3711CC:t2:AF:erl_prim_loader,P<0.2.0>
-3710D8:lH3710E0|H3710EC
-3710E0:t2:A5:-root,H371108
-371108:lH371148|N
-371148:Yh13:2F636C656172636173652F6F74702F65727473
-3710EC:lH371110|H37111C
-371110:t2:A9:-progname,H371164
-371164:lH37119C|N
-37119C:Yh1D:2F636C656172636173652F6F74702F657274732F62696E2F6365726C20
-37111C:lH37116C|N
-37116C:t2:A5:-home,H3711C4
-3711C4:lH3711E8|N
-3711E8:YhA:2F686F6D652F73697269
-=proc_stack:<0.2.0>
-38eca8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H367D20
-y1:P<0.1.0>
-y2:H367D28
-y3:A8:infinity
-=proc_heap:<0.2.0>
-367D20:lH367D48|H367D50
-367D48:lI47|H367D58
-367D58:lI99|H367D68
-367D68:lI108|H367D78
-367D78:lI101|H367D88
-367D88:lI97|H367D98
-367D98:lI114|H367DA8
-367DA8:lI99|H367DB8
-367DB8:lI97|H367DC8
-367DC8:lI115|H367DD8
-367DD8:lI101|H367DE8
-367DE8:lI47|H367DF8
-367DF8:lI111|H367E08
-367E08:lI116|H367E18
-367E18:lI112|H367E28
-367E28:lI47|H367E38
-367E38:lI101|H367E48
-367E48:lI114|H367E58
-367E58:lI116|H367E68
-367E68:lI115|H367E78
-367E78:lI47|H367E88
-367E88:lI108|H367E98
-367E98:lI105|H367EA8
-367EA8:lI98|H367EB8
-367EB8:lI47|H367EC8
-367EC8:lI107|H367ED8
-367ED8:lI101|H367EE8
-367EE8:lI114|H367EF8
-367EF8:lI110|H367F08
-367F08:lI101|H367F18
-367F18:lI108|H367F28
-367F28:lI47|H367F38
-367F38:lI101|H367F48
-367F48:lI98|H367F58
-367F58:lI105|H367F68
-367F68:lI110|N
-367D50:lH367D60|N
-367D60:lI47|H367D70
-367D70:lI99|H367D80
-367D80:lI108|H367D90
-367D90:lI101|H367DA0
-367DA0:lI97|H367DB0
-367DB0:lI114|H367DC0
-367DC0:lI99|H367DD0
-367DD0:lI97|H367DE0
-367DE0:lI115|H367DF0
-367DF0:lI101|H367E00
-367E00:lI47|H367E10
-367E10:lI111|H367E20
-367E20:lI116|H367E30
-367E30:lI112|H367E40
-367E40:lI47|H367E50
-367E50:lI101|H367E60
-367E60:lI114|H367E70
-367E70:lI116|H367E80
-367E80:lI115|H367E90
-367E90:lI47|H367EA0
-367EA0:lI108|H367EB0
-367EB0:lI105|H367EC0
-367EC0:lI98|H367ED0
-367ED0:lI47|H367EE0
-367EE0:lI115|H367EF0
-367EF0:lI116|H367F00
-367F00:lI100|H367F10
-367F10:lI108|H367F20
-367F20:lI105|H367F30
-367F30:lI98|H367F40
-367F40:lI47|H367F50
-367F50:lI101|H367F60
-367F60:lI98|H367F70
-367F70:lI105|H367F78
-367F78:lI110|N
-367D28:t7:A5:state,A5:efile,N,A4:none,p<0.2>,A8:infinity,A5:false
-=proc_dictionary:<0.4.0>
-H3AC588
-H3AC594
-=proc_stack:<0.4.0>
-3b2f14:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:H3B21E8
-y2:AC:error_logger
-y3:P<0.1.0>
-3b2f28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3AC5A8
-=proc_heap:<0.4.0>
-3B21E8:lH3B2144|H3B21E0
-3B2144:t5:A7:handler,AC:error_logger,A5:false,N,A5:false
-3B21E0:lH3B21BC|N
-3B21BC:t5:A7:handler,A12:error_logger_tty_h,A5:false,H3AC610,A5:false
-3AC610:t2:P<0.21.0>,AC:error_logger
-3AC5A8:lA9:gen_event|H3AC5E8
-3AC5E8:lP<0.1.0>|H3AC608
-3AC608:lP<0.1.0>|H3AC61C
-3AC61C:lH3AC624|H3AC630
-3AC624:t2:A5:local,AC:error_logger
-3AC630:lN|H3AC638
-3AC638:lN|H3AC640
-3AC640:lN|N
-3AC588:t2:AD:$initial_call,H3AC5B0
-3AC5B0:t3:A3:gen,A7:init_it,H3AC5A8
-3AC594:t2:AA:$ancestors,H3AC5C0
-3AC5C0:lP<0.1.0>|N
-=proc_dictionary:<0.5.0>
-H372E4C
-H372E58
-=proc_stack:<0.5.0>
-374704:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A16:application_controller
-y3:H3739F4
-y4:A16:application_controller
-y5:P<0.1.0>
-374720:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H372ED0
-=proc_heap:<0.5.0>
-3739F4:t9:A5:state,N,N,N,H373914,N,H373928,N,N
-373928:lH37391C|H372F54
-37391C:t2:A6:stdlib,A9:permanent
-372F54:lH372F90|N
-372F90:t2:A6:kernel,A9:permanent
-373914:lH373908|H372F4C
-373908:t2:A6:stdlib,A9:undefined
-372F4C:lH372F84|N
-372F84:t2:A6:kernel,P<0.7.0>
-372ED0:lAA:gen_server|H372F5C
-372F5C:lP<0.1.0>|H372F9C
-372F9C:lP<0.1.0>|H372FC4
-372FC4:lH372FEC|H372FF8
-372FEC:t2:A5:local,A16:application_controller
-372FF8:lA16:application_controller|H373018
-373018:lH373038|H373048
-373038:t3:AB:application,A6:kernel,H373060
-373060:lH373078|H373084
-373078:t2:AB:description,H37309C
-37309C:lI69|H3730C8
-3730C8:lI82|H3730FC
-3730FC:lI84|H373130
-373130:lI83|H37316C
-37316C:lI32|H3731A8
-3731A8:lI32|H3731E4
-3731E4:lI67|H373220
-373220:lI88|H37325C
-37325C:lI67|H37329C
-37329C:lI32|H3732D0
-3732D0:lI49|H3732FC
-3732FC:lI51|H373328
-373328:lI56|H373348
-373348:lI32|H373368
-373368:lI49|H373388
-373388:lI48|N
-373084:lH3730A4|H3730B0
-3730A4:t2:A3:vsn,H3730D0
-3730D0:lI50|H373104
-373104:lI46|H373138
-373138:lI57|N
-3730B0:lH3730D8|H3730E4
-3730D8:t2:A2:id,N
-3730E4:lH37310C|H373118
-37310C:t2:A7:modules,H373140
-373140:lAB:application|H373174
-373174:lA16:application_controller|H3731B0
-3731B0:lA12:application_master|H3731EC
-3731EC:lA13:application_starter|H373228
-373228:lA4:auth|H373264
-373264:lA4:code|H3732A4
-3732A4:lA8:code_aux|H3732D8
-3732D8:lA8:packages|H373304
-373304:lAB:code_server|H373330
-373330:lA9:dist_util|H373350
-373350:lAF:erl_boot_server|H373370
-373370:lA10:erl_distribution|H373390
-373390:lAF:erl_prim_loader|H3733A8
-3733A8:lA9:erl_reply|H3733C0
-3733C0:lA6:erlang|H3733D8
-3733D8:lAD:error_handler|H3733F0
-3733F0:lAC:error_logger|H373408
-373408:lA4:file|H373420
-373420:lAB:file_server|H373438
-373438:lAF:old_file_server|H373450
-373450:lAE:file_io_server|H373468
-373468:lA9:prim_file|H373480
-373480:lA6:global|H373498
-373498:lAC:global_group|H3734B0
-3734B0:lAD:global_search|H3734C8
-3734C8:lA5:group|H3734E0
-3734E0:lA5:heart|H3734F8
-3734F8:lA13:hipe_unified_loader|H373510
-373510:lA11:hipe_sparc_loader|H373520
-373520:lAF:hipe_x86_loader|H373530
-373530:lA9:inet6_tcp|H373540
-373540:lAE:inet6_tcp_dist|H373550
-373550:lA9:inet6_udp|H373560
-373560:lAB:inet_config|H373570
-373570:lAA:inet_hosts|H373580
-373580:lA13:inet_gethost_native|H373590
-373590:lAD:inet_tcp_dist|H3735A0
-3735A0:lA4:init|H3735B0
-3735B0:lA6:kernel|H3735C0
-3735C0:lAD:kernel_config|H3735D0
-3735D0:lA3:net|H3735E0
-3735E0:lA7:net_adm|H3735F0
-3735F0:lAA:net_kernel|H373600
-373600:lA2:os|H373610
-373610:lA8:ram_file|H373620
-373620:lA3:rpc|H373630
-373630:lA4:user|H373640
-373640:lA8:user_drv|H373650
-373650:lA8:user_sup|H373660
-373660:lA8:disk_log|H373670
-373670:lAA:disk_log_1|H373680
-373680:lAF:disk_log_server|H373690
-373690:lAC:disk_log_sup|H3736A0
-3736A0:lA7:dist_ac|H3736B0
-3736B0:lA8:erl_ddll|H3736C0
-3736C0:lA8:erl_epmd|H3736D0
-3736D0:lAA:erts_debug|H3736E0
-3736E0:lA7:gen_tcp|H3736F0
-3736F0:lA7:gen_udp|H373700
-373700:lA9:prim_inet|H373708
-373708:lA4:inet|H373710
-373710:lA7:inet_db|H373718
-373718:lA8:inet_dns|H373720
-373720:lAA:inet_parse|H373728
-373728:lA8:inet_res|H373730
-373730:lA8:inet_tcp|H373738
-373738:lA8:inet_udp|H373740
-373740:lA3:pg2|H373748
-373748:lA9:seq_trace|H373750
-373750:lA6:socks5|H373758
-373758:lAB:socks5_auth|H373760
-373760:lAA:socks5_tcp|H373768
-373768:lAA:socks5_udp|H373770
-373770:lAF:wrap_log_reader|H373778
-373778:lA4:zlib|H373780
-373780:lA9:otp_ring0|N
-373118:lH373148|H373154
-373148:t2:AA:registered,H37317C
-37317C:lA16:application_controller|H3731B8
-3731B8:lA9:erl_reply|H3731F4
-3731F4:lA4:auth|H373230
-373230:lAB:boot_server|H37326C
-37326C:lAB:code_server|H3732AC
-3732AC:lAF:disk_log_server|H3732E0
-3732E0:lAC:disk_log_sup|H37330C
-37330C:lAF:erl_prim_loader|H373338
-373338:lAC:error_logger|H373358
-373358:lAB:file_server|H373378
-373378:lAD:file_server_2|H373398
-373398:lAF:fixtable_server|H3733B0
-3733B0:lAC:global_group|H3733C8
-3733C8:lA12:global_name_server|H3733E0
-3733E0:lA5:heart|H3733F8
-3733F8:lA4:init|H373410
-373410:lAD:kernel_config|H373428
-373428:lAA:kernel_sup|H373440
-373440:lAA:net_kernel|H373458
-373458:lA7:net_sup|H373470
-373470:lA3:rex|H373488
-373488:lA4:user|H3734A0
-3734A0:lA9:os_server|H3734B8
-3734B8:lAB:ddll_server|H3734D0
-3734D0:lA8:erl_epmd|H3734E8
-3734E8:lA7:inet_db|H373500
-373500:lA3:pg2|N
-373154:lH373184|H373190
-373184:t2:AC:applications,N
-373190:lH3731C0|H3731CC
-3731C0:t2:A15:included_applications,N
-3731CC:lH3731FC|H373208
-3731FC:t2:A3:env,H373238
-373238:lH373274|N
-373274:t2:AC:error_logger,A3:tty
-373208:lH373240|H37324C
-373240:t2:AC:start_phases,A9:undefined
-37324C:lH373280|H37328C
-373280:t2:A4:maxT,A8:infinity
-37328C:lH3732B4|H3732C0
-3732B4:t2:A4:maxP,A8:infinity
-3732C0:lH3732E8|N
-3732E8:t2:A3:mod,H373314
-373314:t2:A6:kernel,N
-373048:lN|N
-372E4C:t2:AD:$initial_call,H372EE4
-372EE4:t3:A3:gen,A7:init_it,H372ED0
-372E58:t2:AA:$ancestors,H372EF4
-372EF4:lP<0.1.0>|N
-=proc_dictionary:<0.7.0>
-H369B78
-H369B5C
-=proc_stack:<0.7.0>
-369d64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:H369C2C
-y1:P<0.5.0>
-369d70:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A12:application_master
-y2:A4:init
-y3:H369B2C
-=proc_heap:<0.7.0>
-369C2C:t6:A5:state,P<0.8.0>,H3697B0,N,I0,P<0.0.0>
-3697B0:t9:A9:appl_data,A6:kernel,H369B14,A9:undefined,H3697D8,H369A3C,N,A8:infinity,A8:infinity
-369A3C:lAB:application|H369A34
-369A34:lA16:application_controller|H369A2C
-369A2C:lA12:application_master|H369A24
-369A24:lA13:application_starter|H369A1C
-369A1C:lA4:auth|H369A14
-369A14:lA4:code|H369A0C
-369A0C:lA8:code_aux|H369A04
-369A04:lA8:packages|H3699FC
-3699FC:lAB:code_server|H3699F4
-3699F4:lA9:dist_util|H3699EC
-3699EC:lAF:erl_boot_server|H3699E4
-3699E4:lA10:erl_distribution|H3699DC
-3699DC:lAF:erl_prim_loader|H3699D4
-3699D4:lA9:erl_reply|H3699CC
-3699CC:lA6:erlang|H3699C4
-3699C4:lAD:error_handler|H3699BC
-3699BC:lAC:error_logger|H3699B4
-3699B4:lA4:file|H3699AC
-3699AC:lAB:file_server|H3699A4
-3699A4:lAF:old_file_server|H36999C
-36999C:lAE:file_io_server|H369994
-369994:lA9:prim_file|H36998C
-36998C:lA6:global|H369984
-369984:lAC:global_group|H36997C
-36997C:lAD:global_search|H369974
-369974:lA5:group|H36996C
-36996C:lA5:heart|H369964
-369964:lA13:hipe_unified_loader|H36995C
-36995C:lA11:hipe_sparc_loader|H369954
-369954:lAF:hipe_x86_loader|H36994C
-36994C:lA9:inet6_tcp|H369944
-369944:lAE:inet6_tcp_dist|H36993C
-36993C:lA9:inet6_udp|H369934
-369934:lAB:inet_config|H36992C
-36992C:lAA:inet_hosts|H369924
-369924:lA13:inet_gethost_native|H36991C
-36991C:lAD:inet_tcp_dist|H369914
-369914:lA4:init|H36990C
-36990C:lA6:kernel|H369904
-369904:lAD:kernel_config|H3698FC
-3698FC:lA3:net|H3698F4
-3698F4:lA7:net_adm|H3698EC
-3698EC:lAA:net_kernel|H3698E4
-3698E4:lA2:os|H3698DC
-3698DC:lA8:ram_file|H3698D4
-3698D4:lA3:rpc|H3698CC
-3698CC:lA4:user|H3698C4
-3698C4:lA8:user_drv|H3698BC
-3698BC:lA8:user_sup|H3698B4
-3698B4:lA8:disk_log|H3698AC
-3698AC:lAA:disk_log_1|H3698A4
-3698A4:lAF:disk_log_server|H36989C
-36989C:lAC:disk_log_sup|H369894
-369894:lA7:dist_ac|H36988C
-36988C:lA8:erl_ddll|H369884
-369884:lA8:erl_epmd|H36987C
-36987C:lAA:erts_debug|H369874
-369874:lA7:gen_tcp|H36986C
-36986C:lA7:gen_udp|H369864
-369864:lA9:prim_inet|H36985C
-36985C:lA4:inet|H369854
-369854:lA7:inet_db|H36984C
-36984C:lA8:inet_dns|H369844
-369844:lAA:inet_parse|H36983C
-36983C:lA8:inet_res|H369834
-369834:lA8:inet_tcp|H36982C
-36982C:lA8:inet_udp|H369824
-369824:lA3:pg2|H36981C
-36981C:lA9:seq_trace|H369814
-369814:lA6:socks5|H36980C
-36980C:lAB:socks5_auth|H369804
-369804:lAA:socks5_tcp|H3697FC
-3697FC:lAA:socks5_udp|H3697F4
-3697F4:lAF:wrap_log_reader|H3697EC
-3697EC:lA4:zlib|H3697E4
-3697E4:lA9:otp_ring0|N
-3697D8:t2:A6:kernel,N
-369B14:lA16:application_controller|H369B0C
-369B0C:lA9:erl_reply|H369B04
-369B04:lA4:auth|H369AFC
-369AFC:lAB:boot_server|H369AF4
-369AF4:lAB:code_server|H369AEC
-369AEC:lAF:disk_log_server|H369AE4
-369AE4:lAC:disk_log_sup|H369ADC
-369ADC:lAF:erl_prim_loader|H369AD4
-369AD4:lAC:error_logger|H369ACC
-369ACC:lAB:file_server|H369AC4
-369AC4:lAD:file_server_2|H369ABC
-369ABC:lAF:fixtable_server|H369AB4
-369AB4:lAC:global_group|H369AAC
-369AAC:lA12:global_name_server|H369AA4
-369AA4:lA5:heart|H369A9C
-369A9C:lA4:init|H369A94
-369A94:lAD:kernel_config|H369A8C
-369A8C:lAA:kernel_sup|H369A84
-369A84:lAA:net_kernel|H369A7C
-369A7C:lA7:net_sup|H369A74
-369A74:lA3:rex|H369A6C
-369A6C:lA4:user|H369A64
-369A64:lA9:os_server|H369A5C
-369A5C:lAB:ddll_server|H369A54
-369A54:lA8:erl_epmd|H369A4C
-369A4C:lA7:inet_db|H369A44
-369A44:lA3:pg2|N
-369B2C:lP<0.5.0>|H369B24
-369B24:lP<0.6.0>|H3697A8
-3697A8:lH3697B0|H369B1C
-369B1C:lA6:normal|N
-369B78:t2:AD:$initial_call,H369B68
-369B68:t3:A12:application_master,A4:init,H369B2C
-369B5C:t2:AA:$ancestors,H369B54
-369B54:lP<0.6.0>|N
-=proc_stack:<0.8.0>
-384ec0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H384BDC
-y1:A6:kernel
-y2:P<0.9.0>
-y3:P<0.7.0>
-=proc_heap:<0.8.0>
-384BDC:t2:A5:state,A3:tty
-=proc_dictionary:<0.9.0>
-H376850
-H37685C
-=proc_stack:<0.9.0>
-36bde8:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36B8E8
-y4:AA:kernel_sup
-y5:P<0.8.0>
-36be04:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3768D4
-=proc_heap:<0.9.0>
-36B8E8:tA:A5:state,H376868,AB:one_for_all,H36B8D4,N,I0,I1,N,A6:kernel,N
-36B8D4:lH36B8B0|H36B6E8
-36B8B0:t8:A5:child,P<0.24.0>,AF:kernel_safe_sup,H376BF0,A9:permanent,A8:infinity,AA:supervisor,H376C00
-376C00:lA6:kernel|N
-376BF0:t3:AA:supervisor,AA:start_link,H376C08
-376C08:lH376C10|H376C1C
-376C10:t2:A5:local,AF:kernel_safe_sup
-376C1C:lA6:kernel|H376C24
-376C24:lA4:safe|N
-36B6E8:lH36B6C4|H36B490
-36B6C4:t8:A5:child,P<0.23.0>,AD:kernel_config,H376BB4,A9:permanent,I2000,A6:worker,H376BC4
-376BC4:lAD:kernel_config|N
-376BB4:t3:AD:kernel_config,AA:start_link,N
-36B490:lH36B498|H36B4BC
-36B498:t8:A5:child,P<0.19.0>,A4:user,H376B70,A9:temporary,I2000,AA:supervisor,H376B80
-376B80:lA8:user_sup|N
-376B70:t3:A8:user_sup,A5:start,N
-36B4BC:lH36B4C4|H376CB0
-36B4C4:t8:A5:child,P<0.18.0>,AB:code_server,H376B0C,A9:permanent,I2000,A6:worker,H376B1C
-376B1C:lA4:code|N
-376B0C:t3:A4:code,AA:start_link,N
-376CB0:lH376CB8|H376CDC
-376CB8:t8:A5:child,P<0.17.0>,AB:file_server,H376AB8,A9:permanent,I2000,A6:worker,H376AC8
-376AC8:lAF:old_file_server|N
-376AB8:t3:AF:old_file_server,AA:start_link,N
-376CDC:lH376CE4|H376C2C
-376CE4:t8:A5:child,P<0.16.0>,AD:file_server_2,H376A58,A9:permanent,I2000,A6:worker,H376A68
-376A68:lA4:file|H376AB0
-376AB0:lAB:file_server|H376B04
-376B04:lAE:file_io_server|H376B68
-376B68:lA9:prim_file|N
-376A58:t3:AB:file_server,AA:start_link,N
-376C2C:lH376C34|H376C58
-376C34:t8:A5:child,P<0.15.0>,AC:global_group,H3769F4,A9:permanent,I2000,A6:worker,H376A04
-376A04:lAC:global_group|N
-3769F4:t3:AC:global_group,AA:start_link,N
-376C58:lH376C60|H376C84
-376C60:t8:A5:child,A9:undefined,A7:net_sup,H37696C,A9:permanent,A8:infinity,AA:supervisor,H37697C
-37697C:lA10:erl_distribution|N
-37696C:t3:A10:erl_distribution,AA:start_link,N
-376C84:lH376C8C|H3768A0
-376C8C:t8:A5:child,P<0.14.0>,A7:inet_db,H3768F4,A9:permanent,I2000,A6:worker,H376904
-376904:lA7:inet_db|N
-3768F4:t3:A7:inet_db,AA:start_link,N
-3768A0:lH376938|H37695C
-376938:t8:A5:child,P<0.11.0>,A12:global_name_server,H3769B0,A9:permanent,I2000,A6:worker,H3769C0
-3769C0:lA6:global|N
-3769B0:t3:A6:global,AA:start_link,N
-37695C:lH3769C8|N
-3769C8:t8:A5:child,P<0.10.0>,A3:rex,H376A38,A9:permanent,I2000,A6:worker,H376A48
-376A48:lA3:rpc|N
-376A38:t3:A3:rpc,AA:start_link,N
-376868:t2:A5:local,AA:kernel_sup
-3768D4:lAA:gen_server|H376964
-376964:lP<0.8.0>|H3769EC
-3769EC:lP<0.8.0>|H376A50
-376A50:lH376A9C|H376AA8
-376A9C:t2:A5:local,AA:kernel_sup
-376AA8:lAA:supervisor|H376AFC
-376AFC:lH376B50|H376B60
-376B50:t3:H376868,A6:kernel,N
-376B60:lN|N
-376850:t2:AD:$initial_call,H3768DC
-3768DC:t3:A3:gen,A7:init_it,H3768D4
-37685C:t2:AA:$ancestors,H3768EC
-3768EC:lP<0.8.0>|N
-=proc_dictionary:<0.10.0>
-H367A10
-H3679F4
-=proc_stack:<0.10.0>
-367cec:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A3:rpc
-y3:H367AA8
-y4:A3:rex
-y5:P<0.9.0>
-367d08:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3679C4
-=proc_heap:<0.10.0>
-367AA8:t2:I0,A3:nil
-3679C4:lAA:gen_server|H3679BC
-3679BC:lP<0.9.0>|H3679B4
-3679B4:lP<0.9.0>|H367988
-367988:lH367990|H3679AC
-367990:t2:A5:local,A3:rex
-3679AC:lA3:rpc|H3679A4
-3679A4:lN|H36799C
-36799C:lN|N
-367A10:t2:AD:$initial_call,H367A00
-367A00:t3:A3:gen,A7:init_it,H3679C4
-3679F4:t2:AA:$ancestors,H3679EC
-3679EC:lAA:kernel_sup|H3679CC
-3679CC:lP<0.8.0>|N
-=proc_dictionary:<0.11.0>
-H36ADD8
-H36ADBC
-=proc_stack:<0.11.0>
-36b0b4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A6:global
-y3:H36AF0C
-y4:A12:global_name_server
-y5:P<0.9.0>
-36b0d0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36AD8C
-=proc_heap:<0.11.0>
-36AF0C:t9:A5:state,A4:true,N,N,N,N,AD:nonode@nohost,P<0.12.0>,P<0.13.0>
-36AD8C:lAA:gen_server|H36AD84
-36AD84:lP<0.9.0>|H36AD7C
-36AD7C:lP<0.9.0>|H36AD50
-36AD50:lH36AD58|H36AD74
-36AD58:t2:A5:local,A12:global_name_server
-36AD74:lA6:global|H36AD6C
-36AD6C:lN|H36AD64
-36AD64:lN|N
-36ADD8:t2:AD:$initial_call,H36ADC8
-36ADC8:t3:A3:gen,A7:init_it,H36AD8C
-36ADBC:t2:AA:$ancestors,H36ADB4
-36ADB4:lAA:kernel_sup|H36AD94
-36AD94:lP<0.8.0>|N
-=proc_stack:<0.12.0>
-36921c:SReturn addr 0x261184 (global:init_the_locker/1 + 112)
-y0:N
-y1:N
-y2:N
-y3:N
-y4:N
-y5:N
-y6:A8:infinity
-y7:H368EB0
-y8:P<0.11.0>
-369244:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-=proc_heap:<0.12.0>
-368EB0:t3:A5:multi,A9:undefined,N
-=proc_stack:<0.13.0>
-3695d0:SReturn addr 0x2651AC (global:loop_the_deleter/1 + 36)
-y0:A8:infinity
-y1:N
-y2:P<0.11.0>
-3695e0:SReturn addr 0x2654F8 (global:'-start_the_deleter/1-fun-0-'/1 + 20)
-y0:N
-y1:N
-y2:P<0.11.0>
-3695f0:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.13.0>
-=proc_dictionary:<0.14.0>
-H36A998
-H36A9A4
-=proc_stack:<0.14.0>
-372e0c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:inet_db
-y3:H36A9B0
-y4:A7:inet_db
-y5:P<0.9.0>
-372e28:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36A9C8
-=proc_heap:<0.14.0>
-36A9B0:t5:A5:state,A7:inet_db,AA:inet_cache,AA:inet_hosts,H36A9E8
-36A9E8:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000060000000000000000
-36A9C8:lAA:gen_server|H36A9F8
-36A9F8:lP<0.9.0>|H36AA08
-36AA08:lP<0.9.0>|H36AA10
-36AA10:lH36AA18|H36AA24
-36AA18:t2:A5:local,A7:inet_db
-36AA24:lA7:inet_db|H36AA2C
-36AA2C:lN|H36AA34
-36AA34:lN|N
-36A998:t2:AD:$initial_call,H36A9D0
-36A9D0:t3:A3:gen,A7:init_it,H36A9C8
-36A9A4:t2:AA:$ancestors,H36A9E0
-36A9E0:lAA:kernel_sup|H36AA00
-36AA00:lP<0.8.0>|N
-=proc_dictionary:<0.15.0>
-H372788
-H3727F8
-H37276C
-H37280C
-H372820
-=proc_stack:<0.15.0>
-372a64:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AC:global_group
-y3:H3728C8
-y4:AC:global_group
-y5:P<0.9.0>
-372a80:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37273C
-=proc_heap:<0.15.0>
-3728C8:tC:A5:state,A7:no_conf,A4:true,N,N,N,N,N,AD:nonode@nohost,N,A6:normal,A6:normal
-37273C:lAA:gen_server|H372734
-372734:lP<0.9.0>|H37272C
-37272C:lP<0.9.0>|H372700
-372700:lH372708|H372724
-372708:t2:A5:local,AC:global_group
-372724:lAC:global_group|H37271C
-37271C:lN|H372714
-372714:lN|N
-372788:t2:AD:$initial_call,H372778
-372778:t3:A3:gen,A7:init_it,H37273C
-3727F8:t2:A10:registered_names,H3727F0
-3727F0:lA9:undefined|N
-37276C:t2:AA:$ancestors,H372764
-372764:lAA:kernel_sup|H372744
-372744:lP<0.8.0>|N
-37280C:t2:A4:send,H372804
-372804:lA9:undefined|N
-372820:t2:AC:whereis_name,H372818
-372818:lA9:undefined|N
-=proc_dictionary:<0.16.0>
-H37B918
-H37B924
-=proc_stack:<0.16.0>
-3d303c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AB:file_server
-y3:p<0.4>
-y4:AD:file_server_2
-y5:P<0.9.0>
-3d3058:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37B930
-=proc_heap:<0.16.0>
-37B930:lAA:gen_server|H37B950
-37B950:lP<0.9.0>|H37B960
-37B960:lP<0.9.0>|H37B968
-37B968:lH37B970|H37B97C
-37B970:t2:A5:local,AD:file_server_2
-37B97C:lAB:file_server|H37B984
-37B984:lN|H37B98C
-37B98C:lN|N
-37B918:t2:AD:$initial_call,H37B938
-37B938:t3:A3:gen,A7:init_it,H37B930
-37B924:t2:AA:$ancestors,H37B948
-37B948:lAA:kernel_sup|H37B958
-37B958:lP<0.8.0>|N
-=proc_stack:<0.17.0>
-3763cc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H376084
-y1:P<0.16.0>
-y2:P<0.9.0>
-=proc_heap:<0.17.0>
-376084:E21:8372000364000D6E6F6E6F6465406E6F686F737400000000160000000000000000
-=proc_stack:<0.18.0>
-3b98e8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H38AE84
-y1:P<0.9.0>
-=proc_heap:<0.18.0>
-38AE84:t8:A5:state,P<0.9.0>,H3873BC,H38AEB8,I9,I10,A8:no_cache,AB:interactive
-38AEB8:lH3873D4|H38AEE0
-3873D4:lI46|N
-38AEE0:lH3873EC|H38AF10
-3873EC:lI47|H387404
-387404:lI99|H387424
-387424:lI108|H38744C
-38744C:lI101|H38747C
-38747C:lI97|H3874B4
-3874B4:lI114|H3874F4
-3874F4:lI99|H38753C
-38753C:lI97|H38758C
-38758C:lI115|H3875E4
-3875E4:lI101|H387644
-387644:lI47|H3876AC
-3876AC:lI111|H38771C
-38771C:lI116|H387794
-387794:lI112|H387814
-387814:lI47|H38789C
-38789C:lI101|H38792C
-38792C:lI114|H3879BC
-3879BC:lI116|H387A54
-387A54:lI115|H387AF4
-387AF4:lI47|H387B9C
-387B9C:lI108|H387C4C
-387C4C:lI105|H387D04
-387D04:lI98|H387DC4
-387DC4:lI47|H387E8C
-387E8C:lI107|H387F5C
-387F5C:lI101|H388034
-388034:lI114|H388114
-388114:lI110|H3881FC
-3881FC:lI101|H3882EC
-3882EC:lI108|H3883E4
-3883E4:lI47|H3884E4
-3884E4:lI101|H3885EC
-3885EC:lI98|H3886FC
-3886FC:lI105|H388814
-388814:lI110|N
-38AF10:lH38740C|H38AF48
-38740C:lI47|H38742C
-38742C:lI99|H387454
-387454:lI108|H387484
-387484:lI101|H3874BC
-3874BC:lI97|H3874FC
-3874FC:lI114|H387544
-387544:lI99|H387594
-387594:lI97|H3875EC
-3875EC:lI115|H38764C
-38764C:lI101|H3876B4
-3876B4:lI47|H387724
-387724:lI111|H38779C
-38779C:lI116|H38781C
-38781C:lI112|H3878A4
-3878A4:lI47|H387934
-387934:lI101|H3879C4
-3879C4:lI114|H387A5C
-387A5C:lI116|H387AFC
-387AFC:lI115|H387BA4
-387BA4:lI47|H387C54
-387C54:lI108|H387D0C
-387D0C:lI105|H387DCC
-387DCC:lI98|H387E94
-387E94:lI47|H387F64
-387F64:lI115|H38803C
-38803C:lI116|H38811C
-38811C:lI100|H388204
-388204:lI108|H3882F4
-3882F4:lI105|H3883EC
-3883EC:lI98|H3884EC
-3884EC:lI47|H3885F4
-3885F4:lI101|H388704
-388704:lI98|H38881C
-38881C:lI105|H38892C
-38892C:lI110|N
-38AF48:lH387434|H38AF70
-387434:lI47|H38745C
-38745C:lI99|H38748C
-38748C:lI108|H3874C4
-3874C4:lI101|H387504
-387504:lI97|H38754C
-38754C:lI114|H38759C
-38759C:lI99|H3875F4
-3875F4:lI97|H387654
-387654:lI115|H3876BC
-3876BC:lI101|H38772C
-38772C:lI47|H3877A4
-3877A4:lI111|H387824
-387824:lI116|H3878AC
-3878AC:lI112|H38793C
-38793C:lI47|H3879CC
-3879CC:lI101|H387A64
-387A64:lI114|H387B04
-387B04:lI116|H387BAC
-387BAC:lI115|H387C5C
-387C5C:lI47|H387D14
-387D14:lI108|H387DD4
-387DD4:lI105|H387E9C
-387E9C:lI98|H387F6C
-387F6C:lI47|H388044
-388044:lI119|H388124
-388124:lI101|H38820C
-38820C:lI98|H3882FC
-3882FC:lI116|H3883F4
-3883F4:lI111|H3884F4
-3884F4:lI111|H3885FC
-3885FC:lI108|H38870C
-38870C:lI47|H388824
-388824:lI101|H388934
-388934:lI98|H388A44
-388A44:lI105|H388B54
-388B54:lI110|N
-38AF70:lH387464|H38AF98
-387464:lI47|H387494
-387494:lI99|H3874CC
-3874CC:lI108|H38750C
-38750C:lI101|H387554
-387554:lI97|H3875A4
-3875A4:lI114|H3875FC
-3875FC:lI99|H38765C
-38765C:lI97|H3876C4
-3876C4:lI115|H387734
-387734:lI101|H3877AC
-3877AC:lI47|H38782C
-38782C:lI111|H3878B4
-3878B4:lI116|H387944
-387944:lI112|H3879D4
-3879D4:lI47|H387A6C
-387A6C:lI101|H387B0C
-387B0C:lI114|H387BB4
-387BB4:lI116|H387C64
-387C64:lI115|H387D1C
-387D1C:lI47|H387DDC
-387DDC:lI108|H387EA4
-387EA4:lI105|H387F74
-387F74:lI98|H38804C
-38804C:lI47|H38812C
-38812C:lI116|H388214
-388214:lI118|H388304
-388304:lI47|H3883FC
-3883FC:lI101|H3884FC
-3884FC:lI98|H388604
-388604:lI105|H388714
-388714:lI110|N
-38AF98:lH38749C|H38AFC0
-38749C:lI47|H3874D4
-3874D4:lI99|H387514
-387514:lI108|H38755C
-38755C:lI101|H3875AC
-3875AC:lI97|H387604
-387604:lI114|H387664
-387664:lI99|H3876CC
-3876CC:lI97|H38773C
-38773C:lI115|H3877B4
-3877B4:lI101|H387834
-387834:lI47|H3878BC
-3878BC:lI111|H38794C
-38794C:lI116|H3879DC
-3879DC:lI112|H387A74
-387A74:lI47|H387B14
-387B14:lI101|H387BBC
-387BBC:lI114|H387C6C
-387C6C:lI116|H387D24
-387D24:lI115|H387DE4
-387DE4:lI47|H387EAC
-387EAC:lI108|H387F7C
-387F7C:lI105|H388054
-388054:lI98|H388134
-388134:lI47|H38821C
-38821C:lI116|H38830C
-38830C:lI115|H388404
-388404:lI112|H388504
-388504:lI47|H38860C
-38860C:lI101|H38871C
-38871C:lI98|H38882C
-38882C:lI105|H38893C
-38893C:lI110|N
-38AFC0:lH3874DC|H38AFE8
-3874DC:lI47|H38751C
-38751C:lI99|H387564
-387564:lI108|H3875B4
-3875B4:lI101|H38760C
-38760C:lI97|H38766C
-38766C:lI114|H3876D4
-3876D4:lI99|H387744
-387744:lI97|H3877BC
-3877BC:lI115|H38783C
-38783C:lI101|H3878C4
-3878C4:lI47|H387954
-387954:lI111|H3879E4
-3879E4:lI116|H387A7C
-387A7C:lI112|H387B1C
-387B1C:lI47|H387BC4
-387BC4:lI101|H387C74
-387C74:lI114|H387D2C
-387D2C:lI116|H387DEC
-387DEC:lI115|H387EB4
-387EB4:lI47|H387F84
-387F84:lI108|H38805C
-38805C:lI105|H38813C
-38813C:lI98|H388224
-388224:lI47|H388314
-388314:lI116|H38840C
-38840C:lI111|H38850C
-38850C:lI111|H388614
-388614:lI108|H388724
-388724:lI115|H388834
-388834:lI47|H388944
-388944:lI101|H388A4C
-388A4C:lI98|H388B5C
-388B5C:lI105|H388C6C
-388C6C:lI110|N
-38AFE8:lH387524|H38B008
-387524:lI47|H38756C
-38756C:lI99|H3875BC
-3875BC:lI108|H387614
-387614:lI101|H387674
-387674:lI97|H3876DC
-3876DC:lI114|H38774C
-38774C:lI99|H3877C4
-3877C4:lI97|H387844
-387844:lI115|H3878CC
-3878CC:lI101|H38795C
-38795C:lI47|H3879EC
-3879EC:lI111|H387A84
-387A84:lI116|H387B24
-387B24:lI112|H387BCC
-387BCC:lI47|H387C7C
-387C7C:lI101|H387D34
-387D34:lI114|H387DF4
-387DF4:lI116|H387EBC
-387EBC:lI115|H387F8C
-387F8C:lI47|H388064
-388064:lI108|H388144
-388144:lI105|H38822C
-38822C:lI98|H38831C
-38831C:lI47|H388414
-388414:lI116|H388514
-388514:lI111|H38861C
-38861C:lI111|H38872C
-38872C:lI108|H38883C
-38883C:lI98|H38894C
-38894C:lI97|H388A54
-388A54:lI114|H388B64
-388B64:lI47|H388C74
-388C74:lI101|H388D84
-388D84:lI98|H388E9C
-388E9C:lI105|H388FB4
-388FB4:lI110|N
-38B008:lH387574|H38B018
-387574:lI47|H3875C4
-3875C4:lI99|H38761C
-38761C:lI108|H38767C
-38767C:lI101|H3876E4
-3876E4:lI97|H387754
-387754:lI114|H3877CC
-3877CC:lI99|H38784C
-38784C:lI97|H3878D4
-3878D4:lI115|H387964
-387964:lI101|H3879F4
-3879F4:lI47|H387A8C
-387A8C:lI111|H387B2C
-387B2C:lI116|H387BD4
-387BD4:lI112|H387C84
-387C84:lI47|H387D3C
-387D3C:lI101|H387DFC
-387DFC:lI114|H387EC4
-387EC4:lI116|H387F94
-387F94:lI115|H38806C
-38806C:lI47|H38814C
-38814C:lI108|H388234
-388234:lI105|H388324
-388324:lI98|H38841C
-38841C:lI47|H38851C
-38851C:lI116|H388624
-388624:lI101|H388734
-388734:lI115|H388844
-388844:lI116|H388954
-388954:lI95|H388A5C
-388A5C:lI115|H388B6C
-388B6C:lI101|H388C7C
-388C7C:lI114|H388D8C
-388D8C:lI118|H388EA4
-388EA4:lI101|H388FBC
-388FBC:lI114|H3890D4
-3890D4:lI47|H3891EC
-3891EC:lI101|H3892FC
-3892FC:lI98|H38940C
-38940C:lI105|H38951C
-38951C:lI110|N
-38B018:lH3875CC|H38AE7C
-3875CC:lI47|H387624
-387624:lI99|H387684
-387684:lI108|H3876EC
-3876EC:lI101|H38775C
-38775C:lI97|H3877D4
-3877D4:lI114|H387854
-387854:lI99|H3878DC
-3878DC:lI97|H38796C
-38796C:lI115|H3879FC
-3879FC:lI101|H387A94
-387A94:lI47|H387B34
-387B34:lI111|H387BDC
-387BDC:lI116|H387C8C
-387C8C:lI112|H387D44
-387D44:lI47|H387E04
-387E04:lI101|H387ECC
-387ECC:lI114|H387F9C
-387F9C:lI116|H388074
-388074:lI115|H388154
-388154:lI47|H38823C
-38823C:lI108|H38832C
-38832C:lI105|H388424
-388424:lI98|H388524
-388524:lI47|H38862C
-38862C:lI115|H38873C
-38873C:lI115|H38884C
-38884C:lI108|H38895C
-38895C:lI47|H388A64
-388A64:lI101|H388B74
-388B74:lI98|H388C84
-388C84:lI105|H388D94
-388D94:lI110|N
-38AE7C:lH38762C|H38AEB0
-38762C:lI47|H38768C
-38768C:lI99|H3876F4
-3876F4:lI108|H387764
-387764:lI101|H3877DC
-3877DC:lI97|H38785C
-38785C:lI114|H3878E4
-3878E4:lI99|H387974
-387974:lI97|H387A04
-387A04:lI115|H387A9C
-387A9C:lI101|H387B3C
-387B3C:lI47|H387BE4
-387BE4:lI111|H387C94
-387C94:lI116|H387D4C
-387D4C:lI112|H387E0C
-387E0C:lI47|H387ED4
-387ED4:lI101|H387FA4
-387FA4:lI114|H38807C
-38807C:lI116|H38815C
-38815C:lI115|H388244
-388244:lI47|H388334
-388334:lI108|H38842C
-38842C:lI105|H38852C
-38852C:lI98|H388634
-388634:lI47|H388744
-388744:lI115|H388854
-388854:lI110|H388964
-388964:lI109|H388A6C
-388A6C:lI112|H388B7C
-388B7C:lI47|H388C8C
-388C8C:lI101|H388D9C
-388D9C:lI98|H388EAC
-388EAC:lI105|H388FC4
-388FC4:lI110|N
-38AEB0:lH387694|H38AED8
-387694:lI47|H3876FC
-3876FC:lI99|H38776C
-38776C:lI108|H3877E4
-3877E4:lI101|H387864
-387864:lI97|H3878EC
-3878EC:lI114|H38797C
-38797C:lI99|H387A0C
-387A0C:lI97|H387AA4
-387AA4:lI115|H387B44
-387B44:lI101|H387BEC
-387BEC:lI47|H387C9C
-387C9C:lI111|H387D54
-387D54:lI116|H387E14
-387E14:lI112|H387EDC
-387EDC:lI47|H387FAC
-387FAC:lI101|H388084
-388084:lI114|H388164
-388164:lI116|H38824C
-38824C:lI115|H38833C
-38833C:lI47|H388434
-388434:lI108|H388534
-388534:lI105|H38863C
-38863C:lI98|H38874C
-38874C:lI47|H38885C
-38885C:lI115|H38896C
-38896C:lI97|H388A74
-388A74:lI115|H388B84
-388B84:lI108|H388C94
-388C94:lI47|H388DA4
-388DA4:lI101|H388EB4
-388EB4:lI98|H388FCC
-388FCC:lI105|H3890DC
-3890DC:lI110|N
-38AED8:lH387704|H38AF08
-387704:lI47|H387774
-387774:lI99|H3877EC
-3877EC:lI108|H38786C
-38786C:lI101|H3878F4
-3878F4:lI97|H387984
-387984:lI114|H387A14
-387A14:lI99|H387AAC
-387AAC:lI97|H387B4C
-387B4C:lI115|H387BF4
-387BF4:lI101|H387CA4
-387CA4:lI47|H387D5C
-387D5C:lI111|H387E1C
-387E1C:lI116|H387EE4
-387EE4:lI112|H387FB4
-387FB4:lI47|H38808C
-38808C:lI101|H38816C
-38816C:lI114|H388254
-388254:lI116|H388344
-388344:lI115|H38843C
-38843C:lI47|H38853C
-38853C:lI108|H388644
-388644:lI105|H388754
-388754:lI98|H388864
-388864:lI47|H388974
-388974:lI114|H388A7C
-388A7C:lI117|H388B8C
-388B8C:lI110|H388C9C
-388C9C:lI116|H388DAC
-388DAC:lI105|H388EBC
-388EBC:lI109|H388FD4
-388FD4:lI101|H3890E4
-3890E4:lI95|H3891F4
-3891F4:lI116|H389304
-389304:lI111|H389414
-389414:lI111|H389524
-389524:lI108|H389624
-389624:lI115|H38971C
-38971C:lI47|H389814
-389814:lI101|H38990C
-38990C:lI98|H389A04
-389A04:lI105|H389AE4
-389AE4:lI110|N
-38AF08:lH38777C|H38AF40
-38777C:lI47|H3877F4
-3877F4:lI99|H387874
-387874:lI108|H3878FC
-3878FC:lI101|H38798C
-38798C:lI97|H387A1C
-387A1C:lI114|H387AB4
-387AB4:lI99|H387B54
-387B54:lI97|H387BFC
-387BFC:lI115|H387CAC
-387CAC:lI101|H387D64
-387D64:lI47|H387E24
-387E24:lI111|H387EEC
-387EEC:lI116|H387FBC
-387FBC:lI112|H388094
-388094:lI47|H388174
-388174:lI101|H38825C
-38825C:lI114|H38834C
-38834C:lI116|H388444
-388444:lI115|H388544
-388544:lI47|H38864C
-38864C:lI108|H38875C
-38875C:lI105|H38886C
-38886C:lI98|H38897C
-38897C:lI47|H388A84
-388A84:lI114|H388B94
-388B94:lI115|H388CA4
-388CA4:lI104|H388DB4
-388DB4:lI101|H388EC4
-388EC4:lI108|H388FDC
-388FDC:lI108|H3890EC
-3890EC:lI47|H3891FC
-3891FC:lI101|H38930C
-38930C:lI98|H38941C
-38941C:lI105|H38952C
-38952C:lI110|N
-38AF40:lH3877FC|H38AF68
-3877FC:lI47|H38787C
-38787C:lI99|H387904
-387904:lI108|H387994
-387994:lI101|H387A24
-387A24:lI97|H387ABC
-387ABC:lI114|H387B5C
-387B5C:lI99|H387C04
-387C04:lI97|H387CB4
-387CB4:lI115|H387D6C
-387D6C:lI101|H387E2C
-387E2C:lI47|H387EF4
-387EF4:lI111|H387FC4
-387FC4:lI116|H38809C
-38809C:lI112|H38817C
-38817C:lI47|H388264
-388264:lI101|H388354
-388354:lI114|H38844C
-38844C:lI116|H38854C
-38854C:lI115|H388654
-388654:lI47|H388764
-388764:lI108|H388874
-388874:lI105|H388984
-388984:lI98|H388A8C
-388A8C:lI47|H388B9C
-388B9C:lI112|H388CAC
-388CAC:lI109|H388DBC
-388DBC:lI97|H388ECC
-388ECC:lI110|H388FE4
-388FE4:lI47|H3890F4
-3890F4:lI101|H389204
-389204:lI98|H389314
-389314:lI105|H389424
-389424:lI110|N
-38AF68:lH387884|H38AF90
-387884:lI47|H38790C
-38790C:lI99|H38799C
-38799C:lI108|H387A2C
-387A2C:lI101|H387AC4
-387AC4:lI97|H387B64
-387B64:lI114|H387C0C
-387C0C:lI99|H387CBC
-387CBC:lI97|H387D74
-387D74:lI115|H387E34
-387E34:lI101|H387EFC
-387EFC:lI47|H387FCC
-387FCC:lI111|H3880A4
-3880A4:lI116|H388184
-388184:lI112|H38826C
-38826C:lI47|H38835C
-38835C:lI101|H388454
-388454:lI114|H388554
-388554:lI116|H38865C
-38865C:lI115|H38876C
-38876C:lI47|H38887C
-38887C:lI108|H38898C
-38898C:lI105|H388A94
-388A94:lI98|H388BA4
-388BA4:lI47|H388CB4
-388CB4:lI112|H388DC4
-388DC4:lI97|H388ED4
-388ED4:lI114|H388FEC
-388FEC:lI115|H3890FC
-3890FC:lI101|H38920C
-38920C:lI116|H38931C
-38931C:lI111|H38942C
-38942C:lI111|H389534
-389534:lI108|H38962C
-38962C:lI115|H389724
-389724:lI47|H38981C
-38981C:lI101|H389914
-389914:lI98|H389A0C
-389A0C:lI105|H389AEC
-389AEC:lI110|N
-38AF90:lH387914|H38AFB8
-387914:lI47|H3879A4
-3879A4:lI99|H387A34
-387A34:lI108|H387ACC
-387ACC:lI101|H387B6C
-387B6C:lI97|H387C14
-387C14:lI114|H387CC4
-387CC4:lI99|H387D7C
-387D7C:lI97|H387E3C
-387E3C:lI115|H387F04
-387F04:lI101|H387FD4
-387FD4:lI47|H3880AC
-3880AC:lI111|H38818C
-38818C:lI116|H388274
-388274:lI112|H388364
-388364:lI47|H38845C
-38845C:lI101|H38855C
-38855C:lI114|H388664
-388664:lI116|H388774
-388774:lI115|H388884
-388884:lI47|H388994
-388994:lI108|H388A9C
-388A9C:lI105|H388BAC
-388BAC:lI98|H388CBC
-388CBC:lI47|H388DCC
-388DCC:lI111|H388EDC
-388EDC:lI116|H388FF4
-388FF4:lI112|H389104
-389104:lI95|H389214
-389214:lI109|H389324
-389324:lI105|H389434
-389434:lI98|H38953C
-38953C:lI115|H389634
-389634:lI47|H38972C
-38972C:lI101|H389824
-389824:lI98|H38991C
-38991C:lI105|H389A14
-389A14:lI110|N
-38AFB8:lH3879AC|H38AFE0
-3879AC:lI47|H387A3C
-387A3C:lI99|H387AD4
-387AD4:lI108|H387B74
-387B74:lI101|H387C1C
-387C1C:lI97|H387CCC
-387CCC:lI114|H387D84
-387D84:lI99|H387E44
-387E44:lI97|H387F0C
-387F0C:lI115|H387FDC
-387FDC:lI101|H3880B4
-3880B4:lI47|H388194
-388194:lI111|H38827C
-38827C:lI116|H38836C
-38836C:lI112|H388464
-388464:lI47|H388564
-388564:lI101|H38866C
-38866C:lI114|H38877C
-38877C:lI116|H38888C
-38888C:lI115|H38899C
-38899C:lI47|H388AA4
-388AA4:lI108|H388BB4
-388BB4:lI105|H388CC4
-388CC4:lI98|H388DD4
-388DD4:lI47|H388EE4
-388EE4:lI111|H388FFC
-388FFC:lI115|H38910C
-38910C:lI95|H38921C
-38921C:lI109|H38932C
-38932C:lI111|H38943C
-38943C:lI110|H389544
-389544:lI47|H38963C
-38963C:lI101|H389734
-389734:lI98|H38982C
-38982C:lI105|H389924
-389924:lI110|N
-38AFE0:lH387A44|H38B000
-387A44:lI47|H387ADC
-387ADC:lI99|H387B7C
-387B7C:lI108|H387C24
-387C24:lI101|H387CD4
-387CD4:lI97|H387D8C
-387D8C:lI114|H387E4C
-387E4C:lI99|H387F14
-387F14:lI97|H387FE4
-387FE4:lI115|H3880BC
-3880BC:lI101|H38819C
-38819C:lI47|H388284
-388284:lI111|H388374
-388374:lI116|H38846C
-38846C:lI112|H38856C
-38856C:lI47|H388674
-388674:lI101|H388784
-388784:lI114|H388894
-388894:lI116|H3889A4
-3889A4:lI115|H388AAC
-388AAC:lI47|H388BBC
-388BBC:lI108|H388CCC
-388CCC:lI105|H388DDC
-388DDC:lI98|H388EEC
-388EEC:lI47|H389004
-389004:lI111|H389114
-389114:lI114|H389224
-389224:lI98|H389334
-389334:lI101|H389444
-389444:lI114|H38954C
-38954C:lI47|H389644
-389644:lI101|H38973C
-38973C:lI98|H389834
-389834:lI105|H38992C
-38992C:lI110|N
-38B000:lH387AE4|H38B010
-387AE4:lI47|H387B84
-387B84:lI99|H387C2C
-387C2C:lI108|H387CDC
-387CDC:lI101|H387D94
-387D94:lI97|H387E54
-387E54:lI114|H387F1C
-387F1C:lI99|H387FEC
-387FEC:lI97|H3880C4
-3880C4:lI115|H3881A4
-3881A4:lI101|H38828C
-38828C:lI47|H38837C
-38837C:lI111|H388474
-388474:lI116|H388574
-388574:lI112|H38867C
-38867C:lI47|H38878C
-38878C:lI101|H38889C
-38889C:lI114|H3889AC
-3889AC:lI116|H388AB4
-388AB4:lI115|H388BC4
-388BC4:lI47|H388CD4
-388CD4:lI108|H388DE4
-388DE4:lI105|H388EF4
-388EF4:lI98|H38900C
-38900C:lI47|H38911C
-38911C:lI111|H38922C
-38922C:lI100|H38933C
-38933C:lI98|H38944C
-38944C:lI99|H389554
-389554:lI47|H38964C
-38964C:lI101|H389744
-389744:lI98|H38983C
-38983C:lI105|H389934
-389934:lI110|N
-38B010:lH387B8C|H38B020
-387B8C:lI47|H387C34
-387C34:lI99|H387CE4
-387CE4:lI108|H387D9C
-387D9C:lI101|H387E5C
-387E5C:lI97|H387F24
-387F24:lI114|H387FF4
-387FF4:lI99|H3880CC
-3880CC:lI97|H3881AC
-3881AC:lI115|H388294
-388294:lI101|H388384
-388384:lI47|H38847C
-38847C:lI111|H38857C
-38857C:lI116|H388684
-388684:lI112|H388794
-388794:lI47|H3888A4
-3888A4:lI101|H3889B4
-3889B4:lI114|H388ABC
-388ABC:lI116|H388BCC
-388BCC:lI115|H388CDC
-388CDC:lI47|H388DEC
-388DEC:lI108|H388EFC
-388EFC:lI105|H389014
-389014:lI98|H389124
-389124:lI47|H389234
-389234:lI111|H389344
-389344:lI98|H389454
-389454:lI115|H38955C
-38955C:lI101|H389654
-389654:lI114|H38974C
-38974C:lI118|H389844
-389844:lI101|H38993C
-38993C:lI114|H389A1C
-389A1C:lI47|H389AF4
-389AF4:lI101|H389BBC
-389BBC:lI98|H389C84
-389C84:lI105|H389D4C
-389D4C:lI110|N
-38B020:lH387C3C|H38B028
-387C3C:lI47|H387CEC
-387CEC:lI99|H387DA4
-387DA4:lI108|H387E64
-387E64:lI101|H387F2C
-387F2C:lI97|H387FFC
-387FFC:lI114|H3880D4
-3880D4:lI99|H3881B4
-3881B4:lI97|H38829C
-38829C:lI115|H38838C
-38838C:lI101|H388484
-388484:lI47|H388584
-388584:lI111|H38868C
-38868C:lI116|H38879C
-38879C:lI112|H3888AC
-3888AC:lI47|H3889BC
-3889BC:lI101|H388AC4
-388AC4:lI114|H388BD4
-388BD4:lI116|H388CE4
-388CE4:lI115|H388DF4
-388DF4:lI47|H388F04
-388F04:lI108|H38901C
-38901C:lI105|H38912C
-38912C:lI98|H38923C
-38923C:lI47|H38934C
-38934C:lI109|H38945C
-38945C:lI110|H389564
-389564:lI101|H38965C
-38965C:lI115|H389754
-389754:lI105|H38984C
-38984C:lI97|H389944
-389944:lI95|H389A24
-389A24:lI115|H389AFC
-389AFC:lI101|H389BC4
-389BC4:lI115|H389C8C
-389C8C:lI115|H389D54
-389D54:lI105|H389E14
-389E14:lI111|H389ECC
-389ECC:lI110|H389F7C
-389F7C:lI47|H38A01C
-38A01C:lI101|H38A0AC
-38A0AC:lI98|H38A12C
-38A12C:lI105|H38A19C
-38A19C:lI110|N
-38B028:lH387CF4|H38B030
-387CF4:lI47|H387DAC
-387DAC:lI99|H387E6C
-387E6C:lI108|H387F34
-387F34:lI101|H388004
-388004:lI97|H3880DC
-3880DC:lI114|H3881BC
-3881BC:lI99|H3882A4
-3882A4:lI97|H388394
-388394:lI115|H38848C
-38848C:lI101|H38858C
-38858C:lI47|H388694
-388694:lI111|H3887A4
-3887A4:lI116|H3888B4
-3888B4:lI112|H3889C4
-3889C4:lI47|H388ACC
-388ACC:lI101|H388BDC
-388BDC:lI114|H388CEC
-388CEC:lI116|H388DFC
-388DFC:lI115|H388F0C
-388F0C:lI47|H389024
-389024:lI108|H389134
-389134:lI105|H389244
-389244:lI98|H389354
-389354:lI47|H389464
-389464:lI109|H38956C
-38956C:lI110|H389664
-389664:lI101|H38975C
-38975C:lI115|H389854
-389854:lI105|H38994C
-38994C:lI97|H389A2C
-389A2C:lI47|H389B04
-389B04:lI101|H389BCC
-389BCC:lI98|H389C94
-389C94:lI105|H389D5C
-389D5C:lI110|N
-38B030:lH387DB4|H38B038
-387DB4:lI47|H387E74
-387E74:lI99|H387F3C
-387F3C:lI108|H38800C
-38800C:lI101|H3880E4
-3880E4:lI97|H3881C4
-3881C4:lI114|H3882AC
-3882AC:lI99|H38839C
-38839C:lI97|H388494
-388494:lI115|H388594
-388594:lI101|H38869C
-38869C:lI47|H3887AC
-3887AC:lI111|H3888BC
-3888BC:lI116|H3889CC
-3889CC:lI112|H388AD4
-388AD4:lI47|H388BE4
-388BE4:lI101|H388CF4
-388CF4:lI114|H388E04
-388E04:lI116|H388F14
-388F14:lI115|H38902C
-38902C:lI47|H38913C
-38913C:lI108|H38924C
-38924C:lI105|H38935C
-38935C:lI98|H38946C
-38946C:lI47|H389574
-389574:lI109|H38966C
-38966C:lI110|H389764
-389764:lI101|H38985C
-38985C:lI109|H389954
-389954:lI111|H389A34
-389A34:lI115|H389B0C
-389B0C:lI121|H389BD4
-389BD4:lI110|H389C9C
-389C9C:lI101|H389D64
-389D64:lI47|H389E1C
-389E1C:lI101|H389ED4
-389ED4:lI98|H389F84
-389F84:lI105|H38A024
-38A024:lI110|N
-38B038:lH387E7C|H38B040
-387E7C:lI47|H387F44
-387F44:lI99|H388014
-388014:lI108|H3880EC
-3880EC:lI101|H3881CC
-3881CC:lI97|H3882B4
-3882B4:lI114|H3883A4
-3883A4:lI99|H38849C
-38849C:lI97|H38859C
-38859C:lI115|H3886A4
-3886A4:lI101|H3887B4
-3887B4:lI47|H3888C4
-3888C4:lI111|H3889D4
-3889D4:lI116|H388ADC
-388ADC:lI112|H388BEC
-388BEC:lI47|H388CFC
-388CFC:lI101|H388E0C
-388E0C:lI114|H388F1C
-388F1C:lI116|H389034
-389034:lI115|H389144
-389144:lI47|H389254
-389254:lI108|H389364
-389364:lI105|H389474
-389474:lI98|H38957C
-38957C:lI47|H389674
-389674:lI109|H38976C
-38976C:lI101|H389864
-389864:lI103|H38995C
-38995C:lI97|H389A3C
-389A3C:lI99|H389B14
-389B14:lI111|H389BDC
-389BDC:lI47|H389CA4
-389CA4:lI101|H389D6C
-389D6C:lI98|H389E24
-389E24:lI105|H389EDC
-389EDC:lI110|N
-38B040:lH387F4C|H38B048
-387F4C:lI47|H38801C
-38801C:lI99|H3880F4
-3880F4:lI108|H3881D4
-3881D4:lI101|H3882BC
-3882BC:lI97|H3883AC
-3883AC:lI114|H3884A4
-3884A4:lI99|H3885A4
-3885A4:lI97|H3886AC
-3886AC:lI115|H3887BC
-3887BC:lI101|H3888CC
-3888CC:lI47|H3889DC
-3889DC:lI111|H388AE4
-388AE4:lI116|H388BF4
-388BF4:lI112|H388D04
-388D04:lI47|H388E14
-388E14:lI101|H388F24
-388F24:lI114|H38903C
-38903C:lI116|H38914C
-38914C:lI115|H38925C
-38925C:lI47|H38936C
-38936C:lI108|H38947C
-38947C:lI105|H389584
-389584:lI98|H38967C
-38967C:lI47|H389774
-389774:lI106|H38986C
-38986C:lI105|H389964
-389964:lI110|H389A44
-389A44:lI116|H389B1C
-389B1C:lI101|H389BE4
-389BE4:lI114|H389CAC
-389CAC:lI102|H389D74
-389D74:lI97|H389E2C
-389E2C:lI99|H389EE4
-389EE4:lI101|N
-38B048:lH388024|H38B050
-388024:lI47|H3880FC
-3880FC:lI99|H3881DC
-3881DC:lI108|H3882C4
-3882C4:lI101|H3883B4
-3883B4:lI97|H3884AC
-3884AC:lI114|H3885AC
-3885AC:lI99|H3886B4
-3886B4:lI97|H3887C4
-3887C4:lI115|H3888D4
-3888D4:lI101|H3889E4
-3889E4:lI47|H388AEC
-388AEC:lI111|H388BFC
-388BFC:lI116|H388D0C
-388D0C:lI112|H388E1C
-388E1C:lI47|H388F2C
-388F2C:lI101|H389044
-389044:lI114|H389154
-389154:lI116|H389264
-389264:lI115|H389374
-389374:lI47|H389484
-389484:lI108|H38958C
-38958C:lI105|H389684
-389684:lI98|H38977C
-38977C:lI47|H389874
-389874:lI105|H38996C
-38996C:lI110|H389A4C
-389A4C:lI101|H389B24
-389B24:lI116|H389BEC
-389BEC:lI115|H389CB4
-389CB4:lI47|H389D7C
-389D7C:lI101|H389E34
-389E34:lI98|H389EEC
-389EEC:lI105|H389F8C
-389F8C:lI110|N
-38B050:lH388104|H38B058
-388104:lI47|H3881E4
-3881E4:lI99|H3882CC
-3882CC:lI108|H3883BC
-3883BC:lI101|H3884B4
-3884B4:lI97|H3885B4
-3885B4:lI114|H3886BC
-3886BC:lI99|H3887CC
-3887CC:lI97|H3888DC
-3888DC:lI115|H3889EC
-3889EC:lI101|H388AF4
-388AF4:lI47|H388C04
-388C04:lI111|H388D14
-388D14:lI116|H388E24
-388E24:lI112|H388F34
-388F34:lI47|H38904C
-38904C:lI101|H38915C
-38915C:lI114|H38926C
-38926C:lI116|H38937C
-38937C:lI115|H38948C
-38948C:lI47|H389594
-389594:lI108|H38968C
-38968C:lI105|H389784
-389784:lI98|H38987C
-38987C:lI47|H389974
-389974:lI105|H389A54
-389A54:lI99|H389B2C
-389B2C:lI47|H389BF4
-389BF4:lI101|H389CBC
-389CBC:lI98|H389D84
-389D84:lI105|H389E3C
-389E3C:lI110|N
-38B058:lH3881EC|H38B060
-3881EC:lI47|H3882D4
-3882D4:lI99|H3883C4
-3883C4:lI108|H3884BC
-3884BC:lI101|H3885BC
-3885BC:lI97|H3886C4
-3886C4:lI114|H3887D4
-3887D4:lI99|H3888E4
-3888E4:lI97|H3889F4
-3889F4:lI115|H388AFC
-388AFC:lI101|H388C0C
-388C0C:lI47|H388D1C
-388D1C:lI111|H388E2C
-388E2C:lI116|H388F3C
-388F3C:lI112|H389054
-389054:lI47|H389164
-389164:lI101|H389274
-389274:lI114|H389384
-389384:lI116|H389494
-389494:lI115|H38959C
-38959C:lI47|H389694
-389694:lI108|H38978C
-38978C:lI105|H389884
-389884:lI98|H38997C
-38997C:lI47|H389A5C
-389A5C:lI104|H389B34
-389B34:lI105|H389BFC
-389BFC:lI112|H389CC4
-389CC4:lI101|H389D8C
-389D8C:lI47|H389E44
-389E44:lI101|H389EF4
-389EF4:lI98|H389F94
-389F94:lI105|H38A02C
-38A02C:lI110|N
-38B060:lH3882DC|H38B068
-3882DC:lI47|H3883CC
-3883CC:lI99|H3884C4
-3884C4:lI108|H3885C4
-3885C4:lI101|H3886CC
-3886CC:lI97|H3887DC
-3887DC:lI114|H3888EC
-3888EC:lI99|H3889FC
-3889FC:lI97|H388B04
-388B04:lI115|H388C14
-388C14:lI101|H388D24
-388D24:lI47|H388E34
-388E34:lI111|H388F44
-388F44:lI116|H38905C
-38905C:lI112|H38916C
-38916C:lI47|H38927C
-38927C:lI101|H38938C
-38938C:lI114|H38949C
-38949C:lI116|H3895A4
-3895A4:lI115|H38969C
-38969C:lI47|H389794
-389794:lI108|H38988C
-38988C:lI105|H389984
-389984:lI98|H389A64
-389A64:lI47|H389B3C
-389B3C:lI103|H389C04
-389C04:lI115|H389CCC
-389CCC:lI47|H389D94
-389D94:lI101|H389E4C
-389E4C:lI98|H389EFC
-389EFC:lI105|H389F9C
-389F9C:lI110|N
-38B068:lH3883D4|H38B070
-3883D4:lI47|H3884CC
-3884CC:lI99|H3885CC
-3885CC:lI108|H3886D4
-3886D4:lI101|H3887E4
-3887E4:lI97|H3888F4
-3888F4:lI114|H388A04
-388A04:lI99|H388B0C
-388B0C:lI97|H388C1C
-388C1C:lI115|H388D2C
-388D2C:lI101|H388E3C
-388E3C:lI47|H388F4C
-388F4C:lI111|H389064
-389064:lI116|H389174
-389174:lI112|H389284
-389284:lI47|H389394
-389394:lI101|H3894A4
-3894A4:lI114|H3895AC
-3895AC:lI116|H3896A4
-3896A4:lI115|H38979C
-38979C:lI47|H389894
-389894:lI108|H38998C
-38998C:lI105|H389A6C
-389A6C:lI98|H389B44
-389B44:lI47|H389C0C
-389C0C:lI101|H389CD4
-389CD4:lI118|H389D9C
-389D9C:lI97|H389E54
-389E54:lI47|H389F04
-389F04:lI101|H389FA4
-389FA4:lI98|H38A034
-38A034:lI105|H38A0B4
-38A0B4:lI110|N
-38B070:lH3884D4|H38B078
-3884D4:lI47|H3885D4
-3885D4:lI99|H3886DC
-3886DC:lI108|H3887EC
-3887EC:lI101|H3888FC
-3888FC:lI97|H388A0C
-388A0C:lI114|H388B14
-388B14:lI99|H388C24
-388C24:lI97|H388D34
-388D34:lI115|H388E44
-388E44:lI101|H388F54
-388F54:lI47|H38906C
-38906C:lI111|H38917C
-38917C:lI116|H38928C
-38928C:lI112|H38939C
-38939C:lI47|H3894AC
-3894AC:lI101|H3895B4
-3895B4:lI114|H3896AC
-3896AC:lI116|H3897A4
-3897A4:lI115|H38989C
-38989C:lI47|H389994
-389994:lI108|H389A74
-389A74:lI105|H389B4C
-389B4C:lI98|H389C14
-389C14:lI47|H389CDC
-389CDC:lI101|H389DA4
-389DA4:lI116|H389E5C
-389E5C:lI47|H389F0C
-389F0C:lI101|H389FAC
-389FAC:lI98|H38A03C
-38A03C:lI105|H38A0BC
-38A0BC:lI110|N
-38B078:lH3885DC|H38B080
-3885DC:lI47|H3886E4
-3886E4:lI99|H3887F4
-3887F4:lI108|H388904
-388904:lI101|H388A14
-388A14:lI97|H388B1C
-388B1C:lI114|H388C2C
-388C2C:lI99|H388D3C
-388D3C:lI97|H388E4C
-388E4C:lI115|H388F5C
-388F5C:lI101|H389074
-389074:lI47|H389184
-389184:lI111|H389294
-389294:lI116|H3893A4
-3893A4:lI112|H3894B4
-3894B4:lI47|H3895BC
-3895BC:lI101|H3896B4
-3896B4:lI114|H3897AC
-3897AC:lI116|H3898A4
-3898A4:lI115|H38999C
-38999C:lI47|H389A7C
-389A7C:lI108|H389B54
-389B54:lI105|H389C1C
-389C1C:lI98|H389CE4
-389CE4:lI47|H389DAC
-389DAC:lI101|H389E64
-389E64:lI114|H389F14
-389F14:lI108|H389FB4
-389FB4:lI95|H38A044
-38A044:lI105|H38A0C4
-38A0C4:lI110|H38A134
-38A134:lI116|H38A1A4
-38A1A4:lI101|H38A20C
-38A20C:lI114|H38A274
-38A274:lI102|H38A2DC
-38A2DC:lI97|H38A344
-38A344:lI99|H38A3AC
-38A3AC:lI101|N
-38B080:lH3886EC|H38B088
-3886EC:lI47|H3887FC
-3887FC:lI99|H38890C
-38890C:lI108|H388A1C
-388A1C:lI101|H388B24
-388B24:lI97|H388C34
-388C34:lI114|H388D44
-388D44:lI99|H388E54
-388E54:lI97|H388F64
-388F64:lI115|H38907C
-38907C:lI101|H38918C
-38918C:lI47|H38929C
-38929C:lI111|H3893AC
-3893AC:lI116|H3894BC
-3894BC:lI112|H3895C4
-3895C4:lI47|H3896BC
-3896BC:lI101|H3897B4
-3897B4:lI114|H3898AC
-3898AC:lI116|H3899A4
-3899A4:lI115|H389A84
-389A84:lI47|H389B5C
-389B5C:lI108|H389C24
-389C24:lI105|H389CEC
-389CEC:lI98|H389DB4
-389DB4:lI47|H389E6C
-389E6C:lI100|H389F1C
-389F1C:lI101|H389FBC
-389FBC:lI98|H38A04C
-38A04C:lI117|H38A0CC
-38A0CC:lI103|H38A13C
-38A13C:lI103|H38A1AC
-38A1AC:lI101|H38A214
-38A214:lI114|H38A27C
-38A27C:lI47|H38A2E4
-38A2E4:lI101|H38A34C
-38A34C:lI98|H38A3B4
-38A3B4:lI105|H38A414
-38A414:lI110|N
-38B088:lH388804|H38B090
-388804:lI47|H388914
-388914:lI99|H388A24
-388A24:lI108|H388B2C
-388B2C:lI101|H388C3C
-388C3C:lI97|H388D4C
-388D4C:lI114|H388E5C
-388E5C:lI99|H388F6C
-388F6C:lI97|H389084
-389084:lI115|H389194
-389194:lI101|H3892A4
-3892A4:lI47|H3893B4
-3893B4:lI111|H3894C4
-3894C4:lI116|H3895CC
-3895CC:lI112|H3896C4
-3896C4:lI47|H3897BC
-3897BC:lI101|H3898B4
-3898B4:lI114|H3899AC
-3899AC:lI116|H389A8C
-389A8C:lI115|H389B64
-389B64:lI47|H389C2C
-389C2C:lI108|H389CF4
-389CF4:lI105|H389DBC
-389DBC:lI98|H389E74
-389E74:lI47|H389F24
-389F24:lI99|H389FC4
-389FC4:lI114|H38A054
-38A054:lI121|H38A0D4
-38A0D4:lI112|H38A144
-38A144:lI116|H38A1B4
-38A1B4:lI111|H38A21C
-38A21C:lI47|H38A284
-38A284:lI101|H38A2EC
-38A2EC:lI98|H38A354
-38A354:lI105|H38A3BC
-38A3BC:lI110|N
-38B090:lH38891C|H38B098
-38891C:lI47|H388A2C
-388A2C:lI99|H388B34
-388B34:lI108|H388C44
-388C44:lI101|H388D54
-388D54:lI97|H388E64
-388E64:lI114|H388F74
-388F74:lI99|H38908C
-38908C:lI97|H38919C
-38919C:lI115|H3892AC
-3892AC:lI101|H3893BC
-3893BC:lI47|H3894CC
-3894CC:lI111|H3895D4
-3895D4:lI116|H3896CC
-3896CC:lI112|H3897C4
-3897C4:lI47|H3898BC
-3898BC:lI101|H3899B4
-3899B4:lI114|H389A94
-389A94:lI116|H389B6C
-389B6C:lI115|H389C34
-389C34:lI47|H389CFC
-389CFC:lI108|H389DC4
-389DC4:lI105|H389E7C
-389E7C:lI98|H389F2C
-389F2C:lI47|H389FCC
-389FCC:lI99|H38A05C
-38A05C:lI111|H38A0DC
-38A0DC:lI115|H38A14C
-38A14C:lI84|H38A1BC
-38A1BC:lI114|H38A224
-38A224:lI97|H38A28C
-38A28C:lI110|H38A2F4
-38A2F4:lI115|H38A35C
-38A35C:lI97|H38A3C4
-38A3C4:lI99|H38A41C
-38A41C:lI116|H38A46C
-38A46C:lI105|H38A4BC
-38A4BC:lI111|H38A50C
-38A50C:lI110|H38A554
-38A554:lI115|H38A59C
-38A59C:lI47|H38A5E4
-38A5E4:lI101|H38A62C
-38A62C:lI98|H38A66C
-38A66C:lI105|H38A6A4
-38A6A4:lI110|N
-38B098:lH388A34|H38B0A0
-388A34:lI47|H388B3C
-388B3C:lI99|H388C4C
-388C4C:lI108|H388D5C
-388D5C:lI101|H388E6C
-388E6C:lI97|H388F7C
-388F7C:lI114|H389094
-389094:lI99|H3891A4
-3891A4:lI97|H3892B4
-3892B4:lI115|H3893C4
-3893C4:lI101|H3894D4
-3894D4:lI47|H3895DC
-3895DC:lI111|H3896D4
-3896D4:lI116|H3897CC
-3897CC:lI112|H3898C4
-3898C4:lI47|H3899BC
-3899BC:lI101|H389A9C
-389A9C:lI114|H389B74
-389B74:lI116|H389C3C
-389C3C:lI115|H389D04
-389D04:lI47|H389DCC
-389DCC:lI108|H389E84
-389E84:lI105|H389F34
-389F34:lI98|H389FD4
-389FD4:lI47|H38A064
-38A064:lI99|H38A0E4
-38A0E4:lI111|H38A154
-38A154:lI115|H38A1C4
-38A1C4:lI84|H38A22C
-38A22C:lI105|H38A294
-38A294:lI109|H38A2FC
-38A2FC:lI101|H38A364
-38A364:lI47|H38A3CC
-38A3CC:lI101|H38A424
-38A424:lI98|H38A474
-38A474:lI105|H38A4C4
-38A4C4:lI110|N
-38B0A0:lH388B44|H38B0A8
-388B44:lI47|H388C54
-388C54:lI99|H388D64
-388D64:lI108|H388E74
-388E74:lI101|H388F84
-388F84:lI97|H38909C
-38909C:lI114|H3891AC
-3891AC:lI99|H3892BC
-3892BC:lI97|H3893CC
-3893CC:lI115|H3894DC
-3894DC:lI101|H3895E4
-3895E4:lI47|H3896DC
-3896DC:lI111|H3897D4
-3897D4:lI116|H3898CC
-3898CC:lI112|H3899C4
-3899C4:lI47|H389AA4
-389AA4:lI101|H389B7C
-389B7C:lI114|H389C44
-389C44:lI116|H389D0C
-389D0C:lI115|H389DD4
-389DD4:lI47|H389E8C
-389E8C:lI108|H389F3C
-389F3C:lI105|H389FDC
-389FDC:lI98|H38A06C
-38A06C:lI47|H38A0EC
-38A0EC:lI99|H38A15C
-38A15C:lI111|H38A1CC
-38A1CC:lI115|H38A234
-38A234:lI80|H38A29C
-38A29C:lI114|H38A304
-38A304:lI111|H38A36C
-38A36C:lI112|H38A3D4
-38A3D4:lI101|H38A42C
-38A42C:lI114|H38A47C
-38A47C:lI116|H38A4CC
-38A4CC:lI121|H38A514
-38A514:lI47|H38A55C
-38A55C:lI101|H38A5A4
-38A5A4:lI98|H38A5EC
-38A5EC:lI105|H38A634
-38A634:lI110|N
-38B0A8:lH388C5C|H38B0B0
-388C5C:lI47|H388D6C
-388D6C:lI99|H388E7C
-388E7C:lI108|H388F8C
-388F8C:lI101|H3890A4
-3890A4:lI97|H3891B4
-3891B4:lI114|H3892C4
-3892C4:lI99|H3893D4
-3893D4:lI97|H3894E4
-3894E4:lI115|H3895EC
-3895EC:lI101|H3896E4
-3896E4:lI47|H3897DC
-3897DC:lI111|H3898D4
-3898D4:lI116|H3899CC
-3899CC:lI112|H389AAC
-389AAC:lI47|H389B84
-389B84:lI101|H389C4C
-389C4C:lI114|H389D14
-389D14:lI116|H389DDC
-389DDC:lI115|H389E94
-389E94:lI47|H389F44
-389F44:lI108|H389FE4
-389FE4:lI105|H38A074
-38A074:lI98|H38A0F4
-38A0F4:lI47|H38A164
-38A164:lI99|H38A1D4
-38A1D4:lI111|H38A23C
-38A23C:lI115|H38A2A4
-38A2A4:lI78|H38A30C
-38A30C:lI111|H38A374
-38A374:lI116|H38A3DC
-38A3DC:lI105|H38A434
-38A434:lI102|H38A484
-38A484:lI105|H38A4D4
-38A4D4:lI99|H38A51C
-38A51C:lI97|H38A564
-38A564:lI116|H38A5AC
-38A5AC:lI105|H38A5F4
-38A5F4:lI111|H38A63C
-38A63C:lI110|H38A674
-38A674:lI47|H38A6AC
-38A6AC:lI101|H38A6D4
-38A6D4:lI98|H38A6EC
-38A6EC:lI105|H38A704
-38A704:lI110|N
-38B0B0:lH388D74|H38B0B8
-388D74:lI47|H388E84
-388E84:lI99|H388F94
-388F94:lI108|H3890AC
-3890AC:lI101|H3891BC
-3891BC:lI97|H3892CC
-3892CC:lI114|H3893DC
-3893DC:lI99|H3894EC
-3894EC:lI97|H3895F4
-3895F4:lI115|H3896EC
-3896EC:lI101|H3897E4
-3897E4:lI47|H3898DC
-3898DC:lI111|H3899D4
-3899D4:lI116|H389AB4
-389AB4:lI112|H389B8C
-389B8C:lI47|H389C54
-389C54:lI101|H389D1C
-389D1C:lI114|H389DE4
-389DE4:lI116|H389E9C
-389E9C:lI115|H389F4C
-389F4C:lI47|H389FEC
-389FEC:lI108|H38A07C
-38A07C:lI105|H38A0FC
-38A0FC:lI98|H38A16C
-38A16C:lI47|H38A1DC
-38A1DC:lI99|H38A244
-38A244:lI111|H38A2AC
-38A2AC:lI115|H38A314
-38A314:lI70|H38A37C
-38A37C:lI105|H38A3E4
-38A3E4:lI108|H38A43C
-38A43C:lI101|H38A48C
-38A48C:lI84|H38A4DC
-38A4DC:lI114|H38A524
-38A524:lI97|H38A56C
-38A56C:lI110|H38A5B4
-38A5B4:lI115|H38A5FC
-38A5FC:lI102|H38A644
-38A644:lI101|H38A67C
-38A67C:lI114|H38A6B4
-38A6B4:lI47|H38A6DC
-38A6DC:lI101|H38A6F4
-38A6F4:lI98|H38A70C
-38A70C:lI105|H38A71C
-38A71C:lI110|N
-38B0B8:lH388E8C|H38B0C0
-388E8C:lI47|H388F9C
-388F9C:lI99|H3890B4
-3890B4:lI108|H3891C4
-3891C4:lI101|H3892D4
-3892D4:lI97|H3893E4
-3893E4:lI114|H3894F4
-3894F4:lI99|H3895FC
-3895FC:lI97|H3896F4
-3896F4:lI115|H3897EC
-3897EC:lI101|H3898E4
-3898E4:lI47|H3899DC
-3899DC:lI111|H389ABC
-389ABC:lI116|H389B94
-389B94:lI112|H389C5C
-389C5C:lI47|H389D24
-389D24:lI101|H389DEC
-389DEC:lI114|H389EA4
-389EA4:lI116|H389F54
-389F54:lI115|H389FF4
-389FF4:lI47|H38A084
-38A084:lI108|H38A104
-38A104:lI105|H38A174
-38A174:lI98|H38A1E4
-38A1E4:lI47|H38A24C
-38A24C:lI99|H38A2B4
-38A2B4:lI111|H38A31C
-38A31C:lI115|H38A384
-38A384:lI69|H38A3EC
-38A3EC:lI118|H38A444
-38A444:lI101|H38A494
-38A494:lI110|H38A4E4
-38A4E4:lI116|H38A52C
-38A52C:lI68|H38A574
-38A574:lI111|H38A5BC
-38A5BC:lI109|H38A604
-38A604:lI97|H38A64C
-38A64C:lI105|H38A684
-38A684:lI110|H38A6BC
-38A6BC:lI47|H38A6E4
-38A6E4:lI101|H38A6FC
-38A6FC:lI98|H38A714
-38A714:lI105|H38A724
-38A724:lI110|N
-38B0C0:lH388FA4|H38B0C8
-388FA4:lI47|H3890BC
-3890BC:lI99|H3891CC
-3891CC:lI108|H3892DC
-3892DC:lI101|H3893EC
-3893EC:lI97|H3894FC
-3894FC:lI114|H389604
-389604:lI99|H3896FC
-3896FC:lI97|H3897F4
-3897F4:lI115|H3898EC
-3898EC:lI101|H3899E4
-3899E4:lI47|H389AC4
-389AC4:lI111|H389B9C
-389B9C:lI116|H389C64
-389C64:lI112|H389D2C
-389D2C:lI47|H389DF4
-389DF4:lI101|H389EAC
-389EAC:lI114|H389F5C
-389F5C:lI116|H389FFC
-389FFC:lI115|H38A08C
-38A08C:lI47|H38A10C
-38A10C:lI108|H38A17C
-38A17C:lI105|H38A1EC
-38A1EC:lI98|H38A254
-38A254:lI47|H38A2BC
-38A2BC:lI99|H38A324
-38A324:lI111|H38A38C
-38A38C:lI115|H38A3F4
-38A3F4:lI69|H38A44C
-38A44C:lI118|H38A49C
-38A49C:lI101|H38A4EC
-38A4EC:lI110|H38A534
-38A534:lI116|H38A57C
-38A57C:lI47|H38A5C4
-38A5C4:lI101|H38A60C
-38A60C:lI98|H38A654
-38A654:lI105|H38A68C
-38A68C:lI110|N
-38B0C8:lH3890C4|H38B0D0
-3890C4:lI47|H3891D4
-3891D4:lI99|H3892E4
-3892E4:lI108|H3893F4
-3893F4:lI101|H389504
-389504:lI97|H38960C
-38960C:lI114|H389704
-389704:lI99|H3897FC
-3897FC:lI97|H3898F4
-3898F4:lI115|H3899EC
-3899EC:lI101|H389ACC
-389ACC:lI47|H389BA4
-389BA4:lI111|H389C6C
-389C6C:lI116|H389D34
-389D34:lI112|H389DFC
-389DFC:lI47|H389EB4
-389EB4:lI101|H389F64
-389F64:lI114|H38A004
-38A004:lI116|H38A094
-38A094:lI115|H38A114
-38A114:lI47|H38A184
-38A184:lI108|H38A1F4
-38A1F4:lI105|H38A25C
-38A25C:lI98|H38A2C4
-38A2C4:lI47|H38A32C
-38A32C:lI99|H38A394
-38A394:lI111|H38A3FC
-38A3FC:lI109|H38A454
-38A454:lI112|H38A4A4
-38A4A4:lI105|H38A4F4
-38A4F4:lI108|H38A53C
-38A53C:lI101|H38A584
-38A584:lI114|H38A5CC
-38A5CC:lI47|H38A614
-38A614:lI101|H38A65C
-38A65C:lI98|H38A694
-38A694:lI105|H38A6C4
-38A6C4:lI110|N
-38B0D0:lH3891DC|H38B0D8
-3891DC:lI47|H3892EC
-3892EC:lI99|H3893FC
-3893FC:lI108|H38950C
-38950C:lI101|H389614
-389614:lI97|H38970C
-38970C:lI114|H389804
-389804:lI99|H3898FC
-3898FC:lI97|H3899F4
-3899F4:lI115|H389AD4
-389AD4:lI101|H389BAC
-389BAC:lI47|H389C74
-389C74:lI111|H389D3C
-389D3C:lI116|H389E04
-389E04:lI112|H389EBC
-389EBC:lI47|H389F6C
-389F6C:lI101|H38A00C
-38A00C:lI114|H38A09C
-38A09C:lI116|H38A11C
-38A11C:lI115|H38A18C
-38A18C:lI47|H38A1FC
-38A1FC:lI108|H38A264
-38A264:lI105|H38A2CC
-38A2CC:lI98|H38A334
-38A334:lI47|H38A39C
-38A39C:lI97|H38A404
-38A404:lI115|H38A45C
-38A45C:lI110|H38A4AC
-38A4AC:lI49|H38A4FC
-38A4FC:lI47|H38A544
-38A544:lI101|H38A58C
-38A58C:lI98|H38A5D4
-38A5D4:lI105|H38A61C
-38A61C:lI110|N
-38B0D8:lH3892F4|H38B0E0
-3892F4:lI47|H389404
-389404:lI99|H389514
-389514:lI108|H38961C
-38961C:lI101|H389714
-389714:lI97|H38980C
-38980C:lI114|H389904
-389904:lI99|H3899FC
-3899FC:lI97|H389ADC
-389ADC:lI115|H389BB4
-389BB4:lI101|H389C7C
-389C7C:lI47|H389D44
-389D44:lI111|H389E0C
-389E0C:lI116|H389EC4
-389EC4:lI112|H389F74
-389F74:lI47|H38A014
-38A014:lI101|H38A0A4
-38A0A4:lI114|H38A124
-38A124:lI116|H38A194
-38A194:lI115|H38A204
-38A204:lI47|H38A26C
-38A26C:lI108|H38A2D4
-38A2D4:lI105|H38A33C
-38A33C:lI98|H38A3A4
-38A3A4:lI47|H38A40C
-38A40C:lI97|H38A464
-38A464:lI112|H38A4B4
-38A4B4:lI112|H38A504
-38A504:lI109|H38A54C
-38A54C:lI111|H38A594
-38A594:lI110|H38A5DC
-38A5DC:lI47|H38A624
-38A624:lI101|H38A664
-38A664:lI98|H38A69C
-38A69C:lI105|H38A6CC
-38A6CC:lI110|N
-38B0E0:lH38AA88|H38B0E8
-38AA88:lI47|H38AA90
-38AA90:lI104|H38AA98
-38AA98:lI111|H38AAA0
-38AAA0:lI109|H38AAA8
-38AAA8:lI101|H38AAB0
-38AAB0:lI47|H38AAB8
-38AAB8:lI115|H38AAC0
-38AAC0:lI105|H38AAC8
-38AAC8:lI114|H38AAD0
-38AAD0:lI105|H38AAD8
-38AAD8:lI47|H38AAE0
-38AAE0:lI101|H38AAE8
-38AAE8:lI114|H38AAF0
-38AAF0:lI108|H38AAF8
-38AAF8:lI97|H38AB00
-38AB00:lI110|H38AB08
-38AB08:lI103|N
-38B0E8:lH38AB1C|H38B0F0
-38AB1C:lI47|H38AB2C
-38AB2C:lI104|H38AB4C
-38AB4C:lI111|H38AB74
-38AB74:lI109|H38ABA4
-38ABA4:lI101|H38ABC4
-38ABC4:lI47|H38ABE4
-38ABE4:lI115|H38AC04
-38AC04:lI105|H38AC24
-38AC24:lI114|H38AC3C
-38AC3C:lI105|H38AC44
-38AC44:lI47|H38AC4C
-38AC4C:lI116|H38AC54
-38AC54:lI111|H38AC5C
-38AC5C:lI111|H38AC64
-38AC64:lI108|H38AC6C
-38AC6C:lI115|H38AC74
-38AC74:lI47|H38AC7C
-38AC7C:lI100|H38AC84
-38AC84:lI105|H38AC8C
-38AC8C:lI115|H38AC94
-38AC94:lI116|H38AC9C
-38AC9C:lI101|H38ACA4
-38ACA4:lI108|H38ACAC
-38ACAC:lI47|H38ACB4
-38ACB4:lI101|H38ACBC
-38ACBC:lI98|H38ACC4
-38ACC4:lI105|H38ACCC
-38ACCC:lI110|N
-38B0F0:lH38B0F8|N
-38B0F8:lI47|H38B100
-38B100:lI104|H38B108
-38B108:lI111|H38B110
-38B110:lI109|H38B118
-38B118:lI101|H38B120
-38B120:lI47|H38B128
-38B128:lI115|H38B130
-38B130:lI105|H38B138
-38B138:lI114|H38B140
-38B140:lI105|H38B148
-38B148:lI47|H38B150
-38B150:lI79|H38B158
-38B158:lI84|H38B160
-38B160:lI80|H38B168
-38B168:lI47|H38B170
-38B170:lI103|H38B178
-38B178:lI112|H38B180
-38B180:lI114|H38B188
-38B188:lI115|H38B190
-38B190:lI95|H38B198
-38B198:lI116|H38B1A0
-38B1A0:lI114|H38B1A8
-38B1A8:lI97|H38B1B0
-38B1B0:lI99|H38B1B8
-38B1B8:lI101|H38B1C0
-38B1C0:lI47|H38B1C8
-38B1C8:lI106|H38B1D0
-38B1D0:lI97|H38B1D8
-38B1D8:lI110|N
-3873BC:lI47|H3873CC
-3873CC:lI99|H3873E4
-3873E4:lI108|H3873FC
-3873FC:lI101|H38741C
-38741C:lI97|H387444
-387444:lI114|H387474
-387474:lI99|H3874AC
-3874AC:lI97|H3874EC
-3874EC:lI115|H387534
-387534:lI101|H387584
-387584:lI47|H3875DC
-3875DC:lI111|H38763C
-38763C:lI116|H3876A4
-3876A4:lI112|H387714
-387714:lI47|H38778C
-38778C:lI101|H38780C
-38780C:lI114|H387894
-387894:lI116|H387924
-387924:lI115|N
-=proc_dictionary:<0.19.0>
-H370244
-H370250
-=proc_stack:<0.19.0>
-36b45c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36B17C
-y4:P<0.19.0>
-y5:P<0.9.0>
-36b478:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37025C
-=proc_heap:<0.19.0>
-36B17C:t5:A5:state,A8:user_sup,P<0.21.0>,P<0.21.0>,H370238
-370238:t2:P<0.19.0>,A8:user_sup
-37025C:lAA:gen_server|H37027C
-37027C:lP<0.9.0>|H37028C
-37028C:lP<0.9.0>|H370294
-370294:lA11:supervisor_bridge|H37029C
-37029C:lH3702A4|H3702AC
-3702A4:lA8:user_sup|H3702B4
-3702B4:lN|H3702BC
-3702BC:lA4:self|N
-3702AC:lN|N
-370244:t2:AD:$initial_call,H370264
-370264:t3:A3:gen,A7:init_it,H37025C
-370250:t2:AA:$ancestors,H370274
-370274:lAA:kernel_sup|H370284
-370284:lP<0.8.0>|N
-=proc_dictionary:<0.20.0>
-H36F8A8
-=proc_stack:<0.20.0>
-36a714:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:H36F8C4
-y3:P<0.21.0>
-y4:P<0.22.0>
-y5:p<0.72>
-y6:p<0.72>
-=proc_heap:<0.20.0>
-36F8C4:t4:I3,I2,P<0.22.0>,H36F8F0
-36F8F0:lH36F900|H36F910
-36F900:t3:I1,P<0.21.0>,H36F920
-36F920:t0:
-36F910:lH36F924|N
-36F924:t3:I2,P<0.22.0>,H36F93C
-36F93C:t3:A5:shell,A5:start,N
-36F8A8:t2:A3:eof,A5:false
-=proc_dictionary:<0.21.0>
-H3709DC
-H3709D0
-H3709F8
-=proc_stack:<0.21.0>
-370d1c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:A9:undefined
-y2:P<0.20.0>
-=proc_heap:<0.21.0>
-3709DC:t2:AB:line_buffer,N
-3709D0:t2:AB:kill_buffer,N
-3709F8:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.22.0>
-H370D44
-H370D60
-H370D7C
-H370D38
-=proc_stack:<0.22.0>
-374a88:SReturn addr 0x2CE718 (group:get_chars_loop/7 + 80)
-y0:N
-y1:N
-y2:A8:infinity
-y3:H374A00
-y4:P<0.20.0>
-y5:H374A28
-374aa4:SReturn addr 0x2CDC18 (group:io_request/5 + 48)
-y0:H37499C
-y1:A6:io_lib
-y2:A9:get_until
-y3:H3748B8
-y4:P<0.20.0>
-y5:A5:start
-374ac0:SReturn addr 0x2CDB2C (group:server_loop/3 + 372)
-y0:P<0.49.0>
-y1:P<0.22.0>
-374acc:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:P<0.25.0>
-y2:P<0.20.0>
-=proc_heap:<0.22.0>
-374A00:t4:A4:line,H37499C,H3749A4,A4:none
-3749A4:t2:N,N
-37499C:lI50|H374994
-374994:lI62|H37498C
-37498C:lI32|N
-374A28:t4:A5:stack,H370D58,H374A24,N
-374A24:t0:
-370D58:lH370D74|N
-370D74:lI99|H370D88
-370D88:lI114|H370D90
-370D90:lI97|H370D98
-370D98:lI115|H370DA0
-370DA0:lI104|H370DA8
-370DA8:lI100|H370DB0
-370DB0:lI117|H370DB8
-370DB8:lI109|H370DC0
-370DC0:lI112|H370DC8
-370DC8:lI95|H370DD0
-370DD0:lI118|H370DD8
-370DD8:lI105|H370DE0
-370DE0:lI101|H370DE8
-370DE8:lI119|H370DF0
-370DF0:lI101|H370DF8
-370DF8:lI114|H370E00
-370E00:lI58|H370E08
-370E08:lI115|H370E10
-370E10:lI116|H370E18
-370E18:lI97|H370E20
-370E20:lI114|H370E28
-370E28:lI116|H370E30
-370E30:lI40|H370E38
-370E38:lI41|H370E40
-370E40:lI46|H370E48
-370E48:lI10|N
-3748B8:t3:A8:erl_scan,A6:tokens,H3748B0
-3748B0:lI1|N
-370D44:t2:AB:line_buffer,H370D58
-370D60:t2:A5:shell,P<0.25.0>
-370D7C:t2:AB:kill_buffer,N
-370D38:t2:A9:read_mode,A4:list
-=proc_dictionary:<0.23.0>
-H376464
-H376448
-=proc_stack:<0.23.0>
-376754:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:kernel_config
-y3:N
-y4:P<0.23.0>
-y5:P<0.9.0>
-376770:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H376418
-=proc_heap:<0.23.0>
-376418:lAA:gen_server|H376410
-376410:lP<0.9.0>|H376408
-376408:lP<0.9.0>|H376400
-376400:lAD:kernel_config|H3763F8
-3763F8:lN|H3763F0
-3763F0:lN|N
-376464:t2:AD:$initial_call,H376454
-376454:t3:A3:gen,A7:init_it,H376418
-376448:t2:AA:$ancestors,H376440
-376440:lAA:kernel_sup|H376420
-376420:lP<0.8.0>|N
-=proc_dictionary:<0.24.0>
-H3705E0
-H3705EC
-=proc_stack:<0.24.0>
-36f38c:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F018
-y4:AF:kernel_safe_sup
-y5:P<0.9.0>
-36f3a8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H37063C
-=proc_heap:<0.24.0>
-36F018:tA:A5:state,H370644,AB:one_for_one,H36F044,N,I4,I3600,N,A6:kernel,A4:safe
-36F044:lH36F04C|N
-36F04C:t8:A5:child,P<0.31.0>,A17:inet_gethost_native_sup,H370650,A9:temporary,I1000,A6:worker,H370660
-370660:lA13:inet_gethost_native|N
-370650:t3:A13:inet_gethost_native,AA:start_link,N
-370644:t2:A5:local,AF:kernel_safe_sup
-37063C:lAA:gen_server|H3706AC
-3706AC:lP<0.9.0>|H3706BC
-3706BC:lP<0.9.0>|H3706C4
-3706C4:lH3706CC|H3706D8
-3706CC:t2:A5:local,AF:kernel_safe_sup
-3706D8:lAA:supervisor|H3706E0
-3706E0:lH3706E8|H3706F8
-3706E8:t3:H370644,A6:kernel,A4:safe
-3706F8:lN|N
-3705E0:t2:AD:$initial_call,H370668
-370668:t3:A3:gen,A7:init_it,H37063C
-3705EC:t2:AA:$ancestors,H370678
-370678:lAA:kernel_sup|H3706B4
-3706B4:lP<0.8.0>|N
-=proc_dictionary:<0.25.0>
-H36E304
-H36E31C
-=proc_stack:<0.25.0>
-36e610:SReturn addr 0x2E06FC (shell:server_loop/6 + 140)
-y0:N
-y1:N
-y2:P<0.27.0>
-y3:P<0.49.0>
-36e624:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:I2
-y3:I1
-y4:N
-y5:N
-y6:N
-y7:I20
-y8:I20
-=proc_heap:<0.25.0>
-36E304:t2:H36E2F8,H36E2A8
-36E2A8:lH36E2B0|N
-36E2B0:t4:A4:call,I1,H36E2C4,N
-36E2C4:t4:A6:remote,I1,H36E2D8,H36E2E8
-36E2E8:t3:A4:atom,I1,A5:start
-36E2D8:t3:A4:atom,I1,A10:crashdump_viewer
-36E2F8:t2:A7:command,I1
-36E31C:t2:H36E310,A2:ok
-36E310:t2:A6:result,I1
-=proc_stack:<0.27.0>
-3bda3c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:N
-y1:N
-y2:P<0.25.0>
-=proc_heap:<0.27.0>
-=proc_dictionary:<0.31.0>
-H36DA24
-H36DA08
-=proc_stack:<0.31.0>
-36dcd4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A11:supervisor_bridge
-y3:H36DB68
-y4:A17:inet_gethost_native_sup
-y5:P<0.24.0>
-36dcf0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36D9D0
-=proc_heap:<0.31.0>
-36DB68:t5:A5:state,A13:inet_gethost_native,P<0.32.0>,P<0.32.0>,H36D994
-36D994:t2:A5:local,A17:inet_gethost_native_sup
-36D9D0:lAA:gen_server|H36D9C8
-36D9C8:lP<0.24.0>|H36D9C0
-36D9C0:lP<0.24.0>|H36D970
-36D970:lH36D980|H36D9B8
-36D980:t2:A5:local,A17:inet_gethost_native_sup
-36D9B8:lA11:supervisor_bridge|H36D978
-36D978:lH36D9A8|H36D9B0
-36D9A8:lA13:inet_gethost_native|H36D9A0
-36D9A0:lN|H36D98C
-36D98C:lH36D994|N
-36D9B0:lN|N
-36DA24:t2:AD:$initial_call,H36DA14
-36DA14:t3:A3:gen,A7:init_it,H36D9D0
-36DA08:t2:AA:$ancestors,H36DA00
-36DA00:lAF:kernel_safe_sup|H36D9E0
-36D9E0:lAA:kernel_sup|H36D9D8
-36D9D8:lP<0.8.0>|N
-=proc_dictionary:<0.32.0>
-H36CFD4
-H36D0BC
-=proc_stack:<0.32.0>
-36d12c:SReturn addr 0x156F90 (<terminate process normally>)
-y0:H36CF18
-=proc_heap:<0.32.0>
-36CF18:t8:A5:state,p<0.105>,I8000,I11,I12,P<0.31.0>,I4,H36CEF0
-36CEF0:t9:AA:statistics,I0,I0,I0,I0,I0,I0,I0,I0
-36CFD4:t2:A3:rid,I1
-36D0BC:t2:AC:num_requests,I0
-=proc_dictionary:<0.33.0>
-H3905C4
-H3905D0
-=proc_stack:<0.33.0>
-3ceee4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A7:webtool
-y3:H3C8570
-y4:A8:web_tool
-y5:P<0.33.0>
-3cef00:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3905FC
-=proc_heap:<0.33.0>
-3C8570:t6:A5:state,H3905EC,I13,P<0.41.0>,H3905F4,H3C85D4
-3C85D4:lA10:crashdump_viewer|N
-3905F4:lH390650|H39065C
-390650:t2:A4:port,I8888
-39065C:lH3906C8|H3906D4
-3906C8:t2:AC:bind_address,H390760
-390760:t4:I127,I0,I0,I1
-3906D4:lH390774|H390780
-390774:t2:AB:server_name,H39082C
-39082C:lI108|H390908
-390908:lI111|H3909DC
-3909DC:lI99|H390AC0
-390AC0:lI97|H390B98
-390B98:lI108|H390C78
-390C78:lI104|H390D58
-390D58:lI111|H390E2C
-390E2C:lI115|H390F10
-390F10:lI116|N
-390780:lH390834|H390840
-390834:t2:AE:max_header_siz,I1024
-390840:lH390910|H39091C
-390910:t2:A11:max_header_action,A8:reply414
-39091C:lH3909E4|H3909F0
-3909E4:t2:A8:com_type,A7:ip_comm
-3909F0:lH390AC8|H390AD4
-390AC8:t2:A7:modules,H390BA0
-390BA0:lA9:mod_alias|H390C80
-390C80:lA8:mod_auth|H390D60
-390D60:lA7:mod_esi|H390E34
-390E34:lAB:mod_actions|H390F18
-390F18:lA7:mod_cgi|H390FF4
-390FF4:lAB:mod_include|H3910D8
-3910D8:lA7:mod_dir|H3911B4
-3911B4:lA7:mod_get|H3912A0
-3912A0:lA8:mod_head|H39139C
-39139C:lA7:mod_log|H3914A0
-3914A0:lAC:mod_disk_log|N
-390AD4:lH390BA8|H390BB4
-390BA8:t2:AF:directory_index,H390C88
-390C88:lH390D68|N
-390D68:lI105|H390E3C
-390E3C:lI110|H390F20
-390F20:lI100|H390FFC
-390FFC:lI101|H3910E0
-3910E0:lI120|H3911BC
-3911BC:lI46|H3912A8
-3912A8:lI104|H3913A4
-3913A4:lI116|H3914A8
-3914A8:lI109|H39159C
-39159C:lI108|N
-390BB4:lH390C90|N
-390C90:t2:AC:default_type,H390D70
-390D70:lI116|H390E44
-390E44:lI101|H390F28
-390F28:lI120|H391004
-391004:lI116|H3910E8
-3910E8:lI47|H3911C4
-3911C4:lI112|H3912B0
-3912B0:lI108|H3913AC
-3913AC:lI97|H3914B0
-3914B0:lI105|H3915A4
-3915A4:lI110|N
-3905EC:lI47|H390648
-390648:lI99|H3906C0
-3906C0:lI108|H390758
-390758:lI101|H390824
-390824:lI97|H390900
-390900:lI114|H3909D4
-3909D4:lI99|H390AB8
-390AB8:lI97|H390B90
-390B90:lI115|H390C70
-390C70:lI101|H390D50
-390D50:lI47|H390E24
-390E24:lI111|H390F08
-390F08:lI116|H390FEC
-390FEC:lI112|H3910D0
-3910D0:lI47|H3911AC
-3911AC:lI101|H391298
-391298:lI114|H391394
-391394:lI116|H391498
-391498:lI115|H391594
-391594:lI47|H391680
-391680:lI108|H39175C
-39175C:lI105|H391840
-391840:lI98|H391924
-391924:lI47|H3919F8
-3919F8:lI119|H391AC4
-391AC4:lI101|H391B90
-391B90:lI98|H391C54
-391C54:lI116|H391D18
-391D18:lI111|H391DD4
-391DD4:lI111|H391E90
-391E90:lI108|H391F5C
-391F5C:lI47|H392030
-392030:lI112|H3920EC
-3920EC:lI114|H3921A8
-3921A8:lI105|H392264
-392264:lI118|N
-3905FC:lAA:gen_server|H390664
-390664:lP<0.27.0>|H3906DC
-3906DC:lA4:self|H390788
-390788:lH390848|H390854
-390848:t2:A5:local,A8:web_tool
-390854:lA7:webtool|H390924
-390924:lH3909F8|H390A04
-3909F8:t2:H3905EC,H3905F4
-390A04:lN|N
-3905C4:t2:AD:$initial_call,H390614
-390614:t3:A3:gen,A7:init_it,H3905FC
-3905D0:t2:AA:$ancestors,H390624
-390624:lP<0.27.0>|N
-=proc_dictionary:<0.41.0>
-H36DF0C
-H36DF18
-=proc_stack:<0.41.0>
-36eda4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36EA3C
-y4:A6:websup
-y5:P<0.33.0>
-36edc0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36DF24
-=proc_heap:<0.41.0>
-36EA3C:tA:A5:state,H36DF2C,AB:one_for_one,H36EA68,N,I100,I10,N,AB:webtool_sup,N
-36EA68:lH36EA70|N
-36EA70:t8:A5:child,P<0.48.0>,H36DF38,H36DF44,A9:permanent,I100,A6:worker,H36DF54
-36DF54:lA10:crashdump_viewer|N
-36DF44:t3:A10:crashdump_viewer,AA:start_link,N
-36DF38:t2:A5:local,A17:crashdump_viewer_server
-36DF2C:t2:A5:local,A6:websup
-36DF24:lAA:gen_server|H36DF84
-36DF84:lP<0.33.0>|H36DF94
-36DF94:lP<0.33.0>|H36DF9C
-36DF9C:lH36DFA4|H36DFB0
-36DFA4:t2:A5:local,A6:websup
-36DFB0:lAA:supervisor|H36DFB8
-36DFB8:lH36DFC0|H36DFD0
-36DFC0:t3:H36DF2C,AB:webtool_sup,N
-36DFD0:lN|N
-36DF0C:t2:AD:$initial_call,H36DF6C
-36DF6C:t3:A3:gen,A7:init_it,H36DF24
-36DF18:t2:AA:$ancestors,H36DF7C
-36DF7C:lA8:web_tool|H36DF8C
-36DF8C:lP<0.27.0>|N
-=proc_dictionary:<0.43.0>
-H39D940
-H39D94C
-=proc_stack:<0.43.0>
-3a42ac:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H3A3E34
-y4:A1A:httpd_sup__127_0_0_1__8888
-y5:P<0.33.0>
-3a42c8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H39D9CC
-=proc_heap:<0.43.0>
-3A3E34:tA:A5:state,H39D960,AB:one_for_one,H3A3E20,N,I0,I1,N,A9:httpd_sup,H39DA88
-39DA88:lA9:undefined|H39DB18
-39DB18:lH39DB50|H39DB58
-39DB50:lH39DB88|H39DB94
-39DB88:t2:AB:server_root,H39DBD0
-39DBD0:lI47|H39DC0C
-39DC0C:lI99|H39DC50
-39DC50:lI108|H39DC84
-39DC84:lI101|H39DCC4
-39DCC4:lI97|H39DD28
-39DD28:lI114|H39DD90
-39DD90:lI99|H39DE00
-39DE00:lI97|H39DE78
-39DE78:lI115|H39DF00
-39DF00:lI101|H39DF90
-39DF90:lI47|H39E038
-39E038:lI111|H39E0E8
-39E0E8:lI116|H39E1AC
-39E1AC:lI112|H39E288
-39E288:lI47|H39E37C
-39E37C:lI101|H39E478
-39E478:lI114|H39E580
-39E580:lI116|H39E69C
-39E69C:lI115|H39E7B0
-39E7B0:lI47|H39E8C4
-39E8C4:lI108|H39E9D8
-39E9D8:lI105|H39EACC
-39EACC:lI98|H39EBC0
-39EBC0:lI47|H39ECB4
-39ECB4:lI119|H39EDA8
-39EDA8:lI101|H39EE7C
-39EE7C:lI98|H39EF50
-39EF50:lI116|H39F02C
-39F02C:lI111|H39F110
-39F110:lI111|H39F1E4
-39F1E4:lI108|H39F2B0
-39F2B0:lI47|H39F36C
-39F36C:lI112|H39F430
-39F430:lI114|H39F4FC
-39F4FC:lI105|H39F5C0
-39F5C0:lI118|H39F694
-39F694:lI47|H39F768
-39F768:lI114|H39F83C
-39F83C:lI111|H39F920
-39F920:lI111|H39F9FC
-39F9FC:lI116|N
-39DB94:lH39DBD8|H39DBE4
-39DBD8:t2:AD:document_root,H39DC14
-39DC14:lI47|H39DC58
-39DC58:lI99|H39DC8C
-39DC8C:lI108|H39DCCC
-39DCCC:lI101|H39DD30
-39DD30:lI97|H39DD98
-39DD98:lI114|H39DE08
-39DE08:lI99|H39DE80
-39DE80:lI97|H39DF08
-39DF08:lI115|H39DF98
-39DF98:lI101|H39E040
-39E040:lI47|H39E0F0
-39E0F0:lI111|H39E1B4
-39E1B4:lI116|H39E290
-39E290:lI112|H39E384
-39E384:lI47|H39E480
-39E480:lI101|H39E588
-39E588:lI114|H39E6A4
-39E6A4:lI116|H39E7B8
-39E7B8:lI115|H39E8CC
-39E8CC:lI47|H39E9E0
-39E9E0:lI108|H39EAD4
-39EAD4:lI105|H39EBC8
-39EBC8:lI98|H39ECBC
-39ECBC:lI47|H39EDB0
-39EDB0:lI119|H39EE84
-39EE84:lI101|H39EF58
-39EF58:lI98|H39F034
-39F034:lI116|H39F118
-39F118:lI111|H39F1EC
-39F1EC:lI111|H39F2B8
-39F2B8:lI108|H39F374
-39F374:lI47|H39F438
-39F438:lI112|H39F504
-39F504:lI114|H39F5C8
-39F5C8:lI105|H39F69C
-39F69C:lI118|H39F770
-39F770:lI47|H39F844
-39F844:lI114|H39F928
-39F928:lI111|H39FA04
-39FA04:lI111|H39FAD8
-39FAD8:lI116|H39FBB4
-39FBB4:lI47|H39FC80
-39FC80:lI100|H39FD44
-39FD44:lI111|H39FE10
-39FE10:lI99|N
-39DBE4:lH39DC1C|H39DC28
-39DC1C:t2:AA:mime_types,H39DC60
-39DC60:lH39DC94|H39DCA0
-39DC94:t2:H39DCD4,H39DCDC
-39DCDC:lI120|H39DD40
-39DD40:lI45|H39DDA8
-39DDA8:lI119|H39DE10
-39DE10:lI111|H39DE88
-39DE88:lI114|H39DF10
-39DF10:lI108|H39DFA0
-39DFA0:lI100|H39E048
-39E048:lI47|H39E0F8
-39E0F8:lI120|H39E1BC
-39E1BC:lI45|H39E298
-39E298:lI118|H39E38C
-39E38C:lI114|H39E488
-39E488:lI109|H39E590
-39E590:lI108|N
-39DCD4:lI119|H39DD38
-39DD38:lI114|H39DDA0
-39DDA0:lI108|N
-39DCA0:lH39DCE4|H39DCF0
-39DCE4:t2:H39DD48,H39DD50
-39DD50:lI120|H39DDB8
-39DDB8:lI45|H39DE20
-39DE20:lI119|H39DE98
-39DE98:lI111|H39DF18
-39DF18:lI114|H39DFA8
-39DFA8:lI108|H39E050
-39E050:lI100|H39E100
-39E100:lI47|H39E1C4
-39E1C4:lI120|H39E2A0
-39E2A0:lI45|H39E394
-39E394:lI118|H39E490
-39E490:lI114|H39E598
-39E598:lI109|H39E6AC
-39E6AC:lI108|N
-39DD48:lI118|H39DDB0
-39DDB0:lI114|H39DE18
-39DE18:lI109|H39DE90
-39DE90:lI108|N
-39DCF0:lH39DD58|H39DD64
-39DD58:t2:H39DDC0,H39DDC8
-39DDC8:lI120|H39DE30
-39DE30:lI45|H39DEA8
-39DEA8:lI99|H39DF20
-39DF20:lI111|H39DFB0
-39DFB0:lI110|H39E058
-39E058:lI102|H39E108
-39E108:lI101|H39E1CC
-39E1CC:lI114|H39E2A8
-39E2A8:lI101|H39E39C
-39E39C:lI110|H39E498
-39E498:lI99|H39E5A0
-39E5A0:lI101|H39E6B4
-39E6B4:lI47|H39E7C0
-39E7C0:lI120|H39E8D4
-39E8D4:lI45|H39E9E8
-39E9E8:lI99|H39EADC
-39EADC:lI111|H39EBD0
-39EBD0:lI111|H39ECC4
-39ECC4:lI108|H39EDB8
-39EDB8:lI116|H39EE8C
-39EE8C:lI97|H39EF60
-39EF60:lI108|H39F03C
-39F03C:lI107|N
-39DDC0:lI105|H39DE28
-39DE28:lI99|H39DEA0
-39DEA0:lI101|N
-39DD64:lH39DDD0|H39DDDC
-39DDD0:t2:H39DE38,H39DE40
-39DE40:lI118|H39DEB8
-39DEB8:lI105|H39DF30
-39DF30:lI100|H39DFC0
-39DFC0:lI101|H39E068
-39E068:lI111|H39E110
-39E110:lI47|H39E1D4
-39E1D4:lI120|H39E2B0
-39E2B0:lI45|H39E3A4
-39E3A4:lI115|H39E4A0
-39E4A0:lI103|H39E5A8
-39E5A8:lI105|H39E6BC
-39E6BC:lI45|H39E7C8
-39E7C8:lI109|H39E8DC
-39E8DC:lI111|H39E9F0
-39E9F0:lI118|H39EAE4
-39EAE4:lI105|H39EBD8
-39EBD8:lI101|N
-39DE38:lI109|H39DEB0
-39DEB0:lI111|H39DF28
-39DF28:lI118|H39DFB8
-39DFB8:lI105|H39E060
-39E060:lI101|N
-39DDDC:lH39DE48|H39DE54
-39DE48:t2:H39DEC0,H39DEC8
-39DEC8:lI118|H39DF40
-39DF40:lI105|H39DFD0
-39DFD0:lI100|H39E070
-39E070:lI101|H39E118
-39E118:lI111|H39E1DC
-39E1DC:lI47|H39E2B8
-39E2B8:lI120|H39E3AC
-39E3AC:lI45|H39E4A8
-39E4A8:lI109|H39E5B0
-39E5B0:lI115|H39E6C4
-39E6C4:lI118|H39E7D0
-39E7D0:lI105|H39E8E4
-39E8E4:lI100|H39E9F8
-39E9F8:lI101|H39EAEC
-39EAEC:lI111|N
-39DEC0:lI97|H39DF38
-39DF38:lI118|H39DFC8
-39DFC8:lI105|N
-39DE54:lH39DED0|H39DEDC
-39DED0:t2:H39DF48,H39DF50
-39DF50:lI118|H39DFE0
-39DFE0:lI105|H39E078
-39E078:lI100|H39E120
-39E120:lI101|H39E1E4
-39E1E4:lI111|H39E2C0
-39E2C0:lI47|H39E3B4
-39E3B4:lI113|H39E4B0
-39E4B0:lI117|H39E5B8
-39E5B8:lI105|H39E6CC
-39E6CC:lI99|H39E7D8
-39E7D8:lI107|H39E8EC
-39E8EC:lI116|H39EA00
-39EA00:lI105|H39EAF4
-39EAF4:lI109|H39EBE0
-39EBE0:lI101|N
-39DF48:lI113|H39DFD8
-39DFD8:lI116|N
-39DEDC:lH39DF58|H39DF64
-39DF58:t2:H39DFE8,H39DFF0
-39DFF0:lI118|H39E088
-39E088:lI105|H39E130
-39E130:lI100|H39E1EC
-39E1EC:lI101|H39E2C8
-39E2C8:lI111|H39E3BC
-39E3BC:lI47|H39E4B8
-39E4B8:lI113|H39E5C0
-39E5C0:lI117|H39E6D4
-39E6D4:lI105|H39E7E0
-39E7E0:lI99|H39E8F4
-39E8F4:lI107|H39EA08
-39EA08:lI116|H39EAFC
-39EAFC:lI105|H39EBE8
-39EBE8:lI109|H39ECCC
-39ECCC:lI101|N
-39DFE8:lI109|H39E080
-39E080:lI111|H39E128
-39E128:lI118|N
-39DF64:lH39DFF8|H39E004
-39DFF8:t2:H39E090,H39E098
-39E098:lI118|H39E140
-39E140:lI105|H39E1FC
-39E1FC:lI100|H39E2D8
-39E2D8:lI101|H39E3C4
-39E3C4:lI111|H39E4C0
-39E4C0:lI47|H39E5C8
-39E5C8:lI109|H39E6DC
-39E6DC:lI112|H39E7E8
-39E7E8:lI101|H39E8FC
-39E8FC:lI103|N
-39E090:lI109|H39E138
-39E138:lI112|H39E1F4
-39E1F4:lI101|H39E2D0
-39E2D0:lI103|N
-39E004:lH39E0A0|H39E0AC
-39E0A0:t2:H39E148,H39E150
-39E150:lI118|H39E20C
-39E20C:lI105|H39E2E8
-39E2E8:lI100|H39E3CC
-39E3CC:lI101|H39E4C8
-39E4C8:lI111|H39E5D0
-39E5D0:lI47|H39E6E4
-39E6E4:lI109|H39E7F0
-39E7F0:lI112|H39E904
-39E904:lI101|H39EA10
-39EA10:lI103|N
-39E148:lI109|H39E204
-39E204:lI112|H39E2E0
-39E2E0:lI103|N
-39E0AC:lH39E158|H39E164
-39E158:t2:H39E214,H39E21C
-39E21C:lI118|H39E2F8
-39E2F8:lI105|H39E3DC
-39E3DC:lI100|H39E4D0
-39E4D0:lI101|H39E5D8
-39E5D8:lI111|H39E6EC
-39E6EC:lI47|H39E7F8
-39E7F8:lI109|H39E90C
-39E90C:lI112|H39EA18
-39EA18:lI101|H39EB04
-39EB04:lI103|N
-39E214:lI109|H39E2F0
-39E2F0:lI112|H39E3D4
-39E3D4:lI101|N
-39E164:lH39E224|H39E230
-39E224:t2:H39E300,H39E308
-39E308:lI116|H39E3EC
-39E3EC:lI101|H39E4E0
-39E4E0:lI120|H39E5E8
-39E5E8:lI116|H39E6F4
-39E6F4:lI47|H39E800
-39E800:lI120|H39E914
-39E914:lI45|H39EA20
-39EA20:lI115|H39EB0C
-39EB0C:lI103|H39EBF0
-39EBF0:lI109|H39ECD4
-39ECD4:lI108|N
-39E300:lI115|H39E3E4
-39E3E4:lI103|H39E4D8
-39E4D8:lI109|H39E5E0
-39E5E0:lI108|N
-39E230:lH39E310|H39E31C
-39E310:t2:H39E3F4,H39E3FC
-39E3FC:lI116|H39E4F0
-39E4F0:lI101|H39E5F8
-39E5F8:lI120|H39E6FC
-39E6FC:lI116|H39E808
-39E808:lI47|H39E91C
-39E91C:lI120|H39EA28
-39EA28:lI45|H39EB14
-39EB14:lI115|H39EBF8
-39EBF8:lI103|H39ECDC
-39ECDC:lI109|H39EDC0
-39EDC0:lI108|N
-39E3F4:lI115|H39E4E8
-39E4E8:lI103|H39E5F0
-39E5F0:lI109|N
-39E31C:lH39E404|H39E410
-39E404:t2:H39E4F8,H39E500
-39E500:lI116|H39E608
-39E608:lI101|H39E70C
-39E70C:lI120|H39E810
-39E810:lI116|H39E924
-39E924:lI47|H39EA30
-39EA30:lI120|H39EB1C
-39EB1C:lI45|H39EC00
-39EC00:lI115|H39ECE4
-39ECE4:lI101|H39EDC8
-39EDC8:lI116|H39EE94
-39EE94:lI101|H39EF68
-39EF68:lI120|H39F044
-39F044:lI116|N
-39E4F8:lI101|H39E600
-39E600:lI116|H39E704
-39E704:lI120|N
-39E410:lH39E508|H39E514
-39E508:t2:H39E610,H39E618
-39E618:lI116|H39E71C
-39E71C:lI101|H39E820
-39E820:lI120|H39E92C
-39E92C:lI116|H39EA38
-39EA38:lI47|H39EB24
-39EB24:lI116|H39EC08
-39EC08:lI97|H39ECEC
-39ECEC:lI98|H39EDD0
-39EDD0:lI45|H39EE9C
-39EE9C:lI115|H39EF70
-39EF70:lI101|H39F04C
-39F04C:lI112|H39F120
-39F120:lI97|H39F1F4
-39F1F4:lI114|H39F2C0
-39F2C0:lI97|H39F37C
-39F37C:lI116|H39F440
-39F440:lI101|H39F50C
-39F50C:lI100|H39F5D0
-39F5D0:lI45|H39F6A4
-39F6A4:lI118|H39F778
-39F778:lI97|H39F84C
-39F84C:lI108|H39F930
-39F930:lI117|H39FA0C
-39FA0C:lI101|H39FAE0
-39FAE0:lI115|N
-39E610:lI116|H39E714
-39E714:lI115|H39E818
-39E818:lI118|N
-39E514:lH39E620|H39E62C
-39E620:t2:H39E724,H39E72C
-39E72C:lI116|H39E830
-39E830:lI101|H39E93C
-39E93C:lI120|H39EA40
-39EA40:lI116|H39EB2C
-39EB2C:lI47|H39EC10
-39EC10:lI114|H39ECF4
-39ECF4:lI105|H39EDD8
-39EDD8:lI99|H39EEA4
-39EEA4:lI104|H39EF78
-39EF78:lI116|H39F054
-39F054:lI101|H39F128
-39F128:lI120|H39F1FC
-39F1FC:lI116|N
-39E724:lI114|H39E828
-39E828:lI116|H39E934
-39E934:lI120|N
-39E62C:lH39E734|H39E740
-39E734:t2:H39E838,H39E840
-39E840:lI116|H39E94C
-39E94C:lI101|H39EA50
-39EA50:lI120|H39EB34
-39EB34:lI116|H39EC18
-39EC18:lI47|H39ECFC
-39ECFC:lI112|H39EDE0
-39EDE0:lI108|H39EEAC
-39EEAC:lI97|H39EF80
-39EF80:lI105|H39F05C
-39F05C:lI110|N
-39E838:lI116|H39E944
-39E944:lI120|H39EA48
-39EA48:lI116|N
-39E740:lH39E848|H39E854
-39E848:t2:H39E954,H39E95C
-39E95C:lI116|H39EA60
-39EA60:lI101|H39EB44
-39EB44:lI120|H39EC28
-39EC28:lI116|H39ED0C
-39ED0C:lI47|H39EDE8
-39EDE8:lI120|H39EEB4
-39EEB4:lI45|H39EF88
-39EF88:lI115|H39F064
-39F064:lI101|H39F130
-39F130:lI114|H39F204
-39F204:lI118|H39F2C8
-39F2C8:lI101|H39F384
-39F384:lI114|H39F448
-39F448:lI45|H39F514
-39F514:lI112|H39F5D8
-39F5D8:lI97|H39F6AC
-39F6AC:lI114|H39F780
-39F780:lI115|H39F854
-39F854:lI101|H39F938
-39F938:lI100|H39FA14
-39FA14:lI45|H39FAE8
-39FAE8:lI104|H39FBBC
-39FBBC:lI116|H39FC88
-39FC88:lI109|H39FD4C
-39FD4C:lI108|N
-39E954:lI115|H39EA58
-39EA58:lI104|H39EB3C
-39EB3C:lI116|H39EC20
-39EC20:lI109|H39ED04
-39ED04:lI108|N
-39E854:lH39E964|H39E970
-39E964:t2:H39EA68,H39EA70
-39EA70:lI116|H39EB54
-39EB54:lI101|H39EC38
-39EC38:lI120|H39ED1C
-39ED1C:lI116|H39EDF0
-39EDF0:lI47|H39EEBC
-39EEBC:lI104|H39EF90
-39EF90:lI116|H39F06C
-39F06C:lI109|H39F138
-39F138:lI108|N
-39EA68:lI104|H39EB4C
-39EB4C:lI116|H39EC30
-39EC30:lI109|H39ED14
-39ED14:lI108|N
-39E970:lH39EA78|H39EA84
-39EA78:t2:H39EB5C,H39EB64
-39EB64:lI116|H39EC48
-39EC48:lI101|H39ED2C
-39ED2C:lI120|H39EDF8
-39EDF8:lI116|H39EEC4
-39EEC4:lI47|H39EF98
-39EF98:lI104|H39F074
-39F074:lI116|H39F140
-39F140:lI109|H39F20C
-39F20C:lI108|N
-39EB5C:lI104|H39EC40
-39EC40:lI116|H39ED24
-39ED24:lI109|N
-39EA84:lH39EB6C|H39EB78
-39EB6C:t2:H39EC50,H39EC58
-39EC58:lI105|H39ED3C
-39ED3C:lI109|H39EE08
-39EE08:lI97|H39EECC
-39EECC:lI103|H39EFA0
-39EFA0:lI101|H39F07C
-39F07C:lI47|H39F148
-39F148:lI120|H39F214
-39F214:lI45|H39F2D0
-39F2D0:lI120|H39F38C
-39F38C:lI119|H39F450
-39F450:lI105|H39F51C
-39F51C:lI110|H39F5E0
-39F5E0:lI100|H39F6B4
-39F6B4:lI111|H39F788
-39F788:lI119|H39F85C
-39F85C:lI100|H39F940
-39F940:lI117|H39FA1C
-39FA1C:lI109|H39FAF0
-39FAF0:lI112|N
-39EC50:lI120|H39ED34
-39ED34:lI119|H39EE00
-39EE00:lI100|N
-39EB78:lH39EC60|H39EC6C
-39EC60:t2:H39ED44,H39ED4C
-39ED4C:lI105|H39EE18
-39EE18:lI109|H39EEDC
-39EEDC:lI97|H39EFA8
-39EFA8:lI103|H39F084
-39F084:lI101|H39F150
-39F150:lI47|H39F21C
-39F21C:lI120|H39F2D8
-39F2D8:lI45|H39F394
-39F394:lI120|H39F458
-39F458:lI112|H39F524
-39F524:lI105|H39F5E8
-39F5E8:lI120|H39F6BC
-39F6BC:lI109|H39F790
-39F790:lI97|H39F864
-39F864:lI112|N
-39ED44:lI120|H39EE10
-39EE10:lI112|H39EED4
-39EED4:lI109|N
-39EC6C:lH39ED54|H39ED60
-39ED54:t2:H39EE20,H39EE28
-39EE28:lI105|H39EEEC
-39EEEC:lI109|H39EFB8
-39EFB8:lI97|H39F08C
-39F08C:lI103|H39F158
-39F158:lI101|H39F224
-39F224:lI47|H39F2E0
-39F2E0:lI120|H39F39C
-39F39C:lI45|H39F460
-39F460:lI120|H39F52C
-39F52C:lI98|H39F5F0
-39F5F0:lI105|H39F6C4
-39F6C4:lI116|H39F798
-39F798:lI109|H39F86C
-39F86C:lI97|H39F948
-39F948:lI112|N
-39EE20:lI120|H39EEE4
-39EEE4:lI98|H39EFB0
-39EFB0:lI109|N
-39ED60:lH39EE30|H39EE3C
-39EE30:t2:H39EEF4,H39EEFC
-39EEFC:lI105|H39EFC8
-39EFC8:lI109|H39F09C
-39F09C:lI97|H39F160
-39F160:lI103|H39F22C
-39F22C:lI101|H39F2E8
-39F2E8:lI47|H39F3A4
-39F3A4:lI120|H39F468
-39F468:lI45|H39F534
-39F534:lI114|H39F5F8
-39F5F8:lI103|H39F6CC
-39F6CC:lI98|N
-39EEF4:lI114|H39EFC0
-39EFC0:lI103|H39F094
-39F094:lI98|N
-39EE3C:lH39EF04|H39EF10
-39EF04:t2:H39EFD0,H39EFD8
-39EFD8:lI105|H39F0AC
-39F0AC:lI109|H39F170
-39F170:lI97|H39F234
-39F234:lI103|H39F2F0
-39F2F0:lI101|H39F3AC
-39F3AC:lI47|H39F470
-39F470:lI120|H39F53C
-39F53C:lI45|H39F600
-39F600:lI112|H39F6D4
-39F6D4:lI111|H39F7A0
-39F7A0:lI114|H39F874
-39F874:lI116|H39F950
-39F950:lI97|H39FA24
-39FA24:lI98|H39FAF8
-39FAF8:lI108|H39FBC4
-39FBC4:lI101|H39FC90
-39FC90:lI45|H39FD54
-39FD54:lI112|H39FE18
-39FE18:lI105|H39FECC
-39FECC:lI120|H39FF88
-39FF88:lI109|H3A003C
-3A003C:lI97|H3A00E8
-3A00E8:lI112|N
-39EFD0:lI112|H39F0A4
-39F0A4:lI112|H39F168
-39F168:lI109|N
-39EF10:lH39EFE0|H39EFEC
-39EFE0:t2:H39F0B4,H39F0BC
-39F0BC:lI105|H39F180
-39F180:lI109|H39F244
-39F244:lI97|H39F2F8
-39F2F8:lI103|H39F3B4
-39F3B4:lI101|H39F478
-39F478:lI47|H39F544
-39F544:lI120|H39F608
-39F608:lI45|H39F6DC
-39F6DC:lI112|H39F7A8
-39F7A8:lI111|H39F87C
-39F87C:lI114|H39F958
-39F958:lI116|H39FA2C
-39FA2C:lI97|H39FB00
-39FB00:lI98|H39FBCC
-39FBCC:lI108|H39FC98
-39FC98:lI101|H39FD5C
-39FD5C:lI45|H39FE20
-39FE20:lI103|H39FED4
-39FED4:lI114|H39FF90
-39FF90:lI97|H3A0044
-3A0044:lI121|H3A00F0
-3A00F0:lI109|H3A0194
-3A0194:lI97|H3A0248
-3A0248:lI112|N
-39F0B4:lI112|H39F178
-39F178:lI103|H39F23C
-39F23C:lI109|N
-39EFEC:lH39F0C4|H39F0D0
-39F0C4:t2:H39F188,H39F190
-39F190:lI105|H39F254
-39F254:lI109|H39F308
-39F308:lI97|H39F3BC
-39F3BC:lI103|H39F480
-39F480:lI101|H39F54C
-39F54C:lI47|H39F610
-39F610:lI120|H39F6E4
-39F6E4:lI45|H39F7B0
-39F7B0:lI112|H39F884
-39F884:lI111|H39F960
-39F960:lI114|H39FA34
-39FA34:lI116|H39FB08
-39FB08:lI97|H39FBD4
-39FBD4:lI98|H39FCA0
-39FCA0:lI108|H39FD64
-39FD64:lI101|H39FE28
-39FE28:lI45|H39FEDC
-39FEDC:lI98|H39FF98
-39FF98:lI105|H3A004C
-3A004C:lI116|H3A00F8
-3A00F8:lI109|H3A019C
-3A019C:lI97|H3A0250
-3A0250:lI112|N
-39F188:lI112|H39F24C
-39F24C:lI98|H39F300
-39F300:lI109|N
-39F0D0:lH39F198|H39F1A4
-39F198:t2:H39F25C,H39F264
-39F264:lI105|H39F318
-39F318:lI109|H39F3CC
-39F3CC:lI97|H39F488
-39F488:lI103|H39F554
-39F554:lI101|H39F618
-39F618:lI47|H39F6EC
-39F6EC:lI120|H39F7B8
-39F7B8:lI45|H39F88C
-39F88C:lI112|H39F968
-39F968:lI111|H39FA3C
-39FA3C:lI114|H39FB10
-39FB10:lI116|H39FBDC
-39FBDC:lI97|H39FCA8
-39FCA8:lI98|H39FD6C
-39FD6C:lI108|H39FE30
-39FE30:lI101|H39FEE4
-39FEE4:lI45|H39FFA0
-39FFA0:lI97|H3A0054
-3A0054:lI110|H3A0100
-3A0100:lI121|H3A01A4
-3A01A4:lI109|H3A0258
-3A0258:lI97|H3A0304
-3A0304:lI112|N
-39F25C:lI112|H39F310
-39F310:lI110|H39F3C4
-39F3C4:lI109|N
-39F1A4:lH39F26C|H39F278
-39F26C:t2:H39F320,H39F328
-39F328:lI105|H39F3DC
-39F3DC:lI109|H39F498
-39F498:lI97|H39F55C
-39F55C:lI103|H39F620
-39F620:lI101|H39F6F4
-39F6F4:lI47|H39F7C0
-39F7C0:lI120|H39F894
-39F894:lI45|H39F970
-39F970:lI99|H39FA44
-39FA44:lI109|H39FB18
-39FB18:lI117|H39FBE4
-39FBE4:lI45|H39FCB0
-39FCB0:lI114|H39FD74
-39FD74:lI97|H39FE38
-39FE38:lI115|H39FEEC
-39FEEC:lI116|H39FFA8
-39FFA8:lI101|H3A005C
-3A005C:lI114|N
-39F320:lI114|H39F3D4
-39F3D4:lI97|H39F490
-39F490:lI115|N
-39F278:lH39F330|H39F33C
-39F330:t2:H39F3E4,H39F3EC
-39F3EC:lI105|H39F4A8
-39F4A8:lI109|H39F56C
-39F56C:lI97|H39F630
-39F630:lI103|H39F6FC
-39F6FC:lI101|H39F7C8
-39F7C8:lI47|H39F89C
-39F89C:lI116|H39F978
-39F978:lI105|H39FA4C
-39FA4C:lI102|H39FB20
-39FB20:lI102|N
-39F3E4:lI116|H39F4A0
-39F4A0:lI105|H39F564
-39F564:lI102|H39F628
-39F628:lI102|N
-39F33C:lH39F3F4|H39F400
-39F3F4:t2:H39F4B0,H39F4B8
-39F4B8:lI105|H39F57C
-39F57C:lI109|H39F640
-39F640:lI97|H39F704
-39F704:lI103|H39F7D0
-39F7D0:lI101|H39F8A4
-39F8A4:lI47|H39F980
-39F980:lI116|H39FA54
-39FA54:lI105|H39FB28
-39FB28:lI102|H39FBEC
-39FBEC:lI102|N
-39F4B0:lI116|H39F574
-39F574:lI105|H39F638
-39F638:lI102|N
-39F400:lH39F4C0|H39F4CC
-39F4C0:t2:H39F584,H39F58C
-39F58C:lI105|H39F650
-39F650:lI109|H39F714
-39F714:lI97|H39F7D8
-39F7D8:lI103|H39F8AC
-39F8AC:lI101|H39F988
-39F988:lI47|H39FA5C
-39FA5C:lI112|H39FB30
-39FB30:lI110|H39FBF4
-39FBF4:lI103|N
-39F584:lI112|H39F648
-39F648:lI110|H39F70C
-39F70C:lI103|N
-39F4CC:lH39F594|H39F5A0
-39F594:t2:H39F658,H39F660
-39F660:lI105|H39F724
-39F724:lI109|H39F7E8
-39F7E8:lI97|H39F8BC
-39F8BC:lI103|H39F990
-39F990:lI101|H39FA64
-39FA64:lI47|H39FB38
-39FB38:lI106|H39FBFC
-39FBFC:lI112|H39FCB8
-39FCB8:lI101|H39FD7C
-39FD7C:lI103|N
-39F658:lI106|H39F71C
-39F71C:lI112|H39F7E0
-39F7E0:lI101|H39F8B4
-39F8B4:lI103|N
-39F5A0:lH39F668|H39F674
-39F668:t2:H39F72C,H39F734
-39F734:lI105|H39F7F8
-39F7F8:lI109|H39F8CC
-39F8CC:lI97|H39F998
-39F998:lI103|H39FA6C
-39FA6C:lI101|H39FB40
-39FB40:lI47|H39FC04
-39FC04:lI106|H39FCC0
-39FCC0:lI112|H39FD84
-39FD84:lI101|H39FE40
-39FE40:lI103|N
-39F72C:lI106|H39F7F0
-39F7F0:lI112|H39F8C4
-39F8C4:lI103|N
-39F674:lH39F73C|H39F748
-39F73C:t2:H39F800,H39F808
-39F808:lI105|H39F8DC
-39F8DC:lI109|H39F9A8
-39F9A8:lI97|H39FA74
-39FA74:lI103|H39FB48
-39FB48:lI101|H39FC0C
-39FC0C:lI47|H39FCC8
-39FCC8:lI106|H39FD8C
-39FD8C:lI112|H39FE48
-39FE48:lI101|H39FEF4
-39FEF4:lI103|N
-39F800:lI106|H39F8D4
-39F8D4:lI112|H39F9A0
-39F9A0:lI101|N
-39F748:lH39F810|H39F81C
-39F810:t2:H39F8E4,H39F8EC
-39F8EC:lI105|H39F9B8
-39F9B8:lI109|H39FA84
-39FA84:lI97|H39FB50
-39FB50:lI103|H39FC14
-39FC14:lI101|H39FCD0
-39FCD0:lI47|H39FD94
-39FD94:lI105|H39FE50
-39FE50:lI101|H39FEFC
-39FEFC:lI102|N
-39F8E4:lI105|H39F9B0
-39F9B0:lI101|H39FA7C
-39FA7C:lI102|N
-39F81C:lH39F8F4|H39F900
-39F8F4:t2:H39F9C0,H39F9C8
-39F9C8:lI105|H39FA94
-39FA94:lI109|H39FB60
-39FB60:lI97|H39FC1C
-39FC1C:lI103|H39FCD8
-39FCD8:lI101|H39FD9C
-39FD9C:lI47|H39FE58
-39FE58:lI103|H39FF04
-39FF04:lI105|H39FFB0
-39FFB0:lI102|N
-39F9C0:lI103|H39FA8C
-39FA8C:lI105|H39FB58
-39FB58:lI102|N
-39F900:lH39F9D0|H39F9DC
-39F9D0:t2:H39FA9C,H39FAA4
-39FAA4:lI99|H39FB70
-39FB70:lI104|H39FC2C
-39FC2C:lI101|H39FCE0
-39FCE0:lI109|H39FDA4
-39FDA4:lI105|H39FE60
-39FE60:lI99|H39FF0C
-39FF0C:lI97|H39FFB8
-39FFB8:lI108|H3A0064
-3A0064:lI47|H3A0108
-3A0108:lI120|H3A01AC
-3A01AC:lI45|H3A0260
-3A0260:lI112|H3A030C
-3A030C:lI100|H3A03B8
-3A03B8:lI98|N
-39FA9C:lI112|H39FB68
-39FB68:lI100|H39FC24
-39FC24:lI98|N
-39F9DC:lH39FAAC|H39FAB8
-39FAAC:t2:H39FB78,H39FB80
-39FB80:lI99|H39FC3C
-39FC3C:lI104|H39FCF0
-39FCF0:lI101|H39FDAC
-39FDAC:lI109|H39FE68
-39FE68:lI105|H39FF14
-39FF14:lI99|H39FFC0
-39FFC0:lI97|H3A006C
-3A006C:lI108|H3A0110
-3A0110:lI47|H3A01B4
-3A01B4:lI120|H3A0268
-3A0268:lI45|H3A0314
-3A0314:lI112|H3A03C0
-3A03C0:lI100|H3A0454
-3A0454:lI98|N
-39FB78:lI120|H39FC34
-39FC34:lI121|H39FCE8
-39FCE8:lI122|N
-39FAB8:lH39FB88|H39FB94
-39FB88:t2:H39FC44,H39FC4C
-39FC4C:lI97|H39FD00
-39FD00:lI117|H39FDBC
-39FDBC:lI100|H39FE70
-39FE70:lI105|H39FF1C
-39FF1C:lI111|H39FFC8
-39FFC8:lI47|H3A0074
-3A0074:lI120|H3A0118
-3A0118:lI45|H3A01BC
-3A01BC:lI119|H3A0270
-3A0270:lI97|H3A031C
-3A031C:lI118|N
-39FC44:lI119|H39FCF8
-39FCF8:lI97|H39FDB4
-39FDB4:lI118|N
-39FB94:lH39FC54|H39FC60
-39FC54:t2:H39FD08,H39FD10
-39FD10:lI97|H39FDCC
-39FDCC:lI117|H39FE78
-39FE78:lI100|H39FF24
-39FF24:lI105|H39FFD0
-39FFD0:lI111|H3A007C
-3A007C:lI47|H3A0120
-3A0120:lI120|H3A01C4
-3A01C4:lI45|H3A0278
-3A0278:lI114|H3A0324
-3A0324:lI101|H3A03C8
-3A03C8:lI97|H3A045C
-3A045C:lI108|H3A04F8
-3A04F8:lI97|H3A059C
-3A059C:lI117|H3A0648
-3A0648:lI100|H3A06F4
-3A06F4:lI105|H3A07A0
-3A07A0:lI111|N
-39FD08:lI114|H39FDC4
-39FDC4:lI97|N
-39FC60:lH39FD18|H39FD24
-39FD18:t2:H39FDD4,H39FDDC
-39FDDC:lI97|H39FE88
-39FE88:lI117|H39FF34
-39FF34:lI100|H39FFD8
-39FFD8:lI105|H3A0084
-3A0084:lI111|H3A0128
-3A0128:lI47|H3A01CC
-3A01CC:lI120|H3A0280
-3A0280:lI45|H3A032C
-3A032C:lI112|H3A03D0
-3A03D0:lI110|H3A0464
-3A0464:lI45|H3A0500
-3A0500:lI114|H3A05A4
-3A05A4:lI101|H3A0650
-3A0650:lI97|H3A06FC
-3A06FC:lI108|H3A07A8
-3A07A8:lI97|H3A0844
-3A0844:lI117|H3A08D0
-3A08D0:lI100|H3A0964
-3A0964:lI105|H3A09F8
-3A09F8:lI111|H3A0A94
-3A0A94:lI45|H3A0B40
-3A0B40:lI112|H3A0BEC
-3A0BEC:lI108|H3A0CA8
-3A0CA8:lI117|H3A0D64
-3A0D64:lI103|H3A0E18
-3A0E18:lI105|H3A0ECC
-3A0ECC:lI110|N
-39FDD4:lI114|H39FE80
-39FE80:lI112|H39FF2C
-39FF2C:lI109|N
-39FD24:lH39FDE4|H39FDF0
-39FDE4:t2:H39FE90,H39FE98
-39FE98:lI97|H39FF44
-39FF44:lI117|H39FFE8
-39FFE8:lI100|H3A008C
-3A008C:lI105|H3A0130
-3A0130:lI111|H3A01D4
-3A01D4:lI47|H3A0288
-3A0288:lI120|H3A0334
-3A0334:lI45|H3A03D8
-3A03D8:lI112|H3A046C
-3A046C:lI110|H3A0508
-3A0508:lI45|H3A05AC
-3A05AC:lI114|H3A0658
-3A0658:lI101|H3A0704
-3A0704:lI97|H3A07B0
-3A07B0:lI108|H3A084C
-3A084C:lI97|H3A08D8
-3A08D8:lI117|H3A096C
-3A096C:lI100|H3A0A00
-3A0A00:lI105|H3A0A9C
-3A0A9C:lI111|N
-39FE90:lI114|H39FF3C
-39FF3C:lI97|H39FFE0
-39FFE0:lI109|N
-39FDF0:lH39FEA0|H39FEAC
-39FEA0:t2:H39FF4C,H39FF54
-39FF54:lI97|H39FFF8
-39FFF8:lI117|H3A009C
-3A009C:lI100|H3A0138
-3A0138:lI105|H3A01DC
-3A01DC:lI111|H3A0290
-3A0290:lI47|H3A033C
-3A033C:lI120|H3A03E0
-3A03E0:lI45|H3A0474
-3A0474:lI97|H3A0510
-3A0510:lI105|H3A05B4
-3A05B4:lI102|H3A0660
-3A0660:lI102|N
-39FF4C:lI97|H39FFF0
-39FFF0:lI105|H3A0094
-3A0094:lI102|N
-39FEAC:lH39FF5C|H39FF68
-39FF5C:t2:H3A0000,H3A0008
-3A0008:lI97|H3A00AC
-3A00AC:lI117|H3A0148
-3A0148:lI100|H3A01EC
-3A01EC:lI105|H3A0298
-3A0298:lI111|H3A0344
-3A0344:lI47|H3A03E8
-3A03E8:lI120|H3A047C
-3A047C:lI45|H3A0518
-3A0518:lI97|H3A05BC
-3A05BC:lI105|H3A0668
-3A0668:lI102|H3A070C
-3A070C:lI102|N
-3A0000:lI97|H3A00A4
-3A00A4:lI105|H3A0140
-3A0140:lI102|H3A01E4
-3A01E4:lI102|N
-39FF68:lH3A0010|H3A001C
-3A0010:t2:H3A00B4,H3A00BC
-3A00BC:lI97|H3A0158
-3A0158:lI117|H3A01FC
-3A01FC:lI100|H3A02A8
-3A02A8:lI105|H3A034C
-3A034C:lI111|H3A03F0
-3A03F0:lI47|H3A0484
-3A0484:lI120|H3A0520
-3A0520:lI45|H3A05C4
-3A05C4:lI97|H3A0670
-3A0670:lI105|H3A0714
-3A0714:lI102|H3A07B8
-3A07B8:lI102|N
-3A00B4:lI97|H3A0150
-3A0150:lI105|H3A01F4
-3A01F4:lI102|H3A02A0
-3A02A0:lI99|N
-3A001C:lH3A00C4|H3A00D0
-3A00C4:t2:H3A0160,H3A0168
-3A0168:lI97|H3A020C
-3A020C:lI117|H3A02B8
-3A02B8:lI100|H3A035C
-3A035C:lI105|H3A03F8
-3A03F8:lI111|H3A048C
-3A048C:lI47|H3A0528
-3A0528:lI109|H3A05CC
-3A05CC:lI112|H3A0678
-3A0678:lI101|H3A071C
-3A071C:lI103|N
-3A0160:lI109|H3A0204
-3A0204:lI112|H3A02B0
-3A02B0:lI103|H3A0354
-3A0354:lI97|N
-3A00D0:lH3A0170|H3A017C
-3A0170:t2:H3A0214,H3A021C
-3A021C:lI97|H3A02C8
-3A02C8:lI117|H3A036C
-3A036C:lI100|H3A0400
-3A0400:lI105|H3A0494
-3A0494:lI111|H3A0530
-3A0530:lI47|H3A05D4
-3A05D4:lI109|H3A0680
-3A0680:lI112|H3A0724
-3A0724:lI101|H3A07C0
-3A07C0:lI103|N
-3A0214:lI109|H3A02C0
-3A02C0:lI112|H3A0364
-3A0364:lI50|N
-3A017C:lH3A0224|H3A0230
-3A0224:t2:H3A02D0,H3A02D8
-3A02D8:lI97|H3A037C
-3A037C:lI117|H3A0408
-3A0408:lI100|H3A049C
-3A049C:lI105|H3A0538
-3A0538:lI111|H3A05DC
-3A05DC:lI47|H3A0688
-3A0688:lI98|H3A072C
-3A072C:lI97|H3A07C8
-3A07C8:lI115|H3A0854
-3A0854:lI105|H3A08E0
-3A08E0:lI99|N
-3A02D0:lI97|H3A0374
-3A0374:lI117|N
-3A0230:lH3A02E0|H3A02EC
-3A02E0:t2:H3A0384,H3A038C
-3A038C:lI97|H3A0418
-3A0418:lI117|H3A04AC
-3A04AC:lI100|H3A0540
-3A0540:lI105|H3A05E4
-3A05E4:lI111|H3A0690
-3A0690:lI47|H3A0734
-3A0734:lI98|H3A07D0
-3A07D0:lI97|H3A085C
-3A085C:lI115|H3A08E8
-3A08E8:lI105|H3A0974
-3A0974:lI99|N
-3A0384:lI115|H3A0410
-3A0410:lI110|H3A04A4
-3A04A4:lI100|N
-3A02EC:lH3A0394|H3A03A0
-3A0394:t2:H3A0420,H3A0428
-3A0428:lI97|H3A04BC
-3A04BC:lI112|H3A0550
-3A0550:lI112|H3A05EC
-3A05EC:lI108|H3A0698
-3A0698:lI105|H3A073C
-3A073C:lI99|H3A07D8
-3A07D8:lI97|H3A0864
-3A0864:lI116|H3A08F0
-3A08F0:lI105|H3A097C
-3A097C:lI111|H3A0A08
-3A0A08:lI110|H3A0AA4
-3A0AA4:lI47|H3A0B48
-3A0B48:lI122|H3A0BF4
-3A0BF4:lI105|H3A0CB0
-3A0CB0:lI112|N
-3A0420:lI122|H3A04B4
-3A04B4:lI105|H3A0548
-3A0548:lI112|N
-3A03A0:lH3A0430|H3A043C
-3A0430:t2:H3A04C4,H3A04CC
-3A04CC:lI97|H3A0560
-3A0560:lI112|H3A05FC
-3A05FC:lI112|H3A06A0
-3A06A0:lI108|H3A0744
-3A0744:lI105|H3A07E0
-3A07E0:lI99|H3A086C
-3A086C:lI97|H3A08F8
-3A08F8:lI116|H3A0984
-3A0984:lI105|H3A0A10
-3A0A10:lI111|H3A0AAC
-3A0AAC:lI110|H3A0B50
-3A0B50:lI47|H3A0BFC
-3A0BFC:lI120|H3A0CB8
-3A0CB8:lI45|H3A0D6C
-3A0D6C:lI119|H3A0E20
-3A0E20:lI97|H3A0ED4
-3A0ED4:lI105|H3A0F90
-3A0F90:lI115|H3A105C
-3A105C:lI45|H3A1130
-3A1130:lI115|H3A1204
-3A1204:lI111|H3A12D0
-3A12D0:lI117|H3A13A4
-3A13A4:lI114|H3A1480
-3A1480:lI99|H3A1564
-3A1564:lI101|N
-3A04C4:lI115|H3A0558
-3A0558:lI114|H3A05F4
-3A05F4:lI99|N
-3A043C:lH3A04D4|H3A04E0
-3A04D4:t2:H3A0568,H3A0570
-3A0570:lI97|H3A060C
-3A060C:lI112|H3A06B0
-3A06B0:lI112|H3A0754
-3A0754:lI108|H3A07F0
-3A07F0:lI105|H3A0874
-3A0874:lI99|H3A0900
-3A0900:lI97|H3A098C
-3A098C:lI116|H3A0A18
-3A0A18:lI105|H3A0AB4
-3A0AB4:lI111|H3A0B58
-3A0B58:lI110|H3A0C04
-3A0C04:lI47|H3A0CC0
-3A0CC0:lI120|H3A0D74
-3A0D74:lI45|H3A0E28
-3A0E28:lI117|H3A0EDC
-3A0EDC:lI115|H3A0F98
-3A0F98:lI116|H3A1064
-3A1064:lI97|H3A1138
-3A1138:lI114|N
-3A0568:lI117|H3A0604
-3A0604:lI115|H3A06A8
-3A06A8:lI116|H3A074C
-3A074C:lI97|H3A07E8
-3A07E8:lI114|N
-3A04E0:lH3A0578|H3A0584
-3A0578:t2:H3A0614,H3A061C
-3A061C:lI97|H3A06C0
-3A06C0:lI112|H3A075C
-3A075C:lI112|H3A07F8
-3A07F8:lI108|H3A087C
-3A087C:lI105|H3A0908
-3A0908:lI99|H3A0994
-3A0994:lI97|H3A0A20
-3A0A20:lI116|H3A0ABC
-3A0ABC:lI105|H3A0B60
-3A0B60:lI111|H3A0C0C
-3A0C0C:lI110|H3A0CC8
-3A0CC8:lI47|H3A0D7C
-3A0D7C:lI120|H3A0E30
-3A0E30:lI45|H3A0EE4
-3A0EE4:lI116|H3A0FA0
-3A0FA0:lI114|H3A106C
-3A106C:lI111|H3A1140
-3A1140:lI102|H3A120C
-3A120C:lI102|H3A12D8
-3A12D8:lI45|H3A13AC
-3A13AC:lI109|H3A1488
-3A1488:lI115|N
-3A0614:lI109|H3A06B8
-3A06B8:lI115|N
-3A0584:lH3A0624|H3A0630
-3A0624:t2:H3A06C8,H3A06D0
-3A06D0:lI97|H3A076C
-3A076C:lI112|H3A0800
-3A0800:lI112|H3A0884
-3A0884:lI108|H3A0910
-3A0910:lI105|H3A099C
-3A099C:lI99|H3A0A28
-3A0A28:lI97|H3A0AC4
-3A0AC4:lI116|H3A0B68
-3A0B68:lI105|H3A0C14
-3A0C14:lI111|H3A0CD0
-3A0CD0:lI110|H3A0D84
-3A0D84:lI47|H3A0E38
-3A0E38:lI120|H3A0EEC
-3A0EEC:lI45|H3A0FA8
-3A0FA8:lI116|H3A1074
-3A1074:lI114|H3A1148
-3A1148:lI111|H3A1214
-3A1214:lI102|H3A12E0
-3A12E0:lI102|H3A13B4
-3A13B4:lI45|H3A1490
-3A1490:lI109|H3A156C
-3A156C:lI101|N
-3A06C8:lI109|H3A0764
-3A0764:lI101|N
-3A0630:lH3A06D8|H3A06E4
-3A06D8:t2:H3A0774,H3A077C
-3A077C:lI97|H3A0810
-3A0810:lI112|H3A0894
-3A0894:lI112|H3A0918
-3A0918:lI108|H3A09A4
-3A09A4:lI105|H3A0A30
-3A0A30:lI99|H3A0ACC
-3A0ACC:lI97|H3A0B70
-3A0B70:lI116|H3A0C1C
-3A0C1C:lI105|H3A0CD8
-3A0CD8:lI111|H3A0D8C
-3A0D8C:lI110|H3A0E40
-3A0E40:lI47|H3A0EF4
-3A0EF4:lI120|H3A0FB0
-3A0FB0:lI45|H3A107C
-3A107C:lI116|H3A1150
-3A1150:lI114|H3A121C
-3A121C:lI111|H3A12E8
-3A12E8:lI102|H3A13BC
-3A13BC:lI102|H3A1498
-3A1498:lI45|H3A1574
-3A1574:lI109|H3A1648
-3A1648:lI97|H3A171C
-3A171C:lI110|N
-3A0774:lI109|H3A0808
-3A0808:lI97|H3A088C
-3A088C:lI110|N
-3A06E4:lH3A0784|H3A0790
-3A0784:t2:H3A0818,H3A0820
-3A0820:lI97|H3A089C
-3A089C:lI112|H3A0920
-3A0920:lI112|H3A09AC
-3A09AC:lI108|H3A0A38
-3A0A38:lI105|H3A0AD4
-3A0AD4:lI99|H3A0B78
-3A0B78:lI97|H3A0C24
-3A0C24:lI116|H3A0CE0
-3A0CE0:lI105|H3A0D94
-3A0D94:lI111|H3A0E48
-3A0E48:lI110|H3A0EFC
-3A0EFC:lI47|H3A0FB8
-3A0FB8:lI120|H3A1084
-3A1084:lI45|H3A1158
-3A1158:lI116|H3A1224
-3A1224:lI114|H3A12F0
-3A12F0:lI111|H3A13C4
-3A13C4:lI102|H3A14A0
-3A14A0:lI102|N
-3A0818:lI116|N
-3A0790:lH3A0828|H3A0834
-3A0828:t2:H3A08A4,H3A08AC
-3A08AC:lI97|H3A0930
-3A0930:lI112|H3A09B4
-3A09B4:lI112|H3A0A40
-3A0A40:lI108|H3A0ADC
-3A0ADC:lI105|H3A0B80
-3A0B80:lI99|H3A0C2C
-3A0C2C:lI97|H3A0CE8
-3A0CE8:lI116|H3A0D9C
-3A0D9C:lI105|H3A0E50
-3A0E50:lI111|H3A0F04
-3A0F04:lI110|H3A0FC0
-3A0FC0:lI47|H3A108C
-3A108C:lI120|H3A1160
-3A1160:lI45|H3A122C
-3A122C:lI116|H3A12F8
-3A12F8:lI114|H3A13CC
-3A13CC:lI111|H3A14A8
-3A14A8:lI102|H3A157C
-3A157C:lI102|N
-3A08A4:lI116|H3A0928
-3A0928:lI114|N
-3A0834:lH3A08B4|H3A08C0
-3A08B4:t2:H3A0938,H3A0940
-3A0940:lI97|H3A09C4
-3A09C4:lI112|H3A0A50
-3A0A50:lI112|H3A0AEC
-3A0AEC:lI108|H3A0B88
-3A0B88:lI105|H3A0C34
-3A0C34:lI99|H3A0CF0
-3A0CF0:lI97|H3A0DA4
-3A0DA4:lI116|H3A0E58
-3A0E58:lI105|H3A0F0C
-3A0F0C:lI111|H3A0FC8
-3A0FC8:lI110|H3A1094
-3A1094:lI47|H3A1168
-3A1168:lI120|H3A1234
-3A1234:lI45|H3A1300
-3A1300:lI116|H3A13D4
-3A13D4:lI114|H3A14B0
-3A14B0:lI111|H3A1584
-3A1584:lI102|H3A1650
-3A1650:lI102|N
-3A0938:lI114|H3A09BC
-3A09BC:lI111|H3A0A48
-3A0A48:lI102|H3A0AE4
-3A0AE4:lI102|N
-3A08C0:lH3A0948|H3A0954
-3A0948:t2:H3A09CC,H3A09D4
-3A09D4:lI97|H3A0A60
-3A0A60:lI112|H3A0AFC
-3A0AFC:lI112|H3A0B98
-3A0B98:lI108|H3A0C44
-3A0C44:lI105|H3A0D00
-3A0D00:lI99|H3A0DB4
-3A0DB4:lI97|H3A0E60
-3A0E60:lI116|H3A0F14
-3A0F14:lI105|H3A0FD0
-3A0FD0:lI111|H3A109C
-3A109C:lI110|H3A1170
-3A1170:lI47|H3A123C
-3A123C:lI120|H3A1308
-3A1308:lI45|H3A13DC
-3A13DC:lI116|H3A14B8
-3A14B8:lI101|H3A158C
-3A158C:lI120|H3A1658
-3A1658:lI105|H3A1724
-3A1724:lI110|H3A17E8
-3A17E8:lI102|H3A18AC
-3A18AC:lI111|N
-3A09CC:lI116|H3A0A58
-3A0A58:lI101|H3A0AF4
-3A0AF4:lI120|H3A0B90
-3A0B90:lI105|H3A0C3C
-3A0C3C:lI110|H3A0CF8
-3A0CF8:lI102|H3A0DAC
-3A0DAC:lI111|N
-3A0954:lH3A09DC|H3A09E8
-3A09DC:t2:H3A0A68,H3A0A70
-3A0A70:lI97|H3A0B0C
-3A0B0C:lI112|H3A0BA8
-3A0BA8:lI112|H3A0C54
-3A0C54:lI108|H3A0D08
-3A0D08:lI105|H3A0DBC
-3A0DBC:lI99|H3A0E68
-3A0E68:lI97|H3A0F1C
-3A0F1C:lI116|H3A0FD8
-3A0FD8:lI105|H3A10A4
-3A10A4:lI111|H3A1178
-3A1178:lI110|H3A1244
-3A1244:lI47|H3A1310
-3A1310:lI120|H3A13E4
-3A13E4:lI45|H3A14C0
-3A14C0:lI116|H3A1594
-3A1594:lI101|H3A1660
-3A1660:lI120|H3A172C
-3A172C:lI105|H3A17F0
-3A17F0:lI110|H3A18B4
-3A18B4:lI102|H3A1970
-3A1970:lI111|N
-3A0A68:lI116|H3A0B04
-3A0B04:lI101|H3A0BA0
-3A0BA0:lI120|H3A0C4C
-3A0C4C:lI105|N
-3A09E8:lH3A0A78|H3A0A84
-3A0A78:t2:H3A0B14,H3A0B1C
-3A0B1C:lI97|H3A0BB8
-3A0BB8:lI112|H3A0C64
-3A0C64:lI112|H3A0D10
-3A0D10:lI108|H3A0DC4
-3A0DC4:lI105|H3A0E70
-3A0E70:lI99|H3A0F24
-3A0F24:lI97|H3A0FE0
-3A0FE0:lI116|H3A10AC
-3A10AC:lI105|H3A1180
-3A1180:lI111|H3A124C
-3A124C:lI110|H3A1318
-3A1318:lI47|H3A13EC
-3A13EC:lI120|H3A14C8
-3A14C8:lI45|H3A159C
-3A159C:lI116|H3A1668
-3A1668:lI101|H3A1734
-3A1734:lI120|N
-3A0B14:lI116|H3A0BB0
-3A0BB0:lI101|H3A0C5C
-3A0C5C:lI120|N
-3A0A84:lH3A0B24|H3A0B30
-3A0B24:t2:H3A0BC0,H3A0BC8
-3A0BC8:lI97|H3A0C74
-3A0C74:lI112|H3A0D20
-3A0D20:lI112|H3A0DCC
-3A0DCC:lI108|H3A0E78
-3A0E78:lI105|H3A0F2C
-3A0F2C:lI99|H3A0FE8
-3A0FE8:lI97|H3A10B4
-3A10B4:lI116|H3A1188
-3A1188:lI105|H3A1254
-3A1254:lI111|H3A1320
-3A1320:lI110|H3A13F4
-3A13F4:lI47|H3A14D0
-3A14D0:lI120|H3A15A4
-3A15A4:lI45|H3A1670
-3A1670:lI116|H3A173C
-3A173C:lI99|H3A17F8
-3A17F8:lI108|N
-3A0BC0:lI116|H3A0C6C
-3A0C6C:lI99|H3A0D18
-3A0D18:lI108|N
-3A0B30:lH3A0BD0|H3A0BDC
-3A0BD0:t2:H3A0C7C,H3A0C84
-3A0C84:lI97|H3A0D30
-3A0D30:lI112|H3A0DDC
-3A0DDC:lI112|H3A0E80
-3A0E80:lI108|H3A0F34
-3A0F34:lI105|H3A0FF0
-3A0FF0:lI99|H3A10BC
-3A10BC:lI97|H3A1190
-3A1190:lI116|H3A125C
-3A125C:lI105|H3A1328
-3A1328:lI111|H3A13FC
-3A13FC:lI110|H3A14D8
-3A14D8:lI47|H3A15AC
-3A15AC:lI120|H3A1678
-3A1678:lI45|H3A1744
-3A1744:lI116|H3A1800
-3A1800:lI97|H3A18BC
-3A18BC:lI114|N
-3A0C7C:lI116|H3A0D28
-3A0D28:lI97|H3A0DD4
-3A0DD4:lI114|N
-3A0BDC:lH3A0C8C|H3A0C98
-3A0C8C:t2:H3A0D38,H3A0D40
-3A0D40:lI97|H3A0DEC
-3A0DEC:lI112|H3A0E90
-3A0E90:lI112|H3A0F44
-3A0F44:lI108|H3A1000
-3A1000:lI105|H3A10CC
-3A10CC:lI99|H3A1198
-3A1198:lI97|H3A1264
-3A1264:lI116|H3A1330
-3A1330:lI105|H3A1404
-3A1404:lI111|H3A14E0
-3A14E0:lI110|H3A15B4
-3A15B4:lI47|H3A1680
-3A1680:lI120|H3A174C
-3A174C:lI45|H3A1808
-3A1808:lI115|H3A18C4
-3A18C4:lI118|H3A1978
-3A1978:lI52|H3A1A2C
-3A1A2C:lI99|H3A1AE0
-3A1AE0:lI114|H3A1BA4
-3A1BA4:lI99|N
-3A0D38:lI115|H3A0DE4
-3A0DE4:lI118|H3A0E88
-3A0E88:lI52|H3A0F3C
-3A0F3C:lI99|H3A0FF8
-3A0FF8:lI114|H3A10C4
-3A10C4:lI99|N
-3A0C98:lH3A0D48|H3A0D54
-3A0D48:t2:H3A0DF4,H3A0DFC
-3A0DFC:lI97|H3A0EA0
-3A0EA0:lI112|H3A0F54
-3A0F54:lI112|H3A1010
-3A1010:lI108|H3A10DC
-3A10DC:lI105|H3A11A8
-3A11A8:lI99|H3A1274
-3A1274:lI97|H3A1338
-3A1338:lI116|H3A140C
-3A140C:lI105|H3A14E8
-3A14E8:lI111|H3A15BC
-3A15BC:lI110|H3A1688
-3A1688:lI47|H3A1754
-3A1754:lI120|H3A1810
-3A1810:lI45|H3A18CC
-3A18CC:lI115|H3A1980
-3A1980:lI118|H3A1A34
-3A1A34:lI52|H3A1AE8
-3A1AE8:lI99|H3A1BAC
-3A1BAC:lI112|H3A1C78
-3A1C78:lI105|H3A1D3C
-3A1D3C:lI111|N
-3A0DF4:lI115|H3A0E98
-3A0E98:lI118|H3A0F4C
-3A0F4C:lI52|H3A1008
-3A1008:lI99|H3A10D4
-3A10D4:lI112|H3A11A0
-3A11A0:lI105|H3A126C
-3A126C:lI111|N
-3A0D54:lH3A0E04|H3A0E10
-3A0E04:t2:H3A0EA8,H3A0EB0
-3A0EB0:lI97|H3A0F64
-3A0F64:lI112|H3A1020
-3A1020:lI112|H3A10E4
-3A10E4:lI108|H3A11B0
-3A11B0:lI105|H3A127C
-3A127C:lI99|H3A1340
-3A1340:lI97|H3A1414
-3A1414:lI116|H3A14F0
-3A14F0:lI105|H3A15C4
-3A15C4:lI111|H3A1690
-3A1690:lI110|H3A175C
-3A175C:lI47|H3A1818
-3A1818:lI120|H3A18D4
-3A18D4:lI45|H3A1988
-3A1988:lI115|H3A1A3C
-3A1A3C:lI116|H3A1AF0
-3A1AF0:lI117|H3A1BB4
-3A1BB4:lI102|H3A1C80
-3A1C80:lI102|H3A1D44
-3A1D44:lI105|H3A1E00
-3A1E00:lI116|N
-3A0EA8:lI115|H3A0F5C
-3A0F5C:lI105|H3A1018
-3A1018:lI116|N
-3A0E10:lH3A0EB8|H3A0EC4
-3A0EB8:t2:H3A0F6C,H3A0F74
-3A0F74:lI97|H3A1030
-3A1030:lI112|H3A10F4
-3A10F4:lI112|H3A11C0
-3A11C0:lI108|H3A1284
-3A1284:lI105|H3A1348
-3A1348:lI99|H3A141C
-3A141C:lI97|H3A14F8
-3A14F8:lI116|H3A15CC
-3A15CC:lI105|H3A1698
-3A1698:lI111|H3A1764
-3A1764:lI110|H3A1820
-3A1820:lI47|H3A18DC
-3A18DC:lI120|H3A1990
-3A1990:lI45|H3A1A44
-3A1A44:lI115|H3A1AF8
-3A1AF8:lI104|H3A1BBC
-3A1BBC:lI97|H3A1C88
-3A1C88:lI114|N
-3A0F6C:lI115|H3A1028
-3A1028:lI104|H3A10EC
-3A10EC:lI97|H3A11B8
-3A11B8:lI114|N
-3A0EC4:lH3A0F7C|H3A0F88
-3A0F7C:t2:H3A1038,H3A1040
-3A1040:lI97|H3A1104
-3A1104:lI112|H3A11C8
-3A11C8:lI112|H3A128C
-3A128C:lI108|H3A1350
-3A1350:lI105|H3A1424
-3A1424:lI99|H3A1500
-3A1500:lI97|H3A15D4
-3A15D4:lI116|H3A16A0
-3A16A0:lI105|H3A176C
-3A176C:lI111|H3A1828
-3A1828:lI110|H3A18E4
-3A18E4:lI47|H3A1998
-3A1998:lI120|H3A1A4C
-3A1A4C:lI45|H3A1B00
-3A1B00:lI115|H3A1BC4
-3A1BC4:lI104|N
-3A1038:lI115|H3A10FC
-3A10FC:lI104|N
-3A0F88:lH3A1048|H3A1054
-3A1048:t2:H3A110C,H3A1114
-3A1114:lI97|H3A11D8
-3A11D8:lI112|H3A1294
-3A1294:lI112|H3A1358
-3A1358:lI108|H3A142C
-3A142C:lI105|H3A1508
-3A1508:lI99|H3A15DC
-3A15DC:lI97|H3A16A8
-3A16A8:lI116|H3A1774
-3A1774:lI105|H3A1830
-3A1830:lI111|H3A18EC
-3A18EC:lI110|H3A19A0
-3A19A0:lI47|H3A1A54
-3A1A54:lI120|H3A1B08
-3A1B08:lI45|H3A1BCC
-3A1BCC:lI110|H3A1C90
-3A1C90:lI101|H3A1D4C
-3A1D4C:lI116|H3A1E08
-3A1E08:lI99|H3A1EC4
-3A1EC4:lI100|H3A1F88
-3A1F88:lI102|N
-3A110C:lI110|H3A11D0
-3A11D0:lI99|N
-3A1054:lH3A111C|H3A1128
-3A111C:t2:H3A11E0,H3A11E8
-3A11E8:lI97|H3A12A4
-3A12A4:lI112|H3A1368
-3A1368:lI112|H3A1434
-3A1434:lI108|H3A1510
-3A1510:lI105|H3A15E4
-3A15E4:lI99|H3A16B0
-3A16B0:lI97|H3A177C
-3A177C:lI116|H3A1838
-3A1838:lI105|H3A18F4
-3A18F4:lI111|H3A19A8
-3A19A8:lI110|H3A1A5C
-3A1A5C:lI47|H3A1B10
-3A1B10:lI120|H3A1BD4
-3A1BD4:lI45|H3A1C98
-3A1C98:lI110|H3A1D54
-3A1D54:lI101|H3A1E10
-3A1E10:lI116|H3A1ECC
-3A1ECC:lI99|H3A1F90
-3A1F90:lI100|H3A2044
-3A2044:lI102|N
-3A11E0:lI99|H3A129C
-3A129C:lI100|H3A1360
-3A1360:lI102|N
-3A1128:lH3A11F0|H3A11FC
-3A11F0:t2:H3A12AC,H3A12B4
-3A12B4:lI97|H3A1378
-3A1378:lI112|H3A1444
-3A1444:lI112|H3A1518
-3A1518:lI108|H3A15EC
-3A15EC:lI105|H3A16B8
-3A16B8:lI99|H3A1784
-3A1784:lI97|H3A1840
-3A1840:lI116|H3A18FC
-3A18FC:lI105|H3A19B0
-3A19B0:lI111|H3A1A64
-3A1A64:lI110|H3A1B18
-3A1B18:lI47|H3A1BDC
-3A1BDC:lI120|H3A1CA0
-3A1CA0:lI45|H3A1D5C
-3A1D5C:lI109|H3A1E18
-3A1E18:lI105|H3A1ED4
-3A1ED4:lI102|N
-3A12AC:lI109|H3A1370
-3A1370:lI105|H3A143C
-3A143C:lI102|N
-3A11FC:lH3A12BC|H3A12C8
-3A12BC:t2:H3A1380,H3A1388
-3A1388:lI97|H3A1454
-3A1454:lI112|H3A1528
-3A1528:lI112|H3A15FC
-3A15FC:lI108|H3A16C8
-3A16C8:lI105|H3A178C
-3A178C:lI99|H3A1848
-3A1848:lI97|H3A1904
-3A1904:lI116|H3A19B8
-3A19B8:lI105|H3A1A6C
-3A1A6C:lI111|H3A1B20
-3A1B20:lI110|H3A1BE4
-3A1BE4:lI47|H3A1CA8
-3A1CA8:lI120|H3A1D64
-3A1D64:lI45|H3A1E20
-3A1E20:lI108|H3A1EDC
-3A1EDC:lI97|H3A1F98
-3A1F98:lI116|H3A204C
-3A204C:lI101|H3A2108
-3A2108:lI120|N
-3A1380:lI108|H3A144C
-3A144C:lI97|H3A1520
-3A1520:lI116|H3A15F4
-3A15F4:lI101|H3A16C0
-3A16C0:lI120|N
-3A12C8:lH3A1390|H3A139C
-3A1390:t2:H3A145C,H3A1464
-3A1464:lI97|H3A1538
-3A1538:lI112|H3A160C
-3A160C:lI112|H3A16D0
-3A16D0:lI108|H3A1794
-3A1794:lI105|H3A1850
-3A1850:lI99|H3A190C
-3A190C:lI97|H3A19C0
-3A19C0:lI116|H3A1A74
-3A1A74:lI105|H3A1B28
-3A1B28:lI111|H3A1BEC
-3A1BEC:lI110|H3A1CB0
-3A1CB0:lI47|H3A1D6C
-3A1D6C:lI120|H3A1E28
-3A1E28:lI45|H3A1EE4
-3A1EE4:lI107|H3A1FA0
-3A1FA0:lI111|H3A2054
-3A2054:lI97|H3A2110
-3A2110:lI110|N
-3A145C:lI115|H3A1530
-3A1530:lI107|H3A1604
-3A1604:lI112|N
-3A139C:lH3A146C|H3A1478
-3A146C:t2:H3A1540,H3A1548
-3A1548:lI97|H3A161C
-3A161C:lI112|H3A16E0
-3A16E0:lI112|H3A179C
-3A179C:lI108|H3A1858
-3A1858:lI105|H3A1914
-3A1914:lI99|H3A19C8
-3A19C8:lI97|H3A1A7C
-3A1A7C:lI116|H3A1B30
-3A1B30:lI105|H3A1BF4
-3A1BF4:lI111|H3A1CB8
-3A1CB8:lI110|H3A1D74
-3A1D74:lI47|H3A1E30
-3A1E30:lI120|H3A1EEC
-3A1EEC:lI45|H3A1FA8
-3A1FA8:lI107|H3A205C
-3A205C:lI111|H3A2118
-3A2118:lI97|H3A21CC
-3A21CC:lI110|N
-3A1540:lI115|H3A1614
-3A1614:lI107|H3A16D8
-3A16D8:lI100|N
-3A1478:lH3A1550|H3A155C
-3A1550:t2:H3A1624,H3A162C
-3A162C:lI97|H3A16F0
-3A16F0:lI112|H3A17AC
-3A17AC:lI112|H3A1860
-3A1860:lI108|H3A191C
-3A191C:lI105|H3A19D0
-3A19D0:lI99|H3A1A84
-3A1A84:lI97|H3A1B38
-3A1B38:lI116|H3A1BFC
-3A1BFC:lI105|H3A1CC0
-3A1CC0:lI111|H3A1D7C
-3A1D7C:lI110|H3A1E38
-3A1E38:lI47|H3A1EF4
-3A1EF4:lI120|H3A1FB0
-3A1FB0:lI45|H3A2064
-3A2064:lI107|H3A2120
-3A2120:lI111|H3A21D4
-3A21D4:lI97|H3A2288
-3A2288:lI110|N
-3A1624:lI115|H3A16E8
-3A16E8:lI107|H3A17A4
-3A17A4:lI116|N
-3A155C:lH3A1634|H3A1640
-3A1634:t2:H3A16F8,H3A1700
-3A1700:lI97|H3A17BC
-3A17BC:lI112|H3A1870
-3A1870:lI112|H3A1924
-3A1924:lI108|H3A19D8
-3A19D8:lI105|H3A1A8C
-3A1A8C:lI99|H3A1B40
-3A1B40:lI97|H3A1C04
-3A1C04:lI116|H3A1CC8
-3A1CC8:lI105|H3A1D84
-3A1D84:lI111|H3A1E40
-3A1E40:lI110|H3A1EFC
-3A1EFC:lI47|H3A1FB8
-3A1FB8:lI120|H3A206C
-3A206C:lI45|H3A2128
-3A2128:lI107|H3A21DC
-3A21DC:lI111|H3A2290
-3A2290:lI97|H3A234C
-3A234C:lI110|N
-3A16F8:lI115|H3A17B4
-3A17B4:lI107|H3A1868
-3A1868:lI109|N
-3A1640:lH3A1708|H3A1714
-3A1708:t2:H3A17C4,H3A17CC
-3A17CC:lI97|H3A1880
-3A1880:lI112|H3A1934
-3A1934:lI112|H3A19E0
-3A19E0:lI108|H3A1A94
-3A1A94:lI105|H3A1B48
-3A1B48:lI99|H3A1C0C
-3A1C0C:lI97|H3A1CD0
-3A1CD0:lI116|H3A1D8C
-3A1D8C:lI105|H3A1E48
-3A1E48:lI111|H3A1F04
-3A1F04:lI110|H3A1FC0
-3A1FC0:lI47|H3A2074
-3A2074:lI120|H3A2130
-3A2130:lI45|H3A21E4
-3A21E4:lI104|H3A2298
-3A2298:lI116|H3A2354
-3A2354:lI116|H3A2410
-3A2410:lI112|H3A24C4
-3A24C4:lI100|H3A2580
-3A2580:lI45|H3A263C
-3A263C:lI99|H3A2700
-3A2700:lI103|H3A27BC
-3A27BC:lI105|N
-3A17C4:lI99|H3A1878
-3A1878:lI103|H3A192C
-3A192C:lI105|N
-3A1714:lH3A17D4|H3A17E0
-3A17D4:t2:H3A1888,H3A1890
-3A1890:lI97|H3A1944
-3A1944:lI112|H3A19F0
-3A19F0:lI112|H3A1A9C
-3A1A9C:lI108|H3A1B50
-3A1B50:lI105|H3A1C14
-3A1C14:lI99|H3A1CD8
-3A1CD8:lI97|H3A1D94
-3A1D94:lI116|H3A1E50
-3A1E50:lI105|H3A1F0C
-3A1F0C:lI111|H3A1FC8
-3A1FC8:lI110|H3A207C
-3A207C:lI47|H3A2138
-3A2138:lI120|H3A21EC
-3A21EC:lI45|H3A22A0
-3A22A0:lI104|H3A235C
-3A235C:lI100|H3A2418
-3A2418:lI102|N
-3A1888:lI104|H3A193C
-3A193C:lI100|H3A19E8
-3A19E8:lI102|N
-3A17E0:lH3A1898|H3A18A4
-3A1898:t2:H3A194C,H3A1954
-3A1954:lI97|H3A1A00
-3A1A00:lI112|H3A1AA4
-3A1AA4:lI112|H3A1B58
-3A1B58:lI108|H3A1C1C
-3A1C1C:lI105|H3A1CE0
-3A1CE0:lI99|H3A1D9C
-3A1D9C:lI97|H3A1E58
-3A1E58:lI116|H3A1F14
-3A1F14:lI105|H3A1FD0
-3A1FD0:lI111|H3A2084
-3A2084:lI110|H3A2140
-3A2140:lI47|H3A21F4
-3A21F4:lI120|H3A22A8
-3A22A8:lI45|H3A2364
-3A2364:lI103|H3A2420
-3A2420:lI122|H3A24CC
-3A24CC:lI105|H3A2588
-3A2588:lI112|N
-3A194C:lI103|H3A19F8
-3A19F8:lI122|N
-3A18A4:lH3A195C|H3A1968
-3A195C:t2:H3A1A08,H3A1A10
-3A1A10:lI97|H3A1AB4
-3A1AB4:lI112|H3A1B68
-3A1B68:lI112|H3A1C2C
-3A1C2C:lI108|H3A1CE8
-3A1CE8:lI105|H3A1DA4
-3A1DA4:lI99|H3A1E60
-3A1E60:lI97|H3A1F1C
-3A1F1C:lI116|H3A1FD8
-3A1FD8:lI105|H3A208C
-3A208C:lI111|H3A2148
-3A2148:lI110|H3A21FC
-3A21FC:lI47|H3A22B0
-3A22B0:lI120|H3A236C
-3A236C:lI45|H3A2428
-3A2428:lI103|H3A24D4
-3A24D4:lI116|H3A2590
-3A2590:lI97|H3A2644
-3A2644:lI114|N
-3A1A08:lI103|H3A1AAC
-3A1AAC:lI116|H3A1B60
-3A1B60:lI97|H3A1C24
-3A1C24:lI114|N
-3A1968:lH3A1A18|H3A1A24
-3A1A18:t2:H3A1ABC,H3A1AC4
-3A1AC4:lI97|H3A1B78
-3A1B78:lI112|H3A1C3C
-3A1C3C:lI112|H3A1CF0
-3A1CF0:lI108|H3A1DAC
-3A1DAC:lI105|H3A1E68
-3A1E68:lI99|H3A1F24
-3A1F24:lI97|H3A1FE0
-3A1FE0:lI116|H3A2094
-3A2094:lI105|H3A2150
-3A2150:lI111|H3A2204
-3A2204:lI110|H3A22B8
-3A22B8:lI47|H3A2374
-3A2374:lI120|H3A2430
-3A2430:lI45|H3A24DC
-3A24DC:lI100|H3A2598
-3A2598:lI118|H3A264C
-3A264C:lI105|N
-3A1ABC:lI100|H3A1B70
-3A1B70:lI118|H3A1C34
-3A1C34:lI105|N
-3A1A24:lH3A1ACC|H3A1AD8
-3A1ACC:t2:H3A1B80,H3A1B88
-3A1B88:lI97|H3A1C4C
-3A1C4C:lI112|H3A1D00
-3A1D00:lI112|H3A1DB4
-3A1DB4:lI108|H3A1E70
-3A1E70:lI105|H3A1F2C
-3A1F2C:lI99|H3A1FE8
-3A1FE8:lI97|H3A209C
-3A209C:lI116|H3A2158
-3A2158:lI105|H3A220C
-3A220C:lI111|H3A22C0
-3A22C0:lI110|H3A237C
-3A237C:lI47|H3A2438
-3A2438:lI120|H3A24E4
-3A24E4:lI45|H3A25A0
-3A25A0:lI100|H3A2654
-3A2654:lI105|H3A2708
-3A2708:lI114|H3A27C4
-3A27C4:lI101|H3A2880
-3A2880:lI99|H3A2944
-3A2944:lI116|H3A2A10
-3A2A10:lI111|H3A2ADC
-3A2ADC:lI114|N
-3A1B80:lI100|H3A1C44
-3A1C44:lI99|H3A1CF8
-3A1CF8:lI114|N
-3A1AD8:lH3A1B90|H3A1B9C
-3A1B90:t2:H3A1C54,H3A1C5C
-3A1C5C:lI97|H3A1D10
-3A1D10:lI112|H3A1DC4
-3A1DC4:lI112|H3A1E78
-3A1E78:lI108|H3A1F34
-3A1F34:lI105|H3A1FF0
-3A1FF0:lI99|H3A20A4
-3A20A4:lI97|H3A2160
-3A2160:lI116|H3A2214
-3A2214:lI105|H3A22C8
-3A22C8:lI111|H3A2384
-3A2384:lI110|H3A2440
-3A2440:lI47|H3A24EC
-3A24EC:lI120|H3A25A8
-3A25A8:lI45|H3A265C
-3A265C:lI100|H3A2710
-3A2710:lI105|H3A27CC
-3A27CC:lI114|H3A2888
-3A2888:lI101|H3A294C
-3A294C:lI99|H3A2A18
-3A2A18:lI116|H3A2AE4
-3A2AE4:lI111|H3A2BB0
-3A2BB0:lI114|N
-3A1C54:lI100|H3A1D08
-3A1D08:lI105|H3A1DBC
-3A1DBC:lI114|N
-3A1B9C:lH3A1C64|H3A1C70
-3A1C64:t2:H3A1D18,H3A1D20
-3A1D20:lI97|H3A1DD4
-3A1DD4:lI112|H3A1E88
-3A1E88:lI112|H3A1F3C
-3A1F3C:lI108|H3A1FF8
-3A1FF8:lI105|H3A20AC
-3A20AC:lI99|H3A2168
-3A2168:lI97|H3A221C
-3A221C:lI116|H3A22D0
-3A22D0:lI105|H3A238C
-3A238C:lI111|H3A2448
-3A2448:lI110|H3A24F4
-3A24F4:lI47|H3A25B0
-3A25B0:lI120|H3A2664
-3A2664:lI45|H3A2718
-3A2718:lI100|H3A27D4
-3A27D4:lI105|H3A2890
-3A2890:lI114|H3A2954
-3A2954:lI101|H3A2A20
-3A2A20:lI99|H3A2AEC
-3A2AEC:lI116|H3A2BB8
-3A2BB8:lI111|H3A2C74
-3A2C74:lI114|N
-3A1D18:lI100|H3A1DCC
-3A1DCC:lI120|H3A1E80
-3A1E80:lI114|N
-3A1C70:lH3A1D28|H3A1D34
-3A1D28:t2:H3A1DDC,H3A1DE4
-3A1DE4:lI97|H3A1E98
-3A1E98:lI112|H3A1F4C
-3A1F4C:lI112|H3A2000
-3A2000:lI108|H3A20B4
-3A20B4:lI105|H3A2170
-3A2170:lI99|H3A2224
-3A2224:lI97|H3A22D8
-3A22D8:lI116|H3A2394
-3A2394:lI105|H3A2450
-3A2450:lI111|H3A24FC
-3A24FC:lI110|H3A25B8
-3A25B8:lI47|H3A266C
-3A266C:lI120|H3A2720
-3A2720:lI45|H3A27DC
-3A27DC:lI99|H3A2898
-3A2898:lI115|H3A295C
-3A295C:lI104|N
-3A1DDC:lI99|H3A1E90
-3A1E90:lI115|H3A1F44
-3A1F44:lI104|N
-3A1D34:lH3A1DEC|H3A1DF8
-3A1DEC:t2:H3A1EA0,H3A1EA8
-3A1EA8:lI97|H3A1F5C
-3A1F5C:lI112|H3A2010
-3A2010:lI112|H3A20C4
-3A20C4:lI108|H3A2178
-3A2178:lI105|H3A222C
-3A222C:lI99|H3A22E0
-3A22E0:lI97|H3A239C
-3A239C:lI116|H3A2458
-3A2458:lI105|H3A2504
-3A2504:lI111|H3A25C0
-3A25C0:lI110|H3A2674
-3A2674:lI47|H3A2728
-3A2728:lI120|H3A27E4
-3A27E4:lI45|H3A28A0
-3A28A0:lI99|H3A2964
-3A2964:lI112|H3A2A28
-3A2A28:lI105|H3A2AF4
-3A2AF4:lI111|N
-3A1EA0:lI99|H3A1F54
-3A1F54:lI112|H3A2008
-3A2008:lI105|H3A20BC
-3A20BC:lI111|N
-3A1DF8:lH3A1EB0|H3A1EBC
-3A1EB0:t2:H3A1F64,H3A1F6C
-3A1F6C:lI97|H3A2018
-3A2018:lI112|H3A20CC
-3A20CC:lI112|H3A2180
-3A2180:lI108|H3A2234
-3A2234:lI105|H3A22E8
-3A22E8:lI99|H3A23A4
-3A23A4:lI97|H3A2460
-3A2460:lI116|H3A250C
-3A250C:lI105|H3A25C8
-3A25C8:lI111|H3A267C
-3A267C:lI110|H3A2730
-3A2730:lI47|H3A27EC
-3A27EC:lI120|H3A28A8
-3A28A8:lI45|H3A296C
-3A296C:lI99|H3A2A30
-3A2A30:lI111|H3A2AFC
-3A2AFC:lI109|H3A2BC0
-3A2BC0:lI112|H3A2C7C
-3A2C7C:lI114|H3A2D2C
-3A2D2C:lI101|H3A2DD4
-3A2DD4:lI115|H3A2E6C
-3A2E6C:lI115|N
-3A1F64:lI90|N
-3A1EBC:lH3A1F74|H3A1F80
-3A1F74:t2:H3A2020,H3A2028
-3A2028:lI97|H3A20DC
-3A20DC:lI112|H3A2190
-3A2190:lI112|H3A223C
-3A223C:lI108|H3A22F0
-3A22F0:lI105|H3A23AC
-3A23AC:lI99|H3A2468
-3A2468:lI97|H3A2514
-3A2514:lI116|H3A25D0
-3A25D0:lI105|H3A2684
-3A2684:lI111|H3A2738
-3A2738:lI110|H3A27F4
-3A27F4:lI47|H3A28B0
-3A28B0:lI120|H3A2974
-3A2974:lI45|H3A2A38
-3A2A38:lI99|H3A2B04
-3A2B04:lI100|H3A2BC8
-3A2BC8:lI108|H3A2C84
-3A2C84:lI105|H3A2D34
-3A2D34:lI110|H3A2DDC
-3A2DDC:lI107|N
-3A2020:lI118|H3A20D4
-3A20D4:lI99|H3A2188
-3A2188:lI100|N
-3A1F80:lH3A2030|H3A203C
-3A2030:t2:H3A20E4,H3A20EC
-3A20EC:lI97|H3A21A0
-3A21A0:lI112|H3A224C
-3A224C:lI112|H3A2300
-3A2300:lI108|H3A23BC
-3A23BC:lI105|H3A2470
-3A2470:lI99|H3A251C
-3A251C:lI97|H3A25D8
-3A25D8:lI116|H3A268C
-3A268C:lI105|H3A2740
-3A2740:lI111|H3A27FC
-3A27FC:lI110|H3A28B8
-3A28B8:lI47|H3A297C
-3A297C:lI120|H3A2A40
-3A2A40:lI45|H3A2B0C
-3A2B0C:lI98|H3A2BD0
-3A2BD0:lI99|H3A2C8C
-3A2C8C:lI112|H3A2D3C
-3A2D3C:lI105|H3A2DE4
-3A2DE4:lI111|N
-3A20E4:lI98|H3A2198
-3A2198:lI99|H3A2244
-3A2244:lI112|H3A22F8
-3A22F8:lI105|H3A23B4
-3A23B4:lI111|N
-3A203C:lH3A20F4|H3A2100
-3A20F4:t2:H3A21A8,H3A21B0
-3A21B0:lI97|H3A225C
-3A225C:lI112|H3A2310
-3A2310:lI112|H3A23C4
-3A23C4:lI108|H3A2478
-3A2478:lI105|H3A2524
-3A2524:lI99|H3A25E0
-3A25E0:lI97|H3A2694
-3A2694:lI116|H3A2748
-3A2748:lI105|H3A2804
-3A2804:lI111|H3A28C0
-3A28C0:lI110|H3A2984
-3A2984:lI47|H3A2A48
-3A2A48:lI114|H3A2B14
-3A2B14:lI116|H3A2BD8
-3A2BD8:lI102|N
-3A21A8:lI114|H3A2254
-3A2254:lI116|H3A2308
-3A2308:lI102|N
-3A2100:lH3A21B8|H3A21C4
-3A21B8:t2:H3A2264,H3A226C
-3A226C:lI97|H3A2320
-3A2320:lI112|H3A23D4
-3A23D4:lI112|H3A2480
-3A2480:lI108|H3A252C
-3A252C:lI105|H3A25E8
-3A25E8:lI99|H3A269C
-3A269C:lI97|H3A2750
-3A2750:lI116|H3A280C
-3A280C:lI105|H3A28C8
-3A28C8:lI111|H3A298C
-3A298C:lI110|H3A2A50
-3A2A50:lI47|H3A2B1C
-3A2B1C:lI112|H3A2BE0
-3A2BE0:lI111|H3A2C94
-3A2C94:lI119|H3A2D44
-3A2D44:lI101|H3A2DEC
-3A2DEC:lI114|H3A2E74
-3A2E74:lI112|H3A2EEC
-3A2EEC:lI111|H3A2F64
-3A2F64:lI105|H3A2FD4
-3A2FD4:lI110|H3A303C
-3A303C:lI116|N
-3A2264:lI112|H3A2318
-3A2318:lI112|H3A23CC
-3A23CC:lI116|N
-3A21C4:lH3A2274|H3A2280
-3A2274:t2:H3A2328,H3A2330
-3A2330:lI97|H3A23E4
-3A23E4:lI112|H3A2488
-3A2488:lI112|H3A2534
-3A2534:lI108|H3A25F0
-3A25F0:lI105|H3A26A4
-3A26A4:lI99|H3A2758
-3A2758:lI97|H3A2814
-3A2814:lI116|H3A28D0
-3A28D0:lI105|H3A2994
-3A2994:lI111|H3A2A58
-3A2A58:lI110|H3A2B24
-3A2B24:lI47|H3A2BE8
-3A2BE8:lI112|H3A2C9C
-3A2C9C:lI111|H3A2D4C
-3A2D4C:lI115|H3A2DF4
-3A2DF4:lI116|H3A2E7C
-3A2E7C:lI115|H3A2EF4
-3A2EF4:lI99|H3A2F6C
-3A2F6C:lI114|H3A2FDC
-3A2FDC:lI105|H3A3044
-3A3044:lI112|H3A30A4
-3A30A4:lI116|N
-3A2328:lI97|H3A23DC
-3A23DC:lI105|N
-3A2280:lH3A2338|H3A2344
-3A2338:t2:H3A23EC,H3A23F4
-3A23F4:lI97|H3A2498
-3A2498:lI112|H3A2544
-3A2544:lI112|H3A25F8
-3A25F8:lI108|H3A26AC
-3A26AC:lI105|H3A2760
-3A2760:lI99|H3A281C
-3A281C:lI97|H3A28D8
-3A28D8:lI116|H3A299C
-3A299C:lI105|H3A2A60
-3A2A60:lI111|H3A2B2C
-3A2B2C:lI110|H3A2BF0
-3A2BF0:lI47|H3A2CA4
-3A2CA4:lI112|H3A2D54
-3A2D54:lI111|H3A2DFC
-3A2DFC:lI115|H3A2E84
-3A2E84:lI116|H3A2EFC
-3A2EFC:lI115|H3A2F74
-3A2F74:lI99|H3A2FE4
-3A2FE4:lI114|H3A304C
-3A304C:lI105|H3A30AC
-3A30AC:lI112|H3A3104
-3A3104:lI116|N
-3A23EC:lI101|H3A2490
-3A2490:lI112|H3A253C
-3A253C:lI115|N
-3A2344:lH3A23FC|H3A2408
-3A23FC:t2:H3A24A0,H3A24A8
-3A24A8:lI97|H3A2554
-3A2554:lI112|H3A2600
-3A2600:lI112|H3A26B4
-3A26B4:lI108|H3A2768
-3A2768:lI105|H3A2824
-3A2824:lI99|H3A28E0
-3A28E0:lI97|H3A29A4
-3A29A4:lI116|H3A2A68
-3A2A68:lI105|H3A2B34
-3A2B34:lI111|H3A2BF8
-3A2BF8:lI110|H3A2CAC
-3A2CAC:lI47|H3A2D5C
-3A2D5C:lI112|H3A2E04
-3A2E04:lI111|H3A2E8C
-3A2E8C:lI115|H3A2F04
-3A2F04:lI116|H3A2F7C
-3A2F7C:lI115|H3A2FEC
-3A2FEC:lI99|H3A3054
-3A3054:lI114|H3A30B4
-3A30B4:lI105|H3A310C
-3A310C:lI112|H3A315C
-3A315C:lI116|N
-3A24A0:lI112|H3A254C
-3A254C:lI115|N
-3A2408:lH3A24B0|H3A24BC
-3A24B0:t2:H3A255C,H3A2564
-3A2564:lI97|H3A2610
-3A2610:lI112|H3A26C4
-3A26C4:lI112|H3A2770
-3A2770:lI108|H3A282C
-3A282C:lI105|H3A28E8
-3A28E8:lI99|H3A29AC
-3A29AC:lI97|H3A2A70
-3A2A70:lI116|H3A2B3C
-3A2B3C:lI105|H3A2C00
-3A2C00:lI111|H3A2CB4
-3A2CB4:lI110|H3A2D64
-3A2D64:lI47|H3A2E0C
-3A2E0C:lI112|H3A2E94
-3A2E94:lI100|H3A2F0C
-3A2F0C:lI102|N
-3A255C:lI112|H3A2608
-3A2608:lI100|H3A26BC
-3A26BC:lI102|N
-3A24BC:lH3A256C|H3A2578
-3A256C:t2:H3A2618,H3A2620
-3A2620:lI97|H3A26D4
-3A26D4:lI112|H3A2780
-3A2780:lI112|H3A2834
-3A2834:lI108|H3A28F0
-3A28F0:lI105|H3A29B4
-3A29B4:lI99|H3A2A78
-3A2A78:lI97|H3A2B44
-3A2B44:lI116|H3A2C08
-3A2C08:lI105|H3A2CBC
-3A2CBC:lI111|H3A2D6C
-3A2D6C:lI110|H3A2E14
-3A2E14:lI47|H3A2E9C
-3A2E9C:lI111|H3A2F14
-3A2F14:lI100|H3A2F84
-3A2F84:lI97|N
-3A2618:lI111|H3A26CC
-3A26CC:lI100|H3A2778
-3A2778:lI97|N
-3A2578:lH3A2628|H3A2634
-3A2628:t2:H3A26DC,H3A26E4
-3A26E4:lI97|H3A2790
-3A2790:lI112|H3A2844
-3A2844:lI112|H3A28F8
-3A28F8:lI108|H3A29BC
-3A29BC:lI105|H3A2A80
-3A2A80:lI99|H3A2B4C
-3A2B4C:lI97|H3A2C10
-3A2C10:lI116|H3A2CC4
-3A2CC4:lI105|H3A2D74
-3A2D74:lI111|H3A2E1C
-3A2E1C:lI110|H3A2EA4
-3A2EA4:lI47|H3A2F1C
-3A2F1C:lI111|H3A2F8C
-3A2F8C:lI99|H3A2FF4
-3A2FF4:lI116|H3A305C
-3A305C:lI101|H3A30BC
-3A30BC:lI116|H3A3114
-3A3114:lI45|H3A3164
-3A3164:lI115|H3A31AC
-3A31AC:lI116|H3A31F4
-3A31F4:lI114|H3A323C
-3A323C:lI101|H3A3284
-3A3284:lI97|H3A32CC
-3A32CC:lI109|N
-3A26DC:lI98|H3A2788
-3A2788:lI105|H3A283C
-3A283C:lI110|N
-3A2634:lH3A26EC|H3A26F8
-3A26EC:t2:H3A2798,H3A27A0
-3A27A0:lI97|H3A2854
-3A2854:lI112|H3A2908
-3A2908:lI112|H3A29C4
-3A29C4:lI108|H3A2A88
-3A2A88:lI105|H3A2B54
-3A2B54:lI99|H3A2C18
-3A2C18:lI97|H3A2CCC
-3A2CCC:lI116|H3A2D7C
-3A2D7C:lI105|H3A2E24
-3A2E24:lI111|H3A2EAC
-3A2EAC:lI110|H3A2F24
-3A2F24:lI47|H3A2F94
-3A2F94:lI111|H3A2FFC
-3A2FFC:lI99|H3A3064
-3A3064:lI116|H3A30C4
-3A30C4:lI101|H3A311C
-3A311C:lI116|H3A316C
-3A316C:lI45|H3A31B4
-3A31B4:lI115|H3A31FC
-3A31FC:lI116|H3A3244
-3A3244:lI114|H3A328C
-3A328C:lI101|H3A32D4
-3A32D4:lI97|H3A3314
-3A3314:lI109|N
-3A2798:lI100|H3A284C
-3A284C:lI109|H3A2900
-3A2900:lI115|N
-3A26F8:lH3A27A8|H3A27B4
-3A27A8:t2:H3A285C,H3A2864
-3A2864:lI97|H3A2918
-3A2918:lI112|H3A29D4
-3A29D4:lI112|H3A2A90
-3A2A90:lI108|H3A2B5C
-3A2B5C:lI105|H3A2C20
-3A2C20:lI99|H3A2CD4
-3A2CD4:lI97|H3A2D84
-3A2D84:lI116|H3A2E2C
-3A2E2C:lI105|H3A2EB4
-3A2EB4:lI111|H3A2F2C
-3A2F2C:lI110|H3A2F9C
-3A2F9C:lI47|H3A3004
-3A3004:lI111|H3A306C
-3A306C:lI99|H3A30CC
-3A30CC:lI116|H3A3124
-3A3124:lI101|H3A3174
-3A3174:lI116|H3A31BC
-3A31BC:lI45|H3A3204
-3A3204:lI115|H3A324C
-3A324C:lI116|H3A3294
-3A3294:lI114|H3A32DC
-3A32DC:lI101|H3A331C
-3A331C:lI97|H3A334C
-3A334C:lI109|N
-3A285C:lI108|H3A2910
-3A2910:lI104|H3A29CC
-3A29CC:lI97|N
-3A27B4:lH3A286C|H3A2878
-3A286C:t2:H3A2920,H3A2928
-3A2928:lI97|H3A29E4
-3A29E4:lI112|H3A2AA0
-3A2AA0:lI112|H3A2B64
-3A2B64:lI108|H3A2C28
-3A2C28:lI105|H3A2CDC
-3A2CDC:lI99|H3A2D8C
-3A2D8C:lI97|H3A2E34
-3A2E34:lI116|H3A2EBC
-3A2EBC:lI105|H3A2F34
-3A2F34:lI111|H3A2FA4
-3A2FA4:lI110|H3A300C
-3A300C:lI47|H3A3074
-3A3074:lI111|H3A30D4
-3A30D4:lI99|H3A312C
-3A312C:lI116|H3A317C
-3A317C:lI101|H3A31C4
-3A31C4:lI116|H3A320C
-3A320C:lI45|H3A3254
-3A3254:lI115|H3A329C
-3A329C:lI116|H3A32E4
-3A32E4:lI114|H3A3324
-3A3324:lI101|H3A3354
-3A3354:lI97|H3A337C
-3A337C:lI109|N
-3A2920:lI108|H3A29DC
-3A29DC:lI122|H3A2A98
-3A2A98:lI104|N
-3A2878:lH3A2930|H3A293C
-3A2930:t2:H3A29EC,H3A29F4
-3A29F4:lI97|H3A2AB0
-3A2AB0:lI112|H3A2B74
-3A2B74:lI112|H3A2C30
-3A2C30:lI108|H3A2CE4
-3A2CE4:lI105|H3A2D94
-3A2D94:lI99|H3A2E3C
-3A2E3C:lI97|H3A2EC4
-3A2EC4:lI116|H3A2F3C
-3A2F3C:lI105|H3A2FAC
-3A2FAC:lI111|H3A3014
-3A3014:lI110|H3A307C
-3A307C:lI47|H3A30DC
-3A30DC:lI111|H3A3134
-3A3134:lI99|H3A3184
-3A3184:lI116|H3A31CC
-3A31CC:lI101|H3A3214
-3A3214:lI116|H3A325C
-3A325C:lI45|H3A32A4
-3A32A4:lI115|H3A32EC
-3A32EC:lI116|H3A332C
-3A332C:lI114|H3A335C
-3A335C:lI101|H3A3384
-3A3384:lI97|H3A33A4
-3A33A4:lI109|N
-3A29EC:lI101|H3A2AA8
-3A2AA8:lI120|H3A2B6C
-3A2B6C:lI101|N
-3A293C:lH3A29FC|H3A2A08
-3A29FC:t2:H3A2AB8,H3A2AC0
-3A2AC0:lI97|H3A2B84
-3A2B84:lI112|H3A2C40
-3A2C40:lI112|H3A2CF4
-3A2CF4:lI108|H3A2DA4
-3A2DA4:lI105|H3A2E44
-3A2E44:lI99|H3A2ECC
-3A2ECC:lI97|H3A2F44
-3A2F44:lI116|H3A2FB4
-3A2FB4:lI105|H3A301C
-3A301C:lI111|H3A3084
-3A3084:lI110|H3A30E4
-3A30E4:lI47|H3A313C
-3A313C:lI111|H3A318C
-3A318C:lI99|H3A31D4
-3A31D4:lI116|H3A321C
-3A321C:lI101|H3A3264
-3A3264:lI116|H3A32AC
-3A32AC:lI45|H3A32F4
-3A32F4:lI115|H3A3334
-3A3334:lI116|H3A3364
-3A3364:lI114|H3A338C
-3A338C:lI101|H3A33AC
-3A33AC:lI97|H3A33C4
-3A33C4:lI109|N
-3A2AB8:lI99|H3A2B7C
-3A2B7C:lI108|H3A2C38
-3A2C38:lI97|H3A2CEC
-3A2CEC:lI115|H3A2D9C
-3A2D9C:lI115|N
-3A2A08:lH3A2AC8|H3A2AD4
-3A2AC8:t2:H3A2B8C,H3A2B94
-3A2B94:lI97|H3A2C50
-3A2C50:lI112|H3A2D04
-3A2D04:lI112|H3A2DAC
-3A2DAC:lI108|H3A2E4C
-3A2E4C:lI105|H3A2ED4
-3A2ED4:lI99|H3A2F4C
-3A2F4C:lI97|H3A2FBC
-3A2FBC:lI116|H3A3024
-3A3024:lI105|H3A308C
-3A308C:lI111|H3A30EC
-3A30EC:lI110|H3A3144
-3A3144:lI47|H3A3194
-3A3194:lI109|H3A31DC
-3A31DC:lI115|H3A3224
-3A3224:lI119|H3A326C
-3A326C:lI111|H3A32B4
-3A32B4:lI114|H3A32FC
-3A32FC:lI100|N
-3A2B8C:lI100|H3A2C48
-3A2C48:lI111|H3A2CFC
-3A2CFC:lI99|N
-3A2AD4:lH3A2B9C|H3A2BA8
-3A2B9C:t2:H3A2C58,H3A2C60
-3A2C60:lI97|H3A2D14
-3A2D14:lI112|H3A2DBC
-3A2DBC:lI112|H3A2E54
-3A2E54:lI108|H3A2EDC
-3A2EDC:lI105|H3A2F54
-3A2F54:lI99|H3A2FC4
-3A2FC4:lI97|H3A302C
-3A302C:lI116|H3A3094
-3A3094:lI105|H3A30F4
-3A30F4:lI111|H3A314C
-3A314C:lI110|H3A319C
-3A319C:lI47|H3A31E4
-3A31E4:lI109|H3A322C
-3A322C:lI97|H3A3274
-3A3274:lI99|H3A32BC
-3A32BC:lI45|H3A3304
-3A3304:lI99|H3A333C
-3A333C:lI111|H3A336C
-3A336C:lI109|H3A3394
-3A3394:lI112|H3A33B4
-3A33B4:lI97|H3A33CC
-3A33CC:lI99|H3A33DC
-3A33DC:lI116|H3A33EC
-3A33EC:lI112|H3A33FC
-3A33FC:lI114|H3A340C
-3A340C:lI111|N
-3A2C58:lI99|H3A2D0C
-3A2D0C:lI112|H3A2DB4
-3A2DB4:lI116|N
-3A2BA8:lH3A2C68|N
-3A2C68:t2:H3A2D1C,H3A2D24
-3A2D24:lI97|H3A2DCC
-3A2DCC:lI112|H3A2E64
-3A2E64:lI112|H3A2EE4
-3A2EE4:lI108|H3A2F5C
-3A2F5C:lI105|H3A2FCC
-3A2FCC:lI99|H3A3034
-3A3034:lI97|H3A309C
-3A309C:lI116|H3A30FC
-3A30FC:lI105|H3A3154
-3A3154:lI111|H3A31A4
-3A31A4:lI110|H3A31EC
-3A31EC:lI47|H3A3234
-3A3234:lI109|H3A327C
-3A327C:lI97|H3A32C4
-3A32C4:lI99|H3A330C
-3A330C:lI45|H3A3344
-3A3344:lI98|H3A3374
-3A3374:lI105|H3A339C
-3A339C:lI110|H3A33BC
-3A33BC:lI104|H3A33D4
-3A33D4:lI101|H3A33E4
-3A33E4:lI120|H3A33F4
-3A33F4:lI52|H3A3404
-3A3404:lI48|N
-3A2D1C:lI104|H3A2DC4
-3A2DC4:lI113|H3A2E5C
-3A2E5C:lI120|N
-39DC28:lH39DC68|H39DC74
-39DC68:t2:A4:port,I8888
-39DC74:lH39DCA8|H39DCB4
-39DCA8:t2:AC:bind_address,H39DCF8
-39DCF8:t4:I127,I0,I0,I1
-39DCB4:lH39DD0C|H39DD18
-39DD0C:t2:AB:server_name,H39DD6C
-39DD6C:lI108|H39DDE4
-39DDE4:lI111|H39DE5C
-39DE5C:lI99|H39DEE4
-39DEE4:lI97|H39DF6C
-39DF6C:lI108|H39E00C
-39E00C:lI104|H39E0B4
-39E0B4:lI111|H39E16C
-39E16C:lI115|H39E238
-39E238:lI116|N
-39DD18:lH39DD74|H39DD80
-39DD74:t2:AE:max_header_siz,I1024
-39DD80:lH39DDEC|H39DDF8
-39DDEC:t2:A11:max_header_action,A8:reply414
-39DDF8:lH39DE64|H39DE70
-39DE64:t2:A8:com_type,A7:ip_comm
-39DE70:lH39DEEC|H39DEF8
-39DEEC:t2:A7:modules,H39DF74
-39DF74:lA9:mod_alias|H39E014
-39E014:lA8:mod_auth|H39E0BC
-39E0BC:lA7:mod_esi|H39E174
-39E174:lAB:mod_actions|H39E240
-39E240:lA7:mod_cgi|H39E324
-39E324:lAB:mod_include|H39E418
-39E418:lA7:mod_dir|H39E51C
-39E51C:lA7:mod_get|H39E634
-39E634:lA8:mod_head|H39E748
-39E748:lA7:mod_log|H39E85C
-39E85C:lAC:mod_disk_log|N
-39DEF8:lH39DF7C|H39DF88
-39DF7C:t2:AF:directory_index,H39E01C
-39E01C:lH39E0C4|N
-39E0C4:lI105|H39E17C
-39E17C:lI110|H39E248
-39E248:lI100|H39E32C
-39E32C:lI101|H39E420
-39E420:lI120|H39E524
-39E524:lI46|H39E63C
-39E63C:lI104|H39E750
-39E750:lI116|H39E864
-39E864:lI109|H39E978
-39E978:lI108|N
-39DF88:lH39E024|H39E030
-39E024:t2:AC:default_type,H39E0CC
-39E0CC:lI116|H39E184
-39E184:lI101|H39E250
-39E250:lI120|H39E334
-39E334:lI116|H39E428
-39E428:lI47|H39E52C
-39E52C:lI112|H39E644
-39E644:lI108|H39E758
-39E758:lI97|H39E86C
-39E86C:lI105|H39E980
-39E980:lI110|N
-39E030:lH39E0D4|H39E0E0
-39E0D4:t2:A10:erl_script_alias,H39E18C
-39E18C:t2:H39E258,H39E260
-39E260:lH39E344|N
-39E344:lI119|H39E438
-39E438:lI101|H39E53C
-39E53C:lI98|H39E654
-39E654:lI116|H39E768
-39E768:lI111|H39E87C
-39E87C:lI111|H39E990
-39E990:lI108|N
-39E258:lI47|H39E33C
-39E33C:lI119|H39E430
-39E430:lI101|H39E534
-39E534:lI98|H39E64C
-39E64C:lI116|H39E760
-39E760:lI111|H39E874
-39E874:lI111|H39E988
-39E988:lI108|N
-39E0E0:lH39E198|H39E1A4
-39E198:t2:A5:alias,H39E268
-39E268:t2:H39E34C,H39E354
-39E354:lI47|H39E448
-39E448:lI99|H39E54C
-39E54C:lI108|H39E664
-39E664:lI101|H39E778
-39E778:lI97|H39E88C
-39E88C:lI114|H39E9A0
-39E9A0:lI99|H39EA94
-39EA94:lI97|H39EB88
-39EB88:lI115|H39EC7C
-39EC7C:lI101|H39ED70
-39ED70:lI47|H39EE4C
-39EE4C:lI111|H39EF20
-39EF20:lI116|H39EFFC
-39EFFC:lI112|H39F0E0
-39F0E0:lI47|H39F1B4
-39F1B4:lI101|H39F288
-39F288:lI114|H39F344
-39F344:lI116|H39F408
-39F408:lI115|H39F4D4
-39F4D4:lI47|H39F5A8
-39F5A8:lI108|H39F67C
-39F67C:lI105|H39F750
-39F750:lI98|H39F824
-39F824:lI47|H39F908
-39F908:lI111|H39F9E4
-39F9E4:lI98|H39FAC0
-39FAC0:lI115|H39FB9C
-39FB9C:lI101|H39FC68
-39FC68:lI114|H39FD2C
-39FD2C:lI118|H39FDF8
-39FDF8:lI101|H39FEB4
-39FEB4:lI114|H39FF70
-39FF70:lI47|H3A0024
-3A0024:lI112|H3A00D8
-3A00D8:lI114|H3A0184
-3A0184:lI105|H3A0238
-3A0238:lI118|H3A02F4
-3A02F4:lI47|H3A03A8
-3A03A8:lI99|H3A0444
-3A0444:lI114|H3A04E8
-3A04E8:lI97|H3A058C
-3A058C:lI115|H3A0638
-3A0638:lI104|H3A06EC
-3A06EC:lI100|H3A0798
-3A0798:lI117|H3A083C
-3A083C:lI109|H3A08C8
-3A08C8:lI112|H3A095C
-3A095C:lI95|H3A09F0
-3A09F0:lI118|H3A0A8C
-3A0A8C:lI105|H3A0B38
-3A0B38:lI101|H3A0BE4
-3A0BE4:lI119|H3A0CA0
-3A0CA0:lI101|H3A0D5C
-3A0D5C:lI114|N
-39E34C:lI47|H39E440
-39E440:lI99|H39E544
-39E544:lI114|H39E65C
-39E65C:lI97|H39E770
-39E770:lI115|H39E884
-39E884:lI104|H39E998
-39E998:lI100|H39EA8C
-39EA8C:lI117|H39EB80
-39EB80:lI109|H39EC74
-39EC74:lI112|H39ED68
-39ED68:lI95|H39EE44
-39EE44:lI118|H39EF18
-39EF18:lI105|H39EFF4
-39EFF4:lI101|H39F0D8
-39F0D8:lI119|H39F1AC
-39F1AC:lI101|H39F280
-39F280:lI114|N
-39E1A4:lH39E274|H39E280
-39E274:t2:A5:alias,H39E35C
-39E35C:t2:H39E450,H39E458
-39E458:lI47|H39E55C
-39E55C:lI99|H39E674
-39E674:lI108|H39E788
-39E788:lI101|H39E89C
-39E89C:lI97|H39E9B0
-39E9B0:lI114|H39EAA4
-39EAA4:lI99|H39EB98
-39EB98:lI97|H39EC8C
-39EC8C:lI115|H39ED80
-39ED80:lI101|H39EE5C
-39EE5C:lI47|H39EF30
-39EF30:lI111|H39F00C
-39F00C:lI116|H39F0F0
-39F0F0:lI112|H39F1C4
-39F1C4:lI47|H39F298
-39F298:lI101|H39F354
-39F354:lI114|H39F418
-39F418:lI116|H39F4E4
-39F4E4:lI115|H39F5B0
-39F5B0:lI47|H39F684
-39F684:lI101|H39F758
-39F758:lI114|H39F82C
-39F82C:lI116|H39F910
-39F910:lI115|H39F9EC
-39F9EC:lI47|H39FAC8
-39FAC8:lI100|H39FBA4
-39FBA4:lI111|H39FC70
-39FC70:lI99|H39FD34
-39FD34:lI47|H39FE00
-39FE00:lI104|H39FEBC
-39FEBC:lI116|H39FF78
-39FF78:lI109|H3A002C
-3A002C:lI108|N
-39E450:lI47|H39E554
-39E554:lI99|H39E66C
-39E66C:lI114|H39E780
-39E780:lI97|H39E894
-39E894:lI115|H39E9A8
-39E9A8:lI104|H39EA9C
-39EA9C:lI100|H39EB90
-39EB90:lI117|H39EC84
-39EC84:lI109|H39ED78
-39ED78:lI112|H39EE54
-39EE54:lI95|H39EF28
-39EF28:lI101|H39F004
-39F004:lI114|H39F0E8
-39F0E8:lI116|H39F1BC
-39F1BC:lI115|H39F290
-39F290:lI95|H39F34C
-39F34C:lI100|H39F410
-39F410:lI111|H39F4DC
-39F4DC:lI99|N
-39E280:lH39E368|H39E374
-39E368:t2:A5:alias,H39E460
-39E460:t2:H39E564,H39E56C
-39E56C:lI47|H39E684
-39E684:lI99|H39E798
-39E798:lI108|H39E8AC
-39E8AC:lI101|H39E9C0
-39E9C0:lI97|H39EAB4
-39EAB4:lI114|H39EBA8
-39EBA8:lI99|H39EC9C
-39EC9C:lI97|H39ED90
-39ED90:lI115|H39EE6C
-39EE6C:lI101|H39EF40
-39EF40:lI47|H39F01C
-39F01C:lI111|H39F100
-39F100:lI116|H39F1D4
-39F1D4:lI112|H39F2A0
-39F2A0:lI47|H39F35C
-39F35C:lI101|H39F420
-39F420:lI114|H39F4EC
-39F4EC:lI116|H39F5B8
-39F5B8:lI115|H39F68C
-39F68C:lI47|H39F760
-39F760:lI108|H39F834
-39F834:lI105|H39F918
-39F918:lI98|H39F9F4
-39F9F4:lI47|H39FAD0
-39FAD0:lI111|H39FBAC
-39FBAC:lI98|H39FC78
-39FC78:lI115|H39FD3C
-39FD3C:lI101|H39FE08
-39FE08:lI114|H39FEC4
-39FEC4:lI118|H39FF80
-39FF80:lI101|H3A0034
-3A0034:lI114|H3A00E0
-3A00E0:lI47|H3A018C
-3A018C:lI100|H3A0240
-3A0240:lI111|H3A02FC
-3A02FC:lI99|H3A03B0
-3A03B0:lI47|H3A044C
-3A044C:lI104|H3A04F0
-3A04F0:lI116|H3A0594
-3A0594:lI109|H3A0640
-3A0640:lI108|N
-39E564:lI47|H39E67C
-39E67C:lI99|H39E790
-39E790:lI114|H39E8A4
-39E8A4:lI97|H39E9B8
-39E9B8:lI115|H39EAAC
-39EAAC:lI104|H39EBA0
-39EBA0:lI100|H39EC94
-39EC94:lI117|H39ED88
-39ED88:lI109|H39EE64
-39EE64:lI112|H39EF38
-39EF38:lI95|H39F014
-39F014:lI100|H39F0F8
-39F0F8:lI111|H39F1CC
-39F1CC:lI99|N
-39E374:lH39E46C|N
-39E46C:t2:A10:erl_script_alias,H39E574
-39E574:t2:H39E68C,H39E694
-39E694:lH39E7A8|N
-39E7A8:lI99|H39E8BC
-39E8BC:lI114|H39E9D0
-39E9D0:lI97|H39EAC4
-39EAC4:lI115|H39EBB8
-39EBB8:lI104|H39ECAC
-39ECAC:lI100|H39EDA0
-39EDA0:lI117|H39EE74
-39EE74:lI109|H39EF48
-39EF48:lI112|H39F024
-39F024:lI95|H39F108
-39F108:lI118|H39F1DC
-39F1DC:lI105|H39F2A8
-39F2A8:lI101|H39F364
-39F364:lI119|H39F428
-39F428:lI101|H39F4F4
-39F4F4:lI114|N
-39E68C:lI47|H39E7A0
-39E7A0:lI99|H39E8B4
-39E8B4:lI100|H39E9C8
-39E9C8:lI118|H39EABC
-39EABC:lI95|H39EBB0
-39EBB0:lI101|H39ECA4
-39ECA4:lI114|H39ED98
-39ED98:lI108|N
-39DB58:lN|H39DB9C
-39DB9C:lH39D9FC|H39DBEC
-39D9FC:t4:I127,I0,I0,I1
-39DBEC:lI8888|N
-3A3E20:lH3A3DFC|H3A3704
-3A3DFC:t8:A5:child,P<0.46.0>,H39DAC8,H39DAD8,A9:permanent,I2000,A6:worker,H39DAE8
-39DAE8:lAD:httpd_manager|H39DB38
-39DB38:lAA:gen_server|N
-39DAD8:t3:AD:httpd_manager,AA:start_link,H39DB30
-39DB30:lA9:undefined|H39DB78
-39DB78:lH39DB50|H39DBC0
-39DBC0:lN|N
-39DAC8:t3:AD:httpd_manager,H39D9FC,I8888
-3A3704:lH3A36E0|H39D998
-3A36E0:t8:A5:child,P<0.45.0>,H39DA18,H39DA28,A9:permanent,I2000,AA:supervisor,H39DA38
-39DA38:lAE:httpd_misc_sup|H39DAC0
-39DAC0:lAA:supervisor|N
-39DA28:t3:AE:httpd_misc_sup,A5:start,H39D958
-39D958:lH39D9FC|H39DA10
-39DA10:lI8888|H39DAB8
-39DAB8:lA7:silence|N
-39DA18:t3:AE:httpd_misc_sup,H39D9FC,I8888
-39D998:lH39DA64|N
-39DA64:t8:A5:child,P<0.44.0>,H39DAF0,H39DB00,A9:permanent,I2000,AA:supervisor,H39DB10
-39DB10:lA12:httpd_acceptor_sup|H39DB48
-39DB48:lAA:supervisor|N
-39DB00:t3:A12:httpd_acceptor_sup,A5:start,H39DB40
-39DB40:lH39D9FC|H39DB80
-39DB80:lI8888|H39DBC8
-39DBC8:lA7:silence|N
-39DAF0:t3:A12:httpd_acceptor_sup,H39D9FC,I8888
-39D960:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39D9CC:lAA:gen_server|H39DA90
-39DA90:lP<0.33.0>|H39DB20
-39DB20:lP<0.33.0>|H39DB60
-39DB60:lH39DBA4|H39DBB0
-39DBA4:t2:A5:local,A1A:httpd_sup__127_0_0_1__8888
-39DBB0:lAA:supervisor|H39DBF4
-39DBF4:lH39DC30|H39DC40
-39DC30:t3:H39D960,A9:httpd_sup,H39DA88
-39DC40:lN|N
-39D940:t2:AD:$initial_call,H39D9E4
-39D9E4:t3:A3:gen,A7:init_it,H39D9CC
-39D94C:t2:AA:$ancestors,H39D9F4
-39D9F4:lA8:web_tool|H39DAB0
-39DAB0:lP<0.27.0>|N
-=proc_dictionary:<0.44.0>
-H3756A8
-H3756B4
-H3756C0
-H3756CC
-=proc_stack:<0.44.0>
-36c194:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36C030
-y4:A1E:httpd_acc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36c1b0:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H375710
-=proc_heap:<0.44.0>
-36C030:tA:A5:state,H3756D8,AB:one_for_one,H36C028,N,I500,I100,N,A12:httpd_acceptor_sup,H375730
-375730:lA7:silence|N
-36C028:lH36C004|N
-36C004:t8:A5:child,P<0.47.0>,H36BE80,H36BE90,A9:permanent,I1000,A6:worker,H36BEA0
-36BEA0:lAE:httpd_acceptor|N
-36BE90:t3:AE:httpd_acceptor,AA:start_link,H36BEE8
-36BEE8:lP<0.46.0>|H36BEF0
-36BEF0:lA7:ip_comm|H36BEF8
-36BEF8:lH36BF00|H36BF14
-36BF00:t4:I127,I0,I0,I1
-36BF14:lI8888|H36BF1C
-36BF1C:lA1B:httpd_conf__127_0_0_1__8888|H36BF24
-36BF24:lA7:silence|N
-36BE80:t3:AE:httpd_acceptor,H36BED4,I8888
-36BED4:t4:I127,I0,I0,I1
-3756D8:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-375710:lAA:gen_server|H375738
-375738:lP<0.43.0>|H375748
-375748:lP<0.43.0>|H375758
-375758:lH375760|H37576C
-375760:t2:A5:local,A1E:httpd_acc_sup__127_0_0_1__8888
-37576C:lAA:supervisor|H375774
-375774:lH37577C|H37578C
-37577C:t3:H3756D8,A12:httpd_acceptor_sup,H375730
-37578C:lN|N
-3756A8:t2:AD:$initial_call,H375718
-375718:t3:A3:gen,A7:init_it,H375710
-3756B4:t2:A9:verbosity,A7:silence
-3756C0:t2:AA:$ancestors,H375728
-375728:lA1A:httpd_sup__127_0_0_1__8888|H375740
-375740:lA8:web_tool|H375750
-375750:lP<0.27.0>|N
-3756CC:t2:A5:sname,A7:acc_sup
-=proc_dictionary:<0.45.0>
-H36F484
-H36F4F4
-H36F468
-H36F500
-=proc_stack:<0.45.0>
-36f734:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AA:supervisor
-y3:H36F5D0
-y4:A1F:httpd_misc_sup__127_0_0_1__8888
-y5:P<0.43.0>
-36f750:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H36F430
-=proc_heap:<0.45.0>
-36F5D0:tA:A5:state,H36F3FC,AB:one_for_one,N,N,I0,I1,N,AE:httpd_misc_sup,H36F408
-36F408:lA7:silence|N
-36F3FC:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F430:lAA:gen_server|H36F428
-36F428:lP<0.43.0>|H36F420
-36F420:lP<0.43.0>|H36F3D0
-36F3D0:lH36F3E0|H36F418
-36F3E0:t2:A5:local,A1F:httpd_misc_sup__127_0_0_1__8888
-36F418:lAA:supervisor|H36F3D8
-36F3D8:lH36F3EC|H36F410
-36F3EC:t3:H36F3FC,AE:httpd_misc_sup,H36F408
-36F410:lN|N
-36F484:t2:AD:$initial_call,H36F474
-36F474:t3:A3:gen,A7:init_it,H36F430
-36F4F4:t2:A9:verbosity,A7:silence
-36F468:t2:AA:$ancestors,H36F460
-36F460:lA1A:httpd_sup__127_0_0_1__8888|H36F440
-36F440:lA8:web_tool|H36F438
-36F438:lP<0.27.0>|N
-36F500:t2:A5:sname,A8:misc_sup
-=proc_dictionary:<0.46.0>
-H3BDA50
-H3BDA5C
-H3BDAC8
-H3BDB28
-H3BDB9C
-H3BDC00
-H3BDADC
-H3BDB3C
-=proc_stack:<0.46.0>
-39d8f4:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:AD:httpd_manager
-y3:H39D5A4
-y4:A16:httpd__127_0_0_1__8888
-y5:P<0.43.0>
-39d910:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H3BDAB0
-=proc_heap:<0.46.0>
-39D5A4:t9:A5:state,A7:ip_comm,A9:undefined,A1B:httpd_conf__127_0_0_1__8888,N,A9:unblocked,A9:undefined,A9:undefined,H39D430
-39D430:lH39BF40|H39D428
-39BF40:t2:A8:max_conn,I1
-39D428:lH39BC80|H39D420
-39BC80:t2:AF:last_heavy_load,A5:never
-39D420:lH39D414|N
-39D414:t2:AF:last_connection,H39D408
-39D408:t2:H39D3E8,H39D3F8
-39D3F8:t3:I11,I22,I34
-39D3E8:t3:I2004,I4,I21
-3BDAB0:lAA:gen_server|H3BDB20
-3BDB20:lP<0.43.0>|H3BDB94
-3BDB94:lP<0.43.0>|H3BDBF8
-3BDBF8:lH3BDC48|H3BDC54
-3BDC48:t2:A5:local,A16:httpd__127_0_0_1__8888
-3BDC54:lAD:httpd_manager|H3BDCAC
-3BDCAC:lH3BDD14|H3BDD1C
-3BDD14:lA9:undefined|H3BDD9C
-3BDD9C:lH3BDA84|H3BDE2C
-3BDA84:lH3BDAF0|H3BDAFC
-3BDAF0:t2:AB:server_root,H3BDB48
-3BDB48:lI47|H3BDBB0
-3BDBB0:lI99|H3BDC0C
-3BDC0C:lI108|H3BDC64
-3BDC64:lI101|H3BDCBC
-3BDCBC:lI97|H3BDD2C
-3BDD2C:lI114|H3BDDA4
-3BDDA4:lI99|H3BDE34
-3BDE34:lI97|H3BDED4
-3BDED4:lI115|H3BDF90
-3BDF90:lI101|H3BE054
-3BE054:lI47|H3BE128
-3BE128:lI111|H3BE204
-3BE204:lI116|H3BE2EC
-3BE2EC:lI112|H3BE3E0
-3BE3E0:lI47|H3BE4E4
-3BE4E4:lI101|H3BE5E8
-3BE5E8:lI114|H3BE6EC
-3BE6EC:lI116|H3BE7E0
-3BE7E0:lI115|H3BE8CC
-3BE8CC:lI47|H3BE9B8
-3BE9B8:lI108|H3BEAAC
-3BEAAC:lI105|H3BEB98
-3BEB98:lI98|H3BEC84
-3BEC84:lI47|H3BED70
-3BED70:lI119|H3BEE5C
-3BEE5C:lI101|H3BEF30
-3BEF30:lI98|H3BEFFC
-3BEFFC:lI116|H3BF0C8
-3BF0C8:lI111|H3BF19C
-3BF19C:lI111|H3BF260
-3BF260:lI108|H3BF314
-3BF314:lI47|H3BF3C0
-3BF3C0:lI112|H3BF474
-3BF474:lI114|H3BF530
-3BF530:lI105|H3BF5F4
-3BF5F4:lI118|H3BF6C8
-3BF6C8:lI47|H3BF79C
-3BF79C:lI114|H3BF870
-3BF870:lI111|H3BF954
-3BF954:lI111|H3BFA30
-3BFA30:lI116|N
-3BDAFC:lH3BDB50|H3BDB5C
-3BDB50:t2:AD:document_root,H3BDBB8
-3BDBB8:lI47|H3BDC14
-3BDC14:lI99|H3BDC6C
-3BDC6C:lI108|H3BDCC4
-3BDCC4:lI101|H3BDD34
-3BDD34:lI97|H3BDDAC
-3BDDAC:lI114|H3BDE3C
-3BDE3C:lI99|H3BDEDC
-3BDEDC:lI97|H3BDF98
-3BDF98:lI115|H3BE05C
-3BE05C:lI101|H3BE130
-3BE130:lI47|H3BE20C
-3BE20C:lI111|H3BE2F4
-3BE2F4:lI116|H3BE3E8
-3BE3E8:lI112|H3BE4EC
-3BE4EC:lI47|H3BE5F0
-3BE5F0:lI101|H3BE6F4
-3BE6F4:lI114|H3BE7E8
-3BE7E8:lI116|H3BE8D4
-3BE8D4:lI115|H3BE9C0
-3BE9C0:lI47|H3BEAB4
-3BEAB4:lI108|H3BEBA0
-3BEBA0:lI105|H3BEC8C
-3BEC8C:lI98|H3BED78
-3BED78:lI47|H3BEE64
-3BEE64:lI119|H3BEF38
-3BEF38:lI101|H3BF004
-3BF004:lI98|H3BF0D0
-3BF0D0:lI116|H3BF1A4
-3BF1A4:lI111|H3BF268
-3BF268:lI111|H3BF31C
-3BF31C:lI108|H3BF3C8
-3BF3C8:lI47|H3BF47C
-3BF47C:lI112|H3BF538
-3BF538:lI114|H3BF5FC
-3BF5FC:lI105|H3BF6D0
-3BF6D0:lI118|H3BF7A4
-3BF7A4:lI47|H3BF878
-3BF878:lI114|H3BF95C
-3BF95C:lI111|H3BFA38
-3BFA38:lI111|H3BFB0C
-3BFB0C:lI116|H3BFBE8
-3BFBE8:lI47|H3BFCB4
-3BFCB4:lI100|H3BFD78
-3BFD78:lI111|H3BFE3C
-3BFE3C:lI99|N
-3BDB5C:lH3BDBC0|H3BDBCC
-3BDBC0:t2:AA:mime_types,H3BDC1C
-3BDC1C:lH3BDC74|H3BDC80
-3BDC74:t2:H3BDCCC,H3BDCD4
-3BDCD4:lI120|H3BDD44
-3BDD44:lI45|H3BDDBC
-3BDDBC:lI119|H3BDE44
-3BDE44:lI111|H3BDEE4
-3BDEE4:lI114|H3BDFA0
-3BDFA0:lI108|H3BE064
-3BE064:lI100|H3BE138
-3BE138:lI47|H3BE214
-3BE214:lI120|H3BE2FC
-3BE2FC:lI45|H3BE3F0
-3BE3F0:lI118|H3BE4F4
-3BE4F4:lI114|H3BE5F8
-3BE5F8:lI109|H3BE6FC
-3BE6FC:lI108|N
-3BDCCC:lI119|H3BDD3C
-3BDD3C:lI114|H3BDDB4
-3BDDB4:lI108|N
-3BDC80:lH3BDCDC|H3BDCE8
-3BDCDC:t2:H3BDD4C,H3BDD54
-3BDD54:lI120|H3BDDCC
-3BDDCC:lI45|H3BDE54
-3BDE54:lI119|H3BDEF4
-3BDEF4:lI111|H3BDFA8
-3BDFA8:lI114|H3BE06C
-3BE06C:lI108|H3BE140
-3BE140:lI100|H3BE21C
-3BE21C:lI47|H3BE304
-3BE304:lI120|H3BE3F8
-3BE3F8:lI45|H3BE4FC
-3BE4FC:lI118|H3BE600
-3BE600:lI114|H3BE704
-3BE704:lI109|H3BE7F0
-3BE7F0:lI108|N
-3BDD4C:lI118|H3BDDC4
-3BDDC4:lI114|H3BDE4C
-3BDE4C:lI109|H3BDEEC
-3BDEEC:lI108|N
-3BDCE8:lH3BDD5C|H3BDD68
-3BDD5C:t2:H3BDDD4,H3BDDDC
-3BDDDC:lI120|H3BDE64
-3BDE64:lI45|H3BDF04
-3BDF04:lI99|H3BDFB0
-3BDFB0:lI111|H3BE074
-3BE074:lI110|H3BE148
-3BE148:lI102|H3BE224
-3BE224:lI101|H3BE30C
-3BE30C:lI114|H3BE400
-3BE400:lI101|H3BE504
-3BE504:lI110|H3BE608
-3BE608:lI99|H3BE70C
-3BE70C:lI101|H3BE7F8
-3BE7F8:lI47|H3BE8DC
-3BE8DC:lI120|H3BE9C8
-3BE9C8:lI45|H3BEABC
-3BEABC:lI99|H3BEBA8
-3BEBA8:lI111|H3BEC94
-3BEC94:lI111|H3BED80
-3BED80:lI108|H3BEE6C
-3BEE6C:lI116|H3BEF40
-3BEF40:lI97|H3BF00C
-3BF00C:lI108|H3BF0D8
-3BF0D8:lI107|N
-3BDDD4:lI105|H3BDE5C
-3BDE5C:lI99|H3BDEFC
-3BDEFC:lI101|N
-3BDD68:lH3BDDE4|H3BDDF0
-3BDDE4:t2:H3BDE6C,H3BDE74
-3BDE74:lI118|H3BDF14
-3BDF14:lI105|H3BDFC0
-3BDFC0:lI100|H3BE084
-3BE084:lI101|H3BE158
-3BE158:lI111|H3BE22C
-3BE22C:lI47|H3BE314
-3BE314:lI120|H3BE408
-3BE408:lI45|H3BE50C
-3BE50C:lI115|H3BE610
-3BE610:lI103|H3BE714
-3BE714:lI105|H3BE800
-3BE800:lI45|H3BE8E4
-3BE8E4:lI109|H3BE9D0
-3BE9D0:lI111|H3BEAC4
-3BEAC4:lI118|H3BEBB0
-3BEBB0:lI105|H3BEC9C
-3BEC9C:lI101|N
-3BDE6C:lI109|H3BDF0C
-3BDF0C:lI111|H3BDFB8
-3BDFB8:lI118|H3BE07C
-3BE07C:lI105|H3BE150
-3BE150:lI101|N
-3BDDF0:lH3BDE7C|H3BDE88
-3BDE7C:t2:H3BDF1C,H3BDF24
-3BDF24:lI118|H3BDFD0
-3BDFD0:lI105|H3BE094
-3BE094:lI100|H3BE160
-3BE160:lI101|H3BE234
-3BE234:lI111|H3BE31C
-3BE31C:lI47|H3BE410
-3BE410:lI120|H3BE514
-3BE514:lI45|H3BE618
-3BE618:lI109|H3BE71C
-3BE71C:lI115|H3BE808
-3BE808:lI118|H3BE8EC
-3BE8EC:lI105|H3BE9D8
-3BE9D8:lI100|H3BEACC
-3BEACC:lI101|H3BEBB8
-3BEBB8:lI111|N
-3BDF1C:lI97|H3BDFC8
-3BDFC8:lI118|H3BE08C
-3BE08C:lI105|N
-3BDE88:lH3BDF2C|H3BDF38
-3BDF2C:t2:H3BDFD8,H3BDFE0
-3BDFE0:lI118|H3BE0A4
-3BE0A4:lI105|H3BE168
-3BE168:lI100|H3BE23C
-3BE23C:lI101|H3BE324
-3BE324:lI111|H3BE418
-3BE418:lI47|H3BE51C
-3BE51C:lI113|H3BE620
-3BE620:lI117|H3BE724
-3BE724:lI105|H3BE810
-3BE810:lI99|H3BE8F4
-3BE8F4:lI107|H3BE9E0
-3BE9E0:lI116|H3BEAD4
-3BEAD4:lI105|H3BEBC0
-3BEBC0:lI109|H3BECA4
-3BECA4:lI101|N
-3BDFD8:lI113|H3BE09C
-3BE09C:lI116|N
-3BDF38:lH3BDFE8|H3BDFF4
-3BDFE8:t2:H3BE0AC,H3BE0B4
-3BE0B4:lI118|H3BE178
-3BE178:lI105|H3BE24C
-3BE24C:lI100|H3BE32C
-3BE32C:lI101|H3BE420
-3BE420:lI111|H3BE524
-3BE524:lI47|H3BE628
-3BE628:lI113|H3BE72C
-3BE72C:lI117|H3BE818
-3BE818:lI105|H3BE8FC
-3BE8FC:lI99|H3BE9E8
-3BE9E8:lI107|H3BEADC
-3BEADC:lI116|H3BEBC8
-3BEBC8:lI105|H3BECAC
-3BECAC:lI109|H3BED88
-3BED88:lI101|N
-3BE0AC:lI109|H3BE170
-3BE170:lI111|H3BE244
-3BE244:lI118|N
-3BDFF4:lH3BE0BC|H3BE0C8
-3BE0BC:t2:H3BE180,H3BE188
-3BE188:lI118|H3BE25C
-3BE25C:lI105|H3BE33C
-3BE33C:lI100|H3BE430
-3BE430:lI101|H3BE52C
-3BE52C:lI111|H3BE630
-3BE630:lI47|H3BE734
-3BE734:lI109|H3BE820
-3BE820:lI112|H3BE904
-3BE904:lI101|H3BE9F0
-3BE9F0:lI103|N
-3BE180:lI109|H3BE254
-3BE254:lI112|H3BE334
-3BE334:lI101|H3BE428
-3BE428:lI103|N
-3BE0C8:lH3BE190|H3BE19C
-3BE190:t2:H3BE264,H3BE26C
-3BE26C:lI118|H3BE34C
-3BE34C:lI105|H3BE440
-3BE440:lI100|H3BE534
-3BE534:lI101|H3BE638
-3BE638:lI111|H3BE73C
-3BE73C:lI47|H3BE828
-3BE828:lI109|H3BE90C
-3BE90C:lI112|H3BE9F8
-3BE9F8:lI101|H3BEAE4
-3BEAE4:lI103|N
-3BE264:lI109|H3BE344
-3BE344:lI112|H3BE438
-3BE438:lI103|N
-3BE19C:lH3BE274|H3BE280
-3BE274:t2:H3BE354,H3BE35C
-3BE35C:lI118|H3BE450
-3BE450:lI105|H3BE544
-3BE544:lI100|H3BE640
-3BE640:lI101|H3BE744
-3BE744:lI111|H3BE830
-3BE830:lI47|H3BE914
-3BE914:lI109|H3BEA00
-3BEA00:lI112|H3BEAEC
-3BEAEC:lI101|H3BEBD0
-3BEBD0:lI103|N
-3BE354:lI109|H3BE448
-3BE448:lI112|H3BE53C
-3BE53C:lI101|N
-3BE280:lH3BE364|H3BE370
-3BE364:t2:H3BE458,H3BE460
-3BE460:lI116|H3BE554
-3BE554:lI101|H3BE650
-3BE650:lI120|H3BE754
-3BE754:lI116|H3BE838
-3BE838:lI47|H3BE91C
-3BE91C:lI120|H3BEA08
-3BEA08:lI45|H3BEAF4
-3BEAF4:lI115|H3BEBD8
-3BEBD8:lI103|H3BECB4
-3BECB4:lI109|H3BED90
-3BED90:lI108|N
-3BE458:lI115|H3BE54C
-3BE54C:lI103|H3BE648
-3BE648:lI109|H3BE74C
-3BE74C:lI108|N
-3BE370:lH3BE468|H3BE474
-3BE468:t2:H3BE55C,H3BE564
-3BE564:lI116|H3BE660
-3BE660:lI101|H3BE764
-3BE764:lI120|H3BE840
-3BE840:lI116|H3BE924
-3BE924:lI47|H3BEA10
-3BEA10:lI120|H3BEAFC
-3BEAFC:lI45|H3BEBE0
-3BEBE0:lI115|H3BECBC
-3BECBC:lI103|H3BED98
-3BED98:lI109|H3BEE74
-3BEE74:lI108|N
-3BE55C:lI115|H3BE658
-3BE658:lI103|H3BE75C
-3BE75C:lI109|N
-3BE474:lH3BE56C|H3BE578
-3BE56C:t2:H3BE668,H3BE670
-3BE670:lI116|H3BE774
-3BE774:lI101|H3BE850
-3BE850:lI120|H3BE92C
-3BE92C:lI116|H3BEA18
-3BEA18:lI47|H3BEB04
-3BEB04:lI120|H3BEBE8
-3BEBE8:lI45|H3BECC4
-3BECC4:lI115|H3BEDA0
-3BEDA0:lI101|H3BEE7C
-3BEE7C:lI116|H3BEF48
-3BEF48:lI101|H3BF014
-3BF014:lI120|H3BF0E0
-3BF0E0:lI116|N
-3BE668:lI101|H3BE76C
-3BE76C:lI116|H3BE848
-3BE848:lI120|N
-3BE578:lH3BE678|H3BE684
-3BE678:t2:H3BE77C,H3BE784
-3BE784:lI116|H3BE860
-3BE860:lI101|H3BE93C
-3BE93C:lI120|H3BEA20
-3BEA20:lI116|H3BEB0C
-3BEB0C:lI47|H3BEBF0
-3BEBF0:lI116|H3BECCC
-3BECCC:lI97|H3BEDA8
-3BEDA8:lI98|H3BEE84
-3BEE84:lI45|H3BEF50
-3BEF50:lI115|H3BF01C
-3BF01C:lI101|H3BF0E8
-3BF0E8:lI112|H3BF1AC
-3BF1AC:lI97|H3BF270
-3BF270:lI114|H3BF324
-3BF324:lI97|H3BF3D0
-3BF3D0:lI116|H3BF484
-3BF484:lI101|H3BF540
-3BF540:lI100|H3BF604
-3BF604:lI45|H3BF6D8
-3BF6D8:lI118|H3BF7AC
-3BF7AC:lI97|H3BF880
-3BF880:lI108|H3BF964
-3BF964:lI117|H3BFA40
-3BFA40:lI101|H3BFB14
-3BFB14:lI115|N
-3BE77C:lI116|H3BE858
-3BE858:lI115|H3BE934
-3BE934:lI118|N
-3BE684:lH3BE78C|H3BE798
-3BE78C:t2:H3BE868,H3BE870
-3BE870:lI116|H3BE94C
-3BE94C:lI101|H3BEA30
-3BEA30:lI120|H3BEB14
-3BEB14:lI116|H3BEBF8
-3BEBF8:lI47|H3BECD4
-3BECD4:lI114|H3BEDB0
-3BEDB0:lI105|H3BEE8C
-3BEE8C:lI99|H3BEF58
-3BEF58:lI104|H3BF024
-3BF024:lI116|H3BF0F0
-3BF0F0:lI101|H3BF1B4
-3BF1B4:lI120|H3BF278
-3BF278:lI116|N
-3BE868:lI114|H3BE944
-3BE944:lI116|H3BEA28
-3BEA28:lI120|N
-3BE798:lH3BE878|H3BE884
-3BE878:t2:H3BE954,H3BE95C
-3BE95C:lI116|H3BEA40
-3BEA40:lI101|H3BEB24
-3BEB24:lI120|H3BEC00
-3BEC00:lI116|H3BECDC
-3BECDC:lI47|H3BEDB8
-3BEDB8:lI112|H3BEE94
-3BEE94:lI108|H3BEF60
-3BEF60:lI97|H3BF02C
-3BF02C:lI105|H3BF0F8
-3BF0F8:lI110|N
-3BE954:lI116|H3BEA38
-3BEA38:lI120|H3BEB1C
-3BEB1C:lI116|N
-3BE884:lH3BE964|H3BE970
-3BE964:t2:H3BEA48,H3BEA50
-3BEA50:lI116|H3BEB34
-3BEB34:lI101|H3BEC10
-3BEC10:lI120|H3BECEC
-3BECEC:lI116|H3BEDC8
-3BEDC8:lI47|H3BEE9C
-3BEE9C:lI120|H3BEF68
-3BEF68:lI45|H3BF034
-3BF034:lI115|H3BF100
-3BF100:lI101|H3BF1BC
-3BF1BC:lI114|H3BF280
-3BF280:lI118|H3BF32C
-3BF32C:lI101|H3BF3D8
-3BF3D8:lI114|H3BF48C
-3BF48C:lI45|H3BF548
-3BF548:lI112|H3BF60C
-3BF60C:lI97|H3BF6E0
-3BF6E0:lI114|H3BF7B4
-3BF7B4:lI115|H3BF888
-3BF888:lI101|H3BF96C
-3BF96C:lI100|H3BFA48
-3BFA48:lI45|H3BFB1C
-3BFB1C:lI104|H3BFBF0
-3BFBF0:lI116|H3BFCBC
-3BFCBC:lI109|H3BFD80
-3BFD80:lI108|N
-3BEA48:lI115|H3BEB2C
-3BEB2C:lI104|H3BEC08
-3BEC08:lI116|H3BECE4
-3BECE4:lI109|H3BEDC0
-3BEDC0:lI108|N
-3BE970:lH3BEA58|H3BEA64
-3BEA58:t2:H3BEB3C,H3BEB44
-3BEB44:lI116|H3BEC20
-3BEC20:lI101|H3BECFC
-3BECFC:lI120|H3BEDD8
-3BEDD8:lI116|H3BEEA4
-3BEEA4:lI47|H3BEF70
-3BEF70:lI104|H3BF03C
-3BF03C:lI116|H3BF108
-3BF108:lI109|H3BF1C4
-3BF1C4:lI108|N
-3BEB3C:lI104|H3BEC18
-3BEC18:lI116|H3BECF4
-3BECF4:lI109|H3BEDD0
-3BEDD0:lI108|N
-3BEA64:lH3BEB4C|H3BEB58
-3BEB4C:t2:H3BEC28,H3BEC30
-3BEC30:lI116|H3BED0C
-3BED0C:lI101|H3BEDE8
-3BEDE8:lI120|H3BEEAC
-3BEEAC:lI116|H3BEF78
-3BEF78:lI47|H3BF044
-3BF044:lI104|H3BF110
-3BF110:lI116|H3BF1CC
-3BF1CC:lI109|H3BF288
-3BF288:lI108|N
-3BEC28:lI104|H3BED04
-3BED04:lI116|H3BEDE0
-3BEDE0:lI109|N
-3BEB58:lH3BEC38|H3BEC44
-3BEC38:t2:H3BED14,H3BED1C
-3BED1C:lI105|H3BEDF8
-3BEDF8:lI109|H3BEEBC
-3BEEBC:lI97|H3BEF80
-3BEF80:lI103|H3BF04C
-3BF04C:lI101|H3BF118
-3BF118:lI47|H3BF1D4
-3BF1D4:lI120|H3BF290
-3BF290:lI45|H3BF334
-3BF334:lI120|H3BF3E0
-3BF3E0:lI119|H3BF494
-3BF494:lI105|H3BF550
-3BF550:lI110|H3BF614
-3BF614:lI100|H3BF6E8
-3BF6E8:lI111|H3BF7BC
-3BF7BC:lI119|H3BF890
-3BF890:lI100|H3BF974
-3BF974:lI117|H3BFA50
-3BFA50:lI109|H3BFB24
-3BFB24:lI112|N
-3BED14:lI120|H3BEDF0
-3BEDF0:lI119|H3BEEB4
-3BEEB4:lI100|N
-3BEC44:lH3BED24|H3BED30
-3BED24:t2:H3BEE00,H3BEE08
-3BEE08:lI105|H3BEECC
-3BEECC:lI109|H3BEF90
-3BEF90:lI97|H3BF054
-3BF054:lI103|H3BF120
-3BF120:lI101|H3BF1DC
-3BF1DC:lI47|H3BF298
-3BF298:lI120|H3BF33C
-3BF33C:lI45|H3BF3E8
-3BF3E8:lI120|H3BF49C
-3BF49C:lI112|H3BF558
-3BF558:lI105|H3BF61C
-3BF61C:lI120|H3BF6F0
-3BF6F0:lI109|H3BF7C4
-3BF7C4:lI97|H3BF898
-3BF898:lI112|N
-3BEE00:lI120|H3BEEC4
-3BEEC4:lI112|H3BEF88
-3BEF88:lI109|N
-3BED30:lH3BEE10|H3BEE1C
-3BEE10:t2:H3BEED4,H3BEEDC
-3BEEDC:lI105|H3BEFA0
-3BEFA0:lI109|H3BF064
-3BF064:lI97|H3BF128
-3BF128:lI103|H3BF1E4
-3BF1E4:lI101|H3BF2A0
-3BF2A0:lI47|H3BF344
-3BF344:lI120|H3BF3F0
-3BF3F0:lI45|H3BF4A4
-3BF4A4:lI120|H3BF560
-3BF560:lI98|H3BF624
-3BF624:lI105|H3BF6F8
-3BF6F8:lI116|H3BF7CC
-3BF7CC:lI109|H3BF8A0
-3BF8A0:lI97|H3BF97C
-3BF97C:lI112|N
-3BEED4:lI120|H3BEF98
-3BEF98:lI98|H3BF05C
-3BF05C:lI109|N
-3BEE1C:lH3BEEE4|H3BEEF0
-3BEEE4:t2:H3BEFA8,H3BEFB0
-3BEFB0:lI105|H3BF074
-3BF074:lI109|H3BF138
-3BF138:lI97|H3BF1EC
-3BF1EC:lI103|H3BF2A8
-3BF2A8:lI101|H3BF34C
-3BF34C:lI47|H3BF3F8
-3BF3F8:lI120|H3BF4AC
-3BF4AC:lI45|H3BF568
-3BF568:lI114|H3BF62C
-3BF62C:lI103|H3BF700
-3BF700:lI98|N
-3BEFA8:lI114|H3BF06C
-3BF06C:lI103|H3BF130
-3BF130:lI98|N
-3BEEF0:lH3BEFB8|H3BEFC4
-3BEFB8:t2:H3BF07C,H3BF084
-3BF084:lI105|H3BF148
-3BF148:lI109|H3BF1FC
-3BF1FC:lI97|H3BF2B0
-3BF2B0:lI103|H3BF354
-3BF354:lI101|H3BF400
-3BF400:lI47|H3BF4B4
-3BF4B4:lI120|H3BF570
-3BF570:lI45|H3BF634
-3BF634:lI112|H3BF708
-3BF708:lI111|H3BF7D4
-3BF7D4:lI114|H3BF8A8
-3BF8A8:lI116|H3BF984
-3BF984:lI97|H3BFA58
-3BFA58:lI98|H3BFB2C
-3BFB2C:lI108|H3BFBF8
-3BFBF8:lI101|H3BFCC4
-3BFCC4:lI45|H3BFD88
-3BFD88:lI112|H3BFE44
-3BFE44:lI105|H3BFEF0
-3BFEF0:lI120|H3BFFA4
-3BFFA4:lI109|H3C0050
-3C0050:lI97|H3C00FC
-3C00FC:lI112|N
-3BF07C:lI112|H3BF140
-3BF140:lI112|H3BF1F4
-3BF1F4:lI109|N
-3BEFC4:lH3BF08C|H3BF098
-3BF08C:t2:H3BF150,H3BF158
-3BF158:lI105|H3BF20C
-3BF20C:lI109|H3BF2C0
-3BF2C0:lI97|H3BF35C
-3BF35C:lI103|H3BF408
-3BF408:lI101|H3BF4BC
-3BF4BC:lI47|H3BF578
-3BF578:lI120|H3BF63C
-3BF63C:lI45|H3BF710
-3BF710:lI112|H3BF7DC
-3BF7DC:lI111|H3BF8B0
-3BF8B0:lI114|H3BF98C
-3BF98C:lI116|H3BFA60
-3BFA60:lI97|H3BFB34
-3BFB34:lI98|H3BFC00
-3BFC00:lI108|H3BFCCC
-3BFCCC:lI101|H3BFD90
-3BFD90:lI45|H3BFE4C
-3BFE4C:lI103|H3BFEF8
-3BFEF8:lI114|H3BFFAC
-3BFFAC:lI97|H3C0058
-3C0058:lI121|H3C0104
-3C0104:lI109|H3C01A8
-3C01A8:lI97|H3C025C
-3C025C:lI112|N
-3BF150:lI112|H3BF204
-3BF204:lI103|H3BF2B8
-3BF2B8:lI109|N
-3BF098:lH3BF160|H3BF16C
-3BF160:t2:H3BF214,H3BF21C
-3BF21C:lI105|H3BF2D0
-3BF2D0:lI109|H3BF36C
-3BF36C:lI97|H3BF410
-3BF410:lI103|H3BF4C4
-3BF4C4:lI101|H3BF580
-3BF580:lI47|H3BF644
-3BF644:lI120|H3BF718
-3BF718:lI45|H3BF7E4
-3BF7E4:lI112|H3BF8B8
-3BF8B8:lI111|H3BF994
-3BF994:lI114|H3BFA68
-3BFA68:lI116|H3BFB3C
-3BFB3C:lI97|H3BFC08
-3BFC08:lI98|H3BFCD4
-3BFCD4:lI108|H3BFD98
-3BFD98:lI101|H3BFE54
-3BFE54:lI45|H3BFF00
-3BFF00:lI98|H3BFFB4
-3BFFB4:lI105|H3C0060
-3C0060:lI116|H3C010C
-3C010C:lI109|H3C01B0
-3C01B0:lI97|H3C0264
-3C0264:lI112|N
-3BF214:lI112|H3BF2C8
-3BF2C8:lI98|H3BF364
-3BF364:lI109|N
-3BF16C:lH3BF224|H3BF230
-3BF224:t2:H3BF2D8,H3BF2E0
-3BF2E0:lI105|H3BF37C
-3BF37C:lI109|H3BF420
-3BF420:lI97|H3BF4CC
-3BF4CC:lI103|H3BF588
-3BF588:lI101|H3BF64C
-3BF64C:lI47|H3BF720
-3BF720:lI120|H3BF7EC
-3BF7EC:lI45|H3BF8C0
-3BF8C0:lI112|H3BF99C
-3BF99C:lI111|H3BFA70
-3BFA70:lI114|H3BFB44
-3BFB44:lI116|H3BFC10
-3BFC10:lI97|H3BFCDC
-3BFCDC:lI98|H3BFDA0
-3BFDA0:lI108|H3BFE5C
-3BFE5C:lI101|H3BFF08
-3BFF08:lI45|H3BFFBC
-3BFFBC:lI97|H3C0068
-3C0068:lI110|H3C0114
-3C0114:lI121|H3C01B8
-3C01B8:lI109|H3C026C
-3C026C:lI97|H3C0318
-3C0318:lI112|N
-3BF2D8:lI112|H3BF374
-3BF374:lI110|H3BF418
-3BF418:lI109|N
-3BF230:lH3BF2E8|H3BF2F4
-3BF2E8:t2:H3BF384,H3BF38C
-3BF38C:lI105|H3BF430
-3BF430:lI109|H3BF4DC
-3BF4DC:lI97|H3BF590
-3BF590:lI103|H3BF654
-3BF654:lI101|H3BF728
-3BF728:lI47|H3BF7F4
-3BF7F4:lI120|H3BF8C8
-3BF8C8:lI45|H3BF9A4
-3BF9A4:lI99|H3BFA78
-3BFA78:lI109|H3BFB4C
-3BFB4C:lI117|H3BFC18
-3BFC18:lI45|H3BFCE4
-3BFCE4:lI114|H3BFDA8
-3BFDA8:lI97|H3BFE64
-3BFE64:lI115|H3BFF10
-3BFF10:lI116|H3BFFC4
-3BFFC4:lI101|H3C0070
-3C0070:lI114|N
-3BF384:lI114|H3BF428
-3BF428:lI97|H3BF4D4
-3BF4D4:lI115|N
-3BF2F4:lH3BF394|H3BF3A0
-3BF394:t2:H3BF438,H3BF440
-3BF440:lI105|H3BF4EC
-3BF4EC:lI109|H3BF5A0
-3BF5A0:lI97|H3BF664
-3BF664:lI103|H3BF730
-3BF730:lI101|H3BF7FC
-3BF7FC:lI47|H3BF8D0
-3BF8D0:lI116|H3BF9AC
-3BF9AC:lI105|H3BFA80
-3BFA80:lI102|H3BFB54
-3BFB54:lI102|N
-3BF438:lI116|H3BF4E4
-3BF4E4:lI105|H3BF598
-3BF598:lI102|H3BF65C
-3BF65C:lI102|N
-3BF3A0:lH3BF448|H3BF454
-3BF448:t2:H3BF4F4,H3BF4FC
-3BF4FC:lI105|H3BF5B0
-3BF5B0:lI109|H3BF674
-3BF674:lI97|H3BF738
-3BF738:lI103|H3BF804
-3BF804:lI101|H3BF8D8
-3BF8D8:lI47|H3BF9B4
-3BF9B4:lI116|H3BFA88
-3BFA88:lI105|H3BFB5C
-3BFB5C:lI102|H3BFC20
-3BFC20:lI102|N
-3BF4F4:lI116|H3BF5A8
-3BF5A8:lI105|H3BF66C
-3BF66C:lI102|N
-3BF454:lH3BF504|H3BF510
-3BF504:t2:H3BF5B8,H3BF5C0
-3BF5C0:lI105|H3BF684
-3BF684:lI109|H3BF748
-3BF748:lI97|H3BF80C
-3BF80C:lI103|H3BF8E0
-3BF8E0:lI101|H3BF9BC
-3BF9BC:lI47|H3BFA90
-3BFA90:lI112|H3BFB64
-3BFB64:lI110|H3BFC28
-3BFC28:lI103|N
-3BF5B8:lI112|H3BF67C
-3BF67C:lI110|H3BF740
-3BF740:lI103|N
-3BF510:lH3BF5C8|H3BF5D4
-3BF5C8:t2:H3BF68C,H3BF694
-3BF694:lI105|H3BF758
-3BF758:lI109|H3BF81C
-3BF81C:lI97|H3BF8F0
-3BF8F0:lI103|H3BF9C4
-3BF9C4:lI101|H3BFA98
-3BFA98:lI47|H3BFB6C
-3BFB6C:lI106|H3BFC30
-3BFC30:lI112|H3BFCEC
-3BFCEC:lI101|H3BFDB0
-3BFDB0:lI103|N
-3BF68C:lI106|H3BF750
-3BF750:lI112|H3BF814
-3BF814:lI101|H3BF8E8
-3BF8E8:lI103|N
-3BF5D4:lH3BF69C|H3BF6A8
-3BF69C:t2:H3BF760,H3BF768
-3BF768:lI105|H3BF82C
-3BF82C:lI109|H3BF900
-3BF900:lI97|H3BF9CC
-3BF9CC:lI103|H3BFAA0
-3BFAA0:lI101|H3BFB74
-3BFB74:lI47|H3BFC38
-3BFC38:lI106|H3BFCF4
-3BFCF4:lI112|H3BFDB8
-3BFDB8:lI101|H3BFE6C
-3BFE6C:lI103|N
-3BF760:lI106|H3BF824
-3BF824:lI112|H3BF8F8
-3BF8F8:lI103|N
-3BF6A8:lH3BF770|H3BF77C
-3BF770:t2:H3BF834,H3BF83C
-3BF83C:lI105|H3BF910
-3BF910:lI109|H3BF9DC
-3BF9DC:lI97|H3BFAA8
-3BFAA8:lI103|H3BFB7C
-3BFB7C:lI101|H3BFC40
-3BFC40:lI47|H3BFCFC
-3BFCFC:lI106|H3BFDC0
-3BFDC0:lI112|H3BFE74
-3BFE74:lI101|H3BFF18
-3BFF18:lI103|N
-3BF834:lI106|H3BF908
-3BF908:lI112|H3BF9D4
-3BF9D4:lI101|N
-3BF77C:lH3BF844|H3BF850
-3BF844:t2:H3BF918,H3BF920
-3BF920:lI105|H3BF9EC
-3BF9EC:lI109|H3BFAB8
-3BFAB8:lI97|H3BFB84
-3BFB84:lI103|H3BFC48
-3BFC48:lI101|H3BFD04
-3BFD04:lI47|H3BFDC8
-3BFDC8:lI105|H3BFE7C
-3BFE7C:lI101|H3BFF20
-3BFF20:lI102|N
-3BF918:lI105|H3BF9E4
-3BF9E4:lI101|H3BFAB0
-3BFAB0:lI102|N
-3BF850:lH3BF928|H3BF934
-3BF928:t2:H3BF9F4,H3BF9FC
-3BF9FC:lI105|H3BFAC8
-3BFAC8:lI109|H3BFB94
-3BFB94:lI97|H3BFC50
-3BFC50:lI103|H3BFD0C
-3BFD0C:lI101|H3BFDD0
-3BFDD0:lI47|H3BFE84
-3BFE84:lI103|H3BFF28
-3BFF28:lI105|H3BFFCC
-3BFFCC:lI102|N
-3BF9F4:lI103|H3BFAC0
-3BFAC0:lI105|H3BFB8C
-3BFB8C:lI102|N
-3BF934:lH3BFA04|H3BFA10
-3BFA04:t2:H3BFAD0,H3BFAD8
-3BFAD8:lI99|H3BFBA4
-3BFBA4:lI104|H3BFC60
-3BFC60:lI101|H3BFD14
-3BFD14:lI109|H3BFDD8
-3BFDD8:lI105|H3BFE8C
-3BFE8C:lI99|H3BFF30
-3BFF30:lI97|H3BFFD4
-3BFFD4:lI108|H3C0078
-3C0078:lI47|H3C011C
-3C011C:lI120|H3C01C0
-3C01C0:lI45|H3C0274
-3C0274:lI112|H3C0320
-3C0320:lI100|H3C03CC
-3C03CC:lI98|N
-3BFAD0:lI112|H3BFB9C
-3BFB9C:lI100|H3BFC58
-3BFC58:lI98|N
-3BFA10:lH3BFAE0|H3BFAEC
-3BFAE0:t2:H3BFBAC,H3BFBB4
-3BFBB4:lI99|H3BFC70
-3BFC70:lI104|H3BFD24
-3BFD24:lI101|H3BFDE0
-3BFDE0:lI109|H3BFE94
-3BFE94:lI105|H3BFF38
-3BFF38:lI99|H3BFFDC
-3BFFDC:lI97|H3C0080
-3C0080:lI108|H3C0124
-3C0124:lI47|H3C01C8
-3C01C8:lI120|H3C027C
-3C027C:lI45|H3C0328
-3C0328:lI112|H3C03D4
-3C03D4:lI100|H3C0460
-3C0460:lI98|N
-3BFBAC:lI120|H3BFC68
-3BFC68:lI121|H3BFD1C
-3BFD1C:lI122|N
-3BFAEC:lH3BFBBC|H3BFBC8
-3BFBBC:t2:H3BFC78,H3BFC80
-3BFC80:lI97|H3BFD34
-3BFD34:lI117|H3BFDF0
-3BFDF0:lI100|H3BFE9C
-3BFE9C:lI105|H3BFF40
-3BFF40:lI111|H3BFFE4
-3BFFE4:lI47|H3C0088
-3C0088:lI120|H3C012C
-3C012C:lI45|H3C01D0
-3C01D0:lI119|H3C0284
-3C0284:lI97|H3C0330
-3C0330:lI118|N
-3BFC78:lI119|H3BFD2C
-3BFD2C:lI97|H3BFDE8
-3BFDE8:lI118|N
-3BFBC8:lH3BFC88|H3BFC94
-3BFC88:t2:H3BFD3C,H3BFD44
-3BFD44:lI97|H3BFE00
-3BFE00:lI117|H3BFEA4
-3BFEA4:lI100|H3BFF48
-3BFF48:lI105|H3BFFEC
-3BFFEC:lI111|H3C0090
-3C0090:lI47|H3C0134
-3C0134:lI120|H3C01D8
-3C01D8:lI45|H3C028C
-3C028C:lI114|H3C0338
-3C0338:lI101|H3C03DC
-3C03DC:lI97|H3C0468
-3C0468:lI108|H3C04FC
-3C04FC:lI97|H3C0598
-3C0598:lI117|H3C063C
-3C063C:lI100|H3C06E8
-3C06E8:lI105|H3C0794
-3C0794:lI111|N
-3BFD3C:lI114|H3BFDF8
-3BFDF8:lI97|N
-3BFC94:lH3BFD4C|H3BFD58
-3BFD4C:t2:H3BFE08,H3BFE10
-3BFE10:lI97|H3BFEB4
-3BFEB4:lI117|H3BFF58
-3BFF58:lI100|H3BFFF4
-3BFFF4:lI105|H3C0098
-3C0098:lI111|H3C013C
-3C013C:lI47|H3C01E0
-3C01E0:lI120|H3C0294
-3C0294:lI45|H3C0340
-3C0340:lI112|H3C03E4
-3C03E4:lI110|H3C0470
-3C0470:lI45|H3C0504
-3C0504:lI114|H3C05A0
-3C05A0:lI101|H3C0644
-3C0644:lI97|H3C06F0
-3C06F0:lI108|H3C079C
-3C079C:lI97|H3C0838
-3C0838:lI117|H3C08C4
-3C08C4:lI100|H3C0958
-3C0958:lI105|H3C09EC
-3C09EC:lI111|H3C0A88
-3C0A88:lI45|H3C0B2C
-3C0B2C:lI112|H3C0BD0
-3C0BD0:lI108|H3C0C84
-3C0C84:lI117|H3C0D38
-3C0D38:lI103|H3C0DEC
-3C0DEC:lI105|H3C0EA0
-3C0EA0:lI110|N
-3BFE08:lI114|H3BFEAC
-3BFEAC:lI112|H3BFF50
-3BFF50:lI109|N
-3BFD58:lH3BFE18|H3BFE24
-3BFE18:t2:H3BFEBC,H3BFEC4
-3BFEC4:lI97|H3BFF68
-3BFF68:lI117|H3C0004
-3C0004:lI100|H3C00A0
-3C00A0:lI105|H3C0144
-3C0144:lI111|H3C01E8
-3C01E8:lI47|H3C029C
-3C029C:lI120|H3C0348
-3C0348:lI45|H3C03EC
-3C03EC:lI112|H3C0478
-3C0478:lI110|H3C050C
-3C050C:lI45|H3C05A8
-3C05A8:lI114|H3C064C
-3C064C:lI101|H3C06F8
-3C06F8:lI97|H3C07A4
-3C07A4:lI108|H3C0840
-3C0840:lI97|H3C08CC
-3C08CC:lI117|H3C0960
-3C0960:lI100|H3C09F4
-3C09F4:lI105|H3C0A90
-3C0A90:lI111|N
-3BFEBC:lI114|H3BFF60
-3BFF60:lI97|H3BFFFC
-3BFFFC:lI109|N
-3BFE24:lH3BFECC|H3BFED8
-3BFECC:t2:H3BFF70,H3BFF78
-3BFF78:lI97|H3C0014
-3C0014:lI117|H3C00B0
-3C00B0:lI100|H3C014C
-3C014C:lI105|H3C01F0
-3C01F0:lI111|H3C02A4
-3C02A4:lI47|H3C0350
-3C0350:lI120|H3C03F4
-3C03F4:lI45|H3C0480
-3C0480:lI97|H3C0514
-3C0514:lI105|H3C05B0
-3C05B0:lI102|H3C0654
-3C0654:lI102|N
-3BFF70:lI97|H3C000C
-3C000C:lI105|H3C00A8
-3C00A8:lI102|N
-3BFED8:lH3BFF80|H3BFF8C
-3BFF80:t2:H3C001C,H3C0024
-3C0024:lI97|H3C00C0
-3C00C0:lI117|H3C015C
-3C015C:lI100|H3C0200
-3C0200:lI105|H3C02AC
-3C02AC:lI111|H3C0358
-3C0358:lI47|H3C03FC
-3C03FC:lI120|H3C0488
-3C0488:lI45|H3C051C
-3C051C:lI97|H3C05B8
-3C05B8:lI105|H3C065C
-3C065C:lI102|H3C0700
-3C0700:lI102|N
-3C001C:lI97|H3C00B8
-3C00B8:lI105|H3C0154
-3C0154:lI102|H3C01F8
-3C01F8:lI102|N
-3BFF8C:lH3C002C|H3C0038
-3C002C:t2:H3C00C8,H3C00D0
-3C00D0:lI97|H3C016C
-3C016C:lI117|H3C0210
-3C0210:lI100|H3C02BC
-3C02BC:lI105|H3C0360
-3C0360:lI111|H3C0404
-3C0404:lI47|H3C0490
-3C0490:lI120|H3C0524
-3C0524:lI45|H3C05C0
-3C05C0:lI97|H3C0664
-3C0664:lI105|H3C0708
-3C0708:lI102|H3C07AC
-3C07AC:lI102|N
-3C00C8:lI97|H3C0164
-3C0164:lI105|H3C0208
-3C0208:lI102|H3C02B4
-3C02B4:lI99|N
-3C0038:lH3C00D8|H3C00E4
-3C00D8:t2:H3C0174,H3C017C
-3C017C:lI97|H3C0220
-3C0220:lI117|H3C02CC
-3C02CC:lI100|H3C0370
-3C0370:lI105|H3C040C
-3C040C:lI111|H3C0498
-3C0498:lI47|H3C052C
-3C052C:lI109|H3C05C8
-3C05C8:lI112|H3C066C
-3C066C:lI101|H3C0710
-3C0710:lI103|N
-3C0174:lI109|H3C0218
-3C0218:lI112|H3C02C4
-3C02C4:lI103|H3C0368
-3C0368:lI97|N
-3C00E4:lH3C0184|H3C0190
-3C0184:t2:H3C0228,H3C0230
-3C0230:lI97|H3C02DC
-3C02DC:lI117|H3C0380
-3C0380:lI100|H3C0414
-3C0414:lI105|H3C04A0
-3C04A0:lI111|H3C0534
-3C0534:lI47|H3C05D0
-3C05D0:lI109|H3C0674
-3C0674:lI112|H3C0718
-3C0718:lI101|H3C07B4
-3C07B4:lI103|N
-3C0228:lI109|H3C02D4
-3C02D4:lI112|H3C0378
-3C0378:lI50|N
-3C0190:lH3C0238|H3C0244
-3C0238:t2:H3C02E4,H3C02EC
-3C02EC:lI97|H3C0390
-3C0390:lI117|H3C041C
-3C041C:lI100|H3C04A8
-3C04A8:lI105|H3C053C
-3C053C:lI111|H3C05D8
-3C05D8:lI47|H3C067C
-3C067C:lI98|H3C0720
-3C0720:lI97|H3C07BC
-3C07BC:lI115|H3C0848
-3C0848:lI105|H3C08D4
-3C08D4:lI99|N
-3C02E4:lI97|H3C0388
-3C0388:lI117|N
-3C0244:lH3C02F4|H3C0300
-3C02F4:t2:H3C0398,H3C03A0
-3C03A0:lI97|H3C042C
-3C042C:lI117|H3C04B8
-3C04B8:lI100|H3C0544
-3C0544:lI105|H3C05E0
-3C05E0:lI111|H3C0684
-3C0684:lI47|H3C0728
-3C0728:lI98|H3C07C4
-3C07C4:lI97|H3C0850
-3C0850:lI115|H3C08DC
-3C08DC:lI105|H3C0968
-3C0968:lI99|N
-3C0398:lI115|H3C0424
-3C0424:lI110|H3C04B0
-3C04B0:lI100|N
-3C0300:lH3C03A8|H3C03B4
-3C03A8:t2:H3C0434,H3C043C
-3C043C:lI97|H3C04C8
-3C04C8:lI112|H3C0554
-3C0554:lI112|H3C05E8
-3C05E8:lI108|H3C068C
-3C068C:lI105|H3C0730
-3C0730:lI99|H3C07CC
-3C07CC:lI97|H3C0858
-3C0858:lI116|H3C08E4
-3C08E4:lI105|H3C0970
-3C0970:lI111|H3C09FC
-3C09FC:lI110|H3C0A98
-3C0A98:lI47|H3C0B34
-3C0B34:lI122|H3C0BD8
-3C0BD8:lI105|H3C0C8C
-3C0C8C:lI112|N
-3C0434:lI122|H3C04C0
-3C04C0:lI105|H3C054C
-3C054C:lI112|N
-3C03B4:lH3C0444|H3C0450
-3C0444:t2:H3C04D0,H3C04D8
-3C04D8:lI97|H3C0564
-3C0564:lI112|H3C05F8
-3C05F8:lI112|H3C0694
-3C0694:lI108|H3C0738
-3C0738:lI105|H3C07D4
-3C07D4:lI99|H3C0860
-3C0860:lI97|H3C08EC
-3C08EC:lI116|H3C0978
-3C0978:lI105|H3C0A04
-3C0A04:lI111|H3C0AA0
-3C0AA0:lI110|H3C0B3C
-3C0B3C:lI47|H3C0BE0
-3C0BE0:lI120|H3C0C94
-3C0C94:lI45|H3C0D40
-3C0D40:lI119|H3C0DF4
-3C0DF4:lI97|H3C0EA8
-3C0EA8:lI105|H3C0F64
-3C0F64:lI115|H3C1030
-3C1030:lI45|H3C1104
-3C1104:lI115|H3C11D8
-3C11D8:lI111|H3C12A4
-3C12A4:lI117|H3C1378
-3C1378:lI114|H3C1454
-3C1454:lI99|H3C1538
-3C1538:lI101|N
-3C04D0:lI115|H3C055C
-3C055C:lI114|H3C05F0
-3C05F0:lI99|N
-3C0450:lH3C04E0|H3C04EC
-3C04E0:t2:H3C056C,H3C0574
-3C0574:lI97|H3C0608
-3C0608:lI112|H3C06A4
-3C06A4:lI112|H3C0748
-3C0748:lI108|H3C07E4
-3C07E4:lI105|H3C0868
-3C0868:lI99|H3C08F4
-3C08F4:lI97|H3C0980
-3C0980:lI116|H3C0A0C
-3C0A0C:lI105|H3C0AA8
-3C0AA8:lI111|H3C0B44
-3C0B44:lI110|H3C0BE8
-3C0BE8:lI47|H3C0C9C
-3C0C9C:lI120|H3C0D48
-3C0D48:lI45|H3C0DFC
-3C0DFC:lI117|H3C0EB0
-3C0EB0:lI115|H3C0F6C
-3C0F6C:lI116|H3C1038
-3C1038:lI97|H3C110C
-3C110C:lI114|N
-3C056C:lI117|H3C0600
-3C0600:lI115|H3C069C
-3C069C:lI116|H3C0740
-3C0740:lI97|H3C07DC
-3C07DC:lI114|N
-3C04EC:lH3C057C|H3C0588
-3C057C:t2:H3C0610,H3C0618
-3C0618:lI97|H3C06B4
-3C06B4:lI112|H3C0750
-3C0750:lI112|H3C07EC
-3C07EC:lI108|H3C0870
-3C0870:lI105|H3C08FC
-3C08FC:lI99|H3C0988
-3C0988:lI97|H3C0A14
-3C0A14:lI116|H3C0AB0
-3C0AB0:lI105|H3C0B4C
-3C0B4C:lI111|H3C0BF0
-3C0BF0:lI110|H3C0CA4
-3C0CA4:lI47|H3C0D50
-3C0D50:lI120|H3C0E04
-3C0E04:lI45|H3C0EB8
-3C0EB8:lI116|H3C0F74
-3C0F74:lI114|H3C1040
-3C1040:lI111|H3C1114
-3C1114:lI102|H3C11E0
-3C11E0:lI102|H3C12AC
-3C12AC:lI45|H3C1380
-3C1380:lI109|H3C145C
-3C145C:lI115|N
-3C0610:lI109|H3C06AC
-3C06AC:lI115|N
-3C0588:lH3C0620|H3C062C
-3C0620:t2:H3C06BC,H3C06C4
-3C06C4:lI97|H3C0760
-3C0760:lI112|H3C07F4
-3C07F4:lI112|H3C0878
-3C0878:lI108|H3C0904
-3C0904:lI105|H3C0990
-3C0990:lI99|H3C0A1C
-3C0A1C:lI97|H3C0AB8
-3C0AB8:lI116|H3C0B54
-3C0B54:lI105|H3C0BF8
-3C0BF8:lI111|H3C0CAC
-3C0CAC:lI110|H3C0D58
-3C0D58:lI47|H3C0E0C
-3C0E0C:lI120|H3C0EC0
-3C0EC0:lI45|H3C0F7C
-3C0F7C:lI116|H3C1048
-3C1048:lI114|H3C111C
-3C111C:lI111|H3C11E8
-3C11E8:lI102|H3C12B4
-3C12B4:lI102|H3C1388
-3C1388:lI45|H3C1464
-3C1464:lI109|H3C1540
-3C1540:lI101|N
-3C06BC:lI109|H3C0758
-3C0758:lI101|N
-3C062C:lH3C06CC|H3C06D8
-3C06CC:t2:H3C0768,H3C0770
-3C0770:lI97|H3C0804
-3C0804:lI112|H3C0888
-3C0888:lI112|H3C090C
-3C090C:lI108|H3C0998
-3C0998:lI105|H3C0A24
-3C0A24:lI99|H3C0AC0
-3C0AC0:lI97|H3C0B5C
-3C0B5C:lI116|H3C0C00
-3C0C00:lI105|H3C0CB4
-3C0CB4:lI111|H3C0D60
-3C0D60:lI110|H3C0E14
-3C0E14:lI47|H3C0EC8
-3C0EC8:lI120|H3C0F84
-3C0F84:lI45|H3C1050
-3C1050:lI116|H3C1124
-3C1124:lI114|H3C11F0
-3C11F0:lI111|H3C12BC
-3C12BC:lI102|H3C1390
-3C1390:lI102|H3C146C
-3C146C:lI45|H3C1548
-3C1548:lI109|H3C161C
-3C161C:lI97|H3C16F0
-3C16F0:lI110|N
-3C0768:lI109|H3C07FC
-3C07FC:lI97|H3C0880
-3C0880:lI110|N
-3C06D8:lH3C0778|H3C0784
-3C0778:t2:H3C080C,H3C0814
-3C0814:lI97|H3C0890
-3C0890:lI112|H3C0914
-3C0914:lI112|H3C09A0
-3C09A0:lI108|H3C0A2C
-3C0A2C:lI105|H3C0AC8
-3C0AC8:lI99|H3C0B64
-3C0B64:lI97|H3C0C08
-3C0C08:lI116|H3C0CBC
-3C0CBC:lI105|H3C0D68
-3C0D68:lI111|H3C0E1C
-3C0E1C:lI110|H3C0ED0
-3C0ED0:lI47|H3C0F8C
-3C0F8C:lI120|H3C1058
-3C1058:lI45|H3C112C
-3C112C:lI116|H3C11F8
-3C11F8:lI114|H3C12C4
-3C12C4:lI111|H3C1398
-3C1398:lI102|H3C1474
-3C1474:lI102|N
-3C080C:lI116|N
-3C0784:lH3C081C|H3C0828
-3C081C:t2:H3C0898,H3C08A0
-3C08A0:lI97|H3C0924
-3C0924:lI112|H3C09A8
-3C09A8:lI112|H3C0A34
-3C0A34:lI108|H3C0AD0
-3C0AD0:lI105|H3C0B6C
-3C0B6C:lI99|H3C0C10
-3C0C10:lI97|H3C0CC4
-3C0CC4:lI116|H3C0D70
-3C0D70:lI105|H3C0E24
-3C0E24:lI111|H3C0ED8
-3C0ED8:lI110|H3C0F94
-3C0F94:lI47|H3C1060
-3C1060:lI120|H3C1134
-3C1134:lI45|H3C1200
-3C1200:lI116|H3C12CC
-3C12CC:lI114|H3C13A0
-3C13A0:lI111|H3C147C
-3C147C:lI102|H3C1550
-3C1550:lI102|N
-3C0898:lI116|H3C091C
-3C091C:lI114|N
-3C0828:lH3C08A8|H3C08B4
-3C08A8:t2:H3C092C,H3C0934
-3C0934:lI97|H3C09B8
-3C09B8:lI112|H3C0A44
-3C0A44:lI112|H3C0AE0
-3C0AE0:lI108|H3C0B74
-3C0B74:lI105|H3C0C18
-3C0C18:lI99|H3C0CCC
-3C0CCC:lI97|H3C0D78
-3C0D78:lI116|H3C0E2C
-3C0E2C:lI105|H3C0EE0
-3C0EE0:lI111|H3C0F9C
-3C0F9C:lI110|H3C1068
-3C1068:lI47|H3C113C
-3C113C:lI120|H3C1208
-3C1208:lI45|H3C12D4
-3C12D4:lI116|H3C13A8
-3C13A8:lI114|H3C1484
-3C1484:lI111|H3C1558
-3C1558:lI102|H3C1624
-3C1624:lI102|N
-3C092C:lI114|H3C09B0
-3C09B0:lI111|H3C0A3C
-3C0A3C:lI102|H3C0AD8
-3C0AD8:lI102|N
-3C08B4:lH3C093C|H3C0948
-3C093C:t2:H3C09C0,H3C09C8
-3C09C8:lI97|H3C0A54
-3C0A54:lI112|H3C0AF0
-3C0AF0:lI112|H3C0B84
-3C0B84:lI108|H3C0C28
-3C0C28:lI105|H3C0CDC
-3C0CDC:lI99|H3C0D88
-3C0D88:lI97|H3C0E34
-3C0E34:lI116|H3C0EE8
-3C0EE8:lI105|H3C0FA4
-3C0FA4:lI111|H3C1070
-3C1070:lI110|H3C1144
-3C1144:lI47|H3C1210
-3C1210:lI120|H3C12DC
-3C12DC:lI45|H3C13B0
-3C13B0:lI116|H3C148C
-3C148C:lI101|H3C1560
-3C1560:lI120|H3C162C
-3C162C:lI105|H3C16F8
-3C16F8:lI110|H3C17BC
-3C17BC:lI102|H3C1880
-3C1880:lI111|N
-3C09C0:lI116|H3C0A4C
-3C0A4C:lI101|H3C0AE8
-3C0AE8:lI120|H3C0B7C
-3C0B7C:lI105|H3C0C20
-3C0C20:lI110|H3C0CD4
-3C0CD4:lI102|H3C0D80
-3C0D80:lI111|N
-3C0948:lH3C09D0|H3C09DC
-3C09D0:t2:H3C0A5C,H3C0A64
-3C0A64:lI97|H3C0B00
-3C0B00:lI112|H3C0B94
-3C0B94:lI112|H3C0C38
-3C0C38:lI108|H3C0CE4
-3C0CE4:lI105|H3C0D90
-3C0D90:lI99|H3C0E3C
-3C0E3C:lI97|H3C0EF0
-3C0EF0:lI116|H3C0FAC
-3C0FAC:lI105|H3C1078
-3C1078:lI111|H3C114C
-3C114C:lI110|H3C1218
-3C1218:lI47|H3C12E4
-3C12E4:lI120|H3C13B8
-3C13B8:lI45|H3C1494
-3C1494:lI116|H3C1568
-3C1568:lI101|H3C1634
-3C1634:lI120|H3C1700
-3C1700:lI105|H3C17C4
-3C17C4:lI110|H3C1888
-3C1888:lI102|H3C1944
-3C1944:lI111|N
-3C0A5C:lI116|H3C0AF8
-3C0AF8:lI101|H3C0B8C
-3C0B8C:lI120|H3C0C30
-3C0C30:lI105|N
-3C09DC:lH3C0A6C|H3C0A78
-3C0A6C:t2:H3C0B08,H3C0B10
-3C0B10:lI97|H3C0BA4
-3C0BA4:lI112|H3C0C48
-3C0C48:lI112|H3C0CEC
-3C0CEC:lI108|H3C0D98
-3C0D98:lI105|H3C0E44
-3C0E44:lI99|H3C0EF8
-3C0EF8:lI97|H3C0FB4
-3C0FB4:lI116|H3C1080
-3C1080:lI105|H3C1154
-3C1154:lI111|H3C1220
-3C1220:lI110|H3C12EC
-3C12EC:lI47|H3C13C0
-3C13C0:lI120|H3C149C
-3C149C:lI45|H3C1570
-3C1570:lI116|H3C163C
-3C163C:lI101|H3C1708
-3C1708:lI120|N
-3C0B08:lI116|H3C0B9C
-3C0B9C:lI101|H3C0C40
-3C0C40:lI120|N
-3C0A78:lH3C0B18|H3C0B24
-3C0B18:t2:H3C0BAC,H3C0BB4
-3C0BB4:lI97|H3C0C58
-3C0C58:lI112|H3C0CFC
-3C0CFC:lI112|H3C0DA0
-3C0DA0:lI108|H3C0E4C
-3C0E4C:lI105|H3C0F00
-3C0F00:lI99|H3C0FBC
-3C0FBC:lI97|H3C1088
-3C1088:lI116|H3C115C
-3C115C:lI105|H3C1228
-3C1228:lI111|H3C12F4
-3C12F4:lI110|H3C13C8
-3C13C8:lI47|H3C14A4
-3C14A4:lI120|H3C1578
-3C1578:lI45|H3C1644
-3C1644:lI116|H3C1710
-3C1710:lI99|H3C17CC
-3C17CC:lI108|N
-3C0BAC:lI116|H3C0C50
-3C0C50:lI99|H3C0CF4
-3C0CF4:lI108|N
-3C0B24:lH3C0BBC|H3C0BC8
-3C0BBC:t2:H3C0C60,H3C0C68
-3C0C68:lI97|H3C0D0C
-3C0D0C:lI112|H3C0DB0
-3C0DB0:lI112|H3C0E54
-3C0E54:lI108|H3C0F08
-3C0F08:lI105|H3C0FC4
-3C0FC4:lI99|H3C1090
-3C1090:lI97|H3C1164
-3C1164:lI116|H3C1230
-3C1230:lI105|H3C12FC
-3C12FC:lI111|H3C13D0
-3C13D0:lI110|H3C14AC
-3C14AC:lI47|H3C1580
-3C1580:lI120|H3C164C
-3C164C:lI45|H3C1718
-3C1718:lI116|H3C17D4
-3C17D4:lI97|H3C1890
-3C1890:lI114|N
-3C0C60:lI116|H3C0D04
-3C0D04:lI97|H3C0DA8
-3C0DA8:lI114|N
-3C0BC8:lH3C0C70|H3C0C7C
-3C0C70:t2:H3C0D14,H3C0D1C
-3C0D1C:lI97|H3C0DC0
-3C0DC0:lI112|H3C0E64
-3C0E64:lI112|H3C0F18
-3C0F18:lI108|H3C0FD4
-3C0FD4:lI105|H3C10A0
-3C10A0:lI99|H3C116C
-3C116C:lI97|H3C1238
-3C1238:lI116|H3C1304
-3C1304:lI105|H3C13D8
-3C13D8:lI111|H3C14B4
-3C14B4:lI110|H3C1588
-3C1588:lI47|H3C1654
-3C1654:lI120|H3C1720
-3C1720:lI45|H3C17DC
-3C17DC:lI115|H3C1898
-3C1898:lI118|H3C194C
-3C194C:lI52|H3C1A00
-3C1A00:lI99|H3C1AB4
-3C1AB4:lI114|H3C1B78
-3C1B78:lI99|N
-3C0D14:lI115|H3C0DB8
-3C0DB8:lI118|H3C0E5C
-3C0E5C:lI52|H3C0F10
-3C0F10:lI99|H3C0FCC
-3C0FCC:lI114|H3C1098
-3C1098:lI99|N
-3C0C7C:lH3C0D24|H3C0D30
-3C0D24:t2:H3C0DC8,H3C0DD0
-3C0DD0:lI97|H3C0E74
-3C0E74:lI112|H3C0F28
-3C0F28:lI112|H3C0FE4
-3C0FE4:lI108|H3C10B0
-3C10B0:lI105|H3C117C
-3C117C:lI99|H3C1248
-3C1248:lI97|H3C130C
-3C130C:lI116|H3C13E0
-3C13E0:lI105|H3C14BC
-3C14BC:lI111|H3C1590
-3C1590:lI110|H3C165C
-3C165C:lI47|H3C1728
-3C1728:lI120|H3C17E4
-3C17E4:lI45|H3C18A0
-3C18A0:lI115|H3C1954
-3C1954:lI118|H3C1A08
-3C1A08:lI52|H3C1ABC
-3C1ABC:lI99|H3C1B80
-3C1B80:lI112|H3C1C4C
-3C1C4C:lI105|H3C1D10
-3C1D10:lI111|N
-3C0DC8:lI115|H3C0E6C
-3C0E6C:lI118|H3C0F20
-3C0F20:lI52|H3C0FDC
-3C0FDC:lI99|H3C10A8
-3C10A8:lI112|H3C1174
-3C1174:lI105|H3C1240
-3C1240:lI111|N
-3C0D30:lH3C0DD8|H3C0DE4
-3C0DD8:t2:H3C0E7C,H3C0E84
-3C0E84:lI97|H3C0F38
-3C0F38:lI112|H3C0FF4
-3C0FF4:lI112|H3C10B8
-3C10B8:lI108|H3C1184
-3C1184:lI105|H3C1250
-3C1250:lI99|H3C1314
-3C1314:lI97|H3C13E8
-3C13E8:lI116|H3C14C4
-3C14C4:lI105|H3C1598
-3C1598:lI111|H3C1664
-3C1664:lI110|H3C1730
-3C1730:lI47|H3C17EC
-3C17EC:lI120|H3C18A8
-3C18A8:lI45|H3C195C
-3C195C:lI115|H3C1A10
-3C1A10:lI116|H3C1AC4
-3C1AC4:lI117|H3C1B88
-3C1B88:lI102|H3C1C54
-3C1C54:lI102|H3C1D18
-3C1D18:lI105|H3C1DD4
-3C1DD4:lI116|N
-3C0E7C:lI115|H3C0F30
-3C0F30:lI105|H3C0FEC
-3C0FEC:lI116|N
-3C0DE4:lH3C0E8C|H3C0E98
-3C0E8C:t2:H3C0F40,H3C0F48
-3C0F48:lI97|H3C1004
-3C1004:lI112|H3C10C8
-3C10C8:lI112|H3C1194
-3C1194:lI108|H3C1258
-3C1258:lI105|H3C131C
-3C131C:lI99|H3C13F0
-3C13F0:lI97|H3C14CC
-3C14CC:lI116|H3C15A0
-3C15A0:lI105|H3C166C
-3C166C:lI111|H3C1738
-3C1738:lI110|H3C17F4
-3C17F4:lI47|H3C18B0
-3C18B0:lI120|H3C1964
-3C1964:lI45|H3C1A18
-3C1A18:lI115|H3C1ACC
-3C1ACC:lI104|H3C1B90
-3C1B90:lI97|H3C1C5C
-3C1C5C:lI114|N
-3C0F40:lI115|H3C0FFC
-3C0FFC:lI104|H3C10C0
-3C10C0:lI97|H3C118C
-3C118C:lI114|N
-3C0E98:lH3C0F50|H3C0F5C
-3C0F50:t2:H3C100C,H3C1014
-3C1014:lI97|H3C10D8
-3C10D8:lI112|H3C119C
-3C119C:lI112|H3C1260
-3C1260:lI108|H3C1324
-3C1324:lI105|H3C13F8
-3C13F8:lI99|H3C14D4
-3C14D4:lI97|H3C15A8
-3C15A8:lI116|H3C1674
-3C1674:lI105|H3C1740
-3C1740:lI111|H3C17FC
-3C17FC:lI110|H3C18B8
-3C18B8:lI47|H3C196C
-3C196C:lI120|H3C1A20
-3C1A20:lI45|H3C1AD4
-3C1AD4:lI115|H3C1B98
-3C1B98:lI104|N
-3C100C:lI115|H3C10D0
-3C10D0:lI104|N
-3C0F5C:lH3C101C|H3C1028
-3C101C:t2:H3C10E0,H3C10E8
-3C10E8:lI97|H3C11AC
-3C11AC:lI112|H3C1268
-3C1268:lI112|H3C132C
-3C132C:lI108|H3C1400
-3C1400:lI105|H3C14DC
-3C14DC:lI99|H3C15B0
-3C15B0:lI97|H3C167C
-3C167C:lI116|H3C1748
-3C1748:lI105|H3C1804
-3C1804:lI111|H3C18C0
-3C18C0:lI110|H3C1974
-3C1974:lI47|H3C1A28
-3C1A28:lI120|H3C1ADC
-3C1ADC:lI45|H3C1BA0
-3C1BA0:lI110|H3C1C64
-3C1C64:lI101|H3C1D20
-3C1D20:lI116|H3C1DDC
-3C1DDC:lI99|H3C1E98
-3C1E98:lI100|H3C1F5C
-3C1F5C:lI102|N
-3C10E0:lI110|H3C11A4
-3C11A4:lI99|N
-3C1028:lH3C10F0|H3C10FC
-3C10F0:t2:H3C11B4,H3C11BC
-3C11BC:lI97|H3C1278
-3C1278:lI112|H3C133C
-3C133C:lI112|H3C1408
-3C1408:lI108|H3C14E4
-3C14E4:lI105|H3C15B8
-3C15B8:lI99|H3C1684
-3C1684:lI97|H3C1750
-3C1750:lI116|H3C180C
-3C180C:lI105|H3C18C8
-3C18C8:lI111|H3C197C
-3C197C:lI110|H3C1A30
-3C1A30:lI47|H3C1AE4
-3C1AE4:lI120|H3C1BA8
-3C1BA8:lI45|H3C1C6C
-3C1C6C:lI110|H3C1D28
-3C1D28:lI101|H3C1DE4
-3C1DE4:lI116|H3C1EA0
-3C1EA0:lI99|H3C1F64
-3C1F64:lI100|H3C2018
-3C2018:lI102|N
-3C11B4:lI99|H3C1270
-3C1270:lI100|H3C1334
-3C1334:lI102|N
-3C10FC:lH3C11C4|H3C11D0
-3C11C4:t2:H3C1280,H3C1288
-3C1288:lI97|H3C134C
-3C134C:lI112|H3C1418
-3C1418:lI112|H3C14EC
-3C14EC:lI108|H3C15C0
-3C15C0:lI105|H3C168C
-3C168C:lI99|H3C1758
-3C1758:lI97|H3C1814
-3C1814:lI116|H3C18D0
-3C18D0:lI105|H3C1984
-3C1984:lI111|H3C1A38
-3C1A38:lI110|H3C1AEC
-3C1AEC:lI47|H3C1BB0
-3C1BB0:lI120|H3C1C74
-3C1C74:lI45|H3C1D30
-3C1D30:lI109|H3C1DEC
-3C1DEC:lI105|H3C1EA8
-3C1EA8:lI102|N
-3C1280:lI109|H3C1344
-3C1344:lI105|H3C1410
-3C1410:lI102|N
-3C11D0:lH3C1290|H3C129C
-3C1290:t2:H3C1354,H3C135C
-3C135C:lI97|H3C1428
-3C1428:lI112|H3C14FC
-3C14FC:lI112|H3C15D0
-3C15D0:lI108|H3C169C
-3C169C:lI105|H3C1760
-3C1760:lI99|H3C181C
-3C181C:lI97|H3C18D8
-3C18D8:lI116|H3C198C
-3C198C:lI105|H3C1A40
-3C1A40:lI111|H3C1AF4
-3C1AF4:lI110|H3C1BB8
-3C1BB8:lI47|H3C1C7C
-3C1C7C:lI120|H3C1D38
-3C1D38:lI45|H3C1DF4
-3C1DF4:lI108|H3C1EB0
-3C1EB0:lI97|H3C1F6C
-3C1F6C:lI116|H3C2020
-3C2020:lI101|H3C20DC
-3C20DC:lI120|N
-3C1354:lI108|H3C1420
-3C1420:lI97|H3C14F4
-3C14F4:lI116|H3C15C8
-3C15C8:lI101|H3C1694
-3C1694:lI120|N
-3C129C:lH3C1364|H3C1370
-3C1364:t2:H3C1430,H3C1438
-3C1438:lI97|H3C150C
-3C150C:lI112|H3C15E0
-3C15E0:lI112|H3C16A4
-3C16A4:lI108|H3C1768
-3C1768:lI105|H3C1824
-3C1824:lI99|H3C18E0
-3C18E0:lI97|H3C1994
-3C1994:lI116|H3C1A48
-3C1A48:lI105|H3C1AFC
-3C1AFC:lI111|H3C1BC0
-3C1BC0:lI110|H3C1C84
-3C1C84:lI47|H3C1D40
-3C1D40:lI120|H3C1DFC
-3C1DFC:lI45|H3C1EB8
-3C1EB8:lI107|H3C1F74
-3C1F74:lI111|H3C2028
-3C2028:lI97|H3C20E4
-3C20E4:lI110|N
-3C1430:lI115|H3C1504
-3C1504:lI107|H3C15D8
-3C15D8:lI112|N
-3C1370:lH3C1440|H3C144C
-3C1440:t2:H3C1514,H3C151C
-3C151C:lI97|H3C15F0
-3C15F0:lI112|H3C16B4
-3C16B4:lI112|H3C1770
-3C1770:lI108|H3C182C
-3C182C:lI105|H3C18E8
-3C18E8:lI99|H3C199C
-3C199C:lI97|H3C1A50
-3C1A50:lI116|H3C1B04
-3C1B04:lI105|H3C1BC8
-3C1BC8:lI111|H3C1C8C
-3C1C8C:lI110|H3C1D48
-3C1D48:lI47|H3C1E04
-3C1E04:lI120|H3C1EC0
-3C1EC0:lI45|H3C1F7C
-3C1F7C:lI107|H3C2030
-3C2030:lI111|H3C20EC
-3C20EC:lI97|H3C21A0
-3C21A0:lI110|N
-3C1514:lI115|H3C15E8
-3C15E8:lI107|H3C16AC
-3C16AC:lI100|N
-3C144C:lH3C1524|H3C1530
-3C1524:t2:H3C15F8,H3C1600
-3C1600:lI97|H3C16C4
-3C16C4:lI112|H3C1780
-3C1780:lI112|H3C1834
-3C1834:lI108|H3C18F0
-3C18F0:lI105|H3C19A4
-3C19A4:lI99|H3C1A58
-3C1A58:lI97|H3C1B0C
-3C1B0C:lI116|H3C1BD0
-3C1BD0:lI105|H3C1C94
-3C1C94:lI111|H3C1D50
-3C1D50:lI110|H3C1E0C
-3C1E0C:lI47|H3C1EC8
-3C1EC8:lI120|H3C1F84
-3C1F84:lI45|H3C2038
-3C2038:lI107|H3C20F4
-3C20F4:lI111|H3C21A8
-3C21A8:lI97|H3C225C
-3C225C:lI110|N
-3C15F8:lI115|H3C16BC
-3C16BC:lI107|H3C1778
-3C1778:lI116|N
-3C1530:lH3C1608|H3C1614
-3C1608:t2:H3C16CC,H3C16D4
-3C16D4:lI97|H3C1790
-3C1790:lI112|H3C1844
-3C1844:lI112|H3C18F8
-3C18F8:lI108|H3C19AC
-3C19AC:lI105|H3C1A60
-3C1A60:lI99|H3C1B14
-3C1B14:lI97|H3C1BD8
-3C1BD8:lI116|H3C1C9C
-3C1C9C:lI105|H3C1D58
-3C1D58:lI111|H3C1E14
-3C1E14:lI110|H3C1ED0
-3C1ED0:lI47|H3C1F8C
-3C1F8C:lI120|H3C2040
-3C2040:lI45|H3C20FC
-3C20FC:lI107|H3C21B0
-3C21B0:lI111|H3C2264
-3C2264:lI97|H3C2320
-3C2320:lI110|N
-3C16CC:lI115|H3C1788
-3C1788:lI107|H3C183C
-3C183C:lI109|N
-3C1614:lH3C16DC|H3C16E8
-3C16DC:t2:H3C1798,H3C17A0
-3C17A0:lI97|H3C1854
-3C1854:lI112|H3C1908
-3C1908:lI112|H3C19B4
-3C19B4:lI108|H3C1A68
-3C1A68:lI105|H3C1B1C
-3C1B1C:lI99|H3C1BE0
-3C1BE0:lI97|H3C1CA4
-3C1CA4:lI116|H3C1D60
-3C1D60:lI105|H3C1E1C
-3C1E1C:lI111|H3C1ED8
-3C1ED8:lI110|H3C1F94
-3C1F94:lI47|H3C2048
-3C2048:lI120|H3C2104
-3C2104:lI45|H3C21B8
-3C21B8:lI104|H3C226C
-3C226C:lI116|H3C2328
-3C2328:lI116|H3C23E4
-3C23E4:lI112|H3C2498
-3C2498:lI100|H3C2554
-3C2554:lI45|H3C2610
-3C2610:lI99|H3C26D4
-3C26D4:lI103|H3C2790
-3C2790:lI105|N
-3C1798:lI99|H3C184C
-3C184C:lI103|H3C1900
-3C1900:lI105|N
-3C16E8:lH3C17A8|H3C17B4
-3C17A8:t2:H3C185C,H3C1864
-3C1864:lI97|H3C1918
-3C1918:lI112|H3C19C4
-3C19C4:lI112|H3C1A70
-3C1A70:lI108|H3C1B24
-3C1B24:lI105|H3C1BE8
-3C1BE8:lI99|H3C1CAC
-3C1CAC:lI97|H3C1D68
-3C1D68:lI116|H3C1E24
-3C1E24:lI105|H3C1EE0
-3C1EE0:lI111|H3C1F9C
-3C1F9C:lI110|H3C2050
-3C2050:lI47|H3C210C
-3C210C:lI120|H3C21C0
-3C21C0:lI45|H3C2274
-3C2274:lI104|H3C2330
-3C2330:lI100|H3C23EC
-3C23EC:lI102|N
-3C185C:lI104|H3C1910
-3C1910:lI100|H3C19BC
-3C19BC:lI102|N
-3C17B4:lH3C186C|H3C1878
-3C186C:t2:H3C1920,H3C1928
-3C1928:lI97|H3C19D4
-3C19D4:lI112|H3C1A78
-3C1A78:lI112|H3C1B2C
-3C1B2C:lI108|H3C1BF0
-3C1BF0:lI105|H3C1CB4
-3C1CB4:lI99|H3C1D70
-3C1D70:lI97|H3C1E2C
-3C1E2C:lI116|H3C1EE8
-3C1EE8:lI105|H3C1FA4
-3C1FA4:lI111|H3C2058
-3C2058:lI110|H3C2114
-3C2114:lI47|H3C21C8
-3C21C8:lI120|H3C227C
-3C227C:lI45|H3C2338
-3C2338:lI103|H3C23F4
-3C23F4:lI122|H3C24A0
-3C24A0:lI105|H3C255C
-3C255C:lI112|N
-3C1920:lI103|H3C19CC
-3C19CC:lI122|N
-3C1878:lH3C1930|H3C193C
-3C1930:t2:H3C19DC,H3C19E4
-3C19E4:lI97|H3C1A88
-3C1A88:lI112|H3C1B3C
-3C1B3C:lI112|H3C1C00
-3C1C00:lI108|H3C1CBC
-3C1CBC:lI105|H3C1D78
-3C1D78:lI99|H3C1E34
-3C1E34:lI97|H3C1EF0
-3C1EF0:lI116|H3C1FAC
-3C1FAC:lI105|H3C2060
-3C2060:lI111|H3C211C
-3C211C:lI110|H3C21D0
-3C21D0:lI47|H3C2284
-3C2284:lI120|H3C2340
-3C2340:lI45|H3C23FC
-3C23FC:lI103|H3C24A8
-3C24A8:lI116|H3C2564
-3C2564:lI97|H3C2618
-3C2618:lI114|N
-3C19DC:lI103|H3C1A80
-3C1A80:lI116|H3C1B34
-3C1B34:lI97|H3C1BF8
-3C1BF8:lI114|N
-3C193C:lH3C19EC|H3C19F8
-3C19EC:t2:H3C1A90,H3C1A98
-3C1A98:lI97|H3C1B4C
-3C1B4C:lI112|H3C1C10
-3C1C10:lI112|H3C1CC4
-3C1CC4:lI108|H3C1D80
-3C1D80:lI105|H3C1E3C
-3C1E3C:lI99|H3C1EF8
-3C1EF8:lI97|H3C1FB4
-3C1FB4:lI116|H3C2068
-3C2068:lI105|H3C2124
-3C2124:lI111|H3C21D8
-3C21D8:lI110|H3C228C
-3C228C:lI47|H3C2348
-3C2348:lI120|H3C2404
-3C2404:lI45|H3C24B0
-3C24B0:lI100|H3C256C
-3C256C:lI118|H3C2620
-3C2620:lI105|N
-3C1A90:lI100|H3C1B44
-3C1B44:lI118|H3C1C08
-3C1C08:lI105|N
-3C19F8:lH3C1AA0|H3C1AAC
-3C1AA0:t2:H3C1B54,H3C1B5C
-3C1B5C:lI97|H3C1C20
-3C1C20:lI112|H3C1CD4
-3C1CD4:lI112|H3C1D88
-3C1D88:lI108|H3C1E44
-3C1E44:lI105|H3C1F00
-3C1F00:lI99|H3C1FBC
-3C1FBC:lI97|H3C2070
-3C2070:lI116|H3C212C
-3C212C:lI105|H3C21E0
-3C21E0:lI111|H3C2294
-3C2294:lI110|H3C2350
-3C2350:lI47|H3C240C
-3C240C:lI120|H3C24B8
-3C24B8:lI45|H3C2574
-3C2574:lI100|H3C2628
-3C2628:lI105|H3C26DC
-3C26DC:lI114|H3C2798
-3C2798:lI101|H3C2854
-3C2854:lI99|H3C2918
-3C2918:lI116|H3C29E4
-3C29E4:lI111|H3C2AB0
-3C2AB0:lI114|N
-3C1B54:lI100|H3C1C18
-3C1C18:lI99|H3C1CCC
-3C1CCC:lI114|N
-3C1AAC:lH3C1B64|H3C1B70
-3C1B64:t2:H3C1C28,H3C1C30
-3C1C30:lI97|H3C1CE4
-3C1CE4:lI112|H3C1D98
-3C1D98:lI112|H3C1E4C
-3C1E4C:lI108|H3C1F08
-3C1F08:lI105|H3C1FC4
-3C1FC4:lI99|H3C2078
-3C2078:lI97|H3C2134
-3C2134:lI116|H3C21E8
-3C21E8:lI105|H3C229C
-3C229C:lI111|H3C2358
-3C2358:lI110|H3C2414
-3C2414:lI47|H3C24C0
-3C24C0:lI120|H3C257C
-3C257C:lI45|H3C2630
-3C2630:lI100|H3C26E4
-3C26E4:lI105|H3C27A0
-3C27A0:lI114|H3C285C
-3C285C:lI101|H3C2920
-3C2920:lI99|H3C29EC
-3C29EC:lI116|H3C2AB8
-3C2AB8:lI111|H3C2B84
-3C2B84:lI114|N
-3C1C28:lI100|H3C1CDC
-3C1CDC:lI105|H3C1D90
-3C1D90:lI114|N
-3C1B70:lH3C1C38|H3C1C44
-3C1C38:t2:H3C1CEC,H3C1CF4
-3C1CF4:lI97|H3C1DA8
-3C1DA8:lI112|H3C1E5C
-3C1E5C:lI112|H3C1F10
-3C1F10:lI108|H3C1FCC
-3C1FCC:lI105|H3C2080
-3C2080:lI99|H3C213C
-3C213C:lI97|H3C21F0
-3C21F0:lI116|H3C22A4
-3C22A4:lI105|H3C2360
-3C2360:lI111|H3C241C
-3C241C:lI110|H3C24C8
-3C24C8:lI47|H3C2584
-3C2584:lI120|H3C2638
-3C2638:lI45|H3C26EC
-3C26EC:lI100|H3C27A8
-3C27A8:lI105|H3C2864
-3C2864:lI114|H3C2928
-3C2928:lI101|H3C29F4
-3C29F4:lI99|H3C2AC0
-3C2AC0:lI116|H3C2B8C
-3C2B8C:lI111|H3C2C48
-3C2C48:lI114|N
-3C1CEC:lI100|H3C1DA0
-3C1DA0:lI120|H3C1E54
-3C1E54:lI114|N
-3C1C44:lH3C1CFC|H3C1D08
-3C1CFC:t2:H3C1DB0,H3C1DB8
-3C1DB8:lI97|H3C1E6C
-3C1E6C:lI112|H3C1F20
-3C1F20:lI112|H3C1FD4
-3C1FD4:lI108|H3C2088
-3C2088:lI105|H3C2144
-3C2144:lI99|H3C21F8
-3C21F8:lI97|H3C22AC
-3C22AC:lI116|H3C2368
-3C2368:lI105|H3C2424
-3C2424:lI111|H3C24D0
-3C24D0:lI110|H3C258C
-3C258C:lI47|H3C2640
-3C2640:lI120|H3C26F4
-3C26F4:lI45|H3C27B0
-3C27B0:lI99|H3C286C
-3C286C:lI115|H3C2930
-3C2930:lI104|N
-3C1DB0:lI99|H3C1E64
-3C1E64:lI115|H3C1F18
-3C1F18:lI104|N
-3C1D08:lH3C1DC0|H3C1DCC
-3C1DC0:t2:H3C1E74,H3C1E7C
-3C1E7C:lI97|H3C1F30
-3C1F30:lI112|H3C1FE4
-3C1FE4:lI112|H3C2098
-3C2098:lI108|H3C214C
-3C214C:lI105|H3C2200
-3C2200:lI99|H3C22B4
-3C22B4:lI97|H3C2370
-3C2370:lI116|H3C242C
-3C242C:lI105|H3C24D8
-3C24D8:lI111|H3C2594
-3C2594:lI110|H3C2648
-3C2648:lI47|H3C26FC
-3C26FC:lI120|H3C27B8
-3C27B8:lI45|H3C2874
-3C2874:lI99|H3C2938
-3C2938:lI112|H3C29FC
-3C29FC:lI105|H3C2AC8
-3C2AC8:lI111|N
-3C1E74:lI99|H3C1F28
-3C1F28:lI112|H3C1FDC
-3C1FDC:lI105|H3C2090
-3C2090:lI111|N
-3C1DCC:lH3C1E84|H3C1E90
-3C1E84:t2:H3C1F38,H3C1F40
-3C1F40:lI97|H3C1FEC
-3C1FEC:lI112|H3C20A0
-3C20A0:lI112|H3C2154
-3C2154:lI108|H3C2208
-3C2208:lI105|H3C22BC
-3C22BC:lI99|H3C2378
-3C2378:lI97|H3C2434
-3C2434:lI116|H3C24E0
-3C24E0:lI105|H3C259C
-3C259C:lI111|H3C2650
-3C2650:lI110|H3C2704
-3C2704:lI47|H3C27C0
-3C27C0:lI120|H3C287C
-3C287C:lI45|H3C2940
-3C2940:lI99|H3C2A04
-3C2A04:lI111|H3C2AD0
-3C2AD0:lI109|H3C2B94
-3C2B94:lI112|H3C2C50
-3C2C50:lI114|H3C2D00
-3C2D00:lI101|H3C2DA8
-3C2DA8:lI115|H3C2E40
-3C2E40:lI115|N
-3C1F38:lI90|N
-3C1E90:lH3C1F48|H3C1F54
-3C1F48:t2:H3C1FF4,H3C1FFC
-3C1FFC:lI97|H3C20B0
-3C20B0:lI112|H3C2164
-3C2164:lI112|H3C2210
-3C2210:lI108|H3C22C4
-3C22C4:lI105|H3C2380
-3C2380:lI99|H3C243C
-3C243C:lI97|H3C24E8
-3C24E8:lI116|H3C25A4
-3C25A4:lI105|H3C2658
-3C2658:lI111|H3C270C
-3C270C:lI110|H3C27C8
-3C27C8:lI47|H3C2884
-3C2884:lI120|H3C2948
-3C2948:lI45|H3C2A0C
-3C2A0C:lI99|H3C2AD8
-3C2AD8:lI100|H3C2B9C
-3C2B9C:lI108|H3C2C58
-3C2C58:lI105|H3C2D08
-3C2D08:lI110|H3C2DB0
-3C2DB0:lI107|N
-3C1FF4:lI118|H3C20A8
-3C20A8:lI99|H3C215C
-3C215C:lI100|N
-3C1F54:lH3C2004|H3C2010
-3C2004:t2:H3C20B8,H3C20C0
-3C20C0:lI97|H3C2174
-3C2174:lI112|H3C2220
-3C2220:lI112|H3C22D4
-3C22D4:lI108|H3C2390
-3C2390:lI105|H3C2444
-3C2444:lI99|H3C24F0
-3C24F0:lI97|H3C25AC
-3C25AC:lI116|H3C2660
-3C2660:lI105|H3C2714
-3C2714:lI111|H3C27D0
-3C27D0:lI110|H3C288C
-3C288C:lI47|H3C2950
-3C2950:lI120|H3C2A14
-3C2A14:lI45|H3C2AE0
-3C2AE0:lI98|H3C2BA4
-3C2BA4:lI99|H3C2C60
-3C2C60:lI112|H3C2D10
-3C2D10:lI105|H3C2DB8
-3C2DB8:lI111|N
-3C20B8:lI98|H3C216C
-3C216C:lI99|H3C2218
-3C2218:lI112|H3C22CC
-3C22CC:lI105|H3C2388
-3C2388:lI111|N
-3C2010:lH3C20C8|H3C20D4
-3C20C8:t2:H3C217C,H3C2184
-3C2184:lI97|H3C2230
-3C2230:lI112|H3C22E4
-3C22E4:lI112|H3C2398
-3C2398:lI108|H3C244C
-3C244C:lI105|H3C24F8
-3C24F8:lI99|H3C25B4
-3C25B4:lI97|H3C2668
-3C2668:lI116|H3C271C
-3C271C:lI105|H3C27D8
-3C27D8:lI111|H3C2894
-3C2894:lI110|H3C2958
-3C2958:lI47|H3C2A1C
-3C2A1C:lI114|H3C2AE8
-3C2AE8:lI116|H3C2BAC
-3C2BAC:lI102|N
-3C217C:lI114|H3C2228
-3C2228:lI116|H3C22DC
-3C22DC:lI102|N
-3C20D4:lH3C218C|H3C2198
-3C218C:t2:H3C2238,H3C2240
-3C2240:lI97|H3C22F4
-3C22F4:lI112|H3C23A8
-3C23A8:lI112|H3C2454
-3C2454:lI108|H3C2500
-3C2500:lI105|H3C25BC
-3C25BC:lI99|H3C2670
-3C2670:lI97|H3C2724
-3C2724:lI116|H3C27E0
-3C27E0:lI105|H3C289C
-3C289C:lI111|H3C2960
-3C2960:lI110|H3C2A24
-3C2A24:lI47|H3C2AF0
-3C2AF0:lI112|H3C2BB4
-3C2BB4:lI111|H3C2C68
-3C2C68:lI119|H3C2D18
-3C2D18:lI101|H3C2DC0
-3C2DC0:lI114|H3C2E48
-3C2E48:lI112|H3C2EC0
-3C2EC0:lI111|H3C2F38
-3C2F38:lI105|H3C2FA8
-3C2FA8:lI110|H3C3010
-3C3010:lI116|N
-3C2238:lI112|H3C22EC
-3C22EC:lI112|H3C23A0
-3C23A0:lI116|N
-3C2198:lH3C2248|H3C2254
-3C2248:t2:H3C22FC,H3C2304
-3C2304:lI97|H3C23B8
-3C23B8:lI112|H3C245C
-3C245C:lI112|H3C2508
-3C2508:lI108|H3C25C4
-3C25C4:lI105|H3C2678
-3C2678:lI99|H3C272C
-3C272C:lI97|H3C27E8
-3C27E8:lI116|H3C28A4
-3C28A4:lI105|H3C2968
-3C2968:lI111|H3C2A2C
-3C2A2C:lI110|H3C2AF8
-3C2AF8:lI47|H3C2BBC
-3C2BBC:lI112|H3C2C70
-3C2C70:lI111|H3C2D20
-3C2D20:lI115|H3C2DC8
-3C2DC8:lI116|H3C2E50
-3C2E50:lI115|H3C2EC8
-3C2EC8:lI99|H3C2F40
-3C2F40:lI114|H3C2FB0
-3C2FB0:lI105|H3C3018
-3C3018:lI112|H3C3078
-3C3078:lI116|N
-3C22FC:lI97|H3C23B0
-3C23B0:lI105|N
-3C2254:lH3C230C|H3C2318
-3C230C:t2:H3C23C0,H3C23C8
-3C23C8:lI97|H3C246C
-3C246C:lI112|H3C2518
-3C2518:lI112|H3C25CC
-3C25CC:lI108|H3C2680
-3C2680:lI105|H3C2734
-3C2734:lI99|H3C27F0
-3C27F0:lI97|H3C28AC
-3C28AC:lI116|H3C2970
-3C2970:lI105|H3C2A34
-3C2A34:lI111|H3C2B00
-3C2B00:lI110|H3C2BC4
-3C2BC4:lI47|H3C2C78
-3C2C78:lI112|H3C2D28
-3C2D28:lI111|H3C2DD0
-3C2DD0:lI115|H3C2E58
-3C2E58:lI116|H3C2ED0
-3C2ED0:lI115|H3C2F48
-3C2F48:lI99|H3C2FB8
-3C2FB8:lI114|H3C3020
-3C3020:lI105|H3C3080
-3C3080:lI112|H3C30D8
-3C30D8:lI116|N
-3C23C0:lI101|H3C2464
-3C2464:lI112|H3C2510
-3C2510:lI115|N
-3C2318:lH3C23D0|H3C23DC
-3C23D0:t2:H3C2474,H3C247C
-3C247C:lI97|H3C2528
-3C2528:lI112|H3C25D4
-3C25D4:lI112|H3C2688
-3C2688:lI108|H3C273C
-3C273C:lI105|H3C27F8
-3C27F8:lI99|H3C28B4
-3C28B4:lI97|H3C2978
-3C2978:lI116|H3C2A3C
-3C2A3C:lI105|H3C2B08
-3C2B08:lI111|H3C2BCC
-3C2BCC:lI110|H3C2C80
-3C2C80:lI47|H3C2D30
-3C2D30:lI112|H3C2DD8
-3C2DD8:lI111|H3C2E60
-3C2E60:lI115|H3C2ED8
-3C2ED8:lI116|H3C2F50
-3C2F50:lI115|H3C2FC0
-3C2FC0:lI99|H3C3028
-3C3028:lI114|H3C3088
-3C3088:lI105|H3C30E0
-3C30E0:lI112|H3C3130
-3C3130:lI116|N
-3C2474:lI112|H3C2520
-3C2520:lI115|N
-3C23DC:lH3C2484|H3C2490
-3C2484:t2:H3C2530,H3C2538
-3C2538:lI97|H3C25E4
-3C25E4:lI112|H3C2698
-3C2698:lI112|H3C2744
-3C2744:lI108|H3C2800
-3C2800:lI105|H3C28BC
-3C28BC:lI99|H3C2980
-3C2980:lI97|H3C2A44
-3C2A44:lI116|H3C2B10
-3C2B10:lI105|H3C2BD4
-3C2BD4:lI111|H3C2C88
-3C2C88:lI110|H3C2D38
-3C2D38:lI47|H3C2DE0
-3C2DE0:lI112|H3C2E68
-3C2E68:lI100|H3C2EE0
-3C2EE0:lI102|N
-3C2530:lI112|H3C25DC
-3C25DC:lI100|H3C2690
-3C2690:lI102|N
-3C2490:lH3C2540|H3C254C
-3C2540:t2:H3C25EC,H3C25F4
-3C25F4:lI97|H3C26A8
-3C26A8:lI112|H3C2754
-3C2754:lI112|H3C2808
-3C2808:lI108|H3C28C4
-3C28C4:lI105|H3C2988
-3C2988:lI99|H3C2A4C
-3C2A4C:lI97|H3C2B18
-3C2B18:lI116|H3C2BDC
-3C2BDC:lI105|H3C2C90
-3C2C90:lI111|H3C2D40
-3C2D40:lI110|H3C2DE8
-3C2DE8:lI47|H3C2E70
-3C2E70:lI111|H3C2EE8
-3C2EE8:lI100|H3C2F58
-3C2F58:lI97|N
-3C25EC:lI111|H3C26A0
-3C26A0:lI100|H3C274C
-3C274C:lI97|N
-3C254C:lH3C25FC|H3C2608
-3C25FC:t2:H3C26B0,H3C26B8
-3C26B8:lI97|H3C2764
-3C2764:lI112|H3C2818
-3C2818:lI112|H3C28CC
-3C28CC:lI108|H3C2990
-3C2990:lI105|H3C2A54
-3C2A54:lI99|H3C2B20
-3C2B20:lI97|H3C2BE4
-3C2BE4:lI116|H3C2C98
-3C2C98:lI105|H3C2D48
-3C2D48:lI111|H3C2DF0
-3C2DF0:lI110|H3C2E78
-3C2E78:lI47|H3C2EF0
-3C2EF0:lI111|H3C2F60
-3C2F60:lI99|H3C2FC8
-3C2FC8:lI116|H3C3030
-3C3030:lI101|H3C3090
-3C3090:lI116|H3C30E8
-3C30E8:lI45|H3C3138
-3C3138:lI115|H3C3180
-3C3180:lI116|H3C31C8
-3C31C8:lI114|H3C3210
-3C3210:lI101|H3C3258
-3C3258:lI97|H3C32A0
-3C32A0:lI109|N
-3C26B0:lI98|H3C275C
-3C275C:lI105|H3C2810
-3C2810:lI110|N
-3C2608:lH3C26C0|H3C26CC
-3C26C0:t2:H3C276C,H3C2774
-3C2774:lI97|H3C2828
-3C2828:lI112|H3C28DC
-3C28DC:lI112|H3C2998
-3C2998:lI108|H3C2A5C
-3C2A5C:lI105|H3C2B28
-3C2B28:lI99|H3C2BEC
-3C2BEC:lI97|H3C2CA0
-3C2CA0:lI116|H3C2D50
-3C2D50:lI105|H3C2DF8
-3C2DF8:lI111|H3C2E80
-3C2E80:lI110|H3C2EF8
-3C2EF8:lI47|H3C2F68
-3C2F68:lI111|H3C2FD0
-3C2FD0:lI99|H3C3038
-3C3038:lI116|H3C3098
-3C3098:lI101|H3C30F0
-3C30F0:lI116|H3C3140
-3C3140:lI45|H3C3188
-3C3188:lI115|H3C31D0
-3C31D0:lI116|H3C3218
-3C3218:lI114|H3C3260
-3C3260:lI101|H3C32A8
-3C32A8:lI97|H3C32E8
-3C32E8:lI109|N
-3C276C:lI100|H3C2820
-3C2820:lI109|H3C28D4
-3C28D4:lI115|N
-3C26CC:lH3C277C|H3C2788
-3C277C:t2:H3C2830,H3C2838
-3C2838:lI97|H3C28EC
-3C28EC:lI112|H3C29A8
-3C29A8:lI112|H3C2A64
-3C2A64:lI108|H3C2B30
-3C2B30:lI105|H3C2BF4
-3C2BF4:lI99|H3C2CA8
-3C2CA8:lI97|H3C2D58
-3C2D58:lI116|H3C2E00
-3C2E00:lI105|H3C2E88
-3C2E88:lI111|H3C2F00
-3C2F00:lI110|H3C2F70
-3C2F70:lI47|H3C2FD8
-3C2FD8:lI111|H3C3040
-3C3040:lI99|H3C30A0
-3C30A0:lI116|H3C30F8
-3C30F8:lI101|H3C3148
-3C3148:lI116|H3C3190
-3C3190:lI45|H3C31D8
-3C31D8:lI115|H3C3220
-3C3220:lI116|H3C3268
-3C3268:lI114|H3C32B0
-3C32B0:lI101|H3C32F0
-3C32F0:lI97|H3C3320
-3C3320:lI109|N
-3C2830:lI108|H3C28E4
-3C28E4:lI104|H3C29A0
-3C29A0:lI97|N
-3C2788:lH3C2840|H3C284C
-3C2840:t2:H3C28F4,H3C28FC
-3C28FC:lI97|H3C29B8
-3C29B8:lI112|H3C2A74
-3C2A74:lI112|H3C2B38
-3C2B38:lI108|H3C2BFC
-3C2BFC:lI105|H3C2CB0
-3C2CB0:lI99|H3C2D60
-3C2D60:lI97|H3C2E08
-3C2E08:lI116|H3C2E90
-3C2E90:lI105|H3C2F08
-3C2F08:lI111|H3C2F78
-3C2F78:lI110|H3C2FE0
-3C2FE0:lI47|H3C3048
-3C3048:lI111|H3C30A8
-3C30A8:lI99|H3C3100
-3C3100:lI116|H3C3150
-3C3150:lI101|H3C3198
-3C3198:lI116|H3C31E0
-3C31E0:lI45|H3C3228
-3C3228:lI115|H3C3270
-3C3270:lI116|H3C32B8
-3C32B8:lI114|H3C32F8
-3C32F8:lI101|H3C3328
-3C3328:lI97|H3C3350
-3C3350:lI109|N
-3C28F4:lI108|H3C29B0
-3C29B0:lI122|H3C2A6C
-3C2A6C:lI104|N
-3C284C:lH3C2904|H3C2910
-3C2904:t2:H3C29C0,H3C29C8
-3C29C8:lI97|H3C2A84
-3C2A84:lI112|H3C2B48
-3C2B48:lI112|H3C2C04
-3C2C04:lI108|H3C2CB8
-3C2CB8:lI105|H3C2D68
-3C2D68:lI99|H3C2E10
-3C2E10:lI97|H3C2E98
-3C2E98:lI116|H3C2F10
-3C2F10:lI105|H3C2F80
-3C2F80:lI111|H3C2FE8
-3C2FE8:lI110|H3C3050
-3C3050:lI47|H3C30B0
-3C30B0:lI111|H3C3108
-3C3108:lI99|H3C3158
-3C3158:lI116|H3C31A0
-3C31A0:lI101|H3C31E8
-3C31E8:lI116|H3C3230
-3C3230:lI45|H3C3278
-3C3278:lI115|H3C32C0
-3C32C0:lI116|H3C3300
-3C3300:lI114|H3C3330
-3C3330:lI101|H3C3358
-3C3358:lI97|H3C3378
-3C3378:lI109|N
-3C29C0:lI101|H3C2A7C
-3C2A7C:lI120|H3C2B40
-3C2B40:lI101|N
-3C2910:lH3C29D0|H3C29DC
-3C29D0:t2:H3C2A8C,H3C2A94
-3C2A94:lI97|H3C2B58
-3C2B58:lI112|H3C2C14
-3C2C14:lI112|H3C2CC8
-3C2CC8:lI108|H3C2D78
-3C2D78:lI105|H3C2E18
-3C2E18:lI99|H3C2EA0
-3C2EA0:lI97|H3C2F18
-3C2F18:lI116|H3C2F88
-3C2F88:lI105|H3C2FF0
-3C2FF0:lI111|H3C3058
-3C3058:lI110|H3C30B8
-3C30B8:lI47|H3C3110
-3C3110:lI111|H3C3160
-3C3160:lI99|H3C31A8
-3C31A8:lI116|H3C31F0
-3C31F0:lI101|H3C3238
-3C3238:lI116|H3C3280
-3C3280:lI45|H3C32C8
-3C32C8:lI115|H3C3308
-3C3308:lI116|H3C3338
-3C3338:lI114|H3C3360
-3C3360:lI101|H3C3380
-3C3380:lI97|H3C3398
-3C3398:lI109|N
-3C2A8C:lI99|H3C2B50
-3C2B50:lI108|H3C2C0C
-3C2C0C:lI97|H3C2CC0
-3C2CC0:lI115|H3C2D70
-3C2D70:lI115|N
-3C29DC:lH3C2A9C|H3C2AA8
-3C2A9C:t2:H3C2B60,H3C2B68
-3C2B68:lI97|H3C2C24
-3C2C24:lI112|H3C2CD8
-3C2CD8:lI112|H3C2D80
-3C2D80:lI108|H3C2E20
-3C2E20:lI105|H3C2EA8
-3C2EA8:lI99|H3C2F20
-3C2F20:lI97|H3C2F90
-3C2F90:lI116|H3C2FF8
-3C2FF8:lI105|H3C3060
-3C3060:lI111|H3C30C0
-3C30C0:lI110|H3C3118
-3C3118:lI47|H3C3168
-3C3168:lI109|H3C31B0
-3C31B0:lI115|H3C31F8
-3C31F8:lI119|H3C3240
-3C3240:lI111|H3C3288
-3C3288:lI114|H3C32D0
-3C32D0:lI100|N
-3C2B60:lI100|H3C2C1C
-3C2C1C:lI111|H3C2CD0
-3C2CD0:lI99|N
-3C2AA8:lH3C2B70|H3C2B7C
-3C2B70:t2:H3C2C2C,H3C2C34
-3C2C34:lI97|H3C2CE8
-3C2CE8:lI112|H3C2D90
-3C2D90:lI112|H3C2E28
-3C2E28:lI108|H3C2EB0
-3C2EB0:lI105|H3C2F28
-3C2F28:lI99|H3C2F98
-3C2F98:lI97|H3C3000
-3C3000:lI116|H3C3068
-3C3068:lI105|H3C30C8
-3C30C8:lI111|H3C3120
-3C3120:lI110|H3C3170
-3C3170:lI47|H3C31B8
-3C31B8:lI109|H3C3200
-3C3200:lI97|H3C3248
-3C3248:lI99|H3C3290
-3C3290:lI45|H3C32D8
-3C32D8:lI99|H3C3310
-3C3310:lI111|H3C3340
-3C3340:lI109|H3C3368
-3C3368:lI112|H3C3388
-3C3388:lI97|H3C33A0
-3C33A0:lI99|H3C33B0
-3C33B0:lI116|H3C33C0
-3C33C0:lI112|H3C33D0
-3C33D0:lI114|H3C33E0
-3C33E0:lI111|N
-3C2C2C:lI99|H3C2CE0
-3C2CE0:lI112|H3C2D88
-3C2D88:lI116|N
-3C2B7C:lH3C2C3C|N
-3C2C3C:t2:H3C2CF0,H3C2CF8
-3C2CF8:lI97|H3C2DA0
-3C2DA0:lI112|H3C2E38
-3C2E38:lI112|H3C2EB8
-3C2EB8:lI108|H3C2F30
-3C2F30:lI105|H3C2FA0
-3C2FA0:lI99|H3C3008
-3C3008:lI97|H3C3070
-3C3070:lI116|H3C30D0
-3C30D0:lI105|H3C3128
-3C3128:lI111|H3C3178
-3C3178:lI110|H3C31C0
-3C31C0:lI47|H3C3208
-3C3208:lI109|H3C3250
-3C3250:lI97|H3C3298
-3C3298:lI99|H3C32E0
-3C32E0:lI45|H3C3318
-3C3318:lI98|H3C3348
-3C3348:lI105|H3C3370
-3C3370:lI110|H3C3390
-3C3390:lI104|H3C33A8
-3C33A8:lI101|H3C33B8
-3C33B8:lI120|H3C33C8
-3C33C8:lI52|H3C33D8
-3C33D8:lI48|N
-3C2CF0:lI104|H3C2D98
-3C2D98:lI113|H3C2E30
-3C2E30:lI120|N
-3BDBCC:lH3BDA78|H3BDA8C
-3BDA78:t2:A4:port,I8888
-3BDA8C:lH3BDB04|H3BDB10
-3BDB04:t2:AC:bind_address,H3BDB64
-3BDB64:t4:I127,I0,I0,I1
-3BDB10:lH3BDB78|H3BDB84
-3BDB78:t2:AB:server_name,H3BDBD4
-3BDBD4:lI108|H3BDC24
-3BDC24:lI111|H3BDC88
-3BDC88:lI99|H3BDCF0
-3BDCF0:lI97|H3BDD70
-3BDD70:lI108|H3BDDF8
-3BDDF8:lI104|H3BDE90
-3BDE90:lI111|H3BDF40
-3BDF40:lI115|H3BDFFC
-3BDFFC:lI116|N
-3BDB84:lH3BDBDC|H3BDBE8
-3BDBDC:t2:AE:max_header_siz,I1024
-3BDBE8:lH3BDC2C|H3BDC38
-3BDC2C:t2:A11:max_header_action,A8:reply414
-3BDC38:lH3BDC90|H3BDC9C
-3BDC90:t2:A8:com_type,A7:ip_comm
-3BDC9C:lH3BDCF8|H3BDD04
-3BDCF8:t2:A7:modules,H3BDD78
-3BDD78:lA9:mod_alias|H3BDE00
-3BDE00:lA8:mod_auth|H3BDE98
-3BDE98:lA7:mod_esi|H3BDF48
-3BDF48:lAB:mod_actions|H3BE004
-3BE004:lA7:mod_cgi|H3BE0D0
-3BE0D0:lAB:mod_include|H3BE1A4
-3BE1A4:lA7:mod_dir|H3BE288
-3BE288:lA7:mod_get|H3BE378
-3BE378:lA8:mod_head|H3BE47C
-3BE47C:lA7:mod_log|H3BE580
-3BE580:lAC:mod_disk_log|N
-3BDD04:lH3BDD80|H3BDD8C
-3BDD80:t2:AF:directory_index,H3BDE08
-3BDE08:lH3BDEA0|N
-3BDEA0:lI105|H3BDF50
-3BDF50:lI110|H3BE00C
-3BE00C:lI100|H3BE0D8
-3BE0D8:lI101|H3BE1AC
-3BE1AC:lI120|H3BE290
-3BE290:lI46|H3BE380
-3BE380:lI104|H3BE484
-3BE484:lI116|H3BE588
-3BE588:lI109|H3BE68C
-3BE68C:lI108|N
-3BDD8C:lH3BDE10|H3BDE1C
-3BDE10:t2:AC:default_type,H3BDEA8
-3BDEA8:lI116|H3BDF58
-3BDF58:lI101|H3BE014
-3BE014:lI120|H3BE0E0
-3BE0E0:lI116|H3BE1B4
-3BE1B4:lI47|H3BE298
-3BE298:lI112|H3BE388
-3BE388:lI108|H3BE48C
-3BE48C:lI97|H3BE590
-3BE590:lI105|H3BE694
-3BE694:lI110|N
-3BDE1C:lH3BDEB0|H3BDEBC
-3BDEB0:t2:A10:erl_script_alias,H3BDF60
-3BDF60:t2:H3BE01C,H3BE024
-3BE024:lH3BE0F0|N
-3BE0F0:lI119|H3BE1C4
-3BE1C4:lI101|H3BE2A8
-3BE2A8:lI98|H3BE398
-3BE398:lI116|H3BE49C
-3BE49C:lI111|H3BE5A0
-3BE5A0:lI111|H3BE6A4
-3BE6A4:lI108|N
-3BE01C:lI47|H3BE0E8
-3BE0E8:lI119|H3BE1BC
-3BE1BC:lI101|H3BE2A0
-3BE2A0:lI98|H3BE390
-3BE390:lI116|H3BE494
-3BE494:lI111|H3BE598
-3BE598:lI111|H3BE69C
-3BE69C:lI108|N
-3BDEBC:lH3BDF6C|H3BDF78
-3BDF6C:t2:A5:alias,H3BE02C
-3BE02C:t2:H3BE0F8,H3BE100
-3BE100:lI47|H3BE1D4
-3BE1D4:lI99|H3BE2B8
-3BE2B8:lI108|H3BE3A8
-3BE3A8:lI101|H3BE4AC
-3BE4AC:lI97|H3BE5B0
-3BE5B0:lI114|H3BE6B4
-3BE6B4:lI99|H3BE7A8
-3BE7A8:lI97|H3BE894
-3BE894:lI115|H3BE980
-3BE980:lI101|H3BEA74
-3BEA74:lI47|H3BEB68
-3BEB68:lI111|H3BEC54
-3BEC54:lI116|H3BED40
-3BED40:lI112|H3BEE2C
-3BEE2C:lI47|H3BEF00
-3BEF00:lI101|H3BEFD4
-3BEFD4:lI114|H3BF0A0
-3BF0A0:lI116|H3BF174
-3BF174:lI115|H3BF238
-3BF238:lI47|H3BF2FC
-3BF2FC:lI108|H3BF3A8
-3BF3A8:lI105|H3BF45C
-3BF45C:lI98|H3BF518
-3BF518:lI47|H3BF5DC
-3BF5DC:lI111|H3BF6B0
-3BF6B0:lI98|H3BF784
-3BF784:lI115|H3BF858
-3BF858:lI101|H3BF93C
-3BF93C:lI114|H3BFA18
-3BFA18:lI118|H3BFAF4
-3BFAF4:lI101|H3BFBD0
-3BFBD0:lI114|H3BFC9C
-3BFC9C:lI47|H3BFD60
-3BFD60:lI112|H3BFE2C
-3BFE2C:lI114|H3BFEE0
-3BFEE0:lI105|H3BFF94
-3BFF94:lI118|H3C0040
-3C0040:lI47|H3C00EC
-3C00EC:lI99|H3C0198
-3C0198:lI114|H3C024C
-3C024C:lI97|H3C0308
-3C0308:lI115|H3C03BC
-3C03BC:lI104|H3C0458
-3C0458:lI100|H3C04F4
-3C04F4:lI117|H3C0590
-3C0590:lI109|H3C0634
-3C0634:lI112|H3C06E0
-3C06E0:lI95|H3C078C
-3C078C:lI118|H3C0830
-3C0830:lI105|H3C08BC
-3C08BC:lI101|H3C0950
-3C0950:lI119|H3C09E4
-3C09E4:lI101|H3C0A80
-3C0A80:lI114|N
-3BE0F8:lI47|H3BE1CC
-3BE1CC:lI99|H3BE2B0
-3BE2B0:lI114|H3BE3A0
-3BE3A0:lI97|H3BE4A4
-3BE4A4:lI115|H3BE5A8
-3BE5A8:lI104|H3BE6AC
-3BE6AC:lI100|H3BE7A0
-3BE7A0:lI117|H3BE88C
-3BE88C:lI109|H3BE978
-3BE978:lI112|H3BEA6C
-3BEA6C:lI95|H3BEB60
-3BEB60:lI118|H3BEC4C
-3BEC4C:lI105|H3BED38
-3BED38:lI101|H3BEE24
-3BEE24:lI119|H3BEEF8
-3BEEF8:lI101|H3BEFCC
-3BEFCC:lI114|N
-3BDF78:lH3BE038|H3BE044
-3BE038:t2:A5:alias,H3BE108
-3BE108:t2:H3BE1DC,H3BE1E4
-3BE1E4:lI47|H3BE2C8
-3BE2C8:lI99|H3BE3B8
-3BE3B8:lI108|H3BE4BC
-3BE4BC:lI101|H3BE5C0
-3BE5C0:lI97|H3BE6C4
-3BE6C4:lI114|H3BE7B8
-3BE7B8:lI99|H3BE8A4
-3BE8A4:lI97|H3BE990
-3BE990:lI115|H3BEA84
-3BEA84:lI101|H3BEB78
-3BEB78:lI47|H3BEC64
-3BEC64:lI111|H3BED50
-3BED50:lI116|H3BEE3C
-3BEE3C:lI112|H3BEF10
-3BEF10:lI47|H3BEFE4
-3BEFE4:lI101|H3BF0B0
-3BF0B0:lI114|H3BF184
-3BF184:lI116|H3BF248
-3BF248:lI115|H3BF304
-3BF304:lI47|H3BF3B0
-3BF3B0:lI101|H3BF464
-3BF464:lI114|H3BF520
-3BF520:lI116|H3BF5E4
-3BF5E4:lI115|H3BF6B8
-3BF6B8:lI47|H3BF78C
-3BF78C:lI100|H3BF860
-3BF860:lI111|H3BF944
-3BF944:lI99|H3BFA20
-3BFA20:lI47|H3BFAFC
-3BFAFC:lI104|H3BFBD8
-3BFBD8:lI116|H3BFCA4
-3BFCA4:lI109|H3BFD68
-3BFD68:lI108|N
-3BE1DC:lI47|H3BE2C0
-3BE2C0:lI99|H3BE3B0
-3BE3B0:lI114|H3BE4B4
-3BE4B4:lI97|H3BE5B8
-3BE5B8:lI115|H3BE6BC
-3BE6BC:lI104|H3BE7B0
-3BE7B0:lI100|H3BE89C
-3BE89C:lI117|H3BE988
-3BE988:lI109|H3BEA7C
-3BEA7C:lI112|H3BEB70
-3BEB70:lI95|H3BEC5C
-3BEC5C:lI101|H3BED48
-3BED48:lI114|H3BEE34
-3BEE34:lI116|H3BEF08
-3BEF08:lI115|H3BEFDC
-3BEFDC:lI95|H3BF0A8
-3BF0A8:lI100|H3BF17C
-3BF17C:lI111|H3BF240
-3BF240:lI99|N
-3BE044:lH3BE114|H3BE120
-3BE114:t2:A5:alias,H3BE1EC
-3BE1EC:t2:H3BE2D0,H3BE2D8
-3BE2D8:lI47|H3BE3C8
-3BE3C8:lI99|H3BE4CC
-3BE4CC:lI108|H3BE5D0
-3BE5D0:lI101|H3BE6D4
-3BE6D4:lI97|H3BE7C8
-3BE7C8:lI114|H3BE8B4
-3BE8B4:lI99|H3BE9A0
-3BE9A0:lI97|H3BEA94
-3BEA94:lI115|H3BEB88
-3BEB88:lI101|H3BEC74
-3BEC74:lI47|H3BED60
-3BED60:lI111|H3BEE4C
-3BEE4C:lI116|H3BEF20
-3BEF20:lI112|H3BEFEC
-3BEFEC:lI47|H3BF0B8
-3BF0B8:lI101|H3BF18C
-3BF18C:lI114|H3BF250
-3BF250:lI116|H3BF30C
-3BF30C:lI115|H3BF3B8
-3BF3B8:lI47|H3BF46C
-3BF46C:lI108|H3BF528
-3BF528:lI105|H3BF5EC
-3BF5EC:lI98|H3BF6C0
-3BF6C0:lI47|H3BF794
-3BF794:lI111|H3BF868
-3BF868:lI98|H3BF94C
-3BF94C:lI115|H3BFA28
-3BFA28:lI101|H3BFB04
-3BFB04:lI114|H3BFBE0
-3BFBE0:lI118|H3BFCAC
-3BFCAC:lI101|H3BFD70
-3BFD70:lI114|H3BFE34
-3BFE34:lI47|H3BFEE8
-3BFEE8:lI100|H3BFF9C
-3BFF9C:lI111|H3C0048
-3C0048:lI99|H3C00F4
-3C00F4:lI47|H3C01A0
-3C01A0:lI104|H3C0254
-3C0254:lI116|H3C0310
-3C0310:lI109|H3C03C4
-3C03C4:lI108|N
-3BE2D0:lI47|H3BE3C0
-3BE3C0:lI99|H3BE4C4
-3BE4C4:lI114|H3BE5C8
-3BE5C8:lI97|H3BE6CC
-3BE6CC:lI115|H3BE7C0
-3BE7C0:lI104|H3BE8AC
-3BE8AC:lI100|H3BE998
-3BE998:lI117|H3BEA8C
-3BEA8C:lI109|H3BEB80
-3BEB80:lI112|H3BEC6C
-3BEC6C:lI95|H3BED58
-3BED58:lI100|H3BEE44
-3BEE44:lI111|H3BEF18
-3BEF18:lI99|N
-3BE120:lH3BE1F8|N
-3BE1F8:t2:A10:erl_script_alias,H3BE2E0
-3BE2E0:t2:H3BE3D0,H3BE3D8
-3BE3D8:lH3BE4DC|N
-3BE4DC:lI99|H3BE5E0
-3BE5E0:lI114|H3BE6E4
-3BE6E4:lI97|H3BE7D8
-3BE7D8:lI115|H3BE8C4
-3BE8C4:lI104|H3BE9B0
-3BE9B0:lI100|H3BEAA4
-3BEAA4:lI117|H3BEB90
-3BEB90:lI109|H3BEC7C
-3BEC7C:lI112|H3BED68
-3BED68:lI95|H3BEE54
-3BEE54:lI118|H3BEF28
-3BEF28:lI105|H3BEFF4
-3BEFF4:lI101|H3BF0C0
-3BF0C0:lI119|H3BF194
-3BF194:lI101|H3BF258
-3BF258:lI114|N
-3BE3D0:lI47|H3BE4D4
-3BE4D4:lI99|H3BE5D8
-3BE5D8:lI100|H3BE6DC
-3BE6DC:lI118|H3BE7D0
-3BE7D0:lI95|H3BE8BC
-3BE8BC:lI101|H3BE9A8
-3BE9A8:lI114|H3BEA9C
-3BEA9C:lI108|N
-3BDE2C:lH3BDA9C|H3BDECC
-3BDA9C:t4:I127,I0,I0,I1
-3BDECC:lI8888|H3BDF88
-3BDF88:lN|N
-3BDD1C:lN|N
-3BDA50:t2:AD:$initial_call,H3BDAB8
-3BDAB8:t3:A3:gen,A7:init_it,H3BDAB0
-3BDA5C:t2:A9:verbosity,A7:silence
-3BDAC8:t2:AE:auth_verbosity,A7:silence
-3BDB28:t2:A12:security_verbosity,A7:silence
-3BDB9C:t2:A12:acceptor_verbosity,A7:silence
-3BDC00:t2:AA:$ancestors,H3BDC5C
-3BDC5C:lA1A:httpd_sup__127_0_0_1__8888|H3BDCB4
-3BDCB4:lA8:web_tool|H3BDD24
-3BDD24:lP<0.27.0>|N
-3BDADC:t2:A19:request_handler_verbosity,A7:silence
-3BDB3C:t2:A5:sname,A3:man
-=proc_dictionary:<0.47.0>
-H36E688
-H36E694
-H36E6A0
-H36E6AC
-=proc_stack:<0.47.0>
-36c520:SReturn addr 0x362C9C (inet_tcp:accept/2 + 20)
-y0:I5
-y1:p<0.161>
-y2:p<0.141>
-36c530:SReturn addr 0x500C5C (httpd_socket:accept/3 + 280)
-y0:N
-36c538:SReturn addr 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y0:N
-36c540:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:SCatch 0x502BFC (httpd_acceptor:acceptor/4 + 164)
-y1:P<0.46.0>
-y2:A7:ip_comm
-y3:p<0.141>
-y4:A1B:httpd_conf__127_0_0_1__8888
-36c558:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:AE:httpd_acceptor
-y2:A8:acceptor
-y3:H36E6C8
-=proc_heap:<0.47.0>
-36E6C8:lP<0.44.0>|H36E724
-36E724:lP<0.46.0>|H36E748
-36E748:lA7:ip_comm|H36E760
-36E760:lH36E6D0|H36E778
-36E6D0:t4:I127,I0,I0,I1
-36E778:lI8888|H36E788
-36E788:lA1B:httpd_conf__127_0_0_1__8888|H36E798
-36E798:lA7:silence|N
-36E688:t2:AD:$initial_call,H36E6F0
-36E6F0:t3:AE:httpd_acceptor,A8:acceptor,H36E6C8
-36E694:t2:A9:verbosity,A7:silence
-36E6A0:t2:AA:$ancestors,H36E700
-36E700:lA1E:httpd_acc_sup__127_0_0_1__8888|H36E72C
-36E72C:lA1A:httpd_sup__127_0_0_1__8888|H36E750
-36E750:lA8:web_tool|H36E768
-36E768:lP<0.27.0>|N
-36E6AC:t2:A5:sname,A3:acc
-=proc_dictionary:<0.48.0>
-H385E48
-H385E54
-=proc_stack:<0.48.0>
-3ac1bc:SReturn addr 0x225860 (proc_lib:init_p/5 + 164)
-y0:N
-y1:A8:infinity
-y2:A10:crashdump_viewer
-y3:H3AB280
-y4:A17:crashdump_viewer_server
-y5:P<0.41.0>
-3ac1d8:SReturn addr 0x156F90 (<terminate process normally>)
-y0:SCatch 0x225860 (proc_lib:init_p/5 + 164)
-y1:A3:gen
-y2:A7:init_it
-y3:H385E90
-=proc_heap:<0.48.0>
-3AB280:t8:A5:state,A9:undefined,A9:undefined,A9:undefined,A5:false,I4,A9:undefined,P<0.56.0>
-385E90:lAA:gen_server|H385ED8
-385ED8:lP<0.41.0>|H385F10
-385F10:lP<0.41.0>|H385F58
-385F58:lH385FA8|H385FB4
-385FA8:t2:A5:local,A17:crashdump_viewer_server
-385FB4:lA10:crashdump_viewer|H386014
-386014:lN|H38606C
-38606C:lN|N
-385E48:t2:AD:$initial_call,H385EB0
-385EB0:t3:A3:gen,A7:init_it,H385E90
-385E54:t2:AA:$ancestors,H385EC0
-385EC0:lA6:websup|H385F08
-385F08:lA8:web_tool|H385F50
-385F50:lP<0.27.0>|N
-=proc_stack:<0.49.0>
-36a114:SReturn addr 0x30174C (io:parse_erl_exprs/3 + 92)
-y0:H369E10
-y1:P<0.22.0>
-36a120:SReturn addr 0x2E5360 (shell:'-get_command/4-fun-0-'/1 + 20)
-y0:N
-36a128:SReturn addr 0x156F90 (<terminate process normally>)
-=proc_heap:<0.49.0>
-369E10:E21:8372000364000D6E6F6E6F6465406E6F686F737400000001330000000000000000
-=atoms
diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 8dea0d8ea8..c076c5e81e 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %%
 %% The 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 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
--export([app_file/1]).
+-export([app_file/1, appup_file/1]).
 
 %% Default timetrap timeout (set in init_per_testcase)
 -define(default_timeout, ?t:minutes(1)).
@@ -43,7 +43,7 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_file].
+    [app_file, appup_file].
 
 groups() -> 
     [].
@@ -66,5 +66,9 @@ app_file(suite) ->
 app_file(doc) ->
     ["Testing .app file"];
 app_file(Config) when is_list(Config) ->
-    ?line ok = ?t:app_test(os_mon),
+    ?line ok = ?t:app_test(observer),
     ok.
+
+%% Testing .appup file
+appup_file(Config) when is_list(Config) ->
+    ok = ?t:appup_test(observer).
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index 96d9d885da..f48809a839 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 1.3.1
+OBSERVER_VSN = 1.3.1.2
diff --git a/lib/odbc/aclocal.m4 b/lib/odbc/aclocal.m4
index 25f40944e7..46b30a16b3 100644
--- a/lib/odbc/aclocal.m4
+++ b/lib/odbc/aclocal.m4
@@ -954,6 +954,40 @@ dnl
 AC_DEFUN(ERL_FIND_ETHR_LIB,
 [
 
+AC_ARG_ENABLE(native-ethr-impls,
+	      AS_HELP_STRING([--disable-native-ethr-impls],
+                             [disable native ethread implementations]),
+[ case "$enableval" in
+    no) disable_native_ethr_impls=yes ;;
+    *)  disable_native_ethr_impls=no ;;
+  esac ], disable_native_ethr_impls=no)
+
+test "X$disable_native_ethr_impls" = "Xyes" &&
+  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
+
+AC_ARG_ENABLE(x86-out-of-order,
+	      AS_HELP_STRING([--enable-x86-out-of-order],
+                             [enable x86/x84_64 out of order support (default disabled)]))
+
+AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
+	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
+			     [prefer gcc native ethread implementations]),
+[ case "$enableval" in
+    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
+    *)  enable_prefer_gcc_native_ethr_impls=no ;;
+  esac ], enable_prefer_gcc_native_ethr_impls=no)
+
+test $enable_prefer_gcc_native_ethr_impls = yes &&
+  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
+
+AC_ARG_WITH(libatomic_ops,
+	    AS_HELP_STRING([--with-libatomic_ops=PATH],
+			   [specify and prefer usage of libatomic_ops in the ethread library]))
+
+AC_ARG_WITH(with_sparc_memory_order,
+	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
+			   [specify sparc memory order (defaults to RMO)]))
+
 LM_CHECK_THR_LIB
 ERL_INTERNAL_LIBS
 
@@ -1003,40 +1037,44 @@ case "$THR_LIB_NAME" in
 
 	AC_DEFINE(ETHR_WIN32_THREADS, 1, [Define if you have win32 threads])
 
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
-
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    have_interlocked_op=no
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
+	fi
 	test "$ethr_have_native_atomics" = "yes" && ethr_have_native_spinlock=yes
 	;;
 
@@ -1303,93 +1341,98 @@ case "$THR_LIB_NAME" in
 	    int128="__int128_t"
 	fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+
+	    if test $int128 != no; then
+	        ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
+	    fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+	    AC_MSG_CHECKING([for a usable libatomic_ops implementation])
+	    case "x$with_libatomic_ops" in
+	        xno | xyes | x)
+	    	    libatomic_ops_include=
+	    	    ;;
+	        *)
+	    	    if test -d "${with_libatomic_ops}/include"; then
+	    	        libatomic_ops_include="-I$with_libatomic_ops/include"
+	    	        CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
+	    	    else
+	    	        AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
+	    	    fi;;
+	    esac
+	    ethr_have_libatomic_ops=no
+	    AC_TRY_LINK([#include "atomic_ops.h"],
+	    	        [
+	    	    	    volatile AO_t x;
+	    	    	    AO_t y;
+	    	    	    int z;
+
+	    	    	    AO_nop_full();
+	    	    	    AO_store(&x, (AO_t) 0);
+	    	    	    z = AO_load(&x);
+	    	    	    z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
+	    	        ],
+	    	        [ethr_have_native_atomics=yes
+	    	         ethr_have_libatomic_ops=yes])
+	    AC_MSG_RESULT([$ethr_have_libatomic_ops])
+	    if test $ethr_have_libatomic_ops = yes; then
+	        AC_CHECK_SIZEOF(AO_t, ,
+	    	    	        [
+	    	    	    	    #include <stdio.h>
+	    	    	    	    #include "atomic_ops.h"
+	    	    	        ])
+	        AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
+
+	        AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
+	        if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	    	    AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
+	        fi
+	        ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
+	    elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	        AC_MSG_ERROR([No usable libatomic_ops implementation found])
+	    fi
 
-	if test $int128 != no; then
-	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
-	fi
+	    case "$host_cpu" in
+	      sparc | sun4u | sparc64 | sun4v)
+	    	    case "$with_sparc_memory_order" in
+	    	        "TSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
+	    	        "PSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
+	    	        "RMO"|"")
+	    	    	    AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
+	    	        *)
+	    	    	    AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
+	    	    esac
+	    	    ethr_have_native_atomics=yes;; 
+	      i86pc | i*86 | x86_64 | amd64)
+	    	    if test "$enable_x86_out_of_order" = "yes"; then
+	    	    	    AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
+	    	    fi
+	    	    ethr_have_native_atomics=yes;;
+	      macppc | ppc | powerpc | "Power Macintosh")
+	    	    ethr_have_native_atomics=yes;;
+	      tile)
+	    	    ethr_have_native_atomics=yes;;
+	      *)
+	    	    ;;
+	    esac
 
-	AC_MSG_CHECKING([for a usable libatomic_ops implementation])
-	case "x$with_libatomic_ops" in
-	    xno | xyes | x)
-		libatomic_ops_include=
-		;;
-	    *)
-		if test -d "${with_libatomic_ops}/include"; then
-		    libatomic_ops_include="-I$with_libatomic_ops/include"
-		    CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
-		else
-		    AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
-		fi;;
-	esac
-	ethr_have_libatomic_ops=no
-	AC_TRY_LINK([#include "atomic_ops.h"],
-		    [
-			volatile AO_t x;
-			AO_t y;
-			int z;
-
-			AO_nop_full();
-			AO_store(&x, (AO_t) 0);
-			z = AO_load(&x);
-			z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
-		    ],
-		    [ethr_have_native_atomics=yes
-		     ethr_have_libatomic_ops=yes])
-	AC_MSG_RESULT([$ethr_have_libatomic_ops])
-	if test $ethr_have_libatomic_ops = yes; then
-	    AC_CHECK_SIZEOF(AO_t, ,
-			    [
-				#include <stdio.h>
-				#include "atomic_ops.h"
-			    ])
-	    AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
-
-	    AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
-	    if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-		AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
-	    fi
-	    ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
-	elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-	    AC_MSG_ERROR([No usable libatomic_ops implementation found])
 	fi
 
-	case "$host_cpu" in
-	  sparc | sun4u | sparc64 | sun4v)
-		case "$with_sparc_memory_order" in
-		    "TSO")
-			AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
-		    "PSO")
-			AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
-		    "RMO"|"")
-			AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
-		    *)
-			AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
-		esac
-		ethr_have_native_atomics=yes;; 
-	  i86pc | i*86 | x86_64 | amd64)
-		if test "$enable_x86_out_of_order" = "yes"; then
-			AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
-		fi
-		ethr_have_native_atomics=yes;;
-	  macppc | ppc | "Power Macintosh")
-		ethr_have_native_atomics=yes;;
-	  tile)
-		ethr_have_native_atomics=yes;;
-	  *)
-		;;
-	esac
-
 	test ethr_have_native_atomics = "yes" && ethr_have_native_spinlock=yes
 
 	dnl Restore LIBS
@@ -1451,40 +1494,6 @@ esac
 
 AC_C_DOUBLE_MIDDLE_ENDIAN
 
-AC_ARG_ENABLE(native-ethr-impls,
-	      AS_HELP_STRING([--disable-native-ethr-impls],
-                             [disable native ethread implementations]),
-[ case "$enableval" in
-    no) disable_native_ethr_impls=yes ;;
-    *)  disable_native_ethr_impls=no ;;
-  esac ], disable_native_ethr_impls=no)
-
-AC_ARG_ENABLE(x86-out-of-order,
-	      AS_HELP_STRING([--enable-x86-out-of-order],
-                             [enable x86/x84_64 out of order support (default disabled)]))
-
-test "X$disable_native_ethr_impls" = "Xyes" &&
-  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
-
-AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
-	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
-			     [prefer gcc native ethread implementations]),
-[ case "$enableval" in
-    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
-    *)  enable_prefer_gcc_native_ethr_impls=no ;;
-  esac ], enable_prefer_gcc_native_ethr_impls=no)
-
-test $enable_prefer_gcc_native_ethr_impls = yes &&
-  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
-
-AC_ARG_WITH(libatomic_ops,
-	    AS_HELP_STRING([--with-libatomic_ops=PATH],
-			   [specify and prefer usage of libatomic_ops in the ethread library]))
-
-AC_ARG_WITH(with_sparc_memory_order,
-	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
-			   [specify sparc memory order (defaults to RMO)]))
-
 ETHR_X86_SSE2_ASM=no
 case "$GCC-$ac_cv_sizeof_void_p-$host_cpu" in
   yes-4-i86pc | yes-4-i*86 | yes-4-x86_64 | yes-4-amd64)
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index 5730e20774..b4655ce373 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -98,6 +98,7 @@
 
 /* ----------------------------- INCLUDES ------------------------------*/
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -277,11 +278,15 @@ int main(void)
     msg = receive_erlang_port_msg();
 
     temp = strtok(msg, ";");
+    if (temp == NULL)
+	DO_EXIT(EXIT_STDIN_BODY);
     length = strlen(temp);
     supervisor_port = safe_malloc(length + 1);
     strcpy(supervisor_port, temp);
 
     temp = strtok(NULL, ";");
+    if (temp == NULL)
+	DO_EXIT(EXIT_STDIN_BODY);
     length = strlen(temp);
     odbc_port = safe_malloc(length + 1);
     strcpy(odbc_port, temp);
@@ -1819,12 +1824,20 @@ static byte * receive_erlang_port_msg(void)
 	len |= lengthstr[i];
     }
     
+    if (len <= 0 || len > 1024) {
+	DO_EXIT(EXIT_STDIN_HEADER);
+    }
+
     buffer = (byte *)safe_malloc(len);
     
     if (read_exact(buffer, len) <= 0) {
 	DO_EXIT(EXIT_STDIN_BODY);
     }
 
+    if (buffer[len-1] != '\0') {
+	DO_EXIT(EXIT_STDIN_BODY);
+    }
+
     return buffer;
 }
  
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index 83f7a47434..f86146759c 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -1,7 +1,7 @@
 dnl
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 2005-2013. All Rights Reserved.
+dnl Copyright Ericsson AB 2005-2014. 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
@@ -105,6 +105,12 @@ AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, [LIBS="$LIBS -lnsl"]))
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
+AC_CHECK_HEADERS([windows.h])
+AC_CHECK_HEADERS([sql.h sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no],
+[[#ifdef HAVE_WINDOWS_H
+     # include <windows.h>
+     #endif
+     ]])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -130,7 +136,7 @@ AC_SUBST(THR_LIBS)
 odbc_lib_link_success=no
 AC_SUBST(TARGET_FLAGS)
     case $host_os in
-        darwin*)
+        darwin1[[0-2]].*|darwin[[0-9]].*)
                 TARGET_FLAGS="-DUNIX"
 	        if test ! -d "$with_odbc" || test "$with_odbc" = "yes"; then
 		    ODBC_LIB= -L"/usr/lib"
@@ -203,6 +209,10 @@ AC_SUBST(TARGET_FLAGS)
 	  ;;
 esac
 
+if test $odbc_required_headers = no;  then
+    AC_MSG_WARN(["ODBC library - header check failed"])
+    echo "ODBC library - header check failed" > $ERL_TOP/lib/odbc/SKIP
+fi
 if test $odbc_lib_link_success = no;  then
     AC_MSG_WARN(["ODBC library - link check failed"])
     echo "ODBC library - link check failed" > $ERL_TOP/lib/odbc/SKIP
diff --git a/lib/odbc/doc/src/book.xml b/lib/odbc/doc/src/book.xml
index 05e16b512a..1c76c1cf85 100644
--- a/lib/odbc/doc/src/book.xml
+++ b/lib/odbc/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/databases.xml b/lib/odbc/doc/src/databases.xml
index 34e1d51255..f10282a24d 100644
--- a/lib/odbc/doc/src/databases.xml
+++ b/lib/odbc/doc/src/databases.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2011</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/error_handling.xml b/lib/odbc/doc/src/error_handling.xml
index c30acc5fdc..b255865263 100644
--- a/lib/odbc/doc/src/error_handling.xml
+++ b/lib/odbc/doc/src/error_handling.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2010</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/fascicules.xml b/lib/odbc/doc/src/fascicules.xml
index 91d81d2ac1..91251d4b20 100644
--- a/lib/odbc/doc/src/fascicules.xml
+++ b/lib/odbc/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/odbc/doc/src/getting_started.xml b/lib/odbc/doc/src/getting_started.xml
index d543ef64d6..7397b5f5c5 100644
--- a/lib/odbc/doc/src/getting_started.xml
+++ b/lib/odbc/doc/src/getting_started.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/introduction.xml b/lib/odbc/doc/src/introduction.xml
index 8e9688c407..98e805700e 100644
--- a/lib/odbc/doc/src/introduction.xml
+++ b/lib/odbc/doc/src/introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/notes.xml b/lib/odbc/doc/src/notes.xml
index ebbacb2327..b254ca3bc9 100644
--- a/lib/odbc/doc/src/notes.xml
+++ b/lib/odbc/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,7 +31,76 @@
   <p>This document describes the changes made to the odbc application.
   </p>
 
-  <section><title>ODBC 2.10.16</title>
+  <section><title>ODBC 2.10.19</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Updated configure test for header files sql.h and
+	    sqlext.h to function correctly on windows.</p>
+          <p>
+	    Own Id: OTP-11574</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.10.18</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Configure now also checks for the existence of the sql.h
+	    header file</p>
+          <p>
+	    Own Id: OTP-11483</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.10.17</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The format of the xml source for documentation is
+	    corrected in order to conform to the DTDs and to pass
+	    xmllint without errors.</p>
+          <p>
+	    Own Id: OTP-11193</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Introduced functionality for inspection of system and
+	    build configuration.</p>
+          <p>
+	    Own Id: OTP-11196</p>
+        </item>
+        <item>
+          <p>
+	    Prevent odbcserver crash if it's executed and supplied
+	    incorrect data to stdin. Thanks to Sergei Golovan.</p>
+          <p>
+	    Own Id: OTP-11233</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>ODBC 2.10.16</title>
 
     <section><title>Improvements and New Features</title>
       <list>
@@ -272,7 +341,7 @@
         <item>
           <p>
             ODBC now handles the types SQL_WCHAR and SQL_WVARCHAR.
-            Thanks to Juhani R�nkimies. ODBC also has a new
+            Thanks to Juhani Ränkimies. ODBC also has a new
             connection option to return all strings as binaries and
             also expect strings to be binaries in the param_query
             function. These changes provides some unicode support.</p>
@@ -282,7 +351,7 @@
         <item>
           <p>
             Now supports SQL_TYPE_TIMESTAMP on the format {{YY, MM,
-            DD}, {HH, MM, SS}}. Thanks to Juhani R�nkimies.</p>
+            DD}, {HH, MM, SS}}. Thanks to Juhani Ränkimies.</p>
           <p>
             *** POTENTIAL INCOMPATIBILITY ***</p>
           <p>
diff --git a/lib/odbc/doc/src/notes_history.xml b/lib/odbc/doc/src/notes_history.xml
index 2ce6b18201..277bf9b460 100644
--- a/lib/odbc/doc/src/notes_history.xml
+++ b/lib/odbc/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index a984bf4485..99b9bbbe88 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -213,12 +213,13 @@
 			  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.
+	           </p>
 			 <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>
+		  </list>
       </desc>
     </func>
     <func>
diff --git a/lib/odbc/doc/src/part.xml b/lib/odbc/doc/src/part.xml
index 2ab981c04f..8d6255e083 100644
--- a/lib/odbc/doc/src/part.xml
+++ b/lib/odbc/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/part_notes.xml b/lib/odbc/doc/src/part_notes.xml
index f101cee799..be2603d3a2 100644
--- a/lib/odbc/doc/src/part_notes.xml
+++ b/lib/odbc/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/part_notes_history.xml b/lib/odbc/doc/src/part_notes_history.xml
index fa9b3b7dc7..89721ad0e7 100644
--- a/lib/odbc/doc/src/part_notes_history.xml
+++ b/lib/odbc/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/doc/src/ref_man.xml b/lib/odbc/doc/src/ref_man.xml
index e94febf0f1..b7f71ef496 100644
--- a/lib/odbc/doc/src/ref_man.xml
+++ b/lib/odbc/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src
index c7c83ea079..bf8872eae4 100644
--- a/lib/odbc/src/odbc.appup.src
+++ b/lib/odbc/src/odbc.appup.src
@@ -1,8 +1,24 @@
 %% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
 {"%VSN%",
  [
-  {<<"2\\.*">>,  [{restart_application, odbc}]}
+  {<<"2\\..*">>,  [{restart_application, odbc}]}
  ],
  [
-  {<<"2\\.*">>,  [{restart_application, odbc}]}
+  {<<"2\\..*">>,  [{restart_application, odbc}]}
  ]}.
diff --git a/lib/odbc/test/odbc_connect_SUITE.erl b/lib/odbc/test/odbc_connect_SUITE.erl
index 74ae2c96e6..2a16388929 100644
--- a/lib/odbc/test/odbc_connect_SUITE.erl
+++ b/lib/odbc/test/odbc_connect_SUITE.erl
@@ -77,6 +77,8 @@ end_per_group(_GroupName, Config) ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_suite(Config) when is_list(Config) ->
+    file:write_file(filename:join([proplists:get_value(priv_dir,Config),
+				   "..","..","..","ignore_core_files"]),""),
     case odbc_test_lib:skip() of
 	true ->
 	    {skip, "ODBC not supported"};
diff --git a/lib/odbc/test/odbc_data_type_SUITE.erl b/lib/odbc/test/odbc_data_type_SUITE.erl
index 2d33546622..95c094e081 100644
--- a/lib/odbc/test/odbc_data_type_SUITE.erl
+++ b/lib/odbc/test/odbc_data_type_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
 %%
 %% The 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/odbc/test/odbc_start_SUITE.erl b/lib/odbc/test/odbc_start_SUITE.erl
index e3a3440559..a7bb1d0ffe 100644
--- a/lib/odbc/test/odbc_start_SUITE.erl
+++ b/lib/odbc/test/odbc_start_SUITE.erl
@@ -109,8 +109,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     case odbc_test_lib:odbc_check() of
-	ok -> [start];
-	Other -> {skip, Other}
+	ok -> [app, appup, start];
+	Other -> [app, appup]
     end.
 
 groups() -> 
@@ -127,6 +127,14 @@ end_per_group(_GroupName, Config) ->
 %% Test cases starts here.
 %%--------------------------------------------------------------------
 
+%% Test that the odbc app file is ok
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(odbc).
+
+%% Test that the odbc appup file is ok
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(odbc).
+
 start(doc) -> 
     ["Test start/stop of odbc"];
 start(suite) -> 
diff --git a/lib/odbc/vsn.mk b/lib/odbc/vsn.mk
index 98a9f4ab4a..d9e2ab26a9 100644
--- a/lib/odbc/vsn.mk
+++ b/lib/odbc/vsn.mk
@@ -1 +1 @@
-ODBC_VSN = 2.10.16
+ODBC_VSN = 2.10.19
diff --git a/lib/orber/doc/src/CosNaming.xml b/lib/orber/doc/src/CosNaming.xml
index e8c639b59a..9bdd5bff94 100644
--- a/lib/orber/doc/src/CosNaming.xml
+++ b/lib/orber/doc/src/CosNaming.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/CosNaming_BindingIterator.xml b/lib/orber/doc/src/CosNaming_BindingIterator.xml
index 2ae9871bb9..8be1677a45 100644
--- a/lib/orber/doc/src/CosNaming_BindingIterator.xml
+++ b/lib/orber/doc/src/CosNaming_BindingIterator.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/CosNaming_NamingContext.xml b/lib/orber/doc/src/CosNaming_NamingContext.xml
index 7a3c7bc571..3c620024a9 100644
--- a/lib/orber/doc/src/CosNaming_NamingContext.xml
+++ b/lib/orber/doc/src/CosNaming_NamingContext.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/CosNaming_NamingContextExt.xml b/lib/orber/doc/src/CosNaming_NamingContextExt.xml
index 72e1f497ae..c3cab87e61 100644
--- a/lib/orber/doc/src/CosNaming_NamingContextExt.xml
+++ b/lib/orber/doc/src/CosNaming_NamingContextExt.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2000</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/Module_Interface.xml b/lib/orber/doc/src/Module_Interface.xml
index 7686419fdd..8ae7ab6e46 100644
--- a/lib/orber/doc/src/Module_Interface.xml
+++ b/lib/orber/doc/src/Module_Interface.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/any.xml b/lib/orber/doc/src/any.xml
index 390002669a..0c0a0f5f68 100644
--- a/lib/orber/doc/src/any.xml
+++ b/lib/orber/doc/src/any.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1998</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/book.xml b/lib/orber/doc/src/book.xml
index a8f0fca6f6..7ce153bbfe 100644
--- a/lib/orber/doc/src/book.xml
+++ b/lib/orber/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_contents.xml b/lib/orber/doc/src/ch_contents.xml
index 602955764d..d7f042ffa0 100644
--- a/lib/orber/doc/src/ch_contents.xml
+++ b/lib/orber/doc/src/ch_contents.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_debugging.xml b/lib/orber/doc/src/ch_debugging.xml
index 8c5685bc63..3c9b3d3da5 100644
--- a/lib/orber/doc/src/ch_debugging.xml
+++ b/lib/orber/doc/src/ch_debugging.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_exceptions.xml b/lib/orber/doc/src/ch_exceptions.xml
index a8fb98fe1e..a625eb503d 100644
--- a/lib/orber/doc/src/ch_exceptions.xml
+++ b/lib/orber/doc/src/ch_exceptions.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml b/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
index 1fd2f644cb..ed27ab04af 100644
--- a/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
+++ b/lib/orber/doc/src/ch_idl_to_erlang_mapping.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/orber/doc/src/ch_ifr.xml b/lib/orber/doc/src/ch_ifr.xml
index 690a8167c6..4e3fedba3a 100644
--- a/lib/orber/doc/src/ch_ifr.xml
+++ b/lib/orber/doc/src/ch_ifr.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_install.xml b/lib/orber/doc/src/ch_install.xml
index 89c0e19173..6b526a0b2a 100644
--- a/lib/orber/doc/src/ch_install.xml
+++ b/lib/orber/doc/src/ch_install.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_interceptors.xml b/lib/orber/doc/src/ch_interceptors.xml
index af8c5a45f1..c6d3fa2475 100644
--- a/lib/orber/doc/src/ch_interceptors.xml
+++ b/lib/orber/doc/src/ch_interceptors.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
    <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_introduction.xml b/lib/orber/doc/src/ch_introduction.xml
index 16240e1eb0..8d3d499324 100644
--- a/lib/orber/doc/src/ch_introduction.xml
+++ b/lib/orber/doc/src/ch_introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_naming_service.xml b/lib/orber/doc/src/ch_naming_service.xml
index 5cc50d95ec..b735629a14 100644
--- a/lib/orber/doc/src/ch_naming_service.xml
+++ b/lib/orber/doc/src/ch_naming_service.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_orber_kernel.xml b/lib/orber/doc/src/ch_orber_kernel.xml
index 6669641432..1a9026f9b7 100644
--- a/lib/orber/doc/src/ch_orber_kernel.xml
+++ b/lib/orber/doc/src/ch_orber_kernel.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_orberweb.xml b/lib/orber/doc/src/ch_orberweb.xml
index 30513bac09..2a17207616 100644
--- a/lib/orber/doc/src/ch_orberweb.xml
+++ b/lib/orber/doc/src/ch_orberweb.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_security.xml b/lib/orber/doc/src/ch_security.xml
index a25a8a5052..9b56319a47 100644
--- a/lib/orber/doc/src/ch_security.xml
+++ b/lib/orber/doc/src/ch_security.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ch_stubs.xml b/lib/orber/doc/src/ch_stubs.xml
index 785805a4d6..e0e0003af0 100644
--- a/lib/orber/doc/src/ch_stubs.xml
+++ b/lib/orber/doc/src/ch_stubs.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/corba.xml b/lib/orber/doc/src/corba.xml
index 08ec555f94..004c7fb9b0 100644
--- a/lib/orber/doc/src/corba.xml
+++ b/lib/orber/doc/src/corba.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/corba_object.xml b/lib/orber/doc/src/corba_object.xml
index ef440f1a2d..84bf775f78 100644
--- a/lib/orber/doc/src/corba_object.xml
+++ b/lib/orber/doc/src/corba_object.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/example_part.xml b/lib/orber/doc/src/example_part.xml
index 9adb8fa7cf..d8970be912 100644
--- a/lib/orber/doc/src/example_part.xml
+++ b/lib/orber/doc/src/example_part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/fascicules.xml b/lib/orber/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/orber/doc/src/fascicules.xml
+++ b/lib/orber/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/orber/doc/src/fixed.xml b/lib/orber/doc/src/fixed.xml
index 8f23a32c8f..fc34c89e7e 100644
--- a/lib/orber/doc/src/fixed.xml
+++ b/lib/orber/doc/src/fixed.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/interceptors.xml b/lib/orber/doc/src/interceptors.xml
index 8d1f97d5a2..739da8ab2f 100644
--- a/lib/orber/doc/src/interceptors.xml
+++ b/lib/orber/doc/src/interceptors.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/intro_part.xml b/lib/orber/doc/src/intro_part.xml
index bd783331f2..a44f0fa786 100644
--- a/lib/orber/doc/src/intro_part.xml
+++ b/lib/orber/doc/src/intro_part.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/lname.xml b/lib/orber/doc/src/lname.xml
index 7776e1298c..284a50b900 100644
--- a/lib/orber/doc/src/lname.xml
+++ b/lib/orber/doc/src/lname.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/lname_component.xml b/lib/orber/doc/src/lname_component.xml
index aa27ce28a3..9c0134609e 100644
--- a/lib/orber/doc/src/lname_component.xml
+++ b/lib/orber/doc/src/lname_component.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index 04507d8078..c4d13a5a2f 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/orber/doc/src/orber.xml b/lib/orber/doc/src/orber.xml
index 35e9f57008..16781059c7 100644
--- a/lib/orber/doc/src/orber.xml
+++ b/lib/orber/doc/src/orber.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/orber_acl.xml b/lib/orber/doc/src/orber_acl.xml
index c844b99702..f78e27fc4e 100644
--- a/lib/orber/doc/src/orber_acl.xml
+++ b/lib/orber/doc/src/orber_acl.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2005</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/orber_diagnostics.xml b/lib/orber/doc/src/orber_diagnostics.xml
index ee688dbec4..c9453cfce6 100644
--- a/lib/orber/doc/src/orber_diagnostics.xml
+++ b/lib/orber/doc/src/orber_diagnostics.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/orber_ifr.xml b/lib/orber/doc/src/orber_ifr.xml
index 2d47d57476..c2dc4ff552 100644
--- a/lib/orber/doc/src/orber_ifr.xml
+++ b/lib/orber/doc/src/orber_ifr.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/orber_tc.xml b/lib/orber/doc/src/orber_tc.xml
index a6141dd5bb..50239d7b5e 100644
--- a/lib/orber/doc/src/orber_tc.xml
+++ b/lib/orber/doc/src/orber_tc.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1998</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/part.xml b/lib/orber/doc/src/part.xml
index a131db0bad..a8c13588b5 100644
--- a/lib/orber/doc/src/part.xml
+++ b/lib/orber/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/part_notes.xml b/lib/orber/doc/src/part_notes.xml
index 10b3a64373..f16a2bc343 100644
--- a/lib/orber/doc/src/part_notes.xml
+++ b/lib/orber/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/ref_man.xml b/lib/orber/doc/src/ref_man.xml
index 638463fc84..361b197ef4 100644
--- a/lib/orber/doc/src/ref_man.xml
+++ b/lib/orber/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/doc/src/tools_debugging_part.xml b/lib/orber/doc/src/tools_debugging_part.xml
index 9aae7bc06f..683baab601 100644
--- a/lib/orber/doc/src/tools_debugging_part.xml
+++ b/lib/orber/doc/src/tools_debugging_part.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
index 1c6781e5fd..d96350f4d5 100644
--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
@@ -21,9 +21,6 @@ include $(ERL_TOP)/make/target.mk
 
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
-# To get hold of SYSTEM_VSN (e.g. R9C).
-#include $(ERL_TOP)/erts/vsn.mk
-
 # ----------------------------------------------------
 # Application version
 # ----------------------------------------------------
diff --git a/lib/orber/src/orber_interceptors.erl b/lib/orber/src/orber_interceptors.erl
index 407823ea79..62870b35b5 100644
--- a/lib/orber/src/orber_interceptors.erl
+++ b/lib/orber/src/orber_interceptors.erl
@@ -112,7 +112,7 @@ pop_system_message_interceptor(out) ->
 	[{_, []}] ->
 	    ok;
 	[{_, Interceptors}] ->
-	    ets:insert(orber_interceptors, {message_out_interceptors,  remove_last_element(Interceptors)});
+	    ets:insert(orber_interceptors, {message_out_interceptors,  lists:droplast(Interceptors)});
 	_ ->
 	    corba:raise(#'INTERNAL'{completion_status=?COMPLETED_NO})
     end.    
@@ -151,12 +151,3 @@ apply_message_interceptors([], F, ObjRef, Bytes) ->
 apply_message_interceptors([M | Rest], F, ObjRef, Bytes) ->
     apply_message_interceptors(Rest, F, ObjRef, apply(M, F, [ObjRef, Bytes])).
 
-
-remove_last_element([]) ->
-    [];
-remove_last_element([M]) ->
-    [];
-remove_last_element([M |Tail]) ->
-    remove_last_element([Tail]).
-
-    
diff --git a/lib/orber/test/multi_ORB_SUITE.erl b/lib/orber/test/multi_ORB_SUITE.erl
index 3c1ffd59d3..41a309ff16 100644
--- a/lib/orber/test/multi_ORB_SUITE.erl
+++ b/lib/orber/test/multi_ORB_SUITE.erl
@@ -75,8 +75,6 @@
 	 close_connections_local_interface_ctx_override_api/1,
 	 ssl_1_multi_orber_generation_3_api/1, ssl_2_multi_orber_generation_3_api/1,
 	 ssl_reconfigure_generation_3_api/1,
-	 ssl_1_multi_orber_generation_3_api_old/1, ssl_2_multi_orber_generation_3_api_old/1,
-	 ssl_reconfigure_generation_3_api_old/1,
 	 close_connections_alt_iiop_addr_api/1, close_connections_multiple_profiles_api/1]).
 
 
@@ -137,13 +135,10 @@ cases() ->
      setup_multi_connection_timeout_attempts_api,
      setup_multi_connection_timeout_random_api,
      ssl_1_multi_orber_api,
-     ssl_1_multi_orber_generation_3_api_old,
      ssl_1_multi_orber_generation_3_api,
      ssl_2_multi_orber_api,
-     ssl_2_multi_orber_generation_3_api_old,
      ssl_2_multi_orber_generation_3_api,
      ssl_reconfigure_api,
-     ssl_reconfigure_generation_3_api_old,
      ssl_reconfigure_generation_3_api].
 
 %%-----------------------------------------------------------------
@@ -155,10 +150,7 @@ init_per_testcase(TC,Config)
        TC =:= ssl_reconfigure_api ->
     init_ssl(Config);
 init_per_testcase(TC,Config)
-  when TC =:= ssl_1_multi_orber_generation_3_api_old;
-       TC =:= ssl_2_multi_orber_generation_3_api_old;
-       TC =:= ssl_reconfigure_generation_3_api_old;
-       TC =:= ssl_1_multi_orber_generation_3_api;
+  when TC =:= ssl_1_multi_orber_generation_3_api;
        TC =:= ssl_2_multi_orber_generation_3_api;
        TC =:= ssl_reconfigure_generation_3_api ->
     init_ssl_3(Config);
@@ -1632,22 +1624,6 @@ ssl_1_multi_orber_api(_Config) ->
     ssl_suite(ServerOptions, ClientOptions).
 
 
-ssl_1_multi_orber_generation_3_api_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
-			       "This case set up two secure orbs and test if they can",
-			     "communicate. The case also test to access one of the",
-			     "secure orbs which must raise a NO_PERMISSION exception."];
-ssl_1_multi_orber_generation_3_api_old(suite) -> [];
-ssl_1_multi_orber_generation_3_api_old(_Config) ->
-
-    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
-					       1, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
-					       1, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ssl_suite(ServerOptions, ClientOptions).
-
-
 ssl_1_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 			       "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
@@ -1681,22 +1657,6 @@ ssl_2_multi_orber_api(_Config) ->
     ssl_suite(ServerOptions, ClientOptions).
 
 
-ssl_2_multi_orber_generation_3_api_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
-			     "This case set up two secure orbs and test if they can",
-			     "communicate. The case also test to access one of the",
-			     "secure orbs which must raise a NO_PERMISSION exception."];
-ssl_2_multi_orber_generation_3_api_old(suite) -> [];
-ssl_2_multi_orber_generation_3_api_old(_Config) ->
-
-    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
-					       2, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
-					       2, [{ssl_generation, 3},
-						   {iiop_ssl_port, 0}]),
-    ssl_suite(ServerOptions, ClientOptions).
-
-
 ssl_2_multi_orber_generation_3_api(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
 			     "This case set up two secure orbs and test if they can",
 			     "communicate. The case also test to access one of the",
@@ -1724,11 +1684,6 @@ ssl_reconfigure_api(_Config) ->
     ssl_reconfigure_old([]).
 
 
-ssl_reconfigure_generation_3_api_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 2)",
-			     "This case set up two secure orbs and test if they can",
-			     "communicate. The case also test to access one of the",
-			     "secure orbs which must raise a NO_PERMISSION exception."];
-ssl_reconfigure_generation_3_api_old(suite) -> [];
 ssl_reconfigure_generation_3_api_old(_Config) ->
     ssl_reconfigure_old([{ssl_generation, 3}]).
 
diff --git a/lib/orber/test/orber_nat_SUITE.erl b/lib/orber/test/orber_nat_SUITE.erl
index ee31b162c2..a21bd4d499 100644
--- a/lib/orber/test/orber_nat_SUITE.erl
+++ b/lib/orber/test/orber_nat_SUITE.erl
@@ -57,7 +57,6 @@
 	 nat_ip_address_local/1, nat_ip_address_local_local/1,
 	 nat_iiop_port/1, nat_iiop_port_local/1,
 	 nat_iiop_port_local_local/1,
-	 nat_iiop_ssl_port_old/1, nat_iiop_ssl_port_local_old/1,
 	 nat_iiop_ssl_port/1, nat_iiop_ssl_port_local/1]).
 
 
@@ -93,8 +92,6 @@ cases() ->
      nat_iiop_port_local,
      nat_ip_address_local_local,
      nat_iiop_port_local_local,
-     nat_iiop_ssl_port_old,
-     nat_iiop_ssl_port_local_old,
      nat_iiop_ssl_port,
      nat_iiop_ssl_port_local].
 
@@ -103,9 +100,7 @@ cases() ->
 %%-----------------------------------------------------------------
 init_per_testcase(TC, Config)
  when TC =:= nat_iiop_ssl_port;
-      TC =:= nat_iiop_ssl_port_local;
-      TC =:= nat_iiop_ssl_port_old;
-      TC =:= nat_iiop_ssl_port_local_old ->
+      TC =:= nat_iiop_ssl_port_local ->
       case  ?config(crypto_started, Config) of
 	  true ->
 	      case orber_test_lib:ssl_version() of
@@ -291,106 +286,6 @@ nat_iiop_port_local_local(_Config) ->
 %%  API tests for ORB to ORB, ssl security depth 1
 %%-----------------------------------------------------------------
 
-nat_iiop_ssl_port_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
-			   "Make sure NAT works for SSL"];
-nat_iiop_ssl_port_old(suite) -> [];
-nat_iiop_ssl_port_old(_Config) ->
-
-    IP = orber_test_lib:get_host(),
-    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
-					       1, [{iiop_ssl_port, 0},
-						   {flags, ?ORB_ENV_ENABLE_NAT},
-						   {ip_address, IP}]),
-    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
-					       1, [{iiop_ssl_port, 0}]),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-    NATSSLServerPort = SSLServerPort+1,
-    {ok, Ref} = ?match({ok, _},
-		       orber_test_lib:remote_apply(ServerNode, orber,
-						   add_listen_interface,
-						   [IP, ssl, NATSSLServerPort])),
-    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
-				[nat_iiop_ssl_port,
-				 {local, NATSSLServerPort, [{4001, 43}]}]),
-
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-
-    IOR1 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba,
-					      string_to_object,
-					      ["corbaname::1.2@"++IP++":"++
-						   integer_to_list(ServerPort)++"/NameService#mamba"])),
-
-    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
-			 #host_data{protocol = ssl,
-				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
-	   iop_ior:get_key(IOR1)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   uninstall_test_data,
-					   [ssl])),
-    ?match(ok,
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       remove_listen_interface, [Ref])),
-    ok.
-
-nat_iiop_ssl_port_local_old(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
-				 "Make sure NAT works for SSL"];
-nat_iiop_ssl_port_local_old(suite) -> [];
-nat_iiop_ssl_port_local_old(_Config) ->
-
-    IP = orber_test_lib:get_host(),
-    ServerOptions = orber_test_lib:get_options_old(iiop_ssl, server,
-					       1, [{iiop_ssl_port, 0},
-						   {flags,
-						    (?ORB_ENV_LOCAL_INTERFACE bor
-							 ?ORB_ENV_ENABLE_NAT)},
-						   {ip_address, IP}]),
-    ClientOptions = orber_test_lib:get_options_old(iiop_ssl, client,
-					       1, [{iiop_ssl_port, 0}]),
-    {ok, ServerNode, _ServerHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ServerOptions)),
-    ServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_port, []),
-    SSLServerPort = orber_test_lib:remote_apply(ServerNode, orber, iiop_ssl_port, []),
-    NATSSLServerPort = SSLServerPort+1,
-    {ok, Ref} = ?match({ok, _},
-		       orber_test_lib:remote_apply(ServerNode, orber,
-						   add_listen_interface,
-						   [IP, ssl, NATSSLServerPort])),
-    orber_test_lib:remote_apply(ServerNode, orber_env, configure_override,
-				[nat_iiop_ssl_port,
-				 {local, NATSSLServerPort, [{NATSSLServerPort, NATSSLServerPort}]}]),
-
-    {ok, ClientNode, _ClientHost} =
-	?match({ok,_,_}, orber_test_lib:js_node(ClientOptions)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   install_test_data,
-					   [ssl])),
-
-    IOR1 = ?match(#'IOP_IOR'{},
-		  orber_test_lib:remote_apply(ClientNode, corba,
-					      string_to_object,
-					      ["corbaname::1.2@"++IP++":"++
-						   integer_to_list(ServerPort)++"/NameService#mamba"])),
-
-    ?match({'external', {_IP, _Port, _ObjectKey, _Counter, _TP,
-			 #host_data{protocol = ssl,
-				    ssl_data = #'SSLIOP_SSL'{port = NATSSLServerPort}}}},
-	   iop_ior:get_key(IOR1)),
-    ?match(ok, orber_test_lib:remote_apply(ServerNode, orber_test_lib,
-					   uninstall_test_data,
-					   [ssl])),
-    ?match(ok,
-	   orber_test_lib:remote_apply(ServerNode, orber,
-				       remove_listen_interface, [Ref])),
-    ok.
-
 
 nat_iiop_ssl_port(doc) -> ["SECURE MULTI ORB API tests (SSL depth 1)",
 			   "Make sure NAT works for SSL"];
diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
index 51569f6ec9..f84ccf7c87 100644
--- a/lib/os_mon/c_src/Makefile.in
+++ b/lib/os_mon/c_src/Makefile.in
@@ -84,6 +84,7 @@ debug opt: $(TARGET_FILES)
 
 clean:
 	rm -f $(TARGET_FILES)
+	rm -rf $(OBJDIR)
 	rm -f core *~
 
 docs:
diff --git a/lib/os_mon/c_src/cpu_sup.c b/lib/os_mon/c_src/cpu_sup.c
index 7372d5b0e8..e9fd75a32c 100644
--- a/lib/os_mon/c_src/cpu_sup.c
+++ b/lib/os_mon/c_src/cpu_sup.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
 
 #if defined(__sun__)
 #include <kstat.h>
@@ -120,7 +121,9 @@ typedef struct {
 
 static void util_measure(unsigned int **result_vec, int *result_sz);
 
+#if defined(__sun__)
 static unsigned int misc_measure(char* name);
+#endif
 static void send(unsigned int data);
 static void sendv(unsigned int data[], int ints);
 static void error(char* err_msg);
@@ -140,7 +143,9 @@ int main(int argc, char** argv) {
   int rc;
   int sz;
   unsigned int *rv;
+#if defined(__linux__)
   unsigned int no_of_cpus = 0;
+#endif
 
 #if defined(__sun__)
   kstat_ctl = kstat_open();
@@ -288,10 +293,10 @@ static unsigned int misc_measure(char* name) {
   if(!entry)
     return -1;
   
-  if(entry->data_type != KSTAT_DATA_ULONG)
+  if(entry->data_type != KSTAT_DATA_UINT32)
     return -1;
 
-  return entry->value.ul;
+  return entry->value.ui32;
 }
 
 
diff --git a/lib/os_mon/c_src/ferrule.c b/lib/os_mon/c_src/ferrule.c
index 744f302b2d..c55f594f34 100644
--- a/lib/os_mon/c_src/ferrule.c
+++ b/lib/os_mon/c_src/ferrule.c
@@ -50,7 +50,7 @@
 #define		FDS_STDIN	0
 #define		FDS_PIPE	1
 
-main(int argc, char *argv[])
+int	main(int argc, char *argv[])
 /*	usage: ferrule ownpath */
 {
     int		i, pipe_fd;
diff --git a/lib/os_mon/c_src/mod_syslog.c b/lib/os_mon/c_src/mod_syslog.c
index 87fbfbac22..b1bbf80b2a 100644
--- a/lib/os_mon/c_src/mod_syslog.c
+++ b/lib/os_mon/c_src/mod_syslog.c
@@ -47,7 +47,7 @@
 #define		TRUE		1
 #define		WAIT		1
 
-main(int argc, char *argv[])
+int	main(int argc, char *argv[])
 /*	usage: mod_syslog mode ownpath syslogconf */
 {
     int	syslogd_pid, n_lines_copied=0;
@@ -128,6 +128,7 @@ main(int argc, char *argv[])
        make_exit(PIPE_NOT_FOUND);
        else */
     make_exit(OK);
+    return 0;
 }
 
 void	make_exit(int exit_code)
diff --git a/lib/os_mon/doc/src/book.xml b/lib/os_mon/doc/src/book.xml
index 17645b81fd..1b927fc9ac 100644
--- a/lib/os_mon/doc/src/book.xml
+++ b/lib/os_mon/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/cpu_sup.xml b/lib/os_mon/doc/src/cpu_sup.xml
index 7b28083fbc..59da876208 100644
--- a/lib/os_mon/doc/src/cpu_sup.xml
+++ b/lib/os_mon/doc/src/cpu_sup.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/disksup.xml b/lib/os_mon/doc/src/disksup.xml
index bfa3d3578f..dbcfd65095 100644
--- a/lib/os_mon/doc/src/disksup.xml
+++ b/lib/os_mon/doc/src/disksup.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/fascicules.xml b/lib/os_mon/doc/src/fascicules.xml
index 43090b4aed..fadd37eefb 100644
--- a/lib/os_mon/doc/src/fascicules.xml
+++ b/lib/os_mon/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/os_mon/doc/src/memsup.xml b/lib/os_mon/doc/src/memsup.xml
index 67d617375e..62f77ea12f 100644
--- a/lib/os_mon/doc/src/memsup.xml
+++ b/lib/os_mon/doc/src/memsup.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 2206f93d34..3a7d7793d4 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,59 @@
   </header>
   <p>This document describes the changes made to the OS_Mon application.</p>
 
+<section><title>Os_Mon 2.2.14</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix incorrect reporting of memory on OS X via memsup.
+	    Thanks to Christopher Meiklejohn.</p>
+          <p>
+	    Own Id: OTP-11454</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Os_Mon 2.2.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Use 'df -k -l' to query FreeBSD and OpenBSD about
+	    diskspace on local disks. Previously 'df' -k -t ufs' was
+	    used but this will not handle zfs or other disks. Just
+	    use '-l' instead of listing potential filesystems.</p>
+          <p>
+	    Own Id: OTP-11207</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix compilation on Solaris. Thanks to Maciej Malecki.</p>
+          <p>
+	    Own Id: OTP-11213</p>
+        </item>
+        <item>
+          <p>
+	    Fix broken cpu_sup:nprocs and others on Solaris 64-bit.
+	    Thanks to Simon Cornish.</p>
+          <p>
+	    Own Id: OTP-11298</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.2.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/os_mon/doc/src/nteventlog.xml b/lib/os_mon/doc/src/nteventlog.xml
index 1e3fad90cd..8b27092f85 100644
--- a/lib/os_mon/doc/src/nteventlog.xml
+++ b/lib/os_mon/doc/src/nteventlog.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/os_mon_app.xml b/lib/os_mon/doc/src/os_mon_app.xml
index 8b44b70c5f..f6bb2300bb 100644
--- a/lib/os_mon/doc/src/os_mon_app.xml
+++ b/lib/os_mon/doc/src/os_mon_app.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/os_mon_mib.xml b/lib/os_mon/doc/src/os_mon_mib.xml
index 220d6a4a22..fa183086ff 100644
--- a/lib/os_mon/doc/src/os_mon_mib.xml
+++ b/lib/os_mon/doc/src/os_mon_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/os_sup.xml b/lib/os_mon/doc/src/os_sup.xml
index 792d18ba14..fb162c15a7 100644
--- a/lib/os_mon/doc/src/os_sup.xml
+++ b/lib/os_mon/doc/src/os_sup.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/part_notes.xml b/lib/os_mon/doc/src/part_notes.xml
index 8fe226f53e..0969fb9136 100644
--- a/lib/os_mon/doc/src/part_notes.xml
+++ b/lib/os_mon/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/doc/src/ref_man.xml b/lib/os_mon/doc/src/ref_man.xml
index 5a50c122fd..10c0fef52c 100644
--- a/lib/os_mon/doc/src/ref_man.xml
+++ b/lib/os_mon/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/os_mon/src/disksup.erl b/lib/os_mon/src/disksup.erl
index 8c8bbe843a..278da26a20 100644
--- a/lib/os_mon/src/disksup.erl
+++ b/lib/os_mon/src/disksup.erl
@@ -263,10 +263,10 @@ check_disk_space({unix, dragonfly}, Port, Threshold) ->
     Result = my_cmd("/bin/df -k -t ufs,hammer", Port),
     check_disks_solaris(skip_to_eol(Result), Threshold);
 check_disk_space({unix, freebsd}, Port, Threshold) ->
-    Result = my_cmd("/bin/df -k -t ufs", Port),
+    Result = my_cmd("/bin/df -k -l", Port),
     check_disks_solaris(skip_to_eol(Result), Threshold);
 check_disk_space({unix, openbsd}, Port, Threshold) ->
-    Result = my_cmd("/bin/df -k -t ffs", Port),
+    Result = my_cmd("/bin/df -k -l", Port),
     check_disks_solaris(skip_to_eol(Result), Threshold);
 check_disk_space({unix, netbsd}, Port, Threshold) ->
     Result = my_cmd("/bin/df -k -t ffs", Port),
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl
index a1b8591c8c..b178732fae 100644
--- a/lib/os_mon/src/memsup.erl
+++ b/lib/os_mon/src/memsup.erl
@@ -721,20 +721,19 @@ reply(Pending, MemUsage, SysMemUsage) ->
 %% get_memory_usage(OS) -> {Alloc, Total}
 
 %% Darwin:
-%% Uses vm_stat command. This appears to lie about the page size in
-%% Mac OS X 10.2.2 - the pages given are based on 4000 bytes, but
-%% the vm_stat command tells us that it is 4096...
+%% Uses vm_stat command.
 get_memory_usage({unix,darwin}) ->
     Str1 = os:cmd("/usr/bin/vm_stat"),
-    
-    {[Free],     Str2} = fread_value("Pages free:~d.", Str1),
-    {[Active],   Str3} = fread_value("Pages active:~d.", Str2),
-    {[Inactive], Str4} = fread_value("Pages inactive:~d.", Str3),
-    {[_],        Str5} = fread_value("Pages speculative:~d.", Str4),
+    PageSize = 4096,
+
+    {[Free],        Str2} = fread_value("Pages free:~d.", Str1),
+    {[Active],      Str3} = fread_value("Pages active:~d.", Str2),
+    {[Inactive],    Str4} = fread_value("Pages inactive:~d.", Str3),
+    {[Speculative], Str5} = fread_value("Pages speculative:~d.", Str4),
     {[Wired],       _} = fread_value("Pages wired down:~d.", Str5),
 
-    NMemUsed  = (Wired + Active + Inactive) * 4000,
-    NMemTotal = NMemUsed + Free * 4000,
+    NMemUsed  = (Wired + Active + Inactive) * PageSize,
+    NMemTotal = NMemUsed + (Free + Speculative) * PageSize,
     {NMemUsed,NMemTotal};
 
 %% FreeBSD: Look in /usr/include/sys/vmmeter.h for the format of struct
diff --git a/lib/os_mon/src/nteventlog.erl b/lib/os_mon/src/nteventlog.erl
index d624048c29..97eaf07179 100644
--- a/lib/os_mon/src/nteventlog.erl
+++ b/lib/os_mon/src/nteventlog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The 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 @@ code_change(_OldVsn, State, _Extra) ->
 
 start_portprogram(Identifier) ->
     Command =
-	filename:join([code:priv_dir(os_mon),"bin","nteventlog.exe"]) ++
-	" " ++ make_list(Identifier),
+	"\"" ++ filename:join([code:priv_dir(os_mon),"bin","nteventlog.exe"]) ++
+	"\" " ++ make_list(Identifier),
     open_port({spawn,Command},[{packet,2}]).
 
 make_list(X) when is_atom(X) ->
diff --git a/lib/os_mon/src/os_mon.appup.src b/lib/os_mon/src/os_mon.appup.src
index f8e09a7d87..480f5d9511 100644
--- a/lib/os_mon/src/os_mon.appup.src
+++ b/lib/os_mon/src/os_mon.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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,26 +16,7 @@
 %% 
 %% %CopyrightEnd%
 %%
-
 {"%VSN%",
- [
-  {"2.1",
-   [{load_module, cpu_sup},
-    {load_module, disksup},
-    {load_module, memsup},
-    {load_module, os_mon},
-    {load_module, os_mon_mib}]},
-  {"2.1.1",
-   [{load_module, os_mon_mib}]}
- ],
- [
-  {"2.1",
-   [{load_module, cpu_sup},
-    {load_module, disksup},
-    {load_module, memsup},
-    {load_module, os_mon},
-    {load_module, os_mon_mib}]},
-  {"2.1.1",
-   [{load_module, os_mon_mib}]}
-  ]
+ [{<<".*">>,[{restart_application, os_mon}]}],
+ [{<<".*">>,[{restart_application, os_mon}]}]
 }.
diff --git a/lib/os_mon/src/os_sup.erl b/lib/os_mon/src/os_sup.erl
index f5c6c138ba..3ad8b6e990 100644
--- a/lib/os_mon/src/os_sup.erl
+++ b/lib/os_mon/src/os_sup.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -228,8 +228,8 @@ code_change(_OldVsn, State, _Extra) ->
 start_portprogram() ->
     OwnPath = os_mon:get_env(os_sup, os_sup_own),
     Command =
-	filename:join([code:priv_dir(os_mon), "bin", "ferrule"]) ++
-	" " ++ OwnPath,
+	"\"" ++ filename:join([code:priv_dir(os_mon), "bin", "ferrule"]) ++
+	"\" " ++ OwnPath,
     open_port({spawn, Command}, [{packet, 2}]).
 
 %% os:cmd(cmd_str(enable)) should be done BEFORE starting os_sup
diff --git a/lib/os_mon/test/Makefile b/lib/os_mon/test/Makefile
index 461bebc102..cbb014324d 100644
--- a/lib/os_mon/test/Makefile
+++ b/lib/os_mon/test/Makefile
@@ -85,7 +85,8 @@ release_spec:
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) "$(RELSYSDIR)"
-	$(INSTALL_DATA) os_mon.spec os_mon.cover $(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) os_mon.spec os_mon.cover os_mon_smoke.spec \
+		$(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)"
 	$(INSTALL_DATA) os_mon_mib_SUITE.cfg "$(RELSYSDIR)"
 
 ##	tar chf - *_SUITE_data | (cd "$(RELSYSDIR)"; tar xf -)
diff --git a/lib/os_mon/test/cpu_sup_SUITE.erl b/lib/os_mon/test/cpu_sup_SUITE.erl
index d04adbb6d3..e0382cb0c7 100644
--- a/lib/os_mon/test/cpu_sup_SUITE.erl
+++ b/lib/os_mon/test/cpu_sup_SUITE.erl
@@ -88,6 +88,7 @@ load_api(Config) when is_list(Config) ->
     ?line N = cpu_sup:nprocs(),
     ?line true = is_integer(N),
     ?line true = N>0,
+    ?line true = N<1000000,
 
     %% avg1()
     ?line Load1 = cpu_sup:avg1(),
diff --git a/lib/os_mon/test/disksup_SUITE.erl b/lib/os_mon/test/disksup_SUITE.erl
index c1ff2c6afc..9c65d8b692 100644
--- a/lib/os_mon/test/disksup_SUITE.erl
+++ b/lib/os_mon/test/disksup_SUITE.erl
@@ -34,11 +34,11 @@
 -define(default_timeout, ?t:minutes(1)).
 
 init_per_suite(Config) when is_list(Config) ->
-    ?line ok = application:start(os_mon),
+    ok = application:start(os_mon),
     Config.
 
 end_per_suite(Config) when is_list(Config) ->
-    ?line ok = application:stop(os_mon),
+    ok = application:stop(os_mon),
     Config.
 
 init_per_testcase(unavailable, Config) ->
@@ -78,80 +78,71 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 
-api(suite) ->
-    [];
-api(doc) ->
-    ["Test of API functions"];
+api(suite) -> [];
+api(doc) -> ["Test of API functions"];
 api(Config) when is_list(Config) ->
 
     %% get_disk_data()
-    ?line [{Id, KByte, Capacity}|_] = disksup:get_disk_data(),
-    ?line true = io_lib:printable_list(Id),
-    ?line true = is_integer(KByte),
-    ?line true = is_integer(Capacity),
-    ?line true = KByte>0,
-    ?line true = Capacity>0,
+    [{Id,KByte,Capacity}|_] = get_disk_data(),
+    true = io_lib:printable_list(Id),
+    true = is_integer(KByte),
+    true = is_integer(Capacity),
+    true = Capacity>0,
+    true = KByte>0,
 
     %% get_check_interval()
-    ?line 1800000 = disksup:get_check_interval(),
+    1800000 = disksup:get_check_interval(),
 
     %% set_check_interval(Minutes)
-    ?line ok = disksup:set_check_interval(20),
-    ?line 1200000 = disksup:get_check_interval(),
-    ?line {'EXIT',{badarg,_}} = (catch disksup:set_check_interval(0.5)),
-    ?line 1200000 = disksup:get_check_interval(),
-    ?line ok = disksup:set_check_interval(30),
+    ok = disksup:set_check_interval(20),
+    1200000 = disksup:get_check_interval(),
+    {'EXIT',{badarg,_}} = (catch disksup:set_check_interval(0.5)),
+    1200000 = disksup:get_check_interval(),
+    ok = disksup:set_check_interval(30),
 
     %% get_almost_full_threshold()
-    ?line 80 = disksup:get_almost_full_threshold(),
+    80 = disksup:get_almost_full_threshold(),
 
     %% set_almost_full_threshold(Float)
-    ?line ok = disksup:set_almost_full_threshold(0.90),
-    ?line 90 = disksup:get_almost_full_threshold(),
-    ?line {'EXIT',{badarg,_}} =
+    ok = disksup:set_almost_full_threshold(0.90),
+    90 = disksup:get_almost_full_threshold(),
+    {'EXIT',{badarg,_}} =
 	(catch disksup:set_almost_full_threshold(-0.5)),
-    ?line 90 = disksup:get_almost_full_threshold(),
-    ?line ok = disksup:set_almost_full_threshold(0.80),
+    90 = disksup:get_almost_full_threshold(),
+    ok = disksup:set_almost_full_threshold(0.80),
 
     ok.
 
-config(suite) ->
-    [];
-config(doc) ->
-    ["Test configuration"];
+config(suite) -> [];
+config(doc) -> ["Test configuration"];
 config(Config) when is_list(Config) ->
 
     %% Change configuration parameters and make sure change is reflected
     %% when disksup is restarted
-    ?line ok =
-	application:set_env(os_mon, disk_space_check_interval, 29),
-    ?line ok =
-	application:set_env(os_mon, disk_almost_full_threshold, 0.81),
+    ok = application:set_env(os_mon, disk_space_check_interval, 29),
+    ok = application:set_env(os_mon, disk_almost_full_threshold, 0.81),
 
-    ?line ok = supervisor:terminate_child(os_mon_sup, disksup),
-    ?line {ok, _Child1} = supervisor:restart_child(os_mon_sup, disksup),
+    ok = supervisor:terminate_child(os_mon_sup, disksup),
+    {ok, _Child1} = supervisor:restart_child(os_mon_sup, disksup),
 
-    ?line 1740000 = disksup:get_check_interval(),
-    ?line 81 = disksup:get_almost_full_threshold(),
+    1740000 = disksup:get_check_interval(),
+    81 = disksup:get_almost_full_threshold(),
 
     %% Also try this with bad parameter values, should be ignored
-    ?line ok =
+    ok =
 	application:set_env(os_mon, disk_space_check_interval, 0.5),
-    ?line ok =
+    ok =
 	application:set_env(os_mon, disk_almost_full_threshold, -0.81),
 
-    ?line ok = supervisor:terminate_child(os_mon_sup, disksup),
-    ?line {ok, _Child2} = supervisor:restart_child(os_mon_sup, disksup),
+    ok = supervisor:terminate_child(os_mon_sup, disksup),
+    {ok, _Child2} = supervisor:restart_child(os_mon_sup, disksup),
 
-    ?line 1800000 = disksup:get_check_interval(),
-    ?line 80 = disksup:get_almost_full_threshold(),
+    1800000 = disksup:get_check_interval(),
+    80 = disksup:get_almost_full_threshold(),
 
     %% Reset configuration parameters
-    ?line ok =
-	application:set_env(os_mon, disk_space_check_interval, 30),
-    ?line ok =
-	application:set_env(os_mon, disk_almost_full_threshold, 0.80),
-
+    ok = application:set_env(os_mon, disk_space_check_interval, 30),
+    ok = application:set_env(os_mon, disk_almost_full_threshold, 0.80),
     ok.
 
 %%----------------------------------------------------------------------
@@ -159,24 +150,22 @@ config(Config) when is_list(Config) ->
 %% changes too much during its course, or if there are timing problems
 %% with the alarm_handler receiving the alarms too late
 %%----------------------------------------------------------------------
-alarm(suite) ->
-    [];
-alarm(doc) ->
-    ["Test that alarms are set and cleared"];
+alarm(suite) -> [];
+alarm(doc) -> ["Test that alarms are set and cleared"];
 alarm(Config) when is_list(Config) ->
 
     %% Find out how many disks exceed the threshold
     %% and make sure the corresponding number of alarms is set
-    ?line Threshold1 = disksup:get_almost_full_threshold(), % 80
-    ?line Data1 = disksup:get_disk_data(),
-    ?line Over1 = over_threshold(Data1, Threshold1),
-    ?line Alarms1 = get_alarms(),
+    Threshold1 = disksup:get_almost_full_threshold(), % 80
+    Data1 = disksup:get_disk_data(),
+    Over1 = over_threshold(Data1, Threshold1),
+    Alarms1 = get_alarms(),
     if
 	Over1==length(Alarms1) ->
-	    ?line true;
+	    true;
 	true ->
 	    dump_info(),
-	    ?line ?t:fail({bad_alarms, Threshold1, Data1, Alarms1})
+	    ?t:fail({bad_alarms, Threshold1, Data1, Alarms1})
     end,
 
     %% Try to find a disk with space usage below Threshold1,
@@ -187,24 +176,24 @@ alarm(Config) when is_list(Config) ->
 		       true -> false
 		   end
 	   end,
-    ?line case until(Fun1, Data1) of
+    case until(Fun1, Data1) of
 	      {_, _, Cap1} ->
 		  Threshold2 = Cap1-1,
-		  ?line ok =
+		  ok =
 		      disksup:set_almost_full_threshold(Threshold2/100),
-		  ?line disksup ! timeout, % force a disk check
-		  ?line Data2 = disksup:get_disk_data(),
-		  ?line Over2 = over_threshold(Data2, Threshold2),
-		  ?line Alarms2 = get_alarms(),
+		  disksup ! timeout, % force a disk check
+		  Data2 = disksup:get_disk_data(),
+		  Over2 = over_threshold(Data2, Threshold2),
+		  Alarms2 = get_alarms(),
 		  if
 		      Over2==length(Alarms2), Over2>Over1 ->
-			  ?line true;
+			  true;
 		      true ->
 			  dump_info(),
-			  ?line ?t:fail({bad_alarms, Threshold2, Data2, Alarms2})
+			  ?t:fail({bad_alarms, Threshold2, Data2, Alarms2})
 		  end;
 	      false ->
-		  ?line ignore
+		  ignore
 	  end,
 
     %% Find out the highest space usage among all disks
@@ -216,40 +205,35 @@ alarm(Config) when is_list(Config) ->
 		       true -> MaxAcc
 		   end
 	   end,
-    ?line case lists:foldl(Fun2, 0, Data1) of
+    case lists:foldl(Fun2, 0, Data1) of
 	      Max when Max<100 ->
 		  Threshold3 = Max+1,
-		  ?line ok =
-		      disksup:set_almost_full_threshold(Threshold3/100),
-		  ?line disksup ! timeout, % force a disk check
-		  ?line Data3 = disksup:get_disk_data(),
-		  ?line Over3 = over_threshold(Data3, Threshold3),
-		  ?line Alarms3 = get_alarms(),
+		  ok = disksup:set_almost_full_threshold(Threshold3/100),
+		  disksup ! timeout, % force a disk check
+		  Data3   = disksup:get_disk_data(),
+		  Over3   = over_threshold(Data3, Threshold3),
+		  Alarms3 = get_alarms(),
 		  if
 		      Over3==0, length(Alarms3)==0 ->
-			  ?line ok;
+			  ok;
 		      true ->
 			  dump_info(),
-			  ?line ?t:fail({bad_alarms, Threshold3, Data3, Alarms3})
+			  ?t:fail({bad_alarms, Threshold3, Data3, Alarms3})
 		  end;
 	      100 ->
-		  ?line ignore
+		  ignore
 	  end,
 
     %% Reset threshold
-    ?line ok = disksup:set_almost_full_threshold(Threshold1/100),
-
+    ok = disksup:set_almost_full_threshold(Threshold1/100),
     ok.
 
 over_threshold(Data, Threshold) ->
     Data2 = remove_duplicated_disks(lists:keysort(1, Data)),
-    lists:foldl(fun({_Id, _Kbyte, Cap}, N) when Cap>=Threshold ->
-			N+1;
-		   (_DiskData, N) ->
-			N
-		end,
-		0,
-		Data2).
+    lists:foldl(fun
+	    ({_Id, _Kbyte, Cap}, N) when Cap>=Threshold -> N+1;
+	    (_DiskData, N) -> N
+	end, 0, Data2).
 
 %% On some platforms (for example MontaVista) data for one disk can be
 %% "duplicated":
@@ -278,33 +262,30 @@ remove_duplicated_disks([]) ->
     [].
 
 get_alarms() ->
-    lists:filter(fun({{disk_almost_full, _Disk},_}) -> true;
-		    (_) -> false
-		 end,
-		 alarm_handler:get_alarms()).
+    lists:filter(fun
+	    ({{disk_almost_full, _Disk},_}) -> true;
+	    (_) -> false
+	end, alarm_handler:get_alarms()).
 
 until(Fun, [H|T]) ->
     case Fun(H) of
 	true -> H;
-	false ->
-	    until(Fun, T)
+	false -> until(Fun, T)
     end;
-until(_Fun, []) ->
-    false.
+until(_Fun, []) -> false.
 
-port(suite) ->
-    [];
+port(suite) -> [];
 port(doc) ->
     ["Test that disksup handles a terminating port program"];
 port(Config) when is_list(Config) ->
-    ?line Str = os:cmd("ps -ef | grep '[d]isksup'"),
+    Str = os:cmd("ps -ef | grep '[d]isksup'"),
     case io_lib:fread("~s ~s", Str) of
-	 {ok, [_Uid,Pid], _Rest} ->
+	{ok, [_Uid,Pid], _Rest} ->
 
 	    %% Monitor disksup
-	    ?line MonRef = erlang:monitor(process, disksup),
-	    ?line [{_Disk1,Kbyte1,_Cap1}|_] = disksup:get_disk_data(),
-	    ?line true = Kbyte1>0,
+	    MonRef = erlang:monitor(process, disksup),
+	    [{_Disk1,Kbyte1,_Cap1}|_] = disksup:get_disk_data(),
+	    true = Kbyte1>0,
 
 	    %% Kill the port program
 	    case os:cmd("kill -9 " ++ Pid) of
@@ -315,17 +296,16 @@ port(Config) when is_list(Config) ->
 			{'DOWN', MonRef, _, _, {port_died, _Reason}} ->
 			    ok;
 			{'DOWN', MonRef, _, _, Reason} ->
-			    ?line ?t:fail({unexpected_exit_reason, Reason})
+			    ?t:fail({unexpected_exit_reason, Reason})
 		    after
 			3000 ->
-			    ?line ?t:fail({still_alive, Str})
+			    ?t:fail({still_alive, Str})
 		    end,
 
 		    %% Give os_mon_sup time to restart disksup
 		    ?t:sleep(?t:seconds(3)),
-		    ?line [{_Disk2,Kbyte2,_Cap2}|_] =
-			disksup:get_disk_data(),
-		    ?line true = Kbyte2>0,
+		    [{_Disk2,Kbyte2,_Cap2}|_] = disksup:get_disk_data(),
+		    true = Kbyte2>0,
 
 		    ok;
 
@@ -337,68 +317,61 @@ port(Config) when is_list(Config) ->
 	    {skip, {os_pid_not_found, Str}}
     end.
 
-terminate(suite) ->
-    [];
+terminate(suite) -> [];
 terminate(Config) when is_list(Config) ->
-    ?line ok = application:set_env(os_mon, start_disksup, false),
-    ?line ok = supervisor:terminate_child(os_mon_sup, disksup),
+    ok = application:set_env(os_mon, start_disksup, false),
+    ok = supervisor:terminate_child(os_mon_sup, disksup),
     ok.
 
-unavailable(suite) ->
-    [];
+unavailable(suite) -> [];
 unavailable(doc) ->
     ["Test correct behaviour when service is unavailable"];
 unavailable(Config) when is_list(Config) ->
 
     %% Make sure all API functions return their dummy values
-    ?line [{"none",0,0}] = disksup:get_disk_data(),
-    ?line 1800000 = disksup:get_check_interval(),
-    ?line ok = disksup:set_check_interval(5),
-    ?line 80 = disksup:get_almost_full_threshold(),
-    ?line ok = disksup:set_almost_full_threshold(0.9),
-
+    [{"none",0,0}] = disksup:get_disk_data(),
+    1800000 = disksup:get_check_interval(),
+    ok = disksup:set_check_interval(5),
+    80 = disksup:get_almost_full_threshold(),
+    ok = disksup:set_almost_full_threshold(0.9),
     ok.
 
 restart(suite) ->
     [];
 restart(Config) when is_list(Config) ->
-    ?line ok = application:set_env(os_mon, start_disksup, true),
-    ?line {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup),
+    ok = application:set_env(os_mon, start_disksup, true),
+    {ok, _Pid} = supervisor:restart_child(os_mon_sup, disksup),
     ok.
 
-otp_5910(suite) ->
-    [];
+otp_5910(suite) -> [];
 otp_5910(doc) ->
     ["Test that alarms are cleared if disksup crashes or "
      "if OS_Mon is stopped"];
 otp_5910(Config) when is_list(Config) ->
 
     %% Make sure disksup sets at least one alarm
-    ?line Data = disksup:get_disk_data(),
-    ?line Threshold0 = disksup:get_almost_full_threshold(),
-    ?line Threshold = case over_threshold(Data, Threshold0) of
-			  0 ->
-			      [{_Id,_Kbyte,Cap}|_] = Data,
-			      ?line ok = disksup:set_almost_full_threshold((Cap-1)/100),
-			      Cap-1;
-			  _N ->
-			      Threshold0
-		      end,
-    ?line ok = application:set_env(os_mon,
-				   disk_almost_full_threshold,
-				   Threshold/100),
-    ?line disksup ! timeout, % force a disk check
-    ?line Data2 = disksup:get_disk_data(),
-    ?line Over = over_threshold(Data2, Threshold),
-    ?line Alarms = get_alarms(),
+    Data = disksup:get_disk_data(),
+    Threshold0 = disksup:get_almost_full_threshold(),
+    Threshold  = case over_threshold(Data, Threshold0) of
+	0 ->
+	    [{_Id,_Kbyte,Cap}|_] = Data,
+	    ok = disksup:set_almost_full_threshold((Cap-1)/100),
+	    Cap-1;
+	_N -> Threshold0
+    end,
+    ok = application:set_env(os_mon, disk_almost_full_threshold, Threshold/100),
+    disksup ! timeout, % force a disk check
+    Data2 = disksup:get_disk_data(),
+    Over = over_threshold(Data2, Threshold),
+    Alarms = get_alarms(),
     if
 	Over==0 ->
-	    ?line ?t:fail({threshold_too_low, Data2, Threshold});
+	    ?t:fail({threshold_too_low, Data2, Threshold});
 	Over==length(Alarms) ->
 	    ok;
 	true ->
 	    dump_info(),
-	    ?line ?t:fail({bad_alarms, Threshold, Data2, Alarms})
+	    ?t:fail({bad_alarms, Threshold, Data2, Alarms})
     end,
 
     %% Kill disksup
@@ -407,34 +380,42 @@ otp_5910(Config) when is_list(Config) ->
     %% Wait a little to make sure disksup has been restarted,
     %% then make sure the alarms are set once, but not twice
     ?t:sleep(?t:seconds(1)),
-    ?line Data3 = disksup:get_disk_data(),
-    ?line Alarms2 = get_alarms(),
+    Data3   = disksup:get_disk_data(),
+    Alarms2 = get_alarms(),
     if
-	length(Alarms2)==length(Alarms) ->
-	    ok;
+	length(Alarms2)==length(Alarms) -> ok;
 	true ->
 	    dump_info(),
-	    ?line ?t:fail({bad_alarms, Threshold, Data3, Alarms,Alarms2})
+	    ?t:fail({bad_alarms,Threshold,Data3,Alarms,Alarms2})
     end,
 
     %% Stop OS_Mon and make sure all disksup alarms are cleared
-    ?line ok = application:stop(os_mon),
+    ok = application:stop(os_mon),
     ?t:sleep(?t:seconds(1)),
-    ?line Alarms3 = get_alarms(),
-    if
-	length(Alarms3)==0 ->
-	    ok;
-	true ->
-	    ?line ?t:fail({alarms_not_cleared, Alarms3})
+    Alarms3 = get_alarms(),
+    case get_alarms() of
+	[] -> ok;
+	_  -> ?t:fail({alarms_not_cleared, Alarms3})
     end,
 
     %% Reset threshold and restart OS_Mon
-    ?line ok = application:set_env(os_mon,
-				   disksup_almost_full_threshold, 0.8),
-    ?line ok = disksup:set_almost_full_threshold(0.8),
-    ?line ok = application:start(os_mon),
-
+    ok = application:set_env(os_mon, disksup_almost_full_threshold, 0.8),
+    ok = disksup:set_almost_full_threshold(0.8),
+    ok = application:start(os_mon),
     ok.
 
 dump_info() ->
     io:format("Status: ~p~n", [sys:get_status(disksup)]).
+
+% filter get_disk_data and remove entriew with zero capacity
+% "non-normal" filesystems report zero capacity
+% - Perhaps errorneous 'df -k -l'?
+% - Always list filesystems by type '-t ufs,zfs,..' instead?
+% It is unclear what the intention was from the beginning.
+get_disk_data() ->
+    get_disk_data(disksup:get_disk_data()).
+
+get_disk_data([{"none",0,0}=E]) -> [E];
+get_disk_data([{_,_,0}|Es]) -> get_disk_data(Es);
+get_disk_data([E|Es]) -> [E|get_disk_data(Es)];
+get_disk_data([]) -> [].
diff --git a/lib/os_mon/test/os_mon_SUITE.erl b/lib/os_mon/test/os_mon_SUITE.erl
index f074657d4c..08ad8436dd 100644
--- a/lib/os_mon/test/os_mon_SUITE.erl
+++ b/lib/os_mon/test/os_mon_SUITE.erl
@@ -25,7 +25,7 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
--export([app_file/1, config/1]).
+-export([app_file/1, appup_file/1, config/1]).
 
 %% Default timetrap timeout (set in init_per_testcase)
 -define(default_timeout, ?t:minutes(1)).
@@ -43,8 +43,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     case test_server:os_type() of
-	{unix, sunos} -> [app_file, config];
-	_OS -> [app_file]
+	{unix, sunos} -> [app_file, appup_file, config];
+	_OS -> [app_file, appup_file]
     end.
 
 groups() -> 
@@ -71,6 +71,9 @@ app_file(Config) when is_list(Config) ->
     ?line ok = test_server:app_test(os_mon),
     ok.
 
+appup_file(Config) when is_list(Config) ->
+    ok = test_server:appup_test(os_mon).
+
 config(suite) ->
     [];
 config(doc) ->
diff --git a/lib/os_mon/test/os_mon_smoke.spec b/lib/os_mon/test/os_mon_smoke.spec
new file mode 100644
index 0000000000..6f0d02494b
--- /dev/null
+++ b/lib/os_mon/test/os_mon_smoke.spec
@@ -0,0 +1,3 @@
+{cases,"../os_mon_test",disksup_SUITE,[api]}.
+{cases,"../os_mon_test",cpu_sup_SUITE,[load_api,util_api]}.
+{cases,"../os_mon_test",memsup_SUITE,[api]}.
\ No newline at end of file
diff --git a/lib/os_mon/vsn.mk b/lib/os_mon/vsn.mk
index e3acea0258..e9e90729f2 100644
--- a/lib/os_mon/vsn.mk
+++ b/lib/os_mon/vsn.mk
@@ -1 +1 @@
-OS_MON_VSN = 2.2.12
+OS_MON_VSN = 2.2.14
diff --git a/lib/otp_mibs/doc/src/book.xml b/lib/otp_mibs/doc/src/book.xml
index 11d08b8a41..5377685cd3 100644
--- a/lib/otp_mibs/doc/src/book.xml
+++ b/lib/otp_mibs/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/otp_mibs/doc/src/fascicules.xml b/lib/otp_mibs/doc/src/fascicules.xml
index 101e745722..c075478967 100644
--- a/lib/otp_mibs/doc/src/fascicules.xml
+++ b/lib/otp_mibs/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/otp_mibs/doc/src/introduction.xml b/lib/otp_mibs/doc/src/introduction.xml
index c1ed0fed78..e58c237de2 100644
--- a/lib/otp_mibs/doc/src/introduction.xml
+++ b/lib/otp_mibs/doc/src/introduction.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/otp_mibs/doc/src/mibs.xml b/lib/otp_mibs/doc/src/mibs.xml
index 16d2ac201a..4e3e849043 100644
--- a/lib/otp_mibs/doc/src/mibs.xml
+++ b/lib/otp_mibs/doc/src/mibs.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/otp_mibs/doc/src/notes.xml b/lib/otp_mibs/doc/src/notes.xml
index 8986eab9ad..0c13fb2349 100644
--- a/lib/otp_mibs/doc/src/notes.xml
+++ b/lib/otp_mibs/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml
index c96b31a1d4..9be25fc7a0 100644
--- a/lib/otp_mibs/doc/src/otp_mib.xml
+++ b/lib/otp_mibs/doc/src/otp_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/otp_mibs/doc/src/part.xml b/lib/otp_mibs/doc/src/part.xml
index 40988fda69..352a4e33c8 100644
--- a/lib/otp_mibs/doc/src/part.xml
+++ b/lib/otp_mibs/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/otp_mibs/doc/src/part_notes.xml b/lib/otp_mibs/doc/src/part_notes.xml
index a7bdde9b64..1212c2d80d 100644
--- a/lib/otp_mibs/doc/src/part_notes.xml
+++ b/lib/otp_mibs/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/otp_mibs/doc/src/ref_man.xml b/lib/otp_mibs/doc/src/ref_man.xml
index 1b5d91e9db..d1d5d7f2eb 100644
--- a/lib/otp_mibs/doc/src/ref_man.xml
+++ b/lib/otp_mibs/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib
index 6fbb8ef073..2815251c23 100644
--- a/lib/otp_mibs/mibs/OTP-EVA-MIB.mib
+++ b/lib/otp_mibs/mibs/OTP-EVA-MIB.mib
@@ -34,7 +34,7 @@ IMPORTS
     ;
 
 otpEvaModule MODULE-IDENTITY
-    LAST-UPDATED "0305090900Z"
+    LAST-UPDATED "200305090900Z"
     ORGANIZATION "Ericsson"
     CONTACT-INFO
        "Contact:  Erlang Support see license agreement for Erlang/OTP."
@@ -42,19 +42,19 @@ otpEvaModule MODULE-IDENTITY
 	"This MIB is part of the OTP MIB.  It defines MIB objects
 	for the eva application in OTP."
    
-    REVISION	"0305090900Z"
+    REVISION	"200305090900Z"
     DESCRIPTION		
         "Changed CONTACT-INFO as it was outdated, made it more generic
 	to avoid such changes in the future."
     
-    REVISION     "9801270900Z"
+    REVISION     "199801270900Z"
     DESCRIPTION
         "Changed erroneous defintion of alarmCleared notification.
         Changed erroneous name of this module to otpEvaModule."
-    REVISION     "9712010900Z"
+    REVISION     "199712010900Z"
     DESCRIPTION
         "Converted to v2 SMI and placed in the OTP tree."
-    REVISION     "9705020900Z"
+    REVISION     "199705020900Z"
     DESCRIPTION
         "The initial version of this MIB module.  It is very much
         inspired by the ANS-ALM-MIB and Axd301Eva-OMS mibs."
diff --git a/lib/otp_mibs/mibs/OTP-MIB.mib b/lib/otp_mibs/mibs/OTP-MIB.mib
index 2d4c286bc7..22dc21c9c5 100644
--- a/lib/otp_mibs/mibs/OTP-MIB.mib
+++ b/lib/otp_mibs/mibs/OTP-MIB.mib
@@ -21,7 +21,7 @@ OTP-MIB DEFINITIONS ::= BEGIN
  
 IMPORTS
     MODULE-IDENTITY, OBJECT-TYPE,
-    Counter32, Gauge32, Integer32
+    Counter64, Gauge32, Integer32
         FROM SNMPv2-SMI
     TEXTUAL-CONVENTION, DisplayString
         FROM SNMPv2-TC
@@ -32,7 +32,7 @@ IMPORTS
     ;
 
 otpModule MODULE-IDENTITY
-    LAST-UPDATED    "0305090900Z"
+    LAST-UPDATED    "201307160700Z"
     ORGANIZATION    "Ericsson"
     CONTACT-INFO
         "Contact:    Erlang Support see license agreement for Erlang/OTP."
@@ -41,16 +41,22 @@ otpModule MODULE-IDENTITY
         agent executing at one node only.  Each Erlang node in the
         OTP system is represented by one row in the erlNodeTable."
 
-    REVISION        "0305090900Z"
+    REVISION        "201307160700Z"
+    DESCRIPTION
+        "Updated various types to be able to reflect larger values.
+        The objects erlNodeReductions, erlNodeInBytes, erlNodeOutBytes as well
+        as the type MilliSeconds have been updated to Counter64."
+
+    REVISION        "200305090900Z"
     DESCRIPTION
         "Changed CONTACT-INFO as it was outdated, made it more generic
 	to avoid such changes in the future."
     
-    REVISION        "9712010900Z"
+    REVISION        "199712010900Z"
     DESCRIPTION
         "Converted to v2 SMI and placed in the OTP tree."
 
-    REVISION        "9608191700Z"
+    REVISION        "199608191700Z"
     DESCRIPTION
         "The initial revision of MIB module OTP-MIB."
 
@@ -70,7 +76,7 @@ MilliSeconds ::= TEXTUAL-CONVENTION
         the time, in milliseconds between two epochs.  When objects
 	are defined which use this type, the description of the object
 	identifies both of the reference epochs."
-    SYNTAX      Counter32
+    SYNTAX      Counter64
 
 
 -- Managed Objects
@@ -103,10 +109,10 @@ ErlNodeEntry ::= SEQUENCE {
     erlNodeRunQueue     Gauge32,
     erlNodeRunTime      MilliSeconds,
     erlNodeWallClock    MilliSeconds,
-    erlNodeReductions   Counter32,
+    erlNodeReductions   Counter64,
     erlNodeProcesses    Gauge32,
-    erlNodeInBytes      Counter32,
-    erlNodeOutBytes     Counter32
+    erlNodeInBytes      Counter64,
+    erlNodeOutBytes     Counter64
 }
 
 erlNodeId OBJECT-TYPE
@@ -168,7 +174,7 @@ erlNodeWallClock OBJECT-TYPE
     ::= { erlNodeEntry 7 }  
 
 erlNodeReductions OBJECT-TYPE
-    SYNTAX      Counter32
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -184,7 +190,7 @@ erlNodeProcesses OBJECT-TYPE
     ::= { erlNodeEntry 9 }
 
 erlNodeInBytes  OBJECT-TYPE
-    SYNTAX      Counter32
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
@@ -192,7 +198,7 @@ erlNodeInBytes  OBJECT-TYPE
     ::= { erlNodeEntry 10 }
 
 erlNodeOutBytes  OBJECT-TYPE
-    SYNTAX      Counter32
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION
diff --git a/lib/otp_mibs/mibs/OTP-REG.mib b/lib/otp_mibs/mibs/OTP-REG.mib
index c6ef2c67e5..c700f93fd8 100644
--- a/lib/otp_mibs/mibs/OTP-REG.mib
+++ b/lib/otp_mibs/mibs/OTP-REG.mib
@@ -25,25 +25,25 @@ IMPORTS
     ;
 
 otpRegModule MODULE-IDENTITY
-    LAST-UPDATED "0305090900Z"
+    LAST-UPDATED "200305090900Z"
     ORGANIZATION "Ericsson"
     CONTACT-INFO
        "Contact:  Erlang Support see license agreement for Erlang/OTP."
     DESCRIPTION
        "The root MIB module for OTP."
 
-    REVISION        "0305090900Z"
+    REVISION     "200305090900Z"
     DESCRIPTION
         "Changed CONTACT-INFO as it was outdated, made it more generic
 	to avoid such changes in the future."
   
-    REVISION    "9902020900Z"
+    REVISION     "199902020900Z"
     DESCRIPTION
        "Cleaned up OBJECT IDENTIFIER registration.  Changed the name
        of the MODULE-IDENTITY of this module to non-conflicting name
        otpRegModule."
 
-    REVISION    "9712010900Z"
+    REVISION     "199712010900Z"
     DESCRIPTION
        "The initial revision of MIB module OTP-REG."
     ::= { otpModules 1 }
diff --git a/lib/otp_mibs/mibs/OTP-TC.mib b/lib/otp_mibs/mibs/OTP-TC.mib
index 38c4d05846..9b80e1ccac 100644
--- a/lib/otp_mibs/mibs/OTP-TC.mib
+++ b/lib/otp_mibs/mibs/OTP-TC.mib
@@ -29,7 +29,7 @@ IMPORTS
     ;
 
 otpTcModule MODULE-IDENTITY
-    LAST-UPDATED "0305090900Z"
+    LAST-UPDATED "200305090900Z"
     ORGANIZATION "Ericsson"
     CONTACT-INFO
        "Contact:  Erlang Support see license agreement for Erlang/OTP."
@@ -37,13 +37,13 @@ otpTcModule MODULE-IDENTITY
         "This MIB is part of the OTP MIB.  It defines common
         Textual Conventions used in other OTP mib modules."
     
-    REVISION        "0305090900Z"
+    REVISION     "200305090900Z"
     DESCRIPTION
         "Changed CONTACT-INFO as it was outdated, made it more generic
 	to avoid such changes in the future."
   
     
-    REVISION    "9712010900Z"
+    REVISION     "199712010900Z"
     DESCRIPTION
         "The initial version of this module."
     ::= { otpModules 2 }
diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl
index 619104007c..9d52ce1fab 100644
--- a/lib/otp_mibs/src/otp_mib.erl
+++ b/lib/otp_mibs/src/otp_mib.erl
@@ -1,26 +1,26 @@
 %%
 %% %CopyrightBegin%
-%% 
+%%
 %% Copyright Ericsson AB 1996-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(otp_mib).
 %%%-----------------------------------------------------------------
 %%% Description: This module implements the OTP-MIB.
 %%% The tables are implemented as shadow tables with the module
-%%% snmp_shadow_table. 
+%%% snmp_shadow_table.
 %%%-----------------------------------------------------------------
 
 %% API
@@ -35,9 +35,9 @@
 %% Exported for internal use via rpc
 -export([get_erl_node/1, get_appls/1]).
 
-%% Shadow tables  
+%% Shadow tables
 -record(erlNodeTable,
-	{erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion, 
+	{erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion,
 	 erlNodeRunQueue,
          erlNodeRunTime, erlNodeWallClock, erlNodeReductions,
 	 erlNodeProcesses, erlNodeInBytes, erlNodeOutBytes}).
@@ -45,13 +45,13 @@
 -record(applTable, {key = '_', applName = '_', applDescr = '_',
 		    applVsn = '_'}).
 
-%% Shadow argument macros 
--define(erlNodeShadowArgs, 
+%% Shadow argument macros
+-define(erlNodeShadowArgs,
 	{erlNodeTable, integer, record_info(fields, erlNodeTable), 5000,
 	 fun otp_mib:update_erl_node_table/0}).
 
 -define(applShadowArgs,
-	{applTable, {integer, integer}, record_info(fields, applTable), 
+	{applTable, {integer, integer}, record_info(fields, applTable),
 	 5000, fun otp_mib:update_appl_table/0}).
 
 %% Misc
@@ -79,14 +79,14 @@ load(Agent) ->
 %%-------------------------------------------------------------------------
 unload(Agent) ->
     snmpa:unload_mibs(Agent, ["OTP-MIB"]).
-    
+
 
 %%%=========================================================================
 %%%  SNMP instrumentation
 %%%=========================================================================
 erl_node_table(new) ->
     Tab = erlNodeAlloc,
-    Storage = ram_copies, 
+    Storage = ram_copies,
     case lists:member(Tab, mnesia:system_info(tables)) of
 	true ->
 	    case mnesia:table_info(Tab, storage_type) of
@@ -101,12 +101,12 @@ erl_node_table(new) ->
 		     {attributes, record_info(fields, erlNodeAlloc)},
 		     {local_content, true},
 		     {Storage, Nodes}],
-	    {atomic, ok} = mnesia:create_table(Tab, Props)    
+	    {atomic, ok} = mnesia:create_table(Tab, Props)
     end,
     ok = mnesia:dirty_write({erlNodeAlloc, next_index, 1}),
     update_node_alloc([node() | nodes()]),
     snmp_shadow_table:table_func(new, ?erlNodeShadowArgs).
-    
+
 erl_node_table(Op, RowIndex, Cols) ->
     snmp_shadow_table:table_func(Op, RowIndex, Cols, ?erlNodeShadowArgs).
 
@@ -148,21 +148,26 @@ update_appl_table() ->
 %%% Exported for internal use via rpc
 %%%========================================================================
 get_erl_node(Id) ->
+    RunQueue = erlang:statistics(run_queue),
+    RunTime = element(1, erlang:statistics(runtime)),
+    WallClock = element(1, erlang:statistics(wall_clock)),
+    Reductions = element(1, erlang:statistics(reductions)),
+    Processes = length(processes()),
     IO = erlang:statistics(io),
-    #erlNodeTable{erlNodeId = Id,
+    InBytes = element(2, element(1, IO)),
+    OutBytes = element(2, element(2, IO)),
+    #erlNodeTable{erlNodeId = truncate_int('Integer32', Id),
 		  erlNodeName = atom_to_list(node()),
 		  erlNodeVersion = erlang:system_info(version),
 		  erlNodeMachine = erlang:system_info(machine),
-		  erlNodeRunQueue = erlang:statistics(run_queue),
-		  erlNodeRunTime = element(1, erlang:statistics(runtime)),
-		  erlNodeWallClock = 
-		  element(1, erlang:statistics(wall_clock)),
-		  erlNodeReductions = 
-		  element(1, erlang:statistics(reductions)),
-		  erlNodeProcesses = length(processes()),
-		  erlNodeInBytes = element(2, element(1, IO)),
-		  erlNodeOutBytes = element(2, element(2, IO))}.
-    
+		  erlNodeRunQueue = truncate_int('Unsigned32', RunQueue),
+		  erlNodeRunTime = truncate_int('Counter64', RunTime),
+		  erlNodeWallClock = truncate_int('Counter64', WallClock),
+		  erlNodeReductions = truncate_int('Counter64', Reductions),
+		  erlNodeProcesses = truncate_int('Unsigned32', Processes),
+		  erlNodeInBytes = truncate_int('Counter64', InBytes),
+		  erlNodeOutBytes = truncate_int('Counter64', OutBytes)}.
+
 get_appls(NodeId) ->
     element(1,
 	    lists:mapfoldl(
@@ -181,7 +186,7 @@ update_node_alloc([Node | T]) ->
     case mnesia:dirty_read({erlNodeAlloc, Node}) of
 	[] ->
 	    [{_, _, Idx}] = mnesia:dirty_read({erlNodeAlloc, next_index}),
-	    ok = mnesia:dirty_write(#erlNodeAlloc{nodeName = Node, 
+	    ok = mnesia:dirty_write(#erlNodeAlloc{nodeName = Node,
 						  nodeId = Idx}),
 	    ok = mnesia:dirty_write({erlNodeAlloc, next_index, Idx + 1});
 	_ ->
@@ -196,3 +201,15 @@ delete_all(Key, Name) ->
     Next = mnesia:dirty_next(Name, Key),
     ok = mnesia:dirty_delete({Name, Key}),
     delete_all(Next, Name).
+
+%% This will return a value limited to fit into the specified type.
+%% While counter types will be resetted, other integer types will
+%% only be restricted to the valid range.
+truncate_int('Counter64', Value) when Value < 0 -> 0;
+truncate_int('Counter64', Value) -> Value rem 18446744073709551615;
+truncate_int('Unsigned32', Value) when Value < 0 -> 0;
+truncate_int('Unsigned32', Value) when Value > 4294967295 -> 4294967295;
+truncate_int('Unsigned32', Value) -> Value;
+truncate_int('Integer32', Value) when Value < -2147483648 -> -2147483648;
+truncate_int('Integer32', Value) when Value > 2147483647 -> 2147483647;
+truncate_int('Integer32', Value) -> Value.
diff --git a/lib/otp_mibs/src/otp_mibs.appup.src b/lib/otp_mibs/src/otp_mibs.appup.src
index 5e99dfe325..fd5ce1e391 100644
--- a/lib/otp_mibs/src/otp_mibs.appup.src
+++ b/lib/otp_mibs/src/otp_mibs.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2014. All Rights Reserved.
 %% 
 %% The 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,6 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-
-{"%VSN%",[],[]}.
+{"%VSN%",
+ [{<<".*">>,[{restart_application, otp_mibs}]}],
+ [{<<".*">>,[{restart_application, otp_mibs}]}]
+}.
diff --git a/lib/toolbar/src/Makefile b/lib/otp_mibs/test/Makefile
index a24846976b..48c1c5c7d8 100644
--- a/lib/toolbar/src/Makefile
+++ b/lib/otp_mibs/test/Makefile
@@ -1,93 +1,85 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-2012. 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
 # 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 $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(TOOLBAR_VSN)
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 # ----------------------------------------------------
-# Release directory specification
+# Target Specs
 # ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/toolbar-$(VSN)
 
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
+MODULES= otp_mibs_SUITE
 
-MODULES=  \
-	canvasbutton \
-	toolbar \
-	toolbar_graphics \
-	toolbar_lib \
-	toolbar_toolconfig
+EBIN = .
 
-HRL_FILES= toolbar.hrl
+HRL_FILES=
 
 ERL_FILES= $(MODULES:%=%.erl)
 
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR))
 
-APP_FILE = toolbar.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
+SOURCE = $(ERL_FILES) $(HRL_FILES)
 
-APPUP_FILE = toolbar.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/otp_mibs_test
 
 # ----------------------------------------------------
 # FLAGS
 # ----------------------------------------------------
-ERL_COMPILE_FLAGS += +warn_obsolete_guard
+ERL_MAKE_FLAGS +=
+ERL_COMPILE_FLAGS += \
+	-I$(ERL_TOP)/lib/test_server/include \
+	-I$(ERL_TOP)/lib/snmp/include
 
 # ----------------------------------------------------
 # Targets
 # ----------------------------------------------------
 
-debug opt: $(TARGET_FILES) 
-
-clean:
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
+make_emakefile:
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES)\
+	> $(EMAKEFILE)
 
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
 
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+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
-	$(INSTALL_DIR) "$(RELSYSDIR)/src"
-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
-	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+release_spec:
 
-release_docs_spec:
+release_tests_spec: make_emakefile
+	$(INSTALL_DIR) "$(RELSYSDIR)"
+	$(INSTALL_DATA) $(EMAKEFILE) $(SOURCE) "$(RELSYSDIR)"
+	$(INSTALL_DATA) otp_mibs_SUITE.cfg "$(RELSYSDIR)"
 
+release_docs_spec:
diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.cfg b/lib/otp_mibs/test/otp_mibs_SUITE.cfg
new file mode 100644
index 0000000000..d01cf92104
--- /dev/null
+++ b/lib/otp_mibs/test/otp_mibs_SUITE.cfg
@@ -0,0 +1,15 @@
+%% -*- erlang -*-
+{snmp,
+ [
+  {start_agent,true},
+  {users,
+   [
+    {otp_mibs_test,[snmpm_user_default,[]]}
+   ]},
+  {managed_agents,
+   [
+    {otp_mibs_test, [otp_mibs_test, {127,0,0,1}, 4000, []]}
+   ]},
+  {agent_sysname,"Test otp_mibs"},
+  {mgr_port,5001}
+ ]}.
diff --git a/lib/otp_mibs/test/otp_mibs_SUITE.erl b/lib/otp_mibs/test/otp_mibs_SUITE.erl
new file mode 100644
index 0000000000..5376c54210
--- /dev/null
+++ b/lib/otp_mibs/test/otp_mibs_SUITE.erl
@@ -0,0 +1,254 @@
+%%
+%% %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%
+%%
+-module(otp_mibs_SUITE).
+
+%%-----------------------------------------------------------------
+%% 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, otp_mibs_SUITE.cfg, found in the same directory as
+%% the suite.
+%%
+%% Execute with:
+%% > ct_run -suite otp_mibs_SUITE -config otp_mibs_SUITE.cfg
+%%-----------------------------------------------------------------
+
+-include_lib("test_server/include/test_server.hrl").
+-include_lib("otp_mibs/include/OTP-MIB.hrl").
+-include_lib("snmp/include/snmp_types.hrl").
+
+% Test server specific exports
+-export([all/0,
+	 suite/0,
+	 groups/0,
+	 init_per_group/2,
+	 end_per_group/2,
+	 init_per_suite/1,
+	 end_per_suite/1,
+	 init_per_testcase/2,
+	 end_per_testcase/2]).
+
+% Test cases must be exported.
+-export([app/1, appup/1, nt_basic_types/1, nt_high_reduction_count/1]).
+
+-define(TRAP_UDP,      5000).
+-define(AGENT_UDP,     4000).
+-define(CONF_FILE_VER, [v2]).
+-define(SYS_NAME,      "Test otp_mibs").
+-define(MAX_MSG_SIZE,  484).
+-define(ENGINE_ID,     "mgrEngine").
+-define(MGR_PORT,      5001).
+
+%% Since some cases are only interested in single entries of the OTP-MIB's
+%% node table, one row must be chosen. The first row should be sufficient
+%% for this.
+-define(NODE_ENTRY, 1).
+
+%%---------------------------------------------------------------------
+%% CT setup
+%%---------------------------------------------------------------------
+
+init_per_testcase(_Case, Config) when is_list(Config) ->
+    Dog = test_server:timetrap(test_server:minutes(6)),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case, Config) when is_list(Config) ->
+    Dog = ?config(watchdog, Config),
+    test_server:timetrap_cancel(Dog),
+    Config.
+
+suite() -> [{ct_hooks,[ts_install_cth]}, {require, snmp_mgr_agent, snmp}].
+
+all() -> [{group, app}, {group, node_table}].
+
+groups() -> [{app, [], [app, appup]},
+             {node_table, [], [nt_basic_types, nt_high_reduction_count]}].
+
+init_per_group(_GroupName, Config) -> Config.
+
+end_per_group(_GroupName, Config) -> Config.
+
+init_per_suite(Config) ->
+    ?line application:start(sasl),
+    ?line application:start(mnesia),
+    ?line application:start(otp_mibs),
+
+    ok = ct_snmp:start(Config,snmp_mgr_agent),
+
+    %% Load the mibs that should be tested
+    otp_mib:load(snmp_master_agent),
+
+    Config.
+
+end_per_suite(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    ConfDir = filename:join(PrivDir,"conf"),
+    DbDir = filename:join(PrivDir,"db"),
+    MgrDir = filename:join(PrivDir, "mgr"),
+
+    %% Uload mibs
+    otp_mib:unload(snmp_master_agent),
+
+    %% Clean up
+    application:stop(snmp),
+    application:stop(mnesia),
+    application:stop(otp_mibs),
+
+    del_dir(ConfDir),
+    del_dir(DbDir),
+    (catch del_dir(MgrDir)),
+    ok.
+
+%%---------------------------------------------------------------------
+%% Test cases
+%%---------------------------------------------------------------------
+
+%% Test that the otp_mibs app file is ok
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(otp_mibs).
+
+%% Test that the otp_mibs appup file is ok
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(otp_mibs).
+
+nt_basic_types(suite) ->
+    [];
+nt_basic_types(doc) ->
+    ["Query every item of the node table and check its variable "
+     "type and content for sensible values."];
+nt_basic_types(Config) when is_list(Config) ->
+    ok = otp_mib:update_erl_node_table(),
+
+    NodeNameId = ?erlNodeEntry ++ [?erlNodeName, ?NODE_ENTRY],
+    {noError, 0, [NodeNameVal]} = snmp_get([NodeNameId]),
+    #varbind{variabletype = 'OCTET STRING'} = NodeNameVal,
+    true = is_list(NodeNameVal#varbind.value),
+
+    NodeMachineId = ?erlNodeEntry ++ [?erlNodeMachine, ?NODE_ENTRY],
+    {noError, 0, [NodeMachineVal]} = snmp_get([NodeMachineId]),
+    #varbind{variabletype = 'OCTET STRING'} = NodeMachineVal,
+    true = is_list(NodeMachineVal#varbind.value),
+
+    NodeVersionId = ?erlNodeEntry ++ [?erlNodeVersion, ?NODE_ENTRY],
+    {noError, 0, [NodeVersionVal]} = snmp_get([NodeVersionId]),
+    #varbind{variabletype = 'OCTET STRING'} = NodeVersionVal,
+    true = is_list(NodeVersionVal#varbind.value),
+
+    NodeRunQueueId = ?erlNodeEntry ++ [?erlNodeRunQueue, ?NODE_ENTRY],
+    {noError, 0, [NodeRunQueueVal]} = snmp_get([NodeRunQueueId]),
+    #varbind{variabletype = 'Unsigned32'} = NodeRunQueueVal,
+    true = is_integer(NodeRunQueueVal#varbind.value),
+    NodeRunQueueVal#varbind.value >= 0,
+    NodeRunQueueVal#varbind.value =< 4294967295,
+
+    NodeRunTimeId = ?erlNodeEntry ++ [?erlNodeRunTime, ?NODE_ENTRY],
+    {noError, 0, [NodeRunTimeVal]} = snmp_get([NodeRunTimeId]),
+    #varbind{variabletype = 'Counter64'} = NodeRunTimeVal,
+    true = is_integer(NodeRunTimeVal#varbind.value),
+    NodeRunTimeVal#varbind.value >= 0,
+    NodeRunTimeVal#varbind.value =< 18446744073709551615,
+
+    NodeWallClockId = ?erlNodeEntry ++ [?erlNodeWallClock, ?NODE_ENTRY],
+    {noError, 0, [NodeWallClockVal]} = snmp_get([NodeWallClockId]),
+    #varbind{variabletype = 'Counter64'} = NodeWallClockVal,
+    true = is_integer(NodeWallClockVal#varbind.value),
+    NodeWallClockVal#varbind.value >= 0,
+    NodeWallClockVal#varbind.value =< 18446744073709551615,
+
+    NodeReductionsId = ?erlNodeEntry ++ [?erlNodeReductions, ?NODE_ENTRY],
+    {noError, 0, [NodeReductionsVal]} = snmp_get([NodeReductionsId]),
+    #varbind{variabletype = 'Counter64'} = NodeReductionsVal,
+    true = is_integer(NodeReductionsVal#varbind.value),
+    NodeReductionsVal#varbind.value >= 0,
+    NodeReductionsVal#varbind.value =< 18446744073709551615,
+
+    NodeProcessesId = ?erlNodeEntry ++ [?erlNodeProcesses, ?NODE_ENTRY],
+    {noError, 0, [NodeProcessesVal]} = snmp_get([NodeProcessesId]),
+    #varbind{variabletype = 'Unsigned32'} = NodeProcessesVal,
+    true = is_integer(NodeProcessesVal#varbind.value),
+    NodeProcessesVal#varbind.value >= 0,
+    NodeProcessesVal#varbind.value =< 4294967295,
+
+    NodeInBytesId = ?erlNodeEntry ++ [?erlNodeInBytes, ?NODE_ENTRY],
+    {noError, 0, [NodeInBytesVal]} = snmp_get([NodeInBytesId]),
+    #varbind{variabletype = 'Counter64'} = NodeInBytesVal,
+    true = is_integer(NodeInBytesVal#varbind.value),
+    NodeInBytesVal#varbind.value >= 0,
+    NodeInBytesVal#varbind.value =< 18446744073709551615,
+
+    NodeOutBytesId = ?erlNodeEntry ++ [?erlNodeOutBytes, ?NODE_ENTRY],
+    {noError, 0, [NodeOutBytesVal]} = snmp_get([NodeOutBytesId]),
+    #varbind{variabletype = 'Counter64'} = NodeOutBytesVal,
+    true = is_integer(NodeOutBytesVal#varbind.value),
+    NodeOutBytesVal#varbind.value >= 0,
+    NodeOutBytesVal#varbind.value =< 18446744073709551615,
+
+    ok.
+
+nt_high_reduction_count(suite) ->
+    [];
+nt_high_reduction_count(doc) ->
+    ["Check that no error occurs when the erlNodeReductions field"
+     "exceeds the 32bit boundary, this may take about 10min."];
+nt_high_reduction_count(Config) when is_list(Config) ->
+    NodeReductions = ?erlNodeEntry ++ [?erlNodeReductions, ?NODE_ENTRY],
+
+    BumpFun = fun(F, Limit) ->
+		      case erlang:statistics(reductions) of
+			  {Total, _} when Total < Limit ->
+			      F(F, Limit);
+			  _ ->
+			      ok
+		      end
+	      end,
+
+    ok = otp_mib:update_erl_node_table(),
+
+    {noError, 0, [StartVal]} = snmp_get([NodeReductions]),
+    #varbind{variabletype = 'Counter64'} = StartVal,
+    true = is_integer(StartVal#varbind.value),
+    StartVal#varbind.value >= 0,
+    case StartVal#varbind.value =< 4294967295 of
+	true ->
+	    ok = otp_mib:update_erl_node_table(),
+	    BumpFun(BumpFun, 4294967295),
+	    {noError, 0, [EndVal]} = snmp_get([NodeReductions]),
+	    #varbind{variabletype = 'Counter64'} = EndVal,
+	    true = is_integer(EndVal#varbind.value),
+	    EndVal#varbind.value >= 4294967295,
+	    EndVal#varbind.value =< 18446744073709551615;
+	false ->
+	    %% no need to bump more reductions, since the initial get
+	    %% command already returned successfully with a large value
+	    ok
+    end.
+
+%%---------------------------------------------------------------------
+%% Internal functions
+%%---------------------------------------------------------------------
+
+snmp_get(OIdList) ->
+    ct_snmp:get_values(otp_mibs_test, OIdList, snmp_mgr_agent).
+
+del_dir(Dir) ->
+    io:format("Deleting: ~s~n",[Dir]),
+    {ok, Files} = file:list_dir(Dir),
+    FullPathFiles = lists:map(fun(File) -> filename:join(Dir, File) end, Files),
+    lists:foreach(fun file:delete/1, FullPathFiles),
+    file:del_dir(Dir).
diff --git a/lib/parsetools/doc/src/book.xml b/lib/parsetools/doc/src/book.xml
index 93a107b798..9ae9f72870 100644
--- a/lib/parsetools/doc/src/book.xml
+++ b/lib/parsetools/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/parsetools/doc/src/fascicules.xml b/lib/parsetools/doc/src/fascicules.xml
index 43090b4aed..fadd37eefb 100644
--- a/lib/parsetools/doc/src/fascicules.xml
+++ b/lib/parsetools/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/parsetools/doc/src/leex.xml b/lib/parsetools/doc/src/leex.xml
index d5c24c303d..7ee0633dac 100644
--- a/lib/parsetools/doc/src/leex.xml
+++ b/lib/parsetools/doc/src/leex.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2009</year><year>2011</year>
+      <year>2009</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -38,19 +38,21 @@ Token = tuple()</code>
   </section>
   <funcs>
     <func>
-      <name>file(FileName) -> ok | error</name>
-      <name>file(FileName, Options) -> ok | error</name>
+      <name>file(FileName, [, Options]) -> LeexRet</name>
       <fsummary>Generate a lexical analyzer</fsummary>
       <type>
         <v>FileName = filename()</v>
         <v>Options = Option | [Option]</v>
         <v>Option =&nbsp;-&nbsp;see below&nbsp;-</v>
-        <v>FileReturn = {ok, Scannerfile} 
-                      | {ok, Scannerfile, Warnings}
-                      | error
-                      | {error, Warnings, Errors}</v>
+        <v>LeexRet = {ok, Scannerfile}
+                   | {ok, Scannerfile, Warnings}
+                   | error
+                   | {error, Warnings, Errors}</v>
         <v>Scannerfile = filename()</v>
         <v>Warnings = Errors = [{filename(), [ErrorInfo]}]</v>
+        <v>ErrorInfo  = {ErrorLine, module(), Reason}</v>
+        <v>ErrorLine = integer()</v>
+        <v>Reason =&nbsp;-&nbsp;formatable by format_error/1&nbsp;-</v>
       </type>
       <desc>
         <p>Generates a lexical analyzer from the definition in the input
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index a0816dc728..929daedf74 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,41 @@
   </header>
   <p>This document describes the changes made to the Parsetools application.</p>
 
+<section><title>Parsetools 2.0.10</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> A bug causing Yecc to generate badly formed parsers
+	    when encountering very simple recursive rules has been
+	    fixed. (Thanks to Eric Pailleau.) </p>
+          <p>
+	    Own Id: OTP-11269</p>
+        </item>
+        <item>
+	    <p> A bug where Unicode filenames combined with Latin-1
+	    encoding could crash Yecc and Leex has been fixed. </p>
+          <p>
+	    Own Id: OTP-11286</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix leex module`s inability to build unicode-aware
+	    lexers. Thanks to Pierre Fenoll.</p>
+          <p>
+	    Own Id: OTP-11313</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Parsetools 2.0.9</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/parsetools/doc/src/notes_history.xml b/lib/parsetools/doc/src/notes_history.xml
index 6a63812bcb..5b8ab69e30 100644
--- a/lib/parsetools/doc/src/notes_history.xml
+++ b/lib/parsetools/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/parsetools/doc/src/part_notes.xml b/lib/parsetools/doc/src/part_notes.xml
index 308fc95e35..f7bcd22e7e 100644
--- a/lib/parsetools/doc/src/part_notes.xml
+++ b/lib/parsetools/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/parsetools/doc/src/ref_man.xml b/lib/parsetools/doc/src/ref_man.xml
index 52f1c687da..1bdca3395a 100644
--- a/lib/parsetools/doc/src/ref_man.xml
+++ b/lib/parsetools/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml
index 66bc6f4795..7298e09c2c 100644
--- a/lib/parsetools/doc/src/yecc.xml
+++ b/lib/parsetools/doc/src/yecc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -425,9 +425,9 @@ myparser:parse_and_scan({Mod, Tokenizer, Args})    </code>
 Nonterminals E T F.
 Terminals '+' '*' '(' ')' number.
 Rootsymbol E.
-E -> E '+' T: ['$2', '$1', '$3'].
+E -> E '+' T: {'$2', '$1', '$3'}.
 E -> T : '$1'.
-T -> T '*' F: ['$2', '$1', '$3'].
+T -> T '*' F: {'$2', '$1', '$3'}.
 T -> F : '$1'.
 F -> '(' E ')' : '$2'.
 F -> number : '$1'.    </code>
@@ -438,8 +438,8 @@ Terminals '+' '*' '(' ')' number.
 Rootsymbol E.
 Left 100 '+'.
 Left 200 '*'.
-E -> E '+' E : ['$2', '$1', '$3'].
-E -> E '*' E : ['$2', '$1', '$3'].
+E -> E '+' E : {'$2', '$1', '$3'}.
+E -> E '*' E : {'$2', '$1', '$3'}.
 E -> '(' E ')' : '$2'.
 E -> number : '$1'.    </code>
     <p>3. An overloaded minus operator:</p>
diff --git a/lib/parsetools/src/leex.erl b/lib/parsetools/src/leex.erl
index e531b78a5b..03f864ff03 100644
--- a/lib/parsetools/src/leex.erl
+++ b/lib/parsetools/src/leex.erl
@@ -436,7 +436,7 @@ parse_defs(_, {eof,L}, St) ->
 parse_defs(Ifile, {ok,Chars,L}=Line, Ms, St) ->
     %% This little beauty matches out a macro definition, RE's are so clear.
     MS = "^[ \t]*([A-Z_][A-Za-z0-9_]*)[ \t]*=[ \t]*([^ \t\r\n]*)[ \t\r\n]*\$",
-    case re:run(Chars, MS, [{capture,all_but_first,list}]) of
+    case re:run(Chars, MS, [{capture,all_but_first,list},unicode]) of
         {match,[Name,Def]} ->
             %%io:fwrite("~p = ~p\n", [Name,Def]),
             parse_defs(Ifile, nextline(Ifile, L, St), [{Name,Def}|Ms], St);
@@ -491,7 +491,7 @@ parse_rules_end(_, NextLine, REAs, As, St) ->
 
 collect_rule(Ifile, Chars, L0) ->
     %% Erlang strings are 1 based, but re 0 :-(
-    {match,[{St0,Len}|_]} = re:run(Chars, "[^ \t\r\n]+"),
+    {match,[{St0,Len}|_]} = re:run(Chars, "[^ \t\r\n]+", [unicode]),
     St = St0 + 1,
     %%io:fwrite("RE = ~p~n", [substr(Chars, St, Len)]),
     case collect_action(Ifile, substr(Chars, St+Len), L0, []) of
@@ -548,7 +548,7 @@ var_used(Name, Toks) ->
 %% here as it uses info in replace string (&).
 
 parse_rule_regexp(RE0, [{M,Exp}|Ms], St) ->
-    Split= re:split(RE0, "\\{" ++ M ++ "\\}", [{return,list}]),
+    Split= re:split(RE0, "\\{" ++ M ++ "\\}", [{return,list},unicode]),
     RE1 = string:join(Split, Exp),
     parse_rule_regexp(RE1, Ms, St);
 parse_rule_regexp(RE, [], St) ->
@@ -1645,10 +1645,14 @@ output_encoding_comment(File, #leex{encoding = Encoding}) ->
 
 output_file_directive(File, Filename, Line) ->
     io:fwrite(File, <<"-file(~ts, ~w).\n">>,
-              [format_filename(Filename), Line]).
+              [format_filename(Filename, File), Line]).
 
-format_filename(Filename) ->
-    io_lib:write_string(filename:flatten(Filename)).
+format_filename(Filename0, File) ->
+    Filename = filename:flatten(Filename0),
+    case lists:keyfind(encoding, 1, io:getopts(File)) of
+        {encoding, unicode} -> io_lib:write_string(Filename);
+        _ ->                   io_lib:write_string_as_latin1(Filename)
+    end.
 
 quote($^)  -> "\\^";
 quote($.)  -> "\\.";
diff --git a/lib/parsetools/src/parsetools.appup.src b/lib/parsetools/src/parsetools.appup.src
index 54a63833e6..0e02099893 100644
--- a/lib/parsetools/src/parsetools.appup.src
+++ b/lib/parsetools/src/parsetools.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, parsetools}]}],
+ [{<<".*">>,[{restart_application, parsetools}]}]
+}.
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index 53292b037a..f4657663e6 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -423,7 +423,7 @@ infile(Parent, Infilex, Options) ->
          end,
     case {St#yecc.errors, werror(St)} of
         {[], false} -> ok;
-        _ -> _ = file:delete(St#yecc.outfile)
+        _ -> _ = file:delete(St#yecc.outfile), ok
     end,
     Parent ! {self(), yecc_ret(St)}.
 
@@ -482,7 +482,7 @@ generate(St0) ->
     F = case member(time, St1#yecc.options) of
             true -> 
                 io:fwrite(<<"Generating parser from grammar in ~ts\n">>,
-                          [format_filename(St1#yecc.infile)]),
+                          [format_filename(St1#yecc.infile, St1)]),
                 fun timeit/3;
             false ->
                 fun(_Name, Fn, St) -> Fn(St) end
@@ -2106,8 +2106,8 @@ output_state_actions(St0, State, State, {Actions, Jump}, SI) ->
 output_state_actions(St, State, JState, _XActions, _SI) ->
     fwrite(St, <<"%% yeccpars2_~w: see yeccpars2_~w\n\n">>, [State, JState]).
 
-output_state_actions1(St, State, [], _IsFirst, normal, _SI) ->
-    output_state_actions_fini(State, St);
+output_state_actions1(St, State, [], IsFirst, normal, _SI) ->
+    output_state_actions_fini(State, IsFirst, St);
 output_state_actions1(St0, State, [], IsFirst, {to, ToS}, _SI) ->
     St = delim(St0, IsFirst),
     fwrite(St, 
@@ -2151,9 +2151,9 @@ output_call_to_includefile(NewState, St) ->
     fwrite(St, <<" yeccpars1(S, ~w, Ss, Stack, T, Ts, Tzr)">>, 
            [NewState]).
 
-output_state_actions_fini(State, St0) ->
+output_state_actions_fini(State, IsFirst, St0) ->
     %% Backward compatible.
-    St10 = delim(St0, false),
+    St10 = delim(St0, IsFirst),
     St = fwrite(St10, <<"yeccpars2_~w(_, _, _, _, T, _, _) ->\n">>, [State]),
     fwrite(St, <<" yeccerror(T).\n\n">>, []).
 
@@ -2519,7 +2519,7 @@ output_encoding_comment(#yecc{encoding = Encoding}=St) ->
 
 output_file_directive(St, Filename, Line) when St#yecc.file_attrs ->
     fwrite(St, <<"-file(~ts, ~w).\n">>,
-           [format_filename(Filename), Line]);
+           [format_filename(Filename, St), Line]);
 output_file_directive(St, _Filename, _Line) ->
     St.
 
@@ -2547,8 +2547,12 @@ nl(#yecc{outport = Outport, line = Line}=St) ->
     io:nl(Outport),
     St#yecc{line = Line + 1}.
 
-format_filename(Filename) ->
-    io_lib:write_string(filename:flatten(Filename)).
+format_filename(Filename0, St) ->
+    Filename = filename:flatten(Filename0),
+    case lists:keyfind(encoding, 1, io:getopts(St#yecc.outport)) of
+        {encoding, unicode} -> io_lib:write_string(Filename);
+        _ ->                   io_lib:write_string_as_latin1(Filename)
+    end.
 
 format_assoc(left) ->
     "Left";
diff --git a/lib/parsetools/test/Makefile b/lib/parsetools/test/Makefile
index 6455f6ade7..7c7cc13965 100644
--- a/lib/parsetools/test/Makefile
+++ b/lib/parsetools/test/Makefile
@@ -20,6 +20,7 @@ include $(ERL_TOP)/make/target.mk
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
 MODULES =  \
+	app_SUITE \
 	leex_SUITE \
 	yecc_SUITE
 
diff --git a/lib/parsetools/test/app_SUITE.erl b/lib/parsetools/test/app_SUITE.erl
new file mode 100644
index 0000000000..88ac95e311
--- /dev/null
+++ b/lib/parsetools/test/app_SUITE.erl
@@ -0,0 +1,50 @@
+%% ``The 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.''
+%%
+-module(app_SUITE).
+
+-compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [app, appup].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+     ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+app() ->
+    [{doc, "Test that the parsetools app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(parsetools).
+
+appup() ->
+    [{doc, "Test that the parsetools appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(parsetools).
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index afedd79a4e..eb15bebf63 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -45,7 +44,7 @@
 	 
 	 pt/1, man/1, ex/1, ex2/1, not_yet/1,
 
-         otp_10302/1]).
+         otp_10302/1, otp_11286/1, unicode/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -66,8 +65,8 @@ all() ->
 
 groups() -> 
     [{checks, [], [file, compile, syntax]},
-     {examples, [], [pt, man, ex, ex2, not_yet]},
-     {tickets, [], [otp_10302]}].
+     {examples, [], [pt, man, ex, ex2, not_yet, unicode]},
+     {tickets, [], [otp_10302, otp_11286]}].
 
 init_per_suite(Config) ->
     Config.
@@ -401,6 +400,24 @@ pt(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
+unicode(suite) ->
+    [];
+unicode(Config) when is_list(Config) ->
+    Ts = [{unicode_1, 
+	   <<"%% -*- coding: utf-8 -*-\n"
+	     "Definitions.\n"
+	     "RTLarrow    = (←)\n"
+	     "Rules.\n"
+	     "{RTLarrow}  : {token,{'<-',TokenLine}}.\n"
+	     "Erlang code.\n"
+	     "-export([t/0]).\n"
+	     "t() -> {ok, [{'<-', 1}], 1} = string(\"←\"), ok.">>,
+           default,
+           ok}],
+
+    ?line run(Config, Ts),
+    ok.
+
 man(doc) ->
     "Examples from the manpage.";
 man(suite) -> [];
@@ -983,6 +1000,68 @@ otp_10302(Config) when is_list(Config) ->
 
     ok.
 
+otp_11286(doc) ->
+    "OTP-11286. A Unicode filename bug; both Leex and Yecc.";
+otp_11286(suite) -> [];
+otp_11286(Config) when is_list(Config) ->
+    Node = start_node(otp_11286, "+fnu"),
+    Dir = ?privdir,
+    UName = [1024] ++ "u",
+    UDir = filename:join(Dir, UName),
+    ok = rpc:call(Node, file, make_dir, [UDir]),
+
+    %% Note: Cannot use UName as filename since the filename is used
+    %% as module name. To be fixed in R18.
+    Filename = filename:join(UDir, 'OTP-11286.xrl'),
+    Scannerfile = filename:join(UDir, 'OTP-11286.erl'),
+    Options = [return, {scannerfile, Scannerfile}],
+
+    Mini1 = <<"%% coding: utf-8\n"
+              "Definitions.\n"
+              "D  = [0-9]\n"
+              "Rules.\n"
+              "{L}+  : {token,{word,TokenLine,TokenChars}}.\n"
+              "Erlang code.\n">>,
+    ok = rpc:call(Node, file, write_file, [Filename, Mini1]),
+    {ok, _, []} = rpc:call(Node, leex, file, [Filename, Options]),
+    {ok,_,_} = rpc:call(Node, compile, file,
+                  [Scannerfile,[basic_validation,return]]),
+
+    Mini2 = <<"Definitions.\n"
+              "D  = [0-9]\n"
+              "Rules.\n"
+              "{L}+  : {token,{word,TokenLine,TokenChars}}.\n"
+              "Erlang code.\n">>,
+    ok = rpc:call(Node, file, write_file, [Filename, Mini2]),
+    {ok, _, []} = rpc:call(Node, leex, file, [Filename, Options]),
+    {ok,_,_} = rpc:call(Node, compile, file,
+                  [Scannerfile,[basic_validation,return]]),
+
+    Mini3 = <<"%% coding: latin-1\n"
+              "Definitions.\n"
+              "D  = [0-9]\n"
+              "Rules.\n"
+              "{L}+  : {token,{word,TokenLine,TokenChars}}.\n"
+              "Erlang code.\n">>,
+    ok = rpc:call(Node, file, write_file, [Filename, Mini3]),
+    {ok, _, []} = rpc:call(Node, leex, file, [Filename, Options]),
+    {ok,_,_} = rpc:call(Node, compile, file,
+                  [Scannerfile,[basic_validation,return]]),
+
+    true = test_server:stop_node(Node),
+    ok.
+
+start_node(Name, Args) ->
+    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    ct:log("Trying to start ~w@~s~n", [Name,Host]),
+    case test_server:start_node(Name, peer, [{args,Args}]) of
+	{error,Reason} ->
+	    test_server:fail(Reason);
+	{ok,Node} ->
+	    ct:log("Node ~p started~n", [Node]),
+	    Node
+    end.
+
 unwritable(Fname) ->
     {ok, Info} = file:read_file_info(Fname),
     Mode = Info#file_info.mode - 8#00200,
@@ -1014,7 +1093,7 @@ run_test(Config, Def, Pre) ->
     XrlFile = filename:join(DataDir, DefFile),
     ErlFile = filename:join(DataDir, Filename),
     Opts = [return, warn_unused_vars,{outdir,DataDir}],
-    ok = file:write_file(XrlFile, Def),
+    ok = file:write_file(XrlFile, Def, [{encoding, unicode}]),
     LOpts = [return, {report, false} | 
              case Pre of
                  default ->
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index 3d66a2a525..d308d21f82 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -49,7 +48,8 @@
 	 
 	 otp_5369/1, otp_6362/1, otp_7945/1, otp_8483/1, otp_8486/1,
 	 
-	 otp_7292/1, otp_7969/1, otp_8919/1, otp_10302/1]).
+	 otp_7292/1, otp_7969/1, otp_8919/1, otp_10302/1, otp_11269/1,
+         otp_11286/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -76,7 +76,8 @@ groups() ->
       [empty, prec, yeccpre, lalr, old_yecc, other_examples]},
      {bugs, [],
       [otp_5369, otp_6362, otp_7945, otp_8483, otp_8486]},
-     {improvements, [], [otp_7292, otp_7969, otp_8919, otp_10302]}].
+     {improvements, [], [otp_7292, otp_7969, otp_8919, otp_10302,
+                         otp_11269, otp_11286]}].
 
 init_per_suite(Config) ->
     Config.
@@ -1963,6 +1964,96 @@ otp_10302(Config) when is_list(Config) ->
     run(Config, Ts),
     ok.
 
+otp_11269(doc) ->
+    "OTP-11269. A bug.";
+otp_11269(suite) -> [];
+otp_11269(Config) when is_list(Config) ->
+    Dir = ?privdir,
+    Filename = filename:join(Dir, "OTP-11269.yrl"),
+    Ret = [return, {report, false}],
+    Pai = <<"Nonterminals
+             list list0 list1 newline_list.
+
+             Terminals
+             '\n' semi.
+
+             Rootsymbol  list.
+
+             Endsymbol '$end'.
+
+             list ->   newline_list list0 : '$2'.
+
+             list0 -> list1 '\n' newline_list : '$1'.
+
+             list1 -> list1 semi newline_list list1 :
+                           {command_connect, '$1', '$4', semi}.
+
+             newline_list -> newline_list '\n' : nil.">>,
+    ok = file:write_file(Filename, Pai),
+    {ok,ErlFile,[{_YrlFile,[{none,yecc,{conflicts,1,0}}]}]} =
+        yecc:file(Filename, Ret),
+    Opts = [return, warn_unused_vars,{outdir,Dir}],
+    {ok,'OTP-11269',_Warnings} = compile:file(ErlFile, Opts),
+    ok.
+
+otp_11286(doc) ->
+    "OTP-11286. A Unicode filename bug; both Leex and Yecc.";
+otp_11286(suite) -> [];
+otp_11286(Config) when is_list(Config) ->
+    Node = start_node(otp_11286, "+fnu"),
+    Dir = ?privdir,
+    UName = [1024] ++ "u",
+    UDir = filename:join(Dir, UName),
+    ok = rpc:call(Node, file, make_dir, [UDir]),
+
+    %% Note: Cannot use UName as filename since the filename is used
+    %% as module name. To be fixed in R18.
+    Filename = filename:join(UDir, 'OTP-11286.yrl'),
+    Ret = [return, {report, false}, time],
+
+    Mini1 = <<"%% coding: utf-8
+               Terminals t.
+               Nonterminals nt.
+               Rootsymbol  nt.
+               nt -> t.">>,
+    ok = rpc:call(Node, file, write_file, [Filename, Mini1]),
+    {ok,ErlFile,[]} = rpc:call(Node, yecc, file, [Filename, Ret]),
+    Opts = [return, warn_unused_vars,{outdir,Dir}],
+    {ok,_,_Warnings} = rpc:call(Node, compile, file, [ErlFile, Opts]),
+
+    Mini2 = <<"Terminals t.
+               Nonterminals nt.
+               Rootsymbol  nt.
+               nt -> t.">>,
+    ok = rpc:call(Node, file, write_file, [Filename, Mini2]),
+    {ok,ErlFile,[]} = rpc:call(Node, yecc, file, [Filename, Ret]),
+    Opts = [return, warn_unused_vars,{outdir,Dir}],
+    {ok,_,_Warnings} = rpc:call(Node, compile, file, [ErlFile, Opts]),
+
+    Mini3 = <<"%% coding: latin-1
+               Terminals t.
+               Nonterminals nt.
+               Rootsymbol  nt.
+               nt -> t.">>,
+    ok = rpc:call(Node, file, write_file, [Filename, Mini3]),
+    {ok,ErlFile,[]} = rpc:call(Node, yecc, file, [Filename, Ret]),
+    Opts = [return, warn_unused_vars,{outdir,Dir}],
+    {ok,_,_Warnings} = rpc:call(Node, compile, file, [ErlFile, Opts]),
+
+    true = test_server:stop_node(Node),
+    ok.
+
+start_node(Name, Args) ->
+    [_,Host] = string:tokens(atom_to_list(node()), "@"),
+    ct:log("Trying to start ~w@~s~n", [Name,Host]),
+    case test_server:start_node(Name, peer, [{args,Args}]) of
+	{error,Reason} ->
+	    test_server:fail(Reason);
+	{ok,Node} ->
+	    ct:log("Node ~p started~n", [Node]),
+	    Node
+    end.
+
 yeccpre_size() ->
     yeccpre_size(default_yeccpre()).
 
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index 444caf44a1..d62962c54a 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.0.9
+PARSETOOLS_VSN = 2.0.10
diff --git a/lib/percept/doc/src/book.xml b/lib/percept/doc/src/book.xml
index 4de6bc4eb1..cc86ab5a7f 100644
--- a/lib/percept/doc/src/book.xml
+++ b/lib/percept/doc/src/book.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,7 +24,7 @@
     </legalnotice>
 
     <title>Percept</title>
-    <prepared>Bj�rn-Egil Dahlberg</prepared>
+    <prepared>Björn-Egil Dahlberg</prepared>
     <docno></docno>
     <date>2007-11-02</date>
     <rev>0.5.0</rev>
diff --git a/lib/percept/doc/src/egd_ug.xmlsrc b/lib/percept/doc/src/egd_ug.xmlsrc
index d9bece7e07..a980fe0611 100644
--- a/lib/percept/doc/src/egd_ug.xmlsrc
+++ b/lib/percept/doc/src/egd_ug.xmlsrc
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,7 +24,7 @@
     </legalnotice>
 
     <title>egd</title>
-    <prepared>Bj�rn-Egil Dahlberg</prepared>
+    <prepared>Björn-Egil Dahlberg</prepared>
     <docno></docno>
     <date>2007-11-03</date>
     <rev>A</rev>
diff --git a/lib/percept/doc/src/fascicules.xml b/lib/percept/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/percept/doc/src/fascicules.xml
+++ b/lib/percept/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/percept/doc/src/notes.xml b/lib/percept/doc/src/notes.xml
index 795dd98545..3cead186c4 100644
--- a/lib/percept/doc/src/notes.xml
+++ b/lib/percept/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -32,6 +32,23 @@
   </header>
   <p>This document describes the changes made to the Percept application.</p>
 
+<section><title>Percept 0.8.8.2</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Percept 0.8.8.1</title>
 
     <section><title>Improvements and New Features</title>
@@ -295,7 +312,7 @@
       <list>
         <item>
 	    <p>Performance enhancement for the egd render engine
-	    (Thanks to Magnus Tho�ng).</p>
+	    (Thanks to Magnus Thoäng).</p>
           <p>
 	    Own Id: OTP-7616</p>
         </item>
diff --git a/lib/percept/doc/src/part.xml b/lib/percept/doc/src/part.xml
index 8053b279d5..5575eff53f 100644
--- a/lib/percept/doc/src/part.xml
+++ b/lib/percept/doc/src/part.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,7 +24,7 @@
     </legalnotice>
 
     <title>Percept User's Guide</title>
-    <prepared>Bj�rn-Egil Dahlberg</prepared>
+    <prepared>Björn-Egil Dahlberg</prepared>
     <docno></docno>
     <date>2007-11-02</date>
     <rev>0.5.0</rev>
diff --git a/lib/percept/doc/src/part_notes.xml b/lib/percept/doc/src/part_notes.xml
index 4965e67640..8e226b35cb 100644
--- a/lib/percept/doc/src/part_notes.xml
+++ b/lib/percept/doc/src/part_notes.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,7 +24,7 @@
     </legalnotice>
 
     <title>Percept Release Notes</title>
-    <prepared>Bj�rn-Egil Dahlberg</prepared>
+    <prepared>Björn-Egil Dahlberg</prepared>
     <docno></docno>
     <date>>2007-11-02</date>
     <rev></rev>
diff --git a/lib/percept/doc/src/percept_ug.xmlsrc b/lib/percept/doc/src/percept_ug.xmlsrc
index af2dfe101a..a0c5ab2c98 100644
--- a/lib/percept/doc/src/percept_ug.xmlsrc
+++ b/lib/percept/doc/src/percept_ug.xmlsrc
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -24,7 +24,7 @@
     </legalnotice>
 
     <title>Percept</title>
-    <prepared>Bj�rn-Egil Dahlberg</prepared>
+    <prepared>Björn-Egil Dahlberg</prepared>
     <docno></docno>
     <date>2007-11-02</date>
     <rev>A</rev>
diff --git a/lib/percept/doc/src/ref_man.xml b/lib/percept/doc/src/ref_man.xml
index ac82d9378c..0f2cdb696b 100644
--- a/lib/percept/doc/src/ref_man.xml
+++ b/lib/percept/doc/src/ref_man.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2007</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/percept/src/percept.appup.src b/lib/percept/src/percept.appup.src
index 4fc2852878..23e67f772f 100644
--- a/lib/percept/src/percept.appup.src
+++ b/lib/percept/src/percept.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %% 
 %% The 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,7 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-
-{"%VSN%",[],[]}.
-
+{"%VSN%",
+ [{<<".*">>,[{restart_application, percept}]}],
+ [{<<".*">>,[{restart_application, percept}]}]
+}.
diff --git a/lib/percept/test/percept_SUITE.erl b/lib/percept/test/percept_SUITE.erl
index e415d92a04..aea2462b2e 100644
--- a/lib/percept/test/percept_SUITE.erl
+++ b/lib/percept/test/percept_SUITE.erl
@@ -27,6 +27,8 @@
 
 %% Test cases
 -export([
+	app/1,
+	appup/1,
 	profile/1,
 	analyze/1,
 	analyze_dist/1,
@@ -54,7 +56,7 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [webserver, profile, analyze, analyze_dist].
+    [app, appup, webserver, profile, analyze, analyze_dist].
 
 groups() -> 
     [].
@@ -70,6 +72,14 @@ end_per_group(_GroupName, Config) ->
 %% Tests
 %%----------------------------------------------------------------------
 
+%% Test that the percept app file is ok
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(percept).
+
+%% Test that the percept appup file is ok
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(percept).
+
 webserver(suite) ->
     [];
 webserver(doc) ->
diff --git a/lib/percept/vsn.mk b/lib/percept/vsn.mk
index 2ea0341ddf..99729c11e2 100644
--- a/lib/percept/vsn.mk
+++ b/lib/percept/vsn.mk
@@ -1 +1 @@
-PERCEPT_VSN = 0.8.8.1
+PERCEPT_VSN = 0.8.8.2
diff --git a/lib/pman/AUTHORS b/lib/pman/AUTHORS
deleted file mode 100644
index 5a354526b4..0000000000
--- a/lib/pman/AUTHORS
+++ /dev/null
@@ -1,9 +0,0 @@
-pman was first implemented for the old X windows interface "pxw" by
-Claes Wikstr�m and has since then been rewritten a couple of times by
-among others Peter Olin.
-
-Original Authors and Contributors:
-
-Claes Wikstr�m
-Peter Olin
-Gunilla Arendt
\ No newline at end of file
diff --git a/lib/pman/Makefile b/lib/pman/Makefile
deleted file mode 100644
index 3600504d07..0000000000
--- a/lib/pman/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-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%
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src priv doc/src
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
-
diff --git a/lib/pman/doc/html/.gitignore b/lib/pman/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/pman/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/pman/doc/man3/.gitignore b/lib/pman/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/pman/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/pman/doc/pdf/.gitignore b/lib/pman/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/pman/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/pman/doc/src/Makefile b/lib/pman/doc/src/Makefile
deleted file mode 100644
index d9e0317f05..0000000000
--- a/lib/pman/doc/src/Makefile
+++ /dev/null
@@ -1,116 +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%
-#
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(PMAN_VSN)
-APPLICATION=pman
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = pman.xml
-
-XML_PART_FILES = part.xml part_notes.xml
-XML_CHAPTER_FILES = pman_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 = \
-	main_window.gif \
-	trace.gif \
-	options.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 += 
-
-# ----------------------------------------------------
-# 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/pman/doc/src/book.xml b/lib/pman/doc/src/book.xml
deleted file mode 100644
index 5d1d277fb7..0000000000
--- a/lib/pman/doc/src/book.xml
+++ /dev/null
@@ -1,43 +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>1997</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>Pman</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <pagetext>Pman</pagetext>
-  <preamble>
-  </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>
-</book>
-
diff --git a/lib/pman/doc/src/fascicules.xml b/lib/pman/doc/src/fascicules.xml
deleted file mode 100644
index 0678195e07..0000000000
--- a/lib/pman/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/pman/doc/src/main_window.gif b/lib/pman/doc/src/main_window.gif
deleted file mode 100644
index e12754631c..0000000000
--- a/lib/pman/doc/src/main_window.gif
+++ /dev/null
diff --git a/lib/pman/doc/src/main_window.ps b/lib/pman/doc/src/main_window.ps
deleted file mode 100644
index c66620c677..0000000000
--- a/lib/pman/doc/src/main_window.ps
+++ /dev/null
@@ -1,1573 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./main_window.tmp.eps)
-%%CreationDate: (Tue Jun 12 18:03:36 2001)
-%%BoundingBox: 0 22 377 234
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 22 377 234
-userdict begin
-%%BeginData:
-DisplayImage
-0 22
-377.000000 212.000000
-12
-757 426
-1
-0
-0
-16
-ffffff
-000000
-b24d7a
-dcadc2
-57253b
-0000ff
-d9d9d9
-c3c3c3
-bebebe
-828282
-000000
-000000
-000000
-000000
-000000
-000000
-03ff03ff03ff0311040003ff03ff03b70400031c04000301021a0400030002ff02ff02b6
-04000300021a04010301021a0400030002ff02ff02b604000300021a04010301021a0400
-030002ff02ff02b604000300021a0401030102020418030004ff04ff04b7030004170202
-040103010202040003ff03ff03e902020401030102020400030002150400030002ff02ff
-029e04000300021504000300021504000300020204010301020204000300021504000300
-02ff02ff029e040003000215040003000215040003000202040103010202040003000215
-0400030002ff02ff029e0400030002150400030002150400030002020401030102020400
-030002150400030002ff02ff029e040003000215040003000202030f0202040003000202
-0401030102020400030002150400030002ff0272000302ff022704000300021504000300
-02020300020d040002020400030002020401030102020400030002150400030002d10006
-0202000102060001020600010206000102050000020a00050225000102380001021b0004
-020d00010208000102ee0400030002150400030002020300020d04000202040003000202
-0401030102020400030002150400030002d1000102020002020100020204000202050002
-0206000202040000020900010203000102240001023800010219000102040000020c0001
-0208000102ee0400030002150400030002020300020d0400020204000300020204010301
-02020400030002150400030002d100010203000102010002020400020205000002000001
-02050002020400000208000102050001025e00010218000002070000020b000102f90400
-030002150400030002020300020d04000202040003000202040103010202040003000215
-0400030002d1000102030001020100000200000002030003020500000200000102050000
-020000010203000002030001020100010207000302040000020300030203000102000003
-020400000201000102040003020100010203000002030001020700040202000102000003
-020800040202000402040004020300000203000302010000020300040201000102000003
-020300010201000102040000020200040203000402d30400030002150400030002020300
-020d04000202040003000202040103010202040003000202030f02020400030002d10001
-020300010201000002000001020200000200000102040001020000010205000002000002
-020200000203000102010001020700010200000002040000020200010201000102020002
-020200000204000002010001020300010201000102000001020200020202000002070001
-020200010201000202020001020800010203000102020001020200010202000102020000
-020100010202000002010000020200010205000202020001020200010202000002040000
-02020000020200010201000102d7040003000208030302080400030002020300020d0400
-02020400030002020401030102020400030002020300020d040002020400030002d10001
-020200010202000002000001020200000200000102040000020200010204000002010001
-020200000207000102070001020000010202000002020001020300010201000102030001
-020200000202000102020001020300010200000002020000020000000202000002060001
-020400010200000102030001020800010202000102040001020000010204000102000000
-020200000202000102010000020100010206000102030001020200010202000102020000
-020700010201000102d704000300020803000201040002080400030002020300020d0400
-02020400030002020401030102020400030002020300020d040002020400030002d10005
-020300000201000102000000020100010203000102020001020400000202000102010000
-020700010207000102000001020200000202000102030001020100010203000102020000
-020200010202000102030001020000010201000002000000020100010206000102040001
-020000010203000102080001020200010204000102000001020400010200000002010000
-020200010202000002010001020600010203000102020001020200010202000002070001
-0201000302d504000300020803000201040002080400030002020300020d040002020400
-030002020401030102020400030002020300040e02020400030002d10001020700000201
-000102000000020100010203000102020002020300000202000202000000020700010207
-000102010000020100010202000702010001020400000201000102020001020200070200
-000102000001020000000201000002070001020400010200000102030001020800010202
-000102040001020000010204000102000000020100000201000202010001020100010206
-000102030001020200010203000002010001020400040203000302d30400030002080300
-040202080400030002020300020d04000202040003000202040103010202040003000215
-0400030002d1000102070000020100010200000002010001020300070203000002030001
-020000000207000102070001020100010200000002030001020700010204000102000000
-020300010202000102070000020000000201000102000000020700010204000102000001
-020300010208000102020001020400010200000102040001020000000201000002010000
-020000000201000002020001020600010203000102020001020300010200000002030002
-020100010205000202d20400030002150400030002020300020d04000202040003000202
-0401030102020400030002150400030002d1000102070000020200010202000102020001
-020400010203000002040002020800010205000102020001020000000203000102070001
-020400010200000002030001020200010207000002000000020200000200000002070001
-020400010200000102030001020800010202000102040001020000010204000102010000
-020000020201000202030001020600010203000102020001020300010200000002030001
-020200010206000102d20400030002150400030002020300020d04000202040003000202
-0401030102020400030002150400030002d1000102070000020200010202000102020000
-020600010202000002040002020300010203000102030001020400010205000102030000
-020100010205000102040001020300010203000002010002020200010209000102020001
-020100010203000102080001020300010202000102020001020200010202000102030000
-020700010202000002010001020300010202000102040001020400010202000102010000
-0203000102d20400030002150400030002020300020d0400020204000300020204010301
-02020400030002150400030002d100010207000002070001020100010206000102020000
-020500010203000102040005020500010207000402010001020500010204000102050004
-0201000102030001020a0004020200010203000102080001020400040204000402050003
-020900040201000102030001020200010204000102050003020000010200000502d30400
-030002150400030002020300020d04000202040003000202040103010202040003000215
-0400030002ff02ff029e0400030002150400030002020300020d04000202040003000202
-0401030102020400030002150400030002ff02ff029e0400030002150400030002020300
-040e02020400030002020401030102020400030002150400030002ff02ff029e04000300
-02150400030002150400030002020401030102020400030002150400030002ff02ff029e
-0400030002150400030002150400030002020401030102020400030002150400030002ff
-02ff029e04000300021504000300021504000300020204010300040403000416030004ff
-04ff049f030004160300041603000404030500ff00ff00e80304040003010202040000ff
-00ff00e70900030002020401030102020400000106ff06ff06e409010300020204010301
-02020400000106ff06ff06e40901030002020401030102020400000106ff06ff06e40901
-030002020401030102020400000106ff06ff06e409010300020204010301020204000001
-06ff06ff06e409010300020204010301020204000001060b01040604010006030102061f
-01000602010006040100062601040633010006020100060c010006ff06ff060201000602
-010006090102061309010300020204010301020204000001060b0100060f0100061f0100
-06020100062e01000635010106010100060c010006ff06ff0602010006020100060b0100
-061309010300020204010301020204000001060b01000606010206050100060301020618
-010006020100060201020603010206020100060201000619010006030100060001010603
-010206030102060301020618010106010100060201020603010106000100060201020603
-010206ff06f501000602010006020102060501000602010006000101060c090103000202
-04010301020204000001060b010006080100060501000602010006020100061801000600
-010006050100060201000602010006010100060201000619010006030101060101000601
-010006020100060101000602010006010100060201000617010006000100060001000601
-01000602010006010100060101010601010006020100060101000602010006ff06f40100
-060201000601010006020100060401000602010106010100060b09010300020204010301
-020204000001060b01030605010006050100060201000602010006180100060001000605
-010006020100060201000601010006000100060001000619010006030100060901000601
-010006050100060201000617010006000100060001000601010006020100060101000602
-010006010100060201000601010006ff06f8010406010100060201000604010006020100
-06020100060b09010300020204010301020204000001060b010006080100060501000602
-010406180100060001000605010006020104060101000600010006000100061901000603
-010006060103060101000605010406170100060101010601010006020100060101000602
-0100060101040602010206ff06f501000602010006010104060401000602010006020100
-060b09010300020204010301020204000001060b0100060801000605010006020100061d
-010006060100060201000605010006000100060001000619010006030100060501000602
-01000601010006050100061b010006010101060101000602010006010100060201000601
-01000609010006ff06f401000602010006010100060801000602010006020100060b0901
-0300020204010301020204000001060b0100060801000605010006020100060201000619
-010006060100060201000602010006010100060001000600010006190100060301000605
-010006020100060101000602010006010100060201000617010006020100060101000602
-010006010100060101010601010006020100060101000602010006ff06f4010006020100
-0601010006020100060401000602010106010100060b0901030002020401030102020400
-0001060b0100060801000605010006030102061a01000606010006030102060301000600
-0100061a0100060301000606010306020102060301020618010006020100060201020603
-010106000100060201020603010206ff06f5010006020100060201020605010006020100
-06000101060c0901030002020401030102020400000106ff06ff06d30100060f09010300
-020204010301020204000001060a0106062a0106062a010606ff06ff06470106060e0100
-060f09010300020204010301020204000001060a0106062a0106062a010606ff06ff0647
-0106060e0100060f0901030002020401030102020400000106ff06ff06e4090103000202
-0401030102020400000106ff06ff06e40901030002020401030102020400000106ff06ff
-06e40901030002020401030102020400000109ff09ff09e6030002020401030102020400
-000009ff09ff09e703000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e803000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e803000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e803000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e803000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e803000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e803000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e803000202040103010202040006ff06ff06e803000202040103010202
-040006ff06ff06e8030002020401030102020400060005ff05ff05d40912030002020401
-030102020400060005000849050108d50501089005010858050108670501085709110000
-030002020401030102020400060005000849050108d50501089005010858050108670501
-085709010706090007060001030002020401030102020400060005000849050108d50501
-089005010858050108670501085709010705000009000706000103000202040103010202
-040006000500080105030805050008060500083405010802050208270500080a05040818
-050008060500087405010801050008020500088905010800050008030500085105010801
-0503080d0500085205010802050208050500084a09010705000009010705000103000202
-0401030102020400060005000801050008020500080c0500083405010801050008020500
-08260500080a0500081c0500087c05010801050108010500088905010800050008030500
-085105010801050008020500080c05000852050108010500080205000850090107040001
-090107050001030002020401030102020400060005000801050008020500080205020803
-050108000500083405010801050008020500080105000802050008010500080005010802
-050008000501080305020802050008000501080205040808050008050500080205000801
-050008000501080305020802050408020502080305020802050008000501086605010801
-050108010500080205020802050108000500080305020875050108000501080105010802
-0502080305010800050008020502083d0501080105000802050008020502080305010800
-050008020502084c050108010500080605020802050408020502083c0901070400010600
-090107040001030002020401030102020400060005000801050008020500080405000802
-050008010501083405010801050008050500080205000801050108010500080105010801
-05000801050008020500080105010801050008030500080a050008050500080205000801
-050108010500080105000802050008030500080605000802050008020500080105010801
-050008650501080105000800050008000500080105000802050008010500080005000800
-050008010500080205000874050108000501080105010801050008020500080105000801
-05010801050008020500083c050108010500080205000801050008020500080105000801
-05010801050008020500084b05010802050008070500080605000801050008020500083b
-090107030001060109010704000103000202040103010202040006000500080105030805
-050008020500080205000834050108010500080505000802050008010500080505000805
-050008020500080105000802050008030500080a05030802050008020500080105000802
-050008010500080705000806050008020500080205000801050008020500086505010801
-050008000500080005000805050008010500080005000800050008010500080205000874
-050108000500080005010800050008010500080505000802050008010500084005010801
-05030802050008020500080105000802050008010500084f050108030501080505000805
-05000802050008020500083b090107030001060209010703000103000202040103010202
-040006000500080105000808050008020500080205000834050108010500080505000802
-0500080105000805050008050504080105000802050008030500080a0500080505000802
-050008010500080205000801050008070500080605000802050008020500080105000802
-050008650501080105000801050108020503080105000800050008000500080105040874
-050108000500080005010800050008020502080205000802050008020502083d05010801
-05000801050008020504080105000802050008020502084c050108050500080405000804
-050008030504083b09010702000106030901070300010300020204010301020204000600
-050008010500080805000802050008020500083405010801050008020500080105000802
-0500080105000805050008050500080505000802050008030500080a0500080505000802
-050008010500080205000801050008070500080605000802050008020500080105000802
-050008650501080105000801050108010500080205000801050008000500080005000801
-050008780501080005000803050008050500080105000802050008050500083c05010801
-05000802050008010500080505000802050008050500084b050108010500080205000804
-05000803050008040500083f090107020001060409010702000103000202040103010202
-040006000500080105000808050008020500080105010834050108010500080205000801
-05000801050108010500080505000805050008020500080105000802050008030500080a
-050008050500080105010801050008020500080105000802050008030500080605000802
-050008020500080105000802050008650501080105000802050008010500080205000801
-050008000500080005000801050008020500087405010800050008030500080105000802
-050008010500080105010801050008020500083c05010801050008020500080105000802
-050008010500080105010801050008020500084b05010801050008020500080405000802
-05000805050008020500083b090107010001060509010702000103000202040103010202
-040006000500080105000808050008030501080005000834050108020502080305010800
-050008010500080505000806050208020500080205000804050108080500080605010800
-050008010500080205000802050208050501080405000803050208020500080205000865
-050108010500080205000802050308010500080005000800050008020502087505010800
-05000803050008020502080305010800050008020502083d050108010500080205000802
-0502080305010800050008020502084c050108020502080505000802050408020502083c
-0901070100010606090107010001030002020401030102020400060005000849050108d5
-050108900501081305000843050108670501085709010700000106070901070100010300
-02020401030102020400060005000849050108d5050108900501080f0500080205000843
-050108670501085709010700000106080901070000010300020204010301020204000600
-05000849050108d5050108900501081005020844050108670501085709010001090b0700
-0001030002020401030102020400060005000849050108d5050108900501085805010867
-0501085709010000090d0001030002020401030102020400060005000849050108d50501
-08900501085805010867050108570901070e000103000202040103010202040006000500
-0849050108d5050108900501085805010867050108570901001003000202040103010202
-0400060005000849050108d5050108900501085805010867050108570901000d09000001
-030002020401030102020400060005ff05ff05d409010001060a09010001030002020401
-030102020400060001ff01ff01d409010001060a09010001030002020401030102020400
-060001000849010108d50101089001010858010108670101085709010001060a09010001
-030002020401030102020400060001000849010108d50101089001010858010108670101
-085709010001060a09010001030002020401030102020400060001000805010008230100
-081d010108440100088f0101089001010858010108670101085709010001060a09010001
-030002020401030102020400060001000804010008040101080b0101080b010108020100
-081c010108040100080c010008040100080b0102081b010008030100088a010108040100
-080c01000804010008760101080301010852010108020102080301020806010008520101
-080201020803010208020104084209010001060a09010001030002020401030102020400
-060001000803010008040100080101000809010008010100080901000801010008020100
-081b010108180100080d0100081a010008030101088a0101081801000876010108020100
-080101000851010108010100080201000801010008020100080401010852010108010100
-0802010008010100080201000801010008020100084209010001060a0901000103000202
-040103010202040006000100080201000805010008010100080901000801010008090100
-0801010008030100081a0101080201020802010008000101080301020802010408030101
-0805010008030102080301020802010008000101080501000802010008000100088a0101
-080201020802010008000101080301020802010408740101080201000801010008510101
-080101000802010008010100080701000800010008520101080101000805010008020100
-08050100084209010001060a090100010300020204010301020204000600010008010100
-080601000801010008090100080101000809010008010100080401000819010108040100
-080201010801010008040100080401000805010108050100080201000802010008010100
-0802010008010101080101000803010008050100088a0101080401000802010108010100
-080401000804010008760101080201000801010008510101080101000802010008010100
-08060100080101000852010108010100080501000802010008040100084309010001060a
-090100010300020204010301020204000600010008000100080701000801010008090100
-080101000809010008010100080501000818010108040100080201000802010008040100
-08040100080d010008020100080201000801010008020100080101000802010008030100
-08050100088a010108040100080201000802010008040100080401000876010108020100
-080101000851010108020103080101030802010008020100085201010801010308030103
-08040100084309010001060a090100010300020204010301020204000600010008010100
-080601000801010008090100080101000809010008010100080401000819010108040100
-08020100080201000804010008040100080d010008020100080201000801010008020100
-08010100080201000802010008060100088a010108040100080201000802010008040100
-080401000876010108020100080101000851010108050100080101000802010008010100
-080201000852010108010100080201000805010008040100084309010001060a09010001
-030002020401030102020400060001000802010008050100080101000809010008010100
-080901000801010008030100081a01010804010008020100080201000804010008040100
-080d01000802010008020100080101000802010008010100080201000802010008060100
-088a01010804010008020100080201000804010008040100087601010802010008010100
-085101010805010008010100080201000801010508510101080101000802010008050100
-08030100084409010001060a090100010300020204010301020204000600010008030100
-080401000801010008030101080301000801010008030101080301000801010008020100
-081b01010804010008020100080201000804010008040100080501010805010008020100
-08020100080101000802010008010101080101000801010008070100088a010108040100
-080201000802010008040100080401000876010108020100080101000851010108010100
-080201000801010008020100080501000852010108010100080201000801010008020100
-08030100084409010001060a090100010300020204010301020204000600010008040100
-080401010804010108040101080401010804010108020100081c01010804010008020100
-080201000804010008050101080301010805010008030102080301020802010008000101
-080201000805010408880101080401000802010008020100080401000805010108740101
-080301010852010108020102080301020806010008520101080201020803010208040100
-084409010001060a09010001030002020401030102020400060001000805010008230100
-081d010108390100089a0101089001010858010108670101085709010001060a09010001
-030002020401030102020400060001000849010108390100089a01010890010108580101
-08670101085709010001060a090100010300020204010301020204000600010008490101
-08390100089a0101089001010858010108670101085709010001060a0901000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001000849010108d5010108900101
-0858010108670101085709010001060a0901000103000202040103010202040006000100
-0849010108d50101089001010858010108670101085709010001060a0901000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001ff01ff01d409010001060a0901
-0001030002020401030102020400060001ff01ff01d409010001060a0901000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001000849010108d5010108900101
-0858010108670101085709010001060a0901000103000202040103010202040006000100
-0805010008230100081d0101089101000842010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001000804010008040101080a0102
-080b010108020100081c010108100102081a0100081101020814010008170102081b0100
-08010104083b010108100102081a01000811010208140100083501010803010108520101
-08020102080301020803010208030102084c010108030100080401020803010208060100
-083b09010001060a09010001030002020401030102020400060001000803010008040100
-080101000808010008020100080901000801010008020100081b010108120100082f0100
-0814010008190100081a010008020100083f010108120100082f01000814010008350101
-080201000801010008510101080101000802010008010100080201000801010008020100
-0801010008020100084b0101080201010803010008020100080101000802010008040101
-083b09010001060a09010001030002020401030102020400060001000802010008050100
-08010100080c0100080901000801010008030100081a0101080201020802010008000101
-0805010008090100080001010802010008000101080301020802010108000100080c0100
-080301020803010208030101080001000802010208020100080001010804010108050100
-080301020803010208020100080001010805010008020100083f01010802010208020100
-080001010805010008090100080001010802010008000101080301020802010108000100
-080c01000803010208030102080301010800010008020102080201000800010108280101
-0802010008010100085101010801010008020100080101000809010008050100084b0101
-08010100080001000803010008050100080201000803010008000100083b09010001060a
-0901000103000202040103010202040006000100080101000806010008010100080c0100
-080901000801010008040100081901010801010008020100080101010801010008040100
-0809010108010100080101010801010008040100080201000800010008000100080b0100
-080201000802010008010100080201000801010008010101080101000802010008010101
-080101000803010108050100080201000802010008010100080201000801010108010100
-0803010008030103083c0101080101000802010008010101080101000804010008090101
-08010100080101010801010008040100080201000800010008000100080b010008020100
-080201000801010008020100080101000801010108010100080201000801010108010100
-082701010802010008010100085101010801010008020100080101000809010008050100
-084b0101080301000803010008050100080201000802010008010100083b09010001060a
-0901000103000202040103010202040006000100080001000807010008010100080b0100
-080a01000801010008050100081801010801010008020100080101000808010008090100
-080201000801010008080100080201000800010008000100080b01000802010008020100
-080501000801010008020100080101000802010008010100080f01000802010008020100
-080101000802010008010100080201000803010008070100083b01010801010008020100
-080101000808010008090100080201000801010008080100080201000800010008000100
-080b01000802010008020100080501000801010008020100080101000802010008010100
-082b010108020100080101000851010108020102080201030805010008050100084c0101
-0803010008030103080301020802010008020100083b09010001060a0901000103000202
-040103010202040006000100080101000806010008010100080a0100080b010008010100
-080401000819010108010104080101000808010008090100080201000801010008080100
-080201000800010008000100080b01000802010008020100080201030801010008020100
-0801010408010100080f0100080201000802010008010100080201000801010008020100
-0802010008080100083b0101080101040801010008080100080901000802010008010100
-08080100080201000800010008000100080b010008020100080201000802010308010100
-080201000801010408010100082b01010802010008010100085101010801010008020100
-08010100080201000803010008050100084d010108030100080301000802010008010100
-080201000801010008020100083b09010001060a09010001030002020401030102020400
-0600010008020100080501000801010008090100080c01000801010008030100081a0101
-080101000805010008080100080901000802010008010100080801000802010008000100
-08000100080b010008020100080201000801010008020100080101000802010008010100
-08050100080f010008020100080201000801010008020100080101000802010008020100
-0804010008020100083b0101080101000805010008080100080901000802010008010100
-08080100080201000800010008000100080b010008020100080201000801010008020100
-08010100080201000801010008050100082b010108020100080101000851010108010100
-0802010008010100080201000802010008050100084e0101080301000803010008020100
-080101000802010008010105083a09010001060a09010001030002020401030102020400
-060001000803010008040100080101000803010108020100080701010803010008010100
-08020100081b010108010100080201000801010008080100080901010801010008010100
-08080100080201000800010008000100080b010008020100080201000801010008020100
-080101000801010108010100080201000801010008070101080501000802010008020100
-08010100080201000801010108010100080101000805010008020100083b010108010100
-080201000801010008080100080901010801010008010100080801000802010008000100
-08000100080b010008020100080201000801010008020100080101000801010108010100
-0802010008010100082b0101080201000801010008510101080101000802010008010100
-080201000801010008050100084f01010803010008030100080201000801010008020100
-08050100083b09010001060a090100010300020204010301020204000600010008040100
-080401010804010108020104080301010804010108020100081c01010802010208020100
-0808010008090100080001010802010008080100080201000800010008000100080b0100
-080301020803010308020101080001000802010208020100080701010805010008030102
-0803010208020100080001010802010008060102083c0101080201020802010008080100
-08090100080001010802010008080100080201000800010008000100080b010008030102
-0803010308020101080001000802010208020100082b0101080301010852010108020102
-080301020802010408010104084b010108010104080201020803010208060100083b0901
-0001060a09010001030002020401030102020400060001000805010008230100081d0101
-08150105080101000819010508470100084d010108150105080101000819010508510101
-0858010108670101085709010001060a0901000103000202040103010202040006000100
-08490101081d010008670100084d0101081d010008710101085801010867010108570901
-0001060a090100010300020204010301020204000600010008490101081d010008670100
-084d0101081d0100087101010858010108670101085709010001060a0901000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001000849010108d5010108900101
-0858010108670101085709010001060a0901000103000202040103010202040006000100
-0849010108d50101089001010858010108670101085709010001060a0901000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001ff01ff01d409010001060a0901
-0001030002020401030102020400060001ff01ff01d409010001060a0901000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001000849010108d5010108900101
-0858010108670101085709010001060a0901000103000202040103010202040006000100
-0805010008230100081d010108670100086c010108900101085801010867010108570901
-0001060a09010001030002020401030102020400060001000804010008040101080d0100
-080a010108020100081c0101083b0100080b0102081b01000805010008650101082c0102
-086001010803010108520101080301000804010208030102085301010801010408030100
-08040102084309010001060a090100010300020204010301020204000600010008030100
-0804010008010100080b0101080901000801010008020100081b0101083b0100080d0100
-081a01000805010108650101082e01000860010108020100080101000851010108020101
-080301000802010008010100080201000852010108010100080601010803010008020100
-084209010001060a09010001030002020401030102020400060001000802010008050100
-08010100080a010008000100080901000801010008030100081a01010802010108000100
-080201020802010008000101080a01020802010008020100080201020802010008000101
-080201040803010108050100080301020803010208020100080001010805010008040100
-080001000865010108020102080201000800010108020100080001010803010208020100
-08000101080c010008030102080301010800010008020101080001000802010208020100
-08000101083d010108020100080101000851010108010100080001000803010008090100
-085201010801010008050100080001000803010008020100084209010001060a09010001
-030002020401030102020400060001000801010008060100080101000809010008010100
-080901000801010008040100081901010801010008010101080101000802010008010101
-080101000808010008020100080101000802010008010100080201000801010108010100
-080301000805010108050100080201000802010008010100080201000801010108010100
-080301000804010008010100086501010801010008020100080101010801010008010101
-0801010008010100080201000801010108010100080b0100080201000802010008010100
-08010101080101000801010108010100080201000801010108010100083c010108020100
-080101000851010108030100080301000809010008520101080101030804010008030100
-08020100084209010001060a090100010300020204010301020204000600010008000100
-080701000801010008080100080201000809010008010100080501000818010108010100
-080201000801010008020100080101000802010008080100080201000801010008020100
-0801010008020100080101000802010008030100080d0100080201000802010008010100
-080201000801010008020100080301000803010008020100086501010801010008020100
-0801010008050100080501000802010008010100080f0100080201000802010008010100
-080201000801010008020100080101000802010008010100084001010802010008010100
-085101010803010008030103080501000853010108050100080301000804010308420901
-0001060a0901000103000202040103010202040006000100080101000806010008010100
-080801000802010008090100080101000804010008190101080101000802010008010104
-080101000802010008080104080201000800010008020104080101000802010008030100
-080d01000802010008020100080101000802010008010100080201000802010008040100
-0802010008650101080101040801010008050100080501000802010008010100080f0100
-080201000802010008010100080201000801010008020100080101040801010008400101
-080201000801010008510101080301000803010008020100080301000854010108050100
-0803010008070100084209010001060a0901000103000202040103010202040006000100
-08020100080501000801010008080105080801000801010008030100081a010108010100
-080201000801010008050100080201000808010008060100080001000802010008050100
-0802010008030100080d0100080201000802010008010100080201000801010008020100
-080201000804010508640101080101000805010008050100080501000802010008010100
-080f01000802010008020100080101000802010008010100080201000801010008050100
-084001010802010008010100085101010803010008030100080201000802010008550101
-08010100080201000803010008070100084209010001060a090100010300020204010301
-020204000600010008030100080401000801010008030101080601000803010108030100
-0801010008020100081b0101080101000801010108010100080201000801010008020100
-080801000802010008030100080301000802010008010100080201000803010008050101
-080501000802010008020100080101000802010008010101080101000801010008090100
-0865010108010100080201000801010008050100080501000802010008010100080f0100
-080201000802010008010100080101010801010008010101080101000802010008010100
-084001010802010008010100085101010803010008030100080201000801010008560101
-0801010008020100080301000803010008020100084209010001060a0901000103000202
-040103010202040006000100080401000804010108040101080601000803010108040101
-08020100081c010108020101080001000802010208020100080201000809010208040100
-080401020802010008020100080401010803010108050100080301020803010208020100
-080001010802010008090100086501010802010208020100080501000806010208020100
-080f01000803010208030101080001000802010108000100080201020802010008400101
-080301010852010108010104080201020802010408520101080201020802010408020102
-084309010001060a09010001030002020401030102020400060001000805010008230100
-081d010108050100080e01050840010008770101082301050813010008050100084a0101
-0858010108670101085709010001060a0901000103000202040103010202040006000100
-084901010801010008020100085501000877010108390100080201000801010008020100
-084a01010858010108670101085709010001060a09010001030002020401030102020400
-0600010008490101080201020856010008770101083a010208030102084b010108580101
-08670101085709010001060a090100010300020204010301020204000600010008490101
-08d50101089001010858010108670101085709010001060a090100010300020204010301
-02020400060001000849010108d50101089001010858010108670101085709010001060a
-09010001030002020401030102020400060001000849010108d501010890010108580101
-08670101085709010001060a090100010300020204010301020204000600010008490101
-08d50101089001010858010108670101085709010001060a090100010300020204010301
-02020400060001ff01ff01d409010001060a090100010300020204010301020204000600
-00ff00ff00d409010001060a090100010300020204010301020204000600000008490001
-08d50001089000010858000108670001085709010001060a090100010300020204010301
-02020400060000000849000108d50001089000010858000108670001085709010001060a
-09010001030002020401030102020400060000000805000008230000081d0001086e0000
-08650001089000010858000108670001085709010001060a090100010300020204010301
-0202040006000000080400000804000108090004080a000108020000081c0001084f0002
-081b000008020002085f000108170002080500000812000008060000082e000008120002
-080300020805000108030001085200010805000008020002080400010853000108030000
-080400020803000208060000083b09010001060a09010001030002020401030102020400
-0600000008030000080400000801000008080000080d00000801000008020000081b0001
-08510000081a00000802000008020000085e000108190000081900000836000008140000
-080500000805000108020000080100000851000108040001080100000802000008020000
-0801000008520001080200010803000008020000080100000802000008040001083b0901
-0001060a0901000103000202040103010202040006000000080200000805000008010000
-08080000080d00000801000008030000081a000108020001080000000802000208020000
-08000001080a000208030002080200000800000108020000080200000802000208020000
-080000010804000108050000080300020803000208020000080000010805000008020000
-086200010802000208020000080000010802000008000001080500000803000208030002
-080300020802000408020002080300020802000008000001080a00020803000208020000
-080000010802000408010000080000010803000208050000080500000803000308020000
-080100000851000108030000080000000805000008020000080100000852000108010000
-080000000803000008050000080200000803000008000000083b09010001060a09010001
-0300020204010301020204000600000008010000080600000801000008080003080a0000
-080100000804000008190001080100000801000108010000080200000801000108010000
-080800000802000008010000080200000801000108010000080100000802000008010000
-080200000801000108010000080300010805000008020000080200000801000008020000
-080100010801000008030000080300000862000108010000080200000801000108010000
-080100010801000008040000080500000802000008020000080100000802000008030000
-080600000802000008020000080100010801000008080000080200000801000008020000
-080100010801000008030000080300010801000008010000080200000804000008050000
-080200000801000108020000080100000851000108020000080100000805000008020000
-0801000008520001080300000803000008050000080200000802000008010000083b0901
-0001060a0901000103000202040103010202040006000000080000000807000008010000
-080c00000809000008010000080500000818000108010000080200000801000008020000
-080100000802000008080000080500000802000008010000080500000802000008010000
-0802000008010000080f0000080200000802000008010000080200000801000008020000
-0803000008030003085f0001080500000801000008020000080100000802000008040000
-080500000802000008090000080300000806000008020000080200000801000008020000
-080800000805000008020000080100000802000008030000080300000805000008020000
-080400000805000008020000080100010802000008010000085100010801000008020000
-080300010803000008010000085200010803000008030003080300020802000008020000
-083b09010001060a09010001030002020401030102020400060000000801000008060000
-08010000080c000008090000080100000804000008190001080100000802000008010004
-080100000802000008090002080200040801000008060000080000000802000408010000
-080f00000802000008020000080100000802000008010000080200000802000008040000
-08020000085e000108020003080100000802000008010000080200000804000008050000
-080200000806000308030000080600000802000008020000080100000802000008080000
-080500000802000008010000080200000803000008030000080500000802000008040000
-080500000802000408020000080100000851000108010000080200000805000008020000
-080100000852000108030000080300000802000008010000080200000801000008020000
-083b09010001060a09010001030002020401030102020400060000000802000008050000
-080100000808000008020000080900000801000008030000081a00010801000008020000
-080100000805000008020000080c00000801000008050000080600000800000008020000
-08050000080f000008020000080200000801000008020000080100000802000008020000
-0804000008020000085e0001080100000802000008010000080200000801000008020000
-080400000805000008020000080500000802000008030000080600000802000008020000
-080100000802000008080000080500000802000008010000080200000803000008030000
-080500000802000008040000080500000802000008010001080200000801000008510001
-080100050804000008020000080100000852000108030000080300000802000008010000
-0802000008010005083a09010001060a0901000103000202040103010202040006000000
-080300000804000008010000080300010802000008020000080300010803000008010000
-08020000081b000108010000080100010801000008020000080100000802000008080000
-080200000801000008020000080100000807000008030000080200000801000008070001
-080500000802000008020000080100000802000008010001080100000801000008050000
-08020000085e000108010000080200000801000108010000080100010801000008040000
-080500000802000008020000080100000802000008030000080600000802000008020000
-080100000802000008080000080200000801000008020000080100000802000008030000
-080300000805000008020000080400000805000008020000080100010802000008010000
-085100010805000008010000080200000802000008010000085200010803000008030000
-08020000080100000802000008050000083b09010001060a090100010300020204010301
-020204000600000008040000080400010804000108030002080400010804000108020000
-081c00010802000108000000080200020802000008020000080900020803000208020000
-080700000804000208020000080700010805000008030002080300020802000008000001
-0802000008060002085f0001080200030801000008000001080200000800000108050000
-080500000803000208030003080400010804000008030002080200000802000008090002
-080300020802000008020000080400010801000008060002080500000805000008030003
-080300010852000108050000080200020804000108530001080100040802000208030002
-08060000083b09010001060a090100010300020204010301020204000600000008050000
-08230000081d000108050000080e000508470000087000010808000008050000083c0005
-083c00010858000108670001085709010001060a09010001030002020401030102020400
-06000000084900010801000008020000085c0000087000010808000008050000087f0001
-0858000108670001085709010001060a0901000103000202040103010202040006000000
-0849000108020002085d0000087000010808000008050000087f00010858000108670001
-085709010001060a09010001030002020401030102020400060000000849000108d50001
-089000010858000108670001085709010001060a09010001030002020401030102020400
-060000000849000108d50001089000010858000108670001085709010001060a09010001
-030002020401030102020400060000000849000108d50001089000010858000108670001
-085709010001060a09010001030002020401030102020400060000000849000108d50001
-089000010858000108670001085709010001060a09010001030002020401030102020400
-060000ff00ff00d409010001060a09010001030002020401030102020400060001ff01ff
-01d409010001060a09010001030002020401030102020400060001000849010108d50101
-089001010858010108670101085709010001060a09010001030002020401030102020400
-060001000849010108d50101089001010858010108670101085709010001060a09010001
-030002020401030102020400060001000805010008230100081d010108c90100080a0101
-089001010858010108670101085709010001060a09010001030002020401030102020400
-060001000804010008040101080a0102080b010108020100081c01010817010208050100
-0812010008060100082e01000829010008110102081b0100080201020804010108900101
-08030101085201010803010008040102085a010108020102080301020804010108430901
-0001060a0901000103000202040103010202040006000100080301000804010008010100
-0808010008020100080901000801010008020100081b0101081901000819010008360100
-083e0100081a010008020100080201000803010108900101080201000801010008510101
-080201010803010008020100085901010801010008020100080101000802010008020100
-08010100084209010001060a090100010300020204010301020204000600010008020100
-080501000801010008080100080d01000801010008030100081a01010802010208020100
-080001010802010008000101080501000803010208030102080301020802010408020102
-080301020802010008000101080901010800010008030102080301020802010408020102
-080201000800010108040101080201010800010008030102080301020802010008000101
-080c01000803010208030102080201000800010108050100080601000803010108900101
-080201000801010008510101080101000800010008070100085901010805010008050100
-0802010008010100084209010001060a0901000103000202040103010202040006000100
-08010100080601000801010008080100080d010008010100080401000819010108010100
-080201000801010108010100080101010801010008040100080501000802010008020100
-080101000802010008030100080601000802010008020100080101010801010008080100
-080001000800010008010100080201000801010008020100080301000803010008020100
-080101010801010008030101080201000800010008000100080101000802010008040100
-0802010108010100080b0100080201000802010008010100080201000801010108010100
-080301000807010008030101089001010802010008010100085101010803010008070100
-0859010108050100080501000802010008010100084209010001060a0901000103000202
-04010301020204000600010008000100080701000801010008080103080a010008010100
-080501000818010108050100080101000802010008010100080201000804010008050100
-080201000809010008030100080601000802010008020100080101000802010008080100
-0800010008000100080501000801010008070100080301000802010008010100080c0100
-080001000800010008050100080401000802010008020100080b01000802010008020100
-080101000802010008010100080201000803010008060100080401010890010108020100
-08010100085101010803010008060100085a010108030101080501000803010008010100
-084209010001060a09010001030002020401030102020400060001000801010008060100
-080101000808010008020100080901000801010008040100081901010802010308010100
-080201000801010008020100080401000805010008020100080601030803010008060100
-080201000802010008010100080201000808010008000100080001000802010308020102
-080401000803010408010100080c01000800010008000100080201030804010008020100
-08020100080b010008020100080201000801010008020100080101000802010008020100
-0806010008050101089001010802010008010100085101010803010008050100085b0101
-08050100080301000804010008010100084209010001060a090100010300020204010301
-020204000600010008020100080501000801010008080100080201000809010008010100
-08030100081a010108010100080201000801010008020100080101000802010008040100
-080501000802010008050100080201000803010008060100080201000802010008010100
-080201000808010008000100080001000801010008020100080501000803010008030100
-08050100080c010008000100080001000801010008020100080401000802010008020100
-080b01000802010008020100080101000802010008010100080201000802010008050100
-08060101089001010802010008010100085101010803010008040100085c010108050100
-080201000805010008010100084209010001060a09010001030002020401030102020400
-060001000803010008040100080101000803010108020100080201000803010108030100
-0801010008020100081b0101080101000802010008010101080101000801010108010100
-080401000805010008020100080201000801010008020100080301000806010008020100
-080201000801010008020100080801000800010008000100080101000802010008010100
-080201000803010008030100080201000801010008070101080201000800010008000100
-0801010008020100080401000802010008020100080b0100080201000802010008010100
-080201000801010108010100080101000805010008070101089001010802010008010100
-085101010803010008030100085d01010801010008020100080101000806010008010100
-084209010001060a09010001030002020401030102020400060001000804010008040101
-0804010108030102080401010804010108020100081c0101080201030801010008000101
-080201000800010108050100080501000803010208030103080401010804010008030102
-080201000802010008080100080001000800010008020103080201020805010108020102
-080201000807010108020100080001000800010008020103080401000802010008020100
-080b01000803010208030102080201000800010108020100080501040803010108900101
-080301010852010108010104080101040859010108020102080201040803010108430901
-0001060a09010001030002020401030102020400060001000805010008230100081d0101
-0808010008050100083c0105084d01050816010008150101089001010858010108670101
-085709010001060a09010001030002020401030102020400060001000849010108080100
-0805010008ad010008150101089001010858010108670101085709010001060a09010001
-0300020204010301020204000600010008490101080801000805010008ad010008150101
-089001010858010108670101085709010001060a09010001030002020401030102020400
-060001000849010108d50101089001010858010108670101085709010001060a09010001
-030002020401030102020400060001000849010108d50101089001010858010108670101
-085709010001060a09010001030002020401030102020400060001000849010108d50101
-089001010858010108670101085709010001060a09010001030002020401030102020400
-060001000849010108d50101089001010858010108670101085709010001060a09010001
-030002020401030102020400060001ff01ff01d409010001060a09010001030002020401
-030102020400060001ff01ff01d409010001060a09010001030002020401030102020400
-060001000849010108d50101089001010858010108670101085709010001060a09010001
-030002020401030102020400060001000849010108d50101089001010858010108670101
-085709010001060a09010001030002020401030102020400060001000805010008230100
-081d010108bb010008180101089001010858010108670101085709010001060a09010001
-03000202040103010202040006000100080401000804010108090104080a010108020100
-081c010108170102080501000812010008060100082e0100081901020821010008040100
-0807010008050100081101010890010108030101085201010805010008020102085a0101
-080201020803010208030102084309010001060a09010001030002020401030102020400
-060001000803010008040100080101000808010008020100080901000801010008020100
-081b0101081901000819010008360100081b010008270100080601000805010108110101
-089001010802010008010100085101010804010108010100080201000859010108010100
-0802010008010100080201000801010008020100084209010001060a0901000103000202
-040103010202040006000100080201000805010008010100080c01000809010008010100
-08030100081a010108020102080201000800010108020100080001010805010008030102
-080301020803010208020104080201020803010208020100080001010809010108000100
-080301020803010208020104080201020802010008000101080401010805010008030102
-080301020802010008000101080a01020802010408040100080401000800010008110101
-089001010802010008010100085101010803010008000100080501000859010108050100
-080101000802010008010100084609010001060a09010001030002020401030102020400
-06000100080101000806010008010100080b0100080a0100080101000804010008190101
-080101000802010008010101080101000801010108010100080401000805010008020100
-080201000801010008020100080301000806010008020100080201000801010108010100
-080801000800010008000100080101000802010008010100080201000803010008030100
-080201000801010108010100080301010805010008020100080201000801010008020100
-0801010108010100080b0100080401000805010008040100080101000811010108900101
-080201000801010008510101080201000801010008050100085901010805010008010100
-0802010008010100084609010001090c0001030002020401030102020400060001000800
-01000807010008010100080b0100080a0100080101000805010008180101080501000801
-010008020100080101000802010008040100080501000802010008090100080301000806
-010008020100080201000801010008020100080801000800010008000100080501000801
-010008070100080301000802010008010100080f01000802010008020100080101000802
-01000801010008020100080b010008040100080501000803010008020100081101010890
-0101080201000801010008510101080101000802010008040100085a0101080401000803
-010208020103084309010000090d00010300020204010301020204000600010008010100
-0806010008010100080b0100080a01000801010008040100081901010802010308010100
-080201000801010008020100080401000805010008020100080601030803010008060100
-080201000802010008010100080201000808010008000100080001000802010308020102
-080401000803010408010100080f01000802010008020100080101000802010008010100
-08020100080b010008040100080401000804010008020100081101010890010108020100
-0801010008510101080101000802010008030100085b0101080301000803010008020100
-080101000802010008420901070e00010300020204010301020204000600010008020100
-0805010008010100080a0100080b01000801010008030100081a01010801010008020100
-080101000802010008010100080201000804010008050100080201000805010008020100
-080301000806010008020100080201000801010008020100080801000800010008000100
-080101000802010008050100080301000803010008050100080f01000802010008020100
-08010100080201000801010008020100080b010008040100080401000804010508100101
-089001010802010008010100085101010801010508010100085c01010802010008040100
-08020100080101000802010008420901070e000103000202040103010202040006000100
-080301000804010008010100080301010804010008050101080301000801010008020100
-081b01010801010008020100080101010801010008010101080101000804010008050100
-080201000802010008010100080201000803010008060100080201000802010008010100
-080201000808010008000100080001000801010008020100080101000802010008030100
-080301000802010008010100080701010805010008020100080201000801010008020100
-0801010108010100080b0100080401000803010008090100081101010890010108020100
-08010100085101010805010008010100085d010108010100080501000802010008010100
-0802010008420901070e0001030002020401030102020400060001000804010008040101
-0804010108040100080501010804010108020100081c0101080201030801010008000101
-080201000800010108050100080501000803010208030103080401010804010008030102
-080201000802010008080100080001000800010008020103080201020805010108020102
-08020100080701010805010008030102080301020802010008000101080c010008050101
-080101000809010008110101089001010803010108520101080501000801010408590101
-08010104080201020803010208430901070e000103000202040103010202040006000100
-0805010008230100081d01010808010008050100083c01050847010008040105082d0101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-084901010808010008050100088a01000838010108900101085801010867010108570901
-070e000103000202040103010202040006000100084901010808010008050100088a0100
-0838010108900101085801010867010108570901070e0001030002020401030102020400
-060001000849010108d5010108900101085801010867010108570901070e000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-070e0001030002020401030102020400060001000849010108d501010890010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108d50101
-08900101085801010867010108570901070e0001030002020401030102020400060001ff
-01ff01d40901070e0001030002020401030102020400060001ff01ff01d40901070e0001
-030002020401030102020400060001000849010108d50101089001010858010108670101
-08570901070e0001030002020401030102020400060001000849010108d5010108900101
-085801010867010108570901070e00010300020204010301020204000600010008050100
-08230100081d0101086e01000865010108900101085801010867010108570901070e0001
-030002020401030102020400060001000804010008040101080a0102080b010108020100
-081c0101084f0102081b010008020102085f010108010100082201020867010108030101
-085201010801010408030101080601000852010108030100080401020803010208060100
-083b0901070e000103000202040103010202040006000100080301000804010008010100
-0808010008020100080901000801010008020100081b010108510100081a010008020100
-08020100085e010108010100082401000867010108020100080101000851010108010100
-080601000801010008040101085201010802010108030100080201000801010008020100
-08040101083b0901070e0001030002020401030102020400060001000802010008050100
-080101000808010008020100080901000801010008030100081a01010802010108000100
-080201020802010008000101080a01020803010208020100080001010802010008020100
-080201020802010008000101080401010805010008030102080301020802010008000101
-080501000802010008620101080101000801010008030102080201000800010108020100
-080001010803010208050100080a010208020100080201000801010008000101084b0101
-080201000801010008510101080101000806010008010100080301000800010008520101
-08010100080001000803010008050100080201000803010008000100083b0901070e0001
-030002020401030102020400060001000801010008060100080101000808010008020100
-080901000801010008040100081901010801010008010101080101000802010008010101
-080101000808010008020100080101000802010008010101080101000801010008020100
-080101000802010008010101080101000803010108050100080201000802010008010100
-080201000801010108010100080301000803010008620101080101000800010008030100
-080201000801010108010100080101010801010008010100080201000804010008090100
-0802010008010100080201000801010108010100084a0101080201000801010008510101
-080101030803010008010100080201000801010008520101080301000803010008050100
-080201000802010008010100083b0901070e000103000202040103010202040006000100
-08000100080701000801010008090102080a010008010100080501000818010108010100
-080201000801010008020100080101000802010008080100080501000802010008010100
-0805010008020100080101000802010008010100080f0100080201000802010008010100
-0802010008010100080201000803010008030103085f0101080101010804010008020100
-080101000805010008020100080101000802010008040100080901000805010008020100
-0801010008020100084a0101080201000801010008510101080501000802010008010100
-0801010008020100085201010803010008030103080301020802010008020100083b0901
-070e00010300020204010301020204000600010008010100080601000801010008080100
-080201000809010008010100080401000819010108010100080201000801010408010100
-0802010008090102080201040801010008060100080001000802010408010100080f0100
-080201000802010008010100080201000801010008020100080201000804010008020100
-085e010108010101080401040801010008050100080201000801010408040100080a0102
-08020100080201000801010008020100084a010108020100080101000851010108050100
-080201000801010008010100080201000852010108030100080301000802010008010100
-080201000801010008020100083b0901070e000103000202040103010202040006000100
-0802010008050100080101000808010008020100080901000801010008030100081a0101
-0801010008020100080101000805010008020100080c0100080101000805010008060100
-080001000802010008050100080f01000802010008020100080101000802010008010100
-08020100080201000804010008020100085e010108010100080001000803010008050100
-08050100080201000801010008080100080d010008010100080201000801010008020100
-084a01010802010008010100085101010801010008020100080201000801010008010105
-08510101080301000803010008020100080101000802010008010105083a0901070e0001
-030002020401030102020400060001000803010008040100080101000803010108020100
-0802010008030101080301000801010008020100081b0101080101000801010108010100
-080201000801010008020100080801000802010008010100080201000801010008070100
-080301000802010008010100080701010805010008020100080201000801010008020100
-0801010108010100080101000805010008020100085e0101080101000801010008020100
-080201000801010008050100080201000801010008020100080401000809010008020100
-08010100080101010801010108010100084a010108020100080101000851010108010100
-080201000802010008010100080501000852010108030100080301000802010008010100
-0802010008050100083b0901070e00010300020204010301020204000600010008040100
-080401010804010108030102080401010804010108020100081c01010802010108000100
-080201020802010008020100080901020803010208020100080701000804010208020100
-0807010108050100080301020803010208020100080001010802010008060102085f0101
-0801010008020100080201020802010008050100080201000802010208050100080a0102
-08030101080001000801010008000101084b010108030101085201010802010208040101
-080601000852010108010104080201020803010208060100083b0901070e000103000202
-0401030102020400060001000805010008230100081d010108050100080e010508470100
-08700101082a0105080f0100084e0101085801010867010108570901070e000103000202
-040103010202040006000100084901010801010008020100085c01000870010108400100
-084e0101085801010867010108570901070e000103000202040103010202040006000100
-0849010108020102085d01000870010108400100084e0101085801010867010108570901
-070e0001030002020401030102020400060001000849010108d501010890010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108d50101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-0849010108d5010108900101085801010867010108570901070e00010300020204010301
-02020400060001000849010108d5010108900101085801010867010108570901070e0001
-030002020401030102020400060001ff01ff01d40901070e000103000202040103010202
-0400060001ff01ff01d40901070e00010300020204010301020204000600010008490101
-08d5010108900101085801010867010108570901070e0001030002020401030102020400
-060001000849010108d5010108900101085801010867010108570901070e000103000202
-0401030102020400060001000805010008230100081d0101086e01000865010108900101
-085801010867010108570901070e00010300020204010301020204000600010008040100
-08040101080a0102080b010108020100081c0101084f0102081b010008020102085f0101
-0890010108030101085201010802010208030102085a0101080201020803010208030102
-08430901070e000103000202040103010202040006000100080301000804010008010100
-0808010008020100080901000801010008020100081b010108510100081a010008020100
-08020100085e010108900101080201000801010008510101080101000802010008010100
-080201000859010108010100080201000801010008020100080101000802010008420901
-070e00010300020204010301020204000600010008020100080501000801010008080100
-08020100080901000801010008030100081a010108020101080001000802010208020100
-08000101080a010208030102080201000800010108020100080201000802010208020100
-080001010804010108050100080301020803010208020100080001010805010008020100
-086201010801010008000101080301020802010008020100087b01010802010008010100
-085101010805010008050100085901010805010008010100080201000801010008460901
-070e00010300020204010301020204000600010008010100080601000801010008080100
-080201000809010008010100080401000819010108010100080101010801010008020100
-080101010801010008080100080201000801010008020100080101010801010008010100
-080201000801010008020100080101010801010008030101080501000802010008020100
-080101000802010008010101080101000803010008030100086201010801010108010100
-08010100080201000801010008020100087b010108020100080101000851010108050100
-08050100085901010805010008010100080201000801010008460901070e000103000202
-040103010202040006000100080001000807010008010100080901030809010008010100
-080501000818010108010100080201000801010008020100080101000802010008080100
-0805010008020100080101000805010008020100080101000802010008010100080f0100
-0802010008020100080101000802010008010100080201000803010008030103085f0101
-0801010008050100080201000802010008000100087c0101080201000801010008510101
-0804010008050100085a010108040100080301020802010308430901070e000103000202
-040103010202040006000100080101000806010008010100080c01000809010008010100
-080401000819010108010100080201000801010408010100080201000809010208020104
-0801010008060100080001000802010408010100080f0100080201000802010008010100
-080201000801010008020100080201000804010008020100085e01010801010008050104
-08030100087d01010802010008010100085101010803010008050100085b010108030100
-0803010008020100080101000802010008420901070e0001030002020401030102020400
-06000100080201000805010008010100080c0100080901000801010008030100081a0101
-0801010008020100080101000805010008020100080c0100080101000805010008060100
-080001000802010008050100080f01000802010008020100080101000802010008010100
-08020100080201000804010008020100085e010108010100080501000806010008000100
-087c01010802010008010100085101010802010008050100085c01010802010008040100
-08020100080101000802010008420901070e000103000202040103010202040006000100
-080301000804010008010100080301010802010008020100080301010803010008010100
-08020100081b010108010100080101010801010008020100080101000802010008080100
-080201000801010008020100080101000807010008030100080201000801010008070101
-080501000802010008020100080101000802010008010101080101000801010008050100
-08020100085e01010801010008050100080201000801010008020100087b010108020100
-08010100085101010801010008050100085d010108010100080501000802010008010100
-0802010008420901070e0001030002020401030102020400060001000804010008040101
-0804010108030102080401010804010108020100081c0101080201010800010008020102
-080201000802010008090102080301020802010008070100080401020802010008070101
-08050100080301020803010208020100080001010802010008060102085f010108010100
-080601020802010008020100087b01010803010108520101080101040801010408590101
-08010104080201020803010208430901070e000103000202040103010202040006000100
-0805010008230100081d010108050100080e010508470100087001010890010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108010100
-08020100085c01000870010108900101085801010867010108570901070e000103000202
-0401030102020400060001000849010108020102085d0100087001010890010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108d50101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-0849010108d5010108900101085801010867010108570901070e00010300020204010301
-02020400060001000849010108d5010108900101085801010867010108570901070e0001
-030002020401030102020400060001000849010108d50101089001010858010108670101
-08570901070e0001030002020401030102020400060001ff01ff01d40901070e00010300
-02020401030102020400060001ff01ff01d40901070e0001030002020401030102020400
-060001000849010108d5010108900101085801010867010108570901070e000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-070e00010300020204010301020204000600010008050100082a010008160101086e0100
-0865010108900101085801010867010108570901070e0001030002020401030102020400
-060001000804010008040101080b010008050101080b01010802010008150101084f0102
-081b010008020102085f01010809010208090100080d0102086701010803010108520101
-0802010208030102085a010108020102080201040801010408420901070e000103000202
-040103010202040006000100080301000804010008010100080901010804010008010100
-0809010008010100080201000814010108510100081a01000802010008020100085e0101
-080b010008090100080f0100086701010802010008010100085101010801010008020100
-080101000802010008590101080101000802010008010100080201000801010008460901
-070e00010300020204010301020204000600010008020100080501000801010008080100
-080001000804010008010100080901000801010008030100081301010802010108000100
-080201020802010008000101080a01020803010208020100080001010802010008020100
-080201020802010008000101080401010805010008030102080301020802010008000101
-080501000802010008620101080201010800010008040100080301020802010008000101
-0803010208050100080901000800010108030102080201010800010008030102080a0102
-080301020802010008000101080201000802010008020102080201000800010108130101
-080201000801010008510101080101000802010008010100080201000859010108050100
-080501000801010008460901070e00010300020204010301020204000600010008010100
-0806010008010100080a0100080401000801010008090100080101000804010008120101
-080101000801010108010100080201000801010108010100080801000802010008010100
-080201000801010108010100080101000802010008010100080201000801010108010100
-080301010805010008020100080201000801010008020100080101010801010008030100
-080301000862010108010100080101010804010008020100080201000801010108010100
-080101000802010008040100080901010801010008010100080201000801010008000100
-080001000801010008020100080801000802010008010100080201000801010108010100
-080101000802010008010100080201000801010108010100081201010802010008010100
-085101010801010008020100080101000802010008590101080501000804010008020103
-08430901070e000103000202040103010202040006000100080001000807010008010100
-080a01000804010008010100080901000801010008050100081101010801010008020100
-080101000802010008010100080201000808010008050100080201000801010008050100
-08020100080101000802010008010100080f010008020100080201000801010008020100
-08010100080201000803010008030103085f010108010100080201000804010008020100
-080201000801010008020100080501000804010008090100080201000805010008010100
-080001000800010008010100080201000808010008050100080201000801010008050100
-080201000801010008020100080101000816010108020100080101000851010108020102
-08030102085a010108030101080501000806010008420901070e00010300020204010301
-0202040006000100080101000806010008010100080a0100080401000801010008090100
-080101000804010008120101080101000802010008010104080101000802010008090102
-080201040801010008060100080001000802010408010100080f01000802010008020100
-08010100080201000801010008020100080201000804010008020100085e010108010100
-080201000804010008020100080201000801010008020100080201030804010008090100
-080201000802010308010100080001000800010008010104080901020802010408010100
-080601000800010008020104080101000816010108020100080101000851010108010100
-0802010008010100080201000859010108050100080401000806010008420901070e0001
-03000202040103010202040006000100080201000805010008010100080a010008040100
-080101000809010008010100080301000813010108010100080201000801010008050100
-08020100080c0100080101000805010008060100080001000802010008050100080f0100
-080201000802010008010100080201000801010008020100080201000804010008020100
-085e01010801010008020100080401000802010008020100080101000802010008010100
-080201000804010008090100080201000801010008020100080101000800010008000100
-080101000810010008010100080501000806010008000100080201000805010008160101
-080201000801010008510101080101000802010008010100080201000859010108050100
-08030100080301000802010008420901070e000103000202040103010202040006000100
-080301000804010008010100080301010804010008040100080101000803010108030100
-080101000802010008140101080101000801010108010100080201000801010008020100
-080801000802010008010100080201000801010008070100080301000802010008010100
-080701010805010008020100080201000801010008020100080101010801010008010100
-0805010008020100085e0101080101000801010108040100080201000802010008010101
-080101000801010008020100080401000809010008020100080101000802010008010100
-080001000800010008010100080201000808010008020100080101000802010008010100
-080701000803010008020100080101000816010108020100080101000851010108010100
-080201000801010008020100085901010801010008020100080301000803010008020100
-08420901070e000103000202040103010202040006000100080401000804010108040101
-080201040803010108040101080401010802010008150101080201010800010008020102
-080201000802010008090102080301020802010008070100080401020802010008070101
-08050100080301020803010208020100080001010802010008060102085f010108020101
-080001000804010008030102080201000800010108030103080401000809010008020100
-0802010308010100080001000800010008020102080a0102080301020802010008070100
-08040102080201000816010108030101085201010802010208030102085a010108020102
-080401000804010208430901070e00010300020204010301020204000600010008050100
-082a01000816010108050100080e010508470100087001010805010008230105081c0105
-083c0101085801010867010108570901070e000103000202040103010202040006000100
-084901010801010008020100085c01000870010108010100080201000889010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108020102
-085d01000870010108020102088a0101085801010867010108570901070e000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-070e0001030002020401030102020400060001000849010108d501010890010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108d50101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-0849010108d5010108900101085801010867010108570901070e00010300020204010301
-02020400060001ff01ff01d40901070e0001030002020401030102020400060001ff01ff
-01d40901070e0001030002020401030102020400060001000849010108d5010108900101
-085801010867010108570901070e00010300020204010301020204000600010008490101
-08d5010108900101085801010867010108570901070e0001030002020401030102020400
-0600010008050100082a010008160101086e010008650101089001010858010108670101
-08570901070e0001030002020401030102020400060001000804010008040101080b0100
-08050100080c01010802010008150101084f0102081b010008020102085f010108110100
-087d01010803010108520101080301000805010008040102085301010802010208030102
-0804010108430901070e0001030002020401030102020400060001000803010008040100
-080101000809010108040101080b010008010100080201000814010108510100081a0100
-0802010008020100085e010108110100087d010108020100080101000851010108020101
-080401010803010008020100085201010801010008020100080101000802010008020100
-0801010008420901070e0001030002020401030102020400060001000802010008050100
-0801010008080100080001000803010008000100080b0100080101000803010008130101
-0802010108000100080201020802010008000101080a0102080301020802010008000101
-080201000802010008020102080201000800010108040101080501000803010208030102
-080201000800010108050100080201000862010108010100080001010803010208020104
-080901020802010008020100080101000800010108600101080201000801010008510101
-080101000800010008030100080001000803010008560101080501000805010008020100
-0801010008420901070e0001030002020401030102020400060001000801010008060100
-08010100080a010008050100080b01000801010008040100081201010801010008010101
-080101000802010008010101080101000808010008020100080101000802010008010101
-080101000801010008020100080101000802010008010101080101000803010108050100
-080201000802010008010100080201000801010108010100080301000803010008620101
-0801010108010100080101000802010008030100080a0100080201000801010008020100
-0801010108010100085f0101080201000801010008510101080301000805010008030100
-085601010805010008050100080201000801010008420901070e00010300020204010301
-0202040006000100080001000807010008010100080a010008050100080b010008010100
-080501000811010108010100080201000801010008020100080101000802010008080100
-0805010008020100080101000805010008020100080101000802010008010100080f0100
-0802010008020100080101000802010008010100080201000803010008030103085f0101
-0801010008020100080101000802010008030100080a0100080501000802010008010100
-08020100085f010108020100080101000851010108030100080501000803010308530101
-0803010108050100080301000801010008420901070e0001030002020401030102020400
-06000100080101000806010008010100080a010008050100080b01000801010008040100
-081201010801010008020100080101040801010008020100080901020802010408010100
-08060100080001000802010408010100080f010008020100080201000801010008020100
-0801010008020100080201000804010008020100085e0101080101000802010008010104
-08030100080b010208020100080201000801010008020100085f01010802010008010100
-085101010803010008050100080301000802010008520101080501000803010008040100
-0801010008420901070e0001030002020401030102020400060001000802010008050100
-08010100080a010008050100080b01000801010008030100081301010801010008020100
-080101000805010008020100080c01000801010008050100080601000800010008020100
-08050100080f010008020100080201000801010008020100080101000802010008020100
-0804010008020100085e010108010100080201000801010008070100080e010008010100
-080201000801010008020100085f01010802010008010100085101010803010008050100
-0803010008020100085201010805010008020100080501000801010008420901070e0001
-030002020401030102020400060001000803010008040100080101000803010108040100
-080501000805010108030100080101000802010008140101080101000801010108010100
-080201000801010008020100080801000802010008010100080201000801010008070100
-080301000802010008010100080701010805010008020100080201000801010008020100
-0801010108010100080101000805010008020100085e0101080101000802010008010100
-0802010008030100080a01000802010008010100080101010801010108010100085f0101
-080201000801010008510101080301000805010008030100080201000852010108010100
-0802010008010100080601000801010008420901070e0001030002020401030102020400
-060001000804010008040101080401010802010408010104080301010804010108020100
-081501010802010108000100080201020802010008020100080901020803010208020100
-080701000804010208020100080701010805010008030102080301020802010008000101
-0802010008060102085f0101080101000802010008020102080501010809010208030101
-080001000801010008000101086001010803010108520101080101040801010408020102
-0853010108020102080201040803010108430901070e0001030002020401030102020400
-0600010008050100082a01000816010108050100080e0105084701000870010108150105
-080f010008630101085801010867010108570901070e0001030002020401030102020400
-06000100084901010801010008020100085c010008700101082b01000863010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108020102
-085d010008700101082b010008630101085801010867010108570901070e000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-070e0001030002020401030102020400060001000849010108d501010890010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108d50101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-0849010108d5010108900101085801010867010108570901070e00010300020204010301
-02020400060001ff01ff01d40901070e0001030002020401030102020400060001ff01ff
-01d40901070e0001030002020401030102020400060001000849010108d5010108900101
-085801010867010108570901070e00010300020204010301020204000600010008490101
-08d5010108900101085801010867010108570901070e0001030002020401030102020400
-0600010008050100082a010008160101086e010008650101089001010858010108670101
-08570901070e0001030002020401030102020400060001000804010008040101080b0100
-08040102080b01010802010008150101084f0102081b010008020102085f010108110100
-080301000878010108030101085201010802010208030102085a01010802010208030102
-0804010008440901070e0001030002020401030102020400060001000803010008040100
-080101000809010108030100080201000809010008010100080201000814010108510100
-081a01000802010008020100085e01010811010008030100087801010802010008010100
-085101010801010008020100080101000802010008590101080101000802010008010100
-080201000802010108440901070e00010300020204010301020204000600010008020100
-080501000801010008080100080001000807010008090100080101000803010008130101
-0802010108000100080201020802010008000101080a0102080301020802010008000101
-080201000802010008020102080201000800010108040101080501000803010208030102
-080201000800010108050100080201000862010108020102080201000802010008010104
-080101000800010108750101080201000801010008510101080501000805010008590101
-0805010008050100080101000800010008440901070e0001030002020401030102020400
-06000100080101000806010008010100080a010008070100080901000801010008040100
-081201010801010008010101080101000802010008010101080101000808010008020100
-080101000802010008010101080101000801010008020100080101000802010008010101
-080101000803010108050100080201000802010008010100080201000801010108010100
-080301000803010008620101080101000802010008010100080201000803010008030101
-080101000874010108020100080101000851010108050100080501000859010108050100
-080501000803010008440901070e00010300020204010301020204000600010008000100
-0807010008010100080a010008060100080a010008010100080501000811010108010100
-080201000801010008020100080101000802010008080100080501000802010008010100
-0805010008020100080101000802010008010100080f0100080201000802010008010100
-0802010008010100080201000803010008030103085f0101080501000801010008020100
-080301000803010008020100087401010802010008010100085101010804010008050100
-085a010108040100080401010804010008440901070e0001030002020401030102020400
-06000100080101000806010008010100080a010008050100080b01000801010008040100
-081201010801010008020100080101040801010008020100080901020802010408010100
-08060100080001000802010408010100080f010008020100080201000801010008020100
-0801010008020100080201000804010008020100085e0101080201030801010008020100
-080301000803010008020100087401010802010008010100085101010803010008050100
-085b010108030100080701000803010008440901070e0001030002020401030102020400
-06000100080201000805010008010100080a010008040100080c01000801010008030100
-081301010801010008020100080101000805010008020100080c01000801010008050100
-08060100080001000802010008050100080f010008020100080201000801010008020100
-0801010008020100080201000804010008020100085e0101080101000802010008010100
-080201000803010008030100080201000874010108020100080101000851010108020100
-08050100085c010108020100080801000803010008440901070e00010300020204010301
-020204000600010008030100080401000801010008030101080401000803010008070101
-080301000801010008020100081401010801010008010101080101000802010008010100
-080201000808010008020100080101000802010008010100080701000803010008020100
-080101000807010108050100080201000802010008010100080201000801010108010100
-080101000805010008020100085e01010801010008020100080101000801010108030100
-0803010008020100087401010802010008010100085101010801010008050100085d0101
-0801010008050100080201000803010008440901070e0001030002020401030102020400
-060001000804010008040101080401010802010408010104080301010804010108020100
-081501010802010108000100080201020802010008020100080901020803010208020100
-080701000804010208020100080701010805010008030102080301020802010008000101
-0802010008060102085f0101080201030802010108000100080401010801010008020100
-087401010803010108520101080101040801010408590101080101040802010208020104
-08420901070e00010300020204010301020204000600010008050100082a010008160101
-08050100080e0105084701000870010108900101085801010867010108570901070e0001
-03000202040103010202040006000100084901010801010008020100085c010008700101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-0849010108020102085d01000870010108900101085801010867010108570901070e0001
-030002020401030102020400060001000849010108d50101089001010858010108670101
-08570901070e0001030002020401030102020400060001000849010108d5010108900101
-085801010867010108570901070e00010300020204010301020204000600010008490101
-08d5010108900101085801010867010108570901070e0001030002020401030102020400
-060001000849010108d5010108900101085801010867010108570901070e000103000202
-0401030102020400060001ff01ff01d40901070e00010300020204010301020204000600
-01ff01ff01d40901070e0001030002020401030102020400060001000849010108d50101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-0849010108d5010108900101085801010867010108570901070e00010300020204010301
-020204000600010008050100082a010008160101086e0100086501010890010108580101
-0867010108570901070e0001030002020401030102020400060001000804010008040101
-080b010008040102080b01010802010008150101084f0102081b010008020102085f0101
-08110100080a010008220102084b01010803010108520101080101040805010008050100
-0852010108020102080201040801010408420901070e0001030002020401030102020400
-060001000803010008040100080101000809010108030100080201000809010008010100
-080201000814010108510100081a01000802010008020100085e010108110100080a0100
-08240100084b010108020100080101000851010108010100080801010804010108520101
-080101000802010008010100080201000801010008460901070e00010300020204010301
-020204000600010008020100080501000801010008080100080001000807010008090100
-0801010008030100081301010802010108000100080201020802010008000101080a0102
-080301020802010008000101080201000802010008020102080201000800010108040101
-080501000803010208030102080201000800010108050100080201000862010108010100
-080001010803010208020104080801000801010008030102080201000800010108020100
-080001010803010208050100084b01010802010008010100085101010801010008070100
-0800010008030100080001000852010108050100080501000801010008460901070e0001
-03000202040103010202040006000100080101000806010008010100080a010008070100
-080901000801010008040100081201010801010008010101080101000802010008010101
-080101000808010008020100080101000802010008010101080101000801010008020100
-080101000802010008010101080101000803010108050100080201000802010008010100
-080201000801010108010100080301000803010008620101080101010801010008010100
-0802010008030100080a0100080001000803010008020100080101010801010008010101
-08010100080101000802010008040100084b010108020100080101000851010108010103
-080301000801010008020100080101000852010108050100080401000802010308430901
-070e000103000202040103010202040006000100080001000807010008010100080a0100
-08050101080a010008010100080501000811010108010100080201000801010008020100
-080101000802010008080100080501000802010008010100080501000802010008010100
-0802010008010100080f0100080201000802010008010100080201000801010008020100
-0803010008030103085f01010801010008020100080101000802010008030100080a0101
-0804010008020100080101000805010008020100080101000802010008040100084b0101
-080201000801010008510101080501000801010008020100080101000802010008520101
-08030101080501000806010008420901070e000103000202040103010202040006000100
-080101000806010008010100080a01000807010008090100080101000804010008120101
-080101000802010008010104080101000802010008090102080201040801010008060100
-080001000802010408010100080f01000802010008020100080101000802010008010100
-08020100080201000804010008020100085e010108010100080201000801010408030100
-080a0101080401040801010008050100080201000801010408040100084b010108020100
-080101000851010108050100080101000802010008010100080201000852010108050100
-080401000806010008420901070e00010300020204010301020204000600010008020100
-0805010008010100080a0100080701000809010008010100080301000813010108010100
-08020100080101000805010008020100080c010008010100080501000806010008000100
-0802010008050100080f0100080201000802010008010100080201000801010008020100
-080201000804010008020100085e010108010100080201000801010008070100080a0100
-08000100080301000805010008050100080201000801010008080100084b010108020100
-080101000851010108010100080201000801010508000105085101010805010008030100
-080301000802010008420901070e00010300020204010301020204000600010008030100
-080401000801010008030101080401000803010008020100080301010803010008010100
-080201000814010108010100080101010801010008020100080101000802010008080100
-080201000801010008020100080101000807010008030100080201000801010008070101
-080501000802010008020100080101000802010008010101080101000801010008050100
-08020100085e01010801010008020100080101000802010008030100080a010008010100
-0802010008020100080101000805010008020100080101000802010008040100084b0101
-080201000801010008510101080101000802010008050100080501000852010108010100
-0802010008030100080301000802010008420901070e0001030002020401030102020400
-060001000804010008040101080401010802010408020102080401010804010108020100
-081501010802010108000100080201020802010008020100080901020803010208020100
-080701000804010208020100080701010805010008030102080301020802010008000101
-0802010008060102085f0101080101000802010008020102080501010808010008020100
-080201020802010008050100080201000802010208050100084b01010803010108520101
-0802010208060100080501000852010108020102080401000804010208430901070e0001
-0300020204010301020204000600010008050100082a01000816010108050100080e0105
-08470100087001010815010508740101085801010867010108570901070e000103000202
-040103010202040006000100084901010801010008020100085c01000870010108900101
-085801010867010108570901070e00010300020204010301020204000600010008490101
-08020102085d01000870010108900101085801010867010108570901070e000103000202
-0401030102020400060001000849010108d5010108900101085801010867010108570901
-070e0001030002020401030102020400060001000849010108d501010890010108580101
-0867010108570901070e0001030002020401030102020400060001000849010108d50101
-08900101085801010867010108570901070e000103000202040103010202040006000100
-0849010108d5010108900101085801010867010108570901070e00010300020204010301
-02020400060001ff01ff01d40901070e0001030002020401030102020400060001ff01ff
-01d40901070e0001030002020401030102020400060001000849010108d5010108900101
-0858010108670101085709010010030002020401030102020400060001000849010108d5
-0101089001010858010108670101085709010700000c0900000103000202040103010202
-04000600010008050100082a010008160101088301000850010108900101085801010867
-010108570901070000010608090107000001030002020401030102020400060001000804
-010008040101080b010008070100080a0101080201000815010108110100080a01000822
-0102080b01000806010008090100081501000807010008020102084a0101089001010803
-0101085201010805010008020102085a0101080201020802010408490901070100010607
-090107000001030002020401030102020400060001000803010008040100080101000809
-0101080601010809010008010100080201000814010108110100080a010008240100080b
-010008110100081401010806010008020100080201000849010108900101080201000801
-010008510101080401010801010008020100085901010801010008020100080101000802
-010008490901070100010606090107010001030002020401030102020400060001000802
-010008050100080101000808010008000100080501000800010008090100080101000803
-010008130101080101000800010108030102080201040808010008010100080301020802
-010008000101080201000800010108030102080501000804010108020104080201020803
-010208020100080101000803010208020100080001010802010008000100080601000806
-010008490101089001010802010008010100085101010803010008000100080101000802
-010008590101080101000802010008050100084909010702000106050901070100010300
-0202040103010202040006000100080101000806010008010100080a0100080401000801
-010008090100080101000804010008120101080101010801010008010100080201000803
-0100080a0100080001000803010008020100080101010801010008010101080101000801
-010008020100080401000804010108040100080601000802010008020100080101000800
-010008030100080201000801010108010100080301000805010008070100084901010890
-010108020100080101000851010108020100080101000801010008020100085901010801
-01000802010008040100084a090107020001060409010702000103000202040103010202
-040006000100080001000807010008010100080a01000803010008020100080901000801
-010008050100081101010801010008020100080101000802010008030100080a01010804
-010008020100080101000805010008020100080101000802010008040100080b01000806
-01000802010008050101080401000802010008010100080701000805010008060100084a
-010108900101080201000801010008510101080101000802010008020102085a01010802
-010208050100084a09010703000106030901070200010300020204010301020204000600
-0100080101000806010008010100080a0100080301000802010008090100080101000804
-01000812010108010100080201000801010408030100080a010108040104080101000805
-0100080201000801010408040100080b0100080601000802010008050101080401040801
-0100080701000804010008060100084b0101089001010802010008010100085101010801
-010008020100080101000802010008590101080101000802010008040100084a09010703
-000106020901070300010300020204010301020204000600010008020100080501000801
-0100080a0100080301050808010008010100080301000813010108010100080201000801
-010008070100080a01000800010008030100080501000805010008020100080101000808
-0100080b0100080601000802010008050100080001000803010008050100080701000804
-010008050100084c01010890010108020100080101000851010108010105080001000802
-010008590101080101000802010008030100084b09010704000106010901070300010300
-020204010301020204000600010008030100080401000801010008030101080401000807
-010008030101080301000801010008020100081401010801010008020100080101000802
-010008030100080a01000801010008020100080201000801010008050100080201000801
-010008020100080401000804010108040100080601000802010008020100080101000801
-0100080201000802010008010100080701000803010008050100084d0101089001010802
-010008010100085101010805010008010100080201000859010108010100080201000803
-0100084b0901070400010600090107040001030002020401030102020400060001000804
-010008040101080401010802010408050100080301010804010108020100081501010801
-010008020100080201020805010108080100080201000802010208020100080501000802
-010008020102080501000804010108050101080401000803010208020100080201000802
-010208020100080501040801010008050104084901010890010108030101085201010805
-010008020102085a01010802010208040100084b09010705000009020704000103000202
-04010301020204000600010008050100082a0100081601010815010508b9010108900101
-085801010867010108570901070500000901070500010300020204010301020204000600
-01000849010108d501010890010108580101086701010857090107060901070500010300
-02020401030102020400060001000849010108d501010890010108580101086701010857
-09010706090007060001030002020401030102020400060001000849010108d501010890
-010108580101086701010857090100100300020204010301020204000600010008490101
-08d5010108900101085801010867010108570900001103000202040103010202040009ff
-09ff09d9060e03000202040103010202040009ff09ff09d80000060e0300020204010301
-020204000901070d0000070000ff00ff00a507100001070c0001060e0300020204010301
-020204000901070b00010900070000ff00ff00a4090007100003070a0001060e03000202
-040103010202040009010709000209010700000106ff06ff06a109010710000507080001
-060e030002020401030102020400090107070003060009010700000106ff06ff06a10901
-071000010601000307060001060e03000202040103010202040009010705000306020901
-0700000106ff06ff06a10901071000010603000307040001060e03000202040103010202
-0400090107030003060409010700000106ff06ff06a10901071000010605000307020001
-060e030002020401030102020400090107010003060609010700000106ff06ff06a10901
-071000010607000307000001060e03000202040103010202040009050608090107000001
-06ff06ff06a1090107100001060809030001060e03000202040103010202040009010701
-0903060609010700000106ff06ff06a10901071000010607090307000001060e03000202
-0401030102020400090107030903060409010700000106ff06ff06a10901071000010605
-090307020001060e030002020401030102020400090107050903060209010700000106ff
-06ff06a10901071000010603090307040001060e03000202040103010202040009010707
-0903060009010700000106ff06ff06a10901071000010601090307060001060e03000202
-04010301020204000901070909040700000106ff06ff06a1090107100001090307080001
-060e0300020204010301020204000901070b09020700000109ff09ff09a3071000010901
-070a0001060e0300020204010301020204000901070d09000700000009ff09ff09a40710
-00000900070c0001060e030002020401030102020400090100ff00ff00d7060e03000202
-0401030102020400090000ff00ff00d8060e03000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff0615
-01000601010006ce030002020401030004040601000a0607010006020100060401000606
-010006100102061201000686000a06090100060c01000611010006020100060401000606
-0100060f01000602010006e0010006010100060801000602010006040100060601000605
-0100061f010106890300040403050601000909000607010006020100060c0100060f0100
-060201000611010006860009090006090100060c01000611010006020100060c0100060f
-01010601010006e00100060101000608010006020100060c010006050100061e01000601
-010006880304040003010202040006010001060609010607010006020100060201020603
-010106000100060201020609010006050100060201000602010206020104060201020602
-010106000100060901000600010106020100060001010603010206030102060301020603
-010206030102060301020603010206310001060609010608010006000100060201000602
-010006010104060201020609010006020100060201020603010106000100060201020609
-01010601010006020102060201000602010006d101050607010006020100060201020603
-010106000100060201010600010006020102060201000600010106040101060a01000601
-010006880300020204010301020204000601000106060901060701000602010006040100
-060201000601010106010100060201000609010006040100060201000601010006020100
-060301000603010006020100060101000600010006000100060801010601010006010101
-060101000601010006020100060101000602010006010100060201000601010006020100
-060101000602010006010100060201000601010006020100063000010606090106080100
-060001000602010006020100060301000603010006020100060801000602010006040100
-060201000601010106010100060201000608010006000100060001000601010006020100
-060101000602010006d20100060101000608010006020100060401000602010006010101
-06010100060101010601010006020100060101010601010006030101060a010006010100
-068803000202040103010202040006010001060609010607010406040100060201000602
-01000601010006020100060a010106030100060101000601010006070100060301000602
-010006010100060001000600010006080100060201000601010006050100060201000601
-010006050100060201000601010006050100060501000602010006010100063400010606
-090106080100060001000602010006020100060301000603010006020100060101040601
-010406040100060201000602010006010100060201000608010006000100060001000601
-01000602010006010100060001000600010006d101000601010006090104060401000602
-010006020100060101000602010006010100060201000601010006020100061001000601
-010006880300020204010301020204000601000106060901060701000602010006040100
-060201000602010006010104060c01000602010006010100060201020604010006030104
-060101000600010006000100060801000602010006010100060501000602010006010100
-060501040602010206030102060201040602010206310001060609010607010006020100
-060101000602010006030100060301000602010006080100060201000604010006020100
-060201000601010406080100060101010601010406010100060001000600010006d00105
-060801000602010006040100060201000602010006010100060201000601010406010100
-060201000610010006010100068803000202040103010202040006010001060609010607
-01000602010006040100060201000602010006010100060c010006020100060301000600
-010006050100060301000603010006050100060001000600010006080100060201000601
-010006050100060201000601010006050100060901000605010006010100060901000630
-000106060901060701040601010006020100060301000603010006020100060801000602
-010006040100060201000602010006010100060c01000601010106010100060501000600
-01000600010006d101000601010006090100060201000604010006020100060201000601
-010006020100060101000605010006020100061001000601010006880300020204010301
-020204000601000106060901060701000602010006040100060201000601010106010100
-060201000608010006020100060301010602010006020100060301000603010006020100
-060101000600010006000100060801010601010006010100060501000602010006010100
-060201000601010006020100060101000602010006010100060201000601010006020100
-060101000602010006300001060609010607010006020100060101000601010106030100
-060301000602010006080100060201000604010006020100060101010601010006020100
-0608010006020100060101000602010006010100060001000600010006d1010006010100
-060901000602010006040100060201000601010106010100060101010601010006020100
-060101000602010006030101060a01000601010006880300020204010301020204000601
-000106060901060701000602010006040100060301010600010006020102060a01020605
-010006030102060501010602010206020100060001000600010006080100060001010602
-010006060102060301020603010206030102060301020603010206030102063100010606
-090106070100060201000602010106000100060401010602010206090100060201000604
-0100060301010600010006020102060901000602010006020102060301000600010006d2
-010006010100060901000602010006040100060301010600010006020101060001000602
-0102060201000602010006030101060b0101068903000202040103010202040006010001
-09080634010006250100066c0001090806ff06ff06060300020204010301020204000601
-00000909063101000600010006260100066c0000090906ff06ff06060300020204010301
-02020400063f01000627010006ff06ff067e03000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040006ff06ff06e803000202040103010202040006ff06ff06e8
-03000202040103010202040003ff03ff03e9020204010301021a0400030002ff02ff02b6
-04000300021a04010301021a0400030002ff02ff02b604000300021a04010301021a0400
-030002ff02ff02b604000300021a04010301041b030004ff04ff04b70300041c030004ff
-04ff04f3
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 22 377 234
-%%EOF
diff --git a/lib/pman/doc/src/note.gif b/lib/pman/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/pman/doc/src/note.gif
+++ /dev/null
diff --git a/lib/pman/doc/src/notes.xml b/lib/pman/doc/src/notes.xml
deleted file mode 100644
index 26f966fd86..0000000000
--- a/lib/pman/doc/src/notes.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</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>Pman Release Notes</title>
-    <prepared>otp_appnotes</prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the Pman application.</p>
-
-<section><title>Pman 2.7.1.4</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Tuple funs (deprecated in R15B) are no longer supported.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-10170</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Pman 2.7.1.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Pman 2.7.1.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The GS applications is now deprecated and will be
-	    removed in the R16 release. The following GS-based
-	    applications have been superseded by the Observer
-	    application and will removed in R16: Appmon, Pman,
-	    Tv.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-9907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Pman 2.7.1.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Miscellaneous documentation build updates</p>
-          <p>
-	    Own Id: OTP-9813</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Pman 2.7.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>Pman 2.7</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The copyright notices have been updated.</p>
-          <p>
-	    Own Id: OTP-7851</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-  <section>
-    <title>Pman 2.6</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Some maintenance work to replace deprecated guard
-            expressions etc. somehow grew into a larger rewrite of
-            parts of the Pman code, fixing some of the more blatant
-            errors and removing unused code.</p>
-          <p>The default font has been changed, so now the entire text
-            on buttons etc. should be visible on most platforms.</p>
-          <p>Saving and restoring trace options to/from file now
-            works.</p>
-          <p>Selecting different sets of processes to hide/view should
-            now work in a more consistent and logical way.</p>
-          <p>It is now possible to select more than one module or
-            process to hide/show.</p>
-          <p>Own Id: OTP-6012 Aux Id: OTP-5987 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Pman 2.5.3</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some dead code from <c>pman_process</c>.</p>
-          <p>Own Id: OTP-6550</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Pman 2.5.2</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Some dead code reported by Dialyzer was eliminated.</p>
-          <p>A bug in <c>dbg</c> when tracing to wrap trace files
-            has been corrected. It failed to delete any already existing
-            wrap trace files with the same names when starting a new
-            wrap trace.</p>
-          <p>Own Id: OTP-5329</p>
-        </item>
-        <item>
-          <p>The graphic applications now search for HTML
-            documentation in the correct place.</p>
-          <p>Own Id: OTP-5381</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Pman 2.5.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The Pman 'trace shell' functionality was broken, it has
-            now been fixed. Furthermore, Pman could not correctly
-            find the pid of the active shell if more than one shell
-            process was running on the node. This has also been
-            corrected.</p>
-          <p>Own Id: OTP-5191</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/pman/doc/src/options.gif b/lib/pman/doc/src/options.gif
deleted file mode 100644
index 18377fbed1..0000000000
--- a/lib/pman/doc/src/options.gif
+++ /dev/null
diff --git a/lib/pman/doc/src/options.ps b/lib/pman/doc/src/options.ps
deleted file mode 100644
index b5e2c6a391..0000000000
--- a/lib/pman/doc/src/options.ps
+++ /dev/null
@@ -1,829 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./options.tmp.eps)
-%%CreationDate: (Tue Jun 12 18:04:30 2001)
-%%BoundingBox: 0 53 250 318
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 53 250 318
-userdict begin
-%%BeginData:
-DisplayImage
-0 53
-250.000000 265.000000
-12
-350 371
-1
-0
-0
-8
-ffffff
-000000
-708090
-b03060
-d9d9d9
-808080
-a3a3a3
-000000
-03ff03ff03ff035f04000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400031b040c0392040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000307040c03050400030a040003080404030b0402030d
-0401030104010305040703200403030a040103010401031e040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000308040003020400030204000302
-040003050400030a0400030804010301040103090401030f040103010401030804010322
-040103010401030904010321040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003070400030204000302040003020400030504000303
-040203030400030804010302040103010403030104030301040303010401030104010300
-040103000403030704010302040103000401030004030302040303020403030604010303
-04010300040103000401030104030300040103010403030104010300040103020403030a
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000308
-040003020400030204000302040003050400030204040302040003080401030204010300
-040103010401030104010301040103010401030004010301040103000401030104010308
-040103020406030104010300040103010401030004010301040103050401030304010300
-040203000401030104010301040103000401030104010300040203000401030004010301
-040103080400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030704040302040003020400030504000301040603010400030804010302
-040103000401030104010301040103050401030004010301040103000401030104010308
-040103020402030504010300040103040401030104010305040103030401030004010301
-040103010401030104010300040103010401030004010301040103000402030c04000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030804000306
-040003020400030504000301040603010400030804010302040103000405030104010302
-040403000401030104010300040103010401030804010302040103030404030004010304
-040503050401030304010300040103010401030104010301040103000401030104010300
-040103010401030204020309040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003070400030604000302040003050400030104060301
-040003080401030204010300040103050401030104010301040103000401030104010300
-040103010401030804010302040103020401030104010300040103040401030904010303
-040103000401030104010301040103010401030004010301040103000401030104010303
-040203090400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003080400030604000302040003050400030204040302040003080401030104010301
-040103010401030104010301040103010401030004010300040203000401030104010300
-040003060401030204010302040103010401030004010301040103000401030104010306
-040103010401030104020300040103010401030004020300040103010401030004010301
-040103000401030104010308040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003070408030204000305040003030402030304000308
-040403030403030204010302040203000401030004010300040103000401030204010307
-040103020401030304020300040103000403030204030308040303020401030004010303
-04010300040103010403030104010301040103010403030a040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-0400030004000300040003000400030004000300040003080400030a040003050400030a
-040003660401032904000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-0400030004000300040003070400030a040003050400030a040003660401032a04000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000300040003000400030004000300040003080400030a
-04000305040c036604010329040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000307040c03a604000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-040003000400030004000300040003000400030004000300040003000400030004000300
-04000300040003000400030004000300040003ff03ff03d402ff02ff02bb00ff00ff00ba
-050000ff005b050100ff00ff000e050000ff005b050100b104a80502000204a8000504a8
-0502000204a8000504a80502000204a8000504a80502000204a8000504a80502000204a8
-000504a80502000204a8000504a80502000204a8000504a80502000204a8000504a80502
-000204a8000504a80502000204a8000504a80502000204a8000504a80502000204a80005
-04a8050200020407010404080100041601000404010004360100040601000433000504a8
-0502000204090100040a0100041c010004360100043b0005040801040434010004130100
-041a010004060100042b0502000204090100040301000400010104020100040001010403
-010204020100040001010403010204020104040201020402010004000101040301020403
-0102040a0102040201000400010104020104040201020403010204020100040001010403
-01020404010104170005040a01000436010004130100041a010004330502000204090100
-040301010401010004010101040101000401010004020100040101010401010004040100
-040401000403010004020100040101010401010004010100040201000401010004020100
-040801000402010004010101040101000403010004060100040201000402010004010101
-0401010004010100040201000403010104170005040a0100040301000400010104030102
-0403010204030102040a0102040201000402010004010104040101000400010104020100
-040201000401010404090102040201000400010104020104040201020403010204020100
-040001010403010204040101040f05020002040901000403010004020100040101000402
-010004010100040201000401010004080100040401000407010004010100040201000401
-010004050100040201000408010004020100040101000402010004030100040601000402
-01000402010004010100040201000401010004210005040a010004030101040101000401
-010004020100040101000402010004010100040201000408010004020100040101000402
-0100040301000403010104010100040101000402010004030100040a0100040201000401
-010104010100040301000406010004020100040201000401010104010100040101000402
-010004030101040f05020002040901000403010004020100040101000402010004010104
-040101000408010004040100040401030401010004020100040101000405010404080100
-040201000401010004020100040301000406010004020100040201000401010004020100
-04020102041e0005040a0100040301000409010004010100040501000402010004080100
-040201000401010004020100040301000403010004020100040101000402010004030100
-040a01000402010004010100040201000403010004060100040201000402010004010100
-040201000401010004190502000204090100040301000402010004010100040201000401
-010004050100040801000404010004030100040201000401010004020100040101000405
-0100040c0100040201000401010004020100040301000406010004020100040201000401
-01000402010004050100041d0005040a0100040301000406010304010100040501040408
-010004020100040101000402010004030100040301000402010004010100040201000403
-0100040a0100040201000401010004020100040301000406010004020100040201000401
-010004020100040201020416050200020409010004030100040201000401010004020100
-040101000402010004010100040801000404010004030100040201000401010004020100
-040101000402010004010100040201000408010004020100040101010401010004030100
-040601000402010004020100040101000402010004010100040201000403010104170005
-040a01000403010004050100040201000401010004050100040c01000402010004010100
-04020100040301000403010004020100040101000402010004030100040a010004020100
-040101000402010004030100040601000402010004020100040101000402010004050100
-041505020002040701040401010004020100040101000402010004020102040201000408
-0100040501010402010304010100040201000402010204030102040a0102040201000400
-01010405010104040100040301020402010004020100040201020404010104170005040a
-010004030100040501000402010004010100040201000401010004020100040801000402
-01000401010004010101040301000403010104010100040101000401010104030100040a
-010004020100040101010401010004030100040601000402010004020100040101000402
-0100040101000402010004030101040f050200020462010004440005040a010004030100
-040601030402010204030102040a01020403010104000100040401010401010004000101
-040301010400010004040101040901020402010004000101040501010404010004030102
-04020100040201000402010204040101040f050200020462010004440005044701000421
-0100043c0502000204620100044400050447010004210100043c0502000204a800050447
-010004210100043c0502000204a8000504a80502000204a8000504a80502000204a80005
-04a80502000204a8000504a80502000204a8000504a80502000204a8000504a805020002
-04a8000504a80502000204a8000504a80502000204a8000504a80502000204a8000504a8
-0502000204a8000504a80502000204a8000504a80502000204a8000504a80502000204a8
-000504a8050200020408050a04070104040801000416010004040100045f000504a80502
-000204080509000004090100040a0100041c0100045f000504a805020002040805010306
-000104090100040301000400010104020100040001010403010204020100040001010403
-010204020104040901020402010004000101040a01020402010004000101040301020402
-0100040201000401010004000101041f000504a805020002040805010306000104090100
-040301010401010004010101040101000401010004020100040101010401010004040100
-04040100040a010004020100040101010401010004080100040201000401010104010100
-040101000402010004010100040201000401010104010100041e00050409050a04070104
-043d01000447050200020408050103060001040901000403010004020100040101000402
-01000401010004020100040101000408010004040100040a010004020100040101000402
-010004080100040501000402010004050100040101000400010004000100040101000402
-0100041e000504090509000004090100043f010004470502000204080501030600010409
-01000403010004020100040101000402010004010104040101000408010004040100040a
-010004020100040101000402010004090102040201000402010004020103040101000400
-0100040001000401010004020100041e0005040905010306000104090100040301000400
-0101040301020403010204030102040a0102040301020402010004000101040301010400
-010004470502000204080501030600010409010004030100040201000401010004020100
-04010100040501000408010004040100040a0100040201000401010004020100040c0100
-040101000402010004010100040201000401010004000100040001000401010004020100
-041e00050409050103060001040901000403010104010100040101000402010004010100
-040201000401010004020100040801000402010004010100040201000401010104010100
-040101000401010104470502000204080501030600010409010004030100040201000401
-0100040201000401010004020100040101000408010004040100040a0100040201000401
-010004020100040801000402010004010101040101000401010004020100040101000400
-0100040001000401010004020100041e0005040905010306000104090100040301000409
-010004010100040501000402010004080100040501000402010004010100040201000401
-010004020100044705020002040805010306000104070104040101000402010004010100
-040201000402010204020100040801000405010104090102040201000402010004090102
-04020100040001010403010304020100040001000402010004020100041e000504090501
-030600010409010004030100040601030401010004050104040901020402010404010100
-040201000401010004020100044705020002040805010008045b01000437000504090501
-030600010409010004030100040501000402010004010100040501000410010004010100
-04050100040201000401010004020100044705020002040805000009045b010004370005
-040905010306000104090100040301000405010004020100040101000402010004010100
-040201000408010004020100040101000402010004010100040201000401010004010101
-044705020002046f01000437000504090501030600010409010004030100040601030402
-010204030102040a01020403010204020100040201000402010104000100044705020002
-04a8000504090501000804930502000204a8000504090500000904930502000204a80005
-04a80502000204a8000504a805020002041b0501048a000504a805020002041a0503040e
-01000404010204030102046a000504a80502000204190505040d01000406010004050100
-046a000504a8050200020418050203010502040b0100040001000405010004050100040a
-010204020100040001010403010204020100040201000401010004000101040301020439
-000504a8050200020417050203030502040a010004000100040501000405010004090100
-040201000401010104010100040101000402010004010100040201000401010104010100
-04010100040201000438000504a805020002041605020305050204090100040001000405
-010004050100040901000405010004020100040501000401010004000100040001000401
-01000402010004010100043c000504a80502000204150002030700020407010004020100
-0404010004050100040a0102040201000402010004020103040101000400010004000100
-0401010004020100040201020439000504a8050200020416000203050002040801040404
-010004050100040d01000401010004020100040101000402010004010100040001000400
-0100040101000402010004050100043800050409050a0407010404430100044105020002
-041700020303000204090100040201000404010004050100040901000402010004010101
-040101000401010004020100040101000400010004000100040101000402010004010100
-0402010004380005040905090000040901000488050200020418000203010002040a0100
-040201000404010004050100040a01020402010004000101040301030402010004000100
-040201000402010004020102043900050409050103060001040901000403010004000101
-040301020403010204030102040901000400010104030102040301020403010204030102
-04020100040201000402010204330502000204190005042e010004580005040905010306
-000104090100040301010401010004010100040201000401010004020100040101000402
-010004080101040101000401010004020100040101000402010004010100040201000404
-010004020100040201000401010004020100043205020002041a0003042f010004580005
-040905010306000104090100040301000409010004010100040501000402010004080100
-040501000402010004010100040501000402010004040100040201000402010004010100
-04020100043205020002041b000104300100045800050409050103060001040901000403
-010004060103040101000405010404080100040501040401010004050104040401000403
-0100040001000402010404320502000204a8000504090501030600010409010004030100
-04050100040201000401010004050100040c010004050100040501000405010004080100
-04030100040001000402010004360502000204a800050409050103060001040901000403
-010004050100040201000401010004020100040101000402010004080100040501000402
-010004010100040201000401010004020100040401000404010004030100040201000432
-0502000204a8000504090501030600010409010004030100040601030402010204030102
-0409010004060102040301020403010204050100040401000404010204330502000204a8
-000504090501000804930502000204a80005040905000009049305020002041b0001048a
-000504a805020002041a0003040c01040404010004120100044301020416000504a80502
-000204190005040b0100041c0100044501000416000504a8050200020418000204010002
-040a01000406010204020100040001010403010204020104040901020402010004000101
-0403010204020100040201000401010004000101040a0102040201000400010104050100
-0402010004020100040e000504a805020002041700020403000204090100040801000402
-010104010100040101000402010004030100040a01000402010004010101040101000401
-010004020100040101000402010004010101040101000408010004020100040101010401
-0100040401000402010004020100040e000504a805020002041600020405000204080103
-04050100040201000405010004070100040a010004050100040201000405010004010100
-040001000400010004010100040201000408010004020100040101000402010004040100
-0403010004010100040e000504a805020002041505020407050204070100040801000402
-01000406010204040100040b010204020100040201000402010304010100040001000400
-010004010100040201000408010004020100040101000402010004040100040301000401
-0100040e000504a805020002041605020405050204080100040801000402010004090100
-04030100040e010004010100040201000401010004020100040101000400010004000100
-040101000402010004080100040201000401010004020100040401000404010004000100
-040e000504a8050200020417050204030502040901000408010004020100040501000402
-010004030100040a01000402010004010101040101000401010004020100040101000400
-010004000100040101000402010004080100040201000401010004020100040401000404
-0101040f00050409000a04070104042701010418010004060100043a0502000204180502
-04010502040a010004080100040201000406010204050101040901020402010004000101
-040301030402010004000100040201000402010004090102040201000402010004040100
-04050100040f00050409000905000409010004280100041a010004420502000204190505
-043c010004390100040f0005040900010406050104090100040301000400010104030102
-0403010204030102040b0100040301000402010004010100040001010403010204020104
-0402010204030102040201000400010104030102042505020002041a0503043d01000436
-010004000100041000050409000104060501040901000403010104010100040101000402
-010004010100040201000401010004020100040801040401010004020100040101010401
-010004010100040201000403010004060100040201000402010004010101040101000401
-010004020100042405020002041b0501043e010004370100041100050409000104060501
-040901000403010004090100040101000405010004020100040a01000403010004020100
-040101000402010004010100040701000406010004020100040201000401010004020100
-0401010004280502000204a8000504090001040605010409010004030100040601030401
-010004050104040a01000403010004020100040101000402010004010100040701000406
-0100040201000402010004010100040201000402010204250502000204a8000504090001
-04060501040901000403010004050100040201000401010004050100040e010004030100
-040201000401010004020100040101000407010004060100040201000402010004010100
-040201000405010004240502000204a80005040900010406050104090100040301000405
-01000402010004010100040201000401010004020100040a010004030100040101010401
-010004020100040101000402010004030100040601000402010004020100040101000402
-0100040101000402010004240502000204a8000504090001040605010409010004030100
-040601030402010204030102040b01000404010104000100040101000402010004020102
-04050101040401000403010204020100040201000402010204250502000204a800050409
-0001050804930502000204a8000504090000050904930502000204a8000504a805020002
-04a8000504a80502000204a8000504a80502000204a8000504a80502000204a8000504a8
-0502000204a8000504a80502000204a8000504a80502000204a8000504a80502000204a8
-000504a80502000204a800050409000a040701040442010004420502000204a800050409
-00090500040901000444010004420502000204a800050409000104060501040901000403
-010004000101040301020403010204030102040a01020402010004020100040201020402
-0100040001010402010404020102043a0502000204a80005040900010406050104090100
-040301010401010004010100040201000401010004020100040101000402010004080100
-040201000401010004020100040101000402010004010101040101000403010004030100
-0402010004390502000204a8000504090001040605010409010004030100040901000401
-010004050100040201000408010004020100040101000402010004010100040201000401
-0100040201000403010004030100043d0502000204a80005040900010406050104090100
-040301000406010304010100040501040408010404020100040001000402010404010100
-040201000403010004040102043a0502000204a800050409000104060501040901000403
-010004050100040201000401010004050100040c01000406010004000100040201000405
-010004020100040301000407010004390502000204a80005040900010406050104090100
-040301000405010004020100040101000402010004010100040201000408010004020100
-040301000403010004020100040101000402010004030100040301000402010004390502
-00020408050a040701040408010004160100040401000420010204050100040901000429
-000504090001040605010409010004030100040601030402010204030102040a01020404
-01000404010204020100040201000404010104020102043a050200020408050900000409
-0100040a0100041c01000422010004100100042900050409000105080493050200020408
-050103060001040901000403010004000101040201000400010104030102040201000400
-01010403010204020104040901020402010004000101040c010004030102040201000400
-010104020100040101000426000504090000050904930502000204080501030600010409
-010004030101040101000401010104010100040101000402010004010101040101000404
-010004040100040a0100040201000401010104010100040b010004050100040201010401
-010004010100040001000427000504a80502000204080501030600010409010004030100
-0402010004010100040201000401010004020100040101000408010004040100040a0100
-040201000401010004020100040b01000405010004020100040201000401010104280005
-04a805020002040805010306000104090100040301000402010004010100040201000401
-0104040101000408010004040100040a0100040201000401010004020100040b01000405
-01000402010004020100040101010428000504a805020002040805010306000104090100
-0403010004020100040101000402010004010100040501000408010004040100040a0100
-040201000401010004020100040b01000405010004020100040201000401010004000100
-0427000504a8050200020408050103060001040901000403010004020100040101000402
-01000401010004020100040101000408010004040100040a010004020100040101000402
-0100040b010004050100040201000402010004010100040101000426000504a805020002
-040805010306000104070104040101000402010004010100040201000402010204020100
-0408010004050101040901020402010004020100040b0100040501000402010004020100
-04010100040201000425000504a8050200020408050100080494000504a8050200020408
-050000090494000504a80502000204a8000504a80502000204a8000504a80502000204a8
-000504a80502000204a8000504a80502000204a8000504a805020002041b0501048a0005
-04a805020002041a0503040e01000404010204030102040a01020405010004090100044a
-000504a80502000204190505040d01000406010004050100040c010004100100044a0005
-04a8050200020418050203010502040b0100040001000405010004050100040c01000403
-010204020100040001010402010004010100040301020440000504a80502000204170502
-03030502040a0100040001000405010004050100040c0100040501000402010104010100
-04010100040001000403010004020100043f000504a80502000204160502030505020409
-0100040001000405010004050100040c0100040501000402010004020100040101010404
-01000443000504a805020002041500020307000204070100040201000404010004050100
-040c010004050100040201000402010004010101040501020440000504a8050200020416
-000203050002040801040404010004050100040c01000405010004020100040201000401
-01000400010004070100043f000504a80502000204170002030300020409010004020100
-0404010004050100040c0100040501000402010004020100040101000401010004020100
-04020100043f000504a8050200020418000203010002040a010004020100040401000405
-0100040c01000405010004020100040201000401010004020100040201020440000504a8
-05020002041900050488000504a805020002041a00030489000504a805020002041b0001
-048a000504a80502000204a8000504a80502000204a8000504a80502000204a8000504a8
-0502000204a8000504a80502000204a8000504a805020002041b0001048a000504a80502
-0002041a0003040c01040404010004120100040b01020405010004090100041b0102041d
-000504a80502000204190005040b0100041c0100040d010004100100041d0100041d0005
-04a8050200020418000204010002040a0100040601020402010004000101040301020402
-0104040b01000403010204020100040001010402010004010100040a0102040201000400
-01010405010004020100040201000415000504a805020002041700020403000204090100
-040801000402010104010100040101000402010004030100040d01000405010004020101
-040101000401010004000100040a01000402010004010101040101000404010004020100
-040201000415000504a80502000204160002040500020408010304050100040201000405
-010004070100040d010004050100040201000402010004010101040b0100040201000401
-0100040201000404010004030100040101000415000504a8050200020415050204070502
-0407010004080100040201000406010204040100040d0100040501000402010004020100
-04010101040b010004020100040101000402010004040100040301000401010004150005
-04a80502000204160502040505020408010004080100040201000409010004030100040d
-01000405010004020100040201000401010004000100040a010004020100040101000402
-01000404010004040100040001000415000504a805020002041705020403050204090100
-0408010004020100040501000402010004030100040d0100040501000402010004020100
-040101000401010004090100040201000401010004020100040401000404010104160005
-04a8050200020418050204010502040a010004080100040201000406010204050101040b
-010004050100040201000402010004010100040201000409010204020100040201000404
-0100040501000416000504a80502000204190505047001000416000504a805020002041a
-0503046e0100040001000417000504a805020002041b0501047001000418000504a80502
-000204a8000504a80502000204a8000504a80502000204a8000504a80502000204a80005
-04a80502000204a8000504a80502000204a8000504a80502000204a8000504a805020002
-04a8000504a80502000204a8000504a80502000204a8000504a80502000204a8000504a8
-0502000204a8000504a80502000204a8000505ab000205a8000405ac000105a9000305ad
-000005aa00ff00ff00ff00ff001f04ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff04570005040f01040434010004130100041a01000406010004d3
-0005041101000436010004130100041a010004db00050411010004030100040001010403
-01020403010204030102040a010204020100040201000401010404010100040001010402
-010004020100040101040409010204020100040001010402010404020102040301020402
-010004000101040301020404010104b70005041101000403010104010100040101000402
-010004010100040201000401010004020100040801000402010004010100040201000403
-01000403010104010100040101000402010004030100040a010004020100040101010401
-010004030100040601000402010004020100040101010401010004010100040201000403
-010104b70005041101000403010004090100040101000405010004020100040801000402
-01000401010004020100040301000403010004020100040101000402010004030100040a
-010004020100040101000402010004030100040601000402010004020100040101000402
-01000401010004c100050411010004030100040601030401010004050104040801000402
-01000401010004020100040301000403010004020100040101000402010004030100040a
-010004020100040101000402010004030100040601000402010004020100040101000402
-01000402010204be0005041101000403010004050100040201000401010004050100040c
-010004020100040101000402010004030100040301000402010004010100040201000403
-0100040a0100040201000401010004020100040301000406010004020100040201000401
-0100040201000405010004bd000504110100040301000405010004020100040101000402
-010004010100040201000408010004020100040101000401010104030100040301010401
-0100040101000401010104030100040a0100040201000401010104010100040301000406
-01000402010004020100040101000402010004010100040201000403010104b700050411
-010004030100040601030402010204030102040a01020403010104000100040401010401
-010004000101040301010400010004040101040901020402010004000101040501010404
-0100040301020402010004020100040201020404010104b70005044e01000421010004e4
-0005044e01000421010004e40005044e01000421010004e4000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff045700050416050104ff043e000504150503040c010404190100
-040d010004ff0401000504140505040d0100042a010004ff040100050413050203010502
-040c01000403010004000101040901000402010004020102040201000400010104030101
-0400010004020102040201000402010004f300050412050203030502040b010004030101
-040101000408010004020100040401000402010104010100040101000401010104010100
-04020100040101000402010004f300050411050203050502040a01000403010004020100
-040801000400010004000100040401000402010004020100040101000402010004010100
-0402010004010100040001000400010004f3000504100002030700020409010004030100
-040201000408010004000100040001000404010004020100040201000401010004020100
-040101000402010004010100040001000400010004f300050411000203050002040a0100
-040301000402010004080100040001000400010004040100040201000402010004010100
-04020100040101000402010004010100040001000400010004f300050412000203030002
-040b01000403010004020100040801000400010004000100040401000402010004020100
-0401010004010101040101000402010004010100040001000400010004f3000504130002
-03010002040a010404010100040201000409010004000100040501000402010004020100
-040201010400010004020102040301000400010004f400050414000504ff043c00050415
-000304ff043d00050416000104ff043e000504ff0457000504ff0457000504ff04570005
-04ff0457000504ff0457000504ff040600470408000504ff040600460500040800050467
-058d0410000104430501040800050467058c000004100001044305010408000504670501
-048900010410000104430501040800050467050104890001041000010443050104080005
-04160001044e0501048900010410000104070602043805010408000504150003040c0104
-041201010404010004030102041905010489000104100001040706000401060004370501
-0408000504140005040d010004130100040d010004190501048900010410000104070600
-040106000402060004000601040306020402060004020600040206020403060204140501
-040800050413000204010002040c010004040102040b0100040401020405010004030102
-041205010489000104100001040706000401060004020601040106000401060004020600
-040106000402060004010600040206000401060004020600041305010408000504120002
-04030002040b010004030100040201000408010404040100040501000402010004020100
-041105010489000104100001040706030402060004050600040206000401060004000600
-0400060004010600040506000402060004130501040800050411000204050002040a0100
-0403010004020100040a0100040601000405010004020100040201000411050104890001
-041000010407060004020600040106000405060004020600040106000400060004000600
-040206020402060404130501040800050410050204070502040901000403010004020100
-040a01000406010004050100040201040411050104890001041000010407060004020600
-040106000405060004020600040106000400060004000600040506000401060004170501
-040800050411050204050502040a01000403010004020100040a01000406010004050100
-040201000415050104890001041000010407060004020600040106000405060004020600
-040106000400060004000600040106000402060004010600040206000403060104040601
-040406010501040800050412050204030502040b01000403010004020100040a01000406
-010004050100040201000402010004110501048900010410000104070603040206000406
-060204030600040006000403060204030602040406010404060104040601050104080005
-0413050204010502040c010004040102040b010004060100040501000403010204120501
-0489000104100001044305010408000504140505044c0501048900010410000104430501
-0408000504150503044d05010489000104100001044305010408000504160501044e0501
-048900010410000104430501040800050467050104890001041000010443050104080005
-04670501008b04100001044305010408000504670500008c041000010443050104080005
-04ff0406000105450408000504ff0406000005460408000504ff0457000504ff04570005
-04ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff04570005
-04ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff04570005
-04ff0457000504ff0457000504ff0457000505ff0557000405ff0558000305ff055900ff
-00ff00ff00ff001f04ff0457000504ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff04570005044c003b044b003b04460005044c003a
-0500044b003a050004460005044c000104370501044b00010437050104460005044c0001
-04370501044b00010437050104460005044c000104370501044b00010437050104460005
-044c000104370501044b00010437050104460005044c000104370501044b000104370501
-04460005044c000104370501044b00010437050104460005044c000104370501044b0001
-0437050104460005044c000104150102040201000402010004160501044b000104070102
-041f01020409050104460005044c00010414010004020100040101000401010004170501
-044b00010406010004020100042001000409050104460005044c00010414010004020100
-040101000400010004180501044b00010406010004020100040201020402010004000101
-0403010204030102040501000409050104460005044c0001041401000402010004010101
-04190501044b000104060100040501000402010004010101040101000401010004020100
-0401010004020100040401000409050104460005044c0001041401000402010004010100
-0400010004180501044b0001040601000409010004010100040201000401010004050100
-04020100040401000409050104460005044c000104140100040201000401010004010100
-04170501044b000104060100040601030401010004020100040101000405010404040100
-0409050104460005044c00010414010004020100040101000401010004170501044b0001
-040601000402010004010100040201000401010004020100040101000405010004080100
-0409050104460005044c00010414010004020100040101000402010004160501044b0001
-040601000402010004010100040201000401010004020100040101000402010004010100
-04020100040401000409050104460005044c000104150102040201000402010004160501
-044b00010407010204030103040101000402010004020102040301020405010004090501
-04460005044c000104370501044b00010437050104460005044c000104370501044b0001
-0437050104460005044c000104370501044b00010437050104460005044c000104370501
-044b00010437050104460005044c000104370501044b00010437050104460005044c0001
-04370501044b00010437050104460005044c000104370501044b00010437050104460005
-044c000104370501044b00010437050104460005044c000104370501044b000104370501
-04460005044c000104370501044b00010437050104460005044c00010539044b00010539
-04460005044c0000053a044b0000053a0446000504ff0457000504ff0457000504ff0457
-000504ff0457000504ff0457000504ff045700010500000204ff045700000501000204ff
-0457
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 53 250 318
-%%EOF
diff --git a/lib/pman/doc/src/part.xml b/lib/pman/doc/src/part.xml
deleted file mode 100644
index 29b88e0785..0000000000
--- a/lib/pman/doc/src/part.xml
+++ /dev/null
@@ -1,37 +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>1996</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>Pman User's Guide</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The process manager <em>Pman</em> is a graphical tool used to
-      inspect the Erlang processes executing either locally or on remote
-      nodes. It is also possible to trace events in the individual processes.</p>
-  </description>
-  <xi:include href="pman_chapter.xml"/>
-</part>
-
diff --git a/lib/pman/doc/src/part_notes.xml b/lib/pman/doc/src/part_notes.xml
deleted file mode 100644
index 1505d52421..0000000000
--- a/lib/pman/doc/src/part_notes.xml
+++ /dev/null
@@ -1,39 +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>2004</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>Pman Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2004-09-07</date>
-    <rev>1.0</rev>
-    <file>part_notes.sgml</file>
-  </header>
-  <description>
-    <p>The process manager <em>Pman</em> is a graphical tool used to
-      inspect the Erlang processes executing either locally or on remote
-      nodes. It is also possible to trace events in the individual
-      processes.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/pman/doc/src/pman.xml b/lib/pman/doc/src/pman.xml
deleted file mode 100644
index 48eaf9167c..0000000000
--- a/lib/pman/doc/src/pman.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1996</year>
-      <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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>pman</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <module>pman</module>
-  <modulesummary>A graphical process manager.</modulesummary>
-  <description>
-    <warning>
-      <p>
-	The Pman application has been superseded by the Observer application.
-	Pman will be removed in R16.
-      </p>
-    </warning>
-    <p>A graphical tool used to inspect the Erlang processes executing either
-      locally or on remote nodes. It is also possible to trace events in
-      the individual processes.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>start()</name>
-      <name>start(Excluded)</name>
-      <name>start_notimeout()</name>
-      <name>start_notimeout(Excluded)</name>
-      <fsummary>Start Pman.</fsummary>
-      <type>
-        <v>Excluded = [Module]</v>
-        <v>&nbsp;Module = atom()</v>
-      </type>
-      <desc>
-        <p>Starts Pman. It will use the previously saved trace settings
-          in <c>HOME/.erlang_tools/pman.opts</c>, where <c>HOME</c> is
-          the user's home directory, if such a file exists. Otherwise
-          standard trace settings will be used. The return value should
-          be ignored.</p>
-        <p><c>Excluded</c> is a list of module names. If the argument is
-          present, processes currently executing in any of these modules
-          will not be shown by Pman.</p>
-        <p><c>start/0,1</c> will fail unless the start-up succeeds
-          within 20 seconds, whereas <c>start_notimeout/0,1</c> will
-          wait indefinitely.</p>
-      </desc>
-    </func>
-    <func>
-      <name>proc(Process)</name>
-      <name>proc(A, B, C)</name>
-      <fsummary>Start a Pman trace window.</fsummary>
-      <type>
-        <v>Process = pid() | atom()</v>
-        <v>A = B = C = integer()</v>
-      </type>
-      <desc>
-        <p>Starts a Pman trace window for the specified process.
-          The return value should be ignored.</p>
-        <p>The process to trace is given either by its pid or by its
-          registered name. It is also possible to use <c>proc/3</c>
-          to trace the pid represented as <c><![CDATA[<A,B,C>]]></c>.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/pman/doc/src/pman_chapter.xml b/lib/pman/doc/src/pman_chapter.xml
deleted file mode 100644
index ce4adbec45..0000000000
--- a/lib/pman/doc/src/pman_chapter.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1996</year><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>Pman</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-    <file>pman_chapter.xml</file>
-  </header>
-  <marker id="here"></marker>
-
-  <section>
-    <title>Introduction</title>
-    <warning>
-      <p>
-	The Pman application has been superseded by the Observer application.
-	Pman will be removed in R16.
-      </p>
-    </warning>
-    <p>The process manager Pman is a tool for viewing processes executing
-      locally or on remote nodes. Its main purpose is to locate
-      erroneous code by inspecting the state of the processes and by tracing
-      events. Bottlenecks, unread messages, and bad memory handling are 
-      some of the problems that can be solved with Pman.</p>
-    <p>Processes may be inspected individually in a process trace
-      window. There the user may dynamically follow the execution of a
-      process by getting trace output for sent and received messages
-      as well as for called functions and some other process
-      events. Information about source code modules executed by the
-      processes is also accessible. Note that Pman has some effect on
-      the real time behavior of a running system.</p>
-  </section>
-
-  <section>
-    <title>Getting Started with Pman</title>
-    <p>Start Pman by calling <c>pman:start()</c>. It will start
-      the <seealso marker="#main_win">Main Window</seealso>, showing an
-      overview of all processes running at the current node.</p>
-    <p>To trace a certain process, select it by clicking on its line and
-      then chose Trace-&gt;Selected Process, or simply double-click it. This
-      will open a <seealso marker="#trace_win">Trace Window</seealso>.
-      In the Trace Window, there is some information about the process
-      and traced events are added dynamically.</p>
-    <p>Which events to trace are selected in
-      the <seealso marker="#options_win">Options Window</seealso> which
-      is opened by choosing File-&gt;Options... in the Main Window or in a
-      Trace Window. Currently supported trace events are message sending,
-      message receiving, function calls and process events.</p>
-    <p>It is possible to by-pass the Main Window and open a Trace
-      Window directly for the process <c>Pid</c> by calling
-      <c>pman:proc(Pid)</c>.</p>
-  </section>
-
-  <section>
-    <marker id="main_win"></marker>
-    <title>The Main Window</title>
-    <p>The Main Window shows all processes running at the displayed node.
-      The window is automatically updated every 5 seconds.
-      Select which node to display in the window by choosing the node name
-      from the Nodes menu.</p>
-    <image file="main_window.gif">
-      <icaption>The Main Window.</icaption>
-    </image>
-    <p>A process can be selected by clicking on its line. The selected
-      process is highlighted. Use the arrow keys to move up and down in
-      the process overview.</p>
-    <p>The following information is displayed for each process:</p>
-    <list type="bulleted">
-      <item>Pid - process identifier.</item>
-      <item>Current Function - the function (<c>Module:Function/Arity</c>)
-       the process is currently executing.</item>
-      <item>Name - registered name of the process, if any.</item>
-      <item>Msgs - number of messages in the process' mailbox.</item>
-      <item>Reds - number of reductions performed. Gives a rough estimate
-       of the process' work load.</item>
-      <item>Size - estimated size of the process, in words, calculated by
-       adding the stack size and the heap size.</item>
-    </list>
-    <p>At the bottom of the window the following functions and
-      information can be found:</p>
-    <taglist>
-      <tag><em>Hide System Processes</em></tag>
-      <item>This check button controls the display of what Pman consider
-      <em>system processes</em>, that is, processes Pman knows are part
-       of Erlang/OTP rather than the user's application.
-       If the button is selected, these system processes will not be
-       shown.</item>
-      <tag><em>Auto-Hide New</em></tag>
-      <item>This check button controls the treatment of newly created
-       processes. If it is selected, new processes will not be shown.</item>
-      <tag><em># Hidden</em></tag>
-      <item>This label displays the number of processes currently
-       executing that are not shown in the process overview.</item>
-    </taglist>
-
-    <section>
-      <title>The File Menu</title>
-      <taglist>
-        <tag><em>Options...</em></tag>
-        <item>Open the <seealso marker="#options_win">Options Window</seealso>
-         which allows the user to set the trace options to use.</item>
-        <tag><em>Save Options</em></tag>
-        <item>Save the options set using the Options Window. The options are
-         stored to the file <c>HOME/.erlang_tools/pman.opts</c>, where
-        <c>HOME</c> is the user's home directory, and are automatically
-         loaded the next time Pman is started.</item>
-        <tag><em>Exit</em></tag>
-        <item>Stop Pman.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The View Menu</title>
-      <p>This menu mainly contains buttons for controlling what to
-        display in the Main Window. Note that the View Menu overrides
-        the settings of the check buttons (Hide System processes, Auto-Hide
-        new) in the Main Window.</p>
-      <taglist>
-        <tag><em>Hide All Processes</em></tag>
-        <item>Hide all processes.</item>
-        <tag><em>Hide Modules...</em></tag>
-        <item>Opens a dialog window with all loaded modules. If the user
-         selects a window and clicks OK, the process overview will not
-         show any processes running code from those modules.</item>
-        <tag><em>Hide Selected Processs</em></tag>
-        <item>Hide the selected process.</item>
-        <tag><em>Module Info...</em></tag>
-        <item>Given a selected process currently executing a function in
-         the module <c>Module</c>, this menu button opens a window
-         showing information about the module as returned from
-        <c>Module:module_info()</c>.</item>
-        <tag><em>Refresh</em></tag>
-        <item>Updates the process overview.</item>
-        <tag><em>Show All Processes</em></tag>
-        <item>Show all processes, except system processes and/or new
-         processes if <em>Hide System Processes</em> and/or
-        <em>Auto-Hide New</em> is selected.</item>
-        <tag><em>Show Processes...</em></tag>
-        <item>Opens a dialog window with all hidden processes. If
-         the user selects a process and clicks OK, the process
-         overview will show that process.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Trace Menu</title>
-      <taglist>
-        <tag><em>Kill</em></tag>
-        <item>Terminates the selected process by calling
-        <c>exit(Pid,kill)</c>.</item>
-        <tag><em>Trace Selected Process</em></tag>
-        <item>Opens a Trace Window for the selected process. Tracing
-         will start immediately with the default trace flags set from
-         the Main Window.</item>
-        <tag><em>Shell Process</em></tag>
-        <item>Opens a Trace Window for the shell process of node Pman
-         was started at (not the displayed node). If the shell process
-         dies, the opened Trace Window will find the pid of
-         the automatically started new shell process, and continue to
-         trace that process.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Nodes Menu</title>
-      <p>The Nodes menu contains one entry for each known node.
-        By selecting a node from the Nodes menu, the process overview
-        window will change its view, and display the processes running
-        on that node.</p>
-    </section>
-
-    <section>
-      <title>The Help Menu</title>
-      <taglist>
-        <tag><em>Help</em></tag>
-        <item>Selecting Help from the Help menu will cause the HTML
-         version of the Pman User's Guide (this document) to be
-         displayed. Currently this function requires Netscape to be up
-         and running.</item>
-      </taglist>
-    </section>
-  </section>
-
-  <section>
-    <marker id="trace_win"></marker>
-    <title>The Trace Window</title>
-    <p>A Trace Window outputs trace information for a traced process.
-      A Trace Window automatically uses the trace options set in
-      the Main Window, but it is also possible to change the options for
-      each Trace Window individually.</p>
-    <image file="trace.gif">
-      <icaption>The Trace Window.</icaption>
-    </image>
-    <p>There is no limit to how many Trace Windows can be open at the same
-      time. However, notice that if more processes are traced,
-      the performance degradation of the system will be more noticeable.</p>
-    <p>The following information is displayed, where applicable:</p>
-    <list type="bulleted">
-      <item>initial call - the function (<c>Module:Function/Arity</c>)
-       the process started executing in.</item>
-      <item>current function - the function (<c>Module:Function/Arity</c>)
-       the process is currently executing.</item>
-      <item>messages - the messages in the mailbox.</item>
-      <item>dictionary - the contents of the process dictionary.</item>
-      <item>heap size - heap size in words.</item>
-      <item>stack size - stack size in words.</item>
-      <item>reductions - number of reductions performed. Gives a rough
-       estimate of the process' work load.</item>
-      <item>links - list of pids the process is linked to.</item>
-      <item>trap_exit - <c>true</c> if the process trap exit signals,
-      <c>false</c> otherwise.</item>
-    </list>
-    <p>In the Trace Window, trace output is continuously added. First in
-      each trace message is the pid of the traced process.
-      Note that if the inheritance flags for tracing are set, the trace
-      output for the spawned/linked processes will be shown in the same
-      window as the spawning/linking process.</p>
-    <p>Each trace message also has a mnemonic tag:</p>
-    <taglist>
-      <tag><em>!</em></tag>
-      <item>This tag indicates that a message has been sent. Following
-       the <c>To:</c> tag will be a pid/name of the receiver. Next,
-       following the <c>Msg:</c> tag will be the sent message.</item>
-      <tag><em>rec</em></tag>
-      <item>This tag indicates that a message has been received.
-       Following this will be the received message.</item>
-      <tag><em>call</em></tag>
-      <item>This tag indicates a call to a function. Following this will be
-       the actual call, with all the arguments.</item>
-      <tag><em>link</em></tag>
-      <item>This tag indicates that a link between the traced process and
-       another process has been created. Following this will be the pid
-       of the other process.</item>
-      <tag><em>spawn</em></tag>
-      <item>This tag indicates that the traced process has spawned another
-       process. Following this will be the pid of the spawned process.</item>
-      <tag><em>exit</em></tag>
-      <item>This tag indicates that traced process has exited. Following
-       this will be the exit reason.</item>
-    </taglist>
-
-    <section>
-      <title>The File Menu</title>
-      <taglist>
-        <tag><em>Options...</em></tag>
-        <item>Opens the <seealso marker="#options_win">Options Window</seealso>
-         which allows the user to set the trace options to use for this
-         specific Trace Window.</item>
-        <tag><em>Save Buffer...</em></tag>
-        <item>Opens a dialog that prompts the user for a file name to
-         save the current Trace Window contents in.</item>
-        <tag><em>Close</em></tag>
-        <item>Stops tracing of the process, and closes the Trace Window.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The View Menu</title>
-      <taglist>
-        <tag><em>Clear Buffer</em></tag>
-        <item>Clears the contents of the Trace Window.</item>
-        <tag><em>Module Info</em></tag>
-        <item>Opens a window showing information about the module
-         the process is currently executing code from, as returned from
-        <c>Module:module_info()</c>.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Trace Menu</title>
-      <taglist>
-        <tag><em>All Linked Processes</em></tag>
-        <item>Opens a Trace Window for each of the processes linked to the
-         process being traced in the current Trace Window.</item>
-        <tag><em>Linked Process -></em></tag>
-        <item>The Linked Process submenu has one entry for each process
-         linked to the process being traced in the current Trace Window.
-         Select one of the processes to open a new Trace Window for that
-         process.</item>
-        <tag><em>Kill</em></tag>
-        <item>Terminates the process being traced in the current Trace
-         Window by calling <c>exit(Pid,kill)</c>.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Help Menu</title>
-      <taglist>
-        <tag><em>Help</em></tag>
-        <item>Selecting Help from the Help menu will cause the HTML version
-         of the Pman User's Guide (this document) to be displayed.
-         Currently this function requires Netscape to be up and running.</item>
-      </taglist>
-    </section>
-  </section>
-
-  <section>
-    <marker id="options_win"></marker>
-    <title>The Options Window</title>
-    <p>The Options Window allows the user to specify the amount of output,
-      and the destination of output for traced processes.</p>
-    <image file="options.gif">
-      <icaption>The Options Window.</icaption>
-    </image>
-    <p>In the upper left corner of the Options Window, there are check
-      buttons for determining what to output in the Trace Window:</p>
-    <taglist>
-      <tag><em>Trace send</em></tag>
-      <item>Select this check button to display information about sent
-       messages.</item>
-      <tag><em>Trace receive</em></tag>
-      <item>Select this check button to display information about received
-       messages.</item>
-      <tag><em>Trace functions</em></tag>
-      <item>Select this check button to display information about
-       function calls.</item>
-      <tag><em>Trace events</em></tag>
-      <item>Select this check button to display information about process
-       events, such as spawn, link and exit.</item>
-    </taglist>
-    <p>In the upper right corner of the dialog, there are options for
-      controlling the behaviour of spawned or linked processes:</p>
-    <taglist>
-      <tag><em>Inherit on spawn</em></tag>
-      <item>
-        <p>The user may select if spawned processes shall also be traced.
-          And if so, if all spawned processes should be traced, or just
-          the first spawned process.</p>
-        <p>If a spawned process is traced, it will get the same trace
-          options that are set for the spawning process. And the output
-          will be shown in the same Trace Window as that of the spawning
-          process.</p>
-        <p>.</p>
-      </item>
-      <tag><em>Inherit on link</em></tag>
-      <item>
-        <p>The user may select if a process that is being linked to
-          shall be traced. And if so, if all linked processes shall be
-          traced, or just the first one linked to.</p>
-        <p>If a linked process is traced, it will get the same trace
-          options that are set for the linking process. And the output
-          will be shown in the same Trace Window as that of the linked
-          process.</p>
-      </item>
-    </taglist>
-    <p>In the lower part of the Options Dialog, the user may select
-      whether the trace information shall be output to a file, or appear in
-      the trace window.</p>
-    <p>Sending trace information to a file is more efficient than displaying
-      it in the Trace Window. Furthermore, if the amount of trace data is
-      large, it will not be lost if tracing to a file. The trace information
-      in the Trace Window has an upper limit (approx. 10,000 lines), after
-      which the output buffer will be cleared.</p>
-  </section>
-</chapter>
-
diff --git a/lib/pman/doc/src/ref_man.xml b/lib/pman/doc/src/ref_man.xml
deleted file mode 100644
index 4deb1d9b3d..0000000000
--- a/lib/pman/doc/src/ref_man.xml
+++ /dev/null
@@ -1,37 +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>1996</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>Pman Reference Manual</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev></rev>
-  </header>
-  <description>
-    <p>The process manager <em>Pman</em> is a graphical tool used to
-      inspect the Erlang processes executing either locally or on remote
-      nodes. It is also possible to trace events in the individual processes.</p>
-  </description>
-  <xi:include href="pman.xml"/>
-</application>
-
diff --git a/lib/pman/doc/src/toolbar.gif b/lib/pman/doc/src/toolbar.gif
deleted file mode 100644
index 116e32ace8..0000000000
--- a/lib/pman/doc/src/toolbar.gif
+++ /dev/null
diff --git a/lib/pman/doc/src/trace.gif b/lib/pman/doc/src/trace.gif
deleted file mode 100644
index 8b34ec7ea0..0000000000
--- a/lib/pman/doc/src/trace.gif
+++ /dev/null
diff --git a/lib/pman/doc/src/trace.ps b/lib/pman/doc/src/trace.ps
deleted file mode 100644
index 0828d4ade1..0000000000
--- a/lib/pman/doc/src/trace.ps
+++ /dev/null
@@ -1,1312 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./trace.tmp.eps)
-%%CreationDate: (Tue Jun 12 18:05:00 2001)
-%%BoundingBox: 0 17 377 309
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 17 377 309
-userdict begin
-%%BeginData:
-DisplayImage
-0 17
-377.000000 292.000000
-12
-562 436
-1
-0
-0
-8
-ffffff
-000000
-b24d7a
-dcadc2
-57253b
-d9d9d9
-c3c3c3
-828282
-03ff03ff034e040003ff03f40400031c04000301021a0400030002ff02f304000300021a
-04010301021a0400030002ff02f304000300021a04010301021a0400030002ff02f30400
-0300021a0401030102020418030004ff04f4030004170202040103010202040003ff03ff
-032602020401030102020400030002150400030002ff02db040003000215040003000215
-0400030002020401030102020400030002150400030002ff02db04000300021504000300
-02150400030002020401030102020400030002150400030002ff02db0400030002150400
-030002150400030002020401030102020400030002150400030002ff02db040003000215
-040003000202030f02020400030002020401030102020400030002150400030002ff0263
-000302730400030002150400030002020300020d04000202040003000202040103010202
-04000300021504000300021f000602020001020600010206000102060001020500000209
-0004020100010211000102020001025a0002020a000502040004020c0002022f00010205
-00000212000102110001021b0004020d000102080001023a040003000215040003000202
-0300020d0400020204000300020204010301020204000300021504000300021f00010202
-000202010002020400020205000202060002020400000207000202020000020100010211
-000102020001025800010202000102080000020200020203000002020001020900010202
-0001022d00020204000002120001021100010219000102040000020c000102080001023a
-0400030002150400030002020300020d0400020204000300020204010301020204000300
-021504000300021f00010203000102010002020400020205000002000001020500020204
-0000020700010206000102110001020200010258000102020001020d0001020800010208
-000102020001022d00020204000002120001021100010218000002070000020b00010245
-0400030002150400030002020300020d0400020204000300020204010301020204000300
-021504000300021f00010203000102010000020000000203000302050000020000010205
-000002000001020300000203000102010001020600010200000302050003020200010202
-000102080001020000020204000102000001020200040204000402030003020300040203
-0004020f00000201000102040001020c0001020800010207000102040001020000000211
-000402020001020000030209000002000001020300000204000402040002020000010204
-000302070004020200040204000402030000020300030201000002030004020100010200
-00030203000102010001020400000202000402030004021f040003000215040003000202
-0300020d04000202040003000202040103010202040003000202030f020204000300021f
-000102030001020100000200000102020000020000010204000102000001020500000200
-000202020000020300010201000302040002020200010203000102010001020100010202
-000102080002020100010203000202030001020200010202000102060001020100010201
-000102060001021100010202000102040001020b00010209000102070001020400010201
-0001020e0001020200010201000202020001020800000200000202020000020300010202
-000102020001020100020203000102010001020700010203000102020001020200010202
-000102020000020100010202000002010000020200010205000202020001020200010202
-000002040000020200000202000102010001022304000300020803030208040003000202
-0300020d040002020400030002020401030102020400030002020300020d040002020400
-0300021f0001020200010202000002000001020200000200000102040000020200010204
-000002010001020200000208000402020001020300010202000102030001020000010202
-000102080001020300010202000102030001020400010200000102060001020300010200
-000102060001020f0001020400010204000102080002020a000102080001020400010203
-0001020b0001020400010200000102030001020800000201000102020000020200010204
-000102000001020300010202000102030001020600010202000102040001020000010204
-000102000000020200000202000102010000020100010206000102030001020200010202
-000102020000020700010201000102230400030002080300020104000208040003000202
-0300020d040002020400030002020401030102020400030002020300020d040002020400
-0300021f0005020300000201000102000000020100010203000102020001020400000202
-000102010000020a00030201000102030001020200010203000102000001020200010208
-000102030001020200010203000102040001020000010206000102030001020000030204
-0003020a00020206000102040001020b0001020800000209000102040001020500020208
-000102040001020000010203000102080000020200010201000002020001020400010200
-000102030001020200010203000102060001020200010204000102000001020400010200
-000002010000020200010202000002010001020600010203000102020001020200010202
-00000207000102010003022104000300020803000201040002080400030002020300020d
-040002020400030002020401030102020400030002020300040e020204000300021f0001
-020700000201000102000000020100010203000102020002020300000202000202000000
-020c00020200000102030001020200070200000102020001020800010203000102020001
-020300010204000102000001020600070202000302040003020600020208000102040001
-020c000102060000020a0001020400010207000202060001020400010200000102030001
-020800000202000202000000020200010204000102000001020300010202000702060001
-020200010204000102000001020400010200000002010000020100020201000102010001
-02060001020300010202000102030000020100010204000402030003021f040003000208
-0300040202080400030002020300020d0400020204000300020204010301020204000300
-021504000300021f00010207000002010001020000000201000102030007020300000203
-000102000000020d00010200000102030001020200010206000102020001020800010203
-00010202000102030001020400010200000102060001020a000202050002020700020206
-000102040001020c000102050000020b0001020400010205000202080001020400010200
-000102030001020800000203000102000000020200010204000102000001020300010202
-0001020c0001020200010204000102000001020400010200000002010000020100000200
-000002010000020200010206000102030001020200010203000102000000020300020201
-000102050002021e0400030002150400030002020300020d040002020400030002020401
-0301020204000300021504000300021f0001020700000202000102020001020200010204
-00010203000002040002020d000102000001020300010202000102060001020200010208
-0001020300010202000102030001020400010200000102060001020b000102060001020a
-00010205000102020001020d000102040000020d00010202000102040001020b00010204
-000102000001020300010208000002040002020200010204000102000001020300010202
-0001020c0001020200010204000102000001020400010201000002000002020100020203
-00010206000102030001020200010203000102000000020300010202000102060001021e
-0400030002150400030002020300020d0400020204000300020204010301020204000300
-021504000300021f00010207000002020001020200010202000002060001020200000204
-000202030001020100000203000102010001020300010203000102030000020000010202
-000102080002020100010203000102040001020200010202000102020000020200010203
-000002000000020300010201000002030001020c00010203000102020001020300010202
-0000020200010204000102080001020200010202000102020001020e0001020200010201
-000102030001020800000204000202030001020200010202000102010002020300010203
-000002060001020300010202000102020001020200010202000102030000020700010202
-00000201000102030001020200010204000102040001020200010201000002030001021e
-0400030002150400030002020300020d0400020204000300020204010301020204000300
-021504000300021f00010207000002070001020100010206000102020000020500010203
-000102010005020200010203000102050004020000010202000102080001020000020204
-00010205000402040004020400040200000502020005020f000002040002020500010202
-000402050006020300010204000202030000021100040202000102030001020800000205
-000102040004020400020200000102050004020600010204000402040004020500030209
-000402010001020300010202000102040001020500030200000102000005021f04000300
-02150400030002020300020d040002020400030002020401030102020400030002150400
-03000282000102ff02560400030002150400030002020300020d04000202040003000202
-040103010202040003000215040003000282000102ff0256040003000215040003000202
-0300040e0202040003000202040103010202040003000215040003000282000102ff0256
-0400030002150400030002150400030002020401030102020400030002150400030002ff
-02db04000300021504000300021504000300020204010301020204000300021504000300
-02ff02db04000300021504000300021504000300020204010300040403000416030004ff
-04dc030004160300041603000404030500ff00ff00250304040003010202040000ff00ff
-00240700030002020401030102020400000105ff05ff0521070103000202040103010202
-0400000105ff05ff05210701030002020401030102020400000105ff05ff052107010300
-02020401030102020400000105ff05ff05210701030002020401030102020400000105ff
-05ff052107010300020204010301020204000001050b01040504010005030102051f0100
-05020100050401000526010405ff05860100050201000509010205130701030002020401
-0301020204000001050b0100050f0100051f010005020100052e010005ff058801000502
-0100050b0100051307010300020204010301020204000001050b01000506010205050100
-050301020518010005020100050201020503010205020100050201000519010005030100
-0500010105030102050301020503010205ff056b01000502010005020102050501000502
-010005000101050c07010300020204010301020204000001050b01000508010005050100
-050201000502010005180100050001000505010005020100050201000501010005020100
-051901000503010105010100050101000502010005010100050201000501010005020100
-05ff056a0100050201000501010005020100050401000502010105010100050b07010300
-020204010301020204000001050b01030505010005050100050201000502010005180100
-050001000505010005020100050201000501010005000100050001000519010005030100
-0509010005010100050501000502010005ff056a01040501010005020100050401000502
-010005020100050b07010300020204010301020204000001050b01000508010005050100
-050201040518010005000100050501000502010405010100050001000500010005190100
-0503010005060103050101000505010405ff056a01000502010005010104050401000502
-010005020100050b07010300020204010301020204000001050b01000508010005050100
-05020100051d010005060100050201000505010005000100050001000519010005030100
-0505010005020100050101000505010005ff056e01000502010005010100050801000502
-010005020100050b07010300020204010301020204000001050b01000508010005050100
-050201000502010005190100050601000502010005020100050101000500010005000100
-051901000503010005050100050201000501010005020100050101000502010005ff056a
-0100050201000501010005020100050401000502010105010100050b0701030002020401
-0301020204000001050b0100050801000505010005030102051a01000506010005030102
-0503010005000100051a01000503010005060103050201020503010205ff056b01000502
-010005020102050501000502010005000101050c07010300020204010301020204000001
-05ff05ff05100100050f07010300020204010301020204000001050a0106052a0106052a
-010605ff05840106050e0100050f07010300020204010301020204000001050a0106052a
-0106052a010605ff05840106050e0100050f0701030002020401030102020400000105ff
-05ff05210701030002020401030102020400000105ff05ff052107010300020204010301
-02020400000105ff05ff05210701030002020401030102020400000107ff07ff07230300
-02020401030102020400000007ff07ff072403000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0525
-03000202040103010202040005ff05ff052503000202040103010202040005ff05ff0515
-070f03000202040103010202040005ff05ff0515070f0300020204010301020204000504
-07ff07ff070e05010701060607000605030002020401030102020400050407ff07ff070d
-00000501070106050000070006050300020204010301020204000504070105ff05ff050a
-00010501070106050000070106040300020204010301020204000504070105cf010005ff
-053900010501070106040001070106040300020204010301020204000504070105030100
-050c01000504010005060100050a0102051801020503010205170100050d010205030102
-051f010205120100051501000502010205ff053300010501070106040001050007010603
-030002020401030102020400050407010517010005140100051a01000505010005170100
-050f010005050100052101000512010005140100050201000502010005ff053200010501
-070106030001050107010603030002020401030102020400050407010501010205020100
-050001010503010205020104050201020503010205050100050a01020503010205050100
-0505010005040101050a0102050201000500010105030102050501000505010005040101
-050301020502010005020100050201020505010005020100050201000502010205020104
-050201020502010005000101050501000506010005ff0532000105010701060300010502
-070106020300020204010301020204000504070105030100050201010501010005040100
-050401000506010005020100050201000504010005090100050201000501010005020100
-050401000505010005040101050901000502010005010101050101000501010005020100
-050401000505010005040101050201000502010005010100050201000501010005020100
-050401000502010005020100050101000502010005030100050301000502010005010101
-05010100050301000507010005ff05320001050107010602000105030701060203000202
-040103010202040005040701050301000502010005020100050401000504010005060100
-050601000504010005090100050901000504010005050100051001000505010005020100
-050101000502010005040100050501000509010005020100050101000502010005050100
-050401000502010005020100050501000503010005030100050201000501010005070100
-0505010105ff053300010501070106020001050407010601030002020401030102020400
-050407010503010005020100050201000504010005040100050601000503010305040100
-050901000506010305040100050501000511010205020100050201000501010405040100
-050501000509010405020100050001000503010305040100050201000502010005020103
-05030100050301000502010005010100050601000508010005ff05320001050107010601
-000105050701060103000202040103010202040005040701050301000502010005020100
-050401000504010005060100050201000502010005040100050901000505010005020100
-050401000505010005140100050101000502010005010100050801000505010005090100
-050601000500010005020100050201000504010005020100050201000501010005020100
-05030100050301000502010005010100050601000508010005ff05320001050107010601
-000105060701060003000202040103010202040005040701050301000502010005020100
-050401000504010005060100050201000502010005040100050901000502010005010100
-050201000504010005050100050401010509010005020100050101000502010005010100
-050201000504010005050100050401010502010005020100050301000503010005020100
-050401000502010005010101050101000502010005030100050301000502010005010100
-05050100050501000502010005ff05320001050107010600000105070701060003000202
-040103010202040005040701050301000502010005020100050401000505010105040100
-0503010305040100050a010205030103050401000505010005040101050a010205020100
-050201000502010205050100050501000504010105030102050401000504010305040100
-050301010500010005020103050401010502010205020100050501000506010205ff0533
-0001050107010600000105080701030002020401030102020400050407010530010505ff
-05d30001050107010001070b0300020204010301020204000504070105ff05ff050a0001
-050107010000070c0300020204010301020204000504070105ff05ff050a000105010701
-060d0300020204010301020204000504070105ff05ff050a000105010701000d03000202
-04010301020204000504070105ff05ff050a000105010701000d03000202040103010202
-04000504070105ff05ff050a0001050107010001050a0700030002020401030102020400
-0504070105ff05ff050a0001050107010001050a07000300020204010301020204000504
-070105ff05ff050a0001050107010001050a070003000202040103010202040005040701
-05ff05ff050a0001050107010001050a07000300020204010301020204000504070105ff
-05ff050a0001050107010001050a07000300020204010301020204000504070105ff05ff
-050a0001050107010001050a07000300020204010301020204000504070105ff05ff050a
-0001050107010001050a07000300020204010301020204000504070105ff05ff050a0001
-050107010001050a07000300020204010301020204000504070105ff05ff050a00010501
-07010001050a07000300020204010301020204000504070105ff05ff050a000105010701
-0001050a07000300020204010301020204000504070105ff05ff050a0001050107010001
-070b0300020204010301020204000504070105ff05ff050a0001050107010000070c0300
-020204010301020204000504070105ff05ff050a000105010701060d0300020204010301
-020204000504070105eb010005ff051d000105010701060d030002020401030102020400
-05040701052c0100050d0101051801000506010005250100050d010205030102051f0102
-050a0102051b01000502010205ff0517000105010701060d030002020401030102020400
-05040701052c0100050c0100051a0100052d0100050f01000505010005210100050c0100
-051a0100050201000502010005ff0516000105010701060d030002020401030102020400
-050407010501010205020100050201000501010005000101050201000500010105030102
-050201000500010105020104050a01000503010005020100050101000500010105030102
-050201040502010205030102050201000500010105040101050a01020502010005000101
-050301020505010005050100050401010503010205020100050201000502010205050100
-050c010005030102050301020502010005000101050501000506010005ff051600010501
-0701060d0300020204010301020204000504070105000100050201000501010005020100
-050101010501010005010101050101000501010005020100050101010501010005030100
-050a01040501010005020100050101010501010005010100050201000503010005060100
-050201000502010005010101050101000503010105090100050201000501010105010100
-050101000502010005040100050501000504010105020100050201000501010005020100
-050101000502010005040100050c01000502010005020100050101000502010005010101
-05010100050301000507010005ff0516000105010701060d030002020401030102020400
-050407010500010005050100050201000501010005050100050501000502010005010100
-0502010005030100050c0100050301000502010005010100050201000501010005070100
-0506010005020100050201000501010005020100050f0100050501000502010005010100
-050201000504010005050100050901000502010005010100050201000505010005040100
-050c01000502010005020100050101000502010005010100050201000503010005060100
-05ff0517000105010701060d030002020401030102020400050407010500010005050100
-05020100050101000505010005050104050101000502010005030100050c010005030100
-050201000501010005020100050101000507010005060100050201000502010005010100
-050201000510010205020100050201000501010405040100050501000509010405020100
-050001000503010305040100050c01000502010005020100050101000502010005010100
-05020100050201000506010005ff0518000105010701060d030002020401030102020400
-050407010500010005050100050201000501010005050100050501000505010005020100
-05030100050c010005030100050201000501010005020100050101000507010005060100
-050201000502010005010100050201000513010005010100050201000501010005080100
-05050100050901000506010005000100050201000502010005040100050c010005020100
-0502010005010100050201000501010005020100050201000505010005ff051900010501
-0701060d0300020204010301020204000504070105000100050201000501010005010101
-05010100050501000505010005020100050101000502010005030100050c010005030100
-050101010501010005020100050101000502010005030100050601000502010005020100
-050101000502010005030101050901000502010005010100050201000501010005020100
-050401000505010005040101050201000502010005030100050301000502010005040100
-050c01000502010005020100050101000502010005010101050101000501010005050100
-05ff051a000105010701060d030002020401030102020400050407010501010205030101
-05000100050101000505010005060102050201000502010005040101050a010005040101
-050001000501010005020100050201020505010105040100050301020502010005020100
-05030101050a010205020100050201000502010205050100050501000504010105030102
-050401000504010305040100050c01000503010205030102050201000500010105020100
-0505010405ff0516000105010701060d0300020204010301020204000504070105300105
-058c01050516010005ff0528000105010701060d03000202040103010202040005040701
-05e0010005ff0528000105010701060d0300020204010301020204000504070105e00100
-05ff0528000105010701060d0300020204010301020204000504070105ff05ff050a0001
-05010701060d0300020204010301020204000504070105ff05ff050a000105010701060d
-0300020204010301020204000504070105ff05ff050a000105010701060d030002020401
-0301020204000504070105ff05ff050a000105010701060d030002020401030102020400
-0504070105ff05ff050a000105010701060d0300020204010301020204000504070105ff
-05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a0001
-05010701060d0300020204010301020204000504070105ff05ff050a000105010701060d
-0300020204010301020204000504070105ff05ff050a000105010701060d030002020401
-0301020204000504070105ff05ff050a000105010701060d030002020401030102020400
-0504070105ff05ff050a000105010701060d0300020204010301020204000504070105ff
-05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a0001
-05010701060d0300020204010301020204000504070105ff05ff050a000105010701060d
-0300020204010301020204000504070105ff05ff050a000105010701060d030002020401
-0301020204000504070105ff05ff050a000105010701060d030002020401030102020400
-0504070105000100052b0100051f01020503010205ff05b1000105010701060d03000202
-04010301020204000504070105000100054b010005020100050101000502010005ff05b0
-000105010701060d03000202040103010202040005040701050001000500010105030102
-050301020502010005000101050a01020503010205020104050201020504010105090100
-05020100050101000502010005ff05b0000105010701060d030002020401030102020400
-050407010500010105010100050101000502010005010100050201000501010105010100
-050801000502010005040100050601000501010005020100050301010509010005020100
-050101000502010005ff05b0000105010701060d03000202040103010202040005040701
-050001000502010005010100050201000505010005010100050201000508010005080100
-050501000502010005020100051001020503010305ff05b0000105010701060d03000202
-040103010202040005040701050001000502010005010104050201030501010005020100
-05090102050501000504010005030104050f0100050201000505010005ff05b000010501
-0701060d0300020204010301020204000504070105000100050201000501010005050100
-050201000501010005020100050c01000504010005030100050401000513010005020100
-0505010005ff05b0000105010701060d0300020204010301020204000504070105000100
-050201000501010005020100050101000502010005010101050101000508010005020100
-050401000502010005050100050201000503010105090100050201000501010005020100
-05ff05b0000105010701060d030002020401030102020400050407010500010005020100
-05020102050301030501010005000101050a010205050100050201040502010205040101
-050a01020503010205ff05b1000105010701060d03000202040103010202040005040701
-051501000504010505ff05e8000105010701060d03000202040103010202040005040701
-0515010005ff05f3000105010701060d0300020204010301020204000504070105150100
-05ff05f3000105010701060d0300020204010301020204000504070105ff05ff050a0001
-05010701060d0300020204010301020204000504070105ff05ff050a000105010701060d
-0300020204010301020204000504070105ff05ff050a000105010701060d030002020401
-0301020204000504070105ff05ff050a000105010701060d030002020401030102020400
-0504070105ff05ff050a000105010701060d0300020204010301020204000504070105ff
-05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a0001
-05010701060d0300020204010301020204000504070105ff05ff050a000105010701060d
-0300020204010301020204000504070105ff05ff050a000105010701060d030002020401
-0301020204000504070105ff05ff050a000105010701060d030002020401030102020400
-0504070105ff05ff050a000105010701060d0300020204010301020204000504070105ff
-05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a0001
-05010701060d0300020204010301020204000504070105ff05ff050a000105010701060d
-0300020204010301020204000504070105ff05ff050a000105010701060d030002020401
-0301020204000504070105ff05ff050a000105010701060d030002020401030102020400
-05040701050901000511010005160100051e01040502010205ff05aa000105010701060d
-030002020401030102020400050407010509010005110100053601000505010005020100
-05ff05a9000105010701060d030002020401030102020400050407010501010205020104
-05020102050301020502010005010100050a010205030102050201040502010205040101
-050901000509010005ff05a9000105010701060d03000202040103010202040005040701
-050001000502010005030100050301000502010005010100050201000501010005000100
-050a01000502010005040100050601000501010005020100050301010509010305060100
-05ff05a9000105010701060d030002020401030102020400050407010500010005070100
-050701000501010005050101050b01000508010005050100050201000502010005130100
-0503010105ff05aa000105010701060d0300020204010301020204000504070105010102
-05040100050401030501010005050101050c010205050100050401000503010405130100
-0505010005ff05a9000105010701060d0300020204010301020204000504070105040100
-050301000503010005020100050101000505010005000100050e01000504010005030100
-0504010005130100050201000505010005ff05a9000105010701060d0300020204010301
-020204000504070105000100050201000503010005030100050201000501010005020100
-050101000501010005090100050201000504010005020100050501000502010005030101
-0509010005020100050101000502010005ff05a9000105010701060d0300020204010301
-020204000504070105010102050501010502010305020102050201000502010005090102
-05050100050201040502010205040101050a01020503010205ff05aa000105010701060d
-030002020401030102020400050407010522010505ff05e1000105010701060d03000202
-04010301020204000504070105ff05ff050a000105010701060d03000202040103010202
-04000504070105ff05ff050a000105010701060d03000202040103010202040005040701
-05ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a
-000105010701060d0300020204010301020204000504070105ff05ff050a000105010701
-060d0300020204010301020204000504070105ff05ff050a000105010701060d03000202
-04010301020204000504070105ff05ff050a000105010701060d03000202040103010202
-04000504070105ff05ff050a000105010701060d03000202040103010202040005040701
-05ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a
-000105010701060d0300020204010301020204000504070105ff05ff050a000105010701
-060d0300020204010301020204000504070105ff05ff050a000105010701060d03000202
-04010301020204000504070105ff05ff050a000105010701060d03000202040103010202
-04000504070105ff05ff050a000105010701060d03000202040103010202040005040701
-05ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a
-000105010701060d0300020204010301020204000504070105ff05ff050a000105010701
-060d0300020204010301020204000504070105ff05ff050a000105010701060d03000202
-040103010202040005040701051201000511010005060100052601020503010205ff05aa
-000105010701060d030002020401030102020400050407010512010005110100052d0100
-05020100050101000502010005ff05a9000105010701060d030002020401030102020400
-050407010500010005000101050301020503010105000100050101000502010005020102
-05020104050201020503010205020100050001010503010205040101050d010005010100
-05ff05ad000105010701060d030002020401030102020400050407010500010105010100
-050101000502010005010100050101010501010005020100050101000502010005030100
-0506010005020100050201000501010105010100050101000502010005030101050d0100
-0501010005ff05ad000105010701060d0300020204010301020204000504070105000100
-050501000502010005010100050201000501010005020100050101000507010005060100
-0502010005020100050101000502010005010100051601000502010305ff05aa00010501
-0701060d0300020204010301020204000504070105000100050501040501010005020100
-050101000502010005010100050701000506010005020100050201000501010005020100
-0502010205120100050301000502010005ff05a9000105010701060d0300020204010301
-020204000504070105000100050501000505010005020100050101000502010005010100
-050701000506010005020100050201000501010005020100050501000510010005040100
-0502010005ff05a9000105010701060d0300020204010301020204000504070105000100
-050501000502010005010100050101010501010005010101050101000502010005030100
-050601000502010005020100050101000502010005010100050201000503010105090100
-050501000502010005ff05a9000105010701060d03000202040103010202040005040701
-050001000506010205030101050001000502010105000100050201020505010105040100
-0503010205020100050201000502010205040101050901040502010205ff05aa00010501
-0701060d0300020204010301020204000504070105ff05ff050a000105010701060d0300
-020204010301020204000504070105ff05ff050a000105010701060d0300020204010301
-020204000504070105ff05ff050a000105010701060d0300020204010301020204000504
-070105ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff
-050a000105010701060d0300020204010301020204000504070105ff05ff050a00010501
-0701060d0300020204010301020204000504070105ff05ff050a000105010701060d0300
-020204010301020204000504070105ff05ff050a000105010701060d0300020204010301
-020204000504070105ff05ff050a000105010701060d0300020204010301020204000504
-070105ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff
-050a000105010701060d0300020204010301020204000504070105ff05ff050a00010501
-0701060d0300020204010301020204000504070105ff05ff050a000105010701060d0300
-020204010301020204000504070105ff05ff050a000105010701060d0300020204010301
-020204000504070105ff05ff050a000105010701060d0300020204010301020204000504
-070105ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff
-050a000105010701060d0300020204010301020204000504070105ff05ff050a00010501
-0701060d030002020401030102020400050407010532010305ff05d3000105010701060d
-03000202040103010202040005040701050101020505010005090100051b010005ff05d6
-000105010701060d030002020401030102020400050407010503010005100100051b0100
-05ff05d6000105010701060d030002020401030102020400050407010503010005030102
-050201000500010105020100050101000503010205040101050a010005ff05d600010501
-0701060d0300020204010301020204000504070105030100050501000502010105010100
-0501010005000100050301000502010005030101050a010005ff05d6000105010701060d
-030002020401030102020400050407010503010005050100050201000502010005010101
-050401000514010005ff05d6000105010701060d03000202040103010202040005040701
-0503010005050100050201000502010005010101050501020511010005ff05d600010501
-0701060d0300020204010301020204000504070105030100050501000502010005020100
-0501010005000100050701000510010005ff05d6000105010701060d0300020204010301
-020204000504070105030100050501000502010005020100050101000501010005020100
-0502010005030101050a010005ff05d6000105010701060d030002020401030102020400
-050407010503010005050100050201000502010005010100050201000502010205040101
-050a010005ff05d6000105010701060d0300020204010301020204000504070105320103
-05ff05d3000105010701060d0300020204010301020204000504070105ff05ff050a0001
-05010701060d0300020204010301020204000504070105ff05ff050a000105010701060d
-0300020204010301020204000504070105ff05ff050a000105010701060d030002020401
-0301020204000504070105120100052a01000506010305ff05bf000105010701060d0300
-02020401030102020400050407010511010005040101050a010205030102050b01010502
-01000508010005ff05bf000105010701060d030002020401030102020400050407010510
-010005040100050101000508010005020100050101000502010005090100050101000502
-01000507010005ff05bf000105010701060d03000202040103010202040005040701050f
-01000505010005010100050c0100050501000509010005010100050301000506010005ff
-05bf000105010701060d03000202040103010202040005040701050e0100050601000501
-0100050c0100050501000509010005010100050401000505010005ff05bf000105010701
-060d03000202040103010202040005040701050d01000507010005010100050b01000504
-0101050a010005010100050501000504010005ff05bf000105010701060d030002020401
-03010202040005040701050e01000506010005010100050a010005070100050901000501
-0100050401000505010005ff05bf000105010701060d0300020204010301020204000504
-0701050f0100050501000501010005090100050801000509010005010100050301000506
-010005ff05bf000105010701060d03000202040103010202040005040701051001000504
-010005010100050301010502010005050100050201000503010105030100050101000502
-01000507010005ff05bf000105010701060d030002020401030102020400050407010511
-0100050401010504010105020104050201020504010105040101050201000508010005ff
-05bf000105010701060d0300020204010301020204000504070105120100052a01000506
-010305ff05bf000105010701060d0300020204010301020204000504070105ff05ff050a
-000105010701060d0300020204010301020204000504070105ff05ff050a000105010701
-060d0300020204010301020204000504070105ff05ff050a000105010701060d03000202
-04010301020204000504070105ff05ff050a000105010701060d03000202040103010202
-04000504070105ff05ff050a000105010701060d03000202040103010202040005040701
-05ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a
-000105010701060d0300020204010301020204000504070105ff05ff050a000105010701
-060d0300020204010301020204000504070105ff05ff050a000105010701060d03000202
-04010301020204000504070105ff05ff050a000105010701060d03000202040103010202
-04000504070105ff05ff050a000105010701060d03000202040103010202040005040701
-05ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff050a
-000105010701060d0300020204010301020204000504070105ff05ff050a000105010701
-060d0300020204010301020204000504070105ff05ff050a000105010701060d03000202
-04010301020204000504070105ff05ff050a000105010701060d03000202040103010202
-04000504070105ff05ff050a000105010701060d03000202040103010202040005040701
-05ff05ff050a000105010701060d03000202040103010202040005040701050201000530
-010005040100051401010509010205ff05aa000105010701060d03000202040103010202
-040005040701050201000536010005130100050d010005ff05aa000105010701060d0300
-020204010301020204000504070105000104050101000500010105030102050201000500
-0101050a01020502010005020100050201020502010405030101050b0100050401020505
-0100050301020503010205ff059c000105010701060d0300020204010301020204000504
-070105020100050301010501010005010100050201000501010105010100050801000502
-010005010100050201000504010005040100050501010509010405010100050201000504
-01000502010005020100050101000502010005ff059b000105010701060d030002020401
-030102020400050407010502010005030100050901000501010005020100050801000502
-010005020100050001000505010005040100051301000507010005040100050201000505
-01000502010005ff059b000105010701060d030002020401030102020400050407010502
-010005030100050601030501010005020100050801040503010005060100050401000513
-01000504010305040100050301020502010405ff059b000105010701060d030002020401
-030102020400050407010502010005030100050501000502010005010100050201000508
-010005060100050001000505010005040100051301000503010005020100050401000506
-01000501010005ff059f000105010701060d030002020401030102020400050407010502
-010005030100050501000502010005010101050101000508010005020100050101000502
-0100050401000504010005050101050b0100050301000502010005040100050201000502
-0100050101000502010005ff059b000105010701060d0300020204010301020204000504
-07010503010105010100050601030501010005000101050a010205020100050201000504
-01000505010105030101050b01000504010305040100050301020503010205ff059c0001
-05010701060d03000202040103010202040005040701051501000504010505ff05e80001
-05010701060d030002020401030102020400050407010515010005ff05f3000105010701
-060d030002020401030102020400050407010515010005ff05f3000105010701060d0300
-020204010301020204000504070105ff05ff050a000105010701060d0300020204010301
-020204000504070105ff05ff050a000105010701060d0300020204010301020204000504
-070105ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff
-050a000105010701060d0300020204010301020204000504070105ff05ff050a00010501
-0701060d0300020204010301020204000504070105ff05ff050a000105010701060d0300
-020204010301020204000504070105ff05ff050a000105010701060d0300020204010301
-020204000504070105ff05ff050a000105010701060d0300020204010301020204000504
-070105ff05ff050a000105010701060d0300020204010301020204000504070105ff05ff
-050a000105010701060d0300020204010301020204000504070105ff05ff050a00010501
-0701060d0300020204010301020204000504070105ff05ff050a000105010701060d0300
-020204010301020204000504070105ff05ff050a000105010701060d0300020204010301
-020204000504070105ff05ff050a000105010701060d0300020204010301020204000504
-0701057301010597010105350101053501010540010105190101050b0101050401010516
-000105010701060d0300020204010301020204000504070105040100052a010005400100
-05540100052a010005160100052e0103050301000536010005440100050b010305010103
-050401000503010305040100050501000515000105010701060d03000202040103010202
-0400050407010503010005040101050a010205030102050b010105020100053f0100050a
-0100050d010205030102051b01000512010005040101050a010205030102050b01010502
-0100051501000519010205110100050601000512010205030102050b0100050c0100050c
-0100051a0100050b0102050b0100050b0100050701000504010005060100050401000505
-01000515000105010701060d030002020401030102020400050407010502010005040100
-0501010005080100050201000501010005020100050901000501010005020100053e0100
-050a0100050f010005050100051b01000511010005040100050101000508010005020100
-050101000502010005090100050101000502010005140100051b01000511010005060100
-0514010005050100050a0101050c0100050c010005190101050d0100050b0100050b0100
-05070100050401000506010005040100050501000515000105010701060d030002020401
-03010202040005040701050101000505010005010100050c010005050100050901000501
-010005030100050501010509010005000101050301020503010205190100050401020502
-010005000101050301020505010005050100050a01020502010105000100050301010500
-0100051001000505010005010100050c0100050501000509010005010100050301000513
-010005040102050201000502010005020102050501000511010005060100050401020503
-010205050100050501000509010005000100050c01000504010205020104050201020502
-0101050001000509010005000100050d01000503010205040100050b0100050701000504
-01000506010005040100050501000515000105010701060d030002020401030102020400
-05040701050001000506010005010100050c010005050100050901000501010005040100
-050401010509010105010100050101000502010005010100050201000518010005030100
-050201000501010105010100050101000502010005040100050501000509010005020100
-0501010005000100050001000501010005010101050f01000506010005010100050c0100
-050501000509010005010100050401000512010005030100050201000501010005020100
-050101000502010005040100051101000506010005030100050201000501010005020100
-0504010005050100050b0100050c01000503010005020100050301000503010005020100
-050101000500010005000100050a0100050d0100050201000502010005030100050b0100
-05070100050401000506010005040100050501000515000105010701060d030002020401
-0301020204000504070101000507010005010100050a010105050100050a010005010100
-05050100050f0100050501000502010005010100051a0101050401000505010005020100
-050101000502010005040100050501000509010005050100050001000500010005010100
-05020100050e01000507010005010100050b010005040101050a01000501010005050100
-050f01010504010005020100050101000502010005050100050401000511010005040101
-05040100050901000504010005050100050b0100050a0101050801000503010005030100
-05020100050101000500010005000100050a0100050d0100050201000508010105090100
-05070100050501010504010005050101050401010513000105010701060d030002020401
-03010202040005040701050001000506010005010100050c010005030100050b01000501
-010005040100051001000505010405010100051c01000504010205020100050201000501
-01040504010005050100050901000505010005000100050001000501010005020100050f
-01000506010005010100050a010005070100050901000501010005040100051201000503
-010405020100050001000503010305040100051101000506010005030100050601030504
-010005050100050b0100050c010005040103050301000503010005020100050101000500
-010005000100050a0100050d01000503010205040100050b010005070100050401000506
-010005040100050501000515000105010701060d03000202040103010202040005040701
-050101000505010005010100050c010005020100050c0100050101000503010005110100
-0505010005050100051c0100050701000501010005020100050101000508010005050100
-050901000505010005000100050001000501010005020100051001000505010005010100
-050901000508010005090100050101000503010005130100050301000506010005000100
-050201000502010005040100051101000506010005030100050501000502010005040100
-05050100050b0100050c0100050301000502010005030100050301000502010005010100
-0500010005000100050a0100050d01000506010005030100050b01000507010005040100
-0506010005040100050501000515000105010701060d0300020204010301020204000504
-070105020100050401000501010005030101050201000502010005010100050701010503
-010005010100050201000506010105090100050501000502010005010100050201000518
-010005030100050201000501010005020100050101000502010005040100050501000509
-010005020100050101000500010005000100050101000501010105030101050b01000504
-010005010100050301010502010005050100050201000503010105030100050101000502
-010005060101050b01000503010005020100050301000503010005020100050401000504
-0101050a0100050601000503010005020100050101000502010005040100050501000504
-010105040100050501010504010005030100050201000503010005030100050201000501
-010005000100050001000503010105040100050501010505010005020100050201000503
-010005050101050301000507010005040100050601000504010005050100051500010501
-0701060d0300020204010301020204000504070105030100050401010504010105030102
-050201040503010105040101050201000507010105090100050601020503010205190100
-050401020502010005020100050201020505010005050100050a01020502010005000100
-05000100050201010500010005030101050c010005040101050401010502010405020102
-05040101050401010502010005070101050b010005040102050401000504010305040100
-05040101050a010005060100050401020503010305040100050501000504010105020104
-050301010504010005040103050401010502010205020100050001000500010005030101
-050201040503010105050100050301020504010005050101050301000507010005040100
-0506010005040100050501000515000105010701060d0300020204010301020204000504
-070105040100052a0100054001000525010505190100050d0100052a010005090100050b
-010005220100050a01030503010005220100050c01000504010005220100050c01000512
-010005060100050301030501010305040100050301030504010005050100051500010501
-0701060d03000202040103010202040005040701057301010541010105430101050d0101
-051e010105140101051e0101050b010105060101051e0101050b01010511010105050101
-05110101050b0101050401010516000105010701060d0300020204010301020204000504
-070105ff05ff050a000105010701060d0300020204010301020204000504070105ff0506
-0101055f010105630101051501010521000105010701060d030002020401030102020400
-0504070105040100052a0100051d010005b401000506010005040100053e010005120100
-05070100052a0100051501000501010005180100051301000523000105010701060d0300
-02020401030102020400050407010503010005040101050a010205030102050b01010502
-0100051c0100051f010405280100053f010005030100051f01000506010005030102052d
-01020503010205050100051201000506010005040101050a010205030102050b01010502
-0100051401000501010005010103050c010105030100051301000523000105010701060d
-030002020401030102020400050407010502010005040100050101000508010005020100
-0501010005020100050901000501010005020100051b010005210100052a0100053f0100
-05030100051f010005050100050301000500010005000100052e01000505010005040100
-051301000505010005040100050101000508010005020100050101000502010005090100
-050101000502010005130100050101000501010005020100050a01000505010005130100
-0523000105010701060d0300020204010301020204000504070105010100050501000501
-0100050c0100050501000509010005010100050301000505010105120100052101000504
-010205040101050a010205030102050301010500010005020102050a0102050301020502
-010005000101050201000502010005020102050201000500010105080101050101010502
-0102050301010500010005030101050b0100050401000504010005000100050401010500
-0100050201020502010005000101050a0102050301020505010005050100050301000514
-0100050401000505010005010100050c0100050501000509010005010100050301000511
-010505000100050201000502010205040100050501000513010005040102050201000500
-01010503010205020100050201000501010005000101000105010701060d030002020401
-03010202040005040701050001000506010005010100050c010005050100050901000501
-010005040100050401010512010005210100050301000502010005030101050901000502
-010005010100050201000501010005010101050101000502010005080100050201000501
-010005020100050101010501010005010100050201000501010005020100050101010501
-010005070101050101010501010005020100050101000501010105030101050b0100050a
-010005000100050301000501010105010100050201000501010105010100050801000502
-01000501010005020100050401000505010005190100050301000506010005010100050c
-010005050100050901000501010005040100051101000501010005010100050201000501
-010005020100050101040503010005130100050301000502010005010101050101000501
-0100050201000501010005020100050101010501000105010701060d0300020204010301
-020204000504070101000507010005010100050a010105050100050a0100050101000505
-010005180100052101000503010005020100050f01000505010005020100050101000502
-010005010100050201000508010005050100050201000501010005050100050201000501
-01000502010005010100050b01000500010105000100050101000505010005020100050f
-0101050c0102050201000502010005010100050201000501010005020100050801000509
-0100050401000505010005170101050301000507010005010100050a010105050100050a
-01000501010005050100050f010005010100050201030502010005020100050301000506
-0101050f0101050401000502010005010100050201000501010005050100050201000501
-01000502000105010701060d030002020401030102020400050407010500010005060100
-05010100050c010005030100050b01000501010005040100051901000521010005030100
-05020100050f010005050100050201000501010005020100050101040509010205020104
-0501010005060100050001000502010405010100050b0100050001010500010005020102
-050201000502010005110100050c01000500010005010100050201000501010405010100
-050201000508010005060103050401000505010005190100050301000506010005010100
-050c010005030100050b01000501010005040100050f0105050101000501010005020104
-050301000505010005130100050301040501010005020100050201020502010005020100
-050101000502000105010701060d03000202040103010202040005040701050101000505
-010005010100050c010005020100050c01000501010005030100053d0100050301000502
-0100050f0100050501000502010005010100050201000501010005100100050101000505
-010005060100050001000502010005050100050b01000503010005050100050101000502
-010005110100050c01000500010005010100050201000501010005050100050201000508
-01000505010005020100050401000505010005190100050401000505010005010100050c
-010005020100050c01000501010005030100051101000501010005020100050201000501
-010005070100050501000513010005030100050501000502010005050100050101000502
-0100050101000502000105010701060d0300020204010301020204000504070105020100
-050401000501010005030101050201000502010005010100050701010503010005010100
-050201000506010105350100050301000502010005030101050901000502010005010100
-050201000501010005010101050101000502010005080100050201000501010005020100
-0501010005070100050301000502010005010100050b0100050301000501010005020100
-050101000501010105030101050b0100050a010005000100050001000501010005010101
-050101000502010005010100050201000508010005020100050101000502010005040100
-05050100050b0101050b0100050501000504010005010100050301010502010005020100
-050101000507010105030100050101000502010005060101050901000501010005020100
-050201000501010005020100050301000505010005050101050b01000503010005020100
-050101000502010005010100050201000501010005010101050101000502000105010701
-060d03000202040103010202040005040701050301000504010105040101050301020502
-01040503010105040101050201000507010105120100052101000504010205040101050a
-010205030102050301010500010005020102050a01020503010205020100050701000504
-010205020100050b01000503010005020102050301010500010005030101050b0100050b
-010205030101050001000502010205020100050201000509010205030103050401000505
-0100050b0101050b01000506010005040101050401010503010205020104050301010504
-010105020100050701010509010005010100050201000502010005020102050401000505
-010005050101050b01000504010205020100050201000502010205030101050001000501
-01000502000105010701060d0300020204010301020204000504070105040100052a0100
-057501050544010005110100050c010005070100050e010505270100050b010005070100
-052a0100050901000527010005060100050b01000523000105010701060d030002020401
-0301020204000504070105ee01000502010005120101050f010005020100053a0101050d
-0101053a01010526010105050101050d01010521000105010701060d0300020204010301
-020204000504070105ef01020526010205ed000105010701060d03000202040103010202
-04000504070105730101052e0101058d01010504010105cc000105010701060d03000202
-04010301020204000504070105040100052a010005400100050401000501010005260100
-059101000505010005cb000105010701060d030002020401030102020400050407010503
-010005040101050a010205030102050b010105020100053f010005040100050101000501
-0103050c010105110100051501000509010205260102050c0100050b0100052001020504
-01000505010005cb000105010701060d0300020204010301020204000504070105020100
-050401000501010005080100050201000501010005020100050901000501010005020100
-053e010005040100050101000501010005020100050a01000513010005150100050b0100
-052801000519010005220100050401000505010005cb000105010701060d030002020401
-03010202040005040701050101000505010005010100050c010005050100050901000501
-010005030100050501010509010005000101050301020503010205190100050301050500
-010005020100050201020504010005130100050301010500010005030102050301010500
-01000501010005020100050401000503010205110102050201000500010105050100050a
-010205020100050001010502010405020102050201000500010105020100050001010503
-010205050100050401000505010005cb000105010701060d030002020401030102020400
-05040701050001000506010005010100050c010005050100050901000501010005040100
-050401010509010105010100050101000502010005010100050201000518010005040100
-050101000501010005020100050101000502010005010104051101000503010005000100
-050001000501010005020100050101000501010105010100050201000504010005020100
-05020100050f010005020100050101010501010005040100050c01000502010105010100
-050301000503010005020100050101010501010005010101050101000501010005020100
-05040100050401000505010005cb000105010701060d0300020204010301020204000504
-070101000507010005010100050a010105050100050a01000501010005050100050f0100
-050501000502010005010100051a01010504010005010100050201030502010005020100
-050301000511010105040100050001000500010005010100050201000501010005020100
-0501010005020100050401000502010005020100050f0100050201000501010005080100
-050c01000502010005020100050301000503010005020100050101000505010005020100
-0505010005040100050501010504010105c9000105010701060d03000202040103010202
-040005040701050001000506010005010100050c010005030100050b0100050101000504
-0100051001000505010405010100051c0100050201050501010005010100050201040503
-010005130100050301000500010005000100050101000502010005010100050201000501
-0100050201000504010005020104050f01040501010005080100050c0100050201000502
-010005030100050301040501010005050100050201000502010305040100050401000505
-010005cb000105010701060d030002020401030102020400050407010501010005050100
-05010100050c010005020100050c01000501010005030100051101000505010005050100
-051c01000503010005010100050201000502010005010100050701000513010005030100
-050001000500010005010100050201000501010005020100050101000502010005040100
-05020100051301000505010005080100050c010005020100050201000503010005030100
-050501000505010005020100050101000502010005040100050401000505010005cb0001
-05010701060d030002020401030102020400050407010502010005040100050101000503
-010105020100050201000501010005070101050301000501010005020100050601010509
-010005050100050201000501010005020100051801000503010005010100050201000502
-010005010100050201000503010005050101050b01000503010005000100050001000501
-010005020100050101000501010105010100050101010504010005020100050201000503
-010105090100050201000501010005080100050c01000502010005020100050301000503
-010005020100050101000505010005020100050101000502010005040100050401000505
-010005cb000105010701060d030002020401030102020400050407010503010005040101
-050401010503010205020104050301010504010105020100050701010509010005060102
-050301020519010005030100050101000502010005020100050201020504010005050101
-050b01000503010005000100050001000502010205030101050001000502010105000100
-050401000503010205040101050a01020502010005080100050c01000502010005020100
-050401010502010205020100050501000502010005020103050401000504010005050100
-05cb000105010701060d0300020204010301020204000504070105040100052a01000540
-010005220100050b010005300100051d0105053b01000505010005cb000105010701060d
-0300020204010301020204000504070105730101051e0101050d0101052c0101055e0101
-0504010105cc000105010701060d0300020204010301020204000504070105ff05ff050a
-000105010701060d0300020204010301020204000504070105ff05060101055f01010563
-0101051501010521000105010701060d0300020204010301020204000504070105040100
-052a0100051d010005b401000506010005040100053e01000512010005070100052a0100
-051501000501010005180100051301000523000105010701060d03000202040103010202
-0400050407010503010005040101050a010205030102050b010105020100051c0100051f
-010405280100053f010005030100051f01000506010005030102052d0102050301020505
-0100051201000506010005040101050a010205030102050b010105020100051401000501
-010005010103050c010105030100051301000523000105010701060d0300020204010301
-020204000504070105020100050401000501010005080100050201000501010005020100
-050901000501010005020100051b010005210100052a0100053f010005030100051f0100
-05050100050301000500010005000100052e010005050100050401000513010005050100
-050401000501010005080100050201000501010005020100050901000501010005020100
-05130100050101000501010005020100050a010005050100051301000523000105010701
-060d03000202040103010202040005040701050101000505010005010100050c01000505
-01000509010005010100050301000505010105120100052101000504010205040101050a
-010205030102050301010500010005020102050a01020503010205020100050001010502
-010005020100050201020502010005000101050801010501010105020102050301010500
-010005030101050b01000504010005040100050001000504010105000100050201020502
-010005000101050a01020503010205050100050501000503010005140100050401000505
-010005010100050c01000505010005090100050101000503010005110105050001000502
-010005020102050401000505010005130100050401020502010005000101050301020502
-0100050201000501010005000101000105010701060d0300020204010301020204000504
-0701050001000506010005010100050c0100050501000509010005010100050401000504
-010105120100052101000503010005020100050301010509010005020100050101000502
-010005010100050101010501010005020100050801000502010005010100050201000501
-010105010100050101000502010005010100050201000501010105010100050701010501
-01010501010005020100050101000501010105030101050b0100050a0100050001000503
-010005010101050101000502010005010101050101000508010005020100050101000502
-0100050401000505010005190100050301000506010005010100050c0100050501000509
-010005010100050401000511010005010100050101000502010005010100050201000501
-010405030100051301000503010005020100050101010501010005010100050201000501
-010005020100050101010501000105010701060d03000202040103010202040005040701
-01000507010005010100050a010105050100050a01000501010005050100051801000521
-01000503010005020100050f010005050100050201000501010005020100050101000502
-010005080100050501000502010005010100050501000502010005010100050201000501
-0100050b01000500010105000100050101000505010005020100050f0101050c01020502
-010005020100050101000502010005010100050201000508010005090100050401000505
-010005170101050301000507010005010100050a010105050100050a0100050101000505
-0100050f0100050101000502010305020100050201000503010005060101050f01010504
-010005020100050101000502010005010100050501000502010005010100050200010501
-0701060d03000202040103010202040005040701050001000506010005010100050c0100
-05030100050b0100050101000504010005190100052101000503010005020100050f0100
-050501000502010005010100050201000501010405090102050201040501010005060100
-050001000502010405010100050b01000500010105000100050201020502010005020100
-05110100050c010005000100050101000502010005010104050101000502010005080100
-05060103050401000505010005190100050301000506010005010100050c010005030100
-050b01000501010005040100050f01050501010005010100050201040503010005050100
-051301000503010405010100050201000502010205020100050201000501010005020001
-05010701060d03000202040103010202040005040701050101000505010005010100050c
-010005020100050c01000501010005030100053d01000503010005020100050f01000505
-010005020100050101000502010005010100051001000501010005050100050601000500
-01000502010005050100050b01000503010005050100050101000502010005110100050c
-010005000100050101000502010005010100050501000502010005080100050501000502
-0100050401000505010005190100050401000505010005010100050c010005020100050c
-010005010100050301000511010005010100050201000502010005010100050701000505
-010005130100050301000505010005020100050501000501010005020100050101000502
-000105010701060d03000202040103010202040005040701050201000504010005010100
-050301010502010005020100050101000507010105030100050101000502010005060101
-053501000503010005020100050301010509010005020100050101000502010005010100
-050101010501010005020100050801000502010005010100050201000501010005070100
-050301000502010005010100050b01000503010005010100050201000501010005010101
-05030101050b0100050a0100050001000500010005010100050101010501010005020100
-0501010005020100050801000502010005010100050201000504010005050100050b0101
-050b01000505010005040100050101000503010105020100050201000501010005070101
-050301000501010005020100050601010509010005010100050201000502010005010100
-05020100050301000505010005050101050b010005030100050201000501010005020100
-05010100050201000501010005010101050101000502000105010701060d030002020401
-030102020400050407010503010005040101050401010503010205020104050301010504
-0101050201000507010105120100052101000504010205040101050a0102050301020503
-01010500010005020102050a01020503010205020100050701000504010205020100050b
-01000503010005020102050301010500010005030101050b0100050b0102050301010500
-010005020102050201000502010005090102050301030504010005050100050b0101050b
-010005060100050401010504010105030102050201040503010105040101050201000507
-01010509010005010100050201000502010005020102050401000505010005050101050b
-010005040102050201000502010005020102050301010500010005010100050200010501
-0701060d0300020204010301020204000504070105040100052a01000575010505440100
-05110100050c010005070100050e010505270100050b010005070100052a010005090100
-0527010005060100050b01000523000105010701060d0300020204010301020204000504
-070105ee01000502010005120101050f010005020100053a0101050d0101053a01010526
-010105050101050d01010521000105010701060d03000202040103010202040005040701
-05ef01020526010205ed000105010701060d030002020401030102020400050407010573
-0101052e0101059401010504010105c5000105010701060d030002020401030102020400
-0504070105040100052a0100054001000504010005010100052601000598010005050100
-05c4000105010701060d030002020401030102020400050407010503010005040101050a
-010205030102050b010105020100053f0100050401000501010005010103050c01010511
-01000515010005090102051e0100050d010205030102050d0100050b0101051001020504
-0100050501000505010005c4000105010701060d03000202040103010202040005040701
-050201000504010005010100050801000502010005010100050201000509010005010100
-05020100053e010005040100050101000501010005020100050a01000513010005150100
-050b0100051e0100050f010005050100050d0100050a0100051401000504010005050100
-0505010005c4000105010701060d03000202040103010202040005040701050101000505
-010005010100050c01000505010005090100050101000503010005050101050901000500
-010105030102050301020519010005030105050001000502010005020102050401000513
-010005030101050001000503010205030101050001000501010005020100050401000503
-0102051101020502010005000101050301020505010005050100050a0101050001000502
-0102050401000504010205020100050201000504010005020104050301000505010005c4
-000105010701060d03000202040103010202040005040701050001000506010005010100
-050c01000505010005090100050101000504010005040101050901010501010005010100
-050201000501010005020100051801000504010005010100050101000502010005010100
-050201000501010405110100050301000500010005000100050101000502010005010100
-050101010501010005020100050401000502010005020100050f01000502010005010101
-050101000501010005020100050401000505010005090100050101010501010005020100
-050101040501010005020100050101000502010005040100050401000505010005050100
-05c4000105010701060d0300020204010301020204000504070101000507010005010100
-050a010105050100050a01000501010005050100050f0100050501000502010005010100
-051a01010504010005010100050201030502010005020100050301000511010105040100
-050001000500010005010100050201000501010005020100050101000502010005040100
-0502010005020100050f0100050501000502010005010100050201000504010005050100
-050901000502010005010100050201000503010005070100050101000502010005040100
-05040100050601010504010105c2000105010701060d0300020204010301020204000504
-0701050001000506010005010100050c010005030100050b010005010100050401000510
-01000505010405010100051c010005020105050101000501010005020104050301000513
-010005030100050001000500010005010100050201000501010005020100050101000502
-010005040100050201040510010205020100050201000501010405040100050501000509
-010005020100050101040503010005040103050101000502010005040100050401000505
-01000505010005c4000105010701060d0300020204010301020204000504070105010100
-0505010005010100050c010005020100050c010005010100050301000511010005050100
-05050100051c010005030100050101000502010005020100050101000507010005130100
-050301000500010005000100050101000502010005010100050201000501010005020100
-050401000502010005170100050101000502010005010100050801000505010005090100
-050201000501010005070100050301000502010005010100050201000504010005040100
-050501000505010005c4000105010701060d030002020401030102020400050407010502
-010005040100050101000503010105020100050201000501010005070101050301000501
-010005020100050601010509010005050100050201000501010005020100051801000503
-010005010100050201000502010005010100050201000503010005050101050b01000503
-010005000100050001000501010005020100050101000501010105010100050101010504
-010005020100050201000503010105090100050201000501010005020100050101000502
-010005040100050501000509010005010101050101000502010005030100050301000502
-010005010100050101010504010005040100050501000505010005c4000105010701060d
-030002020401030102020400050407010503010005040101050401010503010205020104
-050301010504010105020100050701010509010005060102050301020519010005030100
-050101000502010005020100050201020504010005050101050b01000503010005000100
-050001000502010205030101050001000502010105000100050401000503010205040101
-050a01020502010005020100050201020505010005050100050a01010500010005020102
-050401000504010305020101050001000504010005050101050301000505010005c40001
-05010701060d0300020204010301020204000504070105040100052a0100054001000522
-0100050b010005300100052b0105053401000505010005c4000105010701060d03000202
-04010301020204000504070105730101051e0101050d0101052c01010565010105040101
-05c5000105010701060d0300020204010301020204000504070105ff05ff050a00010501
-0701060d0300020204010301020204000504070105ff05060101055f0101056301010515
-01010521000105010701060d0300020204010301020204000504070105040100052a0100
-051d010005b401000506010005040100053e01000512010005070100052a010005150100
-0501010005180100051301000523000105010701060d0300020204010301020204000504
-07010503010005040101050a010205030102050b010105020100051c0100051f01040519
-010105040100050301020540010005030100051f01000506010005030102052d01020503
-010205050100051201000506010005040101050a010205030102050b0101050201000514
-01000501010005010103050c010105030100051301000504010205050100050b01000507
-000105010701060d03000202040103010202040005040701050201000504010005010100
-05080100050201000501010005020100050901000501010005020100051b010005210100
-051a0100050d01000540010005030100051f010005050100050301000500010005000100
-052e01000505010005040100051301000505010005040100050101000508010005020100
-050101000502010005090100050101000502010005130100050101000501010005020100
-050a0100050501000513010005060100051201000507000105010701060d030002020401
-03010202040005040701050101000505010005010100050c010005050100050901000501
-0100050301000505010105120100052101000504010205040101050b0100050401020505
-010005030102050a01020503010205020100050001010502010005020100050201020502
-010005000101050801010501010105020102050301010500010005030101050b01000504
-010005040100050001000504010105000100050201020502010005000101050a01020503
-010205050100050501000503010005140100050401000505010005010100050c01000505
-010005090100050101000503010005110105050001000502010005020102050401000505
-010005130100050601000503010205030102050201040505000105010701060d03000202
-040103010202040005040701050001000506010005010100050c01000505010005090100
-050101000504010005040101051201000521010005030100050201000503010105090104
-050401000505010005020100050201000508010005020100050101000502010005010101
-050101000501010005020100050101000502010005010101050101000507010105010101
-0501010005020100050101000501010105030101050b0100050a01000500010005030100
-050101010501010005020100050101010501010005080100050201000501010005020100
-050401000505010005190100050301000506010005010100050c01000505010005090100
-050101000504010005110100050101000501010005020100050101000502010005010104
-050301000513010005060100050501000502010005020100050301000507000105010701
-060d0300020204010301020204000504070101000507010005010100050a010105050100
-050a01000501010005050100051801000521010005030100050201000511010005060100
-050501000502010005020100050801000505010005020100050101000505010005020100
-050101000502010005010100050b01000500010105000100050101000505010005020100
-050f0101050c010205020100050201000501010005020100050101000502010005080100
-05090100050401000505010005170101050301000507010005010100050a010105050100
-050a01000501010005050100050f01000501010005020103050201000502010005030100
-05060101050f0101050701000505010005020100050701000507000105010701060d0300
-0202040103010202040005040701050001000506010005010100050c010005030100050b
-010005010100050401000519010005210100050301000502010005110100050601000505
-01000502010405090102050201040501010005060100050001000502010405010100050b
-0100050001010500010005020102050201000502010005110100050c0100050001000501
-010005020100050101040501010005020100050801000506010305040100050501000519
-0100050301000506010005010100050c010005030100050b01000501010005040100050f
-010505010100050101000502010405030100050501000513010005060100050501000503
-0102050401000507000105010701060d0300020204010301020204000504070105010100
-0505010005010100050c010005020100050c01000501010005030100053d010005030100
-050201000511010005060100050501000502010005100100050101000505010005060100
-050001000502010005050100050b01000503010005050100050101000502010005110100
-050c01000500010005010100050201000501010005050100050201000508010005050100
-05020100050401000505010005190100050401000505010005010100050c010005020100
-050c01000501010005030100051101000501010005020100050201000501010005070100
-0505010005130100050601000505010005060100050301000507000105010701060d0300
-020204010301020204000504070105020100050401000501010005030101050201000502
-010005010100050701010503010005010100050201000506010105350100050301000502
-010005030101050b01000506010005050100050201000502010005080100050201000501
-0100050201000501010005070100050301000502010005010100050b0100050301000501
-010005020100050101000501010105030101050b0100050a010005000100050001000501
-010005010101050101000502010005010100050201000508010005020100050101000502
-01000504010005050100050b0101050b0100050501000504010005010100050301010502
-010005020100050101000507010105030100050101000502010005060101050901000501
-010005020100050201000501010005020100050301000505010005050101050b01000506
-0100050501000502010005020100050301000507000105010701060d0300020204010301
-020204000504070105030100050401010504010105030102050201040503010105040101
-050201000507010105120100052101000504010205040101050b01000506010005050100
-05030102050a01020503010205020100050701000504010205020100050b010005030100
-05020102050301010500010005030101050b0100050b0102050301010500010005020102
-050201000502010005090102050301030504010005050100050b0101050b010005060100
-050401010504010105030102050201040503010105040101050201000507010105090100
-05010100050201000502010005020102050401000505010005050101050b010005060100
-0505010005030102050501010505000105010701060d0300020204010301020204000504
-070105040100052a0100057501050544010005110100050c010005070100050e01050527
-0100050b010005070100052a0100050901000527010005060100050b0100051e01040001
-05010701060d0300020204010301020204000504070105ee01000502010005120101050f
-010005020100053a0101050d0101053a01010526010105050101050d0101052100010501
-0701060d0300020204010301020204000504070105ef01020526010205ed000105010701
-060d0300020204010301020204000504070105730101052e010105ff0563000105010701
-060d0300020204010301020204000504070105040100052a010005400100050401000501
-010005260100052001030501010005010100058701000501010005ae000105010701060d
-030002020401030102020400050407010503010005040101050a010205030102050b0101
-05020100053f0100050401000501010005010103050c010105110100050a010005140100
-050401000501010005340102050401000503010405020102051001000508010005180100
-05010100050101000501010005ae000105010701060d0300020204010301020204000504
-070105020100050401000501010005080100050201000501010005020100050901000501
-010005020100053e010005040100050101000501010005020100050a010005130100050a
-010005140100050401000501010005330100050201000502010105030100050501000502
-0100050f0100052101000500010005000100050101000501010005ae000105010701060d
-03000202040103010202040005040701050101000505010005010100050c010005050100
-050901000501010005030100050501010509010005000101050301020503010205190100
-050301050500010005020100050201020504010005130100050401020502010005010100
-051101000504010005010100050a01020503010205020100050201000502010205030102
-050901000505010005000100050301000505010005020100050901020502010005000101
-050301020502010005020100050201020503010205020100050101000502010005010100
-05ae000105010701060d0300020204010301020204000504070105000100050601000501
-0100050c0100050501000509010005010100050401000504010105090101050101000501
-010005020100050101000502010005180100050401000501010005010100050201000501
-010005020100050101040511010005030100050201000501010005000100051201000512
-010005020100050101000502010005010100050201000501010005020100050101000502
-010005080100050701000503010305020100050201000508010005020100050101010501
-01000504010005020100050201000501010005020100050101000502010005bb00010501
-0701060d0300020204010301020204000504070101000507010005010100050a01010505
-0100050a01000501010005050100050f0100050501000502010005010100051a01010504
-010005010100050201030502010005020100050301000511010105040100050201000501
-010105130100051201000509010005010100050201000501010005020100050101000505
-010405010103050401000507010005020103050101040501010005050100050201000504
-01000502010005020100050501000501010005bf000105010701060d0300020204010301
-0202040005040701050001000506010005010100050c010005030100050b010005010100
-05040100051001000505010405010100051c010005020105050101000501010005020104
-050301000513010005030100050201000501010105130100051301020503010305020100
-050001000502010405020102050901000502010005030100050701000505010005080100
-0505010005020100050401000503010005000100050301030502010205bc000105010701
-060d03000202040103010202040005040701050101000505010005010100050c01000502
-0100050c01000501010005030100051101000505010005050100051c0100050301000501
-010005020100050201000501010005070100051301000503010005020100050101000500
-010005120100051601000501010005020100050201000500010005020100050901000508
-010005020100050301000503010005020100050501000508010005050100050201000504
-0100050301000500010005020100050201000505010005bb000105010701060d03000202
-040103010202040005040701050201000504010005010100050301010502010005020100
-050101000507010105030100050101000502010005060101050901000505010005020100
-050101000502010005180100050301000501010005020100050201000501010005020100
-0503010005050101050b01000503010005020100050101000501010005040101050a0100
-050d01010502010005020100050101000502010005030100050301000502010005010100
-050201000508010005020100050301000503010005020100050101000502010005080100
-050201000501010005020100050401000504010005030100050201000501010005020100
-0511010105a7000105010701060d03000202040103010202040005040701050301000504
-010105040101050301020502010405030101050401010502010005070101050901000506
-010205030102051901000503010005010100050201000502010005020102050401000505
-0101050b010005040102050201000502010005030101050a0100050d0101050301020503
-0103050301000504010205030102050a0102050201040502010205030102050a01020502
-010005020100050401000504010005040103050201020512010105a7000105010701060d
-0300020204010301020204000504070105040100052a01000540010005220100050b0100
-05140100050a01030597010005a7000105010701060d0300020204010301020204000504
-070105730101051e0101050d01010510010105a5010105a8000105010701060d03000202
-04010301020204000504070105ff05ff050a000105010701060d03000202040103010202
-04000504070105ff05ff050a000105010701000d03000202040103010202040005040701
-0507010005010100056401000501010005ff05950001050107010600000c030002020401
-03010202040005040701050701000501010005040100051201020521010105050100050b
-0100051001000501010005ff059500010501070106000001050807010300020204010301
-0202040005040701050701000501010005040100051401000520010005070100051d0100
-0501010005ff059500010501070106010001050707010300020204010301020204000504
-0701050701000501010005020104050201020503010205050100050a0101050001000502
-010205020100050001010504010005040101050001000509010205030102050201010500
-0100050201000501010005ff059500010501070106010001050607010600030002020401
-030102020400050407010510010005030100050201000501010005020100050401000509
-01000501010105010100050201000501010105010100050101040501010005010101050b
-0100050201000502010005010100050001000500010005ff059b00010501070106020001
-050507010600030002020401030102020400050407010510010005030100050201000501
-010005020100050401000509010005020100050101000502010005010100050201000503
-01000503010005020100050b01000506010005010100050001000500010005ff059b0001
-050107010602000105040701060103000202040103010202040005040701051001000503
-010005020100050101000502010005040100050901000502010005010104050101000502
-0100050301000503010005020100050b01000503010305010100050001000500010005ff
-059b00010501070106030001050307010601030002020401030102020400050407010510
-010005030100050201000501010005020100050401000509010005020100050101000505
-010005020100050301000503010005020100050b01000502010005020100050101000500
-01000500010005ff059b0001050107010603000105020701060203000202040103010202
-040005040701051001000503010005020100050101000502010005040100050901000501
-010105010100050201000501010005020100050301000503010005010101050301010505
-01000502010005020100050101000500010005000100050a010105ff058e000105010701
-060400010501070106020300020204010301020204000504070105110101050201020503
-010205050100050a01010500010005020102050201000502010005030100050401010500
-0100050301010505010005030103050101000500010005000100050a010105ff058e0001
-050107010604000105000701060303000202040103010202040005040701052901050505
-010005270100051a010005ff058e00010501070106050000070206030300020204010301
-0202040005040701053101000502010005240100050101000518010105ff058f00010501
-070106050000070106040300020204010301020204000504070100ff00ff000c05010701
-0606070106040300020204010301020204000504070000ff00ff000d0501070106060700
-060503000202040103010202040005ff05ff05150701000d030002020401030102020400
-05ff05ff05150700000e030002020401030102020400050207ff07ff0716050b03000202
-0401030102020400050207ff07ff07150000050b03000202040103010202040005020701
-060d0000060000ff0073067f0001060c0001050b03000202040103010202040005020701
-060b00010700060000ff00720700067f0003060a0001050b030002020401030102020400
-050207010609000207010600000105ff056f0701067f000506080001050b030002020401
-0301020204000502070106070003050007010600000105ff056f0701067f000105010003
-06060001050b030002020401030004040502070106050003050207010600000105ff056f
-0701067f00010503000306040001050b0300040403050502070106030003050407010600
-000105ff056f0701067f00010505000306020001050b0304040003010202040005020701
-06010003050607010600000105ff056f0701067f00010507000306000001050b03000202
-040103010202040005020705050807010600000105ff056f0701067f0001050807030001
-050b0300020204010301020204000502070106010703050607010600000105ff056f0701
-067f00010507070306000001050b03000202040103010202040005020701060307030504
-07010600000105ff056f0701067f00010505070306020001050b03000202040103010202
-04000502070106050703050207010600000105ff056f0701067f00010503070306040001
-050b0300020204010301020204000502070106070703050007010600000105ff056f0701
-067f00010501070306060001050b03000202040103010202040005020701060907040600
-000105ff056f0701067f0001070306080001050b03000202040103010202040005020701
-060b07020600000107ff0771067f00010701060a0001050b030002020401030102020400
-05020701060d07000600000007ff0772067f00000700060c0001050b0300020204010301
-020204000502070100ff00ff0014050b0300020204010301020204000502070000ff00ff
-0015050b03000202040103010202040005ff05ff052503000202040103010202040005ff
-05ff052503000202040103010202040005ff05ff052503000202040103010202040005ff
-05ff052503000202040103010202040005ff05ff052503000202040103010202040005ff
-05ff052503000202040103010202040005ff05ff052503000202040103010202040005ff
-05ff052503000202040103010202040005ff05ff052503000202040103010202040005ff
-05ff052503000202040103010202040005ff05ff052503000202040103010202040005ff
-05ff052503000202040103010202040003ff03ff0326020204010301021a0400030002ff
-02f304000300021a04010301021a0400030002ff02f304000300021a04010301021a0400
-030002ff02f304000300021a04010301041b030004ff04f40300041c030004ff04ff0430
-
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 17 377 309
-%%EOF
diff --git a/lib/pman/doc/src/warning.gif b/lib/pman/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/pman/doc/src/warning.gif
+++ /dev/null
diff --git a/lib/pman/ebin/.gitignore b/lib/pman/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/pman/ebin/.gitignore
+++ /dev/null
diff --git a/lib/pman/info b/lib/pman/info
deleted file mode 100644
index 22003edcea..0000000000
--- a/lib/pman/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: tools
-short: A graphical process manager used to inspect Erlang processes.
diff --git a/lib/pman/priv/Makefile b/lib/pman/priv/Makefile
deleted file mode 100644
index a89278fd3a..0000000000
--- a/lib/pman/priv/Makefile
+++ /dev/null
@@ -1,58 +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
-
-include ../vsn.mk
-VSN = $(PMAN_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/pman-$(VSN)
-
-#
-# Macros
-#
-TOOLBAR_FILES = \
-	pman.tool \
-	pman.gif
-
-#
-# Rules
-#
-
-debug opt:
-
-docs:
-
-clean:
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(TOOLBAR_FILES) "$(RELSYSDIR)/priv"
-
-release_docs_spec:
-
-FORCE:
diff --git a/lib/pman/priv/pman.gif b/lib/pman/priv/pman.gif
deleted file mode 100644
index 4575a397d8..0000000000
--- a/lib/pman/priv/pman.gif
+++ /dev/null
diff --git a/lib/pman/priv/pman.tool b/lib/pman/priv/pman.tool
deleted file mode 100644
index c04b7d00eb..0000000000
--- a/lib/pman/priv/pman.tool
+++ /dev/null
@@ -1,6 +0,0 @@
-{version,"0.1"}.
-{{tool,"Pman"},
- {start,{pman,start,[]}},
- {icon,"pman.gif"},
- {message,"Process Manager"},
- {html,"../doc/html/index.html"}}.
diff --git a/lib/pman/src/Makefile b/lib/pman/src/Makefile
deleted file mode 100644
index eb0413bdbc..0000000000
--- a/lib/pman/src/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# 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
-# 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 $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(PMAN_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/pman-$(VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-MODULES= \
-	pman \
-	pman_main \
-	pman_shell \
-	pman_relay \
-	pman_relay_server \
-	pman_module_info \
-	pman_win \
-	pman_buf \
-	pman_buf_utils \
-	pman_buf_buffer \
-	pman_buf_converter \
-	pman_buf_printer \
-	pman_options \
-	pman_process \
-	pman_tool
-
-HRL_FILES= \
-	assert.hrl \
-	pman_buf.hrl \
-	pman_options.hrl \
-	pman_win.hrl
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-
-APP_FILE = pman.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-APPUP_FILE = pman.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += +warn_obsolete_guard
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES) 
-
-clean:
-	rm -f $(TARGET_FILES) 
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-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"
-
-release_docs_spec:
-
diff --git a/lib/pman/src/assert.hrl b/lib/pman/src/assert.hrl
deleted file mode 100644
index ea3b68cd7c..0000000000
--- a/lib/pman/src/assert.hrl
+++ /dev/null
@@ -1,81 +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 : Assert macro
-
-
-%% ?ASSERT/2 - will simply return true if the first argument evaluates to true
-%%    otherwise it will exit and output (via the error logger) the
-%%    second string
-%%
-%% Arguments:
-%%   Flag	Expression that should evalueate to true or false
-%%   String	String to return as a part of the exit reason as well
-%%   		be to be sent to the error logger.
-%%
-%% Returns:
-%%   true	If the Flag expression evaluates to true
-%%   
-%% Exits:
-%%   {'EXIT', {assertion_failed, String}}
-%%  		If the Flag expression evaluates to something other than
-%%		true.
-%%
-%% Usage notes:
-%%   Please note that the Flag argument must be a valid expression that 
-%%   evaluates to true.
-%%
-%%   Also, avoid any side effects in the Flag, as everything performed
-%%   within the scope of the ?ASSERT macro will not be present when
-%%   the code is not compiled with the debug_on flag.
-%%
-%%   Side effects include the binding of a variable, sending of a
-%%   message, etc.
-%%
-
--ifdef(debug_on).
--define(ASSERT(Flag, String),
-	case Flag of
-	    true ->
-		true;
-	   _ ->
-		S2 =
-		    lists:flatten(
-		      io_lib:format(
-			"=ASSERT====~nPid:~p, Module:~p, Line:~p~nTermination because assertion failed:~n~p",
-			[self(),?MODULE, ?LINE,String])),
-		error_logger:error_report(S2),
-		exit({assertion_failed, String})
-	end
-       ).
-
--define(ALWAYS_ASSERT(String),
-	S2 = lists:flatten(
-	       io_lib:format(
-		 "=ASSERT====~nPid:~p, Module:~p, Line:~p~nTermination because of unconditional assert:~n~p",
-		 [self(),?MODULE, ?LINE, String])),
-	error_logger:error_report(S2),
-	exit({always_assert, String})
-	).
--else.
--define(ASSERT(_Flag,_String), true).
--define(ALWAYS_ASSERT(_String), true).
--endif.
-
-				      
-
diff --git a/lib/pman/src/pman.app.src b/lib/pman/src/pman.app.src
deleted file mode 100644
index cc32a17296..0000000000
--- a/lib/pman/src/pman.app.src
+++ /dev/null
@@ -1,40 +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%
-%%
-{application, pman,
- [{description, "pman The Process Manager"},
-  {vsn, "%VSN%"},
-  {modules, [
-	     pman,
-	     pman_buf,
-	     pman_buf_buffer,
-	     pman_buf_converter,
-	     pman_buf_printer,
-	     pman_buf_utils,
-	     pman_main,
-	     pman_module_info,
-	     pman_options,
-	     pman_process,
-	     pman_relay,
-	     pman_relay_server,
-	     pman_shell,
-	     pman_tool,
-	     pman_win
-	    ]},
-  {registered, []},
-  {applications, [kernel, stdlib]}]}.
diff --git a/lib/pman/src/pman.appup.src b/lib/pman/src/pman.appup.src
deleted file mode 100644
index 7a435e9b22..0000000000
--- a/lib/pman/src/pman.appup.src
+++ /dev/null
@@ -1,19 +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%
-%%
-{"%VSN%",[],[]}.
diff --git a/lib/pman/src/pman.erl b/lib/pman/src/pman.erl
deleted file mode 100644
index c8ea34b6b7..0000000000
--- a/lib/pman/src/pman.erl
+++ /dev/null
@@ -1,132 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-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 : Exported API to the Pman graphical tool
-%%----------------------------------------------------------------------
-
--module(pman).
-
-
-%% ---------------------------------------------------------------
-%% The user interface exports 
-%% ---------------------------------------------------------------
--export([start/0,
-	 start_notimeout/0,
-	 start/1,
-	 start_notimeout/1,
-	 proc/1,
-	 proc/3]).
-
-%% ---------------------------------------------------------------
-
-%% Timeout for the startup function.
-%% If no  {initialization_complete, Pid} message has been received
-%% from the spawned init-function within ?STARTUP_TIMEOUT ms
-%% the start-function will call exit(Reason).
--define(STARTUP_TIMEOUT, 20000).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start/0
-
-start() ->
-    start([], ?STARTUP_TIMEOUT).		%Start w/o excluded modules
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start_notimeout/0
-
-start_notimeout() ->
-    start([],infinity).				%Start w/o excluded modules
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start/1
-
-start(LIModuleExcluded) ->
-    start(LIModuleExcluded, ?STARTUP_TIMEOUT).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start_notimeout/1
-
-start_notimeout(LIModuleExcluded) ->
-    start(LIModuleExcluded, infinity).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start/2 - Spawns the main Pman process, that will supervise
-%%    all processes except those running code from the modules
-%%    specified in LIModuleExcluded
-%%
-
-start(LIModuleExcluded, Timeout) ->
-
-    OSModuleExcluded = ordsets:from_list(LIModuleExcluded),
-
-    PidInit = spawn(pman_main, init, [self(), OSModuleExcluded]),
-
-    %% Wait for a initialization completion message from
-    %% the spawned process before returning its Pid.
-    %% 
-
-    receive
-	{initialization_complete, PidInit} ->
-	    PidInit
-
-    %% (Conditional) Failure to start within the time limit will
-    %% result in termination
-
-    after
-	Timeout ->
-	    exit(PidInit, kill),
-	    exit({startup_timeout, ?MODULE})
-    end.
-
-
-
-%% ---------------------------------------------------------------
-%% If we want to trace just one process, we can call proc, giving it
-%% either the Pid, or the registered name, (Global or local).
-%%
-%% (???)
-%% Note that this function must not be used internally to create a
-%% trace window, since it is assumed that it is started from any
-%% process (esp. the shell) it will not have any supervisor process
-%% that shall be notified about it's exit/death.
-%%
-%% Returns: Trace loop Pid|udefined
-
-%% ---------------------------------------------------------------
-
-
-proc(undefined) ->
-    exit(undefined);
-
-proc({shell,P}) when is_pid(P) ->
-    pman_shell:start({{shell,P},self()});
-
-proc(P) when is_atom(P) ->
-    proc(whereis(P));
-
-proc({global, N}) ->
-    proc(global:whereis_name(N));
-
-proc(P) when is_pid(P) ->
-    pman_shell:start({P,self()}).
-
-proc(X,Y,Z) ->
-    proc(c:pid(X,Y,Z)).
-
diff --git a/lib/pman/src/pman_buf.erl b/lib/pman/src/pman_buf.erl
deleted file mode 100644
index d56ce184fa..0000000000
--- a/lib/pman/src/pman_buf.erl
+++ /dev/null
@@ -1,117 +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 : This module is the exported interface to the buffering mechanism
-%%%           used in PMAN to prevent the trace output to congest
-%%%           the system.
-%%%
-%%%           This module depends on the modules (direct or indirectly):
-%%%               pman_buf.hrl
-%%%               pman_buf_utils.erl
-%%%               pman_buf_buffer.erl
-%%%               pman_buf_converter.erl
-%%%               pman_buf_printer.erl
-%%%
-%%%----------------------------------------------------------------------
-
--module(pman_buf).
-
-%%-compile(export_all).
--export([start/2,clear/3]).
-
-
--include("pman_buf.hrl").
-
-
-%% The buffering mechanism consists of three processes that 
-%% work in a chain to prevent the process monitor from congesting
-%% output mechanism.
-%% 
-%% Messages are buffered in the CONVERTER process before they are sent to
-%% to the BUFFER process where they are formatted before they are finally
-%% sent to either a file or the PRINTER process. The printer process
-%% outputs the messages in the graphical user interface.
-%%
-%%
-%%
-%%     	   -->   CONVERTER  -->   BUFFER    --> PRINTER --> gui
-%%                                 |
-%%                                 |
-%%                                 |
-%%                                 V
-%%
-%%                                file
-%%
-
-
-
-
-
-%% ----------------------------------------------------------------
-%% The amount of data produced by a trace message may be large, and
-%% cause the run time system to run out of memory. To avoid this,
-%% the task of storing, cutting buffers, formating data and printing
-%% it is performed by three processes: The buffer, the converter and 
-%% the printer.
-%%
-%% The converter accepts the raw data, a list
-%% of {trace,Msg} tuples. Having max priority, it assures that the
-%% amount of raw data stored never excedes ?BUFF_SIZE messages.
-%% (With the exception of the last batch received, which assures that
-%% the last trace message printed is never a buffer cut message.)
-%% Whenever there is space available in the buffer process, (The
-%% Buffer process stores max. ?BUFF_SIZE converted messages),
-%% the buffer asks for more unconverted messages, and ?PRINT_LEN messages 
-%% are sent. They are converted by the buffer, and added to the list
-%% of messages to be sent. 
-
-%% The printer process requests formatted messages from the buffer,
-%% and in chuncs of ?MAX_OUTPUT sends them to the buffer. If traces
-%% are to be dumped on file, due to the max priority, such is handled
-%% in the converter, and buffers are not cut.
-%%
-
-
-%% ---------------------------------------------------------------
-%% Initializes the buffering mechanism, which consist of three
-%% processes, each involved with a phase of the formattation and
-%% output of data to the process windows.
-
-start(Editor, FileName) ->
-    Buffer_Pid = spawn_link(pman_buf_buffer,init,[Editor]),
-    Converter_Pid =
-	spawn_link(pman_buf_converter,init,[Buffer_Pid, FileName]),
-    Buffer_Pid!{converter_pid, Converter_Pid},
-    #buffer{converter=Converter_Pid,buffer=Buffer_Pid}.
-
-
-
-%% ---------------------------------------------------------------
-%% Kills the converter and the clears the buffer with formated data
-%% starting a new converter.
-
-clear(Buff,String, FileName) ->
-    exit(Buff#buffer.converter,win_killed),
-    Converter_Pid=spawn_link(pman_buf_converter,init,[Buff#buffer.buffer,
-						      FileName]),
-    Buff#buffer.buffer!{clear,String,Converter_Pid },
-    Buff#buffer{converter = Converter_Pid}.
-
-
-
diff --git a/lib/pman/src/pman_buf.hrl b/lib/pman/src/pman_buf.hrl
deleted file mode 100644
index 3f25dcc5f0..0000000000
--- a/lib/pman/src/pman_buf.hrl
+++ /dev/null
@@ -1,29 +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%
-%%
-
-%%-compile(export_all).
-%%-export([Function/Arity, ...]).
-
--define(BUFF_SIZE,1000).
--define(EDITOR_MAX,10000).
--define(PRINT_LEN,50).
--define(MAX_OUTPUT,5000).
-
-
--record(buffer,{buffer,converter}).
diff --git a/lib/pman/src/pman_buf_buffer.erl b/lib/pman/src/pman_buf_buffer.erl
deleted file mode 100644
index ad92eb1f3e..0000000000
--- a/lib/pman/src/pman_buf_buffer.erl
+++ /dev/null
@@ -1,102 +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 : The purpouse of the buffer process is to take
-%%%           care of the data that is received by the converter
-%%%           process and pass it on to the printer process in chunks
-%%%	      that can be handled.
-%%%
-%%%           This module is a part of the buffering system, and
-%%%           should not be used except through the API defined
-%%%           in the pman_buf module.
-%%%
-%%%----------------------------------------------------------------------
-
--module(pman_buf_buffer).
-
-%%-compile(export_all).
--export([init/1]).
-
--include("pman_buf.hrl").
-
-
-
-%%
-%% Initialization function for the buffer process.
-%% To be started with spawn from the calling process.
-%%
-
-init(Editor) ->
-    Printer_pid = spawn_link(pman_buf_printer,init,[Editor,self()]),
-    receive
-	{converter_pid,Pid} ->
-	    Pid!{buffer,accept},
-	    buffer_loop([],0,0,Printer_pid,Pid)
-    end.
-
-
-
-%%
-%% Receive loop for the buffer process.
-%%
-
-buffer_loop(Buffer,Size,Acc,Printer,Converter) ->
-    receive
-	{save_buffer,Name} ->
-	    Printer!{save_buffer,Name},
-	    buffer_loop(Buffer,Size,Acc,Printer,Converter);
-	{raw,Raw,Length} ->   %%output to editor
-	    New_Size = Size + Length,
-	    if New_Size < ?BUFF_SIZE ->
-		    Converter!{buffer,accept};
-	       true -> ok
-	    end,
-	    Print = lists:map(fun(X) -> pman_buf_utils:textformat(X) end, Raw),
-	    New_Buff = lists:append(Buffer,Print),
-	    buffer_loop(New_Buff,New_Size,Acc,Printer,Converter);
-	{clear,Text,N_Converter} ->
-	    Converter!{buffer,accept},
-	    Printer!clear,
-	    buffer_loop([Text],1,1,Printer,N_Converter);
-	{printer,send} when Buffer /= [] ->
-	     if
-		 Acc  > ?EDITOR_MAX ->
-		     Printer!clear,
-		     Printer !{buffer,"Cleared Buffer due to Size\n\n"},
-		     buffer_loop(Buffer,Size,1,Printer,Converter);
-		 true ->
-		     {Length,Rest,Print} = pman_buf_utils:split(Buffer,
-								?PRINT_LEN,
-								0,
-								[]),
-		     Printer ! {buffer,Print},
-		     New_Size = Size - Length,
-		     if New_Size < ?BUFF_SIZE ->
-			     Converter!{buffer,accept};
-			true -> ok
-		     end,
-		     buffer_loop(Rest,New_Size,Acc+Length,Printer,Converter)
-	     end;
-	{converter,file} ->
-	    Converter!{buffer,Buffer},
-	    self()!{raw,[to_file],1},
-	    buffer_loop([],0,Acc,Printer,Converter)
-    end.
-
-
diff --git a/lib/pman/src/pman_buf_converter.erl b/lib/pman/src/pman_buf_converter.erl
deleted file mode 100644
index c8b3fe37aa..0000000000
--- a/lib/pman/src/pman_buf_converter.erl
+++ /dev/null
@@ -1,190 +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%
-%%
-%%----------------------------------------------------------------------
-%% Purpose : The purpouse of the converter process is to take
-%%           care of the raw data that is received by the tracing
-%%           process (a pman_shell process) and pass it on to
-%%           the buffer process in chunks that can be handled.
-%%
-%%           This module is a part of the buffering system, and
-%%           should not be used except through the API defined
-%%           in the pman_buf module.
-%%
-%%----------------------------------------------------------------------
-
--module(pman_buf_converter).
--compile([{nowarn_deprecated_function,{gs,start,0}}]).
-
-%%-compile(export_all).
--export([init/2]).
-
--include("pman_buf.hrl").
-
-
-%% ---------------------------------------------------------------
-%% Starts the process which received the raw data from the debugger, 
-%% cuts and forwards it to the buffer in smaller chunks. High priority
-%% to avoid large message queues waiting to be processed.
-
-init(Buffer_Pid, FileName) ->
-    process_flag(priority, max),
-    converter_loop(Buffer_Pid,[],0,true,[], FileName).
-    
-converter_loop(Buffer_Pid,Raw,Size,State,Last, FileName) ->
-    receive
-	{file,Shell} ->
-	    case init_file(lists:append(Raw,Last),
-			   FileName,
-			   Shell,
-			   Buffer_Pid) of
-		true  -> converter_loop(Buffer_Pid,
-					[to_buffer],
-					1,
-					State,
-					[],
-					FileName);
-		false -> converter_loop(Buffer_Pid,
-					Raw,
-					Size,
-					State,
-					Last,
-					FileName)
-	    end;
-	{raw,Trace} ->
-	    {New_Raw,New_Size,New_State,New_Last} =
-		converter_data(Trace, Buffer_Pid, Raw, Size, State, Last),
-	    converter_loop(Buffer_Pid,
-			   New_Raw,
-			   New_Size,
-			   New_State,
-			   New_Last,
-			   FileName);
-        {buffer,accept} when Raw /= [] ->
-	    {Length,Rest,Print} = pman_buf_utils:split(Raw,?PRINT_LEN,0,[]),
-	    Buffer_Pid!{raw,Print,Length},
-	    converter_loop(Buffer_Pid,Rest,Size-Length,false,Last,FileName);
-	{buffer,accept} when Last /= [] ->
-	    {New_Raw,New_Size,New_State,New_Last} =
-		converter_data(Last,Buffer_Pid,Raw,Size,true,[]),
-	    converter_loop(Buffer_Pid,
-			   New_Raw,
-			   New_Size,
-			   New_State,
-			   New_Last,
-			   FileName);
-	{buffer,accept} ->
-	    converter_loop(Buffer_Pid,Raw,Size,true,Last, FileName);  
-	{clear,Str} ->
-	    Buffer_Pid!{clear,Str},
-	    converter_loop(Buffer_Pid,[],0,State,Last,FileName)
-    end.
-
-converter_data(Trace,Buffer_Pid,Raw,Size,State,Last) ->
-    if
-	?BUFF_SIZE - Size > 0 ->
-	    {Len,Rest,New_Trace} = pman_buf_utils:split(Trace,
-							?BUFF_SIZE-Size,
-							0,[]),
-	    {New_Raw,New_Last} =
-		case Rest of
-		    [] ->
-			{lists:append(Raw,New_Trace),Last};
-		    [_|_] ->
-			case Last of
-			    [] ->
-				{lists:append(Raw,New_Trace),Rest};
-			    _ ->{lists:concat([Raw,New_Trace,[cut_buffer]]),
-				 Rest}
-			end
-		end,
-	    case State of true ->
-		    {Length,Cut_Raw,Print} = pman_buf_utils:split(New_Raw,
-								  ?PRINT_LEN,
-								  0,[]),
-		    Buffer_Pid!{raw,Print,Length},
-		    {Cut_Raw,Size-Length,false,New_Last};
-		_ ->
-		    {New_Raw,Size+Len,false,New_Last}
-	    end;
-	true ->
-	    {Raw,Size,State,Trace}
-    end.
-
-
-%% ---------------------------------------------------------------
-%% Initializes the environment for saving the trace to file. The 
-%% actual saving is taken care of by the buffer process.
-
-init_file(Raw,FileName, Name,Buffer_Pid) ->
-     case open_file(FileName, Name) of
-	 {false,T} ->
-	     pman_win:msg_win(T),
-	     false;
-	 {File,T} ->
-	     Buffer_Pid!{converter,file},
-	     pman_win:dialog_window(gs:start(),T),
-	     save_loop_init(File,Raw)
-     end.
-
-open_file(FileName, _Shell) ->
-%%    L = "pman_trace." ++ Shell,
-    case file:open(FileName, [read,write]) of
-	{error, _} -> 
-	    Str = "ERROR: Could not create_file\n" ++ FileName,
-	    {false,Str};
-	{ok,File} ->
-	    file:position(File, {eof, 0}),
-	    Str1 = " Appending trace log to file\n" ++ FileName,
-	    {File,Str1}
-    end.
-
-
-save_loop_init(Fd,Raw) ->
-    {Date, Time} = calendar:local_time(),
-    {Year, Month, Day} = Date,
-    {Hour, Minute, Second} = Time,
-    io:format(Fd,"%%% ~n",[]),
-    io:format(Fd,"%%% Trace output~n",[]),
-    io:format(Fd,"%%% Started at ~4p-~2p-~2p ~2p:~2p:~2p~n",
-	      [Year, Month, Day,
-	       Hour, Minute, Second
-	      ]),
-    io:format(Fd,"%%% ~n~n",[]),
-
-    Print = lists:map(fun(X) -> pman_buf_utils:textformat(X) end, Raw),
-    receive
-	{buffer,Text} when is_list(Text) ->
-	    io:format(Fd,Text,[]),
-	    io:format(Fd,Print,[]),
-	    save_loop(Fd)
-    end.
-
-save_loop(Fd) ->
-    receive
-	{raw,Raw} ->
-	    Print = lists:map(fun(X) -> pman_buf_utils:textformat(X) end, Raw),
-	    io:format(Fd,Print,[]),
-	    save_loop(Fd);
-	buffer -> true
-    end.
-
-
-
-
-
diff --git a/lib/pman/src/pman_buf_printer.erl b/lib/pman/src/pman_buf_printer.erl
deleted file mode 100644
index 3284c57559..0000000000
--- a/lib/pman/src/pman_buf_printer.erl
+++ /dev/null
@@ -1,91 +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%
-%%
-
--module(pman_buf_printer).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
-
-%%-compile(export_all).
--export([init/2]).
-
-
--include("pman_buf.hrl").
-
-%% ---------------------------------------------------------------
-%% Starts the part of the buffer which regulates the flow of data to
-%% be printed in the pid editors
-
-
-init(Editor,Buffer_pid) ->
-    Buffer_pid!{printer,send},
-    printer_loop(Editor,Buffer_pid).
-    
-printer_loop(Editor,Buffer_pid)->
-    receive
-	{save_buffer,Name} ->
-	    gs:config(Editor,{save,Name}),
-	    TT = "Buffer saved in file\n" ++ Name,
-	    pman_win:dialog_window(gs:start(),TT),
-	    printer_loop(Editor,Buffer_pid);
-	{buffer,Trace} ->
-	    case lists:flatlength(Trace) of
-		Len when Len > ?MAX_OUTPUT ->
-		    printer_long(lists:flatten(Trace),Editor),
-		    Buffer_pid!{printer,send},
-		    printer_loop(Editor,Buffer_pid);
-		_ ->
-		    		    Buffer_pid!{printer,send},
-		    print_trace(Editor,Trace),
-		    printer_loop(Editor,Buffer_pid)
-	    end;
-	clear ->
-	    pman_win:configeditor(Editor, [{enable, true}]),
-	    pman_win:configeditor(Editor,clear),
-	    pman_win:configeditor(Editor, [{enable, false}]),
-	    printer_loop(Editor,Buffer_pid);
-	_Other ->
-	    printer_loop(Editor,Buffer_pid)
-    end.
-
-printer_long([],_) -> ok;
-printer_long(Trace,Editor) ->
-    receive
-	clear ->
-	    pman_win:configeditor(Editor, [{enable, true}]),
-	    pman_win:configeditor(Editor,clear),
-	    pman_win:configeditor(Editor, [{enable, false}])
-    after 0 ->
-	    {_Length,Rest,Print} = pman_buf_utils:split(Trace,
-							?MAX_OUTPUT,
-							0,
-							[]),
-	    print_trace(Editor,Print),
-	    printer_long(Rest,Editor)
-    end.
-
-
-
-%% ---------------------------------------------------------------
-%% Function which print trace messages on the window 
-%% ---------------------------------------------------------------
-
-print_trace(Editor,Elements) ->
-    pman_win:configeditor(Editor, [{enable, true}]),
-    pman_win:configeditor(Editor, [{insert, {'end',Elements}}]),
-    pman_win:configeditor(Editor, [{enable, false}]).	
diff --git a/lib/pman/src/pman_buf_utils.erl b/lib/pman/src/pman_buf_utils.erl
deleted file mode 100644
index af3982665e..0000000000
--- a/lib/pman/src/pman_buf_utils.erl
+++ /dev/null
@@ -1,106 +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(pman_buf_utils).
-
-%%-compile(export_all).
--export([textformat/1, split/4]).
-
-
-%% ---------------------------------------------------------------
-%% Funtion which format the trace message
-%% ---------------------------------------------------------------
-
-textformat(died) ->
-    "\n\nProcess died\n";
-textformat({died, Pid}) ->
-    io_lib:format("~w Process died.~n",[Pid]);
-textformat({shell_died, Old, New}) ->
-    io_lib:format("~w Shell Process died. Restarted as ~w~n~n",[Old,New]);
-
-
-textformat(to_buffer) ->
-    "\nAppending trace log to Buffer\n\n";
-textformat(to_file) ->
-    "\nAppending trace log to File\n\n";
-textformat(cut_buffer) ->
-    "\nCUT BUFFER\n\n";
-textformat({trace, From, 'receive', Msg}) ->
-    io_lib:format("~w: rec   ~s~n", [From,
-				       tuple_space(Msg)]);
-textformat({trace, From, send, Msg, To}) ->
-    io_lib:format("~w:  !    To: ~w Msg: ~s~n", [From,
-						   To,
-						   tuple_space(Msg)]);
-textformat({trace, From, call, Func}) ->
-    io_lib:format("~w: call  ~s~n",[From, ffunc(Func)]);
-textformat({trace, From, spawn, Data}) ->
-    io_lib:format("~w: spawn ~p~n", [From, Data]);
-textformat({trace, From, link, Data}) ->
-    io_lib:format("~w: link  ~p~n", [From,  Data]);
-textformat({trace, From, unlink, Data}) ->
-    io_lib:format("~w: U-lnk ~p~n", [From,  Data]);
-
-textformat({trace, From, Op, Data}) ->
-    io_lib:format("~w: ~w   ~p~n", [From, Op, Data]);
-
-textformat({print, Format, Args}) ->
-    io_lib:format(Format, Args);
-textformat(Other) ->
-    io_lib:format("~p~n",[Other]).
-    
-
-
-
-
-ffunc({M,F, Argl}) ->
-    io_lib:format("~w:~w(~s)", [M, F, fargs(Argl)]);
-ffunc(X) -> tuple_space(X).
-fargs([]) -> [];
-fargs([A]) -> tuple_space(A);  %% last arg
-fargs([A|Args]) -> [tuple_space(A),", "|fargs(Args)].
-
-
-tuple_space(X) when is_tuple(X) -> print(size(X), X, "}");
-tuple_space(X)                  -> io_lib:format("~p",[X]).
-
-print(0  , _X, Buff) -> ["{"|Buff];
-print(1  , X, Buff) -> 
-    Str =  tuple_space(element(1, X)),
-    ["{",Str|Buff];
-print(Num, X, Buff) ->
-    Str =  tuple_space(element(Num, X)),
-    print(Num-1, X, [", ",Str|Buff]).
-
-
-
-%% ----------------------------------------------------------------
-%% splits the list at element Size, returns Size, and the 2 lists
-%% If the list is not long enough, it returns {size(List),[],List}
-
-
-split([],_,Length,Buff) ->
-    {Length,[],lists:reverse(Buff)};
-split(Rest,0,Length,Buff) ->
-    {Length,Rest,lists:reverse(Buff)};
-split([L|List],Size,Length,Buff) ->
-    split(List,Size-1,Length+1,[L|Buff]).
-
-
-
diff --git a/lib/pman/src/pman_main.erl b/lib/pman/src/pman_main.erl
deleted file mode 100644
index 2f51284293..0000000000
--- a/lib/pman/src/pman_main.erl
+++ /dev/null
@@ -1,789 +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%
-%%
--module(pman_main).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,read,2}}]).
-
-%% Main process and window
-
--export([init/2]).
-
--record(state, {win,		     % GS top window
-		frame,	             % GS top frame
-		grid,		     % GS process info grid
-
-		size,                % int() No. of displayed procs
-		w,                   % int() Window width
-		h,                   % int() Window height
-
-		hide_system=false,   % bool() Auto-hide system procs
-		hide_new=false,      % bool() Auto-hide new processes
-
-		hide_modules,        % ordset() Excluded modules
-
-		hide_all=[],         % [{node(), bool()}] Hide all
-		hide_pids=[],        % [{node(), Ordset}] Processes
-				     %  explicitly to hide, per node
-		show_pids=[],        % [{node(), Ordset}] Processes
-				     %  explicitly to show, per node
-
-		shown_pids=[],       % [{node(), Ordset}] Processes
-		                     %  actually shown, per node
-
-		node,		     % node() Current node
-		nodes=[],            % [node()] All known nodes
-
-		focus=1,	     % int() Grid line with focus
-		focus_pid=undefined, % pid() | undefined Proc in focus
-
-		noshell,	     % bool() Noshell mode on
-
-		options}).           % term() Trace options settings
-
-
--include("pman_win.hrl").
-
--define(REFRESH_TIME,5000).
-
--define(REQUIRES_FOCUS,		     % List of menus that should
-	['Trace Process',	     % be disabled if no process
-	 'Kill',		     % is in focus
-	 'Hide Selected Process',
-	 'Module']).
-
-%%--Process init and loop-----------------------------------------------
-
-init(PidCaller, OSModuleExcluded) ->
-    process_flag(trap_exit, true),
-
-    %% Monitor all nodes in a distributed system
-    case is_alive() of
-
-	%% We have a distributed system
-	true -> net_kernel:monitor_nodes(true);
-
-	%% No distribution
-	false -> ignore
-    end,
-    Nodes = [node()|nodes()],
-
-    %% Create the main window
-    %% For some extremely strange reason, the frame must be resized
-    %% or the grid won't be visible...
-    GridSize = length(processes()) + 61,
-    {Window, Grid, Frame, Visible, W, H}  =
-	pman_win:pman_window(GridSize, OSModuleExcluded, Nodes),
-    gse:resize(Frame, ?WIN_WIDTH, ?WIN_HEIGHT-?MENU_HEIGHT),
-
-    Noshell = case pman_shell:find_shell() of
-		  noshell -> true;
-		  _ -> false
-	      end,
-
-    State1 = #state{win=Window, frame=Frame, grid=Grid,
-		    size=Visible,
-		    w=W, h=H,
-		    hide_modules=OSModuleExcluded,
-		    node=node(),
-		    noshell=Noshell},
-
-    State2 = lists:foldl(fun(Node, State) -> add_node(Node, State) end,
-			 State1,
-			 Nodes),
-
-    State3 = refresh(State2),
-
-    %% Notify caller that the process appears
-    %% to have been started.
-    PidCaller ! {initialization_complete, self()},
-
-    %% Initiate a 'catch all' trace pattern so call tracing works
-    erlang:trace_pattern({'_', '_', '_'}, true, [local]),
-
-    %% Read default options file
-    Options = restore_options(State3),
-
-    loop(State3#state{options=Options}).
-
-add_node(Node, State) ->
-    pman_win:add_menu(node, [Node], "Show"),
-    State#state{hide_all=nl_update(Node, false, State#state.hide_all),
-		hide_pids=nl_update(Node, [], State#state.hide_pids),
-		show_pids=nl_update(Node, [], State#state.show_pids),
-		shown_pids=nl_update(Node, [], State#state.shown_pids),
-		nodes=[Node|State#state.nodes]}.
-
-%% Restore saved options from default file
-restore_options(State)->
-    File = options_file(),
-    case pman_options:read_from_file(File) of
-	{ok, Options} ->
-	    Options;
-	{error, ReasonStr, DefOptions} ->
-	    Parent = State#state.win,
-	    Msg = io_lib:format(
-		    "Problems reading default option file~n~s:~n~s",
-		    [File, ReasonStr]),
-	    tool_utils:notify(Parent, Msg),
-	    DefOptions
-    end.
-
-options_file() ->
-    {ok, [[Home]]} = init:get_argument(home),
-    filename:join([Home, ".erlang_tools", "pman.opts"]).
-
-loop(State) ->
-    receive
-	{nodeup, Node} ->
-	    case nl_exists(Node, State#state.hide_all) of
-		true ->
-		    pman_win:add_menu(node, [Node], "Show"),
-		    loop(State#state{nodes=[Node|State#state.nodes]});
-		false ->
-		    loop(add_node(Node, State))
-	    end;
-
-	{nodedown, Node} ->
-	    pman_win:remove_menu([Node]),
-
-	    Msg = io_lib:format("Node~n~p~ndown.", [Node]),
-	    spawn_link(tool_utils, notify, [State#state.win, Msg]),
-
-	    %% We remove Node from the list of nodes but not from
-	    %% the other lists of State, in case Node reappears later
-	    Nodes = lists:delete(Node, State#state.nodes),
-	    State2 = State#state{nodes=Nodes},
-
-	    %% If it was the shown node that went down,
-	    %% change overview to this node
-	    if
-		Node==State#state.node ->
-		    State3 = execute_cmd({node,node()}, State2, [], []),
-		    loop(State3);
-		true ->
-		    loop(State2)
-	    end;
-
-	%% Ignore EXIT signals from help processes
-	{'EXIT', _Pid, _Reason} ->
-	    loop(State);
-
-	%% GS events
-	{gs, _Obj, _Event, _Data, _Args} = Cmd ->
-	    case gs_cmd(Cmd, State) of
-		stop ->
-		    exit(topquit);
-		State2 ->
-		    loop(State2)
-	    end
-
-    after ?REFRESH_TIME ->
-	    State2 = refresh(State),
-	    loop(State2)
-    end.
-
-%% gs_cmd(Event, State) -> stop | State'
-gs_cmd(Event, State) ->
-    case Event of
-
-	%% --- Window manager commands ---
-
-	%% Window is moved or resized
-        {gs, _, configure, _Data, Args} ->
-	    configure(Args, State);
-
-	%% Window closed, stop Pman
-        {gs, _, destroy, _, _} ->
-	    stop;
-
-	%% --- Dynamic commands ---
-
-	%% Click in any object where the GS Data field is a 2-tuple
-	{gs, _, click, Data, Args} when is_tuple(Data), size(Data)==2 ->
-	    execute_cmd(Data, State, [], Args);
-
-	%% Single click in the grid sets focus to selected process
-	{gs, _, click, {pidfunc,_,_}, [_,Row|_]} when is_integer(Row) ->
-	    focus(Row, State);
-
-	%% Double click in the grid starts tracing of selected process
-	{gs, _, doubleclick, {pidfunc,_,_}, [_Col,Row| _]} when is_integer(Row) ->
-	    execute_cmd('Trace Process', State, [], []);
-
-	%% Click in named GS objects
-        {gs, Cmd, click, Data, Args} when is_atom(Cmd);
-					  is_atom(element(1, Cmd)) ->
-	    execute_cmd(Cmd, State, Data, Args);
-
-        %% --- Keyboard accelerator commands ---
-
-	%% Move focus up and down
-	{gs, _, keypress, [], ['Up',_,0,0]} ->
-	    execute_cmd(focus_previous, State, [], []);
-	{gs, _, keypress, [], ['Down',_,0,0]} ->
-	    execute_cmd(focus_next, State, [], []);
-
-	%% Other keyboard shortcuts
-	{gs, _, keypress, [], ['Return',_,0,0]} ->
-	    execute_cmd('Trace Process', State, [], []);
-        {gs, _, keypress, [], [Key,_,0,1]} ->
-	    execute_cmd(shortcut(Key), State, [], []);
-
-	%% Ignore all other GS events
-     	_Other ->
-	    State
-    end.
-
-%% Keyboard shortcuts
-
-%% File menu
-shortcut(o) -> 'Default Options';
-shortcut(e) -> 'Exit';
-shortcut(z) -> 'Exit';
-
-%% View menu
-shortcut(i) -> 'Hide All';
-shortcut(u) -> 'Hide Modules';
-shortcut(d) -> 'Hide Selected Process';
-shortcut(m) -> 'Module';
-shortcut(r) -> 'Refresh';
-
-%% Trace menu
-shortcut(k) -> 'Kill';
-shortcut(t) -> 'Trace Process';
-shortcut(s) -> 'Trace Shell';
-
-%% Help menu
-shortcut(h) -> 'Help';
-
-%% Keyboard command only
-shortcut(l) -> 'All Links';
-
-%% Process grid traversal
-shortcut(p) -> focus_previous;
-shortcut(n) -> focus_next;
-shortcut(_) -> dummy.
-
-%% configure([W,H,X,Y|_], State) -> State'
-%% Window has been moved or resized
-configure([W,H|_], State) ->
-    if
-	W==State#state.w, H==State#state.h ->
-	    ignore;
-
-	true ->
-	    gse:resize(State#state.frame, W, H-?MENU_HEIGHT),
-
-	    Grid = State#state.grid,
-	    case abs(W - gs:read(Grid,width) - 6) of
-		0 ->
-		    ok;   %% Avoid refreshing width if possible
-		_Anything ->
-		    Cols = pman_win:calc_columnwidths(W-6),
-		    gs:config(Grid, Cols)
-	    end,
-	    pman_win:configwin(Grid, W, H)
-    end,
-    State.
-
-%% focus(Row, State) -> State'
-%%   Row = int()  Grid row
-%% User has selected a row in the grid.
-%% Row==1 means header row.
-focus(Row, State) ->
-
-    Pid = case get_pid_in_focus(Row, State#state.grid) of
-	      {true, {pidfunc,Pid0,_}} ->
-		  pman_win:change_colour(State#state.grid,
-					 State#state.focus, Row),
-		  enable_pid_actions(),
-		  Pid0;
-	      false ->
-		  disable_pid_actions(),
-		  undefined
-	  end,
-
-    State#state{focus=Row, focus_pid=Pid}.
-
-%% get_pid_in_focus(Row, Grid) -> {true, Data} | false
-%%   Data = {pidfunc, Pid, Func}
-%%     Func = {Mod,Name,Arity} | term()
-%% Return the data associated with the process in focus if there is one,
-get_pid_in_focus(1, _Grid) ->
-    false;
-get_pid_in_focus(Row, Grid) ->
-    case gs:read(Grid, {obj_at_row,Row}) of
-	undefined -> false;
-	GridLine ->
-	    Data = gs:read(GridLine, data),
-	    {true, Data}
-    end.
-
-%% execute_cmd(Cmd, State, Data, Args) -> stop | State'
-
-%% Checkbutton "Hide System Processes"
-execute_cmd('Hide System', State, _Data, Args) ->
-    [_Text, _Group, Bool|_Rest] = Args,
-    State2 = State#state{hide_system=Bool},
-    refresh(State2);
-
-%% Checkbutton "Auto-Hide New"
-execute_cmd('Auto Hide New', State, _Data, Args ) ->
-    [_Text, _Group, Bool|_Rest] = Args,
-    refresh(State#state{hide_new=Bool});
-
-%% File->Options...
-execute_cmd('Default Options', State, _Data, _Args) ->
-    OldOptions = State#state.options,
-    NewOptions = pman_options:dialog(State#state.win,
-				     "Default Trace Options",
-				     OldOptions),
-    case NewOptions of
-	{error, _Reason} ->
-	    State;
-	Options ->
-	    State#state{options=Options}
-    end;
-
-%% File->Save Options
-%% Save the set default options to the user's option file
-execute_cmd('Save Options', State, _Data, _Args)->
-    Options = State#state.options,
-    File = options_file(),
-    Parent = State#state.win,
-
-    case pman_options:save_to_file(Options, File) of
-	ok ->
-	    tool_utils:notify(Parent, "Options saved to\n" ++ File);
-	{error, ReasonStr} ->
-	    Msg = io_lib:format("Could not save options to~n~s:~n~s",
-				[File, ReasonStr]),
-	    tool_utils:notify(Parent, Msg)
-    end,
-    State;
-
-%% File->Exit
-%% Exit the application
-execute_cmd('Exit', _State, _Data, _Args) ->
-    stop;
-
-%% View->Hide All Processes
-execute_cmd('Hide All', State, _Data, _Args) ->
-    Node = State#state.node,
-    HideAll = nl_update(Node, true, State#state.hide_all),
-    ShowPids = nl_del_all(State#state.node, State#state.show_pids),
-    State2 = State#state{hide_all=HideAll, show_pids=ShowPids},
-    refresh(State2, true);
-
-%% View->Hide modules...
-%% Opens a dialog where the user can select from a list of 
-%% the loaded modules.
-%% The selected module is added to the list of hidden modules.
-execute_cmd('Hide Modules', State, _Data, _Args) ->
-
-    %% Get all loaded modules that are not already hidden
-    AllModules = lists:map(fun({Module, _File}) -> Module end,
-			   code:all_loaded()),
-    ModulesSet = ordsets:subtract(ordsets:from_list(AllModules),
-				  State#state.hide_modules),
-
-    %% Let the user select which of the loaded modules to exclude from
-    %% the process overview
-    Title = "Module selection",
-    case pman_tool:select(State#state.win, Title, ModulesSet) of
-	Modules when is_list(Modules) ->
-	    HideModules = ordsets:union(State#state.hide_modules,
-					ordsets:from_list(Modules)),
-	    refresh(State#state{hide_modules=HideModules});
-	cancelled -> State
-    end;
-
-%% View->Hide Selected Process
-%% The process in focus should explicitly be hidden
-execute_cmd('Hide Selected Process', State, _Data, _Args) ->
-    case State#state.focus_pid of
-	undefined -> State;
-	Pid ->
-	    Node = State#state.node,
-	    HidePids = nl_add(Node, Pid, State#state.hide_pids),
-	    ShowPids = nl_del(Node, Pid, State#state.show_pids),
-	    refresh(State#state{hide_pids=HidePids, show_pids=ShowPids})
-    end;
-
-%% View->Module Info...
-%% Open window with module information.
-execute_cmd('Module', State, _Data, _Args) ->
-    case get_pid_in_focus(State#state.focus, State#state.grid) of
-	{true, {pidfunc, _Pid, {Module,_Name,_Arity}}} ->
-	    pman_module_info:start(Module);
-	_ -> % false | {true, {pidfunc, Pid, Other}}
-	    ignore
-    end,
-    State;
-
-%% View->Refresh
-%% Refresh the main window. 
-%% (Called automatically every ?REFRESH_TIME millisecond)
-execute_cmd('Refresh', State, _Data, _Args) ->
-    refresh(State);
-
-%% View->Show All Processes
-%% Makes all processes visible except system processes and new
-%% processes, if those buttons are checked.
-%% Note: Also un-hides all hidden modules!
-execute_cmd('Show All', State, _Data, _Args) ->
-    Node = State#state.node,
-    HideAll = nl_update(Node, false, State#state.hide_all),
-    HidePids = nl_del_all(State#state.node, State#state.hide_pids),
-    ShowPids = nl_del_all(State#state.node, State#state.show_pids),
-    State2 = State#state{hide_modules=ordsets:new(), hide_all=HideAll,
-			 hide_pids=HidePids, show_pids=ShowPids},
-    refresh(State2, true);
-
-%% View->Show Processes...
-%% Open a list of all hidden processes, if the user selects one this
-%% process should explicitly be shown
-execute_cmd('Show Selected', State, _Data, _Args) ->
-    Node = State#state.node,
-
-    All = pman_process:r_processes(Node),
-    Hidden = case nl_lookup(Node, State#state.hide_all) of
-		 true ->
-		     All;
-		 false ->
-		     Shown = nl_lookup(Node, State#state.shown_pids),
-		     ordsets:subtract(All, Shown)
-	     end,
-
-    %% Selection window
-    Title = "Select Processes to Show",
-    Tuples =
-	lists:map(fun(Pid) ->
-			  {M,F,A} = pman_process:function_info(Pid),
-			  Str = case pman_process:get_name(Pid) of
-				    " " ->
-					io_lib:format("~p:~p/~p",
-						      [M, F, A]);
-				    Name ->
-					io_lib:format("[~p] ~p:~p/~p",
-						      [Name, M, F, A])
-				end,
-			  {Pid, Str}
-		  end,
-		  Hidden),
-    case pman_tool:select(State#state.win, Title, Tuples) of
-	Pids when is_list(Pids) ->
-	    HidePids = nl_del(Node, Pids, State#state.hide_pids),
-	    ShowPids = nl_add(Node, Pids, State#state.show_pids),
-	    refresh(State#state{hide_pids=HidePids,show_pids=ShowPids});
-	cancelled -> State
-    end;
-
-%% Trace->Kill
-execute_cmd('Kill', State, _Data, _Args) ->
-    case State#state.focus_pid of
-	Pid when is_pid(Pid) ->
-	    exit(Pid, kill);
-	undefined ->
-	    ignore
-    end,
-    State;
-
-%% Trace->Selected Process
-execute_cmd('Trace Process', State, _Data, _Args) ->
-    case State#state.focus_pid of
-	Pid when is_pid(Pid) ->
-	    pman_shell:start({Pid,self()}, State#state.options);
-	undefined ->
-	    ignore
-    end,
-    State;
-
-%% Trace->Shell Process
-execute_cmd('Trace Shell', State, _Data, _Args) ->
-    case pman_shell:find_shell() of
-	noshell ->
-	    State;
-	Shell -> 
-	    pman_shell:start({{shell,Shell},self()},
-			     State#state.options),
-	    State#state{noshell=false}
-    end;
-
-%% Nodes->Show <Node>
-%% Change shown node
-execute_cmd({node,Node}, State, _Data, _Args) ->
-    gse:config(State#state.win,
-	       [{title,lists:concat(["Pman: Overview on ", Node])}]),
-    gse:disable(Node),
-    catch gse:enable(State#state.node), % Menu may not exist any more
-    refresh(State#state{node=Node}, true);
-
-%% Help->Help
-execute_cmd('Help', State, _Data, _Args)  ->
-    Win = State#state.win,
-    HelpFile =
-	filename:join([code:lib_dir(pman),"doc","html","index.html"]),
-    tool_utils:open_help(Win, HelpFile),
-    State;
-
-%% Keyboard shortcut Ctrl-l
-execute_cmd('All Links', State, _Data, _Args) ->
-    case State#state.focus_pid of
-	Pid when is_pid(Pid) ->
-	    case process_info(Pid, links) of
-		{links, Pids} ->
-		    pman_shell:start_list(Pids, self(),
-					  State#state.options);
-		undefined ->
-		    ignore
-	    end;
-	undefined -> ignore
-    end,
-    State;
-
-%% Keyboard shortcuts for process grid traversal
-execute_cmd(focus_previous, State, _Data, _Args) ->
-    focus(previous_row(State), State);
-execute_cmd(focus_next, State, _Data, _Args) ->
-    focus(next_row(State), State);
-
-%% Keyboard combinations that are not shortcuts
-execute_cmd(dummy, State, _Data, _Args) ->
-    State.
-
-%% Convenience functions for disabling/enabling menu items that require
-%% that a process is selected.
-disable_pid_actions() ->
-    lists:foreach(fun(X) -> gse:disable(X) end, ?REQUIRES_FOCUS).
-
-enable_pid_actions()  ->
-    lists:foreach(fun(X) -> gse:enable(X) end, ?REQUIRES_FOCUS).
-
-%% refresh(State) -> State'
-%% refresh(State, ForceP) -> State'
-%% Refreshes the main window.
-refresh(State) ->
-    refresh(State, false).
-refresh(#state{node=Node} = State, ForceP) ->
-
-    %% Update shown processes
-
-    %% First, get an ordset of all processes running at the current node
-    All = pman_process:r_processes(Node),
-
-    Shown = nl_lookup(Node, State#state.shown_pids),
-    ExpShown = nl_lookup(Node, State#state.show_pids),
-
-    {Show, State2} =
-	case nl_lookup(Node, State#state.hide_all) of
-
-	    %% If the user has selected "Hide All Processes", only
-	    %% explicitly selected processes which still exist should
-	    %% be shown
-	    true ->
-		{ordsets:intersection(ExpShown, All), State};
-
-	    false ->
-		%% Compute which processes should be hidden according
-		%% to the flags/menu items selected
-		Hidden = hidden_pids(All, State),
-
-		NotHidden = ordsets:subtract(All, Hidden),
-
-		Show0 = case State#state.hide_new of
-			    %% If the user has selected "Auto-Hide New",
-			    %% then only those processes in NotHidden
-			    %% which are already shown, should be shown,
-			    %% together with explicitly selected
-			    %% processes which still exist
-			    true ->
-				ordsets:union(
-				  ordsets:intersection(NotHidden,Shown),
-				  ordsets:intersection(ExpShown, All));
-
-			    %% Otherwise, show all processes in
-			    %% NotHidden, together with explicitly
-			    %% selected processes which still exist
-			    false ->
-				ordsets:union(
-				  NotHidden,
-				  ordsets:intersection(ExpShown, All))
-			end,
-
-		ShownPids = nl_update(Node, Show0,
-				      State#state.shown_pids),
-		{Show0, State#state{shown_pids=ShownPids}}
-	end,
-
-    NoOfHidden = length(All) - length(Show),
-
-    if
-	Show==Shown, not ForceP ->
-	    pman_win:update(NoOfHidden),
-	    State;
-
-	true ->
-	    ShowInfo = display_info(Show),
-	    pman_win:update(State#state.grid, ShowInfo, NoOfHidden),
-	    
-	    %% Set the focus appropriately
-	    State3 = case State2#state.focus_pid of
-			 undefined ->
-			     disable_pid_actions(),
-			     State2;
-			 Pid ->
-			     Row = get_row(Pid, Show),
-			     focus(Row, State2)
-		     end,
-
-	    trace_shell_possible(State3),
-
-	    Size = length(Show),
-	    case Size of
-		1 -> gse:disable('Hide All');
-		_ -> gse:enable('Hide All')
-	    end,
-
-	    State3#state{size=Size}
-    end.
-
-%% hidden_pids(All, State) -> Hidden
-hidden_pids(All, State) ->
-
-    %% Processes hidden because they are system processes
-    HideSys = case State#state.hide_system of
-		  true ->
-		      lists:filter(
-			fun(Pid) ->
-				pman_process:is_system_process(Pid)
-			end,
-			All);
-		  false ->
-		      []
-	      end,
-	    
-    %% Process hidden because they are executing code in a hidden module
-    Mods = State#state.hide_modules,
-    HideMod =
-	lists:filter(fun(Pid) ->
-			     pman_process:is_hidden_by_module(Pid, Mods)
-		     end,
-		     All),
-
-    %% Explicitly hidden processes
-    HideExp = nl_lookup(State#state.node, State#state.hide_pids),
-
-    %% All hidden processes
-    ordsets:union([HideSys, HideMod, HideExp]).
-
-display_info(Pids) ->
-    lists:map(fun(Pid) ->
-		      Func = pman_process:function_info(Pid),
-		      Name = pman_process:get_name(Pid),
-		      Msgs = pman_process:msg(Pid),
-		      Reds = pman_process:reds(Pid),
-		      Size = pman_process:psize(Pid),
-		      {Pid, Func, Name, Msgs, Reds, Size}
-	      end,
-	      Pids).
-
-get_row(Pid, List) ->
-    get_row(Pid, List, length(List)+1).
-
-get_row(Pid, [Pid | _], Row) ->
-    Row;
-get_row(Pid, [_ | T], Row) ->
-    get_row(Pid, T, Row-1);
-get_row(_Pid, [], _Row) ->
-    1.
-
-next_row(#state{size=Size, focus=Row}) ->
-    check_row(Row+1, Size).
-
-previous_row(#state{size=Size, focus=Row}) ->
-    check_row(Row-1, Size).
-
-check_row(1, Size) ->
-    Size+1;
-check_row(Row, Size) when Row==Size+2 ->
-    2;
-check_row(Row, _Size) ->
-    Row.
-
-%% Check if node is running in noshell mode and if so disable the
-%% 'Trace Shell' menu option.
-trace_shell_possible(#state{noshell=true}) ->
-    gse:disable('Trace Shell');
-trace_shell_possible(_) ->
-    ok.
-
-%% -- Functions for manipulating {Node, Data} lists --
-
-%% nl_add(Node, Elem|Elems, NList) -> NList'
-nl_add(Node, Elems, [{Node, Ordset} | T]) when is_list(Elems) ->
-    [{Node, ordsets:union(Elems, Ordset)} | T];
-nl_add(Node, Elem, [{Node, Ordset} | T]) ->
-    [{Node, ordsets:add_element(Elem, Ordset)} | T];
-nl_add(Node, Elem, [H | T]) ->
-    [H | nl_add(Node, Elem, T)];
-nl_add(Node, Elems, []) when is_list(Elems) ->
-    [{Node, Elems}];
-nl_add(Node, Elem, []) ->
-    [{Node, ordsets:add_element(Elem, ordsets:new())}].
-
-%% nl_del(Node, Elem|Elems, NList) -> NList'
-nl_del(Node, Elems, [{Node, Ordset} | T]) when is_list(Elems) ->
-    [{Node, ordsets:subtract(Ordset, Elems)} | T];
-nl_del(Node, Elem, [{Node, Ordset} | T]) ->
-    [{Node, ordsets:del_element(Elem, Ordset)} | T];
-nl_del(Node, Elem, [H | T]) ->
-    [H | nl_del(Node, Elem, T)];
-nl_del(_Node, _Elem, []) ->
-    [].
-
-%% nl_del_all(Node, NList) -> NList'
-nl_del_all(Node, [{Node, _Ordset} | T]) ->
-    [{Node, ordsets:new()} | T];
-nl_del_all(Node, [H | T]) ->
-    [H | nl_del_all(Node, T)];
-nl_del_all(_Node, []) ->
-    [].
-
-%% nl_update(Node, Val, NList) -> NList'
-nl_update(Node, Val, [{Node, _OldVal} | T]) ->
-    [{Node, Val} | T];
-nl_update(Node, Val, [H | T]) ->
-    [H | nl_update(Node, Val, T)];
-nl_update(Node, Val, []) ->
-    [{Node, Val}].
-
-%% nl_lookup(Node, NList) -> Val
-nl_lookup(Node, NList) ->
-    {value, {_Node,Val}} = lists:keysearch(Node, 1, NList),
-    Val.
-
-%% nl_exists(Node, NList) -> bool()
-nl_exists(Node, NList) ->
-    case lists:keysearch(Node, 1, NList) of
-	{value, _Val} ->
-	    true;
-	false ->
-	    false
-    end.
diff --git a/lib/pman/src/pman_module_info.erl b/lib/pman/src/pman_module_info.erl
deleted file mode 100644
index 944fd4a462..0000000000
--- a/lib/pman/src/pman_module_info.erl
+++ /dev/null
@@ -1,133 +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%
-%%
--module(pman_module_info).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,start,1}}]).
-
-%% Window with module information (View->Module Info...)
-
-%% External exports
--export([start/1]).
-
-%% Record for keeping the loop state for the 
-%% module info process.
--record(state, {topwin,      % GS identifier for top window
-		editor,      % GS identifier for editor
-		module,      % Name of the viewed module
-		parent}).    % Pid of the parent
-
-start(Module) ->
-    Self = self(),
-    spawn_link(fun() -> init(Module, Self) end).
-
-init(Module, Parent) ->
-    process_flag(trap_exit, true),
-
-    GS = gs:start([{kernel,true}]),
-    Font = pman_win:font(GS),
-
-    WinTitle = lists:flatten(io_lib:format("Pman - Module Info: ~p",
-					   [Module])),
-    WinOptions = [{title,WinTitle}, {width,550}, {height, 400},
-		  {configure,true}, {keypress,true}, {destroy,true}],
-    TopWindow = gse:window(GS, WinOptions),
-
-    %% File menu
-    MenuBar = gse:menubar(TopWindow, []),
-    MBFile = gse:menubutton(MenuBar, [{label,{text," File "}},
-				      {font,Font}, {underline, 1}]),
-    MenuFile = gse:menu(MBFile, []),
-
-    gse:named_menuitem('Save buffer', MenuFile,
-		       [{label,{text,"Save buffer..."}},
-			{font,Font}, {underline,0}]),
-    gse:named_menuitem('Close', MenuFile,
-		       [{label,{text,"Close"}},
-			{font,Font}, {underline,0}]),
-
-    %% Output part of window
-    Editor = gse:editor(TopWindow,
-			[{font,Font},
-			 {x,3}, {y,40}, {width,546}, {height,348}]),
-    gse:config(Editor, [{keypress,true},
-			{insert,{'end',pman_win:module_data(Module)}}]),
-    gse:config(Editor, [{enable,false},
-			{vscroll,right}, {hscroll,bottom},
-			{wrap,none}]),
-    gse:map(TopWindow),
-
-    State = #state{topwin=TopWindow, editor=Editor, module=Module,
-		   parent=Parent},
-    loop(State).
-
-loop(State) ->
-
-    receive
-	%% Die if the parent dies
-	{'EXIT', Pid, _Reason} when Pid==State#state.parent ->
-	    gse:destroy(State#state.topwin);
-
-	%% Ignore other exit signals (from file dialog window)
-	{'EXIT', _Pid, _Reason} ->
-	    loop(State);
-
-	%% Window closed
-	{gs, _TopWindow, destroy, [], []} ->
-	    ok;
-
-	%% Window resized or moved
-        {gs, _TopWindow, configure ,_Data, [W,H,_X,_Y|_]} ->
-	    gs:config(State#state.editor, [{width,W-3}, {height,H-40}]),
-	    loop(State);
-
-	%% Close - destroy window and exit process
-	{gs, 'Close', click, _Data, _Args} ->
-	    gse:destroy(State#state.topwin),
-	    ok;
-
-	%% Save Buffer - make filename and save buffer to file
-	{gs, 'Save buffer', click, _Data, _Args} ->
-	    save_buffer(State),
-	    loop(State);
-
-	%% Keyboard accelerator commands
-	{gs, _, keypress, [], [c,_,0,1]} -> % 'Close'
-	    gse:destroy(State#state.topwin),
-	    ok;
-	{gs, _, keypress, [], [s,_,0,1]} -> % 'Save buffer'
-	    save_buffer(State),
-	    loop(State);
-	{gs, _, keypress, _Data, _Args} ->
-	    loop(State)
-    end.
-
-save_buffer(State) ->
-    DefaultFile = atom_to_list(State#state.module) ++ ".module_info",
-    Result = tool_utils:file_dialog([{type,save}, {file,DefaultFile}]),
-    case Result of
-	%% User selected a file, now save the result
-	{ok, File, _Dir} ->	    
-	    gs:config(State#state.editor, {save,File}),
-	    Msg = "Module information saved in file\n" ++ File,
-	    tool_utils:notify(State#state.topwin, Msg);
-
-	%% File dialog was cancelled in some way.
-	{error, _Reason} ->
-	    ignore
-    end.
diff --git a/lib/pman/src/pman_options.erl b/lib/pman/src/pman_options.erl
deleted file mode 100644
index 0765458fdc..0000000000
--- a/lib/pman/src/pman_options.erl
+++ /dev/null
@@ -1,395 +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(pman_options).
-
-%% Window with trace options settings (File->Options...)
-
--export([dialog/3,
-	 read_from_file/1, save_to_file/2]).
-
--include("pman_options.hrl").
-
--define(WIN_WIDTH,  350).
--define(WIN_HEIGHT, 350).
-
--define(TOP_WINDOW, xx_pman_option_window_xx).
--define(TOP_FRAME,  xx_pman_top_frame_xx).
-
--record(state, {resize_frame,   % GS identifier for the main frame
-		parent}).       % Pid of parent
-
-%%--dialog/3------------------------------------------------------------
-%% Create a window, or return a value indicating that is is already
-%% created.
-
-dialog(ParentWin, Title, Options) ->
-    Self = self(),
-    Pid = spawn(fun() -> dialog(Self, ParentWin, Title, Options) end),
-    receive
-	{Pid, Value} ->
-	    Value % Options2 | {error,destroyed} | {error,cancelled}
-    end.
-
-dialog(Parent, ParentWin, Title, Options) ->
-
-    %% Check if the dialog has already been created, in that 
-    %% case, we can reuse it. Otherwise a new dialog is created.
-    case gse:name_occupied(?TOP_WINDOW) of
-	false -> make_window(ParentWin, Title);
-	true -> ok
-    end,
-
-    %% Window has now been created or may be re-used
-    update_window_from_options(Options),
-
-    gse:resize(?TOP_FRAME, ?WIN_WIDTH, ?WIN_HEIGHT),
-    gse:map(?TOP_WINDOW),
-
-    loop(#state{resize_frame=?TOP_FRAME, parent=Parent}).
-
-loop(State) ->
-    receive
-	{gs, _Id, destroy, _Data, _Arg} -> 
-	    State#state.parent ! {self(), {error,destroyed}};
-
-	{gs, ?TOP_WINDOW, configure, _Data, [W, H |_]} ->
-	    gse:config(State#state.resize_frame,
-		       [{width,W},{height,H}]), % repack
-	    loop(State);
-
-	{gs, ok_button, click, _Data, _Arg} ->
-	    Options = get_options_from_window(),
-	    gse:unmap(?TOP_WINDOW),
-	    State#state.parent ! {self(), Options};
-
-	{gs, cancel_button, click, _Data, _Arg} ->
-	    gse:unmap(?TOP_WINDOW),
-	    State#state.parent ! {self(), {error,cancelled}};
-
-	{gs, trace_spawn, click, _Data, [_Text,_,Value]} ->
-	    group_radio(Value, trace_spawn_all, [trace_spawn_all,
-						 trace_spawn_first]),
-	    loop(State);
-
-	{gs, trace_link, click, _Data, [_Text,_,Value]} ->
-	    group_radio(Value, trace_link_all, [trace_link_all,
-						trace_link_first]),
-	    loop(State);
-
-	{gs, trace_in_window, click, _Data, _Arg} ->
-	    lists:foreach(fun(X) -> gse:disable(X) end,
-			  [trace_file, trace_file_browse]),
-	    loop(State);
-
-	{gs, trace_to_file, click, _Data, [_Text,_,_Value]} ->
-	    lists:foreach(fun(X) -> gse:enable(X) end,
-			  [trace_file, trace_file_browse]),
-	    loop(State);
-
-	{gs, trace_file_browse, click, _Data, _Arg} ->
-	    Result = tool_utils:file_dialog([{type,save},
-					     {file, "Untitled.log"}]),
-	    case Result of
-		{error, _Reason} ->
-		    loop(State);
-		{ok, Name,_State} ->
-		    gse:config(trace_file, [{text, Name}]),
-		    loop(State)
-	    end
-    end.
-
--define(LBLOPTS, [{justify,left}, {align,w}]).
--define(BTNOPTS, [{justify,left}, {align,w}]).
-
-make_window(ParentWin, Title) ->
-
-    Font = pman_win:font(),
-
-    gse:named_window(?TOP_WINDOW, ParentWin, [{title,Title},
-					      {configure,true},
-					      {width, ?WIN_WIDTH},
-					      {height, ?WIN_HEIGHT}]),
-
-    gse:named_frame(?TOP_FRAME, ?TOP_WINDOW,
-		    [{bw,3},
-		     {packer_x,[{stretch,1,175}, {stretch,1,175}]},
-		     {packer_y,[{stretch,3},{stretch,2},{stretch,1}]}]),
-
-    F11 = gse:frame(?TOP_FRAME, [{bw,3},
-				 {pack_xy,{1,1}},
-				 {packer_x,[{stretch,1},
-					    {stretch,20},
-					    {stretch,2}]},
-				 {packer_y,[{stretch,2},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1}]}]),
-
-    gse:label(F11,[{pack_xy,{2,1}},
-		   {label,{text,"Trace output options:"}},
-		   {font,Font} | ?LBLOPTS]),
-
-    gse:named_checkbutton(trace_send, F11,
-			  [{pack_xy,{2,2}},
-			   {label,{text,"Trace send"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_checkbutton(trace_receive, F11,
-			  [{pack_xy,{2,3}},
-			   {label,{text, "Trace receive"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_checkbutton(trace_functions,F11,
-			  [{pack_xy,{2,4}},
-			   {label,{text, "Trace functions"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_checkbutton(trace_events,F11,
-			  [{pack_xy,{2,5}},
-			   {label,{text, "Trace events"}},
-			   {font,Font} | ?BTNOPTS]),
-
-    F21 = gse:frame(?TOP_FRAME, [{bw,3},
-				 {pack_xy,{2,1}},
-				 {packer_x,[{stretch,1},
-					    {stretch,2},
-					    {stretch,2},
-					    {stretch,20},
-					    {stretch,1}]},
-				 {packer_y,[{stretch,2},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1}]}]),
-
-    gse:label(F21, [{pack_xy,{{2,4},1}},
-		    {label,{text,"Inheritance options:"}},
-		    {font,Font} | ?LBLOPTS]),
-
-    gse:named_checkbutton(trace_spawn, F21,
-			  [{pack_xy,{{2,4},2}},
-			   {data,trace_send},
-			   {label,{text,"Inherit on spawn"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_radiobutton(trace_spawn_all, F21,
-			  [{pack_xy,{{3,4},3}},
-			   {group,spawn},
-			   {data,trace_receive},
-			   {label,{text, "All spawns"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_radiobutton(trace_spawn_first, F21,
-			  [{pack_xy,{{3,4},4}},
-			   {group,spawn},
-			   {data,trace_receive},
-			   {label,{text,"First spawn only"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_checkbutton(trace_link, F21,
-			  [{pack_xy,{{2,4},6}},
-			   {data,trace_send},
-			   {label,{text,"Inherit on link"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_radiobutton(trace_link_all, F21,
-			  [{pack_xy,{{3,4},7}},
-			   {group,link},
-			   {data,trace_receive},
-			   {label,{text,"All links"}},
-			   {font,Font} | ?BTNOPTS]),
-
-    gse:named_radiobutton(trace_link_first, F21,
-			  [{pack_xy,{{3,4},8}},
-			   {group,link},
-			   {data,trace_receive},
-			   {label,{text,"First link only"}},
-			   {font,Font} | ?BTNOPTS]),
-
-    F12 = gse:frame(?TOP_FRAME, [{bw,3},
-				 {pack_xy,{{1,2},2}},
-				 {packer_x,[{stretch,1},
-					    {stretch,5},  % Label
-					    {stretch,1},
-					    {stretch,10}, % Field
-					    {stretch,1},
-					    {stretch,5},  % Button
-					    {stretch,1}]},
-				 {packer_y,[{stretch,2},
-					    {stretch,1},
-					    {stretch,1},
-					    {stretch,1}]}]),
-    
-    gse:label(F12, [{pack_xy,{{2,6},1}},
-		    {label,{text,"Trace output options:"}},
-		    {font,Font} | ?LBLOPTS]),
-    gse:named_radiobutton(trace_in_window, F12,
-			  [{pack_xy,{{2,6},2}},
-			   {group, trace_dest},
-			   {label,{text,"In window"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_radiobutton(trace_to_file, F12,
-			  [{pack_xy,{2,3}},
-			   {group, trace_dest},
-			   {label,{text,"To file"}},
-			   {font,Font} | ?BTNOPTS]),
-    gse:named_entry(trace_file, F12, [{pack_xy,{4,3}}, {font,Font}]),
-    gse:named_button(trace_file_browse, F12,
-		     [{pack_xy,{6,3}},
-		      {label,{text," Browse..."}},
-		      {font,Font} | ?BTNOPTS]),
-
-    F13 = gse:frame(?TOP_FRAME, [{bw,3},
-				 {pack_xy,{{1,2},3}},
-				 {packer_x,[{stretch, 1},
-					    {fixed, 60},
-					    {stretch, 1},
-					    {fixed, 60},
-					    {stretch, 1}]},
-				 {packer_y,[{stretch,1},
-					    {fixed, 30},
-					    {stretch,1}]}]),
-    
-    gse:named_button(ok_button, F13, [{pack_xy,{2,2}},
-				      {label,{text,"OK"}},
-				      {font,Font}]),
-    gse:named_button(cancel_button, F13, [{pack_xy,{4,2}},
-					  {label,{text,"Cancel"}},
-					  {font,Font}]).
-
-update_window_from_options(Options) ->
-
-    %% Trace output
-    gse:config(trace_send, [{select,Options#trace_options.send}]),
-    gse:config(trace_receive,
-	       [{select,Options#trace_options.treceive}]),
-    gse:config(trace_functions,
-	       [{select,Options#trace_options.functions}]),
-    gse:config(trace_events, [{select,Options#trace_options.events}]),
-
-    %% Trace inheritance
-    case (Options#trace_options.inherit_on_all_spawn or
-	  Options#trace_options.inherit_on_1st_spawn) of
-	true ->
-	    gse:select(trace_spawn),
-	    gse:config(trace_spawn_all,
-		       [{select,Options#trace_options.inherit_on_all_spawn}]),
-	    gse:config(trace_spawn_first,
-		       [{select,Options#trace_options.inherit_on_1st_spawn}]);
-	false ->
-	    lists:foreach(fun(X) -> gse:disable(X) end,
-			  [trace_spawn_all,trace_spawn_first])
-    end,
-
-    case (Options#trace_options.inherit_on_all_link or
-	  Options#trace_options.inherit_on_1st_link) of
-	true -> gse:select(trace_link),
-		gse:config(trace_link_all,
-			   [{select,Options#trace_options.inherit_on_all_link}]),
-		gse:config(trace_link_first,
-			   [{select, Options#trace_options.inherit_on_1st_link}]);
-	false ->
-	    lists:foreach(fun(X) -> gse:disable(X) end,
-			  [trace_link_all,trace_link_first])
-    end,
-
-    %% Trace ouput destinations
-    gse:config(trace_in_window,
-	       [{select,(not Options#trace_options.to_file)}]),
-
-    gse:config(trace_to_file, [{select,Options#trace_options.to_file}]),
-    gse:config(trace_file, [{text,Options#trace_options.file}]),
-    case Options#trace_options.to_file of
-	true ->
-	    ok;
-	false ->
-	    lists:foreach(fun(X) -> gse:disable(X) end,
-			  [trace_file, trace_file_browse])
-    end.
-
-get_options_from_window() ->
-    #trace_options{send = gse:read(trace_send,select),
-		   treceive = gse:read(trace_receive,select),
-		   functions = gse:read(trace_functions,select),
-		   events = gse:read(trace_events,select),
-		   inherit_on_1st_spawn = gse:read(trace_spawn_first,select),
-		   inherit_on_all_spawn = gse:read(trace_spawn_all,select),
-		   inherit_on_1st_link = gse:read(trace_link_first,select),
-		   inherit_on_all_link = gse:read(trace_link_all,select),
-		   to_file = gse:read(trace_to_file,select),
-		   file = gse:read(trace_file,text)}.
-
-group_radio(Value, Default, GroupList) ->
-    case Value of
-	true ->
-	    gse:select(Default),
-	    lists:foreach(fun(X) -> gse:enable(X) end, GroupList);
-	false ->
-	    lists:foreach(fun(X) -> gse:deselect(X) end, GroupList),
-	    lists:foreach(fun(X) -> gse:disable(X) end, GroupList)
-    end.
-
-%%--read_from_file/(File)-----------------------------------------------
-%% Returns the options saved in File.
-%% If no options can be found, then the default options are
-%% returned.
-
-read_from_file(File) ->
-    case file:consult(File) of
-	{ok, [Term]} ->
-	    if
-		is_record(Term, trace_options) ->
-		    {ok, Term};
-		true ->
-		    {error, "unexpected contents", #trace_options{}}
-	    end;
-	{ok, _Terms} ->
-	    {error, "unexpected contents", #trace_options{}};
-	{error, Tuple} when is_tuple(Tuple) -> % {Line,Mod,Term}
-	    {error, "erroneous contents", #trace_options{}};
-	{error, _Posix} ->
-	    %% The most probable reason is that the file does not
-	    %% exist, this is not an error so we simply return
-	    %% the default trace options instead
-	    {ok, #trace_options{}}
-    end.
-
-%%--save_to_file(Options, File)-----------------------------------------
-
-save_to_file(Options, File) ->
-    case file:open(File, [write]) of
-	{ok, Fd} ->
-	    {{Year,Month,Day},{H,M,S}} = calendar:local_time(),
-	    io:format(Fd, "%%%~n", []),
-	    io:format(Fd, "%%% File: ~s~n", [File]),
-	    io:format(Fd, "%%% Date: ~w-~2..0w-~2..0w, ~2..0w:~2..0w:~2..0w~n",
-		      [Year,Month,Day,H,M,S]),
-	    io:format(Fd, "%%%~n", []),
-	    io:format(Fd, "%%% This file was created by Pman. ~n", []),
-	    io:format(Fd, "%%%~n", []),
-	    io:format(Fd, "%%% DO NOT EDIT! ~n", []),
-	    io:format(Fd, "%%%~n", []),
-	    io:format(Fd, "%%%~n", []),
-	    io:format(Fd, "~p.~n", [Options]),
-	    file:close(Fd),
-	    ok;
-	{error, Posix} ->
-	    {error, file:format_error(Posix)}
-    end.
diff --git a/lib/pman/src/pman_process.erl b/lib/pman/src/pman_process.erl
deleted file mode 100644
index 276407a0f1..0000000000
--- a/lib/pman/src/pman_process.erl
+++ /dev/null
@@ -1,317 +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 : A front-end to the erlang:process_info() functions, that
-%%           can handle processes on different nodes in a transparent
-%%           way. 
-%%	     Also some convenience functions for process info, as well
-%%	     as some application specific functions for process 
-%%           classification.
-%%----------------------------------------------------------------------
-
--module(pman_process).
-
--export([pinfo/1, pinfo/2,
-	 r_processes/1,
-	 function_info/1,
-	 get_name/1, msg/1, reds/1, psize/1,
-	 is_running/1,
-	 is_pid_or_shell/1,
-	 get_pid/1,
-	 is_system_process/1,
-	 is_hidden_by_module/2
-	]).
-
-%% List of registered name that will make a prodcess a "SYSTEM"-process 
--define(SYSTEM_REG_NAMES,
-	[
-	 %% kernel
-	 application_controller,
-	 erl_reply,
-	 auth,
-	 boot_server,
-	 code_server,
-	 disk_log_server,
-	 disk_log_sup,
-	 erl_prim_loader,
-	 error_logger,
-	 file_server_2,
-	 fixtable_server,
-	 global_group,
-	 global_name_server,
-	 heart,
-	 inet_gethost_native,
-	 inet_gethost_native_sup,
-	 init,
-	 kernel_config,
-	 kernel_safe_sup,
-	 kernel_sup,
-	 net_kernel,
-	 net_sup,
-	 rex,
-	 user,
-	 os_server,
-	 ddll_server,
-	 erl_epmd,
-	 inet_db,
-	 pg2,
-
-	 %% stdlib
-	 timer_server,
-	 rsh_starter,
-	 take_over_monitor,
-	 pool_master,
-	 dets,
-
-	 %% sasl
-	 sasl_safe_sup, sasl_sup, alarm_handler, overload,
-	 release_handler,
-
-	 %% gs
-	 gs_frontend
-	]).
-	 
-%% List of module:function/arity calls that will make the caller a 
-%% "SYSTEM"-process.
-%% 
--define(SYSTEM_INIT_CALLS,
-	[{application_master,init,4},
-	 {application_master,start_it,4},
-	 {inet_tcp_dist,accept_loop,2},
-	 {net_kernel,ticker,2},
-	 {supervisor_bridge,user_sup,1},
-	 {user_drv,server,2},
-	 {group,server,3},
-	 {kernel_config,init,1},
-	 {inet_tcp_dist,do_accept,6},
-	 {inet_tcp_dist,do_setup,6},
-	 {pman_main,init,2},
-	 {pman_buf_printer,init,2},
-	 {pman_buf_converter,init,2},
-	 {pman_buf_buffer,init,1},
-	 {gstk,init,1},
-	 {gstk_port_handler,init,2},
-	 {gstk,worker_init,1}
-	]).
-
-%% List of module:function/arity calls that will make the executing
-%% process a "SYSTEM"-process.
--define(SYSTEM_RUNNING_CALLS,
-	[{file_io_server,server_loop,1},
-	 {global,loop_the_locker,1},
-	 {global,collect_deletions,2},
-	 {global,loop_the_registrar,0},
-	 {gs_frontend,request,2},
-	 {shell,get_command1,5},
-	 {shell,eval_loop,3},
-	 {io,wait_io_mon_reply,2},
-	 {pman_module_info,loop,1},
-	 {pman_options,dialog,3},
-	 {pman_options,loop,1},
-	 {pman_relay_server,loop,1},
-	 {pman_shell,monitor_loop,1},
-	 {pman_shell,safe_loop,2}
-	]).
-
-%% pinfo(Pid) -> [{Item, Info}] | undefined
-%% pinfo(Pid, Item) -> Info | undefined
-%% A version of process_info/1 that handles pid on remote nodes as well.
-pinfo({_, Pid}) -> % Handle internal process format
-    pinfo(Pid);
-pinfo(Pid) when node(Pid)==node() ->
-    process_info(Pid);
-pinfo(Pid) ->
-    case rpc:call(node(Pid), erlang, process_info, [Pid]) of
-	{badrpc, _} -> undefined;
-	Res -> Res
-    end.
-
-pinfo({_, Pid}, Item) -> % Handle internal process format
-    pinfo(Pid, Item);
-pinfo(Pid, Item) when node(Pid)==node() ->
-    case process_info(Pid, Item) of
-	{Item, Info} -> Info;
-	"" -> ""; % Item == registered_name
-	undefined -> undefined
-    end;
-pinfo(Pid, Item) ->
-    case rpc:call(node(Pid), erlang, process_info, [Pid, Item]) of
-	{badrpc, _} -> undefined;
-	{Item, Info} -> Info;
-	"" -> ""; % Item == registered_name
-	undefined -> undefined
-    end.
-
-%% function_info(Pid) -> {M, F, A}
-%% Returns the initial function for the specified process. 
-function_info(Pid) ->
-    case pinfo(Pid, current_function) of
-	{Module, Function, Arity} ->
-	    {Module, Function, Arity};
-	undefined ->
-	    {unknown, unknown, 0}
-    end.
-
-%% r_processes(Node) -> Pids
-%% Return a list of all processes at Node.
-%%
-%% If there is a problem with getting information from a remote 
-%% node, an empty list is returned.
-r_processes(Node) ->
-    ordsets:from_list(r_processes1(Node)).
-
-r_processes1(Node) ->
-    if
-	Node==node() ->
-	    processes();
-	true ->
-	    case rpc:block_call(Node, erlang, processes, []) of
-		{badrpc, _} ->
-		    [];
-		Pids -> Pids
-	    end
-    end.
-
-%% is_running(Object) -> {true, {shell,Pid}} | {true, Pid} | false
-%%   Object = {shell, Pid} | {link, Pid, ?} | Pid
-is_running({shell,Pid}) -> 
-    case is_running(Pid) of
-	{true,Pid} ->
-	    {true,{shell,Pid}};
-	false ->
-	    false
-    end;
-is_running({link,Pid,_}) -> 
-    is_running(Pid);
-is_running(Pid) ->
-    case is_pid_or_shell(Pid) of
-	true ->
-	    case pinfo(Pid) of
-		undefined -> false;
-		_PInfo -> {true, Pid}
-	    end;
-	false ->
-	    false
-    end.
-
-%% is_pid_or_shell(Object) -> bool()
-%% Checks if the argument is an pid or a tuple {shell, Pid}.
-is_pid_or_shell({shell,Pid}) when is_pid(Pid) ->
-    true;
-is_pid_or_shell(Pid) when is_pid(Pid) ->
-    true;
-is_pid_or_shell(_) ->
-    false.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% get_pid/1 - returns the Pid of the object provided that 
-%%   it is a proper process specifier.
-%%
-%% Arguments:
-%%   Object	A process specifier
-%%
-%% Returns:
-%%   The Pid.
-
-get_pid({shell,Pid}) ->
-    Pid;
-get_pid(Pid) when is_pid(Pid) ->
-    Pid.
-
-%% is_system_process(Pid) -> bool()
-%% Returns true if Pid is a "system process".
-%% This is a prototype version, use file configuration later.
-is_system_process(Pid) ->
-    catch is_system_process2(Pid).
-
-is_system_process2(Pid) ->
-    
-    %% Test if the registered name is a system registered name
-    case pinfo(Pid, registered_name) of
-	undefined -> ignore;
-	"" -> ignore;
-	Name ->
-	    case lists:member(Name, ?SYSTEM_REG_NAMES) of
-		true -> throw(true);
-		false -> ignore
-	    end
-    end,
-    
-    %% Test if the start specification is a "system start function"
-    MFAi = case pinfo(Pid, initial_call) of
-	       {proc_lib, init_p, 5} ->
-		   proc_lib:translate_initial_call(Pid); % {M,F,A} | Fun
-	       Res -> Res % {M,F,A} | undefined
-	   end,
-    case lists:member(MFAi, ?SYSTEM_INIT_CALLS) of
-	true -> throw(true);
-	false -> ignore
-    end,
-
-    %% Test if the running specification is a "system running function"
-    case pinfo(Pid, current_function) of
-	undefined -> false;
-	MFAc ->
-	    lists:member(MFAc, ?SYSTEM_RUNNING_CALLS)
-    end.
-
-%% is_hidden_by_module(Pid, Modules) -> bool()
-%% Checks if Pid is to be hidden because it executes code from one
-%% of Modules
-is_hidden_by_module(Pid, Modules) ->
-    case pinfo(Pid, current_function) of
-	{Module, _Function, _Arity} ->
-	    lists:member(Module, Modules);
-	undefined -> false
-    end.
-
-%% get_name(Pid) -> Name | " "
-%% Returns the registered name of a process, if any, or " " otherwise.
-get_name(Pid) ->
-    case pinfo(Pid, registered_name) of
-	undefined -> " ";
-	"" -> " ";
-	Name -> Name
-    end.
-
-%% msg(Pid) -> int()
-msg(Pid) ->
-    case pinfo(Pid, messages) of
-	undefined -> 0;
-	Msgs -> length(Msgs)
-    end.
-
-%% reds(Pid) -> int()
-reds(Pid) ->
-    case pinfo(Pid, reductions) of
-	undefined -> 0;	    
-	Reds -> Reds
-    end.
-
-%% psize(Pid) -> int()
-%% Returns the total process size (stack + heap).
-psize(Pid) ->
-    Stack = pinfo(Pid, stack_size),
-    Heap = pinfo(Pid, heap_size),
-    case {Heap, Stack} of
-	{undefined, undefined} -> 0;
-	{undefined, Sz} -> Sz;
-	{Sz, undefined} -> Sz;
-	{Sz0, Sz1}  -> Sz0 + Sz1
-    end.
diff --git a/lib/pman/src/pman_relay.erl b/lib/pman/src/pman_relay.erl
deleted file mode 100644
index 289765492f..0000000000
--- a/lib/pman/src/pman_relay.erl
+++ /dev/null
@@ -1,127 +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 : Interface function to  relay calls (esp. trace calls) 
-%%           to processes on other  nodes. Some of the calls
-%%           are conditionally relayed.
-%%----------------------------------------------------------------------
-
--module(pman_relay).
-
-%%-compile(export_all).
--export([start/1,
-	 ok_to_trace/1,
-	 trac/3]).
-
-
--include("assert.hrl").
-
-%% --------------------------------------------------------------
-%%                  DISTRIBUTION
-%% --------------------------------------------------------------
-%% (???) Process dictionary alert!!!
-%%
-%% Since we are not allowed to do erlang:trace/3 on remote
-%% processe we create a help process at the remote node to
-%% do the job for us 
-%% ---------------------------------------------------------------
-
-start(P) when is_pid(P), node(P)/=node() ->
-    
-    %% Remote supervision, relaying necessary
-    
-    put(relay, spawn_link(node(P), pman_relay_server, init, [self()]));
-
-
-start(_) ->
-    
-    %% Local supervision, no relaying
-    
-    ignore.
-
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% ok_to_trace/1 - Tests wheter we can actually start tracing 
-%%    a process.
-%%
-%% Arguments:
-%%   Pid		Pid of the process to trace (on local or remote node)
-%%
-%% Returns
-%%   true		If it is OK to trace the process
-%%   false		If the process is already traced, or some other
-%%			condition prevents it from being traced.
-
-ok_to_trace(Pid) when node(Pid) == node()->
-
-    %% Local trace, no relaying
-
-    case catch erlang:trace(Pid, false, [send]) of
-	1 ->
-	    true;
-	_Otherwise ->
-	    false
-    end;
-ok_to_trace(Pid) ->
-
-    %% Remote trace, relaying necessary
-
-    PidRelay =  get(relay),
-    PidRelay ! {ok_to_trace, self(), Pid},
-    receive
-	{ok_to_trace, PidRelay} ->
-	    true;
-	{not_ok_to_trace, PidRelay} ->
-	    false;
-	_Otherwise ->
-	    ?ALWAYS_ASSERT("Unexpected message from relay process")
-    after
-	5000 ->
-	    false
-    end.
-
-
-    
-	     
-    
-
-%% ---------------------------------------------------------------
-%% Possibly send a request to do tracing to a remote node.
-%% ---------------------------------------------------------------
-
-trac(Pid, How, Flag) when node(Pid) == node() ->
-
-    %% Local trace, no relaying necessary
-
-
-    case catch erlang:trace(Pid, How, Flag) of
-	1 -> ok;
-	_ -> pman_win:format("** Illegal trace request ** \n", [])
-    end;
-	
-trac(Pid, How, Flag) ->
-
-
-
-    %% Remote trace, relaying necessary
-
-    get(relay) ! {self(), erlang, trace, [Pid, How, Flag]}.
-
diff --git a/lib/pman/src/pman_relay_server.erl b/lib/pman/src/pman_relay_server.erl
deleted file mode 100644
index 2fcbb663bc..0000000000
--- a/lib/pman/src/pman_relay_server.erl
+++ /dev/null
@@ -1,57 +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 : Relay server code.
-%%%----------------------------------------------------------------------
-
--module(pman_relay_server).
-
-%%-compile(export_all).
--export([init/1]).
-
-
-
-init(P) ->
-    process_flag(trap_exit, true),
-
-    loop(P).
-
-loop(P) ->
-    receive
-	{ok_to_trace, PidSender, PidToTrace} ->
-	    case catch erlang:trace(PidToTrace, false, [send]) of
-		1 ->
-		    PidSender ! {ok_to_trace, self()},
-		    loop(P);
-		_Otherwise ->
-		    PidSender ! {not_ok_to_trace, self()}
-	    end;
-
-	{P, M,F,A} ->
-	    case catch apply(M, F, A) of
-		1 -> ok;
-		_Other ->  P ! {print, "** Illegal trace request **\n", []}
-	    end,
-	    loop(P);
-	{'EXIT', P, _Reason} ->
-	    exit(normal);
-	Other ->             %% Here is the normal case for trace i/o
-	    P ! Other, 
-	    loop(P)
-    end.
diff --git a/lib/pman/src/pman_shell.erl b/lib/pman/src/pman_shell.erl
deleted file mode 100644
index 2d2b8ce000..0000000000
--- a/lib/pman/src/pman_shell.erl
+++ /dev/null
@@ -1,827 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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: Create a trace window with process 
-%%          information or a help window with information 
-%%          about pman.
-%%
-%% ---------------------------------------------------------------
-
--module(pman_shell).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,start,1}}]).
-
-%% ---------------------------------------------------------------
-%% The user interface exports 
-%% ---------------------------------------------------------------
-
--export([start_list/3,
-	 start/2,
-	 start/1,
-	 find_shell/0]).
-
-%% ---------------------------------------------------------------
-%% Includes
-%% ---------------------------------------------------------------
--include("assert.hrl").
--include("pman_options.hrl").
--include("pman_buf.hrl").
-
-
-%% ---------------------------------------------------------------
-%% Internal record declarations
-%% ---------------------------------------------------------------
--record(pman_shell,{win,
-		    editor,
-		    pid,
-		    buffer,
-		    father,
-		    shell_flag,			% boolean, true for shell
-		    trace_options,		% Keeps trace options
-		    db}).                       % DB for trace windows
-
-
-%%
-%% Constants
-%%
-
--define (PMAN_DB, pman_db).  % The pman db for trace windows
-
-
-
-%% ---------------------------------------------------------------
-%% start/1, start/2
-%%
-%% Starts a new trace shell process.
-%%
-%% start(Pid, DefaultOptions)
-%% Pid			The Pid of the process to trace
-%% DefaultOptions	The default trace options passed along from
-%%			the calling process.
-%%
-%%
-%% start(Pid)
-%% Pid                   The Pid of the process to trace
-%%
-%% start(Pid) starts without using any default options except for those
-%% hardwired into the application. (See pman_options.hrl).
-%%
-%%
-%% Return: Both functions return a process id
-%% ---------------------------------------------------------------
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start_list/3 - Starts a trace window for each of the processes
-%%    in the list
-
-start_list(LIPid, Father, Options) ->
-    StartFun = fun(Pid) ->
-		       start({Pid,Father}, Options)
-	       end,
-    lists:foreach(StartFun, LIPid).
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start/1  - Starts a trace window for the specified Pid.
-%%
-
-start(Pid) ->
-    start(Pid, #trace_options{}).
-
-%%
-%% start/2
-%%
-
-start(Pid,DefaultOptions) when is_pid(Pid) ->
-    start({Pid,self()}, DefaultOptions);
-
-start(Var,DefaultOptions) ->
-    Db = db_start(),
-    spawn_link(fun() -> internal(Var, DefaultOptions, Db) end).
-    
-%% ---------------------------------------------------------------
-%% Initialize the enviroment for tracing/viewing Object
-%%
-%% Object can either be {shell,Shell} or a Pid.
-%% The main loop is then called, which handles trace and event 
-%% requests. The window dies whenever Supervisor dies, while
-%% message windows die whenever their parent dies.
-%% ---------------------------------------------------------------
-
-internal({Object,Supervisor}, DefaultOptions, Db) ->
-
-    %% (???) This call will cause minor problems when the window has been
-    %% invoked with proc/1 from for instance the shell.  The shell
-    %% does not handle the exit-signals, so it will exit
-    %% when the window is exited.
-    
-
-    %% First check that no other process is tracing the process we want
-    %% to trace. There is no well defined way of doing this, so the 
-    %% code below is used instead. (???)
-
-    pman_relay:start(Object),				%(???) Uses proc. dict.
-
-    Pid = pman_process:get_pid(Object),
-
-    case pman_relay:ok_to_trace(Pid) of
-
-	%% Tracing cannot be performed on the specified process
-
-	false ->
-	    T = lists:flatten(io_lib:format("ERROR: Process ~p is already being~ntraced by some other process.~nOr there may be a problem communicating with it.",[Pid])),
-	    tool_utils:notify(gs:start(),T),
-	    exit(quit);
-
-	%% Tracing can be performed, go ahead!
-
-	true ->
-	    
-	    case db_insert_key (Db, Pid) of
-		true ->
-	    
-		    link(Supervisor),
-		    process_flag(trap_exit, true),
-
-		    case catch pman_win:window(Object) of
-			{'EXIT', badrpc} ->
-			    T = "ERROR: Could not access node",
-			    pman_win:dialog_window(gs:start(),T);
-			{'EXIT', dead} ->
-			    T = "ERROR: The process is dead",
-			    pman_win:dialog_window(gs:start(),T);
-			{'EXIT',_W} ->  
-			    T = "ERROR: Untracable process \n(unexpected EXIT reason)",
-			    pman_win:dialog_window(gs:start(),T);
-			{Win, Ed} ->
-			    init_monitor_loop(Win,
-					      Ed,
-					      Object,
-					      Supervisor,
-					      DefaultOptions,
-					      Db)
-		    end;
-		
-		false ->
-		    T = lists:flatten(io_lib:format("ERROR: Process ~p is already being~ntraced by some other process.",[Pid])),
-		    tool_utils:notify(gs:start(),T),
-		    exit(quit);
-
-		Error ->
-		    Error
-	    end
-	    
-	end.
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% init_monitor_loop/5 
-
-init_monitor_loop(Win,Ed,Object,Supervisor, DefaultOptions, Db) ->
-
-    process_flag(priority, max),
-    
-    %% Most default options come from the main window. Now we must set
-    %% the default file name to something that is shows what process
-    %% is being traced.
-
-    %% Find out an appropriate file name to write the trace output
-    %% to if the output should go to a file.
-
-    FileName = case pman_process:is_pid_or_shell(Object) of
-		   true ->
-		       default_file_name(pman_process:get_pid(Object));
-		   false ->
-		       "NoName"
-	       end,
-
-    Buff = pman_buf:start(Ed, FileName),      
-
-    case pman_process:is_running(Object) of
-
-	%% We are tracing a shell process.
-	{true,{shell,Pid}} ->
-	    safe_link(Pid),
-	    NewDefaultOptions =
-		DefaultOptions#trace_options{file=FileName},
-	    perform_option_changes(Pid, NewDefaultOptions, Buff),
-	    monitor_loop(#pman_shell{win=Win, editor=Ed, pid=Pid, buffer=Buff,
-				     father = Supervisor,
-				     shell_flag = true,
-				     trace_options = NewDefaultOptions,
-				     db = Db});
-
-	%% We are tracing an ordinary process.
-	{true,Pid} ->
- 	    safe_link(Pid),
-	    NewDefaultOptions =
-		DefaultOptions#trace_options{file=FileName},
-	    perform_option_changes(Pid, NewDefaultOptions, Buff),
-	    monitor_loop(#pman_shell{win=Win, editor=Ed, pid=Pid, buffer=Buff,
-				     father = Supervisor,
-				     shell_flag = false,
-				     trace_options = NewDefaultOptions,
-				     db = Db});
-
-	%% The process being traced is dead.
-	false ->
-	    monitor_loop(#pman_shell{win=Win, editor=Ed, pid=nopid,
-				     buffer=Buff,
-				     father = Supervisor,
-				     shell_flag = false,
-				     trace_options= DefaultOptions,
-				     db = Db})
-    end.
-
-%% ----------------------------------------------------------------
-%% What is the Pid of the shell on our node?
-%%  ----------------------------------------------------------------
-
-find_shell() ->
-    case shell:whereis_evaluator() of
-	undefined ->				% noshell
-	    noshell;
-	Pid ->
-	    Pid
-    end.
-
-%% ---------------------------------------------------------------
-%% Functions called in case of an exit message 
-%% ---------------------------------------------------------------
-
-clean_up(Win, Buff,Pid) ->
-
-    %% (???) Unlinks the traced process, but since we are using a safe link
-    %% it is probably unnecessary.
-
-    safe_unlink(Pid), 
-
-    %% Kill helper processes
-
-    exit(Buff#buffer.converter, topquit),
-    exit(Buff#buffer.buffer, topquit),
-
-    gs:destroy(Win).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% exit_cmd/3 - Takes care of the necessary details when
-%%    a linked process terminates.
-
-
-exit_cmd(Pid,_Reason, State) ->
-    case State#pman_shell.shell_flag of
-
-	%% This clause handles the case when a shell process dies.
-	%% Since it is restarted and the intention is to continue tracing
-	%% the restarted shell process, we need to handle it separately by
-	%% finding the new shell process.
-	true ->
-	    
-	    NewShell = find_shell(),
-	    safe_link(NewShell),
-	    pman_relay:start(NewShell),
-
-	    %% Update the window title with the new PID
-	    Title = pman_win:title({shell, NewShell}),
-	    Win = State#pman_shell.win,
-	    gse:config(Win,[{title,Title}]),
-
-	    pman_relay:trac(NewShell, true, flags()),
-
-	    B = State#pman_shell.buffer,
-	    B#buffer.converter!{raw,[{shell_died, Pid, NewShell}]},
-
-
-
-	    State#pman_shell{pid=NewShell};
-
-	%% This clause handles the case when a traced process that is
-	%% not a shell process dies.
-	false ->
-
-	    B = State#pman_shell.buffer,
-	    B#buffer.converter!{raw,[{died, Pid}]},
-
-	    lists:foreach(fun(X) -> gse:disable(X) end,
-			  ['Options',
-			   'Kill',
-			   'LinksMenu']),
-	    State#pman_shell{pid=undefined}
-    end.
-
-flags() ->
-    [send, 'receive', call, procs,
-     set_on_spawn, set_on_first_spawn, set_on_link, set_on_first_link].
-
-options_to_flaglists(Options) ->
-    AssocList =
-	[{Options#trace_options.send, send},
-	 {Options#trace_options.treceive, 'receive'},
-	 {Options#trace_options.inherit_on_1st_spawn, set_on_first_spawn},
-	 {Options#trace_options.inherit_on_all_spawn, set_on_spawn},
-	 {Options#trace_options.inherit_on_1st_link, set_on_first_link},
-	 {Options#trace_options.inherit_on_all_link, set_on_link},
-	 {Options#trace_options.events, procs},
-	 {Options#trace_options.functions,call}],
-
-    TrueFun = fun ({Option,Flag}) ->
-		      case Option of
-			  true -> Flag;
-			  _Otherwise -> false
-		      end
-	      end,
-    TrueFlags = mapfilter(TrueFun, AssocList),
-
-    FalseFun = fun ({Option,Flag}) ->
-		       case Option of
-			   false -> Flag;
-			   _Otherwise -> false
-		       end
-	       end,
-    FalseFlags = mapfilter(FalseFun, AssocList),
-    {TrueFlags,FalseFlags}.
-    
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% mapfilter/2 - Combines the functionality of lists:map and
-%%   lists:filter. mapfilter applies the function argument to
-%%   each element in the list. All returned values that are 
-%%   not false will occur in the resulting list.
-%%
-%% Arguments:
-%%   Fun	A fun that takes one argument
-%%   List	A list. Each element will become an argument to Fun.
-%%
-%% Returns:
-%%  A list of all results from the map operation that are not false.
-%%
-
-mapfilter(Fun,[E|Es]) ->
-    case apply(Fun,[E]) of
-	false ->
-	    mapfilter(Fun,Es);
-	Value -> [Value | mapfilter(Fun,Es)]
-    end;
-mapfilter(_Fun, []) -> [].
- 
-
-		      
-perform_option_changes(Pid,Options,Buffer) ->
-
-    %% Notify the trace output functionality
-    %% if the destination is supposed to go to a file...
-
-    case Options#trace_options.to_file of
-	true -> 
-	    FName = Options#trace_options.file,
-	    Buffer#buffer.converter!{file,FName};
-	false ->
-	    done
-    end,
-
-    %%...then set the trace flags of the traced process
-
-    {OnFlags, OffFlags} = options_to_flaglists(Options),
-    case catch begin
-		   
-		   %% (???) Note that the following calls cannot actually fail
-		   %% This may be a problem. And the catch appears unnecessary
-		   %% However, it may become necessary to let the 
-		   %% pman_relay:trac/3 function retrun appropriate values.
-		   pman_relay:trac(Pid,true, OnFlags),
-		   pman_relay:trac(Pid,false, OffFlags)
-	       end of
-	true ->
-	     ok;
-	_ -> pman_win:format("** Illegal trace request ** \n", [])
-    end.
-
-
-
-
-
-
-%% ---------------------------------------------------------------
-%% Take care of the command executed by the user.
-
-execute_cmd(Cmd,Shell_data) ->
-    Window = Shell_data#pman_shell.win,
-    Editor = Shell_data#pman_shell.editor,
-    Shell = Shell_data#pman_shell.pid,
-    Buffer = Shell_data#pman_shell.buffer,
-    TraceOptions = Shell_data#pman_shell.trace_options,
-
-    case Cmd of
-	'Close' ->
-	    db_delete_key (Shell_data#pman_shell.db, Shell_data#pman_shell.pid),
-	    clean_up(Window, Buffer, Shell),
-	    exit(quit);
-	'Destroy' ->
-	    db_delete_key (Shell_data#pman_shell.db, Shell_data#pman_shell.pid),
-	    exit(Buffer#buffer.buffer,topquit),
-	    safe_unlink(Shell),
-	    exit(Buffer#buffer.converter,topquit),
-            exit(Buffer#buffer.buffer,topquit),
-	    exit(quit);
-
-	'Clear' when is_pid(Shell) ->
-	    New_buffer = pman_buf:clear(Buffer,pman_win:display(Shell),
-				       TraceOptions#trace_options.file),
-	    Shell_data#pman_shell{buffer = New_buffer};
-	'Save buffer' ->
-	    DefaultFile = "Pman_buffer." ++ default_file_name(Shell),
-	    Result = tool_utils:file_dialog([{type,save},
-					     {file,DefaultFile}]),
-	    case Result of
-		{ok, UserFile, _State} ->	    
-		    Buffer#buffer.buffer!{save_buffer,UserFile};
-		{error,_Reason} ->
-		    true
-	    end,
-	    Shell_data;
-	'Help' ->
-	    HelpFile = filename:join([code:lib_dir(pman), "doc", "html", "index.html"]),
-	    tool_utils:open_help(gs:start([{kernel, true}]), HelpFile),
-	    Shell_data;
-	'Kill' when is_pid(Shell)  ->		
-	    exit(Buffer#buffer.converter,killed),
-            exit(Buffer#buffer.buffer,killed),
-	    lists:foreach(fun(X) -> gse:disable(X) end,
-			  ['TraceMenu',
-			   'Clear']),
-	    catch exit(Shell, kill),
-	    Shell_data#pman_shell{pid = undefined};
-	'All Links' when is_pid(Shell)  ->
-	    LIPid = pman_process:pinfo(Shell, links),
-	    ?ALWAYS_ASSERT("Just a brutal test"),	    	    
-	    start_list(LIPid,
-		       Shell_data#pman_shell.father,
-		       Shell_data#pman_shell.trace_options), 
-	    Shell_data;
-	'Module' when is_pid(Shell) ->
-	    {ModuleName,_,_} = pman_process:function_info(Shell),
-	    pman_module_info:start(ModuleName),
-	    Shell_data;
-	'Options' when is_pid(Shell) ->
-	    case pman_options:dialog(Window,
-                                     "Trace Options for Process",
-                                     TraceOptions) of
-		{error, _Reason} ->
-		    Shell_data;
-		Options ->
-		    perform_option_changes(Shell, Options, Buffer),
-		    Shell_data#pman_shell{trace_options=Options}
-	    end;
-	
-	{trac,Choice,Bool} when is_pid(Shell) ->
-	    pman_relay:trac(Shell, Bool, [Choice]),
-	    Shell_data;
-
-
-	{configure,{X,Y}} ->
-	    configure (Editor, X, Y),
-	    Shell_data;
-
-	Pid when is_pid(Pid) ->
-	    pman_shell:start({Pid, Shell_data#pman_shell.father},
-			     Shell_data#pman_shell.trace_options),
-	    Shell_data;
-	_Other ->
-	    ?ALWAYS_ASSERT("Received unexpected event"),
-	    Shell_data
-    end.
-	    
-
-default_file_name(Shell) when is_pid(Shell) ->
-    [A,B,C] =  string:tokens(pid_to_list(Shell),[$.,$<,$>]),
-    "pman_trace." ++ A ++ "_" ++ B ++ "_" ++ C;
-default_file_name(_OTHER) ->
-    "shell".
-
-
-
-
-
-%% Key accellerators
-
-key(e) -> 'Clear';
-key(s) -> 'Save buffer';
-key(c) -> 'Close';
-key(a) -> 'All';
-key(r) -> 'Reset';
-key(m) -> 'Module';
-key(l) -> 'All Links';
-key(k) -> 'Kill';
-key(h) -> 'Help';
-key(z) -> 'Close';
-key(O) -> O.
-
-
-
-%% ---------------------------------------------------------------
-%% The main loop takes care of data coming in from the traces, as 
-%% well as exit signals from proceses we are monitoring. Events
-%% caused by the user or window manager are also handled here.
-%% ---------------------------------------------------------------
-
-
-monitor_loop(Shell_data) ->
-    receive
-
-	%% WM destroy
-	{gs,_Window,destroy,[],[]} ->  %%Avoid links menus
-	    execute_cmd('Destroy', Shell_data);
-
-
-	%% Handle EXIT signal from parent process
-	{'EXIT', _Pid, topquit} ->
-	    clean_up(Shell_data#pman_shell.win,
-		     Shell_data#pman_shell.buffer,
-		     Shell_data#pman_shell.pid),
-	    exit(topquit);
-
-	%% (???) Ignore "stray" EXIT signal from converter
-	{'EXIT', _Pid, win_killed} ->
-	    monitor_loop(Shell_data);
-
-
-	%% Handle EXIT signal from safely linked Pid
-	%% This is received when a traced process dies.
-	{'SAFE_EXIT', Pid, Reason} ->
-	    New_Shell_data = exit_cmd(Pid, Reason,Shell_data ),
-	    monitor_loop(New_Shell_data);
-
-
-	%% Handle EXIT signal from processes where we expect
-	%% some EXIT signals, such as the file_dialog opened, and possibly
-	%% others. 
-
-	{'EXIT', _Pid, _Reason} ->
-	    monitor_loop(Shell_data);
-
-	%% Handle incoming trace messages
-	Message when is_tuple(Message) , element(1,Message) == trace->
-	    {L, Suspended} = collect_tracs([Message]),
-	    Buffer = Shell_data#pman_shell.buffer,
-	    Buffer#buffer.converter!{raw,L},
-	    lists:foreach(fun(P) -> erlang:resume_process(P) end, Suspended),
-	    monitor_loop(Shell_data);
-
-
-	%% All other messages on the form {...,...,...}
-	Message when is_tuple(Message) ->
-	    do_link_stuff(Shell_data),
-	    
-	    New_Shell_data = process_gs_event(Message,Shell_data),
-	    monitor_loop(New_Shell_data);
-
-	%% Catch all for unexpected messages
-	_Anything ->
-	    ?ALWAYS_ASSERT("Received unexpected event"),	    
-	    monitor_loop(Shell_data)
-	  
-    end.		
-			
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% process_event/1 - Error handling wrapper for gs_cmd
-
-process_gs_event(Message, Shell_data) ->
-    case catch gs_cmd(Message,Shell_data) of
-
-	%%
-	%% Error exits from gs_cmd
-
-	{'EXIT', badrpc} ->
-	    Text = "\nERROR: Could not access node",
-	    pman_win:msg_win(Text),
-	    Shell_data;
-	{'EXIT', dead} ->
-	    Text = "\nERROR: The process is dead",
-	    pman_win:msg_win(Text),
-	    Shell_data;
-
-	%% A controlled application initiated termination
-	{'EXIT', quit} ->
-	    db_delete_key (Shell_data#pman_shell.db, Shell_data#pman_shell.pid),
-	    exit(quit);
-
-
-	{'EXIT',Reason} ->
-	    db_delete_key (Shell_data#pman_shell.db, Shell_data#pman_shell.pid),
-	    io:format("Debug info, Reason: ~p~n",[Reason]),
-	    ?ALWAYS_ASSERT("Unexpected EXIT reason"),
-	    exit({unexpected_EXIT_reason,Reason});
-	
-	%%
-	%% "Proper" exits from gs_cmd
-
-	New_Shell_data ->
-	    New_Shell_data
-    end.
-
-
-
-gs_cmd(Cmd, Shell_data) ->
-      case Cmd of
-
-	  %%User Command
-	  {gs, Command, click, _Data, _Args}       ->
-	      execute_cmd(Command,Shell_data);
-
-	  %%Key accellerator
-	  {gs,_Window,keypress,_D,[Key,_,0,1]}     ->
-	      execute_cmd(key(Key),Shell_data);
-
-	  %%Window Resize
-	  {gs,_Window,configure,_,[X,Y|_]}        ->
-	      execute_cmd({configure,{X,Y}},Shell_data);
-
-
-	  {gs, _Object, _Event, _Data, _Args} ->
-	      ?ALWAYS_ASSERT("Unhandled gs event"),
-	      Shell_data
-	  
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% (???) do_link_stuff/1 - I have no clue.
-%%
-
-do_link_stuff(Shell_data) ->
-
-    %% This appears to be code to execute for adding
-    %% dynamic links menus.
-
-    case Shell_data#pman_shell.pid of
-	undefined ->
-	    ok;
-	Pid ->
-	    case pman_process:pinfo(Pid, links) of
-		Links when is_list(Links) ->
-		    pman_win:links_menus(Links);
-		undefined ->
-		    ok
-	    end
-    end.
-
-
-%% (???) Process dictionary used to safe Pid-Pid pairs.
-%% 
-%% safe_link/1 - Spawns a process, that links to the Pid, and sends
-%%    a message to the caller when the linked process dies.
-%%
-%% Since we (think we) need to link to the traced process, we want
-%% to do it in a way that has the smallest possible risk. The process
-%% that links to the Pid is small and simple, which is safer than if
-%% the calling process would link directly to the Pid.
-
-safe_link(Pid) when is_pid(Pid) ->
-    Self = self(),
-    PidSafe = spawn_link(fun() -> safe_init(Self, Pid) end),
-    put(Pid, PidSafe).
-    
-
-%% safe_unlink/1 - Removes a safe link
-%%
-
-safe_unlink(Pid) when is_pid(Pid) ->
-    PidSafe = get(Pid),
-    PidSafe ! {unlink, self(), Pid},
-    erase(Pid);
-
-safe_unlink(_Anything)->
-    true.
-
-%% safe_init/2 - Initialize a simple receive loop that controls safe linking
-%%    to application processes.
-%% 
-safe_init(Caller, Pid) ->
-
-    process_flag(trap_exit, true),
-    link(Pid),
-
-    safe_loop(Caller, Pid).
-
-
-%% safe_loop/2 - Simply waits for an exit signal from the linked Pid,
-%%   all other messages are disregarded.
-%% 
-
-
-safe_loop(Caller, Pid) ->
-    receive
-	%% Linked process dies
-	{'EXIT' , Pid, Reason} ->
-	    Caller ! {'SAFE_EXIT', Pid, Reason};
-
-	%% Caller dies
-	{'EXIT', Caller, _Reason} ->
-	    unlink(Pid);
-	
-
-	%% Unlink request
-	{unlink, Caller, Pid} ->
-	    unlink(Pid);
-
-	%% Ignore everything else
-	_Anything ->
-	    safe_loop(Caller, Pid)
-    end.
-	    
-    
-
-configure (Editor, W, H) ->
-    gs:config (Editor, [{width, W - 3},
-			{height, H - 40}]).
-    
-
-
-
-%%% The DB is used to avoid multiple trace windows 
-%%% of the same process.
-
-%%% db_start  /0
-%%%
-
-db_start() ->
-    case ets:info(?PMAN_DB) of
-	undefined -> ets:new(?PMAN_DB, [public, named_table]);
-	_ -> ?PMAN_DB
-    end.
-
-
-
-%%% db_insert_key  /2
-%%%
-
-db_insert_key (Db, Pid) ->
-    case ets:lookup (Db, Pid) of
-	[] ->
-	    case catch ets:insert (Db, {Pid}) of
-		true ->
-		    true;
-		
-		_Error ->
-		    error_insert_db
-	    end;
-
-	_already_exists ->
-	    false
-    end.
-
-
-
-%%% db_delete_key  /2
-%%%
-
-db_delete_key (Db, Pid) ->
-    ets:delete (Db, Pid).
-
-
-%% Function to collect all trace messages in the receive queue.
-%% Returns: {Messages,SuspendedProcesses}
-
-collect_tracs(Ack) -> collect_tracs(Ack, ordsets:new()).
-    
-collect_tracs(Ack, Procs) ->
-    receive
-	Trac when is_tuple(Trac), element(1, Trac) == trace ->
-	    P = suspend(Trac, Procs),
-	    collect_tracs([Trac | Ack], P)
-    after 0 ->
-	    {lists:reverse(Ack), ordsets:to_list(Procs)}
-    end.
-
-suspend({trace,From,call,_Func}, Suspended) when node(From) == node() ->
-    case ordsets:is_element(From, Suspended) of
-	true -> Suspended;
-	false ->
-	    case (catch erlang:suspend_process(From)) of
-		true ->
-		    ordsets:add_element(From, Suspended);
-		_ ->
-		    Suspended
-	    end
-    end;
-suspend(_Other, Suspended) -> Suspended.
diff --git a/lib/pman/src/pman_tool.erl b/lib/pman/src/pman_tool.erl
deleted file mode 100644
index 36382745af..0000000000
--- a/lib/pman/src/pman_tool.erl
+++ /dev/null
@@ -1,146 +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%
-%%
--module(pman_tool).
--compile([{nowarn_deprecated_function,{gs,read,2}}]).
-
-%% Listbox selection window
-
--export([select/3]).
-
--record(state, {topwin,
-		frame,
-		listbox}).
-
-%% Constants
--define(WIN_WIDTH, 350).
--define(WIN_HEIGHT, 350).
-
-select(Win, Title, Choices) ->
-    Self = self(),
-    Pid = spawn_link(fun() -> init(Self, Win, Title, Choices) end),
-    receive 
-	{Pid, Result} ->
-	    Result
-    end.
-
-init(Pid, Win, Title, Choices) ->
-
-    %% Create window
-    State = create_window(Win, Title, Choices),
-
-    gse:map(State#state.topwin),
-    
-    %% enter event loop
-    loop(Pid, Choices, State).
-
-loop(Pid, Choices, State) ->
-    receive
-	{gs, _, destroy, _Data, _Args} ->
-	    Pid ! {self(), cancelled};
-	{gs, _, configure, _Data, [W, H|_]} ->
-	    gse:resize(State#state.frame, W, H),
-	    loop(Pid, Choices, State);
-	{gs, _, click, ok, _Args} ->
-	    case gs:read(State#state.listbox, selection) of
-		[] ->
-		    Pid ! {self(), cancelled};
-		Indices ->
-		    Selection = selection(Indices, Choices),
-		    Pid ! {self(), Selection}
-	    end;
-	{gs, _, click, cancel, _Args} ->
-	    Pid ! {self(), cancelled};
-	{gs, Obj, doubleclick, _Data, _Args} ->
-	    self() ! {gs, Obj, click, ok, []},
-	    loop(Pid, Choices, State);
-	_GSEvent ->
-	    loop(Pid, Choices, State)
-    end.
-
-selection(Indices, Choices) ->
-    selection(0, Indices, Choices).
-
-selection(I, [I|Is], [{Val,_Str}|Vals]) ->
-    [Val | selection(I+1, Is, Vals)];
-selection(I, [I|Is], [Val|Vals]) ->
-    [Val | selection(I+1, Is, Vals)];
-selection(_I, [], _Vals) ->
-    [];
-selection(I, Is, [_Val|Vals]) ->
-    selection(I+1, Is, Vals).
-    
-create_window(Win, Title, Choices) ->
-    Font = pman_win:font(Win),
-
-    %% Top window and a frame that covers it entirely, to allow
-    %% usage of the packer for geometry management.
-    Topwin = gse:window(Win, [{width, ?WIN_WIDTH},
-			      {height,?WIN_HEIGHT},
-			      {configure, true},
-			      {title, Title}]),
-    Frame = gse:frame(Topwin, [{packer_x,[{stretch,1},
-					  {stretch,1}]},
-			       {packer_y,[{stretch,1},
-					  {stretch,5},
-					  {stretch,1}]}]),
-
-    %% Caption above the list of items
-    CaptionTxt = "Select one or more of the following:",
-    gse:label(Frame, [{pack_x,{1,2}},
-		      {pack_y,{1,1}},
-		      {label,{text,CaptionTxt}}, {font,Font}]),
-
-    %% List of selectable items
-    Listbox = gse:listbox(Frame, [{pack_x,{1,2}},
-				  {pack_y,{2,2}},
-				  {selectmode,multiple},
-				  {doubleclick, true},
-				  {font,Font},
-				  {items, str_choices(Choices)}]),
-
-    %% OK and Cancel buttons in a separate frame.
-    F13 = gse:frame(Frame, [{bw,1},
-			    {pack_xy,{{1,2},3}},
-			    {packer_x,[{stretch,1},
-				       {fixed, 60},
-				       {stretch,1},
-				       {fixed, 60},
-				       {stretch,1}]},
-			    {packer_y,[{stretch,1},
-				       {fixed, 30},
-				       {stretch,1}]}]),
-
-    gse:button(F13, [{pack_xy,{2,2}},
-		     {label,{text,"OK"}}, {font,Font},
-		     {data,ok}]),
-    gse:button(F13, [{pack_xy,{4,2}},
-		     {label,{text,"Cancel"}}, {font,Font},
-		     {data,cancel}]),
-
-    gse:resize(Frame, ?WIN_WIDTH, ?WIN_HEIGHT),
-    #state{topwin=Topwin, frame=Frame, listbox=Listbox}.
-
-str_choices(Choices) ->
-    lists:map(
-      fun({Val, Str}) ->
-	      lists:flatten(io_lib:format("~p: ~s", [Val, Str]));
-	 (Term) ->
-	      lists:flatten(io_lib:format("~p", [Term]))
-      end,
-      Choices).
diff --git a/lib/pman/src/pman_win.erl b/lib/pman/src/pman_win.erl
deleted file mode 100644
index aec7dc4412..0000000000
--- a/lib/pman/src/pman_win.erl
+++ /dev/null
@@ -1,677 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
-%% 
-%% The 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:  window management and the gs interface
-%% ------------------------------------------------------------
-
--module(pman_win).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,canvas,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,create,4}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,1}},
-          {nowarn_deprecated_function,{gs,text,2}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
-%% ---------------------------------------------------------------
-%% The user interface exports 
-%% ---------------------------------------------------------------
-
--export([pman_window/3, window/1, module_data/1, display/1, format/2,
-	 dialog_window/2, configeditor/2, configwin/3,
-	 update/1, update/3,
-	 msg_win/1, title/1,
-	 remove_menu/1, add_menu/3,
-	 change_colour/3, links_menus/1, calc_columnwidths/1]).
--export([font/0, font/1]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Constants
-%%
--include("pman_win.hrl").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% pman_window/3 - Create a GS window and components for the
-%%   Pman overview window, the main window.
-%%
-%% Arguments:
-%%   Size		number of processes
-%%   HiddenModules	list of modules 
-%%   Nodes		list of supervised nodes
-%%
-%% Return: 
-%%   {Win, Grid, Frame, Procnum, W, H} where
-%%   Win	The GS top window
-%%   Grid	The GS grid
-%%   Procnum	Number of displayed processes
-%%
-
-pman_window(Size, _HiddenModules, Nodes) ->
-    GS = gs:start([{kernel,true}]),
-    Font = font(GS),
-    Win_Options = [{title, lists:concat(["Pman: Overview on ",node()])},
-		   {width, ?WIN_WIDTH}, {height, ?WIN_HEIGHT},
-		   {destroy, true},
-		   {keypress,true}],
-    Win = gs:create(window, GS, Win_Options),
-
-    %% Menu bar
-    MenuBar = gs:create(menubar, Win, []),
-    MBFile = gs:create(menubutton, MenuBar, [{label,{text," File "}},
-					     {font,Font},
-					     {underline,1}]),
-    MBView = gs:create(menubutton, MenuBar, [{label,{text, " View "}},
-					     {font,Font},
-					     {underline,1}]),
-    MBTrace = gs:create(menubutton, MenuBar, [{label,{text, " Trace "}},
-					      {font,Font},
-					      {underline,1}]),
-    MBHelp = gs:create(menubutton, MenuBar, [{label, {text, " Help "}},
-					     {font,Font},
-					     {side,right},
-					     {underline,1}]),
-
-    %% Addition of a menu for distribution
-    add_node_menu(MenuBar, Nodes, Font),
-
-    %% All menu buttons
-    MenuFile = gs:create(menu, MBFile, []),
-    MenuView = gs:create(menu, MBView, []),
-    MenuTrace = gs:create(menu, MBTrace, []),
-    MenuHelp = gs:create(menu, MBHelp, []),
-
-    %% File menu
-    gse:named_menuitem('Default Options', MenuFile,
-		       [{label,{text,"Options..."}}, {font,Font},
-			{underline,0}]),
-    gse:named_menuitem('Save Options',MenuFile,
-		       [{label,{text,"Save Options"}}, {font,Font}]),
-    gse:named_menuitem('Exit', MenuFile,
-		       [{label,{text,"Exit"}}, {font,Font},
-			{underline,0}]),
-
-    %% View menu
-    gse:named_menuitem('Hide All',MenuView,
-		       [{label, {text, "Hide All Processes"}},
-			{font,Font},
-			{underline,1}]),
-
-    gse:named_menuitem('Hide Modules', MenuView,
-		       [{label, {text, "Hide Modules..."}},
-			{font,Font},
-			{underline,8}]),
-
-    gse:named_menuitem('Hide Selected Process', MenuView,
-		       [{label, {text, "Hide Selected Process"}},
-			{font,Font},
-			{underline,2}]),
-
-    gse:named_menuitem('Module',MenuView,
-		       [{label, {text, "Module Info..."}}, {font,Font},
-			{underline,7}]),
-
-    gse:named_menuitem('Refresh', MenuView,
-		       [{label, {text, "Refresh"}}, {font,Font},
-			{underline,0}]),
-
-    gse:named_menuitem('Show All',MenuView,
-		       [{label, {text, "Show All Processes"}},
-			{font,Font}]),
-
-    gse:named_menuitem('Show Selected',MenuView,
-		       [{label, {text, "Show Processes..."}},
-			{font,Font}]),
-
-    %% Trace menu
-    gs:create(menuitem, 'Kill', MenuTrace, [{label,{text, "Kill"}},
-					    {font,Font},
-					    {underline,0}]),
-
-    gs:create(menuitem, 'Trace Process', MenuTrace,
-	      [{label, {text, "Trace Selected Process"}}, {font,Font},
-	       {underline,0}]),
-
-    gs:create(menuitem,'Trace Shell', MenuTrace,
-	      [{label, {text,"Shell Process"}}, {font,Font},
-	       {underline,0}]),
-
-    %% Help menu
-    gs:create(menuitem,'Help', MenuHelp,  [{label, {text, "Help" }},
-					   {font,Font},
-					   {underline,0}]),
-
-    %% Window contents
-
-    %% Geometry managing frame
-    Frame = gse:frame(Win, [{y,?MENU_HEIGHT},
-			    {packer_x,[{stretch, 1}]},
-			    {packer_y,[{stretch,10},
-				       {fixed,?CHECKBAR_HEIGHT}]}]),
-
-
-
-    %% Grid 
-    Grid_Options = [
-		    {pack_x,1}, {pack_y,1},
-		    {fg,black}, 
-		    {vscroll,right},{hscroll,bottom},
-		    calc_columnwidths(739),
-		    {rows, {1,Size}}], 
-    Grid = gse:grid(Frame,Grid_Options),
-
-
-    %% Checkbutton bar at the bottom of the window
-
-    CheckBar = gse:frame(Frame, [{pack_x,1},
-				 {pack_y,2},
-				 {packer_x,[{stretch, 2, 100,300},
-					    {stretch, 2, 100,300},
-					    {stretch,1},
-					    {stretch, 2,100,300}]},
-				 {packer_y,[{stretch,1}]}]),
-    gse:named_checkbutton('Hide System',CheckBar,
-			  [{pack_xy,{1,1}},
-			   {justify, left},
-			   {align,w},
-			   {width, 200},
-			   {font, Font},
-			   {label, {text, "Hide System Processes" }}]),
-    
-    gse:named_checkbutton('Auto Hide New',CheckBar,
-			  [{pack_xy,{2,1}},
-			   {width, 200},
-			   {justify, left},
-			   {align,w},
-			   {font, Font},
-			   {label, {text, "Auto-Hide New" }}]),
-    
-    gse:named_label('Number Hidden',CheckBar,
-			  [{pack_xy,{4,1}},
-			   {justify, left},
-			   {align,w},
-			   {width, 200},
-			   {font, Font},
-			   {label, {text, ?CPIDHIDDENTEXT }}]),
-
-    %% Finalize it!
-    gse:map(Win),
-    gse:config(Win,[raise]),
-    gse:config(Win,[{configure,true}]),
-
-
-    {Win, Grid, Frame, length(processes())+1, ?WIN_WIDTH, ?WIN_HEIGHT}.
-
-
-%% Calculate columnwidths in respect to the size of the window.
-
-calc_columnwidths(Width) ->
-    if
-	Width =< 739 -> 
-	    {columnwidths,[75,215,146,90,105,105]};
-       true -> 
-	    S = (Width - 75)/(215+146+90+105+105),
-	    {columnwidths,[75,round(215*S),round(146*S),round(90*S),
-			   round(105*S),round(105*S)]}
-    end.
-
-%% ---------------------------------------------------------------
-%% Create a trace window
-%%
-%% Process, a process id or an atom
-%%
-%% Return: A window and a editor
-%% ---------------------------------------------------------------
-
-
-window(Process) ->
-    GS = gs:start([{kernel,true}]),
-    Font = font(GS),
-    Win_Options = [{title,title(Process)}, {width,550}, {keypress,true}, 
-		   {configure,true},
-		   {destroy,true},{height, 400}],
-    Win = gs:create(window,GS,Win_Options),
-    
-    MenuBar = gs:create(menubar, Win, []),
-
-    %% File menu
-    MBFile =  gs:create(menubutton,MenuBar,[{label,{text," File "}},
-					    {font,Font},
-					    {underline, 1}]),
-    MenuFile = gs:create(menu, MBFile, []),
-    make_menus(pman_process:is_running(Process), MenuBar, MenuFile,
-	       Font),
-
-    gse:named_menuitem('Save buffer',MenuFile,
-		       [{label,{text, "Save buffer..."}},
-			{font,Font},
-			{underline,0}]),
-    gse:named_menuitem('Close',MenuFile,
-		       [{label, {text, "Close"}},
-			{font,Font},
-			{underline,0}]),
-
-
-    Editor = gs:create(editor,Win,[{x,3}, {y,40},
-				   {width,546}, {height,348},
-				   {font,Font}]),
-    gs:config(Editor, [{keypress, true},{insert, {'end', display(Process)}}]),
-    gs:config(Editor, [{enable, false},{vscroll, right}, {hscroll, bottom},
-		       {wrap,none}]),
-    gs:config(Win, [{map, true}]),
-    {Win, Editor}.
-
-%% ---------------------------------------------------------------------
-%% Menu Help Fuctions
-%% ---------------------------------------------------------------------
-
-
-links_menus(Links) ->
-    gs:destroy('Links'),
-    gs:create(menu,'Links','LinksMenu',[]),
-    Flag =  case links_menus(Links,[]) of
-		[] -> false;
-		Pids ->
-		    add_menu('Links', Pids, "Trace"),
-		    true
-	    end,
-    gse:config('LinksMenu',[{enable,Flag}]).
-	    
-links_menus([],Pids) -> Pids;
-links_menus([Pid|Links],Pids) when is_pid(Pid) ->
-    links_menus(Links,[Pid|Pids]);
-links_menus([_Port|Links],Pids) ->
-    links_menus(Links,Pids).
-
-
-%% Create the node menu. 
-
-add_node_menu(MenuBar, Nodes, Font) ->
-    MBNode = gs:create(menubutton, MenuBar, [{label,{text, " Nodes "}},
-					     {font,Font},
-					     {underline, 1}]),
-    gs:create(menu, node, MBNode, []),
-    add_menu(node, Nodes, "Show", Font),
-    gse:disable(node()).
-
-
-%% ---------------------------------------------------------------------
-%% Add Menus in the list under Menu menuitem.
-
-add_menu(Menu, Names, Tag) ->
-    add_menu(Menu, Names, Tag, font()).
-
-add_menu(_Menu, [], _Tag, _Font) -> ok;
-add_menu(Menu, [Name|Names], Tag, Font) ->
-    Title = io_lib:format("~s ~p",[Tag, Name]),
-    gs:create(menuitem,Name,Menu,[{label,{text,Title}},
-				  {font,Font},
-				  {data,{Menu,Name}}]),
-    add_menu(Menu, Names, Tag, Font).
-
-%% ---------------------------------------------------------------------
-%% Remove a specific menu item, or a whole menu, or a list of both.
-%%
-
-remove_menu(List) when is_list(List)->
-    lists:foreach(fun(X) -> gs:destroy(X) end, List);
-
-remove_menu(Object) ->
-    gse:destroy(Object).
-
-
-%% ---------------------------------------------------------------------
-%% If the trace window opened is supposed to trace a real pid, let us
-%% add the trace menu, and other items specific to tracing. If not,
-%% the only menus available are the ones in the default defined in
-%% window(Pid).
-
-make_menus(false, _, _, _) -> ok;
-make_menus({true,Pid}, MenuBar, MenuFile, Font) ->
-    MBView = gs:create(menubutton,'ViewMenu',MenuBar,
-				[{underline,1},
-				 {label,{text," View "}}, {font,Font},
-				 {side,left}]),
-    MenuView = gs:create(menu, MBView, []),
-
-    MBTrace = gs:create(menubutton,'TraceMenu',MenuBar,
-			      [{underline,1},
-			       {label,{text," Trace "}}, {font,Font},
-			       {side,left}]),
-    MenuTrace = gs:create(menu, MBTrace, []),
-
-
-    MBHelp =  gs:create(menubutton,'HelpMenu',MenuBar,
-			      [{underline,1},
-			       {label,{text," Help "}}, {font,Font},
-			       {side,right}]),
-    MenuHelp = gs:create(menu, MBHelp, []),
-
-    %% File menu
-    gse:named_menuitem('Options', MenuFile,
-		       [{label, {text, "Options..."}}, {font,Font},
-			{underline,0}]),
-
-    %% Trace menu
-    gse:named_menuitem('All Links', MenuTrace,
-		       [{label, {text, "All Linked Processes"}},
-			{font,Font},
-			{underline,0}]),
-    gse:named_menuitem('LinksMenu', MenuTrace,
-		       [{underline,0},
-			{label, {text, "Linked Process..."}},
-			{font,Font},
-			{itemtype, cascade},
-			{enable,false}]),
-    gs:create(menu,'Links','LinksMenu',[]),
-    case pman_process:pinfo(Pid, links) of
-	Links when is_list(Links) ->
-	    links_menus(Links);
-	undefined ->
-	    lists:foreach(fun(X) -> gse:disable(X) end,['LinksMenu'])
-    end,
-    gse:named_menuitem('Kill', MenuTrace,
-		       [{label, {text, "Kill"}}, {font,Font},
-			{underline,0}]),
-
-    %% View menu
-    gse:named_menuitem('Clear', MenuView,
-		       [{label, {text, "Clear buffer"}}, {font,Font},
-			{underline,0}]),
-
-    gse:named_menuitem('Module', MenuView,
-		       [{label, {text, "Module Info"}}, {font,Font},
-			{underline,0}]),
-
-    %% Help menu
-    gse:named_menuitem('Help', MenuHelp,
-		       [{label, {text, "Help"}}, {font,Font},
-			{underline,0}]).
-
-%% ---------------------------------------------------------------------
-%% Configurate the actual editor
-%%
-%% Editor, actual editor
-%% Options, actual options for the editor
-%%
-%% Return: A configurated editor with the actual options
-%% ---------------------------------------------------------------------
-
-configeditor(Editor, Options) ->
-    gs:config(Editor, Options).
-
-%% ---------------------------------------------------------------------
-%% Configure the actual window after it has been resized.
-%% ---------------------------------------------------------------------
-
-configwin(Object, W, H) ->
-    Dx = abs(W - gs:read(Object,width) - 4),
-    Dy = abs(H - gs:read(Object,height) - 42),
-    if
-	Dx + Dy =/= 0 ->
-	    gs:config(Object,[{width,W - 4}]);
-	true -> ok
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% update/1, 3
-update(NoOfHidden) ->
-    Str = lists:flatten(io_lib:format(?CPIDHIDDENTEXT++"~w",
-				      [NoOfHidden])),
-    gse:config('Number Hidden', [{label, {text,Str}}]).
-    
-update(Grid, ShowInfoR, NoOfHidden) ->
-
-    %% We reverse the list because we want the processes to appear with
-    %% the newest (=highest) pid first in the list.
-    ShowInfo = lists:reverse(ShowInfoR),
-
-    %% Set the length of the grid
-    CGridline = length(ShowInfo) + 1,
-    gs:config(Grid, [{rows, {1,CGridline}}]),
-
-    %% Add the header line 
-    add_gridline(Grid,
-		 1,
-		 {'Pid','Current Function','Name','Msgs','Reds','Size'},
-		 []),
-
-    update(NoOfHidden),
-
-    %% Recurse through the ordset of pids
-    update_r(Grid, ShowInfo, 2).
-
-update_r(Grid, [], Row) ->
-    delete_gridlines(Grid, Row);
-update_r(Grid, [{Pid,Func,Name,Msgs,Reds,Psize}|ShowInfo], Row)  -> 
-    {M, F, A} = Func,
-    FuncText = lists:flatten(io_lib:format("~w:~w/~w", [M, F, A])),
-    add_gridline(Grid,
-		 Row, 
-		 {Pid, FuncText, Name, Msgs, Reds, Psize},
-		 [{data,{pidfunc,Pid,Func}}]),
-    update_r(Grid, ShowInfo, Row+1).
-
-add_gridline(Grid, Row, Tuple, LIOptSpec) ->
-    {Pid, FuncText, Name, Msgs, Reds, Psize} = Tuple,
-    LIOpt = [{click,true},
-	     {doubleclick,true},
-	     {fg, colour(Row)},
-	     {text,{1,Pid}},
-	     {text,{2,FuncText}},
-	     {text,{3,Name}},
-	     {text,{4,Msgs}},
-	     {text,{5,Reds}},
-	     {text,{6,Psize}} |LIOptSpec],
-    case gs:read(Grid, {obj_at_row, Row}) of
-	undefined ->
-	    gse:gridline(Grid,[{row, Row}|LIOpt]);
-	GridLine ->
-	    gs:config(GridLine,LIOpt)
-    end.
-    
-delete_gridlines(Grid, Row) -> 
-    case gs:read(Grid, {obj_at_row, Row}) of
-	undefined ->
-	    ok;
-	GridLine ->
-	    gs:destroy(GridLine),
-	    delete_gridlines(Grid, Row+1)
-    end.
-
-colour(1) ->
-    ?HEADER_COLOUR;
-colour(_Row) ->
-    ?UNSELECTED_COLOUR.
-
-%% Interchange colours between two rows
-change_colour(Grid, Row, Row) ->
-    Gitem = gs:read(Grid, {obj_at_row,Row}),
-    gs:config(Gitem, {fg,?SELECTED_COLOUR});
-change_colour(Grid, From, To) ->
-    Gitem_to = gs:read(Grid, {obj_at_row,To}),
-    Gitem_fr = gs:read(Grid, {obj_at_row,From}),
-    gs:config(Gitem_to, {fg,?SELECTED_COLOUR}),
-    gs:config(Gitem_fr, {fg,colour(From)}).
-    
-%% --------------------------------------------------------------
-%% Create a title for the window
-%% Return: the title
-%% --------------------------------------------------------------
-
-title({module, Mod}) ->
-    lists:flatten([io_lib:format("Pman: Module info ~p", [Mod])]);
-
-title({shell,  Sh} ) ->
-    lists:flatten([io_lib:format("Pman: Shell process ~p on ~p",
-				 [Sh,node(Sh)])]);
-
-title(Sh) ->
-    lists:flatten([io_lib:format("Pman: Process ~p on ~p",
-				 [Sh, node(Sh)]),name(Sh)]).
-name(Pid) ->
-    case pman_process:pinfo(Pid, registered_name) of
-	undefined -> "";
-	Name ->
-	    lists:flatten([io_lib:format("[~p]", [Name])])
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% module_data/1 - %% Returns the module information for a
-%%   module, on a format suitable to insert into a GS editor.
-%%
-%% Arguments:
-%%   ModuleName		The module
-%%
-%% Returns:
-%%   A string with module information.
-%%
-
-module_data(ModuleName) ->
-    vformat("", catch apply(ModuleName, module_info, [])).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% display/1 - 
-%%
-
-display({_,Pid,_}) -> display(Pid);
-display({_,Pid}) -> display(Pid);
-display(Pid) when is_pid(Pid) ->
-    case pman_process:pinfo(Pid) of
-	undefined ->
-	    format('Process is dead~n',[]);
-	Other ->
-	    proc_format(Other)
-    end.
-
-%% --------------------------------------------------------------
-%% Format functions for the shell and help window.
-%% --------------------------------------------------------------
-
-vformat(Pad, {M,F,A}) when is_atom(F) -> 
-    Pad2 = lists:append(Pad,mkpad(io_lib:format("~w:~w",[M,F]))),
-    lists:flatten([format("~p:~p", [M,F]),argformat(Pad2, A)]);
-
-vformat(Pad, [H|T]) ->
-    kvformat(Pad, [H|T],"[");
-
-vformat(_Pad, X) -> format("~p~n", [X]).
-
-format(Format) -> format(Format, []).
-
-format(Format, Args) ->
-   io_lib:format(Format, Args).
-   
-
-kvformat(S, [Item],Buff) ->
-    lists:reverse([format("\n~s~p]\n",[S,Item])|Buff]);
-
-kvformat(S,[H|T],Buff) ->
-    kvformat(S,T,[format("\n~s~p, ",[S,H])|Buff]);
-
-kvformat(_,[],Buff) -> 
-    lists:reverse(["]\n"|Buff]).
-
-argformat(_Pad,A) when is_integer(A) ->
-    format("/~p\n", [A]);
-argformat(_,A) ->
-    lists:flatten([format("/~p\n", [length(A)]),
-		   format("args: \n"),
-		   argformat2("      ", A)]).
-
-argformat2(Pad, Arglist) ->
-    Chars = lists:flatten(io_lib:format("~p",[Arglist])),
-    if
-	length(Chars) < (70 - length(Pad)) ->
-	    format("~s~s\n", [Pad, Chars]);
-	true ->
-	    argformat3(Pad, Arglist)
-    end.
-
-argformat3(_,[]) -> format("\n");
-argformat3(Pad, [H|T]) ->
-    Chars = truncate(65,io_lib:format("~s~p",[Pad, H])),
-    format("~s,\n", [Chars]),
-     argformat3(Pad, T).
-
-pformat(false) -> [];
-pformat({value,{_, 0}}) -> [];
-pformat({value,{_, []}}) -> [];
-pformat({value, {Key, Vals}}) ->
-    Pad = mkpad(io_lib:format("~p ",[Key])),
-    format(lists:flatten(["~p: " ,vformat(Pad, Vals), "~n"]), [Key]).
-   
-truncate(0, _Chars) -> ".....";
-truncate(I, [H|T]) -> [H|truncate(I-1, T)];
-truncate(_I, []) -> [].
-
-mkpad([_|T]) -> [32|mkpad(T)];
-mkpad([]) -> [].
-
-proc_format(Pi) ->  %% process_info struct
-    X1 = pformat(lists:keysearch(initial_call, 1, Pi)),
-    X2 = pformat(lists:keysearch(current_function, 1,Pi)),
-    X3 = pformat(lists:keysearch(messages, 1,Pi)),
-    X4 = pformat(lists:keysearch(dictionary,1, Pi)),
-    X5 = pformat(lists:keysearch(heap_size, 1,Pi)),
-    X6 = pformat(lists:keysearch(stack_size, 1,Pi)),
-    X7 = pformat(lists:keysearch(reductions, 1,Pi)),
-    X8 = pformat(lists:keysearch(links, 1,Pi)),
-    X9 = pformat(lists:keysearch(trap_exit, 1,Pi)),
-    lists:flatten([X1, X2, X3, X4, X5,X6,X7,X8,X9]).
-
-
-%% Using the tool_utils function for presenting messages.
-dialog_window(GSParent, Text) ->
-    spawn_link(tool_utils, notify, [GSParent, Text]).
-
-%% Create a window with a dismiss button.
-msg_win(Text) ->
-    spawn_link(fun() -> display_msg_win(Text) end).
-
-display_msg_win(Text) ->
-    GS = gs:start([{kernel,true}]),
-    Font = font(GS),
-    Win = gs:window(GS, [{width,200}, {height,75}, {destroy,true},
-			 {title,"Pman Message"}]),
-    Can = gs:canvas(Win, [{width,200}, {height, 75},{x,0},{y,0}]),
-    gs:text(Can, [{text,Text}, {coords,[{10,0}]}, {justify,center}]),
-    Btn = gs:button(Win, [{label,{text,"Dismiss"}}, {font,Font},
-			  {width,100}, {x,50}, {y,40}]),
-    gs:config(Win, {map,true}),
-    receive
-	{gs, Btn, click, _, _} ->
-	    ok
-    end.
-
-%% Choose default font
-font() ->
-    font(gs:start([{kernel,true}])).
-
-font(GS) ->
-    case gs:read(GS, {choose_font, {screen,[],12}}) of
-	Font when element(1, Font)==screen ->
-	    Font;
-	_ ->
-	    gs:read(GS, {choose_font, {courier,[],12}})
-    end.
diff --git a/lib/pman/src/pman_win.hrl b/lib/pman/src/pman_win.hrl
deleted file mode 100644
index 8a2778d5b7..0000000000
--- a/lib/pman/src/pman_win.hrl
+++ /dev/null
@@ -1,39 +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%
-%%
-
--define(WIN_HEIGHT, 390).
--define(WIN_WIDTH, 745).
-
--define(MENU_HEIGHT, 40).
--define(CHECKBAR_HEIGHT, 40).
-
--define(CPIDHIDDENTEXT, "# Hidden: ").
-
--define(HEADER_COLOUR, blue).
--define(UNSELECTED_COLOUR, black).
--define(SELECTED_COLOUR, white).
-
-
-
-
-
-
-
-
-
diff --git a/lib/pman/vsn.mk b/lib/pman/vsn.mk
deleted file mode 100644
index 92fb9df222..0000000000
--- a/lib/pman/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-PMAN_VSN = 2.7.1.4
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
index a4e36c7293..c1b3bc866d 100644
--- a/lib/public_key/asn1/Makefile
+++ b/lib/public_key/asn1/Makefile
@@ -41,7 +41,7 @@ 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-7 PKCS-8 PKCS-10 PKCS5v2-0 OTP-PKIX \
-	InformationFramework
+	InformationFramework RFC5639
 ASN_ASNS = $(ASN_MODULES:%=%.asn1)
 ASN_ERLS = $(ASN_TOP:%=%.erl)
 ASN_HRLS = $(ASN_TOP:%=%.hrl)
@@ -116,7 +116,8 @@ OTP-PUB-KEY.asn1db:		PKIX1Algorithms88.asn1 \
 		                PKCS-7.asn1\
 				PKCS-10.asn1\
 				InformationFramework.asn1\
-				OTP-PKIX.asn1
+				OTP-PKIX.asn1 \
+				RFC5639.asn1
 
 $(EBIN)/PKCS-FRAME.beam: 	        PKCS-FRAME.erl PKCS-FRAME.hrl
 PKCS-FRAME.erl PKCS-FRAME.hrl:		PKCS-FRAME.asn1db
diff --git a/lib/public_key/asn1/OTP-PKIX.asn1 b/lib/public_key/asn1/OTP-PKIX.asn1
index 911a156d6c..8d3c76adf5 100644
--- a/lib/public_key/asn1/OTP-PKIX.asn1
+++ b/lib/public_key/asn1/OTP-PKIX.asn1
@@ -252,7 +252,17 @@ domainComponent ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
 
 emailAddress ATTRIBUTE-TYPE-AND-VALUE-CLASS ::= {
 	ID id-emailAddress
-	TYPE EmailAddress }
+	TYPE EmailAddress } -- 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 emailAddress
+
+ OTP-emailAddress ::= CHOICE {
+       ia5String         IA5String       (SIZE (1..255)),
+       utf8String        UTF8String      (SIZE (1..255))
+}
 
 --
 -- Signature and Public Key Algorithms
diff --git a/lib/public_key/asn1/OTP-PUB-KEY.set.asn b/lib/public_key/asn1/OTP-PUB-KEY.set.asn
index e94f428e4b..b3f3ccdb77 100644
--- a/lib/public_key/asn1/OTP-PUB-KEY.set.asn
+++ b/lib/public_key/asn1/OTP-PUB-KEY.set.asn
@@ -9,3 +9,4 @@ DSS.asn1
 ECPrivateKey.asn1
 PKCS-7.asn1
 PKCS-10.asn1
+RFC5639.asn1
diff --git a/lib/public_key/asn1/PKCS-7.asn1 b/lib/public_key/asn1/PKCS-7.asn1
index a6dfd57d80..e76f928acb 100644
--- a/lib/public_key/asn1/PKCS-7.asn1
+++ b/lib/public_key/asn1/PKCS-7.asn1
@@ -78,6 +78,49 @@ signingTime ATTRIBUTE ::= {
 
 SigningTime ::= Time -- imported from ISO/IEC 9594-8
 
+-- begin added for VCE SCEP-support
+transactionID ATTRIBUTE ::= {
+        WITH SYNTAX PrintableString
+        ID id-transId
+}
+
+messageType ATTRIBUTE ::= {
+        WITH SYNTAX PrintableString
+        ID id-messageType
+}
+
+pkiStatus ATTRIBUTE ::= {
+        WITH SYNTAX PrintableString
+        ID id-pkiStatus
+}
+
+failInfo ATTRIBUTE ::= {
+        WITH SYNTAX PrintableString
+        ID id-failInfo
+}
+
+senderNonce ATTRIBUTE ::= {
+        WITH SYNTAX OCTET STRING
+        ID id-senderNonce
+}
+
+recipientNonce ATTRIBUTE ::= {
+        WITH SYNTAX OCTET STRING
+        ID id-recipientNonce
+}
+
+-- This is the authenticatedAttributes -member from SignerInfo
+-- added here to generate decode/encode functions for it which are
+-- needed to build the pkcs-7 used by SCEP, the resulting encoding are
+-- used to make a signed digest
+SignerInfoAuthenticatedAttributes ::= 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.
+  }
+-- end added for VCE SCEP-support
+
 
 -- Also defined in X.509
 -- Redeclared here as a parameterized type
@@ -224,12 +267,9 @@ SignerInfo ::= SEQUENCE {
   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,
+  -- Added explicit type for authenticatedAttributes to be able to
+  -- encode/decode this type separately
+  authenticatedAttributes SignerInfoAuthenticatedAttributes OPTIONAL, 
   digestEncryptionAlgorithm
                   DigestEncryptionAlgorithmIdentifier,
   encryptedDigest EncryptedDigest,
@@ -247,7 +287,15 @@ SignerInfo ::= SEQUENCE {
 
 Authenticated ATTRIBUTE ::= {
   contentType |
-  messageDigest,
+  messageDigest |
+-- begin added for VCE SCEP-support
+  transactionID |
+  messageType |
+  pkiStatus |
+  failInfo |
+  senderNonce |
+  recipientNonce,
+-- end added for VCE SCEP-support
   ...,  -- add application-specific attributes here
   signingTime
 }
@@ -384,4 +432,18 @@ signedAndEnvelopedData  OBJECT IDENTIFIER ::= { pkcs-7 4 }
 digestedData            OBJECT IDENTIFIER ::= { pkcs-7 5 }
 encryptedData           OBJECT IDENTIFIER ::= { pkcs-7 6 }
 
+-- begin added for VCE SCEP-support
+id-VeriSign        OBJECT IDENTIFIER ::= {2 16 us(840) 1  veriSign(113733)}
+id-pki             OBJECT IDENTIFIER ::= {id-VeriSign pki(1)}
+id-attributes      OBJECT IDENTIFIER ::= {id-pki attributes(9)}
+id-messageType     OBJECT IDENTIFIER ::= {id-attributes messageType(2)}
+id-pkiStatus       OBJECT IDENTIFIER ::= {id-attributes pkiStatus(3)}
+id-failInfo        OBJECT IDENTIFIER ::= {id-attributes failInfo(4)}
+id-senderNonce     OBJECT IDENTIFIER ::= {id-attributes senderNonce(5)}
+id-recipientNonce  OBJECT IDENTIFIER ::= {id-attributes recipientNonce(6)}
+id-transId         OBJECT IDENTIFIER ::= {id-attributes transId(7)}
+id-extensionReq    OBJECT IDENTIFIER ::= {id-attributes extensionReq(8)}
+-- end added for VCE SCEP-support
+
+
 END
diff --git a/lib/public_key/asn1/RFC5639.asn1 b/lib/public_key/asn1/RFC5639.asn1
new file mode 100644
index 0000000000..85b8533132
--- /dev/null
+++ b/lib/public_key/asn1/RFC5639.asn1
@@ -0,0 +1,27 @@
+RFC5639 {iso(1) identified-organization(3) teletrust(36) algorithm(3) signature-algorithm(3) ecSign(2) 8} DEFINITIONS EXPLICIT TAGS ::=
+
+BEGIN
+
+ecStdCurvesAndGeneration OBJECT IDENTIFIER::= {iso(1)
+      identified-organization(3) teletrust(36) algorithm(3) signature-algorithm(3) ecSign(2) 8}
+
+ellipticCurveRFC5639 OBJECT IDENTIFIER ::= {ecStdCurvesAndGeneration 1}
+
+versionOne OBJECT IDENTIFIER ::= {ellipticCurveRFC5639 1}
+
+brainpoolP160r1 OBJECT IDENTIFIER ::= {versionOne 1}
+brainpoolP160t1 OBJECT IDENTIFIER ::= {versionOne 2}
+brainpoolP192r1 OBJECT IDENTIFIER ::= {versionOne 3}
+brainpoolP192t1 OBJECT IDENTIFIER ::= {versionOne 4}
+brainpoolP224r1 OBJECT IDENTIFIER ::= {versionOne 5}
+brainpoolP224t1 OBJECT IDENTIFIER ::= {versionOne 6}
+brainpoolP256r1 OBJECT IDENTIFIER ::= {versionOne 7}
+brainpoolP256t1 OBJECT IDENTIFIER ::= {versionOne 8}
+brainpoolP320r1 OBJECT IDENTIFIER ::= {versionOne 9}
+brainpoolP320t1 OBJECT IDENTIFIER ::= {versionOne 10}
+brainpoolP384r1 OBJECT IDENTIFIER ::= {versionOne 11}
+brainpoolP384t1 OBJECT IDENTIFIER ::= {versionOne 12}
+brainpoolP512r1 OBJECT IDENTIFIER ::= {versionOne 13}
+brainpoolP512t1 OBJECT IDENTIFIER ::= {versionOne 14}
+
+END
diff --git a/lib/public_key/doc/src/book.xml b/lib/public_key/doc/src/book.xml
index f8d1205e57..154a111066 100644
--- a/lib/public_key/doc/src/book.xml
+++ b/lib/public_key/doc/src/book.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/public_key/doc/src/cert_records.xml b/lib/public_key/doc/src/cert_records.xml
index c9249d40c3..79e5cb219d 100644
--- a/lib/public_key/doc/src/cert_records.xml
+++ b/lib/public_key/doc/src/cert_records.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/public_key/doc/src/fascicules.xml b/lib/public_key/doc/src/fascicules.xml
index 5f41826c56..25e7008537 100644
--- a/lib/public_key/doc/src/fascicules.xml
+++ b/lib/public_key/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/public_key/doc/src/introduction.xml b/lib/public_key/doc/src/introduction.xml
index 4b59cc2245..bf11a092d8 100644
--- a/lib/public_key/doc/src/introduction.xml
+++ b/lib/public_key/doc/src/introduction.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 47b3e60afd..1dce718ea3 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -34,6 +34,52 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Public_Key 0.21</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a little typo in public_key documentation. Thanks
+	    to Tomas Morstein.</p>
+          <p>
+	    Own Id: OTP-11380</p>
+        </item>
+        <item>
+          <p>
+	    public_key: Workaround for incorrectly encoded utf8
+	    emailAddress. Thanks to Andrew Bennett.</p>
+          <p>
+	    Own Id: OTP-11470</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Public_Key 0.20</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Extend PKCS-7 to support SCEP (Simple Certificate
+	    Enrollment Protocol).</p>
+          <p>
+	    Own Id: OTP-10874</p>
+        </item>
+        <item>
+          <p>
+	    public_key:pem_entry_decode/2 now handles AES-128-CBC
+	    ciphered keys. Thanks to Simon Cornish.</p>
+          <p>
+	    Own Id: OTP-11281</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Public_Key 0.19</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/public_key/doc/src/part.xml b/lib/public_key/doc/src/part.xml
index 08fa4eec58..51e628aa90 100644
--- a/lib/public_key/doc/src/part.xml
+++ b/lib/public_key/doc/src/part.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/lib/public_key/doc/src/part_notes.xml b/lib/public_key/doc/src/part_notes.xml
index f855e76a6d..285f16f380 100644
--- a/lib/public_key/doc/src/part_notes.xml
+++ b/lib/public_key/doc/src/part_notes.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index bce6d58682..fc3479cb64 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -71,7 +71,7 @@
     <p>Use the following include directive to get access to the 
     records and constant macros described here and in the User's Guide.</p>
     
-    <code> -include_lib("public_key/include/public_key.hrl"). </code>
+    <code> -include_lib("public_key/include/public_key.hrl").</code>
 
     <p><em>Data Types </em></p>
     
@@ -84,44 +84,49 @@
     <p><code>der_encoded() = binary()</code></p>
    
     <p><code>pki_asn1_type() = 'Certificate' | 'RSAPrivateKey'| 'RSAPublicKey' |
-    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' | 'SubjectPublicKeyInfo' |
-    'PrivateKeyInfo' | 'CertificationRequest' | 'ECPrivateKey'|
-    'EcpkParameters'</code></p>
+    'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter' |
+    'SubjectPublicKeyInfo' | 'PrivateKeyInfo' |
+    'CertificationRequest' | 'ECPrivateKey' | 'EcpkParameters'</code></p>
     
     <p><code>pem_entry () = {pki_asn1_type(), binary(), %% DER or encrypted DER
-          not_encrypted | cipher_info()} </code></p>
+    not_encrypted | cipher_info()}</code></p>
 
-    <p><code>cipher_info()  =  {"RC2-CBC | "DES-CBC" | "DES-EDE3-CBC", crypto:rand_bytes(8)} |
-    'PBES2-params'} </code></p>
+    <p><code>cipher_info()  =  {"RC2-CBC | "DES-CBC" | "DES-EDE3-CBC",
+    crypto:rand_bytes(8)} | 'PBES2-params'}</code></p>
 	  
+    <p><code>public_key()  = rsa_public_key() | dsa_public_key() | ec_public_key()</code></p>
+    <p><code>private_key() = rsa_private_key() | dsa_private_key() | ec_private_key()</code></p>
     <p><code>rsa_public_key()  = #'RSAPublicKey'{}</code></p>
 
-    <p><code>rsa_private_key() = #'RSAPrivateKey'{} </code></p>
+    <p><code>rsa_private_key() = #'RSAPrivateKey'{}</code></p>
 
-    <p><code>dsa_public_key() = {integer(),  #'Dss-Parms'{}} </code></p>
+    <p><code>dsa_public_key()  = {integer(),  #'Dss-Parms'{}}</code></p>
 
     <p><code>dsa_private_key() = #'DSAPrivateKey'{}</code></p>
 
-    <p><code>ec_public_key()  = {#'ECPoint'{}, #'EcpkParameters'{} | {namedCurve, oid()}} </code></p>
+    <p><code>ec_public_key()   = {#'ECPoint'{}, #'EcpkParameters'{} |
+    {namedCurve, oid()}}</code></p>
     
     <p><code>ec_private_key()  = #'ECPrivateKey'{}</code></p>
 
-    <p><code> public_crypt_options() = [{rsa_pad, rsa_padding()}]. </code></p>
+    <p><code>public_crypt_options() = [{rsa_pad, rsa_padding()}].</code></p>
 
-    <p><code> rsa_padding() =  'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding'
-    | 'rsa_no_padding'</code></p>
+    <p><code>rsa_padding() =  'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' |
+    'rsa_no_padding'</code></p>
     
-    <p><code> rsa_digest_type()  = 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' | 'sha512' </code></p>
+    <p><code>rsa_digest_type()   = 'md5' | 'sha' | 'sha224' | 'sha256' | 'sha384' |
+    'sha512'</code></p>
 
-    <p><code> dss_digest_type()  = 'sha' </code></p>
+    <p><code>dss_digest_type()   = 'sha'</code></p>
 
-    <p><code> ecdsa_digest_type()  = 'sha'| 'sha224' | 'sha256' | 'sha384' | 'sha512' </code></p>
+    <p><code>ecdsa_digest_type() = 'sha'| 'sha224' | 'sha256' | 'sha384' | 'sha512'</code></p>
 
-    <p><code> crl_reason()  = unspecified | keyCompromise | cACompromise | affiliationChanged | superseded | cessationOfOperation | certificateHold | privilegeWithdrawn |  aACompromise
-    </code></p>
+    <p><code>crl_reason()  = unspecified | keyCompromise | cACompromise |
+    affiliationChanged | superseded | cessationOfOperation |
+    certificateHold | privilegeWithdrawn | aACompromise</code></p>
 
-    <p><code> ssh_file()  = openssh_public_key | rfc4716_public_key |
-    known_hosts | auth_keys </code></p>
+    <p><code>ssh_file()  = openssh_public_key | rfc4716_public_key | known_hosts |
+    auth_keys</code></p>
     
 <!--     <p><code>policy_tree() = [Root, Children]</code></p> -->
     
@@ -430,7 +435,7 @@
        constructing the input to this function and that should be run through the <c>verify_fun</c>.</d>
        <v> CertChain = [der_encode()]</v>
        <d>A list of DER encoded certificates in trust order ending with the peer certificate.</d>
-       <v> Options = proplists:proplists()</v>
+       <v> Options = proplists:proplist()</v>
        <v>PublicKeyInfo = {?'rsaEncryption' | ?'id-dsa',
        rsa_public_key() | integer(), 'NULL' | 'Dss-Parms'{}}</v>
        <v> PolicyTree = term() </v>
@@ -492,7 +497,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
      <type>
        <v> OTPCertificate =  #'OTPCertificate'{}</v>
        <v> DPAndCRLs  = [{DP::#'DistributionPoint'{} ,CRL::#'CertificateList'{}}] </v>
-       <v> Options = proplists:proplists()</v>
+       <v> Options = proplists:proplist()</v>
        <v> CRLStatus() =  valid | {bad_cert, revocation_status_undetermined} |
        {bad_cert, {revoked, crl_reason()}}</v>
      </type>
diff --git a/lib/public_key/doc/src/public_key_records.xml b/lib/public_key/doc/src/public_key_records.xml
index e39ad0ec64..13bb996f7f 100644
--- a/lib/public_key/doc/src/public_key_records.xml
+++ b/lib/public_key/doc/src/public_key_records.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/public_key/doc/src/ref_man.xml b/lib/public_key/doc/src/ref_man.xml
index 285cc36c6f..b7078891d4 100644
--- a/lib/public_key/doc/src/ref_man.xml
+++ b/lib/public_key/doc/src/ref_man.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/public_key/doc/src/using_public_key.xml b/lib/public_key/doc/src/using_public_key.xml
index 5d9f1536d9..450bd7e35f 100644
--- a/lib/public_key/doc/src/using_public_key.xml
+++ b/lib/public_key/doc/src/using_public_key.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -90,7 +90,7 @@
 [{'RSAPrivateKey',&lt;&lt;224,108,117,203,152,40,15,77,128,126,
                     221,195,154,249,85,208,202,251,109,
                     119,120,57,29,89,19,9,...&gt;&gt;,
-                  {"DES-EDE3-CBC",&lt;&lt;"k�e��p�L"&gt;&gt;}}]
+                  {"DES-EDE3-CBC",&lt;&lt;"kÙeø¼pµL"&gt;&gt;}}]
 
     </code>
 
@@ -350,7 +350,7 @@ ok</code>
 
     <p> or </p>
 
-    <code>1> PemBin = public_key:pem_entry_encode('SubjectPublicKeyInfo', RSAPubKey).
+    <code>1> PemEntry = public_key:pem_entry_encode('SubjectPublicKeyInfo', RSAPubKey).
 {'SubjectPublicKeyInfo', &lt;&lt;48,92...&gt;&gt;, not_encrypted}
 
 2> PemBin = public_key:pem_encode([PemEntry]).
diff --git a/lib/public_key/include/public_key.hrl b/lib/public_key/include/public_key.hrl
index 1e882e76ee..c6394115e3 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %% 
 %% The 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,7 +76,6 @@
 	  point
 	 }).
 
-
 -define(unspecified, 0).
 -define(keyCompromise, 1).
 -define(cACompromise, 2).
@@ -88,22 +87,4 @@
 -define(privilegeWithdrawn, 9).
 -define(aACompromise, 10).
 
--type public_key()           ::  rsa_public_key() | dsa_public_key().
--type rsa_public_key()       ::  #'RSAPublicKey'{}.
--type rsa_private_key()      ::  #'RSAPrivateKey'{}.
--type dsa_private_key()      ::  #'DSAPrivateKey'{}.
--type dsa_public_key()       :: {integer(), #'Dss-Parms'{}}.
--type ec_public_key()        :: {#'ECPoint'{},{namedCurve, Oid::tuple()} | #'ECParameters'{}}.
--type ec_private_key()       :: #'ECPrivateKey'{}.
--type der_encoded()          :: binary().
--type decrypt_der()          :: binary().
--type pki_asn1_type()        ::  'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey'
-			       | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter'
-                               | 'SubjectPublicKeyInfo' | 'CertificationRequest' | 'CertificateList'.
--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
--type ssh_file()             :: openssh_public_key | rfc4716_public_key | known_hosts |
-				auth_keys.
-
 -endif. % -ifdef(public_key).
diff --git a/lib/public_key/src/pubkey_cert_records.erl b/lib/public_key/src/pubkey_cert_records.erl
index 0449129809..9a8e49f265 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,15 @@ transform(#'AttributeTypeAndValue'{type=Id,value=Value0} = ATAV, Func) ->
 		    {ok, {printableString, ASCCI}} ->
 			{ok, ASCCI}
 		end;
+	    'EmailAddress' when Func == decode ->
+		%% Workaround that some certificates break the ASN-1 spec
+		%% and encode emailAddress as utf8
+		case 'OTP-PUB-KEY':Func('OTP-emailAddress', Value0) of
+		    {ok, {utf8String, Utf8Value}} ->
+			{ok, unicode:characters_to_list(Utf8Value)};
+		    {ok, {ia5String, Ia5Value}} ->
+			{ok, Ia5Value}
+		end;
             Type when is_atom(Type) -> 'OTP-PUB-KEY':Func(Type, Value0);
             _UnknownType            -> {ok, Value0}
         end,
@@ -90,7 +99,7 @@ transform(Other,_) ->
     Other.
 
 %%--------------------------------------------------------------------
--spec supportedPublicKeyAlgorithms(Oid::tuple()) -> asn1_type().
+-spec supportedPublicKeyAlgorithms(Oid::tuple()) -> public_key:asn1_type().
 %%
 %% Description: Returns the public key type for an algorithm
 %% identifier tuple as found in SubjectPublicKeyInfo.
@@ -138,6 +147,20 @@ namedCurves(?'sect163r1') -> sect163r1;
 namedCurves(?'sect163k1') -> sect163k1;
 namedCurves(?'secp256r1') -> secp256r1;
 namedCurves(?'secp192r1') -> secp192r1;
+namedCurves(?'brainpoolP160r1') -> brainpoolP160r1;
+namedCurves(?'brainpoolP160t1') -> brainpoolP160t1;
+namedCurves(?'brainpoolP192r1') -> brainpoolP192r1;
+namedCurves(?'brainpoolP192t1') -> brainpoolP192t1;
+namedCurves(?'brainpoolP224r1') -> brainpoolP224r1;
+namedCurves(?'brainpoolP224t1') -> brainpoolP224t1;
+namedCurves(?'brainpoolP256r1') -> brainpoolP256r1;
+namedCurves(?'brainpoolP256t1') -> brainpoolP256t1;
+namedCurves(?'brainpoolP320r1') -> brainpoolP320r1;
+namedCurves(?'brainpoolP320t1') -> brainpoolP320t1;
+namedCurves(?'brainpoolP384r1') -> brainpoolP384r1;
+namedCurves(?'brainpoolP384t1') -> brainpoolP384t1;
+namedCurves(?'brainpoolP512r1') -> brainpoolP512r1;
+namedCurves(?'brainpoolP512t1') -> brainpoolP512t1;
 
 namedCurves(sect571r1) -> ?'sect571r1';
 namedCurves(sect571k1) -> ?'sect571k1';
@@ -171,7 +194,21 @@ namedCurves(sect239k1) -> ?'sect239k1';
 namedCurves(sect163r1) -> ?'sect163r1';
 namedCurves(sect163k1) -> ?'sect163k1';
 namedCurves(secp256r1) -> ?'secp256r1';
-namedCurves(secp192r1) -> ?'secp192r1'.
+namedCurves(secp192r1) -> ?'secp192r1';
+namedCurves(brainpoolP160r1) -> ?'brainpoolP160r1';
+namedCurves(brainpoolP160t1) -> ?'brainpoolP160t1';
+namedCurves(brainpoolP192r1) -> ?'brainpoolP192r1';
+namedCurves(brainpoolP192t1) -> ?'brainpoolP192t1';
+namedCurves(brainpoolP224r1) -> ?'brainpoolP224r1';
+namedCurves(brainpoolP224t1) -> ?'brainpoolP224t1';
+namedCurves(brainpoolP256r1) -> ?'brainpoolP256r1';
+namedCurves(brainpoolP256t1) -> ?'brainpoolP256t1';
+namedCurves(brainpoolP320r1) -> ?'brainpoolP320r1';
+namedCurves(brainpoolP320t1) -> ?'brainpoolP320t1';
+namedCurves(brainpoolP384r1) -> ?'brainpoolP384r1';
+namedCurves(brainpoolP384t1) -> ?'brainpoolP384t1';
+namedCurves(brainpoolP512r1) -> ?'brainpoolP512r1';
+namedCurves(brainpoolP512t1) -> ?'brainpoolP512t1'.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
diff --git a/lib/public_key/src/pubkey_pbe.erl b/lib/public_key/src/pubkey_pbe.erl
index 6f0be53db9..460624163b 100644
--- a/lib/public_key/src/pubkey_pbe.erl
+++ b/lib/public_key/src/pubkey_pbe.erl
@@ -66,7 +66,13 @@ decode(Data, Password,"DES-EDE3-CBC" = Cipher, KeyDevParams) ->
 
 decode(Data, Password,"RC2-CBC"= Cipher, KeyDevParams) ->
     {Key, IV} = password_to_key_and_iv(Password, Cipher, KeyDevParams),
-    crypto:block_decrypt(rc2_cbc, Key, IV, Data).
+    crypto:block_decrypt(rc2_cbc, Key, IV, Data);
+
+decode(Data, Password,"AES-128-CBC"= Cipher, IV) ->
+    %% PKCS5_SALT_LEN is 8 bytes
+    <<Salt:8/binary,_/binary>> = IV,
+    {Key, _} = password_to_key_and_iv(Password, Cipher, Salt),
+    crypto:block_decrypt(aes_cbc128, Key, IV, Data).
 
 %%--------------------------------------------------------------------
 -spec pbdkdf1(string(), iodata(), integer(), atom()) -> binary().
@@ -200,7 +206,9 @@ derived_key_length(Cipher,_) when (Cipher == ?'rc2CBC') or
     16;
 derived_key_length(Cipher,_) when (Cipher == ?'des-EDE3-CBC') or 
 				  (Cipher == "DES-EDE3-CBC") ->
-    24.
+    24;
+derived_key_length(Cipher,_) when (Cipher == "AES-128-CBC") ->
+    16.
 
 cipher(#'PBES2-params_encryptionScheme'{algorithm = ?'desCBC'}) ->
     "DES-CBC";
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index 746d142ec3..3a1653d989 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -51,7 +51,7 @@
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec decode(binary()) -> [pem_entry()].
+-spec decode(binary()) -> [public_key:pem_entry()].
 %%
 %% Description: Decodes a PEM binary.
 %%--------------------------------------------------------------------		    
@@ -59,7 +59,7 @@ decode(Bin) ->
     decode_pem_entries(split_bin(Bin), []).
 
 %%--------------------------------------------------------------------
--spec encode([pem_entry()]) -> iolist().
+-spec encode([public_key:pem_entry()]) -> iolist().
 %%
 %% Description: Encodes a list of PEM entries.
 %%--------------------------------------------------------------------		    
@@ -67,7 +67,7 @@ encode(PemEntries) ->
     encode_pem_entries(PemEntries).
 
 %%--------------------------------------------------------------------
--spec decipher({pki_asn1_type(), DerEncrypted::binary(),
+-spec decipher({public_key:pki_asn1_type(), DerEncrypted::binary(),
 		{Cipher :: string(), Salt :: iodata() | #'PBES2-params'{}}},
 	       string()) -> Der::binary().
 %%
diff --git a/lib/public_key/src/pubkey_ssh.erl b/lib/public_key/src/pubkey_ssh.erl
index 41280b9e14..0522ea6ac3 100644
--- a/lib/public_key/src/pubkey_ssh.erl
+++ b/lib/public_key/src/pubkey_ssh.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
 %%
 %% The 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,7 +35,8 @@
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec decode(binary(), public_key | ssh_file()) -> [{public_key(), Attributes::list()}].
+-spec decode(binary(), public_key | public_key:ssh_file()) -> 
+		    [{public_key:public_key(), Attributes::list()}].
 %%
 %% Description: Decodes a ssh file-binary.
 %%--------------------------------------------------------------------
@@ -52,7 +53,7 @@ decode(Bin, Type) ->
     openssh_decode(Bin, Type).
 
 %%--------------------------------------------------------------------
--spec encode([{public_key(), Attributes::list()}], ssh_file()) ->
+-spec encode([{public_key:public_key(), Attributes::list()}], public_key:ssh_file()) ->
 		    binary().
 %%
 %% Description: Encodes a list of ssh file entries.
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index aacd3b866d..5278732c87 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,8 +1,21 @@
 %% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
 {"%VSN%",
- [
-  {<<"0\\.*">>,  [{restart_application, public_key}]}
- ],
- [
-  {<<"0\\.*">>,  [{restart_application, public_key}]}
- ]}.
+ [{<<".*">>,[{restart_application, public_key}]}],
+ [{<<".*">>,[{restart_application, public_key}]}]
+}.
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index cdbfe6e07c..a732455aa7 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,27 @@
 	 pkix_crls_validate/3
 	]).
 
+-export_type([public_key/0, private_key/0, pem_entry/0,
+	      pki_asn1_type/0, asn1_type/0, ssh_file/0, der_encoded/0]).
+
+-type public_key()           ::  rsa_public_key() | dsa_public_key() | ec_public_key().
+-type private_key()          ::  rsa_private_key() | dsa_private_key() | ec_private_key().
+
+-type rsa_public_key()       ::  #'RSAPublicKey'{}.
+-type rsa_private_key()      ::  #'RSAPrivateKey'{}.
+-type dsa_private_key()      ::  #'DSAPrivateKey'{}.
+-type dsa_public_key()       :: {integer(), #'Dss-Parms'{}}.
+-type ec_public_key()        :: {#'ECPoint'{},{namedCurve, Oid::tuple()} | #'ECParameters'{}}.
+-type ec_private_key()       :: #'ECPrivateKey'{}.
+-type der_encoded()          :: binary().
+-type pki_asn1_type()        ::  'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey'
+			       | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter'
+                               | 'SubjectPublicKeyInfo' | 'CertificationRequest' | 'CertificateList'.
+-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
+-type ssh_file()             :: openssh_public_key | rfc4716_public_key | known_hosts |
+				auth_keys.
 -type rsa_padding()          :: 'rsa_pkcs1_padding' | 'rsa_pkcs1_oaep_padding' 
 			      | 'rsa_no_padding'.
 -type public_crypt_options() :: [{rsa_pad, rsa_padding()}].
@@ -118,6 +139,13 @@ pem_entry_decode({Asn1Type, CryptDer, {Cipher, Salt}} = PemEntry,
 				is_list(Cipher) andalso
 				is_binary(Salt) andalso
 				erlang:byte_size(Salt) == 8 ->
+    do_pem_entry_decode(PemEntry, Password);
+pem_entry_decode({Asn1Type, CryptDer, {"AES-128-CBC"=Cipher, IV}} = PemEntry,
+		 Password) when is_atom(Asn1Type) andalso
+				is_binary(CryptDer) andalso
+				is_list(Cipher) andalso
+				is_binary(IV) andalso
+				erlang:byte_size(IV) == 16 ->
     do_pem_entry_decode(PemEntry, Password).
 
 %%--------------------------------------------------------------------
@@ -326,7 +354,7 @@ encrypt_private(PlainText,
     crypto:private_encrypt(rsa, PlainText, format_rsa_private_key(Key), Padding).
 
 %%--------------------------------------------------------------------
--spec generate_key(#'DHParameter'{} | {namedCurve, Name ::atom()} |
+-spec generate_key(#'DHParameter'{} | {namedCurve, Name ::oid()} |
 		   #'ECParameters'{}) -> {Public::binary(), Private::binary()} |
 					    #'ECPrivateKey'{}.
 %% Description: Generates a new keypair
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 254601b107..b68ffbd5fd 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -42,6 +42,7 @@ groups() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    application:stop(crypto),
     try crypto:start() of
 	ok ->
 	    Config
@@ -217,6 +218,14 @@ encrypted_private_key_info(Config) when is_list(Config) ->
     [{'PrivateKeyInfo', _, {"RC2-CBC",_}} = PubEntry2] = PemRc2Entry,
     KeyInfo = public_key:pem_entry_decode(PubEntry2, "password"),
 
+    %% key generated with ssh-keygen -N hello_aes -f aes_128_cbc_enc_key
+    {ok, PemAesCbc} = file:read_file(filename:join(Datadir, "aes_128_cbc_enc_key")),
+
+    PemAesCbcEntry = public_key:pem_decode(PemAesCbc),
+    ct:print("Pem entry: ~p" , [PemAesCbcEntry]),
+    [{'RSAPrivateKey', _, {"AES-128-CBC",_}} = PubAesCbcEntry] = PemAesCbcEntry,
+    #'RSAPrivateKey'{} = public_key:pem_entry_decode(PubAesCbcEntry, "hello_aes"),
+
     check_key_info(KeyInfo).
 
 
diff --git a/lib/public_key/test/pbe_SUITE_data/aes_128_cbc_enc_key b/lib/public_key/test/pbe_SUITE_data/aes_128_cbc_enc_key
new file mode 100644
index 0000000000..34c7543f30
--- /dev/null
+++ b/lib/public_key/test/pbe_SUITE_data/aes_128_cbc_enc_key
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,D64FF97327558643763BE17BD50FDDAD
+
+oS4LbrLbQHPxfQILHl0KPswnkC1QqJ4RX6SkcQGVoYJJkPcavupABDYD1PSJf/MD
+aPiN2OHsYAFLHxa1NGEAH6wKSvgdUJyaQ6jbSBNh9we9p2i3tpMnWsJMCZzXsCQh
+RJj23/cFhb2UsqPM3OH6x6/VxX5VmD9Dnt1iU9b+WS6KdU45zP+QWpRd54uBrFab
+Pw0kW7o84VFH6ahUDnzT8JUIk4P4G43G2F7wrOCbiK6AS0S8sCh5E83MrGEoJ6jB
+NIW4xnLdBOLeV65NTgwWEn7bjLz+8IYSg2/wodjj5GL/ciMgiF+/krdQhzbHJhcm
+dXV3SB/lTyjYUUGYU/3wm10f0iLJLFZxVU70yfV0eKhdYtWdR+2RxZjHvstBTGoI
+BMtcaGwfMBh3wBHjS2M9AVh35DUYQIGW6QATf1VF+chhgESj6Qktkmfe4R9uAhP0
+r8Qkql/lq19K653c6ZIcUIYWvpAQ4Y/Q6Fdd92GY45FQdXYlZ/dXkwdq+ZYAhe6g
+GUNmpwHf5N2a6lgXR3YytPYdhQbYMdy29RjXJsFWJh3sKTxgG/Y+FX2Ua7J1G4IW
+wO6yZgQc9GyYzNn1TpT/TQ32GuHbw0u/oQqbNOJEjE0BTsQelEPpnNnEmkgPqSlI
+3PNtsBvS6antvJ3CiCnmkQlT7/dLR9ym8nU+jo/hrtIStNUrdopCLB4+iUt7tJdz
+jpW3Kc5fWmnGbp1UOXHoOghENfjIN+yUxIx9qCgBmWliY1nncUgzEHM34eGqGdek
+nf6PowS4gIbJmO5Uc+0MwPld5HFou21da2M48FKolp3+CO1mX5MhvMLGVoFqNiE3
+dXYJG4bcMdxZncdaMn+c6ycA9iFTufF/qZPF/rGO5I+gc9M50bJjewbixqXM/LJ5
+1OnP/x7DN1Td3PTjAfjFX9yLWRMIjbihG43Htk5bOifaBtnOYj1e7WMjN8uBx91x
+OCnfC3rngF4B9WmdYEkEvp9QZixbDlp0oh6/4HiRjjDkUfADnKuU/At7dd8sDOGD
+NgaWVskJsulp8d9s3CozM7LmowlNpHV9BvAguckx/B7ZqV10mgAKOqZKk4LDlu2Y
+MgQvSLJfyJsz/1q4z4jcXhYtSuZXXHk9lX9dgCZbQfVGnlsptNuV5KwupV2cz0Vi
+Uh1mwvDXWFNIFwexZi0z27FJ1pKAKK+sf/GFqoAvdmYgYS6d5bmxh68bGZMZ2C6P
+eehHkEZm1pv4CVDxrUTk+bNtqhDXglSdfxR0Xm1QDN95hM0dHq1kDZH6HgD6krJ6
+BBfd7mPRExH3+5JSQXoSUDO8LqP5phxLWKS0B8HDburnP/x9QzBOIKvmtDF1lQEk
+FAI/6Lv8GJ0R7WYd2vFfGeqS94iw1BpmO/xS6WINOFpfwVCBuuYmLEdEWcXJgvy9
+zyaTX/mk1RMXo7I1X7aWviaIF7ykGxs1dJdrxQonwJ3oyTySNl2xf8bziKlqB/Ml
+LDjeMNX91G8fJE0MdKPWd94PUoLN0CutM5sY5yHzwCvJQV9oQ1qvrQYUbnvtCEyQ
+xT+bawt+ODgVb/QnyNeiIyEN5lXc8meJFLr1uMeEwX8WaJ7/KBKGk1V0XqVZTmga
+-----END RSA PRIVATE KEY-----
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index 9180fa968b..699481b20f 100644
--- a/lib/public_key/test/pkits_SUITE.erl
+++ b/lib/public_key/test/pkits_SUITE.erl
@@ -111,6 +111,7 @@ groups() ->
 
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
+    application:stop(crypto),
     try crypto:start() of
 	ok ->
 	    application:start(asn1),
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index f2596e3d85..163f5f4413 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -36,17 +36,17 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app,
+    [app, appup,
      {group, pem_decode_encode},
      {group, ssh_public_key_decode_encode},
      encrypt_decrypt,
      {group, sign_verify},
-     pkix, pkix_countryname, pkix_path_validation,
+     pkix, pkix_countryname, pkix_emailaddress, pkix_path_validation,
      pkix_iso_rsa_oid, pkix_iso_dsa_oid].
 
 groups() -> 
     [{pem_decode_encode, [], [dsa_pem, rsa_pem, encrypted_pem,
-			      dh_pem, cert_pem, pkcs10_pem]},
+			      dh_pem, cert_pem, pkcs7_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,
@@ -56,6 +56,7 @@ groups() ->
     ].
 %%-------------------------------------------------------------------
 init_per_suite(Config) ->
+    application:stop(crypto),
     try crypto:start() of
 	ok ->
 	    application:start(asn1),
@@ -94,6 +95,13 @@ app(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
+appup() ->
+    [{doc, "Test that the public_key appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(public_key).
+
+%%--------------------------------------------------------------------
+
 dsa_pem() ->
     [{doc, "DSA PEM-file decode/encode"}].
 dsa_pem(Config) when is_list(Config) ->
@@ -187,15 +195,9 @@ dh_pem() ->
     [{doc, "DH parametrs PEM-file decode/encode"}].
 dh_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
-    [{'DHParameter', DerDH, not_encrypted} = Entry] =
+    [{'DHParameter', _DerDH, not_encrypted} = Entry] =
 	erl_make_certs:pem_to_der(filename:join(Datadir, "dh.pem")),
-
-    erl_make_certs:der_to_pem(filename:join(Datadir, "new_dh.pem"), [Entry]),
-
-    DHParameter = public_key:der_decode('DHParameter', DerDH),
-    DHParameter = public_key:pem_entry_decode(Entry),
-
-    Entry = public_key:pem_entry_encode('DHParameter', DHParameter).
+    asn1_encode_decode(Entry).
 
 %%--------------------------------------------------------------------
 
@@ -203,57 +205,38 @@ pkcs10_pem() ->
    [{doc, "PKCS-10 PEM-file decode/encode"}].
 pkcs10_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
-    [{'CertificationRequest', DerPKCS10, not_encrypted} = Entry] =
+    [{'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).
-
+    asn1_encode_decode(Entry).
 %%--------------------------------------------------------------------
 pkcs7_pem() ->
     [{doc, "PKCS-7 PEM-file decode/encode"}].
 pkcs7_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
-    [{'ContentInfo', DerPKCS7, not_encrypted} = Entry] =
+    [{'ContentInfo', _, not_encrypted} = Entry0] =
 	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).
-
+    [{'ContentInfo', _, not_encrypted} = Entry1] =
+	erl_make_certs:pem_to_der(filename:join(Datadir, "pkcs7_ext.pem")),
+    asn1_encode_decode(Entry0),
+    asn1_encode_decode(Entry1).
+      
 %%--------------------------------------------------------------------
 cert_pem() ->
     [{doc, "Certificate PEM-file decode/encode"}].
 cert_pem(Config) when is_list(Config) ->
     Datadir = ?config(data_dir, Config),
-
-    [Entry0] =
-	erl_make_certs:pem_to_der(filename:join(Datadir, "dsa.pem")),
-
-    [{'Certificate', DerCert, not_encrypted} = Entry7] =  
+   
+    [{'Certificate', _, not_encrypted} = Entry0] =  
 	erl_make_certs:pem_to_der(filename:join(Datadir, "client_cert.pem")),
     
-    Cert = public_key:der_decode('Certificate', DerCert),
-    Cert = public_key:pem_entry_decode(Entry7),
+    asn1_encode_decode(Entry0),
     
-    CertEntries = [{'Certificate', _, not_encrypted} = CertEntry0, 
-		   {'Certificate', _, not_encrypted} = CertEntry1] = 
+    [{'Certificate', _, not_encrypted} = Entry1, 
+     {'Certificate', _, not_encrypted} = Entry2] = 
         erl_make_certs:pem_to_der(filename:join(Datadir, "cacerts.pem")),
-
-    ok = erl_make_certs:der_to_pem(filename:join(Datadir, "wcacerts.pem"), CertEntries), 
-    ok = erl_make_certs:der_to_pem(filename:join(Datadir, "wdsa.pem"), [Entry0]), 
     
-     NewCertEntries = erl_make_certs:pem_to_der(filename:join(Datadir, "wcacerts.pem")),
-     true = lists:member(CertEntry0, NewCertEntries),
-     true = lists:member(CertEntry1, NewCertEntries),
-    [Entry0] = erl_make_certs:pem_to_der(filename:join(Datadir, "wdsa.pem")).
+    asn1_encode_decode(Entry1),
+    asn1_encode_decode(Entry2).
 
 %%--------------------------------------------------------------------
 ssh_rsa_public_key() ->
@@ -610,9 +593,9 @@ pkix(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 pkix_countryname() ->
- [{doc, "Test workaround for certs that code x509countryname as utf8"}].
+    [{doc, "Test workaround for certs that code x509countryname as utf8"}].
 pkix_countryname(Config) when is_list(Config) ->
-    Cert = incorrect_pkix_cert(),
+    Cert = incorrect_countryname_pkix_cert(),
     OTPCert = public_key:pkix_decode_cert(Cert, otp),
     TBSCert = OTPCert#'OTPCertificate'.tbsCertificate,
     Issuer = TBSCert#'OTPTBSCertificate'.issuer,
@@ -621,6 +604,18 @@ pkix_countryname(Config) when is_list(Config) ->
     check_countryname(Subj).
 
 %%--------------------------------------------------------------------
+pkix_emailaddress() ->
+    [{doc, "Test workaround for certs that code emailAddress as utf8"}].
+pkix_emailaddress(Config) when is_list(Config) ->
+    Cert = incorrect_emailaddress_pkix_cert(),
+    OTPCert = public_key:pkix_decode_cert(Cert, otp),
+    TBSCert = OTPCert#'OTPCertificate'.tbsCertificate,
+    Issuer = TBSCert#'OTPTBSCertificate'.issuer,
+    Subj   = TBSCert#'OTPTBSCertificate'.subject,
+    check_emailaddress(Issuer),
+    check_emailaddress(Subj).
+
+%%--------------------------------------------------------------------
 pkix_path_validation() ->
     [{doc, "Test PKIX path validation"}].
 pkix_path_validation(Config) when is_list(Config) ->
@@ -719,6 +714,12 @@ pkix_iso_dsa_oid(Config) when is_list(Config) ->
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
+asn1_encode_decode({Asn1Type, Der, not_encrypted} = Entry) ->
+    Decoded = public_key:der_decode(Asn1Type, Der),
+    Decoded = public_key:pem_entry_decode(Entry),
+    Entry = public_key:pem_entry_encode(Asn1Type, Decoded),
+    ok.
+    
 check_countryname({rdnSequence,DirName}) ->
     do_check_countryname(DirName).
 do_check_countryname([]) ->
@@ -728,10 +729,23 @@ do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
     ok;
 do_check_countryname([#'AttributeTypeAndValue'{type = ?'id-at-countryName',
 					       value =  Value}|_]) ->
-    ct:fail({incorrect_cuntry_name, Value});
+    ct:fail({incorrect_country_name, Value});
 do_check_countryname([_| Rest]) ->
     do_check_countryname(Rest).
 
+check_emailaddress({rdnSequence,DirName}) ->
+    do_check_emailaddress(DirName).
+do_check_emailaddress([]) ->
+    ok;
+do_check_emailaddress([#'AttributeTypeAndValue'{type = ?'id-emailAddress',
+					       value = "[email protected]"}|_]) ->
+    ok;
+do_check_emailaddress([#'AttributeTypeAndValue'{type = ?'id-emailAddress',
+					       value =  Value}|_]) ->
+    ct:fail({incorrect_email_address, Value});
+do_check_emailaddress([_| Rest]) ->
+    do_check_emailaddress(Rest).
+
 check_entry_type(#'DSAPrivateKey'{}, 'DSAPrivateKey') ->
     true;
 check_entry_type(#'RSAPrivateKey'{}, 'RSAPrivateKey') ->
@@ -750,5 +764,8 @@ check_entry_type(_,_) ->
 strip_ending_newlines(Bin) ->
     string:strip(binary_to_list(Bin), right, 10).
 
-incorrect_pkix_cert() ->
+incorrect_countryname_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>>.
+
+incorrect_emailaddress_pkix_cert() ->
+    <<48,130,3,74,48,130,2,50,2,9,0,133,49,203,25,198,156,252,230,48,13,6,9,42,134, 72,134,247,13,1,1,5,5,0,48,103,49,11,48,9,6,3,85,4,6,19,2,65,85,49,19,48,17, 6,3,85,4,8,12,10,83,111,109,101,45,83,116,97,116,101,49,33,48,31,6,3,85,4,10, 12,24,73,110,116,101,114,110,101,116,32,87,105,100,103,105,116,115,32,80,116, 121,32,76,116,100,49,32,48,30,6,9,42,134,72,134,247,13,1,9,1,12,17,105,110, 118,97,108,105,100,64,101,109,97,105,108,46,99,111,109,48,30,23,13,49,51,49, 49,48,55,50,48,53,54,49,56,90,23,13,49,52,49,49,48,55,50,48,53,54,49,56,90, 48,103,49,11,48,9,6,3,85,4,6,19,2,65,85,49,19,48,17,6,3,85,4,8,12,10,83,111, 109,101,45,83,116,97,116,101,49,33,48,31,6,3,85,4,10,12,24,73,110,116,101, 114,110,101,116,32,87,105,100,103,105,116,115,32,80,116,121,32,76,116,100,49, 32,48,30,6,9,42,134,72,134,247,13,1,9,1,12,17,105,110,118,97,108,105,100,64, 101,109,97,105,108,46,99,111,109,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,190,243,49,213,219,60,232,105, 1,127,126,9,130,15,60,190,78,100,148,235,246,223,21,91,238,200,251,84,55,212, 78,32,120,61,85,172,0,144,248,5,165,29,143,79,64,178,51,153,203,76,115,238, 192,49,173,37,121,203,89,62,157,13,181,166,30,112,154,40,202,140,104,211,157, 73,244,9,78,236,70,153,195,158,233,141,42,238,2,143,160,225,249,27,30,140, 151,176,43,211,87,114,164,108,69,47,39,195,123,185,179,219,28,218,122,53,83, 77,48,81,184,14,91,243,12,62,146,86,210,248,228,171,146,225,87,51,146,155, 116,112,238,212,36,111,58,41,67,27,6,61,61,3,84,150,126,214,121,57,38,12,87, 121,67,244,37,45,145,234,131,115,134,58,194,5,36,166,52,59,229,32,47,152,80, 237,190,58,182,248,98,7,165,198,211,5,31,231,152,116,31,108,71,218,64,188, 178,143,27,167,79,15,112,196,103,116,212,65,197,94,37,4,132,103,91,217,73, 223,207,185,7,153,221,240,232,31,44,102,108,82,83,56,242,210,214,74,71,246, 177,217,148,227,220,230,4,176,226,74,194,37,2,3,1,0,1,48,13,6,9,42,134,72, 134,247,13,1,1,5,5,0,3,130,1,1,0,89,247,141,154,173,123,123,203,143,85,28,79, 73,37,164,6,17,89,171,224,149,22,134,17,198,146,158,192,241,41,253,58,230, 133,71,189,43,66,123,88,15,242,119,227,249,99,137,61,200,54,161,0,177,167, 169,114,80,148,90,22,97,78,162,181,75,93,209,116,245,46,81,232,64,157,93,136, 52,57,229,113,197,218,113,93,42,161,213,104,205,137,30,144,183,58,10,98,47, 227,177,96,40,233,98,150,209,217,68,22,221,133,27,161,152,237,46,36,179,59, 172,97,134,194,205,101,137,71,192,57,153,20,114,27,173,233,166,45,56,0,61, 205,45,202,139,7,132,103,248,193,157,184,123,43,62,172,236,110,49,62,209,78, 249,83,219,133,1,213,143,73,174,16,113,143,189,41,84,60,128,222,30,177,104, 134,220,52,239,171,76,59,176,36,113,176,214,118,16,44,235,21,167,199,216,200, 76,219,142,248,13,70,145,205,216,230,226,148,97,223,216,179,68,209,222,63, 140,137,24,164,192,149,194,79,119,247,75,159,49,116,70,241,70,116,11,40,119, 176,157,36,160,102,140,255,34,248,25,231,136,59>>.
diff --git a/lib/public_key/test/public_key_SUITE_data/pkcs7_ext.pem b/lib/public_key/test/public_key_SUITE_data/pkcs7_ext.pem
new file mode 100644
index 0000000000..d7a1d01fe1
--- /dev/null
+++ b/lib/public_key/test/public_key_SUITE_data/pkcs7_ext.pem
@@ -0,0 +1,62 @@
+-----BEGIN PKCS7-----
+MIILCAYJKoZIhvcNAQcCoIIK+TCCCvUCAQExDjAMBggqhkiG9w0CBQUAMIIFmwYJ
+KoZIhvcNAQcBoIIFjASCBYgwggWEBgkqhkiG9w0BBwOgggV1MIIFcQIBADGCAmQw
+ggJgAgEAMEgwPDELMAkGA1UEBhMCU0UxETAPBgNVBAoMCEVyaWNzc29uMRowGAYD
+VQQDDBFWQ19SQlNfU3ViQ0FfVjNfMQIIcw3ZS5VSTIwwDQYJKoZIhvcNAQEBBQAE
+ggIAFW0vd8wY2FJ87KVyUqcdK5uCmnjwC6uPbypDqnL44Fe4iAAiNOvmqt1Crm46
+pg9gOq50NbrRb+PY+UUM7lEUNNKZ61cul2iwGwp6r41l05EbMqgfsNoJkH+bTM8Y
+YhME4sT+AzdmPHIg1PGoM+pAMHzpjcdnaHFSlfSmwq5xfZwWelR2TDz7arO+AKCk
+DVIEnG9qHBrUWvDoT23VDVQQXP5Uja0Nml7B7Jt2RW2EKAiCAYDujkjIWcGy3F3X
+2Q+Nm4K2nJKnkdMI5kS0Eu9uHp24VHn98sEyqn8rDiLFOaj5BskQIVMDN6npssgr
+X4ChmBiVcquaxCoHMqQYGa/Jrd66C8WK2lQH3NpDCsULS+m6Z76bvXDFyL0K6rEP
+sOcn8J91LfB5jXeSvS3vi7zk07M/IwAL03fVKvqiKU65D4859AOgbjkGyytWG1iv
+t7ENh6GYHGJj71L+OlZZH25cJQ/2gGsYs4IYrT6w4Z1X5TscOL/tBiCDdTwcdT0q
++YdkL9ZONouHvgszb9IFvfFErzmmG7jTHwC/TzR0nC8vPog9+y05G4vnD1h7lzH7
+8xDsGrn86gcjYXXRPfc4AxDZfmaM8S0SFmd+O7B24sUKmSyxF3A7OVnb0/rTMuez
+Izoy6RW9WQpCJM5R9k7YFDI5lQI+PiKT8GqzQuFIFXRYwOIwggMCBgkqhkiG9w0B
+BwEwEQYFKw4DAgcECLsGKZ/iQ1HBgIIC4J1lxb/gn6EosJyMrTV8KnJxvD+Garzp
+zmrDNvl9Q7CHmpNLuW3dngU5JcB5dElq7B+j6+RXNkupcrd2dvllAmwfPpFblmNp
+Snsn99TTwDYv4LrpxNCcoIKSm93H28wfszhPv75zD9+/aIy4JK4UwYuv+p5JHfLW
+EhvWO4pxUc2YpB8jiUVKTJJcRohry/lwvXu5s8VjmpoADSflHtAA4DUhFKX2fafu
+Ux7muxbh7xFViNY6laQ/tuZuxxjs2Eb5aWWizO00cyLP2724vFQL+lnvyAvtSmcD
+z2hOeOvvch6sJ4krx/gFznqe/lVksPyJQOj+Or8RTbC26kV4GQwiuGqgp6zhNjYe
+4niPvGxVAFz8Qdv8Zu47fSHgI2nz5YlWuE2NiQ1qtCbMsf2k/NnZrTgx2oZxnZvL
+B2We2D0u6BRZo4XMvGUqOLlGIV5scusv39/sBblJGOwNjtekG/pIRmiHXuI+RQOX
+yr4tLR8clylf/HEMmYn2UVxXXuWsEr6zdBB3u3JhXhq+YmDpYYnTkxZq4nTz7oMY
+MicrF0+iUrun6lIAXEU6yOSPehje5PfZW5PqKlpugKYIQSsbuJ4t/8n/MczHbRk9
+CcIX05OeWUdxRPKYa7Jt8umXnuIqWu7s7uZpbiB/tmuW4Cp16xUv53SgrTm4tiMq
+b7O3ftMmEiFZ+uXds/ODfh7bTe4YlWdyimkCcyI4dcIjLxe+ifx4T+b4LktIc5Pd
+5MHwAN+F1yIWnPxi8Nep9Pnw4HiX/ZkL0jHG0msZgZ60jb1U3LV4w3VI1WrsjvJM
+6M+l7HM3xeTl9posjVQPxb7kyX5s6gDe4IaatPrNYcsDJ4t43v/se/nvlrQtkJzv
+D4S2a9l833kYIC0MvoT8dqJuwySPZxjK0Io69sd6Af1BTGBoSQL75pOntrQUhICl
+/kfjBkG5h6tpJFSZQEReK3Kg9rKIax5VwgQUte2yVu3EYARd3YZ7On+gggMTMIID
+DzCCAfegAwIBAgITAkxY3LTPyvVkS5SUobGvznBgQDANBgkqhkiG9w0BAQUFADBC
+MQswCQYDVQQGEwJTRTERMA8GA1UEChMIRXJpY3Nzb24xIDAeBgNVBAMTF0M4MjYx
+MjQ1ODEuZXJpY3Nzb24uY29tMB4XDTEzMDgyMTE1MTcwM1oXDTE0MDgyMTE1MTcw
+M1owQjELMAkGA1UEBhMCU0UxETAPBgNVBAoTCEVyaWNzc29uMSAwHgYDVQQDExdD
+ODI2MTI0NTgxLmVyaWNzc29uLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAPgg9zlAP6Z8vDMq+Ux0mq1RPLLtG2kByeauGvKdzbRLxtiyyKlknFQ8
+jdn8w3NrQiXTYSEcR0eDWjpLiwvkW2WC+lARIHUWQjRJWQIaSQ1lu9rDHlMYr2xm
+6EF6QDgr/9fqkY1IrF/gEAwnNQhT44qCzSr/jqmf5phd5qslzYlpYY97yeEihiCT
+wa/BNl1puS3+ayXI9e73Fpeysd0+TFjgbUwhUZn8kcKnDiynb19cyKzk4F1MQHwu
+QDFUkxtFcKMW8GikjEYy0Gw8CJUPl4SedtwoU4PGhWqgA/vYOPhdP6LfSBhTmU3s
+tUrFxUuMAiRF24JHdTj2bv+huDotWu0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+PtB1eG9FbriUPD79Kb5uyt15JoROPDBc3voR9HffqDsANyEJ3VPlvAFEyrQzbdnA
+V5slZRR7M5AJBha1K3BIR7Cs74BlCXiiuWi358HnPGsHqqJjKVxlTKJksrRLvUr4
+K2bG1kBniQU/PkSZjB1DbSwAqw4So9BKLbzQFE8888/yETeCIEWnG2YMiRe1GB0r
+P/88QJctNrsT5oLdZ9E4igcAoGna6UR71PJSFCBoJ5WsnofMf44gZr7bgg2szoZr
+KDPnrlsi9SM4nWzTaxSTjEp3397QMwEHosJxwXv/Zy5QyGBDYfynaTRUVS2BwIfo
+AqRdylyrbv/+3NBQxdERRjGCAigwggIkAgEBMFkwQjELMAkGA1UEBhMCU0UxETAP
+BgNVBAoTCEVyaWNzc29uMSAwHgYDVQQDExdDODI2MTI0NTgxLmVyaWNzc29uLmNv
+bQITAkxY3LTPyvVkS5SUobGvznBgQDAMBggqhkiG9w0CBQUAoIGiMBIGCmCGSAGG
++EUBCQIxBBMCMTkwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAfBgkqhkiG9w0B
+CQQxEgQQaEUDvpv6H163UM7zAQiMvDAgBgpghkgBhvhFAQkFMRIEEN4FI8tal3of
+ZTXKi1Ny2cswLwYKYIZIAYb4RQEJBzEhEx8yOUFBQjJFNTY5OUY1QjI1QTJEQUI3
+NDlGN0Q0QTFBMA0GCSqGSIb3DQEBAQUABIIBACnR54LqeHZ0u8bSErSnGupEytHK
+xbfShraXl3DFPnIZYs0HUuuriw5/BhkFHBsSXO8Oqm759/UgxOjnCUD2AKHenGoK
+LB0yqLGe/USBs0IkBv6lXg7HJhSDNqAPES6a5iUVIRv+M40Ldob570MKjZhERVPN
+AVSHMJHKmtVTZGt/VqiVk0qqZeV9nqhaSPFyW9pQU0PKep0lFltnwCHUTZiiqHuk
+SIpZFCmIgahAUcl/WrxiW4xC9L5+wBgsuaUU5LqLZwg3AFua0aaDs6NZXpSE0A43
+zm5whhmkVePjnSUUr78AoBRalsBdMkDwLoUZZ1Hhq+/WH+WW7TQ96zm+uzE=
+-----END PKCS7-----
+
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index b820f24d2a..3473757c5f 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.19
+PUBLIC_KEY_VSN = 0.21
diff --git a/lib/reltool/doc/src/book.xml b/lib/reltool/doc/src/book.xml
index f50d314711..660c81ddb6 100644
--- a/lib/reltool/doc/src/book.xml
+++ b/lib/reltool/doc/src/book.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
       <year>2009</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
index 598d3333f8..df81418677 100644
--- a/lib/reltool/doc/src/notes.xml
+++ b/lib/reltool/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -37,7 +37,24 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Reltool.</p>
 
-  <section><title>Reltool 0.6.4</title>
+  <section><title>Reltool 0.6.4.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The encoding of the <c>notes.xml</c> file has been
+	    changed from latin1 to utf-8 to avoid future merge
+	    problems.</p>
+          <p>
+	    Own Id: OTP-11310</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Reltool 0.6.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -61,7 +78,7 @@
 	    even if the application was explicitly excluded in the
 	    config. This has been changed and will only produce a
 	    warning. If the application is not explicitly excluded it
-	    will still cause reltool to fail. Thanks to H�kan
+	    will still cause reltool to fail. Thanks to Håkan
 	    Mattsson!</p>
           <p>
 	    Own Id: OTP-10988</p>
diff --git a/lib/reltool/doc/src/part.xml b/lib/reltool/doc/src/part.xml
index f78022a718..8f4f3731b8 100644
--- a/lib/reltool/doc/src/part.xml
+++ b/lib/reltool/doc/src/part.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2009</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/reltool/doc/src/ref_man.xml b/lib/reltool/doc/src/ref_man.xml
index 52602bd069..28e4ccfb28 100644
--- a/lib/reltool/doc/src/ref_man.xml
+++ b/lib/reltool/doc/src/ref_man.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>2009</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 8437b7a623..c08d4228f0 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/reltool/doc/src/reltool_examples.xml b/lib/reltool/doc/src/reltool_examples.xml
index 7dfe0cbff5..e56a59bfd5 100644
--- a/lib/reltool/doc/src/reltool_examples.xml
+++ b/lib/reltool/doc/src/reltool_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/reltool/doc/src/reltool_intro.xml b/lib/reltool/doc/src/reltool_intro.xml
index 54bc991da8..ddba29e3f4 100644
--- a/lib/reltool/doc/src/reltool_intro.xml
+++ b/lib/reltool/doc/src/reltool_intro.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2009</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/reltool/doc/src/reltool_usage.xml b/lib/reltool/doc/src/reltool_usage.xml
index 0041e60d8f..fa82b8c7d9 100644
--- a/lib/reltool/doc/src/reltool_usage.xml
+++ b/lib/reltool/doc/src/reltool_usage.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2009</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/reltool/src/reltool.appup.src b/lib/reltool/src/reltool.appup.src
index c02edd2afb..79ecdbd392 100644
--- a/lib/reltool/src/reltool.appup.src
+++ b/lib/reltool/src/reltool.appup.src
@@ -1,8 +1,7 @@
-%% This is an -*- erlang -*- file.
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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 +15,7 @@
 %% under the License.
 %%
 %% %CopyrightEnd%
-
 {"%VSN%",
- [ ]
+ [{<<".*">>,[{restart_application, reltool}]}],
+ [{<<".*">>,[{restart_application, reltool}]}]
 }.
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 9cda5dabd3..b59108d8dd 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -1455,10 +1455,11 @@ do_install(RelName, TargetDir) ->
 		{win32, _} ->
 		    NativeRootDir = nativename(TargetDir2),
 		    NativeErtsBinDir = nativename(ErtsBinDir),
-		    IniData = ["[erlang]\r\n",
-			       "Bindir=", NativeErtsBinDir, "\r\n",
-			       "Progname=erl\r\n",
-			       "Rootdir=", NativeRootDir, "\r\n"],
+		    IniData0 = ["[erlang]\r\n",
+				"Bindir=", NativeErtsBinDir, "\r\n",
+				"Progname=erl\r\n",
+				"Rootdir=", NativeRootDir, "\r\n"],
+		    IniData = unicode:characters_to_binary(IniData0),
 		    IniFile = filename:join([BinDir, "erl.ini"]),
                     ok = file:write_file(IniFile, IniData);
 		_ ->
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 9af8f6bae8..5a3f34506d 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -589,6 +589,8 @@ throw_error(Format, Args) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+decode_regexps(Key, Regexps, undefined) ->
+    decode_regexps(Key, Regexps, []);
 decode_regexps(Key, {add, Regexps}, Old) when is_list(Regexps) ->
     do_decode_regexps(Key, Regexps, Old);
 decode_regexps(_Key, {del, Regexps}, Old)  when is_list(Regexps) ->
diff --git a/lib/reltool/test/reltool_app_SUITE.erl b/lib/reltool/test/reltool_app_SUITE.erl
index a6e00cde08..9abc7fea41 100644
--- a/lib/reltool/test/reltool_app_SUITE.erl
+++ b/lib/reltool/test/reltool_app_SUITE.erl
@@ -26,6 +26,7 @@
 -compile(export_all).
 
 -include("reltool_test_lib.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 t()     -> reltool_test_lib:t(?MODULE).
@@ -64,7 +65,7 @@ end_per_testcase(Func,Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [fields, modules, export_all, app_depend, undef_funcs].
+    [fields, modules, export_all, app_depend, undef_funcs, appup].
 
 groups() -> 
     [].
@@ -290,3 +291,9 @@ key1search(Key, L) ->
 	{value, {Key, Value}} ->
 	    Value
     end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Test that the reltool appup file is ok
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(reltool).
diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl
index 752037042d..bfe5d39d53 100644
--- a/lib/reltool/test/reltool_server_SUITE.erl
+++ b/lib/reltool/test/reltool_server_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -144,7 +143,8 @@ all() ->
      mod_incl_cond_derived,
      use_selected_vsn,
      use_selected_vsn_relative_path,
-     non_standard_vsn_id].
+     non_standard_vsn_id,
+     undefined_regexp].
 
 groups() -> 
     [].
@@ -808,13 +808,14 @@ create_target_unicode(Config) ->
 
     %% If file name translation mode is unicode, then use unicode
     %% characters release name (which will be used as file name for
-    %% .rel, .script and .boot)
-    RelNamePrefix =
+    %% .rel, .script and .boot), and install the release under a path
+    %% which icludes unicode characters.
+    {RelNamePrefix,TargetDirName} =
 	case file:native_name_encoding() of
 	    utf8 ->
-		"Unicode test αβ";
+		{"Unicode test αβ","target_unicode_αβ"} ;
 	    latin1 ->
-		"Unicode test"
+		{"Unicode test","target_unicode"}
 	end,
 
     %% Configure the server
@@ -838,7 +839,7 @@ create_target_unicode(Config) ->
          ]},
 
     %% Generate target file
-    TargetDir = filename:join([?WORK_DIR, "target_unicode"]),
+    TargetDir = filename:join([?WORK_DIR, TargetDirName]),
     ?m(ok, reltool_utils:recursive_delete(TargetDir)),
     ?m(ok, file:make_dir(TargetDir)),
     ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, Sys}])]),
@@ -2506,6 +2507,12 @@ non_standard_vsn_id(Config) ->
 	  reltool_server:get_app(Pid2,b)),
    ok.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+undefined_regexp(_Config) ->
+    ?msym({ok,_},
+          reltool:get_config([{sys,[{app,asn1,[{excl_app_filters,
+                                                {add, ["^priv"]}}]}]}])),
+    ok.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Library functions
diff --git a/lib/reltool/test/reltool_server_SUITE_data/unicode/ua-1.0/ebin/ua.app b/lib/reltool/test/reltool_server_SUITE_data/unicode/ua-1.0/ebin/ua.app
index 6f571b7179..dbce20232c 100644
--- a/lib/reltool/test/reltool_server_SUITE_data/unicode/ua-1.0/ebin/ua.app
+++ b/lib/reltool/test/reltool_server_SUITE_data/unicode/ua-1.0/ebin/ua.app
@@ -1,4 +1,3 @@
-% -*- coding: utf-8 -*-
 {application, ua,
  [{description, "Application for testing unicode in reltool - αβ"},
   {vsn, "1.0"},
diff --git a/lib/reltool/test/reltool_test_lib.erl b/lib/reltool/test/reltool_test_lib.erl
index 3485365ed9..530d0a9985 100644
--- a/lib/reltool/test/reltool_test_lib.erl
+++ b/lib/reltool/test/reltool_test_lib.erl
@@ -258,8 +258,8 @@ run_test([{Module, TC} | Rest], Config) ->
 		    true ->
 			[do_run_test(Module, TC, NewConfig)]
 		end,
-	    Module:end_per_suite(NewConfig),
-	    Res ++ run_test(Rest, NewConfig);
+            CommonTestRes = worst_res(Res),
+	    Res ++ run_test(Rest, [{tc_status,CommonTestRes}|NewConfig]);
 	Error ->
 	    ?error("Test suite skipped: ~w~n", [Error]),
 	    [{skipped, Error}]
@@ -267,6 +267,36 @@ run_test([{Module, TC} | Rest], Config) ->
 run_test([], _Config) ->
     [].
 
+worst_res(Res) ->
+    NewRes = [{dummy, {ok,dummy, dummy}} | Res],
+    [{_,WorstRes}|_] = lists:sort(fun compare_res/2, NewRes),
+    common_test_res(WorstRes).
+
+common_test_res(ok) ->
+    ok;
+common_test_res({Res,_,Reason}) ->
+    common_test_res({Res,Reason});
+common_test_res({Res,Reason}) ->
+    case Res of
+        ok      -> ok;
+        skip    -> {skipped, Reason};
+        skipped -> {skipped, Reason};
+        failed  -> {failed, Reason};
+        crash   -> {failed, Reason}
+    end.
+
+% crash < failed < skip < ok
+compare_res({_,{ResA,_,_}},{_,{ResB,_,_}}) ->
+    res_to_int(ResA) < res_to_int(ResB).
+
+res_to_int(Res) ->
+    case Res of
+        ok     -> 4;
+        skip   -> 3;
+        failed -> 2;
+        crash  -> 1
+    end.
+
 do_run_test(Module, all, Config) ->
     All = [{Module, Test} || Test <- Module:all()],
     run_test(All, Config);
@@ -290,9 +320,10 @@ eval_test_case(Mod, Fun, Config) ->
 
 test_case_evaluator(Mod, Fun, [Config]) ->
     NewConfig = Mod:init_per_testcase(Fun, Config),
-    R = apply(Mod, Fun, [NewConfig]),
-    Mod:end_per_testcase(Fun, NewConfig),
-    exit({test_case_ok, R}).
+    Res = apply(Mod, Fun, [NewConfig]),
+    CommonTestRes = common_test_res(Res),
+    Mod:end_per_testcase(Fun, [{tc_status,CommonTestRes}|NewConfig]),
+    exit({test_case_ok, Res}).
 
 wait_for_evaluator(Pid, Mod, Fun, Config) ->
     receive
@@ -307,13 +338,17 @@ wait_for_evaluator(Pid, Mod, Fun, Config) ->
 	{'EXIT', Pid, {skipped, Reason}} ->
 	    log("<WARNING> Test case ~w skipped, because ~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:end_per_testcase(Fun, Config),
-	    {skip, {Mod, Fun}, Reason};
+            Res = {skipped, {Mod, Fun}, Reason},
+            CommonTestRes = common_test_res(Res),
+	    Mod:end_per_testcase(Fun, [{tc_status,CommonTestRes}|Config]),
+	    Res;
 	{'EXIT', Pid, Reason} ->
 	    log("<ERROR> Eval process ~w exited, because\n\t~p~n",
 		[{Mod, Fun}, Reason]),
-	    Mod:end_per_testcase(Fun, Config),
-	    {crash, {Mod, Fun}, Reason}
+            Res = {crash, {Mod, Fun}, Reason},
+            CommonTestRes = common_test_res(Res),
+            Mod:end_per_testcase(Fun, [{tc_status,CommonTestRes}|Config]),
+	    Res
     end.
 
 flush() ->
diff --git a/lib/reltool/vsn.mk b/lib/reltool/vsn.mk
index 412e78f49f..16ec570d22 100644
--- a/lib/reltool/vsn.mk
+++ b/lib/reltool/vsn.mk
@@ -1 +1 @@
-RELTOOL_VSN = 0.6.4
+RELTOOL_VSN = 0.6.4.1
diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
index d315a90e18..2bcb93b4dd 100644
--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
@@ -21,11 +21,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk
 
 # ----------------------------------------------------
-# Items from top-level configure
-# ----------------------------------------------------
-DTRACE_ENABLED=@DTRACE_ENABLED@
-DTRACE_ENABLED_2STEP=@DTRACE_ENABLED_2STEP@
-# ----------------------------------------------------
 # Application version
 # ----------------------------------------------------
 include ../vsn.mk
@@ -108,28 +103,7 @@ _create_dirs := $(shell mkdir -p $(OBJDIR) $(LIBDIR))
 
 debug opt valgrind: $(SOLIBS) $(OBJDIR) $(LIBDIR) $(NIF_LIB)
 
-ifdef DTRACE_ENABLED
-DTRACE_USER_HEADER=$(OBJDIR)/dtrace_user.h
-$(OBJDIR)/dtrace_user.h: ./dtrace_user.d
-	$(dtrace_verbose)dtrace -h -C $(INCLUDES) \
-	  -s ./dtrace_user.d \
-	  -o ./dtrace_user.tmp
-	$(V_at)sed -e '/^#define[ 	]*ERLANG_[A-Z0-9_]*(.*)/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/' ./dtrace_user.tmp > $@
-	$(V_at)rm ./dtrace_user.tmp
-else
-DTRACE_USER_HEADER=
-endif
-
-DTRACE_OBJS =
-ifdef DTRACE_ENABLED_2STEP
-DTRACE_OBJS += $(OBJDIR)/dtrace_user.o
-$(OBJDIR)/dtrace_user.o: $(before_DTrace_OBJS) $(OBJDIR)/dtrace_user.h
-	$(dtrace_verbose)dtrace -G -C \
-	  -s ./dtrace_user.d \
-	  -o $@ $(before_DTrace_OBJS)
-endif
-
-DYNTRACE_OBJS = $(before_DTrace_OBJS) $(DTRACE_OBJS)
+DYNTRACE_OBJS = $(before_DTrace_OBJS)
 
 $(OBJDIR):
 	-@mkdir -p $(OBJDIR)
@@ -137,7 +111,7 @@ $(OBJDIR):
 $(LIBDIR):
 	-@mkdir -p $(LIBDIR)
 
-$(OBJDIR)/dyntrace$(TYPEMARKER).o: dyntrace.c $(DTRACE_USER_HEADER)
+$(OBJDIR)/dyntrace$(TYPEMARKER).o: dyntrace.c
 	$(V_at)$(INSTALL_DIR) $(OBJDIR)
 	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
 
diff --git a/lib/runtime_tools/c_src/dyntrace.c b/lib/runtime_tools/c_src/dyntrace.c
index eef03afd1c..18f91cd7e7 100644
--- a/lib/runtime_tools/c_src/dyntrace.c
+++ b/lib/runtime_tools/c_src/dyntrace.c
@@ -30,9 +30,6 @@
 #if defined(USE_DYNAMIC_TRACE) && (defined(USE_DTRACE) || defined(USE_SYSTEMTAP))
 #define HAVE_USE_DTRACE 1
 #endif
-#ifdef  HAVE_USE_DTRACE
-#include "dtrace_user.h"
-#endif
 
 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);
diff --git a/lib/runtime_tools/doc/src/book.xml b/lib/runtime_tools/doc/src/book.xml
index 62f145f0a5..d3c462c0ad 100644
--- a/lib/runtime_tools/doc/src/book.xml
+++ b/lib/runtime_tools/doc/src/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/lib/runtime_tools/doc/src/dbg.xml b/lib/runtime_tools/doc/src/dbg.xml
index d8c82b2459..d31ccd834d 100644
--- a/lib/runtime_tools/doc/src/dbg.xml
+++ b/lib/runtime_tools/doc/src/dbg.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -244,7 +244,7 @@ Error: fun containing local erlang function calls ('is_atomm' called in guard)\
           </item>
           <tag><c>all</c></tag>
           <item>
-            <p>Sets all flags.</p>
+            <p>Sets all flags except <c>silent</c>.</p>
           </item>
           <tag><c>clear</c></tag>
           <item>
@@ -1024,7 +1024,7 @@ hello</pre>
       </desc>
     </func>
     <func>
-      <name>stop() -> stopped</name>
+      <name>stop() -> ok</name>
       <fsummary>Stop the <c>dbg</c>server and the tracing of all processes.</fsummary>
       <desc>
         <p>Stops the <c>dbg</c> server and clears all trace flags for
@@ -1035,7 +1035,7 @@ hello</pre>
       </desc>
     </func>
     <func>
-      <name>stop_clear() -> stopped</name>
+      <name>stop_clear() -> ok</name>
       <fsummary>Stop the <c>dbg</c>server and the tracing of all processes, and clears trace patterns.</fsummary>
       <desc>
         <p>Same as stop/0, but also clears all trace patterns on local
diff --git a/lib/runtime_tools/doc/src/dyntrace.xml b/lib/runtime_tools/doc/src/dyntrace.xml
index f0149d0665..25f750677f 100644
--- a/lib/runtime_tools/doc/src/dyntrace.xml
+++ b/lib/runtime_tools/doc/src/dyntrace.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/doc/src/erts_alloc_config.xml b/lib/runtime_tools/doc/src/erts_alloc_config.xml
index 6acf498411..31145bee63 100644
--- a/lib/runtime_tools/doc/src/erts_alloc_config.xml
+++ b/lib/runtime_tools/doc/src/erts_alloc_config.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2010</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/doc/src/fascicules.xml b/lib/runtime_tools/doc/src/fascicules.xml
index 5230dc7e90..1a0bd6ec97 100644
--- a/lib/runtime_tools/doc/src/fascicules.xml
+++ b/lib/runtime_tools/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/runtime_tools/doc/src/notes.xml b/lib/runtime_tools/doc/src/notes.xml
index 2281ac4a49..32b7d168f5 100644
--- a/lib/runtime_tools/doc/src/notes.xml
+++ b/lib/runtime_tools/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,51 @@
   <p>This document describes the changes made to the Runtime_Tools
     application.</p>
 
+<section><title>Runtime_Tools 1.8.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Observer did not produce correct result when ERTS
+	    internal memory allocators had been disabled.</p>
+          <p>
+	    Own Id: OTP-11520</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Runtime_Tools 1.8.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The process trace flag 'silent' is now allowed in call to
+	    dbg:p/2.</p>
+          <p>
+	    Own Id: OTP-11222</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Introduced functionality for inspection of system and
+	    build configuration.</p>
+          <p>
+	    Own Id: OTP-11196</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Runtime_Tools 1.8.11</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -69,7 +114,7 @@
         <item>
           <p>
 	    Fix Table Viewer refresh crash on no more existing ets
-	    tables (Thanks to Peti G�mori)</p>
+	    tables (Thanks to Peti Gömori)</p>
           <p>
 	    Own Id: OTP-10635</p>
         </item>
diff --git a/lib/runtime_tools/doc/src/notes_history.xml b/lib/runtime_tools/doc/src/notes_history.xml
index 8fe27f619c..aba9f47cbf 100644
--- a/lib/runtime_tools/doc/src/notes_history.xml
+++ b/lib/runtime_tools/doc/src/notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/doc/src/part.xml b/lib/runtime_tools/doc/src/part.xml
index 948d4a8020..d81eed6515 100644
--- a/lib/runtime_tools/doc/src/part.xml
+++ b/lib/runtime_tools/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2012</year><year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/doc/src/part_notes.xml b/lib/runtime_tools/doc/src/part_notes.xml
index 6f7f610da0..395de39ac7 100644
--- a/lib/runtime_tools/doc/src/part_notes.xml
+++ b/lib/runtime_tools/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/doc/src/part_notes_history.xml b/lib/runtime_tools/doc/src/part_notes_history.xml
index 2ce1a5de05..46a6baa45e 100644
--- a/lib/runtime_tools/doc/src/part_notes_history.xml
+++ b/lib/runtime_tools/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/doc/src/ref_man.xml b/lib/runtime_tools/doc/src/ref_man.xml
index df3446cd17..6017f3cdaa 100644
--- a/lib/runtime_tools/doc/src/ref_man.xml
+++ b/lib/runtime_tools/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2012</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/doc/src/runtime_tools_app.xml b/lib/runtime_tools/doc/src/runtime_tools_app.xml
index 1fd61b84d8..4b030b09af 100644
--- a/lib/runtime_tools/doc/src/runtime_tools_app.xml
+++ b/lib/runtime_tools/doc/src/runtime_tools_app.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
index 2347986c53..8d2bcfe3d1 100644
--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
@@ -42,6 +42,7 @@ MODULES= \
 	dbg \
 	dyntrace \
 	percept_profile \
+	system_information \
 	observer_backend \
 	ttb_autostart
 HRL_FILES= ../include/observer_backend.hrl
diff --git a/lib/runtime_tools/src/dbg.erl b/lib/runtime_tools/src/dbg.erl
index 6b2fb0460f..186563ab74 100644
--- a/lib/runtime_tools/src/dbg.erl
+++ b/lib/runtime_tools/src/dbg.erl
@@ -1113,7 +1113,7 @@ transform_flags([sos|Tail],Acc) -> transform_flags(Tail,[set_on_spawn|Acc]);
 transform_flags([sol|Tail],Acc) -> transform_flags(Tail,[set_on_link|Acc]);
 transform_flags([sofs|Tail],Acc) -> transform_flags(Tail,[set_on_first_spawn|Acc]);
 transform_flags([sofl|Tail],Acc) -> transform_flags(Tail,[set_on_first_link|Acc]);
-transform_flags([all|_],_Acc) -> all();
+transform_flags([all|_],_Acc) -> all()--[silent];
 transform_flags([F|Tail]=List,Acc) when is_atom(F) ->
     case lists:member(F, all()) of
 	true -> transform_flags(Tail,[F|Acc]);
@@ -1124,7 +1124,7 @@ transform_flags(Bad,_Acc) -> {error,{bad_flags,Bad}}.
 all() ->
     [send,'receive',call,procs,garbage_collection,running,
      set_on_spawn,set_on_first_spawn,set_on_link,set_on_first_link,
-     timestamp,arity,return_to].
+     timestamp,arity,return_to,silent].
 
 display_info([Node|Nodes]) ->
     io:format("~nNode ~w:~n",[Node]),
@@ -1786,12 +1786,12 @@ h(get_tracer) ->
        " - Returns the process or port to which all trace messages are sent."]);
 h(stop) ->
     help_display(
-      ["stop() -> stopped",
+      ["stop() -> ok",
        " - Stops the dbg server and the tracing of all processes.",
        "   Does not clear any trace patterns."]);
 h(stop_clear) ->
     help_display(
-      ["stop_clear() -> stopped",
+      ["stop_clear() -> ok",
        " - Stops the dbg server and the tracing of all processes,",
        "   and clears all trace patterns."]).
 
diff --git a/lib/runtime_tools/src/erts_alloc_config.erl b/lib/runtime_tools/src/erts_alloc_config.erl
index 284e88d4a7..b9a26dc0dc 100644
--- a/lib/runtime_tools/src/erts_alloc_config.erl
+++ b/lib/runtime_tools/src/erts_alloc_config.erl
@@ -39,6 +39,8 @@
 		need_config_change,
 		alloc_util,
 		instances,
+		strategy,
+		acul,
 		low_mbc_blocks_size,
 		high_mbc_blocks_size,
 		sbct,
@@ -54,8 +56,6 @@
 
 -define(SERVER, '__erts_alloc_config__').
 
--define(MAX_ALLOCATOR_INSTANCES, 16).
-
 -define(KB, 1024).
 -define(MB, 1048576).
 
@@ -99,23 +99,11 @@
 	 {ets_alloc, 131072},
 	 {fix_alloc, 131072},
 	 {eheap_alloc, 524288},
-	 {ll_alloc, 2097152},
+	 {ll_alloc, 131072},
 	 {sl_alloc, 131072},
 	 {temp_alloc, 131072},
 	 {driver_alloc, 131072}]).
 
--define(MMMBC_DEFAULTS,
-	[{binary_alloc, 10},
-	 {std_alloc, 10},
-	 {ets_alloc, 10},
-	 {fix_alloc, 10},
-	 {eheap_alloc, 10},
-	 {ll_alloc, 0},
-	 {sl_alloc, 10},
-	 {temp_alloc, 10},
-	 {driver_alloc, 10}]).
-
-
 %%%
 %%% Exported interface
 %%%
@@ -230,20 +218,72 @@ server_loop(State) ->
 	       end,
     server_loop(NewState).
 
-allocator_instances(temp_alloc) ->
-    erlang:system_info(schedulers) + 1;
-allocator_instances(ll_alloc) ->
+carrier_migration_support(aoff) ->
+    true;
+carrier_migration_support(aoffcbf) ->
+    true;
+carrier_migration_support(aoffcaobf) ->
+    true;
+carrier_migration_support(_) ->
+    false.
+
+allocator_instances(ll_alloc, Strategy) ->
+    case carrier_migration_support(Strategy) of
+	true -> erlang:system_info(schedulers);
+	false -> 1
+    end;
+allocator_instances(_A, undefined) ->
     1;
-allocator_instances(_Allocator) ->
-    case erlang:system_info(schedulers) of
-	Schdlrs when Schdlrs =< ?MAX_ALLOCATOR_INSTANCES -> Schdlrs;
-	_Schdlrs -> ?MAX_ALLOCATOR_INSTANCES
+allocator_instances(_A, _Strategy) ->
+    erlang:system_info(schedulers).
+
+strategy(temp_alloc, _AI) ->
+    af;
+strategy(A, AI) ->
+    try
+	{A, OptList} = lists:keyfind(A, 1, AI),
+	{as, S} = lists:keyfind(as, 1, OptList),
+	S
+    catch
+	_ : _ ->
+	    undefined
+    end.
+
+strategy_str(af) ->
+    "A fit";
+strategy_str(gf) ->
+    "Good fit";
+strategy_str(bf) ->
+    "Best fit";
+strategy_str(aobf) ->
+    "Address order best fit";
+strategy_str(aoff) ->
+    "Address order first fit";
+strategy_str(aoffcbf) ->
+    "Address order first fit carrier best fit";
+strategy_str(aoffcaobf) ->
+    "Address order first fit carrier adress order best fit".
+
+default_acul(A, S) ->
+    case carrier_migration_support(S) of
+	false ->
+	    0;
+	true ->
+	    case A of
+		ll_alloc -> 85;
+		eheap_alloc -> 45;
+		_ -> 60
+	    end
     end.
-					   
+
 make_state() ->
+    {_, _, _, AI} = erlang:system_info(allocator),
     #state{alloc = lists:map(fun (A) ->
+				     S = strategy(A, AI),
 				     #alloc{name = A,
-					    instances = allocator_instances(A)}
+					    strategy = S,
+					    acul = default_acul(A, S),
+					    instances = allocator_instances(A, S)}
 			     end,
 			     ?ALLOCATORS)}.
 
@@ -345,7 +385,7 @@ do_save_scenario(AlcList) ->
 conf_size(Bytes) when is_integer(Bytes), Bytes < 0 ->
     exit({bad_value, Bytes});
 conf_size(Bytes) when is_integer(Bytes), Bytes < 1*?MB ->
-    ?ROUNDUP(?B2KB(Bytes), 128);
+    ?ROUNDUP(?B2KB(Bytes), 256);
 conf_size(Bytes) when is_integer(Bytes), Bytes < 10*?MB ->
     ?ROUNDUP(?B2KB(Bytes), ?B2KB(1*?MB));
 conf_size(Bytes) when is_integer(Bytes), Bytes < 100*?MB ->
@@ -376,28 +416,25 @@ mmbcs(#conf{format_to = FTO},
 	     temp_alloc -> BlocksSize;
 	     _ -> BlocksSize div Insts
 	 end,
-    case BS > default_mmbcs(A, Insts) of
-	true ->
+    DefMMBCS = default_mmbcs(A, Insts),
+    case {Insts, BS > DefMMBCS} of
+	{1, true} ->
 	    MMBCS = conf_size(BS),
 	    fc(FTO, "Main mbc size of ~p kilobytes.", [MMBCS]),
 	    format(FTO, " +M~cmmbcs ~p~n", [alloc_char(A), MMBCS]);
-	false ->
+	_ ->
+	    MMBCS = ?B2KB(DefMMBCS),
+	    fc(FTO, "Main mbc size of ~p kilobytes.", [MMBCS]),
+	    format(FTO, " +M~cmmbcs ~p~n", [alloc_char(A), MMBCS]),
 	    ok
     end.
 
-smbcs_lmbcs_mmmbc(#conf{format_to = FTO},
-		  #alloc{name = A, instances = Insts, segments = Segments}) ->
-    MMMBC = case {A, Insts} of
-		{_, 1} -> Segments#segment.number;
-		{temp_alloc, _} -> Segments#segment.number;
-		_ -> (Segments#segment.number div Insts) + 1
-	    end,
+smbcs_lmbcs(#conf{format_to = FTO},
+	    #alloc{name = A, segments = Segments}) ->
     MBCS = Segments#segment.size,
     AC = alloc_char(A),
     fc(FTO, "Mseg mbc size of ~p kilobytes.", [MBCS]),
     format(FTO, " +M~csmbcs ~p +M~clmbcs ~p~n", [AC, MBCS, AC, MBCS]),
-    fc(FTO, "Max ~p mseg mbcs.", [MMMBC]),
-    format(FTO, " +M~cmmmbc ~p~n", [AC, MMMBC]),
     ok.
 
 alloc_char(binary_alloc) -> $B;
@@ -462,6 +499,8 @@ au_conf_alloc(#conf{format_to = FTO} = Conf,
 	      #alloc{name = A,
 		     alloc_util = true,
 		     instances = Insts,
+		     acul = Acul,
+		     strategy = Strategy,
 		     low_mbc_blocks_size = Low,
 		     high_mbc_blocks_size = High} = Alc) ->
     fcp(FTO, "Usage of mbcs: ~p - ~p kilobytes", [?B2KB(Low), ?B2KB(High)]),
@@ -470,31 +509,49 @@ au_conf_alloc(#conf{format_to = FTO} = Conf,
 	    fc(FTO, "One instance used."),
 	    format(FTO, " +M~ct false~n", [alloc_char(A)]);
 	_ ->
-	    fc(FTO, "~p instances used.",
+	    fc(FTO, "~p + 1 instances used.",
 	       [Insts]),
-	    format(FTO, " +M~ct true~n", [alloc_char(A)])
-    end,	    
+	    format(FTO, " +M~ct true~n", [alloc_char(A)]),
+	    case Strategy of
+		undefined ->
+		    ok;
+		_ ->
+		    fc(FTO, "Allocation strategy: ~s.",
+		       [strategy_str(Strategy)]),
+		    format(FTO, " +M~cas ~s~n", [alloc_char(A),
+						 atom_to_list(Strategy)])
+	    end,
+	    case carrier_migration_support(Strategy) of
+		false ->
+		    ok;
+		true ->
+		    fc(FTO, "Abandon carrier utilization limit of ~p%.", [Acul]),
+		    format(FTO, " +M~cacul ~p~n", [alloc_char(A), Acul])
+	    end
+    end,
     mmbcs(Conf, Alc),
-    smbcs_lmbcs_mmmbc(Conf, Alc),
+    smbcs_lmbcs(Conf, Alc),
     sbct(Conf, Alc).
 
-large_growth(Low, High) ->
-    High - Low >= ?LARGE_GROWTH_ABS_LIMIT.
-
 calc_seg_size(Growth, Segs) ->
     conf_size(round(Growth*?FRAG_FACT*?GROWTH_SEG_FACT) div Segs).
 
 calc_growth_segments(Conf, AlcList0) ->
-    CalcSmall = fun (#alloc{name = ll_alloc} = Alc, Acc) ->
-			{Alc#alloc{segments = #segment{size = 0,
+    CalcSmall = fun (#alloc{name = ll_alloc, instances = 1} = Alc, Acc) ->
+			{Alc#alloc{segments = #segment{size = conf_size(0),
 						       number = 0}},
 			 Acc};
 		    (#alloc{alloc_util = true,
-			    low_mbc_blocks_size = Low,
+			    instances = Insts,
+			    low_mbc_blocks_size = LowMBC,
 			    high_mbc_blocks_size = High} = Alc,
 		     {SL, AL}) ->
+			Low = case Insts of
+				  1 -> LowMBC;
+				  _ -> 0
+			      end,
 			Growth = High - Low,
-			case large_growth(Low, High) of
+			case Growth >= ?LARGE_GROWTH_ABS_LIMIT of
 			    true ->
 				{Alc, {SL, AL+1}};
 			    false ->
@@ -522,8 +579,13 @@ calc_growth_segments(Conf, AlcList0) ->
 			   end,
 	    CalcLarge = fun (#alloc{alloc_util = true,
 				    segments = undefined,
-				    low_mbc_blocks_size = Low,
+				    instances = Insts,
+				    low_mbc_blocks_size = LowMBC,
 				    high_mbc_blocks_size = High} = Alc) ->
+				Low = case Insts of
+					  1 -> LowMBC;
+					  _ -> 0
+				      end,
 				Growth = High - Low,
 				SegSize = calc_seg_size(Growth,
 							SegsPerAlloc),
@@ -560,15 +622,10 @@ format_header(FTO) ->
     case erlang:system_info(schedulers) of
 	1 -> ok;
 	Schdlrs ->
-	    MinSchdlrs = case Schdlrs > ?MAX_ALLOCATOR_INSTANCES of
-			     true -> ?MAX_ALLOCATOR_INSTANCES;
-			     false -> Schdlrs
-			 end,
 	    fcp(FTO,
 		"NOTE: This configuration was made for ~p schedulers. "
-		"It is very important that at least ~p schedulers "
-		"are used.",
-		[Schdlrs, MinSchdlrs])
+		"It is very important that ~p schedulers are used.",
+		[Schdlrs, Schdlrs])
     end,
     fcp(FTO,
 	"This configuration is intended as a suggestion and "
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 670e216d97..fea0854042 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2014. All Rights Reserved.
 %% 
 %% The 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,13 @@ sys_info() ->
 		  Mem -> Mem
 	      catch _:_ -> []
 	      end,
+
+    SchedulersOnline = erlang:system_info(schedulers_online),
+    SchedulersAvailable = case erlang:system_info(multi_scheduling) of
+			      enabled -> SchedulersOnline;
+			      _ -> 1
+			  end,
+
     {{_,Input},{_,Output}} = erlang:statistics(io),
     [{process_count, erlang:system_info(process_count)},
      {process_limit, erlang:system_info(process_limit)},
@@ -60,9 +67,13 @@ sys_info() ->
      {run_queue, erlang:statistics(run_queue)},
      {io_input, Input},
      {io_output,  Output},
+
      {logical_processors, erlang:system_info(logical_processors)},
-     {logical_processors_available, erlang:system_info(logical_processors_available)},
      {logical_processors_online, erlang:system_info(logical_processors_online)},
+     {logical_processors_available, erlang:system_info(logical_processors_available)},
+     {schedulers, erlang:system_info(schedulers)},
+     {schedulers_online, SchedulersOnline},
+     {schedulers_available, SchedulersAvailable},
 
      {otp_release, erlang:system_info(otp_release)},
      {version, erlang:system_info(version)},
@@ -77,8 +88,8 @@ sys_info() ->
      | MemInfo].
 
 alloc_info() ->
-    {_,_,AllocTypes,_} = erlang:system_info(allocator),
-    try erlang:system_info({allocator_sizes,AllocTypes}) of
+    AlcuAllocs = erlang:system_info(alloc_util_allocators),
+    try erlang:system_info({allocator_sizes, AlcuAllocs}) of
 	Allocators -> Allocators
     catch _:_ -> []
     end.
@@ -216,12 +227,14 @@ fetch_stats(Parent, Time) ->
 fetch_stats_loop(Parent, Time) ->
     erlang:system_flag(scheduler_wall_time, true),
     receive
-	_Msg -> erlang:system_flag(scheduler_wall_time, false)
+	_Msg ->
+	    %% erlang:system_flag(scheduler_wall_time, false)
+	    ok
     after Time ->
 	    _M = Parent ! {stats, 1,
 			   erlang:statistics(scheduler_wall_time),
 			   erlang:statistics(io),
-			   erlang:memory()},
+			   try erlang:memory() catch _:_ -> [] end},
 	    fetch_stats_loop(Parent, Time)
     end.
 %%
@@ -233,17 +246,6 @@ etop_collect(Collector) ->
     %% utilization in etop). Next time the flag will be true and then
     %% there will be a measurement.
     SchedulerWallTime = erlang:statistics(scheduler_wall_time),
-
-    %% Turn off the flag while collecting data per process etc.
-    case erlang:system_flag(scheduler_wall_time,false) of
-	false ->
-	    %% First time and the flag was false - start a monitoring
-	    %% process to set the flag back to false when etop is stopped.
-	    spawn(fun() -> flag_holder_proc(Collector) end);
-	_ ->
-	    ok
-    end,
-
     ProcInfo = etop_collect(processes(), []),
 
     Collector ! {self(),#etop_info{now = now(),
@@ -253,13 +255,22 @@ etop_collect(Collector) ->
 				   memi = etop_memi(),
 				   procinfo = ProcInfo
 				  }},
+
+    case SchedulerWallTime of
+	undefined ->
+	    spawn(fun() -> flag_holder_proc(Collector) end);
+	_ ->
+	    ok
+    end,
+
     erlang:system_flag(scheduler_wall_time,true).
 
 flag_holder_proc(Collector) ->
     Ref = erlang:monitor(process,Collector),
     receive
 	{'DOWN',Ref,_,_,_} ->
-	    erlang:system_flag(scheduler_wall_time,false)
+	    %% erlang:system_flag(scheduler_wall_time,false)
+	    ok
     end.
 
 etop_memi() ->
diff --git a/lib/runtime_tools/src/runtime_tools.app.src b/lib/runtime_tools/src/runtime_tools.app.src
index 602048dc21..d46cfe1f32 100644
--- a/lib/runtime_tools/src/runtime_tools.app.src
+++ b/lib/runtime_tools/src/runtime_tools.app.src
@@ -21,7 +21,7 @@
     {vsn,          "%VSN%"},
     {modules,      [appmon_info, dbg,observer_backend,percept_profile,
 		    runtime_tools,runtime_tools_sup,erts_alloc_config,
-		    ttb_autostart,dyntrace]},
+		    ttb_autostart,dyntrace,system_information]},
     {registered,   [runtime_tools_sup]},
     {applications, [kernel, stdlib]},
     {env,          []},
diff --git a/lib/runtime_tools/src/runtime_tools.appup.src b/lib/runtime_tools/src/runtime_tools.appup.src
index 7a435e9b22..0c2bab316f 100644
--- a/lib/runtime_tools/src/runtime_tools.appup.src
+++ b/lib/runtime_tools/src/runtime_tools.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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,5 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-{"%VSN%",[],[]}.
+{"%VSN%",
+ [{<<".*">>,[{restart_application, runtime_tools}]}],
+ [{<<".*">>,[{restart_application, runtime_tools}]}]
+}.
diff --git a/lib/runtime_tools/src/runtime_tools_sup.erl b/lib/runtime_tools/src/runtime_tools_sup.erl
index ab9fa534d5..32770397dd 100644
--- a/lib/runtime_tools/src/runtime_tools_sup.erl
+++ b/lib/runtime_tools/src/runtime_tools_sup.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
diff --git a/lib/runtime_tools/src/system_information.erl b/lib/runtime_tools/src/system_information.erl
new file mode 100644
index 0000000000..603b698d5e
--- /dev/null
+++ b/lib/runtime_tools/src/system_information.erl
@@ -0,0 +1,554 @@
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% 
+%% The 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%
+%%
+
+
+%% The main purpose of system_information is to aggregate all information
+%% deemed useful for investigation, i.e. system_information:report/0.
+
+%% The server and all other utilities surrounding this is for inspecting
+%% reported values. Functions will be added to this as time goes by.
+
+-module(system_information).
+-behaviour(gen_server).
+
+%% API
+-export([
+	report/0,
+	from_file/1,
+	to_file/1
+    ]).
+-export([
+	start/0, stop/0,
+	load_report/0, load_report/2,
+	applications/0, applications/1,
+	application/1, application/2,
+	environment/0, environment/1,
+	module/1, module/2,
+	modules/1
+    ]).
+
+%% gen_server callbacks
+-export([
+	init/1,
+	handle_call/3,
+	handle_cast/2,
+	handle_info/2,
+	terminate/2,
+	code_change/3
+    ]).
+
+-define(SERVER, ?MODULE).
+
+%% change version if parsing of file changes
+-define(REPORT_FILE_VSN, "1.0").
+
+-record(state, {
+	report
+    }).
+
+%%===================================================================
+%% API
+%%===================================================================
+
+start() ->
+    gen_server:start({local, ?SERVER}, ?MODULE, [], []).
+
+stop() ->
+    gen_server:call(?SERVER, stop).
+
+load_report() -> load_report(data, report()).
+
+load_report(file, File)   -> load_report(data, from_file(File));
+load_report(data, Report) ->
+    start(), gen_server:call(?SERVER, {load_report, Report}).
+
+report() -> [
+	{init_arguments,    init:get_arguments()},
+	{code_paths,        code:get_path()},
+	{code,              code()},
+	{system_info,       erlang_system_info()},
+	{erts_compile_info, erlang:system_info(compile_info)},
+	{beam_dynamic_libraries, get_dynamic_libraries()},
+	{environment_erts,  os_getenv_erts_specific()},
+	{environment,       [split_env(Env) || Env <- os:getenv()]}
+    ].
+
+to_file(File) ->
+    file:write_file(File, iolist_to_binary([
+		io_lib:format("{system_information_version, ~p}.~n", [
+			?REPORT_FILE_VSN
+		    ]),
+		io_lib:format("{system_information, ~p}.~n", [
+			report()
+		    ])
+	    ])).
+
+from_file(File) ->
+    case file:consult(File) of
+	{ok, Data} ->
+	    case get_value([system_information_version], Data) of
+		?REPORT_FILE_VSN ->
+		    get_value([system_information], Data);
+		Vsn ->
+		    erlang:error({unknown_version, Vsn})
+	    end;
+	_ ->
+	    erlang:error(bad_report_file)
+    end.
+
+applications() -> applications([]).
+applications(Opts) when is_list(Opts) ->
+    gen_server:call(?SERVER, {applications, Opts}).
+
+application(App) when is_atom(App) -> application(App, []).
+application(App, Opts) when is_atom(App), is_list(Opts) ->
+    gen_server:call(?SERVER, {application, App, Opts}).
+
+environment() -> environment([]).
+environment(Opts) when is_list(Opts) ->
+    gen_server:call(?SERVER, {environment, Opts}).
+
+module(M) when is_atom(M) -> module(M, []).
+module(M, Opts) when is_atom(M), is_list(Opts) ->
+    gen_server:call(?SERVER, {module, M, Opts}).
+
+modules(Opt) when is_atom(Opt) ->
+    gen_server:call(?SERVER, {modules, Opt}).
+
+%%===================================================================
+%% gen_server callbacks
+%%===================================================================
+
+init([]) ->
+    {ok, #state{}}.
+
+handle_call(stop, _From, S) ->
+    {stop, normal, ok, S};
+
+handle_call({load_report, Report}, _From, S) ->
+    Version = get_value([system_info, system_version], Report),
+    io:format("Loaded report from system version: ~s~n", [Version]),
+    {reply, ok, S#state{ report = Report }};
+
+handle_call(_Req, _From, #state{ report = undefined } = S) ->
+    {reply, {error, report_not_loaded}, S};
+
+handle_call({applications, Opts}, _From, #state{ report = Report } = S) ->
+    ok = print_applications(get_value([code], Report), Opts),
+    {reply, ok, S};
+
+handle_call({application, App, Opts}, _From, #state{ report = Report } = S) ->
+    Data = get_value([App], [AppInfo||{application, AppInfo}<-get_value([code], Report)]),
+    ok = print_application({App, Data}, Opts),
+    {reply, ok, S};
+
+
+handle_call({environment, Opts}, _From, #state{ report = Report } = S) ->
+    Choices = case proplists:get_bool(full, Opts) of
+	true  -> [environment];
+	false -> [environment_erts]
+    end,
+    ok = print_environments(get_value(Choices, Report), Opts),
+    {reply, ok, S};
+
+
+handle_call({module, M, Opts}, _From, #state{ report = Report } = S) ->
+    Mods = find_modules_from_code(M, get_value([code], Report)),
+    print_modules_from_code(M, Mods, Opts),
+    {reply, ok, S};
+
+handle_call({modules, native}, _From, #state{ report = Report } = S) ->
+    Codes = get_native_modules_from_code(get_value([code],Report)),
+    io:format("~p~n", [Codes]),
+    {reply, ok, S};
+
+
+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}.
+
+%%===================================================================
+%% Internal functions
+%%===================================================================
+
+%% handle report values
+
+get_value([], Data) -> Data;
+get_value([K|Ks], Data) ->
+    get_value(Ks, proplists:get_value(K, Data, [])).
+
+find_modules_from_code(M, [{code, Info}|Codes]) ->
+    case find_modules(M, get_value([modules], Info)) of
+	[]   -> find_modules_from_code(M, Codes);
+	Mods ->
+	    Path = get_value([path], Info),
+	    [{Path, Mods}|find_modules_from_code(M, Codes)]
+    end;
+find_modules_from_code(M, [{application, {App, Info}}|Codes]) ->
+    case find_modules(M, get_value([modules], Info)) of
+	[]   -> find_modules_from_code(M, Codes);
+	Mods ->
+	    Path = get_value([path], Info),
+	    Vsn  = get_value([vsn], Info),
+	    [{App, Vsn, Path, Mods}|find_modules_from_code(M, Codes)]
+    end;
+find_modules_from_code(_, []) -> [].
+
+find_modules(M, [{M, _}=Info|Ms]) -> [Info|find_modules(M,Ms)];
+find_modules(M, [_|Ms]) -> find_modules(M, Ms);
+find_modules(_, []) -> [].
+
+get_native_modules_from_code([{application, {App, Info}}|Cs]) ->
+    case get_native_modules(get_value([modules], Info)) of
+	[] -> get_native_modules_from_code(Cs);
+	Mods ->
+	    Path = get_value([path], Info),
+	    Vsn  = get_value([vsn], Info),
+	    [{App, Vsn, Path, Mods}|get_native_modules_from_code(Cs)]
+    end;
+get_native_modules_from_code([{code, Info}|Cs]) ->
+    case get_native_modules(get_value([modules], Info)) of
+	[] -> get_native_modules_from_code(Cs);
+	Mods ->
+	    Path = get_value([path], Info),
+	    [{Path, Mods}|get_native_modules_from_code(Cs)]
+    end;
+get_native_modules_from_code([]) -> [].
+
+get_native_modules([]) -> [];
+get_native_modules([{Mod, Info}|Ms]) ->
+    case proplists:get_value(native, Info) of
+	false -> get_native_modules(Ms);
+	_     -> [Mod|get_native_modules(Ms)]
+    end.
+
+
+%% print information
+
+print_applications([{application, App}|Apps], Opts) ->
+    print_application(App, Opts),
+    print_applications(Apps, Opts);
+print_applications([{code,_}|Apps], Opts) ->
+    print_applications(Apps, Opts);
+print_applications([], _) ->
+    ok.
+
+print_application({App, Info}, Opts) ->
+    Vsn = get_value([vsn], Info),
+    io:format(" * ~w-~s~n", [App, Vsn]),
+    case proplists:get_bool(full, Opts) of
+	true ->
+	    _ = [ begin
+			print_module(Minfo)
+		end || Minfo <- get_value([modules], Info) ],
+	    ok;
+	false ->
+	    ok
+    end.
+
+print_environments([Env|Envs],Opts) ->
+    print_environment(Env,Opts),
+    print_environments(Envs,Opts);
+print_environments([],_) ->
+    ok.
+
+print_environment({_Key, false},_) -> ok;
+print_environment({Key, Value},_) ->
+    io:format(" - ~s = ~ts~n", [Key, Value]).
+
+print_modules_from_code(M, [Info|Ms], Opts) ->
+    print_module_from_code(M, Info),
+    case proplists:get_bool(full, Opts) of
+	true  -> print_modules_from_code(M, Ms, Opts);
+	false -> ok
+    end;
+print_modules_from_code(_, [], _) ->
+    ok.
+
+print_module_from_code(M, {Path, [{M,ModInfo}]}) ->
+    io:format(" from path \"~ts\" (no application):~n", [Path]),
+    io:format("     - compiler: ~s~n", [get_value([compiler], ModInfo)]),
+    io:format("     -      md5: ~s~n", [get_value([md5], ModInfo)]),
+    io:format("     -   native: ~w~n", [get_value([native], ModInfo)]),
+    io:format("     -   loaded: ~w~n", [get_value([loaded], ModInfo)]),
+    ok;
+print_module_from_code(M, {App,Vsn,Path,[{M,ModInfo}]}) ->
+    io:format(" from path \"~ts\" (~w-~s):~n", [Path,App,Vsn]),
+    io:format("     - compiler: ~s~n", [get_value([compiler], ModInfo)]),
+    io:format("     -      md5: ~s~n", [get_value([md5], ModInfo)]),
+    io:format("     -   native: ~w~n", [get_value([native], ModInfo)]),
+    io:format("     -   loaded: ~w~n", [get_value([loaded], ModInfo)]),
+    ok.
+
+print_module({Mod, ModInfo}) ->
+    io:format("   - ~w:~n", [Mod]),
+    io:format("     - compiler: ~s~n", [get_value([compiler], ModInfo)]),
+    io:format("     -      md5: ~s~n", [get_value([md5], ModInfo)]),
+    io:format("     -   native: ~w~n", [get_value([native], ModInfo)]),
+    io:format("     -   loaded: ~w~n", [get_value([loaded], ModInfo)]),
+    ok.
+
+
+
+%% get useful information from erlang:system_info/1
+
+erlang_system_info() ->
+    erlang_system_info([
+	    allocator,
+	    check_io,
+	    otp_release,
+	    port_limit,
+	    process_limit,
+	    % procs,  % not needed
+	    smp_support,
+	    system_version,
+	    system_architecture,
+	    threads,
+	    thread_pool_size,
+	    {wordsize,internal},
+	    {wordsize,external},
+	    {cpu_topology, defined},
+	    {cpu_topology, detected},
+	    scheduler_bind_type,
+	    scheduler_bindings,
+	    compat_rel,
+	    schedulers_state,
+	    build_type,
+	    logical_processors,
+	    logical_processors_online,
+	    logical_processors_available,
+	    driver_version,
+	    emu_args,
+	    ethread_info,
+	    beam_jump_table,
+	    taints
+	]).
+
+erlang_system_info([]) -> [];
+erlang_system_info([Type|Types]) ->
+    [{Type, erlang:system_info(Type)}|erlang_system_info(Types)].
+
+
+%% get known useful erts environment
+
+os_getenv_erts_specific() -> 
+    os_getenv_erts_specific([
+	    "BINDIR",
+	    "DIALYZER_EMULATOR",
+	    "CERL_DETACHED_PROG",
+	    "EMU",
+	    "ERL_CONSOLE_MODE",
+	    "ERL_CRASH_DUMP",
+	    "ERL_CRASH_DUMP_NICE",
+	    "ERL_CRASH_DUMP_SECONDS",
+	    "ERL_EPMD_PORT",
+	    "ERL_EMULATOR_DLL",
+	    "ERL_FULLSWEEP_AFTER",
+	    "ERL_LIBS",
+	    "ERL_MALLOC_LIB",
+	    "ERL_MAX_PORTS",
+	    "ERL_MAX_ETS_TABLES",
+	    "ERL_NO_VFORK",
+	    "ERL_NO_KERNEL_POLL",
+	    "ERL_THREAD_POOL_SIZE",
+	    "ERLC_EMULATOR",
+	    "ESCRIPT_EMULATOR",
+	    "HOME",
+	    "HOMEDRIVE",
+	    "HOMEPATH",
+	    "LANG",
+	    "LC_ALL",
+	    "LC_CTYPE",
+	    "PATH",
+	    "PROGNAME",
+	    "RELDIR",
+	    "ROOTDIR",
+	    "TERM",
+	    %"VALGRIND_LOG_XML",
+
+	    %% heart
+	    "COMSPEC",
+	    "HEART_COMMAND",
+
+	    %% run_erl
+	    "RUN_ERL_LOG_ALIVE_MINUTES",
+	    "RUN_ERL_LOG_ACTIVITY_MINUTES",
+	    "RUN_ERL_LOG_ALIVE_FORMAT",
+	    "RUN_ERL_LOG_ALIVE_IN_UTC",
+	    "RUN_ERL_LOG_GENERATIONS",
+	    "RUN_ERL_LOG_MAXSIZE",
+	    "RUN_ERL_DISABLE_FLOWCNTRL",
+
+	    %% driver getenv
+	    "CALLER_DRV_USE_OUTPUTV",
+	    "ERL_INET_GETHOST_DEBUG",
+	    "ERL_EFILE_THREAD_SHORT_CIRCUIT",
+	    "ERL_WINDOW_TITLE",
+	    "ERL_ABORT_ON_FAILURE",
+	    "TTYSL_DEBUG_LOG"
+	]).
+
+os_getenv_erts_specific([]) -> [];
+os_getenv_erts_specific([Key|Keys]) ->
+    [{Key, os:getenv(Key)}|os_getenv_erts_specific(Keys)].
+
+split_env(Env) ->
+    split_env(Env, []).
+
+split_env([$=|Vs], Key) -> {lists:reverse(Key), Vs};
+split_env([I|Vs], Key)  -> split_env(Vs, [I|Key]);
+split_env([], KV)       -> lists:reverse(KV). % should not happen.
+
+%% get applications
+
+code() ->
+    % order is important
+    get_code_from_paths(code:get_path()).
+
+get_code_from_paths([]) -> [];
+get_code_from_paths([Path|Paths]) ->
+    case is_application_path(Path) of
+	true -> 
+	    [{application, get_application_from_path(Path)}|get_code_from_paths(Paths)];
+	false ->
+	    [{code, [
+			{path,    Path},
+			{modules, get_modules_from_path(Path)}
+		    ]}|get_code_from_paths(Paths)]
+    end.
+
+is_application_path(Path) ->
+    case filelib:wildcard(filename:join(Path, "*.app")) of
+	[] -> false;
+	_  -> true
+    end.
+
+get_application_from_path(Path) ->
+    [Appfile|_] = filelib:wildcard(filename:join(Path, "*.app")),
+    case file:consult(Appfile) of
+	{ok, [{application, App, Info}]} ->
+	    {App, [
+		    {description, proplists:get_value(description, Info, [])},
+		    {vsn,         proplists:get_value(vsn, Info, [])},
+		    {path,        Path},
+		    {modules,     get_modules_from_path(Path)}
+		]}
+    end.
+
+get_modules_from_path(Path) ->
+    [ 
+	begin
+		{ok,{Mod, Md5}} = beam_lib:md5(Beam),
+		Loaded = case code:is_loaded(Mod) of
+		    false -> false;
+		    _     -> true
+		end,
+		{Mod, [
+			{loaded,   Loaded},
+			{native,   beam_is_native_compiled(Beam)},
+			{compiler, get_compiler_version(Beam)},
+			{md5,      hexstring(Md5)}
+		    ]}
+	end || Beam <- filelib:wildcard(filename:join(Path, "*.beam"))
+    ].
+
+hexstring(Bin) when is_binary(Bin) ->
+    lists:flatten([io_lib:format("~2.16.0b", [V]) || <<V>> <= Bin]).
+
+%% inspect beam files for information
+
+get_compiler_version(Beam) ->
+    case beam_lib:chunks(Beam, [compile_info]) of
+	{ok,{_,[{compile_info, Info}]}} ->
+	    proplists:get_value(version, Info);
+	_ -> undefined
+    end.
+
+%% we don't know the specific chunk names of native code
+%% we don't want to load the code to check it
+beam_is_native_compiled(Beam) ->
+    Chunks = get_value([chunks], beam_lib:info(Beam)),
+    case check_known_hipe_chunks(Chunks) of
+	[] -> false;
+	[Arch] -> {true, Arch};
+	Archs  -> {true, Archs}
+    end.
+
+
+check_known_hipe_chunks([{Tag,_,_}|Cs]) ->
+    case is_chunk_tag_hipe_arch(Tag) of
+	false -> check_known_hipe_chunks(Cs);
+	{true, Arch} -> [Arch|check_known_hipe_chunks(Cs)]
+    end;
+check_known_hipe_chunks([]) -> [].
+
+%% these values are taken from hipe_unified_loader
+%% perhaps these should be exported in that module?
+
+-define(HS8P_TAG,"HS8P").
+-define(HPPC_TAG,"HPPC").
+-define(HP64_TAG,"HP64").
+-define(HARM_TAG,"HARM").
+-define(HX86_TAG,"HX86").
+-define(HA64_TAG,"HA64").
+
+is_chunk_tag_hipe_arch(Tag) ->
+    case Tag of
+	?HA64_TAG -> {true, amd64};       %% HiPE, x86_64, (implicit: 64-bit, Unix)
+	?HARM_TAG -> {true, arm};         %% HiPE, arm, v5 (implicit: 32-bit, Linux)
+	?HPPC_TAG -> {true, powerpc};     %% HiPE, PowerPC (implicit: 32-bit, Linux)
+	?HP64_TAG -> {true, ppc64};       %% HiPE, ppc64 (implicit: 64-bit, Linux)
+	?HS8P_TAG -> {true, ultrasparc};  %% HiPE, SPARC, V8+ (implicit: 32-bit)
+	%% Future:     HSV9               %% HiPE, SPARC, V9 (implicit: 64-bit)
+	%%             HW32               %% HiPE, x86, Win32
+	_ -> false
+    end.
+
+
+get_dynamic_libraries() ->
+    Beam = filename:join([os:getenv("BINDIR"),get_beam_name()]),
+    case os:type() of
+	{unix, darwin} -> os:cmd("otool -L " ++ Beam);
+	_ -> os:cmd("ldd " ++ Beam)
+    end.
+
+get_beam_name() ->
+    Type = case erlang:system_info(build_type) of
+	opt -> "";
+	TypeName -> "." ++ atom_to_list(TypeName)
+    end,
+    Flavor = case erlang:system_info(smp_support) of
+	false -> "";
+	true -> ".smp"
+    end,
+    Beam = case os:getenv("EMU") of
+	false -> "beam";
+	Value -> Value
+    end,
+    Beam ++ Type ++ Flavor.
diff --git a/lib/runtime_tools/src/ttb_autostart.erl b/lib/runtime_tools/src/ttb_autostart.erl
index 5339507cec..4c6971c119 100644
--- a/lib/runtime_tools/src/ttb_autostart.erl
+++ b/lib/runtime_tools/src/ttb_autostart.erl
@@ -1,4 +1,3 @@
-%%%-*- coding: utf-8 -*-
 %%%-------------------------------------------------------------------
 %%% File    : ttb_autostart.erl
 %%% Author  : Bartłomiej Puzoń <[email protected]>
diff --git a/lib/runtime_tools/test/Makefile b/lib/runtime_tools/test/Makefile
index bcabdf13ed..dcb9082231 100644
--- a/lib/runtime_tools/test/Makefile
+++ b/lib/runtime_tools/test/Makefile
@@ -5,6 +5,7 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
 MODULES =  \
 	dyntrace_SUITE \
 	runtime_tools_SUITE \
+	system_information_SUITE \
 	dbg_SUITE \
 	erts_alloc_config_SUITE
 
diff --git a/lib/runtime_tools/test/runtime_tools_SUITE.erl b/lib/runtime_tools/test/runtime_tools_SUITE.erl
index 62497ab527..48ed810918 100644
--- a/lib/runtime_tools/test/runtime_tools_SUITE.erl
+++ b/lib/runtime_tools/test/runtime_tools_SUITE.erl
@@ -25,7 +25,7 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases
--export([app_file/1, start_stop_app/1]).
+-export([app_file/1, appup_file/1, start_stop_app/1]).
 
 %% Default timetrap timeout (set in init_per_testcase)
 -define(default_timeout, ?t:minutes(1)).
@@ -43,6 +43,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [app_file,
+     appup_file,
      start_stop_app].
 
 groups() -> 
@@ -65,6 +66,9 @@ app_file(_Config) ->
     ?line ok = ?t:app_test(runtime_tools),
     ok.
 
+appup_file(_Config) ->
+    ok = ?t:appup_test(runtime_tools).
+
 start_stop_app(_Config) ->
     ok = application:start(runtime_tools),
     Sup = whereis(runtime_tools_sup),
diff --git a/lib/runtime_tools/test/system_information_SUITE.erl b/lib/runtime_tools/test/system_information_SUITE.erl
new file mode 100644
index 0000000000..fb9455a30f
--- /dev/null
+++ b/lib/runtime_tools/test/system_information_SUITE.erl
@@ -0,0 +1,300 @@
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% 
+%% The 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(system_information_SUITE).
+
+-include_lib("common_test/include/ct.hrl").
+
+%% Test server callbacks
+-export([suite/0, all/0, groups/0,
+	 init_per_suite/1, end_per_suite/1,
+	 init_per_group/2, end_per_group/2,
+	 init_per_testcase/2, end_per_testcase/2]).
+
+%% Test cases
+-export([
+	%% API-test
+	api_report/1,
+	api_to_file/1,
+	api_from_file/1,
+	%% server
+	api_start_stop/1,
+	validate_server_interface/1
+    ]).
+
+%%--------------------------------------------------------------------
+%% COMMON TEST CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
+%% Function: groups() -> [Group]
+%%
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%%   The name of the group.
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%%   Group properties that may be combined.
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%%   The name of a test case.
+%% Shuffle = shuffle | {shuffle,Seed}
+%%   To get cases executed in random order.
+%% Seed = {integer(),integer(),integer()}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%%   To get execution of cases repeated.
+%% N = integer() | forever
+%%
+%% Description: Returns a list of test case group definitions.
+%%--------------------------------------------------------------------
+groups() ->
+    [].
+
+%%--------------------------------------------------------------------
+%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+%%
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%%   Name of a test case group.
+%% TestCase = atom()
+%%   Name of a test case.
+%% Reason = term()
+%%   The reason for skipping all groups and test cases.
+%%
+%% Description: Returns the list of groups and test cases that
+%%              are to be executed.
+%%--------------------------------------------------------------------
+all() -> [
+	api_report,
+	api_to_file,
+	api_from_file,
+	api_start_stop,
+	validate_server_interface
+    ].
+
+
+%%--------------------------------------------------------------------
+%% Function: suite() -> Info
+%%
+%% Info = [tuple()]
+%%   List of key/value pairs.
+%%
+%% Description: Returns list of tuples to set default properties
+%%              for the suite.
+%%
+%% Note: The suite/0 function is only meant to be used to return
+%% default data values, not perform any other operations.
+%%--------------------------------------------------------------------
+suite() -> [
+	{timetrap,{minutes,1}},
+	{ct_hooks,[ts_install_cth]}
+    ].
+
+%%--------------------------------------------------------------------
+%% Function: init_per_suite(Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the suite.
+%%
+%% Description: Initialization before the 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) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%%
+%% Description: Cleanup after the suite.
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% GroupName = atom()
+%%   Name of the test case group that is about to run.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding configuration data for the group.
+%% Reason = term()
+%%   The reason for skipping all test cases and subgroups in the group.
+%%
+%% Description: Initialization before each test case group.
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%%
+%% GroupName = atom()
+%%   Name of the test case group that is finished.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding configuration data for the group.
+%%
+%% Description: Cleanup after each test case group.
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% Function: init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is about to run.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%%
+%% 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.
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Function: end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%%
+%% TestCase = atom()
+%%   Name of the test case that is finished.
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for failing the test case.
+%%
+%% Description: Cleanup after each test case.
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Function: TestCase(Config0) ->
+%%               ok | exit() | {skip,Reason} | {comment,Comment} |
+%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+%%
+%% Config0 = Config1 = [tuple()]
+%%   A list of key/value pairs, holding the test case configuration.
+%% Reason = term()
+%%   The reason for skipping the test case.
+%% Comment = term()
+%%   A comment about the test case that will be printed in the html log.
+%%
+%% Description: Test case function. (The name of it must be specified in
+%%              the all/0 list or in a test case group for the test case
+%%              to be executed).
+%%--------------------------------------------------------------------
+
+
+api_report(_Config) ->
+    Report = system_information:report(),
+    ok     = validate_report(Report),
+    ok.
+
+api_to_file(Config) ->
+    DataDir  = ?config(data_dir, Config),
+    Filename = filename:join([DataDir, "system_information_report_1.dat"]),
+    ok      = system_information:to_file(Filename),
+    {ok, _} = file:consult(Filename),
+    {save_config, [{report_name, Filename}]}.
+
+api_from_file(Config) ->
+    {api_to_file, Saved} = ?config(saved_config, Config),
+    DataDir = ?config(data_dir, Config),
+    Fname1  = filename:join([DataDir, "information_test_report.dat"]),
+    Report1 = system_information:from_file(Fname1),
+    ok      = validate_report(Report1),
+    Fname2  = ?config(report_name, Saved),
+    Report2 = system_information:from_file(Fname2),
+    ok      = validate_report(Report2),
+    ok.
+
+api_start_stop(_Config) ->
+    {ok, _} = system_information:start(),
+    ok      = system_information:stop(),
+    ok.
+
+validate_server_interface(Config) ->
+    DataDir = ?config(data_dir, Config),
+    Fname1  = filename:join([DataDir, "information_test_report.dat"]),
+    %% load old report
+    ok = system_information:load_report(file, Fname1),
+    ok = validate_loaded_report(),
+    ok = system_information:stop(),
+    %% load local
+    ok = system_information:load_report(),
+    ok = validate_loaded_report(),
+    ok = system_information:stop(),
+    ok.
+
+
+%% aux
+
+validate_loaded_report() ->
+    ok = system_information:applications(),
+    ok = system_information:applications([full]),
+    ok = system_information:environment(),
+    ok = system_information:environment([full]),
+    ok = system_information:application(kernel),
+    ok = system_information:application(kernel,[full]),
+    ok = system_information:module(gen_server),
+    ok = system_information:module(gen_server,[full]),
+    ok = system_information:modules(native),
+    ok.
+
+
+validate_report([]) -> {error, no_entries};
+validate_report(Report) ->
+    ensure_report_keys([
+	    init_arguments,
+	    code_paths,
+	    code,
+	    system_info,
+	    erts_compile_info,
+	    beam_dynamic_libraries,
+	    environment_erts,
+	    environment
+	], Report).
+
+ensure_report_keys([], _) -> ok;
+ensure_report_keys([K|Ks], Report) ->
+    case lists:keysearch(K, 1, Report) of
+	false -> {error, key_not_found, K};
+	_     -> ensure_report_keys(Ks, Report)
+    end.
+
diff --git a/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
new file mode 100644
index 0000000000..0900eadd4a
--- /dev/null
+++ b/lib/runtime_tools/test/system_information_SUITE_data/information_test_report.dat
@@ -0,0 +1,9873 @@
+{system_information_version, "1.0"}.
+{system_information, [{init_arguments,
+                [{root,
+                  ["/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp"]},
+                 {progname,["erl"]},
+                 {home,["/home/otptest"]}]},
+               {code_paths,
+                [".",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/kernel-2.16.3/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/stdlib-1.19.3/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/xmerl-1.3.3/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/wx-1.0/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/webtool-0.8.9.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/typer-0.9.5/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/tv-2.1.4.10/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/tools-2.6.11/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/toolbar-1.4.2.3/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/test_server-3.6.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/syntax_tools-1.6.11/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/ssl-5.3/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/ssh-2.1.7/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/snmp-4.24/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/sasl-2.3.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/runtime_tools-1.8.11/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/reltool-0.6.4/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/public_key-0.19/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/pman-2.7.1.4/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/percept-0.8.8.1/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/parsetools-2.0.9/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/otp_mibs-1.0.8/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/os_mon-2.2.12/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/orber-3.6.26.1/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/odbc-2.10.16/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/observer-1.3.1/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/mnesia-4.9/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/megaco-3.17.0.1/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/jinterface-1.5.8",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/inets-5.9.5/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/ic-4.3.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/hipe-3.10.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/gs-1.5.15.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/eunit-2.2.4/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/et-1.4.4.4/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/erts-5.10.3/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/erl_interface-3.7.13",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/erl_docgen-0.3.4/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/eldap-1.0.1/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/edoc-0.7.12/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/diameter-1.4.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/dialyzer-2.6.1/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/debugger-3.2.11/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/crypto-3.0/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosTransactions-1.2.13/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosTime-1.1.13/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosProperty-1.1.16/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosNotification-1.1.20/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosFileTransfer-1.1.15/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosEventDomain-1.1.13/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosEvent-2.1.14/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/compiler-4.9.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/common_test-1.7.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/asn1-2.0.2/ebin",
+                 "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/appmon-2.1.14.2/ebin"]},
+               {code,
+                [{code,[{path,"."},{modules,[]}]},
+                 {application,
+                  {kernel,
+                   [{description,"ERTS  CXC 138 10"},
+                    {vsn,"2.16.3"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/kernel-2.16.3/ebin"},
+                    {modules,
+                     [{application,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"69c3102d717e7258701a536ddae1eb89"}]},
+                      {application_controller,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1bbfd81a8486ac040562ce0fd40c32aa"}]},
+                      {application_master,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d8eee82bfd661e8f0d862f3aad5b85ca"}]},
+                      {application_starter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d505f3189443053e586fdf270446ce2f"}]},
+                      {auth,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"800c93bf9ba03b6e4951de0d5db28328"}]},
+                      {code,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"84f37378526c5e82c5d0d967c1ca8f82"}]},
+                      {code_server,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"09ce0ef7103f3151553c6badc7e96fc1"}]},
+                      {disk_log,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a5ab0573095f258c87f6166af8f8425c"}]},
+                      {disk_log_1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"287f2521436a30a0567d54e2596c1034"}]},
+                      {disk_log_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4c7972e5f3dedce5c87cf8ef88c59bb2"}]},
+                      {disk_log_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c6012237e70b570585bfb58f60537d9c"}]},
+                      {dist_ac,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4dfa17c94d63da8f6b9edb1532a3e537"}]},
+                      {dist_util,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8fa19e7b4bca4b5aac847d138c85c553"}]},
+                      {erl_boot_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"86ecca01e41b2321c01b7181cb826766"}]},
+                      {erl_ddll,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"90f1c7a6fd3cf6595d95b9f57abd87ce"}]},
+                      {erl_distribution,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"16a49a506b48567bd32b2021dac425ff"}]},
+                      {erl_epmd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eee4870e061790054c43ff70bbccbe25"}]},
+                      {erl_reply,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0e0a4f09b0877938b4d79b41122dad38"}]},
+                      {error_handler,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1af2b51d167b017b3e1fae0beb408181"}]},
+                      {error_logger,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"941136b080021af90dc32f23774b0def"}]},
+                      {erts_debug,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e2a7b675323db5946605344ffccca170"}]},
+                      {file,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5eccb55276e7162ab5bec77b46562332"}]},
+                      {file_io_server,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"032292fd7d9e2bf08ff23de192710f97"}]},
+                      {file_server,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"58bd1e532dee0fccff9e1fba1e429a5e"}]},
+                      {gen_sctp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1e5e5a8c7708c9a81f26d2a89e3987c"}]},
+                      {gen_tcp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4cf58918602a7242ca4060bc1d6b5652"}]},
+                      {gen_udp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"361b9b25604b9053a8a4c98b8df47408"}]},
+                      {global,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e553137965978f64ffb9ef274c79e9c2"}]},
+                      {global_group,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8ce6b230fef9340aeb41205a6ef4b4f3"}]},
+                      {global_search,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0a82f2701d71d2a1576074dd69414e1b"}]},
+                      {group,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6b3164d5d61625f0651c13107459627c"}]},
+                      {heart,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b808d9003cf50d73ebf888da50d73e12"}]},
+                      {hipe_unified_loader,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"879423975936fcf88729034f7d4a93b6"}]},
+                      {inet,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bd325ceedcab3ca885eeaf4c982561e0"}]},
+                      {inet6_sctp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d8b6d95ec571f5e669047b5f40455d21"}]},
+                      {inet6_tcp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"93a9204ef927b17957c61a18f3ba47e2"}]},
+                      {inet6_tcp_dist,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9a94acd2c5dc0e625d2c2b4292e9a27a"}]},
+                      {inet6_udp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"17a90b344977dd2c657309507c99b516"}]},
+                      {inet_config,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"741587fa47d6b66b96ef125b3d5ba61a"}]},
+                      {inet_db,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f65160805d30ff194618a5ae4038ae9f"}]},
+                      {inet_dns,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7f0c31b6cecf31d641bf46840f85ebee"}]},
+                      {inet_gethost_native,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"09867d1d19f3c30b73fb47a48d0d843a"}]},
+                      {inet_hosts,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a0f48322bd3a1bd0e75f248e39b41f69"}]},
+                      {inet_parse,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"29aee7378a4d1f814e1fd311d0eaab3a"}]},
+                      {inet_res,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c1018a662254323cfa45309afb3b3397"}]},
+                      {inet_sctp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cbce09a1ffa13cb124d87eaecd25dfbf"}]},
+                      {inet_tcp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0da6499cb44db53be6145a5dc3449d93"}]},
+                      {inet_tcp_dist,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"797e28cd89efe3a1a9d83244afd0b880"}]},
+                      {inet_udp,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"70908d7165a2b298a85d9a4c1f8f9fa2"}]},
+                      {kernel,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cf5c248b778654e664e6d2368ec285df"}]},
+                      {kernel_config,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"39fbe27956eeb0cca9d7871f7de40a2e"}]},
+                      {net,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cb8595f084959a2b5e329ab32047dbc4"}]},
+                      {net_adm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"628c961d8dbbab4c5b2b180e527530be"}]},
+                      {net_kernel,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"049f43826000bfefbbc2376bd21c9919"}]},
+                      {os,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"464c6c09afb87824ecf12bfa6065b3dc"}]},
+                      {pg2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"34858fa3619c1dc17d01536593359ed2"}]},
+                      {ram_file,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"28bf8253c5f8357ab68b4d505e170856"}]},
+                      {rpc,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"895e080302ac8a39197dfac0cc53adc6"}]},
+                      {seq_trace,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"845af954b395a80e5cf3d0c2ea0a3b99"}]},
+                      {standard_error,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c0ac4192fd9f73885581481638c1648a"}]},
+                      {user,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"93ad1841fa2dee776bff76f8989f5021"}]},
+                      {user_drv,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"161f1a45735f77129c80bacd778e5632"}]},
+                      {user_sup,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"baab537a62725bcbe4510c9f0b2d99eb"}]},
+                      {wrap_log_reader,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5dceb6e671d0c51d181f51ec4e031798"}]}]}]}},
+                 {application,
+                  {stdlib,
+                   [{description,"ERTS  CXC 138 10"},
+                    {vsn,"1.19.3"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/stdlib-1.19.3/ebin"},
+                    {modules,
+                     [{array,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c7c98b180715bd79794eef21a2930fff"}]},
+                      {base64,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e45b571f2414c6131fbf62b1da3560e5"}]},
+                      {beam_lib,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9e13b050aff529ecac6569f7101237ba"}]},
+                      {binary,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1e77ffd0688b3f1ace1ac70936969da3"}]},
+                      {c,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"402465a98ccec8e9314139daacf6203e"}]},
+                      {calendar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c09413575ac7f80ea3d9217b1f7e1bc"}]},
+                      {dets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5154c82c2ffefa19096cf87ffb394a6c"}]},
+                      {dets_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c810e731ba4101aba5f6b6c08481ea85"}]},
+                      {dets_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9b4a9ef0f616b7c5464cf6813384e220"}]},
+                      {dets_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a64e0220f855e6e97d53a9bc4f0a111b"}]},
+                      {dets_v8,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ebf2c94f62d180c3159b663ba2094189"}]},
+                      {dets_v9,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9098391234b6304ff3d106dc56d467b6"}]},
+                      {dict,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0bc1d74a65bd392960cd7e1b230f07bf"}]},
+                      {digraph,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ac9049d6d7454a87c40c2f03f4223849"}]},
+                      {digraph_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"17bbe67d3314e9024825512c1ccc7be8"}]},
+                      {edlin,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"518247b4963c998e742c0794091c9864"}]},
+                      {edlin_expand,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"06c4ff7cf326df872bec9feed7f5984d"}]},
+                      {epp,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"493760bc942ddd16df2a8e55f8b59774"}]},
+                      {erl_bits,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bba2a00b28557c9678356247c36b0474"}]},
+                      {erl_compile,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"291c9ddceeb66c7a7c36ab3505799513"}]},
+                      {erl_eval,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9982f2bca01a352a45932a6db95a1336"}]},
+                      {erl_expand_records,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"047c93973c9fbf83724cdf688e258cff"}]},
+                      {erl_internal,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3225aadc9ec4f84cc9451f30833cdefb"}]},
+                      {erl_lint,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"98ffb79824edc0f2a8ad49ff447e121c"}]},
+                      {erl_parse,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f9a3d97b028bafa2bba7037bc1987d87"}]},
+                      {erl_posix_msg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ecb0903ecde21b7cc58277424d8bac3d"}]},
+                      {erl_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1b7945b193daf989e3f62c4a452f773e"}]},
+                      {erl_scan,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1dd9fb779b35d1925a0ad68c092af1f0"}]},
+                      {erl_tar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c6161b31a69bd3566a910d369baae00"}]},
+                      {error_logger_file_h,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"218156df9bdedd04e37eecc76863940c"}]},
+                      {error_logger_tty_h,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a2cac9386113d6879a4111be3e2d191b"}]},
+                      {escript,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b77d5172cf00acd06fd6e42f03dc9b06"}]},
+                      {ets,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"13c77916ba3c85e6e076aa0664f5674f"}]},
+                      {eval_bits,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7bf8829d056519787fd0f7900bd04b73"}]},
+                      {file_sorter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4e31c9ca53e59010980dfc4e46e8aaf1"}]},
+                      {filelib,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"641651ced98857991b064b22c85cf90f"}]},
+                      {filename,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9a007021a1e9de6af67e99cc48be13c5"}]},
+                      {gb_sets,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4891f6d98f4bb81bc64415434d08ff9d"}]},
+                      {gb_trees,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4e9a8ae86761c41dc0e9d32f57df63c3"}]},
+                      {gen,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5beaa9b295439aa39187eeef56b8527b"}]},
+                      {gen_event,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"79bc1c9f72e633331d4518d982221af0"}]},
+                      {gen_fsm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fb95e4cf29f5cf640e486c789fe9f1f7"}]},
+                      {gen_server,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"14f189569fb6420c633a5dab81f7b897"}]},
+                      {io,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"75fd9a0dc5823e95b4543a09be83c6ce"}]},
+                      {io_lib,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"34c18dd02ec6458cae20ddc323542eed"}]},
+                      {io_lib_format,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1f8f2a4d12d79d82420335d0e84107a"}]},
+                      {io_lib_fread,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"27699e322a2de2004b057465f549fa3f"}]},
+                      {io_lib_pretty,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"32d7bae40549bdd60298c0d17efe057b"}]},
+                      {lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"394b1b967c909d1830939846963ac4f0"}]},
+                      {lists,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f840b76db5f9e5d37dcc9dc39a436b90"}]},
+                      {log_mf_h,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6f972dea76e360d99074b659327db69f"}]},
+                      {math,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fe02e030a198ec343f3c4a62f60ebf8a"}]},
+                      {ms_transform,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dba72a603f0a9382274671842d6aaf55"}]},
+                      {orddict,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bedb6cdaf10530b2486b46f79853fbea"}]},
+                      {ordsets,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f5dfe0e73da077c2f86dbbe846e0dab7"}]},
+                      {otp_internal,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ff3edabfa0633b9553b6fed1e47e41fc"}]},
+                      {pg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c3975b993694a2a465d331278b503f81"}]},
+                      {pool,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d0398428064137474f5acbb4122a70d"}]},
+                      {proc_lib,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5542f4add07ef7bb54a76b0cdfa542ba"}]},
+                      {proplists,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5723876c3ed585a5a4b10dc3aefaf170"}]},
+                      {qlc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"75df6efc99d9a75bb4c989985125d3da"}]},
+                      {qlc_pt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e84b6da8fb84f811f2c58365e59dd47f"}]},
+                      {queue,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"221ed57d299c2281992706fd6e2c6584"}]},
+                      {random,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e703cb7ee27e2e23baf924c2f6b29f50"}]},
+                      {re,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6eef786ed4f4dfec57a568e488e3596d"}]},
+                      {sets,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c4fbf3b29bf971465a8dc4077fc3e7c8"}]},
+                      {shell,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c4fdd7e1d18047b5f086b6fe8730c896"}]},
+                      {shell_default,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5a94fd884c9594ff9056228503cd2731"}]},
+                      {slave,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f5536e71d137302d699982fc65b9d025"}]},
+                      {sofs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"10f13cd4626d429897246538c02c2cb4"}]},
+                      {string,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d7440fe2e1838223f877286bf7d8f2a4"}]},
+                      {supervisor,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"29c98bf9e58cc955d4c29d881d98e84f"}]},
+                      {supervisor_bridge,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f58b58a1fefecc46a476490ef5231d7e"}]},
+                      {sys,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7afd9c746450e5189048ff3635b37926"}]},
+                      {timer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fa3e2b017848accc808f92910abf87b8"}]},
+                      {unicode,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be45160097c37c9144169f4ba54e0128"}]},
+                      {win32reg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9f59ec1a4af1e6381d8770fc2c5915e4"}]},
+                      {zip,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bc9aab95b5fc9ee7e534e890d8e5516c"}]}]}]}},
+                 {application,
+                  {xmerl,
+                   [{description,"XML parser"},
+                    {vsn,"1.3.3"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/xmerl-1.3.3/ebin"},
+                    {modules,
+                     [{xmerl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1eabeb9846b832059537e2bdf6fed2d2"}]},
+                      {xmerl_b64Bin,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62075ae2d95f3188143a41f582542bf9"}]},
+                      {xmerl_b64Bin_scan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bd99982371c4db3baf4883c96e146c96"}]},
+                      {xmerl_eventp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"99aad15d2ad4be80d580fe7e3ba4178f"}]},
+                      {xmerl_html,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f79915eaadae7d92946f1182110e6f81"}]},
+                      {xmerl_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91fe55408e50bf92a9f8ef8b402a3e51"}]},
+                      {xmerl_otpsgml,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f2e027e7204405c168eaa598a6a4d476"}]},
+                      {xmerl_regexp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"408f3ffbd843e09ed0326f5e6a72356e"}]},
+                      {xmerl_sax_old_dom,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"66b229f3eec3dce1f8754de256ba8d1d"}]},
+                      {xmerl_sax_parser,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"66e80c0d03a583d22abc40a54096777c"}]},
+                      {xmerl_sax_parser_latin1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e2a462359d6765811f41b1ac1260c81a"}]},
+                      {xmerl_sax_parser_list,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"db56224dbccdf302e42479027c3f961b"}]},
+                      {xmerl_sax_parser_utf16be,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aaa379b8f1008944bd486f29a85ab1c2"}]},
+                      {xmerl_sax_parser_utf16le,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"027d5c2218de2a7dd6f5db3b1c433a74"}]},
+                      {xmerl_sax_parser_utf8,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"40f970e9b4eb4122589c0afec6b8907d"}]},
+                      {xmerl_sax_simple_dom,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2c08dc40f819e4972a58a2fb2fcf6239"}]},
+                      {xmerl_scan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0afb5a6c37db1b5dd100297a149d9f8a"}]},
+                      {xmerl_sgml,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"22933821d58054ab2941678ce2f8a298"}]},
+                      {xmerl_simple,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8c83463864e0c2117c7659aae4e6ae50"}]},
+                      {xmerl_text,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"661d77ea6d07fe6281f04e8e553528d4"}]},
+                      {xmerl_ucs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8ace187d193a5314fbe329eba939dcf0"}]},
+                      {xmerl_uri,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1121ced96856184d51daecddbb4b562f"}]},
+                      {xmerl_validate,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fe1eb20e24d92db08eb03a7a3fbbd73a"}]},
+                      {xmerl_xlate,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2515e06ee34909465fb4520f199f5a46"}]},
+                      {xmerl_xml,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e04d0e513bb48336b9e69de89208e97c"}]},
+                      {xmerl_xpath,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02a4e2d946ffe93e960c66ce0d391628"}]},
+                      {xmerl_xpath_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d6531ac82f1524946a0a31f40a90546d"}]},
+                      {xmerl_xpath_parse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7b3bd078c12f46cf5154d05c49880058"}]},
+                      {xmerl_xpath_pred,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e2a7d97114507d23ad8cfdf967fd656f"}]},
+                      {xmerl_xpath_scan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1d43883f65aa0006900fc053453d1bd2"}]},
+                      {xmerl_xs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6963383b4148fd4a7d51bf8e54b79640"}]},
+                      {xmerl_xsd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4660a75a540225ba8a88c00914923507"}]},
+                      {xmerl_xsd_type,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be422d840d07c53b8ba210889dd5d308"}]}]}]}},
+                 {application,
+                  {wx,
+                   [{description,"Yet another graphics system"},
+                    {vsn,"1.0"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/wx-1.0/ebin"},
+                    {modules,
+                     [{gl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2b2c807a7fbd4012871027dd4292448b"}]},
+                      {glu,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"28a23cf86e317c54ebd1b609b38f2fe3"}]},
+                      {wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"854481fd306d90c1fe6ad683045a1d98"}]},
+                      {wxAcceleratorEntry,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d7572b3e8662e26666964cc64ff7b90"}]},
+                      {wxAcceleratorTable,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a261f6c3e0d571493a46fcd40b0361f7"}]},
+                      {wxArtProvider,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"22bc145a24e52e15d6e0f66e3f057df7"}]},
+                      {wxAuiDockArt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"22fca5ae251c6592dda5b08c0688138a"}]},
+                      {wxAuiManager,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6f87b4fc280d820edca4655bfc0388bd"}]},
+                      {wxAuiManagerEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d08f2847271aae031ed49a0cab96e8f1"}]},
+                      {wxAuiNotebook,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4b055991aa4efef19c59653db60d611e"}]},
+                      {wxAuiNotebookEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f9fc2a85bda82dc6406833d3746a1313"}]},
+                      {wxAuiPaneInfo,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"96dc39e65e2d04e597a76663651cbe45"}]},
+                      {wxAuiTabArt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0641080a257e4c0ce7030d7a404ea965"}]},
+                      {wxBitmap,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62ddedace917fe7d65ebfdd968e2b442"}]},
+                      {wxBitmapButton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"676cbd0f421681f3cdb110b08b89cdf4"}]},
+                      {wxBitmapDataObject,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9ab868e8a18350bb427d08abd31d805c"}]},
+                      {wxBoxSizer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8f30f0ad197cd2fe6bb6956ecf55009e"}]},
+                      {wxBrush,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f41534b5b14c0528729f3faba6d97e1d"}]},
+                      {wxBufferedDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"14bd8d1184f57ca3b71ae50c396b8fb6"}]},
+                      {wxBufferedPaintDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b617bb74c090fd1bedd78a44e87620df"}]},
+                      {wxButton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cee0c2cf94d454426067a18f222b5175"}]},
+                      {wxCalendarCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"684d559165e957aac543b2f75db8821a"}]},
+                      {wxCalendarDateAttr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d3406fdefafb1e56b3b4b0c049e8f306"}]},
+                      {wxCalendarEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"deb02e8741160ee9f1a44853db16a6d3"}]},
+                      {wxCaret,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"543d4a99c593ac822143cc4c680fbe10"}]},
+                      {wxCheckBox,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ae5b445190e6d0811bc3bf41c269ad7a"}]},
+                      {wxCheckListBox,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"094de5ba936cca4c26ffc0b765d371be"}]},
+                      {wxChildFocusEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d4d29ee311555ab76419724546859432"}]},
+                      {wxChoice,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b7e31246a035375896498e17c366beaa"}]},
+                      {wxChoicebook,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"32665c0637a00816a2fff4d4f5f418c1"}]},
+                      {wxClientDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"400fdcc0f51e0e5043be4ca4da99a8a7"}]},
+                      {wxClipboard,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4ddbb8e1f11321204d48d247e9f7548b"}]},
+                      {wxCloseEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"815ac954da8b6cb7b694ca4cb28ccd50"}]},
+                      {wxColourData,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"84cf04d6327af73aabd2f775d16bac5d"}]},
+                      {wxColourDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d8e90d5109efec91ee6417d01b929951"}]},
+                      {wxColourPickerCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e7fb673975f4cfa9946c34e30109d036"}]},
+                      {wxColourPickerEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2cfa29b0fce7f98058c3d5ad016c1f2f"}]},
+                      {wxComboBox,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b2aa520b9051f42a5e0f1ce1c6408101"}]},
+                      {wxCommandEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e5fed22a39c6c80dcc029ebe5444b0c0"}]},
+                      {wxContextMenuEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0a1739b84b365833c87232bfb298f681"}]},
+                      {wxControl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aed7a496290caa0b53740c681de998ec"}]},
+                      {wxControlWithItems,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a14351fadd0f776a4deeaf5ec518a689"}]},
+                      {wxCursor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"79eadaef3d9df7bae0a2146634d43e72"}]},
+                      {wxDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3f88cfd62f368172c3ed90684df53ba3"}]},
+                      {wxDataObject,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"065ea6f1e76ca8b6558ca3dd7ff42077"}]},
+                      {wxDateEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"56c06074946764fbc74b7070f5759e19"}]},
+                      {wxDatePickerCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c716525fffbc864c85159fb43b2a8d64"}]},
+                      {wxDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1a480a0c1690092014cf8198ba52d2a3"}]},
+                      {wxDirDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"43565cc473a21632555cb3151138b7c0"}]},
+                      {wxDirPickerCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6463e54c6564a1f7f5d6bec082f9ea63"}]},
+                      {wxDisplayChangedEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1dbd9061f370f3db0343c4f88f57cfa3"}]},
+                      {wxEraseEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ff780a85a34cb23667b7e4072db17a2b"}]},
+                      {wxEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8644675e2fd7bbc6965d4babd0d14d7a"}]},
+                      {wxEvtHandler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c0991f5d86247ce757145c326adea516"}]},
+                      {wxFileDataObject,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cd9b5735e3994492c32ca099a70093d0"}]},
+                      {wxFileDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b9cb446535683e7a9258953f53cd77de"}]},
+                      {wxFileDirPickerEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6153d339ac822da8c4a9d766d0af22f9"}]},
+                      {wxFilePickerCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5c9ff43ff739e3ee37aae637a494d7d3"}]},
+                      {wxFindReplaceData,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bccc5beebb4aa0bfd424d26f472745a6"}]},
+                      {wxFindReplaceDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c40b557d35e4bc527a715996daad0e0c"}]},
+                      {wxFlexGridSizer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ed3da3c3822f59a6b2737f273397367d"}]},
+                      {wxFocusEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1c04cb018d6c94d24a44ae365dae46c1"}]},
+                      {wxFont,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"64303b1a35432898649e40e9c3f5bdd2"}]},
+                      {wxFontData,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0135398ad369de2fd9beda1553f7d309"}]},
+                      {wxFontDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a872a3b88df4faa051e4b1f8cb0397a0"}]},
+                      {wxFontPickerCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5e5b363ea487a4284714346d43d6c418"}]},
+                      {wxFontPickerEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a22e0effda4c521ce1b35bd5b2259758"}]},
+                      {wxFrame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"168aac11a6c3835b122ee653ce2e50a0"}]},
+                      {wxGBSizerItem,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"857c0be340c9c324d39cd525749a7cf7"}]},
+                      {wxGLCanvas,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"88461209c2234e4e166923d760a42164"}]},
+                      {wxGauge,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4d998a1ffcf56ccf2ea3a12eabe375d9"}]},
+                      {wxGenericDirCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c5f8f19f7fdf9545c1a08318a12782b8"}]},
+                      {wxGraphicsBrush,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9eeb08fd93c17259400e13b1586ef6ee"}]},
+                      {wxGraphicsContext,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bee681fb85f534a63c2747e704d9001d"}]},
+                      {wxGraphicsFont,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be1d636aa381e330db93a1deb9ff4b13"}]},
+                      {wxGraphicsMatrix,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b452f9e3d87800b00e063b39d71583aa"}]},
+                      {wxGraphicsObject,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"64dba881c5b70355d45323363715ba69"}]},
+                      {wxGraphicsPath,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e93e67098fd350e7eb20ccc5f7287b30"}]},
+                      {wxGraphicsPen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9c8c8c3cf5277cdc526dca9e591a10b0"}]},
+                      {wxGraphicsRenderer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4aeb3961b9b1a22263c8abf2473cc53f"}]},
+                      {wxGrid,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e1195ea11e71c0534fffa76535efefbf"}]},
+                      {wxGridBagSizer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"60ee2c7022f1feef9c169a191945d637"}]},
+                      {wxGridCellAttr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02222543db113d41d409cd4080764d49"}]},
+                      {wxGridCellBoolEditor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"297c5d3648d99bef9bc294d52d28b619"}]},
+                      {wxGridCellBoolRenderer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5cf8954049f0443ea2f9003deae7960d"}]},
+                      {wxGridCellChoiceEditor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b77d6b8cb344c4512cef8adaf23ef93b"}]},
+                      {wxGridCellEditor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a5cf6065e8754f96612cff48a1fdcd20"}]},
+                      {wxGridCellFloatEditor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"723baea27c999730afcacb3280f611c4"}]},
+                      {wxGridCellFloatRenderer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ab56332ebccd1245fff7cb86abfd670b"}]},
+                      {wxGridCellNumberEditor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f0d86be445b03945610d9154c8905258"}]},
+                      {wxGridCellNumberRenderer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"28ae774386962927dd552da4e9a28ca1"}]},
+                      {wxGridCellRenderer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a6da61c7ff2464f3b007626b1f813dcb"}]},
+                      {wxGridCellStringRenderer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aefd3b8019cc4321037c8bd8e4faeba2"}]},
+                      {wxGridCellTextEditor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dbce8b54a66e9a9869d84655ef26d908"}]},
+                      {wxGridEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7b41f04ffe42c4602fe2911b5ca44dbe"}]},
+                      {wxGridSizer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"37bfde707aa6f2a1f68f8377dcbd7580"}]},
+                      {wxHelpEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"714f8b000f3d09fe7eae13b1a5daa0c7"}]},
+                      {wxHtmlEasyPrinting,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eaa59118b8408b91d16df3b600494e5e"}]},
+                      {wxHtmlLinkEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6f527856d02011b9f480494b2f3118f0"}]},
+                      {wxHtmlWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"61e947b44d4ae81b9bb0faf9a443cbd3"}]},
+                      {wxIcon,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1b4d9209343a029641204f334bd07dc5"}]},
+                      {wxIconBundle,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3281d9d364552b38009405e79467d5c5"}]},
+                      {wxIconizeEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d66e4289534961f6868d91e1d1399b53"}]},
+                      {wxIdleEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fc82957c3a0181ef84ca78ace7a9271e"}]},
+                      {wxImage,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"25de92b502b3a920e1247d2d1433aa32"}]},
+                      {wxImageList,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3445492f371fe7d2a6f7534d61ad66a9"}]},
+                      {wxJoystickEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"15c7352ac168dc5adc0de4a872b9740c"}]},
+                      {wxKeyEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b2e23f50406c65d5f2269910467a9721"}]},
+                      {wxLayoutAlgorithm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2f93e6eac8570144faabaea83388129a"}]},
+                      {wxListBox,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"87aade14ade89a7021b6908143d339f1"}]},
+                      {wxListCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1e35643c3218ee7db6bf18dbd72bc470"}]},
+                      {wxListEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"90354ad1e09b594dd321bca68d8d3f02"}]},
+                      {wxListItem,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be95e4c22e265fbcfb14ab7c9c798684"}]},
+                      {wxListItemAttr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0137573b7a2b2569b481548c26bb91a9"}]},
+                      {wxListView,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c0022979dbcc2ac873adb72ea26c16aa"}]},
+                      {wxListbook,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0e4b01ad81bf68f1784ba30772502e0b"}]},
+                      {wxLogNull,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"17f8273288c6e880ec0c7a21842b022f"}]},
+                      {wxMDIChildFrame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5894b4a01bb643f208995257a0f9a00f"}]},
+                      {wxMDIClientWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fa7017cfb2e70f0492550a2ecd01d1c7"}]},
+                      {wxMDIParentFrame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"251cf2044002bbb5afc2acddf442f14a"}]},
+                      {wxMask,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8b4ce241e6edd84d32df4b40a2f17a15"}]},
+                      {wxMaximizeEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e8a766afd7de5050ced825a275c6cdba"}]},
+                      {wxMemoryDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b4c1bb9fed0edf70b44f24ea3fb54f39"}]},
+                      {wxMenu,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d2e48cd879d0ece5ee24260bc70e2f9b"}]},
+                      {wxMenuBar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"562e9979f8ce58c85032ae3e02307d7b"}]},
+                      {wxMenuEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0571277ab11e756d18d34c6cb4f8f1c0"}]},
+                      {wxMenuItem,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"900c9de70ac02a326bce22eec1c64d48"}]},
+                      {wxMessageDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a15267b44d3cbeae16c294c4c0b96324"}]},
+                      {wxMiniFrame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ca0204b8a167fd472a555695e58927b"}]},
+                      {wxMirrorDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d521a1f1e4d37132a7a0de0eccc332f0"}]},
+                      {wxMouseCaptureChangedEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f85672fbf15ee0b8306de4aaf4eb4719"}]},
+                      {wxMouseEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"802c21f46105f957d8cd8c84ff36d986"}]},
+                      {wxMoveEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4231fd181e0b305a82c595f66eb99b96"}]},
+                      {wxMultiChoiceDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4eb40bfa965a25034ebe4b8fca335863"}]},
+                      {wxNavigationKeyEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"04b113c9dcf181af633d0eae1f18c36f"}]},
+                      {wxNotebook,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fef44c082d799a4d86e0cd8db58609df"}]},
+                      {wxNotebookEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0ccae052bfd1cf87236add4c0b26143d"}]},
+                      {wxNotifyEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d3d22b2b86ce1a94c57ccd9842211f05"}]},
+                      {wxPageSetupDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"755792c8d70118493f5147ef26f40d00"}]},
+                      {wxPageSetupDialogData,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"942f2c8bd296e971ea1d0f74ec700be5"}]},
+                      {wxPaintDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c23afeac816efecc5417b0687437d8cf"}]},
+                      {wxPaintEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a18ce83af679d334ce979df65607226c"}]},
+                      {wxPalette,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a5b3e165b8ac3e3cb2d5ba6e149bb0ca"}]},
+                      {wxPaletteChangedEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"785c765df0a50eac4b2c5c054453c0d9"}]},
+                      {wxPanel,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"08c772b8c30e7441366bcfcd5005f21d"}]},
+                      {wxPasswordEntryDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62b860fd64e74f7d67c51a5d8a0fb157"}]},
+                      {wxPen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"51b981a9e2313e58123888c6b67192ed"}]},
+                      {wxPickerBase,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ab9e2f2d6c3b5f8184d5b1d806b0dce"}]},
+                      {wxPostScriptDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8a820bdc1354c448a8b442016951a6b2"}]},
+                      {wxPreviewCanvas,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e7b48321129f0e14c2006272c8926544"}]},
+                      {wxPreviewControlBar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62393081a6ffcb6bf092b47703e31b4d"}]},
+                      {wxPreviewFrame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"78f39bbfead1330839955a50281a2329"}]},
+                      {wxPrintData,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"928a6a97c5c4b664687015c40d660cdf"}]},
+                      {wxPrintDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"acc4c816bf0a64c8ce31af3c001f1688"}]},
+                      {wxPrintDialogData,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fc97f97b620110928f4093806b1b8ce4"}]},
+                      {wxPrintPreview,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"92f04b064e7b041ee27bb202e5a60b80"}]},
+                      {wxPrinter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"05626841c780ceaf3c5af0212f53fbaf"}]},
+                      {wxPrintout,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"feea26109fa63e4d98c2924189762a43"}]},
+                      {wxProgressDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eb45280951aef0038b8130c91a333833"}]},
+                      {wxQueryNewPaletteEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be6c85603e81f7c90d4a949d42c0b32d"}]},
+                      {wxRadioBox,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"33684d6ce3f3c5388e6faf4f06d90463"}]},
+                      {wxRadioButton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"92bebfd9b33658dcff2e592b5fcaeb7a"}]},
+                      {wxRegion,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"18cb5a2a1dcb63a646135f2a6cb1b21c"}]},
+                      {wxSashEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d4c51c14137513da9841890751deafd2"}]},
+                      {wxSashLayoutWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f6f5167ff888b73c603b2f641e96a49f"}]},
+                      {wxSashWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91c5be41fbe95f5ad4504fae2f56f91f"}]},
+                      {wxScreenDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fc9411f49fe7324bcbace2c05d31d39a"}]},
+                      {wxScrollBar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e60ffb44799a3684f74d783addbf42c9"}]},
+                      {wxScrollEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4fbd1eb49f69e56894aa4a7fb26e1b4b"}]},
+                      {wxScrollWinEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be44e413061c515cb83a103a46572065"}]},
+                      {wxScrolledWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ccef65f1430df907d9bd34c27408f9cb"}]},
+                      {wxSetCursorEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1aad98a9e1d08f792da0d73f23ceb7e5"}]},
+                      {wxShowEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"89a775b3e6579b8e55e35bc6a46649ef"}]},
+                      {wxSingleChoiceDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f0df9c7367cbb88a21c8dbfcff668fed"}]},
+                      {wxSizeEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"78d4dff8fa58b02bd49c31b6de28b935"}]},
+                      {wxSizer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"581f4ba6c9b3befca1efbcd221455b49"}]},
+                      {wxSizerFlags,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"54ae0bf1305ef85943158c8f4bc58669"}]},
+                      {wxSizerItem,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ff2680fb6f057abf757516aa98e26281"}]},
+                      {wxSlider,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1e0578ebbde06a5308c00e98e0fbb6b"}]},
+                      {wxSpinButton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d27cc12c048bf0b160f53ca416add6ab"}]},
+                      {wxSpinCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6ce2382ed84ceb1585afea719fcddf73"}]},
+                      {wxSpinEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"158d1777d9e8d840b6d8fa93982b876a"}]},
+                      {wxSplashScreen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2719e687a6f08135c305b0b0692b8f40"}]},
+                      {wxSplitterEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a71231c8d2c06f12ee862be00ac91fb3"}]},
+                      {wxSplitterWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d7cf57a832b89c0e8574b09e632c7f1d"}]},
+                      {wxStaticBitmap,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"709ad1816bd35aa84a5b1eca1a6571f2"}]},
+                      {wxStaticBox,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"84480d00723cfae07f5c67ad463bec22"}]},
+                      {wxStaticBoxSizer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b32933189486b806c14a04452a3a5887"}]},
+                      {wxStaticLine,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"569ff89c23e697fc73de1f13d51b17d3"}]},
+                      {wxStaticText,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6baa91538f6f4d374f0c8c4a2cb5f25c"}]},
+                      {wxStatusBar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1cbef8443710f5270baade15b9312c4e"}]},
+                      {wxStdDialogButtonSizer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2325bcbc06870de4093489cae45bc2ee"}]},
+                      {wxStyledTextCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"94cc5d191271e6c87926850e0ea8615d"}]},
+                      {wxStyledTextEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"451ad9ce6872ea2035c3828713fe09c1"}]},
+                      {wxSysColourChangedEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c6f80dd65e0c9731e4a6dfcb10c71059"}]},
+                      {wxSystemOptions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3f3db4310f5e978392d4c6ec83347dae"}]},
+                      {wxSystemSettings,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3bb2753eb2dde96fd7f4aac7f944f69e"}]},
+                      {wxTaskBarIcon,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d221781abd0a15270e591e77e279a840"}]},
+                      {wxTaskBarIconEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a3d865d9706104b122cab70b07fcc3a1"}]},
+                      {wxTextAttr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3a6de5eb0c71625ca14606d4e3919e53"}]},
+                      {wxTextCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"924adbbbade1b95c226a18484c6bba33"}]},
+                      {wxTextDataObject,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4a3694d548ae60c8261f55b671ac834a"}]},
+                      {wxTextEntryDialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6c3038c65992b9a6eef33dd1aff7ce1d"}]},
+                      {wxToggleButton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4471e21c4fb39eece7418adbcd0f0fd1"}]},
+                      {wxToolBar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"163743b59b5ec0b6af08d7a66f1f36a0"}]},
+                      {wxToolTip,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"71dde961902117baba2d2b70f18ebad5"}]},
+                      {wxToolbook,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"053b84811ff7ef240d44fa454f966e71"}]},
+                      {wxTopLevelWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c7dc3f9260823e5ebb2f99855f8d498f"}]},
+                      {wxTreeCtrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"72e339bd396c87edd28d5a7cc6954e6d"}]},
+                      {wxTreeEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"17bf2e16e1f41f451fde53d1b72f8b01"}]},
+                      {wxTreebook,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b4889ab8905fd0fd8df5d06c900edf44"}]},
+                      {wxUpdateUIEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b7e61e2de35af5257f49919be1304381"}]},
+                      {wxWindow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c5337193a39eb848cbcd1afc79f19c8f"}]},
+                      {wxWindowCreateEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c898ff077b90017671180089c5b37048"}]},
+                      {wxWindowDC,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dcdf0f184f2b85f0915bb8d89ae8be27"}]},
+                      {wxWindowDestroyEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6c443d15978d3a61549f9817ff75fb48"}]},
+                      {wxXmlResource,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7240754b5985cf7af7c3ff2a3aba3548"}]},
+                      {wx_misc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1c24e9903d1b499f26e385d7aae15108"}]},
+                      {wx_object,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b17d673c7c4f59b27e9625b62077ef41"}]},
+                      {wxe_master,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cbafeb9aba24bb5e831dede889b317c1"}]},
+                      {wxe_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d6fabc67e68c6a41d8fa0ae642f6b272"}]},
+                      {wxe_util,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5d6e77598d0db8185bb1cb3bad9c5d14"}]}]}]}},
+                 {application,
+                  {webtool,
+                   [{description,"Toolbar lookalike for the web"},
+                    {vsn,"0.8.9.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/webtool-0.8.9.2/ebin"},
+                    {modules,
+                     [{webtool,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"29344486df5f854ae8fd3bd674c80e99"}]},
+                      {webtool_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0130c653986734ecbcc9eb173c28c60a"}]}]}]}},
+                 {application,
+                  {typer,
+                   [{description,
+                     "TYPe annotator for ERlang programs, version 0.9.5"},
+                    {vsn,"0.9.5"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/typer-0.9.5/ebin"},
+                    {modules,
+                     [{typer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bfd9dd08af18a1e70eacb4048fb641d9"}]}]}]}},
+                 {application,
+                  {tv,
+                   [{description,"tv Table Visualizer"},
+                    {vsn,"2.1.4.10"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/tv-2.1.4.10/ebin"},
+                    {modules,
+                     [{tv,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be7275d94eee00787500a1a2116f2f42"}]},
+                      {tv_comm_func,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ac45aad5047bb8c9fd5567c83f513db4"}]},
+                      {tv_db,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"97de27d10499042aaf10e26289e1e92b"}]},
+                      {tv_db_search,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"41a489c86d92bc1de3d2b1eba6884c6f"}]},
+                      {tv_db_sort,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e8f3679aece6310ac4b2d574bb4e7180"}]},
+                      {tv_ets_rpc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"71f7fcd2da96e0166340d5fecd7b3878"}]},
+                      {tv_etsread,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"45a731d225555df8f910b7960330f095"}]},
+                      {tv_info,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1c776d3c4a16bc432fed801d2e3c8d70"}]},
+                      {tv_io_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6c34cbecb007f6b330646a192aac6163"}]},
+                      {tv_io_lib_format,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"843ef9fc1762e75675f7a27b7ba99eb4"}]},
+                      {tv_io_lib_pretty,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e749f6a7879008513c7194c145e0faf2"}]},
+                      {tv_ip,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2d54724ccb30cfd4eaca323d38ef7861"}]},
+                      {tv_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"de096a5d9d31dd3443e6bbbd4207ecd8"}]},
+                      {tv_mnesia_rpc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"947c40384ab9d95074ee626b399d893d"}]},
+                      {tv_new_table,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c3105970c5d4e109104492bf286bfb4b"}]},
+                      {tv_nodewin,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bfd57496a2e56d57558891338db3e79e"}]},
+                      {tv_pb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fecb58bfc084d7d6dd979f14ea8c2796"}]},
+                      {tv_pb_funcs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bcfb711f62ae07c91da02c5b145f3099"}]},
+                      {tv_pc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"61f6f61fcc34826ca8bc3b450e94f92f"}]},
+                      {tv_pc_graph_ctrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e8c763ad45fac44f4356a4739baa30b0"}]},
+                      {tv_pc_menu_handling,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fc155c0472d92d089e6d74a1987d2223"}]},
+                      {tv_pd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"20b8ec33209b59d6775702be748d2da1"}]},
+                      {tv_pd_display,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"73d810061bb4e923468e82e414f6c962"}]},
+                      {tv_pd_frames,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8fd381887281403263da14b070a35ca1"}]},
+                      {tv_pd_scale,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"daff409824df94f43198e08c00c8aadc"}]},
+                      {tv_pg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"de42de073fbf5bd3ae58bef45ee05858"}]},
+                      {tv_pg_gridfcns,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"663f41dd11d7fbca1f8eb58529e63e53"}]},
+                      {tv_poll_dialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ef887432416a9931b8051963d9a97fdc"}]},
+                      {tv_pw,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c4443616d58cadb7e473ff9ad95c473c"}]},
+                      {tv_pw_window,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ef96313278caafa5e4cb0c1f5da9d165"}]},
+                      {tv_rec_edit,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6cbd579d5ccd73e575e67d00fe9983d2"}]},
+                      {tv_table_owner,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"af79fe7c2092cd90cd1cd360def69fec"}]},
+                      {tv_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d6967a2d5f7e03b34c4e26f47355ba43"}]}]}]}},
+                 {application,
+                  {tools,
+                   [{description,"DEVTOOLS  CXC 138 16"},
+                    {vsn,"2.6.11"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/tools-2.6.11/ebin"},
+                    {modules,
+                     [{cover,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e7856ff33e1e956b68c9f6527b5700b5"}]},
+                      {cover_web,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ead2c2bfdef49be858d1caee2d8878a0"}]},
+                      {cprof,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0d6cd8fb042b31641c7869b4e148e7c5"}]},
+                      {eprof,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c8fd5ee11ba9f1cdae8af5c8f1b367a1"}]},
+                      {fprof,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c549341f79f954416e826f591645f676"}]},
+                      {instrument,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cf9b95c95942f0ca0ca65db707873a74"}]},
+                      {lcnt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"04b27f3e814feb4f8d4f95705115ce98"}]},
+                      {make,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9a69d24258713596763ad87c247cef15"}]},
+                      {tags,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"450d10b82d488d74ab49eeef1d7277b7"}]},
+                      {xref,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5f07cbb4541ab47dd30a29a9ad6df8c2"}]},
+                      {xref_base,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cdb2414576f192e4f5df0f8b0d565598"}]},
+                      {xref_compiler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c1bba5a52fff82650e201bd08241277e"}]},
+                      {xref_parser,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3ee075a14d4a9caf00fd422a5b8a4941"}]},
+                      {xref_reader,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d257c5126f9d0cc4e9050fbbae796366"}]},
+                      {xref_scanner,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c7e53f28338fe627ac6fd0821ae6c551"}]},
+                      {xref_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"66929f66fc0606d320c6e5d216cb3b29"}]}]}]}},
+                 {application,
+                  {toolbar,
+                   [{description,"Toolbar"},
+                    {vsn,"1.4.2.3"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/toolbar-1.4.2.3/ebin"},
+                    {modules,
+                     [{canvasbutton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2432b0ceaf3b3cd6ab059067bb1b904c"}]},
+                      {toolbar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0264f53a2881d926b34401d0583b07fe"}]},
+                      {toolbar_graphics,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"327c7483e8b5cd55e8478a2cea9f0c1f"}]},
+                      {toolbar_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"64977a22d445c231a98bc12926186e0d"}]},
+                      {toolbar_toolconfig,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"037bc3e6d48012cb0c18796d7870c33a"}]}]}]}},
+                 {application,
+                  {test_server,
+                   [{description,"The OTP Test Server application"},
+                    {vsn,"3.6.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/test_server-3.6.2/ebin"},
+                    {modules,
+                     [{erl2html2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"28fc702edc8365854f9f66fc2fe01793"}]},
+                      {test_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"09cd3b380d55881b18f4020709ad1ef4"}]},
+                      {test_server_ctrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"14f716cc55a7cb00e3db6f747c72bfa7"}]},
+                      {test_server_gl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91fa2c7419209a51361800e1a28f3891"}]},
+                      {test_server_h,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"90c3fbf1bdd3260d8be29c0ab04279bf"}]},
+                      {test_server_io,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"accd333c058e9b4da064190ef7cf48cc"}]},
+                      {test_server_node,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"091d5d7aadb062a6e3812afbb130402a"}]},
+                      {test_server_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9aad63f121b569e197e38735d5f3bf2a"}]}]}]}},
+                 {application,
+                  {syntax_tools,
+                   [{description,"Syntax tools"},
+                    {vsn,"1.6.11"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/syntax_tools-1.6.11/ebin"},
+                    {modules,
+                     [{epp_dodger,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec04cd4dd5985f232fc3116ba222bfd6"}]},
+                      {erl_comment_scan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0b8dce1126af7468c5b30f73044c44db"}]},
+                      {erl_prettypr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"020fefd3937417a2029a5278dfe6a6c3"}]},
+                      {erl_recomment,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f9ef1a5c9ce3c6ce6b88966b1c766452"}]},
+                      {erl_syntax,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1ee5f2f422313742a2d321fcd901909b"}]},
+                      {erl_syntax_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f27de1f2cf65260fe863025c358c9c86"}]},
+                      {erl_tidy,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f92471b03263f0cd77f35fd59686258a"}]},
+                      {igor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eabc7b07e7b92b8d34fa8eb20a507cff"}]},
+                      {prettypr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c1e07ce1f5edda823216364302796ac1"}]}]}]}},
+                 {application,
+                  {ssl,
+                   [{description,"Erlang/OTP SSL application"},
+                    {vsn,"5.3"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/ssl-5.3/ebin"},
+                    {modules,
+                     [{dtls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d3942c7ba7ffaf15f739485a0294f256"}]},
+                      {dtls_connection,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0d3d571363ba45d10d8d772f107cd24f"}]},
+                      {dtls_handshake,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"92217b2b0b6d3b16913521e333533ca6"}]},
+                      {dtls_record,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4aa88c3ec82a97c9aef5efb0773c153c"}]},
+                      {inet_tls_dist,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7c9e1c10262b46fce60dcd0127455cb0"}]},
+                      {ssl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7c0cf688a767412c4de5ab3be9cb2e55"}]},
+                      {ssl_alert,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ff069c184808a482f096e6cf5aeda43b"}]},
+                      {ssl_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"08781acbe7e677b43923f943d54e17f5"}]},
+                      {ssl_certificate,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"292c330ca048353298a264de596e2ee2"}]},
+                      {ssl_cipher,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c7da7124e32552cf9438259bf544389c"}]},
+                      {ssl_connection_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b46886f7e29fdc628a965ee9e2314e1f"}]},
+                      {ssl_dist_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1db0e97b9d77cbb26348e98cf386210b"}]},
+                      {ssl_manager,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1e170a0ac2f663c4396f5a3b00e36239"}]},
+                      {ssl_pkix_db,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c1b5a81345dcd39060c2fb177b29898"}]},
+                      {ssl_session,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f9103614974d7d39d0f1ccb0a9e5b6f8"}]},
+                      {ssl_session_cache,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"09b0d541e61e1ed9dbcb169b1d5b945a"}]},
+                      {ssl_session_cache_api,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ffafcdc2ff0342c4c698df0dec3cdc96"}]},
+                      {ssl_socket,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4e9d62b4943dddf16fbe39f781699260"}]},
+                      {ssl_srp_primes,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8c2df3c9a38a3ceb9cb273a030bd423a"}]},
+                      {ssl_ssl2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6822bde894695368a294a0e890183b67"}]},
+                      {ssl_ssl3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c5cd3fbdb5a3f1fdb4c78a2acf9735fa"}]},
+                      {ssl_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a69f0e3bb4639f90a310b2b938cb9235"}]},
+                      {ssl_tls1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"14b5f8a146f51df359e9c1265e949564"}]},
+                      {ssl_tls_dist_proxy,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1bbb1df174c32c1f424cfa64547d075f"}]},
+                      {tls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7ff734327614ac4d6e4d9acf49998c2d"}]},
+                      {tls_connection,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ad4d62a6b8101cc5b928498752714ed7"}]},
+                      {tls_handshake,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c2c5513a959ecbe56166df52dff06e6e"}]},
+                      {tls_record,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"94501e4bda011f01fba860eebdff5a44"}]}]}]}},
+                 {application,
+                  {ssh,
+                   [{description,"SSH-2 for Erlang/OTP"},
+                    {vsn,"2.1.7"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/ssh-2.1.7/ebin"},
+                    {modules,
+                     [{ssh,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8b91a0a4f8271ff77d0efceb75ba5e8f"}]},
+                      {ssh_acceptor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7c39ef119dbfcec7618d1cf223d445d6"}]},
+                      {ssh_acceptor_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d79d965ce6a8121cfbcc1a57029fa06c"}]},
+                      {ssh_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"11089687f3d5ff2e2ff4527efdb86920"}]},
+                      {ssh_auth,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0ff2e66febd08d64ffbebed7e7880ca3"}]},
+                      {ssh_bits,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5ab1a9f964ccce1e001d7484b37c561c"}]},
+                      {ssh_channel,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e4259284ff9d7671940cfde40b8615fe"}]},
+                      {ssh_channel_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2594f48f478040f5e861f92c63f78eb3"}]},
+                      {ssh_cli,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6eb0733483419dc0a920452bb42b7344"}]},
+                      {ssh_client_key_api,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1a1ce3edce20525a435533b3f37fcfc"}]},
+                      {ssh_connection,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b551f86d866df22232a147fca4ac7c04"}]},
+                      {ssh_connection_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9bec5a32b6f6199b3f52e1fbfbbceba3"}]},
+                      {ssh_connection_manager,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"399ad1481f99b9d43c874c162742c91c"}]},
+                      {ssh_connection_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cd1150bc1fe3673d2446811f54dc23de"}]},
+                      {ssh_daemon_channel,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"17ceee1d84a542cf54dd487808e00a1e"}]},
+                      {ssh_file,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d014774c5b5dbd368fad2bc809515e48"}]},
+                      {ssh_io,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c1045e82cd74643c823a1bda96d24b47"}]},
+                      {ssh_math,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9a4b44ed70c1938a7277f37d56f9de8f"}]},
+                      {ssh_no_io,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c9bf450746c1bcc1fd90c463299fdaf5"}]},
+                      {ssh_server_key_api,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"debb7d5dcdf2eb88d30ed95a56652366"}]},
+                      {ssh_sftp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"74ed0ad4eaf38e4233ea40f4b4769b7d"}]},
+                      {ssh_sftpd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"472a422310ca8f6f289334ef64550afd"}]},
+                      {ssh_sftpd_file,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5269b3e25dd16faeb466f76ba993ba50"}]},
+                      {ssh_sftpd_file_api,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"627f97d4fb4abd5bee4b509d9225edaa"}]},
+                      {ssh_shell,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5c7831c144031be28ec9dc12b4da3b94"}]},
+                      {ssh_subsystem_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"755716a08c990d1f606e90420006a77e"}]},
+                      {ssh_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"408837d884dc9e1f0a969ef64558d733"}]},
+                      {ssh_system_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f384bcadd7cdca24ec6e40cbe04d71a0"}]},
+                      {ssh_transport,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0b1c9ed65701948f63ddb181cfaf2744"}]},
+                      {ssh_userreg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a4f27505cb543991360e10ddb88870cc"}]},
+                      {ssh_xfer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0220668d75e0c89e7823990a0c968eaf"}]},
+                      {sshc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"483104e1f9410dfc4e1e29c61d8827ee"}]},
+                      {sshd_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aba8a2861b6f773e9016ff2859e8de24"}]}]}]}},
+                 {application,
+                  {snmp,
+                   [{description,"SNMP  CXC 138 13"},
+                    {vsn,"4.24"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/snmp-4.24/ebin"},
+                    {modules,
+                     [{snmp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9ab098c46c4c009b5ab8a4a37673cf82"}]},
+                      {snmp_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6a2ab3974db30a5b20ba308e1ef0c1d3"}]},
+                      {snmp_app_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b81a8361da32fd1da51e85f36b678347"}]},
+                      {snmp_community_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"14e553d78094cb09e2e2a1a3476fa9de"}]},
+                      {snmp_conf,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5e5c6bc754f1fdf1dfaf7f9815163cc5"}]},
+                      {snmp_config,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d9ec2fef69fed3fddbb122a5fd31853b"}]},
+                      {snmp_framework_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0886188c6a8c18a6ff8a3b08172a0773"}]},
+                      {snmp_generic,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b23bcb8a031ccd450999f71b41f1f0dc"}]},
+                      {snmp_generic_mnesia,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"74806ef6c5e3a1af2cb14a4121f4442a"}]},
+                      {snmp_index,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8a0358730d6b279e4056b9e78fdabbe2"}]},
+                      {snmp_log,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f93d36dbfdfef30de3f4807efcec170e"}]},
+                      {snmp_mini_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4bb79af4e373cdc2ec4e6f5fe71d0e01"}]},
+                      {snmp_misc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ccd6ba3cc7e504e0c163f8c0f7ff575"}]},
+                      {snmp_note_store,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a3b5f37d8fc6663a63d177cb72a1c498"}]},
+                      {snmp_notification_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c283ef6cba1ffb08a38c4228f119c1f2"}]},
+                      {snmp_pdus,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"48138570bb1ff76dabe8f1fa5a6e662c"}]},
+                      {snmp_shadow_table,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ba004cbc14fe13ad6b29515d6b3b84af"}]},
+                      {snmp_standard_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"75c1099b71f4cde7703c1b651168196a"}]},
+                      {snmp_target_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"52cfb682cf25e4c6ad7c6a31ea71bc41"}]},
+                      {snmp_user_based_sm_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b3b454fe409f6cd24463bfca9369adf5"}]},
+                      {snmp_usm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"667650cc1c2f535f771132907bf12342"}]},
+                      {snmp_verbosity,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c8e3d33775ee83cca4d47f64df1dd5ca"}]},
+                      {snmp_view_based_acm_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1dcc969b6786ab84f450e9f0875eab3e"}]},
+                      {snmpa,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2057219be785ea520f5a3f1886d51360"}]},
+                      {snmpa_acm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f21fee89e88dccc36afbae59e8ccd85f"}]},
+                      {snmpa_agent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a1fcbbb2b5328095d05622eb5da5b1fa"}]},
+                      {snmpa_agent_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"668a5398f181b8abce6b0c68716e175e"}]},
+                      {snmpa_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"16cc3053b5568e50b5fa384baca6a40f"}]},
+                      {snmpa_authentication_service,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fc05c3f08dbdec4878aae7816eb5033e"}]},
+                      {snmpa_conf,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"826ab227f8829b50aabc3072cf2a8537"}]},
+                      {snmpa_discovery_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"50040fb1565d5888507dcffe6109cc16"}]},
+                      {snmpa_discovery_handler_default,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62413e2497c617d1dabf1ab269610eb3"}]},
+                      {snmpa_error,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fb436bf4d7bf0615c02c649c0e04541e"}]},
+                      {snmpa_error_io,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"98147b5cfad093916c0756b37f763e86"}]},
+                      {snmpa_error_logger,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b0431d9de22543e6608515bc4afc07c2"}]},
+                      {snmpa_error_report,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"214d6585224898ce39f6eef6554593c4"}]},
+                      {snmpa_local_db,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eb82eaa9a8486d087a27e834b58a2f6c"}]},
+                      {snmpa_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e68b813ac1df34912af16ef01738f185"}]},
+                      {snmpa_mib_data,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ed334445e6e025059b2c9b618109cb9c"}]},
+                      {snmpa_mib_data_tttn,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2f39357a667d3cb530b431fed0dfa674"}]},
+                      {snmpa_mib_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"79d8aff9ea8d71bce6eac0a6f01f53b8"}]},
+                      {snmpa_mib_storage,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"22e11676e0303ea2f292534da8ae66f5"}]},
+                      {snmpa_mib_storage_dets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f8c4649828d764370112243ccdbd2da3"}]},
+                      {snmpa_mib_storage_ets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4410e4e89e46b6e2b818d3b002a98579"}]},
+                      {snmpa_mib_storage_mnesia,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1e3d387a72c28b5bf76d7a55ac39071a"}]},
+                      {snmpa_misc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6c4244cad7870e2ec012bdd05281b182"}]},
+                      {snmpa_mpd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8475e9d61092213166efe3667bcf0c06"}]},
+                      {snmpa_net_if,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"258227a8467ed99df2f9e55cc7b5e9ad"}]},
+                      {snmpa_net_if_filter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f57faf094fd82ceadc8527983194b2cd"}]},
+                      {snmpa_network_interface,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"247221ee7ec97ee189ef5a8b5eb2d18a"}]},
+                      {snmpa_network_interface_filter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec6d7d452145362e9dcc0a8be42b3280"}]},
+                      {snmpa_notification_delivery_info_receiver,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"de84fce31ef758fbb04722b66e1b22d3"}]},
+                      {snmpa_notification_filter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e0b2e493bbbe13f1f17f3fd0be7ce1f7"}]},
+                      {snmpa_set,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7152d8c4f238062a801fb9b46115b1ee"}]},
+                      {snmpa_set_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c1739e0cf36ad6a9249a8a200409813b"}]},
+                      {snmpa_set_mechanism,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c3bef6423ec85b3b9a144f17c3e3f6c2"}]},
+                      {snmpa_supervisor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"19aa2eef0602df46711bdc98c67d105c"}]},
+                      {snmpa_svbl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e4079d7e9812ac1c42274316b0f883c0"}]},
+                      {snmpa_symbolic_store,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e0fe1dda713ed3048f51155e47932e06"}]},
+                      {snmpa_target_cache,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02394ee2b706d7c26f027c960c659f39"}]},
+                      {snmpa_trap,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6ffd78574b7c33a0a96bee64d310531e"}]},
+                      {snmpa_usm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b121f7bf87a2d44a14aa42988c2072f3"}]},
+                      {snmpa_vacm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d7c7855fb65468a2355c889aa26badb6"}]},
+                      {snmpc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a474261cc18e1f80f0f742774e3b1417"}]},
+                      {snmpc_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ce88a5b16fdc8fa367c8559a81eabcb8"}]},
+                      {snmpc_mib_gram,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c8b4a0280a0bd9b0e89fd47361381583"}]},
+                      {snmpc_mib_to_hrl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"88a2a7964f0b3501263eaf513a72e876"}]},
+                      {snmpc_misc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"feadc3549879e928bcc4941ff25c1756"}]},
+                      {snmpc_tok,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"37784c9fb162c53b0fae3cd77566bdb2"}]},
+                      {snmpm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cfcde2ccea1b2dbfe7d6f3bead4df7d4"}]},
+                      {snmpm_conf,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2d6eef427d28f7a96b5be06a0509ed8d"}]},
+                      {snmpm_config,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5a026c01e17b82bd2fdcb31fb69ae51a"}]},
+                      {snmpm_misc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02dd27ee95e3bbe3aab099b11120b826"}]},
+                      {snmpm_mpd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1b593b66256ce780231c57b31298fd29"}]},
+                      {snmpm_net_if,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"68d325a69b69e7de7106965a049522d2"}]},
+                      {snmpm_net_if_filter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a83bf186eec6c82fd6c9b164fc337edb"}]},
+                      {snmpm_net_if_mt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e44169e0549ab840243a2e4e0fa3d5fa"}]},
+                      {snmpm_network_interface,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"47b0e15cd1537e1a3a1b41b8be44998e"}]},
+                      {snmpm_network_interface_filter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"93b503aeb95e30d2fcf28c2b7d2e017e"}]},
+                      {snmpm_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fdf5855cd385c8d4589d43f2aaddee8c"}]},
+                      {snmpm_server_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1fc16c37e8db23a8b3e40d3696488a0d"}]},
+                      {snmpm_supervisor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"289642b05307317c1684b5ba76cb81c5"}]},
+                      {snmpm_user,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9c6e66b34460082bbcb99ccaf1cedbf3"}]},
+                      {snmpm_user_default,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c8c7e1b66076bcbde4678471ee9066f0"}]},
+                      {snmpm_user_old,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ae32fe52a746f3be59c94bac2b679fcb"}]},
+                      {snmpm_usm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"59bb20fedd0aca2f57ce3b5dad4e50aa"}]}]}]}},
+                 {application,
+                  {sasl,
+                   [{description,"SASL  CXC 138 11"},
+                    {vsn,"2.3.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/sasl-2.3.2/ebin"},
+                    {modules,
+                     [{alarm_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"250185bf9caa8aafeefc21d2dc85671d"}]},
+                      {erlsrv,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"656c183c67d6d7556d846752ac2e0168"}]},
+                      {format_lib_supp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be7d1b5e03f626bc3a081680842f3c69"}]},
+                      {misc_supp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"57e2232dbb711535686b684350c6412a"}]},
+                      {overload,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ce834faf427a10bffb528420385e75fc"}]},
+                      {rb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c791582aa44b9701a38bea7b12a737c9"}]},
+                      {rb_format_supp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f6df90c6b446bfd31471022bae098995"}]},
+                      {release_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bc289c9b3ed6443f9e88a7a40b1bbd78"}]},
+                      {release_handler_1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0b7cbb150cbc1ad629936632bcf8700a"}]},
+                      {sasl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8a39ff904fad2fb7b62b8745b34e29b9"}]},
+                      {sasl_report,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"651a20fbd6df5b1c785152aecf691f13"}]},
+                      {sasl_report_file_h,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6d21420c495fb60e6be13677a923ff7b"}]},
+                      {sasl_report_tty_h,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"165b304307e62adee19805a95d9b6ccb"}]},
+                      {si,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ecfe8c3c35aba098dd3530398086bcc1"}]},
+                      {si_sasl_supp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"77c86cc1c9667be73a48dbcb3c480d36"}]},
+                      {systools,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5514e0264308050ac1cc5cecaf74c950"}]},
+                      {systools_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1aa9e6a22dccb94499d5609ce1cf66b"}]},
+                      {systools_make,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d2c4d3e4b7b322b6629575a64e553f90"}]},
+                      {systools_rc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4337b68dc98fbbed9e93f2bde9ef4d0d"}]},
+                      {systools_relup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dd4bb2c6c8422b979b5a75e6f545baab"}]}]}]}},
+                 {application,
+                  {runtime_tools,
+                   [{description,"RUNTIME_TOOLS"},
+                    {vsn,"1.8.11"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/runtime_tools-1.8.11/ebin"},
+                    {modules,
+                     [{appmon_info,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62c6dd94499d20f1776df7cd3267c100"}]},
+                      {dbg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5a7b449f37506a70985c5b3f69ec579c"}]},
+                      {dyntrace,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"746609b1554ac41985637b5bba780905"}]},
+                      {erts_alloc_config,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1a489439d8dded5734eab5eb575ce454"}]},
+                      {observer_backend,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d9af82e565eecf62c161023fce415c58"}]},
+                      {percept_profile,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"32909b64d30ade082680e9491a3ddbc8"}]},
+                      {runtime_tools,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c569a23a42bf744f56abbf4215ca2a9d"}]},
+                      {runtime_tools_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f52650d88ee6f6754ed9d109accb7eac"}]},
+                      {system_information,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9ed879d33f6159b48fb25bc472369285"}]},
+                      {ttb_autostart,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6838c97b9564b06d26e5f599adcee4a6"}]}]}]}},
+                 {application,
+                  {reltool,
+                   [{description,"Reltool the release management tool"},
+                    {vsn,"0.6.4"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/reltool-0.6.4/ebin"},
+                    {modules,
+                     [{reltool,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b15d15af1453d274df701f6c4b39da09"}]},
+                      {reltool_app_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e15041fae657a7abcce63e7e775af842"}]},
+                      {reltool_fgraph,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c07b7a13c2ae36b59f5d1f0daf8a567"}]},
+                      {reltool_fgraph_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"230041769919290efa2a3419cf70c8cb"}]},
+                      {reltool_mod_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"752d8f1d674a79955de7afd3ba6b561b"}]},
+                      {reltool_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"135d9bb6ea57344472c185d61c97573c"}]},
+                      {reltool_sys_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f02ff065d17fa8203d711b9cc698ebf4"}]},
+                      {reltool_target,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"036440a327b1c9cbe5e404ffaf02b9a4"}]},
+                      {reltool_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c623f90e0c5da5db65d4ca56d9088d7a"}]}]}]}},
+                 {application,
+                  {public_key,
+                   [{description,"Public key infrastructure"},
+                    {vsn,"0.19"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/public_key-0.19/ebin"},
+                    {modules,
+                     [{'OTP-PUB-KEY',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d6f796b3667abf21828ee3daf8df487c"}]},
+                      {'PKCS-FRAME',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4419b1988012d2d620ac3cc7dec13d65"}]},
+                      {pubkey_cert,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7a4ac659e84ddfb1dc14f0608460fbfb"}]},
+                      {pubkey_cert_records,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d5b1f48543bb6b0e62b343c2b965615f"}]},
+                      {pubkey_crl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"680633b53ae9815138f804c999e78bbd"}]},
+                      {pubkey_pbe,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"517156230695474828dc4d30af59f656"}]},
+                      {pubkey_pem,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eef5632fcf01194dd6c98f116de8f923"}]},
+                      {pubkey_ssh,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5acc6568d3caea9be2d2b93904f6bda9"}]},
+                      {public_key,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7b054e72c6e34943c0143ac34edcc37e"}]}]}]}},
+                 {application,
+                  {pman,
+                   [{description,"pman The Process Manager"},
+                    {vsn,"2.7.1.4"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/pman-2.7.1.4/ebin"},
+                    {modules,
+                     [{pman,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d0ea0aa857d089d112f46bed16fb83c"}]},
+                      {pman_buf,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"efdccd7cb884a2a9c50cc70719d53575"}]},
+                      {pman_buf_buffer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bfdd78d8905bd1bb7e07ee22414a0eae"}]},
+                      {pman_buf_converter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"afd7e3173377b46ec7374c0e1118a158"}]},
+                      {pman_buf_printer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7c592081860a9b92b08b557c46b11307"}]},
+                      {pman_buf_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"77e551e0bc43c59bf5a76f0e32daf822"}]},
+                      {pman_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b4371d24cd7312794afb137de259b8e0"}]},
+                      {pman_module_info,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0336677781cb813897e9306415f85b38"}]},
+                      {pman_options,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"016b8cac7c507593a118b25ab3d642d2"}]},
+                      {pman_process,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"faab007fad0f14fc692df152d60a8abd"}]},
+                      {pman_relay,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b12bbe3e253211fac5006414f6f6162b"}]},
+                      {pman_relay_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3b7eb65c7c1507892ed8f01a1b5e027d"}]},
+                      {pman_shell,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3b9e7634fb49f1e84a57ed8cee5e3909"}]},
+                      {pman_tool,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"58ab631eed4b29ddebd390b4cd30c82f"}]},
+                      {pman_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"697f4a56a374bcacf06e8329356f7b9d"}]}]}]}},
+                 {application,
+                  {percept,
+                   [{description,"PERCEPT Erlang Concurrency Profiling Tool"},
+                    {vsn,"0.8.8.1"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/percept-0.8.8.1/ebin"},
+                    {modules,
+                     [{egd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"810926c65926827a80dc5de6e9cace80"}]},
+                      {egd_font,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3f41911d6aa5ada509332aca159c905e"}]},
+                      {egd_png,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"201db7435f6981d1d5b738c5431d4a39"}]},
+                      {egd_primitives,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cba1711d459930f92725953bca582106"}]},
+                      {egd_render,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b86b9269dfad8feb8753abfa8e9be68e"}]},
+                      {percept,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"af81f6c6164ac09eafdfbe02a985976b"}]},
+                      {percept_analyzer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"efe67a4369a96144def43df906f2ac94"}]},
+                      {percept_db,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9bff80fb7515c9c23977cceb2fba5e0f"}]},
+                      {percept_graph,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1444b51fa93b12bb98f6bf5246e079f9"}]},
+                      {percept_html,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b84fd915479ddaa158366217f7fb2ff7"}]},
+                      {percept_image,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec8d1dae1d54b90ccd7cce76d83573b6"}]}]}]}},
+                 {application,
+                  {parsetools,
+                   [{description,"XLATETOOLS  CXC 138 xx"},
+                    {vsn,"2.0.9"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/parsetools-2.0.9/ebin"},
+                    {modules,
+                     [{leex,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c82fd5f503469e40008fb18b393b5421"}]},
+                      {yecc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e644a07828dcb46e440058ec4e3ea83b"}]},
+                      {yeccparser,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"43c2c84fbd4caf3c3eacfe0e25874f3a"}]},
+                      {yeccscan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cc55537c97f45738825ae56628fd4c71"}]}]}]}},
+                 {application,
+                  {otp_mibs,
+                   [{description,
+                     "SNMP managment information base for Erlang/OTP nodes."},
+                    {vsn,"1.0.8"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/otp_mibs-1.0.8/ebin"},
+                    {modules,
+                     [{otp_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b92358a169666b58abe47dc98b1ea1f8"}]}]}]}},
+                 {application,
+                  {os_mon,
+                   [{description,"CPO  CXC 138 46"},
+                    {vsn,"2.2.12"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/os_mon-2.2.12/ebin"},
+                    {modules,
+                     [{cpu_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"071d377ab6c706f3c4404dfddf95316c"}]},
+                      {disksup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"53255f9176fdf57c6d2c62a1e3ca8ce2"}]},
+                      {memsup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d5aa81b4c0017f97827b13d588e907cc"}]},
+                      {nteventlog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d593ff9832f59a682cb9a7217eb1dc55"}]},
+                      {os_mon,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f8fcf26c77f01a1542d007513e49c214"}]},
+                      {os_mon_mib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"15ff2fbfd1c88ff31ff9c8e85bf10cb9"}]},
+                      {os_mon_sysinfo,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2bed5dda663ec63a320198f44c90f388"}]},
+                      {os_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"52837f657faabaab44288ba2d29ba473"}]}]}]}},
+                 {application,
+                  {orber,
+                   [{description,"The Erlang ORB application"},
+                    {vsn,"3.6.26.1"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/orber-3.6.26.1/ebin"},
+                    {modules,
+                     [{'CosNaming_Binding',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f894f1ca2a53e8c68579c9e786884b64"}]},
+                      {'CosNaming_BindingIterator',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"938a503dbdbe3f091ce900dbe1efeeaa"}]},
+                      {'CosNaming_BindingIterator_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"07513574b340d64ec6d50ebf98a772c7"}]},
+                      {'CosNaming_BindingList',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"37aaba8fc8623355426055d3b9c2e2b8"}]},
+                      {'CosNaming_Name',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7053bbff4a4dd27357c7ae2b7a1bd158"}]},
+                      {'CosNaming_NameComponent',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4ef942efe3f30c93b89cbb79f0b0e372"}]},
+                      {'CosNaming_NamingContext',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9e73232824e400a4b6f9a295922420a5"}]},
+                      {'CosNaming_NamingContextExt',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fb072ace0d3d1445fa884fbb59d19ff6"}]},
+                      {'CosNaming_NamingContextExt_InvalidAddress',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ba29a989c4d5c961c62bec9162bedd71"}]},
+                      {'CosNaming_NamingContextExt_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ece2da1a74559421fd8c5a0fcce5a984"}]},
+                      {'CosNaming_NamingContext_AlreadyBound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ba2061d5ba1cd24262351fa0b92b8850"}]},
+                      {'CosNaming_NamingContext_CannotProceed',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"175c9f998a255ce625568ff7d7258988"}]},
+                      {'CosNaming_NamingContext_InvalidName',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4b5bb3702b8105f78101d3deeb4c3717"}]},
+                      {'CosNaming_NamingContext_NotEmpty',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0dbdfc178f40394391977946fdbf331d"}]},
+                      {'CosNaming_NamingContext_NotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f2f4d6cf9150fcc92bd9568ff89d2774"}]},
+                      {'OrberApp_IFR',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"67d245498b4abcae1f6acd51c4edc47e"}]},
+                      {'OrberApp_IFR_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ab7e63e7a7e47bac6d2cc7e703f2915"}]},
+                      {any,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1339baf3e573eee6bb558d0097bce4c2"}]},
+                      {cdr_decode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dda23b10f13bec369113cf3ae72b9448"}]},
+                      {cdr_encode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4d36c6b8ee3a9fddfdc76246030287ba"}]},
+                      {cdrlib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d97ec0db3640dda02a25e6ecc9d5fa5e"}]},
+                      {corba,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3794dffcd3c921332af2b343bb9e8e40"}]},
+                      {corba_boa,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3dfd1417d677ca18f73c4efe65b37bad"}]},
+                      {corba_object,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"569d7993c599bd7c2f68bf7a2d11fdbd"}]},
+                      {erlang_binary,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0ec91157e3e220cc5163b552f3a4050d"}]},
+                      {erlang_pid,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"49b95cc1773eeed11661fc4cb36b7921"}]},
+                      {erlang_port,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2b0dd3969488714fc2e2dce30b297b14"}]},
+                      {erlang_ref,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"98b38f4a590a67a1fa34b2c6d60e8992"}]},
+                      {fixed,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"469aed745e70550ecb4ee6b382a0c919"}]},
+                      {iop_ior,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1d3eeb1d5401ad27f97b75926cbf8387"}]},
+                      {lname,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"945467530d2858f1dfb87b970a3862bc"}]},
+                      {lname_component,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c2cb0fe6e60c6d07d711cd8c3b28c8f7"}]},
+                      {oe_CORBA,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02e20118e9fd5c3f5d2f398851cbdcf1"}]},
+                      {oe_OrberIFR,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ebc39f59cbd7848e61193c82ab0ee2b9"}]},
+                      {oe_cos_naming,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"18745eadd8db295fc1e8e656a5c8d4d6"}]},
+                      {oe_cos_naming_ext,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"56520dda2639eaadae720ac4974080d5"}]},
+                      {oe_erlang,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"963486a48402a80366275f8dace2a80f"}]},
+                      {orber,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0b4c2a1e44684d8f314230f21def86f2"}]},
+                      {orber_acl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"76577170937f03fa23e69e4df6cfc424"}]},
+                      {orber_cosnaming_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f856cbb99314e9eb7d0d7bfcdb30994e"}]},
+                      {orber_diagnostics,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"656103538d0ee20b1433c6b2909b26c0"}]},
+                      {orber_env,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"75b0fa232da40432e3009ead263f3749"}]},
+                      {orber_exceptions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ef09c1b3026ef3aaae5e9c6a5dd2918"}]},
+                      {orber_ifr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0fed5973a29d60ab161580bf07f3b185"}]},
+                      {orber_ifr_aliasdef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"941404668a378948bbef59da18973eea"}]},
+                      {orber_ifr_arraydef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4a1ebba0a7f7a26d5205972ac2bc6fc6"}]},
+                      {orber_ifr_attributedef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"141fa0d0127d292e0bfc3f0e654059df"}]},
+                      {orber_ifr_constantdef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"337388d13414ab58cdafcbd70a150741"}]},
+                      {orber_ifr_contained,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a825abb903208287bc2dfb7323342fe6"}]},
+                      {orber_ifr_container,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3027632d783e5db3440bead382fbc787"}]},
+                      {orber_ifr_enumdef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f031b9d117143554a1db00a0f7f9d4af"}]},
+                      {orber_ifr_exceptiondef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6e152b750cbb286b90ec49855c9f8115"}]},
+                      {orber_ifr_fixeddef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c0f66c8a6999241daec6815a1eaf7112"}]},
+                      {orber_ifr_idltype,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7f5b0c9c79289e56f5cfe24c5de10c26"}]},
+                      {orber_ifr_interfacedef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"985cc443e424939f7f067e9d577c0044"}]},
+                      {orber_ifr_irobject,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"441a6a89092f9059eddaafb3a19fddac"}]},
+                      {orber_ifr_moduledef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"571791fe8c191478f9d99008066db451"}]},
+                      {orber_ifr_operationdef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"26ff4727920661a5777fdfeb9542447d"}]},
+                      {orber_ifr_orb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9f82245f4568a7ad57b93005504b22f3"}]},
+                      {orber_ifr_primitivedef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cad06f8ddc116042d7dd2f54f189dc9e"}]},
+                      {orber_ifr_repository,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"88fc8f59fe5a883e6a5cc76c9db0a8f0"}]},
+                      {orber_ifr_sequencedef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"55db89bec3e336bf1a1087b8b24ec0c9"}]},
+                      {orber_ifr_stringdef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7119d2c1827fbfe04397a23e0c9b7bea"}]},
+                      {orber_ifr_structdef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2e0643a9e51eb2fe1bb3268623005b9c"}]},
+                      {orber_ifr_typecode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"52a2bebb663486dfde545175b24f1db9"}]},
+                      {orber_ifr_typedef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1440f73d398af50ec1f1854b68a7ba14"}]},
+                      {orber_ifr_uniondef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1a767805d679f87ec96f566ea535b0ae"}]},
+                      {orber_ifr_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a7a7127b079023e8507c1963bb70c6a8"}]},
+                      {orber_ifr_wstringdef,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5d9705c3d0a8e75958cfc92c0e065688"}]},
+                      {orber_iiop,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"08e63cf45c6b87ef390f1ba44908df62"}]},
+                      {orber_iiop_inproxy,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7d958ccebf1795810daf42c284df0b0e"}]},
+                      {orber_iiop_inrequest,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"01cf6a0b86d8575aad71a64d1ead078f"}]},
+                      {orber_iiop_insup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3f3e97ae477f58ab983bbf78c5691a6b"}]},
+                      {orber_iiop_net,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cf48384275f94de84a88f985e69db8c5"}]},
+                      {orber_iiop_net_accept,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"311c1717af0f83c768a7904bd4f35d87"}]},
+                      {orber_iiop_outproxy,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aadcfde8449aad07dda946c4fe8ae73f"}]},
+                      {orber_iiop_outsup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4bb6aa4ab42569ea07e6410eec054d96"}]},
+                      {orber_iiop_pm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3c23eac6eed61ab8f4b0376bada6a96c"}]},
+                      {orber_iiop_socketsup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"41cb70052711397c5ff4346c78bad0bc"}]},
+                      {orber_iiop_tracer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3db9add6a744c5d57f2f88593010189c"}]},
+                      {orber_iiop_tracer_silent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ddc6f4254d9d55920c182bfc82174cd5"}]},
+                      {orber_iiop_tracer_stealth,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b5c2faed84597fcc65a1f79f126d38ed"}]},
+                      {orber_initial_references,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"52d7435fcf9d9b18c41cd15112211641"}]},
+                      {orber_objectkeys,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"77601464765a034f2157e184b66b27bf"}]},
+                      {orber_pi,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7772668cb95512b5068384cffb15f5ec"}]},
+                      {orber_request_number,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ce4912e1c1726a3edd4d2709171895ad"}]},
+                      {orber_socket,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ea78f1c75c253c070f2b3423b896667a"}]},
+                      {orber_tb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d9b508906d187e6448fd06b88923aea"}]},
+                      {orber_tc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f43cb767b9c01d13d190a56574aa504c"}]},
+                      {orber_typedefs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"82369e4a3e862ef248d19c460b2df8ea"}]},
+                      {orber_web,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"23cc5e9ac5ffe3b7ac2315ae0759243c"}]},
+                      {orber_web_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c95b45e743c0a1f7a2e88e350075f78c"}]}]}]}},
+                 {application,
+                  {odbc,
+                   [{description,"Erlang ODBC application"},
+                    {vsn,"2.10.16"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/odbc-2.10.16/ebin"},
+                    {modules,
+                     [{odbc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2763e2d38d62e1fbe7c8ed231cce1905"}]},
+                      {odbc_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"83f4d02ba9fd29ff84576abe0fde901e"}]},
+                      {odbc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3c39c9a6e602d66a2d12b662bf0a9b20"}]}]}]}},
+                 {application,
+                  {observer,
+                   [{description,"OBSERVER version 1"},
+                    {vsn,"1.3.1"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/observer-1.3.1/ebin"},
+                    {modules,
+                     [{crashdump_viewer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"77bff2805dfd88de4320b9f8c1469fe3"}]},
+                      {crashdump_viewer_html,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d22f72c96ed77a6e4cabe125db6c8419"}]},
+                      {etop,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"377b59a76eeb5edb5b8531b5f0267399"}]},
+                      {etop_gui,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f0421b554807cd47031f0873f649d5e1"}]},
+                      {etop_tr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d152946c82611d5f39b1ed3c720cb570"}]},
+                      {etop_txt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a02a670a9ee8ea7c3cea6de5bdcfa356"}]},
+                      {observer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0e7d30dfe8122c8736eeac0582abb076"}]},
+                      {observer_app_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e6130cbc700be448c7f64c7f8bcefcc6"}]},
+                      {observer_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0973e064b3b2ff3b79f2f1eed47a8539"}]},
+                      {observer_perf_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b5753467f635c1a98ad5e3f2e50f75f4"}]},
+                      {observer_pro_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1e68919849e91012fd156d3ac6228af"}]},
+                      {observer_procinfo,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"175c07cc3510655fbdfe95a35012a84a"}]},
+                      {observer_sys_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7637a94c99800b8b1c47467f7411fce6"}]},
+                      {observer_trace_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a836a58f29e21107efbf7fa3276c0ff6"}]},
+                      {observer_traceoptions_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e070e083bc809e6bd67284d46876292e"}]},
+                      {observer_tv_table,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3dfa1b811025f5313ba91c620bdafa62"}]},
+                      {observer_tv_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c8661053d6b3b563582c335e6e18bc2"}]},
+                      {observer_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"72d4b855d618e72367b3b26a9c9fe22e"}]},
+                      {ttb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"08eec178cb05729190be64adbfc06fd4"}]},
+                      {ttb_et,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"18006f41b1483c5378d0d803bb73428f"}]}]}]}},
+                 {application,
+                  {mnesia,
+                   [{description,"MNESIA  CXC 138 12"},
+                    {vsn,"4.9"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/mnesia-4.9/ebin"},
+                    {modules,
+                     [{mnesia,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7ef269bdcc2f2ebecc93eed4a7d97e43"}]},
+                      {mnesia_backup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"50581e2e99465b9ab9adb11193ccbcb8"}]},
+                      {mnesia_bup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"63c4dc59c47dedf48fb8a67b3aee3a5a"}]},
+                      {mnesia_checkpoint,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"57fca37f2b0e856bb728f0660f6ad017"}]},
+                      {mnesia_checkpoint_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"211e3b158a5869145c472cc12080a148"}]},
+                      {mnesia_controller,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a4d98077e647433bbd4dfe9215bf45c0"}]},
+                      {mnesia_dumper,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"32b0759359dcf8f05af72e914720ceaf"}]},
+                      {mnesia_event,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bb423661483d17e8aaa683a22600aee7"}]},
+                      {mnesia_frag,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"279eb6b4f1f713c9960f1697856030e7"}]},
+                      {mnesia_frag_hash,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7ca1e314bdfa381005e047965e7fe435"}]},
+                      {mnesia_frag_old_hash,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"70dd3592f65741eefd724448e56427a3"}]},
+                      {mnesia_index,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"79261cc27d922d6eeecac20a90920cd0"}]},
+                      {mnesia_kernel_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8f6da4fd3cf0ce074bf7b04e44e86470"}]},
+                      {mnesia_late_loader,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02a44f59cd50a3b6fcb78198781e8e7b"}]},
+                      {mnesia_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"08abcd0826ef6dce6929ca1741c156d7"}]},
+                      {mnesia_loader,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b316a61b4f5ce23b5c7e4bcfdaf6367f"}]},
+                      {mnesia_locker,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"847d79bf891a9bcffda9e12458490e7e"}]},
+                      {mnesia_log,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8ae50e4995027fe6229091521e842b1e"}]},
+                      {mnesia_monitor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"105c199cb846668f52e583faee684690"}]},
+                      {mnesia_recover,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91044c669bf165c1d9bb72d76da7135c"}]},
+                      {mnesia_registry,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aa46aa5634381be997d54dbbf8da99d1"}]},
+                      {mnesia_schema,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"19676af000bf38b666e545b3c6f22937"}]},
+                      {mnesia_snmp_hook,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f994954a18270025bf505af1a1dd1244"}]},
+                      {mnesia_snmp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bb3f27cfb0a3fa51e062ca6e86973a3f"}]},
+                      {mnesia_sp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"86565dac38aae327be11f08e8d2e05e8"}]},
+                      {mnesia_subscr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a02b0b2458f5900927d72010d097ea94"}]},
+                      {mnesia_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"309a5b00197c57437131eec4ce49c560"}]},
+                      {mnesia_text,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3008beca178112720e4dc18ec6325583"}]},
+                      {mnesia_tm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7be29c00407f6162375a0d855b36c68d"}]}]}]}},
+                 {application,
+                  {megaco,
+                   [{description,"Megaco/H.248 protocol"},
+                    {vsn,"3.17.0.1"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/megaco-3.17.0.1/ebin"},
+                    {modules,
+                     [{megaco,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1621bcd17d72f8165b568b33e80badff"}]},
+                      {megaco_ber_encoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"12ccb5c139d29b2066d3317a2f6c166f"}]},
+                      {megaco_ber_media_gateway_control_prev3a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c13becbea3de6bd37af08cd022c5b5a1"}]},
+                      {megaco_ber_media_gateway_control_prev3b,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"721176c1221d7ea112757ebe621508fb"}]},
+                      {megaco_ber_media_gateway_control_prev3c,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c4546f9416ae2b969c41f114c777b994"}]},
+                      {megaco_ber_media_gateway_control_v1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0f352af0a5bfe76b5ca6a6393ef0782a"}]},
+                      {megaco_ber_media_gateway_control_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2321767a4aeeadca11a92a77da4bb488"}]},
+                      {megaco_ber_media_gateway_control_v3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"851782cffe570769b46773bc55073bc5"}]},
+                      {megaco_binary_encoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5e378f272d26a606b7d8b99accc472ff"}]},
+                      {megaco_binary_encoder_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1eaa0f4ac077056d2753b4945acac2af"}]},
+                      {megaco_binary_name_resolver_prev3a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"afc05954d77f1580e3e3119b28b2ee18"}]},
+                      {megaco_binary_name_resolver_prev3b,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"64eca1a5ca4891ec6cb56e5b3b747cb1"}]},
+                      {megaco_binary_name_resolver_prev3c,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7ab8daa26dfc1ecd8593ea03f037e0b1"}]},
+                      {megaco_binary_name_resolver_v1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8a28e0729df9ed41a27d38e76d2b1efc"}]},
+                      {megaco_binary_name_resolver_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6e831098553576721cfa3187f3246577"}]},
+                      {megaco_binary_name_resolver_v3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"adc24901b71b89a59191caa575777136"}]},
+                      {megaco_binary_term_id,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"82f36dc610c932eb0e6ca2e9002d6c5b"}]},
+                      {megaco_binary_term_id_gen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0b1f0904c943c78f55b67da76203955d"}]},
+                      {megaco_binary_transformer_prev3a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fff3d874f36cfbc32dbbbc5078dcd380"}]},
+                      {megaco_binary_transformer_prev3b,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"33cc44d1bf46cd3bfb5aea29887bcd57"}]},
+                      {megaco_binary_transformer_prev3c,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ef3fe41f1f88c54aa4fb1caac2724337"}]},
+                      {megaco_binary_transformer_v1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f916e19a7725a6887c4f88395c9af607"}]},
+                      {megaco_binary_transformer_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d4c8f6b31357bc55c13c7b7881a9a775"}]},
+                      {megaco_binary_transformer_v3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ab88024bec5e1fd3c03923d1d0e5119a"}]},
+                      {megaco_compact_text_encoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bf7e1fe374598225fd46f38b81e07d9f"}]},
+                      {megaco_compact_text_encoder_prev3a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"23e6620407ec5197028fa798bf01e51a"}]},
+                      {megaco_compact_text_encoder_prev3b,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a475f5b036fb0aa3dd35f86ff1d3c3fd"}]},
+                      {megaco_compact_text_encoder_prev3c,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2cbd43381f15e24a25a85797028851d5"}]},
+                      {megaco_compact_text_encoder_v1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b193fe2860d7e926e73b71c501412b07"}]},
+                      {megaco_compact_text_encoder_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"777b3a6ecc8b41b8bbab1ad70c7bf6ae"}]},
+                      {megaco_compact_text_encoder_v3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e481d7fc5b319d95e6b6d7301837211c"}]},
+                      {megaco_config,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"895d349eeee863ee722653edb146eec3"}]},
+                      {megaco_config_misc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"275e3e57bae4ae030b1e8f2be4a4ece2"}]},
+                      {megaco_digit_map,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e82b7b9950adc2a9b92418b741056198"}]},
+                      {megaco_edist_compress,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"de4bb8d979b71e2a77bc6480c755f0e0"}]},
+                      {megaco_encoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"323b5d062600331842c9a23dd847ce29"}]},
+                      {megaco_erl_dist_encoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6523fa00adc2e065d8418983cb9caa83"}]},
+                      {megaco_erl_dist_encoder_mc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"41066ab829e0f8ebc457c8e087e029db"}]},
+                      {megaco_filter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"778b451ec26564a06b01bb6449e62004"}]},
+                      {megaco_flex_scanner,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"76674c634aab23d50f8746016a4a0be5"}]},
+                      {megaco_flex_scanner_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"eeafd9d64269893a5e719f9791e846ec"}]},
+                      {megaco_messenger,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7fc902eabe8adb5b0fe33e79b000ddbd"}]},
+                      {megaco_messenger_misc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3bee9043dce0a684cdd1cd8134a370a4"}]},
+                      {megaco_misc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"441b7ad486bf4eef899e02f97ba14768"}]},
+                      {megaco_monitor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6da74b6f55cbbbacdea077af0a845ef1"}]},
+                      {megaco_per_encoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"58c49d0f60e2132cef575414c82a917b"}]},
+                      {megaco_per_media_gateway_control_prev3a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b84247f3fbcda78fd09755f5368ade94"}]},
+                      {megaco_per_media_gateway_control_prev3b,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a981605bd179636baebaef5ff6ebc806"}]},
+                      {megaco_per_media_gateway_control_prev3c,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f30445cfec10f8cbd55fe17c6724b53c"}]},
+                      {megaco_per_media_gateway_control_v1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0fe217237913122558c928dd10ef79f5"}]},
+                      {megaco_per_media_gateway_control_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d1a9dfc04639677dfb27b24b2829f7ad"}]},
+                      {megaco_per_media_gateway_control_v3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e967677da6dc54388db01f5c1545c77e"}]},
+                      {megaco_pretty_text_encoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b9dce15ad90abfcf6a7cc93391dbdc64"}]},
+                      {megaco_pretty_text_encoder_prev3a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1b00d8cfa3efaae8d225da7007dada64"}]},
+                      {megaco_pretty_text_encoder_prev3b,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aa844b22554dca495b913fc57cfa3013"}]},
+                      {megaco_pretty_text_encoder_prev3c,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91b54a6e884a8afa32ffaa8352893baa"}]},
+                      {megaco_pretty_text_encoder_v1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c6db8e013212168a6df39fca101e3aa"}]},
+                      {megaco_pretty_text_encoder_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"079587bd6b00f80224aaeec199380224"}]},
+                      {megaco_pretty_text_encoder_v3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d3a6f2cc1885299f91fb769fd4a1cb01"}]},
+                      {megaco_sdp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7e2d41d949f9ab2404116f809237301a"}]},
+                      {megaco_stats,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"03152bbddea7c1e557224711c4b97892"}]},
+                      {megaco_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cb7802016626e692d5a8519f536cf3d2"}]},
+                      {megaco_tcp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"15cec9b1865d957412d0945e11bd5630"}]},
+                      {megaco_tcp_accept,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4999b86506c5da0b256de8fdf1423c20"}]},
+                      {megaco_tcp_accept_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91e916f8b5d3aec78b129abb2064f229"}]},
+                      {megaco_tcp_connection,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"53c5b634698b54c66de0676289c52222"}]},
+                      {megaco_tcp_connection_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"48ff5ffa59eb95858702320eed91bf59"}]},
+                      {megaco_tcp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"597fe1780a9081757e42b57e5ebef1b2"}]},
+                      {megaco_text_mini_decoder,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4675bc758b6dfade5a21f345c13fd523"}]},
+                      {megaco_text_mini_parser,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dbc886fe01447c012941de8bbcb8b1e7"}]},
+                      {megaco_text_parser_prev3a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fc946659afb87b8bcd032cd513206016"}]},
+                      {megaco_text_parser_prev3b,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d0158fa2aa0880bfcfcea1249e90a259"}]},
+                      {megaco_text_parser_prev3c,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9acb9c582674145c94ada5f3bc58567f"}]},
+                      {megaco_text_parser_v1,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cfc2972ed82568f1212b10aa5f54a5bf"}]},
+                      {megaco_text_parser_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"38f90460cdfcaf135be0f96917b2f7fa"}]},
+                      {megaco_text_parser_v3,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4e9afc2c639e48188d332c8bccf39588"}]},
+                      {megaco_text_scanner,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d050061e3c87e8f1964b063624202b3"}]},
+                      {megaco_timer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1252b5457aeb62266567e5905d4fa76f"}]},
+                      {megaco_trans_sender,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3be0e627b81fb19dc7a3e27885f0958d"}]},
+                      {megaco_trans_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c89becbc7e0e3b62c0ee8fac09f5adef"}]},
+                      {megaco_transport,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8ad32251f0bd50e9289ae09286daf84e"}]},
+                      {megaco_udp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4274133166af4f35b78505125ca3280a"}]},
+                      {megaco_udp_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"84b71d1f62b9e3958dc6bc55ea87dd5d"}]},
+                      {megaco_udp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e05c1a2e530417dee164ad41e4fa8888"}]},
+                      {megaco_user_default,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"604d252f88e8e7de2e8b2941d6f2fc2f"}]}]}]}},
+                 {code,
+                  [{path,
+                    "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/jinterface-1.5.8"},
+                   {modules,[]}]},
+                 {application,
+                  {inets,
+                   [{description,"INETS  CXC 138 49"},
+                    {vsn,"5.9.5"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/inets-5.9.5/ebin"},
+                    {modules,
+                     [{ftp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f75e6a1763c0f8ad63c48fee7762bd08"}]},
+                      {ftp_progress,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a9f1247decddc2091349cc0c561740ba"}]},
+                      {ftp_response,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8184ca2df27024d938c1745b9b46b21b"}]},
+                      {ftp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"23491501dc6175d1a49c2bbb888642a9"}]},
+                      {http_chunk,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2d127d36200e815d589b358178ae3d98"}]},
+                      {http_request,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c9d27256b8abc0a4752a98c5fab193d9"}]},
+                      {http_response,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a327d5e08590cae728288f395b5880ea"}]},
+                      {http_transport,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fefac9e86284528e5883735ff02f9635"}]},
+                      {http_uri,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6d8dafbcdb6a18c64161cda56b762aea"}]},
+                      {http_util,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"948c60f737d5c6d13e9e19b518eb5dcc"}]},
+                      {httpc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"12f827ea3b4a60e6abe352016df83794"}]},
+                      {httpc_cookie,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"55dbb04357dcd95196eb831ae6c88924"}]},
+                      {httpc_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"13538972414b85062867ba8f72b63a6a"}]},
+                      {httpc_handler_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6d291f5169c3ee61ab92b272e5612628"}]},
+                      {httpc_manager,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fbc2349ce89229b7aab1397e920c4a23"}]},
+                      {httpc_profile_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"71f19372131a26ce3fec7fe59cae62a6"}]},
+                      {httpc_request,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0f9b151b009d24a06987f46db7a7ab32"}]},
+                      {httpc_response,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"df4086639fe81d9d6b0b0f1c27d783c8"}]},
+                      {httpc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cac51bc379bec99f8e2fe737e6701177"}]},
+                      {httpd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"965f24797bd0ecb2662f8cccbf5a114f"}]},
+                      {httpd_acceptor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"60c4ec255f9d3e71ca247d690fc050e3"}]},
+                      {httpd_acceptor_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"146196f8aa54e2872ea09789bf43167e"}]},
+                      {httpd_cgi,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"493bef6896bc09b2a84424756e6aa2d6"}]},
+                      {httpd_conf,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"122f251eb11290e92a55da1a97647ff7"}]},
+                      {httpd_esi,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f0a20e7f4efd148111074d6c027a749d"}]},
+                      {httpd_example,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4e8699c78100cc50e49ac578b154e491"}]},
+                      {httpd_file,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"30702eec4e62275db10ea6e81cd67866"}]},
+                      {httpd_instance_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5d7ab2c856e6d5438dd3144b284ee396"}]},
+                      {httpd_log,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"12fc1dfa3734ae50f2b5912d1245d63d"}]},
+                      {httpd_manager,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ae9176839ab029c3685eaa1e9b2b90d9"}]},
+                      {httpd_misc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4c61eb0828079a16033e6b33e8095104"}]},
+                      {httpd_request,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a91f7e3de28a17002b2923df84f4b01e"}]},
+                      {httpd_request_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2b44228586d6ef9df1fb9bbcdf8e395a"}]},
+                      {httpd_response,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"73a06662a9f1ea7bb68ea6e0487ff3c0"}]},
+                      {httpd_script_env,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"348c3920cf5e3c2137127c4a1e1345b4"}]},
+                      {httpd_socket,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2f021c0b5923e108fd344cee27e360a2"}]},
+                      {httpd_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7814cf6981a80379606be6a64d684e24"}]},
+                      {httpd_util,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4b6d1e4e24096bf68e395c2105f9ddce"}]},
+                      {inets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5dea85fffabe81e273c12c78d57d3ea7"}]},
+                      {inets_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0cc5b16bf76fdd61cc3fcc189509b4cb"}]},
+                      {inets_regexp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d90aa0458fda8b4878dc77b59f3a996"}]},
+                      {inets_service,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fda2c34b97323c1cc7756e681f50073f"}]},
+                      {inets_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5c8287946a050dad1ffd422678150174"}]},
+                      {inets_trace,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"38930cb6dedec461e1cb409ee6902dc4"}]},
+                      {mod_actions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cd04b142450e4b2a6681a67ff53fe983"}]},
+                      {mod_alias,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"488cd71dcfc552f96603b8ae70cffbc8"}]},
+                      {mod_auth,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e4c582f449cb199ea9cc8d5a7004a9da"}]},
+                      {mod_auth_dets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"43a467ba929f04d907a1a6ba11bb1893"}]},
+                      {mod_auth_mnesia,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a3d3fe40e66d1a310a5814ead817db4f"}]},
+                      {mod_auth_plain,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1692c15dbed5d5a680dbac4354569ec8"}]},
+                      {mod_auth_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ee144579a7fd9a4a761307385f6ef449"}]},
+                      {mod_browser,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b4187d14f39e293330958d7ed7f61ce5"}]},
+                      {mod_cgi,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4e72a465306011f4ac2a88f03cd6c9dc"}]},
+                      {mod_dir,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec5cbec9126f452057ed437dba2051b2"}]},
+                      {mod_disk_log,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"702d6f87d24465d11d91f561fd11f7b6"}]},
+                      {mod_esi,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e83eabd7527ed663b93fd5a58a587be4"}]},
+                      {mod_get,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8dd5d81c6a7cc426524180332edb7a14"}]},
+                      {mod_head,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3a62a5beb75a1b60206669499f77130e"}]},
+                      {mod_htaccess,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1bf3f03a28de0bf786813fc181fdb85f"}]},
+                      {mod_include,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"145c3dccff68b053b1db14d5f92488a2"}]},
+                      {mod_log,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5417983275ff4ded18c546c70b8cc7e5"}]},
+                      {mod_range,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"03a0b6a05ae0fd306c5b3f20bb6e05b8"}]},
+                      {mod_responsecontrol,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0ebe00aaf53af7508dabc9d09b949a0b"}]},
+                      {mod_security,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"423eb8f57b9a8bde28e3da13db3de59d"}]},
+                      {mod_security_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cca3960b3899a1a7a4581afc69d7a5cc"}]},
+                      {mod_trace,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62fba170a84e8fdb39c8744f64b37a64"}]},
+                      {tftp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ade4b7390488800507debf97307bd963"}]},
+                      {tftp_binary,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"67a1747702ba0bff57a6f8aaa883b9d2"}]},
+                      {tftp_engine,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fb9e0ee93bfa57bd7ef5a038c23edecd"}]},
+                      {tftp_file,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"48fd419a1467c45c1e7057cdbb59a0a7"}]},
+                      {tftp_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f666dd774c5c60c7ff175b19ade12b2d"}]},
+                      {tftp_logger,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"151ed197576a35d060b7bbf3c74bdf7f"}]},
+                      {tftp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7fc8de866dbc9c30b3d91a8adf8ebf0c"}]}]}]}},
+                 {application,
+                  {ic,
+                   [{description,"The IDL Compiler"},
+                    {vsn,"4.3.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/ic-4.3.2/ebin"},
+                    {modules,
+                     [{ic,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fe764abce09fdd454d880128d9ddda2c"}]},
+                      {ic_array_java,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"227ce84fee6671f9cdf93fb8048f596c"}]},
+                      {ic_attribute_java,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"975e0b45c8a9ce1cb4551fdfb76cbd11"}]},
+                      {ic_cbe,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"43ac10b9d3c5142c747d99c3b9dad4d7"}]},
+                      {ic_cclient,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"73ec31c28859c6c5d6e5dc91b6ce5411"}]},
+                      {ic_code,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02d51ffcaef78b26a0bc8c680938fb53"}]},
+                      {ic_codegen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"41159947a7c4259a58fec12f96d02d69"}]},
+                      {ic_constant_java,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ca029a6c4023f792cdd8fb9052241416"}]},
+                      {ic_cserver,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bf63d17869ccb762e0edab496be39e09"}]},
+                      {ic_enum_java,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ab555fa7842eec8c99e22d11060e6430"}]},
+                      {ic_erl_template,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"04c3d10872a5ab6edd781ae24512b6aa"}]},
+                      {ic_erlbe,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"add3f7151efb782e2437bb626a7d51fd"}]},
+                      {ic_error,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6379a791ac55b3542b5db5a1e329439d"}]},
+                      {ic_fetch,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bdc5454c6fe20b3a28d3a10ea4a7b3ed"}]},
+                      {ic_file,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6597963c839cab5b5591eb1dcaa6a9a1"}]},
+                      {ic_forms,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9bcfeec18c0f2bc54dd64694b0f6d82e"}]},
+                      {ic_genobj,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"97c379af6629a74a7b70c60e6338a245"}]},
+                      {ic_java_type,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"40d0d5d7707b0d63119fdc658f7f3084"}]},
+                      {ic_jbe,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7e2429e630ce4f7dad22af0d4ab242b7"}]},
+                      {ic_noc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c8e61ad2dbb06818f812f1a3dcf0f16c"}]},
+                      {ic_options,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f9f64ecd00b68edfcf38b61e79bd0b80"}]},
+                      {ic_plainbe,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"44ee00595baf6554efbdb45d3ee28937"}]},
+                      {ic_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"857d2fb9fea30b14657b1c4a86d08386"}]},
+                      {ic_pragma,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4f69abbe96dd3cbebbff573664fe0997"}]},
+                      {ic_sequence_java,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fdf12c1c5c020249ba9966ed529e5062"}]},
+                      {ic_struct_java,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4120b045ef93f4db9bea6c9f14180ca6"}]},
+                      {ic_symtab,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9c8ba1bfdd061a5e6864f86c957d6408"}]},
+                      {ic_union_java,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b9b140a193c08210aa09a4484d9a54f3"}]},
+                      {ic_util,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c6ce2a93793c15e09c8e18ccca534772"}]},
+                      {icenum,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a53766074b7015a3bae4631d87f017e7"}]},
+                      {iceval,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d60924eb402c253265ef229824856baa"}]},
+                      {icparse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f2a14e584b40aa5b9e79c5f3101dfb3e"}]},
+                      {icpreproc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"14b63dc40d8160ee25e0f829a0d088c6"}]},
+                      {icscan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8c8e2841047e577935f05c0b5cb10b02"}]},
+                      {icstruct,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3fc6b7d763b490773a0c893a541b3d3a"}]},
+                      {ictk,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"00ad73c637ec333d51a0905c46381eb0"}]},
+                      {ictype,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8cfb0ed8d61bdff82302c4b52716ebf0"}]},
+                      {icunion,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"db222ee3335d7b431061d104f6ecf9b2"}]}]}]}},
+                 {application,
+                  {hipe,
+                   [{description,"HiPE Native Code Compiler, version 3.10.2"},
+                    {vsn,"3.10.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/hipe-3.10.2/ebin"},
+                    {modules,
+                     [{cerl_cconv,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3f8e5afb7f644e20ecc93eff288091d3"}]},
+                      {cerl_closurean,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"598014277bdc97eb3e42db827964786c"}]},
+                      {cerl_hipeify,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c67cb3c827232c389de98edcb669a6f2"}]},
+                      {cerl_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"81c8c4cc2fddba367e557bb8fa3e46b1"}]},
+                      {cerl_messagean,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"d45d1cf2112a30de90c6e02674b471f5"}]},
+                      {cerl_pmatch,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"592ae9106c429413eef5bca3404a312a"}]},
+                      {cerl_prettypr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c10b7a51c482eaae5d5bb5156072faed"}]},
+                      {cerl_to_icode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"975ca9009d46f139766227e24f00167b"}]},
+                      {cerl_typean,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"2407a7ab5367d3d2112283c1ddfc53a2"}]},
+                      {erl_bif_types,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"0a6c9083ace0be207cc54681c6cbf565"}]},
+                      {erl_types,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"42d756bf4eaf470785a1b81838979af7"}]},
+                      {hipe,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"32e6ef5c8585a438373c41e5a5d75d91"}]},
+                      {hipe_adj_list,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"e5bc155da44d7631411dfc1a02fec2ef"}]},
+                      {hipe_amd64_assemble,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1647b309190377cb226db1314fcac5cd"}]},
+                      {hipe_amd64_defuse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"d3829c95a7eed25abc393e29da9bbf19"}]},
+                      {hipe_amd64_encode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"49079178cae281b4645ae6f25ce18838"}]},
+                      {hipe_amd64_frame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4476b9c0703b2a8473aa502dc6bdada8"}]},
+                      {hipe_amd64_liveness,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"9fab826ab4bd5d716173c1f3b3b4d347"}]},
+                      {hipe_amd64_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"52b41c777e65aeea7e35a9321585d34a"}]},
+                      {hipe_amd64_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4eb339172dae5c27d67b4410de84f51f"}]},
+                      {hipe_amd64_ra,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"73bf464fdfd7cf668efdffc3fc78c352"}]},
+                      {hipe_amd64_ra_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"7bc4f317d89794f58a1a0bda3b599879"}]},
+                      {hipe_amd64_ra_ls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"5c0509cfd228b140247a46214243a415"}]},
+                      {hipe_amd64_ra_naive,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6a50f0f7d1c454c50975d6d0b3eb3c4e"}]},
+                      {hipe_amd64_ra_postconditions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1ed593df4c9da2fe96da00274117f1b4"}]},
+                      {hipe_amd64_ra_sse2_postconditions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"277417561a1fed88867bfdafe9e1c580"}]},
+                      {hipe_amd64_ra_x87_ls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"8684b37d2d952516b2f8e77426decaf2"}]},
+                      {hipe_amd64_registers,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"02db134b8e57405134b8e68a9f0588d3"}]},
+                      {hipe_amd64_specific,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c66c33708abe9f32d36337c358a73530"}]},
+                      {hipe_amd64_specific_sse2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"f0e4d5df03612b82d8cffecd5f9d4a84"}]},
+                      {hipe_amd64_specific_x87,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3a28b90d577a9db6ef4b70d9defbd863"}]},
+                      {hipe_amd64_spill_restore,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"81a80af9658effa33fdfe85f6161a35a"}]},
+                      {hipe_amd64_x87,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b55ded15ce4283908342b2824226406b"}]},
+                      {hipe_arm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"160cf412bbc01adfb4229f8b73a45ba5"}]},
+                      {hipe_arm_assemble,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"62390a02348b3abffcb4502ff1b2b9f3"}]},
+                      {hipe_arm_cfg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"30d169daa65fe2104260b4621d500e17"}]},
+                      {hipe_arm_defuse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c464aa34b089a594edfc1cdb7012f39c"}]},
+                      {hipe_arm_encode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ee3833e47107f465b35e3d9a255d0447"}]},
+                      {hipe_arm_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"74ce09dca62bfdfdbe0f667075f78c35"}]},
+                      {hipe_arm_frame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"e46614b822aafd6233af080377bc8729"}]},
+                      {hipe_arm_liveness_gpr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"19888211ce56a0eb039578ea485a7776"}]},
+                      {hipe_arm_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b745515f7f9a5b4dc2e3f03f8dba82c3"}]},
+                      {hipe_arm_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3b5de0ec46bf573c64151697e03dcbeb"}]},
+                      {hipe_arm_ra,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"d129dfc23327601b4615e91f849c214f"}]},
+                      {hipe_arm_ra_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"cdeccd5062db370b87cb350b317c041a"}]},
+                      {hipe_arm_ra_ls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"fd59b7eba19bd0985bfc527377e815ea"}]},
+                      {hipe_arm_ra_naive,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"cbbdef9b7829ce07fc482451a8f7c7a8"}]},
+                      {hipe_arm_ra_postconditions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"2a3a8e58a6ba75ca3902348a5b43ec79"}]},
+                      {hipe_arm_registers,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"7bd890ef97657715f12f031658d4c9c4"}]},
+                      {hipe_arm_specific,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"611f5b731b1c7fa6f589010db3443a81"}]},
+                      {hipe_bb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"66afe906c353f43505649b33dfed45a9"}]},
+                      {hipe_beam_to_icode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"826bf8aa6513c06c61e08faa9383b4fc"}]},
+                      {hipe_coalescing_regalloc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"cf5f22f7e27c8ba6a1e73e29900fb096"}]},
+                      {hipe_consttab,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4a430042156f62e55b404d38b82ef6c1"}]},
+                      {hipe_data_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"7843ffb243b1c8d66351c1452fec1cf5"}]},
+                      {hipe_digraph,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3caa6181724dc59e70a3c5ee5b886233"}]},
+                      {hipe_dominators,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4f7038336d002e637edb3b57cc6b7293"}]},
+                      {hipe_dot,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"0218e226a92b4a444c90b4c18be48c76"}]},
+                      {hipe_gen_cfg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"75a06ae623c2dd5a78903d11ba61cfd6"}]},
+                      {hipe_gensym,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1b5a357fb4e6833e55b574343d116217"}]},
+                      {hipe_graph_coloring_regalloc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"e25c88384aaa7b7a16c5849b31db4fcf"}]},
+                      {hipe_icode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"899c47579553070995c5701f16f2c1ca"}]},
+                      {hipe_icode2rtl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"cba4203ea542c9abfac6eaa92cb269e9"}]},
+                      {hipe_icode_bincomp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4e211977eb23242d6a2bf0b099eff090"}]},
+                      {hipe_icode_callgraph,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"f79f8f10f1aaaf4280abf06cfa40d56d"}]},
+                      {hipe_icode_cfg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ca9529e58b378b731ac6aac84218e2da"}]},
+                      {hipe_icode_coordinator,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3a1caa6d31d48a3fb311a2ea97f0c30c"}]},
+                      {hipe_icode_ebb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b6b088a13c02a03e5a28247be6d45b94"}]},
+                      {hipe_icode_exceptions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"40dfad7ac3602fece6bb4b5a8c9ab98b"}]},
+                      {hipe_icode_fp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"f3fcc6b3d555dfa882e7483eb64a6571"}]},
+                      {hipe_icode_heap_test,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"fed11d612f8f3da9ea1e4cc67389eff5"}]},
+                      {hipe_icode_inline_bifs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3027c916d2ecc9762123585e1d91f467"}]},
+                      {hipe_icode_instruction_counter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"cf488cc5eb29636045d2880b33254711"}]},
+                      {hipe_icode_liveness,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"bb99ee17bd466d1b802a42b0583e26d7"}]},
+                      {hipe_icode_mulret,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"323e6103d2511e5bd4a87ad2b4dcf3c3"}]},
+                      {hipe_icode_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"56edb2552a5c36757005cebd6196f7ce"}]},
+                      {hipe_icode_primops,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3f14ad0079bdc8cf1feb08c6c2da287a"}]},
+                      {hipe_icode_range,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"0040719dd6effa173e861e4eb0e3cff6"}]},
+                      {hipe_icode_split_arith,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"5575b7299b149e93d358fdeccc999652"}]},
+                      {hipe_icode_ssa,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"090ca01ba76f97f346c6fb260751cad3"}]},
+                      {hipe_icode_ssa_const_prop,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"5944b123b3fcd4b0839b316ee68ee36d"}]},
+                      {hipe_icode_ssa_copy_prop,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"997be266f8aa90058e1cc47807628ab4"}]},
+                      {hipe_icode_ssa_struct_reuse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"8fbe27064d4bb5a27507564d4ace240b"}]},
+                      {hipe_icode_type,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"cd5755e095fcdc667aa925440a072104"}]},
+                      {hipe_ig,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"023433ebf566fdd844f091a0d35af764"}]},
+                      {hipe_ig_moves,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b1d86094e8232686f4e234cca76178c6"}]},
+                      {hipe_jit,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"d52c6fa1354f23d6c3234f2ba0adb467"}]},
+                      {hipe_ls_regalloc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"af8f6022eafbf853ada08fe69e9509ca"}]},
+                      {hipe_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c5c32cf830833284942651c29d48e796"}]},
+                      {hipe_moves,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c4b6be3fb7b1fd8acaa60cf09a34ab92"}]},
+                      {hipe_node_sets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"8f506e9e71db4336c1ec699b1335dc17"}]},
+                      {hipe_optimistic_regalloc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"43cd34d83f3c513ee455a446628c39eb"}]},
+                      {hipe_pack_constants,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"09e240bfc2522acbaa543f356a28f9af"}]},
+                      {hipe_ppc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b4a1ef1f5d56e249be91954a55b35b5c"}]},
+                      {hipe_ppc_assemble,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"be62cec21a026c5385d2482369ac59a0"}]},
+                      {hipe_ppc_cfg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"7d0362cb062e78fb25852d9fcf943371"}]},
+                      {hipe_ppc_defuse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"45a4ac6be649d5ebd584abd44704addc"}]},
+                      {hipe_ppc_encode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"fb5b41996c46e440e0292565c786d9a2"}]},
+                      {hipe_ppc_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1475ac44aff754105fdd4e85687346ab"}]},
+                      {hipe_ppc_frame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1fd18b642e945b3f6b384549c810f5c6"}]},
+                      {hipe_ppc_liveness_all,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"5194b99327e725de7a0c94abb4d35974"}]},
+                      {hipe_ppc_liveness_fpr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b3958a1138f1f112f5ff4b357520fa4d"}]},
+                      {hipe_ppc_liveness_gpr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"fc4585d446b47d4151671b7bc83f86eb"}]},
+                      {hipe_ppc_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ec4dd9d536fb6aa5cdb418dded96184b"}]},
+                      {hipe_ppc_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c37b9de73810ceeaca37bc0520a76884"}]},
+                      {hipe_ppc_ra,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"db4deb5ea2a237ff1e0984f7979e5d3f"}]},
+                      {hipe_ppc_ra_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c4376f33857d9cb0cea29ff783ea82cf"}]},
+                      {hipe_ppc_ra_ls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6ba2df5f54c48dc90c42547e8bd2ca48"}]},
+                      {hipe_ppc_ra_naive,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ba3d03b4267f315b10ed939a37d4597c"}]},
+                      {hipe_ppc_ra_postconditions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"a9d4ca393bff97c1931d0eb18d38a811"}]},
+                      {hipe_ppc_ra_postconditions_fp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"742e3f111a16eb5ca003f1a97804e5a9"}]},
+                      {hipe_ppc_registers,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"40dd287c6853767e7083a8c5549681ce"}]},
+                      {hipe_ppc_specific,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"d5e2330aa55edd677ecf3e77bf659781"}]},
+                      {hipe_ppc_specific_fp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"34a6f358c60c47ebec7956b66205062f"}]},
+                      {hipe_profile,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"210939fd9ea20991d7fae07b12348d35"}]},
+                      {hipe_reg_worklists,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ee79fa6eb3bca9a4f0025d9e4ce02a72"}]},
+                      {hipe_regalloc_loop,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"19fc9f539fd5abb2ecc5aeaf6c2526db"}]},
+                      {hipe_rtl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"2ab93246a0c75f83327de3e0234dbe08"}]},
+                      {hipe_rtl_arch,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3481cc7240b928da18df9e61214ceb25"}]},
+                      {hipe_rtl_arith_32,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"328deb7987296b869279c7c0d588f337"}]},
+                      {hipe_rtl_arith_64,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"64cc932e691e7743d06642103170de55"}]},
+                      {hipe_rtl_binary,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"198df75c4eefcd2b7a7f769922d4ce60"}]},
+                      {hipe_rtl_binary_construct,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"7a1b57215669ed36c40b335e6826be2c"}]},
+                      {hipe_rtl_binary_match,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1c22996f5b79a3818503a19059bdaf8e"}]},
+                      {hipe_rtl_cfg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"60570bb8a1cbde7c72ad1c37e2b8e17d"}]},
+                      {hipe_rtl_cleanup_const,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"a555a1c325dd9b3ae1775881af8abfad"}]},
+                      {hipe_rtl_exceptions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6c7f64efbed1c8e51f2323fa693d3b89"}]},
+                      {hipe_rtl_lcm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"bd3735cbd4bc9eb9254b0c2ee67cd1ad"}]},
+                      {hipe_rtl_liveness,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"0dcceb8fd82c12480e42399dd2869c41"}]},
+                      {hipe_rtl_mk_switch,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"8890cf7e39302f57f3adf8987755b34c"}]},
+                      {hipe_rtl_primops,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c734e269cbc4be78cb3fe47fa55053a5"}]},
+                      {hipe_rtl_ssa,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4d9ce36d8dc1168eecf173bde8a0871a"}]},
+                      {hipe_rtl_ssa_avail_expr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ef5653db422ed4115c734d9676f3b030"}]},
+                      {hipe_rtl_ssa_const_prop,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"598dee97d9fd44735a534b250bf60e2a"}]},
+                      {hipe_rtl_ssapre,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"93b3ea7957d2008d763bd4416ef98277"}]},
+                      {hipe_rtl_symbolic,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4e6b19de45d978326014a378368a6f8e"}]},
+                      {hipe_rtl_to_amd64,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6afb4d232649b0a0ee54e5a4859e85ce"}]},
+                      {hipe_rtl_to_arm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"a12eb244baec0e0bcd2d39353ac69b90"}]},
+                      {hipe_rtl_to_ppc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"521f595296e6c1bf0b7d1caf59bbfb77"}]},
+                      {hipe_rtl_to_sparc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"66783d3f670bd939159b0abf3548dddc"}]},
+                      {hipe_rtl_to_x86,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"2b4ebecd4e2fa29e952c650809ec89b6"}]},
+                      {hipe_rtl_varmap,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"2b1e6ba5714a0764c0897a780fb38c8e"}]},
+                      {hipe_sdi,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c305600fbb8905b9b0cf792f2f85ed72"}]},
+                      {hipe_sparc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6a5cf680abe539d1dfa669cb52ce1f80"}]},
+                      {hipe_sparc_assemble,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"330f4c7130dc215c911ecfd48d9dedde"}]},
+                      {hipe_sparc_cfg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"d8278464e9d1d65437625517255ae2ab"}]},
+                      {hipe_sparc_defuse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"a7f131d52962288326e844f28d13d4cc"}]},
+                      {hipe_sparc_encode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c1b5971e5e6f3304bcc00f1abeb268f7"}]},
+                      {hipe_sparc_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"22d88316138d80c3ecf41ced21ec25cf"}]},
+                      {hipe_sparc_frame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"623fdaf78bfaff2b07733eb4a211f79b"}]},
+                      {hipe_sparc_liveness_all,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"2bd5c26371c946fdbf9c1530c1478ca1"}]},
+                      {hipe_sparc_liveness_fpr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"7dc401039841503524934a1b97990c2a"}]},
+                      {hipe_sparc_liveness_gpr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4c5e32e6adbbc37b4f793e8bde52ab2f"}]},
+                      {hipe_sparc_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"3c063c4c5b1bd8ec02c6ffe60c561056"}]},
+                      {hipe_sparc_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"f89846e24afb3795d259291e4613c155"}]},
+                      {hipe_sparc_ra,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6925c18182b17ee978041e26fbf490b3"}]},
+                      {hipe_sparc_ra_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"45cef8c32ae3b2f6f01911592016924b"}]},
+                      {hipe_sparc_ra_ls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"2eedc8b13aac2efcd2e3649afd845d02"}]},
+                      {hipe_sparc_ra_naive,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"81f0a231c4bde04b132bdb6748774c10"}]},
+                      {hipe_sparc_ra_postconditions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"549d7dfb54dce00bb7f5317306694308"}]},
+                      {hipe_sparc_ra_postconditions_fp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"9de491abdbbc1c156a20a692d463965b"}]},
+                      {hipe_sparc_registers,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1a4dd5b6dc938d539fead6b1ad9e2ba0"}]},
+                      {hipe_sparc_specific,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"809b836428fcb194565eeee86ecf138b"}]},
+                      {hipe_sparc_specific_fp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4bf2be9b351b82024e81eabfd68806f9"}]},
+                      {hipe_spillcost,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b9ef65406aa671e28d1bd8428f102fe9"}]},
+                      {hipe_spillmin,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"bde0ad7813cb8f86fc4ff110090af2da"}]},
+                      {hipe_spillmin_color,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"e277f11303f44d6ea07be695c1057d7f"}]},
+                      {hipe_spillmin_scan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b007825bb206e086b9ffc943213aa625"}]},
+                      {hipe_tagscheme,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"568fc377e498aec5a73e1b2c9cd29432"}]},
+                      {hipe_temp_map,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"56dff1fb8175d1d7c32f7e8d95e10488"}]},
+                      {hipe_timing,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c3238c3b4adc08c290c37ba1ea7d3a31"}]},
+                      {hipe_tool,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"f93194221b0e3756c9f0f70127b205bd"}]},
+                      {hipe_vectors,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c4e6ef55b233f27c27bd2f781baf9c94"}]},
+                      {hipe_x86,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"051e4ee3dd5298e2cee05b1fca82e64d"}]},
+                      {hipe_x86_assemble,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"d1829f13a89049280e7cb22cd394af0d"}]},
+                      {hipe_x86_cfg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"b9d6a090c32c03e6e91deac9bbb167ae"}]},
+                      {hipe_x86_defuse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"c81bb7a0dd72b256c57fb37042de68ff"}]},
+                      {hipe_x86_encode,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"386d1abc98765c09c6bc6fe44cf2748d"}]},
+                      {hipe_x86_frame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"db2a440f5975688c7bf9a88c47aaf627"}]},
+                      {hipe_x86_liveness,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"8783c19717dda46b566c465ba85b2588"}]},
+                      {hipe_x86_main,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"236cd462abe386223cefe606b4f48928"}]},
+                      {hipe_x86_postpass,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"57e5cb6ad12dceef612122c8f759ac15"}]},
+                      {hipe_x86_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6efd3b5cd8c70edbd326ffe9457a3192"}]},
+                      {hipe_x86_ra,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"1e8b7f27a05e1e7fac9ea95cdd394909"}]},
+                      {hipe_x86_ra_finalise,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"4a3c30788866a5e997e0a1687279732e"}]},
+                      {hipe_x86_ra_ls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"bb13a4d08391fe3f212fa4eba816029b"}]},
+                      {hipe_x86_ra_naive,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"e26c0711db5e891c86b64da12fe064ff"}]},
+                      {hipe_x86_ra_postconditions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"e3d6ad622a3017744106b653324c0edb"}]},
+                      {hipe_x86_ra_x87_ls,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"a6092f1853a7a04f8d16228f6183dcc0"}]},
+                      {hipe_x86_registers,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ce77b4ffff06c9532943ad5f6907b18e"}]},
+                      {hipe_x86_specific,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"ad074b1e645c06c2137a46cd19f88b72"}]},
+                      {hipe_x86_specific_x87,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"a20c2c2b1742aa084dbb7395a92b650d"}]},
+                      {hipe_x86_spill_restore,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"88e191ef5057ea6a50c75af85c814013"}]},
+                      {hipe_x86_x87,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.2"},
+                        {md5,"6edcc888c87ffc96414a8dce57d691da"}]}]}]}},
+                 {application,
+                  {gs,
+                   [{description,"GS  The Graphics System"},
+                    {vsn,"1.5.15.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/gs-1.5.15.2/ebin"},
+                    {modules,
+                     [{gs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9d416ae60d6cda2ea55a05dbde8a53f7"}]},
+                      {gs_frontend,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eb02484f42ac799bdd086f6832b72330"}]},
+                      {gs_make,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ea7a1edc4bd5b9867ce924130851f295"}]},
+                      {gs_packer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4c5d911152526836f3487cd3de6b0bf9"}]},
+                      {gs_widgets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2efa721783d863bca4ff2e116c9593fd"}]},
+                      {gse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9355057cfe2b70da376f208739bd7c06"}]},
+                      {gstk,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"684b9d8f370368e25ea2ca2ac708c1ee"}]},
+                      {gstk_arc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1cd1114560c3839fb84380975d61d68b"}]},
+                      {gstk_button,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"29ce4f10fe8dc2bb85649018aa64d71a"}]},
+                      {gstk_canvas,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a637d6932415873666ed040817ed2a72"}]},
+                      {gstk_checkbutton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3cad265e62fb4cbeda02c089b5b309bb"}]},
+                      {gstk_db,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dd236aeb7ff4658fd1a9d1302602a7af"}]},
+                      {gstk_editor,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"17dd7595545d33bb3143ac3995711b39"}]},
+                      {gstk_entry,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2740de840e6b8871909dfedd96d4b5b4"}]},
+                      {gstk_font,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bc2fef06167d48c71cc434fa7411ca95"}]},
+                      {gstk_frame,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5113cb91ebb88a4cb1a0b4cb7665607d"}]},
+                      {gstk_generic,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d392d9f2e6c6220245cff065e99a3f5"}]},
+                      {gstk_grid,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"61def27e9610041778245948e5f82be1"}]},
+                      {gstk_gridline,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"40c7173521b57e4c9243ec5258f65d6d"}]},
+                      {gstk_gs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9c9ab7ac782c3e36e201d4760f37e478"}]},
+                      {gstk_image,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"50a6a6b41de78e4f06b0c98cba97992a"}]},
+                      {gstk_label,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"00b5826ce30fc11e417a7a43f0c7e563"}]},
+                      {gstk_line,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b7785bc56e2f32b575a4240a60994d62"}]},
+                      {gstk_listbox,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"053218bec49478a8334df6b0818e981f"}]},
+                      {gstk_menu,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ccf11b45fdd908fafb781c897d379370"}]},
+                      {gstk_menubar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e801f2c6eccc8258d719028b706ec624"}]},
+                      {gstk_menubutton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1fc2d88da997bdc39a24f3f0db9963b3"}]},
+                      {gstk_menuitem,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6a4442a7307d34c544783c9d22433135"}]},
+                      {gstk_oval,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f4775c1b7522750f395f28a94eefe453"}]},
+                      {gstk_polygon,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fdc96f316574995486c842b612722e25"}]},
+                      {gstk_port_handler,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"95ec5d20c905e8cc7fef2df5f99ceb88"}]},
+                      {gstk_radiobutton,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b67bb9cafd3bf67b210d7b0e0b1bd992"}]},
+                      {gstk_rectangle,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6bf1f8e7953532468393090fe8d56ba2"}]},
+                      {gstk_scale,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"848c7ee845d1a59a0a7c4775f64f220e"}]},
+                      {gstk_text,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"719252f8d069544886ec473e16688530"}]},
+                      {gstk_widgets,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"29b540f4612eb1f1e65123f08809bee4"}]},
+                      {gstk_window,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"746a06674df1cd96678689e6ab92a95a"}]},
+                      {tcl2erl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f67bcc59683d0c578cba1c0062ff6b3e"}]},
+                      {tool_file_dialog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3763cc96ed8e2a6136a4c15e54a9adee"}]},
+                      {tool_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"96edfeab61de9b40618e7808d62225b2"}]}]}]}},
+                 {application,
+                  {eunit,
+                   [{description,"EUnit"},
+                    {vsn,"2.2.4"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/eunit-2.2.4/ebin"},
+                    {modules,
+                     [{eunit,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"800601aeceaf1de519df273ca25741b5"}]},
+                      {eunit_autoexport,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"48f889ffaa560238fa2269614f93bbce"}]},
+                      {eunit_data,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ed89782dac4c2b21da64d92bf74f1e22"}]},
+                      {eunit_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"949ed8c5f494a8678c6f29775a7b5154"}]},
+                      {eunit_listener,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6f107b19b4ecf45031a93afa5ace611f"}]},
+                      {eunit_proc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cfc2da427b2bf7ba843f6b8d8121e2c9"}]},
+                      {eunit_serial,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f07a040ebbba4af90fa9668c410befba"}]},
+                      {eunit_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0842dedb36c3b1cd91229a7e4abfe328"}]},
+                      {eunit_striptests,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"473b48509d28519ba18cfa83a8dea8b4"}]},
+                      {eunit_surefire,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1e6a5cebf210cdd8a558cd32b96ac13"}]},
+                      {eunit_test,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cc3897e05a5146b24c109fbc5da83e86"}]},
+                      {eunit_tests,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5d2b6b165201e0aad13a8d8f4d542f59"}]},
+                      {eunit_tty,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a4faaab287e1fa52837cdfd1b58c7faf"}]}]}]}},
+                 {application,
+                  {et,
+                   [{description,"Event Tracer"},
+                    {vsn,"1.4.4.4"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/et-1.4.4.4/ebin"},
+                    {modules,
+                     [{et,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"82db3e8683420a2adb933306c8c822e8"}]},
+                      {et_collector,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dd43f7a22b3c3e6a1799a88163c3d441"}]},
+                      {et_gs_contents_viewer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"44e7ea855be084e48cd364735d79f5f7"}]},
+                      {et_gs_viewer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d4ef2a5673c20444b198bdc185cc637a"}]},
+                      {et_selector,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"267f60d2ecdad671eae269cdd2ff30f6"}]},
+                      {et_viewer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3ae9af3449c17f045d25ca424e9873ae"}]},
+                      {et_wx_contents_viewer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6d14826378988286a32fc85ca4246325"}]},
+                      {et_wx_viewer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"87f45e31d50a82d9db2443ddff14ad22"}]}]}]}},
+                 {application,
+                  {erts,
+                   [{description,"ERTS  CXC 138 10"},
+                    {vsn,"5.10.3"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/erts-5.10.3/ebin"},
+                    {modules,
+                     [{erl_prim_loader,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"719e5362c7c1f0d1fd96601b7f814981"}]},
+                      {erlang,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"04b2444affe04bb9287d86e0e0c80578"}]},
+                      {erts_internal,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a95c0409fe7b4ccf6e2fe509bfd23da8"}]},
+                      {init,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"55bb9fddcdf820938be2efee15eccd82"}]},
+                      {otp_ring0,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"47fe4e7e2d2a5f20cd3a9393e0743e57"}]},
+                      {prim_eval,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"16d4fc3a8e5e2ef7200bd866fe8b1abb"}]},
+                      {prim_file,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"da0745178ab8aa8fb8d3a373970ebfdd"}]},
+                      {prim_inet,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4993598825a1083526cbc23cf027f494"}]},
+                      {prim_zip,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9280fc2398f9eb3bd09f74cfa1d6d267"}]},
+                      {zlib,
+                       [{loaded,true},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"811834d04ac37676048717e1c51f63ac"}]}]}]}},
+                 {code,
+                  [{path,
+                    "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/erl_interface-3.7.13"},
+                   {modules,[]}]},
+                 {application,
+                  {erl_docgen,
+                   [{description,"Misc tools for building documentation"},
+                    {vsn,"0.3.4"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/erl_docgen-0.3.4/ebin"},
+                    {modules,
+                     [{docgen_edoc_xml_cb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"29c8b94e559528ca0aeacee089f52bcf"}]},
+                      {docgen_otp_specs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c6d53404b1059d2da87ce44bee49d2dd"}]},
+                      {docgen_xmerl_xml_cb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"274ef03ec5cb146346fea794e77febcf"}]}]}]}},
+                 {application,
+                  {eldap,
+                   [{description,"Ldap api"},
+                    {vsn,"1.0.1"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/eldap-1.0.1/ebin"},
+                    {modules,
+                     [{'ELDAPv3',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"655b60d1b5b0629024e2a78708c64518"}]},
+                      {eldap,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"df60096d034768188e0fd6eaa0fd571c"}]}]}]}},
+                 {application,
+                  {edoc,
+                   [{description,"EDoc"},
+                    {vsn,"0.7.12"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/edoc-0.7.12/ebin"},
+                    {modules,
+                     [{edoc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f2749685cb80a536ad42426933220065"}]},
+                      {edoc_data,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3a444b7ae3acc249aac7fe40b38355af"}]},
+                      {edoc_doclet,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"77b3ccaf177983dab1991425fd3d714b"}]},
+                      {edoc_extract,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9effef62cfe9939a4c80b43b86041c6c"}]},
+                      {edoc_layout,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f2b79a133f490b4de09b13f7519d37dd"}]},
+                      {edoc_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4f421fb61a9b2c711d5fc28387b0ffd0"}]},
+                      {edoc_macros,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ddb1e78cf2ddd20aadc87329067286f3"}]},
+                      {edoc_parser,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"02fe39575dfda2cffd6031f6c8f470eb"}]},
+                      {edoc_refs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5a3ba4e7f5211445d74a4d19bc4c5963"}]},
+                      {edoc_report,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bfef03c1f2c7de294972d0ad185a3a11"}]},
+                      {edoc_run,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0db629008caa57ebafde1dda9672306c"}]},
+                      {edoc_scanner,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"165a8e826f458ac6de7c50c395d012df"}]},
+                      {edoc_specs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"21a5746822e2ae01421fb064d9c8ccfd"}]},
+                      {edoc_tags,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c9ad335a1ce6b99189cfbfaef2ca2038"}]},
+                      {edoc_types,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"84530d798ce334278df4dea8a69098f4"}]},
+                      {edoc_wiki,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eabda8c28daf0cdc040eef58f31cc6a8"}]},
+                      {otpsgml_layout,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a511240c5864dd31d4df687465e355f6"}]}]}]}},
+                 {application,
+                  {diameter,
+                   [{description,"Diameter protocol"},
+                    {vsn,"1.4.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/diameter-1.4.2/ebin"},
+                    {modules,
+                     [{diameter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b2fdb2feddc71bda9175711150823325"}]},
+                      {diameter_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6dcc769947f323a9ff306c9bcab4dd2c"}]},
+                      {diameter_callback,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d8c76e1ccf47e3c781cbdf3c8d3e293f"}]},
+                      {diameter_capx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"65e483a5f121d99db830329f3dc050cb"}]},
+                      {diameter_codec,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9bd2e1ef215e88519ca3865601e479dc"}]},
+                      {diameter_codegen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"33696e30585762fe29ca103d67ffbb04"}]},
+                      {diameter_config,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"76e885acd24a697d19b07ce5446f5c2b"}]},
+                      {diameter_dbg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0954c1f71a204a0f2c8b3682d520c704"}]},
+                      {diameter_dict,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1ed21a8d2eea031aa736e95870a7a165"}]},
+                      {diameter_dict_parser,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c90e506d7eba4f18547238b8f025ce5e"}]},
+                      {diameter_dict_scanner,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b3fc9ee26b660a97ad67b4c8728a0b75"}]},
+                      {diameter_dict_util,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"70475203e0968747889eecc533af3f0f"}]},
+                      {diameter_etcp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dde08c8d8311e2700c59b741274923fb"}]},
+                      {diameter_etcp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"85fc8320ca9eb8daceb03727bdadb6f8"}]},
+                      {diameter_exprecs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"728aa8871c778eacc02313d922dde7ae"}]},
+                      {diameter_gen_acct_rfc6733,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"53fb49bb8c354f36d6e1ad6366fe02a2"}]},
+                      {diameter_gen_base_accounting,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"845f38b99248c11778453b628ddb4fed"}]},
+                      {diameter_gen_base_rfc3588,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f6cd02c8318f4ccc198bd08d1ac789fb"}]},
+                      {diameter_gen_base_rfc6733,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"49edd3b9955c82c872169f769c833482"}]},
+                      {diameter_gen_relay,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c970d47476d2832f510b6b03699c95c6"}]},
+                      {diameter_info,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"472b763fc9554c0c92992a3b36177667"}]},
+                      {diameter_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8d49799607d7c7792a79dbc434b4d53e"}]},
+                      {diameter_make,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"249d7f673e7f192ddff7c66b578e886e"}]},
+                      {diameter_misc_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3996fa63b0e083301d35fc6d88b75ce4"}]},
+                      {diameter_peer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"89f28d8d35bdeb8b05995daffb8d868c"}]},
+                      {diameter_peer_fsm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"df03404577882e8cfba57087c91fe3ef"}]},
+                      {diameter_peer_fsm_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b25500795639e63d9a591e33df6e4af7"}]},
+                      {diameter_reg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1e7d427dafe432249d3535bc9e6ec538"}]},
+                      {diameter_sctp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cb7487b2c41e3520b1a46738699a88c8"}]},
+                      {diameter_sctp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a02584b6b31789dd38493fd1a8d7d3e3"}]},
+                      {diameter_service,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e990f54abf1c8706cd7717cba717594c"}]},
+                      {diameter_service_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a66f4714fa96fd7d289260002851cbf9"}]},
+                      {diameter_session,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d348e0ca8d3c827d647c3bea8f9c7691"}]},
+                      {diameter_stats,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f12a18f52de33ca77dacd1bba99680c8"}]},
+                      {diameter_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c910b68b3d0760f595a81ca58b1337f8"}]},
+                      {diameter_sync,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ff62cfc82b044d2300345ac7912fe320"}]},
+                      {diameter_tcp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e4dae7482d9a79d4ead66ef14d1c3a48"}]},
+                      {diameter_tcp_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c1b03a96691e03eb93144bc50022a007"}]},
+                      {diameter_traffic,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6d351fdbef0536bba235fe102fe8e697"}]},
+                      {diameter_transport,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"386e129e240e91794ff79e1da6c6966a"}]},
+                      {diameter_transport_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c9f8da23c3c870b8a6ed8648d7aac2d5"}]},
+                      {diameter_types,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d2ecf24e368d30dbef34527e2971caf8"}]},
+                      {diameter_watchdog,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a0ab7bd910bc959c0d1b64f0a2ae4bda"}]},
+                      {diameter_watchdog_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e4b16aeb2713fd42bf5e9da7cbe43bcf"}]}]}]}},
+                 {application,
+                  {dialyzer,
+                   [{description,
+                     "DIscrepancy AnaLYZer of ERlang programs, version 2.6.1"},
+                    {vsn,"2.6.1"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/dialyzer-2.6.1/ebin"},
+                    {modules,
+                     [{dialyzer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"929cdc37a18725b9710b9c4345c3aca0"}]},
+                      {dialyzer_analysis_callgraph,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b679e22bb1edb9f0225b79d995342dc5"}]},
+                      {dialyzer_behaviours,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5fb71e7e5129b4c2f74cb529d8a745c4"}]},
+                      {dialyzer_callgraph,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5b03b559fdab4c77a8c955cdfe7a2036"}]},
+                      {dialyzer_cl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"79a2208b0cc03af530473d2d2f49587f"}]},
+                      {dialyzer_cl_parse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b4fcced00882cfef0262398a14319c2a"}]},
+                      {dialyzer_codeserver,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f5c8a1600210988f627559bc16a49a65"}]},
+                      {dialyzer_contracts,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c002e8bcddf711ae9feef14b88f28873"}]},
+                      {dialyzer_coordinator,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"51efdc15e07eaa495060e420585bb74f"}]},
+                      {dialyzer_dataflow,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ddb43241a51460b67c67780ca6174bef"}]},
+                      {dialyzer_dep,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ffffdcfd7edb9901be2e92b6d3a5f082"}]},
+                      {dialyzer_explanation,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"79c9bc71edcc115a03c1bb00a4133627"}]},
+                      {dialyzer_gui,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec41553832cb5f49cce3b123ec763448"}]},
+                      {dialyzer_gui_wx,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"00f5ef9bd8202d5bc303fca27c740b00"}]},
+                      {dialyzer_options,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"713bf0249b3bb22c7461498b908db812"}]},
+                      {dialyzer_plt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e5b1ecae532cb2887c942c6bda2c7dc7"}]},
+                      {dialyzer_races,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec1b2f026e1dfd438fbb48dcf16a19de"}]},
+                      {dialyzer_succ_typings,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"12a59523b727169f2f415b6e57768910"}]},
+                      {dialyzer_timing,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b170424f433845fb9aab3e554ea61044"}]},
+                      {dialyzer_typesig,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b6670ae353fa06c5c8a5f301a7079ca6"}]},
+                      {dialyzer_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cac59b9f59802633948d271fcf8ff92d"}]},
+                      {dialyzer_worker,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1e9ff1cc342b308c73bab8c607a8437e"}]}]}]}},
+                 {application,
+                  {debugger,
+                   [{description,"Debugger"},
+                    {vsn,"3.2.11"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/debugger-3.2.11/ebin"},
+                    {modules,
+                     [{dbg_debugged,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"78bf1d9b43c718da5e198af36cabb1ce"}]},
+                      {dbg_icmd,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"615470a6677e03a603c24cf821ba3471"}]},
+                      {dbg_idb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0e78e73c63bfe9149a11122857355f29"}]},
+                      {dbg_ieval,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0e49ed51a1a1e7581334308cd3c9195e"}]},
+                      {dbg_iload,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f249c44fee09e35262d2cafbfa22ce49"}]},
+                      {dbg_iserver,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6a2911ffbd531888ac6e1b96a5475436"}]},
+                      {dbg_istk,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ae44e86b7893633859292861275bdb7f"}]},
+                      {dbg_ui_break,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e5397708044bd37bac2a6f4e24edbd30"}]},
+                      {dbg_ui_break_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c974a8a9b180cfd4ccbcfd31a7bb88e5"}]},
+                      {dbg_ui_edit,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7faadd987bb74826e5f5865d725ca177"}]},
+                      {dbg_ui_edit_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0e912e444704ad322b3e25fc6393c068"}]},
+                      {dbg_ui_filedialog_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"06a6b13cd9bcfe7d7d203a981352cfaa"}]},
+                      {dbg_ui_interpret,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dcf7a340530f4807d774d4c719a1dbbf"}]},
+                      {dbg_ui_mon,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5c79f2debfab06b86990ef7e390a61b7"}]},
+                      {dbg_ui_mon_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8c43cdde20d4e66b6f51ef903af75250"}]},
+                      {dbg_ui_settings,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8deedced7307e14f36cca3d9fe7e367f"}]},
+                      {dbg_ui_trace,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c817c2cc2f62354d4f59be8b6e6fac96"}]},
+                      {dbg_ui_trace_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"db1abdd3b7a7b45d3c74dbd9c48f07e8"}]},
+                      {dbg_ui_view,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b10a46e072053a225a894ed76dceebca"}]},
+                      {dbg_ui_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e51ec8a33c335245583f7a9ba8728f66"}]},
+                      {dbg_ui_winman,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2056472842990c08dfdb81e56df2caa8"}]},
+                      {dbg_wx_break,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"55c7dc041c4cd1b1da98d49def9c2b15"}]},
+                      {dbg_wx_break_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ad9cde7d28f7de18dda8da80d97a8f00"}]},
+                      {dbg_wx_code,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"27abac65970e6f7c6bbaca07e9ead6a4"}]},
+                      {dbg_wx_filedialog_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"da924842b25d80b7b258100a4e597810"}]},
+                      {dbg_wx_interpret,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8549ef4a5bad09472dccd1cb3ab2c764"}]},
+                      {dbg_wx_mon,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"09140d34a402d7183cf9dfecb0b2b6e8"}]},
+                      {dbg_wx_mon_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1fefe3be53da62cf504daf354579d910"}]},
+                      {dbg_wx_settings,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"350aed0cb189f0b91979fc38752fd4c4"}]},
+                      {dbg_wx_src_view,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"644bfb2c2d8fc6e9296722fef5f05b57"}]},
+                      {dbg_wx_trace,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"024358a893f9b37296fc0c416074a4b1"}]},
+                      {dbg_wx_trace_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b2348218e83d1704bcf894e71c2f3e82"}]},
+                      {dbg_wx_view,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d37489d27927cff9f19f76bc0c816c9"}]},
+                      {dbg_wx_win,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d94add4e9adade091198438a278501a8"}]},
+                      {dbg_wx_winman,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"caa1febd36494a9088fddbd5557c503f"}]},
+                      {debugger,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2e242b76bc941785f65d1cf819fd98a5"}]},
+                      {i,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2bebfb4e91c343a1ad89f1124b06e190"}]},
+                      {int,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e1d4c0b2e30129359db05d3bc4df646c"}]}]}]}},
+                 {application,
+                  {crypto,
+                   [{description,"CRYPTO version 2"},
+                    {vsn,"3.0"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/crypto-3.0/ebin"},
+                    {modules,
+                     [{crypto,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"858d0e1779f13a6bfde511898916ae94"}]},
+                      {crypto_app,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6d2de1cd4927d57e8eaa4467404c8c02"}]},
+                      {crypto_server,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"17e05e4b0d772036706b76ba8f68de2e"}]},
+                      {crypto_sup,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1342a18fe8d994974e41aa3e351d8500"}]}]}]}},
+                 {application,
+                  {cosTransactions,
+                   [{description,"The Erlang CosTransactions application"},
+                    {vsn,"1.2.13"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosTransactions-1.2.13/ebin"},
+                    {modules,
+                     [{'CosTransactions_Control',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9ee94b22194357e2374fe2c026d2a9fb"}]},
+                      {'CosTransactions_Coordinator',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bca2be777e58bf130a3bf48252c0c0cb"}]},
+                      {'CosTransactions_HeuristicCommit',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d12c1a0988d03c64a606ba471794e3cc"}]},
+                      {'CosTransactions_HeuristicHazard',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"79d0dc47e6759987e5b45281bc4c39f2"}]},
+                      {'CosTransactions_HeuristicMixed',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a77cb11ccf269fa85f2194ab16ec5ebb"}]},
+                      {'CosTransactions_HeuristicRollback',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"67a56bf7b8084c29dd10db9daa8e08f7"}]},
+                      {'CosTransactions_Inactive',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8f94debdaa1912d18bbea77492e6fc88"}]},
+                      {'CosTransactions_InvalidControl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b14b9b82b831e56235c1bca1f6e02e16"}]},
+                      {'CosTransactions_NoTransaction',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"24252bfbc89f79dac5c90b35e35a66ad"}]},
+                      {'CosTransactions_NotPrepared',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ddbcd30a479a50fa2fed4b0cb019c0bd"}]},
+                      {'CosTransactions_NotSubtransaction',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3904cf57a879720704d8b725802cc530"}]},
+                      {'CosTransactions_PropagationContext',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4d0dd57873deb42ef62f2e9e8620e111"}]},
+                      {'CosTransactions_RecoveryCoordinator',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2a670d242e21803d3a559b812b3f3bfd"}]},
+                      {'CosTransactions_Resource',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"78bdc7f9989a5277bde7e066804fa1c0"}]},
+                      {'CosTransactions_SubtransactionAwareResource',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e1194d19b4db72b1c571aec1847fa65f"}]},
+                      {'CosTransactions_SubtransactionsUnavailable',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d6ffc90a293248735f58984f7a9f4fa9"}]},
+                      {'CosTransactions_SynchronizationUnavailable',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9858316a8256791e5fe66729fcd364ef"}]},
+                      {'CosTransactions_Terminator',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dbbba1c622d817538fba982cbefd4a15"}]},
+                      {'CosTransactions_Terminator_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2db2696226a90215edb559cdae7ad928"}]},
+                      {'CosTransactions_TransIdentity',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d38592cd26cbbbe3a963ca77b5264ea8"}]},
+                      {'CosTransactions_TransactionFactory',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"04db55c2ba8df7975e98e1c7b7582bb6"}]},
+                      {'CosTransactions_TransactionFactory_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1d8ff8a2434c10c4716b1b59aebbcb9e"}]},
+                      {'CosTransactions_Unavailable',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a77c05d98c0c72e2f1d52a1f781a1b98"}]},
+                      {'CosTransactions_WrongTransaction',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c836d95954f2374d89bfc9ff2bd86793"}]},
+                      {'CosTransactions_otid_t',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1e903c81e783cb34153bbca99e047870"}]},
+                      {'ETraP_Common',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ea5d3e59af9cadcb5587cc42fc750470"}]},
+                      {'ETraP_Server',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8592fd689bdae07056a29bd258293371"}]},
+                      {'ETraP_Server_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7f192b40f501fd2f5fb3f92b21c5e9d3"}]},
+                      {cosTransactions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6d83a1fd7da7dc0b87658efe3039f484"}]},
+                      {etrap_logmgr,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91577f644192b682cb8739b9ce7ac7ad"}]},
+                      {oe_CosTransactions,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6f6c79ffe50eac0c3ced0fba1a8c08a0"}]}]}]}},
+                 {application,
+                  {cosTime,
+                   [{description,"The Erlang CosTime application"},
+                    {vsn,"1.1.13"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosTime-1.1.13/ebin"},
+                    {modules,
+                     [{'CosTime_TIO',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"77717ab85418c3c1599b3238c879b770"}]},
+                      {'CosTime_TIO_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3ce85958b051f2f97925e980f56115e2"}]},
+                      {'CosTime_TimeService',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a92a3fc07bfeeae58a57075ecddb5ac6"}]},
+                      {'CosTime_TimeService_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0885fbeef5bd4f72920ae716f0c73d54"}]},
+                      {'CosTime_TimeUnavailable',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9ee0570f9b91eece7560cc1b6146f784"}]},
+                      {'CosTime_UTO',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"799ddc99175222b61965c6c8e66e5cb3"}]},
+                      {'CosTime_UTO_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"552c29f5ece131368c121b5a14c3ae06"}]},
+                      {'CosTimerEvent_TimerEventHandler',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"76961fc9eaae9e46950b5eb52fe62ae3"}]},
+                      {'CosTimerEvent_TimerEventHandler_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a69e243a494b80eb34b37456f2b1f855"}]},
+                      {'CosTimerEvent_TimerEventService',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"62c54aabe64cb28b1245eb80f6b9190d"}]},
+                      {'CosTimerEvent_TimerEventService_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c6926dd7faed0366772908c8593691e"}]},
+                      {'CosTimerEvent_TimerEventT',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"74b7db88a5dd4f17c263683a80bcfe3b"}]},
+                      {'TimeBase_IntervalT',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5c8f966d02c9520f2d3a4f024892ded3"}]},
+                      {'TimeBase_UtcT',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"15f72a9538e725e68e375f3d638c1b6d"}]},
+                      {cosTime,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8c96cfbcafba8c9df1a9b57b7e09c4d8"}]},
+                      {oe_CosTime,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e607ddba4a35690c39bfcbb1fa3e044e"}]},
+                      {oe_CosTimerEvent,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"39f960f5b9c079eaecb87e75d9f90f2b"}]},
+                      {oe_TimeBase,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"764d088e21dd985285d4ccfd723959fe"}]}]}]}},
+                 {application,
+                  {cosProperty,
+                   [{description,"The Erlang CosProperty application"},
+                    {vsn,"1.1.16"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosProperty-1.1.16/ebin"},
+                    {modules,
+                     [{'CosPropertyService_ConflictingProperty',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"67353514e217df9f5a5c5e0d3e97d9bd"}]},
+                      {'CosPropertyService_ConstraintNotSupported',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ce577ca5520194130903c063d8f2211a"}]},
+                      {'CosPropertyService_FixedProperty',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0ef0b79fd5dbcb18f7b9c94f941678e2"}]},
+                      {'CosPropertyService_InvalidPropertyName',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bd173257499295fbdc728d60fd14af92"}]},
+                      {'CosPropertyService_MultipleExceptions',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a3004385ac63dc6aa52bcb2aa46818f0"}]},
+                      {'CosPropertyService_Properties',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"172b757c8a881b79146f50d9f3da1ea9"}]},
+                      {'CosPropertyService_PropertiesIterator',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"37fa8c7f1e5ab4798845a1b101835900"}]},
+                      {'CosPropertyService_PropertiesIterator_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"728fabf6239161186aa9f574ad27fbd6"}]},
+                      {'CosPropertyService_Property',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a912eb5a31517a6f94ee3f8e3b898ece"}]},
+                      {'CosPropertyService_PropertyDef',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d8ea474f53418bda870c1f98c522d15b"}]},
+                      {'CosPropertyService_PropertyDefs',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3c997a6a4db17765d72f52953679fc7d"}]},
+                      {'CosPropertyService_PropertyException',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3600a7d77fe924d3883a003b68ab8902"}]},
+                      {'CosPropertyService_PropertyExceptions',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a516b05a720966d4a3568f7f087f22cf"}]},
+                      {'CosPropertyService_PropertyMode',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b1e1e285b3a2b01a12e328ed94a65225"}]},
+                      {'CosPropertyService_PropertyModes',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ed697876aa56c111eee5733379303ef3"}]},
+                      {'CosPropertyService_PropertyNames',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"39684cd186c7d8da459f9d17637606a2"}]},
+                      {'CosPropertyService_PropertyNamesIterator',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"97b170d84779dcb7b98460588de428e3"}]},
+                      {'CosPropertyService_PropertyNamesIterator_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e06e012106df3651db1e9d52472bebd3"}]},
+                      {'CosPropertyService_PropertyNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"86c83ceacb0b80d4ffa6042cfaec025f"}]},
+                      {'CosPropertyService_PropertySet',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ffbb0b6b88d4a35cd836322dcc2b4603"}]},
+                      {'CosPropertyService_PropertySetDef',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"429c3ed48018cc6eef3d28c2407fa42e"}]},
+                      {'CosPropertyService_PropertySetDefFactory',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"86da518b687db630cd85921ebe96d07a"}]},
+                      {'CosPropertyService_PropertySetDefFactory_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2f52585d44dd9d6863bd2b0e0359a24e"}]},
+                      {'CosPropertyService_PropertySetDef_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a02a747cf3856996416253a5cbccfbd7"}]},
+                      {'CosPropertyService_PropertySetFactory',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"faef66b15f43dc81cbf7dd9bde81c8a2"}]},
+                      {'CosPropertyService_PropertySetFactory_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b538bc6740ae2b6934e08d831d5b0960"}]},
+                      {'CosPropertyService_PropertyTypes',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec088d6b4028f6a9dc2917e6722f1c32"}]},
+                      {'CosPropertyService_ReadOnlyProperty',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3f4d338a44a7ab32daf202f4d2aa7cbb"}]},
+                      {'CosPropertyService_UnsupportedMode',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"203ca7e42a209758ceea013cbff109bd"}]},
+                      {'CosPropertyService_UnsupportedProperty',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"28e9e73be7eb82646e3713135d695a6d"}]},
+                      {'CosPropertyService_UnsupportedTypeCode',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"da862aea1e36f6fb797bee192a2f3e08"}]},
+                      {cosProperty,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e5c17adcc4dc9f93a8cf92c91a12c81e"}]},
+                      {oe_CosProperty,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4c9d35f1b883b805a44e9864136958b1"}]}]}]}},
+                 {application,
+                  {cosNotification,
+                   [{description,"The Erlang CosNotification application"},
+                    {vsn,"1.1.20"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosNotification-1.1.20/ebin"},
+                    {modules,
+                     [{'CosNotification',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5a52684ebceaceebe3d7c971fd5e45e6"}]},
+                      {'CosNotification_AdminPropertiesAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aa2af8e932319a2ab715d799c31678b0"}]},
+                      {'CosNotification_Common',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e908fdcf47fa3d9d234d4061db9760ab"}]},
+                      {'CosNotification_EventBatch',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8c79e194e19df338bec34cee83d5c999"}]},
+                      {'CosNotification_EventHeader',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9e08e276e855cfa3dd60bdc9b563b8e9"}]},
+                      {'CosNotification_EventType',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"be0b154ef34f6279604f04d0be386d64"}]},
+                      {'CosNotification_EventTypeSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3719ad475d47fd73c1a70891586f0b17"}]},
+                      {'CosNotification_FixedEventHeader',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e512d2bce68fcb3de1336060be225cad"}]},
+                      {'CosNotification_NamedPropertyRange',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e42690af83d192433daaadb6cbfc7e02"}]},
+                      {'CosNotification_NamedPropertyRangeSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5eac2fb6027077046d918d30b36fb45a"}]},
+                      {'CosNotification_Property',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d89e479fd34c1e6c46447dcb4aaa44e0"}]},
+                      {'CosNotification_PropertyError',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c2b5a17b0ff2dd997013daf5a4d73a83"}]},
+                      {'CosNotification_PropertyErrorSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2437aa1bdbeeb5f45213bc7e7922351a"}]},
+                      {'CosNotification_PropertyRange',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b2392c8040a976dc8db3ba147f7911f2"}]},
+                      {'CosNotification_PropertySeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6950965079eb678d5b2e010c8266cf13"}]},
+                      {'CosNotification_QoSAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fafc8842d8f8e11febab4d341a2ce879"}]},
+                      {'CosNotification_StructuredEvent',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"22a1eae09f5d8cf0d223d06cebf9d85b"}]},
+                      {'CosNotification_UnsupportedAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0b1d7ff2796dd090e244cecdbfa4d2ce"}]},
+                      {'CosNotification_UnsupportedQoS',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d0968f6f188653b1e292c34f3b18c51a"}]},
+                      {'CosNotifyChannelAdmin_AdminIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"42791a7a0d5ca5fef186c441a81cf50b"}]},
+                      {'CosNotifyChannelAdmin_AdminLimit',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5355d6a703102439e59b070eb6e61b45"}]},
+                      {'CosNotifyChannelAdmin_AdminLimitExceeded',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"18b11c68d839f9aa90bfe6da07b15cd8"}]},
+                      {'CosNotifyChannelAdmin_AdminNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c853cd178ef80d6a46a334d3cb5371d4"}]},
+                      {'CosNotifyChannelAdmin_ChannelIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"992ab8f1ac2f4cc15edd6068c8dc1948"}]},
+                      {'CosNotifyChannelAdmin_ChannelNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"475e742fdf1dd2ec932704ccb941f3c1"}]},
+                      {'CosNotifyChannelAdmin_ConnectionAlreadyActive',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d8b95c202b2ebc28a7208928563b5382"}]},
+                      {'CosNotifyChannelAdmin_ConnectionAlreadyInactive',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8b106140de30c6cd638b328efe453cb3"}]},
+                      {'CosNotifyChannelAdmin_ConsumerAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4c8c31c812099afa148ed0662dc67ea0"}]},
+                      {'CosNotifyChannelAdmin_ConsumerAdmin_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"172767d1c29ca64e810d8853c61a01e9"}]},
+                      {'CosNotifyChannelAdmin_EventChannel',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e362f0dc4dc40c98e66b91632554ddb7"}]},
+                      {'CosNotifyChannelAdmin_EventChannelFactory',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4798a326d18d53e9a7870454fb33ef4c"}]},
+                      {'CosNotifyChannelAdmin_EventChannelFactory_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4bc146f5b9cc168505d2249e7f04a618"}]},
+                      {'CosNotifyChannelAdmin_EventChannel_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"db6e5631fc1e5ff158dfc77123c7e752"}]},
+                      {'CosNotifyChannelAdmin_NotConnected',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b7f5e3229c7849f94b0744a78e38012c"}]},
+                      {'CosNotifyChannelAdmin_ProxyConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b1aa19779800f6e97852f5a2e8042641"}]},
+                      {'CosNotifyChannelAdmin_ProxyIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bf0a62dd47773a5a4df90f70644c4e24"}]},
+                      {'CosNotifyChannelAdmin_ProxyNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"735c610478319545c1a68c1c8b75609d"}]},
+                      {'CosNotifyChannelAdmin_ProxyPullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6cc803a524bd58d1c33bee3fb8f92ac7"}]},
+                      {'CosNotifyChannelAdmin_ProxyPullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1683d6e08309fb3fc51d127c407348a"}]},
+                      {'CosNotifyChannelAdmin_ProxyPushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"94416e046b1c566bfa8df9bc1884bea5"}]},
+                      {'CosNotifyChannelAdmin_ProxyPushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"61c57643509be14cbb5e82090fb5bf6d"}]},
+                      {'CosNotifyChannelAdmin_ProxySupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4c1c83635cd4d1e4a50577e68f084a39"}]},
+                      {'CosNotifyChannelAdmin_SequenceProxyPullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"af562a179799a5ae781278e980912710"}]},
+                      {'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"da43e615a23f2485758bec039617792c"}]},
+                      {'CosNotifyChannelAdmin_SequenceProxyPushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6a876b3b2c655fa98e23510ca72be236"}]},
+                      {'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"55954cf819fb29c74e8c7fa7dcb17eb8"}]},
+                      {'CosNotifyChannelAdmin_StructuredProxyPullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"aeb95ea3a9deb7c129dccfd77df7976c"}]},
+                      {'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e72e1de7fb0ea440aae9ca791fbdd403"}]},
+                      {'CosNotifyChannelAdmin_StructuredProxyPushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d277b85ea15126c7645eccc585325ee2"}]},
+                      {'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7339f8c2876066369e6afa27267bfd81"}]},
+                      {'CosNotifyChannelAdmin_SupplierAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"043d43346f3ff5c2775bf7030a13e1d9"}]},
+                      {'CosNotifyChannelAdmin_SupplierAdmin_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"efe73dc58fd1b27c2adc184018e4091a"}]},
+                      {'CosNotifyComm_InvalidEventType',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"516a9a10d779d7b47a5752d0b4278017"}]},
+                      {'CosNotifyComm_NotifyPublish',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c50da2c5c4d79c4cd3974c37b6165fbd"}]},
+                      {'CosNotifyComm_NotifySubscribe',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"180ce40d1660bec349bb7ddf1275c985"}]},
+                      {'CosNotifyComm_PullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dd7be30cd0685dbb3e0f22b4de8ffb91"}]},
+                      {'CosNotifyComm_PullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e76b3f6be347a5d08350ae25cddc77c1"}]},
+                      {'CosNotifyComm_PushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c2c972f2affe7f936ec38997084045b1"}]},
+                      {'CosNotifyComm_PushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"416e6887077de70bf3aa7cf6c6b35a9c"}]},
+                      {'CosNotifyComm_SequencePullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1322fb2dadb5669a36391f12455c6969"}]},
+                      {'CosNotifyComm_SequencePullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"281779a70fdae7a1de3e569ae707d21a"}]},
+                      {'CosNotifyComm_SequencePushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"701eb7ecaef2fb7f13b5adf2ff8a97aa"}]},
+                      {'CosNotifyComm_SequencePushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ceb164baf53b3df5f90fdbef4c800d8d"}]},
+                      {'CosNotifyComm_StructuredPullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"70d2e255c8613a9d58a4f1f69b1adf51"}]},
+                      {'CosNotifyComm_StructuredPullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fa8164033103e1c40f7721471fa6b8fd"}]},
+                      {'CosNotifyComm_StructuredPushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"684f225a8d760e970a4380c303f82662"}]},
+                      {'CosNotifyComm_StructuredPushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"de1b05e00095ac428839c165db9f92fc"}]},
+                      {'CosNotifyFilter_CallbackIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ab4cfad0073e21b629ebd16f8973912"}]},
+                      {'CosNotifyFilter_CallbackNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5ae7cd265c665a4cd4a969c75388b1fc"}]},
+                      {'CosNotifyFilter_ConstraintExp',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"421355667259ba4906ed0b0ba89ae1ba"}]},
+                      {'CosNotifyFilter_ConstraintExpSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ef901d08223839966e5d67b55731e63"}]},
+                      {'CosNotifyFilter_ConstraintIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"50d0d1e84309217b5a2864eb2df3653b"}]},
+                      {'CosNotifyFilter_ConstraintInfo',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e988281d1a6d6d2ba412a86cb1b89e0b"}]},
+                      {'CosNotifyFilter_ConstraintInfoSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ff21820130cfa051a6781e79f53171af"}]},
+                      {'CosNotifyFilter_ConstraintNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1611f041bd2826435c850dc36b2a6953"}]},
+                      {'CosNotifyFilter_DuplicateConstraintID',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"40c6d62f59e44a14649e3de2e78deafd"}]},
+                      {'CosNotifyFilter_Filter',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"864d9d277d782fca9a15809c5c195c1c"}]},
+                      {'CosNotifyFilter_FilterAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ee1e90ea0fbde4a0c53036e0efa4b89a"}]},
+                      {'CosNotifyFilter_FilterFactory',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b59a3c5c5e24a9a389792ea9ff254312"}]},
+                      {'CosNotifyFilter_FilterFactory_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"40bc158ddcbb31abff87fe4da270b55a"}]},
+                      {'CosNotifyFilter_FilterIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3dd80855340f372c0682a53a6d3bc216"}]},
+                      {'CosNotifyFilter_FilterNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fbdd34c6e28fb4c907410c2f7bc82f92"}]},
+                      {'CosNotifyFilter_Filter_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a6911bf97e4ebe2333e7e19914d821ea"}]},
+                      {'CosNotifyFilter_InvalidConstraint',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"beaedbe7bcec40b0d90a0404dde063a9"}]},
+                      {'CosNotifyFilter_InvalidGrammar',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0055f6477430cf9c38cce84d93393a12"}]},
+                      {'CosNotifyFilter_InvalidValue',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"041b66a4b7933005a983848254dec48c"}]},
+                      {'CosNotifyFilter_MappingConstraintInfo',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ab3093c4688953509866f4128d0747d2"}]},
+                      {'CosNotifyFilter_MappingConstraintInfoSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9f81b4c571998ef9f1cefa77c45be6e5"}]},
+                      {'CosNotifyFilter_MappingConstraintPair',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"305991c110aca04df1398bd3b640e284"}]},
+                      {'CosNotifyFilter_MappingConstraintPairSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7bd7692f2d9ad411d3d4323ff4ef9a2d"}]},
+                      {'CosNotifyFilter_MappingFilter',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fbd3cd1cce0f195048025a19666e4bb8"}]},
+                      {'CosNotifyFilter_MappingFilter_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5c337925555dac8714bcde4ff0ac3682"}]},
+                      {'CosNotifyFilter_UnsupportedFilterableData',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"64044f951a82b03309ab90082ed6d354"}]},
+                      {'PullerConsumer_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a96588beb8db62195c499ba6a61cc53f"}]},
+                      {'PullerSupplier_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"90058bd6464dc08f79814185696ce1fb"}]},
+                      {'PusherConsumer_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"72a8f62fb563174cf54b97aa1206b293"}]},
+                      {'PusherSupplier_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1d03a842669765bf9907b644957fa7cb"}]},
+                      {cosNotificationApp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0a6dabb21a8926c7f733904336b3375b"}]},
+                      {cosNotification_Filter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"63cb134b80f03d8399abe10908055e40"}]},
+                      {cosNotification_Grammar,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c5636b97c6e449aeafada1b5df5b6e91"}]},
+                      {cosNotification_Scanner,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9c6334416492eb7be457c13d39b92222"}]},
+                      {cosNotification_eventDB,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d52b15cf6eaba713bb979684b54fb8df"}]},
+                      {oe_CosNotification,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"961cde96216694db976f1f714b0f4d6c"}]},
+                      {oe_CosNotificationComm_Event,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"affa53e3f3dfcb411ff317d98a5ce64a"}]},
+                      {oe_CosNotifyChannelAdmin,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4ed58499950adf48241f1701c2116857"}]},
+                      {oe_CosNotifyComm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a944c5aa4379e8f3b07acc9c5fd56f9a"}]},
+                      {oe_CosNotifyFilter,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c51f3aaa451621c060bdb0d707324fbd"}]},
+                      {oe_cosNotificationAppComm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ed879b4fb4e5e3438e523069a29ce1aa"}]}]}]}},
+                 {application,
+                  {cosFileTransfer,
+                   [{description,"The Erlang CosFileTransfer application"},
+                    {vsn,"1.1.15"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosFileTransfer-1.1.15/ebin"},
+                    {modules,
+                     [{'CosFileTransfer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"537730bb6ac118a9f672ea5c5616502c"}]},
+                      {'CosFileTransfer_AccessLevel',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"538517d444956f350c54176200fa9c2d"}]},
+                      {'CosFileTransfer_CommandNotImplementedException',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"06bb7e58f28ad101e4cb2cd2336d3698"}]},
+                      {'CosFileTransfer_Directory',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a3504d2207476a6439367e5e20b442bc"}]},
+                      {'CosFileTransfer_Directory_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ca00e96f4f13619cbcaf663edf819405"}]},
+                      {'CosFileTransfer_File',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"082fb7de49fb7a94ad34873e876fbdd8"}]},
+                      {'CosFileTransfer_FileIterator',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d7fce306a50dbb7edaea5f9eeec1d5ce"}]},
+                      {'CosFileTransfer_FileIterator_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bb5946f486a03df082e02ec55308e270"}]},
+                      {'CosFileTransfer_FileList',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5f508ab863f8cf90e46fda1e2bc6a01b"}]},
+                      {'CosFileTransfer_FileNameList',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2044a2695019499e1294315eea9f3092"}]},
+                      {'CosFileTransfer_FileNotFoundException',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b00961e88651b5ab62c9d20b2d60c6e0"}]},
+                      {'CosFileTransfer_FileTransferSession',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"102d05bd8c1fda9dfa1ba3769ef283fd"}]},
+                      {'CosFileTransfer_FileTransferSession_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a6774a931a16efaa7bcbf342ef660b49"}]},
+                      {'CosFileTransfer_FileWrapper',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4d19e7d1eeb8b381847003f8837be28d"}]},
+                      {'CosFileTransfer_File_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"64eda7b0b054da3e646bba7fbe6be70d"}]},
+                      {'CosFileTransfer_IllegalOperationException',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"25a05f47c3c2fc5d14d135acb6d72a5f"}]},
+                      {'CosFileTransfer_ProtocolAddressList',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4587002261d4308181fc93122a15cea9"}]},
+                      {'CosFileTransfer_ProtocolSupport',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c7937786969ccbba0967581d3c25ad54"}]},
+                      {'CosFileTransfer_RequestFailureException',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"384095c7be94a7544378f029e966cf2e"}]},
+                      {'CosFileTransfer_SessionException',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7ef101cef5808b9d7c08037e15ee66fa"}]},
+                      {'CosFileTransfer_SupportedProtocolAddresses',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d145c64e85be77403b797ad505564018"}]},
+                      {'CosFileTransfer_TransferException',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a4b8f0ca1710b11ed6d723ee1692c46c"}]},
+                      {'CosFileTransfer_VirtualFileSystem',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"37e0d0057b23e3e1563b19539bc0a76d"}]},
+                      {'CosFileTransfer_VirtualFileSystem_ContentList',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"165e5f4d21952fc5eb1f0a289c571fbc"}]},
+                      {'CosFileTransfer_VirtualFileSystem_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"81b6bf0f44b0eab55cebc3d408671e0a"}]},
+                      {cosFileTransferApp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ed8d595027fd9c5f7dd1e9398a4351bf"}]},
+                      {cosFileTransferNATIVE_file,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"91cd6a5ac4ba42b3d2ef0c0cf4c48270"}]},
+                      {oe_CosFileTransfer,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"683aa469ec95c19f32d0f62f5f7ef6e7"}]}]}]}},
+                 {application,
+                  {cosEventDomain,
+                   [{description,"The Erlang CosEventDomain application"},
+                    {vsn,"1.1.13"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosEventDomain-1.1.13/ebin"},
+                    {modules,
+                     [{'CosEventDomainAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2e2d9e538ddd0f2a2fa74f499e042db1"}]},
+                      {'CosEventDomainAdmin_AlreadyExists',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a1ce2f0d94e633823bedf296aa1527e5"}]},
+                      {'CosEventDomainAdmin_Connection',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a3d8e1bead63a2d7644f36edd4a66772"}]},
+                      {'CosEventDomainAdmin_ConnectionIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"56929f00f5dcec6d75408d85921c693f"}]},
+                      {'CosEventDomainAdmin_ConnectionNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4de106e024e8f9f45783dd7b45af2cc1"}]},
+                      {'CosEventDomainAdmin_CycleCreationForbidden',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6a28090bafe2078be88ee5cb996f9d23"}]},
+                      {'CosEventDomainAdmin_CycleSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3232a8bb21e31c81f7791fdf0359d945"}]},
+                      {'CosEventDomainAdmin_DiamondCreationForbidden',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8b9e307237ee3408e348d4593c0de997"}]},
+                      {'CosEventDomainAdmin_DiamondSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"65478f4d3f155d7547b52ea7d04f6628"}]},
+                      {'CosEventDomainAdmin_DomainIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4f44a097ccf00511ed397775b33991a8"}]},
+                      {'CosEventDomainAdmin_DomainNotFound',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e17639bb3b5f18e80cd8f505191dbc7c"}]},
+                      {'CosEventDomainAdmin_EventDomain',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b21b34fcceae9698702dadc469ef2cd1"}]},
+                      {'CosEventDomainAdmin_EventDomainFactory',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bcf4395bcda2d977235b24ec4416ddec"}]},
+                      {'CosEventDomainAdmin_EventDomainFactory_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a7d21747fe63505e98037202798cca90"}]},
+                      {'CosEventDomainAdmin_EventDomain_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2801240b7c96984648d565b9b210b8fb"}]},
+                      {'CosEventDomainAdmin_MemberIDSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"889c0e92b864877d5c2bbbd2ed185575"}]},
+                      {'CosEventDomainAdmin_RouteSeq',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f77038e040e610031d35f876dfa2925e"}]},
+                      {cosEventDomainApp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ea692728e2b3d71f1f486a7aece4df48"}]},
+                      {oe_CosEventDomainAdmin,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"939160a9e6adced7edf36e0a18927785"}]}]}]}},
+                 {application,
+                  {cosEvent,
+                   [{description,"The Erlang CosEvent application"},
+                    {vsn,"2.1.14"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/cosEvent-2.1.14/ebin"},
+                    {modules,
+                     [{'CosEventChannelAdmin_AlreadyConnected',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"64cb912070ade0d3254585904ba4c509"}]},
+                      {'CosEventChannelAdmin_ConsumerAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e027fd366965c17a0b51c3cfd80dcd4f"}]},
+                      {'CosEventChannelAdmin_EventChannel',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f8d2e64b53114282c8c353dd5110ea9e"}]},
+                      {'CosEventChannelAdmin_ProxyPullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9aef474c8cb0c5e9e2cb5d4cc43fe52d"}]},
+                      {'CosEventChannelAdmin_ProxyPullConsumer_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9057fc161db130ea1ee3bd656b083ad0"}]},
+                      {'CosEventChannelAdmin_ProxyPullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"11cc90a016f1b493838f6f79caa959fa"}]},
+                      {'CosEventChannelAdmin_ProxyPushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"21b14ec7e74c8632349f31cb70324ca6"}]},
+                      {'CosEventChannelAdmin_ProxyPushConsumer_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dabc851d850f372affa761150136640d"}]},
+                      {'CosEventChannelAdmin_ProxyPushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d32c6d87385b474519aa936d9bd79256"}]},
+                      {'CosEventChannelAdmin_SupplierAdmin',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b26b61665649ea2af6fc2b7174d7c4f7"}]},
+                      {'CosEventChannelAdmin_SupplierAdmin_impl',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8606a32b7269881c1f455edce89344db"}]},
+                      {'CosEventChannelAdmin_TypeError',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"20bb7e990eb8d6b0e854919c0dff94cc"}]},
+                      {'CosEventComm_Disconnected',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"c2ec0e6b1fa849a2ab22fdd1ce14ecb7"}]},
+                      {'CosEventComm_PullConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"43972738bc29806b38419aaf76d8c393"}]},
+                      {'CosEventComm_PullSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5206247fdf5b00621d3732805fe1854a"}]},
+                      {'CosEventComm_PushConsumer',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"72937626c2c3f3689fb6dafed66bad17"}]},
+                      {'CosEventComm_PushSupplier',
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"54875107d8748bac2b96a3037669a477"}]},
+                      {cosEventApp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dab9a7b6c3106899fe7d2c9e74fcb021"}]},
+                      {oe_CosEventChannelAdmin,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b192666923744044b3a0e652ec9e9948"}]},
+                      {oe_CosEventComm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"884bef0af9742bfe5f3f7e345d24cd18"}]},
+                      {oe_CosEventComm_CAdmin,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f344012f72ef7bfbdef3d29d525e2896"}]},
+                      {oe_CosEventComm_CAdmin_impl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"935565447529d9e97da7b98c3631cc92"}]},
+                      {oe_CosEventComm_Channel,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fe816f373688feb5c63c10543eedd3c2"}]},
+                      {oe_CosEventComm_Channel_impl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5c3c48bf48ac0b63f62d82064f9ce32f"}]},
+                      {oe_CosEventComm_Event,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7f5146f9630ff6e60665cf32fc7e6641"}]},
+                      {oe_CosEventComm_PullerS,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dbd58f368f06b16fa0a7628594f84c44"}]},
+                      {oe_CosEventComm_PullerS_impl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2bd0c1df9074f1a792985b4ff1b0ec98"}]},
+                      {oe_CosEventComm_PusherS,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"36dc7eaaa1b298b7875dd41b3e6b5b85"}]},
+                      {oe_CosEventComm_PusherS_impl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"63c64664227a2772b5ad3d0c6519f8c4"}]},
+                      {oe_cosEventApp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cc2ca7e6febb762f39f337c5303390e6"}]}]}]}},
+                 {application,
+                  {compiler,
+                   [{description,"ERTS  CXC 138 10"},
+                    {vsn,"4.9.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/compiler-4.9.2/ebin"},
+                    {modules,
+                     [{beam_a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a338f3a7878d0c9a407950fcb5a2e7ed"}]},
+                      {beam_asm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cef85f8577595b73910fa77803c58cdb"}]},
+                      {beam_block,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7e7610e6f816e2c8d869e7ce1c44cba8"}]},
+                      {beam_bool,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3fcb1cec9f4370800203e1189c01a10c"}]},
+                      {beam_bsm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"973abf79efd649a3f0eb1b3351b4fe92"}]},
+                      {beam_clean,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a0c6b67b764da86372deb11b4c5154f4"}]},
+                      {beam_dead,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ff4f53d218b932103fcf093dbd366584"}]},
+                      {beam_dict,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f1e8c36a21a5287a84844e7ffa0a9bbb"}]},
+                      {beam_disasm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"63dd1f997343124a900e2fe982fe4cad"}]},
+                      {beam_except,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"89dd12d9c4781f83554a9d2101d623d8"}]},
+                      {beam_flatten,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a1e49fa674cc580042459878a27403e9"}]},
+                      {beam_jump,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1a9f1ce9787205a57d137424b5ab022b"}]},
+                      {beam_listing,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e9a84340142cd7c90e95851ab1260a0f"}]},
+                      {beam_opcodes,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d5d21bc2584bf078639eba76a18d221"}]},
+                      {beam_peep,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5d81c38cab19af16ff472ce5838c63b1"}]},
+                      {beam_receive,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"7d22ec74972c53f3f93bd01dbe369370"}]},
+                      {beam_split,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"03b0416d0fee9081f68cf6468d036170"}]},
+                      {beam_trim,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9a6a01870ff8f8bda3ea36184da7348a"}]},
+                      {beam_type,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"cc4a9521730959ffc10d3ccebd20861d"}]},
+                      {beam_utils,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d7d2b1d7cc0722d47c7fd72fa6487d27"}]},
+                      {beam_validator,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ed5a82e40ba511c22291f87c1e2b705b"}]},
+                      {beam_z,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ffafc7070cf14ec69d569b0f8106f9a"}]},
+                      {cerl,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"38c2ac91b52a3141d74df2f219b45eb5"}]},
+                      {cerl_clauses,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"75da88dc5ced060fe52f177dae449ac0"}]},
+                      {cerl_inline,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"976487fce255a37192ac2a9258cdacf9"}]},
+                      {cerl_trees,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a240a6560f194a05956f572e436a6861"}]},
+                      {compile,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"98a40d5fc6bcd14ac5e516a506b6161f"}]},
+                      {core_lib,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9bdda978e16a885a17587e575cb2b369"}]},
+                      {core_lint,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"633c18d069ada94f1f1dfec526de2a2a"}]},
+                      {core_parse,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"21b745083d46bbe9725eb423f0c73c7a"}]},
+                      {core_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9940bb6f480fe3438bf97863ad0a5755"}]},
+                      {core_scan,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1f3ff89deb03f34714390b93e678989c"}]},
+                      {erl_bifs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"74c0a1563ea88b196dc2a18b1a34ffed"}]},
+                      {rec_env,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9a6fdcf8ffe126bb2838f86949ced210"}]},
+                      {sys_core_dsetel,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2c45d53e09f1b3f4e92b8f2ff8adf258"}]},
+                      {sys_core_fold,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ac092bdc7362a76cda76e27ad5610ec7"}]},
+                      {sys_core_inline,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4f439077cdab9795b782412d556828fa"}]},
+                      {sys_pre_attributes,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fc95feafdeca105f38589c4ca7b43532"}]},
+                      {sys_pre_expand,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4b1c1e3bf39af00ca2988295aa2fbdbb"}]},
+                      {v3_codegen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"590be66e39ccc3e6260a412ccbc8becd"}]},
+                      {v3_core,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5997d0774f74e0bad9b8887d24a8bfa3"}]},
+                      {v3_kernel,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"21a4b3edd53de6b910df1b99219824fc"}]},
+                      {v3_kernel_pp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1ec5b0e503bcf660d6da8aca9cba9682"}]},
+                      {v3_life,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"eb4ae7606e9409846d17c5c60751b08f"}]}]}]}},
+                 {application,
+                  {common_test,
+                   [{description,"The OTP Common Test application"},
+                    {vsn,"1.7.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/common_test-1.7.2/ebin"},
+                    {modules,
+                     [{ct,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"1f3d139ac677184b601722b92977b971"}]},
+                      {ct_config,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0257a2b9a5ed7e176df35b2c39a03a5a"}]},
+                      {ct_config_plain,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8330eca3a0e4401b3a8f9508343df5cc"}]},
+                      {ct_config_xml,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3502006ebdcc975febe9d750b28fd2b0"}]},
+                      {ct_conn_log_h,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5f2e020e7c92f8a7c2c148faf855c9b0"}]},
+                      {ct_cover,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"76b9cecb99d35c0bf38daa0a7107ddeb"}]},
+                      {ct_event,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2dfbb0a114e64e69b012a83a29312fe8"}]},
+                      {ct_framework,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d65dc75bd25fe8c45b3e574d18b0be87"}]},
+                      {ct_ftp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f60d1979bd240e45fb63deb00c6dae6e"}]},
+                      {ct_gen_conn,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"abb8aa2681d03230890eb5f3fcaffc6b"}]},
+                      {ct_groups,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0f3c50d44938374c7e364cef4c905079"}]},
+                      {ct_hooks,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5fbdbe96e81a1abe94ff6ce0c20c9574"}]},
+                      {ct_hooks_lock,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6e94b9611b2abb9a665606264fb96c2c"}]},
+                      {ct_logs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ec22f1709750c55acff646a44502c2db"}]},
+                      {ct_make,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a2f7f755c88a136bbe56c5415901e217"}]},
+                      {ct_master,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3d8a8fd7184fd07d8caec68f3653b7f8"}]},
+                      {ct_master_event,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c497dbbef03d74f085ee633998aecba"}]},
+                      {ct_master_logs,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6a2180f96ad17256256d5ef731ac4d04"}]},
+                      {ct_master_status,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5d63adbf76f9afa47c576284d77d75a9"}]},
+                      {ct_netconfc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9bff4907efdc764c267f373d12956eca"}]},
+                      {ct_repeat,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"b18f0f016143922207ef2dd5577d60dc"}]},
+                      {ct_rpc,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"51957dfa13552f236dad5ad5ab1f83a0"}]},
+                      {ct_run,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"bcaaaf893ba391b4ce961c33d48b3b5f"}]},
+                      {ct_slave,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6b03499c65f734a1ad97e2fce458be92"}]},
+                      {ct_snmp,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"8a6826b2fdf26d9e775f8352ab15b454"}]},
+                      {ct_ssh,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"657b8f076669c2db4245acd4bc8254d7"}]},
+                      {ct_telnet,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"47a92efe0ab4b30fe83d83d8d429a8fe"}]},
+                      {ct_telnet_client,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"53f220488e09886c1933a060c000dddf"}]},
+                      {ct_testspec,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"fb607ba1ef1abdab4ba76e654cbd1ce1"}]},
+                      {ct_util,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e6178d700637198b47134c927348b72b"}]},
+                      {cth_conn_log,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"113d8b745a6d162d678b03dba49ea048"}]},
+                      {cth_log_redirect,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e7da913515a3b5841c7da153ce0883cb"}]},
+                      {cth_surefire,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"3c7c9d2147289740b913895898126f1a"}]},
+                      {unix_telnet,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d38cf476a56523e6222de857b16e89d0"}]},
+                      {vts,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a31c45897c8d9fe60fbc9115599edcf7"}]}]}]}},
+                 {application,
+                  {asn1,
+                   [{description,"The Erlang ASN1 compiler version 2.0.2"},
+                    {vsn,"2.0.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/asn1-2.0.2/ebin"},
+                    {modules,
+                     [{asn1_db,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d9af64def8344330927cefe9a2bf9a8a"}]},
+                      {asn1ct,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"352b6c8edb6cf7dfc39b3b6b6b0a7b35"}]},
+                      {asn1ct_check,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"5ef3333d2a492df6b90deff919f28b58"}]},
+                      {asn1ct_constructed_ber_bin_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"41e917757a2c1195b8f86749a5905d64"}]},
+                      {asn1ct_constructed_per,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"63d5e7bf85a641a2529c81c7888bfb52"}]},
+                      {asn1ct_eval_ext,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4f5e38c39875f699ad76e07de7b073b7"}]},
+                      {asn1ct_func,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"ea7118ee0d45ac6641313e378a1733db"}]},
+                      {asn1ct_gen,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e5b2688ada58f6ed45c2e7e841088e3e"}]},
+                      {asn1ct_gen_ber_bin_v2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"26db838a5c213d6ec1fe2fdf997a06d1"}]},
+                      {asn1ct_gen_per,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"a67d91fec991b9f08680c35e95f907f0"}]},
+                      {asn1ct_imm,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"9288c73c656cf6d60fd74bd7946581b2"}]},
+                      {asn1ct_name,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"2ea14b79e5eb0ae2c3f08f92241f9c4f"}]},
+                      {asn1ct_parser2,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"6a7951b400104d9f72bcfbb7405e4404"}]},
+                      {asn1ct_pretty_format,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"dc1240d0e121f12732f8469cbd23051a"}]},
+                      {asn1ct_rtt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"f24866e9e2295b4f6c5553ae44d53270"}]},
+                      {asn1ct_table,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"4d4ec9835f20bc046769547da299363c"}]},
+                      {asn1ct_tok,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"19908cc77297850954d101491e5eb97d"}]},
+                      {asn1ct_value,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"388ba3507e46869822607142eef38d70"}]},
+                      {asn1rt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0160799421ccb619fc6b08099bfaf37b"}]},
+                      {asn1rt_nif,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"0c579098c3d97270d004e54a94e42daa"}]}]}]}},
+                 {application,
+                  {appmon,
+                   [{description,"DEVTOOLS  CXC 138 16"},
+                    {vsn,"2.1.14.2"},
+                    {path,
+                     "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/lib/appmon-2.1.14.2/ebin"},
+                    {modules,
+                     [{appmon,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"97b8d88aecbd66963563a5aa5df0d0bc"}]},
+                      {appmon_a,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"adb9049e71eb9e2131b6952974302b4c"}]},
+                      {appmon_dg,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"438c40af3e96404e73904864597dcca0"}]},
+                      {appmon_lb,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"d851ee67b54dbf0da46cb21a8c1f7bd9"}]},
+                      {appmon_place,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"192140bb8bc7e74fd7121d8da2019c56"}]},
+                      {appmon_txt,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"34c7f9da76880b4f7fcfeb0856fcc097"}]},
+                      {appmon_web,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"449317a9770ff1aa4cf001604bd2261c"}]},
+                      {process_info,
+                       [{loaded,false},
+                        {native,false},
+                        {compiler,"4.9.1"},
+                        {md5,"e6d86fad6d0d208318c48af00853ec5b"}]}]}]}}]},
+               {system_info,
+                [{allocator,
+                  {glibc,
+                   [2,4],
+                   [sys_alloc,temp_alloc,sl_alloc,std_alloc,ll_alloc,
+                    eheap_alloc,ets_alloc,fix_alloc,binary_alloc,driver_alloc,
+                    mseg_alloc],
+                   [{sys_alloc,[{e,true},{m,libc},{tt,131072},{tp,0}]},
+                    {temp_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,90},
+                      {rsbcmt,80},
+                      {rmbcmt,100},
+                      {mmbcs,131072},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,10485760},
+                      {smbcs,1048576},
+                      {mbcgs,10},
+                      {acul,0},
+                      {mbsd,3},
+                      {as,gf}]},
+                    {sl_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,80},
+                      {rsbcmt,80},
+                      {rmbcmt,50},
+                      {mmbcs,32768},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,5242880},
+                      {smbcs,262144},
+                      {mbcgs,10},
+                      {acul,0},
+                      {mbsd,3},
+                      {as,gf}]},
+                    {std_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,20},
+                      {rsbcmt,80},
+                      {rmbcmt,50},
+                      {mmbcs,32768},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,5242880},
+                      {smbcs,262144},
+                      {mbcgs,10},
+                      {acul,0},
+                      {as,bf}]},
+                    {ll_alloc,
+                     [{e,true},
+                      {t,false},
+                      {ramv,false},
+                      {sbct,18446744073709551615},
+                      {asbcst,0},
+                      {rsbcst,0},
+                      {rsbcmt,0},
+                      {rmbcmt,0},
+                      {mmbcs,2097112},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,0},
+                      {lmbcs,10485760},
+                      {smbcs,1048576},
+                      {mbcgs,10},
+                      {acul,0},
+                      {as,aobf}]},
+                    {eheap_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,50},
+                      {rsbcmt,80},
+                      {rmbcmt,50},
+                      {mmbcs,131072},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,5242880},
+                      {smbcs,262144},
+                      {mbcgs,10},
+                      {acul,0},
+                      {mbsd,3},
+                      {as,gf}]},
+                    {ets_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,20},
+                      {rsbcmt,80},
+                      {rmbcmt,50},
+                      {mmbcs,32768},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,5242880},
+                      {smbcs,262144},
+                      {mbcgs,10},
+                      {acul,0},
+                      {as,bf}]},
+                    {fix_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,20},
+                      {rsbcmt,80},
+                      {rmbcmt,50},
+                      {mmbcs,32768},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,5242880},
+                      {smbcs,262144},
+                      {mbcgs,10},
+                      {acul,0},
+                      {as,aobf}]},
+                    {binary_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,20},
+                      {rsbcmt,80},
+                      {rmbcmt,50},
+                      {mmbcs,32768},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,5242880},
+                      {smbcs,262144},
+                      {mbcgs,10},
+                      {acul,0},
+                      {as,bf}]},
+                    {driver_alloc,
+                     [{e,true},
+                      {t,true},
+                      {ramv,false},
+                      {sbct,524288},
+                      {asbcst,4145152},
+                      {rsbcst,20},
+                      {rsbcmt,80},
+                      {rmbcmt,50},
+                      {mmbcs,32768},
+                      {mmmbc,18446744073709551615},
+                      {mmsbc,256},
+                      {lmbcs,5242880},
+                      {smbcs,262144},
+                      {mbcgs,10},
+                      {acul,0},
+                      {as,bf}]},
+                    {mseg_alloc,[{amcbf,4194304},{rmcbf,20},{mcs,10}]},
+                    {alloc_util,[{mmc,1024},{ycs,1048576}]},
+                    {instr,[{m,false},{s,false},{t,false}]}]}},
+                 {check_io,
+                  [{name,erts_poll},
+                   {primary,poll},
+                   {fallback,false},
+                   {kernel_poll,false},
+                   {memory_size,49808},
+                   {total_poll_set_size,2},
+                   {lazy_updates,true},
+                   {pending_updates,0},
+                   {batch_updates,false},
+                   {concurrent_updates,false},
+                   {max_fds,1024}]},
+                 {otp_release,"R16B02"},
+                 {port_limit,65536},
+                 {process_limit,262144},
+                 {smp_support,true},
+                 {system_version,
+                  "Erlang R16B02 (erts-5.10.3) [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]\n"},
+                 {system_architecture,"x86_64-unknown-linux-gnu"},
+                 {threads,true},
+                 {thread_pool_size,10},
+                 {{wordsize,internal},8},
+                 {{wordsize,external},8},
+                 {{cpu_topology,defined},undefined},
+                 {{cpu_topology,detected},
+                  [{node,
+                    [{processor,[{core,{logical,0}},{core,{logical,1}}]}]},
+                   {node,
+                    [{processor,[{core,{logical,2}},{core,{logical,3}}]}]}]},
+                 {scheduler_bind_type,unbound},
+                 {scheduler_bindings,{unbound,unbound,unbound,unbound}},
+                 {compat_rel,16},
+                 {schedulers_state,{4,4,4}},
+                 {build_type,opt},
+                 {logical_processors,4},
+                 {logical_processors_online,4},
+                 {logical_processors_available,4},
+                 {driver_version,"2.1"},
+                 {taints,[]}]},
+               {erts_compile_info,
+                [{ldflags,[]},
+                 {cflags,
+                  "-g -O2 -I/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp_src_R16B02/erts/x86_64-unknown-linux-gnu -DOTP_RELEASE   -D_GNU_SOURCE -DERTS_SMP -DHAVE_CONFIG_H -Wall -Wstrict-prototypes -Wmissing-prototypes -Wdeclaration-after-statement -DUSE_THREADS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS  "},
+                 {config_h,
+                  "/* x86_64-unknown-linux-gnu/config.h.  Generated by configure.  */\n/* config.h.in.  Generated from configure.in by autoheader.  */\n\n\n#define GHBN_R_SOLARIS  2\n#define GHBN_R_AIX      3\n#define GHBN_R_GLIBC    4\n\n\n/* Define the brk() argument type. */\n#define BRK_ARG_TYPE void *\n\n/* Define the brk() return type. */\n#define BRK_RET_TYPE int\n\n/* Define if you do not have a high-res. timer & want to use times() instead\n   */\n/* #undef CORRECT_USING_TIMES */\n\n/* Modern style mcontext_t in MacOSX */\n/* #undef DARWIN_MODERN_MCONTEXT */\n\n/* Define if you need to include rpc/types.h to get INADDR_LOOPBACK defined */\n/* #undef DEF_INADDR_LOOPBACK_IN_RPC_TYPES_H */\n\n/* Define if you need to include winsock2.h to get INADDR_LOOPBACK defined */\n/* #undef DEF_INADDR_LOOPBACK_IN_WINSOCK2_H */\n\n/* Define if you want to disable child waiter thread */\n/* #undef DISABLE_CHILD_WAITER_THREAD */\n\n/* Define if you want to disable vfork. */\n/* #undef DISABLE_VFORK */\n\n/* Define to 1 if your processor stores the words in a double in middle-endian\n   format (like some ARMs). */\n/* #undef DOUBLE_MIDDLE_ENDIAN */\n\n/* Define if you want to enable child waiter thread */\n/* #undef ENABLE_CHILD_WAITER_THREAD */\n\n/* Define if sbrk()/brk() wrappers can track malloc()s core memory use */\n/* #undef ERTS_BRK_WRAPPERS_CAN_TRACK_MALLOC */\n\n/* The only reason ERTS_EMU_CMDLINE_FLAGS exists is to force modification of\n   config.h when the emulator command line flags are modified by configure */\n#define ERTS_EMU_CMDLINE_FLAGS \" -g -O2 -I/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp_src_R16B02/erts/x86_64-unknown-linux-gnu -DOTP_RELEASE   -D_GNU_SOURCE -g  -D_GNU_SOURCE -I/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp_src_R16B02/erts/x86_64-unknown-linux-gnu -DOTP_RELEASE   -DUSE_THREADS -D_THREAD_SAFE -D_REENTRANT -DPOSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS   -Wall -Wstrict-prototypes -Wmissing-prototypes -Wdeclaration-after-statement\"\n\n/* Define if you have kernel poll and want to use it */\n#define ERTS_ENABLE_KERNEL_POLL 1\n\n/* Define if the smp emulator is built */\n#define ERTS_HAVE_SMP_EMU 1\n\n/* Define if dlopen() needs to be called before first call to dlerror() */\n/* #undef ERTS_NEED_DLOPEN_BEFORE_DLERROR */\n\n/* Define if poll() should be used instead of select() */\n#define ERTS_USE_POLL 1\n\n/* Define if __after_morecore_hook can track malloc()s core memory use. */\n#define ERTS___AFTER_MORECORE_HOOK_CAN_TRACK_MALLOC 1\n\n/* Define if bigendian */\n/* #undef ETHR_BIGENDIAN */\n\n/* Define if you get a register shortage with cmpxchg8b and position\n   independent code */\n/* #undef ETHR_CMPXCHG8B_REGISTER_SHORTAGE */\n\n/* Define if you want to disable native ethread implementations */\n/* #undef ETHR_DISABLE_NATIVE_IMPLS */\n\n/* Define if you want to force usage of pthread rwlocks */\n/* #undef ETHR_FORCE_PTHREAD_RWLOCK */\n\n/* Define if you use a gcc that supports the double word cmpxchg instruction\n   */\n#define ETHR_GCC_HAVE_DW_CMPXCHG_ASM_SUPPORT 1\n\n/* Define if you use a gcc that supports -msse2 and understand sse2 specific\n   asm statements */\n/* #undef ETHR_GCC_HAVE_SSE2_ASM_SUPPORT */\n\n/* Define if you have all ethread defines */\n#define ETHR_HAVE_ETHREAD_DEFINES 1\n\n/* Define if you have libatomic_ops atomic operations */\n/* #undef ETHR_HAVE_LIBATOMIC_OPS */\n\n/* Define if you have a linux futex implementation. */\n#define ETHR_HAVE_LINUX_FUTEX 1\n\n/* Define if the pthread.h header file is in pthread/mit directory. */\n/* #undef ETHR_HAVE_MIT_PTHREAD_H */\n\n/* Define if you have the pthread_attr_setguardsize function. */\n#define ETHR_HAVE_PTHREAD_ATTR_SETGUARDSIZE 1\n\n/* Define if you have the <pthread.h> header file. */\n#define ETHR_HAVE_PTHREAD_H 1\n\n/* Define if you have the pthread_rwlockattr_setkind_np() function. */\n#define ETHR_HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP 1\n\n/* Define if you have the PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP rwlock\n   attribute. */\n#define ETHR_HAVE_PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP 1\n\n/* Define if you have the pthread_spin_lock function. */\n#define ETHR_HAVE_PTHREAD_SPIN_LOCK 1\n\n/* Define if you have the pthread_yield() function. */\n#define ETHR_HAVE_PTHREAD_YIELD 1\n\n/* Define if you have the <sched.h> header file. */\n#define ETHR_HAVE_SCHED_H 1\n\n/* Define if you have the sched_yield() function. */\n#define ETHR_HAVE_SCHED_YIELD 1\n\n/* Define if you have the <sys/time.h> header file. */\n#define ETHR_HAVE_SYS_TIME_H 1\n\n/* Define if you have _InterlockedAnd() */\n/* #undef ETHR_HAVE__INTERLOCKEDAND */\n\n/* Define if you have _InterlockedAnd64() */\n/* #undef ETHR_HAVE__INTERLOCKEDAND64 */\n\n/* Define if you have _InterlockedCompareExchange() */\n/* #undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE */\n\n/* Define if you have _InterlockedCompareExchange128() */\n/* #undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128 */\n\n/* Define if you have _InterlockedCompareExchange64() */\n/* #undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64 */\n\n/* Define if you have _InterlockedCompareExchange64_acq() */\n/* #undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ */\n\n/* Define if you have _InterlockedCompareExchange64_rel() */\n/* #undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL */\n\n/* Define if you have _InterlockedCompareExchange_acq() */\n/* #undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ */\n\n/* Define if you have _InterlockedCompareExchange_rel() */\n/* #undef ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL */\n\n/* Define if you have _InterlockedDecrement() */\n/* #undef ETHR_HAVE__INTERLOCKEDDECREMENT */\n\n/* Define if you have _InterlockedDecrement64() */\n/* #undef ETHR_HAVE__INTERLOCKEDDECREMENT64 */\n\n/* Define if you have _InterlockedDecrement64_rel() */\n/* #undef ETHR_HAVE__INTERLOCKEDDECREMENT64_REL */\n\n/* Define if you have _InterlockedDecrement_rel() */\n/* #undef ETHR_HAVE__INTERLOCKEDDECREMENT_REL */\n\n/* Define if you have _InterlockedExchange() */\n/* #undef ETHR_HAVE__INTERLOCKEDEXCHANGE */\n\n/* Define if you have _InterlockedExchange64() */\n/* #undef ETHR_HAVE__INTERLOCKEDEXCHANGE64 */\n\n/* Define if you have _InterlockedExchangeAdd() */\n/* #undef ETHR_HAVE__INTERLOCKEDEXCHANGEADD */\n\n/* Define if you have _InterlockedExchangeAdd64() */\n/* #undef ETHR_HAVE__INTERLOCKEDEXCHANGEADD64 */\n\n/* Define if you have _InterlockedExchangeAdd64_acq() */\n/* #undef ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ */\n\n/* Define if you have _InterlockedExchangeAdd_acq() */\n/* #undef ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ */\n\n/* Define if you have _InterlockedIncrement() */\n/* #undef ETHR_HAVE__INTERLOCKEDINCREMENT */\n\n/* Define if you have _InterlockedIncrement64() */\n/* #undef ETHR_HAVE__INTERLOCKEDINCREMENT64 */\n\n/* Define if you have _InterlockedIncrement64_acq() */\n/* #undef ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ */\n\n/* Define if you have _InterlockedIncrement_acq() */\n/* #undef ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ */\n\n/* Define if you have _InterlockedOr() */\n/* #undef ETHR_HAVE__INTERLOCKEDOR */\n\n/* Define if you have _InterlockedOr64() */\n/* #undef ETHR_HAVE__INTERLOCKEDOR64 */\n\n/* Define if you have __sync_add_and_fetch() for 32-bit integers */\n#define ETHR_HAVE___SYNC_ADD_AND_FETCH32 1\n\n/* Define if you have __sync_add_and_fetch() for 64-bit integers */\n#define ETHR_HAVE___SYNC_ADD_AND_FETCH64 1\n\n/* Define if you have __sync_fetch_and_and() for 32-bit integers */\n#define ETHR_HAVE___SYNC_FETCH_AND_AND32 1\n\n/* Define if you have __sync_fetch_and_and() for 64-bit integers */\n#define ETHR_HAVE___SYNC_FETCH_AND_AND64 1\n\n/* Define if you have __sync_fetch_and_or() for 32-bit integers */\n#define ETHR_HAVE___SYNC_FETCH_AND_OR32 1\n\n/* Define if you have __sync_fetch_and_or() for 64-bit integers */\n#define ETHR_HAVE___SYNC_FETCH_AND_OR64 1\n\n/* Define if you have __sync_val_compare_and_swap() for 128-bit integers */\n/* #undef ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128 */\n\n/* Define if you have __sync_val_compare_and_swap() for 32-bit integers */\n#define ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32 1\n\n/* Define if you have __sync_val_compare_and_swap() for 64-bit integers */\n#define ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64 1\n\n/* Define if you want to modify the default stack size */\n/* #undef ETHR_MODIFIED_DEFAULT_STACK_SIZE */\n\n/* Define if you need the <nptl/pthread.h> header file. */\n/* #undef ETHR_NEED_NPTL_PTHREAD_H */\n\n/* Define if you prefer gcc native ethread implementations */\n/* #undef ETHR_PREFER_GCC_NATIVE_IMPLS */\n\n/* Define if you prefer libatomic_ops native ethread implementations */\n/* #undef ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS */\n\n/* Define if you have pthreads */\n#define ETHR_PTHREADS 1\n\n/* Define if pthread_yield() returns an int. */\n#define ETHR_PTHREAD_YIELD_RET_INT 1\n\n/* Define if sched_yield() returns an int. */\n#define ETHR_SCHED_YIELD_RET_INT 1\n\n/* Define to the size of AO_t if libatomic_ops is used */\n/* #undef ETHR_SIZEOF_AO_T */\n\n/* Define to the size of int */\n#define ETHR_SIZEOF_INT 4\n\n/* Define to the size of long */\n#define ETHR_SIZEOF_LONG 8\n\n/* Define to the size of long long */\n#define ETHR_SIZEOF_LONG_LONG 8\n\n/* Define to the size of pointers */\n#define ETHR_SIZEOF_PTR 8\n\n/* Define to the size of __int128_t */\n#define ETHR_SIZEOF___INT128_T 16\n\n/* Define to the size of __int64 */\n#define ETHR_SIZEOF___INT64 0\n\n/* Define if only run in Sparc PSO, or TSO mode */\n/* #undef ETHR_SPARC_PSO */\n\n/* Define if run in Sparc RMO, PSO, or TSO mode */\n/* #undef ETHR_SPARC_RMO */\n\n/* Define if only run in Sparc TSO mode */\n/* #undef ETHR_SPARC_TSO */\n\n/* Define if you can safely include both <sys/time.h> and <time.h>. */\n#define ETHR_TIME_WITH_SYS_TIME 1\n\n/* Define if you have win32 threads */\n/* #undef ETHR_WIN32_THREADS */\n\n/* Define if x86/x86_64 out of order instructions should be synchronized */\n/* #undef ETHR_X86_OUT_OF_ORDER */\n\n/* Define if you want to use clock_gettime to simulate gethrtime */\n#define GETHRTIME_WITH_CLOCK_GETTIME 1\n\n/* Define if building a halfword-heap 64bit emulator */\n/* #undef HALFWORD_HEAP_EMULATOR */\n\n/* Define to 1 if you have the <arpa/nameser.h> header file. */\n#define HAVE_ARPA_NAMESER_H 1\n\n/* Define to 1 if you have the `brk' function. */\n#define HAVE_BRK 1\n\n/* define if clock_gettime() works for getting process time */\n/* #undef HAVE_CLOCK_GETTIME */\n\n/* Define if you have a decl of fread that conflicts with int fread */\n#define HAVE_CONFLICTING_FREAD_DECLARATION 1\n\n/* Define if you have a putenv() that stores a copy of the key-value pair */\n/* #undef HAVE_COPYING_PUTENV */\n\n/* Define if you have cpuset_getaffinity/cpuset_setaffinity */\n/* #undef HAVE_CPUSET_xETAFFINITY */\n\n/* Define to 1 if you have the declaration of `getrlimit', and to 0 if you\n   don't. */\n#define HAVE_DECL_GETRLIMIT 1\n\n/* Define to 1 if you have the declaration of `IN6ADDR_ANY_INIT', and to 0 if\n   you don't. */\n#define HAVE_DECL_IN6ADDR_ANY_INIT 1\n\n/* Define to 1 if you have the declaration of `IN6ADDR_LOOPBACK_INIT', and to\n   0 if you don't. */\n#define HAVE_DECL_IN6ADDR_LOOPBACK_INIT 1\n\n/* Define to 1 if you have the declaration of `IPV6_V6ONLY', and to 0 if you\n   don't. */\n#define HAVE_DECL_IPV6_V6ONLY 1\n\n/* Define to 1 if you have the declaration of `posix2time', and to 0 if you\n   don't. */\n#define HAVE_DECL_POSIX2TIME 0\n\n/* Define to 1 if you have the declaration of `RLIMIT_STACK', and to 0 if you\n   don't. */\n#define HAVE_DECL_RLIMIT_STACK 1\n\n/* Define to 1 if you have the declaration of `SCTPS_BOUND', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTPS_BOUND 0\n\n/* Define to 1 if you have the declaration of `SCTPS_COOKIE_ECHOED', and to 0\n   if you don't. */\n#define HAVE_DECL_SCTPS_COOKIE_ECHOED 0\n\n/* Define to 1 if you have the declaration of `SCTPS_COOKIE_WAIT', and to 0 if\n   you don't. */\n#define HAVE_DECL_SCTPS_COOKIE_WAIT 0\n\n/* Define to 1 if you have the declaration of `SCTPS_ESTABLISHED', and to 0 if\n   you don't. */\n#define HAVE_DECL_SCTPS_ESTABLISHED 0\n\n/* Define to 1 if you have the declaration of `SCTPS_IDLE', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTPS_IDLE 0\n\n/* Define to 1 if you have the declaration of `SCTPS_LISTEN', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTPS_LISTEN 0\n\n/* Define to 1 if you have the declaration of `SCTPS_SHUTDOWN_ACK_SENT', and\n   to 0 if you don't. */\n#define HAVE_DECL_SCTPS_SHUTDOWN_ACK_SENT 0\n\n/* Define to 1 if you have the declaration of `SCTPS_SHUTDOWN_PENDING', and to\n   0 if you don't. */\n#define HAVE_DECL_SCTPS_SHUTDOWN_PENDING 0\n\n/* Define to 1 if you have the declaration of `SCTPS_SHUTDOWN_RECEIVED', and\n   to 0 if you don't. */\n#define HAVE_DECL_SCTPS_SHUTDOWN_RECEIVED 0\n\n/* Define to 1 if you have the declaration of `SCTPS_SHUTDOWN_SENT', and to 0\n   if you don't. */\n#define HAVE_DECL_SCTPS_SHUTDOWN_SENT 0\n\n/* Define to 1 if you have the declaration of `SCTP_ABORT', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTP_ABORT 1\n\n/* Define to 1 if you have the declaration of `SCTP_ADDR_CONFIRMED', and to 0\n   if you don't. */\n#define HAVE_DECL_SCTP_ADDR_CONFIRMED 0\n\n/* Define to 1 if you have the declaration of `SCTP_ADDR_OVER', and to 0 if\n   you don't. */\n#define HAVE_DECL_SCTP_ADDR_OVER 1\n\n/* Define to 1 if you have the declaration of `SCTP_BOUND', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTP_BOUND 0\n\n/* Define to 1 if you have the declaration of `SCTP_CLOSED', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTP_CLOSED 1\n\n/* Define to 1 if you have the declaration of `SCTP_COOKIE_ECHOED', and to 0\n   if you don't. */\n#define HAVE_DECL_SCTP_COOKIE_ECHOED 1\n\n/* Define to 1 if you have the declaration of `SCTP_COOKIE_WAIT', and to 0 if\n   you don't. */\n#define HAVE_DECL_SCTP_COOKIE_WAIT 1\n\n/* Define to 1 if you have the declaration of `SCTP_DELAYED_ACK_TIME', and to\n   0 if you don't. */\n#define HAVE_DECL_SCTP_DELAYED_ACK_TIME 1\n\n/* Define to 1 if you have the declaration of `SCTP_EMPTY', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTP_EMPTY 1\n\n/* Define to 1 if you have the declaration of `SCTP_EOF', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTP_EOF 1\n\n/* Define to 1 if you have the declaration of `SCTP_ESTABLISHED', and to 0 if\n   you don't. */\n#define HAVE_DECL_SCTP_ESTABLISHED 1\n\n/* Define to 1 if you have the declaration of `SCTP_LISTEN', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTP_LISTEN 0\n\n/* Define to 1 if you have the declaration of `SCTP_SENDALL', and to 0 if you\n   don't. */\n#define HAVE_DECL_SCTP_SENDALL 0\n\n/* Define to 1 if you have the declaration of `SCTP_SHUTDOWN_ACK_SENT', and to\n   0 if you don't. */\n#define HAVE_DECL_SCTP_SHUTDOWN_ACK_SENT 1\n\n/* Define to 1 if you have the declaration of `SCTP_SHUTDOWN_PENDING', and to\n   0 if you don't. */\n#define HAVE_DECL_SCTP_SHUTDOWN_PENDING 1\n\n/* Define to 1 if you have the declaration of `SCTP_SHUTDOWN_RECEIVED', and to\n   0 if you don't. */\n#define HAVE_DECL_SCTP_SHUTDOWN_RECEIVED 1\n\n/* Define to 1 if you have the declaration of `SCTP_SHUTDOWN_SENT', and to 0\n   if you don't. */\n#define HAVE_DECL_SCTP_SHUTDOWN_SENT 1\n\n/* Define to 1 if you have the declaration of `SCTP_UNORDERED', and to 0 if\n   you don't. */\n#define HAVE_DECL_SCTP_UNORDERED 1\n\n/* Define to 1 if you have the declaration of `setrlimit', and to 0 if you\n   don't. */\n#define HAVE_DECL_SETRLIMIT 1\n\n/* Define to 1 if you have the declaration of `time2posix', and to 0 if you\n   don't. */\n#define HAVE_DECL_TIME2POSIX 0\n\n/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.\n   */\n#define HAVE_DIRENT_H 1\n\n/* Define to 1 if you have the <dlfcn.h> header file. */\n#define HAVE_DLFCN_H 1\n\n/* Define to 1 if you have the `dlopen' function. */\n#define HAVE_DLOPEN 1\n\n/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */\n/* #undef HAVE_DOPRNT */\n\n/* Define if you have the 'end' symbol */\n#define HAVE_END_SYMBOL 1\n\n/* Define if you have a working fallocate() */\n/* #undef HAVE_FALLOCATE */\n\n/* Define to 1 if you have the <fcntl.h> header file. */\n#define HAVE_FCNTL_H 1\n\n/* Define to 1 if you have the `fdatasync' function. */\n#define HAVE_FDATASYNC 1\n\n/* Define to 1 if you have the `finite' function. */\n#define HAVE_FINITE 1\n\n/* Define to 1 if you have the `flockfile' function. */\n#define HAVE_FLOCKFILE 1\n\n/* Define to 1 if you have the `fork' function. */\n#define HAVE_FORK 1\n\n/* Define to 1 if you have the `fpsetmask' function. */\n/* #undef HAVE_FPSETMASK */\n\n/* Define to 1 if you have the `fstat' function. */\n#define HAVE_FSTAT 1\n\n/* Define if you have fwrite_unlocked */\n#define HAVE_FWRITE_UNLOCKED 1\n\n/* Define to 1 if you have a good `getaddrinfo' function. */\n#define HAVE_GETADDRINFO 1\n\n/* Define to 1 if you have the `gethostbyname2' function. */\n#define HAVE_GETHOSTBYNAME2 1\n\n/* Define to flavour of gethostbyname_r */\n#define HAVE_GETHOSTBYNAME_R GHBN_R_GLIBC\n\n/* Define to 1 if you have the `gethrtime' function. */\n/* #undef HAVE_GETHRTIME */\n\n/* define if gethrvtime() works and uses ioctl() to /proc/self */\n/* #undef HAVE_GETHRVTIME_PROCFS_IOCTL */\n\n/* Define to 1 if you have the `getifaddrs' function. */\n#define HAVE_GETIFADDRS 1\n\n/* Define to 1 if you have the `getipnodebyaddr' function. */\n/* #undef HAVE_GETIPNODEBYADDR */\n\n/* Define to 1 if you have the `getipnodebyname' function. */\n/* #undef HAVE_GETIPNODEBYNAME */\n\n/* Define to 1 if you have a good `getnameinfo' function. */\n#define HAVE_GETNAMEINFO 1\n\n/* Define to 1 if you have the `gmtime_r' function. */\n#define HAVE_GMTIME_R 1\n\n/* Define to 1 if you have the <ieeefp.h> header file. */\n/* #undef HAVE_IEEEFP_H */\n\n/* Define to 1 if you have the `ieee_handler' function. */\n/* #undef HAVE_IEEE_HANDLER */\n\n/* Define to 1 if you have the <ifaddrs.h> header file. */\n#define HAVE_IFADDRS_H 1\n\n/* Define if ipv6 is present */\n#define HAVE_IN6 1\n\n/* Define to 1 if you have the variable in6addr_any declared. */\n#define HAVE_IN6ADDR_ANY 1\n\n/* Define to 1 if you have the variable in6addr_loopback declared. */\n#define HAVE_IN6ADDR_LOOPBACK 1\n\n/* Define to 1 if you have the `inet_pton' function. */\n#define HAVE_INET_PTON 1\n\n/* Define to 1 if you have the <inttypes.h> header file. */\n#define HAVE_INTTYPES_H 1\n\n/* Early linux used in_addr6 instead of in6_addr, define if you have this */\n/* #undef HAVE_IN_ADDR6_STRUCT */\n\n/* Define to 1 if you have the `isinf' function. */\n#define HAVE_ISINF 1\n\n/* Define to 1 if you have the `isnan' function. */\n#define HAVE_ISNAN 1\n\n/* Define if you have kstat */\n/* #undef HAVE_KSTAT */\n\n/* Define to 1 if you have the <langinfo.h> header file. */\n#define HAVE_LANGINFO_H 1\n\n/* Define to 1 if you have the `dl' library (-ldl). */\n#define HAVE_LIBDL 1\n\n/* Define to 1 if you have the `dlpi' library (-ldlpi). */\n/* #undef HAVE_LIBDLPI */\n\n/* Define to 1 if you have the <libdlpi.h> header file. */\n/* #undef HAVE_LIBDLPI_H */\n\n/* Define to 1 if you have the `inet' library (-linet). */\n/* #undef HAVE_LIBINET */\n\n/* Define to 1 if you have the `m' library (-lm). */\n#define HAVE_LIBM 1\n\n/* Define to 1 if you have the `util' library (-lutil). */\n#define HAVE_LIBUTIL 1\n\n/* Define to 1 if you have the `z' library (-lz). */\n/* #undef HAVE_LIBZ */\n\n/* Define to 1 if you have the <limits.h> header file. */\n#define HAVE_LIMITS_H 1\n\n/* Define to 1 if you have the <linux/falloc.h> header file. */\n/* #undef HAVE_LINUX_FALLOC_H */\n\n/* Define to 1 if you have the `localtime_r' function. */\n#define HAVE_LOCALTIME_R 1\n\n/* Define to 1 if you have the <malloc.h> header file. */\n#define HAVE_MALLOC_H 1\n\n/* Define to 1 if you have the `mallopt' function. */\n#define HAVE_MALLOPT 1\n\n/* Define to 1 if you have the `memcpy' function. */\n#define HAVE_MEMCPY 1\n\n/* Define to 1 if you have the `memmove' function. */\n#define HAVE_MEMMOVE 1\n\n/* Define to 1 if you have the <memory.h> header file. */\n#define HAVE_MEMORY_H 1\n\n/* Define if the pthread.h header file is in pthread/mit directory. */\n/* #undef HAVE_MIT_PTHREAD_H */\n\n/* Define to 1 if you have the `mmap' function. */\n#define HAVE_MMAP 1\n\n/* Define to 1 if you have the `mremap' function. */\n#define HAVE_MREMAP 1\n\n/* Define if setsockopt() accepts multicast options */\n#define HAVE_MULTICAST_SUPPORT 1\n\n/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */\n/* #undef HAVE_NDIR_H */\n\n/* Define to 1 if you have the <netpacket/packet.h> header file. */\n#define HAVE_NETPACKET_PACKET_H 1\n\n/* Define to 1 if you have the <net/errno.h> header file. */\n/* #undef HAVE_NET_ERRNO_H */\n\n/* Define to 1 if you have the <net/if_dl.h> header file. */\n/* #undef HAVE_NET_IF_DL_H */\n\n/* Define to 1 if you have the `nl_langinfo' function. */\n#define HAVE_NL_LANGINFO 1\n\n/* Define if you don't have a definition of INADDR_LOOPBACK */\n/* #undef HAVE_NO_INADDR_LOOPBACK */\n\n/* Define to 1 if you have the `openpty' function. */\n#define HAVE_OPENPTY 1\n\n/* Define to 1 if you have the `poll' function. */\n#define HAVE_POLL 1\n\n/* Define to 1 if you have the <poll.h> header file. */\n#define HAVE_POLL_H 1\n\n/* Define to 1 if you have the `posix2time' function. */\n/* #undef HAVE_POSIX2TIME */\n\n/* Define to 1 if you have the `posix_fadvise' function. */\n#define HAVE_POSIX_FADVISE 1\n\n/* Define if you have a working posix_fallocate() */\n/* #undef HAVE_POSIX_FALLOCATE */\n\n/* Define to 1 if you have the `pread' function. */\n#define HAVE_PREAD 1\n\n/* Define if you have processor_bind functionality */\n/* #undef HAVE_PROCESSOR_BIND */\n\n/* Define if you have pset functionality */\n/* #undef HAVE_PSET */\n\n/* Define if you have the <pthread.h> header file. */\n#define HAVE_PTHREAD_H 1\n\n/* Define to 1 if you have the <pty.h> header file. */\n#define HAVE_PTY_H 1\n\n/* Define if you have putc_unlocked */\n#define HAVE_PUTC_UNLOCKED 1\n\n/* Define to 1 if you have the `pwrite' function. */\n#define HAVE_PWRITE 1\n\n/* Define to 1 if you have the `res_gethostbyname' function. */\n/* #undef HAVE_RES_GETHOSTBYNAME */\n\n/* Define to 1 if you have the `sbrk' function. */\n#define HAVE_SBRK 1\n\n/* Define if you have sched_getaffinity/sched_setaffinity */\n#define HAVE_SCHED_xETAFFINITY 1\n\n/* Define to 1 if you have the `sctp_bindx' function. */\n/* #undef HAVE_SCTP_BINDX */\n\n/* Define to 1 if you have the <netinet/sctp.h> header file */\n#define HAVE_SCTP_H 1\n\n/* Define to 1 if you have the `sctp_peeloff' function. */\n/* #undef HAVE_SCTP_PEELOFF */\n\n/* Define to 1 if you have the <sdkddkver.h> header file. */\n/* #undef HAVE_SDKDDKVER_H */\n\n/* Define to 1 if you have the `sendfile' function. */\n#define HAVE_SENDFILE 1\n\n/* Define to 1 if you have the `sendfilev' function. */\n/* #undef HAVE_SENDFILEV */\n\n/* Define to 1 if you have the `setlocale' function. */\n#define HAVE_SETLOCALE 1\n\n/* Define to 1 if you have the `setsid' function. */\n#define HAVE_SETSID 1\n\n/* Define if we have socklen_t */\n#define HAVE_SOCKLEN_T 1\n\n/* define if you have the Solaris/ultrasparc /dev/perfmon interface */\n/* #undef HAVE_SOLARIS_SPARC_PERFMON */\n\n/* Define if you have SO_BSDCOMPAT flag on sockets */\n/* #undef HAVE_SO_BSDCOMPAT */\n\n/* Define to 1 if you have the <stdint.h> header file. */\n#define HAVE_STDINT_H 1\n\n/* Define to 1 if you have the <stdlib.h> header file. */\n#define HAVE_STDLIB_H 1\n\n/* Define to 1 if you have the `strerror' function. */\n#define HAVE_STRERROR 1\n\n/* Define to 1 if you have the `strerror_r' function. */\n#define HAVE_STRERROR_R 1\n\n/* Define to 1 if you have the <strings.h> header file. */\n#define HAVE_STRINGS_H 1\n\n/* Define to 1 if you have the <string.h> header file. */\n#define HAVE_STRING_H 1\n\n/* Define to 1 if you have the `strlcat' function. */\n/* #undef HAVE_STRLCAT */\n\n/* Define to 1 if you have the `strlcpy' function. */\n/* #undef HAVE_STRLCPY */\n\n/* Define to 1 if you have the `strncasecmp' function. */\n#define HAVE_STRNCASECMP 1\n\n/* Define to 1 if `ifr_enaddr' is member of `struct ifreq'. */\n/* #undef HAVE_STRUCT_IFREQ_IFR_ENADDR */\n\n/* Define to 1 if `ifr_hwaddr' is member of `struct ifreq'. */\n#define HAVE_STRUCT_IFREQ_IFR_HWADDR 1\n\n/* Define to 1 if `spp_flags' is member of `struct sctp_paddrparams'. */\n#define HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_FLAGS 1\n\n/* Define to 1 if `spp_pathmtu' is member of `struct sctp_paddrparams'. */\n#define HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_PATHMTU 1\n\n/* Define to 1 if `spp_sackdelay' is member of `struct sctp_paddrparams'. */\n#define HAVE_STRUCT_SCTP_PADDRPARAMS_SPP_SACKDELAY 1\n\n/* Define to 1 if `sre_data' is member of `struct sctp_remote_error'. */\n#define HAVE_STRUCT_SCTP_REMOTE_ERROR_SRE_DATA 1\n\n/* Define to 1 if `ssf_data' is member of `struct sctp_send_failed'. */\n#define HAVE_STRUCT_SCTP_SEND_FAILED_SSF_DATA 1\n\n/* Define to 1 if you have the <syslog.h> header file. */\n#define HAVE_SYSLOG_H 1\n\n/* Define if you have <sys/devpoll.h> header file. */\n/* #undef HAVE_SYS_DEVPOLL_H */\n\n/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.\n   */\n/* #undef HAVE_SYS_DIR_H */\n\n/* Define if you have the <sys/epoll.h> header file. */\n#define HAVE_SYS_EPOLL_H 1\n\n/* Define if you have <sys/event.h> header file. */\n/* #undef HAVE_SYS_EVENT_H */\n\n/* Define to 1 if you have the <sys/ioctl.h> header file. */\n#define HAVE_SYS_IOCTL_H 1\n\n/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.\n   */\n/* #undef HAVE_SYS_NDIR_H */\n\n/* Define to 1 if you have the <sys/resource.h> header file */\n#define HAVE_SYS_RESOURCE_H 1\n\n/* Define to 1 if you have the <sys/sdt.h> header file. */\n/* #undef HAVE_SYS_SDT_H */\n\n/* Define to 1 if you have the <sys/socketio.h> header file. */\n/* #undef HAVE_SYS_SOCKETIO_H */\n\n/* Define to 1 if you have the <sys/socket.h> header file. */\n#define HAVE_SYS_SOCKET_H 1\n\n/* Define to 1 if you have the <sys/sockio.h> header file. */\n/* #undef HAVE_SYS_SOCKIO_H */\n\n/* Define to 1 if you have the <sys/stat.h> header file. */\n#define HAVE_SYS_STAT_H 1\n\n/* Define to 1 if you have the <sys/stropts.h> header file. */\n#define HAVE_SYS_STROPTS_H 1\n\n/* Define to 1 if you have the <sys/sysctl.h> header file. */\n#define HAVE_SYS_SYSCTL_H 1\n\n/* Define to 1 if you have the <sys/time.h> header file. */\n#define HAVE_SYS_TIME_H 1\n\n/* Define to 1 if you have the <sys/types.h> header file. */\n#define HAVE_SYS_TYPES_H 1\n\n/* Define to 1 if you have the <sys/uio.h> header file. */\n#define HAVE_SYS_UIO_H 1\n\n/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */\n#define HAVE_SYS_WAIT_H 1\n\n/* Define if termcap functions exists */\n#define HAVE_TERMCAP 1\n\n/* Define to 1 if you have the `time2posix' function. */\n/* #undef HAVE_TIME2POSIX */\n\n/* Define to 1 if you have the <unistd.h> header file. */\n#define HAVE_UNISTD_H 1\n\n/* Define to 1 if you have the <util.h> header file. */\n/* #undef HAVE_UTIL_H */\n\n/* Define to 1 if you have the <utmp.h> header file. */\n#define HAVE_UTMP_H 1\n\n/* Define to 1 if you have the `vfork' function. */\n#define HAVE_VFORK 1\n\n/* Define to 1 if you have the <vfork.h> header file. */\n/* #undef HAVE_VFORK_H */\n\n/* Define to 1 if you have the `vprintf' function. */\n#define HAVE_VPRINTF 1\n\n/* Define to 1 if you have a `wcwidth' function. */\n#define HAVE_WCWIDTH 1\n\n/* Define to 1 if you have the <windows.h> header file. */\n/* #undef HAVE_WINDOWS_H */\n\n/* Define to 1 if you have the <winsock2.h> header file. */\n/* #undef HAVE_WINSOCK2_H */\n\n/* Define to 1 if `fork' works. */\n#define HAVE_WORKING_FORK 1\n\n/* Define if you have a working posix_openpt implementation */\n#define HAVE_WORKING_POSIX_OPENPT 1\n\n/* Define to 1 if `vfork' works. */\n#define HAVE_WORKING_VFORK 1\n\n/* Define to 1 if you have the `writev' function. */\n#define HAVE_WRITEV 1\n\n/* Define to 1 if you have the <ws2tcpip.h> header file. */\n/* #undef HAVE_WS2TCPIP_H */\n\n/* Define to 1 if you have the `_brk' function. */\n/* #undef HAVE__BRK */\n\n/* Define if you have the '_end' symbol */\n#define HAVE__END_SYMBOL 1\n\n/* Define to 1 if you have the `_sbrk' function. */\n/* #undef HAVE__SBRK */\n\n/* Define to 1 if you have the `__brk' function. */\n/* #undef HAVE___BRK */\n\n/* Define to 1 if you have the `__sbrk' function. */\n#define HAVE___SBRK 1\n\n/* Define to enable HiPE */\n#define HIPE 1\n\n/* define if h_errno is declared (in some way) in a system header file */\n#define H_ERRNO_DECLARED 1\n\n/* Define if netdb.h needs struct sockaddr_in ans in.h CAN be included before\n   */\n#define NETDB_H_NEEDS_IN_H 1\n\n/* Define if floating points exceptions are non-existing/not reliable */\n#define NO_FPE_SIGNALS \n\n/* Defined if no found C compiler can handle jump tables */\n/* #undef NO_JUMP_TABLE */\n\n/* Define if you dont have salen */\n#define NO_SA_LEN 1\n\n/* Define to the address where bug reports for this package should be sent. */\n#define PACKAGE_BUGREPORT \"\"\n\n/* Define to the full name of this package. */\n#define PACKAGE_NAME \"\"\n\n/* Define to the full name and version of this package. */\n#define PACKAGE_STRING \"\"\n\n/* Define to the one symbol short name of this package. */\n#define PACKAGE_TARNAME \"\"\n\n/* Define to the version of this package. */\n#define PACKAGE_VERSION \"\"\n\n/* Define if you wish to redefine FD_SETSIZE to be able to select on more fd\n   */\n/* #undef REDEFINE_FD_SETSIZE */\n\n/* Define as the return type of signal handlers (`int' or `void'). */\n#define RETSIGTYPE void\n\n/* Define the sbrk() argument type. */\n#define SBRK_ARG_TYPE intptr_t\n\n/* Define the sbrk() return type. */\n#define SBRK_RET_TYPE void *\n\n/* The size of a `AO_t', as computed by sizeof. */\n/* #undef SIZEOF_AO_T */\n\n/* The size of a `char', as computed by sizeof. */\n#define SIZEOF_CHAR 1\n\n/* The size of a `int', as computed by sizeof. */\n#define SIZEOF_INT 4\n\n/* The size of a `long', as computed by sizeof. */\n#define SIZEOF_LONG 8\n\n/* The size of a `long long', as computed by sizeof. */\n#define SIZEOF_LONG_LONG 8\n\n/* The size of a `off_t', as computed by sizeof. */\n#define SIZEOF_OFF_T 8\n\n/* The size of a `short', as computed by sizeof. */\n#define SIZEOF_SHORT 2\n\n/* The size of a `size_t', as computed by sizeof. */\n#define SIZEOF_SIZE_T 8\n\n/* The size of a `time_t', as computed by sizeof. */\n#define SIZEOF_TIME_T 8\n\n/* The size of a `void *', as computed by sizeof. */\n#define SIZEOF_VOID_P 8\n\n/* The size of a `__int128_t', as computed by sizeof. */\n#define SIZEOF___INT128_T 16\n\n/* The size of a `__int64', as computed by sizeof. */\n#define SIZEOF___INT64 0\n\n/* Define to 1 if you have the ANSI C header files. */\n#define STDC_HEADERS 1\n\n/* define if the variable sys_errlist is declared in a system header file */\n#define SYS_ERRLIST_DECLARED \n\n/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */\n#define TIME_WITH_SYS_TIME 1\n\n/* Define to 1 if your <sys/time.h> declares `struct tm'. */\n/* #undef TM_IN_SYS_TIME */\n\n/* Define if you want to use dtrace for dynamic tracing */\n/* #undef USE_DTRACE */\n\n/* Define if you want to use dynamic tracing */\n/* #undef USE_DYNAMIC_TRACE */\n\n/* Define if you have matherr() function and struct exception type */\n#define USE_MATHERR 1\n\n/* Define to enable hrvtime() on Linux systems with perfctr extension */\n/* #undef USE_PERFCTR */\n\n/* Define if select() should be used instead of poll() */\n/* #undef USE_SELECT */\n\n/* Define if you want to use systemtap for dynamic tracing */\n/* #undef USE_SYSTEMTAP */\n\n/* Define to enable VM dynamic trace probes */\n/* #undef USE_VM_PROBES */\n\n/* Define if windows.h includes winsock2.h */\n/* #undef WINDOWS_H_INCLUDES_WINSOCK2_H */\n\n/* Define to 1 if your processor stores words with the most significant byte\n   first (like Motorola and SPARC, unlike Intel and VAX). */\n/* #undef WORDS_BIGENDIAN */\n\n/* Define to empty if `const' does not conform to ANSI C. */\n/* #undef const */\n\n/* Define to `long' if <sys/types.h> does not define. */\n/* #undef off_t */\n\n/* Define to `int' if <sys/types.h> does not define. */\n/* #undef pid_t */\n\n/* Define to `unsigned' if <sys/types.h> does not define. */\n/* #undef size_t */\n\n/* Define as `fork' if `vfork' does not work. */\n/* #undef vfork */\n\n\n/* Redefine in6_addr. XXX this should be moved to the files where it's used? */\n#ifdef HAVE_IN_ADDR6_STRUCT\n#define in6_addr in_addr6\n#endif\n\n/* Define a reasonable default for INADDR_LOOPBACK */\n/* XXX this should be moved to the files where it's used? */\n#ifdef HAVE_NO_INADDR_LOOPBACK\n#define INADDR_LOOPBACK (u_long)0x7F000001\n#endif\n\n#ifdef REDEFINE_FD_SETSIZE\n#define FD_SETSIZE 1024\n#endif\n\n#ifdef HAVE_GETHRVTIME_PROCFS_IOCTL\n#define HAVE_GETHRVTIME\n#endif\n\n#ifndef HAVE_FINITE\n# if defined(HAVE_ISINF) && defined(HAVE_ISNAN)\n#  define USE_ISINF_ISNAN\n# endif\n#endif\n\n#if defined(DEBUG) && defined(USE_THREADS) && !defined(ERTS_ENABLE_LOCK_CHECK)\n#define ERTS_ENABLE_LOCK_CHECK 1\n#endif\n\n"}]},
+               {beam_dynamic_libraries,
+                "\tlibutil.so.1 => /lib64/libutil.so.1 (0x00002b3e06a05000)\n\tlibdl.so.2 => /lib64/libdl.so.2 (0x00002b3e06b08000)\n\tlibm.so.6 => /lib64/libm.so.6 (0x00002b3e06c0c000)\n\tlibncurses.so.5 => /lib64/libncurses.so.5 (0x00002b3e06d62000)\n\tlibpthread.so.0 => /lib64/libpthread.so.0 (0x00002b3e06ec5000)\n\tlibrt.so.1 => /lib64/librt.so.1 (0x00002b3e06fdc000)\n\tlibc.so.6 => /lib64/libc.so.6 (0x00002b3e070e6000)\n\t/lib64/ld-linux-x86-64.so.2 (0x00002b3e068e9000)\n"},
+               {environment_erts,
+                [{"BINDIR",
+                  "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/erts-5.10.3/bin"},
+                 {"DIALYZER_EMULATOR",false},
+                 {"CERL_DETACHED_PROG",false},
+                 {"EMU","beam"},
+                 {"ERL_CONSOLE_MODE",false},
+                 {"ERL_CRASH_DUMP",false},
+                 {"ERL_CRASH_DUMP_NICE",false},
+                 {"ERL_CRASH_DUMP_SECONDS",false},
+                 {"ERL_EPMD_PORT",false},
+                 {"ERL_EMULATOR_DLL",false},
+                 {"ERL_FULLSWEEP_AFTER",false},
+                 {"ERL_LIBS",false},
+                 {"ERL_MALLOC_LIB",false},
+                 {"ERL_MAX_PORTS",false},
+                 {"ERL_MAX_ETS_TABLES",false},
+                 {"ERL_NO_VFORK",false},
+                 {"ERL_NO_KERNEL_POLL",false},
+                 {"ERL_THREAD_POOL_SIZE",false},
+                 {"ERLC_EMULATOR",false},
+                 {"ESCRIPT_EMULATOR",false},
+                 {"HOME","/home/otptest"},
+                 {"HOMEDRIVE",false},
+                 {"HOMEPATH",false},
+                 {"LANG","sv_SE.UTF-8"},
+                 {"LC_ALL",false},
+                 {"LC_CTYPE",false},
+                 {"PATH",
+                  "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/erts-5.10.3/bin:/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/otp/patch/bin:/home/otp/obe/bin"},
+                 {"PROGNAME","erl"},
+                 {"RELDIR",false},
+                 {"ROOTDIR",
+                  "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp"},
+                 {"TERM","xterm-256color"},
+                 {"COMSPEC",false},
+                 {"HEART_COMMAND",false},
+                 {"RUN_ERL_LOG_ALIVE_MINUTES",false},
+                 {"RUN_ERL_LOG_ACTIVITY_MINUTES",false},
+                 {"RUN_ERL_LOG_ALIVE_FORMAT",false},
+                 {"RUN_ERL_LOG_ALIVE_IN_UTC",false},
+                 {"RUN_ERL_LOG_GENERATIONS",false},
+                 {"RUN_ERL_LOG_MAXSIZE",false},
+                 {"RUN_ERL_DISABLE_FLOWCNTRL",false},
+                 {"CALLER_DRV_USE_OUTPUTV",false},
+                 {"ERL_INET_GETHOST_DEBUG",false},
+                 {"ERL_EFILE_THREAD_SHORT_CIRCUIT",false},
+                 {"ERL_WINDOW_TITLE",false},
+                 {"ERL_ABORT_ON_FAILURE",false},
+                 {"TTYSL_DEBUG_LOG",false}]},
+               {environment,
+                [{"JAVA_ROOT","/usr/lib64/jvm/java"},
+                 {"COLORTERM","1"},
+                 {"LC_NAME","sv_SE.UTF-8"},
+                 {"G_BROKEN_FILENAMES","1"},
+                 {"LESSCLOSE","lessclose.sh %s %s"},
+                 {"LC_TIME","sv_SE.UTF-8"},
+                 {"DISPLAY","localhost:11.0"},
+                 {"INFOPATH",
+                  "/usr/local/info:/usr/share/info:/usr/info:/opt/gnome/share/info"},
+                 {"LPDEST","lw5"},
+                 {"PKG_CONFIG_PATH",
+                  "/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig"},
+                 {"LESSOPEN","lessopen.sh %s"},
+                 {"XDG_DATA_DIRS",
+                  "/usr/local/share/:/usr/share/:/etc/opt/kde3/share/:/opt/kde3/share/:/opt/gnome/share/"},
+                 {"ACLOCAL_FLAGS","-I /opt/gnome/share/aclocal"},
+                 {"PRINTER","lw5"},
+                 {"VISUAL","vim"},
+                 {"GTK_PATH64",
+                  "/usr/local/lib64/gtk-2.0:/opt/gnome/lib64/gtk-2.0:/usr/lib64/gtk-2.0"},
+                 {"CVS_RSH","ssh"},
+                 {"LOGIN_PROFILE_RUN","true"},
+                 {"G_FILENAME_ENCODING","@locale,UTF-8,ISO-8859-15,CP1252"},
+                 {"LESS","-M -I"},
+                 {"MACHTYPE","x86_64-suse-linux"},
+                 {"LOGNAME","otptest"},
+                 {"GTK_PATH",
+                  "/usr/local/lib/gtk-2.0:/opt/gnome/lib/gtk-2.0:/usr/lib/gtk-2.0"},
+                 {"WINDOWMANAGER","/usr/X11R6/bin/gnome"},
+                 {"LS_OPTIONS","-N --color=none -T 0"},
+                 {"LESS_ADVANCED_PREPROCESSOR","no"},
+                 {"OSTYPE","linux"},
+                 {"QT_SYSTEM_DIR","/usr/share/desktop-data"},
+                 {"JDK_HOME","/usr/lib64/jvm/java"},
+                 {"SHLVL","1"},
+                 {"HOME","/home/otptest"},
+                 {"https_proxy","http://www-proxy.ericsson.se:8080"},
+                 {"SDK_HOME","/usr/lib64/jvm/java"},
+                 {"LC_MEASUREMENT","sv_SE.UTF-8"},
+                 {"PYTHONSTARTUP","/etc/pythonstart"},
+                 {"PROGNAME","erl"},
+                 {"LANG","sv_SE.UTF-8"},
+                 {"EDITOR","vim"},
+                 {"JAVA_HOME","/usr/lib64/jvm/java"},
+                 {"INPUTRC","/etc/inputrc"},
+                 {"PWD", "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20"},
+                 {"LC_IDENTIFICATION","sv_SE.UTF-8"},
+                 {"JAVA_BINDIR","/usr/lib64/jvm/java/bin"},
+                 {"SSH_SENDS_LOCALE","yes"},
+                 {"CPU","x86_64"},
+                 {"LC_MESSAGES","POSIX"},
+                 {"MAIL","/var/mail/otptest"},
+                 {"PATH",
+                  "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/erts-5.10.3/bin:/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/otp/patch/bin:/home/otp/obe/bin"},
+                 {"MINICOM","-c on"},
+                 {"XDG_CONFIG_DIRS",
+                  "/usr/local/etc/xdg/:/etc/xdg/:/etc/opt/gnome/xdg/"},
+                 {"CSHEDIT","emacs"},
+                 {"PAGER","less"},
+                 {"HOSTTYPE","x86_64"},
+                 {"ENV","/home/otptest/.bashrc"},
+                 {"ROOTDIR", "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp"},
+                 {"XNLSPATH","/usr/X11R6/lib/X11/nls"},
+                 {"LS_COLORS",[]},
+                 {"LC_TELEPHONE","sv_SE.UTF-8"},
+                 {"GROFF_NO_SGR","yes"},
+                 {"JRE_HOME","/usr/lib64/jvm/java/jre"},
+                 {"USER","otptest"},
+                 {"SSH_TTY","/dev/pts/3"},
+                 {"MORE","-sl"},
+                 {"LC_NUMERIC","sv_SE.UTF-8"},
+                 {"BINDIR",
+                  "/ldisk/daily_build/r16b02_opu_c_Muacul100.2013-07-10_20/otp/erts-5.10.3/bin"},
+                 {"PROFILEREAD","true"},
+                 {"HISTSIZE","1000"},
+                 {"HOST","duilin"},
+                 {"TERM","xterm-256color"},
+                 {"SHELL","/bin/sh"},
+                 {"GNOME2_PATH","/usr/local:/opt/gnome:/usr"},
+                 {"XKEYSYMDB","/usr/X11R6/lib/X11/XKeysymDB"},
+                 {"HOSTNAME","duilin"},
+                 {"LC_MONETARY","sv_SE.UTF-8"},
+                 {"EMU","beam"},
+                 {"LC_ADDRESS","sv_SE.UTF-8"},
+                 {"LASER","lw5"},
+                 {"NNTPSERVER","news"},
+                 {"INFODIR","/usr/local/info:/usr/share/info:/usr/info"},
+                 {"MANPATH",
+                  "/usr/local/man:/usr/share/man:/usr/X11R6/man:/opt/gnome/share/man"},
+                 {"LESSKEY","/etc/lesskey.bin"},
+                 {"LC_PAPER","sv_SE.UTF-8"}]}]}.
diff --git a/lib/runtime_tools/vsn.mk b/lib/runtime_tools/vsn.mk
index 5faae06b53..c282661a61 100644
--- a/lib/runtime_tools/vsn.mk
+++ b/lib/runtime_tools/vsn.mk
@@ -1 +1 @@
-RUNTIME_TOOLS_VSN = 1.8.11
+RUNTIME_TOOLS_VSN = 1.8.13
diff --git a/lib/sasl/doc/src/alarm_handler.xml b/lib/sasl/doc/src/alarm_handler.xml
index 87be6d2a9e..ab3041137e 100644
--- a/lib/sasl/doc/src/alarm_handler.xml
+++ b/lib/sasl/doc/src/alarm_handler.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/appup.xml b/lib/sasl/doc/src/appup.xml
index bacfaa76ef..85fcbed3ba 100644
--- a/lib/sasl/doc/src/appup.xml
+++ b/lib/sasl/doc/src/appup.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fileref SYSTEM "fileref.dtd">
 
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/book.xml b/lib/sasl/doc/src/book.xml
index de6a533636..30f196be48 100644
--- a/lib/sasl/doc/src/book.xml
+++ b/lib/sasl/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/error_logging.xml b/lib/sasl/doc/src/error_logging.xml
index 5707bc4d69..4d799d52f5 100644
--- a/lib/sasl/doc/src/error_logging.xml
+++ b/lib/sasl/doc/src/error_logging.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -173,8 +173,9 @@
   <section>
     <title>Report Browser</title>
     <p>The report browser is used to browse and format error reports
-      written by the error logger handler <c>error_logger_mf_h</c>.</p>
-    <p>The <c>error_logger_mf_h</c> handler writes all reports to a
+      written by the error logger handler <c>log_mf_h</c> defined in
+      <c>stdlib</c>.</p>
+    <p>The <c>log_mf_h</c> handler writes all reports to a
       report logging directory. This directory is specified when
       configuring the SASL application.</p>
     <p>If the report browser is
diff --git a/lib/sasl/doc/src/fascicules.xml b/lib/sasl/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/sasl/doc/src/fascicules.xml
+++ b/lib/sasl/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/sasl/doc/src/notes.xml b/lib/sasl/doc/src/notes.xml
index a3260a5b93..09d97cbe7b 100644
--- a/lib/sasl/doc/src/notes.xml
+++ b/lib/sasl/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,71 @@
   </header>
   <p>This document describes the changes made to the SASL application.</p>
 
+<section><title>SASL 2.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Don't try to add the log_mf_h handler in sasl unless
+	    configured to do so. Thanks to Richard Carlsson.</p>
+          <p>
+	    Own Id: OTP-11464</p>
+        </item>
+        <item>
+          <p>
+	    Fix confusing documentation about error handlers in
+	    SASL.(Thanks to Richard Carlsson)</p>
+          <p>
+	    Own Id: OTP-11507</p>
+        </item>
+        <item>
+          <p>
+	    A bug in the mechanism for upgrading core parts of
+	    Erlang/OTP (emulator, kernel, stdlib, sasl) caused a
+	    switch of paths between stdlib and sasl in the
+	    intermediate .script/.boot file. The bug was introduces
+	    along with this upgrade mechanism in R15B. It has now
+	    been corrected. (Thanks to Tobias Schlager)</p>
+          <p>
+	    Own Id: OTP-11529</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added a boot file which skips loading the "$HOME/.erlang"
+	    file on startup. Enable by starting erlang with "erl
+	    -boot no_dot_erlang".</p>
+          <p>
+	    *** INCOMPATIBILITY with false ***</p>
+          <p>
+	    Own Id: OTP-8479 Aux Id: seq11510 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SASL 2.3.3</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add Fd usage in rb logging. Thanks to Eric Pailleau.</p>
+          <p>
+	    Own Id: OTP-11252</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SASL 2.3.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/sasl/doc/src/notes_history.xml b/lib/sasl/doc/src/notes_history.xml
index 50772ae4e3..3607d9204c 100644
--- a/lib/sasl/doc/src/notes_history.xml
+++ b/lib/sasl/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/overload.xml b/lib/sasl/doc/src/overload.xml
index 80457e75fa..3a82432647 100644
--- a/lib/sasl/doc/src/overload.xml
+++ b/lib/sasl/doc/src/overload.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/part.xml b/lib/sasl/doc/src/part.xml
index 647380efbd..99d5210278 100644
--- a/lib/sasl/doc/src/part.xml
+++ b/lib/sasl/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/part_notes.xml b/lib/sasl/doc/src/part_notes.xml
index 1f572ae922..6a1e2e9408 100644
--- a/lib/sasl/doc/src/part_notes.xml
+++ b/lib/sasl/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/part_notes_history.xml b/lib/sasl/doc/src/part_notes_history.xml
index d8d48bfd46..53fc8a7fea 100644
--- a/lib/sasl/doc/src/part_notes_history.xml
+++ b/lib/sasl/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/rb.xml b/lib/sasl/doc/src/rb.xml
index 3da825878e..fa85b4bcd9 100644
--- a/lib/sasl/doc/src/rb.xml
+++ b/lib/sasl/doc/src/rb.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -138,6 +138,24 @@
       </desc>
     </func>
     <func>
+      <name>log_list()</name>
+      <name>log_list(Type)</name>
+      <fsummary>Log reports list</fsummary>
+      <type>
+        <v>Type = type()</v>
+        <v>type() = error | error_report | info_msg | info_report |
+        warning_msg | warning_report | crash_report |
+        supervisor_report | progress</v>
+      </type>
+      <desc>
+	<p>Same as <c>list/0</c> or <c>list/1</c> functions 
+	   but result is printed to logfile, if set, otherwise to standard_io.
+          </p>
+        <p>If no <c>Type</c> is given, all reports are listed.
+          </p>
+      </desc>
+    </func>
+    <func>
       <name>rescan()</name>
       <name>rescan(Options)</name>
       <fsummary>Rescan the report directory</fsummary>
@@ -172,7 +190,7 @@
       <type>
         <v>Options = [opt()]</v>
         <v>opt() = {start_log, FileName} | {max, MaxNoOfReports} | {report_dir, DirString} | {type, ReportType} | {abort_on_error, Bool}</v>
-        <v>FileName = string() | standard_io</v>
+        <v>FileName = string() | atom() | pid()</v>
         <v>MaxNoOfReports = int() | all</v>
         <v>DirString = string()</v>
         <v>ReportType = type() | [type()] | all</v>
@@ -185,11 +203,13 @@
           reports can be browsed. When the <c>rb_server</c> is
           started, the files in the specified directory are
           scanned. The other functions assume that the server has
-          started.
+	  started.
           </p>
-        <p><c>{start_log, FileName}</c> starts logging to file. All
-          reports will be printed to the named file. The default is
-          <c>standard_io</c>.
+	  <p><c>{start_log, FileName}</c> starts logging to file, 
+	  registered name or io_device. All reports will be printed 
+	  to the named file. The default is <c>standard_io</c>. 
+	  The option {start_log, standard_error} is not allowed and 
+	  will be replaced by default standard_io.
           </p>
         <p><c>{max, MaxNoOfReports}</c>. Controls how many reports the
           <c>rb_server</c> should read on start-up. This option is
@@ -226,11 +246,11 @@
       <name>start_log(FileName)</name>
       <fsummary>Redirect all output to <c>FileName</c></fsummary>
       <type>
-        <v>FileName = string()</v>
+        <v>FileName = string() | atom() | pid()</v>
       </type>
       <desc>
         <p>Redirects all report output from the RB tool to the
-          specified file.
+          specified file, registered name or io_device.
           </p>
       </desc>
     </func>
diff --git a/lib/sasl/doc/src/ref_man.xml b/lib/sasl/doc/src/ref_man.xml
index 09b745a705..fa13bf65c3 100644
--- a/lib/sasl/doc/src/ref_man.xml
+++ b/lib/sasl/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/rel.xml b/lib/sasl/doc/src/rel.xml
index 68ef90330f..82b54a767e 100644
--- a/lib/sasl/doc/src/rel.xml
+++ b/lib/sasl/doc/src/rel.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fileref SYSTEM "fileref.dtd">
 
 <fileref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/release_handler.xml b/lib/sasl/doc/src/release_handler.xml
index e3438ede41..b8b9603bc0 100644
--- a/lib/sasl/doc/src/release_handler.xml
+++ b/lib/sasl/doc/src/release_handler.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/relup.xml b/lib/sasl/doc/src/relup.xml
index 7aba7e58ba..d7c1d6fbe4 100644
--- a/lib/sasl/doc/src/relup.xml
+++ b/lib/sasl/doc/src/relup.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fileref SYSTEM "fileref.dtd">
 
 <fileref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index 446baccb08..9c3c80bd13 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -51,7 +51,7 @@
 
   <section>
     <title>Error Logger Event Handlers</title>
-    <p>The following error logger event handlers are defined in
+    <p>The following error logger event handlers are used by
       the SASL application.</p>
     <taglist>
       <tag><c>sasl_report_tty_h</c></tag>
@@ -62,11 +62,10 @@
       <item>
         <p>Formats and writes <em>supervisor reports</em>, <em>crash report</em> and <em>progress report</em> to a single file.</p>
       </item>
-      <tag><c>error_logger_mf_h</c></tag>
+      <tag><c>log_mf_h</c></tag>
       <item>
         <p>This error logger writes <em>all</em> events sent to
-          the error logger to disk. It installs the <c>log_mf_h</c>
-          event handler in the <c>error_logger</c> process.</p>
+          the error logger to disk.</p>
         <p>To activate this event handler, the following three sasl
           configuration parameters must be set:
           <c>error_logger_mf_dir</c>, <c>error_logger_mf_maxbytes</c>
@@ -109,18 +108,18 @@
       <item>
         <p>Specifies in which directory the files are stored. If this
           parameter is undefined or <c>false</c>,
-          the <c>error_logger_mf_h</c> is not installed.</p>
+          the <c>log_mf_h</c> handler is not installed.</p>
       </item>
       <tag><c><![CDATA[error_logger_mf_maxbytes = integer() <optional>]]></c></tag>
       <item>
         <p>Specifies how large each individual file can be. If this
-          parameter is undefined, the <c>error_logger_mf_h</c> is not
+          parameter is undefined, the <c>log_mf_h</c> handler is not
           installed.</p>
       </item>
       <tag><c><![CDATA[error_logger_mf_maxfiles = 0<integer()<256 <optional>]]></c></tag>
       <item>
         <p>Specifies how many files are used. If this parameter is
-          undefined, the <c>error_logger_mf_h</c> is not installed.</p>
+          undefined, the <c>log_mf_h</c> handler is not installed.</p>
       </item>
       <tag><c><![CDATA[overload_max_intensity = float() > 0 <optional>]]></c></tag>
       <item>
diff --git a/lib/sasl/doc/src/sasl_intro.xml b/lib/sasl/doc/src/sasl_intro.xml
index 535f25e044..f3d4632218 100644
--- a/lib/sasl/doc/src/sasl_intro.xml
+++ b/lib/sasl/doc/src/sasl_intro.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/script.xml b/lib/sasl/doc/src/script.xml
index 17cc64f08e..3a85e64e7a 100644
--- a/lib/sasl/doc/src/script.xml
+++ b/lib/sasl/doc/src/script.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fileref SYSTEM "fileref.dtd">
 
 <fileref>
   <header>
     <copyright>
       <year>1997</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index 84fed0a25f..e8076c6752 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -139,7 +139,7 @@
       <type>
         <v>Name = string()</v>
         <v>Opt = src_tests | {path,[Dir]} | local | {variables,[Var]} | exref |
-	  {exref,[App]}] | silent | {outdir,Dir} | no_warn_sasl |
+	  {exref,[App]}] | silent | {outdir,Dir} | no_dot_erlang | no_warn_sasl |
 	  warnings_as_errors</v>
         <v>&nbsp;Dir = string()</v>
         <v>&nbsp;Var = {VarName,Prefix}</v>
@@ -252,6 +252,8 @@
           <c>Module:format_error(Error)</c>.</p>
 	<p>If the option <c>warnings_as_errors</c> is provided, warnings
 	   are treated as errors.</p>
+	<p>If the option <c>no_dot_erlang</c> is provided, the instruction to
+	   load the <c>.erlang</c> file during boot is <em>NOT</em> included.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/sasl/examples/src/target_system.erl b/lib/sasl/examples/src/target_system.erl
index ffc0fcf443..fb9e9aaaaf 100644
--- a/lib/sasl/examples/src/target_system.erl
+++ b/lib/sasl/examples/src/target_system.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The 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,9 +34,9 @@ create(RelFileName,SystoolsOpts) ->
     Dir = filename:dirname(RelFileName),
     PlainRelFileName = filename:join(Dir,"plain"),
     PlainRelFile = PlainRelFileName ++ ".rel",
-    io:fwrite("Reading file: ~p ...~n", [RelFile]),
+    io:fwrite("Reading file: ~tp ...~n", [RelFile]),
     {ok, [RelSpec]} = file:consult(RelFile),
-    io:fwrite("Creating file: ~p from ~p ...~n", 
+    io:fwrite("Creating file: ~tp from ~tp ...~n",
               [PlainRelFile, RelFile]),
     {release,
      {RelName, RelVsn},
@@ -57,41 +57,41 @@ create(RelFileName,SystoolsOpts) ->
     io:fwrite(Fd, "~p.~n", [PlainRelSpec]),
     file:close(Fd),
 
-    io:fwrite("Making \"~s.script\" and \"~s.boot\" files ...~n",
+    io:fwrite("Making \"~ts.script\" and \"~ts.boot\" files ...~n",
 	      [PlainRelFileName,PlainRelFileName]),
     make_script(PlainRelFileName,SystoolsOpts),
 
-    io:fwrite("Making \"~s.script\" and \"~s.boot\" files ...~n", 
+    io:fwrite("Making \"~ts.script\" and \"~ts.boot\" files ...~n",
               [RelFileName, RelFileName]),
     make_script(RelFileName,SystoolsOpts),
 
     TarFileName = filename:join(Dir,RelFileName ++ ".tar.gz"),
-    io:fwrite("Creating tar file ~p ...~n", [TarFileName]),
+    io:fwrite("Creating tar file ~tp ...~n", [TarFileName]),
     make_tar(RelFileName,SystoolsOpts),
 
     TmpDir = filename:join(Dir,"tmp"),
-    io:fwrite("Creating directory ~p ...~n",[TmpDir]),
+    io:fwrite("Creating directory ~tp ...~n",[TmpDir]),
     file:make_dir(TmpDir), 
 
-    io:fwrite("Extracting ~p into directory ~p ...~n", [TarFileName,TmpDir]),
+    io:fwrite("Extracting ~tp into directory ~tp ...~n", [TarFileName,TmpDir]),
     extract_tar(TarFileName, TmpDir),
 
     TmpBinDir = filename:join([TmpDir, "bin"]),
     ErtsBinDir = filename:join([TmpDir, "erts-" ++ ErtsVsn, "bin"]),
-    io:fwrite("Deleting \"erl\" and \"start\" in directory ~p ...~n", 
+    io:fwrite("Deleting \"erl\" and \"start\" in directory ~tp ...~n",
               [ErtsBinDir]),
     file:delete(filename:join([ErtsBinDir, "erl"])),
     file:delete(filename:join([ErtsBinDir, "start"])),
 
-    io:fwrite("Creating temporary directory ~p ...~n", [TmpBinDir]),
+    io:fwrite("Creating temporary directory ~tp ...~n", [TmpBinDir]),
     file:make_dir(TmpBinDir),
 
-    io:fwrite("Copying file \"~s.boot\" to ~p ...~n", 
+    io:fwrite("Copying file \"~ts.boot\" to ~tp ...~n",
               [PlainRelFileName, filename:join([TmpBinDir, "start.boot"])]),
     copy_file(PlainRelFileName++".boot",filename:join([TmpBinDir, "start.boot"])),
 
     io:fwrite("Copying files \"epmd\", \"run_erl\" and \"to_erl\" from \n"
-              "~p to ~p ...~n", 
+              "~tp to ~tp ...~n",
               [ErtsBinDir, TmpBinDir]),
     copy_file(filename:join([ErtsBinDir, "epmd"]), 
               filename:join([TmpBinDir, "epmd"]), [preserve]),
@@ -101,11 +101,11 @@ create(RelFileName,SystoolsOpts) ->
               filename:join([TmpBinDir, "to_erl"]), [preserve]),
 
     StartErlDataFile = filename:join([TmpDir, "releases", "start_erl.data"]),
-    io:fwrite("Creating ~p ...~n", [StartErlDataFile]),
+    io:fwrite("Creating ~tp ...~n", [StartErlDataFile]),
     StartErlData = io_lib:fwrite("~s ~s~n", [ErtsVsn, RelVsn]),
     write_file(StartErlDataFile, StartErlData),
     
-    io:fwrite("Recreating tar file ~p from contents in directory ~p ...~n", 
+    io:fwrite("Recreating tar file ~tp from contents in directory ~tp ...~n",
 	      [TarFileName,TmpDir]),
     {ok, Tar} = erl_tar:open(TarFileName, [write, compressed]),
     %% {ok, Cwd} = file:get_cwd(),
@@ -117,14 +117,14 @@ create(RelFileName,SystoolsOpts) ->
     erl_tar:add(Tar, filename:join(TmpDir,"lib"), "lib", []),
     erl_tar:close(Tar),
     %% file:set_cwd(Cwd),
-    io:fwrite("Removing directory ~p ...~n",[TmpDir]),
+    io:fwrite("Removing directory ~tp ...~n",[TmpDir]),
     remove_dir_tree(TmpDir),
     ok.
 
 
 install(RelFileName, RootDir) ->
     TarFile = RelFileName ++ ".tar.gz", 
-    io:fwrite("Extracting ~p ...~n", [TarFile]),
+    io:fwrite("Extracting ~tp ...~n", [TarFile]),
     extract_tar(TarFile, RootDir),
     StartErlDataFile = filename:join([RootDir, "releases", "start_erl.data"]),
     {ok, StartErlData} = read_txt_file(StartErlDataFile),
@@ -235,8 +235,9 @@ copy_file(Src, Dest, Opts) ->
     end.
        
 write_file(FName, Conts) ->
+    Enc = file:native_name_encoding(),
     {ok, Fd} = file:open(FName, [write]),
-    file:write(Fd, Conts),
+    file:write(Fd, unicode:characters_to_binary(Conts,Enc,Enc)),
     file:close(Fd).
 
 read_txt_file(File) ->
diff --git a/lib/sasl/src/erlsrv.erl b/lib/sasl/src/erlsrv.erl
index 086dc7c651..0d931f1779 100644
--- a/lib/sasl/src/erlsrv.erl
+++ b/lib/sasl/src/erlsrv.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %% 
 %% The 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 @@ current_version() ->
 run_erlsrv(Command) ->
     run_erlsrv(current_version(),Command).
 run_erlsrv(EVer, Command) ->
-    case catch(open_port({spawn, erlsrv(EVer) ++ " " ++ Command}, 
+    case catch(open_port({spawn, "\"" ++ erlsrv(EVer) ++ "\" " ++ Command},
 			 [{line,1000}, in, eof])) of
 	{'EXIT',{Reason,_}} ->
 	    {port_error, Reason};
@@ -53,7 +53,7 @@ run_erlsrv(EVer, Command) ->
     end.
 
 run_erlsrv_interactive(EVer, Commands) ->
-    case catch(open_port({spawn, erlsrv(EVer) ++ " readargs"}, 
+    case catch(open_port({spawn, "\""++ erlsrv(EVer) ++ "\" readargs"},
 			 [{line,1000}, eof])) of
 	{'EXIT',{Reason,_}} ->
 	    {port_error, Reason};
@@ -71,11 +71,14 @@ write_all_data(Port,[]) ->
     Port ! {self(), {command, io_lib:nl()}},
     ok;
 write_all_data(Port,[H|T]) ->
-    Port ! {self(), {command, H ++ io_lib:nl()}},
+    Port ! {self(), {command, unicode:characters_to_binary([H,io_lib:nl()])}},
     write_all_data(Port,T).
 
 read_all_data(Port) ->
-	lists:reverse(read_all_data(Port,[],[])).
+    Data0 = lists:reverse(read_all_data(Port,[],[])),
+    %% Convert from utf8 to a list of chars
+    [unicode:characters_to_list(list_to_binary(Data)) || Data <- Data0].
+
 read_all_data(Port,Line,Lines) ->
     receive
 	{Port, {data, {noeol,Data}}} ->
@@ -178,7 +181,7 @@ get_service(EVer, ServiceName) ->
 				[]
 			end
 		end,
-	    %%% First split by Env:
+            %%% First split by Env:
 	    {Before, After} = split_by_env(Data),
 	    FirstPass = lists:flatten(lists:map(F,Before)),
 	    %%% If the arguments are there, split them to
diff --git a/lib/sasl/src/format_lib_supp.erl b/lib/sasl/src/format_lib_supp.erl
index af15fd3288..5348bc6d59 100644
--- a/lib/sasl/src/format_lib_supp.erl
+++ b/lib/sasl/src/format_lib_supp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,7 +77,7 @@ print_format(Device, Line, [{data, Data}|T]) ->
     print_data(Device, Line, Data),
     print_format(Device, Line, T);
 print_format(Device, Line, [{table, Table}|T]) ->
-    print_table(Device, Line, Table),
+    _ = print_table(Device, Line, Table),
     print_format(Device, Line, T);
 print_format(Device, Line, [{items, Items}|T]) ->
     print_items(Device, Line, Items),
diff --git a/lib/sasl/src/overload.erl b/lib/sasl/src/overload.erl
index 97f7bebe00..736423484a 100644
--- a/lib/sasl/src/overload.erl
+++ b/lib/sasl/src/overload.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The 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/sasl/src/rb.erl b/lib/sasl/src/rb.erl
index 8004ef2c5a..65011af568 100644
--- a/lib/sasl/src/rb.erl
+++ b/lib/sasl/src/rb.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The 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,7 @@
 
 %% External exports
 -export([start/0, start/1, stop/0, rescan/0, rescan/1]).
--export([list/0, list/1, show/0, show/1, grep/1, filter/1, filter/2, start_log/1, stop_log/0]).
+-export([list/0, list/1, log_list/0, log_list/1, show/0, show/1, grep/1, filter/1, filter/2, start_log/1, stop_log/0]).
 -export([h/0, help/0]).
 
 %% Internal exports
@@ -62,6 +62,9 @@ rescan(Options) ->
 list() -> list(all).
 list(Type) -> call({list, Type}).
 
+log_list() -> log_list(all).
+log_list(Type) -> call({log_list, Type}).
+
 show() -> 
     call(show).
 
@@ -93,6 +96,8 @@ help() ->
     io:format("rb:help()          - print this help~n"),
     io:format("rb:list()          - list all reports~n"),
     io:format("rb:list(Type)      - list all reports of type Type~n"),
+    io:format("rb:log_list()      - log list of all reports~n"),
+    io:format("rb:log_list(Type)  - log list of all reports of type Type~n"),
     io:format("      currently supported types are:~n"),
     print_types(),
     io:format("rb:grep(RegExp)      - print reports containing RegExp.~n"),
@@ -113,7 +118,7 @@ help() ->
     io:format("rb:show(Number)    - print report no Number~n"),
     io:format("rb:show(Type)      - print all reports of type Type~n"),
     io:format("rb:show()          - print all reports~n"),
-    io:format("rb:start_log(File) - redirect all reports to file~n"),
+    io:format("rb:start_log(File) - redirect all reports to file or io_device~n"),
     io:format("rb:stop_log()      - close the log file and redirect to~n"),
     io:format("                     standard_io~n"),
     io:format("rb:stop            - stop the rb_server~n").
@@ -207,7 +212,10 @@ handle_call({rescan, Options}, _From, State) ->
 handle_call(_, _From, #state{data = undefined}) ->
     {reply, {error, no_data}, #state{}};
 handle_call({list, Type}, _From, State) ->
-    print_list(State#state.data, Type),
+    print_list(standard_io, State#state.data, Type),
+    {reply, ok, State};
+handle_call({log_list, Type}, _From, State) ->
+    print_list(State#state.device, State#state.data, Type),
     {reply, ok, State};
 handle_call({start_log, FileName}, _From, State) ->
     NewDevice = open_log_file(FileName),
@@ -262,7 +270,16 @@ code_change(_OldVsn, State, _Extra) ->
 %% Returns: A Device for later use in call to io:format
 %%-----------------------------------------------------------------
 open_log_file(standard_io) -> standard_io;
-open_log_file(FileName) ->
+open_log_file(Fd) when is_atom(Fd),Fd=/=standard_error -> 
+    case whereis(Fd) of
+	undefined -> io:format("rb: Registered name not found '~s'.~n",
+		      [Fd]),
+	             io:format("rb: Using standard_io~n"),
+                     open_log_file(standard_io);
+	Pid       -> open_log_file(Pid)	
+    end;
+open_log_file(Fd) when is_pid(Fd)-> Fd;
+open_log_file(FileName) when is_list(FileName) ->
     case file:open(FileName, [write,append]) of
 	{ok, Fd} -> Fd;
 	Error -> 
@@ -270,7 +287,10 @@ open_log_file(FileName) ->
 		      [FileName, Error]),
 	    io:format("rb: Using standard_io~n"),
 	    standard_io
-    end.
+    end;
+open_log_file(standard_error) -> 
+	    io:format("rb: Using standard_io~n"),
+	    standard_io.
 
 close_device(Fd) when is_pid(Fd) ->
     catch file:close(Fd);
@@ -309,11 +329,11 @@ scan_files(RptDir, Max, Type) ->
 	{ok, Fd} ->
 	    case catch file:read(Fd, 1) of
 		{ok, [LastWritten]} -> 
-		    file:close(Fd),
+		    ok = file:close(Fd),
 		    Files = make_file_list(RptDir, LastWritten),
 		    scan_files(RptDir, Files, Max, Type);		
 		_X ->
-		    file:close(Fd),
+		    _ = file:close(Fd),
 		    exit("cannot read the index file")
 	    end;
 	_X -> exit("cannot read the index file")
@@ -386,7 +406,7 @@ read_reports(No, Fd, Fname, Max, Type) ->
     io:format("rb: reading report..."),
     case catch read_reports(Fd, [], Type) of
 	{ok, Res} -> 
-	    file:close(Fd),
+	    ok = file:close(Fd),
 	    io:format("done.~n"),
 	    NewRes = 
 		if
@@ -397,7 +417,7 @@ read_reports(No, Fd, Fname, Max, Type) ->
 		end,
 	    add_report_data(NewRes, No, Fname);
 	{error, [Problem | Res]} ->
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    io:format("Error: ~p~n",[Problem]),
 	    io:format("Salvaged ~p entries from corrupt report file ~s...~n",
 		      [length(Res),Fname]),
@@ -550,18 +570,18 @@ local_time_to_universal_time({Date,Time}) ->
     end.
 
 
-print_list(Data, Type) ->
+print_list(Fd, Data, Type) ->
     Header = {"No", "Type", "Process", "Date     Time"},
     Width = find_width([Header | Data], 0)+1,
     DateWidth = find_date_width([Header | Data], 0) +1,
     Format = lists:concat(["~4s~20s ~", Width, "s~20s~n"]),
-    io:format(Format, tuple_to_list(Header)),
-    io:format(Format, ["==", "====", "=======", "====     ===="]),
-    print_list(Data, Type, Width, DateWidth).
-print_list([], _, _, _) -> true;
-print_list([H|T], Type, Width, DateWidth) ->
-    print_one_report(H, Type, Width, DateWidth),
-    print_list(T, Type, Width, DateWidth).
+    io:format(Fd, Format, tuple_to_list(Header)),
+    io:format(Fd, Format, ["==", "====", "=======", "====     ===="]),
+    print_list(Fd, Data, Type, Width, DateWidth).
+print_list(_, [], _, _, _) -> true;
+print_list(Fd, [H|T], Type, Width, DateWidth) ->
+    print_one_report(Fd, H, Type, Width, DateWidth),
+    print_list(Fd, T, Type, Width, DateWidth).
 
 find_width([], Width) -> Width;
 find_width([H|T], Width) ->
@@ -578,22 +598,22 @@ find_date_width([H|T], Width) ->
 	true -> find_date_width(T, Width)
     end.
 
-print_one_report({No, RealType, ShortDescr, Date, _Fname, _FilePos},
+print_one_report(Fd, {No, RealType, ShortDescr, Date, _Fname, _FilePos},
 		 WantedType,
 		 Width, DateWidth) ->
     if
 	WantedType == all ->
-	    print_short_descr(No, RealType, ShortDescr, Date, Width, 
+	    print_short_descr(Fd, No, RealType, ShortDescr, Date, Width, 
 			      DateWidth);
 	WantedType == RealType ->
-	    print_short_descr(No, RealType, ShortDescr, Date, Width, 
+	    print_short_descr(Fd, No, RealType, ShortDescr, Date, Width, 
 			      DateWidth);
 	true -> ok
     end.
 
-print_short_descr(No, Type, ShortDescr, Date, Width, DateWidth) ->
+print_short_descr(Fd, No, Type, ShortDescr, Date, Width, DateWidth) ->
     Format = lists:concat(["~4w~20w ~", Width, "s~", DateWidth,"s~n"]),
-    io:format(Format, [No,
+    io:format(Fd, Format, [No,
 		       Type, 
 		       io_lib:format("~s", [ShortDescr]),
 		       Date]).
@@ -898,7 +918,7 @@ handle_bad_form(Date, Msg, Device, Abort, Log) ->
     end.
 
 read_rep_msg(Fd, FilePosition) ->
-    file:position(Fd, {bof, FilePosition}),
+    {ok,_} = file:position(Fd, {bof, FilePosition}),
     Res = 
 	case catch read_report(Fd) of
 	    {ok, Report} ->
@@ -906,5 +926,5 @@ read_rep_msg(Fd, FilePosition) ->
 		{Date, Report};
 	    _ -> error
 	end,
-    file:close(Fd),
+    ok = file:close(Fd),
     Res.
diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index c1b715b970..ccd84f0c37 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -585,11 +585,9 @@ init([]) ->
 
 handle_call({unpack_release, ReleaseName}, _From, S)
   when S#state.masters == false ->
-    RelDir = S#state.rel_dir,
-    case catch do_unpack_release(S#state.root, RelDir,
+    case catch do_unpack_release(S#state.root, S#state.rel_dir,
 				 ReleaseName, S#state.releases) of
 	{ok, NewReleases, Vsn} -> 
-	    clean_release(RelDir, ReleaseName),
 	    {reply, {ok, Vsn}, S#state{releases = NewReleases}};
 	{error, Reason}   ->
 	    {reply, {error, Reason}, S}; 
@@ -739,7 +737,7 @@ mk_lib_name([]) -> [].
 handle_info(timeout, S) ->
     case soft_purge(S#state.unpurged) of
 	[] ->
-	    timer:cancel(S#state.timer),
+	    _ = timer:cancel(S#state.timer),
 	    {noreply, S#state{unpurged = [], timer = undefined}};
 	Unpurged ->
 	    {noreply, S#state{unpurged = Unpurged}}
@@ -850,15 +848,11 @@ do_unpack_release(Root, RelDir, ReleaseName, Releases) ->
     Dir = filename:join([RelDir, Vsn]),
     copy_file(RelFile, Dir, false),
 
-    {ok, NewReleases, Vsn}.
+    %% Clean release
+    _ = file:delete(Tar),
+    _ = file:delete(RelFile),
 
-%% Note that this function is not executed by a client
-%% release_handler.
-clean_release(RelDir, ReleaseName) ->
-    Tar = filename:join(RelDir, ReleaseName ++ ".tar.gz"),
-    Rel = filename:join(RelDir, ReleaseName ++ ".rel"),
-    file:delete(Tar),
-    file:delete(Rel).
+    {ok, NewReleases, Vsn}.
    
 check_rel(Root, RelFile, Masters) ->
     check_rel(Root, RelFile, [], Masters).
@@ -1108,7 +1102,7 @@ new_emulator_make_hybrid_boot(CurrentVsn,ToVsn,TmpVsn,BaseLibs,RelDir,Opts,Maste
     Args = [ToVsn,Opts],
     {ok,FromBoot} = read_file(FromBootFile,Masters),
     {ok,ToBoot} = read_file(ToBootFile,Masters),
-    {{_,_,KernelPath},{_,_,SaslPath},{_,_,StdlibPath}} = BaseLibs,
+    {{_,_,KernelPath},{_,_,StdlibPath},{_,_,SaslPath}} = BaseLibs,
     Paths = {filename:join(KernelPath,"ebin"),
 	     filename:join(StdlibPath,"ebin"),
 	     filename:join(SaslPath,"ebin")},
@@ -1184,7 +1178,8 @@ rename_tmp_service(EVsn,TmpVsn,NewVsn) ->
 	{error, _Error} ->
 	    ok;
 	_Data ->
-	    erlsrv:remove_service(ToName)
+	    {ok,_} = erlsrv:remove_service(ToName),
+	    ok
     end,
     rename_service(EVsn,FromName,ToName).
 
@@ -1237,13 +1232,12 @@ do_make_services_permanent(PermanentVsn,Vsn, PermanentEVsn, EVsn) ->
 	    UpdData = erlsrv:new_service(Name, Data, []),
 	    case erlsrv:store_service(EVsn,UpdData) of
 		ok ->
-		    erlsrv:disable_service(PermanentEVsn, PermName),
-		    erlsrv:enable_service(EVsn, Name),
-		    erlsrv:remove_service(PermName),
+		    {ok,_} = erlsrv:disable_service(PermanentEVsn, PermName),
+		    {ok,_} = erlsrv:enable_service(EVsn, Name),
+		    {ok,_} = erlsrv:remove_service(PermName),
 		    %%% Read comments about these above...
 		    os:putenv("ERLSRV_SERVICE_NAME", Name),
-		    heart:cycle(),
-		    ok;
+		    ok = heart:cycle();
 		Error4 ->
 		    throw(Error4)
 	    end
@@ -1288,7 +1282,7 @@ do_make_permanent(#state{releases = Releases,
 		_ ->
 		    ok
 	    end,
-	    init:make_permanent(filename:join(Dir, "start"), Sys),
+	    ok = init:make_permanent(filename:join(Dir, "start"), Sys),
 	    {ok, NewReleases, brutal_purge(Unpurged)};
 	{value, #release{status = permanent}} ->
 	    {ok, Releases, Unpurged};
@@ -1309,13 +1303,13 @@ do_back_service(OldVersion, CurrentVersion,OldEVsn,CurrentEVsn) ->
 		  Data ->
 		      erlsrv:new_service(OldName, Data, [])
 	      end,
-    case erlsrv:store_service(OldEVsn,UpdData) of
-	ok ->
-	    erlsrv:disable_service(CurrentEVsn,CurrentName),
-	    erlsrv:enable_service(OldEVsn,OldName);
-	Error2 ->
-	    throw(Error2)
-    end,
+    _ = case erlsrv:store_service(OldEVsn,UpdData) of
+	    ok ->
+		{ok,_} = erlsrv:disable_service(CurrentEVsn,CurrentName),
+		{ok,_} = erlsrv:enable_service(OldEVsn,OldName);
+	    Error2 ->
+		throw(Error2)
+	end,
     OldErlSrv = filename:nativename(erlsrv:erlsrv(OldEVsn)),
     CurrentErlSrv = filename:nativename(erlsrv:erlsrv(CurrentEVsn)),
     case heart:set_cmd(CurrentErlSrv ++ " remove " ++ CurrentName ++ 
@@ -1386,10 +1380,18 @@ set_permanent_files(RelDir, _EVsn, Vsn, Masters, _Static) ->
 
 
 do_remove_service(Vsn) ->
-    %%% Very unconditionally remove the service.
+    %% Very unconditionally remove the service.
+    %% Note that the service could already have been removed when
+    %% making another release permanent.
     ServiceName = hd(string:tokens(atom_to_list(node()),"@")) 
 	++ "_" ++ Vsn,
-    erlsrv:remove_service(ServiceName).
+    case erlsrv:get_service(ServiceName) of
+	{error, _Error} ->
+	    ok;
+	_Data ->
+	    {ok,_} = erlsrv:remove_service(ServiceName),
+	    ok
+    end.
 
 do_remove_release(Root, RelDir, Vsn, Releases) ->
     % Decide which libs should be removed
@@ -1603,8 +1605,7 @@ do_write_file(File, Str, FileOpts) ->
     case file:open(File, [write | FileOpts]) of
 	{ok, Fd} ->
 	    io:put_chars(Fd, Str),
-	    file:close(Fd),
-	    ok;
+	    ok = file:close(Fd);
 	{error, Reason} ->
 	    {error, {Reason, File}}
     end.
@@ -1651,9 +1652,9 @@ get_appls([], Res) ->
 
 
 mon_nodes(true) ->
-    net_kernel:monitor_nodes(true);
+    ok = net_kernel:monitor_nodes(true);
 mon_nodes(false) ->
-    net_kernel:monitor_nodes(false),
+    ok = net_kernel:monitor_nodes(false),
     flush().
 
 flush() ->
@@ -1691,7 +1692,7 @@ prepare_restart_nt(#release{erts_vsn = EVsn, vsn = Vsn},
 	{error, _} = Error2 ->
 	    throw(Error2);
 	_X ->
-	    erlsrv:disable_service(EVsn, FutureServiceName),
+	    {ok,_} = erlsrv:disable_service(EVsn, FutureServiceName),
 	    ErlSrv = filename:nativename(erlsrv:erlsrv(EVsn)),
 	    StartDisabled = ErlSrv ++ " start_disabled " ++ FutureServiceName,
 	    case heart:set_cmd(StartDisabled) of
@@ -1877,8 +1878,7 @@ do_write_release(Dir, RELEASES, NewReleases) ->
     case file:open(filename:join(Dir, RELEASES), [write]) of
 	{ok, Fd} ->
 	    ok = io:format(Fd, "~p.~n", [NewReleases]),
-	    file:close(Fd),
-	    ok;
+	    ok = file:close(Fd);
 	{error, Reason} ->
 	    {error, Reason}
     end.
@@ -2010,7 +2010,7 @@ do_rename_files([]) ->
 %% Remove a list of files. Ignore failure.
 %%-----------------------------------------------------------------
 do_remove_files([File|Files]) ->
-    file:delete(File),
+    _ = file:delete(File),
     do_remove_files(Files);
 do_remove_files([]) ->
     ok.
@@ -2030,7 +2030,8 @@ do_ensure_RELEASES(RelFile) ->
 %% Make a directory, ignore failures (captured later).
 %%-----------------------------------------------------------------
 make_dir(Dir, false) ->
-    file:make_dir(Dir);
+    _ = file:make_dir(Dir),
+    ok;
 make_dir(Dir, Masters) ->
     lists:foreach(fun(Master) -> rpc:call(Master, file, make_dir, [Dir]) end,
 		  Masters).
@@ -2062,12 +2063,12 @@ at_all_masters([], _, _, _) ->
 %% Ignore {M,F,A} return value.
 %%-----------------------------------------------------------------
 takewhile(Master, Masters, M, F, A) ->
-    lists:takewhile(fun(Ma) when Ma == Master ->
-			    false;
-		       (Ma) ->
-			    rpc:call(Ma, M, F, A),
-			    true
-		    end, Masters),
+    _ = lists:takewhile(fun(Ma) when Ma == Master ->
+				false;
+			   (Ma) ->
+				rpc:call(Ma, M, F, A),
+				true
+			end, Masters),
     ok.
 
 consult(File, false)   -> file:consult(File);
@@ -2205,23 +2206,23 @@ set_static_files(SrcDir, DestDir, Masters) ->
 write_ini_file(RootDir,EVsn,Masters) ->
    BinDir = filename:join([RootDir,"erts-"++EVsn,"bin"]),
    Str0 = io_lib:format("[erlang]~n"
-                        "Bindir=~s~n"
+                        "Bindir=~ts~n"
                         "Progname=erl~n"
-                        "Rootdir=~s~n",
+                        "Rootdir=~ts~n",
 		        [filename:nativename(BinDir),
 		         filename:nativename(RootDir)]),
-   Str = re:replace(Str0,"\\\\","\\\\\\\\",[{return,list},global]),
+   Str = re:replace(Str0,"\\\\","\\\\\\\\",[{return,list},global,unicode]),
    IniFile = filename:join(BinDir,"erl.ini"),
    do_write_ini_file(IniFile,Str,Masters).
 
 do_write_ini_file(File,Data,false) ->
-    case do_write_file(File, Data) of
+    case do_write_file(File, Data, [{encoding,utf8}]) of
 	ok    -> ok;
 	Error -> throw(Error)
     end;
 do_write_ini_file(File,Data,Masters) ->
     all_masters(Masters),
-    safe_write_file_m(File, Data, Masters).
+    safe_write_file_m(File, Data, [{encoding,utf8}], Masters).
 
 
 %%-----------------------------------------------------------------
@@ -2235,13 +2236,15 @@ do_write_ini_file(File,Data,Masters) ->
 %% (as long as possible), except for 4 which is allowed to fail.
 %%-----------------------------------------------------------------
 safe_write_file_m(File, Data, Masters) ->
+    safe_write_file_m(File, Data, [], Masters).
+safe_write_file_m(File, Data, FileOpts, Masters) ->
     Backup = File ++ ".backup",
     Change = File ++ ".change",
     case at_all_masters(Masters, ?MODULE, do_copy_files,
 			[File, [Backup]]) of
 	ok ->
 	    case at_all_masters(Masters, ?MODULE, do_write_file,
-				[Change, Data]) of
+				[Change, Data, FileOpts]) of
 		ok ->
 		    case at_all_masters(Masters, file, rename,
 					[Change, File]) of
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index b37ae2f944..fa6ef77b2d 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -349,7 +349,7 @@ eval({load, {Mod, _PrePurgeMethod, PostPurgeMethod}}, EvalState) ->
     {value, {_Mod, Bin, File}} = lists:keysearch(Mod, 1, Bins),
     % load_binary kills all procs running old code
     % if soft_purge, we know that there are no such procs now
-    code:load_binary(Mod, File, Bin),
+    {module,_} = code:load_binary(Mod, File, Bin),
     % Now, the prev current is old.  There might be procs
     % running it.  Find them.
     Unpurged = do_soft_purge(Mod,PostPurgeMethod,EvalState#eval_state.unpurged),
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index a4a38ee40a..e789853eea 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The 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,14 +16,10 @@
 %%
 %% %CopyrightEnd%
 {"%VSN%",
- %% Up from - max two major revisions back
- [{<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
-  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R15
-  {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]},    %% R14B04
-  {<<"2\\.1\\.9\\.[24](\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14B-R14B03
- %% Down to - max two major revisions back
- [{<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
-  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R15
-  {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]},    %% R14B04
-  {<<"2\\.1\\.9\\.[24](\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14B-R14B03
+ %% Up from - max one major revision back
+ [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R17
+  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}],        %% R16
+ %% Down to - max one major revision back
+ [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R17
+  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}]         %% R16
 }.
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 989f99dc82..fdea6da13e 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -82,8 +82,8 @@ get_mf() ->
     MaxB = get_mf_maxb(),
     MaxF = get_mf_maxf(),
     case {Dir, MaxB, MaxF} of
-	{undefined,undefined,undefined} = R ->
-	    R;
+	{undefined,undefined,undefined} ->
+	    undefined;
 	{undefined,_,_} ->
 	    exit({missing_config, {sasl, error_logger_mf_dir}});
 	{_,undefined,_} ->
diff --git a/lib/sasl/src/sasl_report_file_h.erl b/lib/sasl/src/sasl_report_file_h.erl
index f4810d31cc..f42b4b5ff2 100644
--- a/lib/sasl/src/sasl_report_file_h.erl
+++ b/lib/sasl/src/sasl_report_file_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,7 @@ init({File, Type}) ->
 handle_event({_Type, GL, _Msg}, State) when node(GL) /= node() ->
     {ok, State};
 handle_event(Event, {Fd, File, Type}) ->
-    sasl_report:write_report(Fd, Type, tag_event(Event)),
+    _ = sasl_report:write_report(Fd, Type, tag_event(Event)),
     {ok, {Fd, File, Type}};
 handle_event(_, State) ->
     {ok, State}.
@@ -53,7 +53,7 @@ handle_info(_, State) ->
 handle_call(_Query, _State) -> {error, bad_query}.
 
 terminate(_, {Fd, _File, _Type}) ->
-    file:close(Fd),
+    _ = file:close(Fd),
     [].
 
 tag_event(Event) ->    
diff --git a/lib/sasl/src/sasl_report_tty_h.erl b/lib/sasl/src/sasl_report_tty_h.erl
index 064f0471f2..8d63428aeb 100644
--- a/lib/sasl/src/sasl_report_tty_h.erl
+++ b/lib/sasl/src/sasl_report_tty_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,7 +35,7 @@ init(Type) ->
 handle_event({Type, GL, _Msg}, Type) when node(GL) /= node() ->
     {ok, Type};
 handle_event(Event, Type) ->
-    sasl_report:write_report(standard_io, Type, tag_event(Event)),
+    _ = sasl_report:write_report(standard_io, Type, tag_event(Event)),
     {ok, Type}.
 
 handle_info(_, Type) -> {ok, Type}.
diff --git a/lib/sasl/src/si.erl b/lib/sasl/src/si.erl
index eeed7a9f55..e2f6d95e58 100644
--- a/lib/sasl/src/si.erl
+++ b/lib/sasl/src/si.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -135,7 +135,7 @@ pi_impl(Opt, XPid) ->
 		{status_info, Pid, {module, Module}, Data} ->
 		    si_sasl_supp:do_best_printout(Opt, Pid, Module, Data);
 		{error, Reason} ->
-		    si_sasl_supp:ppi_impl(Pid),
+		    _ = si_sasl_supp:ppi_impl(Pid),
 		    {error, {"can not get status info from process:",
 			     XPid,
 			     Reason}};
diff --git a/lib/sasl/src/si_sasl_supp.erl b/lib/sasl/src/si_sasl_supp.erl
index c4fc0c5f08..12b2557cd6 100644
--- a/lib/sasl/src/si_sasl_supp.erl
+++ b/lib/sasl/src/si_sasl_supp.erl
@@ -162,7 +162,7 @@ handle_call(stop, _From, State) ->
     {stop, normal, stopped, State}.
 
 terminate(_Reason, _State) ->
-    close_device(get(device)),
+    _ = close_device(get(device)),
     ok.
 
 handle_cast(_Msg, State) ->
@@ -190,7 +190,7 @@ open_log_file(undefined, NewFile) ->
 open_log_file(standard_io, NewFile) ->
     open_log_file(NewFile);
 open_log_file(OldFile, NewFile) ->
-    file:close(OldFile),
+    _ = file:close(OldFile),
     open_log_file(NewFile).
 
 open_log_file(standard_io) -> standard_io;
@@ -317,7 +317,7 @@ pi_impl(Opt, XPid) ->
 		{status_info, Pid, {module, Module}, Data} ->
 		    do_best_printout(Opt, Pid, Module, Data);
 		{error, Reason} ->
-		    ppi_impl(Pid),
+		    _ = ppi_impl(Pid),
 		    {error, {"can not get status info from process:",
 			     XPid,
 			     Reason}}
@@ -335,7 +335,7 @@ do_best_printout(Opt, Pid, Mod, Data) when is_pid(Pid) ->
     case print_info(get(device), Pid, {Mod, format_status}, Opt, Data) of
 	ok -> ok;
 	{error, Reason} ->
-	    ppi_impl(Pid),
+	    _ = ppi_impl(Pid),
 	    {error, Reason}
     end.
 
diff --git a/lib/sasl/src/systools_lib.erl b/lib/sasl/src/systools_lib.erl
index 6618baa2aa..0a96f2bd48 100644
--- a/lib/sasl/src/systools_lib.erl
+++ b/lib/sasl/src/systools_lib.erl
@@ -34,8 +34,10 @@
 file_term2binary(FileIn, FileOut) ->
     case read_term(FileIn) of
 	{ok, Term} ->
-	    file:write_file(FileOut, term_to_binary(Term)),
-	    ok;
+	    case file:write_file(FileOut, term_to_binary(Term)) of
+		ok -> ok;
+		{error,Error} -> {error,{open,FileOut,Error}}
+	    end;
 	Other ->
 	    Other
     end.
@@ -51,8 +53,10 @@ read_term(File) ->
     case file:open(File, [read]) of
 	{ok, Stream} ->
 	    Res = read_term_from_stream(Stream, File),
-	    file:close(Stream),
-	    Res;
+	    case file:close(Stream) of
+		ok -> Res;
+		{error,Error} -> {error,{close,File,Error}}
+	    end;
 	{error, Error} ->
 	    {error, {open,File,Error}}
     end.
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index b2e95fdbee..3d370a93a5 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -406,9 +406,9 @@ check_rel(Release) ->
     end.
 
 check_rel1({release,{Name,Vsn},{erts,EVsn},Appl}) when is_list(Appl) ->
-    check_name(Name),
-    check_vsn(Vsn),
-    check_evsn(EVsn),
+    Name = check_name(Name),
+    Vsn = check_vsn(Vsn),
+    EVsn = check_evsn(EVsn),
     {{Appls,Incls},Ws} = check_appl(Appl),
     {ok, {Name,Vsn,EVsn,Appls,Incls},Ws};
 check_rel1(_) ->
@@ -974,7 +974,8 @@ check_xref(Appls, Path, XrefP) ->
 	    ok;
 	{error, {already_started, _Pid}} ->
 	    xref:stop(?XREF_SERVER), %% Clear out any previous data
-	    xref:start(?XREF_SERVER, XrefArgs)
+	    {ok,_} = xref:start(?XREF_SERVER, XrefArgs),
+	    ok
     end,
     {ok, _} = xref:set_default(?XREF_SERVER, verbose, false),
     LibPath = case Path == code:get_path() of
@@ -1135,10 +1136,10 @@ generate_script(Output, Release, Appls, Flags) ->
 	      load_appl_mods(Appls, Mandatory ++ Preloaded,
 			     PathFlag, Variables) ++
 	      [{path, create_path(Appls, PathFlag, Variables)}] ++
-	      create_kernel_procs(Appls) ++
-	      create_load_appls(Appls) ++
-	      create_start_appls(Appls) ++
-	      script_end()
+		  create_kernel_procs(Appls) ++
+		  create_load_appls(Appls) ++
+		  create_start_appls(Appls) ++
+		  script_end(lists:member(no_dot_erlang, Flags))
 	     },
 
     ScriptFile = Output ++ ".script",
@@ -1146,14 +1147,17 @@ generate_script(Output, Release, Appls, Flags) ->
 	{ok, Fd} ->
 	    io:format(Fd, "%% script generated at ~w ~w\n~p.\n",
 		      [date(), time(), Script]),
-	    file:close(Fd),
-
-	    BootFile = Output ++ ".boot",
-	    case file:write_file(BootFile, term_to_binary(Script)) of
+	    case file:close(Fd) of
 		ok ->
-		    ok;
+		    BootFile = Output ++ ".boot",
+		    case file:write_file(BootFile, term_to_binary(Script)) of
+			ok ->
+			    ok;
+			{error, Reason} ->
+			    {error, ?MODULE, {open,BootFile,Reason}}
+		    end;
 		{error, Reason} ->
-		    {error, ?MODULE, {open,BootFile,Reason}}
+		    {error, ?MODULE, {close,ScriptFile,Reason}}
 	    end;
 	{error, Reason} ->
 	    {error, ?MODULE, {open,ScriptFile,Reason}}
@@ -1229,9 +1233,12 @@ create_load_appls([]) ->
 %%______________________________________________________________________
 %% The final part of the script.
 
-script_end() ->
+script_end(false) ->  %% Do not skip loading of $HOME/.erlang
     [{apply, {c, erlangrc, []}},
-     {progress, started}].
+     {progress, started}];
+script_end(true) ->   %% Ignore loading of $HOME/.erlang
+    [{progress, started}].
+
 
 %%-----------------------------------------------------------------
 %% Function: sort_appls(Appls) -> {ok, Appls'} | throw({error, Error})
@@ -1529,14 +1536,16 @@ mk_tar(RelName, Release, Appls, Flags, Path1) ->
     Tar = open_main_tar(TarName),
     case catch mk_tar(Tar, RelName, Release, Appls, Flags, Path1) of
 	{error,Error} ->
-	    del_tar(Tar, TarName),
+	    _ = del_tar(Tar, TarName),
 	    {error,?MODULE,Error};
 	{'EXIT',Reason} ->
-	    del_tar(Tar, TarName),
+	    _ = del_tar(Tar, TarName),
 	    {error,?MODULE,Reason};
 	_ ->
-	    close_tar(Tar),
-	    ok
+	    case erl_tar:close(Tar) of
+		ok -> ok;
+		{error,Reason} -> {error,?MODULE,{close,TarName,Reason}}
+	    end
     end.
 
 open_main_tar(TarName) ->
@@ -1591,14 +1600,13 @@ add_variable_tar({Variable,P}, Appls, Tar, Flags) ->
 	    case catch add_applications(Appls, VarTar, [{Variable,P}],
 					Flags, Variable) of
 		ok when Flag == include ->
-		    close_tar(VarTar),
+		    close_tar(VarTar,TarName),
 		    add_to_tar(Tar, TarName, TarName),
 		    del_file(TarName);
 		ok when Flag == ownfile ->
-		    close_tar(VarTar),
-		    ok;
+		    close_tar(VarTar,TarName);
 		Error ->
-		    del_tar(VarTar, TarName),
+		    _ = del_tar(VarTar, TarName),
 		    throw(Error)
 	    end
     end.
@@ -1856,12 +1864,15 @@ open_tar(TarName) ->
 	    throw({error,{tar_error, {open, TarName, Error}}})
     end.
 
-close_tar(Tar) ->
-    erl_tar:close(Tar).
+close_tar(Tar,File) ->
+    case erl_tar:close(Tar) of
+	ok -> ok;
+	{error,Reason} -> throw({error,{close,File,Reason}})
+    end.
 
 del_tar(Tar, TarName) ->
-    close_tar(Tar),
-    del_file(TarName).
+    _ = erl_tar:close(Tar),
+    file:delete(TarName).
 
 add_to_tar(Tar, FromFile, ToFile) ->
     case erl_tar:add(Tar, FromFile, ToFile, [compressed, dereference]) of
@@ -1916,13 +1927,20 @@ read_file(File, Path) ->
 			 Other ->
 			     Other
 		     end,
-	    file:close(Stream),
-	    Return;
+	    case file:close(Stream) of
+		ok -> Return;
+		{error, Error} -> {error, {close,File,Error}}
+	    end;
 	_Other ->
 	    {error, {not_found, File}}
     end.
 
-del_file(File) -> file:delete(File).
+del_file(File) ->
+    case file:delete(File) of
+	ok -> ok;
+	{error, Error} ->
+	    throw({error, {delete, File, Error}})
+    end.
 
 dirp(Dir) ->
     case file:read_file_info(Dir) of
@@ -2055,6 +2073,9 @@ cas([no_warn_sasl | Args], X) ->
 %%% no_module_tests (kept for backwards compatibility, but ignored) ----
 cas([no_module_tests | Args], X) ->
     cas(Args, X);
+cas([no_dot_erlang | Args], X) ->
+    cas(Args, X);
+
 %%% ERROR --------------------------------------------------------------
 cas([Y | Args], X) ->
     cas(Args, X++[Y]).
@@ -2238,6 +2259,12 @@ format_error({read,File}) ->
 format_error({open,File,Error}) ->
     io_lib:format("Cannot open ~p - ~ts~n",
 		  [File,file:format_error(Error)]);
+format_error({close,File,Error}) ->
+    io_lib:format("Cannot close ~p - ~ts~n",
+		  [File,file:format_error(Error)]);
+format_error({delete,File,Error}) ->
+    io_lib:format("Cannot delete ~p - ~ts~n",
+		  [File,file:format_error(Error)]);
 format_error({tar_error,What}) ->
     form_tar_err(What);
 format_error(ListOfErrors) when is_list(ListOfErrors) ->
diff --git a/lib/sasl/src/systools_rc.erl b/lib/sasl/src/systools_rc.erl
index 54c327410d..76f753c3d0 100644
--- a/lib/sasl/src/systools_rc.erl
+++ b/lib/sasl/src/systools_rc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -365,14 +365,22 @@ translate_application_instrs(Script, Appls, PreAppls) ->
 			  case lists:keysearch(Appl, #application.name, Appls) of
 			      {value, PostApplication} ->
 				  PostMods = PostApplication#application.modules,
+				  Type = PostApplication#application.type,
+				  Apply =
+				      case Type of
+					  none -> [];
+					  load -> [{apply, {application, load,
+							    [Appl]}}];
+					  _ -> [{apply, {application, start,
+							 [Appl, Type]}}]
+				      end,
 
 				  [{apply, {application, stop, [Appl]}}] ++
 				      [{remove, {M, brutal_purge, brutal_purge}}
 				       || M <- PreMods] ++
 				      [{purge, PreMods}] ++
 				      [{add_module, M, []} || M <- PostMods] ++
-				      [{apply, {application, start,
-						[Appl, permanent]}}];
+				      Apply;
 			      false ->
 				  throw({error, {no_such_application, Appl}})
 			  end;
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index 716dc2b5ff..b3494542e5 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -523,7 +523,7 @@ to_list(X) when is_atom(X) -> atom_to_list(X);
 to_list(X) when is_list(X) -> X.
 
 
-%% write_relup_file(Relup, Opts) -> {ok. Relup}
+%% write_relup_file(Relup, Opts) -> ok
 %% 
 %% Writes a relup file.
 %%
@@ -545,12 +545,17 @@ write_relup_file(Relup, Opts) ->
 	    case file:open(Filename, [write]) of
 		{ok, Fd} ->
 		    io:format(Fd, "~p.~n", [Relup]),
-		    file:close(Fd);
+		    case file:close(Fd) of
+			ok -> ok;
+			{error,Reason} ->
+			    throw({error, ?MODULE,
+				   {file_problem, {"relup", {close,Reason}}}})
+		    end;
 		{error, Reason} ->
-		    throw({error, ?MODULE, {file_problem, {"relup", Reason}}})
+		    throw({error, ?MODULE,
+			   {file_problem, {"relup", {open, Reason}}}})
 	    end
-    end,
-    {ok, Relup}.    
+    end.
 
 add_code_path(Opts) ->
     case get_opt(path, Opts) of
@@ -597,8 +602,6 @@ print_error({error, Mod, Error}) ->
 print_error(Other) ->
     io:format("Error: ~p~n", [Other]).
 
-format_error({file_problem, {"relup", _Posix}}) ->
-    io_lib:format("Could not open file relup~n", []);
 format_error({file_problem, {File, What}}) ->
     io_lib:format("Could not ~w file ~ts~n", [get_reason(What), File]);
 format_error({no_relup, File, App, Vsn}) ->
@@ -642,12 +645,14 @@ format_warning(Prefix, What) ->
 get_reason({error, {open, _, _}}) -> open;
 get_reason({error, {read, _, _}}) -> read;
 get_reason({error, {parse, _, _}}) -> parse;
+get_reason({error, {close, _, _}}) -> close;
 get_reason({error, {open, _}}) -> open;
 get_reason({error, {read, _}}) -> read;
 get_reason({error, {parse, _}}) -> parse;
 get_reason({open, _}) -> open;
 get_reason({read, _}) -> read;
 get_reason({parse, _}) -> parse;
+get_reason({close, _}) -> close;
 get_reason(open) -> open;
 get_reason(read) -> read;
 get_reason(parse) -> parse.
diff --git a/lib/sasl/test/installer.erl b/lib/sasl/test/installer.erl
index 709269a73c..fa404c8b7b 100644
--- a/lib/sasl/test/installer.erl
+++ b/lib/sasl/test/installer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The 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,12 @@
 -export([reg_proc/1]).
 -export([registered_loop/1]).
 
--define(print(List), {rh_print, TestNode} ! {print, {?MODULE, ?LINE}, List}).
--define(print_line(Line,List), {rh_print, TestNode} ! {print, {?MODULE, Line}, List}).
+-define(print(List),
+	io:format(user,"(~w:~w) ~tp~n",[?MODULE,?LINE,List]),
+	{rh_print, TestNode} ! {print, {?MODULE, ?LINE}, List}).
+-define(print_line(Line,List),
+	io:format(user,"(~w:~w) ~tp~n",[?MODULE,Line,List]),
+	{rh_print, TestNode} ! {print, {?MODULE, Line}, List}).
 -define(fail(Term), exit({?MODULE, ?LINE, Term})).
 -define(fail_line(Line,Term), exit({?MODULE, Line, Term})).
 
@@ -905,10 +909,9 @@ start_client(TestNode,Client,Sname) ->
 
 start_client_unix(TestNode,Sname,Node) ->
     Start = filename:join(["clients", "type1", Node, "bin", "start"]),
-    Cmd = lists:concat(["env NODENAME=",Sname," ",
-			filename:join(code:root_dir(), Start)]),
+    Cmd = filename:join(code:root_dir(), Start),
     ?print([{start_client,Sname},Cmd]),
-    Res = os:cmd(Cmd),
+    Res = rh_test_lib:cmd(Cmd,[],[{"NODENAME",atom_to_list(Sname)}]),
     ?print([{start_client,result},Res]).
 
 start_client_win32(TestNode,Client,ClientSname) ->
diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl
index b0e43be3a2..453f992850 100644
--- a/lib/sasl/test/rb_SUITE.erl
+++ b/lib/sasl/test/rb_SUITE.erl
@@ -362,18 +362,48 @@ start_stop_log(Config) ->
     StdioResult = [_|_] = capture(fun() -> rb:show(1) end),
     {ok,<<>>} = file:read_file(OutFile),
 
-    %% Start log and check that show is printed to log and not to standad_io
+    %% Start log and check that show is printed to log and not to standard_io
     ok = rb:start_log(OutFile),
     [] = capture(fun() -> rb:show(1) end),
     {ok,Bin} = file:read_file(OutFile),
     true = (Bin =/= <<>>),
 
+    %% Start log with atom standard_io and check that show is printed to standard_io
+    ok = rb:stop_log(),
+    ok = file:write_file(OutFile,[]),
+    ok = rb:start_log(standard_io),
+    StdioResult = [_|_] = capture(fun() -> rb:show(1) end),
+    {ok,<<>>} = file:read_file(OutFile),
+
+    %% Start log and check that show is printed to iodevice log and not to standard_io
+    ok = rb:stop_log(),
+    ok = file:write_file(OutFile,[]),
+    {ok, IoOutFile} = file:open(OutFile,[write]),
+    ok = rb:start_log(IoOutFile),
+    [] = capture(fun() -> rb:show(1) end),
+    {ok,Bin} = file:read_file(OutFile),
+    true = (Bin =/= <<>>),
+    ok = file:close(IoOutFile),
+
     %% Stop log and check that show is printed to standard_io and not to log
     ok = rb:stop_log(),
     ok = file:write_file(OutFile,[]),
     StdioResult = capture(fun() -> rb:show(1) end),
     {ok,<<>>} = file:read_file(OutFile),
 
+    %% Start log and check that list is printed to log and not to standard_io
+    ok = file:write_file(OutFile,[]),
+    ok = rb:start_log(OutFile),
+    [] = capture(fun() -> rb:log_list() end),
+    {ok,Bin2} = file:read_file(OutFile),
+    true = (Bin2 =/= <<>>),
+
+    %% Stop log and check that list is printed to standard_io and not to log
+    ok = rb:stop_log(),
+    ok = file:write_file(OutFile,[]),
+    StdioResult2 = capture(fun() -> rb:log_list() end),
+    {ok,<<>>} = file:read_file(OutFile),
+    
     %% Test that standard_io is used if log file can not be opened
     ok = rb:start_log(filename:join(nonexistingdir,"newfile.txt")),
     StdioResult = capture(fun() -> rb:show(1) end),
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index a56924d5ca..ad2a8005b9 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
 %%
 %% The 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,7 +35,8 @@ init_per_suite(Config) ->
     application:start(sasl),
     Config.
 
-end_per_suite(_Config) ->
+end_per_suite(Config) ->
+    clean_priv_dir(Config,true),
     ok.
 
 all() -> 
@@ -50,7 +51,7 @@ unix_cases() ->
 		true ->  [{group, release}];
 		false -> [no_run_erl]
 	    end,
-    [target_system] ++ RunErlCases ++ cases().
+    [target_system, target_system_unicode] ++ RunErlCases ++ cases().
 
 win32_cases() -> 
     [{group,release} | cases()].
@@ -64,7 +65,7 @@ cases() ->
      supervisor_which_children_timeout,
      release_handler_which_releases, install_release_syntax_check,
      upgrade_supervisor, upgrade_supervisor_fail, otp_9864,
-     otp_10463_upgrade_script_regexp].
+     otp_10463_upgrade_script_regexp, no_dot_erlang].
 
 groups() ->
     [{release,[],
@@ -163,7 +164,6 @@ end_per_group(release, Config) ->
 	{win32,_} -> delete_all_services();
 	_ -> ok
     end,
-    clean_priv_dir(Config,true),
     ?t:timetrap_cancel(Dog),
     Config;
 end_per_group(_GroupName, Config) ->
@@ -1559,6 +1559,9 @@ eval_appup_with_restart(Conf) when is_list(Conf) ->
 %% Test the example/target_system.erl module
 target_system(Conf) when is_list(Conf) ->
     PrivDir = priv_dir(Conf),
+    target_system1(Conf,PrivDir).
+
+target_system1(Conf,PrivDir) ->
     DataDir = ?config(data_dir,Conf),
 
     TargetCreateDir = filename:join([PrivDir,"target_system","create"]),
@@ -1567,7 +1570,6 @@ target_system(Conf) when is_list(Conf) ->
     ok = filelib:ensure_dir(filename:join(TargetCreateDir,"xx")),
     ok = filelib:ensure_dir(filename:join(TargetInstallDir,"xx")),
 
-
     %% Create the .rel file
     RelName = filename:join(TargetCreateDir,"ts-1.0"),
     RelFile = RelName++".rel",
@@ -1607,7 +1609,8 @@ target_system(Conf) when is_list(Conf) ->
     StdlibVsn = vsn(stdlib,current),
     SaslVsn = vsn(sasl,current),
     RelFileBasename = filename:basename(RelFile),
-    true = filelib:is_dir(filename:join(LibDir,"kernel-"++KernelVsn)),
+    KernelLibDir = filename:join(LibDir,"kernel-"++KernelVsn),
+    true = filelib:is_dir(KernelLibDir),
     true = filelib:is_dir(filename:join(LibDir,"stdlib-"++StdlibVsn)),
     true = filelib:is_dir(filename:join(LibDir,"sasl-"++SaslVsn)),
     true = filelib:is_dir(filename:join(LibDir,"a-1.0")),
@@ -1616,11 +1619,13 @@ target_system(Conf) when is_list(Conf) ->
     true = filelib:is_regular(filename:join(RelDir,"start_erl.data")),
     true = filelib:is_regular(filename:join(RelDir,RelFileBasename)),
     true = filelib:is_dir(filename:join(RelDir,RelVsn)),
-    true = filelib:is_regular(filename:join([RelDir,RelVsn,"start.boot"])),
+    StartBoot = filename:join([RelDir,RelVsn,"start.boot"]),
+    true = filelib:is_regular(StartBoot),
     true = filelib:is_regular(filename:join([RelDir,RelVsn,RelFileBasename])),
     BinDir = filename:join(TargetInstallDir,bin),
+    Erl = filename:join(BinDir,erl),
+    true = filelib:is_regular(Erl),
     true = filelib:is_regular(filename:join(BinDir,"start.boot")),
-    true = filelib:is_regular(filename:join(BinDir,erl)),
     true = filelib:is_regular(filename:join(BinDir,start_erl)),
     true = filelib:is_regular(filename:join(BinDir,start)),
     true = filelib:is_regular(filename:join(BinDir,epmd)),
@@ -1631,9 +1636,75 @@ target_system(Conf) when is_list(Conf) ->
     ErtsVsn = vsn(erts,current),
     {ok,SED} = file:read_file(filename:join(RelDir,"start_erl.data")),
     [ErtsVsn,RelVsn] = string:tokens(binary_to_list(SED),"\s\n"),
+
+    %% Check that installation can be started
+    Sname = list_to_atom(atom_to_list(?MODULE) ++ "-target_system"),
+    {ok,Node} = start_target_node_with_erl(Erl,Sname,StartBoot),
+
+    TargetInstallDir = rpc:call(Node,code,root_dir,[]),
+    KernelLibDir = rpc:call(Node,code,lib_dir,[kernel]),
+    [{RelName,RelVsn,_Apps,permanent}] =
+	rpc:call(Node,release_handler,which_releases,[]),
+
+    ?t:format("Target node ok:~nRootDir: ~ts~nKernelLibDir: ~ts~nRelease: ~ts",
+	      [TargetInstallDir,KernelLibDir,RelName]),
+
+    ok.
+
+target_system(cleanup,_Conf) ->
+    Sname = list_to_atom(atom_to_list(?MODULE) ++ "-target_system"),
+    stop_target_node(node_name(Sname)),
     ok.
 
+start_target_node_with_erl(Erl,Sname,Boot) ->
+    FullName = node_name(Sname),
+    FilenameMode = case file:native_name_encoding() of
+		       latin1 -> "+fnl";
+		       utf8 -> "+fnui"
+		   end,
+    Args = [FilenameMode,"-detached", "-noinput","-sname",atom_to_list(Sname),
+	   "-boot",filename:rootname(Boot)],
+    ?t:format("Starting node ~p: ~ts~n",
+	      [FullName, lists:flatten([[X," "] || X <- [Erl|Args]])]),
+    case rh_test_lib:cmd(Erl,Args,[]) of
+	ok ->
+	    ok = wait_nodes_up([FullName],"target_system test node"),
+	    {ok,FullName};
+	Error ->
+            ?t:fail({failed_to_start_node, FullName, Error})
+    end.
 
+stop_target_node(Node) ->
+    monitor_node(Node, true),
+    _ = rpc:call(Node,erlang,halt,[]),
+    receive {nodedown, Node} -> ok end.
+
+%% Test that the example/target_system.erl module can create and
+%% install under a path which includes unicode characters
+target_system_unicode(Conf) when is_list(Conf) ->
+    PrivDir = priv_dir(Conf),
+    UnicodePrivDir = filename:join(PrivDir,"αβ"),
+
+    PA = filename:dirname(code:which(?MODULE)),
+
+    %% Make sure this runs on a node with unicode file name mode
+    Sname = list_to_atom(atom_to_list(?MODULE) ++ "-target_system_unicode"),
+    {ok,Node} = ?t:start_node(Sname,peer,[{args,"+fnui -pa " ++ PA}]),
+    ok = rpc:call(Node,file,make_dir,[UnicodePrivDir]),
+    case rpc:call(Node,application,start,[sasl]) of
+	ok -> ok;
+	{error,{already_started,sasl}} -> ok;
+	Error -> ?t:fail({failed_to_start_sasl_on_test_node,Node,Error})
+    end,
+    ok = rpc:call(Node,?MODULE,target_system1,[Conf,UnicodePrivDir]),
+    ok.
+
+target_system_unicode(cleanup,Conf) ->
+    Sname = list_to_atom(atom_to_list(?MODULE) ++ "-target_system_unicode"),
+    Node = node_name(Sname),
+    _ = rpc:call(Node,?MODULE,target_system,[cleanup,Conf]),
+    _ = stop_node(Node),
+    ok.
 
 %%%=================================================================
 %%% Testing global groups.
@@ -1709,6 +1780,46 @@ otp_10463_upgrade_script_regexp(_Config) ->
 	release_handler:upgrade_script(kernel,code:lib_dir(kernel)),
     ok.
 
+no_dot_erlang(Conf) ->
+    PrivDir = ?config(data_dir,Conf),
+    {ok, OrigWd} = file:get_cwd(),
+    try
+	ok = file:set_cwd(PrivDir),
+
+	{ok, Wd} = file:get_cwd(),
+	io:format("Dir ~ts~n", [Wd]),
+
+	Erl0 =  filename:join([code:root_dir(),"bin","erl"]),
+	Erl = filename:nativename(Erl0),
+	Quote = "\"",
+	Args = " -noinput -run c pwd -run erlang halt",
+	ok = file:write_file(".erlang", <<"io:put_chars(\"DOT_ERLANG_READ\\n\").\n">>),
+
+	CMD1 = Quote ++ Erl ++ Quote ++ Args ,
+	case os:cmd(CMD1) of
+	    "DOT_ERLANG_READ" ++ _ -> ok;
+	    Other1 ->
+		io:format("Failed: ~ts~n",[CMD1]),
+		io:format("Expected: ~s ++ _~n",["DOT_ERLANG_READ "]),
+		io:format("Got: ~ts~n",[Other1]),
+		exit({failed_to_start, test_error})
+	end,
+	NO_DOT_ERL = " -boot no_dot_erlang",
+	CMD2 = Quote ++ Erl ++ Quote ++ NO_DOT_ERL ++ Args,
+	case lists:prefix(Wd, Other2 = os:cmd(CMD2)) of
+	    true -> ok;
+	    false ->
+		io:format("Failed: ~ts~n",[CMD2]),
+		io:format("Expected: ~s~n",["TESTOK"]),
+		io:format("Got: ~ts~n",[Other2]),
+		exit({failed_to_start, no_dot_erlang})
+	end
+    after
+	_ = file:delete(".erlang"),
+	ok = file:set_cwd(OrigWd),
+	ok
+    end.
+
 
 %%%=================================================================
 %%% Misceleaneous functions
@@ -1852,7 +1963,7 @@ stop_node(Node) ->
 
 
 copy_client(Conf,Master,Sname,Client) ->
-    io:format("copy_client(Conf)"),
+    ?t:format("copy_client(Conf)"),
 
     DataDir = ?config(data_dir, Conf),
     MasterDir = filename:join(priv_dir(Conf),Master),
@@ -1891,82 +2002,12 @@ copy_client(Conf,Master,Sname,Client) ->
 
 clean_priv_dir(Conf,Save) ->
     PrivDir = priv_dir(Conf),
-
-    {ok, OrigWd} = file:get_cwd(),
-
-    ok = file:set_cwd(PrivDir),
-    ?t:format("========  current dir ~p~n",[PrivDir]),
-    {ok, Dirs} = file:list_dir(PrivDir),
-    ?t:format("========  deleting  ~p~n",[Dirs]),
-
-    ok = clean_dirs_os(Dirs,Save),
-    {ok,Remaining} = file:list_dir(PrivDir),
-    ?t:format("========  remaining  ~p~n",[Remaining]),
-
-    case Remaining of
-	[] ->
-	    ok;
-	_ ->
-	    clean_dirs_os(Remaining,Save),
-	    Remaining2 = file:list_dir(PrivDir),
-	    ?t:format("========  remaining after second try ~p~n",[Remaining2])
-    end,
-
-    ok = file:set_cwd(OrigWd),
-    ok.
-
-
-clean_dirs_os(Dirs,Save) ->
-    case os:type() of
-	{unix, _} ->
-	    clean_dirs_unix(Dirs,Save);
-	{win32, _} ->
-	    clean_dirs_win32(Dirs,Save);
-	Os ->
-	    test_server:fail({error, {not_yet_implemented_os, Os}})
+    rh_test_lib:clean_dir(PrivDir,Save),
+    case file:list_dir(PrivDir) of
+	{ok,[]} -> _ = file:del_dir(PrivDir);
+	_ -> ok
     end.
 
-
-clean_dirs_unix([],_) ->
-    ok;
-clean_dirs_unix(["save"|Dirs],Save) when Save ->
-    clean_dirs_unix(Dirs,Save);
-clean_dirs_unix([Dir|Dirs],Save) ->
-    Rm = string:concat("rm -rf ", Dir),
-    ?t:format("============== COMMAND ~p~n",[Rm]),
-    case file:list_dir(Dir) of
-	{error, enotdir} ->
-	    ok;
-	X ->
-	    ?t:format("------- Dir ~p~n       ~p~n",[Dir, X])
-    end,
-    case os:cmd(Rm) of
-	      [] ->
-		  ?t:format("------- Result of COMMAND ~p~n",[ok]);
-	      Y ->
-		  ?t:format("!!!!!!! delete ERROR  Dir ~p Error ~p~n",[Dir, Y]),
-		  ?t:format("------- ls -al  ~p~n",[os:cmd("ls -al " ++ Dir)])
-	  end,
-
-    clean_dirs_unix(Dirs,Save).
-
-clean_dirs_win32([],_) ->
-    ok;
-clean_dirs_win32(["save"|Dirs],Save) when Save ->
-    clean_dirs_win32(Dirs,Save);
-clean_dirs_win32([Dir|Dirs],Save) ->
-    Rm =
-       case filelib:is_dir(Dir) of
-          true ->
-             string:concat("rmdir /s /q ", Dir);
-          false ->
-             string:concat("del /q ", Dir)
-       end,
-    ?t:format("============== COMMAND ~p~n",[Rm]),
-    [] = os:cmd(Rm),
-    clean_dirs_win32(Dirs,Save).
-
-
 node_name(Sname) when is_atom(Sname) ->
     {ok,Host} = inet:gethostname(),
     list_to_atom(atom_to_list(Sname) ++ "@" ++ Host).
@@ -2012,7 +2053,7 @@ chmod(Dest,Opts) ->
 
 
 copy_error(Src, Dest, Reason) ->
-    io:format("Copy ~s to ~s failed: ~s\n",
+    ?t:format("Copy ~ts to ~ts failed: ~ts\n",
 	      [Src,Dest,file:format_error(Reason)]),
     ?t:fail(file_copy_failed).
 
@@ -2052,9 +2093,11 @@ subst_file(Src, Dest, Vars) ->
     subst_file(Src, Dest, Vars, []).
 subst_file(Src, Dest, Vars, Opts) ->
     {ok, Bin} = file:read_file(Src),
-    Conts = binary_to_list(Bin),
+    Conts = binary_to_list(Bin), % The source will always be latin1
     NConts = subst(Conts, Vars),
-    ok = file:write_file(Dest, NConts),
+    %% The destination must be utf8 if file name encoding is unicode
+    Enc = file:native_name_encoding(),
+    ok = file:write_file(Dest, unicode:characters_to_binary(NConts,Enc,Enc)),
     preserve(Src,Dest,Opts),
     chmod(Dest,Opts).
 
@@ -2087,13 +2130,22 @@ subst_var([], Vars, Result, VarAcc) ->
 
 
 priv_dir(Conf) ->
-%%    filename:absname(?config(priv_dir, Conf)). % Get rid of trailing slash
     %% Due to problem with long paths on windows => creating a new
     %% priv_dir under data_dir
-    filename:absname(filename:join(?config(data_dir, Conf),priv_dir)).
+    %% And get rid of trailing slash (absname does that)
+    %% And if file name translation mode is utf8, use a path with
+    %% unicode characters
+    PrivDir =
+	case file:native_name_encoding() of
+	    utf8 ->
+		"priv_dir_αβ";
+	    _ ->
+		"priv_dir"
+	end,
+    filename:absname(filename:join([?config(data_dir, Conf),PrivDir])).
 
 init_priv_dir(Conf) ->
-    Dir = filename:absname(filename:join(?config(data_dir, Conf),priv_dir)),
+    Dir = priv_dir(Conf),
     case filelib:is_dir(Dir) of
 	true ->
 	    clean_priv_dir(Conf,false);
@@ -2118,7 +2170,7 @@ rh_print() ->
     receive
 	{print, {Module,Line}, [H|T]} ->
 	    ?t:format("=== ~p:~p - ~p",[Module,Line,H]),
-	    lists:foreach(fun(Term) -> ?t:format("    ~p",[Term]) end, T),
+	    lists:foreach(fun(Term) -> ?t:format("    ~tp",[Term]) end, T),
 	    ?t:format("",[]),
 	    rh_print();
 	kill ->
@@ -2511,11 +2563,14 @@ start_nodes(Conf,Snames,Tag) ->
     
 start_node_unix(Sname,NodeDir) ->
     Script = filename:join([NodeDir,"bin","start"]),
-    Cmd = "env NODENAME="++atom_to_list(Sname) ++ " " ++ Script,
-    %% {ok,StartFile} = file:read_file(Cmd),
-    %% io:format("~s:\n~s~n~n",[Start,binary_to_list(StartFile)]),
-    Res = os:cmd(Cmd),
-    io:format("Start ~p: ~p~n=>\t~p~n", [Sname,Cmd,Res]).
+    ?t:format("Starting ~p: ~tp~n", [Sname,Script]),
+    case rh_test_lib:cmd(Script,[],[{"NODENAME",atom_to_list(Sname)}]) of
+	ok ->
+	    {ok,node_name(Sname)};
+        Error ->
+            ?t:fail({failed_to_start_node, Sname, Error})
+    end.
+
 
 start_node_win32(Sname,NodeDir) ->
     Name = atom_to_list(Sname) ++ "_P1G",
@@ -2676,7 +2731,7 @@ rpc_inst(Node,Func,Args) ->
 
 delete_all_services() ->
     ErlSrv = erlsrv:erlsrv(erlang:system_info(version)),
-    [_|Serviceinfo] = string:tokens(os:cmd(ErlSrv ++ " list"),"\n"),
+    [_|Serviceinfo] = string:tokens(os:cmd("\"" ++ ErlSrv ++ "\" list"),"\n"),
     Services =
 	[lists:takewhile(fun($\t) -> false; (_) -> true end,S)
 	 || S <- Serviceinfo],
diff --git a/lib/sasl/test/release_handler_SUITE_data/start b/lib/sasl/test/release_handler_SUITE_data/start
index 45e526c15f..87275045b1 100755
--- a/lib/sasl/test/release_handler_SUITE_data/start
+++ b/lib/sasl/test/release_handler_SUITE_data/start
@@ -26,4 +26,4 @@ export HW_WD_DISABLE HEART_COMMAND
 
 START_ERL_DATA=${1:-$RELDIR/start_erl.data}
 
-$ROOTDIR/bin/run_erl /tmp/ $ROOTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR $RELDIR $START_ERL_DATA -heart -sname $NODENAME" > $ROOTDIR/log/run_erl.out 2>&1  &
+$ROOTDIR/bin/run_erl /tmp/ $ROOTDIR/log "exec $ROOTDIR/bin/start_erl $ROOTDIR $RELDIR $START_ERL_DATA -heart -sname $NODENAME -mode embedded" > $ROOTDIR/log/run_erl.out 2>&1  &
diff --git a/lib/sasl/test/rh_test_lib.erl b/lib/sasl/test/rh_test_lib.erl
index 99a7f919a7..11935496d8 100644
--- a/lib/sasl/test/rh_test_lib.erl
+++ b/lib/sasl/test/rh_test_lib.erl
@@ -1,5 +1,6 @@
 -module(rh_test_lib).
 
+-export([cmd/3]).
 -export([erlsrv/3,
 	 erlsrv/4]).
 -export([get_service_args/3,
@@ -8,12 +9,26 @@
 	 get_start_erl_args/3,
 	 get_client_args/3,
 	 get_client_args/4]).
+-export([clean_dir/1,
+	 clean_dir/2]).
 
+-include_lib("kernel/include/file.hrl").
+
+cmd(Cmd,Args,Env) ->
+    case open_port({spawn_executable, Cmd}, [{args,Args},{env,Env}]) of
+        Port when is_port(Port) ->
+            unlink(Port),
+            erlang:port_close(Port),
+	    ok;
+        Error ->
+            Error
+    end.
 
 erlsrv(Erlsrv,Action,Name) ->
     erlsrv(Erlsrv,Action,Name,"").
 erlsrv(Erlsrv,Action,Name,Rest) ->
-    Cmd = Erlsrv ++ " " ++ atom_to_list(Action) ++ " " ++ Name ++ " " ++ Rest,
+    Cmd = "\"" ++ Erlsrv ++ "\" " ++ atom_to_list(Action) ++ " " ++
+	Name ++ " " ++ Rest,
     io:format("erlsrv cmd: ~p~n",[Cmd]),
     Port = open_port({spawn, Cmd}, [stream, {line, 100}, eof, in]),
     Res = recv_prog_output(Port),
@@ -98,3 +113,50 @@ single_quote() ->
 	_ ->
 	    "\\'"
     end.
+
+clean_dir(Dir) ->
+    clean_dir(Dir,false).
+clean_dir(Dir,Save) ->
+    test_server:format("========  current dir ~tp~n",[Dir]),
+    Dirs = filelib:wildcard(filename:join(Dir,"*")),
+    test_server:format("========  deleting  ~tp~n",[Dirs]),
+
+    ok = rm_rf(Dirs,Save),
+    Remaining = filelib:wildcard(filename:join(Dir,"*")),
+    test_server:format("========  remaining  ~tp~n",[Remaining]),
+
+    case Remaining of
+	[] ->
+	    ok;
+	_ ->
+	    rm_rf(Remaining,Save),
+	    Remaining2 = filelib:wildcard(filename:join(Dir,"*")),
+	    test_server:format("========  remaining after second try ~tp~n",
+			       [Remaining2])
+    end,
+
+    ok.
+
+
+rm_rf([File|Files],Save) ->
+    case Save andalso filename:basename(File)=="save" of
+	true ->
+	    rm_rf(Files,Save);
+	false ->
+	    case file:read_link_info(File) of
+		{ok,#file_info{type=directory}} ->
+		    MoreFiles = filelib:wildcard(filename:join(File,"*")),
+		    rm_rf(MoreFiles,Save),
+		    file:del_dir(File),
+		    rm_rf(Files,Save);
+		{ok,#file_info{}} ->
+		    file:delete(File),
+		    rm_rf(Files,Save);
+		Other ->
+		    test_server:format("========  could not delete file  ~p~n"
+				       "read_link_info -> ~p~n",[File,Other]),
+		    rm_rf(Files,Save)
+	    end
+    end;
+rm_rf([],_) ->
+    ok.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index b6eaf41323..f4455f7e9b 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
 %%
 %% The 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,11 +19,6 @@
 -module(sasl_SUITE).
 -include_lib("common_test/include/ct.hrl").
 
-
-%% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
--define(application, sasl).
-
 %% Test server specific exports
 -export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -34,7 +29,7 @@
 	 log_mf_h_env/1]).
 
 all() -> 
-    [app_test, appup_test, log_mf_h_env].
+    [log_mf_h_env, app_test, appup_test].
 
 groups() -> 
     [].
@@ -47,102 +42,88 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+end_per_testcase(_Case, _Config) ->
     ok.
 
 app_test(Config) when is_list(Config) ->
     ?t:app_test(sasl, allow),
     ok.
 
-%% Test that appup allows upgrade from/downgrade to a maximum of two
-%% major releases back.
+%% Test that appup allows upgrade from/downgrade to a maximum of one
+%% major release back.
 appup_test(_Config) ->
-    application:load(sasl),
-    {sasl,_,SaslVsn} = lists:keyfind(sasl,1,application:loaded_applications()),
-    Ebin = filename:join(code:lib_dir(sasl),ebin),
-    {ok,[{SaslVsn,UpFrom,DownTo}=Appup]} =
-	file:consult(filename:join(Ebin,"sasl.appup")),
-    ct:log("~p~n",[Appup]),
-    {OkVsns,NokVsns} = create_test_vsns(SaslVsn),
+    appup_tests(sasl,create_test_vsns(sasl)).
+
+appup_tests(_App,{[],[]}) ->
+    {skip,"no previous releases available"};
+appup_tests(App,{OkVsns,NokVsns}) ->
+    application:load(App),
+    {_,_,Vsn} = lists:keyfind(App,1,application:loaded_applications()),
+    AppupFileName = atom_to_list(App) ++ ".appup",
+    AppupFile = filename:join([code:lib_dir(App),ebin,AppupFileName]),
+    {ok,[{Vsn,UpFrom,DownTo}=AppupScript]} = file:consult(AppupFile),
+    ct:log("~p~n",[AppupScript]),
+    ct:log("Testing ok versions: ~p~n",[OkVsns]),
     check_appup(OkVsns,UpFrom,{ok,[restart_new_emulator]}),
     check_appup(OkVsns,DownTo,{ok,[restart_new_emulator]}),
+    ct:log("Testing not ok versions: ~p~n",[NokVsns]),
     check_appup(NokVsns,UpFrom,error),
     check_appup(NokVsns,DownTo,error),
     ok.
 
-
-%% For sasl, the versions up to R14B03 were not according to the rule
-%% used for other core applications - i.e. to change the second number
-%% at major releases, the third at maintenance releases and the fourth
-%% for patches - therefore test versions up to and including R16 are
-%% hardcoded.
-%% (All versions below are not necessarily existing.)
--define(r12_vsns,["2.1.5"]).
--define(r13_vsns,["2.1.6","2.1.7.1","2.1.9","2.1.9.1.2"]).
--define(r14_vsns,["2.1.9.2","2.1.9.2.20","2.1.9.4","2.1.10"]).
--define(r15_major,"2.2").
--define(r16_major,"2.3").
--define(r17_major,"2.4").
-create_test_vsns(?r15_major ++ Rest) ->
-    R15Vsns =
-	case string:tokens(Rest,".") of
-	    [] -> [];
-	    ["1"] -> [?r15_major];
-	    _ -> [?r15_major,?r15_major++".1"]
-	end,
-    OkVsns = ?r13_vsns ++ ?r14_vsns ++ R15Vsns,
-    NokVsns = ?r12_vsns ++ [?r15_major++",1", ?r16_major],
-    {OkVsns,NokVsns};
-create_test_vsns(?r16_major ++ Rest) ->
-    R16Vsns =
-	case string:tokens(Rest,".") of
-	    [] -> [];
-	    ["1"] -> [?r16_major];
-	    _ -> [?r16_major,?r16_major++".1"]
+create_test_vsns(App) ->
+    This = erlang:system_info(otp_release),
+    FirstMajor = previous_major(This),
+    SecondMajor = previous_major(FirstMajor),
+    Ok = app_vsn(App,[FirstMajor]),
+    Nok0 = app_vsn(App,[SecondMajor]),
+    Nok = case Ok of
+	       [Ok1|_] ->
+		   [Ok1 ++ ",1" | Nok0]; % illegal
+	       _ ->
+		   Nok0
+	   end,
+    {Ok,Nok}.
+
+previous_major("17") ->
+    "r16";
+previous_major("r"++Rel) ->
+    "r"++previous_major(Rel);
+previous_major(Rel) ->
+    integer_to_list(list_to_integer(Rel)-1).
+
+app_vsn(App,[R|Rs]) ->
+    OldRel =
+	case test_server:is_release_available(R) of
+	    true ->
+		{release,R};
+	    false ->
+		case ct:get_config({otp_releases,list_to_atom(R)}) of
+		    undefined ->
+			false;
+		    Prog0 ->
+			case os:find_executable(Prog0) of
+			    false ->
+				false;
+			    Prog ->
+				{prog,Prog}
+			end
+		end
 	end,
-    OkVsns = ?r14_vsns ++ [?r15_major, ?r15_major ++ ".1.4"] ++ R16Vsns,
-    NokVsns = ?r13_vsns ++ [?r16_major++",1", ?r17_major],
-    {OkVsns,NokVsns};
-%% Normal erts case - i.e. for versions that comply to the erts standard
-create_test_vsns(Current) ->
-    [XStr,YStr|Rest] = string:tokens(Current,"."),
-    X = list_to_integer(XStr),
-    Y = list_to_integer(YStr),
-    SecondMajor = vsn(X,Y-2),
-    SecondMinor = SecondMajor ++ ".1.3",
-    FirstMajor = vsn(X,Y-1),
-    FirstMinor = FirstMajor ++ ".57",
-    ThisMajor = vsn(X,Y),
-    This =
-	case Rest of
-	    [] ->
-		[];
-	    ["1"] ->
-		[ThisMajor];
-	    _ ->
-		ThisMinor = ThisMajor ++ ".1",
-		[ThisMajor,ThisMinor]
-	end,
-    OkVsns = This ++ [FirstMajor, FirstMinor, SecondMajor, SecondMinor],
-
-    ThirdMajor = vsn(X,Y-3),
-    ThirdMinor = ThirdMajor ++ ".10.12",
-    Illegal = ThisMajor ++ ",1",
-    Newer1Major = vsn(X,Y+1),
-    Newer1Minor = Newer1Major ++ ".1",
-    Newer2Major = ThisMajor ++ "1",
-    NokVsns = [ThirdMajor,ThirdMinor,
-	       Illegal,
-	       Newer1Major,Newer1Minor,
-	       Newer2Major],
-    {OkVsns,NokVsns}.
-
-vsn(X,Y) ->
-    integer_to_list(X) ++ "." ++ integer_to_list(Y).
+    case OldRel of
+	false ->
+	    app_vsn(App,Rs);
+	_ ->
+	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[OldRel]}]),
+	    _ = rpc:call(N,application,load,[App]),
+	    As = rpc:call(N,application,loaded_applications,[]),
+	    {_,_,V} = lists:keyfind(App,1,As),
+	    test_server:stop_node(N),
+	    [V|app_vsn(App,Rs)]
+    end;
+app_vsn(_App,[]) ->
+    [].
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
     case systools_relup:appup_search_for_version(Vsn, Instrs) of
@@ -153,7 +134,6 @@ check_appup([],_,_) ->
     ok.
 
 
-
 %% OTP-9185 - fail sasl start if some but not all log_mf_h env vars
 %% are given.
 log_mf_h_env(Config) ->
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 367cab1d77..e3f6933476 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -43,6 +43,7 @@
 -export([script_options/1, normal_script/1, unicode_script/1,
 	 unicode_script/2, no_mod_vsn_script/1,
 	 wildcard_script/1, variable_script/1, no_sasl_script/1,
+	 no_dot_erlang_script/1,
 	 abnormal_script/1, src_tests_script/1, crazy_script/1,
 	 included_script/1, included_override_script/1,
 	 included_fail_script/1, included_bug_script/1, exref_script/1,
@@ -59,6 +60,7 @@
 -export([otp_6226_outdir/1]).
 -export([init_per_suite/1, end_per_suite/1, 
 	 init_per_testcase/2, end_per_testcase/2]).
+-export([delete_tree/1]).
 
 -import(lists, [foldl/3]).
 
@@ -78,7 +80,8 @@ groups() ->
     [{script, [],
       [script_options, normal_script, unicode_script, no_mod_vsn_script,
        wildcard_script, variable_script, abnormal_script,
-       no_sasl_script, src_tests_script, crazy_script,
+       no_sasl_script, no_dot_erlang_script,
+       src_tests_script, crazy_script,
        included_script, included_override_script,
        included_fail_script, included_bug_script, exref_script,
        otp_3065_circular_dependenies, included_and_used_sort_script]},
@@ -137,9 +140,9 @@ compile_source(File) ->
     ok = file:write_file(OutFileTemp, Code),
     file:rename(OutFileTemp, OutFile).
 
-end_per_suite(Conf) when is_list(Conf) ->
-    %% Nothing.
-    Conf.
+end_per_suite(Config) when is_list(Config) ->
+    rh_test_lib:clean_dir(?privdir),
+    Config.
 
 init_per_testcase(link_tar, Config) ->
     case os:type() of
@@ -299,6 +302,11 @@ unicode_script(Config) when is_list(Config) ->
     %% 3. path (directory name where unicode_app.tgz is extracted)
     true = lists:member({path,[P1]},Instr),
 
+    %% If all is good, delete the unicode dir to avoid lingering files
+    %% on windows.
+    rpc:call(Node,code,add_pathz,[filename:dirname(code:which(?MODULE))]),
+    rpc:call(Node,?MODULE,delete_tree,[UnicodeLibDir]),
+
     ok.
 
 unicode_script(cleanup,Config) ->
@@ -451,6 +459,34 @@ no_sasl_script(Config) when is_list(Config) ->
     ok = file:set_cwd(OldDir),
     ok.
 
+%% make_script: Create script with no_dot_erlang. Check script contents.
+no_dot_erlang_script(Config) when is_list(Config) ->
+    {ok, OldDir} = file:get_cwd(),
+
+    {LatestDir, LatestName} = create_script(latest1_no_sasl,Config),
+
+    DataDir = filename:absname(?copydir),
+    LibDir = [fname([DataDir, d_normal, lib])],
+    P = [fname([LibDir, '*', ebin]),
+	 fname([DataDir, lib, kernel, ebin]),
+	 fname([DataDir, lib, stdlib, ebin]),
+	 fname([DataDir, lib, sasl, ebin])],
+
+    ok = file:set_cwd(LatestDir),
+
+    {ok, _ , []} =
+	systools:make_script(LatestName,[{path, P},silent, no_warn_sasl]),
+    {ok, [{_, _, LoadDotErlang}]} = read_script_file(LatestName),
+    [erlangrc] = [E || {apply, {c, E, []}} <- LoadDotErlang],
+
+    {ok, _ , []} =
+	systools:make_script(LatestName,[{path, P},silent, no_warn_sasl, no_dot_erlang]),
+    {ok, [{_, _, DoNotLoadDotErlang}]} = read_script_file(LatestName),
+    [] = [E || {apply, {c, E, []}} <- DoNotLoadDotErlang],
+
+    ok = file:set_cwd(OldDir),
+    ok.
+
 
 %% make_script: Do not check date of object file or that source code
 %% can be found.
@@ -1924,12 +1960,12 @@ otp_6226_outdir(Config) when is_list(Config) ->
     ok = file:delete(Relup),
 
     %% d) absolute but incorrect path
-    {error,_,{file_problem,{"relup",enoent}}} =
+    {error,_,{file_problem,{"relup",{open,enoent}}}} =
 	systools:make_relup(LatestName,[LatestName1],[LatestName1],
 			    [{outdir,Outdir2},{path,P},silent]),
 
     %% e) relative but incorrect path
-    {error,_,{file_problem,{"relup",enoent}}} =
+    {error,_,{file_problem,{"relup",{open,enoent}}}} =
 	systools:make_relup(LatestName,[LatestName1],[LatestName1],
 			    [{outdir,"./outdir2"},{path,P},silent]),
 
diff --git a/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app b/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app
index 3d38a3dde4..7d56a298b8 100644
--- a/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app
+++ b/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 {application, ua,
    [{description, "αβ"},
     {vsn, "1.0"},
diff --git a/lib/sasl/test/systools_rc_SUITE.erl b/lib/sasl/test/systools_rc_SUITE.erl
index 0cb6e63cf3..5efab7c028 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -436,25 +436,19 @@ translate(Config) when is_list(Config) ->
 
 translate_app(Config) when is_list(Config) ->
     PreApps =
-	[#application{name = test,
-		      description = "TEST",
-		      vsn = "1.0",
-		      modules = [foo,bar,baz],
-		      regs = [],
-		      mod = {sasl, []}},
+	[Test = #application{name = test,
+			     description = "TEST",
+			     vsn = "1.0",
+			     modules = [foo,bar,baz],
+			     regs = [],
+			     mod = {sasl, []}},
 	 #application{name = pelle,
 		      description = "PELLE",
 		      vsn = "1.0",
 		      modules = [pelle, kalle],
 		      regs = [],
 		      mod = {pelle, []}}],
-    Apps =
-	[#application{name = test,
-		      description = "TEST",
-		      vsn = "1.0",
-		      modules = [foo,bar,baz],
-		      regs = [],
-		      mod = {sasl, []}}],
+    Apps = [Test],
     %% Simple translation (1)
     Up1 = [{add_module, foo},
 	   {add_module, bar}],
@@ -475,6 +469,56 @@ translate_app(Config) when is_list(Config) ->
      {load,{baz,brutal_purge,brutal_purge}},
      {apply,{application,start,[test,permanent]}}] = X2,
 
+    %% Translate add_application with different restart types
+    %%  permanent
+    Up2_1 = [{add_application, test, permanent}],
+    {ok, X2_1} = systools_rc:translate_scripts([Up2_1], Apps, []),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,start,[test,permanent]}}] = X2_1,
+
+    %%  transient
+    Up2_2 = [{add_application, test, transient}],
+    {ok, X2_2} = systools_rc:translate_scripts([Up2_2], Apps, []),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,start,[test,transient]}}] = X2_2,
+
+    %%  temporary
+    Up2_3 = [{add_application, test, temporary}],
+    {ok, X2_3} = systools_rc:translate_scripts([Up2_3], Apps, []),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,start,[test,temporary]}}] = X2_3,
+
+    %%  load
+    Up2_4 = [{add_application, test, load}],
+    {ok, X2_4} = systools_rc:translate_scripts([Up2_4], Apps, []),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,load,[test]}}] = X2_4,
+
+    %%  none
+    Up2_5 = [{add_application, test, none}],
+    {ok, X2_5} = systools_rc:translate_scripts([Up2_5], Apps, []),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}}] = X2_5,
+
     %% Simple translation (3)
     Up3 = [{remove_application, pelle}],
     {ok, X3} = systools_rc:translate_scripts([Up3], Apps, PreApps),
@@ -484,6 +528,102 @@ translate_app(Config) when is_list(Config) ->
      {remove,{kalle,brutal_purge,brutal_purge}},
      {purge,[pelle,kalle]},
      {apply,{application,unload,[pelle]}}] = X3,
+
+    %% Simple translation (4)
+    Up4 = [{restart_application, test}],
+    {ok, X4} = systools_rc:translate_scripts([Up4], Apps, PreApps),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {apply,{application,stop,[test]}},
+     {remove,{foo,brutal_purge,brutal_purge}},
+     {remove,{bar,brutal_purge,brutal_purge}},
+     {remove,{baz,brutal_purge,brutal_purge}},
+     {purge,[foo,bar,baz]},
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,start,[test,permanent]}}] = X4,
+
+    %% Translate restart_application with different restart types
+    %%  permanent
+    {ok, X4_1} = systools_rc:translate_scripts([Up4],
+					       [Test#application{type=permanent}],
+					       [Test]),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {apply,{application,stop,[test]}},
+     {remove,{foo,brutal_purge,brutal_purge}},
+     {remove,{bar,brutal_purge,brutal_purge}},
+     {remove,{baz,brutal_purge,brutal_purge}},
+     {purge,[foo,bar,baz]},
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,start,[test,permanent]}}] = X4_1,
+
+    %%  transient
+    {ok, X4_2} = systools_rc:translate_scripts([Up4],
+					       [Test#application{type=transient}],
+					       [Test]),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {apply,{application,stop,[test]}},
+     {remove,{foo,brutal_purge,brutal_purge}},
+     {remove,{bar,brutal_purge,brutal_purge}},
+     {remove,{baz,brutal_purge,brutal_purge}},
+     {purge,[foo,bar,baz]},
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,start,[test,transient]}}] = X4_2,
+
+    %%  temporary
+    {ok, X4_3} = systools_rc:translate_scripts([Up4],
+					       [Test#application{type=temporary}],
+					       [Test]),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {apply,{application,stop,[test]}},
+     {remove,{foo,brutal_purge,brutal_purge}},
+     {remove,{bar,brutal_purge,brutal_purge}},
+     {remove,{baz,brutal_purge,brutal_purge}},
+     {purge,[foo,bar,baz]},
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,start,[test,temporary]}}] = X4_3,
+
+    %%  load
+    {ok, X4_4} = systools_rc:translate_scripts([Up4],
+					       [Test#application{type=load}],
+					       [Test]),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {apply,{application,stop,[test]}},
+     {remove,{foo,brutal_purge,brutal_purge}},
+     {remove,{bar,brutal_purge,brutal_purge}},
+     {remove,{baz,brutal_purge,brutal_purge}},
+     {purge,[foo,bar,baz]},
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}},
+     {apply,{application,load,[test]}}] = X4_4,
+
+    %%  none
+    {ok, X4_5} = systools_rc:translate_scripts([Up4],
+					       [Test#application{type=none}],
+					       [Test]),
+    [{load_object_code,{test,"1.0",[foo,bar,baz]}},
+     point_of_no_return,
+     {apply,{application,stop,[test]}},
+     {remove,{foo,brutal_purge,brutal_purge}},
+     {remove,{bar,brutal_purge,brutal_purge}},
+     {remove,{baz,brutal_purge,brutal_purge}},
+     {purge,[foo,bar,baz]},
+     {load,{foo,brutal_purge,brutal_purge}},
+     {load,{bar,brutal_purge,brutal_purge}},
+     {load,{baz,brutal_purge,brutal_purge}}] = X4_5,
+
     ok.
 
 
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
index eeef721647..c8a4e92f24 100644
--- a/lib/sasl/test/test_lib.hrl
+++ b/lib/sasl/test/test_lib.hrl
@@ -1,3 +1,3 @@
 -define(ertsvsn,"4.4").
--define(kernelvsn,"2.14.3").
--define(stdlibvsn,"1.17.3").
+-define(kernelvsn,"2.16.4").
+-define(stdlibvsn,"1.19.4").
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 551c833446..da8cbc5130 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 2.3.2
+SASL_VSN = 2.4
diff --git a/lib/snmp/doc/src/book.xml b/lib/snmp/doc/src/book.xml
index 2897d25d55..a5c054142f 100644
--- a/lib/snmp/doc/src/book.xml
+++ b/lib/snmp/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/fascicules.xml b/lib/snmp/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/snmp/doc/src/fascicules.xml
+++ b/lib/snmp/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 80de9738f1..ab5514e550 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1996</year><year>2013</year>
+      <year>1996</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -34,6 +34,346 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.25.0.1</title>
+    <p>Version 4.25.0.1 supports code replacement in runtime from/to
+    version 4.25, 4.24.2, 4.24.1 and 4.24. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Updated doc files to utf8. </p>
+          <p>Own Id: OTP-10907</p>
+        </item>
+
+        <item>
+          <p>Fixed test suite to support UTF-8 paths. </p>
+          <p>Own Id: OTP-10877</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>Wrong block cypher type used for AES ('aes_cbf128' 
+	  instead of 'aes_cfb128') when performing AES block 
+	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol 
+	  in agent and manager. </p>
+          <p>Own Id: OTP-11412</p>
+        </item>
+
+        <item>
+          <p>[manager] When performing the AES encryption, invalid values for 
+	  the EngineBoots and EngineTime was used. </p>
+	  <p>The values of the local agent was used, which would have produced 
+	  "some" values if an agent was actually running. 
+	  If not it would have caused a crash. </p>
+	  <p>Own Id: OTP-11413</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+  </section> <!-- 4.25.0.1 -->
+
+
+  <section>
+    <title>SNMP Development Toolkit 4.25</title>
+    <p>Version 4.25 supports code replacement in runtime from/to
+    version 4.24.2, 4.24.1, 4.24, 4.23.1 and 4.23. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] Enable SNMP to create missing database directories. </p>
+	  <p>Add 
+	  <seealso marker="snmp_app#db_init_error">
+	  {db_init_error, create_db_and_dir}</seealso> option to SNMP 
+	  <seealso marker="snmp_app#manager_opts_and_types">manager</seealso> 
+	  and
+	  <seealso marker="snmp_app#agent_opts_and_types">agent</seealso>. 
+	  This allows them to create any missing parent directories for
+	  <c>db_dir</c>, rather than treating any missing directories 
+	  as a fatal error.
+	  The default for <c>db_init_error</c>, which is <c>terminate</c>, 
+	  is unchanged. </p>
+	  <p>Steve Vinoski</p>
+          <p>Own Id: OTP-11352</p>
+        </item>
+
+        <item>
+          <p>[manager] Improved handling of unexpected return values from
+	  <seealso marker="snmpm_user">snmpm_user</seealso>
+	  callback functions. </p>
+	  <p>Violations of the documented API (crashes or invalid return 
+	  values) will now result in an error message. </p>
+          <p>Own Id: OTP-11307</p>
+        </item>
+
+        <item>
+          <p>Add (atl) log conversion block option. </p>
+	  <p>It is now possible to request that the Audit Trail Log should
+	  be blocked during conversion (<c>log_to_txt</c> or <c>log_to_io</c>). 
+	  This could be usefull when coverting an entire large log (when 
+	  there is a chance it may otherwise wrap during conversion). </p>
+	  <p>See 
+	  agent 
+	  <seealso marker="snmpa#log_to_txt">log_to_txt</seealso> and
+	  <seealso marker="snmpa#log_to_io">log_to_io</seealso> and also 
+	  manager 
+	  <seealso marker="snmpm#log_to_txt">log_to_txt</seealso> and
+	  <seealso marker="snmpm#log_to_io">log_to_io</seealso> 
+	  for details. </p>
+          <p>Own Id: OTP-11396</p>
+          <p>Own Id: seq12433</p>
+        </item>
+
+        <item>
+          <p>When converting an Audit Trail Log to text, a corrupt
+	  log entry could cause the entire conversion to fail. </p>
+	  <p>Also, for a log with sequence numbers, failing to 
+	  decode a log entry would cause the conversion to fail
+	  (not because of the failed decode, but because of the 
+	  failure to write the error message). </p>
+          <p>Own Id: OTP-111453</p>
+          <p>Aux Id: Seq 12459</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>Wrong block cypher type used for AES ('aes_cbf128' 
+	  instead of 'aes_cfb128') when performing AES block 
+	  encrypt/decrypt which breaks SNMP usmAesCfb128Protocol 
+	  in agent and manager. </p>
+          <p>Own Id: OTP-11412</p>
+        </item>
+
+        <item>
+          <p>[manager] When performing the AES encryption, invalid values for 
+	  the EngineBoots and EngineTime was used. </p>
+	  <p>The values of the local agent was used, which would have produced 
+	  "some" values if an agent was actually running. 
+	  If not it would have caused a crash. </p>
+	  <p>Own Id: OTP-11413</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+  </section> <!-- 4.25 -->
+
+
+  <section>
+    <title>SNMP Development Toolkit 4.24.2</title>
+    <p>Version 4.24.2 supports code replacement in runtime from/to
+    version 4.24.1, 4.24, 4.23.1 and 4.23. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] Improved documentation for the functions for 
+	  loading and unloading mibs, 
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
+	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso> for 
+	  more info. </p>
+          <p>Also added new functions for loading and unloading a single mib, 
+	  see <seealso marker="snmpa#load_mib">load_mib</seealso> and 
+	  <seealso marker="snmpa#unload_mib">unload_mib</seealso> for 
+	  more info. </p>
+          <p>Own Id: OTP-11216</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent] 
+	  see <seealso marker="snmpa#load_mibs">load_mibs</seealso> and 
+	  <seealso marker="snmpa#unload_mibs">unload_mibs</seealso>. </p>
+          <p>Own Id: OTP-11216</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+-->
+    </section>
+    
+  </section> <!-- 4.24.2 -->
+
+
+  <section>
+    <title>SNMP Development Toolkit 4.24.1</title>
+    <p>Version 4.24.1 supports code replacement in runtime from/to
+    version 4.24, 4.23.1 and 4.23. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent,manager] Updated to support the new crypto interface. </p>
+          <p>Own Id: OTP-11009</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent] Reading the value of the vacmViewTreeFamilyMask returns 
+	  it in the wrong (internal bitlist) format. </p>
+	  <p>The vacmViewTreeFamilyMask is defined as a bit string in the MIB
+	  (OCTET STRING). Internally a bitlist (list of 1's and 0's, 
+	  see <seealso marker="snmp_agent_config_files#vacm">vacm config file</seealso>
+	  for more info) is used. 
+	  However, the MIB implementation assumed the latter, effectively
+	  rendering all attempts to read/set masks via SNMP unsuccessful. </p>
+	  <p>Since the mask is used in hot paths (e.g. access permission checks 
+	  for each SNMP operation, the bitlist representation of the mask has 
+	  benefits (e.g. faster processing). Reading/writing the view mask 
+	  objects is less time-critical. Therefore, to fix the issue, convert 
+	  between the bitlist (internal) representation and bitstring 
+	  (external) when the vacmViewTreeFamilyMask objects are accessed. </p>
+	  <p>Also, the check of the vacm config file was invalid with 
+	  regard to the mask value. It was assumed to be a proper oid, which 
+	  is not strictly the case (see bitlist above). </p>
+          <p>Own Id: OTP-11177</p>
+	  <p>Stefan Zegenhagen</p>
+        </item>
+
+        <item>
+          <p>[agent] The counter increment function in the local-db was  
+	  incorrect. It did not handle counter wrap correctly. </p>
+          <p>Own Id: OTP-11192</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+  </section> <!-- 4.24.1 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.24</title>
     <p>Version 4.24 supports code replacement in runtime from/to
     version 4.23.1 and 4.23. </p>
@@ -67,7 +407,7 @@
 	  <seealso marker="snmpa_mib_storage">mib storage</seealso>. 
 	  At present there are three simple modules 
 	  (<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
-	  <c>snmpa_mib_storage_mnesia</c>) implement�ng this behaviour, 
+	  <c>snmpa_mib_storage_mnesia</c>) implementing this behaviour,
 	  provided with the app. </p>
 	  <p>A config option for the (agent) 
 	  <seealso marker="snmp_config#agent_mib_storage">mib storage</seealso> 
diff --git a/lib/snmp/doc/src/notes_history.xml b/lib/snmp/doc/src/notes_history.xml
index 023717cd7c..62c6782fd7 100644
--- a/lib/snmp/doc/src/notes_history.xml
+++ b/lib/snmp/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/part.xml b/lib/snmp/doc/src/part.xml
index 603ddc7a62..e68872347d 100644
--- a/lib/snmp/doc/src/part.xml
+++ b/lib/snmp/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/part_notes.xml b/lib/snmp/doc/src/part_notes.xml
index 6d00e5b7e3..f716ac10c2 100644
--- a/lib/snmp/doc/src/part_notes.xml
+++ b/lib/snmp/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/part_notes_history.xml b/lib/snmp/doc/src/part_notes_history.xml
index bebd33e81b..3c1cacbede 100644
--- a/lib/snmp/doc/src/part_notes_history.xml
+++ b/lib/snmp/doc/src/part_notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/ref_man.xml b/lib/snmp/doc/src/ref_man.xml
index 9495486c39..9ceaa5e4fb 100644
--- a/lib/snmp/doc/src/ref_man.xml
+++ b/lib/snmp/doc/src/ref_man.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/lib/snmp/doc/src/snmp.xml b/lib/snmp/doc/src/snmp.xml
index 3e6610891f..b9cd4b3402 100644
--- a/lib/snmp/doc/src/snmp.xml
+++ b/lib/snmp/doc/src/snmp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -341,8 +341,9 @@
 
     <func>
       <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Block | Stop) -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop, Block) -> ok | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
@@ -352,53 +353,56 @@
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
         <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
+        <v>Block = boolean()</v>
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>Converts an Audit Trail Log to a readable text file, where
-          each item has a trailing TAB character, and any TAB
-          character in the body of an item has been replaced by ESC
-          TAB.
-          </p>
+	<p>Converts an Audit Trail Log to a readable text file, where
+	each item has a trailing TAB character, and any TAB
+	character in the body of an item has been replaced by ESC
+	TAB. </p>
         <p>The function can be used on a running system, or by copying
-          the entire log directory and calling this function. SNMP
-          must be running in order to provide MIB information.
-          </p>
+	the entire log directory and calling this function. SNMP
+	must be running in order to provide MIB information. </p>
         <p><c>LogDir</c> is the name of the directory where the audit
-          trail log is stored. 
-          <c>Mibs</c> is a list of Mibs to be used. The function uses 
-          the information in the Mibs to convert for example object 
-          identifiers to their symbolic name. 
-          <c>OutFile</c> is the name of the generated text-file.
-          <c>LogName</c> is the name of the log, 
-          <c>LogFile</c> is the name of the log file. 
-          <c>Start</c> is the start (first) date and time from which 
-          log events will be converted and 
-          <c>Stop</c> is the stop (last) date and time to which log 
-          events will be converted.
-          </p>
-        <p>The format of an audit trail log text item is as follows:
-          </p>
-        <p><c>Tag Addr - Community [TimeStamp] Vsn</c><br></br>
-          <c>PDU</c></p>
-        <p>where <c>Tag</c> is <c>request</c>, <c>response</c>, 
-          <c>report</c>, <c>trap</c> or <c>inform</c>; Addr is 
-          <c>IP:Port</c> (or comma space separated list of such);
-          <c>Community</c> is the community parameter (SNMP version
-          v1 and v2), or <c>SecLevel:"AuthEngineID":"UserName"</c>
-          (SNMP v3); <c>TimeStamp</c> is a date and time stamp,
-          and <c>Vsn</c> is the SNMP version. <c>PDU</c> is a textual
-          version of the protocol data unit. There is a new line
-          between <c>Vsn</c> and <c>PDU</c>.</p>
-
+	trail log is stored. 
+	<c>Mibs</c> is a list of Mibs to be used. The function uses 
+	the information in the Mibs to convert for example object 
+	identifiers to their symbolic name. 
+	<c>OutFile</c> is the name of the generated text-file.
+	<c>LogName</c> is the name of the log, 
+	<c>LogFile</c> is the name of the log file. 
+	<c>Start</c> is the start (first) date and time from which 
+	log events will be converted and 
+	<c>Stop</c> is the stop (last) date and time to which log 
+	events will be converted.
+	The <c>Block</c> argument indicates if the log should be blocked
+	during conversion. This could be usefull when converting large 
+	logs (when otherwise the log could wrap during conversion). 
+	Defaults to <c>true</c>. 
+	</p>
+	<p>The format of an audit trail log text item is as follows: </p>
+	<p><c>Tag Addr - Community [TimeStamp] Vsn</c><br></br>
+	<c>PDU</c></p>
+	<p>where <c>Tag</c> is <c>request</c>, <c>response</c>, 
+	<c>report</c>, <c>trap</c> or <c>inform</c>; Addr is 
+	<c>IP:Port</c> (or comma space separated list of such);
+	<c>Community</c> is the community parameter (SNMP version
+	v1 and v2), or <c>SecLevel:"AuthEngineID":"UserName"</c>
+	(SNMP v3); <c>TimeStamp</c> is a date and time stamp,
+	and <c>Vsn</c> is the SNMP version. <c>PDU</c> is a textual
+	version of the protocol data unit. There is a new line
+	between <c>Vsn</c> and <c>PDU</c>.</p>
+	
         <marker id="log_to_io"></marker>
       </desc>
     </func>
 
     <func>
       <name>log_to_io(LogDir, Mibs, LogName, LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Block | Stop) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop, Block) -> ok | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
diff --git a/lib/snmp/doc/src/snmp_advanced_agent.xml b/lib/snmp/doc/src/snmp_advanced_agent.xml
index 6600206c2d..4323b05858 100644
--- a/lib/snmp/doc/src/snmp_advanced_agent.xml
+++ b/lib/snmp/doc/src/snmp_advanced_agent.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_agent_config_files.xml b/lib/snmp/doc/src/snmp_agent_config_files.xml
index bd5c537522..1e8e879814 100644
--- a/lib/snmp/doc/src/snmp_agent_config_files.xml
+++ b/lib/snmp/doc/src/snmp_agent_config_files.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,13 +32,15 @@
     <file>snmp_agent_config_files.xml</file>
   </header>
   <p>All configuration data must be included in configuration files
-    that are located in the configuration directory. The name of this
-    directory is given in the <c>config_dir</c> configuration
-    parameter.  These files are read at start-up, and are used to
-    initialize the SNMPv2-MIB or STANDARD-MIB, SNMP-FRAMEWORK-MIB,
-    SNMP-MPD-MIB, SNMP-VIEW-BASED-ACM-MIB, SNMP-COMMUNITY-MIB,
-    SNMP-USER-BASED-SM-MIB, SNMP-TARGET-MIB and SNMP-NOTIFICATION-MIB
-    (refer to the <seealso marker="snmp_agent_funct_descr#management">Management of the Agent</seealso> for a description of the MIBs). </p>
+  that are located in the configuration directory. The name of this
+  directory is given in the <c>config_dir</c> configuration
+  parameter.  These files are read at start-up, and are used to
+  initialize the SNMPv2-MIB or STANDARD-MIB, SNMP-FRAMEWORK-MIB,
+  SNMP-MPD-MIB, SNMP-VIEW-BASED-ACM-MIB, SNMP-COMMUNITY-MIB,
+  SNMP-USER-BASED-SM-MIB, SNMP-TARGET-MIB and SNMP-NOTIFICATION-MIB
+  (refer to the 
+  <seealso marker="snmp_agent_funct_descr#management">Management of the Agent</seealso> 
+  for a description of the MIBs). </p>
   <p>The files are: </p>
   <list type="bulleted">
     <item>
@@ -79,35 +81,35 @@
     </item>
   </list>
   <p>The directory where the configuration files are found is given as
-    a parameter to the agent. </p>
+  a parameter to the agent. </p>
   <p>The entry format in all files are Erlang terms, separated by a
-    '<em>.</em>' and a <em>newline</em>. In the following sections, the
-    formats of these terms are described. Comments may be specified as
-    ordinary Erlang comments. </p>
+  '<em>.</em>' and a <em>newline</em>. In the following sections, the
+  formats of these terms are described. Comments may be specified as
+  ordinary Erlang comments. </p>
   <p>Syntax errors in these files are discovered and reported with the
-    function <c>config_err/2</c> of the error report module at start-up. </p>
-
+  function <c>config_err/2</c> of the error report module at start-up. </p>
+  
+  <marker id="agent_information"></marker>
+  
   <section>
-    <marker id="agent_information"></marker>
     <title>Agent Information</title>
     <p>The agent information should be stored in a file called
-      <c>agent.conf</c>.
-      </p>
-    <p>Each entry is a tuple of size two:
-      </p>
+    <c>agent.conf</c>. </p>
+    <p>Each entry is a tuple of size two:</p>
     <p><c>{AgentVariable, Value}.</c></p>
     <list type="bulleted">
-      <item><c>AgentVariable</c> is one of the variables is
-       SNMP-FRAMEWORK-MIB or one of the internal variables
-      <c>intAgentUDPPort</c>, which defines which UDP port the agent
-       listens to, or <c>intAgentIpAddress</c>, which defines the IP
-       address of the agent.
+      <item>
+	<p><c>AgentVariable</c> is one of the variables is
+	SNMP-FRAMEWORK-MIB or one of the internal variables
+	<c>intAgentUDPPort</c>, which defines which UDP port the agent
+	listens to, or <c>intAgentIpAddress</c>, which defines the IP
+	address of the agent. </p>
       </item>
-      <item><c>Value</c> is the value for the variable.
+      <item>
+	<p><c>Value</c> is the value for the variable.</p>
       </item>
     </list>
-    <p>The following example shows a <c>agent.conf</c> file: 
-      </p>
+    <p>The following example shows a <c>agent.conf</c> file: </p>
     <pre>
 {intAgentUDPPort, 4000}.
 {intAgentIpAddress,[141,213,11,24]}.
@@ -115,49 +117,47 @@
 {snmpEngineMaxPacketSize, 484}.
     </pre>
     <p>The value of <c>snmpEngineID</c> is a string, which for a 
-      deployed agent should have a very specific structure. See
-      RFC 2271/2571 for details.
-      </p>
+    deployed agent should have a very specific structure. See
+    RFC 2271/2571 for details.</p>
+
+    <marker id="context"></marker>
   </section>
 
   <section>
-    <marker id="context"></marker>
     <title>Contexts</title>
     <p>The context information should be stored in a file called
-      <c>context.conf</c>.  The default context <c>""</c>
-      need not be present.
-      </p>
+    <c>context.conf</c>.  The default context <c>""</c>
+    need not be present.</p>
     <p>Each row defines a context in the agent.  This information is
-      used in the table <c>vacmContextTable</c> in the
-      SNMP-VIEW-BASED-ACM-MIB.
-      </p>
-    <p>Each entry is a term:
-      </p>
+    used in the table <c>vacmContextTable</c> in the
+    SNMP-VIEW-BASED-ACM-MIB.</p>
+    <p>Each entry is a term:</p>
     <p><c>ContextName.</c></p>
     <list type="bulleted">
-      <item><c>ContextName</c> is a string.
+      <item>
+	<p><c>ContextName</c> is a string.</p>
       </item>
     </list>
+
+    <marker id="system_information"></marker>
   </section>
 
   <section>
-    <marker id="system_information"></marker>
     <title>System Information</title>
     <p>The system information should be stored in a file called
-      <c>standard.conf</c>.
-      </p>
-    <p>Each entry is a tuple of size two:
-      </p>
+    <c>standard.conf</c>.</p>
+    <p>Each entry is a tuple of size two:</p>
     <p><c>{SystemVariable, Value}.</c></p>
     <list type="bulleted">
-      <item><c>SystemVariable</c> is one of the variables in the
-       system group, or <c>snmpEnableAuthenTraps</c>.
+      <item>
+	<p><c>SystemVariable</c> is one of the variables in the
+	system group, or <c>snmpEnableAuthenTraps</c>. </p>
       </item>
-      <item><c>Value</c> is the value for the variable.
+      <item>
+	<p><c>Value</c> is the value for the variable. </p>
       </item>
     </list>
-    <p>The following example shows a valid <c>standard.conf</c> file: 
-      </p>
+    <p>The following example shows a valid <c>standard.conf</c> file: </p>
     <pre>
 {sysDescr, "Erlang SNMP agent"}.
 {sysObjectID, [1,2,3]}.
@@ -167,59 +167,60 @@
 {snmpEnableAuthenTraps, enabled}.
     </pre>
     <p>A value must be provided for all variables, which lack default
-      values in the MIB.
-      </p>
+    values in the MIB. </p>
+
+    <marker id="community"></marker>
   </section>
 
   <section>
-    <marker id="community"></marker>
     <title>Communities</title>
     <p>The community information should be stored in a file called
-      <c>community.conf</c>.  It must be present if the agent is
-      configured for SNMPv1 or SNMPv2c.
-      </p>
+    <c>community.conf</c>. It must be present if the agent is
+    configured for SNMPv1 or SNMPv2c. </p>
     <p>An SNMP <em>community</em> is a relationship between an SNMP
     agent and a set of SNMP managers that defines authentication, access 
     control and proxy characteristics. </p>
     <p>The corresponding table is <c>snmpCommunityTable</c> in the
-      SNMP-COMMUNITY-MIB. </p>
+    SNMP-COMMUNITY-MIB. </p>
     <p>Each entry is a term: </p>
-    <p><c>{CommunityIndex, CommunityName, SecurityName, ContextName, TransportTag}.</c></p>
+    <p><c>{CommunityIndex, CommunityName, SecurityName, ContextName, TransportTag}.</c> </p>
     <list type="bulleted">
-      <item><c>CommunityIndex</c> is a non-empty string.
+      <item>
+	<p><c>CommunityIndex</c> is a non-empty string.</p>
       </item>
-      <item><c>CommunityName</c> is a string.
+      <item>
+	<p><c>CommunityName</c> is a string.</p>
       </item>
-      <item><c>SecurityName</c> is a string.
+      <item>
+	<p><c>SecurityName</c> is a string.</p>
       </item>
-      <item><c>ContextName</c> is a string.
+      <item>
+	<p><c>ContextName</c> is a string.</p>
       </item>
-      <item><c>TransportTag</c> is a string.
+      <item>
+	<p><c>TransportTag</c> is a string.</p>
       </item>
     </list>
+
+    <marker id="vacm"></marker>
   </section>
 
   <section>
-    <marker id="vacm"></marker>
     <title>MIB Views for VACM</title>
     <p>The information about MIB Views for VACM should be stored in a 
-      file called
-      <c>vacm.conf</c>.
-      </p>
+    file called <c>vacm.conf</c>.</p>
     <p>The corresponding tables are <c>vacmSecurityToGroupTable</c>,
-      <c>vacmAccessTable</c> and <c>vacmViewTreeFamilyTable</c> in the
-      SNMP-VIEW-BASED-ACM-MIB.
-      </p>
+    <c>vacmAccessTable</c> and <c>vacmViewTreeFamilyTable</c> in the
+    SNMP-VIEW-BASED-ACM-MIB.</p>
     <p>Each entry is one of the terms, one entry corresponds to one
-      row in one of the tables.
-      </p>
+    row in one of the tables.</p>
     <p><c>{vacmSecurityToGroup, SecModel, SecName, GroupName}.</c></p>
     <p><c>{vacmAccess, GroupName, Prefix, SecModel, SecLevel, Match, ReadView, WriteView, NotifyView}.</c></p>
     <p><c>{vacmViewTreeFamily, ViewIndex, ViewSubtree, ViewStatus, ViewMask}.</c></p>
     <list type="bulleted">
       <item>
         <p><c>SecModel</c> is <c>any</c>, <c>v1</c>, <c>v2c</c>, or
-          <c>usm</c>.</p>
+	<c>usm</c>.</p>
       </item>
       <item>
         <p><c>SecName</c> is a string.</p>
@@ -232,7 +233,7 @@
       </item>
       <item>
         <p><c>SecLevel</c> is <c>noAuthNoPriv</c>, <c>authNoPriv</c>,
-          or <c>authPriv</c></p>
+	or <c>authPriv</c></p>
       </item>
       <item>
         <p><c>Match</c> is <c>prefix</c> or <c>exact</c>.</p>
@@ -244,8 +245,7 @@
         <p><c>WriteView</c> is a string.</p>
       </item>
       <item>
-        <p><c>NotifyView</c> is a string.
-          </p>
+        <p><c>NotifyView</c> is a string.</p>
       </item>
       <item>
         <p><c>ViewIndex</c> is an integer.</p>
@@ -258,33 +258,29 @@
       </item>
       <item>
         <p><c>ViewMask</c> is either <c>null</c> or a list of ones and
-          zeros. Ones nominate that an exact match is used for this
-          sub-identifier. Zeros are wild-cards which match any
-          sub-identifier. If the mask is shorter than the sub-tree, the
-          tail is regarded as all ones. <c>null</c> is shorthand for a
-          mask with all ones.</p>
+	zeros. Ones nominate that an exact match is used for this
+	sub-identifier. Zeros are wild-cards which match any
+	sub-identifier. If the mask is shorter than the sub-tree, the
+	tail is regarded as all ones. <c>null</c> is shorthand for a
+	mask with all ones. </p>
       </item>
     </list>
+
+    <marker id="usm"></marker>
   </section>
 
   <section>
-    <marker id="usm"></marker>
     <title>Security data for USM</title>
     <p>The information about Security data for USM should be stored in a 
-      file called
-      <c>usm.conf</c>, which must be present if the agent is configured
-      for SNMPv3.
-      </p>
+    file called <c>usm.conf</c>, which must be present if the agent is 
+    configured for SNMPv3. </p>
     <p>The corresponding table is <c>usmUserTable</c> in the
-      SNMP-USER-BASED-SM-MIB.
-      </p>
-    <p>Each entry is a term:
-      </p>
+    SNMP-USER-BASED-SM-MIB.</p>
+    <p>Each entry is a term:</p>
     <p><c>{EngineID, UserName, SecName, Clone, AuthP, AuthKeyC, OwnAuthKeyC, PrivP, PrivKeyC, OwnPrivKeyC, Public, AuthKey, PrivKey}.</c></p>
     <list type="bulleted">
       <item>
-        <p><c>EngineID</c> is a string.
-          </p>
+        <p><c>EngineID</c> is a string.</p>
       </item>
       <item>
         <p><c>UserName</c> is a string.</p>
@@ -297,7 +293,7 @@
       </item>
       <item>
         <p><c>AuthP</c> is a <c>usmNoAuthProtocol</c>,
-          <c>usmHMACMD5AuthProtocol</c>, or <c>usmHMACSHAAuthProtocol</c>.</p>
+	<c>usmHMACMD5AuthProtocol</c>, or <c>usmHMACSHAAuthProtocol</c>.</p>
       </item>
       <item>
         <p><c>AuthKeyC</c> is a string.</p>
@@ -307,7 +303,7 @@
       </item>
       <item>
         <p><c>PrivP</c> is a <c>usmNoPrivProtocol</c>, 
-          <c>usmDESPrivProtocol</c> or <c>usmAesCfb128Protocol</c>.</p>
+	<c>usmDESPrivProtocol</c> or <c>usmAesCfb128Protocol</c>.</p>
       </item>
       <item>
         <p><c>PrivKeyC</c> is a string.</p>
@@ -319,66 +315,59 @@
         <p><c>Public</c> is a string.</p>
       </item>
       <item>
-        <p><c>AuthKey</c> is a list (of integer).  This is the User's secret
-          localized authentication key.  It is not visible in the MIB.  The length
-          of this key needs to be 16 if <c>usmHMACMD5AuthProtocol</c> is used, and 
-          20 if <c>usmHMACSHAAuthProtocol</c> is used.</p>
+        <p><c>AuthKey</c> is a list (of integer). This is the User's secret
+	localized authentication key. It is not visible in the MIB. The length
+	of this key needs to be 16 if <c>usmHMACMD5AuthProtocol</c> is used, 
+	and 20 if <c>usmHMACSHAAuthProtocol</c> is used.</p>
       </item>
       <item>
         <p><c>PrivKey</c> is a list (of integer).  This is the User's secret
-          localized encryption key.  It is not visible in the MIB.  The length
-          of this key needs to be 16 if <c>usmDESPrivProtocol</c> or 
-          <c>usmAesCfb128Protocol</c> is used.
-          </p>
+	localized encryption key.  It is not visible in the MIB.  The length
+	of this key needs to be 16 if <c>usmDESPrivProtocol</c> or 
+	<c>usmAesCfb128Protocol</c> is used. </p>
       </item>
     </list>
+
+    <marker id="notify"></marker>
   </section>
 
   <section>
-    <marker id="notify"></marker>
     <title>Notify Definitions</title>
     <p>The information about Notify Definitions should be stored in a
-      file called
-      <c>notify.conf</c>.
-      </p>
+    file called <c>notify.conf</c>. </p>
     <p>The corresponding table is <c>snmpNotifyTable</c> in the
-      SNMP-NOTIFICATION-MIB.
-      </p>
-    <p>Each entry is a term:
-      </p>
+    SNMP-NOTIFICATION-MIB.</p>
+    <p>Each entry is a term:</p>
     <p><c>{NotifyName, Tag, Type}.</c></p>
     <list type="bulleted">
       <item>
-        <p><c>NotifyName</c> is a unique non-empty string.
-          </p>
+        <p><c>NotifyName</c> is a unique non-empty string.</p>
       </item>
       <item>
-        <p><c>Tag</c> is a string.
-          </p>
+        <p><c>Tag</c> is a string.</p>
       </item>
       <item>
-        <p><c>Type</c> is <c>trap</c> or <c>inform</c>.
-          </p>
+        <p><c>Type</c> is <c>trap</c> or <c>inform</c>.</p>
       </item>
     </list>
+
+    <marker id="target_addr"></marker>
   </section>
 
   <section>
-    <marker id="target_addr"></marker>
     <title>Target Address Definitions</title>
     <p>The information about Target Address Definitions should be 
-      stored in a file called <c>target_addr.conf</c>. </p>
+    stored in a file called <c>target_addr.conf</c>. </p>
     <p>The corresponding tables are <c>snmpTargetAddrTable</c> in the
-      SNMP-TARGET-MIB and <c>snmpTargetAddrExtTable</c> in the 
-      SNMP-COMMUNITY-MIB. </p>
+    SNMP-TARGET-MIB and <c>snmpTargetAddrExtTable</c> in the 
+    SNMP-COMMUNITY-MIB. </p>
     <p>Each entry is a term: </p>
     <p><c>{TargetName, Ip, Udp, Timeout, RetryCount, TagList, ParamsName, EngineId}.</c> <br></br> or <br></br> 
 <c>{TargetName, Ip, Udp, Timeout, RetryCount, TagList, ParamsName, EngineId, TMask, MaxMessageSize}.</c> <br></br> or  <br></br>
-<c>{TargetName, Domain, Ip, Udp, Timeout, RetryCount, TagList, ParamsName, EngineId, TMask, MaxMessageSize}.</c></p>
+<c>{TargetName, Domain, Ip, Udp, Timeout, RetryCount, TagList, ParamsName, EngineId, TMask, MaxMessageSize}.</c> </p>
     <list type="bulleted">
       <item>
-        <p><c>TargetName</c> is a unique non-empty string.
-          </p>
+        <p><c>TargetName</c> is a unique non-empty string. </p>
       </item>
       <item>
         <p><c>Domain</c> is one of the atoms: 
@@ -414,40 +403,37 @@
       </item>
     </list>
     <p>Note that if <c>EngineId</c> has the value <c>discovery</c>, 
-      the agent cannot send
-      <c>inform</c> messages to that manager until it has performed the
-      <em>discovery</em> process with that manager. </p>
+    the agent cannot send
+    <c>inform</c> messages to that manager until it has performed the
+    <em>discovery</em> process with that manager. </p>
+    
+    <marker id="target_params"></marker>
   </section>
 
   <section>
-    <marker id="target_params"></marker>
     <title>Target Parameters Definitions</title>
     <p>The information about Target Parameters Definitions should be
-      stored in a file called <c>target_params.conf</c>. </p>
+    stored in a file called <c>target_params.conf</c>. </p>
     <p>The corresponding table is <c>snmpTargetParamsTable</c> in the
-      SNMP-TARGET-MIB. </p>
+    SNMP-TARGET-MIB. </p>
     <p>Each entry is a term: </p>
     <p><c>{ParamsName, MPModel, SecurityModel, SecurityName, SecurityLevel}.</c></p>
     <list type="bulleted">
       <item>
-        <p><c>ParamsName</c> is a unique non-empty string.
-          </p>
+        <p><c>ParamsName</c> is a unique non-empty string. </p>
       </item>
       <item>
         <p><c>MPModel</c> is <c>v1</c>, <c>v2c</c> or <c>v3</c></p>
       </item>
       <item>
-        <p><c>SecurityModel</c> is <c>v1</c>, <c>v2c</c>, or <c>usm</c>.
-          </p>
+        <p><c>SecurityModel</c> is <c>v1</c>, <c>v2c</c>, or <c>usm</c>.</p>
       </item>
       <item>
-        <p><c>SecurityName</c> is a string.
-          </p>
+        <p><c>SecurityName</c> is a string.</p>
       </item>
       <item>
         <p><c>SecurityLevel</c> is <c>noAuthNoPriv</c>, <c>authNoPriv</c>
-          or <c>authPriv</c>.
-          </p>
+	or <c>authPriv</c>. </p>
       </item>
     </list>
   </section>
diff --git a/lib/snmp/doc/src/snmp_agent_funct_descr.xml b/lib/snmp/doc/src/snmp_agent_funct_descr.xml
index 9a1bf28ab1..1c89ddea22 100644
--- a/lib/snmp/doc/src/snmp_agent_funct_descr.xml
+++ b/lib/snmp/doc/src/snmp_agent_funct_descr.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_agent_netif.xml b/lib/snmp/doc/src/snmp_agent_netif.xml
index 8f1d860d58..fccfc8857a 100644
--- a/lib/snmp/doc/src/snmp_agent_netif.xml
+++ b/lib/snmp/doc/src/snmp_agent_netif.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_app.xml b/lib/snmp/doc/src/snmp_app.xml
index e5a05342c1..86f0981988 100644
--- a/lib/snmp/doc/src/snmp_app.xml
+++ b/lib/snmp/doc/src/snmp_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
@@ -763,12 +763,15 @@
       </item>
 
       <marker id="db_init_error"></marker>
-      <tag><c>db_init_error() = terminate | create</c></tag>
+      <tag><c>db_init_error() = terminate | create | create_db_and_dir</c></tag>
       <item>
         <p>Defines what to do if the agent or manager is unable to open an
           existing database file. <c>terminate</c> means that the
           agent/manager will terminate and <c>create</c> means that the 
-          agent/manager will remove the faulty file(s) and create new ones.</p>
+          agent/manager will remove the faulty file(s) and create new ones,
+          and <c>create_db_and_dir</c> means that the agent/manager will
+          create the database file along with any missing parent directories
+          for the database file.</p>
         <p>Default is <c>terminate</c>.</p>
       </item>
 
diff --git a/lib/snmp/doc/src/snmp_app_a.xml b/lib/snmp/doc/src/snmp_app_a.xml
index 5192279a45..e2733b0e82 100644
--- a/lib/snmp/doc/src/snmp_app_a.xml
+++ b/lib/snmp/doc/src/snmp_app_a.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_app_b.xml b/lib/snmp/doc/src/snmp_app_b.xml
index 536a4b5c6f..f7c70f3e0c 100644
--- a/lib/snmp/doc/src/snmp_app_b.xml
+++ b/lib/snmp/doc/src/snmp_app_b.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_audit_trail_log.xml b/lib/snmp/doc/src/snmp_audit_trail_log.xml
index 9a49a0175b..c8abeabe87 100644
--- a/lib/snmp/doc/src/snmp_audit_trail_log.xml
+++ b/lib/snmp/doc/src/snmp_audit_trail_log.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_community_mib.xml b/lib/snmp/doc/src/snmp_community_mib.xml
index 5e7bca3e27..c5065bc319 100644
--- a/lib/snmp/doc/src/snmp_community_mib.xml
+++ b/lib/snmp/doc/src/snmp_community_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index 61ee7f00ee..0ec8bb91cf 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -792,12 +792,15 @@ in so far as it will be converted to the new format if found.
       </item>
 
       <marker id="db_init_error"></marker>
-      <tag><c>db_init_error() = terminate | create</c></tag>
+      <tag><c>db_init_error() = terminate | create | create_db_and_dir</c></tag>
       <item>
         <p>Defines what to do if the agent is unable to open an
           existing database file. <c>terminate</c> means that the
-          agent/manager will terminate and <c>create</c> means that the 
-          agent/manager will remove the faulty file(s) and create new ones.</p>
+          agent/manager will terminate, <c>create</c> means that the 
+          agent/manager will remove the faulty file(s) and create new ones,
+          and <c>create_db_and_dir</c> means that the agent/manager will
+          create the database file along with any missing parent directories
+          for the database file.</p>
         <p>Default is <c>terminate</c>.</p>
       </item>
 
diff --git a/lib/snmp/doc/src/snmp_def_instr_functions.xml b/lib/snmp/doc/src/snmp_def_instr_functions.xml
index f88469aeae..20d2180c2d 100644
--- a/lib/snmp/doc/src/snmp_def_instr_functions.xml
+++ b/lib/snmp/doc/src/snmp_def_instr_functions.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_framework_mib.xml b/lib/snmp/doc/src/snmp_framework_mib.xml
index 38fb531d3e..3b4eb52ec2 100644
--- a/lib/snmp/doc/src/snmp_framework_mib.xml
+++ b/lib/snmp/doc/src/snmp_framework_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_generic.xml b/lib/snmp/doc/src/snmp_generic.xml
index 79a22323d9..d4c65ba832 100644
--- a/lib/snmp/doc/src/snmp_generic.xml
+++ b/lib/snmp/doc/src/snmp_generic.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_impl_example_agent.xml b/lib/snmp/doc/src/snmp_impl_example_agent.xml
index 3bba6467ed..1260d7d432 100644
--- a/lib/snmp/doc/src/snmp_impl_example_agent.xml
+++ b/lib/snmp/doc/src/snmp_impl_example_agent.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_impl_example_manager.xml b/lib/snmp/doc/src/snmp_impl_example_manager.xml
index edc1f3998e..03ea54b1bf 100644
--- a/lib/snmp/doc/src/snmp_impl_example_manager.xml
+++ b/lib/snmp/doc/src/snmp_impl_example_manager.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_index.xml b/lib/snmp/doc/src/snmp_index.xml
index cd241820e8..5d333e2fec 100644
--- a/lib/snmp/doc/src/snmp_index.xml
+++ b/lib/snmp/doc/src/snmp_index.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_instr_functions.xml b/lib/snmp/doc/src/snmp_instr_functions.xml
index 32a1844554..dcfaf145d3 100644
--- a/lib/snmp/doc/src/snmp_instr_functions.xml
+++ b/lib/snmp/doc/src/snmp_instr_functions.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_intro.xml b/lib/snmp/doc/src/snmp_intro.xml
index b01bfdd88f..663e269e4b 100644
--- a/lib/snmp/doc/src/snmp_intro.xml
+++ b/lib/snmp/doc/src/snmp_intro.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_manager_config_files.xml b/lib/snmp/doc/src/snmp_manager_config_files.xml
index c2ef3cd2c7..486ef7c170 100644
--- a/lib/snmp/doc/src/snmp_manager_config_files.xml
+++ b/lib/snmp/doc/src/snmp_manager_config_files.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_manager_funct_descr.xml b/lib/snmp/doc/src/snmp_manager_funct_descr.xml
index db4ab9bf15..65a2ec069d 100644
--- a/lib/snmp/doc/src/snmp_manager_funct_descr.xml
+++ b/lib/snmp/doc/src/snmp_manager_funct_descr.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_manager_netif.xml b/lib/snmp/doc/src/snmp_manager_netif.xml
index 169e20d10b..757ed32880 100644
--- a/lib/snmp/doc/src/snmp_manager_netif.xml
+++ b/lib/snmp/doc/src/snmp_manager_netif.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_mib_compiler.xml b/lib/snmp/doc/src/snmp_mib_compiler.xml
index 63af19f479..db0d7a344e 100644
--- a/lib/snmp/doc/src/snmp_mib_compiler.xml
+++ b/lib/snmp/doc/src/snmp_mib_compiler.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_notification_mib.xml b/lib/snmp/doc/src/snmp_notification_mib.xml
index d1d83570d1..963fffe98c 100644
--- a/lib/snmp/doc/src/snmp_notification_mib.xml
+++ b/lib/snmp/doc/src/snmp_notification_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2009</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_pdus.xml b/lib/snmp/doc/src/snmp_pdus.xml
index 6c323c3ad9..2051ab291b 100644
--- a/lib/snmp/doc/src/snmp_pdus.xml
+++ b/lib/snmp/doc/src/snmp_pdus.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_standard_mib.xml b/lib/snmp/doc/src/snmp_standard_mib.xml
index e8dea46f32..7c9bfdb6fe 100644
--- a/lib/snmp/doc/src/snmp_standard_mib.xml
+++ b/lib/snmp/doc/src/snmp_standard_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_target_mib.xml b/lib/snmp/doc/src/snmp_target_mib.xml
index d5151d41de..be6fa15c73 100644
--- a/lib/snmp/doc/src/snmp_target_mib.xml
+++ b/lib/snmp/doc/src/snmp_target_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_user_based_sm_mib.xml b/lib/snmp/doc/src/snmp_user_based_sm_mib.xml
index 7485e5af57..e4eec88c57 100644
--- a/lib/snmp/doc/src/snmp_user_based_sm_mib.xml
+++ b/lib/snmp/doc/src/snmp_user_based_sm_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmp_view_based_acm_mib.xml b/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
index d595f6b93b..0e6e7144b4 100644
--- a/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
+++ b/lib/snmp/doc/src/snmp_view_based_acm_mib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa.xml b/lib/snmp/doc/src/snmpa.xml
index 86fde03205..d484a6b7cf 100644
--- a/lib/snmp/doc/src/snmpa.xml
+++ b/lib/snmp/doc/src/snmpa.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -245,29 +245,75 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
           This function is used to convert to the old (pre-4.4) info 
           format. </p>
 
+        <marker id="load_mib"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>load_mib(Mib) -> ok | {error, Reason}</name>
+      <name>load_mib(Agent, Mib) -> ok | {error, Reason}</name>
+      <fsummary>Load single MIB into the agent</fsummary>
+      <type>
+        <v>Agent = pid() | atom()</v>
+        <v>MibName = string()</v>
+        <v>Reason = already_loaded | term()</v>
+      </type>
+      <desc>
+        <p>Load a single <c>Mib</c> into an agent. The <c>MibName</c> 
+	is the name of the Mib, including the path to where the compiled 
+	mib is found. For example: </p>
+	<code type="none">
+          Dir = code:priv_dir(my_app) ++ "/mibs/",
+          snmpa:load_mib(snmp_master_agent, Dir ++ "MY-MIB").
+        </code>
+
         <marker id="load_mibs"></marker>
       </desc>
     </func>
 
     <func>
       <name>load_mibs(Mibs) -> ok | {error, Reason}</name>
-      <name>load_mibs(Agent,Mibs) -> ok | {error, Reason}</name>
+      <name>load_mibs(Mibs, Force) -> ok | {error, Reason}</name>
+      <name>load_mibs(Agent, Mibs) -> ok | {error, Reason}</name>
+      <name>load_mibs(Agent, Mibs, Force) -> ok | {error, Reason}</name>
       <fsummary>Load MIBs into the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
         <v>Mibs = [MibName]</v>
+        <v>Force = boolean()</v>
         <v>MibName = string()</v>
-        <v>Reason = term()</v>
+        <v>Reason = {'load aborted at', MibName, InternalReason}</v>
+        <v>InternalReason = already_loaded | term()</v>
       </type>
       <desc>
-        <p>Loads <c>Mibs</c> into an agent.  If the agent cannot load
-          all MIBs, it will indicate where loading was aborted.  The
-          <c>MibName</c> is the name of the Mib, including the path to
-          where the compiled mib is found.  For example,</p>
-        <code type="none">
+        <p>Load <c>Mibs</c> into an agent.  If the agent cannot load all 
+	MIBs (the default value of the <c>Force</c> argument is <c>false</c>), 
+	it will indicate where loading was aborted. The <c>MibName</c> 
+	is the name of the Mib, including the path to where the compiled 
+	mib is found. For example,</p>
+	<code type="none">
           Dir = code:priv_dir(my_app) ++ "/mibs/",
           snmpa:load_mibs(snmp_master_agent, [Dir ++ "MY-MIB"]).
         </code>
+	<p>If <c>Force = true</c> then the agent will continue attempting
+	to load each mib even after failing to load a previous mib. Use with 
+	care. </p>
+
+        <marker id="unload_mib"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>unload_mib(Mib) -> ok | {error, Reason}</name>
+      <name>unload_mib(Agent, Mib) -> ok | {error, Reason}</name>
+      <fsummary>Unload single MIB from the agent</fsummary>
+      <type>
+        <v>Agent = pid() | atom()</v>
+        <v>MibName = string()</v>
+        <v>Reason = not_loaded | term()</v>
+      </type>
+      <desc>
+        <p>Unload a single <c>Mib</c> from an agent. </p>
 
         <marker id="unload_mibs"></marker>
       </desc>
@@ -275,16 +321,25 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 
     <func>
       <name>unload_mibs(Mibs) -> ok | {error, Reason}</name>
-      <name>unload_mibs(Agent,Mibs) -> ok | {error, Reason}</name>
+      <name>unload_mibs(Mibs, Force) -> ok | {error, Reason}</name>
+      <name>unload_mibs(Agent, Mibs) -> ok | {error, Reason}</name>
+      <name>unload_mibs(Agent, Mibs, Force) -> ok | {error, Reason}</name>
       <fsummary>Unload MIBs from the agent</fsummary>
       <type>
         <v>Agent = pid() | atom()</v>
         <v>Mibs = [MibName]</v>
+        <v>Force = boolean()</v>
         <v>MibName = string()</v>
+        <v>Reason = {'unload aborted at', MibName, InternalReason}</v>
+        <v>InternalReason = not_loaded | term()</v>
       </type>
       <desc>
-        <p>Unloads MIBs into an agent.  If it cannot unload all MIBs,
-          it will indicate where unloading was aborted. </p>
+        <p>Unload <c>Mibs</c> from an agent. If it cannot unload all MIBs
+	(the default value of the <c>Force</c> argument is <c>false</c>),
+	it will indicate where unloading was aborted. </p>
+	<p>If <c>Force = true</c> then the agent will continue attempting
+	to unload each mib even after failing to unload a previous mib. 
+	Use with care. </p>
 
         <marker id="which_mibs"></marker>
       </desc>
@@ -502,32 +557,39 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 
     <func>
       <name>log_to_txt(LogDir)</name>
-      <name>log_to_txt(LogDir, Mibs)</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile) -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Block | Mibs)</name>
+      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {error, Reason}</name>
       <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
         <v>Mibs = [MibName]</v>
         <v>MibName = string()</v>
+        <v>Block = boolean()</v>
         <v>OutFile = string()</v>
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
-        <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
+        <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
       </type>
       <desc>
         <p>Converts an Audit Trail Log to a readable text file. 
-          <c>OutFile</c> defaults to "./snmpa_log.txt". 
-          <c>LogName</c> defaults to "snmpa_log". 
-          <c>LogFile</c> defaults to "snmpa.log". 
-          See <seealso marker="snmp#log_to_txt">snmp:log_to_txt</seealso> 
-          for more info.</p>
+	<c>OutFile</c> defaults to "./snmpa_log.txt". 
+	<c>LogName</c> defaults to "snmpa_log". 
+	<c>LogFile</c> defaults to "snmpa.log". </p>
+	<p>The <c>Block</c> option indicates if the log should be blocked
+	during conversion. This could be usefull when converting large 
+	logs (when otherwise the log could wrap during conversion). 
+	Defaults to <c>true</c>. </p>
+	<p>See <seealso marker="snmp#log_to_txt">snmp:log_to_txt</seealso> 
+	for more info.</p>
 
         <marker id="log_to_io"></marker>
       </desc>
@@ -535,19 +597,22 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 
     <func>
       <name>log_to_io(LogDir) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Block | Mibs) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) -> ok | {error, Reason}</name>
       <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> ok | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
         <v>Mibs = [MibName]</v>
         <v>MibName = string()</v>
+        <v>Block = boolean()</v>
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
-        <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
+        <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
@@ -557,6 +622,10 @@ notification_delivery_info() = #snmpa_notification_delivery_info{}
 	prints it on stdio. 
 	<c>LogName</c> defaults to "snmpa_log". 
 	<c>LogFile</c> defaults to "snmpa.log". 
+	<p>The <c>Block</c> option indicates if the log should be blocked
+	during conversion. This could be usefull when converting large 
+	logs (when otherwise the log could wrap during conversion). 
+	Defaults to <c>true</c>. </p>
 	See <seealso marker="snmp#log_to_io">snmp:log_to_io</seealso> 
 	for more info.</p>
 
diff --git a/lib/snmp/doc/src/snmpa_conf.xml b/lib/snmp/doc/src/snmpa_conf.xml
index a533c179ee..99a56cd601 100644
--- a/lib/snmp/doc/src/snmpa_conf.xml
+++ b/lib/snmp/doc/src/snmpa_conf.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2011</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_discovery_handler.xml b/lib/snmp/doc/src/snmpa_discovery_handler.xml
index 47814221aa..309a21ec32 100644
--- a/lib/snmp/doc/src/snmpa_discovery_handler.xml
+++ b/lib/snmp/doc/src/snmpa_discovery_handler.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_error.xml b/lib/snmp/doc/src/snmpa_error.xml
index 4dbafdfbb7..2cc44a9e79 100644
--- a/lib/snmp/doc/src/snmpa_error.xml
+++ b/lib/snmp/doc/src/snmpa_error.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_error_io.xml b/lib/snmp/doc/src/snmpa_error_io.xml
index 33fbfac20c..fc90db4bf9 100644
--- a/lib/snmp/doc/src/snmpa_error_io.xml
+++ b/lib/snmp/doc/src/snmpa_error_io.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_error_logger.xml b/lib/snmp/doc/src/snmpa_error_logger.xml
index 06382a6057..b2bf1c4181 100644
--- a/lib/snmp/doc/src/snmpa_error_logger.xml
+++ b/lib/snmp/doc/src/snmpa_error_logger.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_error_report.xml b/lib/snmp/doc/src/snmpa_error_report.xml
index 421202bade..f58287da08 100644
--- a/lib/snmp/doc/src/snmpa_error_report.xml
+++ b/lib/snmp/doc/src/snmpa_error_report.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_local_db.xml b/lib/snmp/doc/src/snmpa_local_db.xml
index c077bc96d8..e617aa0893 100644
--- a/lib/snmp/doc/src/snmpa_local_db.xml
+++ b/lib/snmp/doc/src/snmpa_local_db.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_mib_data.xml b/lib/snmp/doc/src/snmpa_mib_data.xml
index ff07a03b98..c1ea0a91f9 100644
--- a/lib/snmp/doc/src/snmpa_mib_data.xml
+++ b/lib/snmp/doc/src/snmpa_mib_data.xml
@@ -380,7 +380,7 @@
       <desc>
         <p>Perform a code-change (upgrade or downgrade). </p>
         <p>See 
-	<seealso marker="gen_server">gen_server</seealso>
+	<seealso marker="stdlib:gen_server">gen_server</seealso>
 	for more info regarding the <c>Vsn</c> and <c>Extra</c> arguments. </p>
 
       </desc>
diff --git a/lib/snmp/doc/src/snmpa_mpd.xml b/lib/snmp/doc/src/snmpa_mpd.xml
index 202e6b5661..c5ab0a0520 100644
--- a/lib/snmp/doc/src/snmpa_mpd.xml
+++ b/lib/snmp/doc/src/snmpa_mpd.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_network_interface.xml b/lib/snmp/doc/src/snmpa_network_interface.xml
index a986343a4f..5fc51b1e53 100644
--- a/lib/snmp/doc/src/snmpa_network_interface.xml
+++ b/lib/snmp/doc/src/snmpa_network_interface.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_network_interface_filter.xml b/lib/snmp/doc/src/snmpa_network_interface_filter.xml
index bff0a24879..e08a26ed92 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="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2012</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml b/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml
index c52479f76a..aff71688b6 100644
--- a/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml
+++ b/lib/snmp/doc/src/snmpa_notification_delivery_info_receiver.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2008</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_notification_filter.xml b/lib/snmp/doc/src/snmpa_notification_filter.xml
index c3b300ecab..accce286bd 100644
--- a/lib/snmp/doc/src/snmpa_notification_filter.xml
+++ b/lib/snmp/doc/src/snmpa_notification_filter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpa_supervisor.xml b/lib/snmp/doc/src/snmpa_supervisor.xml
index 89b4eb8d54..8fc178b97b 100644
--- a/lib/snmp/doc/src/snmpa_supervisor.xml
+++ b/lib/snmp/doc/src/snmpa_supervisor.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpc.xml b/lib/snmp/doc/src/snmpc.xml
index 61d19251c5..8eb490d391 100644
--- a/lib/snmp/doc/src/snmpc.xml
+++ b/lib/snmp/doc/src/snmpc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpc_cmd.xml b/lib/snmp/doc/src/snmpc_cmd.xml
index 971f8a3cff..e14b9f8e25 100644
--- a/lib/snmp/doc/src/snmpc_cmd.xml
+++ b/lib/snmp/doc/src/snmpc_cmd.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE comref SYSTEM "comref.dtd">
 
 <comref>
   <header>
     <copyright>
-      <year>2011</year><year>2011</year>
+      <year>2011</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpm.xml b/lib/snmp/doc/src/snmpm.xml
index 07fdd208ff..dc8226bb87 100644
--- a/lib/snmp/doc/src/snmpm.xml
+++ b/lib/snmp/doc/src/snmpm.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -1209,32 +1209,40 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
     </func>
 
     <func>
-      <name>log_to_txt(LogDir, Mibs)</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile) -> ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir)</name>
+      <name>log_to_txt(LogDir, Block | Mibs)</name>
+      <name>log_to_txt(LogDir, Mibs, Block | OutFile) -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, Block | LogName) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, Block | LogFile) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  -> ok | {error, Reason}</name>
       <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop)  -> ok | {error, Reason}</name>
+      <name>log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop)  -> ok | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
         <v>Mibs = [MibName]</v>
         <v>MibName = string()</v>
+        <v>Block = boolean()</v>
         <v>OutFile = string()</v>
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
-        <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
+        <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
       </type>
       <desc>
         <p>Converts an Audit Trail Log to a readable text file. 
-          <c>OutFile</c> defaults to "./snmpm_log.txt". 
-          <c>LogName</c> defaults to "snmpm_log". 
-          <c>LogFile</c> defaults to "snmpm.log". 
-          See <seealso marker="snmp#log_to_txt">snmp:log_to_txt</seealso> 
-          for more info.</p>
+	<c>OutFile</c> defaults to "./snmpm_log.txt". 
+	<c>LogName</c> defaults to "snmpm_log". 
+	<c>LogFile</c> defaults to "snmpm.log". 
+	<p>The <c>Block</c> argument indicates if the log should be blocked
+	during conversion. This could be usefull when converting large 
+	logs (when otherwise the log could wrap during conversion). 
+	Defaults to <c>true</c>. </p>
+	See <seealso marker="snmp#log_to_txt">snmp:log_to_txt</seealso> 
+	for more info.</p>
 
         <marker id="log_to_io"></marker>
       </desc>
@@ -1242,20 +1250,23 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 
     <func>
       <name>log_to_io(LogDir) -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Block | Mibs) -> ok | {error, Reason}</name>
       <name>log_to_io(LogDir, Mibs) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs) -> ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile) ->  ok | {error, Reason}</name>
-      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, Block | LogName) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, Block | LogFile) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block | Start) ->  ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start)  -> ok | {error, Reason}</name>
       <name>log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop)  -> ok | {error, Reason}</name>
+      <name>log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop)  -> ok | {error, Reason}</name>
       <fsummary>Convert an Audit Trail Log to text format</fsummary>
       <type>
         <v>LogDir = string()</v>
         <v>Mibs = [MibName]</v>
         <v>MibName = string()</v>
+        <v>Block = boolean()</v>
         <v>LogName = string()</v>
         <v>LogFile = string()</v>
-        <v>Start = Stop = null | datetime() | {local_time,datetime()} |  {universal_time,datetime()} </v>
+        <v>Start = Stop = null | calendar:datetime() | {local_time, calendar:datetime()} | {universal_time, calendar:datetime()} </v>
         <v>Reason = disk_log_open_error() | file_open_error() | term()</v>
         <v>disk_log_open_error() = {LogName, term()}</v>
         <v>file_open_error() = {OutFile, term()}</v>
@@ -1265,6 +1276,10 @@ priv_key = [integer()]   (length is 16 if priv = usmDESPrivProtocol | usmAesCfb1
 	prints it on stdio. 
 	<c>LogName</c> defaults to "snmpm_log". 
 	<c>LogFile</c> defaults to "snmpm.log". 
+	<p>The <c>Block</c> argument indicates if the log should be blocked
+	during conversion. This could be usefull when converting large 
+	logs (when otherwise the log could wrap during conversion). 
+	Defaults to <c>true</c>. </p>
 	See <seealso marker="snmp#log_to_io">snmp:log_to_io</seealso> 
 	for more info.</p>
 
diff --git a/lib/snmp/doc/src/snmpm_conf.xml b/lib/snmp/doc/src/snmpm_conf.xml
index 177e29faa3..0cc9ff3379 100644
--- a/lib/snmp/doc/src/snmpm_conf.xml
+++ b/lib/snmp/doc/src/snmpm_conf.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpm_mpd.xml b/lib/snmp/doc/src/snmpm_mpd.xml
index 030c79e0e6..ad72fd7bc0 100644
--- a/lib/snmp/doc/src/snmpm_mpd.xml
+++ b/lib/snmp/doc/src/snmpm_mpd.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpm_network_interface.xml b/lib/snmp/doc/src/snmpm_network_interface.xml
index 33eb736b8f..6cf7bd6ed7 100644
--- a/lib/snmp/doc/src/snmpm_network_interface.xml
+++ b/lib/snmp/doc/src/snmpm_network_interface.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpm_network_interface_filter.xml b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
index 4dc133dd71..f0526269b3 100644
--- a/lib/snmp/doc/src/snmpm_network_interface_filter.xml
+++ b/lib/snmp/doc/src/snmpm_network_interface_filter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2007</year><year>2012</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/snmp/doc/src/snmpm_user.xml b/lib/snmp/doc/src/snmpm_user.xml
index 1823e0c815..6f412d90f8 100644
--- a/lib/snmp/doc/src/snmpm_user.xml
+++ b/lib/snmp/doc/src/snmpm_user.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -56,40 +56,59 @@
       <item>
         <p>handle_report/3</p>
       </item>
+      <item>
+        <p>handle_invalid_result/2</p>
+      </item>
     </list>
     <p>The semantics of them and their exact signatures are explained
-      below. </p>
-    <p>Note that if an agent is registered using the old, no longer 
-      documented, functions (using Addr and Port), the old variant of the 
-      callback functions, handle_pdu, handle_trap, handle_inform and 
-      handle_report, will be called. </p>
+    below. </p>
+    <p>Some of the function has no defined return value (<c>void()</c>), 
+    they can ofcourse return anythyng. But the functions that do have 
+    specified return value(s) <em>must</em> adhere to this. None of the 
+    functions can use exit of throw to return. </p>
 
-    <marker id="handle_error"></marker>
+    <marker id="types"></marker>
   </description>
+
+  <section>
+    <title>DATA TYPES</title>
+    <code type="none"><![CDATA[
+snmp_gen_info() = {ErrorStatus :: atom(), 
+                   ErrorIndex  :: pos_integer(), 
+                   Varbinds    :: [snmp:varbind()]}
+snmp_v1_trap_info() :: {Enteprise :: snmp:oid(), 
+                        Generic   :: integer(), 
+                        Spec      :: integer(), 
+                        Timestamp :: integer(), 
+                        Varbinds  :: [snmp:varbind()]}
+    ]]></code>
+    <marker id="handle_error"></marker>
+  </section>
+
   <funcs>
     <func>
-      <name>handle_error(ReqId, Reason, UserData) -> Reply</name>
+      <name>handle_error(ReqId, Reason, UserData) -> void()</name>
       <fsummary>Handle error</fsummary>
       <type>
         <v>ReqId = integer()</v>
         <v>Reason = {unexpected_pdu, SnmpInfo} | {invalid_sec_info, SecInfo, SnmpInfo} | {empty_message, Addr, Port} | term()</v>
+        <v>SnmpInfo = snmp_gen_info()</v>
+        <v>SecInfo = term()</v>
         <v>Addr = ip_address()</v>
         <v>Port = integer()</v>
         <v>UserData = term()</v>
-        <v>Reply = ignore</v>
       </type>
       <desc>
         <p>This function is called when the manager needs to
-          communicate an "asynchronous" error, to the user:
-          e.g. failure to send an asynchronous message (i.e. encoding
-          error), a received message was discarded due to security
-          error, the manager failed to generate a response message to
-          a received inform-request, or when receiving an unexpected
-          PDU from an agent (could be an expired async request). </p>
-        <p>If <c>ReqId</c> is less then 0, it means that this
-          information was not available to the manager (that info was
-          never retrieved before the message was discarded). 
-          </p>
+	communicate an "asynchronous" error to the user:
+	e.g. failure to send an asynchronous message (i.e. encoding
+	error), a received message was discarded due to security
+	error, the manager failed to generate a response message to
+	a received inform-request, or when receiving an unexpected
+	PDU from an agent (could be an expired async request). </p>
+	<p>If <c>ReqId</c> is less then 0, it means that this
+	information was not available to the manager (that info was
+	never retrieved before the message was discarded). </p>
         <p>For <c>SnmpInfo</c> see handle_agent below.</p>
 
         <marker id="handle_agent"></marker>
@@ -104,22 +123,22 @@
         <v>Port = integer()</v>
         <v>Type = pdu | trap | report | inform</v>
         <v>SnmpInfo = SnmpPduInfo | SnmpTrapInfo | SnmpReportInfo | SnmpInformInfo</v>
-        <v>ErrorStatus = atom()</v>
-        <v>ErrorIndex = integer()</v>
-        <v>Varbinds = [varbind()]</v>
-        <v>varbind() = #varbind</v>
+        <v>SnmpPduInfo = snmp_gen_info()</v>
+        <v>SnmpTrapInfo = snmp_v1_trap_info()</v>
+        <v>SnmpReportInfo = snmp_gen_info()</v>
+        <v>SnmpInformInfo = snmp_gen_info()</v>
         <v>UserData = term()</v>
-        <v>Reply = ignore | {register, UserId, TargetName, agent_info()}</v>
+        <v>Reply = ignore | {register, UserId, TargetName, AgentConfig}</v>
         <v>UserId = term()</v>
         <v>TargetName = target_name()</v>
-        <v>agent_info() = [{agent_info_item(), agent_info_value()}]</v>
+        <v>AgentConfig = [agent_config()]</v>
       </type>
       <desc>
-        <p>This function is called when a message is received from an 
-          unknown agent.</p>
+	<p>This function is called when a message is received from an 
+	unknown agent.</p>
         <p>Note that this will always be the default user that is called.</p>
-        <p>For more info about the <c>agent_info()</c>, see 
-          <seealso marker="snmpm#register_agent">register_agent</seealso>.</p>
+        <p>For more info about the <c>agent_config()</c>, see 
+	<seealso marker="snmpm#register_agent">register_agent</seealso>.</p>
 
         <p>The arguments <c>Type</c> and <c>SnmpInfo</c> relates in the 
           following way: </p>
@@ -148,7 +167,7 @@
 	  </list>
 
         <p>The only user which would return 
-          <c>{register, UserId, TargetName, agent_info()}</c> is the 
+          <c>{register, UserId, TargetName, AgentConfig}</c> is the 
           <em>default user</em>.</p>
 
         <marker id="handle_pdu"></marker>
@@ -156,18 +175,13 @@
     </func>
 
     <func>
-      <name>handle_pdu(TargetName, ReqId, SnmpPduInfo, UserData) -> Reply</name>
+      <name>handle_pdu(TargetName, ReqId, SnmpPduInfo, UserData) -> void()</name>
       <fsummary>Handle the reply to an asynchronous request</fsummary>
       <type>
         <v>TargetName = target_name()</v>
         <v>ReqId = term()</v>
-        <v>SnmpPduInfo = {ErrorStatus, ErrorIndex, Varbinds}</v>
-        <v>ErrorStatus = atom()</v>
-        <v>ErrorIndex = integer()</v>
-        <v>Varbinds = [varbind()]</v>
-        <v>varbind() = #varbind</v>
+        <v>SnmpPduInfo = snmp_gen_info()</v>
         <v>UserData = term()</v>
-        <v>Reply = ignore</v>
       </type>
       <desc>
         <p>Handle the reply to an asynchronous request, such as 
@@ -186,27 +200,19 @@
       <fsummary>Handle a trap/notification message</fsummary>
       <type>
         <v>TargetName = TargetName2 = target_name()</v>
-        <v>SnmpTrapInfo = {Enteprise, Generic, Spec, Timestamp, Varbinds} | {ErrorStatus, ErrorIndex, Varbinds}</v>
-        <v>Enterprise = oid()</v>
-        <v>Generic = integer()</v>
-        <v>Spec = integer()</v>
-        <v>Timestamp = integer()</v>
-        <v>ErrorStatus = atom()</v>
-        <v>ErrorIndex = integer()</v>
-        <v>Varbinds = [varbind()]</v>
-        <v>varbind() = #varbind</v>
+        <v>SnmpTrapInfo = snmp_v1_trap_info() | snmp_gen_info()</v>
         <v>UserData = term()</v>
-        <v>Reply = ignore | unregister | {register, UserId, TargetName2, agent_info()}</v>
+        <v>Reply = ignore | unregister | {register, UserId, TargetName2, AgentConfig}</v>
         <v>UserId = term()</v>
-        <v>agent_info() = [{agent_info_item(), agent_info_value()}]</v>
+        <v>AgentConfig = [agent_config()]</v>
       </type>
       <desc>
         <p>Handle a trap/notification message from an agent.</p>
-        <p>For more info about the <c>agent_info()</c>, see 
-          <seealso marker="snmpm#register_agent">register_agent</seealso></p>
+        <p>For more info about the <c>agent_config()</c>, see 
+	<seealso marker="snmpm#register_agent">register_agent</seealso></p>
         <p>The only user which would return 
-          <c>{register, UserId, TargetName2, agent_info()}</c> is the 
-          <em>default user</em>.</p>
+	<c>{register, UserId, TargetName2, agent_info()}</c> is the 
+	<em>default user</em>.</p>
 
         <marker id="handle_inform"></marker>
       </desc>
@@ -217,29 +223,25 @@
       <fsummary>Handle a inform message</fsummary>
       <type>
         <v>TargetName = TargetName2 = target_name()</v>
-        <v>SnmpInformInfo = {ErrorStatus, ErrorIndex, Varbinds}</v>
-        <v>ErrorStatus = atom()</v>
-        <v>ErrorIndex = integer()</v>
-        <v>Varbinds = [varbind()]</v>
-        <v>varbind() = #varbind</v>
+        <v>SnmpInformInfo = snmp_gen_info()</v>
         <v>UserData = term()</v>
-        <v>Reply = ignore | unregister | {register, UserId, TargetName2, agent_info()}</v>
+        <v>Reply = ignore | no_reply | unregister | {register, UserId, TargetName2, AgentConfig}</v>
         <v>UserId = term()</v>
-        <v>agent_info() = [{agent_info_item(), agent_info_value()}]</v>
+        <v>AgentConfig = [agent_config()]</v>
       </type>
       <desc>
         <p>Handle a inform message.</p>
-        <p>For more info about the <c>agent_info()</c>, see 
-          <seealso marker="snmpm#register_agent">register_agent</seealso></p>
+        <p>For more info about the <c>agent_config()</c>, see 
+	<seealso marker="snmpm#register_agent">register_agent</seealso></p>
         <p>The only user which would return 
-          <c>{register, UserId, TargetName2, agent_info()}</c> is the 
-          <em>default user</em>.</p>
-        <p>If the 
-          <seealso marker="snmp_app">inform request behaviour</seealso> 
-          configuration option is set to <c>user</c> or 
-          <c>{user, integer()}</c>, the response (acknowledgment) to this 
-          inform-request will be sent when this function returns.</p>
-
+	<c>{register, UserId, TargetName2, AgentConfig}</c> is the 
+	<em>default user</em>.</p>
+	<p>If the 
+	<seealso marker="snmp_app">inform request behaviour</seealso> 
+	configuration option is set to <c>user</c> or 
+	<c>{user, integer()}</c>, the response (acknowledgment) to this 
+	inform-request will be sent when this function returns.</p>
+	
         <marker id="handle_report"></marker>
       </desc>
     </func>
@@ -251,23 +253,46 @@
         <v>TargetName = TargetName2 = target_name()</v>
         <v>Addr = ip_address()</v>
         <v>Port = integer()</v>
-        <v>SnmpReportInfo = {ErrorStatus, ErrorIndex, Varbinds}</v>
-        <v>ErrorStatus = atom()</v>
-        <v>ErrorIndex = integer()</v>
-        <v>Varbinds = [varbind()]</v>
-        <v>varbind() = #varbind</v>
+        <v>SnmpReportInfo = snmp_gen_info()</v>
         <v>UserData = term()</v>
-        <v>Reply = ignore | unregister | {register, UserId, TargetName2, agent_info()}</v>
+        <v>Reply = ignore | unregister | {register, UserId, TargetName2, AgentConfig}</v>
         <v>UserId = term()</v>
-        <v>agent_info() = [{agent_info_item(), agent_info_value()}]</v>
+        <v>AgentConfig = [agent_config()]</v>
       </type>
       <desc>
         <p>Handle a report message.</p>
-        <p>For more info about the <c>agent_info()</c>, see 
-          <seealso marker="snmpm#register_agent">register_agent</seealso></p>
+        <p>For more info about the <c>agent_config()</c>, see 
+	<seealso marker="snmpm#register_agent">register_agent</seealso></p>
         <p>The only user which would return 
-          <c>{register, UserId, TargetName2, agent_info()}</c> is the 
-          <em>default user</em>.</p>
+	<c>{register, UserId, TargetName2, AgentConfig}</c> is the 
+	<em>default user</em>.</p>
+	
+        <marker id="handle_invalid_result"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>handle_invalid_result(IN, OUT) -> void()</name>
+      <fsummary>Handle a report message</fsummary>
+      <type>
+        <v>IN = {Func, Args}</v>
+        <v>Func = atom()</v>
+        <v>Args = list()</v>
+        <v>OUT = {crash, CrashInfo} | {result, InvalidResult}</v>
+        <v>CrashInfo = {ErrorType, Error, Stacktrace}</v>
+        <v>ErrorType = atom()</v>
+        <v>Error = term()</v>
+        <v>Stacktrace = list()</v>
+        <v>InvalidResult = term()</v>
+      </type>
+      <desc>
+        <p>If <em>any</em> of the <em>other</em> callback functions crashes 
+	(exit, throw or a plain crash) or return an invalid result (if a valid 
+	return has been specified), this function is called. 
+	The purpose is to allow the user handle this 
+	error (for instance to issue an error report).</p>
+	<p><c>IN</c> reprecents the function called (and its arguments). 
+	<c>OUT</c> represents the unexpected/invalid result. </p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/snmp/examples/ex2/snmp_ex2_manager.erl b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
index 1b247d713d..a9dcc09b77 100644
--- a/lib/snmp/examples/ex2/snmp_ex2_manager.erl
+++ b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %% 
 %% The 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 @@
          handle_pdu/4,
          handle_trap/3,
          handle_inform/3,
-         handle_report/3]).
+         handle_report/3, 
+	 handle_invalid_result/3]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -406,5 +407,9 @@ handle_report(TargetName, SnmpReport, Server) when is_pid(Server) ->
     report_callback(Server, handle_inform, {TargetName, SnmpReport}),
     ok.
 
+handle_invalid_result(In, Out, Server) when is_pid(Server) ->
+    report_callback(Server, handle_invalid_result, {In, Out}),
+    ok.
+
 report_callback(Pid, Tag, Info) ->
     Pid ! {snmp_callback, Tag, Info}.
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 ad9540e886..c0177b1cea 100644
--- a/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
+++ b/lib/snmp/src/agent/snmp_view_based_acm_mib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
 %% 
 %% The 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,14 @@
 -endif.
 
 
+-type internal_view_mask()         :: null | [internal_view_mask_element()].
+-type internal_view_mask_element() :: 0 | 1.
+
+-type external_view_mask() :: octet_string(). % At most length of 16 octet
+-type octet_string()       :: [octet()].
+-type octet()              :: byte().
+
+
 %%-----------------------------------------------------------------
 %% Func: configure/1
 %% Args: Dir is the directory where the configuration files are found.
@@ -160,14 +168,7 @@ check_vacm({vacmViewTreeFamily, ViewName, Tree, Type, Mask}) ->
     {ok, TypeVal} =
         snmp_conf:check_atom(Type, [{included, ?view_included},
 				    {excluded, ?view_excluded}]),
-    MaskVal = 
-        case (catch snmp_conf:check_atom(Mask, [{null, []}])) of
-            {error, _}  -> 
-                snmp_conf:check_oid(Mask),
-                Mask;
-	    {ok, X} ->
-		X
-	end,
+    {ok, MaskVal} = snmp_conf:check_imask(Mask), 
     Vacm = {ViewName, Tree, MaskVal, TypeVal, 
 	    ?'StorageType_nonVolatile', ?'RowStatus_active'},
     {ok, {vacmViewTreeFamily, Vacm}};
@@ -194,8 +195,8 @@ init_tabs(Sec2Group, Access, View) ->
     ok.
     
 init_sec2group_table([Row | T]) ->
-%%      ?vtrace("init security-to-group table: "
-%%  	    "~n   Row: ~p",[Row]),    
+    %% ?vtrace("init security-to-group table: "
+    %%         "~n   Row: ~p",[Row]),    
     Key1 = element(1, Row),
     Key2 = element(2, Row),
     Key = [Key1, length(Key2) | Key2],
@@ -953,13 +954,23 @@ verify_vacmViewTreeFamilyTable_col(?vacmViewTreeFamilySubtree, Tree) ->
 	    wrongValue(?vacmViewTreeFamilySubtree)
     end;
 verify_vacmViewTreeFamilyTable_col(?vacmViewTreeFamilyMask, Mask) ->
+    %% Mask here is in the "external" format. That is, according 
+    %% to the MIB, which means that its an OCTET STRING of max 16 
+    %% octets. 
+    %% We however store the mask as a list of 1's (exact) and 
+    %% 0's (wildcard), which means we have to convert the mask. 
     case Mask of
-	null -> [];
-	[]   -> [];
+	%% The Mask can only have this value if the vacmViewTreeFamilyTable
+	%% is called locally!
+	null -> 
+	    []; 
+	[] -> 
+	    [];
 	_ ->
-	    case (catch snmp_conf:check_oid(Mask)) of
-		ok ->
-		    Mask;
+	    %% Check and convert to our internal format
+	    case check_mask(Mask) of
+		{ok, IMask} ->
+		    IMask;
 	        _ ->
 		    wrongValue(?vacmViewTreeFamilyMask)
 	    end
@@ -977,6 +988,60 @@ verify_vacmViewTreeFamilyTable_col(_, Val) ->
     Val.
 	    
 
+check_mask(Mask) when is_list(Mask) andalso (length(Mask) =< 16) ->
+    try
+	begin
+	    {ok, emask2imask(Mask)}
+	end
+    catch
+	throw:{error, _} ->
+	    {error, {bad_mask, Mask}};
+	T:E ->
+	    {error, {bad_mask, Mask, T, E}}
+    end;
+check_mask(BadMask) ->
+    {error, {bad_mask, BadMask}}.
+
+-spec emask2imask(EMask :: external_view_mask()) ->
+    IMask :: internal_view_mask().
+
+%% Convert an External Mask (OCTET STRING) to Internal Mask (list of 0 or 1)
+emask2imask(EMask) ->
+    lists:flatten([octet2bits(Octet) || Octet <- EMask]).
+
+octet2bits(Octet) 
+  when is_integer(Octet) andalso (Octet >= 16#00) andalso (16#FF >= Octet) ->
+    <<A:1, B:1, C:1, D:1, E:1, F:1, G:1, H:1>> = <<Octet>>,
+    [A, B, C, D, E, F, G, H];
+octet2bits(BadOctet) ->
+    throw({error, {bad_octet, BadOctet}}).
+
+-spec imask2emask(IMask :: internal_view_mask()) ->
+    EMask :: external_view_mask().
+
+%% Convert an Internal Mask (list of 0 or 1) to External Mask (OCTET STRING) 
+imask2emask(IMask) ->
+    imask2emask(IMask, []).
+
+imask2emask([], EMask) ->
+    lists:reverse(EMask);
+imask2emask(IMask, EMask) ->
+    %% Make sure we have atleast 8 bits
+    %% (maybe extend with 1's)
+    IMask2 = 
+	case length(IMask) of
+	    Small when Small < 8 ->
+		IMask ++ lists:duplicate(8-Small, 1);
+	    _ ->
+		IMask
+	end, 
+    %% Extract 8 bits
+    [A, B, C, D, E, F, G, H | IMaskRest] = IMask2,
+    <<Octet:8>> = <<A:1, B:1, C:1, D:1, E:1, F:1, G:1, H:1>>,
+    imask2emask(IMaskRest, [Octet | EMask]). 
+
+
+
 table_next(Name, RestOid) ->
     snmp_generic:table_next(db(Name), RestOid).
 
@@ -1014,11 +1079,41 @@ stc(vacmSecurityToGroupTable) -> ?vacmSecurityToGroupStorageType;
 stc(vacmViewTreeFamilyTable) -> ?vacmViewTreeFamilyStorageType.
  
 next(Name, RowIndex, Cols) ->
-    snmp_generic:handle_table_next(db(Name), RowIndex, Cols,
-                                   fa(Name), foi(Name), noc(Name)).
+    Result = snmp_generic:handle_table_next(db(Name), RowIndex, Cols,
+					    fa(Name), foi(Name), noc(Name)),
+    externalize_next(Name, Result).
  
 get(Name, RowIndex, Cols) ->
-    snmp_generic:handle_table_get(db(Name), RowIndex, Cols, foi(Name)).
+    Result = snmp_generic:handle_table_get(db(Name), RowIndex, Cols, 
+					   foi(Name)),
+    externalize_get(Name, Cols, Result).
+
+
+externalize_next(Name, Result) when is_list(Result) ->
+    F = fun({[Col | _] = Idx, Val}) -> {Idx, externalize(Name, Col, Val)};
+	   (Other)                  -> Other
+	end,
+    [F(R) || R <- Result];
+externalize_next(_, Result) ->
+    Result.
+
+
+externalize_get(Name, Cols, Result) when is_list(Result) ->
+    %% Patch returned values
+    F = fun({Col, {value, Val}}) -> {value, externalize(Name, Col, Val)};
+	   ({_, Other}) ->          Other
+	end,
+    %% Merge column numbers and return values. there must be as much
+    %% return values as there are columns requested. And then patch all values
+    [F(R) || R <- lists:zip(Cols, Result)];
+externalize_get(_, _, Result) ->
+    Result. 
+
+externalize(vacmViewTreeFamilyTable, ?vacmViewTreeFamilyMask, Val) ->
+    imask2emask(Val);
+externalize(_, _, Val) ->
+    Val. 
+
 
 wrongValue(V) -> throw({wrongValue, V}).
 
diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index 14b93439df..aea63effe6 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -39,8 +39,10 @@
 	 enum_to_int/2, enum_to_int/3,
 
 	 info/0, info/1, old_info_format/1, 
-	 load_mibs/1, load_mibs/2, 
-	 unload_mibs/1, unload_mibs/2, 
+	 load_mib/1, load_mib/2, 
+	 load_mibs/1, load_mibs/2, load_mibs/3, 
+	 unload_mib/1, unload_mib/2, 
+	 unload_mibs/1, unload_mibs/2, unload_mibs/3, 
 	 which_mibs/0, which_mibs/1, 
 	 whereis_mib/1, whereis_mib/2, 
 	 dump_mibs/0, dump_mibs/1,
@@ -83,11 +85,10 @@
 -export([add_agent_caps/2, del_agent_caps/1, get_agent_caps/0]).
 
 %% Audit Trail Log functions
--export([log_to_txt/1, 
-	 log_to_txt/2, log_to_txt/3, log_to_txt/4, 
-	 log_to_txt/5, log_to_txt/6, log_to_txt/7, 
-	 log_to_io/1,  log_to_io/2,  log_to_io/3, 
-	 log_to_io/4,  log_to_io/5,  log_to_io/6, 
+-export([log_to_txt/1, log_to_txt/2, log_to_txt/3, log_to_txt/4, 
+	 log_to_txt/5, log_to_txt/6, log_to_txt/7, log_to_txt/8, 
+	 log_to_io/1,  log_to_io/2,  log_to_io/3,  log_to_io/4, 
+	 log_to_io/5,  log_to_io/6,  log_to_io/7, 
 	 log_info/0, 
 	 change_log_size/1,
 	 get_log_type/0,    get_log_type/1, 
@@ -128,7 +129,8 @@
 -include("snmpa_internal.hrl").
 -include_lib("snmp/include/snmp_types.hrl"). % type of me needed. 
 
--define(DISCO_EXTRA_INFO, undefined).
+-define(DISCO_EXTRA_INFO,  undefined).
+-define(ATL_BLOCK_DEFAULT, true).
 
 
 %%-----------------------------------------------------------------
@@ -300,19 +302,75 @@ backup(Agent, BackupDir) ->
 dump_mibs()     -> snmpa_agent:dump_mibs(snmp_master_agent).
 dump_mibs(File) -> snmpa_agent:dump_mibs(snmp_master_agent, File).
 
+
+load_mib(Mib) ->
+    load_mib(snmp_master_agent, Mib).
+
+-spec load_mib(Agent :: pid() | atom(), Mib :: string()) ->
+    ok | {error, Reason :: already_loaded | term()}.
+
+load_mib(Agent, Mib) ->
+    case load_mibs(Agent, [Mib]) of
+	{error, {'load aborted at', Mib, Reason}} ->
+	    {error, Reason};
+	Else ->
+	    Else
+    end.
+
 load_mibs(Mibs) ->
-    load_mibs(snmp_master_agent, Mibs).
+    load_mibs(snmp_master_agent, Mibs, false).
 load_mibs(Agent, Mibs) when is_list(Mibs) -> 
-    snmpa_agent:load_mibs(Agent, Mibs).
+    snmpa_agent:load_mibs(Agent, Mibs, false);
+load_mibs(Mibs, Force) 
+  when is_list(Mibs) andalso ((Force =:= true) orelse (Force =:= false)) ->
+    load_mibs(snmp_master_agent, Mibs, Force).
+
+-spec load_mibs(Agent :: pid() | atom(), 
+		Mibs  :: [MibName :: string()], 
+		Force :: boolean()) ->
+    ok | {error, {'load aborted at', MibName :: string(), InternalReason :: already_loaded | term()}}.
+
+load_mibs(Agent, Mibs, Force) 
+  when is_list(Mibs) andalso ((Force =:= true) orelse (Force =:= false)) -> 
+    snmpa_agent:load_mibs(Agent, Mibs, Force).
+
+
+unload_mib(Mib) ->
+    unload_mib(snmp_master_agent, Mib).
+
+-spec unload_mib(Agent :: pid() | atom(), Mib :: string()) ->
+    ok | {error, Reason :: not_loaded | term()}.
+
+unload_mib(Agent, Mib) ->
+    case unload_mibs(Agent, [Mib]) of
+	{error, {'unload aborted at', Mib, Reason}} ->
+	    {error, Reason};
+	Else ->
+	    Else
+    end.
 
 unload_mibs(Mibs) ->
-    unload_mibs(snmp_master_agent, Mibs).
+    unload_mibs(snmp_master_agent, Mibs, false).
 unload_mibs(Agent, Mibs) when is_list(Mibs) -> 
-    snmpa_agent:unload_mibs(Agent, Mibs).
+    snmpa_agent:unload_mibs(Agent, Mibs);
+unload_mibs(Mibs, Force) 
+  when is_list(Mibs) andalso ((Force =:= true) orelse (Force =:= false)) ->
+    unload_mibs(snmp_master_agent, Mibs, Force).
+
+-spec unload_mibs(Agent :: pid() | atom(), 
+		  Mibs  :: [MibName :: string()], 
+		  Force :: boolean()) ->
+    ok | {error, {'unload aborted at', MibName :: string(), InternalReason :: not_loaded | term()}}.
+
+unload_mibs(Agent, Mibs, Force) 
+  when is_list(Mibs) andalso ((Force =:= true) orelse (Force =:= false)) ->
+    snmpa_agent:unload_mibs(Agent, Mibs, Force).
+
 
 which_mibs()      -> which_mibs(snmp_master_agent).
 which_mibs(Agent) -> snmpa_agent:which_mibs(Agent).
 
+
 whereis_mib(Mib) ->
     whereis_mib(snmp_master_agent, Mib).
 whereis_mib(Agent, Mib) when is_atom(Mib) ->
@@ -814,43 +872,207 @@ get_agent_caps() ->
 %%% Audit Trail Log functions 
 %%%-----------------------------------------------------------------
 
+-spec log_to_txt(LogDir :: snmp:dir()) ->
+    snmp:void().
+
 log_to_txt(LogDir) -> 
     log_to_txt(LogDir, []).
+
+-spec log_to_txt(LogDir :: snmp:dir(), 
+		 Block  :: boolean()) ->
+    snmp:void();
+                (LogDir :: snmp:dir(), 
+		 Mibs   :: [snmp:mib_name()]) ->
+    snmp:void().
+
+log_to_txt(LogDir, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    Mibs    = [], 
+    OutFile = "snmpa_log.txt",       
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
+
 log_to_txt(LogDir, Mibs) -> 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     OutFile = "snmpa_log.txt",       
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir :: snmp:dir(), 
+		 Mibs   :: [snmp:mib_name()], 
+		 Block  :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    OutFile = "snmpa_log.txt", 
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile) -> 
+    Block   = ?ATL_BLOCK_DEFAULT, 
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 Block   :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName) -> 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 Block   :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Block   :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Start   :: snmp_log:log_time()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) -> 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Block   :: boolean(), 
+		 Start   :: snmp_log:log_time()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Start   :: snmp_log:log_time(), 
+		 Stop    :: snmp_log:log_time()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start);
+
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Block   :: boolean(), 
+		 Start   :: snmp_log:log_time(), 
+		 Stop    :: snmp_log:log_time()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
 
 
 log_to_io(LogDir) -> 
     log_to_io(LogDir, []).
+
+log_to_io(LogDir, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    Mibs    = [], 
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs) -> 
+    Block   = ?ATL_BLOCK_DEFAULT, 
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
+
+log_to_io(LogDir, Mibs, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName) -> 
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
+
+log_to_io(LogDir, Mibs, LogName, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile) -> 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
 
 
 log_info() ->
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index c267ce5a70..9bed6e554e 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -28,7 +28,8 @@
 %% External exports
 -export([start_link/4, start_link/5, stop/1]).
 -export([subagent_set/2, 
-	 load_mibs/2, unload_mibs/2, which_mibs/1, whereis_mib/2, info/1,
+	 load_mibs/3, unload_mibs/3, 
+	 which_mibs/1, whereis_mib/2, info/1,
 	 register_subagent/3, unregister_subagent/2,
 	 send_notification/3, 
          register_notification_filter/5,
@@ -71,7 +72,8 @@
 	 handle_pdu/8, worker/2, worker_loop/1, 
 	 do_send_trap/7, do_send_trap/8]).
 %% <BACKWARD-COMPAT>
--export([handle_pdu/7]).
+-export([handle_pdu/7, 
+	 load_mibs/2, unload_mibs/2]).
 %% </BACKWARD-COMPAT>
 
 -include("snmpa_internal.hrl").
@@ -528,12 +530,22 @@ subagent_set(SubAgent, Arguments) ->
 
 
 %% Called by administrator (not agent; deadlock would occur)
+%% <BACKWARD-COMPAT>
 load_mibs(Agent, Mibs) ->
-    call(Agent, {load_mibs, Mibs}).
+    load_mibs(Agent, Mibs, false).
+%% </BACKWARD-COMPAT>
+
+load_mibs(Agent, Mibs, Force) ->
+    call(Agent, {load_mibs, Mibs, Force}).
 
 %% Called by administrator (not agent; deadlock would occur)
+%% <BACKWARD-COMPAT>
 unload_mibs(Agent, Mibs) ->
-    call(Agent, {unload_mibs, Mibs}).
+    unload_mibs(Agent, Mibs, false).
+%% </BACKWARD-COMPAT>
+
+unload_mibs(Agent, Mibs, Force) ->
+    call(Agent, {unload_mibs, Mibs, Force}).
 
 which_mibs(Agent) ->
     call(Agent, which_mibs).
@@ -1216,13 +1228,25 @@ handle_call({unregister_subagent, SubTreeOid}, _From, S) ->
 	end,
     {reply, Reply, S};
 
+%% <BACKWARD-COMPAT>
 handle_call({load_mibs, Mibs}, _From, S) ->
     ?vlog("load mibs ~p", [Mibs]),
     {reply, snmpa_mib:load_mibs(get(mibserver), Mibs), S};
+%% </BACKWARD-COMPAT>
+
+handle_call({load_mibs, Mibs, Force}, _From, S) ->
+    ?vlog("[~w] load mibs ~p", [Force, Mibs]),
+    {reply, snmpa_mib:load_mibs(get(mibserver), Mibs, Force), S};
 
+%% <BACKWARD-COMPAT>
 handle_call({unload_mibs, Mibs}, _From, S) ->
     ?vlog("unload mibs ~p", [Mibs]),
     {reply, snmpa_mib:unload_mibs(get(mibserver), Mibs), S};
+%% </BACKWARD-COMPAT>
+
+handle_call({unload_mibs, Mibs, Force}, _From, S) ->
+    ?vlog("[~w] unload mibs ~p", [Force, Mibs]),
+    {reply, snmpa_mib:unload_mibs(get(mibserver), Mibs, Force), S};
 
 handle_call(which_mibs, _From, S) ->
     ?vlog("which mibs", []),
diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl
index 2c0cad807a..f991244287 100644
--- a/lib/snmp/src/agent/snmpa_local_db.erl
+++ b/lib/snmp/src/agent/snmpa_local_db.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,6 +191,12 @@ dets_open(DbDir, DbInitError, Opts) ->
 		    end
 	    end;
 	_ ->
+	    case DbInitError of
+		create_db_and_dir ->
+		    ok = filelib:ensure_dir(Filename);
+		_ ->
+		    ok
+	    end,
 	    case do_dets_open(Name, Filename, Opts) of
 		{ok, Dets} ->
 		    ?vdebug("dets open done",[]),
@@ -583,7 +589,7 @@ handle_cast({variable_inc, Name, Db, N}, State) ->
 	    {value, Val} -> Val;
 	    _ -> 0 
 	end,
-    insert(Db, Name, M+N rem 4294967296, State),
+    insert(Db, Name, (M+N) rem 4294967296, State),
     {noreply, State};
     
 handle_cast({verbosity,Verbosity}, State) ->
diff --git a/lib/snmp/src/agent/snmpa_mib.erl b/lib/snmp/src/agent/snmpa_mib.erl
index 031309b990..5b523447c5 100644
--- a/lib/snmp/src/agent/snmpa_mib.erl
+++ b/lib/snmp/src/agent/snmpa_mib.erl
@@ -26,7 +26,7 @@
 %% External exports
 -export([start_link/3, stop/1, 
 	 lookup/2, next/3, which_mib/2, which_mibs/1, whereis_mib/2, 
-	 load_mibs/2, unload_mibs/2, 
+	 load_mibs/3, unload_mibs/3, 
 	 register_subagent/3, unregister_subagent/2, info/1, info/2, 
 	 verbosity/2, dump/1, dump/2,
 	 backup/2,
@@ -39,6 +39,10 @@
 	 which_cache_size/1
 	]).
 
+%% <BACKWARD-COMPAT>
+-export([load_mibs/2, unload_mibs/2]).
+%% </BACKWARD-COMPAT>
+
 %% Internal exports
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
 	 code_change/3]).
@@ -182,19 +186,32 @@ next(MibServer, Oid, MibView) ->
 %%----------------------------------------------------------------------
 %% Purpose: Loads mibs into the mib process.
 %% Args: Mibs is a list of Filenames (compiled mibs).
+%%       Force is a boolean
 %% Returns: ok | {error, Reason}
 %%----------------------------------------------------------------------
+
+%% <BACKWARD-COMPAT>
 load_mibs(MibServer, Mibs) ->
-    call(MibServer, {load_mibs, Mibs}).
+    load_mibs(MibServer, Mibs, false).
+%% </BACKWARD-COMPAT>
+
+load_mibs(MibServer, Mibs, Force) ->
+    call(MibServer, {load_mibs, Mibs, Force}).
 
 
 %%----------------------------------------------------------------------
 %% Purpose: Loads mibs into the mib process.
 %% Args: Mibs is a list of Filenames (compiled mibs).
+%%       Force is a boolean
 %% Returns: ok | {error, Reason}
 %%----------------------------------------------------------------------
+%% <BACKWARD-COMPAT>
 unload_mibs(MibServer, Mibs) ->
-    call(MibServer, {unload_mibs, Mibs}).
+    unload_mibs(MibServer, Mibs, false).
+%% </BACKWARD-COMPAT>
+
+unload_mibs(MibServer, Mibs, Force) ->
+    call(MibServer, {unload_mibs, Mibs, Force}).
 
 
 %%----------------------------------------------------------------------
@@ -323,10 +340,6 @@ do_init(Prio, Mibs, Opts) ->
 %% Returns: {ok, NewMibData} | {'aborted at', Mib, NewData, Reason}
 %% Args: Operation is load_mib | unload_mib.
 %%----------------------------------------------------------------------
-mib_operations(Mod, Operation, Mibs, Data, MeOverride, TeOverride) ->
-    mib_operations(Mod, Operation, Mibs, Data, MeOverride, TeOverride, false). 
-
-
 mib_operations(_Mod, _Operation, [], Data, _MeOverride, _TeOverride, _Force) ->
     {ok, Data};
 mib_operations(Mod, Operation, [Mib|Mibs], Data0, MeOverride, TeOverride, Force) ->
@@ -451,18 +464,23 @@ handle_call({next, Oid, MibView}, _From,
     ?vdebug("next -> Reply: ~p", [Reply]), 
     {reply, Reply, NewState};
 
-handle_call({load_mibs, Mibs}, _From, 
+%% <BACKWARD-COMPAT>
+handle_call({load_mibs, Mibs}, From, State) ->
+    handle_call({load_mibs, Mibs, false}, From, State);
+%% </BACKWARD-COMPAT>
+
+handle_call({load_mibs, Mibs, Force}, _From, 
 	    #state{data         = Data, 
 		   teo          = TeOverride, 
 		   meo          = MeOverride,
 		   cache        = Cache, 
 		   data_mod     = Mod} = State) ->
-    ?vlog("load mibs ~p",[Mibs]),    
+    ?vlog("[~w] load mibs ~p", [Force, Mibs]),    
     %% Invalidate cache
     NewCache = maybe_invalidate_cache(Cache),
     {NData, Reply} = 
 	case (catch mib_operations(Mod, load_mib, Mibs, Data,
-				   MeOverride, TeOverride)) of
+				   MeOverride, TeOverride, Force)) of
 	    {'aborted at', Mib, NewData, Reason} ->
 		?vlog("aborted at ~p for reason ~p",[Mib,Reason]),    
 		{NewData, {error, {'load aborted at', Mib, Reason}}};
@@ -472,19 +490,24 @@ handle_call({load_mibs, Mibs}, _From,
     Mod:sync(NData),
     {reply, Reply, State#state{data = NData, cache = NewCache}};
 
-handle_call({unload_mibs, Mibs}, _From, 
+%% <BACKWARD-COMPAT>
+handle_call({unload_mibs, Mibs}, From, State) ->
+    handle_call({unload_mibs, Mibs, false}, From, State);
+%% </BACKWARD-COMPAT>
+
+handle_call({unload_mibs, Mibs, Force}, _From, 
 	    #state{data         = Data, 
 		   teo          = TeOverride, 
 		   meo          = MeOverride,
 		   cache        = Cache, 
 		   data_mod     = Mod} = State) ->
-    ?vlog("unload mibs ~p",[Mibs]),    
+    ?vlog("[~w] unload mibs ~p", [Force, Mibs]),    
     %% Invalidate cache
     NewCache = maybe_invalidate_cache(Cache),
     %% Unload mib(s)
     {NData, Reply} = 
 	case (catch mib_operations(Mod, unload_mib, Mibs, Data,
-				   MeOverride, TeOverride)) of
+				   MeOverride, TeOverride, Force)) of
 	    {'aborted at', Mib, NewData, Reason} ->
 		?vlog("aborted at ~p for reason ~p", [Mib,Reason]),    
 		{NewData, {error, {'unload aborted at', Mib, Reason}}};
diff --git a/lib/snmp/src/agent/snmpa_mpd.erl b/lib/snmp/src/agent/snmpa_mpd.erl
index 2d37ea56f0..11ae806866 100644
--- a/lib/snmp/src/agent/snmpa_mpd.erl
+++ b/lib/snmp/src/agent/snmpa_mpd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -657,7 +657,7 @@ generate_response_msg(Vsn, RePdu, Type,
 		    ?SEC_USM ->
 			snmpa_usm
 		end,
-	    SecEngineID = LocalEngineID, 
+	    SecEngineID = LocalEngineID, % 3.1.1a
 	    ?vtrace("generate_response_msg -> SecEngineID: ~w", [SecEngineID]),
 	    case (catch SecModule:generate_outgoing_msg(Message, 
 							SecEngineID,
diff --git a/lib/snmp/src/agent/snmpa_supervisor.erl b/lib/snmp/src/agent/snmpa_supervisor.erl
index aebcdbaa84..77ed54bee4 100644
--- a/lib/snmp/src/agent/snmpa_supervisor.erl
+++ b/lib/snmp/src/agent/snmpa_supervisor.erl
@@ -356,7 +356,7 @@ init([AgentType, Opts]) ->
     SymStoreSpec = 
 	worker_spec(snmpa_symbolic_store, SymStoreArgs, Restart, 2000),
 
-    LdbArgs = [Prio, DbDir, LdbOpts],
+    LdbArgs = [Prio, DbDir, DbInitError, LdbOpts],
     LocalDbSpec = 
 	worker_spec(snmpa_local_db, LdbArgs, Restart, 5000),
 
diff --git a/lib/snmp/src/agent/snmpa_symbolic_store.erl b/lib/snmp/src/agent/snmpa_symbolic_store.erl
index 00178f4bcd..a922d62ba8 100644
--- a/lib/snmp/src/agent/snmpa_symbolic_store.erl
+++ b/lib/snmp/src/agent/snmpa_symbolic_store.erl
@@ -642,10 +642,10 @@ code_change(_Vsn, S, _Extra) ->
     {ok, S}.
 
 
-stop_backup_server(undefined) ->
-    ok;
-stop_backup_server({Pid, _}) when is_pid(Pid) ->
-    exit(Pid, kill).
+%% stop_backup_server(undefined) ->
+%%     ok;
+%% stop_backup_server({Pid, _}) when is_pid(Pid) ->
+%%     exit(Pid, kill).
 
 
     
diff --git a/lib/snmp/src/agent/snmpa_usm.erl b/lib/snmp/src/agent/snmpa_usm.erl
index 6f54307f9f..719ea4e356 100644
--- a/lib/snmp/src/agent/snmpa_usm.erl
+++ b/lib/snmp/src/agent/snmpa_usm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
 %%
 %% The 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,6 +16,9 @@
 %%
 %% %CopyrightEnd%
 %%
+%% AES: RFC 3826
+%% 
+
 -module(snmpa_usm).
 
 %% Avoid warning for local function error/1 clashing with autoimported BIF.
@@ -652,7 +655,10 @@ get_des_salt() ->
     [?i32(EngineBoots), ?i32(SaltInt)].
 
 aes_encrypt(PrivKey, Data) ->
-    snmp_usm:aes_encrypt(PrivKey, Data, fun get_aes_salt/0).
+    EngineBoots = snmp_framework_mib:get_engine_boots(),
+    EngineTime  = snmp_framework_mib:get_engine_time(),
+    snmp_usm:aes_encrypt(PrivKey, Data, fun get_aes_salt/0, 
+			 EngineBoots, EngineTime).
 
 aes_decrypt(PrivKey, UsmSecParams, EncData) ->
     #usmSecurityParameters{msgPrivacyParameters        = PrivParams,
diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
index 716add8b9e..b8cc4b8754 100644
--- a/lib/snmp/src/app/Makefile
+++ b/lib/snmp/src/app/Makefile
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2003-2012. All Rights Reserved.
+# Copyright Ericsson AB 2003-2013. All Rights Reserved.
 # 
 # The 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,6 +79,8 @@ endif
 # FLAGS
 # ----------------------------------------------------
 
+ERL_COMPILE_FLAGS += -pa $(ERL_TOP)/lib/snmp/ebin
+
 ifeq ($(WARN_UNUSED_VARS),true)
 ERL_COMPILE_FLAGS += +warn_unused_vars
 endif
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 7ffa4a725d..babc33e6a5 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %% 
 %% The 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,20 +17,33 @@
 %% %CopyrightEnd%
 %%
 
+
 {"%VSN%",
 
 %% ----- U p g r a d e -------------------------------------------------------
 
+%% Instruction examples: 
+%% {restart_application, snmp}
+%% {load_module, snmp_pdus, soft_purge, soft_purge, []}
+%% {update, snmpa_local_db, soft, soft_purge, soft_purge, []}
+%% {add_module,  snmpm_net_if_mt}
  [
-  {"4.23.1", [{restart_application, snmp}]}, 
-  {"4.23",   [{restart_application, snmp}]}
+  {"4.25",   [{restart_application, snmp}]}, 
+  {"4.24.2", [{restart_application, snmp}]}, 
+  {"4.24.1", [{restart_application, snmp}]}, 
+  {"4.24",   [{restart_application, snmp}]}
  ], 
 
 %% ------D o w n g r a d e ---------------------------------------------------
 
+%% Instruction examples: 
+%% {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
+
  [
-  {"4.23.1", [{restart_application, snmp}]}, 
-  {"4.23",   [{restart_application, snmp}]}
+  {"4.25",   [{restart_application, snmp}]}, 
+  {"4.24.2", [{restart_application, snmp}]}, 
+  {"4.24.1", [{restart_application, snmp}]}, 
+  {"4.24",   [{restart_application, snmp}]}
  ]
 
 }.
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index 1bb562654a..8b3a8af77d 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -49,8 +49,8 @@
 
 	 read_mib/1, 
  
-	 log_to_txt/5, log_to_txt/6, log_to_txt/7,
-	 log_to_io/4,  log_to_io/5,  log_to_io/6,
+	 log_to_txt/5, log_to_txt/6, log_to_txt/7, log_to_txt/8, 
+	 log_to_io/4,  log_to_io/5,  log_to_io/6,  log_to_io/7, 
 	 change_log_size/2,
 
 	 octet_string_to_bits/1, bits_to_octet_string/1, 
@@ -91,7 +91,31 @@
 	]).
 
 -export_type([
+	      dir/0, 
+	      snmp_timer/0, 
+
+	      engine_id/0, 
+	      tdomain/0, 
+	      community/0, 
+	      mms/0, 
+	      version/0, 
+	      sec_model/0, 
+	      sec_name/0, 
+	      sec_level/0, 
+
 	      oid/0,
+	      varbind/0, 
+	      ivarbind/0, 
+	      asn1_type/0, 
+	      table_info/0, 
+	      variable_info/0, 
+	      me/0, 
+	      trap/0, 
+	      notification/0, 
+	      pdu/0, 
+	      trappdu/0, 
+	      mib/0, 
+	      mib_name/0, 
  
 	      void/0
 	     ]).
@@ -148,15 +172,42 @@
  
 
 -define(APPLICATION, snmp).
+-define(ATL_BLOCK_DEFAULT, true).
 
+-include_lib("snmp/include/snmp_types.hrl").
 
 
 %%-----------------------------------------------------------------
 %% Types
 %%-----------------------------------------------------------------
 
--type oid()  :: [non_neg_integer()].
--type void() :: term().
+-type dir()           :: string().
+-type snmp_timer()    :: #snmp_incr_timer{}.
+
+-type engine_id()     :: string().
+-type tdomain()       :: transportDomainUdpIpv4 | transportDomainUdpIpv6.
+-type community()     :: string().
+-type mms()           :: non_neg_integer().
+-type version()       :: v1 | v2 | v3.
+-type sec_model()     :: any | v1 | v2c | usm.
+-type sec_name()      :: string().
+-type sec_level()     :: noAuthNoPriv | authNoPriv | authPriv.
+
+-type oid()           :: [non_neg_integer()].
+-type varbind()       :: #varbind{}.
+-type ivarbind()      :: #ivarbind{}.
+-type asn1_type()     :: #asn1_type{}.
+-type table_info()    :: #table_info{}.
+-type variable_info() :: #variable_info{}.
+-type me()            :: #me{}.
+-type trap()          :: #trap{}.
+-type notification()  :: #notification{}.
+-type mib()           :: #mib{}.
+-type mib_name()      :: string().
+-type pdu()           :: #pdu{}.
+-type trappdu()       :: #trappdu{}.
+
+-type void()          :: term().
 
 
 %%-----------------------------------------------------------------
@@ -854,18 +905,60 @@ read_mib(FileName) ->
 %%%-----------------------------------------------------------------
 
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> 
-    snmp_log:log_to_txt(LogName, LogFile, LogDir, Mibs, OutFile).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    Start = null, 
+    Stop  = null, 
+    log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    Start = null, 
+    Stop  = null, 
+    log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) -> 
-    snmp_log:log_to_txt(LogName, LogFile, LogDir, Mibs, OutFile, Start).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    Stop  = null, 
+    log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    Stop  = null, 
+    log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> 
-    snmp_log:log_to_txt(LogName, LogFile, LogDir, Mibs, OutFile, Start, Stop).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> 
+    snmp_log:log_to_txt(LogName, Block, LogFile, LogDir, Mibs, OutFile, 
+			Start, Stop).
+
 
 log_to_io(LogDir, Mibs, LogName, LogFile) -> 
-    snmp_log:log_to_io(LogName, LogFile, LogDir, Mibs).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    Start = null, 
+    Stop  = null, 
+    log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    Start = null, 
+    Stop  = null, 
+    log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
-    snmp_log:log_to_io(LogName, LogFile, LogDir, Mibs, Start).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    Stop  = null, 
+    log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    Stop  = null, 
+    log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    snmp_log:log_to_io(LogName, LogFile, LogDir, Mibs, Start, Stop).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> 
+    snmp_log:log_to_io(LogName, Block, LogFile, LogDir, Mibs, Start, Stop).
 
 change_log_size(LogName, NewSize) -> 
     snmp_log:change_size(LogName, NewSize).
@@ -878,12 +971,12 @@ change_log_size(LogName, NewSize) ->
 %% Usage: erl -s snmp str_apply '{Mod,Func,ArgList}'
 str_apply([Atom]) ->
     Str = atom_to_list(Atom),
-    {Mod,Func,Args} = to_erlang_term(Str),
-    apply(Mod,Func,Args).
+    {Mod, Func, Args} = to_erlang_term(Str),
+    apply(Mod, Func, Args).
 
 to_erlang_term(String) ->
     {ok, Tokens, _} = erl_scan:string(lists:append([String, ". "])),
-    {ok,Term} = erl_parse:parse_term(Tokens),
+    {ok, Term}      = erl_parse:parse_term(Tokens),
     Term.
 
 
diff --git a/lib/snmp/src/app/snmp_internal.hrl b/lib/snmp/src/app/snmp_internal.hrl
index 5ff715e0b7..f04fa4dd53 100644
--- a/lib/snmp/src/app/snmp_internal.hrl
+++ b/lib/snmp/src/app/snmp_internal.hrl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %% 
 %% The 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,8 @@
 -define(APPLICATION, snmp).
 -endif.
 
+-define(STACK(), erlang:get_stacktrace()).
+
 -define(snmp_info(C, F, A),    ?snmp_msg(info_msg, C, F, A)).
 -define(snmp_warning(C, F, A), ?snmp_msg(warning_msg, C, F, A)).
 -define(snmp_error(C, F, A),   ?snmp_msg(error_msg, C, F, A)).
diff --git a/lib/snmp/src/manager/snmpm.erl b/lib/snmp/src/manager/snmpm.erl
index 6ac0115dad..c97b635fc6 100644
--- a/lib/snmp/src/manager/snmpm.erl
+++ b/lib/snmp/src/manager/snmpm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -75,11 +75,10 @@
 
 	 %% 
 	 %% Logging
-	 log_to_txt/1, 
-	 log_to_txt/2, log_to_txt/3, log_to_txt/4,
-	 log_to_txt/5, log_to_txt/6, log_to_txt/7, 
-	 log_to_io/1,  log_to_io/2,  log_to_io/3,
-	 log_to_io/4,  log_to_io/5,  log_to_io/6, 
+	 log_to_txt/1, log_to_txt/2, log_to_txt/3, log_to_txt/4, 
+	 log_to_txt/5, log_to_txt/6, log_to_txt/7, log_to_txt/8, 
+	 log_to_io/1,  log_to_io/2,  log_to_io/3,  log_to_io/4, 
+	 log_to_io/5,  log_to_io/6,  log_to_io/7, 
 	 change_log_size/1,
 	 get_log_type/0,
 	 set_log_type/1,
@@ -111,6 +110,12 @@
 -export([start_link/3, snmpm_start_verify/2, snmpm_start_verify/3]).
 -export([target_name/1, target_name/2]).
 
+-export_type([
+	      register_timeout/0, 
+	      agent_config/0, 
+	      target_name/0
+	     ]).
+
 
 -include_lib("snmp/src/misc/snmp_debug.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
@@ -119,6 +124,26 @@
 -include("snmp_verbosity.hrl").
 
 -define(DEFAULT_AGENT_PORT, 161).
+-define(ATL_BLOCK_DEFAULT,  true).
+
+
+%%-----------------------------------------------------------------
+%% Types
+%%-----------------------------------------------------------------
+
+-type register_timeout() :: pos_integer() | snmp:snmp_timer().
+-type agent_config() :: {engine_id,        snmp:engine_id()}   | % Mandatory
+			{address,          inet:ip_address()}  | % Mandatory
+			{port,             inet:port_number()} | % Optional
+			{tdomain,          snmp:tdomain()}     | % Optional
+			{community,        snmp:community()}   | % Optional
+			{timeout,          register_timeout()} | % Optional
+			{max_message_size, snmp:mms()}         | % Optional
+			{version,          snmp:version()}     | % Optional
+			{sec_moduel,       snmp:sec_model()}   | % Optional
+			{sec_name,         snmp:sec_name()}    | % Optional
+			{sec_level,        snmp:sec_level()}.    % Optional
+-type target_name() :: string().
 
 
 %% This function is called when the snmp application
@@ -762,43 +787,204 @@ cancel_async_request(UserId, ReqId) ->
 %%% Audit Trail Log functions (for backward compatibility)
 %%%-----------------------------------------------------------------
 
+-spec log_to_txt(LogDir :: snmp:dir()) ->
+    snmp:void().
+
 log_to_txt(LogDir) ->
     log_to_txt(LogDir, []). 
+
+-spec log_to_txt(LogDir :: snmp:dir(), 
+		 Block  :: boolean()) ->
+    snmp:void();
+                (LogDir :: snmp:dir(), 
+		 Mibs   :: [snmp:mib_name()]) ->
+    snmp:void().
+
+log_to_txt(LogDir, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    Mibs    = [], 
+    OutFile = "snmpm_log.txt",       
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs) ->
+    Block   = ?ATL_BLOCK_DEFAULT, 
+    OutFile = "snmpm_log.txt",       
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir :: snmp:dir(), 
+		 Mibs   :: [snmp:mib_name()], 
+		 Block  :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, Block)  
+  when ((Block =:= true) orelse (Block =:= false)) ->
     OutFile = "snmpm_log.txt",       
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile) ->
+    Block   = ?ATL_BLOCK_DEFAULT, 
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 Block   :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, Block)  
+  when ((Block =:= true) orelse (Block =:= false)) ->
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block); 
 log_to_txt(LogDir, Mibs, OutFile, LogName) ->
+    Block   = ?ATL_BLOCK_DEFAULT, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 Block   :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, Block)  
+  when ((Block =:= true) orelse (Block =:= false)) -> 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile) -> 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Block   :: boolean()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Start   :: snmp_log:log_time()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block)  
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) -> 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Block   :: boolean(), 
+		 Start   :: snmp_log:log_time()) ->
+    snmp:void();
+                (LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Start   :: snmp_log:log_time(), 
+		 Stop    :: snmp_log:log_time()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start)  
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start);
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> 
-    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
+
+-spec log_to_txt(LogDir  :: snmp:dir(), 
+		 Mibs    :: [snmp:mib_name()], 
+		 OutFile :: file:filename(), 
+		 LogName :: string(), 
+		 LogFile :: string(), 
+		 Block   :: boolean(), 
+		 Start   :: snmp_log:log_time(), 
+		 Stop    :: snmp_log:log_time()) ->
+    snmp:void().
+
+log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop) -> 
+    snmp:log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Block, Start, Stop).
 
 
 log_to_io(LogDir) ->
     log_to_io(LogDir, []).
+
+log_to_io(LogDir, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    Mibs    = [], 
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs) ->
     LogName = ?audit_trail_log_name, 
     LogFile = ?audit_trail_log_file, 
     snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+
+log_to_io(LogDir, Mibs, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    LogName = ?audit_trail_log_name, 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName) ->
+    Block   = ?ATL_BLOCK_DEFAULT, 
     LogFile = ?audit_trail_log_file, 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
+
+log_to_io(LogDir, Mibs, LogName, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    LogFile = ?audit_trail_log_file, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile) -> 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block);
 log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start); 
 log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
-    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop).
+    Block = ?ATL_BLOCK_DEFAULT, 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
+
+log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop) -> 
+    snmp:log_to_io(LogDir, Mibs, LogName, LogFile, Block, Start, Stop).
     
 
 change_log_size(NewSize) ->
diff --git a/lib/snmp/src/manager/snmpm_conf.erl b/lib/snmp/src/manager/snmpm_conf.erl
index 03dbd028f7..5e2d9fdbf6 100644
--- a/lib/snmp/src/manager/snmpm_conf.erl
+++ b/lib/snmp/src/manager/snmpm_conf.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %% 
 %% The 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/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index 736debe544..2101ad46e1 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -1215,6 +1215,12 @@ dets_open(Dir, DbInitError, Repair, AutoSave) ->
 		    end
 	    end;
 	_ ->
+	    case DbInitError of
+		create_db_and_dir ->
+		    ok = filelib:ensure_dir(Filename);
+		_ ->
+		    ok
+	    end,
 	    case do_dets_open(Name, Filename, Repair, AutoSave) of
 		{ok, _Dets} ->
 		    ok;
@@ -1316,7 +1322,14 @@ verify_option({server, ServerOpts}) ->
     verify_server_opts(ServerOpts);
 verify_option({note_store, NoteStoreOpts}) ->
     verify_note_store_opts(NoteStoreOpts);
-verify_option({config, ConfOpts}) ->
+verify_option({config, ConfOpts0}) ->
+    %% Make sure any db_dir option is first in the options list to make it
+    %% easier to check if the db_init_error option specifies that a missing
+    %% db_dir should be created.
+    ConfOpts = case lists:keytake(db_dir, 1, ConfOpts0) of
+                   false -> ConfOpts0;
+                   {value, Result, OtherOpts} -> [Result|OtherOpts]
+               end,
     verify_config_opts(ConfOpts);
 verify_option({versions, Vsns}) ->
     verify_versions(Vsns);
@@ -1365,7 +1378,12 @@ verify_config_opts([{dir, Dir}|Opts]) ->
     verify_conf_dir(Dir),
     verify_config_opts(Opts);
 verify_config_opts([{db_dir, Dir}|Opts]) ->
-    verify_conf_db_dir(Dir),
+    case lists:keyfind(db_init_error, 1, Opts) of
+        {db_init_error, create_db_and_dir} ->
+            verify_conf_db_dir(Dir, false);
+        _ ->
+            verify_conf_db_dir(Dir, true)
+    end,
     verify_config_opts(Opts);
 verify_config_opts([{db_init_error, DbInitErr}|Opts]) ->
     verify_conf_db_init_error(DbInitErr),
@@ -1443,7 +1461,7 @@ verify_conf_dir(Dir) ->
 	    error({invalid_conf_dir, Dir})
     end.
 
-verify_conf_db_dir(Dir) ->
+verify_conf_db_dir(Dir, true) ->
     case (catch verify_dir(Dir)) of
 	ok ->
 	    ok;
@@ -1451,13 +1469,16 @@ verify_conf_db_dir(Dir) ->
 	    error({invalid_conf_db_dir, Dir, Reason});
 	_ ->
 	    error({invalid_conf_db_dir, Dir})
-    end.
-
+    end;
+verify_conf_db_dir(_Dir, false) ->
+    ok.
 
 verify_conf_db_init_error(terminate) ->
     ok;
 verify_conf_db_init_error(create) ->
     ok;
+verify_conf_db_init_error(create_db_and_dir) ->
+    ok;
 verify_conf_db_init_error(InvalidDbInitError) ->
     error({invalid_conf_db_init_error, InvalidDbInitError}).
 
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index 61d22362cc..9c79df2748 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -488,7 +488,7 @@ cancel_async_request(UserId, ReqId) ->
 %% discovery(UserId, BAddr, Port, Config, Expire, ExtraInfo) ->
 %%     call({discovery, self(), UserId, BAddr, Port, Config, Expire, ExtraInfo}).
 
-    
+
 verbosity(Verbosity) ->
     case ?vvalidate(Verbosity) of
 	Verbosity ->
@@ -1851,7 +1851,17 @@ handle_snmp_error(Addr, Port, ReqId, Reason, State) ->
 handle_error(_UserId, Mod, Reason, ReqId, Data, _State) ->
     ?vtrace("handle_error -> entry when"
 	    "~n   Mod: ~p", [Mod]),
-    F = fun() -> (catch Mod:handle_error(ReqId, Reason, Data)) end,
+    F = fun() ->
+		try 
+		    begin
+			Mod:handle_error(ReqId, Reason, Data)
+		    end
+		catch
+		    T:E ->
+			CallbackArgs = [ReqId, Reason, Data], 
+			handle_invalid_result(handle_error, CallbackArgs, T, E)
+		end
+	end,
     handle_callback(F),
     ok.
 
@@ -2031,7 +2041,15 @@ handle_pdu(_UserId, Mod, target_name = _RegType, TargetName, _Addr, _Port,
     ?vtrace("handle_pdu(target_name) -> entry when"
 	    "~n   Mod: ~p", [Mod]),
     F = fun() ->
-		(catch Mod:handle_pdu(TargetName, ReqId, SnmpResponse, Data))
+		try
+		    begin
+			Mod:handle_pdu(TargetName, ReqId, SnmpResponse, Data)
+		    end
+		catch
+		    T:E ->
+			CallbackArgs = [TargetName, ReqId, SnmpResponse, Data], 
+			handle_invalid_result(handle_pdu, CallbackArgs, T, E) 
+		end
 	end,
     handle_callback(F),
     ok;
@@ -2064,8 +2082,37 @@ do_handle_agent(DefUserId, DefMod,
 		SnmpInfo, DefData, State) ->
     ?vdebug("do_handle_agent -> entry when"
 	    "~n   DefUserId: ~p", [DefUserId]),
-    case (catch DefMod:handle_agent(Addr, Port, Type, SnmpInfo, DefData)) of
-	{'EXIT', {undef, _}} when Type =:= pdu ->
+    try DefMod:handle_agent(Addr, Port, Type, SnmpInfo, DefData) of
+	{register, UserId2, TargetName, Config} ->  
+	    ?vtrace("do_handle_agent -> register: "
+		    "~n   UserId2:    ~p"
+		    "~n   TargetName: ~p"
+		    "~n   Config:     ~p", 
+		    [UserId2, TargetName, Config]),
+	    Config2 = ensure_present([{address, Addr}, {port, Port}], Config),
+	    Config3 = [{reg_type, target_name} | Config2], 
+	    case snmpm_config:register_agent(UserId2, 
+					     TargetName, Config3) of
+		ok ->
+		    ok;
+		{error, Reason} ->
+		    error_msg("failed registering agent - "
+			      "handling agent "
+			      "~p <~p,~p>: ~n~w", 
+			      [TargetName, Addr, Port, Reason]),
+		    ok
+	    end;
+	
+	ignore ->
+	    ?vdebug("do_handle_agent -> ignore", []),
+	    ok;
+
+	InvalidResult ->
+	    CallbackArgs = [Addr, Port, Type, SnmpInfo, DefData], 
+	    handle_invalid_result(handle_agent, CallbackArgs, InvalidResult) 
+
+    catch
+	error:{undef, _} when Type =:= pdu ->
 	    %% Maybe, still on the old API
 	    ?vdebug("do_handle_agent -> maybe still on the old api", []),
 	    case (catch DefMod:handle_agent(Addr, Port, SnmpInfo, DefData)) of
@@ -2113,10 +2160,10 @@ do_handle_agent(DefUserId, DefMod,
 		    ok
 	    end;
 
-	{'EXIT', {undef, _}} ->
+	error:{undef, _} ->
 	    %% If the user does not implement the new API (but the
 	    %% old), then this clause catches all non-pdu handle_agent 
-	    %% calls. These calls was previously never made,so we make 
+	    %% calls. These calls was previously never made, so we make 
 	    %% a best-effert call (using reg-type target_name) to the 
 	    %% various callback functions, and leave it to the user to
 	    %% figure out
@@ -2148,31 +2195,11 @@ do_handle_agent(DefUserId, DefMod,
 			      "regarding agent "
 			      "<~p,~p>: ~n~w", [Type, Addr, Port, SnmpInfo])
 	    end;
-
-	{register, UserId2, TargetName, Config} ->  
-	    ?vtrace("do_handle_agent -> register: "
-		    "~n   UserId2:    ~p"
-		    "~n   TargetName: ~p"
-		    "~n   Config:     ~p", 
-		    [UserId2, TargetName, Config]),
-	    Config2 = ensure_present([{address, Addr}, {port, Port}], Config),
-	    Config3 = [{reg_type, target_name} | Config2], 
-	    case snmpm_config:register_agent(UserId2, 
-					     TargetName, Config3) of
-		ok ->
-		    ok;
-		{error, Reason} ->
-		    error_msg("failed registering agent - "
-			      "handling agent "
-			      "~p <~p,~p>: ~n~w", 
-			      [TargetName, Addr, Port, Reason]),
-		    ok
-	    end;
 	
-	_Ignore ->
-	    ?vdebug("do_handle_agent -> ignore", []),
-	    ok
-
+	T:E ->
+	    CallbackArgs = [Addr, Port, Type, SnmpInfo, DefData], 
+	    handle_invalid_result(handle_agent, CallbackArgs, T, E)
+	    
     end.
 
 ensure_present([], Config) ->
@@ -2305,15 +2332,17 @@ do_handle_trap(UserId, Mod,
 	       RegType, Target, Addr, Port, SnmpTrapInfo, Data, _State) ->
     ?vdebug("do_handle_trap -> entry with"
 	    "~n   UserId: ~p", [UserId]),
-    HandleTrap = 
+    {HandleTrap, CallbackArgs} = 
 	case RegType of
 	    target_name ->
-		fun() -> Mod:handle_trap(Target, SnmpTrapInfo, Data) end;
+		{fun() -> Mod:handle_trap(Target, SnmpTrapInfo, Data) end, 
+		 [Target, SnmpTrapInfo, Data]};
 	    addr_port ->
-		fun() -> Mod:handle_trap(Addr, Port, SnmpTrapInfo, Data) end
+		{fun() -> Mod:handle_trap(Addr, Port, SnmpTrapInfo, Data) end, 
+		 [Addr, Port, SnmpTrapInfo, Data]}
 	end,
 
-    case (catch HandleTrap()) of
+    try HandleTrap() of
 	{register, UserId2, Config} -> 
 	    ?vtrace("do_handle_trap -> register: "
 		    "~n   UserId2: ~p"
@@ -2362,9 +2391,17 @@ do_handle_trap(UserId, Mod,
 			      [Addr, Port, Reason]),
 		    ok
 	    end;	    
-	_Ignore ->
+	ignore ->
 	    ?vtrace("do_handle_trap -> ignore", []),
-	    ok
+	    ok;
+
+	InvalidResult ->
+	    handle_invalid_result(handle_trap, CallbackArgs, InvalidResult)
+
+    catch
+	T:E ->
+	    handle_invalid_result(handle_trap, CallbackArgs, T, E)
+
     end.
 
 
@@ -2465,16 +2502,18 @@ do_handle_inform(UserId, Mod, Ref,
 		 RegType, Target, Addr, Port, SnmpInform, Data, State) ->
     ?vdebug("do_handle_inform -> entry with"
 	    "~n   UserId: ~p", [UserId]),
-    HandleInform = 
+    {HandleInform, CallbackArgs} = 
 	case RegType of
 	    target_name ->
-		fun() -> Mod:handle_inform(Target, SnmpInform, Data) end;
+		{fun() -> Mod:handle_inform(Target, SnmpInform, Data) end, 
+		 [Target, SnmpInform, Data]};
 	    addr_port ->
-		fun() -> Mod:handle_inform(Addr, Port, SnmpInform, Data) end
+		{fun() -> Mod:handle_inform(Addr, Port, SnmpInform, Data) end, 
+		 [Addr, Port, SnmpInform, Data]}
 	end,
 
      Rep = 
-	case (catch HandleInform()) of
+	try HandleInform() of
 	    {register, UserId2, Config} -> 
 		?vtrace("do_handle_inform -> register: "
 			"~n   UserId2: ~p"
@@ -2494,6 +2533,7 @@ do_handle_inform(UserId, Mod, Ref,
 				  [Target2, Addr, Port, Reason]),
 			reply
 		end;
+
 	    {register, UserId2, Target2, Config} -> 
 		?vtrace("do_handle_inform -> register: "
 			"~n   UserId2: ~p"
@@ -2512,6 +2552,7 @@ do_handle_inform(UserId, Mod, Ref,
 				  [Target2, Addr, Port, Reason]),
 			reply
 		end;
+
 	    unregister ->
 		?vtrace("do_handle_inform -> unregister", []),
 		case snmpm_config:unregister_agent(UserId, 
@@ -2525,12 +2566,25 @@ do_handle_inform(UserId, Mod, Ref,
 				  [Addr, Port, Reason]),
 			reply
 		end;	    
+
 	    no_reply ->
 		?vtrace("do_handle_inform -> no_reply", []),
 		no_reply;
-	    _Ignore ->
+
+	    ignore ->
 		?vtrace("do_handle_inform -> ignore", []),
+		reply;
+
+	    InvalidResult ->
+		handle_invalid_result(handle_inform, CallbackArgs, 
+				      InvalidResult), 
 		reply
+
+	catch
+	    T:E ->
+		handle_invalid_result(handle_inform, CallbackArgs, T, E), 
+		reply
+
 	end,
     handle_inform_response(Rep, Ref, Addr, Port, State),
     ok.
@@ -2760,15 +2814,17 @@ do_handle_report(UserId, Mod,
 		 RegType, Target, Addr, Port, SnmpReport, Data, _State) ->
     ?vdebug("do_handle_report -> entry with"
 	    "~n   UserId: ~p", [UserId]),
-    HandleReport = 
+    {HandleReport, CallbackArgs} = 
 	case RegType of
 	    target_name ->
-		fun() -> Mod:handle_report(Target, SnmpReport, Data) end;
+		{fun() -> Mod:handle_report(Target, SnmpReport, Data) end, 
+		 [Target, SnmpReport, Data]};
 	    addr_port ->
-		fun() -> Mod:handle_report(Addr, Port, SnmpReport, Data) end
+		{fun() -> Mod:handle_report(Addr, Port, SnmpReport, Data) end,
+		 [Addr, Port, SnmpReport, Data]}
 	end,
 
-    case (catch HandleReport()) of
+    try HandleReport() of
 	{register, UserId2, Config} -> 
 	    ?vtrace("do_handle_report -> register: "
 		    "~n   UserId2: ~p"
@@ -2788,6 +2844,7 @@ do_handle_report(UserId, Mod,
 			      [Addr, Port, Reason]),
 		    ok
 	    end;
+
 	{register, UserId2, Target2, Config} -> 
 	    ?vtrace("do_handle_report -> register: "
 		    "~n   UserId2: ~p"
@@ -2806,6 +2863,7 @@ do_handle_report(UserId, Mod,
 			      [Target2, Addr, Port, Reason]),
 		    reply
 	    end;
+
 	unregister ->
 	    ?vtrace("do_handle_trap -> unregister", []),
 	    case snmpm_config:unregister_agent(UserId, 
@@ -2819,9 +2877,20 @@ do_handle_report(UserId, Mod,
 			      [Addr, Port, Reason]),
 		    ok
 	    end;	    
-	_Ignore ->
+
+	ignore ->
 	    ?vtrace("do_handle_report -> ignore", []),
-	    ok
+	    ok;
+
+	InvalidResult ->
+	    handle_invalid_result(handle_report, CallbackArgs, InvalidResult), 
+	    reply
+
+    catch
+	T:E ->
+	    handle_invalid_result(handle_report, CallbackArgs, T, E),
+	    reply
+
     end.
 
 
@@ -2835,6 +2904,25 @@ handle_callback(F) ->
       end).
 
     
+
+handle_invalid_result(Func, Args, T, E) ->
+    Stacktrace = ?STACK(), 
+    error_msg("Callback function failed: "
+	      "~n   Function:   ~p"
+	      "~n   Args:       ~p"
+	      "~n   Error Type: ~p"
+	      "~n   Error:      ~p"
+	      "~n   Stacktrace: ~p", 
+	      [Func, Args, T, E, Stacktrace]). 
+
+handle_invalid_result(Func, Args, InvalidResult) ->
+    error_msg("Callback function returned invalid result: "
+	      "~n   Function:       ~p"
+	      "~n   Args:           ~p"
+	      "~n   Invalid result: ~p", 
+	      [Func, Args, InvalidResult]).
+
+	    
 handle_down(MonRef) ->
     (catch do_handle_down(MonRef)).
 
diff --git a/lib/snmp/src/manager/snmpm_user.erl b/lib/snmp/src/manager/snmpm_user.erl
index 78aa560b2e..e6b0b6943e 100644
--- a/lib/snmp/src/manager/snmpm_user.erl
+++ b/lib/snmp/src/manager/snmpm_user.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The 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,79 +19,100 @@
 
 -module(snmpm_user).
 
--export([behaviour_info/1]).
-
-behaviour_info(callbacks) ->
-    [{handle_error,    3}, 
-     {handle_agent,    5}, 
-     {handle_pdu,      4},
-     {handle_trap,     3},
-     {handle_inform,   3},
-     {handle_report,   3}];
-behaviour_info(_) ->
-    undefined.
-
-
-%% handle_error(ReqId, Reason, UserData) -> Reply
-%% ReqId       -> integer()
-%% Reason      -> term()
-%% UserData    -> term()     (supplied when the user register)
-%% Reply       -> ignore 
-
-%% handle_agent(Addr, Port, Type, SnmpInfo, UserData) -> Reply
-%% Addr        -> term()
-%% Port        -> integer()
-%% Type        -> pdu | trap | inform | report
-%% SnmpInfo    -> {ErrorStatus, ErrorIndex, Varbinds}
-%% UserId      -> term()
-%% ErrorStatus -> atom()
-%% ErrorIndex  -> integer()
-%% Varbinds    -> [varbind()]
-%% UserData    -> term()     (supplied when the user register)
-%% Reply       -> ignore | {register, UserId, agent_info()}
-%% agent_info() -> [{agent_info_item(), agent_info_value()}]
-%%                 This is the same info as in update_agent_info/4
-
-%% handle_pdu(TargetName, ReqId, SnmpResponse, UserData) -> Reply
-%% TargetName   -> target_name()
-%% ReqId        -> term() (returned when calling ag(...), ...)
-%% SnmpResponse -> {ErrorStatus, ErrorIndex, Varbinds}
-%% ErrorStatus  -> atom()
-%% ErrorIndex   -> integer()
-%% Varbinds     -> [varbind()]
-%% UserData     -> term()     (supplied when the user register)
-%% Reply        -> ignore 
-
-%% handle_trap(TargetName, SnmpTrapInfo, UserData) -> Reply
-%% TargetName   -> target_name()
-%% SnmpTrapInfo -> {Enteprise, Generic, Spec, Timestamp, Varbinds} |
-%%                 {ErrorStatus, ErrorIndex, Varbinds}
-%% Enteprise    -> oid()
-%% Generic      -> integer() 
-%% Spec         -> integer() 
-%% Timestamp    -> integer() 
-%% ErrorStatus  -> atom()
-%% ErrorIndex   -> integer()
-%% Varbinds     -> [varbind()]
-%% UserData     -> term()     (supplied when the user register)
-%% Reply        -> ignore | unregister | {register, UserId, agent_info()}
-
-%% handle_inform(TargetName, SnmpInform, UserData) -> Reply
-%% TargetName  -> target_name()
-%% SnmpInform  -> {ErrorStatus, ErrorIndex, Varbinds}
-%% ErrorStatus -> atom()
-%% ErrorIndex  -> integer()
-%% Varbinds    -> [varbind()]
-%% UserData    -> term()     (supplied when the user register)
-%% Reply       -> ignore | unregister | {register, UserId, agent_info()}
-%%          
-
-%% handle_report(TargetName, SnmpReport, UserData) -> Reply
-%% TargetName  -> target_name()
-%% SnmpReport  -> {ErrorStatus, ErrorIndex, Varbinds}
-%% ErrorStatus -> integer()
-%% ErrorIndex  -> integer()
-%% Varbinds    -> [varbind()]
-%% UserData    -> term()     (supplied when the user register)
-%% Reply       -> ignore | unregister | {register, UserId, agent_info()}
+-export_type([
+	      snmp_gen_info/0, 
+	      snmp_v1_trap_info/0 
+	     ]).
+
+-type snmp_gen_info() :: {ErrorStatus :: atom(), 
+			  ErrorIndex :: pos_integer(), 
+			  Varbinds :: [snmp:varbind()]}.
+-type snmp_v1_trap_info() :: {Enteprise :: snmp:oid(), 
+			      Generic   :: integer(), 
+			      Spec      :: integer(), 
+			      Timestamp :: integer(), 
+			      Varbinds  :: [snmp:varbind()]}.
+-type ip_address()  :: inet:ip_address().
+-type port_number() :: inet:port_number().
+
+
+%% *** handle_error ***
+%% An "asynchronous" error has been detected 
+
+-callback handle_error(ReqId :: integer(), 
+		       Reason :: {unexpected_pdu, SnmpInfo :: snmp_gen_info()} |
+				 {invalid_sec_info, SecInfo :: term(), SnmpInfo :: snmp_gen_info()} | 
+				 {empty_message, Addr :: ip_address(), Port :: port_number()} | 
+				 term(), 
+		       UserData :: term()) ->
+    snmp:void().
+
+
+%% *** handle_agent ***
+%% A message was received from an unknown agent
+
+-callback handle_agent(Addr     :: term(), 
+		       Port     :: pos_integer(), 
+		       Type     :: pdu | trap | inform | report, 
+		       SnmpInfo :: snmp_gen_info() | snmp_v1_trap_info(), 
+		       UserData :: term()) ->
+    Reply :: ignore | 
+	     {register, 
+	      UserId      :: term(), 
+	      RTargetName :: snmpm:target_name(), 
+	      AgentConfig :: [snmpm:agent_config()]}. 
+
+
+%% *** handle_pdu ***
+%% Handle the reply to an async request (such as get, get-next and set).
+
+-callback handle_pdu(TargetName   :: snmpm:target_name(), 
+		     ReqId        :: term(), 
+		     SnmpResponse :: snmp_gen_info(), 
+		     UserData     :: term()) ->
+    snmp:void().
+
+
+%% *** handle_trap ***
+%% Handle a trap/notification message received from an agent
+
+-callback handle_trap(TargetName   :: snmpm:target_name(), 
+		      SnmpTrapInfo :: snmp_gen_info() | snmp_v1_trap_info(), 
+		      UserData     :: term()) ->
+    Reply :: ignore | 
+	     unregister | 
+	     {register, 
+	      UserId      :: term(), 
+	      RTargetName :: snmpm:target_name(), 
+	      AgentConfig :: [snmpm:agent_config()]}.
+
+
+%% *** handle_inform ***
+%% Handle a inform message received from an agent
+
+-callback handle_inform(TargetName :: snmpm:target_name(), 
+			SnmpInform :: snmp_gen_info(), 
+			UserData   :: term()) ->
+    Reply :: ignore | no_reply | 
+	     unregister | 
+	     {register, 
+	      UserId      :: term(), 
+	      RTargetName :: snmpm:target_name(), 
+	      AgentConfig :: [snmpm:agent_config()]}.
+
+
+%% *** handle_report *** 
+%% Handle a report message received from an agent
+
+-callback handle_report(TargetName :: snmpm:target_name(), 
+			SnmpReport :: snmp_gen_info(), 
+			UserData   :: term()) ->
+    Reply :: ignore | 
+	     unregister | 
+	     {register, 
+	      UserId      :: term(), 
+	      RTargetName :: snmpm:target_name(), 
+	      AgentConfig :: [snmpm:agent_config()]}.
+
+
 
diff --git a/lib/snmp/src/manager/snmpm_usm.erl b/lib/snmp/src/manager/snmpm_usm.erl
index 497d6d6102..0a8a6436a3 100644
--- a/lib/snmp/src/manager/snmpm_usm.erl
+++ b/lib/snmp/src/manager/snmpm_usm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The 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,9 @@
 %%-----------------------------------------------------------------
 %% This module implements the User Based Security Model for SNMP,
 %% as defined in rfc2274.
+%% 
+%% AES: RFC 3826
+%% 
 %%-----------------------------------------------------------------
 
 -module(snmpm_usm).
@@ -416,11 +419,14 @@ get_des_salt() ->
     [?i32(EngineBoots), ?i32(SaltInt)].
 
 aes_encrypt(PrivKey, Data) ->
-    snmp_usm:aes_encrypt(PrivKey, Data, fun get_aes_salt/0).
+    EngineBoots = get_engine_boots(), 
+    EngineTime  = get_engine_time(), 
+    snmp_usm:aes_encrypt(PrivKey, Data, fun get_aes_salt/0, 
+			 EngineBoots, EngineTime).
 
 aes_decrypt(PrivKey, UsmSecParams, EncData) ->
-    #usmSecurityParameters{msgPrivacyParameters = MsgPrivParams,
-			   msgAuthoritativeEngineTime = EngineTime,
+    #usmSecurityParameters{msgPrivacyParameters        = MsgPrivParams,
+			   msgAuthoritativeEngineTime  = EngineTime,
 			   msgAuthoritativeEngineBoots = EngineBoots} =
 	UsmSecParams,
     snmp_usm:aes_decrypt(PrivKey, MsgPrivParams, EncData, 
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index e1e7fab57b..46625989d5 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,6 +50,7 @@
 	 check_packet_size/1, 
 
 	 check_oid/1,
+	 check_imask/1, check_emask/1, 
 	 
 	 check_mp_model/1, 
 	 check_sec_model/1, check_sec_model/2, check_sec_model/3, 
@@ -488,6 +489,7 @@ do_check_timer(WaitFor, Factor, Incr, Retry) ->
     check_integer(Retry,   {gte, 0}),
     ok.
 
+
 %% ---------
 
 all_domains() ->
@@ -618,6 +620,37 @@ check_oid(X) ->
 
 %% ---------
 
+%% Check a (view) mask in the internal form (all 0 and 1): 
+check_imask(null) ->
+    {ok, []};
+check_imask(IMask) when is_list(IMask) ->
+    do_check_imask(IMask), 
+    {ok, IMask}.
+
+do_check_imask([0|IMask]) ->
+    do_check_imask(IMask);
+do_check_imask([1|IMask]) ->
+    do_check_imask(IMask);
+do_check_imask([X|_]) ->
+    error({invalid_internal_mask_element, X}).
+
+
+%% Check a (view) mask in the external form (according to MIB, 
+%% an OCTET STRING of at most length 16). 
+check_emask(EMask) when is_list(EMask) andalso (length(EMask) =< 16) ->
+    do_check_emask(EMask).
+
+do_check_emask([]) ->
+    ok;
+do_check_emask([X|EMask]) 
+  when is_integer(X) andalso (X >= 16#00) andalso (X =< 16#FF) ->
+    do_check_emask(EMask);
+do_check_emask([X|_]) ->
+    error({invalid_external_mask_element, X}).
+
+
+%% ---------
+
 all_integer([H|T]) when is_integer(H) -> all_integer(T);
 all_integer([_H|_T]) -> false;
 all_integer([]) -> true.
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 945b8719fc..a222f842e5 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -233,16 +233,18 @@ config_agent_sys() ->
 		     fun verify_verbosity/1),
     DbDir     = ask("5. Database directory (absolute path)?", DefDir, 
 		    fun verify_dir/1),
-    MibStorageType = ask("6. Mib storage type (ets/dets/mnesia)?", "ets",
+    DbInitError = ask("6. How to handle DB init error?", 
+		      "terminate", fun verify_db_init_error/1),
+    MibStorageType = ask("7. Mib storage type (ets/dets/mnesia)?", "ets",
 			 fun verify_mib_storage_type/1),
     MibStorage = 
 	case MibStorageType of
 	    ets ->
 		[{module, snmpa_mib_storage_ets}];
 	    dets ->
-		DetsDir = ask("6b. Mib storage directory (absolute path)?",
+		DetsDir = ask("7b. Mib storage directory (absolute path)?",
 			      DbDir, fun verify_dir/1),
-		DetsAction = ask("6c. Mib storage [dets] database start "
+		DetsAction = ask("7c. Mib storage [dets] database start "
 				 "action "
 				 "(default/clear/keep)?", 
 				 "default", fun verify_mib_storage_action/1),
@@ -257,7 +259,7 @@ config_agent_sys() ->
 		end;
 	    mnesia ->
 		Nodes = [],
-		MnesiaAction = ask("6b. Mib storage [mnesia] database start "
+		MnesiaAction = ask("7b. Mib storage [mnesia] database start "
 				   "action "
 				   "(default/clear/keep)?", 
 				   "default", fun verify_mib_storage_action/1),
@@ -275,80 +277,80 @@ config_agent_sys() ->
     %% Here we should ask about mib-server data module, 
     %% but as we only have one at the moment...
 
-    TargetCacheVerb = ask("7. Target cache verbosity "
+    TargetCacheVerb = ask("8. Target cache verbosity "
 			  "(silence/info/log/debug/trace)?", "silence",
 			  fun verify_verbosity/1),
-    SymStoreVerb = ask("8. Symbolic store verbosity "
+    SymStoreVerb = ask("9. Symbolic store verbosity "
 		       "(silence/info/log/debug/trace)?", "silence",
 		       fun verify_verbosity/1),
-    LocalDbVerb = ask("9. Local DB verbosity "
+    LocalDbVerb = ask("10. Local DB verbosity "
 		       "(silence/info/log/debug/trace)?", "silence",
 		       fun verify_verbosity/1),
-    LocalDbRepair = ask("10. Local DB repair (true/false/force)?", "true",
+    LocalDbRepair = ask("11. Local DB repair (true/false/force)?", "true",
 			fun verify_dets_repair/1),
-    LocalDbAutoSave = ask("11. Local DB auto save (infinity/milli seconds)?", 
+    LocalDbAutoSave = ask("12. Local DB auto save (infinity/milli seconds)?", 
 			  "5000", fun verify_dets_auto_save/1),
-    ErrorMod = ask("12. Error report module?", "snmpa_error_logger", fun verify_module/1),
-    Type = ask("13. Agent type (master/sub)?", "master", 
+    ErrorMod = ask("13. Error report module?", "snmpa_error_logger", fun verify_module/1),
+    Type = ask("14. Agent type (master/sub)?", "master", 
 	       fun verify_agent_type/1),
     AgentConfig = 
 	case Type of 
 	    master ->
-		MasterAgentVerb = ask("14. Master-agent verbosity "
+		MasterAgentVerb = ask("15. Master-agent verbosity "
 				      "(silence/info/log/debug/trace)?", 
 				      "silence",
 				      fun verify_verbosity/1),
-		ForceLoad = ask("15. Shall the agent re-read the "
+		ForceLoad = ask("16. Shall the agent re-read the "
 				"configuration files during startup ~n"
 				"    (and ignore the configuration "
 				"database) (true/false)?", "true", 
 				fun verify_bool/1),
-		MultiThreaded = ask("16. Multi threaded agent (true/false)?", 
+		MultiThreaded = ask("17. Multi threaded agent (true/false)?", 
 				    "false",
 				    fun verify_bool/1),
-		MeOverride = ask("17. Check for duplicate mib entries when "
+		MeOverride = ask("18. Check for duplicate mib entries when "
 				 "installing a mib (true/false)?", "false",
 				 fun verify_bool/1),
-		TrapOverride = ask("18. Check for duplicate trap names when "
+		TrapOverride = ask("19. Check for duplicate trap names when "
 				   "installing a mib (true/false)?", "false",
 				   fun verify_bool/1),
-		MibServerVerb = ask("19. Mib server verbosity "
+		MibServerVerb = ask("20. Mib server verbosity "
 				    "(silence/info/log/debug/trace)?", 
 				    "silence",
 				    fun verify_verbosity/1),
-		MibServerCache = ask("20. Mib server cache "
+		MibServerCache = ask("21. Mib server cache "
 				    "(true/false)?", 
 				    "true",
 				    fun verify_bool/1),
-		NoteStoreVerb = ask("21. Note store verbosity "
+		NoteStoreVerb = ask("22. Note store verbosity "
 				    "(silence/info/log/debug/trace)?", 
 				    "silence",
 				    fun verify_verbosity/1),
-		NoteStoreTimeout = ask("22. Note store GC timeout?", "30000",
+		NoteStoreTimeout = ask("23. Note store GC timeout?", "30000",
 				       fun verify_timeout/1),
 		ATL = 
-		    case ask("23. Shall the agent use an audit trail log "
+		    case ask("24. Shall the agent use an audit trail log "
 			     "(y/n)?",
 			     "n", fun verify_yes_or_no/1) of
 			yes ->
-			    ATLType = ask("23b. Audit trail log type "
+			    ATLType = ask("24b. Audit trail log type "
 					  "(write/read_write)?",
 					  "read_write", fun verify_atl_type/1),
-			    ATLDir = ask("23c. Where to store the "
+			    ATLDir = ask("24c. Where to store the "
 					 "audit trail log?",
 					 DefDir, fun verify_dir/1),
-			    ATLMaxFiles = ask("23d. Max number of files?", 
+			    ATLMaxFiles = ask("24d. Max number of files?", 
 					      "10", 
 					      fun verify_pos_integer/1),
-			    ATLMaxBytes = ask("23e. Max size (in bytes) "
+			    ATLMaxBytes = ask("24e. Max size (in bytes) "
 					      "of each file?", 
 					      "10240", 
 					      fun verify_pos_integer/1),
 			    ATLSize = {ATLMaxBytes, ATLMaxFiles},
-			    ATLRepair = ask("23f. Audit trail log repair "
+			    ATLRepair = ask("24f. Audit trail log repair "
 					    "(true/false/truncate/snmp_repair)?", "true",
 					    fun verify_atl_repair/1),
-			    ATLSeqNo = ask("23g. Audit trail log "
+			    ATLSeqNo = ask("24g. Audit trail log "
 					   "sequence-numbering (true/false)?", 
 					   "false",
 					   fun verify_atl_seqno/1),
@@ -360,33 +362,33 @@ config_agent_sys() ->
 			no ->
 			    []
 		    end,
-		NetIfVerb = ask("24. Network interface verbosity "
+		NetIfVerb = ask("25. Network interface verbosity "
 				"(silence/info/log/debug/trace)?", 
 				"silence",
 				fun verify_verbosity/1),
-		NetIfMod = ask("25. Which network interface module shall be used?",
+		NetIfMod = ask("26. Which network interface module shall be used?",
 			       "snmpa_net_if", fun verify_module/1),
 		NetIfOpts = 
 		    case NetIfMod of
 			snmpa_net_if ->
 			    NetIfBindTo = 
-				ask("25a. Bind the agent IP address "
+				ask("26a. Bind the agent IP address "
 				    "(true/false)?",
 				    "false", fun verify_bool/1),
 			    NetIfNoReuse = 
-				ask("25b. Shall the agents "
+				ask("26b. Shall the agents "
 				    "IP address "
 				    "and port be not reusable "
 				    "(true/false)?",
 				    "false", fun verify_bool/1),
 			    NetIfReqLimit = 
-				ask("25c. Agent request limit "
+				ask("26c. Agent request limit "
 				    "(used for flow control) "
 				    "(infinity/pos integer)?", 
 				    "infinity",
 				    fun verify_netif_req_limit/1),
 			    NetIfRecbuf = 
-				case ask("25d. Receive buffer size of the "
+				case ask("26d. Receive buffer size of the "
 					 "agent (in bytes) "
 					 "(default/pos integer)?", 
 					 "default", 
@@ -397,7 +399,7 @@ config_agent_sys() ->
 					[{recbuf, RecBufSz}]
 				end,
 			    NetIfSndbuf = 
-				case ask("25e. Send buffer size of the agent "
+				case ask("26e. Send buffer size of the agent "
 					 "(in bytes) (default/pos integer)?", 
 					 "default", 
 					 fun verify_netif_sndbuf/1) of
@@ -407,7 +409,7 @@ config_agent_sys() ->
 					[{sndbuf, SndBufSz}]
 				end,
 			    NetIfFilter = 
-				case ask("25f. Do you wish to specify a "
+				case ask("26f. Do you wish to specify a "
 					 "network interface filter module "
 					 "(or use default)",
 					 "default", fun verify_module/1) of
@@ -426,18 +428,18 @@ config_agent_sys() ->
 		NetIf = [{module,    NetIfMod},
 			 {verbosity, NetIfVerb},
 			 {options,   NetIfOpts}],
-		TermDiscoEnable = ask("26a. Allow terminating discovery "
+		TermDiscoEnable = ask("27. Allow terminating discovery "
 				      "(true/false)?", "true",
 				      fun verify_bool/1),
 		TermDiscoConf = 
 		    case TermDiscoEnable of
 			true ->
 			    TermDiscoStage2 = 
-				ask("26b. Second stage behaviour "
+				ask("27a. Second stage behaviour "
 				    "(discovery/plain)?", "discovery",
 				    fun verify_term_disco_behaviour/1),
 			    TermDiscoTrigger = 
-				ask("26c. Trigger username "
+				ask("27b. Trigger username "
 				    "(default/a string)?", "default",
 				    fun verify_term_disco_trigger_username/1),
 			    [{enable, TermDiscoEnable},
@@ -448,7 +450,7 @@ config_agent_sys() ->
 			     {stage2, discovery},
 			     {trigger_username, ""}]
 		    end,
-		OrigDiscoEnable = ask("27a. Allow originating discovery "
+		OrigDiscoEnable = ask("28. Allow originating discovery "
 				      "(true/false)?", "true",
 				      fun verify_bool/1),
 		OrigDiscoConf = 
@@ -471,7 +473,7 @@ config_agent_sys() ->
 				    {verbosity, NoteStoreVerb}]},
 		 {net_if, NetIf}] ++ ATL;
 	    sub ->
-		SubAgentVerb = ask("14. Sub-agent verbosity "
+		SubAgentVerb = ask("15. Sub-agent verbosity "
 				   "(silence/info/log/debug/trace)?", 
 				   "silence",
 				   fun verify_verbosity/1),
@@ -480,11 +482,12 @@ config_agent_sys() ->
 		 {config,          [{dir, ConfigDir}]}]
 	end,
     SysConfig = 
-	[{priority,    Prio},
-	 {versions,    Vsns},
-	 {db_dir,      DbDir},
-	 {mib_storage, MibStorage},
-	 {target_cache, [{verbosity, TargetCacheVerb}]},
+	[{priority,       Prio},
+	 {versions,       Vsns},
+	 {db_dir,         DbDir},
+	 {db_init_error,  DbInitError},
+	 {mib_storage,    MibStorage},
+	 {target_cache,   [{verbosity, TargetCacheVerb}]},
 	 {symbolic_store, [{verbosity, SymStoreVerb}]},
 	 {local_db, [{repair,    LocalDbRepair},
 		     {auto_save, LocalDbAutoSave},
@@ -630,19 +633,21 @@ config_manager_sys() ->
 			fun verify_verbosity/1),
     ConfigDbDir = ask("5. Database directory (absolute path)?", 
 		      DefDir, fun verify_dir/1),
-    ConfigDbRepair = ask("6. Database repair "
+    ConfigDbInitError = ask("6. How to handle DB init error?", 
+			    "terminate", fun verify_db_init_error/1),
+    ConfigDbRepair = ask("7. Database repair "
 			 "(true/false/force)?", "true",
 			 fun verify_dets_repair/1),
-    ConfigDbAutoSave = ask("7. Database auto save "
+    ConfigDbAutoSave = ask("8. Database auto save "
 			   "(infinity/milli seconds)?", 
 			   "5000", fun verify_dets_auto_save/1),
     IRB = 
-	case ask("8. Inform request behaviour (auto/user)?", 
+	case ask("9. Inform request behaviour (auto/user)?", 
 		 "auto", fun verify_irb/1) of
 	    auto ->
 		auto;
 	    user ->
-		case ask("8b. Use default GC timeout"
+		case ask("9b. Use default GC timeout"
 			 "(default/seconds)?",
 			 "default", fun verify_irb_user/1) of
 		    default ->
@@ -651,31 +656,31 @@ config_manager_sys() ->
 			{user, IrbGcTo}
 		end
 	end,
-    ServerVerb = ask("9. Server verbosity "
+    ServerVerb = ask("10. Server verbosity "
 			"(silence/info/log/debug/trace)?", 
 			"silence",
 			fun verify_verbosity/1),
-    ServerTimeout = ask("10. Server GC timeout?", "30000",
+    ServerTimeout = ask("11. Server GC timeout?", "30000",
 			   fun verify_timeout/1),    
-    NoteStoreVerb = ask("11. Note store verbosity "
+    NoteStoreVerb = ask("12. Note store verbosity "
 			"(silence/info/log/debug/trace)?", 
 			"silence",
 			fun verify_verbosity/1),
-    NoteStoreTimeout = ask("12. Note store GC timeout?", "30000",
+    NoteStoreTimeout = ask("13. Note store GC timeout?", "30000",
 			   fun verify_timeout/1),    
-    NetIfMod = ask("13. Which network interface module shall be used?",
+    NetIfMod = ask("14. Which network interface module shall be used?",
 		   "snmpm_net_if", fun verify_module/1),
-    NetIfVerb = ask("14. Network interface verbosity "
+    NetIfVerb = ask("15. Network interface verbosity "
 		    "(silence/info/log/debug/trace)?", "silence",
 		    fun verify_verbosity/1),
-    NetIfBindTo = ask("15. Bind the manager IP address "
+    NetIfBindTo = ask("16. Bind the manager IP address "
 		      "(true/false)?",
 		      "false", fun verify_bool/1),
-    NetIfNoReuse = ask("16. Shall the manager IP address and port "
+    NetIfNoReuse = ask("17. Shall the manager IP address and port "
 		       "be not reusable (true/false)?",
 		       "false", fun verify_bool/1),
     NetIfRecbuf = 
-	case ask("17. Receive buffer size of the manager (in bytes) "
+	case ask("18. Receive buffer size of the manager (in bytes) "
 		 "(default/pos integer)?", "default", 
 		 fun verify_netif_recbuf/1) of
 	    default ->
@@ -684,7 +689,7 @@ config_manager_sys() ->
 		[{recbuf, RecBufSz}]
 	end,
     NetIfSndbuf = 
-	case ask("18. Send buffer size of the manager (in bytes) "
+	case ask("19. Send buffer size of the manager (in bytes) "
 		 "(default/pos integer)?", "default", 
 		 fun verify_netif_sndbuf/1) of
 	    default ->
@@ -700,28 +705,28 @@ config_manager_sys() ->
 	 {verbosity, NetIfVerb},
 	 {options,   NetIfOpts}], 
     ATL = 
-	case ask("19. Shall the manager use an audit trail log "
+	case ask("20. Shall the manager use an audit trail log "
 		 "(y/n)?",
 		 "n", fun verify_yes_or_no/1) of
 	    yes ->
-		ATLType = ask("19b. Audit trail log type "
+		ATLType = ask("20b. Audit trail log type "
 			      "(write/read_write)?",
 			      "read_write", fun verify_atl_type/1),
-		ATLDir = ask("19c. Where to store the "
+		ATLDir = ask("20c. Where to store the "
 			     "audit trail log?",
 			     DefDir, fun verify_dir/1),
-		ATLMaxFiles = ask("19d. Max number of files?", 
+		ATLMaxFiles = ask("20d. Max number of files?", 
 				  "10", 
 				  fun verify_pos_integer/1),
-		ATLMaxBytes = ask("19e. Max size (in bytes) "
+		ATLMaxBytes = ask("20e. Max size (in bytes) "
 				  "of each file?", 
 				  "10240", 
 				  fun verify_pos_integer/1),
 		ATLSize = {ATLMaxBytes, ATLMaxFiles},
-		ATLRepair = ask("19f. Audit trail log repair "
+		ATLRepair = ask("20f. Audit trail log repair "
 				"(true/false/truncate/snmp_repair)?", "true",
 				fun verify_atl_repair/1),
-		ATLSeqNo = ask("19g. Audit trail log sequence-numbering "
+		ATLSeqNo = ask("20g. Audit trail log sequence-numbering "
 			       "(true/false)?", "false",
 			       fun verify_atl_seqno/1),
 		[{audit_trail_log, [{type,   ATLType},
@@ -733,14 +738,14 @@ config_manager_sys() ->
 		[]
 	end,
     DefUser = 
-	case ask("20. Do you wish to assign a default user [yes] or use~n"
+	case ask("21. Do you wish to assign a default user [yes] or use~n"
 		 "    the default settings [no] (y/n)?", "n", 
 		 fun verify_yes_or_no/1) of
 	    yes ->
-		DefUserMod = ask("20b. Default user module?", 
+		DefUserMod = ask("21b. Default user module?", 
 				 "snmpm_user_default",
 				 fun verify_module/1),
-		DefUserData = ask("20c. Default user data?", "undefined",
+		DefUserData = ask("21c. Default user data?", "undefined",
 				  fun verify_user_data/1),
 		[{def_user_mod,  DefUserMod},
 		 {def_user_data, DefUserData}];
@@ -750,11 +755,12 @@ config_manager_sys() ->
     SysConfig = 
 	[{priority,   Prio},
 	 {versions,   Vsns},
-	 {config,     [{dir,       ConfigDir}, 
-		       {verbosity, ConfigVerb},
-		       {db_dir,    ConfigDbDir},
-		       {repair,    ConfigDbRepair},
-		       {auto_save, ConfigDbAutoSave}]},
+	 {config,     [{dir,           ConfigDir},
+		       {db_dir,        ConfigDbDir}, 
+		       {db_init_error, ConfigDbInitError},
+		       {repair,        ConfigDbRepair},
+		       {auto_save,     ConfigDbAutoSave}, 
+		       {verbosity,     ConfigVerb}]},
 	 {inform_request_behaviour, IRB},
 	 {mibs,       []},
 	 {server,     [{timeout,   ServerTimeout},
@@ -1069,6 +1075,16 @@ verify_dir(Dir) ->
 	_E -> 
 	    {error, "invalid directory (not absolute): " ++ Dir}
     end.
+
+
+verify_db_init_error("terminate") ->
+    {ok, true};
+verify_db_init_error("create") ->
+    {ok, create};
+verify_db_init_error("create_db_and_dir") ->
+    {ok, create_db_and_dir};
+verify_db_init_error(R) ->
+    {error, "invalid DB init error: " ++ R}.
 	    
 
 verify_notif_type("trap")   -> {ok, trap};
@@ -1164,13 +1180,20 @@ verify_dets_auto_save(I0) ->
 
 
 %% I know that this is a little of the edge, but...
+verify_module(M) when is_atom(M) ->
+    {ok, M};
+verify_module(M0) when is_list(M0) ->
+    {ok, list_to_atom(M0)};
 verify_module(M0) ->
-    case (catch list_to_atom(M0)) of
-	M when is_atom(M) ->
-	    {ok, M};
-	_ ->
-	    {error, "invalid module: " ++ M0}
-    end.
+    {error, lists:flatten(io_lib:format("invalid module: ~p", [M0]))}.
+
+%% verify_module(M0) ->
+%%     case (catch list_to_atom(M0)) of
+%% 	M when is_atom(M) ->
+%% 	    {ok, M};
+%% 	_ ->
+%% 	    {error, "invalid module: " ++ M0}
+%%     end.
 	 
 
 verify_agent_type("master") ->
@@ -2168,6 +2191,8 @@ write_sys_config_file_agent_opt(Fid, {config, Opts}) ->
     ok = io:format(Fid, "}", []);
 write_sys_config_file_agent_opt(Fid, {db_dir, Dir}) ->
     ok = io:format(Fid, "     {db_dir, \"~s\"}", [Dir]);
+write_sys_config_file_agent_opt(Fid, {db_init_error, Action}) ->
+    ok = io:format(Fid, "     {db_init_error, ~w}", [Action]);
 write_sys_config_file_agent_opt(Fid, {mib_storage, ets}) ->
     ok = io:format(Fid, "     {mib_storage, ets}", []);
 write_sys_config_file_agent_opt(Fid, {mib_storage, {dets, Dir}}) ->
@@ -2344,6 +2369,8 @@ write_sys_config_file_manager_config_opt(Fid, {dir, Dir}) ->
     ok = io:format(Fid, "{dir, \"~s\"}", [Dir]);
 write_sys_config_file_manager_config_opt(Fid, {db_dir, Dir}) ->
     ok = io:format(Fid, "{db_dir, \"~s\"}", [Dir]);
+write_sys_config_file_manager_config_opt(Fid, {db_init_error, Action}) ->
+    ok = io:format(Fid, "{db_init_error, ~w}", [Action]);
 write_sys_config_file_manager_config_opt(Fid, {repair, Rep}) ->
     ok = io:format(Fid, "{repair, ~w}", [Rep]);
 write_sys_config_file_manager_config_opt(Fid, {auto_save, As}) ->
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index a8c5df0b64..ae28df37fa 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -24,8 +24,8 @@
 	 create/4, create/5, create/6, open/1, open/2, 
 	 change_size/2, close/1, sync/1, info/1, 
 	 log/4, 
-	 log_to_txt/5, log_to_txt/6, log_to_txt/7,
-	 log_to_io/4,  log_to_io/5,  log_to_io/6
+	 log_to_txt/6, log_to_txt/7, log_to_txt/8, 
+	 log_to_io/5,  log_to_io/6,  log_to_io/7
 	]).
 -export([
 	 upgrade/1, upgrade/2, 
@@ -34,7 +34,17 @@
 -export([
 	 validate/1, validate/2
 	]).
+%% <BACKWARD-COMPAT>
+-export([
+	 log_to_txt/5, 
+	 log_to_io/4 
+	]).
+%% </BACKWARD-COMPAT>
 
+-export_type([
+	      log/0, 
+	      log_time/0
+	     ]).
 
 -define(SNMP_USE_V3, true).
 -include("snmp_types.hrl").
@@ -42,12 +52,24 @@
 -define(VMODULE,"LOG").
 -include("snmp_verbosity.hrl").
 
--define(LOG_FORMAT, internal).
--define(LOG_TYPE,   wrap).
+-define(LOG_FORMAT,    internal).
+-define(LOG_TYPE,      wrap).
+-define(BLOCK_DEFAULT, true). 
 
 -record(snmp_log, {id, seqno}).
 
 
+%%-----------------------------------------------------------------
+%% Types
+%%-----------------------------------------------------------------
+
+-opaque log() :: #snmp_log{}.
+-type log_time() :: null | 
+                    calendar:datetime() | 
+                    {local_time,     calendar:datetime()} |
+                    {universal_time, calendar:datetime()}.
+
+
 %% --------------------------------------------------------------------
 %% Exported functions
 %% --------------------------------------------------------------------
@@ -322,7 +344,6 @@ validate_loop(Error, _Log, _Write, _PrevTS, _PrevSN) ->
 %% log(Log, Packet, Addr, Port)
 %%-----------------------------------------------------------------
 
-
 log(#snmp_log{id = Log, seqno = SeqNo}, Packet, Addr, Port) ->
     ?vtrace("log -> entry with"
 	    "~n   Log:  ~p"
@@ -378,53 +399,86 @@ do_change_size(Log, NewSize) ->
 
 %% -- log_to_txt ---
 
+%% <BACKWARD-COMPAT>
 log_to_txt(Log, FileName, Dir, Mibs, TextFile) ->
-    log_to_txt(Log, FileName, Dir, Mibs, TextFile, null, null).
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile).
+%% </BACKWARD-COMPAT>
 
+log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, null, null);
+%% <BACKWARD-COMPAT>
 log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start) ->
-    log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, null).
-
-log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, Stop) 
-  when is_list(Mibs) andalso is_list(TextFile) ->
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, null).
+%% </BACKWARD-COMPAT>
+
+log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, null);
+%% <BACKWARD-COMPAT>
+log_to_txt(Log, FileName, Dir, Mibs, TextFile, Start, Stop) ->
+    log_to_txt(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, TextFile, Start, Stop).
+%% </BACKWARD-COMPAT>
+
+log_to_txt(Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop) 
+  when (((Block =:= true) orelse (Block =:= false)) andalso 
+	is_list(Mibs) andalso is_list(TextFile)) ->
     ?vtrace("log_to_txt -> entry with"
 	    "~n   Log:      ~p"
+	    "~n   Block:    ~p"
 	    "~n   FileName: ~p"
 	    "~n   Dir:      ~p"
 	    "~n   Mibs:     ~p"
 	    "~n   TextFile: ~p"
 	    "~n   Start:    ~p"
 	    "~n   Stop:     ~p", 
-	    [Log, FileName, Dir, Mibs, TextFile, Start, Stop]),
+	    [Log, Block, FileName, Dir, Mibs, TextFile, Start, Stop]),
     File = filename:join(Dir, FileName),
     Converter = fun(L) ->
 			do_log_to_file(L, TextFile, Mibs, Start, Stop)
 		end,
-    log_convert(Log, File, Converter).
+    log_convert(Log, Block, File, Converter).
 
 
 %% -- log_to_io ---
 
+%% <BACKWARD-COMPAT>
 log_to_io(Log, FileName, Dir, Mibs) ->
-    log_to_io(Log, FileName, Dir, Mibs, null, null).
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, null, null).
+%% </BACKWARD-COMPAT>
 
+log_to_io(Log, Block, FileName, Dir, Mibs) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_io(Log, Block, FileName, Dir, Mibs, null, null); 
+%% <BACKWARD-COMPAT>
 log_to_io(Log, FileName, Dir, Mibs, Start) ->
-    log_to_io(Log, FileName, Dir, Mibs, Start, null).
-
-log_to_io(Log, FileName, Dir, Mibs, Start, Stop) 
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, null).
+%% </BACKWARD-COMPAT>
+
+log_to_io(Log, Block, FileName, Dir, Mibs, Start) 
+  when ((Block =:= true) orelse (Block =:= false)) ->
+    log_to_io(Log, Block, FileName, Dir, Mibs, Start, null); 
+%% <BACKWARD-COMPAT>
+log_to_io(Log, FileName, Dir, Mibs, Start, Stop) ->
+    log_to_io(Log, ?BLOCK_DEFAULT, FileName, Dir, Mibs, Start, Stop).
+%% </BACKWARD-COMPAT>
+
+log_to_io(Log, Block, FileName, Dir, Mibs, Start, Stop) 
   when is_list(Mibs) ->
     ?vtrace("log_to_io -> entry with"
 	    "~n   Log:      ~p"
+	    "~n   Block:    ~p"
 	    "~n   FileName: ~p"
 	    "~n   Dir:      ~p"
 	    "~n   Mibs:     ~p"
 	    "~n   Start:    ~p"
 	    "~n   Stop:     ~p", 
-	    [Log, FileName, Dir, Mibs, Start, Stop]),
+	    [Log, Block, FileName, Dir, Mibs, Start, Stop]),
     File = filename:join(Dir, FileName),
     Converter = fun(L) ->
 			do_log_to_io(L, Mibs, Start, Stop)
 		end,
-    log_convert(Log, File, Converter).
+    log_convert(Log, Block, File, Converter).
 
 
 %% --------------------------------------------------------------------
@@ -433,53 +487,121 @@ log_to_io(Log, FileName, Dir, Mibs, Start, Stop)
 
 %% -- log_convert ---
 
-log_convert(#snmp_log{id = Log}, File, Converter) ->
-    do_log_convert(Log, File, Converter);
-log_convert(Log, File, Converter) ->
-    do_log_convert(Log, File, Converter).
+log_convert(#snmp_log{id = Log}, Block, File, Converter) ->
+    do_log_convert(Log, Block, File, Converter);
+log_convert(Log, Block, File, Converter) ->
+    do_log_convert(Log, Block, File, Converter).
 
-do_log_convert(Log, File, Converter) ->
+do_log_convert(Log, Block, File, Converter) ->
     %% ?vtrace("do_log_converter -> entry with"
-    %% 	    "~n   Log:  ~p"
-    %% 	    "~n   File: ~p"
-    %% 	    "~n   disk_log:info(Log): ~p", [Log, File, disk_log:info(Log)]),
+    %% 	    "~n   Log:   ~p"
+    %% 	    "~n   Block: ~p"
+    %% 	    "~n   File:  ~p"
+    %% 	    [Log, Block, File]),
+    Verbosity  = get(verbosity), 
     {Pid, Ref} = 
 	erlang:spawn_monitor(
 	  fun() ->
-		  Result = do_log_convert2(Log, File, Converter),
+		  put(sname,     lc),
+		  put(verbosity, Verbosity), 
+		  ?vlog("begin converting", []),
+		  Result = do_log_convert2(Log, Block, File, Converter),
+		  ?vlog("convert result: ~p", [Result]),
 		  exit(Result)
 	  end),
     receive 
 	{'DOWN', Ref, process, Pid, Result} ->
 	    %% ?vtrace("do_log_converter -> received result"
-	    %% 	    "~n   Result: ~p"
-	    %% 	    "~n   disk_log:info(Log): ~p", 
-	    %% 	    [Result, disk_log:info(Log)]),
+	    %% 	    "~n   Result: ~p", [Result]),
 	    Result
     end.
     
-do_log_convert2(Log, File, Converter) ->
+do_log_convert2(Log, Block, File, Converter) ->
+
+    %% ?vtrace("do_log_converter2 -> entry with"
+    %% 	    "~n   Log:   ~p"
+    %% 	    "~n   Block: ~p"
+    %% 	    "~n   File:  ~p"
+    %% 	    "~n   disk_log:info(Log): ~p", 
+    %% 	    [Log, Block, File, disk_log:info(Log)]),
+
     %% First check if the caller process has already opened the
     %% log, because if we close an already open log we will cause
     %% a runtime error.
+
+    ?vtrace("do_log_convert2 -> entry - check if owner", []),
     case is_owner(Log) of
 	true ->
-	    Converter(Log);
+	    ?vtrace("do_log_converter2 -> convert an already owned log", []),
+	    maybe_block(Log, Block), 
+	    Res = Converter(Log),
+	    maybe_unblock(Log, Block), 
+	    Res;
 	false ->
 	    %% Not yet member of the ruling party, apply for membership...
+	    ?vtrace("do_log_converter2 -> convert log", []),
 	    case log_open(Log, File) of
 		{ok, _} ->
+		    ?vdebug("do_log_convert2 -> opened - now convert", []),
+		    maybe_block(Log, Block), 
 		    Res = Converter(Log),
+		    maybe_unblock(Log, Block), 
 		    disk_log:close(Log),
+		    ?vdebug("do_log_convert2 -> converted - done: "
+			    "~n   Result: ~p", [Res]),
 		    Res;
 		{error, {name_already_open, _}} ->
-                    Converter(Log);
+		    ?vdebug("do_log_convert2 -> "
+			    "already opened - now convert", []),
+		    maybe_block(Log, Block), 
+                    Res = Converter(Log), 
+		    maybe_unblock(Log, Block), 
+		    ?vdebug("do_log_convert2 -> converted - done: "
+			    "~n   Result: ~p", [Res]),
+		    Res;
                 {error, Reason} ->
+		    ?vinfo("do_log_converter2 -> "
+			   "failed converting log - open failed: "
+			   "~n   Reason: ~p", [Reason]),
                     {error, {Log, Reason}}
 	    end
     end.
 
 
+maybe_block(_Log, false = _Block) ->
+    %% ?vtrace("maybe_block(false) -> entry", []),
+    ok;
+maybe_block(Log, true = _Block) ->
+    %% ?vtrace("maybe_block(true) -> entry when"
+    %% 	    "~n   Log Status: ~p", [log_status(Log)]),
+    Res = disk_log:block(Log, true),
+    %% ?vtrace("maybe_block(true) -> "
+    %% 	    "~n   Log Status: ~p"
+    %% 	    "~n   Res:        ~p", [log_status(Log), Res]),
+    Res.
+
+maybe_unblock(_Log, false = _Block) ->
+    %% ?vtrace("maybe_unblock(false) -> entry", []),
+    ok;
+maybe_unblock(Log, true = _Block) ->
+    %% ?vtrace("maybe_unblock(true) -> entry when"
+    %% 	    "~n   Log Status: ~p", [log_status(Log)]),
+    Res = disk_log:unblock(Log),
+    %% ?vtrace("maybe_unblock(true) -> "
+    %% 	    "~n   Log Status: ~p"
+    %% 	    "~n   Res:        ~p", [log_status(Log), Res]),
+    Res.
+
+%% log_status(Log) ->
+%%     Info = disk_log:info(Log),
+%%     case lists:keysearch(status, 1, Info) of
+%% 	{value, {status, Status}} ->
+%% 	    Status;
+%% 	false ->
+%% 	    undefined
+%%     end.
+
+
 %% -- do_log_to_text ---
 
 do_log_to_file(Log, TextFile, Mibs, Start, Stop) ->
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index 67e3476816..32198deb8b 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -16,6 +16,8 @@
 %%
 %% %CopyrightEnd%
 %% 
+%% AES: RFC 3826
+%% 
 
 -module(snmp_usm).
 
@@ -24,7 +26,7 @@
 -export([passwd2localized_key/3, localize_key/3]).
 -export([auth_in/4, auth_out/4, set_msg_auth_params/3]).
 -export([des_encrypt/3, des_decrypt/3]).
--export([aes_encrypt/3, aes_decrypt/5]).
+-export([aes_encrypt/5, aes_decrypt/5]).
 
 
 -define(SNMP_USE_V3, true).
@@ -42,6 +44,9 @@
 
 -define(i32(Int), (Int bsr 24) band 255, (Int bsr 16) band 255, (Int bsr 8) band 255, Int band 255).
 
+-define(BLOCK_CIPHER_AES, aes_cfb128).
+-define(BLOCK_CIPHER_DES, des_cbc).
+
 
 %%-----------------------------------------------------------------
 %% Func: passwd2localized_key/3
@@ -210,7 +215,8 @@ des_encrypt(PrivKey, Data, SaltFun) ->
     IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     TailLen = (8 - (length(Data) rem 8)) rem 8,
     Tail = mk_tail(TailLen),
-    EncData = crypto:block_encrypt(des_cbc, DesKey, IV, [Data,Tail]),
+    EncData = crypto:block_encrypt(?BLOCK_CIPHER_DES, 
+				   DesKey, IV, [Data,Tail]),
     {ok, binary_to_list(EncData), Salt}.
 
 des_decrypt(PrivKey, MsgPrivParams, EncData) 
@@ -224,7 +230,8 @@ des_decrypt(PrivKey, MsgPrivParams, EncData)
     Salt = MsgPrivParams,
     IV = list_to_binary(snmp_misc:str_xor(PreIV, Salt)),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
-    Data = binary_to_list(crypto:block_decrypt(des_cbc, DesKey, IV, EncData)),
+    Data = binary_to_list(crypto:block_decrypt(?BLOCK_CIPHER_DES, 
+					       DesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
     {ok, Data2};
 des_decrypt(PrivKey, BadMsgPrivParams, EncData) ->
@@ -236,13 +243,12 @@ des_decrypt(PrivKey, BadMsgPrivParams, EncData) ->
     throw({error, {bad_msgPrivParams, PrivKey, BadMsgPrivParams, EncData}}).
     
 
-aes_encrypt(PrivKey, Data, SaltFun) ->
+aes_encrypt(PrivKey, Data, SaltFun, EngineBoots, EngineTime) ->
     AesKey = PrivKey,
     Salt = SaltFun(),
-    EngineBoots = snmp_framework_mib:get_engine_boots(),
-    EngineTime = snmp_framework_mib:get_engine_time(),
     IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
-    EncData = crypto:block_encrypt(aes_cbf128, AesKey, IV, Data),
+    EncData = crypto:block_encrypt(?BLOCK_CIPHER_AES, 
+				   AesKey, IV, Data),
     {ok, binary_to_list(EncData), Salt}.
 
 aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
@@ -251,7 +257,8 @@ aes_decrypt(PrivKey, MsgPrivParams, EncData, EngineBoots, EngineTime)
     Salt = MsgPrivParams,
     IV = list_to_binary([?i32(EngineBoots), ?i32(EngineTime) | Salt]),
     %% Whatabout errors here???  E.g. not a mulitple of 8!
-    Data = binary_to_list(crypto:block_decrypt(aes_cbf128, AesKey, IV, EncData)),
+    Data = binary_to_list(crypto:block_decrypt(?BLOCK_CIPHER_AES, 
+					       AesKey, IV, EncData)),
     Data2 = snmp_pdus:strip_encrypted_scoped_pdu_data(Data),
     {ok, Data2}.
 
diff --git a/lib/snmp/src/misc/snmp_verbosity.erl b/lib/snmp/src/misc/snmp_verbosity.erl
index df5986b7bc..f27c31db03 100644
--- a/lib/snmp/src/misc/snmp_verbosity.erl
+++ b/lib/snmp/src/misc/snmp_verbosity.erl
@@ -148,6 +148,8 @@ image_of_sname(mnifl)     -> "M-NET-IF-LOGGER";
 image_of_sname(mnifw)     -> io_lib:format("M-NET-IF-worker(~p)", [self()]);
 image_of_sname(mconf)     -> "M-CONF";
 
+image_of_sname(lc)        -> io_lib:format("LOG-CONVERTER(~p)", [self()]);
+
 image_of_sname(mgr)       -> "MGR";
 image_of_sname(mgr_misc)  -> "MGR_MISC";
 
diff --git a/lib/snmp/test/Makefile b/lib/snmp/test/Makefile
index 546d46a002..f22b7ea8ee 100644
--- a/lib/snmp/test/Makefile
+++ b/lib/snmp/test/Makefile
@@ -86,7 +86,7 @@ RELSYSDIR = $(RELEASE_PATH)/snmp_test
 # SNMP FLAGS
 # ----------------------------------------------------
 ifeq ($(SNMP_DEBUG),)
-  SNMP_DEBUG = d
+  # SNMP_DEBUG = d
 endif
 
 ifeq ($(SNMP_DEBUG),e)
diff --git a/lib/snmp/test/snmp_agent_mibs_test.erl b/lib/snmp/test/snmp_agent_mibs_test.erl
index 248fe7d83e..f7dae64e3f 100644
--- a/lib/snmp/test/snmp_agent_mibs_test.erl
+++ b/lib/snmp/test/snmp_agent_mibs_test.erl
@@ -238,6 +238,8 @@ start_and_stop(Config) when is_list(Config) ->
 
 load_unload(suite) -> [];
 load_unload(Config) when is_list(Config) ->
+    ?DBG("load_unload -> start", []),
+
     Prio       = normal,
     Verbosity  = log,
     MibDir     = ?config(data_dir, Config),
@@ -253,8 +255,10 @@ load_unload(Config) when is_list(Config) ->
     ?line ok = load_mibs(MibsPid, MibDir, ["Test2"]),
     ?line ok = verify_loaded_mibs(MibsPid, MibDir, ["Test2"]),
     
-    ?DBG("load_unload -> load one already loaded mib", []),
-    ?line {error, _} = load_mibs(MibsPid, MibDir, ["Test2"]),
+    ?DBG("load_unload -> try load one *already loaded* mib", []),
+    EMib = join(MibDir, "Test2"), 
+    ?line {error, {'load aborted at', EMib, already_loaded}} = 
+	load_mibs(MibsPid, MibDir, ["Test2"]),
 
     ?DBG("load_unload -> load 2 not already loaded mibs", []),
     ?line ok = load_mibs(MibsPid, MibDir, ["TestTrap", "TestTrapv2"]),
@@ -266,7 +270,8 @@ load_unload(Config) when is_list(Config) ->
     ?line ok = verify_loaded_mibs(MibsPid, MibDir, ["TestTrap", "TestTrapv2"]),
     
     ?DBG("load_unload -> try unload two loaded mibs and one not loaded", []),
-    ?line {error, _} = unload_mibs(MibsPid, ["TestTrap","Test2","TestTrapv2"]),
+    ?line {error, {'unload aborted at', "Test2", not_loaded}} = 
+	   unload_mibs(MibsPid, ["TestTrap","Test2","TestTrapv2"]),
     ?line ok = verify_loaded_mibs(MibsPid, MibDir, ["TestTrapv2"]),
     
     ?DBG("load_unload -> unload the remaining loaded mib", []),
@@ -279,6 +284,7 @@ load_unload(Config) when is_list(Config) ->
     ?DBG("load_unload -> stop symbolic store", []),
     ?line sym_stop(),
 
+    ?DBG("load_unload -> done", []),
     ok.
 
 
@@ -691,10 +697,16 @@ mibs_info(Pid) ->
 
 load_mibs(Pid, Dir, Mibs0) ->
     Mibs = [join(Dir, Mib) || Mib <- Mibs0],
-    snmpa_mib:load_mibs(Pid, Mibs).
+    Res = snmpa_mib:load_mibs(Pid, Mibs),
+    %% ?DBG("load_mibs -> "
+    %% 	 "~n   Res: ~p", [Res]),
+    Res.
 
 unload_mibs(Pid, Mibs) ->
-    snmpa_mib:unload_mibs(Pid, Mibs).
+    Res = snmpa_mib:unload_mibs(Pid, Mibs),
+    %% ?DBG("unload_mibs -> "
+    %% 	 "~n   Res: ~p", [Res]),
+    Res.
 
 verify_loaded_mibs(Pid, Dir, ExpectedMibs0) ->
     ExpectedMibs = [join(Dir, Mib) || Mib <- ExpectedMibs0],
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 6fe97ccd25..89a6ce1253 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %% 
 %% %CopyrightBegin%
 %%
@@ -34,6 +33,7 @@
 	 %% all_tcs - misc
 	 app_info/1, 
 	 info_test/1, 
+         create_local_db_dir/1,
 
 	 %% all_tcs - test_v1
 	 simple/1, 
@@ -554,7 +554,7 @@ init_per_suite(Config0) when is_list(Config0) ->
 
     %% Mib-dirs
     MibDir    = snmp_test_lib:lookup(data_dir, Config2),
-    StdMibDir = filename:join([code:priv_dir(snmp), "mibs"]),
+    StdMibDir = join([code:priv_dir(snmp), "mibs"]),
 
     Config3 = [{mib_dir, MibDir}, {std_mib_dir, StdMibDir} | Config2],
 
@@ -748,21 +748,21 @@ init_per_testcase2(Case, Config) ->
     CaseTopDir = snmp_test_lib:init_testcase_top_dir(Case, Config), 
 
     %% Create agent top-dir(s)
-    AgentTopDir = filename:join([CaseTopDir, agent]),
+    AgentTopDir = join([CaseTopDir, agent]),
     ok = file:make_dir(AgentTopDir),
-    AgentConfDir = filename:join([AgentTopDir, config]),
+    AgentConfDir = join([AgentTopDir, config]),
     ok = file:make_dir(AgentConfDir),
-    AgentDbDir = filename:join([AgentTopDir, db]),
+    AgentDbDir = join([AgentTopDir, db]),
     ok = file:make_dir(AgentDbDir),
-    AgentLogDir = filename:join([AgentTopDir, log]),
+    AgentLogDir = join([AgentTopDir, log]),
     ok = file:make_dir(AgentLogDir),
 
     %% Create sub-agent top-dir(s)
-    SubAgentTopDir = filename:join([CaseTopDir, sub_agent]),
+    SubAgentTopDir = join([CaseTopDir, sub_agent]),
     ok = file:make_dir(SubAgentTopDir),
 
     %% Create manager top-dir(s)
-    ManagerTopDir = filename:join([CaseTopDir, manager]),
+    ManagerTopDir = join([CaseTopDir, manager]),
     ok = file:make_dir(ManagerTopDir),
 
     [{case_top_dir,      CaseTopDir}, 
@@ -1506,7 +1506,8 @@ finish_misc(Config) ->
 misc_cases() -> 
     [
      app_info, 
-     info_test
+     info_test,
+     create_local_db_dir
     ].
 
 app_info(suite) -> [];
@@ -1523,11 +1524,11 @@ app_info(Config) when is_list(Config) ->
 	    false ->
 		"undefined"
 	end,
-    io:format("Root dir: ~s~n"
-	      "SNMP:   Application dir: ~s~n"
-	      "        Application ver: ~s~n"
-	      "SSL:    Application dir: ~s~n"
-	      "CRYPTO: Application dir: ~s~n", 
+    io:format("Root dir: ~ts~n"
+	      "SNMP:   Application dir: ~ts~n"
+	      "        Application ver: ~ts~n"
+	      "SSL:    Application dir: ~ts~n"
+	      "CRYPTO: Application dir: ~ts~n",
 	      [code:root_dir(), SnmpDir, AppVsn, SslDir, CryptoDir]),
     ok.
 
@@ -1539,7 +1540,75 @@ app_dir(App) ->
 	    "undefined"
     end.
 
+create_local_db_dir(Config) when is_list(Config) ->
+    ?P(create_local_db_dir),
+    DataDir = snmp_test_lib:lookup(data_dir, Config),
+    T = erlang:now(),
+    [As,Bs,Cs] = [integer_to_list(I) || I <- tuple_to_list(T)],
+    DbDir = filename:join([DataDir, As, Bs, Cs]),
+    ok = del_dir(DbDir, 3),
+    Name = list_to_atom(atom_to_list(create_local_db_dir)
+                        ++"-"++As++"-"++Bs++"-"++Cs),
+    Pa = filename:dirname(code:which(?MODULE)),
+    {ok,Node} = ?t:start_node(Name, slave, [{args, "-pa "++Pa}]),
+
+    %% first start with a nonexisting DbDir
+    Fun1 = fun() ->
+                   false = filelib:is_dir(DbDir),
+                   process_flag(trap_exit,true),
+                   {error, {error, {failed_open_dets, {file_error, _, _}}}} =
+                       snmpa_local_db:start_link(normal, DbDir, [{verbosity,trace}]),
+                   false = filelib:is_dir(DbDir),
+                   {ok, not_found}
+           end,
+    {ok, not_found} = nodecall(Node, Fun1),
+    %% now start with a nonexisting DbDir but pass the
+    %% create_local_db_dir option as well
+    Fun2 = fun() ->
+                   false = filelib:is_dir(DbDir),
+                   process_flag(trap_exit,true),
+                   {ok, _Pid} =
+                       snmpa_local_db:start_link(normal, DbDir,
+                                                 create_db_and_dir, [{verbosity,trace}]),
+                   snmpa_local_db:stop(),
+                   true = filelib:is_dir(DbDir),
+                   {ok, found}
+           end,
+    {ok, found} = nodecall(Node, Fun2),
+    %% cleanup
+    ?t:stop_node(Node),
+    ok = del_dir(DbDir, 3),
+    ok.
 
+nodecall(Node, Fun) ->
+    Parent = self(),
+    Ref = make_ref(),
+    spawn_link(Node,
+               fun() ->
+                       Res = Fun(),
+                       unlink(Parent),
+                       Parent ! {Ref, Res}
+               end),
+    receive
+        {Ref, Res} ->
+            Res
+    end.
+
+del_dir(_Dir, 0) ->
+    ok;
+del_dir(Dir, Depth) ->
+    case filelib:is_dir(Dir) of
+        true ->
+            {ok, Files} = file:list_dir(Dir),
+            lists:map(fun(F) ->
+                              Nm = filename:join(Dir,F),
+                              ok = file:delete(Nm)
+                      end, Files),
+            ok = file:del_dir(Dir),
+            del_dir(filename:dirname(Dir), Depth-1);
+        false ->
+            ok
+    end.
 
 %v1_cases() -> [loop_mib];
 v1_cases() -> 
@@ -1738,19 +1807,19 @@ init_case(Config) ->
 load_master(Mib) ->
     ?DBG("load_master -> entry with"
 	"~n   Mib: ~p", [Mib]),
-    snmpa:unload_mibs(snmp_master_agent, [Mib]),	% Unload for safety
-    ok = snmpa:load_mibs(snmp_master_agent, [get(mib_dir) ++ Mib]).
+    snmpa:unload_mib(snmp_master_agent, Mib),	% Unload for safety
+    ok = snmpa:load_mib(snmp_master_agent, join(get(mib_dir), Mib)).
 
 load_master_std(Mib) ->
     ?DBG("load_master_std -> entry with"
 	"~n   Mib: ~p", [Mib]),
-    snmpa:unload_mibs(snmp_master_agent, [Mib]),	% Unload for safety
-    ok = snmpa:load_mibs(snmp_master_agent, [get(std_mib_dir) ++ Mib]).
+    snmpa:unload_mib(snmp_master_agent, Mib),	% Unload for safety
+    ok = snmpa:load_mib(snmp_master_agent, join(get(std_mib_dir), Mib)).
 
 unload_master(Mib) ->
     ?DBG("unload_master -> entry with"
 	"~n   Mib: ~p", [Mib]),
-    ok = snmpa:unload_mibs(snmp_master_agent, [Mib]).
+    ok = snmpa:unload_mib(snmp_master_agent, Mib).
 
 loaded_mibs() ->
     ?DBG("loaded_mibs -> entry",[]),
@@ -2155,11 +2224,11 @@ subagent(Config) when is_list(Config) ->
     try_test(unreg_test),
 
     ?P1("Loading previous subagent mib in master and testing..."),
-    ?line ok = snmpa:load_mibs(MA, [MibDir ++ "Klas1"]),
+    ?line ok = snmpa:load_mib(MA, join(MibDir, "Klas1")),
     try_test(load_test),
 
     ?P1("Unloading previous subagent mib in master and testing..."),
-    ?line ok = snmpa:unload_mibs(MA, [MibDir ++ "Klas1"]),
+    ?line ok = snmpa:unload_mib(MA, join(MibDir, "Klas1")),
     try_test(unreg_test),
     ?P1("Testing register subagent..."),
     rpc:call(SaNode, snmp, register_subagent,
@@ -2355,11 +2424,11 @@ sa_register(Config) when is_list(Config) ->
 
     ?P1("Unloading Klas1..."),
     ?DBG("sa_register -> unload mibs", []),
-    snmpa:unload_mibs(SA, [MibDir ++ "Klas1"]),
+    snmpa:unload_mib(SA, join(MibDir, "Klas1")),
 
     ?P1("Loading SA-MIB..."),
     ?DBG("sa_register -> unload mibs", []),
-    snmpa:load_mibs(SA, [MibDir ++ "SA-MIB"]),
+    snmpa:load_mib(SA, join(MibDir, "SA-MIB")),
     
     ?P1("register subagent..."),
     ?DBG("sa_register -> register subagent", []),
@@ -2578,7 +2647,7 @@ next_across_sa(Config) when is_list(Config) ->
     ?line {ok, SA} = start_subagent(SaNode, ?sa, "SA-MIB"),
 
     ?P1("Loading another subagent mib (Klas1)..."),
-    ?line ok = snmpa:load_mibs(SA, [MibDir ++ "Klas1"]),
+    ?line ok = snmpa:load_mib(SA, MibDir ++ "Klas1"),
 
     ?P1("register subagent..."), 
     rpc:call(SaNode, snmp, register_subagent, [MA, ?klas1, SA]),
@@ -2590,7 +2659,7 @@ next_across_sa(Config) when is_list(Config) ->
     try_test(next_across_sa_test),
 
     ?P1("Unloading mib (Klas1)"),
-    snmpa:unload_mibs(SA, [MibDir ++ "Klas1"]),
+    snmpa:unload_mib(SA, join(MibDir, "Klas1")),
     rpc:call(SaNode, snmp, unregister_subagent, [MA, ?klas1]),
     try_test(unreg_test),
 
@@ -2631,25 +2700,25 @@ undo(Config) when is_list(Config) ->
     ?line {ok, SA} = start_subagent(SaNode, ?sa, "SA-MIB"),
 
     ?P1("Load Klas3 & Klas4..."),
-    ?line ok = snmpa:load_mibs(MA, [MibDir ++ "Klas3"]),
-    ?line ok = snmpa:load_mibs(MA, [MibDir ++ "Klas4"]),
+    ?line ok = snmpa:load_mib(MA, join(MibDir, "Klas3")),
+    ?line ok = snmpa:load_mib(MA, join(MibDir, "Klas4")),
 
     ?P1("Testing undo phase at master agent..."),
     try_test(undo_test),
     try_test(api_test2),
 
     ?P1("Unload Klas3..."),
-    ?line ok = snmpa:unload_mibs(MA, [MibDir ++ "Klas3"]),
+    ?line ok = snmpa:unload_mib(MA, join(MibDir, "Klas3")),
 
     ?P1("Testing bad return values from instrum. funcs..."),
     try_test(bad_return),
 
     ?P1("Unload Klas4..."),
-    ?line ok = snmpa:unload_mibs(MA, [MibDir ++ "Klas4"]),
+    ?line ok = snmpa:unload_mib(MA, join(MibDir, "Klas4")),
 
     ?P1("Testing undo phase at subagent..."),
-    ?line ok = snmpa:load_mibs(SA, [MibDir ++ "Klas3"]),
-    ?line ok = snmpa:load_mibs(SA, [MibDir ++ "Klas4"]),
+    ?line ok = snmpa:load_mib(SA, join(MibDir, "Klas3")),
+    ?line ok = snmpa:load_mib(SA, join(MibDir, "Klas4")),
     ?line ok = snmpa:register_subagent(MA, ?klas3, SA),
     ?line ok = snmpa:register_subagent(MA, ?klas4, SA),
     try_test(undo_test),
@@ -6247,8 +6316,8 @@ otp_4394_config(AgentConfDir, MgrDir, Ip0) ->
 					     "OTP-4394 test"),
     ?line case update_usm(Vsn, AgentConfDir) of
 	true ->
-	    ?line copy_file(filename:join(AgentConfDir, "usm.conf"),
-			    filename:join(MgrDir, "usm.conf")),
+	    ?line copy_file(join(AgentConfDir, "usm.conf"),
+			    join(MgrDir, "usm.conf")),
 	    ?line update_usm_mgr(Vsn, MgrDir);
 	false ->
 	    ?line ok
@@ -6407,11 +6476,11 @@ otp8395({init, Config}) when is_list(Config) ->
     %% 
 
     AgentDbDir = ?config(agent_db_dir, Config),
-    AgentMnesiaDir = filename:join([AgentDbDir, "mnesia"]),
+    AgentMnesiaDir = join([AgentDbDir, "mnesia"]),
     mnesia_init(AgentNode, AgentMnesiaDir),
 
     %% SubAgentDir = ?config(sub_agent_dir, Config),
-    %% SubAgentMnesiaDir = filename:join([SubAgentDir, "mnesia"]),
+    %% SubAgentMnesiaDir = join([SubAgentDir, "mnesia"]),
     %% mnesia_init(SubAgentNode, SubAgentMnesiaDir),
 
     %% ok = mnesia_create_schema(AgentNode, [AgentNode, SubAgentNode]), 
@@ -6541,7 +6610,7 @@ otp8395(Config) when is_list(Config) ->
     ?SLEEP(1000),
     AgentNode   = ?config(agent_node, Config),
     AgentLogDir = ?config(agent_log_dir, Config),
-    OutFile     = filename:join([AgentLogDir, "otp8395.txt"]),
+    OutFile     = join([AgentLogDir, "otp8395.txt"]),
     {ok, LogInfo} = rpc:call(AgentNode, snmpa, log_info, []),
     ?DBG("otp8395 -> LogInfo: ~p", [LogInfo]), 
 
@@ -6579,7 +6648,7 @@ otp9884({init, Config}) when is_list(Config) ->
     %% 
 
     AgentDbDir = ?config(agent_db_dir, Config),
-    AgentMnesiaDir = filename:join([AgentDbDir, "mnesia"]),
+    AgentMnesiaDir = join([AgentDbDir, "mnesia"]),
     mnesia_init(AgentNode, AgentMnesiaDir),
 
     mnesia_create_schema(AgentNode, [AgentNode]),
@@ -6609,8 +6678,8 @@ otp9884({init, Config}) when is_list(Config) ->
     ManagerConfDir = ?config(manager_top_dir, Config),
     AgentConfDir   = ?config(agent_conf_dir, Config),
     AgentTopDir    = ?config(agent_top_dir, Config),
-    AgentBkpDir1   = filename:join([AgentTopDir, backup1]),
-    AgentBkpDir2   = filename:join([AgentTopDir, backup2]),
+    AgentBkpDir1   = join([AgentTopDir, backup1]),
+    AgentBkpDir2   = join([AgentTopDir, backup2]),
     ok = file:make_dir(AgentBkpDir1),
     ok = file:make_dir(AgentBkpDir2),
     AgentBkpDirs = [AgentBkpDir1, AgentBkpDir2], 
@@ -7105,7 +7174,7 @@ display_log(Config) ->
 		{value, {_, Node}} ->
 		    LogDir  = Dir, 
 		    Mibs    = [], 
-		    OutFile = filename:join(LogDir, "snmpa_log.txt"), 
+		    OutFile = join(LogDir, "snmpa_log.txt"), 
 		    p("~n"
 		      "========================="
 		      "  < Audit Trail Log >  "
@@ -7252,6 +7321,14 @@ lists_key1search(Key, List) when is_atom(Key) ->
 %% regs() ->
 %%     lists:sort(registered()).
 
+%% ------
+
+join(Parts) ->
+    filename:join(Parts).
+
+join(Dir, File) ->
+    filename:join(Dir, File).
+
 
 %% ------
 
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 7e4b713e56..122289c28e 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -139,31 +139,31 @@ init_all(Config) when is_list(Config) ->
     SuiteTopDir = ?config(snmp_suite_top_dir, Config),
     ?DBG("init_all -> SuiteTopDir ~p", [SuiteTopDir]),
 
-    AgentDir = filename:join(SuiteTopDir, "agent/"), 
+    AgentDir = join(SuiteTopDir, "agent/"), 
     ?line ok = file:make_dir(AgentDir),
     ?DBG("init_all -> AgentDir ~p", [AgentDir]),
 
-    AgentDbDir = filename:join(AgentDir, "db/"), 
+    AgentDbDir = join(AgentDir, "db/"), 
     ?line ok   = file:make_dir(AgentDbDir),
     ?DBG("init_all -> AgentDbDir ~p", [AgentDbDir]),
 
-    AgentLogDir = filename:join(AgentDir, "log/"), 
+    AgentLogDir = join(AgentDir, "log/"), 
     ?line ok    = file:make_dir(AgentLogDir),
     ?DBG("init_all -> AgentLogDir ~p", [AgentLogDir]),
 
-    AgentConfDir = filename:join(AgentDir, "conf/"), 
+    AgentConfDir = join(AgentDir, "conf/"), 
     ?line ok     = file:make_dir(AgentConfDir),
     ?DBG("init_all -> AgentConfDir ~p", [AgentConfDir]),
 
-    MgrDir   = filename:join(SuiteTopDir, "mgr/"), 
+    MgrDir   = join(SuiteTopDir, "mgr/"), 
     ?line ok = file:make_dir(MgrDir),
     ?DBG("init_all -> MgrDir ~p", [MgrDir]),
 
-    SaDir    = filename:join(SuiteTopDir, "sa/"), 
+    SaDir    = join(SuiteTopDir, "sa/"), 
     ?line ok = file:make_dir(SaDir),
     ?DBG("init_all -> SaDir ~p", [SaDir]),
 
-    SaDbDir  = filename:join(SaDir, "db/"), 
+    SaDbDir  = join(SaDir, "db/"), 
     ?line ok = file:make_dir(SaDbDir),
     ?DBG("init_all -> SaDbDir ~p", [SaDbDir]),
 
@@ -183,11 +183,11 @@ init_all(Config) when is_list(Config) ->
     
     ?DBG("init_all -> application mnesia: set_env dir",[]),
     ?line application_controller:set_env(mnesia, dir, 
-					 filename:join(AgentDbDir, "Mnesia1")),
+					 join(AgentDbDir, "Mnesia1")),
 
     ?DBG("init_all -> application mnesia: set_env dir on node ~p",[SaNode]),
     ?line rpc:call(SaNode, application_controller, set_env, 
-		   [mnesia, dir,  filename:join(SaDir, "Mnesia2")]),
+		   [mnesia, dir,  join(SaDir, "Mnesia2")]),
 
     ?DBG("init_all -> create mnesia schema",[]),
     ?line ok = mnesia:create_schema([SaNode, node()]),
@@ -253,7 +253,7 @@ init_case(Config) when is_list(Config) ->
     
     MibDir = ?config(mib_dir, Config),
     put(mib_dir, MibDir),
-    StdM = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
+    StdM = join(code:priv_dir(snmp), "mibs") ++ "/",
     put(std_mib_dir, StdM),
 
     MgrDir = ?config(mgr_dir, Config),
@@ -341,7 +341,7 @@ run(Mod, Func, Args, Opts) ->
     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") ++ "/",
+    StdM = join(code:priv_dir(snmp), "mibs") ++ "/",
     Vsn = get(vsn), 
     ?DBG("run -> config:"
 	   "~n   M:           ~p"
@@ -763,7 +763,7 @@ start_subagent(SaNode, RegTree, Mib) ->
     MA = whereis(snmp_master_agent),
     ?DBG("start_subagent -> MA: ~p", [MA]),
     MibDir = get(mib_dir),
-    Mib1   = join(MibDir,Mib),
+    Mib1   = join(MibDir, Mib),
     Mod    = snmpa_supervisor,
     Func   = start_sub_agent,
     Args   = [MA, RegTree, [Mib1]], 
@@ -800,28 +800,25 @@ mibs(StdMibDir,MibDir) ->
      join(MibDir, "Test2.bin"),
      join(MibDir, "TestTrapv2.bin")].
 
-join(D,F) ->
-    filename:join(D,F).
-
 
 %% --- various mib load/unload functions ---
 
 load_master(Mib) ->
     ?DBG("load_master -> entry with"
 	"~n   Mib: ~p", [Mib]),
-    snmpa:unload_mibs(snmp_master_agent, [Mib]),	% Unload for safety
-    ok = snmpa:load_mibs(snmp_master_agent, [get(mib_dir) ++ Mib]).
+    snmpa:unload_mib(snmp_master_agent, Mib),	% Unload for safety
+    ok = snmpa:load_mib(snmp_master_agent, join(get(mib_dir), Mib)).
 
 load_master_std(Mib) ->
     ?DBG("load_master_std -> entry with"
 	"~n   Mib: ~p", [Mib]),
-    snmpa:unload_mibs(snmp_master_agent, [Mib]),	% Unload for safety
-    ok = snmpa:load_mibs(snmp_master_agent, [get(std_mib_dir) ++ Mib]).
+    snmpa:unload_mib(snmp_master_agent, Mib),	% Unload for safety
+    ok = snmpa:load_mibs(snmp_master_agent, join(get(std_mib_dir), Mib)).
 
 unload_master(Mib) ->
     ?DBG("unload_master -> entry with"
 	"~n   Mib: ~p", [Mib]),
-    ok = snmpa:unload_mibs(snmp_master_agent, [Mib]).
+    ok = snmpa:unload_mib(snmp_master_agent, Mib).
 
 loaded_mibs() ->
     ?DBG("loaded_mibs -> entry",[]),
@@ -1383,8 +1380,8 @@ config(Vsns, MgrDir, AgentConfDir, MIp, AIp) ->
  					     "test"),
     ?line case update_usm(Vsns, AgentConfDir) of
 	      true ->
-		  ?line copy_file(filename:join(AgentConfDir, "usm.conf"),
-				  filename:join(MgrDir, "usm.conf")),
+		  ?line copy_file(join(AgentConfDir, "usm.conf"),
+				  join(MgrDir, "usm.conf")),
 		  ?line update_usm_mgr(Vsns, MgrDir);
 	      false ->
 		  ?line ok
@@ -1403,9 +1400,9 @@ delete_files(Config) ->
 delete_files(_AgentFiles, []) ->
     ok;
 delete_files(AgentDir, [DirName|DirNames]) ->
-    Dir = filename:join(AgentDir, DirName),
+    Dir = join(AgentDir, DirName),
     {ok, Files} = file:list_dir(Dir),
-    lists:foreach(fun(FName) -> file:delete(filename:join(Dir, FName)) end,
+    lists:foreach(fun(FName) -> file:delete(join(Dir, FName)) end,
 		  Files),
     delete_files(AgentDir, DirNames).
 
@@ -1481,8 +1478,8 @@ update_usm_mgr(Vsns, Dir) ->
     end.
 
 rewrite_usm_mgr(Dir, ShaKey, DesKey) -> 
-    ?line ok = file:rename(filename:join(Dir,"usm.conf"),
-			   filename:join(Dir,"usm.old")),
+    ?line ok = file:rename(join(Dir,"usm.conf"),
+			   join(Dir,"usm.old")),
     Conf = [{"agentEngine", "newUser", "newUser", zeroDotZero, 
 	     usmHMACSHAAuthProtocol, "", "", 
 	     usmDESPrivProtocol, "", "", "", ShaKey, DesKey}, 
@@ -1492,8 +1489,8 @@ rewrite_usm_mgr(Dir, ShaKey, DesKey) ->
     ok = snmp_config:write_agent_usm_config(Dir, "", Conf).
 
 reset_usm_mgr(Dir) ->
-    ?line ok = file:rename(filename:join(Dir,"usm.old"),
-			   filename:join(Dir,"usm.conf")).
+    ?line ok = file:rename(join(Dir,"usm.old"),
+			   join(Dir,"usm.conf")).
 
 
 update_community([v3], _Dir) -> 
@@ -1526,7 +1523,7 @@ write_target_addr_conf(Dir, ManagerIp, UDP, Vsns) ->
 rewrite_target_addr_conf(Dir, NewPort) -> 
     ?DBG("rewrite_target_addr_conf -> entry with"
 	 "~n   NewPort: ~p", [NewPort]),
-    TAFile = filename:join(Dir, "target_addr.conf"),
+    TAFile = join(Dir, "target_addr.conf"),
     case file:read_file_info(TAFile) of
 	{ok, _} -> 
 	    ok;
@@ -1546,8 +1543,8 @@ rewrite_target_addr_conf(Dir, NewPort) ->
     
     ?DBG("rewrite_target_addr_conf -> NewAddrs: ~p",[NewAddrs]),
 
-    ?line ok = file:rename(filename:join(Dir,"target_addr.conf"),
-			   filename:join(Dir,"target_addr.old")),
+    ?line ok = file:rename(join(Dir,"target_addr.conf"),
+			   join(Dir,"target_addr.old")),
 
     ?line ok = snmp_config:write_agent_target_addr_config(Dir, "", NewAddrs).
 
@@ -1565,8 +1562,8 @@ rewrite_target_addr_conf2(_NewPort,O) ->
     O.
 
 reset_target_addr_conf(Dir) ->
-    ?line ok = file:rename(filename:join(Dir, "target_addr.old"),
-			   filename:join(Dir, "target_addr.conf")).
+    ?line ok = file:rename(join(Dir, "target_addr.old"),
+			   join(Dir, "target_addr.conf")).
 
 write_target_params_conf(Dir, Vsns) -> 
     F = fun(v1) -> {"target_v1", v1,  v1,  "all-rights", noAuthNoPriv};
@@ -1578,14 +1575,14 @@ write_target_params_conf(Dir, Vsns) ->
 
 rewrite_target_params_conf(Dir, SecName, SecLevel) 
   when is_list(SecName) andalso is_atom(SecLevel) -> 
-    ?line ok = file:rename(filename:join(Dir,"target_params.conf"),
-			   filename:join(Dir,"target_params.old")),
+    ?line ok = file:rename(join(Dir,"target_params.conf"),
+			   join(Dir,"target_params.old")),
     Conf = [{"target_v3", v3, usm, SecName, SecLevel}],
     snmp_config:write_agent_target_params_config(Dir, "", Conf).
 
 reset_target_params_conf(Dir) ->
-    ?line ok = file:rename(filename:join(Dir,"target_params.old"),
-			   filename:join(Dir,"target_params.conf")).
+    ?line ok = file:rename(join(Dir,"target_params.old"),
+			   join(Dir,"target_params.conf")).
 
 write_notify_conf(Dir) -> 
     Conf = [{"standard trap",   "std_trap",   trap}, 
@@ -1648,6 +1645,9 @@ rpc(Node, F, A) ->
     rpc:call(Node, snmpa, F, A).
 
 
+join(Dir, File) ->
+    filename:join(Dir, File).
+
 %% await_pdu(To) ->
 %%     await_response(To, pdu).
 %% 
diff --git a/lib/snmp/test/snmp_appup_test.erl b/lib/snmp/test/snmp_appup_test.erl
index 99994a2410..021d42a978 100644
--- a/lib/snmp/test/snmp_appup_test.erl
+++ b/lib/snmp/test/snmp_appup_test.erl
@@ -63,33 +63,9 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(suite) -> [];
 init_per_suite(doc) -> [];
 init_per_suite(Config) when is_list(Config) ->
-    PrivDir = ?config(priv_dir, Config),
-    TopDir  = filename:join(PrivDir, appup),
-    case file:make_dir(TopDir) of
-        ok ->
-            ok;
-        Error ->
-            fail({failed_creating_subsuite_top_dir, Error})
-    end,
-    AppFile   = file_name(?APPLICATION, ".app"),
-    AppupFile = file_name(?APPLICATION, ".appup"),
-    [{app_file,     AppFile}, 
-     {appup_file,   AppupFile},
-     {appup_topdir, TopDir} | Config].
+    Config.
     
 
-file_name(App, Ext) ->
-    Env = init:get_arguments(),
-    LibDir = 
-	case lists:keysearch(clearcase, 1, Env) of
-	    false ->
-		code:lib_dir(App);
-	    _ ->
-		".."
-	end,
-    filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
-
-
 end_per_suite(suite) -> [];
 end_per_suite(doc) -> [];
 end_per_suite(Config) when is_list(Config) ->
@@ -108,467 +84,6 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup_file(suite) ->
-    [];
-appup_file(doc) ->
-    "Perform a simple check of the appup file";
+%% Perform a simple check of the appup file
 appup_file(Config) when is_list(Config) ->
-    AppupFile = key1search(appup_file, Config),
-    AppFile   = key1search(app_file, Config),
-    Modules   = modules(AppFile),
-    check_appup(AppupFile, Modules).
-
-modules(File) ->
-    case file:consult(File) of
-        {ok, [{application,snmp,Info}]} ->
-            case lists:keysearch(modules,1,Info) of
-                {value, {modules, Modules}} ->
-                    Modules;
-                false ->
-                    fail({bad_appinfo, Info})
-            end;
-        Error ->
-            fail({bad_appfile, Error, File})
-    end.
-
-    
-check_appup(AppupFile, Modules) ->
-    case file:consult(AppupFile) of
-	{ok, [{V, UpFrom, DownTo}]} ->
-	    check_appup(V, UpFrom, DownTo, Modules);
-	Else ->
-	    fail({bad_appupfile, Else})
-    end.
-
-
-check_appup(V, UpFrom, DownTo, Modules) ->
-    check_version(V),
-    check_depends(up,   UpFrom, Modules),
-    check_depends(down, DownTo, Modules),
-    check_module_subset(up,   UpFrom),
-    check_module_subset(down, DownTo),
-    ok.
-
-check_depends(_, [], _) ->
-    ok;
-check_depends(UpDown, [Dep|Deps], Modules) ->
-    check_depend(UpDown, Dep, Modules),
-    check_depends(UpDown, Deps, Modules).
-
-
-check_depend(up = UpDown, {add_application, ?APPLICATION} = Instr, Modules) ->
-     d("check_instructions(~w) -> entry with"
-       "~n   Instruction: ~p"
-       "~n   Modules:     ~p", [UpDown, Instr, Modules]),
-     ok;
-check_depend(down = UpDown, {remove_application, ?APPLICATION} = Instr,
-             Modules) ->
-     d("check_instructions(~w) -> entry with"
-       "~n   Instruction: ~p"
-       "~n   Modules:     ~p", [UpDown, Instr, Modules]),
-     ok;
-check_depend(UpDown, {V, Instructions}, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   V:       ~p"
-      "~n   Modules: ~p", [UpDown, V, Modules]),
-    check_version(V),
-    case check_instructions(UpDown, 
-			    Instructions, Instructions, [], [], Modules) of
-	{_Good, []} ->
-	    ok;
-	{_, Bad} ->
-	    fail({bad_instructions, Bad, UpDown})
-    end.
-
-
-check_instructions(_, [], _, Good, Bad, _) ->
-    {lists:reverse(Good), lists:reverse(Bad)};
-check_instructions(UpDown, [Instr|Instrs], AllInstr, Good, Bad, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instr: ~p", [UpDown,Instr]),
-    case (catch check_instruction(UpDown, Instr, AllInstr, Modules)) of
-        ok ->
-            check_instructions(UpDown, Instrs, AllInstr, 
-			       [Instr|Good], Bad, Modules);
-        {error, Reason} ->
-            check_instructions(UpDown, Instrs, AllInstr, Good, 
-                               [{Instr, Reason}|Bad], Modules)
-    end;
-check_instructions(UpDown, Instructions, _, _, _, _) ->
-    fail({bad_instructions, {UpDown, Instructions}}).
-
-check_instruction(_, {restart_application, ?APPLICATION}, _, _Modules) ->
-    d("check_instruction -> entry when restart_application instruction"),
-    ok;
-
-%% A new module is added
-check_instruction(up, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when up-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    check_module(Module, Modules);
-
-%% An old module is re-added
-check_instruction(down, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when down-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    ok;
-	ok ->
-	    error({existing_readded_module, Module})
-    end;
-
-check_instruction(up, {delete_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when up-delete_module instruction with"
-      "~n   Module: ~p", [Module]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    ok;
-	ok ->
-	    error({module_cannot_be_deleted, Module})
-    end;
-
-%% An new module is deleted
-check_instruction(down, {delete_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when down-delete_module instruction with"
-      "~n   Module: ~p", [Module]),
-    check_module(Module, Modules);
-
-%% Removing a module on upgrade: 
-%% - the module has been removed from the app-file.
-%% - check that no module depends on this (removed) module
-check_instruction(up, {remove, {Module, Pre, Post}}, _, Modules) 
-  when is_atom(Module) and is_atom(Pre) and is_atom(Post) ->
-    d("check_instruction -> entry when up-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    check_purge(Pre),
-	    check_purge(Post);
-	ok ->
-	    error({existing_removed_module, Module})
-    end;
-
-%% Removing a module on downgrade: the module exist
-%% in the app-file.
-check_instruction(down, {remove, {Module, Pre, Post}}, AllInstr, Modules) 
-  when is_atom(Module) and is_atom(Pre) and is_atom(Post) ->
-    d("check_instruction -> entry when down-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	ok ->
-	    check_purge(Pre),
-	    check_purge(Post),
-	    check_no_remove_depends(Module, AllInstr);
-	{error, {unknown_module, Module, Modules}} ->
-	    error({nonexisting_removed_module, Module})
-    end;
-
-check_instruction(_, {load_module, Module, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module) and 
-       is_atom(Pre)    and 
-       is_atom(Post)   and 
-       is_list(Depend) ->
-    d("check_instruction -> entry when load_module instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {update, Module, Change, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module) and 
-       is_atom(Pre)    and 
-       is_atom(Post)   and 
-       is_list(Depend) ->
-    d("check_instruction -> entry when update instruction with"
-      "~n   Module: ~p"
-      "~n   Change: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Change, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_change(Change),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {update, Module, supervisor}, _, Modules)
-  when is_atom(Module) ->
-    d("check_instruction -> entry when supervisor update instruction with"
-      "~n   Module: ~p", [Module]),
-    check_module(Module, Modules);
-
-check_instruction(_, {apply, {Module, Function, Args}}, _, _Modules)
-   when is_atom(Module) and is_atom(Function) and is_list(Args) ->
-     d("check_instruction -> entry when apply instruction with"
-       "~n   Module:   ~p"
-       "~n   Function: ~p"
-       "~n   Args:     ~p", [Module, Function, Args]),
-     check_apply(Module, Function, Args);
-
-check_instruction(_, Instr, _AllInstr, _Modules) ->
-    error({error, {unknown_instruction, Instr}}).
-
-%% If Module X depends on Module Y, then module Y must have an update
-%% instruction of some sort (otherwise the depend is faulty).
-updated_modules([], Modules) ->
-    d("updated_modules -> entry when done with"
-      "~n   Modules: ~p", [Modules]),
-    Modules;
-updated_modules([Instr|Instrs], Modules) ->
-    d("updated_modules -> entry with"
-      "~n   Instr:   ~p"
-      "~n   Modules: ~p", [Instr,Modules]),
-    case instruction_module(Instr) of
-	{module, Module} ->
-	    d("updated_modules -> Module: ~p", [Module]),
-	    updated_modules(Instrs, [Module|Modules]);
-	no_module ->
-	    updated_modules(Instrs, Modules)
-    end.
-
-instruction_module({add_module, Module}) ->
-    {module, Module};
-instruction_module({delete_module, Module}) ->
-    {module, Module};
-instruction_module({remove, {Module, _, _}}) ->
-    {module, Module};
-instruction_module({load_module, Module, _, _, _}) ->
-    {module, Module};
-instruction_module({update, Module, _, _, _, _}) ->
-    {module, Module};
-instruction_module({update, Module, _}) ->
-    {module, Module};
-instruction_module({apply, {_, _, _}}) ->
-    no_module;
-instruction_module(Instr) ->
-    d("instruction_module -> entry when unknown instruction with"
-      "~n   Instr: ~p", [Instr]),
-    error({error, {unknown_instruction, Instr}}).
-
-
-%% Check that the modules handled in an instruction set for version X
-%% is a subset of the instruction set for version X-1.
-check_module_subset(Direction, Instructions) ->
-    d("check_module_subset(~w) -> entry when"
-      "~n   Instructions: ~p", [Direction,Instructions]),
-    do_check_module_subset(modules_of(Instructions)).
-
-do_check_module_subset([]) ->
-    ok;
-do_check_module_subset([_]) ->
-    ok;
-do_check_module_subset([{_V1, Mods1}|T]) ->
-    d("do_check_module_subset -> entry with"
-      "~n   V1:    ~s"
-      "~n   Mods1: ~p", [_V1, Mods1]),
-    {V2, Mods2} = hd(T),
-    d("do_check_module_subset -> "
-      "~n   V2:    ~s"
-      "~n   Mods2: ~p", [V2, Mods2]),
-    %% Check that the modules in V1 is a subset of V2
-    case do_check_module_subset2(Mods1, Mods2) of
-	ok ->
-	    do_check_module_subset(T);
-	{error, Modules} ->
-	    fail({subset_missing_instructions, V2, Modules})
-    end.
-
-do_check_module_subset2(_Mods1, [{restart_application, ?APPLICATION}]) ->
-    ok;
-do_check_module_subset2(Mods1, Mods2) ->
-    do_check_module_subset2(Mods1, Mods2, []).
-
-do_check_module_subset2([], _, []) ->
-    ok;
-do_check_module_subset2([], _, Acc) ->
-    {error, lists:reverse(Acc)};
-do_check_module_subset2([Mod|Mods], Mods2, Acc) ->
-    case lists:member(Mod, Mods2) of
-	true ->
-	    do_check_module_subset2(Mods, Mods2, Acc);
-	false ->
-	    do_check_module_subset2(Mods, Mods2, [Mod|Acc])
-    end.
-    
-
-modules_of(Instructions) ->
-    modules_of(Instructions, []).
-
-modules_of([], Acc) ->
-    lists:reverse(Acc);
-modules_of([{_V,[{restart_application, ?APPLICATION}]}|T], Acc) ->
-    modules_of(T, Acc);
-modules_of([{V,Instructions}|T], Acc) ->
-    Mods = modules_of2(Instructions, []),
-    modules_of(T, [{V, Mods}|Acc]).
-
-modules_of2([], Acc) ->
-    lists:reverse(Acc);
-modules_of2([Instr|Instructions], Acc) ->
-    d("module_of -> entry with"
-      "~n   Instr: ~p", [Instr]),
-    case module_of(Instr) of
-	{value, Mod} ->
-	    d("module_of -> Mod: ~p", [Mod]),
-	    modules_of2(Instructions, [Mod|Acc]);
-	false ->
-	    modules_of2(Instructions, Acc)
-    end.
-
-module_of({add_module, Module}) ->
-    {value, Module};
-module_of({delete_module, Module}) ->
-    {value, Module};
-module_of({remove, {Module, _Pre, _Post}}) ->
-    {value, Module};
-module_of({load_module, Module, _Pre, _Post, _Depend}) ->
-    {value, Module};
-module_of({update, Module, _Change, _Pre, _Post, _Depend}) ->
-    {value, Module};
-module_of({update, Module, supervisor}) ->
-    {value, Module};
-module_of(_) ->
-    false.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-check_version(V) when is_list(V) ->
-    ok;
-check_version(V) ->
-    error({bad_version, V}).
-
-
-check_module(M, Modules) when is_atom(M) ->
-    case lists:member(M, Modules) of
-        true ->
-            ok;
-        false ->
-            error({unknown_module, M, Modules})
-    end;
-check_module(M, _) ->
-    error({bad_module, M}).
-
-
-check_module_depend(M, [], _) when is_atom(M) ->
-    ok;
-check_module_depend(M, Deps, Modules) when is_atom(M) and is_list(Deps) ->
-    case [Dep || Dep <- Deps, lists:member(Dep, Modules) == false] of
-        [] ->
-            ok;
-        Unknown ->
-            error({unknown_depend_modules, Unknown})
-    end;
-check_module_depend(_M, D, _Modules) ->
-    error({bad_depend, D}).
-
-
-check_no_remove_depends(_Module, []) ->
-    ok;
-check_no_remove_depends(Module, [Instr|Instrs]) ->
-    check_no_remove_depend(Module, Instr),
-    check_no_remove_depends(Module, Instrs).
-
-check_no_remove_depend(Module, {load_module, Mod, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, load_module, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(Module, {update, Mod, _Change, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    error({removed_module_in_depend, update, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(_, _) ->
-    ok.
-    
-
-check_change(soft) ->
-    ok;
-check_change({advanced, _Something}) ->
-    ok;
-check_change(Change) ->
-    error({bad_change, Change}).
-
-
-check_purge(soft_purge) ->
-    ok;
-check_purge(brutal_purge) ->
-    ok;
-check_purge(Purge) ->
-    error({bad_purge, Purge}).
-
-check_apply(Module, Function, Args) ->
-     case (catch Module:module_info()) of
-        Info when is_list(Info) ->
-            check_exported(Function, Args, Info);
-        {'EXIT', {undef, _}} ->
-            error({not_existing_module, Module})
-     end.
-
-check_exported(Function, Args, Info) ->
-     case lists:keysearch(exports, 1, Info) of
-        {value, {exports, FuncList}} ->
-             Arity   = length(Args),
-             Arities = [A || {F, A} <- FuncList, F == Function],
-             case lists:member(Arity, Arities) of
-                 true ->
-                     ok;
-                 false ->
-                     fail({not_exported_function, Function, Arity})
-             end;
-         _ ->
-             error({bad_export, Info})
-     end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-error(Reason) ->
-    throw({error, Reason}).
-
-fail(Reason) ->
-    exit({suite_failed, Reason}).
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
-	    fail({not_found, Key, L});
-	{value, {Key, Value}} ->
-	    Value
-    end.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-d(F) -> 
-    d(F, []).
-
-d(F, A) ->
-    d(true, F, A).
- 
-d(true, F, A) ->
-    io:format(F ++ "~n", A);
-d(_, _, _) ->
-    ok.
- 
+    ok = ?t:appup_test(snmp).
diff --git a/lib/snmp/test/snmp_log_test.erl b/lib/snmp/test/snmp_log_test.erl
index e9345b44cc..fb7285110f 100644
--- a/lib/snmp/test/snmp_log_test.erl
+++ b/lib/snmp/test/snmp_log_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -331,7 +331,7 @@ log_to_io1(doc) -> "Log to io from the same process that opened "
 log_to_io1(Config) when is_list(Config) ->
     p(log_to_io1),
     put(sname,l2i1),
-    put(verbosity,trace),
+    put(verbosity,debug),
     ?DBG("log_to_io1 -> start", []),
     Dir    = ?config(log_dir, Config),
     Name   = "snmp_test_l2i1",
@@ -365,7 +365,7 @@ log_to_io1(Config) when is_list(Config) ->
     display_info(Info),
 
     ?DBG("log_to_io1 -> do the convert to io (stdout)", []),
-    ? line ok = snmp_log:log_to_io(Log, File, Dir, []),
+    ? line ok = snmp:log_to_io(Dir, [], Name, File, false),
 
     ?DBG("log_to_io1 -> close log", []),
     ?line ok = snmp_log:close(Log),
@@ -377,7 +377,7 @@ log_to_io1(Config) when is_list(Config) ->
 %%======================================================================
 %% Start a logger-process that logs messages with a certain interval.
 %% Start a reader-process that reads messages from the log at a certain
-%% point of time.
+%% point in time.
 
 log_to_io2(suite) -> [];
 log_to_io2(doc) -> "Log to io from a different process than which "
@@ -386,7 +386,7 @@ log_to_io2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     p(log_to_io2),
     put(sname, l2i2),
-    put(verbosity,trace),
+    put(verbosity,debug),
     ?DBG("log_to_io2 -> start", []),
     Dir    = ?config(log_dir, Config),
     Name   = "snmp_test_l2i2",
@@ -414,13 +414,13 @@ log_to_io2(Config) when is_list(Config) ->
 	log_reader_log_to(Reader, 
 			  fun() -> 
 				  I = disk_log:info(Log),
-				  R = snmp_log:log_to_io(Log, File, Dir, []),
+				  R = snmp:log_to_io(Dir, [], Name, File, true),
 				  {R, I}
 			  end),
 
     case Res of
-	{ok, Info} ->
-	    ?DBG("log_to_io2 -> ~n   Info: ~p", [Info]),
+	{ok, _Info} ->
+	    ?DBG("log_to_io2 -> ~n   Info: ~p", [_Info]),
 	    ok;
 	{Error, Info} ->
 	    ?DBG("log_to_io2 -> log to io failed: "
@@ -445,7 +445,7 @@ log_to_txt1(suite) -> [];
 log_to_txt1(Config) when is_list(Config) ->
     p(log_to_txt1),
     put(sname,l2t1),
-    put(verbosity,trace),
+    put(verbosity,debug),
     ?DBG("log_to_txt1 -> start", []),
 
     Name     = "snmp_test_l2t1",
@@ -463,7 +463,7 @@ log_to_txt2(suite) -> [];
 log_to_txt2(Config) when is_list(Config) ->
     p(log_to_txt2),
     put(sname,l2t2),
-    put(verbosity,trace),
+    put(verbosity,debug),
     ?DBG("log_to_txt2 -> start", []),
 
     Name     = "snmp_test_l2t2",
@@ -520,14 +520,21 @@ log_to_txt(Name, SeqNoGen, Config) when is_list(Config) ->
     ?line {ok, Info} = snmp_log:info(Log),
     display_info(Info),
 
-    Out1 = join(Dir, "snmp_text-1.txt"),
-    ?DBG("log_to_txt -> do the convert to a text file when"
-	"~n   Out1: ~p", [Out1]),
-    ?line ok = snmp:log_to_txt(Dir, [], Out1, Log, File),
+    Out1a = join(Dir, "snmp_text-1-unblocked.txt"),
+    ?DBG("log_to_txt -> do the convert to a text file (~s) unblocked", [Out1a]),
+    ?line ok = snmp:log_to_txt(Dir, [], Out1a, Log, File, false),
+
+    ?line {ok, #file_info{size = Size1a}} = file:read_file_info(Out1a),
+    ?DBG("log_to_txt -> text file size: ~p", [Size1a]),
+    validate_size(Size1a),
+
+    Out1b = join(Dir, "snmp_text-1-blocked.txt"),
+    ?DBG("log_to_txt -> do the convert to a text file (~s) blocked", [Out1b]),
+    ?line ok = snmp:log_to_txt(Dir, [], Out1b, Log, File, true),
 
-    ?line {ok, #file_info{size = Size1}} = file:read_file_info(Out1),
-    ?DBG("log_to_txt -> text file size: ~p", [Size1]),
-    validate_size(Size1),
+    ?line {ok, #file_info{size = Size1b}} = file:read_file_info(Out1b),
+    ?DBG("log_to_txt -> text file size: ~p", [Size1b]),
+    validate_size(Size1b, {eq, Size1a}),
 
     Out2 = join(Dir, "snmp_text-2.txt"),
     ?DBG("log_to_txt -> do the convert to a text file when"
@@ -538,7 +545,7 @@ log_to_txt(Name, SeqNoGen, Config) when is_list(Config) ->
 
     ?line {ok, #file_info{size = Size2}} = file:read_file_info(Out2),
     ?DBG("log_to_txt -> text file size: ~p", [Size2]),
-    validate_size(Size2, {le, Size1}),
+    validate_size(Size2, {le, Size1a}),
 
     %% Calculate new start / stop times...
     GStart = calendar:datetime_to_gregorian_seconds(Start),
@@ -568,7 +575,7 @@ log_to_txt(Name, SeqNoGen, Config) when is_list(Config) ->
 
     ?line {ok, #file_info{size = Size3}} = file:read_file_info(Out3),
     ?DBG("log_to_txt -> text file size: ~p", [Size3]),
-    validate_size(Size3, {l, Size1}),    
+    validate_size(Size3, {l, Size1a}),    
 
     ?DBG("log_to_txt -> close log", []),
     ?line ok = snmp_log:close(Log),
@@ -593,7 +600,7 @@ log_to_txt3(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     p(log_to_txt3),
     put(sname,l2t3),
-    put(verbosity,trace),
+    put(verbosity,debug),
     ?DBG("log_to_txt3 -> start", []),
     Dir     = ?config(log_dir, Config),
     Name    = "snmp_test_l2t3",
@@ -637,8 +644,8 @@ log_to_txt3(Config) when is_list(Config) ->
 			  end),
 
     case Res of
-	{ok, Info} ->
-	    ?DBG("log_to_txt3 -> ~n   Info: ~p", [Info]),
+	{ok, _Info} ->
+	    ?DBG("log_to_txt3 -> ~n   Info: ~p", [_Info]),
 	    ?line {ok, #file_info{size = FileSize}} = 
 		file:read_file_info(TxtFile),
 	    ?DBG("log_to_txt3 -> text file size: ~p", [FileSize]),
@@ -667,6 +674,8 @@ validate_size(_) ->
 
 validate_size(0, _) ->
     ?FAIL(invalid_size);
+validate_size(A, {eq, A}) ->
+    ok;
 validate_size(A, {le, B}) when A =< B ->
     ok;
 validate_size(A, {l, B}) when A < B ->
@@ -695,11 +704,11 @@ log_writer_start(Name, File, Size, Repair) ->
 
 log_writer_stop(Pid) ->
     Pid ! {stop, self()},
-    T1 = t(),
+    _T1 = t(),
     receive
 	{'EXIT', Pid, normal} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to stop the writer", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to stop the writer", [_T2 - _T1]),
 	    ok
     after 60000 ->
 	    Msg  = receive Any -> Any after 0 -> nothing end,
@@ -712,11 +721,11 @@ log_writer_info(Pid) ->
 
 log_writer_sleep(Pid, Time) ->
     Pid ! {sleep, Time, self()},
-    T1 = t(),
+    _T1 = t(),
     receive 
 	{sleeping, Pid} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to put the writer to sleep", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to put the writer to sleep", [_T2 - _T1]),
 	    ok;
 	{'EXIT', Pid, Reason} ->
 	    {error, Reason}
@@ -784,11 +793,11 @@ lp(F, A) ->
 
 log_reader_start() ->
     Pid = spawn_link(?MODULE, log_reader_main, [self()]),
-    T1 = t(),
+    _T1 = t(),
     receive 
 	{started, Pid} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to start the reader", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to start the reader", [_T2 - _T1]),
 	    {ok, Pid};
 	{'EXIT', Pid, Reason} ->
 	    {error, Reason}
@@ -798,11 +807,11 @@ log_reader_start() ->
 
 log_reader_stop(Pid) ->
     Pid ! {stop, self()},
-    T1 = t(),
+    _T1 = t(),
     receive
 	{'EXIT', Pid, normal} ->
-	    T2 = t(),
-	    ?DBG("it took ~w ms to put the reader to eleep", [T2 - T1]),
+	    _T2 = t(),
+	    ?DBG("it took ~w ms to put the reader to eleep", [_T2 - _T1]),
 	    ok
     after 1000 ->
 	    Msg = receive Any -> Any after 0 -> nothing end,
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index 3192fe1b40..7b9924b83c 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
 %% The 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,7 @@
 	 start_with_invalid_users_conf_file1/1,
 	 start_with_invalid_agents_conf_file1/1,
 	 start_with_invalid_usm_conf_file1/1,
+         start_with_create_db_and_dir_opt/1,
 
 	
 
@@ -139,8 +140,13 @@ init_per_testcase(Case, Config) when is_list(Config) ->
 	file:make_dir(MgrTopDir  = filename:join(CaseTopDir, "manager/")),
     ?line ok = 
 	file:make_dir(MgrConfDir = filename:join(MgrTopDir,   "conf/")),
-    ?line ok = 
-	file:make_dir(MgrDbDir   = filename:join(MgrTopDir,   "db/")),
+    MgrDbDir = filename:join(MgrTopDir, "db/"),
+    case Case of
+	start_with_create_db_and_dir_opt ->
+	    ok;
+	_ ->
+	    ?line ok = file:make_dir(MgrDbDir)
+    end,
     ?line ok = 
 	file:make_dir(MgrLogDir  = filename:join(MgrTopDir,   "log/")),
     [{case_top_dir,     CaseTopDir},
@@ -174,6 +180,7 @@ groups() ->
        start_without_mandatory_opts2,
        start_with_all_valid_opts, start_with_unknown_opts,
        start_with_incorrect_opts,
+       start_with_create_db_and_dir_opt,
        start_with_invalid_manager_conf_file1,
        start_with_invalid_users_conf_file1,
        start_with_invalid_agents_conf_file1,
@@ -332,7 +339,8 @@ start_with_all_valid_opts(Conf) when is_list(Conf) ->
 			       {no_reuse, false}]}],
     ServerOpts = [{timeout, 10000}, {verbosity, trace}],
     NoteStoreOpts = [{timeout, 20000}, {verbosity, trace}],
-    ConfigOpts = [{dir, ConfDir}, {verbosity, trace}, {db_dir, DbDir}],
+    ConfigOpts = [{dir, ConfDir}, {verbosity, trace},
+                  {db_dir, DbDir}, {db_init_error, create}],
     Mibs = [join(StdMibDir, "SNMP-NOTIFICATION-MIB"),
 	    join(StdMibDir, "SNMP-USER-BASED-SM-MIB")],
     Prio = normal,
@@ -1674,7 +1682,34 @@ start_with_invalid_usm_conf_file1(Conf) when is_list(Conf) ->
 %% ---
 %% 
 
+start_with_create_db_and_dir_opt(suite) -> [];
+start_with_create_db_and_dir_opt(doc) ->
+    "Start the snmp manager config process with the\n"
+        "create_db_and_dir option.";
+start_with_create_db_and_dir_opt(Conf) when is_list(Conf) ->
+    put(tname, swcdado),
+    p("start"),
+    process_flag(trap_exit, true),
+    ConfDir = ?config(manager_conf_dir, Conf),
+    DbDir = ?config(manager_db_dir, Conf),
+    true = not filelib:is_dir(DbDir) and not filelib:is_file(DbDir),
+    write_manager_conf(ConfDir),
+
+    p("verify nonexistent db_dir"),
+    ConfigOpts01 = [{verbosity,trace}, {dir, ConfDir}, {db_dir, DbDir}],
+    {error, Reason01} = config_start([{config, ConfigOpts01}]),
+    p("nonexistent db_dir res: ~p", [Reason01]),
+    {invalid_conf_db_dir, _, not_found} = Reason01,
 
+    p("verify nonexistent db_dir gets created"),
+    ConfigOpts02 = [{db_init_error, create_db_and_dir} | ConfigOpts01],
+    {ok, _Pid} = config_start([{config, ConfigOpts02}]),
+    true = filelib:is_dir(DbDir),
+    p("verified: nonexistent db_dir was correctly created"),
+    ok = config_stop(),
+
+    p("done"),
+    ok.
 
 %% 
 %% ---
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index dedbae5ce4..5fe18980bc 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1615,10 +1615,10 @@ simple_sync_get1(Config) when is_list(Config) ->
     ok.
 
 do_simple_sync_get(Node, Addr, Port, Oids) ->
-    ?line {ok, Reply, Rem} = mgr_user_sync_get(Node, Addr, Port, Oids),
+    ?line {ok, Reply, _Rem} = mgr_user_sync_get(Node, Addr, Port, Oids),
 
     ?DBG("~n   Reply: ~p"
-	 "~n   Rem:   ~w", [Reply, Rem]),
+	 "~n   Rem:   ~w", [Reply, _Rem]),
 
     %% verify that the operation actually worked:
     %% The order should be the same, so no need to seach 
@@ -1682,10 +1682,10 @@ do_simple_sync_get2(Config, Get, PostVerify) ->
 
 do_simple_sync_get2(Node, TargetName, Oids, Get, PostVerify) 
   when is_function(Get, 3) andalso is_function(PostVerify, 0) ->
-    ?line {ok, Reply, Rem} = Get(Node, TargetName, Oids),
+    ?line {ok, Reply, _Rem} = Get(Node, TargetName, Oids),
 
     ?DBG("~n   Reply: ~p"
-	 "~n   Rem:   ~w", [Reply, Rem]),
+	 "~n   Rem:   ~w", [Reply, _Rem]),
 
     %% verify that the operation actually worked:
     %% The order should be the same, so no need to seach 
@@ -2061,10 +2061,10 @@ simple_sync_get_next1(Config) when is_list(Config) ->
 do_simple_get_next(N, Node, Addr, Port, Oids, Verify) ->
     p("issue get-next command ~w", [N]),
     case mgr_user_sync_get_next(Node, Addr, Port, Oids) of
-	{ok, Reply, Rem} ->
+	{ok, Reply, _Rem} ->
 	    ?DBG("get-next ok:"
 		 "~n   Reply: ~p"
-		 "~n   Rem:   ~w", [Reply, Rem]),
+		 "~n   Rem:   ~w", [Reply, _Rem]),
 	    Verify(Reply);
 
 	Error ->
@@ -2217,10 +2217,10 @@ do_simple_sync_get_next2(Config, GetNext, PostVerify)
 do_simple_get_next(N, Node, TargetName, Oids, Verify, GetNext, PostVerify) ->
     p("issue get-next command ~w", [N]),
     case GetNext(Node, TargetName, Oids) of
-	{ok, Reply, Rem} ->
+	{ok, Reply, _Rem} ->
 	    ?DBG("get-next ok:"
 		 "~n   Reply: ~p"
-		 "~n   Rem:   ~w", [Reply, Rem]),
+		 "~n   Rem:   ~w", [Reply, _Rem]),
 	    PostVerify(Verify(Reply));
 
 	Error ->
@@ -2551,10 +2551,10 @@ simple_sync_set1(Config) when is_list(Config) ->
 
 do_simple_set1(Node, Addr, Port, VAVs) ->
     [SysName, SysLoc] = value_of_vavs(VAVs),
-    ?line {ok, Reply, Rem} = mgr_user_sync_set(Node, Addr, Port, VAVs),
+    ?line {ok, Reply, _Rem} = mgr_user_sync_set(Node, Addr, Port, VAVs),
 
     ?DBG("~n   Reply: ~p"
-	 "~n   Rem:   ~w", [Reply, Rem]),
+	 "~n   Rem:   ~w", [Reply, _Rem]),
 
     %% verify that the operation actually worked:
     %% The order should be the same, so no need to seach 
@@ -2631,10 +2631,10 @@ do_simple_sync_set2(Config, Set, PostVerify)
 
 do_simple_set2(Node, TargetName, VAVs, Set, PostVerify) ->
     [SysName, SysLoc] = value_of_vavs(VAVs),
-    ?line {ok, Reply, Rem} = Set(Node, TargetName, VAVs),
+    ?line {ok, Reply, _Rem} = Set(Node, TargetName, VAVs),
 
     ?DBG("~n   Reply: ~p"
-	 "~n   Rem:   ~w", [Reply, Rem]),
+	 "~n   Rem:   ~w", [Reply, _Rem]),
 
     %% verify that the operation actually worked:
     %% The order should be the same, so no need to seach 
@@ -3026,10 +3026,10 @@ fl(L) ->
 do_simple_get_bulk1(N, Node, Addr, Port, NonRep, MaxRep, Oids, Verify) ->
     p("issue get-bulk command ~w", [N]),
     case mgr_user_sync_get_bulk(Node, Addr, Port, NonRep, MaxRep, Oids) of
-	{ok, Reply, Rem} ->
+	{ok, Reply, _Rem} ->
 	    ?DBG("get-bulk ok:"
 		 "~n   Reply: ~p"
-		 "~n   Rem:   ~w", [Reply, Rem]),
+		 "~n   Rem:   ~w", [Reply, _Rem]),
 	    Verify(Reply);
 
 	Error ->
@@ -3213,10 +3213,10 @@ do_simple_get_bulk2(N,
        is_function(PostVerify) ->
     p("issue get-bulk command ~w", [N]),
     case GetBulk(NonRep, MaxRep, Oids) of
-	{ok, Reply, Rem} ->
+	{ok, Reply, _Rem} ->
 	    ?DBG("get-bulk ok:"
 		 "~n   Reply: ~p"
-		 "~n   Rem:   ~w", [Reply, Rem]),
+		 "~n   Rem:   ~w", [Reply, _Rem]),
 	    PostVerify(Verify(Reply));
 
 	Error ->
@@ -5609,11 +5609,11 @@ init_mgr_user_data1(Conf) ->
 				       [{address,   Addr},
 					{port,      Port},
 					{engine_id, "agentEngine"}]),
-    Agents = mgr_user_which_own_agents(Node),
-    ?DBG("Own agents: ~p", [Agents]),
+    _Agents = mgr_user_which_own_agents(Node),
+    ?DBG("Own agents: ~p", [_Agents]),
 
-    ?line {ok, DefAgentConf} = mgr_user_agent_info(Node, TargetName, all),
-    ?DBG("Default agent config: ~n~p", [DefAgentConf]),
+    ?line {ok, _DefAgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?DBG("Default agent config: ~n~p", [_DefAgentConf]),
 
     ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  community, "all-rights"),
@@ -5624,8 +5624,8 @@ init_mgr_user_data1(Conf) ->
     ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  max_message_size, 1024),
 
-    ?line {ok, AgentConf} = mgr_user_agent_info(Node, TargetName, all),
-    ?DBG("Updated agent config: ~n~p", [AgentConf]),
+    ?line {ok, _AgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?DBG("Updated agent config: ~n~p", [_AgentConf]),
     Conf.
 
 init_mgr_user_data2(Conf) ->
@@ -5639,11 +5639,11 @@ init_mgr_user_data2(Conf) ->
 				       [{address,   Addr}, 
 					{port,      Port},
 					{engine_id, "agentEngine"}]),
-    Agents = mgr_user_which_own_agents(Node),
-    ?DBG("Own agents: ~p", [Agents]),
+    _Agents = mgr_user_which_own_agents(Node),
+    ?DBG("Own agents: ~p", [_Agents]),
 
-    ?line {ok, DefAgentConf} = mgr_user_agent_info(Node, TargetName, all),
-    ?DBG("Default agent config: ~n~p", [DefAgentConf]),
+    ?line {ok, _DefAgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?DBG("Default agent config: ~n~p", [_DefAgentConf]),
 
     ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  community, "all-rights"),
@@ -5652,8 +5652,8 @@ init_mgr_user_data2(Conf) ->
     ?line ok = mgr_user_update_agent_info(Node, TargetName, 
 					  max_message_size, 1024),
 
-    ?line {ok, AgentConf} = mgr_user_agent_info(Node, TargetName, all),
-    ?DBG("Updated agent config: ~n~p", [AgentConf]),
+    ?line {ok, _AgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?DBG("Updated agent config: ~n~p", [_AgentConf]),
     Conf.
 
 fin_mgr_user_data1(Conf) ->
@@ -5853,12 +5853,12 @@ mgr_user_name_to_oid(Node, Name) ->
 
 start_manager(Node, Vsns, Config) ->
     start_manager(Node, Vsns, Config, []).
-start_manager(Node, Vsns, Conf0, Opts) ->
+start_manager(Node, Vsns, Conf0, _Opts) ->
     ?DBG("start_manager -> entry with"
 	 "~n   Node:   ~p"
 	 "~n   Vsns:   ~p"
 	 "~n   Conf0:  ~p"
-	 "~n   Opts:   ~p", [Node, Vsns, Conf0, Opts]),
+	 "~n   Opts:   ~p", [Node, Vsns, Conf0, _Opts]),
     
     AtlDir  = ?config(manager_log_dir,  Conf0),
     ConfDir = ?config(manager_conf_dir, Conf0),
@@ -5908,12 +5908,12 @@ stop_manager(Node, Conf) ->
 
 start_agent(Node, Vsns, Config) ->
     start_agent(Node, Vsns, Config, []).
-start_agent(Node, Vsns, Conf0, Opts) ->
+start_agent(Node, Vsns, Conf0, _Opts) ->
     ?DBG("start_agent -> entry with"
 	 "~n   Node:   ~p"
 	 "~n   Vsns:   ~p"
 	 "~n   Conf0:  ~p"
-	 "~n   Opts:   ~p", [Node, Vsns, Conf0, Opts]),
+	 "~n   Opts:   ~p", [Node, Vsns, Conf0, _Opts]),
     
     AtlDir  = ?config(agent_log_dir,  Conf0),
     ConfDir = ?config(agent_conf_dir, Conf0),
diff --git a/lib/snmp/test/snmp_manager_user.erl b/lib/snmp/test/snmp_manager_user.erl
index 4e789bbaec..ddbe156130 100644
--- a/lib/snmp/test/snmp_manager_user.erl
+++ b/lib/snmp/test/snmp_manager_user.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -681,6 +681,15 @@ loop(#state{parent = Parent, id = Id} = S) ->
 	    Parent ! {async_event, TargetName, {report, SnmpReport}}, 
 	    loop(S);
 
+	{handle_invalid_result, _Pid, In, Out} ->
+	    d("loop -> received invalid result callback from manager for "
+	      "~n   In:  ~p", 
+	      "~n   Out: ~p", [In, Out]),
+	    info("received invalid result message: "
+		 "~n   In:  ~p"
+		 "~n   Out: ~p", [In, Out]),
+	    loop(S);
+
 	{'EXIT', Parent, Reason} ->
 	    d("received exit signal from parent: ~n~p", [Reason]),
 	    info("received exit signal from parent: ~n~p", [Reason]),
@@ -770,7 +779,7 @@ handle_pdu(TargetName, ReqId, SnmpResponse, UserPid) ->
  
 handle_trap(TargetName, SnmpTrap, UserPid) ->
     UserPid ! {handle_trap, self(), TargetName, SnmpTrap},
-    ok.
+    ignore.
  
 handle_inform(TargetName, SnmpInform, UserPid) ->
     UserPid ! {handle_inform, self(), TargetName, SnmpInform},
@@ -778,12 +787,12 @@ handle_inform(TargetName, SnmpInform, UserPid) ->
 	{handle_inform_no_response, TargetName} ->
 	    no_reply;
 	{handle_inform_response, TargetName} ->
-	    ok
+	    ignore
     end.
 
 handle_report(TargetName, SnmpReport, UserPid) ->
     UserPid ! {handle_report, self(), TargetName, SnmpReport},
-    ok.
+    ignore.
 
 
 %%----------------------------------------------------------------------
diff --git a/lib/snmp/test/snmp_test_manager.erl b/lib/snmp/test/snmp_test_manager.erl
index 1f3383a7a8..925ae77ab5 100644
--- a/lib/snmp/test/snmp_test_manager.erl
+++ b/lib/snmp/test/snmp_test_manager.erl
@@ -47,7 +47,8 @@
          handle_pdu/4,
          handle_trap/3,
          handle_inform/3,
-         handle_report/3
+         handle_report/3, 
+	 handle_invalid_result/3
 	]).
 
 
@@ -279,12 +280,18 @@ handle_info({snmp_inform, TargetName, Info, Pid},
 handle_info({snmp_report, TargetName, Info, Pid}, 
 	    #state{parent = P} = State) ->
     info_msg("received snmp report: "
-	      "~n   TargetName: ~p"
-	      "~n   Info:       ~p", [TargetName, Info]),
+	     "~n   TargetName: ~p"
+	     "~n   Info:       ~p", [TargetName, Info]),
     Pid ! {snmp_report_reply, ignore, self()},
     P ! {snmp_report, TargetName, Info}, 
     {noreply, State};
 
+handle_info({snmp_invalid_result, In, Out}, State) ->
+    error_msg("Callback failure: "
+	      "~n   In:  ~p"
+	      "~n   Out: ~p", [In, Out]),
+    {noreply, State};
+
 handle_info(Info, State) ->
     error_msg("received unknown info: "
 	      "~n   Info: ~p", [Info]),
@@ -369,7 +376,12 @@ handle_report(TargetName, SnmpInfo, Pid) ->
     after 10000 ->
 	    ignore
     end.
-    
+
+
+handle_invalid_result(In, Out, Pid) ->
+    Pid ! {snmp_invalid_result, In, Out},
+    ignore.
+
 
 %%----------------------------------------------------------------------
          
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 0e48e7ea56..533e313bdb 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2013. All Rights Reserved.
+# Copyright Ericsson AB 1997-2014. All Rights Reserved.
 #
 # The 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,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.24
+SNMP_VSN    = 4.25.0.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/book.xml b/lib/ssh/doc/src/book.xml
index 3c2375f96d..c031d872d7 100644
--- a/lib/ssh/doc/src/book.xml
+++ b/lib/ssh/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2005</year><year>2012</year>
+      <year>2005</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/fascicules.xml b/lib/ssh/doc/src/fascicules.xml
index 069d9002e0..7e99398c16 100644
--- a/lib/ssh/doc/src/fascicules.xml
+++ b/lib/ssh/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/ssh/doc/src/introduction.xml b/lib/ssh/doc/src/introduction.xml
index e76aa20d64..b42910cb34 100644
--- a/lib/ssh/doc/src/introduction.xml
+++ b/lib/ssh/doc/src/introduction.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 8e112433c1..0d88cbda7a 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -29,6 +29,113 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 3.0</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The ssh cli is now faster at close and before new prompt.</p>
+          <p>
+	    Own Id: OTP-11339 Aux Id: seq12423 </p>
+        </item>
+        <item>
+          <p>
+	    Ssh process structure was redesigned to better map to
+	    what is truly parallel this has solved a lot of strange
+	    timing issues that sometimes would occur, for instance a
+	    process leak could happen when a lot of connections where
+	    taken up and down in parallel in a short period of time.
+	    Also backwards compatible clauses to "original" but never
+	    supported features has been removed.</p>
+          <p>
+	    Impact: Increases flow efficiency</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-11363</p>
+        </item>
+        <item>
+          <p>
+	    Fix various typos in erts, kernel and ssh. Thanks to
+	    Martin Hässler.</p>
+          <p>
+	    Own Id: OTP-11414</p>
+        </item>
+        <item>
+          <p>
+	    Correct private_key type documentation in
+	    ssh_server_key_api. Thanks to Tristan Sloughter.</p>
+          <p>
+	    Own Id: OTP-11449</p>
+        </item>
+        <item>
+          <p>
+	    The functions in ssh_no_io.erl did not mimic the
+	    functions in ssh_io.erl correctly, the arity was
+	    incorrect for some functions which caused ssh to fail in
+	    the wrong way.</p>
+          <p>
+	    Own Id: OTP-11490</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add option to disallow CLI</p>
+          <p>
+	    Own Id: OTP-10976</p>
+        </item>
+        <item>
+          <p>
+	    Add sockname and user to ssh:connection_info/2</p>
+          <p>
+	    Own Id: OTP-11296</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Ssh 2.1.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Do not chmod ~/.ssh unnecessarily.</p>
+          <p>
+	    Own Id: OTP-11189</p>
+        </item>
+        <item>
+          <p>
+	    Make ssh_cli.erl handle CTRL+C. Thanks to Stefan
+	    Zegenhagen.</p>
+          <p>
+	    Own Id: OTP-11199</p>
+        </item>
+        <item>
+          <p>
+	    Clarified timeout options in documentation.</p>
+          <p>
+	    Own Id: OTP-11249</p>
+        </item>
+        <item>
+          <p>
+	    Add openssh_zlib compression type to ssh_transport.
+	    Thanks to Louis-Philippe Gauthier.</p>
+          <p>
+	    Own Id: OTP-11256</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 2.1.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -138,7 +245,7 @@
         <item>
           <p>
 	    Fix link to documentation for ssh:connect/3,4. Thanks to
-	    Martin H�ssler.</p>
+	    Martin Hässler.</p>
           <p>
 	    Own Id: OTP-10862</p>
         </item>
@@ -195,8 +302,6 @@
         </item>
       </list>
     </section>
-
-
     <section><title>Improvements and New Features</title>
       <list>
         <item>
@@ -251,7 +356,20 @@
     </section>
 
 </section>
+<section><title>Ssh 2.1.2.1</title>
+<section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Removed error report in ssh_connection_handler triggered
+	    by badmatch failure.</p>
+          <p>
+	    Own Id: OTP-11188</p>
+        </item>
+      </list>
+    </section>
 
+</section>
 <section><title>Ssh 2.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/part_notes.xml b/lib/ssh/doc/src/part_notes.xml
index 1b47a12021..c5cc163717 100644
--- a/lib/ssh/doc/src/part_notes.xml
+++ b/lib/ssh/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2010</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/ref_man.xml b/lib/ssh/doc/src/ref_man.xml
index 88203b5034..55339298e8 100644
--- a/lib/ssh/doc/src/ref_man.xml
+++ b/lib/ssh/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index bd0d3d49dd..eaf96d0230 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -38,6 +38,8 @@
       <item>Supported SSH version is 2.0 </item>
       <item>Supported MAC algorithms: hmac-sha1</item>
       <item>Supported encryption algorithms: aes128-cb and 3des-cbc</item>
+      <item>Supports unicode filenames if the emulator and the underlaying OS supports it. See the DESCRIPTION section in <seealso marker="kernel:file">file</seealso> for information about this subject</item>
+      <item>Supports unicode in shell and cli</item>
     </list>
  
   </section>
@@ -53,8 +55,7 @@
     returned by ssh:daemon/[1,2,3]</c></p>
     <p><c>ssh_connection_ref() - opaque to the user
     returned by ssh:connect/3</c></p>
-    <p><c>ip_address() - {N1,N2,N3,N4} % IPv4 |
-    {K1,K2,K3,K4,K5,K6,K7,K8} % IPv6</c></p>
+    <p><c>ip_address() - inet::ip_address()</c></p>
     <p><c>subsystem_spec() = {subsystem_name(),
     {channel_callback(), channel_init_args()}} </c></p>
     <p><c>subsystem_name() = string() </c></p>
@@ -88,6 +89,7 @@
 	number for SSH.</d>
 	<v>Options = [{Option, Value}]</v>
 	<v>Timeout = infinity | integer(milliseconds)</v>
+	<d>Negotiation timeout, for connection timeout use the option <c>{connect_timeout, timeout()}</c>.</d>
       </type>
       <desc>
 	<p>Connects to an SSH server. No channel is started. This is done
@@ -140,7 +142,7 @@
             <p>Sets the preferred public key algorithm to use for user
 	    authentication. If the the preferred algorithm fails for
 	    some reason, the other algorithm is tried. The  default is
-	    to try <c><![CDATA[ssh_rsa]]></c> first.</p>
+	    to try <c><![CDATA['ssh-rsa']]></c> first.</p>
 	  </item>
 	  <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag>
 	  <item>
@@ -180,10 +182,6 @@
 	  <item>
 	    <p>Allow an existing file descriptor to be used
 	  (simply passed on to the transport protocol).</p></item>
-	  <tag><c><![CDATA[{ipv6_disabled, boolean()}]]></c></tag>
-	  <item>
-	    <p>Determines if SSH shall use IPv6 or not.</p>
-	  </item>
 	  <tag><c><![CDATA[{rekey_limit, integer()}]]></c></tag>
 	  <item>
 	    <p>Provide, in bytes, when rekeying should be initiated, 
@@ -201,8 +199,11 @@
       Value}] </name>
       <fsummary> Retrieves information about a connection. </fsummary>
       <type>
-        <v>Option = client_version | server_version | peer</v>
-	<v>Value = term() </v>
+        <v>Option = client_version | server_version | user | peer | sockname </v>
+	<v>Value = [option_value()] </v>
+	<v>option_value() = {{Major::integer(), Minor::integer()}, VersionString::string()} | User::string() |
+	Peer::{inet:hostname(), {inet::ip_adress(), inet::port_number()}} |
+	Sockname::{inet::ip_adress(), inet::port_number()} () </v>
       </type>
       <desc>
         <p> Retrieves information about a connection. 
@@ -247,14 +248,15 @@
 	    requested by the client. Default is to use the erlang shell:
 	    <c><![CDATA[{shell, start, []}]]></c>
 	  </item>
-	  <tag><c><![CDATA[{ssh_cli,{channel_callback(),
-	  channel_init_args()}}]]></c></tag>
+	  <tag><c><![CDATA[{ssh_cli, {channel_callback(),
+	  channel_init_args()} | no_cli}]]></c></tag>
 	  <item>
-	    Provides your own cli implementation, i.e. a channel callback
+	    Provides your own CLI implementation, i.e. a channel callback
 	    module that implements a shell and command execution. Note
 	    that you may customize the shell read-eval-print loop using the
 	    option <c>shell</c> which is much less work than implementing
-	    your own cli channel.
+	    your own CLI channel. If set to  <c>no_cli</c> you will disable
+	    CLI channels and only subsystem channels will be allowed.
 	  </item>
 	  <tag><c><![CDATA[{user_dir, String}]]></c></tag>
 	  <item>
@@ -295,7 +297,7 @@
               user. From a security perspective this option makes
 	      the server very vulnerable.</p>
 	  </item>
-	  <tag><c><![CDATA[{pwdfun, fun(User::string(), password::string() -> boolean()}]]></c></tag>
+	  <tag><c><![CDATA[{pwdfun, fun(User::string(), password::string()) -> boolean()}]]></c></tag>
 	  <item>
 	    <p>Provide a function for password validation. This is called
 	      with user and password as strings, and should return
@@ -312,26 +314,23 @@
 	  <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 (only used when 
-               HostAddress is set to any).</p></item>
-	  <tag><c><![CDATA[{failfun, fun()}]]></c></tag>
+	  <tag><c><![CDATA[{failfun, fun(User::string(), PeerAddress::ip_address(), Reason::term()) -> _}]]></c></tag>
 	  <item>
-	    <p>Provide a fun() to implement your own logging when a user fails to authenticate.</p>
+	    <p>Provide a fun to implement your own logging when a user fails to authenticate.</p>
 	  </item>
-	  <tag><c><![CDATA[{connectfun, fun()}]]></c></tag>
+	  <tag><c><![CDATA[{connectfun, fun(User::string(), PeerAddress::ip_address(), Method::string()) ->_}]]></c></tag>
 	  <item>
-	    <p>Provide a fun() to implement your own logging when a user authenticates to the server.</p>
+	    <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>
+	  <tag><c><![CDATA[{disconnectfun, fun(Reason:term()) -> _}]]></c></tag>
 	  <item>
-	    <p>Provide a fun() to implement your own logging when a user disconnects from the server.</p>
+	    <p>Provide a fun to implement your own logging when a user disconnects from the server.</p>
 	  </item>
         </taglist>
       </desc>
     </func>
 
+
     <func>
       <name>shell(Host) -> </name>
       <name>shell(Host, Option) -> </name>
@@ -368,8 +367,11 @@
     </func>
 
     <func>
-      <name>stop() -> ok </name>
+      <name>stop() -> ok | {error, Reason}</name>
       <fsummary>Stops the SSH application.</fsummary>
+      <type>
+        <v>Reason = term()</v>
+      </type>
       <desc>
         <p>Stops the SSH application. See also
           <seealso marker="kernel:application">application(3)</seealso></p>
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml
index c01f44936a..a1d2402790 100644
--- a/lib/ssh/doc/src/ssh_app.xml
+++ b/lib/ssh/doc/src/ssh_app.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
   <header>
     <copyright>
-      <year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/ssh_channel.xml b/lib/ssh/doc/src/ssh_channel.xml
index 66b3b8b656..a52a6a115e 100644
--- a/lib/ssh/doc/src/ssh_channel.xml
+++ b/lib/ssh/doc/src/ssh_channel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/ssh/doc/src/ssh_client_key_api.xml b/lib/ssh/doc/src/ssh_client_key_api.xml
index b9b1ec4efa..f3d05a8980 100644
--- a/lib/ssh/doc/src/ssh_client_key_api.xml
+++ b/lib/ssh/doc/src/ssh_client_key_api.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -41,12 +41,14 @@
 
     <p>Type definitions that are used more than once in this module
     and/or abstractions to indicate the intended use of the data
-    type:</p>
+    type. For more details on public key data types 
+    see the <seealso marker="public_key:public_key_records"> public_key user's guide.</seealso>
+    </p>
 
     <p> boolean() = true | false</p>
     <p> string() =  [byte()] </p>
     <p> public_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
-    <p> private_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
+    <p> private_key() =  #'RSAPrivateKey'{} | #'DSAPrivateKey'{} | term()</p>
     <p> public_key_algorithm() =  'ssh-rsa'| 'ssh-dss' | atom()</p>
 
   </section>
diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml
index efd4865a6f..72e7252536 100644
--- a/lib/ssh/doc/src/ssh_connection.xml
+++ b/lib/ssh/doc/src/ssh_connection.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/ssh/doc/src/ssh_protocol.xml b/lib/ssh/doc/src/ssh_protocol.xml
index 28f42f5707..7288266cf7 100644
--- a/lib/ssh/doc/src/ssh_protocol.xml
+++ b/lib/ssh/doc/src/ssh_protocol.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 <!-- %EricssonCopyright% -->
 <chapter>
   <header>
     <copyright>
-      <year>2013</year>
+      <year>2013</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml
index c4562e1211..f7133e4ba5 100644
--- a/lib/ssh/doc/src/ssh_server_key_api.xml
+++ b/lib/ssh/doc/src/ssh_server_key_api.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -29,7 +29,7 @@
     -behaviour(ssh_server_key_api).
   </modulesummary>
   <description>
-    <p>  Behaviour describing the API for an SSH server's public key handling.By implementing the callbacks defined
+    <p>  Behaviour describing the API for an SSH server's public key handling. By implementing the callbacks defined
     in this behavior it is possible to customize the SSH server's public key
     handling. By default the SSH application implements this behavior
     with help of the standard openssh files, see <seealso marker="SSH_app"> ssh(6)</seealso>.</p>
@@ -40,13 +40,15 @@
 
     <p>Type definitions that are used more than once in this module
     and/or abstractions to indicate the intended use of the data
-    type:</p>
+    type. For more details on public key data types 
+    see the <seealso marker="public_key:public_key_records"> public_key user's guide.</seealso>
+    </p>
 
     <p> boolean() = true | false</p>
     <p> string() = [byte()]</p>
-    <p> public_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
-    <p> private_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
-    <p> public_key_algorithm() =  'ssh-rsa'| 'ssh-dss' | atom()</p>
+    <p> public_key() =  #'RSAPublicKey'{} | {integer(),  #'Dss-Parms'{}} | term()</p>
+    <p> private_key() =  #'RSAPrivateKey'{} | #'DSAPrivateKey'{} | term()</p>
+    <p> public_key_algorithm() =  'ssh-rsa' | 'ssh-dss' | atom()</p>
   </section>
 
   <funcs>
@@ -56,7 +58,7 @@
       <fsummary>Fetches the hosts private key </fsummary>
       <type>
 	<v>Algorithm = public_key_algorithm()</v>
-	<d> Host key algorithm. Should support 'ssh-rsa'| 'ssh-dss' but additional algorithms
+	<d> Host key algorithm. Should support 'ssh-rsa' | 'ssh-dss' but additional algorithms
 	can be handled.</d>
 	<v> DaemonOptions = proplists:proplist() </v>
 	<d>Options provided to  <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso></d>
diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml
index 0d61e57edb..e55d092fe2 100644
--- a/lib/ssh/doc/src/ssh_sftp.xml
+++ b/lib/ssh/doc/src/ssh_sftp.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2005</year><year>2012</year>
+      <year>2005</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/ssh_sftpd.xml b/lib/ssh/doc/src/ssh_sftpd.xml
index a73d6e52d4..81c2acc575 100644
--- a/lib/ssh/doc/src/ssh_sftpd.xml
+++ b/lib/ssh/doc/src/ssh_sftpd.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/ssh/doc/src/usersguide.xml b/lib/ssh/doc/src/usersguide.xml
index c818003090..8ab14c2945 100644
--- a/lib/ssh/doc/src/usersguide.xml
+++ b/lib/ssh/doc/src/usersguide.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2012</year>
+      <year>2012</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssh/doc/src/using_ssh.xml b/lib/ssh/doc/src/using_ssh.xml
index c994c1c56c..4d73366f5e 100644
--- a/lib/ssh/doc/src/using_ssh.xml
+++ b/lib/ssh/doc/src/using_ssh.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
index 93d0b54f57..2ef2859fd7 100644
--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
@@ -53,7 +53,6 @@ MODULES= \
 	ssh_connection_sup \
 	ssh_connection \
 	ssh_connection_handler \
-	ssh_connection_manager \
 	ssh_shell \
 	ssh_system_sup \
 	ssh_subsystem_sup \
@@ -67,12 +66,12 @@ MODULES= \
 	ssh_file \
 	ssh_io \
 	ssh_math \
+	ssh_message \
 	ssh_no_io \
 	ssh_sftp \
 	ssh_sftpd \
 	ssh_sftpd_file\
 	ssh_transport \
-	ssh_userreg \
 	ssh_xfer
 
 PUBLIC_HRL_FILES= ssh.hrl ssh_userauth.hrl ssh_xfer.hrl
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 49707f3378..74d7293be0 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -8,6 +8,7 @@
 	     ssh_acceptor,
 	     ssh_acceptor_sup,
 	     ssh_auth,
+	     ssh_message,
 	     ssh_bits,
 	     ssh_cli,
              ssh_client_key_api,
@@ -15,7 +16,6 @@
 	     ssh_channel_sup,
 	     ssh_connection,
 	     ssh_connection_handler,
-	     ssh_connection_manager,
 	     ssh_connection_sup,
 	     ssh_daemon_channel,
 	     ssh_shell,
@@ -34,7 +34,6 @@
 	     ssh_sup,
 	     ssh_system_sup,
 	     ssh_transport,
-	     ssh_userreg,
 	     ssh_xfer]},
   {registered, []},
   {applications, [kernel, stdlib, crypto, public_key]},
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 32f7cc470b..df34a5a3ff 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2014. All Rights Reserved.
 %%
 %% The 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,13 +19,13 @@
 
 {"%VSN%",	
  [
-  {<<"2.1\\.*">>, [{restart_application, ssh}]},
-  {<<"2.0\\.*">>, [{restart_application, ssh}]},
-  {<<"1\\.*">>, [{restart_application, ssh}]}
+  {<<"2\\.1\\..*">>, [{restart_application, ssh}]},
+  {<<"2\\.0\\..*">>, [{restart_application, ssh}]},
+  {<<"1\\..*">>, [{restart_application, ssh}]}
  ],
  [
-  {<<"2.1\\.*">>,[{restart_application, ssh}]},
-  {<<"2.0\\.*">>, [{restart_application, ssh}]},
-  {<<"1\\.*">>, [{restart_application, ssh}]}
+  {<<"2\\.1\\..*">>,[{restart_application, ssh}]},
+  {<<"2\\.0\\..*">>, [{restart_application, ssh}]},
+  {<<"1\\..*">>, [{restart_application, ssh}]}
  ]
 }.
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 7d5478c3f6..d50d5a0cb3 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -32,9 +32,8 @@
 	 shell/1, shell/2, shell/3]).
 
 %%--------------------------------------------------------------------
-%% Function: start([, Type]) -> ok
-%%
-%%  Type =  permanent | transient | temporary
+-spec start() -> ok | {error, term()}.
+-spec start(permanent | transient | temporary) -> ok | {error, term()}.
 %%
 %% Description: Starts the ssh application. Default type
 %% is temporary. see application(3)
@@ -52,7 +51,7 @@ start(Type) ->
     application:start(ssh, Type).
 
 %%--------------------------------------------------------------------
-%% Function: stop() -> ok
+-spec stop() -> ok | {error, term()}.
 %%
 %% Description: Stops the ssh application.
 %%--------------------------------------------------------------------
@@ -60,13 +59,8 @@ stop() ->
     application:stop(ssh).
 
 %%--------------------------------------------------------------------
-%% Function: connect(Host, Port, Options) -> 
-%%           connect(Host, Port, Options, Timeout -> ConnectionRef | {error, Reason}
-%% 
-%%	Host - string()
-%%	Port - integer()
-%%	Options - [{Option, Value}]
-%%      Timeout - infinity | integer().
+-spec connect(string(), integer(), proplists:proplist()) -> {ok, pid()} |  {error, term()}.
+-spec connect(string(), integer(), proplists:proplist(), timeout()) -> {ok, pid()} |  {error, term()}.
 %%
 %% Description: Starts an ssh connection.
 %%--------------------------------------------------------------------
@@ -77,83 +71,52 @@ connect(Host, Port, Options, Timeout) ->
 	{error, _Reason} = Error ->
 	    Error;
 	{SocketOptions, SshOptions} ->
-	    DisableIpv6 =  proplists:get_value(ipv6_disabled, SshOptions, false),
-	    Inet = inetopt(DisableIpv6),
-	    do_connect(Host, Port, [Inet | SocketOptions], 
-		       [{user_pid, self()}, {host, Host} | fix_idle_time(SshOptions)], Timeout, DisableIpv6)
+	    {_, Transport, _} = TransportOpts =
+		proplists:get_value(transport, Options, {tcp, gen_tcp, tcp_closed}),
+	    Inet = proplists:get_value(inet, SshOptions, inet),
+	    try Transport:connect(Host, Port,  [ {active, false}, Inet | SocketOptions], Timeout) of
+		{ok, Socket} ->
+		    Opts =  [{user_pid, self()}, {host, Host} | fix_idle_time(SshOptions)],
+		    ssh_connection_handler:start_connection(client, Socket, Opts, Timeout);
+		{error, Reason} ->
+		    {error, Reason}
+	    catch
+		exit:{function_clause, _} ->
+		    {error, {options, {transport, TransportOpts}}};
+		exit:badarg ->
+		    {error, {options, {socket_options, SocketOptions}}}
+	    end
     end.
 
-do_connect(Host, Port, SocketOptions, SshOptions, Timeout, DisableIpv6) ->
-    try sshc_sup:start_child([[{address, Host}, {port, Port}, 
-			       {role, client},
-			       {channel_pid, self()},
-			       {socket_opts, SocketOptions}, 
-			       {ssh_opts, SshOptions}]]) of 
- 	{ok, ConnectionSup} ->
-	    {ok, Manager} = 
-		ssh_connection_sup:connection_manager(ConnectionSup),
-	    msg_loop(Manager, DisableIpv6, Host, Port, SocketOptions, SshOptions, Timeout)
-    catch 
-	exit:{noproc, _} ->
- 	    {error, ssh_not_started}
-    end.
-msg_loop(Manager, DisableIpv6, Host, Port, SocketOptions, SshOptions, Timeout) ->
-    receive 
-	{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
+-spec close(pid()) -> ok.
 %%
 %% Description: Closes an ssh connection.
 %%--------------------------------------------------------------------	
 close(ConnectionRef) ->
-    ssh_connection_manager:stop(ConnectionRef).
+    ssh_connection_handler:stop(ConnectionRef).
 
 %%--------------------------------------------------------------------
-%% Function: connection_info(ConnectionRef) -> [{Option, Value}]
+-spec connection_info(pid(), [atom()]) -> [{atom(), term()}].
 %%
 %% Description: Retrieves information about a connection. 
 %%--------------------------------------------------------------------	
 connection_info(ConnectionRef, Options) ->
-    ssh_connection_manager:connection_info(ConnectionRef, Options).
+    ssh_connection_handler:connection_info(ConnectionRef, Options).
 
 %%--------------------------------------------------------------------
-%% Function: channel_info(ConnectionRef) -> [{Option, Value}]
+-spec channel_info(pid(), channel_id(), [atom()]) -> [{atom(), term()}].
 %%
 %% Description: Retrieves information about a connection. 
 %%--------------------------------------------------------------------	
 channel_info(ConnectionRef, ChannelId, Options) ->
-    ssh_connection_manager:channel_info(ConnectionRef, ChannelId, Options).
+    ssh_connection_handler:channel_info(ConnectionRef, ChannelId, Options).
 
 %%--------------------------------------------------------------------
-%% Function: daemon(Port) ->
-%%           daemon(Port, Options) ->
-%%           daemon(Address, Port, Options) -> SshSystemRef
-%%
+-spec daemon(integer()) -> {ok, pid()}.
+-spec daemon(integer(), proplists:proplist()) -> {ok, pid()}.
+-spec daemon(any | inet:ip_address(), integer(), proplists:proplist()) -> {ok, pid()}.
+
 %% Description: Starts a server listening for SSH connections 
 %% on the given port.
 %%--------------------------------------------------------------------	
@@ -170,11 +133,11 @@ daemon(HostAddr, Port, Options0) ->
 		   _ ->
 		       Options0
 	       end,
-    DisableIpv6 =  proplists:get_value(ipv6_disabled, Options0, false),
+
     {Host, Inet, Options} = case HostAddr of
 				any ->
 				    {ok, Host0} = inet:gethostname(), 
-				    {Host0, inetopt(DisableIpv6), Options1};
+				    {Host0,  proplists:get_value(inet, Options1, inet), Options1};
 				{_,_,_,_} ->
 				    {HostAddr, inet, 
 				     [{ip, HostAddr} | Options1]};
@@ -185,9 +148,8 @@ daemon(HostAddr, Port, Options0) ->
     start_daemon(Host, Port, Options, Inet).
 
 %%--------------------------------------------------------------------
-%% Function: stop_listener(SysRef) -> ok
-%%           stop_listener(Address, Port) -> ok
-%%
+-spec stop_listener(pid()) -> ok.
+-spec stop_listener(inet:ip_address(), integer()) -> ok.
 %%
 %% Description: Stops the listener, but leaves 
 %% existing connections started by the listener up and running.
@@ -198,9 +160,8 @@ stop_listener(Address, Port) ->
     ssh_system_sup:stop_listener(Address, Port).
 
 %%--------------------------------------------------------------------
-%% Function: stop_daemon(SysRef) -> ok
-%%%          stop_daemon(Address, Port) -> ok
-%%
+-spec stop_daemon(pid()) -> ok.
+-spec stop_daemon(inet:ip_address(), integer()) -> ok.
 %%
 %% Description: Stops the listener and all connections started by 
 %% the listener.
@@ -211,9 +172,10 @@ stop_daemon(Address, Port) ->
     ssh_system_sup:stop_system(Address, Port).
 
 %%--------------------------------------------------------------------
-%% Function: shell(Host [,Port,Options]) -> {ok, ConnectionRef} | 
-%%                                                     {error, Reason}
-%%
+-spec shell(string()) ->  _.
+-spec shell(string(), proplists:proplist()) ->  _.
+-spec shell(string(), integer(), proplists:proplist()) ->  _.
+
 %%   Host = string()
 %%   Port = integer()
 %%   Options = [{Option, Value}]
@@ -379,9 +341,9 @@ handle_ssh_option({user_dir, Value} = Opt) when is_list(Value) ->
     Opt;
 handle_ssh_option({user_dir_fun, Value} = Opt) when is_function(Value) ->
     Opt;
-handle_ssh_option({silently_accept_hosts, Value} = Opt) when Value == true; Value == false ->
+handle_ssh_option({silently_accept_hosts, Value} = Opt) when is_boolean(Value) ->
     Opt;
-handle_ssh_option({user_interaction, Value} = Opt) when Value == true; Value == false ->
+handle_ssh_option({user_interaction, Value} = Opt) when is_boolean(Value) ->
     Opt;
 handle_ssh_option({public_key_alg, ssh_dsa}) ->
     {public_key_alg, 'ssh-dss'};
@@ -429,9 +391,8 @@ handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) ->
 handle_ssh_option({failfun, Value} = Opt) when is_function(Value) ->
     Opt;
 
-handle_ssh_option({ipv6_disabled, Value} = Opt) when Value == true;
-						      Value == false ->
-    Opt;
+handle_ssh_option({ipv6_disabled, Value} = Opt) when is_boolean(Value) ->
+    throw({error, {{ipv6_disabled, Opt}, option_no_longer_valid_use_inet_option_instead}});
 handle_ssh_option({transport, {Protocol, Cb, ClosTag}} = Opt) when is_atom(Protocol),
 								   is_atom(Cb),
 								   is_atom(ClosTag) ->
@@ -440,13 +401,14 @@ handle_ssh_option({subsystems, Value} = Opt) when is_list(Value) ->
     Opt;
 handle_ssh_option({ssh_cli, {Cb, _}}= Opt) when is_atom(Cb) ->
     Opt;
+handle_ssh_option({ssh_cli, no_cli} = Opt) ->
+    Opt;
 handle_ssh_option({shell, {Module, Function, _}} = Opt)  when is_atom(Module),
 							      is_atom(Function) ->
     Opt;
 handle_ssh_option({shell, Value} = Opt) when is_function(Value) ->
     Opt;
-handle_ssh_option({quiet_mode, Value} = Opt) when Value == true; 
-						  Value == false -> 
+handle_ssh_option({quiet_mode, Value} = Opt) when is_boolean(Value) ->
     Opt;
 handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 ->
     Opt;
@@ -459,10 +421,8 @@ handle_inet_option({active, _} = Opt) ->
     throw({error, {{eoptions, Opt}, "Ssh has built in flow control, "
 		   "and activ is handled internaly user is not allowd"
 		   "to specify this option"}});
-handle_inet_option({inet, _} = Opt) ->
-    throw({error, {{eoptions, Opt},"Is set internaly use ipv6_disabled to"
-		   " enforce iv4 in the server, client will fallback to ipv4 if"
-		   " it can not use ipv6"}});
+handle_inet_option({inet, Value} = Opt) when (Value == inet) or (Value == inet6) ->
+    Opt;
 handle_inet_option({reuseaddr, _} = Opt) ->
     throw({error, {{eoptions, Opt},"Is set internaly user is not allowd"
 		   "to specify this option"}});
@@ -485,18 +445,3 @@ handle_pref_algs([H|T], Acc) ->
 	_ ->
 	    false
     end.
-%% Has IPv6 been disabled?
-inetopt(true) ->
-    inet;
-inetopt(false) ->
-    case gen_tcp:listen(0, [inet6]) of
-	{ok, Dummyport} ->
-	    gen_tcp:close(Dummyport),
-	    inet6;
-	_ ->
-	    inet
-    end.
-
-%%%
-%% Deprecated
-%%%
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index da5750b6c3..0c4d34f89c 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
 %% The 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,8 @@
 -define(SSH_DEFAULT_PORT, 22).
 -define(SSH_MAX_PACKET_SIZE, (256*1024)).
 -define(SSH_LENGHT_INDICATOR_SIZE, 4).
+-define(REKEY_TIMOUT, 3600000).
+-define(REKEY_DATA_TIMOUT, 60000).
 
 -define(FALSE, 0).
 -define(TRUE,  1).
@@ -52,6 +54,7 @@
 -define(uint32(X), << ?UINT32(X) >> ).
 -define(uint64(X), << ?UINT64(X) >> ).
 -define(string(X), << ?STRING(list_to_binary(X)) >> ).
+-define(string_utf8(X), << ?STRING(unicode:characters_to_binary(X)) >> ).
 -define(binary(X), << ?STRING(X) >>).
 
 -define(SSH_CIPHER_NONE, 0).
@@ -127,7 +130,8 @@
 	  userauth_supported_methods , %  
 	  userauth_methods,
 	  userauth_preference,
-	  available_host_keys
+	  available_host_keys,
+	  authenticated = false
 	 }).
 
 -record(alg,
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index d023656c32..91905b2eaf 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,6 @@
 -export([start_link/5]).
 
 %% spawn export  
-%% TODO: system messages
 -export([acceptor_init/6, acceptor_loop/6]).
 
 -define(SLEEP_TIME, 200).
@@ -81,17 +80,15 @@ acceptor_loop(Callback, Port, Address, Opts, ListenSocket, AcceptTimeout) ->
 				  ListenSocket, AcceptTimeout)
     end.
 
-handle_connection(Callback, Address, Port, Options, Socket) ->
+handle_connection(_Callback, Address, Port, Options, Socket) ->
     SystemSup = ssh_system_sup:system_supervisor(Address, Port),
     {ok, SubSysSup} = ssh_system_sup:start_subsystem(SystemSup, Options),
-    ConnectionSup = ssh_system_sup:connection_supervisor(SystemSup),
-    {ok, Pid} = 
-	ssh_connection_sup:start_manager_child(ConnectionSup,
-					       [server, Socket, Options]),
-    Callback:controlling_process(Socket, Pid),
-    SshOpts = proplists:get_value(ssh_opts, Options),
-    Pid ! {start_connection, server, [Address, Port, Socket, SshOpts, SubSysSup]}.
-
+    ConnectionSup = ssh_subsystem_sup:connection_supervisor(SubSysSup),
+    ssh_connection_handler:start_connection(server, Socket,
+					    [{supervisors, [{system_sup, SystemSup},
+							    {subsystem_sup, SubSysSup},
+							    {connection_sup, ConnectionSup}]}
+					     | Options], infinity).
 handle_error(timeout) ->
     ok;
 
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl
index f37e1fe4ff..2be729d305 100644
--- a/lib/ssh/src/ssh_acceptor_sup.erl
+++ b/lib/ssh/src/ssh_acceptor_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,8 +84,8 @@ child_spec(ServerOpts) ->
 					    [{active, false},
 					     {reuseaddr, true}] ++ SocketOpts, 
 					    ServerOpts, Timeout]},
-    Restart = permanent, 
-    Shutdown = 3600,
+    Restart = transient, 
+    Shutdown = brutal_kill,
     Modules = [ssh_acceptor],
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index cb0c7751f0..409a1db6d5 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,8 +30,7 @@
 -export([publickey_msg/1, password_msg/1, keyboard_interactive_msg/1,
 	 service_request_msg/1, init_userauth_request_msg/1,
 	 userauth_request_msg/1, handle_userauth_request/3,
-	 handle_userauth_info_request/3, handle_userauth_info_response/2,
-	 userauth_messages/0
+	 handle_userauth_info_request/3, handle_userauth_info_response/2
 	]).
 
 %%--------------------------------------------------------------------
@@ -43,7 +42,6 @@ publickey_msg([Alg, #ssh{user = User,
 		       opts = Opts} = Ssh]) ->
 
     Hash = sha, %% Maybe option?!
-    ssh_bits:install_messages(userauth_pk_messages()),
     KeyCb = proplists:get_value(key_cb, Opts, ssh_file),
 
     case KeyCb:user_key(Alg, Opts) of
@@ -69,7 +67,6 @@ publickey_msg([Alg, #ssh{user = User,
 
 password_msg([#ssh{opts = Opts, io_cb = IoCb,
 		   user = User, service = Service} = Ssh]) ->
-    ssh_bits:install_messages(userauth_passwd_messages()),
     Password = case proplists:get_value(password, Opts) of
 		   undefined -> 
 		       user_interaction(IoCb, Ssh);
@@ -86,7 +83,7 @@ password_msg([#ssh{opts = Opts, io_cb = IoCb,
 					method = "password",
 					data =
 					    <<?BOOLEAN(?FALSE),
-					      ?STRING(list_to_binary(Password))>>},
+					      ?STRING(unicode:characters_to_binary(Password))>>},
 	      Ssh)
     end.
 
@@ -99,7 +96,6 @@ user_interaction(IoCb, Ssh) ->
 %% See RFC 4256 for info on keyboard-interactive
 keyboard_interactive_msg([#ssh{user = User,
 			       service = Service} = Ssh]) ->
-    ssh_bits:install_messages(userauth_keyboard_interactive_messages()),
     ssh_transport:ssh_packet(
       #ssh_msg_userauth_request{user = User,
 				service = Service,
@@ -194,8 +190,7 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
 						  data = Data}, _, 
 			#ssh{opts = Opts} = Ssh) ->
     <<_:8, ?UINT32(Sz), BinPwd:Sz/binary>> = Data,
-    Password = binary_to_list(BinPwd),
-    
+    Password = unicode:characters_to_list(BinPwd),
     case check_password(User, Password, Opts) of
 	true ->
 	    {authorized, User,
@@ -239,7 +234,6 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
 			     partial_success = false}, Ssh)}
 	    end;
 	?FALSE ->
-	    ssh_bits:install_messages(userauth_pk_messages()),
 	    {not_authorized, {User, undefined},
 	     ssh_transport:ssh_packet(
 	       #ssh_msg_userauth_pk_ok{algorithm_name = Alg,
@@ -275,26 +269,10 @@ handle_userauth_info_request(
 handle_userauth_info_response(#ssh_msg_userauth_info_response{},
 			      _Auth) ->
     throw(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-			      description = "Server does not support" 
-			      "keyboard-interactive", 
+			      description = "Server does not support"
+			      "keyboard-interactive",
 			      language = "en"}).
-userauth_messages() ->
-    [ {ssh_msg_userauth_request, ?SSH_MSG_USERAUTH_REQUEST,
-       [string, 
-	string, 
-	string, 
-	'...']},
-
-      {ssh_msg_userauth_failure, ?SSH_MSG_USERAUTH_FAILURE,
-       [string, 
-	boolean]},
-
-      {ssh_msg_userauth_success, ?SSH_MSG_USERAUTH_SUCCESS,
-       []},
-
-      {ssh_msg_userauth_banner, ?SSH_MSG_USERAUTH_BANNER,
-       [string, 
-	string]}].
+
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
@@ -373,7 +351,7 @@ verify_sig(SessionId, User, Service, Alg, KeyBlob, SigWLen, Opts) ->
 build_sig_data(SessionId, User, Service, KeyBlob, Alg) ->
     Sig = [?binary(SessionId),
 	   ?SSH_MSG_USERAUTH_REQUEST,
-	   ?string(User),
+	   ?string_utf8(User),
 	   ?string(Service),
 	   ?binary(<<"publickey">>),
 	   ?TRUE,
@@ -386,13 +364,8 @@ algorithm_string('ssh-rsa') ->
 algorithm_string('ssh-dss') ->
      "ssh-dss".
 
-decode_keyboard_interactive_prompts(NumPrompts, Data) ->
-    Types = lists:append(lists:duplicate(NumPrompts, [string, boolean])),
-    pairwise_tuplify(ssh_bits:decode(Data, Types)).
-
-pairwise_tuplify([E1, E2 | Rest]) -> [{E1, E2} | pairwise_tuplify(Rest)];
-pairwise_tuplify([])              -> [].
-    
+decode_keyboard_interactive_prompts(_NumPrompts, Data) ->
+    ssh_message:decode_keyboard_interactive_prompts(Data, []).
 
 keyboard_interact_get_responses(IoCb, Opts, Name, Instr, PromptInfos) ->
     NumPrompts = length(PromptInfos),
@@ -431,50 +404,29 @@ keyboard_interact(IoCb, Name, Instr, Prompts, Opts) ->
 	      end,
 	      Prompts).
 
-userauth_passwd_messages() ->
-    [ 
-      {ssh_msg_userauth_passwd_changereq, ?SSH_MSG_USERAUTH_PASSWD_CHANGEREQ,
-       [string, 
-	string]}
-     ].
-
-userauth_keyboard_interactive_messages() ->
-    [ {ssh_msg_userauth_info_request, ?SSH_MSG_USERAUTH_INFO_REQUEST,
-       [string, 
-	string,
-	string,
-	uint32,
-	'...']},
-
-      {ssh_msg_userauth_info_response, ?SSH_MSG_USERAUTH_INFO_RESPONSE,
-       [uint32, 
-	'...']}
-     ].
-
-userauth_pk_messages() ->
-    [ {ssh_msg_userauth_pk_ok, ?SSH_MSG_USERAUTH_PK_OK,
-       [string, % algorithm name
-	binary]} % key blob
-     ].
-
 other_alg('ssh-rsa') ->
     'ssh-dss';
 other_alg('ssh-dss') ->
     'ssh-rsa'.
-decode_public_key_v2(K_S, "ssh-rsa") ->
-    case ssh_bits:decode(K_S,[string,mpint,mpint]) of
-	["ssh-rsa", E, N] ->
-	    {ok, #'RSAPublicKey'{publicExponent = E, modulus = N}};
-	_ ->
-	    {error, bad_format}
-    end;
-decode_public_key_v2(K_S, "ssh-dss") ->
-     case ssh_bits:decode(K_S,[string,mpint,mpint,mpint,mpint]) of
-	 ["ssh-dss",P,Q,G,Y] ->
-	     {ok, {Y, #'Dss-Parms'{p = P, q = Q, g = G}}};
-	 _ ->
-	     {error, bad_format}
-     end;
+decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary,
+		       ?UINT32(Len1), BinE:Len1/binary,
+		       ?UINT32(Len2), BinN:Len2/binary>>
+			 ,"ssh-rsa") ->
+    E = ssh_bits:erlint(Len1, BinE),
+    N = ssh_bits:erlint(Len2, BinN),
+    {ok, #'RSAPublicKey'{publicExponent = E, modulus = N}};
+decode_public_key_v2(<<?UINT32(Len0), _:Len0/binary,
+		       ?UINT32(Len1), BinP:Len1/binary,
+		       ?UINT32(Len2), BinQ:Len2/binary,
+		       ?UINT32(Len3), BinG:Len3/binary,
+		       ?UINT32(Len4), BinY:Len4/binary>>
+			 , "ssh-dss") ->
+    P = ssh_bits:erlint(Len1, BinP),
+    Q = ssh_bits:erlint(Len2, BinQ),
+    G = ssh_bits:erlint(Len3, BinG),
+    Y = ssh_bits:erlint(Len4, BinY),
+    {ok, {Y, #'Dss-Parms'{p = P, q = Q, g = G}}};
+
 decode_public_key_v2(_, _) ->
     {error, bad_format}.
 
diff --git a/lib/ssh/src/ssh_bits.erl b/lib/ssh/src/ssh_bits.erl
index fc6efc817f..8aaff93b9f 100644
--- a/lib/ssh/src/ssh_bits.erl
+++ b/lib/ssh/src/ssh_bits.erl
@@ -25,19 +25,9 @@
 
 -include("ssh.hrl").
 
--export([encode/1, encode/2]).
--export([decode/1, decode/2, decode/3]).
--export([mpint/1,  bignum/1, string/1, name_list/1]).
--export([b64_encode/1, b64_decode/1]).
--export([install_messages/1, uninstall_messages/1]).
-
-%% integer utils
--export([isize/1]).
+-export([encode/2]).
+-export([mpint/1, erlint/2, string/1, name_list/1]).
 -export([random/1]).
--export([xor_bits/2, fill_bits/2]).
--export([i2bin/2, bin2i/1]).
-
--import(lists, [foreach/2, reverse/1]).
 
 -define(name_list(X), 
 	(fun(B) -> ?binary(B) end)(list_to_binary(name_concat(X)))).
@@ -95,38 +85,6 @@ mpint_pos(X,I,Ds) ->
     mpint_pos(X bsr 8,I+1,[(X band 255)|Ds]).
 
 
-%% BIGNUM representation SSH1
-bignum(X) ->
-    XSz = isize(X),
-    Pad = (8 - (XSz rem 8)) rem 8,
-    <<?UINT16(XSz),0:Pad/unsigned-integer,X:XSz/big-unsigned-integer>>.
-
-
-install_messages(Codes) ->
-    foreach(fun({Name, Code, Ts}) ->
-		    put({msg_name,Code}, {Name,Ts}),
-		    put({msg_code,Name}, {Code,Ts})
-	    end, Codes).
-
-uninstall_messages(Codes) ->
-    foreach(fun({Name, Code, _Ts}) ->
-		    erase({msg_name,Code}),
-		    erase({msg_code,Name})
-	    end, Codes).
-
-%%
-%% Encode a record, the type spec is expected to be 
-%% in process dictionary under the key {msg_code, RecodeName}
-%%
-encode(Record) ->
-    case get({msg_code, element(1, Record)}) of
-	undefined -> 
-	    {error, unimplemented};
-	{Code, Ts} ->
-	    Data = enc(tl(tuple_to_list(Record)), Ts),
-	    list_to_binary([Code, Data])
-    end.
-
 encode(List, Types) ->
     list_to_binary(enc(List, Types)).
 
@@ -136,230 +94,62 @@ encode(List, Types) ->
 enc(Xs, Ts) ->
     enc(Xs, Ts, 0).
 
-enc(Xs, [Type|Ts], Offset) ->
-    case Type of
-	boolean ->
-	    X=hd(Xs), 
-	    [?boolean(X) | enc(tl(Xs), Ts, Offset+1)];
-	byte ->
-	    X=hd(Xs),
-	    [?byte(X) | enc(tl(Xs), Ts,Offset+1)];
-	uint16 ->  
-	    X=hd(Xs),
-	    [?uint16(X) | enc(tl(Xs), Ts,Offset+2)];
-	uint32 ->
-	    X=hd(Xs),
-	    [?uint32(X) | enc(tl(Xs), Ts,Offset+4)];
-	uint64 ->
-	    X=hd(Xs),
-	    [?uint64(X) | enc(tl(Xs), Ts,Offset+8)];
-	mpint ->
-	    Y=mpint(hd(Xs)),
-	    [Y | enc(tl(Xs), Ts,Offset+size(Y))];
-	bignum ->  
-	    Y=bignum(hd(Xs)),
-	    [Y | enc(tl(Xs),Ts,Offset+size(Y))];
-	string ->
-	    X0=hd(Xs),
-	    Y=?string(X0),
-	    [Y | enc(tl(Xs),Ts,Offset+size(Y))];
-	binary ->
-	    X0=hd(Xs),
-	    Y=?binary(X0),
-	    [Y | enc(tl(Xs), Ts,Offset+size(Y))];
-	name_list -> 
-	    X0=hd(Xs),
-	    Y=?name_list(X0),
-	    [Y | enc(tl(Xs), Ts, Offset+size(Y))];
-	cookie -> 
-	    [random(16) | enc(tl(Xs), Ts, Offset+16)];
-	{pad,N} ->
-	    K = (N - (Offset rem N)) rem N,
-	    [fill_bits(K,0) | enc(Xs, Ts, Offset+K)];
-	'...' when Ts==[] ->
-	    X=hd(Xs),
-	    if is_binary(X) -> 
-		    [X];
-	       is_list(X) ->
-		    [list_to_binary(X)];
-	       X==undefined ->
-		    []
-	    end
+enc(Xs, [boolean|Ts], Offset) ->
+    X = hd(Xs),
+    [?boolean(X) | enc(tl(Xs), Ts, Offset+1)];
+enc(Xs, [byte|Ts], Offset) ->
+    X = hd(Xs),
+    [?byte(X) | enc(tl(Xs), Ts,Offset+1)];
+enc(Xs, [uint16|Ts], Offset) ->
+    X = hd(Xs),
+    [?uint16(X) | enc(tl(Xs), Ts,Offset+2)];
+enc(Xs, [uint32 |Ts], Offset) ->
+    X = hd(Xs),
+    [?uint32(X) | enc(tl(Xs), Ts,Offset+4)];
+enc(Xs, [uint64|Ts], Offset) ->
+    X = hd(Xs),
+    [?uint64(X) | enc(tl(Xs), Ts,Offset+8)];
+enc(Xs, [mpint|Ts], Offset) ->
+    Y = mpint(hd(Xs)),
+    [Y | enc(tl(Xs), Ts,Offset+size(Y))];
+enc(Xs, [string|Ts], Offset) ->
+    X0 = hd(Xs),
+    Y = ?string(X0),
+    [Y | enc(tl(Xs),Ts,Offset+size(Y))];
+enc(Xs, [string_utf8|Ts], Offset) ->
+    X0 = hd(Xs),
+    Y = ?string_utf8(X0),
+    [Y | enc(tl(Xs),Ts,Offset+size(Y))];
+enc(Xs, [binary|Ts], Offset) ->
+     X0 = hd(Xs),
+    Y = ?binary(X0),
+    [Y | enc(tl(Xs), Ts,Offset+size(Y))];
+enc(Xs, [name_list|Ts], Offset) ->
+    X0 = hd(Xs),
+    Y = ?name_list(X0),
+    [Y | enc(tl(Xs), Ts, Offset+size(Y))];
+enc(Xs, [cookie|Ts], Offset) ->
+    [random(16) | enc(tl(Xs), Ts, Offset+16)];
+enc(Xs, [{pad,N}|Ts], Offset) ->
+    K = (N - (Offset rem N)) rem N,
+    [fill_bits(K,0) | enc(Xs, Ts, Offset+K)];
+enc(Xs, ['...'| []], _Offset) ->
+    X = hd(Xs),
+    if is_binary(X) ->
+	    [X];
+       is_list(X) ->
+	    [list_to_binary(X)];
+       X==undefined ->
+	    []
     end;
 enc([], [],_) ->
     [].
 
-
-
-%%
-%% Decode a SSH record the type is encoded as the first byte
-%% and the type spec MUST be installed in {msg_name, ID}
-%%
-
-decode(Binary = <<?BYTE(ID), _/binary>>) ->
-    case get({msg_name, ID}) of
-	undefined -> 
-	    {unknown, Binary};
-	{Name, Ts} ->
-	    {_, Elems} = decode(Binary,1,Ts),
-	    list_to_tuple([Name | Elems])
-    end.
-
-%%
-%% Decode a binary form offset 0
-%%
-
-decode(Binary, Types) when is_binary(Binary) andalso is_list(Types) ->
-    {_,Elems} = decode(Binary, 0, Types),
-    Elems.
-
-
-%%
-%% Decode a binary from byte offset Offset
-%% return {UpdatedOffset, DecodedElements}
-%%
-decode(Binary, Offset, Types) ->
-    decode(Binary, Offset, Types, []).
-
-decode(Binary, Offset, [Type|Ts], Acc) ->
-    case Type of
-	boolean ->
-	    <<_:Offset/binary, ?BOOLEAN(X0), _/binary>> = Binary,
-	    X = if X0 == 0 -> false; true -> true end,
-	    decode(Binary, Offset+1, Ts, [X | Acc]);
-
-	byte ->
-	    <<_:Offset/binary, ?BYTE(X), _/binary>> = Binary,
-	    decode(Binary, Offset+1, Ts, [X | Acc]);
-
-	uint16 ->
-	    <<_:Offset/binary, ?UINT16(X), _/binary>> = Binary,
-	    decode(Binary, Offset+2, Ts, [X | Acc]);
-
-	uint32 ->
-	    <<_:Offset/binary, ?UINT32(X), _/binary>> = Binary,
-	    decode(Binary, Offset+4, Ts, [X | Acc]);
-
-	uint64 ->
-	    <<_:Offset/binary, ?UINT64(X), _/binary>> = Binary,
-	    decode(Binary, Offset+8, Ts, [X | Acc]);
-
-	mpint ->
-	    <<_:Offset/binary, ?UINT32(L), X0:L/binary,_/binary>> = Binary,
-	    Sz = L*8,
-	    <<X:Sz/big-signed-integer>> = X0,
-	    decode(Binary, Offset+4+L, Ts, [X | Acc]);
-
-	bignum ->
-	    <<_:Offset/binary, ?UINT16(Bits),_/binary>> = Binary,
-	    L = (Bits+7) div 8,
-	    Pad = (8 - (Bits rem 8)) rem 8,
-	    <<_:Offset/binary, _:16, _:Pad, X:Bits/big-unsigned-integer,
-	     _/binary>> = Binary,
-	    decode(Binary, Offset+2+L, Ts, [X | Acc]);
-
-	string ->
-	    Size = size(Binary),
-	    if Size < Offset + 4  ->
-		    %% empty string at end
-		    {Size, reverse(["" | Acc])};
-	       true ->
-		    <<_:Offset/binary,?UINT32(L), X:L/binary,_/binary>> =
-			Binary,
-		    decode(Binary, Offset+4+L, Ts, [binary_to_list(X) | 
-						    Acc])
-	    end;
-
-	binary ->
-	    <<_:Offset/binary,?UINT32(L), X:L/binary,_/binary>> = Binary,
-	    decode(Binary, Offset+4+L, Ts, [X | Acc]);
-
-	name_list ->
-	    <<_:Offset/binary,?UINT32(L), X:L/binary,_/binary>> = Binary,
-	    List = string:tokens(binary_to_list(X), ","),
-	    decode(Binary, Offset+4+L, Ts, [List | Acc]);
-
-	cookie ->
-	    <<_:Offset/binary, X:16/binary, _/binary>> = Binary,
-	    decode(Binary, Offset+16, Ts, [X | Acc]);
-
-	{pad,N} -> %% pad offset to a multiple of N
-	    K = (N - (Offset rem N)) rem N,
-	    decode(Binary, Offset+K, Ts, Acc);
-	    
+erlint(Len, BinInt) ->
+    Sz = Len*8,
+    <<Int:Sz/big-signed-integer>> = BinInt,
+    Int.
 	
-	'...' when Ts==[] ->
-	    <<_:Offset/binary, X/binary>> = Binary,
-	    {Offset+size(X), reverse([X | Acc])}
-    end;
-decode(_Binary, Offset, [], Acc) ->
-    {Offset, reverse(Acc)}.
-
-
-
-%% HACK WARNING :-)
--define(VERSION_MAGIC, 131).
--define(SMALL_INTEGER_EXT, $a).
--define(INTEGER_EXT,       $b).
--define(SMALL_BIG_EXT,     $n).
--define(LARGE_BIG_EXT,     $o).
-
-isize(N) when N > 0 ->
-    case term_to_binary(N) of
-	<<?VERSION_MAGIC, ?SMALL_INTEGER_EXT, X>> ->
-	    isize_byte(X);
-	<<?VERSION_MAGIC, ?INTEGER_EXT, X3,X2,X1,X0>> ->
-	    isize_bytes([X3,X2,X1,X0]);
-	<<?VERSION_MAGIC, ?SMALL_BIG_EXT, S:8/big-unsigned-integer, 0,
-	 Ds:S/binary>> ->
-	    K = S - 1,
-	    <<_:K/binary, Top>> = Ds,
-	    isize_byte(Top)+K*8;
-	<<?VERSION_MAGIC, ?LARGE_BIG_EXT, S:32/big-unsigned-integer, 0,
-	 Ds:S/binary>> ->
-	    K = S - 1,
-	    <<_:K/binary, Top>> = Ds,
-	    isize_byte(Top)+K*8
-    end;
-isize(0) -> 0.
-
-%% big endian byte list
-isize_bytes([0|L]) ->
-    isize_bytes(L);
-isize_bytes([Top|L]) ->
-    isize_byte(Top) + length(L)*8.
-
-%% Well could be improved
-isize_byte(X) ->
-    if X >= 2#10000000 -> 8;
-       X >= 2#1000000 -> 7;
-       X >= 2#100000 -> 6;
-       X >= 2#10000 -> 5;
-       X >= 2#1000 -> 4;
-       X >= 2#100 -> 3;
-       X >= 2#10 -> 2;
-       X >= 2#1 -> 1;
-       true -> 0
-    end.
-
-%% Convert integer into binary 
-%% When XLen is the wanted size in octets of the output
-i2bin(X, XLen) ->
-    XSz = isize(X),
-    Sz = XLen*8,
-    if Sz < XSz -> 
-	    exit(integer_to_large);
-       true ->
-	    (<<X:Sz/big-unsigned-integer>>)
-    end.
-
-%% Convert a binary into an integer
-%%
-bin2i(X) ->
-    Sz = size(X)*8,
-    <<Y:Sz/big-unsigned-integer>> = X,
-    Y.
-
 %%
 %% Create a binary with constant bytes 
 %%
@@ -377,15 +167,6 @@ fill(N,C) ->
 	    [C,Cs,Cs]
     end.
 
-%% xor 2 binaries
-xor_bits(XBits, YBits) ->
-    XSz = size(XBits)*8,
-    YSz = size(YBits)*8,
-    Sz = if XSz < YSz -> XSz; true -> YSz end, %% min
-    <<X:Sz, _/binary>> = XBits,
-    <<Y:Sz, _/binary>> = YBits,
-    <<(X bxor Y):Sz>>.
-
 
 %% random/1
 %%   Generate N random bytes
@@ -393,18 +174,5 @@ xor_bits(XBits, YBits) ->
 random(N) ->
     crypto:strong_rand_bytes(N).
 
-%%
-%% Base 64 encode/decode
-%%
-
-b64_encode(Bs) when is_list(Bs) -> 
-    base64:encode(Bs);    
-b64_encode(Bin) when is_binary(Bin) ->
-    base64:encode(Bin).
-
-b64_decode(Bin) when is_binary(Bin) -> 
-    base64:mime_decode(Bin);
-b64_decode(Cs) when is_list(Cs) -> 
-    base64:mime_decode(Cs).
 
 
diff --git a/lib/ssh/src/ssh_channel.erl b/lib/ssh/src/ssh_channel.erl
index 062ed764ca..508ae637cf 100644
--- a/lib/ssh/src/ssh_channel.erl
+++ b/lib/ssh/src/ssh_channel.erl
@@ -284,7 +284,7 @@ handle_info(Msg, #state{cm = ConnectionManager, channel_cb = Module,
 terminate(Reason, #state{cm = ConnectionManager, 
  			 channel_id = ChannelId,
  			 close_sent = false} = State) ->
-    ssh_connection:close(ConnectionManager, ChannelId),
+    catch ssh_connection:close(ConnectionManager, ChannelId),
     terminate(Reason, State#state{close_sent = true});
 terminate(_, #state{channel_cb = Cb, channel_state = ChannelState}) ->
     catch Cb:terminate(Cb, ChannelState),
diff --git a/lib/ssh/src/ssh_channel_sup.erl b/lib/ssh/src/ssh_channel_sup.erl
index 0093bce9c2..ee37ed35f8 100644
--- a/lib/ssh/src/ssh_channel_sup.erl
+++ b/lib/ssh/src/ssh_channel_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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 @@
 -export([init/1]).
 
 %%%=========================================================================
-%%%  API
+%%%  Internal API
 %%%=========================================================================
 start_link(Args) ->
     supervisor:start_link(?MODULE, [Args]).
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index 69b1ab186f..77453e8fd7 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -32,9 +32,6 @@
 %% ssh_channel callbacks
 -export([init/1, handle_ssh_msg/2, handle_msg/2, terminate/2]).
 
-%% backwards compatibility
--export([listen/1, listen/2, listen/3, listen/4, stop/1]).
-
 %% state
 -record(state, {
 	  cm,
@@ -65,13 +62,14 @@ init([Shell]) ->
 %%                        
 %% Description: Handles channel messages received on the ssh-connection.
 %%--------------------------------------------------------------------
-handle_ssh_msg({ssh_cm, _ConnectionManager, 
+handle_ssh_msg({ssh_cm, _ConnectionHandler,
 		{data, _ChannelId, _Type, Data}}, 
 	       #state{group = Group} = State) ->
-    Group ! {self(), {data, binary_to_list(Data)}},
+    List = binary_to_list(Data),
+    to_group(List, Group),
     {ok, State};
 
-handle_ssh_msg({ssh_cm, ConnectionManager, 
+handle_ssh_msg({ssh_cm, ConnectionHandler,
 		{pty, ChannelId, WantReply, 
 		 {TermName, Width, Height, PixWidth, PixHeight, Modes}}}, 
 	       State0) ->
@@ -84,53 +82,53 @@ handle_ssh_msg({ssh_cm, ConnectionManager,
                   modes = Modes},
              buf = empty_buf()},
     set_echo(State),
-    ssh_connection:reply_request(ConnectionManager, WantReply, 
+    ssh_connection:reply_request(ConnectionHandler, WantReply,
 				 success, ChannelId),
     {ok, State};
 
-handle_ssh_msg({ssh_cm, ConnectionManager, 
+handle_ssh_msg({ssh_cm, ConnectionHandler,
 	    {env, ChannelId, WantReply, _Var, _Value}}, State) ->
-    ssh_connection:reply_request(ConnectionManager, 
+    ssh_connection:reply_request(ConnectionHandler,
 				 WantReply, failure, ChannelId),
     {ok, State};
 
-handle_ssh_msg({ssh_cm, ConnectionManager,
+handle_ssh_msg({ssh_cm, ConnectionHandler,
 	    {window_change, ChannelId, Width, Height, PixWidth, PixHeight}},
 	   #state{buf = Buf, pty = Pty0} = State) ->
     Pty = Pty0#ssh_pty{width = Width, height = Height,
 		       pixel_width = PixWidth,
 		       pixel_height = PixHeight},
     {Chars, NewBuf} = io_request({window_change, Pty0}, Buf, Pty),
-    write_chars(ConnectionManager, ChannelId, Chars),
+    write_chars(ConnectionHandler, ChannelId, Chars),
     {ok, State#state{pty = Pty, buf = NewBuf}};
 
-handle_ssh_msg({ssh_cm, ConnectionManager, 
+handle_ssh_msg({ssh_cm, ConnectionHandler,
 	    {shell, ChannelId, WantReply}}, State) ->
-    NewState = start_shell(ConnectionManager, State),
-    ssh_connection:reply_request(ConnectionManager, WantReply, 
+    NewState = start_shell(ConnectionHandler, State),
+    ssh_connection:reply_request(ConnectionHandler, WantReply,
 				 success, ChannelId),
     {ok, NewState#state{channel = ChannelId,
-			cm = ConnectionManager}};
+			cm = ConnectionHandler}};
 
-handle_ssh_msg({ssh_cm, ConnectionManager, 
+handle_ssh_msg({ssh_cm, ConnectionHandler,
 		{exec, ChannelId, WantReply, Cmd}}, #state{exec=undefined} = State) ->
     {Reply, Status} = exec(Cmd),
-    write_chars(ConnectionManager, 
+    write_chars(ConnectionHandler,
 		ChannelId, io_lib:format("~p\n", [Reply])),
-    ssh_connection:reply_request(ConnectionManager, WantReply, 
+    ssh_connection:reply_request(ConnectionHandler, WantReply,
 				 success, ChannelId),
-    ssh_connection:exit_status(ConnectionManager, ChannelId, Status),
-    ssh_connection:send_eof(ConnectionManager, ChannelId),
-    {stop, ChannelId, State#state{channel = ChannelId, cm = ConnectionManager}};
-handle_ssh_msg({ssh_cm, ConnectionManager,
+    ssh_connection:exit_status(ConnectionHandler, ChannelId, Status),
+    ssh_connection:send_eof(ConnectionHandler, ChannelId),
+    {stop, ChannelId, State#state{channel = ChannelId, cm = ConnectionHandler}};
+handle_ssh_msg({ssh_cm, ConnectionHandler,
 		{exec, ChannelId, WantReply, Cmd}}, State) ->
-    NewState = start_shell(ConnectionManager, Cmd, State),
-    ssh_connection:reply_request(ConnectionManager, WantReply,
+    NewState = start_shell(ConnectionHandler, Cmd, State),
+    ssh_connection:reply_request(ConnectionHandler, WantReply,
 				 success, ChannelId),
     {ok, NewState#state{channel = ChannelId,
-			cm = ConnectionManager}};
+			cm = ConnectionHandler}};
 
-handle_ssh_msg({ssh_cm, _ConnectionManager, {eof, _ChannelId}}, State) ->
+handle_ssh_msg({ssh_cm, _ConnectionHandler, {eof, _ChannelId}}, State) ->
     {ok, State};
 
 handle_ssh_msg({ssh_cm, _, {signal, _, _}}, State) ->
@@ -158,16 +156,40 @@ handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, Status}}, State) ->
 %%                        
 %% Description: Handles other channel messages.
 %%--------------------------------------------------------------------
-handle_msg({ssh_channel_up, ChannelId, ConnectionManager},
+handle_msg({ssh_channel_up, ChannelId, ConnectionHandler},
 	   #state{channel = ChannelId,
-		  cm = ConnectionManager} = State) ->
+		  cm = ConnectionHandler} = State) ->
     {ok,  State};
 
+handle_msg({Group, set_unicode_state, _Arg}, State) ->
+    Group ! {self(), set_unicode_state, false},
+    {ok, State};
+
+handle_msg({Group, get_unicode_state}, State) ->
+    Group ! {self(), get_unicode_state, false},
+    {ok, State};
+
+handle_msg({Group, tty_geometry}, #state{group = Group,
+					 pty = Pty
+					} = State) ->
+    case Pty of
+	#ssh_pty{width=Width,height=Height} ->
+	    Group ! {self(),tty_geometry,{Width,Height}};
+	_ ->
+	    %% This is a dirty fix of the problem with the otp ssh:shell
+	    %% client. That client will not allocate a tty, but someone
+	    %% asks for the tty_geometry just before every erlang prompt.
+	    %% If that question is not answered, there is a 2 sec timeout
+	    %% Until the prompt is seen by the user at the client side ...
+	    Group ! {self(),tty_geometry,{0,0}}
+    end,
+    {ok,State};
+    
 handle_msg({Group, Req}, #state{group = Group, buf = Buf, pty = Pty,
-				 cm = ConnectionManager,
+				 cm = ConnectionHandler,
 				 channel = ChannelId} = State) ->
     {Chars, NewBuf} = io_request(Req, Buf, Pty),
-    write_chars(ConnectionManager, ChannelId, Chars),
+    write_chars(ConnectionHandler, ChannelId, Chars),
     {ok, State#state{buf = NewBuf}};
 
 handle_msg({'EXIT', Group, _Reason}, #state{group = Group,
@@ -188,6 +210,22 @@ terminate(_Reason, _State) ->
 %%% Internal functions
 %%--------------------------------------------------------------------
 
+to_group([], _Group) ->
+    ok;
+to_group([$\^C | Tail], Group) ->
+    exit(Group, interrupt),
+    to_group(Tail, Group);
+to_group(Data, Group) ->
+    Func = fun(C) -> C /= $\^C end,
+    Tail = case lists:splitwith(Func, Data) of
+        {[], Right} ->
+            Right;
+        {Left, Right} ->
+            Group ! {self(), {data, Left}},
+            Right
+    end,
+    to_group(Tail, Group).
+
 exec(Cmd) ->
     case eval(parse(scan(Cmd))) of
 	{error, _} ->
@@ -320,7 +358,7 @@ delete_chars(N, {Buf, BufTail, Col}, Tty) when N > 0 ->
      {Buf, NewBufTail, Col}};
 delete_chars(N, {Buf, BufTail, Col}, Tty) -> % N < 0
     NewBuf = nthtail(-N, Buf),
-    NewCol = Col + N,
+    NewCol = case Col + N of V when V >= 0 -> V; _ -> 0 end,
     M1 = move_cursor(Col, NewCol, Tty),
     M2 = move_cursor(NewCol + length(BufTail) - N, NewCol, Tty),
     {[M1, BufTail, lists:duplicate(-N, $ ) | M2],
@@ -382,12 +420,12 @@ move_cursor(From, To, #ssh_pty{width=Width, term=Type}) ->
 %% %%% write out characters
 %% %%% make sure that there is data to send
 %% %%% before calling ssh_connection:send
-write_chars(ConnectionManager, ChannelId, Chars) ->
+write_chars(ConnectionHandler, ChannelId, Chars) ->
     case erlang:iolist_size(Chars) of
 	0 ->
 	    ok;
        _ ->
-	    ssh_connection:send(ConnectionManager, ChannelId, 
+	    ssh_connection:send(ConnectionHandler, ChannelId,
 				?SSH_EXTENDED_DATA_DEFAULT, Chars)
     end.
 
@@ -417,18 +455,20 @@ bin_to_list(L) when is_list(L) ->
 bin_to_list(I) when is_integer(I) ->
     I.
 
-start_shell(ConnectionManager, State) ->
+start_shell(ConnectionHandler, State) ->
     Shell = State#state.shell,
+    ConnectionInfo = ssh_connection_handler:info(ConnectionHandler,
+						  [peer, user]),
     ShellFun = case is_function(Shell) of
 		   true ->
 		       {ok, User} = 
-			   ssh_userreg:lookup_user(ConnectionManager),
+			   proplists:get_value(user, ConnectionInfo),
 		       case erlang:fun_info(Shell, arity) of
 			   {arity, 1} ->
 			       fun() -> Shell(User) end;
 			   {arity, 2} ->
-			       {ok, PeerAddr} = 
-				   ssh_connection_manager:peer_addr(ConnectionManager),
+			       [{_, PeerAddr}] =
+				   proplists:get_value(peer, ConnectionInfo),
 			       fun() -> Shell(User, PeerAddr) end;
 			   _ ->
 			       Shell
@@ -440,12 +480,15 @@ start_shell(ConnectionManager, State) ->
     Group = group:start(self(), ShellFun, [{echo, Echo}]),
     State#state{group = Group, buf = empty_buf()}.
 
-start_shell(_ConnectionManager, Cmd, #state{exec={M, F, A}} = State) ->
+start_shell(_ConnectionHandler, Cmd, #state{exec={M, F, A}} = State) ->
     Group = group:start(self(), {M, F, A++[Cmd]}, [{echo, false}]),
     State#state{group = Group, buf = empty_buf()};
-start_shell(ConnectionManager, Cmd, #state{exec=Shell} = State) when is_function(Shell) ->
+start_shell(ConnectionHandler, Cmd, #state{exec=Shell} = State) when is_function(Shell) ->
+
+    ConnectionInfo = ssh_connection_handler:info(ConnectionHandler,
+						 [peer, user]),
     {ok, User} = 
-	ssh_userreg:lookup_user(ConnectionManager),
+	proplists:get_value(user, ConnectionInfo),
     ShellFun = 
 	case erlang:fun_info(Shell, arity) of
 	    {arity, 1} ->
@@ -453,8 +496,8 @@ start_shell(ConnectionManager, Cmd, #state{exec=Shell} = State) when is_function
 	    {arity, 2} ->
 		fun() -> Shell(Cmd, User) end;
 	    {arity, 3} ->
-		{ok, PeerAddr} = 
-		    ssh_connection_manager:peer_addr(ConnectionManager),
+		[{_, PeerAddr}] =
+		    proplists:get_value(peer, ConnectionInfo),
 		fun() -> Shell(Cmd, User, PeerAddr) end;
 	    _ ->
 		Shell
@@ -488,31 +531,3 @@ not_zero(0, B) ->
 not_zero(A, _) -> 
     A.
 
-%%% Backwards compatibility
-	    
-%%--------------------------------------------------------------------
-%% Function: listen(...) -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts a listening server
-%% Note that the pid returned is NOT the pid of this gen_server;
-%% this server is started when an SSH connection is made on the
-%% listening port
-%%--------------------------------------------------------------------
-listen(Shell) ->
-    listen(Shell, 22).
-
-listen(Shell, Port) ->
-    listen(Shell, Port, []).
-
-listen(Shell, Port, Opts) ->
-    listen(Shell, any, Port, Opts).
-
-listen(Shell, HostAddr, Port, Opts) ->
-    ssh:daemon(HostAddr, Port, [{shell, Shell} | Opts]).
-    
-
-%%--------------------------------------------------------------------
-%% Function: stop(Pid) -> ok
-%% Description: Stops the listener
-%%--------------------------------------------------------------------
-stop(Pid) ->
-    ssh:stop_listener(Pid).
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl
index 932b0642f1..8421b07167 100644
--- a/lib/ssh/src/ssh_connect.hrl
+++ b/lib/ssh/src/ssh_connect.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %%
 %% The 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 @@
 
 %%% Description : SSH connection protocol 
 
+-type channel_id()           :: integer().
+
 -define(DEFAULT_PACKET_SIZE, 32768).
 -define(DEFAULT_WINDOW_SIZE, 2*?DEFAULT_PACKET_SIZE).
 -define(DEFAULT_TIMEOUT, 5000).
@@ -260,6 +262,7 @@
 	  port,
 	  options,
 	  exec,
+	  system_supervisor,
 	  sub_system_supervisor,
 	  connection_supervisor
 	 }).
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 9424cdd423..b377614949 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,232 +29,205 @@
 -include("ssh_connect.hrl").
 -include("ssh_transport.hrl").
 
+%% API
 -export([session_channel/2, session_channel/4,
 	 exec/4, shell/2, subsystem/4, send/3, send/4, send/5, 
-	 send_eof/2, adjust_window/3, open_pty/3, open_pty/7,
-	 open_pty/9, setenv/5, window_change/4, window_change/6,
+	 send_eof/2, adjust_window/3, setenv/5, close/2, reply_request/4]).
+
+%% Potential API currently unsupported and not tested
+-export([open_pty/3, open_pty/7,
+	 open_pty/9, window_change/4, window_change/6,
 	 direct_tcpip/6, direct_tcpip/8, tcpip_forward/3,
-	 cancel_tcpip_forward/3, signal/3, exit_status/3, encode_ip/1, close/2,
-	 reply_request/4]).
+	 cancel_tcpip_forward/3, signal/3, exit_status/3]).
 
--export([channel_data/6, handle_msg/4, channel_eof_msg/1,
+%% Internal application API
+-export([channel_data/5, handle_msg/3, channel_eof_msg/1,
 	 channel_close_msg/1, channel_success_msg/1, channel_failure_msg/1, 
+	 channel_status_msg/1,
 	 channel_adjust_window_msg/2, channel_data_msg/3,
 	 channel_open_msg/5, channel_open_confirmation_msg/4,
 	 channel_open_failure_msg/4, channel_request_msg/4,
 	 global_request_msg/3, request_failure_msg/0, 
 	 request_success_msg/1, bind/4, unbind/3, unbind_channel/2, 
-	 bound_channel/3, messages/0]).
+	 bound_channel/3, encode_ip/1]).
 
 %%--------------------------------------------------------------------
-%%% Internal application API
+%%% API
 %%--------------------------------------------------------------------
 
 %%--------------------------------------------------------------------
-%% Function: session_channel(ConnectionManager 
-%%                           [, InitialWindowSize, MaxPacketSize], 
-%%                           Timeout) -> {ok, }
-%%   ConnectionManager = pid() 
-%%   InitialWindowSize = integer()
-%%   MaxPacketSize = integer() 
-%%
+-spec session_channel(pid(), timeout()) -> {ok, channel_id()} | {error, term()}.
+-spec session_channel(pid(), integer(), integer(), timeout()) -> {ok, channel_id()} | {error, term()}.
+
 %% Description: Opens a channel for a ssh session. A session is a
 %% remote execution of a program. The program may be a shell, an
 %% application, a system command, or some built-in subsystem.
 %% --------------------------------------------------------------------
-session_channel(ConnectionManager, Timeout) ->
-    session_channel(ConnectionManager, 
+
+session_channel(ConnectionHandler, Timeout) ->
+    session_channel(ConnectionHandler,
  		    ?DEFAULT_WINDOW_SIZE, ?DEFAULT_PACKET_SIZE,
  		    Timeout).
-session_channel(ConnectionManager, InitialWindowSize, 
+
+session_channel(ConnectionHandler, InitialWindowSize,
  		MaxPacketSize, Timeout) ->
-    ssh_connection_manager:open_channel(ConnectionManager, "session", <<>>,
+    case ssh_connection_handler:open_channel(ConnectionHandler, "session", <<>>,
 					InitialWindowSize,
- 					MaxPacketSize, Timeout).
+					MaxPacketSize, Timeout) of
+	{open, Channel} ->
+	    {ok, Channel};
+	Error ->
+	    Error
+    end.
+
 %%--------------------------------------------------------------------
-%% Function: exec(ConnectionManager, ChannelId, Command, Timeout) -> 
-%%
-%%   ConnectionManager = pid() 
-%%   ChannelId = integer()
-%%   Cmd = string()
-%%   Timeout = integer() 
-%%
+-spec exec(pid(), channel_id(), string(), timeout()) -> success | failure.
+
 %% Description: Will request that the server start the
 %% execution of the given command. 
 %%--------------------------------------------------------------------
-exec(ConnectionManager, ChannelId, Command, TimeOut) ->
-    ssh_connection_manager:request(ConnectionManager, self(), ChannelId, "exec", 
- 				   true, [?string(Command)], TimeOut).
+exec(ConnectionHandler, ChannelId, Command, TimeOut) ->
+    ssh_connection_handler:request(ConnectionHandler, self(), ChannelId, "exec",
+				   true, [?string(Command)], TimeOut).
+
 %%--------------------------------------------------------------------
-%% Function: shell(ConnectionManager, ChannelId) -> 
-%%
-%%   ConnectionManager = pid() 
-%%   ChannelId = integer()
-%%
+-spec shell(pid(), channel_id()) -> _.
+
 %% Description: Will request that the user's default shell (typically
 %% defined in /etc/passwd in UNIX systems) be started at the other
 %% end.
 %%--------------------------------------------------------------------
-shell(ConnectionManager, ChannelId) ->
-    ssh_connection_manager:request(ConnectionManager, self(), ChannelId, 
+shell(ConnectionHandler, ChannelId) ->
+    ssh_connection_handler:request(ConnectionHandler, self(), ChannelId,
  				   "shell", false, <<>>, 0).
 %%--------------------------------------------------------------------
-%% Function: subsystem(ConnectionManager, ChannelId, SubSystem, TimeOut) -> 
-%%
-%% ConnectionManager = pid() 
-%% ChannelId = integer()
-%% SubSystem = string()
-%% TimeOut = integer() 
-%%
+-spec subsystem(pid(), channel_id(), string(), timeout()) ->
+		       success | failure | {error, timeout}.
 %%
 %% Description: Executes a predefined subsystem.
 %%--------------------------------------------------------------------
-subsystem(ConnectionManager, ChannelId, SubSystem, TimeOut) ->
-     ssh_connection_manager:request(ConnectionManager, self(),
+subsystem(ConnectionHandler, ChannelId, SubSystem, TimeOut) ->
+     ssh_connection_handler:request(ConnectionHandler, self(),
 				    ChannelId, "subsystem", 
 				    true, [?string(SubSystem)], TimeOut).
 %%--------------------------------------------------------------------
-%% Function: send(ConnectionManager, ChannelId, Type, Data, [TimeOut]) ->
+-spec send(pid(), channel_id(), iodata()) ->
+		  ok | {error, closed}.
+-spec send(pid(), channel_id(), integer()| iodata(), timeout() | iodata()) ->
+		  ok | {error, timeout} | {error, closed}.
+-spec send(pid(), channel_id(), integer(), iodata(), timeout()) ->
+		  ok | {error, timeout} | {error, closed}.
 %%
 %%
 %% Description: Sends channel data.
 %%--------------------------------------------------------------------
-send(ConnectionManager, ChannelId, Data) ->
-    send(ConnectionManager, ChannelId, 0, Data, infinity).
-send(ConnectionManager, ChannelId, Data, TimeOut) when is_integer(TimeOut) ->
-    send(ConnectionManager, ChannelId, 0, Data, TimeOut);
-send(ConnectionManager, ChannelId, Data, infinity) ->
-    send(ConnectionManager, ChannelId, 0, Data, infinity);
-send(ConnectionManager, ChannelId, Type, Data) ->
-    send(ConnectionManager, ChannelId, Type, Data, infinity).
-send(ConnectionManager, ChannelId, Type, Data, TimeOut) ->
-    ssh_connection_manager:send(ConnectionManager, ChannelId, 
+send(ConnectionHandler, ChannelId, Data) ->
+    send(ConnectionHandler, ChannelId, 0, Data, infinity).
+send(ConnectionHandler, ChannelId, Data, TimeOut) when is_integer(TimeOut) ->
+    send(ConnectionHandler, ChannelId, 0, Data, TimeOut);
+send(ConnectionHandler, ChannelId, Data, infinity) ->
+    send(ConnectionHandler, ChannelId, 0, Data, infinity);
+send(ConnectionHandler, ChannelId, Type, Data) ->
+    send(ConnectionHandler, ChannelId, Type, Data, infinity).
+send(ConnectionHandler, ChannelId, Type, Data, TimeOut) ->
+    ssh_connection_handler:send(ConnectionHandler, ChannelId,
 				Type, Data, TimeOut).
 %%--------------------------------------------------------------------
-%% Function: send_eof(ConnectionManager, ChannelId) ->
+-spec send_eof(pid(), channel_id()) -> ok | {error, closed}.
 %%
 %%
 %% Description: Sends eof on the channel <ChannelId>.
 %%--------------------------------------------------------------------
-send_eof(ConnectionManager, Channel) ->
-    ssh_connection_manager:send_eof(ConnectionManager, Channel).
+send_eof(ConnectionHandler, Channel) ->
+    ssh_connection_handler:send_eof(ConnectionHandler, Channel).
 
 %%--------------------------------------------------------------------
-%% Function: adjust_window(ConnectionManager, Channel, Bytes) -> 
+-spec adjust_window(pid(), channel_id(), integer()) -> ok.
 %%
 %%
 %% Description: Adjusts the ssh flowcontrol window.
 %%--------------------------------------------------------------------
-adjust_window(ConnectionManager, Channel, Bytes) ->
-    ssh_connection_manager:adjust_window(ConnectionManager, Channel, Bytes).
+adjust_window(ConnectionHandler, Channel, Bytes) ->
+    ssh_connection_handler:adjust_window(ConnectionHandler, Channel, Bytes).
 
 %%--------------------------------------------------------------------
-%% Function: setenv(ConnectionManager, ChannelId, Var, Value, TimeOut) ->
+-spec setenv(pid(), channel_id(), string(), string(), timeout()) ->  success | failure.
 %%
 %%
 %% Description: Environment variables may be passed to the shell/command to be
 %% started later.
 %%--------------------------------------------------------------------
-setenv(ConnectionManager, ChannelId, Var, Value, TimeOut) ->
-    ssh_connection_manager:request(ConnectionManager, ChannelId, 
+setenv(ConnectionHandler, ChannelId, Var, Value, TimeOut) ->
+    ssh_connection_handler:request(ConnectionHandler, ChannelId,
 	    "env", true, [?string(Var), ?string(Value)], TimeOut).
 
 
 %%--------------------------------------------------------------------
-%% Function: close(ConnectionManager, ChannelId) ->
+-spec close(pid(), channel_id()) -> ok.
 %%
 %%
 %% Description: Sends a close message on the channel <ChannelId>.
 %%--------------------------------------------------------------------
-close(ConnectionManager, ChannelId) ->
-    ssh_connection_manager:close(ConnectionManager, ChannelId).
-
+close(ConnectionHandler, ChannelId) ->
+    ssh_connection_handler:close(ConnectionHandler, ChannelId).
 
 %%--------------------------------------------------------------------
-%% Function: reply_request(ConnectionManager, WantReply, Status, CannelId) ->_
+-spec reply_request(pid(), boolean(), success | failure, channel_id()) -> ok.
 %%
 %%
 %% Description: Send status replies to requests that want such replies.
 %%--------------------------------------------------------------------
-reply_request(ConnectionManager, true, Status, ChannelId) ->
-    ssh_connection_manager:reply_request(ConnectionManager, Status, ChannelId),
-    ok;
+reply_request(ConnectionHandler, true, Status, ChannelId) ->
+    ssh_connection_handler:reply_request(ConnectionHandler, Status, ChannelId);
 reply_request(_,false, _, _) ->
     ok.
 
-
 %%--------------------------------------------------------------------
-%% Function: window_change(ConnectionManager, Channel, Width, Height) ->
-%%
-%%
-%% Description: Not yet officialy supported.
+%% Not yet officialy supported! The following functions are part of the
+%% initial contributed ssh application. They are untested. Do we want them?
+%% Should they be documented and tested?
 %%--------------------------------------------------------------------
-window_change(ConnectionManager, Channel, Width, Height) ->
-    window_change(ConnectionManager, Channel, Width, Height, 0, 0).
-window_change(ConnectionManager, Channel, Width, Height, 
+window_change(ConnectionHandler, Channel, Width, Height) ->
+    window_change(ConnectionHandler, Channel, Width, Height, 0, 0).
+window_change(ConnectionHandler, Channel, Width, Height,
 	      PixWidth, PixHeight) ->
-    ssh_connection_manager:request(ConnectionManager, Channel, 
+    ssh_connection_handler:request(ConnectionHandler, Channel,
 				   "window-change", false, 
 				   [?uint32(Width), ?uint32(Height),
 				    ?uint32(PixWidth), ?uint32(PixHeight)], 0).
-%%--------------------------------------------------------------------
-%% Function: signal(ConnectionManager, Channel, Sig) ->
-%%
-%%
-%% Description:  Not yet officialy supported.
-%%--------------------------------------------------------------------
-signal(ConnectionManager, Channel, Sig) ->
-    ssh_connection_manager:request(ConnectionManager, Channel, 
+
+signal(ConnectionHandler, Channel, Sig) ->
+    ssh_connection_handler:request(ConnectionHandler, Channel,
 				   "signal", false, [?string(Sig)], 0).
 
-%%--------------------------------------------------------------------
-%% Function: signal(ConnectionManager, Channel, Status) ->
-%%
-%%
-%% Description:  Not yet officialy supported.
-%%--------------------------------------------------------------------
-exit_status(ConnectionManager, Channel, Status) ->
-    ssh_connection_manager:request(ConnectionManager, Channel, 
-				   "exit-status", false, [?uint32(Status)], 0).
 
+exit_status(ConnectionHandler, Channel, Status) ->
+    ssh_connection_handler:request(ConnectionHandler, Channel,
+				   "exit-status", false, [?uint32(Status)], 0).
 
-%%--------------------------------------------------------------------
-%% Function: open_pty(ConnectionManager, Channel, TimeOut) ->
-%%
-%%
-%% Description:  Not yet officialy supported.
-%%--------------------------------------------------------------------
-open_pty(ConnectionManager, Channel, TimeOut) ->
-    open_pty(ConnectionManager, Channel, 
+open_pty(ConnectionHandler, Channel, TimeOut) ->
+    open_pty(ConnectionHandler, Channel,
 	     os:getenv("TERM"), 80, 24, [], TimeOut).
 
-open_pty(ConnectionManager, Channel, Term, Width, Height, PtyOpts, TimeOut) ->
-    open_pty(ConnectionManager, Channel, Term, Width, 
+open_pty(ConnectionHandler, Channel, Term, Width, Height, PtyOpts, TimeOut) ->
+    open_pty(ConnectionHandler, Channel, Term, Width,
 	     Height, 0, 0, PtyOpts, TimeOut).
 
-open_pty(ConnectionManager, Channel, Term, Width, Height, 
+open_pty(ConnectionHandler, Channel, Term, Width, Height,
 	 PixWidth, PixHeight, PtyOpts, TimeOut) ->
-    ssh_connection_manager:request(ConnectionManager, 
+    ssh_connection_handler:request(ConnectionHandler,
 				   Channel, "pty-req", true, 
 				   [?string(Term),
 				    ?uint32(Width), ?uint32(Height),
 				    ?uint32(PixWidth),?uint32(PixHeight),
 				    encode_pty_opts(PtyOpts)], TimeOut).
 
-
-%%--------------------------------------------------------------------
-%% Function: direct_tcpip(ConnectionManager, RemoteHost,  
-%%                        RemotePort, OrigIP, OrigPort, Timeout) ->
-%%
-%%
-%% Description: Not yet officialy supported.
-%%--------------------------------------------------------------------
-direct_tcpip(ConnectionManager, RemoteHost, 
+direct_tcpip(ConnectionHandler, RemoteHost,
 	     RemotePort, OrigIP, OrigPort, Timeout) ->
-    direct_tcpip(ConnectionManager, RemoteHost, RemotePort, OrigIP, OrigPort,
+    direct_tcpip(ConnectionHandler, RemoteHost, RemotePort, OrigIP, OrigPort,
 		 ?DEFAULT_WINDOW_SIZE, ?DEFAULT_PACKET_SIZE, Timeout).
 
-direct_tcpip(ConnectionManager, RemoteIP, RemotePort, OrigIP, OrigPort,
+direct_tcpip(ConnectionHandler, RemoteIP, RemotePort, OrigIP, OrigPort,
 	     InitialWindowSize, MaxPacketSize, Timeout) ->
     case {encode_ip(RemoteIP), encode_ip(OrigIP)} of
 	{false, _} -> 
@@ -262,7 +235,7 @@ direct_tcpip(ConnectionManager, RemoteIP, RemotePort, OrigIP, OrigPort,
 	{_, false} -> 
 	    {error, einval};
 	{RIP, OIP} ->
-	    ssh_connection_manager:open_channel(ConnectionManager,
+	    ssh_connection_handler:open_channel(ConnectionHandler,
 						"direct-tcpip",
 						[?string(RIP), 
 						 ?uint32(RemotePort),
@@ -272,34 +245,24 @@ direct_tcpip(ConnectionManager, RemoteIP, RemotePort, OrigIP, OrigPort,
 						MaxPacketSize,
 						Timeout)
     end.
-%%--------------------------------------------------------------------
-%% Function: tcpip_forward(ConnectionManager, BindIP, BindPort) ->
-%%
-%%
-%% Description: Not yet officialy supported.
-%%--------------------------------------------------------------------
-tcpip_forward(ConnectionManager, BindIP, BindPort) ->
+
+tcpip_forward(ConnectionHandler, BindIP, BindPort) ->
     case encode_ip(BindIP) of
 	false -> 
 	    {error, einval};
 	IPStr ->
-	    ssh_connection_manager:global_request(ConnectionManager, 
+	    ssh_connection_handler:global_request(ConnectionHandler,
 						  "tcpip-forward", true,
 						  [?string(IPStr),
 						   ?uint32(BindPort)])
     end.
-%%--------------------------------------------------------------------
-%% Function: cancel_tcpip_forward(ConnectionManager, BindIP, Port) ->
-%%
-%%
-%% Description: Not yet officialy supported.
-%%--------------------------------------------------------------------
-cancel_tcpip_forward(ConnectionManager, BindIP, Port) ->
+
+cancel_tcpip_forward(ConnectionHandler, BindIP, Port) ->
     case encode_ip(BindIP) of
 	false -> 
 	    {error, einval};
 	IPStr ->
-	    ssh_connection_manager:global_request(ConnectionManager, 
+	    ssh_connection_handler:global_request(ConnectionHandler,
 						  "cancel-tcpip-forward", true,
 						  [?string(IPStr),
 						   ?uint32(Port)])
@@ -308,22 +271,49 @@ cancel_tcpip_forward(ConnectionManager, BindIP, Port) ->
 %%--------------------------------------------------------------------
 %%% Internal API
 %%--------------------------------------------------------------------
-channel_data(ChannelId, DataType, Data, Connection, ConnectionPid, From) 
+l2b(L) when is_integer(hd(L)) ->
+    try list_to_binary(L)
+    of
+	B -> B
+    catch
+	_:_ -> 
+	    unicode:characters_to_binary(L)
+    end;
+l2b([H|T]) -> 
+    << (l2b(H))/binary, (l2b(T))/binary >>;
+l2b(B) when is_binary(B) ->
+    B;
+l2b([]) ->
+    <<>>.
+
+    
+
+channel_data(ChannelId, DataType, Data, Connection, From)
   when is_list(Data)->
     channel_data(ChannelId, DataType, 
-		 list_to_binary(Data), Connection, ConnectionPid, From);
+%%		 list_to_binary(Data), Connection, From);
+		 l2b(Data), Connection, From);
+		 %% try list_to_binary(Data)
+		 %% of
+		 %%     B -> B
+		 %% catch
+		 %%     _:_ -> io:format('BAD BINARY: ~p~n',[Data]),
+		 %% 	    unicode:characters_to_binary(Data)
+		 %% end,
+		 %% Connection, From);
 
 channel_data(ChannelId, DataType, Data, 
-	     #connection{channel_cache = Cache} = Connection, ConnectionPid,
+	     #connection{channel_cache = Cache} = Connection,
 	     From) ->
     
     case ssh_channel:cache_lookup(Cache, ChannelId) of
 	#channel{remote_id = Id, sent_close = false} = Channel0 ->
-	    {SendList, Channel} = update_send_window(Channel0#channel{flow_control = From}, DataType,
-						     Data, Connection),
+	    {SendList, Channel} =
+		update_send_window(Channel0#channel{flow_control = From}, DataType,
+				   Data, Connection),
 	    Replies = 
 		lists:map(fun({SendDataType, SendData}) -> 
-				  {connection_reply, ConnectionPid,
+				  {connection_reply,
 				   channel_data_msg(Id,
 						    SendDataType,
 						    SendData)}
@@ -333,7 +323,7 @@ channel_data(ChannelId, DataType, Data,
 					Cache),
 	    {{replies, Replies ++ FlowCtrlMsgs}, Connection};
 	_ ->
-	    gen_server:reply(From, {error, closed}),
+	    gen_fsm:reply(From, {error, closed}),
 	    {noreply, Connection}
     end.
 
@@ -341,7 +331,7 @@ handle_msg(#ssh_msg_channel_open_confirmation{recipient_channel = ChannelId,
 					      sender_channel = RemoteId,
 					      initial_window_size = WindowSz,
 					      maximum_packet_size = PacketSz}, 
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     
     #channel{remote_id = undefined} = Channel =
 	ssh_channel:cache_lookup(Cache, ChannelId), 
@@ -357,7 +347,7 @@ handle_msg(#ssh_msg_channel_open_failure{recipient_channel = ChannelId,
 					 reason = Reason,
 					 description = Descr,
 					 lang = Lang},  
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     ssh_channel:cache_delete(Cache, ChannelId),
     {Reply, Connection} = 
@@ -365,51 +355,59 @@ handle_msg(#ssh_msg_channel_open_failure{recipient_channel = ChannelId,
     {{replies, [Reply]}, Connection};
 
 handle_msg(#ssh_msg_channel_success{recipient_channel = ChannelId},
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    {Reply, Connection} = reply_msg(Channel, Connection0, success),
-    {{replies, [Reply]}, Connection};
+    case reply_msg(Channel, Connection0, success) of
+	{[], Connection} ->
+	    {noreply, Connection};
+	{Reply, Connection} ->
+	    {{replies, [Reply]}, Connection}
+    end;
 
 handle_msg(#ssh_msg_channel_failure{recipient_channel = ChannelId},
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
-    {Reply, Connection} = reply_msg(Channel, Connection0, failure),
-    {{replies, [Reply]}, Connection};
+    case reply_msg(Channel, Connection0, failure) of
+	{[], Connection} ->
+	    {noreply, Connection};
+	{Reply, Connection} ->
+	    {{replies, [Reply]}, Connection}
+    end;
+
 
 handle_msg(#ssh_msg_channel_eof{recipient_channel = ChannelId}, 
-	    #connection{channel_cache = Cache} = Connection0, _, _) ->
+	    #connection{channel_cache = Cache} = Connection0, _) ->
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     {Reply, Connection} = reply_msg(Channel, Connection0, {eof, ChannelId}),
     {{replies, [Reply]}, Connection};
    
 handle_msg(#ssh_msg_channel_close{recipient_channel = ChannelId},   
-	   #connection{channel_cache = Cache} = Connection0, 
-	   ConnectionPid, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
 
 	case ssh_channel:cache_lookup(Cache, ChannelId) of
-		#channel{sent_close = Closed, remote_id = RemoteId, flow_control = FlowControl} = 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 -> [];
-		    false ->
-			RemoteCloseMsg = channel_close_msg(RemoteId),
-						[{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};
+		ConnReplyMsgs =
+		    case Closed of
+			true -> [];
+			false ->
+			    RemoteCloseMsg = channel_close_msg(RemoteId),
+			    [{connection_reply, 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}
@@ -417,21 +415,24 @@ handle_msg(#ssh_msg_channel_close{recipient_channel = ChannelId},
 
 handle_msg(#ssh_msg_channel_data{recipient_channel = ChannelId,
 				 data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     
-    #channel{recv_window_size = Size} = Channel =
-	ssh_channel:cache_lookup(Cache, ChannelId), 
-    WantedSize = Size - size(Data),
-    ssh_channel:cache_update(Cache, Channel#channel{
-				      recv_window_size = WantedSize}),
-    {Replies, Connection} = 
-	channel_data_reply(Cache, Channel, Connection0, 0, Data),
-    {{replies, Replies}, Connection};
+    case ssh_channel:cache_lookup(Cache, ChannelId) of
+	#channel{recv_window_size = Size} = Channel ->
+	    WantedSize = Size - size(Data),
+	    ssh_channel:cache_update(Cache, Channel#channel{
+					      recv_window_size = WantedSize}),
+	    {Replies, Connection} =
+		channel_data_reply(Cache, Channel, Connection0, 0, Data),
+	    {{replies, Replies}, Connection};
+	undefined ->
+	    {noreply, Connection0}
+    end;
 
 handle_msg(#ssh_msg_channel_extended_data{recipient_channel = ChannelId,
 					  data_type_code = DataType,
 					  data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     
     #channel{recv_window_size = Size} = Channel =
 	ssh_channel:cache_lookup(Cache, ChannelId), 
@@ -444,9 +445,7 @@ handle_msg(#ssh_msg_channel_extended_data{recipient_channel = ChannelId,
 
 handle_msg(#ssh_msg_channel_window_adjust{recipient_channel = ChannelId,
 					  bytes_to_add = Add}, 
-	   #connection{channel_cache = Cache} = Connection, 
-	   ConnectionPid, _) ->
-    
+	   #connection{channel_cache = Cache} = Connection, _) ->
     #channel{send_window_size = Size, remote_id = RemoteId} = 
 	Channel0 = ssh_channel:cache_lookup(Cache, ChannelId), 
     
@@ -455,8 +454,7 @@ handle_msg(#ssh_msg_channel_window_adjust{recipient_channel = ChannelId,
 			   0, undefined, Connection),
     
     Replies = lists:map(fun({Type, Data}) -> 
-				{connection_reply, ConnectionPid,
-				 channel_data_msg(RemoteId, Type, Data)}
+				{connection_reply, channel_data_msg(RemoteId, Type, Data)}
 			end, SendList),
     FlowCtrlMsgs = flow_control(Channel, Cache),
     {{replies, Replies ++ FlowCtrlMsgs}, Connection};
@@ -464,10 +462,9 @@ handle_msg(#ssh_msg_channel_window_adjust{recipient_channel = ChannelId,
 handle_msg(#ssh_msg_channel_open{channel_type = "session" = Type,
 				 sender_channel = RemoteId,
 				 initial_window_size = WindowSz,
-				 maximum_packet_size = PacketSz}, Connection0, 
-	   ConnectionPid, server) ->
+				 maximum_packet_size = PacketSz}, Connection0, server) ->
    
-    try setup_session(Connection0, ConnectionPid, RemoteId,
+    try setup_session(Connection0, RemoteId,
 		     Type, WindowSz, PacketSz) of
 	Result ->
 	    Result
@@ -475,20 +472,20 @@ handle_msg(#ssh_msg_channel_open{channel_type = "session" = Type,
 	    FailMsg = channel_open_failure_msg(RemoteId, 
 					       ?SSH_OPEN_CONNECT_FAILED,
 					       "Connection refused", "en"),
-	    {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, 
+	    {{replies, [{connection_reply, FailMsg}]},
 	     Connection0}
     end;
 
 handle_msg(#ssh_msg_channel_open{channel_type = "session",
 				 sender_channel = RemoteId}, 
-	   Connection, ConnectionPid, client) ->
+	   Connection, client) ->
     %% Client implementations SHOULD reject any session channel open
     %% requests to make it more difficult for a corrupt server to attack the
     %% client. See See RFC 4254 6.1.
     FailMsg = channel_open_failure_msg(RemoteId, 
 				       ?SSH_OPEN_CONNECT_FAILED,
 				       "Connection refused", "en"),
-    {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, 
+    {{replies, [{connection_reply, FailMsg}]},
      Connection};
 
 handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip" = Type,
@@ -496,8 +493,7 @@ handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip" = Type,
 				 initial_window_size = RWindowSz,
 				 maximum_packet_size = RPacketSz,
 				 data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, 
-	   ConnectionPid, server) ->
+	   #connection{channel_cache = Cache} = Connection0, server) ->
     <<?UINT32(ALen), Address:ALen/binary, ?UINT32(Port),
      ?UINT32(OLen), Orig:OLen/binary, ?UINT32(OrigPort)>> = Data,
     
@@ -507,7 +503,7 @@ handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip" = Type,
 					       ?SSH_OPEN_CONNECT_FAILED,
 					       "Connection refused", "en"),
 	    {{replies, 
-	      [{connection_reply, ConnectionPid, FailMsg}]}, Connection0};
+	      [{connection_reply, FailMsg}]}, Connection0};
 	ChannelPid ->
 	    {ChannelId, Connection1} = new_channel_id(Connection0),
 	    LWindowSz = ?DEFAULT_WINDOW_SIZE,
@@ -528,32 +524,31 @@ handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip" = Type,
 			  {open,  Channel, {forwarded_tcpip,
 					    decode_ip(Address), Port,
 					    decode_ip(Orig), OrigPort}}),
-	    {{replies, [{connection_reply, ConnectionPid, OpenConfMsg},
+	    {{replies, [{connection_reply, OpenConfMsg},
 			OpenMsg]}, Connection}
     end;
 
 handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip",
 				 sender_channel = RemoteId}, 
-	   Connection, ConnectionPid, client) ->
+	   Connection, client) ->
     %% Client implementations SHOULD reject direct TCP/IP open requests for
     %% security reasons. See RFC 4254 7.2.
     FailMsg = channel_open_failure_msg(RemoteId, 
 				       ?SSH_OPEN_CONNECT_FAILED,
 				       "Connection refused", "en"),
-    {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, Connection};
+    {{replies, [{connection_reply, FailMsg}]}, Connection};
 
 
-handle_msg(#ssh_msg_channel_open{sender_channel = RemoteId}, Connection, 
-	   ConnectionPid, _) ->
+handle_msg(#ssh_msg_channel_open{sender_channel = RemoteId}, Connection, _) ->
     FailMsg = channel_open_failure_msg(RemoteId, 
 				       ?SSH_OPEN_ADMINISTRATIVELY_PROHIBITED,
 				       "Not allowed", "en"),
-    {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, Connection};
+    {{replies, [{connection_reply, FailMsg}]}, Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "exit-status",
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, _, _) ->
+	   #connection{channel_cache = Cache} = Connection, _) ->
     <<?UINT32(Status)>> = Data,
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     {Reply, Connection} = 
@@ -564,8 +559,7 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "exit-signal",
 				    want_reply = false,
 				    data = Data},  
-	   #connection{channel_cache = Cache} = Connection0, 
-	   ConnectionPid, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     <<?UINT32(SigLen), SigName:SigLen/binary,
      ?BOOLEAN(_Core), 
      ?UINT32(ErrLen), Err:ErrLen/binary,
@@ -578,14 +572,14 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				      binary_to_list(Err),
 				      binary_to_list(Lang)}),
     CloseMsg = channel_close_msg(RemoteId),
-    {{replies, [{connection_reply, ConnectionPid, CloseMsg}, Reply]},
+    {{replies, [{connection_reply, CloseMsg}, Reply]},
      Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "xon-xoff",
 				    want_reply = false,
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, _, _) ->
+	   #connection{channel_cache = Cache} = Connection, _) ->
     <<?BOOLEAN(CDo)>> = Data,
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     {Reply, Connection} = 
@@ -596,7 +590,7 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "window-change",
 				    want_reply = false,
 				    data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     <<?UINT32(Width),?UINT32(Height),
      ?UINT32(PixWidth), ?UINT32(PixHeight)>> = Data,
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
@@ -609,7 +603,7 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "signal",
 				    data = Data}, 
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     <<?UINT32(SigLen), SigName:SigLen/binary>> = Data,
     
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
@@ -622,8 +616,7 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "subsystem",
 				    want_reply = WantReply,
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, 
-	   ConnectionPid, server) ->
+	   #connection{channel_cache = Cache} = Connection, server) ->
     <<?UINT32(SsLen), SsName:SsLen/binary>> = Data,
     
     #channel{remote_id = RemoteId} = Channel0 = 
@@ -631,22 +624,23 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
     
     ReplyMsg =  {subsystem, ChannelId, WantReply, binary_to_list(SsName)},
     
-    try start_subsytem(SsName, Connection, Channel0, ReplyMsg) of
-	{ok, Pid} -> 
-	    erlang:monitor(process, Pid),
-	    Channel = Channel0#channel{user = Pid},
-	    ssh_channel:cache_update(Cache, Channel),
-	    Reply = {connection_reply, ConnectionPid, 
-		     channel_success_msg(RemoteId)}, 
-	    {{replies, [Reply]}, Connection}
-    catch _:_ ->
-	    Reply = {connection_reply, ConnectionPid, 
-		     channel_failure_msg(RemoteId)}, 
-	    {{replies, [Reply]}, Connection}
+    try
+	{ok, Pid} = start_subsytem(SsName, Connection, Channel0, ReplyMsg),
+	erlang:monitor(process, Pid),
+	Channel = Channel0#channel{user = Pid},
+	ssh_channel:cache_update(Cache, Channel),
+	Reply = {connection_reply,
+		 channel_success_msg(RemoteId)},
+	{{replies, [Reply]}, Connection}
+    catch
+	_:_ ->
+	    ErrorReply = {connection_reply,
+			  channel_failure_msg(RemoteId)},
+	    {{replies, [ErrorReply]}, Connection}
     end;	
 
 handle_msg(#ssh_msg_channel_request{request_type = "subsystem"},
-	   Connection, _, client) ->
+	   Connection, client) ->
     %% The client SHOULD ignore subsystem requests. See RFC 4254 6.5.
     {{replies, []}, Connection};
 
@@ -654,8 +648,7 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "pty-req",
 				    want_reply = WantReply,
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, 
-	   ConnectionPid, server) ->
+	   #connection{channel_cache = Cache} = Connection, server) ->
     <<?UINT32(TermLen), BTermName:TermLen/binary,
      ?UINT32(Width),?UINT32(Height),
      ?UINT32(PixWidth), ?UINT32(PixHeight),
@@ -667,27 +660,26 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
     
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     
-    handle_cli_msg(Connection, ConnectionPid, Channel, 
+    handle_cli_msg(Connection, Channel,
 		   {pty, ChannelId, WantReply, PtyRequest});
 
 handle_msg(#ssh_msg_channel_request{request_type = "pty-req"},
-	   Connection, _, client) ->
+	   Connection, client) ->
     %% The client SHOULD ignore pty requests. See RFC 4254 6.2.
     {{replies, []}, Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "shell",
 				    want_reply = WantReply},
-	   #connection{channel_cache = Cache} = Connection, 
-	   ConnectionPid, server) ->
+	   #connection{channel_cache = Cache} = Connection, server) ->
       
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     
-    handle_cli_msg(Connection, ConnectionPid, Channel, 
+    handle_cli_msg(Connection, Channel,
 		   {shell, ChannelId, WantReply});
  
 handle_msg(#ssh_msg_channel_request{request_type = "shell"},
-	   Connection, _, client) ->
+	   Connection, client) ->
     %% The client SHOULD ignore shell requests. See RFC 4254 6.5.
     {{replies, []}, Connection};
 
@@ -695,17 +687,16 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = "exec",
 				    want_reply = WantReply,
 				    data = Data},
-	   #connection{channel_cache = Cache} = Connection, 
-	   ConnectionPid, server) ->
+	   #connection{channel_cache = Cache} = Connection, server) ->
     <<?UINT32(Len), Command:Len/binary>> = Data,
      
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     
-    handle_cli_msg(Connection, ConnectionPid, Channel, 
+    handle_cli_msg(Connection, Channel,
 		   {exec, ChannelId, WantReply, binary_to_list(Command)});
 	
 handle_msg(#ssh_msg_channel_request{request_type = "exec"},
-	   Connection, _, client) ->
+	   Connection, client) ->
     %% The client SHOULD ignore exec requests. See RFC 4254 6.5.
     {{replies, []}, Connection};
 
@@ -713,31 +704,30 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
   				    request_type = "env",
   				    want_reply = WantReply,
   				    data = Data}, 
-  	   #connection{channel_cache = Cache} = Connection, 
-  	   ConnectionPid, server) ->
+	   #connection{channel_cache = Cache} = Connection, server) ->
     
     <<?UINT32(VarLen), 
      Var:VarLen/binary, ?UINT32(ValueLen), Value:ValueLen/binary>> = Data,
     
     Channel = ssh_channel:cache_lookup(Cache, ChannelId), 
     
-    handle_cli_msg(Connection, ConnectionPid, Channel,
+    handle_cli_msg(Connection, Channel,
  		   {env, ChannelId, WantReply, Var, Value});
 
 handle_msg(#ssh_msg_channel_request{request_type = "env"},
-	   Connection, _, client) ->
+	   Connection, client) ->
     %% The client SHOULD ignore env requests. 
     {{replies, []}, Connection};
 
 handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 				    request_type = _Other,
-				    want_reply = WantReply},  #connection{channel_cache = Cache} = Connection,
-	   ConnectionPid, _) ->
+				    want_reply = WantReply},
+	   #connection{channel_cache = Cache} = Connection, _) ->
     if WantReply == true ->
 		case ssh_channel:cache_lookup(Cache, ChannelId) of
 		    #channel{remote_id = RemoteId}  -> 
 			FailMsg = channel_failure_msg(RemoteId),
-			{{replies, [{connection_reply, ConnectionPid, FailMsg}]}, 
+			{{replies, [{connection_reply, FailMsg}]},
 			 Connection};
 		    undefined -> %% Chanel has been closed
 			{noreply, Connection}
@@ -748,61 +738,74 @@ handle_msg(#ssh_msg_channel_request{recipient_channel = ChannelId,
 
 handle_msg(#ssh_msg_global_request{name = _Type,
 				   want_reply = WantReply,
-				   data = _Data}, Connection,
-	   ConnectionPid, _) ->
+				   data = _Data}, Connection, _) ->
     if WantReply == true ->
 	    FailMsg = request_failure_msg(),
-	    {{replies, [{connection_reply, ConnectionPid, FailMsg}]}, 
+	    {{replies, [{connection_reply, FailMsg}]},
 	     Connection};
        true ->
 	    {noreply, Connection}  
     end;
 
-%%% This transport message will also be handled at the connection level
+handle_msg(#ssh_msg_request_failure{},
+	   #connection{requests = [{_, From} | Rest]} = Connection, _) ->
+    {{replies, [{channel_requst_reply, From, {failure, <<>>}}]},
+     Connection#connection{requests = Rest}};
+handle_msg(#ssh_msg_request_success{data = Data},
+	   #connection{requests = [{_, From} | Rest]} = Connection, _) ->
+    {{replies, [{channel_requst_reply, From, {success, Data}}]},
+     Connection#connection{requests = Rest}};
+
 handle_msg(#ssh_msg_disconnect{code = Code,
 			       description = Description,
 			       language = _Lang },
-	   #connection{channel_cache = Cache} = Connection0, _, _) ->
+	   #connection{channel_cache = Cache} = Connection0, _) ->
     {Connection, Replies} = 
 	ssh_channel:cache_foldl(fun(Channel, {Connection1, Acc}) ->
 					{Reply, Connection2} =  
 					    reply_msg(Channel,
-						      Connection1, {closed, Channel#channel.local_id}),
+						      Connection1,
+						      {closed, Channel#channel.local_id}),
 					{Connection2, [Reply | Acc]}
 				end, {Connection0, []}, Cache),
     
     ssh_channel:cache_delete(Cache),
     {disconnect, {Code, Description}, {{replies, Replies}, Connection}}.
 
-handle_cli_msg(#connection{channel_cache = Cache} = Connection0,
-	       ConnectionPid, 
+handle_cli_msg(#connection{channel_cache = Cache} = Connection,
 	       #channel{user = undefined, 
+			remote_id = RemoteId,
 			local_id = ChannelId} = Channel0, Reply0) -> 
     
-    case (catch start_cli(Connection0, ChannelId)) of
+    case (catch start_cli(Connection, ChannelId)) of
 	{ok, Pid} ->
 	    erlang:monitor(process, Pid),
 	    Channel = Channel0#channel{user = Pid},
 	    ssh_channel:cache_update(Cache, Channel),
-	    {Reply, Connection} = reply_msg(Channel, Connection0, Reply0),
-	    {{replies, [Reply]}, Connection};
-	_ ->
-	    Reply = {connection_reply, ConnectionPid, 
-		     request_failure_msg()}, 
-	    {{replies, [Reply]}, Connection0}
+	    Reply = {connection_reply,
+		     channel_success_msg(RemoteId)},
+	    {{replies, [{channel_data, Pid, Reply0}, Reply]}, Connection};
+	_Other ->
+	    Reply = {connection_reply,
+		     channel_failure_msg(RemoteId)},
+	    {{replies, [Reply]}, Connection}
     end;
 
-handle_cli_msg(Connection0, _, Channel, Reply0) -> 
+handle_cli_msg(Connection0, Channel, Reply0) ->
     {Reply, Connection} =  reply_msg(Channel, Connection0, Reply0),
     {{replies, [Reply]}, Connection}.
 
-
 channel_eof_msg(ChannelId) ->
     #ssh_msg_channel_eof{recipient_channel = ChannelId}.
 
 channel_close_msg(ChannelId) ->
     #ssh_msg_channel_close {recipient_channel = ChannelId}.
 
+channel_status_msg({success, ChannelId}) ->
+    channel_success_msg(ChannelId);
+channel_status_msg({failure, ChannelId}) ->
+    channel_failure_msg(ChannelId).
+
 channel_success_msg(ChannelId) ->
     #ssh_msg_channel_success{recipient_channel = ChannelId}.
 
@@ -880,70 +883,6 @@ bound_channel(IP, Port, Connection) ->
 	_ -> undefined
     end.
 
-messages() ->
-    [ {ssh_msg_global_request, ?SSH_MSG_GLOBAL_REQUEST,
-       [string, 
-	boolean,
-	'...']},
-      
-      {ssh_msg_request_success, ?SSH_MSG_REQUEST_SUCCESS,
-       ['...']},
-      
-      {ssh_msg_request_failure, ?SSH_MSG_REQUEST_FAILURE,
-       []},
-      
-      {ssh_msg_channel_open, ?SSH_MSG_CHANNEL_OPEN,
-       [string,
-	uint32,
-	uint32,
-	uint32,
-	'...']},
-
-      {ssh_msg_channel_open_confirmation, ?SSH_MSG_CHANNEL_OPEN_CONFIRMATION,
-       [uint32,
-	uint32,
-	uint32,
-	uint32,
-	'...']},
-
-      {ssh_msg_channel_open_failure, ?SSH_MSG_CHANNEL_OPEN_FAILURE,
-       [uint32,
-	uint32,
-	string,
-	string]},
-
-      {ssh_msg_channel_window_adjust, ?SSH_MSG_CHANNEL_WINDOW_ADJUST,
-       [uint32,
-	uint32]},
-
-      {ssh_msg_channel_data, ?SSH_MSG_CHANNEL_DATA,
-       [uint32,
-	binary]},
-
-      {ssh_msg_channel_extended_data, ?SSH_MSG_CHANNEL_EXTENDED_DATA,
-       [uint32,
-	uint32,
-	binary]},
-
-      {ssh_msg_channel_eof, ?SSH_MSG_CHANNEL_EOF,
-       [uint32]},
-
-      {ssh_msg_channel_close, ?SSH_MSG_CHANNEL_CLOSE,
-       [uint32]},
-
-      {ssh_msg_channel_request, ?SSH_MSG_CHANNEL_REQUEST,
-       [uint32,
-	string,
-	boolean,
-	'...']},
-
-      {ssh_msg_channel_success, ?SSH_MSG_CHANNEL_SUCCESS,
-       [uint32]},
-
-      {ssh_msg_channel_failure, ?SSH_MSG_CHANNEL_FAILURE,
-       [uint32]}
-     ].
-
 encode_ip(Addr) when is_tuple(Addr) ->
     case catch inet_parse:ntoa(Addr) of
 	{'EXIT',_} -> false;
@@ -965,14 +904,14 @@ start_channel(Cb, Id, Args, SubSysSup) ->
 
 start_channel(Cb, Id, Args, SubSysSup, Exec) ->
     ChildSpec = child_spec(Cb, Id, Args, Exec),
-    ChannelSup =ssh_subsystem_sup:channel_supervisor(SubSysSup),
+    ChannelSup = ssh_subsystem_sup:channel_supervisor(SubSysSup),
     ssh_channel_sup:start_child(ChannelSup, ChildSpec).
     
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
 setup_session(#connection{channel_cache = Cache} = Connection0, 
-	      ConnectionPid, RemoteId,
+	      RemoteId,
 	      Type, WindowSize, PacketSize) ->
     {ChannelId, Connection} = new_channel_id(Connection0),
 
@@ -990,7 +929,7 @@ setup_session(#connection{channel_cache = Cache} = Connection0,
 						?DEFAULT_WINDOW_SIZE, 
 						?DEFAULT_PACKET_SIZE),
 
-    {{replies, [{connection_reply, ConnectionPid, OpenConfMsg}]}, Connection}.
+    {{replies, [{connection_reply, OpenConfMsg}]}, Connection}.
 
 
 check_subsystem("sftp"= SsName, Options) ->
@@ -1019,35 +958,21 @@ child_spec(Callback, Id, Args, Exec) ->
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, [ssh_channel]}.
 
-%% Backwards compatibility
-start_cli(#connection{address = Address, port = Port, cli_spec = {Fun, [Shell]},
-		      options = Options}, 
-	  _ChannelId) when is_function(Fun) ->
-    case Fun(Shell, Address, Port, Options) of
-	NewFun when is_function(NewFun) ->
-	    {ok, NewFun()};
-	Pid when is_pid(Pid) ->
-	    {ok, Pid}
-    end;
-
+start_cli(#connection{cli_spec = no_cli}, _) ->
+    {error, cli_disabled};
 start_cli(#connection{cli_spec = {CbModule, Args}, exec = Exec,
 		      sub_system_supervisor = SubSysSup}, ChannelId) ->
     start_channel(CbModule, ChannelId, Args, SubSysSup, Exec).
 
-start_subsytem(BinName, #connection{address = Address, port = Port, 
-				    options = Options, 
+start_subsytem(BinName, #connection{options = Options,
 				    sub_system_supervisor = SubSysSup},
-	       #channel{local_id = ChannelId, remote_id = RemoteChannelId},
-	       ReplyMsg) ->
+	       #channel{local_id = ChannelId}, _ReplyMsg) ->
     Name = binary_to_list(BinName),
     case check_subsystem(Name, Options) of
 	{Callback, Opts} when is_atom(Callback), Callback =/= none ->
 	    start_channel(Callback, ChannelId, Opts, SubSysSup);
 	{Other, _} when Other =/= none ->
-	    handle_backwards_compatibility(Other, self(), 
-					   ChannelId, RemoteChannelId,
-					   Options, Address, Port, 
-					   {ssh_cm, self(), ReplyMsg})
+	    {error, legacy_option_not_supported}
     end.
 
 channel_data_reply(_, #channel{local_id = ChannelId} = Channel, 
@@ -1070,9 +995,12 @@ reply_msg(Channel, Connection, failure = Reply) ->
     request_reply_or_data(Channel, Connection, Reply);
 reply_msg(Channel, Connection, {closed, _} = Reply) ->
     request_reply_or_data(Channel, Connection, Reply);
+reply_msg(undefined, Connection, _Reply) ->
+    {noreply, Connection};
 reply_msg(#channel{user = ChannelPid}, Connection, Reply) ->
     {{channel_data, ChannelPid, Reply}, Connection}.
 
+
 request_reply_or_data(#channel{local_id = ChannelId, user = ChannelPid}, 
 		      #connection{requests = Requests} = 
 		      Connection, Reply) -> 
@@ -1080,10 +1008,13 @@ request_reply_or_data(#channel{local_id = ChannelId, user = ChannelPid},
 	{value, {ChannelId, From}} ->
 	    {{channel_requst_reply, From, Reply}, 
 	     Connection#connection{requests = 
-				   lists:keydelete(ChannelId, 1, Requests)}};
+				       lists:keydelete(ChannelId, 1, Requests)}};
+	false when (Reply == success) or (Reply == failure) ->
+	    {[], Connection};
 	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);
@@ -1139,7 +1070,7 @@ flow_control([], Channel, Cache) ->
     [];
 
 flow_control([_|_], #channel{flow_control = From,
-							 send_buf = []} = Channel, Cache) when From =/= undefined ->
+			     send_buf = []} = Channel, Cache) when From =/= undefined ->
 	[{flow_control, Cache, Channel, From, ok}];
 flow_control(_,_,_) ->
 	[].
@@ -1341,43 +1272,3 @@ decode_ip(Addr) when is_binary(Addr) ->
 	{ok,A}    -> A
     end.
 
-%% This is really awful and that is why it is beeing phased out. 
-handle_backwards_compatibility({_,_,_,_,_,_} = ChildSpec, _, _, _, _,
-			       Address, Port, _) ->
-    SystemSup = ssh_system_sup:system_supervisor(Address, Port),
-    ChannelSup = ssh_system_sup:channel_supervisor(SystemSup),
-    ssh_channel_sup:start_child(ChannelSup, ChildSpec);
-
-handle_backwards_compatibility(Module, ConnectionManager, ChannelId,
-			       RemoteChannelId, Opts,
-			       _, _, Msg) when is_atom(Module) ->
-    {ok, SubSystemPid} = gen_server:start_link(Module, [Opts], []),
-    SubSystemPid !
-	{ssh_cm, ConnectionManager, 
-	 {open, ChannelId, RemoteChannelId, {session}}},
-    SubSystemPid ! Msg,
-    {ok, SubSystemPid}; 
-
-handle_backwards_compatibility(Fun, ConnectionManager, ChannelId, 
-			       RemoteChannelId, 
-			       _, _, _, Msg) when is_function(Fun) ->
-    SubSystemPid = Fun(),
-    SubSystemPid ! 
-	{ssh_cm, ConnectionManager, 
-	 {open, ChannelId, RemoteChannelId, {session}}},
-    SubSystemPid ! Msg,
-    {ok, SubSystemPid};
-
-handle_backwards_compatibility(ChildSpec, 
-			       ConnectionManager, 
-			       ChannelId, RemoteChannelId, _, 
-			       Address, Port, Msg) ->
-    SystemSup = ssh_system_sup:system_supervisor(Address, Port),
-    ChannelSup = ssh_system_sup:channel_supervisor(SystemSup),
-    {ok, SubSystemPid} 
-	= ssh_channel_sup:start_child(ChannelSup, ChildSpec),
-    SubSystemPid ! 
-	{ssh_cm, ConnectionManager, 
-	 {open, ChannelId, RemoteChannelId, {session}}},
-    SubSystemPid ! Msg,
-    {ok, SubSystemPid}.
diff --git a/lib/ssh/src/ssh_connection_controler.erl b/lib/ssh/src/ssh_connection_controler.erl
deleted file mode 100644
index ca3e62dc83..0000000000
--- a/lib/ssh/src/ssh_connection_controler.erl
+++ /dev/null
@@ -1,137 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2009-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%
-%%
-%%--------------------------------------------------------------------
-%% File    : ssh_connection_controler.erl
-%% Description : 
-%%
-%%--------------------------------------------------------------------
-
--module(ssh_connection_controler).
-
--behaviour(gen_server).
-
-%%-----------------------------------------------------------------
-%% External exports
-%%-----------------------------------------------------------------
--export([start_link/1, start_handler_child/2, start_manager_child/2,
-	 connection_manager/1]).
-
-%%-----------------------------------------------------------------
-%% Internal exports
-%%-----------------------------------------------------------------
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 code_change/3, terminate/2, stop/1]).
-
--record(state, {role, manager, handler, timeout}).
-
-%%-----------------------------------------------------------------
-%% External interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: start/0
-%%-----------------------------------------------------------------
-start_link(Args) ->
-    gen_server:start_link(?MODULE, [Args], []).
-
-%% Will be called from the manager child process
-start_handler_child(ServerRef, Args) ->
-    gen_server:call(ServerRef, {handler, self(), Args}, infinity).
-
-%% Will be called from the acceptor process
-start_manager_child(ServerRef, Args) ->
-    gen_server:call(ServerRef, {manager, Args}, infinity).
-
-connection_manager(ServerRef) ->
-    {ok, gen_server:call(ServerRef, manager, infinity)}.
-
-%%-----------------------------------------------------------------
-%% Internal interface functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: stop/1
-%%-----------------------------------------------------------------
-stop(Pid) ->
-    gen_server:cast(Pid, stop).
-
-%%-----------------------------------------------------------------
-%% Server functions
-%%-----------------------------------------------------------------
-%%-----------------------------------------------------------------
-%% Func: init/1
-%%-----------------------------------------------------------------
-init([Opts]) ->
-    process_flag(trap_exit, true),
-    case proplists:get_value(role, Opts) of
-	client ->		
-	    {ok, Manager} = ssh_connection_manager:start_link([client, Opts]),
-	    {ok, #state{role = client, manager = Manager}};
-	_server ->
-	    %% Children started by acceptor process
-	    {ok, #state{role = server}}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: terminate/2
-%%-----------------------------------------------------------------
-terminate(_Reason, #state{}) ->
-    ok.
-
-%%-----------------------------------------------------------------
-%% Func: handle_call/3
-%%-----------------------------------------------------------------
-handle_call({handler, Pid, [Role, Socket, Opts]}, _From, State) ->
-    {ok, Handler} = ssh_connection_handler:start_link(Role, Pid, Socket, Opts),
-    {reply, {ok, Handler}, State#state{handler = Handler}};
-handle_call({manager, [server = Role, Socket, Opts, SubSysSup]}, _From, State) ->
-    {ok, Manager} = ssh_connection_manager:start_link([Role, Socket, Opts, SubSysSup]),
-    {reply, {ok, Manager}, State#state{manager = Manager}};
-handle_call({manager, [client = Role | Opts]}, _From, State) ->
-    {ok, Manager} = ssh_connection_manager:start_link([Role, Opts]),
-    {reply, {ok, Manager}, State#state{manager = Manager}};
-handle_call(manager, _From, State) ->
-    {reply, State#state.manager, State};
-handle_call(stop, _From, State) ->
-    {stop, normal, ok, State};
-handle_call(_, _, State) ->
-    {noreply, State, State#state.timeout}.
-
-%%-----------------------------------------------------------------
-%% Func: handle_cast/2
-%%-----------------------------------------------------------------
-handle_cast(stop, State) ->
-    {stop, normal, State};
-handle_cast(_, State) ->
-    {noreply, State, State#state.timeout}.
-
-%%-----------------------------------------------------------------
-%% Func: handle_info/2
-%%-----------------------------------------------------------------
-%% handle_info(ssh_connected, State) ->
-%%     {stop, normal, State};
-%% Servant termination.
-handle_info({'EXIT', _Pid, Reason}, State) ->
-    {stop, Reason, State}.
-
-%%-----------------------------------------------------------------
-%% Func: code_change/3
-%%-----------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 1c4477aeb3..070a2db5a8 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -18,10 +18,11 @@
 %%
 %%
 %%----------------------------------------------------------------------
-%% Purpose: Handles the setup of an ssh connection, e.i. both the
-%% setup SSH Transport Layer Protocol (RFC 4253) and Authentication
-%% Protocol (RFC 4252). Details of the different protocols are
-%% implemented in ssh_transport.erl, ssh_auth.erl
+%% Purpose: Handles an ssh connection, e.i. both the
+%% setup SSH Transport Layer Protocol (RFC 4253), Authentication
+%% Protocol (RFC 4252) and SSH connection Protocol (RFC 4255)
+%% Details of the different protocols are
+%% implemented in ssh_transport.erl, ssh_auth.erl and ssh_connection.erl
 %% ----------------------------------------------------------------------
 
 -module(ssh_connection_handler).
@@ -33,10 +34,14 @@
 -include("ssh_auth.hrl").
 -include("ssh_connect.hrl").
 
--export([start_link/4, send/2, renegotiate/1, send_event/2,
-	 connection_info/3,
-	 peer_address/1,
-	 renegotiate_data/1]).
+-export([start_link/3]).
+
+%% Internal application API
+-export([open_channel/6, reply_request/3, request/6, request/7,
+	 global_request/4, send/5, send_eof/2, info/1, info/2,
+	 connection_info/2, channel_info/3,
+	 adjust_window/3, close/2, stop/1, renegotiate/1, renegotiate_data/1,
+	 start_connection/4]).
 
 %% gen_fsm callbacks
 -export([hello/2, kexinit/2, key_exchange/2, new_keys/2,
@@ -45,10 +50,14 @@
 -export([init/1, handle_event/3,
 	 handle_sync_event/4, handle_info/3, terminate/3, code_change/4]).
 
-%% spawn export
--export([ssh_info_handler/3]).
-
 -record(state, {
+	  role,
+	  client,
+	  starter,
+	  auth_user,
+	  connection_state,
+	  latest_channel_id = 0,
+	  idle_timer_ref,
 	  transport_protocol,      % ex: tcp
 	  transport_cb,
 	  transport_close_tag,
@@ -59,105 +68,234 @@
 	  undecoded_packet_length, %  integer()
 	  key_exchange_init_msg,   %  #ssh_msg_kexinit{}
 	  renegotiate = false,     %  boolean() 
-	  manager,                  % pid()
 	  connection_queue,
 	  address,
 	  port,
 	  opts
 	 }). 
 
--define(DBG_MESSAGE, true).
+-type state_name()           :: hello | kexinit | key_exchange | new_keys | userauth | connection.
+-type gen_fsm_state_return() :: {next_state, state_name(), term()} |
+				{next_state, state_name(), term(), timeout()} |
+				{stop, term(), term()}.
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
+
 %%--------------------------------------------------------------------
-%% Function: start_link() -> ok,Pid} | ignore | {error,Error}
-%% Description:Creates a gen_fsm process which calls Module:init/1 to
-%% initialize. To ensure a synchronized start-up procedure, this function
-%% does not return until Module:init/1 has returned.  
+-spec start_connection(client| server, port(), proplists:proplist(),
+		       timeout()) -> {ok, pid()} | {error, term()}.
 %%--------------------------------------------------------------------
-start_link(Role, Manager, Socket, Options) ->
-    gen_fsm:start_link(?MODULE, [Role, Manager, Socket, Options], []).
-
-send(ConnectionHandler, Data) ->
-    send_all_state_event(ConnectionHandler, {send, Data}).
+start_connection(client = Role, Socket, Options, Timeout) ->
+    try
+	{ok, Pid} = sshc_sup:start_child([Role, Socket, Options]),
+	{_, Callback, _} =
+	    proplists:get_value(transport, Options, {tcp, gen_tcp, tcp_closed}),
+	ok = socket_control(Socket, Pid, Callback),
+	Ref = erlang:monitor(process, Pid),
+	handshake(Pid, Ref, Timeout)
+    catch
+	exit:{noproc, _} ->
+	    {error, ssh_not_started};
+	_:Error ->
+	    {error, Error}
+    end;
 
-renegotiate(ConnectionHandler) ->
-    send_all_state_event(ConnectionHandler, renegotiate).
- 
-renegotiate_data(ConnectionHandler) ->
-    send_all_state_event(ConnectionHandler, data_size).
-connection_info(ConnectionHandler, From, Options) ->
-     send_all_state_event(ConnectionHandler, {info, From, Options}).
+start_connection(server = Role, Socket, Options, Timeout) ->
+    try
+	Sups = proplists:get_value(supervisors, Options),
+	ConnectionSup = proplists:get_value(connection_sup, Sups),
+	Opts = [{supervisors, Sups}, {user_pid, self()} | proplists:get_value(ssh_opts, Options, [])],
+	{ok, Pid} = ssh_connection_sup:start_child(ConnectionSup, [Role, Socket, Opts]),
+	{_, Callback, _} =  proplists:get_value(transport, Options, {tcp, gen_tcp, tcp_closed}),
+	socket_control(Socket, Pid, Callback),
+	Ref = erlang:monitor(process, Pid),
+	handshake(Pid, Ref, Timeout)
+    catch
+	exit:{noproc, _} ->
+	    {error, ssh_not_started};
+	_:Error ->
+	    {error, Error}
+    end.
 
-%% Replaced with option to connection_info/3. For now keep 
-%% for backwards compatibility
-peer_address(ConnectionHandler) ->
-    sync_send_all_state_event(ConnectionHandler, peer_address).
+start_link(Role, Socket, Options) ->
+    {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Socket, Options]])}.
 
-%%====================================================================
-%% gen_fsm callbacks
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, StateName, State} |
-%%                         {ok, StateName, State, Timeout} |
-%%                         ignore                              |
-%%                         {stop, StopReason}                   
-%% 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, Manager, Socket, SshOpts]) ->
+init([Role, Socket, SshOpts]) ->
     process_flag(trap_exit, true),
     {NumVsn, StrVsn} = ssh_transport:versions(Role, SshOpts),
-    ssh_bits:install_messages(ssh_transport:transport_messages(NumVsn)),
     {Protocol, Callback, CloseTag} = 
 	proplists:get_value(transport, SshOpts, {tcp, gen_tcp, tcp_closed}),
+    Cache = ssh_channel:cache_create(),
+    State0 = #state{
+		role = Role,
+		connection_state = #connection{channel_cache = Cache,
+					       channel_id_seed = 0,
+					       port_bindings = [],
+					       requests = [],
+					       options = SshOpts},
+		socket = Socket,
+		decoded_data_buffer = <<>>,
+		encoded_data_buffer = <<>>,
+		transport_protocol = Protocol,
+		transport_cb = Callback,
+		transport_close_tag = CloseTag,
+		opts = SshOpts
+	       },
+
+    State = init_role(State0),
+
     try init_ssh(Role, NumVsn, StrVsn, SshOpts, Socket) of
 	Ssh ->
-	    {ok, hello, #state{ssh_params =
-				   Ssh#ssh{send_sequence = 0, recv_sequence = 0},
-			       socket = Socket,
-			       decoded_data_buffer = <<>>,
-			       encoded_data_buffer = <<>>,
-			       transport_protocol = Protocol,
-			       transport_cb = Callback,
-			       transport_close_tag = CloseTag,
-			       manager = Manager,
-			       opts = SshOpts
-			      }}
+	    gen_fsm:enter_loop(?MODULE, [], hello,
+			       State#state{ssh_params = Ssh})
     catch
-	exit:Reason ->
-	    {stop, {shutdown, Reason}}
+	_:Error ->
+	    gen_fsm:enter_loop(?MODULE, [], error, {Error, State0})
     end.
+
+%%--------------------------------------------------------------------
+-spec open_channel(pid(), string(), iodata(), integer(), integer(),
+		   timeout()) -> {open, channel_id()} | {error, term()}.
+%%--------------------------------------------------------------------
+open_channel(ConnectionHandler, ChannelType, ChannelSpecificData,
+					InitialWindowSize,
+	     MaxPacketSize, Timeout) ->
+    sync_send_all_state_event(ConnectionHandler, {open, self(), ChannelType,
+						  InitialWindowSize, MaxPacketSize,
+						  ChannelSpecificData,
+						  Timeout}).
+%%--------------------------------------------------------------------
+-spec request(pid(), pid(), channel_id(), string(), boolean(), iodata(),
+		   timeout()) -> success | failure | ok | {error, term()}.
+%%--------------------------------------------------------------------
+request(ConnectionHandler, ChannelPid, ChannelId, Type, true, Data, Timeout) ->
+    sync_send_all_state_event(ConnectionHandler, {request, ChannelPid, ChannelId, Type, Data,
+						  Timeout});
+request(ConnectionHandler, ChannelPid, ChannelId, Type, false, Data, _) ->
+    send_all_state_event(ConnectionHandler, {request, ChannelPid, ChannelId, Type, Data}).
+
+%%--------------------------------------------------------------------
+-spec request(pid(), channel_id(), string(), boolean(), iodata(),
+		   timeout()) ->  success | failure | {error, timeout}.
+%%--------------------------------------------------------------------
+request(ConnectionHandler, ChannelId, Type, true, Data, Timeout) ->
+    sync_send_all_state_event(ConnectionHandler, {request, ChannelId, Type, Data, Timeout});
+request(ConnectionHandler, ChannelId, Type, false, Data, _) ->
+    send_all_state_event(ConnectionHandler, {request, ChannelId, Type, Data}).
+
+%%--------------------------------------------------------------------
+-spec reply_request(pid(), success | failure, channel_id()) -> ok.
+%%--------------------------------------------------------------------
+reply_request(ConnectionHandler, Status, ChannelId) ->
+    send_all_state_event(ConnectionHandler, {reply_request, Status, ChannelId}).
+
+%%--------------------------------------------------------------------
+-spec global_request(pid(), string(), boolean(), iolist()) -> ok | error.
+%%--------------------------------------------------------------------
+global_request(ConnectionHandler, Type, true = Reply, Data) ->
+    case sync_send_all_state_event(ConnectionHandler,
+				   {global_request, self(), Type, Reply, Data}) of
+	{ssh_cm, ConnectionHandler, {success, _}} ->
+	    ok;
+	{ssh_cm, ConnectionHandler, {failure, _}} ->
+	    error
+    end;
+global_request(ConnectionHandler, Type, false = Reply, Data) ->
+    send_all_state_event(ConnectionHandler, {global_request, self(), Type, Reply, Data}).
+
+%%--------------------------------------------------------------------
+-spec send(pid(), channel_id(), integer(), iolist(), timeout()) ->
+		  ok | {error, timeout} | {error, closed}.
+%%--------------------------------------------------------------------
+send(ConnectionHandler, ChannelId, Type, Data, Timeout) ->
+    sync_send_all_state_event(ConnectionHandler, {data, ChannelId, Type, Data, Timeout}).
+
+%%--------------------------------------------------------------------
+-spec send_eof(pid(), channel_id()) -> ok | {error, closed}.
+%%--------------------------------------------------------------------
+send_eof(ConnectionHandler, ChannelId) ->
+    sync_send_all_state_event(ConnectionHandler, {eof, ChannelId}).
+
+%%--------------------------------------------------------------------
+-spec connection_info(pid(), [atom()]) -> proplists:proplist().
+%%--------------------------------------------------------------------
+connection_info(ConnectionHandler, Options) ->
+    sync_send_all_state_event(ConnectionHandler, {connection_info, Options}).
+
+%%--------------------------------------------------------------------
+-spec channel_info(pid(), channel_id(), [atom()]) -> proplists:proplist().
+%%--------------------------------------------------------------------
+channel_info(ConnectionHandler, ChannelId, Options) ->
+    sync_send_all_state_event(ConnectionHandler, {channel_info, ChannelId, Options}).
+
+%%--------------------------------------------------------------------
+-spec adjust_window(pid(), channel_id(), integer()) -> ok.
+%%--------------------------------------------------------------------
+adjust_window(ConnectionHandler, Channel, Bytes) ->
+    send_all_state_event(ConnectionHandler, {adjust_window, Channel, Bytes}).
+%%--------------------------------------------------------------------
+-spec renegotiate(pid()) -> ok.
+%%--------------------------------------------------------------------
+renegotiate(ConnectionHandler) ->
+    send_all_state_event(ConnectionHandler, renegotiate).
+
+%%--------------------------------------------------------------------
+-spec renegotiate_data(pid()) -> ok.
+%%--------------------------------------------------------------------
+renegotiate_data(ConnectionHandler) ->
+    send_all_state_event(ConnectionHandler, data_size).
+
+%%--------------------------------------------------------------------
+-spec close(pid(), channel_id()) -> ok.
+%%--------------------------------------------------------------------
+close(ConnectionHandler, ChannelId) ->
+    sync_send_all_state_event(ConnectionHandler, {close, ChannelId}).
+
 %%--------------------------------------------------------------------
-%% Function: 
-%% state_name(Event, State) -> {next_state, NextStateName, NextState}|
-%%                             {next_state, NextStateName, 
-%%                                NextState, Timeout} |
-%%                             {stop, Reason, NewState}
-%% Description:There should be one instance of this function for each possible
-%% state name. Whenever a gen_fsm receives an event sent using
-%% gen_fsm:send_event/2, the instance of this function with the same name as
-%% the current state name StateName is called to handle the event. It is also 
-%% called if a timeout occurs. 
+-spec stop(pid()) -> ok | {error, term()}.
 %%--------------------------------------------------------------------
+stop(ConnectionHandler)->
+    case sync_send_all_state_event(ConnectionHandler, stop) of
+       {error, closed} ->
+	    ok;
+	Other ->
+	    Other
+    end.
+
+info(ConnectionHandler) ->
+    info(ConnectionHandler, {info, all}).
+
+info(ConnectionHandler, ChannelProcess) ->
+    sync_send_all_state_event(ConnectionHandler, {info, ChannelProcess}).
+
+
+%%====================================================================
+%% gen_fsm callbacks
+%%====================================================================
+
+%%--------------------------------------------------------------------
+-spec hello(socket_control | {info_line, list()} | {version_exchange, list()},
+	    #state{}) -> gen_fsm_state_return().
+%%--------------------------------------------------------------------
+
 hello(socket_control, #state{socket = Socket, ssh_params = Ssh} = State) ->
     VsnMsg = ssh_transport:hello_version_msg(string_version(Ssh)),
     send_msg(VsnMsg, State),
-    inet:setopts(Socket, [{packet, line}]),
-    {next_state, hello, next_packet(State)};
+    inet:setopts(Socket, [{packet, line}, {active, once}]),
+    {next_state, hello, State};
 
-hello({info_line, _Line}, State) ->
-    {next_state, hello, next_packet(State)};
+hello({info_line, _Line},#state{socket = Socket} = State) ->
+    inet:setopts(Socket, [{active, once}]),
+    {next_state, hello, State};
 
 hello({version_exchange, Version}, #state{ssh_params = Ssh0,
 					  socket = Socket} = State) ->
     {NumVsn, StrVsn} = ssh_transport:handle_hello_version(Version),
     case handle_version(NumVsn, StrVsn, Ssh0) of
 	{ok, Ssh1} ->
-	    inet:setopts(Socket, [{packet,0}, {mode,binary}]),
+	    inet:setopts(Socket, [{packet,0}, {mode,binary}, {active, once}]),
 	    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(Ssh1),
 	    send_msg(SshPacket, State),
 	    {next_state, kexinit, next_packet(State#state{ssh_params = Ssh,
@@ -173,12 +311,15 @@ hello({version_exchange, Version}, #state{ssh_params = Ssh0,
 	    handle_disconnect(DisconnectMsg, State)
     end.
 
+%%--------------------------------------------------------------------
+-spec kexinit({#ssh_msg_kexinit{}, binary()}, #state{}) -> gen_fsm_state_return().
+%%--------------------------------------------------------------------
 kexinit({#ssh_msg_kexinit{} = Kex, Payload},
 	#state{ssh_params = #ssh{role = Role} = Ssh0,
-					 key_exchange_init_msg = OwnKex} = 
-	State) ->
+	       key_exchange_init_msg = OwnKex} =
+	    State) ->
     Ssh1 = ssh_transport:key_init(opposite_role(Role), Ssh0, Payload), 
-    try ssh_transport:handle_kexinit_msg(Kex, OwnKex, Ssh1) of
+    case ssh_transport:handle_kexinit_msg(Kex, OwnKex, Ssh1) of
 	{ok, NextKexMsg, Ssh} when Role == client ->
 	    send_msg(NextKexMsg, State),
 	    {next_state, key_exchange, 
@@ -186,157 +327,75 @@ kexinit({#ssh_msg_kexinit{} = Kex, Payload},
 	{ok, Ssh} when Role == server ->
 	    {next_state, key_exchange, 
 	     next_packet(State#state{ssh_params = Ssh})}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-						  description = Desc,
-						  language = "en"}, State)
     end.
-    
+
+%%--------------------------------------------------------------------
+-spec key_exchange(#ssh_msg_kexdh_init{} | #ssh_msg_kexdh_reply{} |
+		   #ssh_msg_kex_dh_gex_group{} | #ssh_msg_kex_dh_gex_request{} |
+		   #ssh_msg_kex_dh_gex_request{} | #ssh_msg_kex_dh_gex_reply{}, #state{})
+		  -> gen_fsm_state_return().
+%%--------------------------------------------------------------------
+
 key_exchange(#ssh_msg_kexdh_init{} = Msg, 
-	     #state{ssh_params = #ssh{role = server} =Ssh0} = State) ->
-    try ssh_transport:handle_kexdh_init(Msg, Ssh0) of
+	     #state{ssh_params = #ssh{role = server} = Ssh0} = State) ->
+    case ssh_transport:handle_kexdh_init(Msg, Ssh0) of
 	{ok, KexdhReply, Ssh1} ->
 	    send_msg(KexdhReply, State),
 	    {ok, NewKeys, Ssh} = ssh_transport:new_keys_message(Ssh1),
 	    send_msg(NewKeys, State),
 	    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-						  description = Desc,
-						  language = "en"}, State)
     end;
 
-key_exchange({#ssh_msg_kexinit{} = Kex, Payload},
-	#state{ssh_params = #ssh{role = Role} = Ssh0,
-					 key_exchange_init_msg = OwnKex} =
-	State) ->
-    Ssh1 = ssh_transport:key_init(opposite_role(Role), Ssh0, Payload),
-    try ssh_transport:handle_kexinit_msg(Kex, OwnKex, Ssh1) of
-	{ok, NextKexMsg, Ssh} when Role == client ->
-	    send_msg(NextKexMsg, State),
-	    {next_state, key_exchange,
-	     next_packet(State#state{ssh_params = Ssh})};
-	{ok, Ssh} when Role == server ->
-	    {next_state, key_exchange,
-	     next_packet(State#state{ssh_params = Ssh})}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-						  description = Desc,
-						  language = "en"}, State)
-    end;
-  
 key_exchange(#ssh_msg_kexdh_reply{} = Msg, 
 	     #state{ssh_params = #ssh{role = client} = Ssh0} = State) -> 
-    try ssh_transport:handle_kexdh_reply(Msg, Ssh0) of
-	{ok, NewKeys, Ssh} -> 
-	    send_msg(NewKeys, State),
-	    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	{ErrorToDisplay, #ssh_msg_disconnect{} = DisconnectMsg} ->
-	    handle_disconnect(DisconnectMsg, State, ErrorToDisplay);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-							  description = Desc,
-							  language = "en"}, State)
-    end;
+    {ok, NewKeys, Ssh} = ssh_transport:handle_kexdh_reply(Msg, Ssh0),
+    send_msg(NewKeys, State),
+    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})};
 
 key_exchange(#ssh_msg_kex_dh_gex_group{} = Msg, 
 	     #state{ssh_params = #ssh{role = server} = Ssh0} = State) ->
-    try ssh_transport:handle_kex_dh_gex_group(Msg, Ssh0) of 
-	{ok, NextKexMsg, Ssh1} ->
-	    send_msg(NextKexMsg, State),
-	    {ok, NewKeys, Ssh} = ssh_transport:new_keys_message(Ssh1),
-	    send_msg(NewKeys, State),
-	    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-						  description = Desc,
-						  language = "en"}, State)
-    end;
+    {ok, NextKexMsg, Ssh1} = ssh_transport:handle_kex_dh_gex_group(Msg, Ssh0),
+    send_msg(NextKexMsg, State),
+    {ok, NewKeys, Ssh} = ssh_transport:new_keys_message(Ssh1),
+    send_msg(NewKeys, State),
+    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})};
 
 key_exchange(#ssh_msg_kex_dh_gex_request{} = Msg, 
 	     #state{ssh_params = #ssh{role = client} = Ssh0} = State) ->
-    try ssh_transport:handle_kex_dh_gex_request(Msg, Ssh0) of 
-	{ok, NextKexMsg, Ssh} ->
-	    send_msg(NextKexMsg, State),
-	    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-						  description = Desc,
-						  language = "en"}, State)
-    end;
+    {ok, NextKexMsg, Ssh} = ssh_transport:handle_kex_dh_gex_request(Msg, Ssh0),
+    send_msg(NextKexMsg, State),
+    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})};
+
 key_exchange(#ssh_msg_kex_dh_gex_reply{} = Msg, 
 	     #state{ssh_params = #ssh{role = client} = Ssh0} = State) ->
-    try ssh_transport:handle_kex_dh_gex_reply(Msg, Ssh0) of 
-	{ok, NewKeys, Ssh} ->
-	    send_msg(NewKeys, State),
-	    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-						  description = Desc,
-						  language = "en"}, State)
-    end.
+    {ok, NewKeys, Ssh} = ssh_transport:handle_kex_dh_gex_reply(Msg, Ssh0),
+    send_msg(NewKeys, State),
+    {next_state, new_keys, next_packet(State#state{ssh_params = Ssh})}.
+
+%%--------------------------------------------------------------------
+-spec new_keys(#ssh_msg_newkeys{}, #state{}) -> gen_fsm_state_return().
+%%--------------------------------------------------------------------
 
 new_keys(#ssh_msg_newkeys{} = Msg, #state{ssh_params = Ssh0} = State0) ->
-    try ssh_transport:handle_new_keys(Msg, Ssh0) of
-	{ok, Ssh} ->
-	    {NextStateName, State} = 
-		after_new_keys(State0#state{ssh_params = Ssh}),
-	    {next_state, NextStateName, next_packet(State)}
-    catch
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State0);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-						  description = Desc,
-						  language = "en"}, State0)
-    end.
+    {ok, Ssh} = ssh_transport:handle_new_keys(Msg, Ssh0),
+    {NextStateName, State} =
+	after_new_keys(State0#state{ssh_params = Ssh}),
+    {next_state, NextStateName, next_packet(State)}.
+
+%%--------------------------------------------------------------------
+-spec userauth(#ssh_msg_service_request{} | #ssh_msg_service_accept{} |
+	       #ssh_msg_userauth_request{} | #ssh_msg_userauth_info_request{} |
+	       #ssh_msg_userauth_info_response{} | #ssh_msg_userauth_success{} |
+	       #ssh_msg_userauth_failure{} | #ssh_msg_userauth_banner{},
+	       #state{}) -> gen_fsm_state_return().
+%%--------------------------------------------------------------------
 
 userauth(#ssh_msg_service_request{name = "ssh-userauth"} = Msg, 
 	 #state{ssh_params = #ssh{role = server, 
 				  session_id = SessionId} = Ssh0} = State) ->
-    ssh_bits:install_messages(ssh_auth:userauth_messages()),
-    try ssh_auth:handle_userauth_request(Msg, SessionId, Ssh0) of
-	{ok, {Reply, Ssh}} ->
-	    send_msg(Reply, State),
-	    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}
-    catch 	
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-						  description = Desc,
-						  language = "en"}, State)
-    end;
+    {ok, {Reply, Ssh}} = ssh_auth:handle_userauth_request(Msg, SessionId, Ssh0),
+    send_msg(Reply, State),
+    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})};
 
 userauth(#ssh_msg_service_accept{name = "ssh-userauth"},  
 	 #state{ssh_params = #ssh{role = client,
@@ -344,93 +403,55 @@ userauth(#ssh_msg_service_accept{name = "ssh-userauth"},
 	 State) ->
     {Msg, Ssh} = ssh_auth:init_userauth_request_msg(Ssh0),
     send_msg(Msg, State),
-    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})};
+    {next_state, userauth, next_packet(State#state{auth_user = Ssh#ssh.user, ssh_params = Ssh})};
 
 userauth(#ssh_msg_userauth_request{service = "ssh-connection",
                                   method = "none"} = Msg, 
         #state{ssh_params = #ssh{session_id = SessionId, role = server, 
                                  service = "ssh-connection"} = Ssh0
               } = State) -> 
-    try ssh_auth:handle_userauth_request(Msg, SessionId, Ssh0) of
-       {not_authorized, {_User, _Reason}, {Reply, Ssh}} ->
-           send_msg(Reply, State),
-           {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}
-    catch 
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-						  description = Desc,
-						  language = "en"}, State)
-    end;
+    {not_authorized, {_User, _Reason}, {Reply, Ssh}} =
+	ssh_auth:handle_userauth_request(Msg, SessionId, Ssh0),
+    send_msg(Reply, State),
+    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})};
 
 userauth(#ssh_msg_userauth_request{service = "ssh-connection",
 				   method = Method} = Msg, 
 	 #state{ssh_params = #ssh{session_id = SessionId, role = server, 
 				  service = "ssh-connection",
 				  peer = {_, Address}} = Ssh0,
-		opts = Opts, manager = Pid} = State) -> 
-    try ssh_auth:handle_userauth_request(Msg, SessionId, Ssh0) of
+		opts = Opts, starter = Pid} = State) ->
+    case ssh_auth:handle_userauth_request(Msg, SessionId, Ssh0) of
 	{authorized, User, {Reply, Ssh}} ->
 	    send_msg(Reply, State),
-	    ssh_userreg:register_user(User, Pid),
 	    Pid ! ssh_connected,
 	    connected_fun(User, Address, Method, Opts),
 	    {next_state, connected, 
-	     next_packet(State#state{ssh_params = Ssh})};
+	     next_packet(State#state{auth_user = User, ssh_params = Ssh})};
 	{not_authorized, {User, Reason}, {Reply, Ssh}} ->
-	    retry_fun(User, Reason, Opts),
+	    retry_fun(User, Address, Reason, Opts),
 	    send_msg(Reply, State),
 	    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})} 
-    catch 	
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-						  description = Desc,
-						  language = "en"}, State)
     end;
 
 userauth(#ssh_msg_userauth_info_request{} = Msg, 
 	 #state{ssh_params = #ssh{role = client, 
 				  io_cb = IoCb} = Ssh0} = State) ->
-    try ssh_auth:handle_userauth_info_request(Msg, IoCb, Ssh0) of
-	{ok, {Reply, Ssh}} ->
-	    send_msg(Reply, State),
-	    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}
-    catch 	
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-						  description = Desc,
-						  language = "en"}, State)
-    end;
+    {ok, {Reply, Ssh}} = ssh_auth:handle_userauth_info_request(Msg, IoCb, Ssh0),
+    send_msg(Reply, State),
+    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})};
 
 userauth(#ssh_msg_userauth_info_response{} = Msg, 
 	 #state{ssh_params = #ssh{role = server} = Ssh0} = State) ->
-    try ssh_auth:handle_userauth_info_response(Msg, Ssh0) of
-	{ok, {Reply, Ssh}} ->
-	    send_msg(Reply, State),
-	    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}
-    catch 	
-	#ssh_msg_disconnect{} = DisconnectMsg ->
-	    handle_disconnect(DisconnectMsg, State);
-	_:Error ->
-	    Desc = log_error(Error),
-	    handle_disconnect(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
-						  description = Desc,
-						  language = "en"}, State)
-    end;
+    {ok, {Reply, Ssh}} = ssh_auth:handle_userauth_info_response(Msg, Ssh0),
+    send_msg(Reply, State),
+    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})};
 			
-userauth(#ssh_msg_userauth_success{}, #state{ssh_params = #ssh{role = client},
-					     manager = Pid} = State) ->
+userauth(#ssh_msg_userauth_success{}, #state{ssh_params = #ssh{role = client} = Ssh,
+					     starter = Pid} = State) ->
     Pid ! ssh_connected,
-    {next_state, connected, next_packet(State)};
-
+    {next_state, connected, next_packet(State#state{ssh_params =
+							Ssh#ssh{authenticated = true}})};
 userauth(#ssh_msg_userauth_failure{},  
 	 #state{ssh_params = #ssh{role = client,
 				  userauth_methods = []}} 
@@ -451,11 +472,12 @@ userauth(#ssh_msg_userauth_failure{authentications = Methodes},
     case ssh_auth:userauth_request_msg(Ssh1) of
 	{disconnect, DisconnectMsg, {Msg, Ssh}} ->
 	    send_msg(Msg, State),
-	    handle_disconnect(DisconnectMsg, State#state{ssh_params = Ssh}); 
+	    handle_disconnect(DisconnectMsg, State#state{ssh_params = Ssh});
 	{Msg, Ssh} ->
 	    send_msg(Msg, State),
 	    {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}
     end;
+
 %% The prefered authentication method failed try next method 
 userauth(#ssh_msg_userauth_failure{},  
 	 #state{ssh_params = #ssh{role = client} = Ssh0} = State) ->
@@ -478,31 +500,28 @@ userauth(#ssh_msg_userauth_banner{message = Msg},
     io:format("~s", [Msg]),
     {next_state, userauth, next_packet(State)}.
 
+%%--------------------------------------------------------------------
+-spec connected({#ssh_msg_kexinit{}, binary()}, %%| %% #ssh_msg_kexdh_init{},
+		 #state{}) -> gen_fsm_state_return().
+%%--------------------------------------------------------------------
 connected({#ssh_msg_kexinit{}, _Payload} = Event, State) ->
-    kexinit(Event, State#state{renegotiate = true});
-connected({#ssh_msg_kexdh_init{}, _Payload} = Event, State) ->
-    key_exchange(Event, State#state{renegotiate = true}).
+    kexinit(Event, State#state{renegotiate = true}).
+%% ;
+%% connected(#ssh_msg_kexdh_init{} = Event, State) ->
+%%     key_exchange(Event, State#state{renegotiate = true}).
 
 %%--------------------------------------------------------------------
-%% Function: 
-%% handle_event(Event, StateName, State) -> {next_state, NextStateName, 
-%%						  NextState} |
-%%                                          {next_state, NextStateName, 
-%%					          NextState, Timeout} |
-%%                                          {stop, Reason, NewState}
-%% Description: Whenever a gen_fsm receives an event sent using
-%% gen_fsm:send_all_state_event/2, this function is called to handle
-%% the event.
-%%--------------------------------------------------------------------
-handle_event({send, Data}, StateName, #state{ssh_params = Ssh0} = State) ->
-    {Packet, Ssh} = ssh_transport:pack(Data, Ssh0),
-    send_msg(Packet, State),
-    {next_state, StateName, next_packet(State#state{ssh_params = Ssh})};
+-spec handle_event(#ssh_msg_disconnect{} | #ssh_msg_ignore{} | #ssh_msg_debug{} |
+		   #ssh_msg_unimplemented{} | {adjust_window, integer(), integer()} |
+		   {reply_request, success | failure, integer()} | renegotiate |
+		   data_size | {request, pid(), integer(), integer(), iolist()} |
+		   {request, integer(), integer(), iolist()}, state_name(),
+		   #state{}) -> gen_fsm_state_return().
 
-handle_event(#ssh_msg_disconnect{} = Msg, _StateName, 
-	     #state{manager = Pid} = State) ->
-    (catch ssh_connection_manager:event(Pid, Msg)),
-    {stop, normal, State};
+%%--------------------------------------------------------------------
+handle_event(#ssh_msg_disconnect{description = Desc} = DisconnectMsg, _StateName, #state{} = State) ->
+    handle_disconnect(DisconnectMsg, State),
+    {stop, {shutdown, Desc}, State};
 
 handle_event(#ssh_msg_ignore{}, StateName, State) ->
     {next_state, StateName, next_packet(State)};
@@ -518,30 +537,58 @@ handle_event(#ssh_msg_debug{}, StateName, State) ->
 handle_event(#ssh_msg_unimplemented{}, StateName, State) ->
     {next_state, StateName, next_packet(State)};
 
+handle_event({adjust_window, ChannelId, Bytes}, StateName,
+	     #state{connection_state =
+			#connection{channel_cache = Cache}} = State0) ->
+    State =
+	case ssh_channel:cache_lookup(Cache, ChannelId) of
+	    #channel{recv_window_size = WinSize, remote_id = Id} = Channel ->
+		ssh_channel:cache_update(Cache, Channel#channel{recv_window_size =
+					       WinSize + Bytes}),
+		Msg = ssh_connection:channel_adjust_window_msg(Id, Bytes),
+		send_replies([{connection_reply, Msg}], State0);
+	undefined ->
+	    State0
+	end,
+    {next_state, StateName, next_packet(State)};
+
+handle_event({reply_request, success, ChannelId}, StateName,
+		  #state{connection_state =
+			     #connection{channel_cache = Cache}} = State0) ->
+    State = case ssh_channel:cache_lookup(Cache, ChannelId) of
+		#channel{remote_id = RemoteId} ->
+		    Msg = ssh_connection:channel_success_msg(RemoteId),
+		    send_replies([{connection_reply, Msg}], State0);
+		undefined ->
+		    State0
+	    end,
+    {next_state, StateName, State};
+
 handle_event(renegotiate, connected, #state{ssh_params = Ssh0} 
 	     = State) ->
     {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(Ssh0),
     send_msg(SshPacket, State),
-    {next_state, connected, 
+    timer:apply_after(?REKEY_TIMOUT, gen_fsm, send_all_state_event, [self(), renegotiate]),
+    {next_state, kexinit,
      next_packet(State#state{ssh_params = Ssh,
 			     key_exchange_init_msg = KeyInitMsg,
 			     renegotiate = true})};
 
 handle_event(renegotiate, StateName, State) ->
+    timer:apply_after(?REKEY_TIMOUT, gen_fsm, send_all_state_event, [self(), renegotiatie]),
     %% Allready in keyexcahange so ignore
     {next_state, StateName, State};
 
-handle_event({info, From, Options}, StateName,  #state{ssh_params = Ssh} = State) ->
-    spawn(?MODULE, ssh_info_handler, [Options, Ssh, From]), 
-    {next_state, StateName, State};
+%% Rekey due to sent data limit reached?
 handle_event(data_size, connected, #state{ssh_params = Ssh0} = State) ->
     {ok, [{send_oct,Sent}]} = inet:getstat(State#state.socket, [send_oct]),
     MaxSent = proplists:get_value(rekey_limit, State#state.opts, 1024000000),
+    timer:apply_after(?REKEY_DATA_TIMOUT, gen_fsm, send_all_state_event, [self(), data_size]),
     case Sent >= MaxSent of
 	true ->
 	    {KeyInitMsg, SshPacket, Ssh} = ssh_transport:key_exchange_init_msg(Ssh0),
 	    send_msg(SshPacket, State),
-	    {next_state, connected, 
+	    {next_state, kexinit,
 	     next_packet(State#state{ssh_params = Ssh,
 				     key_exchange_init_msg = KeyInitMsg,
 				     renegotiate = true})};
@@ -550,42 +597,196 @@ handle_event(data_size, connected, #state{ssh_params = Ssh0} = State) ->
     end;
 handle_event(data_size, StateName, State) ->
     {next_state, StateName, State};
+
+handle_event({request, ChannelPid, ChannelId, Type, Data}, StateName, State0) ->
+    {{replies, Replies}, State1} = handle_request(ChannelPid, ChannelId,
+						 Type, Data,
+						 false, none, State0),
+    State = send_replies(Replies, State1),
+    {next_state, StateName, next_packet(State)};
+
+handle_event({request, ChannelId, Type, Data}, StateName, State0) ->
+    {{replies, Replies}, State1} = handle_request(ChannelId, Type, Data,
+						 false, none, State0),
+    State = send_replies(Replies, State1),
+    {next_state, StateName, next_packet(State)};
+
 handle_event({unknown, Data}, StateName, State) ->
     Msg = #ssh_msg_unimplemented{sequence = Data},
     send_msg(Msg, State),
     {next_state, StateName, next_packet(State)}.
+
 %%--------------------------------------------------------------------
-%% Function: 
-%% handle_sync_event(Event, From, StateName, 
-%%                   State) -> {next_state, NextStateName, NextState} |
-%%                             {next_state, NextStateName, NextState, 
-%%                              Timeout} |
-%%                             {reply, Reply, NextStateName, NextState}|
-%%                             {reply, Reply, NextStateName, NextState, 
-%%                              Timeout} |
-%%                             {stop, Reason, NewState} |
-%%                             {stop, Reason, Reply, NewState}
-%% Description: Whenever a gen_fsm receives an event sent using
-%% gen_fsm:sync_send_all_state_event/2,3, this function is called to handle
-%% the event.
+-spec handle_sync_event({request, pid(), channel_id(), integer(), binary(), timeout()} |
+			{request, channel_id(), integer(), binary(), timeout()} |
+			{global_request, pid(), integer(), boolean(), binary()} | {eof, integer()} |
+			{open, pid(), integer(), channel_id(), integer(), binary(), _} |
+			{send_window, channel_id()} | {recv_window, channel_id()} |
+			{connection_info, [client_version | server_version | peer |
+					   sockname]} | {channel_info, channel_id(), [recv_window |
+										      send_window]} |
+			{close, channel_id()} | stop, term(), state_name(), #state{})
+		       -> gen_fsm_state_return().
 %%--------------------------------------------------------------------
+handle_sync_event({request, ChannelPid, ChannelId, Type, Data, Timeout}, From,  StateName, State0) ->
+    {{replies, Replies}, State1} = handle_request(ChannelPid,
+						 ChannelId, Type, Data,
+						 true, From, State0),
+    %% Note reply to channel will happen later when
+    %% reply is recived from peer on the socket
+    State = send_replies(Replies, State1),
+    start_timeout(ChannelId, From, Timeout),
+    handle_idle_timeout(State),
+    {next_state, StateName, next_packet(State)};
 
-%% Replaced with option to connection_info/3. For now keep 
-%% for backwards compatibility
-handle_sync_event(peer_address, _From, StateName, 
-		  #state{ssh_params = #ssh{peer = {_, Address}}} = State) ->
-    {reply, {ok, Address}, StateName, State}.
+handle_sync_event({request, ChannelId, Type, Data, Timeout}, From,  StateName, State0) ->
+    {{replies, Replies}, State1} = handle_request(ChannelId, Type, Data,
+						 true, From, State0),
+    %% Note reply to channel will happen later when
+    %% reply is recived from peer on the socket
+    State = send_replies(Replies, State1),
+    start_timeout(ChannelId, From, Timeout),
+    handle_idle_timeout(State),
+    {next_state, StateName, next_packet(State)};
+
+handle_sync_event({global_request, Pid, _, _, _} = Request, From, StateName,
+		  #state{connection_state =
+			     #connection{channel_cache = Cache}} = State0) ->
+    State1 = handle_global_request(Request, State0),
+    Channel = ssh_channel:cache_find(Pid, Cache),
+    State = add_request(true, Channel#channel.local_id, From, State1),
+    {next_state, StateName, next_packet(State)};
+
+handle_sync_event({data, ChannelId, Type, Data, Timeout}, From, StateName,
+		  #state{connection_state = #connection{channel_cache = _Cache}
+			 = Connection0} = State0) ->
+
+    case ssh_connection:channel_data(ChannelId, Type, Data, Connection0, From) of
+	{{replies, Replies}, Connection} ->
+	    State = send_replies(Replies,  State0#state{connection_state = Connection}),
+	    start_timeout(ChannelId, From, Timeout),
+	    {next_state, StateName, next_packet(State)};
+	{noreply, Connection} ->
+	    start_timeout(ChannelId, From, Timeout),
+	    {next_state, StateName, next_packet(State0#state{connection_state = Connection})}
+    end;
+
+handle_sync_event({eof, ChannelId}, _From, StateName,
+		  #state{connection_state =
+			     #connection{channel_cache = Cache}} = State0) ->
+    case ssh_channel:cache_lookup(Cache, ChannelId) of
+	#channel{remote_id = Id, sent_close = false} ->
+	    State = send_replies([{connection_reply,
+			  ssh_connection:channel_eof_msg(Id)}], State0),
+	    {reply, ok, StateName, next_packet(State)};
+	_ ->
+	    {reply, {error,closed}, StateName, State0}
+    end;
+
+handle_sync_event({open, ChannelPid, Type, InitialWindowSize, MaxPacketSize, Data, Timeout},
+		  From,  StateName, #state{connection_state =
+					       #connection{channel_cache = Cache}} = State0) ->
+    erlang:monitor(process, ChannelPid),
+    {ChannelId, State1}  = new_channel_id(State0),
+    Msg = ssh_connection:channel_open_msg(Type, ChannelId,
+					  InitialWindowSize,
+					  MaxPacketSize, Data),
+    State2 = send_replies([{connection_reply, Msg}], State1),
+    Channel = #channel{type = Type,
+		       sys = "none",
+		       user = ChannelPid,
+		       local_id = ChannelId,
+		       recv_window_size = InitialWindowSize,
+		       recv_packet_size = MaxPacketSize},
+    ssh_channel:cache_update(Cache, Channel),
+    State = add_request(true, ChannelId, From, State2),
+    start_timeout(ChannelId, From, Timeout),
+    {next_state, StateName, next_packet(remove_timer_ref(State))};
+
+handle_sync_event({send_window, ChannelId}, _From, StateName,
+		  #state{connection_state =
+			     #connection{channel_cache = Cache}} = State) ->
+    Reply = case ssh_channel:cache_lookup(Cache, ChannelId) of
+		#channel{send_window_size = WinSize,
+			 send_packet_size = Packsize} ->
+		    {ok, {WinSize, Packsize}};
+		undefined ->
+		    {error, einval}
+	    end,
+    {reply, Reply, StateName, next_packet(State)};
+
+handle_sync_event({recv_window, ChannelId}, _From, StateName,
+		  #state{connection_state = #connection{channel_cache = Cache}}
+	     = State) ->
+
+    Reply = case ssh_channel:cache_lookup(Cache, ChannelId) of
+		#channel{recv_window_size = WinSize,
+			 recv_packet_size = Packsize} ->
+		    {ok, {WinSize, Packsize}};
+		undefined ->
+		    {error, einval}
+	    end,
+    {reply, Reply, StateName, next_packet(State)};
+
+handle_sync_event({connection_info, Options}, _From, StateName, State) ->
+    Info = ssh_info(Options, State, []),
+    {reply, Info, StateName, State};
+
+handle_sync_event({channel_info, ChannelId, Options}, _From, StateName,
+		  #state{connection_state = #connection{channel_cache = Cache}} = State) ->
+    case ssh_channel:cache_lookup(Cache, ChannelId) of
+       #channel{} = Channel ->
+	    Info = ssh_channel_info(Options, Channel, []),
+	    {reply, Info, StateName, State};
+	undefined ->
+	    {reply, [], StateName, State}
+    end;
+
+handle_sync_event({info, ChannelPid}, _From, StateName,
+	    #state{connection_state =
+		       #connection{channel_cache = Cache}} = State) ->
+    Result = ssh_channel:cache_foldl(
+	       fun(Channel, Acc) when ChannelPid == all;
+				      Channel#channel.user == ChannelPid ->
+		       [Channel | Acc];
+		  (_, Acc) ->
+		       Acc
+	       end, [], Cache),
+    {reply, {ok, Result}, StateName, State};
+
+handle_sync_event({close, ChannelId}, _, StateName,
+		  #state{connection_state =
+			     #connection{channel_cache = Cache}} = State0) ->
+    State =
+	case ssh_channel:cache_lookup(Cache, ChannelId) of
+	    #channel{remote_id = Id} = Channel ->
+		State1 = send_replies([{connection_reply,
+				       ssh_connection:channel_close_msg(Id)}], State0),
+		ssh_channel:cache_update(Cache, Channel#channel{sent_close = true}),
+		handle_idle_timeout(State1),
+		State1;
+	    undefined ->
+		State0
+	end,
+    {reply, ok, StateName, next_packet(State)};
+
+handle_sync_event(stop, _, _StateName, #state{connection_state = Connection0,
+					     role = Role,
+					     opts = Opts} = State0) ->
+    {disconnect, Reason, {{replies, Replies}, Connection}} =
+	ssh_connection:handle_msg(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
+						      description = "User closed down connection",
+						      language = "en"}, Connection0, Role),
+    State = send_replies(Replies, State0),
+    SSHOpts = proplists:get_value(ssh_opts, Opts),
+    disconnect_fun(Reason, SSHOpts),
+    {stop, normal, ok, State#state{connection_state = Connection}}.
 
 %%--------------------------------------------------------------------
-%% Function: 
-%% handle_info(Info,StateName,State)-> {next_state, NextStateName, NextState}|
-%%                                     {next_state, NextStateName, NextState, 
-%%                                       Timeout} |
-%%                                     {stop, Reason, NewState}
-%% Description: This function is called by a gen_fsm when it receives any
-%% other message than a synchronous or asynchronous event
-%% (or a system message).
+-spec handle_info({atom(), port(), binary()} | {atom(), port()} |
+		  term (), state_name(), #state{}) -> gen_fsm_state_return().
 %%--------------------------------------------------------------------
+
 handle_info({Protocol, Socket, "SSH-" ++ _ = Version}, hello, 
 	    #state{socket = Socket,
 		   transport_protocol = Protocol} = State ) -> 
@@ -650,15 +851,39 @@ handle_info({Protocol, Socket, Data}, Statename,
 handle_info({CloseTag, _Socket}, _StateName, 
 	    #state{transport_close_tag = CloseTag,
 		   ssh_params = #ssh{role = _Role, opts = _Opts}} = State) ->
-    DisconnectMsg =
-	#ssh_msg_disconnect{code = ?SSH_DISCONNECT_CONNECTION_LOST,
-			    description = "Connection Lost",
+    DisconnectMsg = 
+	#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
+			    description = "Connection closed",
 			    language = "en"},
-    {stop, {shutdown, DisconnectMsg}, State};
+    handle_disconnect(DisconnectMsg, State);
+
+handle_info({timeout, {_, From} = Request}, Statename,
+	    #state{connection_state = #connection{requests = Requests} = Connection} = State) ->
+    case lists:member(Request, Requests) of
+	true ->
+	    gen_fsm:reply(From, {error, timeout}),
+	    {next_state, Statename,
+	     State#state{connection_state =
+			     Connection#connection{requests =
+						       lists:delete(Request, Requests)}}};
+	false ->
+	    {next_state, Statename, State}
+    end;
+
+%%% Handle that ssh channels user process goes down
+handle_info({'DOWN', _Ref, process, ChannelPid, _Reason}, Statename, State0) ->
+    {{replies, Replies}, State1} = handle_channel_down(ChannelPid, State0),
+    State = send_replies(Replies, State1),
+    {next_state, Statename, next_packet(State)};
 
 %%% So that terminate will be run when supervisor is shutdown
 handle_info({'EXIT', _Sup, Reason}, _StateName, State) ->
-    {stop, Reason, State};
+    {stop, {shutdown, Reason}, State};
+
+handle_info({check_cache, _ , _},
+	    StateName, #state{connection_state =
+		       #connection{channel_cache = Cache}} = State) ->
+    {next_state, StateName, check_cache(State, Cache)};
 
 handle_info(UnexpectedMessage, StateName, #state{ssh_params = SshParams} = State) ->
     Msg = lists:flatten(io_lib:format(
@@ -672,20 +897,16 @@ handle_info(UnexpectedMessage, StateName, #state{ssh_params = SshParams} = State
     {next_state, StateName, State}.
 
 %%--------------------------------------------------------------------
-%% Function: terminate(Reason, StateName, State) -> void()
-%% Description:This function is called by a gen_fsm when it is about
-%% to terminate. It should be the opposite of Module:init/1 and do any
-%% necessary cleaning up. When it returns, the gen_fsm terminates with
-%% Reason. The return value is ignored.
+-spec terminate(Reason::term(), state_name(), #state{}) -> _.
 %%--------------------------------------------------------------------
 terminate(normal, _, #state{transport_cb = Transport,
-			    socket = Socket,
-			    manager = Pid}) ->
-    (catch ssh_userreg:delete_user(Pid)),
+			    connection_state = Connection,
+			    socket = Socket}) ->
+    terminate_subsytem(Connection),
     (catch Transport:close(Socket)),
     ok;
 
-%% Terminated as manager terminated
+%% Terminated by supervisor
 terminate(shutdown, StateName, #state{ssh_params = Ssh0} = State) ->
     DisconnectMsg = 
 	#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
@@ -695,31 +916,34 @@ terminate(shutdown, StateName, #state{ssh_params = Ssh0} = State) ->
     send_msg(SshPacket, State),
     terminate(normal, StateName, State#state{ssh_params = Ssh});
 
-terminate({shutdown, #ssh_msg_disconnect{} = Msg}, StateName, #state{ssh_params = Ssh0, manager = Pid} = State) ->
-    {SshPacket, Ssh} = ssh_transport:ssh_packet(Msg, Ssh0),
-    send_msg(SshPacket, State),
-    ssh_connection_manager:event(Pid, Msg),
-    terminate(normal, StateName, State#state{ssh_params = Ssh});
-terminate({shutdown, {#ssh_msg_disconnect{} = Msg, ErrorMsg}}, StateName, #state{ssh_params = Ssh0, manager = Pid} = State) ->
-    {SshPacket, Ssh} = ssh_transport:ssh_packet(Msg, Ssh0),
+terminate({shutdown, #ssh_msg_disconnect{} = Msg}, StateName,
+	  #state{ssh_params = Ssh0} = State) ->
+     {SshPacket, Ssh} = ssh_transport:ssh_packet(Msg, Ssh0),
     send_msg(SshPacket, State),
-    ssh_connection_manager:event(Pid, Msg, ErrorMsg),
-    terminate(normal, StateName, State#state{ssh_params = Ssh});
-terminate(Reason, StateName, #state{ssh_params = Ssh0, manager = Pid} = State) ->
+     terminate(normal, StateName, State#state{ssh_params = Ssh});
+terminate({shutdown, _}, StateName, State) ->
+    terminate(normal, StateName, State);
+terminate(Reason, StateName, #state{ssh_params = Ssh0, starter = _Pid,
+				   connection_state = Connection} = State) ->
+    terminate_subsytem(Connection),
     log_error(Reason),
     DisconnectMsg = 
 	#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
 			    description = "Internal error",
 			    language = "en"},
     {SshPacket, Ssh} = ssh_transport:ssh_packet(DisconnectMsg, Ssh0),
-    ssh_connection_manager:event(Pid, DisconnectMsg),
     send_msg(SshPacket, State),
     terminate(normal, StateName, State#state{ssh_params = Ssh}).
 
+terminate_subsytem(#connection{system_supervisor = SysSup,
+			       sub_system_supervisor = SubSysSup}) when is_pid(SubSysSup) ->
+    ssh_system_sup:stop_subsystem(SysSup, SubSysSup);
+terminate_subsytem(_) ->
+    ok.
+
 %%--------------------------------------------------------------------
-%% Function:
-%% code_change(OldVsn, StateName, State, Extra) -> {ok, StateName, NewState}
-%% Description: Convert process state when code is changed
+-spec code_change(OldVsn::term(), state_name(), Oldstate::term(), Extra::term()) ->
+			 {ok, state_name(), #state{}}.
 %%--------------------------------------------------------------------
 code_change(_OldVsn, StateName, State, _Extra) ->
     {ok, StateName, State}.
@@ -727,6 +951,39 @@ code_change(_OldVsn, StateName, State, _Extra) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
+init_role(#state{role = client, opts = Opts} = State0) ->
+    Pid = proplists:get_value(user_pid, Opts),
+    TimerRef = get_idle_time(Opts),
+    timer:apply_after(?REKEY_TIMOUT, gen_fsm, send_all_state_event, [self(), renegotiate]),
+    timer:apply_after(?REKEY_DATA_TIMOUT, gen_fsm, send_all_state_event,
+		       [self(), data_size]),
+    State0#state{starter = Pid,
+		 idle_timer_ref = TimerRef};
+init_role(#state{role = server, opts = Opts, connection_state = Connection} = State) ->
+    Sups = proplists:get_value(supervisors, Opts),
+    Pid = proplists:get_value(user_pid, Opts),
+    SystemSup = proplists:get_value(system_sup, Sups),
+    SubSystemSup = proplists:get_value(subsystem_sup, Sups),
+    ConnectionSup = proplists:get_value(connection_sup, Sups),
+    Shell = proplists:get_value(shell, Opts),
+    Exec = proplists:get_value(exec, Opts),
+    CliSpec = proplists:get_value(ssh_cli, Opts, {ssh_cli, [Shell]}),
+    State#state{starter = Pid, connection_state = Connection#connection{
+						    cli_spec = CliSpec,
+						    exec = Exec,
+						    system_supervisor = SystemSup,
+						    sub_system_supervisor = SubSystemSup,
+						    connection_supervisor = ConnectionSup
+						   }}.
+
+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.
+
 init_ssh(client = Role, Vsn, Version, Options, Socket) ->
     IOCb = case proplists:get_value(user_interaction, Options, true) of
 	       true -> 
@@ -844,7 +1101,15 @@ send_all_state_event(FsmPid, Event) ->
     gen_fsm:send_all_state_event(FsmPid, Event).
 
 sync_send_all_state_event(FsmPid, Event) ->
-    gen_fsm:sync_send_all_state_event(FsmPid, Event).
+    try gen_fsm:sync_send_all_state_event(FsmPid, Event, infinity)
+    catch
+	exit:{noproc, _} ->
+	    {error, closed};
+	exit:{normal, _} ->
+	    {error, closed};
+	exit:{{shutdown, _},_} ->
+	    {error, closed}
+    end.
 
 %% simulate send_all_state_event(self(), Event) 
 event(#ssh_msg_disconnect{} = Event, StateName, State) ->
@@ -857,10 +1122,33 @@ event(#ssh_msg_unimplemented{} = Event, StateName, State) ->
     handle_event(Event, StateName, State);
 %% simulate send_event(self(), Event)
 event(Event, StateName, State) ->
-    ?MODULE:StateName(Event, State).
+    try
+	?MODULE:StateName(Event, State)
+    catch
+	throw:#ssh_msg_disconnect{} = DisconnectMsg ->
+	    handle_disconnect(DisconnectMsg, State);
+	throw:{ErrorToDisplay, #ssh_msg_disconnect{} = DisconnectMsg}  ->
+	    handle_disconnect(DisconnectMsg, State, ErrorToDisplay);
+	_:Error ->
+	    log_error(Error),
+	    handle_disconnect(#ssh_msg_disconnect{code = error_code(StateName),
+						  description = "Internal error",
+						  language = "en"}, State)
+    end.
+error_code(key_exchange) ->
+    ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED;
+error_code(new_keys) ->
+    ?SSH_DISCONNECT_KEY_EXCHANGE_FAILED;
+error_code(_) ->
+    ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE.
 
 generate_event(<<?BYTE(Byte), _/binary>> = Msg, StateName,
-	       #state{manager = Pid} = State0, EncData) 
+	       #state{
+		  role = Role,
+		  starter = User,
+		  opts = Opts,
+		  renegotiate = Renegotiation,
+		  connection_state = Connection0} = State0, EncData)
   when  Byte == ?SSH_MSG_GLOBAL_REQUEST;
 	Byte == ?SSH_MSG_REQUEST_SUCCESS;
 	Byte == ?SSH_MSG_REQUEST_FAILURE;
@@ -875,18 +1163,40 @@ generate_event(<<?BYTE(Byte), _/binary>> = Msg, StateName,
 	Byte == ?SSH_MSG_CHANNEL_REQUEST;
 	Byte == ?SSH_MSG_CHANNEL_SUCCESS;
 	Byte == ?SSH_MSG_CHANNEL_FAILURE ->
-
-    try 
-	ssh_connection_manager:event(Pid, Msg),
-	State = generate_event_new_state(State0, EncData),
-	next_packet(State),
-	{next_state, StateName, State}
+    ConnectionMsg =  ssh_message:decode(Msg),
+    State1 = generate_event_new_state(State0, EncData),
+    try ssh_connection:handle_msg(ConnectionMsg, Connection0, Role) of
+	{{replies, Replies}, Connection} ->
+	    State = send_replies(Replies,  State1#state{connection_state = Connection}),
+	    {next_state, StateName, next_packet(State)};
+	{noreply, Connection} ->
+	    {next_state, StateName, next_packet(State1#state{connection_state = Connection})};
+	{disconnect, {_, Reason}, {{replies, Replies}, Connection}} when
+	      Role == client andalso ((StateName =/= connected) and (not Renegotiation)) ->
+	    State = send_replies(Replies,  State1#state{connection_state = Connection}),
+	    User ! {self(), not_connected, Reason},
+	    {stop, {shutdown, normal},
+	     next_packet(State#state{connection_state = Connection})};
+	{disconnect, Reason, {{replies, Replies}, Connection}} ->
+	    State = send_replies(Replies,  State1#state{connection_state = Connection}),
+	    SSHOpts = proplists:get_value(ssh_opts, Opts),
+	    disconnect_fun(Reason, SSHOpts),
+	    {stop, {shutdown, normal}, State#state{connection_state = Connection}}
     catch
-	exit:{noproc, Reason} ->
-	    {stop, {shutdown, Reason}, State0}
+	_:Error ->
+	    {disconnect, Reason, {{replies, Replies}, Connection}} =
+		ssh_connection:handle_msg(
+		  #ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
+					  description = "Internal error",
+				      language = "en"}, Connection0, Role),
+	    State = send_replies(Replies,  State1#state{connection_state = Connection}),
+	    SSHOpts = proplists:get_value(ssh_opts, Opts),
+	    disconnect_fun(Reason, SSHOpts),
+	    {stop, {shutdown, Error}, State#state{connection_state = Connection}}
     end;
+
 generate_event(Msg, StateName, State0, EncData) ->
-    Event = ssh_bits:decode(Msg),
+    Event = ssh_message:decode(Msg),
     State = generate_event_new_state(State0, EncData),
     case Event of
 	#ssh_msg_kexinit{} ->
@@ -896,6 +1206,100 @@ generate_event(Msg, StateName, State0, EncData) ->
 	    event(Event, StateName, State)
     end.
 
+
+handle_request(ChannelPid, ChannelId, Type, Data, WantReply, From,
+	       #state{connection_state =
+		      #connection{channel_cache = Cache}} = State0) ->
+    case ssh_channel:cache_lookup(Cache, ChannelId) of
+	#channel{remote_id = Id} = Channel ->
+	    update_sys(Cache, Channel, Type, ChannelPid),
+	    Msg = ssh_connection:channel_request_msg(Id, Type,
+						     WantReply, Data),
+	    Replies = [{connection_reply, Msg}],
+	    State = add_request(WantReply, ChannelId, From, State0),
+	    {{replies, Replies}, State};
+	undefined ->
+	    {{replies, []}, State0}
+    end.
+
+handle_request(ChannelId, Type, Data, WantReply, From,
+	       #state{connection_state =
+		      #connection{channel_cache = Cache}} = State0) ->
+    case ssh_channel:cache_lookup(Cache, ChannelId) of
+	#channel{remote_id = Id}  ->
+	    Msg = ssh_connection:channel_request_msg(Id, Type,
+						     WantReply, Data),
+	    Replies = [{connection_reply, Msg}],
+	    State = add_request(WantReply, ChannelId, From, State0),
+	    {{replies, Replies}, State};
+	undefined ->
+	    {{replies, []}, State0}
+    end.
+
+handle_global_request({global_request, ChannelPid,
+		       "tcpip-forward" = Type, WantReply,
+		       <<?UINT32(IPLen),
+			IP:IPLen/binary, ?UINT32(Port)>> = Data},
+		      #state{connection_state =
+				 #connection{channel_cache = Cache}
+			     = Connection0} = State) ->
+    ssh_channel:cache_update(Cache, #channel{user = ChannelPid,
+					     type = "forwarded-tcpip",
+					     sys = none}),
+    Connection = ssh_connection:bind(IP, Port, ChannelPid, Connection0),
+    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
+    send_replies([{connection_reply, Msg}],  State#state{connection_state = Connection});
+
+handle_global_request({global_request, _Pid, "cancel-tcpip-forward" = Type,
+		       WantReply, <<?UINT32(IPLen),
+				   IP:IPLen/binary, ?UINT32(Port)>> = Data},
+		      #state{connection_state = Connection0} = State) ->
+    Connection = ssh_connection:unbind(IP, Port, Connection0),
+    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
+    send_replies([{connection_reply, Msg}], State#state{connection_state = Connection});
+
+handle_global_request({global_request, _, "cancel-tcpip-forward" = Type,
+		       WantReply, Data}, State) ->
+    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
+    send_replies([{connection_reply, Msg}], State).
+
+handle_idle_timeout(#state{opts = Opts}) ->
+    case proplists:get_value(idle_time, Opts, infinity) of
+	infinity ->
+	    ok;
+	IdleTime ->
+	    erlang:send_after(IdleTime, self(), {check_cache, [], []})
+    end.
+
+handle_channel_down(ChannelPid, #state{connection_state =
+					   #connection{channel_cache = Cache}} =
+			State) ->
+    ssh_channel:cache_foldl(
+	       fun(Channel, Acc) when Channel#channel.user == ChannelPid ->
+		       ssh_channel:cache_delete(Cache,
+						Channel#channel.local_id),
+		       Acc;
+		  (_,Acc) ->
+		       Acc
+	       end, [], Cache),
+    {{replies, []}, check_cache(State, Cache)}.
+
+update_sys(Cache, Channel, Type, ChannelPid) ->
+    ssh_channel:cache_update(Cache,
+			     Channel#channel{sys = Type, user = ChannelPid}).
+add_request(false, _ChannelId, _From, State) ->
+    State;
+add_request(true, ChannelId, From, #state{connection_state =
+					#connection{requests = Requests0} =
+					Connection} = State) ->
+    Requests = [{ChannelId, From} | Requests0],
+    State#state{connection_state = Connection#connection{requests = Requests}}.
+
+new_channel_id(#state{connection_state = #connection{channel_id_seed = Id} =
+		      Connection}
+	       = State) ->
+    {Id, State#state{connection_state =
+		     Connection#connection{channel_id_seed = Id + 1}}}.
 generate_event_new_state(#state{ssh_params = 
 				#ssh{recv_sequence = SeqNum0} 
 				= Ssh} = State, EncData) ->
@@ -905,7 +1309,6 @@ generate_event_new_state(#state{ssh_params =
 		encoded_data_buffer = EncData, 
 		undecoded_packet_length = undefined}.
 
-
 next_packet(#state{decoded_data_buffer = <<>>,
 		   encoded_data_buffer = Buff,
 		   ssh_params = #ssh{decrypt_block_size = BlockSize},
@@ -930,7 +1333,6 @@ after_new_keys(#state{renegotiate = true} = State) ->
     {connected, State#state{renegotiate = false}};
 after_new_keys(#state{renegotiate = false, 
 		      ssh_params = #ssh{role = client} = Ssh0} = State) ->
-    ssh_bits:install_messages(ssh_auth:userauth_messages()),
     {Msg, Ssh} = ssh_auth:service_request_msg(Ssh0),
     send_msg(Msg, State),
     {userauth, State#state{ssh_params = Ssh}};
@@ -980,10 +1382,16 @@ handle_ssh_packet(Length, StateName, #state{decoded_data_buffer = DecData0,
 	    handle_disconnect(DisconnectMsg, State0)
     end.
 
-handle_disconnect(#ssh_msg_disconnect{} = Msg, State) ->
-    {stop, {shutdown, Msg}, State}.
-handle_disconnect(#ssh_msg_disconnect{} = Msg, State, ErrorMsg) ->
-    {stop, {shutdown, {Msg, ErrorMsg}}, State}.
+handle_disconnect(#ssh_msg_disconnect{description = Desc} = Msg, #state{connection_state = Connection0,
+									role = Role} = State0) ->
+    {disconnect, _, {{replies, Replies}, Connection}} = ssh_connection:handle_msg(Msg, Connection0, Role),
+    State = send_replies(Replies, State0),
+    {stop, {shutdown, Desc}, State#state{connection_state = Connection}}.
+handle_disconnect(#ssh_msg_disconnect{description = Desc} = Msg, #state{connection_state = Connection0,
+									role = Role} = State0, ErrorMsg) ->
+    {disconnect, _, {{replies, Replies}, Connection}} = ssh_connection:handle_msg(Msg, Connection0, Role),
+    State = send_replies(Replies, State0),
+    {stop, {shutdown, {Desc, ErrorMsg}}, State#state{connection_state = Connection}}.
 
 counterpart_versions(NumVsn, StrVsn, #ssh{role = server} = Ssh) ->
     Ssh#ssh{c_vsn = NumVsn , c_version = StrVsn};
@@ -1002,45 +1410,67 @@ connected_fun(User, PeerAddr, Method, Opts) ->
 	    catch Fun(User, PeerAddr, Method)
     end.
 
-retry_fun(_, undefined, _) ->
+retry_fun(_, _, undefined, _) ->
     ok;
 
-retry_fun(User, {error, Reason}, Opts) ->
+retry_fun(User, PeerAddr, {error, Reason}, Opts) ->
     case proplists:get_value(failfun, Opts) of
 	undefined ->
 	    ok;
 	Fun ->
-	    catch Fun(User, Reason)
+	    do_retry_fun(Fun, User, PeerAddr, Reason)
     end;
 
-retry_fun(User, Reason, Opts) ->
+retry_fun(User, PeerAddr, Reason, Opts) ->
     case proplists:get_value(infofun, Opts) of
 	undefined ->
 	    ok;
-	Fun ->
-	    catch Fun(User, Reason)
+	Fun  ->
+	    do_retry_fun(Fun, User, PeerAddr, Reason)
     end.
 
-ssh_info_handler(Options, Ssh, From) ->
-    Info = ssh_info(Options, Ssh, []),
-    ssh_connection_manager:send_msg({channel_requst_reply, From, Info}).
+do_retry_fun(Fun, User, PeerAddr, Reason) ->
+    case erlang:fun_info(Fun, arity) of
+	{arity, 2} -> %% Backwards compatible
+	    catch Fun(User, Reason);
+	{arity, 3} ->
+	    catch Fun(User, PeerAddr, Reason)
+    end.
 
-ssh_info([], _, Acc) ->
+ssh_info([], _State, Acc) ->
+    Acc;
+ssh_info([client_version | Rest], #state{ssh_params = #ssh{c_vsn = IntVsn,
+							   c_version = StringVsn}} = State, Acc) ->
+    ssh_info(Rest, State, [{client_version, {IntVsn, StringVsn}} | Acc]);
+
+ssh_info([server_version | Rest], #state{ssh_params =#ssh{s_vsn = IntVsn,
+							  s_version = StringVsn}} = State, Acc) ->
+    ssh_info(Rest, State, [{server_version, {IntVsn, StringVsn}} | Acc]);
+ssh_info([peer | Rest],  #state{ssh_params = #ssh{peer = Peer}} = State, Acc) ->
+    ssh_info(Rest, State, [{peer, Peer} | Acc]);
+ssh_info([sockname | Rest], #state{socket = Socket} = State, Acc) ->
+    {ok, SockName} = inet:sockname(Socket),
+   ssh_info(Rest, State, [{sockname, SockName}|Acc]);
+ssh_info([user | Rest], #state{auth_user = User} = State, Acc) ->
+    ssh_info(Rest, State, [{user, User}|Acc]);
+ssh_info([ _ | Rest], State, Acc) ->
+    ssh_info(Rest, State, Acc).
+
+ssh_channel_info([], _, Acc) ->
     Acc;
 
-ssh_info([client_version | Rest], #ssh{c_vsn = IntVsn,
-				       c_version = StringVsn} = SshParams, Acc) ->
-    ssh_info(Rest, SshParams, [{client_version, {IntVsn, StringVsn}} | Acc]);
-
-ssh_info([server_version | Rest], #ssh{s_vsn = IntVsn,
-				       s_version = StringVsn} = SshParams, Acc) ->
-    ssh_info(Rest, SshParams, [{server_version, {IntVsn, StringVsn}} | Acc]);
-
-ssh_info([peer | Rest], #ssh{peer = Peer} = SshParams, Acc) ->
-    ssh_info(Rest, SshParams, [{peer, Peer} | Acc]);
-
-ssh_info([ _ | Rest], SshParams, Acc) ->
-    ssh_info(Rest, SshParams, Acc).
+ssh_channel_info([recv_window | Rest], #channel{recv_window_size = WinSize,
+						   recv_packet_size = Packsize
+						  } = Channel, Acc) ->
+    ssh_channel_info(Rest, Channel, [{recv_window, {{win_size, WinSize},
+						      {packet_size, Packsize}}} | Acc]);
+ssh_channel_info([send_window | Rest], #channel{send_window_size = WinSize,
+						send_packet_size = Packsize
+					       } = Channel, Acc) ->
+    ssh_channel_info(Rest, Channel, [{send_window, {{win_size, WinSize},
+						      {packet_size, Packsize}}} | Acc]);
+ssh_channel_info([ _ | Rest], Channel, Acc) ->
+    ssh_channel_info(Rest, Channel, Acc).
 
 log_error(Reason) ->
     Report = io_lib:format("Erlang ssh connection handler failed with reason: "
@@ -1049,3 +1479,101 @@ log_error(Reason) ->
 			   [Reason,  erlang:get_stacktrace()]),
     error_logger:error_report(Report),
     "Internal error".
+
+send_replies([], State) ->
+    State;
+send_replies([{connection_reply, Data} | Rest], #state{ssh_params = Ssh0} = State) ->
+    {Packet, Ssh} = ssh_transport:ssh_packet(Data, Ssh0),
+    send_msg(Packet, State),
+    send_replies(Rest, State#state{ssh_params = Ssh});
+send_replies([Msg | Rest], State) ->
+    catch send_reply(Msg),
+    send_replies(Rest, State).
+
+send_reply({channel_data, Pid, Data}) ->
+    Pid ! {ssh_cm, self(), Data};
+send_reply({channel_requst_reply, From, Data}) ->
+    gen_fsm:reply(From, Data);
+send_reply({flow_control, Cache, Channel, From, Msg}) ->
+    ssh_channel:cache_update(Cache, Channel#channel{flow_control = undefined}),
+    gen_fsm:reply(From, Msg);
+send_reply({flow_control, From, Msg}) ->
+    gen_fsm:reply(From, Msg).
+
+disconnect_fun(_, undefined) ->
+    ok;
+disconnect_fun(Reason, Opts) ->
+    case proplists:get_value(disconnectfun, Opts) of
+	undefined ->
+	    ok;
+	Fun ->
+	    catch Fun(Reason)
+     end.
+
+check_cache(#state{opts = Opts} = State, Cache) ->
+    %% Check the number of entries in Cache
+    case proplists:get_value(size, ets:info(Cache)) of
+	0 ->
+	    case proplists:get_value(idle_time, Opts, infinity) of
+		infinity ->
+		    State;
+		Time ->
+		    handle_idle_timer(Time, State)
+	    end;
+	_ ->
+	    State
+    end.
+
+handle_idle_timer(Time, #state{idle_timer_ref = undefined} = State) ->
+    TimerRef = erlang:send_after(Time, self(), {'EXIT', [], "Timeout"}),
+    State#state{idle_timer_ref=TimerRef};
+handle_idle_timer(_, State) ->
+    State.
+
+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.
+
+socket_control(Socket, Pid, Transport) ->
+    case Transport:controlling_process(Socket, Pid) of
+	ok ->
+	    send_event(Pid, socket_control);
+	{error, Reason}	->
+	    {error, Reason}
+    end.
+
+handshake(Pid, Ref, Timeout) ->
+    receive
+	ssh_connected ->
+	    erlang:demonitor(Ref),
+	    {ok, Pid};
+	{Pid, not_connected, Reason} ->
+	    {error, Reason};
+	{Pid, user_password} ->
+	    Pass = io:get_password(),
+	    Pid ! Pass,
+	    handshake(Pid, Ref, Timeout);
+	{Pid, question} ->
+	    Answer = io:get_line(""),
+	    Pid ! Answer,
+	    handshake(Pid, Ref, Timeout);
+	{'DOWN', _, process, Pid, {shutdown, Reason}} ->
+	    {error, Reason};
+	{'DOWN', _, process, Pid, Reason} ->
+	    {error, Reason}
+    after Timeout ->
+	    stop(Pid),
+	    {error, Timeout}
+    end.
+
+start_timeout(_,_, infinity) ->
+    ok;
+start_timeout(Channel, From, Time) ->
+    erlang:send_after(Time, self(), {timeout, {Channel, From}}).
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
deleted file mode 100644
index 99a0b6a7c8..0000000000
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ /dev/null
@@ -1,916 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
-%% 
-%% The 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: Handles multiplexing to ssh channels and global connection
-%% requests e.i. the SSH Connection Protocol (RFC 4254), that provides
-%% interactive login sessions, remote execution of commands, forwarded
-%% TCP/IP connections, and forwarded X11 connections. Details of the
-%% protocol is implemented in ssh_connection.erl
-%% ----------------------------------------------------------------------
--module(ssh_connection_manager).
-
--behaviour(gen_server).
-
--include("ssh.hrl").
--include("ssh_connect.hrl").
--include("ssh_transport.hrl").
-
--export([start_link/1]).
-
--export([info/1, info/2, 
-	 renegotiate/1, connection_info/2, channel_info/3,
-	 peer_addr/1, send_window/3, recv_window/3, adjust_window/3,
-	 close/2, stop/1, send/5,
-	 send_eof/2]).
-
--export([open_channel/6, reply_request/3, request/6, request/7, global_request/4, event/2, event/3, cast/2]).
-
-%% Internal application API and spawn
--export([send_msg/1, ssh_channel_info_handler/3]).
-
-%% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
-
--define(DBG_MESSAGE, true).
-
--record(state,
-	{
-	  role,
-	  client,
-	  starter,
-	  connection,       % pid()
-	  connection_state, % #connection{} 
-	  latest_channel_id = 0, 
-	  opts,
-	  channel_args,
-	  idle_timer_ref, % timerref
-	  connected 
-	 }).
-
-%%====================================================================
-%% Internal application API
-%%====================================================================
-
-start_link(Opts) ->
-    gen_server:start_link(?MODULE, Opts, []).
-
-open_channel(ConnectionManager,	ChannelType, ChannelSpecificData,
-	     InitialWindowSize, MaxPacketSize, Timeout) ->
-    case (catch call(ConnectionManager, {open, self(), ChannelType,
-					 InitialWindowSize, 
-					 MaxPacketSize, ChannelSpecificData},
-	      Timeout)) of
-	{open, Channel} -> 
-	    {ok, Channel}; 
-	Error -> 
-	    %% TODO: Best way?
-	    Error
-    end.
-
-request(ConnectionManager, ChannelPid, ChannelId, Type, true, Data, Timeout) ->
-    call(ConnectionManager, {request, ChannelPid, ChannelId, Type, Data}, Timeout);
-request(ConnectionManager, ChannelPid, ChannelId, Type, false, Data, _) ->
-    cast(ConnectionManager, {request, ChannelPid, ChannelId, Type, Data}).
-
-request(ConnectionManager, ChannelId, Type, true, Data, Timeout) ->
-    call(ConnectionManager, {request, ChannelId, Type, 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
-	{ssh_cm, ConnectionManager, {success, _}} ->
-	    ok;
-	{ssh_cm, ConnectionManager, {failure, _}} ->
-	    error
-    end;
-
-global_request(ConnectionManager, Type, false = Reply, Data) ->
-    cast(ConnectionManager, {global_request, self(), Type, Reply, Data}).
-
-event(ConnectionManager, BinMsg, ErrorMsg) ->
-    call(ConnectionManager, {ssh_msg, self(), BinMsg, ErrorMsg}).
-event(ConnectionManager, BinMsg) -> 
-    call(ConnectionManager, {ssh_msg, self(), BinMsg}).
-info(ConnectionManager) ->
-    info(ConnectionManager, {info, all}).
-
-info(ConnectionManager, ChannelProcess) ->
-    call(ConnectionManager, {info, ChannelProcess}).
-
-%% TODO: Do we really want this function? Should not 
-%% renegotiation be triggered by configurable timer
-%% or amount of data sent counter! 
-renegotiate(ConnectionManager) ->
-    cast(ConnectionManager, renegotiate).
-renegotiate_data(ConnectionManager) ->
-    cast(ConnectionManager, renegotiate_data).
-connection_info(ConnectionManager, Options) ->
-    call(ConnectionManager, {connection_info, Options}).
-
-channel_info(ConnectionManager, ChannelId, Options) ->
-    call(ConnectionManager, {channel_info, ChannelId, Options}).
-
-%% Replaced by option peer to connection_info/2 keep for now
-%% for Backwards compatibility!
-peer_addr(ConnectionManager) ->
-    call(ConnectionManager, {peer_addr, self()}).
-
-%% Backwards compatibility!
-send_window(ConnectionManager, Channel, TimeOut) ->
-    call(ConnectionManager, {send_window, Channel}, TimeOut).
-%% Backwards compatibility!
-recv_window(ConnectionManager, Channel, TimeOut) ->
-    call(ConnectionManager, {recv_window, Channel}, TimeOut).
-
-adjust_window(ConnectionManager, Channel, Bytes) ->
-    cast(ConnectionManager, {adjust_window, Channel, Bytes}).
-
-close(ConnectionManager, ChannelId) ->
-    case call(ConnectionManager, {close, ChannelId}) of
-	ok ->
-	    ok;
-	{error, channel_closed} ->
-	    ok
-    end.	
-
-stop(ConnectionManager) ->
-    case call(ConnectionManager, stop) of
-	ok ->
-	    ok;
-	{error, channel_closed} ->
-	    ok
-    end.
-			
-send(ConnectionManager, ChannelId, Type, Data, Timeout) ->
-    call(ConnectionManager, {data, ChannelId, Type, Data}, Timeout).
-
-send_eof(ConnectionManager, ChannelId) ->
-    call(ConnectionManager, {eof, ChannelId}).
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
-%% Description: Initiates the server
-%%--------------------------------------------------------------------
-init([server, _Socket, Opts]) ->
-    process_flag(trap_exit, true),
-    ssh_bits:install_messages(ssh_connection:messages()),
-    Cache = ssh_channel:cache_create(),
-    {ok, #state{role = server, 
-		connection_state = #connection{channel_cache = Cache,
-					       channel_id_seed = 0,
-					       port_bindings = [],
-					       requests = []},
-		opts = Opts,
-		connected = false}};
-
-init([client, Opts]) ->  
-    process_flag(trap_exit, true),
-    {links, [Parent]} = process_info(self(), links),
-    ssh_bits:install_messages(ssh_connection:messages()),
-    Cache = ssh_channel:cache_create(),
-    Address =  proplists:get_value(address, Opts),
-    Port = proplists:get_value(port, Opts),
-    SocketOpts = proplists:get_value(socket_opts, Opts),
-    Options = proplists:get_value(ssh_opts, 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,
-					       channel_id_seed = 0,
-					       port_bindings = [],
-					       connection_supervisor = Parent,
-					       requests = []},
-		opts = Opts,
-		idle_timer_ref = TimerRef,
-		connected = false}}.
-
-%%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, Reply, State} |
-%%                                      {stop, Reason, State}
-%% Description: Handling call messages
-%%--------------------------------------------------------------------
-handle_call({request, ChannelPid, ChannelId, Type, Data}, From, State0) ->
-    {{replies, Replies}, State} = handle_request(ChannelPid, 
-						 ChannelId, Type, Data, 
-						 true, From, State0),
-    %% Sends message to the connection handler process, reply to
-    %% 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) ->
-    {{replies, Replies}, State} = handle_request(ChannelId, Type, Data, 
-						 true, From, State0),
-    %% Sends message to the connection handler process, reply to
-    %% channel is sent later when reply arrives from the connection
-    %% handler.
-    lists:foreach(fun send_msg/1, Replies),
-    {noreply, State};
-
-%% Message from ssh_connection_handler
-handle_call({ssh_msg, Pid, Msg}, From, 
-	    #state{connection_state = Connection0,
-		   role = Role, opts = Opts, connected = IsConnected,
-		   client = ClientPid}
-	    = State) ->
-    
-    %% To avoid that not all data sent by the other side is processes before
-    %% possible crash in ssh_connection_handler takes down the connection.
-    gen_server:reply(From, ok),
-    ConnectionMsg = decode_ssh_msg(Msg),
-    try ssh_connection:handle_msg(ConnectionMsg, Connection0, Pid, Role) of
-	{{replies, Replies}, Connection} ->
-	    lists:foreach(fun send_msg/1, Replies),
-	    {noreply, State#state{connection_state = Connection}};
-	{noreply, Connection} ->
-	    {noreply, State#state{connection_state = Connection}};
-	{disconnect, {_, Reason}, {{replies, Replies}, Connection}} 
-	when Role == client andalso (not IsConnected) ->
-	    lists:foreach(fun send_msg/1, Replies),
-	    ClientPid ! {self(), not_connected, Reason},
-	    {stop, {shutdown, normal}, State#state{connection = Connection}};
-	{disconnect, Reason, {{replies, Replies}, Connection}} ->
-	    lists:foreach(fun send_msg/1, Replies),
-	    SSHOpts = proplists:get_value(ssh_opts, Opts),
-	    disconnect_fun(Reason, SSHOpts),
-	    {stop, {shutdown, normal}, State#state{connection_state = Connection}}
-	catch
-	    _:Error ->
-		{disconnect, Reason, {{replies, Replies}, Connection}} =
-		    ssh_connection:handle_msg(
-		      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-					  description = "Internal error",
-					  language = "en"}, Connection0, undefined,
-		      Role),
-		lists:foreach(fun send_msg/1, Replies),
-		SSHOpts = proplists:get_value(ssh_opts, Opts),
-		disconnect_fun(Reason, SSHOpts),
-		{stop, {shutdown, Error}, State#state{connection_state = Connection}}
-	end;
-handle_call({ssh_msg, Pid, Msg, ErrorMsg}, From,
-	    #state{connection_state = Connection0,
-		   role = Role, opts = Opts, connected = IsConnected,
-		   client = ClientPid}
-	    = State) ->
-
-    %% To avoid that not all data sent by the other side is processes before
-    %% possible crash in ssh_connection_handler takes down the connection.
-    gen_server:reply(From, ok),
-    ConnectionMsg = decode_ssh_msg(Msg),
-    try ssh_connection:handle_msg(ConnectionMsg, Connection0, Pid, Role) of
-	{{replies, Replies}, Connection} ->
-	    lists:foreach(fun send_msg/1, Replies),
-	    {noreply, State#state{connection_state = Connection}};
-	{noreply, Connection} ->
-	    {noreply, State#state{connection_state = Connection}};
-	{disconnect, {_, Reason}, {{replies, Replies}, Connection}}
-	when Role == client andalso (not IsConnected) ->
-	    lists:foreach(fun send_msg/1, Replies),
-	    ClientPid ! {self(), not_connected, {Reason, ErrorMsg}},
-	    {stop, {shutdown, normal}, State#state{connection = Connection}};
-	{disconnect, Reason, {{replies, Replies}, Connection}} ->
-	    lists:foreach(fun send_msg/1, Replies),
-	    SSHOpts = proplists:get_value(ssh_opts, Opts),
-	    disconnect_fun(Reason, SSHOpts),
-	    {stop, {shutdown, normal}, State#state{connection_state = Connection}}
-	catch
-	    _:Error ->
-		{disconnect, Reason, {{replies, Replies}, Connection}} =
-		    ssh_connection:handle_msg(
-		      #ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-					  description = "Internal error",
-					  language = "en"}, Connection0, undefined,
-		      Role),
-		lists:foreach(fun send_msg/1, Replies),
-		SSHOpts = proplists:get_value(ssh_opts, Opts),
-		disconnect_fun(Reason, SSHOpts),
-		{stop, {shutdown, Error}, State#state{connection_state = Connection}}
-	end;
-handle_call({global_request, Pid, _, _, _} = Request, From, 
-	    #state{connection_state = 
-		   #connection{channel_cache = Cache}} = State0) ->
-    State1 = handle_global_request(Request, State0),
-    Channel = ssh_channel:cache_find(Pid, Cache),
-    State = add_request(true, Channel#channel.local_id, From, State1),
-    {noreply, State};
-
-handle_call({data, ChannelId, Type, Data}, From, 
-	    #state{connection_state = #connection{channel_cache = _Cache} 
-		   = Connection0, 
-		   connection = ConnectionPid} = State) ->
-    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),
-    %% Reply will be sent by the connection handler by calling
-    %% ssh_connection_handler:send_msg/1.
-    {noreply, State};
-
-handle_call({channel_info, ChannelId, Options}, From, 
-	    #state{connection_state = #connection{channel_cache = Cache}} = State) ->
- 
-    case ssh_channel:cache_lookup(Cache, ChannelId) of			 
-       #channel{} = Channel ->
-	    spawn(?MODULE, ssh_channel_info_handler, [Options, Channel, From]),
-	    {noreply, State};
-	undefined -> 
-	    {reply, []}
-    end;
-   
-handle_call({info, ChannelPid}, _From, 
-	    #state{connection_state = 
-		   #connection{channel_cache = Cache}} = State) ->
-    Result = ssh_channel:cache_foldl(
-	       fun(Channel, Acc) when ChannelPid == all; 
-		  Channel#channel.user == ChannelPid ->
-		       [Channel | Acc];
-		  (_, Acc) ->
-		       Acc
-	       end, [], Cache),
-    {reply, {ok, Result}, State};
-
-handle_call({open, ChannelPid, Type, InitialWindowSize, MaxPacketSize, Data}, 
-	    From, #state{connection = Pid,
-			 connection_state = 
-			     #connection{channel_cache = Cache}} = State0) ->
-    erlang:monitor(process, ChannelPid),
-    {ChannelId, State1}  = new_channel_id(State0),
-    Msg = ssh_connection:channel_open_msg(Type, ChannelId, 
-					  InitialWindowSize, 
-					  MaxPacketSize, Data),
-    send_msg({connection_reply, Pid, Msg}),
-    Channel = #channel{type = Type,
-		       sys = "none",
-		       user = ChannelPid,
-		       local_id = ChannelId,
-		       recv_window_size = InitialWindowSize,
-		       recv_packet_size = MaxPacketSize},
-    ssh_channel:cache_update(Cache, Channel),
-    State = add_request(true, ChannelId, From, State1),
-    {noreply, remove_timer_ref(State)};
-
-handle_call({send_window, ChannelId}, _From, 
-	    #state{connection_state = 
-		   #connection{channel_cache = Cache}} = State) ->
-     Reply = case ssh_channel:cache_lookup(Cache, ChannelId) of
-		#channel{send_window_size = WinSize,
-			 send_packet_size = Packsize} ->
-		    {ok, {WinSize, Packsize}};
-		undefined -> 
-		    {error, einval}
-	    end,
-    {reply, Reply, State};
-
-handle_call({recv_window, ChannelId}, _From, 
-	    #state{connection_state = #connection{channel_cache = Cache}} 
-	     = State) ->
-  
-    Reply = case ssh_channel:cache_lookup(Cache, ChannelId) of
-		#channel{recv_window_size = WinSize,
-			 recv_packet_size = Packsize} ->
-		    {ok, {WinSize, Packsize}};
-		undefined -> 
-		    {error, einval}
-	    end,
-    {reply, Reply, State};
-
-%% Replaced by option peer to connection_info/2 keep for now
-%% for Backwards compatibility!
-handle_call({peer_addr, _ChannelId}, _From, 
-	    #state{connection = Pid} = State) ->
-    Reply = ssh_connection_handler:peer_address(Pid),
-    {reply, Reply, State};
-
-handle_call(opts, _, #state{opts = Opts} = State) ->
-    {reply, Opts, State};
-
-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 ->
-	    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}
-    end;
-
-handle_call(stop, _, #state{connection_state = Connection0,
-			    role = Role,
-			    opts = Opts} = State) ->
-    {disconnect, Reason, {{replies, Replies}, Connection}} =
-	ssh_connection:handle_msg(#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
-						      description = "User closed down connection",
-						      language = "en"}, Connection0, undefined, 
-				  Role),
-    lists:foreach(fun send_msg/1, Replies),
-    SSHOpts = proplists:get_value(ssh_opts, Opts),
-    disconnect_fun(Reason, SSHOpts),
-    {stop, normal, ok, State#state{connection_state = Connection}};
-
-%% API violation make it the violaters problem
-%% by ignoring it. The violating process will get
-%% a timeout or hang. 
-handle_call(_, _, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
-%% Description: Handling cast messages
-%%--------------------------------------------------------------------
-handle_cast({request, ChannelPid, ChannelId, Type, Data}, State0) ->
-    {{replies, Replies}, State} = handle_request(ChannelPid, ChannelId, 
-						 Type, Data, 
-						 false, none, State0),
-    lists:foreach(fun send_msg/1, Replies),
-    {noreply, State};
-
-handle_cast({request, ChannelId, Type, Data}, State0) ->
-    {{replies, Replies}, State} = handle_request(ChannelId, Type, Data, 
-						 false, none, 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};
-
-handle_cast(renegotiate, #state{connection = Pid} = State) ->
-    ssh_connection_handler:renegotiate(Pid),
-    {noreply, State};
-handle_cast(renegotiate_data, #state{connection = Pid} = State) ->
-    ssh_connection_handler:renegotiate_data(Pid),
-    {noreply, State};
-handle_cast({adjust_window, ChannelId, Bytes}, 
-	    #state{connection = Pid, connection_state =
-		   #connection{channel_cache = Cache}} = State) ->
-    case ssh_channel:cache_lookup(Cache, ChannelId) of
-	#channel{recv_window_size = WinSize, remote_id = Id} = Channel ->
-	    ssh_channel:cache_update(Cache, Channel#channel{recv_window_size = 
-					       WinSize + Bytes}),
-	    Msg = ssh_connection:channel_adjust_window_msg(Id, Bytes),
-	    send_msg({connection_reply, Pid, Msg});
-	undefined -> 
-	    ignore
-    end,
-    {noreply, State};
-
-handle_cast({success, ChannelId},  #state{connection = Pid} = State) ->
-    Msg = ssh_connection:channel_success_msg(ChannelId),
-    send_msg({connection_reply, Pid, Msg}),
-    {noreply, State};
-
-handle_cast({failure, ChannelId},  #state{connection = Pid} = State) ->
-    Msg = ssh_connection:channel_failure_msg(ChannelId),
-    send_msg({connection_reply, Pid, Msg}),
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
-%% Description: Handling all non call/cast messages
-%%--------------------------------------------------------------------
-handle_info({start_connection, server, 
-	     [Address, Port, Socket, Options, SubSysSup]},
-	    #state{connection_state = CState} = State) ->
-    {ok, Connection} = ssh_transport:accept(Address, Port, Socket, Options),
-    Shell = proplists:get_value(shell, Options),
-    Exec = proplists:get_value(exec, Options),
-    CliSpec = proplists:get_value(ssh_cli, Options, {ssh_cli, [Shell]}),
-    ssh_connection_handler:send_event(Connection, socket_control),
-    erlang:send_after(60000, self(), rekey_data),
-    {noreply, State#state{connection = Connection,
-			  connection_state = 
-			  CState#connection{address = Address,
-					    port = Port,
-					    cli_spec = CliSpec,
-					    options = Options,
-					    exec = Exec,
-					    sub_system_supervisor = SubSysSup
-					   }}};
-	    
-handle_info({start_connection, client, 
-	     [Parent, Address, Port, SocketOpts, Options]},
-	    #state{client = Pid} = State) ->
-    case (catch ssh_transport:connect(Parent, Address, 
-				      Port, SocketOpts, Options)) of
-	{ok, Connection} ->
-	    erlang:send_after(60000, self(), rekey_data),
-	    erlang:send_after(3600000, self(), rekey),
-	    {noreply, State#state{connection = Connection}};
-	Reason ->
-	    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),
-    {noreply, State};
-
-%% Nop backwards compatibility
-handle_info({same_user, _}, State) ->
-    {noreply, State};
-
-handle_info(ssh_connected, #state{role = client, client = Pid} 
-	    = State) ->
-    Pid ! {self(), is_connected},
-    {noreply, State#state{connected = true, opts = handle_password(State#state.opts)}};
-
-handle_info(ssh_connected, #state{role = server} = State) ->
-    {noreply, State#state{connected = true}};
-
-%%% Handle that ssh channels user process goes down
-handle_info({'DOWN', _Ref, process, ChannelPid, _Reason}, State) ->
-    handle_down(handle_channel_down(ChannelPid, State));
-
-%%% So that terminate will be run when supervisor is shutdown
-handle_info({'EXIT', _Sup, Reason}, State) ->
-    {stop, Reason, State};
-handle_info(rekey, State) ->
-    renegotiate(self()),
-    erlang:send_after(3600000, self(), rekey),
-    {noreply, State};
-handle_info(rekey_data, State) ->
-    renegotiate_data(self()),
-    erlang:send_after(60000, self(), rekey_data),
-    {noreply, 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
-%% terminate. It should be the opposite of Module:init/1 and do any necessary
-%% cleaning up. When it returns, the gen_server terminates with Reason.
-%% The return value is ignored.
-%%--------------------------------------------------------------------
-terminate(_Reason, #state{role = client,
-			  connection_state =
-			      #connection{connection_supervisor = Supervisor}}) ->
-    sshc_sup:stop_child(Supervisor);
-	
-terminate(_Reason, #state{role = server,
-			 connection_state =
-			     #connection{sub_system_supervisor = SubSysSup},
-			 opts = Opts}) ->
-    Address =  proplists:get_value(address, Opts),
-    Port = proplists:get_value(port, Opts),
-    SystemSup = ssh_system_sup:system_supervisor(Address, Port),
-    ssh_system_sup:stop_subsystem(SystemSup, SubSysSup).
-
-%%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% 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
-	{{replies, Replies}, Connection} ->
-	    lists:foreach(fun send_msg/1, Replies),
-	    {noreply, State#state{connection_state = Connection}};
-	{noreply, Connection} ->
-	    {noreply, State#state{connection_state = Connection}}
-    end.
-
-call(Pid, Msg) ->
-    call(Pid, Msg, infinity).
-call(Pid, Msg, Timeout) ->
-    try gen_server:call(Pid, Msg, Timeout) of
-	Result ->
-	    Result
-    catch
-	exit:{timeout, _} ->
-	    {error, timeout};
-	exit:{normal, _} ->
-	    {error, channel_closed};
-	exit:{{shutdown, _}, _} ->
-	    {error, channel_closed};
-	exit:{noproc,_} ->
-	    {error, channel_closed}
-    end.
-
-cast(Pid, Msg) ->
-    gen_server:cast(Pid, Msg).
-
-decode_ssh_msg(BinMsg) when is_binary(BinMsg)->
-    ssh_bits:decode(BinMsg);
-decode_ssh_msg(Msg) ->
-    Msg.
-
-
-send_msg(Msg) ->
-    catch do_send_msg(Msg).
-do_send_msg({channel_data, Pid, Data}) ->
-    Pid ! {ssh_cm, self(), Data};
-do_send_msg({channel_requst_reply, From, Data}) ->
-    gen_server:reply(From, Data);
-do_send_msg({connection_reply, Pid, Data}) ->
-    Msg = ssh_bits:encode(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, 
-	       #state{connection = Pid,
-		      connection_state = 
-		      #connection{channel_cache = Cache}} = State0) ->
-    case ssh_channel:cache_lookup(Cache, ChannelId) of
-	#channel{remote_id = Id} = Channel ->
-	    update_sys(Cache, Channel, Type, ChannelPid),
-	    Msg = ssh_connection:channel_request_msg(Id, Type, 
-						     WantReply, Data),
-	    Replies = [{connection_reply, Pid, Msg}],
-	    State = add_request(WantReply, ChannelId, From, State0),
-	    {{replies, Replies}, State};
-	undefined ->
-	    {{replies, []}, State0}
-    end.
-
-handle_request(ChannelId, Type, Data, WantReply, From, 
-	       #state{connection = Pid,
-		      connection_state = 
-		      #connection{channel_cache = Cache}} = State0) ->
-    case ssh_channel:cache_lookup(Cache, ChannelId) of
-	#channel{remote_id = Id}  ->
-	    Msg = ssh_connection:channel_request_msg(Id, Type, 
-						     WantReply, Data),
-	    Replies = [{connection_reply, Pid, Msg}],
-	    State = add_request(WantReply, ChannelId, From, State0),
-	    {{replies, Replies}, State};
-	undefined ->
-	    {{replies, []}, State0}
-    end.
-
-handle_down({{replies, Replies}, State}) ->
-    lists:foreach(fun send_msg/1, Replies),
-    {noreply, State}.
-
-handle_channel_down(ChannelPid, #state{connection_state = 
-					   #connection{channel_cache = Cache}} =
-			State) ->
-    ssh_channel:cache_foldl(
-	       fun(Channel, Acc) when Channel#channel.user == ChannelPid ->
-		       ssh_channel:cache_delete(Cache,
-						Channel#channel.local_id),
-		       Acc;
-		  (_,Acc) ->
-		       Acc
-	       end, [], Cache),
-    {{replies, []}, check_cache(State, Cache)}.
-
-update_sys(Cache, Channel, Type, ChannelPid) ->
-    ssh_channel:cache_update(Cache, 
-			     Channel#channel{sys = Type, user = ChannelPid}).
-
-add_request(false, _ChannelId, _From, State) ->
-    State;
-add_request(true, ChannelId, From, #state{connection_state = 
-					#connection{requests = Requests0} = 
-					Connection} = State) ->
-    Requests = [{ChannelId, From} | Requests0],
-    State#state{connection_state = Connection#connection{requests = Requests}}.
- 
-new_channel_id(#state{connection_state = #connection{channel_id_seed = Id} =
-		      Connection}
-	       = State) ->
-    {Id, State#state{connection_state = 
-		     Connection#connection{channel_id_seed = Id + 1}}}.
-   
-handle_global_request({global_request, ChannelPid, 
-		       "tcpip-forward" = Type, WantReply, 
-		       <<?UINT32(IPLen), 
-			IP:IPLen/binary, ?UINT32(Port)>> = Data}, 
-		      #state{connection = ConnectionPid, 
-			     connection_state = 
-			     #connection{channel_cache = Cache}
-			     = Connection0} = State) ->
-    ssh_channel:cache_update(Cache, #channel{user = ChannelPid,
-					     type = "forwarded-tcpip",
- 					     sys = none}),
-    Connection = ssh_connection:bind(IP, Port, ChannelPid, Connection0),
-    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
-    send_msg({connection_reply, ConnectionPid, Msg}),
-    State#state{connection_state = Connection};
-
-handle_global_request({global_request, _Pid, "cancel-tcpip-forward" = Type, 
-		       WantReply, <<?UINT32(IPLen), 
-				   IP:IPLen/binary, ?UINT32(Port)>> = Data}, 
-		      #state{connection = Pid,
-			     connection_state = Connection0} = State) ->
-    Connection = ssh_connection:unbind(IP, Port, Connection0),
-    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
-    send_msg({connection_reply, Pid, Msg}),
-    State#state{connection_state = Connection};
-
-handle_global_request({global_request, _Pid, "cancel-tcpip-forward" = Type, 
-		       WantReply,  Data}, #state{connection = Pid} = State) ->
-    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
-    send_msg({connection_reply, Pid, Msg}),
-    State.
-
-cm_message(Msg, State) ->
-    {noreply, NewState} =  handle_cast(Msg, State),
-    NewState.
-
-disconnect_fun(Reason, Opts) ->
-    case proplists:get_value(disconnectfun, Opts) of
- 	undefined ->
- 	    ok;
- 	Fun ->
- 	    catch Fun(Reason)
-     end.
-
-ssh_channel_info_handler(Options, Channel, From) ->
-    Info = ssh_channel_info(Options, Channel, []),
-    send_msg({channel_requst_reply, From, Info}).
-
-ssh_channel_info([], _, Acc) ->
-    Acc;
-
-ssh_channel_info([recv_window | Rest], #channel{recv_window_size = WinSize,
-						   recv_packet_size = Packsize
-						  } = Channel, Acc) ->
-    ssh_channel_info(Rest, Channel, [{recv_window, {{win_size, WinSize}, 
-						      {packet_size, Packsize}}} | Acc]);
-ssh_channel_info([send_window | Rest], #channel{send_window_size = WinSize,
-						send_packet_size = Packsize
-					       } = Channel, Acc) ->
-    ssh_channel_info(Rest, Channel, [{send_window, {{win_size, WinSize}, 
-						      {packet_size, Packsize}}} | Acc]);
-ssh_channel_info([ _ | Rest], Channel, Acc) ->
-    ssh_channel_info(Rest, Channel, Acc).
-
-
-
diff --git a/lib/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl
index b620056310..c5abc8f23b 100644
--- a/lib/ssh/src/ssh_connection_sup.erl
+++ b/lib/ssh/src/ssh_connection_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %% 
 %% The 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,8 +25,9 @@
 
 -behaviour(supervisor).
 
--export([start_link/1, start_handler_child/2, start_manager_child/2,
-	 connection_manager/1]).
+%% API
+-export([start_link/1]).
+-export([start_child/2]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -37,83 +38,23 @@
 start_link(Args) ->
     supervisor:start_link(?MODULE, [Args]).
 
-%% Will be called from the manager child process
-start_handler_child(Sup, Args) ->
-    [Spec] = child_specs(handler, Args),
-    supervisor:start_child(Sup, Spec).
-
-%% Will be called from the acceptor process
-start_manager_child(Sup, Args) ->
-    [Spec] = child_specs(manager, Args),    
-    supervisor:start_child(Sup, Spec).
-
-connection_manager(SupPid) -> 
-    try supervisor:which_children(SupPid) of
-	Children ->
-	    {ok, ssh_connection_manager(Children)}
-    catch exit:{noproc,_} ->
-	    {ok, undefined}
-    end.
+start_child(Sup, Args) ->
+    supervisor:start_child(Sup, Args).
 
 %%%=========================================================================
 %%%  Supervisor callback
 %%%=========================================================================
-init([Args]) ->  
-    RestartStrategy = one_for_all,
+init(_) ->
+    RestartStrategy = simple_one_for_one,
     MaxR = 0,
     MaxT = 3600,
-    Children = child_specs(Args),
-    {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
-
-%%%=========================================================================
-%%%  Internal functions
-%%%=========================================================================
-child_specs(Opts) ->
-    case proplists:get_value(role, Opts) of
-	client ->		
-	    child_specs(manager, [client | Opts]);
-	server ->
-	    %% Children started by acceptor process
-	    []
-    end.
- 
-% The manager process starts the handler process
-child_specs(manager, Opts) ->
-    [manager_spec(Opts)];
-child_specs(handler, Opts) ->
-    [handler_spec(Opts)].
-
-manager_spec([server = Role, Socket, Opts]) ->
-    Name = make_ref(), 
-    StartFunc = {ssh_connection_manager, start_link, [[Role, Socket, Opts]]},
-    Restart = temporary,
-    Shutdown = 3600,
-    Modules = [ssh_connection_manager],
-    Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules};
-
-manager_spec([client = Role | Opts]) ->
-    Name = make_ref(), 
-    StartFunc = {ssh_connection_manager, start_link, [[Role, Opts]]},
-    Restart = temporary,
-    Shutdown = 3600,
-    Modules = [ssh_connection_manager],
-    Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-handler_spec([Role, Socket, Opts]) ->
-    Name = make_ref(), 
-    StartFunc = {ssh_connection_handler, 
-		 start_link, [Role, self(), Socket, Opts]},
-    Restart = temporary,
-    Shutdown = 3600,
+    Name = undefined, % As simple_one_for_one is used.
+    StartFunc = {ssh_connection_handler, start_link, []},
+    Restart = temporary, % E.g. should not be restarted
+    Shutdown = 4000,
     Modules = [ssh_connection_handler],
     Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-ssh_connection_manager([]) ->
-    undefined;
-ssh_connection_manager([{_, Child, _, [ssh_connection_manager]} | _]) ->
-    Child;
-ssh_connection_manager([_ | Rest]) ->
-    ssh_connection_manager(Rest).
+    ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules},
+    {ok, {{RestartStrategy, MaxR, MaxT}, [ChildSpec]}}.
diff --git a/lib/ssh/src/ssh_file.erl b/lib/ssh/src/ssh_file.erl
index f115a32710..5692138a8a 100644
--- a/lib/ssh/src/ssh_file.erl
+++ b/lib/ssh/src/ssh_file.erl
@@ -65,7 +65,7 @@ is_auth_key(Key, User,Opts) ->
 
 %% Used by client
 is_host_key(Key, PeerName, Algorithm, Opts) ->
-    case lookup_host_key(PeerName, Algorithm, Opts) of
+    case lookup_host_key(Key, PeerName, Algorithm, Opts) of
 	{ok, Key} ->
 	    true;
 	_ ->
@@ -121,9 +121,9 @@ decode_ssh_file(Pem, Password) ->
 %% return {ok, Key(s)} or {error, not_found}
 %%
 
-lookup_host_key(Host, Alg, Opts) ->
+lookup_host_key(KeyToMatch, Host, Alg, Opts) ->
     Host1 = replace_localhost(Host),
-    do_lookup_host_key(Host1, Alg, Opts).
+    do_lookup_host_key(KeyToMatch, Host1, Alg, Opts).
 	    
 
 add_host_key(Host, Key, Opts) ->
@@ -204,10 +204,10 @@ replace_localhost("localhost") ->
 replace_localhost(Host) ->
     Host.
 
-do_lookup_host_key(Host, Alg, Opts) ->
+do_lookup_host_key(KeyToMatch, Host, Alg, Opts) ->
     case file:open(file_name(user, "known_hosts", Opts), [read, binary]) of
 	{ok, Fd} ->
-	    Res = lookup_host_key_fd(Fd, Host, Alg),
+	    Res = lookup_host_key_fd(Fd, KeyToMatch, Host, Alg),
 	    file:close(Fd),
 	    {ok, Res};
 	{error, enoent} -> {error, not_found};
@@ -228,16 +228,16 @@ identity_pass_phrase('ssh-rsa') ->
 identity_pass_phrase("ssh-rsa") ->
     rsa_pass_phrase.
 
-lookup_host_key_fd(Fd, Host, KeyType) ->
+lookup_host_key_fd(Fd, KeyToMatch, Host, KeyType) ->
     case io:get_line(Fd, '') of
 	eof ->
 	    {error, not_found};
 	Line ->
 	    case ssh_decode_line(Line, known_hosts) of
 		[{Key, Attributes}] ->
-		    handle_host(Fd, Host, proplists:get_value(hostnames, Attributes), Key, KeyType);
+		    handle_host(Fd, KeyToMatch, Host, proplists:get_value(hostnames, Attributes), Key, KeyType);
 		[] ->
-		    lookup_host_key_fd(Fd, Host, KeyType)
+		    lookup_host_key_fd(Fd, KeyToMatch, Host, KeyType)
 	    end
     end.
 
@@ -248,13 +248,13 @@ ssh_decode_line(Line, Type) ->
 	    []
     end.
 
-handle_host(Fd, Host, HostList, Key, KeyType) ->
+handle_host(Fd, KeyToMatch, Host, HostList, Key, KeyType) ->
     Host1 = host_name(Host),
-    case lists:member(Host1, HostList) and key_match(Key, KeyType) of
-	true ->
+    case lists:member(Host1, HostList) andalso key_match(Key, KeyType) of
+	true when KeyToMatch == Key ->
 	    Key;
-	false ->
-	    lookup_host_key_fd(Fd, Host, KeyType)
+	_ ->
+	    lookup_host_key_fd(Fd, KeyToMatch, Host, KeyType)
     end.
 
 host_name(Atom) when is_atom(Atom) ->
@@ -315,5 +315,12 @@ default_user_dir()->
     {ok,[[Home|_]]} = init:get_argument(home),
     UserDir = filename:join(Home, ".ssh"),
     ok = filelib:ensure_dir(filename:join(UserDir, "dummy")),
-    ok = file:change_mode(UserDir, ?PERM_700),
+    {ok,Info} = file:read_file_info(UserDir),
+    #file_info{mode=Mode} = Info,
+    case (Mode band 8#777) of
+	?PERM_700 ->
+	    ok;
+	_Other ->
+	    ok = file:change_mode(UserDir, ?PERM_700)
+    end,
     UserDir.
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl
index 01fc713569..832b144db9 100644
--- a/lib/ssh/src/ssh_io.erl
+++ b/lib/ssh/src/ssh_io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %%
 %% The 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,6 @@
 -module(ssh_io).
 
 -export([yes_no/2, read_password/2, read_line/2, format/2]).
--import(lists, [reverse/1]).
 -include("ssh.hrl").
 
 read_line(Prompt, Ssh) ->
@@ -81,7 +80,7 @@ format(Fmt, Args) ->
 
 
 trim(Line) when is_list(Line) ->
-    reverse(trim1(reverse(trim1(Line))));
+    lists:reverse(trim1(lists:reverse(trim1(Line))));
 trim(Other) -> Other.
 
 trim1([$\s|Cs]) -> trim(Cs);
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl
new file mode 100644
index 0000000000..8d6c77c0ed
--- /dev/null
+++ b/lib/ssh/src/ssh_message.erl
@@ -0,0 +1,533 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The 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_message).
+
+-include_lib("public_key/include/public_key.hrl").
+
+-include("ssh.hrl").
+-include("ssh_connect.hrl").
+-include("ssh_auth.hrl").
+-include("ssh_transport.hrl").
+
+-export([encode/1, decode/1, encode_host_key/1, decode_keyboard_interactive_prompts/2]).
+
+encode(#ssh_msg_global_request{
+	  name = Name,
+	  want_reply = Bool,
+	  data = Data}) ->
+    ssh_bits:encode([?SSH_MSG_GLOBAL_REQUEST,
+		     Name, Bool, Data], [byte, string, boolean, '...']);
+encode(#ssh_msg_request_success{data = Data}) ->
+    <<?BYTE(?SSH_MSG_REQUEST_SUCCESS), Data/binary>>;
+encode(#ssh_msg_request_failure{}) ->
+    <<?BYTE(?SSH_MSG_REQUEST_FAILURE)>>;
+encode(#ssh_msg_channel_open{
+	  channel_type = Type,
+	  sender_channel = Sender,
+	  initial_window_size = Window,
+	  maximum_packet_size = Max,
+	  data = Data
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_CHANNEL_OPEN,
+		     Type, Sender, Window, Max, Data], [byte, string, uint32,
+							uint32, uint32, '...']);
+encode(#ssh_msg_channel_open_confirmation{
+	  recipient_channel = Recipient,
+	  sender_channel = Sender,
+	  initial_window_size = InitWindowSize,
+	  maximum_packet_size = MaxPacketSize,
+	  data = Data
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_CHANNEL_OPEN_CONFIRMATION, Recipient,
+		     Sender, InitWindowSize, MaxPacketSize, Data],
+		    [byte, uint32, uint32, uint32, uint32, '...']);
+encode(#ssh_msg_channel_open_failure{
+	  recipient_channel = Recipient,
+	  reason = Reason,
+	  description = Desc,
+	  lang = Lang
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_CHANNEL_OPEN_FAILURE, Recipient,
+		     Reason, Desc, Lang], [byte, uint32, uint32, string, string]);
+encode(#ssh_msg_channel_window_adjust{
+	  recipient_channel = Recipient,
+	  bytes_to_add = Bytes
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_CHANNEL_WINDOW_ADJUST, Recipient, Bytes],
+		    [byte, uint32, uint32]);
+encode(#ssh_msg_channel_data{
+	  recipient_channel = Recipient,
+	  data = Data
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_CHANNEL_DATA, Recipient, Data], [byte, uint32, binary]);
+
+encode(#ssh_msg_channel_extended_data{
+	  recipient_channel = Recipient,
+	  data_type_code = DataType,
+	  data = Data
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_CHANNEL_EXTENDED_DATA, Recipient,
+		     DataType, Data], [byte, uint32, uint32, binary]);
+
+encode(#ssh_msg_channel_eof{recipient_channel = Recipient
+			   }) ->
+    <<?BYTE(?SSH_MSG_CHANNEL_EOF), ?UINT32(Recipient)>>;
+encode(#ssh_msg_channel_close{
+	   recipient_channel = Recipient
+	  }) ->
+    <<?BYTE(?SSH_MSG_CHANNEL_CLOSE),  ?UINT32(Recipient)>>;
+encode(#ssh_msg_channel_request{
+	  recipient_channel = Recipient,
+	  request_type = Type,
+	  want_reply = Bool,
+	  data  = Data
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_CHANNEL_REQUEST, Recipient, Type, Bool, Data],
+		    [byte, uint32, string, boolean, '...']);
+encode(#ssh_msg_channel_success{
+	  recipient_channel = Recipient
+	 }) ->
+    <<?BYTE(?SSH_MSG_CHANNEL_SUCCESS), ?UINT32(Recipient)>>;
+encode(#ssh_msg_channel_failure{
+	  recipient_channel = Recipient
+	 }) ->
+    <<?BYTE(?SSH_MSG_CHANNEL_FAILURE), ?UINT32(Recipient)>>;
+
+encode(#ssh_msg_userauth_request{
+	  user = User,
+	  service = Service,
+	  method = Method,
+	  data = Data
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_USERAUTH_REQUEST, User, Service, Method, Data],
+		    [byte, string_utf8, string, string, '...']);
+encode(#ssh_msg_userauth_failure{
+	  authentications = Auths,
+	  partial_success = Bool
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_USERAUTH_FAILURE, Auths, Bool],
+		    [byte, string, boolean]);
+encode(#ssh_msg_userauth_success{}) ->
+    <<?BYTE(?SSH_MSG_USERAUTH_SUCCESS)>>;
+
+encode(#ssh_msg_userauth_banner{
+       message = Banner,
+       language = Lang
+      }) ->
+    ssh_bits:encode([?SSH_MSG_USERAUTH_BANNER, Banner, Lang],
+		    [byte, string_utf8, string]);
+
+encode(#ssh_msg_userauth_pk_ok{
+	  algorithm_name = Alg,
+	  key_blob = KeyBlob
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_USERAUTH_PK_OK, Alg, KeyBlob],
+		    [byte, string, binary]);
+
+encode(#ssh_msg_userauth_passwd_changereq{prompt = Prompt,
+					  languge = Lang
+					 })->
+    ssh_bits:encode([?SSH_MSG_USERAUTH_PASSWD_CHANGEREQ, Prompt, Lang],
+		    [byte, string, string]);
+
+encode(#ssh_msg_userauth_info_request{
+	  name = Name,
+	  instruction = Inst,
+	  language_tag = Lang,
+	  num_prompts = NumPromtps,
+	  data = Data}) ->
+    ssh_bits:encode([?SSH_MSG_USERAUTH_INFO_REQUEST, Name, Inst, Lang, NumPromtps, Data],
+		    [byte, string, string, string, uint32, '...']);
+
+encode(#ssh_msg_userauth_info_response{
+	  num_responses = Num,
+	  data = Data}) ->
+    ssh_bits:encode([?SSH_MSG_USERAUTH_INFO_RESPONSE, Num, Data],
+		    [byte, uint32, '...']);
+encode(#ssh_msg_disconnect{
+	  code = Code,
+	  description = Desc,
+	  language = Lang
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_DISCONNECT, Code, Desc, Lang],
+		    [byte, uint32, string, string]);
+
+encode(#ssh_msg_service_request{
+	  name = Service
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_SERVICE_REQUEST, Service], [byte, string]);
+
+encode(#ssh_msg_service_accept{
+	  name = Service
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_SERVICE_ACCEPT, Service], [byte, string]);
+
+encode(#ssh_msg_newkeys{}) ->
+    <<?BYTE(?SSH_MSG_NEWKEYS)>>;
+
+encode(#ssh_msg_kexinit{
+	  cookie = Cookie,
+	  kex_algorithms = KeyAlgs,
+	  server_host_key_algorithms = HostKeyAlgs,
+	  encryption_algorithms_client_to_server = EncAlgC2S,
+	  encryption_algorithms_server_to_client = EncAlgS2C,
+	  mac_algorithms_client_to_server = MacAlgC2S,
+	  mac_algorithms_server_to_client = MacAlgS2C,
+	  compression_algorithms_client_to_server = CompAlgS2C,
+	  compression_algorithms_server_to_client = CompAlgC2S,
+	  languages_client_to_server = LangC2S,
+	  languages_server_to_client = LangS2C,
+	  first_kex_packet_follows = Bool,
+	  reserved = Reserved
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_KEXINIT, Cookie, KeyAlgs, HostKeyAlgs, EncAlgC2S, EncAlgS2C,
+		     MacAlgC2S, MacAlgS2C, CompAlgS2C, CompAlgC2S, LangC2S, LangS2C, Bool,
+		     Reserved],
+		    [byte, cookie,
+		     name_list, name_list,
+		     name_list, name_list,
+		     name_list, name_list,
+		     name_list, name_list,
+		     name_list, name_list,
+		     boolean, uint32]);
+
+encode(#ssh_msg_kexdh_init{e = E}) ->
+    ssh_bits:encode([?SSH_MSG_KEXDH_INIT, E], [byte, mpint]);
+
+encode(#ssh_msg_kexdh_reply{
+	  public_host_key = Key,
+	  f = F,
+	  h_sig = Signature
+	 }) ->
+    EncKey = encode_host_key(Key),
+    EncSign = encode_sign(Key, Signature),
+    ssh_bits:encode([?SSH_MSG_KEXDH_REPLY, EncKey, F, EncSign], [byte, binary, mpint, binary]);
+
+encode(#ssh_msg_kex_dh_gex_request{
+	  min = Min,
+	  n = N,
+	  max = Max
+	 }) ->
+    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_REQUEST, Min, N, Max],
+		    [byte, uint32, uint32, uint32, uint32]);
+encode(#ssh_msg_kex_dh_gex_request_old{n = N}) ->
+    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_REQUEST_OLD, N],
+		    [byte, uint32]);
+
+encode(#ssh_msg_kex_dh_gex_group{p = Prime, g = Generator}) ->
+    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_GROUP, Prime, Generator],
+		    [byte, mpint, mpint]);
+
+encode(#ssh_msg_kex_dh_gex_init{e = Public}) ->
+    ssh_bits:encode([?SSH_MSG_KEX_DH_GEX_INIT, Public], [byte, mpint]);
+
+encode(#ssh_msg_kex_dh_gex_reply{
+	  %% Will be private key encode_host_key extracts only the public part!
+	  public_host_key = Key,
+	  f = F,
+	  h_sig = Signature
+	 }) ->
+    EncKey = encode_host_key(Key),
+    EncSign = encode_sign(Key, Signature),
+    ssh_bits:encode([?SSH_MSG_KEXDH_REPLY, EncKey, F, EncSign], [byte, binary, mpint, binary]);
+
+encode(#ssh_msg_ignore{data = Data}) ->
+    ssh_bits:encode([?SSH_MSG_IGNORE, Data], [byte, string]);
+
+encode(#ssh_msg_unimplemented{sequence = Seq}) ->
+    ssh_bits:encode([?SSH_MSG_IGNORE, Seq], [byte, uint32]);
+
+encode(#ssh_msg_debug{always_display = Bool,
+		      message = Msg,
+		      language = Lang}) ->
+    ssh_bits:encode([?SSH_MSG_DEBUG, Bool, Msg, Lang], [byte, boolean, string, string]).
+
+
+%% Connection Messages
+decode(<<?BYTE(?SSH_MSG_GLOBAL_REQUEST), ?UINT32(Len), Name:Len/binary,
+	 ?BYTE(Bool), Data/binary>>) ->
+    #ssh_msg_global_request{
+       name = Name,
+       want_reply = erl_boolean(Bool),
+       data = Data
+      };
+decode(<<?BYTE(?SSH_MSG_REQUEST_SUCCESS), Data/binary>>) ->
+    #ssh_msg_request_success{data = Data};
+decode(<<?BYTE(?SSH_MSG_REQUEST_FAILURE)>>) ->
+    #ssh_msg_request_failure{};
+decode(<<?BYTE(?SSH_MSG_CHANNEL_OPEN),
+	 ?UINT32(Len), Type:Len/binary,
+	 ?UINT32(Sender), ?UINT32(Window), ?UINT32(Max),
+	 Data/binary>>) ->
+    #ssh_msg_channel_open{
+       channel_type = binary_to_list(Type),
+       sender_channel = Sender,
+       initial_window_size = Window,
+       maximum_packet_size = Max,
+       data = Data
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_OPEN_CONFIRMATION), ?UINT32(Recipient), ?UINT32(Sender),
+	 ?UINT32(InitWindowSize), ?UINT32(MaxPacketSize),
+	 Data/binary>>) ->
+    #ssh_msg_channel_open_confirmation{
+       recipient_channel = Recipient,
+       sender_channel = Sender,
+       initial_window_size = InitWindowSize,
+       maximum_packet_size = MaxPacketSize,
+       data = Data
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_OPEN_FAILURE),  ?UINT32(Recipient), ?UINT32(Reason),
+	 ?UINT32(Len0), Desc:Len0/binary,  ?UINT32(Len1), Lang:Len1/binary >>) ->
+    #ssh_msg_channel_open_failure{
+       recipient_channel = Recipient,
+       reason = Reason,
+       description = unicode:characters_to_list(Desc),
+       lang = Lang
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_WINDOW_ADJUST), ?UINT32(Recipient), ?UINT32(Bytes)>>) ->
+    #ssh_msg_channel_window_adjust{
+       recipient_channel = Recipient,
+       bytes_to_add = Bytes
+    };
+
+decode(<<?BYTE(?SSH_MSG_CHANNEL_DATA), ?UINT32(Recipient), ?UINT32(Len), Data:Len/binary>>) ->
+    #ssh_msg_channel_data{
+       recipient_channel = Recipient,
+       data = Data
+    };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_EXTENDED_DATA), ?UINT32(Recipient), 
+	 ?UINT32(DataType), ?UINT32(Len), Data:Len/binary>>) ->
+    #ssh_msg_channel_extended_data{
+       recipient_channel = Recipient,
+       data_type_code = DataType,
+       data = Data
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_EOF), ?UINT32(Recipient)>>) ->
+    #ssh_msg_channel_eof{
+       recipient_channel = Recipient
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_CLOSE),  ?UINT32(Recipient)>>) ->
+    #ssh_msg_channel_close{
+       recipient_channel = Recipient
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_REQUEST), ?UINT32(Recipient),
+	 ?UINT32(Len), RequestType:Len/binary,
+	 ?BYTE(Bool), Data/binary>>) ->
+    #ssh_msg_channel_request{
+       recipient_channel = Recipient,
+       request_type = unicode:characters_to_list(RequestType),
+       want_reply = erl_boolean(Bool),
+       data  = Data
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_SUCCESS),  ?UINT32(Recipient)>>) ->
+    #ssh_msg_channel_success{
+       recipient_channel = Recipient
+      };
+decode(<<?BYTE(?SSH_MSG_CHANNEL_FAILURE),  ?UINT32(Recipient)>>) ->
+    #ssh_msg_channel_failure{
+       recipient_channel = Recipient
+      };
+
+%%% Auth Messages
+decode(<<?BYTE(?SSH_MSG_USERAUTH_REQUEST),
+	 ?UINT32(Len0), User:Len0/binary,
+	 ?UINT32(Len1), Service:Len1/binary,
+	 ?UINT32(Len2), Method:Len2/binary,
+	 Data/binary>>) ->
+    #ssh_msg_userauth_request{
+       user = unicode:characters_to_list(User),
+       service = unicode:characters_to_list(Service),
+       method = unicode:characters_to_list(Method),
+       data = Data
+      };
+
+decode(<<?BYTE(?SSH_MSG_USERAUTH_FAILURE),
+	 ?UINT32(Len0), Auths:Len0/binary,
+	 ?BYTE(Bool)>>) ->
+    #ssh_msg_userauth_failure {
+       authentications = unicode:characters_to_list(Auths),
+       partial_success = erl_boolean(Bool)
+      };
+
+decode(<<?BYTE(?SSH_MSG_USERAUTH_SUCCESS)>>) ->
+    #ssh_msg_userauth_success{};
+
+decode(<<?BYTE(?SSH_MSG_USERAUTH_BANNER),
+	       ?UINT32(Len0), Banner:Len0/binary,
+	       ?UINT32(Len1), Lang:Len1/binary>>) ->
+    #ssh_msg_userauth_banner{
+       message = Banner,
+       language = Lang
+      };
+
+decode(<<?BYTE(?SSH_MSG_USERAUTH_INFO_REQUEST), ?UINT32(Len0), Name:Len0/binary,
+	 ?UINT32(Len1), Inst:Len1/binary, ?UINT32(Len2), Lang:Len2/binary,
+	 ?UINT32(NumPromtps), Data/binary>>) ->
+    #ssh_msg_userauth_info_request{
+       name = Name,
+       instruction = Inst,
+       language_tag = Lang,
+       num_prompts = NumPromtps,
+       data = Data};
+
+%%% Unhandled message, also masked by same 1:st byte value as ?SSH_MSG_USERAUTH_INFO_REQUEST:
+decode(<<?BYTE(?SSH_MSG_USERAUTH_PK_OK), ?UINT32(Len), Alg:Len/binary, KeyBlob/binary>>) ->
+    #ssh_msg_userauth_pk_ok{
+       algorithm_name = Alg,
+       key_blob = KeyBlob
+      };
+
+%%% Unhandled message, also masked by same 1:st byte value as ?SSH_MSG_USERAUTH_INFO_REQUEST:
+decode(<<?BYTE(?SSH_MSG_USERAUTH_PASSWD_CHANGEREQ), ?UINT32(Len0), Prompt:Len0/binary,
+	 ?UINT32(Len1), Lang:Len1/binary>>) ->
+    #ssh_msg_userauth_passwd_changereq{
+       prompt = Prompt,
+       languge = Lang
+      };
+
+decode(<<?BYTE(?SSH_MSG_USERAUTH_INFO_RESPONSE), ?UINT32(Num), Data/binary>>) ->
+    #ssh_msg_userauth_info_response{
+       num_responses = Num,
+       data = Data};
+
+%%% Keyexchange messages
+decode(<<?BYTE(?SSH_MSG_KEXINIT), Cookie:128, Data/binary>>) ->
+    decode_kex_init(Data, [Cookie, ssh_msg_kexinit], 10);
+
+decode(<<?BYTE(?SSH_MSG_KEXDH_INIT), ?UINT32(Len), E:Len/binary>>) ->
+    #ssh_msg_kexdh_init{e = erlint(Len, E)
+		       };
+decode(<<?BYTE(?SSH_MSG_KEX_DH_GEX_REQUEST), ?UINT32(Min), ?UINT32(N), ?UINT32(Max)>>) ->
+    #ssh_msg_kex_dh_gex_request{
+       min = Min,
+       n = N,
+       max = Max
+      };
+decode(<<?BYTE(?SSH_MSG_KEX_DH_GEX_REQUEST_OLD), ?UINT32(N)>>) ->
+    #ssh_msg_kex_dh_gex_request_old{
+       n = N
+      };
+decode(<<?BYTE(?SSH_MSG_KEX_DH_GEX_GROUP),  
+	 ?UINT32(Len0), Prime:Len0/big-signed-integer-unit:8,
+	 ?UINT32(Len1), Generator:Len1/big-signed-integer-unit:8>>) ->
+    #ssh_msg_kex_dh_gex_group{
+       p = Prime,
+       g = Generator
+      };
+decode(<<?BYTE(?SSH_MSG_KEXDH_REPLY), ?UINT32(Len0), Key:Len0/binary,
+	 ?UINT32(Len1), F:Len1/binary,
+	 ?UINT32(Len2), Hashsign:Len2/binary>>) ->
+    #ssh_msg_kexdh_reply{
+       public_host_key = decode_host_key(Key),
+       f = erlint(Len1, F),
+       h_sig = decode_sign(Hashsign)
+      };
+
+decode(<<?SSH_MSG_SERVICE_REQUEST, ?UINT32(Len0), Service:Len0/binary>>) ->
+    #ssh_msg_service_request{
+       name = unicode:characters_to_list(Service)
+      };
+
+decode(<<?SSH_MSG_SERVICE_ACCEPT, ?UINT32(Len0), Service:Len0/binary>>) ->
+    #ssh_msg_service_accept{
+       name = unicode:characters_to_list(Service)
+      };
+
+decode(<<?BYTE(?SSH_MSG_DISCONNECT), ?UINT32(Code),
+       ?UINT32(Len0), Desc:Len0/binary, ?UINT32(Len1), Lang:Len1/binary>>) ->
+    #ssh_msg_disconnect{
+       code = Code,
+       description = unicode:characters_to_list(Desc),
+       language = Lang
+      };
+
+decode(<<?SSH_MSG_NEWKEYS>>) ->
+    #ssh_msg_newkeys{};
+
+decode(<<?BYTE(?SSH_MSG_IGNORE), Data/binary>>) ->
+    #ssh_msg_ignore{data = Data};
+
+decode(<<?BYTE(?SSH_MSG_UNIMPLEMENTED), ?UINT32(Seq)>>) ->
+    #ssh_msg_unimplemented{sequence = Seq};
+
+decode(<<?BYTE(?SSH_MSG_DEBUG), ?BYTE(Bool), ?UINT32(Len0), Msg:Len0/binary,
+	 ?UINT32(Len1), Lang:Len1/binary>>) ->
+    #ssh_msg_debug{always_display = erl_boolean(Bool),
+		   message = Msg,
+		   language = Lang}.
+
+decode_keyboard_interactive_prompts(<<>>, Acc) ->
+    lists:reverse(Acc);
+decode_keyboard_interactive_prompts(<<?UINT32(Len), Prompt:Len/binary, ?BYTE(Bool), Bin/binary>>,
+				    Acc) ->
+    decode_keyboard_interactive_prompts(Bin, [{Prompt, erl_boolean(Bool)} | Acc]).
+
+erl_boolean(0) ->
+    false;
+erl_boolean(1) ->
+    true.
+
+decode_kex_init(<<?BYTE(Bool), ?UINT32(X)>>, Acc, 0) ->
+    list_to_tuple(lists:reverse([X, erl_boolean(Bool) | Acc]));
+decode_kex_init(<<?UINT32(Len), Data:Len/binary, Rest/binary>>, Acc, N) ->
+    Names = string:tokens(unicode:characters_to_list(Data), ","),
+    decode_kex_init(Rest, [Names | Acc], N -1).
+
+erlint(MPIntSize, MPIntValue) ->
+    Bits = MPIntSize * 8,
+    <<Integer:Bits/integer>> = MPIntValue,
+    Integer.
+
+decode_sign(<<?UINT32(Len), _Alg:Len/binary, ?UINT32(_), Signature/binary>>) ->
+    Signature.
+
+decode_host_key(<<?UINT32(Len), Alg:Len/binary, Rest/binary>>) ->
+    decode_host_key(Alg, Rest).
+
+decode_host_key(<<"ssh-rsa">>, <<?UINT32(Len0), E:Len0/binary,
+				 ?UINT32(Len1), N:Len1/binary>>) ->
+    #'RSAPublicKey'{publicExponent = erlint(Len0, E),
+		    modulus = erlint(Len1, N)};
+
+decode_host_key(<<"ssh-dss">>,
+		<<?UINT32(Len0), P:Len0/binary,
+		  ?UINT32(Len1), Q:Len1/binary,
+		  ?UINT32(Len2), G:Len2/binary,
+		  ?UINT32(Len3), Y:Len3/binary>>) ->
+    {erlint(Len3, Y), #'Dss-Parms'{p = erlint(Len0, P), q = erlint(Len1, Q),
+				   g = erlint(Len2, G)}}.
+
+encode_host_key(#'RSAPublicKey'{modulus = N, publicExponent = E}) ->
+    ssh_bits:encode(["ssh-rsa", E, N], [string, mpint, mpint]);
+encode_host_key({Y,  #'Dss-Parms'{p = P, q = Q, g = G}}) ->
+    ssh_bits:encode(["ssh-dss", P, Q, G, Y],
+		    [string, mpint, mpint, mpint, mpint]);
+encode_host_key(#'RSAPrivateKey'{modulus = N, publicExponent = E}) ->
+    ssh_bits:encode(["ssh-rsa", E, N], [string, mpint, mpint]);
+encode_host_key(#'DSAPrivateKey'{y = Y, p = P, q = Q, g = G}) ->
+    ssh_bits:encode(["ssh-dss", P, Q, G, Y],
+		    [string, mpint, mpint, mpint, mpint]).
+encode_sign(#'RSAPrivateKey'{}, Signature) ->
+    ssh_bits:encode(["ssh-rsa", Signature],[string, binary]);
+encode_sign(#'DSAPrivateKey'{}, Signature) ->
+    ssh_bits:encode(["ssh-dss", Signature],[string, binary]).
diff --git a/lib/ssh/src/ssh_no_io.erl b/lib/ssh/src/ssh_no_io.erl
index 2c8dd92ee2..825a0d4af5 100644
--- a/lib/ssh/src/ssh_no_io.erl
+++ b/lib/ssh/src/ssh_no_io.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
 %%
 %% The 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,18 +22,31 @@
 %%% Description: ssh_io replacement that throws on everything
 
 -module(ssh_no_io).
-
--export([yes_no/1, read_password/1, read_line/1, format/2]).
-
-yes_no(_Prompt) ->
-    throw({no_io_allowed, yes_no}).
-
-read_password(_Prompt) ->
-    throw({no_io_allowed, read_password}).
-
-read_line(_Prompt) ->
-    throw({no_io_allowed, read_line}).
-
-format(_Fmt, _Args) ->
-    throw({no_io_allowed, format}).
+-include("ssh_transport.hrl").
+
+-export([yes_no/2, read_password/2, read_line/2, format/2]).
+
+yes_no(_, _) ->
+    throw({{no_io_allowed, yes_no},
+	   #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+			       description = "User interaction is not allowed",
+			       language = "en"}}).
+
+read_password(_, _) ->
+    throw({{no_io_allowed, read_password},
+	  #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+			       description = "User interaction is not allowed",
+			      language = "en"}}).
+
+read_line(_, _) ->
+    throw({{no_io_allowed, read_line},
+	  #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+			      description =  "User interaction is not allowed",
+			      language = "en"}} ).
+
+format(_, _) ->
+    throw({{no_io_allowed, format},
+	   #ssh_msg_disconnect{code = ?SSH_DISCONNECT_SERVICE_NOT_AVAILABLE,
+			       description =   "User interaction is not allowed",
+			       language = "en"}}).
     
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index 10167a9223..0ea2366ac7 100644
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -352,7 +352,7 @@ write_file(Pid, Name, List) ->
     write_file(Pid, Name, List, ?FILEOP_TIMEOUT).
 
 write_file(Pid, Name, List, FileOpTimeout) when is_list(List) ->
-    write_file(Pid, Name, list_to_binary(List), FileOpTimeout);
+    write_file(Pid, Name, unicode:characters_to_binary(List), FileOpTimeout);
 write_file(Pid, Name, Bin, FileOpTimeout) ->
     case open(Pid, Name, [write, binary], FileOpTimeout) of
 	{ok, Handle} ->
@@ -514,7 +514,7 @@ do_handle_call({pread,Async,Handle,At,Length}, From, State) ->
 				    case get_mode(Handle, State2) of
 					binary -> {{ok,Data}, State2};
 					text ->
-					    {{ok,binary_to_list(Data)}, State2}
+					    {{ok,unicode:characters_to_list(Data)}, State2}
 				    end;
 			       (Rep, State2) -> 
 				    {Rep, State2}
@@ -535,8 +535,7 @@ do_handle_call({read,Async,Handle,Length}, From, State) ->
 			    fun({ok,Data}, State2) ->
 				    case get_mode(Handle, State2) of
 					binary -> {{ok,Data}, State2};
-					text ->
-					    {{ok,binary_to_list(Data)}, State2}
+					text -> {{ok,binary_to_list(Data)}, State2}
 				    end;
 			       (Rep, State2) -> {Rep, State2}
 			    end);
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index 3d469d3c6e..52665635f0 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -76,7 +76,7 @@ listen(Addr, Port, Options) ->
 %% Description: Stops the listener
 %%--------------------------------------------------------------------
 stop(Pid) ->
-    ssh_cli:stop(Pid).
+    ssh:stop_listener(Pid).
 
 
 %%% DEPRECATED END %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -214,8 +214,7 @@ handle_op(?SSH_FXP_INIT, Version, B, State) when is_binary(B) ->
 handle_op(?SSH_FXP_REALPATH, ReqId,
 	  <<?UINT32(Rlen), RPath:Rlen/binary>>,
 	  State0) ->
-    RelPath0 = binary_to_list(RPath),
-    RelPath = relate_file_name(RelPath0, State0, _Canonicalize=false),
+    RelPath = relate_file_name(RPath, State0, _Canonicalize=false),
     {Res, State} = resolve_symlinks(RelPath, State0),
     case Res of
 	{ok, AbsPath} ->
@@ -231,7 +230,7 @@ handle_op(?SSH_FXP_OPENDIR, ReqId,
 	 <<?UINT32(RLen), RPath:RLen/binary>>,
 	  State0 = #state{xf = #ssh_xfer{vsn = Vsn}, 
 			  file_handler = FileMod, file_state = FS0}) ->
-    RelPath = binary_to_list(RPath),
+    RelPath = unicode:characters_to_list(RPath),
     AbsPath = relate_file_name(RelPath, State0),
     
     XF = State0#state.xf,
@@ -312,9 +311,8 @@ handle_op(?SSH_FXP_WRITE, ReqId,
 				    ?SSH_FX_INVALID_HANDLE),
 	    State
     end;
-handle_op(?SSH_FXP_READLINK, ReqId, <<?UINT32(PLen), BPath:PLen/binary>>, 
+handle_op(?SSH_FXP_READLINK, ReqId, <<?UINT32(PLen), RelPath:PLen/binary>>, 
 	  State = #state{file_handler = FileMod, file_state = FS0}) ->
-    RelPath = binary_to_list(BPath),
     AbsPath = relate_file_name(RelPath, State),
     {Res, FS1} = FileMod:read_link(AbsPath, FS0),
     case Res of
@@ -524,10 +522,10 @@ close_our_file({_,Fd}, FileMod, FS0) ->
 %%% stat: do the stat
 stat(Vsn, ReqId, Data, State, F) when Vsn =< 3->
     <<?UINT32(BLen), BPath:BLen/binary>> = Data,
-    stat(ReqId, binary_to_list(BPath), State, F);
+    stat(ReqId, unicode:characters_to_list(BPath), State, F);
 stat(Vsn, ReqId, Data, State, F) when Vsn >= 4->
     <<?UINT32(BLen), BPath:BLen/binary, ?UINT32(_Flags)>> = Data,
-    stat(ReqId, binary_to_list(BPath), State, F).
+    stat(ReqId, unicode:characters_to_list(BPath), State, F).
 
 fstat(Vsn, ReqId, Data, State) when Vsn =< 3->
     <<?UINT32(HLen), Handle:HLen/binary>> = Data,
@@ -609,13 +607,13 @@ decode_4_acess([]) ->
 open(Vsn, ReqId, Data, State) when Vsn =< 3 ->
     <<?UINT32(BLen), BPath:BLen/binary, ?UINT32(PFlags),
      _Attrs/binary>> = Data,
-    Path = binary_to_list(BPath),
+    Path = unicode:characters_to_list(BPath),
     Flags = ssh_xfer:decode_open_flags(Vsn, PFlags),
     do_open(ReqId, State, Path, Flags);
 open(Vsn, ReqId, Data, State) when Vsn >= 4 ->
     <<?UINT32(BLen), BPath:BLen/binary, ?UINT32(Access),
      ?UINT32(PFlags), _Attrs/binary>> = Data,
-    Path = binary_to_list(BPath),
+    Path = unicode:characters_to_list(BPath),
     FlagBits = ssh_xfer:decode_open_flags(Vsn, PFlags),
     AcessBits = ssh_xfer:decode_ace_mask(Access),
     %% TODO: This is to make sure the Access flags are not ignored
@@ -675,7 +673,7 @@ resolve_symlinks_2(["." | RestPath], State0, LinkCnt, AccPath) ->
 resolve_symlinks_2([".." | RestPath], State0, LinkCnt, AccPath) ->
     %% Remove the last path component
     AccPathComps0 = filename:split(AccPath),
-    Path =  case lists:reverse(tl(lists:reverse(AccPathComps0))) of
+    Path =  case lists:droplast(AccPathComps0) of
 		[] ->
 		    "";
 		AccPathComps ->
@@ -712,7 +710,7 @@ relate_file_name(File, State) ->
     relate_file_name(File, State, _Canonicalize=true).
 
 relate_file_name(File, State, Canonicalize) when is_binary(File) ->
-    relate_file_name(binary_to_list(File), State, Canonicalize);
+    relate_file_name(unicode:characters_to_list(File), State, Canonicalize);
 relate_file_name(File, #state{cwd = CWD, root = ""}, Canonicalize) ->
     relate_filename_to_path(File, CWD, Canonicalize);
 relate_file_name(File, #state{root = Root}, Canonicalize) ->
diff --git a/lib/ssh/src/ssh_subsystem_sup.erl b/lib/ssh/src/ssh_subsystem_sup.erl
index cd6defd535..e8855b09ac 100644
--- a/lib/ssh/src/ssh_subsystem_sup.erl
+++ b/lib/ssh/src/ssh_subsystem_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,9 @@
 
 -behaviour(supervisor).
 
--export([start_link/1, connection_supervisor/1, channel_supervisor/1
+-export([start_link/1,
+	 connection_supervisor/1,
+	 channel_supervisor/1
 	]).
 
 %% Supervisor callback
@@ -61,9 +63,9 @@ init([Opts]) ->
 child_specs(Opts) ->
     case proplists:get_value(role, Opts) of
 	client ->		
-	    [ssh_connectinon_child_spec(Opts)];
+	    [];
 	server ->
-	    [ssh_connectinon_child_spec(Opts), ssh_channel_child_spec(Opts)]
+	    [ssh_channel_child_spec(Opts), ssh_connectinon_child_spec(Opts)]
     end.
   
 ssh_connectinon_child_spec(Opts) ->
@@ -72,9 +74,9 @@ ssh_connectinon_child_spec(Opts) ->
     Role = proplists:get_value(role, Opts),
     Name = id(Role, ssh_connection_sup, Address, Port),
     StartFunc = {ssh_connection_sup, start_link, [Opts]},
-    Restart = transient, 
+    Restart = temporary,
     Shutdown = 5000,
-    Modules = [ssh_connection_sup],
+     Modules = [ssh_connection_sup],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
@@ -84,7 +86,7 @@ ssh_channel_child_spec(Opts) ->
     Role = proplists:get_value(role, Opts),
     Name = id(Role, ssh_channel_sup, Address, Port),
     StartFunc = {ssh_channel_sup, start_link, [Opts]},
-    Restart = transient, 
+    Restart = temporary,
     Shutdown = infinity,
     Modules = [ssh_channel_sup],
     Type = supervisor,
diff --git a/lib/ssh/src/ssh_sup.erl b/lib/ssh/src/ssh_sup.erl
index f307d1f833..6d2b9c107d 100644
--- a/lib/ssh/src/ssh_sup.erl
+++ b/lib/ssh/src/ssh_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -51,8 +51,7 @@ children() ->
     Clients = [Service || Service <- Services, is_client(Service)],
     Servers =  [Service || Service <- Services, is_server(Service)],
 
-    [server_child_spec(Servers), client_child_spec(Clients),
-     ssh_userauth_reg_spec()].
+    [server_child_spec(Servers), client_child_spec(Clients)].
 
 server_child_spec(Servers) ->
     Name = sshd_sup,
@@ -72,16 +71,6 @@ client_child_spec(Clients) ->
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-ssh_userauth_reg_spec() ->
-    Name = ssh_userreg,
-    StartFunc = {ssh_userreg, start_link, []},
-    Restart = transient, 
-    Shutdown = 5000,
-    Modules = [ssh_userreg],
-    Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
-
 is_server({sftpd, _}) ->
     true;
 is_server({shelld, _}) ->
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 36daf3b1ac..848133f838 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 @@
 -export([init/1]).
 
 %%%=========================================================================
-%%%  API
+%%% Internal  API
 %%%=========================================================================
 start_link(ServerOpts) ->
     Address = proplists:get_value(address, ServerOpts),
@@ -54,13 +54,15 @@ stop_listener(SysSup) ->
 stop_listener(Address, Port) ->
     Name = make_name(Address, Port),
     stop_acceptor(whereis(Name)). 
-
+ 
 stop_system(SysSup) ->
     Name = sshd_sup:system_name(SysSup),
-    sshd_sup:stop_child(Name).
-    
+    spawn(fun() -> sshd_sup:stop_child(Name) end),
+    ok.
+
 stop_system(Address, Port) -> 
-    sshd_sup:stop_child(Address, Port).
+    spawn(fun() -> sshd_sup:stop_child(Address, Port) end),
+    ok.
 
 system_supervisor(Address, Port) ->
     Name = make_name(Address, Port),
@@ -121,7 +123,7 @@ restart_acceptor(Address, Port) ->
 %%%=========================================================================
 init([ServerOpts]) ->
     RestartStrategy = one_for_one,
-    MaxR = 10,
+    MaxR = 0,
     MaxT = 3600,
     Children = child_specs(ServerOpts),
     {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
@@ -137,7 +139,7 @@ ssh_acceptor_child_spec(ServerOpts) ->
     Port = proplists:get_value(port, ServerOpts),
     Name = id(ssh_acceptor_sup, Address, Port),
     StartFunc = {ssh_acceptor_sup, start_link, [ServerOpts]},
-    Restart = permanent, 
+    Restart = transient, 
     Shutdown = infinity,
     Modules = [ssh_acceptor_sup],
     Type = supervisor,
@@ -146,7 +148,7 @@ ssh_acceptor_child_spec(ServerOpts) ->
 ssh_subsystem_child_spec(ServerOpts) ->
     Name = make_ref(),
     StartFunc = {ssh_subsystem_sup, start_link, [ServerOpts]},
-    Restart = transient, 
+    Restart = temporary,
     Shutdown = infinity,
     Modules = [ssh_subsystem_sup],
     Type = supervisor,
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl
index beaffdc025..27723dc870 100644
--- a/lib/ssh/src/ssh_transport.erl
+++ b/lib/ssh/src/ssh_transport.erl
@@ -29,12 +29,12 @@
 -include("ssh_transport.hrl").
 -include("ssh.hrl").
 
--export([connect/5, accept/4]). 
 -export([versions/2, hello_version_msg/1]).
 -export([next_seqnum/1, decrypt_first_block/2, decrypt_blocks/3,
-	 is_valid_mac/3, transport_messages/1, kexdh_messages/0,
-	 kex_dh_gex_messages/0, handle_hello_version/1,
-	 key_exchange_init_msg/1, key_init/3, new_keys_message/1,
+	 is_valid_mac/3,
+	 handle_hello_version/1,
+	 key_exchange_init_msg/1,
+	 key_init/3, new_keys_message/1,
 	 handle_kexinit_msg/3, handle_kexdh_init/2,
 	 handle_kex_dh_gex_group/2, handle_kex_dh_gex_reply/2,
 	 handle_new_keys/2, handle_kex_dh_gex_request/2,
@@ -74,113 +74,9 @@ is_valid_mac(Mac, Data, #ssh{recv_mac = Algorithm,
 			     recv_mac_key = Key, recv_sequence = SeqNum}) ->
     Mac == mac(Algorithm, Key, SeqNum, Data).
 
-transport_messages(_) ->
-    [{ssh_msg_disconnect, ?SSH_MSG_DISCONNECT, 
-      [uint32, string, string]},
-     
-     {ssh_msg_ignore, ?SSH_MSG_IGNORE,
-      [string]},
-     
-     {ssh_msg_unimplemented, ?SSH_MSG_UNIMPLEMENTED,
-      [uint32]},
-     
-     {ssh_msg_debug, ?SSH_MSG_DEBUG,
-      [boolean, string, string]},
-     
-     {ssh_msg_service_request, ?SSH_MSG_SERVICE_REQUEST,
-      [string]},
-
-     {ssh_msg_service_accept, ?SSH_MSG_SERVICE_ACCEPT,
-      [string]},
-     
-     {ssh_msg_kexinit, ?SSH_MSG_KEXINIT,
-      [cookie,
-       name_list, name_list, 
-       name_list, name_list, 
-       name_list, name_list,
-       name_list, name_list,
-       name_list, name_list,
-       boolean, 
-       uint32]},
-     
-     {ssh_msg_newkeys, ?SSH_MSG_NEWKEYS,
-      []}
-    ].
-
-kexdh_messages() ->
-    [{ssh_msg_kexdh_init, ?SSH_MSG_KEXDH_INIT,
-      [mpint]},
-     
-     {ssh_msg_kexdh_reply, ?SSH_MSG_KEXDH_REPLY,
-      [binary, mpint, binary]}
-    ].
-
-kex_dh_gex_messages() ->
-    [{ssh_msg_kex_dh_gex_request, ?SSH_MSG_KEX_DH_GEX_REQUEST,
-      [uint32, uint32, uint32]},
-     
-     {ssh_msg_kex_dh_gex_request_old, ?SSH_MSG_KEX_DH_GEX_REQUEST_OLD,
-       [uint32]},
-     
-     {ssh_msg_kex_dh_gex_group, ?SSH_MSG_KEX_DH_GEX_GROUP,
-      [mpint, mpint]},
-     
-     {ssh_msg_kex_dh_gex_init, ?SSH_MSG_KEX_DH_GEX_INIT,
-       [mpint]},
-     
-     {ssh_msg_kex_dh_gex_reply, ?SSH_MSG_KEX_DH_GEX_REPLY,
-      [binary, mpint, binary]}
-    ].
-
 yes_no(Ssh, Prompt)  ->
     (Ssh#ssh.io_cb):yes_no(Prompt, Ssh).
 
-connect(ConnectionSup, Address, Port, SocketOpts, Opts) ->    
-    Timeout = proplists:get_value(connect_timeout, Opts, infinity),
-    {_, Callback, _} =  
-	proplists:get_value(transport, Opts, {tcp, gen_tcp, tcp_closed}),
-    case do_connect(Callback, Address, Port, SocketOpts, Timeout) of
- 	{ok, Socket} ->
-	    {ok, Pid} = 
-		ssh_connection_sup:start_handler_child(ConnectionSup,
-						       [client, Socket,
-							[{address, Address},
-							 {port, Port} |
-							 Opts]]), 
-	    Callback:controlling_process(Socket, Pid),
-	    ssh_connection_handler:send_event(Pid, socket_control),
-	    {ok, Pid};
-	{error, Reason} ->
-	    {error, Reason} 
-    end.
-
-do_connect(Callback, Address, Port, SocketOpts, Timeout) ->
-    Opts = [{active, false} | SocketOpts],
-    case Callback:connect(Address, Port, Opts, Timeout) of
-	{error, nxdomain} -> 
-	    Callback:connect(Address, Port, lists:delete(inet6, Opts), Timeout);
-	{error, eafnosupport}  ->
-	    Callback:connect(Address, Port, lists:delete(inet6, Opts), Timeout);
-	{error, enetunreach}  ->
-	    Callback:connect(Address, Port, lists:delete(inet6, Opts), Timeout);
-	Other ->
-	    Other
-    end.
-
-accept(Address, Port, Socket, Options) ->
-    {_, Callback, _} =  
-	proplists:get_value(transport, Options, {tcp, gen_tcp, tcp_closed}),
-    ConnectionSup =
-	ssh_system_sup:connection_supervisor(
-	  ssh_system_sup:system_supervisor(Address, Port)),
-    {ok, Pid} = 
-	ssh_connection_sup:start_handler_child(ConnectionSup,
-					       [server, Socket,
-						[{address, Address},
-						 {port, Port} | Options]]),
-    Callback:controlling_process(Socket, Pid),
-    {ok, Pid}.
-
 format_version({Major,Minor}) ->
     "SSH-" ++ integer_to_list(Major) ++ "." ++ 
 	integer_to_list(Minor) ++ "-Erlang".
@@ -206,6 +102,7 @@ key_exchange_init_msg(Ssh0) ->
 kex_init(#ssh{role = Role, opts = Opts, available_host_keys = HostKeyAlgs}) ->
     Random = ssh_bits:random(16),
     Compression = case proplists:get_value(compression, Opts, none) of
+		      openssh_zlib -> ["[email protected]", "none"];
 		      zlib -> ["zlib", "none"];
 		      none -> ["none", "zlib"]
 		  end,
@@ -256,7 +153,6 @@ handle_kexinit_msg(#ssh_msg_kexinit{} = CounterPart, #ssh_msg_kexinit{} = Own,
     {ok, Algoritms} = select_algorithm(client, Own, CounterPart),  
     case verify_algorithm(Algoritms) of
 	true ->
-	    install_messages(Algoritms#alg.kex),
 	    key_exchange_first_msg(Algoritms#alg.kex, 
 				   Ssh0#ssh{algorithms = Algoritms});
 	_  ->
@@ -270,7 +166,6 @@ handle_kexinit_msg(#ssh_msg_kexinit{} = CounterPart, #ssh_msg_kexinit{} = Own,
 handle_kexinit_msg(#ssh_msg_kexinit{} = CounterPart, #ssh_msg_kexinit{} = Own,
 			    #ssh{role = server} = Ssh) ->
     {ok, Algoritms} = select_algorithm(server, CounterPart, Own),
-    install_messages(Algoritms#alg.kex),
     {ok, Ssh#ssh{algorithms = Algoritms}}.
 
 
@@ -283,11 +178,6 @@ verify_algorithm(#alg{kex = 'diffie-hellman-group-exchange-sha1'}) ->
 verify_algorithm(_) ->
     false.
 
-install_messages('diffie-hellman-group1-sha1') ->
-    ssh_bits:install_messages(kexdh_messages());
-install_messages('diffie-hellman-group-exchange-sha1') ->
-    ssh_bits:install_messages(kex_dh_gex_messages()).
-
 key_exchange_first_msg('diffie-hellman-group1-sha1', Ssh0) ->
     {G, P} = dh_group1(),
     {Private, Public} = dh_gen_key(G, P, 1024),
@@ -311,10 +201,10 @@ handle_kexdh_init(#ssh_msg_kexdh_init{e = E}, Ssh0) ->
     {G, P} = dh_group1(),
     {Private, Public} = dh_gen_key(G, P, 1024),
     K = ssh_math:ipow(E, Private, P),
-    {Key, K_S} = get_host_key(Ssh0),
-    H = kex_h(Ssh0, K_S, E, Public, K),
+    Key = get_host_key(Ssh0),
+    H = kex_h(Ssh0, Key, E, Public, K),
     H_SIG = sign_host_key(Ssh0, Key, H),
-    {SshPacket, Ssh1} = ssh_packet(#ssh_msg_kexdh_reply{public_host_key = K_S,
+    {SshPacket, Ssh1} = ssh_packet(#ssh_msg_kexdh_reply{public_host_key = Key,
 							f = Public,
 							h_sig = H_SIG
 						       }, Ssh0),
@@ -410,65 +300,33 @@ get_host_key(SSH) ->
     #ssh{key_cb = Mod, opts = Opts, algorithms = ALG} = SSH,
 
     case Mod:host_key(ALG#alg.hkey, Opts) of
-	{ok, #'RSAPrivateKey'{modulus = N, publicExponent = E} = Key} ->
-	    {Key,
-	     ssh_bits:encode(["ssh-rsa",E,N],[string,mpint,mpint])};
-	{ok, #'DSAPrivateKey'{y = Y, p = P, q = Q, g = G} = Key} ->
-	    {Key, ssh_bits:encode(["ssh-dss",P,Q,G,Y],
-				  [string,mpint,mpint,mpint,mpint])};
+	{ok, #'RSAPrivateKey'{} = Key} ->
+	    Key;
+	{ok, #'DSAPrivateKey'{} = Key} ->
+	    Key;
 	Result ->
 	    exit({error, {Result, unsupported_key_type}})
     end.
 
 sign_host_key(_Ssh, #'RSAPrivateKey'{} = Private, H) ->
     Hash = sha, %% Option ?!
-    Signature = sign(H, Hash, Private),
-    ssh_bits:encode(["ssh-rsa", Signature],[string, binary]);
+    _Signature = sign(H, Hash, Private);
 sign_host_key(_Ssh, #'DSAPrivateKey'{} = Private, H) ->
     Hash = sha, %% Option ?!
-    RawSignature = sign(H, Hash, Private),
-    ssh_bits:encode(["ssh-dss", RawSignature],[string, binary]).
+    _RawSignature = sign(H, Hash, Private).
 
-verify_host_key(SSH, K_S, H, H_SIG) ->
-    ALG = SSH#ssh.algorithms,
-    case ALG#alg.hkey of
-	'ssh-rsa' ->
-	    verify_host_key_rsa(SSH, K_S, H, H_SIG);
-	'ssh-dss' ->
-	    verify_host_key_dss(SSH, K_S, H, H_SIG);
-	_ ->
-	    {error, bad_host_key_algorithm}
-    end.
-
-verify_host_key_rsa(SSH, K_S, H, H_SIG) ->
-    case ssh_bits:decode(K_S,[string,mpint,mpint]) of
-	["ssh-rsa", E, N] ->
-	    ["ssh-rsa",SIG] = ssh_bits:decode(H_SIG,[string,binary]),
-	    Public = #'RSAPublicKey'{publicExponent = E, modulus = N},
-	    case verify(H, sha, SIG, Public) of
-		false ->
-		    {error, bad_signature};
-		true ->
-		    known_host_key(SSH, Public, 'ssh-rsa')
-	    end;
-	_ ->
-	    {error, bad_format}
+verify_host_key(SSH, PublicKey, Digest, Signature) ->
+    case verify(Digest, sha, Signature, PublicKey) of
+	false ->
+	    {error, bad_signature};
+	true ->
+	    known_host_key(SSH, PublicKey, public_algo(PublicKey))
     end.
 
-verify_host_key_dss(SSH, K_S, H, H_SIG) ->
-    case ssh_bits:decode(K_S,[string,mpint,mpint,mpint,mpint]) of
-	["ssh-dss",P,Q,G,Y] ->
-	    ["ssh-dss",SIG] = ssh_bits:decode(H_SIG,[string,binary]),
-	    Public = {Y,  #'Dss-Parms'{p = P, q = Q, g = G}},
-	    case verify(H, sha, SIG, Public) of
-		false ->
-		    {error, bad_signature};
-		true ->
-		    known_host_key(SSH, Public, 'ssh-dss')
-	    end;
-	_ ->
-	    {error, bad_host_key_format}
-    end.
+public_algo(#'RSAPublicKey'{}) ->
+    'ssh-rsa';
+public_algo({_, #'Dss-Parms'{}}) ->
+    'ssh-dss'.
 
 accepted_host(Ssh, PeerName, Opts) ->
     case proplists:get_value(silently_accept_hosts, Opts, false) of
@@ -635,12 +493,12 @@ select(CL, SL) ->
     C.
 	    
 ssh_packet(#ssh_msg_kexinit{} = Msg, Ssh0) ->
-    BinMsg = ssh_bits:encode(Msg),
+    BinMsg = ssh_message:encode(Msg),
     Ssh = key_init(Ssh0#ssh.role, Ssh0, BinMsg),
     pack(BinMsg, Ssh);
 
 ssh_packet(Msg, Ssh) ->
-    BinMsg = ssh_bits:encode(Msg),
+    BinMsg = ssh_message:encode(Msg),
     pack(BinMsg, Ssh).
 
 pack(Data0, #ssh{encrypt_block_size = BlockSize, 
@@ -855,13 +713,14 @@ decrypt(#ssh{decrypt = 'aes128-cbc', decrypt_keys = Key,
     IV = crypto:next_iv(aes_cbc, Data),
     {Ssh#ssh{decrypt_ctx = IV}, Dec}.
 
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Compression
 %%
-%%     none     REQUIRED        no compression
-%%     zlib     OPTIONAL        ZLIB (LZ77) compression
+%%     none             REQUIRED        no compression
+%%     zlib             OPTIONAL        ZLIB (LZ77) compression
+%%     openssh_zlib     OPTIONAL        ZLIB (LZ77) compression
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 compress_init(SSH) ->
     compress_init(SSH, 1).
 
@@ -870,19 +729,32 @@ compress_init(#ssh{compress = none} = Ssh, _) ->
 compress_init(#ssh{compress = zlib} = Ssh, Level) ->
     Zlib = zlib:open(),
     ok = zlib:deflateInit(Zlib, Level),
+    {ok, Ssh#ssh{compress_ctx = Zlib}};
+compress_init(#ssh{compress = '[email protected]'} = Ssh, Level) ->
+    Zlib = zlib:open(),
+    ok = zlib:deflateInit(Zlib, Level),
     {ok, Ssh#ssh{compress_ctx = Zlib}}.
 
-
 compress_final(#ssh{compress = none} = Ssh) ->
     {ok, Ssh};
 compress_final(#ssh{compress = zlib, compress_ctx = Context} = Ssh) ->
     zlib:close(Context),
+    {ok, Ssh#ssh{compress = none, compress_ctx = undefined}};
+compress_final(#ssh{compress = '[email protected]', authenticated = false} = Ssh) ->
+    {ok, Ssh};
+compress_final(#ssh{compress = '[email protected]', compress_ctx = Context, authenticated = true} = Ssh) ->
+    zlib:close(Context),
     {ok, Ssh#ssh{compress = none, compress_ctx = undefined}}.
 
 compress(#ssh{compress = none} = Ssh, Data) ->
     {Ssh, Data};
 compress(#ssh{compress = zlib, compress_ctx = Context} = Ssh, Data) ->
     Compressed = zlib:deflate(Context, Data, sync),
+    {Ssh, list_to_binary(Compressed)};
+compress(#ssh{compress = '[email protected]', authenticated = false} = Ssh, Data) ->
+    {Ssh, Data};
+compress(#ssh{compress = '[email protected]', compress_ctx = Context, authenticated = true} = Ssh, Data) ->
+    Compressed = zlib:deflate(Context, Data, sync),
     {Ssh, list_to_binary(Compressed)}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -894,18 +766,32 @@ decompress_init(#ssh{decompress = none} = Ssh) ->
 decompress_init(#ssh{decompress = zlib} = Ssh) ->
     Zlib = zlib:open(),
     ok = zlib:inflateInit(Zlib),
+    {ok, Ssh#ssh{decompress_ctx = Zlib}};
+decompress_init(#ssh{decompress = '[email protected]'} = Ssh) ->
+    Zlib = zlib:open(),
+    ok = zlib:inflateInit(Zlib),
     {ok, Ssh#ssh{decompress_ctx = Zlib}}.
 
 decompress_final(#ssh{decompress = none} = Ssh) ->
     {ok, Ssh};
 decompress_final(#ssh{decompress = zlib, decompress_ctx = Context} = Ssh) ->
     zlib:close(Context),
+    {ok, Ssh#ssh{decompress = none, decompress_ctx = undefined}};
+decompress_final(#ssh{decompress = '[email protected]', authenticated = false} = Ssh) ->
+    {ok, Ssh};
+decompress_final(#ssh{decompress = '[email protected]', decompress_ctx = Context, authenticated = true} = Ssh) ->
+    zlib:close(Context),
     {ok, Ssh#ssh{decompress = none, decompress_ctx = undefined}}.
 
 decompress(#ssh{decompress = none} = Ssh, Data) ->
     {Ssh, Data};
 decompress(#ssh{decompress = zlib, decompress_ctx = Context} = Ssh, Data) ->
     Decompressed = zlib:inflate(Context, Data),
+    {Ssh, list_to_binary(Decompressed)};
+decompress(#ssh{decompress = '[email protected]', authenticated = false} = Ssh, Data) ->
+    {Ssh, Data};
+decompress(#ssh{decompress = '[email protected]', decompress_ctx = Context, authenticated = true} = Ssh, Data) ->
+    Decompressed = zlib:inflate(Context, Data),
     {Ssh, list_to_binary(Decompressed)}.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -992,23 +878,23 @@ hash(K, H, Ki, N, HASH) ->
     Kj = HASH([K, H, Ki]),
     hash(K, H, <<Ki/binary, Kj/binary>>, N-128, HASH).
 
-kex_h(SSH, K_S, E, F, K) ->
+kex_h(SSH, Key, E, F, K) ->
     L = ssh_bits:encode([SSH#ssh.c_version, SSH#ssh.s_version,
 			 SSH#ssh.c_keyinit, SSH#ssh.s_keyinit,
-			 K_S, E,F,K],
+			 ssh_message:encode_host_key(Key), E,F,K],
 			[string,string,binary,binary,binary,
 			 mpint,mpint,mpint]),
     crypto:hash(sha,L).
  
 
-kex_h(SSH, K_S, Min, NBits, Max, Prime, Gen, E, F, K) ->
+kex_h(SSH, Key, Min, NBits, Max, Prime, Gen, E, F, K) ->
     L = if Min==-1; Max==-1 ->
 		Ts = [string,string,binary,binary,binary,
 		      uint32,
 		      mpint,mpint,mpint,mpint,mpint],
 		ssh_bits:encode([SSH#ssh.c_version,SSH#ssh.s_version,
 				 SSH#ssh.c_keyinit,SSH#ssh.s_keyinit,
-				 K_S, NBits, Prime, Gen, E,F,K],
+				 ssh_message:encode_host_key(Key), NBits, Prime, Gen, E,F,K],
 				Ts);
 	   true ->
 		Ts = [string,string,binary,binary,binary,
@@ -1016,7 +902,7 @@ kex_h(SSH, K_S, Min, NBits, Max, Prime, Gen, E, F, K) ->
 		      mpint,mpint,mpint,mpint,mpint],
 		ssh_bits:encode([SSH#ssh.c_version,SSH#ssh.s_version,
 				 SSH#ssh.c_keyinit,SSH#ssh.s_keyinit,
-				 K_S, Min, NBits, Max,
+				 ssh_message:encode_host_key(Key), Min, NBits, Max,
 				 Prime, Gen, E,F,K], Ts)
 	end,
     crypto:hash(sha,L).
diff --git a/lib/ssh/src/ssh_userreg.erl b/lib/ssh/src/ssh_userreg.erl
deleted file mode 100644
index f901461aea..0000000000
--- a/lib/ssh/src/ssh_userreg.erl
+++ /dev/null
@@ -1,141 +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%
-%%
-
-%%
-%% Description: User register for ssh_cli
-
--module(ssh_userreg).
-
--behaviour(gen_server).
-
-%% API
--export([start_link/0,
-	 register_user/2,
-	 lookup_user/1,
-	 delete_user/1]).
-
-%% gen_server callbacks
--export([init/1,
-	 handle_call/3,
-	 handle_cast/2,
-	 handle_info/2,
-	 terminate/2,
-	 code_change/3]).
-
--record(state, {user_db = []}).
-
-%%====================================================================
-%% API
-%%====================================================================
-%%--------------------------------------------------------------------
-%% Function: start_link() -> {ok,Pid} | ignore | {error,Error}
-%% Description: Starts the server
-%%--------------------------------------------------------------------
-start_link() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
-
-register_user(User, Cm) ->
-    gen_server:cast(?MODULE, {register, {User, Cm}}).
-
-delete_user(Cm) ->
-    gen_server:cast(?MODULE, {delete, Cm}).
-
-lookup_user(Cm) ->
-    gen_server:call(?MODULE, {get_user, Cm}, infinity).
-
-%%====================================================================
-%% gen_server callbacks
-%%====================================================================
-
-%%--------------------------------------------------------------------
-%% Function: init(Args) -> {ok, State} |
-%%                         {ok, State, Timeout} |
-%%                         ignore               |
-%%                         {stop, Reason}
-%% Description: Initiates the server
-%%--------------------------------------------------------------------
-init([]) ->
-    {ok, #state{}}.
-
-%%--------------------------------------------------------------------
-%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} |
-%%                                      {reply, Reply, State, Timeout} |
-%%                                      {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, Reply, State} |
-%%                                      {stop, Reason, State}
-%% Description: Handling call messages
-%%--------------------------------------------------------------------
-handle_call({get_user, Cm}, _From, #state{user_db = Db} = State) ->
-    User = lookup(Cm, Db),
-    {reply, {ok, User}, State}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_cast(Msg, State) -> {noreply, State} |
-%%                                      {noreply, State, Timeout} |
-%%                                      {stop, Reason, State}
-%% Description: Handling cast messages
-%%--------------------------------------------------------------------
-handle_cast({register, UserCm}, State) ->
-    {noreply, insert(UserCm, State)};
-handle_cast({delete, UserCm}, State) ->
-    {noreply, delete(UserCm, State)}.
-
-%%--------------------------------------------------------------------
-%% Function: handle_info(Info, State) -> {noreply, State} |
-%%                                       {noreply, State, Timeout} |
-%%                                       {stop, Reason, State}
-%% Description: Handling all non call/cast messages
-%%--------------------------------------------------------------------
-handle_info(_Info, State) ->
-    {noreply, State}.
-
-%%--------------------------------------------------------------------
-%% Function: terminate(Reason, State) -> void()
-%% Description: This function is called by a gen_server when it is about to
-%% terminate. It should be the opposite of Module:init/1 and do any necessary
-%% cleaning up. When it returns, the gen_server terminates with Reason.
-%% The return value is ignored.
-%%--------------------------------------------------------------------
-terminate(_Reason, _State) ->
-    ok.
-
-%%--------------------------------------------------------------------
-%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState}
-%% Description: Convert process state when code is changed
-%%--------------------------------------------------------------------
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-%%--------------------------------------------------------------------
-%%% Internal functions
-%%--------------------------------------------------------------------
-insert({User, Cm}, #state{user_db = Db} = State) ->
-    State#state{user_db = [{User, Cm} | Db]}.
-
-delete(Cm, #state{user_db = Db} = State) ->
-    State#state{user_db = lists:keydelete(Cm, 2, Db)}.
-
-lookup(_, []) ->
-    undefined;
-lookup(Cm, [{User, Cm} | _Rest]) ->
-    User;
-lookup(Cm, [_ | Rest]) ->
-    lookup(Cm, Rest).
-
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl
index b299868d41..63d01fd9de 100644
--- a/lib/ssh/src/ssh_xfer.erl
+++ b/lib/ssh/src/ssh_xfer.erl
@@ -72,7 +72,6 @@ protocol_version_request(XF) ->
 
 open(XF, ReqID, FileName, Access, Flags, Attrs) -> 
     Vsn = XF#ssh_xfer.vsn,
-    FileName1 = unicode:characters_to_binary(FileName),
     MBits = if Vsn >= 5 -> 
 		    M = encode_ace_mask(Access),
 		    ?uint32(M);
@@ -82,7 +81,7 @@ open(XF, ReqID, FileName, Access, Flags, Attrs) ->
     F = encode_open_flags(Flags),
     xf_request(XF,?SSH_FXP_OPEN, 
 	       [?uint32(ReqID),
-		?binary(FileName1),
+		?string_utf8(FileName),
 		MBits,
 		?uint32(F),
 		encode_ATTR(Vsn,Attrs)]).    
@@ -90,7 +89,7 @@ open(XF, ReqID, FileName, Access, Flags, Attrs) ->
 opendir(XF, ReqID, DirName) ->
     xf_request(XF, ?SSH_FXP_OPENDIR, 
 	       [?uint32(ReqID),
-		?string(DirName)]).
+		?string_utf8(DirName)]).
 
 
 close(XF, ReqID, Handle) ->
@@ -127,13 +126,11 @@ write(XF,ReqID, Handle, Offset, Data) ->
 remove(XF, ReqID, File) ->
     xf_request(XF, ?SSH_FXP_REMOVE, 
 	       [?uint32(ReqID),
-		?string(File)]).
+		?string_utf8(File)]).
 
 %% Rename a file/directory
-rename(XF, ReqID, Old, New, Flags) ->
+rename(XF, ReqID, OldPath, NewPath, Flags) ->
     Vsn = XF#ssh_xfer.vsn,
-    OldPath = unicode:characters_to_binary(Old),
-    NewPath = unicode:characters_to_binary(New),
     FlagBits
 	= if Vsn >= 5 ->
 		  F0 = encode_rename_flags(Flags),
@@ -143,30 +140,27 @@ rename(XF, ReqID, Old, New, Flags) ->
 	  end,
     xf_request(XF, ?SSH_FXP_RENAME, 
 	       [?uint32(ReqID),
-		?binary(OldPath),
-		?binary(NewPath),
+		?string_utf8(OldPath),
+		?string_utf8(NewPath),
 		FlagBits]).
 
 
 
 %% Create directory
 mkdir(XF, ReqID, Path, Attrs) ->
-    Path1 = unicode:characters_to_binary(Path),
     xf_request(XF, ?SSH_FXP_MKDIR, 
 	       [?uint32(ReqID),
-		?binary(Path1),
+		?string_utf8(Path),
 		encode_ATTR(XF#ssh_xfer.vsn, Attrs)]).
 
 %% Remove a directory
 rmdir(XF, ReqID, Dir) ->
-    Dir1 = unicode:characters_to_binary(Dir),
     xf_request(XF, ?SSH_FXP_RMDIR,
 	       [?uint32(ReqID),
-		?binary(Dir1)]).
+		?string_utf8(Dir)]).
 
 %% Stat file
 stat(XF, ReqID, Path, Flags) ->
-    Path1 = unicode:characters_to_binary(Path),
     Vsn = XF#ssh_xfer.vsn,
     AttrFlags = if Vsn >= 5 ->
 			F = encode_attr_flags(Vsn, Flags),
@@ -176,13 +170,12 @@ stat(XF, ReqID, Path, Flags) ->
 		end,
     xf_request(XF, ?SSH_FXP_STAT, 
 	       [?uint32(ReqID),
-		?binary(Path1),
+		?string_utf8(Path),
 		AttrFlags]).
 
 
 %% Stat file - follow symbolic links
 lstat(XF, ReqID, Path, Flags) ->
-    Path1 = unicode:characters_to_binary(Path),
     Vsn = XF#ssh_xfer.vsn,
     AttrFlags = if Vsn >= 5 ->
 			F = encode_attr_flags(Vsn, Flags),
@@ -192,7 +185,7 @@ lstat(XF, ReqID, Path, Flags) ->
 		end,
     xf_request(XF, ?SSH_FXP_LSTAT, 
 	     [?uint32(ReqID),
-	      ?binary(Path1),
+	      ?string_utf8(Path),
 	      AttrFlags]).
 
 %% Stat open file
@@ -211,10 +204,9 @@ fstat(XF, ReqID, Handle, Flags) ->
 
 %% Modify file attributes
 setstat(XF, ReqID, Path, Attrs) ->
-    Path1 = unicode:characters_to_binary(Path),
     xf_request(XF, ?SSH_FXP_SETSTAT, 
 	       [?uint32(ReqID),
-		?binary(Path1),
+		?string_utf8(Path),
 		encode_ATTR(XF#ssh_xfer.vsn, Attrs)]).
 
 
@@ -227,10 +219,9 @@ fsetstat(XF, ReqID, Handle, Attrs) ->
     
 %% Read a symbolic link
 readlink(XF, ReqID, Path) ->
-    Path1 = unicode:characters_to_binary(Path),
     xf_request(XF, ?SSH_FXP_READLINK, 
 	       [?uint32(ReqID),
-		?binary(Path1)]).
+		?string_utf8(Path)]).
 
 
 %% Create a symbolic link    
@@ -244,10 +235,9 @@ symlink(XF, ReqID, LinkPath, TargetPath) ->
 
 %% Convert a path into a 'canonical' form
 realpath(XF, ReqID, Path) ->
-    Path1 = unicode:characters_to_binary(Path),
     xf_request(XF, ?SSH_FXP_REALPATH,     
 	       [?uint32(ReqID),
-		?binary(Path1)]).
+		?string_utf8(Path)]).
 
 extended(XF, ReqID, Request, Data) ->
     xf_request(XF, ?SSH_FXP_EXTENDED,
@@ -267,7 +257,7 @@ xf_request(XF, Op, Arg) ->
 		   list_to_binary(Arg)
 	   end,
     Size = 1+size(Data),
-    ssh_connection:send(CM, Channel, <<?UINT32(Size), Op, Data/binary>>).
+    ssh_connection:send(CM, Channel, [<<?UINT32(Size), Op, Data/binary>>]).
 
 xf_send_reply(#ssh_xfer{cm = CM, channel = Channel}, Op, Arg) ->    
     Data = if 
@@ -277,7 +267,7 @@ xf_send_reply(#ssh_xfer{cm = CM, channel = Channel}, Op, Arg) ->
 		   list_to_binary(Arg)
 	   end,
     Size = 1 + size(Data),
-    ssh_connection:send(CM, Channel, <<?UINT32(Size), Op, Data/binary>>).
+    ssh_connection:send(CM, Channel, [<<?UINT32(Size), Op, Data/binary>>]).
 
 xf_send_name(XF, ReqId, Name, Attr) ->
     xf_send_names(XF, ReqId, [{Name, Attr}]).
@@ -296,7 +286,10 @@ xf_send_names(#ssh_xfer{cm = CM, channel = Channel, vsn = Vsn},
     Count = length(NamesAndAttrs),
     {Data, Len} = encode_names(Vsn, NamesAndAttrs),
     Size = 1 + 4 + 4 + Len,
-    ToSend = [<<?UINT32(Size), ?SSH_FXP_NAME, ?UINT32(ReqId), ?UINT32(Count)>>,
+    ToSend = [<<?UINT32(Size), 
+		?SSH_FXP_NAME, 
+		?UINT32(ReqId),
+		?UINT32(Count)>>,
 	      Data],
     ssh_connection:send(CM, Channel, ToSend).
 
@@ -818,25 +811,27 @@ decode_names(_Vsn, 0, _Data) ->
 decode_names(Vsn, I, <<?UINT32(Len), FileName:Len/binary, 
 		      ?UINT32(LLen), _LongName:LLen/binary,
 		      Tail/binary>>) when Vsn =< 3 ->
-    Name = binary_to_list(FileName),
+    Name = unicode:characters_to_list(FileName),
     {A, Tail2} = decode_ATTR(Vsn, Tail),
     [{Name, A} | decode_names(Vsn, I-1, Tail2)];
 decode_names(Vsn, I, <<?UINT32(Len), FileName:Len/binary, 
 		      Tail/binary>>) when Vsn >= 4 ->
-    Name = binary_to_list(FileName),
+    Name = unicode:characters_to_list(FileName),
     {A, Tail2} = decode_ATTR(Vsn, Tail),
     [{Name, A} | decode_names(Vsn, I-1, Tail2)].
 
 encode_names(Vsn, NamesAndAttrs) ->
     lists:mapfoldl(fun(N, L) -> encode_name(Vsn, N, L) end, 0, NamesAndAttrs).
 
-encode_name(Vsn, {Name,Attr}, Len) when Vsn =< 3 ->
+encode_name(Vsn, {NameUC,Attr}, Len) when Vsn =< 3 ->
+    Name = binary_to_list(unicode:characters_to_binary(NameUC)),
     NLen = length(Name),
     EncAttr = encode_ATTR(Vsn, Attr),
     ALen = size(EncAttr),
     NewLen = Len + NLen*2 + 4 + 4 + ALen,
     {[<<?UINT32(NLen)>>, Name, <<?UINT32(NLen)>>, Name, EncAttr], NewLen};
-encode_name(Vsn, {Name,Attr}, Len) when Vsn >= 4 ->
+encode_name(Vsn, {NameUC,Attr}, Len) when Vsn >= 4 ->
+    Name = binary_to_list(unicode:characters_to_binary(NameUC)),
     NLen = length(Name),
     EncAttr = encode_ATTR(Vsn, Attr),
     ALen = size(EncAttr),
@@ -851,9 +846,9 @@ encode_acl_items([ACE|As]) ->
     Type = encode_ace_type(ACE#ssh_xfer_ace.type),
     Flag = encode_ace_flag(ACE#ssh_xfer_ace.flag), 
     Mask = encode_ace_mask(ACE#ssh_xfer_ace.mask), 
-    Who = list_to_binary(ACE#ssh_xfer_ace.who),
+    Who = ACE#ssh_xfer_ace.who,
     [?uint32(Type), ?uint32(Flag), ?uint32(Mask), 
-     ?binary(Who) | encode_acl_items(As)];
+     ?string_utf8(Who) | encode_acl_items(As)];
 encode_acl_items([]) ->
     [].
 
@@ -872,7 +867,7 @@ decode_acl_items(I, <<?UINT32(Type),
 		     [#ssh_xfer_ace { type = decode_ace_type(Type),
 				      flag = decode_ace_flag(Flag),
 				      mask = decode_ace_mask(Mask),
-				      who = binary_to_list(BWho)} | Acc]).
+				      who = unicode:characters_to_list(BWho)} | Acc]).
 
 encode_extensions(Exts) ->
     Count = length(Exts),
diff --git a/lib/ssh/src/sshc_sup.erl b/lib/ssh/src/sshc_sup.erl
index 1d2779de23..e6b4b681a4 100644
--- a/lib/ssh/src/sshc_sup.erl
+++ b/lib/ssh/src/sshc_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -61,9 +61,9 @@ init(Args) ->
 %%%=========================================================================
 child_spec(_) ->
     Name = undefined, % As simple_one_for_one is used.
-    StartFunc = {ssh_connection_sup, start_link, []},
+    StartFunc = {ssh_connection_handler, start_link, []},
     Restart = temporary,
     Shutdown = infinity,
-    Modules = [ssh_connection_sup],
+    Modules = [ssh_connection_handler],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl
index 747906b2cf..60222f5172 100644
--- a/lib/ssh/src/sshd_sup.erl
+++ b/lib/ssh/src/sshd_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,12 +58,7 @@ start_child(ServerOpts) ->
     end.
 
 stop_child(Name) ->
-    case supervisor:terminate_child(?MODULE, Name) of
-        ok ->
-            supervisor:delete_child(?MODULE, Name);
-        Error ->
-            Error
-    end.
+    supervisor:terminate_child(?MODULE, Name).
 
 stop_child(Address, Port) ->
     Name = id(Address, Port),
@@ -94,7 +89,7 @@ init([Servers]) ->
 child_spec(Address, Port, ServerOpts) ->
     Name = id(Address, Port),
     StartFunc = {ssh_system_sup, start_link, [ServerOpts]},
-    Restart = transient, 
+    Restart = temporary, 
     Shutdown = infinity,
     Modules = [ssh_system_sup],
     Type = supervisor,
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index f5db31baee..740dbd0235 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2004-2012. All Rights Reserved.
+# Copyright Ericsson AB 2004-2013. All Rights Reserved.
 #
 # The 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,9 @@ MODULES= \
 	ssh_sftpd_SUITE \
 	ssh_sftpd_erlclient_SUITE \
 	ssh_connection_SUITE \
-	ssh_echo_server
+	ssh_echo_server \
+	ssh_peername_sockname_server \
+	ssh_test_cli 
 
 HRL_FILES_NEEDED_IN_TEST= \
 	$(ERL_TOP)/lib/ssh/src/ssh.hrl \
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 93029c5038..d2e52379fa 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -22,6 +22,7 @@
 -module(ssh_basic_SUITE).
 
 -include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/inet.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
@@ -37,6 +38,7 @@ suite() ->
 
 all() -> 
     [app_test,
+     appup_test,
      {group, dsa_key},
      {group, rsa_key},
      {group, dsa_pass_key},
@@ -45,15 +47,21 @@ all() ->
      daemon_already_started,
      server_password_option,
      server_userpassword_option,
-     close].
+     double_close].
 
 groups() -> 
-    [{dsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time, rekey]},
-     {rsa_key, [], [send, exec, exec_compressed, shell, known_hosts, idle_time, rekey]},
+    [{dsa_key, [], basic_tests()},
+     {rsa_key, [], basic_tests()},
      {dsa_pass_key, [], [pass_phrase]},
      {rsa_pass_key, [], [pass_phrase]},
      {internal_error, [], [internal_error]}
     ].
+
+basic_tests() ->
+    [send, close, peername_sockname,
+     exec, exec_compressed, shell, cli, known_hosts, 
+     idle_time, rekey, openssh_zlib_basic_test].
+
 %%--------------------------------------------------------------------
 init_per_suite(Config) ->
     case catch crypto:start() of
@@ -143,6 +151,11 @@ app_test(Config) when is_list(Config) ->
     ?t:app_test(ssh),
     ok.
 %%--------------------------------------------------------------------
+appup_test() ->
+    [{doc, "Appup file consistency test."}].
+appup_test(Config) when is_list(Config) ->
+    ok = ?t:appup_test(ssh).
+%%--------------------------------------------------------------------
 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 "
@@ -252,7 +265,7 @@ idle_time(Config) ->
     ssh_connection:close(ConnectionRef, Id),
     receive
     after 10000 ->
-	    {error,channel_closed} = ssh_connection:session_channel(ConnectionRef, 1000)
+	    {error, closed} = ssh_connection:session_channel(ConnectionRef, 1000)
     end,
     ssh:stop_daemon(Pid).
 %%--------------------------------------------------------------------
@@ -300,6 +313,41 @@ shell(Config) when is_list(Config) ->
     end.
     
 %%--------------------------------------------------------------------
+cli() ->
+    [{doc, ""}].
+cli(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},
+					       {password, "morot"},
+					       {ssh_cli, {ssh_test_cli, [cli]}}, 
+					       {subsystems, []},
+					       {failfun, fun ssh_test_lib:failfun/2}]),
+    ct:sleep(500),
+    
+    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),
+    ssh_connection:shell(ConnectionRef, ChannelId),
+    ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>),
+    receive 
+	{ssh_cm, ConnectionRef,
+	 {data,0,0, <<"\r\nYou are accessing a dummy, type \"q\" to exit\r\n\n">>}} ->
+	    ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>)
+    end,
+    
+    receive 
+     	{ssh_cm, ConnectionRef,{closed, ChannelId}} ->
+     	    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"}].
@@ -445,10 +493,11 @@ internal_error(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}]),
-    {error,"Internal error"} =
+    {error, Error} =
 	ssh:connect(Host, Port, [{silently_accept_hosts, true},
 				 {user_dir, UserDir},
 				 {user_interaction, false}]),
+    check_error(Error),
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
@@ -473,9 +522,85 @@ send(Config) when is_list(Config) ->
 
 
 %%--------------------------------------------------------------------
+peername_sockname() ->
+    [{doc, "Test ssh:connection_info([peername, sockname])"}].
+peername_sockname(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},
+					     {subsystems, [{"peername_sockname",
+							    {ssh_peername_sockname_server, []}}
+							  ]}
+					    ]),
+    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),
+    success = ssh_connection:subsystem(ConnectionRef, ChannelId, "peername_sockname", infinity),
+    [{peer, {_Name, {HostPeerClient,PortPeerClient} = ClientPeer}}] =
+	ssh:connection_info(ConnectionRef, [peer]),
+    [{sockname, {HostSockClient,PortSockClient} = ClientSock}] =
+	ssh:connection_info(ConnectionRef, [sockname]),
+    ct:pal("Client: ~p ~p", [ClientPeer, ClientSock]),
+    receive
+	{ssh_cm, ConnectionRef, {data, ChannelId, _, Response}} ->
+	    {PeerNameSrv,SockNameSrv} = binary_to_term(Response),
+	    {HostPeerSrv,PortPeerSrv} = PeerNameSrv,
+	    {HostSockSrv,PortSockSrv} = SockNameSrv,
+	    ct:pal("Server: ~p ~p", [PeerNameSrv, SockNameSrv]),
+	    host_equal(HostPeerSrv, HostSockClient),
+	    PortPeerSrv = PortSockClient,
+	    host_equal(HostSockSrv, HostPeerClient),
+	    PortSockSrv = PortPeerClient,
+	    host_equal(HostSockSrv, Host),
+	    PortSockSrv = Port
+    after 10000 ->
+	    throw(timeout)
+    end.
+
+host_equal(H1, H2) ->
+    not ordsets:is_disjoint(ips(H1), ips(H2)).
+
+ips(IP) when is_tuple(IP) -> ordsets:from_list([IP]);
+ips(Name) when is_list(Name) ->
+    {ok,#hostent{h_addr_list=IPs4}} = inet:gethostbyname(Name,inet),
+    {ok,#hostent{h_addr_list=IPs6}} = inet:gethostbyname(Name,inet6),
+    ordsets:from_list(IPs4++IPs6).
+
+%%--------------------------------------------------------------------
+
 close() ->
-    [{doc, "Simulate that we try to close an already closed connection"}].
+    [{doc, "Client receives close when server closes"}].
 close(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    SystemDir = filename:join(?config(priv_dir, Config), system),
+    UserDir = ?config(priv_dir, Config),
+    
+    {Server, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
+					     {user_dir, UserDir},
+					     {failfun, fun ssh_test_lib:failfun/2}]),
+    Client =
+	ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+					  {user_dir, UserDir},
+					  {user_interaction, false}]),
+    {ok, ChannelId} = ssh_connection:session_channel(Client, infinity),
+    
+    ssh:stop_daemon(Server),
+    receive 
+	{ssh_cm, Client,{closed, ChannelId}} ->  
+	    ok
+    after 5000 ->
+	    ct:fail(timeout)
+    end.
+
+%%--------------------------------------------------------------------
+double_close() ->
+    [{doc, "Simulate that we try to close an already closed connection"}].
+double_close(Config) when is_list(Config) ->
     SystemDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config), 
     UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
@@ -493,11 +618,39 @@ close(Config) when is_list(Config) ->
     
     exit(CM, {shutdown, normal}),
     ok = ssh:close(CM).
-    
+
+%%--------------------------------------------------------------------
+
+openssh_zlib_basic_test() ->
+    [{doc, "Test basic connection with openssh_zlib"}].
+openssh_zlib_basic_test(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},
+					  {compression, openssh_zlib}]),
+    ok = ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
   
+%% Due to timing the error message may or may not be delivered to
+%% the "tcp-application" before the socket closed message is recived
+check_error("Internal error") ->
+    ok;
+check_error("Connection closed") ->
+    ok;
+check_error(Error) ->
+    ct:fail(Error).
+
 basic_test(Config) ->
     ClientOpts = ?config(client_opts, Config),
     ServerOpts = ?config(server_opts, Config),
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 6c781e0e91..f4f0682b40 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -73,6 +73,9 @@ end_per_group(_, Config) ->
 
 %%--------------------------------------------------------------------
 init_per_testcase(_TestCase, Config) ->
+    %% To make sure we start clean as it is not certain that
+    %% end_per_testcase will be run!
+    ssh:stop(),
     ssh:start(),
     Config.
 
@@ -91,7 +94,6 @@ simple_exec(Config) when is_list(Config) ->
     {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">>}} ->
@@ -146,7 +148,6 @@ small_cat(Config) when is_list(Config) ->
 	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
 	    ok
     end.
-
 %%--------------------------------------------------------------------
 big_cat() ->
     [{doc,"Use 'cat' to echo large data block back to us."}].
@@ -204,37 +205,33 @@ 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),
+    Data = <<"I like spaghetti squash">>,
 
     %% 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, _}} ->
+	{ssh_cm, ConnectionRef, {exit_status, ChannelId0, _ExitStatus}} ->
 	    ok
     end,
     receive
 	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
 	    ok
+    end,
+    case ssh_connection:send(ConnectionRef, ChannelId0, Data, 2000) of
+	{error, closed} -> ok;
+	ok ->
+	    ct:fail({expected,{error,closed}, {got, ok}});
+	{error, timeout} ->
+	    ct:fail({expected,{error,closed}, {got, {error, timeout}}});
+	Else ->
+	    ct:fail(Else)
     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."}].
diff --git a/lib/ssh/test/ssh_peername_sockname_server.erl b/lib/ssh/test/ssh_peername_sockname_server.erl
new file mode 100644
index 0000000000..bc505695d3
--- /dev/null
+++ b/lib/ssh/test/ssh_peername_sockname_server.erl
@@ -0,0 +1,54 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%%
+%% The 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_peername_sockname_server).
+
+%% The purpose of this module is to perform tests on the server side of an
+%% ssh connection.
+
+
+-behaviour(ssh_daemon_channel).
+-record(state, {}).
+
+-export([init/1, handle_msg/2, handle_ssh_msg/2, terminate/2]).
+
+init([]) ->
+    {ok, #state{}}.
+
+handle_msg({ssh_channel_up, ChannelId, ConnectionManager}, State) ->
+    [{peer, {_Name, Peer}}] = ssh:connection_info(ConnectionManager, [peer]),
+    [{sockname, Sock}] = ssh:connection_info(ConnectionManager, [sockname]),
+    ssh_connection:send(ConnectionManager, ChannelId,
+			term_to_binary({Peer, Sock})),
+    {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};
+
+handle_ssh_msg({ssh_cm, _CM, _}, State) ->
+    {ok, State}.
+
+terminate(_Reason, _State) ->
+    ok.
diff --git a/lib/ssh/test/ssh_test_cli.erl b/lib/ssh/test/ssh_test_cli.erl
new file mode 100644
index 0000000000..cd9ad5f2ff
--- /dev/null
+++ b/lib/ssh/test/ssh_test_cli.erl
@@ -0,0 +1,81 @@
+-module(ssh_test_cli).
+
+-export([init/1, terminate/2, handle_ssh_msg/2, handle_msg/2]).
+
+-record(state, {
+	  type,
+	  id, 
+	  ref,
+	  port
+	 }).
+
+init([Type]) ->
+    {ok, #state{type = Type}}.
+
+handle_msg({ssh_channel_up, Id, Ref}, S) ->
+    User = get_ssh_user(Ref), 
+    ok = ssh_connection:send(Ref,
+			     Id,
+			     << "\r\nYou are accessing a dummy, type \"q\" to exit\r\n\n" >>),
+    Port = run_portprog(User, S#state.type),
+    {ok, S#state{port = Port, id = Id, ref = Ref}};
+
+handle_msg({Port, {data, Data}}, S = #state{port = Port}) ->
+    ok = ssh_connection:send(S#state.ref, S#state.id, Data),
+    {ok, S};
+handle_msg({Port, {exit_status, Exit}}, S = #state{port = Port}) ->
+    if 
+        S#state.type =:= cli ->
+            ok = ssh_connection:send(S#state.ref, S#state.id, << "\r\n" >>);
+        true ->
+            ok
+    end,
+    ok = ssh_connection:exit_status(S#state.ref, S#state.id, Exit),
+    {stop, S#state.id, S#state{port = undefined}};
+handle_msg({'EXIT', Port, _}, S = #state{port = Port}) ->
+    ok = ssh_connection:exit_status(S#state.ref, S#state.id, 0),
+    {stop, S#state.id, S#state{port = undefined}};
+handle_msg(_Msg, S) ->
+    {ok, S}.
+
+handle_ssh_msg({ssh_cm, Ref, {data, Id, _Type, <<"q">>}}, S) ->
+    ssh_connection:send_eof(Ref, Id),
+    {stop, Id,  S};
+handle_ssh_msg({ssh_cm, _Ref, {data, _Id, _Type, Data}}, S) ->
+    true = port_command(S#state.port, Data),
+    {ok, S};
+handle_ssh_msg({ssh_cm, _, {eof, _}}, S) ->
+    {ok, S};
+handle_ssh_msg({ssh_cm, Ref, {env, Id, WantReply, _Var, _Value}}, S) ->
+    ok = ssh_connection:reply_request(Ref, WantReply, success, Id),
+    {ok, S};
+handle_ssh_msg({ssh_cm, Ref, {pty, Id, WantReply, _Terminal_jox}}, S) ->
+    ok = ssh_connection:reply_request(Ref, WantReply, success, Id),
+    {ok, S};
+handle_ssh_msg({ssh_cm, Ref, {shell, Id, WantReply}}, S) ->
+    ok = ssh_connection:reply_request(Ref, WantReply, success, Id),
+    {ok, S};
+handle_ssh_msg({ssh_cm, _, {signal, _, _}}, S) ->
+    %% Ignore signals according to RFC 4254 section 6.9.
+    {ok, S};
+handle_ssh_msg({ssh_cm, _,
+	{window_change, _Id, _Width, _Height, _Pixw, _PixH}}, S) ->
+    {ok, S};
+handle_ssh_msg({ssh_cm, _, {exit_signal, Id, _, _, _}},
+	       S) ->
+    {stop, Id,  S}.
+
+terminate(_Why, _S) ->
+    nop.
+
+run_portprog(User, cli) ->
+    Pty_bin = os:find_executable("cat"), 
+    open_port({spawn_executable, Pty_bin},
+	      [stream, {cd, "/tmp"}, {env, [{"USER", User}]},
+	       {args, []}, binary,
+	       exit_status, use_stdio, stderr_to_stdout]).
+
+get_ssh_user(Ref) ->
+    [{user, User}] = ssh:connection_info(Ref, [user]),
+    User.
+
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 6ed3dfa68c..00c25bf394 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -63,8 +63,13 @@ daemon(Host, Port, Options) ->
 	    Error
     end.
 
+
+
 start_shell(Port, IOServer, UserDir) ->
-    spawn_link(?MODULE, init_shell, [Port, IOServer, [{user_dir, UserDir}]]).
+    start_shell(Port, IOServer, UserDir, []).
+
+start_shell(Port, IOServer, UserDir, Options) ->
+    spawn_link(?MODULE, init_shell, [Port, IOServer, [{user_dir, UserDir}|Options]]).
 
 start_shell(Port, IOServer) ->
     spawn_link(?MODULE, init_shell, [Port, IOServer, []]).
@@ -91,18 +96,23 @@ loop_io_server(TestCase, Buff0) ->
 	 {input, TestCase, Line} ->
 	     loop_io_server(TestCase, Buff0 ++ [Line]);
 	 {io_request, From, ReplyAs, Request} ->
+%%ct:pal("~p",[{io_request, From, ReplyAs, Request}]),
 	     {ok, Reply, Buff} = io_request(Request, TestCase, From,
 					    ReplyAs, Buff0),
+%%ct:pal("io_request(~p)-->~p",[Request,{ok, Reply, Buff}]),
 	     io_reply(From, ReplyAs, Reply),
 	     loop_io_server(TestCase, Buff);
 	 {'EXIT',_, _} ->
-	     erlang:display('EXIT'),
+	     erlang:display('ssh_test_lib:loop_io_server/2 EXIT'),
 	     ok
      end.
 
 io_request({put_chars, Chars}, TestCase, _, _, Buff) ->
     reply(TestCase, Chars),
     {ok, ok, Buff};
+io_request({put_chars, unicode, Chars}, TestCase, _, _, Buff) when is_binary(Chars) ->
+    reply(TestCase, Chars),
+    {ok, ok, Buff};
 io_request({put_chars, Enc, Chars}, TestCase, _, _, Buff) ->
     reply(TestCase, unicode:characters_to_binary(Chars,Enc,latin1)),
     {ok, ok, Buff};
@@ -120,11 +130,13 @@ io_request({get_line, _Enc,_}, _, _, _, [Line | Buff]) ->
 io_reply(_, _, []) ->
     ok;
 io_reply(From, ReplyAs, Reply) ->
+%%ct:pal("io_reply ~p sending ~p ! ~p",[self(),From, {io_reply, ReplyAs, Reply}]),
     From ! {io_reply, ReplyAs, Reply}.
 
 reply(_, []) ->
     ok;
 reply(TestCase, Result) ->
+%%ct:pal("reply ~p sending ~p ! ~p",[self(), TestCase, Result]),
     TestCase ! Result.
 
 receive_exec_result(Msg) ->
diff --git a/lib/ssh/test/ssh_unicode_SUITE.erl b/lib/ssh/test/ssh_unicode_SUITE.erl
new file mode 100644
index 0000000000..a896a425b9
--- /dev/null
+++ b/lib/ssh/test/ssh_unicode_SUITE.erl
@@ -0,0 +1,590 @@
+%% Next line needed to enable utf8-strings in Erlang:
+%% -*- coding: utf-8 -*-
+
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
+%%
+%% The 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%
+%%
+
+%% gerl +fnu
+%% ct:run_test([{suite,"ssh_unicode_SUITE"}, {logdir,"LOG"}]).
+
+-module(ssh_unicode_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("kernel/include/file.hrl").
+
+% Default timetrap timeout
+-define(default_timeout, ?t:minutes(1)).
+
+-define(USER, "åke高兴").
+-define(PASSWD, "ärlig日本じん").
+-define('sftp.txt',      "sftp瑞点.txt").
+-define('test.txt',      "testハンス.txt").
+-define('link_test.txt', "link_test語.txt").
+
+-define(bindata, unicode:characters_to_binary("foobar å 一二三四いちにさんち") ).
+
+-define(NEWLINE, <<"\r\n">>).
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+%% suite() ->
+%%     [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [{group, sftp},
+     {group, shell}
+    ].
+
+
+init_per_suite(Config) ->
+    case {file:native_name_encoding(), (catch crypto:start())} of
+	{utf8, ok} ->
+	    ssh:start(),
+	    Config;
+	{utf8, _} ->
+	    {skip,"Could not start crypto!"};
+	_ ->
+	    {skip,"Not unicode filename enabled emulator"}
+    end.
+
+end_per_suite(Config) ->
+    ssh:stop(),
+    crypto:stop(),
+    Config.
+
+%%--------------------------------------------------------------------
+groups() -> 
+    [{shell, [], [shell_no_unicode, shell_unicode_string]},
+     {sftp, [], [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_read_bin,
+		 async_write
+		 %% , position, pos_read, pos_write
+		]}].
+     
+init_per_group(Group, Config) when Group==sftp 
+				 ; Group==shell ->
+    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}]}]),
+    [{group,Group}, {sftpd, Sftpd} | Config];
+
+init_per_group(Group, Config) ->
+    [{group,Group} | Config].
+
+
+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 = ct:timetrap(?default_timeout),
+
+    case ?config(group, Config) of 
+	sftp ->
+	    {_Pid, Host, Port} =  ?config(sftpd, Config),
+	    {ok, ChannelPid, Connection}  = 
+		ssh_sftp:start_channel(Host, Port,
+				       [{user, ?USER},
+					{password, ?PASSWD},
+					{user_interaction, false},
+					{silently_accept_hosts, true}]),
+	    Sftp = {ChannelPid, Connection},
+	    [{sftp, Sftp}, {watchdog, Dog} | TmpConfig];
+	shell ->
+	    UserDir = ?config(priv_dir, Config),
+	    process_flag(trap_exit, true),
+	    {_Pid, _Host, Port} =  ?config(sftpd, Config),
+	    ct:sleep(500),
+	    IO = ssh_test_lib:start_io_server(),
+	    Shell = ssh_test_lib:start_shell(Port, IO, UserDir,
+					     [{silently_accept_hosts, true},
+					      {user,?USER},{password,?PASSWD}]),
+%%ct:pal("IO=~p, Shell=~p, self()=~p",[IO,Shell,self()]),
+	    wait_for_erlang_first_line([{io,IO}, {shell,Shell} | Config])
+    end.
+
+
+wait_for_erlang_first_line(Config) ->
+    receive
+	{'EXIT', _, _} ->
+	    {fail,no_ssh_connection};
+	<<"Eshell ",_/binary>> = ErlShellStart ->
+%%	    ct:pal("Erlang shell start: ~p~n", [ErlShellStart]),
+	    Config;
+	Other ->
+	    ct:pal("Unexpected answer from ssh server: ~p",[Other]),
+	    {fail,unexpected_answer}
+    after 10000 ->
+	    ct:pal("No answer from ssh-server"),
+	    {fail,timeout}
+    end.
+
+
+
+end_per_testcase(rename_file, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    NewFileName = filename:join(PrivDir, ?'test.txt'),
+    file:delete(NewFileName),  
+    end_per_testcase(Config);
+end_per_testcase(_TC, Config) ->
+    end_per_testcase(Config).
+
+end_per_testcase(Config) ->
+    catch exit(?config(shell,Config), kill),
+    case  ?config(sftp, Config) of
+	{Sftp, Connection} ->
+	    ssh_sftp:stop_channel(Sftp),
+	    ssh:close(Connection);
+	_ ->
+	    ok
+    end.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+
+-define(chk_expected(Received,Expected),
+	(fun(R_,E_) when R_==E_ -> ok;
+	    (R_,E_) -> ct:pal("Expected: ~p~nReceived: ~p~n", [E_,R_]),
+		       E_ = R_
+	 end)(Received,Expected)).
+
+-define(receive_chk(Ref,Expected),
+	(fun(E__) ->
+		 receive
+		     {async_reply, Ref, Received} when Received==E__ ->
+			 ?chk_expected(Received, E__);
+		     {async_reply, Ref, Received} when Received=/=E__ ->
+			 ct:pal("Expected: ~p~nReceived: ~p~n", [E__,Received]),
+			 E__ = Received;
+		     Msg ->
+			 ct:pal("Expected (Ref=~p): ~p", [Ref,E__]),
+			 ct:fail(Msg)
+		 end
+	 end)(Expected)).
+
+%%--------------------------------------------------------------------
+
+
+open_close_file() ->
+    [{doc, "Test API functions open/3 and close/2"}].
+open_close_file(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'sftp.txt'),
+    {Sftp, _} = ?config(sftp, Config),
+
+    lists:foreach(
+      fun(Mode) ->
+	      ct:log("Mode: ~p",[Mode]),
+	      %% list_dir(PrivDir),
+	      ok = open_close_file(Sftp, FileName, Mode)
+      end,
+      [
+       [read],
+       [write],
+       [write, creat],
+       [write, trunc],
+       [append],
+       [read, binary]
+      ]).
+
+open_close_file(Server, File, Mode) ->
+    {ok, Handle} = ssh_sftp:open(Server, File, Mode),
+    ok = ssh_sftp:close(Server, Handle).
+
+%%--------------------------------------------------------------------
+open_close_dir() ->
+    [{doc, "Test API functions opendir/2 and close/2"}].
+open_close_dir(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    {Sftp, _} = ?config(sftp, Config),
+    FileName = filename:join(PrivDir, ?'sftp.txt'),
+
+    {ok, Handle} = ssh_sftp:opendir(Sftp, PrivDir),
+    ok = ssh_sftp:close(Sftp, Handle),
+    {error, _} =  ssh_sftp:opendir(Sftp, FileName).
+
+%%--------------------------------------------------------------------
+read_file() ->
+    [{doc, "Test API funtion read_file/2"}].
+read_file(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'sftp.txt'),
+    {Sftp, _} = ?config(sftp, Config),
+    ?chk_expected(ssh_sftp:read_file(Sftp,FileName),  file:read_file(FileName)).
+
+%%--------------------------------------------------------------------
+read_dir() ->
+    [{doc,"Test API function list_dir/2"}].
+read_dir(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    {Sftp, _} = ?config(sftp, Config),
+    {ok, Files} = ssh_sftp:list_dir(Sftp, PrivDir),
+    ct:pal("sftp list dir: ~ts~n", [Files]).
+
+%%--------------------------------------------------------------------
+write_file() ->
+    [{doc, "Test API function write_file/2"}].
+write_file(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'sftp.txt'),
+    {Sftp, _} = ?config(sftp, Config),
+    ok = ssh_sftp:write_file(Sftp, FileName, [?bindata]),
+    ?chk_expected(file:read_file(FileName), {ok,?bindata}).
+
+%%--------------------------------------------------------------------
+remove_file() ->
+    [{doc,"Test API function delete/2"}].
+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).
+%%--------------------------------------------------------------------
+rename_file() ->
+    [{doc, "Test API function rename_file/2"}].
+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),
+    ct:pal("FileName: ~ts~nFiles: ~ts~n", [FileName, [[$\n,$ ,F]||F<-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),
+    ct:pal("FileName: ~ts, Files: ~ts~n", [FileName, [[$\n,F]||F<-NewFiles] ]),
+
+    false = lists:member(filename:basename(FileName), NewFiles),
+    true = lists:member(filename:basename(NewFileName), NewFiles).
+
+%%--------------------------------------------------------------------
+mk_rm_dir() ->
+    [{doc,"Test API functions make_dir/2, del_dir/2"}].
+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).
+
+%%--------------------------------------------------------------------
+links() ->
+    [{doc,"Tests API function make_symlink/3"}].
+links(Config) when is_list(Config) ->
+    case os:type() of
+	{win32, _} ->
+	    {skip, "Links are not fully supported by windows"};
+	_ ->
+	    {Sftp, _} = ?config(sftp, Config),
+	    PrivDir =  ?config(priv_dir, Config),
+	    FileName = filename:join(PrivDir, ?'sftp.txt'),
+	    LinkFileName = filename:join(PrivDir, ?'link_test.txt'),
+
+	    ok = ssh_sftp:make_symlink(Sftp, LinkFileName, FileName),
+	    {ok, FileName} = ssh_sftp:read_link(Sftp, LinkFileName)
+    end.
+
+%%--------------------------------------------------------------------
+retrieve_attributes() ->
+    [{doc, "Test API function read_file_info/3"}].
+retrieve_attributes(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'sftp.txt'),
+
+    {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?
+    ct:pal("SFTP: ~p~nFILE: ~p~n", [FileInfo, NewFileInfo]).
+
+%%--------------------------------------------------------------------
+set_attributes() ->
+    [{doc,"Test API function write_file_info/3"}].
+set_attributes(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'test.txt'),
+
+    {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").
+
+%%--------------------------------------------------------------------
+
+async_read() ->
+    [{doc,"Test API aread/3"}].
+async_read(Config) when is_list(Config) ->
+    do_async_read(Config, false).
+
+async_read_bin() ->
+    [{doc,"Test API aread/3"}].
+async_read_bin(Config) when is_list(Config) ->
+    do_async_read(Config, true).
+
+do_async_read(Config, BinaryFlag) ->
+    {Sftp, _} = ?config(sftp, Config),
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'sftp.txt'),
+    {ok,ExpDataBin} = file:read_file(FileName),
+    ExpData = case BinaryFlag of
+		  true -> ExpDataBin;
+		  false -> binary_to_list(ExpDataBin)
+	      end,
+    {ok, Handle} = ssh_sftp:open(Sftp, FileName, [read|case BinaryFlag of
+							   true -> [binary];
+							   false -> []
+						       end]),
+    {async, Ref} = ssh_sftp:aread(Sftp, Handle, 20),
+    ?receive_chk(Ref, {ok,ExpData}).
+
+%%--------------------------------------------------------------------
+async_write() ->
+    [{doc,"Test API awrite/3"}].
+async_write(Config) when is_list(Config) ->
+    {Sftp, _} = ?config(sftp, Config),
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'test.txt'),
+    {ok, Handle} = ssh_sftp:open(Sftp, FileName, [write]),
+    Expected = ?bindata,
+    {async, Ref} = ssh_sftp:awrite(Sftp, Handle, Expected),
+
+    receive
+	{async_reply, Ref, ok} ->
+	    {ok, Data} = file:read_file(FileName),
+	    ?chk_expected(Data, Expected);
+	Msg ->
+	    ct:fail(Msg)
+    end.
+
+%%--------------------------------------------------------------------
+
+position() ->
+    [{doc, "Test API functions position/3"}].
+position(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'test.txt'),
+    {Sftp, _} = ?config(sftp, 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}),
+    {ok, "4"} = ssh_sftp:read(Sftp, Handle, 1),
+
+    {ok, 10} = ssh_sftp:position(Sftp, Handle, eof),
+    eof = ssh_sftp:read(Sftp, Handle, 1),
+
+    {ok, 6} = ssh_sftp:position(Sftp, Handle, {bof, 6}),
+    {ok, "7"} = ssh_sftp:read(Sftp, Handle, 1),
+
+    {ok, 9} = ssh_sftp:position(Sftp, Handle, {cur, 2}),
+    {ok, "0"} = ssh_sftp:read(Sftp, Handle, 1),
+
+    {ok, 0} = ssh_sftp:position(Sftp, Handle, bof),
+    {ok, "1"} = ssh_sftp:read(Sftp, Handle, 1),
+
+    {ok, 1} = ssh_sftp:position(Sftp, Handle, cur),
+    {ok, "2"} = ssh_sftp:read(Sftp, Handle, 1).
+
+%%--------------------------------------------------------------------
+pos_read() ->
+    [{doc,"Test API functions pread/3 and apread/3"}].
+pos_read(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'test.txt'),
+    {Sftp, _} = ?config(sftp, Config),
+    Data = ?bindata,
+    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),
+
+    ?receive_chk(Ref, {ok,binary_part(Data,5,4)}),
+    ?chk_expected(ssh_sftp:pread(Sftp,Handle,{bof,4},4), {ok,binary_part(Data,4,4)}).
+
+
+%%--------------------------------------------------------------------
+pos_write() ->
+    [{doc,"Test API functions pwrite/4 and apwrite/4"}].
+pos_write(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    FileName = filename:join(PrivDir, ?'test.txt'),
+    {Sftp, _} = ?config(sftp, Config),
+
+    {ok, Handle} = ssh_sftp:open(Sftp, FileName, [write]),
+
+    Data = unicode:characters_to_list("再见"),
+    ssh_sftp:write_file(Sftp, FileName, [Data]),
+
+    NewData = unicode:characters_to_list("  さようなら"),
+    {async, Ref} = ssh_sftp:apwrite(Sftp, Handle, {bof, 2}, NewData),
+    ?receive_chk(Ref, ok),
+
+    ok = ssh_sftp:pwrite(Sftp, Handle, eof, unicode:characters_to_list(" adjö ")),
+
+    ?chk_expected(ssh_sftp:read_file(Sftp,FileName), 
+		  {ok,unicode:characters_to_binary("再见  さようなら adjö ")}).
+
+%%--------------------------------------------------------------------
+sftp_nonexistent_subsystem() ->
+    [{doc, "Try to execute sftp subsystem on a server that does not support it"}].
+sftp_nonexistent_subsystem(Config) when is_list(Config) ->
+    {_,Host, Port} =  ?config(sftpd, Config),
+    {error,"server failed to start sftp subsystem"} =
+	ssh_sftp:start_channel(Host, Port,
+			       [{user_interaction, false},
+				{user, ?USER}, 
+				{password, ?PASSWD},
+				{silently_accept_hosts, true}]).
+
+%%--------------------------------------------------------------------
+shell_no_unicode(Config) ->
+    do_shell(?config(io,Config),
+	     [new_prompt,
+ 	      {type,"io:format(\"hej ~p~n\",[42])."},
+	      {expect,"hej 42"}
+	     ]).
+	      
+%%--------------------------------------------------------------------
+shell_unicode_string(Config) ->
+    do_shell(?config(io,Config),
+	     [new_prompt,
+ 	      {type,"io:format(\"こにちわ~ts~n\",[\"四二\"])."},
+	      {expect,"こにちわ四二"},
+	      {expect,"ok"}
+	     ]).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+prep(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    TestFile = filename:join(PrivDir, ?'sftp.txt'),
+    TestFile1 = filename:join(PrivDir, ?'test.txt'),
+    TestLink = filename:join(PrivDir, ?'link_test.txt'),
+
+    file:delete(TestFile),
+    file:delete(TestFile1),
+    file:delete(TestLink),
+
+    %% Initial config
+    DataDir = ?config(data_dir, Config),
+    FileName = filename:join(DataDir, ?'sftp.txt'),
+    {ok,_BytesCopied} = file:copy(FileName, TestFile),
+    Mode = 8#00400 bor 8#00200 bor 8#00040, % read & write owner, read group
+    {ok, FileInfo} = file:read_file_info(TestFile),
+    ok = file:write_file_info(TestFile,
+			      FileInfo#file_info{mode = Mode}).
+
+
+%% list_dir(Dir) ->
+%%     ct:pal("prep/1: ls(~p):~n~p~n~ts",[Dir, file:list_dir(Dir), 
+%% 				       begin
+%% 					   {ok,DL} = file:list_dir(Dir),
+%% 					   [[$\n|FN] || FN <- DL]
+%% 				       end]).
+    
+
+%%--------------------------------------------------------------------
+do_shell(IO, List) -> do_shell(IO, 0, List).
+
+do_shell(IO, N, [new_prompt|More]) ->
+    do_shell(IO, N+1, More);
+
+do_shell(IO, N, Ops=[{Order,Arg}|More]) ->
+    receive
+	X = <<"\r\n">> ->
+%%	    ct:pal("Skip newline ~p",[X]),
+	    do_shell(IO, N, Ops);
+	
+	<<P1,"> ">> when (P1-$0)==N -> 
+	    do_shell_prompt(IO, N, Order, Arg, More);
+
+	<<P1,P2,"> ">> when (P1-$0)*10 + (P2-$0) == N -> 
+	    do_shell_prompt(IO, N, Order, Arg, More);
+
+	Err when element(1,Err)==error ->
+	    ct:fail("do_shell error: ~p~n",[Err]);
+
+	RecBin when Order==expect ; Order==expect_echo ->
+%%	    ct:pal("received ~p",[RecBin]),
+	    RecStr = string:strip(unicode:characters_to_list(RecBin)),
+	    ExpStr = string:strip(Arg),
+	    case lists:prefix(ExpStr, RecStr) of
+		true when Order==expect ->
+		    ct:pal("Matched ~ts",[RecStr]),
+		    do_shell(IO, N, More);
+		true when Order==expect_echo ->
+		    ct:pal("Matched echo ~ts",[RecStr]),
+		    do_shell(IO, N, More);
+		false ->
+		    ct:fail("*** Expected ~p, but got ~p",[string:strip(ExpStr),RecStr])
+	    end
+    after 10000 ->
+	    case Order of
+		expect -> ct:fail("timeout, expected ~p",[string:strip(Arg)]);
+		type ->  ct:fail("timeout, no prompt")
+	    end
+    end;
+
+do_shell(_, _, []) ->
+    ok.
+
+
+do_shell_prompt(IO, N, type, Str, More) ->
+%%    ct:pal("Matched prompt ~p to trigger sending of next line to server",[N]),
+    IO ! {input, self(), Str++"\r\n"},
+    ct:pal("Promt '~p> ', Sent ~ts",[N,Str++"\r\n"]),
+    do_shell(IO, N, [{expect_echo,Str}|More]); % expect echo of the sent line
+do_shell_prompt(IO, N, Op, Str, More) ->
+%%    ct:pal("Matched prompt ~p",[N]),
+    do_shell(IO, N, [{Op,Str}|More]).
+  
+%%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_unicode_SUITE_data/sftp.txt b/lib/ssh/test/ssh_unicode_SUITE_data/sftp.txt
new file mode 100644
index 0000000000..3eaaddca21
--- /dev/null
+++ b/lib/ssh/test/ssh_unicode_SUITE_data/sftp.txt
@@ -0,0 +1 @@
+åäöÅÄÖ瑞語
diff --git a/lib/ssh/test/ssh_unicode_SUITE_data/sftp瑞点.txt b/lib/ssh/test/ssh_unicode_SUITE_data/sftp瑞点.txt
new file mode 100644
index 0000000000..3eaaddca21
--- /dev/null
+++ b/lib/ssh/test/ssh_unicode_SUITE_data/sftp瑞点.txt
@@ -0,0 +1 @@
+åäöÅÄÖ瑞語
diff --git a/lib/ssh/test/ssh_unicode_SUITE_data/ssh_host_dsa_key b/lib/ssh/test/ssh_unicode_SUITE_data/ssh_host_dsa_key
new file mode 100644
index 0000000000..51ab6fbd88
--- /dev/null
+++ b/lib/ssh/test/ssh_unicode_SUITE_data/ssh_host_dsa_key
@@ -0,0 +1,13 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBuwIBAAKBgQCClaHzE2ul0gKSUxah5W0W8UiJLy4hXngKEqpaUq9SSdVdY2LK
+wVfKH1gt5iuaf1FfzOhsIC9G/GLnjYttXZc92cv/Gfe3gR+s0ni2++MX+T++mE/Q
+diltXv/Hp27PybS67SmiFW7I+RWnT2OKlMPtw2oUuKeztCe5UWjaj/y5FQIVAPLA
+l9RpiU30Z87NRAHY3NTRaqtrAoGANMRxw8UfdtNVR0CrQj3AgPaXOGE4d+G4Gp4X
+skvnCHycSVAjtYxebUkzUzt5Q6f/IabuLUdge3gXrc8BetvrcKbp+XZgM0/Vj2CF
+Ymmy3in6kzGZq7Fw1sZaku6AOU8vLa5woBT2vAcHLLT1bLAzj7viL048T6MfjrOP
+ef8nHvACgYBhDWFQJ1mf99sg92LalVq1dHLmVXb3PTJDfCO/Gz5NFmj9EZbAtdah
+/XcF3DeRF+eEoz48wQF/ExVxSMIhLdL+o+ElpVhlM7Yii+T7dPhkQfEul6zZXu+U
+ykSTXYUbtsfTNRFQGBW2/GfnEc0mnIxfn9v10NEWMzlq5z9wT9P0CgIVAN4wtL5W
+Lv62jKcdskxNyz2NQoBx
+-----END DSA PRIVATE KEY-----
+
diff --git a/lib/ssh/test/ssh_unicode_SUITE_data/ssh_host_dsa_key.pub b/lib/ssh/test/ssh_unicode_SUITE_data/ssh_host_dsa_key.pub
new file mode 100644
index 0000000000..4dbb1305b0
--- /dev/null
+++ b/lib/ssh/test/ssh_unicode_SUITE_data/ssh_host_dsa_key.pub
@@ -0,0 +1,11 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1kc3MAAACBAIKVofMTa6XSApJTFqHlbRbxSIkvLiFeeAoSqlpSr1JJ1V1j
+YsrBV8ofWC3mK5p/UV/M6GwgL0b8YueNi21dlz3Zy/8Z97eBH6zSeLb74xf5P76YT9B2
+KW1e/8enbs/JtLrtKaIVbsj5FadPY4qUw+3DahS4p7O0J7lRaNqP/LkVAAAAFQDywJfU
+aYlN9GfOzUQB2NzU0WqrawAAAIA0xHHDxR9201VHQKtCPcCA9pc4YTh34bganheyS+cI
+fJxJUCO1jF5tSTNTO3lDp/8hpu4tR2B7eBetzwF62+twpun5dmAzT9WPYIViabLeKfqT
+MZmrsXDWxlqS7oA5Ty8trnCgFPa8BwcstPVssDOPu+IvTjxPox+Os495/yce8AAAAIBh
+DWFQJ1mf99sg92LalVq1dHLmVXb3PTJDfCO/Gz5NFmj9EZbAtdah/XcF3DeRF+eEoz48
+wQF/ExVxSMIhLdL+o+ElpVhlM7Yii+T7dPhkQfEul6zZXu+UykSTXYUbtsfTNRFQGBW2
+/GfnEc0mnIxfn9v10NEWMzlq5z9wT9P0Cg==
+---- END SSH2 PUBLIC KEY ----
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 231779b75a..9ffc59dbaf 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.7
+SSH_VSN = 3.0.1
 APP_VSN    = "ssh-$(SSH_VSN)"
 
diff --git a/lib/ssl/doc/src/book.xml b/lib/ssl/doc/src/book.xml
index ecfb915b44..317997b22b 100644
--- a/lib/ssl/doc/src/book.xml
+++ b/lib/ssl/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/fascicules.xml b/lib/ssl/doc/src/fascicules.xml
index 7ee764fda3..7a60e8dd1f 100644
--- a/lib/ssl/doc/src/fascicules.xml
+++ b/lib/ssl/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 8875d07535..0b28b1ebd4 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -25,8 +25,165 @@
     <file>notes.xml</file>
   </header>
   <p>This document describes the changes made to the SSL application.</p>
-  
-  <section><title>SSL 5.3</title>
+  <section><title>SSL 5.3.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add missing validation of the server_name_indication
+	    option and test for its explicit use. It was not possible
+	    to set or disable the default server_name_indication as
+	    the validation of the option was missing.</p>
+          <p>
+	    Own Id: OTP-11567</p>
+        </item>
+        <item>
+          <p>
+	    Elliptic curve selection in server mode now properly
+	    selects a curve suggested by the client, if possible, and
+	    the fallback alternative is changed to a more widely
+	    supported curve.</p>
+          <p>
+	    Own Id: OTP-11575</p>
+        </item>
+        <item>
+          <p>
+	    Bug in the TLS hello extension handling caused the server
+	    to behave as it did not understand secure renegotiation.</p>
+          <p>
+	    Own Id: OTP-11595</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 5.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Honors the clients advertised support of elliptic curves
+	    and no longer sends incorrect elliptic curve extension in
+	    server hello.</p>
+          <p>
+	    Own Id: OTP-11370</p>
+        </item>
+        <item>
+          <p>
+	    Fix initialization of DTLS fragment reassembler, in
+	    previously contributed code, for future support of DTLS .
+	    Thanks to Andreas Schultz.</p>
+          <p>
+	    Own Id: OTP-11376</p>
+        </item>
+        <item>
+          <p>
+	    Corrected type error in client_preferred_next_protocols
+	    documentation. Thanks to Julien Barbot.</p>
+          <p>
+	    Own Id: OTP-11457</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    TLS code has been refactored to prepare for future DTLS
+	    support. Also some DTLS code is in place but not yet
+	    runnable, some of it contributed by Andreas Schultz and
+	    some of it written by the OTP team. Thanks to to Andreas
+	    for his participation.</p>
+          <p>
+	    Own Id: OTP-11292</p>
+        </item>
+        <item>
+          <p>
+	    Remove extraneous dev debug code left in the close
+	    function. Thanks to Ken Key.</p>
+          <p>
+	    Own Id: OTP-11447</p>
+        </item>
+        <item>
+          <p>
+	    Add SSL Server Name Indication (SNI) client support.
+	    Thanks to Julien Barbot.</p>
+          <p>
+	    Own Id: OTP-11460</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 5.3.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Setopts during renegotiation caused the renegotiation to
+	    be unsuccessful.</p>
+          <p>
+	    If calling setopts during a renegotiation the FSM state
+	    might change during the handling of the setopts messages,
+	    this is now handled correctly.</p>
+          <p>
+	    Own Id: OTP-11228</p>
+        </item>
+        <item>
+          <p>
+	    Now handles signature_algorithm field in digitally_signed
+	    properly with proper defaults. Prior to this change some
+	    elliptic curve cipher suites could fail reporting the
+	    error "bad certificate".</p>
+          <p>
+	    Own Id: OTP-11229</p>
+        </item>
+        <item>
+          <p>
+	    The code emulating the inet header option was changed in
+	    the belief that it made it inet compatible. However the
+	    testing is a bit hairy as the inet option is actually
+	    broken, now the tests are corrected and the header option
+	    should work in the same broken way as inet again,
+	    preferably use the bitsyntax instead.</p>
+          <p>
+	    Own Id: OTP-11230</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Make the ssl manager name for erlang distribution over
+	    SSL/TLS relative to the module name of the ssl_manager.</p>
+          <p>
+	    This can be beneficial when making tools that rename
+	    modules for internal processing in the tool.</p>
+          <p>
+	    Own Id: OTP-11255</p>
+        </item>
+        <item>
+          <p>
+	    Add documentation regarding log_alert option.</p>
+          <p>
+	    Own Id: OTP-11271</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SSL 5.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -100,7 +257,6 @@
 </section>
 
 <section><title>SSL 5.2.1</title>
-
     <section><title>Improvements and New Features</title>
       <list>
         <item>
@@ -126,9 +282,20 @@
     </section>
 
 </section>
-
+<section><title>SSL 5.1.2.1</title>
+<section><title>Improvements and New Features</title>
+<list>
+  <item>
+    <p>
+      Make log_alert configurable as option in ssl, SSLLogLevel
+    added as option to inets conf file</p>
+    <p>
+    Own Id: OTP-11259</p>
+  </item>
+</list>
+</section>
+</section>
 <section><title>SSL 5.2</title>
-
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
diff --git a/lib/ssl/doc/src/pkix_certs.xml b/lib/ssl/doc/src/pkix_certs.xml
index 1de807cadc..cfbc6b08d7 100644
--- a/lib/ssl/doc/src/pkix_certs.xml
+++ b/lib/ssl/doc/src/pkix_certs.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/refman.xml b/lib/ssl/doc/src/refman.xml
index 011819e82b..ae11198edb 100644
--- a/lib/ssl/doc/src/refman.xml
+++ b/lib/ssl/doc/src/refman.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2011</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/release_notes.xml b/lib/ssl/doc/src/release_notes.xml
index e7c766bb91..123e8e1451 100644
--- a/lib/ssl/doc/src/release_notes.xml
+++ b/lib/ssl/doc/src/release_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1999</year><year>2009</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 1645eb15f3..910dca3889 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -52,6 +52,8 @@
       <item>CRL and policy certificate extensions are not supported
       yet. However CRL verification is supported by public_key, only not integrated
       in ssl yet. </item>
+      <item>Support for 'Server Name Indication' extension client side
+      (RFC 6066 section 3).</item>
     </list>
  
   </section>
@@ -74,7 +76,7 @@
       <seealso marker="kernel:gen_tcp">gen_tcp(3)</seealso>.
     </p>
     
-    <p> <c>ssloption() = {verify, verify_type()} |
+    <p><marker id="type-ssloption"></marker><c>ssloption() = {verify, verify_type()} |
       {verify_fun, {fun(), term()}} |
       {fail_if_no_peer_cert, boolean()}
       {depth, integer()} |
@@ -86,7 +88,8 @@
       {user_lookup_fun, {fun(), term()}}, {psk_identity, string()}, {srp_identity, {string(), string()}} |
       {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()}
       {next_protocols_advertised, [binary()]} |
-      {client_preferred_next_protocols, client | server, [binary()]}
+      {client_preferred_next_protocols, {client | server, [binary()]} | {client | server, [binary()], binary()}} |
+      {log_alert, boolean()} | {server_name_indication, hostname() | disable}
     </c></p>
 
     <p><c>transportoption() = {cb_info, {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom(), ErrTag:atom()}}
@@ -352,8 +355,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
       when possible.
       </item>
 
-      <tag>{client_preferred_next_protocols, Precedence :: server | client, ClientPrefs :: [binary()]}</tag>
-      <tag>{client_preferred_next_protocols, Precedence :: server | client, ClientPrefs :: [binary()], Default :: binary()}</tag>
+      <tag>{client_preferred_next_protocols, {Precedence :: server | client, ClientPrefs :: [binary()]}}</tag>
+      <tag>{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>
@@ -381,6 +384,15 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <tag>{srp_identity, {Username :: string(), Password :: string()}</tag>
       <item>Specifies the Username and Password to use to authenticate to the server.
       </item>
+      <tag>{server_name_indication, hostname()}</tag>
+      <tag>{server_name_indication, disable}</tag>
+      <item>
+        <p>This option can be specified when upgrading a TCP socket to a TLS
+        socket to use the TLS Server Name Indication extension.</p>
+        <p>When starting a TLS connection without upgrade the Server Name
+        Indication extension will be sent if possible, this option may also be
+        used to disable that behavior.</p>
+      </item>
     </taglist>
    </section>
 
@@ -446,7 +458,12 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <tag>{psk_identity, string()}</tag>
       <item>Specifies the server identity hint the server presents to the client.
       </item>
-
+      <tag>{log_alert, boolean()}</tag>
+      <item>If false, error reports will not be displayed.</item>
+      <tag>{honor_cipher_order, boolean()}</tag>
+      <item>If true, use the server's preference for cipher selection. If false
+      (the default), use the client's preference.
+      </item>
     </taglist>
   </section>
   
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 0ee5b23e47..43cb3934f7 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
diff --git a/lib/ssl/doc/src/ssl_distribution.xml b/lib/ssl/doc/src/ssl_distribution.xml
index 4ae4ead3ee..4b4d042f70 100644
--- a/lib/ssl/doc/src/ssl_distribution.xml
+++ b/lib/ssl/doc/src/ssl_distribution.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/ssl_protocol.xml b/lib/ssl/doc/src/ssl_protocol.xml
index f540dc999b..cdfafe224b 100644
--- a/lib/ssl/doc/src/ssl_protocol.xml
+++ b/lib/ssl/doc/src/ssl_protocol.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2012</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/ssl_session_cache_api.xml b/lib/ssl/doc/src/ssl_session_cache_api.xml
index e0b07961fb..82de1784ca 100644
--- a/lib/ssl/doc/src/ssl_session_cache_api.xml
+++ b/lib/ssl/doc/src/ssl_session_cache_api.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/usersguide.xml b/lib/ssl/doc/src/usersguide.xml
index 6528c00a0b..b1c7190085 100644
--- a/lib/ssl/doc/src/usersguide.xml
+++ b/lib/ssl/doc/src/usersguide.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml
index ab837a156a..cce388d02a 100644
--- a/lib/ssl/doc/src/using_ssl.xml
+++ b/lib/ssl/doc/src/using_ssl.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index cf9f7d5001..131b615277 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -55,23 +55,30 @@ MODULES= \
 	ssl_srp_primes \
 	tls_connection \
 	dtls_connection \
-	ssl_connection_sup \
+	ssl_config \
+	ssl_connection \
+	tls_connection_sup \
+	dtls_connection_sup \
 	tls_handshake \
 	dtls_handshake\
+	ssl_handshake\
 	ssl_manager \
 	ssl_session \
 	ssl_session_cache \
 	ssl_socket \
 	tls_record \
 	dtls_record \
-	ssl_ssl2 \
-	ssl_ssl3 \
-	ssl_tls1 \
+	ssl_record \
+	ssl_v2 \
+	ssl_v3 \
+	tls_v1 \
+	dtls_v1 \
 	ssl_tls_dist_proxy
 
 INTERNAL_HRL_FILES = \
-	ssl_alert.hrl ssl_cipher.hrl ssl_handshake.hrl tls_handshake.hrl \
-	dtls_handshake.hrl ssl_internal.hrl \
+	ssl_alert.hrl ssl_cipher.hrl \
+	tls_connection.hrl dtls_connection.hrl ssl_connection.hrl \
+        ssl_handshake.hrl tls_handshake.hrl dtls_handshake.hrl ssl_api.hrl ssl_internal.hrl \
         ssl_record.hrl tls_record.hrl dtls_record.hrl ssl_srp.hrl
 
 ERL_FILES= \
@@ -145,9 +152,10 @@ $(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)/tls_connection.$(EMULATOR): ssl_internal.hrl tls_record.hrl ssl_cipher.hrl tls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
-$(EBIN)/dtls_connection.$(EMULATOR): ssl_internal.hrl dtls_record.hrl ssl_cipher.hrl dtls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/tls_connection.$(EMULATOR): ssl_internal.hrl tls_connection.hrl tls_record.hrl ssl_cipher.hrl tls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/dtls_connection.$(EMULATOR): ssl_internal.hrl dtls_connection.hrl dtls_record.hrl ssl_cipher.hrl dtls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
 $(EBIN)/tls_handshake.$(EMULATOR): ssl_internal.hrl tls_record.hrl ssl_cipher.hrl tls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl
+$(EBIN)/tls_handshake.$(EMULATOR): ssl_internal.hrl ssl_connection.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
diff --git a/lib/ssl/src/dtls.erl b/lib/ssl/src/dtls.erl
index 013286c9bd..780bddeb10 100644
--- a/lib/ssl/src/dtls.erl
+++ b/lib/ssl/src/dtls.erl
@@ -19,7 +19,94 @@
 
 %%
 
-%%% Purpose : API for DTLS.
+%%% Purpose : Reflect DTLS specific API options (fairly simple wrapper at the moment)
+%% First implementation will support DTLS connections only in a "TLS/TCP like way"
 
 -module(dtls).
 
+-include("ssl_api.hrl").
+-include("ssl_internal.hrl").
+
+-export([connect/2, connect/3, listen/2, accept/1, accept/2,
+	 handshake/1, handshake/2, handshake/3]).
+
+%%--------------------------------------------------------------------
+%%
+%% Description: Connect to a DTLS server.
+%%--------------------------------------------------------------------
+
+-spec connect(host() | port(), [connect_option()]) -> {ok, #sslsocket{}} |
+					      {error, reason()}.
+
+connect(Socket, Options) when is_port(Socket) ->
+    connect(Socket, Options, infinity).
+
+-spec connect(host() | port(), [connect_option()] | inet:port_number(),
+	      timeout() | list()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
+
+connect(Socket, SslOptions, Timeout)  when is_port(Socket) ->
+    DTLSOpts = [{protocol, dtls} | SslOptions],
+    ssl:connect(Socket, DTLSOpts, Timeout);
+connect(Host, Port, Options) ->
+    connect(Host, Port, Options, infinity).
+
+-spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
+
+connect(Host, Port, Options, Timeout) ->
+    DTLSOpts = [{protocol, dtls} | Options],
+    ssl:connect(Host, Port, DTLSOpts, Timeout).
+
+%%--------------------------------------------------------------------
+-spec listen(inet:port_number(), [listen_option()]) ->{ok, #sslsocket{}} | {error, reason()}.
+
+%%
+%% Description: Creates an ssl listen socket.
+%%--------------------------------------------------------------------
+listen(Port, Options) ->
+    DTLSOpts = [{protocol, dtls} | Options],
+    ssl:listen(Port, DTLSOpts).
+
+%%--------------------------------------------------------------------
+%%
+%% Description: Performs transport accept on an ssl listen socket
+%%--------------------------------------------------------------------
+-spec accept(#sslsocket{}) -> {ok, #sslsocket{}} |
+					{error, reason()}.
+accept(ListenSocket) ->
+    accept(ListenSocket, infinity).
+
+-spec accept(#sslsocket{}, timeout()) -> {ok, #sslsocket{}} |
+						   {error, reason()}.
+accept(Socket, Timeout) ->
+    ssl:transport_accept(Socket, Timeout).
+
+%%--------------------------------------------------------------------
+%%
+%% Description: Performs accept on an ssl listen socket. e.i. performs
+%%              ssl handshake.
+%%--------------------------------------------------------------------
+
+-spec handshake(#sslsocket{}) -> ok | {error, reason()}.
+
+handshake(ListenSocket) ->
+    handshake(ListenSocket, infinity).
+
+
+-spec handshake(#sslsocket{} | port(), timeout()| [ssl_option()
+						    | transport_option()]) ->
+			ok | {ok, #sslsocket{}} | {error, reason()}.
+
+handshake(#sslsocket{} = Socket, Timeout) ->
+    ssl:ssl_accept(Socket, Timeout);
+
+handshake(ListenSocket, SslOptions)  when is_port(ListenSocket) ->
+    handshake(ListenSocket, SslOptions, infinity).
+
+
+-spec handshake(port(), [ssl_option()| transport_option()], timeout()) ->
+			{ok, #sslsocket{}} | {error, reason()}.
+
+handshake(Socket, SslOptions, Timeout) when is_port(Socket) ->
+    ssl:ssl_accept(Socket, SslOptions, Timeout).
diff --git a/lib/ssl/src/dtls_connection.erl b/lib/ssl/src/dtls_connection.erl
index ac2ee0d09f..da2e076856 100644
--- a/lib/ssl/src/dtls_connection.erl
+++ b/lib/ssl/src/dtls_connection.erl
@@ -17,3 +17,225 @@
 %% %CopyrightEnd%
 %%
 -module(dtls_connection).
+
+%% Internal application API
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+
+
+
+%% %%====================================================================
+%% %% State functions
+%% %%====================================================================
+
+%% -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,
+%% 			      session_cache = Cache, session_cache_cb = CacheCb,
+%% 			      connection_states = ConnectionStates0,
+%% 			      renegotiation = {Renegotiation, _},
+%% 			      client_cookie = Cookie} = State0) ->
+%%     Hello = dtls_handshake:client_hello(Host, Port, Cookie, ConnectionStates0, SslOpts,
+%% 				       Cache, CacheCb, Renegotiation, Cert),
+
+%%     Version = Hello#client_hello.client_version,
+%%     State1 = State0#state{negotiated_version = Version, %% Requested version
+%% 			  session =
+%% 			      Session0#session{session_id = Hello#client_hello.session_id},
+%% 			  dtls_handshake_history = ssl_handshake:init_handshake_history()},
+
+%%     State2 = send_flight(Hello, waiting, State1),
+
+%%     {Record, State} = next_record(State2),
+%%     next_state(hello, hello, Record, State);
+
+%% hello(start, #state{role = server} = State0) ->
+%%     {Record, State} = next_record(State0),
+%%     next_state(hello, hello, Record, State);
+
+%% hello(#hello_request{}, #state{role = client} = State0) ->
+%%     {Record, State} = next_record(State0),
+%%     next_state(hello, hello, Record, State);
+
+%% hello(#server_hello{cipher_suite = CipherSuite,
+%% 		    compression_method = Compression} = Hello,
+%%       #state{session = #session{session_id = OldId},
+%% 	     connection_states = ConnectionStates0,
+%% 	     role = client,
+%% 	     negotiated_version = ReqVersion,
+%% 	     renegotiation = {Renegotiation, _},
+%% 	     ssl_options = SslOptions} = State1) ->
+%%     State0 = flight_done(State1),
+%%     case ssl_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
+%% 	#alert{} = Alert ->
+%% 	    handle_own_alert(Alert, ReqVersion, hello, 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,
+%% 				 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#state{connection_states = ConnectionStates});
+%% 		false ->
+%% 		    handle_resumed_session(NewId, State#state{connection_states = ConnectionStates})
+%% 	    end
+%%     end;
+
+%% hello(#hello_verify_request{cookie = Cookie},
+%%       #state{host = Host, port = Port,
+%% 	     session = #session{own_certificate = Cert},
+%% 	     session_cache = Cache, session_cache_cb = CacheCb,
+%% 	     ssl_options = SslOpts,
+%% 	     connection_states = ConnectionStates0,
+%% 	     renegotiation = {Renegotiation, _}} = State0) ->
+%%     Hello = ssl_handshake:client_hello(Host, Port, Cookie, ConnectionStates0, SslOpts,
+%% 				       Cache, CacheCb, Renegotiation, Cert),
+%%     State1 = State0#state{
+%% 	       tls_handshake_history = ssl_handshake:init_handshake_history(),
+%% 	       client_cookie = Cookie},
+%%     State2 = send_flight(Hello, waiting, State1),
+
+%%     {Record, State} = next_record(State2),
+%%     next_state(hello, hello, Record, State);
+
+
+%% %%--------------------------------------------------------------------
+%% -spec abbreviated(#hello_request{} | #finished{} | term(),
+%% 		  #state{}) -> gen_fsm_state_return().
+%% %%--------------------------------------------------------------------
+
+%% abbreviated(timeout, State) ->
+%%     { next_state, abbreviated, State, hibernate };
+
+%% abbreviated(Msg, State) ->
+%%     handle_unexpected_message(Msg, abbreviated, State).
+
+%% %%--------------------------------------------------------------------
+%% -spec certify(#hello_request{} | #certificate{} |  #server_key_exchange{} |
+%% 	      #certificate_request{} | #server_hello_done{} | #client_key_exchange{} | term(),
+%% 	      #state{}) -> gen_fsm_state_return().
+%% %%--------------------------------------------------------------------
+
+
+%% certify(timeout, State) ->
+%%     { next_state, certify, State, hibernate };
+
+%% certify(Msg, State) ->
+%%     handle_unexpected_message(Msg, certify, State).
+
+
+%% %%--------------------------------------------------------------------
+%% -spec cipher(#hello_request{} | #certificate_verify{} | #finished{} | term(),
+%% 	     #state{}) -> gen_fsm_state_return().
+%% %%--------------------------------------------------------------------
+
+%% cipher(timeout, State) ->
+%%     { next_state, cipher, State, hibernate };
+
+%% cipher(Msg, State) ->
+%%     handle_unexpected_message(Msg, cipher, State).
+
+%% %%--------------------------------------------------------------------
+%% -spec connection(#hello_request{} | #client_hello{} | term(),
+%% 		 #state{}) -> gen_fsm_state_return().
+%% %%--------------------------------------------------------------------
+
+%% connection(timeout, State) ->
+%%     {next_state, connection, State, hibernate};
+
+%% connection(Msg, State) ->
+%%     handle_unexpected_message(Msg, connection, State).
+
+%% %%--------------------------------------------------------------------
+%% %%% Internal functions
+%% %%--------------------------------------------------------------------
+%% handle_unexpected_message(Msg, Info, #state{negotiated_version = Version} = State) ->
+%%     Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE),
+%%     handle_own_alert(Alert, Version, {Info, Msg}, State).
+
+%% send_flight(HandshakeRec, FlightState, State) ->
+%%     send_flight(FlightState, buffer_flight(HandshakeRec, State)).
+
+%% send_flight(FlightState, State = #state{negotiated_version = Version,
+%% 					flight_buffer = Buffer}) ->
+
+%%     State1 = do_send_flight(queue:to_list(Buffer), [], State),
+%%     finish_send_flight(Version, FlightState, State1).
+
+%% resend_flight(State = #state{negotiated_version = Version,
+%% 			     flight_state = FlightState,
+%% 			     flight_buffer = Buffer})
+%%   when FlightState == finished; FlightState == waiting ->
+%%     State1 = do_send_flight(queue:to_list(Buffer), [], State),
+%%     finish_send_flight(Version, FlightState, State1);
+
+%% resend_flight(State) ->
+%%     State.
+
+%% flight_done(State) ->
+%%     cancel_dtls_retransmit_timer(State#state{flight_state = done,
+%% 					     flight_buffer = undefined}).
+
+%% do_send_flight([], BinMsgs, State = #state{transport_cb = Transport, socket = Socket}) ->
+%%     Transport:send(Socket, lists:reverse(BinMsgs)),
+%%     State;
+%% do_send_flight([{Epoch, MsgSeq, HandshakeRec}|T], BinMsgs0,
+%% 	       State = #state{negotiated_version = Version,
+%% 			      connection_states = ConnectionStates0}) ->
+%%     CS0 = ssl_record:connection_state_by_epoch(ConnectionStates0, Epoch, write),
+%%     {BinMsgs, CS1} = encode_handshake_rec(HandshakeRec, Version, MsgSeq, BinMsgs0, CS0),
+%%     ConnectionStates1 = ssl_record:set_connection_state_by_epoch(ConnectionStates0, CS1, write),
+%%     do_send_flight(T, BinMsgs, State#state{connection_states = ConnectionStates1}).
+
+%% cancel_dtls_retransmit_timer(State = #state{dtls_retransmit_timer = TimerRef}) ->
+%%     cancel_timer(TimerRef),
+%%     State#state{dtls_retransmit_timer = undefined}.
+
+%% rearm_dtls_retransmit_timer(State = #state{dtls_retransmit_timer = undefined}) ->
+%%     TimerRef = erlang:start_timer(1000, self(), dtls_retransmit),
+%%     State#state{dtls_retransmit_timer = TimerRef};
+%% rearm_dtls_retransmit_timer(State) ->
+%%     State.
+
+%% finish_send_flight({254, _}, waiting, State) ->
+%%     TimerRef = erlang:start_timer(1000, self(), dtls_retransmit),
+%%     State#state{
+%%       dtls_retransmit_timer = TimerRef,
+%%       last_retransmit = timestamp(),
+%%       flight_state = waiting};
+
+%% finish_send_flight(_, FlightState, State) ->
+%%     State#state{flight_state = FlightState}.
+
+%% timestamp() ->
+%%     {Mega, Sec, Micro} = erlang:now(),
+%%     Mega * 1000000 * 1000 + Sec * 1000 + (Micro div 1000).
+
+%% encode_handshake_rec(HandshakeRec, Version, MsgSeq, BinMsgs0, CS0) ->
+%%     {_, Fragments} = ssl_handshake:encode_handshake(HandshakeRec, Version, MsgSeq, 1400),
+%%     lists:foldl(fun(F, {Bin, C0}) ->
+%% 			{B, C1} = ssl_record:encode_handshake(F, Version, C0),
+%% 		{[B|Bin], C1} end, {BinMsgs0, CS0}, Fragments).
diff --git a/lib/ssl/src/dtls_connection.hrl b/lib/ssl/src/dtls_connection.hrl
new file mode 100644
index 0000000000..b8dff479d5
--- /dev/null
+++ b/lib/ssl/src/dtls_connection.hrl
@@ -0,0 +1,51 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The 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: SSL/TLS specific state
+%%----------------------------------------------------------------------
+
+-ifndef(dtls_connection).
+-define(dtls_connection, true).
+
+-include("ssl_connection.hrl").
+
+-record(protocol_buffers, {
+	  dtls_packets = []      ::[binary()],  % Not yet handled decode ssl/tls packets.
+          dtls_record_buffer     :: binary(),   % Buffer of incomplete records
+          dtls_handshake_buffer  :: binary(),   % Buffer of incomplete handshakes
+	  dtls_cipher_texts      :: [binary()],
+	  dtls_cipher_texts_next :: [binary()]  % Received for Epoch not yet active
+	 }).
+
+-record(flight, {
+	  last_retransmit,
+	  last_read_seq,
+	  msl_timer,
+	  flight_state,
+	  flight_buffer,        % buffer of not yet ACKed TLS records
+	 }).
+
+-record(message_sequences, {
+	  read = 0,
+	  write = 0
+	 }).
+
+-endif. % -ifdef(dtls_connection).
diff --git a/lib/ssl/src/dtls_connection_sup.erl b/lib/ssl/src/dtls_connection_sup.erl
new file mode 100644
index 0000000000..9fe545be18
--- /dev/null
+++ b/lib/ssl/src/dtls_connection_sup.erl
@@ -0,0 +1,60 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% 
+%% The 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: Supervisor of DTLS connection.
+%%----------------------------------------------------------------------
+-module(dtls_connection_sup).
+
+-behaviour(supervisor).
+
+%% API
+-export([start_link/0]).
+-export([start_child/1]).
+
+%% Supervisor callback
+-export([init/1]).
+
+%%%=========================================================================
+%%%  API
+%%%=========================================================================
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+
+start_child(Args) ->
+    supervisor:start_child(?MODULE, Args).
+    
+%%%=========================================================================
+%%%  Supervisor callback
+%%%=========================================================================
+init(_O) ->
+    RestartStrategy = simple_one_for_one,
+    MaxR = 0,
+    MaxT = 3600,
+   
+    Name = undefined, % As simple_one_for_one is used.
+    StartFunc = {dtls_connection, start_link, []},
+    Restart = temporary, % E.g. should not be restarted
+    Shutdown = 4000,
+    Modules = [dtls_connection],
+    Type = worker,
+    
+    ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules},
+    {ok, {{RestartStrategy, MaxR, MaxT}, [ChildSpec]}}.
diff --git a/lib/ssl/src/dtls_handshake.erl b/lib/ssl/src/dtls_handshake.erl
index b25daa59d9..5db2434753 100644
--- a/lib/ssl/src/dtls_handshake.erl
+++ b/lib/ssl/src/dtls_handshake.erl
@@ -16,3 +16,425 @@
 %%
 %% %CopyrightEnd%
 -module(dtls_handshake).
+
+-include("dtls_handshake.hrl").
+-include("dtls_record.hrl").
+-include("ssl_internal.hrl").
+
+-export([client_hello/8, client_hello/9, hello/3,
+	 get_dtls_handshake/2,
+	 dtls_handshake_new_flight/1, dtls_handshake_new_epoch/1,
+	 encode_handshake/4]).
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+%%--------------------------------------------------------------------
+-spec client_hello(host(), inet:port_number(), #connection_states{},
+		   #ssl_options{}, integer(), atom(), boolean(), der_cert()) ->
+			  #client_hello{}.
+%%
+%% Description: Creates a client hello message.
+%%--------------------------------------------------------------------
+client_hello(Host, Port, ConnectionStates, SslOpts,
+	     Cache, CacheCb, Renegotiation, OwnCert) ->
+    %% First client hello (two sent in DTLS ) uses empty Cookie
+    client_hello(Host, Port, <<>>, ConnectionStates, SslOpts,
+		 Cache, CacheCb, Renegotiation, OwnCert).
+
+%%--------------------------------------------------------------------
+-spec client_hello(host(), inet:port_number(), term(), #connection_states{},
+		   #ssl_options{}, integer(), atom(), boolean(), der_cert()) ->
+			  #client_hello{}.
+%%
+%% Description: Creates a client hello message.
+%%--------------------------------------------------------------------
+client_hello(Host, Port, Cookie, ConnectionStates,
+	     #ssl_options{versions = Versions,
+			  ciphers = UserSuites
+			 } = SslOpts,
+	     Cache, CacheCb, Renegotiation, OwnCert) ->
+    Version = dtls_record:highest_protocol_version(Versions),
+    Pending = ssl_record:pending_connection_state(ConnectionStates, read),
+    SecParams = Pending#connection_state.security_parameters,
+    CipherSuites = ssl_handshake:available_suites(UserSuites, Version),
+
+    Extensions = ssl_handshake:client_hello_extensions(Host, Version, CipherSuites,
+						SslOpts, ConnectionStates, Renegotiation),
+
+    Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),
+
+    #client_hello{session_id = Id,
+		  client_version = Version,
+		  cipher_suites = ssl_handshake:cipher_suites(CipherSuites, Renegotiation),
+		  compression_methods = ssl_record:compressions(),
+		  random = SecParams#security_parameters.client_random,
+		  cookie = Cookie,
+		  extensions = Extensions
+		 }.
+
+hello(Address, Port,
+      #ssl_tls{epoch = _Epoch, record_seq = _Seq,
+	       version = Version} = Record) ->
+    {[{Hello, _}], _, _} =
+	get_dtls_handshake(Record,
+			   dtls_handshake_new_flight(undefined)),
+    #client_hello{client_version = {Major, Minor},
+		  random = Random,
+		  session_id = SessionId,
+		  cipher_suites = CipherSuites,
+		  compression_methods = CompressionMethods} = Hello,
+    CookieData = [address_to_bin(Address, Port),
+		  <<?BYTE(Major), ?BYTE(Minor)>>,
+		  Random, SessionId, CipherSuites, CompressionMethods],
+    Cookie = crypto:hmac(sha, <<"secret">>, CookieData),
+
+    case Hello of
+	#client_hello{cookie = Cookie} ->
+	    accept;
+	_ ->
+	    %% generate HelloVerifyRequest
+	    HelloVerifyRequest = encode_handshake(#hello_verify_request{protocol_version = Version,
+									  cookie = Cookie},
+						    Version, 0, 1400),
+	    {reply, HelloVerifyRequest}
+    end.
+
+%%--------------------------------------------------------------------
+encode_handshake(Package, Version, MsgSeq, Mss) ->
+    {MsgType, Bin} = enc_hs(Package, Version),
+    Len = byte_size(Bin),
+    HsHistory = [MsgType, ?uint24(Len), ?uint16(MsgSeq), ?uint24(0), ?uint24(Len), Bin],
+    BinMsg = dtls_split_handshake(Mss, MsgType, Len, MsgSeq, Bin, 0, []),
+    {HsHistory, BinMsg}.
+
+%--------------------------------------------------------------------
+-spec get_dtls_handshake(#ssl_tls{}, #dtls_hs_state{} | binary()) ->
+     {[dtls_handshake()], #dtls_hs_state{}} | {retransmit, #dtls_hs_state{}}.
+%
+% Description: Given a DTLS state and new data from ssl_record, collects
+% and returns it as a list of handshake messages, also returns a new
+% DTLS state
+%--------------------------------------------------------------------
+% get_dtls_handshake(Record, <<>>) ->
+%     get_dtls_handshake_aux(Record, dtls_hs_state_init());
+get_dtls_handshake(Record, HsState) ->
+    get_dtls_handshake_aux(Record, HsState).
+
+%--------------------------------------------------------------------
+-spec dtls_handshake_new_epoch(#dtls_hs_state{}) -> #dtls_hs_state{}.
+%
+% Description: Reset the DTLS decoder state for a new Epoch
+%--------------------------------------------------------------------
+% dtls_handshake_new_epoch(<<>>) ->
+%     dtls_hs_state_init();
+dtls_handshake_new_epoch(HsState) ->
+    HsState#dtls_hs_state{highest_record_seq = 0,
+			  starting_read_seq = HsState#dtls_hs_state.current_read_seq,
+			  fragments = gb_trees:empty(), completed = []}.
+
+%--------------------------------------------------------------------
+-spec dtls_handshake_new_flight(integer() | undefined) -> #dtls_hs_state{}.
+%
+% Description: Init the DTLS decoder state for a new Flight
+dtls_handshake_new_flight(ExpectedReadReq) ->
+    #dtls_hs_state{current_read_seq = ExpectedReadReq,
+		   highest_record_seq = 0,
+		   starting_read_seq = 0,
+		   fragments = gb_trees:empty(), completed = []}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+
+dtls_split_handshake(Mss, MsgType, Len, MsgSeq, Bin, Offset, Acc)
+  when byte_size(Bin) + 12 < Mss ->
+    FragmentLen = byte_size(Bin),
+    BinMsg = [MsgType, ?uint24(Len), ?uint16(MsgSeq), ?uint24(Offset), ?uint24(FragmentLen), Bin],
+    lists:reverse([BinMsg|Acc]);
+dtls_split_handshake(Mss, MsgType, Len, MsgSeq, Bin, Offset, Acc) ->
+    FragmentLen = Mss - 12,
+    <<Fragment:FragmentLen/bytes, Rest/binary>> = Bin,
+    BinMsg = [MsgType, ?uint24(Len), ?uint16(MsgSeq), ?uint24(Offset), ?uint24(FragmentLen), Fragment],
+    dtls_split_handshake(Mss, MsgType, Len, MsgSeq, Rest, Offset + FragmentLen, [BinMsg|Acc]).
+
+get_dtls_handshake_aux(#ssl_tls{version = Version,
+				record_seq = SeqNo,
+				fragment = Data}, HsState) ->
+    get_dtls_handshake_aux(Version, SeqNo, Data, HsState).
+
+get_dtls_handshake_aux(Version, SeqNo,
+		       <<?BYTE(Type), ?UINT24(Length),
+			 ?UINT16(MessageSeq),
+			 ?UINT24(FragmentOffset), ?UINT24(FragmentLength),
+			 Body:FragmentLength/binary, Rest/binary>>,
+		       HsState0) ->
+    case reassemble_dtls_fragment(SeqNo, Type, Length, MessageSeq,
+				 FragmentOffset, FragmentLength,
+				 Body, HsState0) of
+	{retransmit, HsState1} ->
+	    case Rest of
+		<<>> ->
+		    {retransmit, HsState1};
+		_ ->
+		    get_dtls_handshake_aux(Version, SeqNo, Rest, HsState1)
+	    end;
+	{HsState1, HighestSeqNo, MsgBody} ->
+	    HsState2 = dec_dtls_fragment(Version, HighestSeqNo, Type, Length, MessageSeq, MsgBody, HsState1),
+	    HsState3 = process_dtls_fragments(Version, HsState2),
+	    get_dtls_handshake_aux(Version, SeqNo, Rest, HsState3);
+	HsState2 ->
+	    HsState3 = process_dtls_fragments(Version, HsState2),
+	    get_dtls_handshake_aux(Version, SeqNo, Rest, HsState3)
+    end;
+
+get_dtls_handshake_aux(_Version, _SeqNo, <<>>, HsState) ->
+    {lists:reverse(HsState#dtls_hs_state.completed),
+     HsState#dtls_hs_state{completed = []}}.
+
+dec_dtls_fragment(Version, SeqNo, Type, Length, MessageSeq, MsgBody,
+		  HsState = #dtls_hs_state{highest_record_seq = HighestSeqNo, completed = Acc}) ->
+    Raw = <<?BYTE(Type), ?UINT24(Length), ?UINT16(MessageSeq), ?UINT24(0), ?UINT24(Length), MsgBody/binary>>,
+    H = decode_handshake(Version, Type, MsgBody),
+    HsState#dtls_hs_state{completed = [{H,Raw}|Acc], highest_record_seq = erlang:max(HighestSeqNo, SeqNo)}.
+
+process_dtls_fragments(Version,
+		       HsState0 = #dtls_hs_state{current_read_seq = CurrentReadSeq,
+						 fragments = Fragments0}) ->
+    case gb_trees:is_empty(Fragments0) of
+	true ->
+	    HsState0;
+	_ ->
+	    case gb_trees:smallest(Fragments0) of
+		{CurrentReadSeq, {SeqNo, Type, Length, CurrentReadSeq, {Length, [{0, Length}], MsgBody}}} ->
+		    HsState1 = dtls_hs_state_process_seq(HsState0),
+		    HsState2 = dec_dtls_fragment(Version, SeqNo, Type, Length, CurrentReadSeq, MsgBody, HsState1),
+		    process_dtls_fragments(Version, HsState2);
+		_ ->
+		    HsState0
+	    end
+    end.
+
+dtls_hs_state_process_seq(HsState0 = #dtls_hs_state{current_read_seq = CurrentReadSeq,
+						    fragments = Fragments0}) ->
+    Fragments1 = gb_trees:delete_any(CurrentReadSeq, Fragments0),
+    HsState0#dtls_hs_state{current_read_seq = CurrentReadSeq + 1,
+			   fragments = Fragments1}.
+
+dtls_hs_state_add_fragment(MessageSeq, Fragment, HsState0 = #dtls_hs_state{fragments = Fragments0}) ->
+    Fragments1 = gb_trees:enter(MessageSeq, Fragment, Fragments0),
+    HsState0#dtls_hs_state{fragments = Fragments1}.
+
+reassemble_dtls_fragment(SeqNo, Type, Length, MessageSeq, 0, Length,
+			 Body, HsState0 = #dtls_hs_state{current_read_seq = undefined})
+  when Type == ?CLIENT_HELLO;
+       Type == ?SERVER_HELLO;
+       Type == ?HELLO_VERIFY_REQUEST ->
+    %% First message, should be client hello
+    %% return the current message and set the next expected Sequence
+    %%
+    %% Note: this could (should?) be restricted further, ClientHello and
+    %%       HelloVerifyRequest have to have message_seq = 0, ServerHello
+    %%       can have a message_seq of 0 or 1
+    %%
+    {HsState0#dtls_hs_state{current_read_seq = MessageSeq + 1}, SeqNo, Body};
+
+reassemble_dtls_fragment(_SeqNo, _Type, Length, _MessageSeq, _, Length,
+			 _Body, HsState = #dtls_hs_state{current_read_seq = undefined}) ->
+    %% not what we expected, drop it
+    HsState;
+
+reassemble_dtls_fragment(SeqNo, _Type, Length, MessageSeq, 0, Length,
+			 Body, HsState0 =
+			     #dtls_hs_state{starting_read_seq = StartingReadSeq})
+  when MessageSeq < StartingReadSeq ->
+    %% this has to be the start of a new flight, let it through
+    %%
+    %% Note: this could (should?) be restricted further, the first message of a
+    %%       new flight has to have message_seq = 0
+    %%
+    HsState = dtls_hs_state_process_seq(HsState0),
+    {HsState, SeqNo, Body};
+
+reassemble_dtls_fragment(_SeqNo, _Type, Length, MessageSeq, 0, Length,
+			 _Body, HsState =
+			     #dtls_hs_state{current_read_seq = CurrentReadSeq})
+  when MessageSeq < CurrentReadSeq ->
+    {retransmit, HsState};
+
+reassemble_dtls_fragment(_SeqNo, _Type, Length, MessageSeq, 0, Length,
+			 _Body, HsState = #dtls_hs_state{current_read_seq = CurrentReadSeq})
+  when MessageSeq < CurrentReadSeq ->
+    HsState;
+
+reassemble_dtls_fragment(SeqNo, _Type, Length, MessageSeq, 0, Length,
+			 Body, HsState0 = #dtls_hs_state{current_read_seq = MessageSeq}) ->
+    %% Message fully contained and it's the current seq
+    HsState1 = dtls_hs_state_process_seq(HsState0),
+    {HsState1, SeqNo, Body};
+
+reassemble_dtls_fragment(SeqNo, Type, Length, MessageSeq, 0, Length,
+			 Body, HsState) ->
+    %% Message fully contained and it's the NOT the current seq -> buffer
+    Fragment = {SeqNo, Type, Length, MessageSeq,
+		dtls_fragment_init(Length, 0, Length, Body)},
+    dtls_hs_state_add_fragment(MessageSeq, Fragment, HsState);
+
+reassemble_dtls_fragment(_SeqNo, _Type, Length, MessageSeq, FragmentOffset, FragmentLength,
+			 _Body,
+			 HsState = #dtls_hs_state{current_read_seq = CurrentReadSeq})
+  when FragmentOffset + FragmentLength == Length andalso MessageSeq == (CurrentReadSeq - 1) ->
+    {retransmit, HsState};
+
+reassemble_dtls_fragment(_SeqNo, _Type, _Length, MessageSeq, _FragmentOffset, _FragmentLength,
+			 _Body,
+			 HsState = #dtls_hs_state{current_read_seq = CurrentReadSeq})
+  when MessageSeq < CurrentReadSeq ->
+    HsState;
+
+reassemble_dtls_fragment(SeqNo, Type, Length, MessageSeq,
+			 FragmentOffset, FragmentLength,
+			 Body,
+			 HsState = #dtls_hs_state{fragments = Fragments0}) ->
+    case gb_trees:lookup(MessageSeq, Fragments0) of
+	{value, Fragment} ->
+	    dtls_fragment_reassemble(SeqNo, Type, Length, MessageSeq,
+				     FragmentOffset, FragmentLength,
+				     Body, Fragment, HsState);
+	none ->
+	    dtls_fragment_start(SeqNo, Type, Length, MessageSeq,
+				FragmentOffset, FragmentLength,
+				Body, HsState)
+    end.
+
+dtls_fragment_start(SeqNo, Type, Length, MessageSeq,
+				FragmentOffset, FragmentLength,
+				Body, HsState = #dtls_hs_state{fragments = Fragments0}) ->
+    Fragment = {SeqNo, Type, Length, MessageSeq,
+		dtls_fragment_init(Length, FragmentOffset, FragmentLength, Body)},
+    Fragments1 = gb_trees:insert(MessageSeq, Fragment, Fragments0),
+    HsState#dtls_hs_state{fragments = Fragments1}.
+
+dtls_fragment_reassemble(SeqNo, Type, Length, MessageSeq,
+			 FragmentOffset, FragmentLength,
+			 Body,
+			 {LastSeqNo, Type, Length, MessageSeq, FragBuffer0},
+			 HsState = #dtls_hs_state{fragments = Fragments0}) ->
+    FragBuffer1 = dtls_fragment_add(FragBuffer0, FragmentOffset, FragmentLength, Body),
+    Fragment = {erlang:max(SeqNo, LastSeqNo), Type, Length, MessageSeq, FragBuffer1},
+    Fragments1 = gb_trees:enter(MessageSeq, Fragment, Fragments0),
+    HsState#dtls_hs_state{fragments = Fragments1};
+
+%% Type, Length or Seq mismatch, drop everything...
+%% Note: the RFC is not clear on how to handle this...
+dtls_fragment_reassemble(_SeqNo, _Type, _Length, MessageSeq,
+			 _FragmentOffset, _FragmentLength, _Body, _Fragment,
+			 HsState = #dtls_hs_state{fragments = Fragments0}) ->
+    Fragments1 = gb_trees:delete_any(MessageSeq, Fragments0),
+    HsState#dtls_hs_state{fragments = Fragments1}.
+
+dtls_fragment_add({Length, FragmentList0, Bin0}, FragmentOffset, FragmentLength, Body) ->
+    Bin1 = dtls_fragment_bin_add(FragmentOffset, FragmentLength, Body, Bin0),
+    FragmentList1 = add_fragment(FragmentList0, {FragmentOffset, FragmentLength}),
+    {Length, FragmentList1, Bin1}.
+
+dtls_fragment_init(Length, 0, Length, Body) ->
+    {Length, [{0, Length}], Body};
+dtls_fragment_init(Length, FragmentOffset, FragmentLength, Body) ->
+    Bin = dtls_fragment_bin_add(FragmentOffset, FragmentLength, Body, <<0:(Length*8)>>),
+    {Length, [{FragmentOffset, FragmentOffset + FragmentLength}], Bin}.
+
+dtls_fragment_bin_add(FragmentOffset, FragmentLength, Add, Buffer) ->
+    <<First:FragmentOffset/bytes, _:FragmentLength/bytes, Rest/binary>> = Buffer,
+    <<First/binary, Add/binary, Rest/binary>>.
+
+merge_fragment_list([], Fragment, Acc) ->
+    lists:reverse([Fragment|Acc]);
+
+merge_fragment_list([H = {_, HEnd}|Rest], Frag = {FStart, _}, Acc)
+  when FStart > HEnd ->
+    merge_fragment_list(Rest, Frag, [H|Acc]);
+
+merge_fragment_list(Rest = [{HStart, _HEnd}|_], Frag = {_FStart, FEnd}, Acc)
+  when FEnd < HStart ->
+    lists:reverse(Acc) ++ [Frag|Rest];
+
+merge_fragment_list([{HStart, HEnd}|Rest], _Frag = {FStart, FEnd}, Acc)
+  when
+      FStart =< HEnd orelse FEnd >= HStart ->
+    Start = erlang:min(HStart, FStart),
+    End = erlang:max(HEnd, FEnd),
+    NewFrag = {Start, End},
+    merge_fragment_list(Rest, NewFrag, Acc).
+
+add_fragment(List, {FragmentOffset, FragmentLength}) ->
+    merge_fragment_list(List, {FragmentOffset, FragmentOffset + FragmentLength}, []).
+
+enc_hs(#hello_verify_request{protocol_version = {Major, Minor},
+			     cookie = Cookie}, _Version) ->
+    CookieLength = byte_size(Cookie),
+    {?HELLO_VERIFY_REQUEST, <<?BYTE(Major), ?BYTE(Minor),
+			      ?BYTE(CookieLength),
+			      Cookie/binary>>};
+
+enc_hs(#client_hello{client_version = {Major, Minor},
+		     random = Random,
+		     session_id = SessionID,
+		     cookie = Cookie,
+		     cipher_suites = CipherSuites,
+		     compression_methods = CompMethods,
+		     extensions = HelloExtensions}, Version) ->
+    SIDLength = byte_size(SessionID),
+    BinCookie = enc_client_hello_cookie(Version, Cookie),
+    BinCompMethods = list_to_binary(CompMethods),
+    CmLength = byte_size(BinCompMethods),
+    BinCipherSuites = list_to_binary(CipherSuites),
+    CsLength = byte_size(BinCipherSuites),
+    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions),
+
+    {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+		      ?BYTE(SIDLength), SessionID/binary,
+		      BinCookie/binary,
+				?UINT16(CsLength), BinCipherSuites/binary,
+		      ?BYTE(CmLength), BinCompMethods/binary, ExtensionsBin/binary>>};
+enc_hs(HandshakeMsg, Version) ->
+    ssl_handshake:encode_handshake(HandshakeMsg, Version).
+
+enc_client_hello_cookie(_, <<>>) ->
+    <<>>;
+enc_client_hello_cookie(_, Cookie) ->
+    CookieLength = byte_size(Cookie),
+    <<?BYTE(CookieLength), Cookie/binary>>.
+
+decode_handshake(_Version, ?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+		       ?BYTE(SID_length), Session_ID:SID_length/binary,
+		       ?BYTE(Cookie_length), Cookie:Cookie_length/binary,
+		       ?UINT16(Cs_length), CipherSuites:Cs_length/binary,
+		       ?BYTE(Cm_length), Comp_methods:Cm_length/binary,
+		       Extensions/binary>>) ->
+
+    DecodedExtensions = ssl_handshake:decode_hello_extensions(Extensions),
+
+    #client_hello{
+       client_version = {Major,Minor},
+       random = Random,
+       session_id = Session_ID,
+       cookie = Cookie,
+       cipher_suites = ssl_handshake:decode_suites('2_bytes', CipherSuites),
+       compression_methods = Comp_methods,
+       extensions = DecodedExtensions
+      };
+
+decode_handshake(_Version, ?HELLO_VERIFY_REQUEST, <<?BYTE(Major), ?BYTE(Minor),
+					  ?BYTE(CookieLength), Cookie:CookieLength/binary>>) ->
+
+    #hello_verify_request{
+       protocol_version = {Major,Minor},
+       cookie = Cookie};
+decode_handshake(Version, Tag, Msg) ->
+    ssl_handshake:decode_handshake(Version, Tag, Msg).
+
+address_to_bin({A,B,C,D}, Port) ->
+    <<0:80,16#ffff:16,A,B,C,D,Port:16>>;
+address_to_bin({A,B,C,D,E,F,G,H}, Port) ->
+    <<A:16,B:16,C:16,D:16,E:16,F:16,G:16,H:16,Port:16>>.
diff --git a/lib/ssl/src/dtls_handshake.hrl b/lib/ssl/src/dtls_handshake.hrl
index db7b8596ae..5bdf45f627 100644
--- a/lib/ssl/src/dtls_handshake.hrl
+++ b/lib/ssl/src/dtls_handshake.hrl
@@ -27,6 +27,8 @@
 
 -include("ssl_handshake.hrl"). %% Common TLS and DTLS records and Constantes
 
+-define(HELLO_VERIFY_REQUEST, 3).
+
 -record(client_hello, {
 	  client_version,
 	  random,             
@@ -35,16 +37,22 @@
 	  cipher_suites,       % cipher_suites<2..2^16-1>
 	  compression_methods, % compression_methods<1..2^8-1>,
 	  %% Extensions
-	  renegotiation_info,
-	  hash_signs,          % supported combinations of hashes/signature algos
-	  next_protocol_negotiation = undefined % [binary()]
+	  extensions
 	 }).
 
--record(hello_verify_request  {
+-record(hello_verify_request, {
 	  protocol_version,
 	  cookie
 	 }).
 
--define(HELLO_VERIFY_REQUEST, 3).
+-record(dtls_hs_state,
+	{current_read_seq,
+	 starting_read_seq,
+	 highest_record_seq,
+	 fragments,
+	 completed
+	}).
+
+-type dtls_handshake() :: #client_hello{} | #hello_verify_request{} | ssl_handshake().
 
 -endif. % -ifdef(dtls_handshake).
diff --git a/lib/ssl/src/dtls_record.erl b/lib/ssl/src/dtls_record.erl
index 2469a7d26c..b0a7976864 100644
--- a/lib/ssl/src/dtls_record.erl
+++ b/lib/ssl/src/dtls_record.erl
@@ -15,4 +15,333 @@
 %% under the License.
 %%
 %% %CopyrightEnd%
+
+%%
+%%----------------------------------------------------------------------
+%% Purpose: Handle DTLS record protocol. (Parts that are not shared with SSL/TLS)
+%%----------------------------------------------------------------------
 -module(dtls_record).
+
+-include("dtls_record.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_alert.hrl").
+-include("dtls_handshake.hrl").
+-include("ssl_cipher.hrl").
+
+%% Handling of incoming data
+-export([get_dtls_records/2]).
+
+%% Decoding
+-export([decode_cipher_text/2]).
+
+%% Encoding
+-export([encode_plain_text/4]).
+
+%% Protocol version handling
+-export([protocol_version/1, lowest_protocol_version/2,
+	 highest_protocol_version/1, supported_protocol_versions/0,
+	 is_acceptable_version/2]).
+
+%% DTLS Epoch handling
+-export([init_connection_state_seq/2, current_connection_state_epoch/2,
+	 set_connection_state_by_epoch/3, connection_state_by_epoch/3]).
+
+-compile(inline).
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+
+%%--------------------------------------------------------------------
+-spec get_dtls_records(binary(), binary()) -> {[binary()], binary()} | #alert{}.
+%%
+%% Description: Given old buffer and new data from UDP/SCTP, packs up a records
+%% and returns it as a list of tls_compressed binaries also returns leftover
+%% data
+%%--------------------------------------------------------------------
+get_dtls_records(Data, <<>>) ->
+    get_dtls_records_aux(Data, []);
+get_dtls_records(Data, Buffer) ->
+    get_dtls_records_aux(list_to_binary([Buffer, Data]), []).
+
+get_dtls_records_aux(<<?BYTE(?APPLICATION_DATA),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length), Data:Length/binary, Rest/binary>>,
+		     Acc) ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?APPLICATION_DATA,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, record_seq = SequenceNumber,
+					 fragment = Data} | Acc]);
+get_dtls_records_aux(<<?BYTE(?HANDSHAKE),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length),
+		       Data:Length/binary, Rest/binary>>, Acc) when MajVer >= 128 ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?HANDSHAKE,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, record_seq = SequenceNumber,
+					 fragment = Data} | Acc]);
+get_dtls_records_aux(<<?BYTE(?ALERT),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length), Data:Length/binary,
+		       Rest/binary>>, Acc) ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?ALERT,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, record_seq = SequenceNumber,
+					 fragment = Data} | Acc]);
+get_dtls_records_aux(<<?BYTE(?CHANGE_CIPHER_SPEC),?BYTE(MajVer),?BYTE(MinVer),
+		       ?UINT16(Epoch), ?UINT48(SequenceNumber),
+		       ?UINT16(Length), Data:Length/binary, Rest/binary>>,
+		     Acc) ->
+    get_dtls_records_aux(Rest, [#ssl_tls{type = ?CHANGE_CIPHER_SPEC,
+					 version = {MajVer, MinVer},
+					 epoch = Epoch, record_seq = SequenceNumber,
+					 fragment = Data} | Acc]);
+
+get_dtls_records_aux(<<0:1, _CT:7, ?BYTE(_MajVer), ?BYTE(_MinVer),
+		       ?UINT16(Length), _/binary>>,
+		     _Acc) when Length > ?MAX_CIPHER_TEXT_LENGTH ->
+    ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
+
+get_dtls_records_aux(<<1:1, Length0:15, _/binary>>,_Acc)
+  when Length0 > ?MAX_CIPHER_TEXT_LENGTH ->
+    ?ALERT_REC(?FATAL, ?RECORD_OVERFLOW);
+
+get_dtls_records_aux(Data, Acc) ->
+    case size(Data) =< ?MAX_CIPHER_TEXT_LENGTH + ?INITIAL_BYTES of
+	true ->
+	    {lists:reverse(Acc), Data};
+	false ->
+	    ?ALERT_REC(?FATAL, ?UNEXPECTED_MESSAGE)
+    end.
+
+encode_plain_text(Type, Version, Data,
+		  #connection_states{current_write=#connection_state{
+						      epoch = Epoch,
+						      sequence_number = Seq,
+						      compression_state=CompS0,
+						      security_parameters=
+							  #security_parameters{compression_algorithm=CompAlg}
+						     }= WriteState0} = ConnectionStates) ->
+    {Comp, CompS1} = ssl_record:compress(CompAlg, Data, CompS0),
+    WriteState1 = WriteState0#connection_state{compression_state = CompS1},
+    MacHash = calc_mac_hash(WriteState1, Type, Version, Epoch, Seq, Comp),
+    {CipherFragment, WriteState} = ssl_record:cipher(Version, Comp, WriteState1, MacHash),
+    CipherText = encode_tls_cipher_text(Type, Version, Epoch, Seq, CipherFragment),
+    {CipherText, ConnectionStates#connection_states{current_write =
+							WriteState#connection_state{sequence_number = Seq +1}}}.
+
+decode_cipher_text(#ssl_tls{type = Type, version = Version,
+			    epoch = Epoch,
+			    record_seq = Seq,
+			    fragment = CipherFragment} = CipherText,
+		   #connection_states{current_read =
+					  #connection_state{compression_state = CompressionS0,
+							    security_parameters = SecParams} = ReadState0}
+		   = ConnnectionStates0) ->
+    CompressAlg = SecParams#security_parameters.compression_algorithm,
+    {PlainFragment, Mac, ReadState1} = ssl_record:decipher(dtls_v1:corresponding_tls_version(Version),
+							   CipherFragment, ReadState0),
+    MacHash = calc_mac_hash(Type, Version, Epoch, Seq, PlainFragment, ReadState1),
+    case ssl_record:is_correct_mac(Mac, MacHash) of
+	true ->
+	    {Plain, CompressionS1} = ssl_record:uncompress(CompressAlg,
+							   PlainFragment, CompressionS0),
+	    ConnnectionStates = ConnnectionStates0#connection_states{
+				  current_read = ReadState1#connection_state{
+						   compression_state = CompressionS1}},
+	    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
+	false ->
+	    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+    end.
+
+%%--------------------------------------------------------------------
+-spec protocol_version(tls_atom_version() | tls_version()) ->
+			      tls_version() | tls_atom_version().
+%%
+%% Description: Creates a protocol version record from a version atom
+%% or vice versa.
+%%--------------------------------------------------------------------
+protocol_version('dtlsv1.2') ->
+    {254, 253};
+protocol_version(dtlsv1) ->
+    {254, 255};
+protocol_version({254, 253}) ->
+    'dtlsv1.2';
+protocol_version({254, 255}) ->
+    dtlsv1.
+%%--------------------------------------------------------------------
+-spec lowest_protocol_version(tls_version(), tls_version()) -> tls_version().
+%%
+%% Description: Lowes protocol version of two given versions
+%%--------------------------------------------------------------------
+lowest_protocol_version(Version = {M, N}, {M, O}) when N > O ->
+    Version;
+lowest_protocol_version({M, _}, Version = {M, _}) ->
+    Version;
+lowest_protocol_version(Version = {M,_}, {N, _}) when M > N ->
+    Version;
+lowest_protocol_version(_,Version) ->
+    Version.
+%%--------------------------------------------------------------------
+-spec highest_protocol_version([tls_version()]) -> tls_version().
+%%
+%% Description: Highest protocol version present in a list
+%%--------------------------------------------------------------------
+highest_protocol_version([Ver | Vers]) ->
+    highest_protocol_version(Ver, Vers).
+
+highest_protocol_version(Version, []) ->
+    Version;
+highest_protocol_version(Version = {N, M}, [{N, O} | Rest])   when M < O ->
+    highest_protocol_version(Version, Rest);
+highest_protocol_version({M, _}, [Version = {M, _} | Rest]) ->
+    highest_protocol_version(Version, Rest);
+highest_protocol_version(Version = {M,_}, [{N,_} | Rest])  when M < N ->
+    highest_protocol_version(Version, Rest);
+highest_protocol_version(_, [Version | Rest]) ->
+    highest_protocol_version(Version, Rest).
+
+
+%%--------------------------------------------------------------------
+-spec supported_protocol_versions() -> [tls_version()].
+%%
+%% Description: Protocol versions supported
+%%--------------------------------------------------------------------
+supported_protocol_versions() ->
+    Fun = fun(Version) ->
+		  protocol_version(Version)
+	  end,
+    case application:get_env(ssl, dtls_protocol_version) of
+	undefined ->
+	    lists:map(Fun, supported_protocol_versions([]));
+	{ok, []} ->
+	    lists:map(Fun, supported_protocol_versions([]));
+	{ok, Vsns} when is_list(Vsns) ->
+	    supported_protocol_versions(Vsns);
+	{ok, Vsn} ->
+	    supported_protocol_versions([Vsn])
+     end.
+
+supported_protocol_versions([]) ->
+    Vsns = supported_connection_protocol_versions([]),
+    application:set_env(ssl, dtls_protocol_version, Vsns),
+    Vsns;
+
+supported_protocol_versions([_|_] = Vsns) ->
+    Vsns.
+
+supported_connection_protocol_versions([]) ->
+    ?ALL_DATAGRAM_SUPPORTED_VERSIONS.
+
+%%--------------------------------------------------------------------
+-spec is_acceptable_version(tls_version(), Supported :: [tls_version()]) -> boolean().
+%%
+%% Description: ssl version 2 is not acceptable security risks are too big.
+%%
+%%--------------------------------------------------------------------
+is_acceptable_version(Version, Versions) ->
+    lists:member(Version, Versions).
+
+
+%%--------------------------------------------------------------------
+-spec init_connection_state_seq(tls_version(), #connection_states{}) ->
+				       #connection_state{}.
+%%
+%% Description: Copy the read sequence number to the write sequence number
+%% This is only valid for DTLS in the first client_hello
+%%--------------------------------------------------------------------
+init_connection_state_seq({254, _},
+			  #connection_states{
+			     current_read = Read = #connection_state{epoch = 0},
+			     current_write = Write = #connection_state{epoch = 0}} = CS0) ->
+    CS0#connection_states{current_write =
+			      Write#connection_state{
+				sequence_number = Read#connection_state.sequence_number}};
+init_connection_state_seq(_, CS) ->
+    CS.
+
+%%--------------------------------------------------------
+-spec current_connection_state_epoch(#connection_states{}, read | write) ->
+					    integer().
+%%
+%% Description: Returns the epoch the connection_state record
+%% that is currently defined as the current conection state.
+%%--------------------------------------------------------------------
+current_connection_state_epoch(#connection_states{current_read = Current},
+			       read) ->
+    Current#connection_state.epoch;
+current_connection_state_epoch(#connection_states{current_write = Current},
+			       write) ->
+    Current#connection_state.epoch.
+
+%%--------------------------------------------------------------------
+
+-spec connection_state_by_epoch(#connection_states{}, integer(), read | write) ->
+				      #connection_state{}.
+%%
+%% Description: Returns the instance of the connection_state record
+%% that is defined by the Epoch.
+%%--------------------------------------------------------------------
+connection_state_by_epoch(#connection_states{current_read = CS}, Epoch, read)
+  when CS#connection_state.epoch == Epoch ->
+    CS;
+connection_state_by_epoch(#connection_states{pending_read = CS}, Epoch, read)
+  when CS#connection_state.epoch == Epoch ->
+    CS;
+connection_state_by_epoch(#connection_states{current_write = CS}, Epoch, write)
+  when CS#connection_state.epoch == Epoch ->
+    CS;
+connection_state_by_epoch(#connection_states{pending_write = CS}, Epoch, write)
+  when CS#connection_state.epoch == Epoch ->
+    CS.
+%%--------------------------------------------------------------------
+-spec set_connection_state_by_epoch(#connection_states{},
+				    #connection_state{}, read | write)
+				   -> #connection_states{}.
+%%
+%% Description: Returns the instance of the connection_state record
+%% that is defined by the Epoch.
+%%--------------------------------------------------------------------
+set_connection_state_by_epoch(ConnectionStates0 =
+				  #connection_states{current_read = CS},
+			      NewCS = #connection_state{epoch = Epoch}, read)
+  when CS#connection_state.epoch == Epoch ->
+    ConnectionStates0#connection_states{current_read = NewCS};
+
+set_connection_state_by_epoch(ConnectionStates0 =
+				  #connection_states{pending_read = CS},
+			      NewCS = #connection_state{epoch = Epoch}, read)
+  when CS#connection_state.epoch == Epoch ->
+    ConnectionStates0#connection_states{pending_read = NewCS};
+
+set_connection_state_by_epoch(ConnectionStates0 =
+				  #connection_states{current_write = CS},
+			      NewCS = #connection_state{epoch = Epoch}, write)
+  when CS#connection_state.epoch == Epoch ->
+    ConnectionStates0#connection_states{current_write = NewCS};
+
+set_connection_state_by_epoch(ConnectionStates0 =
+				  #connection_states{pending_write = CS},
+			      NewCS = #connection_state{epoch = Epoch}, write)
+  when CS#connection_state.epoch == Epoch ->
+    ConnectionStates0#connection_states{pending_write = NewCS}.
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+encode_tls_cipher_text(Type, {MajVer, MinVer}, Epoch, Seq, Fragment) ->
+    Length = erlang:iolist_size(Fragment),
+    [<<?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer), ?UINT16(Epoch),
+       ?UINT48(Seq), ?UINT16(Length)>>, Fragment].
+
+calc_mac_hash(#connection_state{mac_secret = MacSecret,
+				security_parameters = #security_parameters{mac_algorithm = MacAlg}},
+	      Type, Version, Epoch, SeqNo, Fragment) ->
+    Length = erlang:iolist_size(Fragment),
+    NewSeq = (Epoch bsl 48) + SeqNo,
+    mac_hash(Version, MacAlg, MacSecret, NewSeq, Type,
+	     Length, Fragment).
+
+mac_hash(Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment) ->
+    dtls_v1:mac_hash(MacAlg, MacSecret, SeqNo, Type, Version,
+		     Length, Fragment).
diff --git a/lib/ssl/src/dtls_v1.erl b/lib/ssl/src/dtls_v1.erl
new file mode 100644
index 0000000000..6e41641483
--- /dev/null
+++ b/lib/ssl/src/dtls_v1.erl
@@ -0,0 +1,43 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The 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(dtls_v1).
+
+-include("ssl_cipher.hrl").
+
+-export([suites/1, mac_hash/7, ecc_curves/1, corresponding_tls_version/1]).
+
+-spec suites(Minor:: 253|255) -> [cipher_suite()].
+
+suites(Minor) ->
+   tls_v1:suites(corresponding_minor_tls_version(Minor)).
+
+mac_hash(Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment) ->
+    tls_v1:mac_hash(MacAlg, MacSecret, SeqNo, Type, corresponding_tls_version(Version),
+		    Length, Fragment).
+
+ecc_curves({_Major, Minor}) ->
+    tls_v1:ecc_curves(corresponding_minor_tls_version(Minor)).
+
+corresponding_tls_version({254, Minor}) ->
+    {3, corresponding_minor_tls_version(Minor)}.
+
+corresponding_minor_tls_version(255) ->
+    2;
+corresponding_minor_tls_version(253) ->
+    3.
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
index 57c859bf24..7367b5c224 100644
--- a/lib/ssl/src/inet_tls_dist.erl
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -95,11 +95,6 @@ do_setup(Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) ->
     end.
 
 close(Socket) ->
-    try
-	erlang:error(foo)
-    catch _:_ ->
-	    io:format("close called ~p ~p~n",[Socket, erlang:get_stacktrace()])
-    end,
     gen_tcp:close(Socket),
     ok.
 
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 582a60635f..68ebc49e4a 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -3,40 +3,46 @@
     {vsn, "%VSN%"},
     {modules, [
 	       %% TLS/SSL 
-	       tls,
 	       tls_connection,
 	       tls_handshake,
 	       tls_record,
+	       tls_v1,
+	       ssl_v3,
+	       ssl_v2,
 	       %% DTLS
-	       dtls_record,
-	       dtls_handshake,
 	       dtls_connection,
-	       dtls,	
-	       %% Backwards compatibility
-               ssl,
+	       dtls_handshake,
+	       dtls_record,
+	       dtls_v1,
+	       %% API
+	       ssl,  %% Main API		  
+	       tls,  %% TLS specific
+	       dtls, %% DTLS specific 
+	       ssl_session_cache_api,
 	       %% Both TLS/SSL and DTLS
-	       ssl_app,
-	       ssl_sup,
+	       ssl_config,
+	       ssl_connection,
+	       ssl_handshake,
+	       ssl_record,
+	       ssl_cipher,
+	       ssl_srp_primes,
+	       ssl_alert,
+	       ssl_socket,
+	       %% Erlang Distribution over SSL/TLS
 	       inet_tls_dist,
 	       ssl_tls_dist_proxy,
 	       ssl_dist_sup,
-	       ssl_tls1,
-	       ssl_ssl3,
-	       ssl_ssl2,
+	       %% SSL/TLS session handling
 	       ssl_session,
-	       ssl_session_cache_api,
 	       ssl_session_cache,
-	       ssl_socket,	
-	       %%ssl_record,
 	       ssl_manager,
-	       %%ssl_handshake,
-	       ssl_connection_sup,
-	       %%ssl_connection,
-	       ssl_cipher,
-	       ssl_srp_primes,
 	       ssl_pkix_db,
 	       ssl_certificate,
-	       ssl_alert
+	       %% App structure
+	       ssl_app,
+	       ssl_sup,
+	       tls_connection_sup,
+	       dtls_connection_sup	
 	       ]},
     {registered, [ssl_sup, ssl_manager]},
     {applications, [crypto, public_key, kernel, stdlib]},
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index 9e5bec26f1..3a64841976 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,6 +1,11 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
+  {<<"5.3.2">>, [{load_module, ssl, soft_purge, soft_purge, []},
+		 {load_module, ssl_connection, soft_purge, soft_purge, []},
+		 {load_module, ssl_handshake, soft_purge, soft_purge, []},
+		 {load_module, tls_connection, soft_purge, soft_purge, []}]},
+  {<<"5.3.1">>, [{restart_application, ssl}]},
   {<<"5.2\\*">>, [{restart_application, ssl}]},
   {<<"5.1\\*">>, [{restart_application, ssl}]},
   {<<"5.0\\*">>, [{restart_application, ssl}]},
@@ -8,6 +13,11 @@
   {<<"3\\.*">>, [{restart_application, ssl}]}
  ], 
  [
+  {<<"5.3.2">>, [{load_module, ssl, soft_purge, soft_purge, []},
+		 {load_module, ssl_connection, soft_purge, soft_purge, []},
+		 {load_module, ssl_handshake, soft_purge, soft_purge, []},
+		 {load_module, tls_connection, soft_purge, soft_purge, []}]},
+  {<<"5.3.1">>, [{restart_application, ssl}]},
   {<<"5.2\\*">>, [{restart_application, ssl}]},
   {<<"5.1\\*">>, [{restart_application, ssl}]},
   {<<"5.0\\*">>, [{restart_application, ssl}]},
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 0c1e47311d..c3bdeb1a54 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The 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,63 +19,38 @@
 
 %%
 
-%%% Purpose : Backwards compatibility
+%%% Purpose : Main API module for SSL see also tls.erl and dtls.erl
 
 -module(ssl).
+-include("ssl_internal.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%% Application handling
+-export([start/0, start/1, stop/0, clear_pem_cache/0]).
 
--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, suite_definition/1,
-	 close/1, shutdown/2,
-	 connect/3, connect/2, connect/4, connection_info/1,
-	 controlling_process/2, listen/2, 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, clear_pem_cache/0, random_bytes/1, negotiated_next_protocol/1]).
+%% Socket handling
+-export([connect/3, connect/2, connect/4,
+	 listen/2, transport_accept/1, transport_accept/2,
+	 ssl_accept/1, ssl_accept/2, ssl_accept/3,
+	 controlling_process/2, peername/1, peercert/1, sockname/1,
+	 close/1, shutdown/2, recv/2, recv/3, send/2, getopts/2, setopts/2
+	]).
+%% SSL/TLS protocol handling
+-export([cipher_suites/0, cipher_suites/1, suite_definition/1,
+	 connection_info/1, versions/0, session_info/1, format_error/1,
+	 renegotiate/1, prf/5, negotiated_next_protocol/1]).
+%% Misc
+-export([random_bytes/1]).
 
+-include("ssl_api.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl").
 -include("ssl_cipher.hrl").
 -include("ssl_handshake.hrl").
+-include("ssl_srp.hrl").
 
 -include_lib("public_key/include/public_key.hrl"). 
 
-%% Visible in API
--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, sslsocket/0]).
-
--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().
--type socket_listen_option()     :: gen_tcp:listen_option().
-
--type ssl_option()    :: {verify, verify_type()} |
-			{verify_fun, {fun(), InitialUserState::term()}} |
-                        {fail_if_no_peer_cert, boolean()} | {depth, integer()} |
-                        {cert, Der::binary()} | {certfile, path()} | {key, Der::binary()} |
-                        {keyfile, path()} | {password, string()} | {cacerts, [Der::binary()]} |
-                        {cacertfile, path()} | {dh, Der::binary()} | {dhfile, path()} |
-                        {user_lookup_fun, {fun(), InitialUserState::term()}} |
-                        {psk_identity, string()} |
-                        {srp_identity, {string(), string()}} |
-                        {ciphers, ciphers()} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} |
-                        {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().
--type ciphers()      :: [erl_cipher_suite()] |
-			string(). % (according to old API)
--type ssl_imp()      :: new | old.
-
--type transport_option() :: {cb_info, {CallbackModule::atom(), DataTag::atom(), 
-				       ClosedTag::atom(), ErrTag::atom()}}.
--type prf_random() :: client_random | server_random.
-
 %%--------------------------------------------------------------------
 -spec start() -> ok  | {error, reason()}.
 -spec start(permanent | transient | temporary) -> ok | {error, reason()}.
@@ -85,65 +60,249 @@
 %% is temporary. see application(3)
 %%--------------------------------------------------------------------
 start() ->
-   tls:start().
+    application:start(crypto),
+    application:start(asn1),
+    application:start(public_key),
+    application:start(ssl).
+
 start(Type) ->
-    tls:start(Type).
+    application:start(crypto, Type),
+    application:start(asn1),
+    application:start(public_key, Type),
+    application:start(ssl, Type).
 
+%%--------------------------------------------------------------------
+-spec stop() -> ok.
+%%
+%% Description: Stops the ssl application.
+%%--------------------------------------------------------------------
 stop() ->
-   tls:stop().
+    application:stop(ssl).
 
-connect(Socket, SslOptions) ->
-    tls:connect(Socket, SslOptions).
+%%--------------------------------------------------------------------
+-spec connect(host() | port(), [connect_option()]) -> {ok, #sslsocket{}} |
+					      {error, reason()}.
+-spec connect(host() | port(), [connect_option()] | inet:port_number(),
+	      timeout() | list()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
+-spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
 
-connect(Socket, SslOptions0, TimeoutOrOpts) ->
-    tls:connect(Socket, SslOptions0, TimeoutOrOpts).
+%%
+%% Description: Connect to an ssl server.
+%%--------------------------------------------------------------------
+connect(Socket, SslOptions) when is_port(Socket) ->
+    connect(Socket, SslOptions, infinity).
+
+connect(Socket, SslOptions0, Timeout) when is_port(Socket) ->
+    {Transport,_,_,_} = proplists:get_value(cb_info, SslOptions0,
+					      {gen_tcp, tcp, tcp_closed, tcp_error}),
+    EmulatedOptions = emulated_options(),
+    {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions),
+    try handle_options(SslOptions0 ++ SocketValues, client) of
+	{ok, #config{transport_info = CbInfo, ssl = SslOptions, emulated = EmOpts,
+		     connection_cb = ConnectionCb}} ->
+
+	    ok = ssl_socket:setopts(Transport, Socket, internal_inet_values()),
+	    case ssl_socket:peername(Transport, Socket) of
+		{ok, {Address, Port}} ->
+		    ssl_connection:connect(ConnectionCb, Address, Port, Socket,
+					   {SslOptions, EmOpts},
+					   self(), CbInfo, Timeout);
+		{error, Error} ->
+		    {error, Error}
+	    end
+    catch
+	_:{error, Reason} ->
+            {error, Reason}
+    end;
+
+connect(Host, Port, Options) ->
+    connect(Host, Port, Options, infinity).
 
 connect(Host, Port, Options, Timeout) ->
-    tls:connect(Host, Port, Options, Timeout).
+    try handle_options(Options, client) of
+	{ok, Config} ->
+	    do_connect(Host,Port,Config,Timeout)
+    catch
+	throw:Error ->
+	    Error
+    end.
 
-listen(Port, Options) ->
-    tls:listen(Port, Options).
+%%--------------------------------------------------------------------
+-spec listen(inet:port_number(), [listen_option()]) ->{ok, #sslsocket{}} | {error, reason()}.
 
+%%
+%% Description: Creates an ssl listen socket.
+%%--------------------------------------------------------------------
+listen(_Port, []) ->
+    {error, nooptions};
+listen(Port, Options0) ->
+    try
+	{ok, Config} = handle_options(Options0, server),
+	ConnectionCb = connection_cb(Options0),
+	#config{transport_info = {Transport, _, _, _}, inet_user = Options, connection_cb = ConnectionCb} = Config,
+	case Transport:listen(Port, Options) of
+	    {ok, ListenSocket} ->
+		{ok, #sslsocket{pid = {ListenSocket, Config}}};
+	    Err = {error, _} ->
+		Err
+	end
+    catch
+	Error = {error, _} ->
+	    Error
+    end.
+%%--------------------------------------------------------------------
+-spec transport_accept(#sslsocket{}) -> {ok, #sslsocket{}} |
+					{error, reason()}.
+-spec transport_accept(#sslsocket{}, timeout()) -> {ok, #sslsocket{}} |
+						   {error, reason()}.
+%%
+%% Description: Performs transport accept on an ssl listen socket
+%%--------------------------------------------------------------------
 transport_accept(ListenSocket) ->
-    tls:transport_accept(ListenSocket).
+    transport_accept(ListenSocket, infinity).
+
+transport_accept(#sslsocket{pid = {ListenSocket,
+				   #config{transport_info = CbInfo,
+					   connection_cb = ConnectionCb,
+					   ssl = SslOpts}}}, Timeout) ->
+    %% The setopt could have been invoked on the listen socket
+    %% and options should be inherited.
+    EmOptions = emulated_options(),
+    {Transport,_,_, _} = CbInfo,
+    {ok, SocketValues} = ssl_socket:getopts(Transport, ListenSocket, EmOptions),
+    ok = ssl_socket:setopts(Transport, ListenSocket, internal_inet_values()),
+    case Transport:accept(ListenSocket, Timeout) of
+	{ok, Socket} ->
+	    ok = ssl_socket:setopts(Transport, ListenSocket, SocketValues),
+	    {ok, Port} = ssl_socket:port(Transport, Socket),
+	    ConnArgs = [server, "localhost", Port, Socket,
+			{SslOpts, socket_options(SocketValues)}, self(), CbInfo],
+	    ConnectionSup = connection_sup(ConnectionCb),
+	    case ConnectionSup:start_child(ConnArgs) of
+		{ok, Pid} ->
+		    ssl_connection:socket_control(ConnectionCb, Socket, Pid, Transport);
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
 
-transport_accept(ListenSocket, Timeout) ->
-    tls:transport_accept(ListenSocket, Timeout).
-   
+%%--------------------------------------------------------------------
+-spec ssl_accept(#sslsocket{}) -> ok | {error, reason()}.
+-spec ssl_accept(#sslsocket{} | port(), timeout()| [ssl_option()
+						    | transport_option()]) ->
+			ok | {ok, #sslsocket{}} | {error, reason()}.
+-spec ssl_accept(port(), [ssl_option()| transport_option()], timeout()) ->
+			{ok, #sslsocket{}} | {error, reason()}.
+%%
+%% Description: Performs accept on an ssl listen socket. e.i. performs
+%%              ssl handshake.
+%%--------------------------------------------------------------------
 ssl_accept(ListenSocket) ->
-    tls:ssl_accept(ListenSocket, infinity).
+    ssl_accept(ListenSocket, infinity).
 
 ssl_accept(#sslsocket{} = Socket, Timeout) ->
-    tls:ssl_accept(Socket, Timeout);
+    ssl_connection:handshake(Socket, Timeout);
     
 ssl_accept(ListenSocket, SslOptions)  when is_port(ListenSocket) -> 
-    tls:ssl_accept(ListenSocket, SslOptions, infinity).
+    ssl_accept(ListenSocket, SslOptions, infinity).
 
 ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) -> 
-    tls:ssl_accept(Socket, SslOptions, Timeout).
+    {Transport,_,_,_} =
+	proplists:get_value(cb_info, SslOptions, {gen_tcp, tcp, tcp_closed, tcp_error}),
+    EmulatedOptions = emulated_options(),
+    {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions),
+    ConnetionCb = connection_cb(SslOptions),
+    try handle_options(SslOptions ++ SocketValues, server) of
+	{ok, #config{transport_info = CbInfo, ssl = SslOpts, emulated = EmOpts}} ->
+	    ok = ssl_socket:setopts(Transport, Socket, internal_inet_values()),
+	    {ok, Port} = ssl_socket:port(Transport, Socket),
+	    ssl_connection:ssl_accept(ConnetionCb, Port, Socket,
+				   {SslOpts, EmOpts},
+				   self(), CbInfo, Timeout)
+    catch
+	Error = {error, _Reason} -> Error
+    end.
 
-close(Socket) ->
-    tls:close(Socket).
+%%--------------------------------------------------------------------
+-spec  close(#sslsocket{}) -> term().
+%%
+%% Description: Close an ssl connection
+%%--------------------------------------------------------------------
+close(#sslsocket{pid = Pid}) when is_pid(Pid) ->
+    ssl_connection:close(Pid);
+close(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport,_, _, _}}}}) ->
+    Transport:close(ListenSocket).
 
-send(Socket, Data)  ->
-    tls:send(Socket, Data).
+%%--------------------------------------------------------------------
+-spec send(#sslsocket{}, iodata()) -> ok | {error, reason()}.
+%%
+%% Description: Sends data over the ssl connection
+%%--------------------------------------------------------------------
+send(#sslsocket{pid = Pid}, Data) when is_pid(Pid) ->
+    ssl_connection:send(Pid, Data);
+send(#sslsocket{pid = {ListenSocket, #config{transport_info={Transport, _, _, _}}}}, Data) ->
+    Transport:send(ListenSocket, Data). %% {error,enotconn}
 
+%%--------------------------------------------------------------------
+-spec recv(#sslsocket{}, integer()) -> {ok, binary()| list()} | {error, reason()}.
+-spec recv(#sslsocket{}, integer(), timeout()) -> {ok, binary()| list()} | {error, reason()}.
+%%
+%% Description: Receives data when active = false
+%%--------------------------------------------------------------------
 recv(Socket, Length) ->
-    tls:recv(Socket, Length, infinity).
-recv(Socket, Length, Timeout) ->
-    tls:recv(Socket, Length, Timeout).
+    recv(Socket, Length, infinity).
+recv(#sslsocket{pid = Pid}, Length, Timeout) when is_pid(Pid) ->
+    ssl_connection:recv(Pid, Length, Timeout);
+recv(#sslsocket{pid = {Listen,
+		       #config{transport_info = {Transport, _, _, _}}}}, _,_) when is_port(Listen)->
+    Transport:recv(Listen, 0). %% {error,enotconn}
 
-controlling_process(Socket, NewOwner) ->
-    tls:controlling_process(Socket, NewOwner).
-    
-connection_info(Socket) ->
-    tls:connection_info(Socket).
+%%--------------------------------------------------------------------
+-spec controlling_process(#sslsocket{}, pid()) -> ok | {error, reason()}.
+%%
+%% Description: Changes process that receives the messages when active = true
+%% or once.
+%%--------------------------------------------------------------------
+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{transport_info = {Transport, _, _, _}}}},
+		    NewOwner) when is_port(Listen),
+				   is_pid(NewOwner) ->
+    Transport:controlling_process(Listen, NewOwner).
 
-peername(Socket) ->
-    tls:peername(Socket).
+%%--------------------------------------------------------------------
+-spec connection_info(#sslsocket{}) -> 	{ok, {tls_atom_version(), erl_cipher_suite()}} |
+					{error, reason()}.
+%%
+%% Description: Returns ssl protocol and cipher used for the connection
+%%--------------------------------------------------------------------
+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, fd = {Transport, Socket, _}}) when is_pid(Pid)->
+    ssl_socket:peername(Transport, Socket);
+peername(#sslsocket{pid = {ListenSocket,  #config{transport_info = {Transport,_,_,_}}}}) ->
+    ssl_socket:peername(Transport, ListenSocket). %% Will return {error, enotconn}
 
+%%--------------------------------------------------------------------
+-spec peercert(#sslsocket{}) ->{ok, DerCert::binary()} | {error, reason()}.
+%%
+%% Description: Returns the peercert.
+%%--------------------------------------------------------------------
 peercert(#sslsocket{pid = Pid}) when is_pid(Pid) ->
-    case tls_connection:peer_certificate(Pid) of
+    case ssl_connection:peer_certificate(Pid) of
 	{ok, undefined} ->
 	    {error, no_peercert};
         Result ->
@@ -152,20 +311,30 @@ peercert(#sslsocket{pid = Pid}) when is_pid(Pid) ->
 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}) ->
-    tls_connection:negotiated_next_protocol(Pid).
+    ssl_connection:negotiated_next_protocol(Pid).
 
-%%%--------------------------------------------------------------------
+%%--------------------------------------------------------------------
 -spec cipher_suites() -> [erl_cipher_suite()].
--spec cipher_suites(erlang | openssl | all ) -> [erl_cipher_suite()] | [string()].
+-spec cipher_suites(erlang | openssl | all) -> [erl_cipher_suite()] | [string()].
 			   
 %% Description: Returns all supported cipher suites.
 %%--------------------------------------------------------------------
-
 cipher_suites() ->
     cipher_suites(erlang).
   
@@ -176,7 +345,6 @@ cipher_suites(erlang) ->
 cipher_suites(openssl) ->
     Version = tls_record:highest_protocol_version([]),
     [ssl_cipher:openssl_suite_name(S) || S <- ssl_cipher:suites(Version)];
-
 cipher_suites(all) ->
     Version = tls_record:highest_protocol_version([]),
     Supported = ssl_cipher:suites(Version)
@@ -185,38 +353,692 @@ cipher_suites(all) ->
 	++ ssl_cipher:srp_suites(),
     [suite_definition(S) || S <- Supported].
 
-getopts(Socket, OptionTags) ->
-    tls:getopts(Socket, OptionTags).
+%%--------------------------------------------------------------------
+-spec getopts(#sslsocket{}, [gen_tcp:option_name()]) ->
+		     {ok, [gen_tcp:option()]} | {error, reason()}.
+%%
+%% Description: Gets options
+%%--------------------------------------------------------------------
+getopts(#sslsocket{pid = Pid}, OptionTags) when is_pid(Pid), is_list(OptionTags) ->
+    ssl_connection:get_opts(Pid, OptionTags);
+getopts(#sslsocket{pid = {ListenSocket,  #config{transport_info = {Transport,_,_,_}}}},
+	OptionTags) when is_list(OptionTags) ->
+    try ssl_socket:getopts(Transport, ListenSocket, OptionTags) of
+	{ok, _} = Result ->
+	    Result;
+	{error, InetError} ->
+	    {error, {options, {socket_options, OptionTags, InetError}}}
+    catch
+	_:_ ->
+	    {error, {options, {socket_options, OptionTags}}}
+    end;
+getopts(#sslsocket{}, OptionTags) ->
+    {error, {options, {socket_options, OptionTags}}}.
+
+%%--------------------------------------------------------------------
+-spec setopts(#sslsocket{},  [gen_tcp:option()]) -> ok | {error, reason()}.
+%%
+%% Description: Sets options
+%%--------------------------------------------------------------------
+setopts(#sslsocket{pid = Pid}, Options0) when is_pid(Pid), is_list(Options0)  ->
+    try proplists:expand([{binary, [{mode, binary}]},
+			  {list, [{mode, list}]}], Options0) of
+	Options ->
+	    ssl_connection:set_opts(Pid, Options)
+    catch
+	_:_ ->
+	    {error, {options, {not_a_proplist, Options0}}}
+    end;
+
+setopts(#sslsocket{pid = {ListenSocket, #config{transport_info = {Transport,_,_,_}}}}, Options) when is_list(Options) ->
+    try ssl_socket:setopts(Transport, ListenSocket, Options) of
+	ok ->
+	    ok;
+	{error, InetError} ->
+	    {error, {options, {socket_options, Options, InetError}}}
+    catch
+	_:Error ->
+	    {error, {options, {socket_options, Options, Error}}}
+    end;
+setopts(#sslsocket{}, Options) ->
+    {error, {options,{not_a_proplist, Options}}}.
 
-setopts(Socket, Options) ->
-    tls:setopts(Socket, Options).
+%%---------------------------------------------------------------
+-spec shutdown(#sslsocket{}, read | write | read_write) ->  ok | {error, reason()}.
+%%
+%% Description: Same as gen_tcp:shutdown/2
+%%--------------------------------------------------------------------
+shutdown(#sslsocket{pid = {Listen, #config{transport_info = {Transport,_, _, _}}}},
+	 How) when is_port(Listen) ->
+    Transport:shutdown(Listen, How);
+shutdown(#sslsocket{pid = Pid}, How) ->
+    ssl_connection:shutdown(Pid, How).
 
-shutdown(Socket, How) ->
-    tls:shutdown(Socket, How).
+%%--------------------------------------------------------------------
+-spec sockname(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
+%%
+%% Description: Same as inet:sockname/1
+%%--------------------------------------------------------------------
+sockname(#sslsocket{pid = {Listen,  #config{transport_info = {Transport,_, _, _}}}}) when is_port(Listen) ->
+    ssl_socket:sockname(Transport, Listen);
 
-sockname(Socket)  ->
-    tls:sockname(Socket).
+sockname(#sslsocket{pid = Pid, fd = {Transport, Socket, _}}) when is_pid(Pid) ->
+    ssl_socket:sockname(Transport, Socket).
 
+%%---------------------------------------------------------------
+-spec session_info(#sslsocket{}) -> {ok, list()} | {error, reason()}.
+%%
+%% Description: Returns list of session info currently [{session_id, session_id(),
+%% {cipher_suite, cipher_suite()}]
+%%--------------------------------------------------------------------
 session_info(#sslsocket{pid = Pid}) when is_pid(Pid) ->
-    tls_connection:session_info(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()]}].
+%%
+%% Description: Returns a list of relevant versions.
+%%--------------------------------------------------------------------
 versions() ->
-   tls:versions().
+    Vsns = tls_record:supported_protocol_versions(),
+    SupportedVsns = [tls_record:protocol_version(Vsn) || Vsn <- Vsns],
+    AvailableVsns = ?ALL_SUPPORTED_VERSIONS,
+    %% TODO Add DTLS versions when supported
+    [{ssl_app, ?VSN}, {supported, SupportedVsns}, {available, AvailableVsns}].
 
-renegotiate(Socket) ->
-    tls:renegotiate(Socket).
 
-prf(Socket, Secret, Label, Seed, WantedLength) ->
-    tls:prf(Socket, Secret, Label, Seed, WantedLength).
+%%---------------------------------------------------------------
+-spec renegotiate(#sslsocket{}) -> ok | {error, reason()}.
+%%
+%% Description: Initiates a renegotiation.
+%%--------------------------------------------------------------------
+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(),
+	  binary() | prf_random(), non_neg_integer()) ->
+		 {ok, binary()} | {error, reason()}.
+%%
+%% Description: use a ssl sessions TLS PRF to generate key material
+%%--------------------------------------------------------------------
+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() ->
-    tls:clear_pem_cache().
+    ssl_manager:clear_pem_cache().
 
-format_error(Error)  ->
-    tls:format_error(Error).
+%%---------------------------------------------------------------
+-spec format_error({error, term()}) -> list().
+%%
+%% Description: Creates error string.
+%%--------------------------------------------------------------------
+format_error({error, Reason}) ->
+    format_error(Reason);
+format_error(Reason) when is_list(Reason) ->
+    Reason;
+format_error(closed) ->
+    "TLS connection is closed";
+format_error({tls_alert, Description}) ->
+    "TLS Alert: " ++ Description;
+format_error({options,{FileType, File, Reason}}) when FileType == cacertfile;
+						      FileType == certfile;
+						      FileType == keyfile;
+						      FileType == dhfile ->
+    Error = file_error_format(Reason),
+    file_desc(FileType) ++ File ++ ": " ++ Error;
+format_error({options, {socket_options, Option, Error}}) ->
+    lists:flatten(io_lib:format("Invalid transport socket option ~p: ~s", [Option, format_error(Error)]));
+format_error({options, {socket_options, Option}}) ->
+    lists:flatten(io_lib:format("Invalid socket option: ~p", [Option]));
+format_error({options, Options}) ->
+    lists:flatten(io_lib:format("Invalid TLS option: ~p", [Options]));
+
+format_error(Error) ->
+    case inet:format_error(Error) of
+        "unknown POSIX" ++ _ ->
+            unexpected_format(Error);
+        Other ->
+            Other
+    end.
+
+%%--------------------------------------------------------------------
+-spec random_bytes(integer()) -> binary().
 
+%%
+%% Description: Generates cryptographically secure random sequence if possible
+%% fallbacks on pseudo random function
+%%--------------------------------------------------------------------
 random_bytes(N) ->
-   tls:random_bytes(N).
+    try crypto:strong_rand_bytes(N) of
+	RandBytes ->
+	    RandBytes
+    catch
+	error:low_entropy ->
+	    crypto:rand_bytes(N)
+    end.
+
+%%%--------------------------------------------------------------
+%%% Internal functions
+%%%--------------------------------------------------------------------
+do_connect(Address, Port,
+	   #config{transport_info = CbInfo, inet_user = UserOpts, ssl = SslOpts,
+		   emulated = EmOpts, inet_ssl = SocketOpts, connection_cb = ConnetionCb},
+	   Timeout) ->
+    {Transport, _, _, _} = CbInfo,
+    try Transport:connect(Address, Port,  SocketOpts, Timeout) of
+	{ok, Socket} ->
+	    ssl_connection:connect(ConnetionCb, Address, Port, Socket, {SslOpts,EmOpts},
+				   self(), CbInfo, Timeout);
+	{error, Reason} ->
+	    {error, Reason}
+    catch
+	exit:{function_clause, _} ->
+	    {error, {options, {cb_info, CbInfo}}};
+	exit:badarg ->
+	    {error, {options, {socket_options, UserOpts}}};
+	exit:{badarg, _} ->
+	    {error, {options, {socket_options, UserOpts}}}
+    end.
+
+handle_options(Opts0, _Role) ->
+    Opts = proplists:expand([{binary, [{mode, binary}]},
+			     {list, [{mode, list}]}], Opts0),
+    ReuseSessionFun = fun(_, _, _, _) -> true end,
+
+    DefaultVerifyNoneFun =
+	{fun(_,{bad_cert, _}, UserState) ->
+		 {valid, UserState};
+	    (_,{extension, _}, UserState) ->
+		 {unknown, UserState};
+	    (_, valid, UserState) ->
+		 {valid, UserState};
+	    (_, valid_peer, UserState) ->
+		 {valid, UserState}
+	 end, []},
+
+    VerifyNoneFun = handle_option(verify_fun, Opts, DefaultVerifyNoneFun),
+
+    UserFailIfNoPeerCert = handle_option(fail_if_no_peer_cert, Opts, false),
+    UserVerifyFun = handle_option(verify_fun, Opts, undefined),
+    CaCerts = handle_option(cacerts, Opts, undefined),
+
+    {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun} =
+	%% Handle 0, 1, 2 for backwards compatibility
+	case proplists:get_value(verify, Opts, verify_none) of
+	    0 ->
+		{verify_none, false,
+		 ca_cert_default(verify_none, VerifyNoneFun, CaCerts), VerifyNoneFun};
+	    1  ->
+		{verify_peer, false,
+		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
+	    2 ->
+		{verify_peer, true,
+		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
+	    verify_none ->
+		{verify_none, false,
+		 ca_cert_default(verify_none, VerifyNoneFun, CaCerts), VerifyNoneFun};
+	    verify_peer ->
+		{verify_peer, UserFailIfNoPeerCert,
+		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
+	    Value ->
+		throw({error, {options, {verify, Value}}})
+	end,
+
+    CertFile = handle_option(certfile, Opts, <<>>),
+
+    Versions = case handle_option(versions, Opts, []) of
+		   [] ->
+		       tls_record:supported_protocol_versions();
+		   Vsns  ->
+		       [tls_record:protocol_version(Vsn) || Vsn <- Vsns]
+	       end,
+
+    SSLOptions = #ssl_options{
+		    versions   = Versions,
+		    verify     = validate_option(verify, Verify),
+		    verify_fun = VerifyFun,
+		    fail_if_no_peer_cert = FailIfNoPeerCert,
+		    verify_client_once =  handle_option(verify_client_once, Opts, false),
+		    depth      = handle_option(depth,  Opts, 1),
+		    cert       = handle_option(cert, Opts, undefined),
+		    certfile   = CertFile,
+		    key        = handle_option(key, Opts, undefined),
+		    keyfile    = handle_option(keyfile,  Opts, CertFile),
+		    password   = handle_option(password, Opts, ""),
+		    cacerts    = CaCerts,
+		    cacertfile = handle_option(cacertfile, Opts, CaCertDefault),
+		    dh         = handle_option(dh, Opts, undefined),
+		    dhfile     = handle_option(dhfile, Opts, undefined),
+		    user_lookup_fun = handle_option(user_lookup_fun, Opts, undefined),
+		    psk_identity = handle_option(psk_identity, Opts, undefined),
+		    srp_identity = handle_option(srp_identity, Opts, undefined),
+		    ciphers    = handle_cipher_option(proplists:get_value(ciphers, Opts, []), hd(Versions)),
+		    %% Server side option
+		    reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun),
+		    reuse_sessions = handle_option(reuse_sessions, Opts, true),
+		    secure_renegotiate = handle_option(secure_renegotiate, Opts, false),
+		    renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT),
+		    hibernate_after = handle_option(hibernate_after, Opts, undefined),
+		    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)),
+		    log_alert = handle_option(log_alert, Opts, true),
+		    server_name_indication = handle_option(server_name_indication, Opts, undefined),
+		    honor_cipher_order = handle_option(honor_cipher_order, Opts, false)
+		   },
+
+    CbInfo  = proplists:get_value(cb_info, Opts, {gen_tcp, tcp, tcp_closed, tcp_error}),
+    SslOptions = [protocol, versions, verify, verify_fun,
+		  fail_if_no_peer_cert, verify_client_once,
+		  depth, cert, certfile, key, keyfile,
+		  password, cacerts, cacertfile, dh, dhfile,
+		  user_lookup_fun, psk_identity, srp_identity, ciphers,
+		  reuse_session, reuse_sessions, ssl_imp,
+		  cb_info, renegotiate_at, secure_renegotiate, hibernate_after,
+		  erl_dist, next_protocols_advertised,
+		  client_preferred_next_protocols, log_alert,
+		  server_name_indication, honor_cipher_order],
+
+    SockOpts = lists:foldl(fun(Key, PropList) ->
+				   proplists:delete(Key, PropList)
+			   end, Opts, SslOptions),
+
+    {SSLsock, Emulated} = emulated_options(SockOpts),
+    ConnetionCb = connection_cb(Opts),
+
+    {ok, #config{ssl = SSLOptions, emulated = Emulated, inet_ssl = SSLsock,
+		 inet_user = SockOpts, transport_info = CbInfo, connection_cb = ConnetionCb
+		}}.
+
+handle_option(OptionName, Opts, Default) ->
+    validate_option(OptionName,
+		    proplists:get_value(OptionName, Opts, Default)).
+
+
+validate_option(versions, Versions)  ->
+    validate_versions(Versions, Versions);
+validate_option(verify, Value)
+  when Value == verify_none; Value == verify_peer ->
+    Value;
+validate_option(verify_fun, undefined)  ->
+    undefined;
+%% Backwards compatibility
+validate_option(verify_fun, Fun) when is_function(Fun) ->
+    {fun(_,{bad_cert, _} = Reason, OldFun) ->
+	     case OldFun([Reason]) of
+		 true ->
+		     {valid, OldFun};
+		 false ->
+		     {fail, Reason}
+	     end;
+	(_,{extension, _}, UserState) ->
+	     {unknown, UserState};
+	(_, valid, UserState) ->
+	     {valid, UserState};
+	(_, valid_peer, UserState) ->
+	     {valid, UserState}
+     end, Fun};
+validate_option(verify_fun, {Fun, _} = Value) when is_function(Fun) ->
+   Value;
+validate_option(fail_if_no_peer_cert, Value) when is_boolean(Value) ->
+    Value;
+validate_option(verify_client_once, Value) when is_boolean(Value) ->
+    Value;
+validate_option(depth, Value) when is_integer(Value),
+                                   Value >= 0, Value =< 255->
+    Value;
+validate_option(cert, Value) when Value == undefined;
+                                 is_binary(Value) ->
+    Value;
+validate_option(certfile, undefined = Value) ->
+    Value;
+validate_option(certfile, Value) when is_binary(Value) ->
+    Value;
+validate_option(certfile, Value) when is_list(Value) ->
+    binary_filename(Value);
+
+validate_option(key, undefined) ->
+    undefined;
+validate_option(key, {KeyType, Value}) when is_binary(Value),
+					    KeyType == rsa; %% Backwards compatibility
+					    KeyType == dsa; %% Backwards compatibility
+					    KeyType == 'RSAPrivateKey';
+					    KeyType == 'DSAPrivateKey';
+					    KeyType == 'PrivateKeyInfo' ->
+    {KeyType, Value};
+
+validate_option(keyfile, undefined) ->
+   <<>>;
+validate_option(keyfile, Value) when is_binary(Value) ->
+    Value;
+validate_option(keyfile, Value) when is_list(Value), Value =/= "" ->
+    binary_filename(Value);
+validate_option(password, Value) when is_list(Value) ->
+    Value;
+
+validate_option(cacerts, Value) when Value == undefined;
+				     is_list(Value) ->
+    Value;
+%% 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_binary(Value) ->
+    Value;
+validate_option(cacertfile, Value) when is_list(Value), Value =/= ""->
+    binary_filename(Value);
+validate_option(dh, Value) when Value == undefined;
+				is_binary(Value) ->
+    Value;
+validate_option(dhfile, undefined = Value)  ->
+    Value;
+validate_option(dhfile, Value) when is_binary(Value) ->
+    Value;
+validate_option(dhfile, Value) when is_list(Value), Value =/= "" ->
+    binary_filename(Value);
+validate_option(psk_identity, undefined) ->
+    undefined;
+validate_option(psk_identity, Identity)
+  when is_list(Identity), Identity =/= "", length(Identity) =< 65535 ->
+    binary_filename(Identity);
+validate_option(user_lookup_fun, undefined) ->
+    undefined;
+validate_option(user_lookup_fun, {Fun, _} = Value) when is_function(Fun, 3) ->
+   Value;
+validate_option(srp_identity, undefined) ->
+    undefined;
+validate_option(srp_identity, {Username, Password})
+  when is_list(Username), is_list(Password), Username =/= "", length(Username) =< 255 ->
+    {unicode:characters_to_binary(Username),
+     unicode:characters_to_binary(Password)};
+
+validate_option(reuse_session, Value) when is_function(Value) ->
+    Value;
+validate_option(reuse_sessions, Value) when is_boolean(Value) ->
+    Value;
+
+validate_option(secure_renegotiate, Value) when is_boolean(Value) ->
+    Value;
+validate_option(renegotiate_at, Value) when is_integer(Value) ->
+    erlang:min(Value, ?DEFAULT_RENEGOTIATE_AT);
+
+validate_option(hibernate_after, undefined) ->
+    undefined;
+validate_option(hibernate_after, Value) when is_integer(Value), Value >= 0 ->
+    Value;
+validate_option(erl_dist,Value) when is_boolean(Value) ->
+    Value;
+validate_option(client_preferred_next_protocols = Opt, {Precedence, PreferredProtocols} = Value)
+  when is_list(PreferredProtocols) ->
+    case tls_record:highest_protocol_version([]) of
+	{3,0} ->
+	    throw({error, {options, {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 tls_record:highest_protocol_version([]) of
+	{3,0} ->
+	    throw({error, {options, {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(log_alert, Value) when is_boolean(Value) ->
+    Value;
+validate_option(next_protocols_advertised = Opt, Value) when is_list(Value) ->
+    case tls_record:highest_protocol_version([]) of
+	{3,0} ->
+	    throw({error, {options, {not_supported_in_sslv3, {Opt, Value}}}});
+	_ ->
+	    validate_binary_list(next_protocols_advertised, Value),
+	    Value
+    end;
+
+validate_option(next_protocols_advertised, undefined) ->
+    undefined;
+validate_option(server_name_indication, Value) when is_list(Value) ->
+    Value;
+validate_option(server_name_indication, disable) ->
+    disable;
+validate_option(server_name_indication, undefined) ->
+    undefined;
+validate_option(honor_cipher_order, Value) when is_boolean(Value) ->
+    Value;
+validate_option(Opt, Value) ->
+    throw({error, {options, {Opt, Value}}}).
+
+validate_npn_ordering(client) ->
+    ok;
+validate_npn_ordering(server) ->
+    ok;
+validate_npn_ordering(Value) ->
+    throw({error, {options, {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, {options, {Opt, {invalid_protocol, Bin}}}})
+        end, List).
+
+validate_versions([], Versions) ->
+    Versions;
+validate_versions([Version | Rest], Versions) when Version == 'tlsv1.2';
+                                                   Version == 'tlsv1.1';
+                                                   Version == tlsv1;
+                                                   Version == sslv3 ->
+    validate_versions(Rest, Versions);
+validate_versions([Ver| _], Versions) ->
+    throw({error, {options, {Ver, {versions, Versions}}}}).
+
+validate_inet_option(mode, Value)
+  when Value =/= list, Value =/= binary ->
+    throw({error, {options, {mode,Value}}});
+validate_inet_option(packet, Value)
+  when not (is_atom(Value) orelse is_integer(Value)) ->
+    throw({error, {options, {packet,Value}}});
+validate_inet_option(packet_size, Value)
+  when not is_integer(Value) ->
+    throw({error, {options, {packet_size,Value}}});
+validate_inet_option(header, Value)
+  when not is_integer(Value) ->
+    throw({error, {options, {header,Value}}});
+validate_inet_option(active, Value)
+  when Value =/= true, Value =/= false, Value =/= once ->
+    throw({error, {options, {active,Value}}});
+validate_inet_option(_, _) ->
+    ok.
+
+%% The option cacerts overrides cacertsfile
+ca_cert_default(_,_, [_|_]) ->
+    undefined;
+ca_cert_default(verify_none, _, _) ->
+    undefined;
+ca_cert_default(verify_peer, {Fun,_}, _) when is_function(Fun) ->
+    undefined;
+%% Server that wants to verify_peer and has no verify_fun must have
+%% some trusted certs.
+ca_cert_default(verify_peer, undefined, _) ->
+    "".
+
+emulated_options() ->
+    [mode, packet, active, header, packet_size].
+
+internal_inet_values() ->
+    [{packet_size,0},{packet, 0},{header, 0},{active, false},{mode,binary}].
+
+socket_options(InetValues) ->
+    #socket_options{
+		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)
+	       }.
+
+emulated_options(Opts) ->
+    emulated_options(Opts, internal_inet_values(), #socket_options{}).
+
+emulated_options([{mode,Opt}|Opts], Inet, Emulated) ->
+    validate_inet_option(mode,Opt),
+    emulated_options(Opts, Inet, Emulated#socket_options{mode=Opt});
+emulated_options([{header,Opt}|Opts], Inet, Emulated) ->
+    validate_inet_option(header,Opt),
+    emulated_options(Opts, Inet, Emulated#socket_options{header=Opt});
+emulated_options([{active,Opt}|Opts], Inet, Emulated) ->
+    validate_inet_option(active,Opt),
+    emulated_options(Opts, Inet, Emulated#socket_options{active=Opt});
+emulated_options([{packet,Opt}|Opts], Inet, Emulated) ->
+    validate_inet_option(packet,Opt),
+    emulated_options(Opts, Inet, Emulated#socket_options{packet=Opt});
+emulated_options([{packet_size,Opt}|Opts], Inet, Emulated) ->
+    validate_inet_option(packet_size,Opt),
+    emulated_options(Opts, Inet, Emulated#socket_options{packet_size=Opt});
+emulated_options([Opt|Opts], Inet, Emulated) ->
+    emulated_options(Opts, [Opt|Inet], Emulated);
+emulated_options([], Inet,Emulated) ->
+    {Inet, Emulated}.
+
+handle_cipher_option(Value, Version)  when is_list(Value) ->
+    try binary_cipher_suites(Version, Value) of
+	Suites ->
+	    Suites
+    catch
+	exit:_ ->
+	    throw({error, {options, {ciphers, Value}}});
+	error:_->
+	    throw({error, {options, {ciphers, Value}}})
+    end.
+binary_cipher_suites(Version, []) -> %% Defaults to all supported suits
+    ssl_cipher:suites(Version);
+binary_cipher_suites(Version, [{_,_,_,_}| _] = Ciphers0) -> %% Backwards compatibility
+    Ciphers = [{KeyExchange, Cipher, Hash} || {KeyExchange, Cipher, Hash, _} <- Ciphers0],
+    binary_cipher_suites(Version, Ciphers);
+binary_cipher_suites(Version, [{_,_,_}| _] = Ciphers0) ->
+    Ciphers = [ssl_cipher:suite(C) || C <- Ciphers0],
+    binary_cipher_suites(Version, Ciphers);
+
+binary_cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0) ->
+    Supported0 = ssl_cipher:suites(Version)
+	++ ssl_cipher:anonymous_suites()
+	++ ssl_cipher:psk_suites(Version)
+	++ ssl_cipher:srp_suites(),
+    Supported = ssl_cipher:filter_suites(Supported0),
+    case [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported)] of
+	[] ->
+	    Supported;  %% Defaults to all supported suits
+	Ciphers ->
+	    Ciphers
+    end;
+binary_cipher_suites(Version, [Head | _] = Ciphers0) when is_list(Head) ->
+    %% Format: ["RC4-SHA","RC4-MD5"]
+    Ciphers = [ssl_cipher:openssl_suite(C) || C <- Ciphers0],
+    binary_cipher_suites(Version, Ciphers);
+binary_cipher_suites(Version, Ciphers0)  ->
+    %% Format: "RC4-SHA:RC4-MD5"
+    Ciphers = [ssl_cipher:openssl_suite(C) || C <- string:tokens(Ciphers0, ":")],
+    binary_cipher_suites(Version, Ciphers).
+
+unexpected_format(Error) ->
+    lists:flatten(io_lib:format("Unexpected error: ~p", [Error])).
+
+file_error_format({error, Error})->
+    case file:format_error(Error) of
+	"unknown POSIX error" ->
+	    "decoding error";
+	Str ->
+	    Str
+    end;
+file_error_format(_) ->
+    "decoding error".
+
+file_desc(cacertfile) ->
+    "Invalid CA certificate file ";
+file_desc(certfile) ->
+    "Invalid certificate file ";
+file_desc(keyfile) ->
+    "Invalid key file ";
+file_desc(dhfile) ->
+    "Invalid DH params file ".
+
+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.
+
+connection_cb(tls) ->
+    tls_connection;
+connection_cb(dtls) ->
+    dtls_connection;
+connection_cb(Opts) ->
+   connection_cb(proplists:get_value(protocol, Opts, tls)).
+
+connection_sup(tls_connection) ->
+    tls_connection_sup;
+connection_sup(dtls_connection) ->
+    dtls_connection_sup.
 
+binary_filename(FileName) ->
+    Enc = file:native_name_encoding(),
+    unicode:characters_to_binary(FileName, unicode, Enc).
diff --git a/lib/ssl/src/ssl_alert.erl b/lib/ssl/src/ssl_alert.erl
index 1810043dfb..5c842b4d19 100644
--- a/lib/ssl/src/ssl_alert.erl
+++ b/lib/ssl/src/ssl_alert.erl
@@ -29,12 +29,23 @@
 
 -include("ssl_alert.hrl").
 -include("ssl_record.hrl").
+-include("ssl_internal.hrl").
 
--export([alert_txt/1, reason_code/2]).
+-export([encode/3, alert_txt/1, reason_code/2]).
 
 %%====================================================================
 %% Internal application API
 %%====================================================================
+
+%%--------------------------------------------------------------------
+-spec encode(#alert{}, tls_version(), #connection_states{}) -> 
+		    {iolist(), #connection_states{}}.
+%%
+%% Description: 
+%%--------------------------------------------------------------------
+encode(#alert{} = Alert, Version, ConnectionStates) ->
+    ssl_record:encode_alert_record(Alert, Version, ConnectionStates).
+
 %%--------------------------------------------------------------------
 -spec reason_code(#alert{}, client | server) -> closed | {essl, string()}.
 %%
diff --git a/lib/ssl/src/ssl_api.hrl b/lib/ssl/src/ssl_api.hrl
new file mode 100644
index 0000000000..607991750f
--- /dev/null
+++ b/lib/ssl/src/ssl_api.hrl
@@ -0,0 +1,66 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The 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%
+%%
+
+-ifndef(ssl_api).
+-define(ssl_api, true).
+
+-include("ssl_cipher.hrl").
+
+%% Visible in API
+-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, sslsocket/0]).
+
+
+%% Looks like it does for backwards compatibility reasons
+-record(sslsocket, {fd = nil, pid = nil}).
+
+
+-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().
+-type socket_listen_option()     :: gen_tcp:listen_option().
+
+-type ssl_option()    :: {verify, verify_type()} |
+			{verify_fun, {fun(), InitialUserState::term()}} |
+                        {fail_if_no_peer_cert, boolean()} | {depth, integer()} |
+                        {cert, Der::binary()} | {certfile, path()} | {key, Der::binary()} |
+                        {keyfile, path()} | {password, string()} | {cacerts, [Der::binary()]} |
+                        {cacertfile, path()} | {dh, Der::binary()} | {dhfile, path()} |
+                        {user_lookup_fun, {fun(), InitialUserState::term()}} |
+                        {psk_identity, string()} |
+                        {srp_identity, {string(), string()}} |
+                        {ciphers, ciphers()} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} |
+                        {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().
+-type ciphers()      :: [erl_cipher_suite()] |
+			string(). % (according to old API)
+-type ssl_imp()      :: new | old.
+
+-type transport_option() :: {cb_info, {CallbackModule::atom(), DataTag::atom(),
+				       ClosedTag::atom(), ErrTag::atom()}}.
+-type prf_random() :: client_random | server_random.
+
+-endif. % -ifdef(ssl_api).
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl
index ec5d793d65..b2077c662a 100644
--- a/lib/ssl/src/ssl_cipher.erl
+++ b/lib/ssl/src/ssl_cipher.erl
@@ -32,16 +32,26 @@
 -include("ssl_alert.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export([security_parameters/3, suite_definition/1,
+-export([security_parameters/2, security_parameters/3, suite_definition/1,
 	 decipher/5, cipher/5,
-	 suite/1, suites/1, anonymous_suites/0, psk_suites/1, srp_suites/0,
+	 suite/1, suites/1, ec_keyed_suites/0, anonymous_suites/0, psk_suites/1, srp_suites/0,
 	 openssl_suite/1, openssl_suite_name/1, filter/2, filter_suites/1,
-	 hash_algorithm/1, sign_algorithm/1]).
+	 hash_algorithm/1, sign_algorithm/1, is_acceptable_hash/2]).
 
 -compile(inline).
 
 %%--------------------------------------------------------------------
--spec security_parameters(tls_version(), cipher_suite(), #security_parameters{}) ->
+-spec security_parameters(cipher_suite(), #security_parameters{}) ->
+				 #security_parameters{}.
+%% Only security_parameters/2 should call security_parameters/3 with undefined as
+%% first argument.
+%%--------------------------------------------------------------------
+
+security_parameters(?TLS_NULL_WITH_NULL_NULL = CipherSuite, SecParams) ->
+    security_parameters(undefined, CipherSuite, SecParams).
+
+%%--------------------------------------------------------------------
+-spec security_parameters(tls_version() | undefined, cipher_suite(), #security_parameters{}) ->
 				 #security_parameters{}.
 %%
 %% Description: Returns a security parameters record where the
@@ -62,7 +72,7 @@ security_parameters(Version, CipherSuite, SecParams) ->
       hash_size = hash_size(Hash)}.
 
 %%--------------------------------------------------------------------
--spec cipher(cipher_enum(), #cipher_state{}, binary(), binary(), tls_version()) ->
+-spec cipher(cipher_enum(), #cipher_state{}, binary(), iolist(), tls_version()) ->
 		    {binary(), #cipher_state{}}. 
 %%
 %% Description: Encrypts the data and the MAC using chipher described
@@ -195,9 +205,9 @@ block_decipher(Fun, #cipher_state{key=Key, iv=IV} = CipherState0,
 %% Description: Returns a list of supported cipher suites.
 %%--------------------------------------------------------------------
 suites({3, 0}) ->
-    ssl_ssl3:suites();
+    ssl_v3:suites();
 suites({3, N}) ->
-    ssl_tls1:suites(N).
+    tls_v1:suites(N).
 
 %%--------------------------------------------------------------------
 -spec anonymous_suites() -> [cipher_suite()].
@@ -1009,6 +1019,7 @@ filter(DerCert, Ciphers) ->
 		filter_keyuse(OtpCert, (Ciphers -- rsa_keyed_suites()) -- dsa_signed_suites(),
 			      [], ecdhe_ecdsa_suites())
 	end,
+
     case public_key:pkix_sign_types(SigAlg#'SignatureAlgorithm'.algorithm) of
 	{_, rsa} ->
 	    Ciphers1 -- ecdsa_signed_suites();
@@ -1191,15 +1202,15 @@ hash_size(md5) ->
 hash_size(sha) ->
     20;
 %% Uncomment when adding cipher suite that needs it
-%% hash_size(sha224) ->
-%%     28;
+%hash_size(sha224) ->
+%    28;
 hash_size(sha256) ->
     32;
 hash_size(sha384) ->
     48.
 %% Uncomment when adding cipher suite that needs it
-%% hash_size(sha512) ->
-%%     64.
+%hash_size(sha512) ->
+%    64.
 
 %% RFC 5246: 6.2.3.2.  CBC Block Cipher
 %%
@@ -1259,15 +1270,15 @@ generic_stream_cipher_from_bin(T, HashSz) ->
 %% SSL 3.0 and TLS 1.0 as it is not strictly required and breaks
 %% interopability with for instance Google. 
 is_correct_padding(#generic_block_cipher{padding_length = Len,
-										 padding = Padding}, {3, N})
+					 padding = Padding}, {3, N})
   when N == 0; N == 1 ->
     Len == byte_size(Padding); 
 %% Padding must be check in TLS 1.1 and after  
 is_correct_padding(#generic_block_cipher{padding_length = Len,
-										 padding = Padding}, _) ->
+					 padding = Padding}, _) ->
     Len == byte_size(Padding) andalso
 		list_to_binary(lists:duplicate(Len, Len)) == Padding.
-										      
+
 get_padding(Length, BlockSize) ->
     get_padding_aux(BlockSize, Length rem BlockSize).
 
@@ -1291,7 +1302,7 @@ next_iv(Bin, IV) ->
 rsa_signed_suites() ->
     dhe_rsa_suites() ++ rsa_suites() ++
 	psk_rsa_suites() ++ srp_rsa_suites() ++
-	ecdh_rsa_suites().
+	ecdh_rsa_suites() ++ ecdhe_rsa_suites().
 
 rsa_keyed_suites() ->
     dhe_rsa_suites() ++ rsa_suites() ++
diff --git a/lib/ssl/src/ssl_cipher.hrl b/lib/ssl/src/ssl_cipher.hrl
index c7c71ee1a7..62a5269def 100644
--- a/lib/ssl/src/ssl_cipher.hrl
+++ b/lib/ssl/src/ssl_cipher.hrl
@@ -28,7 +28,8 @@
 
 -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 | ssh224 | sha256 | sha384 | sha512.
+-type hash()              :: null | sha | md5 | sha224 | sha256 | sha384 | sha512.
+-type key_algo()          :: null | rsa | dhe_rsa | dhe_dss | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon.
 -type erl_cipher_suite()  :: {key_algo(), cipher(), hash()}.
 -type int_cipher_suite()  :: {key_algo(), cipher(), hash(), hash() | default_prf}.
 -type cipher_suite()      :: binary().
diff --git a/lib/ssl/src/ssl_config.erl b/lib/ssl/src/ssl_config.erl
new file mode 100644
index 0000000000..545b8aa0f6
--- /dev/null
+++ b/lib/ssl/src/ssl_config.erl
@@ -0,0 +1,156 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%%
+%% The 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_config).
+
+-include("ssl_internal.hrl").
+-include("ssl_connection.hrl").
+-include_lib("public_key/include/public_key.hrl"). 
+
+-export([init/2]).
+
+init(SslOpts, Role) ->
+    
+    init_manager_name(SslOpts#ssl_options.erl_dist),
+
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, OwnCert} 
+	= init_certificates(SslOpts, Role),
+    PrivateKey =
+	init_private_key(PemCacheHandle, SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile,
+			 SslOpts#ssl_options.password, Role),
+    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:manager_name(normal));
+init_manager_name(true) ->
+    put(ssl_manager, ssl_manager:manager_name(dist)).
+
+init_certificates(#ssl_options{cacerts = CaCerts,
+			       cacertfile = CACertFile,
+			       certfile = CertFile,
+			       cert = Cert}, Role) ->
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle} =
+	try 
+	    Certs = case CaCerts of
+			undefined ->
+			    CACertFile;
+			_ ->
+			    {der, CaCerts}
+		    end,
+	    {ok, _, _, _, _, _} = ssl_manager:connection_init(Certs, Role)
+	catch
+	    _:Reason ->
+		file_error(CACertFile, {cacertfile, Reason})
+	end,
+    init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, 
+		      CacheHandle, CertFile, Role).
+
+init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, <<>>, _) ->
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, undefined};
+
+init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, 
+		  CacheHandle, CertFile, client) ->
+    try 
+	%% Ignoring potential proxy-certificates see: 
+	%% http://dev.globus.org/wiki/Security/ProxyFileFormat
+	[OwnCert|_] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle),
+	{ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, OwnCert}
+    catch _Error:_Reason  ->
+	    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, undefined}
+    end;
+
+init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, 
+		  PemCacheHandle, CacheRef, CertFile, server) ->
+    try
+	[OwnCert|_] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle),
+	{ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, OwnCert}
+    catch
+	_:Reason ->
+	    file_error(CertFile, {certfile, Reason})	    
+    end;
+init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, _, _) ->
+    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, Cert}.
+
+init_private_key(_, undefined, <<>>, _Password, _Client) ->
+    undefined;
+init_private_key(DbHandle, undefined, KeyFile, Password, _) ->
+    try
+	{ok, List} = ssl_manager:cache_pem_file(KeyFile, DbHandle),
+	[PemEntry] = [PemEntry || PemEntry = {PKey, _ , _} <- List,
+				  PKey =:= 'RSAPrivateKey' orelse
+				      PKey =:= 'DSAPrivateKey' orelse
+				      PKey =:= 'ECPrivateKey' orelse
+				      PKey =:= 'PrivateKeyInfo'
+		     ],
+	private_key(public_key:pem_entry_decode(PemEntry, Password))
+    catch 
+	_:Reason ->
+	    file_error(KeyFile, {keyfile, Reason}) 
+    end;
+
+init_private_key(_,{Asn1Type, PrivateKey},_,_,_) ->
+    private_key(init_private_key(Asn1Type, PrivateKey)).
+
+init_private_key(Asn1Type, PrivateKey) ->
+    public_key:der_decode(Asn1Type, PrivateKey).
+
+private_key(#'PrivateKeyInfo'{privateKeyAlgorithm =
+				 #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?'rsaEncryption'},
+			     privateKey = Key}) ->
+    public_key:der_decode('RSAPrivateKey', iolist_to_binary(Key));
+
+private_key(#'PrivateKeyInfo'{privateKeyAlgorithm =
+				 #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?'id-dsa'},
+			     privateKey = Key}) ->
+    public_key:der_decode('DSAPrivateKey', iolist_to_binary(Key));
+
+private_key(Key) ->
+    Key.
+
+-spec(file_error(_,_) -> no_return()).
+file_error(File, Throw) ->
+    case Throw of
+	{Opt,{badmatch, {error, {badmatch, Error}}}} ->
+	    throw({options, {Opt, binary_to_list(File), Error}});
+	_ ->
+	    throw(Throw)
+    end.
+
+init_diffie_hellman(_,Params, _,_) when is_binary(Params)->
+    public_key:der_decode('DHParameter', Params);
+init_diffie_hellman(_,_,_, client) ->
+    undefined;
+init_diffie_hellman(_,_,undefined, _) ->
+    ?DEFAULT_DIFFIE_HELLMAN_PARAMS;
+init_diffie_hellman(DbHandle,_, DHParamFile, server) ->
+    try
+	{ok, List} = ssl_manager:cache_pem_file(DHParamFile,DbHandle),
+	case [Entry || Entry = {'DHParameter', _ , _} <- List] of
+	    [Entry] ->
+		public_key:pem_entry_decode(Entry);
+	    [] ->
+		?DEFAULT_DIFFIE_HELLMAN_PARAMS
+	end
+    catch
+	_:Reason ->
+	    file_error(DHParamFile, {dhfile, Reason}) 
+    end.
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
new file mode 100644
index 0000000000..e283e6079e
--- /dev/null
+++ b/lib/ssl/src/ssl_connection.erl
@@ -0,0 +1,1856 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
+%%
+%% The 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: Common handling of a TLS/SSL/DTLS connection, see also
+%% tls_connection.erl and dtls_connection.erl
+%%----------------------------------------------------------------------
+
+-module(ssl_connection).
+
+-include("ssl_api.hrl").
+-include("ssl_connection.hrl").
+-include("ssl_handshake.hrl").
+-include("ssl_alert.hrl").
+-include("ssl_record.hrl").
+-include("ssl_cipher.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_srp.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%% Setup
+-export([connect/8, ssl_accept/7, handshake/2,
+	 socket_control/4]).
+
+%% User Events 
+-export([send/2, recv/3, close/1, shutdown/2,
+	 new_user/2, get_opts/2, set_opts/2, info/1, session_info/1, 
+	 peer_certificate/1, renegotiation/1, negotiated_next_protocol/1, prf/5	
+	]).
+
+-export([handle_session/6]).
+
+%% SSL FSM state functions 
+-export([hello/3, abbreviated/3, certify/3, cipher/3, connection/3]).
+%% SSL all state functions 
+-export([handle_sync_event/4, handle_info/3, terminate/3]).
+
+%%====================================================================
+%% Internal application API
+%%====================================================================	     
+%%--------------------------------------------------------------------
+-spec connect(tls_connection | dtls_connection,
+	      host(), inet:port_number(), port(), {#ssl_options{}, #socket_options{}},
+	      pid(), tuple(), timeout()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
+%%
+%% Description: Connect to an ssl server.
+%%--------------------------------------------------------------------
+connect(Connection, Host, Port, Socket, Options, User, CbInfo, Timeout) ->
+    try Connection:start_fsm(client, Host, Port, Socket, Options, User, CbInfo,
+			     Timeout)
+    catch
+	exit:{noproc, _} ->
+	    {error, ssl_not_started}
+    end.
+%%--------------------------------------------------------------------
+-spec ssl_accept(tls_connection | dtls_connection,
+		 inet:port_number(), port(), {#ssl_options{}, #socket_options{}},
+				      pid(), tuple(), timeout()) ->
+    {ok, #sslsocket{}} | {error, reason()}.
+%%
+%% Description: Performs accept on an ssl listen socket. e.i. performs
+%%              ssl handshake. 
+%%--------------------------------------------------------------------
+ssl_accept(Connection, Port, Socket, Opts, User, CbInfo, Timeout) ->
+    try Connection:start_fsm(server, "localhost", Port, Socket, Opts, User, 
+		  CbInfo, Timeout)
+    catch
+	exit:{noproc, _} ->
+	    {error, ssl_not_started}
+    end.	
+
+%%--------------------------------------------------------------------
+-spec handshake(#sslsocket{}, timeout()) ->  ok | {error, reason()}.
+%%
+%% Description: Starts ssl handshake. 
+%%--------------------------------------------------------------------
+handshake(#sslsocket{pid = Pid}, Timeout) ->  
+    case sync_send_all_state_event(Pid, {start, Timeout}) of
+	connected ->
+	    ok;
+ 	Error ->
+	    Error
+    end.
+%--------------------------------------------------------------------
+-spec socket_control(tls_connection | dtls_connection, port(), pid(), atom()) -> 
+    {ok, #sslsocket{}} | {error, reason()}.  
+%%
+%% Description: Set the ssl process to own the accept socket
+%%--------------------------------------------------------------------	    
+socket_control(Connection, Socket, Pid, Transport) ->
+    case Transport:controlling_process(Socket, Pid) of
+	ok ->
+	    {ok, ssl_socket:socket(Pid, Transport, Socket, Connection)};
+	{error, Reason}	->
+	    {error, Reason}
+    end.
+
+%%--------------------------------------------------------------------
+-spec send(pid(), iodata()) -> ok | {error, reason()}.
+%%
+%% Description: Sends data over the ssl connection
+%%--------------------------------------------------------------------
+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)}).
+
+%%--------------------------------------------------------------------
+-spec recv(pid(), integer(), timeout()) ->  
+    {ok, binary() | list()} | {error, reason()}.
+%%
+%% Description:  Receives data when active = false
+%%--------------------------------------------------------------------
+recv(Pid, Length, Timeout) -> 
+    sync_send_all_state_event(Pid, {recv, Length, Timeout}).
+
+%%--------------------------------------------------------------------
+-spec close(pid()) -> ok | {error, reason()}.  
+%%
+%% Description:  Close an ssl connection
+%%--------------------------------------------------------------------
+close(ConnectionPid) ->
+    case sync_send_all_state_event(ConnectionPid, close) of
+	{error, closed} ->
+	    ok;
+	Other ->
+	    Other
+    end.
+
+%%--------------------------------------------------------------------
+-spec shutdown(pid(), atom()) -> ok | {error, reason()}.  
+%%
+%% Description: Same as gen_tcp:shutdown/2
+%%--------------------------------------------------------------------
+shutdown(ConnectionPid, How) ->
+    sync_send_all_state_event(ConnectionPid, {shutdown, How}).
+
+%%--------------------------------------------------------------------
+-spec new_user(pid(), pid()) ->  ok | {error, reason()}.
+%%
+%% Description:  Changes process that receives the messages when active = true
+%% or once. 
+%%--------------------------------------------------------------------
+new_user(ConnectionPid, User) ->
+    sync_send_all_state_event(ConnectionPid, {new_user, User}).
+
+%%--------------------------------------------------------------------
+-spec negotiated_next_protocol(pid()) -> {ok, binary()} | {error, reason()}.
+%%
+%% Description:  Returns the negotiated protocol
+%%--------------------------------------------------------------------
+negotiated_next_protocol(ConnectionPid) ->
+    sync_send_all_state_event(ConnectionPid, negotiated_next_protocol).
+
+%%--------------------------------------------------------------------
+-spec get_opts(pid(), list()) -> {ok, list()} | {error, reason()}.    
+%%
+%% Description: Same as inet:getopts/2
+%%--------------------------------------------------------------------
+get_opts(ConnectionPid, OptTags) ->
+    sync_send_all_state_event(ConnectionPid, {get_opts, OptTags}).
+%%--------------------------------------------------------------------
+-spec set_opts(pid(), list()) -> ok | {error, reason()}. 
+%%
+%% Description:  Same as inet:setopts/2
+%%--------------------------------------------------------------------
+set_opts(ConnectionPid, Options) ->
+    sync_send_all_state_event(ConnectionPid, {set_opts, Options}).
+
+%%--------------------------------------------------------------------
+-spec info(pid()) ->  {ok, {atom(), tuple()}} | {error, reason()}. 
+%%
+%% Description:  Returns ssl protocol and cipher used for the connection
+%%--------------------------------------------------------------------
+info(ConnectionPid) ->
+    sync_send_all_state_event(ConnectionPid, info). 
+
+%%--------------------------------------------------------------------
+-spec session_info(pid()) -> {ok, list()} | {error, reason()}. 
+%%
+%% Description:  Returns info about the ssl session
+%%--------------------------------------------------------------------
+session_info(ConnectionPid) ->
+    sync_send_all_state_event(ConnectionPid, session_info). 
+
+%%--------------------------------------------------------------------
+-spec peer_certificate(pid()) -> {ok, binary()| undefined} | {error, reason()}.
+%%
+%% Description: Returns the peer cert
+%%--------------------------------------------------------------------
+peer_certificate(ConnectionPid) ->
+    sync_send_all_state_event(ConnectionPid, peer_certificate). 
+
+%%--------------------------------------------------------------------
+-spec renegotiation(pid()) -> ok | {error, reason()}.
+%%
+%% Description: Starts a renegotiation of the ssl session.
+%%--------------------------------------------------------------------
+renegotiation(ConnectionPid) ->
+    sync_send_all_state_event(ConnectionPid, renegotiate). 
+
+%%--------------------------------------------------------------------
+-spec prf(pid(), binary() | 'master_secret', binary(),
+	  binary() | ssl:prf_random(), non_neg_integer()) ->
+		 {ok, binary()} | {error, reason()} | {'EXIT', term()}.
+%%
+%% Description: use a ssl sessions TLS PRF to generate key material
+%%--------------------------------------------------------------------
+prf(ConnectionPid, Secret, Label, Seed, WantedLength) ->
+    sync_send_all_state_event(ConnectionPid, {prf, Secret, Label, Seed, WantedLength}).
+
+
+handle_session(#server_hello{cipher_suite = CipherSuite,
+			     compression_method = Compression}, 
+	       Version, NewId, ConnectionStates, NextProtocol, 
+	       #state{session = #session{session_id = OldId},
+		      negotiated_version = ReqVersion} = State0) ->
+    {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,
+				 negotiated_version = Version,
+			 connection_states = ConnectionStates,
+			 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#state{connection_states = ConnectionStates});
+	false ->
+	    handle_resumed_session(NewId,
+				   State#state{connection_states = ConnectionStates})
+    end.
+	
+%%--------------------------------------------------------------------
+-spec hello(start | #hello_request{} | #server_hello{} | term(),
+	    #state{}, tls_connection | dtls_connection) ->
+		   gen_fsm_state_return().
+%%--------------------------------------------------------------------
+hello(start, #state{role = server} = State0, Connection) ->
+    {Record, State} = Connection:next_record(State0),
+    Connection:next_state(hello, hello, Record, State);
+
+hello(#hello_request{}, #state{role = client} = State0, Connection) ->
+    {Record, State} = Connection:next_record(State0),
+    Connection:next_state(hello, hello, Record, State);
+
+hello({common_client_hello, Type, ServerHelloExt, HashSign},
+      #state{session = #session{cipher_suite = CipherSuite},
+	     negotiated_version = Version} = State, Connection) ->
+    {KeyAlg, _, _, _} = ssl_cipher:suite_definition(CipherSuite),
+    NegotiatedHashSign = negotiated_hashsign(HashSign, KeyAlg, Version),
+    do_server_hello(Type, ServerHelloExt,
+		    State#state{hashsign_algorithm = NegotiatedHashSign}, Connection);
+
+hello(timeout, State, _) ->
+    {next_state, hello, State, hibernate};
+
+hello(Msg, State, Connection) ->
+    Connection:handle_unexpected_message(Msg, hello, State).
+
+%%--------------------------------------------------------------------
+-spec abbreviated(#hello_request{} | #finished{} | term(),
+		  #state{}, tls_connection | dtls_connection) ->
+			 gen_fsm_state_return().
+%%--------------------------------------------------------------------
+abbreviated(#hello_request{}, State0, Connection) ->
+    {Record, State} = Connection:next_record(State0),
+    Connection:next_state(abbreviated, hello, Record, State);
+
+abbreviated(#finished{verify_data = Data} = Finished,
+	    #state{role = server,
+		   negotiated_version = Version,
+		   tls_handshake_history = Handshake,
+		   session = #session{master_secret = MasterSecret},
+		   connection_states = ConnectionStates0} =
+		State, Connection) ->
+    case ssl_handshake:verify_connection(Version, Finished, client,
+					 get_current_prf(ConnectionStates0, write),
+					 MasterSecret, Handshake) of
+        verified ->
+	    ConnectionStates =
+		ssl_record:set_client_verify_data(current_both, Data, ConnectionStates0),
+	    Connection:next_state_connection(abbreviated,
+					     ack_connection(
+					       State#state{connection_states = ConnectionStates}));
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, abbreviated, State)
+    end;
+
+abbreviated(#finished{verify_data = Data} = Finished,
+	    #state{role = client, tls_handshake_history = Handshake0,
+		   session = #session{master_secret = MasterSecret},
+		   negotiated_version = Version,
+		   connection_states = ConnectionStates0} = State0, Connection) ->
+    case ssl_handshake:verify_connection(Version, Finished, server,
+					 get_pending_prf(ConnectionStates0, write),
+					 MasterSecret, Handshake0) of
+        verified ->
+	    ConnectionStates1 =
+		ssl_record:set_server_verify_data(current_read, Data, ConnectionStates0),
+	    State =
+		finalize_handshake(State0#state{connection_states = ConnectionStates1},
+				   abbreviated, Connection),
+	    Connection:next_state_connection(abbreviated,
+					     ack_connection(State));
+        #alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, abbreviated, State0)
+    end;
+
+%% only allowed to send next_protocol message after change cipher spec
+%% & before finished message and it is not allowed during renegotiation
+abbreviated(#next_protocol{selected_protocol = SelectedProtocol},
+	    #state{role = server, expecting_next_protocol_negotiation = true} = State0,
+	    Connection) ->
+    {Record, State} = Connection:next_record(State0#state{next_protocol = SelectedProtocol}),
+    Connection:next_state(abbreviated, abbreviated, Record, State);
+
+abbreviated(timeout, State, _) ->
+    {next_state, abbreviated, State, hibernate };
+
+abbreviated(Msg, State, Connection) ->
+    Connection:handle_unexpected_message(Msg, abbreviated, State).
+
+%%--------------------------------------------------------------------
+-spec certify(#hello_request{} | #certificate{} |  #server_key_exchange{} |
+	      #certificate_request{} | #server_hello_done{} | #client_key_exchange{} | term(),
+	      #state{}, tls_connection | dtls_connection) ->
+		     gen_fsm_state_return().
+%%--------------------------------------------------------------------
+certify(#hello_request{}, State0, Connection) ->
+    {Record, State} = Connection:next_record(State0),
+    Connection:next_state(certify, hello, Record, State);
+
+certify(#certificate{asn1_certificates = []},
+	#state{role = server, negotiated_version = Version,
+	       ssl_options = #ssl_options{verify = verify_peer,
+					  fail_if_no_peer_cert = true}} =
+	    State, Connection) ->
+    Alert =  ?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE),
+    Connection:handle_own_alert(Alert, Version, certify, State);
+
+certify(#certificate{asn1_certificates = []},
+	#state{role = server,
+	       ssl_options = #ssl_options{verify = verify_peer,
+					  fail_if_no_peer_cert = false}} =
+	State0, Connection) ->
+    {Record, State} = Connection:next_record(State0#state{client_certificate_requested = false}),
+    Connection:next_state(certify, certify, Record, State);
+
+certify(#certificate{} = Cert,
+        #state{negotiated_version = Version,
+	       role = Role,
+	       cert_db = CertDbHandle,
+	       cert_db_ref = CertDbRef,
+	       ssl_options = Opts} = State, Connection) ->
+    case ssl_handshake:certify(Cert, CertDbHandle, CertDbRef, Opts#ssl_options.depth,
+			       Opts#ssl_options.verify,
+			       Opts#ssl_options.verify_fun, Role) of
+        {PeerCert, PublicKeyInfo} ->
+	    handle_peer_cert(Role, PeerCert, PublicKeyInfo,
+			     State#state{client_certificate_requested = false}, Connection);
+	#alert{} = Alert ->
+            Connection:handle_own_alert(Alert, Version, certify, State)
+    end;
+
+certify(#server_key_exchange{exchange_keys = Keys},
+        #state{role = client, negotiated_version = Version,
+	       key_algorithm = Alg,
+	       public_key_info = PubKeyInfo,
+	       connection_states = ConnectionStates} = State, Connection)
+  when Alg == dhe_dss; Alg == dhe_rsa;
+       Alg == ecdhe_rsa; Alg == ecdhe_ecdsa;
+       Alg == dh_anon; Alg == ecdh_anon;
+       Alg == psk; Alg == dhe_psk; Alg == rsa_psk;
+       Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
+
+    Params = ssl_handshake:decode_server_key(Keys, Alg, Version),
+    HashSign = negotiated_hashsign(Params#server_key_params.hashsign, Alg, Version),
+    case is_anonymous(Alg) of
+	true ->
+	    calculate_secret(Params#server_key_params.params,
+			     State#state{hashsign_algorithm = HashSign}, Connection);
+	false ->
+	    case  ssl_handshake:verify_server_key(Params, HashSign, ConnectionStates, Version, PubKeyInfo) of
+		true ->
+		    calculate_secret(Params#server_key_params.params,
+				     State#state{hashsign_algorithm = HashSign}, Connection);
+		false ->
+		    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
+	    end
+    end;
+
+certify(#server_key_exchange{} = Msg,
+        #state{role = client, key_algorithm = rsa} = State, Connection) ->
+    Connection:handle_unexpected_message(Msg, certify_server_keyexchange, State);
+
+certify(#certificate_request{hashsign_algorithms = HashSigns},
+	#state{session = #session{own_certificate = Cert}} = State0, Connection) ->
+    HashSign = ssl_handshake:select_hashsign(HashSigns, Cert),
+    {Record, State} = Connection:next_record(State0#state{client_certificate_requested = true}),
+    Connection:next_state(certify, certify, Record,
+			  State#state{cert_hashsign_algorithm = HashSign});
+
+%% PSK and RSA_PSK might bypass the Server-Key-Exchange
+certify(#server_hello_done{},
+	#state{session = #session{master_secret = undefined},
+	       negotiated_version = Version,
+	       psk_identity = PSKIdentity,
+	       ssl_options = #ssl_options{user_lookup_fun = PSKLookup},
+	       premaster_secret = undefined,
+	       role = client,
+	       key_algorithm = Alg} = State0, Connection)
+  when Alg == psk ->
+    case ssl_handshake:premaster_secret({Alg, PSKIdentity}, PSKLookup) of
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, certify, State0);
+	PremasterSecret ->
+	    State = master_secret(PremasterSecret,
+				  State0#state{premaster_secret = PremasterSecret}),
+	    client_certify_and_key_exchange(State, Connection)
+    end;
+
+certify(#server_hello_done{},
+	#state{session = #session{master_secret = undefined},
+	       ssl_options = #ssl_options{user_lookup_fun = PSKLookup},
+	       negotiated_version = {Major, Minor},
+	       psk_identity = PSKIdentity,
+	       premaster_secret = undefined,
+	       role = client,
+	       key_algorithm = Alg} = State0, Connection)
+  when Alg == rsa_psk ->
+    Rand = ssl:random_bytes(?NUM_OF_PREMASTERSECRET_BYTES-2),
+    RSAPremasterSecret = <<?BYTE(Major), ?BYTE(Minor), Rand/binary>>,
+    case ssl_handshake:premaster_secret({Alg, PSKIdentity}, PSKLookup, RSAPremasterSecret) of
+	#alert{} = Alert ->
+	    Alert;
+	PremasterSecret ->
+	    State = master_secret(PremasterSecret, State0#state{premaster_secret = RSAPremasterSecret}),
+	    client_certify_and_key_exchange(State, Connection)
+    end;
+
+%% Master secret was determined with help of server-key exchange msg
+certify(#server_hello_done{},
+	#state{session = #session{master_secret = MasterSecret} = Session,
+	       connection_states = ConnectionStates0,
+	       negotiated_version = Version,
+	       premaster_secret = undefined,
+	       role = client} = State0, Connection) ->
+    case ssl_handshake:master_secret(record_cb(Connection), Version, Session,
+				     ConnectionStates0, client) of
+	{MasterSecret, ConnectionStates} ->
+	    State = State0#state{connection_states = ConnectionStates},
+	    client_certify_and_key_exchange(State, Connection);
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, certify, State0)
+    end;
+
+%% Master secret is calculated from premaster_secret
+certify(#server_hello_done{},
+	#state{session = Session0,
+	       connection_states = ConnectionStates0,
+	       negotiated_version = Version,
+	       premaster_secret = PremasterSecret,
+	       role = client} = State0, Connection) ->
+    case ssl_handshake:master_secret(record_cb(Connection), Version, PremasterSecret,
+				     ConnectionStates0, client) of
+	{MasterSecret, ConnectionStates} ->
+	    Session = Session0#session{master_secret = MasterSecret},
+	    State = State0#state{connection_states = ConnectionStates,
+				 session = Session},
+	    client_certify_and_key_exchange(State, Connection);
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, certify, State0)
+    end;
+
+certify(#client_key_exchange{} = Msg,
+	#state{role = server,
+	       client_certificate_requested = true,
+	       ssl_options = #ssl_options{fail_if_no_peer_cert = true}} = State, Connection) ->
+    %% We expect a certificate here
+    Connection:handle_unexpected_message(Msg, certify_client_key_exchange, State);
+
+certify(#client_key_exchange{exchange_keys = Keys},
+	State = #state{key_algorithm = KeyAlg, negotiated_version = Version}, Connection) ->
+    try
+	certify_client_key_exchange(ssl_handshake:decode_client_key(Keys, KeyAlg, Version),
+				    State, Connection)
+    catch
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, certify, State)
+    end;
+
+certify(timeout, State, _) ->
+    {next_state, certify, State, hibernate};
+
+certify(Msg, State, Connection) ->
+    Connection:handle_unexpected_message(Msg, certify, State).
+
+%%--------------------------------------------------------------------
+-spec cipher(#hello_request{} | #certificate_verify{} | #finished{} | term(),
+	     #state{}, tls_connection | dtls_connection) ->
+		    gen_fsm_state_return().
+%%--------------------------------------------------------------------
+cipher(#hello_request{}, State0, Connection) ->
+    {Record, State} = Connection:next_record(State0),
+    Connection:next_state(cipher, hello, Record, State);
+
+cipher(#certificate_verify{signature = Signature, hashsign_algorithm = CertHashSign},
+       #state{role = server,
+	      public_key_info = {Algo, _, _} =PublicKeyInfo,
+	      negotiated_version = Version,
+	      session = #session{master_secret = MasterSecret},
+	      tls_handshake_history = Handshake
+	     } = State0, Connection) ->
+
+    HashSign = ssl_handshake:select_cert_hashsign(CertHashSign, Algo, Version),
+    case ssl_handshake:certificate_verify(Signature, PublicKeyInfo,
+					  Version, HashSign, MasterSecret, Handshake) of
+	valid ->
+	    {Record, State} = Connection:next_record(State0),
+	    Connection:next_state(cipher, cipher, Record,
+				  State#state{cert_hashsign_algorithm = HashSign});
+	#alert{} = Alert ->
+	    Connection: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,
+       Connection) ->
+    Connection:handle_own_alert(?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE), Version, cipher, State0);
+
+cipher(#finished{verify_data = Data} = Finished,
+       #state{negotiated_version = Version,
+	      host = Host,
+	      port = Port,
+	      role = Role,
+	      session = #session{master_secret = MasterSecret}
+	      = Session0,
+	      connection_states = ConnectionStates0,
+	      tls_handshake_history = Handshake0} = State, Connection) ->
+    case ssl_handshake:verify_connection(Version, Finished,
+					 opposite_role(Role),
+					 get_current_prf(ConnectionStates0, read),
+					 MasterSecret, Handshake0) of
+        verified ->
+	    Session = register_session(Role, Host, Port, Session0),
+	    cipher_role(Role, Data, Session, State, Connection);
+        #alert{} = Alert ->
+	    Connection: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, Connection) ->
+    {Record, State} = Connection:next_record(State0#state{next_protocol = SelectedProtocol}),
+    Connection:next_state(cipher, cipher, Record, State);
+
+cipher(timeout, State, _) ->
+    {next_state, cipher, State, hibernate};
+
+cipher(Msg, State, Connection) ->
+    Connection:handle_unexpected_message(Msg, cipher, State).
+
+%%--------------------------------------------------------------------
+-spec connection(term(), #state{}, tls_connection | dtls_connection) ->
+			gen_fsm_state_return().
+%%--------------------------------------------------------------------
+connection(timeout, State,  _) ->
+    {next_state, connection, State, hibernate};
+
+connection(Msg, State, Connection) ->
+    Connection:handle_unexpected_message(Msg, connection, State).
+
+%%--------------------------------------------------------------------
+%% Description: Whenever a gen_fsm receives an event sent using
+%% gen_fsm:sync_send_all_state_event/2,3, this function is called to handle
+%% the event.
+%%--------------------------------------------------------------------
+handle_sync_event({application_data, Data}, From, connection,  
+		  #state{protocol_cb = Connection} = State) ->
+    %% We should look into having a worker process to do this to 
+    %% parallize send and receive decoding and not block the receiver
+    %% if sending is overloading the socket.
+    try
+	Connection:write_application_data(Data, From, State)
+    catch throw:Error ->
+	    {reply, Error, connection, State, get_timeout(State)}
+    end;
+handle_sync_event({application_data, Data}, From, StateName, 
+		  #state{send_queue = Queue} = State) ->
+    %% In renegotiation priorities handshake, send data when handshake is finished
+    {next_state, StateName,
+     State#state{send_queue = queue:in({From, Data}, Queue)},
+     get_timeout(State)};
+
+handle_sync_event({start, Timeout}, StartFrom, hello, #state{protocol_cb = Connection} = State) ->
+    Timer = start_or_recv_cancel_timer(Timeout, StartFrom),
+    Connection: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
+%% controlling_process has been evalueated before receiving handshake
+%% messages from client. The server should put the socket in passive
+%% 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 an active socket. 
+handle_sync_event({start,_}, _, connection, State) ->
+    {reply, connected, connection, State, 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{protocol_cb = Connection} = State) ->
+    %% Run terminate before returning
+    %% so that the reuseaddr inet-option will work
+    %% as intended.
+    (catch Connection:terminate(user_close, StateName, State)),
+    {stop, normal, ok, State#state{terminated = true}};
+
+handle_sync_event({shutdown, How0}, _, StateName,
+		  #state{transport_cb = Transport,
+			 negotiated_version = Version,
+			 connection_states = ConnectionStates,
+			 socket = Socket} = State) ->
+    case How0 of
+	How when How == write; How == both ->	    
+	    Alert = ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
+	    {BinMsg, _} =
+		ssl_alert:encode(Alert, Version, ConnectionStates),
+	    Transport:send(Socket, BinMsg);
+	_ ->
+	    ok
+    end,
+    
+    case Transport:shutdown(Socket, How0) of
+	ok ->
+	    {reply, ok, StateName, State, get_timeout(State)};
+	Error ->
+	    {stop, normal, Error, State}
+    end;
+    
+handle_sync_event({recv, N, Timeout}, RecvFrom, connection = StateName,  
+		  #state{protocol_cb = Connection} = State0) ->
+    Timer = start_or_recv_cancel_timer(Timeout, RecvFrom),
+    Connection: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, 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, 
+		  State =#state{user_application = {OldMon, _}}) ->
+    NewMon = erlang:monitor(process, User),
+    erlang:demonitor(OldMon, [flush]),
+    {reply, ok, StateName, State#state{user_application = {NewMon,User}},
+     get_timeout(State)};
+
+handle_sync_event({get_opts, OptTags}, _From, StateName,
+		  #state{socket = Socket,
+			 transport_cb = Transport,
+			 socket_options = SockOpts} = State) ->
+    OptsReply = get_socket_opts(Transport, Socket, OptTags, SockOpts, []),
+    {reply, OptsReply, 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, StateName0, 
+		  #state{socket_options = Opts1, 
+			 protocol_cb = Connection,
+			 socket = Socket,
+			 transport_cb = Transport,
+			 user_data_buffer = Buffer} = State0) ->
+    {Reply, Opts} = set_socket_opts(Transport, Socket, Opts0, Opts1, []),
+    State1 = State0#state{socket_options = Opts},
+    if 
+	Opts#socket_options.active =:= false ->
+	    {reply, Reply, StateName0, State1, get_timeout(State1)};
+	Buffer =:= <<>>, Opts1#socket_options.active =:= false ->
+            %% Need data, set active once
+	    {Record, State2} = Connection:next_record_if_active(State1),
+	    %% Note: Renogotiation may cause StateName0 =/= StateName
+	    case Connection:next_state(StateName0, StateName0, Record, State2) of
+		{next_state, StateName, State, Timeout} ->
+		    {reply, Reply, StateName, State, Timeout};
+		{stop, Reason, State} ->
+		    {stop, Reason, State}
+	    end;
+	Buffer =:= <<>> ->
+            %% Active once already set 
+	    {reply, Reply, StateName0, State1, get_timeout(State1)};
+	true ->
+	    case Connection:read_application_data(<<>>, State1) of
+		Stop = {stop,_,_} ->
+		    Stop;
+		{Record, State2} ->
+		    %% Note: Renogotiation may cause StateName0 =/= StateName
+		    case Connection:next_state(StateName0, StateName0, Record, State2) of
+			{next_state, StateName, State, Timeout} ->
+			    {reply, Reply, StateName, State, Timeout};
+			{stop, Reason, State} ->
+			    {stop, Reason, State}
+		    end
+	    end
+    end;
+
+handle_sync_event(renegotiate, From, connection,  #state{protocol_cb = Connection} = State) ->
+    Connection:renegotiate(State#state{renegotiation = {true, From}});
+
+handle_sync_event(renegotiate, _, StateName, State) ->
+    {reply, {error, already_renegotiating}, StateName, State, get_timeout(State)};
+
+handle_sync_event({prf, Secret, Label, Seed, WantedLength}, _, StateName,
+		  #state{connection_states = ConnectionStates,
+			 negotiated_version = Version} = State) ->
+    ConnectionState =
+	ssl_record:current_connection_state(ConnectionStates, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{master_secret = MasterSecret,
+			 client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Reply = try
+		SecretToUse = case Secret of
+				  _ when is_binary(Secret) -> Secret;
+				  master_secret -> MasterSecret
+			      end,
+		SeedToUse = lists:reverse(
+			      lists:foldl(fun(X, Acc) when is_binary(X) -> [X|Acc];
+					     (client_random, Acc) -> [ClientRandom|Acc];
+					     (server_random, Acc) -> [ServerRandom|Acc]
+					  end, [], Seed)),
+		ssl_handshake:prf(Version, SecretToUse, Label, SeedToUse, WantedLength)
+	    catch
+		exit:_ -> {error, badarg};
+		error:Reason -> {error, Reason}
+	    end,
+    {reply, Reply, StateName, State, get_timeout(State)};
+
+handle_sync_event(info, _, StateName, 
+		  #state{negotiated_version = Version,
+			 session = #session{cipher_suite = Suite}} = State) ->
+    
+    AtomVersion = tls_record:protocol_version(Version),
+    {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:suite_definition(Suite)}],
+     StateName, State, get_timeout(State)};
+
+handle_sync_event(peer_certificate, _, StateName, 
+		  #state{session = #session{peer_certificate = Cert}} 
+		  = State) ->
+    {reply, {ok, Cert}, StateName, State, get_timeout(State)}.
+
+handle_info({ErrorTag, Socket, econnaborted}, StateName,  
+	    #state{socket = Socket, transport_cb = Transport,
+		   start_or_recv_from = StartFrom, role = Role,
+		   protocol_cb = Connection,
+		   error_tag = ErrorTag} = State)  when StateName =/= connection ->
+    Connection:alert_user(Transport, Socket, StartFrom, ?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), Role),
+    {stop, normal, State};
+
+handle_info({ErrorTag, Socket, Reason}, StateName, #state{socket = Socket,
+							  protocol_cb = Connection,
+							  error_tag = ErrorTag} = State)  ->
+    Report = io_lib:format("SSL: Socket error: ~p ~n", [Reason]),
+    error_logger:info_report(Report),
+    Connection:handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
+    {stop, normal, State};
+
+handle_info({'DOWN', MonitorRef, _, _, _}, _, 
+	    State = #state{user_application={MonitorRef,_Pid}}) ->
+    {stop, normal, State};   
+
+%%% So that terminate will be run when supervisor issues shutdown
+handle_info({'EXIT', _Sup, shutdown}, _StateName, State) ->
+    {stop, shutdown, State};
+handle_info({'EXIT', Socket, normal}, _StateName, #state{socket = Socket} = State) ->
+    %% Handle as transport close"
+    {stop, {shutdown, transport_closed}, State};
+
+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{socket = Socket, error_tag = Tag} = State) ->
+    Report = io_lib:format("SSL: Got unexpected info: ~p ~n", [{Msg, Tag, Socket}]),
+    error_logger:info_report(Report),
+    {next_state, StateName, State, get_timeout(State)}.
+
+
+terminate(_, _, #state{terminated = true}) ->
+    %% Happens when user closes the connection using ssl:close/1
+    %% 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,
+				     protocol_cb = Connection,
+				     connection_states = ConnectionStates, 
+				     transport_cb = Transport, socket = Socket, 
+				     send_queue = SendQueue, renegotiation = Renegotiate} = State) ->
+    handle_trusted_certs_db(State),
+    notify_senders(SendQueue),
+    notify_renegotiater(Renegotiate),
+    BinAlert = terminate_alert(Reason, Version, ConnectionStates),
+    Transport:send(Socket, BinAlert),
+    case Connection of
+	tls_connection ->
+	    tls_connection:workaround_transport_delivery_problems(Socket, Transport);
+	_ ->
+	    ok
+    end;
+
+terminate(_Reason, _StateName, #state{transport_cb = Transport,
+				      socket = Socket, send_queue = SendQueue,
+				      renegotiation = Renegotiate} = State) ->
+    handle_trusted_certs_db(State),
+    notify_senders(SendQueue),
+    notify_renegotiater(Renegotiate),
+    Transport:close(Socket).
+
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+do_server_hello(Type, #hello_extensions{next_protocol_negotiation = NextProtocols} =
+		    ServerHelloExt,
+		#state{negotiated_version = Version,
+		       session = #session{session_id = SessId},
+		       connection_states = ConnectionStates0}
+		= State0, Connection) when is_atom(Type) ->
+
+    ServerHello =
+	ssl_handshake:server_hello(SessId, Version, ConnectionStates0, ServerHelloExt),
+    State = server_hello(ServerHello,
+			 State0#state{expecting_next_protocol_negotiation =
+					  NextProtocols =/= undefined}, Connection),
+    case Type of
+	new ->
+	    new_server_hello(ServerHello, State, Connection);
+	resumed ->
+	    resumed_server_hello(State, Connection)
+    end.
+
+new_server_hello(#server_hello{cipher_suite = CipherSuite,
+			      compression_method = Compression,
+			      session_id = SessionId},
+		#state{session = Session0,
+		       negotiated_version = Version} = State0, Connection) ->
+    try server_certify_and_key_exchange(State0, Connection) of
+        #state{} = State1 ->
+            State2 = server_hello_done(State1, Connection),
+	    Session =
+		Session0#session{session_id = SessionId,
+				 cipher_suite = CipherSuite,
+				 compression_method = Compression},
+	    {Record, State} = Connection:next_record(State2#state{session = Session}),
+	    Connection:next_state(hello, certify, Record, State)
+    catch
+        #alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, hello, State0)
+    end.
+
+resumed_server_hello(#state{session = Session,
+			    connection_states = ConnectionStates0,
+			    negotiated_version = Version} = State0, Connection) ->
+
+    case ssl_handshake:master_secret(record_cb(Connection), Version, Session,
+				     ConnectionStates0, server) of
+	{_, ConnectionStates1} ->
+	    State1 = State0#state{connection_states = ConnectionStates1,
+				  session = Session},
+	    State2 =
+		finalize_handshake(State1, abbreviated, Connection),
+	    {Record, State} = Connection:next_record(State2),
+	    Connection:next_state(hello, abbreviated, Record, State);
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, hello, State0)
+    end.
+
+server_hello(ServerHello, State0, Connection) ->
+    CipherSuite = ServerHello#server_hello.cipher_suite,
+    {KeyAlgorithm, _, _, _} = ssl_cipher:suite_definition(CipherSuite),
+    State = Connection:send_handshake(ServerHello, State0),
+    State#state{key_algorithm = KeyAlgorithm}.
+
+server_hello_done(State, Connection) ->
+    HelloDone = ssl_handshake:server_hello_done(),
+    Connection:send_handshake(HelloDone, State).
+
+
+
+
+handle_peer_cert(Role, PeerCert, PublicKeyInfo,
+		 #state{session = #session{cipher_suite = CipherSuite} = Session} = State0,
+		 Connection) ->
+    State1 = State0#state{session =
+			 Session#session{peer_certificate = PeerCert},
+			 public_key_info = PublicKeyInfo},
+    {KeyAlg,_,_,_} = ssl_cipher:suite_definition(CipherSuite),
+    State2 = handle_peer_cert_key(Role, PeerCert, PublicKeyInfo, KeyAlg, State1),
+
+    {Record, State} = Connection:next_record(State2),
+    Connection:next_state(certify, certify, Record, State).
+
+handle_peer_cert_key(client, _,
+		     {?'id-ecPublicKey',  #'ECPoint'{point = _ECPoint} = PublicKey,
+		      PublicKeyParams},
+		     KeyAlg, State)  when KeyAlg == ecdh_rsa;
+					  KeyAlg == ecdh_ecdsa ->
+    ECDHKey = public_key:generate_key(PublicKeyParams),
+    PremasterSecret = ssl_handshake:premaster_secret(PublicKey, ECDHKey),
+    master_secret(PremasterSecret, State#state{diffie_hellman_keys = ECDHKey});
+
+%% We do currently not support cipher suites that use fixed DH.
+%% If we want to implement that the following clause can be used
+%% to extract DH parameters form cert.
+%% handle_peer_cert_key(client, _PeerCert, {?dhpublicnumber, PublicKey, PublicKeyParams},
+%%                      {_,SignAlg},
+%% 		        #state{diffie_hellman_keys = {_, MyPrivatKey}} = State) when
+%%                                                                           SignAlg == dh_rsa;
+%% 									     SignAlg == dh_dss ->
+%%     dh_master_secret(PublicKeyParams, PublicKey, MyPrivatKey, State);
+handle_peer_cert_key(_, _, _, _, State) ->
+    State.
+
+certify_client(#state{client_certificate_requested = true, role = client,
+		      cert_db = CertDbHandle,
+                      cert_db_ref = CertDbRef,
+		      session = #session{own_certificate = OwnCert}}
+	       = State, Connection) ->
+    Certificate = ssl_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, client),
+    Connection:send_handshake(Certificate, State);
+
+certify_client(#state{client_certificate_requested = false} = State, _) ->
+    State.
+
+verify_client_cert(#state{client_certificate_requested = true, role = client,
+			  negotiated_version = Version,
+			  private_key = PrivateKey,
+			  session = #session{master_secret = MasterSecret,
+					     own_certificate = OwnCert},
+			  cert_hashsign_algorithm = HashSign,
+			  tls_handshake_history = Handshake0} = State, Connection) ->
+
+    case ssl_handshake:client_certificate_verify(OwnCert, MasterSecret,
+						 Version, HashSign, PrivateKey, Handshake0) of
+        #certificate_verify{} = Verified ->
+           Connection:send_handshake(Verified, State);
+	ignore ->
+	    State;
+	#alert{} = Alert ->
+	    throw(Alert)
+    end;
+verify_client_cert(#state{client_certificate_requested = false} = State, _) ->
+    State.
+
+client_certify_and_key_exchange(#state{negotiated_version = Version} =
+				State0, Connection) ->
+    try do_client_certify_and_key_exchange(State0, Connection) of
+        State1 = #state{} ->
+	    State2 = finalize_handshake(State1, certify, Connection),
+            State3 = State2#state{
+		       %% Reinitialize
+		       client_certificate_requested = false},
+	    {Record, State} = Connection:next_record(State3),
+	    Connection:next_state(certify, cipher, Record, State)
+    catch
+        throw:#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, certify, State0)
+    end.
+
+do_client_certify_and_key_exchange(State0, Connection) ->
+    State1 = certify_client(State0, Connection),
+    State2 = key_exchange(State1, Connection),
+    verify_client_cert(State2, Connection).
+
+server_certify_and_key_exchange(State0, Connection) ->
+    State1 = certify_server(State0, Connection),
+    State2 = key_exchange(State1, Connection),
+    request_client_cert(State2, Connection).
+
+certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS},
+			    #state{private_key = Key} = State, Connection) ->
+    PremasterSecret = ssl_handshake:premaster_secret(EncPMS, Key),
+    calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
+
+certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey},
+			    #state{diffie_hellman_params = #'DHParameter'{} = Params,
+				   diffie_hellman_keys = {_, ServerDhPrivateKey}} = State,
+			    Connection) ->
+    PremasterSecret = ssl_handshake:premaster_secret(ClientPublicDhKey, ServerDhPrivateKey, Params),
+    calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
+
+certify_client_key_exchange(#client_ec_diffie_hellman_public{dh_public = ClientPublicEcDhPoint},
+			    #state{diffie_hellman_keys = ECDHKey} = State, Connection) ->
+    PremasterSecret = ssl_handshake:premaster_secret(#'ECPoint'{point = ClientPublicEcDhPoint}, ECDHKey),
+    calculate_master_secret(PremasterSecret, State, Connection, certify, cipher);
+
+certify_client_key_exchange(#client_psk_identity{} = ClientKey,
+			    #state{ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = State0, Connection) ->
+    PremasterSecret = ssl_handshake:premaster_secret(ClientKey, PSKLookup),
+    calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher);
+
+certify_client_key_exchange(#client_dhe_psk_identity{} = ClientKey,
+			    #state{diffie_hellman_params = #'DHParameter'{} = Params,
+				   diffie_hellman_keys = {_, ServerDhPrivateKey},
+				   ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = State0,
+			    Connection) ->
+    PremasterSecret = ssl_handshake:premaster_secret(ClientKey, ServerDhPrivateKey, Params, PSKLookup),
+    calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher);
+certify_client_key_exchange(#client_rsa_psk_identity{} = ClientKey,
+			    #state{private_key = Key,
+				   ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = State0,
+			    Connection) ->
+    PremasterSecret = ssl_handshake:premaster_secret(ClientKey, Key, PSKLookup),
+    calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher);
+
+certify_client_key_exchange(#client_srp_public{} = ClientKey,
+			    #state{srp_params = Params,
+				   srp_keys = Key
+				  } = State0, Connection) ->
+    PremasterSecret = ssl_handshake:premaster_secret(ClientKey, Key, Params),
+    calculate_master_secret(PremasterSecret, State0, Connection, certify, cipher).
+
+certify_server(#state{key_algorithm = Algo} = State, _)
+  when Algo == dh_anon; Algo == ecdh_anon; Algo == psk; Algo == dhe_psk; Algo == srp_anon  ->
+    State;
+
+certify_server(#state{cert_db = CertDbHandle,
+		      cert_db_ref = CertDbRef,
+		      session = #session{own_certificate = OwnCert}} = State, Connection) ->
+    case ssl_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, server) of
+	Cert = #certificate{} ->
+	    Connection:send_handshake(Cert, State);
+	Alert = #alert{} ->
+	    throw(Alert)
+    end.
+
+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'{} = Params,
+		    private_key = PrivateKey,
+		    connection_states = ConnectionStates0,
+		    negotiated_version = Version
+		   } = State0, Connection)
+  when Algo == dhe_dss;
+       Algo == dhe_rsa;
+       Algo == dh_anon ->
+    DHKeys = public_key:generate_key(Params),
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Msg = ssl_handshake:key_exchange(server, Version, {dh, DHKeys, Params,
+					       HashSignAlgo, ClientRandom,
+					       ServerRandom,
+					       PrivateKey}),
+    State = Connection:send_handshake(Msg, State0),
+    State#state{diffie_hellman_keys = DHKeys};
+
+key_exchange(#state{role = server, private_key = Key, key_algorithm = Algo} = State, _)
+  when Algo == ecdh_ecdsa; Algo == ecdh_rsa ->
+    State#state{diffie_hellman_keys = Key};
+key_exchange(#state{role = server, key_algorithm = Algo,
+		    hashsign_algorithm = HashSignAlgo,
+		    private_key = PrivateKey,
+		    connection_states = ConnectionStates0,
+		    negotiated_version = Version
+		   } = State0, Connection)
+  when Algo == ecdhe_ecdsa; Algo == ecdhe_rsa;
+       Algo == ecdh_anon ->
+
+    ECDHKeys = public_key:generate_key(select_curve(State0)),
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Msg =  ssl_handshake:key_exchange(server, Version, {ecdh, ECDHKeys,
+							HashSignAlgo, ClientRandom,
+							ServerRandom,
+							PrivateKey}),
+    State = Connection:send_handshake(Msg, State0),
+    State#state{diffie_hellman_keys = ECDHKeys};
+
+key_exchange(#state{role = server, key_algorithm = psk,
+		    ssl_options = #ssl_options{psk_identity = undefined}} = State, _) ->
+    State;
+key_exchange(#state{role = server, key_algorithm = psk,
+		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
+		    hashsign_algorithm = HashSignAlgo,
+		    private_key = PrivateKey,
+		    connection_states = ConnectionStates0,
+		    negotiated_version = Version
+		   } = State0, Connection) ->
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Msg = ssl_handshake:key_exchange(server, Version, {psk, PskIdentityHint,
+						       HashSignAlgo, ClientRandom,
+						       ServerRandom,
+						       PrivateKey}),
+    Connection:send_handshake(Msg, State0);
+
+key_exchange(#state{role = server, key_algorithm = dhe_psk,
+		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
+		    hashsign_algorithm = HashSignAlgo,
+		    diffie_hellman_params = #'DHParameter'{} = Params,
+		    private_key = PrivateKey,
+		    connection_states = ConnectionStates0,
+		    negotiated_version = Version
+		   } = State0, Connection) ->
+    DHKeys = public_key:generate_key(Params),
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Msg =  ssl_handshake:key_exchange(server, Version, {dhe_psk, PskIdentityHint, DHKeys, Params,
+					       HashSignAlgo, ClientRandom,
+					       ServerRandom,
+					       PrivateKey}),
+    State = Connection:send_handshake(Msg, State0),
+    State#state{diffie_hellman_keys = DHKeys};
+
+key_exchange(#state{role = server, key_algorithm = rsa_psk,
+		    ssl_options = #ssl_options{psk_identity = undefined}} = State, _) ->
+    State;
+key_exchange(#state{role = server, key_algorithm = rsa_psk,
+		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
+		    hashsign_algorithm = HashSignAlgo,
+		    private_key = PrivateKey,
+		    connection_states = ConnectionStates0,
+		    negotiated_version = Version
+		   } = State0, Connection) ->
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Msg =  ssl_handshake:key_exchange(server, Version, {psk, PskIdentityHint,
+					       HashSignAlgo, ClientRandom,
+					       ServerRandom,
+					       PrivateKey}),
+    Connection:send_handshake(Msg, State0);
+
+key_exchange(#state{role = server, key_algorithm = Algo,
+		    ssl_options = #ssl_options{user_lookup_fun = LookupFun},
+		    hashsign_algorithm = HashSignAlgo,
+		    session = #session{srp_username = Username},
+		    private_key = PrivateKey,
+		    connection_states = ConnectionStates0,
+		    negotiated_version = Version
+		   } = State0, Connection)
+  when Algo == srp_dss;
+       Algo == srp_rsa;
+       Algo == srp_anon ->
+    SrpParams = handle_srp_identity(Username, LookupFun),
+    Keys = case generate_srp_server_keys(SrpParams, 0) of
+	       Alert = #alert{} ->
+		   throw(Alert);
+	       Keys0 = {_,_} ->
+		   Keys0
+	   end,
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Msg =  ssl_handshake:key_exchange(server, Version, {srp, Keys, SrpParams,
+					       HashSignAlgo, ClientRandom,
+					       ServerRandom,
+					       PrivateKey}),
+    State = Connection:send_handshake(Msg, State0),
+    State#state{srp_params = SrpParams,
+		srp_keys = Keys};
+
+key_exchange(#state{role = client,
+		    key_algorithm = rsa,
+		    public_key_info = PublicKeyInfo,
+		    negotiated_version = Version,
+		    premaster_secret = PremasterSecret} = State0, Connection) ->
+    Msg = rsa_key_exchange(Version, PremasterSecret, PublicKeyInfo),
+    Connection:send_handshake(Msg, State0);
+
+key_exchange(#state{role = client,
+		    key_algorithm = Algorithm,
+		    negotiated_version = Version,
+		    diffie_hellman_keys = {DhPubKey, _}
+		   } = State0, Connection)
+  when Algorithm == dhe_dss;
+       Algorithm == dhe_rsa;
+       Algorithm == dh_anon ->
+    Msg =  ssl_handshake:key_exchange(client, Version, {dh, DhPubKey}),
+    Connection:send_handshake(Msg, State0);
+
+key_exchange(#state{role = client,
+		    key_algorithm = Algorithm,
+		    negotiated_version = Version,
+		    diffie_hellman_keys = Keys} = State0, Connection)
+  when Algorithm == ecdhe_ecdsa; Algorithm == ecdhe_rsa;
+       Algorithm == ecdh_ecdsa; Algorithm == ecdh_rsa;
+       Algorithm == ecdh_anon ->
+    Msg = ssl_handshake:key_exchange(client, Version, {ecdh, Keys}),
+    Connection:send_handshake(Msg, State0);
+
+key_exchange(#state{role = client,
+		    ssl_options = SslOpts,
+		    key_algorithm = psk,
+		    negotiated_version = Version} = State0, Connection) ->
+    Msg =  ssl_handshake:key_exchange(client, Version, {psk, SslOpts#ssl_options.psk_identity}),
+    Connection:send_handshake(Msg, State0);
+
+key_exchange(#state{role = client,
+		    ssl_options = SslOpts,
+		    key_algorithm = dhe_psk,
+		    negotiated_version = Version,
+		    diffie_hellman_keys = {DhPubKey, _}} = State0, Connection) ->
+    Msg =  ssl_handshake:key_exchange(client, Version,
+				      {dhe_psk, SslOpts#ssl_options.psk_identity, DhPubKey}),
+    Connection:send_handshake(Msg, State0);
+key_exchange(#state{role = client,
+		    ssl_options = SslOpts,
+		    key_algorithm = rsa_psk,
+		    public_key_info = PublicKeyInfo,
+		    negotiated_version = Version,
+		    premaster_secret = PremasterSecret}
+	     = State0, Connection) ->
+    Msg = rsa_psk_key_exchange(Version, SslOpts#ssl_options.psk_identity,
+			       PremasterSecret, PublicKeyInfo),
+    Connection:send_handshake(Msg, State0);
+
+key_exchange(#state{role = client,
+		    key_algorithm = Algorithm,
+		    negotiated_version = Version,
+		    srp_keys = {ClientPubKey, _}}
+	     = State0, Connection)
+  when Algorithm == srp_dss;
+       Algorithm == srp_rsa;
+       Algorithm == srp_anon ->
+    Msg =  ssl_handshake:key_exchange(client, Version, {srp, ClientPubKey}),
+    Connection:send_handshake(Msg, State0).
+
+rsa_key_exchange(Version, PremasterSecret, PublicKeyInfo = {Algorithm, _, _})
+  when Algorithm == ?rsaEncryption;
+       Algorithm == ?md2WithRSAEncryption;
+       Algorithm == ?md5WithRSAEncryption;
+       Algorithm == ?sha1WithRSAEncryption;
+       Algorithm == ?sha224WithRSAEncryption;
+       Algorithm == ?sha256WithRSAEncryption;
+       Algorithm == ?sha384WithRSAEncryption;
+       Algorithm == ?sha512WithRSAEncryption
+       ->
+    ssl_handshake:key_exchange(client, Version,
+			       {premaster_secret, PremasterSecret,
+				PublicKeyInfo});
+rsa_key_exchange(_, _, _) ->
+    throw (?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE)).
+
+rsa_psk_key_exchange(Version, PskIdentity, PremasterSecret, PublicKeyInfo = {Algorithm, _, _})
+  when Algorithm == ?rsaEncryption;
+       Algorithm == ?md2WithRSAEncryption;
+       Algorithm == ?md5WithRSAEncryption;
+       Algorithm == ?sha1WithRSAEncryption;
+       Algorithm == ?sha224WithRSAEncryption;
+       Algorithm == ?sha256WithRSAEncryption;
+       Algorithm == ?sha384WithRSAEncryption;
+       Algorithm == ?sha512WithRSAEncryption
+       ->
+    ssl_handshake:key_exchange(client, Version,
+			       {psk_premaster_secret, PskIdentity, PremasterSecret,
+				PublicKeyInfo});
+rsa_psk_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,
+			   negotiated_version = Version} = State0, Connection) ->
+    #connection_state{security_parameters =
+			  #security_parameters{cipher_suite = CipherSuite}} =
+	ssl_record:pending_connection_state(ConnectionStates0, read),
+    Msg = ssl_handshake:certificate_request(CipherSuite, CertDbHandle, CertDbRef, Version),
+    State = Connection:send_handshake(Msg, State0),
+    State#state{client_certificate_requested = true};
+
+request_client_cert(#state{ssl_options = #ssl_options{verify = verify_none}} =
+		    State, _) ->
+    State.
+
+calculate_master_secret(PremasterSecret, #state{negotiated_version = Version,
+						       connection_states = ConnectionStates0,
+						       session = Session0} = State0, Connection,
+			Current, Next) ->
+    case ssl_handshake:master_secret(record_cb(Connection), Version, PremasterSecret,
+				     ConnectionStates0, server) of
+	{MasterSecret, ConnectionStates} ->
+	    Session = Session0#session{master_secret = MasterSecret},
+	    State1 = State0#state{connection_states = ConnectionStates,
+				  session = Session},
+	    {Record, State} = Connection:next_record(State1),
+	    Connection:next_state(Current, Next, Record, State);
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, certify, State0)
+    end.
+
+finalize_handshake(State0, StateName, Connection) ->
+    #state{connection_states = ConnectionStates0} =
+	State1 = cipher_protocol(State0, Connection),
+
+    ConnectionStates =
+        ssl_record:activate_pending_connection_state(ConnectionStates0,
+                                                     write),
+
+    State2 = State1#state{connection_states = ConnectionStates},
+    State = next_protocol(State2, Connection),
+    finished(State, StateName, Connection).
+
+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{next_protocol = NextProtocol} = State0, Connection) ->
+    NextProtocolMessage = ssl_handshake:next_protocol(NextProtocol),
+    Connection:send_handshake(NextProtocolMessage, State0).
+
+cipher_protocol(State, Connection) ->
+    Connection:send_change_cipher(#change_cipher_spec{}, State).
+
+finished(#state{role = Role, negotiated_version = Version,
+		session = Session,
+                connection_states = ConnectionStates0,
+                tls_handshake_history = Handshake0} = State0, StateName, Connection) ->
+    MasterSecret = Session#session.master_secret,
+    Finished = ssl_handshake:finished(Version, Role,
+				       get_current_prf(ConnectionStates0, write),
+				       MasterSecret, Handshake0),
+    ConnectionStates = save_verify_data(Role, Finished, ConnectionStates0, StateName),
+    Connection:send_handshake(Finished, State0#state{connection_states =
+								 ConnectionStates}).
+
+save_verify_data(client, #finished{verify_data = Data}, ConnectionStates, certify) ->
+    ssl_record:set_client_verify_data(current_write, Data, ConnectionStates);
+save_verify_data(server, #finished{verify_data = Data}, ConnectionStates, cipher) ->
+    ssl_record:set_server_verify_data(current_both, Data, ConnectionStates);
+save_verify_data(client, #finished{verify_data = Data}, ConnectionStates, abbreviated) ->
+    ssl_record:set_client_verify_data(current_both, Data, ConnectionStates);
+save_verify_data(server, #finished{verify_data = Data}, ConnectionStates, abbreviated) ->
+    ssl_record:set_server_verify_data(current_write, Data, ConnectionStates).
+
+calculate_secret(#server_dh_params{dh_p = Prime, dh_g = Base, dh_y = ServerPublicDhKey} = Params,
+		     State, Connection) ->
+    Keys = {_, PrivateDhKey} = crypto:generate_key(dh, [Prime, Base]),
+    PremasterSecret =
+	ssl_handshake:premaster_secret(ServerPublicDhKey, PrivateDhKey, Params),
+    calculate_master_secret(PremasterSecret,
+			    State#state{diffie_hellman_keys = Keys}, Connection, certify, certify);
+
+calculate_secret(#server_ecdh_params{curve = ECCurve, public = ECServerPubKey},
+		     State, Connection) ->
+    ECDHKeys = public_key:generate_key(ECCurve),
+    PremasterSecret = ssl_handshake:premaster_secret(#'ECPoint'{point = ECServerPubKey}, ECDHKeys),
+    calculate_master_secret(PremasterSecret,
+			    State#state{diffie_hellman_keys = ECDHKeys}, Connection, certify, certify);
+
+calculate_secret(#server_psk_params{
+			hint = IdentityHint},
+		 State0, Connection) ->
+    %% store for later use
+    {Record, State} = Connection:next_record(State0#state{psk_identity = IdentityHint}),
+    Connection:next_state(certify, certify, Record, State);
+
+calculate_secret(#server_dhe_psk_params{
+		    dh_params = #server_dh_params{dh_p = Prime, dh_g = Base}} = ServerKey,
+		    #state{ssl_options = #ssl_options{user_lookup_fun = PSKLookup}} = State, Connection) ->
+    Keys = {_, PrivateDhKey} =
+	crypto:generate_key(dh, [Prime, Base]),
+    PremasterSecret = ssl_handshake:premaster_secret(ServerKey, PrivateDhKey, PSKLookup),
+    calculate_master_secret(PremasterSecret, State#state{diffie_hellman_keys = Keys},
+			    Connection, certify, certify);
+
+calculate_secret(#server_srp_params{srp_n = Prime, srp_g = Generator} = ServerKey,
+		 #state{ssl_options = #ssl_options{srp_identity = SRPId}} = State, Connection) ->
+    Keys = generate_srp_client_keys(Generator, Prime, 0),
+    PremasterSecret = ssl_handshake:premaster_secret(ServerKey, Keys, SRPId),
+    calculate_master_secret(PremasterSecret, State#state{srp_keys = Keys}, Connection, certify, certify).
+
+master_secret(#alert{} = Alert, _) ->
+    Alert;
+master_secret(PremasterSecret, #state{session = Session,
+				      negotiated_version = Version, role = Role,
+				      connection_states = ConnectionStates0} = State) ->
+    case ssl_handshake:master_secret(tls_record, Version, PremasterSecret,
+				     ConnectionStates0, Role) of
+	{MasterSecret, ConnectionStates} ->
+	    State#state{
+	      session =
+		  Session#session{master_secret = MasterSecret},
+	      connection_states = ConnectionStates};
+	#alert{} = Alert ->
+	    Alert
+    end.
+
+generate_srp_server_keys(_SrpParams, 10) ->
+    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+generate_srp_server_keys(SrpParams =
+			     #srp_user{generator = Generator, prime = Prime,
+				       verifier = Verifier}, N) ->
+    case crypto:generate_key(srp, {host, [Verifier, Generator, Prime, '6a']}) of
+	error ->
+	    generate_srp_server_keys(SrpParams, N+1);
+	Keys ->
+	    Keys
+    end.
+
+generate_srp_client_keys(_Generator, _Prime, 10) ->
+    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+generate_srp_client_keys(Generator, Prime, N) ->
+
+    case crypto:generate_key(srp, {user, [Generator, Prime, '6a']}) of
+	error ->
+	    generate_srp_client_keys(Generator, Prime, N+1);
+	Keys ->
+	    Keys
+    end.
+
+handle_srp_identity(Username, {Fun, UserState}) ->
+    case Fun(srp, Username, UserState) of
+	{ok, {SRPParams, Salt, DerivedKey}}
+	  when is_atom(SRPParams), is_binary(Salt), is_binary(DerivedKey) ->
+	    {Generator, Prime} = ssl_srp_primes:get_srp_params(SRPParams),
+	    Verifier = crypto:mod_pow(Generator, DerivedKey, Prime),
+	    #srp_user{generator = Generator, prime = Prime,
+		      salt = Salt, verifier = Verifier};
+	#alert{} = Alert ->
+	    throw(Alert);
+	_ ->
+	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
+    end.
+
+
+cipher_role(client, Data, Session, #state{connection_states = ConnectionStates0} = State,
+	    Connection) ->
+    ConnectionStates = ssl_record:set_server_verify_data(current_both, Data, ConnectionStates0),
+    Connection:next_state_connection(cipher,
+				     ack_connection(
+				       State#state{session = Session,
+						   connection_states = ConnectionStates}));
+
+cipher_role(server, Data, Session,  #state{connection_states = ConnectionStates0} = State0,
+	    Connection) ->
+    ConnectionStates1 = ssl_record:set_client_verify_data(current_read, Data, ConnectionStates0),
+    State =
+	finalize_handshake(State0#state{connection_states = ConnectionStates1,
+					session = Session}, cipher, Connection),
+    Connection:next_state_connection(cipher, ack_connection(State#state{session = Session})).
+
+negotiated_hashsign(undefined, Algo, Version) ->
+    default_hashsign(Version, Algo);
+negotiated_hashsign(HashSign = {_, _}, _, _) ->
+    HashSign.
+
+%% 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 orelse
+	KeyExchange == ecdhe_rsa orelse
+	KeyExchange == ecdh_rsa orelse
+	KeyExchange == srp_rsa) ->
+    {sha, rsa};
+default_hashsign(_Version, KeyExchange)
+  when KeyExchange == rsa;
+       KeyExchange == dhe_rsa;
+       KeyExchange == dh_rsa;
+       KeyExchange == ecdhe_rsa;
+       KeyExchange == ecdh_rsa;
+       KeyExchange == srp_rsa ->
+    {md5sha, rsa};
+default_hashsign(_Version, KeyExchange)
+  when KeyExchange == ecdhe_ecdsa;
+       KeyExchange == ecdh_ecdsa ->
+    {sha, ecdsa};
+default_hashsign(_Version, KeyExchange)
+  when KeyExchange == dhe_dss;
+       KeyExchange == dh_dss;
+       KeyExchange == srp_dss ->
+    {sha, dsa};
+default_hashsign(_Version, KeyExchange)
+  when KeyExchange == dh_anon;
+       KeyExchange == ecdh_anon;
+       KeyExchange == psk;
+       KeyExchange == dhe_psk;
+       KeyExchange == rsa_psk;
+       KeyExchange == srp_anon ->
+    {null, anon}.
+
+select_curve(#state{client_ecc = {[Curve|_], _}}) ->
+    {namedCurve, Curve};
+select_curve(_) ->
+    {namedCurve, ?secp256r1}.
+
+is_anonymous(Algo) when Algo == dh_anon;
+			Algo == ecdh_anon;
+			Algo == psk;
+			Algo == dhe_psk;
+			Algo == rsa_psk;
+			Algo == srp_anon ->
+    true;
+is_anonymous(_) ->
+    false.
+
+get_current_prf(CStates, Direction) ->
+	CS = ssl_record:current_connection_state(CStates, Direction),
+	CS#connection_state.security_parameters#security_parameters.prf_algorithm.
+get_pending_prf(CStates, Direction) ->
+	CS = ssl_record:pending_connection_state(CStates, Direction),
+	CS#connection_state.security_parameters#security_parameters.prf_algorithm.
+
+opposite_role(client) ->
+    server;
+opposite_role(server) ->
+    client.
+
+record_cb(tls_connection) ->
+    tls_record;
+record_cb(dtls_connection) ->
+    dtls_record.
+
+sync_send_all_state_event(FsmPid, Event) ->
+    try gen_fsm:sync_send_all_state_event(FsmPid, Event, infinity)
+    catch
+ 	exit:{noproc, _} ->
+ 	    {error, closed};
+	exit:{normal, _} ->
+	    {error, closed};
+	exit:{{shutdown, _},_} ->
+	    {error, closed}
+    end.
+
+get_socket_opts(_,_,[], _, Acc) ->
+    {ok, Acc};
+get_socket_opts(Transport, Socket, [mode | Tags], SockOpts, Acc) ->
+    get_socket_opts(Transport, Socket, Tags, SockOpts, 
+		    [{mode, SockOpts#socket_options.mode} | Acc]);
+get_socket_opts(Transport, Socket, [packet | Tags], SockOpts, Acc) ->
+    case SockOpts#socket_options.packet of
+	{Type, headers} ->
+	    get_socket_opts(Transport, Socket, Tags, SockOpts, [{packet, Type} | Acc]);
+	Type ->
+	    get_socket_opts(Transport, Socket, Tags, SockOpts, [{packet, Type} | Acc])
+    end;
+get_socket_opts(Transport, Socket, [header | Tags], SockOpts, Acc) ->
+    get_socket_opts(Transport, Socket, Tags, SockOpts, 
+		    [{header, SockOpts#socket_options.header} | Acc]);
+get_socket_opts(Transport, Socket, [active | Tags], SockOpts, Acc) ->
+    get_socket_opts(Transport, Socket, Tags, SockOpts, 
+		    [{active, SockOpts#socket_options.active} | Acc]);
+get_socket_opts(Transport, Socket, [Tag | Tags], SockOpts, Acc) ->
+    try ssl_socket:getopts(Transport, Socket, [Tag]) of
+	{ok, [Opt]} ->
+	    get_socket_opts(Transport, Socket, Tags, SockOpts, [Opt | Acc]);
+	{error, Error} ->
+	    {error, {options, {socket_options, Tag, Error}}}
+    catch
+	%% So that inet behavior does not crash our process
+	_:Error -> {error, {options, {socket_options, Tag, Error}}}
+    end;
+get_socket_opts(_, _,Opts, _,_) ->
+    {error, {options, {socket_options, Opts, function_clause}}}.
+
+set_socket_opts(_,_, [], SockOpts, []) ->
+    {ok, SockOpts};
+set_socket_opts(Transport, Socket, [], SockOpts, Other) ->
+    %% Set non emulated options 
+    try ssl_socket:setopts(Transport, Socket, Other) of
+	ok ->
+	    {ok, SockOpts};
+	{error, InetError} ->
+	    {{error, {options, {socket_options, Other, InetError}}}, SockOpts}
+    catch
+	_:Error ->
+	    %% So that inet behavior does not crash our process
+	    {{error, {options, {socket_options, Other, Error}}}, SockOpts}
+    end;
+
+set_socket_opts(Transport,Socket, [{mode, Mode}| Opts], SockOpts, Other) when Mode == list; Mode == binary ->
+    set_socket_opts(Transport, Socket, Opts, 
+		    SockOpts#socket_options{mode = Mode}, Other);
+set_socket_opts(_, _, [{mode, _} = Opt| _], SockOpts, _) ->
+    {{error, {options, {socket_options, Opt}}}, SockOpts};
+set_socket_opts(Transport,Socket, [{packet, Packet}| Opts], SockOpts, Other) when Packet == raw;
+									Packet == 0;
+									Packet == 1;
+									Packet == 2;
+									Packet == 4;
+									Packet == asn1;
+									Packet == cdr;
+									Packet == sunrm;
+									Packet == fcgi;
+									Packet == tpkt;
+									Packet == line;
+									Packet == http;
+									Packet == httph;
+									Packet == http_bin;
+									Packet == httph_bin ->
+    set_socket_opts(Transport, Socket, Opts, 
+		    SockOpts#socket_options{packet = Packet}, Other);
+set_socket_opts(_, _, [{packet, _} = Opt| _], SockOpts, _) ->
+    {{error, {options, {socket_options, Opt}}}, SockOpts};
+set_socket_opts(Transport, Socket, [{header, Header}| Opts], SockOpts, Other) when is_integer(Header) ->
+    set_socket_opts(Transport, Socket, Opts, 
+		    SockOpts#socket_options{header = Header}, Other);
+set_socket_opts(_, _, [{header, _} = Opt| _], SockOpts, _) ->
+    {{error,{options, {socket_options, Opt}}}, SockOpts};
+set_socket_opts(Transport, Socket, [{active, Active}| Opts], SockOpts, Other) when Active == once;
+										   Active == true;
+										   Active == false ->
+    set_socket_opts(Transport, Socket, Opts, 
+		    SockOpts#socket_options{active = Active}, Other);
+set_socket_opts(_, _, [{active, _} = Opt| _], SockOpts, _) ->
+    {{error, {options, {socket_options, Opt}} }, SockOpts};
+set_socket_opts(Transport, Socket, [Opt | Opts], SockOpts, Other) ->
+    set_socket_opts(Transport, Socket, Opts, SockOpts, [Opt | Other]).
+
+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}).
+
+get_timeout(#state{ssl_options=#ssl_options{hibernate_after = undefined}}) ->
+    infinity;
+get_timeout(#state{ssl_options=#ssl_options{hibernate_after = HibernateAfter}}) ->
+    HibernateAfter.
+
+terminate_alert(Reason, Version, ConnectionStates) when Reason == normal;
+							Reason == user_close ->
+    {BinAlert, _} = ssl_alert:encode(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
+				 Version, ConnectionStates),
+    BinAlert;
+terminate_alert({shutdown, _}, Version, ConnectionStates) ->
+    {BinAlert, _} = ssl_alert:encode(?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
+				 Version, ConnectionStates),
+    BinAlert;
+
+terminate_alert(_, Version, ConnectionStates) ->
+    {BinAlert, _} = ssl_alert:encode(?ALERT_REC(?FATAL, ?INTERNAL_ERROR),
+				 Version, ConnectionStates),
+    BinAlert.
+
+handle_unrecv_data(StateName, #state{socket = Socket, transport_cb = Transport,
+				     protocol_cb = Connection} = State) ->
+    ssl_socket:setopts(Transport, Socket, [{active, false}]),
+    case Transport:recv(Socket, 0, 0) of
+	{error, closed} ->
+	    ok;
+	{ok, Data} ->
+	    Connection:handle_close_alert(Data, StateName, State)
+    end.
+
+handle_trusted_certs_db(#state{ssl_options = #ssl_options{cacertfile = <<>>, cacerts = []}}) ->
+    %% No trusted certs specified
+    ok;
+handle_trusted_certs_db(#state{cert_db_ref = Ref,
+			       cert_db = CertDb,
+			       ssl_options = #ssl_options{cacertfile = <<>>}}) ->
+    %% Certs provided as DER directly can not be shared
+    %% with other connections and it is safe to delete them when the connection ends.
+    ssl_pkix_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_pkix_db:ref_count(Ref, RefDb, -1) of
+	0 ->
+	    ssl_manager:clean_cert_db(Ref, File);
+	_ ->
+	    ok
+    end.
+
+notify_senders(SendQueue) -> 
+    lists:foreach(fun({From, _}) ->
+ 			  gen_fsm:reply(From, {error, closed})
+ 		  end, queue:to_list(SendQueue)).
+
+notify_renegotiater({true, From}) when not is_atom(From)  ->
+    gen_fsm:reply(From, {error, closed});
+notify_renegotiater(_) ->
+    ok.
+
+ack_connection(#state{renegotiation = {true, Initiater}} = State) 
+  when Initiater == internal;
+       Initiater == peer ->
+    State#state{renegotiation = undefined};
+ack_connection(#state{renegotiation = {true, From}} = State) ->    
+    gen_fsm:reply(From, ok),
+    State#state{renegotiation = undefined};
+ack_connection(#state{renegotiation = {false, first}, 
+		      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.
+
+cancel_timer(undefined) ->
+    ok;
+cancel_timer(Timer) ->
+    erlang:cancel_timer(Timer),
+    ok.
+
+register_session(client, Host, Port, #session{is_resumable = new} = Session0) ->
+    Session = Session0#session{is_resumable = true},
+    ssl_manager:register_session(Host, Port, Session),
+    Session;
+register_session(server, _, Port, #session{is_resumable = new} = Session0) ->
+    Session = Session0#session{is_resumable = true},
+    ssl_manager:register_session(Port, Session),
+    Session;
+register_session(_, _, _, Session) ->
+    Session. %% Already registered
+
+handle_new_session(NewId, CipherSuite, Compression, #state{session = Session0,
+							   protocol_cb = Connection} = State0) ->
+    Session = Session0#session{session_id = NewId,
+			       cipher_suite = CipherSuite,
+			       compression_method = Compression},
+    {Record, State} = Connection:next_record(State0#state{session = Session}),
+    Connection:next_state(hello, certify, Record, State).
+
+handle_resumed_session(SessId, #state{connection_states = ConnectionStates0,
+				      negotiated_version = Version,
+				      host = Host, port = Port,
+				      protocol_cb = Connection,
+				      session_cache = Cache,
+				      session_cache_cb = CacheCb} = State0) ->
+    Session = CacheCb:lookup(Cache, {{Host, Port}, SessId}),
+    case ssl_handshake:master_secret(tls_record, Version, Session,
+				     ConnectionStates0, client) of
+	{_, ConnectionStates} ->
+	    {Record, State} =
+		Connection:next_record(State0#state{
+			      connection_states = ConnectionStates,
+			      session = Session}),
+	    Connection:next_state(hello, abbreviated, Record, State);
+	#alert{} = Alert ->
+	    Connection:handle_own_alert(Alert, Version, hello, State0)
+    end.
+
+make_premaster_secret({MajVer, MinVer}, rsa) ->
+    Rand = ssl:random_bytes(?NUM_OF_PREMASTERSECRET_BYTES-2),
+    <<?BYTE(MajVer), ?BYTE(MinVer), Rand/binary>>;
+make_premaster_secret(_, _) ->
+    undefined.
diff --git a/lib/ssl/src/ssl_connection.hrl b/lib/ssl/src/ssl_connection.hrl
new file mode 100644
index 0000000000..341a4217e4
--- /dev/null
+++ b/lib/ssl/src/ssl_connection.hrl
@@ -0,0 +1,89 @@
+
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
+%%
+%% The 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: SSL/TLS specific state
+%%----------------------------------------------------------------------
+
+-ifndef(ssl_connection).
+-define(ssl_connection, true).
+
+-include("ssl_internal.hrl").
+-include("ssl_record.hrl").
+-include("ssl_handshake.hrl").
+-include("ssl_srp.hrl").
+-include("ssl_cipher.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+-record(state, {
+          role                  :: client | server,
+	  user_application      :: {Monitor::reference(), User::pid()},
+          transport_cb          :: atom(),   % callback module
+	  protocol_cb           :: tls_connection | dtls_connection,
+          data_tag              :: atom(),   % ex tcp.
+	  close_tag             :: atom(),   % ex tcp_closed
+	  error_tag             :: atom(),   % ex tcp_error
+          host                  :: string() | inet:ip_address(),
+          port                  :: integer(),
+          socket                :: port(),
+          ssl_options           :: #ssl_options{},
+          socket_options        :: #socket_options{},
+          connection_states     :: #connection_states{},
+	  protocol_buffers      :: term(), %% #protocol_buffers{} from tls_record.hrl or dtls_recor.hrl
+          tls_handshake_history ::tls_handshake_history(),
+	  cert_db               :: reference(),
+          session               :: #session{},
+	  session_cache         :: db_handle(),
+	  session_cache_cb      :: atom(),
+          negotiated_version    :: tls_version(),
+          client_certificate_requested = false :: boolean(),
+	  key_algorithm         :: key_algo(),
+	  hashsign_algorithm = {undefined, undefined},
+	  cert_hashsign_algorithm,
+          public_key_info      ::public_key_info(),
+          private_key          ::public_key:private_key(),
+	  diffie_hellman_params, % PKIX: #'DHParameter'{} relevant for server side
+	  diffie_hellman_keys, % {PublicKey, PrivateKey}
+	  psk_identity         :: binary(), % server psk identity hint
+	  srp_params           :: #srp_user{},
+	  srp_keys             ::{PublicKey :: binary(), PrivateKey :: binary()},
+          premaster_secret     :: binary(),
+	  file_ref_db          :: db_handle(),
+          cert_db_ref          :: certdb_ref(),
+          bytes_to_read        :: undefined | integer(), %% bytes to read in passive mode
+          user_data_buffer     :: undefined | binary(),
+	  renegotiation        :: undefined | {boolean(), From::term() | internal | peer},
+	  start_or_recv_from   :: term(),
+	  timer                :: undefined | reference(), % start_or_recive_timer
+	  send_queue           :: queue:queue(),
+	  terminated = false                          ::boolean(),
+	  allow_renegotiate = true                    ::boolean(),
+          expecting_next_protocol_negotiation = false ::boolean(),
+          next_protocol = undefined                   :: undefined | binary(),
+	  client_ecc          % {Curves, PointFmt}
+	 }).
+
+-define(DEFAULT_DIFFIE_HELLMAN_PARAMS,
+	#'DHParameter'{prime = ?DEFAULT_DIFFIE_HELLMAN_PRIME,
+		       base = ?DEFAULT_DIFFIE_HELLMAN_GENERATOR}).
+-define(WAIT_TO_ALLOW_RENEGOTIATION, 12000).
+
+-endif. % -ifdef(ssl_connection).
diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl
index 9d9afb7707..22614a2d34 100644
--- a/lib/ssl/src/ssl_dist_sup.erl
+++ b/lib/ssl/src/ssl_dist_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -65,7 +65,7 @@ session_and_cert_manager_child_spec() ->
 
 connection_manager_child_spec() ->
     Name = ssl_connection_dist,  
-    StartFunc = {ssl_connection_sup, start_link_dist, []},
+    StartFunc = {tls_connection_sup, start_link_dist, []},
     Restart = permanent, 
     Shutdown = 4000,
     Modules = [ssl_connection],
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
new file mode 100644
index 0000000000..7b4cf8eb06
--- /dev/null
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -0,0 +1,1875 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2014. All Rights Reserved.
+%%
+%% The 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: Help funtions for handling the SSL-handshake protocol (common
+%% to SSL/TLS and DTLS
+%%----------------------------------------------------------------------
+
+-module(ssl_handshake).
+
+-include("ssl_handshake.hrl").
+-include("ssl_record.hrl").
+-include("ssl_cipher.hrl").
+-include("ssl_alert.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_srp.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%% Handshake messages
+-export([hello_request/0, server_hello/4, server_hello_done/0,
+	 certificate/4, certificate_request/4, key_exchange/3,
+	 finished/5,  next_protocol/1]).
+
+%% Handle handshake messages
+-export([certify/7, client_certificate_verify/6, certificate_verify/6, verify_signature/5,
+	 master_secret/5, server_key_exchange_hash/2, verify_connection/6,
+	 init_handshake_history/0, update_handshake_history/2, verify_server_key/5
+	]).
+
+%% Encode/Decode
+-export([encode_handshake/2, encode_hello_extensions/1,
+	 encode_client_protocol_negotiation/2, encode_protocols_advertised_on_server/1,
+	 decode_handshake/3, decode_hello_extensions/1,
+	 decode_server_key/3, decode_client_key/3,
+	 decode_suites/2
+	]).
+
+%% Cipher suites handling
+-export([available_suites/2, cipher_suites/2,
+	 select_session/10, supported_ecc/1]).
+
+%% Extensions handling
+-export([client_hello_extensions/6,
+	 handle_client_hello_extensions/9, %% Returns server hello extensions
+	 handle_server_hello_extensions/9, select_curve/2
+	]).
+
+%% MISC
+-export([select_version/3, prf/5, select_hashsign/2, select_cert_hashsign/3,
+	 premaster_secret/2, premaster_secret/3, premaster_secret/4]).
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+
+%% ---------- Create handshake messages  ----------
+
+%%--------------------------------------------------------------------
+-spec hello_request() -> #hello_request{}.
+%%
+%% Description: Creates a hello request message sent by server to
+%% trigger renegotiation.
+%%--------------------------------------------------------------------
+hello_request() ->
+    #hello_request{}.
+
+%%--------------------------------------------------------------------
+-spec server_hello(#session{}, tls_version(), #connection_states{},
+		   #hello_extensions{}) -> #server_hello{}.
+%%
+%% Description: Creates a server hello message.
+%%--------------------------------------------------------------------
+server_hello(SessionId, Version, ConnectionStates, Extensions) ->
+    Pending = ssl_record:pending_connection_state(ConnectionStates, read),
+    SecParams = Pending#connection_state.security_parameters,
+
+    #server_hello{server_version = Version,
+		  cipher_suite = SecParams#security_parameters.cipher_suite,
+                  compression_method =
+		  SecParams#security_parameters.compression_algorithm,
+		  random = SecParams#security_parameters.server_random,
+		  session_id = SessionId,
+		  extensions = Extensions
+		 }.
+
+%%--------------------------------------------------------------------
+-spec server_hello_done() ->  #server_hello_done{}.
+%%
+%% Description: Creates a server hello done message.
+%%--------------------------------------------------------------------
+server_hello_done() ->
+    #server_hello_done{}.
+
+client_hello_extensions(Host, Version, CipherSuites, SslOpts, ConnectionStates, Renegotiation) ->
+    {EcPointFormats, EllipticCurves} =
+	case advertises_ec_ciphers(lists:map(fun ssl_cipher:suite_definition/1, CipherSuites)) of
+	    true ->
+		client_ecc_extensions(tls_v1, Version);
+	    false ->
+		{undefined, undefined}
+	end,
+    SRP = srp_user(SslOpts),
+
+    #hello_extensions{
+       renegotiation_info = renegotiation_info(tls_record, client,
+					       ConnectionStates, Renegotiation),
+       srp = SRP,
+       hash_signs = advertised_hash_signs(Version),
+       ec_point_formats = EcPointFormats,
+       elliptic_curves = EllipticCurves,
+       next_protocol_negotiation =
+	   encode_client_protocol_negotiation(SslOpts#ssl_options.next_protocol_selector,
+					      Renegotiation),
+       sni = sni(Host, SslOpts#ssl_options.server_name_indication)}.
+
+%%--------------------------------------------------------------------
+-spec certificate(der_cert(), db_handle(), certdb_ref(), client | server) -> #certificate{} | #alert{}.
+%%
+%% Description: Creates a certificate message.
+%%--------------------------------------------------------------------
+certificate(OwnCert, CertDbHandle, CertDbRef, client) ->
+    Chain =
+	case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
+	    {ok, CertChain} ->
+		CertChain;
+	    {error, _} ->
+		%% If no suitable certificate is available, the client
+		%% SHOULD send a certificate message containing no
+		%% certificates. (chapter 7.4.6. RFC 4346)
+		[]
+	end,
+    #certificate{asn1_certificates = Chain};
+
+certificate(OwnCert, CertDbHandle, CertDbRef, server) ->
+    case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
+	{ok, Chain} ->
+	    #certificate{asn1_certificates = Chain};
+	{error, _} ->
+	    ?ALERT_REC(?FATAL, ?INTERNAL_ERROR)
+    end.
+
+%%--------------------------------------------------------------------
+-spec next_protocol(binary()) -> #next_protocol{}.
+%%
+%% Description: Creates a next protocol message
+%%-------------------------------------------------------------------
+next_protocol(SelectedProtocol) ->
+  #next_protocol{selected_protocol = SelectedProtocol}.
+
+%%--------------------------------------------------------------------
+-spec client_certificate_verify(undefined | der_cert(), binary(),
+				tls_version(), term(), public_key:private_key(),
+				tls_handshake_history()) ->
+    #certificate_verify{} | ignore | #alert{}.
+%%
+%% Description: Creates a certificate_verify message, called by the client.
+%%--------------------------------------------------------------------
+client_certificate_verify(undefined, _, _, _, _, _) ->
+    ignore;
+client_certificate_verify(_, _, _, _, undefined, _) ->
+    ignore;
+client_certificate_verify(OwnCert, MasterSecret, Version,
+			  {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, HashAlgo, MasterSecret, Handshake),
+	    Signed = digitally_signed(Version, Hashes, HashAlgo, PrivateKey),
+	    #certificate_verify{signature = Signed, hashsign_algorithm = {HashAlgo, SignAlgo}}
+    end.
+
+%%--------------------------------------------------------------------
+-spec certificate_request(erl_cipher_suite(), db_handle(), certdb_ref(), tls_version()) ->
+    #certificate_request{}.
+%%
+%% Description: Creates a certificate_request message, called by the server.
+%%--------------------------------------------------------------------
+certificate_request(CipherSuite, CertDbHandle, CertDbRef, Version) ->
+    Types = certificate_types(CipherSuite),
+    HashSigns = advertised_hash_signs(Version),
+    Authorities = certificate_authorities(CertDbHandle, CertDbRef),
+    #certificate_request{
+		    certificate_types = Types,
+		    hashsign_algorithms = HashSigns,
+		    certificate_authorities = Authorities
+		   }.
+%%--------------------------------------------------------------------
+-spec key_exchange(client | server, tls_version(),
+		   {premaster_secret, binary(), public_key_info()} |
+		   {dh, binary()} |
+		   {dh, {binary(), binary()}, #'DHParameter'{}, {HashAlgo::atom(), SignAlgo::atom()},
+		   binary(), binary(), public_key:private_key()} |
+		   {ecdh, #'ECPrivateKey'{}} |
+		   {psk, binary()} |
+		   {dhe_psk, binary(), binary()} |
+		   {srp, {binary(), binary()}, #srp_user{}, {HashAlgo::atom(), SignAlgo::atom()},
+		   binary(), binary(), public_key:private_key()}) ->
+    #client_key_exchange{} | #server_key_exchange{}.
+
+%%
+%% Description: Creates a keyexchange message.
+%%--------------------------------------------------------------------
+key_exchange(client, _Version, {premaster_secret, Secret, {_, PublicKey, _}}) ->
+    EncPremasterSecret =
+	encrypted_premaster_secret(Secret, PublicKey),
+    #client_key_exchange{exchange_keys = EncPremasterSecret};
+
+key_exchange(client, _Version, {dh, PublicKey}) ->
+    #client_key_exchange{
+	      exchange_keys = #client_diffie_hellman_public{
+		dh_public = PublicKey}
+	       };
+
+key_exchange(client, _Version, {ecdh, #'ECPrivateKey'{publicKey = {0, ECPublicKey}}}) ->
+    #client_key_exchange{
+	      exchange_keys = #client_ec_diffie_hellman_public{
+		dh_public = ECPublicKey}
+	       };
+
+key_exchange(client, _Version, {psk, Identity}) ->
+    #client_key_exchange{
+       exchange_keys = #client_psk_identity{
+			  identity = Identity}
+      };
+
+key_exchange(client, _Version, {dhe_psk, Identity, PublicKey}) ->
+    #client_key_exchange{
+	      exchange_keys = #client_dhe_psk_identity{
+		identity = Identity,
+		dh_public = PublicKey}
+	       };
+
+key_exchange(client, _Version, {psk_premaster_secret, PskIdentity, Secret, {_, PublicKey, _}}) ->
+    EncPremasterSecret =
+	encrypted_premaster_secret(Secret, PublicKey),
+    #client_key_exchange{
+       exchange_keys = #client_rsa_psk_identity{
+			  identity = PskIdentity,
+			  exchange_keys = EncPremasterSecret}};
+
+key_exchange(client, _Version, {srp, PublicKey}) ->
+    #client_key_exchange{
+       exchange_keys = #client_srp_public{
+			  srp_a = PublicKey}
+      };
+
+key_exchange(server, Version, {dh, {PublicKey, _},
+			       #'DHParameter'{prime = P, base = G},
+			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
+    ServerDHParams = #server_dh_params{dh_p = int_to_bin(P),
+				       dh_g = int_to_bin(G), dh_y = PublicKey},
+    enc_server_key_exchange(Version, ServerDHParams, HashSign,
+			    ClientRandom, ServerRandom, PrivateKey);
+
+key_exchange(server, Version, {ecdh,  #'ECPrivateKey'{publicKey =  {0, ECPublicKey},
+						      parameters = ECCurve}, HashSign,
+			       ClientRandom, ServerRandom, PrivateKey}) ->
+    ServerECParams = #server_ecdh_params{curve = ECCurve, public = ECPublicKey},
+    enc_server_key_exchange(Version, ServerECParams, HashSign,
+			    ClientRandom, ServerRandom, PrivateKey);
+
+key_exchange(server, Version, {psk, PskIdentityHint,
+			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
+    ServerPSKParams = #server_psk_params{hint = PskIdentityHint},
+    enc_server_key_exchange(Version, ServerPSKParams, HashSign,
+			    ClientRandom, ServerRandom, PrivateKey);
+
+key_exchange(server, Version, {dhe_psk, PskIdentityHint, {PublicKey, _},
+			       #'DHParameter'{prime = P, base = G},
+			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
+    ServerEDHPSKParams = #server_dhe_psk_params{
+      hint = PskIdentityHint,
+      dh_params = #server_dh_params{dh_p = int_to_bin(P),
+				    dh_g = int_to_bin(G), dh_y = PublicKey}
+     },
+    enc_server_key_exchange(Version, ServerEDHPSKParams,
+			    HashSign, ClientRandom, ServerRandom, PrivateKey);
+
+key_exchange(server, Version, {srp, {PublicKey, _},
+			       #srp_user{generator = Generator, prime = Prime,
+					 salt = Salt},
+			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
+    ServerSRPParams = #server_srp_params{srp_n = Prime, srp_g = Generator,
+					 srp_s = Salt, srp_b = PublicKey},
+    enc_server_key_exchange(Version, ServerSRPParams, HashSign,
+			    ClientRandom, ServerRandom, PrivateKey).
+
+%%--------------------------------------------------------------------
+-spec finished(tls_version(), client | server, integer(), binary(), tls_handshake_history()) ->
+    #finished{}.
+%%
+%% Description: Creates a handshake finished message
+%%-------------------------------------------------------------------
+finished(Version, Role, PrfAlgo, MasterSecret, {Handshake, _}) -> % use the current handshake
+    #finished{verify_data =
+	      calc_finished(Version, Role, PrfAlgo, MasterSecret, Handshake)}.
+
+%% ---------- Handle handshake messages  ----------
+
+verify_server_key(#server_key_params{params = Params,
+				     params_bin = EncParams,
+				     signature = Signature},
+		  HashSign = {HashAlgo, _},
+		  ConnectionStates, Version, PubKeyInfo) ->
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    Hash = server_key_exchange_hash(HashAlgo,
+				    <<ClientRandom/binary,
+				      ServerRandom/binary,
+				      EncParams/binary>>),
+    verify_signature(Version, Hash, HashSign, Signature, PubKeyInfo).
+
+%%--------------------------------------------------------------------
+-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, PublicKeyInfo, Version,
+		   HashSign = {HashAlgo, _}, MasterSecret, {_, Handshake}) ->
+    Hash = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
+    case verify_signature(Version, Hash, HashSign, Signature, PublicKeyInfo) of
+	true ->
+	    valid;
+	_ ->
+	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
+    end.
+%%--------------------------------------------------------------------
+-spec verify_signature(tls_version(), binary(), {term(), term()}, binary(),
+				   public_key_info()) -> true | false.
+%%
+%% Description: Checks that a public_key signature is valid.
+%%--------------------------------------------------------------------
+verify_signature(_Version, _Hash, {_HashAlgo, anon}, _Signature, _) ->
+    true;
+verify_signature({3, Minor}, Hash, {HashAlgo, rsa}, Signature, {?rsaEncryption, PubKey, _PubKeyParams})
+  when Minor >= 3 ->
+    public_key:verify({digest, Hash}, HashAlgo, Signature, PubKey);
+verify_signature(_Version, Hash, _HashAlgo, Signature, {?rsaEncryption, PubKey, _PubKeyParams}) ->
+    case public_key:decrypt_public(Signature, PubKey,
+				   [{rsa_pad, rsa_pkcs1_padding}]) of
+	Hash -> true;
+	_    -> false
+    end;
+verify_signature(_Version, Hash, {HashAlgo, dsa}, Signature, {?'id-dsa', PublicKey, PublicKeyParams}) ->
+    public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams});
+verify_signature(_Version, Hash, {HashAlgo, ecdsa}, Signature,
+		 {?'id-ecPublicKey', PublicKey, PublicKeyParams}) ->
+    public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams}).
+
+%%--------------------------------------------------------------------
+-spec certify(#certificate{}, db_handle(), certdb_ref(), integer() | nolimit,
+	      verify_peer | verify_none, {fun(), term},
+	      client | server) ->  {der_cert(), public_key_info()} | #alert{}.
+%%
+%% Description: Handles a certificate handshake message
+%%--------------------------------------------------------------------
+certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef,
+	MaxPathLen, _Verify, VerifyFunAndState, Role) ->
+    [PeerCert | _] = ASN1Certs,
+
+    ValidationFunAndState =
+	case VerifyFunAndState of
+	    undefined ->
+		{fun(OtpCert, ExtensionOrVerifyResult, SslState) ->
+			 ssl_certificate:validate_extension(OtpCert,
+							    ExtensionOrVerifyResult, SslState)
+		 end, Role};
+	    {Fun, UserState0} ->
+		{fun(OtpCert, {extension, _} = Extension, {SslState, UserState}) ->
+			 case ssl_certificate:validate_extension(OtpCert,
+								 Extension,
+								 SslState) of
+			     {valid, NewSslState} ->
+				 {valid, {NewSslState, UserState}};
+			     {fail, Reason} ->
+				 apply_user_fun(Fun, OtpCert, Reason, UserState,
+						SslState);
+			     {unknown, _} ->
+				 apply_user_fun(Fun, OtpCert,
+						Extension, UserState, SslState)
+			 end;
+		    (OtpCert, VerifyResult, {SslState, UserState}) ->
+			 apply_user_fun(Fun, OtpCert, VerifyResult, UserState,
+					SslState)
+		 end, {Role, UserState0}}
+	end,
+
+    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.
+
+%%--------------------------------------------------------------------
+-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, PrfAlgo, MasterSecret, {_, Handshake}) ->
+    %% use the previous hashes
+    case calc_finished(Version, Role, PrfAlgo, MasterSecret, Handshake) of
+	Data ->
+	    verified;
+	_ ->
+	    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
+    end.
+
+%%--------------------------------------------------------------------
+-spec init_handshake_history() -> tls_handshake_history().
+
+%%
+%% Description: Initialize the empty handshake history buffer.
+%%--------------------------------------------------------------------
+init_handshake_history() ->
+    {[], []}.
+
+%%--------------------------------------------------------------------
+-spec update_handshake_history(tls_handshake_history(), Data ::term()) ->
+				      tls_handshake_history().
+%%
+%% Description: Update the handshake history buffer with Data.
+%%--------------------------------------------------------------------
+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().
+
+%% %%
+%% %% Description: Public key decryption using the private key.
+%% %%--------------------------------------------------------------------
+%% decrypt_premaster_secret(Secret, RSAPrivateKey) ->
+%%     try public_key:decrypt_private(Secret, RSAPrivateKey,
+%% 				   [{rsa_pad, rsa_pkcs1_padding}])
+%%     catch
+%% 	_:_ ->
+%% 	    throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR))
+%%     end.
+
+premaster_secret(OtherPublicDhKey, MyPrivateKey, #'DHParameter'{} = Params) ->
+    public_key:compute_key(OtherPublicDhKey, MyPrivateKey, Params);
+
+premaster_secret(PublicDhKey, PrivateDhKey, #server_dh_params{dh_p = Prime, dh_g = Base}) ->
+    crypto:compute_key(dh, PublicDhKey, PrivateDhKey, [Prime, Base]);
+premaster_secret(#client_srp_public{srp_a = ClientPublicKey}, ServerKey, #srp_user{prime = Prime,
+										   verifier = Verifier}) ->
+    case crypto:compute_key(srp, ClientPublicKey, ServerKey, {host, [Verifier, Prime, '6a']}) of
+	error ->
+	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+	PremasterSecret ->
+	    PremasterSecret
+    end;
+
+premaster_secret(#server_srp_params{srp_n = Prime, srp_g = Generator, srp_s = Salt, srp_b = Public},
+		 ClientKeys, {Username, Password}) ->
+    case ssl_srp_primes:check_srp_params(Generator, Prime) of
+	ok ->
+	    DerivedKey = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
+	    case crypto:compute_key(srp, Public, ClientKeys, {user, [DerivedKey, Prime, Generator, '6a']}) of
+		error ->
+		    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
+		PremasterSecret ->
+		    PremasterSecret
+	    end;
+	_ ->
+	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
+    end;
+
+premaster_secret(#client_rsa_psk_identity{
+		    identity = PSKIdentity,
+		    exchange_keys = #encrypted_premaster_secret{premaster_secret = EncPMS}
+		   }, #'RSAPrivateKey'{} = Key, PSKLookup) ->
+    PremasterSecret = premaster_secret(EncPMS, Key),
+    psk_secret(PSKIdentity, PSKLookup, PremasterSecret);
+
+premaster_secret(#server_dhe_psk_params{
+		    hint = IdentityHint,
+		    dh_params =  #server_dh_params{dh_y = PublicDhKey} = Params},
+		    PrivateDhKey,
+		    LookupFun) ->
+    PremasterSecret = premaster_secret(PublicDhKey, PrivateDhKey, Params),
+    psk_secret(IdentityHint, LookupFun, PremasterSecret);
+
+premaster_secret({rsa_psk, PSKIdentity}, PSKLookup, RSAPremasterSecret) ->
+    psk_secret(PSKIdentity, PSKLookup, RSAPremasterSecret).
+
+premaster_secret(#client_dhe_psk_identity{
+		    identity =  PSKIdentity,
+		    dh_public = PublicDhKey}, PrivateKey, #'DHParameter'{} = Params, PSKLookup) ->
+    PremasterSecret = premaster_secret(PublicDhKey, PrivateKey, Params),
+    psk_secret(PSKIdentity, PSKLookup, PremasterSecret).
+
+premaster_secret(#client_psk_identity{identity = PSKIdentity}, PSKLookup) ->
+    psk_secret(PSKIdentity, PSKLookup);
+
+premaster_secret({psk, PSKIdentity}, PSKLookup) ->
+    psk_secret(PSKIdentity, PSKLookup);
+
+premaster_secret(#'ECPoint'{} = ECPoint, #'ECPrivateKey'{} = ECDHKeys) ->
+    public_key:compute_key(ECPoint, ECDHKeys);
+premaster_secret(EncSecret, #'RSAPrivateKey'{} = RSAPrivateKey) ->
+    try public_key:decrypt_private(EncSecret, RSAPrivateKey,
+				   [{rsa_pad, rsa_pkcs1_padding}])
+    catch
+	_:_ ->
+	    throw(?ALERT_REC(?FATAL, ?DECRYPT_ERROR))
+    end.
+%%--------------------------------------------------------------------
+-spec server_key_exchange_hash(md5sha | md5 | sha | sha224 |sha256 | sha384 | sha512, binary()) -> binary().
+%%
+%% Description: Calculate server key exchange hash
+%%--------------------------------------------------------------------
+server_key_exchange_hash(md5sha, Value) ->
+    MD5 = crypto:hash(md5, Value),
+    SHA = crypto:hash(sha, Value),
+    <<MD5/binary, SHA/binary>>;
+
+server_key_exchange_hash(Hash, Value) ->
+    crypto:hash(Hash, Value).
+%%--------------------------------------------------------------------
+-spec prf(tls_version(), binary(), binary(), [binary()], non_neg_integer()) ->
+		 {ok, binary()} | {error, undefined}.
+%%
+%% Description: use the TLS PRF to generate key material
+%%--------------------------------------------------------------------
+prf({3,0}, _, _, _, _) ->
+    {error, undefined};
+prf({3,1}, Secret, Label, Seed, WantedLength) ->
+    {ok, tls_v1:prf(?MD5SHA, Secret, Label, Seed, WantedLength)};
+prf({3,_N}, Secret, Label, Seed, WantedLength) ->
+    {ok, tls_v1:prf(?SHA256, Secret, Label, Seed, WantedLength)}.
+%%--------------------------------------------------------------------
+-spec select_hashsign(#hash_sign_algos{}| undefined,  undefined | binary()) ->
+			      [{atom(), atom()}] | undefined.
+
+%%
+%% Description:
+%%--------------------------------------------------------------------
+select_hashsign(_, undefined) ->
+    {null, anon};
+select_hashsign(undefined,  Cert) ->
+    #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
+    #'OTPSubjectPublicKeyInfo'{algorithm = {_,Algo, _}} = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
+    select_cert_hashsign(undefined, Algo, {undefined, undefined});
+select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert) ->
+    #'OTPCertificate'{tbsCertificate = TBSCert} =public_key:pkix_decode_cert(Cert, otp),
+    #'OTPSubjectPublicKeyInfo'{algorithm = {_,Algo, _}} = TBSCert#'OTPTBSCertificate'.subjectPublicKeyInfo,
+    DefaultHashSign = {_, Sign} = select_cert_hashsign(undefined, Algo, {undefined, undefined}),
+    case lists:filter(fun({sha, dsa}) ->
+			      true;
+			 ({_, dsa}) ->
+			      false;
+			 ({Hash, S}) when  S == Sign ->
+			      ssl_cipher:is_acceptable_hash(Hash,
+							    proplists:get_value(hashs, crypto:supports()));
+			 (_)  ->
+			      false
+		      end, HashSigns) of
+	[] ->
+	    DefaultHashSign;
+	[HashSign| _] ->
+	    HashSign
+    end.
+%%--------------------------------------------------------------------
+-spec select_cert_hashsign(#hash_sign_algos{}| undefined, oid(), tls_version() | {undefined, undefined}) ->
+				  {atom(), atom()}.
+
+%%
+%% Description: For TLS 1.2 selected cert_hash_sign will be recived
+%% in the handshake message, for previous versions use appropriate defaults.
+%% This function is also used by select_hashsign to extract
+%% the alogrithm of the server cert key.
+%%--------------------------------------------------------------------
+select_cert_hashsign(HashSign, _, {Major, Minor}) when HashSign =/= undefined andalso
+						       Major >= 3 andalso Minor >= 3 ->
+    HashSign;
+select_cert_hashsign(undefined,?'id-ecPublicKey', _) ->
+    {sha, ecdsa};
+select_cert_hashsign(undefined, ?rsaEncryption, _) ->
+    {md5sha, rsa};
+select_cert_hashsign(undefined, ?'id-dsa', _) ->
+    {sha, dsa}.
+
+%%--------------------------------------------------------------------
+-spec master_secret(atom(), tls_version(), #session{} | binary(), #connection_states{},
+		   client | server) -> {binary(), #connection_states{}} | #alert{}.
+%%
+%% Description: Sets or calculates the master secret and calculate keys,
+%% updating the pending connection states. The Mastersecret and the update
+%% connection states are returned or an alert if the calculation fails.
+%%-------------------------------------------------------------------
+master_secret(RecordCB, Version, #session{master_secret = Mastersecret},
+	      ConnectionStates, Role) ->
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    try master_secret(RecordCB, Version, Mastersecret, SecParams,
+		      ConnectionStates, Role)
+    catch
+	exit:Reason ->
+	    Report = io_lib:format("Key calculation failed due to ~p",
+				   [Reason]),
+	    error_logger:error_report(Report),
+	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
+    end;
+
+master_secret(RecordCB, Version, PremasterSecret, ConnectionStates, Role) ->
+    ConnectionState =
+	ssl_record:pending_connection_state(ConnectionStates, read),
+    SecParams = ConnectionState#connection_state.security_parameters,
+    #security_parameters{prf_algorithm = PrfAlgo,
+			 client_random = ClientRandom,
+			 server_random = ServerRandom} = SecParams,
+    try master_secret(RecordCB, Version,
+		      calc_master_secret(Version,PrfAlgo,PremasterSecret,
+					 ClientRandom, ServerRandom),
+		      SecParams, ConnectionStates, Role)
+    catch
+	exit:Reason ->
+	    Report = io_lib:format("Master secret calculation failed"
+				   " due to ~p", [Reason]),
+	    error_logger:error_report(Report),
+	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
+    end.
+
+%%-------------Encode/Decode --------------------------------
+encode_handshake(#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)>>};
+
+encode_handshake(#server_hello{server_version = {Major, Minor},
+			       random = Random,
+			       session_id = Session_ID,
+			       cipher_suite = CipherSuite,
+			       compression_method = Comp_method,
+			       extensions = #hello_extensions{} = Extensions}, _Version) ->
+			SID_length = byte_size(Session_ID),
+    ExtensionsBin = encode_hello_extensions(Extensions),
+    {?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+		     ?BYTE(SID_length), Session_ID/binary,
+                     CipherSuite/binary, ?BYTE(Comp_method), ExtensionsBin/binary>>};
+encode_handshake(#certificate{asn1_certificates = ASN1CertList}, _Version) ->
+    ASN1Certs = certs_from_list(ASN1CertList),
+    ACLen = erlang:iolist_size(ASN1Certs),
+    {?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>};
+encode_handshake(#server_key_exchange{exchange_keys = Keys}, _Version) ->
+    {?SERVER_KEY_EXCHANGE, Keys};
+encode_handshake(#server_key_params{params_bin = Keys, hashsign = HashSign,
+			  signature = Signature}, Version) ->
+    EncSign = enc_sign(HashSign, Signature, Version),
+    {?SERVER_KEY_EXCHANGE, <<Keys/binary, EncSign/binary>>};
+encode_handshake(#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>>
+    };
+encode_handshake(#certificate_request{certificate_types = CertTypes,
+			    certificate_authorities = CertAuths},
+       _Version) ->
+    CertTypesLen = byte_size(CertTypes),
+    CertAuthsLen = byte_size(CertAuths),
+    {?CERTIFICATE_REQUEST,
+       <<?BYTE(CertTypesLen), CertTypes/binary,
+	?UINT16(CertAuthsLen), CertAuths/binary>>
+    };
+encode_handshake(#server_hello_done{}, _Version) ->
+    {?SERVER_HELLO_DONE, <<>>};
+encode_handshake(#client_key_exchange{exchange_keys = ExchangeKeys}, Version) ->
+    {?CLIENT_KEY_EXCHANGE, encode_client_key(ExchangeKeys, Version)};
+encode_handshake(#certificate_verify{signature = BinSig, hashsign_algorithm = HashSign}, Version) ->
+    EncSig = enc_sign(HashSign, BinSig, Version),
+    {?CERTIFICATE_VERIFY, EncSig};
+encode_handshake(#finished{verify_data = VerifyData}, _Version) ->
+    {?FINISHED, VerifyData}.
+
+encode_hello_extensions(#hello_extensions{} = Extensions) ->
+    encode_hello_extensions(hello_extensions_list(Extensions), <<>>).
+encode_hello_extensions([], <<>>) ->
+    <<>>;
+encode_hello_extensions([], Acc) ->
+    Size = byte_size(Acc),
+    <<?UINT16(Size), Acc/binary>>;
+
+encode_hello_extensions([#next_protocol_negotiation{extension_data = ExtensionData} | Rest], Acc) ->
+    Len = byte_size(ExtensionData),
+    encode_hello_extensions(Rest, <<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len),
+				    ExtensionData/binary, Acc/binary>>);
+encode_hello_extensions([#renegotiation_info{renegotiated_connection = undefined} | Rest], Acc) ->
+    encode_hello_extensions(Rest, Acc);
+encode_hello_extensions([#renegotiation_info{renegotiated_connection = ?byte(0) = Info} | Rest], Acc) ->
+    Len = byte_size(Info),
+    encode_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info/binary, Acc/binary>>);
+
+encode_hello_extensions([#renegotiation_info{renegotiated_connection = Info} | Rest], Acc) ->
+    InfoLen = byte_size(Info),
+    Len = InfoLen +1,
+    encode_hello_extensions(Rest, <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), ?BYTE(InfoLen),
+				    Info/binary, Acc/binary>>);
+encode_hello_extensions([#elliptic_curves{elliptic_curve_list = EllipticCurves} | Rest], Acc) ->
+
+    EllipticCurveList = << <<(tls_v1:oid_to_enum(X)):16>> || X <- EllipticCurves>>,
+    ListLen = byte_size(EllipticCurveList),
+    Len = ListLen + 2,
+    encode_hello_extensions(Rest, <<?UINT16(?ELLIPTIC_CURVES_EXT),
+				 ?UINT16(Len), ?UINT16(ListLen), EllipticCurveList/binary, Acc/binary>>);
+encode_hello_extensions([#ec_point_formats{ec_point_format_list = ECPointFormats} | Rest], Acc) ->
+    ECPointFormatList = list_to_binary(ECPointFormats),
+    ListLen = byte_size(ECPointFormatList),
+    Len = ListLen + 1,
+    encode_hello_extensions(Rest, <<?UINT16(?EC_POINT_FORMATS_EXT),
+				 ?UINT16(Len), ?BYTE(ListLen), ECPointFormatList/binary, Acc/binary>>);
+encode_hello_extensions([#srp{username = UserName} | Rest], Acc) ->
+    SRPLen = byte_size(UserName),
+    Len = SRPLen + 2,
+    encode_hello_extensions(Rest, <<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen),
+				    UserName/binary, Acc/binary>>);
+encode_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,
+    encode_hello_extensions(Rest, <<?UINT16(?SIGNATURE_ALGORITHMS_EXT),
+				 ?UINT16(Len), ?UINT16(ListLen), SignAlgoList/binary, Acc/binary>>);
+encode_hello_extensions([#sni{hostname = Hostname} | Rest], Acc) ->
+    HostLen = length(Hostname),
+    HostnameBin = list_to_binary(Hostname),
+    % Hostname type (1 byte) + Hostname length (2 bytes) + Hostname (HostLen bytes)
+    ServerNameLength = 1 + 2 + HostLen,
+    % ServerNameListSize (2 bytes) + ServerNameLength
+    ExtLength = 2 + ServerNameLength,
+    encode_hello_extensions(Rest, <<?UINT16(?SNI_EXT), ?UINT16(ExtLength),
+				    ?UINT16(ServerNameLength),
+				    ?BYTE(?SNI_NAMETYPE_HOST_NAME),
+				    ?UINT16(HostLen), HostnameBin/binary,
+				    Acc/binary>>).
+
+enc_server_key_exchange(Version, Params, {HashAlgo, SignAlgo},
+			ClientRandom, ServerRandom, PrivateKey) ->
+    EncParams = encode_server_key(Params),
+    case HashAlgo of
+	null ->
+	    #server_key_params{params = Params,
+			       params_bin = EncParams,
+			       hashsign = {null, anon},
+			       signature = <<>>};
+	_ ->
+	    Hash =
+		server_key_exchange_hash(HashAlgo, <<ClientRandom/binary,
+						     ServerRandom/binary,
+						     EncParams/binary>>),
+	    Signature = digitally_signed(Version, Hash, HashAlgo, PrivateKey),
+	    #server_key_params{params = Params,
+			       params_bin = EncParams,
+			       hashsign = {HashAlgo, SignAlgo},
+			       signature = Signature}
+    end.
+
+%%--------------------------------------------------------------------
+-spec decode_client_key(binary(), key_algo(), tls_version()) ->
+			    #encrypted_premaster_secret{}
+			    | #client_diffie_hellman_public{}
+			    | #client_ec_diffie_hellman_public{}
+			    | #client_psk_identity{}
+			    | #client_dhe_psk_identity{}
+			    | #client_rsa_psk_identity{}
+			    | #client_srp_public{}.
+%%
+%% Description: Decode client_key data and return appropriate type
+%%--------------------------------------------------------------------
+decode_client_key(ClientKey, Type, Version) ->
+    dec_client_key(ClientKey, key_exchange_alg(Type), Version).
+
+%%--------------------------------------------------------------------
+-spec decode_server_key(binary(), key_algo(), tls_version()) ->
+			       #server_key_params{}.
+%%
+%% Description: Decode server_key data and return appropriate type
+%%--------------------------------------------------------------------
+decode_server_key(ServerKey, Type, Version) ->
+    dec_server_key(ServerKey, key_exchange_alg(Type), Version).
+
+encode_client_protocol_negotiation(undefined, _) ->
+    undefined;
+encode_client_protocol_negotiation(_, false) ->
+	#next_protocol_negotiation{extension_data = <<>>};
+encode_client_protocol_negotiation(_, _) ->
+	undefined.
+
+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)}.
+
+decode_handshake(_, ?HELLO_REQUEST, <<>>) ->
+    #hello_request{};
+decode_handshake(_, ?NEXT_PROTOCOL, <<?BYTE(SelectedProtocolLength),
+				      SelectedProtocol:SelectedProtocolLength/binary,
+				      ?BYTE(PaddingLength), _Padding:PaddingLength/binary>>) ->
+    #next_protocol{selected_protocol = SelectedProtocol};
+
+decode_handshake(_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{
+       server_version = {Major,Minor},
+       random = Random,
+       session_id = Session_ID,
+       cipher_suite = Cipher_suite,
+       compression_method = Comp_method,
+       extensions = #hello_extensions{}};
+
+decode_handshake(_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),
+		       ?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
+
+    HelloExtensions = decode_hello_extensions(Extensions),
+
+    #server_hello{
+       server_version = {Major,Minor},
+       random = Random,
+       session_id = Session_ID,
+       cipher_suite = Cipher_suite,
+       compression_method = Comp_method,
+       extensions = HelloExtensions};
+
+decode_handshake(_Version, ?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>) ->
+    #certificate{asn1_certificates = certs_to_list(ASN1Certs)};
+decode_handshake(_Version, ?SERVER_KEY_EXCHANGE, Keys) ->
+    #server_key_exchange{exchange_keys = Keys};
+decode_handshake({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};
+decode_handshake(_Version, ?CERTIFICATE_REQUEST,
+       <<?BYTE(CertTypesLen), CertTypes:CertTypesLen/binary,
+	?UINT16(CertAuthsLen), CertAuths:CertAuthsLen/binary>>) ->
+    #certificate_request{certificate_types = CertTypes,
+			 certificate_authorities = CertAuths};
+decode_handshake(_Version, ?SERVER_HELLO_DONE, <<>>) ->
+    #server_hello_done{};
+decode_handshake({Major, Minor}, ?CERTIFICATE_VERIFY,<<HashSign:2/binary, ?UINT16(SignLen),
+						       Signature:SignLen/binary>>)
+  when Major == 3, Minor >= 3 ->
+    #certificate_verify{hashsign_algorithm = dec_hashsign(HashSign), signature = Signature};
+decode_handshake(_Version, ?CERTIFICATE_VERIFY,<<?UINT16(SignLen), Signature:SignLen/binary>>)->
+    #certificate_verify{signature = Signature};
+decode_handshake(_Version, ?CLIENT_KEY_EXCHANGE, PKEPMS) ->
+    #client_key_exchange{exchange_keys = PKEPMS};
+decode_handshake(_Version, ?FINISHED, VerifyData) ->
+    #finished{verify_data = VerifyData};
+decode_handshake(_, _, _) ->
+    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
+
+%%--------------------------------------------------------------------
+-spec decode_hello_extensions({client, binary()} | binary()) -> #hello_extensions{}.
+%%
+%% Description: Decodes TLS hello extensions
+%%--------------------------------------------------------------------
+decode_hello_extensions({client, <<>>}) ->
+    #hello_extensions{};
+decode_hello_extensions({client, <<?UINT16(ExtLen), Extensions:ExtLen/binary>>}) ->
+    decode_hello_extensions(Extensions);
+decode_hello_extensions(Extensions) ->
+    dec_hello_extensions(Extensions, #hello_extensions{}).
+
+dec_server_key(<<?UINT16(PLen), P:PLen/binary,
+		 ?UINT16(GLen), G:GLen/binary,
+		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, Version) ->
+    Params = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(PLen + GLen + YLen + 6, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+%% ECParameters with named_curve
+%% TODO: explicit curve
+dec_server_key(<<?BYTE(?NAMED_CURVE), ?UINT16(CurveID),
+		 ?BYTE(PointLen), ECPoint:PointLen/binary,
+		 _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, Version) ->
+    Params = #server_ecdh_params{curve = {namedCurve, tls_v1:enum_to_oid(CurveID)},
+				 public = ECPoint},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(PointLen + 4, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(<<?UINT16(Len), PskIdentityHint:Len/binary, _/binary>> = KeyStruct,
+	       KeyExchange, Version)
+  when KeyExchange == ?KEY_EXCHANGE_PSK; KeyExchange == ?KEY_EXCHANGE_RSA_PSK ->
+    Params = #server_psk_params{
+		hint = PskIdentityHint},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + 2, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
+		 ?UINT16(PLen), P:PLen/binary,
+		 ?UINT16(GLen), G:GLen/binary,
+		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_DHE_PSK, Version) ->
+    DHParams = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
+    Params = #server_dhe_psk_params{
+      hint = IdentityHint,
+      dh_params = DHParams},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(Len + PLen + GLen + YLen + 8, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(<<?UINT16(NLen), N:NLen/binary,
+		 ?UINT16(GLen), G:GLen/binary,
+		 ?BYTE(SLen), S:SLen/binary,
+		 ?UINT16(BLen), B:BLen/binary, _/binary>> = KeyStruct,
+	       ?KEY_EXCHANGE_SRP, Version) ->
+    Params = #server_srp_params{srp_n = N, srp_g = G, srp_s = S, srp_b = B},
+    {BinMsg, HashSign, Signature} = dec_server_key_params(NLen + GLen + SLen + BLen + 7, KeyStruct, Version),
+    #server_key_params{params = Params,
+		       params_bin = BinMsg,
+		       hashsign = HashSign,
+		       signature = Signature};
+dec_server_key(_, _, _) ->
+    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
+
+%%--------------------------------------------------------------------
+-spec decode_suites('2_bytes'|'3_bytes', binary()) -> list().
+%%
+%% Description:
+%%--------------------------------------------------------------------
+decode_suites('2_bytes', Dec) ->
+    from_2bytes(Dec);
+decode_suites('3_bytes', Dec) ->
+    from_3bytes(Dec).
+
+%%-------------Cipeher suite handling --------------------------------
+
+available_suites(UserSuites, Version) ->
+    case UserSuites of
+	[] ->
+	    ssl_cipher:suites(Version);
+	_ ->
+	    UserSuites
+    end.
+
+available_suites(ServerCert, UserSuites, Version, Curve) ->
+    ssl_cipher:filter(ServerCert, available_suites(UserSuites, Version))
+	-- unavailable_ecc_suites(Curve).
+
+unavailable_ecc_suites(no_curve) ->
+    ssl_cipher:ec_keyed_suites();
+unavailable_ecc_suites(_) ->
+    [].
+
+cipher_suites(Suites, false) ->
+    [?TLS_EMPTY_RENEGOTIATION_INFO_SCSV | Suites];
+cipher_suites(Suites, true) ->
+    Suites.
+
+select_session(SuggestedSessionId, CipherSuites, Compressions, Port, #session{ecc = ECCCurve} = 
+		   Session, Version,
+	       #ssl_options{ciphers = UserSuites, honor_cipher_order = HCO} = SslOpts,
+	       Cache, CacheCb, Cert) ->
+    {SessionId, Resumed} = ssl_session:server_id(Port, SuggestedSessionId,
+						 SslOpts, Cert,
+						 Cache, CacheCb),
+    case Resumed of
+        undefined ->
+	    Suites = available_suites(Cert, UserSuites, Version, ECCCurve),
+	    CipherSuite = select_cipher_suite(CipherSuites, Suites, HCO),
+	    Compression = select_compression(Compressions),
+	    {new, Session#session{session_id = SessionId,
+				  cipher_suite = CipherSuite,
+				  compression_method = Compression}};
+	_ ->
+	    {resumed, Resumed}
+    end.
+
+supported_ecc({Major, Minor} = Version) when ((Major == 3) and (Minor >= 1)) orelse (Major > 3) ->
+    Curves = tls_v1:ecc_curves(Version),
+    #elliptic_curves{elliptic_curve_list = Curves};
+supported_ecc(_) ->
+    #elliptic_curves{elliptic_curve_list = []}.
+
+%%-------------certificate handling --------------------------------
+
+certificate_types({KeyExchange, _, _, _})
+  when KeyExchange == rsa;
+       KeyExchange == dhe_dss;
+       KeyExchange == dhe_rsa;
+       KeyExchange == ecdhe_rsa ->
+    <<?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>;
+
+certificate_types({KeyExchange, _, _, _})
+  when KeyExchange == dh_ecdsa;
+       KeyExchange == dhe_ecdsa ->
+    <<?BYTE(?ECDSA_SIGN)>>;
+
+certificate_types(_) ->
+    <<?BYTE(?RSA_SIGN)>>.
+
+certificate_authorities(CertDbHandle, CertDbRef) ->
+    Authorities = certificate_authorities_from_db(CertDbHandle, CertDbRef),
+    Enc = fun(#'OTPCertificate'{tbsCertificate=TBSCert}) ->
+		  OTPSubj = TBSCert#'OTPTBSCertificate'.subject,
+		  DNEncodedBin = public_key:pkix_encode('Name', OTPSubj, otp),
+		  DNEncodedLen = byte_size(DNEncodedBin),
+		  <<?UINT16(DNEncodedLen), DNEncodedBin/binary>>
+	  end,
+    list_to_binary([Enc(Cert) || {_, Cert} <- Authorities]).
+
+certificate_authorities_from_db(CertDbHandle, CertDbRef) ->
+    ConnectionCerts = fun({{Ref, _, _}, Cert}, Acc) when Ref  == CertDbRef ->
+			      [Cert | Acc];
+			 (_, Acc) ->
+			      Acc
+		      end,
+    ssl_pkix_db:foldl(ConnectionCerts, [], CertDbHandle).
+
+%%-------------Extension handling --------------------------------
+
+handle_client_hello_extensions(RecordCB, Random, ClientCipherSuites,
+			       #hello_extensions{renegotiation_info = Info,
+						 srp = SRP,
+						 ec_point_formats = ECCFormat,
+						 next_protocol_negotiation = NextProtocolNegotiation}, Version,
+			       #ssl_options{secure_renegotiate = SecureRenegotation} = Opts,
+			       #session{cipher_suite = NegotiatedCipherSuite,
+					compression_method = Compression} = Session0,
+			       ConnectionStates0, Renegotiation) ->
+    Session = handle_srp_extension(SRP, Session0),
+    ConnectionStates = handle_renegotiation_extension(server, RecordCB, Version, Info,
+						      Random, NegotiatedCipherSuite, 
+						      ClientCipherSuites, Compression,
+						      ConnectionStates0, Renegotiation, SecureRenegotation),
+    ProtocolsToAdvertise = handle_next_protocol_extension(NextProtocolNegotiation, Renegotiation, Opts),
+   
+    ServerHelloExtensions =  #hello_extensions{
+				renegotiation_info = renegotiation_info(RecordCB, server,
+									ConnectionStates, Renegotiation),
+				ec_point_formats = server_ecc_extension(Version, ECCFormat),
+				next_protocol_negotiation =
+				    encode_protocols_advertised_on_server(ProtocolsToAdvertise)
+			       },
+    {Session, ConnectionStates, ServerHelloExtensions}.
+
+handle_server_hello_extensions(RecordCB, Random, CipherSuite, Compression,
+			       #hello_extensions{renegotiation_info = Info,
+						 next_protocol_negotiation = NextProtocolNegotiation}, Version,
+			       #ssl_options{secure_renegotiate = SecureRenegotation,
+					    next_protocol_selector = NextProtoSelector},
+			       ConnectionStates0, Renegotiation) ->
+    ConnectionStates = handle_renegotiation_extension(client, RecordCB, Version, Info, Random, 
+						      CipherSuite, undefined,
+						      Compression, ConnectionStates0,
+						      Renegotiation, SecureRenegotation),
+    case handle_next_protocol(NextProtocolNegotiation, NextProtoSelector, Renegotiation) of
+	#alert{} = Alert ->
+	    Alert;
+	Protocol ->
+	    {ConnectionStates, Protocol}
+    end.
+
+select_version(RecordCB, ClientVersion, Versions) ->
+    ServerVersion = RecordCB:highest_protocol_version(Versions),
+    RecordCB:lowest_protocol_version(ClientVersion, ServerVersion).
+
+renegotiation_info(_, client, _, false) ->
+    #renegotiation_info{renegotiated_connection = undefined};
+renegotiation_info(_RecordCB, server, ConnectionStates, false) ->
+    CS  = ssl_record:current_connection_state(ConnectionStates, read),
+    case CS#connection_state.secure_renegotiation of
+	true ->
+	    #renegotiation_info{renegotiated_connection = ?byte(0)};
+	false ->
+	    #renegotiation_info{renegotiated_connection = undefined}
+    end;
+renegotiation_info(_RecordCB, client, ConnectionStates, true) ->
+    CS = ssl_record:current_connection_state(ConnectionStates, read),
+    case CS#connection_state.secure_renegotiation of
+	true ->
+	    Data = CS#connection_state.client_verify_data,
+	    #renegotiation_info{renegotiated_connection = Data};
+	false ->
+	    #renegotiation_info{renegotiated_connection = undefined}
+    end;
+
+renegotiation_info(_RecordCB, server, ConnectionStates, true) ->
+    CS = ssl_record:current_connection_state(ConnectionStates, read),
+    case CS#connection_state.secure_renegotiation of
+	true ->
+	    CData = CS#connection_state.client_verify_data,
+	    SData  =CS#connection_state.server_verify_data,
+	    #renegotiation_info{renegotiated_connection = <<CData/binary, SData/binary>>};
+	false ->
+	    #renegotiation_info{renegotiated_connection = undefined}
+    end.
+
+handle_renegotiation_info(_RecordCB, _, #renegotiation_info{renegotiated_connection = ?byte(0)},
+			  ConnectionStates, false, _, _) ->
+    {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
+
+handle_renegotiation_info(_RecordCB, server, undefined, ConnectionStates, _, _, CipherSuites) ->
+    case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
+	true ->
+	    {ok, ssl_record:set_renegotiation_flag(true, ConnectionStates)};
+	false ->
+	    {ok, ssl_record:set_renegotiation_flag(false, ConnectionStates)}
+    end;
+
+handle_renegotiation_info(_RecordCB, _, undefined, ConnectionStates, false, _, _) ->
+    {ok, ssl_record:set_renegotiation_flag(false, ConnectionStates)};
+
+handle_renegotiation_info(_RecordCB, client, #renegotiation_info{renegotiated_connection = ClientServerVerify},
+			  ConnectionStates, true, _, _) ->
+    CS = ssl_record:current_connection_state(ConnectionStates, read),
+    CData = CS#connection_state.client_verify_data,
+    SData = CS#connection_state.server_verify_data,
+    case <<CData/binary, SData/binary>> == ClientServerVerify of
+	true ->
+	    {ok, ConnectionStates};
+	false ->
+	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
+    end;
+handle_renegotiation_info(_RecordCB, server, #renegotiation_info{renegotiated_connection = ClientVerify},
+			  ConnectionStates, true, _, CipherSuites) ->
+
+      case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
+	  true ->
+	      ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
+	  false ->
+	      CS = ssl_record:current_connection_state(ConnectionStates, read),
+	      Data = CS#connection_state.client_verify_data,
+	      case Data == ClientVerify of
+		  true ->
+		      {ok, ConnectionStates};
+		  false ->
+		      ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
+	      end
+      end;
+
+handle_renegotiation_info(RecordCB, client, undefined, ConnectionStates, true, SecureRenegotation, _) ->
+    handle_renegotiation_info(RecordCB, ConnectionStates, SecureRenegotation);
+
+handle_renegotiation_info(RecordCB, server, undefined, ConnectionStates, true, SecureRenegotation, CipherSuites) ->
+     case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
+	  true ->
+	     ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
+	 false ->
+	     handle_renegotiation_info(RecordCB, ConnectionStates, SecureRenegotation)
+     end.
+
+handle_renegotiation_info(_RecordCB, ConnectionStates, SecureRenegotation) ->
+    CS = ssl_record:current_connection_state(ConnectionStates, read),
+    case {SecureRenegotation, CS#connection_state.secure_renegotiation} of
+	{_, true} ->
+	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
+	{true, false} ->
+	    ?ALERT_REC(?FATAL, ?NO_RENEGOTIATION);
+	{false, false} ->
+	    {ok, ConnectionStates}
+    end.
+
+hello_extensions_list(#hello_extensions{renegotiation_info = RenegotiationInfo,
+					srp = SRP,
+					hash_signs = HashSigns,
+					ec_point_formats = EcPointFormats,
+					elliptic_curves = EllipticCurves,
+					next_protocol_negotiation = NextProtocolNegotiation,
+					sni = Sni}) ->
+    [Ext || Ext <- [RenegotiationInfo, SRP, HashSigns,
+		    EcPointFormats, EllipticCurves, NextProtocolNegotiation, Sni], Ext =/= undefined].
+
+srp_user(#ssl_options{srp_identity = {UserName, _}}) ->
+    #srp{username = UserName};
+srp_user(_) ->
+    undefined.
+
+client_ecc_extensions(Module, Version) ->
+    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
+    case proplists:get_bool(ecdh, CryptoSupport) of
+	true ->
+	    EcPointFormats = #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]},
+	    EllipticCurves = #elliptic_curves{elliptic_curve_list = Module:ecc_curves(Version)},
+	    {EcPointFormats, EllipticCurves};
+	_ ->
+	    {undefined, undefined}
+    end.
+
+server_ecc_extension(_Version, EcPointFormats) ->
+    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
+    case proplists:get_bool(ecdh, CryptoSupport) of
+	true ->
+	    handle_ecc_point_fmt_extension(EcPointFormats);
+	false ->
+	    undefined
+    end.
+
+handle_ecc_point_fmt_extension(undefined) ->
+    undefined;
+handle_ecc_point_fmt_extension(_) ->
+    #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]}.
+
+advertises_ec_ciphers([]) ->
+    false;
+advertises_ec_ciphers([{ecdh_ecdsa, _,_,_} | _]) ->
+    true;
+advertises_ec_ciphers([{ecdhe_ecdsa, _,_,_} | _]) ->
+    true;
+advertises_ec_ciphers([{ecdh_rsa, _,_,_} | _]) ->
+    true;
+advertises_ec_ciphers([{ecdhe_rsa, _,_,_} | _]) ->
+    true;
+advertises_ec_ciphers([{ecdh_anon, _,_,_} | _]) ->
+    true;
+advertises_ec_ciphers([_| Rest]) ->
+    advertises_ec_ciphers(Rest).
+select_curve(#elliptic_curves{elliptic_curve_list = ClientCurves}, 
+	     #elliptic_curves{elliptic_curve_list = ServerCurves}) -> 
+    select_curve(ClientCurves, ServerCurves);
+select_curve(undefined, _) ->
+    %% Client did not send ECC extension use default curve if 
+    %% ECC cipher is negotiated
+    {namedCurve, ?secp256r1};
+select_curve(_, []) ->
+    no_curve;
+select_curve(Curves, [Curve| Rest]) ->
+    case lists:member(Curve, Curves) of
+	true ->
+	    {namedCurve, Curve};
+	false ->
+	    select_curve(Curves, Rest)
+    end.
+%% RFC 6066, Section 3: Currently, the only server names supported are
+%% DNS hostnames
+sni(_, disable) ->
+    undefined;
+sni(Host, undefined) ->
+    sni1(Host);
+sni(_Host, SNIOption) ->
+    sni1(SNIOption).
+
+sni1(Hostname) ->
+    case inet_parse:domain(Hostname) of
+        false -> undefined;
+        true -> #sni{hostname = Hostname}
+    end.
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+apply_user_fun(Fun, OtpCert, ExtensionOrError, UserState0, SslState) ->
+    case Fun(OtpCert, ExtensionOrError, UserState0) of
+	{valid, UserState} ->
+	    {valid, {SslState, UserState}};
+	{fail, _} = Fail ->
+	    Fail;
+	{unknown, UserState} ->
+	    {unknown, {SslState, UserState}}
+    end.
+path_validation_alert({bad_cert, cert_expired}) ->
+    ?ALERT_REC(?FATAL, ?CERTIFICATE_EXPIRED);
+path_validation_alert({bad_cert, invalid_issuer}) ->
+    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
+path_validation_alert({bad_cert, invalid_signature}) ->
+    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
+path_validation_alert({bad_cert, name_not_permitted}) ->
+    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
+path_validation_alert({bad_cert, unknown_critical_extension}) ->
+    ?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE);
+path_validation_alert({bad_cert, cert_revoked}) ->
+    ?ALERT_REC(?FATAL, ?CERTIFICATE_REVOKED);
+path_validation_alert({bad_cert, selfsigned_peer}) ->
+    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
+path_validation_alert({bad_cert, unknown_ca}) ->
+     ?ALERT_REC(?FATAL, ?UNKNOWN_CA);
+path_validation_alert(_) ->
+    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE).
+
+encrypted_premaster_secret(Secret, RSAPublicKey) ->
+    try
+	PreMasterSecret = public_key:encrypt_public(Secret, RSAPublicKey,
+						    [{rsa_pad,
+						      rsa_pkcs1_padding}]),
+	#encrypted_premaster_secret{premaster_secret = PreMasterSecret}
+    catch
+	_:_->
+	    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE))
+    end.
+
+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}, HashAlgo, Key);
+digitally_signed(_Version, Hash, _HashAlgo, #'RSAPrivateKey'{} = Key) ->
+    public_key:encrypt_private(Hash, Key,
+			       [{rsa_pad, rsa_pkcs1_padding}]);
+digitally_signed(_Version, Hash, HashAlgo, Key) ->
+    public_key:sign({digest, Hash}, HashAlgo, Key).
+
+calc_certificate_verify({3, 0}, HashAlgo, MasterSecret, Handshake) ->
+    ssl_v3:certificate_verify(HashAlgo, MasterSecret, lists:reverse(Handshake));
+calc_certificate_verify({3, N}, HashAlgo, _MasterSecret, Handshake) ->
+    tls_v1:certificate_verify(HashAlgo, N, lists:reverse(Handshake)).
+
+calc_finished({3, 0}, Role, _PrfAlgo, MasterSecret, Handshake) ->
+    ssl_v3:finished(Role, MasterSecret, lists:reverse(Handshake));
+calc_finished({3, N}, Role, PrfAlgo, MasterSecret, Handshake) ->
+    tls_v1:finished(Role, N, PrfAlgo, MasterSecret, lists:reverse(Handshake)).
+
+master_secret(_RecordCB, 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, PrfAlgo, MasterSecret, ServerRandom,
+		   ClientRandom, HashSize, KML, EKML, IVS),
+
+    ConnStates1 = ssl_record:set_master_secret(MasterSecret, ConnectionStates),
+    ConnStates2 =
+	ssl_record:set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret,
+				  Role, ConnStates1),
+
+    ClientCipherState = #cipher_state{iv = ClientIV, key = ClientWriteKey},
+    ServerCipherState = #cipher_state{iv = ServerIV, key = ServerWriteKey},
+    {MasterSecret,
+     ssl_record:set_pending_cipher_state(ConnStates2, ClientCipherState,
+					 ServerCipherState, Role)}.
+
+setup_keys({3,0}, _PrfAlgo, MasterSecret,
+	   ServerRandom, ClientRandom, HashSize, KML, EKML, IVS) ->
+    ssl_v3:setup_keys(MasterSecret, ServerRandom,
+			ClientRandom, HashSize, KML, EKML, IVS);
+
+setup_keys({3,N}, PrfAlgo, MasterSecret,
+	   ServerRandom, ClientRandom, HashSize, KML, _EKML, IVS) ->
+    tls_v1:setup_keys(N, PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
+			KML, IVS).
+
+calc_master_secret({3,0}, _PrfAlgo, PremasterSecret, ClientRandom, ServerRandom) ->
+    ssl_v3:master_secret(PremasterSecret, ClientRandom, ServerRandom);
+
+calc_master_secret({3,_}, PrfAlgo, PremasterSecret, ClientRandom, ServerRandom) ->
+    tls_v1:master_secret(PrfAlgo, PremasterSecret, ClientRandom, ServerRandom).
+
+handle_renegotiation_extension(Role, RecordCB, Version, Info, Random, NegotiatedCipherSuite, 
+			       ClientCipherSuites, Compression,
+			       ConnectionStates0, Renegotiation, SecureRenegotation) ->
+    case handle_renegotiation_info(RecordCB, Role, Info, ConnectionStates0,
+				   Renegotiation, SecureRenegotation,
+				   ClientCipherSuites) of
+	{ok, ConnectionStates} ->
+	    hello_pending_connection_states(RecordCB, Role,
+					    Version,
+					    NegotiatedCipherSuite,
+					    Random,
+					    Compression,
+					    ConnectionStates);
+	#alert{} = Alert ->
+	    throw(Alert)
+    end.
+
+%% Update pending connection states with parameters exchanged via
+%% hello messages
+%% NOTE : Role is the role of the receiver of the hello message
+%%        currently being processed.
+hello_pending_connection_states(_RecordCB, Role, Version, CipherSuite, Random, Compression,
+				 ConnectionStates) ->
+    ReadState =
+	ssl_record:pending_connection_state(ConnectionStates, read),
+    WriteState =
+	ssl_record:pending_connection_state(ConnectionStates, write),
+
+    NewReadSecParams =
+	hello_security_parameters(Role, Version, ReadState, CipherSuite,
+			    Random, Compression),
+
+    NewWriteSecParams =
+	hello_security_parameters(Role, Version, WriteState, CipherSuite,
+			    Random, Compression),
+
+    ssl_record:set_security_params(NewReadSecParams,
+				    NewWriteSecParams,
+				    ConnectionStates).
+
+hello_security_parameters(client, Version, ConnectionState, CipherSuite, Random,
+			  Compression) ->
+    SecParams = ConnectionState#connection_state.security_parameters,
+    NewSecParams = ssl_cipher:security_parameters(Version, CipherSuite, SecParams),
+    NewSecParams#security_parameters{
+      server_random = Random,
+      compression_algorithm = Compression
+     };
+
+hello_security_parameters(server, Version, ConnectionState, CipherSuite, Random,
+			  Compression) ->
+    SecParams = ConnectionState#connection_state.security_parameters,
+    NewSecParams = ssl_cipher:security_parameters(Version, CipherSuite, SecParams),
+    NewSecParams#security_parameters{
+      client_random = Random,
+      compression_algorithm = Compression
+     }.
+
+%%-------------Encode/Decode --------------------------------
+
+encode_server_key(#server_dh_params{dh_p = P, dh_g = G, dh_y = Y}) ->
+    PLen = byte_size(P),
+    GLen = byte_size(G),
+    YLen = byte_size(Y),
+    <<?UINT16(PLen), P/binary, ?UINT16(GLen), G/binary, ?UINT16(YLen), Y/binary>>;
+encode_server_key(#server_ecdh_params{curve = {namedCurve, ECCurve}, public = ECPubKey}) ->
+    %%TODO: support arbitrary keys
+    KLen = size(ECPubKey),
+    <<?BYTE(?NAMED_CURVE), ?UINT16((tls_v1:oid_to_enum(ECCurve))),
+      ?BYTE(KLen), ECPubKey/binary>>;
+encode_server_key(#server_psk_params{hint = PskIdentityHint}) ->
+    Len = byte_size(PskIdentityHint),
+    <<?UINT16(Len), PskIdentityHint/binary>>;
+encode_server_key(Params = #server_dhe_psk_params{hint = undefined}) ->
+    encode_server_key(Params#server_dhe_psk_params{hint = <<>>});
+encode_server_key(#server_dhe_psk_params{
+		  hint = PskIdentityHint,
+		  dh_params = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y}}) ->
+    Len = byte_size(PskIdentityHint),
+    PLen = byte_size(P),
+    GLen = byte_size(G),
+    YLen = byte_size(Y),
+    <<?UINT16(Len), PskIdentityHint/binary,
+      ?UINT16(PLen), P/binary, ?UINT16(GLen), G/binary, ?UINT16(YLen), Y/binary>>;
+encode_server_key(#server_srp_params{srp_n = N, srp_g = G,	srp_s = S, srp_b = B}) ->
+    NLen = byte_size(N),
+    GLen = byte_size(G),
+    SLen = byte_size(S),
+    BLen = byte_size(B),
+    <<?UINT16(NLen), N/binary, ?UINT16(GLen), G/binary,
+      ?BYTE(SLen), S/binary, ?UINT16(BLen), B/binary>>.
+
+encode_client_key(#encrypted_premaster_secret{premaster_secret = PKEPMS},{3, 0}) ->
+    PKEPMS;
+encode_client_key(#encrypted_premaster_secret{premaster_secret = PKEPMS}, _) ->
+    PKEPMSLen = byte_size(PKEPMS),
+    <<?UINT16(PKEPMSLen), PKEPMS/binary>>;
+encode_client_key(#client_diffie_hellman_public{dh_public = DHPublic}, _) ->
+    Len = byte_size(DHPublic),
+    <<?UINT16(Len), DHPublic/binary>>;
+encode_client_key(#client_ec_diffie_hellman_public{dh_public = DHPublic}, _) ->
+    Len = byte_size(DHPublic),
+    <<?BYTE(Len), DHPublic/binary>>;
+encode_client_key(#client_psk_identity{identity = undefined}, _) ->
+    Id = <<"psk_identity">>,
+    Len = byte_size(Id),
+    <<?UINT16(Len), Id/binary>>;
+encode_client_key(#client_psk_identity{identity = Id}, _) ->
+    Len = byte_size(Id),
+    <<?UINT16(Len), Id/binary>>;
+encode_client_key(Identity = #client_dhe_psk_identity{identity = undefined}, Version) ->
+    encode_client_key(Identity#client_dhe_psk_identity{identity = <<"psk_identity">>}, Version);
+encode_client_key(#client_dhe_psk_identity{identity = Id, dh_public = DHPublic}, _) ->
+    Len = byte_size(Id),
+    DHLen = byte_size(DHPublic),
+    <<?UINT16(Len), Id/binary, ?UINT16(DHLen), DHPublic/binary>>;
+encode_client_key(Identity = #client_rsa_psk_identity{identity = undefined}, Version) ->
+    encode_client_key(Identity#client_rsa_psk_identity{identity = <<"psk_identity">>}, Version);
+encode_client_key(#client_rsa_psk_identity{identity = Id, exchange_keys = ExchangeKeys}, Version) ->
+    EncPMS = encode_client_key(ExchangeKeys, Version),
+    Len = byte_size(Id),
+    <<?UINT16(Len), Id/binary, EncPMS/binary>>;
+encode_client_key(#client_srp_public{srp_a = A}, _) ->
+    Len = byte_size(A),
+    <<?UINT16(Len), A/binary>>.
+
+enc_sign({_, anon}, _Sign, _Version) ->
+    <<>>;
+enc_sign({HashAlg, SignAlg}, Signature, _Version = {Major, Minor})
+  when Major == 3, Minor >= 3->
+	SignLen = byte_size(Signature),
+	HashSign = enc_hashsign(HashAlg, SignAlg),
+	<<HashSign/binary, ?UINT16(SignLen), Signature/binary>>;
+enc_sign(_HashSign, Sign, _Version) ->
+	SignLen = byte_size(Sign),
+	<<?UINT16(SignLen), Sign/binary>>.
+
+enc_hashsign(HashAlgo, SignAlgo) ->
+    Hash = ssl_cipher:hash_algorithm(HashAlgo),
+    Sign = ssl_cipher:sign_algorithm(SignAlgo),
+    <<?BYTE(Hash), ?BYTE(Sign)>>.
+
+encode_protocol(Protocol, Acc) ->
+	Len = byte_size(Protocol),
+	<<Acc/binary, ?BYTE(Len), Protocol/binary>>.
+
+dec_client_key(PKEPMS, ?KEY_EXCHANGE_RSA, {3, 0}) ->
+    #encrypted_premaster_secret{premaster_secret = PKEPMS};
+dec_client_key(<<?UINT16(_), PKEPMS/binary>>, ?KEY_EXCHANGE_RSA, _) ->
+    #encrypted_premaster_secret{premaster_secret = PKEPMS};
+dec_client_key(<<>>, ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
+    throw(?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE));
+dec_client_key(<<?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
+	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
+    #client_diffie_hellman_public{dh_public = DH_Y};
+dec_client_key(<<>>, ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, _) ->
+    throw(?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE));
+dec_client_key(<<?BYTE(DH_YLen), DH_Y:DH_YLen/binary>>,
+	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, _) ->
+    #client_ec_diffie_hellman_public{dh_public = DH_Y};
+dec_client_key(<<?UINT16(Len), Id:Len/binary>>,
+	       ?KEY_EXCHANGE_PSK, _) ->
+    #client_psk_identity{identity = Id};
+dec_client_key(<<?UINT16(Len), Id:Len/binary,
+		 ?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
+	       ?KEY_EXCHANGE_DHE_PSK, _) ->
+    #client_dhe_psk_identity{identity = Id, dh_public = DH_Y};
+dec_client_key(<<?UINT16(Len), Id:Len/binary, PKEPMS/binary>>,
+	       ?KEY_EXCHANGE_RSA_PSK, {3, 0}) ->
+    #client_rsa_psk_identity{identity = Id,
+			     exchange_keys = #encrypted_premaster_secret{premaster_secret = PKEPMS}};
+dec_client_key(<<?UINT16(Len), Id:Len/binary, ?UINT16(_), PKEPMS/binary>>,
+	       ?KEY_EXCHANGE_RSA_PSK, _) ->
+    #client_rsa_psk_identity{identity = Id,
+			     exchange_keys = #encrypted_premaster_secret{premaster_secret = PKEPMS}};
+dec_client_key(<<?UINT16(ALen), A:ALen/binary>>,
+	       ?KEY_EXCHANGE_SRP, _) ->
+    #client_srp_public{srp_a = A}.
+
+dec_server_key_params(Len, Keys, Version) ->
+    <<Params:Len/bytes, Signature/binary>> = Keys,
+    dec_server_key_signature(Params, Signature, Version).
+
+dec_server_key_signature(Params, <<?BYTE(HashAlgo), ?BYTE(SignAlgo),
+			    ?UINT16(0)>>, {Major, Minor})
+  when Major == 3, Minor >= 3 ->
+    HashSign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)},
+    {Params, HashSign, <<>>};
+dec_server_key_signature(Params, <<?BYTE(HashAlgo), ?BYTE(SignAlgo),
+			    ?UINT16(Len), Signature:Len/binary>>, {Major, Minor})
+  when Major == 3, Minor >= 3 ->
+    HashSign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)},
+    {Params, HashSign, Signature};
+dec_server_key_signature(Params, <<>>, _) ->
+    {Params, {null, anon}, <<>>};
+dec_server_key_signature(Params, <<?UINT16(0)>>, _) ->
+    {Params, {null, anon}, <<>>};
+dec_server_key_signature(Params, <<?UINT16(Len), Signature:Len/binary>>, _) ->
+    {Params, undefined, Signature};
+dec_server_key_signature(_, _, _) ->
+    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
+
+dec_hello_extensions(<<>>, Acc) ->
+    Acc;
+dec_hello_extensions(<<?UINT16(?NEXTPROTONEG_EXT), ?UINT16(Len), ExtensionData:Len/binary, Rest/binary>>, Acc) ->
+    NextP = #next_protocol_negotiation{extension_data = ExtensionData},
+    dec_hello_extensions(Rest, Acc#hello_extensions{next_protocol_negotiation = NextP});
+dec_hello_extensions(<<?UINT16(?RENEGOTIATION_EXT), ?UINT16(Len), Info:Len/binary, Rest/binary>>, Acc) ->
+    RenegotiateInfo = case Len of
+			  1 ->  % Initial handshake
+			      Info; % should be <<0>> will be matched in handle_renegotiation_info
+			  _ ->
+			      VerifyLen = Len - 1,
+			      <<?BYTE(VerifyLen), VerifyInfo/binary>> = Info,
+			      VerifyInfo
+		      end,
+    dec_hello_extensions(Rest, Acc#hello_extensions{renegotiation_info =
+							#renegotiation_info{renegotiated_connection =
+										RenegotiateInfo}});
+
+dec_hello_extensions(<<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen), SRP:SRPLen/binary, Rest/binary>>, Acc)
+  when Len == SRPLen + 2 ->
+    dec_hello_extensions(Rest,  Acc#hello_extensions{srp = #srp{username = SRP}});
+
+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, Acc#hello_extensions{hash_signs =
+						    #hash_sign_algos{hash_sign_algos = HashSignAlgos}});
+
+dec_hello_extensions(<<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Acc) ->
+    <<?UINT16(_), EllipticCurveList/binary>> = ExtData,
+    EllipticCurves = [tls_v1:enum_to_oid(X) || <<X:16>> <= EllipticCurveList],
+    dec_hello_extensions(Rest, Acc#hello_extensions{elliptic_curves =
+							#elliptic_curves{elliptic_curve_list =
+									     EllipticCurves}});
+dec_hello_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len),
+		       ExtData:Len/binary, Rest/binary>>, Acc) ->
+    <<?BYTE(_), ECPointFormatList/binary>> = ExtData,
+    ECPointFormats = binary_to_list(ECPointFormatList),
+    dec_hello_extensions(Rest, Acc#hello_extensions{ec_point_formats =
+							#ec_point_formats{ec_point_format_list =
+									      ECPointFormats}});
+%% 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.
+dec_hello_extensions(_, Acc) ->
+    Acc.
+
+dec_hashsign(<<?BYTE(HashAlgo), ?BYTE(SignAlgo)>>) ->
+    {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)}.
+
+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}.
+
+%% encode/decode stream of certificate data to/from list of certificate data
+certs_to_list(ASN1Certs) ->
+    certs_to_list(ASN1Certs, []).
+
+certs_to_list(<<?UINT24(CertLen), Cert:CertLen/binary, Rest/binary>>, Acc) ->
+    certs_to_list(Rest, [Cert | Acc]);
+certs_to_list(<<>>, Acc) ->
+    lists:reverse(Acc, []).
+
+certs_from_list(ACList) ->
+    list_to_binary([begin
+			CertLen = byte_size(Cert),
+                        <<?UINT24(CertLen), Cert/binary>>
+		    end || Cert <- ACList]).
+from_3bytes(Bin3) ->
+    from_3bytes(Bin3, []).
+
+from_3bytes(<<>>, Acc) ->
+    lists:reverse(Acc);
+from_3bytes(<<?UINT24(N), Rest/binary>>, Acc) ->
+    from_3bytes(Rest, [?uint16(N) | Acc]).
+
+from_2bytes(Bin2) ->
+    from_2bytes(Bin2, []).
+
+from_2bytes(<<>>, Acc) ->
+    lists:reverse(Acc);
+from_2bytes(<<?UINT16(N), Rest/binary>>, Acc) ->
+    from_2bytes(Rest, [?uint16(N) | Acc]).
+key_exchange_alg(rsa) ->
+    ?KEY_EXCHANGE_RSA;
+key_exchange_alg(Alg) when Alg == dhe_rsa; Alg == dhe_dss;
+			    Alg == dh_dss; Alg == dh_rsa; Alg == dh_anon ->
+    ?KEY_EXCHANGE_DIFFIE_HELLMAN;
+key_exchange_alg(Alg) when Alg == ecdhe_rsa; Alg == ecdh_rsa;
+			   Alg == ecdhe_ecdsa; Alg == ecdh_ecdsa;
+			   Alg == ecdh_anon ->
+    ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN;
+key_exchange_alg(psk) ->
+    ?KEY_EXCHANGE_PSK;
+key_exchange_alg(dhe_psk) ->
+    ?KEY_EXCHANGE_DHE_PSK;
+key_exchange_alg(rsa_psk) ->
+    ?KEY_EXCHANGE_RSA_PSK;
+key_exchange_alg(Alg)
+  when Alg == srp_rsa; Alg == srp_dss; Alg == srp_anon ->
+    ?KEY_EXCHANGE_SRP;
+key_exchange_alg(_) ->
+    ?NULL.
+
+%%-------------Extension handling --------------------------------
+
+handle_next_protocol(undefined,
+		     _NextProtocolSelector, _Renegotiating) ->
+    undefined;
+
+handle_next_protocol(#next_protocol_negotiation{} = NextProtocols,
+    NextProtocolSelector, Renegotiating) ->
+
+    case next_protocol_extension_allowed(NextProtocolSelector, Renegotiating) of
+        true ->
+            select_next_protocol(decode_next_protocols(NextProtocols), NextProtocolSelector);
+        false ->
+            ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE) % unexpected next protocol extension
+    end.
+
+
+handle_next_protocol_extension(NextProtocolNegotiation, Renegotiation, SslOpts)->
+    case handle_next_protocol_on_server(NextProtocolNegotiation, Renegotiation, SslOpts) of
+	#alert{} = Alert ->
+	    Alert;
+	ProtocolsToAdvertise ->
+	    ProtocolsToAdvertise
+    end.
+
+handle_next_protocol_on_server(undefined, _Renegotiation, _SslOpts) ->
+    undefined;
+
+handle_next_protocol_on_server(#next_protocol_negotiation{extension_data = <<>>},
+			       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
+
+next_protocol_extension_allowed(NextProtocolSelector, Renegotiating) ->
+    NextProtocolSelector =/= undefined andalso not Renegotiating.
+
+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_srp_extension(undefined, Session) ->
+    Session;
+handle_srp_extension(#srp{username = Username}, Session) ->
+    Session#session{srp_username = Username}.
+
+%%-------------Misc --------------------------------
+
+select_cipher_suite(CipherSuites, Suites, false) ->
+    select_cipher_suite(CipherSuites, Suites);
+select_cipher_suite(CipherSuites, Suites, true) ->
+    select_cipher_suite(Suites, CipherSuites).
+
+select_cipher_suite([], _) ->
+   no_suite;
+select_cipher_suite([Suite | ClientSuites], SupportedSuites) ->
+    case is_member(Suite, SupportedSuites) of
+	true ->
+	    Suite;
+        false ->
+	    select_cipher_suite(ClientSuites, SupportedSuites)
+    end.
+
+int_to_bin(I) ->
+    L = (length(integer_to_list(I, 16)) + 1) div 2,
+    <<I:(L*8)>>.
+
+is_member(Suite, SupportedSuites) ->
+    lists:member(Suite, SupportedSuites).
+
+select_compression(_CompressionMetodes) ->
+    ?NULL.
+
+-define(TLSEXT_SIGALG_RSA(MD), {MD, rsa}).
+-define(TLSEXT_SIGALG_DSA(MD), {MD, dsa}).
+-define(TLSEXT_SIGALG_ECDSA(MD), {MD, ecdsa}).
+
+-define(TLSEXT_SIGALG(MD), ?TLSEXT_SIGALG_ECDSA(MD), ?TLSEXT_SIGALG_RSA(MD)).
+
+advertised_hash_signs({Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
+    HashSigns = [?TLSEXT_SIGALG(sha512),
+		 ?TLSEXT_SIGALG(sha384),
+		 ?TLSEXT_SIGALG(sha256),
+		 ?TLSEXT_SIGALG(sha224),
+		 ?TLSEXT_SIGALG(sha),
+		 ?TLSEXT_SIGALG_DSA(sha),
+		 ?TLSEXT_SIGALG_RSA(md5)],
+    CryptoSupport = crypto:supports(),
+    HasECC = proplists:get_bool(ecdsa,  proplists:get_value(public_keys, CryptoSupport)),
+    Hashs = proplists:get_value(hashs, CryptoSupport),
+    #hash_sign_algos{hash_sign_algos =
+			 lists:filter(fun({Hash, ecdsa}) -> HasECC andalso proplists:get_bool(Hash, Hashs);
+					 ({Hash, _}) -> proplists:get_bool(Hash, Hashs) end, HashSigns)};
+advertised_hash_signs(_) ->
+    undefined.
+
+psk_secret(PSKIdentity, PSKLookup) ->
+    case handle_psk_identity(PSKIdentity, PSKLookup) of
+	{ok, PSK} when is_binary(PSK) ->
+	    Len = erlang:byte_size(PSK),
+	    <<?UINT16(Len), 0:(Len*8), ?UINT16(Len), PSK/binary>>;
+	#alert{} = Alert ->
+	    Alert;
+	_ ->
+	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
+    end.
+
+psk_secret(PSKIdentity, PSKLookup, PremasterSecret) ->
+    case handle_psk_identity(PSKIdentity, PSKLookup) of
+	{ok, PSK} when is_binary(PSK) ->
+	    Len = erlang:byte_size(PremasterSecret),
+	    PSKLen = erlang:byte_size(PSK),
+	    <<?UINT16(Len), PremasterSecret/binary, ?UINT16(PSKLen), PSK/binary>>;
+	#alert{} = Alert ->
+	    Alert;
+	_ ->
+	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
+    end.
+
+handle_psk_identity(_PSKIdentity, LookupFun)
+  when LookupFun == undefined ->
+    error;
+handle_psk_identity(PSKIdentity, {Fun, UserState}) ->
+    Fun(psk, PSKIdentity, UserState).
diff --git a/lib/ssl/src/ssl_handshake.hrl b/lib/ssl/src/ssl_handshake.hrl
index eb1a1dbf62..75160526b9 100644
--- a/lib/ssl/src/ssl_handshake.hrl
+++ b/lib/ssl/src/ssl_handshake.hrl
@@ -28,11 +28,6 @@
 
 -include_lib("public_key/include/public_key.hrl").
 
--type oid()               :: tuple().
--type public_key_params() :: #'Dss-Parms'{} |  {namedCurve, oid()} | #'ECParameters'{} | term().
--type public_key_info()   :: {oid(), #'RSAPublicKey'{} | integer() | #'ECPoint'{}, public_key_params()}.
--type tls_handshake_history() :: {[binary()], [binary()]}.
-
 -define(NO_PROTOCOL, <<>>).
 
 %% Signature algorithms
@@ -50,7 +45,8 @@
 	  master_secret,
 	  srp_username,
 	  is_resumable,
-	  time_stamp
+	  time_stamp,
+	  ecc
 	  }).
 
 -define(NUM_OF_SESSION_ID_BYTES, 32).  % TSL 1.1 & SSL 3
@@ -96,17 +92,23 @@
 
 %% client_hello defined in tls_handshake.hrl and dtls_handshake.hrl
 
+-record(hello_extensions, {
+	  renegotiation_info,
+	  hash_signs,          % supported combinations of hashes/signature algos
+	  next_protocol_negotiation = undefined, % [binary()]
+	  srp,
+	  ec_point_formats,
+	  elliptic_curves,
+	  sni
+	 }).
+
 -record(server_hello, {
 	  server_version,
 	  random,             
 	  session_id,         % opaque SessionID<0..32>
 	  cipher_suite,       % cipher_suites
 	  compression_method, % compression_method
-	  renegotiation_info,
-	  hash_signs,          % supported combinations of hashes/signature algos
-	  ec_point_formats,    % supported ec point formats
-	  elliptic_curves,     % supported elliptic curver
-	  next_protocol_negotiation = undefined % [binary()]
+	  extensions
 	 }).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -337,7 +339,31 @@
 -define(EXPLICIT_CHAR2, 2).
 -define(NAMED_CURVE, 3).
 
--endif. % -ifdef(ssl_handshake).
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Server name indication RFC 6066 section 3
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+-define(SNI_EXT, 16#0000).
 
-     
+%% enum { host_name(0), (255) } NameType;
+-define(SNI_NAMETYPE_HOST_NAME, 0).
+
+-record(sni, {
+          hostname = undefined
+        }).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Dialyzer types
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+-type oid()               :: tuple().
+-type public_key_params() :: #'Dss-Parms'{} |  {namedCurve, oid()} | #'ECParameters'{} | term().
+-type public_key_info()   :: {oid(), #'RSAPublicKey'{} | integer() | #'ECPoint'{}, public_key_params()}.
+-type tls_handshake_history() :: {[binary()], [binary()]}.
+
+-type ssl_handshake() :: #server_hello{} | #server_hello_done{} | #certificate{} | #certificate_request{} |
+			 #client_key_exchange{} | #finished{} | #certificate_verify{} |
+			 #hello_request{} | #next_protocol{}.
+
+
+-endif. % -ifdef(ssl_handshake).
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl
index 14db4a6067..64b89e9f95 100644
--- a/lib/ssl/src/ssl_internal.hrl
+++ b/lib/ssl/src/ssl_internal.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %%
 %% The 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,9 +24,6 @@
 
 -include_lib("public_key/include/public_key.hrl"). 
 
-%% Looks like it does for backwards compatibility reasons
--record(sslsocket, {fd = nil, pid = nil}).
-
 -type reason()            :: term().
 -type reply()             :: term().
 -type msg()               :: term().
@@ -37,9 +34,7 @@
 -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 | ecdhe_ecdsa| ecdh_ecdsa | ecdh_rsa| srp_rsa| srp_dss | psk | dhe_psk | rsa_psk | dh_anon | ecdh_anon | srp_anon.
 -type der_cert()          :: binary().
--type private_key()       :: #'RSAPrivateKey'{} | #'DSAPrivateKey'{} | #'ECPrivateKey'{}.
 -type issuer()            :: tuple().
 -type serialnumber()      :: integer().
 -type cert_key()          :: {reference(), integer(), issuer()}.
@@ -50,6 +45,7 @@
 -define(UINT16(X),   X:16/unsigned-big-integer).
 -define(UINT24(X),   X:24/unsigned-big-integer).
 -define(UINT32(X),   X:32/unsigned-big-integer).
+-define(UINT48(X),   X:48/unsigned-big-integer).
 -define(UINT64(X),   X:64/unsigned-big-integer).
 -define(STRING(X),   ?UINT32((size(X))), (X)/binary).
 
@@ -57,6 +53,7 @@
 -define(uint16(X), << ?UINT16(X) >> ).
 -define(uint24(X), << ?UINT24(X) >> ).
 -define(uint32(X), << ?UINT32(X) >> ).
+-define(uint48(X), << ?UINT48(X) >> ).
 -define(uint64(X), << ?UINT64(X) >> ).
 
 -define(CDR_MAGIC, "GIOP").
@@ -71,27 +68,30 @@
 
 -define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
 -define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]).
+-define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
+-define(MIN_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
 
 -record(ssl_options, {
-	  versions,   % 'tlsv1.2' | 'tlsv1.1' | tlsv1 | sslv3
-	  verify,     %   verify_none | verify_peer
-	  verify_fun, % fun(CertVerifyErrors) -> boolean()
-	  fail_if_no_peer_cert, % boolean()
-	  verify_client_once,  % boolean()
+	  protocol    :: tls | dtls,
+	  versions    :: ['tlsv1.2' | 'tlsv1.1' | tlsv1 | sslv3] | ['dtlsv1.2' | dtlsv1],
+	  verify      :: verify_none | verify_peer,
+	  verify_fun,  %%:: fun(CertVerifyErrors::term()) -> boolean(),
+	  fail_if_no_peer_cert ::  boolean(),
+	  verify_client_once   ::  boolean(),
 	  %% fun(Extensions, State, Verify, AccError) ->  {Extensions, State, AccError}
 	  validate_extensions_fun, 
-	  depth,      % integer()
-	  certfile,   % file()
-	  cert,       % der_encoded()
-	  keyfile,    % file()
-	  key,	      % der_encoded()
-	  password,   % 
-	  cacerts,    % [der_encoded()]
-	  cacertfile, % file()
-	  dh,         % der_encoded()
-	  dhfile,     % file()
+	  depth                :: integer(),
+	  certfile             :: binary(),
+	  cert                 :: public_key:der_encoded(),
+	  keyfile              :: binary(),
+	  key	               :: {'RSAPrivateKey' | 'DSAPrivateKey' | 'ECPrivateKey' | 'PrivateKeyInfo', public_key:der_encoded()},
+	  password	       :: string(),
+	  cacerts              :: [public_key:der_encoded()],
+	  cacertfile           :: binary(),
+	  dh                   :: public_key:der_encoded(),
+	  dhfile               :: binary(),
 	  user_lookup_fun,  % server option, fun to lookup the user
-	  psk_identity,  % binary
+	  psk_identity         :: binary(),
 	  srp_identity,  % client option {User, Password}
 	  ciphers,    % 
 	  %% Local policy for the server if it want's to reuse the session
@@ -100,20 +100,33 @@
 	  reuse_session,  
 	  %% If false sessions will never be reused, if true they
 	  %% will be reused if possible.
-	  reuse_sessions, % boolean()
+	  reuse_sessions       :: boolean(),
 	  renegotiate_at,
 	  secure_renegotiate,
 	  debug,
-	  hibernate_after,% undefined if not hibernating,
-                          % or number of ms of inactivity
-			  % after which ssl_connection will
-                          % go into hibernation
+	  %% undefined if not hibernating, or number of ms of
+	  %% inactivity after which ssl_connection will go into
+	  %% hibernation
+	  hibernate_after      :: boolean(),
 	  %% This option should only be set to true by inet_tls_dist
-	  erl_dist = false,
+	  erl_dist = false     :: boolean(),
 	  next_protocols_advertised = undefined, %% [binary()],
-	  next_protocol_selector = undefined  %% fun([binary()]) -> binary())
+	  next_protocol_selector = undefined,  %% fun([binary()]) -> binary())
+	  log_alert             :: boolean(),
+	  server_name_indication = undefined,
+	  %% Should the server prefer its own cipher order over the one provided by
+	  %% the client?
+	  honor_cipher_order = false
 	  }).
 
+-record(config, {ssl,               %% SSL parameters
+		 inet_user,         %% User set inet options
+		 emulated,          %% #socket_option{} emulated
+		 inet_ssl,          %% inet options for internal ssl socket
+		 transport_info,                 %% Callback info
+		 connection_cb
+		}).
+
 -record(socket_options,
 	{
 	  mode   = list, 
@@ -123,6 +136,10 @@
 	  active = true
 	 }).
 
+-type state_name()           :: hello | abbreviated | certify | cipher | connection.
+-type gen_fsm_state_return() :: {next_state, state_name(), term()} |
+				{next_state, state_name(), term(), timeout()} |
+				{stop, term(), term()}.
 -endif. % -ifdef(ssl_internal).
 
 
diff --git a/lib/ssl/src/ssl_manager.erl b/lib/ssl/src/ssl_manager.erl
index 7af4a68461..fbc73e0e42 100644
--- a/lib/ssl/src/ssl_manager.erl
+++ b/lib/ssl/src/ssl_manager.erl
@@ -30,7 +30,7 @@
 	 lookup_trusted_cert/4,
 	 new_session_id/1, clean_cert_db/2,
 	 register_session/2, register_session/3, invalidate_session/2,
-	 invalidate_session/3, clear_pem_cache/0]).
+	 invalidate_session/3, clear_pem_cache/0, manager_name/1]).
 
 % Spawn export
 -export([init_session_validator/1]).
@@ -64,6 +64,18 @@
 %%====================================================================
 %% API
 %%====================================================================
+
+%%--------------------------------------------------------------------
+-spec manager_name(normal | dist) -> atom().
+%%
+%% Description: Returns the registered name of the ssl manager process
+%% in the operation modes 'normal' and 'dist'.
+%%--------------------------------------------------------------------
+manager_name(normal) ->
+    ?MODULE;
+manager_name(dist) ->
+    list_to_atom(atom_to_list(?MODULE) ++ "dist").
+
 %%--------------------------------------------------------------------
 -spec start_link(list()) -> {ok, pid()} | ignore | {error, term()}.
 %%
@@ -71,7 +83,8 @@
 %% and certificate caching.
 %%--------------------------------------------------------------------
 start_link(Opts) ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [?MODULE, Opts], []).
+    DistMangerName = manager_name(normal),
+    gen_server:start_link({local, DistMangerName}, ?MODULE, [DistMangerName, Opts], []).
 
 %%--------------------------------------------------------------------
 -spec start_link_dist(list()) -> {ok, pid()} | ignore | {error, term()}.
@@ -80,7 +93,8 @@ start_link(Opts) ->
 %% be used by the erlang distribution. Note disables soft upgrade!
 %%--------------------------------------------------------------------
 start_link_dist(Opts) ->
-    gen_server:start_link({local, ssl_manager_dist}, ?MODULE, [ssl_manager_dist, Opts], []).
+    DistMangerName = manager_name(dist),
+    gen_server:start_link({local, DistMangerName}, ?MODULE, [DistMangerName, Opts], []).
 
 %%--------------------------------------------------------------------
 -spec connection_init(binary()| {der, list()}, client | server) ->
@@ -100,7 +114,7 @@ connection_init(Trustedcerts, Role) ->
 %%--------------------------------------------------------------------
 -spec cache_pem_file(binary(), term()) -> {ok, term()} | {error, reason()}.
 %%		    
-%% Description: Cach a pem file and return its content.
+%% Description: Cache a pem file and return its content.
 %%--------------------------------------------------------------------
 cache_pem_file(File, DbHandle) ->
     MD5 = crypto:hash(md5, File),
@@ -120,7 +134,7 @@ cache_pem_file(File, DbHandle) ->
 %%--------------------------------------------------------------------
 clear_pem_cache() ->
     %% Not supported for distribution at the moement, should it be?
-    put(ssl_manager, ssl_manager),
+    put(ssl_manager, manager_name(normal)),
     call(unconditionally_clear_pem_cache).
 
 %%--------------------------------------------------------------------
@@ -153,27 +167,27 @@ clean_cert_db(Ref, File) ->
     ok.
 
 %%--------------------------------------------------------------------
--spec register_session(inet:port_number(), #session{}) -> ok.
--spec register_session(host(), inet:port_number(), #session{}) -> ok.
 %%
 %% Description: Make the session available for reuse.
 %%--------------------------------------------------------------------
+-spec register_session(host(), inet:port_number(), #session{}) -> ok.
 register_session(Host, Port, Session) ->
     cast({register_session, Host, Port, Session}).
 
+-spec register_session(inet:port_number(), #session{}) -> ok.
 register_session(Port, Session) ->
     cast({register_session, Port, Session}).
 %%--------------------------------------------------------------------
--spec invalidate_session(inet:port_number(), #session{}) -> ok.
--spec invalidate_session(host(), inet:port_number(), #session{}) -> ok.
 %%
 %% Description: Make the session unavailable for reuse. After
 %% a the session has been marked "is_resumable = false" for some while
 %% it will be safe to remove the data from the session database.
 %%--------------------------------------------------------------------
+-spec invalidate_session(host(), inet:port_number(), #session{}) -> ok.
 invalidate_session(Host, Port, Session) ->
     cast({invalidate_session, Host, Port, Session}).
 
+-spec invalidate_session(inet:port_number(), #session{}) -> ok.
 invalidate_session(Port, Session) ->
     cast({invalidate_session, Port, Session}).
 
diff --git a/lib/ssl/src/ssl_pkix_db.erl b/lib/ssl/src/ssl_pkix_db.erl
index 9de50c8f26..e59aba0618 100644
--- a/lib/ssl/src/ssl_pkix_db.erl
+++ b/lib/ssl/src/ssl_pkix_db.erl
@@ -115,17 +115,17 @@ add_trusted_certs(_Pid, File, [CertsDb, RefDb, PemChache] = Db) ->
 	    new_trusted_cert_entry({MD5, File}, Db)
     end.
 %%--------------------------------------------------------------------
--spec cache_pem_file({binary(), binary()}, [db_handle()]) -> {ok, term()}.
--spec cache_pem_file(reference(), {binary(), binary()}, [db_handle()]) -> {ok, term()}.
 %%
 %% Description: Cache file as binary in DB
 %%--------------------------------------------------------------------
+-spec cache_pem_file({binary(), binary()}, [db_handle()]) -> {ok, term()}.
 cache_pem_file({MD5, File}, [_CertsDb, _RefDb, PemChache]) ->
     {ok, PemBin} = file:read_file(File),
     Content = public_key:pem_decode(PemBin),
     insert(MD5, Content, PemChache),
     {ok, Content}.
 
+-spec cache_pem_file(reference(), {binary(), binary()}, [db_handle()]) -> {ok, term()}.
 cache_pem_file(Ref, {MD5, File}, [_CertsDb, _RefDb, PemChache]) ->
     {ok, PemBin} = file:read_file(File),
     Content = public_key:pem_decode(PemBin),
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl
new file mode 100644
index 0000000000..018c8befe0
--- /dev/null
+++ b/lib/ssl/src/ssl_record.erl
@@ -0,0 +1,475 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The 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 TLS/SSL/DTLS record protocol. Note epoch is only
+%% used by DTLS but handled here so we can avoid code duplication.
+%%----------------------------------------------------------------------
+
+-module(ssl_record).
+
+-include("ssl_record.hrl").
+-include("ssl_internal.hrl").
+-include("ssl_cipher.hrl").
+-include("ssl_alert.hrl").
+
+%% Connection state handling
+-export([init_connection_states/1,
+	 current_connection_state/2, pending_connection_state/2,
+	 activate_pending_connection_state/2,
+	 set_security_params/3,
+         set_mac_secret/4,
+	 set_master_secret/2,
+         set_pending_cipher_state/4,
+	 set_renegotiation_flag/2,
+	 set_client_verify_data/3,
+	 set_server_verify_data/3]).
+
+%% Encoding records
+-export([encode_handshake/3, encode_alert_record/3,
+	 encode_change_cipher_spec/2, encode_data/3]).
+
+%% Compression
+-export([compress/3, uncompress/3, compressions/0]).
+
+%% Payload encryption/decryption
+-export([cipher/4, decipher/3, is_correct_mac/2]).
+
+%%====================================================================
+%% Internal application API
+%%====================================================================
+
+%%--------------------------------------------------------------------
+-spec init_connection_states(client | server) -> #connection_states{}.
+%%
+%% Description: Creates a connection_states record with appropriate
+%% values for the initial SSL connection setup.
+%%--------------------------------------------------------------------
+init_connection_states(Role) ->
+    ConnectionEnd = record_protocol_role(Role),
+    Current = initial_connection_state(ConnectionEnd),
+    Pending = empty_connection_state(ConnectionEnd),
+    #connection_states{current_read = Current,
+		       pending_read = Pending,
+		       current_write = Current,
+		       pending_write = Pending
+                      }.
+
+%%--------------------------------------------------------------------
+-spec current_connection_state(#connection_states{}, read | write) ->
+				      #connection_state{}.
+%%
+%% Description: Returns the instance of the connection_state record
+%% that is currently defined as the current conection state.
+%%--------------------------------------------------------------------
+current_connection_state(#connection_states{current_read = Current},
+			 read) ->
+    Current;
+current_connection_state(#connection_states{current_write = Current},
+			 write) ->
+    Current.
+
+%%--------------------------------------------------------------------
+-spec pending_connection_state(#connection_states{}, read | write) ->
+				      term().
+%%
+%% Description: Returns the instance of the connection_state record
+%% that is currently defined as the pending conection state.
+%%--------------------------------------------------------------------
+pending_connection_state(#connection_states{pending_read = Pending},
+			 read) ->
+    Pending;
+pending_connection_state(#connection_states{pending_write = Pending},
+			 write) ->
+    Pending.
+
+
+%%--------------------------------------------------------------------
+-spec activate_pending_connection_state(#connection_states{}, read | write) ->
+					       #connection_states{}.
+%%
+%% Description: Creates a new instance of the connection_states record
+%% where the pending state of <Type> has been activated.
+%%--------------------------------------------------------------------
+activate_pending_connection_state(States =
+                                  #connection_states{current_read = Current,
+						     pending_read = Pending},
+                                  read) ->
+    NewCurrent = Pending#connection_state{epoch = dtls_next_epoch(Current),
+					  sequence_number = 0},
+    SecParams = Pending#connection_state.security_parameters,
+    ConnectionEnd = SecParams#security_parameters.connection_end,
+    EmptyPending = empty_connection_state(ConnectionEnd),
+    SecureRenegotation = NewCurrent#connection_state.secure_renegotiation,
+    NewPending = EmptyPending#connection_state{secure_renegotiation = SecureRenegotation},
+    States#connection_states{current_read = NewCurrent,
+                             pending_read = NewPending
+                            };
+
+activate_pending_connection_state(States =
+                                  #connection_states{current_write = Current,
+						     pending_write = Pending},
+                                  write) ->
+    NewCurrent = Pending#connection_state{epoch = dtls_next_epoch(Current),
+					  sequence_number = 0},
+    SecParams = Pending#connection_state.security_parameters,
+    ConnectionEnd = SecParams#security_parameters.connection_end,
+    EmptyPending = empty_connection_state(ConnectionEnd),
+    SecureRenegotation = NewCurrent#connection_state.secure_renegotiation,
+    NewPending = EmptyPending#connection_state{secure_renegotiation = SecureRenegotation},
+    States#connection_states{current_write = NewCurrent,
+                             pending_write = NewPending
+                            }.
+
+
+%%--------------------------------------------------------------------
+-spec set_security_params(#security_parameters{}, #security_parameters{},
+			     #connection_states{}) -> #connection_states{}.
+%%
+%% Description: Creates a new instance of the connection_states record
+%% where the pending states gets its security parameters updated.
+%%--------------------------------------------------------------------
+set_security_params(ReadParams, WriteParams, States =
+		       #connection_states{pending_read = Read,
+					  pending_write = Write}) ->
+    States#connection_states{pending_read =
+                             Read#connection_state{security_parameters =
+                                                   ReadParams},
+                             pending_write =
+                             Write#connection_state{security_parameters =
+                                                    WriteParams}
+                            }.
+%%--------------------------------------------------------------------
+-spec set_mac_secret(binary(), binary(), client | server,
+			#connection_states{}) -> #connection_states{}.
+%%
+%% Description: update the mac_secret field in pending connection states
+%%--------------------------------------------------------------------
+set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, client, States) ->
+    set_mac_secret(ServerWriteMacSecret, ClientWriteMacSecret, States);
+set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, server, States) ->
+    set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, States).
+
+set_mac_secret(ReadMacSecret, WriteMacSecret,
+	       States = #connection_states{pending_read = Read,
+					   pending_write = Write}) ->
+    States#connection_states{
+      pending_read = Read#connection_state{mac_secret = ReadMacSecret},
+      pending_write = Write#connection_state{mac_secret = WriteMacSecret}
+     }.
+
+
+%%--------------------------------------------------------------------
+-spec set_master_secret(binary(), #connection_states{}) -> #connection_states{}.
+%%
+%% Description: Set master_secret in pending connection states
+%%--------------------------------------------------------------------
+set_master_secret(MasterSecret,
+                  States = #connection_states{pending_read = Read,
+                                              pending_write = Write}) ->
+    ReadSecPar = Read#connection_state.security_parameters,
+    Read1 = Read#connection_state{
+              security_parameters = ReadSecPar#security_parameters{
+                                      master_secret = MasterSecret}},
+    WriteSecPar = Write#connection_state.security_parameters,
+    Write1 = Write#connection_state{
+               security_parameters = WriteSecPar#security_parameters{
+                                       master_secret = MasterSecret}},
+    States#connection_states{pending_read = Read1, pending_write = Write1}.
+
+%%--------------------------------------------------------------------
+-spec set_renegotiation_flag(boolean(), #connection_states{}) -> #connection_states{}.
+%%
+%% Description: Set secure_renegotiation in pending connection states
+%%--------------------------------------------------------------------
+set_renegotiation_flag(Flag, #connection_states{
+			 current_read = CurrentRead0,
+			 current_write = CurrentWrite0,
+			 pending_read = PendingRead0,
+			 pending_write = PendingWrite0}
+		       = ConnectionStates) ->
+    CurrentRead = CurrentRead0#connection_state{secure_renegotiation = Flag},
+    CurrentWrite = CurrentWrite0#connection_state{secure_renegotiation = Flag},
+    PendingRead = PendingRead0#connection_state{secure_renegotiation = Flag},
+    PendingWrite = PendingWrite0#connection_state{secure_renegotiation = Flag},
+    ConnectionStates#connection_states{current_read = CurrentRead,
+				       current_write = CurrentWrite,
+				       pending_read = PendingRead,
+				       pending_write = PendingWrite}.
+
+%%--------------------------------------------------------------------
+-spec set_client_verify_data(current_read | current_write | current_both,
+			     binary(), #connection_states{})->
+				    #connection_states{}.
+%%
+%% Description: Set verify data in connection states.
+%%--------------------------------------------------------------------
+set_client_verify_data(current_read, Data,
+		       #connection_states{current_read = CurrentRead0,
+					  pending_write = PendingWrite0}
+		       = ConnectionStates) ->
+    CurrentRead = CurrentRead0#connection_state{client_verify_data = Data},
+    PendingWrite = PendingWrite0#connection_state{client_verify_data = Data},
+    ConnectionStates#connection_states{current_read = CurrentRead,
+				       pending_write = PendingWrite};
+set_client_verify_data(current_write, Data,
+		       #connection_states{pending_read = PendingRead0,
+					  current_write = CurrentWrite0}
+		       = ConnectionStates) ->
+    PendingRead = PendingRead0#connection_state{client_verify_data = Data},
+    CurrentWrite = CurrentWrite0#connection_state{client_verify_data = Data},
+    ConnectionStates#connection_states{pending_read = PendingRead,
+				       current_write = CurrentWrite};
+set_client_verify_data(current_both, Data,
+		       #connection_states{current_read = CurrentRead0,
+					  current_write = CurrentWrite0}
+		       = ConnectionStates) ->
+    CurrentRead = CurrentRead0#connection_state{client_verify_data = Data},
+    CurrentWrite = CurrentWrite0#connection_state{client_verify_data = Data},
+    ConnectionStates#connection_states{current_read = CurrentRead,
+				       current_write = CurrentWrite}.
+%%--------------------------------------------------------------------
+-spec set_server_verify_data(current_read | current_write | current_both,
+			     binary(), #connection_states{})->
+				    #connection_states{}.
+%%
+%% Description: Set verify data in pending connection states.
+%%--------------------------------------------------------------------
+set_server_verify_data(current_write, Data,
+		       #connection_states{pending_read = PendingRead0,
+					  current_write = CurrentWrite0}
+		       = ConnectionStates) ->
+    PendingRead = PendingRead0#connection_state{server_verify_data = Data},
+    CurrentWrite = CurrentWrite0#connection_state{server_verify_data = Data},
+    ConnectionStates#connection_states{pending_read = PendingRead,
+				       current_write = CurrentWrite};
+
+set_server_verify_data(current_read, Data,
+		       #connection_states{current_read = CurrentRead0,
+					  pending_write = PendingWrite0}
+		       = ConnectionStates) ->
+    CurrentRead = CurrentRead0#connection_state{server_verify_data = Data},
+    PendingWrite = PendingWrite0#connection_state{server_verify_data = Data},
+    ConnectionStates#connection_states{current_read = CurrentRead,
+				       pending_write = PendingWrite};
+
+set_server_verify_data(current_both, Data,
+		       #connection_states{current_read = CurrentRead0,
+					  current_write = CurrentWrite0}
+		       = ConnectionStates) ->
+    CurrentRead = CurrentRead0#connection_state{server_verify_data = Data},
+    CurrentWrite = CurrentWrite0#connection_state{server_verify_data = Data},
+    ConnectionStates#connection_states{current_read = CurrentRead,
+				       current_write = CurrentWrite}.
+%%--------------------------------------------------------------------
+-spec set_pending_cipher_state(#connection_states{}, #cipher_state{},
+			       #cipher_state{}, client | server) ->
+				      #connection_states{}.
+%%
+%% Description: Set the cipher state in the specified pending connection state.
+%%--------------------------------------------------------------------
+set_pending_cipher_state(#connection_states{pending_read = Read,
+                                            pending_write = Write} = States,
+                         ClientState, ServerState, server) ->
+    States#connection_states{
+        pending_read = Read#connection_state{cipher_state = ClientState},
+        pending_write = Write#connection_state{cipher_state = ServerState}};
+
+set_pending_cipher_state(#connection_states{pending_read = Read,
+                                            pending_write = Write} = States,
+                         ClientState, ServerState, client) ->
+    States#connection_states{
+        pending_read = Read#connection_state{cipher_state = ServerState},
+        pending_write = Write#connection_state{cipher_state = ClientState}}.
+
+
+%%--------------------------------------------------------------------
+-spec encode_handshake(iolist(), tls_version(), #connection_states{}) ->
+			      {iolist(), #connection_states{}}.
+%%
+%% Description: Encodes a handshake message to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_handshake(Frag, Version, ConnectionStates) ->
+    encode_plain_text(?HANDSHAKE, Version, Frag, ConnectionStates).
+
+%%--------------------------------------------------------------------
+-spec encode_alert_record(#alert{}, tls_version(), #connection_states{}) ->
+				 {iolist(), #connection_states{}}.
+%%
+%% Description: Encodes an alert message to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_alert_record(#alert{level = Level, description = Description},
+                    Version, ConnectionStates) ->
+    encode_plain_text(?ALERT, Version, <<?BYTE(Level), ?BYTE(Description)>>,
+		      ConnectionStates).
+
+%%--------------------------------------------------------------------
+-spec encode_change_cipher_spec(tls_version(), #connection_states{}) ->
+				       {iolist(), #connection_states{}}.
+%%
+%% Description: Encodes a change_cipher_spec-message to send on the ssl socket.
+%%--------------------------------------------------------------------
+encode_change_cipher_spec(Version, ConnectionStates) ->
+    encode_plain_text(?CHANGE_CIPHER_SPEC, Version, <<1:8>>, ConnectionStates).
+
+%%--------------------------------------------------------------------
+-spec encode_data(binary(), tls_version(), #connection_states{}) ->
+			 {iolist(), #connection_states{}}.
+%%
+%% Description: Encodes data to send on the ssl-socket.
+%%--------------------------------------------------------------------
+encode_data(Frag, Version,
+	    #connection_states{current_write = #connection_state{
+				 security_parameters =
+				     #security_parameters{bulk_cipher_algorithm = BCA}}} =
+		ConnectionStates) ->
+    Data = split_bin(Frag, ?MAX_PLAIN_TEXT_LENGTH, Version, BCA),
+    encode_iolist(?APPLICATION_DATA, Data, Version, ConnectionStates).
+
+uncompress(?NULL, Data, CS) ->
+    {Data, CS}.
+
+compress(?NULL, Data, CS) ->
+    {Data, CS}.
+
+%%--------------------------------------------------------------------
+-spec compressions() -> [binary()].
+%%
+%% Description: return a list of compressions supported (currently none)
+%%--------------------------------------------------------------------
+compressions() ->
+    [?byte(?NULL)].
+
+%%--------------------------------------------------------------------
+-spec cipher(tls_version(), iolist(), #connection_state{}, MacHash::binary()) ->
+		    {CipherFragment::binary(), #connection_state{}}.
+%%
+%% Description: Payload encryption
+%%--------------------------------------------------------------------
+cipher(Version, Fragment,
+       #connection_state{cipher_state = CipherS0,
+			 security_parameters=
+			     #security_parameters{bulk_cipher_algorithm =
+						      BulkCipherAlgo}
+			} = WriteState0, MacHash) ->
+
+    {CipherFragment, CipherS1} =
+	ssl_cipher:cipher(BulkCipherAlgo, CipherS0, MacHash, Fragment, Version),
+    {CipherFragment,  WriteState0#connection_state{cipher_state = CipherS1}}.
+%%--------------------------------------------------------------------
+-spec decipher(tls_version(), binary(), #connection_state{}) -> {binary(), binary(), #connection_state{}}.
+%%
+%% Description: Payload decryption
+%%--------------------------------------------------------------------
+decipher(Version, CipherFragment,
+	 #connection_state{security_parameters =
+			       #security_parameters{bulk_cipher_algorithm =
+							BulkCipherAlgo,
+						    hash_size = HashSz},
+			   cipher_state = CipherS0
+			  } = ReadState) ->
+    case ssl_cipher:decipher(BulkCipherAlgo, HashSz, CipherS0, CipherFragment, Version) of
+	{PlainFragment, Mac, CipherS1} ->
+	    CS1 = ReadState#connection_state{cipher_state = CipherS1},
+	    {PlainFragment, Mac, CS1};
+	#alert{} = Alert ->
+	    Alert
+    end.
+%%--------------------------------------------------------------------
+%%% Internal functions
+%%--------------------------------------------------------------------
+empty_connection_state(ConnectionEnd) ->
+    SecParams = empty_security_params(ConnectionEnd),
+    #connection_state{security_parameters = SecParams}.
+
+empty_security_params(ConnectionEnd = ?CLIENT) ->
+    #security_parameters{connection_end = ConnectionEnd,
+                         client_random = random()};
+empty_security_params(ConnectionEnd = ?SERVER) ->
+    #security_parameters{connection_end = ConnectionEnd,
+                         server_random = random()}.
+random() ->
+    Secs_since_1970 = calendar:datetime_to_gregorian_seconds(
+			calendar:universal_time()) - 62167219200,
+    Random_28_bytes = crypto:rand_bytes(28),
+    <<?UINT32(Secs_since_1970), Random_28_bytes/binary>>.
+
+dtls_next_epoch(#connection_state{epoch = undefined}) -> %% SSL/TLS
+    undefined;
+dtls_next_epoch(#connection_state{epoch = Epoch}) -> %% DTLS
+    Epoch + 1.
+
+is_correct_mac(Mac, Mac) ->
+    true;
+is_correct_mac(_M,_H) ->
+    false.
+
+record_protocol_role(client) ->
+    ?CLIENT;
+record_protocol_role(server) ->
+    ?SERVER.
+
+initial_connection_state(ConnectionEnd) ->
+    #connection_state{security_parameters =
+			  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, SecParams).
+
+
+encode_plain_text(Type, Version, Data, ConnectionStates) ->
+    RecordCB = protocol_module(Version),
+    RecordCB:encode_plain_text(Type, Version, Data, ConnectionStates).
+
+encode_iolist(Type, Data, Version, ConnectionStates0) ->
+    RecordCB = protocol_module(Version),
+    {ConnectionStates, EncodedMsg} =
+        lists:foldl(fun(Text, {CS0, Encoded}) ->
+			    {Enc, CS1} =
+				RecordCB:encode_plain_text(Type, Version, Text, CS0),
+			    {CS1, [Enc | Encoded]}
+		    end, {ConnectionStates0, []}, Data),
+    {lists:reverse(EncodedMsg), ConnectionStates}.
+
+%% 1/n-1 splitting countermeasure Rizzo/Duong-Beast, RC4 chiphers are
+%% not vulnerable to this attack.
+split_bin(<<FirstByte:8, Rest/binary>>, ChunkSize, Version, BCA) when
+      BCA =/= ?RC4 andalso ({3, 1} == Version orelse
+			    {3, 0} == Version) ->
+    do_split_bin(Rest, ChunkSize, [[FirstByte]]);
+split_bin(Bin, ChunkSize, _, _) ->
+    do_split_bin(Bin, ChunkSize, []).
+
+do_split_bin(<<>>, _, Acc) ->
+    lists:reverse(Acc);
+do_split_bin(Bin, ChunkSize, Acc) ->
+    case Bin of
+        <<Chunk:ChunkSize/binary, Rest/binary>> ->
+            do_split_bin(Rest, ChunkSize, [Chunk | Acc]);
+        _ ->
+            lists:reverse(Acc, [Bin])
+    end.
+
+protocol_module({3, _}) ->
+    tls_record;
+protocol_module({254, _}) ->
+    dtls_record.
diff --git a/lib/ssl/src/ssl_record.hrl b/lib/ssl/src/ssl_record.hrl
index 2fd17f9c35..c17fa53a62 100644
--- a/lib/ssl/src/ssl_record.hrl
+++ b/lib/ssl/src/ssl_record.hrl
@@ -29,6 +29,18 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%% Connection states - RFC 4346 section 6.1
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-record(connection_state, {
+	  security_parameters,
+	  compression_state,
+	  cipher_state,
+	  mac_secret,
+	  epoch, %% Only used by DTLS
+	  sequence_number,
+	  %% RFC 5746
+	  secure_renegotiation,
+	  client_verify_data,
+	  server_verify_data
+	 }).
 
 -record(connection_states, {
 	  current_read,
@@ -56,17 +68,7 @@
           exportable				% boolean
        }). 
 
--record(connection_state, {
-	  security_parameters,
-	  compression_state,
-	  cipher_state,
-	  mac_secret,
-	  sequence_number,
-	  %% RFC 5746
-	  secure_renegotiation,
-	  client_verify_data,
-	  server_verify_data
-	 }).
+-define(INITIAL_BYTES, 5).
 
 -define(MAX_SEQENCE_NUMBER, 18446744073709552000). %% math:pow(2, 64) - 1 = 1.8446744073709552e19
 %% Sequence numbers can not wrap so when max is about to be reached we should renegotiate.
diff --git a/lib/ssl/src/ssl_socket.erl b/lib/ssl/src/ssl_socket.erl
index 4778db2333..1b6e637cd3 100644
--- a/lib/ssl/src/ssl_socket.erl
+++ b/lib/ssl/src/ssl_socket.erl
@@ -1,13 +1,14 @@
 -module(ssl_socket).
 
 -include("ssl_internal.hrl").
+-include("ssl_api.hrl").
 
--export([socket/3, setopts/3, getopts/3, peername/2, sockname/2, port/2]).
+-export([socket/4, setopts/3, getopts/3, peername/2, sockname/2, port/2]).
 
-socket(Pid, Transport, Socket) ->
+socket(Pid, Transport, Socket, ConnectionCb) ->
     #sslsocket{pid = Pid, 
 	       %% "The name "fd" is keept for backwards compatibility
-	       fd = {Transport, Socket}}.
+	       fd = {Transport, Socket, ConnectionCb}}.
 
 setopts(gen_tcp, Socket, Options) ->
     inet:setopts(Socket, Options);
diff --git a/lib/ssl/src/ssl_srp.hrl b/lib/ssl/src/ssl_srp.hrl
index ab2be33ab2..af56a91194 100644
--- a/lib/ssl/src/ssl_srp.hrl
+++ b/lib/ssl/src/ssl_srp.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %%
 %% The 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,9 +23,14 @@
 %% see RFC 5054
 %%----------------------------------------------------------------------
 
+-ifndef(ssl_srp).
+-define(ssl_srp, true).
+
 -record(srp_user, {
 	  generator :: binary(),
 	  prime     :: binary(),
 	  salt      :: binary(),
 	  verifier  :: binary()
 	 }).
+
+-endif. % -ifdef(ssl_srp).
diff --git a/lib/ssl/src/ssl_sup.erl b/lib/ssl/src/ssl_sup.erl
index 59039a6e0a..77b40a7b38 100644
--- a/lib/ssl/src/ssl_sup.erl
+++ b/lib/ssl/src/ssl_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
 %%
 %% The 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,22 +43,12 @@ start_link() ->
 %%%=========================================================================
 
 init([]) ->    
-    %% OLD ssl - moved start to ssl.erl only if old
-    %% ssl is acctualy run!
-    %%Child1 = {ssl_server, {ssl_server, start_link, []},
-    %%	       permanent, 2000, worker, [ssl_server]},
-
-    %% Does not start any port programs so it does matter
-    %% so much if it is not used!
-    %% Child2 = {ssl_broker_sup, {ssl_broker_sup, start_link, []},
-    %% 	      permanent, 2000, supervisor, [ssl_broker_sup]},
-
-
-    %% New ssl
     SessionCertManager = session_and_cert_manager_child_spec(),
-    ConnetionManager = connection_manager_child_spec(),
+    TLSConnetionManager = tls_connection_manager_child_spec(),
+    %% Not supported yet
+    %%DTLSConnetionManager = tls_connection_manager_child_spec(),
 
-    {ok, {{one_for_all, 10, 3600}, [SessionCertManager, ConnetionManager]}}.
+    {ok, {{one_for_all, 10, 3600}, [SessionCertManager, TLSConnetionManager]}}.
 
 
 manager_opts() ->
@@ -90,15 +80,23 @@ session_and_cert_manager_child_spec() ->
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
-connection_manager_child_spec() ->
-    Name = ssl_connection,  
-    StartFunc = {ssl_connection_sup, start_link, []},
+tls_connection_manager_child_spec() ->
+    Name = tls_connection,  
+    StartFunc = {tls_connection_sup, start_link, []},
     Restart = permanent, 
     Shutdown = 4000,
-    Modules = [ssl_connection],
+    Modules = [tls_connection, ssl_connection],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
+dtls_connection_manager_child_spec() ->
+    Name = dtls_connection,  
+    StartFunc = {dtls_connection_sup, start_link, []},
+    Restart = permanent, 
+    Shutdown = 4000,
+    Modules = [dtls_connection, ssl_connection],
+    Type = supervisor,
+    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
 session_cb_init_args() ->
     case application:get_env(ssl, session_cb_init_args) of
diff --git a/lib/ssl/src/ssl_ssl2.erl b/lib/ssl/src/ssl_v2.erl
index a9ab6a2678..07876366f1 100644
--- a/lib/ssl/src/ssl_ssl2.erl
+++ b/lib/ssl/src/ssl_v2.erl
@@ -1,30 +1,30 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%%
 %% The 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: Handles sslv2 hello as clients supporting sslv2 and higher 
+%% Purpose: Handles sslv2 hello as clients supporting sslv2 and higher
 %% will send an sslv2 hello.
 %%----------------------------------------------------------------------
 
--module(ssl_ssl2).
-             
+-module(ssl_v2).
+
 -export([client_random/2]).
 
 client_random(ChallengeData, 32) ->
diff --git a/lib/ssl/src/ssl_ssl3.erl b/lib/ssl/src/ssl_v3.erl
index 013c27ebb5..d477b3df81 100644
--- a/lib/ssl/src/ssl_ssl3.erl
+++ b/lib/ssl/src/ssl_v3.erl
@@ -22,14 +22,14 @@
 %% Purpose: Handles sslv3 encryption.
 %%----------------------------------------------------------------------
 
--module(ssl_ssl3).
+-module(ssl_v3).
 
 -include("ssl_cipher.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_record.hrl"). 			% MD5 and SHA
 
 -export([master_secret/3, finished/3, certificate_verify/3,
-	 mac_hash/6, setup_keys/7, 
+	 mac_hash/6, setup_keys/7,
 	 suites/0]).
 -compile(inline).
 
@@ -40,7 +40,7 @@
 -spec master_secret(binary(), binary(), binary()) -> binary().
 
 master_secret(PremasterSecret, ClientRandom, ServerRandom) ->
-    %%  draft-ietf-tls-ssl-version3-00 - 6.2.2 
+    %%  draft-ietf-tls-ssl-version3-00 - 6.2.2
     %% key_block =
     %%   MD5(master_secret + SHA(`A' + master_secret +
     %%                           ServerHello.random +
@@ -62,7 +62,7 @@ finished(Role, MasterSecret, Handshake) ->
    %%      opaque md5_hash[16];
    %%      opaque sha_hash[20];
    %%  } Finished;
-   %% 
+   %%
    %%   md5_hash       MD5(master_secret + pad2 +
    %%                     MD5(handshake_messages + Sender +
    %%                         master_secret + pad1));
@@ -95,23 +95,23 @@ certificate_verify(sha, MasterSecret, Handshake) ->
 
     handshake_hash(?SHA, MasterSecret, undefined, Handshake).
 
--spec mac_hash(integer(), binary(), integer(), integer(), integer(), binary()) -> binary(). 
+-spec mac_hash(integer(), binary(), integer(), integer(), integer(), binary()) -> binary().
 
 mac_hash(Method, Mac_write_secret, Seq_num, Type, Length, Fragment) ->
-    %% draft-ietf-tls-ssl-version3-00 - 5.2.3.1 
+    %% draft-ietf-tls-ssl-version3-00 - 5.2.3.1
     %% hash(MAC_write_secret + pad_2 +
     %%      hash(MAC_write_secret + pad_1 + seq_num +
     %%           SSLCompressed.type + SSLCompressed.length +
     %%           SSLCompressed.fragment));
-    Mac = mac_hash(Method, Mac_write_secret, 
-		   [<<?UINT64(Seq_num), ?BYTE(Type), 
+    Mac = mac_hash(Method, Mac_write_secret,
+		   [<<?UINT64(Seq_num), ?BYTE(Type),
 		     ?UINT16(Length)>>, Fragment]),
     Mac.
 
--spec setup_keys(binary(), binary(), binary(),  
-		 integer(), integer(), term(), integer()) -> 
-			{binary(), binary(), binary(), 
-			 binary(), binary(), binary()}.  
+-spec setup_keys(binary(), binary(), binary(),
+		 integer(), integer(), term(), integer()) ->
+			{binary(), binary(), binary(),
+			 binary(), binary(), binary()}.
 
 setup_keys(MasterSecret, ServerRandom, ClientRandom, HS, KML, _EKML, IVS) ->
     KeyBlock = generate_keyblock(MasterSecret, ServerRandom, ClientRandom,
@@ -133,7 +133,7 @@ setup_keys(MasterSecret, ServerRandom, ClientRandom, HS, KML, _EKML, IVS) ->
 -spec suites() -> [cipher_suite()].
 
 suites() ->
-    [ 
+    [
       ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
       ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
       ?TLS_RSA_WITH_AES_256_CBC_SHA,
@@ -143,7 +143,7 @@ suites() ->
       ?TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
       ?TLS_RSA_WITH_AES_128_CBC_SHA,
-      %%?TLS_RSA_WITH_IDEA_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
diff --git a/lib/ssl/src/tls.erl b/lib/ssl/src/tls.erl
index bb02695c12..c829129250 100644
--- a/lib/ssl/src/tls.erl
+++ b/lib/ssl/src/tls.erl
@@ -19,147 +19,43 @@
 
 %%
 
-%%% Purpose : Main API module for SSL.
+%%% Purpose : Reflect TLS specific API options (fairly simple wrapper at the moment)
 
 -module(tls).
 
--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, suite_definition/1,
-	 close/1, shutdown/2,
-	 connect/3, connect/2, connect/4, connection_info/1,
-	 controlling_process/2, listen/2, 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, clear_pem_cache/0, random_bytes/1, negotiated_next_protocol/1]).
-
+-include("ssl_api.hrl").
 -include("ssl_internal.hrl").
--include("ssl_record.hrl").
--include("ssl_cipher.hrl").
--include("ssl_handshake.hrl").
--include("ssl_srp.hrl").
-
--include_lib("public_key/include/public_key.hrl"). 
-
-%% Visible in API
--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, sslsocket/0]).
-
--record(config, {ssl,               %% SSL parameters
-		 inet_user,         %% User set inet options
-		 emulated,          %% #socket_option{} emulated
-		 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().
--type socket_listen_option()     :: gen_tcp:listen_option().
 
--type ssl_option()    :: {verify, verify_type()} |
-			{verify_fun, {fun(), InitialUserState::term()}} |
-                        {fail_if_no_peer_cert, boolean()} | {depth, integer()} |
-                        {cert, Der::binary()} | {certfile, path()} | {key, Der::binary()} |
-                        {keyfile, path()} | {password, string()} | {cacerts, [Der::binary()]} |
-                        {cacertfile, path()} | {dh, Der::binary()} | {dhfile, path()} |
-                        {user_lookup_fun, {fun(), InitialUserState::term()}} |
-                        {psk_identity, string()} |
-                        {srp_identity, {string(), string()}} |
-                        {ciphers, ciphers()} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} |
-                        {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().
--type ciphers()      :: [erl_cipher_suite()] |
-			string(). % (according to old API)
--type ssl_imp()      :: new | old.
-
--type transport_option() :: {cb_info, {CallbackModule::atom(), DataTag::atom(), 
-				       ClosedTag::atom(), ErrTag::atom()}}.
--type prf_random() :: client_random | server_random.
+-export([connect/2, connect/3, listen/2, accept/1, accept/2,
+	 handshake/1, handshake/2, handshake/3]).
 
 %%--------------------------------------------------------------------
--spec start() -> ok  | {error, reason()}.
--spec start(permanent | transient | temporary) -> ok | {error, reason()}.
 %%
-%% Description: Utility function that starts the ssl, 
-%% crypto and public_key applications. Default type
-%% is temporary. see application(3)
+%% Description: Connect to an TLS server.
 %%--------------------------------------------------------------------
-start() ->
-    application:start(crypto),
-    application:start(asn1),
-    application:start(public_key),
-    application:start(ssl).
-
-start(Type) ->
-    application:start(crypto, Type),
-    application:start(asn1),
-    application:start(public_key, Type),
-    application:start(ssl, Type).
 
-%%--------------------------------------------------------------------
--spec stop() -> ok.
-%%
-%% Description: Stops the ssl application.
-%%--------------------------------------------------------------------
-stop() ->
-    application:stop(ssl).
-
-%%--------------------------------------------------------------------
 -spec connect(host() | port(), [connect_option()]) -> {ok, #sslsocket{}} |
 					      {error, reason()}.
--spec connect(host() | port(), [connect_option()] | inet:port_number(), 
-	      timeout() | list()) ->
-		     {ok, #sslsocket{}} | {error, reason()}.
--spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
-		     {ok, #sslsocket{}} | {error, reason()}.
 
-%%
-%% Description: Connect to an ssl server.
-%%--------------------------------------------------------------------
-connect(Socket, SslOptions) when is_port(Socket) ->
-    connect(Socket, SslOptions, infinity).
+connect(Socket, Options) when is_port(Socket) ->
+    connect(Socket, Options, infinity).
 
-connect(Socket, SslOptions0, Timeout) when is_port(Socket) ->
-    {Transport,_,_,_} = proplists:get_value(cb_info, SslOptions0, 
-					      {gen_tcp, tcp, tcp_closed, tcp_error}),    
-    EmulatedOptions = emulated_options(),
-    {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions),
-    try handle_options(SslOptions0 ++ SocketValues, client) of
-	{ok, #config{cb = CbInfo, ssl = SslOptions, emulated = EmOpts}} ->
-	   
-	    ok = ssl_socket:setopts(Transport, Socket, internal_inet_values()),
-	    case ssl_socket:peername(Transport, Socket) of
-		{ok, {Address, Port}} ->
-		    tls_connection:connect(Address, Port, Socket, 
-					   {SslOptions, EmOpts},
-					   self(), CbInfo, Timeout);
-		{error, Error} ->
-		    {error, Error}
-	    end
-    catch 
-	_:{error, Reason} ->
-            {error, Reason}
-    end;
+-spec connect(host() | port(), [connect_option()] | inet:port_number(),
+	      timeout() | list()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
 
+connect(Socket, SslOptions, Timeout)  when is_port(Socket) ->
+    TLSOpts = [{protocol, tls} | SslOptions],
+    ssl:connect(Socket, TLSOpts, Timeout);
 connect(Host, Port, Options) ->
     connect(Host, Port, Options, infinity).
 
+-spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
+		     {ok, #sslsocket{}} | {error, reason()}.
+
 connect(Host, Port, Options, Timeout) ->
-    try handle_options(Options, client) of
-	{ok, Config} ->
-	    do_connect(Host,Port,Config,Timeout)
-    catch
-	throw:Error ->
-	    Error
-    end.
+    TLSOpts = [{protocol, tls} | Options],
+    ssl:connect(Host, Port, TLSOpts, Timeout).
 
 %%--------------------------------------------------------------------
 -spec listen(inet:port_number(), [listen_option()]) ->{ok, #sslsocket{}} | {error, reason()}.
@@ -167,873 +63,49 @@ connect(Host, Port, Options, Timeout) ->
 %%
 %% Description: Creates an ssl listen socket.
 %%--------------------------------------------------------------------
-listen(_Port, []) ->
-    {error, nooptions};
-listen(Port, Options0) ->
-    try
-	{ok, Config} = handle_options(Options0, server),
-	#config{cb = {Transport, _, _, _}, inet_user = Options} = Config,
-	case Transport:listen(Port, Options) of
-	    {ok, ListenSocket} ->
-		{ok, #sslsocket{pid = {ListenSocket, Config}}};
-	    Err = {error, _} ->
-		Err
-	end
-    catch
-	Error = {error, _} ->
-	    Error
-    end.
+listen(Port, Options) ->
+    TLSOpts = [{protocol, tls} | Options],
+    ssl:listen(Port, TLSOpts).
+
 %%--------------------------------------------------------------------
--spec transport_accept(#sslsocket{}) -> {ok, #sslsocket{}} |
-					{error, reason()}.
--spec transport_accept(#sslsocket{}, timeout()) -> {ok, #sslsocket{}} |
-						   {error, reason()}.
 %%
 %% Description: Performs transport accept on an ssl listen socket
 %%--------------------------------------------------------------------
-transport_accept(ListenSocket) ->
-    transport_accept(ListenSocket, infinity).
+-spec accept(#sslsocket{}) -> {ok, #sslsocket{}} |
+					{error, reason()}.
+accept(ListenSocket) ->
+    accept(ListenSocket, infinity).
 
-transport_accept(#sslsocket{pid = {ListenSocket, #config{cb = CbInfo, ssl = SslOpts}}}, Timeout) ->
-    
-    %% The setopt could have been invoked on the listen socket
-    %% and options should be inherited.
-    EmOptions = emulated_options(),
-    {Transport,_,_, _} = CbInfo,    
-    {ok, SocketValues} = ssl_socket:getopts(Transport, ListenSocket, EmOptions),
-    ok = ssl_socket:setopts(Transport, ListenSocket, internal_inet_values()),
-    case Transport:accept(ListenSocket, Timeout) of
-	{ok, Socket} ->
-	    ok = ssl_socket:setopts(Transport, ListenSocket, SocketValues),
-	    {ok, Port} = ssl_socket:port(Transport, Socket),
-	    ConnArgs = [server, "localhost", Port, Socket,
-			{SslOpts, socket_options(SocketValues)}, self(), CbInfo],
-	    case ssl_connection_sup:start_child(ConnArgs) of
-		{ok, Pid} ->
-		    tls_connection:socket_control(Socket, Pid, Transport);
-		{error, Reason} ->
-		    {error, Reason}
-	    end;
-	{error, Reason} ->
-	    {error, Reason}
-    end.
+-spec accept(#sslsocket{}, timeout()) -> {ok, #sslsocket{}} |
+						   {error, reason()}.
+accept(Socket, Timeout) ->
+    ssl:transport_accept(Socket, Timeout).
 
 %%--------------------------------------------------------------------
--spec ssl_accept(#sslsocket{}) -> ok | {error, reason()}.
--spec ssl_accept(#sslsocket{} | port(), timeout()| [ssl_option() 
-						    | transport_option()]) ->
-			ok | {ok, #sslsocket{}} | {error, reason()}.
--spec ssl_accept(port(), [ssl_option()| transport_option()], timeout()) -> 
-			{ok, #sslsocket{}} | {error, reason()}.
 %%
 %% Description: Performs accept on an ssl listen socket. e.i. performs
 %%              ssl handshake. 
 %%--------------------------------------------------------------------
-ssl_accept(ListenSocket) ->
-    ssl_accept(ListenSocket, infinity).
 
-ssl_accept(#sslsocket{} = Socket, Timeout) ->
-    tls_connection:handshake(Socket, Timeout);
-    
-ssl_accept(ListenSocket, SslOptions)  when is_port(ListenSocket) -> 
-    ssl_accept(ListenSocket, SslOptions, infinity).
-
-ssl_accept(Socket, SslOptions, Timeout) when is_port(Socket) -> 
-    {Transport,_,_,_} = 
-	proplists:get_value(cb_info, SslOptions, {gen_tcp, tcp, tcp_closed, tcp_error}),    
-    EmulatedOptions = emulated_options(),
-    {ok, SocketValues} = ssl_socket:getopts(Transport, Socket, EmulatedOptions),
-    try handle_options(SslOptions ++ SocketValues, server) of
-	{ok, #config{cb = CbInfo, ssl = SslOpts, emulated = EmOpts}} ->
-	    ok = ssl_socket:setopts(Transport, Socket, internal_inet_values()),
-	    {ok, Port} = ssl_socket:port(Transport, Socket),
-	    tls_connection:ssl_accept(Port, Socket,
-				      {SslOpts, EmOpts},
-				      self(), CbInfo, Timeout)
-    catch 
-	Error = {error, _Reason} -> Error
-    end.
+-spec handshake(#sslsocket{}) -> ok | {error, reason()}.
 
-%%--------------------------------------------------------------------
--spec  close(#sslsocket{}) -> term().
-%%
-%% Description: Close an ssl connection
-%%--------------------------------------------------------------------  
-close(#sslsocket{pid = Pid}) when is_pid(Pid) ->
-    tls_connection:close(Pid);
-close(#sslsocket{pid = {ListenSocket, #config{cb={Transport,_, _, _}}}}) ->
-    Transport:close(ListenSocket).
+handshake(ListenSocket) ->
+    handshake(ListenSocket, infinity).
 
-%%--------------------------------------------------------------------
--spec send(#sslsocket{}, iodata()) -> ok | {error, reason()}.
-%% 
-%% Description: Sends data over the ssl connection
-%%--------------------------------------------------------------------
-send(#sslsocket{pid = Pid}, Data) when is_pid(Pid) ->
-    tls_connection:send(Pid, Data);
-send(#sslsocket{pid = {ListenSocket, #config{cb={Transport, _, _, _}}}}, Data) ->
-    Transport:send(ListenSocket, Data). %% {error,enotconn}
-
-%%--------------------------------------------------------------------
--spec recv(#sslsocket{}, integer()) -> {ok, binary()| list()} | {error, reason()}.
--spec recv(#sslsocket{}, integer(), timeout()) -> {ok, binary()| list()} | {error, reason()}.
-%%
-%% Description: Receives data when active = false
-%%--------------------------------------------------------------------
-recv(Socket, Length) ->
-    recv(Socket, Length, infinity).
-recv(#sslsocket{pid = Pid}, Length, Timeout) when is_pid(Pid) ->
-    tls_connection:recv(Pid, Length, Timeout);
-recv(#sslsocket{pid = {Listen, 
-		       #config{cb={Transport, _, _, _}}}}, _,_) when is_port(Listen)->
-    Transport:recv(Listen, 0). %% {error,enotconn}
-
-%%--------------------------------------------------------------------
--spec controlling_process(#sslsocket{}, pid()) -> ok | {error, reason()}.
-%%				 
-%% Description: Changes process that receives the messages when active = true
-%% or once. 
-%%--------------------------------------------------------------------
-controlling_process(#sslsocket{pid = Pid}, NewOwner) when is_pid(Pid), is_pid(NewOwner) ->
-    tls_connection:new_user(Pid, NewOwner);
-controlling_process(#sslsocket{pid = {Listen,
-				      #config{cb={Transport, _, _, _}}}}, 
-		    NewOwner) when is_port(Listen),
-				   is_pid(NewOwner) ->
-    Transport:controlling_process(Listen, NewOwner).
-
-%%--------------------------------------------------------------------
--spec connection_info(#sslsocket{}) -> 	{ok, {tls_atom_version(), erl_cipher_suite()}} | 
-					{error, reason()}.
-%%
-%% Description: Returns ssl protocol and cipher used for the connection
-%%--------------------------------------------------------------------
-connection_info(#sslsocket{pid = Pid}) when is_pid(Pid) ->
-    tls_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, fd = {Transport, Socket}}) when is_pid(Pid)->
-    ssl_socket:peername(Transport, Socket);
-peername(#sslsocket{pid = {ListenSocket,  #config{cb = {Transport,_,_,_}}}}) ->
-    ssl_socket:peername(Transport, ListenSocket). %% Will return {error, enotconn}
-
-%%--------------------------------------------------------------------
--spec peercert(#sslsocket{}) ->{ok, DerCert::binary()} | {error, reason()}.
-%%
-%% Description: Returns the peercert.
-%%--------------------------------------------------------------------
-peercert(#sslsocket{pid = Pid}) when is_pid(Pid) ->
-    case tls_connection:peer_certificate(Pid) of
-	{ok, undefined} ->
-	    {error, no_peercert};
-        Result ->
-	    Result
-    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}) ->
-    tls_connection:negotiated_next_protocol(Pid).
-
--spec cipher_suites() -> [erl_cipher_suite()].
--spec cipher_suites(erlang | openssl | all) -> [erl_cipher_suite()] | [string()].
-			   
-%% Description: Returns all supported cipher suites.
-%%--------------------------------------------------------------------
-cipher_suites() ->
-    cipher_suites(erlang).
-  
-cipher_suites(erlang) ->
-    Version = tls_record:highest_protocol_version([]),
-    [suite_definition(S) || S <- ssl_cipher:suites(Version)];
-
-cipher_suites(openssl) ->
-    Version = tls_record:highest_protocol_version([]),
-    [ssl_cipher:openssl_suite_name(S) || S <- ssl_cipher:suites(Version)];
-cipher_suites(all) ->
-    Version = tls_record:highest_protocol_version([]),
-    Supported = ssl_cipher:suites(Version)
-	++ ssl_cipher:anonymous_suites()
-	++ ssl_cipher:psk_suites(Version)
-	++ ssl_cipher:srp_suites(),
-    [suite_definition(S) || S <- Supported].
-
-%%--------------------------------------------------------------------
--spec getopts(#sslsocket{}, [gen_tcp:option_name()]) ->
-		     {ok, [gen_tcp:option()]} | {error, reason()}.
-%% 
-%% Description: Gets options
-%%--------------------------------------------------------------------
-getopts(#sslsocket{pid = Pid}, OptionTags) when is_pid(Pid), is_list(OptionTags) ->
-    tls_connection:get_opts(Pid, OptionTags);
-getopts(#sslsocket{pid = {ListenSocket,  #config{cb = {Transport,_,_,_}}}}, 
-	OptionTags) when is_list(OptionTags) ->
-    try ssl_socket:getopts(Transport, ListenSocket, OptionTags) of
-	{ok, _} = Result ->
-	    Result;
-	{error, InetError} ->
-	    {error, {options, {socket_options, OptionTags, InetError}}}
-    catch
-	_:_ ->
-	    {error, {options, {socket_options, OptionTags}}}
-    end;
-getopts(#sslsocket{}, OptionTags) ->
-    {error, {options, {socket_options, OptionTags}}}.
 
-%%--------------------------------------------------------------------
--spec setopts(#sslsocket{},  [gen_tcp:option()]) -> ok | {error, reason()}.
-%% 
-%% Description: Sets options
-%%--------------------------------------------------------------------
-setopts(#sslsocket{pid = Pid}, Options0) when is_pid(Pid), is_list(Options0)  ->
-    try proplists:expand([{binary, [{mode, binary}]},
-			  {list, [{mode, list}]}], Options0) of
-	Options ->
-	    tls_connection:set_opts(Pid, Options)
-    catch
-	_:_ ->
-	    {error, {options, {not_a_proplist, Options0}}}
-    end;
-
-setopts(#sslsocket{pid = {ListenSocket, #config{cb = {Transport,_,_,_}}}}, Options) when is_list(Options) ->
-    try ssl_socket:setopts(Transport, ListenSocket, Options) of
-	ok ->
-	    ok;
-	{error, InetError} ->
-	    {error, {options, {socket_options, Options, InetError}}}
-    catch
-	_:Error ->
-	    {error, {options, {socket_options, Options, Error}}}
-    end;
-setopts(#sslsocket{}, Options) ->
-    {error, {options,{not_a_proplist, Options}}}.
-
-%%---------------------------------------------------------------
--spec shutdown(#sslsocket{}, read | write | read_write) ->  ok | {error, reason()}.
-%%		      
-%% Description: Same as gen_tcp:shutdown/2
-%%--------------------------------------------------------------------
-shutdown(#sslsocket{pid = {Listen, #config{cb={Transport,_, _, _}}}},
-	 How) when is_port(Listen) ->
-    Transport:shutdown(Listen, How);
-shutdown(#sslsocket{pid = Pid}, How) ->
-    tls_connection:shutdown(Pid, How).
-
-%%--------------------------------------------------------------------
--spec sockname(#sslsocket{}) -> {ok, {inet:ip_address(), inet:port_number()}} | {error, reason()}.
-%%		     
-%% Description: Same as inet:sockname/1
-%%--------------------------------------------------------------------
-sockname(#sslsocket{pid = {Listen,  #config{cb={Transport,_, _, _}}}}) when is_port(Listen) ->
-    ssl_socket:sockname(Transport, Listen);
-
-sockname(#sslsocket{pid = Pid, fd = {Transport, Socket}}) when is_pid(Pid) ->
-    ssl_socket:sockname(Transport, Socket).
-
-%%---------------------------------------------------------------
--spec session_info(#sslsocket{}) -> {ok, list()} | {error, reason()}.
-%% 
-%% Description: Returns list of session info currently [{session_id, session_id(),
-%% {cipher_suite, cipher_suite()}]
-%%--------------------------------------------------------------------
-session_info(#sslsocket{pid = Pid}) when is_pid(Pid) ->
-    tls_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()]}].
-%%
-%% Description: Returns a list of relevant versions.
-%%--------------------------------------------------------------------
-versions() ->
-    Vsns = tls_record:supported_protocol_versions(),
-    SupportedVsns = [tls_record:protocol_version(Vsn) || Vsn <- Vsns],
-    AvailableVsns = ?ALL_SUPPORTED_VERSIONS,
-    [{ssl_app, ?VSN}, {supported, SupportedVsns}, {available, AvailableVsns}].
-
-
-%%---------------------------------------------------------------
--spec renegotiate(#sslsocket{}) -> ok | {error, reason()}.
-%% 
-%% Description: Initiates a renegotiation.
-%%--------------------------------------------------------------------
-renegotiate(#sslsocket{pid = Pid}) when is_pid(Pid) ->
-    tls_connection:renegotiation(Pid);
-renegotiate(#sslsocket{pid = {Listen,_}}) when is_port(Listen) ->
-    {error, enotconn}.
-
-%%--------------------------------------------------------------------
--spec prf(#sslsocket{}, binary() | 'master_secret', binary(),
-	  binary() | prf_random(), non_neg_integer()) ->
-		 {ok, binary()} | {error, reason()}.
-%%
-%% Description: use a ssl sessions TLS PRF to generate key material
-%%--------------------------------------------------------------------
-prf(#sslsocket{pid = Pid},
-    Secret, Label, Seed, WantedLength) when is_pid(Pid) ->
-    tls_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().
-%%
-%% Description: Creates error string.
-%%--------------------------------------------------------------------
-format_error({error, Reason}) ->
-    format_error(Reason);
-format_error(Reason) when is_list(Reason) ->
-    Reason;
-format_error(closed) ->
-    "TLS connection is closed";
-format_error({tls_alert, Description}) ->
-    "TLS Alert: " ++ Description;
-format_error({options,{FileType, File, Reason}}) when FileType == cacertfile;
-						      FileType == certfile;
-						      FileType == keyfile;
-						      FileType == dhfile ->
-    Error = file_error_format(Reason),
-    file_desc(FileType) ++ File ++ ": " ++ Error;
-format_error({options, {socket_options, Option, Error}}) ->
-    lists:flatten(io_lib:format("Invalid transport socket option ~p: ~s", [Option, format_error(Error)]));
-format_error({options, {socket_options, Option}}) ->
-    lists:flatten(io_lib:format("Invalid socket option: ~p", [Option]));
-format_error({options, Options}) ->
-    lists:flatten(io_lib:format("Invalid TLS option: ~p", [Options]));
-
-format_error(Error) ->
-    case inet:format_error(Error) of
-        "unknown POSIX" ++ _ ->
-            unexpected_format(Error);
-        Other ->
-            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
-%%%--------------------------------------------------------------------
-do_connect(Address, Port,
-	       #config{cb=CbInfo, inet_user=UserOpts, ssl=SslOpts,
-		       emulated=EmOpts,inet_ssl=SocketOpts},
-	       Timeout) ->
-    {Transport, _, _, _} = CbInfo,    
-    try Transport:connect(Address, Port,  SocketOpts, Timeout) of
-	{ok, Socket} ->
-	    tls_connection:connect(Address, Port, Socket, {SslOpts,EmOpts},
-				   self(), CbInfo, Timeout);
-	{error, Reason} ->
-	    {error, Reason}
-    catch
-	exit:{function_clause, _} ->
-	    {error, {options, {cb_info, CbInfo}}};
-	exit:badarg ->
-	    {error, {options, {socket_options, UserOpts}}};
-	exit:{badarg, _} ->
-	    {error, {options, {socket_options, UserOpts}}}
-    end.
-
-handle_options(Opts0, _Role) ->
-    Opts = proplists:expand([{binary, [{mode, binary}]},
-			     {list, [{mode, list}]}], Opts0),
-    ReuseSessionFun = fun(_, _, _, _) -> true end,
-
-    DefaultVerifyNoneFun =
-	{fun(_,{bad_cert, _}, UserState) ->
-		 {valid, UserState};
-	    (_,{extension, _}, UserState) ->
-		 {unknown, UserState};
-	    (_, valid, UserState) ->
-		 {valid, UserState};
-	    (_, valid_peer, UserState) ->
-		 {valid, UserState}
-	 end, []},
-
-    VerifyNoneFun = handle_option(verify_fun, Opts, DefaultVerifyNoneFun),
-
-    UserFailIfNoPeerCert = handle_option(fail_if_no_peer_cert, Opts, false),
-    UserVerifyFun = handle_option(verify_fun, Opts, undefined),
-    CaCerts = handle_option(cacerts, Opts, undefined),
-
-    {Verify, FailIfNoPeerCert, CaCertDefault, VerifyFun} =
-	%% Handle 0, 1, 2 for backwards compatibility
-	case proplists:get_value(verify, Opts, verify_none) of
-	    0 ->
-		{verify_none, false,
-		 ca_cert_default(verify_none, VerifyNoneFun, CaCerts), VerifyNoneFun};
-	    1  ->
-		{verify_peer, false,
-		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
-	    2 ->
-		{verify_peer, true,
-		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
-	    verify_none ->
-		{verify_none, false,
-		 ca_cert_default(verify_none, VerifyNoneFun, CaCerts), VerifyNoneFun};
-	    verify_peer ->
-		{verify_peer, UserFailIfNoPeerCert,
-		 ca_cert_default(verify_peer, UserVerifyFun, CaCerts), UserVerifyFun};
-	    Value ->
-		throw({error, {options, {verify, Value}}})
-	end,
-
-    CertFile = handle_option(certfile, Opts, <<>>),
-    
-    Versions = case handle_option(versions, Opts, []) of
-		   [] ->
-		       tls_record:supported_protocol_versions();  
-		   Vsns  ->
-		       [tls_record:protocol_version(Vsn) || Vsn <- Vsns]
-	       end,  
-
-    SSLOptions = #ssl_options{
-      versions   = Versions,
-      verify     = validate_option(verify, Verify),
-      verify_fun = VerifyFun,
-      fail_if_no_peer_cert = FailIfNoPeerCert,
-      verify_client_once =  handle_option(verify_client_once, Opts, false),
-      depth      = handle_option(depth,  Opts, 1),
-      cert       = handle_option(cert, Opts, undefined),
-      certfile   = CertFile,
-      key        = handle_option(key, Opts, undefined),
-      keyfile    = handle_option(keyfile,  Opts, CertFile),
-      password   = handle_option(password, Opts, ""),
-      cacerts    = CaCerts,
-      cacertfile = handle_option(cacertfile, Opts, CaCertDefault),
-      dh         = handle_option(dh, Opts, undefined),
-      dhfile     = handle_option(dhfile, Opts, undefined),
-      user_lookup_fun = handle_option(user_lookup_fun, Opts, undefined),
-      psk_identity = handle_option(psk_identity, Opts, undefined),
-      srp_identity = handle_option(srp_identity, Opts, undefined),
-      ciphers    = handle_option(ciphers, Opts, []),
-      %% Server side option
-      reuse_session = handle_option(reuse_session, Opts, ReuseSessionFun),
-      reuse_sessions = handle_option(reuse_sessions, Opts, true),
-      secure_renegotiate = handle_option(secure_renegotiate, Opts, false),
-      renegotiate_at = handle_option(renegotiate_at, Opts, ?DEFAULT_RENEGOTIATE_AT),
-      hibernate_after = handle_option(hibernate_after, Opts, undefined),
-      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}),    
-    SslOptions = [versions, verify, verify_fun,
-		  fail_if_no_peer_cert, verify_client_once,
-		  depth, cert, certfile, key, keyfile,
-		  password, cacerts, cacertfile, dh, dhfile, 
-		  user_lookup_fun, psk_identity, srp_identity, ciphers,
-		  reuse_session, reuse_sessions, ssl_imp,
-		  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)
-			   end, Opts, SslOptions),
-    
-    {SSLsock, Emulated} = emulated_options(SockOpts),
-    {ok, #config{ssl=SSLOptions, emulated=Emulated, inet_ssl=SSLsock,
-		 inet_user=SockOpts, cb=CbInfo}}.
-
-handle_option(OptionName, Opts, Default) ->
-    validate_option(OptionName, 
-		    proplists:get_value(OptionName, Opts, Default)).
-
-
-validate_option(versions, Versions)  ->
-    validate_versions(Versions, Versions);
-validate_option(verify, Value) 
-  when Value == verify_none; Value == verify_peer ->
-    Value;
-validate_option(verify_fun, undefined)  ->
-    undefined;
-%% Backwards compatibility
-validate_option(verify_fun, Fun) when is_function(Fun) ->
-    {fun(_,{bad_cert, _} = Reason, OldFun) ->
-	     case OldFun([Reason]) of
-		 true ->
-		     {valid, OldFun};
-		 false ->
-		     {fail, Reason}
-	     end;
-	(_,{extension, _}, UserState) ->
-	     {unknown, UserState};
-	(_, valid, UserState) ->
-	     {valid, UserState};
-	(_, valid_peer, UserState) ->
-	     {valid, UserState}
-     end, Fun};
-validate_option(verify_fun, {Fun, _} = Value) when is_function(Fun) ->
-   Value;
-validate_option(fail_if_no_peer_cert, Value) 
-  when Value == true; Value == false ->
-    Value;
-validate_option(verify_client_once, Value) 
-  when Value == true; Value == false ->
-    Value;
-validate_option(depth, Value) when is_integer(Value), 
-                                   Value >= 0, Value =< 255->
-    Value;
-validate_option(cert, Value) when Value == undefined;
-                                 is_binary(Value) ->
-    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;
-validate_option(key, {KeyType, Value}) when is_binary(Value),
-					    KeyType == rsa; %% Backwards compatibility
-					    KeyType == dsa; %% Backwards compatibility
-					    KeyType == 'RSAPrivateKey';
-					    KeyType == 'DSAPrivateKey';
-					    KeyType == 'PrivateKeyInfo' ->
-    {KeyType, 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;
-
-validate_option(cacerts, Value) when Value == undefined;
-				     is_list(Value) ->
-    Value;
-%% 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_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_binary(Value) ->
-    Value;
-validate_option(dhfile, Value) when is_list(Value), Value =/= "" ->
-    list_to_binary(Value);
-validate_option(psk_identity, undefined) ->
-    undefined;
-validate_option(psk_identity, Identity)
-  when is_list(Identity), Identity =/= "", length(Identity) =< 65535 ->
-    list_to_binary(Identity);
-validate_option(user_lookup_fun, undefined) ->
-    undefined;
-validate_option(user_lookup_fun, {Fun, _} = Value) when is_function(Fun, 3) ->
-   Value;
-validate_option(srp_identity, undefined) ->
-    undefined;
-validate_option(srp_identity, {Username, Password})
-  when is_list(Username), is_list(Password), Username =/= "", length(Username) =< 255 ->
-    {list_to_binary(Username), list_to_binary(Password)};
-
-validate_option(ciphers, Value)  when is_list(Value) ->
-    Version = tls_record:highest_protocol_version([]),
-    try cipher_suites(Version, Value)
-    catch
-	exit:_ ->
-	    throw({error, {options, {ciphers, Value}}});
-	error:_->
-	    throw({error, {options, {ciphers, Value}}})
-    end;
-validate_option(reuse_session, Value) when is_function(Value) ->
-    Value;
-validate_option(reuse_sessions, Value) when Value == true; 
-					    Value == false ->
-    Value;
-
-validate_option(secure_renegotiate, Value) when Value == true; 
-						Value == false ->
-    Value;
-validate_option(renegotiate_at, Value) when is_integer(Value) ->
-    erlang:min(Value, ?DEFAULT_RENEGOTIATE_AT);
-
-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;
-				     Value == false ->
-    Value;
-validate_option(client_preferred_next_protocols = Opt, {Precedence, PreferredProtocols} = Value)
-  when is_list(PreferredProtocols) ->
-    case tls_record:highest_protocol_version([]) of
-	{3,0} ->
-	    throw({error, {options, {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 tls_record:highest_protocol_version([]) of
-	{3,0} ->
-	    throw({error, {options, {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 tls_record:highest_protocol_version([]) of
-	{3,0} ->
-	    throw({error, {options, {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, {options, {Opt, Value}}}).
-
-validate_npn_ordering(client) ->
-    ok;
-validate_npn_ordering(server) ->
-    ok;
-validate_npn_ordering(Value) ->
-    throw({error, {options, {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, {options, {Opt, {invalid_protocol, Bin}}}})
-        end, List).
-
-validate_versions([], Versions) ->
-    Versions;
-validate_versions([Version | Rest], Versions) when Version == 'tlsv1.2';
-                                                   Version == 'tlsv1.1';
-                                                   Version == tlsv1; 
-                                                   Version == sslv3 ->
-    validate_versions(Rest, Versions);					   
-validate_versions([Ver| _], Versions) ->
-    throw({error, {options, {Ver, {versions, Versions}}}}).
-
-validate_inet_option(mode, Value)
-  when Value =/= list, Value =/= binary ->
-    throw({error, {options, {mode,Value}}});
-validate_inet_option(packet, Value)
-  when not (is_atom(Value) orelse is_integer(Value)) ->
-    throw({error, {options, {packet,Value}}});
-validate_inet_option(packet_size, Value)
-  when not is_integer(Value) ->
-    throw({error, {options, {packet_size,Value}}});
-validate_inet_option(header, Value)
-  when not is_integer(Value) ->
-    throw({error, {options, {header,Value}}});
-validate_inet_option(active, Value)
-  when Value =/= true, Value =/= false, Value =/= once ->
-    throw({error, {options, {active,Value}}});
-validate_inet_option(_, _) ->
-    ok.
-
-%% The option cacerts overrides cacertsfile
-ca_cert_default(_,_, [_|_]) ->
-    undefined;
-ca_cert_default(verify_none, _, _) ->
-    undefined;
-ca_cert_default(verify_peer, {Fun,_}, _) when is_function(Fun) ->
-    undefined;
-%% Server that wants to verify_peer and has no verify_fun must have
-%% some trusted certs.
-ca_cert_default(verify_peer, undefined, _) ->
-    "".
-
-emulated_options() ->
-    [mode, packet, active, header, packet_size].
-
-internal_inet_values() ->
-    [{packet_size,0},{packet, 0},{header, 0},{active, false},{mode,binary}].
-
-socket_options(InetValues) ->
-    #socket_options{
-		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)	     
-	       }.
-
-emulated_options(Opts) ->
-    emulated_options(Opts, internal_inet_values(), #socket_options{}).
-
-emulated_options([{mode,Opt}|Opts], Inet, Emulated) ->
-    validate_inet_option(mode,Opt),
-    emulated_options(Opts, Inet, Emulated#socket_options{mode=Opt});
-emulated_options([{header,Opt}|Opts], Inet, Emulated) ->
-    validate_inet_option(header,Opt),
-    emulated_options(Opts, Inet, Emulated#socket_options{header=Opt});
-emulated_options([{active,Opt}|Opts], Inet, Emulated) ->
-    validate_inet_option(active,Opt),
-    emulated_options(Opts, Inet, Emulated#socket_options{active=Opt});
-emulated_options([{packet,Opt}|Opts], Inet, Emulated) ->
-    validate_inet_option(packet,Opt),
-    emulated_options(Opts, Inet, Emulated#socket_options{packet=Opt});
-emulated_options([{packet_size,Opt}|Opts], Inet, Emulated) ->
-    validate_inet_option(packet_size,Opt),
-    emulated_options(Opts, Inet, Emulated#socket_options{packet_size=Opt});
-emulated_options([Opt|Opts], Inet, Emulated) ->
-    emulated_options(Opts, [Opt|Inet], Emulated);
-emulated_options([], Inet,Emulated) ->
-    {Inet, Emulated}.
-
-cipher_suites(Version, []) ->
-    ssl_cipher:suites(Version);
-cipher_suites(Version, [{_,_,_,_}| _] = Ciphers0) -> %% Backwards compatibility
-    Ciphers = [{KeyExchange, Cipher, Hash} || {KeyExchange, Cipher, Hash, _} <- Ciphers0],
-    cipher_suites(Version, Ciphers);
-cipher_suites(Version, [{_,_,_}| _] = Ciphers0) ->
-    Ciphers = [ssl_cipher:suite(C) || C <- Ciphers0],
-    cipher_suites(Version, Ciphers);
-
-cipher_suites(Version, [Cipher0 | _] = Ciphers0) when is_binary(Cipher0) ->
-    Supported0 = ssl_cipher:suites(Version)  
-	++ ssl_cipher:anonymous_suites() 
-	++ ssl_cipher:psk_suites(Version)
-	++ ssl_cipher:srp_suites(),
-    Supported = ssl_cipher:filter_suites(Supported0),
-    case [Cipher || Cipher <- Ciphers0, lists:member(Cipher, Supported)] of
-	[] ->
-	    Supported;
-	Ciphers ->
-	    Ciphers
-    end;
-cipher_suites(Version, [Head | _] = Ciphers0) when is_list(Head) ->
-    %% Format: ["RC4-SHA","RC4-MD5"]
-    Ciphers = [ssl_cipher:openssl_suite(C) || C <- Ciphers0],
-    cipher_suites(Version, Ciphers); 
-cipher_suites(Version, Ciphers0)  ->
-    %% Format: "RC4-SHA:RC4-MD5"
-    Ciphers = [ssl_cipher:openssl_suite(C) || C <- string:tokens(Ciphers0, ":")],
-    cipher_suites(Version, Ciphers).
-
-unexpected_format(Error) ->    
-    lists:flatten(io_lib:format("Unexpected error: ~p", [Error])).
+-spec handshake(#sslsocket{} | port(), timeout()| [ssl_option()
+						    | transport_option()]) ->
+			ok | {ok, #sslsocket{}} | {error, reason()}.
 
-file_error_format({error, Error})->
-    case file:format_error(Error) of 
-	"unknown POSIX error" ->
-	    "decoding error";
-	Str ->
-	    Str
-    end;
-file_error_format(_) ->
-    "decoding error".
+handshake(#sslsocket{} = Socket, Timeout) ->
+    ssl:ssl_accept(Socket, Timeout);
     
-file_desc(cacertfile) ->
-    "Invalid CA certificate file ";
-file_desc(certfile) ->
-    "Invalid certificate file ";
-file_desc(keyfile) ->
-    "Invalid key file "; 
-file_desc(dhfile) ->
-    "Invalid DH params file ".
+handshake(ListenSocket, SslOptions)  when is_port(ListenSocket) ->
+    handshake(ListenSocket, SslOptions, infinity).
 
-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;
+-spec handshake(port(), [ssl_option()| transport_option()], timeout()) ->
+			{ok, #sslsocket{}} | {error, reason()}.
 
-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.
+handshake(Socket, SslOptions, Timeout) when is_port(Socket) ->
+    ssl:ssl_accept(Socket, SslOptions, Timeout).
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 246fecf34a..ffa04ee8ba 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -29,21 +29,38 @@
 
 -behaviour(gen_fsm).
 
+-include("tls_connection.hrl").
 -include("tls_handshake.hrl").
 -include("ssl_alert.hrl").
 -include("tls_record.hrl").
--include("ssl_cipher.hrl"). 
+-include("ssl_cipher.hrl").
+-include("ssl_api.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_srp.hrl").
 -include_lib("public_key/include/public_key.hrl"). 
 
 %% Internal application API
--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, renegotiation/1, negotiated_next_protocol/1, prf/5]).
 
-%% Called by ssl_connection_sup
+%% Setup
+-export([start_fsm/8]).
+
+%% State transition handling	 
+-export([next_record/1, next_state/4, next_state_connection/2]).
+
+%% Handshake handling
+-export([renegotiate/1, send_handshake/2, send_change_cipher/2]).
+
+%% Alert and close handling
+-export([send_alert/2, handle_own_alert/4, handle_close_alert/3,
+	 handle_normal_shutdown/3, handle_unexpected_message/3,
+	 workaround_transport_delivery_problems/2, alert_user/5, alert_user/8
+	]).
+
+%% Data handling
+-export([write_application_data/3, read_application_data/2,
+	 passive_receive/2,  next_record_if_active/1]).
+
+%% Called by tls_connection_sup
 -export([start_link/7]). 
 
 %% gen_fsm callbacks
@@ -51,242 +68,69 @@
 	 abbreviated/2, connection/2, handle_event/3,
          handle_sync_event/4, handle_info/3, terminate/3, code_change/4]).
 
--record(state, {
-          role,               % client | server
-          user_application,   % {MonitorRef, pid()} 
-          transport_cb,       % atom() - callback module 
-          data_tag,           % atom()  - ex tcp.
-	  close_tag,          % atom()  - ex tcp_closed
-	  error_tag,          % atom() - ex  tcp_error
-          host,               % string() | ipadress()
-          port,               % integer()
-          socket,             % socket() 
-          ssl_options,        % #ssl_options{}
-          socket_options,     % #socket_options{}
-          connection_states,  % #connection_states{} from ssl_record.hrl
-	  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
-          tls_handshake_history, % tls_handshake_history()
-          tls_cipher_texts,     % list() received but not deciphered yet
-	  cert_db,              %
-          session,              % #session{} from tls_handshake.hrl
-	  session_cache,        % 
-	  session_cache_cb,     %
-          negotiated_version,   % tls_version()
-          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}
-	  psk_identity,        % binary() - server psk identity hint
-	  srp_params,          % #srp_user{}
-	  srp_keys,            % {PublicKey, PrivateKey}
-          premaster_secret,    %
-	  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}
-	  start_or_recv_from,  % "gen_fsm From"
-	  timer,               % start_or_recv_timer
-	  send_queue,          % queue()
-	  terminated = false,  %
-	  allow_renegotiate = true,
-          expecting_next_protocol_negotiation = false :: boolean(),
-          next_protocol = undefined :: undefined | binary(),
-	  client_ecc          % {Curves, PointFmt}
-	 }).
-
--define(DEFAULT_DIFFIE_HELLMAN_PARAMS, 
-	#'DHParameter'{prime = ?DEFAULT_DIFFIE_HELLMAN_PRIME,
-		       base = ?DEFAULT_DIFFIE_HELLMAN_GENERATOR}).
--define(WAIT_TO_ALLOW_RENEGOTIATION, 12000).
-
--type state_name()           :: hello | abbreviated | certify | cipher | connection.
--type gen_fsm_state_return() :: {next_state, state_name(), #state{}} |
-				{next_state, state_name(), #state{}, timeout()} |
-				{stop, term(), #state{}}.
-
 %%====================================================================
 %% Internal application API
 %%====================================================================	     
-
-%%--------------------------------------------------------------------
--spec send(pid(), iodata()) -> ok | {error, reason()}.
-%%
-%% Description: Sends data over the ssl connection
-%%--------------------------------------------------------------------
-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)}).
-
-%%--------------------------------------------------------------------
--spec recv(pid(), integer(), timeout()) ->  
-    {ok, binary() | list()} | {error, reason()}.
-%%
-%% Description:  Receives data when active = false
-%%--------------------------------------------------------------------
-recv(Pid, 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()) ->
-		     {ok, #sslsocket{}} | {error, reason()}.
-%%
-%% Description: Connect to an ssl server.
-%%--------------------------------------------------------------------
-connect(Host, Port, Socket, Options, User, CbInfo, Timeout) ->
-    try start_fsm(client, Host, Port, Socket, Options, User, CbInfo,
-		  Timeout)
-    catch
-	exit:{noproc, _} ->
-	    {error, ssl_not_started}
-    end.
-%%--------------------------------------------------------------------
--spec ssl_accept(inet:port_number(), port(), {#ssl_options{}, #socket_options{}},
-				      pid(), tuple(), timeout()) ->
-    {ok, #sslsocket{}} | {error, reason()}.
-%%
-%% Description: Performs accept on an ssl listen socket. e.i. performs
-%%              ssl handshake. 
-%%--------------------------------------------------------------------
-ssl_accept(Port, Socket, Opts, User, CbInfo, Timeout) ->
-    try start_fsm(server, "localhost", Port, Socket, Opts, User, 
-		  CbInfo, Timeout)
+start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_} = Opts,
+	  User, {CbModule, _,_, _} = CbInfo, 
+	  Timeout) -> 
+    try 
+	{ok, Pid} = tls_connection_sup:start_child([Role, Host, Port, Socket, 
+						    Opts, User, CbInfo]), 
+	{ok, SslSocket} = ssl_connection:socket_control(?MODULE, Socket, Pid, CbModule),
+	ok = ssl_connection:handshake(SslSocket, Timeout),
+	{ok, SslSocket} 
     catch
-	exit:{noproc, _} ->
-	    {error, ssl_not_started}
-    end.	
-
-%%--------------------------------------------------------------------
--spec handshake(#sslsocket{}, timeout()) ->  ok | {error, reason()}.
-%%
-%% Description: Starts ssl handshake. 
-%%--------------------------------------------------------------------
-handshake(#sslsocket{pid = Pid}, Timeout) ->  
-    case sync_send_all_state_event(Pid, {start, Timeout}) of
-	connected ->
-	    ok;
- 	Error ->
+	error:{badmatch, {error, _} = Error} ->
 	    Error
-    end.
-%--------------------------------------------------------------------
--spec socket_control(port(), pid(), atom()) -> 
-    {ok, #sslsocket{}} | {error, reason()}.  
-%%
-%% Description: Set the ssl process to own the accept socket
-%%--------------------------------------------------------------------	    
-socket_control(Socket, Pid, Transport) ->
-    case Transport:controlling_process(Socket, Pid) of
-	ok ->
-	    {ok, ssl_socket:socket(Pid, Transport, Socket)};
-	{error, Reason}	->
-	    {error, Reason}
-    end.
+    end;
 
-%%--------------------------------------------------------------------
--spec close(pid()) -> ok | {error, reason()}.  
-%%
-%% Description:  Close an ssl connection
-%%--------------------------------------------------------------------
-close(ConnectionPid) ->
-    case sync_send_all_state_event(ConnectionPid, close) of
-	{error, closed} ->
-	    ok;
-	Other ->
-	    Other
+start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_} = Opts,
+	  User, {CbModule, _,_, _} = CbInfo, 
+	  Timeout) -> 
+    try 
+	{ok, Pid} = tls_connection_sup:start_child_dist([Role, Host, Port, Socket, 
+							 Opts, User, CbInfo]), 
+	{ok, SslSocket} = ssl_connection:socket_control(?MODULE, Socket, Pid, CbModule),
+	ok = ssl_connection:handshake(SslSocket, Timeout),
+	{ok, SslSocket} 
+    catch
+	error:{badmatch, {error, _} = Error} ->
+	    Error
     end.
 
-%%--------------------------------------------------------------------
--spec shutdown(pid(), atom()) -> ok | {error, reason()}.  
-%%
-%% Description: Same as gen_tcp:shutdown/2
-%%--------------------------------------------------------------------
-shutdown(ConnectionPid, How) ->
-    sync_send_all_state_event(ConnectionPid, {shutdown, How}).
-
-%%--------------------------------------------------------------------
--spec new_user(pid(), pid()) ->  ok | {error, reason()}.
-%%
-%% Description:  Changes process that receives the messages when active = true
-%% or once. 
-%%--------------------------------------------------------------------
-new_user(ConnectionPid, User) ->
-    sync_send_all_state_event(ConnectionPid, {new_user, User}).
-
-%%--------------------------------------------------------------------
--spec negotiated_next_protocol(pid()) -> {ok, binary()} | {error, reason()}.
-%%
-%% Description:  Returns the negotiated protocol
-%%--------------------------------------------------------------------
-negotiated_next_protocol(ConnectionPid) ->
-    sync_send_all_state_event(ConnectionPid, negotiated_next_protocol).
-
-%%--------------------------------------------------------------------
--spec get_opts(pid(), list()) -> {ok, list()} | {error, reason()}.    
-%%
-%% Description: Same as inet:getopts/2
-%%--------------------------------------------------------------------
-get_opts(ConnectionPid, OptTags) ->
-    sync_send_all_state_event(ConnectionPid, {get_opts, OptTags}).
-%%--------------------------------------------------------------------
--spec set_opts(pid(), list()) -> ok | {error, reason()}. 
-%%
-%% Description:  Same as inet:setopts/2
-%%--------------------------------------------------------------------
-set_opts(ConnectionPid, Options) ->
-    sync_send_all_state_event(ConnectionPid, {set_opts, Options}).
-
-%%--------------------------------------------------------------------
--spec info(pid()) ->  {ok, {atom(), tuple()}} | {error, reason()}. 
-%%
-%% Description:  Returns ssl protocol and cipher used for the connection
-%%--------------------------------------------------------------------
-info(ConnectionPid) ->
-    sync_send_all_state_event(ConnectionPid, info). 
-
-%%--------------------------------------------------------------------
--spec session_info(pid()) -> {ok, list()} | {error, reason()}. 
-%%
-%% Description:  Returns info about the ssl session
-%%--------------------------------------------------------------------
-session_info(ConnectionPid) ->
-    sync_send_all_state_event(ConnectionPid, session_info). 
-
-%%--------------------------------------------------------------------
--spec peer_certificate(pid()) -> {ok, binary()| undefined} | {error, reason()}.
-%%
-%% Description: Returns the peer cert
-%%--------------------------------------------------------------------
-peer_certificate(ConnectionPid) ->
-    sync_send_all_state_event(ConnectionPid, peer_certificate). 
+send_handshake(Handshake, #state{negotiated_version = Version,
+				 socket = Socket,
+				 transport_cb = Transport,
+				 tls_handshake_history = Hist0,
+				 connection_states = ConnectionStates0} = State0) ->
+    {BinHandshake, ConnectionStates, Hist} =
+	encode_handshake(Handshake, Version, ConnectionStates0, Hist0),
+    Transport:send(Socket, BinHandshake),
+    State0#state{connection_states = ConnectionStates,
+		tls_handshake_history = Hist
+	       }.
 
-%%--------------------------------------------------------------------
--spec renegotiation(pid()) -> ok | {error, reason()}.
-%%
-%% Description: Starts a renegotiation of the ssl session.
-%%--------------------------------------------------------------------
-renegotiation(ConnectionPid) ->
-    sync_send_all_state_event(ConnectionPid, renegotiate). 
+send_alert(Alert, #state{negotiated_version = Version,
+			 socket = Socket,
+			 transport_cb = Transport,
+			 connection_states = ConnectionStates0} = State0) ->
+    {BinMsg, ConnectionStates} =
+	ssl_alert:encode(Alert, Version, ConnectionStates0),
+    Transport:send(Socket, BinMsg),
+    State0#state{connection_states = ConnectionStates}.
 
-%%--------------------------------------------------------------------
--spec prf(pid(), binary() | 'master_secret', binary(),
-	  binary() | ssl:prf_random(), non_neg_integer()) ->
-		 {ok, binary()} | {error, reason()} | {'EXIT', term()}.
-%%
-%% Description: use a ssl sessions TLS PRF to generate key material
-%%--------------------------------------------------------------------
-prf(ConnectionPid, Secret, Label, Seed, WantedLength) ->
-    sync_send_all_state_event(ConnectionPid, {prf, Secret, Label, Seed, WantedLength}).
+send_change_cipher(Msg, #state{connection_states = ConnectionStates0,
+			       socket = Socket,
+			       negotiated_version = Version,
+			       transport_cb = Transport} = State0) ->
+    {BinChangeCipher, ConnectionStates} =
+	encode_change_cipher(Msg, Version, ConnectionStates0),
+    Transport:send(Socket, BinChangeCipher),
+    State0#state{connection_states = ConnectionStates}.
 
 %%====================================================================
-%% ssl_connection_sup API
+%% tls_connection_sup API
 %%====================================================================
 
 %%--------------------------------------------------------------------
@@ -301,10 +145,11 @@ start_link(Role, Host, Port, Socket, Options, User, CbInfo) ->
     {ok, proc_lib:spawn_link(?MODULE, init, [[Role, Host, Port, Socket, Options, User, CbInfo]])}.
 
 init([Role, Host, Port, Socket, {SSLOpts0, _} = Options,  User, CbInfo]) ->
+    process_flag(trap_exit, true),
     State0 = initial_state(Role, Host, Port, Socket, Options, User, CbInfo),
-    Handshake = tls_handshake:init_handshake_history(),
+    Handshake = ssl_handshake:init_handshake_history(),
     TimeStamp = calendar:datetime_to_gregorian_seconds({date(), time()}),
-    try ssl_init(SSLOpts0, Role) of
+    try ssl_config:init(SSLOpts0, Role) of
 	{ok, Ref, CertDbHandle, FileRefHandle, CacheHandle, OwnCert, Key, DHParams} ->
 	    Session = State0#state.session,
 	    State = State0#state{
@@ -330,23 +175,18 @@ init([Role, Host, Port, Socket, {SSLOpts0, _} = Options,  User, CbInfo]) ->
 %% 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,
-			      session_cache = Cache, session_cache_cb = CacheCb,
-			      transport_cb = Transport, socket = Socket,
-			      connection_states = ConnectionStates0,
-			      renegotiation = {Renegotiation, _}} = State0) ->
+		    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 = tls_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
 				       Cache, CacheCb, Renegotiation, Cert),
     
     Version = Hello#client_hello.client_version,
-    Handshake0 = tls_handshake:init_handshake_history(),
+    Handshake0 = ssl_handshake:init_handshake_history(),
     {BinMsg, ConnectionStates, Handshake} =
         encode_handshake(Hello, Version, ConnectionStates0, Handshake0),
     Transport:send(Socket, BinMsg),
@@ -358,488 +198,70 @@ hello(start, #state{host = Host, port = Port, role = client,
     {Record, State} = next_record(State1),
     next_state(hello, hello, Record, State);
 
-hello(start, #state{role = server} = State0) ->
-    {Record, State} = next_record(State0),
-    next_state(hello, hello, Record, State);
-
-hello(#hello_request{}, #state{role = client} = State0) ->
-    {Record, State} = next_record(State0),
-    next_state(hello, hello, Record, State);
-
-hello(#server_hello{cipher_suite = CipherSuite,
-		    compression_method = Compression} = Hello,
-      #state{session = #session{session_id = OldId},
-	     connection_states = ConnectionStates0,
-	     role = client,
-	     negotiated_version = ReqVersion,
-	     renegotiation = {Renegotiation, _},
-	     ssl_options = SslOptions} = State0) ->
-    case tls_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, ReqVersion, hello, 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,
-				 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#state{connection_states = ConnectionStates});
-		false ->
-		    handle_resumed_session(NewId, State#state{connection_states = ConnectionStates}) 
-	    end
-    end;
-
-hello(Hello = #client_hello{client_version = ClientVersion},
+hello(Hello = #client_hello{client_version = ClientVersion,
+			    extensions = #hello_extensions{hash_signs = HashSigns,
+							   ec_point_formats = EcPointFormats,
+							   elliptic_curves = EllipticCurves}},
       State = #state{connection_states = ConnectionStates0,
 		     port = Port, session = #session{own_certificate = Cert} = Session0,
 		     renegotiation = {Renegotiation, _},
-		     session_cache = Cache,		  
+		     session_cache = Cache,
 		     session_cache_cb = CacheCb,
 		     ssl_options = SslOpts}) ->
+    HashSign = ssl_handshake:select_hashsign(HashSigns, Cert),
     case tls_handshake:hello(Hello, SslOpts, {Port, Session0, Cache, CacheCb,
-				     ConnectionStates0, Cert}, Renegotiation) of
-        {Version, {Type, Session}, ConnectionStates, ProtocolsToAdvertise,
-	 EcPointFormats, EllipticCurves} ->
-            do_server_hello(Type, ProtocolsToAdvertise,
-			    EcPointFormats, EllipticCurves,
-			    State#state{connection_states  = ConnectionStates,
-					negotiated_version = Version,
-					session = Session,
-					client_ecc = {EllipticCurves, EcPointFormats}});
+					      ConnectionStates0, Cert}, Renegotiation) of
+        {Version, {Type, Session},
+	 ConnectionStates, ServerHelloExt} ->
+            ssl_connection:hello({common_client_hello, Type, ServerHelloExt, HashSign},
+				 State#state{connection_states  = ConnectionStates,
+					     negotiated_version = Version,
+					     session = Session,
+					     client_ecc = {EllipticCurves, EcPointFormats}}, ?MODULE);
         #alert{} = Alert ->
             handle_own_alert(Alert, ClientVersion, hello, State)
     end;
-
-hello(timeout, State) ->
-    { next_state, hello, State, hibernate };
-
-hello(Msg, State) ->
-    handle_unexpected_message(Msg, hello, State).
-%%--------------------------------------------------------------------
--spec abbreviated(#hello_request{} | #finished{} | term(),
-		  #state{}) -> gen_fsm_state_return().   
-%%--------------------------------------------------------------------
-abbreviated(#hello_request{}, State0) ->
-    {Record, State} = next_record(State0),
-    next_state(abbreviated, hello, Record, State);
-
-abbreviated(#finished{verify_data = Data} = Finished,
-	    #state{role = server,
-		   negotiated_version = Version,
-		   tls_handshake_history = Handshake,
-		   session = #session{master_secret = MasterSecret},
-		  connection_states = ConnectionStates0} = 
-	    State) ->
-    case tls_handshake:verify_connection(Version, Finished, client,
-					 get_current_connection_state_prf(ConnectionStates0, write),
-					 MasterSecret, Handshake) of
-        verified ->  
-	    ConnectionStates = tls_record:set_client_verify_data(current_both, Data, ConnectionStates0),
-	    next_state_connection(abbreviated, 
-				  ack_connection(State#state{connection_states = ConnectionStates}));
+hello(Hello,
+      #state{connection_states = ConnectionStates0,
+	     negotiated_version = ReqVersion,
+	     role = client,
+	     renegotiation = {Renegotiation, _},
+	     ssl_options = SslOptions} = State) ->
+    case tls_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of
 	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, abbreviated, State)
-    end;
-
-abbreviated(#finished{verify_data = Data} = Finished,
-	    #state{role = client, tls_handshake_history = Handshake0,
-		   session = #session{master_secret = MasterSecret},
-		   negotiated_version = Version,
-		   connection_states = ConnectionStates0} = State) ->
-    case tls_handshake:verify_connection(Version, Finished, server,
-					 get_pending_connection_state_prf(ConnectionStates0, write),
-					 MasterSecret, Handshake0) of
-        verified ->
-	    ConnectionStates1 = tls_record:set_server_verify_data(current_read, Data, ConnectionStates0),
-	    {ConnectionStates, Handshake} =
-		finalize_handshake(State#state{connection_states = ConnectionStates1}, abbreviated),
-	    next_state_connection(abbreviated, 
-				  ack_connection(State#state{tls_handshake_history = Handshake,
-							     connection_states = 
-							     ConnectionStates}));
-        #alert{} = Alert ->
-	    handle_own_alert(Alert, Version, abbreviated, State)
+	    handle_own_alert(Alert, ReqVersion, hello, State);
+	{Version, NewId, ConnectionStates, NextProtocol} ->
+	    ssl_connection:handle_session(Hello, 
+					  Version, NewId, ConnectionStates, NextProtocol, State)
     end;
 
-%% only allowed to send next_protocol message after change cipher spec
-%% & before finished message and it is not allowed during renegotiation
-abbreviated(#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(abbreviated, abbreviated, Record, State);
-
-abbreviated(timeout, State) ->
-    { next_state, abbreviated, State, hibernate };
+hello(Msg, State) ->
+    ssl_connection:hello(Msg, State, ?MODULE).
 
 abbreviated(Msg, State) ->
-    handle_unexpected_message(Msg, abbreviated, State).
-
-%%--------------------------------------------------------------------
--spec certify(#hello_request{} | #certificate{} |  #server_key_exchange{} |
-	      #certificate_request{} | #server_hello_done{} | #client_key_exchange{} | term(),
-	      #state{}) -> gen_fsm_state_return().   
-%%--------------------------------------------------------------------
-certify(#hello_request{}, State0) ->
-    {Record, State} = next_record(State0),
-    next_state(certify, hello, Record, State);
-
-certify(#certificate{asn1_certificates = []}, 
-	#state{role = server, negotiated_version = Version,
-	       ssl_options = #ssl_options{verify = verify_peer,
-					  fail_if_no_peer_cert = true}} = 
-	State) ->
-    Alert =  ?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE),
-    handle_own_alert(Alert, Version, certify, State);
-
-certify(#certificate{asn1_certificates = []}, 
-	#state{role = server,
-	       ssl_options = #ssl_options{verify = verify_peer,
-					  fail_if_no_peer_cert = false}} = 
-	State0) ->
-    {Record, State} = next_record(State0#state{client_certificate_requested = false}),
-    next_state(certify, certify, Record, State);
-
-certify(#certificate{} = Cert, 
-        #state{negotiated_version = Version,
-	       role = Role,
-	       cert_db = CertDbHandle,
-	       cert_db_ref = CertDbRef,
-	       ssl_options = Opts} = State) ->
-    case tls_handshake:certify(Cert, CertDbHandle, CertDbRef, Opts#ssl_options.depth,
-			       Opts#ssl_options.verify,
-			       Opts#ssl_options.verify_fun, Role) of
-        {PeerCert, PublicKeyInfo} ->
-	    handle_peer_cert(PeerCert, PublicKeyInfo, 
-			     State#state{client_certificate_requested = false});
-	#alert{} = Alert ->
-            handle_own_alert(Alert, Version, certify, State)
-    end;
-
-certify(#server_key_exchange{} = KeyExchangeMsg, 
-        #state{role = client, negotiated_version = Version,
-	       key_algorithm = Alg} = State0) 
-  when Alg == dhe_dss; Alg == dhe_rsa;
-       Alg == ecdhe_rsa; Alg == ecdhe_ecdsa;
-       Alg == dh_anon; Alg == ecdh_anon;
-       Alg == psk; Alg == dhe_psk; Alg == rsa_psk;
-       Alg == srp_dss; Alg == srp_rsa; Alg == srp_anon ->
-    case handle_server_key(KeyExchangeMsg, State0) of
-	#state{} = State1 ->
-	    {Record, State} = next_record(State1),
-	    next_state(certify, certify, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify(#server_key_exchange{} = Msg, 
-        #state{role = client, key_algorithm = rsa} = State) -> 
-    handle_unexpected_message(Msg, certify_server_keyexchange, State);
-
-certify(#certificate_request{}, State0) ->
-    {Record, State} = next_record(State0#state{client_certificate_requested = true}),
-    next_state(certify, certify, Record, State);
-
-%% PSK and RSA_PSK might bypass the Server-Key-Exchange
-certify(#server_hello_done{},
-	#state{session = #session{master_secret = undefined},
-	       negotiated_version = Version,
-	       psk_identity = PSKIdentity,
-	       premaster_secret = undefined,
-	       role = client,
-	       key_algorithm = Alg} = State0)
-  when Alg == psk ->
-    case server_psk_master_secret(PSKIdentity, State0) of
-	#state{} = State ->
-	    client_certify_and_key_exchange(State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify(#server_hello_done{},
-	#state{session = #session{master_secret = undefined},
-	       ssl_options = SslOpts,
-	       negotiated_version = Version,
-	       psk_identity = PSKIdentity,
-	       premaster_secret = undefined,
-	       role = client,
-	       key_algorithm = Alg} = State0)
-  when Alg == rsa_psk ->
-    case handle_psk_identity(PSKIdentity, SslOpts#ssl_options.user_lookup_fun) of
-	{ok, PSK} when is_binary(PSK) ->
-	    PremasterSecret = make_premaster_secret(Version, rsa),
-	    Len = byte_size(PSK),
-	    RealPMS = <<?UINT16(48), PremasterSecret/binary, ?UINT16(Len), PSK/binary>>,
-	    State1 = State0#state{premaster_secret = PremasterSecret},
-	    State = master_from_premaster_secret(RealPMS, State1),
-	    client_certify_and_key_exchange(State);
-	#alert{} = Alert ->
-	    Alert;
-	_ ->
-	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
-    end;
-
-%% Master secret was determined with help of server-key exchange msg
-certify(#server_hello_done{},
-	#state{session = #session{master_secret = MasterSecret} = Session,
-	       connection_states = ConnectionStates0,
-	       negotiated_version = Version,
-	       premaster_secret = undefined,
-	       role = client} = State0) ->
-    case tls_handshake:master_secret(Version, Session, 
-				     ConnectionStates0, client) of
-	{MasterSecret, ConnectionStates} ->
-	    State = State0#state{connection_states = ConnectionStates},
-	    client_certify_and_key_exchange(State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-%% Master secret is calculated from premaster_secret
-certify(#server_hello_done{},
-	#state{session = Session0,
-	       connection_states = ConnectionStates0,
-	       negotiated_version = Version,
-	       premaster_secret = PremasterSecret,
-	       role = client} = State0) ->    
-    case tls_handshake:master_secret(Version, PremasterSecret, 
-				     ConnectionStates0, client) of
-	{MasterSecret, ConnectionStates} ->
-	    Session = Session0#session{master_secret = MasterSecret},
-	    State = State0#state{connection_states = ConnectionStates,
-				 session = Session},
-	    client_certify_and_key_exchange(State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify(#client_key_exchange{} = Msg,
-	#state{role = server,
-	       client_certificate_requested = true,
-	       ssl_options = #ssl_options{fail_if_no_peer_cert = true}} = State) ->
-    %% We expect a certificate here
-    handle_unexpected_message(Msg, certify_client_key_exchange, State);
-
-certify(#client_key_exchange{exchange_keys = Keys},
-	State = #state{key_algorithm = KeyAlg, negotiated_version = Version}) ->
-    try
-	certify_client_key_exchange(tls_handshake:decode_client_key(Keys, KeyAlg, Version), State)
-    catch 
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State)
-    end;
-
-
-certify(timeout, State) ->
-    { next_state, certify, State, hibernate };
+    ssl_connection:abbreviated(Msg, State, ?MODULE).
 
 certify(Msg, State) ->
-    handle_unexpected_message(Msg, certify, State).
-
-certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS},
-			    #state{negotiated_version = Version,
-				   connection_states = ConnectionStates0,
-				   session = Session0,
-				   private_key = Key} = State0) ->
-    PremasterSecret = tls_handshake:decrypt_premaster_secret(EncPMS, Key),
-    case tls_handshake:master_secret(Version, PremasterSecret,
-				     ConnectionStates0, server) of
-	{MasterSecret, ConnectionStates} ->
-	    Session = Session0#session{master_secret = MasterSecret},
-	    State1 = State0#state{connection_states = ConnectionStates,
-				  session = Session},
-	    {Record, State} = next_record(State1),
-	    next_state(certify, cipher, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey},
-			    #state{negotiated_version = Version,
-				   diffie_hellman_params = #'DHParameter'{} = Params,
-				   diffie_hellman_keys = {_, ServerDhPrivateKey}} = State0) ->
-    case dh_master_secret(Params, ClientPublicDhKey, ServerDhPrivateKey, State0) of
-	#state{} = State1 ->
-	    {Record, State} = next_record(State1),
-	    next_state(certify, cipher, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify_client_key_exchange(#client_ec_diffie_hellman_public{dh_public = ClientPublicEcDhPoint},
-			    #state{negotiated_version = Version,
-				   diffie_hellman_keys = ECDHKey} = State0) ->
-    case ec_dh_master_secret(ECDHKey, #'ECPoint'{point = ClientPublicEcDhPoint}, State0) of
-	#state{} = State1 ->
-	    {Record, State} = next_record(State1),
-	    next_state(certify, cipher, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify_client_key_exchange(#client_psk_identity{identity = ClientPSKIdentity},
-			    #state{negotiated_version = Version} = State0) ->
-    case server_psk_master_secret(ClientPSKIdentity, State0) of
-	#state{} = State1 ->
-	    {Record, State} = next_record(State1),
-	    next_state(certify, cipher, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify_client_key_exchange(#client_dhe_psk_identity{
-			       identity =  ClientPSKIdentity,
-			       dh_public = ClientPublicDhKey},
-			    #state{negotiated_version = Version,
-				   diffie_hellman_params = #'DHParameter'{prime = P,
-									  base = G},
-				   diffie_hellman_keys = {_, ServerDhPrivateKey}} = State0) ->
-    case dhe_psk_master_secret(ClientPSKIdentity, P, G, ClientPublicDhKey, ServerDhPrivateKey, State0) of
-	#state{} = State1 ->
-	    {Record, State} = next_record(State1),
-	    next_state(certify, cipher, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify_client_key_exchange(#client_rsa_psk_identity{
-			       identity = PskIdentity,
-			       exchange_keys =
-				   #encrypted_premaster_secret{premaster_secret= EncPMS}},
-			    #state{negotiated_version = Version,
-				   private_key = Key} = State0) ->
-    PremasterSecret = tls_handshake:decrypt_premaster_secret(EncPMS, Key),
-    case server_rsa_psk_master_secret(PskIdentity, PremasterSecret, State0) of
-	#state{} = State1 ->
-	    {Record, State} = next_record(State1),
-	    next_state(certify, cipher, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end;
-
-certify_client_key_exchange(#client_srp_public{srp_a = ClientPublicKey},
-			    #state{negotiated_version = Version,
-				   srp_params =
-				       #srp_user{prime = Prime,
-						 verifier = Verifier}
-				  } = State0) ->
-    case server_srp_master_secret(Verifier, Prime, ClientPublicKey, State0) of
-	#state{} = State1 ->
-	    {Record, State} = next_record(State1),
-	    next_state(certify, cipher, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, certify, State0)
-    end.
-
-%%--------------------------------------------------------------------
--spec cipher(#hello_request{} | #certificate_verify{} | #finished{} | term(),
-	     #state{}) -> gen_fsm_state_return().  
-%%--------------------------------------------------------------------
-cipher(#hello_request{}, State0) ->
-    {Record, State} = next_record(State0),
-    next_state(cipher, hello, Record, State);
-
-cipher(#certificate_verify{signature = Signature, hashsign_algorithm = CertHashSign},
-       #state{role = server, 
-	      public_key_info = PublicKeyInfo,
-	      negotiated_version = Version,
-	      session = #session{master_secret = MasterSecret},
-	      hashsign_algorithm = ConnectionHashSign,
-	      tls_handshake_history = Handshake
-	     } = State0) -> 
-    HashSign = case CertHashSign of
-		   {_, _} -> CertHashSign;
-		   _      -> ConnectionHashSign
-	       end,
-    case tls_handshake:certificate_verify(Signature, PublicKeyInfo,
-					  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)
-    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);
-
-cipher(#finished{verify_data = Data} = Finished, 
-       #state{negotiated_version = Version,
-	      host = Host,
-	      port = Port,
-	      role = Role,
-	      session = #session{master_secret = MasterSecret} 
-	      = Session0,
-		  connection_states = ConnectionStates0,
-	      tls_handshake_history = Handshake0} = State) ->
-    case tls_handshake:verify_connection(Version, Finished, 
-					 opposite_role(Role), 
-					 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)
-    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 };
+    ssl_connection:certify(Msg, State, ?MODULE).
 
 cipher(Msg, State) ->
-    handle_unexpected_message(Msg, cipher, State).
+     ssl_connection:cipher(Msg, State, ?MODULE).
 
-%%--------------------------------------------------------------------
--spec connection(#hello_request{} | #client_hello{} | term(),
-		 #state{}) -> gen_fsm_state_return().  
-%%--------------------------------------------------------------------
 connection(#hello_request{}, #state{host = Host, port = Port,
-				    socket = Socket,
 				    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_history = Handshake0} = State0) ->
+				    renegotiation = {Renegotiation, _}} = State0) ->
     Hello = tls_handshake:client_hello(Host, Port, ConnectionStates0, SslOpts,
 				       Cache, CacheCb, Renegotiation, Cert),
-  
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Hello, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    {Record, State} = next_record(State0#state{connection_states =  
-						   ConnectionStates,
-					       session = Session0#session{session_id = Hello#client_hello.session_id},
-					       tls_handshake_history = Handshake}),
+    State1 = send_handshake(Hello, State0),
+    {Record, State} =
+	next_record(
+	  State1#state{session = Session0#session{session_id
+						  = Hello#client_hello.session_id}}),
     next_state(connection, hello, Record, State);
+
 connection(#client_hello{} = Hello, #state{role = server, allow_renegotiate = true} = State) ->
     %% Mitigate Computational DoS attack
     %% http://www.educatedguesswork.org/2011/10/ssltls_and_computational_dos.html
@@ -849,21 +271,13 @@ connection(#client_hello{} = Hello, #state{role = server, allow_renegotiate = tr
     erlang:send_after(?WAIT_TO_ALLOW_RENEGOTIATION, self(), allow_renegotiate),
     hello(Hello, State#state{allow_renegotiate = false});
 
-connection(#client_hello{}, #state{role = server, allow_renegotiate = false,
-				   connection_states = ConnectionStates0,
-				   socket = Socket, transport_cb = Transport,
-				   negotiated_version = Version} = State0) ->
+connection(#client_hello{}, #state{role = server, allow_renegotiate = false} = State0) ->
     Alert = ?ALERT_REC(?WARNING, ?NO_RENEGOTIATION),
-    {BinMsg, ConnectionStates} =
-	encode_alert(Alert, Version, ConnectionStates0),
-    Transport:send(Socket, BinMsg),
-    next_state_connection(connection, State0#state{connection_states = ConnectionStates});
+    State = send_alert(Alert, State0),
+    next_state_connection(connection, State);
   
-connection(timeout, State) ->
-    {next_state, connection, State, hibernate};
-
 connection(Msg, State) ->
-    handle_unexpected_message(Msg, connection, State).
+     ssl_connection:connection(Msg, State, tls_connection).
 
 %%--------------------------------------------------------------------
 %% Description: Whenever a gen_fsm receives an event sent using
@@ -878,193 +292,8 @@ handle_event(_Event, StateName, State) ->
 %% gen_fsm:sync_send_all_state_event/2,3, this function is called to handle
 %% the event.
 %%--------------------------------------------------------------------
-handle_sync_event({application_data, Data}, From, connection, State) ->
-    %% We should look into having a worker process to do this to 
-    %% parallize send and receive decoding and not block the receiver
-    %% if sending is overloading the socket.
-    try
-	write_application_data(Data, From, State)
-    catch throw:Error ->
-	    {reply, Error, connection, State, get_timeout(State)}
-    end;
-handle_sync_event({application_data, Data}, From, StateName, 
-		  #state{send_queue = Queue} = State) ->
-    %% In renegotiation priorities handshake, send data when handshake is finished
-    {next_state, StateName,
-     State#state{send_queue = queue:in({From, Data}, Queue)},
-     get_timeout(State)};
-
-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
-%% controlling_process has been evalueated before receiving handshake
-%% messages from client. The server should put the socket in passive
-%% 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 an active socket. 
-handle_sync_event({start,_}, _, connection, State) ->
-    {reply, connected, connection, State, 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
-    %% so that the reuseaddr inet-option will work
-    %% as intended.
-    (catch terminate(user_close, StateName, State)),
-    {stop, normal, ok, State#state{terminated = true}};
-
-handle_sync_event({shutdown, How0}, _, StateName,
-		  #state{transport_cb = Transport,
-			 negotiated_version = Version,
-			 connection_states = ConnectionStates,
-			 socket = Socket} = State) ->
-    case How0 of
-	How when How == write; How == both ->	    
-	    Alert = ?ALERT_REC(?WARNING, ?CLOSE_NOTIFY),
-	    {BinMsg, _} =
-		encode_alert(Alert, Version, ConnectionStates),
-	    Transport:send(Socket, BinMsg);
-	_ ->
-	    ok
-    end,
-    
-    case Transport:shutdown(Socket, How0) of
-	ok ->
-	    {reply, ok, StateName, State, get_timeout(State)};
-	Error ->
-	    {stop, normal, Error, State}
-    end;
-    
-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, 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, 
-		  State =#state{user_application = {OldMon, _}}) ->
-    NewMon = erlang:monitor(process, User),
-    erlang:demonitor(OldMon, [flush]),
-    {reply, ok, StateName, State#state{user_application = {NewMon,User}},
-     get_timeout(State)};
-
-handle_sync_event({get_opts, OptTags}, _From, StateName,
-		  #state{socket = Socket,
-			 transport_cb = Transport,
-			 socket_options = SockOpts} = State) ->
-    OptsReply = get_socket_opts(Transport, Socket, OptTags, SockOpts, []),
-    {reply, OptsReply, 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, 
-			 socket = Socket,
-			 transport_cb = Transport,
-			 user_data_buffer = Buffer} = State0) ->
-    {Reply, Opts} = set_socket_opts(Transport, Socket, Opts0, Opts1, []),
-    State1 = State0#state{socket_options = Opts},
-    if 
-	Opts#socket_options.active =:= false ->
-	    {reply, Reply, StateName, State1, get_timeout(State1)};
-	Buffer =:= <<>>, Opts1#socket_options.active =:= false ->
-            %% Need data, set active once
-	    {Record, State2} = next_record_if_active(State1),
-	    case next_state(StateName, StateName, Record, State2) of
-		{next_state, StateName, State, Timeout} ->
-		    {reply, Reply, StateName, State, Timeout};
-		{stop, Reason, State} ->
-		    {stop, Reason, State}
-	    end;
-	Buffer =:= <<>> ->
-            %% Active once already set 
-	    {reply, Reply, StateName, State1, get_timeout(State1)};
-	true ->
-	    case read_application_data(<<>>, State1) of
-		Stop = {stop,_,_} ->
-		    Stop;
-		{Record, State2} ->
-		    case next_state(StateName, StateName, Record, State2) of
-			{next_state, StateName, State, Timeout} ->
-			    {reply, Reply, StateName, State, Timeout};
-			{stop, Reason, State} ->
-			    {stop, Reason, State}
-		    end
-	    end
-    end;
-
-handle_sync_event(renegotiate, From, connection, State) ->
-    renegotiate(State#state{renegotiation = {true, From}});
-
-handle_sync_event(renegotiate, _, StateName, State) ->
-    {reply, {error, already_renegotiating}, StateName, State, get_timeout(State)};
-
-handle_sync_event({prf, Secret, Label, Seed, WantedLength}, _, StateName,
-		  #state{connection_states = ConnectionStates,
-			 negotiated_version = Version} = State) ->
-    ConnectionState =
-	tls_record:current_connection_state(ConnectionStates, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{master_secret = MasterSecret,
-			 client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams,
-    Reply = try
-		SecretToUse = case Secret of
-				  _ when is_binary(Secret) -> Secret;
-				  master_secret -> MasterSecret
-			      end,
-		SeedToUse = lists:reverse(
-			      lists:foldl(fun(X, Acc) when is_binary(X) -> [X|Acc];
-					     (client_random, Acc) -> [ClientRandom|Acc];
-					     (server_random, Acc) -> [ServerRandom|Acc]
-					  end, [], Seed)),
-		tls_handshake:prf(Version, SecretToUse, Label, SeedToUse, WantedLength)
-	    catch
-		exit:_ -> {error, badarg};
-		error:Reason -> {error, Reason}
-	    end,
-    {reply, Reply, StateName, State, get_timeout(State)};
-
-handle_sync_event(info, _, StateName, 
-		  #state{negotiated_version = Version,
-			 session = #session{cipher_suite = Suite}} = State) ->
-    
-    AtomVersion = tls_record:protocol_version(Version),
-    {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:suite_definition(Suite)}],
-     StateName, State, get_timeout(State)};
-
-handle_sync_event(peer_certificate, _, StateName, 
-		  #state{session = #session{peer_certificate = Cert}} 
-		  = State) ->
-    {reply, {ok, Cert}, StateName, State, get_timeout(State)}.
+handle_sync_event(Event, From, StateName, State) ->
+    ssl_connection:handle_sync_event(Event, From, StateName, State).
 
 %%--------------------------------------------------------------------
 %% Description: This function is called by a gen_fsm when it receives any
@@ -1072,7 +301,7 @@ handle_sync_event(peer_certificate, _, StateName,
 %% (or a system message).
 %%--------------------------------------------------------------------
 
-%% raw data from TCP, unpack records
+%% raw data from socket, unpack records
 handle_info({Protocol, _, Data}, StateName,
             #state{data_tag = Protocol} = State0) ->
     case next_tls_record(Data, State0) of
@@ -1103,45 +332,8 @@ handle_info({CloseTag, Socket}, StateName,
     handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
     {stop, {shutdown, transport_closed}, State};
 
-handle_info({ErrorTag, Socket, econnaborted}, StateName,  
-	    #state{socket = Socket, transport_cb = Transport,
-		   start_or_recv_from = StartFrom, role = Role,
-		   error_tag = ErrorTag} = State)  when StateName =/= connection ->
-    alert_user(Transport, Socket, StartFrom, ?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), Role),
-    {stop, normal, State};
-
-handle_info({ErrorTag, Socket, Reason}, StateName, #state{socket = Socket,
-							  error_tag = ErrorTag} = State)  ->
-    Report = io_lib:format("SSL: Socket error: ~p ~n", [Reason]),
-    error_logger:info_report(Report),
-    handle_normal_shutdown(?ALERT_REC(?FATAL, ?CLOSE_NOTIFY), StateName, State),
-    {stop, normal, State};
-
-handle_info({'DOWN', MonitorRef, _, _, _}, _, 
-	    State = #state{user_application={MonitorRef,_Pid}}) ->
-    {stop, normal, State};   
-
-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),
-    {next_state, StateName, State, get_timeout(State)}.
+    ssl_connection:handle_info(Msg, StateName, State).
 
 %%--------------------------------------------------------------------
 %% Description:This function is called by a gen_fsm when it is about
@@ -1149,44 +341,9 @@ handle_info(Msg, StateName, State) ->
 %% necessary cleaning up. When it returns, the gen_fsm terminates with
 %% Reason. The return value is ignored.
 %%--------------------------------------------------------------------
-terminate(_, _, #state{terminated = true}) ->
-    %% Happens when user closes the connection using ssl:close/1
-    %% we want to guarantee that Transport:close has been called
-    %% when ssl:close/1 returns.
-    ok;
+terminate(Reason, StateName, State) ->
+    ssl_connection:terminate(Reason, StateName, State).
 
-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} = 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);
-
-terminate(_Reason, _StateName, #state{transport_cb = Transport,
-				      socket = Socket, send_queue = SendQueue,
-				      renegotiation = Renegotiate} = State) ->
-    handle_trusted_certs_db(State),
-    notify_senders(SendQueue),
-    notify_renegotiater(Renegotiate),
-    Transport:close(Socket).
 
 %%--------------------------------------------------------------------
 %% code_change(OldVsn, StateName, State, Extra) -> {ok, StateName, NewState}
@@ -1198,1084 +355,206 @@ code_change(_OldVsn, StateName, State, _Extra) ->
 %%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = false},_} = Opts,
-	  User, {CbModule, _,_, _} = CbInfo, 
-	  Timeout) -> 
-    try 
-	{ok, Pid} = ssl_connection_sup:start_child([Role, Host, Port, Socket, 
-						    Opts, User, CbInfo]), 
-	{ok, SslSocket} = socket_control(Socket, Pid, CbModule),
-	ok = handshake(SslSocket, Timeout),
-	{ok, SslSocket} 
-    catch
-	error:{badmatch, {error, _} = Error} ->
-	    Error
-    end;
-
-start_fsm(Role, Host, Port, Socket, {#ssl_options{erl_dist = true},_} = Opts,
-	  User, {CbModule, _,_, _} = CbInfo, 
-	  Timeout) -> 
-    try 
-	{ok, Pid} = ssl_connection_sup:start_child_dist([Role, Host, Port, Socket, 
-							 Opts, User, CbInfo]), 
-	{ok, SslSocket} = socket_control(Socket, Pid, CbModule),
-	ok = handshake(SslSocket, Timeout),
-	{ok, SslSocket} 
-    catch
-	error:{badmatch, {error, _} = Error} ->
-	    Error
-    end.
-
-ssl_init(SslOpts, Role) ->
-    
-    init_manager_name(SslOpts#ssl_options.erl_dist),
-
-    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, OwnCert} = init_certificates(SslOpts, Role),
-    PrivateKey =
-	init_private_key(PemCacheHandle, SslOpts#ssl_options.key, SslOpts#ssl_options.keyfile,
-			 SslOpts#ssl_options.password, Role),
-    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);
-init_manager_name(true) ->
-    put(ssl_manager, ssl_manager_dist).
-
-init_certificates(#ssl_options{cacerts = CaCerts,
-			       cacertfile = CACertFile,
-			       certfile = CertFile,
-			       cert = Cert}, Role) ->
-    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle} =
-	try 
-	    Certs = case CaCerts of
-			undefined ->
-			    CACertFile;
-			_ ->
-			    {der, CaCerts}
-		    end,
-	    {ok, _, _, _, _, _} = ssl_manager:connection_init(Certs, Role)
-	catch
-	    _:Reason ->
-		file_error(CACertFile, {cacertfile, Reason})
-	end,
-    init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, CertFile, Role).
-
-init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, <<>>, _) ->
-    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, undefined};
-
-init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, CertFile, client) ->
-    try 
-	%% Ignoring potential proxy-certificates see: 
-	%% http://dev.globus.org/wiki/Security/ProxyFileFormat
-	[OwnCert|_] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle),
-	{ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, OwnCert}
-    catch _Error:_Reason  ->
-	    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, undefined}
-    end;
-
-init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, CertFile, server) ->
-    try
-	[OwnCert|_] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle),
-	{ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, OwnCert}
-    catch
-	_:Reason ->
-	    file_error(CertFile, {certfile, Reason})	    
-    end;
-init_certificates(Cert, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, _, _) ->
-    {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, Cert}.
-
-init_private_key(_, undefined, <<>>, _Password, _Client) ->
-    undefined;
-init_private_key(DbHandle, undefined, KeyFile, Password, _) ->
-    try
-	{ok, List} = ssl_manager:cache_pem_file(KeyFile, DbHandle),
-	[PemEntry] = [PemEntry || PemEntry = {PKey, _ , _} <- List,
-				  PKey =:= 'RSAPrivateKey' orelse
-				      PKey =:= 'DSAPrivateKey' orelse
-				      PKey =:= 'ECPrivateKey' orelse
-				      PKey =:= 'PrivateKeyInfo'
-		     ],
-	private_key(public_key:pem_entry_decode(PemEntry, Password))
-    catch 
-	_:Reason ->
-	    file_error(KeyFile, {keyfile, Reason}) 
-    end;
-
-%% First two clauses are for backwards compatibility
-init_private_key(_,{rsa, PrivateKey}, _, _,_) ->
-    init_private_key('RSAPrivateKey', PrivateKey);
-init_private_key(_,{dsa, PrivateKey},_,_,_) ->
-    init_private_key('DSAPrivateKey', PrivateKey);
-init_private_key(_,{ec, PrivateKey},_,_,_) ->
-    init_private_key('ECPrivateKey', PrivateKey);
-init_private_key(_,{Asn1Type, PrivateKey},_,_,_) ->
-    private_key(init_private_key(Asn1Type, PrivateKey)).
-
-init_private_key(Asn1Type, PrivateKey) ->
-    public_key:der_decode(Asn1Type, PrivateKey).
-
-private_key(#'PrivateKeyInfo'{privateKeyAlgorithm =
-				 #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?'rsaEncryption'},
-			     privateKey = Key}) ->
-    public_key:der_decode('RSAPrivateKey', iolist_to_binary(Key));
-
-private_key(#'PrivateKeyInfo'{privateKeyAlgorithm =
-				 #'PrivateKeyInfo_privateKeyAlgorithm'{algorithm = ?'id-dsa'},
-			     privateKey = Key}) ->
-    public_key:der_decode('DSAPrivateKey', iolist_to_binary(Key));
-
-private_key(Key) ->
-    Key.
-
--spec(file_error(_,_) -> no_return()).
-file_error(File, Throw) ->
-    case Throw of
-	{Opt,{badmatch, {error, {badmatch, Error}}}} ->
-	    throw({options, {Opt, binary_to_list(File), Error}});
-	_ ->
-	    throw(Throw)
-    end.
-
-init_diffie_hellman(_,Params, _,_) when is_binary(Params)->
-    public_key:der_decode('DHParameter', Params);
-init_diffie_hellman(_,_,_, client) ->
-    undefined;
-init_diffie_hellman(_,_,undefined, _) ->
-    ?DEFAULT_DIFFIE_HELLMAN_PARAMS;
-init_diffie_hellman(DbHandle,_, DHParamFile, server) ->
-    try
-	{ok, List} = ssl_manager:cache_pem_file(DHParamFile,DbHandle),
-	case [Entry || Entry = {'DHParameter', _ , _} <- List] of
-	    [Entry] ->
-		public_key:pem_entry_decode(Entry);
-	    [] ->
-		?DEFAULT_DIFFIE_HELLMAN_PARAMS
-	end
-    catch
-	_:Reason ->
-	    file_error(DHParamFile, {dhfile, Reason}) 
-    end.
-
-sync_send_all_state_event(FsmPid, Event) ->
-    try gen_fsm:sync_send_all_state_event(FsmPid, Event, infinity)
-    catch
- 	exit:{noproc, _} ->
- 	    {error, closed};
-	exit:{normal, _} ->
-	    {error, closed};
-	exit:{{shutdown, _},_} ->
-	    {error, closed}
-    end.
-
-%% We do currently not support cipher suites that use fixed DH.
-%% If we want to implement that we should add a code
-%% here to extract DH parameters form cert.
-handle_peer_cert(PeerCert, PublicKeyInfo, 
-		 #state{session = Session} = State0) ->
-    State1 = State0#state{session = 
-			 Session#session{peer_certificate = PeerCert},
-			 public_key_info = PublicKeyInfo},
-    State2 = case PublicKeyInfo of
-		 {?'id-ecPublicKey',  #'ECPoint'{point = _ECPoint} = PublicKey, PublicKeyParams} ->
-		     ECDHKey = public_key:generate_key(PublicKeyParams),
-		     State3 = State1#state{diffie_hellman_keys = ECDHKey},
-		     ec_dh_master_secret(ECDHKey, PublicKey, State3);
-
-		 _ -> State1
-	     end,
-    {Record, State} = next_record(State2),
-    next_state(certify, certify, Record, State).
-
-certify_client(#state{client_certificate_requested = true, role = client,
-                      connection_states = ConnectionStates0,
-                      transport_cb = Transport,
-                      negotiated_version = Version,
-		      cert_db = CertDbHandle,
-                      cert_db_ref = CertDbRef,
-		      session = #session{own_certificate = OwnCert},
-                      socket = Socket,
-                      tls_handshake_history = Handshake0} = State) ->
-    Certificate = tls_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, client),
-    {BinCert, ConnectionStates, Handshake} =
-        encode_handshake(Certificate, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinCert),
-            State#state{connection_states = ConnectionStates,
-                        tls_handshake_history = Handshake};
-certify_client(#state{client_certificate_requested = false} = State) ->
-    State.
-
-verify_client_cert(#state{client_certificate_requested = true, role = client,
-			  connection_states = ConnectionStates0,
-			  transport_cb = Transport,
-			  negotiated_version = Version,
-			  socket = Socket,
-			  private_key = PrivateKey,
-			  session = #session{master_secret = MasterSecret,
-					     own_certificate = OwnCert},
-			  hashsign_algorithm = HashSign,
-			  tls_handshake_history = Handshake0} = State) ->
-
-    %%TODO: for TLS 1.2 we can choose a different/stronger HashSign combination for this.
-    case tls_handshake:client_certificate_verify(OwnCert, MasterSecret, 
-						 Version, HashSign, PrivateKey, Handshake0) of
-        #certificate_verify{} = Verified ->
-            {BinVerified, ConnectionStates, Handshake} =
-                encode_handshake(Verified, Version,
-                                 ConnectionStates0, Handshake0),
-            Transport:send(Socket, BinVerified),
-            State#state{connection_states = ConnectionStates,
-                        tls_handshake_history = Handshake};
-	ignore ->
-	    State;
-	#alert{} = Alert ->
-	    throw(Alert)	    
-    end;
-verify_client_cert(#state{client_certificate_requested = false} = State) ->
-    State.
-
-do_server_hello(Type, NextProtocolsToSend,
-		EcPointFormats, EllipticCurves,
-		#state{negotiated_version = Version,
-		       session = #session{session_id = SessId},
-		       connection_states = ConnectionStates0,
-		       renegotiation = {Renegotiation, _}}
-		= State0) when is_atom(Type) ->
-
-    ServerHello = 
-	tls_handshake:server_hello(SessId, Version, 
-                                   ConnectionStates0, Renegotiation,
-				   NextProtocolsToSend, EcPointFormats, EllipticCurves),
-    State = server_hello(ServerHello,
-			 State0#state{expecting_next_protocol_negotiation =
-					  NextProtocolsToSend =/= undefined}),
-    case Type of	
-	new ->
-	    new_server_hello(ServerHello, State);
-	resumed ->
-	    resumed_server_hello(State)
-    end.
+encode_handshake(Handshake, Version, ConnectionStates0, Hist0) ->
+    Frag = tls_handshake:encode_handshake(Handshake, Version),
+    Hist = ssl_handshake:update_handshake_history(Hist0, Frag),
+    {Encoded, ConnectionStates} =
+        ssl_record:encode_handshake(Frag, Version, ConnectionStates0),
+    {Encoded, ConnectionStates, Hist}.
 
-new_server_hello(#server_hello{cipher_suite = CipherSuite,
-			      compression_method = Compression,
-			      session_id = SessionId}, 
-		#state{session = Session0,
-		       negotiated_version = Version} = State0) ->
-    try server_certify_and_key_exchange(State0) of 
-        #state{} = State1 ->
-            State2 = server_hello_done(State1),
-	    Session = 
-		Session0#session{session_id = SessionId,
-				 cipher_suite = CipherSuite,
-				 compression_method = Compression},
-	    {Record, State} = next_record(State2#state{session = Session}),
-	    next_state(hello, certify, Record, State)
-    catch        
-        #alert{} = Alert ->  
-	    handle_own_alert(Alert, Version, hello, State0)
-    end.
 
-resumed_server_hello(#state{session = Session,
-			    connection_states = ConnectionStates0,
-			    negotiated_version = Version} = State0) ->
-
-    case tls_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.
+encode_change_cipher(#change_cipher_spec{}, Version, ConnectionStates) ->
+    ssl_record:encode_change_cipher_spec(Version, ConnectionStates).
 
-handle_new_session(NewId, CipherSuite, Compression, #state{session = Session0} = State0) ->
-    Session = Session0#session{session_id = NewId,
-			       cipher_suite = CipherSuite,
-			       compression_method = Compression}, 
-    {Record, State} = next_record(State0#state{session = Session}),
-    next_state(hello, certify, Record, State).
-
-handle_resumed_session(SessId, #state{connection_states = ConnectionStates0,
-				      negotiated_version = Version,
-				      host = Host, port = Port,
-				      session_cache = Cache,
-				      session_cache_cb = CacheCb} = State0) ->
-    Session = CacheCb:lookup(Cache, {{Host, Port}, SessId}),
-    case tls_handshake:master_secret(Version, Session, 
-				     ConnectionStates0, client) of
-	{_, ConnectionStates} ->
-	    {Record, State} = 
-		next_record(State0#state{
-			      connection_states = ConnectionStates,
-			      session = Session}),
-	    next_state(hello, abbreviated, Record, State);
-	#alert{} = Alert ->
-	    handle_own_alert(Alert, Version, hello, State0)
-    end.
 
 
-client_certify_and_key_exchange(#state{negotiated_version = Version} = 
-				State0) ->
-    try do_client_certify_and_key_exchange(State0) of 
-        State1 = #state{} ->
-	    {ConnectionStates, Handshake} = finalize_handshake(State1, certify),
-            State2 = State1#state{connection_states = ConnectionStates,
-				 %% Reinitialize 
-				 client_certificate_requested = false,
-				 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)
-    end.
+decode_alerts(Bin) ->
+    decode_alerts(Bin, []).
 
-do_client_certify_and_key_exchange(State0) ->
-    State1 = certify_client(State0), 
-    State2 = key_exchange(State1),
-    verify_client_cert(State2).
+decode_alerts(<<?BYTE(Level), ?BYTE(Description), Rest/binary>>, Acc) ->
+    A = ?ALERT_REC(Level, Description),
+    decode_alerts(Rest, [A | Acc]);
+decode_alerts(<<>>, Acc) ->
+    lists:reverse(Acc, []).
 
-server_certify_and_key_exchange(State0) ->
-    State1 = certify_server(State0), 
-    State2 = key_exchange(State1),
-    request_client_cert(State2).
-    
-server_hello(ServerHello, #state{transport_cb = Transport,
-                                 socket = Socket,
-                                 negotiated_version = Version,
-                                 connection_states = ConnectionStates0,
-                                 tls_handshake_history = Handshake0} = State) ->
-    CipherSuite = ServerHello#server_hello.cipher_suite,
-    {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_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 = ConnectionStates0,
-                         tls_handshake_history = Handshake0} = State) ->
+initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions}, User,
+	      {CbModule, DataTag, CloseTag, ErrorTag}) ->
+    ConnectionStates = ssl_record:init_connection_states(Role),
     
-    HelloDone = tls_handshake:server_hello_done(),
+    SessionCacheCb = case application:get_env(ssl, session_cb) of
+			 {ok, Cb} when is_atom(Cb) ->
+			    Cb;
+			 _  ->
+			     ssl_session_cache
+		     end,
     
-    {BinHelloDone, ConnectionStates, Handshake} =
-        encode_handshake(HelloDone, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinHelloDone),
-    State#state{connection_states = ConnectionStates,
-		tls_handshake_history = Handshake}.
-
-certify_server(#state{key_algorithm = Algo} = State)
-  when Algo == dh_anon; Algo == ecdh_anon; Algo == psk; Algo == dhe_psk; Algo == srp_anon  ->
-    State;
-
-certify_server(#state{transport_cb = Transport,
-		      socket = Socket,
-		      negotiated_version = Version,
-		      connection_states = ConnectionStates0,
-		      tls_handshake_history = Handshake0,
-		      cert_db = CertDbHandle,
-		      cert_db_ref = CertDbRef,
-		      session = #session{own_certificate = OwnCert}} = State) ->
-    case tls_handshake:certificate(OwnCert, CertDbHandle, CertDbRef, server) of
-	CertMsg = #certificate{} ->
-	    {BinCertMsg, ConnectionStates, Handshake} =
-		encode_handshake(CertMsg, Version, ConnectionStates0, Handshake0),
-	    Transport:send(Socket, BinCertMsg),
-	    State#state{connection_states = ConnectionStates,
-			tls_handshake_history = Handshake
-		       };
-	Alert = #alert{} ->
-	    throw(Alert)
-    end.
-
-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'{} = Params,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version,
-		    tls_handshake_history = Handshake0,
-		    socket = Socket,
-		    transport_cb = Transport
-		   } = State) 
-  when Algo == dhe_dss;
-       Algo == dhe_rsa;
-       Algo == dh_anon ->
-    DHKeys = public_key:generate_key(Params),
-    ConnectionState = 
-	tls_record:pending_connection_state(ConnectionStates0, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams, 
-    Msg = tls_handshake:key_exchange(server, Version, {dh, DHKeys, Params,
-					       HashSignAlgo, ClientRandom,
-					       ServerRandom,
-					       PrivateKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-		diffie_hellman_keys = DHKeys,
-                tls_handshake_history = Handshake};
-
-key_exchange(#state{role = server, private_key = Key, key_algorithm = Algo} = State)
-  when Algo == ecdh_ecdsa; Algo == ecdh_rsa ->
-    State#state{diffie_hellman_keys = Key};
-key_exchange(#state{role = server, key_algorithm = Algo,
-		    hashsign_algorithm = HashSignAlgo,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version,
-		    tls_handshake_history = Handshake0,
-		    socket = Socket,
-		    transport_cb = Transport
-		   } = State)
-  when Algo == ecdhe_ecdsa; Algo == ecdhe_rsa;
-       Algo == ecdh_anon ->
-
-    ECDHKeys = public_key:generate_key(select_curve(State)),
-    ConnectionState =
-	tls_record:pending_connection_state(ConnectionStates0, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams,
-    Msg =  tls_handshake:key_exchange(server, Version, {ecdh, ECDHKeys,
-							HashSignAlgo, ClientRandom,
-							ServerRandom,
-							PrivateKey}),
-    {BinMsg, ConnectionStates, Handshake1} =
-	encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-		diffie_hellman_keys = ECDHKeys,
-		tls_handshake_history = Handshake1};
-
-key_exchange(#state{role = server, key_algorithm = psk,
-		    ssl_options = #ssl_options{psk_identity = undefined}} = State) ->
-    State;
-key_exchange(#state{role = server, key_algorithm = psk,
-		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
-		    hashsign_algorithm = HashSignAlgo,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version,
-		    tls_handshake_history = Handshake0,
-		    socket = Socket,
-		    transport_cb = Transport
-		   } = State) ->
-    ConnectionState =
-	tls_record:pending_connection_state(ConnectionStates0, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams,
-    Msg = tls_handshake:key_exchange(server, Version, {psk, PskIdentityHint,
-						       HashSignAlgo, ClientRandom,
-						       ServerRandom,
-						       PrivateKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-                tls_handshake_history = Handshake};
-
-key_exchange(#state{role = server, key_algorithm = dhe_psk,
-		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
-		    hashsign_algorithm = HashSignAlgo,
-		    diffie_hellman_params = #'DHParameter'{} = Params,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version,
-		    tls_handshake_history = Handshake0,
-		    socket = Socket,
-		    transport_cb = Transport
-		   } = State) ->
-    DHKeys = public_key:generate_key(Params),
-    ConnectionState =
-	tls_record:pending_connection_state(ConnectionStates0, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams,
-    Msg =  tls_handshake:key_exchange(server, Version, {dhe_psk, PskIdentityHint, DHKeys, Params,
-					       HashSignAlgo, ClientRandom,
-					       ServerRandom,
-					       PrivateKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-		diffie_hellman_keys = DHKeys,
-                tls_handshake_history = Handshake};
-
-key_exchange(#state{role = server, key_algorithm = rsa_psk,
-		    ssl_options = #ssl_options{psk_identity = undefined}} = State) ->
-    State;
-key_exchange(#state{role = server, key_algorithm = rsa_psk,
-		    ssl_options = #ssl_options{psk_identity = PskIdentityHint},
-		    hashsign_algorithm = HashSignAlgo,
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version,
-		    tls_handshake_history = Handshake0,
-		    socket = Socket,
-		    transport_cb = Transport
-		   } = State) ->
-    ConnectionState =
-	tls_record:pending_connection_state(ConnectionStates0, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams,
-    Msg =  tls_handshake:key_exchange(server, Version, {psk, PskIdentityHint,
-					       HashSignAlgo, ClientRandom,
-					       ServerRandom,
-					       PrivateKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-                tls_handshake_history = Handshake};
-
-key_exchange(#state{role = server, key_algorithm = Algo,
-		    ssl_options = #ssl_options{user_lookup_fun = LookupFun},
-		    hashsign_algorithm = HashSignAlgo,
-		    session = #session{srp_username = Username},
-		    private_key = PrivateKey,
-		    connection_states = ConnectionStates0,
-		    negotiated_version = Version,
-		    tls_handshake_history = Handshake0,
-		    socket = Socket,
-		    transport_cb = Transport
-		   } = State)
-  when Algo == srp_dss;
-       Algo == srp_rsa;
-       Algo == srp_anon ->
-    SrpParams = handle_srp_identity(Username, LookupFun),
-    Keys = case generate_srp_server_keys(SrpParams, 0) of
-	       Alert = #alert{} ->
-		   throw(Alert);
-	       Keys0 = {_,_} ->
-		   Keys0
-	   end,
-    ConnectionState =
-	tls_record:pending_connection_state(ConnectionStates0, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams,
-    Msg =  tls_handshake:key_exchange(server, Version, {srp, Keys, SrpParams,
-					       HashSignAlgo, ClientRandom,
-					       ServerRandom,
-					       PrivateKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-		srp_params = SrpParams,
-		srp_keys = Keys,
-                tls_handshake_history = Handshake};
-
-key_exchange(#state{role = client, 
-		    connection_states = ConnectionStates0,
-		    key_algorithm = rsa,
-		    public_key_info = PublicKeyInfo,
-		    negotiated_version = Version,
-		    premaster_secret = PremasterSecret,
-		    socket = Socket, transport_cb = Transport,
-		    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 = 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_history = Handshake0} = State)
-  when Algorithm == dhe_dss;
-       Algorithm == dhe_rsa;
-       Algorithm == dh_anon ->
-    Msg =  tls_handshake:key_exchange(client, Version, {dh, DhPubKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    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 = Keys,
-		    socket = Socket, transport_cb = Transport,
-		    tls_handshake_history = Handshake0} = State)
-  when Algorithm == ecdhe_ecdsa; Algorithm == ecdhe_rsa;
-       Algorithm == ecdh_ecdsa; Algorithm == ecdh_rsa;
-       Algorithm == ecdh_anon ->
-    Msg = tls_handshake:key_exchange(client, Version, {ecdh, Keys}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-                tls_handshake_history = Handshake};
+    Monitor = erlang:monitor(process, User),
 
-key_exchange(#state{role = client,
-		    ssl_options = SslOpts,
-		    connection_states = ConnectionStates0,
-		    key_algorithm = psk,
-		    negotiated_version = Version,
-		    socket = Socket, transport_cb = Transport,
-		    tls_handshake_history = Handshake0} = State) ->
-    Msg =  tls_handshake:key_exchange(client, Version, {psk, SslOpts#ssl_options.psk_identity}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-                tls_handshake_history = Handshake};
+    #state{socket_options = SocketOptions,
+	   %% We do not want to save the password in the state so that
+	   %% could be written in the clear into error logs.
+	   ssl_options = SSLOptions#ssl_options{password = undefined},	   
+	   session = #session{is_resumable = new},
+	   transport_cb = CbModule,
+	   data_tag = DataTag,
+	   close_tag = CloseTag,
+	   error_tag = ErrorTag,
+	   role = Role,
+	   host = Host,
+	   port = Port,
+	   socket = Socket,
+	   connection_states = ConnectionStates,
+	   protocol_buffers = #protocol_buffers{},
+	   user_application = {Monitor, User},
+	   user_data_buffer = <<>>,
+	   session_cache_cb = SessionCacheCb,
+	   renegotiation = {false, first},
+	   start_or_recv_from = undefined,
+	   send_queue = queue:new(),
+	   protocol_cb = ?MODULE
+	  }.
 
-key_exchange(#state{role = client,
-		    ssl_options = SslOpts,
-		    connection_states = ConnectionStates0,
-		    key_algorithm = dhe_psk,
-		    negotiated_version = Version,
-		    diffie_hellman_keys = {DhPubKey, _},
-		    socket = Socket, transport_cb = Transport,
-		    tls_handshake_history = Handshake0} = State) ->
-    Msg =  tls_handshake:key_exchange(client, Version, {dhe_psk, SslOpts#ssl_options.psk_identity, DhPubKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-                tls_handshake_history = Handshake};
+next_state(Current,_, #alert{} = Alert, #state{negotiated_version = Version} = State) ->
+    handle_own_alert(Alert, Version, Current, State);
 
-key_exchange(#state{role = client,
-		    ssl_options = SslOpts,
-		    connection_states = ConnectionStates0,
-		    key_algorithm = rsa_psk,
-		    public_key_info = PublicKeyInfo,
-		    negotiated_version = Version,
-		    premaster_secret = PremasterSecret,
-		    socket = Socket, transport_cb = Transport,
-		    tls_handshake_history = Handshake0} = State) ->
-    Msg = rsa_psk_key_exchange(Version, SslOpts#ssl_options.psk_identity, PremasterSecret, PublicKeyInfo),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-                tls_handshake_history = Handshake};
+next_state(_,Next, no_record, State) ->
+    {next_state, Next, State, get_timeout(State)};
 
-key_exchange(#state{role = client,
-		    connection_states = ConnectionStates0,
-		    key_algorithm = Algorithm,
-		    negotiated_version = Version,
-		    srp_keys = {ClientPubKey, _},
-		    socket = Socket, transport_cb = Transport,
-		    tls_handshake_history = Handshake0} = State)
-  when Algorithm == srp_dss;
-       Algorithm == srp_rsa;
-       Algorithm == srp_anon ->
-    Msg =  tls_handshake:key_exchange(client, Version, {srp, ClientPubKey}),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{connection_states = ConnectionStates,
-                tls_handshake_history = Handshake}.
-
-rsa_key_exchange(Version, PremasterSecret, PublicKeyInfo = {Algorithm, _, _})
-  when Algorithm == ?rsaEncryption;
-       Algorithm == ?md2WithRSAEncryption;
-       Algorithm == ?md5WithRSAEncryption;
-       Algorithm == ?sha1WithRSAEncryption;
-       Algorithm == ?sha224WithRSAEncryption;
-       Algorithm == ?sha256WithRSAEncryption;
-       Algorithm == ?sha384WithRSAEncryption;
-       Algorithm == ?sha512WithRSAEncryption
-       ->
-    tls_handshake:key_exchange(client, Version,
-			       {premaster_secret, PremasterSecret,
-				PublicKeyInfo});
-rsa_key_exchange(_, _, _) ->
-    throw (?ALERT_REC(?FATAL,?HANDSHAKE_FAILURE)).
-
-rsa_psk_key_exchange(Version, PskIdentity, PremasterSecret, PublicKeyInfo = {Algorithm, _, _})
-  when Algorithm == ?rsaEncryption;
-       Algorithm == ?md2WithRSAEncryption;
-       Algorithm == ?md5WithRSAEncryption;
-       Algorithm == ?sha1WithRSAEncryption;
-       Algorithm == ?sha224WithRSAEncryption;
-       Algorithm == ?sha256WithRSAEncryption;
-       Algorithm == ?sha384WithRSAEncryption;
-       Algorithm == ?sha512WithRSAEncryption
-       ->
-    tls_handshake:key_exchange(client, Version,
-			       {psk_premaster_secret, PskIdentity, PremasterSecret,
-				PublicKeyInfo});
-rsa_psk_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_history = Handshake0,
-			   negotiated_version = Version,
-			   socket = Socket,
-			   transport_cb = Transport} = State) ->
-    Msg = tls_handshake:certificate_request(ConnectionStates0, CertDbHandle, CertDbRef),
-    {BinMsg, ConnectionStates, Handshake} =
-        encode_handshake(Msg, Version, ConnectionStates0, Handshake0),
-    Transport:send(Socket, BinMsg),
-    State#state{client_certificate_requested = true,
-		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),
-
-    ConnectionStates =
-        tls_record:activate_pending_connection_state(ConnectionStates0,
-                                                     write),
-
-    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 = tls_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}.
+next_state(_,Next, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, State) ->
+    Alerts = decode_alerts(EncAlerts),
+    handle_alerts(Alerts,  {next_state, Next, State, get_timeout(State)});
 
-cipher_protocol(#state{connection_states = ConnectionStates0,
-                       socket = Socket,
-                       negotiated_version = Version,
-                       transport_cb = Transport}) ->
-    {BinChangeCipher, ConnectionStates} =
-        encode_change_cipher(#change_cipher_spec{}, 
-			     Version, ConnectionStates0),
-    Transport:send(Socket, BinChangeCipher),
-    ConnectionStates.
-   
-finished(#state{role = Role, socket = Socket, negotiated_version = Version,
-                transport_cb = Transport,
-		session = Session,
-                connection_states = ConnectionStates0,
-                tls_handshake_history = Handshake0}, StateName) ->
-    MasterSecret = Session#session.master_secret,
-    Finished = tls_handshake:finished(Version, Role,
-				       get_current_connection_state_prf(ConnectionStates0, write),
-				       MasterSecret, Handshake0),
-    ConnectionStates1 = save_verify_data(Role, Finished, ConnectionStates0, StateName),
-    {BinFinished, ConnectionStates, Handshake} =
-        encode_handshake(Finished, Version, ConnectionStates1, Handshake0),
-    Transport:send(Socket, BinFinished),
-    {ConnectionStates, Handshake}.
-
-save_verify_data(client, #finished{verify_data = Data}, ConnectionStates, certify) ->
-    tls_record:set_client_verify_data(current_write, Data, ConnectionStates);
-save_verify_data(server, #finished{verify_data = Data}, ConnectionStates, cipher) ->
-    tls_record:set_server_verify_data(current_both, Data, ConnectionStates);
-save_verify_data(client, #finished{verify_data = Data}, ConnectionStates, abbreviated) ->
-    tls_record:set_client_verify_data(current_both, Data, ConnectionStates);
-save_verify_data(server, #finished{verify_data = Data}, ConnectionStates, abbreviated) ->
-    tls_record:set_server_verify_data(current_write, Data, ConnectionStates).
-
-handle_server_key(#server_key_exchange{exchange_keys = Keys},
-		  #state{key_algorithm = KeyAlg,
-			 negotiated_version = Version} = State) ->
-    Params = tls_handshake:decode_server_key(Keys, KeyAlg, Version),
-    HashSign = connection_hashsign(Params#server_key_params.hashsign, State),
-    case HashSign of
-	{_, SignAlgo} when SignAlgo == anon; SignAlgo == ecdh_anon ->
-	    server_master_secret(Params#server_key_params.params, State);
-	_ ->
-	    verify_server_key(Params, HashSign, State)
-    end.
+next_state(Current, Next, #ssl_tls{type = ?HANDSHAKE, fragment = Data},
+	   State0 = #state{protocol_buffers =
+			       #protocol_buffers{tls_handshake_buffer = Buf0} = Buffers,
+			   negotiated_version = Version}) ->
+    Handle = 
+   	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_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}) ->
+		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_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} = tls_handshake:get_tls_handshake(Version,Data,Buf0),
+	State = State0#state{protocol_buffers =
+				 Buffers#protocol_buffers{tls_packets = Packets,
+							  tls_handshake_buffer = Buf}},
+	handle_tls_handshake(Handle, Next, State)
+    catch throw:#alert{} = Alert ->
+	    handle_own_alert(Alert, Version, Current, State0)
+    end;
 
-verify_server_key(#server_key_params{params = Params,
-				     params_bin = EncParams,
-				     signature = Signature},
-		  HashSign = {HashAlgo, _},
-		  #state{negotiated_version = Version,
-			 public_key_info = PubKeyInfo,
-			 connection_states = ConnectionStates} = State) ->
-    ConnectionState =
-	tls_record:pending_connection_state(ConnectionStates, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams, 
-    Hash = tls_handshake:server_key_exchange_hash(HashAlgo,
-						  <<ClientRandom/binary,
-						    ServerRandom/binary,
-						    EncParams/binary>>),
-    case tls_handshake:verify_signature(Version, Hash, HashSign, Signature, PubKeyInfo) of
-	true ->
-	    server_master_secret(Params, State);
-	false ->
-	    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
-    end.
+next_state(_, StateName, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, State0) ->
+    case read_application_data(Data, State0) of
+	Stop = {stop,_,_} ->
+   	    Stop;
+	{Record, State} ->
+   	    next_state(StateName, StateName, Record, State)
+    end;
+next_state(Current, Next, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = <<1>>} = 
+ 	   _ChangeCipher, 
+ 	   #state{connection_states = ConnectionStates0} = State0) ->
+    ConnectionStates1 =
+	ssl_record:activate_pending_connection_state(ConnectionStates0, read),
+    {Record, State} = next_record(State0#state{connection_states = ConnectionStates1}),
+    next_state(Current, Next, Record, State);
+next_state(Current, Next, #ssl_tls{type = _Unknown}, State0) ->
+    %% Ignore unknown type 
+    {Record, State} = next_record(State0),
+    next_state(Current, Next, Record, State).
 
-server_master_secret(#server_dh_params{dh_p = P, dh_g = G, dh_y = ServerPublicDhKey},
-		     State) ->
-    dh_master_secret(P, G, ServerPublicDhKey, undefined, State);
-
-server_master_secret(#server_ecdh_params{curve = ECCurve, public = ECServerPubKey},
-		     State) ->
-    ECDHKeys = public_key:generate_key(ECCurve),
-    ec_dh_master_secret(ECDHKeys, #'ECPoint'{point = ECServerPubKey}, State#state{diffie_hellman_keys = ECDHKeys});
-
-server_master_secret(#server_psk_params{
-			hint = IdentityHint},
-		     State) ->
-    %% store for later use
-    State#state{psk_identity = IdentityHint};
-
-server_master_secret(#server_dhe_psk_params{
-			hint = IdentityHint,
-			dh_params = #server_dh_params{dh_p = P, dh_g = G, dh_y = ServerPublicDhKey}},
-		     State) ->
-    dhe_psk_master_secret(IdentityHint, P, G, ServerPublicDhKey, undefined, State);
-
-server_master_secret(#server_srp_params{srp_n = N, srp_g = G, srp_s = S, srp_b = B},
-		     State) ->
-    client_srp_master_secret(G, N, S, B, undefined, State).
-
-master_from_premaster_secret(PremasterSecret,
-			     #state{session = Session,
-				    negotiated_version = Version, role = Role,
-				    connection_states = ConnectionStates0} = State) ->
-    case tls_handshake:master_secret(Version, PremasterSecret,
-				     ConnectionStates0, Role) of
-	{MasterSecret, ConnectionStates} ->
-	    State#state{
-	      session =
-		  Session#session{master_secret = MasterSecret},
-	      connection_states = ConnectionStates};
+next_tls_record(Data, #state{protocol_buffers = #protocol_buffers{tls_record_buffer = Buf0,
+						tls_cipher_texts = CT0} = Buffers} = State0) ->
+    case tls_record:get_tls_records(Data, Buf0) of
+	{Records, Buf1} ->
+	    CT1 = CT0 ++ Records,
+	    next_record(State0#state{protocol_buffers =
+					 Buffers#protocol_buffers{tls_record_buffer = Buf1,
+								  tls_cipher_texts = CT1}});
 	#alert{} = Alert ->
 	    Alert
     end.
 
-dh_master_secret(#'DHParameter'{} = Params, OtherPublicDhKey, MyPrivateKey, State) ->
-    PremasterSecret =
-	public_key:compute_key(OtherPublicDhKey, MyPrivateKey, Params),
-    master_from_premaster_secret(PremasterSecret, State).
-
-dh_master_secret(Prime, Base, PublicDhKey, undefined, State) ->
-    Keys = {_, PrivateDhKey} = crypto:generate_key(dh, [Prime, Base]),
-    dh_master_secret(Prime, Base, PublicDhKey, PrivateDhKey, State#state{diffie_hellman_keys = Keys});
-
-dh_master_secret(Prime, Base, PublicDhKey, PrivateDhKey, State) ->
-    PremasterSecret =
-	crypto:compute_key(dh, PublicDhKey, PrivateDhKey, [Prime, Base]),
-    master_from_premaster_secret(PremasterSecret, State).
-
-ec_dh_master_secret(ECDHKeys, ECPoint, State) ->
-    PremasterSecret =
-	public_key:compute_key(ECPoint, ECDHKeys),
-    master_from_premaster_secret(PremasterSecret, State).
-
-handle_psk_identity(_PSKIdentity, LookupFun)
-  when LookupFun == undefined ->
-    error;
-handle_psk_identity(PSKIdentity, {Fun, UserState}) ->
-    Fun(psk, PSKIdentity, UserState).
-
-server_psk_master_secret(ClientPSKIdentity,
-			 #state{ssl_options = SslOpts} = State) ->
-    case handle_psk_identity(ClientPSKIdentity, SslOpts#ssl_options.user_lookup_fun) of
-	{ok, PSK} when is_binary(PSK) ->
-	    Len = byte_size(PSK),
-	    PremasterSecret = <<?UINT16(Len), 0:(Len*8), ?UINT16(Len), PSK/binary>>,
-	    master_from_premaster_secret(PremasterSecret, State);
-	#alert{} = Alert ->
-	    Alert;
-	_ ->
-	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
-    end.
-
-dhe_psk_master_secret(PSKIdentity, Prime, Base, PublicDhKey, undefined, State) ->
-    Keys = {_, PrivateDhKey} =
-	crypto:generate_key(dh, [Prime, Base]),
-    dhe_psk_master_secret(PSKIdentity, Prime, Base, PublicDhKey, PrivateDhKey,
-			  State#state{diffie_hellman_keys = Keys});
-
-dhe_psk_master_secret(PSKIdentity, Prime, Base, PublicDhKey, PrivateDhKey,
-			     #state{ssl_options = SslOpts} = State) ->
-    case handle_psk_identity(PSKIdentity, SslOpts#ssl_options.user_lookup_fun) of
-	{ok, PSK} when is_binary(PSK) ->
-	    DHSecret =
-		crypto:compute_key(dh, PublicDhKey, PrivateDhKey,
-				   [Prime, Base]),
-	    DHLen = erlang:byte_size(DHSecret),
-	    Len = erlang:byte_size(PSK),
-	    PremasterSecret = <<?UINT16(DHLen), DHSecret/binary, ?UINT16(Len), PSK/binary>>,
-	    master_from_premaster_secret(PremasterSecret, State);
-	#alert{} = Alert ->
-	    Alert;
-	_ ->
-	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
-    end.
-
-server_rsa_psk_master_secret(PskIdentity, PremasterSecret,
-			     #state{ssl_options = SslOpts} = State) ->
-    case handle_psk_identity(PskIdentity, SslOpts#ssl_options.user_lookup_fun) of
-	{ok, PSK} when is_binary(PSK) ->
-	    Len = byte_size(PSK),
-	    RealPMS = <<?UINT16(48), PremasterSecret/binary, ?UINT16(Len), PSK/binary>>,
-	    master_from_premaster_secret(RealPMS, State);
-	#alert{} = Alert ->
-	    Alert;
-	_ ->
-	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
-    end.
-
-generate_srp_server_keys(_SrpParams, 10) ->
-    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
-generate_srp_server_keys(SrpParams =
-			     #srp_user{generator = Generator, prime = Prime,
-				       verifier = Verifier}, N) ->
-    case crypto:generate_key(srp, {host, [Verifier, Generator, Prime, '6a']}) of
-	error ->
-	    generate_srp_server_keys(SrpParams, N+1);
-	Keys ->
-	    Keys
-    end.
-
-generate_srp_client_keys(_Generator, _Prime, 10) ->
-    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
-generate_srp_client_keys(Generator, Prime, N) ->
-
-    case crypto:generate_key(srp, {user, [Generator, Prime, '6a']}) of
-	error ->
-	    generate_srp_client_keys(Generator, Prime, N+1);
-	Keys ->
-	    Keys
-    end.
-
-handle_srp_identity(Username, {Fun, UserState}) ->
-    case Fun(srp, Username, UserState) of
-	{ok, {SRPParams, Salt, DerivedKey}}
-	  when is_atom(SRPParams), is_binary(Salt), is_binary(DerivedKey) ->
-	    {Generator, Prime} = ssl_srp_primes:get_srp_params(SRPParams),
-	    Verifier = crypto:mod_pow(Generator, DerivedKey, Prime),
-	    #srp_user{generator = Generator, prime = Prime,
-		      salt = Salt, verifier = Verifier};
+next_record(#state{protocol_buffers = #protocol_buffers{tls_packets = [], tls_cipher_texts = []},
+		   socket = Socket,
+		   transport_cb = Transport} = State) ->
+    ssl_socket:setopts(Transport, Socket, [{active,once}]),
+    {no_record, State};
+next_record(#state{protocol_buffers =
+		       #protocol_buffers{tls_packets = [], tls_cipher_texts = [CT | Rest]}
+		   = Buffers,
+		   connection_states = ConnStates0} = State) ->
+    case tls_record:decode_cipher_text(CT, ConnStates0) of
+	{Plain, ConnStates} ->		      
+	    {Plain, State#state{protocol_buffers =
+				    Buffers#protocol_buffers{tls_cipher_texts = Rest},
+				connection_states = ConnStates}};
 	#alert{} = Alert ->
-	    throw(Alert);
-	_ ->
-	    throw(?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER))
-    end.
-
-server_srp_master_secret(Verifier, Prime, ClientPub, State = #state{srp_keys = ServerKeys}) ->
-    case crypto:compute_key(srp, ClientPub, ServerKeys, {host, [Verifier, Prime, '6a']}) of
-	error ->
-	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
-	PremasterSecret ->
-	    master_from_premaster_secret(PremasterSecret, State)
-    end.
-
-client_srp_master_secret(_Generator, _Prime, _Salt, _ServerPub, #alert{} = Alert, _State) ->
-    Alert;
-client_srp_master_secret(Generator, Prime, Salt, ServerPub, undefined, State) ->
-    Keys = generate_srp_client_keys(Generator, Prime, 0),
-    client_srp_master_secret(Generator, Prime, Salt, ServerPub, Keys, State#state{srp_keys = Keys});
-
-client_srp_master_secret(Generator, Prime, Salt, ServerPub, ClientKeys,
-			 #state{ssl_options = SslOpts} = State) ->
-    case ssl_srp_primes:check_srp_params(Generator, Prime) of
-	ok ->
-	    {Username, Password} = SslOpts#ssl_options.srp_identity,
-	    DerivedKey = crypto:hash(sha, [Salt, crypto:hash(sha, [Username, <<$:>>, Password])]),
-	    case crypto:compute_key(srp, ServerPub, ClientKeys, {user, [DerivedKey, Prime, Generator, '6a']}) of
-		error ->
-		    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER);
-		PremasterSecret ->
-		    master_from_premaster_secret(PremasterSecret, State)
-	    end;
-	_ ->
-	    ?ALERT_REC(?FATAL, ?ILLEGAL_PARAMETER)
-    end.
-
-cipher_role(client, Data, Session, #state{connection_states = ConnectionStates0} = State) -> 
-    ConnectionStates = tls_record:set_server_verify_data(current_both, Data, ConnectionStates0),
-    next_state_connection(cipher, ack_connection(State#state{session = Session,
-							     connection_states = ConnectionStates}));
-     
-cipher_role(server, Data, Session,  #state{connection_states = ConnectionStates0} = State) -> 
-    ConnectionStates1 = tls_record:set_client_verify_data(current_read, Data, ConnectionStates0),
-    {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_history =
-								 Handshake})).
-encode_alert(#alert{} = Alert, Version, ConnectionStates) ->
-    tls_record:encode_alert_record(Alert, Version, ConnectionStates).
-
-encode_change_cipher(#change_cipher_spec{}, Version, ConnectionStates) ->
-    tls_record:encode_change_cipher_spec(Version, ConnectionStates).
+	    {Alert, State}
+    end;
+next_record(State) ->
+    {no_record, State}.
 
-encode_handshake(HandshakeRec, Version, ConnectionStates0, Handshake0) ->
-    Frag = tls_handshake:encode_handshake(HandshakeRec, Version),
-    Handshake1 = tls_handshake:update_handshake_history(Handshake0, Frag),
-    {E, ConnectionStates1} =
-        tls_record:encode_handshake(Frag, Version, ConnectionStates0),
-    {E, ConnectionStates1, Handshake1}.
+next_record_if_active(State = 
+		      #state{socket_options = 
+			     #socket_options{active = false}}) ->    
+    {no_record ,State};
 
-encode_packet(Data, #socket_options{packet=Packet}) ->
-    case Packet of
-	1 -> encode_size_packet(Data, 8,  (1 bsl 8) - 1);
-	2 -> encode_size_packet(Data, 16, (1 bsl 16) - 1);
-	4 -> encode_size_packet(Data, 32, (1 bsl 32) - 1);
-	_ -> Data
-    end.
+next_record_if_active(State) ->
+    next_record(State).
 
-encode_size_packet(Bin, Size, Max) ->
-    Len = erlang:byte_size(Bin),
-    case Len > Max of
-	true  -> throw({error, {badarg, {packet_to_large, Len, Max}}});
-	false -> <<Len:Size, Bin/binary>>
+next_state_connection(StateName, #state{send_queue = Queue0,
+					negotiated_version = Version,
+					socket = Socket,
+					transport_cb = Transport,
+					connection_states = ConnectionStates0
+				       } = State) ->     
+    %% Send queued up data that was queued while renegotiating
+    case queue:out(Queue0) of
+	{{value, {From, Data}}, Queue} ->
+	    {Msgs, ConnectionStates} = 
+		ssl_record:encode_data(Data, Version, ConnectionStates0),
+	    Result = Transport:send(Socket, Msgs),
+	    gen_fsm:reply(From, Result),
+	    next_state_connection(StateName,
+				  State#state{connection_states = ConnectionStates,
+						      send_queue = Queue});		
+	{empty, Queue0} ->
+	    next_state_is_connection(StateName, State)
     end.
 
-decode_alerts(Bin) ->
-    decode_alerts(Bin, []).
+%% 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{start_or_recv_from = RecvFrom,
+			     socket_options =
+			     #socket_options{active = false}}) when RecvFrom =/= undefined ->
+    passive_receive(State#state{premaster_secret = undefined,
+				public_key_info = undefined,
+				tls_handshake_history = ssl_handshake:init_handshake_history()}, connection);
 
-decode_alerts(<<?BYTE(Level), ?BYTE(Description), Rest/binary>>, Acc) ->
-    A = ?ALERT_REC(Level, Description),
-    decode_alerts(Rest, [A | Acc]);
-decode_alerts(<<>>, Acc) ->
-    lists:reverse(Acc, []).
+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_history = ssl_handshake:init_handshake_history()}).
 
 passive_receive(State0 = #state{user_data_buffer = Buffer}, StateName) -> 
     case Buffer of
@@ -2331,38 +610,10 @@ read_application_data(Data, #state{user_application = {_Mon, Pid},
 	    {stop, normal, State0}
     end.
 
-write_application_data(Data0, From, #state{socket = Socket,
-					   negotiated_version = Version,
-					   transport_cb = Transport,
-					   connection_states = ConnectionStates0,
-					   send_queue = SendQueue,
-					   socket_options = SockOpts,
-					   ssl_options = #ssl_options{renegotiate_at = RenegotiateAt}} = State) ->
-    Data = encode_packet(Data0, SockOpts),
-    
-    case time_to_renegotiate(Data, ConnectionStates0, RenegotiateAt) of
-	true ->
-	    renegotiate(State#state{send_queue = queue:in_r({From, Data}, SendQueue),
-				    renegotiation = {true, internal}});
-	false ->
-	    {Msgs, ConnectionStates} = tls_record:encode_data(Data, Version, ConnectionStates0),
-	    Result = Transport:send(Socket, Msgs),
-	    {reply, Result,
-	     connection, State#state{connection_states = ConnectionStates}, get_timeout(State)}
-    end.
-
-time_to_renegotiate(_Data, #connection_states{current_write = 
-						    #connection_state{sequence_number = Num}}, RenegotiateAt) ->
-    
-    %% We could do test:
-    %% is_time_to_renegotiate((erlang:byte_size(_Data) div ?MAX_PLAIN_TEXT_LENGTH) + 1, RenegotiateAt),
-    %% but we chose to have a some what lower renegotiateAt and a much cheaper test 
-    is_time_to_renegotiate(Num, RenegotiateAt).
-
-is_time_to_renegotiate(N, M) when N < M->
-    false;
-is_time_to_renegotiate(_,_) ->
-    true.
+get_timeout(#state{ssl_options=#ssl_options{hibernate_after = undefined}}) ->
+    infinity;
+get_timeout(#state{ssl_options=#ssl_options{hibernate_after = HibernateAfter}}) ->
+    HibernateAfter.
 
 %% Picks ClientData 
 get_data(_, _, <<>>) ->
@@ -2435,7 +686,8 @@ format_reply(_, _,#socket_options{active = false, mode = Mode, packet = Packet,
     {ok, do_format_reply(Mode, Packet, Header, Data)};
 format_reply(Transport, Socket, #socket_options{active = _, mode = Mode, packet = Packet,
 						header = Header}, Data) ->
-    {ssl, ssl_socket:socket(self(), Transport, Socket), do_format_reply(Mode, Packet, Header, Data)}.
+    {ssl, ssl_socket:socket(self(), Transport, Socket, ?MODULE), 
+     do_format_reply(Mode, Packet, Header, Data)}.
 
 deliver_packet_error(Transport, Socket, SO= #socket_options{active = Active}, Data, Pid, From) ->
     send_or_reply(Active, Pid, From, format_packet_error(Transport, Socket, SO, Data)).
@@ -2443,7 +695,8 @@ deliver_packet_error(Transport, Socket, SO= #socket_options{active = Active}, Da
 format_packet_error(_, _,#socket_options{active = false, mode = Mode}, Data) ->
     {error, {invalid_packet, do_format_reply(Mode, raw, 0, Data)}};
 format_packet_error(Transport, Socket, #socket_options{active = _, mode = Mode}, Data) ->
-    {ssl_error, ssl_socket:socket(self(), Transport, Socket), {invalid_packet, do_format_reply(Mode, raw, 0, Data)}}.
+    {ssl_error, ssl_socket:socket(self(), Transport, Socket, ?MODULE), 
+     {invalid_packet, do_format_reply(Mode, raw, 0, Data)}}.
 
 do_format_reply(binary, _, N, Data) when N > 0 ->  % Header mode
     header(N, Data);
@@ -2458,7 +711,7 @@ do_format_reply(list, _,_, Data) ->
     binary_to_list(Data).
 
 header(0, <<>>) ->
-    [];
+    <<>>;
 header(_, <<>>) ->
     [];
 header(0, Binary) ->
@@ -2476,298 +729,99 @@ send_or_reply(false, no_pid, _, _) ->
 send_or_reply(_, Pid, _From, Data) ->
     send_user(Pid, Data).
 
-opposite_role(client) ->
-    server;
-opposite_role(server) ->
-    client.
-
 send_user(Pid, Msg) ->
     Pid ! Msg.
 
-handle_tls_handshake(Handle, StateName, #state{tls_packets = [Packet]} = State) ->
-    FsmReturn = {next_state, StateName, State#state{tls_packets = []}},
+handle_tls_handshake(Handle, StateName,
+		     #state{protocol_buffers =
+				#protocol_buffers{tls_packets = [Packet]} = Buffers} = State) ->
+    FsmReturn = {next_state, StateName, State#state{protocol_buffers =
+							Buffers#protocol_buffers{tls_packets = []}}},
     Handle(Packet, FsmReturn);
 
-handle_tls_handshake(Handle, StateName, #state{tls_packets = [Packet | Packets]} = State0) ->
-    FsmReturn = {next_state, StateName, State0#state{tls_packets = Packets}},
+handle_tls_handshake(Handle, StateName,
+		     #state{protocol_buffers =
+				#protocol_buffers{tls_packets = [Packet | Packets]} = Buffers} =
+			 State0) ->
+    FsmReturn = {next_state, StateName, State0#state{protocol_buffers =
+							 Buffers#protocol_buffers{tls_packets =
+										      Packets}}},
     case Handle(Packet, FsmReturn) of
 	{next_state, NextStateName, State, _Timeout} ->
 	    handle_tls_handshake(Handle, NextStateName, State);
 	{stop, _,_} = Stop ->
 	    Stop
     end.
-
-next_state(Current,_, #alert{} = Alert, #state{negotiated_version = Version} = State) ->
-    handle_own_alert(Alert, Version, Current, State);
-
-next_state(_,Next, no_record, State) ->
-    {next_state, Next, State, get_timeout(State)};
-
-next_state(_,Next, #ssl_tls{type = ?ALERT, fragment = EncAlerts}, State) ->
-    Alerts = decode_alerts(EncAlerts),
-    handle_alerts(Alerts,  {next_state, Next, State, get_timeout(State)});
-
-next_state(Current, Next, #ssl_tls{type = ?HANDSHAKE, fragment = Data},
-	   State0 = #state{tls_handshake_buffer = Buf0, negotiated_version = Version}) ->
-    Handle = 
-   	fun({#hello_request{} = Packet, _}, {next_state, connection = SName, State}) ->
-   		%% This message should not be included in handshake
-   		%% message hashes. Starts new handshake (renegotiation)
-		Hs0 = tls_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}) ->
-		Version = Packet#client_hello.client_version,
-		Hs0 = tls_handshake:init_handshake_history(),
-		Hs1 = tls_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_history=Hs0}}) ->
-		Hs1 = tls_handshake:update_handshake_history(Hs0, Raw),
-		?MODULE:SName(Packet, State#state{tls_handshake_history=Hs1});
-   	   (_, StopState) -> StopState
-   	end,
-    try
-	{Packets, Buf} = tls_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)
-    end;
-
-next_state(_, StateName, #ssl_tls{type = ?APPLICATION_DATA, fragment = Data}, State0) ->
-    case read_application_data(Data, State0) of
-	Stop = {stop,_,_} ->
-   	    Stop;
-	{Record, State} ->
-   	    next_state(StateName, StateName, Record, State)
-    end;
-next_state(Current, Next, #ssl_tls{type = ?CHANGE_CIPHER_SPEC, fragment = <<1>>} = 
- 	   _ChangeCipher, 
- 	   #state{connection_states = ConnectionStates0} = State0) ->
-    ConnectionStates1 =
- 	tls_record:activate_pending_connection_state(ConnectionStates0, read),
-    {Record, State} = next_record(State0#state{connection_states = ConnectionStates1}),
-    next_state(Current, Next, Record, State);
-next_state(Current, Next, #ssl_tls{type = _Unknown}, State0) ->
-    %% Ignore unknown type 
-    {Record, State} = next_record(State0),
-    next_state(Current, Next, Record, State).
-
-next_tls_record(Data, #state{tls_record_buffer = Buf0,
-		       tls_cipher_texts = CT0} = State0) ->
-    case tls_record:get_tls_records(Data, Buf0) of
-	{Records, Buf1} ->
-	    CT1 = CT0 ++ Records,
-	    next_record(State0#state{tls_record_buffer = Buf1,
-				     tls_cipher_texts = CT1});
-	#alert{} = Alert ->
-	    Alert
-    end.
-
-next_record(#state{tls_packets = [], tls_cipher_texts = [], socket = Socket,
-		   transport_cb = Transport} = State) ->
-    ssl_socket:setopts(Transport, Socket, [{active,once}]),
-    {no_record, State};
-next_record(#state{tls_packets = [], tls_cipher_texts = [CT | Rest],
-		   connection_states = ConnStates0} = State) ->
-    case tls_record:decode_cipher_text(CT, ConnStates0) of
-	{Plain, ConnStates} ->		      
-	    {Plain, State#state{tls_cipher_texts = Rest, connection_states = ConnStates}};
-	#alert{} = Alert ->
-	    {Alert, State}
-    end;
-next_record(State) ->
-    {no_record, State}.
-
-next_record_if_active(State = 
-		      #state{socket_options = 
-			     #socket_options{active = false}}) ->    
-    {no_record ,State};
-
-next_record_if_active(State) ->
-    next_record(State).
-
-next_state_connection(StateName, #state{send_queue = Queue0,
-					negotiated_version = Version,
-					socket = Socket,
-					transport_cb = Transport,
-					connection_states = ConnectionStates0
-				       } = State) ->     
-    %% Send queued up data that was queued while renegotiating
-    case queue:out(Queue0) of
-	{{value, {From, Data}}, Queue} ->
-	    {Msgs, ConnectionStates} = 
-		tls_record:encode_data(Data, Version, ConnectionStates0),
+write_application_data(Data0, From, 
+		       #state{socket = Socket,
+			      negotiated_version = Version,
+			      transport_cb = Transport,
+			      connection_states = ConnectionStates0,
+			      send_queue = SendQueue,
+			      socket_options = SockOpts,
+			      ssl_options = #ssl_options{renegotiate_at = RenegotiateAt}} = State) ->
+    Data = encode_packet(Data0, SockOpts),
+    
+    case time_to_renegotiate(Data, ConnectionStates0, RenegotiateAt) of
+	true ->
+	    renegotiate(State#state{send_queue = queue:in_r({From, Data}, SendQueue),
+				    renegotiation = {true, internal}});
+	false ->
+	    {Msgs, ConnectionStates} = ssl_record:encode_data(Data, Version, ConnectionStates0),
 	    Result = Transport:send(Socket, Msgs),
-	    gen_fsm:reply(From, Result),
-	    next_state_connection(StateName,
-				  State#state{connection_states = ConnectionStates,
-						      send_queue = Queue});		
-	{empty, Queue0} ->
-	    next_state_is_connection(StateName, State)
+	    {reply, Result,
+	     connection, State#state{connection_states = ConnectionStates}, get_timeout(State)}
     end.
 
-%% 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{start_or_recv_from = RecvFrom,
-			     socket_options =
-			     #socket_options{active = false}}) when RecvFrom =/= undefined ->
-    passive_receive(State#state{premaster_secret = undefined,
-				public_key_info = undefined,
-				tls_handshake_history = tls_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_history = tls_handshake:init_handshake_history()}).
-
-register_session(client, Host, Port, #session{is_resumable = new} = Session0) ->
-    Session = Session0#session{is_resumable = true},
-    ssl_manager:register_session(Host, Port, Session),
-    Session;
-register_session(server, _, Port, #session{is_resumable = new} = Session0) ->
-    Session = Session0#session{is_resumable = true},
-    ssl_manager:register_session(Port, Session),
-    Session;
-register_session(_, _, _, Session) ->
-    Session. %% Already registered
+encode_packet(Data, #socket_options{packet=Packet}) ->
+    case Packet of
+	1 -> encode_size_packet(Data, 8,  (1 bsl 8) - 1);
+	2 -> encode_size_packet(Data, 16, (1 bsl 16) - 1);
+	4 -> encode_size_packet(Data, 32, (1 bsl 32) - 1);
+	_ -> Data
+    end.
 
-invalidate_session(client, Host, Port, Session) ->
-    ssl_manager:invalidate_session(Host, Port, Session);
-invalidate_session(server, _, Port, Session) ->
-    ssl_manager:invalidate_session(Port, Session).
+encode_size_packet(Bin, Size, Max) ->
+    Len = erlang:byte_size(Bin),
+    case Len > Max of
+	true  -> throw({error, {badarg, {packet_to_large, Len, Max}}});
+	false -> <<Len:Size, Bin/binary>>
+    end.
 
-initial_state(Role, Host, Port, Socket, {SSLOptions, SocketOptions}, User,
-	      {CbModule, DataTag, CloseTag, ErrorTag}) ->
-    ConnectionStates = tls_record:init_connection_states(Role),
+time_to_renegotiate(_Data, 
+		    #connection_states{current_write = 
+					   #connection_state{sequence_number = Num}}, 
+		    RenegotiateAt) ->
     
-    SessionCacheCb = case application:get_env(ssl, session_cb) of
-			 {ok, Cb} when is_atom(Cb) ->
-			    Cb;
-			 _  ->
-			     ssl_session_cache
-		     end,
-    
-    Monitor = erlang:monitor(process, User),
-
-    #state{socket_options = SocketOptions,
-	   %% We do not want to save the password in the state so that
-	   %% could be written in the clear into error logs.
-	   ssl_options = SSLOptions#ssl_options{password = undefined},	   
-	   session = #session{is_resumable = new},
-	   transport_cb = CbModule,
-	   data_tag = DataTag,
-	   close_tag = CloseTag,
-	   error_tag = ErrorTag,
-	   role = Role,
-	   host = Host,
-	   port = Port,
-	   socket = Socket,
-	   connection_states = ConnectionStates,
-	   tls_handshake_buffer = <<>>,
-	   tls_record_buffer = <<>>,
-	   tls_cipher_texts = [],
-	   user_application = {Monitor, User},
-	   user_data_buffer = <<>>,
-	   log_alert = true,
-	   session_cache_cb = SessionCacheCb,
-	   renegotiation = {false, first},
-	   start_or_recv_from = undefined,
-	   send_queue = queue:new()
-	  }.
-
-get_socket_opts(_,_,[], _, Acc) ->
-    {ok, Acc};
-get_socket_opts(Transport, Socket, [mode | Tags], SockOpts, Acc) ->
-    get_socket_opts(Transport, Socket, Tags, SockOpts, 
-		    [{mode, SockOpts#socket_options.mode} | Acc]);
-get_socket_opts(Transport, Socket, [packet | Tags], SockOpts, Acc) ->
-    case SockOpts#socket_options.packet of
-	{Type, headers} ->
-	    get_socket_opts(Transport, Socket, Tags, SockOpts, [{packet, Type} | Acc]);
-	Type ->
-	    get_socket_opts(Transport, Socket, Tags, SockOpts, [{packet, Type} | Acc])
-    end;
-get_socket_opts(Transport, Socket, [header | Tags], SockOpts, Acc) ->
-    get_socket_opts(Transport, Socket, Tags, SockOpts, 
-		    [{header, SockOpts#socket_options.header} | Acc]);
-get_socket_opts(Transport, Socket, [active | Tags], SockOpts, Acc) ->
-    get_socket_opts(Transport, Socket, Tags, SockOpts, 
-		    [{active, SockOpts#socket_options.active} | Acc]);
-get_socket_opts(Transport, Socket, [Tag | Tags], SockOpts, Acc) ->
-    try ssl_socket:getopts(Transport, Socket, [Tag]) of
-	{ok, [Opt]} ->
-	    get_socket_opts(Transport, Socket, Tags, SockOpts, [Opt | Acc]);
-	{error, Error} ->
-	    {error, {options, {socket_options, Tag, Error}}}
-    catch
-	%% So that inet behavior does not crash our process
-	_:Error -> {error, {options, {socket_options, Tag, Error}}}
-    end;
-get_socket_opts(_, _,Opts, _,_) ->
-    {error, {options, {socket_options, Opts, function_clause}}}.
-
-set_socket_opts(_,_, [], SockOpts, []) ->
-    {ok, SockOpts};
-set_socket_opts(Transport, Socket, [], SockOpts, Other) ->
-    %% Set non emulated options 
-    try ssl_socket:setopts(Transport, Socket, Other) of
-	ok ->
-	    {ok, SockOpts};
-	{error, InetError} ->
-	    {{error, {options, {socket_options, Other, InetError}}}, SockOpts}
-    catch
-	_:Error ->
-	    %% So that inet behavior does not crash our process
-	    {{error, {options, {socket_options, Other, Error}}}, SockOpts}
-    end;
+    %% We could do test:
+    %% is_time_to_renegotiate((erlang:byte_size(_Data) div ?MAX_PLAIN_TEXT_LENGTH) + 1, RenegotiateAt),
+    %% but we chose to have a some what lower renegotiateAt and a much cheaper test 
+    is_time_to_renegotiate(Num, RenegotiateAt).
 
-set_socket_opts(Transport,Socket, [{mode, Mode}| Opts], SockOpts, Other) when Mode == list; Mode == binary ->
-    set_socket_opts(Transport, Socket, Opts, 
-		    SockOpts#socket_options{mode = Mode}, Other);
-set_socket_opts(_, _, [{mode, _} = Opt| _], SockOpts, _) ->
-    {{error, {options, {socket_options, Opt}}}, SockOpts};
-set_socket_opts(Transport,Socket, [{packet, Packet}| Opts], SockOpts, Other) when Packet == raw;
-									Packet == 0;
-									Packet == 1;
-									Packet == 2;
-									Packet == 4;
-									Packet == asn1;
-									Packet == cdr;
-									Packet == sunrm;
-									Packet == fcgi;
-									Packet == tpkt;
-									Packet == line;
-									Packet == http;
-									Packet == httph;
-									Packet == http_bin;
-									Packet == httph_bin ->
-    set_socket_opts(Transport, Socket, Opts, 
-		    SockOpts#socket_options{packet = Packet}, Other);
-set_socket_opts(_, _, [{packet, _} = Opt| _], SockOpts, _) ->
-    {{error, {options, {socket_options, Opt}}}, SockOpts};
-set_socket_opts(Transport, Socket, [{header, Header}| Opts], SockOpts, Other) when is_integer(Header) ->
-    set_socket_opts(Transport, Socket, Opts, 
-		    SockOpts#socket_options{header = Header}, Other);
-set_socket_opts(_, _, [{header, _} = Opt| _], SockOpts, _) ->
-    {{error,{options, {socket_options, Opt}}}, SockOpts};
-set_socket_opts(Transport, Socket, [{active, Active}| Opts], SockOpts, Other) when Active == once;
-										   Active == true;
-										   Active == false ->
-    set_socket_opts(Transport, Socket, Opts, 
-		    SockOpts#socket_options{active = Active}, Other);
-set_socket_opts(_, _, [{active, _} = Opt| _], SockOpts, _) ->
-    {{error, {options, {socket_options, Opt}} }, SockOpts};
-set_socket_opts(Transport, Socket, [Opt | Opts], SockOpts, Other) ->
-    set_socket_opts(Transport, Socket, Opts, SockOpts, [Opt | Other]).
+is_time_to_renegotiate(N, M) when N < M->
+    false;
+is_time_to_renegotiate(_,_) ->
+    true.
+renegotiate(#state{role = client} = State) ->
+    %% Handle same way as if server requested
+    %% the renegotiation
+    Hs0 = ssl_handshake:init_handshake_history(),
+    connection(#hello_request{}, State#state{tls_handshake_history = Hs0});
+renegotiate(#state{role = server,
+		   socket = Socket,
+		   transport_cb = Transport,
+		   negotiated_version = Version,
+		   connection_states = ConnectionStates0} = State0) ->
+    HelloRequest = ssl_handshake:hello_request(),
+    Frag = tls_handshake:encode_handshake(HelloRequest, Version),
+    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_history = Hs0}),
+    next_state(connection, hello, Record, State#state{allow_renegotiate = true}).
 
 handle_alerts([], Result) ->
     Result;
@@ -2779,11 +833,11 @@ handle_alerts([Alert | Alerts], {next_state, StateName, State, _Timeout}) ->
 
 handle_alert(#alert{level = ?FATAL} = Alert, StateName,
 	     #state{socket = Socket, transport_cb = Transport, 
-		    start_or_recv_from = From, host = Host,
+		    ssl_options = SslOpts, start_or_recv_from = From, host = Host,
 		    port = Port, session = Session, user_application = {_Mon, Pid},
-		    log_alert = Log, role = Role, socket_options = Opts} = State) ->
+		    role = Role, socket_options = Opts} = State) ->
     invalidate_session(Role, Host, Port, Session),
-    log_alert(Log, StateName, Alert),
+    log_alert(SslOpts#ssl_options.log_alert, StateName, Alert),
     alert_user(Transport, Socket, StateName, Opts, Pid, From, Alert, Role),
     {stop, normal, State};
 
@@ -2793,21 +847,21 @@ handle_alert(#alert{level = ?WARNING, description = ?CLOSE_NOTIFY} = Alert,
     {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),
+	     #state{ssl_options = SslOpts, renegotiation = {true, internal}} = State) ->
+    log_alert(SslOpts#ssl_options.log_alert, StateName, Alert),
     handle_normal_shutdown(Alert, StateName, State),
     {stop, {shutdown, peer_close}, State};
 
 handle_alert(#alert{level = ?WARNING, description = ?NO_RENEGOTIATION} = Alert, StateName, 
-	     #state{log_alert = Log, renegotiation = {true, From}} = State0) ->
-    log_alert(Log, StateName, Alert),
+	     #state{ssl_options = SslOpts, renegotiation = {true, From}} = State0) ->
+    log_alert(SslOpts#ssl_options.log_alert, StateName, Alert),
     gen_fsm:reply(From, {error, renegotiation_rejected}),
     {Record, State} = next_record(State0),
     next_state(StateName, connection, Record, State);
 
 handle_alert(#alert{level = ?WARNING, description = ?USER_CANCELED} = Alert, StateName, 
-	     #state{log_alert = Log} = State0) ->
-    log_alert(Log, StateName, Alert),
+	     #state{ssl_options = SslOpts} = State0) ->
+    log_alert(SslOpts#ssl_options.log_alert, StateName, Alert),
     {Record, State} = next_record(State0),
     next_state(StateName, StateName, Record, State).
 
@@ -2829,10 +883,12 @@ alert_user(Transport, Socket, Active, Pid, From, Alert, Role) ->
     case ssl_alert:reason_code(Alert, Role) of
 	closed ->
 	    send_or_reply(Active, Pid, From,
-			  {ssl_closed, ssl_socket:socket(self(), Transport, Socket)});
+			  {ssl_closed, ssl_socket:socket(self(), 
+							 Transport, Socket, ?MODULE)});
 	ReasonCode ->
 	    send_or_reply(Active, Pid, From,
-			  {ssl_error, ssl_socket:socket(self(), Transport, Socket), ReasonCode})
+			  {ssl_error, ssl_socket:socket(self(), 
+							Transport, Socket, ?MODULE), ReasonCode})
     end.
 
 log_alert(true, Info, Alert) ->
@@ -2845,17 +901,17 @@ handle_own_alert(Alert, Version, StateName,
 		 #state{transport_cb = Transport,
 			socket = Socket,
 			connection_states = ConnectionStates,
-			log_alert = Log} = State) ->
+			ssl_options = SslOpts} = State) ->
     try %% Try to tell the other side
 	{BinMsg, _} =
-	encode_alert(Alert, Version, ConnectionStates),
+	ssl_alert:encode(Alert, Version, ConnectionStates),
 	Transport:send(Socket, BinMsg),
 	workaround_transport_delivery_problems(Socket, Transport)
     catch _:_ ->  %% Can crash if we are in a uninitialized state
 	    ignore
     end,
     try %% Try to tell the local user
-	log_alert(Log, StateName, Alert),
+	log_alert(SslOpts#ssl_options.log_alert, StateName, Alert),
 	handle_normal_shutdown(Alert,StateName, State)
     catch _:_ ->
 	    ok
@@ -2879,73 +935,26 @@ handle_unexpected_message(Msg, Info, #state{negotiated_version = Version} = Stat
     Alert =  ?ALERT_REC(?FATAL,?UNEXPECTED_MESSAGE),
     handle_own_alert(Alert, Version, {Info, Msg}, State).
 
-make_premaster_secret({MajVer, MinVer}, rsa) ->
-    Rand = ssl:random_bytes(?NUM_OF_PREMASTERSECRET_BYTES-2),
-    <<?BYTE(MajVer), ?BYTE(MinVer), Rand/binary>>;
-make_premaster_secret(_, _) ->
-    undefined.
-
-ack_connection(#state{renegotiation = {true, Initiater}} = State) 
-  when Initiater == internal;
-       Initiater == peer ->
-    State#state{renegotiation = undefined};
-ack_connection(#state{renegotiation = {true, From}} = State) ->    
-    gen_fsm:reply(From, ok),
-    State#state{renegotiation = undefined};
-ack_connection(#state{renegotiation = {false, first}, 
-		      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 = tls_handshake:init_handshake_history(),
-    connection(#hello_request{}, State#state{tls_handshake_history = Hs0});
-renegotiate(#state{role = server,
-		   socket = Socket,
-		   transport_cb = Transport,
-		   negotiated_version = Version,
-		   connection_states = ConnectionStates0} = State0) ->
-    HelloRequest = tls_handshake:hello_request(),
-    Frag = tls_handshake:encode_handshake(HelloRequest, Version),
-    Hs0 = tls_handshake:init_handshake_history(),
-    {BinMsg, ConnectionStates} = 
-	tls_record:encode_handshake(Frag, Version, ConnectionStates0),
-    Transport:send(Socket, BinMsg),
-    {Record, State} = next_record(State0#state{connection_states = 
-					       ConnectionStates,
-					       tls_handshake_history = Hs0}),
-    next_state(connection, hello, Record, State#state{allow_renegotiate = true}).
 
-notify_senders(SendQueue) -> 
-    lists:foreach(fun({From, _}) ->
- 			  gen_fsm:reply(From, {error, closed})
- 		  end, queue:to_list(SendQueue)).
+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.
 
-notify_renegotiater({true, From}) when not is_atom(From)  ->
-    gen_fsm:reply(From, {error, closed});
-notify_renegotiater(_) ->
+cancel_timer(undefined) ->
+    ok;
+cancel_timer(Timer) ->
+    erlang:cancel_timer(Timer),
     ok.
 
-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.
+invalidate_session(client, Host, Port, Session) ->
+    ssl_manager:invalidate_session(Host, Port, Session);
+invalidate_session(server, _, Port, Session) ->
+    ssl_manager:invalidate_session(Port, Session).
 
 workaround_transport_delivery_problems(Socket, gen_tcp = Transport) ->
     %% Standard trick to try to make sure all
@@ -2961,124 +970,3 @@ workaround_transport_delivery_problems(Socket, gen_tcp = Transport) ->
     Transport:recv(Socket, 0, 30000);
 workaround_transport_delivery_problems(Socket, Transport) ->
     Transport:close(Socket).
-
-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_pkix_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_pkix_db:ref_count(Ref, RefDb, -1) of
-	0 ->
-	    ssl_manager:clean_cert_db(Ref, File);
-	_ ->
-	    ok
-    end.
-
-get_current_connection_state_prf(CStates, Direction) ->
-	CS = tls_record:current_connection_state(CStates, Direction),
-	CS#connection_state.security_parameters#security_parameters.prf_algorithm.
-get_pending_connection_state_prf(CStates, Direction) ->
-	CS = tls_record:pending_connection_state(CStates, Direction),
-	CS#connection_state.security_parameters#security_parameters.prf_algorithm.
-
-connection_hashsign(HashSign = {_, _}, _State) ->
-    HashSign;
-connection_hashsign(_, #state{hashsign_algorithm = HashSign}) ->
-    HashSign.
-
-%% 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 orelse
-	KeyExchange == ecdhe_rsa orelse
-	KeyExchange == srp_rsa) ->
-    {sha, rsa};
-default_hashsign(_Version, KeyExchange)
-  when KeyExchange == rsa;
-       KeyExchange == dhe_rsa;
-       KeyExchange == dh_rsa;
-       KeyExchange == ecdhe_rsa;
-       KeyExchange == srp_rsa ->
-    {md5sha, rsa};
-default_hashsign(_Version, KeyExchange)
-  when KeyExchange == ecdhe_ecdsa;
-       KeyExchange == ecdh_ecdsa;
-       KeyExchange == ecdh_rsa ->
-    {sha, ecdsa};
-default_hashsign(_Version, KeyExchange)
-  when KeyExchange == dhe_dss;
-       KeyExchange == dh_dss;
-       KeyExchange == srp_dss ->
-    {sha, dsa};
-default_hashsign(_Version, KeyExchange)
-  when KeyExchange == dh_anon;
-       KeyExchange == ecdh_anon;
-       KeyExchange == psk;
-       KeyExchange == dhe_psk;
-       KeyExchange == rsa_psk;
-       KeyExchange == srp_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),
-    ok.
-
-handle_unrecv_data(StateName, #state{socket = Socket, transport_cb = Transport} = State) ->
-    ssl_socket:setopts(Transport, 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.
-
-select_curve(#state{client_ecc = {[Curve|_], _}}) ->
-    {namedCurve, Curve};
-select_curve(_) ->
-    {namedCurve, ?secp256k1}.
diff --git a/lib/ssl/src/tls_connection.hrl b/lib/ssl/src/tls_connection.hrl
new file mode 100644
index 0000000000..2beecbb84d
--- /dev/null
+++ b/lib/ssl/src/tls_connection.hrl
@@ -0,0 +1,38 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The 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: SSL/TLS specific state
+%%----------------------------------------------------------------------
+
+-ifndef(tls_connection).
+-define(tls_connection, true).
+
+-include("ssl_connection.hrl").
+-include("tls_record.hrl").
+
+-record(protocol_buffers, {
+	  tls_packets = [], %%           :: [#ssl_tls{}],  % Not yet handled decode SSL/TLS packets.
+          tls_record_buffer = <<>>, %%    :: binary(),  % Buffer of incomplete records
+          tls_handshake_buffer = <<>>, %% :: binary(),  % Buffer of incomplete handshakes
+	  tls_cipher_texts = []       %%:: [binary()]
+	 }).
+
+-endif. % -ifdef(tls_connection).
diff --git a/lib/ssl/src/ssl_connection_sup.erl b/lib/ssl/src/tls_connection_sup.erl
index fb1c6e11a6..6f0d8a7262 100644
--- a/lib/ssl/src/ssl_connection_sup.erl
+++ b/lib/ssl/src/tls_connection_sup.erl
@@ -19,9 +19,9 @@
 
 %%
 %%----------------------------------------------------------------------
-%% Purpose: The top supervisor for the ftp hangs under inets_sup.
+%% Purpose: Supervisor for a SSL/TLS connection
 %%----------------------------------------------------------------------
--module(ssl_connection_sup).
+-module(tls_connection_sup).
 
 -behaviour(supervisor).
 
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl
index 51fd2e1dc9..01abefca46 100644
--- a/lib/ssl/src/tls_handshake.erl
+++ b/lib/ssl/src/tls_handshake.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %%
 %% The 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,36 +18,20 @@
 %%
 
 %%----------------------------------------------------------------------
-%% Purpose: Help funtions for handling the SSL-handshake protocol
+%% Purpose: Help funtions for handling the TLS (specific parts of)
+%%% SSL/TLS/DTLS handshake protocol
 %%----------------------------------------------------------------------
 
 -module(tls_handshake).
 
 -include("tls_handshake.hrl").
 -include("tls_record.hrl").
--include("ssl_cipher.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_internal.hrl").
--include("ssl_srp.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
--export([master_secret/4, client_hello/8, server_hello/7, hello/4,
-	 hello_request/0, certify/7, certificate/4,
-	 client_certificate_verify/6, certificate_verify/6, verify_signature/5,
-	 certificate_request/3, key_exchange/3, server_key_exchange_hash/2,
-	 finished/5, verify_connection/6, get_tls_handshake/3,
-	 decode_client_key/3, decode_server_key/3, server_hello_done/0,
-	 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{} | #next_protocol{}.
-
--define(NAMED_CURVE_TYPE, 3).
+-export([client_hello/8, hello/4,
+	 get_tls_handshake/3, encode_handshake/2, decode_handshake/3]).
 
 %%====================================================================
 %% Internal application API
@@ -65,517 +49,85 @@ client_hello(Host, Port, ConnectionStates,
 			 } = SslOpts,
 	     Cache, CacheCb, Renegotiation, OwnCert) ->
     Version = tls_record:highest_protocol_version(Versions),
-    Pending = tls_record:pending_connection_state(ConnectionStates, read),
+    Pending = ssl_record:pending_connection_state(ConnectionStates, read),
     SecParams = Pending#connection_state.security_parameters,
-    Ciphers = available_suites(UserSuites, Version),
-    SRP = srp_user(SslOpts),
-    {EcPointFormats, EllipticCurves} = default_ecc_extensions(Version),
+    CipherSuites = ssl_handshake:available_suites(UserSuites, Version),
+    Extensions = ssl_handshake:client_hello_extensions(Host, Version, 
+						       CipherSuites,
+						       SslOpts, ConnectionStates, Renegotiation),
 
     Id = ssl_session:client_id({Host, Port, SslOpts}, Cache, CacheCb, OwnCert),
 
     #client_hello{session_id = Id,
 		  client_version = Version,
-		  cipher_suites = cipher_suites(Ciphers, Renegotiation),
-		  compression_methods = tls_record:compressions(),
+		  cipher_suites = ssl_handshake:cipher_suites(CipherSuites, Renegotiation),
+		  compression_methods = ssl_record:compressions(),
 		  random = SecParams#security_parameters.client_random,
-
-		  renegotiation_info =
-		      renegotiation_info(client, ConnectionStates, Renegotiation),
-		  srp = SRP,
-		  hash_signs = default_hash_signs(),
-		  ec_point_formats = EcPointFormats,
-		  elliptic_curves = EllipticCurves,
-		  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(), [binary()] | undefined,
-		   #ec_point_formats{} | undefined,
-		   #elliptic_curves{} | undefined) -> #server_hello{}.
-%%
-%% Description: Creates a server hello message.
-%%--------------------------------------------------------------------
-server_hello(SessionId, Version, ConnectionStates, Renegotiation,
-	     ProtocolsAdvertisedOnServer, EcPointFormats, EllipticCurves) ->
-    Pending = tls_record:pending_connection_state(ConnectionStates, read),
-    SecParams = Pending#connection_state.security_parameters,
-    #server_hello{server_version = Version,
-		  cipher_suite = SecParams#security_parameters.cipher_suite,
-                  compression_method = 
-		  SecParams#security_parameters.compression_algorithm,
-		  random = SecParams#security_parameters.server_random,
-		  session_id = SessionId,
-		  renegotiation_info = 
-		  renegotiation_info(server, ConnectionStates, Renegotiation),
-		  ec_point_formats = EcPointFormats,
-		  elliptic_curves = EllipticCurves,
-		  next_protocol_negotiation = encode_protocols_advertised_on_server(ProtocolsAdvertisedOnServer)
+		  extensions = Extensions
 		 }.
 
 %%--------------------------------------------------------------------
--spec hello_request() -> #hello_request{}.
-%%
-%% Description: Creates a hello request message sent by server to 
-%% trigger renegotiation.
-%%--------------------------------------------------------------------
-hello_request() ->
-    #hello_request{}.
-
-%%--------------------------------------------------------------------
 -spec hello(#server_hello{} | #client_hello{}, #ssl_options{},
 	    #connection_states{} | {inet:port_number(), #session{}, db_handle(),
-				    atom(), #connection_states{}, binary()},
+				    atom(), #connection_states{}, binary() | undefined},
 	    boolean()) ->
 			  {tls_version(), session_id(), #connection_states{}, binary() | undefined}|
-			  {tls_version(), {resumed | new, #session{}}, #connection_states{}, [binary()] | undefined,
+			  {tls_version(), {resumed | new, #session{}}, #connection_states{},
+			   [binary()] | undefined,
 			  [oid()] | undefined, [oid()] | 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,
-		    hash_signs = _HashSigns} = Hello,
-      #ssl_options{secure_renegotiate = SecureRenegotation, next_protocol_selector = NextProtocolSelector,
-		   versions = SupportedVersions},
+hello(#server_hello{server_version = Version, random = Random,
+		    cipher_suite = CipherSuite,
+		    compression_method = Compression,
+		    session_id = SessionId, extensions = HelloExt},
+      #ssl_options{versions = SupportedVersions} = SslOpt,
       ConnectionStates0, Renegotiation) ->
-    %%TODO: select hash and signature algorigthm
     case tls_record:is_acceptable_version(Version, SupportedVersions) of
 	true ->
-	    case handle_renegotiation_info(client, Info, ConnectionStates0, 
-					   Renegotiation, SecureRenegotation, []) of
-		{ok, ConnectionStates1} ->
-		    ConnectionStates =
-			hello_pending_connection_states(client, Version, CipherSuite, Random,
-							Compression, ConnectionStates1),
-		    case handle_next_protocol(Hello, NextProtocolSelector, Renegotiation) of
-			#alert{} = Alert ->
-			    Alert;
-			    Protocol ->
-			    {Version, SessionId, ConnectionStates, Protocol}
-		    end;
-		#alert{} = Alert ->
-		    Alert
-	    end;
+	    handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
+					   Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation);
 	false ->
 	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
     end;
 			       
-hello(#client_hello{client_version = ClientVersion} = Hello,
+hello(#client_hello{client_version = ClientVersion,
+		    session_id = SugesstedId,
+		    cipher_suites = CipherSuites,
+		    compression_methods = Compressions,
+		    random = Random,
+		    extensions = #hello_extensions{elliptic_curves = Curves} = HelloExt},
       #ssl_options{versions = Versions} = SslOpts,
       {Port, Session0, Cache, CacheCb, ConnectionStates0, Cert}, Renegotiation) ->
-    %% TODO: select hash and signature algorithm
-    Version = select_version(ClientVersion, Versions),
+    Version = ssl_handshake:select_version(tls_record, ClientVersion, Versions),
     case tls_record:is_acceptable_version(Version, Versions) of
 	true ->
-	    %% TODO: need to take supported Curves into Account when selecting the CipherSuite....
-	    %%       if whe have an ECDSA cert with an unsupported curve, we need to drop ECDSA ciphers
+	    ECCCurve = ssl_handshake:select_curve(Curves, ssl_handshake:supported_ecc(Version)),
 	    {Type, #session{cipher_suite = CipherSuite} = Session1}
-		= select_session(Hello, Port, Session0, Version, 
-				 SslOpts, Cache, CacheCb, Cert),
+		= ssl_handshake:select_session(SugesstedId, CipherSuites, Compressions,
+					       Port, Session0#session{ecc = ECCCurve}, Version,
+					       SslOpts, Cache, CacheCb, Cert),
 	    case CipherSuite of 
 		no_suite ->
 		    ?ALERT_REC(?FATAL, ?INSUFFICIENT_SECURITY);
 		_ ->
-		    try handle_hello_extensions(Hello, Version, SslOpts, Session1, ConnectionStates0, Renegotiation) of
-			{Session, ConnectionStates, ProtocolsToAdvertise, ECPointFormats, EllipticCurves} ->
-			    {Version, {Type, Session}, ConnectionStates,
-			     ProtocolsToAdvertise, ECPointFormats, EllipticCurves}
-		    catch throw:Alert ->
-			    Alert
-		    end
+		    handle_client_hello_extensions(Version, Type, Random, CipherSuites, HelloExt,
+						   SslOpts, Session1, ConnectionStates0,
+						   Renegotiation)
 	    end;
 	false ->
 	    ?ALERT_REC(?FATAL, ?PROTOCOL_VERSION)
     end.
 
 %%--------------------------------------------------------------------
--spec certify(#certificate{}, db_handle(), certdb_ref(), integer() | nolimit,
-	      verify_peer | verify_none, {fun(), term},
-	      client | server) ->  {der_cert(), public_key_info()} | #alert{}.
-%%
-%% Description: Handles a certificate handshake message
-%%--------------------------------------------------------------------
-certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef,
-	MaxPathLen, _Verify, VerifyFunAndState, Role) ->
-    [PeerCert | _] = ASN1Certs,
-      
-    ValidationFunAndState =
-	case VerifyFunAndState of
-	    undefined ->
-		{fun(OtpCert, ExtensionOrVerifyResult, SslState) ->
-			 ssl_certificate:validate_extension(OtpCert,
-							    ExtensionOrVerifyResult, SslState)
-		 end, Role};
-	    {Fun, UserState0} ->
-		{fun(OtpCert, {extension, _} = Extension, {SslState, UserState}) ->
-			 case ssl_certificate:validate_extension(OtpCert,
-								 Extension,
-								 SslState) of
-			     {valid, NewSslState} ->
-				 {valid, {NewSslState, UserState}};
-			     {fail, Reason} ->
-				 apply_user_fun(Fun, OtpCert, Reason, UserState,
-						SslState);
-			     {unknown, _} ->
-				 apply_user_fun(Fun, OtpCert,
-						Extension, UserState, SslState)
-			 end;
-		    (OtpCert, VerifyResult, {SslState, UserState}) ->
-			 apply_user_fun(Fun, OtpCert, VerifyResult, UserState,
-					SslState)
-		 end, {Role, UserState0}}
-	end,
-
-    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.
-
-%%--------------------------------------------------------------------
--spec certificate(der_cert(), db_handle(), certdb_ref(), client | server) -> #certificate{} | #alert{}.
-%%
-%% Description: Creates a certificate message.
-%%--------------------------------------------------------------------
-certificate(OwnCert, CertDbHandle, CertDbRef, client) ->
-    Chain =
-	case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
-	    {ok, CertChain} ->
-		CertChain;
-	    {error, _} -> 
-		%% If no suitable certificate is available, the client
-		%% SHOULD send a certificate message containing no
-		%% certificates. (chapter 7.4.6. RFC 4346)
-		[]	 
-	end,
-    #certificate{asn1_certificates = Chain};
-
-certificate(OwnCert, CertDbHandle, CertDbRef, server) ->
-    case ssl_certificate:certificate_chain(OwnCert, CertDbHandle, CertDbRef) of
-	{ok, Chain} ->
-	    #certificate{asn1_certificates = Chain};
-	{error, _} ->
-	    ?ALERT_REC(?FATAL, ?INTERNAL_ERROR)
-    end.
-
-%%--------------------------------------------------------------------
--spec client_certificate_verify(undefined | der_cert(), 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, _, _, _, _, _) ->
-    ignore;
-client_certificate_verify(_, _, _, _, undefined, _) ->
-    ignore;
-client_certificate_verify(OwnCert, MasterSecret, Version,
-			  {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, 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(), term(),
-			 binary(), tls_handshake_history()) -> valid | #alert{}.
-%%
-%% Description: Checks that the certificate_verify message is valid.
-%%--------------------------------------------------------------------
-certificate_verify(Signature, PublicKeyInfo, Version,
-		   HashSign = {HashAlgo, _}, MasterSecret, {_, Handshake}) ->
-    Hash = calc_certificate_verify(Version, HashAlgo, MasterSecret, Handshake),
-    case verify_signature(Version, Hash, HashSign, Signature, PublicKeyInfo) of
-	true ->
-	    valid;
-	_ ->
-    	    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE)
-    end.
-
-%%--------------------------------------------------------------------
--spec verify_signature(tls_version(), binary(), {term(), term()}, binary(),
-				   public_key_info()) -> true | false.
-%%
-%% Description: Checks that a public_key signature is valid.
-%%--------------------------------------------------------------------
-verify_signature(_Version, _Hash, {_HashAlgo, anon}, _Signature, _) ->
-    true;
-verify_signature({3, Minor}, Hash, {HashAlgo, rsa}, Signature, {?rsaEncryption, PubKey, _PubKeyParams})
-  when Minor >= 3 ->
-    public_key:verify({digest, Hash}, HashAlgo, Signature, PubKey);
-verify_signature(_Version, Hash, _HashAlgo, Signature, {?rsaEncryption, PubKey, _PubKeyParams}) ->
-    case public_key:decrypt_public(Signature, PubKey,
-				   [{rsa_pad, rsa_pkcs1_padding}]) of
-	Hash -> true;
-	_    -> false
-    end;
-verify_signature(_Version, Hash, {HashAlgo, dsa}, Signature, {?'id-dsa', PublicKey, PublicKeyParams}) ->
-    public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams});
-verify_signature(_Version, Hash, {HashAlgo, ecdsa}, Signature, {?'id-ecPublicKey', PublicKey, PublicKeyParams}) ->
-    public_key:verify({digest, Hash}, HashAlgo, Signature, {PublicKey, PublicKeyParams}).
-
-%%--------------------------------------------------------------------
--spec certificate_request(#connection_states{}, db_handle(), certdb_ref()) ->
-    #certificate_request{}.
-%%
-%% Description: Creates a certificate_request message, called by the server.
-%%--------------------------------------------------------------------
-certificate_request(ConnectionStates, CertDbHandle, CertDbRef) ->
-    #connection_state{security_parameters = 
-		      #security_parameters{cipher_suite = CipherSuite}} =
-	tls_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, tls_version(),
-		   {premaster_secret, binary(), public_key_info()} |
-		   {dh, binary()} |
-		   {dh, {binary(), binary()}, #'DHParameter'{}, {HashAlgo::atom(), SignAlgo::atom()},
-		   binary(), binary(), private_key()} |
-		   {ecdh, #'ECPrivateKey'{}} |
-		   {psk, binary()} |
-		   {dhe_psk, binary(), binary()} |
-		   {srp, {binary(), binary()}, #srp_user{}, {HashAlgo::atom(), SignAlgo::atom()},
-		   binary(), binary(), private_key()}) ->
-    #client_key_exchange{} | #server_key_exchange{}.
-%%
-%% Description: Creates a keyexchange message.
-%%--------------------------------------------------------------------
-key_exchange(client, _Version, {premaster_secret, Secret, {_, PublicKey, _}}) ->
-    EncPremasterSecret =
-	encrypted_premaster_secret(Secret, PublicKey),
-    #client_key_exchange{exchange_keys = EncPremasterSecret};
-
-key_exchange(client, _Version, {dh, PublicKey}) ->
-    #client_key_exchange{
-	      exchange_keys = #client_diffie_hellman_public{
-		dh_public = PublicKey}
-	       };
-
-key_exchange(client, _Version, {ecdh, #'ECPrivateKey'{publicKey = {0, ECPublicKey}}}) ->
-    #client_key_exchange{
-	      exchange_keys = #client_ec_diffie_hellman_public{
-		dh_public = ECPublicKey}
-	       };
-
-key_exchange(client, _Version, {psk, Identity}) ->
-    #client_key_exchange{
-	      exchange_keys = #client_psk_identity{
-		identity = Identity}
-	       };
-
-key_exchange(client, _Version, {dhe_psk, Identity, PublicKey}) ->
-    #client_key_exchange{
-	      exchange_keys = #client_dhe_psk_identity{
-		identity = Identity,
-		dh_public = PublicKey}
-	       };
-
-key_exchange(client, _Version, {psk_premaster_secret, PskIdentity, Secret, {_, PublicKey, _}}) ->
-    EncPremasterSecret =
-	encrypted_premaster_secret(Secret, PublicKey),
-    #client_key_exchange{
-		exchange_keys = #client_rsa_psk_identity{
-				   identity = PskIdentity,
-		  exchange_keys = EncPremasterSecret}};
-
-key_exchange(client, _Version, {srp, PublicKey}) ->
-    #client_key_exchange{
-	      exchange_keys = #client_srp_public{
-		srp_a = PublicKey}
-	       };
-
-key_exchange(server, Version, {dh, {PublicKey, _},
-			       #'DHParameter'{prime = P, base = G},
-			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
-    ServerDHParams = #server_dh_params{dh_p = int_to_bin(P),
-				       dh_g = int_to_bin(G), dh_y = PublicKey},
-    enc_server_key_exchange(Version, ServerDHParams, HashSign,
-			    ClientRandom, ServerRandom, PrivateKey);
-
-key_exchange(server, Version, {ecdh,  #'ECPrivateKey'{publicKey =  {0, ECPublicKey},
-						      parameters = ECCurve}, HashSign, ClientRandom, ServerRandom,
-	     PrivateKey}) ->
-    ServerECParams = #server_ecdh_params{curve = ECCurve, public = ECPublicKey},
-    enc_server_key_exchange(Version, ServerECParams, HashSign,
-			    ClientRandom, ServerRandom, PrivateKey);
-
-key_exchange(server, Version, {psk, PskIdentityHint,
-			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
-    ServerPSKParams = #server_psk_params{hint = PskIdentityHint},
-    enc_server_key_exchange(Version, ServerPSKParams, HashSign,
-			    ClientRandom, ServerRandom, PrivateKey);
-
-key_exchange(server, Version, {dhe_psk, PskIdentityHint, {PublicKey, _},
-			       #'DHParameter'{prime = P, base = G},
-			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
-    ServerEDHPSKParams = #server_dhe_psk_params{
-      hint = PskIdentityHint,
-      dh_params = #server_dh_params{dh_p = int_to_bin(P),
-				    dh_g = int_to_bin(G), dh_y = PublicKey}
-     },
-    enc_server_key_exchange(Version, ServerEDHPSKParams,
-			    HashSign, ClientRandom, ServerRandom, PrivateKey);
-
-key_exchange(server, Version, {srp, {PublicKey, _},
-			       #srp_user{generator = Generator, prime = Prime,
-					 salt = Salt},
-			       HashSign, ClientRandom, ServerRandom, PrivateKey}) ->
-    ServerSRPParams = #server_srp_params{srp_n = Prime, srp_g = Generator,
-					 srp_s = Salt, srp_b = PublicKey},
-    enc_server_key_exchange(Version, ServerSRPParams, HashSign,
-			    ClientRandom, ServerRandom, PrivateKey).
-
-enc_server_key_exchange(Version, Params, {HashAlgo, SignAlgo},
-			ClientRandom, ServerRandom, PrivateKey) ->
-    EncParams = enc_server_key(Params),
-    case HashAlgo of
-	null ->
-	    #server_key_params{params = Params,
-			       params_bin = EncParams,
-			       hashsign = {null, anon},
-			       signature = <<>>};
-	_ ->
-	    Hash =
-		server_key_exchange_hash(HashAlgo, <<ClientRandom/binary,
-						     ServerRandom/binary,
-						     EncParams/binary>>),
-	    Signature = digitally_signed(Version, Hash, HashAlgo, PrivateKey),
-	    #server_key_params{params = Params,
-			       params_bin = EncParams,
-			       hashsign = {HashAlgo, SignAlgo},
-			       signature = Signature}
-    end.
-
-%%--------------------------------------------------------------------
--spec master_secret(tls_version(), #session{} | binary(), #connection_states{},
-		   client | server) -> {binary(), #connection_states{}} | #alert{}.
-%%    
-%% Description: Sets or calculates the master secret and calculate keys,
-%% updating the pending connection states. The Mastersecret and the update
-%% connection states are returned or an alert if the calculation fails.
-%%-------------------------------------------------------------------
-master_secret(Version, #session{master_secret = Mastersecret}, 
-	      ConnectionStates, Role) ->
-    ConnectionState = 
-	tls_record:pending_connection_state(ConnectionStates, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    try master_secret(Version, Mastersecret, SecParams, 
-		      ConnectionStates, Role)
-    catch
-	exit:Reason ->
-	    Report = io_lib:format("Key calculation failed due to ~p",
-				   [Reason]),
-	    error_logger:error_report(Report),
-	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
-    end;
-
-master_secret(Version, PremasterSecret, ConnectionStates, Role) ->
-    ConnectionState = 
-	tls_record:pending_connection_state(ConnectionStates, read),
-    SecParams = ConnectionState#connection_state.security_parameters,
-    #security_parameters{prf_algorithm = PrfAlgo,
-			 client_random = ClientRandom,
-			 server_random = ServerRandom} = SecParams, 
-    try master_secret(Version, 
-		      calc_master_secret(Version,PrfAlgo,PremasterSecret,
-				       ClientRandom, ServerRandom),
-		      SecParams, ConnectionStates, Role) 
-    catch
-	exit:Reason ->
-	    Report = io_lib:format("Master secret calculation failed"
-				   " due to ~p", [Reason]),
-	    error_logger:error_report(Report),
-	    ?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, integer(), binary(), tls_handshake_history()) ->
-    #finished{}.
-%%
-%% Description: Creates a handshake finished message
-%%-------------------------------------------------------------------
-finished(Version, Role, PrfAlgo, MasterSecret, {Handshake, _}) -> % use the current handshake
-    #finished{verify_data = 
-	      calc_finished(Version, Role, PrfAlgo, MasterSecret, Handshake)}.
-
-%%--------------------------------------------------------------------
--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, PrfAlgo, MasterSecret, {_, Handshake}) ->
-    %% use the previous hashes
-    case calc_finished(Version, Role, PrfAlgo, MasterSecret, Handshake) of
-	Data ->
-	    verified;
-	_ ->
-	    ?ALERT_REC(?FATAL, ?DECRYPT_ERROR)
-    end.
-%%--------------------------------------------------------------------
--spec server_hello_done() ->  #server_hello_done{}.
-%%     
-%% Description: Creates a server hello done message.
-%%--------------------------------------------------------------------	    
-server_hello_done() ->
-    #server_hello_done{}.
-
-%%--------------------------------------------------------------------
 -spec encode_handshake(tls_handshake(), tls_version()) -> iolist().
 %%     
-%% Description: Encode a handshake packet to binary
+%% Description: Encode a handshake packet
 %%--------------------------------------------------------------------x
 encode_handshake(Package, Version) ->
-    {MsgType, Bin} = enc_hs(Package, Version),
+    {MsgType, Bin} = enc_handshake(Package, Version),
     Len = byte_size(Bin),
     [MsgType, ?uint24(Len), Bin].
 
@@ -593,1235 +145,98 @@ 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()) ->
-			    #encrypted_premaster_secret{}
-			    | #client_diffie_hellman_public{}
-			    | #client_ec_diffie_hellman_public{}
-			    | #client_psk_identity{}
-			    | #client_dhe_psk_identity{}
-			    | #client_rsa_psk_identity{}
-			    | #client_srp_public{}.
-%%
-%% Description: Decode client_key data and return appropriate type
-%%--------------------------------------------------------------------
-decode_client_key(ClientKey, Type, Version) ->
-    dec_client_key(ClientKey, key_exchange_alg(Type), Version).
-
-%%--------------------------------------------------------------------
--spec decode_server_key(binary(), key_algo(), tls_version()) ->
-			       #server_key_params{}.
-%%
-%% Description: Decode server_key data and return appropriate type
-%%--------------------------------------------------------------------
-decode_server_key(ServerKey, Type, Version) ->
-    dec_server_key(ServerKey, key_exchange_alg(Type), Version).
-
-%%--------------------------------------------------------------------
--spec init_handshake_history() -> tls_handshake_history().
-
-%%
-%% Description: Initialize the empty handshake history buffer.
-%%--------------------------------------------------------------------
-init_handshake_history() ->
-    {[], []}.
-
-%%--------------------------------------------------------------------
--spec update_handshake_history(tls_handshake_history(), Data ::term()) ->
-				      tls_handshake_history().
-%%
-%% Description: Update the handshake history buffer with Data.
-%%--------------------------------------------------------------------
-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().
-
-%%
-%% Description: Public key decryption using the private key.
-%%--------------------------------------------------------------------
-decrypt_premaster_secret(Secret, RSAPrivateKey) ->
-    try public_key:decrypt_private(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(md5sha | md5 | sha | sha224 |sha256 | sha384 | sha512, binary()) -> binary().
-%%
-%% Description: Calculate server key exchange hash
-%%--------------------------------------------------------------------
-server_key_exchange_hash(md5sha, Value) ->
-    MD5 = crypto:hash(md5, Value),
-    SHA = crypto:hash(sha, Value),
-    <<MD5/binary, SHA/binary>>;
-
-server_key_exchange_hash(Hash, Value) ->
-    crypto:hash(Hash, Value).
-
-%%--------------------------------------------------------------------
--spec prf(tls_version(), binary(), binary(), [binary()], non_neg_integer()) ->
-		 {ok, binary()} | {error, undefined}.
-%%
-%% Description: use the TLS PRF to generate key material
-%%--------------------------------------------------------------------
-prf({3,0}, _, _, _, _) ->
-    {error, undefined};
-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(Version, <<?BYTE(Type), ?UINT24(Length),
 			Body:Length/binary,Rest/binary>>, Acc) ->
     Raw = <<?BYTE(Type), ?UINT24(Length), Body/binary>>,
-    H = dec_hs(Version, Type, Body),
-    get_tls_handshake_aux(Version, Rest, [{H,Raw} | Acc]);
+    Handshake = decode_handshake(Version, Type, Body),
+    get_tls_handshake_aux(Version, Rest, [{Handshake,Raw} | Acc]);
 get_tls_handshake_aux(_Version, Data, Acc) ->
     {lists:reverse(Acc), Data}.
 
-path_validation_alert({bad_cert, cert_expired}) ->
-    ?ALERT_REC(?FATAL, ?CERTIFICATE_EXPIRED);
-path_validation_alert({bad_cert, invalid_issuer}) ->
-    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
-path_validation_alert({bad_cert, invalid_signature}) ->
-    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
-path_validation_alert({bad_cert, name_not_permitted}) ->
-    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
-path_validation_alert({bad_cert, unknown_critical_extension}) ->
-    ?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE);
-path_validation_alert({bad_cert, cert_revoked}) ->
-    ?ALERT_REC(?FATAL, ?CERTIFICATE_REVOKED);
-path_validation_alert({bad_cert, selfsigned_peer}) ->
-    ?ALERT_REC(?FATAL, ?BAD_CERTIFICATE);
-path_validation_alert({bad_cert, unknown_ca}) ->
-     ?ALERT_REC(?FATAL, ?UNKNOWN_CA);
-path_validation_alert(_) ->
-    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE).
-
-select_session(Hello, Port, Session, Version,
-	       #ssl_options{ciphers = UserSuites} = SslOpts, Cache, CacheCb, Cert) ->
-    SuggestedSessionId = Hello#client_hello.session_id,
-    {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}};
-	_ ->
-	    {resumed, Resumed}
-    end.
-
-available_suites(UserSuites, Version) ->
-    case UserSuites of
-	[] ->
-	    ssl_cipher:suites(Version);
-	_ ->
-	    UserSuites
-    end.
-
-available_suites(ServerCert, UserSuites, Version) ->
-    ssl_cipher:filter(ServerCert, available_suites(UserSuites, Version)).
- 
-cipher_suites(Suites, false) ->
-    [?TLS_EMPTY_RENEGOTIATION_INFO_SCSV | Suites];
-cipher_suites(Suites, true) ->
-    Suites.
-
-srp_user(#ssl_options{srp_identity = {UserName, _}}) ->
-    #srp{username = UserName};
-srp_user(_) ->
-    undefined.
-
-renegotiation_info(client, _, false) ->
-    #renegotiation_info{renegotiated_connection = undefined};
-renegotiation_info(server, ConnectionStates, false) ->
-    CS  = tls_record:current_connection_state(ConnectionStates, read),
-    case CS#connection_state.secure_renegotiation of
-	true ->
-	    #renegotiation_info{renegotiated_connection = ?byte(0)};
-	false ->
-	    #renegotiation_info{renegotiated_connection = undefined}
-    end;
-renegotiation_info(client, ConnectionStates, true) ->
-    CS = tls_record:current_connection_state(ConnectionStates, read),
-    case CS#connection_state.secure_renegotiation of
-	true ->
-	    Data = CS#connection_state.client_verify_data,
-	    #renegotiation_info{renegotiated_connection = Data};
-	false ->
-	    #renegotiation_info{renegotiated_connection = undefined}
-    end;
-
-renegotiation_info(server, ConnectionStates, true) ->
-    CS = tls_record:current_connection_state(ConnectionStates, read),
-    case CS#connection_state.secure_renegotiation of
-	true ->
-	    CData = CS#connection_state.client_verify_data,
-	    SData  =CS#connection_state.server_verify_data,
-	    #renegotiation_info{renegotiated_connection = <<CData/binary, SData/binary>>};
-	false ->
-	    #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.
-
-default_ecc_extensions(Version) ->
-    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
-    case proplists:get_bool(ecdh, CryptoSupport) of
-	true ->
-	    EcPointFormats = #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]},
-	    EllipticCurves = #elliptic_curves{elliptic_curve_list = ssl_tls1:ecc_curves(Version)},
-	    {EcPointFormats, EllipticCurves};
-	_ ->
-	    {undefined, undefined}
-    end.
-
-handle_ecc_extensions(Version, EcPointFormats0, EllipticCurves0) ->
-    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
-    case proplists:get_bool(ecdh, CryptoSupport) of
-	true ->
-	    EcPointFormats1 = handle_ecc_point_fmt_extension(EcPointFormats0),
-	    EllipticCurves1 = handle_ecc_curves_extension(Version, EllipticCurves0),
-	    {EcPointFormats1, EllipticCurves1};
-	_ ->
-	    {undefined, undefined}
-    end.
-
-handle_ecc_point_fmt_extension(undefined) ->
-    undefined;
-handle_ecc_point_fmt_extension(_) ->
-    #ec_point_formats{ec_point_format_list = [?ECPOINT_UNCOMPRESSED]}.
-
-handle_ecc_curves_extension(_Version, undefined) ->
-    undefined;
-handle_ecc_curves_extension(Version, _) ->
-    #elliptic_curves{elliptic_curve_list = ssl_tls1:ecc_curves(Version)}.
-
-handle_renegotiation_info(_, #renegotiation_info{renegotiated_connection = ?byte(0)}, 
-			  ConnectionStates, false, _, _) ->
-    {ok, tls_record:set_renegotiation_flag(true, ConnectionStates)};
-
-handle_renegotiation_info(server, undefined, ConnectionStates, _, _, CipherSuites) -> 
-    case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
-	true ->
-	    {ok, tls_record:set_renegotiation_flag(true, ConnectionStates)};
-	false ->
-	    {ok, tls_record:set_renegotiation_flag(false, ConnectionStates)}
-    end;
-
-handle_renegotiation_info(_, undefined, ConnectionStates, false, _, _) ->
-    {ok, tls_record:set_renegotiation_flag(false, ConnectionStates)};
-
-handle_renegotiation_info(client, #renegotiation_info{renegotiated_connection = ClientServerVerify}, 
-			  ConnectionStates, true, _, _) ->
-    CS = tls_record:current_connection_state(ConnectionStates, read),
-    CData = CS#connection_state.client_verify_data,
-    SData = CS#connection_state.server_verify_data,    
-    case <<CData/binary, SData/binary>> == ClientServerVerify of
-	true ->
-	    {ok, ConnectionStates};
-	false ->
-	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
-    end;
-handle_renegotiation_info(server, #renegotiation_info{renegotiated_connection = ClientVerify}, 
-			  ConnectionStates, true, _, CipherSuites) ->
-    
-      case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
-	  true ->
-	      ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
-	  false ->	
-	      CS = tls_record:current_connection_state(ConnectionStates, read),
-	      Data = CS#connection_state.client_verify_data,
-	      case Data == ClientVerify of
-		  true ->
-		      {ok, ConnectionStates};
-		  false ->
-		      ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)
-	      end
-      end;
-
-handle_renegotiation_info(client, undefined, ConnectionStates, true, SecureRenegotation, _) ->
-    handle_renegotiation_info(ConnectionStates, SecureRenegotation);
-
-handle_renegotiation_info(server, undefined, ConnectionStates, true, SecureRenegotation, CipherSuites) ->
-     case is_member(?TLS_EMPTY_RENEGOTIATION_INFO_SCSV, CipherSuites) of
-	  true ->
-	     ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
-	 false ->
-	     handle_renegotiation_info(ConnectionStates, SecureRenegotation)
-     end.
-
-handle_renegotiation_info(ConnectionStates, SecureRenegotation) ->
-    CS = tls_record:current_connection_state(ConnectionStates, read),
-    case {SecureRenegotation, CS#connection_state.secure_renegotiation} of
-	{_, true} ->
-	    ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE);
-	{true, false} ->
-	    ?ALERT_REC(?FATAL, ?NO_RENEGOTIATION);
-	{false, false} ->
-	    {ok, ConnectionStates}
-    end.
-
-%% Update pending connection states with parameters exchanged via 
-%% hello messages
-%% NOTE : Role is the role of the receiver of the hello message
-%%        currently being processed.
-hello_pending_connection_states(Role, Version, CipherSuite, Random, Compression,
-				 ConnectionStates) ->    
-    ReadState =  
-	tls_record:pending_connection_state(ConnectionStates, read),
-    WriteState = 
-	tls_record:pending_connection_state(ConnectionStates, write),
-    
-    NewReadSecParams = 
-	hello_security_parameters(Role, Version, ReadState, CipherSuite,
-			    Random, Compression),
-    
-    NewWriteSecParams =
-	hello_security_parameters(Role, Version, WriteState, CipherSuite,
-			    Random, Compression),
- 
-    tls_record:update_security_params(NewReadSecParams,
-				    NewWriteSecParams,
-				    ConnectionStates).
-
-hello_security_parameters(client, Version, ConnectionState, CipherSuite, Random,
-			  Compression) ->   
-    SecParams = ConnectionState#connection_state.security_parameters,
-    NewSecParams = ssl_cipher:security_parameters(Version, CipherSuite, SecParams),
-    NewSecParams#security_parameters{
-      server_random = Random,
-      compression_algorithm = Compression
-     };
-
-hello_security_parameters(server, Version, ConnectionState, CipherSuite, Random,
-			  Compression) ->
-    SecParams = ConnectionState#connection_state.security_parameters,
-    NewSecParams = ssl_cipher:security_parameters(Version, CipherSuite, SecParams),
-    NewSecParams#security_parameters{
-      client_random = Random,
-      compression_algorithm = Compression
-     }.
-
-select_version(ClientVersion, Versions) ->   
-    ServerVersion = tls_record:highest_protocol_version(Versions),
-    tls_record:lowest_protocol_version(ClientVersion, ServerVersion).
-
-select_cipher_suite([], _) ->
-   no_suite;
-select_cipher_suite([Suite | ClientSuites], SupportedSuites) ->
-    case is_member(Suite, SupportedSuites) of
-	true ->
-	    Suite;
-        false ->
-	    select_cipher_suite(ClientSuites, SupportedSuites)
-    end.
-
-is_member(Suite, SupportedSuites) ->
-    lists:member(Suite, SupportedSuites).
-
-select_compression(_CompressionMetodes) ->
-    ?NULL.
-
-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, PrfAlgo, MasterSecret, ServerRandom,
-		   ClientRandom, HashSize, KML, EKML, IVS),
-
-    ConnStates1 = tls_record:set_master_secret(MasterSecret, ConnectionStates),
-    ConnStates2 =
-	tls_record:set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret,
-				  Role, ConnStates1),
-
-    ClientCipherState = #cipher_state{iv = ClientIV, key = ClientWriteKey},
-    ServerCipherState = #cipher_state{iv = ServerIV, key = ServerWriteKey}, 
-    {MasterSecret, 
-     tls_record:set_pending_cipher_state(ConnStates2, ClientCipherState, 
-					 ServerCipherState, Role)}.
-
-
-dec_hs(_, ?NEXT_PROTOCOL, <<?BYTE(SelectedProtocolLength), SelectedProtocol:SelectedProtocolLength/binary,
-                         ?BYTE(PaddingLength), _Padding:PaddingLength/binary>>) ->
-	#next_protocol{selected_protocol = SelectedProtocol};
-
-dec_hs(_, ?HELLO_REQUEST, <<>>) ->
+decode_handshake(_, ?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(_Version, ?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor),
+decode_handshake(_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),
+		  random = ssl_v2:client_random(ChallengeData, CDLength),
 		  session_id = 0,
-		  cipher_suites = from_3bytes(CipherSuites),
+		  cipher_suites =  ssl_handshake:decode_suites('3_bytes', CipherSuites),
 		  compression_methods = [?NULL],
-		  renegotiation_info = undefined
+		  extensions = #hello_extensions{}
 		 };
-dec_hs(_Version, ?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+decode_handshake(_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>>) ->
 
-    DecodedExtensions = dec_hello_extensions(Extensions),
-    RenegotiationInfo = proplists:get_value(renegotiation_info, DecodedExtensions, undefined),
-    SRP = proplists:get_value(srp, DecodedExtensions, undefined),
-    HashSigns = proplists:get_value(hash_signs, DecodedExtensions, undefined),
-    EllipticCurves = proplists:get_value(elliptic_curves, DecodedExtensions,
-					 undefined),
-    NextProtocolNegotiation = proplists:get_value(next_protocol_negotiation, DecodedExtensions, undefined),
+    DecodedExtensions = ssl_handshake:decode_hello_extensions({client, Extensions}),
 
     #client_hello{
        client_version = {Major,Minor},
        random = Random,
        session_id = Session_ID,
-       cipher_suites = from_2bytes(CipherSuites),
+       cipher_suites = ssl_handshake:decode_suites('2_bytes', CipherSuites),
        compression_methods = Comp_methods,
-       renegotiation_info = RenegotiationInfo,
-	srp = SRP,
-       hash_signs = HashSigns,
-       elliptic_curves = EllipticCurves,
-       next_protocol_negotiation = NextProtocolNegotiation
+       extensions = DecodedExtensions
       };
 
-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{
-	server_version = {Major,Minor},
-	random = Random,
-	session_id = Session_ID,
-	cipher_suite = Cipher_suite,
-	compression_method = Comp_method,
-	renegotiation_info = undefined,
-	hash_signs = undefined,
-	elliptic_curves = undefined};
-
-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),
-		       ?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
-    
-    HelloExtensions = dec_hello_extensions(Extensions, []),
-    RenegotiationInfo = proplists:get_value(renegotiation_info, HelloExtensions,
-					   undefined),
-    HashSigns = proplists:get_value(hash_signs, HelloExtensions,
-					   undefined),
-    EllipticCurves = proplists:get_value(elliptic_curves, 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,
-	hash_signs = HashSigns,
-	elliptic_curves = EllipticCurves,
-       next_protocol_negotiation = NextProtocolNegotiation};
-dec_hs(_Version, ?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>) ->
-    #certificate{asn1_certificates = certs_to_list(ASN1Certs)};
-dec_hs(_Version, ?SERVER_KEY_EXCHANGE, Keys) ->
-    #server_key_exchange{exchange_keys = Keys};
-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(_Version, ?SERVER_HELLO_DONE, <<>>) ->
-    #server_hello_done{};
-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(_Version, ?CLIENT_KEY_EXCHANGE, PKEPMS) ->
-    #client_key_exchange{exchange_keys = PKEPMS};
-dec_hs(_Version, ?FINISHED, VerifyData) ->
-    #finished{verify_data = VerifyData};
-dec_hs(_, _, _) ->
-    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
-
-dec_client_key(PKEPMS, ?KEY_EXCHANGE_RSA, {3, 0}) ->
-    #encrypted_premaster_secret{premaster_secret = PKEPMS};
-dec_client_key(<<?UINT16(_), PKEPMS/binary>>, ?KEY_EXCHANGE_RSA, _) ->
-    #encrypted_premaster_secret{premaster_secret = PKEPMS};
-dec_client_key(<<>>, ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
-    throw(?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE));
-dec_client_key(<<?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
-	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, _) ->
-    #client_diffie_hellman_public{dh_public = DH_Y};
-dec_client_key(<<>>, ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, _) ->
-    throw(?ALERT_REC(?FATAL, ?UNSUPPORTED_CERTIFICATE));
-dec_client_key(<<?BYTE(DH_YLen), DH_Y:DH_YLen/binary>>,
-	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, _) ->
-    #client_ec_diffie_hellman_public{dh_public = DH_Y};
-dec_client_key(<<?UINT16(Len), Id:Len/binary>>,
-	       ?KEY_EXCHANGE_PSK, _) ->
-    #client_psk_identity{identity = Id};
-dec_client_key(<<?UINT16(Len), Id:Len/binary,
-		 ?UINT16(DH_YLen), DH_Y:DH_YLen/binary>>,
-	       ?KEY_EXCHANGE_DHE_PSK, _) ->
-    #client_dhe_psk_identity{identity = Id, dh_public = DH_Y};
-dec_client_key(<<?UINT16(Len), Id:Len/binary, PKEPMS/binary>>,
-	       ?KEY_EXCHANGE_RSA_PSK, {3, 0}) ->
-    #client_rsa_psk_identity{identity = Id, exchange_keys = #encrypted_premaster_secret{premaster_secret = PKEPMS}};
-dec_client_key(<<?UINT16(Len), Id:Len/binary, ?UINT16(_), PKEPMS/binary>>,
-	       ?KEY_EXCHANGE_RSA_PSK, _) ->
-    #client_rsa_psk_identity{identity = Id, exchange_keys = #encrypted_premaster_secret{premaster_secret = PKEPMS}};
-dec_client_key(<<?UINT16(ALen), A:ALen/binary>>,
-	       ?KEY_EXCHANGE_SRP, _) ->
-    #client_srp_public{srp_a = A}.
-
-dec_ske_params(Len, Keys, Version) ->
-    <<Params:Len/bytes, Signature/binary>> = Keys,
-    dec_ske_signature(Params, Signature, Version).
-
-dec_ske_signature(Params, <<?BYTE(HashAlgo), ?BYTE(SignAlgo),
-			    ?UINT16(0)>>, {Major, Minor})
-  when Major == 3, Minor >= 3 ->
-    HashSign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)},
-    {Params, HashSign, <<>>};
-dec_ske_signature(Params, <<?BYTE(HashAlgo), ?BYTE(SignAlgo),
-			    ?UINT16(Len), Signature:Len/binary>>, {Major, Minor})
-  when Major == 3, Minor >= 3 ->
-    HashSign = {ssl_cipher:hash_algorithm(HashAlgo), ssl_cipher:sign_algorithm(SignAlgo)},
-    {Params, HashSign, Signature};
-dec_ske_signature(Params, <<>>, _) ->
-    {Params, {null, anon}, <<>>};
-dec_ske_signature(Params, <<?UINT16(0)>>, _) ->
-    {Params, {null, anon}, <<>>};
-dec_ske_signature(Params, <<?UINT16(Len), Signature:Len/binary>>, _) ->
-    {Params, undefined, Signature};
-dec_ske_signature(_, _, _) ->
-    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
+decode_handshake(Version, Tag, Msg) ->
+    ssl_handshake:decode_handshake(Version, Tag, Msg).
 
-dec_server_key(<<?UINT16(PLen), P:PLen/binary,
-		 ?UINT16(GLen), G:GLen/binary,
-		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_DIFFIE_HELLMAN, Version) ->
-    Params = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
-    {BinMsg, HashSign, Signature} = dec_ske_params(PLen + GLen + YLen + 6, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-%% ECParameters with named_curve
-%% TODO: explicit curve
-dec_server_key(<<?BYTE(?NAMED_CURVE), ?UINT16(CurveID),
-		 ?BYTE(PointLen), ECPoint:PointLen/binary,
-		 _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN, Version) ->
-    Params = #server_ecdh_params{curve = {namedCurve, ssl_tls1:enum_to_oid(CurveID)},
-				 public = ECPoint},
-    {BinMsg, HashSign, Signature} = dec_ske_params(PointLen + 4, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(<<?UINT16(Len), PskIdentityHint:Len/binary>> = KeyStruct,
-	       KeyExchange, Version)
-  when KeyExchange == ?KEY_EXCHANGE_PSK; KeyExchange == ?KEY_EXCHANGE_RSA_PSK ->
-    Params = #server_psk_params{
-      hint = PskIdentityHint},
-    {BinMsg, HashSign, Signature} = dec_ske_params(Len + 2, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(<<?UINT16(Len), IdentityHint:Len/binary,
-		 ?UINT16(PLen), P:PLen/binary,
-		 ?UINT16(GLen), G:GLen/binary,
-		 ?UINT16(YLen), Y:YLen/binary, _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_DHE_PSK, Version) ->
-    DHParams = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y},
-    Params = #server_dhe_psk_params{
-      hint = IdentityHint,
-      dh_params = DHParams},
-    {BinMsg, HashSign, Signature} = dec_ske_params(Len + PLen + GLen + YLen + 8, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(<<?UINT16(NLen), N:NLen/binary,
-		 ?UINT16(GLen), G:GLen/binary,
-		 ?BYTE(SLen), S:SLen/binary,
-		 ?UINT16(BLen), B:BLen/binary, _/binary>> = KeyStruct,
-	       ?KEY_EXCHANGE_SRP, Version) ->
-    Params = #server_srp_params{srp_n = N, srp_g = G, srp_s = S, srp_b = B},
-    {BinMsg, HashSign, Signature} = dec_ske_params(NLen + GLen + SLen + BLen + 7, KeyStruct, Version),
-    #server_key_params{params = Params,
-		       params_bin = BinMsg,
-		       hashsign = HashSign,
-		       signature = Signature};
-dec_server_key(_, _, _) ->
-    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE)).
-
-dec_hello_extensions(<<>>) ->
-    [];
-dec_hello_extensions(<<?UINT16(ExtLen), Extensions:ExtLen/binary>>) ->
-    dec_hello_extensions(Extensions, []);
-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
-			      Info; % should be <<0>> will be matched in handle_renegotiation_info
-			  _ ->
-			      VerifyLen = Len - 1,
-			      <<?BYTE(VerifyLen), VerifyInfo/binary>> = Info,
-			      VerifyInfo
-		      end,	    
-    dec_hello_extensions(Rest, [{renegotiation_info, 
-			   #renegotiation_info{renegotiated_connection = RenegotiateInfo}} | Acc]);
-
-dec_hello_extensions(<<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen), SRP:SRPLen/binary, Rest/binary>>, Acc)
-  when Len == SRPLen + 2 ->
-    dec_hello_extensions(Rest, [{srp,
-			   #srp{username = SRP}} | 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]);
-
-dec_hello_extensions(<<?UINT16(?ELLIPTIC_CURVES_EXT), ?UINT16(Len),
-		       ExtData:Len/binary, Rest/binary>>, Acc) ->
-    EllipticCurveListLen = Len - 2,
-    <<?UINT16(EllipticCurveListLen), EllipticCurveList/binary>> = ExtData,
-    EllipticCurves = [ssl_tls1:enum_to_oid(X) || <<X:16>> <= EllipticCurveList],
-    dec_hello_extensions(Rest, [{elliptic_curves,
-				 #elliptic_curves{elliptic_curve_list = EllipticCurves}} | Acc]);
-
-dec_hello_extensions(<<?UINT16(?EC_POINT_FORMATS_EXT), ?UINT16(Len),
-		       ExtData:Len/binary, Rest/binary>>, Acc) ->
-    ECPointFormatListLen = Len - 1,
-    <<?BYTE(ECPointFormatListLen), ECPointFormatList/binary>> = ExtData,
-    ECPointFormats = binary_to_list(ECPointFormatList),
-    dec_hello_extensions(Rest, [{ec_point_formats,
-				 #ec_point_formats{ec_point_format_list = ECPointFormats}} | 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.
-dec_hello_extensions(_, Acc) ->
-    Acc.
-
-encrypted_premaster_secret(Secret, RSAPublicKey) -> 
-    try 
-	PreMasterSecret = public_key:encrypt_public(Secret, RSAPublicKey, 
-						    [{rsa_pad, 
-						      rsa_pkcs1_padding}]),
-	#encrypted_premaster_secret{premaster_secret = PreMasterSecret}
-    catch
-	_:_->
-	    throw(?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE))
-    end.
-
-%% encode/decode stream of certificate data to/from list of certificate data 
-certs_to_list(ASN1Certs) ->
-    certs_to_list(ASN1Certs, []).
-
-certs_to_list(<<?UINT24(CertLen), Cert:CertLen/binary, Rest/binary>>, Acc) ->
-    certs_to_list(Rest, [Cert | Acc]);
-certs_to_list(<<>>, Acc) ->
-    lists:reverse(Acc, []).
-
-certs_from_list(ACList) ->
-    list_to_binary([begin
-			CertLen = byte_size(Cert),
-                        <<?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) ->
+enc_handshake(#hello_request{}, _Version) ->
     {?HELLO_REQUEST, <<>>};
-enc_hs(#client_hello{client_version = {Major, Minor},
+enc_handshake(#client_hello{client_version = {Major, Minor},
 		     random = Random,
 		     session_id = SessionID,
 		     cipher_suites = CipherSuites,
 		     compression_methods = CompMethods, 
-		     renegotiation_info = RenegotiationInfo,
-		     srp = SRP,
-		     hash_signs = HashSigns,
-		     ec_point_formats = EcPointFormats,
-		     elliptic_curves = EllipticCurves,
-		     next_protocol_negotiation = NextProtocolNegotiation}, _Version) ->
+		     extensions = HelloExtensions}, _Version) ->
     SIDLength = byte_size(SessionID),
     BinCompMethods = list_to_binary(CompMethods),
     CmLength = byte_size(BinCompMethods),
     BinCipherSuites = list_to_binary(CipherSuites),
     CsLength = byte_size(BinCipherSuites),
-    Extensions0 = hello_extensions(RenegotiationInfo, SRP, NextProtocolNegotiation)
-	++ ec_hello_extensions(lists:map(fun ssl_cipher:suite_definition/1, CipherSuites), EcPointFormats)
-	++ ec_hello_extensions(lists:map(fun ssl_cipher:suite_definition/1, CipherSuites), EllipticCurves),
-    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>>};
-
-enc_hs(#server_hello{server_version = {Major, Minor},
-		     random = Random,
-		     session_id = Session_ID,
-		     cipher_suite = CipherSuite,
-		     compression_method = Comp_method,
-		     renegotiation_info = RenegotiationInfo,
-		     ec_point_formats = EcPointFormats,
-		     elliptic_curves = EllipticCurves,
-		     next_protocol_negotiation = NextProtocolNegotiation}, _Version) ->
-    SID_length = byte_size(Session_ID),
-    CipherSuites = [ssl_cipher:suite_definition(CipherSuite)],
-    Extensions  = hello_extensions(RenegotiationInfo, NextProtocolNegotiation)
-	++ ec_hello_extensions(CipherSuites, EcPointFormats)
-	++ ec_hello_extensions(CipherSuites, EllipticCurves),
-    ExtensionsBin = enc_hello_extensions(Extensions),
-    {?SERVER_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
-		     ?BYTE(SID_length), Session_ID/binary,
-                     CipherSuite/binary, ?BYTE(Comp_method), ExtensionsBin/binary>>};
-enc_hs(#certificate{asn1_certificates = ASN1CertList}, _Version) ->
-    ASN1Certs = certs_from_list(ASN1CertList),
-    ACLen = erlang:iolist_size(ASN1Certs),
-    {?CERTIFICATE, <<?UINT24(ACLen), ASN1Certs:ACLen/binary>>};
-enc_hs(#server_key_exchange{exchange_keys = Keys}, _Version) ->
-    {?SERVER_KEY_EXCHANGE, Keys};
-enc_hs(#server_key_params{params_bin = Keys, hashsign = HashSign,
-			  signature = Signature}, Version) ->
-    EncSign = enc_sign(HashSign, Signature, Version),
-    {?SERVER_KEY_EXCHANGE, <<Keys/binary, EncSign/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}, 
-       _Version) ->
-    CertTypesLen = byte_size(CertTypes),
-    CertAuthsLen = byte_size(CertAuths),
-    {?CERTIFICATE_REQUEST,
-       <<?BYTE(CertTypesLen), CertTypes/binary,
-	?UINT16(CertAuthsLen), CertAuths/binary>>
-    };
-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, hashsign_algorithm = HashSign}, Version) ->
-    EncSig = enc_sign(HashSign, BinSig, Version),
-    {?CERTIFICATE_VERIFY, EncSig};
-enc_hs(#finished{verify_data = VerifyData}, _Version) ->
-    {?FINISHED, VerifyData}.
-
-enc_cke(#encrypted_premaster_secret{premaster_secret = PKEPMS},{3, 0}) ->
-    PKEPMS;
-enc_cke(#encrypted_premaster_secret{premaster_secret = PKEPMS}, _) ->
-    PKEPMSLen = byte_size(PKEPMS),
-    <<?UINT16(PKEPMSLen), PKEPMS/binary>>;
-enc_cke(#client_diffie_hellman_public{dh_public = DHPublic}, _) ->
-    Len = byte_size(DHPublic),
-    <<?UINT16(Len), DHPublic/binary>>;
-enc_cke(#client_ec_diffie_hellman_public{dh_public = DHPublic}, _) ->
-    Len = byte_size(DHPublic),
-    <<?BYTE(Len), DHPublic/binary>>;
-enc_cke(#client_psk_identity{identity = undefined}, _) ->
-    Id = <<"psk_identity">>,
-    Len = byte_size(Id),
-    <<?UINT16(Len), Id/binary>>;
-enc_cke(#client_psk_identity{identity = Id}, _) ->
-    Len = byte_size(Id),
-    <<?UINT16(Len), Id/binary>>;
-enc_cke(Identity = #client_dhe_psk_identity{identity = undefined}, Version) ->
-    enc_cke(Identity#client_dhe_psk_identity{identity = <<"psk_identity">>}, Version);
-enc_cke(#client_dhe_psk_identity{identity = Id, dh_public = DHPublic}, _) ->
-    Len = byte_size(Id),
-    DHLen = byte_size(DHPublic),
-    <<?UINT16(Len), Id/binary, ?UINT16(DHLen), DHPublic/binary>>;
-enc_cke(Identity = #client_rsa_psk_identity{identity = undefined}, Version) ->
-    enc_cke(Identity#client_rsa_psk_identity{identity = <<"psk_identity">>}, Version);
-enc_cke(#client_rsa_psk_identity{identity = Id, exchange_keys = ExchangeKeys}, Version) ->
-    EncPMS = enc_cke(ExchangeKeys, Version),
-    Len = byte_size(Id),
-    <<?UINT16(Len), Id/binary, EncPMS/binary>>;
-enc_cke(#client_srp_public{srp_a = A}, _) ->
-    Len = byte_size(A),
-    <<?UINT16(Len), A/binary>>.
-
-enc_server_key(#server_dh_params{dh_p = P, dh_g = G, dh_y = Y}) ->
-    PLen = byte_size(P),
-    GLen = byte_size(G),
-    YLen = byte_size(Y),
-    <<?UINT16(PLen), P/binary, ?UINT16(GLen), G/binary, ?UINT16(YLen), Y/binary>>;
-enc_server_key(#server_ecdh_params{curve = {namedCurve, ECCurve}, public = ECPubKey}) ->
-    %%TODO: support arbitrary keys
-    KLen = size(ECPubKey),
-    <<?BYTE(?NAMED_CURVE_TYPE), ?UINT16((ssl_tls1:oid_to_enum(ECCurve))),
-      ?BYTE(KLen), ECPubKey/binary>>;
-enc_server_key(#server_psk_params{hint = PskIdentityHint}) ->
-    Len = byte_size(PskIdentityHint),
-    <<?UINT16(Len), PskIdentityHint/binary>>;
-enc_server_key(Params = #server_dhe_psk_params{hint = undefined}) ->
-    enc_server_key(Params#server_dhe_psk_params{hint = <<>>});
-enc_server_key(#server_dhe_psk_params{
-		  hint = PskIdentityHint,
-		  dh_params = #server_dh_params{dh_p = P, dh_g = G, dh_y = Y}}) ->
-    Len = byte_size(PskIdentityHint),
-    PLen = byte_size(P),
-    GLen = byte_size(G),
-    YLen = byte_size(Y),
-    <<?UINT16(Len), PskIdentityHint/binary,
-      ?UINT16(PLen), P/binary, ?UINT16(GLen), G/binary, ?UINT16(YLen), Y/binary>>;
-enc_server_key(#server_srp_params{srp_n = N, srp_g = G,	srp_s = S, srp_b = B}) ->
-    NLen = byte_size(N),
-    GLen = byte_size(G),
-    SLen = byte_size(S),
-    BLen = byte_size(B),
-    <<?UINT16(NLen), N/binary, ?UINT16(GLen), G/binary,
-      ?BYTE(SLen), S/binary, ?UINT16(BLen), B/binary>>.
-
-enc_sign({_, anon}, _Sign, _Version) ->
-    <<>>;
-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>>.
-
-
-ec_hello_extensions(CipherSuites, #elliptic_curves{} = Info) ->
-    case advertises_ec_ciphers(CipherSuites) of
-	true ->
-	    [Info];
-	false ->
-	    []
-    end;
-ec_hello_extensions(CipherSuites, #ec_point_formats{} = Info) ->
-    case advertises_ec_ciphers(CipherSuites) of
-	true ->
-	    [Info];
-	false ->
-	    []
-    end;
-ec_hello_extensions(_, undefined) ->
-    [].
-
-hello_extensions(RenegotiationInfo, NextProtocolNegotiation) ->
-    hello_extensions(RenegotiationInfo) ++ next_protocol_extension(NextProtocolNegotiation).
-
-hello_extensions(RenegotiationInfo, SRP, NextProtocolNegotiation) ->
-    hello_extensions(RenegotiationInfo)
-	++ hello_extensions(SRP)
-	++ next_protocol_extension(NextProtocolNegotiation).
-
-advertises_ec_ciphers([]) ->
-    false;
-advertises_ec_ciphers([{ecdh_ecdsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdhe_ecdsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdh_rsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdhe_rsa, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([{ecdh_anon, _,_,_} | _]) ->
-    true;
-advertises_ec_ciphers([_| Rest]) ->
-    advertises_ec_ciphers(Rest).
+    ExtensionsBin = ssl_handshake:encode_hello_extensions(HelloExtensions),
 
-%% Renegotiation info
-hello_extensions(#renegotiation_info{renegotiated_connection = undefined}) ->
-    [];
-hello_extensions(#renegotiation_info{} = Info) ->
-    [Info];
-hello_extensions(#srp{} = Info) ->
-    [Info];
-hello_extensions(#hash_sign_algos{} = Info) ->
-    [Info];
-hello_extensions(undefined) ->
-    [].
+    {?CLIENT_HELLO, <<?BYTE(Major), ?BYTE(Minor), Random:32/binary,
+		      ?BYTE(SIDLength), SessionID/binary,
+		      ?UINT16(CsLength), BinCipherSuites/binary,
+		      ?BYTE(CmLength), BinCompMethods/binary, ExtensionsBin/binary>>};
 
-next_protocol_extension(undefined) ->
-    [];
-next_protocol_extension(#next_protocol_negotiation{} = Info) ->
-    [Info].
+enc_handshake(HandshakeMsg, Version) ->
+    ssl_handshake:encode_handshake(HandshakeMsg, Version).
 
-enc_hello_extensions(Extensions) ->
-    enc_hello_extensions(Extensions, <<>>).
-enc_hello_extensions([], <<>>) ->
-    <<>>;
-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>>);
-
-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([#elliptic_curves{elliptic_curve_list = EllipticCurves} | Rest], Acc) ->
-    EllipticCurveList = << <<(ssl_tls1:oid_to_enum(X)):16>> || X <- EllipticCurves>>,
-    ListLen = byte_size(EllipticCurveList),
-    Len = ListLen + 2,
-    enc_hello_extensions(Rest, <<?UINT16(?ELLIPTIC_CURVES_EXT),
-				 ?UINT16(Len), ?UINT16(ListLen), EllipticCurveList/binary, Acc/binary>>);
-enc_hello_extensions([#ec_point_formats{ec_point_format_list = ECPointFormats} | Rest], Acc) ->
-    ECPointFormatList = list_to_binary(ECPointFormats),
-    ListLen = byte_size(ECPointFormatList),
-    Len = ListLen + 1,
-    enc_hello_extensions(Rest, <<?UINT16(?EC_POINT_FORMATS_EXT),
-				 ?UINT16(Len), ?BYTE(ListLen), ECPointFormatList/binary, Acc/binary>>);
-enc_hello_extensions([#srp{username = UserName} | Rest], Acc) ->
-    SRPLen = byte_size(UserName),
-    Len = SRPLen + 2,
-    enc_hello_extensions(Rest, <<?UINT16(?SRP_EXT), ?UINT16(Len), ?BYTE(SRPLen), UserName/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, []).
-
-from_3bytes(<<>>, Acc) ->
-    lists:reverse(Acc);
-from_3bytes(<<?UINT24(N), Rest/binary>>, Acc) ->
-    from_3bytes(Rest, [?uint16(N) | Acc]).
-
-from_2bytes(Bin2) ->
-    from_2bytes(Bin2, []).
-
-from_2bytes(<<>>, Acc) ->
-    lists:reverse(Acc);
-from_2bytes(<<?UINT16(N), Rest/binary>>, Acc) ->
-    from_2bytes(Rest, [?uint16(N) | Acc]).
-
-certificate_types({KeyExchange, _, _, _})  
-  when KeyExchange == rsa;
-       KeyExchange == dhe_dss;
-       KeyExchange == dhe_rsa;
-       KeyExchange == ecdhe_rsa ->
-    <<?BYTE(?RSA_SIGN), ?BYTE(?DSS_SIGN)>>;
-
-certificate_types({KeyExchange, _, _, _})
-  when KeyExchange == dh_ecdsa;
-       KeyExchange == dhe_ecdsa ->
-    <<?BYTE(?ECDSA_SIGN)>>;
-
-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}) ->
-		  OTPSubj = TBSCert#'OTPTBSCertificate'.subject,
-		  DNEncodedBin = public_key:pkix_encode('Name', OTPSubj, otp),
-		  DNEncodedLen = byte_size(DNEncodedBin),
-		  <<?UINT16(DNEncodedLen), DNEncodedBin/binary>>
-	  end,
-    list_to_binary([Enc(Cert) || {_, Cert} <- Authorities]).
-
-certificate_authorities_from_db(CertDbHandle, CertDbRef) ->
-    ConnectionCerts = fun({{Ref, _, _}, Cert}, Acc) when Ref  == CertDbRef ->
-			      [Cert | Acc];
-			 (_, Acc) ->
-			      Acc
-		      end,
-    ssl_pkix_db:foldl(ConnectionCerts, [], CertDbHandle).
-
-
-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}, HashAlgo, Key);
-digitally_signed(_Version, Hash, _HashAlgo, #'RSAPrivateKey'{} = Key) ->
-    public_key:encrypt_private(Hash, Key,
-			       [{rsa_pad, rsa_pkcs1_padding}]);
-digitally_signed(_Version, Hash, HashAlgo, Key) ->
-    public_key:sign({digest, Hash}, HashAlgo, Key).
-
-calc_master_secret({3,0}, _PrfAlgo, PremasterSecret, ClientRandom, ServerRandom) ->
-    ssl_ssl3: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}, _PrfAlgo, MasterSecret,
-	   ServerRandom, ClientRandom, HashSize, KML, EKML, IVS) ->
-    ssl_ssl3:setup_keys(MasterSecret, ServerRandom,
-			ClientRandom, HashSize, KML, EKML, IVS);
-
-setup_keys({3,N}, PrfAlgo, MasterSecret,
-	   ServerRandom, ClientRandom, HashSize, KML, _EKML, IVS) ->
-    ssl_tls1:setup_keys(N, PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
-			KML, IVS).
-
-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}, 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;
-key_exchange_alg(Alg) when Alg == dhe_rsa; Alg == dhe_dss;
-			    Alg == dh_dss; Alg == dh_rsa; Alg == dh_anon ->
-    ?KEY_EXCHANGE_DIFFIE_HELLMAN;
-key_exchange_alg(Alg) when Alg == ecdhe_rsa; Alg == ecdh_rsa;
-			   Alg == ecdhe_ecdsa; Alg == ecdh_ecdsa;
-			   Alg == ecdh_anon ->
-    ?KEY_EXCHANGE_EC_DIFFIE_HELLMAN;
-key_exchange_alg(psk) ->
-    ?KEY_EXCHANGE_PSK;
-key_exchange_alg(dhe_psk) ->
-    ?KEY_EXCHANGE_DHE_PSK;
-key_exchange_alg(rsa_psk) ->
-    ?KEY_EXCHANGE_RSA_PSK;
-key_exchange_alg(Alg)
-  when Alg == srp_rsa; Alg == srp_dss; Alg == srp_anon ->
-    ?KEY_EXCHANGE_SRP;
-key_exchange_alg(_) ->
-    ?NULL.
-
-apply_user_fun(Fun, OtpCert, ExtensionOrError, UserState0, SslState) ->
-    case Fun(OtpCert, ExtensionOrError, UserState0) of
-	{valid, UserState} ->
-	    {valid, {SslState, UserState}};
-	{fail, _} = Fail ->
-	    Fail;
-	{unknown, UserState} ->
-	    {unknown, {SslState, UserState}}
+handle_client_hello_extensions(Version, Type, Random, CipherSuites,
+			HelloExt, SslOpts, Session0, ConnectionStates0, Renegotiation) ->
+    try ssl_handshake:handle_client_hello_extensions(tls_record, Random, CipherSuites,
+						     HelloExt, Version, SslOpts,
+						     Session0, ConnectionStates0, Renegotiation) of
+	{Session, ConnectionStates, ServerHelloExt} ->
+	    {Version, {Type, Session}, ConnectionStates, ServerHelloExt}
+    catch throw:Alert ->
+	    Alert
     end.
 
--define(TLSEXT_SIGALG_RSA(MD), {MD, rsa}).
--define(TLSEXT_SIGALG_DSA(MD), {MD, dsa}).
--define(TLSEXT_SIGALG_ECDSA(MD), {MD, ecdsa}).
-
--define(TLSEXT_SIGALG(MD), ?TLSEXT_SIGALG_ECDSA(MD), ?TLSEXT_SIGALG_RSA(MD)).
 
-default_hash_signs() ->
-    HashSigns = [?TLSEXT_SIGALG(sha512),
-		 ?TLSEXT_SIGALG(sha384),
-		 ?TLSEXT_SIGALG(sha256),
-		 ?TLSEXT_SIGALG(sha224),
-		 ?TLSEXT_SIGALG(sha),
-		 ?TLSEXT_SIGALG_DSA(sha),
-		 ?TLSEXT_SIGALG_RSA(md5)],
-    CryptoSupport = proplists:get_value(public_keys, crypto:supports()),
-    HasECC = proplists:get_bool(ecdsa, CryptoSupport),
-    #hash_sign_algos{hash_sign_algos =
-			 lists:filter(fun({_, ecdsa}) -> HasECC;
-					 (_) -> true end, HashSigns)}.
-
-handle_hello_extensions(#client_hello{random = Random,
-				      cipher_suites = CipherSuites,
-				      renegotiation_info = Info,
-				      srp = SRP,
-				      ec_point_formats = EcPointFormats0,
-				      elliptic_curves = EllipticCurves0} = Hello, Version,
-			#ssl_options{secure_renegotiate = SecureRenegotation} = Opts,
-			Session0, ConnectionStates0, Renegotiation) ->
-    Session = handle_srp_extension(SRP, Session0),
-    ConnectionStates = handle_renegotiation_extension(Version, Info, Random, Session, ConnectionStates0,
-						      Renegotiation, SecureRenegotation, CipherSuites),
-    ProtocolsToAdvertise = handle_next_protocol_extension(Hello, Renegotiation, Opts),
-    {EcPointFormats, EllipticCurves} = handle_ecc_extensions(Version, EcPointFormats0, EllipticCurves0),
-    %%TODO make extensions compund data structure
-    {Session, ConnectionStates, ProtocolsToAdvertise, EcPointFormats, EllipticCurves}.
-
-
-handle_renegotiation_extension(Version, Info, Random, #session{cipher_suite = CipherSuite,
-							       compression_method = Compression},
-			       ConnectionStates0, Renegotiation, SecureRenegotation, CipherSuites) ->
-    case handle_renegotiation_info(server, Info, ConnectionStates0,
-				   Renegotiation, SecureRenegotation,
-				   CipherSuites) of
-	{ok, ConnectionStates1} ->
-	    hello_pending_connection_states(server,
-					    Version,
-					    CipherSuite,
-					    Random,
-					    Compression,
-					    ConnectionStates1);
+handle_server_hello_extensions(Version, SessionId, Random, CipherSuite,
+			Compression, HelloExt, SslOpt, ConnectionStates0, Renegotiation) ->
+    case ssl_handshake:handle_server_hello_extensions(tls_record, Random, CipherSuite,
+						      Compression, HelloExt, Version,
+						      SslOpt, ConnectionStates0, Renegotiation) of
 	#alert{} = Alert ->
-	    throw(Alert)
+	    Alert;
+	{ConnectionStates, Protocol} ->
+	    {Version, SessionId, ConnectionStates, Protocol}
     end.
 
-handle_next_protocol_extension(Hello, Renegotiation, SslOpts)->
-    case handle_next_protocol_on_server(Hello, Renegotiation, SslOpts) of
-	#alert{} = Alert ->
-	    throw(Alert);
-	ProtocolsToAdvertise ->
-	    ProtocolsToAdvertise
-    end.
-
-handle_srp_extension(undefined, Session) ->
-    Session;
-handle_srp_extension(#srp{username = Username}, Session) ->
-    Session#session{srp_username = Username}.
-
-int_to_bin(I) ->
-    L = (length(integer_to_list(I, 16)) + 1) div 2,
-    <<I:(L*8)>>.
diff --git a/lib/ssl/src/tls_handshake.hrl b/lib/ssl/src/tls_handshake.hrl
index abf1b5abb6..dbe930cb90 100644
--- a/lib/ssl/src/tls_handshake.hrl
+++ b/lib/ssl/src/tls_handshake.hrl
@@ -34,12 +34,9 @@
 	  cipher_suites,       % cipher_suites<2..2^16-1>
 	  compression_methods, % compression_methods<1..2^8-1>,
 	  %% Extensions
-	  renegotiation_info,
-	  hash_signs,          % supported combinations of hashes/signature algos
-	  next_protocol_negotiation = undefined, % [binary()]
-	  srp,
-	  ec_point_formats,
-	  elliptic_curves
+	  extensions
 	 }).
 
+-type tls_handshake() :: #client_hello{} | ssl_handshake().
+
 -endif. % -ifdef(tls_handshake).
diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl
index 1409a04763..8c0c4f3c91 100644
--- a/lib/ssl/src/tls_record.erl
+++ b/lib/ssl/src/tls_record.erl
@@ -19,8 +19,7 @@
 
 %%
 %%----------------------------------------------------------------------
-%% Purpose: Help functions for handling the SSL-Record protocol 
-%% 
+%% Purpose: Handle TLS/SSL record protocol. (Parts that are not shared with DTLS)
 %%----------------------------------------------------------------------
 
 -module(tls_record).
@@ -31,282 +30,27 @@
 -include("tls_handshake.hrl").
 -include("ssl_cipher.hrl").
 
-%% Connection state handling
--export([init_connection_states/1, 
-         current_connection_state/2, pending_connection_state/2,
-         update_security_params/3,
-         set_mac_secret/4,
-	 set_master_secret/2, 
-         activate_pending_connection_state/2,
-         set_pending_cipher_state/4,
-	 set_renegotiation_flag/2,
-	 set_client_verify_data/3,
-	 set_server_verify_data/3]).
-
 %% Handling of incoming data
 -export([get_tls_records/2]).
 
-%% Encoding records
--export([encode_handshake/3, encode_alert_record/3,
-	 encode_change_cipher_spec/2, encode_data/3]).
-
 %% Decoding
 -export([decode_cipher_text/2]).
 
-%% Misc.
+%% Encoding
+-export([encode_plain_text/4]).
+
+%% Protocol version handling
 -export([protocol_version/1, lowest_protocol_version/2,
 	 highest_protocol_version/1, supported_protocol_versions/0,
 	 is_acceptable_version/1, is_acceptable_version/2]).
 
--export([compressions/0]).
-
 -compile(inline).
 
--define(INITIAL_BYTES, 5).
-
 %%====================================================================
 %% Internal application API
 %%====================================================================
 
 %%--------------------------------------------------------------------
--spec init_connection_states(client | server) -> #connection_states{}.
-%%
-%% Description: Creates a connection_states record with appropriate
-%% values for the initial SSL connection setup. 
-%%--------------------------------------------------------------------
-init_connection_states(Role) ->
-    ConnectionEnd = record_protocol_role(Role),
-    Current = initial_connection_state(ConnectionEnd),
-    Pending = empty_connection_state(ConnectionEnd),
-    #connection_states{current_read = Current,
-		       pending_read = Pending,
-		       current_write = Current,
-		       pending_write = Pending
-                      }.
-
-%%--------------------------------------------------------------------
--spec current_connection_state(#connection_states{}, read | write) ->
-				      #connection_state{}.
-%%
-%% Description: Returns the instance of the connection_state record
-%% that is currently defined as the current conection state.
-%%--------------------------------------------------------------------  
-current_connection_state(#connection_states{current_read = Current},
-			 read) ->
-    Current;
-current_connection_state(#connection_states{current_write = Current},
-			 write) ->
-    Current.
-
-%%--------------------------------------------------------------------
--spec pending_connection_state(#connection_states{}, read | write) ->
-				      #connection_state{}.
-%%
-%% Description: Returns the instance of the connection_state record
-%% that is currently defined as the pending conection state.
-%%--------------------------------------------------------------------  
-pending_connection_state(#connection_states{pending_read = Pending},    
-			 read) ->
-    Pending;
-pending_connection_state(#connection_states{pending_write = Pending},
-			 write) ->
-    Pending.
-
-%%--------------------------------------------------------------------
--spec update_security_params(#security_parameters{}, #security_parameters{},
-			     #connection_states{}) -> #connection_states{}.
-%%
-%% Description: Creates a new instance of the connection_states record
-%% where the pending states gets its security parameters updated.
-%%--------------------------------------------------------------------  
-update_security_params(ReadParams, WriteParams, States = 
-		       #connection_states{pending_read = Read,
-					  pending_write = Write}) -> 
-    States#connection_states{pending_read =
-                             Read#connection_state{security_parameters = 
-                                                   ReadParams},
-                             pending_write = 
-                             Write#connection_state{security_parameters = 
-                                                    WriteParams}
-                            }.
-%%--------------------------------------------------------------------
--spec set_mac_secret(binary(), binary(), client | server, 
-			#connection_states{}) -> #connection_states{}.			       
-%%
-%% Description: update the mac_secret field in pending connection states
-%%--------------------------------------------------------------------
-set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, client, States) ->
-    set_mac_secret(ServerWriteMacSecret, ClientWriteMacSecret, States);
-set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, server, States) ->
-    set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, States).
-
-set_mac_secret(ReadMacSecret, WriteMacSecret,
-	       States = #connection_states{pending_read = Read,
-					   pending_write = Write}) ->
-    States#connection_states{
-      pending_read = Read#connection_state{mac_secret = ReadMacSecret},
-      pending_write = Write#connection_state{mac_secret = WriteMacSecret}
-     }.
-
-
-%%--------------------------------------------------------------------
--spec set_master_secret(binary(), #connection_states{}) -> #connection_states{}.
-%%
-%% Description: Set master_secret in pending connection states
-%%--------------------------------------------------------------------
-set_master_secret(MasterSecret,
-                  States = #connection_states{pending_read = Read,
-                                              pending_write = Write}) -> 
-    ReadSecPar = Read#connection_state.security_parameters,
-    Read1 = Read#connection_state{
-              security_parameters = ReadSecPar#security_parameters{
-                                      master_secret = MasterSecret}},
-    WriteSecPar = Write#connection_state.security_parameters,
-    Write1 = Write#connection_state{
-               security_parameters = WriteSecPar#security_parameters{
-                                       master_secret = MasterSecret}},
-    States#connection_states{pending_read = Read1, pending_write = Write1}.
-
-%%--------------------------------------------------------------------
--spec set_renegotiation_flag(boolean(), #connection_states{}) -> #connection_states{}.
-%%
-%% Description: Set secure_renegotiation in pending connection states
-%%--------------------------------------------------------------------
-set_renegotiation_flag(Flag, #connection_states{
-			 current_read = CurrentRead0,
-			 current_write = CurrentWrite0,
-			 pending_read = PendingRead0,
-			 pending_write = PendingWrite0} 
-		       = ConnectionStates) ->
-    CurrentRead = CurrentRead0#connection_state{secure_renegotiation = Flag},
-    CurrentWrite = CurrentWrite0#connection_state{secure_renegotiation = Flag},
-    PendingRead = PendingRead0#connection_state{secure_renegotiation = Flag},
-    PendingWrite = PendingWrite0#connection_state{secure_renegotiation = Flag},
-    ConnectionStates#connection_states{current_read = CurrentRead, 
-				       current_write = CurrentWrite, 
-				       pending_read = PendingRead, 
-				       pending_write = PendingWrite}.
-
-%%--------------------------------------------------------------------
--spec set_client_verify_data(current_read | current_write | current_both,
-			     binary(), #connection_states{})->
-				    #connection_states{}.
-%%
-%% Description: Set verify data in connection states.                 
-%%--------------------------------------------------------------------
-set_client_verify_data(current_read, Data, 
-		       #connection_states{current_read = CurrentRead0,
-					  pending_write = PendingWrite0} 
-		       = ConnectionStates) ->
-    CurrentRead = CurrentRead0#connection_state{client_verify_data = Data},
-    PendingWrite = PendingWrite0#connection_state{client_verify_data = Data},
-    ConnectionStates#connection_states{current_read = CurrentRead,
-				       pending_write = PendingWrite};
-set_client_verify_data(current_write, Data, 
-		       #connection_states{pending_read = PendingRead0,
-					  current_write = CurrentWrite0} 
-		       = ConnectionStates) ->
-    PendingRead = PendingRead0#connection_state{client_verify_data = Data},
-    CurrentWrite = CurrentWrite0#connection_state{client_verify_data = Data},
-    ConnectionStates#connection_states{pending_read = PendingRead,
-				       current_write = CurrentWrite};
-set_client_verify_data(current_both, Data, 
-		       #connection_states{current_read = CurrentRead0,
-					  current_write = CurrentWrite0} 
-		       = ConnectionStates) ->
-    CurrentRead = CurrentRead0#connection_state{client_verify_data = Data},
-    CurrentWrite = CurrentWrite0#connection_state{client_verify_data = Data},
-    ConnectionStates#connection_states{current_read = CurrentRead,
-				       current_write = CurrentWrite}.
-%%--------------------------------------------------------------------
--spec set_server_verify_data(current_read | current_write | current_both,
-			     binary(), #connection_states{})->
-				    #connection_states{}.
-%%
-%% Description: Set verify data in pending connection states.
-%%--------------------------------------------------------------------
-set_server_verify_data(current_write, Data, 
-		       #connection_states{pending_read = PendingRead0,
-					  current_write = CurrentWrite0} 
-		       = ConnectionStates) ->
-    PendingRead = PendingRead0#connection_state{server_verify_data = Data},
-    CurrentWrite = CurrentWrite0#connection_state{server_verify_data = Data},
-    ConnectionStates#connection_states{pending_read = PendingRead,
-				       current_write = CurrentWrite};
-
-set_server_verify_data(current_read, Data, 
-		       #connection_states{current_read = CurrentRead0,
-					  pending_write = PendingWrite0} 
-		       = ConnectionStates) ->
-    CurrentRead = CurrentRead0#connection_state{server_verify_data = Data},
-    PendingWrite = PendingWrite0#connection_state{server_verify_data = Data},
-    ConnectionStates#connection_states{current_read = CurrentRead,
-				       pending_write = PendingWrite};
-
-set_server_verify_data(current_both, Data, 
-		       #connection_states{current_read = CurrentRead0,
-					  current_write = CurrentWrite0} 
-		       = ConnectionStates) ->
-    CurrentRead = CurrentRead0#connection_state{server_verify_data = Data},
-    CurrentWrite = CurrentWrite0#connection_state{server_verify_data = Data},
-    ConnectionStates#connection_states{current_read = CurrentRead,
-				       current_write = CurrentWrite}.
-
-%%--------------------------------------------------------------------
--spec activate_pending_connection_state(#connection_states{}, read | write) ->
-					       #connection_states{}.
-%%
-%% Description: Creates a new instance of the connection_states record
-%% where the pending state of <Type> has been activated. 
-%%--------------------------------------------------------------------
-activate_pending_connection_state(States = 
-                                  #connection_states{pending_read = Pending},
-                                  read) ->
-    NewCurrent = Pending#connection_state{sequence_number = 0},
-    SecParams = Pending#connection_state.security_parameters,
-    ConnectionEnd = SecParams#security_parameters.connection_end,
-    EmptyPending = empty_connection_state(ConnectionEnd),
-    SecureRenegotation = NewCurrent#connection_state.secure_renegotiation,
-    NewPending = EmptyPending#connection_state{secure_renegotiation = SecureRenegotation},
-    States#connection_states{current_read = NewCurrent,
-                             pending_read = NewPending
-                            };
-
-activate_pending_connection_state(States = 
-                                  #connection_states{pending_write = Pending},
-                                  write) ->
-    NewCurrent = Pending#connection_state{sequence_number = 0},
-    SecParams = Pending#connection_state.security_parameters,
-    ConnectionEnd = SecParams#security_parameters.connection_end,
-    EmptyPending = empty_connection_state(ConnectionEnd),
-    SecureRenegotation = NewCurrent#connection_state.secure_renegotiation,
-    NewPending = EmptyPending#connection_state{secure_renegotiation = SecureRenegotation},
-    States#connection_states{current_write = NewCurrent,
-                             pending_write = NewPending
-                            }.
-
-%%--------------------------------------------------------------------
--spec set_pending_cipher_state(#connection_states{}, #cipher_state{},
-			       #cipher_state{}, client | server) ->
-				      #connection_states{}.
-%%
-%% Description: Set the cipher state in the specified pending connection state.
-%%--------------------------------------------------------------------
-set_pending_cipher_state(#connection_states{pending_read = Read,
-                                            pending_write = Write} = States,
-                         ClientState, ServerState, server) ->
-    States#connection_states{
-        pending_read = Read#connection_state{cipher_state = ClientState},
-        pending_write = Write#connection_state{cipher_state = ServerState}};
-
-set_pending_cipher_state(#connection_states{pending_read = Read,
-                                            pending_write = Write} = States,
-                         ClientState, ServerState, client) ->
-    States#connection_states{
-        pending_read = Read#connection_state{cipher_state = ServerState},
-        pending_write = Write#connection_state{cipher_state = ClientState}}.
-
-%%--------------------------------------------------------------------
 -spec get_tls_records(binary(), binary()) -> {[binary()], binary()} | #alert{}.
 %%			     
 %% Description: Given old buffer and new data from TCP, packs up a records
@@ -376,6 +120,50 @@ get_tls_records_aux(Data, Acc) ->
 	false ->
 	    ?ALERT_REC(?FATAL, ?UNEXPECTED_MESSAGE)
 	end.
+
+encode_plain_text(Type, Version, Data,
+		  #connection_states{current_write =
+					 #connection_state{
+					    sequence_number = Seq,
+					    compression_state=CompS0,
+					    security_parameters=
+						#security_parameters{compression_algorithm=CompAlg}
+					   }= WriteState0} = ConnectionStates) ->
+    {Comp, CompS1} = ssl_record:compress(CompAlg, Data, CompS0),
+    WriteState1 = WriteState0#connection_state{compression_state = CompS1},
+    MacHash = calc_mac_hash(Type, Version, Comp, WriteState1),
+    {CipherFragment, WriteState} = ssl_record:cipher(Version, Comp, WriteState1, MacHash),
+    CipherText = encode_tls_cipher_text(Type, Version, CipherFragment),
+    {CipherText, ConnectionStates#connection_states{current_write = WriteState#connection_state{sequence_number = Seq +1}}}.
+
+%%--------------------------------------------------------------------
+-spec decode_cipher_text(#ssl_tls{}, #connection_states{}) ->
+				{#ssl_tls{}, #connection_states{}}| #alert{}.
+%%
+%% Description: Decode cipher text
+%%--------------------------------------------------------------------
+decode_cipher_text(#ssl_tls{type = Type, version = Version,
+			    fragment = CipherFragment} = CipherText, ConnnectionStates0) ->
+    ReadState0 = ConnnectionStates0#connection_states.current_read,
+    #connection_state{compression_state = CompressionS0,
+		      sequence_number = Seq,
+		      security_parameters = SecParams} = ReadState0,
+    CompressAlg = SecParams#security_parameters.compression_algorithm,
+    {PlainFragment, Mac, ReadState1} = ssl_record:decipher(Version, CipherFragment, ReadState0),
+    MacHash = calc_mac_hash(Type, Version, PlainFragment, ReadState1),
+    case ssl_record:is_correct_mac(Mac, MacHash) of
+	true ->
+	    {Plain, CompressionS1} = ssl_record:uncompress(CompressAlg,
+							   PlainFragment, CompressionS0),
+	    ConnnectionStates = ConnnectionStates0#connection_states{
+				  current_read = ReadState1#connection_state{
+						   sequence_number = Seq + 1,
+						   compression_state = CompressionS1}},
+	    {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates};
+	false ->
+	    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
+    end.
+
 %%--------------------------------------------------------------------
 -spec protocol_version(tls_atom_version() | tls_version()) -> 
 			      tls_version() | tls_atom_version().		      
@@ -474,18 +262,18 @@ supported_protocol_versions([_|_] = Vsns) ->
     Vsns.
 
 %%--------------------------------------------------------------------
--spec is_acceptable_version(tls_version()) -> boolean().
--spec is_acceptable_version(tls_version(), Supported :: [tls_version()]) -> boolean().
 %%     
 %% Description: ssl version 2 is not acceptable security risks are too big.
 %% 
 %%--------------------------------------------------------------------
+-spec is_acceptable_version(tls_version()) -> boolean().
 is_acceptable_version({N,_}) 
   when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
     true;
 is_acceptable_version(_) ->
     false.
 
+-spec is_acceptable_version(tls_version(), Supported :: [tls_version()]) -> boolean().
 is_acceptable_version({N,_} = Version, Versions)   
   when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
     lists:member(Version, Versions);
@@ -493,224 +281,36 @@ is_acceptable_version(_,_) ->
     false.
 
 %%--------------------------------------------------------------------
--spec compressions() -> [binary()].
-%%     
-%% Description: return a list of compressions supported (currently none)
-%%--------------------------------------------------------------------
-compressions() ->
-    [?byte(?NULL)].
-
-%%--------------------------------------------------------------------
--spec decode_cipher_text(#ssl_tls{}, #connection_states{}) ->
-				{#ssl_tls{}, #connection_states{}}| #alert{}.
-%%     
-%% Description: Decode cipher text
-%%--------------------------------------------------------------------
-decode_cipher_text(CipherText, ConnnectionStates0) ->
-    ReadState0 = ConnnectionStates0#connection_states.current_read,
-    #connection_state{compression_state = CompressionS0,
-		      security_parameters = SecParams} = ReadState0,
-    CompressAlg = SecParams#security_parameters.compression_algorithm,
-   case decipher(CipherText, ReadState0) of
-       {Compressed, ReadState1} ->
-	   {Plain, CompressionS1} = uncompress(CompressAlg, 
-					       Compressed, CompressionS0),
-	   ConnnectionStates = ConnnectionStates0#connection_states{
-				 current_read = ReadState1#connection_state{
-						  compression_state = CompressionS1}},
-	   {Plain, ConnnectionStates};
-       #alert{} = Alert ->
-	   Alert
-   end.
-%%--------------------------------------------------------------------
--spec encode_data(binary(), tls_version(), #connection_states{}) ->
-			 {iolist(), #connection_states{}}.
-%%
-%% Description: Encodes data to send on the ssl-socket.
-%%--------------------------------------------------------------------
-encode_data(Frag, Version,
-	    #connection_states{current_write = #connection_state{
-				 security_parameters =
-				     #security_parameters{bulk_cipher_algorithm = BCA}}} =
-		ConnectionStates) ->
-    Data = split_bin(Frag, ?MAX_PLAIN_TEXT_LENGTH, Version, BCA),
-    encode_iolist(?APPLICATION_DATA, Data, Version, ConnectionStates).
-
-%%--------------------------------------------------------------------
--spec encode_handshake(iolist(), tls_version(), #connection_states{}) ->
-			      {iolist(), #connection_states{}}.
-%%
-%% Description: Encodes a handshake message to send on the ssl-socket.
-%%--------------------------------------------------------------------
-encode_handshake(Frag, Version, ConnectionStates) ->
-    encode_plain_text(?HANDSHAKE, Version, Frag, ConnectionStates).
-
-%%--------------------------------------------------------------------
--spec encode_alert_record(#alert{}, tls_version(), #connection_states{}) ->
-				 {iolist(), #connection_states{}}.
-%%
-%% Description: Encodes an alert message to send on the ssl-socket.
-%%--------------------------------------------------------------------
-encode_alert_record(#alert{level = Level, description = Description},
-                    Version, ConnectionStates) ->
-    encode_plain_text(?ALERT, Version, <<?BYTE(Level), ?BYTE(Description)>>,
-		      ConnectionStates).
-
-%%--------------------------------------------------------------------
--spec encode_change_cipher_spec(tls_version(), #connection_states{}) ->
-				       {iolist(), #connection_states{}}.
-%%
-%% Description: Encodes a change_cipher_spec-message to send on the ssl socket.
-%%--------------------------------------------------------------------
-encode_change_cipher_spec(Version, ConnectionStates) ->
-    encode_plain_text(?CHANGE_CIPHER_SPEC, Version, <<1:8>>, ConnectionStates).
-
-%%--------------------------------------------------------------------
 %%% Internal functions
 %%--------------------------------------------------------------------
-encode_iolist(Type, Data, Version, ConnectionStates0) ->
-    {ConnectionStates, EncodedMsg} =
-        lists:foldl(fun(Text, {CS0, Encoded}) ->
-			    {Enc, CS1} = encode_plain_text(Type, Version, Text, CS0),
-			    {CS1, [Enc | Encoded]}
-		    end, {ConnectionStates0, []}, Data),
-    {lists:reverse(EncodedMsg), ConnectionStates}.
-
-highest_protocol_version() ->
-    highest_protocol_version(supported_protocol_versions()).
-
-initial_connection_state(ConnectionEnd) ->
-    #connection_state{security_parameters =
-			  initial_security_params(ConnectionEnd),
-                      sequence_number = 0
-                     }.
-
-initial_security_params(ConnectionEnd) ->
-    SecParams = #security_parameters{connection_end = ConnectionEnd,
-				     compression_algorithm = ?NULL},
-    ssl_cipher:security_parameters(highest_protocol_version(), ?TLS_NULL_WITH_NULL_NULL,
-				   SecParams).
-
-empty_connection_state(ConnectionEnd) ->
-    SecParams = empty_security_params(ConnectionEnd),
-    #connection_state{security_parameters = SecParams}.
-
-empty_security_params(ConnectionEnd = ?CLIENT) ->
-    #security_parameters{connection_end = ConnectionEnd,
-                         client_random = random()};
-empty_security_params(ConnectionEnd = ?SERVER) ->
-    #security_parameters{connection_end = ConnectionEnd,
-                         server_random = random()}.
-random() ->
-    Secs_since_1970 = calendar:datetime_to_gregorian_seconds(
-			calendar:universal_time()) - 62167219200,
-    Random_28_bytes = crypto:rand_bytes(28),
-    <<?UINT32(Secs_since_1970), Random_28_bytes/binary>>.
-
-record_protocol_role(client) ->
-    ?CLIENT;
-record_protocol_role(server) ->
-    ?SERVER.
-
-%% 1/n-1 splitting countermeasure Rizzo/Duong-Beast, RC4 chiphers are not vulnerable to this attack.
-split_bin(<<FirstByte:8, Rest/binary>>, ChunkSize, Version, BCA) when BCA =/= ?RC4 andalso ({3, 1} == Version orelse
-											    {3, 0} == Version) ->
-    do_split_bin(Rest, ChunkSize, [[FirstByte]]);
-split_bin(Bin, ChunkSize, _, _) ->
-    do_split_bin(Bin, ChunkSize, []).
-
-do_split_bin(<<>>, _, Acc) ->
-    lists:reverse(Acc);
-do_split_bin(Bin, ChunkSize, Acc) ->
-    case Bin of
-        <<Chunk:ChunkSize/binary, Rest/binary>> ->
-            do_split_bin(Rest, ChunkSize, [Chunk | Acc]);
-        _ ->
-            lists:reverse(Acc, [Bin])
-    end.
-
-encode_plain_text(Type, Version, Data, ConnectionStates) ->
-    #connection_states{current_write=#connection_state{
-			 compression_state=CompS0,
-			 security_parameters=
-			 #security_parameters{compression_algorithm=CompAlg}
-			}=CS0} = ConnectionStates,
-    {Comp, CompS1} = compress(CompAlg, Data, CompS0),
-    CS1 = CS0#connection_state{compression_state = CompS1},
-    {CipherText, CS2} = cipher(Type, Version, Comp, CS1),
-    CTBin = encode_tls_cipher_text(Type, Version, CipherText),
-    {CTBin, ConnectionStates#connection_states{current_write = CS2}}.
-
 encode_tls_cipher_text(Type, {MajVer, MinVer}, Fragment) ->
     Length = erlang:iolist_size(Fragment),
     [<<?BYTE(Type), ?BYTE(MajVer), ?BYTE(MinVer), ?UINT16(Length)>>, Fragment].
 
-cipher(Type, Version, Fragment, CS0) ->
-    Length = erlang:iolist_size(Fragment),
-    {MacHash, CS1=#connection_state{cipher_state = CipherS0,
-				 security_parameters=
-				 #security_parameters{bulk_cipher_algorithm = 
-						      BCA}
-				}} = 
-	hash_and_bump_seqno(CS0, Type, Version, Length, Fragment),
-    {Ciphered, CipherS1} = ssl_cipher:cipher(BCA, CipherS0, MacHash, Fragment, Version),
-    CS2 = CS1#connection_state{cipher_state=CipherS1},
-    {Ciphered, CS2}.
-
-decipher(TLS=#ssl_tls{type=Type, version=Version, fragment=Fragment}, CS0) ->
-    SP = CS0#connection_state.security_parameters,
-    BCA = SP#security_parameters.bulk_cipher_algorithm, 
-    HashSz = SP#security_parameters.hash_size,
-    CipherS0 = CS0#connection_state.cipher_state,
-    case ssl_cipher:decipher(BCA, HashSz, CipherS0, Fragment, Version) of
-	{T, Mac, CipherS1} ->
-	    CS1 = CS0#connection_state{cipher_state = CipherS1},
-	    TLength = size(T),
-	    {MacHash, CS2} = hash_and_bump_seqno(CS1, Type, Version, TLength, T),
-	    case is_correct_mac(Mac, MacHash) of
-		true ->		  
-		    {TLS#ssl_tls{fragment = T}, CS2};
-		false ->
-		    ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC)
-	    end;
-	#alert{} = Alert ->
-	    Alert
-    end.
-
-uncompress(?NULL, Data = #ssl_tls{type = _Type,
-				  version = _Version,
-				  fragment = _Fragment}, CS) ->
-    {Data, CS}.
-
-compress(?NULL, Data, CS) ->
-    {Data, CS}.
-
-hash_and_bump_seqno(#connection_state{sequence_number = SeqNo,
-				      mac_secret = MacSecret,
-				      security_parameters = 
-				      SecPars} = CS0,
-		    Type, Version, Length, Fragment) ->
-    Hash = mac_hash(Version, 
-		    SecPars#security_parameters.mac_algorithm,
-		    MacSecret, SeqNo, Type,
-		    Length, Fragment),
-    {Hash, CS0#connection_state{sequence_number = SeqNo+1}}.
-
-is_correct_mac(Mac, Mac) ->
-    true;
-is_correct_mac(_M,_H) ->
-    false.
 
 mac_hash({_,_}, ?NULL, _MacSecret, _SeqNo, _Type,
 	 _Length, _Fragment) ->
     <<>>;
 mac_hash({3, 0}, MacAlg, MacSecret, SeqNo, Type, Length, Fragment) ->
-    ssl_ssl3:mac_hash(MacAlg, MacSecret, SeqNo, Type, Length, Fragment);
+    ssl_v3:mac_hash(MacAlg, MacSecret, SeqNo, Type, Length, Fragment);
 mac_hash({3, N} = Version, MacAlg, MacSecret, SeqNo, Type, Length, Fragment)  
   when N =:= 1; N =:= 2; N =:= 3 ->
-    ssl_tls1:mac_hash(MacAlg, MacSecret, SeqNo, Type, Version, 
+    tls_v1:mac_hash(MacAlg, MacSecret, SeqNo, Type, Version,
 		      Length, Fragment).
 
+highest_protocol_version() ->
+    highest_protocol_version(supported_protocol_versions()).
+
 sufficient_tlsv1_2_crypto_support() ->
     CryptoSupport = crypto:supports(),
     proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport)).
+
+calc_mac_hash(Type, Version,
+	      PlainFragment, #connection_state{sequence_number = SeqNo,
+					       mac_secret = MacSecret,
+					       security_parameters =
+						   SecPars}) ->
+    Length = erlang:iolist_size(PlainFragment),
+    mac_hash(Version, SecPars#security_parameters.mac_algorithm,
+	     MacSecret, SeqNo, Type,
+	     Length, PlainFragment).
diff --git a/lib/ssl/src/tls_record.hrl b/lib/ssl/src/tls_record.hrl
index c9350fa137..30d7343074 100644
--- a/lib/ssl/src/tls_record.hrl
+++ b/lib/ssl/src/tls_record.hrl
@@ -29,7 +29,6 @@
 -include("ssl_record.hrl"). %% Common TLS and DTLS records and Constantes
 
 %% Used to handle tls_plain_text, tls_compressed and tls_cipher_text
-
 -record(ssl_tls, {   
 	  type,
 	  version, 
diff --git a/lib/ssl/src/ssl_tls1.erl b/lib/ssl/src/tls_v1.erl
index 8ab66d0627..7c7fdd64c3 100644
--- a/lib/ssl/src/ssl_tls1.erl
+++ b/lib/ssl/src/tls_v1.erl
@@ -22,7 +22,7 @@
 %% Purpose: Handles tls1 encryption.
 %%----------------------------------------------------------------------
 
--module(ssl_tls1).
+-module(tls_v1).
 
 -include("ssl_cipher.hrl").
 -include("ssl_internal.hrl").
@@ -86,7 +86,7 @@ certificate_verify(HashAlgo, _Version, Handshake) ->
 
 -spec setup_keys(integer(), integer(), binary(), binary(), binary(), integer(),
 		 integer(), integer()) -> {binary(), binary(), binary(),
-					  binary(), binary(), binary()}.  
+					  binary(), binary(), binary()}.
 
 setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
 	   KeyMatLen, IVSize)
@@ -106,7 +106,7 @@ setup_keys(Version, _PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize
     WantedLength = 2 * (HashSize + KeyMatLen + IVSize),
     KeyBlock = prf(?MD5SHA, MasterSecret, "key expansion",
 		   [ServerRandom, ClientRandom], WantedLength),
-    <<ClientWriteMacSecret:HashSize/binary, 
+    <<ClientWriteMacSecret:HashSize/binary,
      ServerWriteMacSecret:HashSize/binary,
      ClientWriteKey:KeyMatLen/binary, ServerWriteKey:KeyMatLen/binary,
      ClientIV:IVSize/binary, ServerIV:IVSize/binary>> = KeyBlock,
@@ -167,22 +167,22 @@ setup_keys(Version, PrfAlgo, MasterSecret, ServerRandom, ClientRandom, HashSize,
      ServerWriteKey, ClientIV, ServerIV}.
 
 -spec mac_hash(integer(), binary(), integer(), integer(), tls_version(),
-	       integer(), binary()) -> binary(). 
+	       integer(), binary()) -> binary().
 
-mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor}, 
+mac_hash(Method, Mac_write_secret, Seq_num, Type, {Major, Minor},
 	 Length, Fragment) ->
     %% RFC 2246 & 4346 - 6.2.3.1.
     %% HMAC_hash(MAC_write_secret, seq_num + TLSCompressed.type +
     %%              TLSCompressed.version + TLSCompressed.length +
     %%              TLSCompressed.fragment));
-    Mac = hmac_hash(Method, Mac_write_secret, 
-		    [<<?UINT64(Seq_num), ?BYTE(Type), 
-		      ?BYTE(Major), ?BYTE(Minor), ?UINT16(Length)>>, 
+    Mac = hmac_hash(Method, Mac_write_secret,
+		    [<<?UINT64(Seq_num), ?BYTE(Type),
+		      ?BYTE(Major), ?BYTE(Minor), ?UINT16(Length)>>,
 		     Fragment]),
     Mac.
 
 -spec suites(1|2|3) -> [cipher_suite()].
-    
+
 suites(Minor) when Minor == 1; Minor == 2->
     case sufficent_ec_support() of
 	true ->
@@ -199,8 +199,8 @@ suites(Minor) when Minor == 3 ->
 	    no_ec_suites(3) ++ no_ec_suites(2)
     end.
 
-all_suites(Minor) when Minor == 1; Minor == 2->		
-    [ 
+all_suites(Minor) when Minor == 1; Minor == 2->
+    [
       ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
       ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
       ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
@@ -224,7 +224,7 @@ all_suites(Minor) when Minor == 1; Minor == 2->
       ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
       ?TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
       ?TLS_RSA_WITH_AES_128_CBC_SHA,
-      
+
       ?TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
       ?TLS_ECDHE_RSA_WITH_RC4_128_SHA,
       ?TLS_RSA_WITH_RC4_128_SHA,
@@ -232,32 +232,32 @@ all_suites(Minor) when Minor == 1; Minor == 2->
       ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
       ?TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
       ?TLS_ECDH_RSA_WITH_RC4_128_SHA,
-      
+
       ?TLS_RSA_WITH_DES_CBC_SHA
     ];
-all_suites(3) ->	
+all_suites(3) ->
     [
      ?TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384,
      ?TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384,
-     
+
      ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
      ?TLS_RSA_WITH_AES_256_CBC_SHA256,
-     
+
      ?TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
      ?TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
      ?TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256,
      ?TLS_ECDH_RSA_WITH_AES_128_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
     ].
 
-no_ec_suites(Minor) when Minor == 1; Minor == 2->		
-    [ 
+no_ec_suites(Minor) when Minor == 1; Minor == 2->
+    [
       ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
       ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA,
       ?TLS_RSA_WITH_AES_256_CBC_SHA,
@@ -272,7 +272,7 @@ no_ec_suites(Minor) when Minor == 1; Minor == 2->
       ?TLS_DHE_RSA_WITH_DES_CBC_SHA,
       ?TLS_RSA_WITH_DES_CBC_SHA
     ];
-no_ec_suites(3) ->	
+no_ec_suites(3) ->
     [
      ?TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
      ?TLS_DHE_DSS_WITH_AES_256_CBC_SHA256,
@@ -323,7 +323,7 @@ p_hash(Secret, Seed, WantedLength, Method, N, Acc) ->
 
 %% ... Where  A(0) = seed
 %%            A(i) = HMAC_hash(secret, A(i-1))
-%% a(0, _Secret, Seed, _Method) -> 
+%% a(0, _Secret, Seed, _Method) ->
 %%     Seed.
 %% a(N, Secret, Seed, Method) ->
 %%     hmac_hash(Method, Secret, a(N-1, Secret, Seed, Method)).
@@ -368,11 +368,19 @@ finished_label(server) ->
 
 %% list ECC curves in prefered order
 ecc_curves(_Minor) ->
-    [?sect571r1,?sect571k1,?secp521r1,?sect409k1,?sect409r1,
-     ?secp384r1,?sect283k1,?sect283r1,?secp256k1,?secp256r1,
-     ?sect239k1,?sect233k1,?sect233r1,?secp224k1,?secp224r1,
-     ?sect193r1,?sect193r2,?secp192k1,?secp192r1,?sect163k1,
-     ?sect163r1,?sect163r2,?secp160k1,?secp160r1,?secp160r2].
+    TLSCurves = [sect571r1,sect571k1,secp521r1,brainpoolP512r1,
+		 sect409k1,sect409r1,brainpoolP384r1,secp384r1,
+		 sect283k1,sect283r1,brainpoolP256r1,secp256k1,secp256r1,
+		 sect239k1,sect233k1,sect233r1,secp224k1,secp224r1,
+		 sect193r1,sect193r2,secp192k1,secp192r1,sect163k1,
+		 sect163r1,sect163r2,secp160k1,secp160r1,secp160r2],
+    CryptoCurves = crypto:ec_curves(),
+    lists:foldr(fun(Curve, Curves) ->
+			case proplists:get_bool(Curve, CryptoCurves) of
+			    true ->  [pubkey_cert_records:namedCurves(Curve)|Curves];
+			    false -> Curves
+			end
+		end, [], TLSCurves).
 
 %% ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005)
 oid_to_enum(?sect163k1) -> 1;
@@ -399,7 +407,10 @@ oid_to_enum(?secp224r1) -> 21;
 oid_to_enum(?secp256k1) -> 22;
 oid_to_enum(?secp256r1) -> 23;
 oid_to_enum(?secp384r1) -> 24;
-oid_to_enum(?secp521r1) -> 25.
+oid_to_enum(?secp521r1) -> 25;
+oid_to_enum(?brainpoolP256r1) -> 26;
+oid_to_enum(?brainpoolP384r1) -> 27;
+oid_to_enum(?brainpoolP512r1) -> 28.
 
 enum_to_oid(1) -> ?sect163k1;
 enum_to_oid(2) -> ?sect163r1;
@@ -425,7 +436,10 @@ enum_to_oid(21) -> ?secp224r1;
 enum_to_oid(22) -> ?secp256k1;
 enum_to_oid(23) -> ?secp256r1;
 enum_to_oid(24) -> ?secp384r1;
-enum_to_oid(25) -> ?secp521r1.
+enum_to_oid(25) -> ?secp521r1;
+enum_to_oid(26) -> ?brainpoolP256r1;
+enum_to_oid(27) -> ?brainpoolP384r1;
+enum_to_oid(28) -> ?brainpoolP512r1.
 
 sufficent_ec_support() ->
     CryptoSupport = crypto:supports(),
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile
index 39aa22ffb4..244eb5ce0a 100644
--- a/lib/ssl/test/Makefile
+++ b/lib/ssl/test/Makefile
@@ -47,6 +47,7 @@ MODULES = \
 	ssl_payload_SUITE \
 	ssl_session_cache_SUITE	\
 	ssl_to_openssl_SUITE \
+	ssl_ECC_SUITE \
 	make_certs\
 	erl_make_certs
 
@@ -56,6 +57,7 @@ ERL_FILES = $(MODULES:%=%.erl)
 HRL_FILES =
 
 HRL_FILES_SRC = \
+	ssl_api.hrl\
 	ssl_internal.hrl\
 	ssl_alert.hrl \
 	tls_handshake.hrl \
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl
new file mode 100644
index 0000000000..608f2f11c3
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE.erl
@@ -0,0 +1,225 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%%
+%% The 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/.2
+%%
+%% 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_ECC_SUITE).
+
+%% Note: This directive should only be used in test suites.
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("public_key/include/public_key.hrl").
+
+%%--------------------------------------------------------------------
+%% Common Test interface functions -----------------------------------
+%%--------------------------------------------------------------------
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() ->
+    [
+     {group, 'tlsv1.2'},
+     {group, 'tlsv1.1'},
+     {group, 'tlsv1'}
+    ].
+
+groups() ->
+    [
+     {'tlsv1.2', [], all_versions_groups()},
+     {'tlsv1.1', [], all_versions_groups()},
+     {'tlsv1', [], all_versions_groups()},
+     {'erlang_server', [], key_cert_combinations()},
+     {'erlang_client', [], key_cert_combinations()},
+     {'erlang', [], key_cert_combinations()}
+    ].
+
+all_versions_groups ()->
+    [{group, 'erlang_server'},
+     {group, 'erlang_client'},
+     {group, 'erlang'}
+    ].
+
+key_cert_combinations() ->
+    [client_ec_server_ec,
+     client_rsa_server_ec,
+     client_ec_server_rsa,
+     client_rsa_server_rsa].
+
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    catch crypto:stop(),
+    try crypto:start() of
+	ok ->
+	    ssl:start(),
+	    Config
+    catch _:_ ->
+	    {skip, "Crypto did not start"}
+    end.
+
+end_per_suite(_Config) ->
+    ssl:stop(),
+    application:stop(crypto).
+
+%%--------------------------------------------------------------------
+init_per_group(erlang_client, Config) ->
+    case ssl_test_lib:is_sane_ecc(openssl) of
+	true ->
+	    common_init_per_group(erlang_client, [{server_type, openssl},
+						  {client_type, erlang} | Config]);
+	false ->
+	    {skip, "Known ECC bug in openssl"}
+    end;
+
+init_per_group(erlang_server, Config) ->
+    case ssl_test_lib:is_sane_ecc(openssl) of 
+	true ->
+	    common_init_per_group(erlang_client, [{server_type, erlang},
+						  {client_type, openssl} | Config]);
+	false ->
+	    {skip, "Known ECC bug in openssl"}
+    end;
+	
+init_per_group(erlang = Group, Config) ->
+     case ssl_test_lib:sufficient_crypto_support(Group) of
+	 true ->
+	     common_init_per_group(erlang, [{server_type, erlang},
+					    {client_type, erlang} | Config]);
+	 false ->
+	      {skip, "Crypto does not support ECC"}
+     end;		 
+init_per_group(Group, Config) ->
+    common_init_per_group(Group, Config).
+
+common_init_per_group(GroupName, Config) ->
+    case ssl_test_lib:is_tls_version(GroupName) of
+	true ->
+	    ssl_test_lib:init_tls_version(GroupName),
+	    [{tls_version, GroupName} | Config];
+	_ ->
+	   openssl_check(GroupName, Config)
+    end.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+
+init_per_testcase(_TestCase, Config) ->
+    ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
+    ct:log("Ciphers: ~p~n ", [ ssl:cipher_suites()]),
+    Config.
+
+end_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% Test Cases --------------------------------------------------------
+%%--------------------------------------------------------------------
+
+client_ec_server_ec(Config) when is_list(Config) ->
+    basic_test("ec1.crt", "ec1.key", "ec2.crt", "ec2.key", Config).
+
+client_ec_server_rsa(Config)  when is_list(Config) ->
+    basic_test("ec1.crt", "ec1.key", "rsa1.crt", "rsa1.key", Config).
+
+client_rsa_server_ec(Config)  when is_list(Config) ->
+    basic_test("rsa1.crt", "rsa1.key", "ec2.crt", "ec2.key", Config).
+
+client_rsa_server_rsa(Config)  when is_list(Config) ->
+    basic_test("rsa1.crt", "rsa1.key", "rsa2.crt", "rsa2.key", Config).
+
+%%--------------------------------------------------------------------
+%% Internal functions ------------------------------------------------
+%%--------------------------------------------------------------------
+basic_test(ClientCert, ClientKey, ServerCert, ServerKey, Config) ->
+    DataDir = ?config(data_dir, Config),
+    SType = ?config(server_type, Config),
+    CType = ?config(client_type, Config),
+    {Server, Port} = start_server(SType,
+				  filename:join(DataDir, "CA.pem"),
+				  filename:join(DataDir, ServerCert),
+				  filename:join(DataDir, ServerKey),
+				  Config),
+    Client = start_client(CType, Port, filename:join(DataDir, "CA.pem"),
+			  filename:join(DataDir, ClientCert),
+			  filename:join(DataDir, ClientKey), Config),
+    check_result(Server, SType, Client, CType).
+
+start_client(openssl, Port, CA, Cert, Key, _) ->
+    Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port) ++  ssl_test_lib:version_flag(Version) ++
+	" -cert " ++ Cert ++ " -CAfile " ++ CA
+	++ " -key " ++ Key ++ " -host localhost -msg",
+    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+    true = port_command(OpenSslPort, "Hello world"),
+    OpenSslPort;
+start_client(erlang, Port, CA, Cert, Key, Config) ->
+    {ClientNode, _, Hostname} = ssl_test_lib:run_where(Config),
+    ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+			       {host, Hostname},
+			       {from, self()},
+			       {mfa, {ssl_test_lib, send_recv_result_active, []}},
+			       {options, [{verify, verify_peer}, {cacertfile, CA},
+					  {certfile, Cert}, {keyfile, Key}]}]).
+
+start_server(openssl, CA, Cert, Key, _) ->
+    Port = ssl_test_lib:inet_port(node()),
+    Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port) ++ ssl_test_lib:version_flag(Version) ++
+	" -cert " ++ Cert ++ " -CAfile " ++ CA
+	++ " -key " ++ Key ++ " -Verify 2 -msg",
+    OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
+    ssl_test_lib:wait_for_openssl_server(),
+    true = port_command(OpenSslPort, "Hello world"),
+    {OpenSslPort, Port};
+
+start_server(erlang, CA, Cert, Key, Config) ->
+    {_, ServerNode, _} = ssl_test_lib:run_where(Config),
+    Server = ssl_test_lib:start_server([{node, ServerNode}, {port, 0},
+			       {from, self()},
+			       {mfa, {ssl_test_lib,
+				      send_recv_result_active,
+				      []}},
+			       {options,
+				[{verify, verify_peer}, {cacertfile, CA},
+				 {certfile, Cert}, {keyfile, Key}]}]),
+    {Server, ssl_test_lib:inet_port(Server)}.
+
+check_result(Server, erlang, Client, erlang) ->
+    ssl_test_lib:check_result(Server, ok, Client, ok);
+check_result(Server, erlang, _, _) ->
+    ssl_test_lib:check_result(Server, ok);
+check_result(_, _, Client, erlang) ->
+    ssl_test_lib:check_result(Client, ok);
+check_result(_,openssl, _, openssl) ->
+    ok.
+
+openssl_check(erlang, Config) ->
+    Config;
+openssl_check(_, Config) ->
+    TLSVersion = ?config(tls_version, Config),
+    case ssl_test_lib:check_sane_openssl_version(TLSVersion) of
+	true ->
+	    ssl:start(),
+	    Config;
+	false ->
+	    {skip, "TLS version not supported by openssl"}
+    end.
+
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/CA.pem b/lib/ssl/test/ssl_ECC_SUITE_data/CA.pem
new file mode 100644
index 0000000000..f82efdefc5
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/CA.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICGjCCAYegAwIBAgIQZIIqq4RXfpBKJXV69Jc4BjAJBgUrDgMCHQUAMB0xGzAZ
+BgNVBAMTEklTQSBUZXN0IEF1dGhvcml0eTAeFw0xMjAzMjAxNzEzMjFaFw0zOTEy
+MzEyMzU5NTlaMB0xGzAZBgNVBAMTEklTQSBUZXN0IEF1dGhvcml0eTCBnzANBgkq
+hkiG9w0BAQEFAAOBjQAwgYkCgYEAqnt6FSyFQVSDyP7mY63IhCzgysTxBEg1qDb8
+nBHj9REReZA5UQ5iyEOdTbdLyOaSk2rJyA2wdTjYkNnLzK49nZFlpf89r3/bakAM
+wZv69S3FJi9W2z9m4JPv/5+QCYnFNRSnnHw3maNElwoQyknx96I3W7EuVOvKtKhh
+4DaD0WsCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zBOBgNVHQEERzBFgBBCHwn2
+8AmbN+cvJl1iJ1bsoR8wHTEbMBkGA1UEAxMSSVNBIFRlc3QgQXV0aG9yaXR5ghBk
+giqrhFd+kEoldXr0lzgGMAkGBSsOAwIdBQADgYEAIlVecua5Cr1z/cdwQ8znlgOU
+U+y/uzg0nupKkopzVnRYhwV4hxZt3izAz4C/SJZB7eL0bUKlg1ceGjbQsGEm0fzF
+LEV3vym4G51bxv03Iecwo96G4NgjJ7+9/7ciBVzfxZyfuCpYG1M2LyrbOyuevtTy
+2+vIueT0lv6UftgBfIE=
+-----END CERTIFICATE-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/ec1.crt b/lib/ssl/test/ssl_ECC_SUITE_data/ec1.crt
new file mode 100644
index 0000000000..7d2b9cde9d
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/ec1.crt
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBhjCB8AIBBjANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJJU0EgVGVzdCBB
+dXRob3JpdHkwHhcNMTMwODA4MTAxNDI3WhcNMjMwODA2MTAxNDI3WjBFMQswCQYD
+VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEZvcnQgQmVsdm9p
+cjEMMAoGA1UEAxMDZWMxMFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEpiRIxUCESROR
+P8IByg+vBv1fDdAg7yXfAh95GxFtvhBqZs6ATwaRKyLmZYgUm/4NUAyUeqmTBb7s
+2msKo5mnNzANBgkqhkiG9w0BAQUFAAOBgQAmwzoB1DVO69FQOUdBVnyups4t0c1c
+8h+1z/5P4EtPltk4o3mRn0AZogqdXCpNbuSGbSJh+dep5xW30VLxNHdc+tZSLK6j
+pT7A3hymMk8qbi13hxeH/VpEP25y1EjHowow9Wmb6ebtT/v7qFQ9AAHD9ONcIM4I
+FCC8vdFo7M5GgQ==
+-----END CERTIFICATE-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/ec1.key b/lib/ssl/test/ssl_ECC_SUITE_data/ec1.key
new file mode 100644
index 0000000000..2dc9508b3c
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/ec1.key
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BgUrgQQACg==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHQCAQEEIOO0WK8znNzLyZIoGRIlaKnCNr2Wy8uk9i+GGFIhDGNAoAcGBSuBBAAK
+oUQDQgAEpiRIxUCESRORP8IByg+vBv1fDdAg7yXfAh95GxFtvhBqZs6ATwaRKyLm
+ZYgUm/4NUAyUeqmTBb7s2msKo5mnNw==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/ec2.crt b/lib/ssl/test/ssl_ECC_SUITE_data/ec2.crt
new file mode 100644
index 0000000000..b0558a0ebc
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/ec2.crt
@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBhjCB8AIBBzANBgkqhkiG9w0BAQUFADAdMRswGQYDVQQDExJJU0EgVGVzdCBB
+dXRob3JpdHkwHhcNMTMwODA4MTAxNDM0WhcNMjMwODA2MTAxNDM0WjBFMQswCQYD
+VQQGEwJVUzERMA8GA1UECBMIVmlyZ2luaWExFTATBgNVBAcTDEZvcnQgQmVsdm9p
+cjEMMAoGA1UEAxMDZWMyMFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEzXaYReUyvoYl
+FwGOe0MJEXWCUncMfr2xG4GMjGYlfZsvLGEokefsJIvW+I+9jgUT2UFjxFXYNAvm
+uD1A1iWVWjANBgkqhkiG9w0BAQUFAAOBgQBFa6iIlrT9DWptIdB8uSYvp7qwiHxN
+hiVH5YhGIHHqjGZqtRHrSxqNEYMXXrgH9Hxc6gDbk9PsHZyVVoh/HgVWddqW1inh
+tStZm420PAKCuH4T6Cfsk76GE2m7FRzJvw9TM1f2A5nIy9abyrpup8lZGcIL4Kmq
+1Fix1LRtrmLNTA==
+-----END CERTIFICATE-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/ec2.key b/lib/ssl/test/ssl_ECC_SUITE_data/ec2.key
new file mode 100644
index 0000000000..366d13648b
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/ec2.key
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BgUrgQQACg==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHQCAQEEIPR3ORUpAFMTQhUJ0jllN38LKWziG8yP2H54Y/9vh1PwoAcGBSuBBAAK
+oUQDQgAEzXaYReUyvoYlFwGOe0MJEXWCUncMfr2xG4GMjGYlfZsvLGEokefsJIvW
++I+9jgUT2UFjxFXYNAvmuD1A1iWVWg==
+-----END EC PRIVATE KEY-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/rsa1.crt b/lib/ssl/test/ssl_ECC_SUITE_data/rsa1.crt
new file mode 100644
index 0000000000..ed9beacf68
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/rsa1.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVjCCAr8CAQkwDQYJKoZIhvcNAQEFBQAwHTEbMBkGA1UEAxMSSVNBIFRlc3Qg
+QXV0aG9yaXR5MB4XDTEzMDgwODEwMTUzNFoXDTQwMTIyNDEwMTUzNFowRjELMAkG
+A1UEBhMCVVMxETAPBgNVBAgTCFZpcmdpbmlhMRUwEwYDVQQHEwxGb3J0IEJlbHZv
+aXIxDTALBgNVBAMTBHJzYTEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQC62v40w1AjV3oJuyYC2Fw6XhTOi1il6xZFnB9J1WhCmuxAB/VMhBcNypx38mNk
+eQ7a/ERQ5ddhZey29DYeFYU8oqfDURgWx5USHufb90xBen9KPmX3VNuQ8ZFP2q8Q
+b01/oRHBJQRBuaCtFHzpGIVBjC6dD5yeQgJsYaF4u+PBbonsIGROXMybcvUzXmjU
+dwpy2NhjGQL5sWcOdIeRP43APSyRYvq4tuBUZk2XxWfBcvA8LpcoYPMlRTf6jGL1
+/fAAcCYJ9lh3h92w0NZ/7ZRa/ebTplxK6yqCftuSKui1KdL69m0WZqHl79AUSfs9
+lsOwx9lHkyYvJeMofyeDbZ+3OYLmVqEBG1fza2aV2XVh9zJ8fAwmXy/c2IDhw/oD
+HAe/rSg/Sgt03ydIKqtZHbl3v0EexQQRlJRULIzdtON02dJMUd4EFUgQ9OUtEmC2
+Psj9Jdu1g5cevU7Mymu8Ot+fjHiGTcBUsXNuXFCbON3Gw7cIDl4+iv+cpDHHVC9L
+HK3PMEq3vu3qOGXSz+LDOoqkfROcLG7BclBuN2zoVSsMHFkB4aJhwy7eHhGz0z2W
+c6LTVd+GAApdY80kmjOjT//QxHEsX/n1useHza3OszQqZiArr4ub4rtq+l1DxAS/
+DWrZ/JGsbKL8cjWso6qBF94xTi8WhjkKuUYhsm+qLAbNOQIDAQABMA0GCSqGSIb3
+DQEBBQUAA4GBAIcuzqRkfypV/9Z85ZQCCoejPm5Urhv7dfg1/B3QtazogPBZLgL5
+e60fG1uAw5GmqTViHLvW06z73oQvJrFkrCLVvadDNtrKYKXnXqdkgVyk36F/B737
+A43HGnMfSxCfRhIOuKZB9clP5PiNlhw36yi3DratqT6TUvI69hg8a7jA
+-----END CERTIFICATE-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/rsa1.key b/lib/ssl/test/ssl_ECC_SUITE_data/rsa1.key
new file mode 100644
index 0000000000..6e0d913d79
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/rsa1.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKAIBAAKCAgEAutr+NMNQI1d6CbsmAthcOl4UzotYpesWRZwfSdVoQprsQAf1
+TIQXDcqcd/JjZHkO2vxEUOXXYWXstvQ2HhWFPKKnw1EYFseVEh7n2/dMQXp/Sj5l
+91TbkPGRT9qvEG9Nf6ERwSUEQbmgrRR86RiFQYwunQ+cnkICbGGheLvjwW6J7CBk
+TlzMm3L1M15o1HcKctjYYxkC+bFnDnSHkT+NwD0skWL6uLbgVGZNl8VnwXLwPC6X
+KGDzJUU3+oxi9f3wAHAmCfZYd4fdsNDWf+2UWv3m06ZcSusqgn7bkirotSnS+vZt
+Fmah5e/QFEn7PZbDsMfZR5MmLyXjKH8ng22ftzmC5lahARtX82tmldl1YfcyfHwM
+Jl8v3NiA4cP6AxwHv60oP0oLdN8nSCqrWR25d79BHsUEEZSUVCyM3bTjdNnSTFHe
+BBVIEPTlLRJgtj7I/SXbtYOXHr1OzMprvDrfn4x4hk3AVLFzblxQmzjdxsO3CA5e
+Por/nKQxx1QvSxytzzBKt77t6jhl0s/iwzqKpH0TnCxuwXJQbjds6FUrDBxZAeGi
+YcMu3h4Rs9M9lnOi01XfhgAKXWPNJJozo0//0MRxLF/59brHh82tzrM0KmYgK6+L
+m+K7avpdQ8QEvw1q2fyRrGyi/HI1rKOqgRfeMU4vFoY5CrlGIbJvqiwGzTkCAwEA
+AQKCAgBkXyaWKSRvF5pSh9lPRfGk2MzMdkXUOofoNIkKHDy5KocljiDSTVIk8mVC
+eU2ytuSn9UKtQgmEJEAXtu8rEdxUSftcC7+o3OTSqw9ZNWoc8jRWKVaUmVyoa1rn
+Tk0jwuYaXOcwnTXAKHqK/qpqe+V45FhVvgEfcc3jcj5OoH8jdMFZubyn62ltRz83
+rMsa9icCskDqWpEil40IUshP2ZfHYBUEs+qCNpoiPCIKGNw3KgqqCUzhP9LcfmYn
+jCnMge/eDGAikdXLv4vyYvwWFATRK/pGTuLcy542IvbHeY0vY5wVezH2CoOFBGD9
+xQ/UcZwE5hVtQToNsYhoRIVxL/3Of0qDk1M6W2Plh2MAstyejIHE3ct0pPfW3rsu
+j/9Z/H0P9Q5ghSjarwOp2qGrrz6/4LVbbTDY8V1L928l4SqbUMtEQxcxTBN8YFoD
+mPV3Jc3zls9wiiEX53RcH8MK5tjrcRwWqurTZvi/pkLfXlGDgKGCOaa3HgWVQyU+
+L6jVZM+u1nwN+jNXQYGeLEro/6tvG8WQbRMHQoxLG+rm4V3/SwH0DcfrVFDTg+i6
+3wMU1GC/aQEdTFWXvHAkpwrf4M9QWvjtheiaSxtBUoAY6l+ixCVHKrIk6glKLEjx
+92HxmcJdopQScFETAyg8eVKV0kOGfVeFEpIqwq7hVedmTflpQQKCAQEA44h4dAta
+cYeBqBr8eljWcgs79gmgwBEQxQUnwE/zuzLKn5NxAW324Kh25V/n/MupUzBlLPWn
+91UHfw9PCXT8/HvgYQ4S5sXbKRbGmuPSsTmz4Rfe2ix6RggVNUOwORVNDyM7SQh7
+USdzZH5dMxKfF5L/b4Byx7eQZaoeKlfaXcqgikNZZ6pkhVCNxUKi9vvjS9r2wwCd
+xtgu5MfTpdEci0zH1+uuRisVRcEbcRX9umUTCiZrmEeddZXNiwTAS3FtX7qGzuq9
+LKIeETwcOZrWj0E48UvbSfK4Axn7sf5J0n7/Qo7I089S5QQEI6ZDP501i71dNFhn
+qfcY30c1k3TC7QKCAQEA0juuVHExKNLLNmQejNPfuHYoH0Uk2BH/8x96/Mkj6k6K
+SUCHDS3iWOljXGw8YtpS8v5mGBGgMhJ+s/vCRM6R9eXYTc8u2ktY/kjyW0PgW8/Z
+vb9VrQpn5svTNwj2Q8qYsTqXnQKO7YuL+hnQpQNAcID6FTeOASVLGObEf810qRfN
+4y3RqCWUnYXXTyXj+cJdbXTxfF7HVZPIAQKqE7J5Qo9ynYILY62oSmUGC6m8VKyE
+rrvDMK1IVi0X4w+Jx4HX0IC2+DBKxCaLWT69bE1IwjB06Q5zoTQPVi6c6qQp7K0H
+kqSyLJ/ctwcEubu0DPNmvMlgWtAbAsoESA5GbIit/QKCAQEAxRzp9OYNAUM6AK74
+QOmLRZsT4+6tUxa1p2jy6fiZlnfG731kra9c630mG0n9iJPK6aWIUO20CGGiL+HM
+P84YiIaseIgfucp4NV1kyrRJR31MptjuF6Xme5ru/IjaNmmMq2uDJZ7ybfi2T73k
+8aTVLDANl8P4K6qLrnc00MvxAcXTVFRKNLN5h8CkQNqcoUjPvVxA3+g9xxBrd4jh
+gsnoZ4kpq5WiEWmrcRV8t3gsqfh8CRQFrBOGhmIzgZapG/J0pTTLKqBTKEJ9t8KS
+VRkdfVcshGWJ4MMjxJQS5zz7KR8Z9cgKlOwLzRiwmU2k/owr4hY3k2xuyeClrHBd
+KpRBdQKCAQBvDk/dE55gbloi9WieBB6eluxC+IeqDHgkunCBsM9kKvEqGQg+kgqL
+5V4zqImNvr8q1fCgrk7tpI+CDHBnYKgCOdS15cheUIdGbMp6I7UVSws/DR/5NRIF
+/Y4p+HX/Abr/hHAq5PsTyS+8gn6RbNJRnBB/vMUrHcQ5902+JY6G9KgyZjXmmVOU
+kutWSDHR8jbgZ3JZvMeYEWUKA5pMpW8hFh35zoStt0K7afpzlsqCAFBm7ZEC2cbo
+nxGLRN4HojObVSNSoFAepi3eiyINYBYbXvWjV5sFgTbI0/7YhLgQ6qahdJcas6go
+l3CLnPhUDxAqkkZwMpbSNl1kowXYt6sRAoIBAAOWnXgf9Bdb9OWKGgt42gVfC4cz
+zj2JoLpbDTtbEdHNn8XQvPhGbpdtgnsuEMijIMy1UTlmv17jbFWdZTDeN31EUJrC
+smgKX0OlVFKD90AI0BiIREK0hJUBV0pV4JoUjwnQBHGvranD06/wAtHEqgqF1Ipp
+DCAKwxggM7qtB1R1vkrc/aLQej+mlwA8N6q92rnEsg+EnEbhtLDDZQcV/q5cSDCN
+MMcnM+QdyjKwEeCVXHaqNfeSqKg/Ab2eZbS9VxA+XZD73+eUY/JeJsg7LfZrRz0T
+ij5LCS7A+nVB5/B5tGkk4fcNhk2n356be6l46S98BEgtuwGLC9pqXf7zyp4=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/rsa2.crt b/lib/ssl/test/ssl_ECC_SUITE_data/rsa2.crt
new file mode 100644
index 0000000000..06ca92dda3
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/rsa2.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVjCCAr8CAQowDQYJKoZIhvcNAQEFBQAwHTEbMBkGA1UEAxMSSVNBIFRlc3Qg
+QXV0aG9yaXR5MB4XDTEzMDgwODEwMTYwMloXDTQwMTIyNDEwMTYwMlowRjELMAkG
+A1UEBhMCVVMxETAPBgNVBAgTCFZpcmdpbmlhMRUwEwYDVQQHEwxGb3J0IEJlbHZv
+aXIxDTALBgNVBAMTBHJzYTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCjQUe0BGOpULjOAmLbXM4SSQzJvxJbCFi3tryyd+OARq6Fdp6/fslVhsr0PhWE
+X8yRbAugIjseTpLwz+1OC6LavOGV1ixzGTI/9HDXGKbf8qoCrSdh28sqQJnmqGT4
+UCKLn6Rqjg2iyBBcSK3LrtKEPI4C7NaSOZUtANkppvziEMwm+0r16sgHh2Xx6mxd
+22q01kq1lJqwEnIDPMSz3+ESUVQQ4T3ka7yFIhc9PYmILIXkZi0x7AiDeRkIILul
+GQrduTWSPGY3prXeDAbmQNazxrHp8fcR2AfFSI6HYxMALq9jWxc4xDIkss6BO2Et
+riJOIgXFpbyVsYCbkI1kXhEWFDt3uJBIcmtJKGzro4xv+XLG6BbUeTJgSHXMc7Cb
+fX87+CBIFR5a/aqkEKh/mcvsDdaV+kpNKdr7q4wAuIQb8g7IyXEDuAm1VZjQs9WC
+KFRGSq9sergEw9gna0iThRZjD+dzNzB17XmlAK4wa98a7MntwqpAt/GsCFOiPM8E
+c+8gpuo8WqC0kP8OpImyw9cQhlZ3dca1qkr2cyKyAOGxUxyA67FgiHSsxJJ2Xhse
+o49qeKTjMZd8zhSokM2TH6qEf7YfOePU51YRfAHUhzRmE31N/MExqDjFjklksEtM
+iHhbPo+cOoxV8x1u13umdUvtTaAUSBA/DpvzWdnORvnaqQIDAQABMA0GCSqGSIb3
+DQEBBQUAA4GBAFD+O7h+5R5S1rIN9eC+oEGpvRhMG4v4G3pJp+c7bbtO7ifFx1WP
+bta1b5YtiQYcKP0ORABm/3Kcvsb3VbaMH/zkxWEbASZsmIcBY3ml4f2kkn6WT2hD
+Wc6VMIAR3N6Mj1b30yI1qYVIid+zIouiykMB+zqllm+Uar0SPNjKxDU/
+-----END CERTIFICATE-----
diff --git a/lib/ssl/test/ssl_ECC_SUITE_data/rsa2.key b/lib/ssl/test/ssl_ECC_SUITE_data/rsa2.key
new file mode 100644
index 0000000000..d415ef0391
--- /dev/null
+++ b/lib/ssl/test/ssl_ECC_SUITE_data/rsa2.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIJJwIBAAKCAgEAo0FHtARjqVC4zgJi21zOEkkMyb8SWwhYt7a8snfjgEauhXae
+v37JVYbK9D4VhF/MkWwLoCI7Hk6S8M/tTgui2rzhldYscxkyP/Rw1xim3/KqAq0n
+YdvLKkCZ5qhk+FAii5+kao4NosgQXEity67ShDyOAuzWkjmVLQDZKab84hDMJvtK
+9erIB4dl8epsXdtqtNZKtZSasBJyAzzEs9/hElFUEOE95Gu8hSIXPT2JiCyF5GYt
+MewIg3kZCCC7pRkK3bk1kjxmN6a13gwG5kDWs8ax6fH3EdgHxUiOh2MTAC6vY1sX
+OMQyJLLOgTthLa4iTiIFxaW8lbGAm5CNZF4RFhQ7d7iQSHJrSShs66OMb/lyxugW
+1HkyYEh1zHOwm31/O/ggSBUeWv2qpBCof5nL7A3WlfpKTSna+6uMALiEG/IOyMlx
+A7gJtVWY0LPVgihURkqvbHq4BMPYJ2tIk4UWYw/nczcwde15pQCuMGvfGuzJ7cKq
+QLfxrAhTojzPBHPvIKbqPFqgtJD/DqSJssPXEIZWd3XGtapK9nMisgDhsVMcgOux
+YIh0rMSSdl4bHqOPanik4zGXfM4UqJDNkx+qhH+2Hznj1OdWEXwB1Ic0ZhN9TfzB
+Mag4xY5JZLBLTIh4Wz6PnDqMVfMdbtd7pnVL7U2gFEgQPw6b81nZzkb52qkCAwEA
+AQKCAgBORLHXwHL3bdfsDIDQooG5ioQzBQQL2MiP63A0L/5GNZzeJ6ycKnDkLCeJ
+SWqPeE5fOemo8EBfm1QfV9BxpmqBbCTK7U+KLv5EYzDmLs9ydqjDd7h11iZlL2uZ
+hgpCckjdn7/3xfsLm9ccJ0wLZtlOxKlhBaMpn6nBVbLHoWOEDoGR/tBFbjZQRb2+
+aaFirhtOb56Jx6ER4QYAP1Ye1qrVWWBwZ0yBApXzThDOL36MZqwagFISqRK71YcG
+uoq78HGhM3ZXkdV/wNFYj3OPWG6W6h/KBVNqnqO7FbofdoRZhghYHgfYE1fm+ELA
++nLwr5eK1gzmYTs0mVELRBZFlEOkCfYNOnuRgysFezEklS+ICp3HzIhYXza3kyTf
+B2ZBwZZVCv/94MKyibyANErmv1a5ugY5Hsn9/WKC8qTto+qLYoyFCvBjzj0PSaVX
+/3cty2DY0SK16K1Y4AOPtJMYTXYB3tVX8Akgjz1F6REBtZSOXrSQ3Vhy1ORl3Hzf
+WCBYDqL8K0hJiBVgkvneIyIjmFHsdM60Nr7EldBEnJ/UrPzsl2VuWFPZlnasfUaW
+x+vq1H4Dfz+bHt8coBRHDjKgUvwkfFeBQOBR5DG3vMrxguVRA1EYYMRR5C3yxk2m
+ARAtdh4VxUQDQjjrmr7Dl/y1rU34aInXIrrFWpuvIhl8Ht09sQKCAQEA1pXKK5f0
+HkKfM/qk5xzF+WdHClBrPXi0XwLN6UQ+WWMMNhkGZ+FMPXl/6IJDT91s6DA3tPhr
+OZF64n9ZFaGgHNBXNiB+Txjv5vZeSBMFt3hSonqt42aijx6gXfmLnkA+TYpa6Wex
+YCeEgdH8LocJa7Gj2vzrYliPYk3deh6SnZZ6N8bI+ciwK3ZGF/pkWaTX83dIFq3w
+YyZ+0dEpNGbA9812wNVourPg3OfqG3/CdnTfvY1M9KCC3JalpyzQL4Zm5soXF0wj
+36C2yTxA02AyFz3TvUIBrvsN6i0gmGfE79+UIp29JYrFRsIgBDt+ze2vQWUz2MX5
+GeX6/yCBgiTXtwKCAQEAwsNf6k2m5Cw+WtuLzzUfBBJCN+t1lrnYJ6lF0HubW6TZ
+vX1kBWyc+Rpo4ljr/+f4R9aC/gTEQOmV/hNVZy1RU2dAI8cH+r6JWG9lgif+8h//
+5R81txE7gnuK1Na7PmvnQPPN661zsQZ5e1ENPXS3TJmUW/M01JxAMqEQjvAPa/II
+H2KjL5NX28k9Hiw9rP6n+qXAfG/LEwXgoVCcehPwfANqQ1l95UgOdKDmjG94dipI
+h2DEK70ZbrsgQbT60Wd8I5h0yhiQsik2/bVkqLmcG4SSg0/5cf2vZMApgoH/adUz
+rJFdthm7iGPLhwS6fbhXew17Af96FvzfkifUV+cgnwKCAQBNUlYyFSQKz1jMgxFu
+kciokNVhWw75bIgaAEmwNz38OZuJ1sSfI+iz8hbr8hxNJ+15UP6RwD3q1YghG2A/
+Uij+mPgD8ftxhvvTDo10jR4vOTUVhP0phq8mwRNqKWRs1ptcl3Egz5NzoWm22bJ0
+FYaIfs8bNq2el2i7NHGM8n1EOZe6h2+dyfno/0pMk5YbUzHZce7Q9UY8g/+InUSq
+tCfuYuPaokuFkxGAqDSMSiIJSx3gEI1dTIU69TGlppkxts1XdhSR+YanqyKSKpr1
+T6FdDJNCjAlNQvuFmVM4d5PYF4kqXApu/60MTSD6RXHwxCe1ecEP6G5VLbCew9jG
+y33LAoIBAGsWyC9pwQEm/qYwn4AwYjx32acrtX1J9HtiTLvkqzjJvNu/DXcaEHm7
+tr32TNVp9A9z+JS5hDt49Hs+oC/aMCRe2lqRvmZ1y8kvfy4A1eLGC4stDPj65bDK
+QzziURRyejYxmCElPz6wI63VlCUdfwgEThn88SiSPY5ZF2SwxJoC+8peDwJCzwVP
+cmabxtHPOAfOibciNRPhoHCyhUdunUVjD1O26k1ewGwKaJoBVMgMWdLuNw8hq9FB
+3OukGmF3uD9OPbE9rpn3pX/89Dr9y8MpsvG20J6H8Z/BNVHILus/SmlxiIhvP7kv
+viIgTHaCHL/RWrhvg+8N3dRcSBqJQFsCggEAFe2TMEq2AlnBn4gsuAOIuZPYKQCg
+2a+tl1grQzmNth6AGGQcIqShadICD6SnVMIS64HHV/m18Cuz7GhJ06ZVjXJsHueG
+UpTE9wAmI2LxnNkupkLJu+SVcW3N86PujWmQBFpHkd+IRPLS51xjD9W5zLJ7HL4/
+fnKO+B+ZK6Imxbe5C5vJezkGfeOSyQoVtt6MT/XtSKNEGPBX+M6fLKgUMMg2H2Mt
+/SsD7DkOzFteKXzaEg/K8oOTpsOPkVDwNl2KErlEqbJv0k7yEVw50mYmsn/OLjh8
++9EibISwCODbPxB+PhV6u2ue1IvGLRqtsN60lFOvbGn+kSewy9EUVHHQDQ==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index b5cf6d1212..523760aba6 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %%
 %% The 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_lib("common_test/include/ct.hrl").
 -include_lib("public_key/include/public_key.hrl").
 
+-include("ssl_api.hrl").
 -include("ssl_internal.hrl").
 -include("ssl_alert.hrl").
 -include("ssl_internal.hrl").
@@ -83,8 +84,10 @@ all_versions_groups ()->
 
 basic_tests() ->
     [app,
+     appup,
      alerts,
      send_close,
+     version_option,
      connect_twice,
      connect_dist,
      clear_pem_cache
@@ -109,7 +112,10 @@ options_tests() ->
      empty_protocol_versions,
      ipv6,
      reuseaddr,
-     tcp_reuseaddr].
+     tcp_reuseaddr,
+     honor_server_cipher_order,
+     honor_client_cipher_order
+].
 
 api_tests() ->
     [connection_info,
@@ -129,7 +135,8 @@ api_tests() ->
      listen_socket,
      ssl_accept_timeout,
      ssl_recv_timeout,
-     versions_option
+     versions_option,
+     server_name_indication_option
     ].
 
 session_tests() ->
@@ -142,6 +149,7 @@ session_tests() ->
 renegotiate_tests() ->
     [client_renegotiate,
      server_renegotiate,
+     client_secure_renegotiate,
      client_renegotiate_reused_session,
      server_renegotiate_reused_session,
      client_no_wrap_sequence_number,
@@ -212,21 +220,20 @@ end_per_suite(_Config) ->
 
 %%--------------------------------------------------------------------
 init_per_group(GroupName, Config) ->
-    case ssl_test_lib:is_tls_version(GroupName) of
+    case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of
 	true ->
+	    ssl_test_lib:init_tls_version(GroupName),
+	    Config;
+	_ ->
 	    case ssl_test_lib:sufficient_crypto_support(GroupName) of
 		true ->
-		    ssl_test_lib:init_tls_version(GroupName),
+		    ssl:start(),
 		    Config;
 		false ->
 		    {skip, "Missing crypto support"}
-	    end;
-	_ ->
-	    ssl:start(),
-	    Config
+	    end
     end.
 
-
 end_per_group(_GroupName, Config) ->
     Config.
 
@@ -286,6 +293,11 @@ app() ->
 app(Config) when is_list(Config) ->
     ok = ?t:app_test(ssl).
 %%--------------------------------------------------------------------
+appup() ->
+    [{doc, "Test that the ssl appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(ssl).
+%%--------------------------------------------------------------------
 alerts() ->
     [{doc, "Test ssl_alert:alert_txt/1"}].
 alerts(Config) when is_list(Config) ->
@@ -1067,6 +1079,13 @@ send_close(Config) when is_list(Config) ->
     {error, _} = ssl:send(SslS, "Hello world").
 
 %%--------------------------------------------------------------------
+version_option() ->
+    [{doc, "Use version option and do no specify ciphers list. Bug specified incorrect ciphers"}].
+version_option(Config) when is_list(Config) -> 
+    Versions = proplists:get_value(supported, ssl:versions()),
+    [version_option_test(Config, Version) || Version <- Versions].
+   
+%%--------------------------------------------------------------------
 close_transport_accept() ->
     [{doc,"Tests closing ssl socket when waiting on ssl:transport_accept/1"}].
 
@@ -1978,6 +1997,37 @@ client_renegotiate(Config) when is_list(Config) ->
     ssl_test_lib:close(Client).
 
 %%--------------------------------------------------------------------
+client_secure_renegotiate() ->
+    [{doc,"Test ssl:renegotiate/1 on client."}].
+client_secure_renegotiate(Config) when is_list(Config) ->
+    ServerOpts = ?config(server_opts, Config),
+    ClientOpts = ?config(client_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, [{secure_renegotiate, true} | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE,
+					       renegotiate, [Data]}},
+					{options, [{reuse_sessions, false},
+						   {secure_renegotiate, true}| ClientOpts]}]),
+    
+    ssl_test_lib:check_result(Client, ok, Server, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+
+%%--------------------------------------------------------------------
 server_renegotiate() ->
     [{doc,"Test ssl:renegotiate/1 on server."}].
 server_renegotiate(Config) when is_list(Config) ->
@@ -2164,7 +2214,14 @@ der_input(Config) when is_list(Config) ->
 
     ssl_test_lib:check_result(Server, ok, Client, ok),
     ssl_test_lib:close(Server),
-    ssl_test_lib:close(Client).
+    ssl_test_lib:close(Client),
+
+    {status, _, _, StatusInfo} = sys:get_status(whereis(ssl_manager)),
+    [_, _,_, _, Prop] = StatusInfo,
+    State = ssl_test_lib:state(Prop),
+    [CADb | _] = element(5, State),
+    [] = ets:tab2list(CADb).
+    
 %%--------------------------------------------------------------------
 der_input_opts(Opts) ->
     Certfile = proplists:get_value(certfile, Opts),
@@ -2410,6 +2467,51 @@ tcp_reuseaddr(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 
+honor_server_cipher_order() ->
+    [{doc,"Test API honor server cipher order."}].
+honor_server_cipher_order(Config) when is_list(Config) ->
+    ClientCiphers = [{rsa, aes_128_cbc, sha}, {rsa, aes_256_cbc, sha}],
+    ServerCiphers = [{rsa, aes_256_cbc, sha}, {rsa, aes_128_cbc, sha}],
+honor_cipher_order(Config, true, ServerCiphers, ClientCiphers, {rsa, aes_256_cbc, sha}).
+
+honor_client_cipher_order() ->
+    [{doc,"Test API honor server cipher order."}].
+honor_client_cipher_order(Config) when is_list(Config) ->
+    ClientCiphers = [{rsa, aes_128_cbc, sha}, {rsa, aes_256_cbc, sha}],
+    ServerCiphers = [{rsa, aes_256_cbc, sha}, {rsa, aes_128_cbc, sha}],
+honor_cipher_order(Config, false, ServerCiphers, ClientCiphers, {rsa, aes_128_cbc, sha}).
+
+honor_cipher_order(Config, Honor, ServerCiphers, ClientCiphers, Expected) ->
+    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, connection_info_result, []}},
+					{options, [{ciphers, ServerCiphers}, {honor_cipher_order, Honor}
+						   | ServerOpts]}]),
+    Port = ssl_test_lib:inet_port(Server),
+    Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
+					{host, Hostname},
+					{from, self()},
+					{mfa, {?MODULE, connection_info_result, []}},
+					{options, [{ciphers, ClientCiphers}, {honor_cipher_order, Honor}
+						   | ClientOpts]}]),
+
+    Version =
+	tls_record:protocol_version(tls_record:highest_protocol_version([])),
+
+    ServerMsg = ClientMsg = {ok, {Version, Expected}},
+
+    ssl_test_lib:check_result(Server, ServerMsg, Client, ClientMsg),
+
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
+
+%%--------------------------------------------------------------------
+
 hibernate() ->
     [{doc,"Check that an SSL connection that is started with option "
       "{hibernate_after, 1000} indeed hibernates after 1000ms of "
@@ -2490,7 +2592,10 @@ ssl_accept_timeout(Config) ->
 	    ssl_test_lib:check_result(Server, {error, timeout}),
 	    receive
 		{'EXIT', Server, _} ->
-		    [] = supervisor:which_children(ssl_connection_sup)
+		    %% Make sure supervisor had time to react on process exit
+		    %% Could we come up with a better solution to this?
+		    ct:sleep(500), 
+		    [] = supervisor:which_children(tls_connection_sup)
 	    end
     end.
 
@@ -2646,7 +2751,7 @@ tcp_error_propagation_in_active_mode(Config) when is_list(Config) ->
     {status, _, _, StatusInfo} = sys:get_status(Pid),
     [_, _,_, _, Prop] = StatusInfo,
     State = ssl_test_lib:state(Prop),
-    Socket = element(10, State),
+    Socket = element(11, State),
 
     %% Fake tcp error
     Pid ! {tcp_error, Socket, etimedout},
@@ -2801,6 +2906,47 @@ versions_option(Config) when is_list(Config) ->
     end,	    
    
     ssl_test_lib:check_result(ErrClient, {error, {tls_alert, "protocol version"}}).
+
+
+%%--------------------------------------------------------------------
+
+server_name_indication_option() ->
+    [{doc,"Test API server_name_indication option to connect."}].
+server_name_indication_option(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, {ssl_test_lib, send_recv_result_active, []}},
+					{options, ServerOpts}]),
+    Port = ssl_test_lib:inet_port(Server),
+    
+    Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					 {host, Hostname},
+					 {from, self()}, 
+					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
+					 {options,  
+					  [{server_name_indication, disable} | 
+					   ClientOpts]}
+					]),
+    
+    ssl_test_lib:check_result(Server, ok, Client0, ok),
+    Server ! listen,				       
+    
+    Client1 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
+					 {host, Hostname},
+					 {from, self()}, 
+					 {mfa, {ssl_test_lib, send_recv_result_active, []}},
+					 {options,
+					  [{server_name_indication, Hostname} | ClientOpts]
+					 }]),    
+    ssl_test_lib:check_result(Server, ok, Client1, ok),
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client0),
+    ssl_test_lib:close(Client1).
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -3363,3 +3509,28 @@ shutdown_both_result(Socket, client) ->
 
 peername_result(S) ->
     ssl:peername(S).
+
+version_option_test(Config, Version) ->
+    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, {ssl_test_lib, send_recv_result, []}},
+				   {options,  [{active, false}, {versions, [Version]}| 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, send_recv_result, []}},
+				   {options, [{active, false}, {versions, [Version]}| ClientOpts]}]),
+    
+    ct:log("Testcase ~p, Client ~p  Server ~p ~n",
+	   [self(), Client, Server]),
+    
+    ssl_test_lib:check_result(Server, ok, Client, ok),
+    
+    ssl_test_lib:close(Server),
+    ssl_test_lib:close(Client).
diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
index f76c55f670..14047c6e9c 100644
--- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl
+++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl
@@ -250,10 +250,15 @@ server_require_peer_cert_fail(Config) when is_list(Config) ->
 					      {host, Hostname},
 					      {from, self()},
 					      {options, [{active, false} | BadClientOpts]}]),
-
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "handshake failure"}},
-			      Client, {error, {tls_alert, "handshake failure"}}).
-
+    receive
+	{Server, {error, {tls_alert, "handshake failure"}}} ->
+	    receive
+		{Client, {error, {tls_alert, "handshake failure"}}} ->
+		    ok;
+		{Client, {error, closed}} ->
+		    ok
+	    end
+    end.
 
 %%--------------------------------------------------------------------
 verify_fun_always_run_client() ->
@@ -827,9 +832,16 @@ unknown_server_ca_fail(Config) when is_list(Config) ->
 					       [{verify, verify_peer},
 						{verify_fun, FunAndState}
 						| ClientOpts]}]),
+    receive
+	{Server, {error, {tls_alert, "unknown ca"}}} ->
+	    receive
+		{Client, {error, {tls_alert, "unknown ca"}}} ->
+		    ok;
+		{Client, {error, closed}} ->
+		    ok
+	    end
+    end.
 
-    ssl_test_lib:check_result(Server, {error, {tls_alert, "unknown ca"}},
-			      Client, {error, {tls_alert, "unknown ca"}}).
 
 %%--------------------------------------------------------------------
 unknown_server_ca_accept_verify_none() ->
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 7bfd678f4b..1a1b2af8d4 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -95,7 +95,7 @@ common_init(Case, Config) ->
 
 end_per_testcase(Case, Config) when is_list(Config) ->
     Flags = proplists:get_value(old_flags, Config),
-    os:putenv("ERL_FLAGS", Flags),
+    catch os:putenv("ERL_FLAGS", Flags),
     common_end(Case, Config).
 
 common_end(_, Config) ->
@@ -324,7 +324,7 @@ start_ssl_node_raw(Name, Args) ->
 				 [binary, {packet, 4}, {active, false}]),
     {ok, ListenPort} = inet:port(LSock),
     CmdLine = mk_node_cmdline(ListenPort, Name, Args),
-    ?t:format("Attempting to start ssl node ~s: ~s~n", [Name, CmdLine]),
+    ?t:format("Attempting to start ssl node ~ts: ~ts~n", [Name, CmdLine]),
     case open_port({spawn, CmdLine}, []) of
 	Port when is_port(Port) ->
 	    unlink(Port),
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl
index a40f07fd07..7e8e8d2611 100644
--- a/lib/ssl/test/ssl_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_handshake_SUITE.erl
@@ -32,43 +32,54 @@
 %%--------------------------------------------------------------------
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
-all() -> [
-	decode_hello_handshake,
-	decode_single_hello_extension_correctly,
-	decode_unknown_hello_extension_correctly].
+all() -> [decode_hello_handshake,
+	  decode_single_hello_extension_correctly,
+	  decode_unknown_hello_extension_correctly,
+	  encode_single_hello_sni_extension_correctly].
 
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
 %%--------------------------------------------------------------------
 decode_hello_handshake(_Config) ->
-	HelloPacket = <<16#02, 16#00, 16#00,
-	16#44, 16#03, 16#03, 16#4e, 16#7f, 16#c1, 16#03, 16#35,
-	16#c2, 16#07, 16#b9, 16#4a, 16#58, 16#af, 16#34, 16#07,
-	16#a6, 16#7e, 16#ef, 16#52, 16#cb, 16#e0, 16#ea, 16#b7,
-	16#aa, 16#47, 16#c8, 16#c2, 16#2c, 16#66, 16#fa, 16#f8,
-	16#09, 16#42, 16#cf, 16#00, 16#c0, 16#30, 16#00, 16#00,
-	16#1c, 
-	16#00, 16#0b, 16#00, 16#04, 16#03, 16#00, 16#01, 16#02, % ec_point_formats
-	16#ff, 16#01, 16#00, 16#01, 16#00, %% renegotiate 
-	16#00, 16#23,
-	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>>,
-	
-	Version = {3, 0},
-	{Records, _Buffer} = tls_handshake:get_tls_handshake(Version, HelloPacket, <<>>),
-	
-	{Hello, _Data} = hd(Records),
-	#renegotiation_info{renegotiated_connection = <<0>>} = Hello#server_hello.renegotiation_info.
+    HelloPacket = <<16#02, 16#00, 16#00,
+		    16#44, 16#03, 16#03, 16#4e, 16#7f, 16#c1, 16#03, 16#35,
+		    16#c2, 16#07, 16#b9, 16#4a, 16#58, 16#af, 16#34, 16#07,
+		    16#a6, 16#7e, 16#ef, 16#52, 16#cb, 16#e0, 16#ea, 16#b7,
+		    16#aa, 16#47, 16#c8, 16#c2, 16#2c, 16#66, 16#fa, 16#f8,
+		    16#09, 16#42, 16#cf, 16#00, 16#c0, 16#30, 16#00, 16#00,
+		    16#1c,
+		    16#00, 16#0b, 16#00, 16#04, 16#03, 16#00, 16#01, 16#02, % ec_point_formats
+		    16#ff, 16#01, 16#00, 16#01, 16#00, %% renegotiate
+		    16#00, 16#23,
+		    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>>,
 	
+    Version = {3, 0},
+    {Records, _Buffer} = tls_handshake:get_tls_handshake(Version, HelloPacket, <<>>),
+
+    {Hello, _Data} = hd(Records),
+    #renegotiation_info{renegotiated_connection = <<0>>}
+	= (Hello#server_hello.extensions)#hello_extensions.renegotiation_info.
+
 decode_single_hello_extension_correctly(_Config) -> 
-	Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
-	Extensions = tls_handshake:dec_hello_extensions(Renegotiation, []),
-	[{renegotiation_info,#renegotiation_info{renegotiated_connection = <<0>>}}] = Extensions.
-	
+    Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
+    Extensions = ssl_handshake:decode_hello_extensions(Renegotiation),
+    #renegotiation_info{renegotiated_connection = <<0>>}
+	= Extensions#hello_extensions.renegotiation_info.
+
 
 decode_unknown_hello_extension_correctly(_Config) ->
-	FourByteUnknown = <<16#CA,16#FE, ?UINT16(4), 3, 0, 1, 2>>,
-	Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
-	Extensions = tls_handshake:dec_hello_extensions(<<FourByteUnknown/binary, Renegotiation/binary>>, []),
-	[{renegotiation_info,#renegotiation_info{renegotiated_connection = <<0>>}}] = Extensions.
-	
+    FourByteUnknown = <<16#CA,16#FE, ?UINT16(4), 3, 0, 1, 2>>,
+    Renegotiation = <<?UINT16(?RENEGOTIATION_EXT), ?UINT16(1), 0>>,
+    Extensions = ssl_handshake:decode_hello_extensions(<<FourByteUnknown/binary, Renegotiation/binary>>),
+     #renegotiation_info{renegotiated_connection = <<0>>}
+	= Extensions#hello_extensions.renegotiation_info.
+
+encode_single_hello_sni_extension_correctly(_Config) ->
+    Exts = #hello_extensions{sni = #sni{hostname = "test.com"}},
+    SNI = <<16#00, 16#00, 16#00, 16#0d, 16#00, 16#0b, 16#00, 16#00, 16#08,
+	    $t,    $e,    $s,    $t,    $.,    $c,    $o,    $m>>,
+    ExtSize = byte_size(SNI),
+    HelloExt = <<ExtSize:16/unsigned-big-integer, SNI/binary>>,
+    Encoded = ssl_handshake:encode_hello_extensions(Exts),
+    HelloExt = Encoded.
diff --git a/lib/ssl/test/ssl_npn_hello_SUITE.erl b/lib/ssl/test/ssl_npn_hello_SUITE.erl
index ef5a02abef..68ff9172e9 100644
--- a/lib/ssl/test/ssl_npn_hello_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_hello_SUITE.erl
@@ -52,7 +52,7 @@ encode_and_decode_client_hello_test(_Config) ->
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
-    NextProtocolNegotiation = DecodedHandshakeMessage#client_hello.next_protocol_negotiation,
+    NextProtocolNegotiation = (DecodedHandshakeMessage#client_hello.extensions)#hello_extensions.next_protocol_negotiation,
     NextProtocolNegotiation = undefined.
 %%--------------------------------------------------------------------
 encode_and_decode_npn_client_hello_test(_Config) ->
@@ -60,7 +60,7 @@ encode_and_decode_npn_client_hello_test(_Config) ->
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
-    NextProtocolNegotiation = DecodedHandshakeMessage#client_hello.next_protocol_negotiation,
+    NextProtocolNegotiation = (DecodedHandshakeMessage#client_hello.extensions)#hello_extensions.next_protocol_negotiation,
     NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<>>}.
 %%--------------------------------------------------------------------
 encode_and_decode_server_hello_test(_Config) ->
@@ -68,7 +68,7 @@ encode_and_decode_server_hello_test(_Config) ->
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
-    NextProtocolNegotiation = DecodedHandshakeMessage#server_hello.next_protocol_negotiation,
+    NextProtocolNegotiation = (DecodedHandshakeMessage#server_hello.extensions)#hello_extensions.next_protocol_negotiation,
     NextProtocolNegotiation = undefined.
 %%--------------------------------------------------------------------
 encode_and_decode_npn_server_hello_test(_Config) ->
@@ -76,56 +76,59 @@ encode_and_decode_npn_server_hello_test(_Config) ->
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
     {[{DecodedHandshakeMessage, _Raw}], _} =
 	tls_handshake:get_tls_handshake(Version, list_to_binary(HandShakeData), <<>>),
-    NextProtocolNegotiation = DecodedHandshakeMessage#server_hello.next_protocol_negotiation,
+    NextProtocolNegotiation = (DecodedHandshakeMessage#server_hello.extensions)#hello_extensions.next_protocol_negotiation,
     ct:log("~p ~n", [NextProtocolNegotiation]),
     NextProtocolNegotiation = #next_protocol_negotiation{extension_data = <<6, "spdy/2">>}.
 
 %%--------------------------------------------------------------------
 create_server_hello_with_no_advertised_protocols_test(_Config) ->
-    Hello = tls_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),  false, undefined, undefined, undefined),
-    undefined = Hello#server_hello.next_protocol_negotiation.
+    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(), #hello_extensions{}),
+    undefined = (Hello#server_hello.extensions)#hello_extensions.next_protocol_negotiation.
 %%--------------------------------------------------------------------
 create_server_hello_with_advertised_protocols_test(_Config) ->
-    Hello = tls_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),
-				       false, [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>], undefined, undefined),
-    #next_protocol_negotiation{extension_data = <<6, "spdy/1", 8, "http/1.0", 8, "http/1.1">>} =
-	Hello#server_hello.next_protocol_negotiation.
+    Hello = ssl_handshake:server_hello(<<>>, {3, 0}, create_connection_states(),
+				       #hello_extensions{next_protocol_negotiation = [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>]}),
+    [<<"spdy/1">>, <<"http/1.0">>, <<"http/1.1">>] =
+	(Hello#server_hello.extensions)#hello_extensions.next_protocol_negotiation.
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 create_client_handshake(Npn) ->
+    Vsn = {1, 2},
     tls_handshake:encode_handshake(#client_hello{
-        client_version = {1, 2},
-        random = <<1:256>>,
-        session_id = <<>>,
-        cipher_suites = [?TLS_DHE_DSS_WITH_DES_CBC_SHA],
-        compression_methods = "",
-        next_protocol_negotiation = Npn,
-        renegotiation_info = #renegotiation_info{}
-    }, vsn).
+				      client_version = Vsn,
+				      random = <<1:256>>,
+				      session_id = <<>>,
+				      cipher_suites = [?TLS_DHE_DSS_WITH_DES_CBC_SHA],
+				      compression_methods = "",
+				      extensions = #hello_extensions{
+						      next_protocol_negotiation = Npn,
+						      renegotiation_info = #renegotiation_info{}}
+				     }, Vsn).
 
 create_server_handshake(Npn) ->
+    Vsn = {1, 2},
     tls_handshake:encode_handshake(#server_hello{
-        server_version = {1, 2},
-        random = <<1:256>>,
-        session_id = <<>>,
-        cipher_suite = ?TLS_DHE_DSS_WITH_DES_CBC_SHA,
-        compression_method = 1,
-        next_protocol_negotiation = Npn,
-        renegotiation_info = #renegotiation_info{}
-    }, vsn).
+				      server_version = Vsn,
+				      random = <<1:256>>,
+				      session_id = <<>>,
+				      cipher_suite = ?TLS_DHE_DSS_WITH_DES_CBC_SHA,
+				      compression_method = 1,
+				      extensions = #hello_extensions{
+						      next_protocol_negotiation = Npn,
+						      renegotiation_info = #renegotiation_info{}}
+				     }, Vsn).
 
 create_connection_states() ->
     #connection_states{
-        pending_read = #connection_state{
-            security_parameters = #security_parameters{
-                server_random = <<1:256>>,
-                compression_algorithm = 1,
-                cipher_suite = ?TLS_DHE_DSS_WITH_DES_CBC_SHA
-            }
-        },
-
-        current_read = #connection_state {
-            secure_renegotiation = false
-        }
-    }.
+       pending_read = #connection_state{
+			 security_parameters = #security_parameters{
+						  server_random = <<1:256>>,
+						  compression_algorithm = 1,
+						  cipher_suite = ?TLS_DHE_DSS_WITH_DES_CBC_SHA
+						 }
+			},
+       current_read = #connection_state {
+			 secure_renegotiation = false
+			}
+      }.
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 36f7af784d..d50498f547 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -1631,8 +1631,8 @@ header_decode_one_byte_active(Config) when is_list(Config) ->
 					{from, self()},
 					{mfa, {?MODULE, client_header_decode_active,
 					       [Data, [11 | <<"Hello world">> ]]}},
-					{options, [{active, true}, {header, 1},
-						   binary | ClientOpts]}]),
+					{options, [{active, true}, binary, {header, 1}
+						    | ClientOpts]}]),
 
     ssl_test_lib:check_result(Server, ok, Client, ok),
 
@@ -1688,7 +1688,7 @@ header_decode_two_bytes_two_sent_active(Config) when is_list(Config) ->
     Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
 					{from, self()},
 					{mfa, {?MODULE, server_header_decode_active,
-					       [Data, [$H, $e]]}},
+					       [Data, [$H, $e | <<>>]]}},
 					{options, [{active, true}, binary, 
 						   {header,2}|ServerOpts]}]),
 
@@ -1697,7 +1697,7 @@ header_decode_two_bytes_two_sent_active(Config) when is_list(Config) ->
 					{host, Hostname},
 					{from, self()},
 					{mfa, {?MODULE, client_header_decode_active,
-					       [Data, [$H, $e]]}},
+					       [Data, [$H, $e | <<>>]]}},
 					{options, [{active, true}, {header, 2},
 						   binary | ClientOpts]}]),
 
@@ -1765,8 +1765,8 @@ header_decode_one_byte_passive(Config) when is_list(Config) ->
 					{from, self()},
 					{mfa, {?MODULE, client_header_decode_passive,
 					       [Data, [11 | <<"Hello world">> ]]}},
-					{options, [{active, false}, {header, 1},
-						   binary | ClientOpts]}]),
+					{options, [{active, false}, binary, {header, 1}
+						   | ClientOpts]}]),
 
     ssl_test_lib:check_result(Server, ok, Client, ok),
 
@@ -1822,7 +1822,7 @@ header_decode_two_bytes_two_sent_passive(Config) when is_list(Config) ->
     Server = ssl_test_lib:start_server([{node, ClientNode}, {port, 0},
 					{from, self()},
 					{mfa, {?MODULE, server_header_decode_passive,
-					       [Data, [$H, $e]]}},
+					       [Data, [$H, $e | <<>>]]}},
 					{options, [{active, false}, binary,
 						   {header,2}|ServerOpts]}]),
 
@@ -1831,7 +1831,7 @@ header_decode_two_bytes_two_sent_passive(Config) when is_list(Config) ->
 					{host, Hostname},
 					{from, self()},
 					{mfa, {?MODULE, client_header_decode_passive,
-					       [Data, [$H, $e]]}},
+					       [Data, [$H, $e | <<>>]]}},
 					{options, [{active, false}, {header, 2},
 						   binary | ClientOpts]}]),
 
@@ -2124,10 +2124,14 @@ client_header_decode_passive(Socket, Packet, Result) ->
 %% option and the bitsynax makes it obsolete!
 check_header_result([Byte1 | _], [Byte1]) ->
     ok;
+check_header_result([Byte1 | _], [Byte1| <<>>]) ->
+    ok;
 check_header_result([Byte1, Byte2 | _], [Byte1, Byte2]) ->
     ok;
-check_header_result(_,Got) ->
-    exit({?LINE, Got}).
+check_header_result([Byte1, Byte2 | _], [Byte1, Byte2 | <<>>]) ->
+    ok;
+check_header_result(Expected,Got) ->
+    exit({?LINE, {Expected, 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_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 34c52b10b3..7ed9adfcd9 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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 @@
 -compile(export_all).
 
 -record(sslsocket, { fd = nil, pid = nil}).
+-define(SLEEP, 1000).
 
 %% For now always run locally
 run_where(_) ->
@@ -145,7 +146,7 @@ remove_close_msg(ReconnectTimes) ->
     end.
 	    
 start_client(Args) ->
-    Result = spawn_link(?MODULE, run_client, [lists:delete(return_socket, Args)]),
+    Result = spawn_link(?MODULE, run_client_init, [lists:delete(return_socket, Args)]),
     receive 
 	{ connected, Socket } ->
         case lists:member(return_socket, Args) of
@@ -154,6 +155,10 @@ start_client(Args) ->
         end
     end.
 
+run_client_init(Opts) ->
+    put(retries, 0),
+    run_client(Opts).
+
 run_client(Opts) ->
     Node = proplists:get_value(node, Opts),
     Host = proplists:get_value(host, Opts),
@@ -188,9 +193,19 @@ run_client(Opts) ->
 		{gen_tcp, closed} ->
 		    ok
 	    end;
+	{error, econnrefused = Reason} ->
+	    case get(retries) of
+		N when N < 5 ->
+		    put(retries, N+1),
+		    ct:sleep(?SLEEP),
+		    run_client(Opts);
+	       _ ->
+		    ct:log("Client faild several times: connection failed: ~p ~n", [Reason]),
+		    Pid ! {self(), {error, Reason}}
+	    end;
 	{error, Reason} ->
 	    ct:log("Client: connection failed: ~p ~n", [Reason]),
-	       Pid ! {self(), {error, Reason}}
+	    Pid ! {self(), {error, Reason}}
     end.
 
 close(Pid) ->
@@ -949,7 +964,10 @@ init_tls_version(Version) ->
 sufficient_crypto_support('tlsv1.2') ->
     CryptoSupport = crypto:supports(),
     proplists:get_bool(sha256, proplists:get_value(hashs, CryptoSupport));
-sufficient_crypto_support(ciphers_ec) ->
+sufficient_crypto_support(Group) when Group == ciphers_ec;     %% From ssl_basic_SUITE
+				      Group == erlang_server;  %% From ssl_ECC_SUITE
+				      Group == erlang_client;  %% From ssl_ECC_SUITE
+				      Group == erlang ->       %% From ssl_ECC_SUITE
     CryptoSupport = crypto:supports(),
     proplists:get_bool(ecdh, proplists:get_value(public_keys, CryptoSupport));
 sufficient_crypto_support(_) ->
@@ -1026,3 +1044,39 @@ cipher_restriction(Config0) ->
 	true ->
 	    Config0
     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.
+
+wait_for_openssl_server() ->
+    receive
+	{Port, {data, Debug}} when is_port(Port) ->
+	    ct:log("openssl ~s~n",[Debug]),
+	    %% openssl has started make sure
+	    %% it will be in accept. Parsing
+	    %% output is too error prone. (Even
+	    %% more so than sleep!)
+	    ct:sleep(?SLEEP)
+    end.
+
+version_flag(tlsv1) ->
+    " -tls1 ";
+version_flag('tlsv1.1') ->
+    " -tls1_1 ";
+version_flag('tlsv1.2') ->
+    " -tls1_2 ";
+version_flag(sslv3) ->
+    " -ssl3 ".
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl
index 019ed58b1b..a7361755e5 100644
--- a/lib/ssl/test/ssl_to_openssl_SUITE.erl
+++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +120,7 @@ end_per_suite(_Config) ->
 init_per_group(GroupName, Config) ->
     case ssl_test_lib:is_tls_version(GroupName) of
 	true ->
-	    case check_sane_openssl_version(GroupName) of
+	    case ssl_test_lib:check_sane_openssl_version(GroupName) of
 		true ->
 		    ssl_test_lib:init_tls_version(GroupName),
 		    Config;
@@ -154,22 +154,31 @@ special_init(TestCase, Config)
        TestCase == erlang_client_openssl_server_nowrap_seqnum;
        TestCase == erlang_server_openssl_client_nowrap_seqnum
        ->
-    check_sane_openssl_renegotaite(Config);
+    {ok, Version} = application:get_env(ssl, protocol_version),
+    check_sane_openssl_renegotaite(Config, Version);
 
 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;        
          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(TestCase, Config)
+  when TestCase == erlang_server_openssl_client_npn_renegotiate;
+       TestCase == erlang_client_openssl_server_npn_renegotiate ->
+    {ok, Version} = application:get_env(ssl, protocol_version),
+    case check_sane_openssl_renegotaite(Config, Version) of
+	{skip, _} = Skip ->
+	    Skip;
+	_ -> 
+	    check_openssl_npn_support(Config)
+    end;
 special_init(_, Config) ->
     Config.
 
@@ -204,7 +213,7 @@ basic_erlang_client_openssl_server(Config) when is_list(Config) ->
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
@@ -239,7 +248,7 @@ basic_erlang_server_openssl_client(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(Server),
 
     Cmd = "openssl s_client -port " ++ integer_to_list(Port) ++
-	" -host localhost",
+	" -host localhost" ++ workaround_openssl_s_clinent(),
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
     
@@ -269,14 +278,14 @@ erlang_client_openssl_server(Config) when is_list(Config) ->
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile  ++ " -key " ++ KeyFile,
     
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
@@ -311,7 +320,7 @@ erlang_server_openssl_client(Config) when is_list(Config) ->
     Port = ssl_test_lib:inet_port(Server),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
 
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -host localhost",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
@@ -345,7 +354,7 @@ erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
 
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile  
 	++ " -key " ++ KeyFile ++ " -Verify 2 -msg",
     
@@ -353,7 +362,7 @@ erlang_client_openssl_server_dsa_cert(Config) when is_list(Config) ->
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
@@ -392,7 +401,7 @@ erlang_server_openssl_client_dsa_cert(Config) when is_list(Config) ->
                           {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
        " -host localhost " ++  " -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile
        ++ " -key " ++ KeyFile ++ " -msg",
 
@@ -428,7 +437,7 @@ erlang_server_openssl_client_reuse_session(Config) when is_list(Config) ->
 			   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -host localhost -reconnect",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
@@ -464,14 +473,14 @@ erlang_client_openssl_server_renegotiate(Config) when is_list(Config) ->
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
 
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
@@ -513,14 +522,14 @@ erlang_client_openssl_server_nowrap_seqnum(Config) when is_list(Config) ->
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
@@ -559,7 +568,7 @@ erlang_server_openssl_client_nowrap_seqnum(Config) when is_list(Config) ->
 					{options, [{renegotiate_at, N}, {reuse_sessions, false} | ServerOpts]}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_client -port " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -host localhost -msg",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
@@ -594,14 +603,14 @@ erlang_client_openssl_server_no_server_ca_cert(Config) when is_list(Config) ->
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ " -msg", 
     
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
@@ -636,7 +645,7 @@ erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
     CaCertFile = proplists:get_value(cacertfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -CAfile " ++ CaCertFile 
 	++ " -key " ++ KeyFile ++ " -Verify 2",
     
@@ -644,7 +653,7 @@ erlang_client_openssl_server_client_cert(Config) when is_list(Config) ->
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					{host, Hostname},
@@ -688,7 +697,7 @@ erlang_server_openssl_client_client_cert(Config) when is_list(Config) ->
     KeyFile = proplists:get_value(keyfile, ClientOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
     Cmd = "openssl s_client -cert " ++ CertFile  ++ " -CAfile " ++ CaCertFile 
-	++ " -key " ++ KeyFile ++ " -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+	++ " -key " ++ KeyFile ++ " -port " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
 	" -host localhost",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
@@ -776,14 +785,14 @@ erlang_client_bad_openssl_server(Config) when is_list(Config) ->
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  ssl_test_lib:version_flag(Version) ++
  	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
     
     Client0 = ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, 
 					 {host, Hostname},
@@ -839,7 +848,7 @@ expired_session(Config) when is_list(Config) ->
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
     
     Client0 =
 	ssl_test_lib:start_client([{node, ClientNode}, 
@@ -897,11 +906,22 @@ ssl2_erlang_server_openssl_client(Config) when is_list(Config) ->
     
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]), 
     true = port_command(OpenSslPort, Data),
+    
+    ct:log("Ports ~p~n", [[erlang:port_info(P) || P <- erlang:ports()]]), 
     receive
-	{'EXIT', OpenSslPort, _} ->
+	{'EXIT', OpenSslPort, _} = Exit ->
+	    ct:log("Received: ~p ~n", [Exit]),
 	    ok
-
     end,
+    receive 
+	{'EXIT', _, _} = UnkownExit ->
+	    Msg = lists:flatten(io_lib:format("Received: ~p ~n", [UnkownExit])),
+	    ct:log(Msg),
+	    ct:comment(Msg),
+	    ok
+    after 0 ->
+	    ok
+    end,		
     ssl_test_lib:check_result(Server, {error, {tls_alert, "protocol version"}}),
     process_flag(trap_exit, false).
 
@@ -1033,14 +1053,14 @@ cipher(CipherSuite, Version, Config, ClientOpts, ServerOpts) ->
     CertFile = proplists:get_value(certfile, ServerOpts),
     KeyFile = proplists:get_value(keyfile, ServerOpts),
 
-    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+    Cmd = "openssl s_server -accept " ++ integer_to_list(Port)  ++  ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile ++ " -key " ++ KeyFile ++ "",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpenSslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     ConnectionInfo = {ok, {Version, CipherSuite}},
 
@@ -1097,14 +1117,14 @@ start_erlang_client_and_openssl_server_with_opts(Config, ErlangClientOpts, Opens
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
 
     Cmd = "openssl s_server " ++ OpensslServerOpts ++ "  -accept " ++ 
-	integer_to_list(Port) ++  version_flag(Version) ++
+	integer_to_list(Port) ++  ssl_test_lib:version_flag(Version) ++
 	" -cert " ++ CertFile  ++ " -key " ++ KeyFile,
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
                     {host, Hostname},
@@ -1136,14 +1156,14 @@ start_erlang_client_and_openssl_server_for_npn_negotiation(Config, Data, Callbac
     KeyFile = proplists:get_value(keyfile, ServerOpts),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
 
-    Cmd = "openssl s_server -msg -nextprotoneg http/1.1,spdy/2  -accept " ++ integer_to_list(Port)  ++  version_flag(Version) ++
+    Cmd = "openssl s_server -msg -nextprotoneg http/1.1,spdy/2  -accept " ++ integer_to_list(Port)  ++  ssl_test_lib:version_flag(Version) ++
     " -cert " ++ CertFile  ++ " -key " ++ KeyFile,
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
 
     OpensslPort =  open_port({spawn, Cmd}, [stderr_to_stdout]),
 
-    wait_for_openssl_server(),
+    ssl_test_lib:wait_for_openssl_server(),
 
     Client = ssl_test_lib:start_client([{node, ClientNode}, {port, Port},
                     {host, Hostname},
@@ -1174,7 +1194,7 @@ start_erlang_server_and_openssl_client_for_npn_negotiation(Config, Data, Callbac
                     {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_client -nextprotoneg http/1.0,spdy/2 -msg -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_client -nextprotoneg http/1.0,spdy/2 -msg -port " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
     " -host localhost",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
@@ -1203,7 +1223,7 @@ start_erlang_server_and_openssl_client_with_opts(Config, ErlangServerOpts, OpenS
                     {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     Version = tls_record:protocol_version(tls_record:highest_protocol_version([])),
-    Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port)  ++ version_flag(Version) ++
+    Cmd = "openssl s_client " ++ OpenSSLClientOpts ++ " -msg -port " ++ integer_to_list(Port)  ++ ssl_test_lib:version_flag(Version) ++
     " -host localhost",
 
     ct:log("openssl cmd: ~p~n", [Cmd]),
@@ -1302,25 +1322,6 @@ server_sent_garbage(Socket) ->
 	    
     end.
     
-wait_for_openssl_server() ->
-    receive
-     	{Port, {data, Debug}} when is_port(Port) ->
-	    ct:log("openssl ~s~n",[Debug]),
-	    %% openssl has started make sure
-	    %% it will be in accept. Parsing
-	    %% output is too error prone. (Even 
-	    %% more so than sleep!)
-	    ct: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"),
@@ -1331,8 +1332,25 @@ check_openssl_npn_support(Config) ->
             Config
     end.
 
+check_sane_openssl_renegotaite(Config, Version) when Version == 'tlsv1.1';
+						     Version == 'tlsv1.2' ->
+    case os:cmd("openssl version") of     
+	"OpenSSL 1.0.1c" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 1.0.1b" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 1.0.1a" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	"OpenSSL 1.0.1" ++ _ ->
+	    {skip, "Known renegotiation bug in OpenSSL"};
+	_ ->
+	    check_sane_openssl_renegotaite(Config)
+    end;
+check_sane_openssl_renegotaite(Config, _) ->
+    check_sane_openssl_renegotaite(Config).
+	
 check_sane_openssl_renegotaite(Config) ->
-    case os:cmd("openssl version") of
+    case os:cmd("openssl version") of     
 	"OpenSSL 0.9.8" ++ _ ->
 	    {skip, "Known renegotiation bug in OpenSSL"};
 	"OpenSSL 0.9.7" ++ _ ->
@@ -1365,18 +1383,20 @@ supports_sslv2(Port) ->
 	    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
+workaround_openssl_s_clinent() ->
+    %% http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683159
+    %% https://bugs.archlinux.org/task/33919
+    %% Bug seems to manifests it self if TLS version is not
+    %% explicitly specified 
+    case os:cmd("openssl version") of 
+	"OpenSSL 1.0.1c" ++ _ ->
+	    " -no_tls1_2 ";
+	"OpenSSL 1.0.1d" ++ _ ->
+	    " -no_tls1_2 ";
+	"OpenSSL 1.0.1e" ++ _ ->
+	    " -no_tls1_2 ";
+	"OpenSSL 1.0.1f" ++ _ ->
+	    " -no_tls1_2 ";
+	_  ->
+	    ""
     end.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 9dd151553c..a6e0efed25 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 5.3
+SSL_VSN = 5.3.3
diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml
index a79fcd487e..b03a2fa0cc 100644
--- a/lib/stdlib/doc/src/array.xml
+++ b/lib/stdlib/doc/src/array.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 <erlref>
 <header>
     <copyright>
-      <year>2007</year><year>2011</year>
+      <year>2007</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -84,7 +84,7 @@ the default value cannot be confused with the values of set entries.</p>
   {'EXIT',{badarg,_}} = (catch array:get(18, A3)).</pre></description>
 <datatypes>
   <datatype>
-    <name><marker id="type-array">array()</marker></name>
+    <name name="array" n_vars="1"/>
     <desc>
       <p>A functional, extendible array. The representation is
         not documented and is subject to change without notice. Note that
@@ -92,6 +92,12 @@ the default value cannot be confused with the values of set entries.</p>
     </desc>
   </datatype>
   <datatype>
+    <name name="array" n_vars="0"/>
+    <desc>
+      <p><c>array()</c> is equivalent to <c>array(term())</c>.</p>
+    </desc>
+  </datatype>
+  <datatype>
     <name name="array_indx"/>
   </datatype>
   <datatype>
@@ -189,7 +195,7 @@ the default value cannot be confused with the values of set entries.</p>
 
 <desc><marker id="from_orddict-2"/>
 
-<p>Convert an ordered list of pairs <c>{Index, Value}</c> to a
+<p>Convert an ordered list of pairs <c>{Index, <anno>Value</anno>}</c> to a
   corresponding extendible array. <c><anno>Default</anno></c> is used as the value for
   uninitialized entries of the array. If <c><anno>Orddict</anno></c> is not a proper,
   ordered list of pairs whose first elements are nonnegative
@@ -455,7 +461,7 @@ cannot be changed once the array has been created.</p>
 
 <desc><marker id="sparse_to_orddict-1"/>
 
-<p>Convert the array to an ordered list of pairs <c>{Index, Value}</c>,
+<p>Convert the array to an ordered list of pairs <c>{Index, <anno>Value</anno>}</c>,
   skipping default-valued entries.
  </p>
 <p><em>See also:</em> <seealso marker="#to_orddict-1">to_orddict/1</seealso>.</p>
@@ -476,7 +482,7 @@ cannot be changed once the array has been created.</p>
 
 <desc><marker id="to_orddict-1"/>
 
-<p>Convert the array to an ordered list of pairs <c>{Index, Value}</c>.
+<p>Convert the array to an ordered list of pairs <c>{Index, <anno>Value</anno>}</c>.
  </p>
 <p><em>See also:</em> <seealso marker="#from_orddict-2">from_orddict/2</seealso>, <seealso marker="#sparse_to_orddict-1">sparse_to_orddict/1</seealso>.</p>
 </desc></func></funcs>
diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml
index f90a82187d..c4982f4eaa 100644
--- a/lib/stdlib/doc/src/base64.xml
+++ b/lib/stdlib/doc/src/base64.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index db65eb3848..eb4974a79f 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index 06cfad0b0b..2410f1f9b8 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2009</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/book.xml b/lib/stdlib/doc/src/book.xml
index 10ee6f3855..b1b67d661c 100644
--- a/lib/stdlib/doc/src/book.xml
+++ b/lib/stdlib/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml
index f2e3d8fb44..b49fa6ad67 100644
--- a/lib/stdlib/doc/src/c.xml
+++ b/lib/stdlib/doc/src/c.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index f8db48e00c..e32a639b81 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index 215ec154ed..6bbedb0662 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml
index b01acd02bf..942fd1f45e 100644
--- a/lib/stdlib/doc/src/dict.xml
+++ b/lib/stdlib/doc/src/dict.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -41,9 +41,15 @@
 
   <datatypes>
     <datatype>
-      <name><marker id="type-dict">dict()</marker></name>
+      <name name="dict" n_vars="2"/>
       <desc><p>Dictionary as returned by <c>new/0</c>.</p></desc>
     </datatype>
+    <datatype>
+      <name name="dict" n_vars="0"/>
+      <desc>
+        <p><c>dict()</c> is equivalent to <c>dict(term(), term())</c>.</p>
+      </desc>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
@@ -177,6 +183,13 @@ merge(Fun, D1, D2) ->
       </desc>
     </func>
     <func>
+      <name name="is_empty" arity="1"/>
+      <fsummary>Return true if the dictionary is empty</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Dict</anno></c> has no elements, <c>false</c> otherwise.</p>
+      </desc>
+    </func>
+    <func>
       <name name="store" arity="3"/>
       <fsummary>Store a value in a dictionary</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml
index 0afc70ebe0..9b9b48584b 100644
--- a/lib/stdlib/doc/src/digraph.xml
+++ b/lib/stdlib/doc/src/digraph.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -98,7 +98,7 @@
       <name name="d_protection"/>
     </datatype>
     <datatype>
-      <name><marker id="type-digraph">digraph()</marker></name>
+      <name name="graph"/>
       <desc><p>A digraph as returned by <c>new/0,1</c>.</p></desc>
     </datatype>
     <datatype>
diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml
index ef6e1cb46f..ef6f9d8611 100644
--- a/lib/stdlib/doc/src/digraph_utils.xml
+++ b/lib/stdlib/doc/src/digraph_utils.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2012</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml
index df7bf883fc..cf33530395 100644
--- a/lib/stdlib/doc/src/epp.xml
+++ b/lib/stdlib/doc/src/epp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml
index fd78788a45..b707dbcc02 100644
--- a/lib/stdlib/doc/src/erl_eval.xml
+++ b/lib/stdlib/doc/src/erl_eval.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/erl_expand_records.xml b/lib/stdlib/doc/src/erl_expand_records.xml
index 8ead438b31..1b5ee5de36 100644
--- a/lib/stdlib/doc/src/erl_expand_records.xml
+++ b/lib/stdlib/doc/src/erl_expand_records.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2005</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml
index 18cc2460f9..0f7042f0c6 100644
--- a/lib/stdlib/doc/src/erl_id_trans.xml
+++ b/lib/stdlib/doc/src/erl_id_trans.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/erl_internal.xml b/lib/stdlib/doc/src/erl_internal.xml
index b8d5ad73b3..54e560f8b9 100644
--- a/lib/stdlib/doc/src/erl_internal.xml
+++ b/lib/stdlib/doc/src/erl_internal.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml
index b7fbdd8799..1ca58baf9a 100644
--- a/lib/stdlib/doc/src/erl_lint.xml
+++ b/lib/stdlib/doc/src/erl_lint.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml
index 56a7131821..2d5aff3c6c 100644
--- a/lib/stdlib/doc/src/erl_parse.xml
+++ b/lib/stdlib/doc/src/erl_parse.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml
index 9ae4f3d91f..005c101973 100644
--- a/lib/stdlib/doc/src/erl_pp.xml
+++ b/lib/stdlib/doc/src/erl_pp.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml
index 54240dea19..855c8fc195 100644
--- a/lib/stdlib/doc/src/erl_scan.xml
+++ b/lib/stdlib/doc/src/erl_scan.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index fe166dbd01..f81e36f810 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2013</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 6db1ae3aa3..3df24bf688 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2013</year>
+      <year>1996</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -171,6 +171,10 @@
         <p>Returns a list of all tables at the node. Named tables are
           given by their names, unnamed tables are given by their
           table identifiers.</p>
+	<p>There is no guarantee of consistency in the returned list. Tables created
+	or deleted by other processes "during" the ets:all() call may or may
+	not be included in the list. Only tables created/deleted <em>before</em>
+	ets:all() is called are guaranteed to be included/excluded.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/stdlib/doc/src/fascicules.xml b/lib/stdlib/doc/src/fascicules.xml
index b30d34186e..0ded9007e0 100644
--- a/lib/stdlib/doc/src/fascicules.xml
+++ b/lib/stdlib/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml
index a6b3633066..16572df3c5 100644
--- a/lib/stdlib/doc/src/file_sorter.xml
+++ b/lib/stdlib/doc/src/file_sorter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml
index bd780b2b2f..6fa39f97f6 100644
--- a/lib/stdlib/doc/src/filelib.xml
+++ b/lib/stdlib/doc/src/filelib.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -49,6 +49,12 @@
     <datatype>
       <name name="dirname"/>
     </datatype>
+    <datatype>
+      <name name="dirname_all"/>
+    </datatype>
+    <datatype>
+      <name name="filename_all"/>
+    </datatype>
   </datatypes>
 
   <funcs>
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml
index 9296319b83..49b652f969 100644
--- a/lib/stdlib/doc/src/filename.xml
+++ b/lib/stdlib/doc/src/filename.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2011</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index f91fac9c82..ea96c14472 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -115,28 +115,40 @@
 
   <datatypes>
     <datatype>
-      <name><marker id="type-gb_set">gb_set()</marker></name>
+      <name name="set" n_vars="1"/>
       <desc><p>A GB set.</p></desc>
     </datatype>
     <datatype>
-      <name name="iter"/>
+      <name name="set" n_vars="0"/>
+      <desc>
+        <p><c>set()</c> is equivalent to <c>set(term())</c>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="iter" n_vars="1"/>
       <desc><p>A GB set iterator.</p></desc>
     </datatype>
+    <datatype>
+      <name name="iter" n_vars="0"/>
+      <desc>
+        <p><c>iter()</c> is equivalent to <c>iter(term())</c>.</p>
+      </desc>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
       <name name="add" arity="2"/>
       <name name="add_element" arity="2"/>
-      <fsummary>Add a (possibly existing) element to a gb_set</fsummary>
+      <fsummary>Add a (possibly existing) element to a set</fsummary>
       <desc>
-        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+        <p>Returns a new set formed from <c><anno>Set1</anno></c> with
           <c><anno>Element</anno></c> inserted. If <c><anno>Element</anno></c> is already an
           element in <c><anno>Set1</anno></c>, nothing is changed.</p>
       </desc>
     </func>
     <func>
       <name name="balance" arity="1"/>
-      <fsummary>Rebalance tree representation of a gb_set</fsummary>
+      <fsummary>Rebalance tree representation of a set</fsummary>
       <desc>
         <p>Rebalances the tree representation of <c><anno>Set1</anno></c>. Note that
           this is rarely necessary, but may be motivated when a large
@@ -148,9 +160,9 @@
     </func>
     <func>
       <name name="delete" arity="2"/>
-      <fsummary>Remove an element from a gb_set</fsummary>
+      <fsummary>Remove an element from a set</fsummary>
       <desc>
-        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+        <p>Returns a new set formed from <c><anno>Set1</anno></c> with
           <c><anno>Element</anno></c> removed. Assumes that <c><anno>Element</anno></c> is present
           in <c><anno>Set1</anno></c>.</p>
       </desc>
@@ -158,9 +170,9 @@
     <func>
       <name name="delete_any" arity="2"/>
       <name name="del_element" arity="2"/>
-      <fsummary>Remove a (possibly non-existing) element from a gb_set</fsummary>
+      <fsummary>Remove a (possibly non-existing) element from a set</fsummary>
       <desc>
-        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+        <p>Returns a new set formed from <c><anno>Set1</anno></c> with
           <c><anno>Element</anno></c> removed. If <c><anno>Element</anno></c> is not an element
           in <c><anno>Set1</anno></c>, nothing is changed.</p>
       </desc>
@@ -168,7 +180,7 @@
     <func>
       <name name="difference" arity="2"/>
       <name name="subtract" arity="2"/>
-      <fsummary>Return the difference of two gb_sets</fsummary>
+      <fsummary>Return the difference of two sets</fsummary>
       <desc>
         <p>Returns only the elements of <c><anno>Set1</anno></c> which are not also
           elements of <c><anno>Set2</anno></c>.</p>
@@ -177,14 +189,14 @@
     <func>
       <name name="empty" arity="0"/>
       <name name="new" arity="0"/>
-      <fsummary>Return an empty gb_set</fsummary>
+      <fsummary>Return an empty set</fsummary>
       <desc>
-        <p>Returns a new empty gb_set.</p>
+        <p>Returns a new empty set.</p>
       </desc>
     </func>
     <func>
       <name name="filter" arity="2"/>
-      <fsummary>Filter gb_set elements</fsummary>
+      <fsummary>Filter set elements</fsummary>
       <desc>
         <p>Filters elements in <c><anno>Set1</anno></c> using predicate function
           <c><anno>Pred</anno></c>.</p>
@@ -192,7 +204,7 @@
     </func>
     <func>
       <name name="fold" arity="3"/>
-      <fsummary>Fold over gb_set elements</fsummary>
+      <fsummary>Fold over set elements</fsummary>
       <desc>
         <p>Folds <c><anno>Function</anno></c> over every element in <c><anno>Set</anno></c>
           returning the final value of the accumulator.</p>
@@ -200,46 +212,46 @@
     </func>
     <func>
       <name name="from_list" arity="1"/>
-      <fsummary>Convert a list into a gb_set</fsummary>
+      <fsummary>Convert a list into a set</fsummary>
       <desc>
-        <p>Returns a gb_set of the elements in <c><anno>List</anno></c>, where
+        <p>Returns a set of the elements in <c><anno>List</anno></c>, where
           <c><anno>List</anno></c> may be unordered and contain duplicates.</p>
       </desc>
     </func>
     <func>
       <name name="from_ordset" arity="1"/>
-      <fsummary>Make a gb_set from an ordset list</fsummary>
+      <fsummary>Make a set from an ordset list</fsummary>
       <desc>
-        <p>Turns an ordered-set list <c><anno>List</anno></c> into a gb_set. The list
+        <p>Turns an ordered-set list <c><anno>List</anno></c> into a set. The list
           must not contain duplicates.</p>
       </desc>
     </func>
     <func>
       <name name="insert" arity="2"/>
-      <fsummary>Add a new element to a gb_set</fsummary>
+      <fsummary>Add a new element to a set</fsummary>
       <desc>
-        <p>Returns a new gb_set formed from <c><anno>Set1</anno></c> with
+        <p>Returns a new set formed from <c><anno>Set1</anno></c> with
           <c><anno>Element</anno></c> inserted. Assumes that <c><anno>Element</anno></c> is not
           present in <c><anno>Set1</anno></c>.</p>
       </desc>
     </func>
     <func>
       <name name="intersection" arity="2"/>
-      <fsummary>Return the intersection of two gb_sets</fsummary>
+      <fsummary>Return the intersection of two sets</fsummary>
       <desc>
         <p>Returns the intersection of <c><anno>Set1</anno></c> and <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
       <name name="intersection" arity="1"/>
-      <fsummary>Return the intersection of a list of gb_sets</fsummary>
+      <fsummary>Return the intersection of a list of sets</fsummary>
       <desc>
-        <p>Returns the intersection of the non-empty list of gb_sets.</p>
+        <p>Returns the intersection of the non-empty list of sets.</p>
       </desc>
     </func>
     <func>
       <name name="is_disjoint" arity="2"/>
-      <fsummary>Check whether two gb_sets are disjoint</fsummary>
+      <fsummary>Check whether two sets are disjoint</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set1</anno></c> and
           <c><anno>Set2</anno></c> are disjoint (have no elements in common),
@@ -248,7 +260,7 @@
     </func>
     <func>
       <name name="is_empty" arity="1"/>
-      <fsummary>Test for empty gb_set</fsummary>
+      <fsummary>Test for empty set</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Set</anno></c> is an empty set, and
           <c>false</c> otherwise.</p>
@@ -257,7 +269,7 @@
     <func>
       <name name="is_member" arity="2"/>
       <name name="is_element" arity="2"/>
-      <fsummary>Test for membership of a gb_set</fsummary>
+      <fsummary>Test for membership of a set</fsummary>
       <desc>
         <p>Returns <c>true</c> if <c><anno>Element</anno></c> is an element of
           <c><anno>Set</anno></c>, otherwise <c>false</c>.</p>
@@ -265,9 +277,9 @@
     </func>
     <func>
       <name name="is_set" arity="1"/>
-      <fsummary>Test for a gb_set</fsummary>
+      <fsummary>Test for a set</fsummary>
       <desc>
-        <p>Returns <c>true</c> if <c><anno>Term</anno></c> appears to be a gb_set,
+        <p>Returns <c>true</c> if <c><anno>Term</anno></c> appears to be a set,
           otherwise <c>false</c>.</p>
       </desc>
     </func>
@@ -281,7 +293,7 @@
     </func>
     <func>
       <name name="iterator" arity="1"/>
-      <fsummary>Return an iterator for a gb_set</fsummary>
+      <fsummary>Return an iterator for a set</fsummary>
       <desc>
         <p>Returns an iterator that can be used for traversing the
           entries of <c><anno>Set</anno></c>; see <c>next/1</c>. The implementation
@@ -303,7 +315,7 @@
     </func>
     <func>
       <name name="next" arity="1"/>
-      <fsummary>Traverse a gb_set with an iterator</fsummary>
+      <fsummary>Traverse a set with an iterator</fsummary>
       <desc>
         <p>Returns <c>{<anno>Element</anno>, <anno>Iter2</anno>}</c> where <c><anno>Element</anno></c> is the
           smallest element referred to by the iterator <c><anno>Iter1</anno></c>,
@@ -314,14 +326,14 @@
     </func>
     <func>
       <name name="singleton" arity="1"/>
-      <fsummary>Return a gb_set with one element</fsummary>
+      <fsummary>Return a set with one element</fsummary>
       <desc>
-        <p>Returns a gb_set containing only the element <c><anno>Element</anno></c>.</p>
+        <p>Returns a set containing only the element <c><anno>Element</anno></c>.</p>
       </desc>
     </func>
     <func>
       <name name="size" arity="1"/>
-      <fsummary>Return the number of elements in a gb_set</fsummary>
+      <fsummary>Return the number of elements in a set</fsummary>
       <desc>
         <p>Returns the number of elements in <c><anno>Set</anno></c>.</p>
       </desc>
@@ -356,24 +368,24 @@
     </func>
     <func>
       <name name="to_list" arity="1"/>
-      <fsummary>Convert a gb_set into a list</fsummary>
+      <fsummary>Convert a set into a list</fsummary>
       <desc>
         <p>Returns the elements of <c><anno>Set</anno></c> as a list.</p>
       </desc>
     </func>
     <func>
       <name name="union" arity="2"/>
-      <fsummary>Return the union of two gb_sets</fsummary>
+      <fsummary>Return the union of two sets</fsummary>
       <desc>
-        <p>Returns the merged (union) gb_set of <c><anno>Set1</anno></c> and
+        <p>Returns the merged (union) set of <c><anno>Set1</anno></c> and
           <c><anno>Set2</anno></c>.</p>
       </desc>
     </func>
     <func>
       <name name="union" arity="1"/>
-      <fsummary>Return the union of a list of gb_sets</fsummary>
+      <fsummary>Return the union of a list of sets</fsummary>
       <desc>
-        <p>Returns the merged (union) gb_set of the list of gb_sets.</p>
+        <p>Returns the merged (union) set of the list of sets.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml
index 9316d60b1a..b2f237e1d7 100644
--- a/lib/stdlib/doc/src/gb_trees.xml
+++ b/lib/stdlib/doc/src/gb_trees.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -59,13 +59,25 @@
 
   <datatypes>
     <datatype>
-      <name><marker id="type-gb_tree">gb_tree()</marker></name>
+      <name name="tree" n_vars="2"/>
       <desc><p>A GB tree.</p></desc>
     </datatype>
     <datatype>
-      <name name="iter"/>
+      <name name="tree" n_vars="0"/>
+      <desc>
+        <p><c>tree()</c> is equivalent to <c>tree(term(), term())</c>.</p>
+      </desc>
+    </datatype>
+    <datatype>
+      <name name="iter" n_vars="2"/>
       <desc><p>A GB tree iterator.</p></desc>
     </datatype>
+    <datatype>
+      <name name="iter" n_vars="0"/>
+      <desc>
+        <p><c>iter()</c> is equivalent to <c>iter(term(), term())</c>.</p>
+      </desc>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
@@ -108,9 +120,9 @@
       <name name="enter" arity="3"/>
       <fsummary>Insert or update key with value in a tree</fsummary>
       <desc>
-        <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Val</anno></c> into <c><anno>Tree1</anno></c> if
+        <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Value</anno></c> into <c><anno>Tree1</anno></c> if
           the key is not present in the tree, otherwise updates
-          <c><anno>Key</anno></c> to value <c><anno>Val</anno></c> in <c><anno>Tree1</anno></c>. Returns the
+          <c><anno>Key</anno></c> to value <c><anno>Value</anno></c> in <c><anno>Tree1</anno></c>. Returns the
           new tree.</p>
       </desc>
     </func>
@@ -135,7 +147,7 @@
       <name name="insert" arity="3"/>
       <fsummary>Insert a new key and value in a tree</fsummary>
       <desc>
-        <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Val</anno></c> into <c><anno>Tree1</anno></c>;
+        <p>Inserts <c><anno>Key</anno></c> with value <c><anno>Value</anno></c> into <c><anno>Tree1</anno></c>;
           returns the new tree. Assumes that the key is not present in
           the tree, crashes otherwise.</p>
       </desc>
@@ -181,8 +193,8 @@
       <name name="largest" arity="1"/>
       <fsummary>Return largest key and value</fsummary>
       <desc>
-        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>}</c>, where <c><anno>Key</anno></c> is the largest
-          key in <c><anno>Tree</anno></c>, and <c><anno>Val</anno></c> is the value associated
+        <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>}</c>, where <c><anno>Key</anno></c> is the largest
+          key in <c><anno>Tree</anno></c>, and <c><anno>Value</anno></c> is the value associated
           with this key. Assumes that the tree is nonempty.</p>
       </desc>
     </func>
@@ -191,7 +203,7 @@
       <fsummary>Look up a key in a tree</fsummary>
       <desc>
         <p>Looks up <c><anno>Key</anno></c> in <c><anno>Tree</anno></c>; returns
-          <c>{value, <anno>Val</anno>}</c>, or <c>none</c> if <c><anno>Key</anno></c> is not
+          <c>{value, <anno>Value</anno>}</c>, or <c>none</c> if <c><anno>Key</anno></c> is not
           present.</p>
       </desc>
     </func>
@@ -207,7 +219,7 @@
       <name name="next" arity="1"/>
       <fsummary>Traverse a tree with an iterator</fsummary>
       <desc>
-        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>, <anno>Iter2</anno>}</c> where <c><anno>Key</anno></c> is the
+        <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>, <anno>Iter2</anno>}</c> where <c><anno>Key</anno></c> is the
           smallest key referred to by the iterator <c><anno>Iter1</anno></c>, and
           <c><anno>Iter2</anno></c> is the new iterator to be used for
           traversing the remaining nodes, or the atom <c>none</c> if no
@@ -225,8 +237,8 @@
       <name name="smallest" arity="1"/>
       <fsummary>Return smallest key and value</fsummary>
       <desc>
-        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>}</c>, where <c><anno>Key</anno></c> is the smallest
-          key in <c><anno>Tree</anno></c>, and <c><anno>Val</anno></c> is the value associated
+        <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>}</c>, where <c><anno>Key</anno></c> is the smallest
+          key in <c><anno>Tree</anno></c>, and <c><anno>Value</anno></c> is the value associated
           with this key. Assumes that the tree is nonempty.</p>
       </desc>
     </func>
@@ -234,8 +246,8 @@
       <name name="take_largest" arity="1"/>
       <fsummary>Extract largest key and value</fsummary>
       <desc>
-        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>, <anno>Tree2</anno>}</c>, where <c><anno>Key</anno></c> is the
-          largest key in <c><anno>Tree1</anno></c>, <c><anno>Val</anno></c> is the value
+        <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>, <anno>Tree2</anno>}</c>, where <c><anno>Key</anno></c> is the
+          largest key in <c><anno>Tree1</anno></c>, <c><anno>Value</anno></c> is the value
           associated with this key, and <c><anno>Tree2</anno></c> is this tree with
           the corresponding node deleted. Assumes that the tree is
           nonempty.</p>
@@ -245,8 +257,8 @@
       <name name="take_smallest" arity="1"/>
       <fsummary>Extract smallest key and value</fsummary>
       <desc>
-        <p>Returns <c>{<anno>Key</anno>, <anno>Val</anno>, <anno>Tree2</anno>}</c>, where <c><anno>Key</anno></c> is the
-          smallest key in <c><anno>Tree1</anno></c>, <c><anno>Val</anno></c> is the value
+        <p>Returns <c>{<anno>Key</anno>, <anno>Value</anno>, <anno>Tree2</anno>}</c>, where <c><anno>Key</anno></c> is the
+          smallest key in <c><anno>Tree1</anno></c>, <c><anno>Value</anno></c> is the value
           associated with this key, and <c><anno>Tree2</anno></c> is this tree with
           the corresponding node deleted. Assumes that the tree is
           nonempty.</p>
@@ -263,7 +275,7 @@
       <name name="update" arity="3"/>
       <fsummary>Update a key to new value in a tree</fsummary>
       <desc>
-        <p>Updates <c><anno>Key</anno></c> to value <c><anno>Val</anno></c> in <c><anno>Tree1</anno></c>;
+        <p>Updates <c><anno>Key</anno></c> to value <c><anno>Value</anno></c> in <c><anno>Tree1</anno></c>;
           returns the new tree. Assumes that the key is present in the
           tree.</p>
       </desc>
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml
index 1601ea9892..b9dfff833e 100644
--- a/lib/stdlib/doc/src/gen_event.xml
+++ b/lib/stdlib/doc/src/gen_event.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index 73c1911f1e..1713367bd8 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index abb4c73c7b..4c83fde237 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index 90f24c4cbc..a28180b42a 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index 3dac259477..3312b08064 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -54,6 +54,9 @@
       <name name="fread_error"/>
     </datatype>
     <datatype>
+      <name name="fread_item"/>
+    </datatype>
+    <datatype>
       <name name="latin1_string"/>
     </datatype>
   </datatypes>
diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml
index d36bf2042f..9328704e11 100644
--- a/lib/stdlib/doc/src/io_protocol.xml
+++ b/lib/stdlib/doc/src/io_protocol.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml
index 19fb827cbf..30f164826c 100644
--- a/lib/stdlib/doc/src/lib.xml
+++ b/lib/stdlib/doc/src/lib.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml
index 16f81bdba1..ee3c51c62c 100644
--- a/lib/stdlib/doc/src/lists.xml
+++ b/lib/stdlib/doc/src/lists.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -123,6 +123,14 @@
       </desc>
     </func>
     <func>
+      <name name="droplast" arity="1"/>
+      <fsummary>Drop the last element of a list</fsummary>
+      <desc>
+        <p>Drops the last element of a <c><anno>List</anno></c>. The list should
+           be non-empty, otherwise the function will crash with a <c>function_clause</c></p>
+      </desc>
+    </func>
+    <func>
       <name name="dropwhile" arity="2"/>
       <fsummary>Drop elements from a list while a predicate is true</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/log_mf_h.xml b/lib/stdlib/doc/src/log_mf_h.xml
index f2b09b58eb..3ef659f579 100644
--- a/lib/stdlib/doc/src/log_mf_h.xml
+++ b/lib/stdlib/doc/src/log_mf_h.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml
index 0219dcce10..43cd20e726 100644
--- a/lib/stdlib/doc/src/math.xml
+++ b/lib/stdlib/doc/src/math.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml
index ad5f8bd5ac..e89dd41f26 100644
--- a/lib/stdlib/doc/src/ms_transform.xml
+++ b/lib/stdlib/doc/src/ms_transform.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2011</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 38cd44def6..e94a4d6a55 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,121 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 1.19.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix typo in gen_server.erl. Thanks to Brian L. Troutwine.</p>
+          <p>
+	    Own Id: OTP-11398</p>
+        </item>
+        <item>
+          <p>
+	    Spec for atan2 should be atan2(Y, X), not atan2(X, Y).
+	    Thanks to Ary Borenszweig.</p>
+          <p>
+	    Own Id: OTP-11465</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add XML marker for regexp syntax. Thanks to Håkan
+	    Mattson.</p>
+          <p>
+	    Own Id: OTP-11442</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>STDLIB 1.19.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> The functions <c>dets:foldl/3</c>,
+	    <c>dets:foldr/3</c>, and <c>dets:traverse/2</c> did not
+	    release the table after having traversed the table to the
+	    end. The bug was introduced in R16B. (Thanks to Manuel
+	    Duran Aguete.) </p>
+          <p>
+	    Own Id: OTP-11245</p>
+        </item>
+        <item>
+	    <p> If the <c>fun M:F/A</c> construct was used
+	    erroneously the linter could crash. (Thanks to Mikhail
+	    Sobolev.) </p>
+          <p>
+	    Own Id: OTP-11254</p>
+        </item>
+        <item>
+	    <p> The specifications of <c>io_lib:fread/2,3</c> have
+	    been corrected. (Thanks to Chris King and Kostis Sagonas
+	    for pinpointing the bug.) </p>
+          <p>
+	    Own Id: OTP-11261</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed type typo in gen_server.</p>
+          <p>
+	    Own Id: OTP-11200</p>
+        </item>
+        <item>
+          <p>
+	    Update type specs in filelib and io_prompt. Thanks to
+	    Jose Valim.</p>
+          <p>
+	    Own Id: OTP-11208</p>
+        </item>
+        <item>
+          <p>
+	    Fix typo in abcast() function comment. Thanks to Johannes
+	    Weissl.</p>
+          <p>
+	    Own Id: OTP-11219</p>
+        </item>
+        <item>
+          <p>
+	    Make edlin understand a few important control keys.
+	    Thanks to Stefan Zegenhagen.</p>
+          <p>
+	    Own Id: OTP-11251</p>
+        </item>
+        <item>
+          <p>
+	    Export the edge/0 type from the digraph module. Thanks to
+	    Alex Ronne Petersen.</p>
+          <p>
+	    Own Id: OTP-11266</p>
+        </item>
+        <item>
+          <p>
+	    Fix variable usage tracking in erl_lint and fixed unsafe
+	    variable tracking in try expressions. Thanks to Anthony
+	    Ramine.</p>
+          <p>
+	    Own Id: OTP-11268</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 1.19.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -126,20 +241,20 @@
         </item>
         <item>
           <p>
-	    Optimizations to gen mechanism. Thanks to Lo�c Hoguin.</p>
+	    Optimizations to gen mechanism. Thanks to Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-11025</p>
         </item>
         <item>
           <p>
-	    Optimizations to gen.erl. Thanks to Lo�c Hoguin.</p>
+	    Optimizations to gen.erl. Thanks to Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-11035</p>
         </item>
         <item>
           <p>
 	    Use erlang:demonitor(Ref, [flush]) where applicable.
-	    Thanks to Lo�c Hoguin.</p>
+	    Thanks to Loïc Hoguin.</p>
           <p>
 	    Own Id: OTP-11039</p>
         </item>
@@ -194,7 +309,7 @@
         </item>
         <item>
           <p>
-	    Improve erl_lint performance. Thanks to Jos� Valim.</p>
+	    Improve erl_lint performance. Thanks to José Valim.</p>
           <p>
 	    Own Id: OTP-11143</p>
         </item>
@@ -297,7 +412,7 @@
           <p>
 	    Two adjacent * used as a single pattern will match all
 	    files and zero or more directories and subdirectories.
-	    (Thanks to Jos� Valim)</p>
+	    (Thanks to José Valim)</p>
           <p>
 	    Own Id: OTP-10431</p>
         </item>
@@ -535,7 +650,7 @@
 	    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>
+	    Thanks to Jan Klötzke</p>
           <p>
 	    Own Id: OTP-10188</p>
         </item>
@@ -644,7 +759,7 @@
         <item>
           <p>
 	    Fix the type spec from the doc of binary:part/3 (Thanks
-	    to Ricardo Catalinas Jim�nez)</p>
+	    to Ricardo Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-9920</p>
         </item>
@@ -3209,7 +3324,7 @@
 	    It is now possible to hibernate a
 	    gen_server/gen_event/gen_fsm. In gen_server and gen_fsm,
 	    hibernation is triggered by returning the atom
-	    'hibernate'�instead of a timeout value. In the gen_event
+	    'hibernate' instead of a timeout value. In the gen_event
 	    case hibernation is triggered by a event handler
 	    returning a tuple with an extra element containing the
 	    atom 'hibernate'.</p>
diff --git a/lib/stdlib/doc/src/notes_history.xml b/lib/stdlib/doc/src/notes_history.xml
index 85997f1717..328855f6dd 100644
--- a/lib/stdlib/doc/src/notes_history.xml
+++ b/lib/stdlib/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml
index 319083d35b..6d1702bc59 100644
--- a/lib/stdlib/doc/src/orddict.xml
+++ b/lib/stdlib/doc/src/orddict.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -187,6 +187,13 @@ merge(Fun, D1, D2) ->
       </desc>
     </func>
     <func>
+      <name name="is_empty" arity="1"/>
+      <fsummary>Return true if the dictionary is empty</fsummary>
+      <desc>
+        <p>Returns <c>true</c> if <c><anno>Orddict</anno></c> has no elements, <c>false</c> otherwise.</p>
+      </desc>
+    </func>
+    <func>
       <name name="store" arity="3"/>
       <fsummary>Store a value in a dictionary</fsummary>
       <desc>
diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml
index 1e26fc2022..277c1c32ab 100644
--- a/lib/stdlib/doc/src/ordsets.xml
+++ b/lib/stdlib/doc/src/ordsets.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/part.xml b/lib/stdlib/doc/src/part.xml
index 25ca56ad86..5589d11e3e 100644
--- a/lib/stdlib/doc/src/part.xml
+++ b/lib/stdlib/doc/src/part.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
       <year>1996</year>
-      <year>2009</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/part_notes.xml b/lib/stdlib/doc/src/part_notes.xml
index 66ad294753..cdd35ac370 100644
--- a/lib/stdlib/doc/src/part_notes.xml
+++ b/lib/stdlib/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/part_notes_history.xml b/lib/stdlib/doc/src/part_notes_history.xml
index 5e055ee606..15e0a0f1d3 100644
--- a/lib/stdlib/doc/src/part_notes_history.xml
+++ b/lib/stdlib/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/pg.xml b/lib/stdlib/doc/src/pg.xml
index c56db8c6e6..7cc1b805b4 100644
--- a/lib/stdlib/doc/src/pg.xml
+++ b/lib/stdlib/doc/src/pg.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/pool.xml b/lib/stdlib/doc/src/pool.xml
index 39a79e5dc5..1b903984f9 100644
--- a/lib/stdlib/doc/src/pool.xml
+++ b/lib/stdlib/doc/src/pool.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index b597074044..5bf5744622 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml
index a0063a58d3..1655133b2b 100644
--- a/lib/stdlib/doc/src/proplists.xml
+++ b/lib/stdlib/doc/src/proplists.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml
index ce50631ca9..8682936c08 100644
--- a/lib/stdlib/doc/src/qlc.xml
+++ b/lib/stdlib/doc/src/qlc.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml
index 383f52d10d..9c994154d4 100644
--- a/lib/stdlib/doc/src/queue.xml
+++ b/lib/stdlib/doc/src/queue.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -90,9 +90,15 @@
 
   <datatypes>
     <datatype>
-      <name><marker id="type-queue">queue()</marker></name>
+      <name name="queue" n_vars="1"/>
       <desc><p>As returned by <c>new/0</c>.</p></desc>
     </datatype>
+    <datatype>
+      <name name="queue" n_vars="0"/>
+      <desc>
+        <p><c>queue()</c> is equivalent to <c>queue(term())</c>.</p>
+      </desc>
+    </datatype>
   </datatypes>
 
   <funcs>
diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml
index 1b8fa44883..e001058e19 100644
--- a/lib/stdlib/doc/src/random.xml
+++ b/lib/stdlib/doc/src/random.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index 71a6e34513..a1833f6a51 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2007</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -40,8 +40,8 @@
     <p>This module contains regular expression matching functions for
     strings and binaries.</p>
 
-    <p>The regular expression syntax and semantics resemble that of
-    Perl.</p>
+    <p>The <seealso marker="#regexp_syntax">regular expression</seealso>
+    syntax and semantics resemble that of Perl.</p>
 
     <p>The library's matching algorithms are currently based on the
     PCRE library, but not all of the PCRE library is interfaced and
@@ -101,7 +101,7 @@
       <p><marker id="compile_options"/>The options have the following meanings:</p>
       <taglist>
       <tag><c>unicode</c></tag>
-      <item>The regular expression is given as a Unicode <c>charlist()</c> and the resulting regular expression code is to be run against a valid Unicode <c>charlist()</c> subject.</item>
+      <item>The regular expression is given as a Unicode <c>charlist()</c> and the resulting regular expression code is to be run against a valid Unicode <c>charlist()</c> subject. Also consider the <c>ucp</c> option when using Unicode characters.</item>
       <tag><c>anchored</c></tag>
       <item>The pattern is forced to be "anchored", that is, it is constrained to match only at the first matching point in the string that is being searched (the "subject string"). This effect can also be achieved by appropriate constructs in the pattern itself.</item>
       <tag><c>caseless</c></tag>
@@ -147,11 +147,51 @@ This option makes it possible to include comments inside complicated patterns. N
       <item>Specifies specifically that \R is to match only the cr, lf or crlf sequences, not the Unicode specific newline characters.</item>
       <tag><c>bsr_unicode</c></tag>
       <item>Specifies specifically that \R is to match all the Unicode newline characters (including crlf etc, the default).</item>
+      <tag><c>no_start_optimize</c></tag>
+      <item>This option disables optimization that may malfunction if "Special start-of-pattern items" are present in the regular expression. A typical example would be when matching "DEFABC" against "(*COMMIT)ABC", where the start optimization of PCRE would skip the subject up to the "A" and would never realize that the (*COMMIT) instruction should have made the matching fail. This option is only relevant if you use "start-of-pattern items", as discussed in the section "PCRE regular expression details" below.</item>
+      <tag><c>ucp</c></tag>
+      <item>Specifies that Unicode Character Properties should be used when resolving \B, \b, \D, \d, \S, \s, \Wand \w. Without this flag, only ISO-Latin-1 properties are used. Using Unicode properties hurts performance, but is semantically correct when working with Unicode characters beyond the ISO-Latin-1 range.</item>
+      <tag><c>never_utf</c></tag>
+      <item>Specifies that the (*UTF) and/or (*UTF8) "start-of-pattern items" are forbidden. This flag can not be combined with <c>unicode</c>. Useful if ISO-Latin-1 patterns from an external source are to be compiled.</item>
       </taglist>
     </desc>
     </func> 
 
     <func>
+      <name name="inspect" arity="2"/>
+      <fsummary>Inspects a compiled regular expression</fsummary>
+      <desc>
+      <p>This function takes a compiled regular expression and an item, returning the relevant data from the regular expression. Currently the only supported item is <c>namelist</c>, which returns the tuple <c>{namelist, [ binary()]}</c>, containing the names of all (unique) named subpatterns in the regular expression.</p>
+      <p>Example:</p>
+      <code type="none">
+1&gt; {ok,MP} = re:compile("(?&lt;A&gt;A)|(?&lt;B&gt;B)|(?&lt;C&gt;C)").
+{ok,{re_pattern,3,0,0,
+                &lt;&lt;69,82,67,80,119,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,
+                  255,255,...&gt;&gt;}}
+2&gt; re:inspect(MP,namelist).
+{namelist,[&lt;&lt;"A"&gt;&gt;,&lt;&lt;"B"&gt;&gt;,&lt;&lt;"C"&gt;&gt;]}
+3&gt; {ok,MPD} = re:compile("(?&lt;C&gt;A)|(?&lt;B&gt;B)|(?&lt;C&gt;C)",[dupnames]).
+{ok,{re_pattern,3,0,0,
+                &lt;&lt;69,82,67,80,119,0,0,0,0,0,8,0,1,0,0,0,255,255,255,255,
+                  255,255,...&gt;&gt;}}
+4&gt; re:inspect(MPD,namelist).                                   
+{namelist,[&lt;&lt;"B"&gt;&gt;,&lt;&lt;"C"&gt;&gt;]}</code>
+      <p>Note specifically in the second example that the duplicate name only occurs once in the returned list, and that the list is in alphabetical order regardless of where the names are positioned in the regular expression. The order of the names is the same as the order of captured subexpressions if <c>{capture, all_names}</c> is given as an option to <c>re:run/3</c>. You can therefore create a name-to-value mapping from the result of <c>re:run/3</c> like this:</p>
+<code>
+1&gt; {ok,MP} = re:compile("(?&lt;A&gt;A)|(?&lt;B&gt;B)|(?&lt;C&gt;C)").
+{ok,{re_pattern,3,0,0,
+                &lt;&lt;69,82,67,80,119,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,
+                  255,255,...&gt;&gt;}}
+2&gt; {namelist, N} = re:inspect(MP,namelist).
+{namelist,[&lt;&lt;"A"&gt;&gt;,&lt;&lt;"B"&gt;&gt;,&lt;&lt;"C"&gt;&gt;]}
+3&gt; {match,L} = re:run("AA",MP,[{capture,all_names,binary}]).
+{match,[&lt;&lt;"A"&gt;&gt;,&lt;&lt;&gt;&gt;,&lt;&lt;&gt;&gt;]}
+4&gt; NameMap = lists:zip(N,L).
+[{&lt;&lt;"A"&gt;&gt;,&lt;&lt;"A"&gt;&gt;},{&lt;&lt;"B"&gt;&gt;,&lt;&lt;&gt;&gt;},{&lt;&lt;"C"&gt;&gt;,&lt;&lt;&gt;&gt;}]</code>
+      <p>More items are expected to be added in the future.</p>
+      </desc>
+    </func> 
+    <func>
       <name name="run" arity="2"/>
       <fsummary>Match a subject against regular expression and capture subpatterns</fsummary>
       <desc>
@@ -178,13 +218,18 @@ This option makes it possible to include comments inside complicated patterns. N
 
       <p>If the regular expression is previously compiled, the option
       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,
-      <anno>NLSpec</anno>}</c> and <c>{capture, <anno>ValueSpec</anno>}/{capture, <anno>ValueSpec</anno>,
+      <c>global</c>, <c>notbol</c>, <c>noteol</c>, <c>report_errors</c>,
+      <c>notempty</c>, <c>notempty_atstart</c>, <c>{offset, integer() >= 0}</c>,
+      <c>{match_limit, integer() >= 0}</c>, 
+      <c>{match_limit_recursion, integer() >= 0}</c>, 
+      <c>{newline,
+      <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, <anno>NLSpec</anno>}</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>
 
@@ -214,6 +259,17 @@ This option makes it possible to include comments inside complicated patterns. N
       be done either by specifying <c>none</c> or an empty list as
       <c><anno>ValueSpec</anno></c>.</p>
 
+      <p>The <c>report_errors</c> option adds the possibility that an
+      error tuple is returned. The tuple will either indicate a
+      matching error (<c>match_limit</c> or
+      <c>match_limit_recursion</c>) or a compilation error, where the
+      error tuple has the format <c>{error, {compile,
+      <anno>CompileErr</anno>}}</c>. Note that if the option
+      <c>report_errors</c> is not given, the function never returns
+      error tuples, but will report compilation errors as a badarg
+      exception and failed matches due to exceeded match limits simply
+      as <c>nomatch</c>.</p>
+
       <p>The options relevant for execution are:</p>
 
       <taglist>
@@ -241,7 +297,7 @@ This option makes it possible to include comments inside complicated patterns. N
       When the global option is given, <c>re:run/3</c> handles empty
       matches in the same way as Perl: a zero-length match at any
       point will be retried with the options <c>[anchored,
-      notempty]</c> as well. If that search gives a result of length
+      notempty_atstart]</c> as well. If that search gives a result of length
       &gt; 0, the result is included.  For example:</p>
       
 <code>    re:run("cat","(|at)",[global]).</code>
@@ -254,9 +310,9 @@ This option makes it possible to include comments inside complicated patterns. N
       <c>[{0,0},{0,0}]</c> (the second <c>{0,0}</c> is due to the
       subexpression marked by the parentheses). As the length of the
       match is 0, we don't advance to the next position yet.</item>
-      <tag>At offset <c>0</c> with <c>[anchored, notempty]</c></tag>
+      <tag>At offset <c>0</c> with <c>[anchored, notempty_atstart]</c></tag>
       <item> The search is retried
-      with the options <c>[anchored, notempty]</c> at the same
+      with the options <c>[anchored, notempty_atstart]</c> at the same
       position, which does not give any interesting result of longer
       length, so the search position is now advanced to the next
       character (<c>a</c>).</item>
@@ -264,7 +320,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <item>This time, the search results in
       <c>[{1,0},{1,0}]</c>, so this search will also be repeated
       with the extra options.</item>
-      <tag>At offset <c>1</c> with <c>[anchored, notempty]</c></tag>
+      <tag>At offset <c>1</c> with <c>[anchored, notempty_atstart]</c></tag>
       <item>Now the <c>ab</c> alternative
       is found and the result will be [{1,2},{1,2}]. The result is
       added to the list of results and the position in the
@@ -272,7 +328,7 @@ This option makes it possible to include comments inside complicated patterns. N
       <tag>At offset <c>3</c></tag>
       <item>The search now once again
       matches the empty string, giving <c>[{3,0},{3,0}]</c>.</item>
-      <tag>At offset <c>1</c> with <c>[anchored, notempty]</c></tag>
+      <tag>At offset <c>1</c> with <c>[anchored, notempty_atstart]</c></tag>
       <item>This will give no result of length &gt; 0 and we are at
       the last position, so the global search is complete.</item>
       </taglist>
@@ -293,15 +349,21 @@ This option makes it possible to include comments inside complicated patterns. N
       subject. With the <c>notempty</c> option, this match is not
       valid, so re:run/3 searches further into the string for
       occurrences of "a" or "b".</p>
-
-      <p>Perl has no direct equivalent of <c>notempty</c>, but it does
-      make a special case of a pattern match of the empty string
-      within its split() function, and when using the /g modifier. It
-      is possible to emulate Perl's behavior after matching a null
-      string by first trying the match again at the same offset with
-      <c>notempty</c> and <c>anchored</c>, and then, if that fails, by
-      advancing the starting offset (see below) and trying an ordinary
-      match again.</p>
+      </item>
+      <tag><c>notempty_atstart</c></tag>
+      <item>
+	<p>This is like <c>notempty</c>, except that an empty string
+	match that is not at the start of the subject is permitted. If
+	the pattern is anchored, such a match can occur only if the
+	pattern contains \K.</p>
+	<p>Perl has no direct equivalent of <c>notempty</c> or <c>notempty_atstart</c>, but it does
+	make a special case of a pattern match of the empty string
+	within its split() function, and when using the /g modifier. It
+	is possible to emulate Perl's behavior after matching a null
+	string by first trying the match again at the same offset with
+	<c>notempty_atstart</c> and <c>anchored</c>, and then, if that fails, by
+	advancing the starting offset (see below) and trying an ordinary
+	match again.</p>
       </item>
       <tag><c>notbol</c></tag>
 
@@ -322,6 +384,116 @@ This option makes it possible to include comments inside complicated patterns. N
       behavior of the dollar metacharacter. It does not affect \Z or
       \z.</item>
 
+      <tag><c>report_errors</c></tag>
+
+      <item><p>This option gives better control of the error handling in <c>re:run/3</c>. When it is given, compilation errors (if the regular expression isn't already compiled) as well as run-time errors are explicitly returned as an error tuple.</p> 
+      <p>The possible run-time errors are:</p>
+      <taglist>
+	<tag><c>match_limit</c></tag>
+
+	<item>The PCRE library sets a limit on how many times the
+	internal match function can be called. The default value for
+	this is 10000000 in the library compiled for Erlang. If
+	<c>{error, match_limit}</c> is returned, it means that the
+	execution of the regular expression has reached this
+	limit. Normally this is to be regarded as a <c>nomatch</c>,
+	which is the default return value when this happens, but by
+	specifying <c>report_errors</c>, you will get informed when
+	the match fails due to to many internal calls.</item>
+
+	<tag><c>match_limit_recursion</c></tag>
+
+	<item>This error is very similar to <c>match_limit</c>, but
+	occurs when the internal match function of PCRE is
+	"recursively" called more times than the
+	"match_limit_recursion" limit, which is by default 10000000 as
+	well. Note that as long as the <c>match_limit</c> and
+	<c>match_limit_default</c> values are kept at the default
+	values, the <c>match_limit_recursion</c> error can not occur,
+	as the <c>match_limit</c> error will occur before that (each
+	recursive call is also a call, but not vice versa). Both
+	limits can however be changed, either by setting limits
+	directly in the regular expression string (see reference
+	section below) or by giving options to <c>re:run/3</c></item>
+
+      </taglist>
+      <p>It is important to understand that what is referred to as
+      "recursion" when limiting matches is not actually recursion on
+      the C stack of the Erlang machine, neither is it recursion on
+      the Erlang process stack. The version of PCRE compiled into the
+      Erlang VM uses machine "heap" memory to store values that needs to be
+      kept over recursion in regular expression matches.</p>
+      </item>
+      <tag><c>{match_limit, integer() >= 0}</c></tag>
+
+      <item><p>This option limits the execution time of a match in an
+      implementation-specific way. It is described in the following
+      way by the PCRE documentation:</p>
+
+      <code>
+The match_limit field provides a means of preventing PCRE from using
+up a vast amount of resources when running patterns that are not going
+to match, but which have a very large number of possibilities in their
+search trees. The classic example is a pattern that uses nested
+unlimited repeats.
+
+Internally, pcre_exec() uses a function called match(), which it calls
+repeatedly (sometimes recursively). The limit set by match_limit is
+imposed on the number of times this function is called during a match,
+which has the effect of limiting the amount of backtracking that can
+take place. For patterns that are not anchored, the count restarts
+from zero for each position in the subject string.</code>
+
+      <p>This means that runaway regular expression matches can fail
+      faster if the limit is lowered using this option. The default
+      value compiled into the Erlang virtual machine is 10000000</p>
+
+      <note><p>This option does in no way affect the execution of the
+      Erlang virtual machine in terms of "long running
+      BIF's". <c>re:run</c> always give control back to the scheduler
+      of Erlang processes at intervals that ensures the real time
+      properties of the Erlang system.</p></note>
+      </item>
+      
+      <tag><c>{match_limit_recursion, integer() >= 0}</c></tag>
+
+      <item><p>This option limits the execution time and memory
+      consumption of a match in an implementation-specific way, very
+      similar to <c>match_limit</c>. It is described in the following
+      way by the PCRE documentation:</p>
+
+      <code>
+The match_limit_recursion field is similar to match_limit, but instead
+of limiting the total number of times that match() is called, it
+limits the depth of recursion. The recursion depth is a smaller number
+than the total number of calls, because not all calls to match() are
+recursive. This limit is of use only if it is set smaller than
+match_limit.
+
+Limiting the recursion depth limits the amount of machine stack that
+can be used, or, when PCRE has been compiled to use memory on the heap
+instead of the stack, the amount of heap memory that can be
+used.</code>
+
+      <p>The Erlang virtual machine uses a PCRE library where heap
+      memory is used when regular expression match recursion happens,
+      why this limits the usage of machine heap, not C stack.</p>
+
+      <p>Specifying a lower value may result in matches with deep recursion failing, when they should actually have matched:</p>
+      <code type="none">
+1&gt; re:run("aaaaaaaaaaaaaz","(a+)*z").
+{match,[{0,14},{0,13}]}
+2&gt; re:run("aaaaaaaaaaaaaz","(a+)*z",[{match_limit_recursion,5}]).
+nomatch
+3&gt; re:run("aaaaaaaaaaaaaz","(a+)*z",[{match_limit_recursion,5},report_errors]).
+{error,match_limit_recursion}</code>
+
+      <p>This option, as well as the <c>match_limit</c> option should
+      only be used in very rare cases. Understanding of the PCRE
+      library internals is recommended before tampering with these
+      limits.</p>
+      </item>
+
       <tag><c>{offset, integer() >= 0}</c></tag>
 
       <item>Start matching at the offset (position) given in the
@@ -394,6 +566,9 @@ This option makes it possible to include comments inside complicated patterns. N
         <taglist>
         <tag><c>all</c></tag>
         <item>All captured subpatterns including the complete matching string. This is the default.</item>
+        <tag><c>all_names</c></tag>
+        <item>All <em>named</em> subpatterns in the regular expression, as if a <c>list()</c> 
+	of all the names <em>in alphabetical order</em> was given. The list of all names can also be retrieved with the <seealso marker="#inspect/2">inspect/2</seealso> function.</item>
         <tag><c>first</c></tag>
         <item>Only the first captured subpattern, which is always the complete matching part of the subject. All explicitly captured subpatterns are discarded.</item>
         <tag><c>all_but_first</c></tag>
@@ -702,7 +877,7 @@ This option makes it possible to include comments inside complicated patterns. N
     </func>     
     </funcs>
     
-
+  <marker id="regexp_syntax"></marker>
   <section>
     <title>PERL LIKE REGULAR EXPRESSIONS SYNTAX</title>
     <p>The following sections contain reference material for the
@@ -721,12 +896,12 @@ published by O'Reilly, covers regular expressions in great detail. This
 description of PCRE's regular expressions is intended as reference material.</p>
 <p>The reference material is divided into the following sections:</p>
 <list>
-<item><seealso marker="#sect1">Newline conventions</seealso></item>
+<item><seealso marker="#sect1">Special start-of-pattern items</seealso></item>
 <item><seealso marker="#sect2">Characters and metacharacters</seealso></item>
 <item><seealso marker="#sect3">Backslash</seealso></item>
 <item><seealso marker="#sect4">Circumflex and dollar</seealso></item>
-<item><seealso marker="#sect5">Full stop (period, dot)</seealso></item>
-<item><seealso marker="#sect6">Matching a single byte</seealso></item>
+<item><seealso marker="#sect5">Full stop (period, dot) and \N</seealso></item>
+<item><seealso marker="#sect6">Matching a single data unit</seealso></item>
 <item><seealso marker="#sect7">Square brackets and character classes</seealso></item>
 <item><seealso marker="#sect8">POSIX character classes</seealso></item>
 <item><seealso marker="#sect9">Vertical bar</seealso></item>
@@ -742,6 +917,7 @@ description of PCRE's regular expressions is intended as reference material.</p>
 <item><seealso marker="#sect19">Comments</seealso></item>
 <item><seealso marker="#sect20">Recursive patterns</seealso></item>
 <item><seealso marker="#sect21">Subpatterns as subroutines</seealso></item>
+<item><seealso marker="#sect22">Oniguruma subroutine syntax</seealso></item>
 <!-- XXX C Interface
 <item><seealso marker="#sect22">Callouts</seealso></item>
 -->
@@ -751,7 +927,55 @@ description of PCRE's regular expressions is intended as reference material.</p>
 </section>
 
 
-<section><marker id="sect1"></marker><title>Newline conventions</title>
+<section><marker id="sect1"></marker><title>Special start-of-pattern items</title>
+
+<p>A number of options that can be passed to <c>re:compile/2</c> can also be set
+by special items at the start of a pattern. These are not Perl-compatible, but
+are provided to make these options accessible to pattern writers who are not
+able to change the program that processes the pattern. Any number of these
+items may appear, but they must all be together right at the start of the
+pattern string, and the letters must be in upper case.</p>
+
+<p><em>UTF support</em></p>
+<p>
+Unicode support is basically UTF-8 based. To use Unicode characters, you either
+call <c>re:compile/2</c>/<c>re:run/3</c> with the <c>unicode</c> option, or the
+ pattern must start with one of these special sequences:</p>
+<quote>
+<p>    (*UTF8)</p>
+<p>    (*UTF)</p>
+</quote>
+
+<p>Both options give the same effect, the input string is interpreted
+as UTF-8. Note that with these instructions, the automatic conversion
+of lists to UTF-8 is not performed by the <c>re</c> functions, why
+using these options is not recommended. Add the <c>unicode</c> option
+when running <c>re:compile/2</c> instead.</p>
+
+<p>
+Some applications that allow their users to supply patterns may wish to
+restrict them to non-UTF data for security reasons. If the <c>never_utf</c>
+option is set at compile time, (*UTF) etc. are not allowed, and their
+appearance causes an error.
+</p>
+
+<p><em>Unicode property support</em></p>
+<p>Another special sequence that may appear at the start of a pattern is</p>
+<quote>
+<p>    (*UCP)</p>
+</quote>
+<p>This has the same effect as setting the <c>ucp</c> option: it causes sequences
+such as \d and \w to use Unicode properties to determine character types,
+instead of recognizing only characters with codes less than 128 via a lookup
+table.
+</p>
+
+<p><em>Disabling start-up optimizations</em></p>
+<p>
+If a pattern starts with (*NO_START_OPT), it has the same effect as setting the
+<c>no_Start_optimize</c> option at compile time.</p>
+
+<p><em>Newline conventions</em></p>
 
 <p>PCRE supports 
 five 
@@ -780,23 +1004,37 @@ example, the pattern:</p>
 </quote>
 
 <p>changes the convention to CR. That pattern matches "a\nb" because LF is no
-longer a newline. Note that these special settings, which are not
-Perl-compatible, are recognized only at the very start of a pattern, and that
-they must be in upper case. If more than one of them is present, the last one
+longer a newline. If more than one of them is present, the last one
 is used.</p>
 
-<p>The newline convention does not affect what the \R escape sequence matches. By
-default, this is any Unicode newline sequence, for Perl compatibility. However,
-this can be changed; see the description of \R in the section entitled
+<p>The newline convention affects where the circumflex and dollar assertions are
+true. It also affects the interpretation of the dot metacharacter when
+<c>dotall</c> is not set, and the behaviour of \N. However, it does not affect
+what the \R escape sequence matches. By default, this is any Unicode newline
+sequence, for Perl compatibility. However, this can be changed; see the
+description of \R in the section entitled
 
-"Newline sequences"
+<em>"Newline sequences"</em>
 
 below. A change of \R setting can be combined with a change of newline
 convention.</p>
 
+<p><em>Setting match and recursion limits</em></p>
+
+<p>The caller of <c>re:run/3</c> can set a limit on the number of times the internal match() function is called and on the maximum depth of recursive calls. These facilities are provided to catch runaway matches that are provoked by patterns with huge matching trees (a typical example is a pattern with nested unlimited repeats) and to avoid running out of system stack by too much recursion. When one of these limits is reached, pcre_exec() gives an error return. The limits can also be set by items at the start of the pattern of the form</p>
+<quote>
+<p>    (*LIMIT_MATCH=d)</p>
+<p>    (*LIMIT_RECURSION=d)</p>
+</quote>
+<p>where d is any number of decimal digits. However, the value of the setting must be less than the value set by the caller of <c>re:run/3</c> for it to have any effect. In other words, the pattern writer can lower the limit set by the programmer, but not raise it. If there is more than one setting of one of these limits, the lower value is used.</p>
+
+<p>The current default value for both the limits are 10000000 in the Erlang
+VM. Note that the recursion limit does not actually affect the stack
+depth of the VM, as PCRE for Erlang is compiled in such a way that the
+match function never does recursion on the "C-stack".</p> 
+
 </section>
 
- 
 <section><marker id="sect2"></marker><title>Characters and metacharacters</title>
 <!-- .rs -->
 
@@ -862,7 +1100,7 @@ a character class the only metacharacters are:</p>
 
 
 <p>The backslash character has several uses. Firstly, if it is followed by a
-non-alphanumeric character, it takes away any special meaning that character
+character that is not a number or a letter, it takes away any special meaning that character
 may have. This use of backslash as an escape character applies both inside and
 outside character classes.</p>
 
@@ -872,10 +1110,14 @@ otherwise be interpreted as a metacharacter, so it is always safe to precede a
 non-alphanumeric with backslash to specify that it stands for itself. In
 particular, if you want to match a backslash, you write \\.</p>
 
-<p>If a pattern is compiled with the <c>extended</c> option, whitespace in the
+<p>In <c>unicode</c> mode, only ASCII numbers and letters have any special meaning after a
+backslash. All other characters (in particular, those whose codepoints are
+greater than 127) are treated as literals.</p>
+
+<p>If a pattern is compiled with the <c>extended</c> option, white space in the
 pattern (other than in a character class) and characters between a # outside
 a character class and the next newline are ignored. An escaping backslash can
-be used to include a whitespace or # character as part of the pattern.</p>
+be used to include a white space or # character as part of the pattern.</p>
 
 <p>If you want to remove the special meaning from a sequence of characters, you
 can do so by putting them between \Q and \E. This is different from Perl in 
@@ -889,42 +1131,54 @@ Perl, $ and @ cause variable interpolation. Note the following examples:</p>
   \Qabc\E\$\Qxyz\E  abc$xyz        abc$xyz</code>
 
 
-<p>The \Q...\E sequence is recognized both inside and outside character classes.</p>
-
+<p>The \Q...\E sequence is recognized both inside and outside
+character classes. An isolated \E that is not preceded by \Q is
+ignored. If \Q is not followed by \E later in the pattern, the literal
+interpretation continues to the end of the pattern (that is, \E is
+assumed at the end). If the isolated \Q is inside a character class,
+this causes an error, because the character class is not
+terminated.</p>
 
 <p><em>Non-printing characters</em></p>
 
 <p>A second use of backslash provides a way of encoding non-printing characters
 in patterns in a visible manner. There is no restriction on the appearance of
 non-printing characters, apart from the binary zero that terminates a pattern,
-but when a pattern is being prepared by text editing, it is usually easier to
-use one of the following escape sequences than the binary character it
-represents:</p>
+but when a pattern is being prepared by text editing, it is often easier to use
+one of the following escape sequences than the binary character it represents:</p>
 
 <taglist>  
   <tag>\a</tag>        <item>alarm, that is, the BEL character (hex 07)</item>
-  <tag>\cx</tag>       <item>"control-x", where x is any character</item>
+  <tag>\cx</tag>       <item>"control-x", where x is any ASCII character</item>
   <tag>\e </tag>       <item>escape (hex 1B)</item>
-  <tag>\f</tag>        <item>formfeed (hex 0C)</item>
+  <tag>\f</tag>        <item>form feed (hex 0C)</item>
   <tag>\n</tag>        <item>linefeed (hex 0A)</item>
   <tag>\r</tag>        <item>carriage return (hex 0D)</item>
   <tag>\t </tag>       <item>tab (hex 09)</item>
-  <tag>\ddd</tag>      <item>character with octal code ddd, or backreference</item>
+  <tag>\ddd</tag>      <item>character with octal code ddd, or back reference</item>
   <tag>\xhh </tag>     <item>character with hex code hh</item>
   <tag>\x{hhh..}</tag> <item>character with hex code hhh..</item>
 </taglist>
 
-<p>The precise effect of \cx is as follows: if x is a lower case letter, it
-is converted to upper case. Then bit 6 of the character (hex 40) is inverted.
-Thus \cz becomes hex 1A, but \c{ becomes hex 3B, while \c; becomes hex
-7B.</p>
+<p>The precise effect of \cx on ASCII characters is as follows: if x is a lower
+case letter, it is converted to upper case. Then bit 6 of the character (hex
+40) is inverted. Thus \cA to \cZ become hex 01 to hex 1A (A is 41, Z is 5A),
+but \c{ becomes hex 3B ({ is 7B), and \c; becomes hex 7B (; is 3B). If the
+data item (byte or 16-bit value) following \c has a value greater than 127, a
+compile-time error occurs. This locks out non-ASCII characters in all modes.</p>
+
+<p>The \c facility was designed for use with ASCII characters, but with the
+extension to Unicode it is even less useful than it once was.</p>
 
-<p>After \x, from zero to two hexadecimal digits are read (letters can be in
-upper or lower case). Any number of hexadecimal digits may appear between \x{
-and }, but the value of the character code must be less than 256 in non-UTF-8
-mode, and less than 2**31 in UTF-8 mode. That is, the maximum value in
-hexadecimal is 7FFFFFFF. Note that this is bigger than the largest Unicode code
-point, which is 10FFFF.</p>
+<p>By default, after \x, from zero to two hexadecimal digits are read (letters
+can be in upper or lower case). Any number of hexadecimal digits may appear
+between \x{ and }, but the character code is constrained as follows:</p>
+<taglist>
+  <tag>8-bit non-Unicode mode</tag>    <item>less than 0x100</item>
+  <tag>8-bit UTF-8 mode</tag>          <item>less than 0x10ffff and a valid codepoint</item>
+</taglist>
+<p>Invalid Unicode codepoints are the range 0xd800 to 0xdfff (the so-called
+"surrogate" codepoints), and 0xffef.</p>
 
 <p>If characters other than hexadecimal digits appear between \x{ and }, or if
 there is no terminating }, this form of escape is not recognized. Instead, the
@@ -952,17 +1206,12 @@ later, following the discussion of parenthesized subpatterns.</p>
 <p>Inside a character class, or if the decimal number is greater than 9 and there
 have not been that many capturing subpatterns, PCRE re-reads up to three octal
 digits following the backslash, and uses them to generate a data character. Any
-subsequent digits stand for themselves. 
-The value of a
-character specified in octal must be less than \400.
-In non-UTF-8 mode, the value of a
-character specified in octal must be less than \400. In UTF-8 mode, values up
-to \777 are permitted. 
-
+subsequent digits stand for themselves. The value of the character is
+constrained in the same way as characters specified in hexadecimal.
 For example:</p>
 
 <taglist>  
-  <tag>\040</tag>   <item>is another way of writing a space</item>
+  <tag>\040</tag>   <item>is another way of writing a ASCII space</item>
 
   <tag>\40</tag>    <item>is the same, provided there are fewer than 40
             previous capturing subpatterns</item>
@@ -977,7 +1226,7 @@ For example:</p>
             character with octal code 113</item>
 
   <tag>\377</tag>   <item>might be a back reference, otherwise
-            the byte consisting entirely of 1 bits</item>
+            the value 255 (decimal)</item>
 
   <tag>\81</tag>    <item>is either a back reference, or a binary zero
             followed by the two characters "8" and "1"</item>
@@ -987,12 +1236,19 @@ For example:</p>
 a leading zero, because no more than three octal digits are ever
 read.</p>
 
-<p>All the sequences that define a single character value can be used
-both inside and outside character classes. In addition, inside a
-character class, the sequence \b is interpreted as the backspace
-character (hex 08), and the sequences \R and \X are interpreted as
-the characters "R" and "X", respectively. Outside a character class,
-these sequences have different meanings (see below).</p>
+<p>All the sequences that define a single character value can be used both inside
+and outside character classes. In addition, inside a character class, \b is
+interpreted as the backspace character (hex 08).</p>
+<p>\N is not allowed in a character class. \B, \R, and \X are not special
+inside a character class. Like other unrecognized escape sequences, they are
+treated as the literal characters "B", "R", and "X". Outside a character class, these
+sequences have different meanings.</p>
+
+<p><em>Unsupported escape sequences</em></p>
+
+<p>In Perl, the sequences \l, \L, \u, and \U are recognized by its string
+handler and used to modify the case of following characters. PCRE
+does not support these escape sequences.</p>
 
 <p><em>Absolute and relative back references</em></p>
 
@@ -1002,30 +1258,42 @@ reference. A named back reference can be coded as \g{name}. Back
 references are discussed later, following the discussion of
 parenthesized subpatterns.</p>
 
+<p><em>Absolute and relative subroutine calls</em></p>
+<p>For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or
+a number enclosed either in angle brackets or single quotes, is an alternative
+syntax for referencing a subpattern as a "subroutine". Details are discussed
+later.
+Note that \g{...} (Perl syntax) and \g&lt;...&gt; (Oniguruma syntax) are <em>not</em>
+synonymous. The former is a back reference; the latter is a
+subroutine call.</p>
+
 <p><em>Generic character types</em></p>
 
-<p>Another use of backslash is for specifying generic character types. The
-following are always recognized:</p>
+<p>Another use of backslash is for specifying generic character types:</p>
 
 <taglist>  
   <tag>\d</tag>     <item>any decimal digit</item>
   <tag>\D</tag>     <item>any character that is not a decimal digit</item>
-  <tag>\h</tag>     <item>any horizontal whitespace character</item>
-  <tag>\H</tag>     <item>any character that is not a horizontal whitespace character</item>
-  <tag>\s</tag>     <item>any whitespace character</item>
-  <tag>\S</tag>     <item>any character that is not a whitespace character</item>
-  <tag>\v</tag>     <item>any vertical whitespace character</item>
-  <tag>\V</tag>     <item>any character that is not a vertical whitespace character</item>
+  <tag>\h</tag>     <item>any horizontal white space character</item>
+  <tag>\H</tag>     <item>any character that is not a horizontal white space character</item>
+  <tag>\s</tag>     <item>any white space character</item>
+  <tag>\S</tag>     <item>any character that is not a white space character</item>
+  <tag>\v</tag>     <item>any vertical white space character</item>
+  <tag>\V</tag>     <item>any character that is not a vertical white space character</item>
   <tag>\w</tag>     <item>any "word" character</item>
   <tag>\W</tag>     <item>any "non-word" character</item>
 </taglist>
 
-<p>Each pair of escape sequences partitions the complete set of characters into
-two disjoint sets. Any given character matches one, and only one, of each pair.</p>
+<p>There is also the single sequence \N, which matches a non-newline character.
+This is the same as the "." metacharacter
+when <c>dotall</c> is not set. Perl also uses \N to match characters by name;
+PCRE does not support this.</p>
 
-<p>These character type sequences can appear both inside and outside character
+<p>Each pair of lower and upper case escape sequences partitions the complete set
+of characters into two disjoint sets. Any given character matches one, and only
+one, of each pair. The sequences can appear both inside and outside character
 classes. They each match one character of the appropriate type. If the current
-matching point is at the end of the subject string, all of them fail, since
+matching point is at the end of the subject string, all of them fail, because
 there is no character to match.</p>
 
 <p>For compatibility with Perl, \s does not match the VT character (code 11).
@@ -1034,18 +1302,34 @@ are HT (9), LF (10), FF (12), CR (13), and space (32). If "use locale;" is
 included in a Perl script, \s may match the VT character. In PCRE, it never
 does.</p>
 
-<p>In UTF-8 mode, characters with values greater than 128 never match \d, \s, or
-\w, and always match \D, \S, and \W. This is true even when Unicode
-character property support is available. These sequences retain their original
-meanings from before UTF-8 support was available, mainly for efficiency
-reasons.</p>
+<p>A "word" character is an underscore or any character that is a letter or digit.
+By default, the definition of letters and digits is controlled by PCRE's
+low-valued character tables, in Erlang's case (and without the <c>unicode</c> option), 
+the ISO-Latin-1 character set.</p>
 
-<p>The sequences \h, \H, \v, and \V are Perl 5.10 features. In contrast to the
-other sequences, these do match certain high-valued codepoints in UTF-8 mode.
-The horizontal space characters are:</p>
+<p>By default, in <c>unicode</c> mode, characters with values greater than 128 never match
+\d, \s, or \w, and always match \D, \S, and \W. These sequences retain
+their original meanings from before UTF support was available, mainly for
+efficiency reasons. However, if the <c>ucp</c> option is set, the behaviour is changed so that Unicode
+properties are used to determine character types, as follows:</p>
+<taglist>
+  <tag>\d</tag>  <item>any character that \p{Nd} matches (decimal digit)</item>
+  <tag>\s</tag>  <item>any character that \p{Z} matches, plus HT, LF, FF, CR)</item>
+ <tag> \w</tag>  <item>any character that \p{L} or \p{N} matches, plus underscore)</item>
+</taglist>
+<p>The upper case escapes match the inverse sets of characters. Note that \d
+matches only decimal digits, whereas \w matches any Unicode digit, as well as
+any Unicode letter, and underscore. Note also that <c>ucp</c> affects \b, and
+\B because they are defined in terms of \w and \W. Matching these sequences
+is noticeably slower when <c>ucp</c> is set.</p>
+
+<p>The sequences \h, \H, \v, and \V are features that were added to Perl at
+release 5.10. In contrast to the other sequences, which match only ASCII
+characters by default, these always match certain high-valued codepoints,
+whether or not <c>ucp</c> is set. The horizontal space characters are:</p>
 
 <taglist>
-  <tag>U+0009</tag>     <item>Horizontal tab</item>
+  <tag>U+0009</tag>     <item>Horizontal tab (HT)</item>
   <tag>U+0020</tag>     <item>Space</item>
   <tag>U+00A0</tag>     <item>Non-break space</item>
   <tag>U+1680</tag>     <item>Ogham space mark</item>
@@ -1069,23 +1353,22 @@ The horizontal space characters are:</p>
 <p>The vertical space characters are:</p>
 
 <taglist>
-  <tag>U+000A</tag>     <item>Linefeed</item>
-  <tag>U+000B</tag>     <item>Vertical tab</item>
-  <tag>U+000C</tag>     <item>Formfeed</item>
-  <tag>U+000D</tag>     <item>Carriage return</item>
-  <tag>U+0085</tag>     <item>Next line</item>
+  <tag>U+000A</tag>     <item>Linefeed (LF)</item>
+  <tag>U+000B</tag>     <item>Vertical tab (VT)</item>
+  <tag>U+000C</tag>     <item>Form feed (FF)</item>
+  <tag>U+000D</tag>     <item>Carriage return (CR)</item>
+  <tag>U+0085</tag>     <item>Next line (NEL)</item>
   <tag>U+2028</tag>     <item>Line separator</item>
   <tag>U+2029</tag>     <item>Paragraph separator</item>
 </taglist>
 
-<p>A "word" character is an underscore or any character less than 256 that is a
-letter or digit. The definition of letters and digits is controlled by PCRE's
-low-valued character tables, which are always ISO-8859-1.</p>
+<p>In 8-bit, non-UTF-8 mode, only the characters with codepoints less than 256 are
+relevant.</p>
 
 <p><em>Newline sequences</em></p>
 
 <p>Outside a character class, by default, the escape sequence \R matches any
-Unicode newline sequence. This is a Perl 5.10 feature. In non-UTF-8 mode \R is
+Unicode newline sequence. In non-UTF-8 mode \R is
 equivalent to the following:</p>
 
 <quote><p>  (?&gt;\r\n|\n|\x0b|\f|\r|\x85)</p></quote>
@@ -1094,11 +1377,11 @@ equivalent to the following:</p>
 
 <p>This particular group matches either the two-character sequence CR followed by
 LF, or one of the single characters LF (linefeed, U+000A), VT (vertical tab,
-U+000B), FF (formfeed, U+000C), CR (carriage return, U+000D), or NEL (next
+U+000B), FF (form feed, U+000C), CR (carriage return, U+000D), or NEL (next
 line, U+0085). The two-character sequence is treated as a single unit that
 cannot be split.</p>
 
-<p>In UTF-8 mode, two additional characters whose codepoints are greater than 255
+<p>In Unicode mode, two additional characters whose codepoints are greater than 255
 are added: LS (line separator, U+2028) and PS (paragraph separator, U+2029).
 Unicode character property support is not needed for these characters to be
 recognized.</p>
@@ -1115,35 +1398,39 @@ one of the following sequences:</p>
 <p>  (*BSR_ANYCRLF)   CR, LF, or CRLF only
   (*BSR_UNICODE)   any Unicode newline sequence</p>
 
-<p>These override the default and the options given to <c>re:compile/2</c>, but
-they can be overridden by options given to <c>re:run/3</c>. Note that these
-special settings, which are not Perl-compatible, are recognized only at the
-very start of a pattern, and that they must be in upper case. If more than one
-of them is present, the last one is used. They can be combined with a change of
-newline convention, for example, a pattern can start with:</p>
+<p>These override the default and the options given to the compiling function, but
+they can themselves be overridden by options given to a matching function. Note
+that these special settings, which are not Perl-compatible, are recognized only
+at the very start of a pattern, and that they must be in upper case. If more
+than one of them is present, the last one is used. They can be combined with a
+change of newline convention; for example, a pattern can start with:</p>
 
 <p>  (*ANY)(*BSR_ANYCRLF)</p>
 
-<p>Inside a character class, \R matches the letter "R".</p>
-
+<p>They can also be combined with the (*UTF8), (*UTF) or
+(*UCP) special sequences. Inside a character class, \R is treated as an
+unrecognized escape sequence, and so matches the letter "R" by default.</p>
 
 <p><em>Unicode character properties</em></p>
 
-<p>When PCRE is built with Unicode character property support, three additional
+<p>Three additional
 escape sequences that match characters with specific properties are available.
-When not in UTF-8 mode, these sequences are of course limited to testing
+When in 8-bit non-UTF-8 mode, these sequences are of course limited to testing
 characters whose codepoints are less than 256, but they do work in this mode.
 The extra escape sequences are:</p>
+<taglist>
+<tag>\p{<em>xx</em>}</tag>   <item>a character with the <em>xx</em> property</item>
+<tag>\P{<em>xx</em>}</tag>   <item>a character without the <em>xx</em> property</item>
+<tag>\X</tag>                <item>a Unicode extended grapheme cluster</item>
+</taglist>
 
-<p>  \p{<em>xx</em>}   a character with the <em>xx</em> property
-  \P{<em>xx</em>}   a character without the <em>xx</em> property
-  \X       an extended Unicode sequence</p>
-
-<p>The property names represented by <em>xx</em> above are limited to the Unicode
-script names, the general category properties, and "Any", which matches any
-character (including newline). Other properties such as "InMusicalSymbols" are
-not currently supported by PCRE. Note that \P{Any} does not match any
-characters, so always causes a match failure.</p>
+<p>The property names represented by <i>xx</i> above are limited to the Unicode
+script names, the general category properties, "Any", which matches any
+character (including newline), and some special PCRE properties (described
+in the next section).
+Other Perl properties such as "InMusicalSymbols" are not currently supported by
+PCRE. Note that \P{Any} does not match any characters, so always causes a
+match failure.</p>
 
 <p>Sets of Unicode characters are defined as belonging to certain scripts. A
 character from one of these sets can be matched using a script name. For
@@ -1158,13 +1445,19 @@ example:</p>
 <list>
 <item>Arabic</item>
 <item>Armenian</item>
+<item>Avestan</item>
 <item>Balinese</item>
+<item>Bamum</item>
+<item>Batak</item>
 <item>Bengali</item>
 <item>Bopomofo</item>
 <item>Braille</item>
 <item>Buginese</item>
 <item>Buhid</item>
 <item>Canadian_Aboriginal</item>
+<item>Carian</item>
+<item>Chakma</item>
+<item>Cham</item>
 <item>Cherokee</item>
 <item>Common</item>
 <item>Coptic</item>
@@ -1173,6 +1466,7 @@ example:</p>
 <item>Cyrillic</item>
 <item>Deseret</item>
 <item>Devanagari</item>
+<item>Egyptian_Hieroglyphs</item>
 <item>Ethiopic</item>
 <item>Georgian</item>
 <item>Glagolitic</item>
@@ -1185,16 +1479,31 @@ example:</p>
 <item>Hanunoo</item>
 <item>Hebrew</item>
 <item>Hiragana</item>
+<item>Imperial_Aramaic</item>
 <item>Inherited</item>
+<item>Inscriptional_Pahlavi</item>
+<item>Inscriptional_Parthian</item>
+<item>Javanese</item>
+<item>Kaithi</item>
 <item>Kannada</item>
 <item>Katakana</item>
+<item>Kayah_Li</item>
 <item>Kharoshthi</item>
 <item>Khmer</item>
 <item>Lao</item>
 <item>Latin</item>
+<item>Lepcha</item>
 <item>Limbu</item>
 <item>Linear_B</item>
+<item>Lisu</item>
+<item>Lycian</item>
+<item>Lydian</item>
 <item>Malayalam</item>
+<item>Mandaic</item>
+<item>Meetei_Mayek</item>
+<item>Meroitic_Cursive</item>
+<item>Meroitic_Hieroglyphs</item>
+<item>Miao</item>
 <item>Mongolian</item>
 <item>Myanmar</item>
 <item>New_Tai_Lue</item>
@@ -1203,17 +1512,29 @@ example:</p>
 <item>Old_Italic</item>
 <item>Old_Persian</item>
 <item>Oriya</item>
+<item>Old_South_Arabian</item>
+<item>Old_Turkic</item>
+<item>Ol_Chiki</item>
 <item>Osmanya</item>
 <item>Phags_Pa</item>
 <item>Phoenician</item>
+<item>Rejang</item>
 <item>Runic</item>
+<item>Samaritan</item>
+<item>Saurashtra</item>
+<item>Sharada</item>
 <item>Shavian</item>
 <item>Sinhala</item>
+<item>Sora_Sompeng</item>
+<item>Sundanese</item>
 <item>Syloti_Nagri</item>
 <item>Syriac</item>
 <item>Tagalog</item>
 <item>Tagbanwa</item>
 <item>Tai_Le</item>
+<item>Tai_Tham</item>
+<item>Tai_Viet</item>
+<item>Takri</item>
 <item>Tamil</item>
 <item>Telugu</item>
 <item>Thaana</item>
@@ -1221,13 +1542,14 @@ example:</p>
 <item>Tibetan</item>
 <item>Tifinagh</item>
 <item>Ugaritic</item>
+<item>Vai</item>
 <item>Yi</item>
 </list>
 
-<p>Each character has exactly one general category property, specified by a
-two-letter abbreviation. For compatibility with Perl, negation can be specified
-by including a circumflex between the opening brace and the property name. For
-example, \p{^Lu} is the same as \P{Lu}.</p>
+<p>Each character has exactly one Unicode general category property, specified by
+a two-letter abbreviation. For compatibility with Perl, negation can be
+specified by including a circumflex between the opening brace and the property
+name. For example, \p{^Lu} is the same as \P{Lu}.</p>
 
 <p>If only one letter is specified with \p or \P, it includes all the general
 category properties that start with that letter. In this case, in the absence
@@ -1303,13 +1625,10 @@ the Lu, Ll, or Lt property, in other words, a letter that is not classified as
 a modifier or "other".</p>
 
 <p>The Cs (Surrogate) property applies only to characters in the range U+D800 to
-U+DFFF. Such characters are not valid in UTF-8 strings (see RFC 3629) and so
-cannot be tested by PCRE, unless UTF-8 validity checking has been turned off
-(see the discussion of <c>no_utf8_check</c> in the
-<em>pcreapi</em>
-page).</p>
+U+DFFF. Such characters are not valid in Unicode strings and so
+cannot be tested by PCRE. Perl does not support the Cs property</p>
 
-<p>The long synonyms for these properties that Perl supports (such as \p{Letter})
+<p>The long synonyms for property names that Perl supports (such as \p{Letter})
 are not supported by PCRE, nor is it permitted to prefix any of these
 properties with "Is".</p>
 
@@ -1318,31 +1637,79 @@ Instead, this property is assumed for any code point that is not in the
 Unicode table.</p>
 
 <p>Specifying caseless matching does not affect these escape sequences. For
-example, \p{Lu} always matches only upper case letters.</p>
-
-<p>The \X escape matches any number of Unicode characters that form an extended
-Unicode sequence. \X is equivalent to</p>
+example, \p{Lu} always matches only upper case letters. This is different from
+the behaviour of current versions of Perl.</p>
+<p>Matching characters by Unicode property is not fast, because PCRE has to do a
+multistage table lookup in order to find a character's property. That is why
+the traditional escape sequences such as \d and \w do not use Unicode
+properties in PCRE by default, though you can make them do so by setting the
+<c>ucp</c> option or by starting the pattern with (*UCP).</p>
+
+<p><em>Extended grapheme clusters</em></p>
+<p>The \X escape matches any number of Unicode characters that form an "extended
+grapheme cluster", and treats the sequence as an atomic group (see below).
+Up to and including release 8.31, PCRE matched an earlier, simpler definition
+that was equivalent to</p>
 
 <quote><p>  (?&gt;\PM\pM*)</p></quote>
 
-<p>That is, it matches a character without the "mark" property, followed by zero
-or more characters with the "mark" property, and treats the sequence as an
-atomic group
-(see below).
-Characters with the "mark" property are typically accents that affect the
-preceding character. None of them have codepoints less than 256, so in
-non-UTF-8 mode \X matches any one character.</p>
+<p>That is, it matched a character without the "mark" property, followed by zero
+or more characters with the "mark" property. Characters with the "mark"
+property are typically non-spacing accents that affect the preceding character.</p>
 
-<p>Matching characters by Unicode property is not fast, because PCRE has to search
-a structure that contains data for over fifteen thousand characters. That is
-why the traditional escape sequences such as \d and \w do not use Unicode
-properties in PCRE.</p>
+<p>This simple definition was extended in Unicode to include more complicated
+kinds of composite character by giving each character a grapheme breaking
+property, and creating rules that use these properties to define the boundaries
+of extended grapheme clusters. In releases of PCRE later than 8.31, \X matches
+one of these clusters.</p>
+
+<p>\X always matches at least one character. Then it decides whether to add
+additional characters according to the following rules for ending a cluster:</p>
+<taglist>
+<tag>1.</tag> <item>End at the end of the subject string.</item>
+<tag>2.</tag> <item>Do not end between CR and LF; otherwise end after any control character.</item>
+<tag>3.</tag> <item>Do not break Hangul (a Korean script) syllable sequences. Hangul characters
+are of five types: L, V, T, LV, and LVT. An L character may be followed by an
+L, V, LV, or LVT character; an LV or V character may be followed by a V or T
+character; an LVT or T character may be follwed only by a T character.</item>
+<tag>4.</tag> <item>Do not end before extending characters or spacing marks. Characters with
+the "mark" property always have the "extend" grapheme breaking property.</item>
+<tag>5.</tag> <item>Do not end after prepend characters.</item>
+<tag>6.</tag> <item>Otherwise, end the cluster.</item>
+</taglist>
+
+<p><em>PCRE's additional properties</em></p>
+
+<p>As well as the standard Unicode properties described above, PCRE supports four
+more that make it possible to convert traditional escape sequences such as \w
+and \s and POSIX character classes to use Unicode properties. PCRE uses these
+non-standard, non-Perl properties internally when PCRE_UCP is set. However,
+they may also be used explicitly. These properties are:</p>
+<taglist>
+  <tag>Xan</tag>   <item>Any alphanumeric character</item>
+  <tag>Xps</tag>   <item>Any POSIX space character</item>
+  <tag>Xsp</tag>   <item>Any Perl space character</item>
+  <tag>Xwd</tag>   <item>Any Perl "word" character</item>
+</taglist>
+<p>Xan matches characters that have either the L (letter) or the N (number)
+property. Xps matches the characters tab, linefeed, vertical tab, form feed, or
+carriage return, and any other character that has the Z (separator) property.
+Xsp is the same as Xps, except that vertical tab is excluded. Xwd matches the
+same characters as Xan, plus underscore.</p>
+
+<p>There is another non-standard property, Xuc, which matches any character that
+can be represented by a Universal Character Name in C++ and other programming
+languages. These are the characters $, @, ` (grave accent), and all characters
+with Unicode code points greater than or equal to U+00A0, except for the
+surrogates U+D800 to U+DFFF. Note that most base (ASCII) characters are
+excluded. (Universal Character Names are of the form \uHHHH or \UHHHHHHHH
+where H is a hexadecimal digit. Note that the Xuc property does not match these
+sequences but the characters that they represent.)</p>
 
 <p><em>Resetting the match start</em></p>
 
-<p>The escape sequence \K, which is a Perl 5.10 feature, causes any previously
-matched characters not to be included in the final matched sequence. For
-example, the pattern:</p>
+<p>The escape sequence \K causes any previously matched characters not to be
+included in the final matched sequence. For example, the pattern:</p>
 
 <quote><p>  foo\Kbar</p></quote>
 
@@ -1362,6 +1729,10 @@ For example, when the pattern</p>
 
 <p>matches "foobar", the first substring is still set to "foo".</p>
 
+<p>Perl documents that the use of \K within assertions is "not well defined". In
+PCRE, \K is acted upon when it occurs inside positive assertions, but is
+ignored in negative assertions.</p>
+
 <p><em>Simple assertions</em></p>
 
 <p>The final use of backslash is for certain simple assertions. An
@@ -1382,13 +1753,20 @@ described below. The backslashed assertions are:</p>
                            subject</item>
 </taglist>
 
-<p>These assertions may not appear in character classes (but note that \b has a
-different meaning, namely the backspace character, inside a character class).</p>
+<p>Inside a character class, \b has a different meaning; it matches the backspace
+character. If any other of these assertions appears in a character class, by
+default it matches the corresponding literal character (for example, \B
+matches the letter B). </p>
 
 <p>A word boundary is a position in the subject string where the current character
 and the previous character do not both match \w or \W (i.e. one matches
 \w and the other matches \W), or the start or end of the string if the
-first or last character matches \w, respectively.</p>
+first or last character matches \w, respectively. In a UTF mode, the meanings
+of \w and \W can be changed by setting the <c>ucp</c> option. When this is
+done, it also affects \b and \B. Neither PCRE nor Perl has a separate "start
+of word" or "end of word" metasequence. However, whatever follows \b normally
+determines which it is. For example, the fragment \ba matches "a" at the start
+of a word.</p>
 
 <p>The \A, \Z, and \z assertions differ from the traditional circumflex and
 dollar (described in the next section) in that they only ever match at the very
@@ -1422,9 +1800,13 @@ regular expression.</p>
 
 <section><marker id="sect4"></marker><title>Circumflex and dollar</title>
 
+<p>The circumflex and dollar metacharacters are zero-width assertions. That is,
+they test for a particular condition being true without consuming any
+characters from the subject string.</p>
+
 <p>Outside a character class, in the default matching mode, the circumflex
-character is an assertion that is true only if the current matching point is
-at the start of the subject string. If the <em>startoffset</em> argument of
+character is an assertion that is true only if the current matching point is at
+the start of the subject string. If the <i>startoffset</i> argument of
 <c>re:run/3</c> is non-zero, circumflex can never match if the <c>multiline</c>
 option is unset. Inside a character class, circumflex has an entirely different
 meaning (see below).</p>
@@ -1437,12 +1819,12 @@ constrained to match only at the start of the subject, it is said to be an
 "anchored" pattern. (There are also other constructs that can cause a pattern
 to be anchored.)</p>
 
-<p>A dollar character is an assertion that is true only if the current matching
-point is at the end of the subject string, or immediately before a newline
-at the end of the string (by default). Dollar need not be the last character of
-the pattern if a number of alternatives are involved, but it should be the last
-item in any branch in which it appears. Dollar has no special meaning in a
-character class.</p>
+<p>The dollar character is an assertion that is true only if the current matching
+point is at the end of the subject string, or immediately before a newline at
+the end of the string (by default). Note, however, that it does not actually
+match the newline. Dollar need not be the last character of the pattern if a
+number of alternatives are involved, but it should be the last item in any
+branch in which it appears. Dollar has no special meaning in a character class.</p>
 
 <p>The meaning of dollar can be changed so that it matches only at the
 very end of the string, by setting the <c>dollar_endonly</c> option at
@@ -1471,12 +1853,11 @@ end of the subject in both modes, and if all branches of a pattern start with
 
 </section>
 
-<section><marker id="sect5"></marker><title>Full stop (period, dot)</title>
+<section><marker id="sect5"></marker><title>Full stop (period, dot) and \N</title>
 
 <p>Outside a character class, a dot in the pattern matches any one character in
 the subject string except (by default) a character that signifies the end of a
 line.
- In UTF-8 mode, the matched character may be more than one byte long.
 </p>
 
 <p>When a line ending is defined as a single character, dot never matches that
@@ -1497,111 +1878,138 @@ the subject string, it takes two dots to match it.</p>
 circumflex and dollar, the only relationship being that they both
 involve newlines. Dot has no special meaning in a character class.</p>
 
+<p>The escape sequence \N behaves like a dot, except that it is not affected by
+the PCRE_DOTALL option. In other words, it matches any character except one
+that signifies the end of a line. Perl also uses \N to match characters by
+name; PCRE does not support this.</p>
+
 </section>
 
-<section><marker id="sect6"></marker><title>Matching a single byte</title>
+<section><marker id="sect6"></marker><title>Matching a single data unit</title>
 
-<p>Outside a character class, the escape sequence \C matches any one byte, both
-in and out of UTF-8 mode. Unlike a dot, it always matches any line-ending
-characters. The feature is provided in Perl in order to match individual bytes
-in UTF-8 mode. Because it breaks up UTF-8 characters into individual bytes,
-what remains in the string may be a malformed UTF-8 string. For this reason,
-the \C escape sequence is best avoided.</p>
+<p>Outside a character class, the escape sequence \C matches any one data unit,
+whether or not a UTF mode is set. One data unit is one
+byte. Unlike a dot, \C always
+matches line-ending characters. The feature is provided in Perl in order to
+match individual bytes in UTF-8 mode, but it is unclear how it can usefully be
+used. Because \C breaks up characters into individual data units, matching one
+unit with \C in a UTF mode means that the rest of the string may start with a
+malformed UTF character. This has undefined results, because PCRE assumes that
+it is dealing with valid UTF strings.</p>
 
-<p>PCRE does not allow \C to appear in lookbehind assertions (described below),
-because in UTF-8 mode this would make it impossible to calculate the length of
+<p>PCRE does not allow \C to appear in lookbehind assertions (described below)
+in a UTF mode, because this would make it impossible to calculate the length of
 the lookbehind.</p>
 
+<p>In general, the \C escape sequence is best avoided. However, one
+way of using it that avoids the problem of malformed UTF characters is to use a
+lookahead to check the length of the next character, as in this pattern, which
+could be used with a UTF-8 string (ignore white space and line breaks):</p>
+
+<code type="none">
+  (?| (?=[\x00-\x7f])(\C) |
+      (?=[\x80-\x{7ff}])(\C)(\C) |
+      (?=[\x{800}-\x{ffff}])(\C)(\C)(\C) |
+      (?=[\x{10000}-\x{1fffff}])(\C)(\C)(\C)(\C))</code>
+
+<p>A group that starts with (?| resets the capturing parentheses numbers in each
+alternative (see "Duplicate Subpattern Numbers"
+below). The assertions at the start of each branch check the next UTF-8
+character for values whose encoding uses 1, 2, 3, or 4 bytes, respectively. The
+character's individual bytes are then captured by the appropriate number of
+groups.</p>
+
 </section>
 
 <section><marker id="sect7"></marker><title>Square brackets and character classes</title>
 
-<p>An opening square bracket introduces a character class, terminated
-by a closing square bracket. A closing square bracket on its own is
-not special. If a closing square bracket is required as a member of
-the class, it should be the first data character in the class (after
-an initial circumflex, if present) or escaped with a backslash.</p>
-
-<p>A character class matches a single character in the subject. 
-In
-UTF-8 mode, the character may occupy more than one byte. 
-A matched
-character must be in the set of characters defined by the class,
-unless the first character in the class definition is a circumflex, in
-which case the subject character must not be in the set defined by the
-class. If a circumflex is actually required as a member of the class,
-ensure it is not the first character, or escape it with a
+<p>An opening square bracket introduces a character class, terminated by a closing
+square bracket. A closing square bracket on its own is not special by default.
+However, if the PCRE_JAVASCRIPT_COMPAT option is set, a lone closing square
+bracket causes a compile-time error. If a closing square bracket is required as
+a member of the class, it should be the first data character in the class
+(after an initial circumflex, if present) or escaped with a backslash.</p>
+
+<p>A character class matches a single character in the subject. In a UTF mode, the
+character may be more than one data unit long. A matched character must be in
+the set of characters defined by the class, unless the first character in the
+class definition is a circumflex, in which case the subject character must not
+be in the set defined by the class. If a circumflex is actually required as a
+member of the class, ensure it is not the first character, or escape it with a
 backslash.</p>
 
 <p>For example, the character class [aeiou] matches any lower case vowel, while
 [^aeiou] matches any character that is not a lower case vowel. Note that a
 circumflex is just a convenient notation for specifying the characters that
 are in the class by enumerating those that are not. A class that starts with a
-circumflex is not an assertion: it still consumes a character from the subject
+circumflex is not an assertion; it still consumes a character from the subject
 string, and therefore it fails if the current pointer is at the end of the
 string.</p>
 
-<p>In UTF-8 mode, characters with values greater than 255 can be included in a
-class as a literal string of bytes, or by using the \x{ escaping mechanism.</p>
+<p>In UTF-8 mode, characters with values greater than 255 (0xffff)
+can be included in a class as a literal string of data units, or by using the
+\x{ escaping mechanism.</p>
 
 <p>When caseless matching is set, any letters in a class represent both their
 upper case and lower case versions, so for example, a caseless [aeiou] matches
 "A" as well as "a", and a caseless [^aeiou] does not match "A", whereas a
-caseful version would. 
-In UTF-8 mode, PCRE always understands the concept of
+caseful version would. In a UTF mode, PCRE always understands the concept of
 case for characters whose values are less than 128, so caseless matching is
 always possible. For characters with higher values, the concept of case is
 supported if PCRE is compiled with Unicode property support, but not otherwise.
-If you want to use caseless matching for characters 128 and above, you must
-ensure that PCRE is compiled with Unicode property support as well as with
-UTF-8 support.
-</p>
-
-<p>Characters that might indicate line breaks are never treated in any
-special way when matching character classes, whatever line-ending
-sequence is in use, and whatever setting of the <c>dotall</c> and
-<c>multiline</c> options is used. A class such as [^a] always matches
-one of these characters.</p>
-
-<p>The minus (hyphen) character can be used to specify a range of
-characters in a character class. For example, [d-m] matches any letter
-between d and m, inclusive. If a minus character is required in a
-class, it must be escaped with a backslash or appear in a position
-where it cannot be interpreted as indicating a range, typically as the
-first or last character in the class.</p>
-
-<p>It is not possible to have the literal character "]" as the end
-character of a range. A pattern such as [W-]46] is interpreted as a
-class of two characters ("W" and "-") followed by a literal string
-"46]", so it would match "W46]" or "-46]". However, if the "]" is
-escaped with a backslash it is interpreted as the end of range, so
-[W-\]46] is interpreted as a class containing a range followed by two
-other characters. The octal or hexadecimal representation of "]" can
-also be used to end a range.</p>
+If you want to use caseless matching in a UTF mode for characters 128 and
+above, you must ensure that PCRE is compiled with Unicode property support as
+well as with UTF support.</p>
+
+<p>Characters that might indicate line breaks are never treated in any special way
+when matching character classes, whatever line-ending sequence is in use, and
+whatever setting of the PCRE_DOTALL and PCRE_MULTILINE options is used. A class
+such as [^a] always matches one of these characters.</p>
+
+<p>The minus (hyphen) character can be used to specify a range of characters in a
+character class. For example, [d-m] matches any letter between d and m,
+inclusive. If a minus character is required in a class, it must be escaped with
+a backslash or appear in a position where it cannot be interpreted as
+indicating a range, typically as the first or last character in the class.</p>
+
+<p>It is not possible to have the literal character "]" as the end character of a
+range. A pattern such as [W-]46] is interpreted as a class of two characters
+("W" and "-") followed by a literal string "46]", so it would match "W46]" or
+"-46]". However, if the "]" is escaped with a backslash it is interpreted as
+the end of range, so [W-\]46] is interpreted as a class containing a range
+followed by two other characters. The octal or hexadecimal representation of
+"]" can also be used to end a range.</p>
 
 <p>Ranges operate in the collating sequence of character values. They can also be
-used for characters specified numerically, for example [\000-\037]. 
-In UTF-8
-mode, ranges can include characters whose values are greater than 255, for
-example [\x{100}-\x{2ff}].
-</p>
+used for characters specified numerically, for example [\000-\037]. Ranges
+can include any characters that are valid for the current mode.</p>
 
 <p>If a range that includes letters is used when caseless matching is set, it
 matches the letters in either case. For example, [W-c] is equivalent to
-[][\\^_`wxyzabc], matched caselessly
-, and in non-UTF-8 mode, if character
+[][\\^_`wxyzabc], matched caselessly, and in a non-UTF mode, if character
 tables for a French locale are in use, [\xc8-\xcb] matches accented E
-characters in both cases. In UTF-8 mode, PCRE supports the concept of case for
+characters in both cases. In UTF modes, PCRE supports the concept of case for
 characters with values greater than 128 only when it is compiled with Unicode
 property support.</p>
 
-<p>The character types \d, \D, \p, \P, \s, \S, \w, and \W may
-also appear in a character class, and add the characters that they
-match to the class. For example, [\dABCDEF] matches any hexadecimal
-digit. A circumflex can conveniently be used with the upper case
-character types to specify a more restricted set of characters than
-the matching lower case type. For example, the class [^\W_] matches
-any letter or digit, but not underscore.</p>
+<p>The character escape sequences \d, \D, \h, \H, \p, \P, \s, \S, \v,
+\V, \w, and \W may appear in a character class, and add the characters that
+they match to the class. For example, [\dABCDEF] matches any hexadecimal
+digit. In UTF modes, the <c>ucp</c> option affects the meanings of \d, \s, \w
+and their upper case partners, just as it does when they appear outside a
+character class, as described in the section entitled
+"Generic character types"
+above. The escape sequence \b has a different meaning inside a character
+class; it matches the backspace character. The sequences \B, \N, \R, and \X
+are not special inside a character class. Like any other unrecognized escape
+sequences, they are treated as the literal characters "B", "N", "R", and "X".</p>
+
+<p>A circumflex can conveniently be used with the upper case character types to
+specify a more restricted set of characters than the matching lower case type.
+For example, the class [^\W_] matches any letter or digit, but not underscore,
+whereas [\w] includes underscore. A positive character class should be read as
+"something OR something OR ..." and a negative class as "NOT something AND NOT
+something AND NOT ...".</p>
 
 <p>The only metacharacters that are recognized in character classes
 are backslash, hyphen (only where it can be interpreted as specifying
@@ -1611,7 +2019,6 @@ next section), and the terminating closing square bracket. However,
 escaping other non-alphanumeric characters does no harm.</p>
 </section>
 
-
 <section><marker id="sect8"></marker><title>POSIX character classes</title>
 
 <p>Perl supports the POSIX notation for character classes. This uses names
@@ -1621,7 +2028,7 @@ this notation. For example,</p>
 <quote><p>  [01[:alpha:]%]</p></quote>
 
 <p>matches "0", "1", any alphabetic character, or "%". The supported class names
-are</p>
+are:</p>
 
 <taglist>  
   <tag>alnum</tag>    <item>letters and digits</item>
@@ -1633,7 +2040,7 @@ are</p>
   <tag>graph</tag>    <item>printing characters, excluding space</item>
   <tag>lower</tag>    <item>lower case letters</item>
   <tag>print</tag>    <item>printing characters, including space</item>
-  <tag>punct</tag>    <item>printing characters, excluding letters and digits</item>
+  <tag>punct</tag>    <item>printing characters, excluding letters and digits and space</item>
   <tag>space</tag>    <item>whitespace (not quite the same as \s)</item>
   <tag>upper</tag>    <item>upper case letters</item>
   <tag>word</tag>     <item>"word" characters (same as \w)</item>
@@ -1655,8 +2062,26 @@ by a ^ character after the colon. For example,</p>
 syntax [.ch.] and [=ch=] where "ch" is a "collating element", but these are not
 supported, and an error is given if they are encountered.</p>
 
-<p>In UTF-8 mode, characters with values greater than 128 do not match any of
-the POSIX character classes.</p>
+<p>By default, in UTF modes, characters with values greater than 128 do not match
+any of the POSIX character classes. However, if the PCRE_UCP option is passed
+to <b>pcre_compile()</b>, some of the classes are changed so that Unicode
+character properties are used. This is achieved by replacing the POSIX classes
+by other sequences, as follows:</p>
+
+<taglist>
+  <tag>[:alnum:]</tag>  <item>becomes  <em>\p{Xan}</em></item>
+  <tag>[:alpha:]</tag>  <item>becomes  <em>\p{L}</em></item>
+  <tag>[:blank:]</tag>  <item>becomes  <em>\h</em></item>
+  <tag>[:digit:</tag>]  <item>becomes  <em>\p{Nd}</em></item>
+  <tag>[:lower:]</tag>  <item>becomes  <em>\p{Ll}</em></item>
+  <tag>[:space:]</tag>  <item>becomes  <em>\p{Xps}</em></item>
+  <tag>[:upper:</tag>]  <item>becomes  <em>\p{Lu}</em></item>
+  <tag>[:word:]</tag>   <item>becomes  <em>\p{Xwd}</em></item>
+</taglist>
+
+<p>Negated versions, such as [:^alpha:] use \P instead of \p. The other POSIX
+classes are unchanged, and match only characters with code points less than
+128.</p>
 
 </section>
 
@@ -1703,19 +2128,13 @@ unset.</p>
 <c>extra</c> can be changed in the same way as the Perl-compatible
 options by using the characters J, U and X respectively.</p>
 
-<p>When an option change occurs at top level (that is, not inside subpattern
-parentheses), the change applies to the remainder of the pattern that follows.
-If the change is placed right at the start of a pattern, PCRE extracts it into
-the global options 
-<!-- XXX C Interface
-(and it will therefore show up in data extracted by the
-<c>pcre_fullinfo()</c> function).
--->
-</p>
+<p>When one of these option changes occurs at top level (that is, not inside
+subpattern parentheses), the change applies to the remainder of the pattern
+that follows. If the change is placed right at the start of a pattern, PCRE
+extracts it into the global options.</p>
 
-<p>An option change within a subpattern (see below for a description
-of subpatterns) affects only that part of the current pattern that
-follows it, so</p>
+<p>An option change within a subpattern (see below for a description of
+subpatterns) affects only that part of the subpattern that follows it, so</p>
 
 <quote><p>  (a(?i)b)c</p></quote>
 
@@ -1733,11 +2152,16 @@ option settings happen at compile time. There would be some very weird
 behaviour otherwise.</p>
 
 <p><em>Note:</em> There are other PCRE-specific options that can be set by the
-application when the compile or match functions are called. In some cases the
-pattern can contain special leading sequences to override what the application
-has set or what has been defaulted. Details are given in the section entitled
-"Newline sequences" above.</p>
-
+application when the compiling or matching functions are called. In some cases
+the pattern can contain special leading sequences such as (*CRLF) to override
+what the application has set or what has been defaulted. Details are given in
+the section entitled "Newline sequences"
+above. There are also the (*UTF8) and (*UCP) leading
+sequences that can be used to set UTF and Unicode property modes; they are
+equivalent to setting the <c>unicode</c> and the <c>ucp</c>
+options, respectively. The (*UTF) sequence is a generic version that can be
+used with any of the libraries. However, the application can set the
+<c>never_utf</c> option, which locks out the use of the (*UTF) sequences.</p>
 
 </section>
 
@@ -1751,16 +2175,17 @@ things:</p>
 
 <quote><p>  cat(aract|erpillar|)</p></quote>
 
-<p>matches one of the words "cat", "cataract", or "caterpillar". Without the
-parentheses, it would match "cataract", "erpillar" or an empty string.</p>
+<p>matches "cataract", "caterpillar", or "cat". Without the parentheses, it would
+match "cataract", "erpillar" or an empty string.</p>
 
 <p>2. It sets up the subpattern as a capturing subpattern. This means that, when
 the complete pattern matches, that portion of the subject string that matched the
 subpattern is passed back to the caller via the return value of
-<c>re:run/3</c>. Opening parentheses are counted from left to right (starting
-from 1) to obtain numbers for the capturing subpatterns.</p>
-
-<p>For example, if the string "the red king" is matched against the pattern</p>
+<c>re:run/3</c>.</p>
+ 
+<p>Opening parentheses are counted from left to right (starting
+from 1) to obtain numbers for the capturing subpatterns.For example, if the string 
+"the red king" is matched against the pattern</p>
 
 <quote><p>  the ((red|white) (king|queen))</p></quote>
 
@@ -1793,7 +2218,6 @@ from left to right, and options are not reset until the end of the subpattern
 is reached, an option setting in one branch does affect subsequent branches, so
 the above patterns match "SUNDAY" as well as "Saturday".</p>
 
-
 </section>
 
 <section><marker id="sect12"></marker><title>Duplicate subpattern numbers</title>
@@ -1811,18 +2235,30 @@ at captured substring number one, whichever alternative matched. This construct
 is useful when you want to capture part, but not all, of one of a number of
 alternatives. Inside a (?| group, parentheses are numbered as usual, but the
 number is reset at the start of each branch. The numbers of any capturing
-buffers that follow the subpattern start after the highest number used in any
-branch. The following example is taken from the Perl documentation.
-The numbers underneath show in which buffer the captured content will be
-stored.</p>
+parentheses that follow the subpattern start after the highest number used in
+any branch. The following example is taken from the Perl documentation. The
+numbers underneath show in which buffer the captured content will be stored.</p>
 
 <code type="none">
   # before  ---------------branch-reset----------- after
   / ( a )  (?| x ( y ) z | (p (q) r) | (t) u (v) ) ( z ) /x
   # 1            2         2  3        2     3     4</code>
 
-<p>A backreference or a recursive call to a numbered subpattern always
-refers to the first one in the pattern with the given number.</p>
+<p>A back reference to a numbered subpattern uses the most recent value that is
+set for that number by any subpattern. The following pattern matches "abcabc"
+or "defdef":</p>
+
+<quote><p>    /(?|(abc)|(def))\1/</p></quote>
+
+<p>In contrast, a subroutine call to a numbered subpattern always refers to the
+first one in the pattern with the given number. The following pattern matches
+"abcabc" or "defabc":</p>
+
+<quote><p>    /(?|(abc)|(def))(?1)/</p></quote>
+
+<p>If a condition test
+for a subpattern's having matched refers to a non-unique number, the test is
+true if any of the subpatterns of that number have matched.</p>
 
 <p>An alternative approach to using this "branch reset" feature is to use
 duplicate named subpatterns, as described in the next section.</p>
@@ -1837,12 +2273,13 @@ if an expression is modified, the numbers may change. To help with this
 difficulty, PCRE supports the naming of subpatterns. This feature was not
 added to Perl until release 5.10. Python had the feature earlier, and PCRE
 introduced it at release 4.0, using the Python syntax. PCRE now supports both
-the Perl and the Python syntax.</p>
+the Perl and the Python syntax. Perl allows identically numbered subpatterns to
+have different names, but PCRE does not.</p>
 
 <p>In PCRE, a subpattern can be named in one of three ways:
 (?&lt;name&gt;...) or (?'name'...) as in Perl, or (?P&lt;name&gt;...)
 as in Python. References to capturing parentheses from other parts of
-the pattern, such as backreferences, recursion, and conditions, can be
+the pattern, such as back references, recursion, and conditions, can be
 made by name as well as by number.</p>
 
 <p>Names consist of up to 32 alphanumeric characters and underscores. Named
@@ -1857,11 +2294,13 @@ The <c>capture</c> specification to <c>re:run/3</c> can use named values if they
 </p>
 
 <p>By default, a name must be unique within a pattern, but it is possible to relax
-this constraint by setting the <c>dupnames</c> option at compile time. This can
-be useful for patterns where only one instance of the named parentheses can
-match. Suppose you want to match the name of a weekday, either as a 3-letter
-abbreviation or as the full name, and in both cases you want to extract the
-abbreviation. This pattern (ignoring the line breaks) does the job:</p>
+this constraint by setting the <c>dupnames</c> option at compile time. (Duplicate
+names are also always permitted for subpatterns with the same number, set up as
+described in the previous section.) Duplicate names can be useful for patterns
+where only one instance of the named parentheses can match. Suppose you want to
+match the name of a weekday, either as a 3-letter abbreviation or as the full
+name, and in both cases you want to extract the abbreviation. This pattern
+(ignoring the line breaks) does the job:</p>
 
 <code type="none">
   (?&lt;DN&gt;Mon|Fri|Sun)(?:day)?|
@@ -1887,7 +2326,13 @@ details of the interfaces for handling named subpatterns, see the
 documentation.</p>
 -->
 
-<p>In case of capturing named subpatterns which are not unique, the first occurrence is returned from <c>re:exec/3</c>, if the name is specified int the <c>values</c> part of the <c>capture</c> statement.</p>
+<p>In case of capturing named subpatterns which names are not unique, the first matching occurrence (counted from left to right in the subject) is returned from <c>re:exec/3</c>, if the name is specified in the <c>values</c> part of the <c>capture</c> statement. The <c>all_names</c> capturing value will match all of the names in the same way.</p>
+
+<p><em>Warning:</em> You cannot use different names to distinguish between two
+subpatterns with the same number because PCRE uses only the numbers when
+matching. For this reason, an error is given at compile time if different names
+are given to subpatterns with the same number. However, you can give the same
+name to subpatterns with the same number, even when <c>dupnames</c> is not set.</p>
 
 </section>
 
@@ -1900,14 +2345,13 @@ following items:</p>
   <item>a literal data character</item>
   <item>the dot metacharacter</item>
   <item>the \C escape sequence</item>
-  <item>the \X escape sequence 
-(in UTF-8 mode with Unicode properties)
-  </item>
+  <item>the \X escape sequence</item>
   <item>the \R escape sequence</item>
-  <item>an escape such as \d that matches a single character</item>
+  <item>an escape such as \d or \pL that matches a single character</item>
   <item>a character class</item>
   <item>a back reference (see next section)</item>
-  <item>a parenthesized subpattern (unless it is an assertion)</item>
+  <item>a parenthesized subpattern (including assertions)</item>
+  <item>a subroutine call to a subpattern (recursive or otherwise)</item>
 </list>
 
 <p>The general repetition quantifier specifies a minimum and maximum number of
@@ -1933,14 +2377,18 @@ where a quantifier is not allowed, or one that does not match the syntax of a
 quantifier, is taken as a literal character. For example, {,6} is not a
 quantifier, but a literal string of four characters.</p>
 
-<p>In UTF-8 mode, quantifiers apply to UTF-8 characters rather than to individual
-bytes. Thus, for example, \x{100}{2} matches two UTF-8 characters, each of
-which is represented by a two-byte sequence. Similarly, when Unicode property
-support is available, \X{3} matches three Unicode extended sequences, each of
-which may be several bytes long (and they may be of different lengths).</p>
-
+<p>In Unicode mode, quantifiers apply to characters rather than to individual data
+units. Thus, for example, \x{100}{2} matches two characters, each of
+which is represented by a two-byte sequence in a UTF-8 string. Similarly,
+\X{3} matches three Unicode extended grapheme clusters, each of which may be
+several data units long (and they may be of different lengths).</p>
 <p>The quantifier {0} is permitted, causing the expression to behave as if the
-previous item and the quantifier were not present.</p>
+previous item and the quantifier were not present. This may be useful for
+subpatterns that are referenced as subroutines
+from elsewhere in the pattern (but see also the section entitled
+"Defining subpatterns for use by reference only"
+below). Items other than subpatterns that have a {0} quantifier are omitted
+from the compiled pattern.</p>
 
 <p>For convenience, the three most common quantifiers have single-character
 abbreviations:</p>
@@ -2014,8 +2462,8 @@ pattern as though it were preceded by \A.</p>
 worth setting <c>dotall</c> in order to obtain this optimization, or
 alternatively using ^ to indicate anchoring explicitly.</p>
 
-<p>However, there is one situation where the optimization cannot be used. When .*
-is inside capturing parentheses that are the subject of a backreference
+<p>However, there are some cases where the optimization cannot be used. When .*
+is inside capturing parentheses that are the subject of a back reference
 elsewhere in the pattern, a match at the start may fail where a later one
 succeeds. Consider, for example:</p>
 
@@ -2024,6 +2472,15 @@ succeeds. Consider, for example:</p>
 <p>If the subject is "xyz123abc123" the match point is the fourth character. For
 this reason, such a pattern is not implicitly anchored.</p>
 
+<p>Another case where implicit anchoring is not applied is when the leading .* is
+inside an atomic group. Once again, a match at the start may fail where a later
+one succeeds. Consider this pattern:</p>
+
+<quote><p>  (?&gt;.*?a)b</p></quote>
+
+<p>It matches "ab" in the subject "aab". The use of the backtracking control verbs
+(*PRUNE) and (*SKIP) also disable this optimization.</p>
+
 <p>When a capturing subpattern is repeated, the value captured is the substring
 that matched the final iteration. For example, after</p>
 
@@ -2162,11 +2619,10 @@ further details of the handling of digits following a backslash. There
 is no such problem when named parentheses are used. A back reference
 to any subpattern is possible using named parentheses (see below).</p>
 
-<p>Another way of avoiding the ambiguity inherent in the use of digits
-following a backslash is to use the \g escape sequence, which is a
-feature introduced in Perl 5.10. This escape must be followed by an
-unsigned number or a negative number, optionally enclosed in
-braces. These examples are all identical:</p>
+<p>Another way of avoiding the ambiguity inherent in the use of digits following a
+backslash is to use the \g escape sequence. This escape must be followed by an
+unsigned number or a negative number, optionally enclosed in braces. These
+examples are all identical:</p>
 
 <list>  
   <item>(ring), \1</item>
@@ -2182,10 +2638,10 @@ reference. Consider this example:</p>
 <quote><p>  (abc(def)ghi)\g{-1}</p></quote>
 
 <p>The sequence \g{-1} is a reference to the most recently started capturing
-subpattern before \g, that is, is it equivalent to \2. Similarly, \g{-2}
-would be equivalent to \1. The use of relative references can be helpful in
-long patterns, and also in patterns that are created by joining together
-fragments that contain references within themselves.</p>
+subpattern before \g, that is, is it equivalent to \2 in this example.
+Similarly, \g{-2} would be equivalent to \1. The use of relative references
+can be helpful in long patterns, and also in patterns that are created by
+joining together fragments that contain references within themselves.</p>
 
 <p>A back reference matches whatever actually matched the capturing
 subpattern in the current subject string, rather than anything
@@ -2234,6 +2690,8 @@ some delimiter must be used to terminate the back reference. If the
 <c>extended</c> option is set, this can be whitespace.  Otherwise an
 empty comment (see "Comments" below) can be used.</p>
 
+<p><em>Recursive back references</em></p>
+
 <p>A back reference that occurs inside the parentheses to which it refers fails
 when the subpattern is first used, so, for example, (a\1) never matches.
 However, such references can be useful inside repeated subpatterns. For
@@ -2248,6 +2706,11 @@ that the first iteration does not need to match the back reference. This can be
 done using alternation, as in the example above, or by a quantifier with a
 minimum of zero.</p>
 
+<p>Back references of this type cause the group that they reference to be treated
+as an atomic group.
+Once the whole group has been matched, a subsequent matching failure cannot
+cause backtracking into the middle of the group.</p>
+
 </section>
 
 <section><marker id="sect17"></marker><title>Assertions</title>
@@ -2263,12 +2726,27 @@ those that look ahead of the current position in the subject string, and those
 that look behind it. An assertion subpattern is matched in the normal way,
 except that it does not cause the current matching position to be changed.</p>
 
-<p>Assertion subpatterns are not capturing subpatterns, and may not be repeated,
-because it makes no sense to assert the same thing several times. If any kind
-of assertion contains capturing subpatterns within it, these are counted for
-the purposes of numbering the capturing subpatterns in the whole pattern.
-However, substring capturing is carried out only for positive assertions,
-because it does not make sense for negative assertions.</p>
+<p>Assertion subpatterns are not capturing subpatterns. If such an assertion
+contains capturing subpatterns within it, these are counted for the purposes of
+numbering the capturing subpatterns in the whole pattern. However, substring
+capturing is carried out only for positive assertions. (Perl sometimes, but not
+always, does do capturing in negative assertions.)</p>
+
+<p>For compatibility with Perl, assertion subpatterns may be repeated; though
+it makes no sense to assert the same thing several times, the side effect of
+capturing parentheses may occasionally be useful. In practice, there only three
+cases:</p>
+
+<taglist>
+<tag>(1)</tag> <item>If the quantifier is {0}, the assertion is never obeyed during matching.
+However, it may contain internal capturing parenthesized groups that are called
+from elsewhere via the subroutine mechanism.</item>
+<tag>(2)</tag> <item>If quantifier is {0,n} where n is greater than zero, it is treated as if it
+were {0,1}. At run time, the rest of the pattern match is tried with and
+without the assertion, the order depending on the greediness of the quantifier.</item>
+<tag>(3)</tag> <item>If the minimum repetition is greater than zero, the quantifier is ignored.
+The assertion is obeyed just once when encountered during matching.</item>
+</taglist>
 
 <p><em>Lookahead assertions</em></p>
 
@@ -2294,7 +2772,8 @@ lookbehind assertion is needed to achieve the other effect.</p>
 
 <p>If you want to force a matching failure at some point in a pattern, the most
 convenient way to do it is with (?!) because an empty string always matches, so
-an assertion that requires there not to be an empty string must always fail.</p>
+an assertion that requires there not to be an empty string must always fail.
+The backtracking control verb (*FAIL) or (*F) is a synonym for (?!).</p>
 
 
 <p><em>Lookbehind assertions</em></p>
@@ -2317,33 +2796,38 @@ do not all have to have the same fixed length. Thus</p>
 
 <p>causes an error at compile time. Branches that match different length strings
 are permitted only at the top level of a lookbehind assertion. This is an
-extension compared with Perl (at least for 5.8), which requires all branches to
+extension compared with Perl, which requires all branches to
 match the same length of string. An assertion such as</p>
 
 <quote><p>  (?&lt;=ab(c|de))</p></quote>
 
 <p>is not permitted, because its single top-level branch can match two different
-lengths, but it is acceptable if rewritten to use two top-level branches:</p>
+lengths, but it is acceptable to PCRE if rewritten to use two top-level 
+branches:</p>
 
 <quote><p>  (?&lt;=abc|abde)</p></quote>
 
-<p>In some cases, the Perl 5.10 escape sequence \K (see above) can be
-used instead of a lookbehind assertion; this is not restricted to a
-fixed-length.</p>
+<p>In some cases, the escape sequence \K (see above) can be
+used instead of a lookbehind assertion to get round the fixed-length
+restriction.</p>
 
 <p>The implementation of lookbehind assertions is, for each alternative, to
 temporarily move the current position back by the fixed length and then try to
 match. If there are insufficient characters before the current position, the
 assertion fails.</p>
 
-<p>PCRE does not allow the \C escape (which matches a single byte in UTF-8 mode)
-to appear in lookbehind assertions, because it makes it impossible to calculate
-the length of the lookbehind. The \X and \R escapes, which can match
-different numbers of bytes, are also not permitted.</p>
+<p>In a UTF mode, PCRE does not allow the \C escape (which matches a single data
+unit even in a UTF mode) to appear in lookbehind assertions, because it makes
+it impossible to calculate the length of the lookbehind. The \X and \R
+escapes, which can match different numbers of data units, are also not
+permitted.</p>
+<p>"Subroutine" calls (see below) such as (?2) or (?&amp;X) are permitted in lookbehinds, as long
+as the subpattern matches a fixed-length string. Recursion,
+however, is not supported.</p>
 
 <p>Possessive quantifiers can be used in conjunction with lookbehind assertions to
-specify efficient matching at the end of the subject string. Consider a simple
-pattern such as</p>
+specify efficient matching of fixed-length strings at the end of subject
+strings. Consider a simple pattern such as</p>
 
 <quote><p>  abcd$</p></quote>
 
@@ -2406,8 +2890,8 @@ characters that are not "999".</p>
 
 <p>It is possible to cause the matching process to obey a subpattern
 conditionally or to choose between two alternative subpatterns, depending on
-the result of an assertion, or whether a previous capturing subpattern matched
-or not. The two possible forms of conditional subpattern are</p>
+the result of an assertion, or whether a specific capturing subpattern has
+already been matched. The two possible forms of conditional subpattern are:</p>
 
 <list>  
 <item>(?(condition)yes-pattern)</item>
@@ -2416,7 +2900,13 @@ or not. The two possible forms of conditional subpattern are</p>
 
 <p>If the condition is satisfied, the yes-pattern is used; otherwise the
 no-pattern (if present) is used. If there are more than two alternatives in the
-subpattern, a compile-time error occurs.</p>
+subpattern, a compile-time error occurs. Each of the two alternatives may
+itself contain nested subpatterns of any form, including conditional
+subpatterns; the restriction to two alternatives applies only at the level of
+the condition. This pattern fragment is an example where the alternatives are
+complex:</p>
+
+<quote><p>  (?(1) (A|B|C) | (D | (?(2)E|F) | E) )</p></quote>
 
 <p>There are four kinds of condition: references to subpatterns, references to
 recursion, a pseudo-condition called DEFINE, and assertions.</p>
@@ -2425,13 +2915,16 @@ recursion, a pseudo-condition called DEFINE, and assertions.</p>
 <p><em>Checking for a used subpattern by number</em></p>
 
 <p>If the text between the parentheses consists of a sequence of
-digits, the condition is true if the capturing subpattern of that
-number has previously matched. An alternative notation is to precede
-the digits with a plus or minus sign. In this case, the subpattern
-number is relative rather than absolute.  The most recently opened
-parentheses can be referenced by (?(-1), the next most recent by
-(?(-2), and so on. In looping constructs it can also make sense to
-refer to subsequent groups with constructs such as (?(+2).</p>
+digits, the condition is true if a capturing subpattern of that number has previously
+matched. If there is more than one capturing subpattern with the same number
+(see the earlier section about duplicate subpattern numbers),
+the condition is true if any of them have matched. An alternative notation is
+to precede the digits with a plus or minus sign. In this case, the subpattern
+number is relative rather than absolute. The most recently opened parentheses
+can be referenced by (?(-1), the next most recent by (?(-2), and so on. Inside
+loops it can also make sense to refer to subsequent groups. The next
+parentheses to be opened can be referenced as (?(+1), and so on. (The value
+zero in any of these forms is not used; it provokes a compile-time error.)</p>
 
 <p>Consider the following pattern, which contains non-significant
 whitespace to make it more readable (assume the <c>extended</c>
@@ -2442,7 +2935,7 @@ option) and to divide it into three parts for ease of discussion:</p>
 <p>The first part matches an optional opening parenthesis, and if that
 character is present, sets it as the first captured substring. The second part
 matches one or more characters that are not parentheses. The third part is a
-conditional subpattern that tests whether the first set of parentheses matched
+conditional subpattern that tests whether or not the first set of parentheses matched
 or not. If they did, that is, if subject started with an opening parenthesis,
 the condition is true, and so the yes-pattern is executed and a closing
 parenthesis is required. Otherwise, since no-pattern is not present, the
@@ -2472,6 +2965,10 @@ consist entirely of digits is not recommended.</p>
 
 <quote><p>  (?&lt;OPEN&gt; \( )?    [^()]+    (?(&lt;OPEN&gt;) \) )</p></quote>
 
+<p>If the name used in a condition of this kind is a duplicate, the test is
+applied to all subpatterns of the same name, and is true if any one of them has
+matched.</p>
+
 <p><em>Checking for pattern recursion</em></p>
 
 <p>If the condition is the string (R), and there is no subpattern with
@@ -2481,12 +2978,14 @@ by ampersand follow the letter R, for example:</p>
 
 <quote><p>  (?(R3)...) or (?(R&amp;name)...)</p></quote>
 
-<p>the condition is true if the most recent recursion is into the
+<p>the condition is true if the most recent recursion is into a
 subpattern whose number or name is given. This condition does not
-check the entire recursion stack.</p>
+check the entire recursion stack. If the name used in a condition of this kind is a duplicate, the test is
+applied to all subpatterns of the same name, and is true if any one of them is
+the most recent recursion.</p>
 
-<p>At "top level", all these recursion test conditions are false. Recursive
-patterns are described below.</p>
+<p>At "top level", all these recursion test conditions are false. The syntax for recursive
+patterns is described below.</p>
 
 <p><em>Defining subpatterns for use by reference only</em></p>
 
@@ -2494,21 +2993,21 @@ patterns are described below.</p>
 name DEFINE, the condition is always false. In this case, there may be only one
 alternative in the subpattern. It is always skipped if control reaches this
 point in the pattern; the idea of DEFINE is that it can be used to define
-"subroutines" that can be referenced from elsewhere. (The use of "subroutines"
-is described below.) For example, a pattern to match an IPv4 address could be
+"subroutines" that can be referenced from elsewhere. (The use of subroutines
+is described below.) For example, a pattern to match an IPv4 address such as
+"192.168.23.245" could be
 written like this (ignore whitespace and line breaks):</p>
 
 <quote><p>  (?(DEFINE) (?&lt;byte&gt; 2[0-4]\d | 25[0-5] | 1\d\d | [1-9]?\d) )
   \b (?&amp;byte) (\.(?&amp;byte)){3} \b</p></quote>
 
-<p>The first part of the pattern is a DEFINE group inside which a another group
-named "byte" is defined. This matches an individual component of an IPv4
-address (a number less than 256). When matching takes place, this part of the
-pattern is skipped because DEFINE acts like a false condition.</p>
-
-<p>The rest of the pattern uses references to the named group to match the four
-dot-separated components of an IPv4 address, insisting on a word boundary at
-each end.</p>
+<p>The first part of the pattern is a DEFINE group inside which a
+another group named "byte" is defined. This matches an individual
+component of an IPv4 address (a number less than 256). When matching
+takes place, this part of the pattern is skipped because DEFINE acts
+like a false condition. The rest of the pattern uses references to the
+named group to match the four dot-separated components of an IPv4
+address, insisting on a word boundary at each end.</p>
 
 <p><em>Assertion conditions</em></p>
 
@@ -2533,14 +3032,31 @@ dd-aaa-dd or dd-dd-dd, where aaa are letters and dd are digits.</p>
 
 <section><marker id="sect19"></marker><title>Comments</title>
 
-<p>The sequence (?# marks the start of a comment that continues up to the next
-closing parenthesis. Nested parentheses are not permitted. The characters
-that make up a comment play no part in the pattern matching at all.</p>
-
-<p>If the <c>extended</c> option is set, an unescaped # character outside a
-character class introduces a comment that continues to immediately after the
-next newline in the pattern.</p>
+<p>There are two ways of including comments in patterns that are processed by
+PCRE. In both cases, the start of the comment must not be in a character class,
+nor in the middle of any other sequence of related characters such as (?: or a
+subpattern name or number. The characters that make up a comment play no part
+in the pattern matching.</p>
 
+<p>The sequence (?# marks the start of a comment that continues up to the next
+closing parenthesis. Nested parentheses are not permitted. If the PCRE_EXTENDED
+option is set, an unescaped # character also introduces a comment, which in
+this case continues to immediately after the next newline character or
+character sequence in the pattern. Which characters are interpreted as newlines
+is controlled by the options passed to a compiling function or by a special
+sequence at the start of the pattern, as described in the section entitled
+"Newline conventions"
+above. Note that the end of this type of comment is a literal newline sequence
+in the pattern; escape sequences that happen to represent a newline do not
+count. For example, consider this pattern when <c>extended</c> is set, and the
+default newline convention is in force:</p>
+
+<quote><p>  abc #comment \n still comment</p></quote>
+
+<p>On encountering the # character, <b>pcre_compile()</b> skips along, looking for
+a newline in the pattern. The sequence \n is still literal at this stage, so
+it does not terminate the comment. Only an actual character with the code value
+0x0a (the default newline) does so.</p>
 
 </section>
 
@@ -2566,51 +3082,45 @@ case refers recursively to the pattern in which it appears.</p>
 <p>Obviously, PCRE cannot support the interpolation of Perl code. Instead, it
 supports special syntax for recursion of the entire pattern, and also for
 individual subpattern recursion. After its introduction in PCRE and Python,
-this kind of recursion was introduced into Perl at release 5.10.</p>
+this kind of recursion was subsequently introduced into Perl at release 5.10.</p>
 
 <p>A special item that consists of (? followed by a number greater
-than zero and a closing parenthesis is a recursive call of the
+than zero and a closing parenthesis is a recursive subroutine call of the
 subpattern of the given number, provided that it occurs inside that
-subpattern. (If not, it is a "subroutine" call, which is described in
+subpattern. (If not, it is a non-recursive subroutine call, which is described in
 the next section.) The special item (?R) or (?0) is a recursive call
 of the entire regular expression.</p>
 
-<p>In PCRE (like Python, but unlike Perl), a recursive subpattern call
-is always treated as an atomic group. That is, once it has matched
-some of the subject string, it is never re-entered, even if it
-contains untried alternatives and there is a subsequent matching
-failure.</p>
-
 <p>This PCRE pattern solves the nested parentheses problem (assume the
 <c>extended</c> option is set so that whitespace is ignored):</p>
 
-<quote><p>  \( ( (?&gt;[^()]+) | (?R) )* \)</p></quote>
+<quote><p>  \( ( [^()]++ | (?R) )* \)</p></quote>
 
 <p>First it matches an opening parenthesis. Then it matches any number
 of substrings which can either be a sequence of non-parentheses, or a
 recursive match of the pattern itself (that is, a correctly
-parenthesized substring).  Finally there is a closing parenthesis.</p>
+parenthesized substring).  Finally there is a closing
+parenthesis. Note the use of a possessive quantifier to avoid
+backtracking into sequences of non-parentheses.</p>
 
 <p>If this were part of a larger pattern, you would not want to
 recurse the entire pattern, so instead you could use this:</p>
 
-<quote><p>  ( \( ( (?&gt;[^()]+) | (?1) )* \) )</p></quote>
+<quote><p>  ( \( ( [^()]++ | (?1) )* \) )</p></quote>
 
 <p>We have put the pattern into parentheses, and caused the recursion
 to refer to them instead of the whole pattern.</p>
 
-<p>In a larger pattern, keeping track of parenthesis numbers can be
-tricky. This is made easier by the use of relative references. (A Perl
-5.10 feature.)  Instead of (?1) in the pattern above you can write
-(?-2) to refer to the second most recently opened parentheses
-preceding the recursion. In other words, a negative number counts
-capturing parentheses leftwards from the point at which it is
-encountered.</p>
+<p>In a larger pattern, keeping track of parenthesis numbers can be tricky. This
+is made easier by the use of relative references. Instead of (?1) in the
+pattern above you can write (?-2) to refer to the second most recently opened
+parentheses preceding the recursion. In other words, a negative number counts
+capturing parentheses leftwards from the point at which it is encountered.</p>
 
 <p>It is also possible to refer to subsequently opened parentheses, by
 writing references such as (?+2). However, these cannot be recursive
 because the reference is not inside the parentheses that are
-referenced. They are always "subroutine" calls, as described in the
+referenced. They are always non-recursive subroutine calls, as described in the
 next section.</p>
 
 <p>An alternative approach is to use named parentheses instead. The
@@ -2618,75 +3128,136 @@ Perl syntax for this is (?&amp;name); PCRE's earlier syntax
 (?P&gt;name) is also supported. We could rewrite the above example as
 follows:</p>
 
-<quote><p>  (?&lt;pn&gt; \( ( (?&gt;[^()]+) | (?&amp;pn) )* \) )</p></quote>
+<quote><p>  (?&lt;pn&gt; \( ( [^()]++ | (?&amp;pn) )* \) )</p></quote>
 
 <p>If there is more than one subpattern with the same name, the earliest one is
 used.</p>
 
 <p>This particular example pattern that we have been looking at contains nested
-unlimited repeats, and so the use of atomic grouping for matching strings of
-non-parentheses is important when applying the pattern to strings that do not
-match. For example, when this pattern is applied to</p>
+unlimited repeats, and so the use of a possessive quantifier for matching
+strings of non-parentheses is important when applying the pattern to strings
+that do not match. For example, when this pattern is applied to</p>
 
 <quote><p>  (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()</p></quote>
 
-<p>it yields "no match" quickly. However, if atomic grouping is not used,
+<p>it yields "no match" quickly. However, if a possessive quantifier is not used,
 the match runs for a very long time indeed because there are so many different
 ways the + and * repeats can carve up the subject, and all have to be tested
 before failure can be reported.</p>
 
-<p>At the end of a match, the values set for any capturing subpatterns are those
-from the outermost level of the recursion at which the subpattern value is set.
+<p>At the end of a match, the values of capturing parentheses are those from
+the outermost level. If the pattern above is matched against</p>
 
-<!-- XXX C Interface
-If you want to obtain intermediate values, a callout function can be used (see
-below and the
+<quote><p>  (ab(cd)ef)</p></quote>
 
-<em>pcrecallout</em>
+<p>the value for the inner capturing parentheses (numbered 2) is "ef", which is
+the last value taken on at the top level. If a capturing subpattern is not
+matched at the top level, its final captured value is unset, even if it was
+(temporarily) set at a deeper level during the matching process.</p>
 
-documentation). 
--->
-If the pattern above is matched against</p>
+<p>Do not confuse the (?R) item with the condition (R), which tests for recursion.
+Consider this pattern, which matches text in angle brackets, allowing for
+arbitrary nesting. Only digits are allowed in nested brackets (that is, when
+recursing), whereas any characters are permitted at the outer level.</p>
 
-<quote><p>  (ab(cd)ef)</p></quote>
+<quote><p>  &lt; (?: (?(R) \d++  | [^&lt;&gt;]*+) | (?R)) * &gt;</p></quote>
 
-<p>the value for the capturing parentheses is "ef", which is the last value taken
-on at the top level. If additional parentheses are added, giving</p>
+<p>In this pattern, (?(R) is the start of a conditional subpattern, with two
+different alternatives for the recursive and non-recursive cases. The (?R) item
+is the actual recursive call.</p>
+
+<p><em>Differences in recursion processing between PCRE and Perl</em></p>
+
+<p>Recursion processing in PCRE differs from Perl in two important ways. In PCRE
+(like Python, but unlike Perl), a recursive subpattern call is always treated
+as an atomic group. That is, once it has matched some of the subject string, it
+is never re-entered, even if it contains untried alternatives and there is a
+subsequent matching failure. This can be illustrated by the following pattern,
+which purports to match a palindromic string that contains an odd number of
+characters (for example, "a", "aba", "abcba", "abcdcba"):</p>
+
+<quote><p>  ^(.|(.)(?1)\2)$</p></quote>
+
+<p>The idea is that it either matches a single character, or two identical
+characters surrounding a sub-palindrome. In Perl, this pattern works; in PCRE
+it does not if the pattern is longer than three characters. Consider the
+subject string "abcba":</p>
+
+<p>At the top level, the first character is matched, but as it is not at the end
+of the string, the first alternative fails; the second alternative is taken
+and the recursion kicks in. The recursive call to subpattern 1 successfully
+matches the next character ("b"). (Note that the beginning and end of line
+tests are not part of the recursion).</p>
+
+<p>Back at the top level, the next character ("c") is compared with what
+subpattern 2 matched, which was "a". This fails. Because the recursion is
+treated as an atomic group, there are now no backtracking points, and so the
+entire match fails. (Perl is able, at this point, to re-enter the recursion and
+try the second alternative.) However, if the pattern is written with the
+alternatives in the other order, things are different:</p>
+
+<quote><p>  ^((.)(?1)\2|.)$</p></quote>
+
+<p>This time, the recursing alternative is tried first, and continues to recurse
+until it runs out of characters, at which point the recursion fails. But this
+time we do have another alternative to try at the higher level. That is the big
+difference: in the previous case the remaining alternative is at a deeper
+recursion level, which PCRE cannot use.</p>
+
+<p>To change the pattern so that it matches all palindromic strings, not just
+those with an odd number of characters, it is tempting to change the pattern to
+this:</p>
 
-<code type="none">
-  \( ( ( (?&gt;[^()]+) | (?R) )* ) \)
-     ^                        ^
-     ^                        ^</code>
+<quote><p>  ^((.)(?1)\2|.?)$</p></quote>
 
-<p>the string they capture is "ab(cd)ef", the contents of the top level
-parentheses. 
-<!-- XXX C interface
-If there are more than 15 capturing parentheses in a pattern, PCRE
-has to obtain extra memory to store data during a recursion, which it does by
-using <em>pcre_malloc</em>, freeing it via <em>pcre_free</em> afterwards. If no
-memory can be obtained, the match fails with the <c>error_nomemory</c> error.</p>
--->
-</p>
+<p>Again, this works in Perl, but not in PCRE, and for the same reason. When a
+deeper recursion has matched a single character, it cannot be entered again in
+order to match an empty string. The solution is to separate the two cases, and
+write out the odd and even cases as alternatives at the higher level:</p>
 
-<p>Do not confuse the (?R) item with the condition (R), which tests
-for recursion.  Consider this pattern, which matches text in angle
-brackets, allowing for arbitrary nesting. Only digits are allowed in
-nested brackets (that is, when recursing), whereas any characters are
-permitted at the outer level.</p>
+<quote><p>  ^(?:((.)(?1)\2|)|((.)(?3)\4|.))</p></quote>
 
-<quote><p>  &lt; (?: (?(R) \d++  | [^&lt;&gt;]*+) | (?R)) * &gt;</p></quote>
+<p>If you want to match typical palindromic phrases, the pattern has to ignore all
+non-word characters, which can be done like this:</p>
+
+  <quote><p>  ^\W*+(?:((.)\W*+(?1)\W*+\2|)|((.)\W*+(?3)\W*+\4|\W*+.\W*+))\W*+$</p></quote>
+
+<p>If run with the <c>caseless</c> option, this pattern matches phrases such as "A
+man, a plan, a canal: Panama!" and it works well in both PCRE and Perl. Note
+the use of the possessive quantifier *+ to avoid backtracking into sequences of
+non-word characters. Without this, PCRE takes a great deal longer (ten times or
+more) to match typical phrases, and Perl takes so long that you think it has
+gone into a loop.</p>
+
+<p><em>WARNING</em>: The palindrome-matching patterns above work only if the subject
+string does not start with a palindrome that is shorter than the entire string.
+For example, although "abcba" is correctly matched, if the subject is "ababa",
+PCRE finds the palindrome "aba" at the start, then fails at top level because
+the end of the string does not follow. Once again, it cannot jump back into the
+recursion to try other alternatives, so the entire match fails.</p>
 
-<p>In this pattern, (?(R) is the start of a conditional subpattern,
-with two different alternatives for the recursive and non-recursive
-cases. The (?R) item is the actual recursive call.</p>
+<p>The second way in which PCRE and Perl differ in their recursion processing is
+in the handling of captured values. In Perl, when a subpattern is called
+recursively or as a subpattern (see the next section), it has no access to any
+values that were captured outside the recursion, whereas in PCRE these values
+can be referenced. Consider this pattern:</p>
+
+<quote><p>  ^(.)(\1|a(?2))</p></quote>
+
+<p>In PCRE, this pattern matches "bab". The first capturing parentheses match "b",
+then in the second group, when the back reference \1 fails to match "b", the
+second alternative matches "a" and then recurses. In the recursion, \1 does
+now match "b" and so the whole match succeeds. In Perl, the pattern fails to
+match because inside the recursive call \1 cannot access the externally set
+value.</p>
 
 </section>
 
 <section><marker id="sect21"></marker><title>Subpatterns as subroutines</title>
 
-<p>If the syntax for a recursive subpattern reference (either by number or by
+<p>If the syntax for a recursive subpattern call (either by number or by
 name) is used outside the parentheses to which it refers, it operates like a
-subroutine in a programming language. The "called" subpattern may be defined
+subroutine in a programming language. The called subpattern may be defined
 before or after the reference. A numbered reference can be absolute or
 relative, as in these examples:</p>
 
@@ -2708,23 +3279,40 @@ relative, as in these examples:</p>
 <p>is used, it does match "sense and responsibility" as well as the other two
 strings. Another example is given in the discussion of DEFINE above.</p>
 
-<p>Like recursive subpatterns, a "subroutine" call is always treated
-as an atomic group. That is, once it has matched some of the subject
-string, it is never re-entered, even if it contains untried
-alternatives and there is a subsequent matching failure.</p>
-
-<p>When a subpattern is used as a subroutine, processing options such as
-case-independence are fixed when the subpattern is defined. They cannot be
-changed for different calls. For example, consider this pattern:</p>
+<p>All subroutine calls, whether recursive or not, are always treated as atomic
+groups. That is, once a subroutine has matched some of the subject string, it
+is never re-entered, even if it contains untried alternatives and there is a
+subsequent matching failure. Any capturing parentheses that are set during the
+subroutine call revert to their previous values afterwards.</p>
 
+<p>Processing options such as case-independence are fixed when a subpattern is
+defined, so if it is used as a subroutine, such options cannot be changed for
+different calls. For example, consider this pattern:</p>
 <quote><p>  (abc)(?i:(?-1))</p></quote>
 
 <p>It matches "abcabc". It does not match "abcABC" because the change of
 processing option does not affect the called subpattern.</p>
 
-
 </section>
 
+<section><marker id="sect22"></marker><title>Oniguruma subroutine syntax</title>
+<p>For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or
+a number enclosed either in angle brackets or single quotes, is an alternative
+syntax for referencing a subpattern as a subroutine, possibly recursively. Here
+are two of the examples used above, rewritten using this syntax:</p>
+<quote>
+  <p>    (?&lt;pn&gt; \( ( (?&gt;[^()]+) | \g&lt;pn&gt; )* \) )</p>
+  <p>    (sens|respons)e and \g'1'ibility</p>
+</quote>
+<p>PCRE supports an extension to Oniguruma: if a number is preceded by a
+plus or a minus sign it is taken as a relative reference. For example:</p>
+
+  <quote><p>    (abc)(?i:\g&lt;-1&gt;)</p></quote>
+
+<p>Note that \g{...} (Perl syntax) and \g&lt;...&gt; (Oniguruma syntax) are <i>not</i>
+synonymous. The former is a back reference; the latter is a subroutine call.</p>
+
+</section>
 <!-- XXX C interface
 
 <section> <marker id="sect22"><title>Callouts</title></marker>
@@ -2767,116 +3355,387 @@ documentation.</p>
 <section><marker id="sect23"></marker><title>Backtracking control</title>
 
 <p>Perl 5.10 introduced a number of "Special Backtracking Control Verbs", which
-are described in the Perl documentation as "experimental and subject to change
-or removal in a future version of Perl". It goes on to say: "Their usage in
-production code should be noted to avoid problems during upgrades." The same
+are still described in the Perl documentation as "experimental and subject to
+change or removal in a future version of Perl". It goes on to say: "Their usage
+in production code should be noted to avoid problems during upgrades." The same
 remarks apply to the PCRE features described in this section.</p>
 
+<p>The new verbs make use of what was previously invalid syntax: an opening
+parenthesis followed by an asterisk. They are generally of the form
+(*VERB) or (*VERB:NAME). Some may take either form, possibly behaving
+differently depending on whether or not a name is present. A name is any
+sequence of characters that does not include a closing parenthesis. The maximum
+length of name is 255 in the 8-bit library and 65535 in the 16-bit and 32-bit
+libraries. If the name is empty, that is, if the closing parenthesis
+immediately follows the colon, the effect is as if the colon were not there.
+Any number of these verbs may occur in a pattern.</p>
+
 <!-- XXX C interface
-<p>Since these verbs are specifically related to backtracking, they can be used
-only when the pattern is to be matched using <c>re:run/3</c>, which uses a
-backtracking algorithm. They cause an error if encountered by
-<c>pcre_dfa_exec()</c>.</p>
+<p>Since these verbs are specifically related to backtracking, most of them can be
+used only when the pattern is to be matched using one of the traditional
+matching functions, because these use a backtracking algorithm. With the
+exception of (*FAIL), which behaves like a failing negative assertion, the
+backtracking control verbs cause an error if encountered by a DFA matching
+function.</p>
 -->
+<p>The behaviour of these verbs in
+repeated groups, assertions,
+and in subpatterns called as subroutines
+(whether or not recursively) is documented below.</p>
 
-<p>The new verbs make use of what was previously invalid syntax: an opening
-parenthesis followed by an asterisk. In Perl, they are generally of the form
-(*VERB:ARG) but PCRE does not support the use of arguments, so its general
-form is just (*VERB). Any number of these verbs may occur in a pattern. There
-are two kinds:</p>
+<p><em>Optimizations that affect backtracking verbs</em></p>
+
+<p>PCRE contains some optimizations that are used to speed up matching by running
+some checks at the start of each match attempt. For example, it may know the
+minimum length of matching subject, or that a particular character must be
+present. When one of these optimizations bypasses the running of a match, any
+included backtracking verbs will not, of course, be processed. You can suppress
+the start-of-match optimizations by setting the <c>no_start_optimize</c> option
+when calling <c>re:compile/2</c> or <c>re:run/3</c>, or by starting the
+pattern with (*NO_START_OPT).</p>
 
+<p>Experiments with Perl suggest that it too has similar optimizations, sometimes
+leading to anomalous results.</p>
 
 <p><em>Verbs that act immediately</em></p>
 
-<p>The following verbs act as soon as they are encountered:</p>
+<p>The following verbs act as soon as they are encountered. They may not be
+followed by a name.</p>
 
-<quote><p>   (*ACCEPT)</p></quote>
+<quote><p>    (*ACCEPT)</p></quote>
 
 <p>This verb causes the match to end successfully, skipping the remainder of the
-pattern. When inside a recursion, only the innermost pattern is ended
-immediately. PCRE differs from Perl in what happens if the (*ACCEPT) is inside
-capturing parentheses. In Perl, the data so far is captured: in PCRE no data is
-captured. For example:</p>
+pattern. However, when it is inside a subpattern that is called as a
+subroutine, only that subpattern is ended successfully. Matching then continues
+at the outer level. If (*ACCEPT) in triggered in a positive assertion, the
+assertion succeeds; in a negative assertion, the assertion fails.</p>
+
+<p>If (*ACCEPT) is inside capturing parentheses, the data so far is captured. For
+example:</p>
 
-<quote><p>  A(A|B(*ACCEPT)|C)D</p></quote>
+<quote><p>    A((?:A|B(*ACCEPT)|C)D)</p></quote>
 
-<p>This matches "AB", "AAD", or "ACD", but when it matches "AB", no data is
-captured.</p>
+<p>This matches "AB", "AAD", or "ACD"; when it matches "AB", "B" is captured by
+the outer parentheses.</p>
 
-<quote><p>  (*FAIL) or (*F)</p></quote>
+<quote><p>    (*FAIL) or (*F)</p></quote>
 
-<p>This verb causes the match to fail, forcing backtracking to occur. It is
+<p>This verb causes a matching failure, forcing backtracking to occur. It is
 equivalent to (?!) but easier to read. The Perl documentation notes that it is
 probably useful only when combined with (?{}) or (??{}). Those are, of course,
 Perl features that are not present in PCRE. The nearest equivalent is the
 callout feature, as for example in this pattern:</p>
 
-<quote><p>  a+(?C)(*FAIL)</p></quote>
+<quote><p>    a+(?C)(*FAIL)</p></quote>
 
 <p>A match with the string "aaaa" always fails, but the callout is taken before
 each backtrack happens (in this example, 10 times).</p>
 
-
+<p><em>Recording which path was taken</em></p>
+
+<p>There is one verb whose main purpose is to track how a match was arrived at,
+though it also has a secondary use in conjunction with advancing the match
+starting point (see (*SKIP) below).</p>
+
+<warning>
+<p>In Erlang, there is no interface to retrieve a mark with <c>re:run/{2,3]</c>,
+so only the secondary purpose is relevant to the Erlang programmer!</p>
+<p>The rest of this section is therefore deliberately not adapted for reading
+by the Erlang programmer, however the examples might help in understanding NAMES as
+they can be used by (*SKIP).</p>
+</warning>
+
+<quote><p>    (*MARK:NAME) or (*:NAME)</p></quote>
+
+<p>A name is always required with this verb. There may be as many instances of
+(*MARK) as you like in a pattern, and their names do not have to be unique.</p>
+
+<p>When a match succeeds, the name of the last-encountered (*MARK:NAME),
+(*PRUNE:NAME), or (*THEN:NAME) on the matching path is passed back to the
+caller as described in the section entitled "Extra data for <c>pcre_exec()</c>"
+in the <c>pcreapi</c>
+documentation. Here is an example of <c>pcretest</c> output, where the /K
+modifier requests the retrieval and outputting of (*MARK) data:</p>
+<code>
+    re&gt; /X(*MARK:A)Y|X(*MARK:B)Z/K
+  data&gt; XY
+   0: XY
+  MK: A
+  XZ
+   0: XZ
+  MK: B</code>
+
+<p>The (*MARK) name is tagged with "MK:" in this output, and in this example it
+indicates which of the two alternatives matched. This is a more efficient way
+of obtaining this information than putting each alternative in its own
+capturing parentheses.</p>
+
+<p>If a verb with a name is encountered in a positive assertion that is true, the
+name is recorded and passed back if it is the last-encountered. This does not
+happen for negative assertions or failing positive assertions.</p>
+
+<p>After a partial match or a failed match, the last encountered name in the
+entire match process is returned. For example:</p>
+<code>
+    re&gt; /X(*MARK:A)Y|X(*MARK:B)Z/K
+  data&gt; XP
+  No match, mark = B</code>
+
+<p>Note that in this unanchored example the mark is retained from the match
+attempt that started at the letter "X" in the subject. Subsequent match
+attempts starting at "P" and then with an empty string do not get as far as the
+(*MARK) item, but nevertheless do not reset it.</p>
+
+<!--
+<p>If you are interested in (*MARK) values after failed matches, you should
+probably set the PCRE_NO_START_OPTIMIZE option
+(see above)
+to ensure that the match is always attempted.</p>
+-->
 
 <p><em>Verbs that act after backtracking</em></p>
 
 <p>The following verbs do nothing when they are encountered. Matching continues
-with what follows, but if there is no subsequent match, a failure is forced.
-The verbs differ in exactly what kind of failure occurs.</p>
-
-<quote><p>  (*COMMIT)</p></quote>
-
-<p>This verb causes the whole match to fail outright if the rest of the pattern
-does not match. Even if the pattern is unanchored, no further attempts to find
-a match by advancing the start point take place. Once (*COMMIT) has been
-passed, <c>re:run/3</c> is committed to finding a match at the current
-starting point, or not at all. For example:</p>
+with what follows, but if there is no subsequent match, causing a backtrack to
+the verb, a failure is forced. That is, backtracking cannot pass to the left of
+the verb. However, when one of these verbs appears inside an atomic group or an
+assertion that is true, its effect is confined to that group, because once the
+group has been matched, there is never any backtracking into it. In this
+situation, backtracking can "jump back" to the left of the entire atomic group
+or assertion. (Remember also, as stated above, that this localization also
+applies in subroutine calls.)</p>
+
+<p>These verbs differ in exactly what kind of failure occurs when backtracking
+reaches them. The behaviour described below is what happens when the verb is
+not in a subroutine or an assertion. Subsequent sections cover these special
+cases.</p>
+
+<quote><p>    (*COMMIT)</p></quote>
+
+<p>This verb, which may not be followed by a name, causes the whole match to fail
+outright if there is a later matching failure that causes backtracking to reach
+it. Even if the pattern is unanchored, no further attempts to find a match by
+advancing the starting point take place. If (*COMMIT) is the only backtracking
+verb that is encountered, once it has been passed <c>re:run/{2,3}</c> is
+committed to finding a match at the current starting point, or not at all. For
+example:</p>
 
-<quote><p>  a+(*COMMIT)b</p></quote>
+<quote><p>    a+(*COMMIT)b</p></quote>
 
 <p>This matches "xxaab" but not "aacaab". It can be thought of as a kind of
-dynamic anchor, or "I've started, so I must finish."</p>
+dynamic anchor, or "I've started, so I must finish." The name of the most
+recently passed (*MARK) in the path is passed back when (*COMMIT) forces a
+match failure.</p>
 
-<quote><p>  (*PRUNE)</p></quote>
+<p>If there is more than one backtracking verb in a pattern, a different one that
+follows (*COMMIT) may be triggered first, so merely passing (*COMMIT) during a
+match does not always guarantee that a match must be at this starting point.</p>
 
-<p>This verb causes the match to fail at the current position if the rest of the
-pattern does not match. If the pattern is unanchored, the normal "bumpalong"
-advance to the next starting character then happens. Backtracking can occur as
-usual to the left of (*PRUNE), or when matching to the right of (*PRUNE), but
-if there is no match to the right, backtracking cannot cross (*PRUNE).
-In simple cases, the use of (*PRUNE) is just an alternative to an atomic
-group or possessive quantifier, but there are some uses of (*PRUNE) that cannot
-be expressed in any other way.</p>
-
-<quote><p>  (*SKIP)</p></quote>
-
-<p>This verb is like (*PRUNE), except that if the pattern is unanchored, the
-"bumpalong" advance is not to the next character, but to the position in the
-subject where (*SKIP) was encountered. (*SKIP) signifies that whatever text
-was matched leading up to it cannot be part of a successful match. Consider:</p>
-
-<quote><p>  a+(*SKIP)b</p></quote>
+<p>Note that (*COMMIT) at the start of a pattern is not the same as an anchor,
+unless PCRE's start-of-match optimizations are turned off, as shown in this
+ example:</p>
+<code type="none">
+  1&gt; re:run("xyzabc","(*COMMIT)abc",[{capture,all,list}]).
+  {match,["abc"]}
+  2&gt; re:run("xyzabc","(*COMMIT)abc",[{capture,all,list},no_start_optimize]).
+  nomatch</code>
+
+<p>PCRE knows that any match must start with "a", so the optimization skips along
+the subject to "a" before running the first match attempt, which succeeds. When
+the optimization is disabled by the <c>no_start_optimize</c> option, the match
+starts at "x" and so the (*COMMIT) causes it to fail without trying any other
+starting points.</p>
+
+<quote><p>    (*PRUNE) or (*PRUNE:NAME)</p></quote>
+
+<p>This verb causes the match to fail at the current starting position in the
+subject if there is a later matching failure that causes backtracking to reach
+it. If the pattern is unanchored, the normal "bumpalong" advance to the next
+starting character then happens. Backtracking can occur as usual to the left of
+(*PRUNE), before it is reached, or when matching to the right of (*PRUNE), but
+if there is no match to the right, backtracking cannot cross (*PRUNE). In
+simple cases, the use of (*PRUNE) is just an alternative to an atomic group or
+possessive quantifier, but there are some uses of (*PRUNE) that cannot be
+expressed in any other way. In an anchored pattern (*PRUNE) has the same effect
+as (*COMMIT).</p>
+
+<p>The behaviour of (*PRUNE:NAME) is the not the same as (*MARK:NAME)(*PRUNE).
+It is like (*MARK:NAME) in that the name is remembered for passing back to the
+caller. However, (*SKIP:NAME) searches only for names set with (*MARK).</p>
+
+<warning>
+<p>The fact that (*PRUNE:NAME) remembers the name is useless to the Erlang programmer, 
+as names can not be retrieved.</p>
+</warning>
+
+<quote><p>    (*SKIP)</p></quote>
+
+<p>This verb, when given without a name, is like (*PRUNE), except that if the
+pattern is unanchored, the "bumpalong" advance is not to the next character,
+but to the position in the subject where (*SKIP) was encountered. (*SKIP)
+signifies that whatever text was matched leading up to it cannot be part of a
+successful match. Consider:</p>
+
+<quote><p>    a+(*SKIP)b</p></quote>
 
 <p>If the subject is "aaaac...", after the first match attempt fails (starting at
 the first character in the string), the starting point skips on to start the
-next attempt at "c". Note that a possessive quantifier does not have the same
-effect in this example; although it would suppress backtracking during the
+next attempt at "c". Note that a possessive quantifer does not have the same
+effect as this example; although it would suppress backtracking during the
 first match attempt, the second attempt would start at the second character
 instead of skipping on to "c".</p>
 
-<quote><p>  (*THEN)</p></quote>
+<quote><p>    (*SKIP:NAME)</p></quote>
+
+<p>When (*SKIP) has an associated name, its behaviour is modified. When it is
+triggered, the previous path through the pattern is searched for the most
+recent (*MARK) that has the same name. If one is found, the "bumpalong" advance
+is to the subject position that corresponds to that (*MARK) instead of to where
+(*SKIP) was encountered. If no (*MARK) with a matching name is found, the
+(*SKIP) is ignored.</p>
 
-<p>This verb causes a skip to the next alternation if the rest of the pattern does
-not match. That is, it cancels pending backtracking, but only within the
-current alternation. Its name comes from the observation that it can be used
-for a pattern-based if-then-else block:</p>
+<p>Note that (*SKIP:NAME) searches only for names set by (*MARK:NAME). It ignores
+names that are set by (*PRUNE:NAME) or (*THEN:NAME).</p>
 
-<quote><p>  ( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...</p></quote>
+<quote><p>    (*THEN) or (*THEN:NAME)</p></quote>
+
+<p>This verb causes a skip to the next innermost alternative when backtracking
+reaches it. That is, it cancels any further backtracking within the current
+alternative. Its name comes from the observation that it can be used for a
+pattern-based if-then-else block:</p>
+
+<quote><p>    ( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...</p></quote>
 
 <p>If the COND1 pattern matches, FOO is tried (and possibly further items after
-the end of the group if FOO succeeds); on failure the matcher skips to the
-second alternative and tries COND2, without backtracking into COND1. If (*THEN)
-is used outside of any alternation, it acts exactly like (*PRUNE).</p>
+the end of the group if FOO succeeds); on failure, the matcher skips to the
+second alternative and tries COND2, without backtracking into COND1. If that
+succeeds and BAR fails, COND3 is tried. If subsequently BAZ fails, there are no
+more alternatives, so there is a backtrack to whatever came before the entire
+group. If (*THEN) is not inside an alternation, it acts like (*PRUNE).</p>
+
+<p>The behaviour of (*THEN:NAME) is the not the same as (*MARK:NAME)(*THEN).
+It is like (*MARK:NAME) in that the name is remembered for passing back to the
+caller. However, (*SKIP:NAME) searches only for names set with (*MARK).</p>
+
+<warning>
+<p>The fact that (*THEN:NAME) remembers the name is useless to the Erlang programmer, 
+as names can not be retrieved.</p>
+</warning>
+
+<p>A subpattern that does not contain a | character is just a part of the
+enclosing alternative; it is not a nested alternation with only one
+alternative. The effect of (*THEN) extends beyond such a subpattern to the
+enclosing alternative. Consider this pattern, where A, B, etc. are complex
+pattern fragments that do not contain any | characters at this level:</p>
+
+<quote><p>    A (B(*THEN)C) | D</p></quote>
+
+<p>If A and B are matched, but there is a failure in C, matching does not
+backtrack into A; instead it moves to the next alternative, that is, D.
+However, if the subpattern containing (*THEN) is given an alternative, it
+behaves differently:</p>
+
+<quote><p>    A (B(*THEN)C | (*FAIL)) | D</p></quote>
+
+<p>The effect of (*THEN) is now confined to the inner subpattern. After a failure
+in C, matching moves to (*FAIL), which causes the whole subpattern to fail
+because there are no more alternatives to try. In this case, matching does now
+backtrack into A.</p>
+
+<p>Note that a conditional subpattern is not considered as having two
+alternatives, because only one is ever used. In other words, the | character in
+a conditional subpattern has a different meaning. Ignoring white space,
+consider:</p>
+
+<quote><p>    ^.*? (?(?=a) a | b(*THEN)c )</p></quote>
+
+<p>If the subject is "ba", this pattern does not match. Because .*? is ungreedy,
+it initially matches zero characters. The condition (?=a) then fails, the
+character "b" is matched, but "c" is not. At this point, matching does not
+backtrack to .*? as might perhaps be expected from the presence of the |
+character. The conditional subpattern is part of the single alternative that
+comprises the whole pattern, and so the match fails. (If there was a backtrack
+into .*?, allowing it to match "b", the match would succeed.)</p>
+
+<p>The verbs just described provide four different "strengths" of control when
+subsequent matching fails. (*THEN) is the weakest, carrying on the match at the
+next alternative. (*PRUNE) comes next, failing the match at the current
+starting position, but allowing an advance to the next character (for an
+unanchored pattern). (*SKIP) is similar, except that the advance may be more
+than one character. (*COMMIT) is the strongest, causing the entire match to
+fail.</p>
+
+
+<p><em>More than one backtracking verb</em></p>
+
+<p>If more than one backtracking verb is present in a pattern, the one that is
+backtracked onto first acts. For example, consider this pattern, where A, B,
+etc. are complex pattern fragments:</p>
+
+<quote><p>    (A(*COMMIT)B(*THEN)C|ABD)</p></quote>
+
+<p>If A matches but B fails, the backtrack to (*COMMIT) causes the entire match to
+fail. However, if A and B match, but C fails, the backtrack to (*THEN) causes
+the next alternative (ABD) to be tried. This behaviour is consistent, but is
+not always the same as Perl's. It means that if two or more backtracking verbs
+appear in succession, all the the last of them has no effect. Consider this
+example:</p>
+
+<quote><p>    ...(*COMMIT)(*PRUNE)...</p></quote>
+
+<p>If there is a matching failure to the right, backtracking onto (*PRUNE) cases
+it to be triggered, and its action is taken. There can never be a backtrack
+onto (*COMMIT).</p>
+
+<p><em>Backtracking verbs in repeated groups</em></p>
+
+<p>PCRE differs from Perl in its handling of backtracking verbs in repeated
+groups. For example, consider:</p>
+
+<quote><p>    /(a(*COMMIT)b)+ac/</p></quote>
+
+<p>If the subject is "abac", Perl matches, but PCRE fails because the (*COMMIT) in
+the second repeat of the group acts.</p>
+
+<p><em>Backtracking verbs in assertions</em></p>
+
+<p>(*FAIL) in an assertion has its normal effect: it forces an immediate backtrack.</p>
+
+<p>(*ACCEPT) in a positive assertion causes the assertion to succeed without any
+further processing. In a negative assertion, (*ACCEPT) causes the assertion to
+fail without any further processing.</p>
+
+<p>The other backtracking verbs are not treated specially if they appear in a
+positive assertion. In particular, (*THEN) skips to the next alternative in the
+innermost enclosing group that has alternations, whether or not this is within
+the assertion.</p>
+
+<p>Negative assertions are, however, different, in order to ensure that changing a
+positive assertion into a negative assertion changes its result. Backtracking
+into (*COMMIT), (*SKIP), or (*PRUNE) causes a negative assertion to be true,
+without considering any further alternative branches in the assertion.
+Backtracking into (*THEN) causes it to skip to the next enclosing alternative
+within the assertion (the normal behaviour), but if the assertion does not have
+such an alternative, (*THEN) behaves like (*PRUNE).</p>
+
+<p><em>Backtracking verbs in subroutines</em></p>
+
+<p>These behaviours occur whether or not the subpattern is called recursively.
+Perl's treatment of subroutines is different in some cases.</p>
+
+<p>(*FAIL) in a subpattern called as a subroutine has its normal effect: it forces
+an immediate backtrack.</p>
+
+<p>(*ACCEPT) in a subpattern called as a subroutine causes the subroutine match to
+succeed without any further processing. Matching then continues after the
+subroutine call.</p>
+
+<p>(*COMMIT), (*SKIP), and (*PRUNE) in a subpattern called as a subroutine cause
+the subroutine match to fail.</p>
+
+<p>(*THEN) skips to the next alternative in the innermost enclosing group within
+the subpattern that has alternatives. If there is no such group within the
+subpattern, (*THEN) causes the subroutine match to fail.</p>
 
 </section>
 
diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml
index 0f277f6c5e..4ecd02a4bf 100644
--- a/lib/stdlib/doc/src/ref_man.xml
+++ b/lib/stdlib/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml
index 071ee437cb..c5b8dce4b7 100644
--- a/lib/stdlib/doc/src/sets.xml
+++ b/lib/stdlib/doc/src/sets.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -45,9 +45,15 @@
 
   <datatypes>
     <datatype>
-      <name><marker id="type-dict">set()</marker></name>
+      <name name="set" n_vars="1"/>
       <desc><p>As returned by <c>new/0</c>.</p></desc>
     </datatype>
+    <datatype>
+      <name name="set" n_vars="0"/>
+      <desc>
+        <p><c>set()</c> is equivalent to <c>set(term())</c>.</p>
+      </desc>
+    </datatype>
   </datatypes>
   <funcs>
     <func>
diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml
index 7f251c863e..3ca80ed900 100644
--- a/lib/stdlib/doc/src/shell.xml
+++ b/lib/stdlib/doc/src/shell.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/shell_default.xml b/lib/stdlib/doc/src/shell_default.xml
index f7e7d5388a..2355ba92f9 100644
--- a/lib/stdlib/doc/src/shell_default.xml
+++ b/lib/stdlib/doc/src/shell_default.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml
index 15b6711731..f5d0436a20 100644
--- a/lib/stdlib/doc/src/slave.xml
+++ b/lib/stdlib/doc/src/slave.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml
index 37c41501ae..6c97fd0bc0 100644
--- a/lib/stdlib/doc/src/sofs.xml
+++ b/lib/stdlib/doc/src/sofs.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2012</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml
index 49c60529d2..213ce7563f 100644
--- a/lib/stdlib/doc/src/specs.xml
+++ b/lib/stdlib/doc/src/specs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <specs xmlns:xi="http://www.w3.org/2001/XInclude">
   <xi:include href="../specs/specs_array.xml"/>
   <xi:include href="../specs/specs_base64.xml"/>
diff --git a/lib/stdlib/doc/src/stdlib_app.xml b/lib/stdlib/doc/src/stdlib_app.xml
index 2391bb6f03..de4cc65396 100644
--- a/lib/stdlib/doc/src/stdlib_app.xml
+++ b/lib/stdlib/doc/src/stdlib_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index 549c871aed..c96cc95a44 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2012</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index ed09f6e1f2..8197684d2d 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -371,7 +371,7 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
 	  children.</p>
 
         <p>If the supervisor is <c>simple_one_for_one</c>, <c><anno>Id</anno></c>
-          must be the child process' <c>pid()</c>. I the specified
+          must be the child process' <c>pid()</c>. If the specified
           process is alive, but is not a child of the given
           supervisor, the function will return
           <c>{error,not_found}</c>. If the child specification
diff --git a/lib/stdlib/doc/src/supervisor_bridge.xml b/lib/stdlib/doc/src/supervisor_bridge.xml
index f6712d6c1d..d16b258b6c 100644
--- a/lib/stdlib/doc/src/supervisor_bridge.xml
+++ b/lib/stdlib/doc/src/supervisor_bridge.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml
index b66a6b17bd..ab8b380f49 100644
--- a/lib/stdlib/doc/src/sys.xml
+++ b/lib/stdlib/doc/src/sys.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index 0c1e398dc4..eca9a72d36 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2011</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml
index deba6adb11..6f8a289432 100644
--- a/lib/stdlib/doc/src/unicode.xml
+++ b/lib/stdlib/doc/src/unicode.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index 1f64b38554..75505d7d84 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>1999</year>
-      <year>2013</year>
+      <year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -41,10 +41,10 @@
   future.</p>
 
   <p>The functionality described in EEP10 was implemented in Erlang/OTP
-  as of R13A, but that was by no means the end of it. In R14B01 support
+  R13A, but that was by no means the end of it. In Erlang/OTP R14B01 support
   for Unicode file names was added, although it was in no way complete
   and was by default disabled on platforms where no guarantee was given
-  for the file name encoding. With R16A came support for UTF-8 encoded
+  for the file name encoding. With Erlang/OTP R16A came support for UTF-8 encoded
   source code, among with enhancements to many of the applications to
   support both Unicode encoded file names as well as support for UTF-8
   encoded files in several circumstances. Most notable is the support
@@ -52,8 +52,8 @@
   for UTF-8 and more support for Unicode character sets in the
   I/O-system.</p>
 
-  <p>In R17, the encoding default for Erlang source files will be
-  switched to UTF-8 and in R18 Erlang will support atoms in the full
+  <p>In Erlang/OTP 17.0, the encoding default for Erlang source files was
+  switched to UTF-8 and in Erlang/OTP 18.0 Erlang will support atoms in the full
   Unicode range, meaning full Unicode function and module
   names</p>
 
@@ -222,7 +222,7 @@
     <tag>Representation</tag>
     <item>To handle Unicode characters in Erlang, we have to have a
     common representation both in lists and binaries. The EEP (10) and
-    the subsequent initial implementation in R13A settled a standard
+    the subsequent initial implementation in Erlang/OTP R13A settled a standard
     representation of Unicode characters in Erlang.</item>
     <tag>Manipulation</tag>
     <item>The Unicode characters need to be processed by the Erlang
@@ -274,9 +274,9 @@
     (<c>+fnu</c>) on platforms where this is not the default.</item>
     <tag>Source code encoding</tag>
     <item>When it comes to the Erlang source code, there is support
-    for the UTF-8 encoding and bytewise encoding. The default in R16B
-    is bytewise (or latin1) encoding. You can control the encoding by
-    a comment like:
+    for the UTF-8 encoding and bytewise encoding. The default in
+    Erlang/OTP R16B was bytewise (or latin1) encoding; in Erlang/OTP 17.0
+    it was changed to UTF-8. You can control the encoding by a comment like:
 <code>
 %% -*- coding: utf-8 -*-
 </code>
@@ -290,7 +290,7 @@
     <item>Having the source code in UTF-8 also allows you to write
     string literals containing Unicode characters with code points &gt;
     255, although atoms, module names and function names will be
-    restricted to the ISO-Latin-1 range until the R18 release. Binary
+    restricted to the ISO-Latin-1 range until the Erlang/OTP 18.0 release. Binary
     literals where you use the <c>/utf8</c> type, can also be
     expressed using Unicode characters &gt; 255. Having module names
     using characters other than 7-bit ASCII can cause trouble on
@@ -304,7 +304,7 @@
 <section>
   <title>Standard Unicode Representation</title>
   <p>In Erlang, strings are actually lists of integers. A string was
-  up until R13 defined to be encoded in the ISO-latin-1 (ISO8859-1)
+  up until Erlang/OTP R13 defined to be encoded in the ISO-latin-1 (ISO8859-1)
   character set, which is, code point by code point, a sub-range of
   the Unicode character set.</p>
   <p>The standard list encoding for strings was therefore easily
@@ -321,7 +321,7 @@
   encoding has to be decided upon and the string should be converted
   to a binary in the preferred encoding using
   <c>unicode:characters_to_binary/{1,2,3}</c>. Strings are not
-  generally lists of bytes, as they were before R13. They are lists of
+  generally lists of bytes, as they were before Erlang/OTP R13. They are lists of
   characters. Characters are not generally bytes, they are Unicode
   code points.</p>
 
@@ -385,7 +385,7 @@ external_charlist() = maybe_improper_list(char() |
   using characters from the ISO-latin-1 character set and atoms are
   restricted to the same ISO-latin-1 range. These restrictions in the
   language are of course independent of the encoding of the source
-  file. Erlang/OTP R18 is expected to handle functions named in
+  file. Erlang/OTP 18.0 is expected to handle functions named in
   Unicode as well as Unicode atoms.</p>
   <section>
     <title>Bit-syntax</title>
@@ -447,8 +447,8 @@ Bin4 = &lt;&lt;"Hello"/utf16&gt;&gt;,</code>
     probably will not appreciate). Another way is to keep it backwards
     compatible so that only the ISO-Latin-1 character set is used to
     detect a string. A third way would be to let the user decide
-    exactly what Unicode ranges are to be viewed as characters. In
-    R16B you can select either the whole Unicode range or the
+    exactly what Unicode ranges are to be viewed as characters. Since
+    Erlang/OTP R16B you can select either the whole Unicode range or the
     ISO-Latin-1 range by supplying the startup flag <c>+pc
     </c><i>Range</i>, where <i>Range</i> is either <c>latin1</c> or
     <c>unicode</c>. For backwards compatibility, the default is
@@ -662,11 +662,14 @@ Eshell V5.10.1  (abort with ^G)
       containing characters having code points between 128 and 255 may
       be named either as plain ISO-latin-1 or using UTF-8 encoding. As
       no consistency is enforced, the Erlang VM can do no consistent
-      translation of all file names. If the VM would automatically
-      select encoding based on heuristics, one could get unexpected
-      behavior on these systems. By default, Erlang starts in "latin1"
-      file name mode on such systems, meaning bytewise encoding in file
-      names. This allows for list representation of all file names in
+      translation of all file names.</p>
+
+      <p>By default on such systems, Erlang starts in <c>utf8</c> file
+      name mode if the terminal supports UTF-8, otherwise in
+      <c>latin1</c> mode.</p>
+
+      <p>In the <c>latin1</c> mode, file names are bytewise endcoded.
+      This allows for list representation of all file names in
       the system, but, for example, a file named "Östersund.txt", will
       appear in <c>file:list_dir/1</c> as either "Östersund.txt" (if
       the file name was encoded in bytewise ISO-Latin-1 by the program
@@ -682,7 +685,7 @@ Eshell V5.10.1  (abort with ^G)
     </item>
   </taglist>
 
-  <p>The Unicode file naming support was introduced with OTP release
+  <p>The Unicode file naming support was introduced with Erlang/OTP
   R14B01. A VM operating in Unicode file name translation mode can
   work with files having names in any language or character set (as
   long as it is supported by the underlying OS and file system). The
@@ -706,7 +709,7 @@ Eshell V5.10.1  (abort with ^G)
   problem even if it uses transparent file naming. Very few systems
   have mixed file name encodings. A consistent UTF-8 named system will
   work perfectly in Unicode file name mode. It was still however
-  considered experimental in R14B01 and is still not the default on
+  considered experimental in Erlang/OTP R14B01 and is still not the default on
   such systems. Unicode file name translation is turned on with the
   <c>+fnu</c> switch to the On Linux, a VM started without explicitly
   stating the file name translation mode will default to <c>latin1</c>
@@ -752,9 +755,9 @@ Eshell V5.10.1  (abort with ^G)
 
 <section>
   <title>Notes About Raw File Names</title>
-
+  <marker id="notes-about-raw-filenames"/>
   <p>Raw file names were introduced together with Unicode file name
-  support in erts-5.8.2 (OTP R14B01). The reason &quot;raw file
+  support in erts-5.8.2 (Erlang/OTP R14B01). The reason &quot;raw file
   names&quot; was introduced in the system was to be able to
   consistently represent file names given in different encodings on
   the same system. Having the VM automatically translate a file name
@@ -795,10 +798,10 @@ Eshell V5.10.1  (abort with ^G)
   the argument as a binary.</p>
 
   <p>To force Unicode file name translation mode on systems where this
-  is not the default was considered experimental in OTP R14B01 due to
+  is not the default was considered experimental in Erlang/OTP R14B01 due to
   the fact that the initial implementation did not ignore wrongly
   encoded file names, so that raw file names could spread unexpectedly
-  throughout the system. Beginning with R16B, the wrongly encoded file
+  throughout the system. Beginning with Erlang/OTP R16B, the wrongly encoded file
   names are only retrieved by special functions
   (e.g. <c>file:list_dir_all/1</c>), so the impact on existing code is
   much lower, why it is now supported. Unicode file name translation
@@ -1014,7 +1017,8 @@ ok
       allowed. This setting should correspond to the actual terminal
       you are using.</p>
       <p>The environment can also affect file name interpretation, if
-      Erlang is started with the <c>+fna</c> flag.</p>
+      Erlang is started with the <c>+fna</c> flag (which is default from
+      Erlang/OTP 17.0).</p>
       <p>You can check the setting of this by calling
       <c>io:getopts()</c>, which will give you an option list
       containing <c>{encoding,unicode}</c> or
@@ -1028,7 +1032,7 @@ ok
       <c>io</c>/<c>io_lib:format</c> with the <c>"~tp"</c> and
       <c>~tP</c> formatting instructions, as described above.</p>
       <p>You can check this option by calling io:printable_range/0,
-      which in R16B will return <c>unicode</c> or <c>latin1</c>. To be
+      which will return <c>unicode</c> or <c>latin1</c>. To be
       compatible with future (expected) extensions to the settings,
       one should rather use <c>io_lib:printable_list/1</c> to check if
       a list is printable according to the setting. That function will
@@ -1046,8 +1050,7 @@ ok
       &gt; 255.</p>
       <p><c>+fnl</c> means bytewise interpretation of file names, which
       was the usual way to represent ISO-Latin-1 file names before
-      UTF-8 file naming got widespread. This is the default on all
-      Unix-like operating systems except MacOS X.</p>
+      UTF-8 file naming got widespread.</p>
       <p><c>+fnu</c> means that file names are encoded in UTF-8, which
       is nowadays the common scheme (although not enforced).</p>
       <p><c>+fna</c> means that you automatically select between
@@ -1055,8 +1058,8 @@ ok
       <c>LC_CTYPE</c> environment variables. This is optimistic
       heuristics indeed, nothing enforces a user to have a terminal
       with the same encoding as the file system, but usually, this is
-      the case. This might be the default behavior in a future
-      release.</p>
+      the case.  This is the default on all Unix-like operating
+      systems except MacOS X.</p>
 
       <p>The file name translation mode can be read with the
       <c>file:native_name_encoding/0</c> function, which returns
@@ -1067,8 +1070,8 @@ ok
     <item>
       <p>This function returns the default encoding for Erlang source
       files (if no encoding comment is present) in the currently
-      running release. For R16 this returns <c>latin1</c> (meaning
-      bytewise encoding). In R17 and forward it is expected to return
+      running release. In Erlang/OTP R16B <c>latin1</c> was returned (meaning
+      bytewise encoding). In Erlang/OTP 17.0 and forward it returns
       <c>utf8</c>.</p>
       <p>The encoding of each file can be specified using comments as
       described in 
diff --git a/lib/stdlib/doc/src/win32reg.xml b/lib/stdlib/doc/src/win32reg.xml
index 99fd7fdeb6..8835f931b2 100644
--- a/lib/stdlib/doc/src/win32reg.xml
+++ b/lib/stdlib/doc/src/win32reg.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index 484bf0e080..66c21da193 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/stdlib/examples/erl_id_trans.erl b/lib/stdlib/examples/erl_id_trans.erl
index 51def8c8e1..5fcb74310e 100644
--- a/lib/stdlib/examples/erl_id_trans.erl
+++ b/lib/stdlib/examples/erl_id_trans.erl
@@ -144,6 +144,13 @@ pattern({cons,Line,H0,T0}) ->
 pattern({tuple,Line,Ps0}) ->
     Ps1 = pattern_list(Ps0),
     {tuple,Line,Ps1};
+pattern({map,Line,Ps0}) ->
+    Ps1 = pattern_list(Ps0),
+    {map,Line,Ps1};
+pattern({map_field_exact,Line,K,V}) ->
+    Ke = pattern(K),
+    Ve = pattern(V),
+    {map_field_exact,Line,Ke,Ve};
 %%pattern({struct,Line,Tag,Ps0}) ->
 %%    Ps1 = pattern_list(Ps0),
 %%    {struct,Line,Tag,Ps1};
@@ -251,6 +258,20 @@ gexpr({float,Line,F}) -> {float,Line,F};
 gexpr({atom,Line,A}) -> {atom,Line,A};
 gexpr({string,Line,S}) -> {string,Line,S};
 gexpr({nil,Line}) -> {nil,Line};
+gexpr({map,Line,Map0,Es0}) ->
+    [Map1|Es1] = gexpr_list([Map0|Es0]),
+    {map,Line,Map1,Es1};
+gexpr({map,Line,Es0}) ->
+    Es1 = gexpr_list(Es0),
+    {map,Line,Es1};
+gexpr({map_field_assoc,Line,K,V}) ->
+    Ke = gexpr(K),
+    Ve = gexpr(V),
+    {map_field_assoc,Line,Ke,Ve};
+gexpr({map_field_exact,Line,K,V}) ->
+    Ke = gexpr(K),
+    Ve = gexpr(V),
+    {map_field_exact,Line,Ke,Ve};
 gexpr({cons,Line,H0,T0}) ->
     H1 = gexpr(H0),
     T1 = gexpr(T0),				%They see the same variables
@@ -356,6 +377,20 @@ expr({bc,Line,E0,Qs0}) ->
 expr({tuple,Line,Es0}) ->
     Es1 = expr_list(Es0),
     {tuple,Line,Es1};
+expr({map,Line,Map0,Es0}) ->
+    [Map1|Es1] = exprs([Map0|Es0]),
+    {map,Line,Map1,Es1};
+expr({map,Line,Es0}) ->
+    Es1 = exprs(Es0),
+    {map,Line,Es1};
+expr({map_field_assoc,Line,K,V}) ->
+    Ke = expr(K),
+    Ve = expr(V),
+    {map_field_assoc,Line,Ke,Ve};
+expr({map_field_exact,Line,K,V}) ->
+    Ke = expr(K),
+    Ve = expr(V),
+    {map_field_exact,Line,Ke,Ve};
 %%expr({struct,Line,Tag,Es0}) ->
 %%    Es1 = pattern_list(Es0),
 %%    {struct,Line,Tag,Es1};
@@ -419,6 +454,8 @@ expr({'fun',Line,Body}) ->
 	    A = expr(A0),
 	    {'fun',Line,{function,M,F,A}}
     end;
+expr({named_fun,Loc,Name,Cs}) ->
+    {named_fun,Loc,Name,fun_clauses(Cs)};
 expr({call,Line,F0,As0}) ->
     %% N.B. If F an atom then call to local function or BIF, if F a
     %% remote structure (see below) then call to other module,
diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
index f3387d669b..9ab2cd4134 100644
--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
@@ -91,6 +91,7 @@ MODULES= \
 	lib \
 	lists \
 	log_mf_h \
+	maps \
 	math \
 	ms_transform \
 	otp_internal \
diff --git a/lib/stdlib/src/array.erl b/lib/stdlib/src/array.erl
index 2f69e2b0a4..10d2ccea45 100644
--- a/lib/stdlib/src/array.erl
+++ b/lib/stdlib/src/array.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -86,6 +86,8 @@
 	 foldr/3, sparse_foldl/3, sparse_foldr/3, fix/1, relax/1, is_fix/1,
 	 resize/1, resize/2]).
 
+-export_type([array/0, array/1]).
+
 %%-define(TEST,1).
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
@@ -144,18 +146,28 @@
 
 %%--------------------------------------------------------------------------
 
+-type element_tuple(T) ::
+        {T, T, T, T, T, T, T, T, T, T}
+      | {element_tuple(T), element_tuple(T), element_tuple(T),
+         element_tuple(T), element_tuple(T), element_tuple(T),
+         element_tuple(T), element_tuple(T), element_tuple(T),
+         element_tuple(T), non_neg_integer()}.
+
+-type elements(T) :: non_neg_integer()
+                   | element_tuple(T)
+                   | nil(). % kill reference, for GC
+
 -record(array, {size :: non_neg_integer(),	%% number of defined entries
 		max  :: non_neg_integer(),	%% maximum number of entries
 						%% in current tree
 		default,	%% the default value (usually 'undefined')
-		elements	%% the tuple tree
+                elements :: elements(_)         %% the tuple tree
 	       }).
-%% A declaration equivalent to the following one is hard-coded in erl_types.
-%% That declaration contains hard-coded information about the #array{}
-%% structure and the types of its fields.  So, please make sure that any
-%% changes to its structure are also propagated to erl_types.erl.
-%%
-%% -opaque array() :: #array{}.
+
+-opaque array() :: array(term()).
+
+-opaque array(Type) ::
+          #array{default :: Type, elements :: elements(Type)}.
 
 %%
 %% Types
@@ -164,13 +176,13 @@
 -type array_indx() :: non_neg_integer().
 
 -type array_opt()  :: {'fixed', boolean()} | 'fixed'
-                    | {'default', Value :: term()}
+                    | {'default', Type :: term()}
                     | {'size', N :: non_neg_integer()}
                     | (N :: non_neg_integer()).
 -type array_opts() :: array_opt() | [array_opt()].
 
--type indx_pair()  :: {Index :: array_indx(), Value :: term()}.
--type indx_pairs() :: [indx_pair()].
+-type indx_pair(Type)  :: {Index :: array_indx(), Type}.
+-type indx_pairs(Type) :: [indx_pair(Type)].
 
 %%--------------------------------------------------------------------------
 
@@ -321,7 +333,7 @@ size(_) -> erlang:error(badarg).
 %%
 %% @see new/2
 
--spec default(Array :: array()) -> term().
+-spec default(Array :: array(Type)) -> Value :: Type.
 
 default(#array{default = D}) -> D;
 default(_) -> erlang:error(badarg).
@@ -404,7 +416,7 @@ new_test_() ->
 %% automatically upon insertion; see also {@link set/3}.
 %% @see relax/1
 
--spec fix(Array :: array()) -> array().
+-spec fix(Array :: array(Type)) -> array(Type).
 
 fix(#array{}=A) ->
     A#array{max = 0}.
@@ -452,7 +464,7 @@ fix_test_() ->
 %% fix/1}.)
 %% @see fix/1
 
--spec relax(Array :: array()) -> array().
+-spec relax(Array :: array(Type)) -> array(Type).
 
 relax(#array{size = N}=A) ->
     A#array{max = find_max(N-1, ?LEAFSIZE)}.
@@ -477,7 +489,8 @@ relax_test_() ->
 %% integer, the call fails with reason `badarg'. If the given array has
 %% fixed size, the resulting array will also have fixed size.
 
--spec resize(Size :: non_neg_integer(), Array :: array()) -> array().
+-spec resize(Size :: non_neg_integer(), Array :: array(Type)) ->
+                    array(Type).
 
 resize(Size, #array{size = N, max = M, elements = E}=A)
   when is_integer(Size), Size >= 0 ->
@@ -508,7 +521,7 @@ resize(_Size, _) ->
 %% @see resize/2
 %% @see sparse_size/1
 
--spec resize(Array :: array()) -> array().
+-spec resize(Array :: array(Type)) -> array(Type).
 
 resize(Array) ->
     resize(sparse_size(Array), Array).
@@ -558,7 +571,7 @@ resize_test_() ->
 %% @see get/2
 %% @see reset/2
 
--spec set(I :: array_indx(), Value :: term(), Array :: array()) -> array().
+-spec set(I :: array_indx(), Value :: Type, Array :: array(Type)) -> array(Type).
 
 set(I, Value, #array{size = N, max = M, default = D, elements = E}=A)
   when is_integer(I), I >= 0 ->
@@ -621,7 +634,7 @@ expand(I, _S, X, D) ->
  
 %% @see set/3
 
--spec get(I :: array_indx(), Array :: array()) -> term().
+-spec get(I :: array_indx(), Array :: array(Type)) -> Value :: Type.
 
 get(I, #array{size = N, max = M, elements = E, default = D})
   when is_integer(I), I >= 0 ->
@@ -661,7 +674,7 @@ get_1(I, E, _D) ->
 
 %% TODO: a reset_range function
 
--spec reset(I :: array_indx(), Array :: array()) -> array().
+-spec reset(I :: array_indx(), Array :: array(Type)) -> array(Type).
 
 reset(I, #array{size = N, max = M, default = D, elements = E}=A) 
     when is_integer(I), I >= 0 ->
@@ -747,7 +760,7 @@ set_get_test_() ->
 %% @see from_list/2
 %% @see sparse_to_list/1
 
--spec to_list(Array :: array()) -> list().
+-spec to_list(Array :: array(Type)) -> list(Value :: Type).
 
 to_list(#array{size = 0}) ->
     [];
@@ -820,7 +833,7 @@ to_list_test_() ->
 %%
 %% @see to_list/1
 
--spec sparse_to_list(Array :: array()) -> list().
+-spec sparse_to_list(Array :: array(Type)) -> list(Value :: Type).
 
 sparse_to_list(#array{size = 0}) ->
     [];
@@ -887,7 +900,7 @@ sparse_to_list_test_() ->
 
 %% @equiv from_list(List, undefined)
 
--spec from_list(List :: list()) -> array().
+-spec from_list(List :: list(Value :: Type)) -> array(Type).
 
 from_list(List) ->
     from_list(List, undefined).
@@ -899,7 +912,7 @@ from_list(List) ->
 %% @see new/2
 %% @see to_list/1
 
--spec from_list(List :: list(), Default :: term()) -> array().
+-spec from_list(List :: list(Value :: Type), Default :: term()) -> array(Type).
 
 from_list([], Default) ->
     new({default,Default});
@@ -998,7 +1011,7 @@ from_list_test_() ->
 %% @see from_orddict/2
 %% @see sparse_to_orddict/1
 
--spec to_orddict(Array :: array()) -> indx_pairs().
+-spec to_orddict(Array :: array(Type)) -> indx_pairs(Value :: Type).
 
 to_orddict(#array{size = 0}) ->
     [];
@@ -1035,16 +1048,16 @@ to_orddict_3(N, R, D, L, E, S) ->
  		 to_orddict_2(element(N, E), R, D, L),
  		 E, S).
 
--spec push_pairs(non_neg_integer(), array_indx(), term(), indx_pairs()) ->
-	  indx_pairs().
+-spec push_pairs(non_neg_integer(), array_indx(), term(), indx_pairs(Type)) ->
+	  indx_pairs(Type).
 
 push_pairs(0, _I, _E, L) ->
     L;
 push_pairs(N, I, E, L) ->
     push_pairs(N-1, I-1, E, [{I, E} | L]).
 
--spec push_tuple_pairs(non_neg_integer(), array_indx(), term(), indx_pairs()) ->
-	  indx_pairs().
+-spec push_tuple_pairs(non_neg_integer(), array_indx(), term(), indx_pairs(Type)) ->
+	  indx_pairs(Type).
 
 push_tuple_pairs(0, _I, _T, L) ->
     L;
@@ -1090,7 +1103,7 @@ to_orddict_test_() ->
 %% 
 %% @see to_orddict/1
 
--spec sparse_to_orddict(Array :: array()) -> indx_pairs().
+-spec sparse_to_orddict(Array :: array(Type)) -> indx_pairs(Value :: Type).
 
 sparse_to_orddict(#array{size = 0}) ->
     [];
@@ -1128,7 +1141,7 @@ sparse_to_orddict_3(N, R, D, L, E, S) ->
  		 E, S).
 
 -spec sparse_push_tuple_pairs(non_neg_integer(), array_indx(),
-			      _, _, indx_pairs()) -> indx_pairs().
+			      _, _, indx_pairs(Type)) -> indx_pairs(Type).
 
 sparse_push_tuple_pairs(0, _I, _D, _T, L) ->
     L;
@@ -1170,7 +1183,7 @@ sparse_to_orddict_test_() ->
 
 %% @equiv from_orddict(Orddict, undefined)
 
--spec from_orddict(Orddict :: indx_pairs()) -> array().
+-spec from_orddict(Orddict :: indx_pairs(Value :: Type)) -> array(Type).
 
 from_orddict(Orddict) ->
     from_orddict(Orddict, undefined).
@@ -1184,7 +1197,8 @@ from_orddict(Orddict) ->
 %% @see new/2
 %% @see to_orddict/1
 
--spec from_orddict(Orddict :: indx_pairs(), Default :: term()) -> array().
+-spec from_orddict(Orddict :: indx_pairs(Value :: Type), Default :: Type) ->
+                          array(Type).
 
 from_orddict([], Default) ->
     new({default,Default});
@@ -1379,8 +1393,8 @@ from_orddict_test_() ->
 %% @see foldr/3
 %% @see sparse_map/2
 
--spec map(Function, Array :: array()) -> array() when
-      Function :: fun((Index :: array_indx(), Value :: _) -> _).
+-spec map(Function, Array :: array(Type1)) -> array(Type2) when
+      Function :: fun((Index :: array_indx(), Type1) -> Type2).
 
 map(Function, Array=#array{size = N, elements = E, default = D})
   when is_function(Function, 2) ->
@@ -1471,8 +1485,8 @@ map_test_() ->
 %%
 %% @see map/2
 
--spec sparse_map(Function, Array :: array()) -> array() when
-      Function :: fun((Index :: array_indx(), Value :: _) -> _).
+-spec sparse_map(Function, Array :: array(Type1)) -> array(Type2) when
+      Function :: fun((Index :: array_indx(), Type1) -> Type2).
 
 sparse_map(Function, Array=#array{size = N, elements = E, default = D})
   when is_function(Function, 2) ->
@@ -1567,8 +1581,8 @@ sparse_map_test_() ->
 %% @see map/2
 %% @see sparse_foldl/3
 
--spec foldl(Function, InitialAcc :: A, Array :: array()) -> B when
-      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
+-spec foldl(Function, InitialAcc :: A, Array :: array(Type)) -> B when
+      Function :: fun((Index :: array_indx(), Value :: Type, Acc :: A) -> B).
 
 foldl(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
@@ -1640,8 +1654,8 @@ foldl_test_() ->
 %% @see foldl/3
 %% @see sparse_foldr/3
 
--spec sparse_foldl(Function, InitialAcc :: A, Array :: array()) -> B when
-      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
+-spec sparse_foldl(Function, InitialAcc :: A, Array :: array(Type)) -> B when
+      Function :: fun((Index :: array_indx(), Value :: Type, Acc :: A) -> B).
 
 sparse_foldl(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
@@ -1717,8 +1731,8 @@ sparse_foldl_test_() ->
 %% @see foldl/3
 %% @see map/2
 
--spec foldr(Function, InitialAcc :: A, Array :: array()) -> B when
-      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
+-spec foldr(Function, InitialAcc :: A, Array :: array(Type)) -> B when
+      Function :: fun((Index :: array_indx(), Value :: Type, Acc :: A) -> B).
 
 foldr(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
@@ -1796,8 +1810,8 @@ foldr_test_() ->
 %% @see foldr/3
 %% @see sparse_foldl/3
 
--spec sparse_foldr(Function, InitialAcc :: A, Array :: array()) -> B when
-      Function :: fun((Index :: array_indx(), Value :: _, Acc :: A) -> B).
+-spec sparse_foldr(Function, InitialAcc :: A, Array :: array(Type)) -> B when
+      Function :: fun((Index :: array_indx(), Value :: Type, Acc :: A) -> B).
 
 sparse_foldr(Function, A, #array{size = N, elements = E, default = D})
   when is_function(Function, 3) ->
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl
index 121f9febed..1a7b7d5a5e 100644
--- a/lib/stdlib/src/beam_lib.erl
+++ b/lib/stdlib/src/beam_lib.erl
@@ -904,7 +904,7 @@ call_crypto_server(Req) ->
     end.
 
 call_crypto_server_1(Req) ->
-    gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []),
+    {ok, _} = gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []),
     erlang:yield(),
     call_crypto_server(Req).
 
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl
index 6e96e3d564..c2256c0cf9 100644
--- a/lib/stdlib/src/c.erl
+++ b/lib/stdlib/src/c.erl
@@ -330,13 +330,18 @@ choice(F) ->
     end.
 
 get_line(P, Default) ->
-    case io:get_line(P) of
+    case line_string(io:get_line(P)) of
 	"\n" ->
 	    Default;
 	L ->
 	    L
     end.
 
+%% If the standard input is set to binary mode
+%% convert it to a list so we can properly match.
+line_string(Binary) when is_binary(Binary) -> unicode:characters_to_list(Binary);
+line_string(Other) -> Other.
+
 mfa_string(Fun) when is_function(Fun) ->
     {module,M} = erlang:fun_info(Fun, module),
     {name,F} = erlang:fun_info(Fun, name),
@@ -450,7 +455,7 @@ m() ->
     foreach(fun ({Mod,File}) -> mformat(Mod, File) end, sort(code:all_loaded())).
 
 mformat(A1, A2) ->
-    format("~-20s  ~s\n", [A1,A2]).
+    format("~-20s  ~ts\n", [A1,A2]).
 
 %% erlangrc(Home)
 %%  Try to run a ".erlang" file, first in the current directory
@@ -694,7 +699,7 @@ pwd() ->
       Dir :: file:name().
 
 cd(Dir) ->
-    file:set_cwd(Dir),
+    _ = file:set_cwd(Dir),
     pwd().
 
 %% ls()
@@ -716,7 +721,7 @@ ls(Dir) ->
 	{error, enotdir} ->
 	    ls_print([Dir]);
 	{error, Error} ->
-	    format("~s\n", [file:format_error(Error)])
+	    format("~ts\n", [file:format_error(Error)])
     end.
 
 ls_print([]) -> ok;
diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index 50812cc532..44dad04f43 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -469,7 +469,7 @@ is_compatible_bchunk_format(Tab, Term) ->
 is_dets_file(FileName) ->
     case catch read_file_header(FileName, read, false) of
 	{ok, Fd, FH} ->
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    FH#fileheader.cookie =:= ?MAGIC;
 	{error, {tooshort, _}} ->
 	    false;
@@ -951,10 +951,10 @@ do_trav(Proc, Acc, Fun) ->
 	    Error
     end.
     
-do_trav(#dets_cont{bin = eof}, _Proc, Acc, _Fun) ->
-    Acc;
 do_trav(State, Proc, Acc, Fun) ->
     case req(Proc, {match_init, State, safe}) of
+        '$end_of_table'->
+            Acc;
 	{cont, {Bins, NewState}} ->
 	    do_trav_bins(NewState, Proc, Acc, Fun, lists:reverse(Bins));
 	Error ->
@@ -1384,7 +1384,8 @@ do_apply_op(Op, From, Head, N) ->
             end,
             if
                 From =/= self() ->
-                    From ! {self(), {error, {dets_bug, Name, Op, Bad}}};
+                    From ! {self(), {error, {dets_bug, Name, Op, Bad}}},
+                    ok;
                 true -> % auto_save | may_grow | {delayed_write, _}
                     ok
             end,
@@ -1634,7 +1635,8 @@ start_auto_save_timer(Head) when Head#head.auto_save =:= infinity ->
     ok;
 start_auto_save_timer(Head) ->
     Millis = Head#head.auto_save,
-    erlang:send_after(Millis, self(), ?DETS_CALL(self(), auto_save)).
+    _Ref = erlang:send_after(Millis, self(), ?DETS_CALL(self(), auto_save)),
+    ok.
 
 %% Version 9: Peek the message queue and try to evaluate several
 %% lookup requests in parallel. Evalute delete_object, delete and
@@ -1683,7 +1685,7 @@ stream_end(Head, Pids0, C, N, Next) ->
 	    %%  replies to delete and insert requests even if the
 	    %%  latter requests were made before the lookup requests,
 	    %%  which can be confusing.)
-	    lookup_replies(Found),
+	    _ = lookup_replies(Found),
 	    stream_end1(Pids0, Next, N, C, Head1, PwriteList);
 	Head1 when is_record(Head1, head) ->
 	    stream_end2(Pids0, Pids0, Next, N, C, Head1, ok);	    
@@ -1733,7 +1735,7 @@ lookup_replies(Q) ->
 lookup_replies(P, O, []) ->
     lookup_reply(P, O);
 lookup_replies(P, O, [{P2,O2} | L]) ->
-    lookup_reply(P, O),
+    _ = lookup_reply(P, O),
     lookup_replies(P2, lists:append(O2), L).
 
 %% If a list of Pid then op was {member, Key}. Inlined.
@@ -1790,12 +1792,15 @@ fclose(Head) ->
     {Head1, Res} = perform_save(Head, false),
     case Head1#head.ram_file of
 	true -> 
-	    ignore;
+            Res;
 	false -> 
             dets_utils:stop_disk_map(),
-	    file:close(Head1#head.fptr)
-    end,
-    Res.
+	    Res2 = file:close(Head1#head.fptr),
+            if
+                Res2 =:= ok -> Res;
+                true -> Res2
+            end
+    end.
 
 %% -> {NewHead, Res}
 perform_save(Head, DoSync) when Head#head.update_mode =:= dirty;
@@ -2002,7 +2007,7 @@ remove_fix(Head, Pid, How) ->
     end.
 
 do_stop(Head) ->
-    unlink_fixing_procs(Head),
+    _NewHead = unlink_fixing_procs(Head),
     fclose(Head).
 
 unlink_fixing_procs(Head) ->
@@ -2010,7 +2015,7 @@ unlink_fixing_procs(Head) ->
 	false ->
 	    Head;
 	{_, Counters} ->
-	    lists:map(fun({Pid, _Counter}) -> unlink(Pid) end, Counters),
+	    lists:foreach(fun({Pid, _Counter}) -> unlink(Pid) end, Counters),
 	    Head#head{fixed = false, 
 		      freelists = dets_utils:get_freelists(Head)}
     end.
@@ -2021,8 +2026,9 @@ check_growth(Head) ->
     NoThings = no_things(Head),
     if
 	NoThings > Head#head.next ->
-	    erlang:send_after(200, self(), 
-			      ?DETS_CALL(self(), may_grow)); % Catch up.
+	    _Ref = erlang:send_after
+                     (200, self(), ?DETS_CALL(self(), may_grow)), % Catch up.
+            ok;
 	true ->
 	    ok
     end.
@@ -2123,7 +2129,7 @@ do_open_file([Fname, Verbose], Parent, Server, Ref) ->
 do_open_file([Tab, OpenArgs, Verb], Parent, Server, Ref) ->
     case catch fopen3(Tab, OpenArgs) of
 	{error, {tooshort, _}} ->
-	    file:delete(OpenArgs#open_args.file),
+	    _ = file:delete(OpenArgs#open_args.file),
 	    do_open_file([Tab, OpenArgs, Verb], Parent, Server, Ref);
 	{error, _Reason} = Error ->
 	    err(Error);
@@ -2671,11 +2677,11 @@ fopen_init_file(Tab, OpenArgs) ->
     case catch Mod:initiate_file(Fd, Tab, Fname, Type, Kp, MinSlots, MaxSlots,
 				 Ram, CacheSz, Auto, true) of
 	{error, Reason} when Ram ->
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    throw({error, Reason});
 	{error, Reason} ->
-	    file:close(Fd),
-	    file:delete(Fname),
+	    _ = file:close(Fd),
+	    _ = file:delete(Fname),
 	    throw({error, Reason});
 	{ok, Head} ->
 	    start_auto_save_timer(Head),
@@ -2730,8 +2736,8 @@ compact(SourceHead) ->
 	       {ok, H} ->
 		   H;
 	       Error ->
-		   file:close(Fd),
-                   file:delete(Tmp),
+		   _ = file:close(Fd),
+                   _ = file:delete(Tmp),
 		   throw(Error)
 	   end,
 
@@ -2748,12 +2754,12 @@ compact(SourceHead) ->
 	    if 
 		R =:= ok -> ok;
 		true ->
-		    file:delete(Tmp),
+		    _ = file:delete(Tmp),
 		    throw(R)
 	    end;
 	Err ->
-	    file:close(Fd),
-            file:delete(Tmp),
+	    _ = file:close(Fd),
+            _ = file:delete(Tmp),
 	    throw(Err)
     end.
 	    
@@ -2777,7 +2783,7 @@ fsck(Fd, Tab, Fname, FH, MinSlotsArg, MaxSlotsArg, Version) ->
 	    BetterSlotNumbers = {MinSlots, BetterNoSlots, MaxSlots},
             case fsck_try(Fd, Tab, FH, Fname, BetterSlotNumbers, Version) of
                 {try_again, _} ->
-                    file:close(Fd),
+                    _ = file:close(Fd),
                     {error, {cannot_repair, Fname}};
                 Else ->
                     Else
@@ -2818,15 +2824,15 @@ fsck_try(Fd, Tab, FH, Fname, SlotNumbers, Version) ->
                     if 
 			R =:= ok -> ok;
 			true ->
-			    file:delete(Tmp),
+			    _ = file:delete(Tmp),
 			    R
 		    end;
 		TryAgainOrError ->
-                    file:delete(Tmp),
+                    _ = file:delete(Tmp),
                     TryAgainOrError
             end;
 	Error -> 
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    Error
     end.
 
@@ -2855,13 +2861,13 @@ fsck_try_est(Head, Fd, Fname, SlotNumbers, FH) ->
     Bulk = false,
     case Reply of 
         {ok, NoDups, H1} ->
-            file:close(Fd),
+            _ = file:close(Fd),
             fsck_copy(SizeData, H1, Bulk, NoDups);
         {try_again, _} = Return ->
             close_files(Bulk, SizeData, Head),
             Return;
         Else ->
-            file:close(Fd),
+            _ = file:close(Fd),
             close_files(Bulk, SizeData, Head),
 	    Else
     end.
@@ -2896,14 +2902,20 @@ fsck_copy1([SzData | L], Head, Bulk, NoDups) ->
     {LogSz, Pos, {FileName, Fd}, NoObjects} = SzData,
     Size = if NoObjects =:= 0 -> 0; true -> ?POW(LogSz-1) end,
     ExpectedSize = Size * NoObjects,
-    close_tmp(Fd),
-    case file:position(Out, Pos) of
-	{ok, Pos} -> ok;
-	PError -> dets_utils:file_error(FileName, PError)
+    case close_tmp(Fd) of
+        ok -> ok;
+        Err ->
+	    close_files(Bulk, L, Head),
+	    dets_utils:file_error(FileName, Err)
     end,
-    {ok, Pos} = file:position(Out, Pos),
+    case file:position(Out, Pos) of
+        {ok, Pos} -> ok;
+        Err2 ->
+	    close_files(Bulk, L, Head),
+	    dets_utils:file_error(Head#head.filename, Err2)
+        end,
     CR = file:copy({FileName, [raw,binary]}, Out),
-    file:delete(FileName),
+    _ = file:delete(FileName),
     case CR of 
 	{ok, Copied} when Copied =:= ExpectedSize;
 			  NoObjects =:= 0 -> % the segments
@@ -2937,11 +2949,11 @@ free_n_objects(Head, Addr, Size, N) ->
     free_n_objects(NewHead, NewAddr, Size, N-1).
 
 close_files(false, SizeData, Head) ->
-    file:close(Head#head.fptr),
+    _ = file:close(Head#head.fptr),
     close_files(true, SizeData, Head);
 close_files(true, SizeData, _Head) ->
     Fun = fun({_Size, _Pos, {FileName, Fd}, _No}) ->
-		  close_tmp(Fd),
+		  _ = close_tmp(Fd),
 		  file:delete(FileName);
 	     (_) ->
 		  ok
@@ -3261,7 +3273,7 @@ err(Error) ->
 file_info(FileName) ->
     case catch read_file_header(FileName, read, false) of
 	{ok, Fd, FH} ->
-	    file:close(Fd),
+	    _ = file:close(Fd),
             (FH#fileheader.mod):file_info(FH);
 	Other ->
 	    Other
@@ -3290,7 +3302,7 @@ view(FileName) ->
                         X ->
                             X
                     end
-            after file:close(Fd)
+            after _ = file:close(Fd)
             end;
 	X -> 
 	    X
diff --git a/lib/stdlib/src/dets_server.erl b/lib/stdlib/src/dets_server.erl
index 931112088e..268c201047 100644
--- a/lib/stdlib/src/dets_server.erl
+++ b/lib/stdlib/src/dets_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -241,8 +241,8 @@ ensure_started() ->
 init() ->
     set_verbose(verbose_flag()),
     process_flag(trap_exit, true),
-    ets:new(?REGISTRY, [set, named_table]),
-    ets:new(?OWNERS, [set, named_table]),
+    ?REGISTRY = ets:new(?REGISTRY, [set, named_table]),
+    ?OWNERS = ets:new(?OWNERS, [set, named_table]),
     ets:new(?STORE, [duplicate_bag]).
 
 verbose_flag() ->
@@ -338,7 +338,7 @@ handle_close(State, Req, {FromPid,_Tag}=From, Tab) ->
                         [{Tab, _Counter, Pid}] ->
 			    do_unlink(Store, FromPid),
 			    true = ets:match_delete(Store, {FromPid, Tab}),
-			    [true = ets:insert(Store, K) || K <- Keep],
+                            true = ets:insert(Store, Keep),
 			    ets:update_counter(?REGISTRY, Tab, -1),
                             pending_call(Tab, Pid, make_ref(), From, [],
                                          remove_user, State)
diff --git a/lib/stdlib/src/dets_utils.erl b/lib/stdlib/src/dets_utils.erl
index 7bbb34dd15..6c176ad513 100644
--- a/lib/stdlib/src/dets_utils.erl
+++ b/lib/stdlib/src/dets_utils.erl
@@ -230,8 +230,12 @@ write_file(Head, Bin) ->
 	    {ok, Fd} ->
 		R1 = file:write(Fd, Bin),
 		R2 = file:sync(Fd),
-		file:close(Fd),
-		if R1 =:= ok -> R2; true -> R1 end;
+		R3 = file:close(Fd),
+                case {R1, R2, R3} of
+                    {ok, ok, R3} -> R3;
+                    {ok, R2, _} -> R2;
+                    {R1, _, _} -> R1
+                end;
 	    Else ->
 		Else
 	end,
@@ -277,12 +281,7 @@ open(FileSpec, Args) ->
     end.
 
 truncate(Fd, FileName, Pos) ->
-    if
-	Pos =:= cur ->
-	    ok;
-	true ->
-	    position(Fd, FileName, Pos)
-    end,
+    _ = [position(Fd, FileName, Pos) || Pos =/= cur],
     case file:truncate(Fd) of
 	ok    -> 
 	    ok;
@@ -327,10 +326,10 @@ pread_close(Fd, FileName, Pos, Size) ->
 	{error, Error} ->
 	    file_error_close(Fd, FileName, {error, Error});
 	{ok, Bin} when byte_size(Bin) < Size ->
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    throw({error, {tooshort, FileName}});
 	eof ->
-	    file:close(Fd),
+	    _ = file:close(Fd),
 	    throw({error, {tooshort, FileName}});
 	OK -> OK
     end.
@@ -339,7 +338,7 @@ file_error(FileName, {error, Reason}) ->
     throw({error, {file_error, FileName, Reason}}).
 
 file_error_close(Fd, FileName, {error, Reason}) ->
-    file:close(Fd),
+    _ = file:close(Fd),
     throw({error, {file_error, FileName, Reason}}).
 	    
 debug_mode() ->
@@ -977,7 +976,8 @@ dm([{P,<<Sz:32,X:32>>} | Bs], T) ->
     true = ets:insert(T, {P,{pointer,X,Sz}}),
     if 
         Sz =:= 0 -> 
-            X = 0; 
+            X = 0,
+            true;
         true -> 
             true = ets:insert(T, {{pointer,X}, P})
     end,
diff --git a/lib/stdlib/src/dets_v8.erl b/lib/stdlib/src/dets_v8.erl
index 24d6e06ec8..f188502017 100644
--- a/lib/stdlib/src/dets_v8.erl
+++ b/lib/stdlib/src/dets_v8.erl
@@ -199,10 +199,10 @@
 %% -> ok | throw({NewHead,Error})
 mark_dirty(Head) ->
     Dirty = [{?CLOSED_PROPERLY_POS, <<?NOT_PROPERLY_CLOSED:32>>}],
-    dets_utils:pwrite(Head, Dirty),
-    dets_utils:sync(Head),
-    dets_utils:position(Head, Head#head.freelists_p),
-    dets_utils:truncate(Head, cur).
+    {_NewHead, ok} = dets_utils:pwrite(Head, Dirty),
+    ok = dets_utils:sync(Head),
+    {ok, _Pos} = dets_utils:position(Head, Head#head.freelists_p),
+    ok = dets_utils:truncate(Head, cur).
 
 %% -> {ok, head()} | throw(Error)
 initiate_file(Fd, Tab, Fname, Type, Kp, MinSlots, MaxSlots, 
diff --git a/lib/stdlib/src/dets_v9.erl b/lib/stdlib/src/dets_v9.erl
index 308f81c23b..2af93ec800 100644
--- a/lib/stdlib/src/dets_v9.erl
+++ b/lib/stdlib/src/dets_v9.erl
@@ -284,9 +284,9 @@
 %% -> ok | throw({NewHead,Error})
 mark_dirty(Head) ->
     Dirty = [{?CLOSED_PROPERLY_POS, <<?NOT_PROPERLY_CLOSED:32>>}],
-    dets_utils:pwrite(Head, Dirty),
-    dets_utils:sync(Head),
-    dets_utils:position(Head, Head#head.freelists_p),
+    {_H, ok} = dets_utils:pwrite(Head, Dirty),
+    ok = dets_utils:sync(Head),
+    {ok, _Pos} = dets_utils:position(Head, Head#head.freelists_p),
     dets_utils:truncate(Head, cur).
 
 %% -> {ok, head()} | throw(Error) | throw(badarg)
@@ -1385,13 +1385,13 @@ segment_file(SizeT, Head, FileData, SegEnd) ->
 	case Data of
 	    {InFile,In0} ->
 		{OutFile, Out} = temp_file(Head, SizeT, I),
-		file:close(In0),
+		_ = file:close(In0),
 		{ok, In} = dets_utils:open(InFile, [raw,binary,read]),
 		{ok, 0} = dets_utils:position(In, InFile, bof),
 		seg_file(SegAddr, SegAddr, In, InFile, Out, OutFile, SizeT, 
 			 SegEnd),
-		file:close(In),
-		file:delete(InFile),
+		_ = file:close(In),
+		_ = file:delete(InFile),
 		{OutFile,Out};
 	    Objects ->
 		{LastAddr, B} = seg_file(Objects, SegAddr, SegAddr, SizeT, []),
@@ -1702,7 +1702,7 @@ free_list_to_file(Ftab, H, Pos, Sz, Ws, WsSz) ->
     free_list_to_file(Ftab, H, Pos+1, Sz, NWs, NWsSz).
 
 free_lists_from_file(H, Pos) ->
-    dets_utils:position(H#head.fptr, H#head.filename, Pos),
+    {ok, Pos} = dets_utils:position(H#head.fptr, H#head.filename, Pos),
     FL = dets_utils:empty_free_lists(),
     case catch bin_to_tree([], H, start, FL, -1, []) of
 	{'EXIT', _} ->
diff --git a/lib/stdlib/src/dict.erl b/lib/stdlib/src/dict.erl
index 4f8d45dc8d..6088e1a2dd 100644
--- a/lib/stdlib/src/dict.erl
+++ b/lib/stdlib/src/dict.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %% 
 %% The 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 +36,13 @@
 -module(dict).
 
 %% Standard interface.
--export([new/0,is_key/2,to_list/1,from_list/1,size/1]).
+-export([new/0,is_key/2,to_list/1,from_list/1,size/1,is_empty/1]).
 -export([fetch/2,find/2,fetch_keys/1,erase/2]).
 -export([store/3,append/3,append_list/3,update/3,update/4,update_counter/3]).
 -export([fold/3,map/2,filter/2,merge/3]).
 
+-export_type([dict/0, dict/2]).
+
 %% Low-level interface.
 %%-export([get_slot/2,get_bucket/2,on_bucket/3,fold_dict/3,
 %%	 maybe_expand/2,maybe_contract/2]).
@@ -54,6 +55,9 @@
 -define(exp_size, (?seg_size * ?expand_load)).
 -define(con_size, (?seg_size * ?contract_load)).
 
+-type segs(K, V) :: tuple()
+                  | {K, V}. % dummy
+
 %% Define a hashtable.  The default values are the standard ones.
 -record(dict,
 	{size=0		      :: non_neg_integer(),   	% Number of elements
@@ -63,14 +67,13 @@
 	 exp_size=?exp_size   :: non_neg_integer(),   	% Size to expand at
 	 con_size=?con_size   :: non_neg_integer(),   	% Size to contract at
 	 empty		      :: tuple(),		% Empty segment
-	 segs		      :: tuple()	      	% Segments
+	 segs		      :: segs(_, _)	      	% Segments
 	}).
-%% A declaration equivalent to the following one is hard-coded in erl_types.
-%% That declaration contains hard-coded information about the #dict{}
-%% structure and the types of its fields.  So, please make sure that any
-%% changes to its structure are also propagated to erl_types.erl.
-%%
-%% -opaque dict() :: #dict{}.
+
+
+-opaque dict() :: dict(_, _).
+
+-opaque dict(Key, Value) :: #dict{segs :: segs(Key, Value)}.
 
 -define(kv(K,V), [K|V]).			% Key-Value pair format
 %%-define(kv(K,V), {K,V}).			% Key-Value pair format
@@ -82,8 +85,7 @@ new() ->
     #dict{empty=Empty,segs={Empty}}.
 
 -spec is_key(Key, Dict) -> boolean() when
-      Key :: term(),
-      Dict :: dict().
+      Dict :: dict(Key, Value :: term()).
 
 is_key(Key, D) ->
     Slot = get_slot(D, Key),
@@ -95,15 +97,15 @@ find_key(K, [_|Bkt]) -> find_key(K, Bkt);
 find_key(_, []) -> false.
 
 -spec to_list(Dict) -> List when
-      Dict :: dict(),
-      List :: [{Key :: term(), Value :: term()}].
+      Dict :: dict(Key, Value),
+      List :: [{Key, Value}].
 
 to_list(D) ->
     fold(fun (Key, Val, List) -> [{Key,Val}|List] end, [], D).
 
 -spec from_list(List) -> Dict when
-      List :: [{Key :: term(), Value :: term()}],
-      Dict :: dict().
+      Dict :: dict(Key, Value),
+      List :: [{Key, Value}].
 
 from_list(L) ->
     lists:foldl(fun ({K,V}, D) -> store(K, V, D) end, new(), L).
@@ -113,10 +115,13 @@ from_list(L) ->
 
 size(#dict{size=N}) when is_integer(N), N >= 0 -> N. 
 
+-spec is_empty(Dict) -> boolean() when
+      Dict :: dict().
+
+is_empty(#dict{size=N}) -> N =:= 0.
+
 -spec fetch(Key, Dict) -> Value when
-      Key :: term(),
-      Dict :: dict(),
-      Value :: term().
+      Dict :: dict(Key, Value).
 
 fetch(Key, D) ->
     Slot = get_slot(D, Key),
@@ -131,9 +136,7 @@ fetch_val(K, [_|Bkt]) -> fetch_val(K, Bkt);
 fetch_val(_, []) -> throw(badarg).
 
 -spec find(Key, Dict) -> {'ok', Value} | 'error' when
-      Key :: term(),
-      Dict :: dict(),
-      Value :: term().
+      Dict :: dict(Key, Value).
 
 find(Key, D) ->
     Slot = get_slot(D, Key),
@@ -145,16 +148,16 @@ find_val(K, [_|Bkt]) -> find_val(K, Bkt);
 find_val(_, []) -> error.
 
 -spec fetch_keys(Dict) -> Keys when
-      Dict :: dict(),
-      Keys :: [term()].
+      Dict :: dict(Key, Value :: term()),
+      Keys :: [Key].
 
 fetch_keys(D) ->
     fold(fun (Key, _Val, Keys) -> [Key|Keys] end, [], D).
 
 -spec erase(Key, Dict1) -> Dict2 when
-      Key :: term(),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value).
+
 %%  Erase all elements with key Key.
 
 erase(Key, D0) -> 
@@ -170,10 +173,8 @@ erase_key(Key, [E|Bkt0]) ->
 erase_key(_, []) -> {[],0}.
 
 -spec store(Key, Value, Dict1) -> Dict2 when
-      Key :: term(),
-      Value :: term(),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value).
 
 store(Key, Val, D0) ->
     Slot = get_slot(D0, Key),
@@ -190,10 +191,8 @@ store_bkt_val(Key, New, [Other|Bkt0]) ->
 store_bkt_val(Key, New, []) -> {[?kv(Key,New)],1}.
 
 -spec append(Key, Value, Dict1) -> Dict2 when
-      Key :: term(),
-      Value :: term(),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value).
 
 append(Key, Val, D0) ->
     Slot = get_slot(D0, Key),
@@ -210,10 +209,9 @@ append_bkt(Key, Val, [Other|Bkt0]) ->
 append_bkt(Key, Val, []) -> {[?kv(Key,[Val])],1}.
 
 -spec append_list(Key, ValList, Dict1) -> Dict2 when
-      Key :: term(),
-      ValList :: [Value :: term()],
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value),
+      ValList :: [Value].
 
 append_list(Key, L, D0) ->
     Slot = get_slot(D0, Key),
@@ -284,10 +282,9 @@ app_list_bkt(Key, L, []) -> {[?kv(Key,L)],1}.
 %%     {[Other|Bkt1],Dc}.
 
 -spec update(Key, Fun, Dict1) -> Dict2 when
-      Key :: term(),
-      Fun :: fun((Value1 :: term()) -> Value2 :: term()),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value),
+      Fun :: fun((Value1 :: Value) -> Value2 :: Value).
 
 update(Key, F, D0) ->
     Slot = get_slot(D0, Key),
@@ -307,11 +304,10 @@ update_bkt(_Key, _F, []) ->
     throw(badarg).
 
 -spec update(Key, Fun, Initial, Dict1) -> Dict2 when
-      Key :: term(),
-      Initial :: term(),
-      Fun :: fun((Value1 :: term()) -> Value2 :: term()),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value),
+      Fun :: fun((Value1 :: Value) -> Value2 :: Value),
+      Initial :: Value.
 
 update(Key, F, Init, D0) ->
     Slot = get_slot(D0, Key),
@@ -327,10 +323,9 @@ update_bkt(Key, F, I, [Other|Bkt0]) ->
 update_bkt(Key, F, I, []) when is_function(F, 1) -> {[?kv(Key,I)],1}.
 
 -spec update_counter(Key, Increment, Dict1) -> Dict2 when
-      Key :: term(),
-      Increment :: number(),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value),
+      Increment :: number().
 
 update_counter(Key, Incr, D0) when is_number(Incr) ->
     Slot = get_slot(D0, Key),
@@ -347,36 +342,35 @@ counter_bkt(Key, I, []) -> {[?kv(Key,I)],1}.
 
 -spec fold(Fun, Acc0, Dict) -> Acc1 when
       Fun :: fun((Key, Value, AccIn) -> AccOut),
-      Key :: term(),
-      Value :: term(),
-      Acc0 :: term(),
-      Acc1 :: term(),
-      AccIn :: term(),
-      AccOut :: term(),
-      Dict :: dict().
+      Dict :: dict(Key, Value),
+      Acc0 :: Acc,
+      Acc1 :: Acc,
+      AccIn :: Acc,
+      AccOut :: Acc.
+
 %%  Fold function Fun over all "bags" in Table and return Accumulator.
 
 fold(F, Acc, D) -> fold_dict(F, Acc, D).
 
 -spec map(Fun, Dict1) -> Dict2 when
-      Fun :: fun((Key :: term(), Value1 :: term()) -> Value2 :: term()),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Fun :: fun((Key, Value1) -> Value2),
+      Dict1 :: dict(Key, Value1),
+      Dict2 :: dict(Key, Value2).
 
 map(F, D) -> map_dict(F, D).
 
 -spec filter(Pred, Dict1) -> Dict2 when
-      Pred :: fun((Key :: term(), Value :: term()) -> boolean()),
-      Dict1 :: dict(),
-      Dict2 :: dict().
+      Pred :: fun((Key , Value) -> boolean()),
+      Dict1 :: dict(Key, Value),
+      Dict2 :: dict(Key, Value).
 
 filter(F, D) -> filter_dict(F, D).
 
 -spec merge(Fun, Dict1, Dict2) -> Dict3 when
-      Fun :: fun((Key :: term(), Value1 :: term(), Value2 :: term()) -> Value :: term()),
-      Dict1 :: dict(),
-      Dict2 :: dict(),
-      Dict3 :: dict().
+      Fun :: fun((Key, Value1, Value2) -> Value),
+      Dict1 :: dict(Key, Value1),
+      Dict2 :: dict(Key, Value2),
+      Dict3 :: dict(Key, Value).
 
 merge(F, D1, D2) when D1#dict.size < D2#dict.size ->
     fold_dict(fun (K, V1, D) ->
@@ -387,7 +381,7 @@ merge(F, D1, D2) ->
 		      update(K, fun (V1) -> F(K, V1, V2) end, V2, D)
 	      end, D1, D2).
 
-
+
 %% get_slot(Hashdb, Key) -> Slot.
 %%  Get the slot.  First hash on the new range, if we hit a bucket
 %%  which has not been split use the unsplit buddy bucket.
diff --git a/lib/stdlib/src/digraph.erl b/lib/stdlib/src/digraph.erl
index e3f87d2c57..0c21271529 100644
--- a/lib/stdlib/src/digraph.erl
+++ b/lib/stdlib/src/digraph.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,18 +36,14 @@
 
 -export([get_short_path/3, get_short_cycle/2]).
 
--export_type([digraph/0, d_type/0, vertex/0]).
+-export_type([graph/0, d_type/0, vertex/0, edge/0]).
 
 -record(digraph, {vtab = notable :: ets:tab(),
 		  etab = notable :: ets:tab(),
 		  ntab = notable :: ets:tab(),
 	          cyclic = true  :: boolean()}).
-%% A declaration equivalent to the following one is hard-coded in erl_types.
-%% That declaration contains hard-coded information about the #digraph{}
-%% record and the types of its fields.  So, please make sure that any
-%% changes to its structure are also propagated to erl_types.erl.
-%%
-%% -opaque digraph() :: #digraph{}.
+
+-opaque graph() :: #digraph{}.
 
 -type edge()    :: term().
 -type label()   :: term().
@@ -67,11 +63,11 @@
 -type d_cyclicity()  :: 'acyclic' | 'cyclic'.
 -type d_type()       :: d_cyclicity() | d_protection().
 
--spec new() -> digraph().
+-spec new() -> graph().
 
 new() -> new([]).
 
--spec new(Type) -> digraph() when
+-spec new(Type) -> graph() when
       Type :: [d_type()].
 
 new(Type) ->
@@ -106,7 +102,7 @@ check_type(_, _, _) -> error.
 %%
 %% Set graph type
 %%
--spec set_type([{'cyclic', boolean()}], digraph()) -> digraph().
+-spec set_type([{'cyclic', boolean()}], graph()) -> graph().
 
 set_type([{cyclic,V} | Ks], G) ->
     set_type(Ks, G#digraph{cyclic = V});
@@ -116,7 +112,7 @@ set_type([], G) -> G.
 %% Data access functions
 
 -spec delete(G) -> 'true' when
-      G :: digraph().
+      G :: graph().
 
 delete(G) ->
     ets:delete(G#digraph.vtab),
@@ -124,7 +120,7 @@ delete(G) ->
     ets:delete(G#digraph.ntab).
 
 -spec info(G) -> InfoList when
-      G :: digraph(),
+      G :: graph(),
       InfoList :: [{'cyclicity', Cyclicity :: d_cyclicity()} |
                    {'memory', NoWords :: non_neg_integer()} |
                    {'protection', Protection :: d_protection()}].
@@ -142,20 +138,20 @@ info(G) ->
     [{cyclicity, Cyclicity}, {memory, Memory}, {protection, Protection}].
 
 -spec add_vertex(G) -> vertex() when
-      G :: digraph().
+      G :: graph().
 
 add_vertex(G) ->
     do_add_vertex({new_vertex_id(G), []}, G).
 
 -spec add_vertex(G, V) -> vertex() when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex().
 
 add_vertex(G, V) ->
     do_add_vertex({V, []}, G).
 
 -spec add_vertex(G, V, Label) -> vertex() when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Label :: label().
 
@@ -163,21 +159,21 @@ add_vertex(G, V, D) ->
     do_add_vertex({V, D}, G).
 
 -spec del_vertex(G, V) -> 'true' when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex().
 
 del_vertex(G, V) ->
     do_del_vertex(V, G).
 
 -spec del_vertices(G, Vertices) -> 'true' when
-      G :: digraph(),
+      G :: graph(),
       Vertices :: [vertex()].
 
 del_vertices(G, Vs) -> 
     do_del_vertices(Vs, G).
 
 -spec vertex(G, V) -> {V, Label} | 'false' when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Label :: label().
 
@@ -188,37 +184,37 @@ vertex(G, V) ->
     end.
 
 -spec no_vertices(G) -> non_neg_integer() when
-      G :: digraph().
+      G :: graph().
 
 no_vertices(G) ->
     ets:info(G#digraph.vtab, size).
 
 -spec vertices(G) -> Vertices when
-      G :: digraph(),
+      G :: graph(),
       Vertices :: [vertex()].
 
 vertices(G) ->
     ets:select(G#digraph.vtab, [{{'$1', '_'}, [], ['$1']}]).
 
--spec source_vertices(digraph()) -> [vertex()].
+-spec source_vertices(graph()) -> [vertex()].
 
 source_vertices(G) ->
     collect_vertices(G, in).
 
--spec sink_vertices(digraph()) -> [vertex()].
+-spec sink_vertices(graph()) -> [vertex()].
 
 sink_vertices(G) ->
     collect_vertices(G, out).
 
 -spec in_degree(G, V) -> non_neg_integer() when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex().
 
 in_degree(G, V) ->
     length(ets:lookup(G#digraph.ntab, {in, V})).
 
 -spec in_neighbours(G, V) -> Vertex when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Vertex :: [vertex()].
 
@@ -228,7 +224,7 @@ in_neighbours(G, V) ->
     collect_elems(ets:lookup(NT, {in, V}), ET, 2).
 
 -spec in_edges(G, V) -> Edges when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Edges :: [edge()].
 
@@ -236,14 +232,14 @@ in_edges(G, V) ->
     ets:select(G#digraph.ntab, [{{{in, V}, '$1'}, [], ['$1']}]).
 
 -spec out_degree(G, V) -> non_neg_integer() when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex().
 
 out_degree(G, V) ->
     length(ets:lookup(G#digraph.ntab, {out, V})).
 
 -spec out_neighbours(G, V) -> Vertices when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Vertices :: [vertex()].
 
@@ -253,7 +249,7 @@ out_neighbours(G, V) ->
     collect_elems(ets:lookup(NT, {out, V}), ET, 3).
 
 -spec out_edges(G, V) -> Edges when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Edges :: [edge()].
 
@@ -261,7 +257,7 @@ out_edges(G, V) ->
     ets:select(G#digraph.ntab, [{{{out, V}, '$1'}, [], ['$1']}]).
 
 -spec add_edge(G, V1, V2) -> edge() | {'error', add_edge_err_rsn()} when
-      G :: digraph(),
+      G :: graph(),
       V1 :: vertex(),
       V2 :: vertex().
 
@@ -269,7 +265,7 @@ add_edge(G, V1, V2) ->
     do_add_edge({new_edge_id(G), V1, V2, []}, G).
 
 -spec add_edge(G, V1, V2, Label) -> edge() | {'error', add_edge_err_rsn()} when
-      G :: digraph(),
+      G :: graph(),
       V1 :: vertex(),
       V2 :: vertex(),
       Label :: label().
@@ -278,7 +274,7 @@ add_edge(G, V1, V2, D) ->
     do_add_edge({new_edge_id(G), V1, V2, D}, G).
 
 -spec add_edge(G, E, V1, V2, Label) -> edge() | {'error', add_edge_err_rsn()} when
-      G :: digraph(),
+      G :: graph(),
       E :: edge(),
       V1 :: vertex(),
       V2 :: vertex(),
@@ -288,34 +284,34 @@ add_edge(G, E, V1, V2, D) ->
     do_add_edge({E, V1, V2, D}, G).
 
 -spec del_edge(G, E) -> 'true' when
-      G :: digraph(),
+      G :: graph(),
       E :: edge().
 
 del_edge(G, E) ->
     do_del_edges([E], G).
 
 -spec del_edges(G, Edges) -> 'true' when
-      G :: digraph(),
+      G :: graph(),
       Edges :: [edge()].
 
 del_edges(G, Es) ->
     do_del_edges(Es, G).
 
 -spec no_edges(G) -> non_neg_integer() when
-      G :: digraph().
+      G :: graph().
 
 no_edges(G) ->
     ets:info(G#digraph.etab, size).
 
 -spec edges(G) -> Edges when
-      G :: digraph(),
+      G :: graph(),
       Edges :: [edge()].
 
 edges(G) ->
     ets:select(G#digraph.etab, [{{'$1', '_', '_', '_'}, [], ['$1']}]).
 
 -spec edges(G, V) -> Edges when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Edges :: [edge()].
 
@@ -324,7 +320,7 @@ edges(G, V) ->
 				{{{in, V}, '$1'}, [], ['$1']}]).
 
 -spec edge(G, E) -> {E, V1, V2, Label} | 'false' when
-      G :: digraph(),
+      G :: graph(),
       E :: edge(),
       V1 :: vertex(),
       V2 :: vertex(),
@@ -339,7 +335,7 @@ edge(G, E) ->
 %%
 %% Generate a "unique" edge identifier (relative to this graph)
 %%
--spec new_edge_id(digraph()) -> edge().
+-spec new_edge_id(graph()) -> edge().
 
 new_edge_id(G) ->
     NT = G#digraph.ntab,
@@ -351,7 +347,7 @@ new_edge_id(G) ->
 %%
 %% Generate a "unique" vertex identifier (relative to this graph)
 %%
--spec new_vertex_id(digraph()) -> vertex().
+-spec new_vertex_id(graph()) -> vertex().
 
 new_vertex_id(G) ->
     NT = G#digraph.ntab,
@@ -371,7 +367,7 @@ collect_elems([{_,Key}|Keys], Table, Index, Acc) ->
 		  [ets:lookup_element(Table, Key, Index)|Acc]);
 collect_elems([], _, _, Acc) -> Acc.
 
--spec do_add_vertex({vertex(), label()}, digraph()) -> vertex().
+-spec do_add_vertex({vertex(), label()}, graph()) -> vertex().
 
 do_add_vertex({V, _Label} = VL, G) ->
     ets:insert(G#digraph.vtab, VL),
@@ -430,14 +426,14 @@ do_del_edge(E, V1, V2, G) ->
 				       {{{out,V1}, E}, [], [true]}]),
     ets:delete(G#digraph.etab, E).
 
--spec rm_edges([vertex(),...], digraph()) -> 'true'.
+-spec rm_edges([vertex(),...], graph()) -> 'true'.
 
 rm_edges([V1, V2|Vs], G) ->
     rm_edge(V1, V2, G),
     rm_edges([V2|Vs], G);
 rm_edges(_, _) -> true.
 
--spec rm_edge(vertex(), vertex(), digraph()) -> 'ok'.
+-spec rm_edge(vertex(), vertex(), graph()) -> 'ok'.
 
 rm_edge(V1, V2, G) ->
     Es = out_edges(G, V1),
@@ -456,7 +452,7 @@ rm_edge_0([], _, _, #digraph{}) -> ok.
 %%
 %% Check that endpoints exist
 %%
--spec do_add_edge({edge(), vertex(), vertex(), label()}, digraph()) ->
+-spec do_add_edge({edge(), vertex(), vertex(), label()}, graph()) ->
 	edge() | {'error', add_edge_err_rsn()}.
 
 do_add_edge({E, V1, V2, Label}, G) ->
@@ -484,14 +480,14 @@ other_edge_exists(#digraph{etab = ET}, E, V1, V2) ->
             false
     end.
 
--spec do_insert_edge(edge(), vertex(), vertex(), label(), digraph()) -> edge().
+-spec do_insert_edge(edge(), vertex(), vertex(), label(), graph()) -> edge().
 
 do_insert_edge(E, V1, V2, Label, #digraph{ntab=NT, etab=ET}) ->
     ets:insert(NT, [{{out, V1}, E}, {{in, V2}, E}]),
     ets:insert(ET, {E, V1, V2, Label}),
     E.
 
--spec acyclic_add_edge(edge(), vertex(), vertex(), label(), digraph()) ->
+-spec acyclic_add_edge(edge(), vertex(), vertex(), label(), graph()) ->
 	edge() | {'error', {'bad_edge', [vertex()]}}.
 
 acyclic_add_edge(_E, V1, V2, _L, _G) when V1 =:= V2 ->
@@ -507,7 +503,7 @@ acyclic_add_edge(E, V1, V2, Label, G) ->
 %%
 
 -spec del_path(G, V1, V2) -> 'true' when
-      G :: digraph(),
+      G :: graph(),
       V1 :: vertex(),
       V2 :: vertex().
 
@@ -529,7 +525,7 @@ del_path(G, V1, V2) ->
 %%
 
 -spec get_cycle(G, V) -> Vertices | 'false' when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Vertices :: [vertex(),...].
 
@@ -550,7 +546,7 @@ get_cycle(G, V) ->
 %%
 
 -spec get_path(G, V1, V2) -> Vertices | 'false' when
-      G :: digraph(),
+      G :: graph(),
       V1 :: vertex(),
       V2 :: vertex(),
       Vertices :: [vertex(),...].
@@ -589,7 +585,7 @@ one_path([], _, [], _, _, _, _, _Counter) -> false.
 %%
 
 -spec get_short_cycle(G, V) -> Vertices | 'false' when
-      G :: digraph(),
+      G :: graph(),
       V :: vertex(),
       Vertices :: [vertex(),...].
 
@@ -602,7 +598,7 @@ get_short_cycle(G, V) ->
 %%
 
 -spec get_short_path(G, V1, V2) -> Vertices | 'false' when
-      G :: digraph(),
+      G :: graph(),
       V1 :: vertex(),
       V2 :: vertex(),
       Vertices :: [vertex(),...].
diff --git a/lib/stdlib/src/digraph_utils.erl b/lib/stdlib/src/digraph_utils.erl
index 807b5c12a1..011bcd0260 100644
--- a/lib/stdlib/src/digraph_utils.erl
+++ b/lib/stdlib/src/digraph_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %% 
 %% The 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,28 +43,28 @@
 %%
 
 -spec components(Digraph) -> [Component] when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Component :: [digraph:vertex()].
 
 components(G) ->
     forest(G, fun inout/3).
 
 -spec strong_components(Digraph) -> [StrongComponent] when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       StrongComponent :: [digraph:vertex()].
 
 strong_components(G) ->
     forest(G, fun in/3, revpostorder(G)).
 
 -spec cyclic_strong_components(Digraph) -> [StrongComponent] when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       StrongComponent :: [digraph:vertex()].
 
 cyclic_strong_components(G) ->
     remove_singletons(strong_components(G), G, []).
 
 -spec reachable(Vertices, Digraph) -> Reachable when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()],
       Reachable :: [digraph:vertex()].
 
@@ -72,7 +72,7 @@ reachable(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun out/3, Vs, first)).
 
 -spec reachable_neighbours(Vertices, Digraph) -> Reachable when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()],
       Reachable :: [digraph:vertex()].
 
@@ -80,7 +80,7 @@ reachable_neighbours(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun out/3, Vs, not_first)).
 
 -spec reaching(Vertices, Digraph) -> Reaching when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()],
       Reaching :: [digraph:vertex()].
 
@@ -88,7 +88,7 @@ reaching(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun in/3, Vs, first)).
 
 -spec reaching_neighbours(Vertices, Digraph) -> Reaching when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()],
       Reaching :: [digraph:vertex()].
 
@@ -96,7 +96,7 @@ reaching_neighbours(Vs, G) when is_list(Vs) ->
     lists:append(forest(G, fun in/3, Vs, not_first)).
 
 -spec topsort(Digraph) -> Vertices | 'false' when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()].
 
 topsort(G) ->
@@ -107,13 +107,13 @@ topsort(G) ->
     end.
 
 -spec is_acyclic(Digraph) -> boolean() when
-      Digraph :: digraph().
+      Digraph :: digraph:graph().
 
 is_acyclic(G) ->
     loop_vertices(G) =:= [] andalso topsort(G) =/= false.
 
 -spec arborescence_root(Digraph) -> 'no' | {'yes', Root} when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Root :: digraph:vertex().
 
 arborescence_root(G) ->
@@ -136,29 +136,29 @@ arborescence_root(G) ->
     end.
 
 -spec is_arborescence(Digraph) -> boolean() when
-      Digraph :: digraph().
+      Digraph :: digraph:graph().
 
 is_arborescence(G) ->
     arborescence_root(G) =/= no.
 
 -spec is_tree(Digraph) -> boolean() when
-      Digraph :: digraph().
+      Digraph :: digraph:graph().
 
 is_tree(G) ->
     (digraph:no_edges(G) =:= digraph:no_vertices(G) - 1)
     andalso (length(components(G)) =:= 1).
 
 -spec loop_vertices(Digraph) -> Vertices when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()].
 
 loop_vertices(G) ->
     [V || V <- digraph:vertices(G), is_reflexive_vertex(V, G)].
 
 -spec subgraph(Digraph, Vertices) -> SubGraph when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()],
-      SubGraph :: digraph().
+      SubGraph :: digraph:graph().
 
 subgraph(G, Vs) ->
     try
@@ -169,8 +169,8 @@ subgraph(G, Vs) ->
     end.
 
 -spec subgraph(Digraph, Vertices, Options) -> SubGraph when
-      Digraph :: digraph(),
-      SubGraph :: digraph(),
+      Digraph :: digraph:graph(),
+      SubGraph :: digraph:graph(),
       Vertices :: [digraph:vertex()],
       Options :: [{'type', SubgraphType} | {'keep_labels', boolean()}],
       SubgraphType :: 'inherit' | [digraph:d_type()].
@@ -184,8 +184,8 @@ subgraph(G, Vs, Opts) ->
     end.
 
 -spec condensation(Digraph) -> CondensedDigraph when
-      Digraph :: digraph(),
-      CondensedDigraph :: digraph().
+      Digraph :: digraph:graph(),
+      CondensedDigraph :: digraph:graph().
 
 condensation(G) ->
     SCs = strong_components(G),
@@ -209,14 +209,14 @@ condensation(G) ->
     SCG.
 
 -spec preorder(Digraph) -> Vertices when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()].
 
 preorder(G) ->
     lists:reverse(revpreorder(G)).
 
 -spec postorder(Digraph) -> Vertices when
-      Digraph :: digraph(),
+      Digraph :: digraph:graph(),
       Vertices :: [digraph:vertex()].
 
 postorder(G) ->
@@ -370,5 +370,5 @@ condense('$end_of_table', _T, _SC, _G, _SCG, _I2C) ->
 condense(I, T, SC, G, SCG, I2C) ->
     [{_,C}] = ets:lookup(I2C, I),
     digraph:add_vertex(SCG, C),
-    [digraph:add_edge(SCG, SC, C) || C =/= SC],
+    _ = [digraph:add_edge(SCG, SC, C) || C =/= SC],
     condense(ets:next(T, I), T, SC, G, SCG, I2C).
diff --git a/lib/stdlib/src/edlin.erl b/lib/stdlib/src/edlin.erl
index 3192879f09..be9a4f5107 100644
--- a/lib/stdlib/src/edlin.erl
+++ b/lib/stdlib/src/edlin.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The 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,6 +78,14 @@ edit([C|Cs], P, {Bef,Aft}, Prefix, Rs0) ->
     case key_map(C, Prefix) of
 	meta ->
 	    edit(Cs, P, {Bef,Aft}, meta, Rs0);
+    meta_o ->
+        edit(Cs, P, {Bef,Aft}, meta_o, Rs0);
+    meta_csi ->
+        edit(Cs, P, {Bef,Aft}, meta_csi, Rs0);
+    meta_meta ->
+        edit(Cs, P, {Bef,Aft}, meta_meta, Rs0);
+    {csi, _} = Csi ->
+        edit(Cs, P, {Bef,Aft}, Csi, Rs0);
 	meta_left_sq_bracket ->
 	    edit(Cs, P, {Bef,Aft}, meta_left_sq_bracket, Rs0);
 	search_meta ->
@@ -178,6 +185,7 @@ key_map($\^U, none) -> ctlu;
 key_map($\^], none) -> auto_blink;
 key_map($\^X, none) -> ctlx;
 key_map($\^Y, none) -> yank;
+key_map($\^W, none) -> backward_kill_word;
 key_map($\e, none) -> meta;
 key_map($), Prefix) when Prefix =/= meta,
                          Prefix =/= search,
@@ -198,11 +206,29 @@ key_map($d, meta) -> kill_word;
 key_map($f, meta) -> forward_word;
 key_map($t, meta) -> transpose_word;
 key_map($y, meta) -> yank_pop;
+key_map($O, meta) -> meta_o;
+key_map($H, meta_o) -> beginning_of_line;
+key_map($F, meta_o) -> end_of_line;
 key_map($\177, none) -> backward_delete_char;
 key_map($\177, meta) -> backward_kill_word;
 key_map($[, meta) -> meta_left_sq_bracket;
 key_map($D, meta_left_sq_bracket) -> backward_char;
 key_map($C, meta_left_sq_bracket) -> forward_char;
+% support a few <CTRL>+<CURSOR LEFT|RIGHT> combinations...
+%  - forward:  \e\e[C, \e[5C, \e[1;5C
+%  - backward: \e\e[D, \e[5D, \e[1;5D
+key_map($\e, meta) -> meta_meta;
+key_map($[, meta_meta) -> meta_csi;
+key_map($C, meta_csi) -> forward_word;
+key_map($D, meta_csi) -> backward_word;
+key_map($1, meta_left_sq_bracket) -> {csi, "1"};
+key_map($5, meta_left_sq_bracket) -> {csi, "5"};
+key_map($5, {csi, "1;"}) -> {csi, "1;5"};
+key_map($C, {csi, "5"}) -> forward_word;
+key_map($C, {csi, "1;5"}) -> forward_word;
+key_map($D, {csi, "5"})  -> backward_word;
+key_map($D, {csi, "1;5"}) -> backward_word;
+key_map($;, {csi, "1"}) -> {csi, "1;"};
 key_map(C, none) when C >= $\s ->
     {insert,C};
 %% for search, we need smarter line handling and so
@@ -363,6 +389,9 @@ do_op(end_of_line, Bef, [C|Aft], Rs) ->
     {{reverse(Aft, [C|Bef]),[]},[{move_rel,length(Aft)+1}|Rs]};
 do_op(end_of_line, Bef, [], Rs) ->
     {{Bef,[]},Rs};
+do_op(ctlu, Bef, Aft, Rs) ->
+    put(kill_buffer, Bef),
+    {{[], Aft}, [{delete_chars, -length(Bef)} | Rs]};
 do_op(beep, Bef, Aft, Rs) ->
     {{Bef,Aft},[beep|Rs]};
 do_op(_, Bef, Aft, Rs) ->
diff --git a/lib/stdlib/src/edlin_expand.erl b/lib/stdlib/src/edlin_expand.erl
index 516c0aa30b..a2b4663219 100644
--- a/lib/stdlib/src/edlin_expand.erl
+++ b/lib/stdlib/src/edlin_expand.erl
@@ -73,7 +73,7 @@ to_atom(Str) ->
 	    error
     end.
 
-match(Prefix, Alts, Extra) ->
+match(Prefix, Alts, Extra0) ->
     Len = length(Prefix),
     Matches = lists:sort(
 		[{S, A} || {H, A} <- Alts,
@@ -89,7 +89,11 @@ match(Prefix, Alts, Extra) ->
  		    {yes, Remain, []}
  	    end;
  	{complete, Str} ->
- 	    {yes, nthtail(Len, Str) ++ Extra, []};
+	    Extra = case {Extra0,Matches} of
+			{"(",[{Str,0}]} -> "()";
+			{_,_} -> Extra0
+		    end,
+	    {yes, nthtail(Len, Str) ++ Extra, []};
  	no ->
  	    {no, [], []}
     end.
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index d1d060ebc8..68e079b7e5 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,8 +46,8 @@
 	      istk=[],				%Ifdef stack
 	      sstk=[],				%State stack
 	      path=[],				%Include-path
-	      macs = dict:new()  :: dict(),	%Macros (don't care locations)
-	      uses = dict:new()  :: dict(),	%Macro use structure
+	      macs = dict:new()  :: dict:dict(),%Macros (don't care locations)
+	      uses = dict:new()  :: dict:dict(),%Macro use structure
 	      pre_opened = false :: boolean()
 	     }).
 
@@ -219,7 +219,7 @@ parse_file(Epp) ->
 	    [{eof,Location}]
     end.
 
--define(DEFAULT_ENCODING, latin1).
+-define(DEFAULT_ENCODING, utf8).
 
 -spec default_encoding() -> source_encoding().
 
@@ -640,11 +640,11 @@ leave_file(From, St) ->
 		    Ms = dict:store({atom,'FILE'},
 				    {none,[{string,CurrLoc,OldName2}]},
 				    St#epp.macs),
-                    NextSt = OldSt#epp{sstk=Sts,macs=Ms},
+                    NextSt = OldSt#epp{sstk=Sts,macs=Ms,uses=St#epp.uses},
 		    enter_file_reply(From, OldName, CurrLoc, CurrLoc),
                     case OldName2 =:= OldName of
                         true ->
-                            From;
+                            ok;
                         false ->
                             NFrom = wait_request(NextSt),
                             enter_file_reply(NFrom, OldName2, OldLoc,
@@ -1247,6 +1247,8 @@ macro_arg([{'case',Lc}|Toks], E, Arg) ->
     macro_arg(Toks, ['end'|E], [{'case',Lc}|Arg]);
 macro_arg([{'fun',Lc}|[{'(',_}|_]=Toks], E, Arg) ->
     macro_arg(Toks, ['end'|E], [{'fun',Lc}|Arg]);
+macro_arg([{'fun',_}=Fun,{var,_,_}=Name|[{'(',_}|_]=Toks], E, Arg) ->
+    macro_arg(Toks, ['end'|E], [Name,Fun|Arg]);
 macro_arg([{'receive',Lr}|Toks], E, Arg) ->
     macro_arg(Toks, ['end'|E], [{'receive',Lr}|Arg]);
 macro_arg([{'try',Lr}|Toks], E, Arg) ->
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl
index 8c3d59467b..ed8fea5d78 100644
--- a/lib/stdlib/src/erl_compile.erl
+++ b/lib/stdlib/src/erl_compile.erl
@@ -21,10 +21,12 @@
 -include("erl_compile.hrl").
 -include("file.hrl").
 
--export([compile_cmdline/1]).
+-export([compile_cmdline/0]).
 
 -export_type([cmd_line_arg/0]).
 
+-define(STDERR, standard_error).		%Macro to avoid misspellings.
+
 %% Mapping from extension to {M,F} to run the correct compiler.
 
 compiler(".erl") ->    {compile,         compile};
@@ -47,9 +49,10 @@ compiler(_) ->         no.
 
 -type cmd_line_arg() :: atom() | string().
 
--spec compile_cmdline([cmd_line_arg()]) -> no_return().
+-spec compile_cmdline() -> no_return().
 
-compile_cmdline(List) ->
+compile_cmdline() ->
+    List = init:get_plain_arguments(),
     case compile(List) of
 	ok -> my_halt(0);
 	error -> my_halt(1);
@@ -67,8 +70,12 @@ compile(List) ->
     receive
 	{'EXIT', Pid, {compiler_result, Result}} ->
 	    Result;
+	{'EXIT', Pid, {compiler_error, Error}} ->
+	    io:put_chars(?STDERR, Error),
+	    io:nl(?STDERR),
+	    error;
 	{'EXIT', Pid, Reason} ->
-	    io:format("Runtime error: ~tp~n", [Reason]),
+	    io:format(?STDERR, "Runtime error: ~tp~n", [Reason]),
 	    error
     end.
 
@@ -83,66 +90,178 @@ compiler_runner(List) ->
 
 %% Parses the first part of the option list.
 
-compile1(['@cwd', Cwd|Rest]) ->
-    CwdL = atom_to_list(Cwd),
-    compile1(Rest, CwdL, #options{outdir=CwdL, cwd=CwdL});
 compile1(Args) ->
-    %% From R13B02, the @cwd argument is optional.
     {ok, Cwd} = file:get_cwd(),
-    compile1(Args, Cwd, #options{outdir=Cwd, cwd=Cwd}).
+    compile1(Args, #options{outdir=Cwd,cwd=Cwd}).
 
 %% Parses all options.
 
-compile1(['@i', Dir|Rest], Cwd, Opts) ->
+compile1(["--"|Files], Opts) ->
+    compile2(Files, Opts);
+compile1(["-"++Option|T], Opts) ->
+    parse_generic_option(Option, T, Opts);
+compile1(["+"++Option|Rest], Opts) ->
+    Term = make_term(Option),
+    Specific = Opts#options.specific,
+    compile1(Rest, Opts#options{specific=[Term|Specific]});
+compile1(Files, Opts) ->
+    compile2(Files, Opts).
+
+parse_generic_option("b"++Opt, T0, Opts) ->
+    {OutputType,T} = get_option("b", Opt, T0),
+    compile1(T, Opts#options{output_type=list_to_atom(OutputType)});
+parse_generic_option("D"++Opt, T0, #options{defines=Defs}=Opts) ->
+    {Val0,T} = get_option("D", Opt, T0),
+    {Key0,Val1} = split_at_equals(Val0, []),
+    Key = list_to_atom(Key0),
+    case Val1 of
+	[] ->
+	    compile1(T, Opts#options{defines=[Key|Defs]});
+	Val2 ->
+	    Val = make_term(Val2),
+	    compile1(T, Opts#options{defines=[{Key,Val}|Defs]})
+    end;
+parse_generic_option("help", _, _Opts) ->
+    usage();
+parse_generic_option("I"++Opt, T0, #options{cwd=Cwd}=Opts) ->
+    {Dir,T} = get_option("I", Opt, T0),
     AbsDir = filename:absname(Dir, Cwd),
-    compile1(Rest, Cwd, Opts#options{includes=[AbsDir|Opts#options.includes]});
-compile1(['@outdir', Dir|Rest], Cwd, Opts) ->
+    compile1(T, Opts#options{includes=[AbsDir|Opts#options.includes]});
+parse_generic_option("M"++Opt, T0, #options{specific=Spec}=Opts) ->
+    case parse_dep_option(Opt, T0) of
+	error ->
+	    error;
+	{SpecOpts,T} ->
+	    compile1(T, Opts#options{specific=SpecOpts++Spec})
+    end;
+parse_generic_option("o"++Opt, T0, #options{cwd=Cwd}=Opts) ->
+    {Dir,T} = get_option("o", Opt, T0),
     AbsName = filename:absname(Dir, Cwd),
     case file_or_directory(AbsName) of
 	file ->
-	    compile1(Rest, Cwd, Opts#options{outfile=AbsName});
+	    compile1(T, Opts#options{outfile=AbsName});
 	directory ->
-	    compile1(Rest, Cwd, Opts#options{outdir=AbsName})
+	    compile1(T, Opts#options{outdir=AbsName})
     end;
-compile1(['@d', Name|Rest], Cwd, Opts) ->
-    Defines = Opts#options.defines,
-    compile1(Rest, Cwd, Opts#options{defines=[Name|Defines]});
-compile1(['@dv', Name, Term|Rest], Cwd, Opts) ->
-    Defines = Opts#options.defines,
-    Value = make_term(atom_to_list(Term)),
-    compile1(Rest, Cwd, Opts#options{defines=[{Name, Value}|Defines]});
-compile1(['@warn', Level0|Rest], Cwd, Opts) ->
-    case catch list_to_integer(atom_to_list(Level0)) of
-	Level when is_integer(Level) ->
-	    compile1(Rest, Cwd, Opts#options{warning=Level});
+parse_generic_option("O"++Opt, T, Opts) ->
+    case Opt of
+	"" ->
+	    compile1(T, Opts#options{optimize=1});
 	_ ->
-	    compile1(Rest, Cwd, Opts)
+	    Term = make_term(Opt),
+	    compile1(T, Opts#options{optimize=Term})
     end;
-compile1(['@verbose', false|Rest], Cwd, Opts) ->
-    compile1(Rest, Cwd, Opts#options{verbose=false});
-compile1(['@verbose', true|Rest], Cwd, Opts) ->
-    compile1(Rest, Cwd, Opts#options{verbose=true});
-compile1(['@optimize', Atom|Rest], Cwd, Opts) ->
-    Term = make_term(atom_to_list(Atom)),
-    compile1(Rest, Cwd, Opts#options{optimize=Term});
-compile1(['@option', Atom|Rest], Cwd, Opts) ->
-    Term = make_term(atom_to_list(Atom)),
-    Specific = Opts#options.specific,
-    compile1(Rest, Cwd, Opts#options{specific=[Term|Specific]});
-compile1(['@output_type', OutputType|Rest], Cwd, Opts) ->
-    compile1(Rest, Cwd, Opts#options{output_type=OutputType});
-compile1(['@files'|Rest], Cwd, Opts) ->
-    Includes = lists:reverse(Opts#options.includes),
-    compile2(Rest, Cwd, Opts#options{includes=Includes}).
-
-compile2(Files, Cwd, Opts) ->
-    case {Opts#options.outfile, length(Files)} of
+parse_generic_option("v", T, Opts) ->
+    compile1(T, Opts#options{verbose=true});
+parse_generic_option("W"++Warn, T, #options{specific=Spec}=Opts) ->
+    case Warn of
+	"all" ->
+	    compile1(T, Opts#options{warning=999});
+	"error" ->
+	    compile1(T, Opts#options{specific=[warnings_as_errors|Spec]});
+	"" ->
+	    compile1(T, Opts#options{warning=1});
+	_ ->
+	    try	list_to_integer(Warn) of
+		Level ->
+		    compile1(T, Opts#options{warning=Level})
+	    catch
+		error:badarg ->
+		    usage()
+	    end
+    end;
+parse_generic_option("E", T, #options{specific=Spec}=Opts) ->
+    compile1(T, Opts#options{specific=['E'|Spec]});
+parse_generic_option("P", T, #options{specific=Spec}=Opts) ->
+    compile1(T, Opts#options{specific=['P'|Spec]});
+parse_generic_option("S", T, #options{specific=Spec}=Opts) ->
+    compile1(T, Opts#options{specific=['S'|Spec]});
+parse_generic_option(Option, _T, _Opts) ->
+    io:format(?STDERR, "Unknown option: -~s\n", [Option]),
+    usage().
+
+parse_dep_option("", T) ->
+    {[makedep,{makedep_output,standard_io}],T};
+parse_dep_option("D", T) ->
+    {[makedep],T};
+parse_dep_option("F"++Opt, T0) ->
+    {File,T} = get_option("MF", Opt, T0),
+    {[makedep,{makedep_output,File}],T};
+parse_dep_option("G", T) ->
+    {[makedep_add_missing],T};
+parse_dep_option("P", T) ->
+    {[makedep_phony],T};
+parse_dep_option("Q"++Opt, T0) ->
+    {Target,T} = get_option("MT", Opt, T0),
+    {[makedep_quote_target,{makedep_target,Target}],T};
+parse_dep_option("T"++Opt, T0) ->
+    {Target,T} = get_option("MT", Opt, T0),
+    {[{makedep_target,Target}],T};
+parse_dep_option(Opt, _T) ->
+    io:format(?STDERR, "Unknown option: -M~s\n", [Opt]),
+    usage().
+
+usage() ->
+    H = [{"-b type","type of output file (e.g. beam)"},
+	 {"-d","turn on debugging of erlc itself"},
+	 {"-Dname","define name"},
+	 {"-Dname=value","define name to have value"},
+	 {"-help","shows this help text"},
+	 {"-I path","where to search for include files"},
+	 {"-M","generate a rule for make(1) describing the dependencies"},
+	 {"-MF file","write the dependencies to 'file'"},
+	 {"-MT target","change the target of the rule emitted by dependency "
+	  "generation"},
+	 {"-MQ target","same as -MT but quote characters special to make(1)"},
+	 {"-MG","consider missing headers as generated files and add them to "
+	  "the dependencies"},
+	 {"-MP","add a phony target for each dependency"},
+	 {"-MD","same as -M -MT file (with default 'file')"},
+	 {"-o name","name output directory or file"},
+	 {"-pa path","add path to the front of Erlang's code path"},
+	 {"-pz path","add path to the end of Erlang's code path"},
+	 {"-smp","compile using SMP emulator"},
+	 {"-v","verbose compiler output"},
+	 {"-Werror","make all warnings into errors"},
+	 {"-W0","disable warnings"},
+	 {"-Wnumber","set warning level to number"},
+	 {"-Wall","enable all warnings"},
+	 {"-W","enable warnings (default; same as -W1)"},
+	 {"-E","generate listing of expanded code (Erlang compiler)"},
+	 {"-S","generate assembly listing (Erlang compiler)"},
+	 {"-P","generate listing of preprocessed code (Erlang compiler)"},
+	 {"+term","pass the Erlang term unchanged to the compiler"}],
+    io:put_chars(?STDERR,
+		 ["Usage: erlc [Options] file.ext ...\n",
+		  "Options:\n",
+		  [io_lib:format("~-14s ~s\n", [K,D]) || {K,D} <- H]]),
+    error.
+
+get_option(_Name, [], [[C|_]=Option|T]) when C =/= $- ->
+    {Option,T};
+get_option(_Name, [_|_]=Option, T) ->
+    {Option,T};
+get_option(Name, _, _) ->
+    exit({compiler_error,"No value given to -"++Name++" option"}).
+
+split_at_equals([$=|T], Acc) ->
+    {lists:reverse(Acc),T};
+split_at_equals([H|T], Acc) ->
+    split_at_equals(T, [H|Acc]);
+split_at_equals([], Acc) ->
+    {lists:reverse(Acc),[]}.
+
+compile2(Files, #options{cwd=Cwd,includes=Incl,outfile=Outfile}=Opts0) ->
+    Opts = Opts0#options{includes=lists:reverse(Incl)},
+    case {Outfile,length(Files)} of
 	{"", _} ->
 	    compile3(Files, Cwd, Opts);
 	{[_|_], 1} ->
 	    compile3(Files, Cwd, Opts);
 	{[_|_], _N} ->
-	    io:format("Output file name given, but more than one input file.~n"),
+	    io:put_chars(?STDERR,
+			 "Output file name given, "
+			 "but more than one input file.\n"),
 	    error
     end.
 
@@ -170,23 +289,25 @@ compile3([], _Cwd, _Options) -> ok.
 %% Invokes the appropriate compiler, depending on the file extension.
 
 compile_file("", Input, _Output, _Options) ->
-    io:format("File has no extension: ~ts~n", [Input]),
+    io:format(?STDERR, "File has no extension: ~ts~n", [Input]),
     error;
 compile_file(Ext, Input, Output, Options) ->
     case compiler(Ext) of
 	no ->
-	    io:format("Unknown extension: '~ts'\n", [Ext]),
+	    io:format(?STDERR, "Unknown extension: '~ts'\n", [Ext]),
 	    error;
 	{M, F} ->
 	    case catch M:F(Input, Output, Options) of
 		ok -> ok;
 		error -> error;
 		{'EXIT',Reason} ->
-		    io:format("Compiler function ~w:~w/3 failed:\n~p~n",
+		    io:format(?STDERR,
+			      "Compiler function ~w:~w/3 failed:\n~p~n",
 			      [M,F,Reason]),
 		    error;
 		Other ->
-		    io:format("Compiler function ~w:~w/3 returned:\n~p~n",
+		    io:format(?STDERR,
+			      "Compiler function ~w:~w/3 returned:\n~p~n",
 			      [M,F,Other]),
 		    error
 	    end
@@ -215,10 +336,10 @@ make_term(Str) ->
 	    case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
 		{ok, Term} -> Term;
 		{error, {_,_,Reason}} ->
-		    io:format("~ts: ~ts~n", [Reason, Str]),
+		    io:format(?STDERR, "~ts: ~ts~n", [Reason, Str]),
 		    throw(error)
 	    end;
 	{error, {_,_,Reason}, _} ->
-	    io:format("~ts: ~ts~n", [Reason, Str]),
+	    io:format(?STDERR, "~ts: ~ts~n", [Reason, Str]),
 	    throw(error)
     end.
diff --git a/lib/stdlib/src/erl_eval.erl b/lib/stdlib/src/erl_eval.erl
index 73b8da335a..3a4108e297 100644
--- a/lib/stdlib/src/erl_eval.erl
+++ b/lib/stdlib/src/erl_eval.erl
@@ -179,8 +179,12 @@ check_command(Es, Bs) ->
 fun_data(F) when is_function(F) ->
     case erlang:fun_info(F, module) of
         {module,erl_eval} ->
-            {env, [FBs,_FEf,_FLf,FCs]} = erlang:fun_info(F, env),
-            {fun_data,FBs,FCs};
+            case erlang:fun_info(F, env) of
+                {env,[{FBs,_FLf,_FEf,FCs}]} ->
+                    {fun_data,FBs,FCs};
+                {env,[{FBs,_FLf,_FEf,FCs,FName}]} ->
+                    {named_fun_data,FBs,FName,FCs}
+            end;
         _ ->
             false
     end;
@@ -235,6 +239,21 @@ expr({record,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
     erlang:raise(error, {undef_record,Name}, stacktrace());
 expr({record,_,_,Name,_}, _Bs, _Lf, _Ef, _RBs) ->
     erlang:raise(error, {undef_record,Name}, stacktrace());
+
+%% map
+expr({map,_, Binding,Es}, Bs0, Lf, Ef, RBs) ->
+    {value, Map0, Bs1} = expr(Binding, Bs0, Lf, Ef, RBs),
+    {Vs,Bs} = eval_map_fields(Es, Bs1, Lf, Ef),
+    ret_expr(lists:foldl(fun
+		({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi);
+		({map_exact,K,V}, Mi) -> maps:update(K,V,Mi)
+	end, Map0, Vs), Bs, RBs);
+expr({map,_,Es}, Bs0, Lf, Ef, RBs) ->
+    {Vs,Bs} = eval_map_fields(Es, Bs0, Lf, Ef),
+    ret_expr(lists:foldl(fun
+		({map_assoc,K,V}, Mi) -> maps:put(K,V,Mi)
+	    end, maps:new(), Vs), Bs, RBs);
+
 expr({block,_,Es}, Bs, Lf, Ef, RBs) ->
     exprs(Es, Bs, Lf, Ef, RBs);
 expr({'if',_,Cs}, Bs, Lf, Ef, RBs) ->
@@ -262,51 +281,99 @@ expr({'fun',Line,{clauses,Cs}} = Ex, Bs, Lf, Ef, RBs) ->
     {Ex1, _} = hide_calls(Ex, 0),
     {ok,Used} = erl_lint:used_vars([Ex1], Bs),
     En = orddict:filter(fun(K,_V) -> member(K,Used) end, Bs),
+    Info = {En,Lf,Ef,Cs},
     %% This is a really ugly hack!
     F = 
     case length(element(3,hd(Cs))) of
-	0 -> fun () -> eval_fun(Cs, [], En, Lf, Ef) end;
-	1 -> fun (A) -> eval_fun(Cs, [A], En, Lf, Ef) end;
-	2 -> fun (A,B) -> eval_fun(Cs, [A,B], En, Lf, Ef) end;
-	3 -> fun (A,B,C) -> eval_fun(Cs, [A,B,C], En, Lf, Ef) end;
-	4 -> fun (A,B,C,D) -> eval_fun(Cs, [A,B,C,D], En, Lf, Ef) end;
-	5 -> fun (A,B,C,D,E) -> eval_fun(Cs, [A,B,C,D,E], En, Lf, Ef) end;
-	6 -> fun (A,B,C,D,E,F) -> eval_fun(Cs, [A,B,C,D,E,F], En, Lf, Ef) end;
-	7 -> fun (A,B,C,D,E,F,G) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G], En, Lf, Ef) end;
-	8 -> fun (A,B,C,D,E,F,G,H) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H], En, Lf, Ef) end;
-	9 -> fun (A,B,C,D,E,F,G,H,I) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I], En, Lf, Ef) end;
-	10 -> fun (A,B,C,D,E,F,G,H,I,J) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J], En, Lf, Ef) end;
-	11 -> fun (A,B,C,D,E,F,G,H,I,J,K) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K], En, Lf, Ef) end;
-	12 -> fun (A,B,C,D,E,F,G,H,I,J,K,L) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L], En, Lf, Ef) end;
-	13 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M], En, Lf, Ef) end;
-	14 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N], En, Lf, Ef) end;
-	15 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O], En, Lf, Ef) end;
-	16 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P], En, Lf, Ef) end;
-	17 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q], En, Lf, Ef) end;
-	18 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R], En, Lf, Ef) end;
-	19 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S], 
-                    En, Lf, Ef) end;
-	20 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T) -> 
-           eval_fun(Cs, [A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T], 
-                    En, Lf, Ef) end;
+        0 -> fun () -> eval_fun([], Info) end;
+        1 -> fun (A) -> eval_fun([A], Info) end;
+        2 -> fun (A,B) -> eval_fun([A,B], Info) end;
+        3 -> fun (A,B,C) -> eval_fun([A,B,C], Info) end;
+        4 -> fun (A,B,C,D) -> eval_fun([A,B,C,D], Info) end;
+        5 -> fun (A,B,C,D,E) -> eval_fun([A,B,C,D,E], Info) end;
+        6 -> fun (A,B,C,D,E,F) -> eval_fun([A,B,C,D,E,F], Info) end;
+        7 -> fun (A,B,C,D,E,F,G) -> eval_fun([A,B,C,D,E,F,G], Info) end;
+        8 -> fun (A,B,C,D,E,F,G,H) -> eval_fun([A,B,C,D,E,F,G,H], Info) end;
+        9 -> fun (A,B,C,D,E,F,G,H,I) -> eval_fun([A,B,C,D,E,F,G,H,I], Info) end;
+        10 -> fun (A,B,C,D,E,F,G,H,I,J) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J], Info) end;
+        11 -> fun (A,B,C,D,E,F,G,H,I,J,K) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K], Info) end;
+        12 -> fun (A,B,C,D,E,F,G,H,I,J,K,L) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L], Info) end;
+        13 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M], Info) end;
+        14 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N], Info) end;
+        15 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O], Info) end;
+        16 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P], Info) end;
+        17 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q], Info) end;
+        18 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R], Info) end;
+        19 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S], Info) end;
+        20 -> fun (A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T) ->
+           eval_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T], Info) end;
 	_Other ->
 	    erlang:raise(error, {'argument_limit',{'fun',Line,Cs}},
 			 stacktrace())
     end,
     ret_expr(F, Bs, RBs);
+expr({named_fun,Line,Name,Cs} = Ex, Bs, Lf, Ef, RBs) ->
+    %% Save only used variables in the function environment.
+    %% {value,L,V} are hidden while lint finds used variables.
+    {Ex1, _} = hide_calls(Ex, 0),
+    {ok,Used} = erl_lint:used_vars([Ex1], Bs),
+    En = orddict:filter(fun(K,_V) -> member(K,Used) end, Bs),
+    Info = {En,Lf,Ef,Cs,Name},
+    %% This is a really ugly hack!
+    F =
+    case length(element(3,hd(Cs))) of
+        0 -> fun RF() -> eval_named_fun([], RF, Info) end;
+        1 -> fun RF(A) -> eval_named_fun([A], RF, Info) end;
+        2 -> fun RF(A,B) -> eval_named_fun([A,B], RF, Info) end;
+        3 -> fun RF(A,B,C) -> eval_named_fun([A,B,C], RF, Info) end;
+        4 -> fun RF(A,B,C,D) -> eval_named_fun([A,B,C,D], RF, Info) end;
+        5 -> fun RF(A,B,C,D,E) -> eval_named_fun([A,B,C,D,E], RF, Info) end;
+        6 -> fun RF(A,B,C,D,E,F) -> eval_named_fun([A,B,C,D,E,F], RF, Info) end;
+        7 -> fun RF(A,B,C,D,E,F,G) ->
+           eval_named_fun([A,B,C,D,E,F,G], RF, Info) end;
+        8 -> fun RF(A,B,C,D,E,F,G,H) ->
+           eval_named_fun([A,B,C,D,E,F,G,H], RF, Info) end;
+        9 -> fun RF(A,B,C,D,E,F,G,H,I) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I], RF, Info) end;
+        10 -> fun RF(A,B,C,D,E,F,G,H,I,J) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J], RF, Info) end;
+        11 -> fun RF(A,B,C,D,E,F,G,H,I,J,K) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K], RF, Info) end;
+        12 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L], RF, Info) end;
+        13 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M], RF, Info) end;
+        14 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N], RF, Info) end;
+        15 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O], RF, Info) end;
+        16 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P], RF, Info) end;
+        17 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q], RF, Info) end;
+        18 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R], RF, Info) end;
+        19 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S],
+                          RF, Info) end;
+        20 -> fun RF(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T) ->
+           eval_named_fun([A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T],
+                          RF, Info) end;
+        _Other ->
+            erlang:raise(error, {'argument_limit',{named_fun,Line,Name,Cs}},
+                         stacktrace())
+    end,
+    ret_expr(F, Bs, RBs);
 expr({call,_,{remote,_,{atom,_,qlc},{atom,_,q}},[{lc,_,_E,_Qs}=LC | As0]}, 
      Bs0, Lf, Ef, RBs) when length(As0) =< 1 ->
     %% No expansion or evaluation of module name or function name.
@@ -534,7 +601,7 @@ do_apply(Func, As, Bs0, Ef, RBs) ->
                   no_env
           end,
     case {Env,Ef} of
-        {{env,[FBs, FEf, FLf, FCs]},_} ->
+        {{env,[{FBs,FLf,FEf,FCs}]},_} ->
             %% If we are evaluting within another function body 
             %% (RBs =/= none), we return RBs when this function body
             %% has been evalutated, otherwise we return Bs0, the
@@ -549,6 +616,17 @@ do_apply(Func, As, Bs0, Ef, RBs) ->
                 _ ->
                     erlang:raise(error, {badarity,{Func,As}},stacktrace())
             end;
+        {{env,[{FBs,FLf,FEf,FCs,FName}]},_} ->
+            NRBs = if
+                       RBs =:= none -> Bs0;
+                       true -> RBs
+                   end,
+            case {erlang:fun_info(Func, arity), length(As)} of
+                {{arity, Arity}, Arity} ->
+                    eval_named_fun(FCs, As, FBs, FLf, FEf, FName, Func, NRBs);
+                _ ->
+                    erlang:raise(error, {badarity,{Func,As}},stacktrace())
+            end;
         {no_env,none} when RBs =:= value ->
             %% Make tail recursive calls when possible.
             apply(Func, As);
@@ -663,6 +741,24 @@ eval_filter(F, Bs0, Lf, Ef, CompFun, Acc) ->
 	    end
     end.
 
+%% eval_map_fields([Field], Bindings, LocalFunctionHandler,
+%%                 ExternalFuncHandler) ->
+%%  {[{map_assoc | map_exact,Key,Value}],Bindings}
+
+eval_map_fields(Fs, Bs, Lf, Ef) ->
+    eval_map_fields(Fs, Bs, Lf, Ef, []).
+
+eval_map_fields([{map_field_assoc,_,K0,V0}|Fs], Bs0, Lf, Ef, Acc) ->
+    {value,K1,Bs1} = expr(K0, Bs0, Lf, Ef, none),
+    {value,V1,Bs2} = expr(V0, Bs1, Lf, Ef, none),
+    eval_map_fields(Fs, Bs2, Lf, Ef, [{map_assoc,K1,V1}|Acc]);
+eval_map_fields([{map_field_exact,_,K0,V0}|Fs], Bs0, Lf, Ef, Acc) ->
+    {value,K1,Bs1} = expr(K0, Bs0, Lf, Ef, none),
+    {value,V1,Bs2} = expr(V0, Bs1, Lf, Ef, none),
+    eval_map_fields(Fs, Bs2, Lf, Ef, [{map_exact,K1,V1}|Acc]);
+eval_map_fields([], Bs, _Lf, _Ef, Acc) ->
+    {lists:reverse(Acc),Bs}.
+
 
 %% RBs is the bindings to return when the evalution of a function
 %% (fun) has finished. If RBs =:= none, then the evalution took place
@@ -676,12 +772,12 @@ ret_expr(V, Bs, none) ->
 ret_expr(V, _Bs, RBs) when is_list(RBs) ->
     {value,V,RBs}.
 
-%% eval_fun(Clauses, Arguments, Bindings, LocalFunctionHandler, 
-%%          ExternalFunctionHandler) -> Value
+%% eval_fun(Arguments, {Bindings,LocalFunctionHandler,
+%%                      ExternalFunctionHandler,Clauses}) -> Value
 %% This function is called when the fun is called from compiled code
 %% or from apply.
 
-eval_fun(Cs, As, Bs0, Lf, Ef) ->
+eval_fun(As, {Bs0,Lf,Ef,Cs}) ->
     eval_fun(Cs, As, Bs0, Lf, Ef, value).
 
 eval_fun([{clause,_,H,G,B}|Cs], As, Bs0, Lf, Ef, RBs) ->
@@ -699,6 +795,27 @@ eval_fun([], As, _Bs, _Lf, _Ef, _RBs) ->
     erlang:raise(error, function_clause, 
 		 [{?MODULE,'-inside-an-interpreted-fun-',As}|stacktrace()]).
 
+
+eval_named_fun(As, Fun, {Bs0,Lf,Ef,Cs,Name}) ->
+    eval_named_fun(Cs, As, Bs0, Lf, Ef, Name, Fun, value).
+
+eval_named_fun([{clause,_,H,G,B}|Cs], As, Bs0, Lf, Ef, Name, Fun, RBs) ->
+    Bs1 = add_binding(Name, Fun, Bs0),
+    case match_list(H, As, new_bindings(), Bs1) of
+        {match,Bsn} ->                      % The new bindings for the head
+            Bs2 = add_bindings(Bsn, Bs1),   % which then shadow!
+            case guard(G, Bs2, Lf, Ef) of
+                true -> exprs(B, Bs2, Lf, Ef, RBs);
+                false -> eval_named_fun(Cs, As, Bs0, Lf, Ef, Name, Fun, RBs)
+            end;
+        nomatch ->
+            eval_named_fun(Cs, As, Bs0, Lf, Ef, Name, Fun, RBs)
+    end;
+eval_named_fun([], As, _Bs, _Lf, _Ef, _Name, _Fun, _RBs) ->
+    erlang:raise(error, function_clause,
+                 [{?MODULE,'-inside-an-interpreted-fun-',As}|stacktrace()]).
+
+
 %% expr_list(ExpressionList, Bindings)
 %% expr_list(ExpressionList, Bindings, LocalFuncHandler)
 %% expr_list(ExpressionList, Bindings, LocalFuncHandler, ExternalFuncHandler)
@@ -889,12 +1006,16 @@ guard0([], _Bs, _Lf, _Ef) -> true.
 guard_test({call,L,{atom,Ln,F},As0}, Bs0, Lf, Ef) ->
     TT = type_test(F),
     G = {call,L,{atom,Ln,TT},As0},
-    try {value,true,_} = expr(G, Bs0, Lf, Ef, none)
-    catch error:_ -> {value,false,Bs0} end;
-guard_test({call,L,{remote,_Lr,{atom,_Lm,erlang},{atom,_Lf,_F}=T},As0}, 
+    expr_guard_test(G, Bs0, Lf, Ef);
+guard_test({call,L,{remote,Lr,{atom,Lm,erlang},{atom,Lf,F}},As0},
            Bs0, Lf, Ef) ->
-    guard_test({call,L,T,As0}, Bs0, Lf, Ef);
+    TT = type_test(F),
+    G = {call,L,{remote,Lr,{atom,Lm,erlang},{atom,Lf,TT}},As0},
+    expr_guard_test(G, Bs0, Lf, Ef);
 guard_test(G, Bs0, Lf, Ef) ->
+    expr_guard_test(G, Bs0, Lf, Ef).
+
+expr_guard_test(G, Bs0, Lf, Ef) ->
     try {value,true,_} = expr(G, Bs0, Lf, Ef, none)
     catch error:_ -> {value,false,Bs0} end.
     
@@ -910,9 +1031,10 @@ type_test(port) -> is_port;
 type_test(function) -> is_function;
 type_test(binary) -> is_binary;
 type_test(record) -> is_record;
+type_test(map) -> is_map;
 type_test(Test) -> Test.
 
-
+
 %% match(Pattern, Term, Bindings) ->
 %%	{match,NewBindings} | nomatch
 %%      or erlang:error({illegal_pattern, Pattern}).
@@ -991,6 +1113,9 @@ match1({tuple,_,Elts}, Tuple, Bs, BBs)
     match_tuple(Elts, Tuple, 1, Bs, BBs);
 match1({tuple,_,_}, _, _Bs, _BBs) ->
     throw(nomatch);
+match1({map,_,Fs}, Map, Bs, BBs) ->
+    match_map(Fs, Map, Bs, BBs);
+
 match1({bin, _, Fs}, <<_/bitstring>>=B, Bs0, BBs) ->
     eval_bits:match_bits(Fs, B, Bs0, BBs,
 			 match_fun(BBs),
@@ -1034,6 +1159,18 @@ match_tuple([E|Es], Tuple, I, Bs0, BBs) ->
 match_tuple([], _, _, Bs, _BBs) ->
     {match,Bs}.
 
+match_map([{map_field_exact, _, K, V}|Fs], Map, Bs0, BBs) ->
+    Vm = try
+	{value, Ke, _} = expr(K, new_bindings()),
+	maps:get(Ke,Map)
+    catch error:_ ->
+	throw(nomatch)
+    end,
+    {match, Bs} = match1(V, Vm, Bs0, BBs),
+    match_map(Fs, Map, Bs, BBs);
+match_map([], _, Bs, _) ->
+    {match, Bs}.
+
 %% match_list(PatternList, TermList, Bindings) ->
 %%	{match,NewBindings} | nomatch
 %%  Try to match a list of patterns against a list of terms with the
@@ -1051,7 +1188,7 @@ match_list([], [], Bs, _BBs) ->
     {match,Bs};
 match_list(_, _, _Bs, _BBs) ->
     nomatch.
-
+
 %% new_bindings()
 %% bindings(Bindings)
 %% binding(Name, Bindings)
diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index d05f630d8e..f53c6e1278 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -132,6 +132,13 @@ pattern({cons,Line,H,T}, St0) ->
 pattern({tuple,Line,Ps}, St0) ->
     {TPs,St1} = pattern_list(Ps, St0),
     {{tuple,Line,TPs},St1};
+pattern({map,Line,Ps}, St0) ->
+    {TPs,St1} = pattern_list(Ps, St0),
+    {{map,Line,TPs},St1};
+pattern({map_field_exact,Line,Key0,V0}, St0) ->
+    {Key,St1} = pattern(Key0, St0),
+    {V,St2} = pattern(V0, St1),
+    {{map_field_exact,Line,Key,V},St2};
 %%pattern({struct,Line,Tag,Ps}, St0) ->
 %%    {TPs,TPsvs,St1} = pattern_list(Ps, St0),
 %%    {{struct,Line,Tag,TPs},TPsvs,St1};
@@ -301,6 +308,21 @@ expr({bc,Line,E0,Qs0}, St0) ->
 expr({tuple,Line,Es0}, St0) ->
     {Es1,St1} = expr_list(Es0, St0),
     {{tuple,Line,Es1},St1};
+expr({map,Line,Es0}, St0) ->
+    {Es1,St1} = expr_list(Es0, St0),
+    {{map,Line,Es1},St1};
+expr({map,Line,Arg0,Es0}, St0) ->
+    {Arg1,St1} = expr(Arg0, St0),
+    {Es1,St2} = expr_list(Es0, St1),
+    {{map,Line,Arg1,Es1},St2};
+expr({map_field_assoc,Line,K0,V0}, St0) ->
+    {K,St1} = expr(K0, St0),
+    {V,St2} = expr(V0, St1),
+    {{map_field_assoc,Line,K,V},St2};
+expr({map_field_exact,Line,K0,V0}, St0) ->
+    {K,St1} = expr(K0, St0),
+    {V,St2} = expr(V0, St1),
+    {{map_field_exact,Line,K,V},St2};
 %%expr({struct,Line,Tag,Es0}, Vs, St0) ->
 %%    {Es1,Esvs,Esus,St1} = expr_list(Es0, Vs, St0),
 %%    {{struct,Line,Tag,Es1},Esvs,Esus,St1};
@@ -344,6 +366,9 @@ expr({'fun',_,{function,_M,_F,_A}}=Fun, St) ->
 expr({'fun',Line,{clauses,Cs0}}, St0) ->
     {Cs,St1} = clauses(Cs0, St0),
     {{'fun',Line,{clauses,Cs}},St1};
+expr({named_fun,Line,Name,Cs0}, St0) ->
+    {Cs,St1} = clauses(Cs0, St0),
+    {{named_fun,Line,Name,Cs},St1};
 expr({call,Line,{atom,_,is_record},[A,{atom,_,Name}]}, St) ->
     record_test(Line, A, Name, St);
 expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,is_record}},
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 378e629ac9..edfb097de0 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -70,6 +70,7 @@ guard_bif(bit_size, 1) -> true;
 guard_bif(byte_size, 1) -> true;
 guard_bif(element, 2) -> true;
 guard_bif(self, 0) -> true;
+guard_bif(map_size, 1) -> true;
 guard_bif(node, 0) -> true;
 guard_bif(node, 1) -> true;
 guard_bif(tuple_size, 1) -> true;
@@ -82,6 +83,7 @@ guard_bif(is_function, 1) -> true;
 guard_bif(is_function, 2) -> true;
 guard_bif(is_integer, 1) -> true;
 guard_bif(is_list, 1) -> true;
+guard_bif(is_map, 1) -> true;
 guard_bif(is_number, 1) -> true;
 guard_bif(is_pid, 1) -> true;
 guard_bif(is_port, 1) -> true;
@@ -113,6 +115,7 @@ new_type_test(is_function, 1) -> true;
 new_type_test(is_function, 2) -> true;
 new_type_test(is_integer, 1) -> true;
 new_type_test(is_list, 1) -> true;
+new_type_test(is_map, 1) -> true;
 new_type_test(is_number, 1) -> true;
 new_type_test(is_pid, 1) -> true;
 new_type_test(is_port, 1) -> true;
@@ -267,6 +270,7 @@ bif(bitstring_to_list, 1) -> true;
 bif(byte_size, 1) -> true;
 bif(check_old_code, 1) -> true;
 bif(check_process_code, 2) -> true;
+bif(check_process_code, 3) -> true;
 bif(date, 0) -> true;
 bif(delete_module, 1) -> true;
 bif(demonitor, 1) -> true;
@@ -286,6 +290,7 @@ bif(float_to_binary, 1) -> true;
 bif(float_to_binary, 2) -> true;
 bif(garbage_collect, 0) -> true;
 bif(garbage_collect, 1) -> true;
+bif(garbage_collect, 2) -> true;
 bif(get, 0) -> true;
 bif(get, 1) -> true;
 bif(get_keys, 1) -> true;
@@ -313,6 +318,7 @@ bif(is_function, 1) -> true;
 bif(is_function, 2) -> true;
 bif(is_integer, 1) -> true;
 bif(is_list, 1) -> true;
+bif(is_map, 1) -> true;
 bif(is_number, 1) -> true;
 bif(is_pid, 1) -> true;
 bif(is_port, 1) -> true;
@@ -333,6 +339,7 @@ bif(list_to_pid, 1) -> true;
 bif(list_to_tuple, 1) -> true;
 bif(load_module, 2) -> true;
 bif(make_ref, 0) -> true;
+bif(map_size,1) -> true;
 bif(max,2) -> true;
 bif(min,2) -> true;
 bif(module_loaded, 1) -> true;
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 08b8541014..9f5be2da37 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,8 +85,8 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
 -record(usage, {
           calls = dict:new(),			%Who calls who
           imported = [],                        %Actually imported functions
-          used_records=sets:new() :: set(),	%Used record definitions
-	  used_types = dict:new() :: dict()	%Used type definitions
+          used_records=sets:new() :: sets:set(),%Used record definitions
+	  used_types = dict:new() :: dict:dict()%Used type definitions
          }).
 
 %% Define the lint state record.
@@ -95,13 +95,13 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
 -record(lint, {state=start		:: 'start' | 'attribute' | 'function',
                module=[],                       %Module
                behaviour=[],                    %Behaviour
-               exports=gb_sets:empty()	:: gb_set(),	%Exports
+               exports=gb_sets:empty()	:: gb_sets:set(),%Exports
                imports=[],                      %Imports
                compile=[],                      %Compile flags
-               records=dict:new()	:: dict(),	%Record definitions
-               locals=gb_sets:empty()	:: gb_set(),	%All defined functions (prescanned)
-	       no_auto=gb_sets:empty()	:: gb_set(),	%Functions explicitly not autoimported
-               defined=gb_sets:empty()	:: gb_set(),	%Defined fuctions
+               records=dict:new()	:: dict:dict(),	%Record definitions
+               locals=gb_sets:empty()	:: gb_sets:set(),%All defined functions (prescanned)
+	       no_auto=gb_sets:empty()	:: gb_sets:set() | 'all',%Functions explicitly not autoimported
+               defined=gb_sets:empty()	:: gb_sets:set(),%Defined fuctions
 	       on_load=[] :: [fa()],		%On-load function
 	       on_load_line=0 :: line(),	%Line for on_load
 	       clashes=[],			%Exported functions named as BIFs
@@ -118,10 +118,10 @@ value_option(Flag, Default, On, OnVal, Off, OffVal, Opts) ->
                new = false :: boolean(),	%Has user-defined 'new/N'
                called= [] :: [{fa(),line()}],		%Called functions
                usage = #usage{}		:: #usage{},
-	       specs = dict:new()	:: dict(),	%Type specifications
-	       callbacks = dict:new()   :: dict(),      %Callback types
-	       types = dict:new()	:: dict(),	%Type definitions
-	       exp_types=gb_sets:empty():: gb_set()	%Exported types
+	       specs = dict:new()	:: dict:dict(),	%Type specifications
+	       callbacks = dict:new()   :: dict:dict(), %Callback types
+	       types = dict:new()	:: dict:dict(),	%Type definitions
+	       exp_types=gb_sets:empty():: gb_sets:set()%Exported types
               }).
 
 -type lint_state() :: #lint{}.
@@ -225,6 +225,8 @@ format_error({too_many_arguments,Arity}) ->
 		  "maximum allowed is ~w", [Arity,?MAX_ARGUMENTS]);
 %% --- patterns and guards ---
 format_error(illegal_pattern) -> "illegal pattern";
+format_error({illegal_map_key_variable,K}) ->
+    io_lib:format("illegal use of variable ~w in map",[K]);
 format_error(illegal_bin_pattern) ->
     "binary patterns cannot be matched in parallel using '='";
 format_error(illegal_expr) -> "illegal expression";
@@ -232,6 +234,9 @@ 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";
+%% --- maps ---
+format_error(illegal_map_construction) ->
+    "only association operators '=>' are allowed in map construction";
 %% --- records ---
 format_error({undefined_record,T}) ->
     io_lib:format("record ~w undefined", [T]);
@@ -281,6 +286,8 @@ format_error(utf_bittype_size_or_unit) ->
     "neither size nor unit must be given for segments of type utf8/utf16/utf32";
 format_error({bad_bitsize,Type}) ->
     io_lib:format("bad ~s bit size", [Type]);
+format_error(unsized_binary_in_bin_gen_pattern) ->
+    "binary fields without size are not allowed in patterns of bit string generators";
 %% --- behaviours ---
 format_error({conflicting_behaviours,{Name,Arity},B,FirstL,FirstB}) ->
     io_lib:format("conflicting behaviours - callback ~w/~w required by both '~p' "
@@ -337,9 +344,10 @@ format_error(spec_wrong_arity) ->
     "spec has the wrong arity";
 format_error(callback_wrong_arity) ->
     "callback has the 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({deprecated_type, {Name, Arity}, {Mod, NewName}, Rel}) ->
+    io_lib:format("type ~w/~w is deprecated and will be "
+                  "removed in ~s; use ~w:~w/~w",
+                  [Name, Arity, Rel, Mod, NewName, Arity]);
 format_error({not_exported_opaque, {TypeName, Arity}}) ->
     io_lib:format("opaque type ~w~s is not exported",
                   [TypeName, gen_type_paren(Arity)]);
@@ -842,8 +850,9 @@ behaviour_callbacks(Line, B, St0) ->
             {[], St1}
     end.
 
-behaviour_missing_callbacks([{{Line,B},Bfs}|T], #lint{exports=Exp}=St0) ->
-    Missing = ordsets:subtract(ordsets:from_list(Bfs), gb_sets:to_list(Exp)),
+behaviour_missing_callbacks([{{Line,B},Bfs}|T], St0) ->
+    Exports = gb_sets:to_list(exports(St0)),
+    Missing = ordsets:subtract(ordsets:from_list(Bfs), Exports),
     St = foldl(fun (F, S0) ->
 		       add_warning(Line, {undefined_behaviour_func,F,B}, S0)
 	       end, St0, Missing),
@@ -1147,6 +1156,14 @@ export_type(Line, ETs, #lint{usage = Usage, exp_types = ETs0} = St0) ->
 	    add_error(Line, {bad_export_type, ETs}, St0)
     end.
 
+-spec exports(lint_state()) -> gb_sets:set().
+
+exports(#lint{compile = Opts, defined = Defs, exports = Es}) ->
+    case lists:member(export_all, Opts) of
+        true -> Defs;
+        false -> Es
+    end.
+
 -type import() :: {module(), [fa()]} | module().
 -spec import(line(), import(), lint_state()) -> lint_state().
 
@@ -1355,6 +1372,19 @@ pattern({cons,_Line,H,T}, Vt, Old,  Bvt, St0) ->
     {vtmerge_pat(Hvt, Tvt),vtmerge_pat(Bvt1,Bvt2),St2};
 pattern({tuple,_Line,Ps}, Vt, Old, Bvt, St) ->
     pattern_list(Ps, Vt, Old, Bvt, St);
+pattern({map,_Line,Ps}, Vt, Old, Bvt, St) ->
+    pattern_list(Ps, Vt, Old, Bvt, St);
+pattern({map_field_assoc,Line,_,_}, _, _, _, St) ->
+    {[],[],add_error(Line, illegal_pattern, St)};
+pattern({map_field_exact,Line,KP,VP}, Vt, Old, Bvt0, St0) ->
+    %% if the key pattern has variables we should fail
+    case expr(KP,[],St0) of
+	{[],_} ->
+	    pattern(VP, Vt, Old, Bvt0, St0);
+	{[Var|_],_} ->
+	    %% found variables in key expression
+	    {Vt,Old,add_error(Line,{illegal_map_key_variable,element(1,Var)},St0)}
+    end;
 %%pattern({struct,_Line,_Tag,Ps}, Vt, Old, Bvt, St) ->
 %%    pattern_list(Ps, Vt, Old, Bvt, St);
 pattern({record_index,Line,Name,Field}, _Vt, _Old, _Bvt, St) ->
@@ -1742,6 +1772,14 @@ gexpr({cons,_Line,H,T}, Vt, St) ->
     gexpr_list([H,T], Vt, St);
 gexpr({tuple,_Line,Es}, Vt, St) ->
     gexpr_list(Es, Vt, St);
+gexpr({map,_Line,Es}, Vt, St) ->
+    gexpr_list(Es, Vt, St);
+gexpr({map,_Line,Src,Es}, Vt, St) ->
+    gexpr_list([Src|Es], Vt, St);
+gexpr({map_field_assoc,_Line,K,V}, Vt, St) ->
+    gexpr_list([K,V], Vt, St);
+gexpr({map_field_exact,_Line,K,V}, Vt, St) ->
+    gexpr_list([K,V], Vt, St);
 gexpr({record_index,Line,Name,Field}, _Vt, St) ->
     check_record(Line, Name, St,
                  fun (Dfs, St1) -> record_field(Field, Name, Dfs, St1) end );
@@ -1851,7 +1889,7 @@ is_guard_test(Expression, Forms) ->
                 end, start(), RecordAttributes),
     is_guard_test2(zip_file_and_line(Expression, "nofile"), St0#lint.records).
 
-%% is_guard_test2(Expression, RecordDefs :: dict()) -> boolean().
+%% is_guard_test2(Expression, RecordDefs :: dict:dict()) -> boolean().
 is_guard_test2({call,Line,{atom,Lr,record},[E,A]}, RDs) ->
     is_gexpr({call,Line,{atom,Lr,is_record},[E,A]}, RDs);
 is_guard_test2({call,_Line,{atom,_La,Test},As}=Call, RDs) ->
@@ -1953,14 +1991,30 @@ expr({string,_Line,_S}, _Vt, St) -> {[],St};
 expr({nil,_Line}, _Vt, St) -> {[],St};
 expr({cons,_Line,H,T}, Vt, St) ->
     expr_list([H,T], Vt, St);
-expr({lc,_Line,E,Qs}, Vt0, St0) ->
-    {Vt,St} = handle_comprehension(E, Qs, Vt0, St0),
-    {vtold(Vt, Vt0),St};                      %Don't export local variables
-expr({bc,_Line,E,Qs}, Vt0, St0) ->
-    {Vt,St} = handle_comprehension(E, Qs, Vt0, St0),
-    {vtold(Vt,Vt0),St};			 %Don't export local variables
+expr({lc,_Line,E,Qs}, Vt, St) ->
+    handle_comprehension(E, Qs, Vt, St);
+expr({bc,_Line,E,Qs}, Vt, St) ->
+    handle_comprehension(E, Qs, Vt, St);
 expr({tuple,_Line,Es}, Vt, St) ->
     expr_list(Es, Vt, St);
+expr({map,Line,Es}, Vt, St) ->
+    {Rvt,St1} = expr_list(Es,Vt,St),
+    case is_valid_map_construction(Es) of
+	true  -> {Rvt,St1};
+	false -> {[],add_error(Line,illegal_map_construction,St1)}
+    end;
+expr({map,_Line,Src,Es}, Vt, St) ->
+    expr_list([Src|Es], Vt, St);
+expr({map_field_assoc,Line,K,V}, Vt, St) ->
+    case is_valid_map_key(K,St) of
+	true  -> expr_list([K,V], Vt, St);
+	{false,Var} -> {[],add_error(Line,{illegal_map_key_variable,Var},St)}
+    end;
+expr({map_field_exact,Line,K,V}, Vt, St) ->
+    case is_valid_map_key(K,St) of
+	true  -> expr_list([K,V], Vt, St);
+	{false,Var} -> {[],add_error(Line,{illegal_map_key_variable,Var},St)}
+    end;
 expr({record_index,Line,Name,Field}, _Vt, St) ->
     check_record(Line, Name, St,
                  fun (Dfs, St1) -> record_field(Field, Name, Dfs, St1) end);
@@ -2012,8 +2066,7 @@ expr({'fun',Line,Body}, Vt, St) ->
     %%No one can think funs export!
     case Body of
         {clauses,Cs} ->
-            {Bvt, St1} = fun_clauses(Cs, Vt, St),
-            {vtupdate(Bvt, Vt), St1};
+            fun_clauses(Cs, Vt, St);
         {function,F,A} ->
 	    %% BifClash - Fun expression
             %% N.B. Only allows BIFs here as well, NO IMPORTS!!
@@ -2031,6 +2084,15 @@ expr({'fun',Line,Body}, Vt, St) ->
 	    {Bvt, St1} = expr_list([M,F,A], Vt, St),
 	    {vtupdate(Bvt, Vt),St1}
     end;
+expr({named_fun,_,'_',Cs}, Vt, St) ->
+    fun_clauses(Cs, Vt, St);
+expr({named_fun,Line,Name,Cs}, Vt, St0) ->
+    Nvt0 = [{Name,{bound,unused,[Line]}}],
+    St1 = shadow_vars(Nvt0, Vt, 'named fun', St0),
+    Nvt1 = vtupdate(vtsubtract(Vt, Nvt0), Nvt0),
+    {Csvt,St2} = fun_clauses(Cs, Nvt1, St1),
+    {_,St3} = check_unused_vars(vtupdate(Csvt, Nvt0), [], St2),
+    {vtold(Csvt, Vt),St3};
 expr({call,_Line,{atom,_Lr,is_record},[E,{atom,Ln,Name}]}, Vt, St0) ->
     {Rvt,St1} = expr(E, Vt, St0),
     {Rvt,exist_record(Ln, Name, St1)};
@@ -2111,12 +2173,12 @@ expr({'try',Line,Es,Scs,Ccs,As}, Vt, St0) ->
     {Evt0,St1} = exprs(Es, Vt, St0),
     TryLine = {'try',Line},
     Uvt = vtunsafe(vtnames(vtnew(Evt0, Vt)), TryLine, []),
-    Evt1 = vtupdate(Uvt, vtupdate(Evt0, Vt)),
-    {Sccs,St2} = icrt_clauses(Scs++Ccs, TryLine, Evt1, St1),
+    Evt1 = vtupdate(Uvt, vtsubtract(Evt0, Uvt)),
+    {Sccs,St2} = icrt_clauses(Scs++Ccs, TryLine, vtupdate(Evt1, Vt), St1),
     Rvt0 = Sccs,
     Rvt1 = vtupdate(vtunsafe(vtnames(vtnew(Rvt0, Vt)), TryLine, []), Rvt0),
     Evt2 = vtmerge(Evt1, Rvt1),
-    {Avt0,St} = exprs(As, Evt2, St2),
+    {Avt0,St} = exprs(As, vtupdate(Evt2, Vt), St2),
     Avt1 = vtupdate(vtunsafe(vtnames(vtnew(Avt0, Vt)), TryLine, []), Avt0),
     Avt = vtmerge(Evt2, Avt1),
     {Avt,St};
@@ -2150,10 +2212,11 @@ expr({remote,Line,_M,_F}, _Vt, St) ->
 %%      {UsedVarTable,State}
 
 expr_list(Es, Vt, St) ->
-    foldl(fun (E, {Esvt,St0}) ->
-                  {Evt,St1} = expr(E, Vt, St0),
-                  {vtmerge(Evt, Esvt),St1}
-          end, {[],St}, Es).
+    {Vt1,St1} = foldl(fun (E, {Esvt,St0}) ->
+                              {Evt,St1} = expr(E, Vt, St0),
+                              {vtmerge_pat(Evt, Esvt),St1}
+                      end, {[],St}, Es),
+    {vtmerge(vtnew(Vt1, Vt), vtold(Vt1, Vt)),St1}.
 
 record_expr(Line, Rec, Vt, St0) ->
     St1 = warn_invalid_record(Line, Rec, St0),
@@ -2182,6 +2245,7 @@ is_valid_record(Rec) ->
         {lc, _, _, _} -> false;
         {record_index, _, _, _} -> false;
         {'fun', _, _} -> false;
+        {named_fun, _, _, _} -> false;
         _ -> true
     end.
 
@@ -2210,6 +2274,20 @@ is_valid_call(Call) ->
         _ -> true
     end.
 
+%% check_map_construction
+%% Only #{ K => V }, i.e. assoc is a valid construction
+is_valid_map_construction([{map_field_assoc,_,_,_}|Es]) ->
+    is_valid_map_construction(Es);
+is_valid_map_construction([]) -> true;
+is_valid_map_construction(_)  -> false.
+
+is_valid_map_key(K,St) ->
+    case expr(K,[],St) of
+	{[],_} -> true;
+	{[Var|_],_} ->
+	    {false,element(1,Var)}
+    end.
+
 %% record_def(Line, RecordName, [RecField], State) -> State.
 %%  Add a record definition if it does not already exist. Normalise
 %%  so that all fields have explicit initial value.
@@ -2310,7 +2388,7 @@ check_fields(Fs, Name, Fields, Vt, St0, CheckFun) ->
 check_field({record_field,Lf,{atom,La,F},Val}, Name, Fields,
             Vt, St, Sfs, CheckFun) ->
     case member(F, Sfs) of
-        true -> {Sfs,{Vt,add_error(Lf, {redefine_field,Name,F}, St)}};
+        true -> {Sfs,{[],add_error(Lf, {redefine_field,Name,F}, St)}};
         false ->
             {[F|Sfs],
              case find_field(F, Fields) of
@@ -2489,18 +2567,12 @@ check_type({paren_type, _L, [Type]}, SeenVars, St) ->
     check_type(Type, SeenVars, St);
 check_type({remote_type, L, [{atom, _, Mod}, {atom, _, Name}, Args]},
 	   SeenVars, #lint{module=CurrentMod} = St) ->
-    St1 =
-	case is_default_type({Name, length(Args)})
-	      orelse is_var_arity_type(Name) of
-	    true -> add_error(L, {imported_predefined_type, Name}, St);
-	    false -> St
-	end,
     case Mod =:= CurrentMod of
-	true -> check_type({type, L, Name, Args}, SeenVars, St1);
+	true -> check_type({type, L, Name, Args}, SeenVars, St);
 	false ->
 	    lists:foldl(fun(T, {AccSeenVars, AccSt}) ->
 				check_type(T, AccSeenVars, AccSt)
-			end, {SeenVars, St1}, Args)
+			end, {SeenVars, St}, Args)
     end;
 check_type({integer, _L, _}, SeenVars, St) -> {SeenVars, St};
 check_type({atom, _L, _}, SeenVars, St) -> {SeenVars, St};
@@ -2530,6 +2602,13 @@ check_type({type, L, range, [From, To]}, SeenVars, St) ->
 	    _ -> add_error(L, {type_syntax, range}, St)
 	end,
     {SeenVars, St1};
+check_type({type, _L, map, any}, SeenVars, St) -> {SeenVars, St};
+check_type({type, _L, map, Pairs}, SeenVars, St) ->
+    lists:foldl(fun(Pair, {AccSeenVars, AccSt}) ->
+			check_type(Pair, AccSeenVars, AccSt)
+		end, {SeenVars, St}, Pairs);
+check_type({type, _L, map_field_assoc, Dom, Range}, SeenVars, St) ->
+    check_type({type, -1, product, [Dom, Range]}, SeenVars, St);
 check_type({type, _L, tuple, any}, SeenVars, St) -> {SeenVars, St};
 check_type({type, _L, any}, SeenVars, St) -> {SeenVars, St};
 check_type({type, L, binary, [Base, Unit]}, SeenVars, St) ->
@@ -2551,14 +2630,33 @@ check_type({type, _L, product, Args}, SeenVars, St) ->
     lists:foldl(fun(T, {AccSeenVars, AccSt}) ->
 			check_type(T, AccSeenVars, AccSt)
 		end, {SeenVars, St}, Args);
-check_type({type, La, TypeName, Args}, SeenVars, #lint{usage=Usage} = St) ->
+check_type({type, La, TypeName, Args}, SeenVars, St) ->
+    #lint{usage=Usage, module = Module, types=Types} = St,
     Arity = length(Args),
+    TypePair = {TypeName, Arity},
     St1 = case is_var_arity_type(TypeName) of
 	      true -> St;
 	      false ->
-		  OldUsed = Usage#usage.used_types,
-		  UsedTypes = dict:store({TypeName, Arity}, La, OldUsed),
-		  St#lint{usage=Usage#usage{used_types=UsedTypes}}
+                  Obsolete = obsolete_type(TypePair),
+                  IsObsolete =
+                      case Obsolete of
+                          {deprecated, {M, _}, _} when M =/= Module ->
+                              case dict:find(TypePair, Types) of
+                                  {ok, _} -> false;
+                                  error -> true
+                              end;
+                          _ -> false
+                      end,
+                  case IsObsolete of
+                      true ->
+                          {deprecated, Replacement, Rel} = Obsolete,
+                          W = {deprecated_type, TypePair, Replacement, Rel},
+                          add_warning(La, W, St);
+                      false ->
+                          OldUsed = Usage#usage.used_types,
+                          UsedTypes = dict:store(TypePair, La, OldUsed),
+                          St#lint{usage=Usage#usage{used_types=UsedTypes}}
+                  end
 	  end,
     check_type({type, -1, product, Args}, SeenVars, St1);
 check_type(I, SeenVars, St) ->
@@ -2635,6 +2733,7 @@ is_default_type({iodata, 0}) -> true;
 is_default_type({iolist, 0}) -> true;
 is_default_type({list, 0}) -> true;
 is_default_type({list, 1}) -> true;
+is_default_type({map, 0}) -> true;
 is_default_type({maybe_improper_list, 0}) -> true;
 is_default_type({maybe_improper_list, 2}) -> true;
 is_default_type({mfa, 0}) -> true;
@@ -2680,6 +2779,17 @@ is_newly_introduced_builtin_type({set, 0}) -> true; % opaque
 is_newly_introduced_builtin_type({boolean, 0}) -> true;
 is_newly_introduced_builtin_type({Name, _}) when is_atom(Name) -> false.
 
+%% Obsolete in OTP 17.0.
+obsolete_type({array, 0}) -> {deprecated, {array, array}, "OTP 18.0"};
+obsolete_type({dict, 0}) -> {deprecated, {dict, dict}, "OTP 18.0"};
+obsolete_type({digraph, 0}) -> {deprecated, {digraph, graph}, "OTP 18.0"};
+obsolete_type({gb_set, 0}) -> {deprecated, {gb_sets, set}, "OTP 18.0"};
+obsolete_type({gb_tree, 0}) -> {deprecated, {gb_trees, tree}, "OTP 18.0"};
+obsolete_type({queue, 0}) -> {deprecated, {queue, queue}, "OTP 18.0"};
+obsolete_type({set, 0}) -> {deprecated, {sets, set}, "OTP 18.0"};
+obsolete_type({tid, 0}) -> {deprecated, {ets, tid}, "OTP 18.0"};
+obsolete_type({Name, _}) when is_atom(Name) -> no.
+
 %% spec_decl(Line, Fun, Types, State) -> State.
 
 spec_decl(Line, MFA0, TypeSpecs, St0 = #lint{specs = Specs, module = Mod}) ->
@@ -2843,7 +2953,9 @@ icrt_export(Csvt, Vt, In, St) ->
     Uvt = vtmerge(Evt, Unused),
     %% Make exported and unsafe unused variables unused in subsequent code:
     Vt2 = vtmerge(Uvt, vtsubtract(Vt1, Uvt)),
-    {Vt2,St}.
+    %% Forget about old variables which were not used:
+    Vt3 = vtmerge(vtnew(Vt2, Vt), vt_no_unused(vtold(Vt2, Vt))),
+    {Vt3,St}.
 
 handle_comprehension(E, Qs, Vt0, St0) ->
     {Vt1, Uvt, St1} = lc_quals(Qs, Vt0, St0),
@@ -2856,7 +2968,11 @@ handle_comprehension(E, Qs, Vt0, St0) ->
     %% Local variables that have not been shadowed.
     {_,St} = check_unused_vars(Vt2, Vt0, St4),
     Vt3 = vtmerge(vtsubtract(Vt2, Uvt), Uvt),
-    {Vt3,St}.
+    %% Don't export local variables.
+    Vt4 = vtold(Vt3, Vt0),
+    %% Forget about old variables which were not used.
+    Vt5 = vt_no_unused(Vt4),
+    {Vt5,St}.
 
 %% lc_quals(Qualifiers, ImportVarTable, State) ->
 %%      {VarTable,ShadowedVarTable,State}
@@ -2878,7 +2994,8 @@ lc_quals([{generate,_Line,P,E} | Qs], Vt0, Uvt0, St0) ->
     {Vt,Uvt,St} = handle_generator(P,E,Vt0,Uvt0,St0),
     lc_quals(Qs, Vt, Uvt, St);
 lc_quals([{b_generate,_Line,P,E} | Qs], Vt0, Uvt0, St0) ->
-    {Vt,Uvt,St} = handle_generator(P,E,Vt0,Uvt0,St0),
+    St1 = handle_bitstring_gen_pat(P,St0),
+    {Vt,Uvt,St} = handle_generator(P,E,Vt0,Uvt0,St1),
     lc_quals(Qs, Vt, Uvt, St);
 lc_quals([F|Qs], Vt, Uvt, St0) ->
     {Fvt,St1} = case is_guard_test2(F, St0#lint.records) of
@@ -2906,6 +3023,22 @@ handle_generator(P,E,Vt,Uvt,St0) ->
     Vt3 = vtupdate(vtsubtract(Vt2, Binvt), Binvt),
     {Vt3,NUvt,St5}.
 
+handle_bitstring_gen_pat({bin,_,Segments=[_|_]},St) ->
+    case lists:last(Segments) of
+        {bin_element,Line,{var,_,_},default,Flags} when is_list(Flags) ->
+            case member(binary, Flags) orelse member(bits, Flags)
+                                       orelse member(bitstring, Flags) of
+                true ->
+                    add_error(Line, unsized_binary_in_bin_gen_pattern, St);
+                false ->
+                    St
+            end;
+        _ ->
+            St
+    end;
+handle_bitstring_gen_pat(_,St) ->
+    St.
+
 %% fun_clauses(Clauses, ImportVarTable, State) ->
 %%      {UsedVars, State}.
 %%  Fun's cannot export any variables.
@@ -2920,7 +3053,7 @@ fun_clauses(Cs, Vt, St) ->
                               {Cvt,St1} = fun_clause(C, Vt, St0),
                               {vtmerge(Cvt, Bvt0),St1}
                       end, {[],St#lint{recdef_top = false}}, Cs),
-    {Bvt,St2#lint{recdef_top = OldRecDef}}.
+    {vt_no_unused(vtold(Bvt, Vt)),St2#lint{recdef_top = OldRecDef}}.
 
 fun_clause({clause,_Line,H,G,B}, Vt0, St0) ->
     {Hvt,Binvt,St1} = head(H, Vt0, [], St0), % No imported pattern variables
@@ -3181,6 +3314,8 @@ vt_no_unsafe(Vt) -> [V || {_,{S,_U,_L}}=V <- Vt,
                               _ -> true
                           end].
 
+vt_no_unused(Vt) -> [V || {_,{_,U,_L}}=V <- Vt, U =/= unused].
+
 %% vunion(VarTable1, VarTable2) -> [VarName].
 %% vunion([VarTable]) -> [VarName].
 %% vintersection(VarTable1, VarTable2) -> [VarName].
@@ -3219,7 +3354,8 @@ modify_line(T, F0) ->
 
 %% Forms.
 modify_line1({function,F,A}, _Mf) -> {function,F,A};
-modify_line1({function,M,F,A}, _Mf) -> {function,M,F,A};
+modify_line1({function,M,F,A}, Mf) ->
+    {function,modify_line1(M, Mf),modify_line1(F, Mf),modify_line1(A, Mf)};
 modify_line1({attribute,L,record,{Name,Fields}}, Mf) ->
     {attribute,Mf(L),record,{Name,modify_line1(Fields, Mf)}};
 modify_line1({attribute,L,spec,{Fun,Types}}, Mf) ->
@@ -3537,15 +3673,22 @@ is_imported_from_erlang(ImportSet,{Func,Arity}) ->
         {ok,erlang} -> true;
         _ -> false
     end.
-%% Build set of functions where auto-import is explicitly supressed
+%% Build set of functions where auto-import is explicitly suppressed
 auto_import_suppressed(CompileFlags) ->
-    L0 = [ X || {no_auto_import,X} <- CompileFlags ],
-    L1 = [ {Y,Z} || {Y,Z} <- lists:flatten(L0), is_atom(Y), is_integer(Z) ],
-    gb_sets:from_list(L1).
-%% Predicate to find out if autoimport is explicitly supressed for a function
+    case lists:member(no_auto_import, CompileFlags) of
+        true ->
+            all;
+        false ->
+            L0 = [ X || {no_auto_import,X} <- CompileFlags ],
+            L1 = [ {Y,Z} || {Y,Z} <- lists:flatten(L0), is_atom(Y), is_integer(Z) ],
+            gb_sets:from_list(L1)
+    end.
+%% Predicate to find out if autoimport is explicitly suppressed for a function
+is_autoimport_suppressed(all,{_Func,_Arity}) ->
+    true;
 is_autoimport_suppressed(NoAutoSet,{Func,Arity}) ->
     gb_sets:is_element({Func,Arity},NoAutoSet).
-%% Predicate to find out if a function specific bif-clash supression (old deprecated) is present
+%% Predicate to find out if a function specific bif-clash suppression (old deprecated) is present
 bif_clash_specifically_disabled(St,{F,A}) ->
     Nowarn = nowarn_function(nowarn_bif_clash, St#lint.compile),
     lists:member({F,A},Nowarn).
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index 7145b0858f..6316db7054 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -34,6 +34,7 @@ binary_comprehension
 tuple
 %struct
 record_expr record_tuple record_field record_fields
+map_expr map_tuple map_field map_field_assoc map_field_exact map_fields map_key
 if_expr if_clause if_clauses case_expr cr_clause cr_clauses receive_expr
 fun_expr fun_clause fun_clauses atom_or_var integer_or_var
 try_expr try_catch try_clause try_clauses
@@ -47,6 +48,7 @@ opt_bit_size_expr bit_size_expr opt_bit_type_list bit_type_list bit_type
 top_type top_type_100 top_types type typed_expr typed_attr_val
 type_sig type_sigs type_guard type_guards fun_type fun_type_100 binary_type
 type_spec spec_fun typed_exprs typed_record_fields field_types field_type
+map_pair_types map_pair_type
 bin_base_type bin_unit_type type_200 type_300 type_400 type_500.
 
 Terminals
@@ -59,7 +61,7 @@ char integer float atom string var
 '*' '/' 'div' 'rem' 'band' 'and'
 '+' '-' 'bor' 'bxor' 'bsl' 'bsr' 'or' 'xor'
 '++' '--'
-'==' '/=' '=<' '<' '>=' '>' '=:=' '=/=' '<='
+'==' '/=' '=<' '<' '>=' '>' '=:=' '=/=' '<=' '=>' ':='
 '<<' '>>'
 '!' '=' '::' '..' '...'
 'spec' 'callback' % helper
@@ -154,6 +156,8 @@ type -> '[' ']'                           : {type, ?line('$1'), nil, []}.
 type -> '[' top_type ']'                  : {type, ?line('$1'), list, ['$2']}.
 type -> '[' top_type ',' '...' ']'        : {type, ?line('$1'),
                                              nonempty_list, ['$2']}.
+type -> '#' '{' '}'                       : {type, ?line('$1'), map, []}.
+type -> '#' '{' map_pair_types '}'        : {type, ?line('$1'), map, '$3'}.
 type -> '{' '}'                           : {type, ?line('$1'), tuple, []}.
 type -> '{' top_types '}'                 : {type, ?line('$1'), tuple, '$2'}.
 type -> '#' atom '{' '}'                  : {type, ?line('$1'), record, ['$2']}.
@@ -175,6 +179,10 @@ fun_type -> '(' top_types ')' '->' top_type
                                    : {type, ?line('$1'), 'fun',
                                       [{type, ?line('$1'), product, '$2'},'$5']}.
 
+map_pair_types -> map_pair_type                    : ['$1'].
+map_pair_types -> map_pair_type ',' map_pair_types : ['$1'|'$3'].
+map_pair_type  -> top_type '=>' top_type           : {type, ?line('$2'), map_field_assoc,'$1','$3'}.
+
 field_types -> field_type                 : ['$1'].
 field_types -> field_type ',' field_types : ['$1'|'$3'].
 
@@ -247,6 +255,7 @@ expr_500 -> expr_600 : '$1'.
 
 expr_600 -> prefix_op expr_700 :
 	?mkop1('$1', '$2').
+expr_600 -> map_expr : '$1'.
 expr_600 -> expr_700 : '$1'.
 
 expr_700 -> function_call : '$1'.
@@ -327,6 +336,30 @@ tuple -> '{' exprs '}' : {tuple,?line('$1'),'$2'}.
 %%struct -> atom tuple :
 %%	{struct,?line('$1'),element(3, '$1'),element(3, '$2')}.
 
+map_expr -> '#' map_tuple :
+	{map, ?line('$1'),'$2'}.
+map_expr -> expr_max '#' map_tuple :
+	{map, ?line('$2'),'$1','$3'}.
+map_expr -> map_expr '#' map_tuple :
+	{map, ?line('$2'),'$1','$3'}.
+
+map_tuple -> '{' '}' : [].
+map_tuple -> '{' map_fields '}' : '$2'.
+
+map_fields -> map_field : ['$1'].
+map_fields -> map_field ',' map_fields : ['$1' | '$3'].
+
+map_field -> map_field_assoc : '$1'.
+map_field -> map_field_exact : '$1'.
+
+map_field_assoc -> map_key '=>' expr :
+	{map_field_assoc,?line('$1'),'$1','$3'}.
+
+map_field_exact -> map_key ':=' expr :
+	{map_field_exact,?line('$1'),'$1','$3'}.
+
+map_key -> expr : '$1'.
+
 
 %% N.B. This is called from expr_700.
 %% N.B. Field names are returned as the complete object, even if they are
@@ -406,6 +439,9 @@ fun_clause -> argument_list clause_guard clause_body :
 	{Args,Pos} = '$1',
 	{clause,Pos,'fun',Args,'$2','$3'}.
 
+fun_clause -> var argument_list clause_guard clause_body :
+	{clause,element(2, '$1'),element(3, '$1'),element(1, '$2'),'$3','$4'}.
+
 try_expr -> 'try' exprs 'of' cr_clauses try_catch :
 	build_try(?line('$1'),'$2','$4','$5').
 try_expr -> 'try' exprs try_catch :
@@ -645,6 +681,8 @@ skip_paren(Type) ->
 
 build_gen_type({atom, La, tuple}) ->
     {type, La, tuple, any};
+build_gen_type({atom, La, map}) ->
+    {type, La, map, any};
 build_gen_type({atom, La, Name}) ->
     {type, La, Name, []}.
 
@@ -799,8 +837,15 @@ build_rule(Cs) ->
 %% build_fun(Line, [Clause]) -> {'fun',Line,{clauses,[Clause]}}.
 
 build_fun(Line, Cs) ->
+    Name = element(3, hd(Cs)),
     Arity = length(element(4, hd(Cs))),
-    {'fun',Line,{clauses,check_clauses(Cs, 'fun', Arity)}}.
+    CheckedCs = check_clauses(Cs, Name, Arity),
+    case Name of
+        'fun' ->
+            {'fun',Line,{clauses,CheckedCs}};
+        Name ->
+            {named_fun,Line,Name,CheckedCs}
+    end.
 
 check_clauses(Cs, Name, Arity) ->
      mapl(fun ({clause,L,N,As,G,B}) when N =:= Name, length(As) =:= Arity ->
@@ -850,6 +895,12 @@ normalise({cons,_,Head,Tail}) ->
     [normalise(Head)|normalise(Tail)];
 normalise({tuple,_,Args}) ->
     list_to_tuple(normalise_list(Args));
+normalise({map,_,Pairs}=M) ->
+    maps:from_list(lists:map(fun
+		%% only allow '=>'
+		({map_field_assoc,_,K,V}) -> {normalise(K),normalise(V)};
+		(_) -> erlang:error({badarg,M})
+	    end, Pairs));
 %% Special case for unary +/-.
 normalise({op,_,'+',{char,_,I}}) -> I;
 normalise({op,_,'+',{integer,_,I}}) -> I;
@@ -1050,3 +1101,5 @@ get_attribute(L, Name) ->
 
 get_attributes(L) ->
     erl_scan:attributes_info(L).
+
+%% vim: ft=erlang
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl
index 657cb5d34c..9dbe89da91 100644
--- a/lib/stdlib/src/erl_pp.erl
+++ b/lib/stdlib/src/erl_pp.erl
@@ -479,6 +479,15 @@ lexpr({record_field, _, Rec, F}, Prec, Opts) ->
     {L,P,R} = inop_prec('.'),
     El = [lexpr(Rec, L, Opts),$.,lexpr(F, R, Opts)],
     maybe_paren(P, Prec, El);
+lexpr({map, _, Fs}, Prec, Opts) ->
+    {P,_R} = preop_prec('#'),
+    El = {first,leaf("#"),map_fields(Fs, Opts)},
+    maybe_paren(P, Prec, El);
+lexpr({map, _, Map, Fs}, Prec, Opts) ->
+    {L,P,_R} = inop_prec('#'),
+    Rl = lexpr(Map, L, Opts),
+    El = {first,[Rl,leaf("#")],map_fields(Fs, Opts)},
+    maybe_paren(P, Prec, El);
 lexpr({block,_,Es}, _, Opts) ->
     {list,[{step,'begin',body(Es, Opts)},'end']};
 lexpr({'if',_,Cs}, _, Opts) ->
@@ -511,10 +520,17 @@ lexpr({'fun',_,{function,M,F,A}}, _Prec, Opts) ->
     ArityItem = lexpr(A, Opts),
     ["fun ",NameItem,$:,CallItem,$/,ArityItem];
 lexpr({'fun',_,{clauses,Cs}}, _Prec, Opts) ->
-    {list,[{first,'fun',fun_clauses(Cs, Opts)},'end']};
+    {list,[{first,'fun',fun_clauses(Cs, Opts, unnamed)},'end']};
+lexpr({named_fun,_,Name,Cs}, _Prec, Opts) ->
+    {list,[{first,['fun', " "],fun_clauses(Cs, Opts, {named, Name})},'end']};
 lexpr({'fun',_,{clauses,Cs},Extra}, _Prec, Opts) ->
     {force_nl,fun_info(Extra),
-     {list,[{first,'fun',fun_clauses(Cs, Opts)},'end']}};
+     {list,[{first,'fun',fun_clauses(Cs, Opts, unnamed)},'end']}};
+lexpr({named_fun,_,Name,Cs,Extra}, _Prec, Opts) ->
+    {force_nl,fun_info(Extra),
+     {list,[{first,['fun', " "],fun_clauses(Cs, Opts, {named, Name})},'end']}};
+lexpr({'query',_,Lc}, _Prec, Opts) ->
+    {list,[{step,leaf("query"),lexpr(Lc, 0, Opts)},'end']};
 lexpr({call,_,{remote,_,{atom,_,M},{atom,_,F}=N}=Name,Args}, Prec, Opts) ->
     case erl_internal:bif(M, F, length(Args)) of
         true ->
@@ -664,6 +680,16 @@ record_field({typed_record_field,Field,Type}, Opts) ->
 record_field({record_field,_,F}, Opts) ->
     lexpr(F, 0, Opts).
 
+map_fields(Fs, Opts) ->
+    tuple(Fs, fun map_field/2, Opts).
+
+map_field({map_field_assoc,_,K,V}, Opts) ->
+    Pl = lexpr(K, 0, Opts),
+    {list,[{step,[Pl,leaf(" =>")],lexpr(V, 0, Opts)}]};
+map_field({map_field_exact,_,K,V}, Opts) ->
+    Pl = lexpr(K, 0, Opts),
+    {list,[{step,[Pl,leaf(" :=")],lexpr(V, 0, Opts)}]}.
+
 list({cons,_,H,T}, Es, Opts) ->
     list(T, [H|Es], Opts);
 list({nil,_}, Es, Opts) ->
@@ -729,8 +755,13 @@ stack_backtrace(S, El, Opts) ->
 %% fun_clauses(Clauses, Opts) -> [Char].
 %%  Print 'fun' clauses.
 
-fun_clauses(Cs, Opts) ->
-    nl_clauses(fun fun_clause/2, [$;], Opts, Cs).
+fun_clauses(Cs, Opts, unnamed) ->
+    nl_clauses(fun fun_clause/2, [$;], Opts, Cs);
+fun_clauses(Cs, Opts, {named, Name}) ->
+    nl_clauses(fun (C, H) ->
+                       {step,Gl,Bl} = fun_clause(C, H),
+                       {step,[atom_to_list(Name),Gl],Bl}
+               end, [$;], Opts, Cs).
 
 fun_clause({clause,_,A,G,B}, Opts) ->
     El = args(A, Opts),
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index d988a4d8c7..ae59d5f44f 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -570,7 +569,7 @@ scan1("++"++Cs, St, Line, Col, Toks) ->
     tok2(Cs, St, Line, Col, Toks, "++", '++', 2);
 scan1("+"=Cs, _St, Line, Col, Toks) ->
     {more,{Cs,Col,Toks,Line,[],fun scan/6}};
-%% =:= =/= =< ==
+%% =:= =/= =< == =>
 scan1("=:="++Cs, St, Line, Col, Toks) ->
     tok2(Cs, St, Line, Col, Toks, "=:=", '=:=', 3);
 scan1("=:"=Cs, _St, Line, Col, Toks) ->
@@ -581,6 +580,8 @@ scan1("=/"=Cs, _St, Line, Col, Toks) ->
     {more,{Cs,Col,Toks,Line,[],fun scan/6}};
 scan1("=<"++Cs, St, Line, Col, Toks) ->
     tok2(Cs, St, Line, Col, Toks, "=<", '=<', 2);
+scan1("=>"++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, "=>", '=>', 2);
 scan1("=="++Cs, St, Line, Col, Toks) ->
     tok2(Cs, St, Line, Col, Toks, "==", '==', 2);
 scan1("="=Cs, _St, Line, Col, Toks) ->
@@ -595,6 +596,9 @@ scan1("||"++Cs, St, Line, Col, Toks) ->
     tok2(Cs, St, Line, Col, Toks, "||", '||', 2);
 scan1("|"=Cs, _St, Line, Col, Toks) ->
     {more,{Cs,Col,Toks,Line,[],fun scan/6}};
+%% :=
+scan1(":="++Cs, St, Line, Col, Toks) ->
+    tok2(Cs, St, Line, Col, Toks, ":=", ':=', 2);
 %% :-
 scan1(":-"++Cs, St, Line, Col, Toks) ->
     tok2(Cs, St, Line, Col, Toks, ":-", ':-', 2);
diff --git a/lib/stdlib/src/erl_tar.erl b/lib/stdlib/src/erl_tar.erl
index 4b654833ed..40b48d7999 100644
--- a/lib/stdlib/src/erl_tar.erl
+++ b/lib/stdlib/src/erl_tar.erl
@@ -45,10 +45,7 @@ open(Name, Mode) ->
 open1({binary,Bin}, read, _Raw, Opts) ->
     case file:open(Bin, [ram,binary,read]) of
 	{ok,File} ->
-	    case Opts of
-		[compressed] -> ram_file:uncompress(File);
-		[] -> ok
-	    end,
+            _ = [ram_file:uncompress(File) || Opts =:= [compressed]],
 	    {ok,{read,File}};
 	Error ->
 	    Error
@@ -222,7 +219,7 @@ format_error(Atom) when is_atom(Atom) ->
 format_error(Term) ->
     lists:flatten(io_lib:format("~tp", [Term])).
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%%	Useful definitions (also start of implementation).
@@ -412,7 +409,7 @@ split_filename([Comp|Rest], Prefix, Suffix, Len) ->
 split_filename([], Prefix, Suffix, _) ->
     {filename:join(Prefix),filename:join(Suffix)}.
 
-
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%
 %%% 	Retrieving files from a tape archive.
diff --git a/lib/stdlib/src/error_logger_tty_h.erl b/lib/stdlib/src/error_logger_tty_h.erl
index ad5891f191..e92142d154 100644
--- a/lib/stdlib/src/error_logger_tty_h.erl
+++ b/lib/stdlib/src/error_logger_tty_h.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,7 +54,7 @@ init([]) ->
 handle_event({_Type, GL, _Msg}, State) when node(GL) =/= node() ->
     {ok, State};
 handle_event(Event, State) ->
-    write_event(tag_event(Event),io),
+    ok = write_event(tag_event(Event),io),
     {ok, State}.
 
 handle_info({'EXIT', User, _Reason}, {User, PrevHandler}) ->
@@ -66,10 +66,10 @@ handle_info({'EXIT', User, _Reason}, {User, PrevHandler}) ->
 	     PrevHandler, go_back}
     end;
 handle_info({emulator, GL, Chars}, State) when node(GL) == node() ->
-    write_event(tag_event({emulator, GL, Chars}),io),
+    ok = write_event(tag_event({emulator, GL, Chars}),io),
     {ok, State};
 handle_info({emulator, noproc, Chars}, State) ->
-    write_event(tag_event({emulator, noproc, Chars}),io),
+    ok = write_event(tag_event({emulator, noproc, Chars}),io),
     {ok, State};
 handle_info(_, State) ->
     {ok, State}.
@@ -99,10 +99,11 @@ set_group_leader() ->
 tag_event(Event) ->    
     {erlang:universaltime(), Event}.
 
+%% IOMOd is always 'io'
 write_events(Events,IOMod) -> write_events1(lists:reverse(Events),IOMod).
 
 write_events1([Event|Es],IOMod) ->
-    write_event(Event,IOMod),
+    ok = write_event(Event,IOMod),
     write_events1(Es,IOMod);
 write_events1([],_IOMod) ->
     ok.
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index fea718541d..35f6dff57e 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -771,9 +771,11 @@ interpret(Forms, HasRecs,  File, Args) ->
     ArgsA = erl_parse:abstract(Args, 0),
     Call = {call,0,{atom,0,main},[ArgsA]},
     try
-        erl_eval:expr(Call,
-                      erl_eval:new_bindings(),
-                      {value,fun(I, J) -> code_handler(I, J, Dict, File) end}),
+        _ = erl_eval:expr(Call,
+                          erl_eval:new_bindings(),
+                          {value,fun(I, J) ->
+                                         code_handler(I, J, Dict, File)
+                                 end}),
         my_halt(0)
     catch
         Class:Reason ->
diff --git a/lib/stdlib/src/ets.erl b/lib/stdlib/src/ets.erl
index 77c8029f59..42b11a97e2 100644
--- a/lib/stdlib/src/ets.erl
+++ b/lib/stdlib/src/ets.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,10 +53,8 @@
                       | {tab(),integer(),integer(),binary(),list(),integer()}
                       | {tab(),_,_,integer(),binary(),list(),integer(),integer()}.
 
-%% a similar definition is also in erl_types
 -opaque tid()      :: integer().
 
-%% these ones are also defined in erl_bif_types
 -type match_pattern() :: atom() | tuple().
 -type match_spec()    :: [{match_pattern(), [_], [_]}].
 
@@ -507,7 +505,7 @@ fun2ms(ShellFun) when is_function(ShellFun) ->
                 Else ->
                     Else
             end;
-        false ->
+        _ ->
             exit({badarg,{?MODULE,fun2ms,
                           [function,called,with,real,'fun',
                            should,be,transformed,with,
@@ -719,7 +717,7 @@ tab2file(Tab, File) ->
 tab2file(Tab, File, Options) ->
     try
 	{ok, FtOptions} = parse_ft_options(Options),
-	file:delete(File),
+	_ = file:delete(File),
 	case file:read_file_info(File) of
 	    {error, enoent} -> ok;
 	    _ -> throw(eaccess)
@@ -750,14 +748,18 @@ tab2file(Tab, File, Options) ->
 		    {fun(Oldstate,Termlist) ->
 			     {NewState,BinList} = 
 				 md5terms(Oldstate,Termlist),
-			     disk_log:blog_terms(Name,BinList),
-			     NewState
+                             case disk_log:blog_terms(Name,BinList) of
+                                 ok -> NewState;
+                                 {error, Reason2} -> throw(Reason2)
+                             end
 		     end,
 		     erlang:md5_init()};
 		false ->
 		    {fun(_,Termlist) ->
-			     disk_log:log_terms(Name,Termlist),
-			     true
+                             case disk_log:log_terms(Name,Termlist) of
+                                 ok -> true;
+                                 {error, Reason2} -> throw(Reason2)
+                             end
 		     end, 
 		     true}
 	    end,
@@ -792,16 +794,16 @@ tab2file(Tab, File, Options) ->
 	    disk_log:close(Name)
 	catch
 	    throw:TReason ->
-		disk_log:close(Name),
-		file:delete(File),
+		_ = disk_log:close(Name),
+		_ = file:delete(File),
 		throw(TReason);
 	    exit:ExReason ->
-		disk_log:close(Name),
-		file:delete(File),
+		_ = disk_log:close(Name),
+		_ = file:delete(File),
 		exit(ExReason);
 	    error:ErReason ->
-		disk_log:close(Name),
-		file:delete(File),
+		_ = disk_log:close(Name),
+		_ = file:delete(File),
 	        erlang:raise(error,ErReason,erlang:get_stacktrace())
 	end
     catch
@@ -892,25 +894,32 @@ file2tab(File, Opts) ->
     try
 	{ok,Verify,TabArg} = parse_f2t_opts(Opts,false,[]),
 	Name = make_ref(),
-	{ok, Major, Minor, FtOptions, MD5State, FullHeader, DLContext} = 
+        {ok, Name} =
 	    case disk_log:open([{name, Name}, 
 				{file, File}, 
 				{mode, read_only}]) of
 		{ok, Name} ->
-		    get_header_data(Name,Verify);
+                    {ok, Name};
 		{repaired, Name, _,_} -> %Uh? cannot happen?
 		    case Verify of
 			true ->
-			    disk_log:close(Name),
+			    _ = disk_log:close(Name),
 			    throw(badfile);
 			false ->
-			    get_header_data(Name,Verify)
+                            {ok, Name}
 		    end;
 		{error, Other1} ->
 		    throw({read_error, Other1});
 		Other2 ->
 		    throw(Other2)
 	    end,
+	{ok, Major, Minor, FtOptions, MD5State, FullHeader, DLContext} =
+            try get_header_data(Name, Verify)
+            catch
+                badfile ->
+                    _ = disk_log:close(Name),
+                    throw(badfile)
+            end,
 	try
 	    if  
 		Major > ?MAJOR_F2T_VERSION -> 
@@ -974,7 +983,7 @@ file2tab(File, Opts) ->
 		    erlang:raise(error,ErReason,erlang:get_stacktrace())
 	    end
 	after
-	    disk_log:close(Name)
+	    _ = disk_log:close(Name)
 	end
     catch
 	throw:TReason2 ->
@@ -1293,20 +1302,30 @@ named_table(false) -> [].
 tabfile_info(File) when is_list(File) ; is_atom(File) ->
     try
 	Name = make_ref(),
-	{ok, Major, Minor, _FtOptions, _MD5State, FullHeader, _DLContext} = 
+        {ok, Name} =
 	    case disk_log:open([{name, Name}, 
 				{file, File}, 
 				{mode, read_only}]) of
 		{ok, Name} ->
-		    get_header_data(Name,false);
+                    {ok, Name};
 		{repaired, Name, _,_} -> %Uh? cannot happen?
-		    get_header_data(Name,false);
+		    {ok, Name};
 		{error, Other1} ->
 		    throw({read_error, Other1});
 		Other2 ->
 		    throw(Other2)
 	    end,
-	disk_log:close(Name),
+	{ok, Major, Minor, _FtOptions, _MD5State, FullHeader, _DLContext} =
+            try get_header_data(Name, false)
+            catch
+                badfile ->
+                    _ = disk_log:close(Name),
+                    throw(badfile)
+            end,
+        case disk_log:close(Name) of
+            ok -> ok;
+            {error, Reason} -> throw(Reason)
+        end,
 	{value, N} = lists:keysearch(name, 1, FullHeader),
 	{value, Type} = lists:keysearch(type, 1, FullHeader),
 	{value, P} = lists:keysearch(protection, 1, FullHeader),
diff --git a/lib/stdlib/src/eval_bits.erl b/lib/stdlib/src/eval_bits.erl
index e49cbc1fd1..75fe2c00c7 100644
--- a/lib/stdlib/src/eval_bits.erl
+++ b/lib/stdlib/src/eval_bits.erl
@@ -192,7 +192,7 @@ bin_gen_field({bin_element,Line,VE,Size0,Options0},
         make_bit_type(Line, Size0, Options0),
     V = erl_eval:partial_eval(VE),
     NewV = coerce_to_float(V, Type),
-    match_check_size(Mfun, Size1, BBs0),
+    match_check_size(Mfun, Size1, BBs0, false),
     {value, Size, _BBs} = Efun(Size1, BBs0),
     bin_gen_field1(Bin, Type, Size, Unit, Sign, Endian, NewV, Bs0, BBs0, Mfun).
 
@@ -380,20 +380,25 @@ make_bit_type(_Line, Size, Type0) -> %Size evaluates to an integer or 'all'
         {error,Reason} -> error(Reason)
     end.
 
-match_check_size(Mfun, {var,_,V}, Bs) ->
+match_check_size(Mfun, Size, Bs) ->
+    match_check_size(Mfun, Size, Bs, true).
+
+match_check_size(Mfun, {var,_,V}, Bs, _AllowAll) ->
     case Mfun(binding, {V,Bs}) of
         {value,_} -> ok;
 	unbound -> throw(invalid) % or, rather, error({unbound,V})
     end;
-match_check_size(_, {atom,_,all}, _Bs) ->
+match_check_size(_, {atom,_,all}, _Bs, true) ->
     ok;
-match_check_size(_, {atom,_,undefined}, _Bs) ->
+match_check_size(_, {atom,_,all}, _Bs, false) ->
+    throw(invalid);
+match_check_size(_, {atom,_,undefined}, _Bs, _AllowAll) ->
     ok;
-match_check_size(_, {integer,_,_}, _Bs) ->
+match_check_size(_, {integer,_,_}, _Bs, _AllowAll) ->
     ok;
-match_check_size(_, {value,_,_}, _Bs) ->
+match_check_size(_, {value,_,_}, _Bs, _AllowAll) ->
     ok;	%From the debugger.
-match_check_size(_, _, _Bs) ->
+match_check_size(_, _, _Bs, _AllowAll) ->
     throw(invalid).
 
 %% error(Reason) -> exception thrown
diff --git a/lib/stdlib/src/file_sorter.erl b/lib/stdlib/src/file_sorter.erl
index 2bf88959b7..687d72b4bd 100644
--- a/lib/stdlib/src/file_sorter.erl
+++ b/lib/stdlib/src/file_sorter.erl
@@ -547,7 +547,7 @@ files(_I, L, _LSz, #w{seq = 1, out = Out}=W, []) ->
             NW = close_input(W1),
             outfun(close, NW);
         Out ->
-            write_run(L, W, Out),
+            _ = write_run(L, W, Out),
             ok
     end;
 files(_I, L, _LSz, W, []) ->
@@ -638,7 +638,7 @@ last_merge(R, W) when length(R) =< W#w.no_files ->
             NW = close_input(W2),
             outfun(close, NW);
         Out ->
-            merge_files(R, W, Out),
+            _ = merge_files(R, W, Out),
             ok
     end;
 last_merge(R, W) ->
@@ -1110,10 +1110,12 @@ read_fun2(Fd, Bin, Size, FileName, Owner) ->
     end.
        
 close_read_fun(Fd, _FileName, user) ->
-    file:close(Fd);
+    _ = file:close(Fd),
+    ok;
 close_read_fun(Fd, FileName, fsort) ->
-    file:close(Fd),
-    file:delete(FileName).
+    _ = file:close(Fd),
+    _ = file:delete(FileName),
+    ok.
 
 read_objs(Fd, FileName, I, L, Bin0, Size0, LSz, W) ->
     Max = erlang:max(Size0, ?CHUNKSIZE),
@@ -1481,10 +1483,10 @@ cleanup(W) ->
     F = fun(IFun) when is_function(IFun) -> 
                 IFun(close);
            ({Fd,FileName}) ->
-                file:close(Fd),
-                file:delete(FileName);
+                _ = file:close(Fd),
+                _= file:delete(FileName);
            (FileName) -> 
-                file:delete(FileName)
+                _= file:delete(FileName)
         end,
     lists:foreach(F, W1#w.temp).
 
@@ -1502,8 +1504,12 @@ close_out(_) ->
 close_file(Fd, W) ->
     {Fd, FileName} = lists:keyfind(Fd, 1, W#w.temp),
     ?DEBUG("closing ~tp~n", [FileName]),
-    file:close(Fd),
-    W#w{temp = [FileName | lists:keydelete(Fd, 1, W#w.temp)]}.
+    case file:close(Fd) of
+        ok ->
+            W#w{temp = [FileName | lists:keydelete(Fd, 1, W#w.temp)]};
+        Error ->
+            file_error(FileName, Error, W)
+    end.
 
 %%%
 %%% Format 'term'.
@@ -1536,10 +1542,10 @@ file_rterms2(Fd, L, LSz, FileName, Files) when LSz < ?CHUNKSIZE ->
             B = term_to_binary(Term),
             file_rterms2(Fd, [B | L], LSz + byte_size(B), FileName, Files);
         eof ->
-            file:close(Fd),
+            _ = file:close(Fd),
             {lists:reverse(L), file_rterms(no_file, Files)};
         _Error ->
-            file:close(Fd),
+            _ = file:close(Fd),
             {error, {bad_term, FileName}}
     end;
 file_rterms2(Fd, L, _LSz, FileName, Files) ->
@@ -1568,7 +1574,7 @@ write_terms(Fd, F, [B | Bs], Args) ->
         ok -> 
             write_terms(Fd, F, Bs, Args);
         {error, Reason} ->
-            file:close(Fd),
+            _ = file:close(Fd),
             {error, {file_error, F, Reason}}
     end;
 write_terms(Fd, F, [], Args) ->
diff --git a/lib/stdlib/src/filelib.erl b/lib/stdlib/src/filelib.erl
index 42ef3679a2..a266daa084 100644
--- a/lib/stdlib/src/filelib.erl
+++ b/lib/stdlib/src/filelib.erl
@@ -41,6 +41,9 @@
 -type filename() :: file:name().
 -type dirname() :: filename().
 
+-type filename_all() :: file:name_all().
+-type dirname_all() :: filename_all().
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -spec wildcard(Wildcard) -> [file:filename()] when
@@ -62,29 +65,29 @@ wildcard(Pattern, Cwd, Mod)
     ?HANDLE_ERROR(do_wildcard(Pattern, Cwd, Mod)).
 
 -spec is_dir(Name) -> boolean() when
-      Name :: filename() | dirname().
+      Name :: filename_all() | dirname_all().
 is_dir(Dir) ->
     do_is_dir(Dir, file).
 
--spec is_dir(file:name(), atom()) -> boolean().
+-spec is_dir(file:name_all(), atom()) -> boolean().
 is_dir(Dir, Mod) when is_atom(Mod) ->
     do_is_dir(Dir, Mod).
 
 -spec is_file(Name) -> boolean() when
-      Name :: filename() | dirname().
+      Name :: filename_all() | dirname_all().
 is_file(File) ->
     do_is_file(File, file).
 
--spec is_file(file:name(), atom()) -> boolean().
+-spec is_file(file:name_all(), atom()) -> boolean().
 is_file(File, Mod) when is_atom(Mod) ->
     do_is_file(File, Mod).
 
 -spec is_regular(Name) -> boolean() when
-      Name :: filename().
+      Name :: filename_all().
 is_regular(File) ->
     do_is_regular(File, file).
     
--spec is_regular(file:name(), atom()) -> boolean().
+-spec is_regular(file:name_all(), atom()) -> boolean().
 is_regular(File, Mod) when is_atom(Mod) ->
     do_is_regular(File, Mod).
     
@@ -103,16 +106,16 @@ fold_files(Dir, RegExp, Recursive, Fun, Acc, Mod) when is_atom(Mod) ->
     do_fold_files(Dir, RegExp, Recursive, Fun, Acc, Mod).
 
 -spec last_modified(Name) -> file:date_time() | 0 when
-      Name :: filename() | dirname().
+      Name :: filename_all() | dirname_all().
 last_modified(File) ->
     do_last_modified(File, file).
 
--spec last_modified(file:name(), atom()) -> file:date_time() | 0.
+-spec last_modified(file:name_all(), atom()) -> file:date_time() | 0.
 last_modified(File, Mod) when is_atom(Mod) ->
     do_last_modified(File, Mod).
 
 -spec file_size(Filename) -> non_neg_integer() when
-      Filename :: filename().
+      Filename :: filename_all().
 file_size(File) ->
     do_file_size(File, file).
 
@@ -218,7 +221,7 @@ do_file_size(File, Mod) ->
 %% ensures that the directory name required to create D exists
 
 -spec ensure_dir(Name) -> 'ok' | {'error', Reason} when
-      Name :: filename() | dirname(),
+      Name :: filename_all() | dirname_all(),
       Reason :: file:posix().
 ensure_dir("/") ->
     ok;
@@ -231,7 +234,7 @@ ensure_dir(F) ->
 	    %% Protect against infinite loop
 	    {error,einval};
 	false ->
-	    ensure_dir(Dir),
+	    _ = ensure_dir(Dir),
 	    case file:make_dir(Dir) of
 		{error,eexist}=EExist ->
 		    case do_is_dir(Dir, file) of
@@ -245,7 +248,7 @@ ensure_dir(F) ->
 	    end
     end.
 
-
+
 %%%
 %%% Pattern matching using a compiled wildcard.
 %%%
@@ -357,7 +360,7 @@ do_alt([], _File) ->
 
 do_list_dir(Dir, Mod) ->     eval_list_dir(Dir, Mod).
 
-	    
+	    
 %%% Compiling a wildcard.
 
 %% Only for debugging.
diff --git a/lib/stdlib/src/gb_sets.erl b/lib/stdlib/src/gb_sets.erl
index ba35a7170a..0a26d0182d 100644
--- a/lib/stdlib/src/gb_sets.erl
+++ b/lib/stdlib/src/gb_sets.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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,31 +196,32 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Some types.
 
--export_type([iter/0]).
+-export_type([set/0, set/1, iter/0, iter/1]).
 
--type gb_set_node() :: 'nil' | {term(), _, _}.
+-type gb_set_node(Element) :: 'nil' | {Element, _, _}.
+-type gb_set_node() :: gb_set_node(_).
+-opaque set(Element) :: {non_neg_integer(), gb_set_node(Element)}.
+-opaque set() :: set(_).
+-opaque iter(Element) :: [gb_set_node(Element)].
 -opaque iter() :: [gb_set_node()].
 
-%% A declaration equivalent to the following is currently hard-coded
-%% in erl_types.erl
-%%
-%% -opaque gb_set() :: {non_neg_integer(), gb_set_node()}.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%%% gb_sets:set() in OTP 17 only.
+
 -spec empty() -> Set when
-      Set :: gb_set().
+      Set :: gb_sets:set().
 
 empty() ->
     {0, nil}.
 
 -spec new() -> Set when
-      Set :: gb_set().
+      Set :: gb_sets:set().
 
 new() -> empty().
 
 -spec is_empty(Set) -> boolean() when
-      Set :: gb_set().
+      Set :: gb_sets:set().
 
 is_empty({0, nil}) ->
     true;
@@ -229,27 +229,24 @@ is_empty(_) ->
     false.
 
 -spec size(Set) -> non_neg_integer() when
-      Set :: gb_set().
+      Set :: gb_sets:set().
 
 size({Size, _}) ->
     Size.
 
--spec singleton(Element) -> gb_set() when
-      Element :: term().
+-spec singleton(Element) -> set(Element).
 
 singleton(Key) ->
     {1, {Key, nil, nil}}.
 
 -spec is_element(Element, Set) -> boolean() when
-      Element :: term(),
-      Set :: gb_set().
+      Set :: set(Element).
 
 is_element(Key, S) ->
     is_member(Key, S).
 
 -spec is_member(Element, Set) -> boolean() when
-      Element :: term(),
-      Set :: gb_set().
+      Set :: set(Element).
 
 is_member(Key, {_, T}) ->
     is_member_1(Key, T).
@@ -264,9 +261,8 @@ is_member_1(_, nil) ->
     false.
 
 -spec insert(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 insert(Key, {S, T}) ->
     S1 = S + 1,
@@ -323,8 +319,8 @@ count(nil) ->
     {1, 0}.
 
 -spec balance(Set1) -> Set2 when
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 balance({S, T}) ->
     {S, balance(T, S)}.
@@ -350,17 +346,15 @@ balance_list_1(L, 0) ->
     {nil, L}.
 
 -spec add_element(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 add_element(X, S) ->
     add(X, S).
 
 -spec add(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 add(X, S) ->
     case is_member(X, S) of
@@ -371,32 +365,30 @@ add(X, S) ->
     end.
 
 -spec from_list(List) -> Set when
-      List :: [term()],
-      Set :: gb_set().
+      List :: [Element],
+      Set :: set(Element).
 
 from_list(L) ->
     from_ordset(ordsets:from_list(L)).
 
 -spec from_ordset(List) -> Set when
-      List :: [term()],
-      Set :: gb_set().
+      List :: [Element],
+      Set :: set(Element).
 
 from_ordset(L) ->
     S = length(L),
     {S, balance_list(L, S)}.
 
 -spec del_element(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 del_element(Key, S) ->
     delete_any(Key, S).
 
 -spec delete_any(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 delete_any(Key, S) ->
     case is_member(Key, S) of
@@ -407,9 +399,8 @@ delete_any(Key, S) ->
     end.
 
 -spec delete(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 delete(Key, {S, T}) ->
     {S - 1, delete_1(Key, T)}.
@@ -432,9 +423,8 @@ merge(Smaller, Larger) ->
     {Key, Smaller, Larger1}.
 
 -spec take_smallest(Set1) -> {Element, Set2} when
-      Set1 :: gb_set(),
-      Set2 :: gb_set(),
-      Element :: term().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 take_smallest({S, T}) ->
     {Key, Larger} = take_smallest1(T),
@@ -446,8 +436,8 @@ take_smallest1({Key, Smaller, Larger}) ->
     {Key1, Smaller1} = take_smallest1(Smaller),
     {Key1, {Key, Smaller1, Larger}}.
 
--spec smallest(Set) -> term() when
-      Set :: gb_set().
+-spec smallest(Set) -> Element when
+      Set :: set(Element).
 
 smallest({_, T}) ->
     smallest_1(T).
@@ -458,9 +448,8 @@ smallest_1({_Key, Smaller, _Larger}) ->
     smallest_1(Smaller).
 
 -spec take_largest(Set1) -> {Element, Set2} when
-      Set1 :: gb_set(),
-      Set2 :: gb_set(),
-      Element :: term().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 take_largest({S, T}) ->
     {Key, Smaller} = take_largest1(T),
@@ -472,8 +461,8 @@ take_largest1({Key, Smaller, Larger}) ->
     {Key1, Larger1} = take_largest1(Larger),
     {Key1, {Key, Smaller, Larger1}}.
 
--spec largest(Set) -> term() when
-      Set :: gb_set().
+-spec largest(Set) -> Element when
+      Set :: set(Element).
 
 largest({_, T}) ->
     largest_1(T).
@@ -484,8 +473,8 @@ largest_1({_Key, _Smaller, Larger}) ->
     largest_1(Larger).
 
 -spec to_list(Set) -> List when
-      Set :: gb_set(),
-      List :: [term()].
+      Set :: set(Element),
+      List :: [Element].
 
 to_list({_, T}) ->
     to_list(T, []).
@@ -497,8 +486,8 @@ to_list({Key, Small, Big}, L) ->
 to_list(nil, L) -> L.
 
 -spec iterator(Set) -> Iter when
-      Set :: gb_set(),
-      Iter :: iter().
+      Set :: set(Element),
+      Iter :: iter(Element).
 
 iterator({_, T}) ->
     iterator(T, []).
@@ -514,9 +503,8 @@ iterator(nil, As) ->
     As.
 
 -spec next(Iter1) -> {Element, Iter2} | 'none' when
-      Iter1 :: iter(),
-      Iter2 :: iter(),
-      Element :: term().
+      Iter1 :: iter(Element),
+      Iter2 :: iter(Element).
 
 next([{X, _, T} | As]) ->
     {X, iterator(T, As)};
@@ -547,9 +535,9 @@ next([]) ->
 %% overhead.
 
 -spec union(Set1, Set2) -> Set3 when
-      Set1 :: gb_set(),
-      Set2 :: gb_set(),
-      Set3 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element),
+      Set3 :: set(Element).
 
 union({N1, T1}, {N2, T2}) when N2 < N1 ->
     union(to_list_1(T2), N2, T1, N1);
@@ -571,7 +559,7 @@ union(L, N1, T2, N2) ->
 	    union_1(L, mk_set(N2, T2))
     end.
 
--spec mk_set(non_neg_integer(), gb_set_node()) -> gb_set().
+-spec mk_set(non_neg_integer(), gb_set_node(T)) -> set(T).
 
 mk_set(N, T) ->
     {N, T}.
@@ -652,8 +640,8 @@ balance_revlist_1(L, 0) ->
     {nil, L}.
 
 -spec union(SetList) -> Set when
-      SetList :: [gb_set(),...],
-      Set :: gb_set().
+      SetList :: [set(Element),...],
+      Set :: set(Element).
 
 union([S | Ss]) ->
     union_list(S, Ss);
@@ -667,9 +655,9 @@ union_list(S, []) -> S.
 %% The rest is modelled on the above.
 
 -spec intersection(Set1, Set2) -> Set3 when
-      Set1 :: gb_set(),
-      Set2 :: gb_set(),
-      Set3 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element),
+      Set3 :: set(Element).
 
 intersection({N1, T1}, {N2, T2}) when N2 < N1 ->
     intersection(to_list_1(T2), N2, T1, N1);
@@ -718,8 +706,8 @@ intersection_2(_, [], As, S) ->
     {S, balance_revlist(As, S)}.
 
 -spec intersection(SetList) -> Set when
-      SetList :: [gb_set(),...],
-      Set :: gb_set().
+      SetList :: [set(Element),...],
+      Set :: set(Element).
 
 intersection([S | Ss]) ->
     intersection_list(S, Ss).
@@ -729,8 +717,8 @@ intersection_list(S, [S1 | Ss]) ->
 intersection_list(S, []) -> S.
 
 -spec is_disjoint(Set1, Set2) -> boolean() when
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 is_disjoint({N1, T1}, {N2, T2}) when N1 < N2 ->
     is_disjoint_1(T1, T2);
@@ -759,17 +747,17 @@ is_disjoint_1(_, nil) ->
 %% traverse the whole element list of the left operand.
 
 -spec subtract(Set1, Set2) -> Set3 when
-      Set1 :: gb_set(),
-      Set2 :: gb_set(),
-      Set3 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element),
+      Set3 :: set(Element).
 
 subtract(S1, S2) ->
     difference(S1, S2).
 
 -spec difference(Set1, Set2) -> Set3 when
-      Set1 :: gb_set(),
-      Set2 :: gb_set(),
-      Set3 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element),
+      Set3 :: set(Element).
 
 difference({N1, T1}, {N2, T2}) ->
     difference(to_list_1(T1), N1, T2, N2).
@@ -818,8 +806,8 @@ difference_2(Xs, [], As, S) ->
 %% without the construction of a new set.
 
 -spec is_subset(Set1, Set2) -> boolean() when
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 is_subset({N1, T1}, {N2, T2}) ->
     is_subset(to_list_1(T1), N1, T2, N2).
@@ -868,20 +856,20 @@ is_set({N, {_, _, _}}) when is_integer(N), N >= 0 -> true;
 is_set(_) -> false.
 
 -spec filter(Pred, Set1) -> Set2 when
-      Pred :: fun((E :: term()) -> boolean()),
-      Set1 :: gb_set(),
-      Set2 :: gb_set().
+      Pred :: fun((Element) -> boolean()),
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 
 filter(F, S) ->
     from_ordset([X || X <- to_list(S), F(X)]).
 
 -spec fold(Function, Acc0, Set) -> Acc1 when
-      Function :: fun((E :: term(), AccIn) -> AccOut),
-      Acc0 :: term(),
-      Acc1 :: term(),
-      AccIn :: term(),
-      AccOut :: term(),
-      Set :: gb_set().
+      Function :: fun((Element, AccIn) -> AccOut),
+      Acc0 :: Acc,
+      Acc1 :: Acc,
+      AccIn :: Acc,
+      AccOut :: Acc,
+      Set :: set(Element).
 
 fold(F, A, {_, T}) when is_function(F, 2) ->
     fold_1(F, A, T).
diff --git a/lib/stdlib/src/gb_trees.erl b/lib/stdlib/src/gb_trees.erl
index de0c239e26..7069b61873 100644
--- a/lib/stdlib/src/gb_trees.erl
+++ b/lib/stdlib/src/gb_trees.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -153,25 +152,25 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Some types.
 
--export_type([iter/0]).
+-export_type([tree/0, tree/2, iter/0, iter/2]).
 
--type gb_tree_node() :: 'nil' | {_, _, _, _}.
+-type gb_tree_node(K, V) :: 'nil'
+                          | {K, V, gb_tree_node(K, V), gb_tree_node(K, V)}.
+-type gb_tree_node() :: gb_tree_node(_, _).
+-opaque tree(Key, Value) :: {non_neg_integer(), gb_tree_node(Key, Value)}.
+-opaque tree() :: tree(_, _).
+-opaque iter(Key, Value) :: [gb_tree_node(Key, Value)].
 -opaque iter() :: [gb_tree_node()].
 
-%% A declaration equivalent to the following is currently hard-coded
-%% in erl_types.erl
-%%
-%% -opaque gb_tree() :: {non_neg_integer(), gb_tree_node()}.
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec empty() -> gb_tree().
+-spec empty() -> tree().
 
 empty() ->
     {0, nil}.
 
 -spec is_empty(Tree) -> boolean() when
-      Tree :: gb_tree().
+      Tree :: tree().
 
 is_empty({0, nil}) ->
     true;
@@ -179,17 +178,15 @@ is_empty(_) ->
     false.
 
 -spec size(Tree) -> non_neg_integer() when
-      Tree :: gb_tree().
+      Tree :: tree().
 
 size({Size, _}) when is_integer(Size), Size >= 0 ->
     Size.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec lookup(Key, Tree) -> 'none' | {'value', Val} when
-      Key :: term(),
-      Val :: term(),
-      Tree :: gb_tree().
+-spec lookup(Key, Tree) -> 'none' | {'value', Value} when
+      Tree :: tree(Key, Value).
 
 lookup(Key, {_, T}) ->
     lookup_1(Key, T).
@@ -215,8 +212,7 @@ lookup_1(_, nil) ->
 %% This is a specialized version of `lookup'.
 
 -spec is_defined(Key, Tree) -> boolean() when
-      Key :: term(),
-      Tree :: gb_tree().
+      Tree :: tree(Key, Value :: term()).
 
 is_defined(Key, {_, T}) ->
     is_defined_1(Key, T).
@@ -234,10 +230,8 @@ is_defined_1(_, nil) ->
 
 %% This is a specialized version of `lookup'.
 
--spec get(Key, Tree) -> Val when
-      Key :: term(),
-      Tree :: gb_tree(),
-      Val :: term().
+-spec get(Key, Tree) -> Value when
+      Tree :: tree(Key, Value).
 
 get(Key, {_, T}) ->
     get_1(Key, T).
@@ -251,11 +245,9 @@ get_1(_, {_, Value, _, _}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec update(Key, Val, Tree1) -> Tree2 when
-      Key :: term(),
-      Val :: term(),
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree().
+-spec update(Key, Value, Tree1) -> Tree2 when
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 update(Key, Val, {S, T}) ->
     T1 = update_1(Key, Val, T),
@@ -272,11 +264,9 @@ update_1(Key, Value, {_, _, Smaller, Bigger}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec insert(Key, Val, Tree1) -> Tree2 when
-      Key :: term(),
-      Val :: term(),
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree().
+-spec insert(Key, Value, Tree1) -> Tree2 when
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 insert(Key, Val, {S, T}) when is_integer(S) ->
     S1 = S+1,
@@ -325,11 +315,9 @@ insert_1(Key, _, _, _) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec enter(Key, Val, Tree1) -> Tree2 when
-      Key :: term(),
-      Val :: term(),
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree().
+-spec enter(Key, Value, Tree1) -> Tree2 when
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 enter(Key, Val, T) ->
     case is_defined(Key, T) of
@@ -353,8 +341,8 @@ count(nil) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -spec balance(Tree1) -> Tree2 when
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree().
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 balance({S, T}) ->
     {S, balance(T, S)}.
@@ -380,8 +368,8 @@ balance_list_1(L, 0) ->
     {nil, L}.
 
 -spec from_orddict(List) -> Tree when
-      List :: [{Key :: term(), Val :: term()}],
-      Tree :: gb_tree().
+      List :: [{Key, Value}],
+      Tree :: tree(Key, Value).
 
 from_orddict(L) ->
     S = length(L),
@@ -390,9 +378,8 @@ from_orddict(L) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -spec delete_any(Key, Tree1) -> Tree2 when
-      Key :: term(),
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree().
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 delete_any(Key, T) ->
     case is_defined(Key, T) of
@@ -405,9 +392,8 @@ delete_any(Key, T) ->
 %%% delete. Assumes that key is present.
 
 -spec delete(Key, Tree1) -> Tree2 when
-      Key :: term(),
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree().
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 delete(Key, {S, T}) when is_integer(S), S >= 0 ->
     {S - 1, delete_1(Key, T)}.
@@ -433,11 +419,9 @@ merge(Smaller, Larger) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec take_smallest(Tree1) -> {Key, Val, Tree2} when
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree(),
-      Key :: term(),
-      Val :: term().
+-spec take_smallest(Tree1) -> {Key, Value, Tree2} when
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 take_smallest({Size, Tree}) when is_integer(Size), Size >= 0 ->
     {Key, Value, Larger} = take_smallest1(Tree),
@@ -449,10 +433,8 @@ take_smallest1({Key, Value, Smaller, Larger}) ->
     {Key1, Value1, Smaller1} = take_smallest1(Smaller),
     {Key1, Value1, {Key, Value, Smaller1, Larger}}.
 
--spec smallest(Tree) -> {Key, Val} when
-      Tree :: gb_tree(),
-      Key :: term(),
-      Val :: term().
+-spec smallest(Tree) -> {Key, Value} when
+      Tree :: tree(Key, Value).
 
 smallest({_, Tree}) ->
     smallest_1(Tree).
@@ -462,11 +444,9 @@ smallest_1({Key, Value, nil, _Larger}) ->
 smallest_1({_Key, _Value, Smaller, _Larger}) ->
     smallest_1(Smaller).
 
--spec take_largest(Tree1) -> {Key, Val, Tree2} when
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree(),
-      Key :: term(),
-      Val :: term().
+-spec take_largest(Tree1) -> {Key, Value, Tree2} when
+      Tree1 :: tree(Key, Value),
+      Tree2 :: tree(Key, Value).
 
 take_largest({Size, Tree}) when is_integer(Size), Size >= 0 ->
     {Key, Value, Smaller} = take_largest1(Tree),
@@ -478,10 +458,8 @@ take_largest1({Key, Value, Smaller, Larger}) ->
     {Key1, Value1, Larger1} = take_largest1(Larger),
     {Key1, Value1, {Key, Value, Smaller, Larger1}}.
 
--spec largest(Tree) -> {Key, Val} when
-      Tree :: gb_tree(),
-      Key :: term(),
-      Val :: term().
+-spec largest(Tree) -> {Key, Value} when
+      Tree :: tree(Key, Value).
 
 largest({_, Tree}) ->
     largest_1(Tree).
@@ -493,10 +471,8 @@ largest_1({_Key, _Value, _Smaller, Larger}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec to_list(Tree) -> [{Key, Val}] when
-      Tree :: gb_tree(),
-      Key :: term(),
-      Val :: term().
+-spec to_list(Tree) -> [{Key, Value}] when
+      Tree :: tree(Key, Value).
 			   
 to_list({_, T}) ->
     to_list(T, []).
@@ -510,8 +486,7 @@ to_list(nil, L) -> L.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -spec keys(Tree) -> [Key] when
-      Tree :: gb_tree(),
-      Key :: term().
+      Tree :: tree(Key, Value :: term()).
 
 keys({_, T}) ->
     keys(T, []).
@@ -522,9 +497,8 @@ keys(nil, L) -> L.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
--spec values(Tree) -> [Val] when
-      Tree :: gb_tree(),
-      Val :: term().
+-spec values(Tree) -> [Value] when
+      Tree :: tree(Key :: term(), Value).
 
 values({_, T}) ->
     values(T, []).
@@ -536,8 +510,8 @@ values(nil, L) -> L.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -spec iterator(Tree) -> Iter when
-      Tree :: gb_tree(),
-      Iter :: iter().
+      Tree :: tree(Key, Value),
+      Iter :: iter(Key, Value).
 
 iterator({_, T}) ->
     iterator_1(T).
@@ -555,11 +529,9 @@ iterator({_, _, L, _} = T, As) ->
 iterator(nil, As) ->
     As.
 
--spec next(Iter1) -> 'none' | {Key, Val, Iter2} when
-      Iter1 :: iter(),
-      Iter2 :: iter(),
-      Key :: term(),
-      Val :: term().
+-spec next(Iter1) -> 'none' | {Key, Value, Iter2} when
+      Iter1 :: iter(Key, Value),
+      Iter2 :: iter(Key, Value).
 
 next([{X, V, _, T} | As]) ->
     {X, V, iterator(T, As)};
@@ -569,9 +541,9 @@ next([]) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 -spec map(Function, Tree1) -> Tree2 when
-      Function :: fun((K :: term(), V1 :: term()) -> V2 :: term()),
-      Tree1 :: gb_tree(),
-      Tree2 :: gb_tree().
+      Function :: fun((K :: Key, V1 :: Value1) -> V2 :: Value2),
+      Tree1 :: tree(Key, Value1),
+      Tree2 :: tree(Key, Value2).
 
 map(F, {Size, Tree}) when is_function(F, 2) ->
     {Size, map_1(F, Tree)}.
diff --git a/lib/stdlib/src/gen_fsm.erl b/lib/stdlib/src/gen_fsm.erl
index 9e9d4ee4bb..e9654322f1 100644
--- a/lib/stdlib/src/gen_fsm.erl
+++ b/lib/stdlib/src/gen_fsm.erl
@@ -549,7 +549,7 @@ handle_msg(Msg, Parent, Name, StateName, StateData, Mod, _Time, Debug) ->
 	{stop, Reason, Reply, NStateData} when From =/= undefined ->
 	    {'EXIT', R} = (catch terminate(Reason, Name, Msg, Mod,
 					   StateName, NStateData, Debug)),
-	    reply(Name, From, Reply, Debug, StateName),
+	    _ = reply(Name, From, Reply, Debug, StateName),
 	    exit(R);
 	{'EXIT', What} ->
 	    terminate(What, Name, Msg, Mod, StateName, StateData, Debug);
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index bc76c9fd10..5f14e48b0a 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -124,7 +124,7 @@
     {noreply, NewState :: term()} |
     {noreply, NewState :: term(), timeout() | hibernate} |
     {stop, Reason :: term(), NewState :: term()}.
--callback handle_info(Info :: timeout() | term(), State :: term()) ->
+-callback handle_info(Info :: timeout | term(), State :: term()) ->
     {noreply, NewState :: term()} |
     {noreply, NewState :: term(), timeout() | hibernate} |
     {stop, Reason :: term(), NewState :: term()}.
@@ -217,7 +217,7 @@ reply({To, Tag}, Reply) ->
     catch To ! {Tag, Reply}.
 
 %% ----------------------------------------------------------------- 
-%% Asyncronous broadcast, returns nothing, it's just send'n prey
+%% Asynchronous broadcast, returns nothing, it's just send 'n' pray
 %%-----------------------------------------------------------------  
 abcast(Name, Request) when is_atom(Name) ->
     do_abcast([node() | nodes()], Name, cast_msg(Request)).
@@ -393,7 +393,7 @@ decode_msg(Msg, Parent, Name, State, Mod, Time, Debug, Hib) ->
     end.
 
 %%% ---------------------------------------------------
-%%% Send/recive functions
+%%% Send/receive functions
 %%% ---------------------------------------------------
 do_send(Dest, Msg) ->
     case catch erlang:send(Dest, Msg, [noconnect]) of
@@ -623,7 +623,7 @@ handle_msg({'$gen_call', From, Msg}, Parent, Name, State, Mod, Debug) ->
 	{stop, Reason, Reply, NState} ->
 	    {'EXIT', R} = 
 		(catch terminate(Reason, Name, Msg, Mod, NState, Debug)),
-	    reply(Name, From, Reply, NState, Debug),
+	    _ = reply(Name, From, Reply, NState, Debug),
 	    exit(R);
 	Other ->
 	    handle_common_reply(Other, Parent, Name, Msg, Mod, State, Debug)
diff --git a/lib/stdlib/src/io.erl b/lib/stdlib/src/io.erl
index 53728237ca..b11d41e2eb 100644
--- a/lib/stdlib/src/io.erl
+++ b/lib/stdlib/src/io.erl
@@ -40,7 +40,7 @@
 %%-------------------------------------------------------------------------
 
 -type device() :: atom() | pid().
--type prompt() :: atom() | string().
+-type prompt() :: atom() | unicode:chardata().
 
 %% ErrorDescription is whatever the I/O-server sends.
 -type server_no_data() :: {'error', ErrorDescription :: term()} | 'eof'.
diff --git a/lib/stdlib/src/io_lib.erl b/lib/stdlib/src/io_lib.erl
index a9b6d4131e..adc9a0cf5f 100644
--- a/lib/stdlib/src/io_lib.erl
+++ b/lib/stdlib/src/io_lib.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -83,7 +82,8 @@
 -export([write_unicode_string/1, write_unicode_char/1,
          deep_unicode_char_list/1]).
 
--export_type([chars/0, latin1_string/0, continuation/0, fread_error/0]).
+-export_type([chars/0, latin1_string/0, continuation/0,
+              fread_error/0, fread_item/0]).
 
 %%----------------------------------------------------------------------
 
@@ -106,6 +106,8 @@
                      | 'string'
                      | 'unsigned'.
 
+-type fread_item() :: string() | atom() | integer() | float().
+
 %%----------------------------------------------------------------------
 
 %% Interface calls to sub-modules.
@@ -120,7 +122,7 @@ fwrite(Format, Args) ->
 -spec fread(Format, String) -> Result when
       Format :: string(),
       String :: string(),
-      Result :: {'ok', InputList :: [term()], LeftOverChars :: string()}
+      Result :: {'ok', InputList :: [fread_item()], LeftOverChars :: string()}
               | {'more', RestFormat :: string(),
                  Nchars :: non_neg_integer(),
                  InputStack :: chars()}
@@ -135,7 +137,7 @@ fread(Chars, Format) ->
       Format :: string(),
       Return :: {'more', Continuation1 :: continuation()}
               | {'done', Result, LeftOverChars :: string()},
-      Result :: {'ok', InputList :: [term()]}
+      Result :: {'ok', InputList :: [fread_item()]}
               | 'eof'
               | {'error', {'fread', What :: fread_error()}}.
 
@@ -255,7 +257,9 @@ write(T, D) when is_tuple(T) ->
 	     [write(element(1, T), D-1)|
               write_tail(tl(tuple_to_list(T)), D-1, $,)],
 	     $}]
-    end.
+    end;
+%write(Term, D)  when is_map(Term) -> write_map(Term, D);
+write(Term, D) -> write_map(Term, D).
 
 %% write_tail(List, Depth, CharacterBeforeDots)
 %%  Test the terminating case first as this looks better with depth.
@@ -273,6 +277,18 @@ write_port(Port) ->
 write_ref(Ref) ->
     erlang:ref_to_list(Ref).
 
+write_map(Map, D) when is_integer(D) ->
+    [$#,${,write_map_body(maps:to_list(Map), D),$}].
+
+write_map_body(_, 0) -> "...";
+write_map_body([],_) -> [];
+write_map_body([{K,V}],D) -> write_map_assoc(K,V,D);
+write_map_body([{K,V}|KVs], D) ->
+    [write_map_assoc(K,V,D),$, | write_map_body(KVs,D-1)].
+
+write_map_assoc(K,V,D) ->
+    [write(K,D - 1),"=>",write(V,D-1)].
+
 write_binary(B, D) when is_integer(D) ->
     [$<,$<,write_binary_body(B, D),$>,$>].
 
@@ -580,7 +596,7 @@ printable_unicode_list(_) -> false.		%Everything else is false
 
 nl() ->
     "\n".
-
+
 %%
 %% Utilities for collecting characters in input files
 %%
diff --git a/lib/stdlib/src/io_lib_fread.erl b/lib/stdlib/src/io_lib_fread.erl
index 92a34995b8..491e1f40d7 100644
--- a/lib/stdlib/src/io_lib_fread.erl
+++ b/lib/stdlib/src/io_lib_fread.erl
@@ -41,9 +41,9 @@
       Format :: string(),
       Return :: {'more', Continuation1 :: io_lib:continuation()}
               | {'done', Result, LeftOverChars :: string()},
-      Result :: {'ok', InputList :: io_lib:chars()}
+      Result :: {'ok', InputList :: [io_lib:fread_item()]}
               | 'eof'
-              | {'error', {'read', What :: io_lib:fread_error()}}.
+              | {'error', {'fread', What :: io_lib:fread_error()}}.
 
 fread([], Chars, Format) ->
     %%io:format("FREAD: ~w `~s'~n", [Format,Chars]),
@@ -101,11 +101,12 @@ fread_line(Format0, Line, N0, Results0, More, Newline) ->
 -spec fread(Format, String) -> Result when
       Format :: string(),
       String :: string(),
-      Result :: {'ok', InputList :: io_lib:chars(), LeftOverChars :: string()}
+      Result :: {'ok', InputList :: [io_lib:fread_item()],
+                 LeftOverChars :: string()}
               | {'more', RestFormat :: string(),
                  Nchars :: non_neg_integer(),
                  InputStack :: io_lib:chars()}
-              | {'error', What :: term()}.
+              | {'error', {'fread', What :: io_lib:fread_error()}}.
 
 fread(Format, Line) ->
     fread(Format, Line, 0, []).
diff --git a/lib/stdlib/src/io_lib_pretty.erl b/lib/stdlib/src/io_lib_pretty.erl
index 7637ad7a3d..9005fede4d 100644
--- a/lib/stdlib/src/io_lib_pretty.erl
+++ b/lib/stdlib/src/io_lib_pretty.erl
@@ -25,6 +25,8 @@
 
 -export([print/1,print/2,print/3,print/4,print/5,print/6]).
 
+-compile(no_native).
+
 %%%
 %%% Exported functions
 %%%
@@ -101,6 +103,7 @@ print(Term, Col, Ll, D, M, RecDefFun, Enc, Str) when Col =< 0 ->
     print(Term, 1, Ll, D, M, RecDefFun, Enc, Str);
 print(Term, Col, Ll, D, M0, RecDefFun, Enc, Str) when is_tuple(Term);
                                                       is_list(Term);
+                                                      is_map(Term);
                                                       is_bitstring(Term) ->
     If = {_S, Len} = print_length(Term, D, RecDefFun, Enc, Str),
     M = max_cs(M0, Len),
@@ -137,6 +140,10 @@ pp({{tuple,true,L}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
     [${, pp_tag_tuple(L, Col, Ll, M, TInd, Ind, LD, W + 1), $}];
 pp({{tuple,false,L}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
     [${, pp_list(L, Col + 1, Ll, M, TInd, indent(1, Ind), LD, $,, W + 1), $}];
+pp({{map,Pairs},_Len}, Col, Ll, M, TInd, Ind, LD, W) ->
+    [$#,${, pp_list(Pairs, Col + 2, Ll, M, TInd, indent(2, Ind), LD, $,, W + 1), $}];
+pp({{map_pair,K,V},_Len}, Col, Ll, M, TInd, Ind, LD, W) ->
+    [pp(K, Col, Ll, M, TInd, Ind, LD, W), " => ", pp(V, Col, Ll, M, TInd, Ind, LD, W)];
 pp({{record,[{Name,NLen} | L]}, _Len}, Col, Ll, M, TInd, Ind, LD, W) ->
     [Name, ${, pp_record(L, NLen, Col, Ll, M, TInd, Ind, LD, W + NLen+1), $}];
 pp({{bin,S}, _Len}, Col, Ll, M, _TInd, Ind, LD, W) ->
@@ -283,6 +290,10 @@ write({{tuple, _IsTagged, L}, _}) ->
     [${, write_list(L, $,), $}];
 write({{list, L}, _}) ->
     [$[, write_list(L, $|), $]];
+write({{map, Pairs}, _}) ->
+    [$#,${, write_list(Pairs, $,), $}];
+write({{map_pair, K, V}, _}) ->
+    [write(K)," => ",write(V)];
 write({{record, [{Name,_} | L]}, _}) ->
     [Name, ${, write_fields(L), $}];
 write({{bin, S}, _}) ->
@@ -331,6 +342,8 @@ print_length([], _D, _RF, _Enc, _Str) ->
     {"[]", 2};
 print_length({}, _D, _RF, _Enc, _Str) ->
     {"{}", 2};
+print_length(#{}=M, _D, _RF, _Enc, _Str) when map_size(M) =:= 0 ->
+    {"#{}", 3};
 print_length(List, D, RF, Enc, Str) when is_list(List) ->
     case Str andalso printable_list(List, D, Enc) of
         true ->
@@ -356,6 +369,8 @@ print_length(R, D, RF, Enc, Str) when is_atom(element(1, R)),
     end;
 print_length(Tuple, D, RF, Enc, Str) when is_tuple(Tuple) ->
     print_length_tuple(Tuple, D, RF, Enc, Str);
+print_length(Map, D, RF, Enc, Str) when is_map(Map) ->
+    print_length_map(Map, D, RF, Enc, Str);
 print_length(<<>>, _D, _RF, _Enc, _Str) ->
     {"<<>>", 4};
 print_length(<<_/bitstring>>, 1, _RF, _Enc, _Str) ->
@@ -389,6 +404,25 @@ print_length(Term, _D, _RF, _Enc, _Str) ->
     S = io_lib:write(Term),
     {S, lists:flatlength(S)}.
 
+print_length_map(_Map, 1, _RF, _Enc, _Str) ->
+    {"#{...}", 6};
+print_length_map(Map, D, RF, Enc, Str) when is_map(Map) ->
+    Pairs = print_length_map_pairs(maps:to_list(Map), D, RF, Enc, Str),
+    {{map, Pairs}, list_length(Pairs, 3)}.
+
+print_length_map_pairs([], _D, _RF, _Enc, _Str) ->
+    [];
+print_length_map_pairs(_Pairs, 1, _RF, _Enc, _Str) ->
+    {dots, 3};
+print_length_map_pairs([{K,V}|Pairs], D, RF, Enc, Str) ->
+    [print_length_map_pair(K,V,D-1,RF,Enc,Str) |
+     print_length_map_pairs(Pairs,D-1,RF,Enc,Str)].
+
+print_length_map_pair(K, V, D, RF, Enc, Str) ->
+    {KS, KL} = print_length(K, D, RF, Enc, Str),
+    {VS, VL} = print_length(V, D, RF, Enc, Str),
+    {{map_pair, {KS,KL}, {VS,VL}}, KL + VL}.
+
 print_length_tuple(_Tuple, 1, _RF, _Enc, _Str) ->
     {"{...}", 5};
 print_length_tuple(Tuple, D, RF, Enc, Str) ->
diff --git a/lib/stdlib/src/lists.erl b/lib/stdlib/src/lists.erl
index b5577165f4..6303465d3d 100644
--- a/lib/stdlib/src/lists.erl
+++ b/lib/stdlib/src/lists.erl
@@ -22,7 +22,7 @@
 -compile({no_auto_import,[min/2]}).
 
 -export([append/2, append/1, subtract/2, reverse/1,
-	 nth/2, nthtail/2, prefix/2, suffix/2, last/1, 
+	 nth/2, nthtail/2, prefix/2, suffix/2, droplast/1, last/1,
 	 seq/2, seq/3, sum/1, duplicate/2, min/1, max/1, sublist/2, sublist/3,
 	 delete/2,
 	 unzip/1, unzip3/1, zip/2, zip3/3, zipwith/3, zipwith3/4,
@@ -203,6 +203,19 @@ suffix(Suffix, List) ->
     Delta = length(List) - length(Suffix),
     Delta >= 0 andalso nthtail(Delta, List) =:= Suffix.
 
+%% droplast(List) returns the list dropping its last element
+
+-spec droplast(List) -> InitList when
+      List :: [T, ...],
+      InitList :: [T],
+      T :: term().
+
+%% This is the simple recursive implementation
+%% reverse(tl(reverse(L))) is faster on average,
+%% but creates more garbage.
+droplast([_T])  -> [];
+droplast([H|T]) -> [H|droplast(T)].
+
 %% last(List) returns the last element in a list.
 
 -spec last(List) -> Last when
@@ -630,7 +643,7 @@ flatlength([H|T], L) when is_list(H) ->
 flatlength([_|T], L) ->
     flatlength(T, L + 1);
 flatlength([], L) -> L.
-
+
 %% keymember(Key, Index, [Tuple]) Now a BIF!
 %% keyfind(Key, Index, [Tuple]) A BIF!
 %% keysearch(Key, Index, [Tuple]) Now a BIF!
@@ -1163,7 +1176,7 @@ rumerge(T1, []) ->
     T1;
 rumerge(T1, [H2 | T2]) ->
     lists:reverse(rumerge2_1(T1, T2, [], H2), []).
-
+
 %% all(Predicate, List)
 %% any(Predicate, List)
 %% map(Function, List)
diff --git a/lib/stdlib/src/log_mf_h.erl b/lib/stdlib/src/log_mf_h.erl
index 19b555a48c..6b42363979 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -135,7 +135,12 @@ handle_event(Event, State) ->
 			State#state{cur_fd = NewFd, curF = NewF, curB = 0}
 		end,
 	    [Hi,Lo] = put_int16(Size),
-	    file:write(NewState#state.cur_fd, [Hi, Lo, Bin]),
+            case file:write(NewState#state.cur_fd, [Hi, Lo, Bin]) of
+                ok ->
+                    ok;
+                {error, Reason} ->
+                    exit({file_exit, Reason})
+            end,
 	    {ok, NewState#state{curB = NewState#state.curB + Size + 2}};
 	_ ->
 	    {ok, State}
@@ -174,7 +179,7 @@ file_open(Dir, FileNo) ->
 	    write_index_file(Dir, FileNo),
 	    {ok, Fd};
 	_ -> 
-	    exit({file, open})
+	    exit(file_open)
     end.
 
 put_int16(I) ->
@@ -211,7 +216,7 @@ write_index_file(Dir, Index) ->
 	    ok = file:close(Fd),
 	    ok = file:rename(TmpFile,File),
 	    ok;
-	_ -> exit(open_index_file)
+	_ -> exit(write_index_file)
     end.
 
 inc(N, Max) ->
diff --git a/lib/stdlib/src/maps.erl b/lib/stdlib/src/maps.erl
new file mode 100644
index 0000000000..57b5072639
--- /dev/null
+++ b/lib/stdlib/src/maps.erl
@@ -0,0 +1,200 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%%
+%% The 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(maps).
+
+-export([
+	fold/3,
+	map/2,
+	size/1,
+	without/2
+    ]).
+
+
+%%% BIFs
+-export([
+	get/2,
+	find/2,
+	from_list/1,
+	is_key/2,
+	keys/1,
+	merge/2,
+	new/0,
+	put/3,
+	remove/2,
+	to_list/1,
+	update/3,
+	values/1
+    ]).
+
+-compile(no_native).
+
+%% Shadowed by erl_bif_types: maps:get/3
+-spec get(Key,Map) -> Value when
+    Key :: term(),
+    Map :: map(),
+    Value :: term().
+
+get(_,_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:find/3
+-spec find(Key,Map) -> {ok, Value} | error when
+    Key :: term(),
+    Map :: map(),
+    Value :: term().
+
+find(_,_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:from_list/1
+-spec from_list([{Key,Value}]) -> Map when
+    Key :: term(),
+    Value :: term(),
+    Map :: map().
+
+from_list(_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:is_key/2
+-spec is_key(Key,Map) -> boolean() when
+    Key :: term(),
+    Map :: map().
+
+is_key(_,_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:keys/1
+-spec keys(Map) -> Keys when
+    Map :: map(),
+    Keys :: [Key],
+    Key :: term().
+
+keys(_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:merge/2
+-spec merge(Map1,Map2) -> Map3 when
+    Map1 :: map(),
+    Map2 :: map(),
+    Map3 :: map().
+
+merge(_,_) -> erlang:nif_error(undef).
+
+
+
+%% Shadowed by erl_bif_types: maps:new/0
+-spec new() -> Map when
+    Map :: map().
+
+new() -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:put/3
+-spec put(Key,Value,Map1) -> Map2 when
+    Key :: term(),
+    Value :: term(),
+    Map1 :: map(),
+    Map2 :: map().
+
+put(_,_,_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:put/3
+-spec remove(Key,Map1) -> Map2 when
+    Key :: term(),
+    Map1 :: map(),
+    Map2 :: map().
+
+remove(_,_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:to_list/1
+-spec to_list(Map) -> [{Key,Value}] when
+    Map :: map(),
+    Key :: term(),
+    Value :: term().
+
+to_list(_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:update/3
+-spec update(Key,Value,Map1) -> Map2 when
+    Key :: term(),
+    Value :: term(),
+    Map1 :: map(),
+    Map2 :: map().
+
+update(_,_,_) -> erlang:nif_error(undef).
+
+
+%% Shadowed by erl_bif_types: maps:values/1
+-spec values(Map) -> Keys when
+    Map :: map(),
+    Keys :: [Key],
+    Key :: term().
+
+values(_) -> erlang:nif_error(undef).
+
+
+%%% End of BIFs
+
+-spec fold(Fun,Init,Map) -> Acc when
+    Fun :: fun((K, V, AccIn) -> AccOut),
+    Init :: term(),
+    Acc :: term(),
+    AccIn :: term(),
+    AccOut :: term(),
+    Map :: map(),
+    K :: term(),
+    V :: term().
+
+fold(Fun, Init, Map) when is_function(Fun,3), is_map(Map) ->
+    lists:foldl(fun({K,V},A) -> Fun(K,V,A) end,Init,maps:to_list(Map)).
+
+-spec map(Fun,Map1) -> Map2 when
+    Fun :: fun((K, V1) -> V2),
+    Map1 :: map(),
+    Map2 :: map(),
+    K :: term(),
+    V1 :: term(),
+    V2 :: term().
+
+map(Fun, Map) when is_function(Fun, 2), is_map(Map) ->
+    maps:from_list(lists:map(fun
+		({K,V}) ->
+		    {K,Fun(K,V)}
+	    end,maps:to_list(Map))).
+
+
+-spec size(Map) -> non_neg_integer() when
+    Map :: map().
+
+size(Map) when is_map(Map) ->
+    erlang:map_size(Map).
+
+
+-spec without(Ks,Map1) -> Map2 when
+    Ks :: [K],
+    Map1 :: map(),
+    Map2 :: map(),
+    K :: term().
+
+without(Ks, M) when is_list(Ks), is_map(M) ->
+    maps:from_list([{K,V}||{K,V} <- maps:to_list(M), not lists:member(K, Ks)]).
diff --git a/lib/stdlib/src/math.erl b/lib/stdlib/src/math.erl
index c3fb684ec3..98a70b1644 100644
--- a/lib/stdlib/src/math.erl
+++ b/lib/stdlib/src/math.erl
@@ -51,9 +51,9 @@ asinh(_) ->
 atan(_) ->
     erlang:nif_error(undef).
 
--spec atan2(X, Y) -> float() when
-      X :: number(),
-      Y :: number().
+-spec atan2(Y, X) -> float() when
+      Y :: number(),
+      X :: number().
 atan2(_, _) ->
     erlang:nif_error(undef).
 
diff --git a/lib/stdlib/src/ms_transform.erl b/lib/stdlib/src/ms_transform.erl
index 4e2ce39ec2..27dfcf52e1 100644
--- a/lib/stdlib/src/ms_transform.erl
+++ b/lib/stdlib/src/ms_transform.erl
@@ -369,6 +369,13 @@ copy({var,_Line,Name} = VarDef,Bound) ->
 copy({'fun',Line,{clauses,Clauses}},Bound) -> % Dont export bindings from funs
     {NewClauses,_IgnoredBindings} = copy_list(Clauses,Bound),
     {{'fun',Line,{clauses,NewClauses}},Bound};
+copy({named_fun,Line,Name,Clauses},Bound) -> % Dont export bindings from funs
+    Bound1 = case Name of
+                 '_' -> Bound;
+                 Name -> gb_sets:add(Name,Bound)
+             end,
+    {NewClauses,_IgnoredBindings} = copy_list(Clauses,Bound1),
+    {{named_fun,Line,Name,NewClauses},Bound};
 copy({'case',Line,Of,ClausesList},Bound) -> % Dont export bindings from funs
     {NewOf,NewBind0} = copy(Of,Bound),
     {NewClausesList,NewBindings} = copy_case_clauses(ClausesList,NewBind0,[]),
@@ -903,6 +910,7 @@ bool_test(is_pid,1) -> true;
 bool_test(is_port,1) -> true;
 bool_test(is_reference,1) -> true;
 bool_test(is_tuple,1) -> true;
+bool_test(is_map,1) -> true;
 bool_test(is_binary,1) -> true;
 bool_test(is_function,1) -> true;
 bool_test(is_record,2) -> true;
@@ -917,6 +925,7 @@ real_guard_function(node,0) -> true;
 real_guard_function(node,1) -> true;
 real_guard_function(round,1) -> true;
 real_guard_function(size,1) -> true;
+real_guard_function(map_size,1) -> true;
 real_guard_function(tl,1) -> true;
 real_guard_function(trunc,1) -> true;
 real_guard_function(self,0) -> true;
diff --git a/lib/stdlib/src/orddict.erl b/lib/stdlib/src/orddict.erl
index 45d3c84b3e..c98d78b34d 100644
--- a/lib/stdlib/src/orddict.erl
+++ b/lib/stdlib/src/orddict.erl
@@ -20,7 +20,7 @@
 -module(orddict).
 
 %% Standard interface.
--export([new/0,is_key/2,to_list/1,from_list/1,size/1]).
+-export([new/0,is_key/2,to_list/1,from_list/1,size/1,is_empty/1]).
 -export([fetch/2,find/2,fetch_keys/1,erase/2]).
 -export([store/3,append/3,append_list/3,update/3,update/4,update_counter/3]).
 -export([fold/3,map/2,filter/2,merge/3]).
@@ -56,14 +56,22 @@ to_list(Dict) -> Dict.
       List :: [{Key :: term(), Value :: term()}],
       Orddict :: orddict().
 
+from_list([]) -> [];
+from_list([{_,_}]=Pair) -> Pair;
 from_list(Pairs) ->
-    lists:foldl(fun ({K,V}, D) -> store(K, V, D) end, [], Pairs).
+    lists:ukeysort(1, reverse_pairs(Pairs, [])).
 
 -spec size(Orddict) -> non_neg_integer() when
       Orddict :: orddict().
 
 size(D) -> length(D).
 
+-spec is_empty(Orddict) -> boolean() when
+      Orddict :: orddict().
+
+is_empty([]) -> true;
+is_empty([_|_]) -> false.
+
 -spec fetch(Key, Orddict) -> Value when
       Key :: term(),
       Value :: term(),
@@ -229,3 +237,7 @@ merge(F, [{K1,V1}|D1], [{_K2,V2}|D2]) ->	%K1 == K2
     [{K1,F(K1, V1, V2)}|merge(F, D1, D2)];
 merge(F, [], D2) when is_function(F, 3) -> D2;
 merge(F, D1, []) when is_function(F, 3) -> D1.
+
+reverse_pairs([{_,_}=H|T], Acc) ->
+    reverse_pairs(T, [H|Acc]);
+reverse_pairs([], Acc) -> Acc.
diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
index cebc9c91bd..380bc3eccc 100644
--- a/lib/stdlib/src/otp_internal.erl
+++ b/lib/stdlib/src/otp_internal.erl
@@ -577,6 +577,24 @@ obsolete_1(wxCursor, new, 3) ->
 obsolete_1(wxCursor, new, 4) ->
     {deprecated,"deprecated function not available in wxWidgets-2.9 and later"};
 
+%% Added in OTP 17.
+obsolete_1(asn1ct, decode,3) ->
+    {deprecated,"deprecated; use Mod:decode/2 instead"};
+obsolete_1(asn1ct, encode, 3) ->
+    {deprecated,"deprecated; use Mod:encode/2 instead"};
+obsolete_1(asn1rt, decode,3) ->
+    {deprecated,"deprecated; use Mod:decode/2 instead"};
+obsolete_1(asn1rt, encode, 2) ->
+    {deprecated,"deprecated; use Mod:encode/2 instead"};
+obsolete_1(asn1rt, encode, 3) ->
+    {deprecated,"deprecated; use Mod:encode/2 instead"};
+obsolete_1(asn1rt, info, 1) ->
+    {deprecated,"deprecated; use Mod:info/0 instead"};
+obsolete_1(asn1rt, utf8_binary_to_list, 1) ->
+    {deprecated,{unicode,characters_to_list,1}};
+obsolete_1(asn1rt, utf8_list_to_binary, 1) ->
+    {deprecated,{unicode,characters_to_binary,1}};
+
 obsolete_1(_, _, _) ->
     no.
 
diff --git a/lib/stdlib/src/pool.erl b/lib/stdlib/src/pool.erl
index a5eb191ab2..dfe6318dea 100644
--- a/lib/stdlib/src/pool.erl
+++ b/lib/stdlib/src/pool.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The 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,7 +63,7 @@ start(Name) ->
       Args :: string(),
       Nodes :: [node()].
 start(Name, Args) when is_atom(Name) ->
-    gen_server:start({global, pool_master}, pool, [], []),
+    _ = gen_server:start({global, pool_master}, pool, [], []),
     Hosts = net_adm:host_file(),
     Nodes = start_nodes(Hosts, Name, Args),
     lists:foreach(fun attach/1, Nodes),
diff --git a/lib/stdlib/src/qlc.erl b/lib/stdlib/src/qlc.erl
index 48f6622565..002032d48d 100644
--- a/lib/stdlib/src/qlc.erl
+++ b/lib/stdlib/src/qlc.erl
@@ -1266,6 +1266,8 @@ abstr_term(Fun, Line) when is_function(Fun) ->
     case erl_eval:fun_data(Fun) of
         {fun_data, _Bs, Cs} ->
             {'fun', Line, {clauses, Cs}};
+        {named_fun_data, _Bs, Name, Cs} ->
+            {named_fun, Line, Name, Cs};
         false ->
             {name, Name} = erlang:fun_info(Fun, name),
             {arity, Arity} = erlang:fun_info(Fun, arity),
diff --git a/lib/stdlib/src/qlc_pt.erl b/lib/stdlib/src/qlc_pt.erl
index 26bc4d1bdf..c26764eb18 100644
--- a/lib/stdlib/src/qlc_pt.erl
+++ b/lib/stdlib/src/qlc_pt.erl
@@ -2540,6 +2540,19 @@ nos({'fun',L,{clauses,Cs}}, S) ->
                {clause,Ln,H,G,B}
            end || {clause,Ln,H0,G0,B0} <- Cs],
     {{'fun',L,{clauses,NCs}}, S};
+nos({named_fun,Loc,Name,Cs}, S) ->
+    {{var,NLoc,NName}, S1} = case Name of
+                                 '_' ->
+                                     S;
+                                 Name ->
+                                     nos_pattern({var,Loc,Name}, S)
+                               end,
+    NCs = [begin
+               {H, S2} = nos_pattern(H0, S1),
+               {[G, B], _} = nos([G0, B0], S2),
+               {clause,CLoc,H,G,B}
+           end || {clause,CLoc,H0,G0,B0} <- Cs],
+    {{named_fun,NLoc,NName,NCs}, S};
 nos({lc,L,E0,Qs0}, S) ->
     %% QLCs as well as LCs. It is OK to modify LCs as long as they
     %% occur within QLCs--the warning messages have already been found
@@ -2713,6 +2726,9 @@ var2const(E) ->
 
 var_map(F, {var, _, _}=V) ->
     F(V);
+var_map(F, {named_fun,NLoc,NName,Cs}) ->
+    {var,Loc,Name} = F({var,NLoc,NName}),
+    {named_fun,Loc,Name,var_map(F, Cs)};
 var_map(F, T) when is_tuple(T) ->
     list_to_tuple(var_map(F, tuple_to_list(T)));
 var_map(F, [E | Es]) ->
diff --git a/lib/stdlib/src/queue.erl b/lib/stdlib/src/queue.erl
index 4bbf5de8a5..472d503b99 100644
--- a/lib/stdlib/src/queue.erl
+++ b/lib/stdlib/src/queue.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %% 
 %% The 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 @@
 -export([cons/2,head/1,tail/1,
 	 snoc/2,last/1,daeh/1,init/1,liat/1,lait/1]).
 
+-export_type([queue/0, queue/1]).
+
 %%--------------------------------------------------------------------------
 %% Efficient implementation of double ended fifo queues
 %%
@@ -44,10 +46,9 @@
 %% that is; the RearList is reversed.
 %%
 
-%% A declaration equivalent to the following is currently hard-coded
-%% in erl_types.erl
-%%
-%% -opaque queue() :: {list(), list()}.
+-opaque queue(Item) :: {list(Item), list(Item)}.
+
+-opaque queue() :: queue(_).
 
 %% Creation, inspection and conversion
 
@@ -79,7 +80,7 @@ len(Q) ->
     erlang:error(badarg, [Q]).
 
 %% O(len(Q))
--spec to_list(Q :: queue()) -> list().
+-spec to_list(Q :: queue(Item)) -> list(Item).
 to_list({In,Out}) when is_list(In), is_list(Out) ->
     Out++lists:reverse(In, []);
 to_list(Q) ->
@@ -88,7 +89,7 @@ to_list(Q) ->
 %% Create queue from list
 %%
 %% O(length(L))
--spec from_list(L :: list()) -> queue().
+-spec from_list(L :: list(Item)) -> queue(Item).
 from_list(L) when is_list(L) ->
     f2r(L);
 from_list(L) ->
@@ -97,7 +98,7 @@ from_list(L) ->
 %% Return true or false depending on if element is in queue
 %% 
 %% O(length(Q)) worst case
--spec member(Item :: term(), Q :: queue()) -> boolean().
+-spec member(Item, Q :: queue(Item)) -> boolean().
 member(X, {R,F}) when is_list(R), is_list(F) ->
     lists:member(X, R) orelse lists:member(X, F);
 member(X, Q) ->
@@ -110,7 +111,7 @@ member(X, Q) ->
 %% Put at least one element in each list, if it is cheap
 %%
 %% O(1)
--spec in(Item :: term(), Q1 :: queue()) -> Q2 :: queue().
+-spec in(Item, Q1 :: queue(Item)) -> Q2 :: queue(Item).
 in(X, {[_]=In,[]}) ->
     {[X], In};
 in(X, {In,Out}) when is_list(In), is_list(Out) ->
@@ -122,7 +123,7 @@ in(X, Q) ->
 %% Put at least one element in each list, if it is cheap
 %%
 %% O(1)
--spec in_r(Item :: term(), Q1 :: queue()) -> Q2 :: queue().
+-spec in_r(Item, Q1 :: queue(Item)) -> Q2 :: queue(Item).
 in_r(X, {[],[_]=F}) ->
     {F,[X]};
 in_r(X, {R,F}) when is_list(R), is_list(F) ->
@@ -133,9 +134,9 @@ in_r(X, Q) ->
 %% Take from head/front
 %%
 %% O(1) amortized, O(len(Q)) worst case
--spec out(Q1 :: queue()) ->
-                 {{value, Item :: term()}, Q2 :: queue()} |
-                 {empty, Q1 :: queue()}.
+-spec out(Q1 :: queue(Item)) ->
+                 {{value, Item}, Q2 :: queue(Item)} |
+                 {empty, Q1 :: queue(Item)}.
 out({[],[]}=Q) ->
     {empty,Q};
 out({[V],[]}) ->
@@ -153,9 +154,9 @@ out(Q) ->
 %% Take from tail/rear
 %%
 %% O(1) amortized, O(len(Q)) worst case
--spec out_r(Q1 :: queue()) ->
-                   {{value, Item :: term()}, Q2 :: queue()} |
-                   {empty, Q1 :: queue()}.
+-spec out_r(Q1 :: queue(Item)) ->
+                 {{value, Item}, Q2 :: queue(Item)} |
+                 {empty, Q1 :: queue(Item)}.
 out_r({[],[]}=Q) ->
     {empty,Q};
 out_r({[],[V]}) ->
@@ -176,7 +177,7 @@ out_r(Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec get(Q :: queue()) -> Item :: term().
+-spec get(Q :: queue(Item)) -> Item.
 get({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 get({R,F}) when is_list(R), is_list(F) ->
@@ -195,7 +196,7 @@ get([_|R], []) -> % malformed queue -> O(len(Q))
 %% Return the last element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec get_r(Q :: queue()) -> Item :: term().
+-spec get_r(Q :: queue(Item)) -> Item.
 get_r({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 get_r({[H|_],F}) when is_list(F) ->
@@ -210,7 +211,7 @@ get_r(Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec peek(Q :: queue()) -> empty | {value,Item :: term()}.
+-spec peek(Q :: queue(Item)) -> empty | {value, Item}.
 peek({[],[]}) ->
     empty;
 peek({R,[H|_]}) when is_list(R) ->
@@ -225,7 +226,7 @@ peek(Q) ->
 %% Return the last element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec peek_r(Q :: queue()) -> empty | {value,Item :: term()}.
+-spec peek_r(Q :: queue(Item)) -> empty | {value, Item}.
 peek_r({[],[]}) ->
     empty;
 peek_r({[H|_],F}) when is_list(F) ->
@@ -240,7 +241,7 @@ peek_r(Q) ->
 %% Remove the first element and return resulting queue
 %%
 %% O(1) amortized
--spec drop(Q1 :: queue()) -> Q2 :: queue().
+-spec drop(Q1 :: queue(Item)) -> Q2 :: queue(Item).
 drop({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 drop({[_],[]}) ->
@@ -258,7 +259,7 @@ drop(Q) ->
 %% Remove the last element and return resulting queue
 %%
 %% O(1) amortized
--spec drop_r(Q1 :: queue()) -> Q2 :: queue().
+-spec drop_r(Q1 :: queue(Item)) -> Q2 :: queue(Item).
 drop_r({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 drop_r({[],[_]}) ->
@@ -279,7 +280,7 @@ drop_r(Q) ->
 %% Return reversed queue
 %%
 %% O(1)
--spec reverse(Q1 :: queue()) -> Q2 :: queue().
+-spec reverse(Q1 :: queue(Item)) -> Q2 :: queue(Item).
 reverse({R,F}) when is_list(R), is_list(F) ->
     {F,R};
 reverse(Q) ->
@@ -289,7 +290,7 @@ reverse(Q) ->
 %%
 %% Q2 empty: O(1)
 %% else:     O(len(Q1))
--spec join(Q1 :: queue(), Q2 :: queue()) -> Q3 :: queue().
+-spec join(Q1 :: queue(Item), Q2 :: queue(Item)) -> Q3 :: queue(Item).
 join({R,F}=Q, {[],[]}) when is_list(R), is_list(F) ->
     Q;
 join({[],[]}, {R,F}=Q) when is_list(R), is_list(F) ->
@@ -303,8 +304,8 @@ join(Q1, Q2) ->
 %%
 %% N = 0..len(Q)
 %% O(max(N, len(Q)))
--spec split(N :: non_neg_integer(), Q1 :: queue()) ->
-                   {Q2 :: queue(),Q3 :: queue()}.
+-spec split(N :: non_neg_integer(), Q1 :: queue(Item)) ->
+                   {Q2 :: queue(Item),Q3 :: queue(Item)}.
 split(0, {R,F}=Q) when is_list(R), is_list(F) ->
     {{[],[]},Q};
 split(N, {R,F}=Q) when is_integer(N), N >= 1, is_list(R), is_list(F) ->
@@ -345,8 +346,8 @@ split_r1_to_f2(N, [X|R1], F1, R2, F2) ->
 %% 
 %% Fun(_) -> List: O(length(List) * len(Q))
 %% else:           O(len(Q)
--spec filter(Fun, Q1 :: queue()) -> Q2 :: queue() when
-      Fun :: fun((Item :: term()) -> boolean() | list()).
+-spec filter(Fun, Q1 :: queue(Item)) -> Q2 :: queue(Item) when
+      Fun :: fun((Item) -> boolean() | list(Item)).
 filter(Fun, {R0,F0}) when is_function(Fun, 1), is_list(R0), is_list(F0) ->
     F = filter_f(Fun, F0),
     R = filter_r(Fun, R0),
@@ -422,7 +423,7 @@ filter_r(Fun, [X|R0]) ->
 
 %% Cons to head
 %%
--spec cons(Item :: term(), Q1 :: queue()) -> Q2 :: queue().
+-spec cons(Item, Q1 :: queue(Item)) -> Q2 :: queue(Item).
 cons(X, Q) ->
     in_r(X, Q).
 
@@ -431,7 +432,7 @@ cons(X, Q) ->
 %% Return the first element in the queue
 %%
 %% O(1) since the queue is supposed to be well formed
--spec head(Q :: queue()) -> Item :: term().
+-spec head(Q :: queue(Item)) -> Item.
 head({[],[]}=Q) ->
     erlang:error(empty, [Q]);
 head({R,F}) when is_list(R), is_list(F) ->
@@ -441,7 +442,7 @@ head(Q) ->
 
 %% Remove head element and return resulting queue
 %%
--spec tail(Q1 :: queue()) -> Q2 :: queue().
+-spec tail(Q1 :: queue(Item)) -> Q2 :: queue(Item).
 tail(Q) ->
     drop(Q).
 
@@ -449,22 +450,22 @@ tail(Q) ->
 
 %% Cons to tail
 %%
--spec snoc(Q1 :: queue(), Item :: term()) -> Q2 :: queue().
+-spec snoc(Q1 :: queue(Item), Item) -> Q2 :: queue(Item).
 snoc(Q, X) ->
     in(X, Q).
 
 %% Return last element
--spec daeh(Q :: queue()) -> Item :: term().
+-spec daeh(Q :: queue(Item)) -> Item.
 daeh(Q) -> get_r(Q).
--spec last(Q :: queue()) -> Item :: term().
+-spec last(Q :: queue(Item)) -> Item.
 last(Q) -> get_r(Q).
 
 %% Remove last element and return resulting queue
--spec liat(Q1 :: queue()) -> Q2 :: queue().
+-spec liat(Q1 :: queue(Item)) -> Q2 :: queue(Item).
 liat(Q) -> drop_r(Q).
--spec lait(Q1 :: queue()) -> Q2 :: queue().
+-spec lait(Q1 :: queue(Item)) -> Q2 :: queue(Item).
 lait(Q) -> drop_r(Q). %% Oops, mis-spelled 'tail' reversed. Forget this one.
--spec init(Q1 :: queue()) -> Q2 :: queue().
+-spec init(Q1 :: queue(Item)) -> Q2 :: queue(Item).
 init(Q) -> drop_r(Q).
 
 %%--------------------------------------------------------------------------
diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index c5109ec455..7f3cd8f592 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,20 +19,20 @@
 -module(re).
 -export([grun/3,urun/3,ucompile/2,replace/3,replace/4,split/2,split/3]).
 
-%-opaque mp() :: {re_pattern, _, _, _}.
--type mp() :: {re_pattern, _, _, _}.
+-type mp() :: {re_pattern, _, _, _, _}.
 
 -type nl_spec() :: cr | crlf | lf | anycrlf | any.
 
 -type compile_option() :: unicode | anchored | caseless | dollar_endonly
                         | dotall | extended | firstline | multiline
                         | no_auto_capture | dupnames | ungreedy
-                        | {newline, nl_spec()}| bsr_anycrlf
-                        | bsr_unicode.
+                        | {newline, nl_spec()}
+                        | bsr_anycrlf | bsr_unicode
+                        | no_start_optimize | ucp | never_utf.
 
 %%% BIFs
 
--export([compile/1, compile/2, run/2, run/3]).
+-export([compile/1, compile/2, run/2, run/3, inspect/2]).
 
 -spec compile(Regexp) -> {ok, MP} | {error, ErrSpec} when
       Regexp :: iodata(),
@@ -63,17 +63,21 @@ run(_, _) ->
 
 -spec run(Subject, RE, Options) -> {match, Captured} |
                                    match |
-                                   nomatch when
+                                   nomatch |
+				   {error, ErrType} when
       Subject :: iodata() | unicode:charlist(),
       RE :: mp() | iodata() | unicode:charlist(),
       Options :: [Option],
-      Option :: anchored | global | notbol | noteol | notempty
+      Option :: anchored | global | notbol | noteol | notempty 
+	      | notempty_atstart | report_errors
               | {offset, non_neg_integer()} |
+		{match_limit, non_neg_integer()} |
+		{match_limit_recursion, 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,
+      ValueSpec :: all | all_but_first | all_names | first | none | ValueList,
       ValueList :: [ValueID],
       ValueID :: integer() | string() | atom(),
       CompileOpt :: compile_option(),
@@ -83,11 +87,21 @@ run(_, _) ->
                    | binary(),
       ListConversionData :: string()
                           | {error, string(), binary()}
-                          | {incomplete, string(), binary()}.
+                          | {incomplete, string(), binary()},
+      ErrType :: match_limit | match_limit_recursion | {compile,  CompileErr}, 
+      CompileErr :: {ErrString :: string(), Position :: non_neg_integer()}.
 
 run(_, _, _) ->
     erlang:nif_error(undef).
 
+-spec inspect(MP,Item) -> {namelist, [ binary() ]} when
+      MP :: mp(),
+      Item :: namelist.
+
+inspect(_,_) ->
+    erlang:nif_error(undef).
+    
+
 %%% End of BIFs
 
 -spec split(Subject, RE) -> SplitList when
@@ -102,8 +116,10 @@ split(Subject,RE) ->
       Subject :: iodata() | unicode:charlist(),
       RE :: mp() | iodata() | unicode:charlist(),
       Options :: [ Option ],
-      Option :: anchored | notbol | noteol | notempty
+      Option :: anchored | notbol | noteol | notempty | notempty_atstart
               | {offset, non_neg_integer()} | {newline, nl_spec()}
+              | {match_limit, non_neg_integer()} 
+              | {match_limit_recursion, non_neg_integer()}
               | bsr_anycrlf | bsr_unicode | {return, ReturnType}
               | {parts, NumParts} | group | trim | CompileOpt,
       NumParts :: non_neg_integer() | infinity,
@@ -266,7 +282,7 @@ extend_subpatterns([],N) ->
 extend_subpatterns([H|T],N) ->
     [H | extend_subpatterns(T,N-1)].
 
-compile_split({re_pattern,N,_,_} = Comp, Options) ->
+compile_split({re_pattern,N,_,_,_} = Comp, Options) ->
     {Comp,N,Options};
 compile_split(Pat,Options0) when not is_tuple(Pat) ->
     Options = lists:filter(fun(O) ->
@@ -275,7 +291,7 @@ compile_split(Pat,Options0) when not is_tuple(Pat) ->
     case re:compile(Pat,Options) of
 	{error,Err} ->
 	    {error,Err};
-	{ok, {re_pattern,N,_,_} = Comp} ->
+	{ok, {re_pattern,N,_,_,_} = Comp} ->
 	    NewOpt = lists:filter(fun(OO) -> (not copt(OO)) end, Options0),
 	    {Comp,N,NewOpt}
     end;
@@ -295,8 +311,11 @@ replace(Subject,RE,Replacement) ->
       RE :: mp() | iodata() | unicode:charlist(),
       Replacement :: iodata() | unicode:charlist(),
       Options :: [Option],
-      Option :: anchored | global | notbol | noteol | notempty
+      Option :: anchored | global | notbol | noteol | notempty 
+	      | notempty_atstart
               | {offset, non_neg_integer()} | {newline, NLSpec} | bsr_anycrlf
+              | {match_limit, non_neg_integer()} 
+              | {match_limit_recursion, non_neg_integer()}
               | bsr_unicode | {return, ReturnType} | CompileOpt,
       ReturnType :: iodata | list | binary,
       CompileOpt :: compile_option(),
@@ -352,6 +371,8 @@ process_repl_params([],Convert,Unicode) ->
 process_repl_params([unicode|T],C,_U) ->
     {NT,NC,NU} = process_repl_params(T,C,true), 
     {[unicode|NT],NC,NU};
+process_repl_params([report_errors|_],_,_) ->
+    throw(badopt);
 process_repl_params([{capture,_,_}|_],_,_) ->
     throw(badopt);
 process_repl_params([{capture,_}|_],_,_) ->
@@ -387,6 +408,8 @@ process_split_params([group|T],C,U,L,S,_G) ->
     process_split_params(T,C,U,L,S,true); 
 process_split_params([global|_],_,_,_,_,_) ->
     throw(badopt);
+process_split_params([report_errors|_],_,_,_,_,_) ->
+    throw(badopt);
 process_split_params([{capture,_,_}|_],_,_,_,_,_) ->
     throw(badopt);
 process_split_params([{capture,_}|_],_,_,_,_,_) ->
@@ -487,17 +510,31 @@ do_replace(Subject,Repl,SubExprs0) ->
       end || Part <- Repl ].
 
 
-check_for_unicode({re_pattern,_,1,_},_) ->
+check_for_unicode({re_pattern,_,1,_,_},_) ->
     true;
-check_for_unicode({re_pattern,_,0,_},_) ->
+check_for_unicode({re_pattern,_,0,_,_},_) ->
     false;
 check_for_unicode(_,L) ->
     lists:member(unicode,L).
+
+check_for_crlf({re_pattern,_,_,1,_},_) ->
+    true;
+check_for_crlf({re_pattern,_,_,0,_},_) ->
+    false;
+check_for_crlf(_,L) ->
+    case lists:keysearch(newline,1,L) of
+	{value,{newline,any}} -> true;
+	{value,{newline,crlf}} -> true;
+	{value,{newline,anycrlf}} -> true;
+	_ -> false
+    end.
     
 % SelectReturn = false | all | stirpfirst | none 
 % ConvertReturn = index | list | binary
 % {capture, all} -> all (untouchded)
-% {capture, first} -> kept in argumentt list and Select all
+% {capture, all_names} -> if names are present: treated as a name {capture, [...]} 
+%                                      else:    same as {capture, []}
+% {capture, first} -> kept in argument list and Select all
 % {capture, all_but_first} -> removed from argument list and selects stripfirst
 % {capture, none} ->  removed from argument list and selects none
 % {capture, []} -> removed from argument list and selects none
@@ -506,23 +543,30 @@ check_for_unicode(_,L) ->
 
 % Call as process_parameters([],0,false,index,NeedClean)
 
-process_parameters([],InitialOffset, SelectReturn, ConvertReturn,_) ->
+process_parameters([],InitialOffset, SelectReturn, ConvertReturn,_,_) ->
     {[], InitialOffset, SelectReturn, ConvertReturn};
-process_parameters([{offset, N} | T],_Init0,Select0,Return0,CC) ->
-    process_parameters(T,N,Select0,Return0,CC);
-process_parameters([global | T],Init0,Select0,Return0,CC) ->
-    process_parameters(T,Init0,Select0,Return0,CC);
-process_parameters([{capture,Values,Type}|T],Init0,Select0,_Return0,CC) ->
-    process_parameters([{capture,Values}|T],Init0,Select0,Type,CC);
-process_parameters([{capture,Values}|T],Init0,Select0,Return0,CC) ->
+process_parameters([{offset, N} | T],_Init0,Select0,Return0,CC,RE) ->
+    process_parameters(T,N,Select0,Return0,CC,RE);
+process_parameters([global | T],Init0,Select0,Return0,CC,RE) ->
+    process_parameters(T,Init0,Select0,Return0,CC,RE);
+process_parameters([{capture,Values,Type}|T],Init0,Select0,_Return0,CC,RE) ->
+    process_parameters([{capture,Values}|T],Init0,Select0,Type,CC,RE);
+process_parameters([{capture,Values}|T],Init0,Select0,Return0,CC,RE) ->
     % First process the rest to see if capture was already present
     {NewTail, Init1, Select1, Return1} = 
-	process_parameters(T,Init0,Select0,Return0,CC),
+	process_parameters(T,Init0,Select0,Return0,CC,RE),
     case Select1 of
 	false ->
 	    case Values of
 		all ->
 		    {[{capture,all} | NewTail], Init1, all, Return0}; 
+		all_names ->
+		    case re:inspect(RE,namelist) of
+			{namelist, []} ->
+			    {[{capture,first} | NewTail], Init1, none, Return0};
+			{namelist, List} ->
+			    {[{capture,[0|List]} | NewTail], Init1, stripfirst, Return0}
+		    end; 
 		first ->
 		    {[{capture,first} | NewTail], Init1, all, Return0};
 		all_but_first ->
@@ -541,20 +585,20 @@ process_parameters([{capture,Values}|T],Init0,Select0,Return0,CC) ->
 	    % Found overriding further down list, ignore this one
 	    {NewTail, Init1, Select1, Return1}
     end;
-process_parameters([H|T],Init0,Select0,Return0,true) ->
+process_parameters([H|T],Init0,Select0,Return0,true,RE) ->
     case copt(H) of
 	true ->
-	    process_parameters(T,Init0,Select0,Return0,true);
+	    process_parameters(T,Init0,Select0,Return0,true,RE);
 	false ->
 	    {NewT,Init,Select,Return} =
-		process_parameters(T,Init0,Select0,Return0,true),	
+		process_parameters(T,Init0,Select0,Return0,true,RE),	
 	    {[H|NewT],Init,Select,Return}
     end;
-process_parameters([H|T],Init0,Select0,Return0,false) ->
+process_parameters([H|T],Init0,Select0,Return0,false,RE) ->
     {NewT,Init,Select,Return} =
-		process_parameters(T,Init0,Select0,Return0,false),
+		process_parameters(T,Init0,Select0,Return0,false,RE),
     {[H|NewT],Init,Select,Return};
-process_parameters(_,_,_,_,_) ->
+process_parameters(_,_,_,_,_,_) ->
     throw(badlist).
 
 postprocess({match,[]},_,_,_,_) ->
@@ -662,7 +706,7 @@ urun2(Subject0,RE0,Options0) ->
     RE = case RE0 of
 	     BinRE when is_binary(BinRE) ->
 		 BinRE;
-	     {re_pattern,_,_,_} = ReCompiled ->
+	     {re_pattern,_,_,_,_} = ReCompiled ->
 		 ReCompiled;
 	     ListRE ->
 		 unicode:characters_to_binary(ListRE,unicode)
@@ -703,38 +747,46 @@ grun(Subject,RE,{Options,NeedClean,OrigRE}) ->
 
 grun2(Subject,RE,{Options,NeedClean}) ->
     Unicode = check_for_unicode(RE,Options),
+    CRLF = check_for_crlf(RE,Options),
     FlatSubject = to_binary(Subject, Unicode),
-    do_grun(FlatSubject,Subject,Unicode,RE,{Options,NeedClean}).
+    do_grun(FlatSubject,Subject,Unicode,CRLF,RE,{Options,NeedClean}).
 
-do_grun(FlatSubject,Subject,Unicode,RE,{Options0,NeedClean}) ->
+do_grun(FlatSubject,Subject,Unicode,CRLF,RE,{Options0,NeedClean}) ->
     {StrippedOptions, InitialOffset,
      SelectReturn, ConvertReturn} = 
 	case (catch 
-		  process_parameters(Options0, 0, false, index, NeedClean)) of
+		  process_parameters(Options0, 0, false, index, NeedClean,RE)) of
 	    badlist ->
 		erlang:error(badarg,[Subject,RE,Options0]);
 	    CorrectReturn ->
 		CorrectReturn
 	end,
-    postprocess(loopexec(FlatSubject,RE,InitialOffset,
-			 byte_size(FlatSubject),
-			 Unicode,StrippedOptions),
-		SelectReturn,ConvertReturn,FlatSubject,Unicode).
+    try
+	postprocess(loopexec(FlatSubject,RE,InitialOffset,
+			     byte_size(FlatSubject),
+			     Unicode,CRLF,StrippedOptions),
+		    SelectReturn,ConvertReturn,FlatSubject,Unicode)
+    catch
+	throw:ErrTuple ->
+	    ErrTuple
+    end.
 
-loopexec(_,_,X,Y,_,_) when X > Y ->
+loopexec(_,_,X,Y,_,_,_) when X > Y ->
     {match,[]};
-loopexec(Subject,RE,X,Y,Unicode,Options) ->
+loopexec(Subject,RE,X,Y,Unicode,CRLF,Options) ->
     case re:run(Subject,RE,[{offset,X}]++Options) of
+	{error, Err} ->
+	    throw({error,Err});
 	nomatch ->
 	    {match,[]};
 	{match,[{A,B}|More]} ->
 	    {match,Rest} = 
 		case B>0 of
 		    true ->
-			loopexec(Subject,RE,A+B,Y,Unicode,Options);
+			loopexec(Subject,RE,A+B,Y,Unicode,CRLF,Options);
 		    false ->
 			{match,M} = 
-			    case re:run(Subject,RE,[{offset,X},notempty,
+			    case re:run(Subject,RE,[{offset,X},notempty_atstart,
 						anchored]++Options) of
 				nomatch ->
 				    {match,[]};
@@ -745,10 +797,10 @@ loopexec(Subject,RE,X,Y,Unicode,Options) ->
 				   [{_,NStep}|_] when NStep > 0 ->
 				       A+NStep;
 				   _ ->
-				       forward(Subject,A,1,Unicode)
+				       forward(Subject,A,1,Unicode,CRLF)
 			       end,
 			{match,MM} = loopexec(Subject,RE,NewA,Y,
-					      Unicode,Options),
+					      Unicode,CRLF,Options),
 			case M of 
 			    [] ->
 				{match,MM};
@@ -759,11 +811,22 @@ loopexec(Subject,RE,X,Y,Unicode,Options) ->
 	    {match,[[{A,B}|More] | Rest]}
     end.
     
-forward(_Chal,A,0,_) ->
+forward(_Chal,A,0,_,_) ->
     A;
-forward(_Chal,A,N,false) ->
-    A+N;
-forward(Chal,A,N,true) ->
+forward(Chal,A,N,U,true) ->
+    <<_:A/binary,Tl/binary>> = Chal,
+    case Tl of
+	<<$\r,$\n,_/binary>> ->
+	    forward(Chal,A+2,N-1,U,true);
+	_ -> 
+	    forward2(Chal,A,N,U,true)
+    end;
+forward(Chal,A,N,U,false) ->
+    forward2(Chal,A,N,U,false).
+
+forward2(Chal,A,N,false,CRLF) ->
+    forward(Chal,A+1,N-1,false,CRLF);
+forward2(Chal,A,N,true,CRLF) ->
     <<_:A/binary,Tl/binary>> = Chal,
     Forw = case Tl of
 	       <<1:1,1:1,0:1,_:5,_/binary>>  ->
@@ -775,10 +838,16 @@ forward(Chal,A,N,true) ->
 	       _ ->
 		   1
 	   end,
-    forward(Chal,A+Forw,N-1,true).
+    forward(Chal,A+Forw,N-1,true,CRLF).
 
 copt(caseless) ->
     true;
+copt(no_start_optimize) ->
+    true;
+copt(never_utf) ->
+    true;
+copt(ucp) ->
+    true;
 copt(dollar_endonly) ->
     true;
 copt(dotall) ->
@@ -809,6 +878,8 @@ copt(_) ->
 
 runopt(notempty) ->
     true;
+runopt(notempty_atstart) ->
+    true;
 runopt(notbol) ->
     true;
 runopt(noteol) ->
@@ -821,6 +892,10 @@ runopt({capture,_}) ->
     true;
 runopt(global) ->
     true;
+runopt({match_limit,_}) ->
+    true;
+runopt({match_limit_recursion,_}) ->
+    true;
 runopt(_) ->
     false.
 
diff --git a/lib/stdlib/src/sets.erl b/lib/stdlib/src/sets.erl
index e6f05b71d4..be4b600f25 100644
--- a/lib/stdlib/src/sets.erl
+++ b/lib/stdlib/src/sets.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %% 
 %% The 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 +43,8 @@
 -export([subtract/2,is_subset/2]).
 -export([fold/3,filter/2]).
 
+-export_type([set/0, set/1]).
+
 %% Note: mk_seg/1 must be changed too if seg_size is changed.
 -define(seg_size, 16).
 -define(max_seg, 32).
@@ -55,7 +56,8 @@
 %%------------------------------------------------------------------------------
 
 -type seg()  :: tuple().
--type segs() :: tuple().
+-type segs(E) :: tuple()
+               | E. % dummy
 
 %% Define a hash set.  The default values are the standard ones.
 -record(set,
@@ -66,14 +68,12 @@
 	 exp_size=?exp_size  :: non_neg_integer(),	% Size to expand at
 	 con_size=?con_size  :: non_neg_integer(),	% Size to contract at
 	 empty               :: seg(),			% Empty segment
-	 segs                :: segs()			% Segments
+	 segs                :: segs(_)			% Segments
 	}).
-%% A declaration equivalent to the following one is hard-coded in erl_types.
-%% That declaration contains hard-coded information about the #set{}
-%% record and the types of its fields.  So, please make sure that any
-%% changes to its structure are also propagated to erl_types.erl.
-%%
-%% -opaque set() :: #set{}.
+
+-opaque set() :: set(_).
+
+-opaque set(Element) :: #set{segs :: segs(Element)}.
 
 %%------------------------------------------------------------------------------
 
@@ -99,24 +99,23 @@ size(S) -> S#set.size.
 %% to_list(Set) -> [Elem].
 %%  Return the elements in Set as a list.
 -spec to_list(Set) -> List when
-      Set :: set(),
-      List :: [term()].
+      Set :: set(Element),
+      List :: [Element].
 to_list(S) ->
     fold(fun (Elem, List) -> [Elem|List] end, [], S).
 
 %% from_list([Elem]) -> Set.
 %%  Build a set from the elements in List.
 -spec from_list(List) -> Set when
-      List :: [term()],
-      Set :: set().
+      List :: [Element],
+      Set :: set(Element).
 from_list(L) ->
     lists:foldl(fun (E, S) -> add_element(E, S) end, new(), L).
 
 %% is_element(Element, Set) -> boolean().
 %%  Return 'true' if Element is an element of Set, else 'false'.
 -spec is_element(Element, Set) -> boolean() when
-      Element :: term(),
-      Set :: set().
+      Set :: set(Element).
 is_element(E, S) ->
     Slot = get_slot(S, E),
     Bkt = get_bucket(S, Slot),
@@ -125,9 +124,8 @@ is_element(E, S) ->
 %% add_element(Element, Set) -> Set.
 %%  Return Set with Element inserted in it.
 -spec add_element(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: set(),
-      Set2 :: set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 add_element(E, S0) ->
     Slot = get_slot(S0, E),
     {S1,Ic} = on_bucket(fun (B0) -> add_bkt_el(E, B0, B0) end, S0, Slot),
@@ -142,9 +140,8 @@ add_bkt_el(E, [], Bkt) -> {[E|Bkt],1}.
 %% del_element(Element, Set) -> Set.
 %%  Return Set but with Element removed.
 -spec del_element(Element, Set1) -> Set2 when
-      Element :: term(),
-      Set1 :: set(),
-      Set2 :: set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 del_element(E, S0) ->
     Slot = get_slot(S0, E),
     {S1,Dc} = on_bucket(fun (B0) -> del_bkt_el(E, B0) end, S0, Slot),
@@ -160,9 +157,9 @@ del_bkt_el(_, []) -> {[],0}.
 %% union(Set1, Set2) -> Set
 %%  Return the union of Set1 and Set2.
 -spec union(Set1, Set2) -> Set3 when
-      Set1 :: set(),
-      Set2 :: set(),
-      Set3 :: set().
+      Set1 :: set(Element),
+      Set2 :: set(Element),
+      Set3 :: set(Element).
 union(S1, S2) when S1#set.size < S2#set.size ->
     fold(fun (E, S) -> add_element(E, S) end, S2, S1);
 union(S1, S2) ->
@@ -171,14 +168,14 @@ union(S1, S2) ->
 %% union([Set]) -> Set
 %%  Return the union of the list of sets.
 -spec union(SetList) -> Set when
-      SetList :: [set()],
-      Set :: set().
+      SetList :: [set(Element)],
+      Set :: set(Element).
 union([S1,S2|Ss]) ->
     union1(union(S1, S2), Ss);
 union([S]) -> S;
 union([]) -> new().
 
--spec union1(set(), [set()]) -> set().
+-spec union1(set(E), [set(E)]) -> set(E).
 union1(S1, [S2|Ss]) ->
     union1(union(S1, S2), Ss);
 union1(S1, []) -> S1.
@@ -186,9 +183,9 @@ union1(S1, []) -> S1.
 %% intersection(Set1, Set2) -> Set.
 %%  Return the intersection of Set1 and Set2.
 -spec intersection(Set1, Set2) -> Set3 when
-      Set1 :: set(),
-      Set2 :: set(),
-      Set3 :: set().
+      Set1 :: set(Element),
+      Set2 :: set(Element),
+      Set3 :: set(Element).
 intersection(S1, S2) when S1#set.size < S2#set.size ->
     filter(fun (E) -> is_element(E, S2) end, S1);
 intersection(S1, S2) ->
@@ -197,13 +194,13 @@ intersection(S1, S2) ->
 %% intersection([Set]) -> Set.
 %%  Return the intersection of the list of sets.
 -spec intersection(SetList) -> Set when
-      SetList :: [set(),...],
-      Set :: set().
+      SetList :: [set(Element),...],
+      Set :: set(Element).
 intersection([S1,S2|Ss]) ->
     intersection1(intersection(S1, S2), Ss);
 intersection([S]) -> S.
 
--spec intersection1(set(), [set()]) -> set().
+-spec intersection1(set(E), [set(E)]) -> set(E).
 intersection1(S1, [S2|Ss]) ->
     intersection1(intersection(S1, S2), Ss);
 intersection1(S1, []) -> S1.
@@ -211,8 +208,8 @@ intersection1(S1, []) -> S1.
 %% is_disjoint(Set1, Set2) -> boolean().
 %%  Check whether Set1 and Set2 are disjoint.
 -spec is_disjoint(Set1, Set2) -> boolean() when
-      Set1 :: set(),
-      Set2 :: set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 is_disjoint(S1, S2) when S1#set.size < S2#set.size ->
     fold(fun (_, false) -> false;
 	     (E, true) -> not is_element(E, S2)
@@ -226,9 +223,9 @@ is_disjoint(S1, S2) ->
 %%  Return all and only the elements of Set1 which are not also in
 %%  Set2.
 -spec subtract(Set1, Set2) -> Set3 when
-      Set1 :: set(),
-      Set2 :: set(),
-      Set3 :: set().
+      Set1 :: set(Element),
+      Set2 :: set(Element),
+      Set3 :: set(Element).
 subtract(S1, S2) ->
     filter(fun (E) -> not is_element(E, S2) end, S1).
 
@@ -236,34 +233,34 @@ subtract(S1, S2) ->
 %%  Return 'true' when every element of Set1 is also a member of
 %%  Set2, else 'false'.
 -spec is_subset(Set1, Set2) -> boolean() when
-      Set1 :: set(),
-      Set2 :: set().
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 is_subset(S1, S2) ->
     fold(fun (E, Sub) -> Sub andalso is_element(E, S2) end, true, S1).
 
 %% fold(Fun, Accumulator, Set) -> Accumulator.
 %%  Fold function Fun over all elements in Set and return Accumulator.
 -spec fold(Function, Acc0, Set) -> Acc1 when
-      Function :: fun((E :: term(),AccIn) -> AccOut),
-      Set :: set(),
-      Acc0 :: T,
-      Acc1 :: T,
-      AccIn :: T,
-      AccOut :: T.
+      Function :: fun((Element, AccIn) -> AccOut),
+      Set :: set(Element),
+      Acc0 :: Acc,
+      Acc1 :: Acc,
+      AccIn :: Acc,
+      AccOut :: Acc.
 fold(F, Acc, D) -> fold_set(F, Acc, D).
 
 %% filter(Fun, Set) -> Set.
 %%  Filter Set with Fun.
 -spec filter(Pred, Set1) -> Set2 when
-      Pred :: fun((E :: term()) -> boolean()),
-      Set1 :: set(),
-      Set2 :: set().
+      Pred :: fun((Element) -> boolean()),
+      Set1 :: set(Element),
+      Set2 :: set(Element).
 filter(F, D) -> filter_set(F, D).
 
 %% get_slot(Hashdb, Key) -> Slot.
 %%  Get the slot.  First hash on the new range, if we hit a bucket
 %%  which has not been split use the unsplit buddy bucket.
--spec get_slot(set(), term()) -> non_neg_integer().
+-spec get_slot(set(E), E) -> non_neg_integer().
 get_slot(T, Key) ->
     H = erlang:phash(Key, T#set.maxn),
     if
@@ -277,8 +274,8 @@ get_bucket(T, Slot) -> get_bucket_s(T#set.segs, Slot).
 
 %% on_bucket(Fun, Hashdb, Slot) -> {NewHashDb,Result}.
 %%  Apply Fun to the bucket in Slot and replace the returned bucket.
--spec on_bucket(fun((_) -> {[_], 0 | 1}), set(), non_neg_integer()) ->
-	  {set(), 0 | 1}.
+-spec on_bucket(fun((_) -> {[_], 0 | 1}), set(E), non_neg_integer()) ->
+	  {set(E), 0 | 1}.
 on_bucket(F, T, Slot) ->
     SegI = ((Slot-1) div ?seg_size) + 1,
     BktI = ((Slot-1) rem ?seg_size) + 1,
@@ -352,7 +349,7 @@ put_bucket_s(Segs, Slot, Bkt) ->
     Seg = setelement(BktI, element(SegI, Segs), Bkt),
     setelement(SegI, Segs, Seg).
 
--spec maybe_expand(set(), 0 | 1) -> set().
+-spec maybe_expand(set(E), 0 | 1) -> set(E).
 maybe_expand(T0, Ic) when T0#set.size + Ic > T0#set.exp_size ->
     T = maybe_expand_segs(T0),			%Do we need more segments.
     N = T#set.n + 1,				%Next slot to expand into
@@ -370,14 +367,14 @@ maybe_expand(T0, Ic) when T0#set.size + Ic > T0#set.exp_size ->
 	  segs = Segs2};
 maybe_expand(T, Ic) -> T#set{size = T#set.size + Ic}.
 
--spec maybe_expand_segs(set()) -> set().
+-spec maybe_expand_segs(set(E)) -> set(E).
 maybe_expand_segs(T) when T#set.n =:= T#set.maxn ->
     T#set{maxn = 2 * T#set.maxn,
 	  bso  = 2 * T#set.bso,
 	  segs = expand_segs(T#set.segs, T#set.empty)};
 maybe_expand_segs(T) -> T.
 
--spec maybe_contract(set(), non_neg_integer()) -> set().
+-spec maybe_contract(set(E), non_neg_integer()) -> set(E).
 maybe_contract(T, Dc) when T#set.size - Dc < T#set.con_size,
 			   T#set.n > ?seg_size ->
     N = T#set.n,
@@ -396,7 +393,7 @@ maybe_contract(T, Dc) when T#set.size - Dc < T#set.con_size,
 			      segs = Segs2});
 maybe_contract(T, Dc) -> T#set{size = T#set.size - Dc}.
 
--spec maybe_contract_segs(set()) -> set().
+-spec maybe_contract_segs(set(E)) -> set(E).
 maybe_contract_segs(T) when T#set.n =:= T#set.bso ->
     T#set{maxn = T#set.maxn div 2,
 	  bso  = T#set.bso div 2,
@@ -423,7 +420,7 @@ mk_seg(16) -> {[],[],[],[],[],[],[],[],[],[],[],[],[],[],[],[]}.
 %%  of segments.  We special case the powers of 2 upto 32, this should
 %%  catch most case.  N.B. the last element in the segments tuple is
 %%  an extra element containing a default empty segment.
--spec expand_segs(segs(), seg()) -> segs().
+-spec expand_segs(segs(E), seg()) -> segs(E).
 expand_segs({B1}, Empty) ->
     {B1,Empty};
 expand_segs({B1,B2}, Empty) ->
@@ -441,7 +438,7 @@ expand_segs(Segs, Empty) ->
     list_to_tuple(tuple_to_list(Segs) 
     ++ lists:duplicate(tuple_size(Segs), Empty)).
 
--spec contract_segs(segs()) -> segs().
+-spec contract_segs(segs(E)) -> segs(E).
 contract_segs({B1,_}) ->
     {B1};
 contract_segs({B1,B2,_,_}) ->
diff --git a/lib/stdlib/src/shell.erl b/lib/stdlib/src/shell.erl
index c6c706c3a7..3b90542452 100644
--- a/lib/stdlib/src/shell.erl
+++ b/lib/stdlib/src/shell.erl
@@ -58,7 +58,7 @@ start(NoCtrlG) ->
     start(NoCtrlG, false).
 
 start(NoCtrlG, StartSync) ->
-    code:ensure_loaded(user_default),
+    _ = code:ensure_loaded(user_default),
     spawn(fun() -> server(NoCtrlG, StartSync) end).
 
 %% Find the pid of the current evaluator process.
@@ -424,6 +424,8 @@ expand_expr({remote,L,M,F}, C) ->
     {remote,L,expand_expr(M, C),expand_expr(F, C)};
 expand_expr({'fun',L,{clauses,Cs}}, C) ->
     {'fun',L,{clauses,expand_exprs(Cs, C)}};
+expand_expr({named_fun,L,Name,Cs}, C) ->
+    {named_fun,L,Name,expand_exprs(Cs, C)};
 expand_expr({clause,L,H,G,B}, C) ->
     %% Could expand H and G, but then erl_eval has to be changed as well.
     {clause,L,H, G, expand_exprs(B, C)};
@@ -677,8 +679,10 @@ exprs([E0|Es], Bs1, RT, Lf, Ef, Bs0, W) ->
             if
                 Es =:= [] ->
                     VS = pp(V0, 1, RT),
-                    [io:requests([{put_chars, unicode, VS}, nl]) ||
-                        W =:= cmd],
+                    case W of
+                        cmd -> io:requests([{put_chars, unicode, VS}, nl]);
+                        pmt -> ok
+                    end,
                     %% Don't send the result back if it will be
                     %% discarded anyway.
                     V = if
@@ -1311,6 +1315,11 @@ list_bindings([{Name,Val}|Bs], RT) ->
             F = {'fun',0,{clauses,FCs}},
             M = {match,0,{var,0,Name},F},
             io:fwrite(<<"~ts\n">>, [erl_pp:expr(M, enc())]);
+        {named_fun_data,_FBs,FName,FCs0} ->
+            FCs = expand_value(FCs0), % looks nicer
+            F = {named_fun,0,FName,FCs},
+            M = {match,0,{var,0,Name},F},
+            io:fwrite(<<"~ts\n">>, [erl_pp:expr(M, enc())]);
         false ->
             Namel = io_lib:fwrite(<<"~s = ">>, [Name]),
             Nl = iolist_size(Namel)+1,
diff --git a/lib/stdlib/src/slave.erl b/lib/stdlib/src/slave.erl
index 9c74041f56..3e647635bc 100644
--- a/lib/stdlib/src/slave.erl
+++ b/lib/stdlib/src/slave.erl
@@ -289,7 +289,8 @@ register_unique_name(Number) ->
 %% If the node should run on the local host, there is
 %% no need to use rsh.
 
-mk_cmd(Host, Name, Args, Waiter, Prog) ->
+mk_cmd(Host, Name, Args, Waiter, Prog0) ->
+    Prog = quote_progname(Prog0),
     BasicCmd = lists:concat([Prog,
 			     " -detached -noinput -master ", node(),
 			     " ", long_or_short(), Name, "@", Host,
@@ -309,6 +310,31 @@ mk_cmd(Host, Name, Args, Waiter, Prog) ->
 	    end
     end.
 
+%% This is an attempt to distinguish between spaces in the program
+%% path and spaces that separate arguments. The program is quoted to
+%% allow spaces in the path.
+%%
+%% Arguments could exist either if the executable is excplicitly given
+%% (through start/5) or if the -program switch to beam is used and
+%% includes arguments (typically done by cerl in OTP test environment
+%% in order to ensure that slave/peer nodes are started with the same
+%% emulator and flags as the test node. The return from lib:progname()
+%% could then typically be '/<full_path_to>/cerl -gcov').
+quote_progname(Progname) ->
+    do_quote_progname(string:tokens(to_list(Progname)," ")).
+
+do_quote_progname([Prog]) ->
+    "\""++Prog++"\"";
+do_quote_progname([Prog,Arg|Args]) ->
+    case os:find_executable(Prog) of
+	false ->
+	    do_quote_progname([Prog++" "++Arg | Args]);
+	_ ->
+	    %% this one has an executable - we assume the rest are arguments
+	    "\""++Prog++"\""++
+		lists:flatten(lists:map(fun(X) -> [" ",X] end, [Arg|Args]))
+    end.
+
 %% Give the user an opportunity to run another program,
 %% than the "rsh".  On HP-UX rsh is called remsh; thus HP users
 %% must start erlang as erl -rsh remsh.
diff --git a/lib/stdlib/src/sofs.erl b/lib/stdlib/src/sofs.erl
index 34eb224647..0bd67db100 100644
--- a/lib/stdlib/src/sofs.erl
+++ b/lib/stdlib/src/sofs.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1509,7 +1509,7 @@ family_projection(SetFun, F) when ?IS_SET(F) ->
 %%%
 
 -spec(family_to_digraph(Family) -> Graph when
-      Graph :: digraph(),
+      Graph :: digraph:graph(),
       Family :: family()).
 family_to_digraph(F) when ?IS_SET(F) ->
     case ?TYPE(F) of
@@ -1519,7 +1519,7 @@ family_to_digraph(F) when ?IS_SET(F) ->
     end.
 
 -spec(family_to_digraph(Family, GraphType) -> Graph when
-      Graph :: digraph(),
+      Graph :: digraph:graph(),
       Family :: family(),
       GraphType :: [digraph:d_type()]).
 family_to_digraph(F, Type) when ?IS_SET(F) ->
@@ -1541,7 +1541,7 @@ family_to_digraph(F, Type) when ?IS_SET(F) ->
     end.
 
 -spec(digraph_to_family(Graph) -> Family when
-      Graph :: digraph(),
+      Graph :: digraph:graph(),
       Family :: family()).
 digraph_to_family(G) ->
     case catch digraph_family(G) of
@@ -1550,7 +1550,7 @@ digraph_to_family(G) ->
     end.
 
 -spec(digraph_to_family(Graph, Type) -> Family when
-      Graph :: digraph(),
+      Graph :: digraph:graph(),
       Family :: family(),
       Type :: type()).
 digraph_to_family(G, T) ->
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index a30685e830..a64b8e13c0 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -71,6 +71,7 @@
 	     lib,
 	     lists,
 	     log_mf_h,
+	     maps,
 	     math,
 	     ms_transform,
 	     orddict,
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 55c8087475..22eefb2514 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The 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,12 +16,10 @@
 %%
 %% %CopyrightEnd%
 {"%VSN%",
- %% Up from - max two major revisions back
- [{<<"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\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14
+ %% Up from - max one major revision back
+ [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R16
+ %% Down to - max one major revision back
+ [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R16
 }.
diff --git a/lib/stdlib/src/string.erl b/lib/stdlib/src/string.erl
index 4ed27ff4eb..f9b083a56d 100644
--- a/lib/stdlib/src/string.erl
+++ b/lib/stdlib/src/string.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -257,7 +256,7 @@ chars(C, N, Tail) when N > 0 ->
     chars(C, N-1, [C|Tail]);
 chars(C, 0, Tail) when is_integer(C) ->
     Tail.
-
+
 %% Torbjörn's bit.
 
 %%% COPIES %%%
@@ -461,7 +460,7 @@ sub_string(String, Start) -> substr(String, Start).
       Stop :: pos_integer().
 
 sub_string(String, Start, Stop) -> substr(String, Start, Stop - Start + 1).
-
+
 %% ISO/IEC 8859-1 (latin1) letters are converted, others are ignored
 %%
 
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl
index 6d8e25b1de..ede2742875 100644
--- a/lib/stdlib/src/supervisor.erl
+++ b/lib/stdlib/src/supervisor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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,10 +45,13 @@
 -type restart()  :: 'permanent' | 'transient' | 'temporary'.
 -type shutdown() :: 'brutal_kill' | timeout().
 -type worker()   :: 'worker' | 'supervisor'.
--type sup_name() :: {'local', Name :: atom()} | {'global', Name :: atom()}.
+-type sup_name() :: {'local', Name :: atom()}
+                  | {'global', Name :: atom()}
+                  | {'via', Module :: module(), Name :: any()}.
 -type sup_ref()  :: (Name :: atom())
                   | {Name :: atom(), Node :: node()}
                   | {'global', Name :: atom()}
+                  | {'via', Module :: module(), Name :: any()}
                   | pid().
 -type child_spec() :: {Id :: child_id(),
                        StartFunc :: mfargs(),
@@ -74,14 +77,15 @@
 		modules = []    :: modules()}).
 -type child_rec() :: #child{}.
 
--define(DICT, dict).
+-define(DICTS, dict).
+-define(DICT, dict:dict).
 -define(SETS, sets).
--define(SET, set).
+-define(SET, sets:set).
 
 -record(state, {name,
 		strategy               :: strategy(),
 		children = []          :: [child_rec()],
-		dynamics               :: ?DICT() | ?SET(),
+		dynamics               :: ?DICT(pid(), list()) | ?SET(pid()),
 		intensity              :: non_neg_integer(),
 		period                 :: pos_integer(),
 		restarts = [],
@@ -260,7 +264,7 @@ init_children(State, StartSpec) ->
                 {ok, NChildren} ->
                     {ok, State#state{children = NChildren}};
                 {error, NChildren, Reason} ->
-                    terminate_children(NChildren, SupName),
+                    _ = terminate_children(NChildren, SupName),
                     {stop, {shutdown, Reason}}
             end;
         Error ->
@@ -441,7 +445,7 @@ handle_call(which_children, _From, #state{children = [#child{restart_type = RTyp
 		State) when ?is_simple(State) ->
     Reply = lists:map(fun({?restarting(_),_}) -> {undefined,restarting,CT,Mods};
 			 ({Pid, _}) -> {undefined, Pid, CT, Mods} end,
-		      ?DICT:to_list(dynamics_db(RType, State#state.dynamics))),
+		      ?DICTS:to_list(dynamics_db(RType, State#state.dynamics))),
     {reply, Reply, State};
 
 handle_call(which_children, _From, State) ->
@@ -480,7 +484,7 @@ handle_call(count_children, _From,  #state{children = [#child{restart_type = RTy
 							      child_type = CT}]} = State)
   when ?is_simple(State) ->
     {Active, Count} =
-	?DICT:fold(fun(Pid, _Val, {Alive, Tot}) ->
+	?DICTS:fold(fun(Pid, _Val, {Alive, Tot}) ->
 			   case is_pid(Pid) andalso is_process_alive(Pid) of
 			       true ->
 				   {Alive+1, Tot +1};
@@ -752,10 +756,16 @@ restart(Child, State) ->
 		    Id = if ?is_simple(State) -> Child#child.pid;
 			    true -> Child#child.name
 			 end,
-		    timer:apply_after(0,?MODULE,try_again_restart,[self(),Id]),
+		    {ok, _TRef} = timer:apply_after(0,
+                                                    ?MODULE,
+                                                    try_again_restart,
+                                                    [self(),Id]),
 		    {ok,NState2};
 		{try_again, NState2, #child{name=ChName}} ->
-		    timer:apply_after(0,?MODULE,try_again_restart,[self(),ChName]),
+		    {ok, _TRef} = timer:apply_after(0,
+						    ?MODULE,
+						    try_again_restart,
+						    [self(),ChName]),
 		    {ok,NState2};
 		Other ->
 		    Other
@@ -768,17 +778,17 @@ restart(Child, State) ->
 
 restart(simple_one_for_one, Child, State) ->
     #child{pid = OldPid, mfargs = {M, F, A}} = Child,
-    Dynamics = ?DICT:erase(OldPid, dynamics_db(Child#child.restart_type,
+    Dynamics = ?DICTS:erase(OldPid, dynamics_db(Child#child.restart_type,
 					       State#state.dynamics)),
     case do_start_child_i(M, F, A) of
 	{ok, Pid} ->
-	    NState = State#state{dynamics = ?DICT:store(Pid, A, Dynamics)},
+	    NState = State#state{dynamics = ?DICTS:store(Pid, A, Dynamics)},
 	    {ok, NState};
 	{ok, Pid, _Extra} ->
-	    NState = State#state{dynamics = ?DICT:store(Pid, A, Dynamics)},
+	    NState = State#state{dynamics = ?DICTS:store(Pid, A, Dynamics)},
 	    {ok, NState};
 	{error, Error} ->
-	    NState = State#state{dynamics = ?DICT:store(restarting(OldPid), A,
+	    NState = State#state{dynamics = ?DICTS:store(restarting(OldPid), A,
 							Dynamics)},
 	    report_error(start_error, Error, Child, State#state.name),
 	    {try_again, NState}
@@ -850,7 +860,7 @@ terminate_children(Children, SupName) ->
 %% we do want them to be shut down as many functions from this module
 %% use this function to just clear everything.
 terminate_children([Child = #child{restart_type=temporary} | Children], SupName, Res) ->
-    do_terminate(Child, SupName),
+    _ = do_terminate(Child, SupName),
     terminate_children(Children, SupName, Res);
 terminate_children([Child | Children], SupName, Res) ->
     NChild = do_terminate(Child, SupName),
@@ -971,7 +981,7 @@ terminate_dynamic_children(Child, Dynamics, SupName) ->
                      wait_dynamic_children(Child, Pids, Sz, TRef, EStack0)
              end,
     %% Unroll stacked errors and report them
-    ?DICT:fold(fun(Reason, Ls, _) ->
+    ?DICTS:fold(fun(Reason, Ls, _) ->
                        report_error(shutdown_error, Reason,
                                     Child#child{pid=Ls}, SupName)
                end, ok, EStack).
@@ -985,22 +995,22 @@ monitor_dynamic_children(#child{restart_type=temporary}, Dynamics) ->
                            {error, normal} ->
                                {Pids, EStack};
                            {error, Reason} ->
-                               {Pids, ?DICT:append(Reason, P, EStack)}
+                               {Pids, ?DICTS:append(Reason, P, EStack)}
                        end
-               end, {?SETS:new(), ?DICT:new()}, Dynamics);
+               end, {?SETS:new(), ?DICTS:new()}, Dynamics);
 monitor_dynamic_children(#child{restart_type=RType}, Dynamics) ->
-    ?DICT:fold(fun(P, _, {Pids, EStack}) when is_pid(P) ->
+    ?DICTS:fold(fun(P, _, {Pids, EStack}) when is_pid(P) ->
                        case monitor_child(P) of
                            ok ->
                                {?SETS:add_element(P, Pids), EStack};
                            {error, normal} when RType =/= permanent ->
                                {Pids, EStack};
                            {error, Reason} ->
-                               {Pids, ?DICT:append(Reason, P, EStack)}
+                               {Pids, ?DICTS:append(Reason, P, EStack)}
                        end;
 		  (?restarting(_), _, {Pids, EStack}) ->
 		       {Pids, EStack}
-               end, {?SETS:new(), ?DICT:new()}, Dynamics).
+               end, {?SETS:new(), ?DICTS:new()}, Dynamics).
 
 
 wait_dynamic_children(_Child, _Pids, 0, undefined, EStack) ->
@@ -1008,7 +1018,7 @@ wait_dynamic_children(_Child, _Pids, 0, undefined, EStack) ->
 wait_dynamic_children(_Child, _Pids, 0, TRef, EStack) ->
 	%% If the timer has expired before its cancellation, we must empty the
 	%% mail-box of the 'timeout'-message.
-    erlang:cancel_timer(TRef),
+    _ = erlang:cancel_timer(TRef),
     receive
         {timeout, TRef, kill} ->
             EStack
@@ -1024,7 +1034,7 @@ wait_dynamic_children(#child{shutdown=brutal_kill} = Child, Pids, Sz,
 
         {'DOWN', _MRef, process, Pid, Reason} ->
             wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
-                                  TRef, ?DICT:append(Reason, Pid, EStack))
+                                  TRef, ?DICTS:append(Reason, Pid, EStack))
     end;
 wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz,
                       TRef, EStack) ->
@@ -1039,7 +1049,7 @@ wait_dynamic_children(#child{restart_type=RType} = Child, Pids, Sz,
 
         {'DOWN', _MRef, process, Pid, Reason} ->
             wait_dynamic_children(Child, ?SETS:del_element(Pid, Pids), Sz-1,
-                                  TRef, ?DICT:append(Reason, Pid, EStack));
+                                  TRef, ?DICTS:append(Reason, Pid, EStack));
 
         {timeout, TRef, kill} ->
             ?SETS:fold(fun(P, _) -> exit(P, kill) end, ok, Pids),
@@ -1064,12 +1074,12 @@ save_child(Child, #state{children = Children} = State) ->
 save_dynamic_child(temporary, Pid, _, #state{dynamics = Dynamics} = State) ->
     State#state{dynamics = ?SETS:add_element(Pid, dynamics_db(temporary, Dynamics))};
 save_dynamic_child(RestartType, Pid, Args, #state{dynamics = Dynamics} = State) ->
-    State#state{dynamics = ?DICT:store(Pid, Args, dynamics_db(RestartType, Dynamics))}.
+    State#state{dynamics = ?DICTS:store(Pid, Args, dynamics_db(RestartType, Dynamics))}.
 
 dynamics_db(temporary, undefined) ->
     ?SETS:new();
 dynamics_db(_, undefined) ->
-    ?DICT:new();
+    ?DICTS:new();
 dynamics_db(_,Dynamics) ->
     Dynamics.
 
@@ -1078,14 +1088,14 @@ dynamic_child_args(Pid, Dynamics) ->
         true ->
             {ok, undefined};
         false ->
-            ?DICT:find(Pid, Dynamics)
+            ?DICTS:find(Pid, Dynamics)
     end.
 
 state_del_child(#child{pid = Pid, restart_type = temporary}, State) when ?is_simple(State) ->
     NDynamics = ?SETS:del_element(Pid, dynamics_db(temporary, State#state.dynamics)),
     State#state{dynamics = NDynamics};
 state_del_child(#child{pid = Pid, restart_type = RType}, State) when ?is_simple(State) ->
-    NDynamics = ?DICT:erase(Pid, dynamics_db(RType, State#state.dynamics)),
+    NDynamics = ?DICTS:erase(Pid, dynamics_db(RType, State#state.dynamics)),
     State#state{dynamics = NDynamics};
 state_del_child(Child, State) ->
     NChildren = del_child(Child#child.name, State#state.children),
@@ -1148,7 +1158,7 @@ is_dynamic_pid(Pid, Dynamics) ->
 	true ->
 	    ?SETS:is_element(Pid, Dynamics);
 	false ->
-	    ?DICT:is_key(Pid, Dynamics)
+	    ?DICTS:is_key(Pid, Dynamics)
     end.
 
 replace_child(Child, State) ->
diff --git a/lib/stdlib/src/supervisor_bridge.erl b/lib/stdlib/src/supervisor_bridge.erl
index e8405ab9a4..ff4502f0b9 100644
--- a/lib/stdlib/src/supervisor_bridge.erl
+++ b/lib/stdlib/src/supervisor_bridge.erl
@@ -101,7 +101,16 @@ handle_cast(_, State) ->
     {noreply, State}.
 
 handle_info({'EXIT', Pid, Reason}, State) when State#state.pid =:= Pid ->
-    report_error(child_terminated, Reason, State),
+	case Reason of
+	normal ->
+	    ok;
+	shutdown ->
+	    ok;
+	{shutdown, _Term} ->
+	    ok;
+	_ ->
+	    report_error(child_terminated, Reason, State)
+	end,
     {stop, Reason, State#state{pid = undefined}};
 handle_info(_, State) ->
     {noreply, State}.
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl
index c186eab940..04f8dfb61b 100644
--- a/lib/stdlib/src/sys.erl
+++ b/lib/stdlib/src/sys.erl
@@ -317,10 +317,10 @@ handle_system_msg(Msg, From, Parent, Mod, Debug, Misc, Hib) ->
 handle_system_msg(SysState, Msg, From, Parent, Mod, Debug, Misc, Hib) ->
     case do_cmd(SysState, Msg, Parent, Mod, Debug, Misc) of
 	{suspended, Reply, NDebug, NMisc} ->
-	    gen:reply(From, Reply),
+	    _ = gen:reply(From, Reply),
 	    suspend_loop(suspended, Parent, Mod, NDebug, NMisc, Hib);
 	{running, Reply, NDebug, NMisc} ->
-	    gen:reply(From, Reply),
+	    _ = gen:reply(From, Reply),
             Mod:system_continue(Parent, NDebug, NMisc)
     end.
 
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index 3cf358630f..72a2dd9616 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -258,7 +258,7 @@ ensure_started() ->
 	undefined -> 
 	    C = {timer_server, {?MODULE, start_link, []}, permanent, 1000, 
 		 worker, [?MODULE]},
-	    supervisor:start_child(kernel_safe_sup, C),  % kernel_safe_sup
+	    _ = supervisor:start_child(kernel_safe_sup, C),
 	    ok;
 	_ -> ok
     end.
diff --git a/lib/stdlib/test/base64_SUITE.erl b/lib/stdlib/test/base64_SUITE.erl
index b28df94221..b0da6408ff 100644
--- a/lib/stdlib/test/base64_SUITE.erl
+++ b/lib/stdlib/test/base64_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2007-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
 %% 
 %% The 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/test/binary_module_SUITE.erl b/lib/stdlib/test/binary_module_SUITE.erl
index 9b6f628aa9..d5a0fe21b4 100644
--- a/lib/stdlib/test/binary_module_SUITE.erl
+++ b/lib/stdlib/test/binary_module_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -249,6 +248,10 @@ badargs(Config) when is_list(Config) ->
 	   binary:matches(<<1,2,3>>,
 			{ac,ets:match_spec_compile([{'_',[],['$_']}])},
 			[{scope,{0,1}}])),
+    %% OTP-11350
+    badarg = ?MASK_ERROR(
+		binary:matches(<<"foo">>, 
+			       [<<>>, <<"f">>])),
     ?line badarg =
 	?MASK_ERROR(binary:longest_common_prefix(
 		      [<<0:10000,1,2,4,1:3>>,
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index 8ff7c3ccc9..059d553b00 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -52,7 +52,7 @@
          simultaneous_open/1, insert_new/1, repair_continuation/1,
          otp_5487/1, otp_6206/1, otp_6359/1, otp_4738/1, otp_7146/1,
          otp_8070/1, otp_8856/1, otp_8898/1, otp_8899/1, otp_8903/1,
-         otp_8923/1, otp_9282/1]).
+         otp_8923/1, otp_9282/1, otp_11245/1]).
 
 -export([dets_dirty_loop/0]).
 
@@ -109,7 +109,7 @@ all() ->
 	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_8899, otp_8903, otp_8923, otp_9282, otp_11245
     ].
 
 groups() -> 
@@ -3898,6 +3898,28 @@ some_calls(Tab, Config) ->
     file:delete(File).
 
 
+otp_11245(doc) ->
+    ["OTP-11245. Tables remained fixed after traversal"];
+otp_11245(suite) ->
+    [];
+otp_11245(Config) when is_list(Config) ->
+    Tab = otp_11245,
+    File = filename(Tab, Config),
+    {ok, Tab} = dets:open_file(Tab, [{file,File}]),
+    N = 1024,
+    ins(Tab, N),
+    N = length(dets:match(Tab, '_')),
+    false = dets:info(Tab, safe_fixed),
+    dets:traverse(Tab, fun(_) -> continue end),
+    false = dets:info(Tab, safe_fixed),
+    N = dets:foldl(fun(_, N2) -> N2+1 end, 0, Tab),
+    false = dets:info(Tab, safe_fixed),
+    N = dets:foldr(fun(_, N2) -> N2+1 end, 0, Tab),
+    false = dets:info(Tab, safe_fixed),
+    ok = dets:close(Tab),
+    file:delete(File),
+    ok.
+
 %%
 %% Parts common to several test cases
 %% 
diff --git a/lib/stdlib/test/dict_SUITE.erl b/lib/stdlib/test/dict_SUITE.erl
index 0223240479..69814e12ce 100644
--- a/lib/stdlib/test/dict_SUITE.erl
+++ b/lib/stdlib/test/dict_SUITE.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %%
 
-%% This module tests the ordsets, sets, and gb_sets modules.
+%% This module tests the orddict, dict, and gb_trees modules.
 %%
 
 -module(dict_SUITE).
@@ -68,6 +68,7 @@ create_1(M) ->
     D0 = M(empty, []),
     [] = M(to_list, D0),
     0 = M(size, D0),
+    true = M(is_empty, D0),
     D0.
 
 store(Config) when is_list(Config) ->
@@ -81,6 +82,14 @@ store_1(List, M) ->
     D1 = foldl(fun({K,V}, Dict) -> M(enter, {K,V,Dict}) end,
 	       M(empty, []), List),
     true = M(equal, {D0,D1}),
+    case List of
+	[] ->
+	    true = M(is_empty, D0),
+	    true = M(is_empty, D1);
+	[_|_] ->
+	    false = M(is_empty, D0),
+	    false = M(is_empty, D1)
+    end,
     D0.
 
 %%%
diff --git a/lib/stdlib/test/dict_test_lib.erl b/lib/stdlib/test/dict_test_lib.erl
index e308fd0721..4fdb4fa0bd 100644
--- a/lib/stdlib/test/dict_test_lib.erl
+++ b/lib/stdlib/test/dict_test_lib.erl
@@ -28,6 +28,7 @@ new(Mod, Eq) ->
 	(from_list, L) -> from_list(Mod, L);
 	(module, []) -> Mod;
 	(size, D) -> Mod:size(D);
+	(is_empty, D) -> Mod:is_empty(D);
 	(to_list, D) -> to_list(Mod, D)
     end.
 
diff --git a/lib/stdlib/test/edlin_expand_SUITE.erl b/lib/stdlib/test/edlin_expand_SUITE.erl
index 0cd2688e2e..43c980e994 100644
--- a/lib/stdlib/test/edlin_expand_SUITE.erl
+++ b/lib/stdlib/test/edlin_expand_SUITE.erl
@@ -26,11 +26,11 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-% Default timetrap timeout (set in init_per_testcase).
+%% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog = ?t:timetrap(?default_timeout),
+    Dog = ?t:timetrap(?default_timeout),
     [{watchdog, Dog} | Config].
 end_per_testcase(_Case, Config) ->
     Dog = ?config(watchdog, Config),
@@ -67,20 +67,21 @@ normal(doc) ->
 normal(suite) ->
     [];
 normal(Config) when is_list(Config) ->
-    ?line {module,expand_test} = c:l(expand_test),
-    % These tests might fail if another module with the prefix "expand_" happens
-    % to also be loaded.
-    ?line {yes, "test:", []} = edlin_expand:expand(lists:reverse("expand_")),
-    ?line {no, [], []} = edlin_expand:expand(lists:reverse("expandXX_")),
-    ?line {no,[],
-	   [{"a_fun_name",1},
-	    {"a_less_fun_name",1},
-	    {"b_comes_after_a",1},
-	    {"module_info",0},
-	    {"module_info",1}]} = edlin_expand:expand(lists:reverse("expand_test:")),
-    ?line {yes,[],[{"a_fun_name",1},
-		   {"a_less_fun_name",1}]} = edlin_expand:expand(
-					       lists:reverse("expand_test:a_")),
+    {module,expand_test} = c:l(expand_test),
+    %% These tests might fail if another module with the prefix
+    %% "expand_" happens to also be loaded.
+    {yes, "test:", []} = do_expand("expand_"),
+    {no, [], []} = do_expand("expandXX_"),
+    {no,[],
+     [{"a_fun_name",1},
+      {"a_less_fun_name",1},
+      {"b_comes_after_a",1},
+      {"expand0arity_entirely",0},
+      {"module_info",0},
+      {"module_info",1}]} = do_expand("expand_test:"),
+    {yes,[],[{"a_fun_name",1},
+	     {"a_less_fun_name",1}]} = do_expand("expand_test:a_"),
+    {yes,"arity_entirely()",[]} = do_expand("expand_test:expand0"),
     ok.
 
 quoted_fun(doc) ->
@@ -88,38 +89,35 @@ quoted_fun(doc) ->
 quoted_fun(suite) ->
     [];
 quoted_fun(Config) when is_list(Config) ->
-    ?line {module,expand_test} = c:l(expand_test),
-    ?line {module,expand_test1} = c:l(expand_test1),
+    {module,expand_test} = c:l(expand_test),
+    {module,expand_test1} = c:l(expand_test1),
     %% should be no colon after test this time
-    ?line {yes, "test", []} = edlin_expand:expand(lists:reverse("expand_")),
-    ?line {no, [], []} = edlin_expand:expand(lists:reverse("expandXX_")),
-    ?line {no,[],[{"'#weird-fun-name'",0},
-		  {"'Quoted_fun_name'",0},
-		  {"'Quoted_fun_too'",0},
-		  {"a_fun_name",1},
-		  {"a_less_fun_name",1},
-		  {"b_comes_after_a",1},
-		  {"module_info",0},
-		  {"module_info",1}]} = edlin_expand:expand(
-					  lists:reverse("expand_test1:")),
-    ?line {yes,"_",[]} = edlin_expand:expand(
-			   lists:reverse("expand_test1:a")),
-    ?line {yes,[],[{"a_fun_name",1},
-		   {"a_less_fun_name",1}]} = edlin_expand:expand(
-					       lists:reverse("expand_test1:a_")),
-    ?line {yes,[],
-	   [{"'#weird-fun-name'",0},
+    {yes, "test", []} = do_expand("expand_"),
+    {no, [], []} = do_expand("expandXX_"),
+    {no,[],[{"'#weird-fun-name'",1},
 	    {"'Quoted_fun_name'",0},
-	    {"'Quoted_fun_too'",0}]} = edlin_expand:expand(
-					 lists:reverse("expand_test1:'")),
-    ?line {yes,"uoted_fun_",[]} = edlin_expand:expand(
-				    lists:reverse("expand_test1:'Q")),
-    ?line {yes,[],
-	   [{"'Quoted_fun_name'",0},
-	    {"'Quoted_fun_too'",0}]} = edlin_expand:expand(
-					 lists:reverse("expand_test1:'Quoted_fun_")),
-    ?line {yes,"weird-fun-name'(",[]} = edlin_expand:expand(
-					  lists:reverse("expand_test1:'#")),
+	    {"'Quoted_fun_too'",0},
+	    {"a_fun_name",1},
+	    {"a_less_fun_name",1},
+	    {"b_comes_after_a",1},
+	    {"module_info",0},
+	    {"module_info",1}]} = do_expand("expand_test1:"),
+    {yes,"_",[]} = do_expand("expand_test1:a"),
+    {yes,[],[{"a_fun_name",1},
+	     {"a_less_fun_name",1}]} = do_expand("expand_test1:a_"),
+    {yes,[],
+     [{"'#weird-fun-name'",1},
+      {"'Quoted_fun_name'",0},
+      {"'Quoted_fun_too'",0}]} = do_expand("expand_test1:'"),
+    {yes,"uoted_fun_",[]} = do_expand("expand_test1:'Q"),
+    {yes,[],
+     [{"'Quoted_fun_name'",0},
+      {"'Quoted_fun_too'",0}]} = do_expand("expand_test1:'Quoted_fun_"),
+    {yes,"weird-fun-name'(",[]} = do_expand("expand_test1:'#"),
+
+    %% Since there is a module_info/1 as well as a module_info/0
+    %% there should not be a closing parenthesis added.
+    {yes,"(",[]} = do_expand("expand_test:module_info"),
     ok.
 
 quoted_module(doc) ->
@@ -127,51 +125,46 @@ quoted_module(doc) ->
 quoted_module(suite) ->
     [];
 quoted_module(Config) when is_list(Config) ->
-    ?line {module,'ExpandTestCaps'} = c:l('ExpandTestCaps'),
-    ?line {yes, "Caps':", []} = edlin_expand:expand(lists:reverse("'ExpandTest")),
-    ?line {no,[],
-	   [{"a_fun_name",1},
-	    {"a_less_fun_name",1},
-	    {"b_comes_after_a",1},
-	    {"module_info",0},
-	    {"module_info",1}]} = edlin_expand:expand(lists:reverse("'ExpandTestCaps':")),
-    ?line {yes,[],[{"a_fun_name",1},
-		   {"a_less_fun_name",1}]} = edlin_expand:expand(
-					       lists:reverse("'ExpandTestCaps':a_")),
+    {module,'ExpandTestCaps'} = c:l('ExpandTestCaps'),
+    {yes, "Caps':", []} = do_expand("'ExpandTest"),
+    {no,[],
+     [{"a_fun_name",1},
+      {"a_less_fun_name",1},
+      {"b_comes_after_a",1},
+      {"module_info",0},
+      {"module_info",1}]} = do_expand("'ExpandTestCaps':"),
+    {yes,[],[{"a_fun_name",1},
+	     {"a_less_fun_name",1}]} = do_expand("'ExpandTestCaps':a_"),
     ok.
 
 quoted_both(suite) ->
     [];
 quoted_both(Config) when is_list(Config) ->
-    ?line {module,'ExpandTestCaps'} = c:l('ExpandTestCaps'),
-    ?line {module,'ExpandTestCaps1'} = c:l('ExpandTestCaps1'),
+    {module,'ExpandTestCaps'} = c:l('ExpandTestCaps'),
+    {module,'ExpandTestCaps1'} = c:l('ExpandTestCaps1'),
     %% should be no colon (or quote) after test this time
-    ?line {yes, "Caps", []} = edlin_expand:expand(lists:reverse("'ExpandTest")),
-    ?line {no,[],[{"'#weird-fun-name'",0},
-		  {"'Quoted_fun_name'",0},
-		  {"'Quoted_fun_too'",0},
-		  {"a_fun_name",1},
-		  {"a_less_fun_name",1},
-		  {"b_comes_after_a",1},
-		  {"module_info",0},
-		  {"module_info",1}]} = edlin_expand:expand(
-					  lists:reverse("'ExpandTestCaps1':")),
-    ?line {yes,"_",[]} = edlin_expand:expand(
-			   lists:reverse("'ExpandTestCaps1':a")),
-    ?line {yes,[],[{"a_fun_name",1},
-		   {"a_less_fun_name",1}]} = edlin_expand:expand(
-					       lists:reverse("'ExpandTestCaps1':a_")),
-    ?line {yes,[],
-	   [{"'#weird-fun-name'",0},
+    {yes, "Caps", []} = do_expand("'ExpandTest"),
+    {no,[],[{"'#weird-fun-name'",0},
 	    {"'Quoted_fun_name'",0},
-	    {"'Quoted_fun_too'",0}]} = edlin_expand:expand(
-					 lists:reverse("'ExpandTestCaps1':'")),
-    ?line {yes,"uoted_fun_",[]} = edlin_expand:expand(
-				    lists:reverse("'ExpandTestCaps1':'Q")),
-    ?line {yes,[],
-	   [{"'Quoted_fun_name'",0},
-	    {"'Quoted_fun_too'",0}]} = edlin_expand:expand(
-					 lists:reverse("'ExpandTestCaps1':'Quoted_fun_")),
-    ?line {yes,"weird-fun-name'(",[]} = edlin_expand:expand(
-					  lists:reverse("'ExpandTestCaps1':'#")),
+	    {"'Quoted_fun_too'",0},
+	    {"a_fun_name",1},
+	    {"a_less_fun_name",1},
+	    {"b_comes_after_a",1},
+	    {"module_info",0},
+	    {"module_info",1}]} = do_expand("'ExpandTestCaps1':"),
+    {yes,"_",[]} = do_expand("'ExpandTestCaps1':a"),
+    {yes,[],[{"a_fun_name",1},
+	     {"a_less_fun_name",1}]} = do_expand("'ExpandTestCaps1':a_"),
+    {yes,[],
+     [{"'#weird-fun-name'",0},
+      {"'Quoted_fun_name'",0},
+      {"'Quoted_fun_too'",0}]} = do_expand("'ExpandTestCaps1':'"),
+    {yes,"uoted_fun_",[]} = do_expand("'ExpandTestCaps1':'Q"),
+    {yes,[],
+     [{"'Quoted_fun_name'",0},
+      {"'Quoted_fun_too'",0}]} = do_expand("'ExpandTestCaps1':'Quoted_fun_"),
+    {yes,"weird-fun-name'()",[]} = do_expand("'ExpandTestCaps1':'#"),
     ok.
+
+do_expand(String) ->
+    edlin_expand:expand(lists:reverse(String)).
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index 0cbdf76270..0b4726c07a 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2014. All Rights Reserved.
 %%
 %% The 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,8 @@
 	 variable_1/1, otp_4870/1, otp_4871/1, otp_5362/1,
          pmod/1, not_circular/1, skip_header/1, otp_6277/1, otp_7702/1,
          otp_8130/1, overload_mac/1, otp_8388/1, otp_8470/1, otp_8503/1,
-         otp_8562/1, otp_8665/1, otp_8911/1, otp_10302/1, otp_10820/1]).
+         otp_8562/1, otp_8665/1, otp_8911/1, otp_10302/1, otp_10820/1,
+         otp_11728/1]).
 
 -export([epp_parse_erl_form/2]).
 
@@ -67,7 +68,7 @@ all() ->
      {group, variable}, otp_4870, otp_4871, otp_5362, pmod,
      not_circular, skip_header, otp_6277, otp_7702, otp_8130,
      overload_mac, otp_8388, otp_8470, otp_8503, otp_8562,
-     otp_8665, otp_8911, otp_10302, otp_10820].
+     otp_8665, otp_8911, otp_10302, otp_10820, otp_11728].
 
 groups() -> 
     [{upcase_mac, [], [upcase_mac_1, upcase_mac_2]},
@@ -1387,6 +1388,31 @@ do_otp_10820(File, C, PC) ->
     true = test_server:stop_node(Node),
     ok.
 
+otp_11728(doc) ->
+    ["OTP-11728. Bugfix circular macro."];
+otp_11728(suite) ->
+    [];
+otp_11728(Config) when is_list(Config) ->
+    Dir = ?config(priv_dir, Config),
+    H = <<"-define(MACRO,[[]++?MACRO]).">>,
+    HrlFile = filename:join(Dir, "otp_11728.hrl"),
+    ok = file:write_file(HrlFile, H),
+    C = <<"-module(otp_11728).
+           -compile(export_all).
+
+           -include(\"otp_11728.hrl\").
+
+           function_name()->
+               A=?MACRO, % line 7
+               ok">>,
+    ErlFile = filename:join(Dir, "otp_11728.erl"),
+    ok = file:write_file(ErlFile, C),
+    {ok, L} = epp:parse_file(ErlFile, [Dir], []),
+    true = lists:member({error,{7,epp,{circular,'MACRO',none}}}, L),
+    _ = file:delete(HrlFile),
+    _ = file:delete(ErlFile),
+    ok.
+
 check(Config, Tests) ->
     eval_tests(Config, fun check_test/2, Tests).
 
diff --git a/lib/stdlib/test/erl_eval_SUITE.erl b/lib/stdlib/test/erl_eval_SUITE.erl
index 18ec17a4bf..e6512b7d71 100644
--- a/lib/stdlib/test/erl_eval_SUITE.erl
+++ b/lib/stdlib/test/erl_eval_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
@@ -26,7 +25,7 @@
 	 match_bin/1,
 	 string_plusplus/1,
 	 pattern_expr/1,
-         guard_3/1, guard_4/1,
+         guard_3/1, guard_4/1, guard_5/1,
          lc/1,
          simple_cases/1,
          unary_plus/1,
@@ -42,7 +41,9 @@
          funs/1,
 	 try_catch/1,
 	 eval_expr_5/1,
-	 zero_width/1]).
+	 zero_width/1,
+         eep37/1,
+         eep43/1]).
 
 %%
 %% Define to run outside of test server
@@ -78,10 +79,11 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [guard_1, guard_2, match_pattern, string_plusplus,
-     pattern_expr, match_bin, guard_3, guard_4, lc,
+     pattern_expr, match_bin, guard_3, guard_4, guard_5, lc,
      simple_cases, unary_plus, apply_atom, otp_5269,
      otp_6539, otp_6543, otp_6787, otp_6977, otp_7550,
-     otp_8133, otp_10622, funs, try_catch, eval_expr_5, zero_width].
+     otp_8133, otp_10622, funs, try_catch, eval_expr_5, zero_width,
+     eep37, eep43].
 
 groups() -> 
     [].
@@ -246,6 +248,20 @@ guard_4(Config) when is_list(Config) ->
                 false),
     ok.
 
+guard_5(doc) ->
+    ["Guards with erlang:'=='/2"];
+guard_5(suite) ->
+    [];
+guard_5(Config) when is_list(Config) ->
+    {ok,Tokens ,_} =
+	erl_scan:string("case 1 of A when erlang:'=='(A, 1) -> true end."),
+    {ok, [Expr]} = erl_parse:parse_exprs(Tokens),
+    true = guard_5_compiled(),
+    {value, true, [{'A',1}]} = erl_eval:expr(Expr, []),
+    ok.
+
+guard_5_compiled() ->
+    case 1 of A when erlang:'=='(A, 1) -> true end.
 
 lc(doc) ->
     ["OTP-4518."];
@@ -1402,6 +1418,41 @@ zero_width(Config) when is_list(Config) ->
 		"ok end.", ok),
     ok.
 
+eep37(Config) when is_list(Config) ->
+    check(fun () -> (fun _(X) -> X end)(42) end,
+          "(fun _(X) -> X end)(42).",
+          42),
+    check(fun () -> (fun _Id(X) -> X end)(42) end,
+          "(fun _Id(X) -> X end)(42).", 42),
+    check(fun () -> is_function((fun Self() -> Self end)(), 0) end,
+          "is_function((fun Self() -> Self end)(), 0).",
+          true),
+    check(fun () ->
+                  F = fun Fact(N) when N > 0 ->
+                              N * Fact(N - 1);
+                          Fact(0) ->
+                              1
+                       end,
+                  F(6)
+          end,
+          "(fun Fact(N) when N > 0 -> N * Fact(N - 1); Fact(0) -> 1 end)(6).",
+          720),
+    ok.
+
+eep43(Config) when is_list(Config) ->
+    check(fun () -> #{} end, " #{}.", #{}),
+    check(fun () -> #{a => b} end, "#{a => b}.", #{a => b}),
+    check(fun () ->
+                  Map = #{a => b},
+                  {Map#{a := b},Map#{a => c},Map#{d => e}}
+          end,
+          "begin "
+          "    Map = #{a => B=b}, "
+          "    {Map#{a := B},Map#{a => c},Map#{d => e}} "
+          "end.",
+          {#{a => b},#{a => c},#{a => b,d => e}}),
+    ok.
+
 %% Check the string in different contexts: as is; in fun; from compiled code.
 check(F, String, Result) ->
     check1(F, String, Result),
diff --git a/lib/stdlib/test/erl_expand_records_SUITE.erl b/lib/stdlib/test/erl_expand_records_SUITE.erl
index 94b4397a9c..43e679f7ed 100644
--- a/lib/stdlib/test/erl_expand_records_SUITE.erl
+++ b/lib/stdlib/test/erl_expand_records_SUITE.erl
@@ -38,7 +38,7 @@
 -export([attributes/1, expr/1, guard/1,
          init/1, pattern/1, strict/1, update/1,
 	 otp_5915/1, otp_7931/1, otp_5990/1,
-	 otp_7078/1, otp_7101/1]).
+	 otp_7078/1, otp_7101/1, maps/1]).
 
 % Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
@@ -56,7 +56,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [attributes, expr, guard, init,
-     pattern, strict, update, {group, tickets}].
+     pattern, strict, update, maps, {group, tickets}].
 
 groups() -> 
     [{tickets, [],
@@ -402,7 +402,22 @@ update(Config) when is_list(Config) ->
       ],
     ?line run(Config, Ts),
     ok.
-    
+
+maps(Config) when is_list(Config) ->
+    Ts = [<<"-record(rr, {a,b,c}).
+             t() ->
+                 R0 = id(#rr{a=1,b=2,c=3}),
+                 R1 = id(#rr{a=4,b=5,c=6}),
+                 [{R0,R1}] =
+                     maps:to_list(#{#rr{a=1,b=2,c=3} => #rr{a=4,b=5,c=6}}),
+                 #{#rr{a=1,b=2,c=3} := #rr{a=1,b=2,c=3}} =
+                     #{#rr{a=1,b=2,c=3} => R1}#{#rr{a=1,b=2,c=3} := R0},
+                 ok.
+
+             id(X) -> X.
+            ">>],
+    run(Config, Ts, [strict_record_tests]),
+    ok.
 
 otp_5915(doc) ->
     "Strict record tests in guards.";
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index f8345559c4..1614a2722f 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2014. All Rights Reserved.
 %%
 %% The 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,9 +48,10 @@
 	  unused_function/1,
 	  unsafe_vars/1,unsafe_vars2/1,
 	  unsafe_vars_try/1,
+	  unsized_binary_in_bin_gen_pattern/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, otp_10436/1,
+	  otp_5917/1, otp_6585/1, otp_6885/1, otp_10436/1, otp_11254/1,
           export_all/1,
 	  bif_clash/1,
 	  behaviour_basic/1, behaviour_multiple/1,
@@ -59,7 +60,8 @@
 	  format_warn/1,
 	  on_load_successful/1, on_load_failing/1, 
 	  too_many_arguments/1,
-	  basic_errors/1,bin_syntax_errors/1
+	  basic_errors/1,bin_syntax_errors/1,
+          predef/1
         ]).
 
 % Default timetrap timeout (set in init_per_testcase).
@@ -80,12 +82,13 @@ all() ->
     [{group, unused_vars_warn}, export_vars_warn,
      shadow_vars, unused_import, unused_function,
      unsafe_vars, unsafe_vars2, unsafe_vars_try, guard,
+     unsized_binary_in_bin_gen_pattern,
      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, otp_10436, export_all,
+     otp_5878, otp_5917, otp_6585, otp_6885, otp_10436, otp_11254,export_all,
      bif_clash, behaviour_basic, behaviour_multiple,
      otp_7550, otp_8051, format_warn, {group, on_load},
-     too_many_arguments, basic_errors, bin_syntax_errors].
+     too_many_arguments, basic_errors, bin_syntax_errors, predef].
 
 groups() -> 
     [{unused_vars_warn, [],
@@ -151,7 +154,16 @@ unused_vars_warn_basic(Config) when is_list(Config) ->
              {22,erl_lint,{unused_var,'N'}},
              {23,erl_lint,{shadowed_var,'N','fun'}},
              {28,erl_lint,{unused_var,'B'}},
-             {29,erl_lint,{unused_var,'B'}}]}}],
+             {29,erl_lint,{unused_var,'B'}}]}},
+          {basic2,
+           <<"-record(r, {x,y}).
+              f({X,Y}) -> {Z=X,Z=Y};
+              f([H|T]) -> [Z=H|Z=T];
+              f(#r{x=X,y=Y}) -> #r{x=A=X,y=A=Y}.
+              g({M, F}) -> (Z=M):(Z=F)();
+              g({M, F, Arg}) -> (Z=M):F(Z=Arg).
+              h(X, Y) -> (Z=X) + (Z=Y).">>,
+           [warn_unused_vars], []}],
     ?line [] = run(Config, Ts),
     ok.
 
@@ -537,12 +549,34 @@ unused_vars_warn_rec(Config) when is_list(Config) ->
                   end.
            ">>,
            [warn_unused_vars],
-           {warnings,[{22,erl_lint,{unused_var,'Same'}}]}}],
+           {warnings,[{22,erl_lint,{unused_var,'Same'}}]}},
+          {rec2,
+           <<"-record(r, {a,b}).
+              f(X, Y) -> #r{a=[K || K <- Y], b=[K || K <- Y]}.
+              g(X, Y) -> #r{a=lists:map(fun (K) -> K end, Y),
+                            b=lists:map(fun (K) -> K end, Y)}.
+              h(X, Y) -> #r{a=case Y of _ when is_list(Y) -> Y end,
+                            b=case Y of _ when is_list(Y) -> Y end}.
+              i(X, Y) -> #r{a=if is_list(Y) -> Y end, b=if is_list(Y) -> Y end}.
+             ">>,
+           [warn_unused_vars],
+           {warnings,[{2,erl_lint,{unused_var,'X'}},
+                      {3,erl_lint,{unused_var,'X'}},
+                      {5,erl_lint,{unused_var,'X'}},
+                      {7,erl_lint,{unused_var,'X'}}]}},
+          {rec3,
+           <<"-record(r, {a}).
+              t() -> X = 1, #r{a=foo, a=bar, a=qux}.
+             ">>,
+           [warn_unused_vars],
+           {error,[{2,erl_lint,{redefine_field,r,a}},
+                   {2,erl_lint,{redefine_field,r,a}}],
+                  [{2,erl_lint,{unused_var,'X'}}]}}],
     ?line [] = run(Config, Ts),
     ok.
 
 unused_vars_warn_fun(doc) ->
-    "Warnings for unused variables in records.";
+    "Warnings for unused variables in funs.";
 unused_vars_warn_fun(suite) -> [];
 unused_vars_warn_fun(Config) when is_list(Config) ->
     Ts = [{fun1,
@@ -610,7 +644,60 @@ unused_vars_warn_fun(Config) when is_list(Config) ->
                {22,erl_lint,{unused_var,'U'}},
                {24,erl_lint,{unused_var,'U'}},
                {26,erl_lint,{unused_var,'U'}},
-               {26,erl_lint,{shadowed_var,'U','fun'}}]}}
+               {26,erl_lint,{shadowed_var,'U','fun'}}]}},
+          {named_fun,
+           <<"u() ->
+                  fun U() -> foo end, % U unused.
+                  U; % U unbound.
+              u() ->
+                  case foo of
+                      true ->
+                          U = 2;
+                      false ->
+                          true
+                  end,
+                  fun U() -> foo end, % U unused.
+                  U; % U unsafe.
+              u() ->
+                  case foo of
+                      true ->
+                          U = 2;
+                      false ->
+                          U = 3
+                  end,
+                  fun U() -> foo end, % U shadowed. U unused.
+                  U;
+              u() ->
+                  case foo of
+                      true ->
+                          U = 2; % U unused.
+                      false ->
+                          U = 3 % U unused.
+                  end,
+                  fun U() -> foo end; % U shadowed. U unused.
+              u() ->
+                  fun U(U) -> foo end; % U shadowed. U unused.
+              u() ->
+                  fun U(1) -> U; U(U) -> foo end; % U shadowed. U unused.
+              u() ->
+                  fun _(N) -> N + 1 end.  % Cover handling of '_' name.
+           ">>,
+           [warn_unused_vars],
+           {error,[{3,erl_lint,{unbound_var,'U'}},
+                   {12,erl_lint,{unsafe_var,'U',{'case',5}}}],
+                  [{2,erl_lint,{unused_var,'U'}},
+                   {11,erl_lint,{unused_var,'U'}},
+                   {20,erl_lint,{unused_var,'U'}},
+                   {20,erl_lint,{shadowed_var,'U','named fun'}},
+                   {25,erl_lint,{unused_var,'U'}},
+                   {27,erl_lint,{unused_var,'U'}},
+                   {29,erl_lint,{unused_var,'U'}},
+                   {29,erl_lint,{shadowed_var,'U','named fun'}},
+                   {31,erl_lint,{unused_var,'U'}},
+                   {31,erl_lint,{unused_var,'U'}},
+                   {31,erl_lint,{shadowed_var,'U','fun'}},
+                   {33,erl_lint,{unused_var,'U'}},
+                   {33,erl_lint,{shadowed_var,'U','fun'}}]}}
           ],
     ?line [] = run(Config, Ts),
     ok.
@@ -1075,10 +1162,56 @@ unsafe_vars_try(Config) when is_list(Config) ->
 		    {10,erl_lint,{unsafe_var,'Ra',{'try',3}}},
 		    {10,erl_lint,{unsafe_var,'Rc',{'try',3}}},
 		    {10,erl_lint,{unsafe_var,'Ro',{'try',3}}}],
-	    []}}],
+	    []}},
+          {unsafe_try5,
+           <<"bang() ->
+                case 1 of
+                  nil ->
+                    Acc = 2;
+                  _ ->
+                    try
+                      Acc = 3,
+                      Acc
+                    catch _:_ ->
+                      ok
+                    end
+                end,
+                Acc.
+           ">>,
+           [],
+           {errors,[{13,erl_lint,{unsafe_var,'Acc',{'try',6}}}],[]}}],
         ?line [] = run(Config, Ts),
     ok.
 
+unsized_binary_in_bin_gen_pattern(doc) ->
+    "Unsized binary fields are forbidden in patterns of bit string generators";
+unsized_binary_in_bin_gen_pattern(suite) -> [];
+unsized_binary_in_bin_gen_pattern(Config) when is_list(Config) ->
+    Ts = [{unsized_binary_in_bin_gen_pattern,
+	   <<"t({bc,binary,Bin}) ->
+		  << <<X,Tail/binary>> || <<X,Tail/binary>> <= Bin >>;
+	      t({bc,bits,Bin}) ->
+		  << <<X,Tail/bits>> || <<X,Tail/bits>> <= Bin >>;
+	      t({bc,bitstring,Bin}) ->
+		  << <<X,Tail/bits>> || <<X,Tail/bitstring>> <= Bin >>;
+	      t({lc,binary,Bin}) ->
+		  [ {X,Tail} || <<X,Tail/binary>> <= Bin ];
+	      t({lc,bits,Bin}) ->
+		  [ {X,Tail} || <<X,Tail/bits>> <= Bin ];
+	      t({lc,bitstring,Bin}) ->
+		  [ {X,Tail} || <<X,Tail/bitstring>> <= Bin ].">>,
+	   [],
+	   {errors,
+	    [{2,erl_lint,unsized_binary_in_bin_gen_pattern},
+	     {4,erl_lint,unsized_binary_in_bin_gen_pattern},
+	     {6,erl_lint,unsized_binary_in_bin_gen_pattern},
+	     {8,erl_lint,unsized_binary_in_bin_gen_pattern},
+	     {10,erl_lint,unsized_binary_in_bin_gen_pattern},
+	     {12,erl_lint,unsized_binary_in_bin_gen_pattern}],
+	     []}}],
+    [] = run(Config, Ts),
+    ok.
+
 guard(doc) ->
     "OTP-4670. Guards, is_record in particular.";
 guard(suite) -> [];
@@ -2122,7 +2255,8 @@ otp_5878(Config) when is_list(Config) ->
            <<"-record(r1, {t = case foo of _ -> 3 end}).
               -record(r2, {a = case foo of A -> A; _ -> 3 end}).
               -record(r3, {a = case foo of A -> A end}).
-              t() -> {#r1{},#r2{},#r3{}}.
+              -record(r4, {a = fun _AllowedFunName() -> allowed end}).
+              t() -> {#r1{},#r2{},#r3{},#r4{}}.
              ">>,
            [warn_unused_record],
            {errors,[{2,erl_lint,{variable_in_record_def,'A'}},
@@ -2418,6 +2552,20 @@ otp_10436(Config) when is_list(Config) ->
         run_test2(Config, Ts2, []),
     ok.
 
+otp_11254(doc) ->
+    "OTP-11254. Warnings for opaque types.";
+otp_11254(suite) -> [];
+otp_11254(Config) when is_list(Config) ->
+    Ts = <<"-module(p2).
+            -export([manifest/2]).
+            manifest(Module, Name) ->
+              fun Module:Nine/1.
+         ">>,
+    {error,[{4,erl_lint,{unbound_var,'Nine'}}],
+     [{3,erl_lint,{unused_var,'Name'}}]} =
+        run_test2(Config, Ts, []),
+    ok.
+
 export_all(doc) ->
     "OTP-7392. Warning for export_all.";
 export_all(Config) when is_list(Config) ->
@@ -2680,7 +2828,24 @@ bif_clash(Config) when is_list(Config) ->
 		    {6,erl_lint,{illegal_guard_local_call,{is_tuple,1}}},
 		    {7,erl_lint,{illegal_guard_local_call,{is_list,1}}},
 		    {8,erl_lint,{illegal_guard_local_call,{is_record,3}}},
-		    {9,erl_lint,{illegal_guard_local_call,{is_record,3}}}],[]}}
+		    {9,erl_lint,{illegal_guard_local_call,{is_record,3}}}],[]}},
+	  %% We can also suppress all auto imports at once
+	  {clash22,
+          <<"-export([size/1, binary_part/2]).
+             -compile(no_auto_import).
+             size([]) ->
+               0;
+             size({N,_}) ->
+               N;
+             size([_|T]) ->
+               1+size(T).
+             binary_part({B,_},{X,Y}) ->
+               binary_part(B,{X,Y});
+             binary_part(B,{X,Y}) ->
+               binary:part(B,X,Y).
+            ">>,
+	   [],
+	   []}
 	 ],
 
     ?line [] = run(Config, Ts),
@@ -2712,7 +2877,15 @@ behaviour_basic(Config) when is_list(Config) ->
               stop(_) -> ok.
              ">>,
            [],
-	   []}
+           []},
+
+          {behaviour4,
+           <<"-behavior(application).  %% Test callbacks with export_all
+              -compile(export_all).
+              stop(_) -> ok.
+             ">>,
+           [],
+           {warnings,[{1,erl_lint,{undefined_behaviour_func,{start,2},application}}]}}
 	 ],
     ?line [] = run(Config, Ts),
     ok.
@@ -3069,6 +3242,23 @@ bin_syntax_errors(Config) ->
     [] = run(Config, Ts),
     ok.
 
+predef(doc) ->
+    "Predefined types: array(), digraph(), and so on";
+predef(suite) -> [];
+predef(Config) when is_list(Config) ->
+    W = get_compilation_warnings(Config, "predef", []),
+    [] = W,
+    W2 = get_compilation_warnings(Config, "predef2", []),
+    [{7,erl_lint,{deprecated_type,{array,0},{array,array},"OTP 18.0"}},
+     {12,erl_lint,{deprecated_type,{dict,0},{dict,dict},"OTP 18.0"}},
+     {17,erl_lint,{deprecated_type,{digraph,0},{digraph,graph},"OTP 18.0"}},
+     {27,erl_lint,{deprecated_type,{gb_set,0},{gb_sets,set},"OTP 18.0"}},
+     {32,erl_lint,{deprecated_type,{gb_tree,0},{gb_trees,tree},"OTP 18.0"}},
+     {37,erl_lint,{deprecated_type,{queue,0},{queue,queue},"OTP 18.0"}},
+     {42,erl_lint,{deprecated_type,{set,0},{sets,set},"OTP 18.0"}},
+     {47,erl_lint,{deprecated_type,{tid,0},{ets,tid},"OTP 18.0"}}] = W2,
+    ok.
+
 run(Config, Tests) ->
     F = fun({N,P,Ws,E}, BadL) ->
                 case catch run_test(Config, P, Ws) of
@@ -3091,8 +3281,10 @@ get_compilation_warnings(Conf, Filename, Warnings) ->
     FileS = binary_to_list(Bin),
     {match,[{Start,Length}|_]} = re:run(FileS, "-module.*\\n"),
     Test = lists:nthtail(Start+Length, FileS),
-    {warnings, Ws} = run_test(Conf, Test, Warnings),
-    Ws.
+    case run_test(Conf, Test, Warnings) of
+        {warnings, Ws} -> Ws;
+        [] -> []
+    end.
 
 %% Compiles a test module and returns the list of errors and warnings.
 
diff --git a/lib/stdlib/test/erl_lint_SUITE_data/predef.erl b/lib/stdlib/test/erl_lint_SUITE_data/predef.erl
new file mode 100644
index 0000000000..c2364fd1c2
--- /dev/null
+++ b/lib/stdlib/test/erl_lint_SUITE_data/predef.erl
@@ -0,0 +1,67 @@
+-module(predef).
+
+-export([array/1, dict/1, digraph/1, digraph2/1, gb_set/1, gb_tree/1,
+         queue/1, set/1, tid/0, tid2/0]).
+
+-export_type([array/0, digraph/0, gb_set/0]).
+
+%% Before R17B local re-definitions of pre-defined opaque types were
+%% ignored but did not generate any warning.
+-opaque array() :: atom().
+-opaque digraph() :: atom().
+-opaque gb_set() :: atom().
+-type dict() :: atom().
+-type gb_tree() :: atom().
+-type queue() :: atom().
+-type set() :: atom().
+-type tid() :: atom().
+
+-spec array(array()) -> array:array().
+
+array(A) ->
+    array:relax(A).
+
+-spec dict(dict()) -> dict:dict().
+
+dict(D) ->
+    dict:store(1, a, D).
+
+-spec digraph(digraph()) -> [digraph:edge()].
+
+digraph(G) ->
+    digraph:edges(G).
+
+-spec digraph2(digraph:graph()) -> [digraph:edge()].
+
+digraph2(G) ->
+    digraph:edges(G).
+
+-spec gb_set(gb_set()) -> gb_sets:set().
+
+gb_set(S) ->
+    gb_sets:balance(S).
+
+-spec gb_tree(gb_tree()) -> gb_trees:tree().
+
+gb_tree(S) ->
+    gb_trees:balance(S).
+
+-spec queue(queue()) -> queue:queue().
+
+queue(Q) ->
+    queue:reverse(Q).
+
+-spec set(set()) -> sets:set().
+
+set(S) ->
+    sets:union([S]).
+
+-spec tid() -> tid().
+
+tid() ->
+    ets:new(tid, []).
+
+-spec tid2() -> ets:tid().
+
+tid2() ->
+    ets:new(tid, []).
diff --git a/lib/stdlib/test/erl_lint_SUITE_data/predef2.erl b/lib/stdlib/test/erl_lint_SUITE_data/predef2.erl
new file mode 100644
index 0000000000..b1d941a49a
--- /dev/null
+++ b/lib/stdlib/test/erl_lint_SUITE_data/predef2.erl
@@ -0,0 +1,56 @@
+-module(predef2).
+
+-export([array/1, dict/1, digraph/1, digraph2/1, gb_set/1, gb_tree/1,
+         queue/1, set/1, tid/0, tid2/0]).
+
+-export_type([array/0, digraph/0, gb_set/0]).
+
+-spec array(array()) -> array:array().
+
+array(A) ->
+    array:relax(A).
+
+-spec dict(dict()) -> dict:dict().
+
+dict(D) ->
+    dict:store(1, a, D).
+
+-spec digraph(digraph()) -> [digraph:edge()].
+
+digraph(G) ->
+    digraph:edges(G).
+
+-spec digraph2(digraph:graph()) -> [digraph:edge()].
+
+digraph2(G) ->
+    digraph:edges(G).
+
+-spec gb_set(gb_set()) -> gb_sets:set().
+
+gb_set(S) ->
+    gb_sets:balance(S).
+
+-spec gb_tree(gb_tree()) -> gb_trees:tree().
+
+gb_tree(S) ->
+    gb_trees:balance(S).
+
+-spec queue(queue()) -> queue:queue().
+
+queue(Q) ->
+    queue:reverse(Q).
+
+-spec set(set()) -> sets:set().
+
+set(S) ->
+    sets:union([S]).
+
+-spec tid() -> tid().
+
+tid() ->
+    ets:new(tid, []).
+
+-spec tid2() -> ets:tid().
+
+tid2() ->
+    ets:new(tid, []).
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index 2b7cec87df..390322a5fa 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -46,6 +46,7 @@
 	  import_export/1, misc_attrs/1, dialyzer_attrs/1,
 	  hook/1,
 	  neg_indent/1,
+	  maps_syntax/1,
 
 	  otp_6321/1, otp_6911/1, otp_6914/1, otp_8150/1, otp_8238/1,
 	  otp_8473/1, otp_8522/1, otp_8567/1, otp_8664/1, otp_9147/1,
@@ -76,7 +77,8 @@ groups() ->
     [{expr, [],
       [func, call, recs, try_catch, if_then, receive_after,
        bits, head_tail, cond1, block, case1, ops,
-       messages, old_mnemosyne_syntax]},
+       messages, old_mnemosyne_syntax, maps_syntax
+    ]},
      {attributes, [], [misc_attrs, import_export, dialyzer_attrs]},
      {tickets, [],
       [otp_6321, otp_6911, otp_6914, otp_8150, otp_8238,
@@ -130,7 +132,27 @@ func(Config) when is_list(Config) ->
                            true
                    end)().">>},
 	  {func_7,
-           <<"t(M, F, A) -> fun M:F/A.">>}
+           <<"t(M, F, A) -> fun M:F/A.">>},
+          {func_8,
+           <<"-record(r1, {a,b}).
+              -record(r3, {a = fun Id(_) -> #r1{} end(1), b}).
+
+              t() ->
+                  fun Id(A) when record(A#r3.a, r1) -> 7 end(#r3{}).
+             ">>},
+          {func_9,
+           <<"-record(r1, {a,b}).
+              -record(r3, {a = fun Id(_) -> #r1{} end(1), b}).
+
+              t() ->
+                  fsdfsdfjsdfjkljf:sdlfjdsfjlf(
+                      fun Id(sdfsd) -> {sdkjsdf,sdfjsdkljfsdl,sdfkjdklf} end).
+             ">>},
+          {func_10,
+           <<"t() ->
+                  (fun True() ->
+                           true
+                   end)().">>}
           ],
     ?line compile(Config, Ts),
     ok.
@@ -158,6 +180,7 @@ recs(Config) when is_list(Config) ->
               -record(r1, {a,b}).
               -record(r2, {a = #r1{},b,c=length([1,2,3])}).
               -record(r3, {a = fun(_) -> #r1{} end(1), b}).
+              -record(r4, {a = fun R1(_) -> #r1{} end(1), b}).
 
               t() ->
                   foo = fun(A) when A#r1.a > A#r1.b -> foo end(#r1{b = 2}),
@@ -741,6 +764,7 @@ neg_indent(Config) when is_list(Config) ->
     ?line ok = pp_expr(<<"{[a,b,c],[d,e|f]}">>),
     ?line ok = pp_expr(<<"f(a,b,c)">>),
     ?line ok = pp_expr(<<"fun() when a,b;c,d -> a end">>),
+    ?line ok = pp_expr(<<"fun A() when a,b;c,d -> a end">>),
     ?line ok = pp_expr(<<"<<34:32,17:32>>">>),
     ?line ok = pp_expr(<<"if a,b,c -> d; e,f,g -> h,i end">>),
     ?line ok = pp_expr(<<"if a -> d; c -> d end">>),
@@ -763,6 +787,9 @@ neg_indent(Config) when is_list(Config) ->
     Fun2 = {'fun',2,{clauses,[{clause,2,[],[],[{atom,3,true}]}]},
             {0,108059557,'-t/0-fun-0-'}},
     ?line "fun() -> true end" = flat_expr(Fun2),
+    Fun3 = {named_fun,3,'True',[{clause,3,[],[],[{atom,3,true}]}],
+            {0,424242424,'-t/0-True-0-'}},
+    ?line "fun True() -> true end" = flat_expr(Fun3),
 
     ok.
 
@@ -950,6 +977,25 @@ count_atom(L, A) when is_list(L) ->
 count_atom(_, _) ->
     0.
 
+maps_syntax(doc) -> "Maps syntax";
+maps_syntax(suite) -> [];
+maps_syntax(Config) when is_list(Config) ->
+    Ts = [{map_fun_1,
+            <<"t() ->\n"
+              "    M0 = #{ 1 => hi, hi => 42, 1.0 => {hi,world}},\n"
+              "    M1 = M0#{ 1 := hello, new_val => 1337 },\n"
+              "    map_fun_2:val(M1).\n">>},
+          {map_fun_2,
+            <<"val(#{ 1 := V1, hi := V2, new_val := V3}) -> {V1,V2,V3}.\n">>}],
+    compile(Config, Ts),
+
+    ok = pp_expr(<<"#{}">>),
+    ok = pp_expr(<<"#{ a => 1, <<\"hi\">> => \"world\", 33 => 1.0 }">>),
+    ok = pp_expr(<<"#{ a := V1, <<\"hi\">> := V2 } = M">>),
+    ok = pp_expr(<<"M#{ a => V1, <<\"hi\">> := V2 }">>),
+    ok.
+
+
 otp_8567(doc) ->
     "OTP_8567. Avoid duplicated 'undefined' in record field types.";
 otp_8567(suite) -> [];
@@ -1091,7 +1137,7 @@ otp_10820(Config) when is_list(Config) ->
     C1 = <<"%% coding: utf-8\n -module(any).">>,
     ok = do_otp_10820(Config, C1, "+pc latin1"),
     ok = do_otp_10820(Config, C1, "+pc unicode"),
-    C2 = <<"-module(any).">>,
+    C2 = <<"%% coding: latin-1\n -module(any).">>,
     ok = do_otp_10820(Config, C2, "+pc latin1"),
     ok = do_otp_10820(Config, C2, "+pc unicode").
 
diff --git a/lib/stdlib/test/erl_scan_SUITE.erl b/lib/stdlib/test/erl_scan_SUITE.erl
index 361abbb771..447e159cd4 100644
--- a/lib/stdlib/test/erl_scan_SUITE.erl
+++ b/lib/stdlib/test/erl_scan_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -225,8 +224,8 @@ atoms() ->
 
 punctuations() ->
     L = ["<<", "<-", "<=", "<", ">>", ">=", ">", "->", "--",
-         "-", "++", "+", "=:=", "=/=", "=<", "==", "=", "/=",
-         "/", "||", "|", ":-", "::", ":"],
+         "-", "++", "+", "=:=", "=/=", "=<", "=>", "==", "=", "/=",
+         "/", "||", "|", ":=", ":-", "::", ":"],
     %% One token at a time:
     [begin
          W = list_to_atom(S),
@@ -1065,8 +1064,8 @@ otp_10302(Config) when is_list(Config) ->
     {string,0,"str"} = erl_parse:abstract("str"),
     {cons,0,
      {integer,0,$a},
-     {cons,0,{integer,0,1024},{string,0,"c"}}} =
-        erl_parse:abstract("a"++[1024]++"c"),
+     {cons,0,{integer,0,55296},{string,0,"c"}}} =
+        erl_parse:abstract("a"++[55296]++"c"),
 
     Line = 17,
     {integer,Line,1} = erl_parse:abstract(1, Line),
@@ -1081,8 +1080,8 @@ otp_10302(Config) when is_list(Config) ->
     {string,Line,"str"} = erl_parse:abstract("str", Line),
     {cons,Line,
      {integer,Line,$a},
-     {cons,Line,{integer,Line,1024},{string,Line,"c"}}} =
-        erl_parse:abstract("a"++[1024]++"c", Line),
+     {cons,Line,{integer,Line,55296},{string,Line,"c"}}} =
+        erl_parse:abstract("a"++[55296]++"c", Line),
 
     Opts1 = [{line,17}],
     {integer,Line,1} = erl_parse:abstract(1, Opts1),
@@ -1097,8 +1096,8 @@ otp_10302(Config) when is_list(Config) ->
     {string,Line,"str"} = erl_parse:abstract("str", Opts1),
     {cons,Line,
      {integer,Line,$a},
-     {cons,Line,{integer,Line,1024},{string,Line,"c"}}} =
-        erl_parse:abstract("a"++[1024]++"c", Opts1),
+     {cons,Line,{integer,Line,55296},{string,Line,"c"}}} =
+        erl_parse:abstract("a"++[55296]++"c", Opts1),
 
     [begin
          {integer,Line,1} = erl_parse:abstract(1, Opts2),
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index 2b29566942..8dc8b2c291 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. All Rights Reserved.
 %%
 %% The 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 @@
 -export([ match1/1, match2/1, match_object/1, match_object2/1]).
 -export([ dups/1, misc1/1, safe_fixtable/1, info/1, tab2list/1]).
 -export([ tab2file/1, tab2file2/1, tabfile_ext1/1,
-	tabfile_ext2/1, tabfile_ext3/1, tabfile_ext4/1]).
+	tabfile_ext2/1, tabfile_ext3/1, tabfile_ext4/1, badfile/1]).
 -export([ heavy_lookup/1, heavy_lookup_element/1, heavy_concurrent/1]).
 -export([ lookup_element_mult/1]).
 -export([]).
@@ -75,6 +75,7 @@
 -export([otp_9932/1]).
 -export([otp_9423/1]).
 -export([otp_10182/1]).
+-export([ets_all/1]).
 -export([memory_check_summary/1]).
 
 -export([init_per_testcase/2, end_per_testcase/2]).
@@ -151,6 +152,7 @@ all() ->
      otp_10182,
      otp_9932,
      otp_9423,
+     ets_all,
      
      memory_check_summary]. % MUST BE LAST
 
@@ -171,7 +173,7 @@ groups() ->
       [misc1, safe_fixtable, info, dups, tab2list]},
      {files, [],
       [tab2file, tab2file2, tabfile_ext1,
-       tabfile_ext2, tabfile_ext3, tabfile_ext4]},
+       tabfile_ext2, tabfile_ext3, tabfile_ext4, badfile]},
      {heavy, [],
       [heavy_lookup, heavy_lookup_element, heavy_concurrent]},
      {fold, [],
@@ -4202,7 +4204,56 @@ tabfile_ext4(Config) when is_list(Config) ->
     file:delete(FName),
     ok.
 
+badfile(suite) ->
+    [];
+badfile(doc) ->
+    ["Tests that no disk_log is left open when file has been corrupted"];
+badfile(Config) when is_list(Config) ->
+    PrivDir = ?config(priv_dir,Config),
+    File = filename:join(PrivDir, "badfile"),
+    _ = file:delete(File),
+    T = ets:new(table, []),
+    true = ets:insert(T, [{a,1},{b,2}]),
+    ok = ets:tab2file(T, File, []),
+    true = ets:delete(T),
+    [H0 | Ts ] = get_all_terms(l, File),
+    H1 = tuple_to_list(H0),
+    H2 = [{K,V} || {K,V} <- H1, K =/= protection],
+    H = list_to_tuple(H2),
+    ok = file:delete(File),
+    write_terms(l, File, [H | Ts]),
+    %% All mandatory keys are no longer members of the header
+    {error, badfile} = ets:file2tab(File),
+    {error, badfile} = ets:tabfile_info(File),
+    file:delete(File),
+    {[],[]} = disk_log:accessible_logs(),
+    ok.
 
+get_all_terms(Log, File) ->
+    {ok, Log} = disk_log:open([{name,Log},
+                               {file, File},
+                               {mode, read_only}]),
+    Ts = get_all_terms(Log),
+    ok = disk_log:close(Log),
+    Ts.
+
+get_all_terms(Log) ->
+    get_all_terms1(Log, start, []).
+
+get_all_terms1(Log, Cont, Res) ->
+    case disk_log:chunk(Log, Cont) of
+	{error, _R} ->
+            throw(fel);
+	{Cont2, Terms} ->
+	    get_all_terms1(Log, Cont2, Res ++ Terms);
+	eof ->
+	    Res
+    end.
+
+write_terms(Log, File, Terms) ->
+    {ok, Log} = disk_log:open([{name,Log},{file, File},{mode,read_write}]),
+    ok = disk_log:log(Log, Terms),
+    ok = disk_log:close(Log).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -5516,7 +5567,19 @@ otp_10182(Config) when is_list(Config) ->
     ets:delete(Db),
     In = Out.
 
-    
+%% Test that ets:all include/exclude tables that we know are created/deleted
+ets_all(Config) when is_list(Config) ->
+    Pids = [spawn_link(fun() -> ets_all_run() end) || _ <- [1,2]],
+    receive after 3*1000 -> ok end,
+    [begin unlink(P), exit(P,kill) end || P <- Pids],
+    ok.
+
+ets_all_run() ->
+    Table = ets:new(undefined, []),
+    true = lists:member(Table, ets:all()),
+    ets:delete(Table),
+    false = lists:member(Table, ets:all()),
+    ets_all_run().
     
 
 %
diff --git a/lib/stdlib/test/expand_test.erl b/lib/stdlib/test/expand_test.erl
index 63e4bc3aa0..b9db32c352 100644
--- a/lib/stdlib/test/expand_test.erl
+++ b/lib/stdlib/test/expand_test.erl
@@ -20,7 +20,8 @@
 
 -export([a_fun_name/1,
 	 a_less_fun_name/1,
-	 b_comes_after_a/1]).
+	 b_comes_after_a/1,
+         expand0arity_entirely/0]).
 
 a_fun_name(X) ->
     X.
@@ -30,3 +31,6 @@ a_less_fun_name(X) ->
 
 b_comes_after_a(X) ->
     X.
+
+expand0arity_entirely () ->
+    ok.
diff --git a/lib/stdlib/test/expand_test1.erl b/lib/stdlib/test/expand_test1.erl
index 11b6fec0f3..1d375e5677 100644
--- a/lib/stdlib/test/expand_test1.erl
+++ b/lib/stdlib/test/expand_test1.erl
@@ -23,7 +23,7 @@
 	 b_comes_after_a/1,
 	 'Quoted_fun_name'/0,
 	 'Quoted_fun_too'/0,
-	 '#weird-fun-name'/0]).
+	 '#weird-fun-name'/1]).
 
 a_fun_name(X) ->
     X.
@@ -40,5 +40,5 @@ b_comes_after_a(X) ->
 'Quoted_fun_too'() ->
     too.
 
-'#weird-fun-name'() ->
+'#weird-fun-name'(_) ->
     weird.
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 9f828c6d2d..5a8971c071 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
diff --git a/lib/stdlib/test/lists_SUITE.erl b/lib/stdlib/test/lists_SUITE.erl
index 92253ef5b9..f4589a8e24 100644
--- a/lib/stdlib/test/lists_SUITE.erl
+++ b/lib/stdlib/test/lists_SUITE.erl
@@ -61,7 +61,7 @@
 	 zip_unzip/1, zip_unzip3/1, zipwith/1, zipwith3/1,
 	 filter_partition/1, 
 	 otp_5939/1, otp_6023/1, otp_6606/1, otp_7230/1,
-	 suffix/1, subtract/1]).
+	 suffix/1, subtract/1, droplast/1]).
 
 %% Sort randomized lists until stopped.
 %%
@@ -2641,4 +2641,12 @@ sub_non_matching(A, B) ->
 sub(A, B) ->
     Res = A -- B,
     Res = lists:subtract(A, B).
-	
+
+%% Test lists:droplast/1
+droplast(Config) when is_list(Config) ->
+    ?line [] = lists:droplast([x]),
+    ?line [x] = lists:droplast([x, y]),
+    ?line {'EXIT', {function_clause, _}} = (catch lists:droplast([])),
+    ?line {'EXIT', {function_clause, _}} = (catch lists:droplast(x)),
+
+    ok.
diff --git a/lib/stdlib/test/ms_transform_SUITE.erl b/lib/stdlib/test/ms_transform_SUITE.erl
index a17307b07b..4ec13ed472 100644
--- a/lib/stdlib/test/ms_transform_SUITE.erl
+++ b/lib/stdlib/test/ms_transform_SUITE.erl
@@ -40,6 +40,7 @@
 -export([action_function/1]).
 -export([warnings/1]).
 -export([no_warnings/1]).
+-export([eep37/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 init_per_testcase(_Func, Config) ->
@@ -57,7 +58,7 @@ all() ->
      record_index, multipass, bitsyntax, record_defaults,
      andalso_orelse, float_1_function, action_function,
      warnings, no_warnings, top_match, old_guards, autoimported,
-     semicolon].
+     semicolon, eep37].
 
 groups() -> 
     [].
@@ -806,6 +807,14 @@ action_function(Config) when is_list(Config) ->
     ok.
 
 
+eep37(Config) when is_list(Config) ->
+    setup(Config),
+    [{'$1',[],['$1']}] =
+        compile_and_run(<<"F = fun _Ms() ->\n"
+                          "            ets:fun2ms(fun (X) -> X end)\n"
+                          "    end,\n"
+                          "F()">>).
+
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index a9ea78a58b..2846657c09 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -76,7 +76,9 @@
 
 	  manpage/1,
 
-	  backward/1, forward/1]).
+	  backward/1, forward/1,
+
+         eep37/1]).
 
 %% Internal exports.
 -export([bad_table_throw/1, bad_table_exit/1, default_table/1, bad_table/1,
@@ -132,7 +134,7 @@ groups() ->
        evaluator, string_to_handle, table, process_dies, sort,
        keysort, filesort, cache, cache_list, filter, info,
        nested_info, lookup1, lookup2, lookup_rec, indices,
-       pre_fun, skip_filters]},
+       pre_fun, skip_filters, eep37]},
      {table_impls, [], [ets, dets]},
      {join, [],
       [join_option, join_filter, join_lookup, join_merge,
@@ -2544,7 +2546,7 @@ info(Config) when is_list(Config) ->
           ets:delete(E)">>,
 
        <<"Q1 = qlc:q([W || W <- [a,b]]),
-          Q2 = qlc:q([Z || Z <- qlc:sort([1,2,300])], unique),
+          Q2 = qlc:q([Z || Z <- qlc:sort([55296,56296,57296])], unique),
           Q3 = qlc:q([{X,Y} || X <- qlc:keysort([2], [{1,a}]),
                                Y <- qlc:append([Q1, Q2]),
                                X > Y]),
@@ -2552,7 +2554,7 @@ info(Config) when is_list(Config) ->
            [{generate, P1, {list, [{1,a}]}},
             {generate, P2, {append, [{list, [a,b]},
                                     {qlc, T2, [{generate, P3,
-                                                {sort, {list,[1,2,300]},[]}}],
+                                                {sort, {list,[55296,56296,57296]},[]}}],
                                      [{cache,ets},{unique,true}]}]}},F],
            []} = i(Q3, cache_all),
           {tuple, _, [{var,_,'X'}, {var,_,'Y'}]} = binary_to_term(T1),
@@ -2562,7 +2564,7 @@ info(Config) when is_list(Config) ->
           {var, _, 'Z'} = binary_to_term(T2),
           {op, _, '>', {var, _, 'X'}, {var, _, 'Y'}} = binary_to_term(F),
           true = binary_to_list(<<
-           \"beginV1=qlc:q([Z||Z<-qlc:sort([1,2,300],[])],[{unique,true}]),\"
+           \"beginV1=qlc:q([Z||Z<-qlc:sort([55296,56296,57296],[])],[{unique,true}]),\"
            \"qlc:q([{X,Y}||X<-[{1,a}],Y<-qlc:append([[a,b],V1]),X>Y])end\"
               >>) == format_info(Q3, true)">>,
 
@@ -6607,12 +6609,12 @@ otp_7232(Config) when is_list(Config) ->
                 {nil,_}]} = 
               qlc:info(qlc:sort(L),{format,abstract_code})">>,
 
-          <<"Q1 = qlc:q([X || X <- [1000,2000]]),
+          <<"Q1 = qlc:q([X || X <- [55296,56296]]),
              Q = qlc:sort(Q1, {order, fun(A,B)-> A>B end}),
-             \"qlc:sort([1000,2000],[{order,fun'-function/0-fun-2-'/2}])\" = 
+             \"qlc:sort([55296,56296],[{order,fun'-function/0-fun-2-'/2}])\" =
                 format_info(Q, true),
              AC = qlc:info(Q, {format, abstract_code}),
-             \"qlc:sort([1000,2000], [{order,fun '-function/0-fun-2-'/2}])\" = 
+             \"qlc:sort([55296,56296], [{order,fun '-function/0-fun-2-'/2}])\" =
                 binary_to_list(iolist_to_binary(erl_pp:expr(AC)))">>,
 
          %% OTP-7234. erl_parse:abstract() handles bit strings
@@ -7427,6 +7429,14 @@ forward(Config) when is_list(Config) ->
     ?line run(Config, Ts),
     ok.
 
+eep37(Config) when is_list(Config) ->
+    Ts = [
+        <<"H = (fun _Handle() -> qlc:q([X || X <- []]) end)(),
+           [] = qlc:eval(H)">>
+    ],
+    run(Config, Ts),
+    ok.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 bad_table_throw(Tab) ->
diff --git a/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl b/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
index a631b9dbcf..56c998f761 100644
--- a/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
+++ b/lib/stdlib/test/qlc_SUITE_data/join_info_compat.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/stdlib/test/re_SUITE.erl b/lib/stdlib/test/re_SUITE.erl
index 500f5fadb9..87763cbf92 100644
--- a/lib/stdlib/test/re_SUITE.erl
+++ b/lib/stdlib/test/re_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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 +24,10 @@
 	 global_capture/1,replace_input_types/1,replace_return/1,
 	 split_autogen/1,split_options/1,split_specials/1,
 	 error_handling/1,pcre_cve_2008_2371/1,
-	 pcre_compile_workspace_overflow/1,re_infinite_loop/1]).
+	 pcre_compile_workspace_overflow/1,re_infinite_loop/1, 
+	 re_backwards_accented/1,opt_dupnames/1,opt_all_names/1,inspect/1,
+	 opt_no_start_optimize/1,opt_never_utf/1,opt_ucp/1,
+	 match_limit/1,sub_binaries/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -37,7 +39,10 @@ all() ->
      replace_autogen, global_capture, replace_input_types,
      replace_return, split_autogen, split_options,
      split_specials, error_handling, pcre_cve_2008_2371,
-     pcre_compile_workspace_overflow, re_infinite_loop].
+     pcre_compile_workspace_overflow, re_infinite_loop, 
+     re_backwards_accented, opt_dupnames, opt_all_names, 
+     inspect, opt_no_start_optimize,opt_never_utf,opt_ucp,
+     match_limit, sub_binaries].
 
 groups() -> 
     [].
@@ -469,115 +474,152 @@ error_handling() ->
     % The malformed precomiled RE is detected after 
     % the trap to re:grun from grun, in the grun function clause
     % that handles precompiled expressions
-    ?line {'EXIT',{badarg,[{re,run,["apa",{1,2,3,4},[global]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,run,["apa",{1,2,3,4},[global]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa",{1,2,3,4},[global])),
     % An invalid capture list will also cause a badarg late, 
     % but with a non pre compiled RE, the exception should be thrown by the
     % grun function clause that handles RE's compiled implicitly by
     % the run/3 BIF before trapping.
-    ?line {'EXIT',{badarg,[{re,run,["apa","p",[{capture,[1,{a}]},global]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,run,["apa","p",[{capture,[1,{a}]},global]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa","p",[{capture,[1,{a}]},global])),
     % And so the case of a precompiled expression together with
     % a compile-option (binary and list subject):
-    ?line {ok,RE} = re:compile("(p)"),
-    ?line {match,[[{1,1},{1,1}]]} = re:run(<<"apa">>,RE,[global]),
-    ?line {match,[[{1,1},{1,1}]]} = re:run("apa",RE,[global]),
-    ?line {'EXIT',{badarg,[{re,run,
-			    [<<"apa">>,
-			     {re_pattern,1,0,_},
-			     [global,unicode]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {ok,RE} = re:compile("(p)"),
+    {match,[[{1,1},{1,1}]]} = re:run(<<"apa">>,RE,[global]),
+    {match,[[{1,1},{1,1}]]} = re:run("apa",RE,[global]),
+    {'EXIT',{badarg,[{re,run,
+		      [<<"apa">>,
+		       {re_pattern,1,0,_,_},
+		       [global,unicode]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run(<<"apa">>,RE,[global,unicode])),
-    ?line {'EXIT',{badarg,[{re,run,
-			    ["apa",
-			     {re_pattern,1,0,_},
-			     [global,unicode]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,run,
+		      ["apa",
+		       {re_pattern,1,0,_,_},
+		       [global,unicode]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:run("apa",RE,[global,unicode])),
-    ?line {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[])),
-    ?line {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[global])),
+    {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[])),
+    {error, {compile, {_,_}}} = re:run("apa","(p",[report_errors]),
+    {'EXIT',{badarg,_}} = (catch re:run("apa","(p",[global])),
+    {error, {compile, {_,_}}} = re:run("apa","(p",[report_errors,global]),
+    % Badly formed options
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,["global"])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{offset,-1}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{offset,ett}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{captore,[1,2],binary}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{capture,[1,2],binary,list}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{capture,[1,2],bunary}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{capture,{1,2},binary}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{newline,3}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{newline,apa}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{njuline,cr}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{<<"newline">>,cr}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[global|dupnames])),
+    {'EXIT',{badarg,_}} = (catch re:run([<<"ap">>|$a],RE,[])), % Not an IO-list
+    {'EXIT',{badarg,_}} = (catch re:compile([<<"ap">>|$a],[])), % Not an IO-list
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,[{capture,[0|1],binary}])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,
+					[{capture,[<<"apa">>|1],binary}])), 
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,RE,
+					[{capture,[[<<"ap">>|$a]],binary}])), 
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,[<<"(p">>|41],[])), 
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,{re_pattern,3,0,0,[]},[])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,{re_pattern,3,0,0,<<"apa">>},[])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa">>,{re_pattern,3,0,0,<<"apa",3:2>>},[])),
+    {'EXIT',{badarg,_}} = (catch re:run(<<"apa",2:2>>,<<"(p)">>,[{capture,[0,1],binary}])), 
+    <<_:4,Temp:3/binary,_:4>> = <<38,23,6,18>>,
+    {match,[{1,1},{1,1}]} = re:run(Temp,<<"(p)">>,[]), % Unaligned works 
     % The replace errors:
-    ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:replace("apa",{1,2,3,4},"X",[])),
-    ?line {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[global]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,replace,["apa",{1,2,3,4},"X",[global]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:replace("apa",{1,2,3,4},"X",[global])),
-    ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa",
-			     {re_pattern,1,0,_},
-			     "X",
-			     [unicode]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,replace,
+		      ["apa",
+		       {re_pattern,1,0,_,_},
+		       "X",
+		       [unicode]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:replace("apa",RE,"X",[unicode])),
-    ?line <<"aXa">> = iolist_to_binary(re:replace("apa","p","X",[])),
-    ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","p","X",[{capture,all,binary}]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    <<"aXa">> = iolist_to_binary(re:replace("apa","p","X",[])),
+    {'EXIT',{badarg,[{re,replace,
+		      ["apa","p","X",[report_errors]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
-					  [{capture,all,binary}]))),
-    ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","p","X",[{capture,all}]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+					   [report_errors]))),
+    {'EXIT',{badarg,[{re,replace,
+		      ["apa","p","X",[{capture,all,binary}]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
-					  [{capture,all}]))),
-    ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","p","X",[{return,banana}]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+					   [{capture,all,binary}]))),
+    {'EXIT',{badarg,[{re,replace,
+		      ["apa","p","X",[{capture,all}]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","p","X",
-					  [{return,banana}]))),
-    ?line {'EXIT',{badarg,_}} = (catch re:replace("apa","(p","X",[])),
+					   [{capture,all}]))),
+    {'EXIT',{badarg,[{re,replace,
+		      ["apa","p","X",[{return,banana}]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
+	(catch iolist_to_binary(re:replace("apa","p","X",
+					   [{return,banana}]))),
+    {'EXIT',{badarg,_}} = (catch re:replace("apa","(p","X",[])),
     % Badarg, not compile error.
-    ?line {'EXIT',{badarg,[{re,replace,
-			    ["apa","(p","X",[{return,banana}]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,replace,
+		      ["apa","(p","X",[{return,banana}]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch iolist_to_binary(re:replace("apa","(p","X",
-					  [{return,banana}]))),
+					   [{return,banana}]))),
     % And the split errors:
-    ?line [<<"a">>,<<"a">>] = (catch re:split("apa","p",[])),
-    ?line [<<"a">>,<<"p">>,<<"a">>] = (catch re:split("apa",RE,[])),
-    ?line {'EXIT',{badarg,[{re,split,["apa","p",[global]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    [<<"a">>,<<"a">>] = (catch re:split("apa","p",[])),
+    [<<"a">>,<<"p">>,<<"a">>] = (catch re:split("apa",RE,[])),
+    {'EXIT',{badarg,[{re,split,["apa","p",[report_errors]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
+	(catch re:split("apa","p",[report_errors])),
+    {'EXIT',{badarg,[{re,split,["apa","p",[global]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa","p",[global])),
-    ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all}]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all}]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa","p",[{capture,all}])),
-    ?line {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all,binary}]],_},
-			   {?MODULE, error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,["apa","p",[{capture,all,binary}]],_},
+		     {?MODULE, error_handling,0,_} | _]}} =
 	(catch re:split("apa","p",[{capture,all,binary}])),
-    ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",{1,2,3,4})),
-    ?line {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,["apa",{1,2,3,4},[]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",{1,2,3,4},[])),
-    ?line {'EXIT',{badarg,[{re,split,
-			    ["apa",
-			     RE,
-			     [unicode]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,
+		      ["apa",
+		       RE,
+		       [unicode]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",RE,[unicode])),
-    ?line {'EXIT',{badarg,[{re,split,
-			    ["apa",
-			     RE,
-			     [{return,banana}]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,
+		      ["apa",
+		       RE,
+		       [{return,banana}]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",RE,[{return,banana}])),
-    ?line {'EXIT',{badarg,[{re,split,
-			    ["apa",
-			     RE,
-			     [banana]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,
+		      ["apa",
+		       RE,
+		       [banana]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa",RE,[banana])),
-    ?line {'EXIT',{badarg,_}} = (catch re:split("apa","(p")),
+    {'EXIT',{badarg,_}} = (catch re:split("apa","(p")),
     %Exception on bad argument, not compilation error
-    ?line {'EXIT',{badarg,[{re,split,
-			    ["apa",
-			     "(p",
-			     [banana]],_},
-			   {?MODULE,error_handling,0,_} | _]}} =
+    {'EXIT',{badarg,[{re,split,
+		      ["apa",
+		       "(p",
+		       [banana]],_},
+		     {?MODULE,error_handling,0,_} | _]}} =
 	(catch re:split("apa","(p",[banana])),
     ?t:timetrap_cancel(Dog),
     ok.
@@ -600,13 +642,280 @@ re_infinite_loop(doc) ->
     "Make sure matches that really loop infinitely actually fail";
 re_infinite_loop(Config) when is_list(Config) ->
     Dog = ?t:timetrap(?t:minutes(1)),
-    ?line Str =
+    Str =
         "http:/www.flickr.com/slideShow/index.gne?group_id=&user_id=69845378@N0",
-    ?line EMail_regex = "[a-z0-9!#$%&'*+/=?^_`{|}~-]+"
+    EMail_regex = "[a-z0-9!#$%&'*+/=?^_`{|}~-]+"
         ++ "(\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*"
         ++ "@.*([a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+"
         ++ "([a-zA-Z]{2}|com|org|net|gov|mil"
         ++ "|biz|info|mobi|name|aero|jobs|museum)",
-    ?line nomatch = re:run(Str, EMail_regex),
+    nomatch = re:run(Str, EMail_regex),
+    nomatch = re:run(Str, EMail_regex, [global]),
+    {error,match_limit} = re:run(Str, EMail_regex,[report_errors]),
+    {error,match_limit} = re:run(Str, EMail_regex,[report_errors,global]),
     ?t:timetrap_cancel(Dog),
     ok.
+re_backwards_accented(doc) ->
+    "Check for nasty bug where accented graphemes can make PCRE back past "
+	"beginning of subject";
+re_backwards_accented(Config) when is_list(Config) ->
+    Dog = ?t:timetrap(?t:minutes(1)),
+    ?line match = re:run(<<65,204,128,65,204,128,97,98,99>>,
+			 <<"\\X?abc">>,
+			 [unicode,{capture,none}]),
+    ?t:timetrap_cancel(Dog),
+    ok.
+opt_dupnames(doc) ->
+    "Check correct handling of dupnames option to re";
+opt_dupnames(Config) when is_list(Config) ->
+    Days = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
+    _ = [ begin
+	      Short = lists:sublist(Day,3),
+	      {match,[Short]} =
+		  re:run(Day,
+			 "(?<DN>Mon|Fri|Sun)(?:day)?|(?<DN>Tue)(?:sday)?|"
+			 "(?<DN>Wed)(?:nesday)?|(?<DN>Thu)(?:rsday)?|"
+			 "(?<DN>Sat)(?:urday)?",
+			 [dupnames, {capture, ['DN'], list}])
+	  end || Day <- Days ],
+    _ = [ begin
+	      Short = list_to_binary(lists:sublist(Day,3)),
+	      {match,[Short]} =
+		  re:run(Day,
+			 "(?<DN>Mon|Fri|Sun)(?:day)?|(?<DN>Tue)(?:sday)?|"
+			 "(?<DN>Wed)(?:nesday)?|(?<DN>Thu)(?:rsday)?|"
+			 "(?<DN>Sat)(?:urday)?",
+			 [dupnames, {capture, ['DN'], binary}])
+	  end || Day <- Days ],
+    _ = [ begin
+	      {match,[{0,3}]} =
+		  re:run(Day,
+			 "(?<DN>Mon|Fri|Sun)(?:day)?|(?<DN>Tue)(?:sday)?|"
+			 "(?<DN>Wed)(?:nesday)?|(?<DN>Thu)(?:rsday)?|"
+			 "(?<DN>Sat)(?:urday)?",
+			 [dupnames, {capture, ['DN'], index}])
+	  end || Day <- Days ],
+    {match,[{0,1},{1,3},{7,1}]} = re:run("SMondayX","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
+					 "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
+					 "(?<DN>Sat)(?:urday)?",
+					 [dupnames, {capture, ['Skrap','DN','Skrap2'],index}]),
+    {match,[{-1,0},{0,3},{-1,0}]} = re:run("Wednesday","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
+					 "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
+					 "(?<DN>Sat)(?:urday)?",
+					 [dupnames, {capture, ['Skrap','DN','Skrap2'],index}]),
+    nomatch = re:run("Wednsday","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
+		     "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
+		     "(?<DN>Sat)(?:urday)?",
+		     [dupnames, {capture, ['Skrap','DN','Skrap2'],index}]),
+    {match,[<<>>]} = re:run("Subject","b",[dupnames,{capture,['B'],binary}]),
+    {match,[<<"S">>,<<"u">>,<<"b">>,<<"j">>,<<"e">>,<<"c">>,
+	    <<"t">>,<<"I">>,<<"s">>,<<"M">>,<<"o">>,<<"r">>,<<"e">>,
+	    <<"T">>,<<"h">>,<<"a">>,<<"n">>,<<"T">>,<<"e">>,<<"n">>]} =
+	re:run("SubjectIsMoreThanTen",
+	       "(?<S>S)(?<u>u)(?<b>b)(?<j>j)(?<e>e)(?<c>c)(?<t>t)"
+	       "(?<I>I)(?<s>s)(?<M>M)(?<o>o)(?<r>r)(?<e>e)(?<T>T)"
+	       "(?<h>h)(?<a>a)(?<n>n)(?<T>T)(?<e>e)(?<n>n)",
+	       [dupnames,{capture,['S','u','b','j','e','c','t',
+				   'I','s','M','o','r','e','T',
+				   'h','a','n','T','e','n'],binary}]),
+    {match,[<<"S">>,<<"u">>,<<"b">>,<<"j">>,<<"e">>,<<"c">>,
+	    <<"t">>,<<"I">>,<<"s">>,<<"M">>,<<"o">>,<<"r">>,<<"e">>,
+	    <<"T">>,<<"h">>,<<"a">>,<<"n">>,<<"T">>,<<"e">>,<<"n">>]} =
+	re:run("SubjectIsMoreThanTen",
+	       "(?<S>S)(?<u>u)(?<b>b)(?<j>j)(?<e>e)(?<c>c)(?<t>t)"
+	       "(?<I>I)(?<s>s)(?<M>M)(?<o>o)(?<r>r)(?<e>e)(?<T>T)"
+	       "(?<h>h)(?<a>a)(?<n>n)(?<T>T)(?<e>e)(?<n>n)",
+	       [dupnames,
+		{capture,all_but_first,list},
+		{capture,['S','u','b','j','e','c','t',
+			  'I','s','M','o','r','e','T',
+			  'h','a','n','T','e','n'],binary}]),
+    {match,[<<"S">>,<<"u">>,<<"b">>,<<"j">>,<<"e">>,<<"c">>,
+	    <<"t">>,<<"I">>,<<"s">>,<<"M">>,<<"o">>,<<"r">>,<<"e">>,
+	    <<"T">>,<<"h">>,<<"a">>,<<"n">>,<<"T">>,<<"e">>,<<"n">>]} =
+	re:run("SubjectIsMoreThanTen",
+	       "(?<S>S)(?<u>u)(?<b>b)(?<j>j)(?<e>e)(?<c>c)(?<t>t)"
+	       "(?<I>I)(?<s>s)(?<M>M)(?<o>o)(?<r>r)(?<e>e)(?<T>T)"
+	       "(?<h>h)(?<a>a)(?<n>n)(?<T>T)(?<e>e)(?<n>n)",
+	       [dupnames,
+		{capture,["S","u","b","j","e","c","t",
+			  "I","s","M","o","r","e","T",
+			  "h","a","n","T","e","n"],binary}]), 
+    {match,[<<"S">>,<<"u">>,<<"b">>,<<"j">>,<<"e">>,<<"c">>,
+	    <<"t">>,<<"I">>,<<"s">>,<<"M">>,<<"o">>,<<"r">>,<<"e">>,
+	    <<"T">>,<<"h">>,<<"a">>,<<"n">>,<<"T">>,<<"e">>,<<"n">>]} =
+	re:run("SubjectIsMoreThanTen",
+	       "(?<S>S)(?<u>u)(?<b>b)(?<j>j)(?<e>e)(?<c>c)(?<t>t)"
+	       "(?<I>I)(?<s>s)(?<M>M)(?<o>o)(?<r>r)(?<e>e)(?<T>T)"
+	       "(?<h>h)(?<a>a)(?<n>n)(?<T>T)(?<e>e)(?<then>n)",
+	       [dupnames,
+		{capture,["S","u","b","j","e","c","t",
+			  "I","s","M","o","r","e","T",
+			  "h","a","n","T","e","then"],binary}]), 
+    ok.
+
+opt_all_names(doc) ->
+    "Test capturing of all_names";
+opt_all_names(Config) when is_list(Config) ->
+    Days = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
+    {match,[{1,3},{0,1},{7,1}]} = re:run("SMondayX","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
+					 "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
+					 "(?<DN>Sat)(?:urday)?",
+					 [dupnames, {capture, all_names,index}]),
+    {match,[{0,3},{-1,0},{-1,0}]} = re:run("Wednesday","(?<Skrap>.)(?<DN>Mon|Fri|Sun)(?:day)?(?<Skrap2>.)|"
+					 "(?<DN>Tue)(?:sday)?|(?<DN>Wed)nesday|(?<DN>Thu)(?:rsday)?|"
+					 "(?<DN>Sat)(?:urday)?",
+					 [dupnames, {capture, all_names,index}]),
+    
+    _ = [ begin
+	      {match,[{0,3}]} =
+		  re:run(Day,
+			 "(?<DN>Mon|Fri|Sun)(?:day)?|(?<DN>Tue)(?:sday)?|"
+			 "(?<DN>Wed)(?:nesday)?|(?<DN>Thu)(?:rsday)?|"
+			 "(?<DN>Sat)(?:urday)?",
+			 [dupnames, {capture, all_names, index}])
+	  end || Day <- Days ],
+    _ = [ begin
+	      match =
+		  re:run(Day,
+			 "(Mon|Fri|Sun)(?:day)?|(Tue)(?:sday)?|"
+			 "(Wed)(?:nesday)?|(Thu)(?:rsday)?|"
+			 "(Sat)(?:urday)?",
+			 [dupnames, {capture, all_names, index}])
+	  end || Day <- Days ],
+    {match,[{0,1},{-1,0},{-1,0}]} = re:run("A","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, index}]),
+    {match,[{-1,0},{0,1},{-1,0}]} = re:run("B","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, index}]),
+    {match,[{-1,0},{-1,0},{0,1}]} = re:run("C","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, index}]),
+    {match,[<<"A">>,<<>>,<<>>]} = re:run("A","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, binary}]),
+    {match,[<<>>,<<"B">>,<<>>]} = re:run("B","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, binary}]),
+    {match,[<<>>,<<>>,<<"C">>]} = re:run("C","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, binary}]),
+    {match,["A",[],[]]} = re:run("A","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, list}]),
+    {match,[[],"B",[]]} = re:run("B","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, list}]),
+    {match,[[],[],"C"]} = re:run("C","(?<A>A)|(?<B>B)|(?<C>C)",[{capture, all_names, list}]),
+    {match,[{-1,0},{-1,0},{0,1}]} = re:run("A","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, index}]),
+    {match,[{-1,0},{0,1},{-1,0}]} = re:run("B","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, index}]),
+    {match,[{0,1},{-1,0},{-1,0}]} = re:run("C","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, index}]),
+    {match,[<<>>,<<>>,<<"A">>]} = re:run("A","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, binary}]),
+    {match,[<<>>,<<>>,<<"A">>]} = re:run("A","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_but_first, binary},{capture, all_names, binary}]),
+    {match,[<<>>,<<"B">>,<<>>]} = re:run("B","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, binary}]),
+    {match,[<<"C">>,<<>>,<<>>]} = re:run("C","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, binary}]),
+    {match,[[],[],"A"]} = re:run("A","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, list}]),
+    {match,[[],"B",[]]} = re:run("B","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, list}]),
+    {match,["C",[],[]]} = re:run("C","(?<C>A)|(?<B>B)|(?<A>C)",[{capture, all_names, list}]),
+    {match,[[<<>>,<<>>,<<"C">>],
+	    [<<>>,<<>>,<<"C">>],
+	    [<<>>,<<>>,<<"C">>]]} = re:run("CCC","(?<A>A)|(?<B>B)|(?<C>C)",
+				       [global,{capture, all_names, binary}]),
+    {match,[[<<"C">>,<<>>],
+	    [<<>>,<<"B">>],
+	    [<<"C">>,<<>>]]} = re:run("CBC","(?<A>A)|(?<B>B)|(?<A>C)",
+				      [global,dupnames,{capture, all_names, binary}]),
+    {match,[[]]} = re:run("ABCE","(?<A>D)|(?<B>E)|(?<A>F)",[dupnames,{capture,['A'],list}]),
+    {match,["D"]} = re:run("ABCDE","(?<A>D)|(?<B>E)|(?<A>F)",[dupnames,{capture,['A'],list}]),
+    {match,["F"]} = re:run("ABCFE","(?<A>D)|(?<B>E)|(?<A>F)",[dupnames,{capture,['A'],list}]),
+    {match,["F",[]]} = re:run("ABCFE","(?<A>D)|(?<B>E)|(?<A>F)",[dupnames,{capture,['A','B'],list}]),
+    {match,[[],"E"]} = re:run("ABCE","(?<A>D)|(?<B>E)|(?<A>F)",[dupnames,{capture,['A','B'],list}]),
+    {match,[[],"E"]} = re:run("ABCE","(?<A>D)|(?<B>E)|(?<A>F)",[dupnames,{capture,all_names,list}]),
+    {match,[{-1,0},{3,1}]}  = re:run("ABCE","(?<A>D)|(?<B>E)|(?<A>F)",[dupnames,{capture,all_names,index}]),
+    match = re:run("Subject","b",[dupnames,{capture,all_names,binary}]),
+    {match,[<<"I">>,<<"M">>,<<"S">>,<<"T">>,<<"a">>,<<"b">>,              
+	    <<"c">>,<<"e">>,<<"h">>,<<"j">>,<<"n">>,<<"o">>,<<"r">>,
+	    <<"s">>,<<"t">>,<<"u">>]} =
+	re:run("SubjectIsMoreThanTen","(?<S>S)(?<u>u)(?<b>b)(?<j>j)"
+	       "(?<e>e)(?<c>c)(?<t>t)(?<I>I)(?<s>s)(?<M>M)(?<o>o)(?<r>r)"
+	       "(?<e>e)(?<T>T)(?<h>h)(?<a>a)(?<n>n)(?<T>T)(?<e>e)(?<n>n)",
+	       [dupnames,{capture,all_names,binary}]),
+    ok.
+
+inspect(doc) ->
+    "Test the minimal inspect function";
+inspect(Config) when is_list(Config)->
+    {ok,MP} = re:compile("(?<A>A)|(?<B>B)|(?<C>C)."),
+    {namelist,[<<"A">>,<<"B">>,<<"C">>]} = re:inspect(MP,namelist),
+    {ok,MPD} = re:compile("(?<A>A)|(?<B>B)|(?<A>C).",[dupnames]),
+    {namelist,[<<"A">>,<<"B">>]} = re:inspect(MPD,namelist),
+    {ok,MPN} = re:compile("(A)|(B)|(C)."),
+    {namelist,[]} = re:inspect(MPN,namelist),
+    {'EXIT',{badarg,_}} = (catch re:inspect(MPD,namelistk)),
+    {'EXIT',{badarg,_}} = (catch re:inspect({re_pattern,3,0,0,<<"kalle">>},namelist)),
+    {'EXIT',{badarg,_}} = (catch re:inspect({re_pattern,3,0,0,<<"kalle",2:2>>},namelist)),
+    ok.
+
+opt_no_start_optimize(doc) ->
+    "Test that the no_start_optimize compilation flag works";
+opt_no_start_optimize(Config) when is_list(Config) ->
+    {match, [{3,3}]} = re:run("DEFABC","(*COMMIT)ABC",[]), % Start optimization makes this result wrong!
+    nomatch = re:run("DEFABC","(*COMMIT)ABC",[no_start_optimize]), % This is the correct result...
+    ok.
+
+opt_never_utf(doc) ->
+    "Check that the never_utf option works";
+opt_never_utf(Config) when is_list(Config) ->
+    {match,[{0,3}]} = re:run("ABC","ABC",[never_utf]),
+    {match,[{0,3}]} = re:run("ABC","(*UTF)ABC",[]),
+    {ok,_} = re:compile("(*UTF)ABC"),
+    {ok,_} = re:compile("(*UTF)ABC",[unicode]),
+    {ok,_} = re:compile("(*UTF8)ABC"),
+    {'EXIT',{badarg,_}} = (catch re:run("ABC","ABC",[unicode,never_utf])),
+    {'EXIT',{badarg,_}} = (catch re:run("ABC","(*UTF)ABC",[never_utf])),
+    {'EXIT',{badarg,_}} = (catch re:run("ABC","(*UTF8)ABC",[never_utf])),
+    {error,_} = (catch re:compile("ABC",[unicode,never_utf])),
+    {error,_} = (catch re:compile("(*UTF)ABC",[never_utf])),
+    {error,_} = (catch re:compile("(*UTF8)ABC",[never_utf])),
+    ok.
+opt_ucp(doc) ->
+    "Check that the ucp option is passed to PCRE";
+opt_ucp(Config) when is_list(Config) ->
+    {match,[{0,1}]} = re:run([$a],"\\w",[unicode]),
+    {match,[{0,2}]} = re:run([229],"\\w",[unicode]), % Latin1 works without UCP, as we have a default 
+						     % Latin1 table
+    nomatch = re:run([1024],"\\w",[unicode]), % Latin1 word characters only, 1024 is not latin1
+    {match,[{0,2}]} = re:run([1024],"\\w",[unicode,ucp]), % Any Unicode word character works with 'ucp'
+    ok.
+match_limit(doc) ->
+    "Check that the match_limit and match_limit_recursion options work";
+match_limit(Config) when is_list(Config) ->
+    nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[]),
+    nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit,3000}]),
+    nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit_recursion,10}]),
+    nomatch = re:run("aaaaaaaaaaaaaz","(a+)*zz",[report_errors]),
+    {error,match_limit} = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit,3000},
+						 report_errors]),
+    {error,match_limit_recursion} = 
+	re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit_recursion,10},
+					   report_errors]),
+    {error,match_limit} = re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit,3000},
+						 report_errors,global]),
+    {error,match_limit_recursion} = 
+	re:run("aaaaaaaaaaaaaz","(a+)*zz",[{match_limit_recursion,10},
+					   report_errors,global]),
+    ["aaaaaaaaaaaaaz"] = re:split("aaaaaaaaaaaaaz","(a+)*zz",
+				  [{match_limit_recursion,10},{return,list}]),
+    ["aaaaaaaaaaaaaz"] = re:split("aaaaaaaaaaaaaz","(a+)*zz",
+				  [{match_limit,3000},{return,list}]),
+    "aaaaaaaaaaaaaz" = re:replace("aaaaaaaaaaaaaz","(a+)*zz","!",
+				  [{match_limit_recursion,10},{return,list}]),
+    "aaaaaaaaaaaaaz" = re:replace("aaaaaaaaaaaaaz","(a+)*zz","!",
+				  [{match_limit,3000},{return,list}]),
+    {'EXIT', {badarg,_}} = (catch re:replace("aaaaaaaaaaaaaz","(a+)*zz","!",
+				  [{match_limit_recursion,-1},{return,list}])),
+    {'EXIT', {badarg,_}} = (catch re:replace("aaaaaaaaaaaaaz","(a+)*zz","!",
+				  [{match_limit,-1},{return,list}])),
+    {'EXIT', {badarg,_}} = (catch re:run("aaaaaaaaaaaaaz","(a+)*zz",
+					 [{match_limit_recursion,-1},
+					  report_errors,global])),
+    {'EXIT', {badarg,_}} = (catch re:run("aaaaaaaaaaaaaz","(a+)*zz",
+					 [{match_limit,-1},
+					  report_errors,global])),
+    ok.
+sub_binaries(doc) ->
+    "test that we get sub-binaries if subject is a binary and we "
+	"capture binaries";
+sub_binaries(Config) when is_list(Config) ->
+    Bin = list_to_binary(lists:seq(1,255)),
+    {match,[B,C]}=re:run(Bin,"(a)",[{capture,all,binary}]),
+    255 = binary:referenced_byte_size(B),
+    255 = binary:referenced_byte_size(C),
+    {match,[D]}=re:run(Bin,"(a)",[{capture,[1],binary}]),
+    255 = binary:referenced_byte_size(D),
+    ok.
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput1 b/lib/stdlib/test/re_SUITE_data/testoutput1
index 3bf4ffbeee..3ed635146a 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput1
+++ b/lib/stdlib/test/re_SUITE_data/testoutput1
@@ -1,3 +1,7 @@
+/-- This set of tests is for features that are compatible with all versions of
+    Perl >= 5.10, in non-UTF-8 mode. It should run clean for both the 8-bit and
+    16-bit PCRE libraries. --/
+
 /the quick brown fox/
     the quick brown fox
  0: the quick brown fox
@@ -2281,7 +2285,7 @@ No match
  0: c
     *** Failers
  0: s
-    abk
+    abk   
 No match
    
 /[^k]{2,3}$/
@@ -2289,7 +2293,7 @@ No match
  0: abc
     kbc
  0: bc
-    kabc
+    kabc 
  0: abc
     *** Failers
  0: ers
@@ -2859,7 +2863,7 @@ No match
     the \"quick\" brown fox
  0: "quick"
  1: quick
-    \"the \\\"quick\\\" brown fox\"
+    \"the \\\"quick\\\" brown fox\" 
  0: "the \"quick\" brown fox"
  1:  brown fox
 
@@ -3749,10 +3753,10 @@ No match
     foobarbaz 
 No match
 
-/The case of aaaaaa is missed out below because I think Perl 5.005_02 gets/
-/it wrong; it sets $1 to aaa rather than aa. Compare the following test,/
+/The cases of aaaa and aaaaaa are missed out below because Perl does things/
+/differently. We know that odd, and maybe incorrect, things happen with/
 No match
-/where it does set $1 to aa when matching aaaaaa./
+/recursive references in Perl, as far as 5.11.3 - see some stuff in test #2./
 No match
 
 /^(a\1?){4}$/
@@ -3762,9 +3766,6 @@ No match
 No match
     aaa
 No match
-    aaaa
- 0: aaaa
- 1: a
     aaaaa
  0: aaaaa
  1: a
@@ -6159,11 +6160,9 @@ No match
  1: bc
  2: bc
 
-/-- This tests for an IPv6 address in the form where it can have up to --/
-/-- eight components, one and only one of which is empty. This must be --/
-No match
-/-- an internal component. --/
-No match
+/-- This tests for an IPv6 address in the form where it can have up to
+    eight components, one and only one of which is empty. This must be
+    an internal component. --/
 
 /^(?!:)                       # colon disallowed at start
   (?:                         # start of item
@@ -6605,4 +6604,2600 @@ No match
     p    
  0: p
 
-/ End of testinput1 /
+/.*[op][xyz]/
+    fooabcfoo
+No match
+
+/(?(?=.*b)b|^)/
+   adc
+ 0: 
+   abc 
+ 0: b
+
+/(?(?=^.*b)b|^)/
+   adc
+ 0: 
+   abc 
+No match
+
+/(?(?=.*b)b|^)*/
+   adc
+ 0: 
+   abc 
+ 0: 
+
+/(?(?=.*b)b|^)+/
+   adc
+ 0: 
+   abc 
+ 0: b
+
+/(?(?=b).*b|^d)/
+    abc
+ 0: b
+
+/(?(?=.*b).*b|^d)/
+    abc
+ 0: ab
+
+/^%((?(?=[a])[^%])|b)*%$/
+    %ab%
+ 0: %ab%
+ 1: 
+
+/(?i)a(?-i)b|c/
+    XabX
+ 0: ab
+    XAbX
+ 0: Ab
+    CcC 
+ 0: c
+    ** Failers
+No match
+    XABX   
+No match
+
+/[\x00-\xff\s]+/
+    \x0a\x0b\x0c\x0d
+ 0: \x0a\x0b\x0c\x0d
+
+/^\c/
+    ?
+ 0: ?
+
+/(abc)\1/i
+   abc
+No match
+
+/(abc)\1/
+   abc
+No match
+
+/[^a]*/i
+    12abc
+ 0: 12
+    12ABC
+ 0: 12
+
+/[^a]*+/i
+    12abc
+ 0: 12
+    12ABC
+ 0: 12
+
+/[^a]*?X/i
+    ** Failers
+No match
+    12abc
+No match
+    12ABC
+No match
+    
+/[^a]+?X/i   
+    ** Failers
+No match
+    12abc
+No match
+    12ABC
+No match
+
+/[^a]?X/i
+    12aXbcX
+ 0: X
+    12AXBCX
+ 0: X
+    BCX 
+ 0: CX
+
+/[^a]??X/i
+    12aXbcX
+ 0: X
+    12AXBCX
+ 0: X
+    BCX
+ 0: CX
+    
+/[^a]?+X/i
+    12aXbcX
+ 0: cX
+    12AXBCX
+ 0: CX
+    BCX 
+ 0: CX
+
+/[^a]{2,3}/i
+    abcdef
+ 0: bcd
+    ABCDEF  
+ 0: BCD
+
+/[^a]{2,3}?/i
+    abcdef
+ 0: bc
+    ABCDEF  
+ 0: BC
+
+/[^a]{2,3}+/i
+    abcdef
+ 0: bcd
+    ABCDEF  
+ 0: BCD
+
+/((a|)+)+Z/
+    Z
+ 0: Z
+ 1: 
+ 2: 
+
+/(a)b|(a)c/
+    ac
+ 0: ac
+ 1: <unset>
+ 2: a
+
+/(?>(a))b|(a)c/
+    ac
+ 0: ac
+ 1: <unset>
+ 2: a
+
+/(?=(a))ab|(a)c/
+    ac
+ 0: ac
+ 1: <unset>
+ 2: a
+
+/((?>(a))b|(a)c)/
+    ac
+ 0: ac
+ 1: ac
+ 2: <unset>
+ 3: a
+
+/((?>(a))b|(a)c)++/
+    ac
+ 0: ac
+ 1: ac
+ 2: <unset>
+ 3: a
+
+/(?:(?>(a))b|(a)c)++/
+    ac
+ 0: ac
+ 1: <unset>
+ 2: a
+
+/(?=(?>(a))b|(a)c)(..)/
+    ac
+ 0: ac
+ 1: <unset>
+ 2: a
+ 3: ac
+
+/(?>(?>(a))b|(a)c)/
+    ac
+ 0: ac
+ 1: <unset>
+ 2: a
+
+/(?:(?>([ab])))+a=/+
+    =ba=
+ 0: ba=
+ 0+ 
+ 1: b
+
+/(?>([ab]))+a=/+
+    =ba=
+ 0: ba=
+ 0+ 
+ 1: b
+
+/((?>(a+)b)+(aabab))/
+    aaaabaaabaabab
+ 0: aaaabaaabaabab
+ 1: aaaabaaabaabab
+ 2: aaa
+ 3: aabab
+
+/(?>a+|ab)+?c/
+    aabc
+No match
+
+/(?>a+|ab)+c/
+    aabc
+No match
+
+/(?:a+|ab)+c/
+    aabc
+ 0: aabc
+
+/(?(?=(a))a)/
+    a
+ 0: a
+ 1: a
+
+/(?(?=(a))a)(b)/
+    ab
+ 0: ab
+ 1: a
+ 2: b
+
+/^(?:a|ab)++c/
+    aaaabc
+No match
+
+/^(?>a|ab)++c/
+    aaaabc
+No match
+
+/^(?:a|ab)+c/
+    aaaabc
+ 0: aaaabc
+
+/(?=abc){3}abc/+
+    abcabcabc
+ 0: abc
+ 0+ abcabc
+    ** Failers
+No match
+    xyz  
+No match
+    
+/(?=abc)+abc/+
+    abcabcabc
+ 0: abc
+ 0+ abcabc
+    ** Failers
+No match
+    xyz  
+No match
+    
+/(?=abc)++abc/+
+    abcabcabc
+ 0: abc
+ 0+ abcabc
+    ** Failers
+No match
+    xyz  
+No match
+    
+/(?=abc){0}xyz/
+    xyz 
+ 0: xyz
+
+/(?=abc){1}xyz/
+    ** Failers
+No match
+    xyz 
+No match
+    
+/(?=(a))?./
+    ab
+ 0: a
+ 1: a
+    bc
+ 0: b
+      
+/(?=(a))??./
+    ab
+ 0: a
+    bc
+ 0: b
+
+/^(?=(a)){0}b(?1)/
+    backgammon
+ 0: ba
+
+/^(?=(?1))?[az]([abc])d/
+    abd 
+ 0: abd
+ 1: b
+    zcdxx 
+ 0: zcd
+ 1: c
+
+/^(?!a){0}\w+/
+    aaaaa
+ 0: aaaaa
+
+/(?<=(abc))?xyz/
+    abcxyz
+ 0: xyz
+ 1: abc
+    pqrxyz 
+ 0: xyz
+
+/^[\g<a>]+/
+    ggg<<<aaa>>>
+ 0: ggg<<<aaa>>>
+    ** Failers
+No match
+    \\ga  
+No match
+    
+/^[\ga]+/
+    gggagagaxyz 
+ 0: gggagaga
+    
+/^[:a[:digit:]]+/
+    aaaa444:::Z 
+ 0: aaaa444:::
+
+/^[:a[:digit:]:b]+/
+    aaaa444:::bbbZ 
+ 0: aaaa444:::bbb
+
+/[:a]xxx[b:]/
+     :xxx:
+ 0: :xxx:
+     
+/(?<=a{2})b/i
+    xaabc
+ 0: b
+    ** Failers
+No match
+    xabc  
+No match
+
+/(?<!a{2})b/i
+    xabc
+ 0: b
+    ** Failers
+No match
+    xaabc  
+No match
+
+/(?<=a\h)c/
+    xa c
+ 0: c
+    
+/(?<=[^a]{2})b/
+    axxbc
+ 0: b
+    aAAbc 
+ 0: b
+    ** Failers
+No match
+    xaabc    
+No match
+
+/(?<=[^a]{2})b/i
+    axxbc  
+ 0: b
+    ** Failers
+No match
+    aAAbc 
+No match
+    xaabc    
+No match
+
+/(?<=a\H)c/
+    abc
+ 0: c
+
+/(?<=a\V)c/
+    abc
+ 0: c
+    
+/(?<=a\v)c/
+    a\nc
+ 0: c
+
+/(?(?=c)c|d)++Y/
+    XcccddYX
+ 0: cccddY
+
+/(?(?=c)c|d)*+Y/
+    XcccddYX
+ 0: cccddY
+
+/^(a{2,3}){2,}+a/
+    aaaaaaa
+ 0: aaaaaaa
+ 1: aaa
+    ** Failers
+No match
+    aaaaaa
+No match
+    aaaaaaaaa 
+No match
+
+/^(a{2,3})++a/
+    ** Failers
+No match
+    aaaaaa
+No match
+
+/^(a{2,3})*+a/
+    ** Failers
+No match
+    aaaaaa
+No match
+
+/ab\Cde/
+    abXde
+ 0: abXde
+    
+/(?<=ab\Cde)X/
+    abZdeX
+ 0: X
+
+/a[\CD]b/
+    aCb
+ 0: aCb
+    aDb 
+ 0: aDb
+
+/a[\C-X]b/
+    aJb
+ 0: aJb
+
+/\H\h\V\v/
+    X X\x0a
+ 0: X X\x0a
+    X\x09X\x0b
+ 0: X\x09X\x0b
+    ** Failers
+No match
+    \xa0 X\x0a   
+No match
+    
+/\H*\h+\V?\v{3,4}/ 
+    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0X\x0a\x0b\x0c\x0d
+    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0\x0a\x0b\x0c\x0d
+    \x09\x20\xa0\x0a\x0b\x0c
+ 0: \x09 \xa0\x0a\x0b\x0c
+    ** Failers 
+No match
+    \x09\x20\xa0\x0a\x0b
+No match
+     
+/\H{3,4}/
+    XY  ABCDE
+ 0: ABCD
+    XY  PQR ST 
+ 0: PQR
+    
+/.\h{3,4}./
+    XY  AB    PQRS
+ 0: B    P
+
+/\h*X\h?\H+Y\H?Z/
+    >XNNNYZ
+ 0: XNNNYZ
+    >  X NYQZ
+ 0:   X NYQZ
+    ** Failers
+No match
+    >XYZ   
+No match
+    >  X NY Z
+No match
+
+/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
+    >XY\x0aZ\x0aA\x0bNN\x0c
+ 0: XY\x0aZ\x0aA\x0bNN\x0c
+    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+ 0: \x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+
+/(foo)\Kbar/
+    foobar
+ 0: bar
+ 1: foo
+   
+/(foo)(\Kbar|baz)/
+    foobar
+ 0: bar
+ 1: foo
+ 2: bar
+    foobaz 
+ 0: foobaz
+ 1: foo
+ 2: baz
+
+/(foo\Kbar)baz/
+    foobarbaz
+ 0: barbaz
+ 1: foobar
+
+/abc\K|def\K/g+
+    Xabcdefghi
+ 0: 
+ 0+ defghi
+ 0: 
+ 0+ ghi
+
+/ab\Kc|de\Kf/g+
+    Xabcdefghi
+ 0: c
+ 0+ defghi
+ 0: f
+ 0+ ghi
+    
+/(?=C)/g+
+    ABCDECBA
+ 0: 
+ 0+ CDECBA
+ 0: 
+ 0+ CBA
+    
+/^abc\K/+
+    abcdef
+ 0: 
+ 0+ def
+    ** Failers
+No match
+    defabcxyz   
+No match
+
+/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
+    ababababbbabZXXXX
+ 0: ababababbbabZ
+ 1: ab
+ 2: b
+
+/(?<A>tom|bon)-\g{A}/
+    tom-tom
+ 0: tom-tom
+ 1: tom
+    bon-bon 
+ 0: bon-bon
+ 1: bon
+    
+/(^(a|b\g{-1}))/
+    bacxxx
+No match
+
+/(?|(abc)|(xyz))\1/
+    abcabc
+ 0: abcabc
+ 1: abc
+    xyzxyz 
+ 0: xyzxyz
+ 1: xyz
+    ** Failers
+No match
+    abcxyz
+No match
+    xyzabc   
+No match
+    
+/(?|(abc)|(xyz))(?1)/
+    abcabc
+ 0: abcabc
+ 1: abc
+    xyzabc 
+ 0: xyzabc
+ 1: xyz
+    ** Failers 
+No match
+    xyzxyz 
+No match
+ 
+/^X(?5)(a)(?|(b)|(q))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: c
+ 4: d
+ 5: Y
+
+/^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: <unset>
+ 4: <unset>
+ 5: c
+ 6: d
+ 7: Y
+
+/^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: <unset>
+ 4: <unset>
+ 5: c
+ 6: d
+ 7: Y
+
+/(?'abc'\w+):\k<abc>{2}/
+    a:aaxyz
+ 0: a:aa
+ 1: a
+    ab:ababxyz
+ 0: ab:abab
+ 1: ab
+    ** Failers
+No match
+    a:axyz
+No match
+    ab:abxyz
+No match
+
+/(?'abc'\w+):\g{abc}{2}/
+    a:aaxyz
+ 0: a:aa
+ 1: a
+    ab:ababxyz
+ 0: ab:abab
+ 1: ab
+    ** Failers
+No match
+    a:axyz
+No match
+    ab:abxyz
+No match
+
+/^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)/x
+    abd
+ 0: abd
+ 1: a
+    ce
+ 0: ce
+
+/^(a.)\g-1Z/
+    aXaXZ
+ 0: aXaXZ
+ 1: aX
+
+/^(a.)\g{-1}Z/
+    aXaXZ
+ 0: aXaXZ
+ 1: aX
+
+/^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) /x
+    abcd
+ 0: ab
+
+/(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?<NAME_PAT>[a-z]+)
+  (?<ADDRESS_PAT>\d+)
+  )/x
+    metcalfe 33
+ 0: metcalfe 33
+ 1: metcalfe
+ 2: 33
+
+/(?(DEFINE)(?<byte>2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))\b(?&byte)(\.(?&byte)){3}/
+    1.2.3.4
+ 0: 1.2.3.4
+ 1: <unset>
+ 2: .4
+    131.111.10.206
+ 0: 131.111.10.206
+ 1: <unset>
+ 2: .206
+    10.0.0.0
+ 0: 10.0.0.0
+ 1: <unset>
+ 2: .0
+    ** Failers
+No match
+    10.6
+No match
+    455.3.4.5
+No match
+
+/\b(?&byte)(\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))/
+    1.2.3.4
+ 0: 1.2.3.4
+ 1: .4
+    131.111.10.206
+ 0: 131.111.10.206
+ 1: .206
+    10.0.0.0
+ 0: 10.0.0.0
+ 1: .0
+    ** Failers
+No match
+    10.6
+No match
+    455.3.4.5
+No match
+
+/^(\w++|\s++)*$/
+    now is the time for all good men to come to the aid of the party
+ 0: now is the time for all good men to come to the aid of the party
+ 1: party
+    *** Failers
+No match
+    this is not a line with only words and spaces!
+No match
+
+/(\d++)(\w)/
+    12345a
+ 0: 12345a
+ 1: 12345
+ 2: a
+    *** Failers
+No match
+    12345+
+No match
+
+/a++b/
+    aaab
+ 0: aaab
+
+/(a++b)/
+    aaab
+ 0: aaab
+ 1: aaab
+
+/(a++)b/
+    aaab
+ 0: aaab
+ 1: aaa
+
+/([^()]++|\([^()]*\))+/
+    ((abc(ade)ufh()()x
+ 0: abc(ade)ufh()()x
+ 1: x
+
+/\(([^()]++|\([^()]+\))+\)/
+    (abc)
+ 0: (abc)
+ 1: abc
+    (abc(def)xyz)
+ 0: (abc(def)xyz)
+ 1: xyz
+    *** Failers
+No match
+    ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+
+/^([^()]|\((?1)*\))*$/
+    abc
+ 0: abc
+ 1: c
+    a(b)c
+ 0: a(b)c
+ 1: c
+    a(b(c))d
+ 0: a(b(c))d
+ 1: d
+    *** Failers)
+No match
+    a(b(c)d
+No match
+
+/^>abc>([^()]|\((?1)*\))*<xyz<$/
+   >abc>123<xyz<
+ 0: >abc>123<xyz<
+ 1: 3
+   >abc>1(2)3<xyz<
+ 0: >abc>1(2)3<xyz<
+ 1: 3
+   >abc>(1(2)3)<xyz<
+ 0: >abc>(1(2)3)<xyz<
+ 1: (1(2)3)
+
+/^(?:((.)(?1)\2|)|((.)(?3)\4|.))$/i
+    1221
+ 0: 1221
+ 1: 1221
+ 2: 1
+    Satanoscillatemymetallicsonatas
+ 0: Satanoscillatemymetallicsonatas
+ 1: <unset>
+ 2: <unset>
+ 3: Satanoscillatemymetallicsonatas
+ 4: S
+    AmanaplanacanalPanama
+ 0: AmanaplanacanalPanama
+ 1: <unset>
+ 2: <unset>
+ 3: AmanaplanacanalPanama
+ 4: A
+    AblewasIereIsawElba
+ 0: AblewasIereIsawElba
+ 1: <unset>
+ 2: <unset>
+ 3: AblewasIereIsawElba
+ 4: A
+    *** Failers
+No match
+    Thequickbrownfox
+No match
+
+/^(\d+|\((?1)([+*-])(?1)\)|-(?1))$/
+    12
+ 0: 12
+ 1: 12
+    (((2+2)*-3)-7)
+ 0: (((2+2)*-3)-7)
+ 1: (((2+2)*-3)-7)
+ 2: -
+    -12
+ 0: -12
+ 1: -12
+    *** Failers
+No match
+    ((2+2)*-3)-7)
+No match
+
+/^(x(y|(?1){2})z)/
+    xyz
+ 0: xyz
+ 1: xyz
+ 2: y
+    xxyzxyzz
+ 0: xxyzxyzz
+ 1: xxyzxyzz
+ 2: xyzxyz
+    *** Failers
+No match
+    xxyzz
+No match
+    xxyzxyzxyzz
+No match
+
+/((< (?: (?(R) \d++  | [^<>]*+) | (?2)) * >))/x
+    <>
+ 0: <>
+ 1: <>
+ 2: <>
+    <abcd>
+ 0: <abcd>
+ 1: <abcd>
+ 2: <abcd>
+    <abc <123> hij>
+ 0: <abc <123> hij>
+ 1: <abc <123> hij>
+ 2: <abc <123> hij>
+    <abc <def> hij>
+ 0: <def>
+ 1: <def>
+ 2: <def>
+    <abc<>def>
+ 0: <abc<>def>
+ 1: <abc<>def>
+ 2: <abc<>def>
+    <abc<>
+ 0: <>
+ 1: <>
+ 2: <>
+    *** Failers
+No match
+    <abc
+No match
+
+/^a+(*FAIL)/
+    aaaaaa
+No match
+    
+/a+b?c+(*FAIL)/
+    aaabccc
+No match
+
+/a+b?(*PRUNE)c+(*FAIL)/
+    aaabccc
+No match
+
+/a+b?(*COMMIT)c+(*FAIL)/
+    aaabccc
+No match
+    
+/a+b?(*SKIP)c+(*FAIL)/
+    aaabcccaaabccc
+No match
+
+/^(?:aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
+    aaaxxxxxx
+ 0: aaaxxxxxx
+    aaa++++++ 
+ 0: aaa
+    bbbxxxxx
+ 0: bbbxxxxx
+    bbb+++++ 
+ 0: bbb
+    cccxxxx
+ 0: cccxxxx
+    ccc++++ 
+ 0: ccc
+    dddddddd   
+ 0: ddd
+
+/^(aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
+    aaaxxxxxx
+ 0: aaaxxxxxx
+ 1: aaaxxxxxx
+    aaa++++++ 
+ 0: aaa
+ 1: aaa
+    bbbxxxxx
+ 0: bbbxxxxx
+ 1: bbbxxxxx
+    bbb+++++ 
+ 0: bbb
+ 1: bbb
+    cccxxxx
+ 0: cccxxxx
+ 1: cccxxxx
+    ccc++++ 
+ 0: ccc
+ 1: ccc
+    dddddddd   
+ 0: ddd
+ 1: ddd
+
+/a+b?(*THEN)c+(*FAIL)/
+    aaabccc
+No match
+
+/(A (A|B(*ACCEPT)|C) D)(E)/x
+    AB
+ 0: AB
+ 1: AB
+ 2: B
+    ABX
+ 0: AB
+ 1: AB
+ 2: B
+    AADE
+ 0: AADE
+ 1: AAD
+ 2: A
+ 3: E
+    ACDE
+ 0: ACDE
+ 1: ACD
+ 2: C
+ 3: E
+    ** Failers
+No match
+    AD 
+No match
+        
+/^\W*+(?:((.)\W*+(?1)\W*+\2|)|((.)\W*+(?3)\W*+\4|\W*+.\W*+))\W*+$/i
+    1221
+ 0: 1221
+ 1: 1221
+ 2: 1
+    Satan, oscillate my metallic sonatas!
+ 0: Satan, oscillate my metallic sonatas!
+ 1: <unset>
+ 2: <unset>
+ 3: Satan, oscillate my metallic sonatas
+ 4: S
+    A man, a plan, a canal: Panama!
+ 0: A man, a plan, a canal: Panama!
+ 1: <unset>
+ 2: <unset>
+ 3: A man, a plan, a canal: Panama
+ 4: A
+    Able was I ere I saw Elba.
+ 0: Able was I ere I saw Elba.
+ 1: <unset>
+ 2: <unset>
+ 3: Able was I ere I saw Elba
+ 4: A
+    *** Failers
+No match
+    The quick brown fox
+No match
+
+/^((.)(?1)\2|.)$/
+    a
+ 0: a
+ 1: a
+    aba
+ 0: aba
+ 1: aba
+ 2: a
+    aabaa  
+ 0: aabaa
+ 1: aabaa
+ 2: a
+    abcdcba 
+ 0: abcdcba
+ 1: abcdcba
+ 2: a
+    pqaabaaqp  
+ 0: pqaabaaqp
+ 1: pqaabaaqp
+ 2: p
+    ablewasiereisawelba
+ 0: ablewasiereisawelba
+ 1: ablewasiereisawelba
+ 2: a
+    rhubarb
+No match
+    the quick brown fox  
+No match
+
+/(a)(?<=b(?1))/
+    baz
+ 0: a
+ 1: a
+    ** Failers
+No match
+    caz  
+No match
+    
+/(?<=b(?1))(a)/
+    zbaaz
+ 0: a
+ 1: a
+    ** Failers
+No match
+    aaa  
+No match
+    
+/(?<X>a)(?<=b(?&X))/
+    baz
+ 0: a
+ 1: a
+
+/^(?|(abc)|(def))\1/
+    abcabc
+ 0: abcabc
+ 1: abc
+    defdef 
+ 0: defdef
+ 1: def
+    ** Failers
+No match
+    abcdef
+No match
+    defabc   
+No match
+    
+/^(?|(abc)|(def))(?1)/
+    abcabc
+ 0: abcabc
+ 1: abc
+    defabc
+ 0: defabc
+ 1: def
+    ** Failers
+No match
+    defdef
+No match
+    abcdef    
+No match
+
+/(?:a(?<quote> (?<apostrophe>')|(?<realquote>")) |b(?<quote> (?<apostrophe>')|(?<realquote>")) ) (?('quote')[a-z]+|[0-9]+)/xJ
+    a\"aaaaa
+ 0: a"aaaaa
+ 1: "
+ 2: <unset>
+ 3: "
+    b\"aaaaa 
+ 0: b"aaaaa
+ 1: <unset>
+ 2: <unset>
+ 3: <unset>
+ 4: "
+ 5: <unset>
+ 6: "
+    ** Failers 
+No match
+    b\"11111
+No match
+
+/(?:(?1)|B)(A(*F)|C)/
+    ABCD
+ 0: BC
+ 1: C
+    CCD
+ 0: CC
+ 1: C
+    ** Failers
+No match
+    CAD   
+No match
+
+/^(?:(?1)|B)(A(*F)|C)/
+    CCD
+ 0: CC
+ 1: C
+    BCD 
+ 0: BC
+ 1: C
+    ** Failers
+No match
+    ABCD
+No match
+    CAD
+No match
+    BAD    
+No match
+
+/(?:(?1)|B)(A(*ACCEPT)XX|C)D/
+    AAD
+ 0: AA
+ 1: A
+    ACD
+ 0: ACD
+ 1: C
+    BAD
+ 0: BA
+ 1: A
+    BCD
+ 0: BCD
+ 1: C
+    BAX  
+ 0: BA
+ 1: A
+    ** Failers
+No match
+    ACX
+No match
+    ABC   
+No match
+
+/(?(DEFINE)(A))B(?1)C/
+    BAC
+ 0: BAC
+
+/(?(DEFINE)((A)\2))B(?1)C/
+    BAAC
+ 0: BAAC
+
+/(?<pn> \( ( [^()]++ | (?&pn) )* \) )/x
+    (ab(cd)ef)
+ 0: (ab(cd)ef)
+ 1: (ab(cd)ef)
+ 2: ef
+
+/^(?=a(*SKIP)b|ac)/
+    ** Failers
+No match
+    ac
+No match
+    
+/^(?=a(*PRUNE)b)/
+    ab  
+ 0: 
+    ** Failers 
+No match
+    ac
+No match
+
+/^(?=a(*ACCEPT)b)/
+    ac
+ 0: 
+
+/(?>a\Kb)/
+    ab
+ 0: b
+
+/((?>a\Kb))/
+    ab
+ 0: b
+ 1: ab
+
+/(a\Kb)/
+    ab
+ 0: b
+ 1: ab
+    
+/^a\Kcz|ac/
+    ac
+ 0: ac
+    
+/(?>a\Kbz|ab)/
+    ab 
+ 0: ab
+
+/^(?&t)(?(DEFINE)(?<t>a\Kb))$/
+    ab
+ 0: b
+
+/^([^()]|\((?1)*\))*$/
+    a(b)c
+ 0: a(b)c
+ 1: c
+    a(b(c)d)e 
+ 0: a(b(c)d)e
+ 1: e
+
+/(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))/
+    0
+ 0: 0
+ 1: 0
+    00
+ 0: 00
+ 1: 00
+ 2: 0
+    0000  
+ 0: 0000
+ 1: 0000
+ 2: 0
+
+/(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))/
+    0
+ 0: 0
+ 1: 0
+ 2: 0
+    00
+ 0: 0
+ 1: 0
+ 2: 0
+    0000  
+ 0: 0
+ 1: 0
+ 2: 0
+
+/--- This one does fail, as expected, in Perl. It needs the complex item at the
+     end of the pattern. A single letter instead of (B|D) makes it not fail,
+     which I think is a Perl bug. --- /
+
+/A(*COMMIT)(B|D)/
+    ACABX
+No match
+
+/--- Check the use of names for failure ---/
+
+/^(A(*PRUNE:A)B|C(*PRUNE:B)D)/K
+    ** Failers
+No match
+    AC
+No match, mark = A
+    CB    
+No match, mark = B
+    
+/--- Force no study, otherwise mark is not seen. The studied version is in
+     test 2 because it isn't Perl-compatible. ---/
+
+/(*MARK:A)(*SKIP:B)(C|X)/KSS
+    C
+ 0: C
+ 1: C
+MK: A
+    D
+No match, mark = A
+     
+/^(A(*THEN:A)B|C(*THEN:B)D)/K
+    ** Failers
+No match
+    CB    
+No match, mark = B
+
+/^(?:A(*THEN:A)B|C(*THEN:B)D)/K
+    CB    
+No match, mark = B
+    
+/^(?>A(*THEN:A)B|C(*THEN:B)D)/K
+    CB    
+No match, mark = B
+    
+/--- This should succeed, as the skip causes bump to offset 1 (the mark). Note
+that we have to have something complicated such as (B|Z) at the end because,
+for Perl, a simple character somehow causes an unwanted optimization to mess
+with the handling of backtracking verbs. ---/
+
+/A(*MARK:A)A+(*SKIP:A)(B|Z) | AC/xK
+    AAAC
+ 0: AC
+    
+/--- Test skipping over a non-matching mark. ---/
+
+/A(*MARK:A)A+(*MARK:B)(*SKIP:A)(B|Z) | AC/xK
+    AAAC
+ 0: AC
+    
+/--- Check shorthand for MARK ---/
+
+/A(*:A)A+(*SKIP:A)(B|Z) | AC/xK
+    AAAC
+ 0: AC
+
+/--- Don't loop! Force no study, otherwise mark is not seen. ---/
+
+/(*:A)A+(*SKIP:A)(B|Z)/KSS
+    AAAC
+No match, mark = A
+
+/--- This should succeed, as a non-existent skip name disables the skip ---/ 
+
+/A(*MARK:A)A+(*SKIP:B)(B|Z) | AC/xK
+    AAAC
+ 0: AC
+
+/A(*MARK:A)A+(*SKIP:B)(B|Z) | AC(*:B)/xK
+    AAAC
+ 0: AC
+MK: B
+
+/--- COMMIT at the start of a pattern should act like an anchor. Again, 
+however, we need the complication for Perl. ---/
+
+/(*COMMIT)(A|P)(B|P)(C|P)/
+    ABCDEFG
+ 0: ABC
+ 1: A
+ 2: B
+ 3: C
+    ** Failers
+No match
+    DEFGABC  
+No match
+
+/--- COMMIT inside an atomic group can't stop backtracking over the group. ---/
+
+/(\w+)(?>b(*COMMIT))\w{2}/
+    abbb
+ 0: abbb
+ 1: a
+
+/(\w+)b(*COMMIT)\w{2}/
+    abbb
+No match
+
+/--- Check opening parens in comment when seeking forward reference. ---/ 
+
+/(?&t)(?#()(?(DEFINE)(?<t>a))/
+    bac
+ 0: a
+
+/--- COMMIT should override THEN ---/
+
+/(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?/
+  yes
+No match
+
+/(?>(*COMMIT)(yes|no)(*THEN)(*F))?/
+  yes
+No match
+
+/b?(*SKIP)c/
+    bc
+ 0: bc
+    abc
+ 0: bc
+   
+/(*SKIP)bc/
+    a
+No match
+
+/(*SKIP)b/
+    a 
+No match
+
+/(?P<abn>(?P=abn)xxx|)+/
+    xxx
+ 0: 
+ 1: 
+
+/(?i:([^b]))(?1)/
+    aa
+ 0: aa
+ 1: a
+    aA     
+ 0: aA
+ 1: a
+    ** Failers
+ 0: **
+ 1: *
+    ab
+No match
+    aB
+No match
+    Ba
+No match
+    ba
+No match
+
+/^(?&t)*+(?(DEFINE)(?<t>a))\w$/
+    aaaaaaX
+ 0: aaaaaaX
+    ** Failers 
+No match
+    aaaaaa 
+No match
+
+/^(?&t)*(?(DEFINE)(?<t>a))\w$/
+    aaaaaaX
+ 0: aaaaaaX
+    aaaaaa 
+ 0: aaaaaa
+
+/^(a)*+(\w)/
+    aaaaX
+ 0: aaaaX
+ 1: a
+ 2: X
+    YZ 
+ 0: Y
+ 1: <unset>
+ 2: Y
+    ** Failers 
+No match
+    aaaa
+No match
+
+/^(?:a)*+(\w)/
+    aaaaX
+ 0: aaaaX
+ 1: X
+    YZ 
+ 0: Y
+ 1: Y
+    ** Failers 
+No match
+    aaaa
+No match
+
+/^(a)++(\w)/
+    aaaaX
+ 0: aaaaX
+ 1: a
+ 2: X
+    ** Failers 
+No match
+    aaaa
+No match
+    YZ 
+No match
+
+/^(?:a)++(\w)/
+    aaaaX
+ 0: aaaaX
+ 1: X
+    ** Failers 
+No match
+    aaaa
+No match
+    YZ 
+No match
+
+/^(a)?+(\w)/
+    aaaaX
+ 0: aa
+ 1: a
+ 2: a
+    YZ 
+ 0: Y
+ 1: <unset>
+ 2: Y
+
+/^(?:a)?+(\w)/
+    aaaaX
+ 0: aa
+ 1: a
+    YZ 
+ 0: Y
+ 1: Y
+
+/^(a){2,}+(\w)/
+    aaaaX
+ 0: aaaaX
+ 1: a
+ 2: X
+    ** Failers
+No match
+    aaa
+No match
+    YZ 
+No match
+
+/^(?:a){2,}+(\w)/
+    aaaaX
+ 0: aaaaX
+ 1: X
+    ** Failers
+No match
+    aaa
+No match
+    YZ 
+No match
+
+/(a|)*(?1)b/
+    b
+ 0: b
+ 1: 
+    ab
+ 0: ab
+ 1: 
+    aab  
+ 0: aab
+ 1: 
+
+/(a)++(?1)b/
+    ** Failers
+No match
+    ab 
+No match
+    aab
+No match
+
+/(a)*+(?1)b/
+    ** Failers
+No match
+    ab
+No match
+    aab  
+No match
+
+/(?1)(?:(b)){0}/
+    b
+ 0: b
+
+/(foo ( \( ((?:(?> [^()]+ )|(?2))*) \) ) )/x
+    foo(bar(baz)+baz(bop))
+ 0: foo(bar(baz)+baz(bop))
+ 1: foo(bar(baz)+baz(bop))
+ 2: (bar(baz)+baz(bop))
+ 3: bar(baz)+baz(bop)
+
+/(A (A|B(*ACCEPT)|C) D)(E)/x
+    AB
+ 0: AB
+ 1: AB
+ 2: B
+
+/\A.*?(a|bc)/
+    ba
+ 0: ba
+ 1: a
+
+/\A.*?(?:a|bc)++/
+    ba
+ 0: ba
+
+/\A.*?(a|bc)++/
+    ba
+ 0: ba
+ 1: a
+
+/\A.*?(?:a|bc|d)/
+    ba
+ 0: ba
+
+/(?:(b))++/
+    beetle
+ 0: b
+ 1: b
+
+/(?(?=(a(*ACCEPT)z))a)/
+    a
+ 0: a
+ 1: a
+
+/^(a)(?1)+ab/
+    aaaab
+ 0: aaaab
+ 1: a
+    
+/^(a)(?1)++ab/
+    aaaab
+No match
+
+/^(?=a(*:M))aZ/K
+    aZbc
+ 0: aZ
+MK: M
+
+/^(?!(*:M)b)aZ/K
+    aZbc
+ 0: aZ
+
+/(?(DEFINE)(a))?b(?1)/
+    backgammon
+ 0: ba
+
+/^\N+/
+    abc\ndef
+ 0: abc
+    
+/^\N{1,}/
+    abc\ndef 
+ 0: abc
+
+/(?(R)a+|(?R)b)/
+    aaaabcde
+ 0: aaaab
+
+/(?(R)a+|((?R))b)/
+    aaaabcde
+ 0: aaaab
+ 1: aaaa
+
+/((?(R)a+|(?1)b))/
+    aaaabcde
+ 0: aaaab
+ 1: aaaab
+
+/((?(R1)a+|(?1)b))/
+    aaaabcde
+ 0: aaaab
+ 1: aaaab
+
+/a(*:any 
+name)/K
+    abc
+ 0: a
+MK: any \x0aname
+    
+/(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))/
+    a
+ 0: a
+    ba
+ 0: a
+    bba 
+ 0: a
+    
+/--- Checking revised (*THEN) handling ---/ 
+
+/--- Capture ---/
+
+/^.*? (a(*THEN)b) c/x
+    aabc
+No match
+
+/^.*? (a(*THEN)b|(*F)) c/x
+    aabc
+ 0: aabc
+ 1: ab
+
+/^.*? ( (a(*THEN)b) | (*F) ) c/x
+    aabc
+ 0: aabc
+ 1: ab
+ 2: ab
+
+/^.*? ( (a(*THEN)b) ) c/x
+    aabc
+No match
+
+/--- Non-capture ---/
+
+/^.*? (?:a(*THEN)b) c/x
+    aabc
+No match
+
+/^.*? (?:a(*THEN)b|(*F)) c/x
+    aabc
+ 0: aabc
+
+/^.*? (?: (?:a(*THEN)b) | (*F) ) c/x
+    aabc
+ 0: aabc
+
+/^.*? (?: (?:a(*THEN)b) ) c/x
+    aabc
+No match
+
+/--- Atomic ---/
+
+/^.*? (?>a(*THEN)b) c/x
+    aabc
+No match
+
+/^.*? (?>a(*THEN)b|(*F)) c/x
+    aabc
+ 0: aabc
+
+/^.*? (?> (?>a(*THEN)b) | (*F) ) c/x
+    aabc
+ 0: aabc
+
+/^.*? (?> (?>a(*THEN)b) ) c/x
+    aabc
+No match
+
+/--- Possessive capture ---/
+
+/^.*? (a(*THEN)b)++ c/x
+    aabc
+No match
+
+/^.*? (a(*THEN)b|(*F))++ c/x
+    aabc
+ 0: aabc
+ 1: ab
+
+/^.*? ( (a(*THEN)b)++ | (*F) )++ c/x
+    aabc
+ 0: aabc
+ 1: ab
+ 2: ab
+
+/^.*? ( (a(*THEN)b)++ )++ c/x
+    aabc
+No match
+
+/--- Possessive non-capture ---/
+
+/^.*? (?:a(*THEN)b)++ c/x
+    aabc
+No match
+
+/^.*? (?:a(*THEN)b|(*F))++ c/x
+    aabc
+ 0: aabc
+
+/^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c/x
+    aabc
+ 0: aabc
+
+/^.*? (?: (?:a(*THEN)b)++ )++ c/x
+    aabc
+No match
+    
+/--- Condition assertion ---/
+
+/^(?(?=a(*THEN)b)ab|ac)/
+    ac
+ 0: ac
+ 
+/--- Condition ---/
+
+/^.*?(?(?=a)a|b(*THEN)c)/
+    ba
+No match
+
+/^.*?(?:(?(?=a)a|b(*THEN)c)|d)/
+    ba
+ 0: ba
+
+/^.*?(?(?=a)a(*THEN)b|c)/
+    ac
+No match
+
+/--- Assertion ---/
+
+/^.*(?=a(*THEN)b)/ 
+    aabc
+ 0: a
+
+/------------------------------/
+
+/(?>a(*:m))/imsxSK 
+    a
+ 0: a
+MK: m
+
+/(?>(a)(*:m))/imsxSK 
+    a
+ 0: a
+ 1: a
+MK: m
+
+/(?<=a(*ACCEPT)b)c/
+    xacd
+ 0: c
+
+/(?<=(a(*ACCEPT)b))c/
+    xacd
+ 0: c
+ 1: a
+
+/(?<=(a(*COMMIT)b))c/
+    xabcd
+ 0: c
+ 1: ab
+    ** Failers 
+No match
+    xacd
+No match
+    
+/(?<!a(*FAIL)b)c/
+    xcd
+ 0: c
+    acd 
+ 0: c
+
+/(?<=a(*:N)b)c/K
+    xabcd
+ 0: c
+MK: N
+    
+/(?<=a(*PRUNE)b)c/
+    xabcd 
+ 0: c
+
+/(?<=a(*SKIP)b)c/
+    xabcd 
+ 0: c
+
+/(?<=a(*THEN)b)c/
+    xabcd 
+ 0: c
+
+/(a)(?2){2}(.)/
+    abcd
+ 0: abcd
+ 1: a
+ 2: d
+
+/(*MARK:A)(*PRUNE:B)(C|X)/KS
+    C
+ 0: C
+ 1: C
+MK: B
+    D 
+No match, mark = B
+
+/(*MARK:A)(*PRUNE:B)(C|X)/KSS
+    C
+ 0: C
+ 1: C
+MK: B
+    D 
+No match, mark = B
+
+/(*MARK:A)(*THEN:B)(C|X)/KS
+    C
+ 0: C
+ 1: C
+MK: B
+    D 
+No match, mark = B
+
+/(*MARK:A)(*THEN:B)(C|X)/KSY
+    C
+ 0: C
+ 1: C
+MK: B
+    D 
+No match, mark = B
+
+/(*MARK:A)(*THEN:B)(C|X)/KSS
+    C
+ 0: C
+ 1: C
+MK: B
+    D 
+No match, mark = B
+
+/--- This should fail, as the skip causes a bump to offset 3 (the skip) ---/
+
+/A(*MARK:A)A+(*SKIP)(B|Z) | AC/xK
+    AAAC
+No match, mark = A
+
+/--- Same --/
+
+/A(*MARK:A)A+(*MARK:B)(*SKIP:B)(B|Z) | AC/xK
+    AAAC
+No match, mark = B
+
+/A(*:A)A+(*SKIP)(B|Z) | AC/xK
+    AAAC
+No match, mark = A
+
+/--- This should fail, as a null name is the same as no name ---/
+
+/A(*MARK:A)A+(*SKIP:)(B|Z) | AC/xK
+    AAAC
+No match, mark = A
+
+/--- A check on what happens after hitting a mark and them bumping along to
+something that does not even start. Perl reports tags after the failures here, 
+though it does not when the individual letters are made into something 
+more complicated. ---/
+
+/A(*:A)B|XX(*:B)Y/K
+    AABC
+ 0: AB
+MK: A
+    XXYZ 
+ 0: XXY
+MK: B
+    ** Failers
+No match
+    XAQQ  
+No match, mark = A
+    XAQQXZZ  
+No match, mark = A
+    AXQQQ 
+No match, mark = A
+    AXXQQQ 
+No match, mark = B
+    
+/^(A(*THEN:A)B|C(*THEN:B)D)/K
+    AB
+ 0: AB
+ 1: AB
+MK: A
+    CD
+ 0: CD
+ 1: CD
+MK: B
+    ** Failers
+No match
+    AC
+No match, mark = A
+    CB    
+No match, mark = B
+    
+/^(A(*PRUNE:A)B|C(*PRUNE:B)D)/K
+    AB
+ 0: AB
+ 1: AB
+MK: A
+    CD
+ 0: CD
+ 1: CD
+MK: B
+    ** Failers
+No match
+    AC
+No match, mark = A
+    CB    
+No match, mark = B
+    
+/--- An empty name does not pass back an empty string. It is the same as if no
+name were given. ---/ 
+
+/^(A(*PRUNE:)B|C(*PRUNE:B)D)/K
+    AB
+ 0: AB
+ 1: AB
+    CD 
+ 0: CD
+ 1: CD
+MK: B
+
+/--- PRUNE goes to next bumpalong; COMMIT does not. ---/
+    
+/A(*PRUNE:A)B/K
+    ACAB
+ 0: AB
+MK: A
+
+/--- Mark names can be duplicated ---/
+
+/A(*:A)B|X(*:A)Y/K
+    AABC
+ 0: AB
+MK: A
+    XXYZ 
+ 0: XY
+MK: A
+    
+/b(*:m)f|a(*:n)w/K
+    aw 
+ 0: aw
+MK: n
+    ** Failers 
+No match, mark = n
+    abc
+No match, mark = m
+
+/b(*:m)f|aw/K
+    abaw
+ 0: aw
+    ** Failers 
+No match
+    abc
+No match, mark = m
+    abax 
+No match, mark = m
+
+/A(*MARK:A)A+(*SKIP:B)(B|Z) | AAC/xK
+    AAAC
+ 0: AAC
+
+/a(*PRUNE:X)bc|qq/KY
+    ** Failers
+No match, mark = X
+    axy
+No match, mark = X
+
+/a(*THEN:X)bc|qq/KY
+    ** Failers
+No match, mark = X
+    axy
+No match, mark = X
+
+/(?=a(*MARK:A)b)..x/K
+    abxy
+ 0: abx
+MK: A
+    ** Failers
+No match
+    abpq  
+No match
+
+/(?=a(*MARK:A)b)..(*:Y)x/K
+    abxy
+ 0: abx
+MK: Y
+    ** Failers
+No match
+    abpq  
+No match
+
+/(?=a(*PRUNE:A)b)..x/K
+    abxy
+ 0: abx
+MK: A
+    ** Failers
+No match
+    abpq  
+No match
+
+/(?=a(*PRUNE:A)b)..(*:Y)x/K
+    abxy
+ 0: abx
+MK: Y
+    ** Failers
+No match
+    abpq  
+No match
+
+/(?=a(*THEN:A)b)..x/K
+    abxy
+ 0: abx
+MK: A
+    ** Failers
+No match
+    abpq  
+No match
+
+/(?=a(*THEN:A)b)..(*:Y)x/K
+    abxy
+ 0: abx
+MK: Y
+    ** Failers
+No match
+    abpq  
+No match
+
+/(another)?(\1?)test/
+    hello world test
+ 0: test
+ 1: <unset>
+ 2: 
+
+/(another)?(\1+)test/
+    hello world test
+No match
+
+/(a(*COMMIT)b){0}a(?1)|aac/
+    aac
+ 0: aac
+
+/((?:a?)*)*c/
+  aac   
+ 0: aac
+ 1: 
+
+/((?>a?)*)*c/
+  aac   
+ 0: aac
+ 1: 
+
+/(?>.*?a)(?<=ba)/
+    aba
+ 0: ba
+
+/(?:.*?a)(?<=ba)/
+    aba
+ 0: aba
+
+/.*?a(*PRUNE)b/
+    aab
+ 0: ab
+
+/.*?a(*PRUNE)b/s
+    aab
+ 0: ab
+
+/^a(*PRUNE)b/s
+    aab
+No match
+
+/.*?a(*SKIP)b/
+    aab
+ 0: ab
+
+/(?>.*?a)b/s
+    aab
+ 0: ab
+
+/(?>.*?a)b/
+    aab
+ 0: ab
+
+/(?>^a)b/s
+    aab
+No match
+
+/(?>.*?)(?<=(abcd)|(wxyz))/
+    alphabetabcd
+ 0: 
+ 1: abcd
+    endingwxyz 
+ 0: 
+ 1: <unset>
+ 2: wxyz
+
+/(?>.*)(?<=(abcd)|(wxyz))/
+    alphabetabcd
+ 0: alphabetabcd
+ 1: abcd
+    endingwxyz 
+ 0: endingwxyz
+ 1: <unset>
+ 2: wxyz
+
+"(?>.*)foo"
+    abcdfooxyz
+No match
+    
+"(?>.*?)foo"
+    abcdfooxyz
+ 0: foo
+
+/(?:(a(*PRUNE)b)){0}(?:(?1)|ac)/
+    ac
+ 0: ac
+    
+/(?:(a(*SKIP)b)){0}(?:(?1)|ac)/
+    ac 
+ 0: ac
+
+/(?<=(*SKIP)ac)a/
+    aa
+No match
+
+/A(*MARK:A)A+(*SKIP:B)(B|Z) | AC/xK
+    AAAC
+ 0: AC
+
+/a(*SKIP:m)x|ac(*:n)(*SKIP:n)d|ac/K
+    acacd
+ 0: acd
+MK: n
+
+/A(*SKIP:m)x|A(*SKIP:n)x|AB/K
+    AB
+ 0: AB
+
+/((*SKIP:r)d){0}a(*SKIP:m)x|ac(*:n)|ac/K
+    acacd
+ 0: ac
+MK: n
+
+/-- Tests that try to figure out how Perl works. My hypothesis is that the
+    first verb that is backtracked onto is the one that acts. This seems to be
+    the case almost all the time, but there is one exception that is perhaps a 
+    bug. --/
+
+/-- This matches "aaaac"; each PRUNE advances one character until the subject
+    no longer starts with 5 'a's. --/
+
+/aaaaa(*PRUNE)b|a+c/
+    aaaaaac
+ 0: aaaac
+
+/-- Putting SKIP in front of PRUNE makes no difference, as it is never 
+backtracked onto, whether or not it has a label. --/
+
+/aaaaa(*SKIP)(*PRUNE)b|a+c/
+    aaaaaac
+ 0: aaaac
+
+/aaaaa(*SKIP:N)(*PRUNE)b|a+c/
+    aaaaaac
+ 0: aaaac
+
+/aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c/
+    aaaaaac
+ 0: aaaac
+
+/-- Putting THEN in front makes no difference. */
+    
+/aaaaa(*THEN)(*PRUNE)b|a+c/
+    aaaaaac
+ 0: aaaac
+ 
+/-- However, putting COMMIT in front of the prune changes it to "no match". I 
+    think this is inconsistent and possibly a bug. For the moment, running this
+    test is moved out of the Perl-compatible file. --/
+
+/aaaaa(*COMMIT)(*PRUNE)b|a+c/
+    
+
+/---- OK, lets play the same game again using SKIP instead of PRUNE. ----/
+
+/-- This matches "ac" because SKIP forces the next match to start on the
+    sixth "a". --/
+
+/aaaaa(*SKIP)b|a+c/
+    aaaaaac
+ 0: ac
+ 
+/-- Putting PRUNE in front makes no difference. --/
+
+/aaaaa(*PRUNE)(*SKIP)b|a+c/
+    aaaaaac
+ 0: ac
+
+/-- Putting THEN in front makes no difference. --/
+
+/aaaaa(*THEN)(*SKIP)b|a+c/
+    aaaaaac
+ 0: ac
+
+/-- In this case, neither does COMMIT. This still matches "ac". --/
+
+/aaaaa(*COMMIT)(*SKIP)b|a+c/
+    aaaaaac
+ 0: ac
+    
+/-- This gives "no match", as expected. --/
+
+/aaaaa(*COMMIT)b|a+c/
+    aaaaaac
+No match
+    
+
+/------ Tests using THEN ------/
+
+/-- This matches "aaaaaac", as expected. --/
+
+/aaaaa(*THEN)b|a+c/
+    aaaaaac
+ 0: aaaaaac
+
+/-- Putting SKIP in front makes no difference. --/
+
+/aaaaa(*SKIP)(*THEN)b|a+c/
+    aaaaaac
+ 0: aaaaaac
+    
+/-- Putting PRUNE in front makes no difference. --/
+
+/aaaaa(*PRUNE)(*THEN)b|a+c/
+    aaaaaac
+ 0: aaaaaac
+    
+/-- Putting COMMIT in front makes no difference. --/
+
+/aaaaa(*COMMIT)(*THEN)b|a+c/
+    aaaaaac
+ 0: aaaaaac
+    
+/-- End of "priority" tests --/ 
+
+/aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+/
+    aaaaaa
+ 0: a
+
+/aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+/
+    aaaaaa
+ 0: a
+
+/aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+/
+    aaaaaa
+ 0: aaaa
+
+/aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+/
+    aaaaaa
+ 0: a
+
+/a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c/
+    aaaac
+ 0: aac
+
+/a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c/
+    aaaac
+ 0: ac
+
+/aaa(*PRUNE:A)a(*SKIP:A)b|a+c/
+    aaaac
+ 0: aac
+
+/aaa(*MARK:A)a(*SKIP:A)b|a+c/
+    aaaac
+ 0: ac
+
+/a(*:m)a(*COMMIT)(*SKIP:m)b|a+c/K
+    aaaaaac
+ 0: ac
+
+/.?(a|b(*THEN)c)/
+    ba
+ 0: ba
+ 1: a
+
+/(a(*COMMIT)b)c|abd/
+    abc
+ 0: abc
+ 1: ab
+    abd
+No match
+
+/(?=a(*COMMIT)b)abc|abd/
+    abc
+ 0: abc
+    abd
+ 0: abd
+
+/(?>a(*COMMIT)b)c|abd/
+    abc
+ 0: abc
+    abd
+ 0: abd
+
+/a(?=b(*COMMIT)c)[^d]|abd/
+    abd
+No match
+    abc 
+ 0: ab
+
+/a(?=bc).|abd/
+    abd
+ 0: abd
+    abc 
+ 0: ab
+    
+/a(?>b(*COMMIT)c)d|abd/
+    abceabd 
+No match
+
+/a(?>bc)d|abd/
+    abceabd 
+ 0: abd
+
+/(?>a(*COMMIT)b)c|abd/
+    abd
+ 0: abd
+
+/(?>a(*COMMIT)c)d|abd/
+    abd
+No match
+
+/((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))/
+    ac 
+ 0: ac
+ 1: <unset>
+ 2: c
+    
+/-- These tests were formerly in test 2, but changes in PCRE and Perl have
+    made them compatible. --/
+    
+/^(a)?(?(1)a|b)+$/
+    *** Failers
+No match
+    a
+No match
+
+/(?=a\Kb)ab/
+    ab 
+ 0: b
+
+/(?!a\Kb)ac/
+    ac 
+ 0: ac
+    
+/^abc(?<=b\Kc)d/
+    abcd
+ 0: cd
+
+/^abc(?<!b\Kq)d/
+    abcd
+ 0: abcd
+
+
+/A(*PRUNE:A)A+(*SKIP:A)(B|Z) | AC/xK
+    AAAC
+No match, mark = A
+
+/^((abc|abcx)(*THEN)y|abcd)/
+    abcd
+ 0: abcd
+ 1: abcd
+    *** Failers 
+No match
+    abcxy 
+No match
+    
+/^((yes|no)(*THEN)(*F))?/
+  yes
+No match
+
+/(A (.*)   C? (*THEN)  | A D) (*FAIL)/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   C? (*THEN)  | A D) z/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   C? (*THEN)  | A D) \s* (*FAIL)/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   C? (*THEN)  | A D) \s* z/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   (?:C|) (*THEN)  | A D) (*FAIL)/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   (?:C|) (*THEN)  | A D) z/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   C{0,6} (*THEN)  | A D) (*FAIL)/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   C{0,6} (*THEN)  | A D) z/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   (CE){0,6} (*THEN)  | A D) (*FAIL)/x
+AbcdCEBefgBhiBqz
+No match
+
+/(A (.*)   (CE){0,6} (*THEN)  | A D) z/x
+AbcdCEBefgBhiBqz
+No match
+
+/(A (.*)   (CE*){0,6} (*THEN)  | A D) (*FAIL)/x
+AbcdCBefgBhiBqz
+No match
+
+/(A (.*)   (CE*){0,6} (*THEN)  | A D) z/x
+AbcdCBefgBhiBqz
+No match
+
+/(?=a(*COMMIT)b|ac)ac|ac/
+    ac
+No match
+
+/(?=a(*COMMIT)b|(ac)) ac | (a)c/x
+    ac
+No match
+
+/--------/
+
+/(?(?!b(*THEN)a)bn|bnn)/
+   bnn 
+ 0: bn
+
+/(?!b(*SKIP)a)bn|bnn/
+    bnn
+ 0: bn
+    
+/(?(?!b(*SKIP)a)bn|bnn)/
+   bnn 
+ 0: bn
+
+/(?!b(*PRUNE)a)bn|bnn/
+    bnn
+ 0: bn
+    
+/(?(?!b(*PRUNE)a)bn|bnn)/
+   bnn 
+ 0: bn
+   
+/(?!b(*COMMIT)a)bn|bnn/
+    bnn
+ 0: bn
+    
+/(?(?!b(*COMMIT)a)bn|bnn)/
+   bnn 
+ 0: bn
+
+/(?=b(*SKIP)a)bn|bnn/
+    bnn
+No match
+
+/(?=b(*THEN)a)bn|bnn/
+    bnn
+ 0: bnn
+    
+ /^(?!a(*SKIP)b)/
+     ac
+ 0: 
+
+ /^(?!a(*SKIP)b)../
+     acd
+ 0: ac
+
+/(?!a(*SKIP)b)../
+     acd
+ 0: ac
+
+/^(?(?!a(*SKIP)b))/
+     ac
+ 0: 
+
+/^(?!a(*PRUNE)b)../
+     acd
+ 0: ac
+
+/(?!a(*PRUNE)b)../
+     acd
+ 0: ac
+
+ /(?!a(*COMMIT)b)ac|cd/
+     ac
+ 0: ac
+
+/\A.*?(?:a|bc)/
+    ba
+ 0: ba
+
+/^(A(*THEN)B|C(*THEN)D)/
+    CD           
+ 0: CD
+ 1: CD
+
+/(*:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+MK: m(m
+
+/(*PRUNE:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+MK: m(m
+
+/(*SKIP:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+
+/(*THEN:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+MK: m(m
+
+/^\d*\w{4}/
+    1234
+ 0: 1234
+    123 
+No match
+
+/^[^b]*\w{4}/
+    aaaa
+ 0: aaaa
+    aaa     
+No match
+
+/^[^b]*\w{4}/i
+    aaaa
+ 0: aaaa
+    aaa     
+No match
+
+/^a*\w{4}/
+    aaaa
+ 0: aaaa
+    aaa     
+No match
+
+/^a*\w{4}/i
+    aaaa
+ 0: aaaa
+    aaa     
+No match
+
+/-- End of testinput1 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput10 b/lib/stdlib/test/re_SUITE_data/testoutput10
index dbd59241ad..c1c85f9a3b 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput10
+++ b/lib/stdlib/test/re_SUITE_data/testoutput10
@@ -1,19 +1,18 @@
 /-- These are a few representative patterns whose lengths and offsets are to be 
 shown when the link size is 2. This is just a doublecheck test to ensure the 
 sizes don't go horribly wrong when something is changed. The pattern contents 
-are all themselves checked in other tests. --/
+are all themselves checked in other tests. Unicode, including property support, 
+is required for these tests. --/
 
 /((?i)b)/BM
-Memory allocation (code space): 21
+Memory allocation (code space): 17
 ------------------------------------------------------------------
-  0  17 Bra
-  3   9 CBra 1
-  8  01 Opt
- 10  NC b
- 12   9 Ket
- 15  00 Opt
- 17  17 Ket
- 20     End
+  0  13 Bra
+  3   7 CBra 1
+  8  /i b
+ 10   7 Ket
+ 13  13 Ket
+ 16     End
 ------------------------------------------------------------------
 
 /(?s)(.*X|^B)/BM
@@ -21,7 +20,7 @@ Memory allocation (code space): 25
 ------------------------------------------------------------------
   0  21 Bra
   3   9 CBra 1
-  8     Any*
+  8     AllAny*
  10     X
  12   6 Alt
  15     ^
@@ -32,21 +31,18 @@ Memory allocation (code space): 25
 ------------------------------------------------------------------
 
 /(?s:.*X|^B)/BM
-Memory allocation (code space): 29
+Memory allocation (code space): 23
 ------------------------------------------------------------------
-  0  25 Bra
-  3   9 Bra
-  6  04 Opt
-  8     Any*
- 10     X
- 12   8 Alt
- 15  04 Opt
- 17     ^
- 18     B
- 20  17 Ket
- 23  00 Opt
- 25  25 Ket
- 28     End
+  0  19 Bra
+  3   7 Bra
+  6     AllAny*
+  8     X
+ 10   6 Alt
+ 13     ^
+ 14     B
+ 16  13 Ket
+ 19  19 Ket
+ 22     End
 ------------------------------------------------------------------
 
 /^[[:alnum:]]/BM
@@ -115,17 +111,15 @@ Memory allocation (code space): 19
 ------------------------------------------------------------------
 
 /(x)*+/BM
-Memory allocation (code space): 24
+Memory allocation (code space): 18
 ------------------------------------------------------------------
-  0  20 Bra
-  3  14 Once
-  6     Brazero
-  7   7 CBra 1
- 12     x
- 14   7 KetRmax
- 17  14 Ket
- 20  20 Ket
- 23     End
+  0  14 Bra
+  3     Braposzero
+  4   7 CBraPos 1
+  9     x
+ 11   7 KetRpos
+ 14  14 Ket
+ 17     End
 ------------------------------------------------------------------
 
 /^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/BM
@@ -172,18 +166,16 @@ Memory allocation (code space): 816
 ------------------------------------------------------------------
 
 /(a(?1)b)/BM
-Memory allocation (code space): 28
+Memory allocation (code space): 22
 ------------------------------------------------------------------
-  0  24 Bra
-  3  18 CBra 1
+  0  18 Bra
+  3  12 CBra 1
   8     a
- 10   6 Once
- 13   3 Recurse
- 16   6 Ket
- 19     b
- 21  18 Ket
- 24  24 Ket
- 27     End
+ 10   3 Recurse
+ 13     b
+ 15  12 Ket
+ 18  18 Ket
+ 21     End
 ------------------------------------------------------------------
 
 /(a(?1)+b)/BM
@@ -202,7 +194,7 @@ Memory allocation (code space): 28
 ------------------------------------------------------------------
 
 /a(?P<name1>b|c)d(?P<longername2>e)/BM
-Memory allocation (code space): 42
+Memory allocation (code space): 36
 ------------------------------------------------------------------
   0  32 Bra
   3     a
@@ -220,7 +212,7 @@ Memory allocation (code space): 42
 ------------------------------------------------------------------
 
 /(?:a(?P<c>c(?P<d>d)))(?P<a>a)/BM
-Memory allocation (code space): 54
+Memory allocation (code space): 45
 ------------------------------------------------------------------
   0  41 Bra
   3  25 Bra
@@ -240,9 +232,9 @@ Memory allocation (code space): 54
 ------------------------------------------------------------------
 
 /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
-Memory allocation (code space): 43
+Memory allocation (code space): 34
 ------------------------------------------------------------------
-  0  36 Bra
+  0  30 Bra
   3   7 CBra 1
   8     a
  10   7 Ket
@@ -251,12 +243,10 @@ Memory allocation (code space): 43
  15     Any
  16     \1
  19     bbb
- 25   6 Once
- 28   3 Recurse
- 31   6 Ket
- 34     d
- 36  36 Ket
- 39     End
+ 25   3 Recurse
+ 28     d
+ 30  30 Ket
+ 33     End
 ------------------------------------------------------------------
 
 /abc(?C255)de(?C)f/BM
@@ -327,32 +317,17 @@ Memory allocation (code space): 12
  11     End
 ------------------------------------------------------------------
 
-/\x{1000000}/8BM
-Memory allocation (code space): 13
-------------------------------------------------------------------
-  0   9 Bra
-  3     \x{1000000}
-  9   9 Ket
- 12     End
-------------------------------------------------------------------
-
-/\x{4000000}/8BM
-Memory allocation (code space): 14
+/\x{10ffff}/8BM
+Memory allocation (code space): 12
 ------------------------------------------------------------------
-  0  10 Bra
-  3     \x{4000000}
- 10  10 Ket
- 13     End
+  0   8 Bra
+  3     \x{10ffff}
+  8   8 Ket
+ 11     End
 ------------------------------------------------------------------
 
-/\x{7fffFFFF}/8BM
-Memory allocation (code space): 14
-------------------------------------------------------------------
-  0  10 Bra
-  3     \x{7fffffff}
- 10  10 Ket
- 13     End
-------------------------------------------------------------------
+/\x{110000}/8BM
+Failed: character value in \x{...} sequence is too large at offset 9
 
 /[\x{ff}]/8BM
 Memory allocation (code space): 10
@@ -364,12 +339,12 @@ Memory allocation (code space): 10
 ------------------------------------------------------------------
 
 /[\x{100}]/8BM
-Memory allocation (code space): 15
+Memory allocation (code space): 10
 ------------------------------------------------------------------
-  0  11 Bra
-  3     [\x{100}]
- 11  11 Ket
- 14     End
+  0   6 Bra
+  3     \x{100}
+  6   6 Ket
+  9     End
 ------------------------------------------------------------------
 
 /\x80/8BM
@@ -399,7 +374,7 @@ Memory allocation (code space): 18
  17     End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
+Options: utf
 First char = 'A'
 Need char = '.'
     
@@ -412,9 +387,9 @@ Memory allocation (code space): 19
  18     End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
-First char = 237
-Need char = 180
+Options: utf
+First char = \x{ed}
+Need char = \x{b4}
 
 /\x{65e5}\x{672c}\x{8a9e}/D8M
 Memory allocation (code space): 19
@@ -425,17 +400,17 @@ Memory allocation (code space): 19
  18     End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
-First char = 230
-Need char = 158
+Options: utf
+First char = \x{e6}
+Need char = \x{9e}
 
 /[\x{100}]/8BM
-Memory allocation (code space): 15
+Memory allocation (code space): 10
 ------------------------------------------------------------------
-  0  11 Bra
-  3     [\x{100}]
- 11  11 Ket
- 14     End
+  0   6 Bra
+  3     \x{100}
+  6   6 Ket
+  9     End
 ------------------------------------------------------------------
 
 /[Z\x{100}]/8BM
@@ -537,7 +512,7 @@ Memory allocation (code space): 48
 Memory allocation (code space): 25
 ------------------------------------------------------------------
   0  21 Bra
-  3  NC A\x{391}\x{10427}\x{ff3a}\x{1fb0}
+  3  /i A\x{391}\x{10427}\x{ff3a}\x{1fb0}
  21  21 Ket
  24     End
 ------------------------------------------------------------------
@@ -616,7 +591,7 @@ Memory allocation (code space): 9
 Memory allocation (code space): 9
 ------------------------------------------------------------------
   0   5 Bra
-  3     \xaa
+  3     \x{aa}
   5   5 Ket
   8     End
 ------------------------------------------------------------------
@@ -652,18 +627,87 @@ Memory allocation (code space): 9
 Memory allocation (code space): 9
 ------------------------------------------------------------------
   0   5 Bra
-  3     [^\xaa]
+  3     [^\x{aa}]
   5   5 Ket
   8     End
 ------------------------------------------------------------------
 
 /[^\xaa]/8BM
-Memory allocation (code space): 40
+Memory allocation (code space): 10
 ------------------------------------------------------------------
-  0  36 Bra
-  3     [\x00-\xa9\xab-\xff] (neg)
- 36  36 Ket
- 39     End
+  0   6 Bra
+  3     [^\x{aa}]
+  6   6 Ket
+  9     End
+------------------------------------------------------------------
+
+/[^\d]/8WB
+------------------------------------------------------------------
+  0  11 Bra
+  3     [^\p{Nd}]
+ 11  11 Ket
+ 14     End
 ------------------------------------------------------------------
 
-/ End of testinput10 /
+/[[:^alpha:][:^cntrl:]]+/8WB
+------------------------------------------------------------------
+  0  44 Bra
+  3     [ -~\x80-\xff\P{L}]+
+ 44  44 Ket
+ 47     End
+------------------------------------------------------------------
+
+/[[:^cntrl:][:^alpha:]]+/8WB
+------------------------------------------------------------------
+  0  44 Bra
+  3     [ -~\x80-\xff\P{L}]+
+ 44  44 Ket
+ 47     End
+------------------------------------------------------------------
+
+/[[:alpha:]]+/8WB
+------------------------------------------------------------------
+  0  12 Bra
+  3     [\p{L}]+
+ 12  12 Ket
+ 15     End
+------------------------------------------------------------------
+
+/[[:^alpha:]\S]+/8WB
+------------------------------------------------------------------
+  0  15 Bra
+  3     [\P{L}\P{Xsp}]+
+ 15  15 Ket
+ 18     End
+------------------------------------------------------------------
+
+/abc(d|e)(*THEN)x(123(*THEN)4|567(b|q)(*THEN)xx)/B
+------------------------------------------------------------------
+  0  73 Bra
+  3     abc
+  9   7 CBra 1
+ 14     d
+ 16   5 Alt
+ 19     e
+ 21  12 Ket
+ 24     *THEN
+ 25     x
+ 27  14 CBra 2
+ 32     123
+ 38     *THEN
+ 39     4
+ 41  29 Alt
+ 44     567
+ 50   7 CBra 3
+ 55     b
+ 57   5 Alt
+ 60     q
+ 62  12 Ket
+ 65     *THEN
+ 66     xx
+ 70  43 Ket
+ 73  73 Ket
+ 76     End
+------------------------------------------------------------------
+
+/-- End of testinput11 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput2 b/lib/stdlib/test/re_SUITE_data/testoutput2
index dba227f503..fd958c2eb7 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput2
+++ b/lib/stdlib/test/re_SUITE_data/testoutput2
@@ -1,3 +1,13 @@
+/-- This set of tests is not Perl-compatible. It checks on special features
+    of PCRE's API, error diagnostics, and the compiled code of some patterns.
+    It also checks the non-Perl syntax the PCRE supports (Python, .NET, 
+    Oniguruma). Finally, there are some tests where PCRE and Perl differ, 
+    either because PCRE can't be compatible, or there is a possible Perl 
+    bug.
+    
+    NOTE: This is a non-UTF set of tests. When UTF support is needed, use
+    test 5, and if Unicode Property Support is needed, use test 7. --/
+  
 /(a)b|/I
 Capturing subpattern count = 1
 No options
@@ -40,28 +50,24 @@ No match
 
 /a+bc/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'c'
 
 /a*bc/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = 'c'
 
 /a{3}bc/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'c'
 
 /(abc|a+z)/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 First char = 'a'
 No need char
@@ -96,6 +102,36 @@ Failed: missing terminating ] for character class at offset 5
 /(?X)[\B]/
 Failed: invalid escape sequence in character class at offset 6
 
+/(?X)[\R]/
+Failed: invalid escape sequence in character class at offset 6
+
+/(?X)[\X]/
+Failed: invalid escape sequence in character class at offset 6
+
+/[\B]/BZ
+------------------------------------------------------------------
+        Bra
+        B
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\R]/BZ
+------------------------------------------------------------------
+        Bra
+        R
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\X]/BZ
+------------------------------------------------------------------
+        Bra
+        X
+        Ket
+        End
+------------------------------------------------------------------
+
 /[z-a]/
 Failed: range out of order in character class at offset 3
 
@@ -113,14 +149,12 @@ Failed: unrecognized character after (? or (?- at offset 2
 
 /.*b/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 'b'
 
 /.*?b/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 'b'
@@ -140,6 +174,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 3
 Starting byte set: c d e 
     this sentence eventually mentions a cat
  0: cat
@@ -151,6 +186,7 @@ Capturing subpattern count = 0
 Options: caseless
 No first char
 No need char
+Subject length lower bound = 3
 Starting byte set: C D E c d e 
     this sentence eventually mentions a CAT cat
  0: CAT
@@ -162,6 +198,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b c d 
 
 /(a|[^\dZ])/IS
@@ -169,6 +206,7 @@ Capturing subpattern count = 1
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: \x00 \x01 \x02 \x03 \x04 \x05 \x06 \x07 \x08 \x09 \x0a 
   \x0b \x0c \x0d \x0e \x0f \x10 \x11 \x12 \x13 \x14 \x15 \x16 \x17 \x18 \x19 
   \x1a \x1b \x1c \x1d \x1e \x1f \x20 ! " # $ % & ' ( ) * + , - . / : ; < = > 
@@ -189,6 +227,7 @@ Capturing subpattern count = 1
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: \x09 \x0a \x0c \x0d \x20 a b 
 
 /(ab\2)/
@@ -324,7 +363,6 @@ No need char
 
 /.*((abc)$|(def))/I
 Capturing subpattern count = 3
-Partial matching not supported
 No options
 First char at start or follows newline
 No need char
@@ -338,61 +376,6 @@ No need char
  2: <unset>
  3: def
 
-/abc/IP
-    abc
- 0: abc
-    *** Failers
-No match: POSIX code 17: match failed
-
-/^abc|def/IP
-    abcdef
- 0: abc
-    abcdef\B
- 0: def
-
-/.*((abc)$|(def))/IP
-    defabc
- 0: defabc
- 1: abc
- 2: abc
-    \Zdefabc
- 0: def
- 1: def
- 3: def
-
-/the quick brown fox/IP
-    the quick brown fox
- 0: the quick brown fox
-    *** Failers
-No match: POSIX code 17: match failed
-    The Quick Brown Fox
-No match: POSIX code 17: match failed
-
-/the quick brown fox/IPi
-    the quick brown fox
- 0: the quick brown fox
-    The Quick Brown Fox
- 0: The Quick Brown Fox
-
-/abc.def/IP
-    *** Failers
-No match: POSIX code 17: match failed
-    abc\ndef
-No match: POSIX code 17: match failed
-
-/abc$/IP
-    abc
- 0: abc
-    abc\n
- 0: abc
-
-/(abc)\2/IP
-Failed: POSIX code 15: bad back reference at offset 7     
-
-/(abc\1)/IP
-    abc
-No match: POSIX code 17: match failed
-
 /)/
 Failed: unmatched parentheses at offset 0
 
@@ -401,7 +384,6 @@ Failed: missing terminating ] for character class at offset 4
 
 /[^aeiou ]{3,}/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -410,7 +392,6 @@ No need char
 
 /<.*>/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = '<'
 Need char = '>'
@@ -419,7 +400,6 @@ Need char = '>'
 
 /<.*?>/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = '<'
 Need char = '>'
@@ -428,7 +408,6 @@ Need char = '>'
 
 /<.*>/IU
 Capturing subpattern count = 0
-Partial matching not supported
 Options: ungreedy
 First char = '<'
 Need char = '>'
@@ -437,7 +416,6 @@ Need char = '>'
 
 /(?U)<.*>/I
 Capturing subpattern count = 0
-Partial matching not supported
 Options: ungreedy
 First char = '<'
 Need char = '>'
@@ -446,7 +424,6 @@ Need char = '>'
 
 /<.*?>/IU
 Capturing subpattern count = 0
-Partial matching not supported
 Options: ungreedy
 First char = '<'
 Need char = '>'
@@ -455,7 +432,6 @@ Need char = '>'
 
 /={3,}/IU
 Capturing subpattern count = 0
-Partial matching not supported
 Options: ungreedy
 First char = '='
 Need char = '='
@@ -464,7 +440,6 @@ Need char = '='
 
 /(?U)={3,}?/I
 Capturing subpattern count = 0
-Partial matching not supported
 Options: ungreedy
 First char = '='
 Need char = '='
@@ -473,6 +448,7 @@ Need char = '='
 
 /(?<!bar|cattle)foo/I
 Capturing subpattern count = 0
+Max lookbehind = 6
 No options
 First char = 'f'
 Need char = 'o'
@@ -522,7 +498,6 @@ No need char
 
 /(?s).*/I
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored dotall
 No first char
 No need char
@@ -532,6 +507,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b c d 
 
 /(?i)[abcd]/IS
@@ -539,6 +515,7 @@ Capturing subpattern count = 0
 Options: caseless
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: A B C D a b c d 
 
 /(?m)[xy]|(b|c)/IS
@@ -546,6 +523,7 @@ Capturing subpattern count = 1
 Options: multiline
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: b c x y 
 
 /(^a|^b)/Im
@@ -584,7 +562,6 @@ Failed: syntax error in subpattern name (missing terminator) at offset 7
 /((?s)blah)\s+\1/I
 Capturing subpattern count = 1
 Max back reference = 1
-Partial matching not supported
 No options
 First char = 'b'
 Need char = 'h'
@@ -592,7 +569,6 @@ Need char = 'h'
 /((?i)blah)\s+\1/I
 Capturing subpattern count = 1
 Max back reference = 1
-Partial matching not supported
 No options
 First char = 'b' (caseless)
 Need char = 'h' (caseless)
@@ -601,10 +577,8 @@ Need char = 'h' (caseless)
 ------------------------------------------------------------------
         Bra
         CBra 1
-     01 Opt
-     NC b
+     /i b
         Ket
-     00 Opt
         Ket
         End
 ------------------------------------------------------------------
@@ -612,14 +586,15 @@ Capturing subpattern count = 1
 No options
 First char = 'b' (caseless)
 No need char
-Study returned NULL
+Subject length lower bound = 1
+No set of starting bytes
 
 /(a*b|(?i:c*(?-i)d))/IS
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: C a b c d 
 
 /a$/I
@@ -656,6 +631,7 @@ No match
 
 /\Aabc/Im
 Capturing subpattern count = 0
+Max lookbehind = 1
 Options: anchored multiline
 No first char
 No need char
@@ -668,7 +644,6 @@ Need char = 'c'
 
 /^((a+)(?U)([ab]+)(?-U)([bc]+)(\w*))/I
 Capturing subpattern count = 5
-Partial matching not supported
 Options: anchored
 No first char
 No need char
@@ -682,16 +657,20 @@ No need char
 
 /(?<=foo)[ab]/IS
 Capturing subpattern count = 0
+Max lookbehind = 3
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b 
 
 /(?<!foo)(alpha|omega)/IS
 Capturing subpattern count = 1
+Max lookbehind = 3
 No options
 No first char
 Need char = 'a'
+Subject length lower bound = 5
 Starting byte set: a o 
 
 /(?!alphabet)[ab]/IS
@@ -699,10 +678,12 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b 
 
 /(?<=foo\n)^bar/Im
 Capturing subpattern count = 0
+Max lookbehind = 4
 Contains explicit CR or LF match
 Options: multiline
 No first char
@@ -720,6 +701,7 @@ No match
 
 /^(?<=foo\n)bar/Im
 Capturing subpattern count = 0
+Max lookbehind = 4
 Contains explicit CR or LF match
 Options: multiline
 First char at start or follows newline
@@ -762,6 +744,7 @@ Failed: lookbehind assertion is not fixed length at offset 13
 
 /(?<=bullock|donkey)-cart/I
 Capturing subpattern count = 0
+Max lookbehind = 7
 No options
 First char = '-'
 Need char = 't'
@@ -778,15 +761,16 @@ No match
 
 /(?<=ab(?i)x|y|z)/I
 Capturing subpattern count = 0
+Max lookbehind = 3
 No options
 No first char
 No need char
 
 /(?>.*)(?<=(abcd)|(xyz))/I
 Capturing subpattern count = 2
-Partial matching not supported
+Max lookbehind = 4
 No options
-First char at start or follows newline
+No first char
 No need char
     alphabetabcd
  0: alphabetabcd
@@ -798,6 +782,7 @@ No need char
 
 /(?<=ab(?i)x(?-i)y|(?i)z|b)ZZ/I
 Capturing subpattern count = 0
+Max lookbehind = 4
 No options
 First char = 'Z'
 Need char = 'Z'
@@ -826,6 +811,7 @@ No match
 
 /(?<!(foo)a)bar/I
 Capturing subpattern count = 1
+Max lookbehind = 4
 No options
 First char = 'b'
 Need char = 'r'
@@ -838,23 +824,7 @@ No match
     fooabar
 No match
 
-/This one is here because Perl 5.005_02 doesn't fail it/I
-Capturing subpattern count = 0
-No options
-First char = 'T'
-Need char = 't'
-
-/^(a)?(?(1)a|b)+$/I
-Capturing subpattern count = 1
-Options: anchored
-No first char
-No need char
-    *** Failers
-No match
-    a
-No match
-
-/This one is here because I think Perl 5.005_02 gets the setting of $1 wrong/I
+/This one is here because Perl behaves differently; see also the following/I
 Capturing subpattern count = 0
 No options
 First char = 'T'
@@ -866,9 +836,34 @@ Max back reference = 1
 Options: anchored
 No first char
 No need char
+    aaaa
+No match
     aaaaaa
- 0: aaaaaa
- 1: aa
+No match
+    
+/Perl does not fail these two for the final subjects. Neither did PCRE until/
+/release 8.01. The problem is in backtracking into a subpattern that contains/
+No match
+/a recursive reference to itself. PCRE has now made these into atomic patterns./
+No match
+
+/^(xa|=?\1a){2}$/
+    xa=xaa
+ 0: xa=xaa
+ 1: =xaa
+    ** Failers
+No match
+    xa=xaaa
+No match
+
+/^(xa|=?\1a)+$/
+    xa=xaa
+ 0: xa=xaa
+ 1: =xaa
+    ** Failers
+No match
+    xa=xaaa
+No match
 
 /These are syntax tests from Perl 5.005/I
 Capturing subpattern count = 0
@@ -975,9 +970,6 @@ Failed: numbers out of order in {} quantifier at offset 7
 /abc/\
 Failed: \ at end of pattern at offset 4
 
-/abc/\P
-Failed: POSIX code 9: bad escape sequence at offset 4     
-
 /abc/\i
 Failed: \ at end of pattern at offset 4
 
@@ -1003,7 +995,6 @@ copy substring 5 failed -7
 
 /(.{20})/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
@@ -1021,7 +1012,6 @@ No need char
 
 /(.{15})/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
@@ -1036,7 +1026,6 @@ No need char
 
 /(.{16})/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
@@ -1096,14 +1085,13 @@ No first char
 No need char
     abc\00def\L\C0
  0: abc\x00def
- 0C abc (7)
+ 0C abc\x00def (7)
  0L abc
 
 /word ((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
 )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+ )((?:[a-zA-Z0-9]+
 )?)?)?)?)?)?)?)?)?otherword/I
 Capturing subpattern count = 8
-Partial matching not supported
 Contains explicit CR or LF match
 No options
 First char = 'w'
@@ -1118,7 +1106,6 @@ Need char = 'd'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 'X'
@@ -1126,13 +1113,12 @@ Need char = 'X'
 /.*X/IDZs
 ------------------------------------------------------------------
         Bra
-        Any*
+        AllAny*
         X
         Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored dotall
 No first char
 Need char = 'X'
@@ -1151,7 +1137,6 @@ Need char = 'X'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 First char at start or follows newline
 No need char
@@ -1160,7 +1145,7 @@ No need char
 ------------------------------------------------------------------
         Bra
         CBra 1
-        Any*
+        AllAny*
         X
         Alt
         ^
@@ -1170,7 +1155,6 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
-Partial matching not supported
 Options: anchored dotall
 No first char
 No need char
@@ -1179,7 +1163,7 @@ No need char
 ------------------------------------------------------------------
         Bra
         CBra 1
-        Any*
+        AllAny*
         X
         Alt
         ^
@@ -1189,7 +1173,6 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
-Partial matching not supported
 Options: anchored dotall
 No first char
 No need char
@@ -1198,26 +1181,23 @@ No need char
 ------------------------------------------------------------------
         Bra
         Bra
-     04 Opt
-        Any*
+        AllAny*
         X
         Alt
-     04 Opt
         ^
         B
         Ket
-     00 Opt
         Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-No options
-First char at start or follows newline
+Options: anchored
+No first char
 No need char
 
 /\Biss\B/I+
 Capturing subpattern count = 0
+Max lookbehind = 1
 No options
 First char = 'i'
 Need char = 's'
@@ -1225,11 +1205,6 @@ Need char = 's'
  0: iss
  0+ issippi
 
-/\Biss\B/I+P
-    Mississippi
- 0: iss
- 0+ issippi
-
 /iss/IG+
 Capturing subpattern count = 0
 No options
@@ -1243,6 +1218,7 @@ Need char = 's'
 
 /\Biss\B/IG+
 Capturing subpattern count = 0
+Max lookbehind = 1
 No options
 First char = 'i'
 Need char = 's'
@@ -1252,6 +1228,7 @@ Need char = 's'
 
 /\Biss\B/Ig+
 Capturing subpattern count = 0
+Max lookbehind = 1
 No options
 First char = 'i'
 Need char = 's'
@@ -1267,6 +1244,7 @@ No match
 
 /(?<=[Ms])iss/Ig+
 Capturing subpattern count = 0
+Max lookbehind = 1
 No options
 First char = 'i'
 Need char = 's'
@@ -1278,6 +1256,7 @@ Need char = 's'
 
 /(?<=[Ms])iss/IG+
 Capturing subpattern count = 0
+Max lookbehind = 1
 No options
 First char = 'i'
 Need char = 's'
@@ -1296,7 +1275,6 @@ No need char
 
 /.*iss/Ig+
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 's'
@@ -1360,7 +1338,7 @@ Capturing subpattern count = 0
 Contains explicit CR or LF match
 Options: multiline
 First char at start or follows newline
-Need char = 10
+Need char = \x0a
     ab\nab\ncd
  0: ab\x0a
  0+ ab\x0acd
@@ -1399,42 +1377,36 @@ Need char = 'c'
 
 /a*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
 
 /a+/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 No need char
 
 /(baa|a+)/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 Need char = 'a'
 
 /a{0,3}/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
 
 /baa{3,}/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'b'
 Need char = 'a'
 
 /"([^\\"]+|\\.)*"/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 First char = '"'
 Need char = '"'
@@ -1465,6 +1437,7 @@ Need char = 'r'
 
 /...(?<=abc)/I
 Capturing subpattern count = 0
+Max lookbehind = 3
 No options
 No first char
 No need char
@@ -1489,70 +1462,60 @@ Need char = 'b'
 
 /abc*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
 
 /ab.c*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
 
 /a.c*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 No need char
 
 /.c*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
 
 /ac*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 No need char
 
 /(a.c*|b.c*)/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
 
 /a.c*|aba/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 No need char
 
 /.+a/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = 'a'
 
 /(?=abcda)a.*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'a'
 
 /(?=a)a.*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 No need char
@@ -1565,14 +1528,12 @@ No need char
 
 /a\d*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 No need char
 
 /ab\d*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
@@ -1591,7 +1552,6 @@ Need char = 'd'
 
 /ab\d+/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
@@ -1666,39 +1626,13 @@ No need char
     \Nabc
 No match
 
-/a*(b+)(z)(z)/IP
-    aaaabbbbzzzz
- 0: aaaabbbbzz
- 1: bbbb
- 2: z
- 3: z
-    aaaabbbbzzzz\O0
-    aaaabbbbzzzz\O1
- 0: aaaabbbbzz
-    aaaabbbbzzzz\O2
- 0: aaaabbbbzz
- 1: bbbb
-    aaaabbbbzzzz\O3
- 0: aaaabbbbzz
- 1: bbbb
- 2: z
-    aaaabbbbzzzz\O4
- 0: aaaabbbbzz
- 1: bbbb
- 2: z
- 3: z
-    aaaabbbbzzzz\O5
- 0: aaaabbbbzz
- 1: bbbb
- 2: z
- 3: z
-
 /^.?abcd/IS
 Capturing subpattern count = 0
 Options: anchored
 No first char
 Need char = 'd'
-Study returned NULL
+Subject length lower bound = 4
+No set of starting bytes
 
 /\(             # ( at start
   (?:           # Non-capturing bracket
@@ -1709,7 +1643,6 @@ Study returned NULL
   \)            # Closing )
   /Ix
 Capturing subpattern count = 0
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1738,7 +1671,6 @@ No match
 
 /\(  ( (?>[^()]+) | (?R) )* \) /Ixg
 Capturing subpattern count = 1
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1753,7 +1685,6 @@ Need char = ')'
 
 /\(  (?: (?>[^()]+) | (?R) ) \) /Ix
 Capturing subpattern count = 0
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1772,7 +1703,6 @@ No match
 
 /\(  (?: (?>[^()]+) | (?R) )? \) /Ix
 Capturing subpattern count = 0
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1783,7 +1713,6 @@ Need char = ')'
 
 /\(  ( (?>[^()]+) | (?R) )* \) /Ix
 Capturing subpattern count = 1
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1793,7 +1722,6 @@ Need char = ')'
 
 /\( ( ( (?>[^()]+) | (?R) )* ) \) /Ix
 Capturing subpattern count = 2
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1804,7 +1732,6 @@ Need char = ')'
 
 /\( (123)? ( ( (?>[^()]+) | (?R) )* ) \) /Ix
 Capturing subpattern count = 3
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1821,7 +1748,6 @@ Need char = ')'
 
 /\( ( (123)? ( (?>[^()]+) | (?R) )* ) \) /Ix
 Capturing subpattern count = 3
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1838,7 +1764,6 @@ Need char = ')'
 
 /\( (((((((((( ( (?>[^()]+) | (?R) )* )))))))))) \) /Ix
 Capturing subpattern count = 11
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1858,7 +1783,6 @@ Need char = ')'
 
 /\( ( ( (?>[^()<>]+) | ((?>[^()]+)) | (?R) )* ) \) /Ix
 Capturing subpattern count = 3
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1866,11 +1790,9 @@ Need char = ')'
  0: (abcd(xyz<p>qrs)123)
  1: abcd(xyz<p>qrs)123
  2: 123
- 3: <unset>
 
 /\( ( ( (?>[^()]+) | ((?R)) )* ) \) /Ix
 Capturing subpattern count = 3
-Partial matching not supported
 Options: extended
 First char = '('
 Need char = ')'
@@ -1942,6 +1864,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
   _ a b c d e f g h i j k l m n o p q r s t u v w x y z 
 
@@ -2003,6 +1926,7 @@ Contains explicit CR or LF match
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: \x09 \x0a \x0b \x0c \x0d \x20 
 
 /^[[:cntrl:]]/DZ
@@ -2249,7 +2173,6 @@ Need char = 'd'
 /(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\w+)\s+(\270)/I
 Capturing subpattern count = 271
 Max back reference = 270
-Partial matching not supported
 No options
 No first char
 No need char
@@ -2746,8 +2669,7 @@ No need char
 ------------------------------------------------------------------
         Bra
         a
-     01 Opt
-     NC b
+     /i b
         Ket
         End
 ------------------------------------------------------------------
@@ -2769,10 +2691,8 @@ No match
         Bra
         CBra 1
         a
-     01 Opt
-     NC b
+     /i b
         Ket
-     00 Opt
         Ket
         End
 ------------------------------------------------------------------
@@ -2794,7 +2714,7 @@ No match
 /   (?i)abc/IxDZ
 ------------------------------------------------------------------
         Bra
-     NC abc
+     /i abc
         Ket
         End
 ------------------------------------------------------------------
@@ -2807,7 +2727,7 @@ Need char = 'c' (caseless)
   (?i)abc/IxDZ
 ------------------------------------------------------------------
         Bra
-     NC abc
+     /i abc
         Ket
         End
 ------------------------------------------------------------------
@@ -2930,7 +2850,6 @@ Need char = 'c'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -2959,7 +2878,6 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'x'
 No need char
@@ -2975,7 +2893,6 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'x'
 No need char
@@ -2983,12 +2900,10 @@ No need char
 /(x)*+/DZ
 ------------------------------------------------------------------
         Bra
-        Once
-        Brazero
-        CBra 1
+        Braposzero
+        CBraPos 1
         x
-        KetRmax
-        Ket
+        KetRpos
         Ket
         End
 ------------------------------------------------------------------
@@ -2999,7 +2914,6 @@ No need char
 
 /^(\w++|\s++)*$/I
 Capturing subpattern count = 1
-Partial matching not supported
 Options: anchored
 No first char
 No need char
@@ -3013,7 +2927,6 @@ No match
 
 /(\d++)(\w)/I
 Capturing subpattern count = 2
-Partial matching not supported
 No options
 No first char
 No need char
@@ -3028,7 +2941,6 @@ No match
 
 /a++b/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
@@ -3037,7 +2949,6 @@ Need char = 'b'
 
 /(a++b)/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
@@ -3047,7 +2958,6 @@ Need char = 'b'
 
 /(a++)b/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
@@ -3057,7 +2967,6 @@ Need char = 'b'
 
 /([^()]++|\([^()]*\))+/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
@@ -3067,7 +2976,6 @@ No need char
 
 /\(([^()]++|\([^()]+\))+\)/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 First char = '('
 Need char = ')'
@@ -3130,7 +3038,6 @@ Failed: nothing to repeat at offset 7
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'x'
 Need char = 'b'
@@ -3147,7 +3054,6 @@ Need char = 'b'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: ungreedy
 First char = 'x'
 Need char = 'b'
@@ -3176,7 +3082,6 @@ Need char = 'b'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 5
-Partial matching not supported
 Options: anchored
 No first char
 No need char
@@ -3192,7 +3097,6 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored
 No first char
 Need char = 'b'
@@ -3210,7 +3114,6 @@ Need char = 'b'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
-Partial matching not supported
 Options: anchored
 No first char
 Need char = 'b'
@@ -3225,19 +3128,19 @@ Failed: POSIX collating elements are not supported at offset 0
 Failed: POSIX named classes are supported only within a class at offset 0
 
 /\l/I
-Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
+Failed: PCRE does not support \L, \l, \N{name}, \U, or \u at offset 1
 
 /\L/I
-Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
+Failed: PCRE does not support \L, \l, \N{name}, \U, or \u at offset 1
 
 /\N{name}/I
-Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
+Failed: PCRE does not support \L, \l, \N{name}, \U, or \u at offset 1
 
 /\u/I
-Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
+Failed: PCRE does not support \L, \l, \N{name}, \U, or \u at offset 1
 
 /\U/I
-Failed: PCRE does not support \L, \l, \N, \U, or \u at offset 1
+Failed: PCRE does not support \L, \l, \N{name}, \U, or \u at offset 1
 
 /[/I
 Failed: missing terminating ] for character class at offset 1
@@ -3286,7 +3189,6 @@ No need char
 
 /< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/Ix
 Capturing subpattern count = 0
-Partial matching not supported
 Options: extended
 First char = '<'
 Need char = '>'
@@ -3316,6 +3218,7 @@ No match
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
+Max lookbehind = 1
 No options
 First char = '8'
 Need char = 'X'
@@ -3329,6 +3232,7 @@ Need char = 'X'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
+Max lookbehind = 1
 No options
 First char = '$'
 Need char = 'X'
@@ -3336,14 +3240,12 @@ Need char = 'X'
 /(.*)\d+\1/I
 Capturing subpattern count = 1
 Max back reference = 1
-Partial matching not supported
 No options
 No first char
 No need char
 
 /(.*)\d+/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 First char at start or follows newline
 No need char
@@ -3351,14 +3253,12 @@ No need char
 /(.*)\d+\1/Is
 Capturing subpattern count = 1
 Max back reference = 1
-Partial matching not supported
 Options: dotall
 No first char
 No need char
 
 /(.*)\d+/Is
 Capturing subpattern count = 1
-Partial matching not supported
 Options: anchored dotall
 No first char
 No need char
@@ -3366,7 +3266,6 @@ No need char
 /(.*(xyz))\d+\2/I
 Capturing subpattern count = 2
 Max back reference = 2
-Partial matching not supported
 No options
 First char at start or follows newline
 Need char = 'z'
@@ -3374,7 +3273,6 @@ Need char = 'z'
 /((.*))\d+\1/I
 Capturing subpattern count = 2
 Max back reference = 1
-Partial matching not supported
 No options
 No first char
 No need char
@@ -3391,7 +3289,6 @@ Need char = 'b'
 
 /(?=a).*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 First char = 'a'
 No need char
@@ -3497,6 +3394,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b 
 
 /[^a]/I
@@ -3516,6 +3414,7 @@ Capturing subpattern count = 0
 No options
 No first char
 Need char = '6'
+Subject length lower bound = 4
 Starting byte set: 0 1 2 3 4 5 6 7 8 9 
 
 /a^b/I
@@ -3549,6 +3448,7 @@ Capturing subpattern count = 0
 Options: caseless
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: A B a b 
 
 /[ab](?i)cd/IS
@@ -3556,6 +3456,7 @@ Capturing subpattern count = 0
 No options
 No first char
 Need char = 'd' (caseless)
+Subject length lower bound = 3
 Starting byte set: a b 
 
 /abc(?C)def/I
@@ -3591,7 +3492,27 @@ Need char = 'f'
   1    ^    ^     f
  0: abcdef
 
-/(?C1)\dabc(?C2)def/I
+/(?C1)\dabc(?C2)def/IS
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'f'
+Subject length lower bound = 7
+Starting byte set: 0 1 2 3 4 5 6 7 8 9 
+    1234abcdef
+--->1234abcdef
+  1 ^              \d
+  1  ^             \d
+  1   ^            \d
+  1    ^           \d
+  2    ^   ^       d
+ 0: 4abcdef
+    *** Failers
+No match
+    abcdef
+No match
+
+/(?C1)\dabc(?C2)def/ISS
 Capturing subpattern count = 0
 No options
 No first char
@@ -3713,7 +3634,6 @@ No need char
 
 /(\d{3}(?C))*/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
@@ -3828,6 +3748,7 @@ Callout 2: last capture = -1
 
 /(?<=(abc)(?C))xyz/I
 Capturing subpattern count = 1
+Max lookbehind = 3
 No options
 First char = 'x'
 Need char = 'z'
@@ -3842,7 +3763,6 @@ Callout 0: last capture = 1
 
 /a(b+)(c*)(?C1)/I
 Capturing subpattern count = 2
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
@@ -3868,7 +3788,6 @@ No match
 
 /a(b+?)(c*?)(?C1)/I
 Capturing subpattern count = 2
-Partial matching not supported
 No options
 First char = 'a'
 Need char = 'b'
@@ -3909,6 +3828,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b 
 
 /(?R)/I
@@ -3997,9 +3917,7 @@ Need char = '<'
         Bra
         CBra 1
         a
-        Once
         Recurse
-        Ket
         b
         Ket
         Ket
@@ -4028,43 +3946,8 @@ No options
 First char = 'a'
 Need char = 'b'
 
-/^\W*(?:((.)\W*(?1)\W*\2|)|((.)\W*(?3)\W*\4|\W*.\W*))\W*$/Ii
-Capturing subpattern count = 4
-Max back reference = 4
-Partial matching not supported
-Options: anchored caseless
-No first char
-No need char
-    1221
- 0: 1221
- 1: 1221
- 2: 1
-    Satan, oscillate my metallic sonatas!
- 0: Satan, oscillate my metallic sonatas!
- 1: <unset>
- 2: <unset>
- 3: Satan, oscillate my metallic sonatas
- 4: S
-    A man, a plan, a canal: Panama!
- 0: A man, a plan, a canal: Panama!
- 1: <unset>
- 2: <unset>
- 3: A man, a plan, a canal: Panama
- 4: A
-    Able was I ere I saw Elba.
- 0: Able was I ere I saw Elba.
- 1: <unset>
- 2: <unset>
- 3: Able was I ere I saw Elba
- 4: A
-    *** Failers
-No match
-    The quick brown fox
-No match
-
 /^(\d+|\((?1)([+*-])(?1)\)|-(?1))$/I
 Capturing subpattern count = 2
-Partial matching not supported
 Options: anchored
 No first char
 No need char
@@ -4105,7 +3988,6 @@ No match
 
 /((< (?: (?(R) \d++  | [^<>]*+) | (?2)) * >))/Ix
 Capturing subpattern count = 2
-Partial matching not supported
 Options: extended
 First char = '<'
 Need char = '>'
@@ -4256,9 +4138,7 @@ Need char = 'a'
         Any
         \1
         bbb
-        Once
         Recurse
-        Ket
         d
         Ket
         End
@@ -4279,7 +4159,6 @@ Named capturing subpatterns:
   one     1
   three   3
   two     2
-Partial matching not supported
 Options: anchored caseless
 No first char
 No need char
@@ -4325,7 +4204,6 @@ No need char
 
 /(.*)a/Is
 Capturing subpattern count = 1
-Partial matching not supported
 Options: anchored dotall
 No first char
 Need char = 'a'
@@ -4333,7 +4211,6 @@ Need char = 'a'
 /(.*)a\1/Is
 Capturing subpattern count = 1
 Max back reference = 1
-Partial matching not supported
 Options: dotall
 No first char
 Need char = 'a'
@@ -4341,14 +4218,12 @@ Need char = 'a'
 /(.*)a(b)\2/Is
 Capturing subpattern count = 2
 Max back reference = 2
-Partial matching not supported
 Options: anchored dotall
 No first char
 Need char = 'b'
 
 /((.*)a|(.*)b)z/Is
 Capturing subpattern count = 3
-Partial matching not supported
 Options: anchored dotall
 No first char
 Need char = 'z'
@@ -4356,7 +4231,6 @@ Need char = 'z'
 /((.*)a|(.*)b)z\1/Is
 Capturing subpattern count = 3
 Max back reference = 1
-Partial matching not supported
 Options: dotall
 No first char
 Need char = 'z'
@@ -4364,7 +4238,6 @@ Need char = 'z'
 /((.*)a|(.*)b)z\2/Is
 Capturing subpattern count = 3
 Max back reference = 2
-Partial matching not supported
 Options: dotall
 No first char
 Need char = 'z'
@@ -4372,7 +4245,6 @@ Need char = 'z'
 /((.*)a|(.*)b)z\3/Is
 Capturing subpattern count = 3
 Max back reference = 3
-Partial matching not supported
 Options: dotall
 No first char
 Need char = 'z'
@@ -4380,14 +4252,12 @@ Need char = 'z'
 /((.*)a|^(.*)b)z\3/Is
 Capturing subpattern count = 3
 Max back reference = 3
-Partial matching not supported
 Options: anchored dotall
 No first char
 Need char = 'z'
 
 /(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a/Is
 Capturing subpattern count = 31
-Partial matching not supported
 Options: anchored dotall
 No first char
 No need char
@@ -4395,7 +4265,6 @@ No need char
 /(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\31/Is
 Capturing subpattern count = 31
 Max back reference = 31
-Partial matching not supported
 Options: dotall
 No first char
 No need char
@@ -4403,7 +4272,6 @@ No need char
 /(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)|(.*)a\32/Is
 Capturing subpattern count = 32
 Max back reference = 32
-Partial matching not supported
 Options: dotall
 No first char
 No need char
@@ -4470,7 +4338,6 @@ Need char = 'c'
 
 /(a+)*zz/I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 Need char = 'z'
@@ -4481,7 +4348,7 @@ Minimum match() recursion limit = 6
  1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   aaaaaaaaaaaaaz\M
 Minimum match() limit = 32768
-Minimum match() recursion limit = 42
+Minimum match() recursion limit = 29
 No match
 
 /(aaa(?C1)bbb|ab)/I
@@ -4607,7 +4474,6 @@ Failed: two named subpatterns have the same name at offset 30
 Capturing subpattern count = 3
 Named capturing subpatterns:
   elem   2
-Partial matching not supported
 No options
 First char = '['
 Need char = ']'
@@ -4625,7 +4491,6 @@ No match
 Capturing subpattern count = 3
 Named capturing subpatterns:
   elem   2
-Partial matching not supported
 No options
 First char = '['
 Need char = ']'
@@ -4645,9 +4510,7 @@ Need char = ']'
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -4667,9 +4530,7 @@ No need char
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         KetRmax
@@ -4690,9 +4551,7 @@ No need char
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -4701,9 +4560,7 @@ No need char
         a
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -4732,7 +4589,6 @@ No need char
 
 /((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/Ii
 Capturing subpattern count = 3
-Partial matching not supported
 Options: caseless
 No first char
 Need char = 'g' (caseless)
@@ -4742,11 +4598,11 @@ Need char = 'g' (caseless)
 
 /((w\/|-|with)*(free|immediate)*.*?shipping\s*[!.-]*)/IiS
 Capturing subpattern count = 3
-Partial matching not supported
 Options: caseless
 No first char
 Need char = 'g' (caseless)
-Study returned NULL
+Subject length lower bound = 8
+No set of starting bytes
      Baby Bjorn Active Carrier - With free SHIPPING!!
  0: Baby Bjorn Active Carrier - With free SHIPPING!!
  1: Baby Bjorn Active Carrier - With free SHIPPING!!
@@ -4761,11 +4617,11 @@ Study returned NULL
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = 'b'
-Study returned NULL
+Subject length lower bound = 1
+No set of starting bytes
 
 /(a|b)*.?c/ISDZ
 ------------------------------------------------------------------
@@ -4785,7 +4641,8 @@ Capturing subpattern count = 1
 No options
 No first char
 Need char = 'c'
-Study returned NULL
+Subject length lower bound = 1
+No set of starting bytes
 
 /abc(?C255)de(?C)f/DZ
 ------------------------------------------------------------------
@@ -4842,7 +4699,51 @@ Need char = 'e'
  +4 ^   ^      e
 No match
 
-/a*b/ICDZ
+/a*b/ICDZS
+------------------------------------------------------------------
+        Bra
+        Callout 255 0 2
+        a*+
+        Callout 255 2 1
+        b
+        Callout 255 3 0
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options:
+No first char
+Need char = 'b'
+Subject length lower bound = 1
+Starting byte set: a b 
+  ab
+--->ab
+ +0 ^      a*
+ +2 ^^     b
+ +3 ^ ^    
+ 0: ab
+  aaaab
+--->aaaab
+ +0 ^         a*
+ +2 ^   ^     b
+ +3 ^    ^    
+ 0: aaaab
+  aaaacb
+--->aaaacb
+ +0 ^          a*
+ +2 ^   ^      b
+ +0  ^         a*
+ +2  ^  ^      b
+ +0   ^        a*
+ +2   ^ ^      b
+ +0    ^       a*
+ +2    ^^      b
+ +0      ^     a*
+ +2      ^     b
+ +3      ^^    
+ 0: b
+
+/a*b/ICDZSS
 ------------------------------------------------------------------
         Bra
         Callout 255 0 2
@@ -4854,7 +4755,6 @@ No match
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options:
 No first char
 Need char = 'b'
@@ -4899,7 +4799,6 @@ Need char = 'b'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options:
 First char = 'a'
 Need char = 'b'
@@ -4927,7 +4826,83 @@ Need char = 'b'
  +2    ^^      b
 No match
 
-/(abc|def)x/ICDZ
+/(abc|def)x/ICDZS
+------------------------------------------------------------------
+        Bra
+        Callout 255 0 9
+        CBra 1
+        Callout 255 1 1
+        a
+        Callout 255 2 1
+        b
+        Callout 255 3 1
+        c
+        Callout 255 4 0
+        Alt
+        Callout 255 5 1
+        d
+        Callout 255 6 1
+        e
+        Callout 255 7 1
+        f
+        Callout 255 8 0
+        Ket
+        Callout 255 9 1
+        x
+        Callout 255 10 0
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 1
+Options:
+No first char
+Need char = 'x'
+Subject length lower bound = 4
+Starting byte set: a d 
+  abcx
+--->abcx
+ +0 ^        (abc|def)
+ +1 ^        a
+ +2 ^^       b
+ +3 ^ ^      c
+ +4 ^  ^     |
+ +9 ^  ^     x
++10 ^   ^    
+ 0: abcx
+ 1: abc
+  defx
+--->defx
+ +0 ^        (abc|def)
+ +1 ^        a
+ +5 ^        d
+ +6 ^^       e
+ +7 ^ ^      f
+ +8 ^  ^     )
+ +9 ^  ^     x
++10 ^   ^    
+ 0: defx
+ 1: def
+  ** Failers 
+No match
+  abcdefzx
+--->abcdefzx
+ +0 ^            (abc|def)
+ +1 ^            a
+ +2 ^^           b
+ +3 ^ ^          c
+ +4 ^  ^         |
+ +9 ^  ^         x
+ +5 ^            d
+ +0    ^         (abc|def)
+ +1    ^         a
+ +5    ^         d
+ +6    ^^        e
+ +7    ^ ^       f
+ +8    ^  ^      )
+ +9    ^  ^      x
+No match
+
+/(abc|def)x/ICDZSS
 ------------------------------------------------------------------
         Bra
         Callout 255 0 9
@@ -4981,6 +4956,8 @@ Need char = 'x'
 +10 ^   ^    
  0: defx
  1: def
+  ** Failers 
+No match
   abcdefzx
 --->abcdefzx
  +0 ^            (abc|def)
@@ -5081,7 +5058,58 @@ No need char
  0: abcdcdcd
  1: cd
 
-/([ab]{,4}c|xy)/ICDZ
+/([ab]{,4}c|xy)/ICDZS
+------------------------------------------------------------------
+        Bra
+        Callout 255 0 14
+        CBra 1
+        Callout 255 1 4
+        [ab]
+        Callout 255 5 1
+        {
+        Callout 255 6 1
+        ,
+        Callout 255 7 1
+        4
+        Callout 255 8 1
+        }
+        Callout 255 9 1
+        c
+        Callout 255 10 0
+        Alt
+        Callout 255 11 1
+        x
+        Callout 255 12 1
+        y
+        Callout 255 13 0
+        Ket
+        Callout 255 14 0
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 1
+Options:
+No first char
+No need char
+Subject length lower bound = 2
+Starting byte set: a b x 
+    Note: that { does NOT introduce a quantifier
+--->Note: that { does NOT introduce a quantifier
+ +0         ^                                        ([ab]{,4}c|xy)
+ +1         ^                                        [ab]
+ +5         ^^                                       {
++11         ^                                        x
+ +0                                 ^                ([ab]{,4}c|xy)
+ +1                                 ^                [ab]
+ +5                                 ^^               {
++11                                 ^                x
+ +0                                     ^            ([ab]{,4}c|xy)
+ +1                                     ^            [ab]
+ +5                                     ^^           {
++11                                     ^            x
+No match
+
+/([ab]{,4}c|xy)/ICDZSS
 ------------------------------------------------------------------
         Bra
         Callout 255 0 14
@@ -5337,7 +5365,6 @@ No match
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
-Partial matching not supported
 Options:
 No first char
 Need char = '3'
@@ -5369,7 +5396,7 @@ Need char = '3'
 
 /\b.*/I
 Capturing subpattern count = 0
-Partial matching not supported
+Max lookbehind = 1
 No options
 No first char
 No need char
@@ -5378,7 +5405,7 @@ No need char
 
 /\b.*/Is
 Capturing subpattern count = 0
-Partial matching not supported
+Max lookbehind = 1
 Options: dotall
 No first char
 No need char
@@ -5387,7 +5414,6 @@ No need char
 
 /(?!.bcd).*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -5400,15 +5426,15 @@ No options
 First char = 'a'
 Need char = 'e'
     ab\P
-Partial match
+Partial match: ab
     abc\P
-Partial match
+Partial match: abc
     abcd\P
-Partial match
+Partial match: abcd
     abcde\P
  0: abcde
     the quick brown abc\P
-Partial match
+Partial match: abc
     ** Failers\P
 No match
     the quick brown abxyz fox\P
@@ -5433,23 +5459,23 @@ Need char = '/'
  1: 02
  2: 05
     1\P
-Partial match
+Partial match: 1
     1/2\P
-Partial match
+Partial match: 1/2
     1/2/0\P
-Partial match
+Partial match: 1/2/0
     1/2/04\P
  0: 1/2/04
  1: 1
  2: 2
     0\P
-Partial match
+Partial match: 0
     02/\P
-Partial match
+Partial match: 02/
     02/0\P
-Partial match
+Partial match: 02/0
     02/1\P
-Partial match
+Partial match: 02/1
     ** Failers\P
 No match
     \P
@@ -5471,28 +5497,24 @@ No match
 
 /0{0,2}ABC/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = 'C'
 
 /\d{3,}ABC/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = 'C'
 
 /\d*ABC/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = 'C'
 
 /[abc]+DE/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = 'E'
@@ -5505,13 +5527,13 @@ Need char = '3'
     123\P
  0: 123
     a\P
-Partial match
+Partial match: a
     b\P
-Partial match
+Partial match: b
     c\P
-Partial match
+Partial match: c
     c12\P
-Partial match
+Partial match: c12
     c123\P
  0: c123
 
@@ -5521,17 +5543,17 @@ Options: anchored
 No first char
 Need char = 'X'
     1\P
-Partial match
+Partial match: 1
     123\P
-Partial match
+Partial match: 123
     123X
  0: 123X
     1234\P
-Partial match
+Partial match: 1234
     1234X
  0: 1234X
     12345\P
-Partial match
+Partial match: 12345
     12345X
  0: 12345X
     *** Failers
@@ -5541,14 +5563,33 @@ No match
     123456\P
 No match
 
-/abc/I>testsavedregex
+/abc/IS>testsavedregex
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'c'
-Compiled regex written to testsavedregex
+Subject length lower bound = 3
+No set of starting bytes
+Compiled pattern written to testsavedregex
+Study data written to testsavedregex
 <testsavedregex
-Compiled regex loaded from testsavedregex
+Compiled pattern loaded from testsavedregex
+Study data loaded from testsavedregex
+    abc
+ 0: abc
+    ** Failers
+No match
+    bca
+No match
+
+/abc/ISS>testsavedregex
+Capturing subpattern count = 0
+No options
+First char = 'a'
+Need char = 'c'
+Compiled pattern written to testsavedregex
+<testsavedregex
+Compiled pattern loaded from testsavedregex
 No study data
     abc
  0: abc
@@ -5557,14 +5598,33 @@ No match
     bca
 No match
 
-/abc/IF>testsavedregex
+/abc/IFS>testsavedregex
+Capturing subpattern count = 0
+No options
+First char = 'a'
+Need char = 'c'
+Subject length lower bound = 3
+No set of starting bytes
+Compiled pattern written to testsavedregex
+Study data written to testsavedregex
+<testsavedregex
+Compiled pattern (byte-inverted) loaded from testsavedregex
+Study data loaded from testsavedregex
+    abc
+ 0: abc
+    ** Failers
+No match
+    bca
+No match
+
+/abc/IFSS>testsavedregex
 Capturing subpattern count = 0
 No options
 First char = 'a'
 Need char = 'c'
-Compiled regex written to testsavedregex
+Compiled pattern written to testsavedregex
 <testsavedregex
-Compiled regex (byte-inverted) loaded from testsavedregex
+Compiled pattern (byte-inverted) loaded from testsavedregex
 No study data
     abc
  0: abc
@@ -5578,11 +5638,12 @@ Capturing subpattern count = 1
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b 
-Compiled regex written to testsavedregex
+Compiled pattern written to testsavedregex
 Study data written to testsavedregex
 <testsavedregex
-Compiled regex loaded from testsavedregex
+Compiled pattern loaded from testsavedregex
 Study data loaded from testsavedregex
     abc
  0: a
@@ -5593,16 +5654,35 @@ Study data loaded from testsavedregex
     def
 No match
 
+/(a|b)/ISS>testsavedregex
+Capturing subpattern count = 1
+No options
+No first char
+No need char
+Compiled pattern written to testsavedregex
+<testsavedregex
+Compiled pattern loaded from testsavedregex
+No study data
+    abc
+ 0: a
+ 1: a
+    ** Failers
+ 0: a
+ 1: a
+    def
+No match
+
 /(a|b)/ISF>testsavedregex
 Capturing subpattern count = 1
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b 
-Compiled regex written to testsavedregex
+Compiled pattern written to testsavedregex
 Study data written to testsavedregex
 <testsavedregex
-Compiled regex (byte-inverted) loaded from testsavedregex
+Compiled pattern (byte-inverted) loaded from testsavedregex
 Study data loaded from testsavedregex
     abc
  0: a
@@ -5613,14 +5693,31 @@ Study data loaded from testsavedregex
     def
 No match
 
+/(a|b)/ISSF>testsavedregex
+Capturing subpattern count = 1
+No options
+No first char
+No need char
+Compiled pattern written to testsavedregex
+<testsavedregex
+Compiled pattern (byte-inverted) loaded from testsavedregex
+No study data
+    abc
+ 0: a
+ 1: a
+    ** Failers
+ 0: a
+ 1: a
+    def
+No match
+
 ~<(\w+)/?>(.)*</(\1)>~smgI
 Capturing subpattern count = 3
 Max back reference = 1
-Partial matching not supported
 Options: multiline dotall
 First char = '<'
 Need char = '>'
-    <!DOCTYPE seite SYSTEM "http://www.lco.lineas.de/xmlCms.dtd">\n<seite>\n<dokumenteninformation>\n<seitentitel>Partner der LCO</seitentitel>\n<sprache>de</sprache>\n<seitenbeschreibung>Partner der LINEAS Consulting\nGmbH</seitenbeschreibung>\n<schluesselworte>LINEAS Consulting GmbH Hamburg\nPartnerfirmen</schluesselworte>\n<revisit>30 days</revisit>\n<robots>index,follow</robots>\n<menueinformation>\n<aktiv>ja</aktiv>\n<menueposition>3</menueposition>\n<menuetext>Partner</menuetext>\n</menueinformation>\n<lastedited>\n<autor>LCO</autor>\n<firma>LINEAS Consulting</firma>\n<datum>15.10.2003</datum>\n</lastedited>\n</dokumenteninformation>\n<inhalt>\n\n<absatzueberschrift>Die Partnerfirmen der LINEAS Consulting\nGmbH</absatzueberschrift>\n\n<absatz><link ziel="http://www.ca.com/" zielfenster="_blank">\n<bild name="logo_ca.gif" rahmen="no"/></link> <link\nziel="http://www.ey.com/" zielfenster="_blank"><bild\nname="logo_euy.gif" rahmen="no"/></link>\n</absatz>\n\n<absatz><link ziel="http://www.cisco.de/" zielfenster="_blank">\n<bild name="logo_cisco.gif" rahmen="ja"/></link></absatz>\n\n<absatz><link ziel="http://www.atelion.de/"\nzielfenster="_blank"><bild\nname="logo_atelion.gif" rahmen="no"/></link>\n</absatz>\n\n<absatz><link ziel="http://www.line-information.de/"\nzielfenster="_blank">\n<bild name="logo_line_information.gif" rahmen="no"/></link>\n</absatz>\n\n<absatz><bild name="logo_aw.gif" rahmen="no"/></absatz>\n\n<absatz><link ziel="http://www.incognis.de/"\nzielfenster="_blank"><bild\nname="logo_incognis.gif" rahmen="no"/></link></absatz>\n\n<absatz><link ziel="http://www.addcraft.com/"\nzielfenster="_blank"><bild\nname="logo_addcraft.gif" rahmen="no"/></link></absatz>\n\n<absatz><link ziel="http://www.comendo.com/"\nzielfenster="_blank"><bild\nname="logo_comendo.gif" rahmen="no"/></link></absatz>\n\n</inhalt>\n</seite>
+    \J1024<!DOCTYPE seite SYSTEM "http://www.lco.lineas.de/xmlCms.dtd">\n<seite>\n<dokumenteninformation>\n<seitentitel>Partner der LCO</seitentitel>\n<sprache>de</sprache>\n<seitenbeschreibung>Partner der LINEAS Consulting\nGmbH</seitenbeschreibung>\n<schluesselworte>LINEAS Consulting GmbH Hamburg\nPartnerfirmen</schluesselworte>\n<revisit>30 days</revisit>\n<robots>index,follow</robots>\n<menueinformation>\n<aktiv>ja</aktiv>\n<menueposition>3</menueposition>\n<menuetext>Partner</menuetext>\n</menueinformation>\n<lastedited>\n<autor>LCO</autor>\n<firma>LINEAS Consulting</firma>\n<datum>15.10.2003</datum>\n</lastedited>\n</dokumenteninformation>\n<inhalt>\n\n<absatzueberschrift>Die Partnerfirmen der LINEAS Consulting\nGmbH</absatzueberschrift>\n\n<absatz><link ziel="http://www.ca.com/" zielfenster="_blank">\n<bild name="logo_ca.gif" rahmen="no"/></link> <link\nziel="http://www.ey.com/" zielfenster="_blank"><bild\nname="logo_euy.gif" rahmen="no"/></link>\n</absatz>\n\n<absatz><link ziel="http://www.cisco.de/" zielfenster="_blank">\n<bild name="logo_cisco.gif" rahmen="ja"/></link></absatz>\n\n<absatz><link ziel="http://www.atelion.de/"\nzielfenster="_blank"><bild\nname="logo_atelion.gif" rahmen="no"/></link>\n</absatz>\n\n<absatz><link ziel="http://www.line-information.de/"\nzielfenster="_blank">\n<bild name="logo_line_information.gif" rahmen="no"/></link>\n</absatz>\n\n<absatz><bild name="logo_aw.gif" rahmen="no"/></absatz>\n\n<absatz><link ziel="http://www.incognis.de/"\nzielfenster="_blank"><bild\nname="logo_incognis.gif" rahmen="no"/></link></absatz>\n\n<absatz><link ziel="http://www.addcraft.com/"\nzielfenster="_blank"><bild\nname="logo_addcraft.gif" rahmen="no"/></link></absatz>\n\n<absatz><link ziel="http://www.comendo.com/"\nzielfenster="_blank"><bild\nname="logo_comendo.gif" rahmen="no"/></link></absatz>\n\n</inhalt>\n</seite>
  0: <seite>\x0a<dokumenteninformation>\x0a<seitentitel>Partner der LCO</seitentitel>\x0a<sprache>de</sprache>\x0a<seitenbeschreibung>Partner der LINEAS Consulting\x0aGmbH</seitenbeschreibung>\x0a<schluesselworte>LINEAS Consulting GmbH Hamburg\x0aPartnerfirmen</schluesselworte>\x0a<revisit>30 days</revisit>\x0a<robots>index,follow</robots>\x0a<menueinformation>\x0a<aktiv>ja</aktiv>\x0a<menueposition>3</menueposition>\x0a<menuetext>Partner</menuetext>\x0a</menueinformation>\x0a<lastedited>\x0a<autor>LCO</autor>\x0a<firma>LINEAS Consulting</firma>\x0a<datum>15.10.2003</datum>\x0a</lastedited>\x0a</dokumenteninformation>\x0a<inhalt>\x0a\x0a<absatzueberschrift>Die Partnerfirmen der LINEAS Consulting\x0aGmbH</absatzueberschrift>\x0a\x0a<absatz><link ziel="http://www.ca.com/" zielfenster="_blank">\x0a<bild name="logo_ca.gif" rahmen="no"/></link> <link\x0aziel="http://www.ey.com/" zielfenster="_blank"><bild\x0aname="logo_euy.gif" rahmen="no"/></link>\x0a</absatz>\x0a\x0a<absatz><link ziel="http://www.cisco.de/" zielfenster="_blank">\x0a<bild name="logo_cisco.gif" rahmen="ja"/></link></absatz>\x0a\x0a<absatz><link ziel="http://www.atelion.de/"\x0azielfenster="_blank"><bild\x0aname="logo_atelion.gif" rahmen="no"/></link>\x0a</absatz>\x0a\x0a<absatz><link ziel="http://www.line-information.de/"\x0azielfenster="_blank">\x0a<bild name="logo_line_information.gif" rahmen="no"/></link>\x0a</absatz>\x0a\x0a<absatz><bild name="logo_aw.gif" rahmen="no"/></absatz>\x0a\x0a<absatz><link ziel="http://www.incognis.de/"\x0azielfenster="_blank"><bild\x0aname="logo_incognis.gif" rahmen="no"/></link></absatz>\x0a\x0a<absatz><link ziel="http://www.addcraft.com/"\x0azielfenster="_blank"><bild\x0aname="logo_addcraft.gif" rahmen="no"/></link></absatz>\x0a\x0a<absatz><link ziel="http://www.comendo.com/"\x0azielfenster="_blank"><bild\x0aname="logo_comendo.gif" rahmen="no"/></link></absatz>\x0a\x0a</inhalt>\x0a</seite>
  1: seite
  2: \x0a
@@ -5669,24 +5766,6 @@ No match
     line one\nthis is a line\nbreak in the second line
 No match
 
-/ab.cd/IP
-    ab-cd
- 0: ab-cd
-    ab=cd
- 0: ab=cd
-    ** Failers
-No match: POSIX code 17: match failed
-    ab\ncd
-No match: POSIX code 17: match failed
-
-/ab.cd/IPs
-    ab-cd
- 0: ab-cd
-    ab=cd
- 0: ab=cd
-    ab\ncd
- 0: ab\x0acd
-
 /(?i)(?-i)AbCd/I
 Capturing subpattern count = 0
 No options
@@ -5923,7 +6002,6 @@ Matched, but too many substrings
 
 /[^()]*(?:\((?R)\)[^()]*)*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -5936,7 +6014,6 @@ No need char
 
 /[^()]*(?:\((?>(?R))\)[^()]*)*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -5947,7 +6024,6 @@ No need char
 
 /[^()]*(?:\((?R)\))*[^()]*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -5958,7 +6034,6 @@ No need char
 
 /(?:\((?R)\))*[^()]*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -5971,7 +6046,6 @@ No need char
 
 /(?:\((?R)\))|[^()]*/I
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 No need char
@@ -5984,21 +6058,10 @@ No need char
     ((this))
  0: ((this))
 
-/a(b)c/IPN
-    abc
-Matched with REG_NOSUB
-
-/a(?P<name>b)c/IPN
-    abc
-Matched with REG_NOSUB
-
-/\x{100}/I
-Failed: character value in \x{...} sequence is too large at offset 6
-
 /\x{0000ff}/I
 Capturing subpattern count = 0
 No options
-First char = 255
+First char = \xff
 No need char
 
 /^((?P<A>a1)|(?P<A>a2)b)/I
@@ -6108,7 +6171,7 @@ no parentheses with name "Z"
  0: a1
  1: a1
  2: a1
-copy substring Z failed -7
+get substring Z failed -7
   G a1 (2) A
 
 /^(?P<A>a)(?P<A>b)/IJ
@@ -6140,7 +6203,7 @@ No need char
   G a (1) A
     cd\GA
  0: cd
-copy substring A failed -7
+get substring A failed -7
 
 /^(?P<A>a)(?P<A>b)|cd(?P<A>ef)(?P<A>gh)/IJ
 Capturing subpattern count = 4
@@ -6308,15 +6371,12 @@ No need char
  9: 
 10: Y
 
-/\777/I
-Failed: octal value is greater than \377 (not in UTF-8 mode) at offset 3
-
 /\s*,\s*/IS
 Capturing subpattern count = 0
-Partial matching not supported
 No options
 No first char
 Need char = ','
+Subject length lower bound = 1
 Starting byte set: \x09 \x0a \x0c \x0d \x20 , 
     \x0b,\x0b
  0: ,
@@ -6443,7 +6503,6 @@ Unknown newline type at: <bad>
 
 /.*/I<lf>
 Capturing subpattern count = 0
-Partial matching not supported
 Options:
 Forced newline sequence: LF
 First char at start or follows newline
@@ -6469,7 +6528,6 @@ No need char
 
 /\w+(.)(.)?def/Is
 Capturing subpattern count = 2
-Partial matching not supported
 Options: dotall
 No first char
 Need char = 'f'
@@ -6486,7 +6544,6 @@ Need char = 'f'
 
 +((?:\s|//.*\\n|/[*](?:\\n|.)*?[*]/)*)+I
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
@@ -6621,10 +6678,10 @@ No need char
 
 /(a*b|(?i:c*(?-i)d))/IS
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: C a b c d 
 
 /()[ab]xyz/IS
@@ -6632,6 +6689,7 @@ Capturing subpattern count = 1
 No options
 No first char
 Need char = 'z'
+Subject length lower bound = 4
 Starting byte set: a b 
 
 /(|)[ab]xyz/IS
@@ -6639,6 +6697,7 @@ Capturing subpattern count = 1
 No options
 No first char
 Need char = 'z'
+Subject length lower bound = 4
 Starting byte set: a b 
 
 /(|c)[ab]xyz/IS
@@ -6646,6 +6705,7 @@ Capturing subpattern count = 1
 No options
 No first char
 Need char = 'z'
+Subject length lower bound = 4
 Starting byte set: a b c 
 
 /(|c?)[ab]xyz/IS
@@ -6653,6 +6713,7 @@ Capturing subpattern count = 1
 No options
 No first char
 Need char = 'z'
+Subject length lower bound = 4
 Starting byte set: a b c 
 
 /(d?|c?)[ab]xyz/IS
@@ -6660,6 +6721,7 @@ Capturing subpattern count = 1
 No options
 No first char
 Need char = 'z'
+Subject length lower bound = 4
 Starting byte set: a b c d 
 
 /(d?|c)[ab]xyz/IS
@@ -6667,6 +6729,7 @@ Capturing subpattern count = 1
 No options
 No first char
 Need char = 'z'
+Subject length lower bound = 4
 Starting byte set: a b c d 
 
 /^a*b\d/DZ
@@ -6680,7 +6743,6 @@ Starting byte set: a b c d
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored
 No first char
 Need char = 'b'
@@ -6696,7 +6758,6 @@ Need char = 'b'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored
 No first char
 Need char = 'b'
@@ -6712,7 +6773,6 @@ Need char = 'b'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored
 No first char
 Need char = 'b'
@@ -6728,7 +6788,6 @@ Need char = 'b'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored
 No first char
 Need char = 'A'
@@ -6743,14 +6802,13 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        a*
-     NC A
+     /i a*
+     /i A
         \d
         Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
 Options: anchored caseless
 No first char
 Need char = 'A' (caseless)
@@ -6761,34 +6819,34 @@ Need char = 'A' (caseless)
 
 /(a*|b*)[cd]/IS
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b c d 
 
 /(a+|b*)[cd]/IS
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b c d 
 
 /(a*|b+)[cd]/IS
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: a b c d 
 
 /(a+|b+)[cd]/IS
 Capturing subpattern count = 1
-Partial matching not supported
 No options
 No first char
 No need char
+Subject length lower bound = 2
 Starting byte set: a b 
 
 /((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((
@@ -7373,8 +7431,8 @@ Matched, but too many substrings
 /[^a]+a/BZi
 ------------------------------------------------------------------
         Bra
-        [^A]++
-     NC a
+     /i [^a]++
+     /i a
         Ket
         End
 ------------------------------------------------------------------
@@ -7382,8 +7440,8 @@ Matched, but too many substrings
 /[^a]+A/BZi
 ------------------------------------------------------------------
         Bra
-        [^A]++
-     NC A
+     /i [^a]++
+     /i A
         Ket
         End
 ------------------------------------------------------------------
@@ -7578,9 +7636,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         [()]
         CBra 1
         Ket
@@ -7594,7 +7650,7 @@ No match
         ^
         CBra 1
         Cond
-      2 Cond ref
+      2 Cond nref
         y
         Ket
         [()]
@@ -7614,9 +7670,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         ()
         CBra 1
         Ket
@@ -7628,9 +7682,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         [(\]a]
         CBra 1
         Ket
@@ -7643,9 +7695,7 @@ No match
 ------------------------------------------------------------------
         Bra
         ^
-        Once
         Recurse
-        Ket
         CBra 1
         Ket
         Ket
@@ -7660,7 +7710,6 @@ Named capturing subpatterns:
   one     1
   three   3
   two     2
-Partial matching not supported
 Options: anchored caseless
 No first char
 No need char
@@ -7694,7 +7743,6 @@ No match
 /(?=(\w+))\1:/I
 Capturing subpattern count = 1
 Max back reference = 1
-Partial matching not supported
 No options
 No first char
 Need char = ':'
@@ -7707,7 +7755,6 @@ Capturing subpattern count = 1
 Max back reference = 1
 Named capturing subpatterns:
   abc   1
-Partial matching not supported
 No options
 No first char
 Need char = ':'
@@ -7715,20 +7762,6 @@ Need char = ':'
  0: abcd:
  1: abcd
 
-/(?'abc'\w+):\k<abc>{2}/
-    a:aaxyz
- 0: a:aa
- 1: a
-    ab:ababxyz
- 0: ab:abab
- 1: ab
-    ** Failers
-No match
-    a:axyz
-No match
-    ab:abxyz
-No match
-
 /(?'abc'a|b)(?<abc>d|e)\k<abc>{2}/J
     adaa
  0: adaa
@@ -7755,13 +7788,6 @@ No match
     bddd
 No match
 
-/^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)/x
-    abd
- 0: abd
- 1: a
-    ce
- 0: ce
-
 /(?(<bc))/
 Failed: malformed number or name after (?( at offset 6
 
@@ -7792,24 +7818,6 @@ Failed: reference to non-existent subpattern at offset 29
  1: abcabc1Xabc2XabcX
  2: abcabc1Xabc2XabcX
 
-/^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) /x
-    abcd
- 0: ab
- 1: <unset>
- 2: <unset>
-
-/(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
-  (?(DEFINE)
-  (?<NAME_PAT>[a-z]+)
-  (?<ADDRESS_PAT>\d+)
-  )/x
-    metcalfe 33
- 0: metcalfe 33
- 1: metcalfe
- 2: 33
- 3: <unset>
- 4: <unset>
-
 /^(?(DEFINE) abc | xyz ) /x
 Failed: DEFINE group contains more than one branch at offset 22
 
@@ -7819,9 +7827,6 @@ Options: extended
 First char = 'x'
 Need char = 'z'
 
-/(?(DEFINE) abc){3} xyz/x
-Failed: repeating a DEFINE group is not allowed at offset 17
-
 /(a|)*\d/
   \O0aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 No match
@@ -7851,7 +7856,7 @@ No match
 No match
 
 /^abc./mgx<any>
-    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 \x{2028}abc8 \x{2029}abc9 JUNK
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 JUNK
  0: abc1
  0: abc2
  0: abc3
@@ -7861,7 +7866,7 @@ No match
  0: abc7
 
 /abc.$/mgx<any>
-    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc7\x{2028} abc8\x{2029} abc9
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc7 abc9
  0: abc1
  0: abc2
  0: abc3
@@ -7987,46 +7992,6 @@ Need char = 'P'
  0: PXP
  1: P
 
-/(?(DEFINE)(?<byte>2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))\b(?&byte)(\.(?&byte)){3}/
-    1.2.3.4
- 0: 1.2.3.4
- 1: <unset>
- 2: .4
-    131.111.10.206
- 0: 131.111.10.206
- 1: <unset>
- 2: .206
-    10.0.0.0
- 0: 10.0.0.0
- 1: <unset>
- 2: .0
-    ** Failers
-No match
-    10.6
-No match
-    455.3.4.5
-No match
-
-/\b(?&byte)(\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\d|25[0-5]|1\d\d|[1-9]?\d))/
-    1.2.3.4
- 0: 1.2.3.4
- 1: .4
- 2: <unset>
-    131.111.10.206
- 0: 131.111.10.206
- 1: .206
- 2: <unset>
-    10.0.0.0
- 0: 10.0.0.0
- 1: .0
- 2: <unset>
-    ** Failers
-No match
-    10.6
-No match
-    455.3.4.5
-No match
-
 /(?:a(?&abc)b)*(?<abc>x)/
     123axbaxbaxbx456
  0: axbaxbaxbx
@@ -8064,23 +8029,17 @@ No match
    DEFabcABCXYZ
 No match
 
-/^(a(b))\1\g1\g{1}\g-1\g{-1}\g{-02}Z/
-    ababababbbabZXXXX
- 0: ababababbbabZ
- 1: ab
- 2: b
-
 /^(a)\g-2/
 Failed: reference to non-existent subpattern at offset 7
 
 /^(a)\g/
-Failed: \g is not followed by a braced name or an optionally braced non-zero number at offset 5
+Failed: a numbered reference must not be zero at offset 5
 
 /^(a)\g{0}/
-Failed: \g is not followed by a braced name or an optionally braced non-zero number at offset 7
+Failed: a numbered reference must not be zero at offset 8
 
 /^(a)\g{3/
-Failed: \g is not followed by a braced name or an optionally braced non-zero number at offset 8
+Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 8
 
 /^(a)\g{4a}/
 Failed: reference to non-existent subpattern at offset 9
@@ -8163,7 +8122,7 @@ No match
  0+ 
 
 /abc.$/mgx<anycrlf>
-    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc7\x{2028} abc8\x{2029} abc9
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc9
  0: abc1
  0: abc4
  0: abc5
@@ -8185,10 +8144,8 @@ No match
         Alt
         c
         Ket
-        Once
         Recurse
         Ket
-        Ket
         End
 ------------------------------------------------------------------
     abc
@@ -8199,9 +8156,7 @@ No match
 ------------------------------------------------------------------
         Bra
         xy
-        Once
         Recurse
-        Ket
         CBra 1
         abc
         Ket
@@ -8217,13 +8172,13 @@ No match
 No match
     
 /x(?-0)y/
-Failed: (?+ or (?- or (?(+ or (?(- must be followed by a non-zero number at offset 5
+Failed: a numbered reference must not be zero at offset 5
 
 /x(?-1)y/
 Failed: reference to non-existent subpattern at offset 5
 
 /x(?+0)y/ 
-Failed: (?+ or (?- or (?(+ or (?(- must be followed by a non-zero number at offset 5
+Failed: a numbered reference must not be zero at offset 5
 
 /x(?+1)y/
 Failed: reference to non-existent subpattern at offset 5
@@ -8325,26 +8280,6 @@ Failed: reference to non-existent subpattern at offset 7
  0: Y!
  1: !
 
-/(foo)\Kbar/
-    foobar
- 0: bar
- 1: foo
-   
-/(foo)(\Kbar|baz)/
-    foobar
- 0: bar
- 1: foo
- 2: bar
-    foobaz 
- 0: foobaz
- 1: foo
- 2: baz
-
-/(foo\Kbar)baz/
-    foobarbaz
- 0: barbaz
- 1: foobar
-
 /(?<A>tom|bon)-\k{A}/
     tom-tom
  0: tom-tom
@@ -8357,14 +8292,6 @@ No match
     tom-bon  
 No match
 
-/(?<A>tom|bon)-\g{A}/
-    tom-tom
- 0: tom-tom
- 1: tom
-    bon-bon 
- 0: bon-bon
- 1: bon
-    
 /\g{A/ 
 Failed: syntax error in subpattern name (missing terminator) at offset 4
 
@@ -8459,142 +8386,6 @@ Failed: syntax error in subpattern name (missing terminator) at offset 4
  3: <unset>
  4: x
 
-/(?|(abc)|(xyz))\1/
-    abcabc
- 0: abcabc
- 1: abc
-    xyzxyz 
- 0: xyzxyz
- 1: xyz
-    ** Failers
-No match
-    abcxyz
-No match
-    xyzabc   
-No match
-    
-/(?|(abc)|(xyz))(?1)/
-    abcabc
- 0: abcabc
- 1: abc
-    xyzabc 
- 0: xyzabc
- 1: xyz
-    ** Failers 
-No match
-    xyzxyz 
-No match
- 
-/\H\h\V\v/
-    X X\x0a
- 0: X X\x0a
-    X\x09X\x0b
- 0: X\x09X\x0b
-    ** Failers
-No match
-    \xa0 X\x0a   
-No match
-    
-/\H*\h+\V?\v{3,4}/ 
-    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
- 0: \x09 \xa0X\x0a\x0b\x0c\x0d
-    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
- 0: \x09 \xa0\x0a\x0b\x0c\x0d
-    \x09\x20\xa0\x0a\x0b\x0c
- 0: \x09 \xa0\x0a\x0b\x0c
-    ** Failers 
-No match
-    \x09\x20\xa0\x0a\x0b
-No match
-     
-/\H{3,4}/
-    XY  ABCDE
- 0: ABCD
-    XY  PQR ST 
- 0: PQR
-    
-/.\h{3,4}./
-    XY  AB    PQRS
- 0: B    P
-
-/\h*X\h?\H+Y\H?Z/
-    >XNNNYZ
- 0: XNNNYZ
-    >  X NYQZ
- 0:   X NYQZ
-    ** Failers
-No match
-    >XYZ   
-No match
-    >  X NY Z
-No match
-
-/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
-    >XY\x0aZ\x0aA\x0bNN\x0c
- 0: XY\x0aZ\x0aA\x0bNN\x0c
-    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
- 0: \x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
-
-/[\h]/BZ
-------------------------------------------------------------------
-        Bra
-        [\x09 \xa0]
-        Ket
-        End
-------------------------------------------------------------------
-    >\x09<
- 0: \x09
-
-/[\h]+/BZ
-------------------------------------------------------------------
-        Bra
-        [\x09 \xa0]+
-        Ket
-        End
-------------------------------------------------------------------
-    >\x09\x20\xa0<
- 0: \x09 \xa0
-
-/[\v]/BZ
-------------------------------------------------------------------
-        Bra
-        [\x0a-\x0d\x85]
-        Ket
-        End
-------------------------------------------------------------------
-
-/[\H]/BZ
-------------------------------------------------------------------
-        Bra
-        [\x00-\x08\x0a-\x1f!-\x9f\xa1-\xff]
-        Ket
-        End
-------------------------------------------------------------------
-
-/[^\h]/BZ
-------------------------------------------------------------------
-        Bra
-        [\x00-\x08\x0a-\x1f!-\x9f\xa1-\xff] (neg)
-        Ket
-        End
-------------------------------------------------------------------
-
-/[\V]/BZ
-------------------------------------------------------------------
-        Bra
-        [\x00-\x09\x0e-\x84\x86-\xff]
-        Ket
-        End
-------------------------------------------------------------------
-
-/[\x0a\V]/BZ
-------------------------------------------------------------------
-        Bra
-        [\x00-\x0a\x0e-\x84\x86-\xff]
-        Ket
-        End
-------------------------------------------------------------------
-
 /\H++X/BZ
 ------------------------------------------------------------------
         Bra
@@ -8786,7 +8577,7 @@ No match
 ------------------------------------------------------------------
 
 /\( (?: [^()]* | (?R) )* \)/x
-(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(00)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)
+\J1024(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(00)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)
  0: (0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(0(00)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)0)
 
 /[\E]AAA/
@@ -8831,87 +8622,6 @@ Failed: missing terminating ] for character class at offset 10
         End
 ------------------------------------------------------------------
 
-/^a+(*FAIL)/
-    aaaaaa
-No match
-    
-/a+b?c+(*FAIL)/
-    aaabccc
-No match
-
-/a+b?(*PRUNE)c+(*FAIL)/
-    aaabccc
-No match
-
-/a+b?(*COMMIT)c+(*FAIL)/
-    aaabccc
-No match
-    
-/a+b?(*SKIP)c+(*FAIL)/
-    aaabcccaaabccc
-No match
-
-/^(?:aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
-    aaaxxxxxx
- 0: aaaxxxxxx
-    aaa++++++ 
- 0: aaa
-    bbbxxxxx
- 0: bbbxxxxx
-    bbb+++++ 
- 0: bbb
-    cccxxxx
- 0: cccxxxx
-    ccc++++ 
- 0: ccc
-    dddddddd   
- 0: ddd
-
-/^(aaa(*THEN)\w{6}|bbb(*THEN)\w{5}|ccc(*THEN)\w{4}|\w{3})/
-    aaaxxxxxx
- 0: aaaxxxxxx
- 1: aaaxxxxxx
-    aaa++++++ 
- 0: aaa
- 1: aaa
-    bbbxxxxx
- 0: bbbxxxxx
- 1: bbbxxxxx
-    bbb+++++ 
- 0: bbb
- 1: bbb
-    cccxxxx
- 0: cccxxxx
- 1: cccxxxx
-    ccc++++ 
- 0: ccc
- 1: ccc
-    dddddddd   
- 0: ddd
- 1: ddd
-
-/a+b?(*THEN)c+(*FAIL)/
-    aaabccc
-No match
-
-/(A (A|B(*ACCEPT)|C) D)(E)/x
-    ABX
- 0: AB
-    AADE
- 0: AADE
- 1: AAD
- 2: A
- 3: E
-    ACDE
- 0: ACDE
- 1: ACD
- 2: C
- 3: E
-    ** Failers
-No match
-    AD 
-No match
-        
 /^a+(*FAIL)/C
     aaaaaa
 --->aaaaaa
@@ -9040,11 +8750,8 @@ No match
 +13   ^  ^      (*FAIL)
 No match
     
-/a(*PRUNE:XXX)b/
-Failed: (*VERB) with an argument is not supported at offset 8
-
 /a(*MARK)b/ 
-Failed: (*VERB) not recognized at offset 7
+Failed: (*MARK) must have an argument at offset 7
 
 /(?i:A{1,}\6666666666)/
 Failed: number is too big at offset 19
@@ -9052,8 +8759,13 @@ Failed: number is too big at offset 19
 /\g6666666666/
 Failed: number is too big at offset 11
 
-/[\g6666666666]/
-Failed: number is too big at offset 12
+/[\g6666666666]/BZ
+------------------------------------------------------------------
+        Bra
+        [6g]
+        Ket
+        End
+------------------------------------------------------------------
 
 /(?1)\c[/
 Failed: reference to non-existent subpattern at offset 3
@@ -9076,7 +8788,7 @@ No match
  1: \x0a
 
 /a(*CR)b/
-Failed: (*VERB) not recognized at offset 5
+Failed: (*VERB) not recognized or malformed at offset 5
 
 /(*CR)a.b/
     a\nb
@@ -9133,6 +8845,27 @@ No match
 No match
     a\x85b 
 No match
+    
+/(*ANY).*/g
+    abc\r\ndef
+ 0: abc
+ 0: 
+ 0: def
+ 0: 
+
+/(*ANYCRLF).*/g
+    abc\r\ndef
+ 0: abc
+ 0: 
+ 0: def
+ 0: 
+
+/(*CRLF).*/g
+    abc\r\ndef
+ 0: abc
+ 0: 
+ 0: def
+ 0: 
 
 /a\Rb/I<bsr_anycrlf>
 Capturing subpattern count = 0
@@ -9216,7 +8949,6 @@ No match
     
 /a\R{2,4}b/I<bsr_anycrlf>
 Capturing subpattern count = 0
-Partial matching not supported
 Options: bsr_anycrlf
 First char = 'a'
 Need char = 'b'
@@ -9235,7 +8967,6 @@ No match
 
 /a\R{2,4}b/I<bsr_unicode>
 Capturing subpattern count = 0
-Partial matching not supported
 Options: bsr_unicode
 First char = 'a'
 Need char = 'b'
@@ -9340,6 +9071,12 @@ Failed: subpattern name expected at offset 3
 /\k{}/
 Failed: subpattern name expected at offset 3
 
+/\k/
+Failed: \k is not followed by a braced, angle-bracketed, or quoted name at offset 2
+
+/\kabc/
+Failed: \k is not followed by a braced, angle-bracketed, or quoted name at offset 5
+
 /(?P=)/
 Failed: subpattern name expected at offset 4
 
@@ -9385,4 +9122,3547 @@ Failed: unknown POSIX class name at offset 6
 /[[:a\dz:]]/
 Failed: unknown POSIX class name at offset 3
 
-/ End of testinput2 /
+/(^(a|b\g<-1'c))/
+Failed: \g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number at offset 15
+
+/^(?+1)(?<a>x|y){0}z/
+    xzxx
+ 0: xz
+    yzyy 
+ 0: yz
+    ** Failers
+No match
+    xxz  
+No match
+
+/(\3)(\1)(a)/
+    cat
+No match
+
+/(\3)(\1)(a)/<JS>
+    cat
+ 0: a
+ 1: 
+ 2: 
+ 3: a
+    
+/TA]/
+    The ACTA] comes 
+ 0: TA]
+
+/TA]/<JS>
+Failed: ] is an invalid data character in JavaScript compatibility mode at offset 2
+
+/(?2)[]a()b](abc)/
+Failed: reference to non-existent subpattern at offset 3
+
+/(?2)[^]a()b](abc)/
+Failed: reference to non-existent subpattern at offset 3
+
+/(?1)[]a()b](abc)/
+    abcbabc
+ 0: abcbabc
+ 1: abc
+    ** Failers 
+No match
+    abcXabc
+No match
+
+/(?1)[^]a()b](abc)/
+    abcXabc
+ 0: abcXabc
+ 1: abc
+    ** Failers 
+No match
+    abcbabc
+No match
+
+/(?2)[]a()b](abc)(xyz)/
+    xyzbabcxyz
+ 0: xyzbabcxyz
+ 1: abc
+ 2: xyz
+
+/(?&N)[]a(?<N>)](?<M>abc)/
+Failed: reference to non-existent subpattern at offset 4
+
+/(?&N)[]a(?<N>)](abc)/
+Failed: reference to non-existent subpattern at offset 4
+
+/a[]b/
+Failed: missing terminating ] for character class at offset 4
+
+/a[^]b/
+Failed: missing terminating ] for character class at offset 5
+
+/a[]b/<JS>
+    ** Failers
+No match
+    ab
+No match
+
+/a[]+b/<JS>
+    ** Failers
+No match
+    ab 
+No match
+
+/a[]*+b/<JS>
+    ** Failers
+No match
+    ab 
+No match
+
+/a[^]b/<JS>
+    aXb
+ 0: aXb
+    a\nb 
+ 0: a\x0ab
+    ** Failers
+No match
+    ab  
+No match
+    
+/a[^]+b/<JS> 
+    aXb
+ 0: aXb
+    a\nX\nXb 
+ 0: a\x0aX\x0aXb
+    ** Failers
+No match
+    ab  
+No match
+
+/a(?!)+b/
+Failed: nothing to repeat at offset 5
+
+/a(*FAIL)+b/
+Failed: nothing to repeat at offset 8
+
+/(abc|pqr|123){0}[xyz]/SI
+Capturing subpattern count = 1
+No options
+No first char
+No need char
+Subject length lower bound = 1
+Starting byte set: x y z 
+
+/(?(?=.*b)b|^)/CI
+Capturing subpattern count = 0
+Options:
+No first char
+No need char
+   adc
+--->adc
+ +0 ^       (?(?=.*b)b|^)
+ +2 ^       (?=.*b)
+ +5 ^       .*
+ +7 ^  ^    b
+ +7 ^ ^     b
+ +7 ^^      b
+ +7 ^       b
++11 ^       ^
++12 ^       )
++13 ^       
+ 0: 
+   abc 
+--->abc
+ +0 ^       (?(?=.*b)b|^)
+ +2 ^       (?=.*b)
+ +5 ^       .*
+ +7 ^  ^    b
+ +7 ^ ^     b
+ +7 ^^      b
+ +8 ^ ^     )
+ +9 ^       b
+ +0  ^      (?(?=.*b)b|^)
+ +2  ^      (?=.*b)
+ +5  ^      .*
+ +7  ^ ^    b
+ +7  ^^     b
+ +7  ^      b
+ +8  ^^     )
+ +9  ^      b
++10  ^^     |
++13  ^^     
+ 0: b
+   
+/(?(?=b).*b|^d)/I
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+
+/(?(?=.*b).*b|^d)/I
+Capturing subpattern count = 0
+No options
+First char at start or follows newline
+No need char
+
+/xyz/C
+  xyz 
+--->xyz
+ +0 ^       x
+ +1 ^^      y
+ +2 ^ ^     z
+ +3 ^  ^    
+ 0: xyz
+  abcxyz 
+--->abcxyz
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  abcxyz\Y
+--->abcxyz
+ +0 ^          x
+ +0  ^         x
+ +0   ^        x
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  ** Failers 
+No match
+  abc
+No match
+  abc\Y
+--->abc
+ +0 ^       x
+ +0  ^      x
+ +0   ^     x
+ +0    ^    x
+No match
+  abcxypqr  
+No match
+  abcxypqr\Y  
+--->abcxypqr
+ +0 ^            x
+ +0  ^           x
+ +0   ^          x
+ +0    ^         x
+ +1    ^^        y
+ +2    ^ ^       z
+ +0     ^        x
+ +0      ^       x
+ +0       ^      x
+ +0        ^     x
+ +0         ^    x
+No match
+  
+/(*NO_START_OPT)xyz/C
+  abcxyz 
+--->abcxyz
++15 ^          x
++15  ^         x
++15   ^        x
++15    ^       x
++16    ^^      y
++17    ^ ^     z
++18    ^  ^    
+ 0: xyz
+
+/xyz/CY
+  abcxyz 
+--->abcxyz
+ +0 ^          x
+ +0  ^         x
+ +0   ^        x
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+
+/^"((?(?=[a])[^"])|b)*"$/C
+    "ab"
+--->"ab"
+ +0 ^        ^
+ +1 ^        "
+ +2 ^^       ((?(?=[a])[^"])|b)*
+ +3 ^^       (?(?=[a])[^"])
+ +5 ^^       (?=[a])
+ +8 ^^       [a]
++11 ^ ^      )
++12 ^^       [^"]
++16 ^ ^      )
++17 ^ ^      |
+ +3 ^ ^      (?(?=[a])[^"])
+ +5 ^ ^      (?=[a])
+ +8 ^ ^      [a]
++17 ^ ^      |
++21 ^ ^      "
++18 ^ ^      b
++19 ^  ^     )
+ +3 ^  ^     (?(?=[a])[^"])
+ +5 ^  ^     (?=[a])
+ +8 ^  ^     [a]
++17 ^  ^     |
++21 ^  ^     "
++22 ^   ^    $
++23 ^   ^    
+ 0: "ab"
+ 1: 
+
+/^"((?(?=[a])[^"])|b)*"$/
+    "ab"
+ 0: "ab"
+ 1: 
+
+/^X(?5)(a)(?|(b)|(q))(c)(d)Y/
+Failed: reference to non-existent subpattern at offset 5
+
+/^X(?&N)(a)(?|(b)|(q))(c)(d)(?<N>Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: c
+ 4: d
+ 5: Y
+ 
+/Xa{2,4}b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/Xa{2,4}?b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/Xa{2,4}+b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X\d{2,4}b/
+    X\P
+Partial match: X
+    X3\P
+Partial match: X3
+    X33\P 
+Partial match: X33
+    X333\P
+Partial match: X333
+    X3333\P 
+Partial match: X3333
+    
+/X\d{2,4}?b/
+    X\P
+Partial match: X
+    X3\P
+Partial match: X3
+    X33\P 
+Partial match: X33
+    X333\P
+Partial match: X333
+    X3333\P 
+Partial match: X3333
+    
+/X\d{2,4}+b/
+    X\P
+Partial match: X
+    X3\P
+Partial match: X3
+    X33\P 
+Partial match: X33
+    X333\P
+Partial match: X333
+    X3333\P 
+Partial match: X3333
+    
+/X\D{2,4}b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X\D{2,4}?b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X\D{2,4}+b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X[abc]{2,4}b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X[abc]{2,4}?b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X[abc]{2,4}+b/
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X[^a]{2,4}b/
+    X\P
+Partial match: X
+    Xz\P
+Partial match: Xz
+    Xzz\P 
+Partial match: Xzz
+    Xzzz\P
+Partial match: Xzzz
+    Xzzzz\P 
+Partial match: Xzzzz
+    
+/X[^a]{2,4}?b/
+    X\P
+Partial match: X
+    Xz\P
+Partial match: Xz
+    Xzz\P 
+Partial match: Xzz
+    Xzzz\P
+Partial match: Xzzz
+    Xzzzz\P 
+Partial match: Xzzzz
+    
+/X[^a]{2,4}+b/
+    X\P
+Partial match: X
+    Xz\P
+Partial match: Xz
+    Xzz\P 
+Partial match: Xzz
+    Xzzz\P
+Partial match: Xzzz
+    Xzzzz\P 
+Partial match: Xzzzz
+    
+/(Y)X\1{2,4}b/
+    YX\P
+Partial match: YX
+    YXY\P
+Partial match: YXY
+    YXYY\P 
+Partial match: YXYY
+    YXYYY\P
+Partial match: YXYYY
+    YXYYYY\P 
+Partial match: YXYYYY
+    
+/(Y)X\1{2,4}?b/
+    YX\P
+Partial match: YX
+    YXY\P
+Partial match: YXY
+    YXYY\P 
+Partial match: YXYY
+    YXYYY\P
+Partial match: YXYYY
+    YXYYYY\P 
+Partial match: YXYYYY
+    
+/(Y)X\1{2,4}+b/
+    YX\P
+Partial match: YX
+    YXY\P
+Partial match: YXY
+    YXYY\P 
+Partial match: YXYY
+    YXYYY\P
+Partial match: YXYYY
+    YXYYYY\P 
+Partial match: YXYYYY
+    
+/\++\KZ|\d+X|9+Y/
+    ++++123999\P
+Partial match: 123999
+    ++++123999Y\P
+ 0: 999Y
+    ++++Z1234\P 
+ 0: Z
+
+/Z(*F)/
+    Z\P
+No match
+    ZA\P 
+No match
+    
+/Z(?!)/
+    Z\P 
+No match
+    ZA\P 
+No match
+
+/dog(sbody)?/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+Partial match: dogs
+    
+/dog(sbody)??/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+ 0: dog
+
+/dog|dogsbody/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+ 0: dog
+ 
+/dogsbody|dog/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+Partial match: dogs
+
+/\bthe cat\b/
+    the cat\P
+ 0: the cat
+    the cat\P\P
+Partial match: the cat
+
+/abc/
+   abc\P
+ 0: abc
+   abc\P\P
+ 0: abc
+   
+/abc\K123/
+    xyzabc123pqr
+ 0: 123
+    xyzabc12\P
+Partial match: abc12
+    xyzabc12\P\P
+Partial match: abc12
+    
+/(?<=abc)123/
+    xyzabc123pqr 
+ 0: 123
+    xyzabc12\P
+Partial match at offset 6: abc12
+    xyzabc12\P\P
+Partial match at offset 6: abc12
+
+/\babc\b/
+    +++abc+++
+ 0: abc
+    +++ab\P
+Partial match at offset 3: +ab
+    +++ab\P\P  
+Partial match at offset 3: +ab
+
+/(?&word)(?&element)(?(DEFINE)(?<element><[^m][^>]>[^<])(?<word>\w*+))/BZ
+------------------------------------------------------------------
+        Bra
+        Recurse
+        Recurse
+        Cond
+        Cond def
+        CBra 1
+        <
+        [^m]
+        [^>]
+        >
+        [^<]
+        Ket
+        CBra 2
+        \w*+
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?&word)(?&element)(?(DEFINE)(?<element><[^\d][^>]>[^<])(?<word>\w*+))/BZ
+------------------------------------------------------------------
+        Bra
+        Recurse
+        Recurse
+        Cond
+        Cond def
+        CBra 1
+        <
+        [\x00-/:-\xff] (neg)
+        [^>]
+        >
+        [^<]
+        Ket
+        CBra 2
+        \w*+
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/(ab)(x(y)z(cd(*ACCEPT)))pq/BZ
+------------------------------------------------------------------
+        Bra
+        CBra 1
+        ab
+        Ket
+        CBra 2
+        x
+        CBra 3
+        y
+        Ket
+        z
+        CBra 4
+        cd
+        Close 4
+        Close 2
+        *ACCEPT
+        Ket
+        Ket
+        pq
+        Ket
+        End
+------------------------------------------------------------------
+
+/abc\K/+
+    abcdef
+ 0: 
+ 0+ def
+    abcdef\N\N
+ 0: 
+ 0+ def
+    xyzabcdef\N\N
+ 0: 
+ 0+ def
+    ** Failers
+No match
+    abcdef\N 
+No match
+    xyzabcdef\N
+No match
+    
+/^(?:(?=abc)|abc\K)/+
+    abcdef
+ 0: 
+ 0+ abcdef
+    abcdef\N\N 
+ 0: 
+ 0+ def
+    ** Failers 
+No match
+    abcdef\N 
+No match
+
+/a?b?/+
+    xyz
+ 0: 
+ 0+ xyz
+    xyzabc
+ 0: 
+ 0+ xyzabc
+    xyzabc\N
+ 0: ab
+ 0+ c
+    xyzabc\N\N
+ 0: 
+ 0+ yzabc
+    xyz\N\N    
+ 0: 
+ 0+ yz
+    ** Failers 
+ 0: 
+ 0+ ** Failers
+    xyz\N 
+No match
+
+/^a?b?/+
+    xyz
+ 0: 
+ 0+ xyz
+    xyzabc
+ 0: 
+ 0+ xyzabc
+    ** Failers 
+ 0: 
+ 0+ ** Failers
+    xyzabc\N
+No match
+    xyzabc\N\N
+No match
+    xyz\N\N    
+No match
+    xyz\N 
+No match
+    
+/^(?<name>a|b\g<name>c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(?<name>a|b\g'name'c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(a|b\g<1>c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(a|b\g'1'c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/^(a|b\g'-1'c)/
+    aaaa
+ 0: a
+ 1: a
+    bacxxx
+ 0: bac
+ 1: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+
+/(^(a|b\g<-1>c))/
+    aaaa
+ 0: a
+ 1: a
+ 2: a
+    bacxxx
+ 0: bac
+ 1: bac
+ 2: bac
+    bbaccxxx 
+ 0: bbacc
+ 1: bbacc
+ 2: bbacc
+    bbbacccxx
+ 0: bbbaccc
+ 1: bbbaccc
+ 2: bbbaccc
+
+/(?-i:\g<name>)(?i:(?<name>a))/
+    XaaX
+ 0: aa
+ 1: a
+    XAAX 
+ 0: AA
+ 1: A
+
+/(?i:\g<name>)(?-i:(?<name>a))/
+    XaaX
+ 0: aa
+ 1: a
+    ** Failers 
+No match
+    XAAX 
+No match
+
+/(?-i:\g<+1>)(?i:(a))/
+    XaaX
+ 0: aa
+ 1: a
+    XAAX 
+ 0: AA
+ 1: A
+
+/(?=(?<regex>(?#simplesyntax)\$(?<name>[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)(?:\[(?<index>[a-zA-Z0-9_\x{7f}-\x{ff}]+|\$\g<name>)\]|->\g<name>(\(.*?\))?)?|(?#simple syntax withbraces)\$\{(?:\g<name>(?<indices>\[(?:\g<index>|'(?:\\.|[^'\\])*'|"(?:\g<regex>|\\.|[^"\\])*")\])?|\g<complex>|\$\{\g<complex>\})\}|(?#complexsyntax)\{(?<complex>\$(?<segment>\g<name>(\g<indices>*|\(.*?\))?)(?:->\g<segment>)*|\$\g<complex>|\$\{\g<complex>\})\}))\{/
+
+/(?<n>a|b|c)\g<n>*/
+   abc
+ 0: abc
+ 1: a
+   accccbbb 
+ 0: accccbbb
+ 1: a
+
+/^X(?7)(a)(?|(b)|(q)(r)(s))(c)(d)(Y)/
+    XYabcdY
+ 0: XYabcdY
+ 1: a
+ 2: b
+ 3: <unset>
+ 4: <unset>
+ 5: c
+ 6: d
+ 7: Y
+
+/(?<=b(?1)|zzz)(a)/
+    xbaax
+ 0: a
+ 1: a
+    xzzzax 
+ 0: a
+ 1: a
+
+/(a)(?<=b\1)/
+Failed: lookbehind assertion is not fixed length at offset 10
+
+/(a)(?<=b+(?1))/
+Failed: lookbehind assertion is not fixed length at offset 13
+
+/(a+)(?<=b(?1))/
+Failed: lookbehind assertion is not fixed length at offset 14
+
+/(a(?<=b(?1)))/
+Failed: lookbehind assertion is not fixed length at offset 13
+
+/(?<=b(?1))xyz/
+Failed: reference to non-existent subpattern at offset 8
+
+/(?<=b(?1))xyz(b+)pqrstuvew/
+Failed: lookbehind assertion is not fixed length at offset 26
+
+/(a|bc)\1/SI
+Capturing subpattern count = 1
+Max back reference = 1
+No options
+No first char
+No need char
+Subject length lower bound = 2
+Starting byte set: a b 
+
+/(a|bc)\1{2,3}/SI
+Capturing subpattern count = 1
+Max back reference = 1
+No options
+No first char
+No need char
+Subject length lower bound = 3
+Starting byte set: a b 
+
+/(a|bc)(?1)/SI
+Capturing subpattern count = 1
+No options
+No first char
+No need char
+Subject length lower bound = 2
+Starting byte set: a b 
+
+/(a|b\1)(a|b\1)/SI
+Capturing subpattern count = 2
+Max back reference = 1
+No options
+No first char
+No need char
+Subject length lower bound = 2
+Starting byte set: a b 
+
+/(a|b\1){2}/SI
+Capturing subpattern count = 1
+Max back reference = 1
+No options
+No first char
+No need char
+Subject length lower bound = 2
+Starting byte set: a b 
+
+/(a|bbbb\1)(a|bbbb\1)/SI
+Capturing subpattern count = 2
+Max back reference = 1
+No options
+No first char
+No need char
+Subject length lower bound = 2
+Starting byte set: a b 
+
+/(a|bbbb\1){2}/SI
+Capturing subpattern count = 1
+Max back reference = 1
+No options
+No first char
+No need char
+Subject length lower bound = 2
+Starting byte set: a b 
+
+/^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]/SI
+Capturing subpattern count = 1
+Options: anchored
+No first char
+Need char = ':'
+Subject length lower bound = 22
+No set of starting bytes
+
+/<tr([\w\W\s\d][^<>]{0,})><TD([\w\W\s\d][^<>]{0,})>([\d]{0,}\.)(.*)((<BR>([\w\W\s\d][^<>]{0,})|[\s]{0,}))<\/a><\/TD><TD([\w\W\s\d][^<>]{0,})>([\w\W\s\d][^<>]{0,})<\/TD><TD([\w\W\s\d][^<>]{0,})>([\w\W\s\d][^<>]{0,})<\/TD><\/TR>/isIS
+Capturing subpattern count = 11
+Options: caseless dotall
+First char = '<'
+Need char = '>'
+Subject length lower bound = 47
+No set of starting bytes
+
+"(?>.*/)foo"SI
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'o'
+Subject length lower bound = 4
+No set of starting bytes
+
+/(?(?=[^a-z]+[a-z])  \d{2}-[a-z]{3}-\d{2}  |  \d{2}-\d{2}-\d{2} ) /xSI
+Capturing subpattern count = 0
+Options: extended
+No first char
+Need char = '-'
+Subject length lower bound = 8
+No set of starting bytes
+
+/(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))/iSI
+Capturing subpattern count = 1
+Options: caseless
+No first char
+No need char
+Subject length lower bound = 1
+Starting byte set: A B C a b c 
+
+/(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))/SI
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'b'
+Subject length lower bound = 41
+Starting byte set: c d 
+
+/<a[\s]+href[\s]*=[\s]*          # find <a href=
+ ([\"\'])?                       # find single or double quote
+ (?(1) (.*?)\1 | ([^\s]+))       # if quote found, match up to next matching
+                                 # quote, otherwise match up to next space
+/isxSI
+Capturing subpattern count = 3
+Max back reference = 1
+Options: caseless extended dotall
+First char = '<'
+Need char = '='
+Subject length lower bound = 9
+No set of starting bytes
+
+/^(?!:)                       # colon disallowed at start
+  (?:                         # start of item
+    (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
+    (?(1)0 | () ) )           # if null previously matched, fail; else null
+    :                         # followed by colon
+  ){1,7}                      # end item; 1-7 of them required               
+  [0-9a-f]{1,4} $             # final hex number at end of string
+  (?(1)|.)                    # check that there was an empty component
+  /xiIS
+Capturing subpattern count = 1
+Options: anchored caseless extended
+No first char
+Need char = ':'
+Subject length lower bound = 2
+No set of starting bytes
+
+/(?|(?<a>A)|(?<a>B))/I
+Capturing subpattern count = 1
+Named capturing subpatterns:
+  a   1
+  a   1
+No options
+No first char
+No need char
+    AB\Ca
+ 0: A
+ 1: A
+  C A (1) a
+    BA\Ca
+ 0: B
+ 1: B
+  C B (1) a
+
+/(?|(?<a>A)|(?<b>B))/ 
+Failed: different names for subpatterns of the same number are not allowed at offset 15
+
+/(?:a(?<quote> (?<apostrophe>')|(?<realquote>")) |
+    b(?<quote> (?<apostrophe>')|(?<realquote>")) ) 
+    (?('quote')[a-z]+|[0-9]+)/JIx
+Capturing subpattern count = 6
+Named capturing subpatterns:
+  apostrophe   2
+  apostrophe   5
+  quote        1
+  quote        4
+  realquote    3
+  realquote    6
+Options: extended dupnames
+No first char
+No need char
+    a"aaaaa
+ 0: a"aaaaa
+ 1: "
+ 2: <unset>
+ 3: "
+    b"aaaaa 
+ 0: b"aaaaa
+ 1: <unset>
+ 2: <unset>
+ 3: <unset>
+ 4: "
+ 5: <unset>
+ 6: "
+    ** Failers 
+No match
+    b"11111
+No match
+    a"11111 
+No match
+    
+/^(?|(a)(b)(c)(?<D>d)|(?<D>e)) (?('D')X|Y)/JDZx
+------------------------------------------------------------------
+        Bra
+        ^
+        Bra
+        CBra 1
+        a
+        Ket
+        CBra 2
+        b
+        Ket
+        CBra 3
+        c
+        Ket
+        CBra 4
+        d
+        Ket
+        Alt
+        CBra 1
+        e
+        Ket
+        Ket
+        Cond
+      4 Cond nref
+        X
+        Alt
+        Y
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 4
+Named capturing subpatterns:
+  D   4
+  D   1
+Options: anchored extended dupnames
+No first char
+No need char
+    abcdX
+ 0: abcdX
+ 1: a
+ 2: b
+ 3: c
+ 4: d
+    eX
+ 0: eX
+ 1: e
+    ** Failers
+No match
+    abcdY
+No match
+    ey     
+No match
+    
+/(?<A>a) (b)(c)  (?<A>d  (?(R&A)$ | (?4)) )/JDZx
+------------------------------------------------------------------
+        Bra
+        CBra 1
+        a
+        Ket
+        CBra 2
+        b
+        Ket
+        CBra 3
+        c
+        Ket
+        CBra 4
+        d
+        Cond
+        Cond nrecurse 1
+        $
+        Alt
+        Recurse
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 4
+Named capturing subpatterns:
+  A   1
+  A   4
+Options: extended dupnames
+First char = 'a'
+Need char = 'd'
+    abcdd
+ 0: abcdd
+ 1: a
+ 2: b
+ 3: c
+ 4: dd
+    ** Failers
+No match
+    abcdde  
+No match
+
+/abcd*/
+    xxxxabcd\P
+ 0: abcd
+    xxxxabcd\P\P
+Partial match: abcd
+
+/abcd*/i
+    xxxxabcd\P
+ 0: abcd
+    xxxxabcd\P\P
+Partial match: abcd
+    XXXXABCD\P
+ 0: ABCD
+    XXXXABCD\P\P
+Partial match: ABCD
+
+/abc\d*/
+    xxxxabc1\P
+ 0: abc1
+    xxxxabc1\P\P
+Partial match: abc1
+
+/(a)bc\1*/
+    xxxxabca\P
+ 0: abca
+ 1: a
+    xxxxabca\P\P
+Partial match: abca
+
+/abc[de]*/
+    xxxxabcde\P
+ 0: abcde
+    xxxxabcde\P\P
+Partial match: abcde
+
+/-- This is not in the Perl-compatible test because Perl seems currently to be
+    broken and not behaving as specified in that it *does* bumpalong after
+    hitting (*COMMIT). --/
+
+/(?1)(A(*COMMIT)|B)D/
+    ABD
+ 0: ABD
+ 1: B
+    XABD
+ 0: ABD
+ 1: B
+    BAD
+ 0: BAD
+ 1: A
+    ABXABD  
+ 0: ABD
+ 1: B
+    ** Failers 
+No match
+    ABX 
+No match
+    BAXBAD  
+No match
+
+/(\3)(\1)(a)/<JS>
+    cat
+ 0: a
+ 1: 
+ 2: 
+ 3: a
+
+/(\3)(\1)(a)/SI<JS>
+Capturing subpattern count = 3
+Max back reference = 3
+Options:
+No first char
+Need char = 'a'
+Subject length lower bound = 1
+No set of starting bytes
+    cat
+ 0: a
+ 1: 
+ 2: 
+ 3: a
+
+/(\3)(\1)(a)/SI
+Capturing subpattern count = 3
+Max back reference = 3
+No options
+No first char
+Need char = 'a'
+Subject length lower bound = 3
+No set of starting bytes
+    cat
+No match
+
+/i(?(DEFINE)(?<s>a))/SI
+Capturing subpattern count = 1
+Named capturing subpatterns:
+  s   1
+No options
+First char = 'i'
+No need char
+Subject length lower bound = 1
+No set of starting bytes
+    i
+ 0: i
+    
+/()i(?(1)a)/SI 
+Capturing subpattern count = 1
+No options
+No first char
+Need char = 'i'
+Subject length lower bound = 1
+Starting byte set: i 
+    ia
+ 0: ia
+ 1: 
+
+/(?i)a(?-i)b|c/BZ
+------------------------------------------------------------------
+        Bra
+     /i a
+        b
+        Alt
+        c
+        Ket
+        End
+------------------------------------------------------------------
+    XabX
+ 0: ab
+    XAbX
+ 0: Ab
+    CcC 
+ 0: c
+    ** Failers
+No match
+    XABX   
+No match
+
+/(?i)a(?s)b|c/BZ
+------------------------------------------------------------------
+        Bra
+     /i ab
+        Alt
+     /i c
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?i)a(?s-i)b|c/BZ
+------------------------------------------------------------------
+        Bra
+     /i a
+        b
+        Alt
+        c
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(ab(c\1)d|x){2}$/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Once
+        CBra 1
+        ab
+        CBra 2
+        c
+        \1
+        Ket
+        d
+        Alt
+        x
+        Ket
+        Ket
+        Once
+        CBra 1
+        ab
+        CBra 2
+        c
+        \1
+        Ket
+        d
+        Alt
+        x
+        Ket
+        Ket
+        $
+        Ket
+        End
+------------------------------------------------------------------
+    xabcxd
+ 0: xabcxd
+ 1: abcxd
+ 2: cx
+    
+/^(?&t)*+(?(DEFINE)(?<t>.))$/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Braposzero
+        SBraPos
+        Recurse
+        KetRpos
+        Cond
+        Cond def
+        CBra 1
+        Any
+        Ket
+        Ket
+        $
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?&t)*(?(DEFINE)(?<t>.))$/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Brazero
+        Once
+        Recurse
+        KetRmax
+        Cond
+        Cond def
+        CBra 1
+        Any
+        Ket
+        Ket
+        $
+        Ket
+        End
+------------------------------------------------------------------
+
+/ -- This one is here because Perl gives the match as "b" rather than "ab". I
+     believe this to be a Perl bug. --/  
+      
+/(?>a\Kb)z|(ab)/
+    ab 
+ 0: ab
+ 1: ab
+
+/(?P<L1>(?P<L2>0|)|(?P>L2)(?P>L1))/
+Failed: recursive call could loop indefinitely at offset 31
+
+/abc(*MARK:)pqr/
+Failed: (*MARK) must have an argument at offset 10
+
+/abc(*:)pqr/
+Failed: (*MARK) must have an argument at offset 6
+
+/abc(*FAIL:123)xyz/
+Failed: an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT) at offset 13
+
+/--- This should, and does, fail. In Perl, it does not, which I think is a 
+     bug because replacing the B in the pattern by (B|D) does make it fail. ---/
+
+/A(*COMMIT)B/+K
+    ACABX
+No match
+
+/--- These should be different, but in Perl they are not, which I think
+     is a bug in Perl. ---/
+
+/A(*THEN)B|A(*THEN)C/K
+    AC
+ 0: AC
+
+/A(*PRUNE)B|A(*PRUNE)C/K
+    AC
+No match
+    
+/--- Mark names can be duplicated. Perl doesn't give a mark for this one,
+though PCRE does. ---/
+
+/^A(*:A)B|^X(*:A)Y/K
+    ** Failers
+No match
+    XAQQ
+No match, mark = A
+    
+/--- COMMIT at the start of a pattern should be the same as an anchor. Perl 
+optimizations defeat this. So does the PCRE optimization unless we disable it 
+with \Y. ---/
+
+/(*COMMIT)ABC/
+    ABCDEFG
+ 0: ABC
+    ** Failers
+No match
+    DEFGABC\Y  
+No match
+    
+/^(ab (c+(*THEN)cd) | xyz)/x
+    abcccd  
+No match
+
+/^(ab (c+(*PRUNE)cd) | xyz)/x
+    abcccd  
+No match
+
+/^(ab (c+(*FAIL)cd) | xyz)/x
+    abcccd  
+No match
+    
+/--- Perl gets some of these wrong ---/ 
+
+/(?>.(*ACCEPT))*?5/
+    abcde
+ 0: a
+
+/(.(*ACCEPT))*?5/
+    abcde
+ 0: a
+ 1: a
+
+/(.(*ACCEPT))5/
+    abcde
+ 0: a
+ 1: a
+
+/(.(*ACCEPT))*5/
+    abcde
+ 0: a
+ 1: a
+
+/A\NB./BZ
+------------------------------------------------------------------
+        Bra
+        A
+        Any
+        B
+        Any
+        Ket
+        End
+------------------------------------------------------------------
+    ACBD
+ 0: ACBD
+    *** Failers
+No match
+    A\nB
+No match
+    ACB\n   
+No match
+
+/A\NB./sBZ
+------------------------------------------------------------------
+        Bra
+        A
+        Any
+        B
+        AllAny
+        Ket
+        End
+------------------------------------------------------------------
+    ACBD
+ 0: ACBD
+    ACB\n 
+ 0: ACB\x0a
+    *** Failers
+No match
+    A\nB  
+No match
+  
+/A\NB/<crlf>
+    A\nB
+ 0: A\x0aB
+    A\rB
+ 0: A\x0dB
+    ** Failers
+No match
+    A\r\nB    
+No match
+
+/\R+b/BZ
+------------------------------------------------------------------
+        Bra
+        \R++
+        b
+        Ket
+        End
+------------------------------------------------------------------
+
+/\R+\n/BZ
+------------------------------------------------------------------
+        Bra
+        \R+
+        \x0a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\R+\d/BZ
+------------------------------------------------------------------
+        Bra
+        \R++
+        \d
+        Ket
+        End
+------------------------------------------------------------------
+
+/\d*\R/BZ
+------------------------------------------------------------------
+        Bra
+        \d*+
+        \R
+        Ket
+        End
+------------------------------------------------------------------
+
+/\s*\R/BZ
+------------------------------------------------------------------
+        Bra
+        \s*
+        \R
+        Ket
+        End
+------------------------------------------------------------------
+    \x20\x0a
+ 0:  \x0a
+    \x20\x0d
+ 0:  \x0d
+    \x20\x0d\x0a
+ 0:  \x0d\x0a
+
+/\S*\R/BZ
+------------------------------------------------------------------
+        Bra
+        \S*+
+        \R
+        Ket
+        End
+------------------------------------------------------------------
+    a\x0a
+ 0: a\x0a
+
+/X\h*\R/BZ
+------------------------------------------------------------------
+        Bra
+        X
+        \h*+
+        \R
+        Ket
+        End
+------------------------------------------------------------------
+    X\x20\x0a
+ 0: X \x0a
+
+/X\H*\R/BZ
+------------------------------------------------------------------
+        Bra
+        X
+        \H*
+        \R
+        Ket
+        End
+------------------------------------------------------------------
+    X\x0d\x0a
+ 0: X\x0d\x0a
+
+/X\H+\R/BZ
+------------------------------------------------------------------
+        Bra
+        X
+        \H+
+        \R
+        Ket
+        End
+------------------------------------------------------------------
+    X\x0d\x0a
+ 0: X\x0d\x0a
+
+/X\H++\R/BZ
+------------------------------------------------------------------
+        Bra
+        X
+        \H++
+        \R
+        Ket
+        End
+------------------------------------------------------------------
+    X\x0d\x0a
+No match
+
+/(?<=abc)def/
+    abc\P\P
+Partial match at offset 3: abc
+
+/abc$/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc$/m
+    abc
+ 0: abc
+    abc\n
+ 0: abc
+    abc\P\P
+Partial match: abc
+    abc\n\P\P 
+ 0: abc
+    abc\P
+ 0: abc
+    abc\n\P
+ 0: abc
+
+/abc\z/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc\Z/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc\b/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc\B/
+    abc
+No match
+    abc\P
+Partial match: abc
+    abc\P\P
+Partial match: abc
+
+/.+/
+    abc\>0
+ 0: abc
+    abc\>1
+ 0: bc
+    abc\>2
+ 0: c
+    abc\>3
+No match
+    abc\>4
+Error -24 (bad offset value)
+    abc\>-4 
+Error -24 (bad offset value)
+
+/^\cģ/
+Failed: \c must be followed by an ASCII character at offset 3
+
+/(?P<abn>(?P=abn)xxx)/BZ
+------------------------------------------------------------------
+        Bra
+        Once
+        CBra 1
+        \1
+        xxx
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/(a\1z)/BZ
+------------------------------------------------------------------
+        Bra
+        Once
+        CBra 1
+        a
+        \1
+        z
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?P<abn>(?P=abn)(?<badstufxxx)/BZ
+Failed: syntax error in subpattern name (missing terminator) at offset 29
+
+/(?P<abn>(?P=axn)xxx)/BZ
+Failed: reference to non-existent subpattern at offset 15
+
+/(?P<abn>(?P=axn)xxx)(?<axn>yy)/BZ
+------------------------------------------------------------------
+        Bra
+        CBra 1
+        \2
+        xxx
+        Ket
+        CBra 2
+        yy
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/-- These tests are here because Perl gets the first one wrong. --/
+
+/(\R*)(.)/s
+    \r\n
+ 0: \x0d
+ 1: 
+ 2: \x0d
+    \r\r\n\n\r 
+ 0: \x0d\x0d\x0a\x0a\x0d
+ 1: \x0d\x0d\x0a\x0a
+ 2: \x0d
+    \r\r\n\n\r\n 
+ 0: \x0d\x0d\x0a\x0a\x0d
+ 1: \x0d\x0d\x0a\x0a
+ 2: \x0d
+
+/(\R)*(.)/s
+    \r\n
+ 0: \x0d
+ 1: <unset>
+ 2: \x0d
+    \r\r\n\n\r 
+ 0: \x0d\x0d\x0a\x0a\x0d
+ 1: \x0a
+ 2: \x0d
+    \r\r\n\n\r\n 
+ 0: \x0d\x0d\x0a\x0a\x0d
+ 1: \x0a
+ 2: \x0d
+
+/((?>\r\n|\n|\x0b|\f|\r|\x85)*)(.)/s
+    \r\n
+ 0: \x0d
+ 1: 
+ 2: \x0d
+    \r\r\n\n\r 
+ 0: \x0d\x0d\x0a\x0a\x0d
+ 1: \x0d\x0d\x0a\x0a
+ 2: \x0d
+    \r\r\n\n\r\n 
+ 0: \x0d\x0d\x0a\x0a\x0d
+ 1: \x0d\x0d\x0a\x0a
+ 2: \x0d
+
+/-- --/
+
+/^abc$/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        abc
+        $
+        Ket
+        End
+------------------------------------------------------------------
+
+/^abc$/BZm
+------------------------------------------------------------------
+        Bra
+     /m ^
+        abc
+     /m $
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(a)*+(\w)/S
+    aaaaX
+ 0: aaaaX
+ 1: a
+ 2: X
+    ** Failers 
+No match
+    aaaa
+No match
+
+/^(?:a)*+(\w)/S
+    aaaaX
+ 0: aaaaX
+ 1: X
+    ** Failers 
+No match
+    aaaa
+No match
+
+/(a)++1234/SDZ
+------------------------------------------------------------------
+        Bra
+        CBraPos 1
+        a
+        KetRpos
+        1234
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 1
+No options
+First char = 'a'
+Need char = '4'
+Subject length lower bound = 5
+No set of starting bytes
+
+/([abc])++1234/SI
+Capturing subpattern count = 1
+No options
+No first char
+Need char = '4'
+Subject length lower bound = 5
+Starting byte set: a b c 
+
+/(?<=(abc)+)X/
+Failed: lookbehind assertion is not fixed length at offset 10
+
+/(^ab)/I
+Capturing subpattern count = 1
+Options: anchored
+No first char
+No need char
+
+/(^ab)++/I
+Capturing subpattern count = 1
+Options: anchored
+No first char
+No need char
+
+/(^ab|^)+/I
+Capturing subpattern count = 1
+Options: anchored
+No first char
+No need char
+
+/(^ab|^)++/I
+Capturing subpattern count = 1
+Options: anchored
+No first char
+No need char
+
+/(?:^ab)/I
+Capturing subpattern count = 0
+Options: anchored
+No first char
+No need char
+
+/(?:^ab)++/I
+Capturing subpattern count = 0
+Options: anchored
+No first char
+No need char
+
+/(?:^ab|^)+/I
+Capturing subpattern count = 0
+Options: anchored
+No first char
+No need char
+
+/(?:^ab|^)++/I
+Capturing subpattern count = 0
+Options: anchored
+No first char
+No need char
+
+/(.*ab)/I
+Capturing subpattern count = 1
+No options
+First char at start or follows newline
+Need char = 'b'
+
+/(.*ab)++/I
+Capturing subpattern count = 1
+No options
+First char at start or follows newline
+Need char = 'b'
+
+/(.*ab|.*)+/I
+Capturing subpattern count = 1
+No options
+First char at start or follows newline
+No need char
+
+/(.*ab|.*)++/I
+Capturing subpattern count = 1
+No options
+First char at start or follows newline
+No need char
+
+/(?:.*ab)/I
+Capturing subpattern count = 0
+No options
+First char at start or follows newline
+Need char = 'b'
+
+/(?:.*ab)++/I
+Capturing subpattern count = 0
+No options
+First char at start or follows newline
+Need char = 'b'
+
+/(?:.*ab|.*)+/I
+Capturing subpattern count = 0
+No options
+First char at start or follows newline
+No need char
+
+/(?:.*ab|.*)++/I
+Capturing subpattern count = 0
+No options
+First char at start or follows newline
+No need char
+
+/(?=a)[bcd]/I
+Capturing subpattern count = 0
+No options
+First char = 'a'
+No need char
+
+/((?=a))[bcd]/I
+Capturing subpattern count = 1
+No options
+First char = 'a'
+No need char
+
+/((?=a))+[bcd]/I
+Capturing subpattern count = 1
+No options
+First char = 'a'
+No need char
+
+/((?=a))++[bcd]/I
+Capturing subpattern count = 1
+No options
+First char = 'a'
+No need char
+
+/(?=a+)[bcd]/iI
+Capturing subpattern count = 0
+Options: caseless
+First char = 'a' (caseless)
+No need char
+
+/(?=a+?)[bcd]/iI
+Capturing subpattern count = 0
+Options: caseless
+First char = 'a' (caseless)
+No need char
+
+/(?=a++)[bcd]/iI
+Capturing subpattern count = 0
+Options: caseless
+First char = 'a' (caseless)
+No need char
+
+/(?=a{3})[bcd]/iI
+Capturing subpattern count = 0
+Options: caseless
+First char = 'a' (caseless)
+Need char = 'a' (caseless)
+
+/(abc)\1+/S
+
+/-- Perl doesn't get these right IMO (the 3rd is PCRE-specific) --/
+
+/(?1)(?:(b(*ACCEPT))){0}/
+    b
+ 0: b
+
+/(?1)(?:(b(*ACCEPT))){0}c/
+    bc
+ 0: bc
+    ** Failers 
+No match
+    b 
+No match
+
+/(?1)(?:((*ACCEPT))){0}c/
+    c
+ 0: c
+    c\N 
+ 0: c
+
+/^.*?(?(?=a)a|b(*THEN)c)/
+    ba
+No match
+
+/^.*?(?(?=a)a|bc)/
+    ba
+ 0: ba
+
+/^.*?(?(?=a)a(*THEN)b|c)/
+    ac
+No match
+
+/^.*?(?(?=a)a(*THEN)b)c/
+    ac
+No match
+
+/^.*?(a(*THEN)b)c/
+    aabc
+No match
+    
+/^.*? (?1) c (?(DEFINE)(a(*THEN)b))/x
+    aabc
+ 0: aabc
+
+/^.*?(a(*THEN)b|z)c/
+    aabc
+ 0: aabc
+ 1: ab
+
+/^.*?(z|a(*THEN)b)c/
+    aabc
+ 0: aabc
+ 1: ab
+
+/-- --/
+
+/-- These studied versions are here because they are not Perl-compatible; the
+    studying means the mark is not seen. --/
+
+/(*MARK:A)(*SKIP:B)(C|X)/KS
+    C
+ 0: C
+ 1: C
+MK: A
+    D
+No match, mark = A
+     
+/(*:A)A+(*SKIP:A)(B|Z)/KS
+    AAAC
+No match, mark = A
+
+/-- --/
+
+"(?=a*(*ACCEPT)b)c"
+    c
+ 0: c
+    c\N 
+ 0: c
+    
+/(?1)c(?(DEFINE)((*ACCEPT)b))/
+    c
+ 0: c
+    c\N  
+ 0: c
+    
+/(?>(*ACCEPT)b)c/
+    c
+ 0: 
+    c\N  
+No match
+
+/(?:(?>(a)))+a%/++
+    %aa%
+ 0: aa%
+ 0+ 
+ 1: a
+ 1+ a%
+
+/(a)b|ac/++SS
+    ac\O3
+ 0: ac
+ 0+ 
+    
+/(a)(b)x|abc/++
+     abc\O6
+ 0: abc
+ 0+ 
+
+/(a)bc|(a)(b)\2/
+    \O3abc
+Matched, but too many substrings
+ 0: abc
+    \O4abc 
+Matched, but too many substrings
+ 0: abc
+
+/(?(DEFINE)(a(?2)|b)(b(?1)|a))(?:(?1)|(?2))/SI
+Capturing subpattern count = 2
+No options
+No first char
+No need char
+Subject length lower bound = 1
+No set of starting bytes
+
+/(a(?2)|b)(b(?1)|a)(?:(?1)|(?2))/SI
+Capturing subpattern count = 2
+No options
+No first char
+No need char
+Subject length lower bound = 3
+Starting byte set: a b 
+
+/(a(?2)|b)(b(?1)|a)(?1)(?2)/SI
+Capturing subpattern count = 2
+No options
+No first char
+No need char
+Subject length lower bound = 4
+Starting byte set: a b 
+
+/(abc)(?1)/SI
+Capturing subpattern count = 1
+No options
+First char = 'a'
+Need char = 'c'
+Subject length lower bound = 6
+No set of starting bytes
+
+/^(?>a)++/
+    aa\M
+Minimum match() limit = 5
+Minimum match() recursion limit = 2
+ 0: aa
+    aaaaaaaaa\M 
+Minimum match() limit = 12
+Minimum match() recursion limit = 2
+ 0: aaaaaaaaa
+    
+/(a)(?1)++/
+    aa\M
+Minimum match() limit = 7
+Minimum match() recursion limit = 4
+ 0: aa
+ 1: a
+    aaaaaaaaa\M  
+Minimum match() limit = 21
+Minimum match() recursion limit = 4
+ 0: aaaaaaaaa
+ 1: a
+
+/(?:(foo)|(bar)|(baz))X/SS=
+    bazfooX
+ 0: fooX
+ 1: foo
+ 2: <unset>
+ 3: <unset>
+    foobazbarX
+ 0: barX
+ 1: <unset>
+ 2: bar
+ 3: <unset>
+    barfooX
+ 0: fooX
+ 1: foo
+ 2: <unset>
+ 3: <unset>
+    bazX
+ 0: bazX
+ 1: <unset>
+ 2: <unset>
+ 3: baz
+    foobarbazX    
+ 0: bazX
+ 1: <unset>
+ 2: <unset>
+ 3: baz
+    bazfooX\O0
+Matched, but too many substrings
+    bazfooX\O2
+Matched, but too many substrings
+ 0: fooX
+    bazfooX\O4
+Matched, but too many substrings
+ 0: fooX
+ 1: <unset>
+    bazfooX\O6
+Matched, but too many substrings
+ 0: fooX
+ 1: foo
+ 2: <unset>
+    bazfooX\O8
+Matched, but too many substrings
+ 0: fooX
+ 1: foo
+ 2: <unset>
+ 3: <unset>
+    bazfooX\O10
+ 0: fooX
+ 1: foo
+ 2: <unset>
+ 3: <unset>
+
+/(?=abc){3}abc/BZ
+------------------------------------------------------------------
+        Bra
+        Assert
+        abc
+        Ket
+        abc
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?=abc)+abc/BZ
+------------------------------------------------------------------
+        Bra
+        Assert
+        abc
+        Ket
+        abc
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?=abc)++abc/BZ
+------------------------------------------------------------------
+        Bra
+        Assert
+        abc
+        Ket
+        abc
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?=abc){0}xyz/BZ
+------------------------------------------------------------------
+        Bra
+        Skip zero
+        Assert
+        abc
+        Ket
+        xyz
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?=(a))?./BZ
+------------------------------------------------------------------
+        Bra
+        Brazero
+        Assert
+        CBra 1
+        a
+        Ket
+        Ket
+        Any
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?=(a))??./BZ
+------------------------------------------------------------------
+        Bra
+        Braminzero
+        Assert
+        CBra 1
+        a
+        Ket
+        Ket
+        Any
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?=(a)){0}b(?1)/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Skip zero
+        Assert
+        CBra 1
+        a
+        Ket
+        Ket
+        b
+        Recurse
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?(DEFINE)(a))?b(?1)/BZ
+------------------------------------------------------------------
+        Bra
+        Cond
+        Cond def
+        CBra 1
+        a
+        Ket
+        Ket
+        b
+        Recurse
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?=(?1))?[az]([abc])d/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Brazero
+        Assert
+        Recurse
+        Ket
+        [az]
+        CBra 1
+        [a-c]
+        Ket
+        d
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?!a){0}\w+/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Skip zero
+        Assert not
+        a
+        Ket
+        \w+
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?<=(abc))?xyz/BZ
+------------------------------------------------------------------
+        Bra
+        Brazero
+        AssertB
+        Reverse
+        CBra 1
+        abc
+        Ket
+        Ket
+        xyz
+        Ket
+        End
+------------------------------------------------------------------
+
+/[:a[:abc]b:]/BZ
+------------------------------------------------------------------
+        Bra
+        [:[a-c]
+        b:]
+        Ket
+        End
+------------------------------------------------------------------
+
+/((?2))((?1))/SS
+    abc
+Error -26 (nested recursion at the same subject position)
+
+/((?(R2)a+|(?1)b))/SS
+    aaaabcde
+Error -26 (nested recursion at the same subject position)
+
+/(?(R)a*(?1)|((?R))b)/SS
+    aaaabcde
+Error -26 (nested recursion at the same subject position)
+
+/(a+|(?R)b)/
+Failed: recursive call could loop indefinitely at offset 7
+
+/^(a(*:A)(d|e(*:B))z|aeq)/C
+    adz
+--->adz
+ +0 ^       ^
+ +1 ^       (a(*:A)(d|e(*:B))z|aeq)
+ +2 ^       a
+ +3 ^^      (*:A)
+ +8 ^^      (d|e(*:B))
+Latest Mark: A
+ +9 ^^      d
++10 ^ ^     |
++18 ^ ^     z
++19 ^  ^    |
++24 ^  ^    
+ 0: adz
+ 1: adz
+ 2: d
+    aez
+--->aez
+ +0 ^       ^
+ +1 ^       (a(*:A)(d|e(*:B))z|aeq)
+ +2 ^       a
+ +3 ^^      (*:A)
+ +8 ^^      (d|e(*:B))
+Latest Mark: A
+ +9 ^^      d
++11 ^^      e
++12 ^ ^     (*:B)
++17 ^ ^     )
+Latest Mark: B
++18 ^ ^     z
++19 ^  ^    |
++24 ^  ^    
+ 0: aez
+ 1: aez
+ 2: e
+    aeqwerty
+--->aeqwerty
+ +0 ^            ^
+ +1 ^            (a(*:A)(d|e(*:B))z|aeq)
+ +2 ^            a
+ +3 ^^           (*:A)
+ +8 ^^           (d|e(*:B))
+Latest Mark: A
+ +9 ^^           d
++11 ^^           e
++12 ^ ^          (*:B)
++17 ^ ^          )
+Latest Mark: B
++18 ^ ^          z
++20 ^            a
++21 ^^           e
++22 ^ ^          q
++23 ^  ^         )
++24 ^  ^         
+ 0: aeq
+ 1: aeq
+
+/.(*F)/
+    \P\Pabc
+No match
+
+/\btype\b\W*?\btext\b\W*?\bjavascript\b/IS
+Capturing subpattern count = 0
+Max lookbehind = 1
+No options
+First char = 't'
+Need char = 't'
+Subject length lower bound = 18
+No set of starting bytes
+
+/\btype\b\W*?\btext\b\W*?\bjavascript\b|\burl\b\W*?\bshell:|<input\b.*?\btype\b\W*?\bimage\b|\bonkeyup\b\W*?\=/IS
+Capturing subpattern count = 0
+Max lookbehind = 1
+No options
+No first char
+No need char
+Subject length lower bound = 8
+Starting byte set: < o t u 
+
+/a(*SKIP)c|b(*ACCEPT)|/+S!I
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Subject length lower bound = -1
+No set of starting bytes
+    a
+ 0: 
+ 0+ 
+
+/a(*SKIP)c|b(*ACCEPT)cd(*ACCEPT)|x/SI
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Subject length lower bound = -1
+Starting byte set: a b x 
+    ax
+ 0: x
+
+'a*(*ACCEPT)b'+
+    \N\N
+No match
+    abc\N\N
+ 0: a
+ 0+ bc
+    bbb\N\N 
+ 0: 
+ 0+ bb
+
+/(*ACCEPT)a/+I
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+    bax
+ 0: 
+ 0+ bax
+
+/z(*ACCEPT)a/+I
+Capturing subpattern count = 0
+No options
+First char = 'z'
+No need char
+    baxzbx
+ 0: z
+ 0+ bx
+
+/a(?:.)*?a/ims                                                                  
+    \Mabbbbbbbbbbbbbbbbbbbbba
+Minimum match() limit = 65
+Minimum match() recursion limit = 2
+ 0: abbbbbbbbbbbbbbbbbbbbba
+    
+/a(?:.(*THEN))*?a/ims
+    \Mabbbbbbbbbbbbbbbbbbbbba
+Minimum match() limit = 86
+Minimum match() recursion limit = 45
+ 0: abbbbbbbbbbbbbbbbbbbbba
+
+/a(?:.(*THEN:ABC))*?a/ims
+    \Mabbbbbbbbbbbbbbbbbbbbba
+Minimum match() limit = 86
+Minimum match() recursion limit = 45
+ 0: abbbbbbbbbbbbbbbbbbbbba
+
+/^(?>a+)(?>(z+))\w/BZ
+------------------------------------------------------------------
+        Bra
+        ^
+        Once_NC
+        a+
+        Ket
+        Once
+        CBra 1
+        z+
+        Ket
+        Ket
+        \w
+        Ket
+        End
+------------------------------------------------------------------
+    aaaazzzzb
+ 0: aaaazzzzb
+ 1: zzzz
+    ** Failers
+No match
+    aazz  
+No match
+
+/(.)(\1|a(?2))/
+    bab
+ 0: bab
+ 1: b
+ 2: ab
+    
+/\1|(.)(?R)\1/
+    cbbbc
+ 0: cbbbc
+ 1: c
+    
+/(.)((?(1)c|a)|a(?2))/
+    baa  
+No match
+
+/(?P<abn>(?P=abn)xxx)/BZ
+------------------------------------------------------------------
+        Bra
+        Once
+        CBra 1
+        \1
+        xxx
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/(a\1z)/BZ
+------------------------------------------------------------------
+        Bra
+        Once
+        CBra 1
+        a
+        \1
+        z
+        Ket
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/^(?>a+)(?>b+)(?>c+)(?>d+)(?>e+)/
+     \Maabbccddee
+Minimum match() limit = 12
+Minimum match() recursion limit = 3
+ 0: aabbccddee
+
+/^(?>(a+))(?>(b+))(?>(c+))(?>(d+))(?>(e+))/
+     \Maabbccddee
+Minimum match() limit = 22
+Minimum match() recursion limit = 21
+ 0: aabbccddee
+ 1: aa
+ 2: bb
+ 3: cc
+ 4: dd
+ 5: ee
+
+/^(?>(a+))(?>b+)(?>(c+))(?>d+)(?>(e+))/
+     \Maabbccddee
+Minimum match() limit = 18
+Minimum match() recursion limit = 13
+ 0: aabbccddee
+ 1: aa
+ 2: cc
+ 3: ee
+
+/^a\x41z/<JS>
+    aAz
+ 0: aAz
+    *** Failers
+No match
+    ax41z
+No match
+
+/^a[m\x41]z/<JS>
+    aAz
+ 0: aAz
+
+/^a\x1z/<JS>
+    ax1z
+ 0: ax1z
+
+/^a\u0041z/<JS>
+    aAz
+ 0: aAz
+    *** Failers
+No match
+    au0041z
+No match
+
+/^a[m\u0041]z/<JS>
+    aAz
+ 0: aAz
+
+/^a\u041z/<JS>
+    au041z
+ 0: au041z
+    *** Failers
+No match
+    aAz
+No match
+
+/^a\U0041z/<JS>
+    aU0041z
+ 0: aU0041z
+    *** Failers
+No match
+    aAz
+No match
+
+/(?(?=c)c|d)++Y/BZ
+------------------------------------------------------------------
+        Bra
+        BraPos
+        Cond
+        Assert
+        c
+        Ket
+        c
+        Alt
+        d
+        Ket
+        KetRpos
+        Y
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?(?=c)c|d)*+Y/BZ
+------------------------------------------------------------------
+        Bra
+        Braposzero
+        BraPos
+        Cond
+        Assert
+        c
+        Ket
+        c
+        Alt
+        d
+        Ket
+        KetRpos
+        Y
+        Ket
+        End
+------------------------------------------------------------------
+
+/a[\NB]c/
+Failed: \N is not supported in a class at offset 3
+
+/a[B-\Nc]/ 
+Failed: \N is not supported in a class at offset 5
+
+/(a)(?2){0,1999}?(b)/
+
+/(a)(?(DEFINE)(b))(?2){0,1999}?(?2)/
+
+/--- This test, with something more complicated than individual letters, causes
+different behaviour in Perl. Perhaps it disables some optimization; no tag is
+passed back for the failures, whereas in PCRE there is a tag. ---/
+    
+/(A|P)(*:A)(B|P) | (X|P)(X|P)(*:B)(Y|P)/xK
+    AABC
+ 0: AB
+ 1: A
+ 2: B
+MK: A
+    XXYZ 
+ 0: XXY
+ 1: <unset>
+ 2: <unset>
+ 3: X
+ 4: X
+ 5: Y
+MK: B
+    ** Failers
+No match
+    XAQQ  
+No match, mark = A
+    XAQQXZZ  
+No match, mark = A
+    AXQQQ 
+No match, mark = A
+    AXXQQQ 
+No match, mark = B
+
+/-- Perl doesn't give marks for these, though it does if the alternatives are
+replaced by single letters. --/
+    
+/(b|q)(*:m)f|a(*:n)w/K
+    aw 
+ 0: aw
+MK: n
+    ** Failers 
+No match, mark = n
+    abc
+No match, mark = m
+
+/(q|b)(*:m)f|a(*:n)w/K
+    aw 
+ 0: aw
+MK: n
+    ** Failers 
+No match, mark = n
+    abc
+No match, mark = m
+
+/-- After a partial match, the behaviour is as for a failure. --/
+
+/^a(*:X)bcde/K
+   abc\P
+Partial match, mark=X: abc
+   
+/-- These are here because Perl doesn't return a mark, except for the first --/
+
+/(?=(*:x))(q|)/K+
+    abc
+ 0: 
+ 0+ abc
+ 1: 
+MK: x
+
+/(?=(*:x))((*:y)q|)/K+
+    abc
+ 0: 
+ 0+ abc
+ 1: 
+MK: x
+
+/(?=(*:x))(?:(*:y)q|)/K+
+    abc
+ 0: 
+ 0+ abc
+MK: x
+
+/(?=(*:x))(?>(*:y)q|)/K+
+    abc
+ 0: 
+ 0+ abc
+MK: x
+
+/(?=a(*:x))(?!a(*:y)c)/K+
+    ab
+ 0: 
+ 0+ ab
+MK: x
+
+/(?=a(*:x))(?=a(*:y)c|)/K+
+    ab
+ 0: 
+ 0+ ab
+MK: x
+
+/(..)\1/
+    ab\P
+Partial match: ab
+    aba\P
+Partial match: aba
+    abab\P
+ 0: abab
+ 1: ab
+
+/(..)\1/i
+    ab\P
+Partial match: ab
+    abA\P
+Partial match: abA
+    aBAb\P
+ 0: aBAb
+ 1: aB
+
+/(..)\1{2,}/
+    ab\P
+Partial match: ab
+    aba\P
+Partial match: aba
+    abab\P
+Partial match: abab
+    ababa\P
+Partial match: ababa
+    ababab\P
+ 0: ababab
+ 1: ab
+    ababab\P\P
+Partial match: ababab
+    abababa\P
+ 0: ababab
+ 1: ab
+    abababa\P\P
+Partial match: abababa
+
+/(..)\1{2,}/i
+    ab\P
+Partial match: ab
+    aBa\P
+Partial match: aBa
+    aBAb\P
+Partial match: aBAb
+    AbaBA\P
+Partial match: AbaBA
+    abABAb\P
+ 0: abABAb
+ 1: ab
+    aBAbaB\P\P
+Partial match: aBAbaB
+    abABabA\P
+ 0: abABab
+ 1: ab
+    abaBABa\P\P
+Partial match: abaBABa
+
+/(..)\1{2,}?x/i
+    ab\P
+Partial match: ab
+    abA\P
+Partial match: abA
+    aBAb\P
+Partial match: aBAb
+    abaBA\P
+Partial match: abaBA
+    abAbaB\P
+Partial match: abAbaB
+    abaBabA\P
+Partial match: abaBabA
+    abAbABaBx\P
+ 0: abAbABaBx
+ 1: ab
+
+/^(..)\1/
+    aba\P
+Partial match: aba
+
+/^(..)\1{2,3}x/
+    aba\P
+Partial match: aba
+    ababa\P
+Partial match: ababa
+    ababa\P\P
+Partial match: ababa
+    abababx
+ 0: abababx
+ 1: ab
+    ababababx  
+ 0: ababababx
+ 1: ab
+
+/^(..)\1{2,3}?x/
+    aba\P
+Partial match: aba
+    ababa\P
+Partial match: ababa
+    ababa\P\P
+Partial match: ababa
+    abababx
+ 0: abababx
+ 1: ab
+    ababababx  
+ 0: ababababx
+ 1: ab
+    
+/^(..)(\1{2,3})ab/
+    abababab
+ 0: abababab
+ 1: ab
+ 2: abab
+
+/^\R/
+    \r\P
+ 0: \x0d
+    \r\P\P
+Partial match: \x0d
+    
+/^\R{2,3}x/
+    \r\P
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P 
+Partial match: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P  
+Partial match: \x0d\x0d\x0d
+    \r\r\r\P\P
+Partial match: \x0d\x0d\x0d
+    \r\rx
+ 0: \x0d\x0dx
+    \r\r\rx    
+ 0: \x0d\x0d\x0dx
+
+/^\R{2,3}?x/
+    \r\P
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P 
+Partial match: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P  
+Partial match: \x0d\x0d\x0d
+    \r\r\r\P\P
+Partial match: \x0d\x0d\x0d
+    \r\rx
+ 0: \x0d\x0dx
+    \r\r\rx    
+ 0: \x0d\x0d\x0dx
+    
+/^\R?x/
+    \r\P
+Partial match: \x0d
+    \r\P\P 
+Partial match: \x0d
+    x
+ 0: x
+    \rx  
+ 0: \x0dx
+
+/^\R+x/
+    \r\P
+Partial match: \x0d
+    \r\P\P 
+Partial match: \x0d
+    \r\n\P
+Partial match: \x0d\x0a
+    \r\n\P\P  
+Partial match: \x0d\x0a
+    \rx  
+ 0: \x0dx
+
+/^a$/<CRLF>
+    a\r\P
+Partial match: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/^a$/m<CRLF>
+    a\r\P
+Partial match: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/^(a$|a\r)/<CRLF>
+    a\r\P
+ 0: a\x0d
+ 1: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/^(a$|a\r)/m<CRLF>
+    a\r\P
+ 0: a\x0d
+ 1: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/./<CRLF>
+    \r\P
+ 0: \x0d
+    \r\P\P 
+Partial match: \x0d
+  
+/.{2,3}/<CRLF>
+    \r\P 
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P
+ 0: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P
+ 0: \x0d\x0d\x0d
+    \r\r\r\P\P     
+Partial match: \x0d\x0d\x0d
+
+/.{2,3}?/<CRLF>
+    \r\P 
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P
+ 0: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P
+ 0: \x0d\x0d
+    \r\r\r\P\P     
+ 0: \x0d\x0d
+
+"AB(C(D))(E(F))?(?(?=\2)(?=\4))"
+    ABCDGHI\O03
+Matched, but too many substrings
+ 0: ABCD
+    
+/-- These are all run as real matches in test 1; here we are just checking the
+settings of the anchored and startline bits. --/ 
+
+/(?>.*?a)(?<=ba)/I
+Capturing subpattern count = 0
+Max lookbehind = 2
+No options
+No first char
+Need char = 'a'
+
+/(?:.*?a)(?<=ba)/I
+Capturing subpattern count = 0
+Max lookbehind = 2
+No options
+First char at start or follows newline
+Need char = 'a'
+
+/.*?a(*PRUNE)b/I
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'b'
+
+/.*?a(*PRUNE)b/sI
+Capturing subpattern count = 0
+Options: dotall
+No first char
+Need char = 'b'
+
+/^a(*PRUNE)b/sI
+Capturing subpattern count = 0
+Options: anchored dotall
+No first char
+No need char
+
+/.*?a(*SKIP)b/I
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'b'
+
+/(?>.*?a)b/sI
+Capturing subpattern count = 0
+Options: dotall
+No first char
+Need char = 'b'
+
+/(?>.*?a)b/I
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'b'
+
+/(?>^a)b/sI
+Capturing subpattern count = 0
+Options: anchored dotall
+No first char
+No need char
+
+/(?>.*?)(?<=(abcd)|(wxyz))/I
+Capturing subpattern count = 2
+Max lookbehind = 4
+No options
+No first char
+No need char
+
+/(?>.*)(?<=(abcd)|(wxyz))/I
+Capturing subpattern count = 2
+Max lookbehind = 4
+No options
+No first char
+No need char
+
+"(?>.*)foo"I
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'o'
+
+"(?>.*?)foo"I
+Capturing subpattern count = 0
+No options
+No first char
+Need char = 'o'
+
+/(?>^abc)/mI
+Capturing subpattern count = 0
+Options: multiline
+First char at start or follows newline
+Need char = 'c'
+
+/(?>.*abc)/mI
+Capturing subpattern count = 0
+Options: multiline
+No first char
+Need char = 'c'
+
+/(?:.*abc)/mI
+Capturing subpattern count = 0
+Options: multiline
+First char at start or follows newline
+Need char = 'c'
+
+/-- Check PCRE_STUDY_EXTRA_NEEDED --/
+
+/.?/S-I
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Study returned NULL
+
+/.?/S!I
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+Subject length lower bound = -1
+No set of starting bytes
+
+/(?:(a)+(?C1)bb|aa(?C2)b)/
+    aab\C+
+Callout 1: last capture = 1
+ 0: <unset>
+ 1: a
+--->aab
+    ^ ^     b
+Callout 1: last capture = 1
+ 0: <unset>
+ 1: a
+--->aab
+    ^^      b
+Callout 2: last capture = -1
+ 0: <unset>
+--->aab
+    ^ ^     b
+ 0: aab
+   
+/(?:(a)++(?C1)bb|aa(?C2)b)/
+    aab\C+ 
+Callout 1: last capture = 1
+ 0: <unset>
+ 1: a
+--->aab
+    ^ ^     b
+Callout 2: last capture = -1
+ 0: <unset>
+--->aab
+    ^ ^     b
+ 0: aab
+    
+/(?:(?>(a))(?C1)bb|aa(?C2)b)/
+    aab\C+ 
+Callout 1: last capture = 1
+ 0: <unset>
+ 1: a
+--->aab
+    ^^      b
+Callout 2: last capture = -1
+ 0: <unset>
+--->aab
+    ^ ^     b
+ 0: aab
+
+/(?:(?1)(?C1)x|ab(?C2))((a)){0}/                                                
+    aab\C+ 
+Callout 1: last capture = -1
+ 0: <unset>
+--->aab
+    ^^      x
+Callout 1: last capture = -1
+ 0: <unset>
+--->aab
+     ^^     x
+Callout 2: last capture = -1
+ 0: <unset>
+--->aab
+     ^ ^    )
+ 0: ab
+
+/(?1)(?C1)((a)(?C2)){0}/   
+    aab\C+ 
+Callout 2: last capture = 2
+ 0: <unset>
+ 1: <unset>
+ 2: a
+--->aab
+    ^^      )
+Callout 1: last capture = -1
+ 0: <unset>
+--->aab
+    ^^      ((a)(?C2)){0}
+ 0: a
+
+/(?:(a)+(?C1)bb|aa(?C2)b)++/
+    aab\C+
+Callout 1: last capture = 1
+ 0: <unset>
+ 1: a
+--->aab
+    ^ ^     b
+Callout 1: last capture = 1
+ 0: <unset>
+ 1: a
+--->aab
+    ^^      b
+Callout 2: last capture = -1
+ 0: <unset>
+--->aab
+    ^ ^     b
+ 0: aab
+    aab\C+\O2
+Callout 1: last capture = 1
+ 0: <unset>
+--->aab
+    ^ ^     b
+Callout 1: last capture = 1
+ 0: <unset>
+--->aab
+    ^^      b
+Callout 2: last capture = -1
+ 0: <unset>
+--->aab
+    ^ ^     b
+ 0: aab
+
+/(ab)x|ab/
+    ab\O3
+ 0: ab
+    ab\O2 
+ 0: ab
+  
+/(ab)/
+    ab\O3
+Matched, but too many substrings
+ 0: ab
+    ab\O2 
+Matched, but too many substrings
+ 0: ab
+    
+/(?<=123)(*MARK:xx)abc/K
+    xxxx123a\P\P
+Partial match at offset 7, mark=xx: 123a
+    xxxx123a\P
+Partial match at offset 7, mark=xx: 123a
+    
+/123\Kabc/
+    xxxx123a\P\P
+Partial match: 123a
+    xxxx123a\P
+Partial match: 123a
+
+/^(?(?=a)aa|bb)/C
+    bb
+--->bb
+ +0 ^      ^
+ +1 ^      (?(?=a)aa|bb)
+ +3 ^      (?=a)
+ +6 ^      a
++11 ^      b
++12 ^^     b
++13 ^ ^    )
++14 ^ ^    
+ 0: bb
+
+/(?C1)^(?C2)(?(?C99)(?=(?C3)a(?C4))(?C5)a(?C6)a(?C7)|(?C8)b(?C9)b(?C10))(?C11)/
+    bb
+--->bb
+  1 ^      ^
+  2 ^      (?(?C99)(?=(?C3)a(?C4))(?C5)a(?C6)a(?C7)|(?C8)b(?C9)b(?C10))
+ 99 ^      (?=(?C3)a(?C4))
+  3 ^      a
+  8 ^      b
+  9 ^^     b
+ 10 ^ ^    )
+ 11 ^ ^    
+ 0: bb
+
+/-- Perl seems to have a bug with this one --/
+
+/aaaaa(*COMMIT)(*PRUNE)b|a+c/
+    aaaaaac
+ 0: aaaac
+    
+/-- Here are some that Perl treats differently because of the way it handles
+backtracking verbs. --/
+
+ /(?!a(*COMMIT)b)ac|ad/
+     ac
+ 0: ac
+     ad 
+ 0: ad
+
+/^(?!a(*THEN)b|ac)../
+     ac
+No match
+     ad 
+ 0: ad
+
+/^(?=a(*THEN)b|ac)/
+    ac
+ 0: 
+    
+/\A.*?(?:a|b(*THEN)c)/
+    ba
+ 0: ba
+
+/\A.*?(?:a|b(*THEN)c)++/
+    ba
+ 0: ba
+
+/\A.*?(?:a|b(*THEN)c|d)/
+    ba
+ 0: ba
+
+/(?:(a(*MARK:X)a+(*SKIP:X)b)){0}(?:(?1)|aac)/
+    aac 
+ 0: aac
+
+/\A.*?(a|b(*THEN)c)/
+    ba
+ 0: ba
+ 1: a
+
+/^(A(*THEN)B|A(*THEN)D)/
+    AD           
+ 0: AD
+ 1: AD
+    
+/(?!b(*THEN)a)bn|bnn/
+    bnn
+ 0: bn
+
+/(?(?=b(*SKIP)a)bn|bnn)/
+    bnn
+No match
+
+/(?=b(*THEN)a|)bn|bnn/
+    bnn
+ 0: bn
+
+/-------------------------/ 
+
+/(*LIMIT_MATCH=12bc)abc/
+Failed: (*VERB) not recognized or malformed at offset 7
+
+/(*LIMIT_MATCH=4294967290)abc/
+Failed: (*VERB) not recognized or malformed at offset 7
+
+/(*LIMIT_RECURSION=4294967280)abc/I
+Capturing subpattern count = 0
+Recursion limit = 4294967280
+No options
+First char = 'a'
+Need char = 'c'
+
+/(a+)*zz/
+    aaaaaaaaaaaaaz
+No match
+    aaaaaaaaaaaaaz\q3000
+Error -8 (match limit exceeded)
+
+/(a+)*zz/S-
+    aaaaaaaaaaaaaz\Q10 
+Error -21 (recursion limit exceeded)
+
+/(*LIMIT_MATCH=3000)(a+)*zz/I
+Capturing subpattern count = 1
+Match limit = 3000
+No options
+No first char
+Need char = 'z'
+    aaaaaaaaaaaaaz
+Error -8 (match limit exceeded)
+    aaaaaaaaaaaaaz\q60000
+Error -8 (match limit exceeded)
+
+/(*LIMIT_MATCH=60000)(*LIMIT_MATCH=3000)(a+)*zz/I
+Capturing subpattern count = 1
+Match limit = 3000
+No options
+No first char
+Need char = 'z'
+    aaaaaaaaaaaaaz
+Error -8 (match limit exceeded)
+
+/(*LIMIT_MATCH=60000)(a+)*zz/I
+Capturing subpattern count = 1
+Match limit = 60000
+No options
+No first char
+Need char = 'z'
+    aaaaaaaaaaaaaz
+No match
+    aaaaaaaaaaaaaz\q3000
+Error -8 (match limit exceeded)
+
+/(*LIMIT_RECURSION=10)(a+)*zz/IS-
+Capturing subpattern count = 1
+Recursion limit = 10
+No options
+No first char
+Need char = 'z'
+Subject length lower bound = 2
+Starting byte set: a z 
+    aaaaaaaaaaaaaz
+Error -21 (recursion limit exceeded)
+    aaaaaaaaaaaaaz\Q1000
+Error -21 (recursion limit exceeded)
+
+/(*LIMIT_RECURSION=10)(*LIMIT_RECURSION=1000)(a+)*zz/IS-
+Capturing subpattern count = 1
+Recursion limit = 10
+No options
+No first char
+Need char = 'z'
+Subject length lower bound = 2
+Starting byte set: a z 
+    aaaaaaaaaaaaaz
+Error -21 (recursion limit exceeded)
+
+/(*LIMIT_RECURSION=1000)(a+)*zz/IS-
+Capturing subpattern count = 1
+Recursion limit = 1000
+No options
+No first char
+Need char = 'z'
+Subject length lower bound = 2
+Starting byte set: a z 
+    aaaaaaaaaaaaaz
+No match
+    aaaaaaaaaaaaaz\Q10
+Error -21 (recursion limit exceeded)
+
+/-- End of testinput2 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput3 b/lib/stdlib/test/re_SUITE_data/testoutput3
index 28b1c3aaaf..7b0a3e926e 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput3
+++ b/lib/stdlib/test/re_SUITE_data/testoutput3
@@ -1,3 +1,7 @@
+/-- This set of tests checks local-specific features, using the fr_FR locale. 
+    It is not Perl-compatible. There is different version called wintestinput3
+  f  or use on Windows, where the locale is called "french". --/
+
 /^[\w]+/
     *** Failers
 No match
@@ -83,6 +87,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P 
   Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z 
 
@@ -91,6 +96,7 @@ Capturing subpattern count = 0
 No options
 No first char
 No need char
+Subject length lower bound = 1
 Starting byte set: 0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P 
   Q R S T U V W X Y Z _ a b c d e f g h i j k l m n o p q r s t u v w x y z 
   � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � � 
@@ -160,4 +166,4 @@ No options
 No first char
 No need char
 
-/ End of testinput3 /
+/-- End of testinput3 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput4 b/lib/stdlib/test/re_SUITE_data/testoutput4
index d87ea4bcc4..6694111fb5 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput4
+++ b/lib/stdlib/test/re_SUITE_data/testoutput4
@@ -1,9 +1,7 @@
-/-- Do not use the \x{} construct except with patterns that have the --/
-/-- /8 option set, because PCRE doesn't recognize them as UTF-8 unless --/
-No match
-/-- that option is set. However, the latest Perls recognize them always. --/
-No match
-
+/-- This set of tests is for UTF support, excluding Unicode properties. It is
+    compatible with all versions of Perl >= 5.10 and both the 8-bit and 16-bit
+    PCRE libraries. --/
+   
 /a.b/8
     acb
  0: acb
@@ -258,46 +256,6 @@ No match
     XYZ 
 No match
 
-/X(\C{3})/8
-    X\x{1234}
- 0: X\x{1234}
- 1: \x{1234}
-
-/X(\C{4})/8
-    X\x{1234}YZ
- 0: X\x{1234}Y
- 1: \x{1234}Y
-    
-/X\C*/8
-    XYZabcdce
- 0: XYZabcdce
-    
-/X\C*?/8
-    XYZabcde
- 0: X
-    
-/X\C{3,5}/8
-    Xabcdefg   
- 0: Xabcde
-    X\x{1234} 
- 0: X\x{1234}
-    X\x{1234}YZ
- 0: X\x{1234}YZ
-    X\x{1234}\x{512}  
- 0: X\x{1234}\x{512}
-    X\x{1234}\x{512}YZ
- 0: X\x{1234}\x{512}
-
-/X\C{3,5}?/8
-    Xabcdefg   
- 0: Xabc
-    X\x{1234} 
- 0: X\x{1234}
-    X\x{1234}YZ
- 0: X\x{1234}
-    X\x{1234}\x{512}  
- 0: X\x{1234}
-
 /[^a]+/8g
     bcd
  0: bcd
@@ -794,22 +752,6 @@ No match
     \x{200}X   
 No match
 
-/a\Cb/
-    aXb
- 0: aXb
-    a\nb
- 0: a\x0ab
-  
-/a\Cb/8
-    aXb
- 0: aXb
-    a\nb
- 0: a\x{0a}b
-    *** Failers 
-No match
-    a\x{100}b 
-No match
-
 /[z-\x{100}]/8i
     z
  0: z
@@ -1071,4 +1013,248 @@ No match
 
 /[^ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞĀĂĄĆĈĊČĎĐĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮİIJĴĶĹĻĽĿŁŃŅŇŊŌŎŐŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŸŹŻŽƁƂƄƆƇƉƊƋƎƏƐƑƓƔƖƗƘƜƝƟƠƢƤƦƧƩƬƮƯƱƲƳƵƷƸƼDŽLJNJǍǏǑǓǕǗǙǛǞǠǢǤǦǨǪǬǮDZǴǶǷǸǺǼǾȀȂȄȆȈȊȌȎȐȒȔȖȘȚȜȞȠȢȤȦȨȪȬȮȰȲȺȻȽȾɁΆΈΉΊΌΎΏΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩΪΫϒϓϔϘϚϜϞϠϢϤϦϨϪϬϮϴϷϹϺϽϾϿЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯѠѢѤѦѨѪѬѮѰѲѴѶѸѺѼѾҀҊҌҎҐҒҔҖҘҚҜҞҠҢҤҦҨҪҬҮҰҲҴҶҸҺҼҾӀӁӃӅӇӉӋӍӐӒӔӖӘӚӜӞӠӢӤӦӨӪӬӮӰӲӴӶӸԀԂԄԆԈԊԌԎԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅḀḂḄḆḈḊḌḎḐḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎṐṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎẐẒẔẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎỐỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸἈἉἊἋἌἍἎἏἘἙἚἛἜἝἨἩἪἫἬἭἮἯἸἹἺἻἼἽἾἿὈὉὊὋὌὍὙὛὝὟὨὩὪὫὬὭὮὯᾸᾹᾺΆῈΈῊΉῘῙῚΊῨῩῪΎῬῸΌῺΏabcdefghijklmnopqrstuvwxyzªµºßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıijĵķĸĺļľŀłńņňʼnŋōŏőœŕŗřśŝşšţťŧũūŭůűųŵŷźżžſƀƃƅƈƌƍƒƕƙƚƛƞơƣƥƨƪƫƭưƴƶƹƺƽƾƿdžljnjǎǐǒǔǖǘǚǜǝǟǡǣǥǧǩǫǭǯǰdzǵǹǻǽǿȁȃȅȇȉȋȍȏȑȓȕȗșțȝȟȡȣȥȧȩȫȭȯȱȳȴȵȶȷȸȹȼȿɀɐɑɒɓɔɕɖɗɘəɚɛɜɝɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀʁʂʃʄʅʆʇʈʉʊʋʌʍʎʏʐʑʒʓʔʕʖʗʘʙʚʛʜʝʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯΐάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώϐϑϕϖϗϙϛϝϟϡϣϥϧϩϫϭϯϰϱϲϳϵϸϻϼабвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљњћќѝўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿҁҋҍҏґғҕҗҙқҝҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӂӄӆӈӊӌӎӑӓӕӗәӛӝӟӡӣӥӧөӫӭӯӱӳӵӷӹԁԃԅԇԉԋԍԏաբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆևᴀᴁᴂᴃᴄᴅᴆᴇᴈᴉᴊᴋᴌᴍᴎᴏᴐᴑᴒᴓᴔᴕᴖᴗᴘᴙᴚᴛᴜᴝᴞᴟᴠᴡᴢᴣᴤᴥᴦᴧᴨᴩᴪᴫᵢᵣᵤᵥᵦᵧᵨᵩᵪᵫᵬᵭᵮᵯᵰᵱᵲᵳᵴᵵᵶᵷᵹᵺᵻᵼᵽᵾᵿᶀᶁᶂᶃᶄᶅᶆᶇᶈᶉᶊᶋᶌᶍᶎᶏᶐᶑᶒᶓᶔᶕᶖᶗᶘᶙᶚḁḃḅḇḉḋḍḏḑḓḕḗḙḛḝḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿṁṃṅṇṉṋṍṏṑṓṕṗṙṛṝṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿẁẃẅẇẉẋẍẏẑẓẕẖẗẘẙẚẛạảấầẩẫậắằẳẵặẹẻẽếềểễệỉịọỏốồổỗộớờởỡợụủứừửữựỳỵỷỹἀἁἂἃἄἅἆἇἐἑἒἓἔἕἠἡἢἣἤἥἦἧἰἱἲἳἴἵἶἷὀὁὂὃὄὅὐὑὒὓὔὕὖὗὠὡὢὣὤὥὦὧὰάὲέὴήὶίὸόὺύὼώᾀᾁᾂᾃᾄᾅᾆᾇᾐᾑᾒᾓᾔᾕᾖᾗᾠᾡᾢᾣᾤᾥᾦᾧᾰᾱᾲᾳᾴᾶᾷιῂῃῄῆῇῐῑῒΐῖῗῠῡῢΰῤῥῦῧῲῳῴῶῷⲁⲃⲅⲇⲉⲋⲍⲏⲑⲓⲕⲗⲙⲛⲝⲟⲡⲣⲥⲧⲩⲫⲭⲯⲱⲳⲵⲷⲹⲻⲽⲿⳁⳃⳅⳇⳉⳋⳍⳏⳑⳓⳕⳗⳙⳛⳝⳟⳡⳣⳤⴀⴁⴂⴃⴄⴅⴆⴇⴈⴉⴊⴋⴌⴍⴎⴏⴐⴑⴒⴓⴔⴕⴖⴗⴘⴙⴚⴛⴜⴝⴞⴟⴠⴡⴢⴣⴤⴥfffiflffifflſtstﬓﬔﬕﬖﬗ\d-_^]/8
 
-/ End of testinput4 /
+/^[^d]*?$/
+    abc
+ 0: abc
+
+/^[^d]*?$/8
+    abc
+ 0: abc
+
+/^[^d]*?$/i
+    abc
+ 0: abc
+
+/^[^d]*?$/8i
+    abc
+ 0: abc
+
+/(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]/8
+
+/^[a\x{c0}]b/8
+    \x{c0}b
+ 0: \x{c0}b
+    
+/^([a\x{c0}]*?)aa/8
+    a\x{c0}aaaa/ 
+ 0: a\x{c0}aa
+ 1: a\x{c0}
+
+/^([a\x{c0}]*?)aa/8
+    a\x{c0}aaaa/ 
+ 0: a\x{c0}aa
+ 1: a\x{c0}
+    a\x{c0}a\x{c0}aaa/ 
+ 0: a\x{c0}a\x{c0}aa
+ 1: a\x{c0}a\x{c0}
+
+/^([a\x{c0}]*)aa/8
+    a\x{c0}aaaa/ 
+ 0: a\x{c0}aaaa
+ 1: a\x{c0}aa
+    a\x{c0}a\x{c0}aaa/ 
+ 0: a\x{c0}a\x{c0}aaa
+ 1: a\x{c0}a\x{c0}a
+
+/^([a\x{c0}]*)a\x{c0}/8
+    a\x{c0}aaaa/ 
+ 0: a\x{c0}
+ 1: 
+    a\x{c0}a\x{c0}aaa/ 
+ 0: a\x{c0}a\x{c0}
+ 1: a\x{c0}
+
+/A*/g8
+    AAB\x{123}BAA
+ 0: AA
+ 0: 
+ 0: 
+ 0: 
+ 0: AA
+ 0: 
+
+/(abc)\1/8i
+   abc
+No match
+
+/(abc)\1/8
+   abc
+No match
+
+/a(*:a\x{1234}b)/8K
+    abc
+ 0: a
+MK: a\x{1234}b
+
+/a(*:a£b)/8K 
+    abc
+ 0: a
+MK: a\x{a3}b
+
+/-- Noncharacters --/
+
+/./8
+    \x{fffe}
+ 0: \x{fffe}
+    \x{ffff}
+ 0: \x{ffff}
+    \x{1fffe}
+ 0: \x{1fffe}
+    \x{1ffff}
+ 0: \x{1ffff}
+    \x{2fffe}
+ 0: \x{2fffe}
+    \x{2ffff}
+ 0: \x{2ffff}
+    \x{3fffe}
+ 0: \x{3fffe}
+    \x{3ffff}
+ 0: \x{3ffff}
+    \x{4fffe}
+ 0: \x{4fffe}
+    \x{4ffff}
+ 0: \x{4ffff}
+    \x{5fffe}
+ 0: \x{5fffe}
+    \x{5ffff}
+ 0: \x{5ffff}
+    \x{6fffe}
+ 0: \x{6fffe}
+    \x{6ffff}
+ 0: \x{6ffff}
+    \x{7fffe}
+ 0: \x{7fffe}
+    \x{7ffff}
+ 0: \x{7ffff}
+    \x{8fffe}
+ 0: \x{8fffe}
+    \x{8ffff}
+ 0: \x{8ffff}
+    \x{9fffe}
+ 0: \x{9fffe}
+    \x{9ffff}
+ 0: \x{9ffff}
+    \x{afffe}
+ 0: \x{afffe}
+    \x{affff}
+ 0: \x{affff}
+    \x{bfffe}
+ 0: \x{bfffe}
+    \x{bffff}
+ 0: \x{bffff}
+    \x{cfffe}
+ 0: \x{cfffe}
+    \x{cffff}
+ 0: \x{cffff}
+    \x{dfffe}
+ 0: \x{dfffe}
+    \x{dffff}
+ 0: \x{dffff}
+    \x{efffe}
+ 0: \x{efffe}
+    \x{effff}
+ 0: \x{effff}
+    \x{ffffe}
+ 0: \x{ffffe}
+    \x{fffff}
+ 0: \x{fffff}
+    \x{10fffe}
+ 0: \x{10fffe}
+    \x{10ffff}
+ 0: \x{10ffff}
+    \x{fdd0}
+ 0: \x{fdd0}
+    \x{fdd1}
+ 0: \x{fdd1}
+    \x{fdd2}
+ 0: \x{fdd2}
+    \x{fdd3}
+ 0: \x{fdd3}
+    \x{fdd4}
+ 0: \x{fdd4}
+    \x{fdd5}
+ 0: \x{fdd5}
+    \x{fdd6}
+ 0: \x{fdd6}
+    \x{fdd7}
+ 0: \x{fdd7}
+    \x{fdd8}
+ 0: \x{fdd8}
+    \x{fdd9}
+ 0: \x{fdd9}
+    \x{fdda}
+ 0: \x{fdda}
+    \x{fddb}
+ 0: \x{fddb}
+    \x{fddc}
+ 0: \x{fddc}
+    \x{fddd}
+ 0: \x{fddd}
+    \x{fdde}
+ 0: \x{fdde}
+    \x{fddf}
+ 0: \x{fddf}
+    \x{fde0}
+ 0: \x{fde0}
+    \x{fde1}
+ 0: \x{fde1}
+    \x{fde2}
+ 0: \x{fde2}
+    \x{fde3}
+ 0: \x{fde3}
+    \x{fde4}
+ 0: \x{fde4}
+    \x{fde5}
+ 0: \x{fde5}
+    \x{fde6}
+ 0: \x{fde6}
+    \x{fde7}
+ 0: \x{fde7}
+    \x{fde8}
+ 0: \x{fde8}
+    \x{fde9}
+ 0: \x{fde9}
+    \x{fdea}
+ 0: \x{fdea}
+    \x{fdeb}
+ 0: \x{fdeb}
+    \x{fdec}
+ 0: \x{fdec}
+    \x{fded}
+ 0: \x{fded}
+    \x{fdee}
+ 0: \x{fdee}
+    \x{fdef}
+ 0: \x{fdef}
+
+/^\d*\w{4}/8
+    1234
+ 0: 1234
+    123 
+No match
+    
+/^[^b]*\w{4}/8
+    aaaa
+ 0: aaaa
+    aaa  
+No match
+ 
+/^[^b]*\w{4}/8i
+    aaaa
+ 0: aaaa
+    aaa  
+No match
+ 
+/^\x{100}*.{4}/8
+    \x{100}\x{100}\x{100}\x{100}
+ 0: \x{100}\x{100}\x{100}\x{100}
+    \x{100}\x{100}\x{100}
+No match
+
+/^\x{100}*.{4}/8i
+    \x{100}\x{100}\x{100}\x{100}
+ 0: \x{100}\x{100}\x{100}\x{100}
+    \x{100}\x{100}\x{100}
+No match
+
+/-- End of testinput4 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput5 b/lib/stdlib/test/re_SUITE_data/testoutput5
index abbe1c87de..d583119dd9 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput5
+++ b/lib/stdlib/test/re_SUITE_data/testoutput5
@@ -1,110 +1,9 @@
-/\x{100}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{100}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 196
-Need char = 128
+/-- This set of tests checks the API, internals, and non-Perl stuff for UTF
+    support, excluding Unicode properties. However, tests that give different
+    results in 8-bit and 16-bit modes are excluded (see tests 16 and 17). --/
 
-/\x{1000}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{1000}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 225
-Need char = 128
-
-/\x{10000}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{10000}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 240
-Need char = 128
-
-/\x{100000}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{100000}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 244
-Need char = 128
-
-/\x{1000000}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{1000000}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 249
-Need char = 128
-
-/\x{4000000}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{4000000}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 252
-Need char = 128
-
-/\x{7fffFFFF}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{7fffffff}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 253
-Need char = 191
-
-/[\x{ff}]/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{ff}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 195
-Need char = 191
-
-/[\x{100}]/8DZ
-------------------------------------------------------------------
-        Bra
-        [\x{100}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-No first char
-No need char
+/\x{110000}/8DZ
+Failed: character value in \x{...} sequence is too large at offset 9
 
 /\x{ffffffff}/8
 Failed: character value in \x{...} sequence is too large at offset 11
@@ -112,34 +11,20 @@ Failed: character value in \x{...} sequence is too large at offset 11
 /\x{100000000}/8
 Failed: character value in \x{...} sequence is too large at offset 12
 
+/\x{d800}/8
+Failed: disallowed Unicode code point (>= 0xd800 && <= 0xdfff) at offset 7
+
+/\x{dfff}/8
+Failed: disallowed Unicode code point (>= 0xd800 && <= 0xdfff) at offset 7
+
+/\x{d7ff}/8
+
+/\x{e000}/8
+
 /^\x{100}a\x{1234}/8
     \x{100}a\x{1234}bcd
  0: \x{100}a\x{1234}
 
-/\x80/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{80}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 194
-Need char = 128
-
-/\xff/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{ff}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 195
-Need char = 191
-
 /\x{0041}\x{2262}\x{0391}\x{002e}/DZ8
 ------------------------------------------------------------------
         Bra
@@ -148,100 +33,12 @@ Need char = 191
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
+Options: utf
 First char = 'A'
 Need char = '.'
     \x{0041}\x{2262}\x{0391}\x{002e}
  0: A\x{2262}\x{391}.
     
-/\x{D55c}\x{ad6d}\x{C5B4}/DZ8 
-------------------------------------------------------------------
-        Bra
-        \x{d55c}\x{ad6d}\x{c5b4}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 237
-Need char = 180
-    \x{D55c}\x{ad6d}\x{C5B4} 
- 0: \x{d55c}\x{ad6d}\x{c5b4}
-
-/\x{65e5}\x{672c}\x{8a9e}/DZ8
-------------------------------------------------------------------
-        Bra
-        \x{65e5}\x{672c}\x{8a9e}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 230
-Need char = 158
-    \x{65e5}\x{672c}\x{8a9e}
- 0: \x{65e5}\x{672c}\x{8a9e}
-
-/\x{80}/DZ8
-------------------------------------------------------------------
-        Bra
-        \x{80}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 194
-Need char = 128
-
-/\x{084}/DZ8
-------------------------------------------------------------------
-        Bra
-        \x{84}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 194
-Need char = 132
-
-/\x{104}/DZ8
-------------------------------------------------------------------
-        Bra
-        \x{104}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 196
-Need char = 132
-
-/\x{861}/DZ8
-------------------------------------------------------------------
-        Bra
-        \x{861}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 224
-Need char = 161
-
-/\x{212ab}/DZ8
-------------------------------------------------------------------
-        Bra
-        \x{212ab}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 240
-Need char = 171
-
 /.{3,5}X/DZ8
 ------------------------------------------------------------------
         Bra
@@ -252,14 +49,12 @@ Need char = 171
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 Need char = 'X'
     \x{212ab}\x{212ab}\x{212ab}\x{861}X
  0: \x{212ab}\x{212ab}\x{212ab}\x{861}X
 
-
 /.{3,5}?/DZ8
 ------------------------------------------------------------------
         Bra
@@ -269,69 +64,15 @@ Need char = 'X'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
     \x{212ab}\x{212ab}\x{212ab}\x{861}
  0: \x{212ab}\x{212ab}\x{212ab}
 
-/-- These tests are here rather than in testinput4 because Perl 5.6 has some
-problems with UTF-8 support, in the area of \x{..} where the value is < 255. 
-It grumbles about invalid UTF-8 strings. --/
-
-/^[a\x{c0}]b/8
-    \x{c0}b
- 0: \x{c0}b
-    
-/^([a\x{c0}]*?)aa/8
-    a\x{c0}aaaa/ 
- 0: a\x{c0}aa
- 1: a\x{c0}
-
-/^([a\x{c0}]*?)aa/8
-    a\x{c0}aaaa/ 
- 0: a\x{c0}aa
- 1: a\x{c0}
-    a\x{c0}a\x{c0}aaa/ 
- 0: a\x{c0}a\x{c0}aa
- 1: a\x{c0}a\x{c0}
-
-/^([a\x{c0}]*)aa/8
-    a\x{c0}aaaa/ 
- 0: a\x{c0}aaaa
- 1: a\x{c0}aa
-    a\x{c0}a\x{c0}aaa/ 
- 0: a\x{c0}a\x{c0}aaa
- 1: a\x{c0}a\x{c0}a
-
-/^([a\x{c0}]*)a\x{c0}/8
-    a\x{c0}aaaa/ 
- 0: a\x{c0}
- 1: 
-    a\x{c0}a\x{c0}aaa/ 
- 0: a\x{c0}a\x{c0}
- 1: a\x{c0}
-    
-/-- --/ 
-    
 /(?<=\C)X/8
 Failed: \C not allowed in lookbehind assertion at offset 6
 
-/-- This one is here not because it's different to Perl, but because the way
-the captured single-byte is displayed. (In Perl it becomes a character, and you
-can't tell the difference.) --/
-    
-/X(\C)(.*)/8
-    X\x{1234}
- 0: X\x{1234}
- 1: \xe1
- 2: \x88\xb4
-    X\nabc 
- 0: X\x{0a}abc
- 1: \x{0a}
- 2: abc
-    
 /^[ab]/8DZ
 ------------------------------------------------------------------
         Bra
@@ -341,7 +82,7 @@ can't tell the difference.) --/
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: anchored utf8
+Options: anchored utf
 No first char
 No need char
     bar
@@ -364,7 +105,7 @@ No match
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: anchored utf8
+Options: anchored utf
 No first char
 No need char
     c
@@ -378,135 +119,6 @@ No need char
     aaa
 No match
   
-/[^ab\xC0-\xF0]/8SDZ
-------------------------------------------------------------------
-        Bra
-        [\x00-`c-\xbf\xf1-\xff] (neg)
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-No first char
-No need char
-Starting byte set: \x00 \x01 \x02 \x03 \x04 \x05 \x06 \x07 \x08 \x09 \x0a 
-  \x0b \x0c \x0d \x0e \x0f \x10 \x11 \x12 \x13 \x14 \x15 \x16 \x17 \x18 \x19 
-  \x1a \x1b \x1c \x1d \x1e \x1f \x20 ! " # $ % & ' ( ) * + , - . / 0 1 2 3 4 
-  5 6 7 8 9 : ; < = > ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y 
-  Z [ \ ] ^ _ ` c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x7f 
-  \xc2 \xc3 \xc4 \xc5 \xc6 \xc7 \xc8 \xc9 \xca \xcb \xcc \xcd \xce \xcf \xd0 
-  \xd1 \xd2 \xd3 \xd4 \xd5 \xd6 \xd7 \xd8 \xd9 \xda \xdb \xdc \xdd \xde \xdf 
-  \xe0 \xe1 \xe2 \xe3 \xe4 \xe5 \xe6 \xe7 \xe8 \xe9 \xea \xeb \xec \xed \xee 
-  \xef \xf0 \xf1 \xf2 \xf3 \xf4 \xf5 \xf6 \xf7 \xf8 \xf9 \xfa \xfb \xfc \xfd 
-  \xfe \xff 
-    \x{f1}
- 0: \x{f1}
-    \x{bf}
- 0: \x{bf}
-    \x{100}
- 0: \x{100}
-    \x{1000}   
- 0: \x{1000}
-    *** Failers
- 0: *
-    \x{c0} 
-No match
-    \x{f0} 
-No match
-
-/Ā{3,4}/8SDZ
-------------------------------------------------------------------
-        Bra
-        \x{100}{3}
-        \x{100}?
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-First char = 196
-Need char = 128
-Study returned NULL
-  \x{100}\x{100}\x{100}\x{100\x{100}
- 0: \x{100}\x{100}\x{100}
-
-/(\x{100}+|x)/8SDZ
-------------------------------------------------------------------
-        Bra
-        CBra 1
-        \x{100}+
-        Alt
-        x
-        Ket
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 1
-Partial matching not supported
-Options: utf8
-No first char
-No need char
-Starting byte set: x \xc4 
-
-/(\x{100}*a|x)/8SDZ
-------------------------------------------------------------------
-        Bra
-        CBra 1
-        \x{100}*+
-        a
-        Alt
-        x
-        Ket
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 1
-Partial matching not supported
-Options: utf8
-No first char
-No need char
-Starting byte set: a x \xc4 
-
-/(\x{100}{0,2}a|x)/8SDZ
-------------------------------------------------------------------
-        Bra
-        CBra 1
-        \x{100}{0,2}
-        a
-        Alt
-        x
-        Ket
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 1
-Partial matching not supported
-Options: utf8
-No first char
-No need char
-Starting byte set: a x \xc4 
-
-/(\x{100}{1,2}a|x)/8SDZ
-------------------------------------------------------------------
-        Bra
-        CBra 1
-        \x{100}
-        \x{100}{0,1}
-        a
-        Alt
-        x
-        Ket
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 1
-Partial matching not supported
-Options: utf8
-No first char
-No need char
-Starting byte set: x \xc4 
-
 /\x{100}*(\d+|"(?1)")/8
     1234
  0: 1234
@@ -531,18 +143,6 @@ No match
     \x{100}\x{100}abcd
 No match
 
-/\x{100}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{100}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 196
-Need char = 128
-
 /\x{100}*/8DZ
 ------------------------------------------------------------------
         Bra
@@ -551,8 +151,7 @@ Need char = 128
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -565,8 +164,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 First char = 'a'
 No need char
 
@@ -579,39 +177,10 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 First char = 'a'
 Need char = 'b'
 
-/a\x{100}\x{101}*/8DZ
-------------------------------------------------------------------
-        Bra
-        a\x{100}
-        \x{101}*
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-First char = 'a'
-Need char = 128
-
-/a\x{100}\x{101}+/8DZ
-------------------------------------------------------------------
-        Bra
-        a\x{100}
-        \x{101}+
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-First char = 'a'
-Need char = 129
-
 /\x{100}*A/8DZ
 ------------------------------------------------------------------
         Bra
@@ -621,8 +190,7 @@ Need char = 129
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 Need char = 'A'
     A
@@ -633,61 +201,14 @@ Need char = 'A'
         Bra
         \x{100}*+
         \d
-        Once
         Recurse
         Ket
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-No first char
-No need char
-
-/[^\x{c4}]/DZ
-------------------------------------------------------------------
-        Bra
-        [^\xc4]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-No options
-No first char
-No need char
-
-/[^\x{c4}]/8DZ
-------------------------------------------------------------------
-        Bra
-        [\x00-\xc3\xc5-\xff] (neg)
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-No first char
-No need char
-
-/[\x{100}]/8DZ
-------------------------------------------------------------------
-        Bra
-        [\x{100}]
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
+Options: utf
 No first char
 No need char
-    \x{100}
- 0: \x{100}
-    Z\x{100}
- 0: \x{100}
-    \x{100}Z
- 0: \x{100}
-    *** Failers 
-No match
 
 /[Z\x{100}]/8DZ
 ------------------------------------------------------------------
@@ -697,7 +218,7 @@ No match
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
+Options: utf
 No first char
 No need char
     Z\x{100}
@@ -732,7 +253,7 @@ No match
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -744,7 +265,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: utf8
+Options: utf
 No first char
 No need char
     \x{100}
@@ -755,35 +276,21 @@ No need char
 /[\xFF]/DZ
 ------------------------------------------------------------------
         Bra
-        \xff
+        \x{ff}
         Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
 No options
-First char = 255
+First char = \xff
 No need char
     >\xff<
  0: \xff
 
-/[\xff]/DZ8
-------------------------------------------------------------------
-        Bra
-        \x{ff}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 195
-Need char = 191
-    >\x{ff}<
- 0: \x{ff}
-
 /[^\xFF]/DZ
 ------------------------------------------------------------------
         Bra
-        [^\xff]
+        [^\x{ff}]
         Ket
         End
 ------------------------------------------------------------------
@@ -792,18 +299,6 @@ No options
 No first char
 No need char
 
-/[^\xff]/8DZ
-------------------------------------------------------------------
-        Bra
-        [\x00-\xfe] (neg)
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-No first char
-No need char
-
 /[Ä-Ü]/8
     Ö # Matches without Study
  0: \x{d6}
@@ -828,99 +323,6 @@ No need char
     \x{d6} 
  0: \x{d6}
 
-/[�]/8
-Failed: invalid UTF-8 string at offset 2
-
-/�/8
-Failed: invalid UTF-8 string at offset 0
-
-/���xxx/8
-Failed: invalid UTF-8 string at offset 1
-
-/���xxx/8?DZ
-------------------------------------------------------------------
-        Bra
-        \X{c0}\X{c0}\X{c0}xxx
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8 no_utf8_check
-First char = 195
-Need char = 'x'
-
-/abc/8
-    �]
-Error -10
-    �
-Error -10
-    ���
-Error -10
-    ���\?
-No match
-
-/anything/8
-    \xc0\x80
-Error -10
-    \xc1\x8f 
-Error -10
-    \xe0\x9f\x80
-Error -10
-    \xf0\x8f\x80\x80 
-Error -10
-    \xf8\x87\x80\x80\x80  
-Error -10
-    \xfc\x83\x80\x80\x80\x80
-Error -10
-    \xfe\x80\x80\x80\x80\x80  
-Error -10
-    \xff\x80\x80\x80\x80\x80  
-Error -10
-    \xc3\x8f
-No match
-    \xe0\xaf\x80
-No match
-    \xe1\x80\x80
-No match
-    \xf0\x9f\x80\x80 
-No match
-    \xf1\x8f\x80\x80 
-No match
-    \xf8\x88\x80\x80\x80  
-Error -10
-    \xf9\x87\x80\x80\x80  
-Error -10
-    \xfc\x84\x80\x80\x80\x80
-Error -10
-    \xfd\x83\x80\x80\x80\x80
-Error -10
-    \?\xf8\x88\x80\x80\x80  
-No match
-    \?\xf9\x87\x80\x80\x80  
-No match
-    \?\xfc\x84\x80\x80\x80\x80
-No match
-    \?\xfd\x83\x80\x80\x80\x80
-No match
-
-/\x{100}abc(xyz(?1))/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{100}abc
-        CBra 1
-        xyz
-        Once
-        Recurse
-        Ket
-        Ket
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 1
-Options: utf8
-First char = 196
-Need char = 'z'
-
 /[^\x{100}]abc(xyz(?1))/8DZ
 ------------------------------------------------------------------
         Bra
@@ -928,15 +330,13 @@ Need char = 'z'
         abc
         CBra 1
         xyz
-        Once
         Recurse
         Ket
         Ket
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
-Options: utf8
+Options: utf
 No first char
 Need char = 'z'
 
@@ -947,15 +347,13 @@ Need char = 'z'
         abc
         CBra 1
         xyz
-        Once
         Recurse
         Ket
         Ket
-        Ket
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 1
-Options: utf8
+Options: utf
 No first char
 Need char = 'z'
 
@@ -967,9 +365,7 @@ Need char = 'z'
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -977,7 +373,7 @@ Need char = 'z'
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -990,9 +386,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1001,9 +395,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1012,7 +404,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1024,9 +416,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1034,7 +424,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1047,9 +437,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1058,9 +446,7 @@ No need char
         \x{100}
         CBra 2
         b
-        Once
         Recurse
-        Ket
         c
         Ket
         Ket
@@ -1069,7 +455,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 2
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1083,10 +469,6 @@ No need char
     \x{100}X   
  0: X
 
-/a\x{1234}b/P8
-    a\x{1234}b
- 0: a\x{1234}b
-
 /^\ሴ/8DZ
 ------------------------------------------------------------------
         Bra
@@ -1096,23 +478,10 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Options: anchored utf8
+Options: anchored utf
 No first char
 No need char
 
-/\777/I
-Failed: octal value is greater than \377 (not in UTF-8 mode) at offset 3
-
-/\777/8I
-Capturing subpattern count = 0
-Options: utf8
-First char = 199
-Need char = 191
-  \x{1ff}
- 0: \x{1ff}
-  \777 
- 0: \x{1ff}
-  
 /\x{100}*\d/8DZ
 ------------------------------------------------------------------
         Bra
@@ -1122,8 +491,7 @@ Need char = 191
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1136,8 +504,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1150,8 +517,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1164,8 +530,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1178,8 +543,7 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
 
@@ -1192,53 +556,10 @@ No need char
         End
 ------------------------------------------------------------------
 Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
+Options: utf
 No first char
 No need char
 
-/\x{100}+\x{200}/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{100}++
-        \x{200}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-First char = 196
-Need char = 128
-
-/\x{100}+X/8DZ
-------------------------------------------------------------------
-        Bra
-        \x{100}++
-        X
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-First char = 196
-Need char = 'X'
-
-/X+\x{200}/8DZ
-------------------------------------------------------------------
-        Bra
-        X++
-        \x{200}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-First char = 'X'
-Need char = 128
-
 /()()()()()()()()()()
  ()()()()()()()()()()
  ()()()()()()()()()()
@@ -1280,9 +601,6 @@ Matched, but too many substrings
         End
 ------------------------------------------------------------------
 
-/^[\QĀ\E-\QŐ\E/BZ8
-Failed: missing terminating ] for character class at offset 15
-
 /^abc./mgx8<any>
     abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
  0: abc1
@@ -1468,7 +786,7 @@ No match
 /[\H]/8BZ
 ------------------------------------------------------------------
         Bra
-        [\x00-\x08\x0a-\x1f!-\x9f\xa1-\xff\x{100}-\x{167f}\x{1681}-\x{180d}\x{180f}-\x{1fff}\x{200b}-\x{202e}\x{2030}-\x{205e}\x{2060}-\x{2fff}\x{3001}-\x{7fffffff}]
+        [\x00-\x08\x0a-\x1f!-\x9f\x{a1}-\x{167f}\x{1681}-\x{180d}\x{180f}-\x{1fff}\x{200b}-\x{202e}\x{2030}-\x{205e}\x{2060}-\x{2fff}\x{3001}-\x{10ffff}]
         Ket
         End
 ------------------------------------------------------------------
@@ -1476,7 +794,7 @@ No match
 /[\V]/8BZ
 ------------------------------------------------------------------
         Bra
-        [\x00-\x09\x0e-\x84\x86-\xff\x{100}-\x{2027}\x{2029}-\x{7fffffff}]
+        [\x00-\x09\x0e-\x84\x{86}-\x{2027}\x{202a}-\x{10ffff}]
         Ket
         End
 ------------------------------------------------------------------
@@ -1485,39 +803,9 @@ No match
     \x{1ec5} 
  0: \x{1ec5}
     
-/-- This tests the stricter UTF-8 check according to RFC 3629. --/ 
-    
-/X/8
-    \x{0}\x{d7ff}\x{e000}\x{10ffff}
-No match
-    \x{d800}
-Error -10
-    \x{d800}\?
-No match
-    \x{da00}
-Error -10
-    \x{da00}\?
-No match
-    \x{dfff}
-Error -10
-    \x{dfff}\?
-No match
-    \x{110000}    
-Error -10
-    \x{110000}\?    
-No match
-    \x{2000000} 
-Error -10
-    \x{2000000}\? 
-No match
-    \x{7fffffff} 
-Error -10
-    \x{7fffffff}\? 
-No match
-
 /a\Rb/I8<bsr_anycrlf>
 Capturing subpattern count = 0
-Options: bsr_anycrlf utf8
+Options: bsr_anycrlf utf
 First char = 'a'
 Need char = 'b'
     a\rb
@@ -1535,7 +823,7 @@ No match
 
 /a\Rb/I8<bsr_unicode>
 Capturing subpattern count = 0
-Options: bsr_unicode utf8
+Options: bsr_unicode utf
 First char = 'a'
 Need char = 'b'
     a\rb
@@ -1557,7 +845,7 @@ No match
     
 /a\R?b/I8<bsr_anycrlf>
 Capturing subpattern count = 0
-Options: bsr_anycrlf utf8
+Options: bsr_anycrlf utf
 First char = 'a'
 Need char = 'b'
     a\rb
@@ -1575,7 +863,7 @@ No match
 
 /a\R?b/I8<bsr_unicode>
 Capturing subpattern count = 0
-Options: bsr_unicode utf8
+Options: bsr_unicode utf
 First char = 'a'
 Need char = 'b'
     a\rb
@@ -1608,4 +896,954 @@ No match
 /[[:a\x{100}b:]]/8
 Failed: unknown POSIX class name at offset 3
 
-/ End of testinput5 /
+/a[^]b/<JS>8
+    a\x{1234}b
+ 0: a\x{1234}b
+    a\nb 
+ 0: a\x{0a}b
+    ** Failers
+No match
+    ab  
+No match
+    
+/a[^]+b/<JS>8
+    aXb
+ 0: aXb
+    a\nX\nX\x{1234}b 
+ 0: a\x{0a}X\x{0a}X\x{1234}b
+    ** Failers
+No match
+    ab  
+No match
+
+/(\x{de})\1/
+    \x{de}\x{de}
+ 0: \xde\xde
+ 1: \xde
+
+/X/8f<any> 
+    A\x{1ec5}ABCXYZ
+ 0: X
+
+/Xa{2,4}b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/Xa{2,4}?b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/Xa{2,4}+b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X\x{123}{2,4}b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X\x{123}{2,4}?b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X\x{123}{2,4}+b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X\x{123}{2,4}b/8
+    Xx\P
+No match
+    X\x{123}x\P
+No match
+    X\x{123}\x{123}x\P 
+No match
+    X\x{123}\x{123}\x{123}x\P
+No match
+    X\x{123}\x{123}\x{123}\x{123}x\P 
+No match
+    
+/X\x{123}{2,4}?b/8
+    Xx\P
+No match
+    X\x{123}x\P
+No match
+    X\x{123}\x{123}x\P 
+No match
+    X\x{123}\x{123}\x{123}x\P
+No match
+    X\x{123}\x{123}\x{123}\x{123}x\P 
+No match
+    
+/X\x{123}{2,4}+b/8
+    Xx\P
+No match
+    X\x{123}x\P
+No match
+    X\x{123}\x{123}x\P 
+No match
+    X\x{123}\x{123}\x{123}x\P
+No match
+    X\x{123}\x{123}\x{123}\x{123}x\P 
+No match
+    
+/X\d{2,4}b/8
+    X\P
+Partial match: X
+    X3\P
+Partial match: X3
+    X33\P 
+Partial match: X33
+    X333\P
+Partial match: X333
+    X3333\P 
+Partial match: X3333
+    
+/X\d{2,4}?b/8
+    X\P
+Partial match: X
+    X3\P
+Partial match: X3
+    X33\P 
+Partial match: X33
+    X333\P
+Partial match: X333
+    X3333\P 
+Partial match: X3333
+    
+/X\d{2,4}+b/8
+    X\P
+Partial match: X
+    X3\P
+Partial match: X3
+    X33\P 
+Partial match: X33
+    X333\P
+Partial match: X333
+    X3333\P 
+Partial match: X3333
+
+/X\D{2,4}b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X\D{2,4}?b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X\D{2,4}+b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+
+/X\D{2,4}b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X\D{2,4}?b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X\D{2,4}+b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+
+/X[abc]{2,4}b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X[abc]{2,4}?b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+    
+/X[abc]{2,4}+b/8
+    X\P
+Partial match: X
+    Xa\P
+Partial match: Xa
+    Xaa\P 
+Partial match: Xaa
+    Xaaa\P
+Partial match: Xaaa
+    Xaaaa\P 
+Partial match: Xaaaa
+
+/X[abc\x{123}]{2,4}b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X[abc\x{123}]{2,4}?b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X[abc\x{123}]{2,4}+b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+
+/X[^a]{2,4}b/8
+    X\P
+Partial match: X
+    Xz\P
+Partial match: Xz
+    Xzz\P 
+Partial match: Xzz
+    Xzzz\P
+Partial match: Xzzz
+    Xzzzz\P 
+Partial match: Xzzzz
+    
+/X[^a]{2,4}?b/8
+    X\P
+Partial match: X
+    Xz\P
+Partial match: Xz
+    Xzz\P 
+Partial match: Xzz
+    Xzzz\P
+Partial match: Xzzz
+    Xzzzz\P 
+Partial match: Xzzzz
+    
+/X[^a]{2,4}+b/8
+    X\P
+Partial match: X
+    Xz\P
+Partial match: Xz
+    Xzz\P 
+Partial match: Xzz
+    Xzzz\P
+Partial match: Xzzz
+    Xzzzz\P 
+Partial match: Xzzzz
+
+/X[^a]{2,4}b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X[^a]{2,4}?b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+    
+/X[^a]{2,4}+b/8
+    X\P
+Partial match: X
+    X\x{123}\P
+Partial match: X\x{123}
+    X\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\P
+Partial match: X\x{123}\x{123}\x{123}
+    X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: X\x{123}\x{123}\x{123}\x{123}
+
+/(Y)X\1{2,4}b/8
+    YX\P
+Partial match: YX
+    YXY\P
+Partial match: YXY
+    YXYY\P 
+Partial match: YXYY
+    YXYYY\P
+Partial match: YXYYY
+    YXYYYY\P 
+Partial match: YXYYYY
+    
+/(Y)X\1{2,4}?b/8
+    YX\P
+Partial match: YX
+    YXY\P
+Partial match: YXY
+    YXYY\P 
+Partial match: YXYY
+    YXYYY\P
+Partial match: YXYYY
+    YXYYYY\P 
+Partial match: YXYYYY
+    
+/(Y)X\1{2,4}+b/8
+    YX\P
+Partial match: YX
+    YXY\P
+Partial match: YXY
+    YXYY\P 
+Partial match: YXYY
+    YXYYY\P
+Partial match: YXYYY
+    YXYYYY\P 
+Partial match: YXYYYY
+
+/(\x{123})X\1{2,4}b/8
+    \x{123}X\P
+Partial match: \x{123}X
+    \x{123}X\x{123}\P
+Partial match: \x{123}X\x{123}
+    \x{123}X\x{123}\x{123}\P 
+Partial match: \x{123}X\x{123}\x{123}
+    \x{123}X\x{123}\x{123}\x{123}\P
+Partial match: \x{123}X\x{123}\x{123}\x{123}
+    \x{123}X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: \x{123}X\x{123}\x{123}\x{123}\x{123}
+    
+/(\x{123})X\1{2,4}?b/8
+    \x{123}X\P
+Partial match: \x{123}X
+    \x{123}X\x{123}\P
+Partial match: \x{123}X\x{123}
+    \x{123}X\x{123}\x{123}\P 
+Partial match: \x{123}X\x{123}\x{123}
+    \x{123}X\x{123}\x{123}\x{123}\P
+Partial match: \x{123}X\x{123}\x{123}\x{123}
+    \x{123}X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: \x{123}X\x{123}\x{123}\x{123}\x{123}
+    
+/(\x{123})X\1{2,4}+b/8
+    \x{123}X\P
+Partial match: \x{123}X
+    \x{123}X\x{123}\P
+Partial match: \x{123}X\x{123}
+    \x{123}X\x{123}\x{123}\P 
+Partial match: \x{123}X\x{123}\x{123}
+    \x{123}X\x{123}\x{123}\x{123}\P
+Partial match: \x{123}X\x{123}\x{123}\x{123}
+    \x{123}X\x{123}\x{123}\x{123}\x{123}\P 
+Partial match: \x{123}X\x{123}\x{123}\x{123}\x{123}
+
+/\bthe cat\b/8
+    the cat\P
+ 0: the cat
+    the cat\P\P
+Partial match: the cat
+
+/abcd*/8
+    xxxxabcd\P
+ 0: abcd
+    xxxxabcd\P\P
+Partial match: abcd
+
+/abcd*/i8
+    xxxxabcd\P
+ 0: abcd
+    xxxxabcd\P\P
+Partial match: abcd
+    XXXXABCD\P
+ 0: ABCD
+    XXXXABCD\P\P
+Partial match: ABCD
+
+/abc\d*/8
+    xxxxabc1\P
+ 0: abc1
+    xxxxabc1\P\P
+Partial match: abc1
+
+/(a)bc\1*/8
+    xxxxabca\P
+ 0: abca
+ 1: a
+    xxxxabca\P\P
+Partial match: abca
+
+/abc[de]*/8
+    xxxxabcde\P
+ 0: abcde
+    xxxxabcde\P\P
+Partial match: abcde
+
+/X\W{3}X/8
+    \PX
+Partial match: X
+
+/\sxxx\s/8T1
+    AB\x{85}xxx\x{a0}XYZ
+ 0: \x{85}xxx\x{a0}
+    AB\x{a0}xxx\x{85}XYZ
+ 0: \x{a0}xxx\x{85}
+
+/\S \S/8T1
+    \x{a2} \x{84} 
+ 0: \x{a2} \x{84}
+
+'A#хц'8x<any>BZ
+------------------------------------------------------------------
+        Bra
+        A
+        Ket
+        End
+------------------------------------------------------------------
+
+'A#хц
+  PQ'8x<any>BZ
+------------------------------------------------------------------
+        Bra
+        APQ
+        Ket
+        End
+------------------------------------------------------------------
+  
+/a+#хaa
+  z#XX?/8x<any>BZ 
+------------------------------------------------------------------
+        Bra
+        a++
+        z
+        Ket
+        End
+------------------------------------------------------------------
+
+/a+#хaa
+  z#х?/8x<any>BZ 
+------------------------------------------------------------------
+        Bra
+        a++
+        z
+        Ket
+        End
+------------------------------------------------------------------
+
+/\g{A}xxx#bXX(?'A'123)
(?'A'456)/8x<any>BZ
+------------------------------------------------------------------
+        Bra
+        \1
+        xxx
+        CBra 1
+        456
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/\g{A}xxx#bх(?'A'123)
(?'A'456)/8x<any>BZ
+------------------------------------------------------------------
+        Bra
+        \1
+        xxx
+        CBra 1
+        456
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/^\cģ/8
+Failed: \c must be followed by an ASCII character at offset 3
+
+/(\R*)(.)/s8
+    \r\n
+ 0: \x{0d}
+ 1: 
+ 2: \x{0d}
+    \r\r\n\n\r 
+ 0: \x{0d}\x{0d}\x{0a}\x{0a}\x{0d}
+ 1: \x{0d}\x{0d}\x{0a}\x{0a}
+ 2: \x{0d}
+    \r\r\n\n\r\n 
+ 0: \x{0d}\x{0d}\x{0a}\x{0a}\x{0d}
+ 1: \x{0d}\x{0d}\x{0a}\x{0a}
+ 2: \x{0d}
+
+/(\R)*(.)/s8
+    \r\n
+ 0: \x{0d}
+ 1: <unset>
+ 2: \x{0d}
+    \r\r\n\n\r 
+ 0: \x{0d}\x{0d}\x{0a}\x{0a}\x{0d}
+ 1: \x{0a}
+ 2: \x{0d}
+    \r\r\n\n\r\n 
+ 0: \x{0d}\x{0d}\x{0a}\x{0a}\x{0d}
+ 1: \x{0a}
+ 2: \x{0d}
+
+/[^\x{1234}]+/iS8I   
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+No need char
+Subject length lower bound = 1
+No set of starting bytes
+
+/[^\x{1234}]+?/iS8I   
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+No need char
+Subject length lower bound = 1
+No set of starting bytes
+
+/[^\x{1234}]++/iS8I   
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+No need char
+Subject length lower bound = 1
+No set of starting bytes
+
+/[^\x{1234}]{2}/iS8I
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+No need char
+Subject length lower bound = 2
+No set of starting bytes
+
+//<bsr_anycrlf><bsr_unicode>
+Failed: inconsistent NEWLINE options at offset 0
+
+/f.*/
+    \P\Pfor
+Partial match: for
+
+/f.*/s
+    \P\Pfor
+Partial match: for
+
+/f.*/8
+    \P\Pfor
+Partial match: for
+
+/f.*/8s
+    \P\Pfor
+Partial match: for
+    
+/\x{d7ff}\x{e000}/8
+
+/\x{d800}/8
+Failed: disallowed Unicode code point (>= 0xd800 && <= 0xdfff) at offset 7
+
+/\x{dfff}/8 
+Failed: disallowed Unicode code point (>= 0xd800 && <= 0xdfff) at offset 7
+
+/\h+/8
+    \x{1681}\x{200b}\x{1680}\x{2000}\x{202f}\x{3000}
+ 0: \x{1680}\x{2000}\x{202f}\x{3000}
+    \x{3001}\x{2fff}\x{200a}\x{a0}\x{2000}
+ 0: \x{200a}\x{a0}\x{2000}
+
+/[\h\x{e000}]+/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x09 \xa0\x{1680}\x{180e}\x{2000}-\x{200a}\x{202f}\x{205f}\x{3000}\x{e000}]+
+        Ket
+        End
+------------------------------------------------------------------
+    \x{1681}\x{200b}\x{1680}\x{2000}\x{202f}\x{3000}
+ 0: \x{1680}\x{2000}\x{202f}\x{3000}
+    \x{3001}\x{2fff}\x{200a}\x{a0}\x{2000}
+ 0: \x{200a}\x{a0}\x{2000}
+
+/\H+/8
+    \x{1680}\x{180e}\x{167f}\x{1681}\x{180d}\x{180f}
+ 0: \x{167f}\x{1681}\x{180d}\x{180f}
+    \x{2000}\x{200a}\x{1fff}\x{200b}
+ 0: \x{1fff}\x{200b}
+    \x{202f}\x{205f}\x{202e}\x{2030}\x{205e}\x{2060}
+ 0: \x{202e}\x{2030}\x{205e}\x{2060}
+    \x{a0}\x{3000}\x{9f}\x{a1}\x{2fff}\x{3001}
+ 0: \x{9f}\x{a1}\x{2fff}\x{3001}
+
+/[\H\x{d7ff}]+/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x08\x0a-\x1f!-\x9f\x{a1}-\x{167f}\x{1681}-\x{180d}\x{180f}-\x{1fff}\x{200b}-\x{202e}\x{2030}-\x{205e}\x{2060}-\x{2fff}\x{3001}-\x{10ffff}\x{d7ff}]+
+        Ket
+        End
+------------------------------------------------------------------
+    \x{1680}\x{180e}\x{167f}\x{1681}\x{180d}\x{180f}
+ 0: \x{167f}\x{1681}\x{180d}\x{180f}
+    \x{2000}\x{200a}\x{1fff}\x{200b}
+ 0: \x{1fff}\x{200b}
+    \x{202f}\x{205f}\x{202e}\x{2030}\x{205e}\x{2060}
+ 0: \x{202e}\x{2030}\x{205e}\x{2060}
+    \x{a0}\x{3000}\x{9f}\x{a1}\x{2fff}\x{3001}
+ 0: \x{9f}\x{a1}\x{2fff}\x{3001}
+
+/\v+/8
+    \x{2027}\x{2030}\x{2028}\x{2029}
+ 0: \x{2028}\x{2029}
+    \x09\x0e\x{84}\x{86}\x{85}\x0a\x0b\x0c\x0d
+ 0: \x{85}\x{0a}\x{0b}\x{0c}\x{0d}
+
+/[\v\x{e000}]+/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x0a-\x0d\x85\x{2028}-\x{2029}\x{e000}]+
+        Ket
+        End
+------------------------------------------------------------------
+    \x{2027}\x{2030}\x{2028}\x{2029}
+ 0: \x{2028}\x{2029}
+    \x09\x0e\x{84}\x{86}\x{85}\x0a\x0b\x0c\x0d
+ 0: \x{85}\x{0a}\x{0b}\x{0c}\x{0d}
+
+/\V+/8
+    \x{2028}\x{2029}\x{2027}\x{2030}
+ 0: \x{2027}\x{2030}
+    \x{85}\x0a\x0b\x0c\x0d\x09\x0e\x{84}\x{86}
+ 0: \x{09}\x{0e}\x{84}\x{86}
+
+/[\V\x{d7ff}]+/8BZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x09\x0e-\x84\x{86}-\x{2027}\x{202a}-\x{10ffff}\x{d7ff}]+
+        Ket
+        End
+------------------------------------------------------------------
+    \x{2028}\x{2029}\x{2027}\x{2030}
+ 0: \x{2027}\x{2030}
+    \x{85}\x0a\x0b\x0c\x0d\x09\x0e\x{84}\x{86}
+ 0: \x{09}\x{0e}\x{84}\x{86}
+
+/\R+/8<bsr_unicode>
+    \x{2027}\x{2030}\x{2028}\x{2029}
+ 0: \x{2028}\x{2029}
+    \x09\x0e\x{84}\x{86}\x{85}\x0a\x0b\x0c\x0d
+ 0: \x{85}\x{0a}\x{0b}\x{0c}\x{0d}
+
+/(..)\1/8
+    ab\P
+Partial match: ab
+    aba\P
+Partial match: aba
+    abab\P
+ 0: abab
+ 1: ab
+
+/(..)\1/8i
+    ab\P
+Partial match: ab
+    abA\P
+Partial match: abA
+    aBAb\P
+ 0: aBAb
+ 1: aB
+
+/(..)\1{2,}/8
+    ab\P
+Partial match: ab
+    aba\P
+Partial match: aba
+    abab\P
+Partial match: abab
+    ababa\P
+Partial match: ababa
+    ababab\P
+ 0: ababab
+ 1: ab
+    ababab\P\P
+Partial match: ababab
+    abababa\P
+ 0: ababab
+ 1: ab
+    abababa\P\P
+Partial match: abababa
+
+/(..)\1{2,}/8i
+    ab\P
+Partial match: ab
+    aBa\P
+Partial match: aBa
+    aBAb\P
+Partial match: aBAb
+    AbaBA\P
+Partial match: AbaBA
+    abABAb\P
+ 0: abABAb
+ 1: ab
+    aBAbaB\P\P
+Partial match: aBAbaB
+    abABabA\P
+ 0: abABab
+ 1: ab
+    abaBABa\P\P
+Partial match: abaBABa
+
+/(..)\1{2,}?x/8i
+    ab\P
+Partial match: ab
+    abA\P
+Partial match: abA
+    aBAb\P
+Partial match: aBAb
+    abaBA\P
+Partial match: abaBA
+    abAbaB\P
+Partial match: abAbaB
+    abaBabA\P
+Partial match: abaBabA
+    abAbABaBx\P
+ 0: abAbABaBx
+ 1: ab
+
+/./8<CRLF>
+    \r\P
+ 0: \x{0d}
+    \r\P\P 
+Partial match: \x{0d}
+  
+/.{2,3}/8<CRLF>
+    \r\P 
+Partial match: \x{0d}
+    \r\P\P
+Partial match: \x{0d}
+    \r\r\P
+ 0: \x{0d}\x{0d}
+    \r\r\P\P
+Partial match: \x{0d}\x{0d}
+    \r\r\r\P
+ 0: \x{0d}\x{0d}\x{0d}
+    \r\r\r\P\P     
+Partial match: \x{0d}\x{0d}\x{0d}
+
+/.{2,3}?/8<CRLF>
+    \r\P 
+Partial match: \x{0d}
+    \r\P\P
+Partial match: \x{0d}
+    \r\r\P
+ 0: \x{0d}\x{0d}
+    \r\r\P\P
+Partial match: \x{0d}\x{0d}
+    \r\r\r\P
+ 0: \x{0d}\x{0d}
+    \r\r\r\P\P     
+ 0: \x{0d}\x{0d}
+
+/[^\x{100}][^\x{1234}][^\x{ffff}][^\x{10000}][^\x{10ffff}]/8BZ
+------------------------------------------------------------------
+        Bra
+        [^\x{100}]
+        [^\x{1234}]
+        [^\x{ffff}]
+        [^\x{10000}]
+        [^\x{10ffff}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^\x{100}][^\x{1234}][^\x{ffff}][^\x{10000}][^\x{10ffff}]/8BZi
+------------------------------------------------------------------
+        Bra
+     /i [^\x{100}]
+     /i [^\x{1234}]
+     /i [^\x{ffff}]
+     /i [^\x{10000}]
+     /i [^\x{10ffff}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^\x{100}]*[^\x{10000}]+[^\x{10ffff}]??[^\x{8000}]{4,}[^\x{7fff}]{2,9}?[^\x{fffff}]{5,6}+/8BZ
+------------------------------------------------------------------
+        Bra
+        [^\x{100}]*
+        [^\x{10000}]+
+        [^\x{10ffff}]??
+        [^\x{8000}]{4}
+        [^\x{8000}]*
+        [^\x{7fff}]{2}
+        [^\x{7fff}]{0,7}?
+        [^\x{fffff}]{5}
+        [^\x{fffff}]?+
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^\x{100}]*[^\x{10000}]+[^\x{10ffff}]??[^\x{8000}]{4,}[^\x{7fff}]{2,9}?[^\x{fffff}]{5,6}+/8BZi
+------------------------------------------------------------------
+        Bra
+     /i [^\x{100}]*
+     /i [^\x{10000}]+
+     /i [^\x{10ffff}]??
+     /i [^\x{8000}]{4}
+     /i [^\x{8000}]*
+     /i [^\x{7fff}]{2}
+     /i [^\x{7fff}]{0,7}?
+        Once
+     /i [^\x{fffff}]{5}
+     /i [^\x{fffff}]?
+        Ket
+        Ket
+        End
+------------------------------------------------------------------
+
+/(?<=\x{1234}\x{1234})\bxy/I8
+Capturing subpattern count = 0
+Max lookbehind = 2
+Options: utf
+First char = 'x'
+Need char = 'y'
+
+/(?<!^)ETA/8
+    ETA
+No match
+
+/\u0100/<JS>8BZ
+------------------------------------------------------------------
+        Bra
+        \x{100}
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\u0100-\u0200]/<JS>8BZ
+------------------------------------------------------------------
+        Bra
+        [\x{100}-\x{200}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/\ud800/<JS>8
+Failed: disallowed Unicode code point (>= 0xd800 && <= 0xdfff) at offset 5
+
+/-- End of testinput5 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput6 b/lib/stdlib/test/re_SUITE_data/testoutput6
index db825b08c1..b1d4579926 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput6
+++ b/lib/stdlib/test/re_SUITE_data/testoutput6
@@ -1,3 +1,6 @@
+/-- This set of tests is for Unicode property support. It is compatible with
+    Perl >= 5.15. --/
+
 /^\pC\pL\pM\pN\pP\pS\pZ</8
     \x7f\x{c0}\x{30f}\x{660}\x{66c}\x{f01}\x{1680}<
  0: \x{7f}\x{c0}\x{30f}\x{660}\x{66c}\x{f01}\x{1680}<
@@ -98,14 +101,6 @@ No match
     \x{09f} 
 No match
   
-/^\p{Cs}/8
-    \?\x{dfff}
- 0: \x{dfff}
-    ** Failers
-No match
-    \x{09f} 
-No match
-  
 /^\p{Ll}/8
     a
  0: a
@@ -338,18 +333,6 @@ No match
     \x{f3b}
 No match
   
-/^\p{Sc}+/8
-    $\x{a2}\x{a3}\x{a4}\x{a5}\x{a6}
- 0: $\x{a2}\x{a3}\x{a4}\x{a5}
-    \x{9f2}
- 0: \x{9f2}
-    ** Failers
-No match
-    X
-No match
-    \x{2c2}
-No match
-  
 /^\p{Sk}/8
     \x{2c2}
  0: \x{2c2}
@@ -402,26 +385,6 @@ No match
     \x{2028}
 No match
   
-/^\p{Zs}/8
-    \ \
- 0:  
-    \x{a0}
- 0: \x{a0}
-    \x{1680}
- 0: \x{1680}
-    \x{180e}
- 0: \x{180e}
-    \x{2000}
- 0: \x{2000}
-    \x{2001}     
- 0: \x{2001}
-    ** Failers
-No match
-    \x{2028}
-No match
-    \x{200d} 
-No match
-  
 /\p{Nd}+(..)/8
       \x{660}\x{661}\x{662}ABC
  0: \x{660}\x{661}\x{662}AB
@@ -494,34 +457,6 @@ No match
       \x{660}\x{661}\x{662}ABC
 No match
   
-/\p{Lu}/8i
-    A
- 0: A
-    a\x{10a0}B 
- 0: \x{10a0}
-    ** Failers 
- 0: F
-    a
-No match
-    \x{1d00}  
-No match
-
-/\p{^Lu}/8i
-    1234
- 0: 1
-    ** Failers
- 0: *
-    ABC 
-No match
-
-/\P{Lu}/8i
-    1234
- 0: 1
-    ** Failers
- 0: *
-    ABC 
-No match
-
 /(?<=A\p{Nd})XYZ/8
     A2XYZ
  0: XYZ
@@ -548,103 +483,6 @@ No match
     WXYZ 
 No match
 
-/[\p{L}]/DZ
-------------------------------------------------------------------
-        Bra
-        [\p{L}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-No options
-No first char
-No need char
-
-/[\p{^L}]/DZ
-------------------------------------------------------------------
-        Bra
-        [\P{L}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-No options
-No first char
-No need char
-
-/[\P{L}]/DZ
-------------------------------------------------------------------
-        Bra
-        [\P{L}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-No options
-No first char
-No need char
-
-/[\P{^L}]/DZ
-------------------------------------------------------------------
-        Bra
-        [\p{L}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-No options
-No first char
-No need char
-
-/[abc\p{L}\x{0660}]/8DZ
-------------------------------------------------------------------
-        Bra
-        [a-c\p{L}\x{660}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-No first char
-No need char
-
-/[\p{Nd}]/8DZ
-------------------------------------------------------------------
-        Bra
-        [\p{Nd}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-No first char
-No need char
-    1234
- 0: 1
-
-/[\p{Nd}+-]+/8DZ
-------------------------------------------------------------------
-        Bra
-        [+\-\p{Nd}]+
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Partial matching not supported
-Options: utf8
-No first char
-No need char
-    1234
- 0: 1234
-    12-34
- 0: 12-34
-    12+\x{661}-34  
- 0: 12+\x{661}-34
-    ** Failers
-No match
-    abcd  
-No match
-
 /[\P{Nd}]+/8
     abcd
  0: abcd
@@ -725,28 +563,6 @@ No match
     ABC   
 No match
 
-/\p{Ll}/8i 
-    a
- 0: a
-    Az
- 0: z
-    ** Failers
- 0: a
-    ABC   
-No match
-
-/^\x{c0}$/8i
-    \x{c0}
- 0: \x{c0}
-    \x{e0} 
- 0: \x{e0}
-
-/^\x{e0}$/8i
-    \x{c0}
- 0: \x{c0}
-    \x{e0} 
- 0: \x{e0}
-
 /A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8
     A\x{391}\x{10427}\x{ff3a}\x{1fb0}
  0: A\x{391}\x{10427}\x{ff3a}\x{1fb0}
@@ -777,54 +593,6 @@ No match
     A\x{391}\x{10427}\x{ff3a}\x{1fb8}
  0: A\x{391}\x{10427}\x{ff3a}\x{1fb8}
 
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8iDZ
-------------------------------------------------------------------
-        Bra
-     NC A\x{391}\x{10427}\x{ff3a}\x{1fb0}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: caseless utf8
-First char = 'A' (caseless)
-No need char
-
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8DZ
-------------------------------------------------------------------
-        Bra
-        A\x{391}\x{10427}\x{ff3a}\x{1fb0}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 'A'
-Need char = 176
-
-/AB\x{1fb0}/8DZ
-------------------------------------------------------------------
-        Bra
-        AB\x{1fb0}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: utf8
-First char = 'A'
-Need char = 176
-
-/AB\x{1fb0}/8DZi
-------------------------------------------------------------------
-        Bra
-     NC AB\x{1fb0}
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: caseless utf8
-First char = 'A' (caseless)
-Need char = 'B' (caseless)
-
 /\x{391}+/8i
     \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}
  0: \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}
@@ -849,98 +617,6 @@ Need char = 'B' (caseless)
     \x{ff5a}   
  0: \x{ff5a}
     
-/[\x{c0}\x{391}]/8i
-    \x{c0}
- 0: \x{c0}
-    \x{e0} 
- 0: \x{e0}
-
-/[\x{105}-\x{109}]/8iDZ
-------------------------------------------------------------------
-        Bra
-        [\x{104}-\x{109}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: caseless utf8
-No first char
-No need char
-    \x{104}
- 0: \x{104}
-    \x{105}
- 0: \x{105}
-    \x{109}  
- 0: \x{109}
-    ** Failers
-No match
-    \x{100}
-No match
-    \x{10a} 
-No match
-    
-/[z-\x{100}]/8iDZ 
-------------------------------------------------------------------
-        Bra
-        [Z\x{39c}\x{178}z-\x{101}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: caseless utf8
-No first char
-No need char
-    Z
- 0: Z
-    z
- 0: z
-    \x{39c}
- 0: \x{39c}
-    \x{178}
- 0: \x{178}
-    |
- 0: |
-    \x{80}
- 0: \x{80}
-    \x{ff}
- 0: \x{ff}
-    \x{100}
- 0: \x{100}
-    \x{101} 
- 0: \x{101}
-    ** Failers
-No match
-    \x{102}
-No match
-    Y
-No match
-    y           
-No match
-
-/[z-\x{100}]/8DZi
-------------------------------------------------------------------
-        Bra
-        [Z\x{39c}\x{178}z-\x{101}]
-        Ket
-        End
-------------------------------------------------------------------
-Capturing subpattern count = 0
-Options: caseless utf8
-No first char
-No need char
-
-/^\X/8
-    A
- 0: A
-    A\x{300}BC 
- 0: A\x{300}
-    A\x{300}\x{301}\x{302}BC 
- 0: A\x{300}\x{301}\x{302}
-    *** Failers
- 0: *
-    \x{300}  
-No match
-
 /^[\X]/8
     X123
  0: X
@@ -1019,7 +695,17 @@ No match
     A\x{300}\x{301}B\x{300}C\x{300}\x{301}DA\x{300}X
  0: A\x{300}\x{301}B\x{300}C
  1: C
-    
+
+/^\X/8
+    A
+ 0: A
+    A\x{300}BC 
+ 0: A\x{300}
+    A\x{300}\x{301}\x{302}BC 
+ 0: A\x{300}\x{301}\x{302}
+    \x{300}  
+ 0: \x{300}
+
 /^\p{Han}+/8
     \x{2e81}\x{3007}\x{2f804}\x{31a0}
  0: \x{2e81}\x{3007}\x{2f804}
@@ -1408,42 +1094,10 @@ No match
  1: L=abc
  2: abc
 
-/The next two should be Perl-compatible, but it fails to match \x{e0}. PCRE
-will match it only with UCP support, because without that it has no notion
-of case for anything other than the ASCII letters. / 
-
-/((?i)[\x{c0}])/8
-    \x{c0}
- 0: \x{c0}
- 1: \x{c0}
-    \x{e0} 
- 0: \x{e0}
- 1: \x{e0}
-
-/(?i:[\x{c0}])/8
-    \x{c0}
- 0: \x{c0}
-    \x{e0} 
- 0: \x{e0}
-    
 /^\p{Balinese}\p{Cuneiform}\p{Nko}\p{Phags_Pa}\p{Phoenician}/8
     \x{1b00}\x{12000}\x{7c0}\x{a840}\x{10900}
  0: \x{1b00}\x{12000}\x{7c0}\x{a840}\x{10900}
 
-/The next two are special cases where the lengths of the different cases of the 
-same character differ. The first went wrong with heap fram storage; the 2nd
-was broken in all cases./
-
-/^\x{023a}+?(\x{0130}+)/8i
-  \x{023a}\x{2c65}\x{0130}
- 0: \x{23a}\x{2c65}\x{130}
- 1: \x{130}
-  
-/^\x{023a}+([^X])/8i
-  \x{023a}\x{2c65}X
- 0: \x{23a}\x{2c65}
- 1: \x{2c65}
-
 /Check property support in non-UTF-8 mode/
  
 /\p{L}{4}/
@@ -1468,61 +1122,9 @@ No match
     A\x80
  0: A\x80
 
-/(?:[\PPa*]*){8,}/
-
-/[\P{Any}]/BZ
-------------------------------------------------------------------
-        Bra
-        [\P{Any}]
-        Ket
-        End
-------------------------------------------------------------------
-
-/[\P{Any}\E]/BZ
-------------------------------------------------------------------
-        Bra
-        [\P{Any}]
-        Ket
-        End
-------------------------------------------------------------------
-
-/(\P{Yi}+\277)/
-
-/(\P{Yi}+\277)?/
-
-/(?<=\P{Yi}{3}A)X/
-
-/\p{Yi}+(\P{Yi}+)(?1)/
-
-/(\P{Yi}{2}\277)?/
-
-/[\P{Yi}A]/
-
-/[\P{Yi}\P{Yi}\P{Yi}A]/
-
-/[^\P{Yi}A]/
-
-/[^\P{Yi}\P{Yi}\P{Yi}A]/
-
-/(\P{Yi}*\277)*/
-
-/(\P{Yi}*?\277)*/
-
-/(\p{Yi}*+\277)*/
-
-/(\P{Yi}?\277)*/
-
-/(\P{Yi}??\277)*/
-
-/(\p{Yi}?+\277)*/
-
-/(\P{Yi}{0,3}\277)*/
-
-/(\P{Yi}{0,3}?\277)*/
-
-/(\p{Yi}{0,3}+\277)*/
-
 /^[\p{Arabic}]/8
+    \x{604}
+ 0: \x{604}
     \x{60e} 
  0: \x{60e}
     \x{656} 
@@ -1543,6 +1145,8 @@ No match
  0: \x{65d}
     \x{65e} 
  0: \x{65e}
+    \x{65f}
+ 0: \x{65f}
     \x{66a} 
  0: \x{66a}
     \x{6e9} 
@@ -1553,8 +1157,6 @@ No match
  0: \x{6fa}
     ** Failers
 No match
-    \x{600}
-No match
     \x{650}
 No match
     \x{651}  
@@ -1567,8 +1169,6 @@ No match
 No match
     \x{655} 
 No match
-    \x{65f}  
-No match
     
 /^\p{Cyrillic}/8
     \x{1d2b} 
@@ -1585,8 +1185,6 @@ No match
  0: \x{964}
     \x{965}  
  0: \x{965}
-    \x{970}  
- 0: \x{970}
 
 /^\p{Inherited}/8
     \x{64b}
@@ -1634,49 +1232,918 @@ No match
     \x{104aa}           
 No match
 
-/\p{Zl}{2,3}+/8BZ
-------------------------------------------------------------------
-        Bra
-        prop Zl {2}
-        prop Zl ?+
-        Ket
-        End
-------------------------------------------------------------------
-    \xe2\x80\xa8\xe2\x80\xa8
- 0: \x{2028}\x{2028}
-    \x{2028}\x{2028}\x{2028}
- 0: \x{2028}\x{2028}\x{2028}
+/\p{Carian}\p{Cham}\p{Kayah_Li}\p{Lepcha}\p{Lycian}\p{Lydian}\p{Ol_Chiki}\p{Rejang}\p{Saurashtra}\p{Sundanese}\p{Vai}/8
+    \x{102A4}\x{AA52}\x{A91D}\x{1C46}\x{10283}\x{1092E}\x{1C6B}\x{A93B}\x{A8BF}\x{1BA0}\x{A50A}====
+ 0: \x{102a4}\x{aa52}\x{a91d}\x{1c46}\x{10283}\x{1092e}\x{1c6b}\x{a93b}\x{a8bf}\x{1ba0}\x{a50a}
+
+/\x{a77d}\x{1d79}/8i
+    \x{a77d}\x{1d79}
+ 0: \x{a77d}\x{1d79}
+    \x{1d79}\x{a77d} 
+ 0: \x{1d79}\x{a77d}
+
+/\x{a77d}\x{1d79}/8
+    \x{a77d}\x{1d79}
+ 0: \x{a77d}\x{1d79}
+    ** Failers 
+No match
+    \x{1d79}\x{a77d} 
+No match
+
+/(A)\1/8i
+    AA
+ 0: AA
+ 1: A
+    Aa
+ 0: Aa
+ 1: A
+    aa
+ 0: aa
+ 1: a
+    aA
+ 0: aA
+ 1: a
+
+/(\x{10a})\1/8i
+    \x{10a}\x{10a}
+ 0: \x{10a}\x{10a}
+ 1: \x{10a}
+    \x{10a}\x{10b}
+ 0: \x{10a}\x{10b}
+ 1: \x{10a}
+    \x{10b}\x{10b}
+ 0: \x{10b}\x{10b}
+ 1: \x{10b}
+    \x{10b}\x{10a}
+ 0: \x{10b}\x{10a}
+ 1: \x{10b}
+    
+/The next two tests are for property support in non-UTF-8 mode/
+
+/(?:\p{Lu}|\x20)+/
+    \x41\x20\x50\xC2\x54\xC9\x20\x54\x4F\x44\x41\x59
+ 0: A P\xc2T\xc9 TODAY
+
+/[\p{Lu}\x20]+/
+    \x41\x20\x50\xC2\x54\xC9\x20\x54\x4F\x44\x41\x59
+ 0: A P\xc2T\xc9 TODAY
+
+/\p{Avestan}\p{Bamum}\p{Egyptian_Hieroglyphs}\p{Imperial_Aramaic}\p{Inscriptional_Pahlavi}\p{Inscriptional_Parthian}\p{Javanese}\p{Kaithi}\p{Lisu}\p{Meetei_Mayek}\p{Old_South_Arabian}\p{Old_Turkic}\p{Samaritan}\p{Tai_Tham}\p{Tai_Viet}/8
+    \x{10b00}\x{a6ef}\x{13007}\x{10857}\x{10b78}\x{10b58}\x{a980}\x{110c1}\x{a4ff}\x{abc0}\x{10a7d}\x{10c48}\x{0800}\x{1aad}\x{aac0}
+ 0: \x{10b00}\x{a6ef}\x{13007}\x{10857}\x{10b78}\x{10b58}\x{a980}\x{110c1}\x{a4ff}\x{abc0}\x{10a7d}\x{10c48}\x{800}\x{1aad}\x{aac0}
+
+/^\w+/8W
+    Az_\x{aa}\x{c0}\x{1c5}\x{2b0}\x{3b6}\x{1d7c9}\x{2fa1d}1\x{660}\x{bef}\x{16ee}
+ 0: Az_\x{aa}\x{c0}\x{1c5}\x{2b0}\x{3b6}\x{1d7c9}\x{2fa1d}1\x{660}\x{bef}\x{16ee}
+
+/^[[:xdigit:]]*/8W
+    1a\x{660}\x{bef}\x{16ee}
+ 0: 1a
+  
+/^\d+/8W
+    1\x{660}\x{bef}\x{16ee}
+ 0: 1\x{660}\x{bef}
+  
+/^[[:digit:]]+/8W
+    1\x{660}\x{bef}\x{16ee}
+ 0: 1\x{660}\x{bef}
+
+/^>\s+/8W
+    >\x{20}\x{a0}\x{1680}\x{2028}\x{2029}\x{202f}\x{9}\x{b} 
+ 0: > \x{a0}\x{1680}\x{2028}\x{2029}\x{202f}\x{09}
+  
+/^>\pZ+/8W
+    >\x{20}\x{a0}\x{1680}\x{2028}\x{2029}\x{202f}\x{9}\x{b} 
+ 0: > \x{a0}\x{1680}\x{2028}\x{2029}\x{202f}
+  
+/^>[[:space:]]*/8W
+    >\x{20}\x{a0}\x{1680}\x{2028}\x{2029}\x{202f}\x{9}\x{b} 
+ 0: > \x{a0}\x{1680}\x{2028}\x{2029}\x{202f}\x{09}\x{0b}
+
+/^>[[:blank:]]*/8W
+    >\x{20}\x{a0}\x{1680}\x{180e}\x{2000}\x{202f}\x{9}\x{b}\x{2028} 
+ 0: > \x{a0}\x{1680}\x{180e}\x{2000}\x{202f}\x{09}
+
+/^[[:alpha:]]*/8W
+    Az\x{aa}\x{c0}\x{1c5}\x{2b0}\x{3b6}\x{1d7c9}\x{2fa1d}
+ 0: Az\x{aa}\x{c0}\x{1c5}\x{2b0}\x{3b6}\x{1d7c9}\x{2fa1d}
+
+/^[[:alnum:]]*/8W
+    Az\x{aa}\x{c0}\x{1c5}\x{2b0}\x{3b6}\x{1d7c9}\x{2fa1d}1\x{660}\x{bef}\x{16ee}
+ 0: Az\x{aa}\x{c0}\x{1c5}\x{2b0}\x{3b6}\x{1d7c9}\x{2fa1d}1\x{660}\x{bef}\x{16ee}
+
+/^[[:cntrl:]]*/8W
+    \x{0}\x{09}\x{1f}\x{7f}\x{9f} 
+ 0: \x{00}\x{09}\x{1f}\x{7f}
+
+/^[[:graph:]]*/8W
+    A\x{a1}\x{a0}
+ 0: A
+
+/^[[:print:]]*/8W
+    A z\x{a0}\x{a1}
+ 0: A z
+
+/^[[:punct:]]*/8W
+    .+\x{a1}\x{a0}
+ 0: .+
+
+/\p{Zs}*?\R/
+    ** Failers
+No match
+    a\xFCb   
+No match
+
+/\p{Zs}*\R/                                                                    
+    ** Failers 
+No match
+    a\xFCb   
+No match
+
+/ⱥ/8i
+    ⱥ
+ 0: \x{2c65}
+    Ⱥx 
+ 0: \x{23a}
+    Ⱥ 
+ 0: \x{23a}
+
+/[ⱥ]/8i
+    ⱥ
+ 0: \x{2c65}
+    Ⱥx 
+ 0: \x{23a}
+    Ⱥ 
+ 0: \x{23a}
+
+/Ⱥ/8i
+    Ⱥ
+ 0: \x{23a}
+    ⱥ
+ 0: \x{2c65}
+    
+/-- These are tests for extended grapheme clusters --/ 
+
+/^\X/8+
+    G\x{34e}\x{34e}X
+ 0: G\x{34e}\x{34e}
+ 0+ X
+    \x{34e}\x{34e}X
+ 0: \x{34e}\x{34e}
+ 0+ X
+    \x04X
+ 0: \x{04}
+ 0+ X
+    \x{1100}X
+ 0: \x{1100}
+ 0+ X
+    \x{1100}\x{34e}X
+ 0: \x{1100}\x{34e}
+ 0+ X
+    \x{1b04}\x{1b04}X 
+ 0: \x{1b04}\x{1b04}
+ 0+ X
+    *These match up to the roman letters
+ 0: *
+ 0+ These match up to the roman letters
+    \x{1111}\x{1111}L,L
+ 0: \x{1111}\x{1111}
+ 0+ L,L
+    \x{1111}\x{1111}\x{1169}L,L,V
+ 0: \x{1111}\x{1111}\x{1169}
+ 0+ L,L,V
+    \x{1111}\x{ae4c}L, LV
+ 0: \x{1111}\x{ae4c}
+ 0+ L, LV
+    \x{1111}\x{ad89}L, LVT
+ 0: \x{1111}\x{ad89}
+ 0+ L, LVT
+    \x{1111}\x{ae4c}\x{1169}L, LV, V
+ 0: \x{1111}\x{ae4c}\x{1169}
+ 0+ L, LV, V
+    \x{1111}\x{ae4c}\x{1169}\x{1169}L, LV, V, V
+ 0: \x{1111}\x{ae4c}\x{1169}\x{1169}
+ 0+ L, LV, V, V
+    \x{1111}\x{ae4c}\x{1169}\x{11fe}L, LV, V, T
+ 0: \x{1111}\x{ae4c}\x{1169}\x{11fe}
+ 0+ L, LV, V, T
+    \x{1111}\x{ad89}\x{11fe}L, LVT, T
+ 0: \x{1111}\x{ad89}\x{11fe}
+ 0+ L, LVT, T
+    \x{1111}\x{ad89}\x{11fe}\x{11fe}L, LVT, T, T
+ 0: \x{1111}\x{ad89}\x{11fe}\x{11fe}
+ 0+ L, LVT, T, T
+    \x{ad89}\x{11fe}\x{11fe}LVT, T, T
+ 0: \x{ad89}\x{11fe}\x{11fe}
+ 0+ LVT, T, T
+    *These match just the first codepoint (invalid sequence)
+ 0: *
+ 0+ These match just the first codepoint (invalid sequence)
+    \x{1111}\x{11fe}L, T
+ 0: \x{1111}
+ 0+ \x{11fe}L, T
+    \x{ae4c}\x{1111}LV, L
+ 0: \x{ae4c}
+ 0+ \x{1111}LV, L
+    \x{ae4c}\x{ae4c}LV, LV
+ 0: \x{ae4c}
+ 0+ \x{ae4c}LV, LV
+    \x{ae4c}\x{ad89}LV, LVT
+ 0: \x{ae4c}
+ 0+ \x{ad89}LV, LVT
+    \x{1169}\x{1111}V, L
+ 0: \x{1169}
+ 0+ \x{1111}V, L
+    \x{1169}\x{ae4c}V, LV
+ 0: \x{1169}
+ 0+ \x{ae4c}V, LV
+    \x{1169}\x{ad89}V, LVT
+ 0: \x{1169}
+ 0+ \x{ad89}V, LVT
+    \x{ad89}\x{1111}LVT, L
+ 0: \x{ad89}
+ 0+ \x{1111}LVT, L
+    \x{ad89}\x{1169}LVT, V
+ 0: \x{ad89}
+ 0+ \x{1169}LVT, V
+    \x{ad89}\x{ae4c}LVT, LV
+ 0: \x{ad89}
+ 0+ \x{ae4c}LVT, LV
+    \x{ad89}\x{ad89}LVT, LVT
+ 0: \x{ad89}
+ 0+ \x{ad89}LVT, LVT
+    \x{11fe}\x{1111}T, L
+ 0: \x{11fe}
+ 0+ \x{1111}T, L
+    \x{11fe}\x{1169}T, V
+ 0: \x{11fe}
+ 0+ \x{1169}T, V
+    \x{11fe}\x{ae4c}T, LV
+ 0: \x{11fe}
+ 0+ \x{ae4c}T, LV
+    \x{11fe}\x{ad89}T, LVT
+ 0: \x{11fe}
+ 0+ \x{ad89}T, LVT
+    *Test extend and spacing mark
+ 0: *
+ 0+ Test extend and spacing mark
+    \x{1111}\x{ae4c}\x{0711}L, LV, extend
+ 0: \x{1111}\x{ae4c}\x{711}
+ 0+ L, LV, extend
+    \x{1111}\x{ae4c}\x{1b04}L, LV, spacing mark
+ 0: \x{1111}\x{ae4c}\x{1b04}
+ 0+ L, LV, spacing mark
+    \x{1111}\x{ae4c}\x{1b04}\x{0711}\x{1b04}L, LV, spacing mark, extend, spacing mark
+ 0: \x{1111}\x{ae4c}\x{1b04}\x{711}\x{1b04}
+ 0+ L, LV, spacing mark, extend, spacing mark
+    *Test CR, LF, and control
+ 0: *
+ 0+ Test CR, LF, and control
+    \x0d\x{0711}CR, extend
+ 0: \x{0d}
+ 0+ \x{711}CR, extend
+    \x0d\x{1b04}CR, spacingmark
+ 0: \x{0d}
+ 0+ \x{1b04}CR, spacingmark
+    \x0a\x{0711}LF, extend
+ 0: \x{0a}
+ 0+ \x{711}LF, extend
+    \x0a\x{1b04}LF, spacingmark
+ 0: \x{0a}
+ 0+ \x{1b04}LF, spacingmark
+    \x0b\x{0711}Control, extend
+ 0: \x{0b}
+ 0+ \x{711}Control, extend
+    \x09\x{1b04}Control, spacingmark
+ 0: \x{09}
+ 0+ \x{1b04}Control, spacingmark
+    *There are no Prepend characters, so we can't test Prepend, CR
+ 0: *
+ 0+ There are no Prepend characters, so we can't test Prepend, CR
+    
+/^(?>\X{2})X/8+
+    \x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0: \x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0+ 
+    
+/^\X{2,4}X/8+
+    \x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0: \x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0+ 
+    \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0: \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0+ 
+    \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0: \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0+ 
+
+/^\X{2,4}?X/8+
+    \x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0: \x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0+ 
+    \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0: \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0+ 
+    \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0: \x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}\x{1111}\x{ae4c}X
+ 0+ 
+
+/-- --/
+
+/\x{1e9e}+/8i
+    \x{1e9e}\x{00df}
+ 0: \x{1e9e}\x{df}
+
+/[z\x{1e9e}]+/8i
+    \x{1e9e}\x{00df}
+ 0: \x{1e9e}\x{df}
+
+/\x{00df}+/8i
+    \x{1e9e}\x{00df}
+ 0: \x{1e9e}\x{df}
+
+/[z\x{00df}]+/8i
+    \x{1e9e}\x{00df}
+ 0: \x{1e9e}\x{df}
+
+/\x{1f88}+/8i
+    \x{1f88}\x{1f80} 
+ 0: \x{1f88}\x{1f80}
+
+/[z\x{1f88}]+/8i
+    \x{1f88}\x{1f80} 
+ 0: \x{1f88}\x{1f80}
+    
+/-- Characters with more than one other case; test in classes --/
+
+/[z\x{00b5}]+/8i
+    \x{00b5}\x{039c}\x{03bc}
+ 0: \x{b5}\x{39c}\x{3bc}
+
+/[z\x{039c}]+/8i
+    \x{00b5}\x{039c}\x{03bc}
+ 0: \x{b5}\x{39c}\x{3bc}
+
+/[z\x{03bc}]+/8i
+    \x{00b5}\x{039c}\x{03bc}
+ 0: \x{b5}\x{39c}\x{3bc}
+
+/[z\x{00c5}]+/8i
+    \x{00c5}\x{00e5}\x{212b}
+ 0: \x{c5}\x{e5}\x{212b}
+
+/[z\x{00e5}]+/8i
+    \x{00c5}\x{00e5}\x{212b}
+ 0: \x{c5}\x{e5}\x{212b}
+
+/[z\x{212b}]+/8i
+    \x{00c5}\x{00e5}\x{212b}
+ 0: \x{c5}\x{e5}\x{212b}
+
+/[z\x{01c4}]+/8i
+    \x{01c4}\x{01c5}\x{01c6}
+ 0: \x{1c4}\x{1c5}\x{1c6}
+
+/[z\x{01c5}]+/8i
+    \x{01c4}\x{01c5}\x{01c6}
+ 0: \x{1c4}\x{1c5}\x{1c6}
+
+/[z\x{01c6}]+/8i
+    \x{01c4}\x{01c5}\x{01c6}
+ 0: \x{1c4}\x{1c5}\x{1c6}
+
+/[z\x{01c7}]+/8i
+    \x{01c7}\x{01c8}\x{01c9}
+ 0: \x{1c7}\x{1c8}\x{1c9}
+
+/[z\x{01c8}]+/8i
+    \x{01c7}\x{01c8}\x{01c9}
+ 0: \x{1c7}\x{1c8}\x{1c9}
+
+/[z\x{01c9}]+/8i
+    \x{01c7}\x{01c8}\x{01c9}
+ 0: \x{1c7}\x{1c8}\x{1c9}
+
+/[z\x{01ca}]+/8i
+    \x{01ca}\x{01cb}\x{01cc}
+ 0: \x{1ca}\x{1cb}\x{1cc}
+
+/[z\x{01cb}]+/8i
+    \x{01ca}\x{01cb}\x{01cc}
+ 0: \x{1ca}\x{1cb}\x{1cc}
+
+/[z\x{01cc}]+/8i
+    \x{01ca}\x{01cb}\x{01cc}
+ 0: \x{1ca}\x{1cb}\x{1cc}
+
+/[z\x{01f1}]+/8i
+    \x{01f1}\x{01f2}\x{01f3}
+ 0: \x{1f1}\x{1f2}\x{1f3}
+
+/[z\x{01f2}]+/8i
+    \x{01f1}\x{01f2}\x{01f3}
+ 0: \x{1f1}\x{1f2}\x{1f3}
+
+/[z\x{01f3}]+/8i
+    \x{01f1}\x{01f2}\x{01f3}
+ 0: \x{1f1}\x{1f2}\x{1f3}
+
+/[z\x{0345}]+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+/[z\x{0399}]+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+/[z\x{03b9}]+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+/[z\x{1fbe}]+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+/[z\x{0392}]+/8i
+    \x{0392}\x{03b2}\x{03d0}
+ 0: \x{392}\x{3b2}\x{3d0}
+
+/[z\x{03b2}]+/8i
+    \x{0392}\x{03b2}\x{03d0}
+ 0: \x{392}\x{3b2}\x{3d0}
+
+/[z\x{03d0}]+/8i
+    \x{0392}\x{03b2}\x{03d0}
+ 0: \x{392}\x{3b2}\x{3d0}
+
+/[z\x{0395}]+/8i
+    \x{0395}\x{03b5}\x{03f5}
+ 0: \x{395}\x{3b5}\x{3f5}
+
+/[z\x{03b5}]+/8i
+    \x{0395}\x{03b5}\x{03f5}
+ 0: \x{395}\x{3b5}\x{3f5}
+
+/[z\x{03f5}]+/8i
+    \x{0395}\x{03b5}\x{03f5}
+ 0: \x{395}\x{3b5}\x{3f5}
+
+/[z\x{0398}]+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+
+/[z\x{03b8}]+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+
+/[z\x{03d1}]+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+
+/[z\x{03f4}]+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+
+/[z\x{039a}]+/8i
+    \x{039a}\x{03ba}\x{03f0}
+ 0: \x{39a}\x{3ba}\x{3f0}
+
+/[z\x{03ba}]+/8i
+    \x{039a}\x{03ba}\x{03f0}
+ 0: \x{39a}\x{3ba}\x{3f0}
+
+/[z\x{03f0}]+/8i
+    \x{039a}\x{03ba}\x{03f0}
+ 0: \x{39a}\x{3ba}\x{3f0}
+
+/[z\x{03a0}]+/8i
+    \x{03a0}\x{03c0}\x{03d6} 
+ 0: \x{3a0}\x{3c0}\x{3d6}
+
+/[z\x{03c0}]+/8i
+    \x{03a0}\x{03c0}\x{03d6} 
+ 0: \x{3a0}\x{3c0}\x{3d6}
+
+/[z\x{03d6}]+/8i
+    \x{03a0}\x{03c0}\x{03d6} 
+ 0: \x{3a0}\x{3c0}\x{3d6}
+
+/[z\x{03a1}]+/8i
+    \x{03a1}\x{03c1}\x{03f1}
+ 0: \x{3a1}\x{3c1}\x{3f1}
+
+/[z\x{03c1}]+/8i
+    \x{03a1}\x{03c1}\x{03f1}
+ 0: \x{3a1}\x{3c1}\x{3f1}
+
+/[z\x{03f1}]+/8i
+    \x{03a1}\x{03c1}\x{03f1}
+ 0: \x{3a1}\x{3c1}\x{3f1}
+
+/[z\x{03a3}]+/8i
+    \x{03A3}\x{03C2}\x{03C3}
+ 0: \x{3a3}\x{3c2}\x{3c3}
+
+/[z\x{03c2}]+/8i
+    \x{03A3}\x{03C2}\x{03C3}
+ 0: \x{3a3}\x{3c2}\x{3c3}
+
+/[z\x{03c3}]+/8i
+    \x{03A3}\x{03C2}\x{03C3}
+ 0: \x{3a3}\x{3c2}\x{3c3}
+
+/[z\x{03a6}]+/8i
+    \x{03a6}\x{03c6}\x{03d5} 
+ 0: \x{3a6}\x{3c6}\x{3d5}
+
+/[z\x{03c6}]+/8i
+    \x{03a6}\x{03c6}\x{03d5} 
+ 0: \x{3a6}\x{3c6}\x{3d5}
+
+/[z\x{03d5}]+/8i
+    \x{03a6}\x{03c6}\x{03d5} 
+ 0: \x{3a6}\x{3c6}\x{3d5}
+
+/[z\x{03c9}]+/8i
+    \x{03c9}\x{03a9}\x{2126}
+ 0: \x{3c9}\x{3a9}\x{2126}
+
+/[z\x{03a9}]+/8i
+    \x{03c9}\x{03a9}\x{2126}
+ 0: \x{3c9}\x{3a9}\x{2126}
+
+/[z\x{2126}]+/8i
+    \x{03c9}\x{03a9}\x{2126}
+ 0: \x{3c9}\x{3a9}\x{2126}
+
+/[z\x{1e60}]+/8i
+    \x{1e60}\x{1e61}\x{1e9b}
+ 0: \x{1e60}\x{1e61}\x{1e9b}
+
+/[z\x{1e61}]+/8i
+    \x{1e60}\x{1e61}\x{1e9b}
+ 0: \x{1e60}\x{1e61}\x{1e9b}
+
+/[z\x{1e9b}]+/8i
+    \x{1e60}\x{1e61}\x{1e9b}
+ 0: \x{1e60}\x{1e61}\x{1e9b}
+
+/-- Perl 5.12.4 gets these wrong, but 5.15.3 is OK --/
+
+/[z\x{004b}]+/8i
+    \x{004b}\x{006b}\x{212a}
+ 0: Kk\x{212a}
+
+/[z\x{006b}]+/8i
+    \x{004b}\x{006b}\x{212a}
+ 0: Kk\x{212a}
+
+/[z\x{212a}]+/8i
+    \x{004b}\x{006b}\x{212a}
+ 0: Kk\x{212a}
+
+/[z\x{0053}]+/8i
+    \x{0053}\x{0073}\x{017f}
+ 0: Ss\x{17f}
+
+/[z\x{0073}]+/8i
+    \x{0053}\x{0073}\x{017f}
+ 0: Ss\x{17f}
+
+/[z\x{017f}]+/8i
+    \x{0053}\x{0073}\x{017f}
+ 0: Ss\x{17f}
+    
+/-- --/ 
+
+/(ΣΆΜΟΣ) \1/8i
+    ΣΆΜΟΣ ΣΆΜΟΣ
+ 0: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3} \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+ 1: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+    ΣΆΜΟΣ σάμος
+ 0: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3} \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+ 1: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+    σάμος σάμος
+ 0: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2} \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+ 1: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+    σάμος σάμοσ
+ 0: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2} \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c3}
+ 1: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+    σάμος ΣΆΜΟΣ  
+ 0: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2} \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+ 1: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+
+/(σάμος) \1/8i
+    ΣΆΜΟΣ ΣΆΜΟΣ
+ 0: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3} \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+ 1: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+    ΣΆΜΟΣ σάμος
+ 0: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3} \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+ 1: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+    σάμος σάμος
+ 0: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2} \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+ 1: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+    σάμος σάμοσ
+ 0: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2} \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c3}
+ 1: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+    σάμος ΣΆΜΟΣ  
+ 0: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2} \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+ 1: \x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+
+/(ΣΆΜΟΣ) \1*/8i
+    ΣΆΜΟΣ\x20
+ 0: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3} 
+ 1: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+    ΣΆΜΟΣ ΣΆΜΟΣσάμοςσάμος
+ 0: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3} \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}\x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}\x{3c3}\x{3ac}\x{3bc}\x{3bf}\x{3c2}
+ 1: \x{3a3}\x{386}\x{39c}\x{39f}\x{3a3}
+
+/-- Perl matches these --/
+
+/\x{00b5}+/8i
+    \x{00b5}\x{039c}\x{03bc}
+ 0: \x{b5}\x{39c}\x{3bc}
+
+/\x{039c}+/8i
+    \x{00b5}\x{039c}\x{03bc}
+ 0: \x{b5}\x{39c}\x{3bc}
+
+/\x{03bc}+/8i
+    \x{00b5}\x{039c}\x{03bc}
+ 0: \x{b5}\x{39c}\x{3bc}
+
+
+/\x{00c5}+/8i
+    \x{00c5}\x{00e5}\x{212b}
+ 0: \x{c5}\x{e5}\x{212b}
+
+/\x{00e5}+/8i
+    \x{00c5}\x{00e5}\x{212b}
+ 0: \x{c5}\x{e5}\x{212b}
+
+/\x{212b}+/8i
+    \x{00c5}\x{00e5}\x{212b}
+ 0: \x{c5}\x{e5}\x{212b}
+
+
+/\x{01c4}+/8i
+    \x{01c4}\x{01c5}\x{01c6}
+ 0: \x{1c4}\x{1c5}\x{1c6}
+
+/\x{01c5}+/8i
+    \x{01c4}\x{01c5}\x{01c6}
+ 0: \x{1c4}\x{1c5}\x{1c6}
+
+/\x{01c6}+/8i
+    \x{01c4}\x{01c5}\x{01c6}
+ 0: \x{1c4}\x{1c5}\x{1c6}
+
+
+/\x{01c7}+/8i
+    \x{01c7}\x{01c8}\x{01c9}
+ 0: \x{1c7}\x{1c8}\x{1c9}
+
+/\x{01c8}+/8i
+    \x{01c7}\x{01c8}\x{01c9}
+ 0: \x{1c7}\x{1c8}\x{1c9}
+
+/\x{01c9}+/8i
+    \x{01c7}\x{01c8}\x{01c9}
+ 0: \x{1c7}\x{1c8}\x{1c9}
+
+
+/\x{01ca}+/8i
+    \x{01ca}\x{01cb}\x{01cc}
+ 0: \x{1ca}\x{1cb}\x{1cc}
+
+/\x{01cb}+/8i
+    \x{01ca}\x{01cb}\x{01cc}
+ 0: \x{1ca}\x{1cb}\x{1cc}
+
+/\x{01cc}+/8i
+    \x{01ca}\x{01cb}\x{01cc}
+ 0: \x{1ca}\x{1cb}\x{1cc}
+
+
+/\x{01f1}+/8i
+    \x{01f1}\x{01f2}\x{01f3}
+ 0: \x{1f1}\x{1f2}\x{1f3}
+
+/\x{01f2}+/8i
+    \x{01f1}\x{01f2}\x{01f3}
+ 0: \x{1f1}\x{1f2}\x{1f3}
+
+/\x{01f3}+/8i
+    \x{01f1}\x{01f2}\x{01f3}
+ 0: \x{1f1}\x{1f2}\x{1f3}
+
+
+/\x{0345}+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+/\x{0399}+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+/\x{03b9}+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+/\x{1fbe}+/8i
+    \x{0345}\x{0399}\x{03b9}\x{1fbe}
+ 0: \x{345}\x{399}\x{3b9}\x{1fbe}
+
+
+/\x{0392}+/8i
+    \x{0392}\x{03b2}\x{03d0}
+ 0: \x{392}\x{3b2}\x{3d0}
+
+/\x{03b2}+/8i
+    \x{0392}\x{03b2}\x{03d0}
+ 0: \x{392}\x{3b2}\x{3d0}
+
+/\x{03d0}+/8i
+    \x{0392}\x{03b2}\x{03d0}
+ 0: \x{392}\x{3b2}\x{3d0}
+    
+
+/\x{0395}+/8i
+    \x{0395}\x{03b5}\x{03f5}
+ 0: \x{395}\x{3b5}\x{3f5}
+
+/\x{03b5}+/8i
+    \x{0395}\x{03b5}\x{03f5}
+ 0: \x{395}\x{3b5}\x{3f5}
+
+/\x{03f5}+/8i
+    \x{0395}\x{03b5}\x{03f5}
+ 0: \x{395}\x{3b5}\x{3f5}
+
+
+/\x{0398}+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+
+/\x{03b8}+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+
+/\x{03d1}+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+
+/\x{03f4}+/8i
+    \x{0398}\x{03b8}\x{03d1}\x{03f4}
+ 0: \x{398}\x{3b8}\x{3d1}\x{3f4}
+    
+
+/\x{039a}+/8i
+    \x{039a}\x{03ba}\x{03f0}
+ 0: \x{39a}\x{3ba}\x{3f0}
+
+/\x{03ba}+/8i
+    \x{039a}\x{03ba}\x{03f0}
+ 0: \x{39a}\x{3ba}\x{3f0}
+
+/\x{03f0}+/8i
+    \x{039a}\x{03ba}\x{03f0}
+ 0: \x{39a}\x{3ba}\x{3f0}
+    
+
+/\x{03a0}+/8i
+    \x{03a0}\x{03c0}\x{03d6} 
+ 0: \x{3a0}\x{3c0}\x{3d6}
+
+/\x{03c0}+/8i
+    \x{03a0}\x{03c0}\x{03d6} 
+ 0: \x{3a0}\x{3c0}\x{3d6}
+
+/\x{03d6}+/8i
+    \x{03a0}\x{03c0}\x{03d6} 
+ 0: \x{3a0}\x{3c0}\x{3d6}
+
+
+/\x{03a1}+/8i
+    \x{03a1}\x{03c1}\x{03f1}
+ 0: \x{3a1}\x{3c1}\x{3f1}
+
+/\x{03c1}+/8i
+    \x{03a1}\x{03c1}\x{03f1}
+ 0: \x{3a1}\x{3c1}\x{3f1}
+
+/\x{03f1}+/8i
+    \x{03a1}\x{03c1}\x{03f1}
+ 0: \x{3a1}\x{3c1}\x{3f1}
+
+
+/\x{03a3}+/8i
+    \x{03A3}\x{03C2}\x{03C3}
+ 0: \x{3a3}\x{3c2}\x{3c3}
+
+/\x{03c2}+/8i
+    \x{03A3}\x{03C2}\x{03C3}
+ 0: \x{3a3}\x{3c2}\x{3c3}
+
+/\x{03c3}+/8i
+    \x{03A3}\x{03C2}\x{03C3}
+ 0: \x{3a3}\x{3c2}\x{3c3}
+    
+
+/\x{03a6}+/8i
+    \x{03a6}\x{03c6}\x{03d5} 
+ 0: \x{3a6}\x{3c6}\x{3d5}
+
+/\x{03c6}+/8i
+    \x{03a6}\x{03c6}\x{03d5} 
+ 0: \x{3a6}\x{3c6}\x{3d5}
+
+/\x{03d5}+/8i
+    \x{03a6}\x{03c6}\x{03d5} 
+ 0: \x{3a6}\x{3c6}\x{3d5}
+
+
+/\x{03c9}+/8i
+    \x{03c9}\x{03a9}\x{2126}
+ 0: \x{3c9}\x{3a9}\x{2126}
+
+/\x{03a9}+/8i
+    \x{03c9}\x{03a9}\x{2126}
+ 0: \x{3c9}\x{3a9}\x{2126}
+
+/\x{2126}+/8i
+    \x{03c9}\x{03a9}\x{2126}
+ 0: \x{3c9}\x{3a9}\x{2126}
+    
+
+/\x{1e60}+/8i
+    \x{1e60}\x{1e61}\x{1e9b}
+ 0: \x{1e60}\x{1e61}\x{1e9b}
+
+/\x{1e61}+/8i
+    \x{1e60}\x{1e61}\x{1e9b}
+ 0: \x{1e60}\x{1e61}\x{1e9b}
+
+/\x{1e9b}+/8i
+    \x{1e60}\x{1e61}\x{1e9b}
+ 0: \x{1e60}\x{1e61}\x{1e9b}
+    
+
+/\x{1e9e}+/8i
+    \x{1e9e}\x{00df}
+ 0: \x{1e9e}\x{df}
+
+/\x{00df}+/8i
+    \x{1e9e}\x{00df}
+ 0: \x{1e9e}\x{df}
+    
+
+/\x{1f88}+/8i
+    \x{1f88}\x{1f80} 
+ 0: \x{1f88}\x{1f80}
+
+/\x{1f80}+/8i
+    \x{1f88}\x{1f80} 
+ 0: \x{1f88}\x{1f80}
+
+
+/-- Perl 5.12.4 gets these wrong, but 5.15.3 is OK --/
+
+/\x{004b}+/8i
+    \x{004b}\x{006b}\x{212a}
+ 0: Kk\x{212a}
+
+/\x{006b}+/8i
+    \x{004b}\x{006b}\x{212a}
+ 0: Kk\x{212a}
+
+/\x{212a}+/8i
+    \x{004b}\x{006b}\x{212a}
+ 0: Kk\x{212a}
+
+
+/\x{0053}+/8i
+    \x{0053}\x{0073}\x{017f}
+ 0: Ss\x{17f}
+
+/\x{0073}+/8i
+    \x{0053}\x{0073}\x{017f}
+ 0: Ss\x{17f}
+
+/\x{017f}+/8i
+    \x{0053}\x{0073}\x{017f}
+ 0: Ss\x{17f}
+
+/^\p{Any}*\d{4}/8
+    1234
+ 0: 1234
+    123 
+No match
+ 
+/^\X*\w{4}/8
+    1234
+ 0: 1234
+    123  
+No match
     
-/\p{Zl}/8BZ
-------------------------------------------------------------------
-        Bra
-        prop Zl
-        Ket
-        End
-------------------------------------------------------------------
-
-/\p{Lu}{3}+/8BZ
-------------------------------------------------------------------
-        Bra
-        prop Lu {3}
-        Ket
-        End
-------------------------------------------------------------------
-
-/\pL{2}+/8BZ
-------------------------------------------------------------------
-        Bra
-        prop L {2}
-        Ket
-        End
-------------------------------------------------------------------
-
-/\p{Cc}{2}+/8BZ
-------------------------------------------------------------------
-        Bra
-        prop Cc {2}
-        Ket
-        End
-------------------------------------------------------------------
-
-/ End of testinput6 /
+/-- End of testinput6 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput7 b/lib/stdlib/test/re_SUITE_data/testoutput7
index d8e3833f39..ddd96fc2ed 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput7
+++ b/lib/stdlib/test/re_SUITE_data/testoutput7
@@ -1,7215 +1,1581 @@
-/abc/
-    abc
- 0: abc
-    
-/ab*c/
-    abc
- 0: abc
-    abbbbc
- 0: abbbbc
-    ac
- 0: ac
-    
-/ab+c/
-    abc
- 0: abc
-    abbbbbbc
- 0: abbbbbbc
-    *** Failers 
-No match
-    ac
-No match
-    ab
-No match
-    
-/a*/
-    a
- 0: a
- 1: 
-    aaaaaaaaaaaaaaaaa
- 0: aaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaa
- 5: aaaaaaaaaaaa
- 6: aaaaaaaaaaa
- 7: aaaaaaaaaa
- 8: aaaaaaaaa
- 9: aaaaaaaa
-10: aaaaaaa
-11: aaaaaa
-12: aaaaa
-13: aaaa
-14: aaa
-15: aa
-16: a
-17: 
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
-Matched, but too many subsidiary matches
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaaaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaaaaaaaaaaaaaaa
- 5: aaaaaaaaaaaaaaaaaaaaaaaaa
- 6: aaaaaaaaaaaaaaaaaaaaaaaa
- 7: aaaaaaaaaaaaaaaaaaaaaaa
- 8: aaaaaaaaaaaaaaaaaaaaaa
- 9: aaaaaaaaaaaaaaaaaaaaa
-10: aaaaaaaaaaaaaaaaaaaa
-11: aaaaaaaaaaaaaaaaaaa
-12: aaaaaaaaaaaaaaaaaa
-13: aaaaaaaaaaaaaaaaa
-14: aaaaaaaaaaaaaaaa
-15: aaaaaaaaaaaaaaa
-16: aaaaaaaaaaaaaa
-17: aaaaaaaaaaaaa
-18: aaaaaaaaaaaa
-19: aaaaaaaaaaa
-20: aaaaaaaaaa
-21: aaaaaaaaa
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\F 
- 0: 
-    
-/(a|abcd|african)/
-    a
- 0: a
-    abcd
- 0: abcd
- 1: a
-    african
- 0: african
- 1: a
-    
-/^abc/
-    abcdef
- 0: abc
-    *** Failers
-No match
-    xyzabc
-No match
-    xyz\nabc    
-No match
-    
-/^abc/m
-    abcdef
- 0: abc
-    xyz\nabc    
- 0: abc
-    *** Failers
-No match
-    xyzabc
-No match
-    
-/\Aabc/
-    abcdef
- 0: abc
-    *** Failers
-No match
-    xyzabc
-No match
-    xyz\nabc    
-No match
-    
-/\Aabc/m
-    abcdef
- 0: abc
-    *** Failers
-No match
-    xyzabc
-No match
-    xyz\nabc    
-No match
-    
-/\Gabc/
-    abcdef
- 0: abc
-    xyzabc\>3
- 0: abc
-    *** Failers
-No match
-    xyzabc    
-No match
-    xyzabc\>2 
-No match
-    
-/x\dy\Dz/
-    x9yzz
- 0: x9yzz
-    x0y+z
- 0: x0y+z
-    *** Failers
-No match
-    xyz
-No match
-    xxy0z     
-No match
-    
-/x\sy\Sz/
-    x yzz
- 0: x yzz
-    x y+z
- 0: x y+z
-    *** Failers
-No match
-    xyz
-No match
-    xxyyz
-No match
-    
-/x\wy\Wz/
-    xxy+z
- 0: xxy+z
-    *** Failers
-No match
-    xxy0z
-No match
-    x+y+z         
-No match
-    
-/x.y/
-    x+y
- 0: x+y
-    x-y
- 0: x-y
-    *** Failers
-No match
-    x\ny
-No match
-    
-/x.y/s
-    x+y
- 0: x+y
-    x-y
- 0: x-y
-    x\ny
- 0: x\x0ay
-
-/(a.b(?s)c.d|x.y)p.q/
-    a+bc+dp+q
- 0: a+bc+dp+q
-    a+bc\ndp+q
- 0: a+bc\x0adp+q
-    x\nyp+q 
- 0: x\x0ayp+q
-    *** Failers 
-No match
-    a\nbc\ndp+q
-No match
-    a+bc\ndp\nq
-No match
-    x\nyp\nq 
-No match
-
-/a\d\z/
-    ba0
- 0: a0
-    *** Failers
-No match
-    ba0\n
-No match
-    ba0\ncd   
-No match
-
-/a\d\z/m
-    ba0
- 0: a0
-    *** Failers
-No match
-    ba0\n
-No match
-    ba0\ncd   
-No match
-
-/a\d\Z/
-    ba0
- 0: a0
-    ba0\n
- 0: a0
-    *** Failers
-No match
-    ba0\ncd   
-No match
+/-- These tests for Unicode property support test PCRE's API and show some of
+    the compiled code. They are not Perl-compatible. --/
+
+/[\p{L}]/DZ
+------------------------------------------------------------------
+        Bra
+        [\p{L}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+
+/[\p{^L}]/DZ
+------------------------------------------------------------------
+        Bra
+        [\P{L}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+
+/[\P{L}]/DZ
+------------------------------------------------------------------
+        Bra
+        [\P{L}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+
+/[\P{^L}]/DZ
+------------------------------------------------------------------
+        Bra
+        [\p{L}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+No options
+No first char
+No need char
+
+/[abc\p{L}\x{0660}]/8DZ
+------------------------------------------------------------------
+        Bra
+        [a-c\p{L}\x{660}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: utf
+No first char
+No need char
+
+/[\p{Nd}]/8DZ
+------------------------------------------------------------------
+        Bra
+        [\p{Nd}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: utf
+No first char
+No need char
+    1234
+ 0: 1
 
-/a\d\Z/m
-    ba0
- 0: a0
-    ba0\n
- 0: a0
-    *** Failers
+/[\p{Nd}+-]+/8DZ
+------------------------------------------------------------------
+        Bra
+        [+\-\p{Nd}]+
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: utf
+No first char
+No need char
+    1234
+ 0: 1234
+    12-34
+ 0: 12-34
+    12+\x{661}-34  
+ 0: 12+\x{661}-34
+    ** Failers
 No match
-    ba0\ncd   
+    abcd  
 No match
 
-/a\d$/
-    ba0
- 0: a0
-    ba0\n
- 0: a0
-    *** Failers
+/[\x{105}-\x{109}]/8iDZ
+------------------------------------------------------------------
+        Bra
+        [\x{104}-\x{109}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+No need char
+    \x{104}
+ 0: \x{104}
+    \x{105}
+ 0: \x{105}
+    \x{109}  
+ 0: \x{109}
+    ** Failers
 No match
-    ba0\ncd   
+    \x{100}
 No match
-
-/a\d$/m
-    ba0
- 0: a0
-    ba0\n
- 0: a0
-    ba0\ncd   
- 0: a0
-    *** Failers
+    \x{10a} 
 No match
-
-/abc/i
-    abc
- 0: abc
-    aBc
- 0: aBc
-    ABC
- 0: ABC
     
-/[^a]/
-    abcd
- 0: b
-    
-/ab?\w/
-    abz
- 0: abz
- 1: ab
-    abbz
- 0: abb
- 1: ab
-    azz  
- 0: az
-
-/x{0,3}yz/
-    ayzq
- 0: yz
-    axyzq
- 0: xyz
-    axxyz
- 0: xxyz
-    axxxyzq
- 0: xxxyz
-    axxxxyzq
- 0: xxxyz
-    *** Failers
-No match
-    ax
-No match
-    axx     
-No match
-      
-/x{3}yz/
-    axxxyzq
- 0: xxxyz
-    axxxxyzq
- 0: xxxyz
-    *** Failers
-No match
-    ax
-No match
-    axx     
-No match
-    ayzq
-No match
-    axyzq
-No match
-    axxyz
-No match
-      
-/x{2,3}yz/
-    axxyz
- 0: xxyz
-    axxxyzq
- 0: xxxyz
-    axxxxyzq
- 0: xxxyz
-    *** Failers
-No match
-    ax
-No match
-    axx     
+/[z-\x{100}]/8iDZ 
+------------------------------------------------------------------
+        Bra
+        [Z\x{39c}\x{3bc}\x{1e9e}\x{178}z-\x{101}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+No need char
+    Z
+ 0: Z
+    z
+ 0: z
+    \x{39c}
+ 0: \x{39c}
+    \x{178}
+ 0: \x{178}
+    |
+ 0: |
+    \x{80}
+ 0: \x{80}
+    \x{ff}
+ 0: \x{ff}
+    \x{100}
+ 0: \x{100}
+    \x{101} 
+ 0: \x{101}
+    ** Failers
 No match
-    ayzq
+    \x{102}
 No match
-    axyzq
+    Y
 No match
-      
-/[^a]+/
-    bac
- 0: b
-    bcdefax
- 0: bcdef
- 1: bcde
- 2: bcd
- 3: bc
- 4: b
-    *** Failers
- 0: *** F
- 1: *** 
- 2: ***
- 3: **
- 4: *
-    aaaaa   
+    y           
 No match
 
-/[^a]*/
-    bac
- 0: b
- 1: 
-    bcdefax
- 0: bcdef
- 1: bcde
- 2: bcd
- 3: bc
- 4: b
- 5: 
-    *** Failers
- 0: *** F
- 1: *** 
- 2: ***
- 3: **
- 4: *
- 5: 
-    aaaaa   
- 0: 
-    
-/[^a]{3,5}/
-    xyz
- 0: xyz
-    awxyza
- 0: wxyz
- 1: wxy
-    abcdefa
- 0: bcdef
- 1: bcde
- 2: bcd
-    abcdefghijk
- 0: bcdef
- 1: bcde
- 2: bcd
-    *** Failers
- 0: *** F
- 1: *** 
- 2: ***
-    axya
-No match
-    axa
-No match
-    aaaaa         
-No match
+/[z-\x{100}]/8DZi
+------------------------------------------------------------------
+        Bra
+        [Z\x{39c}\x{3bc}\x{1e9e}\x{178}z-\x{101}]
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+No need char
 
-/\d*/
-    1234b567
- 0: 1234
- 1: 123
- 2: 12
- 3: 1
- 4: 
-    xyz
- 0: 
-    
-/\D*/
-    a1234b567
- 0: a
- 1: 
-    xyz
- 0: xyz
- 1: xy
- 2: x
- 3: 
-     
-/\d+/
-    ab1234c56
- 0: 1234
- 1: 123
- 2: 12
- 3: 1
-    *** Failers
-No match
-    xyz
-No match
-    
-/\D+/
-    ab123c56
- 0: ab
- 1: a
-    *** Failers
- 0: *** Failers
- 1: *** Failer
- 2: *** Faile
- 3: *** Fail
- 4: *** Fai
- 5: *** Fa
- 6: *** F
- 7: *** 
- 8: ***
- 9: **
-10: *
-    789
-No match
-    
-/\d?A/
-    045ABC
- 0: 5A
-    ABC
- 0: A
-    *** Failers
-No match
-    XYZ
-No match
-    
-/\D?A/
-    ABC
- 0: A
-    BAC
- 0: BA
-    9ABC             
- 0: A
-    *** Failers
-No match
+/(?:[\PPa*]*){8,}/
 
-/a+/
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
-
-/^.*xyz/
-    xyz
- 0: xyz
-    ggggggggxyz
- 0: ggggggggxyz
-    
-/^.+xyz/
-    abcdxyz
- 0: abcdxyz
-    axyz
- 0: axyz
-    *** Failers
-No match
-    xyz
-No match
-    
-/^.?xyz/
-    xyz
- 0: xyz
-    cxyz       
- 0: cxyz
-
-/^\d{2,3}X/
-    12X
- 0: 12X
-    123X
- 0: 123X
-    *** Failers
-No match
-    X
-No match
-    1X
-No match
-    1234X     
-No match
+/[\P{Any}]/BZ
+------------------------------------------------------------------
+        Bra
+        [\P{Any}]
+        Ket
+        End
+------------------------------------------------------------------
 
-/^[abcd]\d/
-    a45
- 0: a4
-    b93
- 0: b9
-    c99z
- 0: c9
-    d04
- 0: d0
-    *** Failers
-No match
-    e45
-No match
-    abcd      
-No match
-    abcd1234
-No match
-    1234  
-No match
+/[\P{Any}\E]/BZ
+------------------------------------------------------------------
+        Bra
+        [\P{Any}]
+        Ket
+        End
+------------------------------------------------------------------
 
-/^[abcd]*\d/
-    a45
- 0: a4
-    b93
- 0: b9
-    c99z
- 0: c9
-    d04
- 0: d0
-    abcd1234
- 0: abcd1
-    1234  
- 0: 1
-    *** Failers
-No match
-    e45
-No match
-    abcd      
-No match
+/(\P{Yi}+\277)/
 
-/^[abcd]+\d/
-    a45
- 0: a4
-    b93
- 0: b9
-    c99z
- 0: c9
-    d04
- 0: d0
-    abcd1234
- 0: abcd1
-    *** Failers
-No match
-    1234  
-No match
-    e45
-No match
-    abcd      
-No match
+/(\P{Yi}+\277)?/
 
-/^a+X/
-    aX
- 0: aX
-    aaX 
- 0: aaX
-
-/^[abcd]?\d/
-    a45
- 0: a4
-    b93
- 0: b9
-    c99z
- 0: c9
-    d04
- 0: d0
-    1234  
- 0: 1
-    *** Failers
-No match
-    abcd1234
-No match
-    e45
-No match
+/(?<=\P{Yi}{3}A)X/
 
-/^[abcd]{2,3}\d/
-    ab45
- 0: ab4
-    bcd93
- 0: bcd9
-    *** Failers
-No match
-    1234 
-No match
-    a36 
-No match
-    abcd1234
-No match
-    ee45
-No match
+/\p{Yi}+(\P{Yi}+)(?1)/
 
-/^(abc)*\d/
-    abc45
- 0: abc4
-    abcabcabc45
- 0: abcabcabc4
-    42xyz 
- 0: 4
-    *** Failers
-No match
+/(\P{Yi}{2}\277)?/
 
-/^(abc)+\d/
-    abc45
- 0: abc4
-    abcabcabc45
- 0: abcabcabc4
-    *** Failers
-No match
-    42xyz 
-No match
+/[\P{Yi}A]/
 
-/^(abc)?\d/
-    abc45
- 0: abc4
-    42xyz 
- 0: 4
-    *** Failers
-No match
-    abcabcabc45
-No match
+/[\P{Yi}\P{Yi}\P{Yi}A]/
 
-/^(abc){2,3}\d/
-    abcabc45
- 0: abcabc4
-    abcabcabc45
- 0: abcabcabc4
-    *** Failers
-No match
-    abcabcabcabc45
-No match
-    abc45
-No match
-    42xyz 
-No match
+/[^\P{Yi}A]/
 
-/1(abc|xyz)2(?1)3/
-    1abc2abc3456
- 0: 1abc2abc3
-    1abc2xyz3456 
- 0: 1abc2xyz3
+/[^\P{Yi}\P{Yi}\P{Yi}A]/
 
-/^(a*\w|ab)=(a*\w|ab)/
-    ab=ab
- 0: ab=ab
- 1: ab=a
+/(\P{Yi}*\277)*/
 
-/^(a*\w|ab)=(?1)/
-    ab=ab
- 0: ab=ab
+/(\P{Yi}*?\277)*/
 
-/^([^()]|\((?1)*\))*$/
-    abc
- 0: abc
-    a(b)c
- 0: a(b)c
-    a(b(c))d  
- 0: a(b(c))d
-    *** Failers)
-No match
-    a(b(c)d  
-No match
+/(\p{Yi}*+\277)*/
 
-/^>abc>([^()]|\((?1)*\))*<xyz<$/
-    >abc>123<xyz<
- 0: >abc>123<xyz<
-    >abc>1(2)3<xyz<
- 0: >abc>1(2)3<xyz<
-    >abc>(1(2)3)<xyz<
- 0: >abc>(1(2)3)<xyz<
-
-/^(?>a*)\d/
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa9876
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa9
-    *** Failers 
-No match
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-No match
+/(\P{Yi}?\277)*/
 
-/< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/x
-    <>
- 0: <>
-    <abcd>
- 0: <abcd>
-    <abc <123> hij>
- 0: <abc <123> hij>
-    <abc <def> hij>
- 0: <def>
-    <abc<>def> 
- 0: <abc<>def>
-    <abc<>      
- 0: <>
-    *** Failers
-No match
-    <abc
-No match
+/(\P{Yi}??\277)*/
 
-/^(?(?=abc)\w{3}:|\d\d)$/        
-    abc:                          
- 0: abc:
-    12                             
- 0: 12
-    *** Failers                     
-No match
-    123                       
-No match
-    xyz                        
-No match
-                                
-/^(?(?!abc)\d\d|\w{3}:)$/      
-    abc:                        
- 0: abc:
-    12         
- 0: 12
-    *** Failers
-No match
-    123
-No match
-    xyz    
-No match
+/(\p{Yi}?+\277)*/
 
-/^(?=abc)\w{5}:$/        
-    abcde:                          
- 0: abcde:
-    *** Failers                     
-No match
-    abc.. 
-No match
-    123                       
-No match
-    vwxyz                        
-No match
-                                
-/^(?!abc)\d\d$/      
-    12         
- 0: 12
-    *** Failers
-No match
-    abcde:
-No match
-    abc..  
-No match
-    123
-No match
-    vwxyz    
-No match
+/(\P{Yi}{0,3}\277)*/
 
-/(?<=abc|xy)123/
-    abc12345
- 0: 123
-    wxy123z
- 0: 123
-    *** Failers
-No match
-    123abc
-No match
+/(\P{Yi}{0,3}?\277)*/
 
-/(?<!abc|xy)123/
-    123abc
- 0: 123
-    mno123456 
- 0: 123
-    *** Failers
-No match
-    abc12345
-No match
-    wxy123z
-No match
-
-/abc(?C1)xyz/
-    abcxyz
---->abcxyz
-  1 ^  ^       x
- 0: abcxyz
-    123abcxyz999 
---->123abcxyz999
-  1    ^  ^          x
- 0: abcxyz
-
-/(ab|cd){3,4}/C
-  ababab
---->ababab
- +0 ^          (ab|cd){3,4}
- +1 ^          a
- +4 ^          c
- +2 ^^         b
- +3 ^ ^        |
- +1 ^ ^        a
- +4 ^ ^        c
- +2 ^  ^       b
- +3 ^   ^      |
- +1 ^   ^      a
- +4 ^   ^      c
- +2 ^    ^     b
- +3 ^     ^    |
-+12 ^     ^    
- +1 ^     ^    a
- +4 ^     ^    c
- 0: ababab
-  abcdabcd
---->abcdabcd
- +0 ^            (ab|cd){3,4}
- +1 ^            a
- +4 ^            c
- +2 ^^           b
- +3 ^ ^          |
- +1 ^ ^          a
- +4 ^ ^          c
- +5 ^  ^         d
- +6 ^   ^        )
- +1 ^   ^        a
- +4 ^   ^        c
- +2 ^    ^       b
- +3 ^     ^      |
-+12 ^     ^      
- +1 ^     ^      a
- +4 ^     ^      c
- +5 ^      ^     d
- +6 ^       ^    )
-+12 ^       ^    
- 0: abcdabcd
- 1: abcdab
-  abcdcdcdcdcd  
---->abcdcdcdcdcd
- +0 ^                (ab|cd){3,4}
- +1 ^                a
- +4 ^                c
- +2 ^^               b
- +3 ^ ^              |
- +1 ^ ^              a
- +4 ^ ^              c
- +5 ^  ^             d
- +6 ^   ^            )
- +1 ^   ^            a
- +4 ^   ^            c
- +5 ^    ^           d
- +6 ^     ^          )
-+12 ^     ^          
- +1 ^     ^          a
- +4 ^     ^          c
- +5 ^      ^         d
- +6 ^       ^        )
-+12 ^       ^        
- 0: abcdcdcd
- 1: abcdcd
-
-/^abc/
-    abcdef
- 0: abc
-    *** Failers
-No match
-    abcdef\B  
-No match
+/(\p{Yi}{0,3}+\277)*/
 
-/^(a*|xyz)/
-    bcd
- 0: 
-    aaabcd
- 0: aaa
- 1: aa
- 2: a
- 3: 
-    xyz
- 0: xyz
- 1: 
-    xyz\N  
- 0: xyz
-    *** Failers
- 0: 
-    bcd\N   
-No match
+/\p{Zl}{2,3}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Zl {2}
+        prop Zl ?+
+        Ket
+        End
+------------------------------------------------------------------
+    


+ 0: \x{2028}\x{2028}
+    \x{2028}\x{2028}\x{2028}
+ 0: \x{2028}\x{2028}\x{2028}
     
-/xyz$/
-    xyz
- 0: xyz
-    xyz\n
- 0: xyz
-    *** Failers
-No match
-    xyz\Z
-No match
-    xyz\n\Z    
-No match
-    
-/xyz$/m
-    xyz
- 0: xyz
-    xyz\n 
- 0: xyz
-    abcxyz\npqr 
- 0: xyz
-    abcxyz\npqr\Z 
- 0: xyz
-    xyz\n\Z    
- 0: xyz
-    *** Failers
-No match
-    xyz\Z
-No match
+/\p{Zl}/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Zl
+        Ket
+        End
+------------------------------------------------------------------
 
-/\Gabc/
-    abcdef
- 0: abc
-    defabcxyz\>3 
- 0: abc
-    *** Failers 
-No match
-    defabcxyz
-No match
+/\p{Lu}{3}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Lu {3}
+        Ket
+        End
+------------------------------------------------------------------
 
-/^abcdef/
-    ab\P
-Partial match: ab
-    abcde\P
-Partial match: abcde
-    abcdef\P
- 0: abcdef
-    *** Failers
-No match
-    abx\P    
-No match
+/\pL{2}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop L {2}
+        Ket
+        End
+------------------------------------------------------------------
 
-/^a{2,4}\d+z/
-    a\P
-Partial match: a
-    aa\P
-Partial match: aa
-    aa2\P 
-Partial match: aa2
-    aaa\P
-Partial match: aaa
-    aaa23\P 
-Partial match: aaa23
-    aaaa12345\P
-Partial match: aaaa12345
-    aa0z\P
- 0: aa0z
-    aaaa4444444444444z\P 
- 0: aaaa4444444444444z
-    *** Failers
-No match
-    az\P 
-No match
-    aaaaa\P 
-No match
-    a56\P 
-No match
+/\p{Cc}{2}+/8BZ
+------------------------------------------------------------------
+        Bra
+        prop Cc {2}
+        Ket
+        End
+------------------------------------------------------------------
 
-/^abcdef/
-   abc\P
-Partial match: abc
-   def\R 
- 0: def
-   
-/(?<=foo)bar/
-   xyzfo\P 
-No match
-   foob\P\>2 
-Partial match: b
-   foobar...\R\P\>4 
- 0: ar
-   xyzfo\P
-No match
-   foobar\>2  
- 0: bar
-   *** Failers
-No match
-   xyzfo\P
-No match
-   obar\R   
-No match
-
-/(ab*(cd|ef))+X/
-    adfadadaklhlkalkajhlkjahdfasdfasdfladsfjkj\P\Z
-No match
-    lkjhlkjhlkjhlkjhabbbbbbcdaefabbbbbbbefa\P\B\Z
-Partial match: abbbbbbcdaefabbbbbbbefa
-    cdabbbbbbbb\P\R\B\Z
-Partial match: cdabbbbbbbb
-    efabbbbbbbbbbbbbbbb\P\R\B\Z
-Partial match: efabbbbbbbbbbbbbbbb
-    bbbbbbbbbbbbcdXyasdfadf\P\R\B\Z    
- 0: bbbbbbbbbbbbcdX
-
-/(a|b)/SF>testsavedregex
-Compiled regex written to testsavedregex
-Study data written to testsavedregex
-<testsavedregex
-Compiled regex (byte-inverted) loaded from testsavedregex
-Study data loaded from testsavedregex
-    abc
- 0: a
+/^\p{Cs}/8
+    \?\x{dfff}
+ 0: \x{dfff}
     ** Failers
- 0: a
-    def  
-No match
-    
-/the quick brown fox/
-    the quick brown fox
- 0: the quick brown fox
-    The quick brown FOX
-No match
-    What do you know about the quick brown fox?
- 0: the quick brown fox
-    What do you know about THE QUICK BROWN FOX?
-No match
-
-/The quick brown fox/i
-    the quick brown fox
- 0: the quick brown fox
-    The quick brown FOX
- 0: The quick brown FOX
-    What do you know about the quick brown fox?
- 0: the quick brown fox
-    What do you know about THE QUICK BROWN FOX?
- 0: THE QUICK BROWN FOX
-
-/abcd\t\n\r\f\a\e\071\x3b\$\\\?caxyz/
-    abcd\t\n\r\f\a\e9;\$\\?caxyz
- 0: abcd\x09\x0a\x0d\x0c\x07\x1b9;$\?caxyz
-
-/a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz/
-    abxyzpqrrrabbxyyyypqAzz
- 0: abxyzpqrrrabbxyyyypqAzz
-    abxyzpqrrrabbxyyyypqAzz
- 0: abxyzpqrrrabbxyyyypqAzz
-    aabxyzpqrrrabbxyyyypqAzz
- 0: aabxyzpqrrrabbxyyyypqAzz
-    aaabxyzpqrrrabbxyyyypqAzz
- 0: aaabxyzpqrrrabbxyyyypqAzz
-    aaaabxyzpqrrrabbxyyyypqAzz
- 0: aaaabxyzpqrrrabbxyyyypqAzz
-    abcxyzpqrrrabbxyyyypqAzz
- 0: abcxyzpqrrrabbxyyyypqAzz
-    aabcxyzpqrrrabbxyyyypqAzz
- 0: aabcxyzpqrrrabbxyyyypqAzz
-    aaabcxyzpqrrrabbxyyyypAzz
- 0: aaabcxyzpqrrrabbxyyyypAzz
-    aaabcxyzpqrrrabbxyyyypqAzz
- 0: aaabcxyzpqrrrabbxyyyypqAzz
-    aaabcxyzpqrrrabbxyyyypqqAzz
- 0: aaabcxyzpqrrrabbxyyyypqqAzz
-    aaabcxyzpqrrrabbxyyyypqqqAzz
- 0: aaabcxyzpqrrrabbxyyyypqqqAzz
-    aaabcxyzpqrrrabbxyyyypqqqqAzz
- 0: aaabcxyzpqrrrabbxyyyypqqqqAzz
-    aaabcxyzpqrrrabbxyyyypqqqqqAzz
- 0: aaabcxyzpqrrrabbxyyyypqqqqqAzz
-    aaabcxyzpqrrrabbxyyyypqqqqqqAzz
- 0: aaabcxyzpqrrrabbxyyyypqqqqqqAzz
-    aaaabcxyzpqrrrabbxyyyypqAzz
- 0: aaaabcxyzpqrrrabbxyyyypqAzz
-    abxyzzpqrrrabbxyyyypqAzz
- 0: abxyzzpqrrrabbxyyyypqAzz
-    aabxyzzzpqrrrabbxyyyypqAzz
- 0: aabxyzzzpqrrrabbxyyyypqAzz
-    aaabxyzzzzpqrrrabbxyyyypqAzz
- 0: aaabxyzzzzpqrrrabbxyyyypqAzz
-    aaaabxyzzzzpqrrrabbxyyyypqAzz
- 0: aaaabxyzzzzpqrrrabbxyyyypqAzz
-    abcxyzzpqrrrabbxyyyypqAzz
- 0: abcxyzzpqrrrabbxyyyypqAzz
-    aabcxyzzzpqrrrabbxyyyypqAzz
- 0: aabcxyzzzpqrrrabbxyyyypqAzz
-    aaabcxyzzzzpqrrrabbxyyyypqAzz
- 0: aaabcxyzzzzpqrrrabbxyyyypqAzz
-    aaaabcxyzzzzpqrrrabbxyyyypqAzz
- 0: aaaabcxyzzzzpqrrrabbxyyyypqAzz
-    aaaabcxyzzzzpqrrrabbbxyyyypqAzz
- 0: aaaabcxyzzzzpqrrrabbbxyyyypqAzz
-    aaaabcxyzzzzpqrrrabbbxyyyyypqAzz
- 0: aaaabcxyzzzzpqrrrabbbxyyyyypqAzz
-    aaabcxyzpqrrrabbxyyyypABzz
- 0: aaabcxyzpqrrrabbxyyyypABzz
-    aaabcxyzpqrrrabbxyyyypABBzz
- 0: aaabcxyzpqrrrabbxyyyypABBzz
-    >>>aaabxyzpqrrrabbxyyyypqAzz
- 0: aaabxyzpqrrrabbxyyyypqAzz
-    >aaaabxyzpqrrrabbxyyyypqAzz
- 0: aaaabxyzpqrrrabbxyyyypqAzz
-    >>>>abcxyzpqrrrabbxyyyypqAzz
- 0: abcxyzpqrrrabbxyyyypqAzz
-    *** Failers
-No match
-    abxyzpqrrabbxyyyypqAzz
-No match
-    abxyzpqrrrrabbxyyyypqAzz
-No match
-    abxyzpqrrrabxyyyypqAzz
-No match
-    aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz
-No match
-    aaaabcxyzzzzpqrrrabbbxyyypqAzz
-No match
-    aaabcxyzpqrrrabbxyyyypqqqqqqqAzz
-No match
-
-/^(abc){1,2}zz/
-    abczz
- 0: abczz
-    abcabczz
- 0: abcabczz
-    *** Failers
-No match
-    zz
-No match
-    abcabcabczz
-No match
-    >>abczz
-No match
-
-/^(b+?|a){1,2}?c/
-    bc
- 0: bc
-    bbc
- 0: bbc
-    bbbc
- 0: bbbc
-    bac
- 0: bac
-    bbac
- 0: bbac
-    aac
- 0: aac
-    abbbbbbbbbbbc
- 0: abbbbbbbbbbbc
-    bbbbbbbbbbbac
- 0: bbbbbbbbbbbac
-    *** Failers
-No match
-    aaac
-No match
-    abbbbbbbbbbbac
-No match
-
-/^(b+|a){1,2}c/
-    bc
- 0: bc
-    bbc
- 0: bbc
-    bbbc
- 0: bbbc
-    bac
- 0: bac
-    bbac
- 0: bbac
-    aac
- 0: aac
-    abbbbbbbbbbbc
- 0: abbbbbbbbbbbc
-    bbbbbbbbbbbac
- 0: bbbbbbbbbbbac
-    *** Failers
-No match
-    aaac
-No match
-    abbbbbbbbbbbac
-No match
-
-/^(b+|a){1,2}?bc/
-    bbc
- 0: bbc
-
-/^(b*|ba){1,2}?bc/
-    babc
- 0: babc
-    bbabc
- 0: bbabc
-    bababc
- 0: bababc
-    *** Failers
 No match
-    bababbc
+    \x{09f} 
 No match
-    babababc
-No match
-
-/^(ba|b*){1,2}?bc/
-    babc
- 0: babc
-    bbabc
- 0: bbabc
-    bababc
- 0: bababc
-    *** Failers
-No match
-    bababbc
-No match
-    babababc
-No match
-
-/^\ca\cA\c[\c{\c:/
-    \x01\x01\e;z
- 0: \x01\x01\x1b;z
-
-/^[ab\]cde]/
-    athing
- 0: a
-    bthing
- 0: b
-    ]thing
- 0: ]
-    cthing
- 0: c
-    dthing
- 0: d
-    ething
- 0: e
-    *** Failers
-No match
-    fthing
-No match
-    [thing
-No match
-    \\thing
-No match
-
-/^[]cde]/
-    ]thing
- 0: ]
-    cthing
- 0: c
-    dthing
- 0: d
-    ething
- 0: e
-    *** Failers
-No match
-    athing
-No match
-    fthing
-No match
-
-/^[^ab\]cde]/
-    fthing
- 0: f
-    [thing
- 0: [
-    \\thing
- 0: \
-    *** Failers
- 0: *
-    athing
+  
+/^\p{Sc}+/8
+    $\x{a2}\x{a3}\x{a4}\x{a5}\x{a6}
+ 0: $\x{a2}\x{a3}\x{a4}\x{a5}
+    \x{9f2}
+ 0: \x{9f2}
+    ** Failers
 No match
-    bthing
+    X
 No match
-    ]thing
+    \x{2c2}
 No match
-    cthing
+  
+/^\p{Zs}/8
+    \ \
+ 0:  
+    \x{a0}
+ 0: \x{a0}
+    \x{1680}
+ 0: \x{1680}
+    \x{180e}
+ 0: \x{180e}
+    \x{2000}
+ 0: \x{2000}
+    \x{2001}     
+ 0: \x{2001}
+    ** Failers
 No match
-    dthing
+    \x{2028}
 No match
-    ething
+    \x{200d} 
 No match
-
-/^[^]cde]/
-    athing
- 0: a
-    fthing
- 0: f
-    *** Failers
+  
+/-- These four are here rather than in test 6 because Perl has problems with
+    the negative versions of the properties. --/
+      
+/\p{^Lu}/8i
+    1234
+ 0: 1
+    ** Failers
  0: *
-    ]thing
-No match
-    cthing
-No match
-    dthing
-No match
-    ething
+    ABC 
 No match
 
-/^\�/
-    �
- 0: \x81
-
-/^�/
-    �
- 0: \xff
-
-/^[0-9]+$/
-    0
- 0: 0
-    1
+/\P{Lu}/8i
+    1234
  0: 1
-    2
- 0: 2
-    3
- 0: 3
-    4
- 0: 4
-    5
- 0: 5
-    6
- 0: 6
-    7
- 0: 7
-    8
- 0: 8
-    9
- 0: 9
-    10
- 0: 10
-    100
- 0: 100
-    *** Failers
-No match
-    abc
-No match
-
-/^.*nter/
-    enter
- 0: enter
-    inter
- 0: inter
-    uponter
- 0: uponter
-
-/^xxx[0-9]+$/
-    xxx0
- 0: xxx0
-    xxx1234
- 0: xxx1234
-    *** Failers
-No match
-    xxx
-No match
-
-/^.+[0-9][0-9][0-9]$/
-    x123
- 0: x123
-    xx123
- 0: xx123
-    123456
- 0: 123456
-    *** Failers
-No match
-    123
-No match
-    x1234
- 0: x1234
-
-/^.+?[0-9][0-9][0-9]$/
-    x123
- 0: x123
-    xx123
- 0: xx123
-    123456
- 0: 123456
-    *** Failers
-No match
-    123
-No match
-    x1234
- 0: x1234
-
-/^([^!]+)!(.+)=apquxz\.ixr\.zzz\.ac\.uk$/
-    abc!pqr=apquxz.ixr.zzz.ac.uk
- 0: abc!pqr=apquxz.ixr.zzz.ac.uk
-    *** Failers
-No match
-    !pqr=apquxz.ixr.zzz.ac.uk
-No match
-    abc!=apquxz.ixr.zzz.ac.uk
-No match
-    abc!pqr=apquxz:ixr.zzz.ac.uk
-No match
-    abc!pqr=apquxz.ixr.zzz.ac.ukk
-No match
-
-/:/
-    Well, we need a colon: somewhere
- 0: :
-    *** Fail if we don't
-No match
-
-/([\da-f:]+)$/i
-    0abc
- 0: 0abc
-    abc
- 0: abc
-    fed
- 0: fed
-    E
- 0: E
-    ::
- 0: ::
-    5f03:12C0::932e
- 0: 5f03:12C0::932e
-    fed def
- 0: def
-    Any old stuff
- 0: ff
-    *** Failers
-No match
-    0zzz
-No match
-    gzzz
-No match
-    fed\x20
-No match
-    Any old rubbish
-No match
-
-/^.*\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/
-    .1.2.3
- 0: .1.2.3
-    A.12.123.0
- 0: A.12.123.0
-    *** Failers
-No match
-    .1.2.3333
-No match
-    1.2.3
-No match
-    1234.2.3
-No match
-
-/^(\d+)\s+IN\s+SOA\s+(\S+)\s+(\S+)\s*\(\s*$/
-    1 IN SOA non-sp1 non-sp2(
- 0: 1 IN SOA non-sp1 non-sp2(
-    1    IN    SOA    non-sp1    non-sp2   (
- 0: 1    IN    SOA    non-sp1    non-sp2   (
-    *** Failers
-No match
-    1IN SOA non-sp1 non-sp2(
-No match
-
-/^[a-zA-Z\d][a-zA-Z\d\-]*(\.[a-zA-Z\d][a-zA-z\d\-]*)*\.$/
-    a.
- 0: a.
-    Z.
- 0: Z.
-    2.
- 0: 2.
-    ab-c.pq-r.
- 0: ab-c.pq-r.
-    sxk.zzz.ac.uk.
- 0: sxk.zzz.ac.uk.
-    x-.y-.
- 0: x-.y-.
-    *** Failers
-No match
-    -abc.peq.
-No match
-
-/^\*\.[a-z]([a-z\-\d]*[a-z\d]+)?(\.[a-z]([a-z\-\d]*[a-z\d]+)?)*$/
-    *.a
- 0: *.a
-    *.b0-a
- 0: *.b0-a
-    *.c3-b.c
- 0: *.c3-b.c
-    *.c-a.b-c
- 0: *.c-a.b-c
-    *** Failers
-No match
-    *.0
-No match
-    *.a-
-No match
-    *.a-b.c-
-No match
-    *.c-a.0-c
-No match
-
-/^(?=ab(de))(abd)(e)/
-    abde
- 0: abde
-
-/^(?!(ab)de|x)(abd)(f)/
-    abdf
- 0: abdf
-
-/^(?=(ab(cd)))(ab)/
-    abcd
- 0: ab
-
-/^[\da-f](\.[\da-f])*$/i
-    a.b.c.d
- 0: a.b.c.d
-    A.B.C.D
- 0: A.B.C.D
-    a.b.c.1.2.3.C
- 0: a.b.c.1.2.3.C
-
-/^\".*\"\s*(;.*)?$/
-    \"1234\"
- 0: "1234"
-    \"abcd\" ;
- 0: "abcd" ;
-    \"\" ; rhubarb
- 0: "" ; rhubarb
-    *** Failers
-No match
-    \"1234\" : things
-No match
-
-/^$/
-    \
- 0: 
-    *** Failers
-No match
-
-/   ^    a   (?# begins with a)  b\sc (?# then b c) $ (?# then end)/x
-    ab c
- 0: ab c
-    *** Failers
-No match
-    abc
-No match
-    ab cde
-No match
-
-/(?x)   ^    a   (?# begins with a)  b\sc (?# then b c) $ (?# then end)/
-    ab c
- 0: ab c
-    *** Failers
-No match
-    abc
-No match
-    ab cde
-No match
-
-/^   a\ b[c ]d       $/x
-    a bcd
- 0: a bcd
-    a b d
- 0: a b d
-    *** Failers
-No match
-    abcd
-No match
-    ab d
+    ** Failers
+ 0: *
+    ABC 
 No match
 
-/^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$/
-    abcdefhijklm
- 0: abcdefhijklm
-
-/^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$/
-    abcdefhijklm
- 0: abcdefhijklm
-
-/^[\w][\W][\s][\S][\d][\D][\b][\n][\c]][\022]/
-    a+ Z0+\x08\n\x1d\x12
- 0: a+ Z0+\x08\x0a\x1d\x12
-
-/^[.^$|()*+?{,}]+/
-    .^\$(*+)|{?,?}
- 0: .^$(*+)|{?,?}
- 1: .^$(*+)|{?,?
- 2: .^$(*+)|{?,
- 3: .^$(*+)|{?
- 4: .^$(*+)|{
- 5: .^$(*+)|
- 6: .^$(*+)
- 7: .^$(*+
- 8: .^$(*
- 9: .^$(
-10: .^$
-11: .^
-12: .
-
-/^a*\w/
-    z
- 0: z
-    az
- 0: az
- 1: a
-    aaaz
- 0: aaaz
- 1: aaa
- 2: aa
- 3: a
+/\p{Ll}/8i 
     a
  0: a
-    aa
- 0: aa
- 1: a
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
-    a+
- 0: a
-    aa+
- 0: aa
- 1: a
-
-/^a*?\w/
-    z
+    Az
  0: z
-    az
- 0: az
- 1: a
-    aaaz
- 0: aaaz
- 1: aaa
- 2: aa
- 3: a
-    a
- 0: a
-    aa
- 0: aa
- 1: a
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
-    a+
- 0: a
-    aa+
- 0: aa
- 1: a
-
-/^a+\w/
-    az
- 0: az
-    aaaz
- 0: aaaz
- 1: aaa
- 2: aa
-    aa
- 0: aa
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
-    aa+
- 0: aa
-
-/^a+?\w/
-    az
- 0: az
-    aaaz
- 0: aaaz
- 1: aaa
- 2: aa
-    aa
- 0: aa
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
-    aa+
- 0: aa
-
-/^\d{8}\w{2,}/
-    1234567890
- 0: 1234567890
-    12345678ab
- 0: 12345678ab
-    12345678__
- 0: 12345678__
-    *** Failers
-No match
-    1234567
-No match
-
-/^[aeiou\d]{4,5}$/
-    uoie
- 0: uoie
-    1234
- 0: 1234
-    12345
- 0: 12345
-    aaaaa
- 0: aaaaa
-    *** Failers
-No match
-    123456
-No match
-
-/^[aeiou\d]{4,5}?/
-    uoie
- 0: uoie
-    1234
- 0: 1234
-    12345
- 0: 12345
- 1: 1234
-    aaaaa
- 0: aaaaa
- 1: aaaa
-    123456
- 0: 12345
- 1: 1234
-
-/^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]/
-    From abcd  Mon Sep 01 12:33:02 1997
- 0: From abcd  Mon Sep 01 12:33
-
-/^From\s+\S+\s+([a-zA-Z]{3}\s+){2}\d{1,2}\s+\d\d:\d\d/
-    From abcd  Mon Sep 01 12:33:02 1997
- 0: From abcd  Mon Sep 01 12:33
-    From abcd  Mon Sep  1 12:33:02 1997
- 0: From abcd  Mon Sep  1 12:33
-    *** Failers
-No match
-    From abcd  Sep 01 12:33:02 1997
-No match
-
-/^12.34/s
-    12\n34
- 0: 12\x0a34
-    12\r34
- 0: 12\x0d34
-
-/\w+(?=\t)/
-    the quick brown\t fox
- 0: brown
-
-/foo(?!bar)(.*)/
-    foobar is foolish see?
- 0: foolish see?
- 1: foolish see
- 2: foolish se
- 3: foolish s
- 4: foolish 
- 5: foolish
- 6: foolis
- 7: fooli
- 8: fool
- 9: foo
-
-/(?:(?!foo)...|^.{0,2})bar(.*)/
-    foobar crowbar etc
- 0: rowbar etc
- 1: rowbar et
- 2: rowbar e
- 3: rowbar 
- 4: rowbar
-    barrel
- 0: barrel
- 1: barre
- 2: barr
- 3: bar
-    2barrel
- 0: 2barrel
- 1: 2barre
- 2: 2barr
- 3: 2bar
-    A barrel
- 0: A barrel
- 1: A barre
- 2: A barr
- 3: A bar
-
-/^(\D*)(?=\d)(?!123)/
-    abc456
- 0: abc
-    *** Failers
-No match
-    abc123
-No match
-
-/^1234(?# test newlines
-  inside)/
-    1234
- 0: 1234
-
-/^1234 #comment in extended re
-  /x
-    1234
- 0: 1234
-
-/#rhubarb
-  abcd/x
-    abcd
- 0: abcd
-
-/^abcd#rhubarb/x
-    abcd
- 0: abcd
-
-/(?!^)abc/
-    the abc
- 0: abc
-    *** Failers
-No match
-    abc
-No match
-
-/(?=^)abc/
-    abc
- 0: abc
-    *** Failers
-No match
-    the abc
-No match
-
-/^[ab]{1,3}(ab*|b)/
-    aabbbbb
- 0: aabbbbb
- 1: aabbbb
- 2: aabbb
- 3: aabb
- 4: aab
- 5: aa
-
-/^[ab]{1,3}?(ab*|b)/
-    aabbbbb
- 0: aabbbbb
- 1: aabbbb
- 2: aabbb
- 3: aabb
- 4: aab
- 5: aa
-
-/^[ab]{1,3}?(ab*?|b)/
-    aabbbbb
- 0: aabbbbb
- 1: aabbbb
- 2: aabbb
- 3: aabb
- 4: aab
- 5: aa
-
-/^[ab]{1,3}(ab*?|b)/
-    aabbbbb
- 0: aabbbbb
- 1: aabbbb
- 2: aabbb
- 3: aabb
- 4: aab
- 5: aa
-
-/  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*                          # optional leading comment
-(?:    (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)                    # initial word
-(?:  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)  )* # further okay, if led by a period
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  @  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*    (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                           # initial subdomain
-(?:                                  #
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.                        # if led by a period...
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                     #   ...further okay
-)*
-# address
-|                     #  or
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)             # one word, optionally followed by....
-(?:
-[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]  |  # atom and space parts, or...
-\(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)       |  # comments, or...
-
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-# quoted strings
-)*
-<  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*                     # leading <
-(?:  @  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*    (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                           # initial subdomain
-(?:                                  #
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.                        # if led by a period...
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                     #   ...further okay
-)*
-
-(?:  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  ,  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  @  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*    (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                           # initial subdomain
-(?:                                  #
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.                        # if led by a period...
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                     #   ...further okay
-)*
-)* # further okay, if led by comma
-:                                # closing colon
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  )? #       optional route
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)                    # initial word
-(?:  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-" (?:                      # opening quote...
-[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
-|                     #    or
-\\ [^\x80-\xff]           #   Escaped something (something != CR)
-)* "  # closing quote
-)  )* # further okay, if led by a period
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  @  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*    (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                           # initial subdomain
-(?:                                  #
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  \.                        # if led by a period...
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*   (?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|   \[                         # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
-\]                        #           ]
-)                     #   ...further okay
-)*
-#       address spec
-(?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*  > #                  trailing >
-# name and address
-)  (?: [\040\t] |  \(
-(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
-\)  )*                       # optional trailing comment
-/x
-    Alan Other <user\@dom.ain>
- 0: Alan Other <[email protected]>
-    <user\@dom.ain>
- 0: [email protected]
- 1: user@dom
-    user\@dom.ain
- 0: [email protected]
- 1: user@dom
-    \"A. Other\" <user.1234\@dom.ain> (a comment)
- 0: "A. Other" <[email protected]> (a comment)
- 1: "A. Other" <[email protected]> 
- 2: "A. Other" <[email protected]>
-    A. Other <user.1234\@dom.ain> (a comment)
- 0:  Other <[email protected]> (a comment)
- 1:  Other <[email protected]> 
- 2:  Other <[email protected]>
-    \"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"\@x400-re.lay
- 0: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re.lay
- 1: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re
-    A missing angle <user\@some.where
- 0: [email protected]
- 1: user@some
-    *** Failers
-No match
-    The quick brown fox
-No match
-
-/[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional leading comment
-(?:
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-# Atom
-|                       #  or
-"                                     # "
-[^\\\x80-\xff\n\015"] *                            #   normal
-(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
-"                                     #        "
-# Quoted string
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-\.
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-# Atom
-|                       #  or
-"                                     # "
-[^\\\x80-\xff\n\015"] *                            #   normal
-(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
-"                                     #        "
-# Quoted string
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# additional words
-)*
-@
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-(?:
-\.
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-)*
-# address
-|                             #  or
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-# Atom
-|                       #  or
-"                                     # "
-[^\\\x80-\xff\n\015"] *                            #   normal
-(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
-"                                     #        "
-# Quoted string
-)
-# leading word
-[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037] *               # "normal" atoms and or spaces
-(?:
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-|
-"                                     # "
-[^\\\x80-\xff\n\015"] *                            #   normal
-(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
-"                                     #        "
-) # "special" comment or quoted string
-[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037] *            #  more "normal"
-)*
-<
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# <
-(?:
-@
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-(?:
-\.
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-)*
-(?: ,
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-@
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-(?:
-\.
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-)*
-)*  # additional domains
-:
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-)?     #       optional route
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-# Atom
-|                       #  or
-"                                     # "
-[^\\\x80-\xff\n\015"] *                            #   normal
-(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
-"                                     #        "
-# Quoted string
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-\.
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-# Atom
-|                       #  or
-"                                     # "
-[^\\\x80-\xff\n\015"] *                            #   normal
-(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
-"                                     #        "
-# Quoted string
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# additional words
-)*
-@
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-(?:
-\.
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-(?:
-[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
-(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
-|
-\[                            # [
-(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
-\]                           #           ]
-)
-[\040\t]*                    # Nab whitespace.
-(?:
-\(                              #  (
-[^\\\x80-\xff\n\015()] *                             #     normal*
-(?:                                 #       (
-(?:  \\ [^\x80-\xff]  |
-\(                            #  (
-[^\\\x80-\xff\n\015()] *                            #     normal*
-(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
-\)                           #                       )
-)    #         special
-[^\\\x80-\xff\n\015()] *                         #         normal*
-)*                                  #            )*
-\)                             #                )
-[\040\t]* )*    # If comment found, allow more spaces.
-# optional trailing comments
-)*
-#       address spec
->                    #                 >
-# name and address
-)
-/x
-    Alan Other <user\@dom.ain>
- 0: Alan Other <[email protected]>
-    <user\@dom.ain>
- 0: [email protected]
- 1: user@dom
-    user\@dom.ain
- 0: [email protected]
- 1: user@dom
-    \"A. Other\" <user.1234\@dom.ain> (a comment)
- 0: "A. Other" <[email protected]>
-    A. Other <user.1234\@dom.ain> (a comment)
- 0:  Other <[email protected]>
-    \"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"\@x400-re.lay
- 0: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re.lay
- 1: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re
-    A missing angle <user\@some.where
- 0: [email protected]
- 1: user@some
-    *** Failers
-No match
-    The quick brown fox
-No match
-
-/abc\0def\00pqr\000xyz\0000AB/
-    abc\0def\00pqr\000xyz\0000AB
- 0: abc\x00def\x00pqr\x00xyz\x000AB
-    abc456 abc\0def\00pqr\000xyz\0000ABCDE
- 0: abc\x00def\x00pqr\x00xyz\x000AB
-
-/abc\x0def\x00pqr\x000xyz\x0000AB/
-    abc\x0def\x00pqr\x000xyz\x0000AB
- 0: abc\x0def\x00pqr\x000xyz\x0000AB
-    abc456 abc\x0def\x00pqr\x000xyz\x0000ABCDE
- 0: abc\x0def\x00pqr\x000xyz\x0000AB
-
-/^[\000-\037]/
-    \0A
- 0: \x00
-    \01B
- 0: \x01
-    \037C
- 0: \x1f
-
-/\0*/
-    \0\0\0\0
- 0: \x00\x00\x00\x00
- 1: \x00\x00\x00
- 2: \x00\x00
- 3: \x00
- 4: 
-
-/A\x0{2,3}Z/
-    The A\x0\x0Z
- 0: A\x00\x00Z
-    An A\0\x0\0Z
- 0: A\x00\x00\x00Z
-    *** Failers
-No match
-    A\0Z
-No match
-    A\0\x0\0\x0Z
-No match
-
-/^\s/
-    \040abc
- 0:  
-    \x0cabc
- 0: \x0c
-    \nabc
- 0: \x0a
-    \rabc
- 0: \x0d
-    \tabc
- 0: \x09
-    *** Failers
-No match
-    abc
-No match
-
-/^a	b
-      c/x
-    abc
- 0: abc
-
-/ab{1,3}bc/
-    abbbbc
- 0: abbbbc
-    abbbc
- 0: abbbc
-    abbc
- 0: abbc
-    *** Failers
-No match
-    abc
-No match
-    abbbbbc
-No match
-
-/([^.]*)\.([^:]*):[T ]+(.*)/
-    track1.title:TBlah blah blah
- 0: track1.title:TBlah blah blah
- 1: track1.title:TBlah blah bla
- 2: track1.title:TBlah blah bl
- 3: track1.title:TBlah blah b
- 4: track1.title:TBlah blah 
- 5: track1.title:TBlah blah
- 6: track1.title:TBlah bla
- 7: track1.title:TBlah bl
- 8: track1.title:TBlah b
- 9: track1.title:TBlah 
-10: track1.title:TBlah
-11: track1.title:TBla
-12: track1.title:TBl
-13: track1.title:TB
-14: track1.title:T
-
-/([^.]*)\.([^:]*):[T ]+(.*)/i
-    track1.title:TBlah blah blah
- 0: track1.title:TBlah blah blah
- 1: track1.title:TBlah blah bla
- 2: track1.title:TBlah blah bl
- 3: track1.title:TBlah blah b
- 4: track1.title:TBlah blah 
- 5: track1.title:TBlah blah
- 6: track1.title:TBlah bla
- 7: track1.title:TBlah bl
- 8: track1.title:TBlah b
- 9: track1.title:TBlah 
-10: track1.title:TBlah
-11: track1.title:TBla
-12: track1.title:TBl
-13: track1.title:TB
-14: track1.title:T
-
-/([^.]*)\.([^:]*):[t ]+(.*)/i
-    track1.title:TBlah blah blah
- 0: track1.title:TBlah blah blah
- 1: track1.title:TBlah blah bla
- 2: track1.title:TBlah blah bl
- 3: track1.title:TBlah blah b
- 4: track1.title:TBlah blah 
- 5: track1.title:TBlah blah
- 6: track1.title:TBlah bla
- 7: track1.title:TBlah bl
- 8: track1.title:TBlah b
- 9: track1.title:TBlah 
-10: track1.title:TBlah
-11: track1.title:TBla
-12: track1.title:TBl
-13: track1.title:TB
-14: track1.title:T
-
-/^[W-c]+$/
-    WXY_^abc
- 0: WXY_^abc
-    *** Failers
-No match
-    wxy
-No match
-
-/^[W-c]+$/i
-    WXY_^abc
- 0: WXY_^abc
-    wxy_^ABC
- 0: wxy_^ABC
-
-/^[\x3f-\x5F]+$/i
-    WXY_^abc
- 0: WXY_^abc
-    wxy_^ABC
- 0: wxy_^ABC
-
-/^abc$/m
-    abc
- 0: abc
-    qqq\nabc
- 0: abc
-    abc\nzzz
- 0: abc
-    qqq\nabc\nzzz
- 0: abc
-
-/^abc$/
-    abc
- 0: abc
-    *** Failers
-No match
-    qqq\nabc
-No match
-    abc\nzzz
-No match
-    qqq\nabc\nzzz
-No match
-
-/\Aabc\Z/m
-    abc
- 0: abc
-    abc\n 
- 0: abc
-    *** Failers
-No match
-    qqq\nabc
-No match
-    abc\nzzz
-No match
-    qqq\nabc\nzzz
-No match
-    
-/\A(.)*\Z/s
-    abc\ndef
- 0: abc\x0adef
-
-/\A(.)*\Z/m
-    *** Failers
- 0: *** Failers
-    abc\ndef
-No match
-
-/(?:b)|(?::+)/
-    b::c
- 0: b
-    c::b
- 0: ::
- 1: :
-
-/[-az]+/
-    az-
- 0: az-
- 1: az
- 2: a
-    *** Failers
- 0: a
-    b
-No match
-
-/[az-]+/
-    za-
- 0: za-
- 1: za
- 2: z
-    *** Failers
- 0: a
-    b
-No match
-
-/[a\-z]+/
-    a-z
- 0: a-z
- 1: a-
- 2: a
-    *** Failers
+    ** Failers
  0: a
-    b
-No match
-
-/[a-z]+/
-    abcdxyz
- 0: abcdxyz
- 1: abcdxy
- 2: abcdx
- 3: abcd
- 4: abc
- 5: ab
- 6: a
-
-/[\d-]+/
-    12-34
- 0: 12-34
- 1: 12-3
- 2: 12-
- 3: 12
- 4: 1
-    *** Failers
-No match
-    aaa
+    ABC   
 No match
 
-/[\d-z]+/
-    12-34z
- 0: 12-34z
- 1: 12-34
- 2: 12-3
- 3: 12-
- 4: 12
- 5: 1
-    *** Failers
-No match
-    aaa
-No match
-
-/\x5c/
-    \\
- 0: \
-
-/\x20Z/
-    the Zoo
- 0:  Z
-    *** Failers
-No match
-    Zulu
-No match
-
-/ab{3cd/
-    ab{3cd
- 0: ab{3cd
-
-/ab{3,cd/
-    ab{3,cd
- 0: ab{3,cd
-
-/ab{3,4a}cd/
-    ab{3,4a}cd
- 0: ab{3,4a}cd
-
-/{4,5a}bc/
-    {4,5a}bc
- 0: {4,5a}bc
-
-/^a.b/<lf>
-    a\rb
- 0: a\x0db
-    *** Failers
-No match
-    a\nb
-No match
-
-/abc$/
-    abc
- 0: abc
-    abc\n
- 0: abc
-    *** Failers
-No match
-    abc\ndef
-No match
-
-/(abc)\123/
-    abc\x53
- 0: abcS
-
-/(abc)\223/
-    abc\x93
- 0: abc\x93
-
-/(abc)\323/
-    abc\xd3
- 0: abc\xd3
-
-/(abc)\100/
-    abc\x40
- 0: abc@
-    abc\100
- 0: abc@
-
-/(abc)\1000/
-    abc\x400
- 0: abc@0
-    abc\x40\x30
- 0: abc@0
-    abc\1000
- 0: abc@0
-    abc\100\x30
- 0: abc@0
-    abc\100\060
- 0: abc@0
-    abc\100\60
- 0: abc@0
-
-/abc\81/
-    abc\081
- 0: abc\x0081
-    abc\0\x38\x31
- 0: abc\x0081
-
-/abc\91/
-    abc\091
- 0: abc\x0091
-    abc\0\x39\x31
- 0: abc\x0091
-
-/(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\12\123/
-    abcdefghijk\12S
- 0: abcdefghijk\x0aS
-
-/ab\idef/
-    abidef
- 0: abidef
-
-/a{0}bc/
-    bc
- 0: bc
-
-/(a|(bc)){0,0}?xyz/
-    xyz
- 0: xyz
-
-/abc[\10]de/
-    abc\010de
- 0: abc\x08de
-
-/abc[\1]de/
-    abc\1de
- 0: abc\x01de
-
-/(abc)[\1]de/
-    abc\1de
- 0: abc\x01de
-
-/(?s)a.b/
-    a\nb
- 0: a\x0ab
-
-/^([^a])([^\b])([^c]*)([^d]{3,4})/
-    baNOTccccd
- 0: baNOTcccc
- 1: baNOTccc
- 2: baNOTcc
- 3: baNOTc
- 4: baNOT
-    baNOTcccd
- 0: baNOTccc
- 1: baNOTcc
- 2: baNOTc
- 3: baNOT
-    baNOTccd
- 0: baNOTcc
- 1: baNOTc
- 2: baNOT
-    bacccd
- 0: baccc
-    *** Failers
- 0: *** Failers
- 1: *** Failer
- 2: *** Faile
- 3: *** Fail
- 4: *** Fai
- 5: *** Fa
- 6: *** F
-    anything
-No match
-    b\bc   
-No match
-    baccd
-No match
-
-/[^a]/
-    Abc
+/\p{Lu}/8i
+    A
  0: A
-  
-/[^a]/i
-    Abc 
- 0: b
-
-/[^a]+/
-    AAAaAbc
- 0: AAA
- 1: AA
- 2: A
-  
-/[^a]+/i
-    AAAaAbc 
- 0: bc
- 1: b
-
-/[^a]+/
-    bbb\nccc
- 0: bbb\x0accc
- 1: bbb\x0acc
- 2: bbb\x0ac
- 3: bbb\x0a
- 4: bbb
- 5: bb
- 6: b
-   
-/[^k]$/
-    abc
- 0: c
-    *** Failers
- 0: s
-    abk   
-No match
-   
-/[^k]{2,3}$/
-    abc
- 0: abc
-    kbc
- 0: bc
-    kabc 
- 0: abc
-    *** Failers
- 0: ers
-    abk
-No match
-    akb
-No match
-    akk 
-No match
-
-/^\d{8,}\@.+[^k]$/
-    12345678\@a.b.c.d
- 0: [email protected]
-    123456789\@x.y.z
- 0: [email protected]
-    *** Failers
-No match
-    12345678\@x.y.uk
+    a\x{10a0}B 
+ 0: \x{10a0}
+    ** Failers 
+ 0: F
+    a
 No match
-    1234567\@a.b.c.d       
+    \x{1d00}  
 No match
 
-/[^a]/
-    aaaabcd
- 0: b
-    aaAabcd 
- 0: A
+/[\x{c0}\x{391}]/8i
+    \x{c0}
+ 0: \x{c0}
+    \x{e0} 
+ 0: \x{e0}
 
-/[^a]/i
-    aaaabcd
- 0: b
-    aaAabcd 
- 0: b
+/-- The next two are special cases where the lengths of the different cases of
+the same character differ. The first went wrong with heap frame storage; the
+second was broken in all cases. --/
 
-/[^az]/
-    aaaabcd
- 0: b
-    aaAabcd 
+/^\x{023a}+?(\x{0130}+)/8i
+  \x{023a}\x{2c65}\x{0130}
+ 0: \x{23a}\x{2c65}\x{130}
+ 1: \x{130}
+  
+/^\x{023a}+([^X])/8i
+  \x{023a}\x{2c65}X
+ 0: \x{23a}\x{2c65}
+ 1: \x{2c65}
+
+/\x{c0}+\x{116}+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+ 0: \x{c0}\x{e0}\x{116}\x{117}
+
+/[\x{c0}\x{116}]+/8i
+    \x{c0}\x{e0}\x{116}\x{117}
+ 0: \x{c0}\x{e0}\x{116}\x{117}
+
+/(\x{de})\1/8i
+    \x{de}\x{de}
+ 0: \x{de}\x{de}
+ 1: \x{de}
+    \x{de}\x{fe}
+ 0: \x{de}\x{fe}
+ 1: \x{de}
+    \x{fe}\x{fe}
+ 0: \x{fe}\x{fe}
+ 1: \x{fe}
+    \x{fe}\x{de}
+ 0: \x{fe}\x{de}
+ 1: \x{fe}
+
+/^\x{c0}$/8i
+    \x{c0}
+ 0: \x{c0}
+    \x{e0} 
+ 0: \x{e0}
+
+/^\x{e0}$/8i
+    \x{c0}
+ 0: \x{c0}
+    \x{e0} 
+ 0: \x{e0}
+
+/-- The next two should be Perl-compatible, but it fails to match \x{e0}. PCRE
+will match it only with UCP support, because without that it has no notion
+of case for anything other than the ASCII letters. --/ 
+
+/((?i)[\x{c0}])/8
+    \x{c0}
+ 0: \x{c0}
+ 1: \x{c0}
+    \x{e0} 
+ 0: \x{e0}
+ 1: \x{e0}
+
+/(?i:[\x{c0}])/8
+    \x{c0}
+ 0: \x{c0}
+    \x{e0} 
+ 0: \x{e0}
+
+/-- These are PCRE's extra properties to help with Unicodizing \d etc. --/
+
+/^\p{Xan}/8
+    ABCD
  0: A
-
-/[^az]/i
-    aaaabcd
- 0: b
-    aaAabcd 
- 0: b
-
-/\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377/
- \000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377
- 0: \x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff
-
-/P[^*]TAIRE[^*]{1,6}?LL/
-    xxxxxxxxxxxPSTAIREISLLxxxxxxxxx
- 0: PSTAIREISLL
-
-/P[^*]TAIRE[^*]{1,}?LL/
-    xxxxxxxxxxxPSTAIREISLLxxxxxxxxx
- 0: PSTAIREISLL
-
-/(\.\d\d[1-9]?)\d+/
-    1.230003938
- 0: .230003938
- 1: .23000393
- 2: .2300039
- 3: .230003
- 4: .23000
- 5: .2300
- 6: .230
-    1.875000282   
- 0: .875000282
- 1: .87500028
- 2: .8750002
- 3: .875000
- 4: .87500
- 5: .8750
- 6: .875
-    1.235  
- 0: .235
-                  
-/(\.\d\d((?=0)|\d(?=\d)))/
-    1.230003938      
- 0: .230
- 1: .23
-    1.875000282
- 0: .875
-    *** Failers 
-No match
-    1.235 
-No match
-    
-/a(?)b/
-    ab 
- 0: ab
- 
-/\b(foo)\s+(\w+)/i
-    Food is on the foo table
- 0: foo table
- 1: foo tabl
- 2: foo tab
- 3: foo ta
- 4: foo t
-    
-/foo(.*)bar/
-    The food is under the bar in the barn.
- 0: food is under the bar in the bar
- 1: food is under the bar
-    
-/foo(.*?)bar/  
-    The food is under the bar in the barn.
- 0: food is under the bar in the bar
- 1: food is under the bar
-
-/(.*)(\d*)/
-    I have 2 numbers: 53147
-Matched, but too many subsidiary matches
- 0: I have 2 numbers: 53147
- 1: I have 2 numbers: 5314
- 2: I have 2 numbers: 531
- 3: I have 2 numbers: 53
- 4: I have 2 numbers: 5
- 5: I have 2 numbers: 
- 6: I have 2 numbers:
- 7: I have 2 numbers
- 8: I have 2 number
- 9: I have 2 numbe
-10: I have 2 numb
-11: I have 2 num
-12: I have 2 nu
-13: I have 2 n
-14: I have 2 
-15: I have 2
-16: I have 
-17: I have
-18: I hav
-19: I ha
-20: I h
-21: I 
-    
-/(.*)(\d+)/
-    I have 2 numbers: 53147
- 0: I have 2 numbers: 53147
- 1: I have 2 numbers: 5314
- 2: I have 2 numbers: 531
- 3: I have 2 numbers: 53
- 4: I have 2 numbers: 5
- 5: I have 2
- 
-/(.*?)(\d*)/
-    I have 2 numbers: 53147
-Matched, but too many subsidiary matches
- 0: I have 2 numbers: 53147
- 1: I have 2 numbers: 5314
- 2: I have 2 numbers: 531
- 3: I have 2 numbers: 53
- 4: I have 2 numbers: 5
- 5: I have 2 numbers: 
- 6: I have 2 numbers:
- 7: I have 2 numbers
- 8: I have 2 number
- 9: I have 2 numbe
-10: I have 2 numb
-11: I have 2 num
-12: I have 2 nu
-13: I have 2 n
-14: I have 2 
-15: I have 2
-16: I have 
-17: I have
-18: I hav
-19: I ha
-20: I h
-21: I 
-
-/(.*?)(\d+)/
-    I have 2 numbers: 53147
- 0: I have 2 numbers: 53147
- 1: I have 2 numbers: 5314
- 2: I have 2 numbers: 531
- 3: I have 2 numbers: 53
- 4: I have 2 numbers: 5
- 5: I have 2
-
-/(.*)(\d+)$/
-    I have 2 numbers: 53147
- 0: I have 2 numbers: 53147
-
-/(.*?)(\d+)$/
-    I have 2 numbers: 53147
- 0: I have 2 numbers: 53147
-
-/(.*)\b(\d+)$/
-    I have 2 numbers: 53147
- 0: I have 2 numbers: 53147
-
-/(.*\D)(\d+)$/
-    I have 2 numbers: 53147
- 0: I have 2 numbers: 53147
-
-/^\D*(?!123)/
-    ABC123
- 0: AB
- 1: A
- 2: 
-     
-/^(\D*)(?=\d)(?!123)/
-    ABC445
- 0: ABC
-    *** Failers
-No match
-    ABC123
-No match
-    
-/^[W-]46]/
-    W46]789 
- 0: W46]
-    -46]789
- 0: -46]
-    *** Failers
-No match
-    Wall
-No match
-    Zebra
-No match
-    42
-No match
-    [abcd] 
-No match
-    ]abcd[
-No match
-       
-/^[W-\]46]/
-    W46]789 
- 0: W
-    Wall
- 0: W
-    Zebra
- 0: Z
-    Xylophone  
- 0: X
-    42
- 0: 4
-    [abcd] 
- 0: [
-    ]abcd[
- 0: ]
-    \\backslash 
- 0: \
-    *** Failers
-No match
-    -46]789
-No match
-    well
+    1234
+ 0: 1
+    \x{6ca}
+ 0: \x{6ca}
+    \x{a6c}
+ 0: \x{a6c}
+    \x{10a7}   
+ 0: \x{10a7}
+    ** Failers
 No match
-    
-/\d\d\/\d\d\/\d\d\d\d/
-    01/01/2000
- 0: 01/01/2000
-
-/word (?:[a-zA-Z0-9]+ ){0,10}otherword/
-  word cat dog elephant mussel cow horse canary baboon snake shark otherword
- 0: word cat dog elephant mussel cow horse canary baboon snake shark otherword
-  word cat dog elephant mussel cow horse canary baboon snake shark
+    _ABC   
 No match
 
-/word (?:[a-zA-Z0-9]+ ){0,300}otherword/
-  word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope
+/^\p{Xan}+/8
+    ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+ 0: ABCD1234\x{6ca}\x{a6c}\x{10a7}
+    ** Failers
 No match
-
-/^(a){0,0}/
-    bcd
- 0: 
-    abc
- 0: 
-    aab     
- 0: 
-
-/^(a){0,1}/
-    bcd
- 0: 
-    abc
- 0: a
- 1: 
-    aab  
- 0: a
- 1: 
-
-/^(a){0,2}/
-    bcd
- 0: 
-    abc
- 0: a
- 1: 
-    aab  
- 0: aa
- 1: a
- 2: 
-
-/^(a){0,3}/
-    bcd
- 0: 
-    abc
- 0: a
- 1: 
-    aab
- 0: aa
- 1: a
- 2: 
-    aaa   
- 0: aaa
- 1: aa
- 2: a
- 3: 
-
-/^(a){0,}/
-    bcd
- 0: 
-    abc
- 0: a
- 1: 
-    aab
- 0: aa
- 1: a
- 2: 
-    aaa
- 0: aaa
- 1: aa
- 2: a
- 3: 
-    aaaaaaaa    
- 0: aaaaaaaa
- 1: aaaaaaa
- 2: aaaaaa
- 3: aaaaa
- 4: aaaa
- 5: aaa
- 6: aa
- 7: a
- 8: 
-
-/^(a){1,1}/
-    bcd
+    _ABC   
 No match
-    abc
- 0: a
-    aab  
- 0: a
 
-/^(a){1,2}/
-    bcd
-No match
-    abc
- 0: a
-    aab  
- 0: aa
- 1: a
+/^\p{Xan}+?/8
+    \x{6ca}\x{a6c}\x{10a7}_
+ 0: \x{6ca}
 
-/^(a){1,3}/
-    bcd
-No match
-    abc
- 0: a
-    aab
- 0: aa
- 1: a
-    aaa   
- 0: aaa
- 1: aa
- 2: a
-
-/^(a){1,}/
-    bcd
-No match
-    abc
- 0: a
-    aab
- 0: aa
- 1: a
-    aaa
- 0: aaa
- 1: aa
- 2: a
-    aaaaaaaa    
- 0: aaaaaaaa
- 1: aaaaaaa
- 2: aaaaaa
- 3: aaaaa
- 4: aaaa
- 5: aaa
- 6: aa
- 7: a
-
-/.*\.gif/
-    borfle\nbib.gif\nno
- 0: bib.gif
-
-/.{0,}\.gif/
-    borfle\nbib.gif\nno
- 0: bib.gif
-
-/.*\.gif/m
-    borfle\nbib.gif\nno
- 0: bib.gif
-
-/.*\.gif/s
-    borfle\nbib.gif\nno
- 0: borfle\x0abib.gif
-
-/.*\.gif/ms
-    borfle\nbib.gif\nno
- 0: borfle\x0abib.gif
+/^\p{Xan}*/8
+    ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+ 0: ABCD1234\x{6ca}\x{a6c}\x{10a7}
     
-/.*$/
-    borfle\nbib.gif\nno
- 0: no
-
-/.*$/m
-    borfle\nbib.gif\nno
- 0: borfle
-
-/.*$/s
-    borfle\nbib.gif\nno
- 0: borfle\x0abib.gif\x0ano
-
-/.*$/ms
-    borfle\nbib.gif\nno
- 0: borfle\x0abib.gif\x0ano
- 1: borfle\x0abib.gif
- 2: borfle
+/^\p{Xan}{2,9}/8
+    ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+ 0: ABCD1234\x{6ca}
     
-/.*$/
-    borfle\nbib.gif\nno\n
- 0: no
-
-/.*$/m
-    borfle\nbib.gif\nno\n
- 0: borfle
-
-/.*$/s
-    borfle\nbib.gif\nno\n
- 0: borfle\x0abib.gif\x0ano\x0a
- 1: borfle\x0abib.gif\x0ano
-
-/.*$/ms
-    borfle\nbib.gif\nno\n
- 0: borfle\x0abib.gif\x0ano\x0a
- 1: borfle\x0abib.gif\x0ano
- 2: borfle\x0abib.gif
- 3: borfle
+/^\p{Xan}{2,9}?/8
+    \x{6ca}\x{a6c}\x{10a7}_
+ 0: \x{6ca}\x{a6c}
     
-/(.*X|^B)/
-    abcde\n1234Xyz
- 0: 1234X
-    BarFoo 
- 0: B
-    *** Failers
-No match
-    abcde\nBar  
-No match
-
-/(.*X|^B)/m
-    abcde\n1234Xyz
- 0: 1234X
-    BarFoo 
- 0: B
-    abcde\nBar  
- 0: B
-
-/(.*X|^B)/s
-    abcde\n1234Xyz
- 0: abcde\x0a1234X
-    BarFoo 
- 0: B
-    *** Failers
-No match
-    abcde\nBar  
-No match
-
-/(.*X|^B)/ms
-    abcde\n1234Xyz
- 0: abcde\x0a1234X
-    BarFoo 
- 0: B
-    abcde\nBar  
- 0: B
-
-/(?s)(.*X|^B)/
-    abcde\n1234Xyz
- 0: abcde\x0a1234X
-    BarFoo 
- 0: B
-    *** Failers 
-No match
-    abcde\nBar  
-No match
-
-/(?s:.*X|^B)/
-    abcde\n1234Xyz
- 0: abcde\x0a1234X
-    BarFoo 
- 0: B
-    *** Failers 
-No match
-    abcde\nBar  
-No match
-
-/^.*B/
-    **** Failers
-No match
-    abc\nB
-No match
-     
-/(?s)^.*B/
-    abc\nB
- 0: abc\x0aB
-
-/(?m)^.*B/
-    abc\nB
- 0: B
-     
-/(?ms)^.*B/
-    abc\nB
- 0: abc\x0aB
-
-/(?ms)^B/
-    abc\nB
- 0: B
-
-/(?s)B$/
-    B\n
- 0: B
-
-/^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/
-    123456654321
- 0: 123456654321
-  
-/^\d\d\d\d\d\d\d\d\d\d\d\d/
-    123456654321 
- 0: 123456654321
-
-/^[\d][\d][\d][\d][\d][\d][\d][\d][\d][\d][\d][\d]/
-    123456654321
- 0: 123456654321
-  
-/^[abc]{12}/
-    abcabcabcabc
- 0: abcabcabcabc
-    
-/^[a-c]{12}/
-    abcabcabcabc
- 0: abcabcabcabc
-    
-/^(a|b|c){12}/
-    abcabcabcabc 
- 0: abcabcabcabc
-
-/^[abcdefghijklmnopqrstuvwxy0123456789]/
-    n
- 0: n
-    *** Failers 
-No match
-    z 
-No match
-
-/abcde{0,0}/
-    abcd
- 0: abcd
-    *** Failers
-No match
-    abce  
-No match
-
-/ab[cd]{0,0}e/
-    abe
- 0: abe
-    *** Failers
+/^[\p{Xan}]/8
+    ABCD1234_
+ 0: A
+    1234abcd_
+ 0: 1
+    \x{6ca}
+ 0: \x{6ca}
+    \x{a6c}
+ 0: \x{a6c}
+    \x{10a7}   
+ 0: \x{10a7}
+    ** Failers
 No match
-    abcde 
+    _ABC   
 No match
-    
-/ab(c){0,0}d/
-    abd
- 0: abd
-    *** Failers
+ 
+/^[\p{Xan}]+/8
+    ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+ 0: ABCD1234\x{6ca}\x{a6c}\x{10a7}
+    ** Failers
 No match
-    abcd   
+    _ABC   
 No match
 
-/a(b*)/
-    a
- 0: a
-    ab
- 0: ab
- 1: a
-    abbbb
- 0: abbbb
- 1: abbb
- 2: abb
- 3: ab
- 4: a
-    *** Failers
- 0: a
-    bbbbb    
-No match
-    
-/ab\d{0}e/
-    abe
- 0: abe
-    *** Failers
+/^>\p{Xsp}/8
+    >\x{1680}\x{2028}\x{0b}
+ 0: >\x{1680}
+    >\x{a0} 
+ 0: >\x{a0}
+    ** Failers
 No match
-    ab1e   
+    \x{0b} 
 No match
-    
-/"([^\\"]+|\\.)*"/
-    the \"quick\" brown fox
- 0: "quick"
-    \"the \\\"quick\\\" brown fox\" 
- 0: "the \"quick\" brown fox"
 
-/.*?/g+
-    abc
- 0: abc
- 0+ 
- 1: ab
- 2: a
- 3: 
- 0: 
- 0+ 
-  
-/\b/g+
-    abc 
- 0: 
- 0+ abc
- 0: 
- 0+ 
+/^>\p{Xsp}+/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}
 
-/\b/+g
-    abc 
- 0: 
- 0+ abc
- 0: 
- 0+ 
+/^>\p{Xsp}+?/8
+    >\x{1680}\x{2028}\x{0b}
+ 0: >\x{1680}
 
-//g
-    abc
- 0: 
- 0: 
- 0: 
- 0: 
-
-/<tr([\w\W\s\d][^<>]{0,})><TD([\w\W\s\d][^<>]{0,})>([\d]{0,}\.)(.*)((<BR>([\w\W\s\d][^<>]{0,})|[\s]{0,}))<\/a><\/TD><TD([\w\W\s\d][^<>]{0,})>([\w\W\s\d][^<>]{0,})<\/TD><TD([\w\W\s\d][^<>]{0,})>([\w\W\s\d][^<>]{0,})<\/TD><\/TR>/is
-  <TR BGCOLOR='#DBE9E9'><TD align=left valign=top>43.<a href='joblist.cfm?JobID=94 6735&Keyword='>Word Processor<BR>(N-1286)</a></TD><TD align=left valign=top>Lega lstaff.com</TD><TD align=left valign=top>CA - Statewide</TD></TR>
- 0: <TR BGCOLOR='#DBE9E9'><TD align=left valign=top>43.<a href='joblist.cfm?JobID=94 6735&Keyword='>Word Processor<BR>(N-1286)</a></TD><TD align=left valign=top>Lega lstaff.com</TD><TD align=left valign=top>CA - Statewide</TD></TR>
-
-/a[^a]b/
-    acb
- 0: acb
-    a\nb
- 0: a\x0ab
-    
-/a.b/
-    acb
- 0: acb
-    *** Failers 
-No match
-    a\nb   
-No match
+/^>\p{Xsp}*/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}
     
-/a[^a]b/s
-    acb
- 0: acb
-    a\nb  
- 0: a\x0ab
+/^>\p{Xsp}{2,9}/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}
     
-/a.b/s
-    acb
- 0: acb
-    a\nb  
- 0: a\x0ab
-
-/^(b+?|a){1,2}?c/
-    bac
- 0: bac
-    bbac
- 0: bbac
-    bbbac
- 0: bbbac
-    bbbbac
- 0: bbbbac
-    bbbbbac 
- 0: bbbbbac
-
-/^(b+|a){1,2}?c/
-    bac
- 0: bac
-    bbac
- 0: bbac
-    bbbac
- 0: bbbac
-    bbbbac
- 0: bbbbac
-    bbbbbac 
- 0: bbbbbac
+/^>\p{Xsp}{2,9}?/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}
     
-/(?!\A)x/m
-    x\nb\n
-No match
-    a\bx\n  
- 0: x
-    
-/\x0{ab}/
-    \0{ab} 
- 0: \x00{ab}
-
-/(A|B)*?CD/
-    CD 
- 0: CD
-    
-/(A|B)*CD/
-    CD 
- 0: CD
-
-/(?<!bar)foo/
-    foo
- 0: foo
-    catfood
- 0: foo
-    arfootle
- 0: foo
-    rfoosh
- 0: foo
-    *** Failers
-No match
-    barfoo
-No match
-    towbarfoo
-No match
-
-/\w{3}(?<!bar)foo/
-    catfood
- 0: catfoo
-    *** Failers
-No match
-    foo
-No match
-    barfoo
+/^>[\p{Xsp}]/8
+    >\x{2028}\x{0b}
+ 0: >\x{2028}
+ 
+/^>[\p{Xsp}]+/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}
+
+/^>\p{Xps}/8
+    >\x{1680}\x{2028}\x{0b}
+ 0: >\x{1680}
+    >\x{a0} 
+ 0: >\x{a0}
+    ** Failers
 No match
-    towbarfoo
+    \x{0b} 
 No match
 
-/(?<=(foo)a)bar/
-    fooabar
- 0: bar
-    *** Failers
-No match
-    bar
-No match
-    foobbar
-No match
-      
-/\Aabc\z/m
-    abc
- 0: abc
-    *** Failers
-No match
-    abc\n   
-No match
-    qqq\nabc
-No match
-    abc\nzzz
-No match
-    qqq\nabc\nzzz
-No match
+/^>\p{Xps}+/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
 
-"(?>.*/)foo"
-    /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/it/you/see/
-No match
+/^>\p{Xps}+?/8
+    >\x{1680}\x{2028}\x{0b}
+ 0: >\x{1680}
 
-"(?>.*/)foo"
-    /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/and/foo
- 0: /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/and/foo
-
-/(?>(\.\d\d[1-9]?))\d+/
-    1.230003938
- 0: .230003938
- 1: .23000393
- 2: .2300039
- 3: .230003
- 4: .23000
- 5: .2300
- 6: .230
-    1.875000282
- 0: .875000282
- 1: .87500028
- 2: .8750002
- 3: .875000
- 4: .87500
- 5: .8750
-    *** Failers 
-No match
-    1.235 
-No match
-
-/^((?>\w+)|(?>\s+))*$/
-    now is the time for all good men to come to the aid of the party
- 0: now is the time for all good men to come to the aid of the party
-    *** Failers
-No match
-    this is not a line with only words and spaces!
-No match
+/^>\p{Xps}*/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
     
-/(\d+)(\w)/
-    12345a
- 0: 12345a
- 1: 12345
- 2: 1234
- 3: 123
- 4: 12
-    12345+ 
- 0: 12345
- 1: 1234
- 2: 123
- 3: 12
-
-/((?>\d+))(\w)/
-    12345a
- 0: 12345a
-    *** Failers
-No match
-    12345+ 
-No match
-
-/(?>a+)b/
-    aaab
- 0: aaab
-
-/((?>a+)b)/
-    aaab
- 0: aaab
-
-/(?>(a+))b/
-    aaab
- 0: aaab
-
-/(?>b)+/
-    aaabbbccc
- 0: bbb
- 1: bb
- 2: b
-
-/(?>a+|b+|c+)*c/
-    aaabbbbccccd
- 0: aaabbbbcccc
- 1: aaabbbbc
+/^>\p{Xps}{2,9}/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
     
-/(a+|b+|c+)*c/
-    aaabbbbccccd
- 0: aaabbbbcccc
- 1: aaabbbbccc
- 2: aaabbbbcc
- 3: aaabbbbc
-
-/((?>[^()]+)|\([^()]*\))+/
-    ((abc(ade)ufh()()x
- 0: abc(ade)ufh()()x
- 1: abc(ade)ufh()()
- 2: abc(ade)ufh()
- 3: abc(ade)ufh
- 4: abc(ade)
- 5: abc
+/^>\p{Xps}{2,9}?/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}
     
-/\(((?>[^()]+)|\([^()]+\))+\)/ 
-    (abc)
- 0: (abc)
-    (abc(def)xyz)
- 0: (abc(def)xyz)
-    *** Failers
-No match
-    ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   
-No match
-
-/a(?-i)b/i
-    ab
- 0: ab
-    Ab
- 0: Ab
-    *** Failers 
-No match
-    aB
-No match
-    AB
-No match
-        
-/(a (?x)b c)d e/
-    a bcd e
- 0: a bcd e
-    *** Failers
-No match
-    a b cd e
-No match
-    abcd e   
-No match
-    a bcde 
-No match
+/^>[\p{Xps}]/8
+    >\x{2028}\x{0b}
+ 0: >\x{2028}
  
-/(a b(?x)c d (?-x)e f)/
-    a bcde f
- 0: a bcde f
-    *** Failers
-No match
-    abcdef  
-No match
+/^>[\p{Xps}]+/8
+    > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
+ 0: > \x{09}\x{0a}\x{0c}\x{0d}\x{a0}\x{1680}\x{2028}\x{0b}
 
-/(a(?i)b)c/
-    abc
- 0: abc
-    aBc
- 0: aBc
-    *** Failers
-No match
-    abC
-No match
-    aBC  
-No match
-    Abc
-No match
-    ABc
-No match
-    ABC
-No match
-    AbC
-No match
-    
-/a(?i:b)c/
-    abc
- 0: abc
-    aBc
- 0: aBc
-    *** Failers 
-No match
-    ABC
-No match
-    abC
-No match
-    aBC
-No match
-    
-/a(?i:b)*c/
-    aBc
- 0: aBc
-    aBBc
- 0: aBBc
-    *** Failers 
-No match
-    aBC
-No match
-    aBBC
-No match
-    
-/a(?=b(?i)c)\w\wd/
-    abcd
- 0: abcd
-    abCd
- 0: abCd
-    *** Failers
-No match
-    aBCd
-No match
-    abcD     
-No match
-    
-/(?s-i:more.*than).*million/i
-    more than million
- 0: more than million
-    more than MILLION
- 0: more than MILLION
-    more \n than Million 
- 0: more \x0a than Million
-    *** Failers
-No match
-    MORE THAN MILLION    
+/^\p{Xwd}/8
+    ABCD
+ 0: A
+    1234
+ 0: 1
+    \x{6ca}
+ 0: \x{6ca}
+    \x{a6c}
+ 0: \x{a6c}
+    \x{10a7}
+ 0: \x{10a7}
+    _ABC    
+ 0: _
+    ** Failers
 No match
-    more \n than \n million 
+    [] 
 No match
 
-/(?:(?s-i)more.*than).*million/i
-    more than million
- 0: more than million
-    more than MILLION
- 0: more than MILLION
-    more \n than Million 
- 0: more \x0a than Million
-    *** Failers
-No match
-    MORE THAN MILLION    
-No match
-    more \n than \n million 
-No match
-    
-/(?>a(?i)b+)+c/ 
-    abc
- 0: abc
-    aBbc
- 0: aBbc
-    aBBc 
- 0: aBBc
-    *** Failers
-No match
-    Abc
-No match
-    abAb    
-No match
-    abbC 
-No match
-    
-/(?=a(?i)b)\w\wc/
-    abc
- 0: abc
-    aBc
- 0: aBc
-    *** Failers
-No match
-    Ab 
-No match
-    abC
-No match
-    aBC     
-No match
-    
-/(?<=a(?i)b)(\w\w)c/
-    abxxc
- 0: xxc
-    aBxxc
- 0: xxc
-    *** Failers
-No match
-    Abxxc
-No match
-    ABxxc
-No match
-    abxxC      
-No match
+/^\p{Xwd}+/8
+    ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+ 0: ABCD1234\x{6ca}\x{a6c}\x{10a7}_
 
-/^(?(?=abc)\w{3}:|\d\d)$/
-    abc:
- 0: abc:
-    12
- 0: 12
-    *** Failers
-No match
-    123
-No match
-    xyz    
-No match
+/^\p{Xwd}+?/8
+    \x{6ca}\x{a6c}\x{10a7}_
+ 0: \x{6ca}
 
-/^(?(?!abc)\d\d|\w{3}:)$/
-    abc:
- 0: abc:
-    12
- 0: 12
-    *** Failers
-No match
-    123
-No match
-    xyz    
-No match
+/^\p{Xwd}*/8
+    ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+ 0: ABCD1234\x{6ca}\x{a6c}\x{10a7}_
     
-/(?(?<=foo)bar|cat)/
-    foobar
- 0: bar
-    cat
- 0: cat
-    fcat
- 0: cat
-    focat   
- 0: cat
-    *** Failers
-No match
-    foocat  
-No match
-
-/(?(?<!foo)cat|bar)/
-    foobar
- 0: bar
-    cat
- 0: cat
-    fcat
- 0: cat
-    focat   
- 0: cat
-    *** Failers
-No match
-    foocat  
-No match
-
-/(?>a*)*/
-    a
- 0: a
- 1: 
-    aa
- 0: aa
- 1: 
-    aaaa
- 0: aaaa
- 1: 
+/^\p{Xwd}{2,9}/8
+    A_B12\x{6ca}\x{a6c}\x{10a7}
+ 0: A_B12\x{6ca}\x{a6c}\x{10a7}
     
-/(abc|)+/
-    abc
- 0: abc
- 1: 
-    abcabc
- 0: abcabc
- 1: abc
- 2: 
-    abcabcabc
- 0: abcabcabc
- 1: abcabc
- 2: abc
- 3: 
-    xyz      
- 0: 
-
-/([a]*)*/
-    a
- 0: a
- 1: 
-    aaaaa 
- 0: aaaaa
- 1: aaaa
- 2: aaa
- 3: aa
- 4: a
- 5: 
- 
-/([ab]*)*/
-    a
- 0: a
- 1: 
-    b
- 0: b
- 1: 
-    ababab
- 0: ababab
- 1: ababa
- 2: abab
- 3: aba
- 4: ab
- 5: a
- 6: 
-    aaaabcde
- 0: aaaab
- 1: aaaa
- 2: aaa
- 3: aa
- 4: a
- 5: 
-    bbbb    
- 0: bbbb
- 1: bbb
- 2: bb
- 3: b
- 4: 
- 
-/([^a]*)*/
-    b
- 0: b
- 1: 
-    bbbb
- 0: bbbb
- 1: bbb
- 2: bb
- 3: b
- 4: 
-    aaa   
- 0: 
- 
-/([^ab]*)*/
-    cccc
- 0: cccc
- 1: ccc
- 2: cc
- 3: c
- 4: 
-    abab  
- 0: 
- 
-/([a]*?)*/
-    a
- 0: a
- 1: 
-    aaaa 
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
- 4: 
- 
-/([ab]*?)*/
-    a
- 0: a
- 1: 
-    b
- 0: b
- 1: 
-    abab
- 0: abab
- 1: aba
- 2: ab
- 3: a
- 4: 
-    baba   
- 0: baba
- 1: bab
- 2: ba
- 3: b
- 4: 
- 
-/([^a]*?)*/
-    b
- 0: b
- 1: 
-    bbbb
- 0: bbbb
- 1: bbb
- 2: bb
- 3: b
- 4: 
-    aaa   
- 0: 
- 
-/([^ab]*?)*/
-    c
- 0: c
- 1: 
-    cccc
- 0: cccc
- 1: ccc
- 2: cc
- 3: c
- 4: 
-    baba   
- 0: 
- 
-/(?>a*)*/
-    a
- 0: a
- 1: 
-    aaabcde 
- 0: aaa
- 1: 
- 
-/((?>a*))*/
-    aaaaa
- 0: aaaaa
- 1: 
-    aabbaa 
- 0: aa
- 1: 
- 
-/((?>a*?))*/
-    aaaaa
- 0: aaaaa
- 1: 
-    aabbaa 
- 0: aa
- 1: 
-
-/(?(?=[^a-z]+[a-z])  \d{2}-[a-z]{3}-\d{2}  |  \d{2}-\d{2}-\d{2} ) /x
-    12-sep-98
- 0: 12-sep-98
-    12-09-98
- 0: 12-09-98
-    *** Failers
-No match
-    sep-12-98
-No match
-        
-/(?i:saturday|sunday)/
-    saturday
- 0: saturday
-    sunday
- 0: sunday
-    Saturday
- 0: Saturday
-    Sunday
- 0: Sunday
-    SATURDAY
- 0: SATURDAY
-    SUNDAY
- 0: SUNDAY
-    SunDay
- 0: SunDay
+/^\p{Xwd}{2,9}?/8
+    \x{6ca}\x{a6c}\x{10a7}_
+ 0: \x{6ca}\x{a6c}
     
-/(a(?i)bc|BB)x/
-    abcx
- 0: abcx
-    aBCx
- 0: aBCx
-    bbx
- 0: bbx
-    BBx
- 0: BBx
-    *** Failers
-No match
-    abcX
-No match
-    aBCX
-No match
-    bbX
-No match
-    BBX               
-No match
-
-/^([ab](?i)[cd]|[ef])/
-    ac
- 0: ac
-    aC
- 0: aC
-    bD
- 0: bD
-    elephant
- 0: e
-    Europe 
- 0: E
-    frog
- 0: f
-    France
- 0: F
-    *** Failers
-No match
-    Africa     
-No match
-
-/^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)/
-    ab
- 0: ab
-    aBd
- 0: aBd
-    xy
- 0: xy
-    xY
- 0: xY
-    zebra
- 0: z
-    Zambesi
- 0: Z
-    *** Failers
-No match
-    aCD  
-No match
-    XY  
-No match
-
-/(?<=foo\n)^bar/m
-    foo\nbar
- 0: bar
-    *** Failers
-No match
-    bar
-No match
-    baz\nbar   
-No match
-
-/(?<=(?<!foo)bar)baz/
-    barbaz
- 0: baz
-    barbarbaz 
- 0: baz
-    koobarbaz 
- 0: baz
-    *** Failers
-No match
-    baz
-No match
-    foobarbaz 
-No match
-
-/The following tests are taken from the Perl 5.005 test suite; some of them/
-/are compatible with 5.004, but I'd rather not have to sort them out./
-No match
-
-/abc/
-    abc
- 0: abc
-    xabcy
- 0: abc
-    ababc
- 0: abc
-    *** Failers
-No match
-    xbc
-No match
-    axc
+/^[\p{Xwd}]/8
+    ABCD1234_
+ 0: A
+    1234abcd_
+ 0: 1
+    \x{6ca}
+ 0: \x{6ca}
+    \x{a6c}
+ 0: \x{a6c}
+    \x{10a7}   
+ 0: \x{10a7}
+    _ABC 
+ 0: _
+    ** Failers
 No match
-    abx
+    []   
 No match
-
-/ab*c/
-    abc
- 0: abc
-
-/ab*bc/
-    abc
+ 
+/^[\p{Xwd}]+/8
+    ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+ 0: ABCD1234\x{6ca}\x{a6c}\x{10a7}_
+
+/-- A check not in UTF-8 mode --/
+
+/^[\p{Xwd}]+/
+    ABCD1234_
+ 0: ABCD1234_
+    
+/-- Some negative checks --/
+
+/^[\P{Xwd}]+/8
+    !.+\x{019}\x{35a}AB
+ 0: !.+\x{19}\x{35a}
+
+/^[\p{^Xwd}]+/8
+    !.+\x{019}\x{35a}AB
+ 0: !.+\x{19}\x{35a}
+
+/[\D]/WBZ8
+------------------------------------------------------------------
+        Bra
+        [\P{Nd}]
+        Ket
+        End
+------------------------------------------------------------------
+    1\x{3c8}2
+ 0: \x{3c8}
+
+/[\d]/WBZ8
+------------------------------------------------------------------
+        Bra
+        [\p{Nd}]
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{6f4}<
+ 0: \x{6f4}
+
+/[\S]/WBZ8
+------------------------------------------------------------------
+        Bra
+        [\P{Xsp}]
+        Ket
+        End
+------------------------------------------------------------------
+    \x{1680}\x{6f4}\x{1680}
+ 0: \x{6f4}
+
+/[\s]/WBZ8
+------------------------------------------------------------------
+        Bra
+        [\p{Xsp}]
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{1680}<
+ 0: \x{1680}
+
+/[\W]/WBZ8
+------------------------------------------------------------------
+        Bra
+        [\P{Xwd}]
+        Ket
+        End
+------------------------------------------------------------------
+    A\x{1712}B
+ 0: \x{1712}
+
+/[\w]/WBZ8
+------------------------------------------------------------------
+        Bra
+        [\p{Xwd}]
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{1723}<
+ 0: \x{1723}
+
+/\D/WBZ8
+------------------------------------------------------------------
+        Bra
+        notprop Nd
+        Ket
+        End
+------------------------------------------------------------------
+    1\x{3c8}2
+ 0: \x{3c8}
+
+/\d/WBZ8
+------------------------------------------------------------------
+        Bra
+        prop Nd
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{6f4}<
+ 0: \x{6f4}
+
+/\S/WBZ8
+------------------------------------------------------------------
+        Bra
+        notprop Xsp
+        Ket
+        End
+------------------------------------------------------------------
+    \x{1680}\x{6f4}\x{1680}
+ 0: \x{6f4}
+
+/\s/WBZ8
+------------------------------------------------------------------
+        Bra
+        prop Xsp
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{1680}>
+ 0: \x{1680}
+
+/\W/WBZ8
+------------------------------------------------------------------
+        Bra
+        notprop Xwd
+        Ket
+        End
+------------------------------------------------------------------
+    A\x{1712}B
+ 0: \x{1712}
+
+/\w/WBZ8
+------------------------------------------------------------------
+        Bra
+        prop Xwd
+        Ket
+        End
+------------------------------------------------------------------
+    >\x{1723}<
+ 0: \x{1723}
+
+/[[:alpha:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{L}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:lower:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{Ll}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:upper:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{Lu}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:alnum:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{Xan}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:ascii:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x7f]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:cntrl:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\x00-\x1f\x7f]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:digit:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{Nd}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:graph:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [!-~]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:print:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [ -~]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:punct:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [!-/:-@[-`{-~]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:space:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{Xps}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:word:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{Xwd}]
+        Ket
+        End
+------------------------------------------------------------------
+
+/[[:xdigit:]]/WBZ
+------------------------------------------------------------------
+        Bra
+        [0-9A-Fa-f]
+        Ket
+        End
+------------------------------------------------------------------
+
+/-- Unicode properties for \b abd \B --/
+
+/\b...\B/8W
+    abc_
+ 0: abc
+    \x{37e}abc\x{376} 
+ 0: abc
+    \x{37e}\x{376}\x{371}\x{393}\x{394} 
+ 0: \x{376}\x{371}\x{393}
+    !\x{c0}++\x{c1}\x{c2} 
+ 0: ++\x{c1}
+    !\x{c0}+++++ 
+ 0: \x{c0}++
+
+/-- Without PCRE_UCP, non-ASCII always fail, even if < 256  --/
+
+/\b...\B/8
+    abc_
  0: abc
-    abbc
- 0: abbc
-    abbbbc
- 0: abbbbc
-
-/.{1}/
-    abbbbc
- 0: a
-
-/.{3,4}/
-    abbbbc
- 0: abbb
- 1: abb
-
-/ab{0,}bc/
-    abbbbc
- 0: abbbbc
-
-/ab+bc/
-    abbc
- 0: abbc
-    *** Failers
+    ** Failers 
+ 0: Fai
+    \x{37e}abc\x{376} 
 No match
-    abc
+    \x{37e}\x{376}\x{371}\x{393}\x{394} 
 No match
-    abq
+    !\x{c0}++\x{c1}\x{c2} 
 No match
-
-/ab{1,}bc/
-
-/ab+bc/
-    abbbbc
- 0: abbbbc
-
-/ab{1,}bc/
-    abbbbc
- 0: abbbbc
-
-/ab{1,3}bc/
-    abbbbc
- 0: abbbbc
-
-/ab{3,4}bc/
-    abbbbc
- 0: abbbbc
-
-/ab{4,5}bc/
-    *** Failers
-No match
-    abq
+    !\x{c0}+++++ 
 No match
-    abbbbc
-No match
-
-/ab?bc/
-    abbc
- 0: abbc
-    abc
- 0: abc
-
-/ab{0,1}bc/
-    abc
- 0: abc
 
-/ab?bc/
+/-- With PCRE_UCP, non-UTF8 chars that are < 256 still check properties  --/
 
-/ab?c/
-    abc
+/\b...\B/W
+    abc_
  0: abc
+    !\x{c0}++\x{c1}\x{c2} 
+ 0: ++\xc1
+    !\x{c0}+++++ 
+ 0: \xc0++
 
-/ab{0,1}c/
-    abc
- 0: abc
+/-- Some of these are silly, but they check various combinations --/
 
-/^abc$/
-    abc
- 0: abc
-    *** Failers
-No match
-    abbbbc
-No match
-    abcc
-No match
-
-/^abc/
-    abcc
- 0: abc
-
-/^abc$/
-
-/abc$/
-    aabc
- 0: abc
-    *** Failers
-No match
-    aabc
+/[[:^alpha:][:^cntrl:]]+/8WBZ
+------------------------------------------------------------------
+        Bra
+        [ -~\x80-\xff\P{L}]+
+        Ket
+        End
+------------------------------------------------------------------
+    123
+ 0: 123
+    abc 
  0: abc
-    aabcd
-No match
-
-/^/
-    abc
- 0: 
 
-/$/
-    abc
- 0: 
-
-/a.c/
-    abc
+/[[:^cntrl:][:^alpha:]]+/8WBZ
+------------------------------------------------------------------
+        Bra
+        [ -~\x80-\xff\P{L}]+
+        Ket
+        End
+------------------------------------------------------------------
+    123
+ 0: 123
+    abc 
  0: abc
-    axc
- 0: axc
-
-/a.*c/
-    axyzc
- 0: axyzc
-
-/a[bc]d/
-    abd
- 0: abd
-    *** Failers
-No match
-    axyzd
-No match
-    abc
-No match
-
-/a[b-d]e/
-    ace
- 0: ace
-
-/a[b-d]/
-    aac
- 0: ac
-
-/a[-b]/
-    a-
- 0: a-
-
-/a[b-]/
-    a-
- 0: a-
-
-/a]/
-    a]
- 0: a]
-
-/a[]]b/
-    a]b
- 0: a]b
-
-/a[^bc]d/
-    aed
- 0: aed
-    *** Failers
-No match
-    abd
-No match
-    abd
-No match
-
-/a[^-b]c/
-    adc
- 0: adc
-
-/a[^]b]c/
-    adc
- 0: adc
-    *** Failers
-No match
-    a-c
- 0: a-c
-    a]c
-No match
-
-/\ba\b/
-    a-
- 0: a
-    -a
- 0: a
-    -a-
- 0: a
-
-/\by\b/
-    *** Failers
-No match
-    xy
-No match
-    yz
-No match
-    xyz
-No match
-
-/\Ba\B/
-    *** Failers
- 0: a
-    a-
-No match
-    -a
-No match
-    -a-
-No match
-
-/\By\b/
-    xy
- 0: y
-
-/\by\B/
-    yz
- 0: y
-
-/\By\B/
-    xyz
- 0: y
-
-/\w/
-    a
- 0: a
-
-/\W/
-    -
- 0: -
-    *** Failers
- 0: *
-    -
- 0: -
-    a
-No match
-
-/a\sb/
-    a b
- 0: a b
-
-/a\Sb/
-    a-b
- 0: a-b
-    *** Failers
-No match
-    a-b
- 0: a-b
-    a b
-No match
-
-/\d/
-    1
- 0: 1
-
-/\D/
-    -
- 0: -
-    *** Failers
- 0: *
-    -
- 0: -
-    1
-No match
-
-/[\w]/
-    a
- 0: a
-
-/[\W]/
-    -
- 0: -
-    *** Failers
- 0: *
-    -
- 0: -
-    a
-No match
 
-/a[\s]b/
-    a b
- 0: a b
-
-/a[\S]b/
-    a-b
- 0: a-b
-    *** Failers
-No match
-    a-b
- 0: a-b
-    a b
-No match
-
-/[\d]/
-    1
- 0: 1
-
-/[\D]/
-    -
- 0: -
-    *** Failers
- 0: *
-    -
- 0: -
-    1
-No match
-
-/ab|cd/
-    abc
- 0: ab
-    abcd
- 0: ab
-
-/()ef/
-    def
- 0: ef
-
-/$b/
-
-/a\(b/
-    a(b
- 0: a(b
-
-/a\(*b/
-    ab
- 0: ab
-    a((b
- 0: a((b
-
-/a\\b/
-    a\b
-No match
-
-/((a))/
-    abc
- 0: a
-
-/(a)b(c)/
+/[[:alpha:]]+/8WBZ
+------------------------------------------------------------------
+        Bra
+        [\p{L}]+
+        Ket
+        End
+------------------------------------------------------------------
     abc
  0: abc
 
-/a+b+c/
-    aabbabc
+/[[:^alpha:]\S]+/8WBZ
+------------------------------------------------------------------
+        Bra
+        [\P{L}\P{Xsp}]+
+        Ket
+        End
+------------------------------------------------------------------
+    123
+ 0: 123
+    abc 
  0: abc
 
-/a{1,}b{1,}c/
-    aabbabc
+/[^\d]+/8WBZ
+------------------------------------------------------------------
+        Bra
+        [^\p{Nd}]+
+        Ket
+        End
+------------------------------------------------------------------
+    abc123
  0: abc
-
-/a.+?c/
-    abcabc
- 0: abcabc
- 1: abc
-
-/(a+|b)*/
-    ab
- 0: ab
- 1: a
- 2: 
-
-/(a+|b){0,}/
-    ab
- 0: ab
- 1: a
- 2: 
-
-/(a+|b)+/
-    ab
- 0: ab
- 1: a
-
-/(a+|b){1,}/
-    ab
- 0: ab
- 1: a
-
-/(a+|b)?/
-    ab
- 0: a
- 1: 
-
-/(a+|b){0,1}/
-    ab
- 0: a
- 1: 
-
-/[^ab]*/
-    cde
- 0: cde
- 1: cd
- 2: c
- 3: 
-
-/abc/
-    *** Failers
+    abc\x{123}
+ 0: abc\x{123}
+    \x{660}abc   
+ 0: abc
+
+/\p{Lu}+9\p{Lu}+B\p{Lu}+b/BZ
+------------------------------------------------------------------
+        Bra
+        prop Lu ++
+        9
+        prop Lu +
+        B
+        prop Lu ++
+        b
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{^Lu}+9\p{^Lu}+B\p{^Lu}+b/BZ
+------------------------------------------------------------------
+        Bra
+        notprop Lu +
+        9
+        notprop Lu ++
+        B
+        notprop Lu +
+        b
+        Ket
+        End
+------------------------------------------------------------------
+
+/\P{Lu}+9\P{Lu}+B\P{Lu}+b/BZ
+------------------------------------------------------------------
+        Bra
+        notprop Lu +
+        9
+        notprop Lu ++
+        B
+        notprop Lu +
+        b
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{Han}+X\p{Greek}+\x{370}/BZ8
+------------------------------------------------------------------
+        Bra
+        prop Han ++
+        X
+        prop Greek +
+        \x{370}
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{Xan}+!\p{Xan}+A/BZ
+------------------------------------------------------------------
+        Bra
+        prop Xan ++
+        !
+        prop Xan +
+        A
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{Xsp}+!\p{Xsp}\t/BZ
+------------------------------------------------------------------
+        Bra
+        prop Xsp ++
+        !
+        prop Xsp
+        \x09
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{Xps}+!\p{Xps}\t/BZ
+------------------------------------------------------------------
+        Bra
+        prop Xps ++
+        !
+        prop Xps
+        \x09
+        Ket
+        End
+------------------------------------------------------------------
+
+/\p{Xwd}+!\p{Xwd}_/BZ
+------------------------------------------------------------------
+        Bra
+        prop Xwd ++
+        !
+        prop Xwd
+        _
+        Ket
+        End
+------------------------------------------------------------------
+
+/A+\p{N}A+\dB+\p{N}*B+\d*/WBZ
+------------------------------------------------------------------
+        Bra
+        A++
+        prop N
+        A++
+        prop Nd
+        B+
+        prop N *+
+        B+
+        prop Nd *
+        Ket
+        End
+------------------------------------------------------------------
+
+/-- These behaved oddly in Perl, so they are kept in this test --/
+
+/(\x{23a}\x{23a}\x{23a})?\1/8i
+    \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}
+No match
+
+/(ȺȺȺ)?\1/8i
+    ȺȺȺⱥⱥ
+No match
+
+/(\x{23a}\x{23a}\x{23a})?\1/8i
+    \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}
+ 0: \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}
+ 1: \x{23a}\x{23a}\x{23a}
+
+/(ȺȺȺ)?\1/8i
+    ȺȺȺⱥⱥⱥ
+ 0: \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}
+ 1: \x{23a}\x{23a}\x{23a}
+
+/(\x{23a}\x{23a}\x{23a})\1/8i
+    \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}
+No match
+
+/(ȺȺȺ)\1/8i
+    ȺȺȺⱥⱥ
+No match
+
+/(\x{23a}\x{23a}\x{23a})\1/8i
+    \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}
+ 0: \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}
+ 1: \x{23a}\x{23a}\x{23a}
+
+/(ȺȺȺ)\1/8i
+    ȺȺȺⱥⱥⱥ
+ 0: \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}
+ 1: \x{23a}\x{23a}\x{23a}
+
+/(\x{2c65}\x{2c65})\1/8i
+    \x{2c65}\x{2c65}\x{23a}\x{23a}
+ 0: \x{2c65}\x{2c65}\x{23a}\x{23a}
+ 1: \x{2c65}\x{2c65}
+    
+/(ⱥⱥ)\1/8i
+    ⱥⱥȺȺ 
+ 0: \x{2c65}\x{2c65}\x{23a}\x{23a}
+ 1: \x{2c65}\x{2c65}
+    
+/(\x{23a}\x{23a}\x{23a})\1Y/8i
+    X\x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}YZ
+ 0: \x{23a}\x{23a}\x{23a}\x{2c65}\x{2c65}\x{2c65}Y
+ 1: \x{23a}\x{23a}\x{23a}
+
+/(\x{2c65}\x{2c65})\1Y/8i
+    X\x{2c65}\x{2c65}\x{23a}\x{23a}YZ
+ 0: \x{2c65}\x{2c65}\x{23a}\x{23a}Y
+ 1: \x{2c65}\x{2c65}
+
+/-- --/ 
+
+/-- These scripts weren't yet in Perl when I added Unicode 6.0.0 to PCRE --/
+
+/^[\p{Batak}]/8
+    \x{1bc0}
+ 0: \x{1bc0}
+    \x{1bff}
+ 0: \x{1bff}
+    ** Failers
 No match
-    b
+    \x{1bf4}
 No match
     
-
-/a*/
-    
-
-/([abc])*d/
-    abbbcd
- 0: abbbcd
-
-/([abc])*bcd/
-    abcd
- 0: abcd
-
-/a|b|c|d|e/
-    e
- 0: e
-
-/(a|b|c|d|e)f/
-    ef
- 0: ef
-
-/abcd*efg/
-    abcdefg
- 0: abcdefg
-
-/ab*/
-    xabyabbbz
- 0: ab
- 1: a
-    xayabbbz
- 0: a
-
-/(ab|cd)e/
-    abcde
- 0: cde
-
-/[abhgefdc]ij/
-    hij
- 0: hij
-
-/^(ab|cd)e/
-
-/(abc|)ef/
-    abcdef
- 0: ef
-
-/(a|b)c*d/
-    abcd
- 0: bcd
-
-/(ab|ab*)bc/
-    abc
- 0: abc
-
-/a([bc]*)c*/
-    abc
- 0: abc
- 1: ab
- 2: a
-
-/a([bc]*)(c*d)/
-    abcd
- 0: abcd
-
-/a([bc]+)(c*d)/
-    abcd
- 0: abcd
-
-/a([bc]*)(c+d)/
-    abcd
- 0: abcd
-
-/a[bcd]*dcdcde/
-    adcdcde
- 0: adcdcde
-
-/a[bcd]+dcdcde/
-    *** Failers
-No match
-    abcde
-No match
-    adcdcde
-No match
-
-/(ab|a)b*c/
-    abc
- 0: abc
-
-/((a)(b)c)(d)/
-    abcd
- 0: abcd
-
-/[a-zA-Z_][a-zA-Z0-9_]*/
-    alpha
- 0: alpha
- 1: alph
- 2: alp
- 3: al
- 4: a
-
-/^a(bc+|b[eh])g|.h$/
-    abh
- 0: bh
-
-/(bc+d$|ef*g.|h?i(j|k))/
-    effgz
- 0: effgz
-    ij
- 0: ij
-    reffgz
- 0: effgz
-    *** Failers
-No match
-    effg
-No match
-    bcdd
-No match
-
-/((((((((((a))))))))))/
-    a
- 0: a
-
-/(((((((((a)))))))))/
-    a
- 0: a
-
-/multiple words of text/
-    *** Failers
-No match
-    aa
-No match
-    uh-uh
-No match
-
-/multiple words/
-    multiple words, yeah
- 0: multiple words
-
-/(.*)c(.*)/
-    abcde
- 0: abcde
- 1: abcd
- 2: abc
-
-/\((.*), (.*)\)/
-    (a, b)
- 0: (a, b)
-
-/[k]/
-
-/abcd/
-    abcd
- 0: abcd
-
-/a(bc)d/
-    abcd
- 0: abcd
-
-/a[-]?c/
-    ac
- 0: ac
-
-/abc/i
-    ABC
- 0: ABC
-    XABCY
- 0: ABC
-    ABABC
- 0: ABC
-    *** Failers
-No match
-    aaxabxbaxbbx
-No match
-    XBC
-No match
-    AXC
-No match
-    ABX
-No match
-
-/ab*c/i
-    ABC
- 0: ABC
-
-/ab*bc/i
-    ABC
- 0: ABC
-    ABBC
- 0: ABBC
-
-/ab*?bc/i
-    ABBBBC
- 0: ABBBBC
-
-/ab{0,}?bc/i
-    ABBBBC
- 0: ABBBBC
-
-/ab+?bc/i
-    ABBC
- 0: ABBC
-
-/ab+bc/i
-    *** Failers
-No match
-    ABC
-No match
-    ABQ
-No match
-
-/ab{1,}bc/i
-
-/ab+bc/i
-    ABBBBC
- 0: ABBBBC
-
-/ab{1,}?bc/i
-    ABBBBC
- 0: ABBBBC
-
-/ab{1,3}?bc/i
-    ABBBBC
- 0: ABBBBC
-
-/ab{3,4}?bc/i
-    ABBBBC
- 0: ABBBBC
-
-/ab{4,5}?bc/i
-    *** Failers
-No match
-    ABQ
-No match
-    ABBBBC
-No match
-
-/ab??bc/i
-    ABBC
- 0: ABBC
-    ABC
- 0: ABC
-
-/ab{0,1}?bc/i
-    ABC
- 0: ABC
-
-/ab??bc/i
-
-/ab??c/i
-    ABC
- 0: ABC
-
-/ab{0,1}?c/i
-    ABC
- 0: ABC
-
-/^abc$/i
-    ABC
- 0: ABC
-    *** Failers
-No match
-    ABBBBC
-No match
-    ABCC
-No match
-
-/^abc/i
-    ABCC
- 0: ABC
-
-/^abc$/i
-
-/abc$/i
-    AABC
- 0: ABC
-
-/^/i
-    ABC
- 0: 
-
-/$/i
-    ABC
- 0: 
-
-/a.c/i
-    ABC
- 0: ABC
-    AXC
- 0: AXC
-
-/a.*?c/i
-    AXYZC
- 0: AXYZC
-
-/a.*c/i
-    *** Failers
-No match
-    AABC
- 0: AABC
-    AXYZD
-No match
-
-/a[bc]d/i
-    ABD
- 0: ABD
-
-/a[b-d]e/i
-    ACE
- 0: ACE
-    *** Failers
-No match
-    ABC
-No match
-    ABD
-No match
-
-/a[b-d]/i
-    AAC
- 0: AC
-
-/a[-b]/i
-    A-
- 0: A-
-
-/a[b-]/i
-    A-
- 0: A-
-
-/a]/i
-    A]
- 0: A]
-
-/a[]]b/i
-    A]B
- 0: A]B
-
-/a[^bc]d/i
-    AED
- 0: AED
-
-/a[^-b]c/i
-    ADC
- 0: ADC
-    *** Failers
-No match
-    ABD
+/^[\p{Brahmi}]/8
+    \x{11000}
+ 0: \x{11000}
+    \x{1106f}
+ 0: \x{1106f}
+    ** Failers
 No match
-    A-C
+    \x{1104e}
 No match
-
-/a[^]b]c/i
-    ADC
- 0: ADC
-
-/ab|cd/i
-    ABC
- 0: AB
-    ABCD
- 0: AB
-
-/()ef/i
-    DEF
- 0: EF
-
-/$b/i
-    *** Failers
-No match
-    A]C
+    
+/^[\p{Mandaic}]/8
+    \x{840}
+ 0: \x{840}
+    \x{85e}
+ 0: \x{85e}
+    ** Failers
 No match
-    B
+    \x{85c}
 No match
-
-/a\(b/i
-    A(B
- 0: A(B
-
-/a\(*b/i
-    AB
- 0: AB
-    A((B
- 0: A((B
-
-/a\\b/i
-    A\B
+    \x{85d}    
 No match
 
-/((a))/i
-    ABC
- 0: A
-
-/(a)b(c)/i
-    ABC
- 0: ABC
-
-/a+b+c/i
-    AABBABC
- 0: ABC
-
-/a{1,}b{1,}c/i
-    AABBABC
- 0: ABC
-
-/a.+?c/i
-    ABCABC
- 0: ABCABC
- 1: ABC
-
-/a.*?c/i
-    ABCABC
- 0: ABCABC
- 1: ABC
-
-/a.{0,5}?c/i
-    ABCABC
- 0: ABCABC
- 1: ABC
-
-/(a+|b)*/i
-    AB
- 0: AB
- 1: A
- 2: 
-
-/(a+|b){0,}/i
-    AB
- 0: AB
- 1: A
- 2: 
-
-/(a+|b)+/i
-    AB
- 0: AB
- 1: A
-
-/(a+|b){1,}/i
-    AB
- 0: AB
- 1: A
-
-/(a+|b)?/i
-    AB
- 0: A
- 1: 
-
-/(a+|b){0,1}/i
-    AB
- 0: A
- 1: 
+/-- --/ 
 
-/(a+|b){0,1}?/i
-    AB
+/(\X*)(.)/s8
+    A\x{300}
  0: A
  1: 
-
-/[^ab]*/i
-    CDE
- 0: CDE
- 1: CD
- 2: C
- 3: 
-
-/abc/i
-
-/a*/i
-    
-
-/([abc])*d/i
-    ABBBCD
- 0: ABBBCD
-
-/([abc])*bcd/i
-    ABCD
- 0: ABCD
-
-/a|b|c|d|e/i
-    E
- 0: E
-
-/(a|b|c|d|e)f/i
-    EF
- 0: EF
-
-/abcd*efg/i
-    ABCDEFG
- 0: ABCDEFG
-
-/ab*/i
-    XABYABBBZ
- 0: AB
- 1: A
-    XAYABBBZ
- 0: A
-
-/(ab|cd)e/i
-    ABCDE
- 0: CDE
-
-/[abhgefdc]ij/i
-    HIJ
- 0: HIJ
-
-/^(ab|cd)e/i
-    ABCDE
-No match
-
-/(abc|)ef/i
-    ABCDEF
- 0: EF
-
-/(a|b)c*d/i
-    ABCD
- 0: BCD
-
-/(ab|ab*)bc/i
-    ABC
- 0: ABC
-
-/a([bc]*)c*/i
-    ABC
- 0: ABC
- 1: AB
  2: A
 
-/a([bc]*)(c*d)/i
-    ABCD
- 0: ABCD
-
-/a([bc]+)(c*d)/i
-    ABCD
- 0: ABCD
-
-/a([bc]*)(c+d)/i
-    ABCD
- 0: ABCD
-
-/a[bcd]*dcdcde/i
-    ADCDCDE
- 0: ADCDCDE
-
-/a[bcd]+dcdcde/i
-
-/(ab|a)b*c/i
-    ABC
- 0: ABC
-
-/((a)(b)c)(d)/i
-    ABCD
- 0: ABCD
-
-/[a-zA-Z_][a-zA-Z0-9_]*/i
-    ALPHA
- 0: ALPHA
- 1: ALPH
- 2: ALP
- 3: AL
- 4: A
-
-/^a(bc+|b[eh])g|.h$/i
-    ABH
- 0: BH
-
-/(bc+d$|ef*g.|h?i(j|k))/i
-    EFFGZ
- 0: EFFGZ
-    IJ
- 0: IJ
-    REFFGZ
- 0: EFFGZ
-    *** Failers
-No match
-    ADCDCDE
-No match
-    EFFG
-No match
-    BCDD
-No match
-
-/((((((((((a))))))))))/i
-    A
- 0: A
-
-/(((((((((a)))))))))/i
-    A
- 0: A
-
-/(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))/i
-    A
- 0: A
-
-/(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))/i
-    C
- 0: C
-
-/multiple words of text/i
-    *** Failers
-No match
-    AA
-No match
-    UH-UH
-No match
-
-/multiple words/i
-    MULTIPLE WORDS, YEAH
- 0: MULTIPLE WORDS
-
-/(.*)c(.*)/i
-    ABCDE
- 0: ABCDE
- 1: ABCD
- 2: ABC
-
-/\((.*), (.*)\)/i
-    (A, B)
- 0: (A, B)
-
-/[k]/i
-
-/abcd/i
-    ABCD
- 0: ABCD
-
-/a(bc)d/i
-    ABCD
- 0: ABCD
-
-/a[-]?c/i
-    AC
- 0: AC
-
-/a(?!b)./
-    abad
- 0: ad
-
-/a(?=d)./
-    abad
- 0: ad
-
-/a(?=c|d)./
-    abad
- 0: ad
-
-/a(?:b|c|d)(.)/
-    ace
- 0: ace
-
-/a(?:b|c|d)*(.)/
-    ace
- 0: ace
- 1: ac
-
-/a(?:b|c|d)+?(.)/
-    ace
- 0: ace
-    acdbcdbe
- 0: acdbcdbe
- 1: acdbcdb
- 2: acdbcd
- 3: acdbc
- 4: acdb
- 5: acd
-
-/a(?:b|c|d)+(.)/
-    acdbcdbe
- 0: acdbcdbe
- 1: acdbcdb
- 2: acdbcd
- 3: acdbc
- 4: acdb
- 5: acd
-
-/a(?:b|c|d){2}(.)/
-    acdbcdbe
- 0: acdb
-
-/a(?:b|c|d){4,5}(.)/
-    acdbcdbe
- 0: acdbcdb
- 1: acdbcd
-
-/a(?:b|c|d){4,5}?(.)/
-    acdbcdbe
- 0: acdbcdb
- 1: acdbcd
-
-/((foo)|(bar))*/
-    foobar
- 0: foobar
- 1: foo
- 2: 
-
-/a(?:b|c|d){6,7}(.)/
-    acdbcdbe
- 0: acdbcdbe
-
-/a(?:b|c|d){6,7}?(.)/
-    acdbcdbe
- 0: acdbcdbe
-
-/a(?:b|c|d){5,6}(.)/
-    acdbcdbe
- 0: acdbcdbe
- 1: acdbcdb
-
-/a(?:b|c|d){5,6}?(.)/
-    acdbcdbe
- 0: acdbcdbe
- 1: acdbcdb
-
-/a(?:b|c|d){5,7}(.)/
-    acdbcdbe
- 0: acdbcdbe
- 1: acdbcdb
-
-/a(?:b|c|d){5,7}?(.)/
-    acdbcdbe
- 0: acdbcdbe
- 1: acdbcdb
-
-/a(?:b|(c|e){1,2}?|d)+?(.)/
-    ace
- 0: ace
-
-/^(.+)?B/
-    AB
- 0: AB
-
-/^([^a-z])|(\^)$/
-    .
- 0: .
-
-/^[<>]&/
-    <&OUT
- 0: <&
-
-/(?:(f)(o)(o)|(b)(a)(r))*/
-    foobar
- 0: foobar
- 1: foo
- 2: 
-
-/(?<=a)b/
-    ab
- 0: b
-    *** Failers
-No match
-    cb
-No match
-    b
-No match
-
-/(?<!c)b/
-    ab
- 0: b
-    b
- 0: b
-    b
- 0: b
-
-/(?:..)*a/
-    aba
- 0: aba
- 1: a
-
-/(?:..)*?a/
-    aba
- 0: aba
- 1: a
-
-/^(){3,5}/
-    abc
- 0: 
-
-/^(a+)*ax/
-    aax
- 0: aax
-
-/^((a|b)+)*ax/
-    aax
- 0: aax
-
-/^((a|bc)+)*ax/
-    aax
- 0: aax
-
-/(a|x)*ab/
-    cab
- 0: ab
-
-/(a)*ab/
-    cab
- 0: ab
-
-/(?:(?i)a)b/
-    ab
- 0: ab
-
-/((?i)a)b/
-    ab
- 0: ab
-
-/(?:(?i)a)b/
-    Ab
- 0: Ab
-
-/((?i)a)b/
-    Ab
- 0: Ab
-
-/(?:(?i)a)b/
-    *** Failers
-No match
-    cb
-No match
-    aB
-No match
-
-/((?i)a)b/
-
-/(?i:a)b/
-    ab
- 0: ab
-
-/((?i:a))b/
-    ab
- 0: ab
-
-/(?i:a)b/
-    Ab
- 0: Ab
-
-/((?i:a))b/
-    Ab
- 0: Ab
-
-/(?i:a)b/
-    *** Failers
-No match
-    aB
-No match
-    aB
-No match
-
-/((?i:a))b/
-
-/(?:(?-i)a)b/i
-    ab
- 0: ab
-
-/((?-i)a)b/i
-    ab
- 0: ab
-
-/(?:(?-i)a)b/i
-    aB
- 0: aB
-
-/((?-i)a)b/i
-    aB
- 0: aB
-
-/(?:(?-i)a)b/i
-    *** Failers
-No match
-    aB
- 0: aB
-    Ab
-No match
-
-/((?-i)a)b/i
-
-/(?:(?-i)a)b/i
-    aB
- 0: aB
-
-/((?-i)a)b/i
-    aB
- 0: aB
-
-/(?:(?-i)a)b/i
-    *** Failers
-No match
-    Ab
-No match
-    AB
-No match
-
-/((?-i)a)b/i
-
-/(?-i:a)b/i
-    ab
- 0: ab
-
-/((?-i:a))b/i
-    ab
- 0: ab
-
-/(?-i:a)b/i
-    aB
- 0: aB
-
-/((?-i:a))b/i
-    aB
- 0: aB
-
-/(?-i:a)b/i
-    *** Failers
-No match
-    AB
-No match
-    Ab
-No match
-
-/((?-i:a))b/i
-
-/(?-i:a)b/i
-    aB
- 0: aB
-
-/((?-i:a))b/i
-    aB
- 0: aB
-
-/(?-i:a)b/i
-    *** Failers
-No match
-    Ab
-No match
-    AB
-No match
-
-/((?-i:a))b/i
-
-/((?-i:a.))b/i
-    *** Failers
-No match
-    AB
-No match
-    a\nB
-No match
-
-/((?s-i:a.))b/i
-    a\nB
- 0: a\x0aB
-
-/(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))/
-    cabbbb
- 0: cabbbb
-
-/(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))/
-    caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
- 0: caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-
-/foo\w*\d{4}baz/
-    foobar1234baz
- 0: foobar1234baz
-
-/x(~~)*(?:(?:F)?)?/
-    x~~
- 0: x~~
- 1: x
-
-/^a(?#xxx){3}c/
-    aaac
- 0: aaac
-
-/^a (?#xxx) (?#yyy) {3}c/x
-    aaac
- 0: aaac
-
-/(?<![cd])b/
-    *** Failers
-No match
-    B\nB
-No match
-    dbcb
-No match
-
-/(?<![cd])[ab]/
-    dbaacb
- 0: a
-
-/(?<!(c|d))b/
-
-/(?<!(c|d))[ab]/
-    dbaacb
- 0: a
-
-/(?<!cd)[ab]/
-    cdaccb
- 0: b
-
-/^(?:a?b?)*$/
-    *** Failers
-No match
-    dbcb
-No match
-    a--
-No match
-
-/((?s)^a(.))((?m)^b$)/
-    a\nb\nc\n
- 0: a\x0ab
-
-/((?m)^b$)/
-    a\nb\nc\n
- 0: b
-
-/(?m)^b/
-    a\nb\n
- 0: b
-
-/(?m)^(b)/
-    a\nb\n
- 0: b
-
-/((?m)^b)/
-    a\nb\n
- 0: b
-
-/\n((?m)^b)/
-    a\nb\n
- 0: \x0ab
-
-/((?s).)c(?!.)/
-    a\nb\nc\n
- 0: \x0ac
-    a\nb\nc\n
- 0: \x0ac
-
-/((?s)b.)c(?!.)/
-    a\nb\nc\n
- 0: b\x0ac
-    a\nb\nc\n
- 0: b\x0ac
-
-/^b/
-
-/()^b/
-    *** Failers
-No match
-    a\nb\nc\n
-No match
-    a\nb\nc\n
-No match
-
-/((?m)^b)/
-    a\nb\nc\n
- 0: b
-
-/(?(?!a)a|b)/
-
-/(?(?!a)b|a)/
-    a
- 0: a
-
-/(?(?=a)b|a)/
-    *** Failers
-No match
-    a
-No match
-    a
-No match
-
-/(?(?=a)a|b)/
-    a
- 0: a
-
-/(\w+:)+/
-    one:
- 0: one:
-
-/$(?<=^(a))/
-    a
- 0: 
-
-/([\w:]+::)?(\w+)$/
-    abcd
- 0: abcd
-    xy:z:::abcd
- 0: xy:z:::abcd
-
-/^[^bcd]*(c+)/
-    aexycd
- 0: aexyc
-
-/(a*)b+/
-    caab
- 0: aab
-
-/([\w:]+::)?(\w+)$/
-    abcd
- 0: abcd
-    xy:z:::abcd
- 0: xy:z:::abcd
-    *** Failers
- 0: Failers
-    abcd:
-No match
-    abcd:
-No match
-
-/^[^bcd]*(c+)/
-    aexycd
- 0: aexyc
-
-/(>a+)ab/
-
-/(?>a+)b/
-    aaab
- 0: aaab
-
-/([[:]+)/
-    a:[b]:
- 0: :[
- 1: :
-
-/([[=]+)/
-    a=[b]=
- 0: =[
- 1: =
-
-/([[.]+)/
-    a.[b].
- 0: .[
- 1: .
-
-/((?>a+)b)/
-    aaab
- 0: aaab
-
-/(?>(a+))b/
-    aaab
- 0: aaab
-
-/((?>[^()]+)|\([^()]*\))+/
-    ((abc(ade)ufh()()x
- 0: abc(ade)ufh()()x
- 1: abc(ade)ufh()()
- 2: abc(ade)ufh()
- 3: abc(ade)ufh
- 4: abc(ade)
- 5: abc
-
-/a\Z/
-    *** Failers
-No match
-    aaab
-No match
-    a\nb\n
-No match
-
-/b\Z/
-    a\nb\n
- 0: b
-
-/b\z/
-
-/b\Z/
-    a\nb
- 0: b
-
-/b\z/
-    a\nb
- 0: b
-    *** Failers
-No match
+/^S(\X*)e(\X*)$/8
+    Stéréo
+ 0: Ste\x{301}re\x{301}o
+ 1: te\x{301}r
+ 2: \x{301}o
     
-/(?>.*)(?<=(abcd|wxyz))/
-    alphabetabcd
- 0: alphabetabcd
-    endingwxyz
- 0: endingwxyz
-    *** Failers
-No match
-    a rather long string that doesn't end with one of them
-No match
-
-/word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword/
-    word cat dog elephant mussel cow horse canary baboon snake shark otherword
- 0: word cat dog elephant mussel cow horse canary baboon snake shark otherword
-    word cat dog elephant mussel cow horse canary baboon snake shark
-No match
-  
-/word (?>[a-zA-Z0-9]+ ){0,30}otherword/
-    word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope
-No match
-
-/(?<=\d{3}(?!999))foo/
-    999foo
- 0: foo
-    123999foo 
- 0: foo
-    *** Failers
-No match
-    123abcfoo
-No match
-    
-/(?<=(?!...999)\d{3})foo/
-    999foo
- 0: foo
-    123999foo 
- 0: foo
-    *** Failers
-No match
-    123abcfoo
-No match
+/^\X/8 
+    ́réo
+ 0: \x{301}
 
-/(?<=\d{3}(?!999)...)foo/
-    123abcfoo
- 0: foo
-    123456foo 
- 0: foo
+/^a\X41z/<JS>
+    aX41z
+ 0: aX41z
     *** Failers
 No match
-    123999foo  
-No match
-    
-/(?<=\d{3}...)(?<!999)foo/
-    123abcfoo   
- 0: foo
-    123456foo 
- 0: foo
-    *** Failers
-No match
-    123999foo  
+    aAz
 No match
 
-/((Z)+|A)*/
-    ZABCDEFG
- 0: ZA
- 1: Z
- 2: 
-
-/(Z()|A)*/
-    ZABCDEFG
- 0: ZA
- 1: Z
- 2: 
-
-/(Z(())|A)*/
-    ZABCDEFG
- 0: ZA
- 1: Z
- 2: 
-
-/((?>Z)+|A)*/
-    ZABCDEFG
- 0: ZA
- 1: Z
- 2: 
-
-/((?>)+|A)*/
-    ZABCDEFG
- 0: 
-
-/a*/g
-    abbab
- 0: a
- 1: 
- 0: 
- 0: 
- 0: a
- 1: 
- 0: 
- 0: 
+/(?<=ab\Cde)X/8
+Failed: \C not allowed in lookbehind assertion at offset 10
 
-/^[a-\d]/
-    abcde
- 0: a
-    -things
- 0: -
-    0digit
- 0: 0
-    *** Failers
-No match
-    bcdef    
-No match
-
-/^[\d-a]/
-    abcde
+/\X/
+    a\P
  0: a
-    -things
- 0: -
-    0digit
- 0: 0
-    *** Failers
-No match
-    bcdef    
-No match
-    
-/[[:space:]]+/
-    > \x09\x0a\x0c\x0d\x0b<
- 0:  \x09\x0a\x0c\x0d\x0b
- 1:  \x09\x0a\x0c\x0d
- 2:  \x09\x0a\x0c
- 3:  \x09\x0a
- 4:  \x09
- 5:  
-     
-/[[:blank:]]+/
-    > \x09\x0a\x0c\x0d\x0b<
- 0:  \x09
- 1:  
-     
-/[\s]+/
-    > \x09\x0a\x0c\x0d\x0b<
- 0:  \x09\x0a\x0c\x0d
- 1:  \x09\x0a\x0c
- 2:  \x09\x0a
- 3:  \x09
- 4:  
-     
-/\s+/
-    > \x09\x0a\x0c\x0d\x0b<
- 0:  \x09\x0a\x0c\x0d
- 1:  \x09\x0a\x0c
- 2:  \x09\x0a
- 3:  \x09
- 4:  
-     
-/ab/x
-    ab
-No match
-
-/(?!\A)x/m
-  a\nxb\n
- 0: x
-
-/(?!^)x/m
-  a\nxb\n
-No match
-
-/abc\Qabc\Eabc/
-    abcabcabc
- 0: abcabcabc
-    
-/abc\Q(*+|\Eabc/
-    abc(*+|abc 
- 0: abc(*+|abc
-
-/   abc\Q abc\Eabc/x
-    abc abcabc
- 0: abc abcabc
-    *** Failers
-No match
-    abcabcabc  
-No match
-    
-/abc#comment
-    \Q#not comment
-    literal\E/x
-    abc#not comment\n    literal     
- 0: abc#not comment\x0a    literal
-
-/abc#comment
-    \Q#not comment
-    literal/x
-    abc#not comment\n    literal     
- 0: abc#not comment\x0a    literal
-
-/abc#comment
-    \Q#not comment
-    literal\E #more comment
-    /x
-    abc#not comment\n    literal     
- 0: abc#not comment\x0a    literal
-
-/abc#comment
-    \Q#not comment
-    literal\E #more comment/x
-    abc#not comment\n    literal     
- 0: abc#not comment\x0a    literal
-
-/\Qabc\$xyz\E/
-    abc\\\$xyz
- 0: abc\$xyz
-
-/\Qabc\E\$\Qxyz\E/
-    abc\$xyz
- 0: abc$xyz
-
-/\Gabc/
-    abc
- 0: abc
-    *** Failers
-No match
-    xyzabc  
-No match
-
-/\Gabc./g
-    abc1abc2xyzabc3
- 0: abc1
- 0: abc2
-
-/abc./g
-    abc1abc2xyzabc3 
- 0: abc1
- 0: abc2
- 0: abc3
-
-/a(?x: b c )d/
-    XabcdY
- 0: abcd
-    *** Failers 
-No match
-    Xa b c d Y 
-No match
-
-/((?x)x y z | a b c)/
-    XabcY
- 0: abc
-    AxyzB 
- 0: xyz
+    a\P\P
+Partial match: a
 
-/(?i)AB(?-i)C/
-    XabCY
- 0: abC
-    *** Failers
-No match
-    XabcY  
-No match
+/\Xa/
+    aa\P
+ 0: aa
+    aa\P\P
+ 0: aa
 
-/((?i)AB(?-i)C|D)E/
-    abCE
- 0: abCE
-    DE
- 0: DE
-    *** Failers
-No match
-    abcE
-No match
-    abCe  
-No match
-    dE
-No match
-    De    
-No match
+/\X{2}/
+    aa\P
+ 0: aa
+    aa\P\P
+Partial match: aa
 
-/[z\Qa-d]\E]/
-    z
- 0: z
-    a
- 0: a
-    -
- 0: -
-    d
- 0: d
-    ] 
- 0: ]
-    *** Failers
- 0: a
-    b     
-No match
+/\X+a/
+    a\P
+Partial match: a
+    aa\P
+ 0: aa
+    aa\P\P
+Partial match: aa
 
-/[\z\C]/
-    z
- 0: z
-    C 
- 0: C
-    
-/\M/
-    M 
- 0: M
-    
-/(a+)*b/
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
-No match
-    
-/(?i)reg(?:ul(?:[a�]|ae)r|ex)/
-    REGular
- 0: REGular
-    regulaer
- 0: regulaer
-    Regex  
- 0: Regex
-    regul�r 
- 0: regul\xe4r
-
-/����[�-��-�]+/
-    �����
- 0: \xc5\xe6\xe5\xe4\xe0
-    �����
- 0: \xc5\xe6\xe5\xe4\xff
-    �����
- 0: \xc5\xe6\xe5\xe4\xc0
-    �����
- 0: \xc5\xe6\xe5\xe4\xdf
-
-/(?<=Z)X./
-    \x84XAZXB
- 0: XB
-
-/^(?(2)a|(1)(2))+$/
-    123a
-Error -17
-
-/(?<=a|bbbb)c/
-    ac
- 0: c
-    bbbbc
- 0: c
-
-/abc/>testsavedregex
-Compiled regex written to testsavedregex
-<testsavedregex
-Compiled regex loaded from testsavedregex
-No study data
-    abc
- 0: abc
-    *** Failers
-No match
-    bca
-No match
+/\X+?a/
+    a\P
+Partial match: a
+    ab\P
+Partial match: ab
+    aa\P
+ 0: aa
+    aa\P\P
+ 0: aa
+    aba\P
+ 0: aba
     
-/abc/F>testsavedregex
-Compiled regex written to testsavedregex
-<testsavedregex
-Compiled regex (byte-inverted) loaded from testsavedregex
-No study data
-    abc
- 0: abc
-    *** Failers
-No match
-    bca
-No match
+/-- These Unicode 6.1.0 scripts are not known to Perl. --/ 
 
-/(a|b)/S>testsavedregex
-Compiled regex written to testsavedregex
-Study data written to testsavedregex
-<testsavedregex
-Compiled regex loaded from testsavedregex
-Study data loaded from testsavedregex
-    abc
- 0: a
-    *** Failers
- 0: a
-    def  
-No match
-    
-/(a|b)/SF>testsavedregex
-Compiled regex written to testsavedregex
-Study data written to testsavedregex
-<testsavedregex
-Compiled regex (byte-inverted) loaded from testsavedregex
-Study data loaded from testsavedregex
-    abc
- 0: a
-    *** Failers
- 0: a
-    def  
-No match
-    
-/line\nbreak/
-    this is a line\nbreak
- 0: line\x0abreak
-    line one\nthis is a line\nbreak in the second line 
- 0: line\x0abreak
-
-/line\nbreak/f
-    this is a line\nbreak
- 0: line\x0abreak
-    ** Failers 
-No match
-    line one\nthis is a line\nbreak in the second line 
-No match
+/\p{Chakma}\d/8W
+    \x{11100}\x{1113c}
+ 0: \x{11100}\x{1113c}
 
-/line\nbreak/mf
-    this is a line\nbreak
- 0: line\x0abreak
-    ** Failers 
-No match
-    line one\nthis is a line\nbreak in the second line 
-No match
+/\p{Takri}\d/8W
+    \x{11680}\x{116c0}
+ 0: \x{11680}\x{116c0}
 
-/1234/
-    123\P
-Partial match: 123
-    a4\P\R
-No match
+/^\X/8
+    A\P
+ 0: A
+    A\P\P 
+Partial match: A
+    A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}
+    A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}
+    A\x{301}\P
+ 0: A\x{301}
+    A\x{301}\P\P  
+Partial match: A\x{301}
+    
+/^\X{2,3}/8
+    A\P
+Partial match: A
+    A\P\P 
+Partial match: A
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+    A\x{300}\x{301}\P
+Partial match: A\x{300}\x{301}
+    A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}A\x{300}\x{301}
+
+/^\X{2}/8
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+    A\x{300}\x{301}A\x{300}\x{301}\P
+ 0: A\x{300}\x{301}A\x{300}\x{301}
+    A\x{300}\x{301}A\x{300}\x{301}\P\P  
+Partial match: A\x{300}\x{301}A\x{300}\x{301}
+    
+/^\X+/8
+    AA\P
+ 0: AA
+    AA\P\P  
+Partial match: AA
+
+/^\X+?Z/8
+    AA\P
+Partial match: AA
+    AA\P\P 
+Partial match: AA
+
+/A\x{3a3}B/8iDZ
+------------------------------------------------------------------
+        Bra
+     /i A
+        clist 03a3 03c2 03c3
+     /i B
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: caseless utf
+First char = 'A' (caseless)
+Need char = 'B' (caseless)
+
+/\x{3a3}B/8iDZ
+------------------------------------------------------------------
+        Bra
+        clist 03a3 03c2 03c3
+     /i B
+        Ket
+        End
+------------------------------------------------------------------
+Capturing subpattern count = 0
+Options: caseless utf
+No first char
+Need char = 'B' (caseless)
+
+/[\x{3a3}]/8iBZ
+------------------------------------------------------------------
+        Bra
+        clist 03a3 03c2 03c3
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^\x{3a3}]/8iBZ
+------------------------------------------------------------------
+        Bra
+        not clist 03a3 03c2 03c3
+        Ket
+        End
+------------------------------------------------------------------
+
+/[\x{3a3}]+/8iBZ
+------------------------------------------------------------------
+        Bra
+        clist 03a3 03c2 03c3 +
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^\x{3a3}]+/8iBZ
+------------------------------------------------------------------
+        Bra
+        not clist 03a3 03c2 03c3 +
+        Ket
+        End
+------------------------------------------------------------------
+
+/a*\x{3a3}/8iBZ
+------------------------------------------------------------------
+        Bra
+     /i a*+
+        clist 03a3 03c2 03c3
+        Ket
+        End
+------------------------------------------------------------------
+
+/\x{3a3}+a/8iBZ
+------------------------------------------------------------------
+        Bra
+        clist 03a3 03c2 03c3 ++
+     /i a
+        Ket
+        End
+------------------------------------------------------------------
+
+/\x{3a3}*\x{3c2}/8iBZ
+------------------------------------------------------------------
+        Bra
+        clist 03a3 03c2 03c3 *
+        clist 03a3 03c2 03c3
+        Ket
+        End
+------------------------------------------------------------------
+
+/\x{3a3}{3}/8i+
+    \x{3a3}\x{3c3}\x{3c2}\x{3a3}\x{3c3}\x{3c2}
+ 0: \x{3a3}\x{3c3}\x{3c2}
+ 0+ \x{3a3}\x{3c3}\x{3c2}
+
+/\x{3a3}{2,4}/8i+
+    \x{3a3}\x{3c3}\x{3c2}\x{3a3}\x{3c3}\x{3c2}
+ 0: \x{3a3}\x{3c3}\x{3c2}\x{3a3}
+ 0+ \x{3c3}\x{3c2}
+
+/\x{3a3}{2,4}?/8i+
+    \x{3a3}\x{3c3}\x{3c2}\x{3a3}\x{3c3}\x{3c2}
+ 0: \x{3a3}\x{3c3}
+ 0+ \x{3c2}\x{3a3}\x{3c3}\x{3c2}
+
+/\x{3a3}+./8i+
+    \x{3a3}\x{3c3}\x{3c2}\x{3a3}\x{3c3}\x{3c2}
+ 0: \x{3a3}\x{3c3}\x{3c2}\x{3a3}\x{3c3}\x{3c2}
+ 0+ 
 
-/1234/
-    123\P
-Partial match: 123
-    4\P\R
- 0: 4
-
-/^/mg
-    a\nb\nc\n
- 0: 
- 0: 
- 0: 
-    \ 
- 0: 
-    
-/(?<=C\n)^/mg
-    A\nC\nC\n 
- 0: 
-
-/(?s)A?B/
-    AB
- 0: AB
-    aB  
- 0: B
-
-/(?s)A*B/
-    AB
- 0: AB
-    aB  
- 0: B
-
-/(?m)A?B/
-    AB
- 0: AB
-    aB  
- 0: B
-
-/(?m)A*B/
-    AB
- 0: AB
-    aB  
- 0: B
-
-/Content-Type\x3A[^\r\n]{6,}/
-    Content-Type:xxxxxyyy 
- 0: Content-Type:xxxxxyyy
- 1: Content-Type:xxxxxyy
- 2: Content-Type:xxxxxy
-
-/Content-Type\x3A[^\r\n]{6,}z/
-    Content-Type:xxxxxyyyz
- 0: Content-Type:xxxxxyyyz
-
-/Content-Type\x3A[^a]{6,}/
-    Content-Type:xxxyyy 
- 0: Content-Type:xxxyyy
-
-/Content-Type\x3A[^a]{6,}z/
-    Content-Type:xxxyyyz
- 0: Content-Type:xxxyyyz
-
-/^abc/m
-    xyz\nabc
- 0: abc
-    xyz\nabc\<lf>
- 0: abc
-    xyz\r\nabc\<lf>
- 0: abc
-    xyz\rabc\<cr>
- 0: abc
-    xyz\r\nabc\<crlf>
- 0: abc
-    ** Failers 
-No match
-    xyz\nabc\<cr>
-No match
-    xyz\r\nabc\<cr>
-No match
-    xyz\nabc\<crlf>
-No match
-    xyz\rabc\<crlf>
-No match
-    xyz\rabc\<lf>
-No match
-    
-/abc$/m<lf>
-    xyzabc
- 0: abc
-    xyzabc\n 
- 0: abc
-    xyzabc\npqr 
- 0: abc
-    xyzabc\r\<cr> 
- 0: abc
-    xyzabc\rpqr\<cr> 
- 0: abc
-    xyzabc\r\n\<crlf> 
- 0: abc
-    xyzabc\r\npqr\<crlf> 
- 0: abc
+/\x{3a3}++./8i+
     ** Failers
 No match
-    xyzabc\r 
-No match
-    xyzabc\rpqr 
-No match
-    xyzabc\r\n 
-No match
-    xyzabc\r\npqr 
-No match
-    
-/^abc/m<cr>
-    xyz\rabcdef
- 0: abc
-    xyz\nabcdef\<lf>
- 0: abc
-    ** Failers  
-No match
-    xyz\nabcdef
-No match
-       
-/^abc/m<lf>
-    xyz\nabcdef
- 0: abc
-    xyz\rabcdef\<cr>
- 0: abc
-    ** Failers  
-No match
-    xyz\rabcdef
-No match
-       
-/^abc/m<crlf>
-    xyz\r\nabcdef
- 0: abc
-    xyz\rabcdef\<cr>
- 0: abc
-    ** Failers  
-No match
-    xyz\rabcdef
-No match
-    
-/.*/<lf>
-    abc\ndef
- 0: abc
- 1: ab
- 2: a
- 3: 
-    abc\rdef
- 0: abc\x0ddef
- 1: abc\x0dde
- 2: abc\x0dd
- 3: abc\x0d
- 4: abc
- 5: ab
- 6: a
- 7: 
-    abc\r\ndef
- 0: abc\x0d
- 1: abc
- 2: ab
- 3: a
- 4: 
-    \<cr>abc\ndef
- 0: abc\x0adef
- 1: abc\x0ade
- 2: abc\x0ad
- 3: abc\x0a
- 4: abc
- 5: ab
- 6: a
- 7: 
-    \<cr>abc\rdef
- 0: abc
- 1: ab
- 2: a
- 3: 
-    \<cr>abc\r\ndef
- 0: abc
- 1: ab
- 2: a
- 3: 
-    \<crlf>abc\ndef
- 0: abc\x0adef
- 1: abc\x0ade
- 2: abc\x0ad
- 3: abc\x0a
- 4: abc
- 5: ab
- 6: a
- 7: 
-    \<crlf>abc\rdef
- 0: abc\x0ddef
- 1: abc\x0dde
- 2: abc\x0dd
- 3: abc\x0d
- 4: abc
- 5: ab
- 6: a
- 7: 
-    \<crlf>abc\r\ndef
- 0: abc
- 1: ab
- 2: a
- 3: 
-
-/\w+(.)(.)?def/s
-    abc\ndef
- 0: abc\x0adef
-    abc\rdef
- 0: abc\x0ddef
-    abc\r\ndef
- 0: abc\x0d\x0adef
-
-/^\w+=.*(\\\n.*)*/
-    abc=xyz\\\npqr
- 0: abc=xyz\\x0apqr
- 1: abc=xyz\\x0apq
- 2: abc=xyz\\x0ap
- 3: abc=xyz\\x0a
- 4: abc=xyz\
- 5: abc=xyz
- 6: abc=xy
- 7: abc=x
- 8: abc=
-
-/^(a()*)*/
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
- 4: 
-
-/^(?:a(?:(?:))*)*/
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
- 4: 
-
-/^(a()+)+/
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
-
-/^(?:a(?:(?:))+)+/
-    aaaa
- 0: aaaa
- 1: aaa
- 2: aa
- 3: a
-
-/(a|)*\d/
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-No match
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
-
-/(?>a|)*\d/
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-No match
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
-
-/(?:a|)*\d/
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-No match
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
-
-/^a.b/<lf>
-    a\rb
- 0: a\x0db
-    a\nb\<cr> 
- 0: a\x0ab
+    \x{3a3}\x{3c3}\x{3c2}\x{3a3}\x{3c3}\x{3c2}
+No match
+
+/\x{3a3}*\x{3c2}/8iBZ
+------------------------------------------------------------------
+        Bra
+        clist 03a3 03c2 03c3 *
+        clist 03a3 03c2 03c3
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^\x{3a3}]*\x{3c2}/8iBZ
+------------------------------------------------------------------
+        Bra
+        not clist 03a3 03c2 03c3 *+
+        clist 03a3 03c2 03c3
+        Ket
+        End
+------------------------------------------------------------------
+
+/[^a]*\x{3c2}/8iBZ
+------------------------------------------------------------------
+        Bra
+     /i [^a]*
+        clist 03a3 03c2 03c3
+        Ket
+        End
+------------------------------------------------------------------
+
+/ist/8iBZ
+------------------------------------------------------------------
+        Bra
+     /i i
+        clist 0053 0073 017f
+     /i t
+        Ket
+        End
+------------------------------------------------------------------
+    ikt
+No match
+
+/is+t/8i
+    iSs\x{17f}t
+ 0: iSs\x{17f}t
+    ikt
+No match
+
+/is+?t/8i
+    ikt
+No match
+
+/is?t/8i
+    ikt
+No match
+
+/is{2}t/8i
+    iskt
+No match
+    
+/-- This property is a PCRE special --/
+
+/^\p{Xuc}/8
+    $abc
+ 0: $
+    @abc
+ 0: @
+    `abc
+ 0: `
+    \x{1234}abc
+ 0: \x{1234}
     ** Failers
 No match
-    a\nb
-No match
-    a\nb\<any>
-No match
-    a\rb\<cr>   
-No match
-    a\rb\<any>   
+    abc     
 No match
 
-/^abc./mgx<any>
-    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 \x{2028}abc8 \x{2029}abc9 JUNK
- 0: abc1
- 0: abc2
- 0: abc3
- 0: abc4
- 0: abc5
- 0: abc6
- 0: abc7
-
-/abc.$/mgx<any>
-    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc7\x{2028} abc8\x{2029} abc9
- 0: abc1
- 0: abc2
- 0: abc3
- 0: abc4
- 0: abc5
- 0: abc6
- 0: abc9
-
-/^a\Rb/<bsr_unicode>
-    a\nb
- 0: a\x0ab
-    a\rb
- 0: a\x0db
-    a\r\nb
- 0: a\x0d\x0ab
-    a\x0bb
- 0: a\x0bb
-    a\x0cb
- 0: a\x0cb
-    a\x85b   
- 0: a\x85b
+/^\p{Xuc}+/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $@`\x{a0}\x{1234}\x{e000}
     ** Failers
 No match
-    a\n\rb    
+    \x{9f}
 No match
 
-/^a\R*b/<bsr_unicode>
-    ab
- 0: ab
-    a\nb
- 0: a\x0ab
-    a\rb
- 0: a\x0db
-    a\r\nb
- 0: a\x0d\x0ab
-    a\x0bb
- 0: a\x0bb
-    a\x0cb
- 0: a\x0cb
-    a\x85b   
- 0: a\x85b
-    a\n\rb    
- 0: a\x0a\x0db
-    a\n\r\x85\x0cb 
- 0: a\x0a\x0d\x85\x0cb
-
-/^a\R+b/<bsr_unicode>
-    a\nb
- 0: a\x0ab
-    a\rb
- 0: a\x0db
-    a\r\nb
- 0: a\x0d\x0ab
-    a\x0bb
- 0: a\x0bb
-    a\x0cb
- 0: a\x0cb
-    a\x85b   
- 0: a\x85b
-    a\n\rb    
- 0: a\x0a\x0db
-    a\n\r\x85\x0cb 
- 0: a\x0a\x0d\x85\x0cb
-    ** Failers
-No match
-    ab  
-No match
-    
-/^a\R{1,3}b/<bsr_unicode>
-    a\nb
- 0: a\x0ab
-    a\n\rb
- 0: a\x0a\x0db
-    a\n\r\x85b
- 0: a\x0a\x0d\x85b
-    a\r\n\r\nb 
- 0: a\x0d\x0a\x0d\x0ab
-    a\r\n\r\n\r\nb 
- 0: a\x0d\x0a\x0d\x0a\x0d\x0ab
-    a\n\r\n\rb
- 0: a\x0a\x0d\x0a\x0db
-    a\n\n\r\nb 
- 0: a\x0a\x0a\x0d\x0ab
+/^\p{Xuc}+?/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $
     ** Failers
 No match
-    a\n\n\n\rb
-No match
-    a\r
+    \x{9f}
 No match
 
-/^a[\R]b/<bsr_unicode>
-    aRb
- 0: aRb
+/^\p{Xuc}+?\*/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $@`\x{a0}\x{1234}\x{e000}*
     ** Failers
 No match
-    a\nb  
+    \x{9f}
 No match
 
-/.+foo/
-    afoo
- 0: afoo
-    ** Failers 
-No match
-    \r\nfoo 
-No match
-    \nfoo 
-No match
-
-/.+foo/<crlf>
-    afoo
- 0: afoo
-    \nfoo 
- 0: \x0afoo
-    ** Failers 
-No match
-    \r\nfoo 
-No match
-
-/.+foo/<any>
-    afoo
- 0: afoo
-    ** Failers 
-No match
-    \nfoo 
-No match
-    \r\nfoo 
-No match
-
-/.+foo/s
-    afoo
- 0: afoo
-    \r\nfoo 
- 0: \x0d\x0afoo
-    \nfoo 
- 0: \x0afoo
-
-/^$/mg<any>
-    abc\r\rxyz
- 0: 
-    abc\n\rxyz  
- 0: 
-    ** Failers 
-No match
-    abc\r\nxyz
-No match
-
-/^X/m
-    XABC
- 0: X
-    ** Failers 
+/^\p{Xuc}++/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $@`\x{a0}\x{1234}\x{e000}
+    ** Failers
 No match
-    XABC\B
+    \x{9f}
 No match
 
-/(?m)^$/<any>g+
-    abc\r\n\r\n
- 0: 
- 0+ \x0d\x0a
-
-/(?m)^$|^\r\n/<any>g+ 
-    abc\r\n\r\n
- 0: \x0d\x0a
- 0+ 
- 1: 
-    
-/(?m)$/<any>g+ 
-    abc\r\n\r\n
- 0: 
- 0+ \x0d\x0a\x0d\x0a
- 0: 
- 0+ \x0d\x0a
- 0: 
- 0+ 
-
-/(?|(abc)|(xyz))/
-   >abc<
- 0: abc
-   >xyz< 
- 0: xyz
-
-/(x)(?|(abc)|(xyz))(x)/
-    xabcx
- 0: xabcx
-    xxyzx 
- 0: xxyzx
-
-/(x)(?|(abc)(pqr)|(xyz))(x)/
-    xabcpqrx
- 0: xabcpqrx
-    xxyzx 
- 0: xxyzx
-
-/(?|(abc)|(xyz))(?1)/
-    abcabc
- 0: abcabc
-    xyzabc 
- 0: xyzabc
-    ** Failers 
-No match
-    xyzxyz 
-No match
- 
-/\H\h\V\v/
-    X X\x0a
- 0: X X\x0a
-    X\x09X\x0b
- 0: X\x09X\x0b
+/^\p{Xuc}{3,5}/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $@`\x{a0}\x{1234}
     ** Failers
 No match
-    \xa0 X\x0a   
+    \x{9f}
 No match
-    
-/\H*\h+\V?\v{3,4}/ 
-    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
- 0: \x09 \xa0X\x0a\x0b\x0c\x0d
- 1: \x09 \xa0X\x0a\x0b\x0c
-    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
- 0: \x09 \xa0\x0a\x0b\x0c\x0d
- 1: \x09 \xa0\x0a\x0b\x0c
-    \x09\x20\xa0\x0a\x0b\x0c
- 0: \x09 \xa0\x0a\x0b\x0c
-    ** Failers 
-No match
-    \x09\x20\xa0\x0a\x0b
-No match
-     
-/\H{3,4}/
-    XY  ABCDE
- 0: ABCD
- 1: ABC
-    XY  PQR ST 
- 0: PQR
-    
-/.\h{3,4}./
-    XY  AB    PQRS
- 0: B    P
- 1: B    
-
-/\h*X\h?\H+Y\H?Z/
-    >XNNNYZ
- 0: XNNNYZ
-    >  X NYQZ
- 0:   X NYQZ
+
+/^\p{Xuc}{3,5}?/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $@`
     ** Failers
 No match
-    >XYZ   
+    \x{9f}
 No match
-    >  X NY Z
-No match
-
-/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
-    >XY\x0aZ\x0aA\x0bNN\x0c
- 0: XY\x0aZ\x0aA\x0bNN\x0c
-    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
- 0: \x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
 
-/.+A/<crlf>
-    \r\nA
-No match
-    
-/\nA/<crlf>
-    \r\nA 
- 0: \x0aA
-
-/[\r\n]A/<crlf>
-    \r\nA 
- 0: \x0aA
-
-/(\r|\n)A/<crlf>
-    \r\nA 
- 0: \x0aA
-
-/a\Rb/I<bsr_anycrlf>
-Capturing subpattern count = 0
-Options: bsr_anycrlf
-First char = 'a'
-Need char = 'b'
-    a\rb
- 0: a\x0db
-    a\nb
- 0: a\x0ab
-    a\r\nb
- 0: a\x0d\x0ab
+/^[\p{Xuc}]/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $
     ** Failers
 No match
-    a\x85b
-No match
-    a\x0bb     
+    \x{9f}
 No match
 
-/a\Rb/I<bsr_unicode>
-Capturing subpattern count = 0
-Options: bsr_unicode
-First char = 'a'
-Need char = 'b'
-    a\rb
- 0: a\x0db
-    a\nb
- 0: a\x0ab
-    a\r\nb
- 0: a\x0d\x0ab
-    a\x85b
- 0: a\x85b
-    a\x0bb     
- 0: a\x0bb
-    ** Failers 
-No match
-    a\x85b\<bsr_anycrlf>
-No match
-    a\x0bb\<bsr_anycrlf>
-No match
-    
-/a\R?b/I<bsr_anycrlf>
-Capturing subpattern count = 0
-Options: bsr_anycrlf
-First char = 'a'
-Need char = 'b'
-    a\rb
- 0: a\x0db
-    a\nb
- 0: a\x0ab
-    a\r\nb
- 0: a\x0d\x0ab
+/^[\p{Xuc}]+/8
+    $@`\x{a0}\x{1234}\x{e000}**
+ 0: $@`\x{a0}\x{1234}\x{e000}
     ** Failers
 No match
-    a\x85b
-No match
-    a\x0bb     
+    \x{9f}
 No match
 
-/a\R?b/I<bsr_unicode>
-Capturing subpattern count = 0
-Options: bsr_unicode
-First char = 'a'
-Need char = 'b'
-    a\rb
- 0: a\x0db
-    a\nb
- 0: a\x0ab
-    a\r\nb
- 0: a\x0d\x0ab
-    a\x85b
- 0: a\x85b
-    a\x0bb     
- 0: a\x0bb
-    ** Failers 
-No match
-    a\x85b\<bsr_anycrlf>
-No match
-    a\x0bb\<bsr_anycrlf>
-No match
-    
-/a\R{2,4}b/I<bsr_anycrlf>
-Capturing subpattern count = 0
-Partial matching not supported
-Options: bsr_anycrlf
-First char = 'a'
-Need char = 'b'
-    a\r\n\nb
- 0: a\x0d\x0a\x0ab
-    a\n\r\rb
- 0: a\x0a\x0d\x0db
-    a\r\n\r\n\r\n\r\nb
- 0: a\x0d\x0a\x0d\x0a\x0d\x0a\x0d\x0ab
+/^\P{Xuc}/8
+    abc
+ 0: a
     ** Failers
+ 0: *
+    $abc
 No match
-    a\x85\85b
-No match
-    a\x0b\0bb     
+    @abc
 No match
-
-/a\R{2,4}b/I<bsr_unicode>
-Capturing subpattern count = 0
-Partial matching not supported
-Options: bsr_unicode
-First char = 'a'
-Need char = 'b'
-    a\r\rb
- 0: a\x0d\x0db
-    a\n\n\nb
- 0: a\x0a\x0a\x0ab
-    a\r\n\n\r\rb
- 0: a\x0d\x0a\x0a\x0d\x0db
-    a\x85\85b
+    `abc
 No match
-    a\x0b\0bb     
+    \x{1234}abc
 No match
-    ** Failers 
+
+/^[\P{Xuc}]/8
+    abc
+ 0: a
+    ** Failers
+ 0: *
+    $abc
 No match
-    a\r\r\r\r\rb 
+    @abc
 No match
-    a\x85\85b\<bsr_anycrlf>
+    `abc
 No match
-    a\x0b\0bb\<bsr_anycrlf>
+    \x{1234}abc
 No match
 
-/ End of testinput7 /
+/-- End of testinput7 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput8 b/lib/stdlib/test/re_SUITE_data/testoutput8
index 631e5b82f9..75affbe2d4 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput8
+++ b/lib/stdlib/test/re_SUITE_data/testoutput8
@@ -1,1035 +1,6813 @@
-/-- Do not use the \x{} construct except with patterns that have the --/
-/-- /8 option set, because PCRE doesn't recognize them as UTF-8 unless --/
+/-- This set of tests check the DFA matching functionality of pcre_dfa_exec().
+    The -dfa flag must be used with pcretest when running it. --/
+     
+/abc/
+    abc
+ 0: abc
+    
+/ab*c/
+    abc
+ 0: abc
+    abbbbc
+ 0: abbbbc
+    ac
+ 0: ac
+    
+/ab+c/
+    abc
+ 0: abc
+    abbbbbbc
+ 0: abbbbbbc
+    *** Failers 
 No match
-/-- that option is set. However, the latest Perls recognize them always. --/
+    ac
 No match
-
-/\x{100}ab/8
-  \x{100}ab
- 0: \x{100}ab
-  
-/a\x{100}*b/8
     ab
- 0: ab
-    a\x{100}b  
- 0: a\x{100}b
-    a\x{100}\x{100}b  
- 0: a\x{100}\x{100}b
-    
-/a\x{100}+b/8
-    a\x{100}b  
- 0: a\x{100}b
-    a\x{100}\x{100}b  
- 0: a\x{100}\x{100}b
+No match
+    
+/a*/
+    a
+ 0: a
+ 1: 
+    aaaaaaaaaaaaaaaaa
+ 0: aaaaaaaaaaaaaaaaa
+ 1: aaaaaaaaaaaaaaaa
+ 2: aaaaaaaaaaaaaaa
+ 3: aaaaaaaaaaaaaa
+ 4: aaaaaaaaaaaaa
+ 5: aaaaaaaaaaaa
+ 6: aaaaaaaaaaa
+ 7: aaaaaaaaaa
+ 8: aaaaaaaaa
+ 9: aaaaaaaa
+10: aaaaaaa
+11: aaaaaa
+12: aaaaa
+13: aaaa
+14: aaa
+15: aa
+16: a
+17: 
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+Matched, but offsets vector is too small to show all matches
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 3: aaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 4: aaaaaaaaaaaaaaaaaaaaaaaaaa
+ 5: aaaaaaaaaaaaaaaaaaaaaaaaa
+ 6: aaaaaaaaaaaaaaaaaaaaaaaa
+ 7: aaaaaaaaaaaaaaaaaaaaaaa
+ 8: aaaaaaaaaaaaaaaaaaaaaa
+ 9: aaaaaaaaaaaaaaaaaaaaa
+10: aaaaaaaaaaaaaaaaaaaa
+11: aaaaaaaaaaaaaaaaaaa
+12: aaaaaaaaaaaaaaaaaa
+13: aaaaaaaaaaaaaaaaa
+14: aaaaaaaaaaaaaaaa
+15: aaaaaaaaaaaaaaa
+16: aaaaaaaaaaaaaa
+17: aaaaaaaaaaaaa
+18: aaaaaaaaaaaa
+19: aaaaaaaaaaa
+20: aaaaaaaaaa
+21: aaaaaaaaa
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\F 
+ 0: 
+    
+/(a|abcd|african)/
+    a
+ 0: a
+    abcd
+ 0: abcd
+ 1: a
+    african
+ 0: african
+ 1: a
+    
+/^abc/
+    abcdef
+ 0: abc
+    *** Failers
+No match
+    xyzabc
+No match
+    xyz\nabc    
+No match
+    
+/^abc/m
+    abcdef
+ 0: abc
+    xyz\nabc    
+ 0: abc
+    *** Failers
+No match
+    xyzabc
+No match
+    
+/\Aabc/
+    abcdef
+ 0: abc
+    *** Failers
+No match
+    xyzabc
+No match
+    xyz\nabc    
+No match
+    
+/\Aabc/m
+    abcdef
+ 0: abc
+    *** Failers
+No match
+    xyzabc
+No match
+    xyz\nabc    
+No match
+    
+/\Gabc/
+    abcdef
+ 0: abc
+    xyzabc\>3
+ 0: abc
+    *** Failers
+No match
+    xyzabc    
+No match
+    xyzabc\>2 
+No match
+    
+/x\dy\Dz/
+    x9yzz
+ 0: x9yzz
+    x0y+z
+ 0: x0y+z
+    *** Failers
+No match
+    xyz
+No match
+    xxy0z     
+No match
+    
+/x\sy\Sz/
+    x yzz
+ 0: x yzz
+    x y+z
+ 0: x y+z
+    *** Failers
+No match
+    xyz
+No match
+    xxyyz
+No match
+    
+/x\wy\Wz/
+    xxy+z
+ 0: xxy+z
+    *** Failers
+No match
+    xxy0z
+No match
+    x+y+z         
+No match
+    
+/x.y/
+    x+y
+ 0: x+y
+    x-y
+ 0: x-y
+    *** Failers
+No match
+    x\ny
+No match
+    
+/x.y/s
+    x+y
+ 0: x+y
+    x-y
+ 0: x-y
+    x\ny
+ 0: x\x0ay
+
+/(a.b(?s)c.d|x.y)p.q/
+    a+bc+dp+q
+ 0: a+bc+dp+q
+    a+bc\ndp+q
+ 0: a+bc\x0adp+q
+    x\nyp+q 
+ 0: x\x0ayp+q
     *** Failers 
 No match
-    ab
+    a\nbc\ndp+q
+No match
+    a+bc\ndp\nq
+No match
+    x\nyp\nq 
+No match
+
+/a\d\z/
+    ba0
+ 0: a0
+    *** Failers
+No match
+    ba0\n
+No match
+    ba0\ncd   
+No match
+
+/a\d\z/m
+    ba0
+ 0: a0
+    *** Failers
+No match
+    ba0\n
+No match
+    ba0\ncd   
+No match
+
+/a\d\Z/
+    ba0
+ 0: a0
+    ba0\n
+ 0: a0
+    *** Failers
+No match
+    ba0\ncd   
 No match
+
+/a\d\Z/m
+    ba0
+ 0: a0
+    ba0\n
+ 0: a0
+    *** Failers
+No match
+    ba0\ncd   
+No match
+
+/a\d$/
+    ba0
+ 0: a0
+    ba0\n
+ 0: a0
+    *** Failers
+No match
+    ba0\ncd   
+No match
+
+/a\d$/m
+    ba0
+ 0: a0
+    ba0\n
+ 0: a0
+    ba0\ncd   
+ 0: a0
+    *** Failers
+No match
+
+/abc/i
+    abc
+ 0: abc
+    aBc
+ 0: aBc
+    ABC
+ 0: ABC
+    
+/[^a]/
+    abcd
+ 0: b
+    
+/ab?\w/
+    abz
+ 0: abz
+ 1: ab
+    abbz
+ 0: abb
+ 1: ab
+    azz  
+ 0: az
+
+/x{0,3}yz/
+    ayzq
+ 0: yz
+    axyzq
+ 0: xyz
+    axxyz
+ 0: xxyz
+    axxxyzq
+ 0: xxxyz
+    axxxxyzq
+ 0: xxxyz
+    *** Failers
+No match
+    ax
+No match
+    axx     
+No match
+      
+/x{3}yz/
+    axxxyzq
+ 0: xxxyz
+    axxxxyzq
+ 0: xxxyz
+    *** Failers
+No match
+    ax
+No match
+    axx     
+No match
+    ayzq
+No match
+    axyzq
+No match
+    axxyz
+No match
+      
+/x{2,3}yz/
+    axxyz
+ 0: xxyz
+    axxxyzq
+ 0: xxxyz
+    axxxxyzq
+ 0: xxxyz
+    *** Failers
+No match
+    ax
+No match
+    axx     
+No match
+    ayzq
+No match
+    axyzq
+No match
+      
+/[^a]+/
+    bac
+ 0: b
+    bcdefax
+ 0: bcdef
+ 1: bcde
+ 2: bcd
+ 3: bc
+ 4: b
+    *** Failers
+ 0: *** F
+ 1: *** 
+ 2: ***
+ 3: **
+ 4: *
+    aaaaa   
+No match
+
+/[^a]*/
+    bac
+ 0: b
+ 1: 
+    bcdefax
+ 0: bcdef
+ 1: bcde
+ 2: bcd
+ 3: bc
+ 4: b
+ 5: 
+    *** Failers
+ 0: *** F
+ 1: *** 
+ 2: ***
+ 3: **
+ 4: *
+ 5: 
+    aaaaa   
+ 0: 
+    
+/[^a]{3,5}/
+    xyz
+ 0: xyz
+    awxyza
+ 0: wxyz
+ 1: wxy
+    abcdefa
+ 0: bcdef
+ 1: bcde
+ 2: bcd
+    abcdefghijk
+ 0: bcdef
+ 1: bcde
+ 2: bcd
+    *** Failers
+ 0: *** F
+ 1: *** 
+ 2: ***
+    axya
+No match
+    axa
+No match
+    aaaaa         
+No match
+
+/\d*/
+    1234b567
+ 0: 1234
+ 1: 123
+ 2: 12
+ 3: 1
+ 4: 
+    xyz
+ 0: 
+    
+/\D*/
+    a1234b567
+ 0: a
+ 1: 
+    xyz
+ 0: xyz
+ 1: xy
+ 2: x
+ 3: 
      
-/\bX/8
-    Xoanon
- 0: X
-    +Xoanon
- 0: X
-    \x{300}Xoanon 
- 0: X
-    *** Failers 
+/\d+/
+    ab1234c56
+ 0: 1234
+ 1: 123
+ 2: 12
+ 3: 1
+    *** Failers
 No match
-    YXoanon  
+    xyz
 No match
     
-/\BX/8
-    YXoanon
- 0: X
+/\D+/
+    ab123c56
+ 0: ab
+ 1: a
     *** Failers
+ 0: *** Failers
+ 1: *** Failer
+ 2: *** Faile
+ 3: *** Fail
+ 4: *** Fai
+ 5: *** Fa
+ 6: *** F
+ 7: *** 
+ 8: ***
+ 9: **
+10: *
+    789
 No match
-    Xoanon
+    
+/\d?A/
+    045ABC
+ 0: 5A
+    ABC
+ 0: A
+    *** Failers
 No match
-    +Xoanon    
+    XYZ
 No match
-    \x{300}Xoanon 
+    
+/\D?A/
+    ABC
+ 0: A
+    BAC
+ 0: BA
+    9ABC             
+ 0: A
+    *** Failers
 No match
 
-/X\b/8
-    X+oanon
- 0: X
-    ZX\x{300}oanon 
- 0: X
-    FAX 
- 0: X
+/a+/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+
+/^.*xyz/
+    xyz
+ 0: xyz
+    ggggggggxyz
+ 0: ggggggggxyz
+    
+/^.+xyz/
+    abcdxyz
+ 0: abcdxyz
+    axyz
+ 0: axyz
+    *** Failers
+No match
+    xyz
+No match
+    
+/^.?xyz/
+    xyz
+ 0: xyz
+    cxyz       
+ 0: cxyz
+
+/^\d{2,3}X/
+    12X
+ 0: 12X
+    123X
+ 0: 123X
+    *** Failers
+No match
+    X
+No match
+    1X
+No match
+    1234X     
+No match
+
+/^[abcd]\d/
+    a45
+ 0: a4
+    b93
+ 0: b9
+    c99z
+ 0: c9
+    d04
+ 0: d0
+    *** Failers
+No match
+    e45
+No match
+    abcd      
+No match
+    abcd1234
+No match
+    1234  
+No match
+
+/^[abcd]*\d/
+    a45
+ 0: a4
+    b93
+ 0: b9
+    c99z
+ 0: c9
+    d04
+ 0: d0
+    abcd1234
+ 0: abcd1
+    1234  
+ 0: 1
+    *** Failers
+No match
+    e45
+No match
+    abcd      
+No match
+
+/^[abcd]+\d/
+    a45
+ 0: a4
+    b93
+ 0: b9
+    c99z
+ 0: c9
+    d04
+ 0: d0
+    abcd1234
+ 0: abcd1
+    *** Failers
+No match
+    1234  
+No match
+    e45
+No match
+    abcd      
+No match
+
+/^a+X/
+    aX
+ 0: aX
+    aaX 
+ 0: aaX
+
+/^[abcd]?\d/
+    a45
+ 0: a4
+    b93
+ 0: b9
+    c99z
+ 0: c9
+    d04
+ 0: d0
+    1234  
+ 0: 1
+    *** Failers
+No match
+    abcd1234
+No match
+    e45
+No match
+
+/^[abcd]{2,3}\d/
+    ab45
+ 0: ab4
+    bcd93
+ 0: bcd9
+    *** Failers
+No match
+    1234 
+No match
+    a36 
+No match
+    abcd1234
+No match
+    ee45
+No match
+
+/^(abc)*\d/
+    abc45
+ 0: abc4
+    abcabcabc45
+ 0: abcabcabc4
+    42xyz 
+ 0: 4
+    *** Failers
+No match
+
+/^(abc)+\d/
+    abc45
+ 0: abc4
+    abcabcabc45
+ 0: abcabcabc4
+    *** Failers
+No match
+    42xyz 
+No match
+
+/^(abc)?\d/
+    abc45
+ 0: abc4
+    42xyz 
+ 0: 4
+    *** Failers
+No match
+    abcabcabc45
+No match
+
+/^(abc){2,3}\d/
+    abcabc45
+ 0: abcabc4
+    abcabcabc45
+ 0: abcabcabc4
+    *** Failers
+No match
+    abcabcabcabc45
+No match
+    abc45
+No match
+    42xyz 
+No match
+
+/1(abc|xyz)2(?1)3/
+    1abc2abc3456
+ 0: 1abc2abc3
+    1abc2xyz3456 
+ 0: 1abc2xyz3
+
+/^(a*\w|ab)=(a*\w|ab)/
+    ab=ab
+ 0: ab=ab
+ 1: ab=a
+
+/^(a*\w|ab)=(?1)/
+    ab=ab
+ 0: ab=ab
+ 1: ab=a
+
+/^([^()]|\((?1)*\))*$/
+    abc
+ 0: abc
+    a(b)c
+ 0: a(b)c
+    a(b(c))d  
+ 0: a(b(c))d
+    *** Failers)
+No match
+    a(b(c)d  
+No match
+
+/^>abc>([^()]|\((?1)*\))*<xyz<$/
+    >abc>123<xyz<
+ 0: >abc>123<xyz<
+    >abc>1(2)3<xyz<
+ 0: >abc>1(2)3<xyz<
+    >abc>(1(2)3)<xyz<
+ 0: >abc>(1(2)3)<xyz<
+
+/^(?>a*)\d/
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa9876
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa9
     *** Failers 
 No match
-    Xoanon  
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+
+/< (?: (?(R) \d++  | [^<>]*+) | (?R)) * >/x
+    <>
+ 0: <>
+    <abcd>
+ 0: <abcd>
+    <abc <123> hij>
+ 0: <abc <123> hij>
+    <abc <def> hij>
+ 0: <def>
+    <abc<>def> 
+ 0: <abc<>def>
+    <abc<>      
+ 0: <>
+    *** Failers
+No match
+    <abc
+No match
+
+/^(?(?=abc)\w{3}:|\d\d)$/        
+    abc:                          
+ 0: abc:
+    12                             
+ 0: 12
+    *** Failers                     
+No match
+    123                       
+No match
+    xyz                        
+No match
+                                
+/^(?(?!abc)\d\d|\w{3}:)$/      
+    abc:                        
+ 0: abc:
+    12         
+ 0: 12
+    *** Failers
+No match
+    123
+No match
+    xyz    
+No match
+
+/^(?=abc)\w{5}:$/        
+    abcde:                          
+ 0: abcde:
+    *** Failers                     
+No match
+    abc.. 
+No match
+    123                       
+No match
+    vwxyz                        
+No match
+                                
+/^(?!abc)\d\d$/      
+    12         
+ 0: 12
+    *** Failers
+No match
+    abcde:
+No match
+    abc..  
+No match
+    123
+No match
+    vwxyz    
+No match
+
+/(?<=abc|xy)123/
+    abc12345
+ 0: 123
+    wxy123z
+ 0: 123
+    *** Failers
+No match
+    123abc
+No match
+
+/(?<!abc|xy)123/
+    123abc
+ 0: 123
+    mno123456 
+ 0: 123
+    *** Failers
+No match
+    abc12345
+No match
+    wxy123z
+No match
+
+/abc(?C1)xyz/
+    abcxyz
+--->abcxyz
+  1 ^  ^       x
+ 0: abcxyz
+    123abcxyz999 
+--->123abcxyz999
+  1    ^  ^          x
+ 0: abcxyz
+
+/(ab|cd){3,4}/C
+  ababab
+--->ababab
+ +0 ^          (ab|cd){3,4}
+ +1 ^          a
+ +4 ^          c
+ +2 ^^         b
+ +3 ^ ^        |
+ +1 ^ ^        a
+ +4 ^ ^        c
+ +2 ^  ^       b
+ +3 ^   ^      |
+ +1 ^   ^      a
+ +4 ^   ^      c
+ +2 ^    ^     b
+ +3 ^     ^    |
++12 ^     ^    
+ +1 ^     ^    a
+ +4 ^     ^    c
+ 0: ababab
+  abcdabcd
+--->abcdabcd
+ +0 ^            (ab|cd){3,4}
+ +1 ^            a
+ +4 ^            c
+ +2 ^^           b
+ +3 ^ ^          |
+ +1 ^ ^          a
+ +4 ^ ^          c
+ +5 ^  ^         d
+ +6 ^   ^        )
+ +1 ^   ^        a
+ +4 ^   ^        c
+ +2 ^    ^       b
+ +3 ^     ^      |
++12 ^     ^      
+ +1 ^     ^      a
+ +4 ^     ^      c
+ +5 ^      ^     d
+ +6 ^       ^    )
++12 ^       ^    
+ 0: abcdabcd
+ 1: abcdab
+  abcdcdcdcdcd  
+--->abcdcdcdcdcd
+ +0 ^                (ab|cd){3,4}
+ +1 ^                a
+ +4 ^                c
+ +2 ^^               b
+ +3 ^ ^              |
+ +1 ^ ^              a
+ +4 ^ ^              c
+ +5 ^  ^             d
+ +6 ^   ^            )
+ +1 ^   ^            a
+ +4 ^   ^            c
+ +5 ^    ^           d
+ +6 ^     ^          )
++12 ^     ^          
+ +1 ^     ^          a
+ +4 ^     ^          c
+ +5 ^      ^         d
+ +6 ^       ^        )
++12 ^       ^        
+ 0: abcdcdcd
+ 1: abcdcd
+
+/^abc/
+    abcdef
+ 0: abc
+    *** Failers
+No match
+    abcdef\B  
+No match
+
+/^(a*|xyz)/
+    bcd
+ 0: 
+    aaabcd
+ 0: aaa
+ 1: aa
+ 2: a
+ 3: 
+    xyz
+ 0: xyz
+ 1: 
+    xyz\N  
+ 0: xyz
+    *** Failers
+ 0: 
+    bcd\N   
 No match
     
-/X\B/8
-    Xoanon  
- 0: X
+/xyz$/
+    xyz
+ 0: xyz
+    xyz\n
+ 0: xyz
     *** Failers
 No match
-    X+oanon
+    xyz\Z
+No match
+    xyz\n\Z    
 No match
-    ZX\x{300}oanon 
+    
+/xyz$/m
+    xyz
+ 0: xyz
+    xyz\n 
+ 0: xyz
+    abcxyz\npqr 
+ 0: xyz
+    abcxyz\npqr\Z 
+ 0: xyz
+    xyz\n\Z    
+ 0: xyz
+    *** Failers
+No match
+    xyz\Z
+No match
+
+/\Gabc/
+    abcdef
+ 0: abc
+    defabcxyz\>3 
+ 0: abc
+    *** Failers 
 No match
-    FAX 
+    defabcxyz
+No match
+
+/^abcdef/
+    ab\P
+Partial match: ab
+    abcde\P
+Partial match: abcde
+    abcdef\P
+ 0: abcdef
+    *** Failers
+No match
+    abx\P    
+No match
+
+/^a{2,4}\d+z/
+    a\P
+Partial match: a
+    aa\P
+Partial match: aa
+    aa2\P 
+Partial match: aa2
+    aaa\P
+Partial match: aaa
+    aaa23\P 
+Partial match: aaa23
+    aaaa12345\P
+Partial match: aaaa12345
+    aa0z\P
+ 0: aa0z
+    aaaa4444444444444z\P 
+ 0: aaaa4444444444444z
+    *** Failers
+No match
+    az\P 
+No match
+    aaaaa\P 
+No match
+    a56\P 
+No match
+
+/^abcdef/
+   abc\P
+Partial match: abc
+   def\R 
+ 0: def
+   
+/(?<=foo)bar/
+   xyzfo\P 
+No match
+   foob\P\>2 
+Partial match at offset 3: foob
+   foobar...\R\P\>4 
+ 0: ar
+   xyzfo\P
+No match
+   foobar\>2  
+ 0: bar
+   *** Failers
+No match
+   xyzfo\P
+No match
+   obar\R   
+No match
+
+/(ab*(cd|ef))+X/
+    adfadadaklhlkalkajhlkjahdfasdfasdfladsfjkj\P\Z
+No match
+    lkjhlkjhlkjhlkjhabbbbbbcdaefabbbbbbbefa\P\B\Z
+Partial match: abbbbbbcdaefabbbbbbbefa
+    cdabbbbbbbb\P\R\B\Z
+Partial match: cdabbbbbbbb
+    efabbbbbbbbbbbbbbbb\P\R\B\Z
+Partial match: efabbbbbbbbbbbbbbbb
+    bbbbbbbbbbbbcdXyasdfadf\P\R\B\Z    
+ 0: bbbbbbbbbbbbcdX
+
+/(a|b)/SF>testsavedregex
+Compiled pattern written to testsavedregex
+Study data written to testsavedregex
+<testsavedregex
+Compiled pattern (byte-inverted) loaded from testsavedregex
+Study data loaded from testsavedregex
+    abc
+ 0: a
+    ** Failers
+ 0: a
+    def  
 No match
     
-/[^a]/8
-    abcd
+/the quick brown fox/
+    the quick brown fox
+ 0: the quick brown fox
+    The quick brown FOX
+No match
+    What do you know about the quick brown fox?
+ 0: the quick brown fox
+    What do you know about THE QUICK BROWN FOX?
+No match
+
+/The quick brown fox/i
+    the quick brown fox
+ 0: the quick brown fox
+    The quick brown FOX
+ 0: The quick brown FOX
+    What do you know about the quick brown fox?
+ 0: the quick brown fox
+    What do you know about THE QUICK BROWN FOX?
+ 0: THE QUICK BROWN FOX
+
+/abcd\t\n\r\f\a\e\071\x3b\$\\\?caxyz/
+    abcd\t\n\r\f\a\e9;\$\\?caxyz
+ 0: abcd\x09\x0a\x0d\x0c\x07\x1b9;$\?caxyz
+
+/a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz/
+    abxyzpqrrrabbxyyyypqAzz
+ 0: abxyzpqrrrabbxyyyypqAzz
+    abxyzpqrrrabbxyyyypqAzz
+ 0: abxyzpqrrrabbxyyyypqAzz
+    aabxyzpqrrrabbxyyyypqAzz
+ 0: aabxyzpqrrrabbxyyyypqAzz
+    aaabxyzpqrrrabbxyyyypqAzz
+ 0: aaabxyzpqrrrabbxyyyypqAzz
+    aaaabxyzpqrrrabbxyyyypqAzz
+ 0: aaaabxyzpqrrrabbxyyyypqAzz
+    abcxyzpqrrrabbxyyyypqAzz
+ 0: abcxyzpqrrrabbxyyyypqAzz
+    aabcxyzpqrrrabbxyyyypqAzz
+ 0: aabcxyzpqrrrabbxyyyypqAzz
+    aaabcxyzpqrrrabbxyyyypAzz
+ 0: aaabcxyzpqrrrabbxyyyypAzz
+    aaabcxyzpqrrrabbxyyyypqAzz
+ 0: aaabcxyzpqrrrabbxyyyypqAzz
+    aaabcxyzpqrrrabbxyyyypqqAzz
+ 0: aaabcxyzpqrrrabbxyyyypqqAzz
+    aaabcxyzpqrrrabbxyyyypqqqAzz
+ 0: aaabcxyzpqrrrabbxyyyypqqqAzz
+    aaabcxyzpqrrrabbxyyyypqqqqAzz
+ 0: aaabcxyzpqrrrabbxyyyypqqqqAzz
+    aaabcxyzpqrrrabbxyyyypqqqqqAzz
+ 0: aaabcxyzpqrrrabbxyyyypqqqqqAzz
+    aaabcxyzpqrrrabbxyyyypqqqqqqAzz
+ 0: aaabcxyzpqrrrabbxyyyypqqqqqqAzz
+    aaaabcxyzpqrrrabbxyyyypqAzz
+ 0: aaaabcxyzpqrrrabbxyyyypqAzz
+    abxyzzpqrrrabbxyyyypqAzz
+ 0: abxyzzpqrrrabbxyyyypqAzz
+    aabxyzzzpqrrrabbxyyyypqAzz
+ 0: aabxyzzzpqrrrabbxyyyypqAzz
+    aaabxyzzzzpqrrrabbxyyyypqAzz
+ 0: aaabxyzzzzpqrrrabbxyyyypqAzz
+    aaaabxyzzzzpqrrrabbxyyyypqAzz
+ 0: aaaabxyzzzzpqrrrabbxyyyypqAzz
+    abcxyzzpqrrrabbxyyyypqAzz
+ 0: abcxyzzpqrrrabbxyyyypqAzz
+    aabcxyzzzpqrrrabbxyyyypqAzz
+ 0: aabcxyzzzpqrrrabbxyyyypqAzz
+    aaabcxyzzzzpqrrrabbxyyyypqAzz
+ 0: aaabcxyzzzzpqrrrabbxyyyypqAzz
+    aaaabcxyzzzzpqrrrabbxyyyypqAzz
+ 0: aaaabcxyzzzzpqrrrabbxyyyypqAzz
+    aaaabcxyzzzzpqrrrabbbxyyyypqAzz
+ 0: aaaabcxyzzzzpqrrrabbbxyyyypqAzz
+    aaaabcxyzzzzpqrrrabbbxyyyyypqAzz
+ 0: aaaabcxyzzzzpqrrrabbbxyyyyypqAzz
+    aaabcxyzpqrrrabbxyyyypABzz
+ 0: aaabcxyzpqrrrabbxyyyypABzz
+    aaabcxyzpqrrrabbxyyyypABBzz
+ 0: aaabcxyzpqrrrabbxyyyypABBzz
+    >>>aaabxyzpqrrrabbxyyyypqAzz
+ 0: aaabxyzpqrrrabbxyyyypqAzz
+    >aaaabxyzpqrrrabbxyyyypqAzz
+ 0: aaaabxyzpqrrrabbxyyyypqAzz
+    >>>>abcxyzpqrrrabbxyyyypqAzz
+ 0: abcxyzpqrrrabbxyyyypqAzz
+    *** Failers
+No match
+    abxyzpqrrabbxyyyypqAzz
+No match
+    abxyzpqrrrrabbxyyyypqAzz
+No match
+    abxyzpqrrrabxyyyypqAzz
+No match
+    aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz
+No match
+    aaaabcxyzzzzpqrrrabbbxyyypqAzz
+No match
+    aaabcxyzpqrrrabbxyyyypqqqqqqqAzz
+No match
+
+/^(abc){1,2}zz/
+    abczz
+ 0: abczz
+    abcabczz
+ 0: abcabczz
+    *** Failers
+No match
+    zz
+No match
+    abcabcabczz
+No match
+    >>abczz
+No match
+
+/^(b+?|a){1,2}?c/
+    bc
+ 0: bc
+    bbc
+ 0: bbc
+    bbbc
+ 0: bbbc
+    bac
+ 0: bac
+    bbac
+ 0: bbac
+    aac
+ 0: aac
+    abbbbbbbbbbbc
+ 0: abbbbbbbbbbbc
+    bbbbbbbbbbbac
+ 0: bbbbbbbbbbbac
+    *** Failers
+No match
+    aaac
+No match
+    abbbbbbbbbbbac
+No match
+
+/^(b+|a){1,2}c/
+    bc
+ 0: bc
+    bbc
+ 0: bbc
+    bbbc
+ 0: bbbc
+    bac
+ 0: bac
+    bbac
+ 0: bbac
+    aac
+ 0: aac
+    abbbbbbbbbbbc
+ 0: abbbbbbbbbbbc
+    bbbbbbbbbbbac
+ 0: bbbbbbbbbbbac
+    *** Failers
+No match
+    aaac
+No match
+    abbbbbbbbbbbac
+No match
+
+/^(b+|a){1,2}?bc/
+    bbc
+ 0: bbc
+
+/^(b*|ba){1,2}?bc/
+    babc
+ 0: babc
+    bbabc
+ 0: bbabc
+    bababc
+ 0: bababc
+    *** Failers
+No match
+    bababbc
+No match
+    babababc
+No match
+
+/^(ba|b*){1,2}?bc/
+    babc
+ 0: babc
+    bbabc
+ 0: bbabc
+    bababc
+ 0: bababc
+    *** Failers
+No match
+    bababbc
+No match
+    babababc
+No match
+
+/^\ca\cA\c[\c{\c:/
+    \x01\x01\e;z
+ 0: \x01\x01\x1b;z
+
+/^[ab\]cde]/
+    athing
+ 0: a
+    bthing
  0: b
-    a\x{100}   
- 0: \x{100}
+    ]thing
+ 0: ]
+    cthing
+ 0: c
+    dthing
+ 0: d
+    ething
+ 0: e
+    *** Failers
+No match
+    fthing
+No match
+    [thing
+No match
+    \\thing
+No match
 
-/^[abc\x{123}\x{400}-\x{402}]{2,3}\d/8
-    ab99
- 0: ab9
-    \x{123}\x{123}45
- 0: \x{123}\x{123}4
-    \x{400}\x{401}\x{402}6  
- 0: \x{400}\x{401}\x{402}6
+/^[]cde]/
+    ]thing
+ 0: ]
+    cthing
+ 0: c
+    dthing
+ 0: d
+    ething
+ 0: e
     *** Failers
 No match
-    d99
+    athing
+No match
+    fthing
 No match
-    \x{123}\x{122}4   
+
+/^[^ab\]cde]/
+    fthing
+ 0: f
+    [thing
+ 0: [
+    \\thing
+ 0: \
+    *** Failers
+ 0: *
+    athing
 No match
-    \x{400}\x{403}6  
+    bthing
 No match
-    \x{400}\x{401}\x{402}\x{402}6  
+    ]thing
+No match
+    cthing
+No match
+    dthing
+No match
+    ething
 No match
 
-/abc/8
-    �]
-Error -10
-    �
-Error -10
-    ���
-Error -10
-    ���\?
+/^[^]cde]/
+    athing
+ 0: a
+    fthing
+ 0: f
+    *** Failers
+ 0: *
+    ]thing
+No match
+    cthing
+No match
+    dthing
+No match
+    ething
 No match
 
-/a.b/8
-    acb
- 0: acb
-    a\x7fb
- 0: a\x{7f}b
-    a\x{100}b 
- 0: a\x{100}b
+/^\�/
+    �
+ 0: \x81
+
+/^�/
+    �
+ 0: \xff
+
+/^[0-9]+$/
+    0
+ 0: 0
+    1
+ 0: 1
+    2
+ 0: 2
+    3
+ 0: 3
+    4
+ 0: 4
+    5
+ 0: 5
+    6
+ 0: 6
+    7
+ 0: 7
+    8
+ 0: 8
+    9
+ 0: 9
+    10
+ 0: 10
+    100
+ 0: 100
     *** Failers
 No match
-    a\nb  
+    abc
+No match
+
+/^.*nter/
+    enter
+ 0: enter
+    inter
+ 0: inter
+    uponter
+ 0: uponter
+
+/^xxx[0-9]+$/
+    xxx0
+ 0: xxx0
+    xxx1234
+ 0: xxx1234
+    *** Failers
+No match
+    xxx
+No match
+
+/^.+[0-9][0-9][0-9]$/
+    x123
+ 0: x123
+    xx123
+ 0: xx123
+    123456
+ 0: 123456
+    *** Failers
+No match
+    123
+No match
+    x1234
+ 0: x1234
+
+/^.+?[0-9][0-9][0-9]$/
+    x123
+ 0: x123
+    xx123
+ 0: xx123
+    123456
+ 0: 123456
+    *** Failers
+No match
+    123
+No match
+    x1234
+ 0: x1234
+
+/^([^!]+)!(.+)=apquxz\.ixr\.zzz\.ac\.uk$/
+    abc!pqr=apquxz.ixr.zzz.ac.uk
+ 0: abc!pqr=apquxz.ixr.zzz.ac.uk
+    *** Failers
+No match
+    !pqr=apquxz.ixr.zzz.ac.uk
+No match
+    abc!=apquxz.ixr.zzz.ac.uk
+No match
+    abc!pqr=apquxz:ixr.zzz.ac.uk
+No match
+    abc!pqr=apquxz.ixr.zzz.ac.ukk
+No match
+
+/:/
+    Well, we need a colon: somewhere
+ 0: :
+    *** Fail if we don't
+No match
+
+/([\da-f:]+)$/i
+    0abc
+ 0: 0abc
+    abc
+ 0: abc
+    fed
+ 0: fed
+    E
+ 0: E
+    ::
+ 0: ::
+    5f03:12C0::932e
+ 0: 5f03:12C0::932e
+    fed def
+ 0: def
+    Any old stuff
+ 0: ff
+    *** Failers
+No match
+    0zzz
+No match
+    gzzz
+No match
+    fed\x20
+No match
+    Any old rubbish
+No match
+
+/^.*\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/
+    .1.2.3
+ 0: .1.2.3
+    A.12.123.0
+ 0: A.12.123.0
+    *** Failers
+No match
+    .1.2.3333
+No match
+    1.2.3
+No match
+    1234.2.3
+No match
+
+/^(\d+)\s+IN\s+SOA\s+(\S+)\s+(\S+)\s*\(\s*$/
+    1 IN SOA non-sp1 non-sp2(
+ 0: 1 IN SOA non-sp1 non-sp2(
+    1    IN    SOA    non-sp1    non-sp2   (
+ 0: 1    IN    SOA    non-sp1    non-sp2   (
+    *** Failers
+No match
+    1IN SOA non-sp1 non-sp2(
+No match
+
+/^[a-zA-Z\d][a-zA-Z\d\-]*(\.[a-zA-Z\d][a-zA-z\d\-]*)*\.$/
+    a.
+ 0: a.
+    Z.
+ 0: Z.
+    2.
+ 0: 2.
+    ab-c.pq-r.
+ 0: ab-c.pq-r.
+    sxk.zzz.ac.uk.
+ 0: sxk.zzz.ac.uk.
+    x-.y-.
+ 0: x-.y-.
+    *** Failers
+No match
+    -abc.peq.
+No match
+
+/^\*\.[a-z]([a-z\-\d]*[a-z\d]+)?(\.[a-z]([a-z\-\d]*[a-z\d]+)?)*$/
+    *.a
+ 0: *.a
+    *.b0-a
+ 0: *.b0-a
+    *.c3-b.c
+ 0: *.c3-b.c
+    *.c-a.b-c
+ 0: *.c-a.b-c
+    *** Failers
+No match
+    *.0
+No match
+    *.a-
+No match
+    *.a-b.c-
+No match
+    *.c-a.0-c
+No match
+
+/^(?=ab(de))(abd)(e)/
+    abde
+ 0: abde
+
+/^(?!(ab)de|x)(abd)(f)/
+    abdf
+ 0: abdf
+
+/^(?=(ab(cd)))(ab)/
+    abcd
+ 0: ab
+
+/^[\da-f](\.[\da-f])*$/i
+    a.b.c.d
+ 0: a.b.c.d
+    A.B.C.D
+ 0: A.B.C.D
+    a.b.c.1.2.3.C
+ 0: a.b.c.1.2.3.C
+
+/^\".*\"\s*(;.*)?$/
+    \"1234\"
+ 0: "1234"
+    \"abcd\" ;
+ 0: "abcd" ;
+    \"\" ; rhubarb
+ 0: "" ; rhubarb
+    *** Failers
+No match
+    \"1234\" : things
+No match
+
+/^$/
+    \
+ 0: 
+    *** Failers
+No match
+
+/   ^    a   (?# begins with a)  b\sc (?# then b c) $ (?# then end)/x
+    ab c
+ 0: ab c
+    *** Failers
+No match
+    abc
+No match
+    ab cde
+No match
+
+/(?x)   ^    a   (?# begins with a)  b\sc (?# then b c) $ (?# then end)/
+    ab c
+ 0: ab c
+    *** Failers
+No match
+    abc
+No match
+    ab cde
+No match
+
+/^   a\ b[c ]d       $/x
+    a bcd
+ 0: a bcd
+    a b d
+ 0: a b d
+    *** Failers
+No match
+    abcd
+No match
+    ab d
+No match
+
+/^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$/
+    abcdefhijklm
+ 0: abcdefhijklm
+
+/^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$/
+    abcdefhijklm
+ 0: abcdefhijklm
+
+/^[\w][\W][\s][\S][\d][\D][\b][\n][\c]][\022]/
+    a+ Z0+\x08\n\x1d\x12
+ 0: a+ Z0+\x08\x0a\x1d\x12
+
+/^[.^$|()*+?{,}]+/
+    .^\$(*+)|{?,?}
+ 0: .^$(*+)|{?,?}
+ 1: .^$(*+)|{?,?
+ 2: .^$(*+)|{?,
+ 3: .^$(*+)|{?
+ 4: .^$(*+)|{
+ 5: .^$(*+)|
+ 6: .^$(*+)
+ 7: .^$(*+
+ 8: .^$(*
+ 9: .^$(
+10: .^$
+11: .^
+12: .
+
+/^a*\w/
+    z
+ 0: z
+    az
+ 0: az
+ 1: a
+    aaaz
+ 0: aaaz
+ 1: aaa
+ 2: aa
+ 3: a
+    a
+ 0: a
+    aa
+ 0: aa
+ 1: a
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+    a+
+ 0: a
+    aa+
+ 0: aa
+ 1: a
+
+/^a*?\w/
+    z
+ 0: z
+    az
+ 0: az
+ 1: a
+    aaaz
+ 0: aaaz
+ 1: aaa
+ 2: aa
+ 3: a
+    a
+ 0: a
+    aa
+ 0: aa
+ 1: a
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+    a+
+ 0: a
+    aa+
+ 0: aa
+ 1: a
+
+/^a+\w/
+    az
+ 0: az
+    aaaz
+ 0: aaaz
+ 1: aaa
+ 2: aa
+    aa
+ 0: aa
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+    aa+
+ 0: aa
+
+/^a+?\w/
+    az
+ 0: az
+    aaaz
+ 0: aaaz
+ 1: aaa
+ 2: aa
+    aa
+ 0: aa
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+    aa+
+ 0: aa
+
+/^\d{8}\w{2,}/
+    1234567890
+ 0: 1234567890
+    12345678ab
+ 0: 12345678ab
+    12345678__
+ 0: 12345678__
+    *** Failers
+No match
+    1234567
 No match
 
-/a(.{3})b/8
-    a\x{4000}xyb 
- 0: a\x{4000}xyb
-    a\x{4000}\x7fyb 
- 0: a\x{4000}\x{7f}yb
-    a\x{4000}\x{100}yb 
- 0: a\x{4000}\x{100}yb
+/^[aeiou\d]{4,5}$/
+    uoie
+ 0: uoie
+    1234
+ 0: 1234
+    12345
+ 0: 12345
+    aaaaa
+ 0: aaaaa
     *** Failers
 No match
-    a\x{4000}b 
+    123456
 No match
-    ac\ncb 
+
+/^[aeiou\d]{4,5}?/
+    uoie
+ 0: uoie
+    1234
+ 0: 1234
+    12345
+ 0: 12345
+ 1: 1234
+    aaaaa
+ 0: aaaaa
+ 1: aaaa
+    123456
+ 0: 12345
+ 1: 1234
+
+/^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]/
+    From abcd  Mon Sep 01 12:33:02 1997
+ 0: From abcd  Mon Sep 01 12:33
+
+/^From\s+\S+\s+([a-zA-Z]{3}\s+){2}\d{1,2}\s+\d\d:\d\d/
+    From abcd  Mon Sep 01 12:33:02 1997
+ 0: From abcd  Mon Sep 01 12:33
+    From abcd  Mon Sep  1 12:33:02 1997
+ 0: From abcd  Mon Sep  1 12:33
+    *** Failers
+No match
+    From abcd  Sep 01 12:33:02 1997
 No match
 
-/a(.*?)(.)/
-    a\xc0\x88b
- 0: a\xc0\x88b
- 1: a\xc0\x88
- 2: a\xc0
+/^12.34/s
+    12\n34
+ 0: 12\x0a34
+    12\r34
+ 0: 12\x0d34
 
-/a(.*?)(.)/8
-    a\x{100}b
- 0: a\x{100}b
- 1: a\x{100}
-
-/a(.*)(.)/
-    a\xc0\x88b
- 0: a\xc0\x88b
- 1: a\xc0\x88
- 2: a\xc0
+/\w+(?=\t)/
+    the quick brown\t fox
+ 0: brown
 
-/a(.*)(.)/8
-    a\x{100}b
- 0: a\x{100}b
- 1: a\x{100}
+/foo(?!bar)(.*)/
+    foobar is foolish see?
+ 0: foolish see?
+ 1: foolish see
+ 2: foolish se
+ 3: foolish s
+ 4: foolish 
+ 5: foolish
+ 6: foolis
+ 7: fooli
+ 8: fool
+ 9: foo
 
-/a(.)(.)/
-    a\xc0\x92bcd
- 0: a\xc0\x92
+/(?:(?!foo)...|^.{0,2})bar(.*)/
+    foobar crowbar etc
+ 0: rowbar etc
+ 1: rowbar et
+ 2: rowbar e
+ 3: rowbar 
+ 4: rowbar
+    barrel
+ 0: barrel
+ 1: barre
+ 2: barr
+ 3: bar
+    2barrel
+ 0: 2barrel
+ 1: 2barre
+ 2: 2barr
+ 3: 2bar
+    A barrel
+ 0: A barrel
+ 1: A barre
+ 2: A barr
+ 3: A bar
 
-/a(.)(.)/8
-    a\x{240}bcd
- 0: a\x{240}b
-
-/a(.?)(.)/
-    a\xc0\x92bcd
- 0: a\xc0\x92
- 1: a\xc0
-
-/a(.?)(.)/8
-    a\x{240}bcd
- 0: a\x{240}b
- 1: a\x{240}
-
-/a(.??)(.)/
-    a\xc0\x92bcd
- 0: a\xc0\x92
- 1: a\xc0
+/^(\D*)(?=\d)(?!123)/
+    abc456
+ 0: abc
+    *** Failers
+No match
+    abc123
+No match
 
-/a(.??)(.)/8
-    a\x{240}bcd
- 0: a\x{240}b
- 1: a\x{240}
+/^1234(?# test newlines
+  inside)/
+    1234
+ 0: 1234
 
-/a(.{3})b/8
-    a\x{1234}xyb 
- 0: a\x{1234}xyb
-    a\x{1234}\x{4321}yb 
- 0: a\x{1234}\x{4321}yb
-    a\x{1234}\x{4321}\x{3412}b 
- 0: a\x{1234}\x{4321}\x{3412}b
+/^1234 #comment in extended re
+  /x
+    1234
+ 0: 1234
+
+/#rhubarb
+  abcd/x
+    abcd
+ 0: abcd
+
+/^abcd#rhubarb/x
+    abcd
+ 0: abcd
+
+/(?!^)abc/
+    the abc
+ 0: abc
     *** Failers
 No match
-    a\x{1234}b 
+    abc
 No match
-    ac\ncb 
+
+/(?=^)abc/
+    abc
+ 0: abc
+    *** Failers
 No match
+    the abc
+No match
+
+/^[ab]{1,3}(ab*|b)/
+    aabbbbb
+ 0: aabbbbb
+ 1: aabbbb
+ 2: aabbb
+ 3: aabb
+ 4: aab
+ 5: aa
+
+/^[ab]{1,3}?(ab*|b)/
+    aabbbbb
+ 0: aabbbbb
+ 1: aabbbb
+ 2: aabbb
+ 3: aabb
+ 4: aab
+ 5: aa
+
+/^[ab]{1,3}?(ab*?|b)/
+    aabbbbb
+ 0: aabbbbb
+ 1: aabbbb
+ 2: aabbb
+ 3: aabb
+ 4: aab
+ 5: aa
+
+/^[ab]{1,3}(ab*?|b)/
+    aabbbbb
+ 0: aabbbbb
+ 1: aabbbb
+ 2: aabbb
+ 3: aabb
+ 4: aab
+ 5: aa
+
+/  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*                          # optional leading comment
+(?:    (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+" (?:                      # opening quote...
+[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
+|                     #    or
+\\ [^\x80-\xff]           #   Escaped something (something != CR)
+)* "  # closing quote
+)                    # initial word
+(?:  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  \.  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*   (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+" (?:                      # opening quote...
+[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
+|                     #    or
+\\ [^\x80-\xff]           #   Escaped something (something != CR)
+)* "  # closing quote
+)  )* # further okay, if led by a period
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  @  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*    (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                           # initial subdomain
+(?:                                  #
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  \.                        # if led by a period...
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*   (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                     #   ...further okay
+)*
+# address
+|                     #  or
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+" (?:                      # opening quote...
+[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
+|                     #    or
+\\ [^\x80-\xff]           #   Escaped something (something != CR)
+)* "  # closing quote
+)             # one word, optionally followed by....
+(?:
+[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037]  |  # atom and space parts, or...
+\(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)       |  # comments, or...
 
-/a(.{3,})b/8
-    a\x{1234}xyb 
- 0: a\x{1234}xyb
-    a\x{1234}\x{4321}yb 
- 0: a\x{1234}\x{4321}yb
-    a\x{1234}\x{4321}\x{3412}b 
- 0: a\x{1234}\x{4321}\x{3412}b
-    axxxxbcdefghijb 
- 0: axxxxbcdefghijb
- 1: axxxxb
-    a\x{1234}\x{4321}\x{3412}\x{3421}b 
- 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
+" (?:                      # opening quote...
+[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
+|                     #    or
+\\ [^\x80-\xff]           #   Escaped something (something != CR)
+)* "  # closing quote
+# quoted strings
+)*
+<  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*                     # leading <
+(?:  @  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*    (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                           # initial subdomain
+(?:                                  #
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  \.                        # if led by a period...
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*   (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                     #   ...further okay
+)*
+
+(?:  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  ,  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  @  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*    (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                           # initial subdomain
+(?:                                  #
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  \.                        # if led by a period...
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*   (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                     #   ...further okay
+)*
+)* # further okay, if led by comma
+:                                # closing colon
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  )? #       optional route
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+" (?:                      # opening quote...
+[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
+|                     #    or
+\\ [^\x80-\xff]           #   Escaped something (something != CR)
+)* "  # closing quote
+)                    # initial word
+(?:  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  \.  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*   (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+" (?:                      # opening quote...
+[^\\\x80-\xff\n\015"]                #   Anything except backslash and quote
+|                     #    or
+\\ [^\x80-\xff]           #   Escaped something (something != CR)
+)* "  # closing quote
+)  )* # further okay, if led by a period
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  @  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*    (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                           # initial subdomain
+(?:                                  #
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  \.                        # if led by a period...
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*   (?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|   \[                         # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*    #    stuff
+\]                        #           ]
+)                     #   ...further okay
+)*
+#       address spec
+(?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*  > #                  trailing >
+# name and address
+)  (?: [\040\t] |  \(
+(?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  |  \( (?:  [^\\\x80-\xff\n\015()]  |  \\ [^\x80-\xff]  )* \)  )*
+\)  )*                       # optional trailing comment
+/x
+    Alan Other <user\@dom.ain>
+ 0: Alan Other <[email protected]>
+    <user\@dom.ain>
+ 0: [email protected]
+ 1: user@dom
+    user\@dom.ain
+ 0: [email protected]
+ 1: user@dom
+    \"A. Other\" <user.1234\@dom.ain> (a comment)
+ 0: "A. Other" <[email protected]> (a comment)
+ 1: "A. Other" <[email protected]> 
+ 2: "A. Other" <[email protected]>
+    A. Other <user.1234\@dom.ain> (a comment)
+ 0:  Other <[email protected]> (a comment)
+ 1:  Other <[email protected]> 
+ 2:  Other <[email protected]>
+    \"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"\@x400-re.lay
+ 0: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re.lay
+ 1: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re
+    A missing angle <user\@some.where
+ 0: [email protected]
+ 1: user@some
     *** Failers
 No match
-    a\x{1234}b 
+    The quick brown fox
 No match
 
-/a(.{3,}?)b/8
-    a\x{1234}xyb 
- 0: a\x{1234}xyb
-    a\x{1234}\x{4321}yb 
- 0: a\x{1234}\x{4321}yb
-    a\x{1234}\x{4321}\x{3412}b 
- 0: a\x{1234}\x{4321}\x{3412}b
-    axxxxbcdefghijb 
- 0: axxxxbcdefghijb
- 1: axxxxb
-    a\x{1234}\x{4321}\x{3412}\x{3421}b 
- 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
+/[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional leading comment
+(?:
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+# Atom
+|                       #  or
+"                                     # "
+[^\\\x80-\xff\n\015"] *                            #   normal
+(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
+"                                     #        "
+# Quoted string
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+\.
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+# Atom
+|                       #  or
+"                                     # "
+[^\\\x80-\xff\n\015"] *                            #   normal
+(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
+"                                     #        "
+# Quoted string
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# additional words
+)*
+@
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+(?:
+\.
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+)*
+# address
+|                             #  or
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+# Atom
+|                       #  or
+"                                     # "
+[^\\\x80-\xff\n\015"] *                            #   normal
+(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
+"                                     #        "
+# Quoted string
+)
+# leading word
+[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037] *               # "normal" atoms and or spaces
+(?:
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+|
+"                                     # "
+[^\\\x80-\xff\n\015"] *                            #   normal
+(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
+"                                     #        "
+) # "special" comment or quoted string
+[^()<>@,;:".\\\[\]\x80-\xff\000-\010\012-\037] *            #  more "normal"
+)*
+<
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# <
+(?:
+@
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+(?:
+\.
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+)*
+(?: ,
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+@
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+(?:
+\.
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+)*
+)*  # additional domains
+:
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+)?     #       optional route
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+# Atom
+|                       #  or
+"                                     # "
+[^\\\x80-\xff\n\015"] *                            #   normal
+(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
+"                                     #        "
+# Quoted string
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+\.
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+# Atom
+|                       #  or
+"                                     # "
+[^\\\x80-\xff\n\015"] *                            #   normal
+(?:  \\ [^\x80-\xff]  [^\\\x80-\xff\n\015"] * )*        #   ( special normal* )*
+"                                     #        "
+# Quoted string
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# additional words
+)*
+@
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+(?:
+\.
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+(?:
+[^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]+    # some number of atom characters...
+(?![^(\040)<>@,;:".\\\[\]\000-\037\x80-\xff]) # ..not followed by something that could be part of an atom
+|
+\[                            # [
+(?: [^\\\x80-\xff\n\015\[\]] |  \\ [^\x80-\xff]  )*     #    stuff
+\]                           #           ]
+)
+[\040\t]*                    # Nab whitespace.
+(?:
+\(                              #  (
+[^\\\x80-\xff\n\015()] *                             #     normal*
+(?:                                 #       (
+(?:  \\ [^\x80-\xff]  |
+\(                            #  (
+[^\\\x80-\xff\n\015()] *                            #     normal*
+(?:  \\ [^\x80-\xff]   [^\\\x80-\xff\n\015()] * )*        #     (special normal*)*
+\)                           #                       )
+)    #         special
+[^\\\x80-\xff\n\015()] *                         #         normal*
+)*                                  #            )*
+\)                             #                )
+[\040\t]* )*    # If comment found, allow more spaces.
+# optional trailing comments
+)*
+#       address spec
+>                    #                 >
+# name and address
+)
+/x
+    Alan Other <user\@dom.ain>
+ 0: Alan Other <[email protected]>
+    <user\@dom.ain>
+ 0: [email protected]
+ 1: user@dom
+    user\@dom.ain
+ 0: [email protected]
+ 1: user@dom
+    \"A. Other\" <user.1234\@dom.ain> (a comment)
+ 0: "A. Other" <[email protected]>
+    A. Other <user.1234\@dom.ain> (a comment)
+ 0:  Other <[email protected]>
+    \"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"\@x400-re.lay
+ 0: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re.lay
+ 1: "/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/"@x400-re
+    A missing angle <user\@some.where
+ 0: [email protected]
+ 1: user@some
     *** Failers
 No match
-    a\x{1234}b 
+    The quick brown fox
 No match
 
-/a(.{3,5})b/8
-    a\x{1234}xyb 
- 0: a\x{1234}xyb
-    a\x{1234}\x{4321}yb 
- 0: a\x{1234}\x{4321}yb
-    a\x{1234}\x{4321}\x{3412}b 
- 0: a\x{1234}\x{4321}\x{3412}b
-    axxxxbcdefghijb 
- 0: axxxxb
-    a\x{1234}\x{4321}\x{3412}\x{3421}b 
- 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
-    axbxxbcdefghijb 
- 0: axbxxb
-    axxxxxbcdefghijb 
- 0: axxxxxb
+/abc\0def\00pqr\000xyz\0000AB/
+    abc\0def\00pqr\000xyz\0000AB
+ 0: abc\x00def\x00pqr\x00xyz\x000AB
+    abc456 abc\0def\00pqr\000xyz\0000ABCDE
+ 0: abc\x00def\x00pqr\x00xyz\x000AB
+
+/abc\x0def\x00pqr\x000xyz\x0000AB/
+    abc\x0def\x00pqr\x000xyz\x0000AB
+ 0: abc\x0def\x00pqr\x000xyz\x0000AB
+    abc456 abc\x0def\x00pqr\x000xyz\x0000ABCDE
+ 0: abc\x0def\x00pqr\x000xyz\x0000AB
+
+/^[\000-\037]/
+    \0A
+ 0: \x00
+    \01B
+ 0: \x01
+    \037C
+ 0: \x1f
+
+/\0*/
+    \0\0\0\0
+ 0: \x00\x00\x00\x00
+ 1: \x00\x00\x00
+ 2: \x00\x00
+ 3: \x00
+ 4: 
+
+/A\x0{2,3}Z/
+    The A\x0\x0Z
+ 0: A\x00\x00Z
+    An A\0\x0\0Z
+ 0: A\x00\x00\x00Z
     *** Failers
 No match
-    a\x{1234}b 
+    A\0Z
 No match
-    axxxxxxbcdefghijb 
+    A\0\x0\0\x0Z
 No match
 
-/a(.{3,5}?)b/8
-    a\x{1234}xyb 
- 0: a\x{1234}xyb
-    a\x{1234}\x{4321}yb 
- 0: a\x{1234}\x{4321}yb
-    a\x{1234}\x{4321}\x{3412}b 
- 0: a\x{1234}\x{4321}\x{3412}b
-    axxxxbcdefghijb 
- 0: axxxxb
-    a\x{1234}\x{4321}\x{3412}\x{3421}b 
- 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
-    axbxxbcdefghijb 
- 0: axbxxb
-    axxxxxbcdefghijb 
- 0: axxxxxb
+/^\s/
+    \040abc
+ 0:  
+    \x0cabc
+ 0: \x0c
+    \nabc
+ 0: \x0a
+    \rabc
+ 0: \x0d
+    \tabc
+ 0: \x09
     *** Failers
 No match
-    a\x{1234}b 
+    abc
 No match
-    axxxxxxbcdefghijb 
+
+/^a	b
+      c/x
+    abc
+ 0: abc
+
+/ab{1,3}bc/
+    abbbbc
+ 0: abbbbc
+    abbbc
+ 0: abbbc
+    abbc
+ 0: abbc
+    *** Failers
+No match
+    abc
+No match
+    abbbbbc
 No match
 
-/^[a\x{c0}]/8
+/([^.]*)\.([^:]*):[T ]+(.*)/
+    track1.title:TBlah blah blah
+ 0: track1.title:TBlah blah blah
+ 1: track1.title:TBlah blah bla
+ 2: track1.title:TBlah blah bl
+ 3: track1.title:TBlah blah b
+ 4: track1.title:TBlah blah 
+ 5: track1.title:TBlah blah
+ 6: track1.title:TBlah bla
+ 7: track1.title:TBlah bl
+ 8: track1.title:TBlah b
+ 9: track1.title:TBlah 
+10: track1.title:TBlah
+11: track1.title:TBla
+12: track1.title:TBl
+13: track1.title:TB
+14: track1.title:T
+
+/([^.]*)\.([^:]*):[T ]+(.*)/i
+    track1.title:TBlah blah blah
+ 0: track1.title:TBlah blah blah
+ 1: track1.title:TBlah blah bla
+ 2: track1.title:TBlah blah bl
+ 3: track1.title:TBlah blah b
+ 4: track1.title:TBlah blah 
+ 5: track1.title:TBlah blah
+ 6: track1.title:TBlah bla
+ 7: track1.title:TBlah bl
+ 8: track1.title:TBlah b
+ 9: track1.title:TBlah 
+10: track1.title:TBlah
+11: track1.title:TBla
+12: track1.title:TBl
+13: track1.title:TB
+14: track1.title:T
+
+/([^.]*)\.([^:]*):[t ]+(.*)/i
+    track1.title:TBlah blah blah
+ 0: track1.title:TBlah blah blah
+ 1: track1.title:TBlah blah bla
+ 2: track1.title:TBlah blah bl
+ 3: track1.title:TBlah blah b
+ 4: track1.title:TBlah blah 
+ 5: track1.title:TBlah blah
+ 6: track1.title:TBlah bla
+ 7: track1.title:TBlah bl
+ 8: track1.title:TBlah b
+ 9: track1.title:TBlah 
+10: track1.title:TBlah
+11: track1.title:TBla
+12: track1.title:TBl
+13: track1.title:TB
+14: track1.title:T
+
+/^[W-c]+$/
+    WXY_^abc
+ 0: WXY_^abc
     *** Failers
 No match
-    \x{100}
+    wxy
 No match
 
-/(?<=aXb)cd/8
-    aXbcd
- 0: cd
+/^[W-c]+$/i
+    WXY_^abc
+ 0: WXY_^abc
+    wxy_^ABC
+ 0: wxy_^ABC
+
+/^[\x3f-\x5F]+$/i
+    WXY_^abc
+ 0: WXY_^abc
+    wxy_^ABC
+ 0: wxy_^ABC
 
-/(?<=a\x{100}b)cd/8
-    a\x{100}bcd
- 0: cd
+/^abc$/m
+    abc
+ 0: abc
+    qqq\nabc
+ 0: abc
+    abc\nzzz
+ 0: abc
+    qqq\nabc\nzzz
+ 0: abc
+
+/^abc$/
+    abc
+ 0: abc
+    *** Failers
+No match
+    qqq\nabc
+No match
+    abc\nzzz
+No match
+    qqq\nabc\nzzz
+No match
 
-/(?<=a\x{100000}b)cd/8
-    a\x{100000}bcd
- 0: cd
+/\Aabc\Z/m
+    abc
+ 0: abc
+    abc\n 
+ 0: abc
+    *** Failers
+No match
+    qqq\nabc
+No match
+    abc\nzzz
+No match
+    qqq\nabc\nzzz
+No match
     
-/(?:\x{100}){3}b/8
-    \x{100}\x{100}\x{100}b
- 0: \x{100}\x{100}\x{100}b
-    *** Failers 
+/\A(.)*\Z/s
+    abc\ndef
+ 0: abc\x0adef
+
+/\A(.)*\Z/m
+    *** Failers
+ 0: *** Failers
+    abc\ndef
+No match
+
+/(?:b)|(?::+)/
+    b::c
+ 0: b
+    c::b
+ 0: ::
+ 1: :
+
+/[-az]+/
+    az-
+ 0: az-
+ 1: az
+ 2: a
+    *** Failers
+ 0: a
+    b
+No match
+
+/[az-]+/
+    za-
+ 0: za-
+ 1: za
+ 2: z
+    *** Failers
+ 0: a
+    b
+No match
+
+/[a\-z]+/
+    a-z
+ 0: a-z
+ 1: a-
+ 2: a
+    *** Failers
+ 0: a
+    b
+No match
+
+/[a-z]+/
+    abcdxyz
+ 0: abcdxyz
+ 1: abcdxy
+ 2: abcdx
+ 3: abcd
+ 4: abc
+ 5: ab
+ 6: a
+
+/[\d-]+/
+    12-34
+ 0: 12-34
+ 1: 12-3
+ 2: 12-
+ 3: 12
+ 4: 1
+    *** Failers
+No match
+    aaa
+No match
+
+/[\d-z]+/
+    12-34z
+ 0: 12-34z
+ 1: 12-34
+ 2: 12-3
+ 3: 12-
+ 4: 12
+ 5: 1
+    *** Failers
 No match
-    \x{100}\x{100}b
+    aaa
 No match
 
-/\x{ab}/8
-    \x{ab} 
- 0: \x{ab}
-    \xc2\xab
- 0: \x{ab}
+/\x5c/
+    \\
+ 0: \
+
+/\x20Z/
+    the Zoo
+ 0:  Z
+    *** Failers
+No match
+    Zulu
+No match
+
+/ab{3cd/
+    ab{3cd
+ 0: ab{3cd
+
+/ab{3,cd/
+    ab{3,cd
+ 0: ab{3,cd
+
+/ab{3,4a}cd/
+    ab{3,4a}cd
+ 0: ab{3,4a}cd
+
+/{4,5a}bc/
+    {4,5a}bc
+ 0: {4,5a}bc
+
+/^a.b/<lf>
+    a\rb
+ 0: a\x0db
+    *** Failers
+No match
+    a\nb
+No match
+
+/abc$/
+    abc
+ 0: abc
+    abc\n
+ 0: abc
+    *** Failers
+No match
+    abc\ndef
+No match
+
+/(abc)\123/
+    abc\x53
+ 0: abcS
+
+/(abc)\223/
+    abc\x93
+ 0: abc\x93
+
+/(abc)\323/
+    abc\xd3
+ 0: abc\xd3
+
+/(abc)\100/
+    abc\x40
+ 0: abc@
+    abc\100
+ 0: abc@
+
+/(abc)\1000/
+    abc\x400
+ 0: abc@0
+    abc\x40\x30
+ 0: abc@0
+    abc\1000
+ 0: abc@0
+    abc\100\x30
+ 0: abc@0
+    abc\100\060
+ 0: abc@0
+    abc\100\60
+ 0: abc@0
+
+/abc\81/
+    abc\081
+ 0: abc\x0081
+    abc\0\x38\x31
+ 0: abc\x0081
+
+/abc\91/
+    abc\091
+ 0: abc\x0091
+    abc\0\x39\x31
+ 0: abc\x0091
+
+/(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\12\123/
+    abcdefghijk\12S
+ 0: abcdefghijk\x0aS
+
+/ab\idef/
+    abidef
+ 0: abidef
+
+/a{0}bc/
+    bc
+ 0: bc
+
+/(a|(bc)){0,0}?xyz/
+    xyz
+ 0: xyz
+
+/abc[\10]de/
+    abc\010de
+ 0: abc\x08de
+
+/abc[\1]de/
+    abc\1de
+ 0: abc\x01de
+
+/(abc)[\1]de/
+    abc\1de
+ 0: abc\x01de
+
+/(?s)a.b/
+    a\nb
+ 0: a\x0ab
+
+/^([^a])([^\b])([^c]*)([^d]{3,4})/
+    baNOTccccd
+ 0: baNOTcccc
+ 1: baNOTccc
+ 2: baNOTcc
+ 3: baNOTc
+ 4: baNOT
+    baNOTcccd
+ 0: baNOTccc
+ 1: baNOTcc
+ 2: baNOTc
+ 3: baNOT
+    baNOTccd
+ 0: baNOTcc
+ 1: baNOTc
+ 2: baNOT
+    bacccd
+ 0: baccc
+    *** Failers
+ 0: *** Failers
+ 1: *** Failer
+ 2: *** Faile
+ 3: *** Fail
+ 4: *** Fai
+ 5: *** Fa
+ 6: *** F
+    anything
+No match
+    b\bc   
+No match
+    baccd
+No match
+
+/[^a]/
+    Abc
+ 0: A
+  
+/[^a]/i
+    Abc 
+ 0: b
+
+/[^a]+/
+    AAAaAbc
+ 0: AAA
+ 1: AA
+ 2: A
+  
+/[^a]+/i
+    AAAaAbc 
+ 0: bc
+ 1: b
+
+/[^a]+/
+    bbb\nccc
+ 0: bbb\x0accc
+ 1: bbb\x0acc
+ 2: bbb\x0ac
+ 3: bbb\x0a
+ 4: bbb
+ 5: bb
+ 6: b
+   
+/[^k]$/
+    abc
+ 0: c
+    *** Failers
+ 0: s
+    abk   
+No match
+   
+/[^k]{2,3}$/
+    abc
+ 0: abc
+    kbc
+ 0: bc
+    kabc 
+ 0: abc
+    *** Failers
+ 0: ers
+    abk
+No match
+    akb
+No match
+    akk 
+No match
+
+/^\d{8,}\@.+[^k]$/
+    12345678\@a.b.c.d
+ 0: [email protected]
+    123456789\@x.y.z
+ 0: [email protected]
+    *** Failers
+No match
+    12345678\@x.y.uk
+No match
+    1234567\@a.b.c.d       
+No match
+
+/[^a]/
+    aaaabcd
+ 0: b
+    aaAabcd 
+ 0: A
+
+/[^a]/i
+    aaaabcd
+ 0: b
+    aaAabcd 
+ 0: b
+
+/[^az]/
+    aaaabcd
+ 0: b
+    aaAabcd 
+ 0: A
+
+/[^az]/i
+    aaaabcd
+ 0: b
+    aaAabcd 
+ 0: b
+
+/\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377/
+ \000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077\100\101\102\103\104\105\106\107\110\111\112\113\114\115\116\117\120\121\122\123\124\125\126\127\130\131\132\133\134\135\136\137\140\141\142\143\144\145\146\147\150\151\152\153\154\155\156\157\160\161\162\163\164\165\166\167\170\171\172\173\174\175\176\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377
+ 0: \x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff
+
+/P[^*]TAIRE[^*]{1,6}?LL/
+    xxxxxxxxxxxPSTAIREISLLxxxxxxxxx
+ 0: PSTAIREISLL
+
+/P[^*]TAIRE[^*]{1,}?LL/
+    xxxxxxxxxxxPSTAIREISLLxxxxxxxxx
+ 0: PSTAIREISLL
+
+/(\.\d\d[1-9]?)\d+/
+    1.230003938
+ 0: .230003938
+ 1: .23000393
+ 2: .2300039
+ 3: .230003
+ 4: .23000
+ 5: .2300
+ 6: .230
+    1.875000282   
+ 0: .875000282
+ 1: .87500028
+ 2: .8750002
+ 3: .875000
+ 4: .87500
+ 5: .8750
+ 6: .875
+    1.235  
+ 0: .235
+                  
+/(\.\d\d((?=0)|\d(?=\d)))/
+    1.230003938      
+ 0: .230
+ 1: .23
+    1.875000282
+ 0: .875
     *** Failers 
 No match
-    \x00{ab}
+    1.235 
 No match
+    
+/a(?)b/
+    ab 
+ 0: ab
+ 
+/\b(foo)\s+(\w+)/i
+    Food is on the foo table
+ 0: foo table
+ 1: foo tabl
+ 2: foo tab
+ 3: foo ta
+ 4: foo t
+    
+/foo(.*)bar/
+    The food is under the bar in the barn.
+ 0: food is under the bar in the bar
+ 1: food is under the bar
+    
+/foo(.*?)bar/  
+    The food is under the bar in the barn.
+ 0: food is under the bar in the bar
+ 1: food is under the bar
 
-/(?<=(.))X/8
-    WXYZ
- 0: X
-    \x{256}XYZ 
+/(.*)(\d*)/
+    I have 2 numbers: 53147
+Matched, but offsets vector is too small to show all matches
+ 0: I have 2 numbers: 53147
+ 1: I have 2 numbers: 5314
+ 2: I have 2 numbers: 531
+ 3: I have 2 numbers: 53
+ 4: I have 2 numbers: 5
+ 5: I have 2 numbers: 
+ 6: I have 2 numbers:
+ 7: I have 2 numbers
+ 8: I have 2 number
+ 9: I have 2 numbe
+10: I have 2 numb
+11: I have 2 num
+12: I have 2 nu
+13: I have 2 n
+14: I have 2 
+15: I have 2
+16: I have 
+17: I have
+18: I hav
+19: I ha
+20: I h
+21: I 
+    
+/(.*)(\d+)/
+    I have 2 numbers: 53147
+ 0: I have 2 numbers: 53147
+ 1: I have 2 numbers: 5314
+ 2: I have 2 numbers: 531
+ 3: I have 2 numbers: 53
+ 4: I have 2 numbers: 5
+ 5: I have 2
+ 
+/(.*?)(\d*)/
+    I have 2 numbers: 53147
+Matched, but offsets vector is too small to show all matches
+ 0: I have 2 numbers: 53147
+ 1: I have 2 numbers: 5314
+ 2: I have 2 numbers: 531
+ 3: I have 2 numbers: 53
+ 4: I have 2 numbers: 5
+ 5: I have 2 numbers: 
+ 6: I have 2 numbers:
+ 7: I have 2 numbers
+ 8: I have 2 number
+ 9: I have 2 numbe
+10: I have 2 numb
+11: I have 2 num
+12: I have 2 nu
+13: I have 2 n
+14: I have 2 
+15: I have 2
+16: I have 
+17: I have
+18: I hav
+19: I ha
+20: I h
+21: I 
+
+/(.*?)(\d+)/
+    I have 2 numbers: 53147
+ 0: I have 2 numbers: 53147
+ 1: I have 2 numbers: 5314
+ 2: I have 2 numbers: 531
+ 3: I have 2 numbers: 53
+ 4: I have 2 numbers: 5
+ 5: I have 2
+
+/(.*)(\d+)$/
+    I have 2 numbers: 53147
+ 0: I have 2 numbers: 53147
+
+/(.*?)(\d+)$/
+    I have 2 numbers: 53147
+ 0: I have 2 numbers: 53147
+
+/(.*)\b(\d+)$/
+    I have 2 numbers: 53147
+ 0: I have 2 numbers: 53147
+
+/(.*\D)(\d+)$/
+    I have 2 numbers: 53147
+ 0: I have 2 numbers: 53147
+
+/^\D*(?!123)/
+    ABC123
+ 0: AB
+ 1: A
+ 2: 
+     
+/^(\D*)(?=\d)(?!123)/
+    ABC445
+ 0: ABC
+    *** Failers
+No match
+    ABC123
+No match
+    
+/^[W-]46]/
+    W46]789 
+ 0: W46]
+    -46]789
+ 0: -46]
+    *** Failers
+No match
+    Wall
+No match
+    Zebra
+No match
+    42
+No match
+    [abcd] 
+No match
+    ]abcd[
+No match
+       
+/^[W-\]46]/
+    W46]789 
+ 0: W
+    Wall
+ 0: W
+    Zebra
+ 0: Z
+    Xylophone  
  0: X
+    42
+ 0: 4
+    [abcd] 
+ 0: [
+    ]abcd[
+ 0: ]
+    \\backslash 
+ 0: \
     *** Failers
 No match
-    XYZ 
+    -46]789
 No match
+    well
+No match
+    
+/\d\d\/\d\d\/\d\d\d\d/
+    01/01/2000
+ 0: 01/01/2000
 
-/[^a]+/8g
-    bcd
- 0: bcd
- 1: bc
- 2: b
-    \x{100}aY\x{256}Z 
- 0: \x{100}
- 0: Y\x{256}Z
- 1: Y\x{256}
- 2: Y
-    
-/^[^a]{2}/8
-    \x{100}bc
- 0: \x{100}b
- 
-/^[^a]{2,}/8
-    \x{100}bcAa
- 0: \x{100}bcA
- 1: \x{100}bc
- 2: \x{100}b
-
-/^[^a]{2,}?/8
-    \x{100}bca
- 0: \x{100}bc
- 1: \x{100}b
-
-/[^a]+/8ig
+/word (?:[a-zA-Z0-9]+ ){0,10}otherword/
+  word cat dog elephant mussel cow horse canary baboon snake shark otherword
+ 0: word cat dog elephant mussel cow horse canary baboon snake shark otherword
+  word cat dog elephant mussel cow horse canary baboon snake shark
+No match
+
+/word (?:[a-zA-Z0-9]+ ){0,300}otherword/
+  word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope
+No match
+
+/^(a){0,0}/
     bcd
- 0: bcd
- 1: bc
- 2: b
-    \x{100}aY\x{256}Z 
- 0: \x{100}
- 0: Y\x{256}Z
- 1: Y\x{256}
- 2: Y
-    
-/^[^a]{2}/8i
-    \x{100}bc
- 0: \x{100}b
- 
-/^[^a]{2,}/8i
-    \x{100}bcAa
- 0: \x{100}bc
- 1: \x{100}b
+ 0: 
+    abc
+ 0: 
+    aab     
+ 0: 
 
-/^[^a]{2,}?/8i
-    \x{100}bca
- 0: \x{100}bc
- 1: \x{100}b
+/^(a){0,1}/
+    bcd
+ 0: 
+    abc
+ 0: a
+ 1: 
+    aab  
+ 0: a
+ 1: 
 
-/\x{100}{0,0}/8
-    abcd
+/^(a){0,2}/
+    bcd
  0: 
- 
-/\x{100}?/8
-    abcd
+    abc
+ 0: a
+ 1: 
+    aab  
+ 0: aa
+ 1: a
+ 2: 
+
+/^(a){0,3}/
+    bcd
  0: 
-    \x{100}\x{100} 
- 0: \x{100}
+    abc
+ 0: a
  1: 
+    aab
+ 0: aa
+ 1: a
+ 2: 
+    aaa   
+ 0: aaa
+ 1: aa
+ 2: a
+ 3: 
 
-/\x{100}{0,3}/8 
-    \x{100}\x{100} 
- 0: \x{100}\x{100}
- 1: \x{100}
+/^(a){0,}/
+    bcd
+ 0: 
+    abc
+ 0: a
+ 1: 
+    aab
+ 0: aa
+ 1: a
  2: 
-    \x{100}\x{100}\x{100}\x{100} 
- 0: \x{100}\x{100}\x{100}
- 1: \x{100}\x{100}
- 2: \x{100}
+    aaa
+ 0: aaa
+ 1: aa
+ 2: a
  3: 
+    aaaaaaaa    
+ 0: aaaaaaaa
+ 1: aaaaaaa
+ 2: aaaaaa
+ 3: aaaaa
+ 4: aaaa
+ 5: aaa
+ 6: aa
+ 7: a
+ 8: 
+
+/^(a){1,1}/
+    bcd
+No match
+    abc
+ 0: a
+    aab  
+ 0: a
+
+/^(a){1,2}/
+    bcd
+No match
+    abc
+ 0: a
+    aab  
+ 0: aa
+ 1: a
+
+/^(a){1,3}/
+    bcd
+No match
+    abc
+ 0: a
+    aab
+ 0: aa
+ 1: a
+    aaa   
+ 0: aaa
+ 1: aa
+ 2: a
+
+/^(a){1,}/
+    bcd
+No match
+    abc
+ 0: a
+    aab
+ 0: aa
+ 1: a
+    aaa
+ 0: aaa
+ 1: aa
+ 2: a
+    aaaaaaaa    
+ 0: aaaaaaaa
+ 1: aaaaaaa
+ 2: aaaaaa
+ 3: aaaaa
+ 4: aaaa
+ 5: aaa
+ 6: aa
+ 7: a
+
+/.*\.gif/
+    borfle\nbib.gif\nno
+ 0: bib.gif
+
+/.{0,}\.gif/
+    borfle\nbib.gif\nno
+ 0: bib.gif
+
+/.*\.gif/m
+    borfle\nbib.gif\nno
+ 0: bib.gif
+
+/.*\.gif/s
+    borfle\nbib.gif\nno
+ 0: borfle\x0abib.gif
+
+/.*\.gif/ms
+    borfle\nbib.gif\nno
+ 0: borfle\x0abib.gif
     
-/\x{100}*/8
-    abce
- 0: 
-    \x{100}\x{100}\x{100}\x{100} 
- 0: \x{100}\x{100}\x{100}\x{100}
- 1: \x{100}\x{100}\x{100}
- 2: \x{100}\x{100}
- 3: \x{100}
- 4: 
+/.*$/
+    borfle\nbib.gif\nno
+ 0: no
 
-/\x{100}{1,1}/8
-    abcd\x{100}\x{100}\x{100}\x{100} 
- 0: \x{100}
-
-/\x{100}{1,3}/8
-    abcd\x{100}\x{100}\x{100}\x{100} 
- 0: \x{100}\x{100}\x{100}
- 1: \x{100}\x{100}
- 2: \x{100}
-
-/\x{100}+/8
-    abcd\x{100}\x{100}\x{100}\x{100} 
- 0: \x{100}\x{100}\x{100}\x{100}
- 1: \x{100}\x{100}\x{100}
- 2: \x{100}\x{100}
- 3: \x{100}
-
-/\x{100}{3}/8
-    abcd\x{100}\x{100}\x{100}XX
- 0: \x{100}\x{100}\x{100}
-
-/\x{100}{3,5}/8
-    abcd\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}XX
- 0: \x{100}\x{100}\x{100}\x{100}\x{100}
- 1: \x{100}\x{100}\x{100}\x{100}
- 2: \x{100}\x{100}\x{100}
-
-/\x{100}{3,}/8
-    abcd\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}XX
- 0: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 1: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 2: \x{100}\x{100}\x{100}\x{100}\x{100}
- 3: \x{100}\x{100}\x{100}\x{100}
- 4: \x{100}\x{100}\x{100}
-
-/(?<=a\x{100}{2}b)X/8
-    Xyyya\x{100}\x{100}bXzzz
- 0: X
+/.*$/m
+    borfle\nbib.gif\nno
+ 0: borfle
 
-/\D*/8
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Matched, but too many subsidiary matches
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 6: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 7: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 8: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 9: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-10: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-13: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-14: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-15: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-16: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-17: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-18: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-19: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-20: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-21: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-
-/\D*/8
-  \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-Matched, but too many subsidiary matches
- 0: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 1: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 2: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 3: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 4: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 5: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 6: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 7: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 8: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
- 9: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-10: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-11: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-12: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-13: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-14: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-15: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-16: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-17: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-18: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-19: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-20: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-21: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
-
-/\D/8
-    1X2
- 0: X
-    1\x{100}2 
- 0: \x{100}
+/.*$/s
+    borfle\nbib.gif\nno
+ 0: borfle\x0abib.gif\x0ano
+
+/.*$/ms
+    borfle\nbib.gif\nno
+ 0: borfle\x0abib.gif\x0ano
+ 1: borfle\x0abib.gif
+ 2: borfle
+    
+/.*$/
+    borfle\nbib.gif\nno\n
+ 0: no
+
+/.*$/m
+    borfle\nbib.gif\nno\n
+ 0: borfle
+
+/.*$/s
+    borfle\nbib.gif\nno\n
+ 0: borfle\x0abib.gif\x0ano\x0a
+ 1: borfle\x0abib.gif\x0ano
+
+/.*$/ms
+    borfle\nbib.gif\nno\n
+ 0: borfle\x0abib.gif\x0ano\x0a
+ 1: borfle\x0abib.gif\x0ano
+ 2: borfle\x0abib.gif
+ 3: borfle
+    
+/(.*X|^B)/
+    abcde\n1234Xyz
+ 0: 1234X
+    BarFoo 
+ 0: B
+    *** Failers
+No match
+    abcde\nBar  
+No match
+
+/(.*X|^B)/m
+    abcde\n1234Xyz
+ 0: 1234X
+    BarFoo 
+ 0: B
+    abcde\nBar  
+ 0: B
+
+/(.*X|^B)/s
+    abcde\n1234Xyz
+ 0: abcde\x0a1234X
+    BarFoo 
+ 0: B
+    *** Failers
+No match
+    abcde\nBar  
+No match
+
+/(.*X|^B)/ms
+    abcde\n1234Xyz
+ 0: abcde\x0a1234X
+    BarFoo 
+ 0: B
+    abcde\nBar  
+ 0: B
+
+/(?s)(.*X|^B)/
+    abcde\n1234Xyz
+ 0: abcde\x0a1234X
+    BarFoo 
+ 0: B
+    *** Failers 
+No match
+    abcde\nBar  
+No match
+
+/(?s:.*X|^B)/
+    abcde\n1234Xyz
+ 0: abcde\x0a1234X
+    BarFoo 
+ 0: B
+    *** Failers 
+No match
+    abcde\nBar  
+No match
+
+/^.*B/
+    **** Failers
+No match
+    abc\nB
+No match
+     
+/(?s)^.*B/
+    abc\nB
+ 0: abc\x0aB
+
+/(?m)^.*B/
+    abc\nB
+ 0: B
+     
+/(?ms)^.*B/
+    abc\nB
+ 0: abc\x0aB
+
+/(?ms)^B/
+    abc\nB
+ 0: B
+
+/(?s)B$/
+    B\n
+ 0: B
+
+/^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/
+    123456654321
+ 0: 123456654321
   
-/>\S/8
-    > >X Y
- 0: >X
-    > >\x{100} Y
- 0: >\x{100}
+/^\d\d\d\d\d\d\d\d\d\d\d\d/
+    123456654321 
+ 0: 123456654321
+
+/^[\d][\d][\d][\d][\d][\d][\d][\d][\d][\d][\d][\d]/
+    123456654321
+ 0: 123456654321
   
-/\d/8
-    \x{100}3
- 0: 3
+/^[abc]{12}/
+    abcabcabcabc
+ 0: abcabcabcabc
     
-/\s/8
-    \x{100} X
- 0:  
+/^[a-c]{12}/
+    abcabcabcabc
+ 0: abcabcabcabc
     
-/\D+/8
-    12abcd34
+/^(a|b|c){12}/
+    abcabcabcabc 
+ 0: abcabcabcabc
+
+/^[abcdefghijklmnopqrstuvwxy0123456789]/
+    n
+ 0: n
+    *** Failers 
+No match
+    z 
+No match
+
+/abcde{0,0}/
+    abcd
  0: abcd
- 1: abc
- 2: ab
- 3: a
     *** Failers
- 0: *** Failers
- 1: *** Failer
- 2: *** Faile
- 3: *** Fail
- 4: *** Fai
- 5: *** Fa
- 6: *** F
- 7: *** 
- 8: ***
- 9: **
-10: *
-    1234  
+No match
+    abce  
 No match
 
-/\D{2,3}/8
-    12abcd34
- 0: abc
- 1: ab
-    12ab34
+/ab[cd]{0,0}e/
+    abe
+ 0: abe
+    *** Failers
+No match
+    abcde 
+No match
+    
+/ab(c){0,0}d/
+    abd
+ 0: abd
+    *** Failers
+No match
+    abcd   
+No match
+
+/a(b*)/
+    a
+ 0: a
+    ab
  0: ab
-    *** Failers  
- 0: ***
- 1: **
-    1234
+ 1: a
+    abbbb
+ 0: abbbb
+ 1: abbb
+ 2: abb
+ 3: ab
+ 4: a
+    *** Failers
+ 0: a
+    bbbbb    
 No match
-    12a34  
+    
+/ab\d{0}e/
+    abe
+ 0: abe
+    *** Failers
 No match
+    ab1e   
+No match
+    
+/"([^\\"]+|\\.)*"/
+    the \"quick\" brown fox
+ 0: "quick"
+    \"the \\\"quick\\\" brown fox\" 
+ 0: "the \"quick\" brown fox"
 
-/\D{2,3}?/8
-    12abcd34
+/.*?/g+
+    abc
  0: abc
+ 0+ 
  1: ab
-    12ab34
+ 2: a
+ 3: 
+ 0: 
+ 0+ 
+  
+/\b/g+
+    abc 
+ 0: 
+ 0+ abc
+ 0: 
+ 0+ 
+
+/\b/+g
+    abc 
+ 0: 
+ 0+ abc
+ 0: 
+ 0+ 
+
+//g
+    abc
+ 0: 
+ 0: 
+ 0: 
+ 0: 
+
+/<tr([\w\W\s\d][^<>]{0,})><TD([\w\W\s\d][^<>]{0,})>([\d]{0,}\.)(.*)((<BR>([\w\W\s\d][^<>]{0,})|[\s]{0,}))<\/a><\/TD><TD([\w\W\s\d][^<>]{0,})>([\w\W\s\d][^<>]{0,})<\/TD><TD([\w\W\s\d][^<>]{0,})>([\w\W\s\d][^<>]{0,})<\/TD><\/TR>/is
+  <TR BGCOLOR='#DBE9E9'><TD align=left valign=top>43.<a href='joblist.cfm?JobID=94 6735&Keyword='>Word Processor<BR>(N-1286)</a></TD><TD align=left valign=top>Lega lstaff.com</TD><TD align=left valign=top>CA - Statewide</TD></TR>
+ 0: <TR BGCOLOR='#DBE9E9'><TD align=left valign=top>43.<a href='joblist.cfm?JobID=94 6735&Keyword='>Word Processor<BR>(N-1286)</a></TD><TD align=left valign=top>Lega lstaff.com</TD><TD align=left valign=top>CA - Statewide</TD></TR>
+
+/a[^a]b/
+    acb
+ 0: acb
+    a\nb
+ 0: a\x0ab
+    
+/a.b/
+    acb
+ 0: acb
+    *** Failers 
+No match
+    a\nb   
+No match
+    
+/a[^a]b/s
+    acb
+ 0: acb
+    a\nb  
+ 0: a\x0ab
+    
+/a.b/s
+    acb
+ 0: acb
+    a\nb  
+ 0: a\x0ab
+
+/^(b+?|a){1,2}?c/
+    bac
+ 0: bac
+    bbac
+ 0: bbac
+    bbbac
+ 0: bbbac
+    bbbbac
+ 0: bbbbac
+    bbbbbac 
+ 0: bbbbbac
+
+/^(b+|a){1,2}?c/
+    bac
+ 0: bac
+    bbac
+ 0: bbac
+    bbbac
+ 0: bbbac
+    bbbbac
+ 0: bbbbac
+    bbbbbac 
+ 0: bbbbbac
+    
+/(?!\A)x/m
+    x\nb\n
+No match
+    a\bx\n  
+ 0: x
+    
+/\x0{ab}/
+    \0{ab} 
+ 0: \x00{ab}
+
+/(A|B)*?CD/
+    CD 
+ 0: CD
+    
+/(A|B)*CD/
+    CD 
+ 0: CD
+
+/(?<!bar)foo/
+    foo
+ 0: foo
+    catfood
+ 0: foo
+    arfootle
+ 0: foo
+    rfoosh
+ 0: foo
+    *** Failers
+No match
+    barfoo
+No match
+    towbarfoo
+No match
+
+/\w{3}(?<!bar)foo/
+    catfood
+ 0: catfoo
+    *** Failers
+No match
+    foo
+No match
+    barfoo
+No match
+    towbarfoo
+No match
+
+/(?<=(foo)a)bar/
+    fooabar
+ 0: bar
+    *** Failers
+No match
+    bar
+No match
+    foobbar
+No match
+      
+/\Aabc\z/m
+    abc
+ 0: abc
+    *** Failers
+No match
+    abc\n   
+No match
+    qqq\nabc
+No match
+    abc\nzzz
+No match
+    qqq\nabc\nzzz
+No match
+
+"(?>.*/)foo"
+    /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/it/you/see/
+No match
+
+"(?>.*/)foo"
+    /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/and/foo
+ 0: /this/is/a/very/long/line/in/deed/with/very/many/slashes/in/and/foo
+
+/(?>(\.\d\d[1-9]?))\d+/
+    1.230003938
+ 0: .230003938
+ 1: .23000393
+ 2: .2300039
+ 3: .230003
+ 4: .23000
+ 5: .2300
+ 6: .230
+    1.875000282
+ 0: .875000282
+ 1: .87500028
+ 2: .8750002
+ 3: .875000
+ 4: .87500
+ 5: .8750
+    *** Failers 
+No match
+    1.235 
+No match
+
+/^((?>\w+)|(?>\s+))*$/
+    now is the time for all good men to come to the aid of the party
+ 0: now is the time for all good men to come to the aid of the party
+    *** Failers
+No match
+    this is not a line with only words and spaces!
+No match
+    
+/(\d+)(\w)/
+    12345a
+ 0: 12345a
+ 1: 12345
+ 2: 1234
+ 3: 123
+ 4: 12
+    12345+ 
+ 0: 12345
+ 1: 1234
+ 2: 123
+ 3: 12
+
+/((?>\d+))(\w)/
+    12345a
+ 0: 12345a
+    *** Failers
+No match
+    12345+ 
+No match
+
+/(?>a+)b/
+    aaab
+ 0: aaab
+
+/((?>a+)b)/
+    aaab
+ 0: aaab
+
+/(?>(a+))b/
+    aaab
+ 0: aaab
+
+/(?>b)+/
+    aaabbbccc
+ 0: bbb
+ 1: bb
+ 2: b
+
+/(?>a+|b+|c+)*c/
+    aaabbbbccccd
+ 0: aaabbbbcccc
+ 1: aaabbbbc
+    
+/(a+|b+|c+)*c/
+    aaabbbbccccd
+ 0: aaabbbbcccc
+ 1: aaabbbbccc
+ 2: aaabbbbcc
+ 3: aaabbbbc
+
+/((?>[^()]+)|\([^()]*\))+/
+    ((abc(ade)ufh()()x
+ 0: abc(ade)ufh()()x
+ 1: abc(ade)ufh()()
+ 2: abc(ade)ufh()
+ 3: abc(ade)ufh
+ 4: abc(ade)
+ 5: abc
+    
+/\(((?>[^()]+)|\([^()]+\))+\)/ 
+    (abc)
+ 0: (abc)
+    (abc(def)xyz)
+ 0: (abc(def)xyz)
+    *** Failers
+No match
+    ((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa   
+No match
+
+/a(?-i)b/i
+    ab
  0: ab
-    *** Failers  
- 0: ***
- 1: **
-    1234
+    Ab
+ 0: Ab
+    *** Failers 
+No match
+    aB
 No match
-    12a34  
+    AB
+No match
+        
+/(a (?x)b c)d e/
+    a bcd e
+ 0: a bcd e
+    *** Failers
+No match
+    a b cd e
+No match
+    abcd e   
+No match
+    a bcde 
+No match
+ 
+/(a b(?x)c d (?-x)e f)/
+    a bcde f
+ 0: a bcde f
+    *** Failers
+No match
+    abcdef  
 No match
 
-/\d+/8
-    12abcd34
- 0: 12
- 1: 1
+/(a(?i)b)c/
+    abc
+ 0: abc
+    aBc
+ 0: aBc
+    *** Failers
+No match
+    abC
+No match
+    aBC  
+No match
+    Abc
+No match
+    ABc
+No match
+    ABC
+No match
+    AbC
+No match
+    
+/a(?i:b)c/
+    abc
+ 0: abc
+    aBc
+ 0: aBc
+    *** Failers 
+No match
+    ABC
+No match
+    abC
+No match
+    aBC
+No match
+    
+/a(?i:b)*c/
+    aBc
+ 0: aBc
+    aBBc
+ 0: aBBc
+    *** Failers 
+No match
+    aBC
+No match
+    aBBC
+No match
+    
+/a(?=b(?i)c)\w\wd/
+    abcd
+ 0: abcd
+    abCd
+ 0: abCd
+    *** Failers
+No match
+    aBCd
+No match
+    abcD     
+No match
+    
+/(?s-i:more.*than).*million/i
+    more than million
+ 0: more than million
+    more than MILLION
+ 0: more than MILLION
+    more \n than Million 
+ 0: more \x0a than Million
     *** Failers
 No match
+    MORE THAN MILLION    
+No match
+    more \n than \n million 
+No match
 
-/\d{2,3}/8
-    12abcd34
+/(?:(?s-i)more.*than).*million/i
+    more than million
+ 0: more than million
+    more than MILLION
+ 0: more than MILLION
+    more \n than Million 
+ 0: more \x0a than Million
+    *** Failers
+No match
+    MORE THAN MILLION    
+No match
+    more \n than \n million 
+No match
+    
+/(?>a(?i)b+)+c/ 
+    abc
+ 0: abc
+    aBbc
+ 0: aBbc
+    aBBc 
+ 0: aBBc
+    *** Failers
+No match
+    Abc
+No match
+    abAb    
+No match
+    abbC 
+No match
+    
+/(?=a(?i)b)\w\wc/
+    abc
+ 0: abc
+    aBc
+ 0: aBc
+    *** Failers
+No match
+    Ab 
+No match
+    abC
+No match
+    aBC     
+No match
+    
+/(?<=a(?i)b)(\w\w)c/
+    abxxc
+ 0: xxc
+    aBxxc
+ 0: xxc
+    *** Failers
+No match
+    Abxxc
+No match
+    ABxxc
+No match
+    abxxC      
+No match
+
+/^(?(?=abc)\w{3}:|\d\d)$/
+    abc:
+ 0: abc:
+    12
  0: 12
-    1234abcd
- 0: 123
- 1: 12
-    *** Failers  
+    *** Failers
+No match
+    123
 No match
-    1.4 
+    xyz    
 No match
 
-/\d{2,3}?/8
-    12abcd34
+/^(?(?!abc)\d\d|\w{3}:)$/
+    abc:
+ 0: abc:
+    12
  0: 12
-    1234abcd
- 0: 123
- 1: 12
-    *** Failers  
-No match
-    1.4 
-No match
-
-/\S+/8
-    12abcd34
- 0: 12abcd34
- 1: 12abcd3
- 2: 12abcd
- 3: 12abc
- 4: 12ab
- 5: 12a
- 6: 12
- 7: 1
-    *** Failers
- 0: ***
- 1: **
- 2: *
-    \    \ 
-No match
-
-/\S{2,3}/8
-    12abcd34
- 0: 12a
- 1: 12
-    1234abcd
- 0: 123
- 1: 12
     *** Failers
- 0: ***
- 1: **
-    \     \  
+No match
+    123
+No match
+    xyz    
+No match
+    
+/(?(?<=foo)bar|cat)/
+    foobar
+ 0: bar
+    cat
+ 0: cat
+    fcat
+ 0: cat
+    focat   
+ 0: cat
+    *** Failers
+No match
+    foocat  
 No match
 
-/\S{2,3}?/8
-    12abcd34
- 0: 12a
- 1: 12
-    1234abcd
- 0: 123
- 1: 12
+/(?(?<!foo)cat|bar)/
+    foobar
+ 0: bar
+    cat
+ 0: cat
+    fcat
+ 0: cat
+    focat   
+ 0: cat
+    *** Failers
+No match
+    foocat  
+No match
+
+/(?>a*)*/
+    a
+ 0: a
+ 1: 
+    aa
+ 0: aa
+ 1: 
+    aaaa
+ 0: aaaa
+ 1: 
+    
+/(abc|)+/
+    abc
+ 0: abc
+ 1: 
+    abcabc
+ 0: abcabc
+ 1: abc
+ 2: 
+    abcabcabc
+ 0: abcabcabc
+ 1: abcabc
+ 2: abc
+ 3: 
+    xyz      
+ 0: 
+
+/([a]*)*/
+    a
+ 0: a
+ 1: 
+    aaaaa 
+ 0: aaaaa
+ 1: aaaa
+ 2: aaa
+ 3: aa
+ 4: a
+ 5: 
+ 
+/([ab]*)*/
+    a
+ 0: a
+ 1: 
+    b
+ 0: b
+ 1: 
+    ababab
+ 0: ababab
+ 1: ababa
+ 2: abab
+ 3: aba
+ 4: ab
+ 5: a
+ 6: 
+    aaaabcde
+ 0: aaaab
+ 1: aaaa
+ 2: aaa
+ 3: aa
+ 4: a
+ 5: 
+    bbbb    
+ 0: bbbb
+ 1: bbb
+ 2: bb
+ 3: b
+ 4: 
+ 
+/([^a]*)*/
+    b
+ 0: b
+ 1: 
+    bbbb
+ 0: bbbb
+ 1: bbb
+ 2: bb
+ 3: b
+ 4: 
+    aaa   
+ 0: 
+ 
+/([^ab]*)*/
+    cccc
+ 0: cccc
+ 1: ccc
+ 2: cc
+ 3: c
+ 4: 
+    abab  
+ 0: 
+ 
+/([a]*?)*/
+    a
+ 0: a
+ 1: 
+    aaaa 
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+ 4: 
+ 
+/([ab]*?)*/
+    a
+ 0: a
+ 1: 
+    b
+ 0: b
+ 1: 
+    abab
+ 0: abab
+ 1: aba
+ 2: ab
+ 3: a
+ 4: 
+    baba   
+ 0: baba
+ 1: bab
+ 2: ba
+ 3: b
+ 4: 
+ 
+/([^a]*?)*/
+    b
+ 0: b
+ 1: 
+    bbbb
+ 0: bbbb
+ 1: bbb
+ 2: bb
+ 3: b
+ 4: 
+    aaa   
+ 0: 
+ 
+/([^ab]*?)*/
+    c
+ 0: c
+ 1: 
+    cccc
+ 0: cccc
+ 1: ccc
+ 2: cc
+ 3: c
+ 4: 
+    baba   
+ 0: 
+ 
+/(?>a*)*/
+    a
+ 0: a
+ 1: 
+    aaabcde 
+ 0: aaa
+ 1: 
+ 
+/((?>a*))*/
+    aaaaa
+ 0: aaaaa
+ 1: 
+    aabbaa 
+ 0: aa
+ 1: 
+ 
+/((?>a*?))*/
+    aaaaa
+ 0: aaaaa
+ 1: 
+    aabbaa 
+ 0: aa
+ 1: 
+
+/(?(?=[^a-z]+[a-z])  \d{2}-[a-z]{3}-\d{2}  |  \d{2}-\d{2}-\d{2} ) /x
+    12-sep-98
+ 0: 12-sep-98
+    12-09-98
+ 0: 12-09-98
     *** Failers
- 0: ***
- 1: **
-    \     \  
+No match
+    sep-12-98
+No match
+        
+/(?i:saturday|sunday)/
+    saturday
+ 0: saturday
+    sunday
+ 0: sunday
+    Saturday
+ 0: Saturday
+    Sunday
+ 0: Sunday
+    SATURDAY
+ 0: SATURDAY
+    SUNDAY
+ 0: SUNDAY
+    SunDay
+ 0: SunDay
+    
+/(a(?i)bc|BB)x/
+    abcx
+ 0: abcx
+    aBCx
+ 0: aBCx
+    bbx
+ 0: bbx
+    BBx
+ 0: BBx
+    *** Failers
+No match
+    abcX
+No match
+    aBCX
+No match
+    bbX
+No match
+    BBX               
 No match
 
-/>\s+</8
-    12>      <34
- 0: >      <
+/^([ab](?i)[cd]|[ef])/
+    ac
+ 0: ac
+    aC
+ 0: aC
+    bD
+ 0: bD
+    elephant
+ 0: e
+    Europe 
+ 0: E
+    frog
+ 0: f
+    France
+ 0: F
     *** Failers
 No match
+    Africa     
+No match
 
-/>\s{2,3}</8
-    ab>  <cd
- 0: >  <
-    ab>   <ce
- 0: >   <
+/^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)/
+    ab
+ 0: ab
+    aBd
+ 0: aBd
+    xy
+ 0: xy
+    xY
+ 0: xY
+    zebra
+ 0: z
+    Zambesi
+ 0: Z
     *** Failers
 No match
-    ab>    <cd 
+    aCD  
+No match
+    XY  
 No match
 
-/>\s{2,3}?</8
-    ab>  <cd
- 0: >  <
-    ab>   <ce
- 0: >   <
+/(?<=foo\n)^bar/m
+    foo\nbar
+ 0: bar
     *** Failers
 No match
-    ab>    <cd 
+    bar
+No match
+    baz\nbar   
 No match
 
-/\w+/8
-    12      34
- 0: 12
- 1: 1
+/(?<=(?<!foo)bar)baz/
+    barbaz
+ 0: baz
+    barbarbaz 
+ 0: baz
+    koobarbaz 
+ 0: baz
     *** Failers
- 0: Failers
- 1: Failer
- 2: Faile
- 3: Fail
- 4: Fai
- 5: Fa
- 6: F
-    +++=*! 
 No match
+    baz
+No match
+    foobarbaz 
+No match
+
+/The following tests are taken from the Perl 5.005 test suite; some of them/
+/are compatible with 5.004, but I'd rather not have to sort them out./
+No match
+
+/abc/
+    abc
+ 0: abc
+    xabcy
+ 0: abc
+    ababc
+ 0: abc
+    *** Failers
+No match
+    xbc
+No match
+    axc
+No match
+    abx
+No match
+
+/ab*c/
+    abc
+ 0: abc
+
+/ab*bc/
+    abc
+ 0: abc
+    abbc
+ 0: abbc
+    abbbbc
+ 0: abbbbc
+
+/.{1}/
+    abbbbc
+ 0: a
+
+/.{3,4}/
+    abbbbc
+ 0: abbb
+ 1: abb
+
+/ab{0,}bc/
+    abbbbc
+ 0: abbbbc
+
+/ab+bc/
+    abbc
+ 0: abbc
+    *** Failers
+No match
+    abc
+No match
+    abq
+No match
+
+/ab+bc/
+    abbbbc
+ 0: abbbbc
+
+/ab{1,}bc/
+    abbbbc
+ 0: abbbbc
+
+/ab{1,3}bc/
+    abbbbc
+ 0: abbbbc
+
+/ab{3,4}bc/
+    abbbbc
+ 0: abbbbc
+
+/ab{4,5}bc/
+    *** Failers
+No match
+    abq
+No match
+    abbbbc
+No match
+
+/ab?bc/
+    abbc
+ 0: abbc
+    abc
+ 0: abc
+
+/ab{0,1}bc/
+    abc
+ 0: abc
+
+/ab?bc/
+
+/ab?c/
+    abc
+ 0: abc
+
+/ab{0,1}c/
+    abc
+ 0: abc
+
+/^abc$/
+    abc
+ 0: abc
+    *** Failers
+No match
+    abbbbc
+No match
+    abcc
+No match
+
+/^abc/
+    abcc
+ 0: abc
+
+/^abc$/
+
+/abc$/
+    aabc
+ 0: abc
+    *** Failers
+No match
+    aabc
+ 0: abc
+    aabcd
+No match
+
+/^/
+    abc
+ 0: 
+
+/$/
+    abc
+ 0: 
+
+/a.c/
+    abc
+ 0: abc
+    axc
+ 0: axc
+
+/a.*c/
+    axyzc
+ 0: axyzc
+
+/a[bc]d/
+    abd
+ 0: abd
+    *** Failers
+No match
+    axyzd
+No match
+    abc
+No match
+
+/a[b-d]e/
+    ace
+ 0: ace
+
+/a[b-d]/
+    aac
+ 0: ac
+
+/a[-b]/
+    a-
+ 0: a-
+
+/a[b-]/
+    a-
+ 0: a-
 
-/\w{2,3}/8
-    ab  cd
+/a]/
+    a]
+ 0: a]
+
+/a[]]b/
+    a]b
+ 0: a]b
+
+/a[^bc]d/
+    aed
+ 0: aed
+    *** Failers
+No match
+    abd
+No match
+    abd
+No match
+
+/a[^-b]c/
+    adc
+ 0: adc
+
+/a[^]b]c/
+    adc
+ 0: adc
+    *** Failers
+No match
+    a-c
+ 0: a-c
+    a]c
+No match
+
+/\ba\b/
+    a-
+ 0: a
+    -a
+ 0: a
+    -a-
+ 0: a
+
+/\by\b/
+    *** Failers
+No match
+    xy
+No match
+    yz
+No match
+    xyz
+No match
+
+/\Ba\B/
+    *** Failers
+ 0: a
+    a-
+No match
+    -a
+No match
+    -a-
+No match
+
+/\By\b/
+    xy
+ 0: y
+
+/\by\B/
+    yz
+ 0: y
+
+/\By\B/
+    xyz
+ 0: y
+
+/\w/
+    a
+ 0: a
+
+/\W/
+    -
+ 0: -
+    *** Failers
+ 0: *
+    -
+ 0: -
+    a
+No match
+
+/a\sb/
+    a b
+ 0: a b
+
+/a\Sb/
+    a-b
+ 0: a-b
+    *** Failers
+No match
+    a-b
+ 0: a-b
+    a b
+No match
+
+/\d/
+    1
+ 0: 1
+
+/\D/
+    -
+ 0: -
+    *** Failers
+ 0: *
+    -
+ 0: -
+    1
+No match
+
+/[\w]/
+    a
+ 0: a
+
+/[\W]/
+    -
+ 0: -
+    *** Failers
+ 0: *
+    -
+ 0: -
+    a
+No match
+
+/a[\s]b/
+    a b
+ 0: a b
+
+/a[\S]b/
+    a-b
+ 0: a-b
+    *** Failers
+No match
+    a-b
+ 0: a-b
+    a b
+No match
+
+/[\d]/
+    1
+ 0: 1
+
+/[\D]/
+    -
+ 0: -
+    *** Failers
+ 0: *
+    -
+ 0: -
+    1
+No match
+
+/ab|cd/
+    abc
+ 0: ab
+    abcd
  0: ab
-    abcd ce
+
+/()ef/
+    def
+ 0: ef
+
+/$b/
+
+/a\(b/
+    a(b
+ 0: a(b
+
+/a\(*b/
+    ab
+ 0: ab
+    a((b
+ 0: a((b
+
+/a\\b/
+    a\b
+No match
+
+/((a))/
+    abc
+ 0: a
+
+/(a)b(c)/
+    abc
  0: abc
- 1: ab
+
+/a+b+c/
+    aabbabc
+ 0: abc
+
+/a{1,}b{1,}c/
+    aabbabc
+ 0: abc
+
+/a.+?c/
+    abcabc
+ 0: abcabc
+ 1: abc
+
+/(a+|b)*/
+    ab
+ 0: ab
+ 1: a
+ 2: 
+
+/(a+|b){0,}/
+    ab
+ 0: ab
+ 1: a
+ 2: 
+
+/(a+|b)+/
+    ab
+ 0: ab
+ 1: a
+
+/(a+|b){1,}/
+    ab
+ 0: ab
+ 1: a
+
+/(a+|b)?/
+    ab
+ 0: a
+ 1: 
+
+/(a+|b){0,1}/
+    ab
+ 0: a
+ 1: 
+
+/[^ab]*/
+    cde
+ 0: cde
+ 1: cd
+ 2: c
+ 3: 
+
+/abc/
     *** Failers
- 0: Fai
- 1: Fa
-    a.b.c
 No match
+    b
+No match
+    
+
+/a*/
+    
+
+/([abc])*d/
+    abbbcd
+ 0: abbbcd
+
+/([abc])*bcd/
+    abcd
+ 0: abcd
+
+/a|b|c|d|e/
+    e
+ 0: e
 
-/\w{2,3}?/8
-    ab  cd
+/(a|b|c|d|e)f/
+    ef
+ 0: ef
+
+/abcd*efg/
+    abcdefg
+ 0: abcdefg
+
+/ab*/
+    xabyabbbz
  0: ab
-    abcd ce
+ 1: a
+    xayabbbz
+ 0: a
+
+/(ab|cd)e/
+    abcde
+ 0: cde
+
+/[abhgefdc]ij/
+    hij
+ 0: hij
+
+/^(ab|cd)e/
+
+/(abc|)ef/
+    abcdef
+ 0: ef
+
+/(a|b)c*d/
+    abcd
+ 0: bcd
+
+/(ab|ab*)bc/
+    abc
+ 0: abc
+
+/a([bc]*)c*/
+    abc
  0: abc
  1: ab
+ 2: a
+
+/a([bc]*)(c*d)/
+    abcd
+ 0: abcd
+
+/a([bc]+)(c*d)/
+    abcd
+ 0: abcd
+
+/a([bc]*)(c+d)/
+    abcd
+ 0: abcd
+
+/a[bcd]*dcdcde/
+    adcdcde
+ 0: adcdcde
+
+/a[bcd]+dcdcde/
     *** Failers
- 0: Fai
- 1: Fa
-    a.b.c
 No match
+    abcde
+No match
+    adcdcde
+No match
+
+/(ab|a)b*c/
+    abc
+ 0: abc
 
-/\W+/8
-    12====34
- 0: ====
- 1: ===
- 2: ==
- 3: =
+/((a)(b)c)(d)/
+    abcd
+ 0: abcd
+
+/[a-zA-Z_][a-zA-Z0-9_]*/
+    alpha
+ 0: alpha
+ 1: alph
+ 2: alp
+ 3: al
+ 4: a
+
+/^a(bc+|b[eh])g|.h$/
+    abh
+ 0: bh
+
+/(bc+d$|ef*g.|h?i(j|k))/
+    effgz
+ 0: effgz
+    ij
+ 0: ij
+    reffgz
+ 0: effgz
     *** Failers
- 0: *** 
- 1: ***
- 2: **
- 3: *
-    abcd 
 No match
+    effg
+No match
+    bcdd
+No match
+
+/((((((((((a))))))))))/
+    a
+ 0: a
+
+/(((((((((a)))))))))/
+    a
+ 0: a
 
-/\W{2,3}/8
-    ab====cd
- 0: ===
- 1: ==
-    ab==cd
- 0: ==
+/multiple words of text/
     *** Failers
- 0: ***
- 1: **
-    a.b.c
 No match
+    aa
+No match
+    uh-uh
+No match
+
+/multiple words/
+    multiple words, yeah
+ 0: multiple words
+
+/(.*)c(.*)/
+    abcde
+ 0: abcde
+ 1: abcd
+ 2: abc
 
-/\W{2,3}?/8
-    ab====cd
- 0: ===
- 1: ==
-    ab==cd
- 0: ==
+/\((.*), (.*)\)/
+    (a, b)
+ 0: (a, b)
+
+/[k]/
+
+/abcd/
+    abcd
+ 0: abcd
+
+/a(bc)d/
+    abcd
+ 0: abcd
+
+/a[-]?c/
+    ac
+ 0: ac
+
+/abc/i
+    ABC
+ 0: ABC
+    XABCY
+ 0: ABC
+    ABABC
+ 0: ABC
     *** Failers
- 0: ***
- 1: **
-    a.b.c
+No match
+    aaxabxbaxbbx
+No match
+    XBC
+No match
+    AXC
+No match
+    ABX
 No match
 
-/[\x{100}]/8
-    \x{100}
- 0: \x{100}
-    Z\x{100}
- 0: \x{100}
-    \x{100}Z
- 0: \x{100}
-    *** Failers 
+/ab*c/i
+    ABC
+ 0: ABC
+
+/ab*bc/i
+    ABC
+ 0: ABC
+    ABBC
+ 0: ABBC
+
+/ab*?bc/i
+    ABBBBC
+ 0: ABBBBC
+
+/ab{0,}?bc/i
+    ABBBBC
+ 0: ABBBBC
+
+/ab+?bc/i
+    ABBC
+ 0: ABBC
+
+/ab+bc/i
+    *** Failers
+No match
+    ABC
+No match
+    ABQ
 No match
 
-/[Z\x{100}]/8
-    Z\x{100}
- 0: Z
-    \x{100}
- 0: \x{100}
-    \x{100}Z
- 0: \x{100}
-    *** Failers 
+/ab{1,}bc/i
+
+/ab+bc/i
+    ABBBBC
+ 0: ABBBBC
+
+/ab{1,}?bc/i
+    ABBBBC
+ 0: ABBBBC
+
+/ab{1,3}?bc/i
+    ABBBBC
+ 0: ABBBBC
+
+/ab{3,4}?bc/i
+    ABBBBC
+ 0: ABBBBC
+
+/ab{4,5}?bc/i
+    *** Failers
+No match
+    ABQ
+No match
+    ABBBBC
 No match
 
-/[\x{100}\x{200}]/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   *** Failers  
-No match
-
-/[\x{100}-\x{200}]/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{111}cd 
- 0: \x{111}
-   *** Failers  
-No match
-
-/[z-\x{200}]/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{111}cd 
- 0: \x{111}
-   abzcd
- 0: z
-   ab|cd  
- 0: |
-   *** Failers  
-No match
-
-/[Q\x{100}\x{200}]/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   Q? 
- 0: Q
-   *** Failers  
-No match
-
-/[Q\x{100}-\x{200}]/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{111}cd 
- 0: \x{111}
-   Q? 
- 0: Q
-   *** Failers  
-No match
-
-/[Qz-\x{200}]/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{111}cd 
- 0: \x{111}
-   abzcd
- 0: z
-   ab|cd  
- 0: |
-   Q? 
- 0: Q
-   *** Failers  
-No match
-
-/[\x{100}\x{200}]{1,3}/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{200}\x{100}\x{200}\x{100}cd
- 0: \x{200}\x{100}\x{200}
- 1: \x{200}\x{100}
- 2: \x{200}
-   *** Failers  
-No match
-
-/[\x{100}\x{200}]{1,3}?/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{200}\x{100}\x{200}\x{100}cd
- 0: \x{200}\x{100}\x{200}
- 1: \x{200}\x{100}
- 2: \x{200}
-   *** Failers  
-No match
-
-/[Q\x{100}\x{200}]{1,3}/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{200}\x{100}\x{200}\x{100}cd
- 0: \x{200}\x{100}\x{200}
- 1: \x{200}\x{100}
- 2: \x{200}
-   *** Failers  
-No match
-
-/[Q\x{100}\x{200}]{1,3}?/8
-   ab\x{100}cd
- 0: \x{100}
-   ab\x{200}cd
- 0: \x{200}
-   ab\x{200}\x{100}\x{200}\x{100}cd
- 0: \x{200}\x{100}\x{200}
- 1: \x{200}\x{100}
- 2: \x{200}
-   *** Failers  
-No match
-
-/(?<=[\x{100}\x{200}])X/8
-    abc\x{200}X
- 0: X
-    abc\x{100}X 
- 0: X
+/ab??bc/i
+    ABBC
+ 0: ABBC
+    ABC
+ 0: ABC
+
+/ab{0,1}?bc/i
+    ABC
+ 0: ABC
+
+/ab??bc/i
+
+/ab??c/i
+    ABC
+ 0: ABC
+
+/ab{0,1}?c/i
+    ABC
+ 0: ABC
+
+/^abc$/i
+    ABC
+ 0: ABC
     *** Failers
 No match
-    X  
+    ABBBBC
+No match
+    ABCC
 No match
 
-/(?<=[Q\x{100}\x{200}])X/8
-    abc\x{200}X
- 0: X
-    abc\x{100}X 
- 0: X
-    abQX 
- 0: X
+/^abc/i
+    ABCC
+ 0: ABC
+
+/^abc$/i
+
+/abc$/i
+    AABC
+ 0: ABC
+
+/^/i
+    ABC
+ 0: 
+
+/$/i
+    ABC
+ 0: 
+
+/a.c/i
+    ABC
+ 0: ABC
+    AXC
+ 0: AXC
+
+/a.*?c/i
+    AXYZC
+ 0: AXYZC
+
+/a.*c/i
     *** Failers
 No match
-    X  
+    AABC
+ 0: AABC
+    AXYZD
 No match
 
-/(?<=[\x{100}\x{200}]{3})X/8
-    abc\x{100}\x{200}\x{100}X
- 0: X
+/a[bc]d/i
+    ABD
+ 0: ABD
+
+/a[b-d]e/i
+    ACE
+ 0: ACE
     *** Failers
 No match
-    abc\x{200}X
+    ABC
 No match
-    X  
+    ABD
 No match
 
-/[^\x{100}\x{200}]X/8
-    AX
- 0: AX
-    \x{150}X
- 0: \x{150}X
-    \x{500}X 
- 0: \x{500}X
+/a[b-d]/i
+    AAC
+ 0: AC
+
+/a[-b]/i
+    A-
+ 0: A-
+
+/a[b-]/i
+    A-
+ 0: A-
+
+/a]/i
+    A]
+ 0: A]
+
+/a[]]b/i
+    A]B
+ 0: A]B
+
+/a[^bc]d/i
+    AED
+ 0: AED
+
+/a[^-b]c/i
+    ADC
+ 0: ADC
     *** Failers
 No match
-    \x{100}X
+    ABD
 No match
-    \x{200}X   
+    A-C
 No match
 
-/[^Q\x{100}\x{200}]X/8
-    AX
- 0: AX
-    \x{150}X
- 0: \x{150}X
-    \x{500}X 
- 0: \x{500}X
+/a[^]b]c/i
+    ADC
+ 0: ADC
+
+/ab|cd/i
+    ABC
+ 0: AB
+    ABCD
+ 0: AB
+
+/()ef/i
+    DEF
+ 0: EF
+
+/$b/i
     *** Failers
 No match
-    \x{100}X
+    A]C
 No match
-    \x{200}X   
+    B
 No match
-    QX 
+
+/a\(b/i
+    A(B
+ 0: A(B
+
+/a\(*b/i
+    AB
+ 0: AB
+    A((B
+ 0: A((B
+
+/a\\b/i
+    A\B
 No match
 
-/[^\x{100}-\x{200}]X/8
-    AX
- 0: AX
-    \x{500}X 
- 0: \x{500}X
+/((a))/i
+    ABC
+ 0: A
+
+/(a)b(c)/i
+    ABC
+ 0: ABC
+
+/a+b+c/i
+    AABBABC
+ 0: ABC
+
+/a{1,}b{1,}c/i
+    AABBABC
+ 0: ABC
+
+/a.+?c/i
+    ABCABC
+ 0: ABCABC
+ 1: ABC
+
+/a.*?c/i
+    ABCABC
+ 0: ABCABC
+ 1: ABC
+
+/a.{0,5}?c/i
+    ABCABC
+ 0: ABCABC
+ 1: ABC
+
+/(a+|b)*/i
+    AB
+ 0: AB
+ 1: A
+ 2: 
+
+/(a+|b){0,}/i
+    AB
+ 0: AB
+ 1: A
+ 2: 
+
+/(a+|b)+/i
+    AB
+ 0: AB
+ 1: A
+
+/(a+|b){1,}/i
+    AB
+ 0: AB
+ 1: A
+
+/(a+|b)?/i
+    AB
+ 0: A
+ 1: 
+
+/(a+|b){0,1}/i
+    AB
+ 0: A
+ 1: 
+
+/(a+|b){0,1}?/i
+    AB
+ 0: A
+ 1: 
+
+/[^ab]*/i
+    CDE
+ 0: CDE
+ 1: CD
+ 2: C
+ 3: 
+
+/abc/i
+
+/a*/i
+    
+
+/([abc])*d/i
+    ABBBCD
+ 0: ABBBCD
+
+/([abc])*bcd/i
+    ABCD
+ 0: ABCD
+
+/a|b|c|d|e/i
+    E
+ 0: E
+
+/(a|b|c|d|e)f/i
+    EF
+ 0: EF
+
+/abcd*efg/i
+    ABCDEFG
+ 0: ABCDEFG
+
+/ab*/i
+    XABYABBBZ
+ 0: AB
+ 1: A
+    XAYABBBZ
+ 0: A
+
+/(ab|cd)e/i
+    ABCDE
+ 0: CDE
+
+/[abhgefdc]ij/i
+    HIJ
+ 0: HIJ
+
+/^(ab|cd)e/i
+    ABCDE
+No match
+
+/(abc|)ef/i
+    ABCDEF
+ 0: EF
+
+/(a|b)c*d/i
+    ABCD
+ 0: BCD
+
+/(ab|ab*)bc/i
+    ABC
+ 0: ABC
+
+/a([bc]*)c*/i
+    ABC
+ 0: ABC
+ 1: AB
+ 2: A
+
+/a([bc]*)(c*d)/i
+    ABCD
+ 0: ABCD
+
+/a([bc]+)(c*d)/i
+    ABCD
+ 0: ABCD
+
+/a([bc]*)(c+d)/i
+    ABCD
+ 0: ABCD
+
+/a[bcd]*dcdcde/i
+    ADCDCDE
+ 0: ADCDCDE
+
+/a[bcd]+dcdcde/i
+
+/(ab|a)b*c/i
+    ABC
+ 0: ABC
+
+/((a)(b)c)(d)/i
+    ABCD
+ 0: ABCD
+
+/[a-zA-Z_][a-zA-Z0-9_]*/i
+    ALPHA
+ 0: ALPHA
+ 1: ALPH
+ 2: ALP
+ 3: AL
+ 4: A
+
+/^a(bc+|b[eh])g|.h$/i
+    ABH
+ 0: BH
+
+/(bc+d$|ef*g.|h?i(j|k))/i
+    EFFGZ
+ 0: EFFGZ
+    IJ
+ 0: IJ
+    REFFGZ
+ 0: EFFGZ
     *** Failers
 No match
-    \x{100}X
+    ADCDCDE
 No match
-    \x{150}X
+    EFFG
 No match
-    \x{200}X   
+    BCDD
 No match
 
-/[z-\x{100}]/8i
-    z
- 0: z
-    Z 
- 0: Z
-    \x{100}
- 0: \x{100}
+/((((((((((a))))))))))/i
+    A
+ 0: A
+
+/(((((((((a)))))))))/i
+    A
+ 0: A
+
+/(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))/i
+    A
+ 0: A
+
+/(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))/i
+    C
+ 0: C
+
+/multiple words of text/i
     *** Failers
 No match
-    \x{102}
+    AA
 No match
-    y    
+    UH-UH
 No match
 
-/[\xFF]/
-    >\xff<
- 0: \xff
+/multiple words/i
+    MULTIPLE WORDS, YEAH
+ 0: MULTIPLE WORDS
 
-/[\xff]/8
-    >\x{ff}<
- 0: \x{ff}
+/(.*)c(.*)/i
+    ABCDE
+ 0: ABCDE
+ 1: ABCD
+ 2: ABC
 
-/[^\xFF]/
-    XYZ
- 0: X
+/\((.*), (.*)\)/i
+    (A, B)
+ 0: (A, B)
 
-/[^\xff]/8
-    XYZ
- 0: X
-    \x{123} 
- 0: \x{123}
+/[k]/i
+
+/abcd/i
+    ABCD
+ 0: ABCD
+
+/a(bc)d/i
+    ABCD
+ 0: ABCD
+
+/a[-]?c/i
+    AC
+ 0: AC
+
+/a(?!b)./
+    abad
+ 0: ad
+
+/a(?=d)./
+    abad
+ 0: ad
+
+/a(?=c|d)./
+    abad
+ 0: ad
+
+/a(?:b|c|d)(.)/
+    ace
+ 0: ace
+
+/a(?:b|c|d)*(.)/
+    ace
+ 0: ace
+ 1: ac
+
+/a(?:b|c|d)+?(.)/
+    ace
+ 0: ace
+    acdbcdbe
+ 0: acdbcdbe
+ 1: acdbcdb
+ 2: acdbcd
+ 3: acdbc
+ 4: acdb
+ 5: acd
+
+/a(?:b|c|d)+(.)/
+    acdbcdbe
+ 0: acdbcdbe
+ 1: acdbcdb
+ 2: acdbcd
+ 3: acdbc
+ 4: acdb
+ 5: acd
+
+/a(?:b|c|d){2}(.)/
+    acdbcdbe
+ 0: acdb
+
+/a(?:b|c|d){4,5}(.)/
+    acdbcdbe
+ 0: acdbcdb
+ 1: acdbcd
+
+/a(?:b|c|d){4,5}?(.)/
+    acdbcdbe
+ 0: acdbcdb
+ 1: acdbcd
+
+/((foo)|(bar))*/
+    foobar
+ 0: foobar
+ 1: foo
+ 2: 
+
+/a(?:b|c|d){6,7}(.)/
+    acdbcdbe
+ 0: acdbcdbe
+
+/a(?:b|c|d){6,7}?(.)/
+    acdbcdbe
+ 0: acdbcdbe
+
+/a(?:b|c|d){5,6}(.)/
+    acdbcdbe
+ 0: acdbcdbe
+ 1: acdbcdb
+
+/a(?:b|c|d){5,6}?(.)/
+    acdbcdbe
+ 0: acdbcdbe
+ 1: acdbcdb
+
+/a(?:b|c|d){5,7}(.)/
+    acdbcdbe
+ 0: acdbcdbe
+ 1: acdbcdb
+
+/a(?:b|c|d){5,7}?(.)/
+    acdbcdbe
+ 0: acdbcdbe
+ 1: acdbcdb
+
+/a(?:b|(c|e){1,2}?|d)+?(.)/
+    ace
+ 0: ace
+
+/^(.+)?B/
+    AB
+ 0: AB
+
+/^([^a-z])|(\^)$/
+    .
+ 0: .
+
+/^[<>]&/
+    <&OUT
+ 0: <&
+
+/(?:(f)(o)(o)|(b)(a)(r))*/
+    foobar
+ 0: foobar
+ 1: foo
+ 2: 
+
+/(?<=a)b/
+    ab
+ 0: b
+    *** Failers
+No match
+    cb
+No match
+    b
+No match
+
+/(?<!c)b/
+    ab
+ 0: b
+    b
+ 0: b
+    b
+ 0: b
+
+/(?:..)*a/
+    aba
+ 0: aba
+ 1: a
+
+/(?:..)*?a/
+    aba
+ 0: aba
+ 1: a
+
+/^(){3,5}/
+    abc
+ 0: 
+
+/^(a+)*ax/
+    aax
+ 0: aax
+
+/^((a|b)+)*ax/
+    aax
+ 0: aax
+
+/^((a|bc)+)*ax/
+    aax
+ 0: aax
+
+/(a|x)*ab/
+    cab
+ 0: ab
+
+/(a)*ab/
+    cab
+ 0: ab
+
+/(?:(?i)a)b/
+    ab
+ 0: ab
+
+/((?i)a)b/
+    ab
+ 0: ab
+
+/(?:(?i)a)b/
+    Ab
+ 0: Ab
+
+/((?i)a)b/
+    Ab
+ 0: Ab
+
+/(?:(?i)a)b/
+    *** Failers
+No match
+    cb
+No match
+    aB
+No match
+
+/((?i)a)b/
+
+/(?i:a)b/
+    ab
+ 0: ab
+
+/((?i:a))b/
+    ab
+ 0: ab
+
+/(?i:a)b/
+    Ab
+ 0: Ab
+
+/((?i:a))b/
+    Ab
+ 0: Ab
+
+/(?i:a)b/
+    *** Failers
+No match
+    aB
+No match
+    aB
+No match
+
+/((?i:a))b/
+
+/(?:(?-i)a)b/i
+    ab
+ 0: ab
+
+/((?-i)a)b/i
+    ab
+ 0: ab
+
+/(?:(?-i)a)b/i
+    aB
+ 0: aB
+
+/((?-i)a)b/i
+    aB
+ 0: aB
+
+/(?:(?-i)a)b/i
+    *** Failers
+No match
+    aB
+ 0: aB
+    Ab
+No match
+
+/((?-i)a)b/i
+
+/(?:(?-i)a)b/i
+    aB
+ 0: aB
+
+/((?-i)a)b/i
+    aB
+ 0: aB
+
+/(?:(?-i)a)b/i
+    *** Failers
+No match
+    Ab
+No match
+    AB
+No match
+
+/((?-i)a)b/i
+
+/(?-i:a)b/i
+    ab
+ 0: ab
+
+/((?-i:a))b/i
+    ab
+ 0: ab
+
+/(?-i:a)b/i
+    aB
+ 0: aB
+
+/((?-i:a))b/i
+    aB
+ 0: aB
+
+/(?-i:a)b/i
+    *** Failers
+No match
+    AB
+No match
+    Ab
+No match
+
+/((?-i:a))b/i
+
+/(?-i:a)b/i
+    aB
+ 0: aB
+
+/((?-i:a))b/i
+    aB
+ 0: aB
+
+/(?-i:a)b/i
+    *** Failers
+No match
+    Ab
+No match
+    AB
+No match
+
+/((?-i:a))b/i
+
+/((?-i:a.))b/i
+    *** Failers
+No match
+    AB
+No match
+    a\nB
+No match
+
+/((?s-i:a.))b/i
+    a\nB
+ 0: a\x0aB
+
+/(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))/
+    cabbbb
+ 0: cabbbb
+
+/(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))/
+    caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ 0: caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+
+/foo\w*\d{4}baz/
+    foobar1234baz
+ 0: foobar1234baz
+
+/x(~~)*(?:(?:F)?)?/
+    x~~
+ 0: x~~
+ 1: x
 
-/^[ac]*b/8
-  xb
+/^a(?#xxx){3}c/
+    aaac
+ 0: aaac
+
+/^a (?#xxx) (?#yyy) {3}c/x
+    aaac
+ 0: aaac
+
+/(?<![cd])b/
+    *** Failers
+No match
+    B\nB
+No match
+    dbcb
+No match
+
+/(?<![cd])[ab]/
+    dbaacb
+ 0: a
+
+/(?<!(c|d))b/
+
+/(?<!(c|d))[ab]/
+    dbaacb
+ 0: a
+
+/(?<!cd)[ab]/
+    cdaccb
+ 0: b
+
+/^(?:a?b?)*$/
+    *** Failers
+No match
+    dbcb
+No match
+    a--
+No match
+
+/((?s)^a(.))((?m)^b$)/
+    a\nb\nc\n
+ 0: a\x0ab
+
+/((?m)^b$)/
+    a\nb\nc\n
+ 0: b
+
+/(?m)^b/
+    a\nb\n
+ 0: b
+
+/(?m)^(b)/
+    a\nb\n
+ 0: b
+
+/((?m)^b)/
+    a\nb\n
+ 0: b
+
+/\n((?m)^b)/
+    a\nb\n
+ 0: \x0ab
+
+/((?s).)c(?!.)/
+    a\nb\nc\n
+ 0: \x0ac
+    a\nb\nc\n
+ 0: \x0ac
+
+/((?s)b.)c(?!.)/
+    a\nb\nc\n
+ 0: b\x0ac
+    a\nb\nc\n
+ 0: b\x0ac
+
+/^b/
+
+/()^b/
+    *** Failers
+No match
+    a\nb\nc\n
+No match
+    a\nb\nc\n
 No match
 
-/^[ac\x{100}]*b/8
-  xb
+/((?m)^b)/
+    a\nb\nc\n
+ 0: b
+
+/(?(?!a)a|b)/
+
+/(?(?!a)b|a)/
+    a
+ 0: a
+
+/(?(?=a)b|a)/
+    *** Failers
+No match
+    a
+No match
+    a
+No match
+
+/(?(?=a)a|b)/
+    a
+ 0: a
+
+/(\w+:)+/
+    one:
+ 0: one:
+
+/$(?<=^(a))/
+    a
+ 0: 
+
+/([\w:]+::)?(\w+)$/
+    abcd
+ 0: abcd
+    xy:z:::abcd
+ 0: xy:z:::abcd
+
+/^[^bcd]*(c+)/
+    aexycd
+ 0: aexyc
+
+/(a*)b+/
+    caab
+ 0: aab
+
+/([\w:]+::)?(\w+)$/
+    abcd
+ 0: abcd
+    xy:z:::abcd
+ 0: xy:z:::abcd
+    *** Failers
+ 0: Failers
+    abcd:
+No match
+    abcd:
+No match
+
+/^[^bcd]*(c+)/
+    aexycd
+ 0: aexyc
+
+/(>a+)ab/
+
+/(?>a+)b/
+    aaab
+ 0: aaab
+
+/([[:]+)/
+    a:[b]:
+ 0: :[
+ 1: :
+
+/([[=]+)/
+    a=[b]=
+ 0: =[
+ 1: =
+
+/([[.]+)/
+    a.[b].
+ 0: .[
+ 1: .
+
+/((?>a+)b)/
+    aaab
+ 0: aaab
+
+/(?>(a+))b/
+    aaab
+ 0: aaab
+
+/((?>[^()]+)|\([^()]*\))+/
+    ((abc(ade)ufh()()x
+ 0: abc(ade)ufh()()x
+ 1: abc(ade)ufh()()
+ 2: abc(ade)ufh()
+ 3: abc(ade)ufh
+ 4: abc(ade)
+ 5: abc
+
+/a\Z/
+    *** Failers
+No match
+    aaab
+No match
+    a\nb\n
 No match
 
-/^[^x]*b/8i
-  xb
+/b\Z/
+    a\nb\n
+ 0: b
+
+/b\z/
+
+/b\Z/
+    a\nb
+ 0: b
+
+/b\z/
+    a\nb
+ 0: b
+    *** Failers
+No match
+    
+/(?>.*)(?<=(abcd|wxyz))/
+    alphabetabcd
+ 0: alphabetabcd
+    endingwxyz
+ 0: endingwxyz
+    *** Failers
+No match
+    a rather long string that doesn't end with one of them
 No match
 
-/^[^x]*b/8
-  xb
+/word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword/
+    word cat dog elephant mussel cow horse canary baboon snake shark otherword
+ 0: word cat dog elephant mussel cow horse canary baboon snake shark otherword
+    word cat dog elephant mussel cow horse canary baboon snake shark
 No match
   
-/^\d*b/8
-  xb 
+/word (?>[a-zA-Z0-9]+ ){0,30}otherword/
+    word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope
 No match
 
-/(|a)/g8
-    catac
+/(?<=\d{3}(?!999))foo/
+    999foo
+ 0: foo
+    123999foo 
+ 0: foo
+    *** Failers
+No match
+    123abcfoo
+No match
+    
+/(?<=(?!...999)\d{3})foo/
+    999foo
+ 0: foo
+    123999foo 
+ 0: foo
+    *** Failers
+No match
+    123abcfoo
+No match
+
+/(?<=\d{3}(?!999)...)foo/
+    123abcfoo
+ 0: foo
+    123456foo 
+ 0: foo
+    *** Failers
+No match
+    123999foo  
+No match
+    
+/(?<=\d{3}...)(?<!999)foo/
+    123abcfoo   
+ 0: foo
+    123456foo 
+ 0: foo
+    *** Failers
+No match
+    123999foo  
+No match
+
+/((Z)+|A)*/
+    ZABCDEFG
+ 0: ZA
+ 1: Z
+ 2: 
+
+/(Z()|A)*/
+    ZABCDEFG
+ 0: ZA
+ 1: Z
+ 2: 
+
+/(Z(())|A)*/
+    ZABCDEFG
+ 0: ZA
+ 1: Z
+ 2: 
+
+/((?>Z)+|A)*/
+    ZABCDEFG
+ 0: ZA
+ 1: Z
+ 2: 
+
+/((?>)+|A)*/
+    ZABCDEFG
  0: 
+
+/a*/g
+    abbab
  0: a
  1: 
  0: 
+ 0: 
  0: a
  1: 
  0: 
  0: 
-    a\x{256}a 
+
+/^[a-\d]/
+    abcde
  0: a
- 1: 
- 0: 
+    -things
+ 0: -
+    0digit
+ 0: 0
+    *** Failers
+No match
+    bcdef    
+No match
+
+/^[\d-a]/
+    abcde
  0: a
- 1: 
+    -things
+ 0: -
+    0digit
+ 0: 0
+    *** Failers
+No match
+    bcdef    
+No match
+    
+/[[:space:]]+/
+    > \x09\x0a\x0c\x0d\x0b<
+ 0:  \x09\x0a\x0c\x0d\x0b
+ 1:  \x09\x0a\x0c\x0d
+ 2:  \x09\x0a\x0c
+ 3:  \x09\x0a
+ 4:  \x09
+ 5:  
+     
+/[[:blank:]]+/
+    > \x09\x0a\x0c\x0d\x0b<
+ 0:  \x09
+ 1:  
+     
+/[\s]+/
+    > \x09\x0a\x0c\x0d\x0b<
+ 0:  \x09\x0a\x0c\x0d
+ 1:  \x09\x0a\x0c
+ 2:  \x09\x0a
+ 3:  \x09
+ 4:  
+     
+/\s+/
+    > \x09\x0a\x0c\x0d\x0b<
+ 0:  \x09\x0a\x0c\x0d
+ 1:  \x09\x0a\x0c
+ 2:  \x09\x0a
+ 3:  \x09
+ 4:  
+     
+/ab/x
+    ab
+No match
+
+/(?!\A)x/m
+  a\nxb\n
+ 0: x
+
+/(?!^)x/m
+  a\nxb\n
+No match
+
+/abc\Qabc\Eabc/
+    abcabcabc
+ 0: abcabcabc
+    
+/abc\Q(*+|\Eabc/
+    abc(*+|abc 
+ 0: abc(*+|abc
+
+/   abc\Q abc\Eabc/x
+    abc abcabc
+ 0: abc abcabc
+    *** Failers
+No match
+    abcabcabc  
+No match
+    
+/abc#comment
+    \Q#not comment
+    literal\E/x
+    abc#not comment\n    literal     
+ 0: abc#not comment\x0a    literal
+
+/abc#comment
+    \Q#not comment
+    literal/x
+    abc#not comment\n    literal     
+ 0: abc#not comment\x0a    literal
+
+/abc#comment
+    \Q#not comment
+    literal\E #more comment
+    /x
+    abc#not comment\n    literal     
+ 0: abc#not comment\x0a    literal
+
+/abc#comment
+    \Q#not comment
+    literal\E #more comment/x
+    abc#not comment\n    literal     
+ 0: abc#not comment\x0a    literal
+
+/\Qabc\$xyz\E/
+    abc\\\$xyz
+ 0: abc\$xyz
+
+/\Qabc\E\$\Qxyz\E/
+    abc\$xyz
+ 0: abc$xyz
+
+/\Gabc/
+    abc
+ 0: abc
+    *** Failers
+No match
+    xyzabc  
+No match
+
+/\Gabc./g
+    abc1abc2xyzabc3
+ 0: abc1
+ 0: abc2
+
+/abc./g
+    abc1abc2xyzabc3 
+ 0: abc1
+ 0: abc2
+ 0: abc3
+
+/a(?x: b c )d/
+    XabcdY
+ 0: abcd
+    *** Failers 
+No match
+    Xa b c d Y 
+No match
+
+/((?x)x y z | a b c)/
+    XabcY
+ 0: abc
+    AxyzB 
+ 0: xyz
+
+/(?i)AB(?-i)C/
+    XabCY
+ 0: abC
+    *** Failers
+No match
+    XabcY  
+No match
+
+/((?i)AB(?-i)C|D)E/
+    abCE
+ 0: abCE
+    DE
+ 0: DE
+    *** Failers
+No match
+    abcE
+No match
+    abCe  
+No match
+    dE
+No match
+    De    
+No match
+
+/[z\Qa-d]\E]/
+    z
+ 0: z
+    a
+ 0: a
+    -
+ 0: -
+    d
+ 0: d
+    ] 
+ 0: ]
+    *** Failers
+ 0: a
+    b     
+No match
+
+/[\z\C]/
+    z
+ 0: z
+    C 
+ 0: C
+    
+/\M/
+    M 
+ 0: M
+    
+/(a+)*b/
+    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
+No match
+    
+/(?i)reg(?:ul(?:[a�]|ae)r|ex)/
+    REGular
+ 0: REGular
+    regulaer
+ 0: regulaer
+    Regex  
+ 0: Regex
+    regul�r 
+ 0: regul\xe4r
+
+/����[�-��-�]+/
+    �����
+ 0: \xc5\xe6\xe5\xe4\xe0
+    �����
+ 0: \xc5\xe6\xe5\xe4\xff
+    �����
+ 0: \xc5\xe6\xe5\xe4\xc0
+    �����
+ 0: \xc5\xe6\xe5\xe4\xdf
+
+/(?<=Z)X./
+    \x84XAZXB
+ 0: XB
+
+/^(?(2)a|(1)(2))+$/
+    123a
+Error -17 (backreference condition or recursion test not supported for DFA matching)
+
+/(?<=a|bbbb)c/
+    ac
+ 0: c
+    bbbbc
+ 0: c
+
+/abc/SS>testsavedregex
+Compiled pattern written to testsavedregex
+<testsavedregex
+Compiled pattern loaded from testsavedregex
+No study data
+    abc
+ 0: abc
+    *** Failers
+No match
+    bca
+No match
+    
+/abc/FSS>testsavedregex
+Compiled pattern written to testsavedregex
+<testsavedregex
+Compiled pattern (byte-inverted) loaded from testsavedregex
+No study data
+    abc
+ 0: abc
+    *** Failers
+No match
+    bca
+No match
+
+/(a|b)/S>testsavedregex
+Compiled pattern written to testsavedregex
+Study data written to testsavedregex
+<testsavedregex
+Compiled pattern loaded from testsavedregex
+Study data loaded from testsavedregex
+    abc
+ 0: a
+    *** Failers
+ 0: a
+    def  
+No match
+    
+/(a|b)/SF>testsavedregex
+Compiled pattern written to testsavedregex
+Study data written to testsavedregex
+<testsavedregex
+Compiled pattern (byte-inverted) loaded from testsavedregex
+Study data loaded from testsavedregex
+    abc
+ 0: a
+    *** Failers
+ 0: a
+    def  
+No match
+    
+/line\nbreak/
+    this is a line\nbreak
+ 0: line\x0abreak
+    line one\nthis is a line\nbreak in the second line 
+ 0: line\x0abreak
+
+/line\nbreak/f
+    this is a line\nbreak
+ 0: line\x0abreak
+    ** Failers 
+No match
+    line one\nthis is a line\nbreak in the second line 
+No match
+
+/line\nbreak/mf
+    this is a line\nbreak
+ 0: line\x0abreak
+    ** Failers 
+No match
+    line one\nthis is a line\nbreak in the second line 
+No match
+
+/1234/
+    123\P
+Partial match: 123
+    a4\P\R
+No match
+
+/1234/
+    123\P
+Partial match: 123
+    4\P\R
+ 0: 4
+
+/^/mg
+    a\nb\nc\n
+ 0: 
+ 0: 
  0: 
+    \ 
+ 0: 
+    
+/(?<=C\n)^/mg
+    A\nC\nC\n 
+ 0: 
+
+/(?s)A?B/
+    AB
+ 0: AB
+    aB  
+ 0: B
+
+/(?s)A*B/
+    AB
+ 0: AB
+    aB  
+ 0: B
+
+/(?m)A?B/
+    AB
+ 0: AB
+    aB  
+ 0: B
+
+/(?m)A*B/
+    AB
+ 0: AB
+    aB  
+ 0: B
+
+/Content-Type\x3A[^\r\n]{6,}/
+    Content-Type:xxxxxyyy 
+ 0: Content-Type:xxxxxyyy
+ 1: Content-Type:xxxxxyy
+ 2: Content-Type:xxxxxy
+
+/Content-Type\x3A[^\r\n]{6,}z/
+    Content-Type:xxxxxyyyz
+ 0: Content-Type:xxxxxyyyz
+
+/Content-Type\x3A[^a]{6,}/
+    Content-Type:xxxyyy 
+ 0: Content-Type:xxxyyy
+
+/Content-Type\x3A[^a]{6,}z/
+    Content-Type:xxxyyyz
+ 0: Content-Type:xxxyyyz
+
+/^abc/m
+    xyz\nabc
+ 0: abc
+    xyz\nabc\<lf>
+ 0: abc
+    xyz\r\nabc\<lf>
+ 0: abc
+    xyz\rabc\<cr>
+ 0: abc
+    xyz\r\nabc\<crlf>
+ 0: abc
+    ** Failers 
+No match
+    xyz\nabc\<cr>
+No match
+    xyz\r\nabc\<cr>
+No match
+    xyz\nabc\<crlf>
+No match
+    xyz\rabc\<crlf>
+No match
+    xyz\rabc\<lf>
+No match
+    
+/abc$/m<lf>
+    xyzabc
+ 0: abc
+    xyzabc\n 
+ 0: abc
+    xyzabc\npqr 
+ 0: abc
+    xyzabc\r\<cr> 
+ 0: abc
+    xyzabc\rpqr\<cr> 
+ 0: abc
+    xyzabc\r\n\<crlf> 
+ 0: abc
+    xyzabc\r\npqr\<crlf> 
+ 0: abc
+    ** Failers
+No match
+    xyzabc\r 
+No match
+    xyzabc\rpqr 
+No match
+    xyzabc\r\n 
+No match
+    xyzabc\r\npqr 
+No match
+    
+/^abc/m<cr>
+    xyz\rabcdef
+ 0: abc
+    xyz\nabcdef\<lf>
+ 0: abc
+    ** Failers  
+No match
+    xyz\nabcdef
+No match
+       
+/^abc/m<lf>
+    xyz\nabcdef
+ 0: abc
+    xyz\rabcdef\<cr>
+ 0: abc
+    ** Failers  
+No match
+    xyz\rabcdef
+No match
+       
+/^abc/m<crlf>
+    xyz\r\nabcdef
+ 0: abc
+    xyz\rabcdef\<cr>
+ 0: abc
+    ** Failers  
+No match
+    xyz\rabcdef
+No match
+    
+/.*/<lf>
+    abc\ndef
+ 0: abc
+ 1: ab
+ 2: a
+ 3: 
+    abc\rdef
+ 0: abc\x0ddef
+ 1: abc\x0dde
+ 2: abc\x0dd
+ 3: abc\x0d
+ 4: abc
+ 5: ab
+ 6: a
+ 7: 
+    abc\r\ndef
+ 0: abc\x0d
+ 1: abc
+ 2: ab
+ 3: a
+ 4: 
+    \<cr>abc\ndef
+ 0: abc\x0adef
+ 1: abc\x0ade
+ 2: abc\x0ad
+ 3: abc\x0a
+ 4: abc
+ 5: ab
+ 6: a
+ 7: 
+    \<cr>abc\rdef
+ 0: abc
+ 1: ab
+ 2: a
+ 3: 
+    \<cr>abc\r\ndef
+ 0: abc
+ 1: ab
+ 2: a
+ 3: 
+    \<crlf>abc\ndef
+ 0: abc\x0adef
+ 1: abc\x0ade
+ 2: abc\x0ad
+ 3: abc\x0a
+ 4: abc
+ 5: ab
+ 6: a
+ 7: 
+    \<crlf>abc\rdef
+ 0: abc\x0ddef
+ 1: abc\x0dde
+ 2: abc\x0dd
+ 3: abc\x0d
+ 4: abc
+ 5: ab
+ 6: a
+ 7: 
+    \<crlf>abc\r\ndef
+ 0: abc
+ 1: ab
+ 2: a
+ 3: 
+
+/\w+(.)(.)?def/s
+    abc\ndef
+ 0: abc\x0adef
+    abc\rdef
+ 0: abc\x0ddef
+    abc\r\ndef
+ 0: abc\x0d\x0adef
 
-/^\x{85}$/8i
-    \x{85}
- 0: \x{85}
+/^\w+=.*(\\\n.*)*/
+    abc=xyz\\\npqr
+ 0: abc=xyz\\x0apqr
+ 1: abc=xyz\\x0apq
+ 2: abc=xyz\\x0ap
+ 3: abc=xyz\\x0a
+ 4: abc=xyz\
+ 5: abc=xyz
+ 6: abc=xy
+ 7: abc=x
+ 8: abc=
+
+/^(a()*)*/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+ 4: 
+
+/^(?:a(?:(?:))*)*/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+ 4: 
+
+/^(a()+)+/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+
+/^(?:a(?:(?:))+)+/
+    aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+
+/(a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/(?>a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
 
-/^abc./mgx8<any>
-    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
+/(?:a|)*\d/
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+No match
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4
+
+/^a.b/<lf>
+    a\rb
+ 0: a\x0db
+    a\nb\<cr> 
+ 0: a\x0ab
+    ** Failers
+No match
+    a\nb
+No match
+    a\nb\<any>
+No match
+    a\rb\<cr>   
+No match
+    a\rb\<any>   
+No match
+
+/^abc./mgx<any>
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x85abc7 JUNK
  0: abc1
  0: abc2
  0: abc3
@@ -1037,100 +6815,92 @@ No match
  0: abc5
  0: abc6
  0: abc7
- 0: abc8
- 0: abc9
 
-/abc.$/mgx8<any>
-    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x{0085} abc7\x{2028} abc8\x{2029} abc9
+/abc.$/mgx<any>
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x85 abc9
  0: abc1
  0: abc2
  0: abc3
  0: abc4
  0: abc5
  0: abc6
- 0: abc7
- 0: abc8
  0: abc9
 
-/^a\Rb/8<bsr_unicode>
+/^a\Rb/<bsr_unicode>
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\rb
- 0: a\x{0d}b
+ 0: a\x0db
     a\r\nb
- 0: a\x{0d}\x{0a}b
+ 0: a\x0d\x0ab
     a\x0bb
- 0: a\x{0b}b
+ 0: a\x0bb
     a\x0cb
- 0: a\x{0c}b
-    a\x{85}b   
- 0: a\x{85}b
-    a\x{2028}b 
- 0: a\x{2028}b
-    a\x{2029}b 
- 0: a\x{2029}b
+ 0: a\x0cb
+    a\x85b   
+ 0: a\x85b
     ** Failers
 No match
     a\n\rb    
 No match
 
-/^a\R*b/8<bsr_unicode>
+/^a\R*b/<bsr_unicode>
     ab
  0: ab
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\rb
- 0: a\x{0d}b
+ 0: a\x0db
     a\r\nb
- 0: a\x{0d}\x{0a}b
+ 0: a\x0d\x0ab
     a\x0bb
- 0: a\x{0b}b
-    a\x0c\x{2028}\x{2029}b
- 0: a\x{0c}\x{2028}\x{2029}b
-    a\x{85}b   
- 0: a\x{85}b
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b   
+ 0: a\x85b
     a\n\rb    
- 0: a\x{0a}\x{0d}b
-    a\n\r\x{85}\x0cb 
- 0: a\x{0a}\x{0d}\x{85}\x{0c}b
+ 0: a\x0a\x0db
+    a\n\r\x85\x0cb 
+ 0: a\x0a\x0d\x85\x0cb
 
-/^a\R+b/8<bsr_unicode>
+/^a\R+b/<bsr_unicode>
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\rb
- 0: a\x{0d}b
+ 0: a\x0db
     a\r\nb
- 0: a\x{0d}\x{0a}b
+ 0: a\x0d\x0ab
     a\x0bb
- 0: a\x{0b}b
-    a\x0c\x{2028}\x{2029}b
- 0: a\x{0c}\x{2028}\x{2029}b
-    a\x{85}b   
- 0: a\x{85}b
+ 0: a\x0bb
+    a\x0cb
+ 0: a\x0cb
+    a\x85b   
+ 0: a\x85b
     a\n\rb    
- 0: a\x{0a}\x{0d}b
-    a\n\r\x{85}\x0cb 
- 0: a\x{0a}\x{0d}\x{85}\x{0c}b
+ 0: a\x0a\x0db
+    a\n\r\x85\x0cb 
+ 0: a\x0a\x0d\x85\x0cb
     ** Failers
 No match
     ab  
 No match
-
-/^a\R{1,3}b/8<bsr_unicode>
+    
+/^a\R{1,3}b/<bsr_unicode>
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\n\rb
- 0: a\x{0a}\x{0d}b
-    a\n\r\x{85}b
- 0: a\x{0a}\x{0d}\x{85}b
+ 0: a\x0a\x0db
+    a\n\r\x85b
+ 0: a\x0a\x0d\x85b
     a\r\n\r\nb 
- 0: a\x{0d}\x{0a}\x{0d}\x{0a}b
+ 0: a\x0d\x0a\x0d\x0ab
     a\r\n\r\n\r\nb 
- 0: a\x{0d}\x{0a}\x{0d}\x{0a}\x{0d}\x{0a}b
+ 0: a\x0d\x0a\x0d\x0a\x0d\x0ab
     a\n\r\n\rb
- 0: a\x{0a}\x{0d}\x{0a}\x{0d}b
+ 0: a\x0a\x0d\x0a\x0db
     a\n\n\r\nb 
- 0: a\x{0a}\x{0a}\x{0d}\x{0a}b
+ 0: a\x0a\x0a\x0d\x0ab
     ** Failers
 No match
     a\n\n\n\rb
@@ -1138,150 +6908,1116 @@ No match
     a\r
 No match
 
-/\h+\V?\v{3,4}/8 
-    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
- 0: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}\x{0d}
- 1: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}
+/^a[\R]b/<bsr_unicode>
+    aRb
+ 0: aRb
+    ** Failers
+No match
+    a\nb  
+No match
 
-/\V?\v{3,4}/8 
-    \x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
- 0: X\x{0a}\x{0b}\x{0c}\x{0d}
- 1: X\x{0a}\x{0b}\x{0c}
+/.+foo/
+    afoo
+ 0: afoo
+    ** Failers 
+No match
+    \r\nfoo 
+No match
+    \nfoo 
+No match
 
-/\h+\V?\v{3,4}/8
-    >\x09\x20\x{a0}X\x0a\x0a\x0a<
- 0: \x{09} \x{a0}X\x{0a}\x{0a}\x{0a}
+/.+foo/<crlf>
+    afoo
+ 0: afoo
+    \nfoo 
+ 0: \x0afoo
+    ** Failers 
+No match
+    \r\nfoo 
+No match
+
+/.+foo/<any>
+    afoo
+ 0: afoo
+    ** Failers 
+No match
+    \nfoo 
+No match
+    \r\nfoo 
+No match
 
-/\V?\v{3,4}/8
-    >\x09\x20\x{a0}X\x0a\x0a\x0a<
- 0: X\x{0a}\x{0a}\x{0a}
+/.+foo/s
+    afoo
+ 0: afoo
+    \r\nfoo 
+ 0: \x0d\x0afoo
+    \nfoo 
+ 0: \x0afoo
 
-/\H\h\V\v/8
+/^$/mg<any>
+    abc\r\rxyz
+ 0: 
+    abc\n\rxyz  
+ 0: 
+    ** Failers 
+No match
+    abc\r\nxyz
+No match
+
+/^X/m
+    XABC
+ 0: X
+    ** Failers 
+No match
+    XABC\B
+No match
+
+/(?m)^$/<any>g+
+    abc\r\n\r\n
+ 0: 
+ 0+ \x0d\x0a
+
+/(?m)^$|^\r\n/<any>g+ 
+    abc\r\n\r\n
+ 0: \x0d\x0a
+ 0+ 
+ 1: 
+    
+/(?m)$/<any>g+ 
+    abc\r\n\r\n
+ 0: 
+ 0+ \x0d\x0a\x0d\x0a
+ 0: 
+ 0+ \x0d\x0a
+ 0: 
+ 0+ 
+
+/(?|(abc)|(xyz))/
+   >abc<
+ 0: abc
+   >xyz< 
+ 0: xyz
+
+/(x)(?|(abc)|(xyz))(x)/
+    xabcx
+ 0: xabcx
+    xxyzx 
+ 0: xxyzx
+
+/(x)(?|(abc)(pqr)|(xyz))(x)/
+    xabcpqrx
+ 0: xabcpqrx
+    xxyzx 
+ 0: xxyzx
+
+/(?|(abc)|(xyz))(?1)/
+    abcabc
+ 0: abcabc
+    xyzabc 
+ 0: xyzabc
+    ** Failers 
+No match
+    xyzxyz 
+No match
+ 
+/\H\h\V\v/
     X X\x0a
- 0: X X\x{0a}
+ 0: X X\x0a
     X\x09X\x0b
- 0: X\x{09}X\x{0b}
+ 0: X\x09X\x0b
     ** Failers
 No match
-    \x{a0} X\x0a   
+    \xa0 X\x0a   
 No match
     
-/\H*\h+\V?\v{3,4}/8 
-    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
- 0: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}\x{0d}
- 1: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}
-    \x09\x20\x{a0}\x0a\x0b\x0c\x0d\x0a
- 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}\x{0d}
- 1: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}
-    \x09\x20\x{a0}\x0a\x0b\x0c
- 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}
+/\H*\h+\V?\v{3,4}/ 
+    \x09\x20\xa0X\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0X\x0a\x0b\x0c\x0d
+ 1: \x09 \xa0X\x0a\x0b\x0c
+    \x09\x20\xa0\x0a\x0b\x0c\x0d\x0a
+ 0: \x09 \xa0\x0a\x0b\x0c\x0d
+ 1: \x09 \xa0\x0a\x0b\x0c
+    \x09\x20\xa0\x0a\x0b\x0c
+ 0: \x09 \xa0\x0a\x0b\x0c
     ** Failers 
 No match
-    \x09\x20\x{a0}\x0a\x0b
+    \x09\x20\xa0\x0a\x0b
 No match
      
-/\H\h\V\v/8
-    \x{3001}\x{3000}\x{2030}\x{2028}
- 0: \x{3001}\x{3000}\x{2030}\x{2028}
-    X\x{180e}X\x{85}
- 0: X\x{180e}X\x{85}
+/\H{3,4}/
+    XY  ABCDE
+ 0: ABCD
+ 1: ABC
+    XY  PQR ST 
+ 0: PQR
+    
+/.\h{3,4}./
+    XY  AB    PQRS
+ 0: B    P
+ 1: B    
+
+/\h*X\h?\H+Y\H?Z/
+    >XNNNYZ
+ 0: XNNNYZ
+    >  X NYQZ
+ 0:   X NYQZ
     ** Failers
 No match
-    \x{2009} X\x0a   
+    >XYZ   
 No match
-    
-/\H*\h+\V?\v{3,4}/8 
-    \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x0c\x0d\x0a
- 0: \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x{0c}\x{0d}
- 1: \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x{0c}
-    \x09\x{205f}\x{a0}\x0a\x{2029}\x0c\x{2028}\x0a
- 0: \x{09}\x{205f}\x{a0}\x{0a}\x{2029}\x{0c}\x{2028}
- 1: \x{09}\x{205f}\x{a0}\x{0a}\x{2029}\x{0c}
-    \x09\x20\x{202f}\x0a\x0b\x0c
- 0: \x{09} \x{202f}\x{0a}\x{0b}\x{0c}
-    ** Failers 
+    >  X NY Z
 No match
-    \x09\x{200a}\x{a0}\x{2028}\x0b
+
+/\v*X\v?Y\v+Z\V*\x0a\V+\x0b\V{2,3}\x0c/
+    >XY\x0aZ\x0aA\x0bNN\x0c
+ 0: XY\x0aZ\x0aA\x0bNN\x0c
+    >\x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+ 0: \x0a\x0dX\x0aY\x0a\x0bZZZ\x0aAAA\x0bNNN\x0c
+
+/.+A/<crlf>
+    \r\nA
 No match
-     
-/a\Rb/I8<bsr_anycrlf>
+    
+/\nA/<crlf>
+    \r\nA 
+ 0: \x0aA
+
+/[\r\n]A/<crlf>
+    \r\nA 
+ 0: \x0aA
+
+/(\r|\n)A/<crlf>
+    \r\nA 
+ 0: \x0aA
+
+/a\Rb/I<bsr_anycrlf>
 Capturing subpattern count = 0
-Options: bsr_anycrlf utf8
+Options: bsr_anycrlf
 First char = 'a'
 Need char = 'b'
     a\rb
- 0: a\x{0d}b
+ 0: a\x0db
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\r\nb
- 0: a\x{0d}\x{0a}b
+ 0: a\x0d\x0ab
     ** Failers
 No match
-    a\x{85}b
+    a\x85b
 No match
     a\x0bb     
 No match
 
-/a\Rb/I8<bsr_unicode>
+/a\Rb/I<bsr_unicode>
 Capturing subpattern count = 0
-Options: bsr_unicode utf8
+Options: bsr_unicode
 First char = 'a'
 Need char = 'b'
     a\rb
- 0: a\x{0d}b
+ 0: a\x0db
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\r\nb
- 0: a\x{0d}\x{0a}b
-    a\x{85}b
- 0: a\x{85}b
+ 0: a\x0d\x0ab
+    a\x85b
+ 0: a\x85b
     a\x0bb     
- 0: a\x{0b}b
+ 0: a\x0bb
     ** Failers 
 No match
-    a\x{85}b\<bsr_anycrlf>
+    a\x85b\<bsr_anycrlf>
 No match
     a\x0bb\<bsr_anycrlf>
 No match
     
-/a\R?b/I8<bsr_anycrlf>
+/a\R?b/I<bsr_anycrlf>
 Capturing subpattern count = 0
-Options: bsr_anycrlf utf8
+Options: bsr_anycrlf
 First char = 'a'
 Need char = 'b'
     a\rb
- 0: a\x{0d}b
+ 0: a\x0db
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\r\nb
- 0: a\x{0d}\x{0a}b
+ 0: a\x0d\x0ab
     ** Failers
 No match
-    a\x{85}b
+    a\x85b
 No match
     a\x0bb     
 No match
 
-/a\R?b/I8<bsr_unicode>
+/a\R?b/I<bsr_unicode>
 Capturing subpattern count = 0
-Options: bsr_unicode utf8
+Options: bsr_unicode
 First char = 'a'
 Need char = 'b'
     a\rb
- 0: a\x{0d}b
+ 0: a\x0db
     a\nb
- 0: a\x{0a}b
+ 0: a\x0ab
     a\r\nb
- 0: a\x{0d}\x{0a}b
-    a\x{85}b
- 0: a\x{85}b
+ 0: a\x0d\x0ab
+    a\x85b
+ 0: a\x85b
     a\x0bb     
- 0: a\x{0b}b
+ 0: a\x0bb
     ** Failers 
 No match
-    a\x{85}b\<bsr_anycrlf>
+    a\x85b\<bsr_anycrlf>
 No match
     a\x0bb\<bsr_anycrlf>
 No match
+    
+/a\R{2,4}b/I<bsr_anycrlf>
+Capturing subpattern count = 0
+Options: bsr_anycrlf
+First char = 'a'
+Need char = 'b'
+    a\r\n\nb
+ 0: a\x0d\x0a\x0ab
+    a\n\r\rb
+ 0: a\x0a\x0d\x0db
+    a\r\n\r\n\r\n\r\nb
+ 0: a\x0d\x0a\x0d\x0a\x0d\x0a\x0d\x0ab
+    ** Failers
+No match
+    a\x85\85b
+No match
+    a\x0b\0bb     
+No match
+
+/a\R{2,4}b/I<bsr_unicode>
+Capturing subpattern count = 0
+Options: bsr_unicode
+First char = 'a'
+Need char = 'b'
+    a\r\rb
+ 0: a\x0d\x0db
+    a\n\n\nb
+ 0: a\x0a\x0a\x0ab
+    a\r\n\n\r\rb
+ 0: a\x0d\x0a\x0a\x0d\x0db
+    a\x85\85b
+No match
+    a\x0b\0bb     
+No match
+    ** Failers 
+No match
+    a\r\r\r\r\rb 
+No match
+    a\x85\85b\<bsr_anycrlf>
+No match
+    a\x0b\0bb\<bsr_anycrlf>
+No match
+    
+/a(?!)|\wbc/
+    abc 
+ 0: abc
+
+/a[]b/<JS>
+    ** Failers
+No match
+    ab
+No match
+
+/a[]+b/<JS>
+    ** Failers
+No match
+    ab 
+No match
+
+/a[]*+b/<JS>
+    ** Failers
+No match
+    ab 
+No match
+
+/a[^]b/<JS>
+    aXb
+ 0: aXb
+    a\nb 
+ 0: a\x0ab
+    ** Failers
+No match
+    ab  
+No match
+    
+/a[^]+b/<JS> 
+    aXb
+ 0: aXb
+    a\nX\nXb 
+ 0: a\x0aX\x0aXb
+    ** Failers
+No match
+    ab  
+No match
+
+/X$/E
+    X
+ 0: X
+    ** Failers 
+No match
+    X\n 
+No match
+
+/X$/
+    X
+ 0: X
+    X\n 
+ 0: X
+
+/xyz/C
+  xyz 
+--->xyz
+ +0 ^       x
+ +1 ^^      y
+ +2 ^ ^     z
+ +3 ^  ^    
+ 0: xyz
+  abcxyz 
+--->abcxyz
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  abcxyz\Y
+--->abcxyz
+ +0 ^          x
+ +0  ^         x
+ +0   ^        x
+ +0    ^       x
+ +1    ^^      y
+ +2    ^ ^     z
+ +3    ^  ^    
+ 0: xyz
+  ** Failers 
+No match
+  abc
+No match
+  abc\Y
+--->abc
+ +0 ^       x
+ +0  ^      x
+ +0   ^     x
+ +0    ^    x
+No match
+  abcxypqr  
+No match
+  abcxypqr\Y  
+--->abcxypqr
+ +0 ^            x
+ +0  ^           x
+ +0   ^          x
+ +0    ^         x
+ +1    ^^        y
+ +2    ^ ^       z
+ +0     ^        x
+ +0      ^       x
+ +0       ^      x
+ +0        ^     x
+ +0         ^    x
+No match
+
+/(*NO_START_OPT)xyz/C
+  abcxyz 
+--->abcxyz
++15 ^          x
++15  ^         x
++15   ^        x
++15    ^       x
++16    ^^      y
++17    ^ ^     z
++18    ^  ^    
+ 0: xyz
+  
+/(?C)ab/
+  ab
+--->ab
+  0 ^      a
+ 0: ab
+  \C-ab
+ 0: ab
+  
+/ab/C
+  ab
+--->ab
+ +0 ^      a
+ +1 ^^     b
+ +2 ^ ^    
+ 0: ab
+  \C-ab    
+ 0: ab
+
+/^"((?(?=[a])[^"])|b)*"$/C
+    "ab"
+--->"ab"
+ +0 ^        ^
+ +1 ^        "
+ +2 ^^       ((?(?=[a])[^"])|b)*
++21 ^^       "
+ +3 ^^       (?(?=[a])[^"])
++18 ^^       b
+ +5 ^^       (?=[a])
+ +8  ^       [a]
++11  ^^      )
++12 ^^       [^"]
++16 ^ ^      )
++17 ^ ^      |
++21 ^ ^      "
+ +3 ^ ^      (?(?=[a])[^"])
++18 ^ ^      b
+ +5 ^ ^      (?=[a])
+ +8   ^      [a]
++19 ^  ^     )
++21 ^  ^     "
+ +3 ^  ^     (?(?=[a])[^"])
++18 ^  ^     b
+ +5 ^  ^     (?=[a])
+ +8    ^     [a]
++17 ^  ^     |
++22 ^   ^    $
++23 ^   ^    
+ 0: "ab"
+    \C-"ab"
+ 0: "ab"
+
+/\d+X|9+Y/
+    ++++123999\P
+Partial match: 123999
+    ++++123999Y\P
+ 0: 999Y
+
+/Z(*F)/
+    Z\P
+No match
+    ZA\P 
+No match
+    
+/Z(?!)/
+    Z\P 
+No match
+    ZA\P 
+No match
+
+/dog(sbody)?/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+Partial match: dogs
+    
+/dog(sbody)??/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+Partial match: dogs
+
+/dog|dogsbody/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+Partial match: dogs
  
-/ End of testinput 8 / 
+/dogsbody|dog/
+    dogs\P
+ 0: dog
+    dogs\P\P 
+Partial match: dogs
+
+/Z(*F)Q|ZXY/
+    Z\P
+Partial match: Z
+    ZA\P 
+No match
+    X\P 
+No match
+
+/\bthe cat\b/
+    the cat\P
+ 0: the cat
+    the cat\P\P
+Partial match: the cat
+
+/dog(sbody)?/
+    dogs\D\P
+ 0: dog
+    body\D\R
+ 0: body
+
+/dog(sbody)?/
+    dogs\D\P\P
+Partial match: dogs
+    body\D\R
+ 0: body
+
+/abc/
+   abc\P
+ 0: abc
+   abc\P\P
+ 0: abc
+
+/abc\K123/
+    xyzabc123pqr
+Error -16 (item unsupported for DFA matching)
+    
+/(?<=abc)123/
+    xyzabc123pqr 
+ 0: 123
+    xyzabc12\P
+Partial match at offset 6: abc12
+    xyzabc12\P\P
+Partial match at offset 6: abc12
+
+/\babc\b/
+    +++abc+++
+ 0: abc
+    +++ab\P
+Partial match at offset 3: +ab
+    +++ab\P\P  
+Partial match at offset 3: +ab
+
+/(?=C)/g+
+    ABCDECBA
+ 0: 
+ 0+ CDECBA
+ 0: 
+ 0+ CBA
+
+/(abc|def|xyz)/I
+Capturing subpattern count = 1
+No options
+No first char
+No need char
+    terhjk;abcdaadsfe
+ 0: abc
+    the quick xyz brown fox 
+ 0: xyz
+    \Yterhjk;abcdaadsfe
+ 0: abc
+    \Ythe quick xyz brown fox 
+ 0: xyz
+    ** Failers
+No match
+    thejk;adlfj aenjl;fda asdfasd ehj;kjxyasiupd
+No match
+    \Ythejk;adlfj aenjl;fda asdfasd ehj;kjxyasiupd
+No match
+
+/(abc|def|xyz)/SI
+Capturing subpattern count = 1
+No options
+No first char
+No need char
+Subject length lower bound = 3
+Starting byte set: a d x 
+    terhjk;abcdaadsfe
+ 0: abc
+    the quick xyz brown fox 
+ 0: xyz
+    \Yterhjk;abcdaadsfe
+ 0: abc
+    \Ythe quick xyz brown fox 
+ 0: xyz
+    ** Failers
+No match
+    thejk;adlfj aenjl;fda asdfasd ehj;kjxyasiupd
+No match
+    \Ythejk;adlfj aenjl;fda asdfasd ehj;kjxyasiupd
+No match
+
+/abcd*/+
+    xxxxabcd\P
+ 0: abcd
+ 0+ 
+ 1: abc
+    xxxxabcd\P\P
+Partial match: abcd
+    dddxxx\R 
+ 0: ddd
+ 0+ xxx
+ 1: dd
+ 2: d
+ 3: 
+    xxxxabcd\P\P
+Partial match: abcd
+    xxx\R 
+ 0: 
+ 0+ xxx
+
+/abcd*/i
+    xxxxabcd\P
+ 0: abcd
+ 1: abc
+    xxxxabcd\P\P
+Partial match: abcd
+    XXXXABCD\P
+ 0: ABCD
+ 1: ABC
+    XXXXABCD\P\P
+Partial match: ABCD
+
+/abc\d*/
+    xxxxabc1\P
+ 0: abc1
+ 1: abc
+    xxxxabc1\P\P
+Partial match: abc1
+
+/abc[de]*/
+    xxxxabcde\P
+ 0: abcde
+ 1: abcd
+ 2: abc
+    xxxxabcde\P\P
+Partial match: abcde
+
+/(?:(?1)|B)(A(*F)|C)/
+    ABCD
+ 0: BC
+    CCD
+ 0: CC
+    ** Failers
+No match
+    CAD   
+No match
+
+/^(?:(?1)|B)(A(*F)|C)/
+    CCD
+ 0: CC
+    BCD 
+ 0: BC
+    ** Failers
+No match
+    ABCD
+No match
+    CAD
+No match
+    BAD    
+No match
+
+/^(?!a(*SKIP)b)/
+    ac
+Error -16 (item unsupported for DFA matching)
+    
+/^(?=a(*SKIP)b|ac)/
+    ** Failers
+No match
+    ac
+Error -16 (item unsupported for DFA matching)
+    
+/^(?=a(*THEN)b|ac)/
+    ac
+Error -16 (item unsupported for DFA matching)
+    
+/^(?=a(*PRUNE)b)/
+    ab  
+Error -16 (item unsupported for DFA matching)
+    ** Failers 
+No match
+    ac
+Error -16 (item unsupported for DFA matching)
+
+/^(?(?!a(*SKIP)b))/
+    ac
+Error -16 (item unsupported for DFA matching)
+
+/(?<=abc)def/
+    abc\P\P
+Partial match at offset 3: abc
+
+/abc$/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc$/m
+    abc
+ 0: abc
+    abc\n
+ 0: abc
+    abc\P\P
+Partial match: abc
+    abc\n\P\P 
+ 0: abc
+    abc\P
+ 0: abc
+    abc\n\P
+ 0: abc
+
+/abc\z/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc\Z/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc\b/
+    abc
+ 0: abc
+    abc\P
+ 0: abc
+    abc\P\P
+Partial match: abc
+
+/abc\B/
+    abc
+No match
+    abc\P
+Partial match: abc
+    abc\P\P
+Partial match: abc
+
+/.+/
+    abc\>0
+ 0: abc
+ 1: ab
+ 2: a
+    abc\>1
+ 0: bc
+ 1: b
+    abc\>2
+ 0: c
+    abc\>3
+No match
+    abc\>4
+Error -24 (bad offset value)
+    abc\>-4 
+Error -24 (bad offset value)
+
+/^(?:a)++\w/
+     aaaab
+ 0: aaaab
+     ** Failers 
+No match
+     aaaa 
+No match
+     bbb 
+No match
+
+/^(?:aa|(?:a)++\w)/
+     aaaab
+ 0: aaaab
+ 1: aa
+     aaaa 
+ 0: aa
+     ** Failers 
+No match
+     bbb 
+No match
+
+/^(?:a)*+\w/
+     aaaab
+ 0: aaaab
+     bbb 
+ 0: b
+     ** Failers 
+No match
+     aaaa 
+No match
+
+/^(a)++\w/
+     aaaab
+ 0: aaaab
+     ** Failers 
+No match
+     aaaa 
+No match
+     bbb 
+No match
+
+/^(a|)++\w/
+     aaaab
+ 0: aaaab
+     ** Failers 
+No match
+     aaaa 
+No match
+     bbb 
+No match
+
+/(?=abc){3}abc/+
+    abcabcabc
+ 0: abc
+ 0+ abcabc
+    ** Failers
+No match
+    xyz  
+No match
+    
+/(?=abc)+abc/+
+    abcabcabc
+ 0: abc
+ 0+ abcabc
+    ** Failers
+No match
+    xyz  
+No match
+    
+/(?=abc)++abc/+
+    abcabcabc
+ 0: abc
+ 0+ abcabc
+    ** Failers
+No match
+    xyz  
+No match
+    
+/(?=abc){0}xyz/
+    xyz 
+ 0: xyz
+
+/(?=abc){1}xyz/
+    ** Failers
+No match
+    xyz 
+No match
+    
+/(?=(a))?./
+    ab
+ 0: a
+    bc
+ 0: b
+      
+/(?=(a))??./
+    ab
+ 0: a
+    bc
+ 0: b
+
+/^(?=(a)){0}b(?1)/
+    backgammon
+ 0: ba
+
+/^(?=(?1))?[az]([abc])d/
+    abd 
+ 0: abd
+    zcdxx 
+ 0: zcd
+
+/^(?!a){0}\w+/
+    aaaaa
+ 0: aaaaa
+ 1: aaaa
+ 2: aaa
+ 3: aa
+ 4: a
+
+/(?<=(abc))?xyz/
+    abcxyz
+ 0: xyz
+    pqrxyz 
+ 0: xyz
+
+/((?2))((?1))/
+    abc
+Error -26 (nested recursion at the same subject position)
+
+/(?(R)a+|(?R)b)/
+    aaaabcde
+ 0: aaaab
+
+/(?(R)a+|((?R))b)/
+    aaaabcde
+ 0: aaaab
+
+/((?(R)a+|(?1)b))/
+    aaaabcde
+ 0: aaaab
+
+/((?(R2)a+|(?1)b))/
+    aaaabcde
+Error -17 (backreference condition or recursion test not supported for DFA matching)
+
+/(?(R)a*(?1)|((?R))b)/
+    aaaabcde
+Error -26 (nested recursion at the same subject position)
+
+/(a+)/
+    \O6aaaa
+Matched, but offsets vector is too small to show all matches
+ 0: aaaa
+ 1: aaa
+ 2: aa
+    \O8aaaa
+ 0: aaaa
+ 1: aaa
+ 2: aa
+ 3: a
+
+/ab\Cde/
+    abXde
+ 0: abXde
+    
+/(?<=ab\Cde)X/
+    abZdeX
+ 0: X
+
+/^\R/
+    \r\P
+ 0: \x0d
+    \r\P\P
+Partial match: \x0d
+    
+/^\R{2,3}x/
+    \r\P
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P 
+Partial match: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P  
+Partial match: \x0d\x0d\x0d
+    \r\r\r\P\P
+Partial match: \x0d\x0d\x0d
+    \r\rx
+ 0: \x0d\x0dx
+    \r\r\rx    
+ 0: \x0d\x0d\x0dx
+
+/^\R{2,3}?x/
+    \r\P
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P 
+Partial match: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P  
+Partial match: \x0d\x0d\x0d
+    \r\r\r\P\P
+Partial match: \x0d\x0d\x0d
+    \r\rx
+ 0: \x0d\x0dx
+    \r\r\rx    
+ 0: \x0d\x0d\x0dx
+    
+/^\R?x/
+    \r\P
+Partial match: \x0d
+    \r\P\P 
+Partial match: \x0d
+    x
+ 0: x
+    \rx  
+ 0: \x0dx
+
+/^\R+x/
+    \r\P
+Partial match: \x0d
+    \r\P\P 
+Partial match: \x0d
+    \r\n\P
+Partial match: \x0d\x0a
+    \r\n\P\P  
+Partial match: \x0d\x0a
+    \rx  
+ 0: \x0dx
+
+/^a$/<CRLF>
+    a\r\P
+Partial match: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/^a$/m<CRLF>
+    a\r\P
+Partial match: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/^(a$|a\r)/<CRLF>
+    a\r\P
+ 0: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/^(a$|a\r)/m<CRLF>
+    a\r\P
+ 0: a\x0d
+    a\r\P\P 
+Partial match: a\x0d
+
+/./<CRLF>
+    \r\P
+ 0: \x0d
+    \r\P\P 
+Partial match: \x0d
+  
+/.{2,3}/<CRLF>
+    \r\P 
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P
+ 0: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P
+ 0: \x0d\x0d\x0d
+ 1: \x0d\x0d
+    \r\r\r\P\P     
+Partial match: \x0d\x0d\x0d
+
+/.{2,3}?/<CRLF>
+    \r\P 
+Partial match: \x0d
+    \r\P\P
+Partial match: \x0d
+    \r\r\P
+ 0: \x0d\x0d
+    \r\r\P\P
+Partial match: \x0d\x0d
+    \r\r\r\P
+ 0: \x0d\x0d\x0d
+ 1: \x0d\x0d
+    \r\r\r\P\P     
+Partial match: \x0d\x0d\x0d
+
+/-- Test simple validity check for restarts --/
+
+/abcdef/
+   abc\R
+Error -30 (invalid data in workspace for DFA restart)
+
+/<H((?(?!<H|F>)(.)|(?R))++)*F>/
+    text <H more text <H texting more  hexA0-"\xA0"    hex above 7F-"\xBC" F> text xxxxx <H text F> text F> text2 <H text sample F> more text.
+ 0: <H more text <H texting more  hexA0-"\xa0"    hex above 7F-"\xbc" F> text xxxxx <H text F> text F>
+
+/^(?>.{4})abc|^\w\w.xabcd/
+    xxxxabcd
+ 0: xxxxabcd
+ 1: xxxxabc
+    xx\xa0xabcd 
+ 0: xx\xa0xabcd
+ 1: xx\xa0xabc
+
+/^(.{4}){2}+abc|^\w\w.x\w\w\w\wabcd/
+    xxxxxxxxabcd
+ 0: xxxxxxxxabcd
+ 1: xxxxxxxxabc
+    xx\xa0xxxxxabcd 
+ 0: xx\xa0xxxxxabcd
+ 1: xx\xa0xxxxxabc
+
+/abcd/
+    abcd\O0
+Matched, but offsets vector is too small to show all matches
+
+/-- End of testinput8 --/
diff --git a/lib/stdlib/test/re_SUITE_data/testoutput9 b/lib/stdlib/test/re_SUITE_data/testoutput9
index acaeb398dd..0bb101ad61 100644
--- a/lib/stdlib/test/re_SUITE_data/testoutput9
+++ b/lib/stdlib/test/re_SUITE_data/testoutput9
@@ -1,1643 +1,1371 @@
-/\pL\P{Nd}/8
-    AB
- 0: AB
-    *** Failers
- 0: Fa
-    A0
+/-- This set of tests checks UTF-8 support with the DFA matching functionality
+    of pcre_dfa_exec(). The -dfa flag must be used with pcretest when running 
+    it. --/
+
+/\x{100}ab/8
+  \x{100}ab
+ 0: \x{100}ab
+  
+/a\x{100}*b/8
+    ab
+ 0: ab
+    a\x{100}b  
+ 0: a\x{100}b
+    a\x{100}\x{100}b  
+ 0: a\x{100}\x{100}b
+    
+/a\x{100}+b/8
+    a\x{100}b  
+ 0: a\x{100}b
+    a\x{100}\x{100}b  
+ 0: a\x{100}\x{100}b
+    *** Failers 
 No match
-    00   
+    ab
 No match
-
-/\X./8
-    AB
- 0: AB
-    A\x{300}BC 
- 0: A\x{300}B
-    A\x{300}\x{301}\x{302}BC 
- 0: A\x{300}\x{301}\x{302}B
-    *** Failers
- 0: **
-    \x{300}  
+     
+/\bX/8
+    Xoanon
+ 0: X
+    +Xoanon
+ 0: X
+    \x{300}Xoanon 
+ 0: X
+    *** Failers 
 No match
-
-/\X\X/8
-    ABC
- 0: AB
-    A\x{300}B\x{300}\x{301}C 
- 0: A\x{300}B\x{300}\x{301}
-    A\x{300}\x{301}\x{302}BC 
- 0: A\x{300}\x{301}\x{302}B
+    YXoanon  
+No match
+    
+/\BX/8
+    YXoanon
+ 0: X
     *** Failers
- 0: **
-    \x{300}  
 No match
-
-/^\pL+/8
-    abcd
- 0: abcd
- 1: abc
- 2: ab
- 3: a
-    a 
- 0: a
-    *** Failers 
+    Xoanon
 No match
-
-/^\PL+/8
-    1234
- 0: 1234
- 1: 123
- 2: 12
- 3: 1
-    = 
- 0: =
-    *** Failers 
- 0: *** 
- 1: ***
- 2: **
- 3: *
-    abcd 
+    +Xoanon    
+No match
+    \x{300}Xoanon 
 No match
 
-/^\X+/8
-    abcdA\x{300}\x{301}\x{302}
- 0: abcdA\x{300}\x{301}\x{302}
- 1: abcd
- 2: abc
- 3: ab
- 4: a
-    A\x{300}\x{301}\x{302}
- 0: A\x{300}\x{301}\x{302}
-    A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}
- 0: A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}
- 1: A\x{300}\x{301}\x{302}
-    a 
- 0: a
+/X\b/8
+    X+oanon
+ 0: X
+    ZX\x{300}oanon 
+ 0: X
+    FAX 
+ 0: X
     *** Failers 
- 0: *** Failers
- 1: *** Failer
- 2: *** Faile
- 3: *** Fail
- 4: *** Fai
- 5: *** Fa
- 6: *** F
- 7: *** 
- 8: ***
- 9: **
-10: *
-    \x{300}\x{301}\x{302}
 No match
-
-/\X?abc/8
-    abc
- 0: abc
-    A\x{300}abc
- 0: A\x{300}abc
-    A\x{300}\x{301}\x{302}A\x{300}A\x{300}A\x{300}abcxyz
- 0: A\x{300}abc
-    \x{300}abc  
- 0: abc
-    *** Failers
+    Xoanon  
 No match
-
-/^\X?abc/8
-    abc
- 0: abc
-    A\x{300}abc
- 0: A\x{300}abc
+    
+/X\B/8
+    Xoanon  
+ 0: X
     *** Failers
 No match
-    A\x{300}\x{301}\x{302}A\x{300}A\x{300}A\x{300}abcxyz
+    X+oanon
 No match
-    \x{300}abc  
+    ZX\x{300}oanon 
 No match
-
-/\X*abc/8
-    abc
- 0: abc
-    A\x{300}abc
- 0: A\x{300}abc
-    A\x{300}\x{301}\x{302}A\x{300}A\x{300}A\x{300}abcxyz
- 0: A\x{300}\x{301}\x{302}A\x{300}A\x{300}A\x{300}abc
-    \x{300}abc  
- 0: abc
-    *** Failers
+    FAX 
 No match
+    
+/[^a]/8
+    abcd
+ 0: b
+    a\x{100}   
+ 0: \x{100}
 
-/^\X*abc/8
-    abc
- 0: abc
-    A\x{300}abc
- 0: A\x{300}abc
-    A\x{300}\x{301}\x{302}A\x{300}A\x{300}A\x{300}abcxyz
- 0: A\x{300}\x{301}\x{302}A\x{300}A\x{300}A\x{300}abc
+/^[abc\x{123}\x{400}-\x{402}]{2,3}\d/8
+    ab99
+ 0: ab9
+    \x{123}\x{123}45
+ 0: \x{123}\x{123}4
+    \x{400}\x{401}\x{402}6  
+ 0: \x{400}\x{401}\x{402}6
     *** Failers
 No match
-    \x{300}abc  
+    d99
 No match
-
-/^\pL?=./8
-    A=b
- 0: A=b
-    =c 
- 0: =c
-    *** Failers
+    \x{123}\x{122}4   
 No match
-    1=2 
+    \x{400}\x{403}6  
 No match
-    AAAA=b  
+    \x{400}\x{401}\x{402}\x{402}6  
 No match
 
-/^\pL*=./8
-    AAAA=b
- 0: AAAA=b
-    =c 
- 0: =c
+/a.b/8
+    acb
+ 0: acb
+    a\x7fb
+ 0: a\x{7f}b
+    a\x{100}b 
+ 0: a\x{100}b
     *** Failers
 No match
-    1=2  
+    a\nb  
 No match
 
-/^\X{2,3}X/8
-    A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}X
- 0: A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}X
-    A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}X 
- 0: A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}X
+/a(.{3})b/8
+    a\x{4000}xyb 
+ 0: a\x{4000}xyb
+    a\x{4000}\x7fyb 
+ 0: a\x{4000}\x{7f}yb
+    a\x{4000}\x{100}yb 
+ 0: a\x{4000}\x{100}yb
     *** Failers
 No match
-    X
+    a\x{4000}b 
+No match
+    ac\ncb 
+No match
+
+/a(.*?)(.)/
+    a\xc0\x88b
+ 0: a\xc0\x88b
+ 1: a\xc0\x88
+ 2: a\xc0
+
+/a(.*?)(.)/8
+    a\x{100}b
+ 0: a\x{100}b
+ 1: a\x{100}
+
+/a(.*)(.)/
+    a\xc0\x88b
+ 0: a\xc0\x88b
+ 1: a\xc0\x88
+ 2: a\xc0
+
+/a(.*)(.)/8
+    a\x{100}b
+ 0: a\x{100}b
+ 1: a\x{100}
+
+/a(.)(.)/
+    a\xc0\x92bcd
+ 0: a\xc0\x92
+
+/a(.)(.)/8
+    a\x{240}bcd
+ 0: a\x{240}b
+
+/a(.?)(.)/
+    a\xc0\x92bcd
+ 0: a\xc0\x92
+ 1: a\xc0
+
+/a(.?)(.)/8
+    a\x{240}bcd
+ 0: a\x{240}b
+ 1: a\x{240}
+
+/a(.??)(.)/
+    a\xc0\x92bcd
+ 0: a\xc0\x92
+ 1: a\xc0
+
+/a(.??)(.)/8
+    a\x{240}bcd
+ 0: a\x{240}b
+ 1: a\x{240}
+
+/a(.{3})b/8
+    a\x{1234}xyb 
+ 0: a\x{1234}xyb
+    a\x{1234}\x{4321}yb 
+ 0: a\x{1234}\x{4321}yb
+    a\x{1234}\x{4321}\x{3412}b 
+ 0: a\x{1234}\x{4321}\x{3412}b
+    *** Failers
 No match
-    A\x{300}\x{301}\x{302}X
+    a\x{1234}b 
 No match
-    A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}A\x{300}\x{301}\x{302}X
+    ac\ncb 
 No match
 
-/^\pC\pL\pM\pN\pP\pS\pZ</8
-    \x7f\x{c0}\x{30f}\x{660}\x{66c}\x{f01}\x{1680}<
- 0: \x{7f}\x{c0}\x{30f}\x{660}\x{66c}\x{f01}\x{1680}<
-    \np\x{300}9!\$ < 
- 0: \x{0a}p\x{300}9!$ <
-    ** Failers 
-No match
-    ap\x{300}9!\$ < 
-No match
-  
-/^\PC/8
-    X
- 0: X
-    ** Failers 
- 0: *
-    \x7f
+/a(.{3,})b/8
+    a\x{1234}xyb 
+ 0: a\x{1234}xyb
+    a\x{1234}\x{4321}yb 
+ 0: a\x{1234}\x{4321}yb
+    a\x{1234}\x{4321}\x{3412}b 
+ 0: a\x{1234}\x{4321}\x{3412}b
+    axxxxbcdefghijb 
+ 0: axxxxbcdefghijb
+ 1: axxxxb
+    a\x{1234}\x{4321}\x{3412}\x{3421}b 
+ 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
+    *** Failers
 No match
-  
-/^\PL/8
-    9
- 0: 9
-    ** Failers 
- 0: *
-    \x{c0}
+    a\x{1234}b 
+No match
+
+/a(.{3,}?)b/8
+    a\x{1234}xyb 
+ 0: a\x{1234}xyb
+    a\x{1234}\x{4321}yb 
+ 0: a\x{1234}\x{4321}yb
+    a\x{1234}\x{4321}\x{3412}b 
+ 0: a\x{1234}\x{4321}\x{3412}b
+    axxxxbcdefghijb 
+ 0: axxxxbcdefghijb
+ 1: axxxxb
+    a\x{1234}\x{4321}\x{3412}\x{3421}b 
+ 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
+    *** Failers
 No match
-  
-/^\PM/8
-    X
- 0: X
-    ** Failers 
- 0: *
-    \x{30f}
+    a\x{1234}b 
+No match
+
+/a(.{3,5})b/8
+    a\x{1234}xyb 
+ 0: a\x{1234}xyb
+    a\x{1234}\x{4321}yb 
+ 0: a\x{1234}\x{4321}yb
+    a\x{1234}\x{4321}\x{3412}b 
+ 0: a\x{1234}\x{4321}\x{3412}b
+    axxxxbcdefghijb 
+ 0: axxxxb
+    a\x{1234}\x{4321}\x{3412}\x{3421}b 
+ 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
+    axbxxbcdefghijb 
+ 0: axbxxb
+    axxxxxbcdefghijb 
+ 0: axxxxxb
+    *** Failers
 No match
-  
-/^\PN/8
-    X
- 0: X
-    ** Failers 
- 0: *
-    \x{660}
+    a\x{1234}b 
+No match
+    axxxxxxbcdefghijb 
+No match
+
+/a(.{3,5}?)b/8
+    a\x{1234}xyb 
+ 0: a\x{1234}xyb
+    a\x{1234}\x{4321}yb 
+ 0: a\x{1234}\x{4321}yb
+    a\x{1234}\x{4321}\x{3412}b 
+ 0: a\x{1234}\x{4321}\x{3412}b
+    axxxxbcdefghijb 
+ 0: axxxxb
+    a\x{1234}\x{4321}\x{3412}\x{3421}b 
+ 0: a\x{1234}\x{4321}\x{3412}\x{3421}b
+    axbxxbcdefghijb 
+ 0: axbxxb
+    axxxxxbcdefghijb 
+ 0: axxxxxb
+    *** Failers
 No match
-  
-/^\PP/8
-    X
- 0: X
-    ** Failers 
+    a\x{1234}b 
 No match
-    \x{66c}
+    axxxxxxbcdefghijb 
 No match
-  
-/^\PS/8
-    X
- 0: X
-    ** Failers 
- 0: *
-    \x{f01}
+
+/^[a\x{c0}]/8
+    *** Failers
 No match
-  
-/^\PZ/8
-    X
- 0: X
-    ** Failers 
- 0: *
-    \x{1680}
+    \x{100}
 No match
+
+/(?<=aXb)cd/8
+    aXbcd
+ 0: cd
+
+/(?<=a\x{100}b)cd/8
+    a\x{100}bcd
+ 0: cd
+
+/(?<=a\x{100000}b)cd/8
+    a\x{100000}bcd
+ 0: cd
     
-/^\p{Cc}/8
-    \x{017}
- 0: \x{17}
-    \x{09f} 
- 0: \x{9f}
-    ** Failers
-No match
-    \x{0600} 
-No match
-  
-/^\p{Cf}/8
-    \x{601}
- 0: \x{601}
-    ** Failers
-No match
-    \x{09f} 
-No match
-  
-/^\p{Cn}/8
-    ** Failers
-No match
-    \x{09f} 
-No match
-  
-/^\p{Co}/8
-    \x{f8ff}
- 0: \x{f8ff}
-    ** Failers
-No match
-    \x{09f} 
-No match
-  
-/^\p{Cs}/8
-    \?\x{dfff}
- 0: \x{dfff}
-    ** Failers
-No match
-    \x{09f} 
-No match
-  
-/^\p{Ll}/8
-    a
- 0: a
-    ** Failers 
-No match
-    Z
-No match
-    \x{e000}  
-No match
-  
-/^\p{Lm}/8
-    \x{2b0}
- 0: \x{2b0}
-    ** Failers
-No match
-    a 
-No match
-  
-/^\p{Lo}/8
-    \x{1bb}
- 0: \x{1bb}
-    ** Failers
-No match
-    a 
-No match
-    \x{2b0}
-No match
-  
-/^\p{Lt}/8
-    \x{1c5}
- 0: \x{1c5}
-    ** Failers
-No match
-    a 
-No match
-    \x{2b0}
-No match
-  
-/^\p{Lu}/8
-    A
- 0: A
-    ** Failers
-No match
-    \x{2b0}
-No match
-  
-/^\p{Mc}/8
-    \x{903}
- 0: \x{903}
-    ** Failers
-No match
-    X
-No match
-    \x{300}
-No match
-       
-/^\p{Me}/8
-    \x{488}
- 0: \x{488}
-    ** Failers
-No match
-    X
-No match
-    \x{903}
-No match
-    \x{300}
-No match
-  
-/^\p{Mn}/8
-    \x{300}
- 0: \x{300}
-    ** Failers
-No match
-    X
-No match
-    \x{903}
-No match
-  
-/^\p{Nd}+/8
-    0123456789\x{660}\x{661}\x{662}\x{663}\x{664}\x{665}\x{666}\x{667}\x{668}\x{669}\x{66a}
- 0: 0123456789\x{660}\x{661}\x{662}\x{663}\x{664}\x{665}\x{666}\x{667}\x{668}\x{669}
- 1: 0123456789\x{660}\x{661}\x{662}\x{663}\x{664}\x{665}\x{666}\x{667}\x{668}
- 2: 0123456789\x{660}\x{661}\x{662}\x{663}\x{664}\x{665}\x{666}\x{667}
- 3: 0123456789\x{660}\x{661}\x{662}\x{663}\x{664}\x{665}\x{666}
- 4: 0123456789\x{660}\x{661}\x{662}\x{663}\x{664}\x{665}
- 5: 0123456789\x{660}\x{661}\x{662}\x{663}\x{664}
- 6: 0123456789\x{660}\x{661}\x{662}\x{663}
- 7: 0123456789\x{660}\x{661}\x{662}
- 8: 0123456789\x{660}\x{661}
- 9: 0123456789\x{660}
-10: 0123456789
-11: 012345678
-12: 01234567
-13: 0123456
-14: 012345
-15: 01234
-16: 0123
-17: 012
-18: 01
-19: 0
-    \x{6f0}\x{6f1}\x{6f2}\x{6f3}\x{6f4}\x{6f5}\x{6f6}\x{6f7}\x{6f8}\x{6f9}\x{6fa}
- 0: \x{6f0}\x{6f1}\x{6f2}\x{6f3}\x{6f4}\x{6f5}\x{6f6}\x{6f7}\x{6f8}\x{6f9}
- 1: \x{6f0}\x{6f1}\x{6f2}\x{6f3}\x{6f4}\x{6f5}\x{6f6}\x{6f7}\x{6f8}
- 2: \x{6f0}\x{6f1}\x{6f2}\x{6f3}\x{6f4}\x{6f5}\x{6f6}\x{6f7}
- 3: \x{6f0}\x{6f1}\x{6f2}\x{6f3}\x{6f4}\x{6f5}\x{6f6}
- 4: \x{6f0}\x{6f1}\x{6f2}\x{6f3}\x{6f4}\x{6f5}
- 5: \x{6f0}\x{6f1}\x{6f2}\x{6f3}\x{6f4}
- 6: \x{6f0}\x{6f1}\x{6f2}\x{6f3}
- 7: \x{6f0}\x{6f1}\x{6f2}
- 8: \x{6f0}\x{6f1}
- 9: \x{6f0}
-    \x{966}\x{967}\x{968}\x{969}\x{96a}\x{96b}\x{96c}\x{96d}\x{96e}\x{96f}\x{970}
- 0: \x{966}\x{967}\x{968}\x{969}\x{96a}\x{96b}\x{96c}\x{96d}\x{96e}\x{96f}
- 1: \x{966}\x{967}\x{968}\x{969}\x{96a}\x{96b}\x{96c}\x{96d}\x{96e}
- 2: \x{966}\x{967}\x{968}\x{969}\x{96a}\x{96b}\x{96c}\x{96d}
- 3: \x{966}\x{967}\x{968}\x{969}\x{96a}\x{96b}\x{96c}
- 4: \x{966}\x{967}\x{968}\x{969}\x{96a}\x{96b}
- 5: \x{966}\x{967}\x{968}\x{969}\x{96a}
- 6: \x{966}\x{967}\x{968}\x{969}
- 7: \x{966}\x{967}\x{968}
- 8: \x{966}\x{967}
- 9: \x{966}
-    ** Failers
-No match
-    X
-No match
-  
-/^\p{Nl}/8
-    \x{16ee}
- 0: \x{16ee}
-    ** Failers
-No match
-    X
-No match
-    \x{966}
-No match
-  
-/^\p{No}/8
-    \x{b2}
- 0: \x{b2}
-    \x{b3}
- 0: \x{b3}
-    ** Failers
-No match
-    X
-No match
-    \x{16ee}
-No match
-  
-/^\p{Pc}/8
-    \x5f
- 0: _
-    \x{203f}
- 0: \x{203f}
-    ** Failers
-No match
-    X
-No match
-    -
-No match
-    \x{58a}
-No match
-  
-/^\p{Pd}/8
-    -
- 0: -
-    \x{58a}
- 0: \x{58a}
-    ** Failers
-No match
-    X
-No match
-    \x{203f}
-No match
-  
-/^\p{Pe}/8
-    )
- 0: )
-    ]
- 0: ]
-    }
- 0: }
-    \x{f3b}
- 0: \x{f3b}
-    ** Failers
-No match
-    X
-No match
-    \x{203f}
-No match
-    (
-No match
-    [
-No match
-    {
-No match
-    \x{f3c}
-No match
-  
-/^\p{Pf}/8
-    \x{bb}
- 0: \x{bb}
-    \x{2019}
- 0: \x{2019}
-    ** Failers
-No match
-    X
+/(?:\x{100}){3}b/8
+    \x{100}\x{100}\x{100}b
+ 0: \x{100}\x{100}\x{100}b
+    *** Failers 
 No match
-    \x{203f}
+    \x{100}\x{100}b
 No match
-  
-/^\p{Pi}/8
-    \x{ab}
+
+/\x{ab}/8
+    \x{ab} 
  0: \x{ab}
-    \x{2018}
- 0: \x{2018}
-    ** Failers
-No match
-    X
-No match
-    \x{203f}
-No match
-  
-/^\p{Po}/8
-    !
- 0: !
-    \x{37e}
- 0: \x{37e}
-    ** Failers
- 0: *
-    X
-No match
-    \x{203f}
-No match
-  
-/^\p{Ps}/8
-    (
- 0: (
-    [
- 0: [
-    {
- 0: {
-    \x{f3c}
- 0: \x{f3c}
-    ** Failers
-No match
-    X
-No match
-    )
-No match
-    ]
-No match
-    }
-No match
-    \x{f3b}
-No match
-  
-/^\p{Sc}+/8
-    $\x{a2}\x{a3}\x{a4}\x{a5}\x{a6}
- 0: $\x{a2}\x{a3}\x{a4}\x{a5}
- 1: $\x{a2}\x{a3}\x{a4}
- 2: $\x{a2}\x{a3}
- 3: $\x{a2}
- 4: $
-    \x{9f2}
- 0: \x{9f2}
-    ** Failers
-No match
-    X
-No match
-    \x{2c2}
-No match
-  
-/^\p{Sk}/8
-    \x{2c2}
- 0: \x{2c2}
-    ** Failers
-No match
-    X
-No match
-    \x{9f2}
-No match
-  
-/^\p{Sm}+/8
-    +<|~\x{ac}\x{2044}
- 0: +<|~\x{ac}\x{2044}
- 1: +<|~\x{ac}
- 2: +<|~
- 3: +<|
- 4: +<
- 5: +
-    ** Failers
-No match
-    X
-No match
-    \x{9f2}
-No match
-  
-/^\p{So}/8
-    \x{a6}
- 0: \x{a6}
-    \x{482} 
- 0: \x{482}
-    ** Failers
-No match
-    X
-No match
-    \x{9f2}
+    \xc2\xab
+ 0: \x{ab}
+    *** Failers 
 No match
-  
-/^\p{Zl}/8
-    \x{2028}
- 0: \x{2028}
-    ** Failers
+    \x00{ab}
 No match
-    X
+
+/(?<=(.))X/8
+    WXYZ
+ 0: X
+    \x{256}XYZ 
+ 0: X
+    *** Failers
 No match
-    \x{2029}
+    XYZ 
 No match
+
+/[^a]+/8g
+    bcd
+ 0: bcd
+ 1: bc
+ 2: b
+    \x{100}aY\x{256}Z 
+ 0: \x{100}
+ 0: Y\x{256}Z
+ 1: Y\x{256}
+ 2: Y
+    
+/^[^a]{2}/8
+    \x{100}bc
+ 0: \x{100}b
+ 
+/^[^a]{2,}/8
+    \x{100}bcAa
+ 0: \x{100}bcA
+ 1: \x{100}bc
+ 2: \x{100}b
+
+/^[^a]{2,}?/8
+    \x{100}bca
+ 0: \x{100}bc
+ 1: \x{100}b
+
+/[^a]+/8ig
+    bcd
+ 0: bcd
+ 1: bc
+ 2: b
+    \x{100}aY\x{256}Z 
+ 0: \x{100}
+ 0: Y\x{256}Z
+ 1: Y\x{256}
+ 2: Y
+    
+/^[^a]{2}/8i
+    \x{100}bc
+ 0: \x{100}b
+ 
+/^[^a]{2,}/8i
+    \x{100}bcAa
+ 0: \x{100}bc
+ 1: \x{100}b
+
+/^[^a]{2,}?/8i
+    \x{100}bca
+ 0: \x{100}bc
+ 1: \x{100}b
+
+/\x{100}{0,0}/8
+    abcd
+ 0: 
+ 
+/\x{100}?/8
+    abcd
+ 0: 
+    \x{100}\x{100} 
+ 0: \x{100}
+ 1: 
+
+/\x{100}{0,3}/8 
+    \x{100}\x{100} 
+ 0: \x{100}\x{100}
+ 1: \x{100}
+ 2: 
+    \x{100}\x{100}\x{100}\x{100} 
+ 0: \x{100}\x{100}\x{100}
+ 1: \x{100}\x{100}
+ 2: \x{100}
+ 3: 
+    
+/\x{100}*/8
+    abce
+ 0: 
+    \x{100}\x{100}\x{100}\x{100} 
+ 0: \x{100}\x{100}\x{100}\x{100}
+ 1: \x{100}\x{100}\x{100}
+ 2: \x{100}\x{100}
+ 3: \x{100}
+ 4: 
+
+/\x{100}{1,1}/8
+    abcd\x{100}\x{100}\x{100}\x{100} 
+ 0: \x{100}
+
+/\x{100}{1,3}/8
+    abcd\x{100}\x{100}\x{100}\x{100} 
+ 0: \x{100}\x{100}\x{100}
+ 1: \x{100}\x{100}
+ 2: \x{100}
+
+/\x{100}+/8
+    abcd\x{100}\x{100}\x{100}\x{100} 
+ 0: \x{100}\x{100}\x{100}\x{100}
+ 1: \x{100}\x{100}\x{100}
+ 2: \x{100}\x{100}
+ 3: \x{100}
+
+/\x{100}{3}/8
+    abcd\x{100}\x{100}\x{100}XX
+ 0: \x{100}\x{100}\x{100}
+
+/\x{100}{3,5}/8
+    abcd\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}XX
+ 0: \x{100}\x{100}\x{100}\x{100}\x{100}
+ 1: \x{100}\x{100}\x{100}\x{100}
+ 2: \x{100}\x{100}\x{100}
+
+/\x{100}{3,}/8
+    abcd\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}XX
+ 0: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 1: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 2: \x{100}\x{100}\x{100}\x{100}\x{100}
+ 3: \x{100}\x{100}\x{100}\x{100}
+ 4: \x{100}\x{100}\x{100}
+
+/(?<=a\x{100}{2}b)X/8
+    Xyyya\x{100}\x{100}bXzzz
+ 0: X
+
+/\D*/8
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+Matched, but offsets vector is too small to show all matches
+ 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 3: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 4: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 6: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 7: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 8: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ 9: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+10: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+12: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+13: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+14: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+15: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+16: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+17: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+18: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+19: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+20: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+21: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+
+/\D*/8
+  \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+Matched, but offsets vector is too small to show all matches
+ 0: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 1: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 2: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 3: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 4: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 5: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 6: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 7: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 8: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+ 9: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+10: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+11: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+12: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+13: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+14: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+15: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+16: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+17: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+18: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+19: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+20: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+21: \x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}\x{100}
+
+/\D/8
+    1X2
+ 0: X
+    1\x{100}2 
+ 0: \x{100}
   
-/^\p{Zp}/8
-    \x{2029}
- 0: \x{2029}
-    ** Failers
-No match
-    X
-No match
-    \x{2028}
-No match
+/>\S/8
+    > >X Y
+ 0: >X
+    > >\x{100} Y
+ 0: >\x{100}
   
-/^\p{Zs}/8
-    \ \
+/\d/8
+    \x{100}3
+ 0: 3
+    
+/\s/8
+    \x{100} X
  0:  
-    \x{a0}
- 0: \x{a0}
-    \x{1680}
- 0: \x{1680}
-    \x{180e}
- 0: \x{180e}
-    \x{2000}
- 0: \x{2000}
-    \x{2001}     
- 0: \x{2001}
-    ** Failers
-No match
-    \x{2028}
-No match
-    \x{200d} 
-No match
-  
-/\p{Nd}+(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
- 2: \x{660}\x{661}\x{662}
-  
-/\p{Nd}+?(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
- 2: \x{660}\x{661}\x{662}
-  
-/\p{Nd}{2,}(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
-  
-/\p{Nd}{2,}?(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
-  
-/\p{Nd}*(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
- 2: \x{660}\x{661}\x{662}
- 3: \x{660}\x{661}
-  
-/\p{Nd}*?(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
- 2: \x{660}\x{661}\x{662}
- 3: \x{660}\x{661}
-  
-/\p{Nd}{2}(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}A
-  
-/\p{Nd}{2,3}(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
-  
-/\p{Nd}{2,3}?(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
- 1: \x{660}\x{661}\x{662}A
-  
-/\p{Nd}?(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}
- 1: \x{660}\x{661}
-  
-/\p{Nd}??(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}
- 1: \x{660}\x{661}
-  
-/\p{Nd}*+(..)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}AB
-  
-/\p{Nd}*+(...)/8
-      \x{660}\x{661}\x{662}ABC
- 0: \x{660}\x{661}\x{662}ABC
-  
-/\p{Nd}*+(....)/8
-      ** Failers
- 0: ** F
-      \x{660}\x{661}\x{662}ABC
+    
+/\D+/8
+    12abcd34
+ 0: abcd
+ 1: abc
+ 2: ab
+ 3: a
+    *** Failers
+ 0: *** Failers
+ 1: *** Failer
+ 2: *** Faile
+ 3: *** Fail
+ 4: *** Fai
+ 5: *** Fa
+ 6: *** F
+ 7: *** 
+ 8: ***
+ 9: **
+10: *
+    1234  
 No match
-  
-/\p{Lu}/8i
-    A
- 0: A
-    a\x{10a0}B 
- 0: \x{10a0}
-    ** Failers 
- 0: F
-    a
+
+/\D{2,3}/8
+    12abcd34
+ 0: abc
+ 1: ab
+    12ab34
+ 0: ab
+    *** Failers  
+ 0: ***
+ 1: **
+    1234
 No match
-    \x{1d00}  
+    12a34  
 No match
 
-/\p{^Lu}/8i
+/\D{2,3}?/8
+    12abcd34
+ 0: abc
+ 1: ab
+    12ab34
+ 0: ab
+    *** Failers  
+ 0: ***
+ 1: **
     1234
- 0: 1
-    ** Failers
- 0: *
-    ABC 
+No match
+    12a34  
 No match
 
-/\P{Lu}/8i
-    1234
- 0: 1
-    ** Failers
- 0: *
-    ABC 
+/\d+/8
+    12abcd34
+ 0: 12
+ 1: 1
+    *** Failers
 No match
 
-/(?<=A\p{Nd})XYZ/8
-    A2XYZ
- 0: XYZ
-    123A5XYZPQR
- 0: XYZ
-    ABA\x{660}XYZpqr
- 0: XYZ
-    ** Failers
+/\d{2,3}/8
+    12abcd34
+ 0: 12
+    1234abcd
+ 0: 123
+ 1: 12
+    *** Failers  
 No match
-    AXYZ
+    1.4 
 No match
-    XYZ     
+
+/\d{2,3}?/8
+    12abcd34
+ 0: 12
+    1234abcd
+ 0: 123
+ 1: 12
+    *** Failers  
 No match
-    
-/(?<!\pL)XYZ/8
-    1XYZ
- 0: XYZ
-    AB=XYZ.. 
- 0: XYZ
-    XYZ 
- 0: XYZ
-    ** Failers
+    1.4 
 No match
-    WXYZ 
+
+/\S+/8
+    12abcd34
+ 0: 12abcd34
+ 1: 12abcd3
+ 2: 12abcd
+ 3: 12abc
+ 4: 12ab
+ 5: 12a
+ 6: 12
+ 7: 1
+    *** Failers
+ 0: ***
+ 1: **
+ 2: *
+    \    \ 
+No match
+
+/\S{2,3}/8
+    12abcd34
+ 0: 12a
+ 1: 12
+    1234abcd
+ 0: 123
+ 1: 12
+    *** Failers
+ 0: ***
+ 1: **
+    \     \  
+No match
+
+/\S{2,3}?/8
+    12abcd34
+ 0: 12a
+ 1: 12
+    1234abcd
+ 0: 123
+ 1: 12
+    *** Failers
+ 0: ***
+ 1: **
+    \     \  
 No match
 
-/[\p{Nd}]/8
-    1234
- 0: 1
+/>\s+</8
+    12>      <34
+ 0: >      <
+    *** Failers
+No match
 
-/[\p{Nd}+-]+/8
-    1234
- 0: 1234
- 1: 123
- 2: 12
- 3: 1
-    12-34
- 0: 12-34
- 1: 12-3
- 2: 12-
- 3: 12
- 4: 1
-    12+\x{661}-34  
- 0: 12+\x{661}-34
- 1: 12+\x{661}-3
- 2: 12+\x{661}-
- 3: 12+\x{661}
- 4: 12+
- 5: 12
- 6: 1
-    ** Failers
+/>\s{2,3}</8
+    ab>  <cd
+ 0: >  <
+    ab>   <ce
+ 0: >   <
+    *** Failers
 No match
-    abcd  
+    ab>    <cd 
 No match
 
-/[\P{Nd}]+/8
-    abcd
- 0: abcd
- 1: abc
- 2: ab
- 3: a
-    ** Failers
- 0: ** Failers
- 1: ** Failer
- 2: ** Faile
- 3: ** Fail
- 4: ** Fai
- 5: ** Fa
- 6: ** F
- 7: ** 
- 8: **
- 9: *
-    1234
+/>\s{2,3}?</8
+    ab>  <cd
+ 0: >  <
+    ab>   <ce
+ 0: >   <
+    *** Failers
 No match
-
-/\D+/8
-    11111111111111111111111111111111111111111111111111111111111111111111111
-No match
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Matched, but too many subsidiary matches
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 6: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 7: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 8: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 9: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-10: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-13: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-14: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-15: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-16: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-17: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-18: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-19: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-20: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-21: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-     
-/\P{Nd}+/8
-    11111111111111111111111111111111111111111111111111111111111111111111111
-No match
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Matched, but too many subsidiary matches
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 6: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 7: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 8: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 9: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-10: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-13: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-14: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-15: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-16: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-17: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-18: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-19: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-20: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-21: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-
-/[\D]+/8
-    11111111111111111111111111111111111111111111111111111111111111111111111
-No match
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Matched, but too many subsidiary matches
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 6: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 7: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 8: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 9: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-10: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-13: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-14: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-15: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-16: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-17: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-18: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-19: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-20: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-21: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-
-/[\P{Nd}]+/8
-    11111111111111111111111111111111111111111111111111111111111111111111111
-No match
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Matched, but too many subsidiary matches
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 6: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 7: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 8: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 9: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-10: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-13: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-14: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-15: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-16: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-17: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-18: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-19: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-20: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-21: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-
-/[\D\P{Nd}]+/8
-    11111111111111111111111111111111111111111111111111111111111111111111111
-No match
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-Matched, but too many subsidiary matches
- 0: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 1: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 2: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 3: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 4: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 5: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 6: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 7: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 8: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
- 9: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-10: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-11: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-12: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-13: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-14: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-15: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-16: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-17: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-18: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-19: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-20: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-21: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-
-/\pL/8
-    a
- 0: a
-    A 
- 0: A
-
-/\pL/8i
-    a
- 0: a
-    A 
- 0: A
-    
-/\p{Lu}/8 
-    A
- 0: A
-    aZ
- 0: Z
-    ** Failers
- 0: F
-    abc   
+    ab>    <cd 
 No match
 
-/\p{Lu}/8i
-    A
- 0: A
-    aZ
- 0: Z
-    ** Failers
- 0: F
-    abc   
+/\w+/8
+    12      34
+ 0: 12
+ 1: 1
+    *** Failers
+ 0: Failers
+ 1: Failer
+ 2: Faile
+ 3: Fail
+ 4: Fai
+ 5: Fa
+ 6: F
+    +++=*! 
+No match
+
+/\w{2,3}/8
+    ab  cd
+ 0: ab
+    abcd ce
+ 0: abc
+ 1: ab
+    *** Failers
+ 0: Fai
+ 1: Fa
+    a.b.c
 No match
 
-/\p{Ll}/8 
-    a
- 0: a
-    Az
- 0: z
-    ** Failers
- 0: a
-    ABC   
+/\w{2,3}?/8
+    ab  cd
+ 0: ab
+    abcd ce
+ 0: abc
+ 1: ab
+    *** Failers
+ 0: Fai
+ 1: Fa
+    a.b.c
 No match
 
-/\p{Ll}/8i 
-    a
- 0: a
-    Az
- 0: z
-    ** Failers
- 0: a
-    ABC   
+/\W+/8
+    12====34
+ 0: ====
+ 1: ===
+ 2: ==
+ 3: =
+    *** Failers
+ 0: *** 
+ 1: ***
+ 2: **
+ 3: *
+    abcd 
 No match
 
-/^\x{c0}$/8i
-    \x{c0}
- 0: \x{c0}
-    \x{e0} 
- 0: \x{e0}
-
-/^\x{e0}$/8i
-    \x{c0}
- 0: \x{c0}
-    \x{e0} 
- 0: \x{e0}
-
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8
-    A\x{391}\x{10427}\x{ff3a}\x{1fb0}
- 0: A\x{391}\x{10427}\x{ff3a}\x{1fb0}
-    ** Failers
+/\W{2,3}/8
+    ab====cd
+ 0: ===
+ 1: ==
+    ab==cd
+ 0: ==
+    *** Failers
+ 0: ***
+ 1: **
+    a.b.c
 No match
-    a\x{391}\x{10427}\x{ff3a}\x{1fb0}   
-No match
-    A\x{3b1}\x{10427}\x{ff3a}\x{1fb0}
-No match
-    A\x{391}\x{1044F}\x{ff3a}\x{1fb0}
-No match
-    A\x{391}\x{10427}\x{ff5a}\x{1fb0}
-No match
-    A\x{391}\x{10427}\x{ff3a}\x{1fb8}
-No match
-
-/A\x{391}\x{10427}\x{ff3a}\x{1fb0}/8i
-    A\x{391}\x{10427}\x{ff3a}\x{1fb0}
- 0: A\x{391}\x{10427}\x{ff3a}\x{1fb0}
-    a\x{391}\x{10427}\x{ff3a}\x{1fb0}   
- 0: a\x{391}\x{10427}\x{ff3a}\x{1fb0}
-    A\x{3b1}\x{10427}\x{ff3a}\x{1fb0}
- 0: A\x{3b1}\x{10427}\x{ff3a}\x{1fb0}
-    A\x{391}\x{1044F}\x{ff3a}\x{1fb0}
- 0: A\x{391}\x{1044f}\x{ff3a}\x{1fb0}
-    A\x{391}\x{10427}\x{ff5a}\x{1fb0}
- 0: A\x{391}\x{10427}\x{ff5a}\x{1fb0}
-    A\x{391}\x{10427}\x{ff3a}\x{1fb8}
- 0: A\x{391}\x{10427}\x{ff3a}\x{1fb8}
-
-/\x{391}+/8i
-    \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}
- 0: \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}
- 1: \x{391}\x{3b1}\x{3b1}\x{3b1}
- 2: \x{391}\x{3b1}\x{3b1}
- 3: \x{391}\x{3b1}
- 4: \x{391}
-
-/\x{391}{3,5}(.)/8i
-    \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}X
- 0: \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}X
- 1: \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}
- 2: \x{391}\x{3b1}\x{3b1}\x{3b1}
-
-/\x{391}{3,5}?(.)/8i
-    \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}X
- 0: \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}X
- 1: \x{391}\x{3b1}\x{3b1}\x{3b1}\x{391}
- 2: \x{391}\x{3b1}\x{3b1}\x{3b1}
-
-/[\x{391}\x{ff3a}]/8i
-    \x{391}
- 0: \x{391}
-    \x{ff3a}
- 0: \x{ff3a}
-    \x{3b1}
- 0: \x{3b1}
-    \x{ff5a}   
- 0: \x{ff5a}
-    
-/[\x{c0}\x{391}]/8i
-    \x{c0}
- 0: \x{c0}
-    \x{e0} 
- 0: \x{e0}
-
-/[\x{105}-\x{109}]/8i
-    \x{104}
- 0: \x{104}
-    \x{105}
- 0: \x{105}
-    \x{109}  
- 0: \x{109}
-    ** Failers
+
+/\W{2,3}?/8
+    ab====cd
+ 0: ===
+ 1: ==
+    ab==cd
+ 0: ==
+    *** Failers
+ 0: ***
+ 1: **
+    a.b.c
 No match
+
+/[\x{100}]/8
     \x{100}
+ 0: \x{100}
+    Z\x{100}
+ 0: \x{100}
+    \x{100}Z
+ 0: \x{100}
+    *** Failers 
 No match
-    \x{10a} 
-No match
-    
-/[z-\x{100}]/8i 
-    Z
+
+/[Z\x{100}]/8
+    Z\x{100}
  0: Z
-    z
- 0: z
-    \x{39c}
- 0: \x{39c}
-    \x{178}
- 0: \x{178}
-    |
- 0: |
-    \x{80}
- 0: \x{80}
-    \x{ff}
- 0: \x{ff}
     \x{100}
  0: \x{100}
-    \x{101} 
- 0: \x{101}
-    ** Failers
-No match
-    \x{102}
-No match
-    Y
-No match
-    y           
+    \x{100}Z
+ 0: \x{100}
+    *** Failers 
 No match
 
-/[z-\x{100}]/8i
-
-/^\X/8
-    A
- 0: A
-    A\x{300}BC 
- 0: A\x{300}
-    A\x{300}\x{301}\x{302}BC 
- 0: A\x{300}\x{301}\x{302}
-    *** Failers
- 0: *
-    \x{300}  
+/[\x{100}\x{200}]/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   *** Failers  
 No match
 
-/^[\X]/8
-    X123
- 0: X
-    *** Failers
-No match
-    AXYZ
-No match
-
-/^(\X*)C/8
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301} 
- 0: A\x{300}\x{301}\x{302}BC
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C 
- 0: A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C
- 1: A\x{300}\x{301}\x{302}BC
-
-/^(\X*?)C/8
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301} 
- 0: A\x{300}\x{301}\x{302}BC
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C 
- 0: A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C
- 1: A\x{300}\x{301}\x{302}BC
-
-/^(\X*)(.)/8
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301} 
- 0: A\x{300}\x{301}\x{302}BCA
- 1: A\x{300}\x{301}\x{302}BC
- 2: A\x{300}\x{301}\x{302}B
- 3: A
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C 
- 0: A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C
- 1: A\x{300}\x{301}\x{302}BCA
- 2: A\x{300}\x{301}\x{302}BC
- 3: A\x{300}\x{301}\x{302}B
- 4: A
-
-/^(\X*?)(.)/8
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301} 
- 0: A\x{300}\x{301}\x{302}BCA
- 1: A\x{300}\x{301}\x{302}BC
- 2: A\x{300}\x{301}\x{302}B
- 3: A
-    A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C 
- 0: A\x{300}\x{301}\x{302}BCA\x{300}\x{301}C
- 1: A\x{300}\x{301}\x{302}BCA
- 2: A\x{300}\x{301}\x{302}BC
- 3: A\x{300}\x{301}\x{302}B
- 4: A
-
-/^\X(.)/8
-    *** Failers
- 0: **
-    A\x{300}\x{301}\x{302}
-No match
-
-/^\X{2,3}(.)/8
-    A\x{300}\x{301}B\x{300}X
- 0: A\x{300}\x{301}B\x{300}X
-    A\x{300}\x{301}B\x{300}C\x{300}\x{301}
- 0: A\x{300}\x{301}B\x{300}C
-    A\x{300}\x{301}B\x{300}C\x{300}\x{301}X
- 0: A\x{300}\x{301}B\x{300}C\x{300}\x{301}X
- 1: A\x{300}\x{301}B\x{300}C
-    A\x{300}\x{301}B\x{300}C\x{300}\x{301}DA\x{300}X
- 0: A\x{300}\x{301}B\x{300}C\x{300}\x{301}D
- 1: A\x{300}\x{301}B\x{300}C
-    
-/^\X{2,3}?(.)/8
-    A\x{300}\x{301}B\x{300}X
- 0: A\x{300}\x{301}B\x{300}X
-    A\x{300}\x{301}B\x{300}C\x{300}\x{301}
- 0: A\x{300}\x{301}B\x{300}C
-    A\x{300}\x{301}B\x{300}C\x{300}\x{301}X
- 0: A\x{300}\x{301}B\x{300}C\x{300}\x{301}X
- 1: A\x{300}\x{301}B\x{300}C
-    A\x{300}\x{301}B\x{300}C\x{300}\x{301}DA\x{300}X
- 0: A\x{300}\x{301}B\x{300}C\x{300}\x{301}D
- 1: A\x{300}\x{301}B\x{300}C
-
-/^\pN{2,3}X/
-    12X
- 0: 12X
-    123X
- 0: 123X
-    *** Failers
-No match
-    X
+/[\x{100}-\x{200}]/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{111}cd 
+ 0: \x{111}
+   *** Failers  
 No match
-    1X
+
+/[z-\x{200}]/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{111}cd 
+ 0: \x{111}
+   abzcd
+ 0: z
+   ab|cd  
+ 0: |
+   *** Failers  
 No match
-    1234X     
+
+/[Q\x{100}\x{200}]/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   Q? 
+ 0: Q
+   *** Failers  
 No match
 
-/\x{100}/i8
-    \x{100}   
+/[Q\x{100}-\x{200}]/8
+   ab\x{100}cd
  0: \x{100}
-    \x{101} 
- 0: \x{101}
-    
-/^\p{Han}+/8
-    \x{2e81}\x{3007}\x{2f804}\x{31a0}
- 0: \x{2e81}\x{3007}\x{2f804}
- 1: \x{2e81}\x{3007}
- 2: \x{2e81}
-    ** Failers
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{111}cd 
+ 0: \x{111}
+   Q? 
+ 0: Q
+   *** Failers  
 No match
-    \x{2e7f}  
+
+/[Qz-\x{200}]/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{111}cd 
+ 0: \x{111}
+   abzcd
+ 0: z
+   ab|cd  
+ 0: |
+   Q? 
+ 0: Q
+   *** Failers  
 No match
 
-/^\P{Katakana}+/8
-    \x{3105}
- 0: \x{3105}
-    ** Failers
- 0: ** Failers
- 1: ** Failer
- 2: ** Faile
- 3: ** Fail
- 4: ** Fai
- 5: ** Fa
- 6: ** F
- 7: ** 
- 8: **
- 9: *
-    \x{30ff}  
-No match
-
-/^[\p{Arabic}]/8
-    \x{06e9}
- 0: \x{6e9}
-    \x{060b}
- 0: \x{60b}
-    ** Failers
+/[\x{100}\x{200}]{1,3}/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{200}\x{100}\x{200}\x{100}cd
+ 0: \x{200}\x{100}\x{200}
+ 1: \x{200}\x{100}
+ 2: \x{200}
+   *** Failers  
 No match
-    X\x{06e9}   
+
+/[\x{100}\x{200}]{1,3}?/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{200}\x{100}\x{200}\x{100}cd
+ 0: \x{200}\x{100}\x{200}
+ 1: \x{200}\x{100}
+ 2: \x{200}
+   *** Failers  
 No match
 
-/^[\P{Yi}]/8
-    \x{2f800}
- 0: \x{2f800}
-    ** Failers
- 0: *
-    \x{a014}
+/[Q\x{100}\x{200}]{1,3}/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{200}\x{100}\x{200}\x{100}cd
+ 0: \x{200}\x{100}\x{200}
+ 1: \x{200}\x{100}
+ 2: \x{200}
+   *** Failers  
 No match
-    \x{a4c6}   
+
+/[Q\x{100}\x{200}]{1,3}?/8
+   ab\x{100}cd
+ 0: \x{100}
+   ab\x{200}cd
+ 0: \x{200}
+   ab\x{200}\x{100}\x{200}\x{100}cd
+ 0: \x{200}\x{100}\x{200}
+ 1: \x{200}\x{100}
+ 2: \x{200}
+   *** Failers  
 No match
 
-/^\p{Any}X/8
-    AXYZ
- 0: AX
-    \x{1234}XYZ 
- 0: \x{1234}X
-    ** Failers
+/(?<=[\x{100}\x{200}])X/8
+    abc\x{200}X
+ 0: X
+    abc\x{100}X 
+ 0: X
+    *** Failers
 No match
     X  
 No match
-    
-/^\P{Any}X/8
-    ** Failers
-No match
-    AX
-No match
-    
-/^\p{Any}?X/8
-    XYZ
+
+/(?<=[Q\x{100}\x{200}])X/8
+    abc\x{200}X
  0: X
-    AXYZ
- 0: AX
-    \x{1234}XYZ 
- 0: \x{1234}X
-    ** Failers
+    abc\x{100}X 
+ 0: X
+    abQX 
+ 0: X
+    *** Failers
 No match
-    ABXYZ   
+    X  
 No match
 
-/^\P{Any}?X/8
-    XYZ
+/(?<=[\x{100}\x{200}]{3})X/8
+    abc\x{100}\x{200}\x{100}X
  0: X
-    ** Failers
-No match
-    AXYZ
+    *** Failers
 No match
-    \x{1234}XYZ 
+    abc\x{200}X
 No match
-    ABXYZ   
+    X  
 No match
 
-/^\p{Any}+X/8
-    AXYZ
+/[^\x{100}\x{200}]X/8
+    AX
  0: AX
-    \x{1234}XYZ
- 0: \x{1234}X
-    A\x{1234}XYZ
- 0: A\x{1234}X
-    ** Failers
+    \x{150}X
+ 0: \x{150}X
+    \x{500}X 
+ 0: \x{500}X
+    *** Failers
 No match
-    XYZ
+    \x{100}X
 No match
-
-/^\P{Any}+X/8
-    ** Failers
+    \x{200}X   
 No match
-    AXYZ
+
+/[^Q\x{100}\x{200}]X/8
+    AX
+ 0: AX
+    \x{150}X
+ 0: \x{150}X
+    \x{500}X 
+ 0: \x{500}X
+    *** Failers
 No match
-    \x{1234}XYZ
+    \x{100}X
 No match
-    A\x{1234}XYZ
+    \x{200}X   
 No match
-    XYZ
+    QX 
 No match
 
-/^\p{Any}*X/8
-    XYZ
- 0: X
-    AXYZ
+/[^\x{100}-\x{200}]X/8
+    AX
  0: AX
-    \x{1234}XYZ
- 0: \x{1234}X
-    A\x{1234}XYZ
- 0: A\x{1234}X
-    ** Failers
-No match
-
-/^\P{Any}*X/8
-    XYZ
- 0: X
-    ** Failers
+    \x{500}X 
+ 0: \x{500}X
+    *** Failers
 No match
-    AXYZ
+    \x{100}X
 No match
-    \x{1234}XYZ
+    \x{150}X
 No match
-    A\x{1234}XYZ
+    \x{200}X   
 No match
 
-/^[\p{Any}]X/8
-    AXYZ
- 0: AX
-    \x{1234}XYZ 
- 0: \x{1234}X
-    ** Failers
-No match
-    X  
+/[z-\x{100}]/8i
+    z
+ 0: z
+    Z 
+ 0: Z
+    \x{100}
+ 0: \x{100}
+    *** Failers
 No match
-    
-/^[\P{Any}]X/8
-    ** Failers
+    \x{102}
 No match
-    AX
+    y    
 No match
-    
-/^[\p{Any}]?X/8
+
+/[\xFF]/
+    >\xff<
+ 0: \xff
+
+/[\xff]/8
+    >\x{ff}<
+ 0: \x{ff}
+
+/[^\xFF]/
     XYZ
  0: X
-    AXYZ
- 0: AX
-    \x{1234}XYZ 
- 0: \x{1234}X
-    ** Failers
-No match
-    ABXYZ   
-No match
 
-/^[\P{Any}]?X/8
+/[^\xff]/8
     XYZ
  0: X
-    ** Failers
-No match
-    AXYZ
-No match
-    \x{1234}XYZ 
-No match
-    ABXYZ   
-No match
+    \x{123} 
+ 0: \x{123}
 
-/^[\p{Any}]+X/8
-    AXYZ
- 0: AX
-    \x{1234}XYZ
- 0: \x{1234}X
-    A\x{1234}XYZ
- 0: A\x{1234}X
-    ** Failers
-No match
-    XYZ
+/^[ac]*b/8
+  xb
 No match
 
-/^[\P{Any}]+X/8
-    ** Failers
-No match
-    AXYZ
+/^[ac\x{100}]*b/8
+  xb
 No match
-    \x{1234}XYZ
+
+/^[^x]*b/8i
+  xb
 No match
-    A\x{1234}XYZ
+
+/^[^x]*b/8
+  xb
 No match
-    XYZ
+  
+/^\d*b/8
+  xb 
 No match
 
-/^[\p{Any}]*X/8
-    XYZ
- 0: X
-    AXYZ
- 0: AX
-    \x{1234}XYZ
- 0: \x{1234}X
-    A\x{1234}XYZ
- 0: A\x{1234}X
+/(|a)/g8
+    catac
+ 0: 
+ 0: a
+ 1: 
+ 0: 
+ 0: a
+ 1: 
+ 0: 
+ 0: 
+    a\x{256}a 
+ 0: a
+ 1: 
+ 0: 
+ 0: a
+ 1: 
+ 0: 
+
+/^\x{85}$/8i
+    \x{85}
+ 0: \x{85}
+
+/^abc./mgx8<any>
+    abc1 \x0aabc2 \x0babc3xx \x0cabc4 \x0dabc5xx \x0d\x0aabc6 \x{0085}abc7 \x{2028}abc8 \x{2029}abc9 JUNK
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+ 0: abc8
+ 0: abc9
+
+/abc.$/mgx8<any>
+    abc1\x0a abc2\x0b abc3\x0c abc4\x0d abc5\x0d\x0a abc6\x{0085} abc7\x{2028} abc8\x{2029} abc9
+ 0: abc1
+ 0: abc2
+ 0: abc3
+ 0: abc4
+ 0: abc5
+ 0: abc6
+ 0: abc7
+ 0: abc8
+ 0: abc9
+
+/^a\Rb/8<bsr_unicode>
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0cb
+ 0: a\x{0c}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\x{2028}b 
+ 0: a\x{2028}b
+    a\x{2029}b 
+ 0: a\x{2029}b
     ** Failers
 No match
-
-/^[\P{Any}]*X/8
-    XYZ
- 0: X
+    a\n\rb    
+No match
+
+/^a\R*b/8<bsr_unicode>
+    ab
+ 0: ab
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0c\x{2028}\x{2029}b
+ 0: a\x{0c}\x{2028}\x{2029}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\n\rb    
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}\x0cb 
+ 0: a\x{0a}\x{0d}\x{85}\x{0c}b
+
+/^a\R+b/8<bsr_unicode>
+    a\nb
+ 0: a\x{0a}b
+    a\rb
+ 0: a\x{0d}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x0bb
+ 0: a\x{0b}b
+    a\x0c\x{2028}\x{2029}b
+ 0: a\x{0c}\x{2028}\x{2029}b
+    a\x{85}b   
+ 0: a\x{85}b
+    a\n\rb    
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}\x0cb 
+ 0: a\x{0a}\x{0d}\x{85}\x{0c}b
     ** Failers
 No match
-    AXYZ
+    ab  
+No match
+
+/^a\R{1,3}b/8<bsr_unicode>
+    a\nb
+ 0: a\x{0a}b
+    a\n\rb
+ 0: a\x{0a}\x{0d}b
+    a\n\r\x{85}b
+ 0: a\x{0a}\x{0d}\x{85}b
+    a\r\n\r\nb 
+ 0: a\x{0d}\x{0a}\x{0d}\x{0a}b
+    a\r\n\r\n\r\nb 
+ 0: a\x{0d}\x{0a}\x{0d}\x{0a}\x{0d}\x{0a}b
+    a\n\r\n\rb
+ 0: a\x{0a}\x{0d}\x{0a}\x{0d}b
+    a\n\n\r\nb 
+ 0: a\x{0a}\x{0a}\x{0d}\x{0a}b
+    ** Failers
 No match
-    \x{1234}XYZ
+    a\n\n\n\rb
 No match
-    A\x{1234}XYZ
+    a\r
 No match
 
-/^\p{Any}{3,5}?/8
-    abcdefgh
- 0: abcde
- 1: abcd
- 2: abc
-    \x{1234}\n\r\x{3456}xyz 
- 0: \x{1234}\x{0a}\x{0d}\x{3456}x
- 1: \x{1234}\x{0a}\x{0d}\x{3456}
- 2: \x{1234}\x{0a}\x{0d}
+/\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}
 
-/^\p{Any}{3,5}/8
-    abcdefgh
- 0: abcde
- 1: abcd
- 2: abc
-    \x{1234}\n\r\x{3456}xyz 
- 0: \x{1234}\x{0a}\x{0d}\x{3456}x
- 1: \x{1234}\x{0a}\x{0d}\x{3456}
- 2: \x{1234}\x{0a}\x{0d}
+/\V?\v{3,4}/8 
+    \x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+ 0: X\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: X\x{0a}\x{0b}\x{0c}
 
-/^\P{Any}{3,5}?/8
-    ** Failers
-No match
-    abcdefgh
-No match
-    \x{1234}\n\r\x{3456}xyz 
-No match
+/\h+\V?\v{3,4}/8
+    >\x09\x20\x{a0}X\x0a\x0a\x0a<
+ 0: \x{09} \x{a0}X\x{0a}\x{0a}\x{0a}
 
-/^\p{L&}X/8
-     AXY
- 0: AX
-     aXY
- 0: aX
-     \x{1c5}XY
- 0: \x{1c5}X
-     ** Failers
-No match
-     \x{1bb}XY
-No match
-     \x{2b0}XY
-No match
-     !XY      
-No match
-
-/^[\p{L&}]X/8
-     AXY
- 0: AX
-     aXY
- 0: aX
-     \x{1c5}XY
- 0: \x{1c5}X
-     ** Failers
-No match
-     \x{1bb}XY
-No match
-     \x{2b0}XY
-No match
-     !XY      
-No match
+/\V?\v{3,4}/8
+    >\x09\x20\x{a0}X\x0a\x0a\x0a<
+ 0: X\x{0a}\x{0a}\x{0a}
 
-/^\p{L&}+X/8
-     AXY
- 0: AX
-     aXY
- 0: aX
-     AbcdeXyz 
- 0: AbcdeX
-     \x{1c5}AbXY
- 0: \x{1c5}AbX
-     abcDEXypqreXlmn 
- 0: abcDEXypqreX
- 1: abcDEX
-     ** Failers
+/\H\h\V\v/8
+    X X\x0a
+ 0: X X\x{0a}
+    X\x09X\x0b
+ 0: X\x{09}X\x{0b}
+    ** Failers
 No match
-     \x{1bb}XY
+    \x{a0} X\x0a   
 No match
-     \x{2b0}XY
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x09\x20\x{a0}X\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: \x{09} \x{a0}X\x{0a}\x{0b}\x{0c}
+    \x09\x20\x{a0}\x0a\x0b\x0c\x0d\x0a
+ 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}\x{0d}
+ 1: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}
+    \x09\x20\x{a0}\x0a\x0b\x0c
+ 0: \x{09} \x{a0}\x{0a}\x{0b}\x{0c}
+    ** Failers 
 No match
-     !XY      
+    \x09\x20\x{a0}\x0a\x0b
 No match
-
-/^[\p{L&}]+X/8
-     AXY
- 0: AX
-     aXY
- 0: aX
-     AbcdeXyz 
- 0: AbcdeX
-     \x{1c5}AbXY
- 0: \x{1c5}AbX
-     abcDEXypqreXlmn 
- 0: abcDEXypqreX
- 1: abcDEX
-     ** Failers
+     
+/\H\h\V\v/8
+    \x{3001}\x{3000}\x{2030}\x{2028}
+ 0: \x{3001}\x{3000}\x{2030}\x{2028}
+    X\x{180e}X\x{85}
+ 0: X\x{180e}X\x{85}
+    ** Failers
 No match
-     \x{1bb}XY
+    \x{2009} X\x0a   
 No match
-     \x{2b0}XY
+    
+/\H*\h+\V?\v{3,4}/8 
+    \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x0c\x0d\x0a
+ 0: \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x{0c}\x{0d}
+ 1: \x{1680}\x{180e}\x{2007}X\x{2028}\x{2029}\x{0c}
+    \x09\x{205f}\x{a0}\x0a\x{2029}\x0c\x{2028}\x0a
+ 0: \x{09}\x{205f}\x{a0}\x{0a}\x{2029}\x{0c}\x{2028}
+ 1: \x{09}\x{205f}\x{a0}\x{0a}\x{2029}\x{0c}
+    \x09\x20\x{202f}\x0a\x0b\x0c
+ 0: \x{09} \x{202f}\x{0a}\x{0b}\x{0c}
+    ** Failers 
 No match
-     !XY      
+    \x09\x{200a}\x{a0}\x{2028}\x0b
 No match
-
-/^\p{L&}+?X/8
-     AXY
- 0: AX
-     aXY
- 0: aX
-     AbcdeXyz 
- 0: AbcdeX
-     \x{1c5}AbXY
- 0: \x{1c5}AbX
-     abcDEXypqreXlmn 
- 0: abcDEXypqreX
- 1: abcDEX
-     ** Failers
+     
+/a\Rb/I8<bsr_anycrlf>
+Capturing subpattern count = 0
+Options: bsr_anycrlf utf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    ** Failers
 No match
-     \x{1bb}XY
+    a\x{85}b
+No match
+    a\x0bb     
+No match
+
+/a\Rb/I8<bsr_unicode>
+Capturing subpattern count = 0
+Options: bsr_unicode utf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x{85}b
+ 0: a\x{85}b
+    a\x0bb     
+ 0: a\x{0b}b
+    ** Failers 
 No match
-     \x{2b0}XY
+    a\x{85}b\<bsr_anycrlf>
 No match
-     !XY      
+    a\x0bb\<bsr_anycrlf>
 No match
-
-/^[\p{L&}]+?X/8
-     AXY
- 0: AX
-     aXY
- 0: aX
-     AbcdeXyz 
- 0: AbcdeX
-     \x{1c5}AbXY
- 0: \x{1c5}AbX
-     abcDEXypqreXlmn 
- 0: abcDEXypqreX
- 1: abcDEX
-     ** Failers
+    
+/a\R?b/I8<bsr_anycrlf>
+Capturing subpattern count = 0
+Options: bsr_anycrlf utf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    ** Failers
 No match
-     \x{1bb}XY
+    a\x{85}b
+No match
+    a\x0bb     
+No match
+
+/a\R?b/I8<bsr_unicode>
+Capturing subpattern count = 0
+Options: bsr_unicode utf
+First char = 'a'
+Need char = 'b'
+    a\rb
+ 0: a\x{0d}b
+    a\nb
+ 0: a\x{0a}b
+    a\r\nb
+ 0: a\x{0d}\x{0a}b
+    a\x{85}b
+ 0: a\x{85}b
+    a\x0bb     
+ 0: a\x{0b}b
+    ** Failers 
 No match
-     \x{2b0}XY
+    a\x{85}b\<bsr_anycrlf>
 No match
-     !XY      
+    a\x0bb\<bsr_anycrlf>
 No match
+ 
+/X/8f<any> 
+    A\x{1ec5}ABCXYZ
+ 0: X
 
-/^\P{L&}X/8
-     !XY
- 0: !X
-     \x{1bb}XY
- 0: \x{1bb}X
-     \x{2b0}XY
- 0: \x{2b0}X
-     ** Failers
-No match
-     \x{1c5}XY
-No match
-     AXY      
-No match
+/abcd*/8
+    xxxxabcd\P
+ 0: abcd
+ 1: abc
+    xxxxabcd\P\P
+Partial match: abcd
 
-/^[\P{L&}]X/8
-     !XY
- 0: !X
-     \x{1bb}XY
- 0: \x{1bb}X
-     \x{2b0}XY
- 0: \x{2b0}X
-     ** Failers
-No match
-     \x{1c5}XY
-No match
-     AXY      
-No match
+/abcd*/i8
+    xxxxabcd\P
+ 0: abcd
+ 1: abc
+    xxxxabcd\P\P
+Partial match: abcd
+    XXXXABCD\P
+ 0: ABCD
+ 1: ABC
+    XXXXABCD\P\P
+Partial match: ABCD
+
+/abc\d*/8
+    xxxxabc1\P
+ 0: abc1
+ 1: abc
+    xxxxabc1\P\P
+Partial match: abc1
 
-/^\x{023a}+?(\x{0130}+)/8i
-  \x{023a}\x{2c65}\x{0130}
- 0: \x{23a}\x{2c65}\x{130}
+/abc[de]*/8
+    xxxxabcde\P
+ 0: abcde
+ 1: abcd
+ 2: abc
+    xxxxabcde\P\P
+Partial match: abcde
+
+/\bthe cat\b/8
+    the cat\P
+ 0: the cat
+    the cat\P\P
+Partial match: the cat
+
+/ab\Cde/8
+    abXde
+Error -16 (item unsupported for DFA matching)
+
+/(?<=ab\Cde)X/8
+Failed: \C not allowed in lookbehind assertion at offset 10
+
+/./8<CRLF>
+    \r\P
+ 0: \x{0d}
+    \r\P\P 
+Partial match: \x{0d}
   
-/^\x{023a}+([^X])/8i
-  \x{023a}\x{2c65}X
- 0: \x{23a}\x{2c65}
- 
-/Check property support in non-UTF-8 mode/
- 
-/\p{L}{4}/
-    123abcdefg
- 0: abcd
-    123abc\xc4\xc5zz
- 0: abc\xc4
+/.{2,3}/8<CRLF>
+    \r\P 
+Partial match: \x{0d}
+    \r\P\P
+Partial match: \x{0d}
+    \r\r\P
+ 0: \x{0d}\x{0d}
+    \r\r\P\P
+Partial match: \x{0d}\x{0d}
+    \r\r\r\P
+ 0: \x{0d}\x{0d}\x{0d}
+ 1: \x{0d}\x{0d}
+    \r\r\r\P\P     
+Partial match: \x{0d}\x{0d}\x{0d}
+
+/.{2,3}?/8<CRLF>
+    \r\P 
+Partial match: \x{0d}
+    \r\P\P
+Partial match: \x{0d}
+    \r\r\P
+ 0: \x{0d}\x{0d}
+    \r\r\P\P
+Partial match: \x{0d}\x{0d}
+    \r\r\r\P
+ 0: \x{0d}\x{0d}\x{0d}
+ 1: \x{0d}\x{0d}
+    \r\r\r\P\P     
+Partial match: \x{0d}\x{0d}\x{0d}
+
+/[^\x{100}]/8
+    \x{100}\x{101}X
+ 0: \x{101}
+
+/[^\x{100}]+/8
+    \x{100}\x{101}X
+ 0: \x{101}X
+ 1: \x{101}
 
-/ End / 
+/-- End of testinput9 --/ 
diff --git a/lib/stdlib/test/re_testoutput1_replacement_test.erl b/lib/stdlib/test/re_testoutput1_replacement_test.erl
index 8f8d8762ad..e475b180eb 100644
--- a/lib/stdlib/test/re_testoutput1_replacement_test.erl
+++ b/lib/stdlib/test/re_testoutput1_replacement_test.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,697 +19,755 @@
 -module(re_testoutput1_replacement_test).
 -compile(export_all).
 -compile(no_native).
--include("test_server.hrl").
 %% This file is generated by running run_pcre_tests:gen_repl_test("re_SUITE_data/testoutput1")
 run() ->
-?line <<"WkCthe quick brown foxtthe quick brown foxjthe quick brown foxPpfmthe quick brown foxthe quick brown foxy">> = iolist_to_binary(re:replace("the quick brown fox","the quick brown fox","WkC&t\\1\\1&j&Ppfm&&y",[])), 
-?line <<"WkCthe quick brown foxtthe quick brown foxjthe quick brown foxPpfmthe quick brown foxthe quick brown foxy">> = iolist_to_binary(re:replace("the quick brown fox","the quick brown fox","WkC&t\\1\\1&j&Ppfm&&y",[global])), 
-?line <<"The quick brown FOX">> = iolist_to_binary(re:replace("The quick brown FOX","the quick brown fox","in&&CSwx",[])), 
-?line <<"The quick brown FOX">> = iolist_to_binary(re:replace("The quick brown FOX","the quick brown fox","in&&CSwx",[global])), 
-?line <<"What do you know about ORtMvuTRHtLthe quick brown foxiYthe quick brown foxGi?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","the quick brown fox","ORtMvuTRHtL&iY&Gi",[])), 
-?line <<"What do you know about ORtMvuTRHtLthe quick brown foxiYthe quick brown foxGi?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","the quick brown fox","ORtMvuTRHtL&iY&Gi",[global])), 
-?line <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","the quick brown fox","\\1nfTnvooMaxHdXgGO",[])), 
-?line <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","the quick brown fox","\\1nfTnvooMaxHdXgGO",[global])), 
-?line <<"hSniFQTqBU">> = iolist_to_binary(re:replace("the quick brown fox","The quick brown fox","hSniFQTqBU",[caseless])), 
-?line <<"hSniFQTqBU">> = iolist_to_binary(re:replace("the quick brown fox","The quick brown fox","hSniFQTqBU",[caseless,
-                                                                                                                                                                                                                                           global])), 
-?line <<"q">> = iolist_to_binary(re:replace("The quick brown FOX","The quick brown fox","q",[caseless])), 
-?line <<"q">> = iolist_to_binary(re:replace("The quick brown FOX","The quick brown fox","q",[caseless,
-                                                                                                                                                                                                                         global])), 
-?line <<"What do you know about uJnke?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","The quick brown fox","uJ\\1nke",[caseless])), 
-?line <<"What do you know about uJnke?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","The quick brown fox","uJ\\1nke",[caseless,
-                                                                                                                                                                                                                                                                                        global])), 
-?line <<"What do you know about VRUTHE QUICK BROWN FOXYgJqUVfiTHE QUICK BROWN FOXqb?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","The quick brown fox","VRU&YgJqUVfi&\\1qb",[caseless])), 
-?line <<"What do you know about VRUTHE QUICK BROWN FOXYgJqUVfiTHE QUICK BROWN FOXqb?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","The quick brown fox","VRU&YgJqUVfi&\\1qb",[caseless,
-                                                                                                                                                                                                                                                                                                              global])), 
-?line <<"jeUmEaUYOfHpPURCabcd	
-
9;$\\?caxyz">> = iolist_to_binary(re:replace("abcd	
-
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz","jeUmEaUYOfHpPURC&",[])), 
-?line <<"jeUmEaUYOfHpPURCabcd	
-
9;$\\?caxyz">> = iolist_to_binary(re:replace("abcd	
-
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz","jeUmEaUYOfHpPURC&",[global])), 
-?line <<"YVh">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","YVh",[])), 
-?line <<"YVh">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","YVh",[global])), 
-?line <<"wDCxbqXSqpabxyzpqrrrabbxyyyypqAzzX">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","wDCxbqXSqp&X",[])), 
-?line <<"wDCxbqXSqpabxyzpqrrrabbxyyyypqAzzX">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","wDCxbqXSqp&X",[global])), 
-?line <<"XOnDbhuPYPfGm">> = iolist_to_binary(re:replace("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1XOnDbhuP\\1Y\\1PfGm",[])), 
-?line <<"XOnDbhuPYPfGm">> = iolist_to_binary(re:replace("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1XOnDbhuP\\1Y\\1PfGm",[global])), 
-?line <<"vgswmIcA">> = iolist_to_binary(re:replace("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","vgswmI\\1cA",[])), 
-?line <<"vgswmIcA">> = iolist_to_binary(re:replace("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","vgswmI\\1cA",[global])), 
-?line <<"YaaaabxyzpqrrrabbxyyyypqAzzOXXRaa">> = iolist_to_binary(re:replace("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Y&OXXRaa",[])), 
-?line <<"YaaaabxyzpqrrrabbxyyyypqAzzOXXRaa">> = iolist_to_binary(re:replace("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Y&OXXRaa",[global])), 
-?line <<"CAeqsXe">> = iolist_to_binary(re:replace("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1CAeq\\1s\\1Xe",[])), 
-?line <<"CAeqsXe">> = iolist_to_binary(re:replace("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1CAeq\\1s\\1Xe",[global])), 
-?line <<"cDLaApdgW">> = iolist_to_binary(re:replace("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","cDLaApdgW",[])), 
-?line <<"cDLaApdgW">> = iolist_to_binary(re:replace("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","cDLaApdgW",[global])), 
-?line <<"aLfXiUYS">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","aLf\\1XiUYS",[])), 
-?line <<"aLfXiUYS">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","aLf\\1XiUYS",[global])), 
-?line <<"aaabcxyzpqrrrabbxyyyypqAzzBcaaabcxyzpqrrrabbxyyyypqAzzDAyoYqGn">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1&Bc&DAyoYqGn",[])), 
-?line <<"aaabcxyzpqrrrabbxyyyypqAzzBcaaabcxyzpqrrrabbxyyyypqAzzDAyoYqGn">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1&Bc&DAyoYqGn",[global])), 
-?line <<"aaabcxyzpqrrrabbxyyyypqqAzzijaaabcxyzpqrrrabbxyyyypqqAzzdIBcB">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&ij&dI\\1BcB",[])), 
-?line <<"aaabcxyzpqrrrabbxyyyypqqAzzijaaabcxyzpqrrrabbxyyyypqqAzzdIBcB">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&ij&dI\\1BcB",[global])), 
-?line <<"qrxTuPSgEjNvkaaabcxyzpqrrrabbxyyyypqqqAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1qrx\\1\\1TuPSgEjNvk&",[])), 
-?line <<"qrxTuPSgEjNvkaaabcxyzpqrrrabbxyyyypqqqAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1qrx\\1\\1TuPSgEjNvk&",[global])), 
-?line <<"oWxyrN">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1oWx\\1y\\1rN",[])), 
-?line <<"oWxyrN">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1oWx\\1y\\1rN",[global])), 
-?line <<"TPbeAcarX">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1T\\1PbeAcarX",[])), 
-?line <<"TPbeAcarX">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1T\\1PbeAcarX",[global])), 
-?line <<"xWhhgaaabcxyzpqrrrabbxyyyypqqqqqqAzzsHcQaaabcxyzpqrrrabbxyyyypqqqqqqAzzAeU">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","xWh\\1hg&sHcQ&AeU",[])), 
-?line <<"xWhhgaaabcxyzpqrrrabbxyyyypqqqqqqAzzsHcQaaabcxyzpqrrrabbxyyyypqqqqqqAzzAeU">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","xWh\\1hg&sHcQ&AeU",[global])), 
-?line <<"HasuDgVdEpaaaabcxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Hasu\\1\\1DgV\\1dEp&",[])), 
-?line <<"HasuDgVdEpaaaabcxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Hasu\\1\\1DgV\\1dEp&",[global])), 
-?line <<"XWMcabxyzzpqrrrabbxyyyypqAzzIUK">> = iolist_to_binary(re:replace("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XWMc&\\1IUK",[])), 
-?line <<"XWMcabxyzzpqrrrabbxyyyypqAzzIUK">> = iolist_to_binary(re:replace("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XWMc&\\1IUK",[global])), 
-?line <<"UBljDAPnposGdT">> = iolist_to_binary(re:replace("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","UBljDAPnposGdT",[])), 
-?line <<"UBljDAPnposGdT">> = iolist_to_binary(re:replace("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","UBljDAPnposGdT",[global])), 
-?line <<"boTxGt">> = iolist_to_binary(re:replace("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","boTxGt",[])), 
-?line <<"boTxGt">> = iolist_to_binary(re:replace("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","boTxGt",[global])), 
-?line <<"mnBWBx">> = iolist_to_binary(re:replace("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","mnB\\1\\1WBx",[])), 
-?line <<"mnBWBx">> = iolist_to_binary(re:replace("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","mnB\\1\\1WBx",[global])), 
-?line <<"lcgIVpnY">> = iolist_to_binary(re:replace("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","lcgIVpnY\\1",[])), 
-?line <<"lcgIVpnY">> = iolist_to_binary(re:replace("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","lcgIVpnY\\1",[global])), 
-?line <<"aabcxyzzzpqrrrabbxyyyypqAzznutiQsQaabcxyzzzpqrrrabbxyyyypqAzzokm">> = iolist_to_binary(re:replace("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&n\\1\\1utiQsQ&o\\1km",[])), 
-?line <<"aabcxyzzzpqrrrabbxyyyypqAzznutiQsQaabcxyzzzpqrrrabbxyyyypqAzzokm">> = iolist_to_binary(re:replace("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&n\\1\\1utiQsQ&o\\1km",[global])), 
-?line <<"rshbaaabcxyzzzzpqrrrabbxyyyypqAzzyCaaabcxyzzzzpqrrrabbxyyyypqAzzFuphTaaabcxyzzzzpqrrrabbxyyyypqAzzb">> = iolist_to_binary(re:replace("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","rshb&yC&FuphT&b",[])), 
-?line <<"rshbaaabcxyzzzzpqrrrabbxyyyypqAzzyCaaabcxyzzzzpqrrrabbxyyyypqAzzFuphTaaabcxyzzzzpqrrrabbxyyyypqAzzb">> = iolist_to_binary(re:replace("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","rshb&yC&FuphT&b",[global])), 
-?line <<"aaaabcxyzzzzpqrrrabbxyyyypqAzzDpUaaaabcxyzzzzpqrrrabbxyyyypqAzzWxWLwIQUnS">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&DpU&WxW\\1LwIQUnS",[])), 
-?line <<"aaaabcxyzzzzpqrrrabbxyyyypqAzzDpUaaaabcxyzzzzpqrrrabbxyyyypqAzzWxWLwIQUnS">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&DpU&WxW\\1LwIQUnS",[global])), 
-?line <<"maaaabcxyzzzzpqrrrabbbxyyyypqAzzaaaabcxyzzzzpqrrrabbbxyyyypqAzzdV">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","m\\1&&dV",[])), 
-?line <<"maaaabcxyzzzzpqrrrabbbxyyyypqAzzaaaabcxyzzzzpqrrrabbbxyyyypqAzzdV">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","m\\1&&dV",[global])), 
-?line <<"qABAquMpjbGrEQl">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","qAB\\1A\\1quMpjbGrEQl",[])), 
-?line <<"qABAquMpjbGrEQl">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","qAB\\1A\\1quMpjbGrEQl",[global])), 
-?line <<"XEmwtsQHVhnjgxANa">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XEmw\\1tsQHVhn\\1jgx\\1ANa",[])), 
-?line <<"XEmwtsQHVhnjgxANa">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XEmw\\1tsQHVhn\\1jgx\\1ANa",[global])), 
-?line <<"agMMGdMqblL">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","agMMGdMq\\1blL\\1",[])), 
-?line <<"agMMGdMqblL">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","agMMGdMq\\1blL\\1",[global])), 
-?line <<">>>EFCLJKUGJXH">> = iolist_to_binary(re:replace(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","EFCLJKUGJXH",[])), 
-?line <<">>>EFCLJKUGJXH">> = iolist_to_binary(re:replace(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","EFCLJKUGJXH",[global])), 
-?line <<">IW">> = iolist_to_binary(re:replace(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1IW",[])), 
-?line <<">IW">> = iolist_to_binary(re:replace(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1IW",[global])), 
-?line <<">>>>uiixDteuEA">> = iolist_to_binary(re:replace(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1uiixD\\1teuEA",[])), 
-?line <<">>>>uiixDteuEA">> = iolist_to_binary(re:replace(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1uiixD\\1teuEA",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","vayXo\\1eo\\1H",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","vayXo\\1eo\\1H",[global])), 
-?line <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","nJK",[])), 
-?line <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","nJK",[global])), 
-?line <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","msrV\\1",[])), 
-?line <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","msrV\\1",[global])), 
-?line <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","nVAVmEdY&rfTu",[])), 
-?line <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","nVAVmEdY&rfTu",[global])), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&G&\\1eyiM",[])), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&G&\\1eyiM",[global])), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","AIYq\\1nFUePr&s\\1s",[])), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","AIYq\\1nFUePr&s\\1s",[global])), 
-?line <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","G\\1\\1XF\\1XcTk&D&Vd",[])), 
-?line <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","G\\1\\1XF\\1XcTk&D&Vd",[global])), 
-?line <<"NMabcYpabcatqabczzabczzReBo">> = iolist_to_binary(re:replace("abczz","^(abc){1,2}zz","NM\\1Yp\\1atq&&ReBo",[])), 
-?line <<"NMabcYpabcatqabczzabczzReBo">> = iolist_to_binary(re:replace("abczz","^(abc){1,2}zz","NM\\1Yp\\1atq&&ReBo",[global])), 
-?line <<"PabcabczzabcsubxWpWrabcCabcabczzBDsb">> = iolist_to_binary(re:replace("abcabczz","^(abc){1,2}zz","P&\\1subxWpWr\\1C&BDsb",[])), 
-?line <<"PabcabczzabcsubxWpWrabcCabcabczzBDsb">> = iolist_to_binary(re:replace("abcabczz","^(abc){1,2}zz","P&\\1subxWpWr\\1C&BDsb",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(abc){1,2}zz","u&MSQ\\1MwaXNEFxKb\\1v\\1r",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(abc){1,2}zz","u&MSQ\\1MwaXNEFxKb\\1v\\1r",[global])), 
-?line <<"zz">> = iolist_to_binary(re:replace("zz","^(abc){1,2}zz","&XIfLMiKJsG&X",[])), 
-?line <<"zz">> = iolist_to_binary(re:replace("zz","^(abc){1,2}zz","&XIfLMiKJsG&X",[global])), 
-?line <<"abcabcabczz">> = iolist_to_binary(re:replace("abcabcabczz","^(abc){1,2}zz","k\\1S&UT&HR\\1\\1MHKIh&mv",[])), 
-?line <<"abcabcabczz">> = iolist_to_binary(re:replace("abcabcabczz","^(abc){1,2}zz","k\\1S&UT&HR\\1\\1MHKIh&mv",[global])), 
-?line <<">>abczz">> = iolist_to_binary(re:replace(">>abczz","^(abc){1,2}zz","R\\1GKCdWtC&\\1ULoV",[])), 
-?line <<">>abczz">> = iolist_to_binary(re:replace(">>abczz","^(abc){1,2}zz","R\\1GKCdWtC&\\1ULoV",[global])), 
-?line <<"bcbcvRuVbMbcbcOSuQfOJbc">> = iolist_to_binary(re:replace("bc","^(b+?|a){1,2}?c","&bcvRuV\\1M&&OSuQfOJ\\1c",[])), 
-?line <<"bcbcvRuVbMbcbcOSuQfOJbc">> = iolist_to_binary(re:replace("bc","^(b+?|a){1,2}?c","&bcvRuV\\1M&&OSuQfOJ\\1c",[global])), 
-?line <<"L">> = iolist_to_binary(re:replace("bbc","^(b+?|a){1,2}?c","L",[])), 
-?line <<"L">> = iolist_to_binary(re:replace("bbc","^(b+?|a){1,2}?c","L",[global])), 
-?line <<"pFFAeA">> = iolist_to_binary(re:replace("bbbc","^(b+?|a){1,2}?c","pFFAeA",[])), 
-?line <<"pFFAeA">> = iolist_to_binary(re:replace("bbbc","^(b+?|a){1,2}?c","pFFAeA",[global])), 
-?line <<"OpEK">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","OpEK",[])), 
-?line <<"OpEK">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","OpEK",[global])), 
-?line <<"bbacQeabbactAVaalybbacdBwbbac">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","&Qe\\1&tAV\\1\\1ly&dBw&",[])), 
-?line <<"bbacQeabbactAVaalybbacdBwbbac">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","&Qe\\1&tAV\\1\\1ly&dBw&",[global])), 
-?line <<"atVuxqLMNgBtlattKaT">> = iolist_to_binary(re:replace("aac","^(b+?|a){1,2}?c","\\1tVuxqLMNgBtl\\1ttKaT",[])), 
-?line <<"atVuxqLMNgBtlattKaT">> = iolist_to_binary(re:replace("aac","^(b+?|a){1,2}?c","\\1tVuxqLMNgBtl\\1ttKaT",[global])), 
-?line <<"Y">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+?|a){1,2}?c","Y",[])), 
-?line <<"Y">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+?|a){1,2}?c","Y",[global])), 
-?line <<"bbbbbbbbbbbactDhmKI">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+?|a){1,2}?c","&tDhmKI",[])), 
-?line <<"bbbbbbbbbbbactDhmKI">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+?|a){1,2}?c","&tDhmKI",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+?|a){1,2}?c","qVVVR&C\\1&etAsmWh",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+?|a){1,2}?c","qVVVR&C\\1&etAsmWh",[global])), 
-?line <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+?|a){1,2}?c","jD\\1&q&KCdV&RhT",[])), 
-?line <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+?|a){1,2}?c","jD\\1&q&KCdV&RhT",[global])), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+?|a){1,2}?c","\\1jT&nRG",[])), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+?|a){1,2}?c","\\1jT&nRG",[global])), 
-?line <<"bcXfvbIubUfhmIRev">> = iolist_to_binary(re:replace("bc","^(b+|a){1,2}c","&Xfv\\1IubUfhmIRev",[])), 
-?line <<"bcXfvbIubUfhmIRev">> = iolist_to_binary(re:replace("bc","^(b+|a){1,2}c","&Xfv\\1IubUfhmIRev",[global])), 
-?line <<"EbbbbcwbbWbbcVuAOqROLkbbcwbbc">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}c","E\\1&w\\1W&VuAOqROLk&w&",[])), 
-?line <<"EbbbbcwbbWbbcVuAOqROLkbbcwbbc">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}c","E\\1&w\\1W&VuAOqROLk&w&",[global])), 
-?line <<"I">> = iolist_to_binary(re:replace("bbbc","^(b+|a){1,2}c","I",[])), 
-?line <<"I">> = iolist_to_binary(re:replace("bbbc","^(b+|a){1,2}c","I",[global])), 
-?line <<"dctSELQIPb">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}c","dctSELQIPb",[])), 
-?line <<"dctSELQIPb">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}c","dctSELQIPb",[global])), 
-?line <<"kbdarKarpbbacbbacbDO">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}c","kbd\\1rK\\1rp&&bDO",[])), 
-?line <<"kbdarKarpbbacbbacbDO">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}c","kbd\\1rK\\1rp&&bDO",[global])), 
-?line <<"aFIlpaasKQWsFRadP">> = iolist_to_binary(re:replace("aac","^(b+|a){1,2}c","\\1FIlp\\1\\1sKQWsFR\\1dP",[])), 
-?line <<"aFIlpaasKQWsFRadP">> = iolist_to_binary(re:replace("aac","^(b+|a){1,2}c","\\1FIlp\\1\\1sKQWsFR\\1dP",[global])), 
-?line <<"bbbbbbbbbbbfbbbbbbbbbbbHo">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+|a){1,2}c","\\1f\\1Ho",[])), 
-?line <<"bbbbbbbbbbbfbbbbbbbbbbbHo">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+|a){1,2}c","\\1f\\1Ho",[global])), 
-?line <<"bbbbbbbbbbbacOuqvbbbbbbbbbbbaclVwIa">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+|a){1,2}c","&Ouqv&lVwI\\1",[])), 
-?line <<"bbbbbbbbbbbacOuqvbbbbbbbbbbbaclVwIa">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+|a){1,2}c","&Ouqv&lVwI\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+|a){1,2}c","\\1sSSP\\1Tw&R&byI\\1TN",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+|a){1,2}c","\\1sSSP\\1Tw&R&byI\\1TN",[global])), 
-?line <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+|a){1,2}c","lBeqV\\1ygD\\1oXXqs",[])), 
-?line <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+|a){1,2}c","lBeqV\\1ygD\\1oXXqs",[global])), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+|a){1,2}c","HVL\\1kIEVrx\\1hyh\\1&eY\\1R",[])), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+|a){1,2}c","HVL\\1kIEVrx\\1hyh\\1&eY\\1R",[global])), 
-?line <<"ScHjJbbcrs">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}?bc","ScHjJ&rs",[])), 
-?line <<"ScHjJbbcrs">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}?bc","ScHjJ&rs",[global])), 
-?line <<"xbabcCeyVbabcbaXLUCoov">> = iolist_to_binary(re:replace("babc","^(b*|ba){1,2}?bc","x&CeyV&\\1XLUCoov",[])), 
-?line <<"xbabcCeyVbabcbaXLUCoov">> = iolist_to_binary(re:replace("babc","^(b*|ba){1,2}?bc","x&CeyV&\\1XLUCoov",[global])), 
-?line <<"HbPsbrWbbabcba">> = iolist_to_binary(re:replace("bbabc","^(b*|ba){1,2}?bc","HbPsbrW&\\1",[])), 
-?line <<"HbPsbrWbbabcba">> = iolist_to_binary(re:replace("bbabc","^(b*|ba){1,2}?bc","HbPsbrW&\\1",[global])), 
-?line <<"IpbababcRBSkmAw">> = iolist_to_binary(re:replace("bababc","^(b*|ba){1,2}?bc","Ip&RBSkmAw",[])), 
-?line <<"IpbababcRBSkmAw">> = iolist_to_binary(re:replace("bababc","^(b*|ba){1,2}?bc","Ip&RBSkmAw",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b*|ba){1,2}?bc","e\\1\\1Tx",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b*|ba){1,2}?bc","e\\1\\1Tx",[global])), 
-?line <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(b*|ba){1,2}?bc","llyNxYhfjNKiNYM\\1&Ko",[])), 
-?line <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(b*|ba){1,2}?bc","llyNxYhfjNKiNYM\\1&Ko",[global])), 
-?line <<"babababc">> = iolist_to_binary(re:replace("babababc","^(b*|ba){1,2}?bc","R&TKD\\1JpYJGqtjf",[])), 
-?line <<"babababc">> = iolist_to_binary(re:replace("babababc","^(b*|ba){1,2}?bc","R&TKD\\1JpYJGqtjf",[global])), 
-?line <<"babcfHFubaafbYLoJba">> = iolist_to_binary(re:replace("babc","^(ba|b*){1,2}?bc","&fHFu\\1afbYLoJ\\1",[])), 
-?line <<"babcfHFubaafbYLoJba">> = iolist_to_binary(re:replace("babc","^(ba|b*){1,2}?bc","&fHFu\\1afbYLoJ\\1",[global])), 
-?line <<"ewhbbabc">> = iolist_to_binary(re:replace("bbabc","^(ba|b*){1,2}?bc","ewh&",[])), 
-?line <<"ewhbbabc">> = iolist_to_binary(re:replace("bbabc","^(ba|b*){1,2}?bc","ewh&",[global])), 
-?line <<"L">> = iolist_to_binary(re:replace("bababc","^(ba|b*){1,2}?bc","L",[])), 
-?line <<"L">> = iolist_to_binary(re:replace("bababc","^(ba|b*){1,2}?bc","L",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ba|b*){1,2}?bc","\\1wv",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ba|b*){1,2}?bc","\\1wv",[global])), 
-?line <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(ba|b*){1,2}?bc","&F",[])), 
-?line <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(ba|b*){1,2}?bc","&F",[global])), 
-?line <<"babababc">> = iolist_to_binary(re:replace("babababc","^(ba|b*){1,2}?bc","Yk",[])), 
-?line <<"babababc">> = iolist_to_binary(re:replace("babababc","^(ba|b*){1,2}?bc","Yk",[global])), 
-?line <<"rdI

;zTYuI

;zcdx">> = iolist_to_binary(re:replace("

;z","^\\ca\\cA\\c[\\c{\\c:","rdI&TYuI&cdx\\1",[])), 
-?line <<"rdI

;zTYuI

;zcdx">> = iolist_to_binary(re:replace("

;z","^\\ca\\cA\\c[\\c{\\c:","rdI&TYuI&cdx\\1",[global])), 
-?line <<"XgOhHATXLthing">> = iolist_to_binary(re:replace("athing","^[ab\\]cde]","XgO\\1hHATXL",[])), 
-?line <<"XgOhHATXLthing">> = iolist_to_binary(re:replace("athing","^[ab\\]cde]","XgO\\1hHATXL",[global])), 
-?line <<"xIBYFthing">> = iolist_to_binary(re:replace("bthing","^[ab\\]cde]","xIBYF",[])), 
-?line <<"xIBYFthing">> = iolist_to_binary(re:replace("bthing","^[ab\\]cde]","xIBYF",[global])), 
-?line <<"]lthing">> = iolist_to_binary(re:replace("]thing","^[ab\\]cde]","&l",[])), 
-?line <<"]lthing">> = iolist_to_binary(re:replace("]thing","^[ab\\]cde]","&l",[global])), 
-?line <<"qbsthing">> = iolist_to_binary(re:replace("cthing","^[ab\\]cde]","\\1qbs",[])), 
-?line <<"qbsthing">> = iolist_to_binary(re:replace("cthing","^[ab\\]cde]","\\1qbs",[global])), 
-?line <<"gyOCYsthing">> = iolist_to_binary(re:replace("dthing","^[ab\\]cde]","gyOCYs",[])), 
-?line <<"gyOCYsthing">> = iolist_to_binary(re:replace("dthing","^[ab\\]cde]","gyOCYs",[global])), 
-?line <<"DrUmPIeSUthing">> = iolist_to_binary(re:replace("ething","^[ab\\]cde]","DrUmP\\1IeSU",[])), 
-?line <<"DrUmPIeSUthing">> = iolist_to_binary(re:replace("ething","^[ab\\]cde]","DrUmP\\1IeSU",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[ab\\]cde]","Xi\\1luACtdK",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[ab\\]cde]","Xi\\1luACtdK",[global])), 
-?line <<"fthing">> = iolist_to_binary(re:replace("fthing","^[ab\\]cde]","&u&Y\\1obNLU\\1tyonhH",[])), 
-?line <<"fthing">> = iolist_to_binary(re:replace("fthing","^[ab\\]cde]","&u&Y\\1obNLU\\1tyonhH",[global])), 
-?line <<"[thing">> = iolist_to_binary(re:replace("[thing","^[ab\\]cde]","TVEAE&ooeuGQJgKnrqW",[])), 
-?line <<"[thing">> = iolist_to_binary(re:replace("[thing","^[ab\\]cde]","TVEAE&ooeuGQJgKnrqW",[global])), 
-?line <<"\\thing">> = iolist_to_binary(re:replace("\\thing","^[ab\\]cde]","vRby\\1&",[])), 
-?line <<"\\thing">> = iolist_to_binary(re:replace("\\thing","^[ab\\]cde]","vRby\\1&",[global])), 
-?line <<"]n]ExaxasbKqYi]CHthing">> = iolist_to_binary(re:replace("]thing","^[]cde]","&n&Ex\\1axa\\1sbKqYi&CH",[])), 
-?line <<"]n]ExaxasbKqYi]CHthing">> = iolist_to_binary(re:replace("]thing","^[]cde]","&n&Ex\\1axa\\1sbKqYi&CH",[global])), 
-?line <<"nLnsthing">> = iolist_to_binary(re:replace("cthing","^[]cde]","nLns",[])), 
-?line <<"nLnsthing">> = iolist_to_binary(re:replace("cthing","^[]cde]","nLns",[global])), 
-?line <<"dOETLdnanQKLkkVthing">> = iolist_to_binary(re:replace("dthing","^[]cde]","\\1&OET\\1L&nanQKLkkV",[])), 
-?line <<"dOETLdnanQKLkkVthing">> = iolist_to_binary(re:replace("dthing","^[]cde]","\\1&OET\\1L&nanQKLkkV",[global])), 
-?line <<"UKthing">> = iolist_to_binary(re:replace("ething","^[]cde]","UK",[])), 
-?line <<"UKthing">> = iolist_to_binary(re:replace("ething","^[]cde]","UK",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[]cde]","OEN&h&RDky",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[]cde]","OEN&h&RDky",[global])), 
-?line <<"athing">> = iolist_to_binary(re:replace("athing","^[]cde]","ADIYuoD\\1PwBWBN",[])), 
-?line <<"athing">> = iolist_to_binary(re:replace("athing","^[]cde]","ADIYuoD\\1PwBWBN",[global])), 
-?line <<"fthing">> = iolist_to_binary(re:replace("fthing","^[]cde]","H&UGGJFd\\1Ys\\1xgEg",[])), 
-?line <<"fthing">> = iolist_to_binary(re:replace("fthing","^[]cde]","H&UGGJFd\\1Ys\\1xgEg",[global])), 
-?line <<"yipHChvHfthing">> = iolist_to_binary(re:replace("fthing","^[^ab\\]cde]","yi\\1pHC\\1hvH&",[])), 
-?line <<"yipHChvHfthing">> = iolist_to_binary(re:replace("fthing","^[^ab\\]cde]","yi\\1pHC\\1hvH&",[global])), 
-?line <<"pthing">> = iolist_to_binary(re:replace("[thing","^[^ab\\]cde]","p",[])), 
-?line <<"pthing">> = iolist_to_binary(re:replace("[thing","^[^ab\\]cde]","p",[global])), 
-?line <<"nvbthing">> = iolist_to_binary(re:replace("\\thing","^[^ab\\]cde]","n\\1v\\1b",[])), 
-?line <<"nvbthing">> = iolist_to_binary(re:replace("\\thing","^[^ab\\]cde]","n\\1v\\1b",[global])), 
-?line <<"o*r*CQayoALTVo** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^ab\\]cde]","o&r&CQa\\1yoALTVo\\1",[])), 
-?line <<"o*r*CQayoALTVo** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^ab\\]cde]","o&r&CQa\\1yoALTVo\\1",[global])), 
-?line <<"athing">> = iolist_to_binary(re:replace("athing","^[^ab\\]cde]","k\\1&MCQ",[])), 
-?line <<"athing">> = iolist_to_binary(re:replace("athing","^[^ab\\]cde]","k\\1&MCQ",[global])), 
-?line <<"bthing">> = iolist_to_binary(re:replace("bthing","^[^ab\\]cde]","XKeFQEPnv",[])), 
-?line <<"bthing">> = iolist_to_binary(re:replace("bthing","^[^ab\\]cde]","XKeFQEPnv",[global])), 
-?line <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^ab\\]cde]","\\1",[])), 
-?line <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^ab\\]cde]","\\1",[global])), 
-?line <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^ab\\]cde]","NU",[])), 
-?line <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^ab\\]cde]","NU",[global])), 
-?line <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^ab\\]cde]","GVUo\\1m&I",[])), 
-?line <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^ab\\]cde]","GVUo\\1m&I",[global])), 
-?line <<"ething">> = iolist_to_binary(re:replace("ething","^[^ab\\]cde]","Ms\\1&GwiawlCHng&EEX",[])), 
-?line <<"ething">> = iolist_to_binary(re:replace("ething","^[^ab\\]cde]","Ms\\1&GwiawlCHng&EEX",[global])), 
-?line <<"lqtFwcAYthing">> = iolist_to_binary(re:replace("athing","^[^]cde]","lqtFwcAY",[])), 
-?line <<"lqtFwcAYthing">> = iolist_to_binary(re:replace("athing","^[^]cde]","lqtFwcAY",[global])), 
-?line <<"Fxtpjthing">> = iolist_to_binary(re:replace("fthing","^[^]cde]","Fxt\\1pj",[])), 
-?line <<"Fxtpjthing">> = iolist_to_binary(re:replace("fthing","^[^]cde]","Fxt\\1pj",[global])), 
-?line <<"xT*oD*U** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^]cde]","xT&oD\\1&U",[])), 
-?line <<"xT*oD*U** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^]cde]","xT&oD\\1&U",[global])), 
-?line <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^]cde]","R\\1M&\\1m",[])), 
-?line <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^]cde]","R\\1M&\\1m",[global])), 
-?line <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^]cde]","\\1tF\\1WOFN&fB",[])), 
-?line <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^]cde]","\\1tF\\1WOFN&fB",[global])), 
-?line <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^]cde]","y\\1I&MoqRPG&GQa\\1l",[])), 
-?line <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^]cde]","y\\1I&MoqRPG&GQa\\1l",[global])), 
-?line <<"ething">> = iolist_to_binary(re:replace("ething","^[^]cde]","AsxwUn\\1GqkWNdgRJk",[])), 
-?line <<"ething">> = iolist_to_binary(re:replace("ething","^[^]cde]","AsxwUn\\1GqkWNdgRJk",[global])), 
-?line <<"RornKmOnaFrtWgtW">> = iolist_to_binary(re:replace("","^\\","R\\1o\\1r\\1nKmOnaFr&tWgtW",[])),
-?line <<"RornKmOnaFrtWgtW">> = iolist_to_binary(re:replace("","^\\","R\\1o\\1r\\1nKmOnaFr&tWgtW",[global])),
-?line <<"ufbmbfOYuKÿwfÿEÿdx">> = iolist_to_binary(re:replace("ÿ","^ÿ","ufbmbfOYuK&wf&E&\\1dx",[])),
-?line <<"ufbmbfOYuKÿwfÿEÿdx">> = iolist_to_binary(re:replace("ÿ","^ÿ","ufbmbfOYuK&wf&E&\\1dx",[global])),
-?line <<"oAdJme0jw">> = iolist_to_binary(re:replace("0","^[0-9]+$","oAdJme\\1&jw",[])), 
-?line <<"oAdJme0jw">> = iolist_to_binary(re:replace("0","^[0-9]+$","oAdJme\\1&jw",[global])), 
-?line <<"1aoKN">> = iolist_to_binary(re:replace("1","^[0-9]+$","&aoKN",[])), 
-?line <<"1aoKN">> = iolist_to_binary(re:replace("1","^[0-9]+$","&aoKN",[global])), 
-?line <<"tIHn">> = iolist_to_binary(re:replace("2","^[0-9]+$","tIHn\\1",[])), 
-?line <<"tIHn">> = iolist_to_binary(re:replace("2","^[0-9]+$","tIHn\\1",[global])), 
-?line <<"wgA3cJbrrCyMvMXM3">> = iolist_to_binary(re:replace("3","^[0-9]+$","wgA&cJbrrCyMv\\1M\\1XM&",[])), 
-?line <<"wgA3cJbrrCyMvMXM3">> = iolist_to_binary(re:replace("3","^[0-9]+$","wgA&cJbrrCyMv\\1M\\1XM&",[global])), 
-?line <<"huUpJ">> = iolist_to_binary(re:replace("4","^[0-9]+$","huUpJ",[])), 
-?line <<"huUpJ">> = iolist_to_binary(re:replace("4","^[0-9]+$","huUpJ",[global])), 
-?line <<"Fe5F5">> = iolist_to_binary(re:replace("5","^[0-9]+$","F\\1e&F&",[])), 
-?line <<"Fe5F5">> = iolist_to_binary(re:replace("5","^[0-9]+$","F\\1e&F&",[global])), 
-?line <<"HJ">> = iolist_to_binary(re:replace("6","^[0-9]+$","HJ",[])), 
-?line <<"HJ">> = iolist_to_binary(re:replace("6","^[0-9]+$","HJ",[global])), 
-?line <<"e">> = iolist_to_binary(re:replace("7","^[0-9]+$","e",[])), 
-?line <<"e">> = iolist_to_binary(re:replace("7","^[0-9]+$","e",[global])), 
-?line <<"Fmds88NtMX">> = iolist_to_binary(re:replace("8","^[0-9]+$","F\\1mds&&Nt\\1MX",[])), 
-?line <<"Fmds88NtMX">> = iolist_to_binary(re:replace("8","^[0-9]+$","F\\1mds&&Nt\\1MX",[global])), 
-?line <<"99cE9SqMch">> = iolist_to_binary(re:replace("9","^[0-9]+$","&&cE&\\1SqMch",[])), 
-?line <<"99cE9SqMch">> = iolist_to_binary(re:replace("9","^[0-9]+$","&&cE&\\1SqMch",[global])), 
-?line <<"xhR">> = iolist_to_binary(re:replace("10","^[0-9]+$","xhR",[])), 
-?line <<"xhR">> = iolist_to_binary(re:replace("10","^[0-9]+$","xhR",[global])), 
-?line <<"j100">> = iolist_to_binary(re:replace("100","^[0-9]+$","j&",[])), 
-?line <<"j100">> = iolist_to_binary(re:replace("100","^[0-9]+$","j&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[0-9]+$","SR&tOYsEgJid&hfCF",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[0-9]+$","SR&tOYsEgJid&hfCF",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","^[0-9]+$","JK&",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","^[0-9]+$","JK&",[global])), 
-?line <<"rXjkB">> = iolist_to_binary(re:replace("enter","^.*nter","rXjkB",[])), 
-?line <<"rXjkB">> = iolist_to_binary(re:replace("enter","^.*nter","rXjkB",[global])), 
-?line <<"oOEtqV">> = iolist_to_binary(re:replace("inter","^.*nter","oO\\1EtqV",[])), 
-?line <<"oOEtqV">> = iolist_to_binary(re:replace("inter","^.*nter","oO\\1EtqV",[global])), 
-?line <<"">> = iolist_to_binary(re:replace("uponter","^.*nter","\\1",[])), 
-?line <<"">> = iolist_to_binary(re:replace("uponter","^.*nter","\\1",[global])), 
-?line <<"SODUcOgFnbuQEN">> = iolist_to_binary(re:replace("xxx0","^xxx[0-9]+$","\\1\\1SODU\\1\\1cOgFnbuQEN",[])), 
-?line <<"SODUcOgFnbuQEN">> = iolist_to_binary(re:replace("xxx0","^xxx[0-9]+$","\\1\\1SODU\\1\\1cOgFnbuQEN",[global])), 
-?line <<"hsacOxxx1234kudxxx1234sEIrIdI">> = iolist_to_binary(re:replace("xxx1234","^xxx[0-9]+$","hsacO\\1&kud&s\\1EIrIdI\\1",[])), 
-?line <<"hsacOxxx1234kudxxx1234sEIrIdI">> = iolist_to_binary(re:replace("xxx1234","^xxx[0-9]+$","hsacO\\1&kud&s\\1EIrIdI\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^xxx[0-9]+$","e",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^xxx[0-9]+$","e",[global])), 
-?line <<"xxx">> = iolist_to_binary(re:replace("xxx","^xxx[0-9]+$","oSBYD&M",[])), 
-?line <<"xxx">> = iolist_to_binary(re:replace("xxx","^xxx[0-9]+$","oSBYD&M",[global])), 
-?line <<"x123HgGUYCx123PowSBtYb">> = iolist_to_binary(re:replace("x123","^.+[0-9][0-9][0-9]$","&HgGUYC&PowSBtY\\1b",[])), 
-?line <<"x123HgGUYCx123PowSBtYb">> = iolist_to_binary(re:replace("x123","^.+[0-9][0-9][0-9]$","&HgGUYC&PowSBtY\\1b",[global])), 
-?line <<"mEVxx123SNuYPQIaJ">> = iolist_to_binary(re:replace("xx123","^.+[0-9][0-9][0-9]$","mE\\1V\\1&SNuYPQIa\\1J",[])), 
-?line <<"mEVxx123SNuYPQIaJ">> = iolist_to_binary(re:replace("xx123","^.+[0-9][0-9][0-9]$","mE\\1V\\1&SNuYPQIa\\1J",[global])), 
-?line <<"l123456O123456">> = iolist_to_binary(re:replace("123456","^.+[0-9][0-9][0-9]$","l&O&",[])), 
-?line <<"l123456O123456">> = iolist_to_binary(re:replace("123456","^.+[0-9][0-9][0-9]$","l&O&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+[0-9][0-9][0-9]$","MX&hxvs",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+[0-9][0-9][0-9]$","MX&hxvs",[global])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^.+[0-9][0-9][0-9]$","RBYgTXkgO&TLdWqjEUps",[])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^.+[0-9][0-9][0-9]$","RBYgTXkgO&TLdWqjEUps",[global])), 
-?line <<"fgx1234">> = iolist_to_binary(re:replace("x1234","^.+[0-9][0-9][0-9]$","fg&",[])), 
-?line <<"fgx1234">> = iolist_to_binary(re:replace("x1234","^.+[0-9][0-9][0-9]$","fg&",[global])), 
-?line <<"FLbkgx123RdPrD">> = iolist_to_binary(re:replace("x123","^.+?[0-9][0-9][0-9]$","FLbkg&R\\1dPrD",[])), 
-?line <<"FLbkgx123RdPrD">> = iolist_to_binary(re:replace("x123","^.+?[0-9][0-9][0-9]$","FLbkg&R\\1dPrD",[global])), 
-?line <<"C">> = iolist_to_binary(re:replace("xx123","^.+?[0-9][0-9][0-9]$","C",[])), 
-?line <<"C">> = iolist_to_binary(re:replace("xx123","^.+?[0-9][0-9][0-9]$","C",[global])), 
-?line <<"oWjVDKTAoaLU">> = iolist_to_binary(re:replace("123456","^.+?[0-9][0-9][0-9]$","oW\\1jVDK\\1TAoaLU",[])), 
-?line <<"oWjVDKTAoaLU">> = iolist_to_binary(re:replace("123456","^.+?[0-9][0-9][0-9]$","oW\\1jVDK\\1TAoaLU",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+?[0-9][0-9][0-9]$","xA&\\1sIV",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+?[0-9][0-9][0-9]$","xA&\\1sIV",[global])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^.+?[0-9][0-9][0-9]$","ONX&",[])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^.+?[0-9][0-9][0-9]$","ONX&",[global])), 
-?line <<"oLgQtiSmGx1234wqbuoRB">> = iolist_to_binary(re:replace("x1234","^.+?[0-9][0-9][0-9]$","\\1oLgQtiSm\\1\\1G&wqbuoRB",[])), 
-?line <<"oLgQtiSmGx1234wqbuoRB">> = iolist_to_binary(re:replace("x1234","^.+?[0-9][0-9][0-9]$","\\1oLgQtiSm\\1\\1G&wqbuoRB",[global])), 
-?line <<"mcpuCvaabc!pqr=apquxz.ixr.zzz.ac.ukgabc!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","mcpuCva&g&",[])), 
-?line <<"mcpuCvaabc!pqr=apquxz.ixr.zzz.ac.ukgabc!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","mcpuCva&g&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","J&a\\1HaapJjylMMyeA\\1e",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","J&a\\1HaapJjylMMyeA\\1e",[global])), 
-?line <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","FOOFh&nQLU\\1c",[])), 
-?line <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","FOOFh&nQLU\\1c",[global])), 
-?line <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","H\\1G",[])), 
-?line <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","H\\1G",[global])), 
-?line <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","&tBS&",[])), 
-?line <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","&tBS&",[global])), 
-?line <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","Gd&\\1CN\\1",[])), 
-?line <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","Gd&\\1CN\\1",[global])), 
-?line <<"Well, we need a colonGTdcJbUips: somewhere">> = iolist_to_binary(re:replace("Well, we need a colon: somewhere",":","GTdc\\1J\\1bUips\\1&",[])), 
-?line <<"Well, we need a colonGTdcJbUips: somewhere">> = iolist_to_binary(re:replace("Well, we need a colon: somewhere",":","GTdc\\1J\\1bUips\\1&",[global])), 
-?line <<"*** Fail if we don't">> = iolist_to_binary(re:replace("*** Fail if we don't",":","d",[])), 
-?line <<"*** Fail if we don't">> = iolist_to_binary(re:replace("*** Fail if we don't",":","d",[global])), 
-?line <<"0abcDqVs0abc0abcptNR">> = iolist_to_binary(re:replace("0abc","([\\da-f:]+)$","\\1DqVs\\1\\1ptNR",[caseless])), 
-?line <<"0abcDqVs0abc0abcptNR">> = iolist_to_binary(re:replace("0abc","([\\da-f:]+)$","\\1DqVs\\1\\1ptNR",[caseless,
-                                                                                                                                                                                                                    global])), 
-?line <<"abctJK">> = iolist_to_binary(re:replace("abc","([\\da-f:]+)$","&tJK",[caseless])), 
-?line <<"abctJK">> = iolist_to_binary(re:replace("abc","([\\da-f:]+)$","&tJK",[caseless,
-                                                                                                                                                                                      global])), 
-?line <<"quighClnfedRB">> = iolist_to_binary(re:replace("fed","([\\da-f:]+)$","quighCln\\1RB",[caseless])), 
-?line <<"quighClnfedRB">> = iolist_to_binary(re:replace("fed","([\\da-f:]+)$","quighCln\\1RB",[caseless,
-                                                                                                                                                                                                        global])), 
-?line <<"ENd">> = iolist_to_binary(re:replace("E","([\\da-f:]+)$","\\1Nd",[caseless])), 
-?line <<"ENd">> = iolist_to_binary(re:replace("E","([\\da-f:]+)$","\\1Nd",[caseless,
-                                                                                                                                                                                    global])), 
-?line <<"o::U::lkIj::XoRWPah::s">> = iolist_to_binary(re:replace("::","([\\da-f:]+)$","o&U&lkIj\\1XoRWPah&s",[caseless])), 
-?line <<"o::U::lkIj::XoRWPah::s">> = iolist_to_binary(re:replace("::","([\\da-f:]+)$","o&U&lkIj\\1XoRWPah&s",[caseless,
-                                                                                                                                                                                                                       global])), 
-?line <<"ab5f03:12C0::932eONbt5f03:12C0::932ehnfLI5f03:12C0::932esqYx5f03:12C0::932e">> = iolist_to_binary(re:replace("5f03:12C0::932e","([\\da-f:]+)$","ab&ONbt\\1hnfLI\\1sqYx&",[caseless])), 
-?line <<"ab5f03:12C0::932eONbt5f03:12C0::932ehnfLI5f03:12C0::932esqYx5f03:12C0::932e">> = iolist_to_binary(re:replace("5f03:12C0::932e","([\\da-f:]+)$","ab&ONbt\\1hnfLI\\1sqYx&",[caseless,
-                                                                                                                                                                                                                                                       global])), 
-?line <<"fed OAMdefijvdef">> = iolist_to_binary(re:replace("fed def","([\\da-f:]+)$","OAM\\1ijv&",[caseless])), 
-?line <<"fed OAMdefijvdef">> = iolist_to_binary(re:replace("fed def","([\\da-f:]+)$","OAM\\1ijv&",[caseless,
-                                                                                                                                                                                                           global])), 
-?line <<"Any old stuSVffaffeYffCjDlYffhWTMo">> = iolist_to_binary(re:replace("Any old stuff","([\\da-f:]+)$","SV&a\\1eY&CjDlY&hWTMo",[caseless])), 
-?line <<"Any old stuSVffaffeYffCjDlYffhWTMo">> = iolist_to_binary(re:replace("Any old stuff","([\\da-f:]+)$","SV&a\\1eY&CjDlY&hWTMo",[caseless,
-                                                                                                                                                                                                                                               global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","([\\da-f:]+)$","j&R\\1oXiR",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","([\\da-f:]+)$","j&R\\1oXiR",[caseless,
-                                                                                                                                                                                                                   global])), 
-?line <<"0zzz">> = iolist_to_binary(re:replace("0zzz","([\\da-f:]+)$","&HUuWH\\1&VEg",[caseless])), 
-?line <<"0zzz">> = iolist_to_binary(re:replace("0zzz","([\\da-f:]+)$","&HUuWH\\1&VEg",[caseless,
-                                                                                                                                                                                                            global])), 
-?line <<"gzzz">> = iolist_to_binary(re:replace("gzzz","([\\da-f:]+)$","l&n&p&DKUsLBFC",[caseless])), 
-?line <<"gzzz">> = iolist_to_binary(re:replace("gzzz","([\\da-f:]+)$","l&n&p&DKUsLBFC",[caseless,
-                                                                                                                                                                                                              global])), 
-?line <<"fed ">> = iolist_to_binary(re:replace("fed ","([\\da-f:]+)$","KuLffd&Y",[caseless])), 
-?line <<"fed ">> = iolist_to_binary(re:replace("fed ","([\\da-f:]+)$","KuLffd&Y",[caseless,
-                                                                                                                                                                                                global])), 
-?line <<"Any old rubbish">> = iolist_to_binary(re:replace("Any old rubbish","([\\da-f:]+)$","Mid\\1",[caseless])), 
-?line <<"Any old rubbish">> = iolist_to_binary(re:replace("Any old rubbish","([\\da-f:]+)$","Mid\\1",[caseless,
+    run0(),
+    run1(),
+    run2(),
+    run3(),
+    run4(),
+    run5(),
+    run6(),
+    run7(),
+    run8(),
+    run9(),
+    run10(),
+    run11(),
+    run12(),
+    run13(),
+    run14(),
+    run15(),
+    run16(),
+    run17(),
+    run18(),
+    run19(),
+    run20(),
+    run21(),
+    run22(),
+    run23(),
+    run24(),
+    run25(),
+    run26(),
+    run27(),
+    run28(),
+    run29(),
+    run30(),
+    run31(),
+    run32(),
+    run33(),
+    run34(),
+    run35(),
+    run36(),
+    run37(),
+    run38(),
+    run39(),
+    run40(),
+    run41(),
+    run42(),
+    run43(),
+    run44(),
+    run45(),
+    run46(),
+    run47(),
+    run48(),
+    run49(),
+    run50(),
+    run51(),
+    run52(),
+    run53(),
+    run54(),
+    ok.
+run0() ->
+    <<"KXii">> = iolist_to_binary(re:replace("the quick brown fox","the quick brown fox","KXii",[])), 
+    <<"KXii">> = iolist_to_binary(re:replace("the quick brown fox","the quick brown fox","KXii",[global])), 
+    <<"The quick brown FOX">> = iolist_to_binary(re:replace("The quick brown FOX","the quick brown fox","HRC\\1&rBc&X&M\\1",[])), 
+    <<"The quick brown FOX">> = iolist_to_binary(re:replace("The quick brown FOX","the quick brown fox","HRC\\1&rBc&X&M\\1",[global])), 
+    <<"What do you know about Hthe quick brown foxgViGthe quick brown fox?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","the quick brown fox","H&gViG\\1&",[])), 
+    <<"What do you know about Hthe quick brown foxgViGthe quick brown fox?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","the quick brown fox","H&gViG\\1&",[global])), 
+    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","the quick brown fox","N&hDtbGaV",[])), 
+    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","the quick brown fox","N&hDtbGaV",[global])), 
+    <<"hQCthe quick brown foxthe quick brown foxjQpvbBuHjthe quick brown foxw">> = iolist_to_binary(re:replace("the quick brown fox","The quick brown fox","hQC&&jQ\\1pvbBuHj&w",[caseless])), 
+    <<"hQCthe quick brown foxthe quick brown foxjQpvbBuHjthe quick brown foxw">> = iolist_to_binary(re:replace("the quick brown fox","The quick brown fox","hQC&&jQ\\1pvbBuHj&w",[caseless,
+                                                                                                                                                                                                                                                               global])), 
+    <<"gkWwP">> = iolist_to_binary(re:replace("The quick brown FOX","The quick brown fox","gkWwP",[caseless])), 
+    <<"gkWwP">> = iolist_to_binary(re:replace("The quick brown FOX","The quick brown fox","gkWwP",[caseless,
+                                                                                                                                                                                                                               global])), 
+    <<"What do you know about ncBxuJXMsIrBx?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","The quick brown fox","ncBxuJXMsIr\\1Bx",[caseless])), 
+    <<"What do you know about ncBxuJXMsIrBx?">> = iolist_to_binary(re:replace("What do you know about the quick brown fox?","The quick brown fox","ncBxuJXMsIr\\1Bx",[caseless,
+                                                                                                                                                                                                                                                                                                      global])), 
+    <<"What do you know about ESkbGx?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","The quick brown fox","ESkbGx",[caseless])), 
+    <<"What do you know about ESkbGx?">> = iolist_to_binary(re:replace("What do you know about THE QUICK BROWN FOX?","The quick brown fox","ESkbGx",[caseless,
+                                                                                                                                                                                                                                                                                 global])), 
+    <<"UImxeSkabcd	
+
9;$\\?caxyzF">> = iolist_to_binary(re:replace("abcd	
+
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz","UImxeSk&F",[])), 
+    <<"UImxeSkabcd	
+
9;$\\?caxyzF">> = iolist_to_binary(re:replace("abcd	
+
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz","UImxeSk&F",[global])), 
+    <<"LhHLabxyzpqrrrabbxyyyypqAzzkWRsxabxyzpqrrrabbxyyyypqAzzVMIt">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","LhHL&kWRsx\\1\\1&VMIt",[])), 
+    <<"LhHLabxyzpqrrrabbxyyyypqAzzkWRsxabxyzpqrrrabbxyyyypqAzzVMIt">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","LhHL&kWRsx\\1\\1&VMIt",[global])), 
+    <<"HLabxyzpqrrrabbxyyyypqAzzOTupMnssabxyzpqrrrabbxyyyypqAzzJs">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","HL&OTupMnss&\\1Js",[])), 
+    <<"HLabxyzpqrrrabbxyyyypqAzzOTupMnssabxyzpqrrrabbxyyyypqAzzJs">> = iolist_to_binary(re:replace("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","HL&OTupMnss&\\1Js",[global])), 
+    <<"HrnoCAoMBaabxyzpqrrrabbxyyyypqAzzUYaabxyzpqrrrabbxyyyypqAzzXaabxyzpqrrrabbxyyyypqAzzaabxyzpqrrrabbxyyyypqAzzaabxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","HrnoCA\\1oM\\1B&\\1UY&X&&&",[])), 
+    <<"HrnoCAoMBaabxyzpqrrrabbxyyyypqAzzUYaabxyzpqrrrabbxyyyypqAzzXaabxyzpqrrrabbxyyyypqAzzaabxyzpqrrrabbxyyyypqAzzaabxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","HrnoCA\\1oM\\1B&\\1UY&X&&&",[global])), 
+    <<"aaabxyzpqrrrabbxyyyypqAzzsiD">> = iolist_to_binary(re:replace("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&siD",[])), 
+    <<"aaabxyzpqrrrabbxyyyypqAzzsiD">> = iolist_to_binary(re:replace("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&siD",[global])), 
+    <<"aaaabxyzpqrrrabbxyyyypqAzzqgRtoWloBl">> = iolist_to_binary(re:replace("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&q\\1gRt\\1oWloB\\1\\1\\1l",[])), 
+    <<"aaaabxyzpqrrrabbxyyyypqAzzqgRtoWloBl">> = iolist_to_binary(re:replace("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&q\\1gRt\\1oWloB\\1\\1\\1l",[global])), 
+    <<"sRmsQabcxyzpqrrrabbxyyyypqAzzThd">> = iolist_to_binary(re:replace("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sRmsQ&Thd",[])), 
+    <<"sRmsQabcxyzpqrrrabbxyyyypqAzzThd">> = iolist_to_binary(re:replace("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sRmsQ&Thd",[global])), 
+    <<"aabcxyzpqrrrabbxyyyypqAzzRHoaabcxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&RHo&",[])), 
+    <<"aabcxyzpqrrrabbxyyyypqAzzRHoaabcxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&RHo&",[global])), 
+    <<"kaaabcxyzpqrrrabbxyyyypAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","k\\1&",[])), 
+    <<"kaaabcxyzpqrrrabbxyyyypAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","k\\1&",[global])), 
+    <<"RxvGiseEerlAfPpFb">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","RxvGiseEerlAfPp\\1F\\1b",[])), 
+    <<"RxvGiseEerlAfPpFb">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","RxvGiseEerlAfPp\\1F\\1b",[global])), 
+    <<"sUgRgemex">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sUgR\\1gem\\1ex\\1",[])), 
+    <<"sUgRgemex">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sUgR\\1gem\\1ex\\1",[global])), 
+    <<"S">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","S",[])), 
+    <<"S">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","S",[global])), 
+    <<"QCVAHkaaabcxyzpqrrrabbxyyyypqqqqAzzCsM">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","QCVAHk&CsM",[])), 
+    <<"QCVAHkaaabcxyzpqrrrabbxyyyypqqqqAzzCsM">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","QCVAHk&CsM",[global])), 
+    <<"kV">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","kV",[])), 
+    <<"kV">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","kV",[global])), 
+    <<"sEX">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sEX",[])), 
+    <<"sEX">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sEX",[global])), 
+    <<"lgaaaabcxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1lg&",[])), 
+    <<"lgaaaabcxyzpqrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1lg&",[global])), 
+    <<"H">> = iolist_to_binary(re:replace("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","H",[])), 
+    <<"H">> = iolist_to_binary(re:replace("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","H",[global])), 
+    <<"sLyaabxyzzzpqrrrabbxyyyypqAzzJJPghXisEdXaabxyzzzpqrrrabbxyyyypqAzzS">> = iolist_to_binary(re:replace("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sLy&JJPghXi\\1sEdX&S\\1",[])), 
+    <<"sLyaabxyzzzpqrrrabbxyyyypqAzzJJPghXisEdXaabxyzzzpqrrrabbxyyyypqAzzS">> = iolist_to_binary(re:replace("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","sLy&JJPghXi\\1sEdX&S\\1",[global])), 
+    <<"">> = iolist_to_binary(re:replace("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1",[])), 
+    <<"">> = iolist_to_binary(re:replace("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1",[global])), 
+    <<"XHrPpSaaaabxyzzzzpqrrrabbxyyyypqAzzgAh">> = iolist_to_binary(re:replace("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XHr\\1PpS&gAh",[])), 
+    <<"XHrPpSaaaabxyzzzzpqrrrabbxyyyypqAzzgAh">> = iolist_to_binary(re:replace("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XHr\\1PpS&gAh",[global])), 
+    <<"NeJBabcxyzzpqrrrabbxyyyypqAzzGo">> = iolist_to_binary(re:replace("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","NeJB&Go",[])), 
+    <<"NeJBabcxyzzpqrrrabbxyyyypqAzzGo">> = iolist_to_binary(re:replace("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","NeJB&Go",[global])), 
+    <<"mu">> = iolist_to_binary(re:replace("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","mu",[])), 
+    <<"mu">> = iolist_to_binary(re:replace("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","mu",[global])), 
+    <<"aaabcxyzzzzpqrrrabbxyyyypqAzzaaabcxyzzzzpqrrrabbxyyyypqAzzN">> = iolist_to_binary(re:replace("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&&N",[])), 
+    <<"aaabcxyzzzzpqrrrabbxyyyypqAzzaaabcxyzzzzpqrrrabbxyyyypqAzzN">> = iolist_to_binary(re:replace("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","&&N",[global])), 
+    <<"TY">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","TY",[])), 
+    <<"TY">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","TY",[global])), 
+    <<"BSUyMaaaabcxyzzzzpqrrrabbbxyyyypqAzzeeab">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","BSUyM&e\\1eab",[])), 
+    <<"BSUyMaaaabcxyzzzzpqrrrabbbxyyyypqAzzeeab">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","BSUyM&e\\1eab",[global])), 
+    <<"bLbpTaaaabcxyzzzzpqrrrabbbxyyyyypqAzzcn">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1bLbp\\1T&cn",[])), 
+    <<"bLbpTaaaabcxyzzzzpqrrrabbbxyyyyypqAzzcn">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1bLbp\\1T&cn",[global])), 
+    <<"qOqibaaabcxyzpqrrrabbxyyyypABzzFnNENBaaabcxyzpqrrrabbxyyyypABzza">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","qOqib&F\\1\\1nNENB\\1&a",[])), 
+    <<"qOqibaaabcxyzpqrrrabbxyyyypABzzFnNENBaaabcxyzpqrrrabbxyyyypABzza">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","qOqib&F\\1\\1nNENB\\1&a",[global])), 
+    <<"SBfQjRuQKXkm">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","SBf\\1\\1QjR\\1uQKXkm\\1",[])), 
+    <<"SBfQjRuQKXkm">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","SBf\\1\\1QjR\\1uQKXkm\\1",[global])), 
+    <<">>>bVaaabxyzpqrrrabbxyyyypqAzzaaabxyzpqrrrabbxyyyypqAzzAiToCwaaabxyzpqrrrabbxyyyypqAzzcehOK">> = iolist_to_binary(re:replace(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","bV\\1\\1&&\\1AiToCw&cehOK",[])), 
+    <<">>>bVaaabxyzpqrrrabbxyyyypqAzzaaabxyzpqrrrabbxyyyypqAzzAiToCwaaabxyzpqrrrabbxyyyypqAzzcehOK">> = iolist_to_binary(re:replace(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","bV\\1\\1&&\\1AiToCw&cehOK",[global])), 
+    <<">RYHNAEdfNPaaaabxyzpqrrrabbxyyyypqAzzHLi">> = iolist_to_binary(re:replace(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","RY\\1HNA\\1\\1EdfNP&HLi",[])), 
+    <<">RYHNAEdfNPaaaabxyzpqrrrabbxyyyypqAzzHLi">> = iolist_to_binary(re:replace(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","RY\\1HNA\\1\\1EdfNP&HLi",[global])), 
+    <<">>>>wRIXabcxyzpqrrrabbxyyyypqAzzhabcxyzpqrrrabbxyyyypqAzzaCoikaFu">> = iolist_to_binary(re:replace(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1wRIX&h&aCoika\\1Fu",[])), 
+    <<">>>>wRIXabcxyzpqrrrabbxyyyypqAzzhabcxyzpqrrrabbxyyyypqAzzaCoikaFu">> = iolist_to_binary(re:replace(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","\\1wRIX&h&aCoika\\1Fu",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XSdFB",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","XSdFB",[global])), 
+    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","p&sjpo&\\1MeLw",[])), 
+    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","p&sjpo&\\1MeLw",[global])), 
+    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Np\\1BvTaI&WRss&",[])), 
+    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Np\\1BvTaI&WRss&",[global])), 
+    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Jm\\1&IqjePLT",[])), 
+    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(re:replace("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","Jm\\1&IqjePLT",[global])), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","X&\\1EJejYwBT\\1N&Vu\\1\\1hj",[])), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","X&\\1EJejYwBT\\1N&Vu\\1\\1hj",[global])), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","ACr\\1ExPn&TggeSRc&pgC",[])), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(re:replace("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","ACr\\1ExPn&TggeSRc&pgC",[global])), 
+    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","AQG",[])), 
+    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(re:replace("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz","AQG",[global])), 
+    <<"Ms">> = iolist_to_binary(re:replace("abczz","^(abc){1,2}zz","Ms",[])), 
+    <<"Ms">> = iolist_to_binary(re:replace("abczz","^(abc){1,2}zz","Ms",[global])), 
+    <<"abcjqKYJWAabcabczzXCsCP">> = iolist_to_binary(re:replace("abcabczz","^(abc){1,2}zz","\\1jqKYJWA&XCsCP",[])), 
+    <<"abcjqKYJWAabcabczzXCsCP">> = iolist_to_binary(re:replace("abcabczz","^(abc){1,2}zz","\\1jqKYJWA&XCsCP",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(abc){1,2}zz","Q\\1PQoCjb\\1eQ&\\1JaSTQ",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(abc){1,2}zz","Q\\1PQoCjb\\1eQ&\\1JaSTQ",[global])), 
+    <<"zz">> = iolist_to_binary(re:replace("zz","^(abc){1,2}zz","DxU",[])), 
+    <<"zz">> = iolist_to_binary(re:replace("zz","^(abc){1,2}zz","DxU",[global])), 
+    <<"abcabcabczz">> = iolist_to_binary(re:replace("abcabcabczz","^(abc){1,2}zz","wRiyMR&vafm&",[])), 
+    <<"abcabcabczz">> = iolist_to_binary(re:replace("abcabcabczz","^(abc){1,2}zz","wRiyMR&vafm&",[global])), 
+    <<">>abczz">> = iolist_to_binary(re:replace(">>abczz","^(abc){1,2}zz","fCQBocoTpl&om",[])), 
+    <<">>abczz">> = iolist_to_binary(re:replace(">>abczz","^(abc){1,2}zz","fCQBocoTpl&om",[global])), 
+    <<"BbtYviciAuOmX">> = iolist_to_binary(re:replace("bc","^(b+?|a){1,2}?c","B\\1tYviciAuOmX",[])), 
+    <<"BbtYviciAuOmX">> = iolist_to_binary(re:replace("bc","^(b+?|a){1,2}?c","B\\1tYviciAuOmX",[global])), 
+    <<"bbcbbcmoxNDbcM">> = iolist_to_binary(re:replace("bbc","^(b+?|a){1,2}?c","&&moxND\\1cM",[])), 
+    <<"bbcbbcmoxNDbcM">> = iolist_to_binary(re:replace("bbc","^(b+?|a){1,2}?c","&&moxND\\1cM",[global])), 
+    <<"HmYAbbbcbbuUEdmhvgxQbbbb">> = iolist_to_binary(re:replace("bbbc","^(b+?|a){1,2}?c","HmYA&\\1uUEdmhvgxQ\\1\\1",[])), 
+    <<"HmYAbbbcbbuUEdmhvgxQbbbb">> = iolist_to_binary(re:replace("bbbc","^(b+?|a){1,2}?c","HmYA&\\1uUEdmhvgxQ\\1\\1",[global])), 
+    <<"YRq">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","YRq",[])), 
+    <<"YRq">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","YRq",[global])), 
+    <<"bbacaOVQYgoesBaHi">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","&\\1OVQYgoesB\\1Hi",[])), 
+    <<"bbacaOVQYgoesBaHi">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","&\\1OVQYgoesB\\1Hi",[global])), 
+    <<"dIraaacvlpk">> = iolist_to_binary(re:replace("aac","^(b+?|a){1,2}?c","dIr\\1&vlpk",[])), 
+    <<"dIraaacvlpk">> = iolist_to_binary(re:replace("aac","^(b+?|a){1,2}?c","dIr\\1&vlpk",[global])), 
+    <<"KbbbbbbbbbbbobbbbbbbbbbbFjgyx">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+?|a){1,2}?c","K\\1o\\1Fjgyx",[])), 
+    <<"KbbbbbbbbbbbobbbbbbbbbbbFjgyx">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+?|a){1,2}?c","K\\1o\\1Fjgyx",[global])), 
+    <<"dkNSkahOVMwoAfbbbbbbbbbbbacchbbbbbbbbbbbacKA">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+?|a){1,2}?c","dkNSk\\1hOVMwoAf&ch&KA",[])), 
+    <<"dkNSkahOVMwoAfbbbbbbbbbbbacchbbbbbbbbbbbacKA">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+?|a){1,2}?c","dkNSk\\1hOVMwoAf&ch&KA",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+?|a){1,2}?c","lRqMfmvH",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+?|a){1,2}?c","lRqMfmvH",[global])), 
+    <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+?|a){1,2}?c","Ya\\1SeSYOH",[])), 
+    <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+?|a){1,2}?c","Ya\\1SeSYOH",[global])), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+?|a){1,2}?c","Mjs\\1&mpd",[])), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+?|a){1,2}?c","Mjs\\1&mpd",[global])), 
+    <<"MbGjTbfbuoXTyLDU">> = iolist_to_binary(re:replace("bc","^(b+|a){1,2}c","M\\1GjT\\1f\\1uoXTyLDU",[])), 
+    <<"MbGjTbfbuoXTyLDU">> = iolist_to_binary(re:replace("bc","^(b+|a){1,2}c","M\\1GjT\\1f\\1uoXTyLDU",[global])), 
+    <<"Xbbbbcbbihpfm">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}c","X\\1&\\1ihpfm",[])), 
+    <<"Xbbbbcbbihpfm">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}c","X\\1&\\1ihpfm",[global])), 
+    <<"bbbbbbpCDbbLKbbbq">> = iolist_to_binary(re:replace("bbbc","^(b+|a){1,2}c","\\1\\1pCDbbLK\\1q",[])), 
+    <<"bbbbbbpCDbbLKbbbq">> = iolist_to_binary(re:replace("bbbc","^(b+|a){1,2}c","\\1\\1pCDbbLK\\1q",[global])), 
+    <<"bacjc">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}c","&jc",[])), 
+    <<"bacjc">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}c","&jc",[global])), 
+    <<"bbacmybbacWtbbacjPQXaybbacl">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}c","&my&Wt&jPQXay&l",[])), 
+    <<"bbacmybbacWtbbacjPQXaybbacl">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}c","&my&Wt&jPQXay&l",[global])), 
+    <<"QcYXpaaGA">> = iolist_to_binary(re:replace("aac","^(b+|a){1,2}c","QcYXpa\\1GA",[])), 
+    <<"QcYXpaaGA">> = iolist_to_binary(re:replace("aac","^(b+|a){1,2}c","QcYXpa\\1GA",[global])), 
+    <<"habbbbbbbbbbbcYbbbbbbbbbbbY">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+|a){1,2}c","h&Y\\1Y",[])), 
+    <<"habbbbbbbbbbbcYbbbbbbbbbbbY">> = iolist_to_binary(re:replace("abbbbbbbbbbbc","^(b+|a){1,2}c","h&Y\\1Y",[global])), 
+    <<"DkD">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+|a){1,2}c","DkD",[])), 
+    <<"DkD">> = iolist_to_binary(re:replace("bbbbbbbbbbbac","^(b+|a){1,2}c","DkD",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+|a){1,2}c","UgARueRrJoL\\1\\1WgjAP",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b+|a){1,2}c","UgARueRrJoL\\1\\1WgjAP",[global])), 
+    <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+|a){1,2}c","IGJPbXNc&kfu\\1xi",[])), 
+    <<"aaac">> = iolist_to_binary(re:replace("aaac","^(b+|a){1,2}c","IGJPbXNc&kfu\\1xi",[global])), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+|a){1,2}c","pWvBeG&&iyL",[])), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(re:replace("abbbbbbbbbbbac","^(b+|a){1,2}c","pWvBeG&&iyL",[global])), 
+    <<"g">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}?bc","g",[])), 
+    <<"g">> = iolist_to_binary(re:replace("bbc","^(b+|a){1,2}?bc","g",[global])), 
+    <<"rXsdbaababcQbambabcWcnvbj">> = iolist_to_binary(re:replace("babc","^(b*|ba){1,2}?bc","rXsd\\1a&Q\\1m&Wcnvbj",[])), 
+    <<"rXsdbaababcQbambabcWcnvbj">> = iolist_to_binary(re:replace("babc","^(b*|ba){1,2}?bc","rXsd\\1a&Q\\1m&Wcnvbj",[global])), 
+    <<"x">> = iolist_to_binary(re:replace("bbabc","^(b*|ba){1,2}?bc","x",[])), 
+    <<"x">> = iolist_to_binary(re:replace("bbabc","^(b*|ba){1,2}?bc","x",[global])), 
+    <<"TMNcgqpTbaE">> = iolist_to_binary(re:replace("bababc","^(b*|ba){1,2}?bc","TMNcgqpT\\1E",[])), 
+    <<"TMNcgqpTbaE">> = iolist_to_binary(re:replace("bababc","^(b*|ba){1,2}?bc","TMNcgqpT\\1E",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b*|ba){1,2}?bc","IM",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(b*|ba){1,2}?bc","IM",[global])), 
+    <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(b*|ba){1,2}?bc","TbVp\\1&mhNgFw\\1",[])), 
+    <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(b*|ba){1,2}?bc","TbVp\\1&mhNgFw\\1",[global])), 
+    <<"babababc">> = iolist_to_binary(re:replace("babababc","^(b*|ba){1,2}?bc","&yrdhkl&hx&\\1M\\1\\1BiFK",[])), 
+    <<"babababc">> = iolist_to_binary(re:replace("babababc","^(b*|ba){1,2}?bc","&yrdhkl&hx&\\1M\\1\\1BiFK",[global])), 
+    <<"bailvqbafDWIOQe">> = iolist_to_binary(re:replace("babc","^(ba|b*){1,2}?bc","\\1ilvq\\1fDWIOQe",[])), 
+    <<"bailvqbafDWIOQe">> = iolist_to_binary(re:replace("babc","^(ba|b*){1,2}?bc","\\1ilvq\\1fDWIOQe",[global])), 
+    <<"o">> = iolist_to_binary(re:replace("bbabc","^(ba|b*){1,2}?bc","o",[])), 
+    <<"o">> = iolist_to_binary(re:replace("bbabc","^(ba|b*){1,2}?bc","o",[global])), 
+    <<"qyH">> = iolist_to_binary(re:replace("bababc","^(ba|b*){1,2}?bc","qyH",[])), 
+    <<"qyH">> = iolist_to_binary(re:replace("bababc","^(ba|b*){1,2}?bc","qyH",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ba|b*){1,2}?bc","GBLVYAxKwO",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ba|b*){1,2}?bc","GBLVYAxKwO",[global])), 
+    <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(ba|b*){1,2}?bc","u&GWGypjK&r\\1\\1&",[])), 
+    <<"bababbc">> = iolist_to_binary(re:replace("bababbc","^(ba|b*){1,2}?bc","u&GWGypjK&r\\1\\1&",[global])), 
+    <<"babababc">> = iolist_to_binary(re:replace("babababc","^(ba|b*){1,2}?bc","Vb",[])), 
+    <<"babababc">> = iolist_to_binary(re:replace("babababc","^(ba|b*){1,2}?bc","Vb",[global])), 
+    <<"nli

;znvMfDQEb

;zGHXN">> = iolist_to_binary(re:replace("

;z","^\\ca\\cA\\c[\\c{\\c:","nli\\1\\1&nv\\1MfDQEb&GHXN",[])), 
+    <<"nli

;znvMfDQEb

;zGHXN">> = iolist_to_binary(re:replace("

;z","^\\ca\\cA\\c[\\c{\\c:","nli\\1\\1&nv\\1MfDQEb&GHXN",[global])), 
+    <<"yxcaleHEFWgGiwbQathing">> = iolist_to_binary(re:replace("athing","^[ab\\]cde]","\\1yxc\\1&leHE\\1FWgGiwbQ&",[])), 
+    <<"yxcaleHEFWgGiwbQathing">> = iolist_to_binary(re:replace("athing","^[ab\\]cde]","\\1yxc\\1&leHE\\1FWgGiwbQ&",[global])), 
+    <<"MeNvthing">> = iolist_to_binary(re:replace("bthing","^[ab\\]cde]","MeNv\\1",[])), 
+    <<"MeNvthing">> = iolist_to_binary(re:replace("bthing","^[ab\\]cde]","MeNv\\1",[global])), 
+    <<"]T]qQDvRdthing">> = iolist_to_binary(re:replace("]thing","^[ab\\]cde]","&T&qQDvRd",[])), 
+    <<"]T]qQDvRdthing">> = iolist_to_binary(re:replace("]thing","^[ab\\]cde]","&T&qQDvRd",[global])), 
+    <<"GFxthing">> = iolist_to_binary(re:replace("cthing","^[ab\\]cde]","GFx",[])), 
+    <<"GFxthing">> = iolist_to_binary(re:replace("cthing","^[ab\\]cde]","GFx",[global])), 
+    <<"kLFxTOaEthing">> = iolist_to_binary(re:replace("dthing","^[ab\\]cde]","kLFxTOaE",[])), 
+    <<"kLFxTOaEthing">> = iolist_to_binary(re:replace("dthing","^[ab\\]cde]","kLFxTOaE",[global])), 
+    <<"RtthVFthing">> = iolist_to_binary(re:replace("ething","^[ab\\]cde]","Rtt\\1hVF",[])), 
+    <<"RtthVFthing">> = iolist_to_binary(re:replace("ething","^[ab\\]cde]","Rtt\\1hVF",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[ab\\]cde]","Srer\\1pi",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[ab\\]cde]","Srer\\1pi",[global])), 
+    <<"fthing">> = iolist_to_binary(re:replace("fthing","^[ab\\]cde]","&AaO",[])), 
+    <<"fthing">> = iolist_to_binary(re:replace("fthing","^[ab\\]cde]","&AaO",[global])), 
+    <<"[thing">> = iolist_to_binary(re:replace("[thing","^[ab\\]cde]","GujQJxlam\\1f\\1FD",[])), 
+    <<"[thing">> = iolist_to_binary(re:replace("[thing","^[ab\\]cde]","GujQJxlam\\1f\\1FD",[global])), 
+    <<"\\thing">> = iolist_to_binary(re:replace("\\thing","^[ab\\]cde]","&&yX",[])), 
+    <<"\\thing">> = iolist_to_binary(re:replace("\\thing","^[ab\\]cde]","&&yX",[global])), 
+    <<"s]tXLkthing">> = iolist_to_binary(re:replace("]thing","^[]cde]","s&tXLk",[])), 
+    <<"s]tXLkthing">> = iolist_to_binary(re:replace("]thing","^[]cde]","s&tXLk",[global])), 
+    <<"HiVDFyrMvAaDvdYdUthing">> = iolist_to_binary(re:replace("cthing","^[]cde]","H\\1iVDFyrMvAaDv\\1\\1dYdU",[])), 
+    <<"HiVDFyrMvAaDvdYdUthing">> = iolist_to_binary(re:replace("cthing","^[]cde]","H\\1iVDFyrMvAaDv\\1\\1dYdU",[global])), 
+    <<"jkWeKNthing">> = iolist_to_binary(re:replace("dthing","^[]cde]","jkWeKN",[])), 
+    <<"jkWeKNthing">> = iolist_to_binary(re:replace("dthing","^[]cde]","jkWeKN",[global])), 
+    <<"strycWDFQcthing">> = iolist_to_binary(re:replace("ething","^[]cde]","stry\\1cWDFQc",[])), 
+    <<"strycWDFQcthing">> = iolist_to_binary(re:replace("ething","^[]cde]","stry\\1cWDFQc",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[]cde]","s",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[]cde]","s",[global])), 
+    <<"athing">> = iolist_to_binary(re:replace("athing","^[]cde]","\\1xREinh\\1vCv",[])), 
+    <<"athing">> = iolist_to_binary(re:replace("athing","^[]cde]","\\1xREinh\\1vCv",[global])), 
+    <<"fthing">> = iolist_to_binary(re:replace("fthing","^[]cde]","\\1h&Y\\1HwTkCc",[])), 
+    <<"fthing">> = iolist_to_binary(re:replace("fthing","^[]cde]","\\1h&Y\\1HwTkCc",[global])), 
+    <<"uifmTffffWmKXllBthing">> = iolist_to_binary(re:replace("fthing","^[^ab\\]cde]","ui&mT&f&&WmKXllB",[])), 
+    <<"uifmTffffWmKXllBthing">> = iolist_to_binary(re:replace("fthing","^[^ab\\]cde]","ui&mT&f&&WmKXllB",[global])), 
+    <<"Kyn[lihrXoXthing">> = iolist_to_binary(re:replace("[thing","^[^ab\\]cde]","Kyn&lihrXoX",[])), 
+    <<"Kyn[lihrXoXthing">> = iolist_to_binary(re:replace("[thing","^[^ab\\]cde]","Kyn&lihrXoX",[global])), 
+    <<"UXMYd\\fthing">> = iolist_to_binary(re:replace("\\thing","^[^ab\\]cde]","U\\1XMYd\\1\\1&f\\1",[])), 
+    <<"UXMYd\\fthing">> = iolist_to_binary(re:replace("\\thing","^[^ab\\]cde]","U\\1XMYd\\1\\1&f\\1",[global])), 
+    <<"QYuh*KpbKbO** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^ab\\]cde]","\\1QYuh&KpbKbO",[])), 
+    <<"QYuh*KpbKbO** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^ab\\]cde]","\\1QYuh&KpbKbO",[global])), 
+    <<"athing">> = iolist_to_binary(re:replace("athing","^[^ab\\]cde]","JwKDqeNpO\\1&m",[])), 
+    <<"athing">> = iolist_to_binary(re:replace("athing","^[^ab\\]cde]","JwKDqeNpO\\1&m",[global])), 
+    <<"bthing">> = iolist_to_binary(re:replace("bthing","^[^ab\\]cde]","G",[])), 
+    <<"bthing">> = iolist_to_binary(re:replace("bthing","^[^ab\\]cde]","G",[global])), 
+    <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^ab\\]cde]","VomLLa&\\1xDtJWx",[])), 
+    <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^ab\\]cde]","VomLLa&\\1xDtJWx",[global])), 
+    <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^ab\\]cde]","&DWkG&&kk",[])), 
+    <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^ab\\]cde]","&DWkG&&kk",[global])), 
+    <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^ab\\]cde]","MYpgcbh&\\1knLFcDqwN",[])), 
+    <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^ab\\]cde]","MYpgcbh&\\1knLFcDqwN",[global])), 
+    <<"ething">> = iolist_to_binary(re:replace("ething","^[^ab\\]cde]","h\\1nb\\1c&&KMVOIu",[])), 
+    <<"ething">> = iolist_to_binary(re:replace("ething","^[^ab\\]cde]","h\\1nb\\1c&&KMVOIu",[global])), 
+    <<"qRaQDneiathing">> = iolist_to_binary(re:replace("athing","^[^]cde]","qR&QDnei&",[])), 
+    <<"qRaQDneiathing">> = iolist_to_binary(re:replace("athing","^[^]cde]","qR&QDnei&",[global])), 
+    <<"YtUthing">> = iolist_to_binary(re:replace("fthing","^[^]cde]","YtU",[])), 
+    <<"YtUthing">> = iolist_to_binary(re:replace("fthing","^[^]cde]","YtU",[global])), 
+    <<"PUGKhoJ*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^]cde]","P\\1UGKhoJ&",[])), 
+    <<"PUGKhoJ*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[^]cde]","P\\1UGKhoJ&",[global])), 
+    <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^]cde]","Xh&gbPHspjXNu&YKXwHH",[])), 
+    <<"]thing">> = iolist_to_binary(re:replace("]thing","^[^]cde]","Xh&gbPHspjXNu&YKXwHH",[global])), 
+    <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^]cde]","kmMlgoXI&xF\\1hwlT",[])), 
+    <<"cthing">> = iolist_to_binary(re:replace("cthing","^[^]cde]","kmMlgoXI&xF\\1hwlT",[global])), 
+    <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^]cde]","ue\\1\\1DU",[])), 
+    <<"dthing">> = iolist_to_binary(re:replace("dthing","^[^]cde]","ue\\1\\1DU",[global])), 
+    <<"ething">> = iolist_to_binary(re:replace("ething","^[^]cde]","x\\1CM",[])), 
+    <<"ething">> = iolist_to_binary(re:replace("ething","^[^]cde]","x\\1CM",[global])), 
+    <<"skV">> = iolist_to_binary(re:replace("0","^[0-9]+$","sk\\1V\\1",[])), 
+    <<"skV">> = iolist_to_binary(re:replace("0","^[0-9]+$","sk\\1V\\1",[global])), 
+    <<"dchqDQcnPE1m">> = iolist_to_binary(re:replace("1","^[0-9]+$","dchqDQcnPE&m",[])), 
+    <<"dchqDQcnPE1m">> = iolist_to_binary(re:replace("1","^[0-9]+$","dchqDQcnPE&m",[global])), 
+    <<"iKMEYpXlyVKXB">> = iolist_to_binary(re:replace("2","^[0-9]+$","iKMEYpXlyVK\\1XB",[])), 
+    <<"iKMEYpXlyVKXB">> = iolist_to_binary(re:replace("2","^[0-9]+$","iKMEYpXlyVK\\1XB",[global])), 
+    <<"lTM3XtBQD3KqG33G">> = iolist_to_binary(re:replace("3","^[0-9]+$","lTM&X\\1tBQD&KqG&&G",[])), 
+    <<"lTM3XtBQD3KqG33G">> = iolist_to_binary(re:replace("3","^[0-9]+$","lTM&X\\1tBQD&KqG&&G",[global])), 
+    <<"A4RtR4paCNffVmKS44ru">> = iolist_to_binary(re:replace("4","^[0-9]+$","A&RtR&paCNffVmKS&&ru",[])), 
+    <<"A4RtR4paCNffVmKS44ru">> = iolist_to_binary(re:replace("4","^[0-9]+$","A&RtR&paCNffVmKS&&ru",[global])), 
+    <<"FvNdw">> = iolist_to_binary(re:replace("5","^[0-9]+$","F\\1vNdw",[])), 
+    <<"FvNdw">> = iolist_to_binary(re:replace("5","^[0-9]+$","F\\1vNdw",[global])), 
+    <<"6bMIirlh">> = iolist_to_binary(re:replace("6","^[0-9]+$","&bMIi\\1rlh",[])), 
+    <<"6bMIirlh">> = iolist_to_binary(re:replace("6","^[0-9]+$","&bMIi\\1rlh",[global])), 
+    <<"7IgF">> = iolist_to_binary(re:replace("7","^[0-9]+$","\\1\\1&IgF\\1\\1",[])), 
+    <<"7IgF">> = iolist_to_binary(re:replace("7","^[0-9]+$","\\1\\1&IgF\\1\\1",[global])), 
+    <<"kXpaB8C">> = iolist_to_binary(re:replace("8","^[0-9]+$","kXpaB&C",[])), 
+    <<"kXpaB8C">> = iolist_to_binary(re:replace("8","^[0-9]+$","kXpaB&C",[global])), 
+    <<"rxDNFoULsT">> = iolist_to_binary(re:replace("9","^[0-9]+$","rxDNFoULsT",[])), 
+    <<"rxDNFoULsT">> = iolist_to_binary(re:replace("9","^[0-9]+$","rxDNFoULsT",[global])), 
+    <<"YmBdr10cd10f10RQlRK">> = iolist_to_binary(re:replace("10","^[0-9]+$","YmBd\\1r&cd&f&RQlRK",[])), 
+    <<"YmBdr10cd10f10RQlRK">> = iolist_to_binary(re:replace("10","^[0-9]+$","YmBd\\1r&cd&f&RQlRK",[global])), 
+    <<"RLqdwwceTW">> = iolist_to_binary(re:replace("100","^[0-9]+$","RLqdwwceTW\\1",[])), 
+    <<"RLqdwwceTW">> = iolist_to_binary(re:replace("100","^[0-9]+$","RLqdwwceTW\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[0-9]+$","BdnjJh\\1urLa&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[0-9]+$","BdnjJh\\1urLa&",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","^[0-9]+$","&&oa&dfYGxAdt&\\1\\1Q&m",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","^[0-9]+$","&&oa&dfYGxAdt&\\1\\1Q&m",[global])), 
+    <<"ndenterMpPenterqHbSYUGGN">> = iolist_to_binary(re:replace("enter","^.*nter","nd&MpP&qHb\\1SY\\1UGGN",[])), 
+    <<"ndenterMpPenterqHbSYUGGN">> = iolist_to_binary(re:replace("enter","^.*nter","nd&MpP&qHb\\1SY\\1UGGN",[global])), 
+    <<"LSinterEPdYinterHoNIyUIDOinter">> = iolist_to_binary(re:replace("inter","^.*nter","LS&\\1EPdY&Ho\\1NIyUIDO&",[])), 
+    <<"LSinterEPdYinterHoNIyUIDOinter">> = iolist_to_binary(re:replace("inter","^.*nter","LS&\\1EPdY&Ho\\1NIyUIDO&",[global])), 
+    <<"IIUwhHsQfXMYBSb">> = iolist_to_binary(re:replace("uponter","^.*nter","IIUwhHsQ\\1fX\\1MYBS\\1b",[])), 
+    <<"IIUwhHsQfXMYBSb">> = iolist_to_binary(re:replace("uponter","^.*nter","IIUwhHsQ\\1fX\\1MYBS\\1b",[global])), 
+    ok.
+run1() ->
+    <<"Bp">> = iolist_to_binary(re:replace("xxx0","^xxx[0-9]+$","B\\1\\1\\1p",[])), 
+    <<"Bp">> = iolist_to_binary(re:replace("xxx0","^xxx[0-9]+$","B\\1\\1\\1p",[global])), 
+    <<"xxx1234okNYhxxx1234tobCxxx1234fg">> = iolist_to_binary(re:replace("xxx1234","^xxx[0-9]+$","&okNYh&tobC\\1&fg",[])), 
+    <<"xxx1234okNYhxxx1234tobCxxx1234fg">> = iolist_to_binary(re:replace("xxx1234","^xxx[0-9]+$","&okNYh&tobC\\1&fg",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^xxx[0-9]+$","hQ&ULnO\\1\\1\\1nNlLbQ",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^xxx[0-9]+$","hQ&ULnO\\1\\1\\1nNlLbQ",[global])), 
+    <<"xxx">> = iolist_to_binary(re:replace("xxx","^xxx[0-9]+$","&KwHk\\1a\\1\\1\\1&&i",[])), 
+    <<"xxx">> = iolist_to_binary(re:replace("xxx","^xxx[0-9]+$","&KwHk\\1a\\1\\1\\1&&i",[global])), 
+    <<"ohMDx123xpx123mNT">> = iolist_to_binary(re:replace("x123","^.+[0-9][0-9][0-9]$","ohMD&xp\\1&mNT",[])), 
+    <<"ohMDx123xpx123mNT">> = iolist_to_binary(re:replace("x123","^.+[0-9][0-9][0-9]$","ohMD&xp\\1&mNT",[global])), 
+    <<"gYaxx123xx123XaaNxx123bNU">> = iolist_to_binary(re:replace("xx123","^.+[0-9][0-9][0-9]$","gYa&&XaaN&bNU",[])), 
+    <<"gYaxx123xx123XaaNxx123bNU">> = iolist_to_binary(re:replace("xx123","^.+[0-9][0-9][0-9]$","gYa&&XaaN&bNU",[global])), 
+    <<"iElVtor">> = iolist_to_binary(re:replace("123456","^.+[0-9][0-9][0-9]$","i\\1ElV\\1tor",[])), 
+    <<"iElVtor">> = iolist_to_binary(re:replace("123456","^.+[0-9][0-9][0-9]$","i\\1ElV\\1tor",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+[0-9][0-9][0-9]$","BWxJ\\1uhGy&vgMLA",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+[0-9][0-9][0-9]$","BWxJ\\1uhGy&vgMLA",[global])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^.+[0-9][0-9][0-9]$","xTGS&sW\\1G&NlcW",[])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^.+[0-9][0-9][0-9]$","xTGS&sW\\1G&NlcW",[global])), 
+    <<"Ix1234IUy">> = iolist_to_binary(re:replace("x1234","^.+[0-9][0-9][0-9]$","I\\1&\\1I\\1Uy",[])), 
+    <<"Ix1234IUy">> = iolist_to_binary(re:replace("x1234","^.+[0-9][0-9][0-9]$","I\\1&\\1I\\1Uy",[global])), 
+    <<"DBYEAgkI">> = iolist_to_binary(re:replace("x123","^.+?[0-9][0-9][0-9]$","DBYE\\1AgkI",[])), 
+    <<"DBYEAgkI">> = iolist_to_binary(re:replace("x123","^.+?[0-9][0-9][0-9]$","DBYE\\1AgkI",[global])), 
+    <<"EABxx123">> = iolist_to_binary(re:replace("xx123","^.+?[0-9][0-9][0-9]$","EAB&\\1",[])), 
+    <<"EABxx123">> = iolist_to_binary(re:replace("xx123","^.+?[0-9][0-9][0-9]$","EAB&\\1",[global])), 
+    <<"w">> = iolist_to_binary(re:replace("123456","^.+?[0-9][0-9][0-9]$","w",[])), 
+    <<"w">> = iolist_to_binary(re:replace("123456","^.+?[0-9][0-9][0-9]$","w",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+?[0-9][0-9][0-9]$","jiMwkAneSrQ&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.+?[0-9][0-9][0-9]$","jiMwkAneSrQ&",[global])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^.+?[0-9][0-9][0-9]$","pg\\1cjQ&&&",[])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^.+?[0-9][0-9][0-9]$","pg\\1cjQ&&&",[global])), 
+    <<"APdx1234Jdelcg">> = iolist_to_binary(re:replace("x1234","^.+?[0-9][0-9][0-9]$","A\\1Pd&Jdelcg",[])), 
+    <<"APdx1234Jdelcg">> = iolist_to_binary(re:replace("x1234","^.+?[0-9][0-9][0-9]$","A\\1Pd&Jdelcg",[global])), 
+    <<"abcVE">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","\\1VE",[])), 
+    <<"abcVE">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","\\1VE",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","ysSa&O\\1ogTi\\1e\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","ysSa&O\\1ogTi\\1e\\1",[global])), 
+    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","eCQWoiG\\1",[])), 
+    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","eCQWoiG\\1",[global])), 
+    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","rYbgJDpc",[])), 
+    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","rYbgJDpc",[global])), 
+    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","vkuwBMsxa",[])), 
+    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(re:replace("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","vkuwBMsxa",[global])), 
+    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","e\\1KF&BD\\1C&kxH&rwWnu",[])), 
+    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(re:replace("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$","e\\1KF&BD\\1C&kxH&rwWnu",[global])), 
+    <<"Well, we need a colongxIksrpvcmlefi:WmR somewhere">> = iolist_to_binary(re:replace("Well, we need a colon: somewhere",":","g\\1xIksrpvcmlefi&WmR",[])), 
+    <<"Well, we need a colongxIksrpvcmlefi:WmR somewhere">> = iolist_to_binary(re:replace("Well, we need a colon: somewhere",":","g\\1xIksrpvcmlefi&WmR",[global])), 
+    <<"*** Fail if we don't">> = iolist_to_binary(re:replace("*** Fail if we don't",":","g&BggNgoAXIe&s\\1NH",[])), 
+    <<"*** Fail if we don't">> = iolist_to_binary(re:replace("*** Fail if we don't",":","g&BggNgoAXIe&s\\1NH",[global])), 
+    <<"TkV0abcQpF0abci0abcyiC">> = iolist_to_binary(re:replace("0abc","([\\da-f:]+)$","TkV\\1QpF\\1i&yiC",[caseless])), 
+    <<"TkV0abcQpF0abci0abcyiC">> = iolist_to_binary(re:replace("0abc","([\\da-f:]+)$","TkV\\1QpF\\1i&yiC",[caseless,
                                                                                                                                                                                                                   global])), 
-?line <<"g.1.2.3WLxQ1s">> = iolist_to_binary(re:replace(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","g&WLxQ\\1s",[])), 
-?line <<"g.1.2.3WLxQ1s">> = iolist_to_binary(re:replace(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","g&WLxQ\\1s",[global])), 
-?line <<"12Oy">> = iolist_to_binary(re:replace("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","\\1Oy",[])), 
-?line <<"12Oy">> = iolist_to_binary(re:replace("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","\\1Oy",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","eX\\1nRbXcnyEu",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","eX\\1nRbXcnyEu",[global])), 
-?line <<".1.2.3333">> = iolist_to_binary(re:replace(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","&iIBylLhNq",[])), 
-?line <<".1.2.3333">> = iolist_to_binary(re:replace(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","&iIBylLhNq",[global])), 
-?line <<"1.2.3">> = iolist_to_binary(re:replace("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","\\1G&pFELr\\1\\1&\\1HPX",[])), 
-?line <<"1.2.3">> = iolist_to_binary(re:replace("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","\\1G&pFELr\\1\\1&\\1HPX",[global])), 
-?line <<"1234.2.3">> = iolist_to_binary(re:replace("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","&qtoJnh\\1h",[])), 
-?line <<"1234.2.3">> = iolist_to_binary(re:replace("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","&qtoJnh\\1h",[global])), 
-?line <<"eaSBc111LbN">> = iolist_to_binary(re:replace("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","eaSBc\\1\\1\\1LbN",[])), 
-?line <<"eaSBc111LbN">> = iolist_to_binary(re:replace("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","eaSBc\\1\\1\\1LbN",[global])), 
-?line <<"1    IN    SOA    non-sp1    non-sp2   (yranl1    IN    SOA    non-sp1    non-sp2   (kU">> = iolist_to_binary(re:replace("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","&yranl&kU",[])), 
-?line <<"1    IN    SOA    non-sp1    non-sp2   (yranl1    IN    SOA    non-sp1    non-sp2   (kU">> = iolist_to_binary(re:replace("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","&yranl&kU",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","W",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","W",[global])), 
-?line <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(re:replace("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","UyNVyrR",[])), 
-?line <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(re:replace("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","UyNVyrR",[global])), 
-?line <<"pbeGIhIlhvhv">> = iolist_to_binary(re:replace("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","pbeGIhIl\\1hvhv",[])), 
-?line <<"pbeGIhIlhvhv">> = iolist_to_binary(re:replace("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","pbeGIhIl\\1hvhv",[global])), 
-?line <<"gFDyTxSYOppWiRv">> = iolist_to_binary(re:replace("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","gFDyTxSYOppWiR\\1v",[])), 
-?line <<"gFDyTxSYOppWiRv">> = iolist_to_binary(re:replace("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","gFDyTxSYOppWiR\\1v",[global])), 
-?line <<"HSc2.vOMD">> = iolist_to_binary(re:replace("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","HSc&\\1vO\\1MD\\1",[])), 
-?line <<"HSc2.vOMD">> = iolist_to_binary(re:replace("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","HSc&\\1vO\\1MD\\1",[global])), 
-?line <<".pq-rd.pq-rG.pq-rUab-c.pq-r.HCGaTI">> = iolist_to_binary(re:replace("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","\\1d\\1G\\1U&HCGaTI",[])), 
-?line <<".pq-rd.pq-rG.pq-rUab-c.pq-r.HCGaTI">> = iolist_to_binary(re:replace("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","\\1d\\1G\\1U&HCGaTI",[global])), 
-?line <<"RwF">> = iolist_to_binary(re:replace("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","RwF",[])), 
-?line <<"RwF">> = iolist_to_binary(re:replace("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","RwF",[global])), 
-?line <<"oAJdUx-.y-.GMx-.y-.iBCRNx-.y-.wBW">> = iolist_to_binary(re:replace("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","oAJdU&GM&iBCRN&wBW",[])), 
-?line <<"oAJdUx-.y-.GMx-.y-.iBCRNx-.y-.wBW">> = iolist_to_binary(re:replace("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","oAJdU&GM&iBCRN&wBW",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","wwA&\\1snkRSCcfnG&S",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","wwA&\\1snkRSCcfnG&S",[global])), 
-?line <<"-abc.peq.">> = iolist_to_binary(re:replace("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","YaFu&cvVYqVy",[])), 
-?line <<"-abc.peq.">> = iolist_to_binary(re:replace("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","YaFu&cvVYqVy",[global])), 
-?line <<"*.aXojEWCW">> = iolist_to_binary(re:replace("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","&\\1XojEWCW",[])), 
-?line <<"*.aXojEWCW">> = iolist_to_binary(re:replace("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","&\\1XojEWCW",[global])), 
-?line <<"djXR0-a0-aFXv*.b0-awEtv">> = iolist_to_binary(re:replace("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","djXR\\1\\1FXv&wEtv",[])), 
-?line <<"djXR0-a0-aFXv*.b0-awEtv">> = iolist_to_binary(re:replace("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","djXR\\1\\1FXv&wEtv",[global])), 
-?line <<"*.c3-b.cregb">> = iolist_to_binary(re:replace("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","&regb",[])), 
-?line <<"*.c3-b.cregb">> = iolist_to_binary(re:replace("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","&regb",[global])), 
-?line <<"Vlm">> = iolist_to_binary(re:replace("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","Vlm",[])), 
-?line <<"Vlm">> = iolist_to_binary(re:replace("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","Vlm",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","Vxm\\1SKnM",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","Vxm\\1SKnM",[global])), 
-?line <<"*.0">> = iolist_to_binary(re:replace("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","n\\1",[])), 
-?line <<"*.0">> = iolist_to_binary(re:replace("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","n\\1",[global])), 
-?line <<"*.a-">> = iolist_to_binary(re:replace("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","SbmRQSxio",[])), 
-?line <<"*.a-">> = iolist_to_binary(re:replace("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","SbmRQSxio",[global])), 
-?line <<"*.a-b.c-">> = iolist_to_binary(re:replace("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","xINKaLRww\\1&\\1",[])), 
-?line <<"*.a-b.c-">> = iolist_to_binary(re:replace("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","xINKaLRww\\1&\\1",[global])), 
-?line <<"*.c-a.0-c">> = iolist_to_binary(re:replace("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","akuY\\1pMWNGWjJ\\1oFTV\\1t",[])), 
-?line <<"*.c-a.0-c">> = iolist_to_binary(re:replace("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","akuY\\1pMWNGWjJ\\1oFTV\\1t",[global])), 
-?line <<"Dy">> = iolist_to_binary(re:replace("abde","^(?=ab(de))(abd)(e)","Dy",[])), 
-?line <<"Dy">> = iolist_to_binary(re:replace("abde","^(?=ab(de))(abd)(e)","Dy",[global])), 
-?line <<"Sf">> = iolist_to_binary(re:replace("abdf","^(?!(ab)de|x)(abd)(f)","Sf",[])), 
-?line <<"Sf">> = iolist_to_binary(re:replace("abdf","^(?!(ab)de|x)(abd)(f)","Sf",[global])), 
-?line <<"IabcdJcd">> = iolist_to_binary(re:replace("abcd","^(?=(ab(cd)))(ab)","I\\1J",[])), 
-?line <<"IabcdJcd">> = iolist_to_binary(re:replace("abcd","^(?=(ab(cd)))(ab)","I\\1J",[global])), 
-?line <<"rvnE.d">> = iolist_to_binary(re:replace("a.b.c.d","^[\\da-f](\\.[\\da-f])*$","rvnE\\1",[caseless])), 
-?line <<"rvnE.d">> = iolist_to_binary(re:replace("a.b.c.d","^[\\da-f](\\.[\\da-f])*$","rvnE\\1",[caseless,
-                                                                                                                                                                                                                            global])), 
-?line <<"niA.B.C.DL.DCGxjcuA.B.C.DhA.B.C.DT.DA.B.C.D.DM">> = iolist_to_binary(re:replace("A.B.C.D","^[\\da-f](\\.[\\da-f])*$","ni&L\\1CGxjcu&h&T\\1&\\1M",[caseless])), 
-?line <<"niA.B.C.DL.DCGxjcuA.B.C.DhA.B.C.DT.DA.B.C.D.DM">> = iolist_to_binary(re:replace("A.B.C.D","^[\\da-f](\\.[\\da-f])*$","ni&L\\1CGxjcu&h&T\\1&\\1M",[caseless,
-                                                                                                                                                                                                                                                                      global])), 
-?line <<"wARa.b.c.1.2.3.Ca.b.c.1.2.3.C.CpUAa.b.c.1.2.3.Cg">> = iolist_to_binary(re:replace("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$","wAR&&\\1pUA&g",[caseless])), 
-?line <<"wARa.b.c.1.2.3.Ca.b.c.1.2.3.C.CpUAa.b.c.1.2.3.Cg">> = iolist_to_binary(re:replace("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$","wAR&&\\1pUA&g",[caseless,
-                                                                                                                                                                                                                                                       global])), 
-?line <<"a">> = iolist_to_binary(re:replace("\"1234\"","^\\\".*\\\"\\s*(;.*)?$","\\1a",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("\"1234\"","^\\\".*\\\"\\s*(;.*)?$","\\1a",[global])), 
-?line <<"CIv">> = iolist_to_binary(re:replace("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$","CIv",[])), 
-?line <<"CIv">> = iolist_to_binary(re:replace("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$","CIv",[global])), 
-?line <<"; rhubarbK">> = iolist_to_binary(re:replace("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$","\\1K",[])), 
-?line <<"; rhubarbK">> = iolist_to_binary(re:replace("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$","\\1K",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\\".*\\\"\\s*(;.*)?$","aWrdsUS\\1QSjQ&dFoGfF",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\\".*\\\"\\s*(;.*)?$","aWrdsUS\\1QSjQ&dFoGfF",[global])), 
-?line <<"\"1234\" : things">> = iolist_to_binary(re:replace("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$","khMGlmiUM&d\\1\\1GGb",[])), 
-?line <<"\"1234\" : things">> = iolist_to_binary(re:replace("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$","khMGlmiUM&d\\1\\1GGb",[global])), 
-?line <<"ddsaVnvP">> = iolist_to_binary(re:replace("","^$","ddsaVnvP",[])), 
-?line <<"ddsaVnvP">> = iolist_to_binary(re:replace("","^$","ddsaVnvP",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^$","d\\1yl\\1chv&DYUrRBp",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^$","d\\1yl\\1chv&DYUrRBp",[global])), 
-?line <<"ubIEeu">> = iolist_to_binary(re:replace("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","ubIEeu",[extended])), 
-?line <<"ubIEeu">> = iolist_to_binary(re:replace("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","ubIEeu",[extended,
-                                                                                                                                                                                                                                                                                                       global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","hTyFd&e\\1&PttRSXjwggW",[extended])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","hTyFd&e\\1&PttRSXjwggW",[extended,
-                                                                                                                                                                                                                                                                                                                                                        global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","RUKr",[extended])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","RUKr",[extended,
-                                                                                                                                                                                                                                                                                                 global])), 
-?line <<"ab cde">> = iolist_to_binary(re:replace("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","&wELTyPo&oJqp&vLg\\1T",[extended])), 
-?line <<"ab cde">> = iolist_to_binary(re:replace("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","&wELTyPo&oJqp&vLg\\1T",[extended,
-                                                                                                                                                                                                                                                                                                                                             global])), 
-?line <<"NNDSkqab cNfQkVqmWj">> = iolist_to_binary(re:replace("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","NN\\1DSk\\1q&NfQkVqmWj",[])), 
-?line <<"NNDSkqab cNfQkVqmWj">> = iolist_to_binary(re:replace("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","NN\\1DSk\\1q&NfQkVqmWj",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","vkwk\\1js\\1pepFK\\1\\1Wa&g",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","vkwk\\1js\\1pepFK\\1\\1Wa&g",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","\\1&fYSPEB",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","\\1&fYSPEB",[global])), 
-?line <<"ab cde">> = iolist_to_binary(re:replace("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","\\1D\\1\\1\\1by&lUP\\1jTlVc",[])), 
-?line <<"ab cde">> = iolist_to_binary(re:replace("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","\\1D\\1\\1\\1by&lUP\\1jTlVc",[global])), 
-?line <<"Pca bcdDXLbDTDa bcdja bcdTa bcdX">> = iolist_to_binary(re:replace("a bcd","^   a\\ b[c ]d       $","Pc&DXLbDTD&j&T&X\\1",[extended])), 
-?line <<"Pca bcdDXLbDTDa bcdja bcdTa bcdX">> = iolist_to_binary(re:replace("a bcd","^   a\\ b[c ]d       $","Pc&DXLbDTD&j&T&X\\1",[extended,
-                                                                                                                                                                                                                                              global])), 
-?line <<"cbruWa b dWvF">> = iolist_to_binary(re:replace("a b d","^   a\\ b[c ]d       $","cbruW&WvF\\1",[extended])), 
-?line <<"cbruWa b dWvF">> = iolist_to_binary(re:replace("a b d","^   a\\ b[c ]d       $","cbruW&WvF\\1",[extended,
-                                                                                                                                                                                                                             global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^   a\\ b[c ]d       $","xLsLvmNGGbWjEqU\\1q",[extended])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^   a\\ b[c ]d       $","xLsLvmNGGbWjEqU\\1q",[extended,
-                                                                                                                                                                                                                                                      global])), 
-?line <<"abcd">> = iolist_to_binary(re:replace("abcd","^   a\\ b[c ]d       $","QvID",[extended])), 
-?line <<"abcd">> = iolist_to_binary(re:replace("abcd","^   a\\ b[c ]d       $","QvID",[extended,
+    <<"gAHIDgPO">> = iolist_to_binary(re:replace("abc","([\\da-f:]+)$","gAHIDgPO",[caseless])), 
+    <<"gAHIDgPO">> = iolist_to_binary(re:replace("abc","([\\da-f:]+)$","gAHIDgPO",[caseless,
+                                                                                                                                                                                           global])), 
+    <<"QqLxYfedlXtfedNm">> = iolist_to_binary(re:replace("fed","([\\da-f:]+)$","QqLxY&lXt\\1Nm",[caseless])), 
+    <<"QqLxYfedlXtfedNm">> = iolist_to_binary(re:replace("fed","([\\da-f:]+)$","QqLxY&lXt\\1Nm",[caseless,
                                                                                                                                                                                                          global])), 
-?line <<"ab d">> = iolist_to_binary(re:replace("ab d","^   a\\ b[c ]d       $","CEUu&Jt",[extended])), 
-?line <<"ab d">> = iolist_to_binary(re:replace("ab d","^   a\\ b[c ]d       $","CEUu&Jt",[extended,
-                                                                                                                                                                                                                global])), 
-?line <<"ohu">> = iolist_to_binary(re:replace("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$","ohu",[])), 
-?line <<"ohu">> = iolist_to_binary(re:replace("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$","ohu",[global])), 
-?line <<"rbcmNabcdefhijklmabcdefhijklmNGkLNbcabcdefhijklmxnbclO">> = iolist_to_binary(re:replace("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$","r\\1mN&&NGkLN\\1&xn\\1lO",[])), 
-?line <<"rbcmNabcdefhijklmabcdefhijklmNGkLNbcabcdefhijklmxnbclO">> = iolist_to_binary(re:replace("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$","r\\1mN&&NGkLN\\1&xn\\1lO",[global])), 
-?line <<"I">> = iolist_to_binary(re:replace("a+ Z0+
-","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]","I",[])), 
-?line <<"I">> = iolist_to_binary(re:replace("a+ Z0+
-","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]","I",[global])), 
-?line <<"ANdwkyHnc">> = iolist_to_binary(re:replace(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+","ANdwkyHnc",[])), 
-?line <<"ANdwkyHnc">> = iolist_to_binary(re:replace(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+","ANdwkyHnc",[global])), 
-?line <<"Dx">> = iolist_to_binary(re:replace("z","^a*\\w","Dx",[])), 
-?line <<"Dx">> = iolist_to_binary(re:replace("z","^a*\\w","Dx",[global])), 
-?line <<"OpVTjQkTaz">> = iolist_to_binary(re:replace("az","^a*\\w","OpVTjQkT&",[])), 
-?line <<"OpVTjQkTaz">> = iolist_to_binary(re:replace("az","^a*\\w","OpVTjQkT&",[global])), 
-?line <<"LexbuooAmFDifW">> = iolist_to_binary(re:replace("aaaz","^a*\\w","LexbuooAm\\1FDifW",[])), 
-?line <<"LexbuooAmFDifW">> = iolist_to_binary(re:replace("aaaz","^a*\\w","LexbuooAm\\1FDifW",[global])), 
-?line <<"arpLCDAadYpPkb">> = iolist_to_binary(re:replace("a","^a*\\w","arpLCDAadYpPk\\1b",[])), 
-?line <<"arpLCDAadYpPkb">> = iolist_to_binary(re:replace("a","^a*\\w","arpLCDAadYpPk\\1b",[global])), 
-?line <<"CyElaaTHfV">> = iolist_to_binary(re:replace("aa","^a*\\w","CyEl&T\\1HfV",[])), 
-?line <<"CyElaaTHfV">> = iolist_to_binary(re:replace("aa","^a*\\w","CyEl&T\\1HfV",[global])), 
-?line <<"v">> = iolist_to_binary(re:replace("aaaa","^a*\\w","v\\1\\1",[])), 
-?line <<"v">> = iolist_to_binary(re:replace("aaaa","^a*\\w","v\\1\\1",[global])), 
-?line <<"COSWtMTXCLic+">> = iolist_to_binary(re:replace("a+","^a*\\w","COSWtMTXCLic",[])), 
-?line <<"COSWtMTXCLic+">> = iolist_to_binary(re:replace("a+","^a*\\w","COSWtMTXCLic",[global])), 
-?line <<"kaaDuaauKGaaIaaFUK+">> = iolist_to_binary(re:replace("aa+","^a*\\w","k&Du&uKG\\1&I&FU\\1\\1K\\1",[])), 
-?line <<"kaaDuaauKGaaIaaFUK+">> = iolist_to_binary(re:replace("aa+","^a*\\w","k&Du&uKG\\1&I&FU\\1\\1K\\1",[global])), 
-?line <<"Pttz">> = iolist_to_binary(re:replace("z","^a*?\\w","Ptt&",[])), 
-?line <<"Pttz">> = iolist_to_binary(re:replace("z","^a*?\\w","Ptt&",[global])), 
-?line <<"QEHxyFSkkaz">> = iolist_to_binary(re:replace("az","^a*?\\w","QEHxyFSkk&",[])), 
-?line <<"QEHxyFSkkaz">> = iolist_to_binary(re:replace("az","^a*?\\w","QEHxyFSkk&",[global])), 
-?line <<"atHEjpaKrKaaz">> = iolist_to_binary(re:replace("aaaz","^a*?\\w","&tHE\\1jp&KrK",[])), 
-?line <<"atHEjpaKrKaaz">> = iolist_to_binary(re:replace("aaaz","^a*?\\w","&tHE\\1jp&KrK",[global])), 
-?line <<"YaSeqaaeBiLO">> = iolist_to_binary(re:replace("a","^a*?\\w","Y&Seq\\1&&eBiLO",[])), 
-?line <<"YaSeqaaeBiLO">> = iolist_to_binary(re:replace("a","^a*?\\w","Y&Seq\\1&&eBiLO",[global])), 
-?line <<"UlaGeGnImSoQaHibARka">> = iolist_to_binary(re:replace("aa","^a*?\\w","Ul&GeGnImSoQ&HibARk",[])), 
-?line <<"UlaGeGnImSoQaHibARka">> = iolist_to_binary(re:replace("aa","^a*?\\w","Ul&GeGnImSoQ&HibARk",[global])), 
-?line <<"upDbxncvqbwvaaa">> = iolist_to_binary(re:replace("aaaa","^a*?\\w","upDbxncvqb\\1wv",[])), 
-?line <<"upDbxncvqbwvaaa">> = iolist_to_binary(re:replace("aaaa","^a*?\\w","upDbxncvqb\\1wv",[global])), 
-?line <<"MalqdUPrj+">> = iolist_to_binary(re:replace("a+","^a*?\\w","M&\\1lqdUPr\\1j\\1\\1",[])), 
-?line <<"MalqdUPrj+">> = iolist_to_binary(re:replace("a+","^a*?\\w","M&\\1lqdUPr\\1j\\1\\1",[global])), 
-?line <<"JTa+">> = iolist_to_binary(re:replace("aa+","^a*?\\w","JT",[])), 
-?line <<"JTa+">> = iolist_to_binary(re:replace("aa+","^a*?\\w","JT",[global])), 
-?line <<"nnvJUazdlV">> = iolist_to_binary(re:replace("az","^a+\\w","\\1nnvJU&dlV",[])), 
-?line <<"nnvJUazdlV">> = iolist_to_binary(re:replace("az","^a+\\w","\\1nnvJU&dlV",[global])), 
-?line <<"aaaz">> = iolist_to_binary(re:replace("aaaz","^a+\\w","\\1&",[])), 
-?line <<"aaaz">> = iolist_to_binary(re:replace("aaaz","^a+\\w","\\1&",[global])), 
-?line <<"daaRBaauOlL">> = iolist_to_binary(re:replace("aa","^a+\\w","d&RB&uO\\1lL",[])), 
-?line <<"daaRBaauOlL">> = iolist_to_binary(re:replace("aa","^a+\\w","d&RB&uO\\1lL",[global])), 
-?line <<"uaaaajkPXJqfBddNNYaaaa">> = iolist_to_binary(re:replace("aaaa","^a+\\w","u&jkPXJqfBddNNY&",[])), 
-?line <<"uaaaajkPXJqfBddNNYaaaa">> = iolist_to_binary(re:replace("aaaa","^a+\\w","u&jkPXJqfBddNNY&",[global])), 
-?line <<"YAJlePYgQb+">> = iolist_to_binary(re:replace("aa+","^a+\\w","YAJlePYgQb",[])), 
-?line <<"YAJlePYgQb+">> = iolist_to_binary(re:replace("aa+","^a+\\w","YAJlePYgQb",[global])), 
-?line <<"MXsW">> = iolist_to_binary(re:replace("az","^a+?\\w","MXsW",[])), 
-?line <<"MXsW">> = iolist_to_binary(re:replace("az","^a+?\\w","MXsW",[global])), 
-?line <<"GaaMGsaaPiMScaz">> = iolist_to_binary(re:replace("aaaz","^a+?\\w","G&MGs&P\\1i\\1MSc",[])), 
-?line <<"GaaMGsaaPiMScaz">> = iolist_to_binary(re:replace("aaaz","^a+?\\w","G&MGs&P\\1i\\1MSc",[global])), 
-?line <<"aaYUHgT">> = iolist_to_binary(re:replace("aa","^a+?\\w","&YUHgT",[])), 
-?line <<"aaYUHgT">> = iolist_to_binary(re:replace("aa","^a+?\\w","&YUHgT",[global])), 
-?line <<"ePknVhaa">> = iolist_to_binary(re:replace("aaaa","^a+?\\w","ePknVh\\1",[])), 
-?line <<"ePknVhaa">> = iolist_to_binary(re:replace("aaaa","^a+?\\w","ePknVh\\1",[global])), 
-?line <<"+">> = iolist_to_binary(re:replace("aa+","^a+?\\w","\\1",[])), 
-?line <<"+">> = iolist_to_binary(re:replace("aa+","^a+?\\w","\\1",[global])), 
-?line <<"AFRGuhtn1234567890rEtjU">> = iolist_to_binary(re:replace("1234567890","^\\d{8}\\w{2,}","\\1AFRGuhtn&rEtjU",[])), 
-?line <<"AFRGuhtn1234567890rEtjU">> = iolist_to_binary(re:replace("1234567890","^\\d{8}\\w{2,}","\\1AFRGuhtn&rEtjU",[global])), 
-?line <<"nNSL12345678abRY">> = iolist_to_binary(re:replace("12345678ab","^\\d{8}\\w{2,}","nNSL&RY",[])), 
-?line <<"nNSL12345678abRY">> = iolist_to_binary(re:replace("12345678ab","^\\d{8}\\w{2,}","nNSL&RY",[global])), 
-?line <<"12345678__JUDy">> = iolist_to_binary(re:replace("12345678__","^\\d{8}\\w{2,}","&JUDy",[])), 
-?line <<"12345678__JUDy">> = iolist_to_binary(re:replace("12345678__","^\\d{8}\\w{2,}","&JUDy",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8}\\w{2,}","&OcK\\1P&XNvgrP",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8}\\w{2,}","&OcK\\1P&XNvgrP",[global])), 
-?line <<"1234567">> = iolist_to_binary(re:replace("1234567","^\\d{8}\\w{2,}","&Mo",[])), 
-?line <<"1234567">> = iolist_to_binary(re:replace("1234567","^\\d{8}\\w{2,}","&Mo",[global])), 
-?line <<"O">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}$","O",[])), 
-?line <<"O">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}$","O",[global])), 
-?line <<"1234b1234n">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}$","&b&n",[])), 
-?line <<"1234b1234n">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}$","&b&n",[global])), 
-?line <<"YBp12345Ul">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}$","YBp&Ul",[])), 
-?line <<"YBp12345Ul">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}$","YBp&Ul",[global])), 
-?line <<"SVHQqBtcrMAtQxy">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}$","SVHQqBtcrMAtQxy\\1",[])), 
-?line <<"SVHQqBtcrMAtQxy">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}$","SVHQqBtcrMAtQxy\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[aeiou\\d]{4,5}$","ne",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[aeiou\\d]{4,5}$","ne",[global])), 
-?line <<"123456">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}$","QA&F\\1LJ",[])), 
-?line <<"123456">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}$","QA&F\\1LJ",[global])), 
-?line <<"gKGpFvTeUK">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}?","gKGpFvTeUK",[])), 
-?line <<"gKGpFvTeUK">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}?","gKGpFvTeUK",[global])), 
-?line <<"LCEqvLxHGWXWrexD">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}?","LCE\\1qvL\\1xHGWXWrexD",[])), 
-?line <<"LCEqvLxHGWXWrexD">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}?","LCE\\1qvL\\1xHGWXWrexD",[global])), 
-?line <<"QWV1234vhndnkkT1234l5">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}?","\\1QWV&\\1vhndnkk\\1T&l",[])), 
-?line <<"QWV1234vhndnkkT1234l5">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}?","\\1QWV&\\1vhndnkk\\1T&l",[global])), 
-?line <<"aaaaIaaaayaaaaEoAPYra">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}?","&I&y&E\\1oAPYr",[])), 
-?line <<"aaaaIaaaayaaaaEoAPYra">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}?","&I&y&E\\1oAPYr",[global])), 
-?line <<"xKUWgRs56">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}?","xKUWgRs",[])), 
-?line <<"xKUWgRs56">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}?","xKUWgRs",[global])), 
-?line <<"JlUywcabcvRabcPFPabcYSXE">> = iolist_to_binary(re:replace("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z","JlUywc\\1vR\\1PFP\\1YSXE",[])), 
-?line <<"JlUywcabcvRabcPFPabcYSXE">> = iolist_to_binary(re:replace("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z","JlUywc\\1vR\\1PFP\\1YSXE",[global])), 
-?line <<"def=defdefdefbucdef=defdefdef">> = iolist_to_binary(re:replace("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z","&buc&",[])), 
-?line <<"def=defdefdefbucdef=defdefdef">> = iolist_to_binary(re:replace("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z","&buc&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z","AYuyHUCDlwjQc\\1OS",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z","AYuyHUCDlwjQc\\1OS",[global])), 
-?line <<"abc=defdef">> = iolist_to_binary(re:replace("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z","PM&h\\1\\1xD\\1&",[])), 
-?line <<"abc=defdef">> = iolist_to_binary(re:replace("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z","PM&h\\1\\1xD\\1&",[global])), 
-?line <<"UFhaagoHObvFc">> = iolist_to_binary(re:replace("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","UFh\\1\\1goHObvFc",[])), 
-?line <<"UFhaagoHObvFc">> = iolist_to_binary(re:replace("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","UFh\\1\\1goHObvFc",[global])), 
-?line <<"aabcdefghijkkkkcda2abcdefghijkkkkcda2abcdefghijkkkkcda2vuYabcdefghijkkkkcda2xdabcdefghijkkkkcda2njaJQEF">> = iolist_to_binary(re:replace("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","\\1&&&vuY&xd&nj\\1JQEF",[])), 
-?line <<"aabcdefghijkkkkcda2abcdefghijkkkkcda2abcdefghijkkkkcda2vuYabcdefghijkkkkcda2xdabcdefghijkkkkcda2njaJQEF">> = iolist_to_binary(re:replace("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","\\1&&&vuY&xd&nj\\1JQEF",[global])), 
-?line <<"mcataractcataract cataract23YTkMcataract cataract23">> = iolist_to_binary(re:replace("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","m\\1&YTkM&",[])), 
-?line <<"mcataractcataract cataract23YTkMcataract cataract23">> = iolist_to_binary(re:replace("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","m\\1&YTkM&",[global])), 
-?line <<"OXcatatonicoHKaXHQpryKFyhVcatatonic">> = iolist_to_binary(re:replace("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","OX\\1oHKaXHQpryKFyhV\\1",[])), 
-?line <<"OXcatatonicoHKaXHQpryKFyhVcatatonic">> = iolist_to_binary(re:replace("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","OX\\1oHKaXHQpryKFyhV\\1",[global])), 
-?line <<"caterpillarcaterpillar caterpillar23foVlhvplLSebcaterpillar">> = iolist_to_binary(re:replace("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","\\1&foVlhvplLSeb\\1",[])), 
-?line <<"caterpillarcaterpillar caterpillar23foVlhvplLSebcaterpillar">> = iolist_to_binary(re:replace("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","\\1&foVlhvplLSeb\\1",[global])), 
-?line <<"From abcd  Mon Sep 01 12:33TNVlANgYabcdabcdFrom abcd  Mon Sep 01 12:33aIFrom abcd  Mon Sep 01 12:33TqsabcdQ:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]","&TNVlANgY\\1\\1&aI&Tqs\\1Q",[])), 
-?line <<"From abcd  Mon Sep 01 12:33TNVlANgYabcdabcdFrom abcd  Mon Sep 01 12:33aIFrom abcd  Mon Sep 01 12:33TqsabcdQ:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]","&TNVlANgY\\1\\1&aI&Tqs\\1Q",[global])), 
-?line <<"isKrFrom abcd  Mon Sep 01 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","isKr&",[])), 
-?line <<"isKrFrom abcd  Mon Sep 01 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","isKr&",[global])), 
-?line <<"lNtEJS:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","lNtEJS",[])), 
-?line <<"lNtEJS:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","lNtEJS",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","aR\\1i&Fxe",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","aR\\1i&Fxe",[global])), 
-?line <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","\\1NsrJ&\\1&PtWlXT",[])), 
-?line <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","\\1NsrJ&\\1&PtWlXT",[global])), 
-?line <<"nGixKixjMO12
-34BhoReSp">> = iolist_to_binary(re:replace("12
-34","^12.34","nGixKixjMO&BhoReSp",[dotall])), 
-?line <<"nGixKixjMO12
-34BhoReSp">> = iolist_to_binary(re:replace("12
-34","^12.34","nGixKixjMO&BhoReSp",[dotall,global])), 
-?line <<"12
34OBfpF12
3412
34fh">> = iolist_to_binary(re:replace("12
34","^12.34","&OBfpF&&fh",[dotall])), 
-?line <<"12
34OBfpF12
3412
34fh">> = iolist_to_binary(re:replace("12
34","^12.34","&OBfpF&&fh",[dotall,
-                                                                                                                                                                                        global])), 
-?line <<"the quick brownhubrownbrownubrownQ	 fox">> = iolist_to_binary(re:replace("the quick brown	 fox","\\w+(?=\\t)","&hu&&u&Q",[])), 
-?line <<"the quick brownhubrownbrownubrownQ	 fox">> = iolist_to_binary(re:replace("the quick brown	 fox","\\w+(?=\\t)","&hu&&u&Q",[global])), 
-?line <<"foobar is uqH">> = iolist_to_binary(re:replace("foobar is foolish see?","foo(?!bar)(.*)","uqH",[])), 
-?line <<"foobar is uqH">> = iolist_to_binary(re:replace("foobar is foolish see?","foo(?!bar)(.*)","uqH",[global])), 
-?line <<"foobar cn">> = iolist_to_binary(re:replace("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)","n",[])), 
-?line <<"foobar cn">> = iolist_to_binary(re:replace("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)","n",[global])), 
-?line <<"CpDjibh">> = iolist_to_binary(re:replace("barrel","(?:(?!foo)...|^.{0,2})bar(.*)","CpDjibh",[])), 
-?line <<"CpDjibh">> = iolist_to_binary(re:replace("barrel","(?:(?!foo)...|^.{0,2})bar(.*)","CpDjibh",[global])), 
-?line <<"wlcfLrelprelgrelD">> = iolist_to_binary(re:replace("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)","wlcfL\\1p\\1g\\1D",[])), 
-?line <<"wlcfLrelprelgrelD">> = iolist_to_binary(re:replace("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)","wlcfL\\1p\\1g\\1D",[global])), 
-?line <<"wbDA barrelYA barrelcQA barrelplrelA barrelXPrel">> = iolist_to_binary(re:replace("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)","wbD&Y&cQ&pl\\1&XP\\1",[])), 
-?line <<"wbDA barrelYA barrelcQA barrelplrelA barrelXPrel">> = iolist_to_binary(re:replace("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)","wbD&Y&cQ&pl\\1&XP\\1",[global])), 
-?line <<"PJMqUabctmoSPC456">> = iolist_to_binary(re:replace("abc456","^(\\D*)(?=\\d)(?!123)","PJMqU\\1tmoSPC",[])), 
-?line <<"PJMqUabctmoSPC456">> = iolist_to_binary(re:replace("abc456","^(\\D*)(?=\\d)(?!123)","PJMqU\\1tmoSPC",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","k\\1&lgXOi",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","k\\1&lgXOi",[global])), 
-?line <<"abc123">> = iolist_to_binary(re:replace("abc123","^(\\D*)(?=\\d)(?!123)","UgE&XTVNX&ygyaQdYO&",[])), 
-?line <<"abc123">> = iolist_to_binary(re:replace("abc123","^(\\D*)(?=\\d)(?!123)","UgE&XTVNX&ygyaQdYO&",[global])), 
-?line <<"CByu1234Oj12341234">> = iolist_to_binary(re:replace("1234","^1234(?# test newlines
-  inside)","CByu&Oj&&",[])), 
-?line <<"CByu1234Oj12341234">> = iolist_to_binary(re:replace("1234","^1234(?# test newlines
-  inside)","CByu&Oj&&",[global])), 
-?line <<"AVF1234DSEvHi">> = iolist_to_binary(re:replace("1234","^1234 #comment in extended re
-  ","AVF&DSEvHi",[extended])), 
-?line <<"AVF1234DSEvHi">> = iolist_to_binary(re:replace("1234","^1234 #comment in extended re
-  ","AVF&DSEvHi",[extended,global])), 
-?line <<"wiUNsYJdROkkkabcdSabcdjvS">> = iolist_to_binary(re:replace("abcd","#rhubarb
-  abcd","wiUNsYJdROkkk&S&jvS",[extended])), 
-?line <<"wiUNsYJdROkkkabcdSabcdjvS">> = iolist_to_binary(re:replace("abcd","#rhubarb
-  abcd","wiUNsYJdROkkk&S&jvS",[extended,global])), 
-?line <<"wxabcdyOpSDe">> = iolist_to_binary(re:replace("abcd","^abcd#rhubarb","wx&yOpSDe",[extended])), 
-?line <<"wxabcdyOpSDe">> = iolist_to_binary(re:replace("abcd","^abcd#rhubarb","wx&yOpSDe",[extended,
+    <<"aXaxRLpEPRwSlQEEw">> = iolist_to_binary(re:replace("E","([\\da-f:]+)$","aXaxRLp\\1PRwSlQ\\1\\1w",[caseless])), 
+    <<"aXaxRLpEPRwSlQEEw">> = iolist_to_binary(re:replace("E","([\\da-f:]+)$","aXaxRLp\\1PRwSlQ\\1\\1w",[caseless,
+                                                                                                                                                                                                                        global])), 
+    <<"srXTndsE::::kfsP::LR">> = iolist_to_binary(re:replace("::","([\\da-f:]+)$","srXTndsE&&kfsP&LR",[caseless])), 
+    <<"srXTndsE::::kfsP::LR">> = iolist_to_binary(re:replace("::","([\\da-f:]+)$","srXTndsE&&kfsP&LR",[caseless,
+                                                                                                                                                                                                              global])), 
+    <<"5f03:12C0::932ejAFV">> = iolist_to_binary(re:replace("5f03:12C0::932e","([\\da-f:]+)$","&jAFV",[caseless])), 
+    <<"5f03:12C0::932ejAFV">> = iolist_to_binary(re:replace("5f03:12C0::932e","([\\da-f:]+)$","&jAFV",[caseless,
+                                                                                                                                                                                                              global])), 
+    <<"fed yjdefSWAl">> = iolist_to_binary(re:replace("fed def","([\\da-f:]+)$","yj&SWAl",[caseless])), 
+    <<"fed yjdefSWAl">> = iolist_to_binary(re:replace("fed def","([\\da-f:]+)$","yj&SWAl",[caseless,
+                                                                                                                                                                                                  global])), 
+    <<"Any old stuqffffafSffkdOlpalffuffR">> = iolist_to_binary(re:replace("Any old stuff","([\\da-f:]+)$","q&\\1afS&kdOlpal&u\\1R",[caseless])), 
+    <<"Any old stuqffffafSffkdOlpalffuffR">> = iolist_to_binary(re:replace("Any old stuff","([\\da-f:]+)$","q&\\1afS&kdOlpal&u\\1R",[caseless,
+                                                                                                                                                                                                                                                global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","([\\da-f:]+)$","IyKK\\1DBvmhe",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","([\\da-f:]+)$","IyKK\\1DBvmhe",[caseless,
+                                                                                                                                                                                                                      global])), 
+    <<"0zzz">> = iolist_to_binary(re:replace("0zzz","([\\da-f:]+)$","rdo\\1x&nKGAa",[caseless])), 
+    <<"0zzz">> = iolist_to_binary(re:replace("0zzz","([\\da-f:]+)$","rdo\\1x&nKGAa",[caseless,
+                                                                                                                                                                                                         global])), 
+    <<"gzzz">> = iolist_to_binary(re:replace("gzzz","([\\da-f:]+)$","CUmRDqbGoniV\\1",[caseless])), 
+    <<"gzzz">> = iolist_to_binary(re:replace("gzzz","([\\da-f:]+)$","CUmRDqbGoniV\\1",[caseless,
+                                                                                                                                                                                                            global])), 
+    <<"fed ">> = iolist_to_binary(re:replace("fed ","([\\da-f:]+)$","bMg\\1\\1Smk",[caseless])), 
+    <<"fed ">> = iolist_to_binary(re:replace("fed ","([\\da-f:]+)$","bMg\\1\\1Smk",[caseless,
+                                                                                                                                                                                                       global])), 
+    <<"Any old rubbish">> = iolist_to_binary(re:replace("Any old rubbish","([\\da-f:]+)$","&NxG\\1osbOqKBX\\1UUxiI",[caseless])), 
+    <<"Any old rubbish">> = iolist_to_binary(re:replace("Any old rubbish","([\\da-f:]+)$","&NxG\\1osbOqKBX\\1UUxiI",[caseless,
+                                                                                                                                                                                                                                                    global])), 
+    <<"xn1t">> = iolist_to_binary(re:replace(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","xn\\1t",[])), 
+    <<"xn1t">> = iolist_to_binary(re:replace(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","xn\\1t",[global])), 
+    <<"xuA.12.123.0pmID">> = iolist_to_binary(re:replace("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","xu&pmID",[])), 
+    <<"xuA.12.123.0pmID">> = iolist_to_binary(re:replace("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","xu&pmID",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","p&&t\\1\\1M&oKI",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","p&&t\\1\\1M&oKI",[global])), 
+    <<".1.2.3333">> = iolist_to_binary(re:replace(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","&p",[])), 
+    <<".1.2.3333">> = iolist_to_binary(re:replace(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","&p",[global])), 
+    <<"1.2.3">> = iolist_to_binary(re:replace("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","\\1&LbVkk&K&F&b",[])), 
+    <<"1.2.3">> = iolist_to_binary(re:replace("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","\\1&LbVkk&K&F&b",[global])), 
+    <<"1234.2.3">> = iolist_to_binary(re:replace("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","Paehh\\1",[])), 
+    <<"1234.2.3">> = iolist_to_binary(re:replace("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$","Paehh\\1",[global])), 
+    <<"1LAfJBRwFABikGlQ1 IN SOA non-sp1 non-sp2(jE1 IN SOA non-sp1 non-sp2(">> = iolist_to_binary(re:replace("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","\\1LAfJBRwFABikGlQ&jE&",[])), 
+    <<"1LAfJBRwFABikGlQ1 IN SOA non-sp1 non-sp2(jE1 IN SOA non-sp1 non-sp2(">> = iolist_to_binary(re:replace("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","\\1LAfJBRwFABikGlQ&jE&",[global])), 
+    <<"vcbW">> = iolist_to_binary(re:replace("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","vcbW",[])), 
+    <<"vcbW">> = iolist_to_binary(re:replace("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","vcbW",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","N",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","N",[global])), 
+    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(re:replace("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","F\\1lEQb&&o&c&&",[])), 
+    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(re:replace("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$","F\\1lEQb&&o&c&&",[global])), 
+    <<"csJqaGLOa.a.Ca.Ma.ja.r">> = iolist_to_binary(re:replace("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","c\\1s\\1JqaGLO&&C&M&j&r",[])), 
+    <<"csJqaGLOa.a.Ca.Ma.ja.r">> = iolist_to_binary(re:replace("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","c\\1s\\1JqaGLO&&C&M&j&r",[global])), 
+    <<"TBVOOLuZ.Y">> = iolist_to_binary(re:replace("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","TBVOO\\1Lu&Y",[])), 
+    <<"TBVOOLuZ.Y">> = iolist_to_binary(re:replace("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","TBVOO\\1Lu&Y",[global])), 
+    <<"lAHLHAaNu2.yfAUu">> = iolist_to_binary(re:replace("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","lAH\\1LHAaNu\\1&yfAUu",[])), 
+    <<"lAHLHAaNu2.yfAUu">> = iolist_to_binary(re:replace("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","lAH\\1LHAaNu\\1&yfAUu",[global])), 
+    <<"EKpab-c.pq-r.">> = iolist_to_binary(re:replace("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","EKp&",[])), 
+    <<"EKpab-c.pq-r.">> = iolist_to_binary(re:replace("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","EKp&",[global])), 
+    <<"Ersxk.zzz.ac.uk.">> = iolist_to_binary(re:replace("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","Er&",[])), 
+    <<"Ersxk.zzz.ac.uk.">> = iolist_to_binary(re:replace("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","Er&",[global])), 
+    <<"Xqs">> = iolist_to_binary(re:replace("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","Xqs",[])), 
+    <<"Xqs">> = iolist_to_binary(re:replace("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","Xqs",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","&DsB",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","&DsB",[global])), 
+    <<"-abc.peq.">> = iolist_to_binary(re:replace("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","Kqq&&AIru&&FA\\1gbG",[])), 
+    <<"-abc.peq.">> = iolist_to_binary(re:replace("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$","Kqq&&AIru&&FA\\1gbG",[global])), 
+    <<"OmWMM*.acuHiylpsiKq">> = iolist_to_binary(re:replace("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","\\1OmWMM&cuHiylpsiKq",[])), 
+    <<"OmWMM*.acuHiylpsiKq">> = iolist_to_binary(re:replace("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","\\1OmWMM&cuHiylpsiKq",[global])), 
+    <<"j0-a0-aXQ">> = iolist_to_binary(re:replace("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","j\\1\\1XQ",[])), 
+    <<"j0-a0-aXQ">> = iolist_to_binary(re:replace("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","j\\1\\1XQ",[global])), 
+    <<"r3-b">> = iolist_to_binary(re:replace("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","r\\1",[])), 
+    <<"r3-b">> = iolist_to_binary(re:replace("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","r\\1",[global])), 
+    <<"EAXRf*.c-a.b-cpOaqRe*.c-a.b-c-a*.c-a.b-cpGer*.c-a.b-c">> = iolist_to_binary(re:replace("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","EAXRf&pOaqRe&\\1&pGer&",[])), 
+    <<"EAXRf*.c-a.b-cpOaqRe*.c-a.b-c-a*.c-a.b-cpGer*.c-a.b-c">> = iolist_to_binary(re:replace("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","EAXRf&pOaqRe&\\1&pGer&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","RmO\\1XAOA\\1p",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","RmO\\1XAOA\\1p",[global])), 
+    <<"*.0">> = iolist_to_binary(re:replace("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","&&iBqKyU",[])), 
+    <<"*.0">> = iolist_to_binary(re:replace("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","&&iBqKyU",[global])), 
+    <<"*.a-">> = iolist_to_binary(re:replace("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","sHEtAniwkH&",[])), 
+    <<"*.a-">> = iolist_to_binary(re:replace("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","sHEtAniwkH&",[global])), 
+    <<"*.a-b.c-">> = iolist_to_binary(re:replace("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","qy",[])), 
+    <<"*.a-b.c-">> = iolist_to_binary(re:replace("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","qy",[global])), 
+    <<"*.c-a.0-c">> = iolist_to_binary(re:replace("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","iH\\1J\\1\\1&iul\\1uosFI",[])), 
+    <<"*.c-a.0-c">> = iolist_to_binary(re:replace("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$","iH\\1J\\1\\1&iul\\1uosFI",[global])), 
+    <<"RW">> = iolist_to_binary(re:replace("abde","^(?=ab(de))(abd)(e)","RW",[])), 
+    <<"RW">> = iolist_to_binary(re:replace("abde","^(?=ab(de))(abd)(e)","RW",[global])), 
+    <<"xrNrabdft">> = iolist_to_binary(re:replace("abdf","^(?!(ab)de|x)(abd)(f)","xrNr&t",[])), 
+    <<"xrNrabdft">> = iolist_to_binary(re:replace("abdf","^(?!(ab)de|x)(abd)(f)","xrNr&t",[global])), 
+    <<"PaGpuabSCqabcdabababpbcd">> = iolist_to_binary(re:replace("abcd","^(?=(ab(cd)))(ab)","PaGpu&SCq\\1&&&pb",[])), 
+    <<"PaGpuabSCqabcdabababpbcd">> = iolist_to_binary(re:replace("abcd","^(?=(ab(cd)))(ab)","PaGpu&SCq\\1&&&pb",[global])), 
+    <<"eB.d.dgKSFa.b.c.dVO">> = iolist_to_binary(re:replace("a.b.c.d","^[\\da-f](\\.[\\da-f])*$","eB\\1\\1gKSF&VO",[caseless])), 
+    <<"eB.d.dgKSFa.b.c.dVO">> = iolist_to_binary(re:replace("a.b.c.d","^[\\da-f](\\.[\\da-f])*$","eB\\1\\1gKSF&VO",[caseless,
+                                                                                                                                                                                                                                            global])), 
+    <<"jpA.B.C.D.Dc.DTWA.B.C.Dl.DKIiy">> = iolist_to_binary(re:replace("A.B.C.D","^[\\da-f](\\.[\\da-f])*$","jp&\\1c\\1TW&l\\1KIiy",[caseless])), 
+    <<"jpA.B.C.D.Dc.DTWA.B.C.Dl.DKIiy">> = iolist_to_binary(re:replace("A.B.C.D","^[\\da-f](\\.[\\da-f])*$","jp&\\1c\\1TW&l\\1KIiy",[caseless,
+                                                                                                                                                                                                                                                          global])), 
+    <<"NToo.Ca.Ca.b.c.1.2.3.C">> = iolist_to_binary(re:replace("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$","NToo\\1a\\1&",[caseless])), 
+    <<"NToo.Ca.Ca.b.c.1.2.3.C">> = iolist_to_binary(re:replace("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$","NToo\\1a\\1&",[caseless,
+                                                                                                                                                                                                                                                  global])), 
+    <<"EftEvTFmRH">> = iolist_to_binary(re:replace("\"1234\"","^\\\".*\\\"\\s*(;.*)?$","\\1\\1EftEvTFmRH",[])), 
+    <<"EftEvTFmRH">> = iolist_to_binary(re:replace("\"1234\"","^\\\".*\\\"\\s*(;.*)?$","\\1\\1EftEvTFmRH",[global])), 
+    <<"j\"abcd\" ;Hyx\"abcd\" ;QTtQvYM\"abcd\" ;BK">> = iolist_to_binary(re:replace("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$","j&Hyx&QTtQvYM&BK",[])), 
+    <<"j\"abcd\" ;Hyx\"abcd\" ;QTtQvYM\"abcd\" ;BK">> = iolist_to_binary(re:replace("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$","j&Hyx&QTtQvYM&BK",[global])), 
+    <<"nM">> = iolist_to_binary(re:replace("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$","nM",[])), 
+    <<"nM">> = iolist_to_binary(re:replace("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$","nM",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\\".*\\\"\\s*(;.*)?$","oRWmakO\\1L&pj",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\\".*\\\"\\s*(;.*)?$","oRWmakO\\1L&pj",[global])), 
+    <<"\"1234\" : things">> = iolist_to_binary(re:replace("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$","kLuRd&B",[])), 
+    <<"\"1234\" : things">> = iolist_to_binary(re:replace("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$","kLuRd&B",[global])), 
+    <<"ixuQHwgCDVra">> = iolist_to_binary(re:replace("","^$","\\1&i\\1x\\1uQHw&\\1&gCDVra",[])), 
+    <<"ixuQHwgCDVra">> = iolist_to_binary(re:replace("","^$","\\1&i\\1x\\1uQHw&\\1&gCDVra",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^$","Rg\\1SwLH\\1bP\\1&&S\\1Xa\\1S&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^$","Rg\\1SwLH\\1bP\\1&&S\\1Xa\\1S&",[global])), 
+    <<"bgab cxhab cxfOtXqErdcf">> = iolist_to_binary(re:replace("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","bg&xh&xfOtXqE\\1rdcf",[extended])), 
+    <<"bgab cxhab cxfOtXqErdcf">> = iolist_to_binary(re:replace("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","bg&xh&xfOtXqE\\1rdcf",[extended,
+                                                                                                                                                                                                                                                                                                                                    global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","kltlQqVmioWPcgb\\1",[extended])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","kltlQqVmioWPcgb\\1",[extended,
+                                                                                                                                                                                                                                                                                                                                            global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","F\\1FmlIs\\1\\1A&gEMuW",[extended])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","F\\1FmlIs\\1\\1A&gEMuW",[extended,
+                                                                                                                                                                                                                                                                                                                                       global])), 
+    <<"ab cde">> = iolist_to_binary(re:replace("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","&wqEXOys\\1L",[extended])), 
+    <<"ab cde">> = iolist_to_binary(re:replace("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","&wqEXOys\\1L",[extended,
+                                                                                                                                                                                                                                                                                                                       global])), 
+    <<"yxGLPQCju">> = iolist_to_binary(re:replace("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","yxGLPQCju",[])), 
+    <<"yxGLPQCju">> = iolist_to_binary(re:replace("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","yxGLPQCju",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","JqU&Xjf\\1JY\\1c",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","JqU&Xjf\\1JY\\1c",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","ASnRhMlmWOb\\1Y&&",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","ASnRhMlmWOb\\1Y&&",[global])), 
+    <<"ab cde">> = iolist_to_binary(re:replace("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","QcD",[])), 
+    <<"ab cde">> = iolist_to_binary(re:replace("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)","QcD",[global])), 
+    <<"yao">> = iolist_to_binary(re:replace("a bcd","^   a\\ b[c ]d       $","\\1yao",[extended])), 
+    <<"yao">> = iolist_to_binary(re:replace("a bcd","^   a\\ b[c ]d       $","\\1yao",[extended,
+                                                                                                                                                                                                              global])), 
+    <<"TrwOQA">> = iolist_to_binary(re:replace("a b d","^   a\\ b[c ]d       $","TrwOQA",[extended])), 
+    <<"TrwOQA">> = iolist_to_binary(re:replace("a b d","^   a\\ b[c ]d       $","TrwOQA",[extended,
+                                                                                                                                                                                                             global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^   a\\ b[c ]d       $","&rUS&afjjm&",[extended])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^   a\\ b[c ]d       $","&rUS&afjjm&",[extended,
+                                                                                                                                                                                                                                      global])), 
+    <<"abcd">> = iolist_to_binary(re:replace("abcd","^   a\\ b[c ]d       $","L&XB\\1P",[extended])), 
+    <<"abcd">> = iolist_to_binary(re:replace("abcd","^   a\\ b[c ]d       $","L&XB\\1P",[extended,
+                                                                                                                                                                                                                 global])), 
+    <<"ab d">> = iolist_to_binary(re:replace("ab d","^   a\\ b[c ]d       $","UMS&\\1tPBWwogPDQ&",[extended])), 
+    <<"ab d">> = iolist_to_binary(re:replace("ab d","^   a\\ b[c ]d       $","UMS&\\1tPBWwogPDQ&",[extended,
+                                                                                                                                                                                                                                      global])), 
+    <<"xToOqchxqabch">> = iolist_to_binary(re:replace("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$","xToOqchxq\\1h",[])), 
+    <<"xToOqchxqabch">> = iolist_to_binary(re:replace("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$","xToOqchxq\\1h",[global])), 
+    ok.
+run2() ->
+    <<"LpAcLI">> = iolist_to_binary(re:replace("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$","LpAcLI",[])), 
+    <<"LpAcLI">> = iolist_to_binary(re:replace("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$","LpAcLI",[global])), 
+    <<"MFa+ Z0+
+QQ">> = iolist_to_binary(re:replace("a+ Z0+
+","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]","MF\\1&QQ",[])), 
+    <<"MFa+ Z0+
+QQ">> = iolist_to_binary(re:replace("a+ Z0+
+","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]","MF\\1&QQ",[global])), 
+    <<".^$(*+)|{?,?}.^$(*+)|{?,?}suXo">> = iolist_to_binary(re:replace(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+","&&s\\1uX\\1o",[])), 
+    <<".^$(*+)|{?,?}.^$(*+)|{?,?}suXo">> = iolist_to_binary(re:replace(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+","&&s\\1uX\\1o",[global])), 
+    <<"KDgPpAUcYEXSK">> = iolist_to_binary(re:replace("z","^a*\\w","KDgP\\1pAUcYEX\\1SK",[])), 
+    <<"KDgPpAUcYEXSK">> = iolist_to_binary(re:replace("z","^a*\\w","KDgP\\1pAUcYEX\\1SK",[global])), 
+    <<"slipoLkQ">> = iolist_to_binary(re:replace("az","^a*\\w","slipoLkQ",[])), 
+    <<"slipoLkQ">> = iolist_to_binary(re:replace("az","^a*\\w","slipoLkQ",[global])), 
+    <<"ritcgAWBT">> = iolist_to_binary(re:replace("aaaz","^a*\\w","ritcgAWBT",[])), 
+    <<"ritcgAWBT">> = iolist_to_binary(re:replace("aaaz","^a*\\w","ritcgAWBT",[global])), 
+    <<"XcRsWQyYNjiYwb">> = iolist_to_binary(re:replace("a","^a*\\w","X\\1cRsWQyYNjiYwb",[])), 
+    <<"XcRsWQyYNjiYwb">> = iolist_to_binary(re:replace("a","^a*\\w","X\\1cRsWQyYNjiYwb",[global])), 
+    <<"MaaFKe">> = iolist_to_binary(re:replace("aa","^a*\\w","M&F\\1\\1K\\1e",[])), 
+    <<"MaaFKe">> = iolist_to_binary(re:replace("aa","^a*\\w","M&F\\1\\1K\\1e",[global])), 
+    <<"h">> = iolist_to_binary(re:replace("aaaa","^a*\\w","h",[])), 
+    <<"h">> = iolist_to_binary(re:replace("aaaa","^a*\\w","h",[global])), 
+    <<"qYN+">> = iolist_to_binary(re:replace("a+","^a*\\w","qYN",[])), 
+    <<"qYN+">> = iolist_to_binary(re:replace("a+","^a*\\w","qYN",[global])), 
+    <<"EfVPxKaaaaewBXaaaawUW+">> = iolist_to_binary(re:replace("aa+","^a*\\w","EfVPx\\1K&&ewBX&&wUW",[])), 
+    <<"EfVPxKaaaaewBXaaaawUW+">> = iolist_to_binary(re:replace("aa+","^a*\\w","EfVPx\\1K&&ewBX&&wUW",[global])), 
+    <<"hslzzPMpWzzIkdYL">> = iolist_to_binary(re:replace("z","^a*?\\w","hsl&&PMpW&&I\\1kdYL",[])), 
+    <<"hslzzPMpWzzIkdYL">> = iolist_to_binary(re:replace("z","^a*?\\w","hsl&&PMpW&&I\\1kdYL",[global])), 
+    <<"RBz">> = iolist_to_binary(re:replace("az","^a*?\\w","R\\1B",[])), 
+    <<"RBz">> = iolist_to_binary(re:replace("az","^a*?\\w","R\\1B",[global])), 
+    <<"IvEhVdavyqnaaz">> = iolist_to_binary(re:replace("aaaz","^a*?\\w","IvEhVd&vy\\1qn",[])), 
+    <<"IvEhVdavyqnaaz">> = iolist_to_binary(re:replace("aaaz","^a*?\\w","IvEhVd&vy\\1qn",[global])), 
+    <<"JnVaaH">> = iolist_to_binary(re:replace("a","^a*?\\w","JnV&&\\1H\\1",[])), 
+    <<"JnVaaH">> = iolist_to_binary(re:replace("a","^a*?\\w","JnV&&\\1H\\1",[global])), 
+    <<"JFfVUa">> = iolist_to_binary(re:replace("aa","^a*?\\w","\\1J\\1FfVU",[])), 
+    <<"JFfVUa">> = iolist_to_binary(re:replace("aa","^a*?\\w","\\1J\\1FfVU",[global])), 
+    <<"aDPvxaYarvWrRabShaHaaa">> = iolist_to_binary(re:replace("aaaa","^a*?\\w","aDPvx&Y&rvWrR&bShaH",[])), 
+    <<"aDPvxaYarvWrRabShaHaaa">> = iolist_to_binary(re:replace("aaaa","^a*?\\w","aDPvx&Y&rvWrR&bShaH",[global])), 
+    <<"Aih+">> = iolist_to_binary(re:replace("a+","^a*?\\w","Ai\\1h",[])), 
+    <<"Aih+">> = iolist_to_binary(re:replace("a+","^a*?\\w","Ai\\1h",[global])), 
+    <<"xbMsOXBdaaAa+">> = iolist_to_binary(re:replace("aa+","^a*?\\w","xbMsOXBd&&A",[])), 
+    <<"xbMsOXBdaaAa+">> = iolist_to_binary(re:replace("aa+","^a*?\\w","xbMsOXBd&&A",[global])), 
+    <<"azvPASpIqMtrikazJ">> = iolist_to_binary(re:replace("az","^a+\\w","&vPASpIq\\1Mt\\1r\\1ik&J",[])), 
+    <<"azvPASpIqMtrikazJ">> = iolist_to_binary(re:replace("az","^a+\\w","&vPASpIq\\1Mt\\1r\\1ik&J",[global])), 
+    <<"ofnsOlLLpmuNPiXJE">> = iolist_to_binary(re:replace("aaaz","^a+\\w","ofnsOlLLpmuNPiXJE",[])), 
+    <<"ofnsOlLLpmuNPiXJE">> = iolist_to_binary(re:replace("aaaz","^a+\\w","ofnsOlLLpmuNPiXJE",[global])), 
+    <<"baaDpxe">> = iolist_to_binary(re:replace("aa","^a+\\w","b&D\\1pxe",[])), 
+    <<"baaDpxe">> = iolist_to_binary(re:replace("aa","^a+\\w","b&D\\1pxe",[global])), 
+    <<"blkOVluqr">> = iolist_to_binary(re:replace("aaaa","^a+\\w","b\\1lkOV\\1luqr",[])), 
+    <<"blkOVluqr">> = iolist_to_binary(re:replace("aaaa","^a+\\w","b\\1lkOV\\1luqr",[global])), 
+    <<"RNRBD+">> = iolist_to_binary(re:replace("aa+","^a+\\w","RNRBD",[])), 
+    <<"RNRBD+">> = iolist_to_binary(re:replace("aa+","^a+\\w","RNRBD",[global])), 
+    <<"CyazerWDQaNazazxDT">> = iolist_to_binary(re:replace("az","^a+?\\w","Cy&\\1erWDQaN&&xDT\\1",[])), 
+    <<"CyazerWDQaNazazxDT">> = iolist_to_binary(re:replace("az","^a+?\\w","Cy&\\1erWDQaN&&xDT\\1",[global])), 
+    <<"pqJrRaaNRaz">> = iolist_to_binary(re:replace("aaaz","^a+?\\w","pq\\1J\\1rR&NR",[])), 
+    <<"pqJrRaaNRaz">> = iolist_to_binary(re:replace("aaaz","^a+?\\w","pq\\1J\\1rR&NR",[global])), 
+    <<"aaAdj">> = iolist_to_binary(re:replace("aa","^a+?\\w","&Ad\\1j",[])), 
+    <<"aaAdj">> = iolist_to_binary(re:replace("aa","^a+?\\w","&Ad\\1j",[global])), 
+    <<"JsRWaaEHmuaaFaaArLaNaaaa">> = iolist_to_binary(re:replace("aaaa","^a+?\\w","JsRW&EHmu&F&\\1ArLaN&",[])), 
+    <<"JsRWaaEHmuaaFaaArLaNaaaa">> = iolist_to_binary(re:replace("aaaa","^a+?\\w","JsRW&EHmu&F&\\1ArLaN&",[global])), 
+    <<"hQmeo+">> = iolist_to_binary(re:replace("aa+","^a+?\\w","hQmeo",[])), 
+    <<"hQmeo+">> = iolist_to_binary(re:replace("aa+","^a+?\\w","hQmeo",[global])), 
+    <<"tSwgJd1234567890">> = iolist_to_binary(re:replace("1234567890","^\\d{8}\\w{2,}","tSwgJd&",[])), 
+    <<"tSwgJd1234567890">> = iolist_to_binary(re:replace("1234567890","^\\d{8}\\w{2,}","tSwgJd&",[global])), 
+    <<"u">> = iolist_to_binary(re:replace("12345678ab","^\\d{8}\\w{2,}","u",[])), 
+    <<"u">> = iolist_to_binary(re:replace("12345678ab","^\\d{8}\\w{2,}","u",[global])), 
+    <<"12345678__JvTBhjF">> = iolist_to_binary(re:replace("12345678__","^\\d{8}\\w{2,}","&JvTBhj\\1F",[])), 
+    <<"12345678__JvTBhjF">> = iolist_to_binary(re:replace("12345678__","^\\d{8}\\w{2,}","&JvTBhj\\1F",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8}\\w{2,}","JQw&GNCBooSB",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8}\\w{2,}","JQw&GNCBooSB",[global])), 
+    <<"1234567">> = iolist_to_binary(re:replace("1234567","^\\d{8}\\w{2,}","oTp&mFd\\1",[])), 
+    <<"1234567">> = iolist_to_binary(re:replace("1234567","^\\d{8}\\w{2,}","oTp&mFd\\1",[global])), 
+    <<"truoieVC">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}$","tr&V\\1\\1C",[])), 
+    <<"truoieVC">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}$","tr&V\\1\\1C",[global])), 
+    <<"SIBB1234a">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}$","SIBB\\1&a",[])), 
+    <<"SIBB1234a">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}$","SIBB\\1&a",[global])), 
+    <<"12345KiNQWVML12345HyU">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}$","&KiN\\1QWVML&HyU",[])), 
+    <<"12345KiNQWVML12345HyU">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}$","&KiN\\1QWVML&HyU",[global])), 
+    <<"hxENo">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}$","\\1hxENo\\1",[])), 
+    <<"hxENo">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}$","\\1hxENo\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[aeiou\\d]{4,5}$","h&RGpLB\\1hlS&pk\\1&yKh",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[aeiou\\d]{4,5}$","h&RGpLB\\1hlS&pk\\1&yKh",[global])), 
+    <<"123456">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}$","&\\1rrEfxa\\1mc",[])), 
+    <<"123456">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}$","&\\1rrEfxa\\1mc",[global])), 
+    <<"hJscruoieFbuoie">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}?","hJs\\1cr&Fb&",[])), 
+    <<"hJscruoieFbuoie">> = iolist_to_binary(re:replace("uoie","^[aeiou\\d]{4,5}?","hJs\\1cr&Fb&",[global])), 
+    <<"OK12341234bV">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}?","OK&&bV",[])), 
+    <<"OK12341234bV">> = iolist_to_binary(re:replace("1234","^[aeiou\\d]{4,5}?","OK&&bV",[global])), 
+    <<"g5">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}?","g\\1",[])), 
+    <<"g5">> = iolist_to_binary(re:replace("12345","^[aeiou\\d]{4,5}?","g\\1",[global])), 
+    <<"MKbLkaaaajjoeeykaaaaa">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}?","MKbLk&jjoeeyk&",[])), 
+    <<"MKbLkaaaajjoeeykaaaaa">> = iolist_to_binary(re:replace("aaaaa","^[aeiou\\d]{4,5}?","MKbLk&jjoeeyk&",[global])), 
+    <<"qExB1234GQ56">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}?","qExB&GQ",[])), 
+    <<"qExB1234GQ56">> = iolist_to_binary(re:replace("123456","^[aeiou\\d]{4,5}?","qExB&GQ",[global])), 
+    <<"abc=abcabcshRMauJabceabcMabcvDjywabcw">> = iolist_to_binary(re:replace("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z","&shRMauJ\\1e\\1M\\1vDjyw\\1w",[])), 
+    <<"abc=abcabcshRMauJabceabcMabcvDjywabcw">> = iolist_to_binary(re:replace("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z","&shRMauJ\\1e\\1M\\1vDjyw\\1w",[global])), 
+    <<"def=defdefdefM">> = iolist_to_binary(re:replace("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z","&M",[])), 
+    <<"def=defdefdefM">> = iolist_to_binary(re:replace("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z","&M",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z","\\1ums",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z","\\1ums",[global])), 
+    <<"abc=defdef">> = iolist_to_binary(re:replace("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z","DkIJLD&Cwg&\\1kq&tsp&&",[])), 
+    <<"abc=defdef">> = iolist_to_binary(re:replace("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z","DkIJLD&Cwg&\\1kq&tsp&&",[global])), 
+    <<"uaahabcdefghijkcda2aqkRJhtVuiyWJaG">> = iolist_to_binary(re:replace("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","u\\1ah&\\1qkRJhtVuiyWJaG",[])), 
+    <<"uaahabcdefghijkcda2aqkRJhtVuiyWJaG">> = iolist_to_binary(re:replace("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","u\\1ah&\\1qkRJhtVuiyWJaG",[global])), 
+    <<"lBSDdJXabcdefghijkkkkcda2DPEXjc">> = iolist_to_binary(re:replace("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","lBSDdJX&DPEXjc",[])), 
+    <<"lBSDdJXabcdefghijkkkkcda2DPEXjc">> = iolist_to_binary(re:replace("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$","lBSDdJX&DPEXjc",[global])), 
+    <<"tEYloj">> = iolist_to_binary(re:replace("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","tEYloj",[])), 
+    <<"tEYloj">> = iolist_to_binary(re:replace("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","tEYloj",[global])), 
+    <<"catatonic catatonic23HiXcatatonic catatonic23">> = iolist_to_binary(re:replace("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","&HiX&",[])), 
+    <<"catatonic catatonic23HiXcatatonic catatonic23">> = iolist_to_binary(re:replace("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","&HiX&",[global])), 
+    <<"EtmqcaterpillarvtVmieDAa">> = iolist_to_binary(re:replace("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","Etmq\\1vtVmieDAa",[])), 
+    <<"EtmqcaterpillarvtVmieDAa">> = iolist_to_binary(re:replace("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)","Etmq\\1vtVmieDAa",[global])), 
+    <<"rFrom abcd  Mon Sep 01 12:33aThFrom abcd  Mon Sep 01 12:33rJabcd:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]","r&aTh&rJ\\1",[])), 
+    <<"rFrom abcd  Mon Sep 01 12:33aThFrom abcd  Mon Sep 01 12:33rJabcd:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]","r&aTh&rJ\\1",[global])), 
+    <<"tKjeGYi:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","tKjeGYi",[])), 
+    <<"tKjeGYi:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","tKjeGYi",[global])), 
+    <<"From abcd  Mon Sep  1 12:33Sep  WqBFrom abcd  Mon Sep  1 12:33UFrom abcd  Mon Sep  1 12:33MHUFrom abcd  Mon Sep  1 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","&\\1WqB&U&MHU&",[])), 
+    <<"From abcd  Mon Sep  1 12:33Sep  WqBFrom abcd  Mon Sep  1 12:33UFrom abcd  Mon Sep  1 12:33MHUFrom abcd  Mon Sep  1 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","&\\1WqB&U&MHU&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","RWw&\\1f",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","RWw&\\1f",[global])), 
+    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","lDKNKPmMpd",[])), 
+    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(re:replace("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d","lDKNKPmMpd",[global])), 
+    <<"eNnWbKP">> = iolist_to_binary(re:replace("12
+34","^12.34","eNnWbK\\1P",[dotall])), 
+    <<"eNnWbKP">> = iolist_to_binary(re:replace("12
+34","^12.34","eNnWbK\\1P",[dotall,global])), 
+    <<"fI12
34N">> = iolist_to_binary(re:replace("12
34","^12.34","fI&N\\1",[dotall])), 
+    <<"fI12
34N">> = iolist_to_binary(re:replace("12
34","^12.34","fI&N\\1",[dotall,
+                                                                                                                                                                               global])), 
+    <<"the quick jmlgbrownfrbrownIaXThxdySok	 fox">> = iolist_to_binary(re:replace("the quick brown	 fox","\\w+(?=\\t)","j\\1mlg&fr&IaXThxdySok",[])), 
+    <<"the quick jmlgbrownfrbrownIaXThxdySok	 fox">> = iolist_to_binary(re:replace("the quick brown	 fox","\\w+(?=\\t)","j\\1mlg&fr&IaXThxdySok",[global])), 
+    <<"foobar is vjQvQsKSfoolish see?cmTPlish see?DB">> = iolist_to_binary(re:replace("foobar is foolish see?","foo(?!bar)(.*)","vjQvQsKS&cmTP\\1DB",[])), 
+    <<"foobar is vjQvQsKSfoolish see?cmTPlish see?DB">> = iolist_to_binary(re:replace("foobar is foolish see?","foo(?!bar)(.*)","vjQvQsKS&cmTP\\1DB",[global])), 
+    <<"foobar cGBmrowbar etcrowbar etcxPCf etc">> = iolist_to_binary(re:replace("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)","GBm&&xPCf\\1",[])), 
+    <<"foobar cGBmrowbar etcrowbar etcxPCf etc">> = iolist_to_binary(re:replace("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)","GBm&&xPCf\\1",[global])), 
+    <<"GDErP">> = iolist_to_binary(re:replace("barrel","(?:(?!foo)...|^.{0,2})bar(.*)","GDErP",[])), 
+    <<"GDErP">> = iolist_to_binary(re:replace("barrel","(?:(?!foo)...|^.{0,2})bar(.*)","GDErP",[global])), 
+    <<"VFDc2barrelqsDrelRKrelbMVIi2barrelb2barrel">> = iolist_to_binary(re:replace("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)","VFDc&qsD\\1RK\\1bMVIi&b&",[])), 
+    <<"VFDc2barrelqsDrelRKrelbMVIi2barrelb2barrel">> = iolist_to_binary(re:replace("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)","VFDc&qsD\\1RK\\1bMVIi&b&",[global])), 
+    <<"DreltMOOKlgrelMMOgA barrel">> = iolist_to_binary(re:replace("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)","D\\1tMOOKlg\\1MMOg&",[])), 
+    <<"DreltMOOKlgrelMMOgA barrel">> = iolist_to_binary(re:replace("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)","D\\1tMOOKlg\\1MMOg&",[global])), 
+    <<"DiLKve456">> = iolist_to_binary(re:replace("abc456","^(\\D*)(?=\\d)(?!123)","DiLKve",[])), 
+    <<"DiLKve456">> = iolist_to_binary(re:replace("abc456","^(\\D*)(?=\\d)(?!123)","DiLKve",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","BTbC",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","BTbC",[global])), 
+    <<"abc123">> = iolist_to_binary(re:replace("abc123","^(\\D*)(?=\\d)(?!123)","DJbM\\1wLxB\\1J&&H\\1&uHc",[])), 
+    <<"abc123">> = iolist_to_binary(re:replace("abc123","^(\\D*)(?=\\d)(?!123)","DJbM\\1wLxB\\1J&&H\\1&uHc",[global])), 
+    ok.
+run3() ->
+    <<"1234cNbGaCaxuI">> = iolist_to_binary(re:replace("1234","^1234(?# test newlines
+  inside)","&cNbGaCaxuI",[])), 
+    <<"1234cNbGaCaxuI">> = iolist_to_binary(re:replace("1234","^1234(?# test newlines
+  inside)","&cNbGaCaxuI",[global])), 
+    <<"jmCvIAMNV1234nNrfW1234GM">> = iolist_to_binary(re:replace("1234","^1234 #comment in extended re
+  ","\\1jmCvIAMNV\\1&nNrfW&GM",[extended])), 
+    <<"jmCvIAMNV1234nNrfW1234GM">> = iolist_to_binary(re:replace("1234","^1234 #comment in extended re
+  ","\\1jmCvIAMNV\\1&nNrfW&GM",[extended,global])), 
+    <<"YyiILRKFjY">> = iolist_to_binary(re:replace("abcd","#rhubarb
+  abcd","YyiILRKFjY",[extended])), 
+    <<"YyiILRKFjY">> = iolist_to_binary(re:replace("abcd","#rhubarb
+  abcd","YyiILRKFjY",[extended,global])), 
+    <<"XbpsAef">> = iolist_to_binary(re:replace("abcd","^abcd#rhubarb","Xbps\\1Aef",[extended])), 
+    <<"XbpsAef">> = iolist_to_binary(re:replace("abcd","^abcd#rhubarb","Xbps\\1Aef",[extended,
                                                                                                                                                                                                 global])), 
-?line <<"aqfaaaab">> = iolist_to_binary(re:replace("aaab","^(a)\\1{2,3}(.)","\\1qf\\1&",[])), 
-?line <<"aqfaaaab">> = iolist_to_binary(re:replace("aaab","^(a)\\1{2,3}(.)","\\1qf\\1&",[global])), 
-?line <<"aLGaaaabhavaLLxaIaaaabJaaaabidaaaab">> = iolist_to_binary(re:replace("aaaab","^(a)\\1{2,3}(.)","\\1LG&h\\1v\\1LLx\\1I&J&id&",[])), 
-?line <<"aLGaaaabhavaLLxaIaaaabJaaaabidaaaab">> = iolist_to_binary(re:replace("aaaab","^(a)\\1{2,3}(.)","\\1LG&h\\1v\\1LLx\\1I&J&id&",[global])), 
-?line <<"aaaaaEaaaaagaawPOaNaaaaab">> = iolist_to_binary(re:replace("aaaaab","^(a)\\1{2,3}(.)","&E&g\\1\\1wPO\\1N&",[])), 
-?line <<"aaaaaEaaaaagaawPOaNaaaaab">> = iolist_to_binary(re:replace("aaaaab","^(a)\\1{2,3}(.)","&E&g\\1\\1wPO\\1N&",[global])), 
-?line <<"QwegtaHxecVVVaaaaaab">> = iolist_to_binary(re:replace("aaaaaab","^(a)\\1{2,3}(.)","QwegtaHxecVVV&",[])), 
-?line <<"QwegtaHxecVVVaaaaaab">> = iolist_to_binary(re:replace("aaaaaab","^(a)\\1{2,3}(.)","QwegtaHxecVVV&",[global])), 
-?line <<"the EcabcmU">> = iolist_to_binary(re:replace("the abc","(?!^)abc","Ec&mU",[])), 
-?line <<"the EcabcmU">> = iolist_to_binary(re:replace("the abc","(?!^)abc","Ec&mU",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?!^)abc","NA",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?!^)abc","NA",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(?!^)abc","yjhaoMMFW\\1",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(?!^)abc","yjhaoMMFW\\1",[global])), 
-?line <<"PKCfTNYlWMooD">> = iolist_to_binary(re:replace("abc","(?=^)abc","\\1PK\\1CfTNYlWMooD",[])), 
-?line <<"PKCfTNYlWMooD">> = iolist_to_binary(re:replace("abc","(?=^)abc","\\1PK\\1CfTNYlWMooD",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=^)abc","fR\\1ltffBHNVYixMX",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=^)abc","fR\\1ltffBHNVYixMX",[global])), 
-?line <<"the abc">> = iolist_to_binary(re:replace("the abc","(?=^)abc","L\\1JJFtgfU&l",[])), 
-?line <<"the abc">> = iolist_to_binary(re:replace("the abc","(?=^)abc","L\\1JJFtgfU&l",[global])), 
-?line <<"aabbvbOdaabbyVtUjIbqObbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*|b)","&v\\1Od&yVtUjI\\1qO\\1",[])), 
-?line <<"aabbvbOdaabbyVtUjIbqObbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*|b)","&v\\1Od&yVtUjI\\1qO\\1",[global])), 
-?line <<"PLPJVxaabbbbbYrEOEywwHFp">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*|b)","PLPJVxa\\1YrEOEywwHFp",[])), 
-?line <<"PLPJVxaabbbbbYrEOEywwHFp">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*|b)","PLPJVxa\\1YrEOEywwHFp",[global])), 
-?line <<"VmghaaMBBitDaaaRnWKaaaAbbbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*?|b)","Vmgh&MBBitD&\\1RnWK&\\1A",[])), 
-?line <<"VmghaaMBBitDaaaRnWKaaaAbbbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*?|b)","Vmgh&MBBitD&\\1RnWK&\\1A",[global])), 
-?line <<"baabblNbbLhaabbtbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*?|b)","\\1&lNb\\1Lh&t",[])), 
-?line <<"baabblNbbLhaabbtbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*?|b)","\\1&lNb\\1Lh&t",[global])), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
+    <<"iPHiDDB">> = iolist_to_binary(re:replace("aaab","^(a)\\1{2,3}(.)","iPHiDDB",[])), 
+    <<"iPHiDDB">> = iolist_to_binary(re:replace("aaab","^(a)\\1{2,3}(.)","iPHiDDB",[global])), 
+    <<"IXEQflgnaWgr">> = iolist_to_binary(re:replace("aaaab","^(a)\\1{2,3}(.)","IXEQflgn\\1Wgr",[])), 
+    <<"IXEQflgnaWgr">> = iolist_to_binary(re:replace("aaaab","^(a)\\1{2,3}(.)","IXEQflgn\\1Wgr",[global])), 
+    <<"gToJhaaaaaOaaaaaaaaaaaiaaaaaHLaNAWab">> = iolist_to_binary(re:replace("aaaaab","^(a)\\1{2,3}(.)","gToJh&O\\1&&i&HL\\1NAW\\1",[])), 
+    <<"gToJhaaaaaOaaaaaaaaaaaiaaaaaHLaNAWab">> = iolist_to_binary(re:replace("aaaaab","^(a)\\1{2,3}(.)","gToJh&O\\1&&i&HL\\1NAW\\1",[global])), 
+    <<"aaaaaaGwEYYdXmTRmaaaaasXab">> = iolist_to_binary(re:replace("aaaaaab","^(a)\\1{2,3}(.)","&\\1GwEYYdXmTRm&sX",[])), 
+    <<"aaaaaaGwEYYdXmTRmaaaaasXab">> = iolist_to_binary(re:replace("aaaaaab","^(a)\\1{2,3}(.)","&\\1GwEYYdXmTRm&sX",[global])), 
+    <<"the abcabcLiXhGXmrloabcEfabcAbS">> = iolist_to_binary(re:replace("the abc","(?!^)abc","&&LiXhGXmrlo&Ef&AbS",[])), 
+    <<"the abcabcLiXhGXmrloabcEfabcAbS">> = iolist_to_binary(re:replace("the abc","(?!^)abc","&&LiXhGXmrlo&Ef&AbS",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?!^)abc","uyPPG",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?!^)abc","uyPPG",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(?!^)abc","x\\1sgS\\1tB\\1RcyA\\1enf",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(?!^)abc","x\\1sgS\\1tB\\1RcyA\\1enf",[global])), 
+    <<"abcubl">> = iolist_to_binary(re:replace("abc","(?=^)abc","&ubl",[])), 
+    <<"abcubl">> = iolist_to_binary(re:replace("abc","(?=^)abc","&ubl",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=^)abc","NPTqioPj",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=^)abc","NPTqioPj",[global])), 
+    <<"the abc">> = iolist_to_binary(re:replace("the abc","(?=^)abc","\\1pNTRQmK\\1Hj",[])), 
+    <<"the abc">> = iolist_to_binary(re:replace("the abc","(?=^)abc","\\1pNTRQmK\\1Hj",[global])), 
+    <<"QpbbCJcbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*|b)","Qp\\1bCJc",[])), 
+    <<"QpbbCJcbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*|b)","Qp\\1bCJc",[global])), 
+    <<"PcVuJcWmvIiq">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*|b)","PcVuJcWmvIiq",[])), 
+    <<"PcVuJcWmvIiq">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*|b)","PcVuJcWmvIiq",[global])), 
+    <<"fwRaaeKbsaanjaKaUaadaaybbbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*?|b)","fwR&eKbs&nj\\1K\\1U&d\\1\\1y",[])), 
+    <<"fwRaaeKbsaanjaKaUaadaaybbbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}?(ab*?|b)","fwR&eKbs&nj\\1K\\1U&d\\1\\1y",[global])), 
+    <<"bblQaabbCsbbeeQvYbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*?|b)","\\1\\1lQ&Cs\\1\\1eeQvY",[])), 
+    <<"bblQaabbCsbbeeQvYbbb">> = iolist_to_binary(re:replace("aabbbbb","^[ab]{1,3}(ab*?|b)","\\1\\1lQ&Cs\\1\\1eeQvY",[global])), 
+    <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -902,8 +959,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","Ag",[extended])), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","SOd&j",[extended])), 
+    <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1095,9 +1152,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","Ag",[extended,
-                                                                      global])), 
-?line <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","SOd&j",[extended,
+                                                                         global])), 
+    <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1289,8 +1346,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","OcN\\1",[extended])), 
-?line <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","Rli",[extended])), 
+    <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1482,9 +1539,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","OcN\\1",[extended,
-                                                                            global])), 
-?line <<"user.ain">> = iolist_to_binary(re:replace("user.ain","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","Rli",[extended,
+                                                                       global])), 
+    <<"user.ain">> = iolist_to_binary(re:replace("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1676,8 +1733,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","P\\1\\1",[extended])), 
-?line <<"user.ain">> = iolist_to_binary(re:replace("user.ain","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","g&TWfEDY",[extended])), 
+    <<"user.ain">> = iolist_to_binary(re:replace("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1869,9 +1926,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","P\\1\\1",[extended,
-                                                                               global])), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","g&TWfEDY",[extended,
+                                                                            global])), 
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2063,8 +2120,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","tFTD&XMAPNeq",[extended])), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","Cw",[extended])), 
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2256,9 +2313,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","tFTD&XMAPNeq",[extended,
-                                                                                global])), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","Cw",[extended,
+                                                                      global])), 
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2450,8 +2507,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","c\\1&C&YTXnfnhWs\\1g",[extended])), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","ej",[extended])), 
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2643,9 +2700,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","c\\1&C&YTXnfnhWs\\1g",[extended,
-                                                                                            global])), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","ej",[extended,
+                                                                      global])), 
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2837,8 +2894,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","\\1R&P&\\1aCnlgH",[extended])), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","y\\1D",[extended])), 
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3030,9 +3087,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","\\1R&P&\\1aCnlgH",[extended,
-                                                                                        global])), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","y\\1D",[extended,
+                                                                           global])), 
+    <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3224,8 +3281,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","p\\1u\\1REy&",[extended])), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","\\1jrwjC",[extended])), 
+    <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3417,9 +3474,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","p\\1u\\1REy&",[extended,
-                                                                                    global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","\\1jrwjC",[extended,
+                                                                              global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3611,8 +3668,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","qytCjuWj\\1fpNNv\\1&ya",[extended])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","&qqjm",[extended])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3804,9 +3861,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","qytCjuWj\\1fpNNv\\1&ya",[extended,
-                                                                                              global])), 
-?line <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","&qqjm",[extended,
+                                                                         global])), 
+    <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3998,8 +4055,8 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","L",[extended])), 
-?line <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","  (?: [\\040\\t] |  \\(
+\\)  )*                       # optional trailing comment","m\\1K&o&&mg&qC&f\\1V\\1i",[extended])), 
+    <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -4191,9 +4248,9 @@ run() ->
 # name and address
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
-\\)  )*                       # optional trailing comment","L",[extended,
-                                                                     global])), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
+\\)  )*                       # optional trailing comment","m\\1K&o&&mg&qC&f\\1V\\1i",[extended,
+                                                                                                  global])), 
+    <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -4773,8 +4830,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","\\1",[extended])), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
+)","d\\1&sJD\\1oA\\1Aruv",[extended])), 
+    <<"Alan Other <user.ain>">> = iolist_to_binary(re:replace("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -5354,8 +5411,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","\\1",[extended,global])), 
-?line <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","[\\040\\t]*                    # Nab whitespace.
+)","d\\1&sJD\\1oA\\1Aruv",[extended,global])), 
+    <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -5935,8 +5992,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","On",[extended])), 
-?line <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","[\\040\\t]*                    # Nab whitespace.
+)","HuWGl&iF&NPX&",[extended])), 
+    <<"<user.ain>">> = iolist_to_binary(re:replace("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -6516,8 +6573,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","On",[extended,global])), 
-?line <<"user.ain">> = iolist_to_binary(re:replace("user.ain","[\\040\\t]*                    # Nab whitespace.
+)","HuWGl&iF&NPX&",[extended,global])), 
+    <<"user.ain">> = iolist_to_binary(re:replace("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -7097,8 +7154,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","OLL\\1TqepmsD\\1V\\1\\1h\\1DsD",[extended])), 
-?line <<"user.ain">> = iolist_to_binary(re:replace("user.ain","[\\040\\t]*                    # Nab whitespace.
+)","VhK&cYXg&Bq\\1f&F",[extended])), 
+    <<"user.ain">> = iolist_to_binary(re:replace("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -7678,8 +7735,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","OLL\\1TqepmsD\\1V\\1\\1h\\1DsD",[extended,global])), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+)","VhK&cYXg&Bq\\1f&F",[extended,global])), 
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -8259,8 +8316,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","SHuKuC\\1Td",[extended])), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+)","a\\1&eMwwW",[extended])), 
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -8840,8 +8897,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","SHuKuC\\1Td",[extended,global])), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+)","a\\1&eMwwW",[extended,global])), 
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -9421,8 +9478,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","D&t&LSQGMfQpSXj",[extended])), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+)","\\1n\\1nYhyxBv&nk&&Sa",[extended])), 
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(re:replace("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -10002,8 +10059,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","D&t&LSQGMfQpSXj",[extended,global])), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
+)","\\1n\\1nYhyxBv&nk&&Sa",[extended,global])), 
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -10583,8 +10640,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","qDSGw",[extended])), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
+)","\\1fdORBWKv\\1&",[extended])), 
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(re:replace("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -11164,8 +11221,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","qDSGw",[extended,global])), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
+)","\\1fdORBWKv\\1&",[extended,global])), 
+    <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -11745,8 +11802,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","SOYovQniOUVJIil\\1",[extended])), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
+)","Utb&\\1l&M\\1aori&\\1&W",[extended])), 
+    <<"A missing angle <user.where">> = iolist_to_binary(re:replace("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -12326,8 +12383,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","SOYovQniOUVJIil\\1",[extended,global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\040\\t]*                    # Nab whitespace.
+)","Utb&\\1l&M\\1aori&\\1&W",[extended,global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -12907,8 +12964,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","D\\1",[extended])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\040\\t]*                    # Nab whitespace.
+)","\\1&RUPp\\1",[extended])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -13488,8 +13545,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","D\\1",[extended,global])), 
-?line <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
+)","\\1&RUPp\\1",[extended,global])), 
+    <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -14069,8 +14126,8 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","X&ayUGYrNMDenjwrkvT",[extended])), 
-?line <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
+)","M",[extended])), 
+    <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -14650,3409 +14707,3433 @@ run() ->
 #       address spec
 >                    #                 >
 # name and address
-)","X&ayUGYrNMDenjwrkvT",[extended,global])), 
-?line <<"abcdefpqrxyz0AB">> = iolist_to_binary(re:replace("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB","bYVVTfV",[])), 
-?line <<"abcdefpqrxyz0AB">> = iolist_to_binary(re:replace("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB","bYVVTfV",[global])), 
-?line <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(re:replace("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB","ALc",[])), 
-?line <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(re:replace("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB","ALc",[global])), 
-?line <<"abc
efpqr0xyz00AB">> = iolist_to_binary(re:replace("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","FJjJa&MUN",[])), 
-?line <<"abc
efpqr0xyz00AB">> = iolist_to_binary(re:replace("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","FJjJa&MUN",[global])), 
-?line <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(re:replace("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","IsJK",[])), 
-?line <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(re:replace("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","IsJK",[global])), 
-?line <<"A">> = iolist_to_binary(re:replace("A","^[\\000-\\037]","&&&l&oFiYRb&dwnRVIB",[])), 
-?line <<"A">> = iolist_to_binary(re:replace("A","^[\\000-\\037]","&&&l&oFiYRb&dwnRVIB",[global])), 
-?line <<"pJINBIVHkbs
QpNB">> = iolist_to_binary(re:replace("
B","^[\\000-\\037]","p\\1JINBIVHkbs&QpN",[])), 
-?line <<"pJINBIVHkbs
QpNB">> = iolist_to_binary(re:replace("
B","^[\\000-\\037]","p\\1JINBIVHkbs&QpN",[global])), 
-?line <<"qnaxlKtxgBKMC">> = iolist_to_binary(re:replace("C","^[\\000-\\037]","qnax&lKtxgB&KM",[])), 
-?line <<"qnaxlKtxgBKMC">> = iolist_to_binary(re:replace("C","^[\\000-\\037]","qnax&lKtxgB&KM",[global])), 
-?line <<"WuuRxIy">> = iolist_to_binary(re:replace("","\\0*","Wu&uRxIy",[])), 
-?line <<"WuuRxIy">> = iolist_to_binary(re:replace("","\\0*","Wu&uRxIy",[global])), 
-?line <<"The AZ">> = iolist_to_binary(re:replace("The AZ","A\\x0{2,3}Z","ggJSniphIbt",[])), 
-?line <<"The AZ">> = iolist_to_binary(re:replace("The AZ","A\\x0{2,3}Z","ggJSniphIbt",[global])), 
-?line <<"An AZ">> = iolist_to_binary(re:replace("An AZ","A\\x0{2,3}Z","s&\\1Bwkjj",[])), 
-?line <<"An AZ">> = iolist_to_binary(re:replace("An AZ","A\\x0{2,3}Z","s&\\1Bwkjj",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","A\\x0{2,3}Z","\\1eJyYpl",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","A\\x0{2,3}Z","\\1eJyYpl",[global])), 
-?line <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","aK\\1qVDC\\1uB",[])), 
-?line <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","aK\\1qVDC\\1uB",[global])), 
-?line <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","DMN&CNdjTe",[])), 
-?line <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","DMN&CNdjTe",[global])), 
-?line <<"cowcowbelldrlcowNSbcowcowbelladivdcowcowbell">> = iolist_to_binary(re:replace("cowcowbell","^(cow|)\\1(bell)","&drl\\1NSb&adivd&",[])), 
-?line <<"cowcowbelldrlcowNSbcowcowbelladivdcowcowbell">> = iolist_to_binary(re:replace("cowcowbell","^(cow|)\\1(bell)","&drl\\1NSb&adivd&",[global])), 
-?line <<"UUUBpbellPtC">> = iolist_to_binary(re:replace("bell","^(cow|)\\1(bell)","UUUBp&P\\1tC",[])), 
-?line <<"UUUBpbellPtC">> = iolist_to_binary(re:replace("bell","^(cow|)\\1(bell)","UUUBp&P\\1tC",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(cow|)\\1(bell)","\\1\\1L\\1foe&LDaKY",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(cow|)\\1(bell)","\\1\\1L\\1foe&LDaKY",[global])), 
-?line <<"cowbell">> = iolist_to_binary(re:replace("cowbell","^(cow|)\\1(bell)","&pE",[])), 
-?line <<"cowbell">> = iolist_to_binary(re:replace("cowbell","^(cow|)\\1(bell)","&pE",[global])), 
-?line <<"KEPMMarMefAQoabc">> = iolist_to_binary(re:replace(" abc","^\\s","KEP\\1MMa\\1rMefAQ\\1\\1\\1o",[])), 
-?line <<"KEPMMarMefAQoabc">> = iolist_to_binary(re:replace(" abc","^\\s","KEP\\1MMa\\1rMefAQ\\1\\1\\1o",[global])), 
-?line <<"mdPwbKbGabc">> = iolist_to_binary(re:replace("abc","^\\s","mdPwbKbG",[])), 
-?line <<"mdPwbKbGabc">> = iolist_to_binary(re:replace("abc","^\\s","mdPwbKbG",[global])), 
-?line <<"Ed
-FNgfabc">> = iolist_to_binary(re:replace("
-abc","^\\s","Ed&FNgf",[])), 
-?line <<"Ed
-FNgfabc">> = iolist_to_binary(re:replace("
-abc","^\\s","Ed&FNgf",[global])), 
-?line <<"iYCabc">> = iolist_to_binary(re:replace("
abc","^\\s","iYC",[])), 
-?line <<"iYCabc">> = iolist_to_binary(re:replace("
abc","^\\s","iYC",[global])), 
-?line <<"Y	KyKjBtWUscEoeabc">> = iolist_to_binary(re:replace("	abc","^\\s","Y\\1&\\1KyKjBtWUscEoe",[])), 
-?line <<"Y	KyKjBtWUscEoeabc">> = iolist_to_binary(re:replace("	abc","^\\s","Y\\1&\\1KyKjBtWUscEoe",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\s","fMXHNBeT",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\s","fMXHNBeT",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","^\\s","GF\\1s&cS\\1yGC",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","^\\s","GF\\1s&cS\\1yGC",[global])), 
-?line <<"Ur">> = iolist_to_binary(re:replace("abc","^a	b
-      c","Ur",[extended])), 
-?line <<"Ur">> = iolist_to_binary(re:replace("abc","^a	b
-      c","Ur",[extended,global])), 
-?line <<"UQqfOFVevBwaga">> = iolist_to_binary(re:replace("ab","^(a|)\\1*b","UQqfOFVevBwag\\1",[])), 
-?line <<"UQqfOFVevBwaga">> = iolist_to_binary(re:replace("ab","^(a|)\\1*b","UQqfOFVevBwag\\1",[global])), 
-?line <<"cAc">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1*b","cAc",[])), 
-?line <<"cAc">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1*b","cAc",[global])), 
-?line <<"QGbTLPFbbYYwpIhdW">> = iolist_to_binary(re:replace("b","^(a|)\\1*b","QG&TLPF&&YYwp\\1Ih\\1dW",[])), 
-?line <<"QGbTLPFbbYYwpIhdW">> = iolist_to_binary(re:replace("b","^(a|)\\1*b","QG&TLPF&&YYwp\\1Ih\\1dW",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1*b","wY",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1*b","wY",[global])), 
-?line <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1*b","IpD\\1tRUS",[])), 
-?line <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1*b","IpD\\1tRUS",[global])), 
-?line <<"PMaabaRKsKVgnxCiJtgp">> = iolist_to_binary(re:replace("aab","^(a|)\\1+b","PM&\\1RKsKVgnxCiJtgp",[])), 
-?line <<"PMaabaRKsKVgnxCiJtgp">> = iolist_to_binary(re:replace("aab","^(a|)\\1+b","PM&\\1RKsKVgnxCiJtgp",[global])), 
-?line <<"quaJPXxLfMHlVxH">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1+b","qu\\1JPXxLfMHlVxH",[])), 
-?line <<"quaJPXxLfMHlVxH">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1+b","qu\\1JPXxLfMHlVxH",[global])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","^(a|)\\1+b","&",[])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","^(a|)\\1+b","&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1+b","ywXwC",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1+b","ywXwC",[global])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1+b","hwwbvhOrVEaVOsD\\1",[])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1+b","hwwbvhOrVEaVOsD\\1",[global])), 
-?line <<"tNvaWAg">> = iolist_to_binary(re:replace("ab","^(a|)\\1?b","tNv\\1WAg",[])), 
-?line <<"tNvaWAg">> = iolist_to_binary(re:replace("ab","^(a|)\\1?b","tNv\\1WAg",[global])), 
-?line <<"K">> = iolist_to_binary(re:replace("aab","^(a|)\\1?b","K",[])), 
-?line <<"K">> = iolist_to_binary(re:replace("aab","^(a|)\\1?b","K",[global])), 
-?line <<"bRibsTbLcleUeb">> = iolist_to_binary(re:replace("b","^(a|)\\1?b","&Ri\\1&sT&L\\1cl\\1e\\1Ue&",[])), 
-?line <<"bRibsTbLcleUeb">> = iolist_to_binary(re:replace("b","^(a|)\\1?b","&Ri\\1&sT&L\\1cl\\1e\\1Ue&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1?b","&CGRslcRfjatPWbOMT",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1?b","&CGRslcRfjatPWbOMT",[global])), 
-?line <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1?b","&k\\1aoVMtug&hJsI",[])), 
-?line <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1?b","&k\\1aoVMtug&hJsI",[global])), 
-?line <<"gaaabFGtJRckPahi">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2}b","g&FGtJRckP\\1hi",[])), 
-?line <<"gaaabFGtJRckPahi">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2}b","g&FGtJRckP\\1hi",[global])), 
-?line <<"bINnRM">> = iolist_to_binary(re:replace("b","^(a|)\\1{2}b","bINnR\\1M",[])), 
-?line <<"bINnRM">> = iolist_to_binary(re:replace("b","^(a|)\\1{2}b","bINnR\\1M",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2}b","cm",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2}b","cm",[global])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2}b","yT\\1\\1NlFQVleuHkXnE\\1",[])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2}b","yT\\1\\1NlFQVleuHkXnE\\1",[global])), 
-?line <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2}b","PwBRhyP\\1txXQhbjE\\1a",[])), 
-?line <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2}b","PwBRhyP\\1txXQhbjE\\1a",[global])), 
-?line <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2}b","cxo",[])), 
-?line <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2}b","cxo",[global])), 
-?line <<"aaabXaaabMaaabdHhnqsiti">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2,3}b","&X&M&dHhnqsiti",[])), 
-?line <<"aaabXaaabMaaabdHhnqsiti">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2,3}b","&X&M&dHhnqsiti",[global])), 
-?line <<"QaaaablaaaabNnVdaaaabpaQEaaaaab">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2,3}b","Q&l&NnVd&p\\1QE\\1&",[])), 
-?line <<"QaaaablaaaabNnVdaaaabpaQEaaaaab">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2,3}b","Q&l&NnVd&p\\1QE\\1&",[global])), 
-?line <<"bCw">> = iolist_to_binary(re:replace("b","^(a|)\\1{2,3}b","&Cw",[])), 
-?line <<"bCw">> = iolist_to_binary(re:replace("b","^(a|)\\1{2,3}b","&Cw",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2,3}b","\\1&puY",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2,3}b","\\1&puY",[global])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2,3}b","pbextvQnRWgXs",[])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2,3}b","pbextvQnRWgXs",[global])), 
-?line <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2,3}b","fHRaaYYIr\\1l\\1",[])), 
-?line <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2,3}b","fHRaaYYIr\\1l\\1",[global])), 
-?line <<"aaaaab">> = iolist_to_binary(re:replace("aaaaab","^(a|)\\1{2,3}b","nXt&Aw\\1XCfLg\\1GGPmN",[])), 
-?line <<"aaaaab">> = iolist_to_binary(re:replace("aaaaab","^(a|)\\1{2,3}b","nXt&Aw\\1XCfLg\\1GGPmN",[global])), 
-?line <<"eRwvgLU">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","eRwvgLU",[])), 
-?line <<"eRwvgLU">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","eRwvgLU",[global])), 
-?line <<"mDnlkabbbcfTJ">> = iolist_to_binary(re:replace("abbbc","ab{1,3}bc","m\\1Dnl\\1k&fTJ",[])), 
-?line <<"mDnlkabbbcfTJ">> = iolist_to_binary(re:replace("abbbc","ab{1,3}bc","m\\1Dnl\\1k&fTJ",[global])), 
-?line <<"QabbcqIjjWabbchabbcBrTp">> = iolist_to_binary(re:replace("abbc","ab{1,3}bc","Q&qIjjW&h\\1&BrTp",[])), 
-?line <<"QabbcqIjjWabbchabbcBrTp">> = iolist_to_binary(re:replace("abbc","ab{1,3}bc","Q&qIjjW&h\\1&BrTp",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{1,3}bc","\\1Wj&Y&ML\\1RBiGiweww",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{1,3}bc","\\1Wj&Y&ML\\1RBiGiweww",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","ab{1,3}bc","HmlRU&NUwwokL",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","ab{1,3}bc","HmlRU&NUwwokL",[global])), 
-?line <<"abbbbbc">> = iolist_to_binary(re:replace("abbbbbc","ab{1,3}bc","FUyCCDShGVXhEHX\\1V\\1bK",[])), 
-?line <<"abbbbbc">> = iolist_to_binary(re:replace("abbbbbc","ab{1,3}bc","FUyCCDShGVXhEHX\\1V\\1bK",[global])), 
-?line <<"track1astrack1track1tIDhtrack1.title:TBlah blah blahiA">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","\\1as\\1\\1tIDh&iA",[])), 
-?line <<"track1astrack1track1tIDhtrack1.title:TBlah blah blahiA">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","\\1as\\1\\1tIDh&iA",[global])), 
-?line <<"wUVSR">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","wUVSR",[caseless])), 
-?line <<"wUVSR">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","wUVSR",[caseless,
-                                                                                                                                                                                                                                                                    global])), 
-?line <<"htrack1TCNtrack1.title:TBlah blah blahpLtrack1.title:TBlah blah blahtrack1.title:TBlah blah blahFnNtrack1jOBdd">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)","h\\1TCN&pL&&FnN\\1jOBdd",[caseless])), 
-?line <<"htrack1TCNtrack1.title:TBlah blah blahpLtrack1.title:TBlah blah blahtrack1.title:TBlah blah blahFnNtrack1jOBdd">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)","h\\1TCN&pL&&FnN\\1jOBdd",[caseless,
-                                                                                                                                                                                                                                                                                                             global])), 
-?line <<"OKnYPU">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","OKnYPU",[])), 
-?line <<"OKnYPU">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","OKnYPU",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-c]+$","\\1GX\\1YVV&\\1WF",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-c]+$","\\1GX\\1YVV&\\1WF",[global])), 
-?line <<"wxy">> = iolist_to_binary(re:replace("wxy","^[W-c]+$","Uax\\1F",[])), 
-?line <<"wxy">> = iolist_to_binary(re:replace("wxy","^[W-c]+$","Uax\\1F",[global])), 
-?line <<"WXY_^abcARKQ">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","&ARK\\1Q",[caseless])), 
-?line <<"WXY_^abcARKQ">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","&ARK\\1Q",[caseless,
-                                                                                                                                                                                              global])), 
-?line <<"fIwxy_^ABCwxy_^ABCGwxy_^ABCwAHLMA">> = iolist_to_binary(re:replace("wxy_^ABC","^[W-c]+$","fI&&G&w\\1AHL\\1MA",[caseless])), 
-?line <<"fIwxy_^ABCwxy_^ABCGwxy_^ABCwAHLMA">> = iolist_to_binary(re:replace("wxy_^ABC","^[W-c]+$","fI&&G&w\\1AHL\\1MA",[caseless,
-                                                                                                                                                                                                                     global])), 
-?line <<"WXY_^abcrgsgXuYrmtfAuS">> = iolist_to_binary(re:replace("WXY_^abc","^[\\x3f-\\x5F]+$","&rgsgXuYrmtfAuS",[caseless])), 
-?line <<"WXY_^abcrgsgXuYrmtfAuS">> = iolist_to_binary(re:replace("WXY_^abc","^[\\x3f-\\x5F]+$","&rgsgXuYrmtfAuS",[caseless,
-                                                                                                                                                                                                                             global])), 
-?line <<"FmwJKwxy_^ABCyluQcjQVnwQ">> = iolist_to_binary(re:replace("wxy_^ABC","^[\\x3f-\\x5F]+$","FmwJK&yluQcjQVnwQ",[caseless])), 
-?line <<"FmwJKwxy_^ABCyluQcjQVnwQ">> = iolist_to_binary(re:replace("wxy_^ABC","^[\\x3f-\\x5F]+$","FmwJK&yluQcjQVnwQ",[caseless,
-                                                                                                                                                                                                                                 global])), 
-?line <<"abcabcMObxlD">> = iolist_to_binary(re:replace("abc","^abc$","&\\1&MObxlD",[multiline])), 
-?line <<"abcabcMObxlD">> = iolist_to_binary(re:replace("abc","^abc$","&\\1&MObxlD",[multiline,
-                                                                                                                                                                                     global])), 
-?line <<"qqq
-wgabc">> = iolist_to_binary(re:replace("qqq
-abc","^abc$","wg&",[multiline])), 
-?line <<"qqq
-wgabc">> = iolist_to_binary(re:replace("qqq
-abc","^abc$","wg&",[multiline,global])), 
-?line <<"abcwXeRgabcKmklKpYiE
+)","M",[extended,global])), 
+    <<"abcdefpqrxyz0AB">> = iolist_to_binary(re:replace("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB","\\1\\1giII\\1hWW&bdV&",[])), 
+    <<"abcdefpqrxyz0AB">> = iolist_to_binary(re:replace("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB","\\1\\1giII\\1hWW&bdV&",[global])), 
+    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(re:replace("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB","cc\\1IiVp",[])), 
+    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(re:replace("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB","cc\\1IiVp",[global])), 
+    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(re:replace("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","prtuhkbIaj&qwHuPpE",[])), 
+    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(re:replace("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","prtuhkbIaj&qwHuPpE",[global])), 
+    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(re:replace("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","&yfjpcn",[])), 
+    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(re:replace("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB","&yfjpcn",[global])), 
+    <<"A">> = iolist_to_binary(re:replace("A","^[\\000-\\037]","fNpC&qUvThkjHh",[])), 
+    <<"A">> = iolist_to_binary(re:replace("A","^[\\000-\\037]","fNpC&qUvThkjHh",[global])), 
+    <<"QyKsB">> = iolist_to_binary(re:replace("
B","^[\\000-\\037]","QyKs",[])), 
+    <<"QyKsB">> = iolist_to_binary(re:replace("
B","^[\\000-\\037]","QyKs",[global])), 
+    <<"ESQC">> = iolist_to_binary(re:replace("C","^[\\000-\\037]","ESQ",[])), 
+    <<"ESQC">> = iolist_to_binary(re:replace("C","^[\\000-\\037]","ESQ",[global])), 
+    <<"aTcfAMkUonvqo">> = iolist_to_binary(re:replace("","\\0*","aT&cfAM&\\1kU\\1onvq&o",[])), 
+    <<"aTcfAMkUonvqo">> = iolist_to_binary(re:replace("","\\0*","aT&cfAM&\\1kU\\1onvq&o",[global])), 
+    <<"The AZ">> = iolist_to_binary(re:replace("The AZ","A\\x0{2,3}Z","vmgVokP\\1Omhk&",[])), 
+    <<"The AZ">> = iolist_to_binary(re:replace("The AZ","A\\x0{2,3}Z","vmgVokP\\1Omhk&",[global])), 
+    <<"An AZ">> = iolist_to_binary(re:replace("An AZ","A\\x0{2,3}Z","VQmaqWv&eULrw\\1glxho",[])), 
+    <<"An AZ">> = iolist_to_binary(re:replace("An AZ","A\\x0{2,3}Z","VQmaqWv&eULrw\\1glxho",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","A\\x0{2,3}Z","UjPLaoqUhTok\\1&kA\\1G",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","A\\x0{2,3}Z","UjPLaoqUhTok\\1&kA\\1G",[global])), 
+    <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","\\1&y&cuh&VgTD&wTnGp",[])), 
+    <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","\\1&y&cuh&VgTD&wTnGp",[global])), 
+    <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","gEElh\\1ECMKe&HElIjJc",[])), 
+    <<"AZ">> = iolist_to_binary(re:replace("AZ","A\\x0{2,3}Z","gEElh\\1ECMKe&HElIjJc",[global])), 
+    <<"cowcowbellYcowcowbelludyJcowE">> = iolist_to_binary(re:replace("cowcowbell","^(cow|)\\1(bell)","&Y&udyJ\\1E",[])), 
+    <<"cowcowbellYcowcowbelludyJcowE">> = iolist_to_binary(re:replace("cowcowbell","^(cow|)\\1(bell)","&Y&udyJ\\1E",[global])), 
+    <<"XIIG">> = iolist_to_binary(re:replace("bell","^(cow|)\\1(bell)","XIIG\\1",[])), 
+    <<"XIIG">> = iolist_to_binary(re:replace("bell","^(cow|)\\1(bell)","XIIG\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(cow|)\\1(bell)","FV&UIVc&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(cow|)\\1(bell)","FV&UIVc&",[global])), 
+    <<"cowbell">> = iolist_to_binary(re:replace("cowbell","^(cow|)\\1(bell)","C&&\\1YwKbOHQIgm&R\\1\\1t",[])), 
+    <<"cowbell">> = iolist_to_binary(re:replace("cowbell","^(cow|)\\1(bell)","C&&\\1YwKbOHQIgm&R\\1\\1t",[global])), 
+    <<"ywr abc">> = iolist_to_binary(re:replace(" abc","^\\s","ywr&",[])), 
+    <<"ywr abc">> = iolist_to_binary(re:replace(" abc","^\\s","ywr&",[global])), 
+    <<"fRabc">> = iolist_to_binary(re:replace("abc","^\\s","&fR",[])), 
+    <<"fRabc">> = iolist_to_binary(re:replace("abc","^\\s","&fR",[global])), 
+    <<"CHbSJabc">> = iolist_to_binary(re:replace("
+abc","^\\s","CHbSJ",[])), 
+    <<"CHbSJabc">> = iolist_to_binary(re:replace("
+abc","^\\s","CHbSJ",[global])), 
+    <<"nivOFemIauK

XVEPabc">> = iolist_to_binary(re:replace("
abc","^\\s","n\\1ivOFemIauK&&XVEP",[])), 
+    <<"nivOFemIauK

XVEPabc">> = iolist_to_binary(re:replace("
abc","^\\s","n\\1ivOFemIauK&&XVEP",[global])), 
+    <<"Hs	Cwabc">> = iolist_to_binary(re:replace("	abc","^\\s","Hs&Cw",[])), 
+    <<"Hs	Cwabc">> = iolist_to_binary(re:replace("	abc","^\\s","Hs&Cw",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\s","wydaKxDrmaSC\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\s","wydaKxDrmaSC\\1",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","^\\s","&mmImPqIRmsQLWtEuv\\1",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","^\\s","&mmImPqIRmsQLWtEuv\\1",[global])), 
+    ok.
+run4() ->
+    <<"KvcEQcubkfx">> = iolist_to_binary(re:replace("abc","^a	b
+      c","KvcEQc\\1\\1ubkfx",[extended])), 
+    <<"KvcEQcubkfx">> = iolist_to_binary(re:replace("abc","^a	b
+      c","KvcEQc\\1\\1ubkfx",[extended,global])), 
+    <<"IEabanuYG">> = iolist_to_binary(re:replace("ab","^(a|)\\1*b","IE&\\1nuYG",[])), 
+    <<"IEabanuYG">> = iolist_to_binary(re:replace("ab","^(a|)\\1*b","IE&\\1nuYG",[global])), 
+    <<"oaVSaaaabg">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1*b","o\\1VS&g",[])), 
+    <<"oaVSaaaabg">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1*b","o\\1VS&g",[global])), 
+    <<"midgkQDfLoqgoK">> = iolist_to_binary(re:replace("b","^(a|)\\1*b","midgk\\1\\1Q\\1DfLoqgoK",[])), 
+    <<"midgkQDfLoqgoK">> = iolist_to_binary(re:replace("b","^(a|)\\1*b","midgk\\1\\1Q\\1DfLoqgoK",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1*b","iq\\1HM&PoX",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1*b","iq\\1HM&PoX",[global])), 
+    <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1*b","pGDNJCvYBCUc&G&\\1\\1nc",[])), 
+    <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1*b","pGDNJCvYBCUc&G&\\1\\1nc",[global])), 
+    <<"NFaDYqrUAXIDCar">> = iolist_to_binary(re:replace("aab","^(a|)\\1+b","NFaDYqrUAXIDC\\1r",[])), 
+    <<"NFaDYqrUAXIDCar">> = iolist_to_binary(re:replace("aab","^(a|)\\1+b","NFaDYqrUAXIDC\\1r",[global])), 
+    <<"rVeVeoaaaabXIMIhaaaaboaRr">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1+b","rVeVeo&XIMIh&o\\1Rr",[])), 
+    <<"rVeVeoaaaabXIMIhaaaaboaRr">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1+b","rVeVeo&XIMIh&o\\1Rr",[global])), 
+    <<"MOSbVKbFIBNV">> = iolist_to_binary(re:replace("b","^(a|)\\1+b","MOS\\1&VKbFIBNV",[])), 
+    <<"MOSbVKbFIBNV">> = iolist_to_binary(re:replace("b","^(a|)\\1+b","MOS\\1&VKbFIBNV",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1+b","&X\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1+b","&X\\1",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1+b","HAk\\1RB",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1+b","HAk\\1RB",[global])), 
+    <<"T">> = iolist_to_binary(re:replace("ab","^(a|)\\1?b","T",[])), 
+    <<"T">> = iolist_to_binary(re:replace("ab","^(a|)\\1?b","T",[global])), 
+    <<"NpaabpafbAIXVrowk">> = iolist_to_binary(re:replace("aab","^(a|)\\1?b","Np&p\\1fbAIXVrowk",[])), 
+    <<"NpaabpafbAIXVrowk">> = iolist_to_binary(re:replace("aab","^(a|)\\1?b","Np&p\\1fbAIXVrowk",[global])), 
+    <<"bTLqWwDhuNEDr">> = iolist_to_binary(re:replace("b","^(a|)\\1?b","&TLqWwDhuNEDr",[])), 
+    <<"bTLqWwDhuNEDr">> = iolist_to_binary(re:replace("b","^(a|)\\1?b","&TLqWwDhuNEDr",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1?b","k&M&WqVpmLKP",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1?b","k&M&WqVpmLKP",[global])), 
+    <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1?b","sukwIjuiB",[])), 
+    <<"acb">> = iolist_to_binary(re:replace("acb","^(a|)\\1?b","sukwIjuiB",[global])), 
+    <<"rHnDYYvSYMasyvaMyaaabqJ">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2}b","rHnDYYvSYM\\1syv\\1My&qJ",[])), 
+    <<"rHnDYYvSYMasyvaMyaaabqJ">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2}b","rHnDYYvSYM\\1syv\\1My&qJ",[global])), 
+    <<"gdeUBJebtvLObDlYQ">> = iolist_to_binary(re:replace("b","^(a|)\\1{2}b","gdeU\\1BJe&tvL\\1ObDlYQ",[])), 
+    <<"gdeUBJebtvLObDlYQ">> = iolist_to_binary(re:replace("b","^(a|)\\1{2}b","gdeU\\1BJe&tvL\\1ObDlYQ",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2}b","AVUEjXCeg&i\\1T\\1ejtKi",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2}b","AVUEjXCeg&i\\1T\\1ejtKi",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2}b","E\\1YBlG",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2}b","E\\1YBlG",[global])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2}b","&Oq&\\1IcB&LT",[])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2}b","&Oq&\\1IcB&LT",[global])), 
+    <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2}b","Xh",[])), 
+    <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2}b","Xh",[global])), 
+    <<"gPaMHaaabaaabnaaOMIaVa">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2,3}b","gP\\1MH&&n\\1aOMI\\1Va",[])), 
+    <<"gPaMHaaabaaabnaaOMIaVa">> = iolist_to_binary(re:replace("aaab","^(a|)\\1{2,3}b","gP\\1MH&&n\\1aOMI\\1Va",[global])), 
+    <<"aaaabWf">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2,3}b","&Wf",[])), 
+    <<"aaaabWf">> = iolist_to_binary(re:replace("aaaab","^(a|)\\1{2,3}b","&Wf",[global])), 
+    <<"KKYfigIbbfyLvtL">> = iolist_to_binary(re:replace("b","^(a|)\\1{2,3}b","KKYfigI&&fyL\\1v\\1tL",[])), 
+    <<"KKYfigIbbfyLvtL">> = iolist_to_binary(re:replace("b","^(a|)\\1{2,3}b","KKYfigI&&fyL\\1v\\1tL",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2,3}b","NFHl",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a|)\\1{2,3}b","NFHl",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2,3}b","ob\\1\\1J&ES\\1av\\1AM",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a|)\\1{2,3}b","ob\\1\\1J&ES\\1av\\1AM",[global])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2,3}b","\\1viNfcaQTcNH&ggGt",[])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","^(a|)\\1{2,3}b","\\1viNfcaQTcNH&ggGt",[global])), 
+    <<"aaaaab">> = iolist_to_binary(re:replace("aaaaab","^(a|)\\1{2,3}b","vu",[])), 
+    <<"aaaaab">> = iolist_to_binary(re:replace("aaaaab","^(a|)\\1{2,3}b","vu",[global])), 
+    <<"aHJVskcmUR">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","\\1aHJVskcmUR",[])), 
+    <<"aHJVskcmUR">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","\\1aHJVskcmUR",[global])), 
+    <<"Rmabbbccackw">> = iolist_to_binary(re:replace("abbbc","ab{1,3}bc","Rm&cackw",[])), 
+    <<"Rmabbbccackw">> = iolist_to_binary(re:replace("abbbc","ab{1,3}bc","Rm&cackw",[global])), 
+    <<"VHGaMs">> = iolist_to_binary(re:replace("abbc","ab{1,3}bc","VHGaMs",[])), 
+    <<"VHGaMs">> = iolist_to_binary(re:replace("abbc","ab{1,3}bc","VHGaMs",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{1,3}bc","UM&MN\\1&vHpV\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{1,3}bc","UM&MN\\1&vHpV\\1",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","ab{1,3}bc","os&Rm\\1akB\\1pkOAH",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","ab{1,3}bc","os&Rm\\1akB\\1pkOAH",[global])), 
+    <<"abbbbbc">> = iolist_to_binary(re:replace("abbbbbc","ab{1,3}bc","oujXAne\\1\\1JsV&Y&I&",[])), 
+    <<"abbbbbc">> = iolist_to_binary(re:replace("abbbbbc","ab{1,3}bc","oujXAne\\1\\1JsV&Y&I&",[global])), 
+    <<"NCkLQtrack1">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","NCkLQ\\1",[])), 
+    <<"NCkLQtrack1">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","NCkLQ\\1",[global])), 
+    <<"track1.title:TBlah blah blahOtrack1.title:TBlah blah blahwtrack1fuQWtrack1.title:TBlah blah blahStrack1.title:TBlah blah blahkEFVKOH">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","&O&w\\1fuQW&S&kEFVKOH",[caseless])), 
+    <<"track1.title:TBlah blah blahOtrack1.title:TBlah blah blahwtrack1fuQWtrack1.title:TBlah blah blahStrack1.title:TBlah blah blahkEFVKOH">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)","&O&w\\1fuQW&S&kEFVKOH",[caseless,
+                                                                                                                                                                                                                                                                                                       global])), 
+    <<"VWgicEGtrack1">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)","VWgicEG\\1",[caseless])), 
+    <<"VWgicEGtrack1">> = iolist_to_binary(re:replace("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)","VWgicEG\\1",[caseless,
+                                                                                                                                                                                                                                                                             global])), 
+    <<"UKrqsWXY_^abcTa">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","UKr\\1\\1qs&Ta",[])), 
+    <<"UKrqsWXY_^abcTa">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","UKr\\1\\1qs&Ta",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-c]+$","LV\\1&\\1&\\1Je&M\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-c]+$","LV\\1&\\1&\\1Je&M\\1",[global])), 
+    <<"wxy">> = iolist_to_binary(re:replace("wxy","^[W-c]+$","yqUKKN",[])), 
+    <<"wxy">> = iolist_to_binary(re:replace("wxy","^[W-c]+$","yqUKKN",[global])), 
+    <<"MxOWXY_^abcqjWXY_^abcWXY_^abcocGDNJgwU">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","MxO&qj&&ocGDNJgwU",[caseless])), 
+    <<"MxOWXY_^abcqjWXY_^abcWXY_^abcocGDNJgwU">> = iolist_to_binary(re:replace("WXY_^abc","^[W-c]+$","MxO&qj&&ocGDNJgwU",[caseless,
+                                                                                                                                                                                                               global])), 
+    <<"lgkBEwxy_^ABCC">> = iolist_to_binary(re:replace("wxy_^ABC","^[W-c]+$","\\1lgkBE&C\\1",[caseless])), 
+    <<"lgkBEwxy_^ABCC">> = iolist_to_binary(re:replace("wxy_^ABC","^[W-c]+$","\\1lgkBE&C\\1",[caseless,
+                                                                                                                                                                                                       global])), 
+    <<"QSQrWXY_^abcvBpJUdCPFVxS">> = iolist_to_binary(re:replace("WXY_^abc","^[\\x3f-\\x5F]+$","QSQr&vBpJUdCP\\1F\\1VxS",[caseless])), 
+    <<"QSQrWXY_^abcvBpJUdCPFVxS">> = iolist_to_binary(re:replace("WXY_^abc","^[\\x3f-\\x5F]+$","QSQr&vBpJUdCP\\1F\\1VxS",[caseless,
+                                                                                                                                                                                                                                             global])), 
+    <<"tgwxy_^ABChAjHBwxy_^ABC">> = iolist_to_binary(re:replace("wxy_^ABC","^[\\x3f-\\x5F]+$","tg&hAjHB&",[caseless])), 
+    <<"tgwxy_^ABChAjHBwxy_^ABC">> = iolist_to_binary(re:replace("wxy_^ABC","^[\\x3f-\\x5F]+$","tg&hAjHB&",[caseless,
+                                                                                                                                                                                                                global])), 
+    <<"uyphoJSabcD">> = iolist_to_binary(re:replace("abc","^abc$","uyphoJS&D",[multiline])), 
+    <<"uyphoJSabcD">> = iolist_to_binary(re:replace("abc","^abc$","uyphoJS&D",[multiline,
+                                                                                                                                                                             global])), 
+    <<"qqq
+wupoAabcauHHyGGVeUwVabc">> = iolist_to_binary(re:replace("qqq
+abc","^abc$","wupoA&au\\1HHyGGVeUwV&",[multiline])), 
+    <<"qqq
+wupoAabcauHHyGGVeUwVabc">> = iolist_to_binary(re:replace("qqq
+abc","^abc$","wupoA&au\\1HHyGGVeUwV&",[multiline,global])), 
+    <<"gfEviFcl
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","^abc$","&wXe\\1Rg&K\\1mklKpYiE",[multiline])), 
-?line <<"abcwXeRgabcKmklKpYiE
+zzz","^abc$","gf\\1EviFcl",[multiline])), 
+    <<"gfEviFcl
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","^abc$","&wXe\\1Rg&K\\1mklKpYiE",[multiline,global])), 
-?line <<"qqq
-CabcCKxlJamS
+zzz","^abc$","gf\\1EviFcl",[multiline,global])), 
+    <<"qqq
+jwoabcabcBysLOHCR
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","^abc$","C&CKxlJam\\1S",[multiline])), 
-?line <<"qqq
-CabcCKxlJamS
+zzz","^abc$","jwo&&BysLOHC\\1R",[multiline])), 
+    <<"qqq
+jwoabcabcBysLOHCR
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","^abc$","C&CKxlJam\\1S",[multiline,global])), 
-?line <<"MLKPlabcY">> = iolist_to_binary(re:replace("abc","^abc$","MLKPl&\\1Y",[])), 
-?line <<"MLKPlabcY">> = iolist_to_binary(re:replace("abc","^abc$","MLKPl&\\1Y",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","\\1uRnMNc&\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","\\1uRnMNc&\\1",[global])), 
-?line <<"qqq
+zzz","^abc$","jwo&&BysLOHC\\1R",[multiline,global])), 
+    <<"fPMabcFHNJXabcJChQyabcU">> = iolist_to_binary(re:replace("abc","^abc$","fPM&FHNJX&JCh\\1Qy&U",[])), 
+    <<"fPMabcFHNJXabcJChQyabcU">> = iolist_to_binary(re:replace("abc","^abc$","fPM&FHNJX&JCh\\1Qy&U",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","&\\1&R\\1oixQQMrImGsd&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","&\\1&R\\1oixQQMrImGsd&",[global])), 
+    <<"qqq
 abc">> = iolist_to_binary(re:replace("qqq
-abc","^abc$","b\\1",[])), 
-?line <<"qqq
+abc","^abc$","rAUAF&gmNHyoIX\\1ymqk",[])), 
+    <<"qqq
 abc">> = iolist_to_binary(re:replace("qqq
-abc","^abc$","b\\1",[global])), 
-?line <<"abc
+abc","^abc$","rAUAF&gmNHyoIX\\1ymqk",[global])), 
+    <<"abc
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","^abc$","RAJ\\1a&Mvoue\\1d",[])), 
-?line <<"abc
+zzz","^abc$","&&qL\\1YUdNN\\1\\1\\1O\\1",[])), 
+    <<"abc
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","^abc$","RAJ\\1a&Mvoue\\1d",[global])), 
-?line <<"qqq
+zzz","^abc$","&&qL\\1YUdNN\\1\\1\\1O\\1",[global])), 
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","^abc$","\\1NghvSn\\1GSQvu&&grYN",[])), 
-?line <<"qqq
+zzz","^abc$","u",[])), 
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","^abc$","\\1NghvSn\\1GSQvu&&grYN",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","&",[multiline])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","&",[multiline,
-                                                                                                                                                                        global])), 
-?line <<"XQevmabcHXD">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","XQevm&HXD",[multiline])), 
-?line <<"XQevmabcHXD">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","XQevm&HXD",[multiline,
-                                                                                                                                                                                        global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\Z","plNA&&\\1Myw&e",[multiline])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\Z","plNA&&\\1Myw&e",[multiline,
-                                                                                                                                                                                                                     global])), 
-?line <<"qqq
+zzz","^abc$","u",[global])), 
+    <<"abcRqIabcuWabcabcFN">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","&\\1RqI&uW&&F\\1N",[multiline])), 
+    <<"abcRqIabcuWabcabcFN">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","&\\1RqI&uW&&F\\1N",[multiline,
+                                                                                                                                                                                                           global])), 
+    <<"abciwrfICONabcYabc">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","&iwrf\\1ICON&\\1Y&\\1\\1",[multiline])), 
+    <<"abciwrfICONabcYabc">> = iolist_to_binary(re:replace("abc","\\Aabc\\Z","&iwrf\\1ICON&\\1Y&\\1\\1",[multiline,
+                                                                                                                                                                                                                          global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\Z","RsIorq&kLBrJVt&Dq",[multiline])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\Z","RsIorq&kLBrJVt&Dq",[multiline,
+                                                                                                                                                                                                                       global])), 
+    <<"qqq
 abc">> = iolist_to_binary(re:replace("qqq
-abc","\\Aabc\\Z","tActj",[multiline])), 
-?line <<"qqq
+abc","\\Aabc\\Z","bByD\\1yC\\1hlr",[multiline])), 
+    <<"qqq
 abc">> = iolist_to_binary(re:replace("qqq
-abc","\\Aabc\\Z","tActj",[multiline,global])), 
-?line <<"abc
+abc","\\Aabc\\Z","bByD\\1yC\\1hlr",[multiline,global])), 
+    <<"abc
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","\\Aabc\\Z","&PAnUmSADdk",[multiline])), 
-?line <<"abc
+zzz","\\Aabc\\Z","AuwHER\\1cj\\1XMx\\1jBcr&u",[multiline])), 
+    <<"abc
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","\\Aabc\\Z","&PAnUmSADdk",[multiline,global])), 
-?line <<"qqq
+zzz","\\Aabc\\Z","AuwHER\\1cj\\1XMx\\1jBcr&u",[multiline,
+                                                              global])), 
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","\\Aabc\\Z","O&&GYJA",[multiline])), 
-?line <<"qqq
+zzz","\\Aabc\\Z","kiYxAVR&jFLIO&t\\1to&",[multiline])), 
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","\\Aabc\\Z","O&&GYJA",[multiline,global])), 
-?line <<"ejfGpamjOGidXfWabc
-defiXJg">> = iolist_to_binary(re:replace("abc
-def","\\A(.)*\\Z","ej\\1GpamjOGidX\\1W&iXJg",[dotall])), 
-?line <<"ejfGpamjOGidXfWabc
-defiXJg">> = iolist_to_binary(re:replace("abc
-def","\\A(.)*\\Z","ej\\1GpamjOGidX\\1W&iXJg",[dotall,global])), 
-?line <<"UTI*** FailersagVgtIFYe*** Failerss*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\A(.)*\\Z","UTI&agVgtIFYe&\\1&",[multiline])), 
-?line <<"UTI*** FailersagVgtIFYe*** Failerss*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\A(.)*\\Z","UTI&agVgtIFYe&\\1&",[multiline,
-                                                                                                                                                                                                                               global])), 
-?line <<"abc
+zzz","\\Aabc\\Z","kiYxAVR&jFLIO&t\\1to&",[multiline,global])), 
+    <<"DGWRrfDctbIpuofabc
+defabc
+defHPf">> = iolist_to_binary(re:replace("abc
+def","\\A(.)*\\Z","DGWRr\\1DctbIpuo\\1&&HPf",[dotall])), 
+    <<"DGWRrfDctbIpuofabc
+defabc
+defHPf">> = iolist_to_binary(re:replace("abc
+def","\\A(.)*\\Z","DGWRr\\1DctbIpuo\\1&&HPf",[dotall,global])), 
+    <<"XsHV*** FailerstLRmsk*** FailersMPy">> = iolist_to_binary(re:replace("*** Failers","\\A(.)*\\Z","XsHV&tLRm\\1k&MPy",[multiline])), 
+    <<"XsHV*** FailerstLRmsk*** FailersMPy">> = iolist_to_binary(re:replace("*** Failers","\\A(.)*\\Z","XsHV&tLRm\\1k&MPy",[multiline,
+                                                                                                                                                                                                                          global])), 
+    <<"abc
 def">> = iolist_to_binary(re:replace("abc
-def","\\A(.)*\\Z","&PHW&rh&xcxs\\1Cy&Chhd",[multiline])), 
-?line <<"abc
+def","\\A(.)*\\Z","v",[multiline])), 
+    <<"abc
 def">> = iolist_to_binary(re:replace("abc
-def","\\A(.)*\\Z","&PHW&rh&xcxs\\1Cy&Chhd",[multiline,global])), 
-?line <<"cjOwaTTW::c">> = iolist_to_binary(re:replace("b::c","(?:b)|(?::+)","cjOwaTTW",[])), 
-?line <<"cjOwaTTWcjOwaTTWc">> = iolist_to_binary(re:replace("b::c","(?:b)|(?::+)","cjOwaTTW",[global])), 
-?line <<"c::ReJbWufqTUdDqlXQb">> = iolist_to_binary(re:replace("c::b","(?:b)|(?::+)","\\1&ReJbWufqTUdDqlXQ",[])), 
-?line <<"c::ReJbWufqTUdDqlXQbReJbWufqTUdDqlXQ">> = iolist_to_binary(re:replace("c::b","(?:b)|(?::+)","\\1&ReJbWufqTUdDqlXQ",[global])), 
-?line <<"az-uaz-obYOlaz-DVbrqaz-y">> = iolist_to_binary(re:replace("az-","[-az]+","&u&obYOl&DVbrq&y",[])), 
-?line <<"az-uaz-obYOlaz-DVbrqaz-y">> = iolist_to_binary(re:replace("az-","[-az]+","&u&obYOl&DVbrq&y",[global])), 
-?line <<"*** FAlNlPvDnUXilers">> = iolist_to_binary(re:replace("*** Failers","[-az]+","AlNlPvDn\\1UX",[])), 
-?line <<"*** FAlNlPvDnUXilers">> = iolist_to_binary(re:replace("*** Failers","[-az]+","AlNlPvDn\\1UX",[global])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[-az]+","&xa\\1Q\\1BSaQG",[])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[-az]+","&xa\\1Q\\1BSaQG",[global])), 
-?line <<"rJXv">> = iolist_to_binary(re:replace("za-","[az-]+","\\1rJXv",[])), 
-?line <<"rJXv">> = iolist_to_binary(re:replace("za-","[az-]+","\\1rJXv",[global])), 
-?line <<"*** FIQWDsCilers">> = iolist_to_binary(re:replace("*** Failers","[az-]+","IQWD\\1\\1sC",[])), 
-?line <<"*** FIQWDsCilers">> = iolist_to_binary(re:replace("*** Failers","[az-]+","IQWD\\1\\1sC",[global])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[az-]+","G\\1TcEO\\1EAeKKLc&eOBg",[])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[az-]+","G\\1TcEO\\1EAeKKLc&eOBg",[global])), 
-?line <<"DsdWoREvsWCDpa-z">> = iolist_to_binary(re:replace("a-z","[a\\-z]+","Dsd\\1WoREvsWCD\\1p&",[])), 
-?line <<"DsdWoREvsWCDpa-z">> = iolist_to_binary(re:replace("a-z","[a\\-z]+","Dsd\\1WoREvsWCD\\1p&",[global])), 
-?line <<"*** FaUqEUvbeKTpilers">> = iolist_to_binary(re:replace("*** Failers","[a\\-z]+","&U\\1qEUvbeKTp",[])), 
-?line <<"*** FaUqEUvbeKTpilers">> = iolist_to_binary(re:replace("*** Failers","[a\\-z]+","&U\\1qEUvbeKTp",[global])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[a\\-z]+","IdIH&",[])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[a\\-z]+","IdIH&",[global])), 
-?line <<"CHIiEabcdxyzAXhIPVabcdxyz">> = iolist_to_binary(re:replace("abcdxyz","[a-z]+","CHIiE&AXhIPV&",[])), 
-?line <<"CHIiEabcdxyzAXhIPVabcdxyz">> = iolist_to_binary(re:replace("abcdxyz","[a-z]+","CHIiE&AXhIPV&",[global])), 
-?line <<"Tk12-34ptREc12-34dF">> = iolist_to_binary(re:replace("12-34","[\\d-]+","Tk&ptREc&dF\\1",[])), 
-?line <<"Tk12-34ptREc12-34dF">> = iolist_to_binary(re:replace("12-34","[\\d-]+","Tk&ptREc&dF\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-]+","PO\\1\\1HuRnqA\\1miVVsKv",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-]+","PO\\1\\1HuRnqA\\1miVVsKv",[global])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-]+","QMUbdeC\\1fKgUg",[])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-]+","QMUbdeC\\1fKgUg",[global])), 
-?line <<"YypJ">> = iolist_to_binary(re:replace("12-34z","[\\d-z]+","YypJ",[])), 
-?line <<"YypJ">> = iolist_to_binary(re:replace("12-34z","[\\d-z]+","YypJ",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-z]+","d&ErDHl\\1&GDjyQy",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-z]+","d&ErDHl\\1&GDjyQy",[global])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-z]+","EVkS",[])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-z]+","EVkS",[global])), 
-?line <<"cHd\\ltkGr\\BqrhP ">> = iolist_to_binary(re:replace("\\ ","\\x5c","cHd&ltkGr&Bqr\\1hP",[])), 
-?line <<"cHd\\ltkGr\\BqrhP ">> = iolist_to_binary(re:replace("\\ ","\\x5c","cHd&ltkGr&Bqr\\1hP",[global])), 
-?line <<"the Z Z ZciyfJLvoo">> = iolist_to_binary(re:replace("the Zoo","\\x20Z","&&&ciyf\\1JLv",[])), 
-?line <<"the Z Z ZciyfJLvoo">> = iolist_to_binary(re:replace("the Zoo","\\x20Z","&&&ciyf\\1JLv",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\x20Z","ry\\1S\\1&\\1\\1MkYc",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\x20Z","ry\\1S\\1&\\1\\1MkYc",[global])), 
-?line <<"Zulu">> = iolist_to_binary(re:replace("Zulu","\\x20Z","b\\1Wc&RB\\1&&pO&Dd\\1&A",[])), 
-?line <<"Zulu">> = iolist_to_binary(re:replace("Zulu","\\x20Z","b\\1Wc&RB\\1&&pO&Dd\\1&A",[global])), 
-?line <<"aabcabcUxryabcAPabcabcDGgL">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","a&Uxry\\1AP&DGgL",[caseless])), 
-?line <<"aabcabcUxryabcAPabcabcDGgL">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","a&Uxry\\1AP&DGgL",[caseless,
-                                                                                                                                                                                                           global])), 
-?line <<"oStOWABCvVHVfFqojojfABC">> = iolist_to_binary(re:replace("ABCabc","(abc)\\1","oStOW\\1vVHVfFqojojf\\1",[caseless])), 
-?line <<"oStOWABCvVHVfFqojojfABC">> = iolist_to_binary(re:replace("ABCabc","(abc)\\1","oStOW\\1vVHVfFqojojf\\1",[caseless,
-                                                                                                                                                                                                                        global])), 
-?line <<"GabcABCrGLdSabcABCWnHabcabcABCP">> = iolist_to_binary(re:replace("abcABC","(abc)\\1","G&rGLdS&WnH\\1&P",[caseless])), 
-?line <<"GabcABCrGLdSabcABCWnHabcabcABCP">> = iolist_to_binary(re:replace("abcABC","(abc)\\1","G&rGLdS&WnH\\1&P",[caseless,
-                                                                                                                                                                                                            global])), 
-?line <<"KVwWyab{3cdEWMab{3cdPr">> = iolist_to_binary(re:replace("ab{3cd","ab{3cd","KVwWy&\\1EWM&Pr",[])), 
-?line <<"KVwWyab{3cdEWMab{3cdPr">> = iolist_to_binary(re:replace("ab{3cd","ab{3cd","KVwWy&\\1EWM&Pr",[global])), 
-?line <<"KuJab{3,cd">> = iolist_to_binary(re:replace("ab{3,cd","ab{3,cd","KuJ&",[])), 
-?line <<"KuJab{3,cd">> = iolist_to_binary(re:replace("ab{3,cd","ab{3,cd","KuJ&",[global])), 
-?line <<"squJfab{3,4a}cd">> = iolist_to_binary(re:replace("ab{3,4a}cd","ab{3,4a}cd","squ\\1Jf&",[])), 
-?line <<"squJfab{3,4a}cd">> = iolist_to_binary(re:replace("ab{3,4a}cd","ab{3,4a}cd","squ\\1Jf&",[global])), 
-?line <<"{4,5a}bc{4,5a}bcH">> = iolist_to_binary(re:replace("{4,5a}bc","{4,5a}bc","&&H",[])), 
-?line <<"{4,5a}bc{4,5a}bcH">> = iolist_to_binary(re:replace("{4,5a}bc","{4,5a}bc","&&H",[global])), 
-?line <<"nb">> = iolist_to_binary(re:replace("abc","abc$","nb",[])), 
-?line <<"nb">> = iolist_to_binary(re:replace("abc","abc$","nb",[global])), 
-?line <<"aabcTslrEK">> = iolist_to_binary(re:replace("abc","abc$","a&TslrEK",[])), 
-?line <<"aabcTslrEK">> = iolist_to_binary(re:replace("abc","abc$","a&TslrEK",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","rVkXRL&nq&w\\1NDuHM\\1dj",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","rVkXRL&nq&w\\1NDuHM\\1dj",[global])), 
-?line <<"abc
+def","\\A(.)*\\Z","v",[multiline,global])), 
+    <<"RmbbMhEEp::c">> = iolist_to_binary(re:replace("b::c","(?:b)|(?::+)","Rmb&MhEEp",[])), 
+    <<"RmbbMhEEpRmb::MhEEpc">> = iolist_to_binary(re:replace("b::c","(?:b)|(?::+)","Rmb&MhEEp",[global])), 
+    <<"cYDT::rLb">> = iolist_to_binary(re:replace("c::b","(?:b)|(?::+)","YDT\\1&rL",[])), 
+    <<"cYDT::rLYDTbrL">> = iolist_to_binary(re:replace("c::b","(?:b)|(?::+)","YDT\\1&rL",[global])), 
+    <<"ehR">> = iolist_to_binary(re:replace("az-","[-az]+","ehR",[])), 
+    <<"ehR">> = iolist_to_binary(re:replace("az-","[-az]+","ehR",[global])), 
+    <<"*** FsaiTaeaWvwilers">> = iolist_to_binary(re:replace("*** Failers","[-az]+","s&\\1iT\\1&eaWvw",[])), 
+    <<"*** FsaiTaeaWvwilers">> = iolist_to_binary(re:replace("*** Failers","[-az]+","s&\\1iT\\1&eaWvw",[global])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[-az]+","mdHw",[])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[-az]+","mdHw",[global])), 
+    ok.
+run5() ->
+    <<"EDUoLiFaCJDko">> = iolist_to_binary(re:replace("za-","[az-]+","EDUoL\\1i\\1FaCJ\\1Dko",[])), 
+    <<"EDUoLiFaCJDko">> = iolist_to_binary(re:replace("za-","[az-]+","EDUoL\\1i\\1FaCJ\\1Dko",[global])), 
+    <<"*** FapAfSayQoaaFksilers">> = iolist_to_binary(re:replace("*** Failers","[az-]+","&\\1pAfS&yQo&&Fks\\1",[])), 
+    <<"*** FapAfSayQoaaFksilers">> = iolist_to_binary(re:replace("*** Failers","[az-]+","&\\1pAfS&yQo&&Fks\\1",[global])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[az-]+","\\1LDAG\\1JLRNo",[])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[az-]+","\\1LDAG\\1JLRNo",[global])), 
+    <<"">> = iolist_to_binary(re:replace("a-z","[a\\-z]+","\\1",[])), 
+    <<"">> = iolist_to_binary(re:replace("a-z","[a\\-z]+","\\1",[global])), 
+    <<"*** FvVgilers">> = iolist_to_binary(re:replace("*** Failers","[a\\-z]+","vVg",[])), 
+    <<"*** FvVgilers">> = iolist_to_binary(re:replace("*** Failers","[a\\-z]+","vVg",[global])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[a\\-z]+","bfgfonbXIj",[])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[a\\-z]+","bfgfonbXIj",[global])), 
+    <<"QYKd">> = iolist_to_binary(re:replace("abcdxyz","[a-z]+","Q\\1\\1Y\\1Kd\\1",[])), 
+    <<"QYKd">> = iolist_to_binary(re:replace("abcdxyz","[a-z]+","Q\\1\\1Y\\1Kd\\1",[global])), 
+    <<"UYmP12-3412-34">> = iolist_to_binary(re:replace("12-34","[\\d-]+","U\\1\\1YmP&&",[])), 
+    <<"UYmP12-3412-34">> = iolist_to_binary(re:replace("12-34","[\\d-]+","U\\1\\1YmP&&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-]+","JWPgf\\1Eng\\1E\\1n",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-]+","JWPgf\\1Eng\\1E\\1n",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-]+","sRhgqdg&E",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-]+","sRhgqdg&E",[global])), 
+    <<"efmQUhkdSK12-34zR12-34z12-34zTb">> = iolist_to_binary(re:replace("12-34z","[\\d-z]+","ef\\1mQUh\\1kdSK&R&&Tb",[])), 
+    <<"efmQUhkdSK12-34zR12-34z12-34zTb">> = iolist_to_binary(re:replace("12-34z","[\\d-z]+","ef\\1mQUh\\1kdSK&R&&Tb",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-z]+","PJaMxeM",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\d-z]+","PJaMxeM",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-z]+","My\\1Kbyr&\\1",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","[\\d-z]+","My\\1Kbyr&\\1",[global])), 
+    <<"QpJFT\\cphXBPQ ">> = iolist_to_binary(re:replace("\\ ","\\x5c","QpJF\\1T&cphXBPQ\\1",[])), 
+    <<"QpJFT\\cphXBPQ ">> = iolist_to_binary(re:replace("\\ ","\\x5c","QpJF\\1T&cphXBPQ\\1",[global])), 
+    <<"theHwjgWjRYr ZofH ZkBtIoo">> = iolist_to_binary(re:replace("the Zoo","\\x20Z","HwjgWjRYr&\\1ofH&kBtI",[])), 
+    <<"theHwjgWjRYr ZofH ZkBtIoo">> = iolist_to_binary(re:replace("the Zoo","\\x20Z","HwjgWjRYr&\\1ofH&kBtI",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\x20Z","&STbBPwwLA",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\x20Z","&STbBPwwLA",[global])), 
+    <<"Zulu">> = iolist_to_binary(re:replace("Zulu","\\x20Z","buG&ki&QEXQhj\\1\\1W",[])), 
+    <<"Zulu">> = iolist_to_binary(re:replace("Zulu","\\x20Z","buG&ki&QEXQhj\\1\\1W",[global])), 
+    <<"bhNKmH">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","bhNKmH",[caseless])), 
+    <<"bhNKmH">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","bhNKmH",[caseless,
+                                                                                                                                                                                  global])), 
+    <<"jdFUGABCabcjABCabc">> = iolist_to_binary(re:replace("ABCabc","(abc)\\1","jdFUG&j&",[caseless])), 
+    <<"jdFUGABCabcjABCabc">> = iolist_to_binary(re:replace("ABCabc","(abc)\\1","jdFUG&j&",[caseless,
+                                                                                                                                                                                        global])), 
+    <<"YSEabcsfRWrD">> = iolist_to_binary(re:replace("abcABC","(abc)\\1","YSE\\1sfRWrD",[caseless])), 
+    <<"YSEabcsfRWrD">> = iolist_to_binary(re:replace("abcABC","(abc)\\1","YSE\\1sfRWrD",[caseless,
+                                                                                                                                                                                               global])), 
+    <<"CbQoKIFQqeNT">> = iolist_to_binary(re:replace("ab{3cd","ab{3cd","CbQoKIFQqeNT\\1",[])), 
+    <<"CbQoKIFQqeNT">> = iolist_to_binary(re:replace("ab{3cd","ab{3cd","CbQoKIFQqeNT\\1",[global])), 
+    <<"rhgUEyXbklwXmp">> = iolist_to_binary(re:replace("ab{3,cd","ab{3,cd","rhgUEyXbk\\1lwXmp",[])), 
+    <<"rhgUEyXbklwXmp">> = iolist_to_binary(re:replace("ab{3,cd","ab{3,cd","rhgUEyXbk\\1lwXmp",[global])), 
+    <<"Xlab{3,4a}cdcbaPbaKyKQGBb">> = iolist_to_binary(re:replace("ab{3,4a}cd","ab{3,4a}cd","Xl&cbaPbaKyKQG\\1Bb",[])), 
+    <<"Xlab{3,4a}cdcbaPbaKyKQGBb">> = iolist_to_binary(re:replace("ab{3,4a}cd","ab{3,4a}cd","Xl&cbaPbaKyKQG\\1Bb",[global])), 
+    <<"bSQWjrSvge">> = iolist_to_binary(re:replace("{4,5a}bc","{4,5a}bc","b\\1SQWjr\\1\\1Svge",[])), 
+    <<"bSQWjrSvge">> = iolist_to_binary(re:replace("{4,5a}bc","{4,5a}bc","b\\1SQWjr\\1\\1Svge",[global])), 
+    <<"SLxoL">> = iolist_to_binary(re:replace("abc","abc$","SLxoL",[])), 
+    <<"SLxoL">> = iolist_to_binary(re:replace("abc","abc$","SLxoL",[global])), 
+    <<"RJabcnabcqnisabctgJA">> = iolist_to_binary(re:replace("abc","abc$","RJ&n&qnis&tgJA",[])), 
+    <<"RJabcnabcqnisabctgJA">> = iolist_to_binary(re:replace("abc","abc$","RJ&n&qnis&tgJA",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","cEO&P&qRklP&Nlb\\1H\\1K",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","cEO&P&qRklP&Nlb\\1H\\1K",[global])), 
+    <<"abc
 def">> = iolist_to_binary(re:replace("abc
-def","abc$","M",[])), 
-?line <<"abc
+def","abc$","h&&nb\\1&NBSkhYb",[])), 
+    <<"abc
 def">> = iolist_to_binary(re:replace("abc
-def","abc$","M",[global])), 
-?line <<"abcWCabcSYXGPjRugTabcVGabcSX">> = iolist_to_binary(re:replace("abcS","(abc)\\123","\\1WC&YXGPjRugT\\1VG&X",[])), 
-?line <<"abcWCabcSYXGPjRugTabcVGabcSX">> = iolist_to_binary(re:replace("abcS","(abc)\\123","\\1WC&YXGPjRugT\\1VG&X",[global])), 
-?line <<"fabc“Uabc“UmiqabceCsabcabc“">> = iolist_to_binary(re:replace("abc“","(abc)\\223","f&U&Umiq\\1eCs\\1&",[])),
-?line <<"fabc“Uabc“UmiqabceCsabcabc“">> = iolist_to_binary(re:replace("abc“","(abc)\\223","f&U&Umiq\\1eCs\\1&",[global])),
-?line <<"JRFabcxnbabcÓVkabcÓfWigQMuaY">> = iolist_to_binary(re:replace("abcÓ","(abc)\\323","JRF\\1xnb&Vk&fWigQMuaY",[])),
-?line <<"JRFabcxnbabcÓVkabcÓfWigQMuaY">> = iolist_to_binary(re:replace("abcÓ","(abc)\\323","JRF\\1xnb&Vk&fWigQMuaY",[global])),
-?line <<"vgabc@QQ">> = iolist_to_binary(re:replace("abc@","(abc)\\100","vg&QQ",[])), 
-?line <<"vgabc@QQ">> = iolist_to_binary(re:replace("abc@","(abc)\\100","vg&QQ",[global])), 
-?line <<"abc@OkvNytabc@abcabc@a">> = iolist_to_binary(re:replace("abc@","(abc)\\100","&OkvNyt&\\1&a",[])), 
-?line <<"abc@OkvNytabc@abcabc@a">> = iolist_to_binary(re:replace("abc@","(abc)\\100","&OkvNyt&\\1&a",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","P&kRot\\1ILA",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","P&kRot\\1ILA",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","iULjBTiVDW&K\\1p&bj",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","iULjBTiVDW&K\\1p&bj",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","cplYw\\1iuv\\1Okstb\\1p",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","cplYw\\1iuv\\1Okstb\\1p",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","LDaRV&lAu\\1i",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","LDaRV&lAu\\1i",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","K\\1",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","K\\1",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","cXHTTaJLMXvR&\\1",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","cXHTTaJLMXvR&\\1",[global])), 
-?line <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","\\1kB&oGS\\1\\1lPn",[])), 
-?line <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","\\1kB&oGS\\1\\1lPn",[global])), 
-?line <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","\\1",[])), 
-?line <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","\\1",[global])), 
-?line <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","\\1GKLIQYEGVpGIxagx&&",[])), 
-?line <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","\\1GKLIQYEGVpGIxagx&&",[global])), 
-?line <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","og&&Tlj&jCLkmrllagN",[])), 
-?line <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","og&&Tlj&jCLkmrllagN",[global])), 
-?line <<"xMFEgabcdefghijkllSDGabcdefghijkllSN">> = iolist_to_binary(re:replace("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123","xMFEg&DG&N",[])), 
-?line <<"xMFEgabcdefghijkllSDGabcdefghijkllSN">> = iolist_to_binary(re:replace("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123","xMFEg&DG&N",[global])), 
-?line <<"WyroFQabcdefghijk
-SNfabcdefghijk
-SahyoPabcdefghijk
-Sqfbs">> = iolist_to_binary(re:replace("abcdefghijk
-S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123","WyroFQ&Nf&ahyoP&qfbs",[])), 
-?line <<"WyroFQabcdefghijk
-SNfabcdefghijk
-SahyoPabcdefghijk
-Sqfbs">> = iolist_to_binary(re:replace("abcdefghijk
-S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123","WyroFQ&Nf&ahyoP&qfbs",[global])), 
-?line <<"fCnqsFE">> = iolist_to_binary(re:replace("abidef","ab\\idef","fCnqs\\1FE",[])), 
-?line <<"fCnqsFE">> = iolist_to_binary(re:replace("abidef","ab\\idef","fCnqs\\1FE",[global])), 
-?line <<"QFATItqr">> = iolist_to_binary(re:replace("bc","a{0}bc","Q\\1FAT\\1Itqr",[])), 
-?line <<"QFATItqr">> = iolist_to_binary(re:replace("bc","a{0}bc","Q\\1FAT\\1Itqr",[global])), 
-?line <<"DnNn">> = iolist_to_binary(re:replace("xyz","(a|(bc)){0,0}?xyz","DnNn",[])), 
-?line <<"DnNn">> = iolist_to_binary(re:replace("xyz","(a|(bc)){0,0}?xyz","DnNn",[global])), 
-?line <<"GlvWIgK">> = iolist_to_binary(re:replace("abcde","abc[\\10]de","GlvW\\1\\1IgK",[])), 
-?line <<"GlvWIgK">> = iolist_to_binary(re:replace("abcde","abc[\\10]de","GlvW\\1\\1IgK",[global])), 
-?line <<"KDyabc
deXgxxbvI">> = iolist_to_binary(re:replace("abc
de","abc[\\1]de","KDy&XgxxbvI",[])), 
-?line <<"KDyabc
deXgxxbvI">> = iolist_to_binary(re:replace("abc
de","abc[\\1]de","KDy&XgxxbvI",[global])), 
-?line <<"abcSYuXabcUabckewfJS">> = iolist_to_binary(re:replace("abc
de","(abc)[\\1]de","\\1SYuX\\1U\\1kewfJS",[])), 
-?line <<"abcSYuXabcUabckewfJS">> = iolist_to_binary(re:replace("abc
de","(abc)[\\1]de","\\1SYuX\\1U\\1kewfJS",[global])), 
-?line <<"a
-b">> = iolist_to_binary(re:replace("a
-b","(?s)a.b","&",[])), 
-?line <<"a
-b">> = iolist_to_binary(re:replace("a
-b","(?s)a.b","&",[global])), 
-?line <<"sILYgbGPUbaNOTcccceynxed">> = iolist_to_binary(re:replace("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","sILYg\\1GPU&eynxe",[])), 
-?line <<"sILYgbGPUbaNOTcccceynxed">> = iolist_to_binary(re:replace("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","sILYg\\1GPU&eynxe",[global])), 
-?line <<"bURwd">> = iolist_to_binary(re:replace("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","\\1URw",[])), 
-?line <<"bURwd">> = iolist_to_binary(re:replace("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","\\1URw",[global])), 
-?line <<"rRcqtdVUmd">> = iolist_to_binary(re:replace("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","rRcqtdVUm",[])), 
-?line <<"rRcqtdVUmd">> = iolist_to_binary(re:replace("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","rRcqtdVUm",[global])), 
-?line <<"lYsStJbdoraarRd">> = iolist_to_binary(re:replace("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","lYsStJ\\1doraarR",[])), 
-?line <<"lYsStJbdoraarRd">> = iolist_to_binary(re:replace("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","lYsStJ\\1doraarR",[global])), 
-?line <<"*** Failersyu**c*** Failers*KH">> = iolist_to_binary(re:replace("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})","&yu\\1\\1c&\\1KH",[])), 
-?line <<"*** Failersyu**c*** Failers*KH">> = iolist_to_binary(re:replace("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})","&yu\\1\\1c&\\1KH",[global])), 
-?line <<"anything">> = iolist_to_binary(re:replace("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})","&xLcPYkjD\\1YuJHCYWAIc",[])), 
-?line <<"anything">> = iolist_to_binary(re:replace("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})","&xLcPYkjD\\1YuJHCYWAIc",[global])), 
-?line <<"bc">> = iolist_to_binary(re:replace("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})","l\\1RIA&evjlHaNPGsYSx",[])), 
-?line <<"bc">> = iolist_to_binary(re:replace("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})","l\\1RIA&evjlHaNPGsYSx",[global])), 
-?line <<"baccd">> = iolist_to_binary(re:replace("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","SfTsSTMDCrU",[])), 
-?line <<"baccd">> = iolist_to_binary(re:replace("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","SfTsSTMDCrU",[global])), 
-?line <<"KqAssSsdXronRAsbc">> = iolist_to_binary(re:replace("Abc","[^a]","Kq&s\\1sSsdXronR&s\\1",[])), 
-?line <<"KqAssSsdXronRAsKqbssSsdXronRbsKqcssSsdXronRcs">> = iolist_to_binary(re:replace("Abc","[^a]","Kq&s\\1sSsdXronR&s\\1",[global])), 
-?line <<"AXxbehbnMtJMOjc">> = iolist_to_binary(re:replace("Abc","[^a]","Xx&eh&nMtJMOj",[caseless])), 
-?line <<"AXxbehbnMtJMOjXxcehcnMtJMOj">> = iolist_to_binary(re:replace("Abc","[^a]","Xx&eh&nMtJMOj",[caseless,
-                                                                                                                                                                                     global])), 
-?line <<"owGHnKmdtjnrJgSkEfaAbc">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","owGHnKmdtjnrJgSkEf",[])), 
-?line <<"owGHnKmdtjnrJgSkEfaowGHnKmdtjnrJgSkEf">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","owGHnKmdtjnrJgSkEf",[global])), 
-?line <<"AAAaAkm">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","\\1km",[caseless])), 
-?line <<"AAAaAkm">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","\\1km",[caseless,
-                                                                                                                                                                              global])), 
-?line <<"iBIdW">> = iolist_to_binary(re:replace("bbb
-ccc","[^a]+","iB\\1I\\1d\\1\\1W",[])), 
-?line <<"iBIdW">> = iolist_to_binary(re:replace("bbb
-ccc","[^a]+","iB\\1I\\1d\\1\\1W",[global])), 
-?line <<"abDIvvGgnrbcKkaSCbuiv">> = iolist_to_binary(re:replace("abc","[^k]$","DIvvGgnrb&KkaSCbuiv\\1",[])), 
-?line <<"abDIvvGgnrbcKkaSCbuiv">> = iolist_to_binary(re:replace("abc","[^k]$","DIvvGgnrb&KkaSCbuiv\\1",[global])), 
-?line <<"*** FailerbswvPHxEss">> = iolist_to_binary(re:replace("*** Failers","[^k]$","b&wvPH\\1xE&&",[])), 
-?line <<"*** FailerbswvPHxEss">> = iolist_to_binary(re:replace("*** Failers","[^k]$","b&wvPH\\1xE&&",[global])), 
-?line <<"abk">> = iolist_to_binary(re:replace("abk","[^k]$","nWvCPNUa\\1iDnbay",[])), 
-?line <<"abk">> = iolist_to_binary(re:replace("abk","[^k]$","nWvCPNUa\\1iDnbay",[global])), 
-?line <<"HWSo">> = iolist_to_binary(re:replace("abc","[^k]{2,3}$","HWSo\\1",[])), 
-?line <<"HWSo">> = iolist_to_binary(re:replace("abc","[^k]{2,3}$","HWSo\\1",[global])), 
-?line <<"kNKYkjbsvgnUOybcsuN">> = iolist_to_binary(re:replace("kbc","[^k]{2,3}$","NKYkjbsvgn\\1UO\\1y&suN",[])), 
-?line <<"kNKYkjbsvgnUOybcsuN">> = iolist_to_binary(re:replace("kbc","[^k]{2,3}$","NKYkjbsvgn\\1UO\\1y&suN",[global])), 
-?line <<"kDhBIRhnabc">> = iolist_to_binary(re:replace("kabc","[^k]{2,3}$","DhBIRhn&",[])), 
-?line <<"kDhBIRhnabc">> = iolist_to_binary(re:replace("kabc","[^k]{2,3}$","DhBIRhn&",[global])), 
-?line <<"*** FailQmVy">> = iolist_to_binary(re:replace("*** Failers","[^k]{2,3}$","QmVy",[])), 
-?line <<"*** FailQmVy">> = iolist_to_binary(re:replace("*** Failers","[^k]{2,3}$","QmVy",[global])), 
-?line <<"abk">> = iolist_to_binary(re:replace("abk","[^k]{2,3}$","L&e",[])), 
-?line <<"abk">> = iolist_to_binary(re:replace("abk","[^k]{2,3}$","L&e",[global])), 
-?line <<"akb">> = iolist_to_binary(re:replace("akb","[^k]{2,3}$","\\1aD\\1u&",[])), 
-?line <<"akb">> = iolist_to_binary(re:replace("akb","[^k]{2,3}$","\\1aD\\1u&",[global])), 
-?line <<"akk">> = iolist_to_binary(re:replace("akk","[^k]{2,3}$","lPwfbQvWcRAypQ&",[])), 
-?line <<"akk">> = iolist_to_binary(re:replace("akk","[^k]{2,3}$","lPwfbQvWcRAypQ&",[global])), 
-?line <<"12345678.b.c.d">> = iolist_to_binary(re:replace("12345678.b.c.d","^\\d{8,}\\@.+[^k]$","VKe&\\1iCfITU\\1&nqEh",[])), 
-?line <<"12345678.b.c.d">> = iolist_to_binary(re:replace("12345678.b.c.d","^\\d{8,}\\@.+[^k]$","VKe&\\1iCfITU\\1&nqEh",[global])), 
-?line <<"123456789.y.z">> = iolist_to_binary(re:replace("123456789.y.z","^\\d{8,}\\@.+[^k]$","aW\\1Jg&g",[])), 
-?line <<"123456789.y.z">> = iolist_to_binary(re:replace("123456789.y.z","^\\d{8,}\\@.+[^k]$","aW\\1Jg&g",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8,}\\@.+[^k]$","lHO",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8,}\\@.+[^k]$","lHO",[global])), 
-?line <<"12345678.y.uk">> = iolist_to_binary(re:replace("12345678.y.uk","^\\d{8,}\\@.+[^k]$","uVLRBqgT\\1c&\\1",[])), 
-?line <<"12345678.y.uk">> = iolist_to_binary(re:replace("12345678.y.uk","^\\d{8,}\\@.+[^k]$","uVLRBqgT\\1c&\\1",[global])), 
-?line <<"1234567.b.c.d">> = iolist_to_binary(re:replace("1234567.b.c.d","^\\d{8,}\\@.+[^k]$","VRE&uJDdtsECL",[])), 
-?line <<"1234567.b.c.d">> = iolist_to_binary(re:replace("1234567.b.c.d","^\\d{8,}\\@.+[^k]$","VRE&uJDdtsECL",[global])), 
-?line <<"XJnEEHYdC">> = iolist_to_binary(re:replace("aaaaaaaaa","(a)\\1{8,}","XJnEEHYdC",[])), 
-?line <<"XJnEEHYdC">> = iolist_to_binary(re:replace("aaaaaaaaa","(a)\\1{8,}","XJnEEHYdC",[global])), 
-?line <<"eviBaaaaaaaaaaaKMfaysHkyJyKi">> = iolist_to_binary(re:replace("aaaaaaaaaa","(a)\\1{8,}","eviB\\1&KMfaysHkyJyKi",[])), 
-?line <<"eviBaaaaaaaaaaaKMfaysHkyJyKi">> = iolist_to_binary(re:replace("aaaaaaaaaa","(a)\\1{8,}","eviB\\1&KMfaysHkyJyKi",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a)\\1{8,}","DjllScfItkb&J&&Nv\\1\\1C",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a)\\1{8,}","DjllScfItkb&J&&Nv\\1\\1C",[global])), 
-?line <<"aaaaaaa">> = iolist_to_binary(re:replace("aaaaaaa","(a)\\1{8,}","W&Bp\\1Bem",[])), 
-?line <<"aaaaaaa">> = iolist_to_binary(re:replace("aaaaaaa","(a)\\1{8,}","W&Bp\\1Bem",[global])), 
-?line <<"aaaaIEWbcd">> = iolist_to_binary(re:replace("aaaabcd","[^a]","IEW\\1&",[])), 
-?line <<"aaaaIEWbIEWcIEWd">> = iolist_to_binary(re:replace("aaaabcd","[^a]","IEW\\1&",[global])), 
-?line <<"aarhjHFaNDBbwVabcd">> = iolist_to_binary(re:replace("aaAabcd","[^a]","r\\1hjHFaNDBbwV",[])), 
-?line <<"aarhjHFaNDBbwVarhjHFaNDBbwVrhjHFaNDBbwVrhjHFaNDBbwV">> = iolist_to_binary(re:replace("aaAabcd","[^a]","r\\1hjHFaNDBbwV",[global])), 
-?line <<"aaaaUVFcd">> = iolist_to_binary(re:replace("aaaabcd","[^a]","U\\1V\\1F",[caseless])), 
-?line <<"aaaaUVFUVFUVF">> = iolist_to_binary(re:replace("aaaabcd","[^a]","U\\1V\\1F",[caseless,
-                                                                                                                                                                                     global])), 
-?line <<"aaAacbLmqbDepcd">> = iolist_to_binary(re:replace("aaAabcd","[^a]","c&Lmq&De\\1p",[caseless])), 
-?line <<"aaAacbLmqbDepccLmqcDepcdLmqdDep">> = iolist_to_binary(re:replace("aaAabcd","[^a]","c&Lmq&De\\1p",[caseless,
-                                                                                                                                                                                            global])), 
-?line <<"aaaaFtrLcd">> = iolist_to_binary(re:replace("aaaabcd","[^az]","Ftr\\1L",[])), 
-?line <<"aaaaFtrLFtrLFtrL">> = iolist_to_binary(re:replace("aaaabcd","[^az]","Ftr\\1L",[global])), 
-?line <<"aaxQoACFyabcd">> = iolist_to_binary(re:replace("aaAabcd","[^az]","xQo&C\\1Fy",[])), 
-?line <<"aaxQoACFyaxQobCFyxQocCFyxQodCFy">> = iolist_to_binary(re:replace("aaAabcd","[^az]","xQo&C\\1Fy",[global])), 
-?line <<"aaaawiJAqfcd">> = iolist_to_binary(re:replace("aaaabcd","[^az]","wiJ\\1Aq\\1f",[caseless])), 
-?line <<"aaaawiJAqfwiJAqfwiJAqf">> = iolist_to_binary(re:replace("aaaabcd","[^az]","wiJ\\1Aq\\1f",[caseless,
-                                                                                                                                                                                             global])), 
-?line <<"aaAabheGsmSFcd">> = iolist_to_binary(re:replace("aaAabcd","[^az]","bheGsmSF",[caseless])), 
-?line <<"aaAabheGsmSFbheGsmSFbheGsmSF">> = iolist_to_binary(re:replace("aaAabcd","[^az]","bheGsmSF",[caseless,
-                                                                                                                                                                                   global])), 
-?line <<"xxxxxxxxxxxINrCehGlgxfQWogKhXjxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL","INrCe\\1hGlgxfQWogKhXj",[])), 
-?line <<"xxxxxxxxxxxINrCehGlgxfQWogKhXjxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL","INrCe\\1hGlgxfQWogKhXj",[global])), 
-?line <<"xxxxxxxxxxxSxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL","S",[])), 
-?line <<"xxxxxxxxxxxSxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL","S",[global])), 
-?line <<"1yO.230003938DJNUSE">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d[1-9]?)\\d+","yO&DJNUSE",[])), 
-?line <<"1yO.230003938DJNUSE">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d[1-9]?)\\d+","yO&DJNUSE",[global])), 
-?line <<"1J.875RCmc.875000282SWmWrLgf">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d[1-9]?)\\d+","J\\1RCmc&SWmWrLgf",[])), 
-?line <<"1J.875RCmc.875000282SWmWrLgf">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d[1-9]?)\\d+","J\\1RCmc&SWmWrLgf",[global])), 
-?line <<"1QhH.23A.235j">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d[1-9]?)\\d+","QhH\\1A&j",[])), 
-?line <<"1QhH.23A.235j">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d[1-9]?)\\d+","QhH\\1A&j",[global])), 
-?line <<"1ASoXGLgq.23gkJkohg.23pCC0003938">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))","ASoXGLgq\\1gkJkohg\\1pCC",[])), 
-?line <<"1ASoXGLgq.23gkJkohg.23pCC0003938">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))","ASoXGLgq\\1gkJkohg\\1pCC",[global])), 
-?line <<"1rmMcAlqV000282">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))","rmMcAlqV",[])), 
-?line <<"1rmMcAlqV000282">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))","rmMcAlqV",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))","wpfYj&AA",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))","wpfYj&AA",[global])), 
-?line <<"1.235">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))","Kq&VgFL",[])), 
-?line <<"1.235">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))","Kq&VgFL",[global])), 
-?line <<"JabwbScGoababcabE">> = iolist_to_binary(re:replace("ab","a(?)b","J&wbSc\\1Go&\\1\\1&c&E",[])), 
-?line <<"JabwbScGoababcabE">> = iolist_to_binary(re:replace("ab","a(?)b","J&wbSc\\1Go&\\1\\1&c&E",[global])), 
-?line <<"Food is on the Qfoo tableygvPjujxbaDigfoo tablegCefoo table">> = iolist_to_binary(re:replace("Food is on the foo table","\\b(foo)\\s+(\\w+)","Q&ygvPjujxbaDig&gCe&",[caseless])), 
-?line <<"Food is on the Qfoo tableygvPjujxbaDigfoo tablegCefoo table">> = iolist_to_binary(re:replace("Food is on the foo table","\\b(foo)\\s+(\\w+)","Q&ygvPjujxbaDig&gCe&",[caseless,
-                                                                                                                                                                                                                                                                             global])), 
-?line <<"The pBETCXLfood is under the bar in the barWwWn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*)bar","pBETCXL&WwW",[])), 
-?line <<"The pBETCXLfood is under the bar in the barWwWn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*)bar","pBETCXL&WwW",[global])), 
-?line <<"The nfood is under the barnSrtWBfood is under the barXapfood is under the barr in the barn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*?)bar","n&nSrtWB&Xap&r",[])), 
-?line <<"The nfood is under the barnSrtWBfood is under the barXapfood is under the barr in the barn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*?)bar","n&nSrtWB&Xap&r",[global])), 
-?line <<"GI have 2 numbers: 53147mNBu">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d*)","G&mNBu",[])), 
-?line <<"GI have 2 numbers: 53147mNBuGmNBu">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d*)","G&mNBu",[global])), 
-?line <<"SI have 2 numbers: 53147">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)","S&",[])), 
-?line <<"SI have 2 numbers: 53147">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)","S&",[global])), 
-?line <<"bGeEvMOYIVDQHJHuI have 2 numbers: 53147">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d*)","bGeEvMO\\1YIVDQ&HJHu",[])), 
-?line <<"bGeEvMOYIVDQHJHubGeEvMOIYIVDQIHJHubGeEvMOYIVDQHJHubGeEvMO YIVDQ HJHubGeEvMOYIVDQHJHubGeEvMOhYIVDQhHJHubGeEvMOYIVDQHJHubGeEvMOaYIVDQaHJHubGeEvMOYIVDQHJHubGeEvMOvYIVDQvHJHubGeEvMOYIVDQHJHubGeEvMOeYIVDQeHJHubGeEvMOYIVDQHJHubGeEvMO YIVDQ 2HJHubGeEvMOYIVDQHJHubGeEvMO YIVDQ HJHubGeEvMOYIVDQHJHubGeEvMOnYIVDQnHJHubGeEvMOYIVDQHJHubGeEvMOuYIVDQuHJHubGeEvMOYIVDQHJHubGeEvMOmYIVDQmHJHubGeEvMOYIVDQHJHubGeEvMObYIVDQbHJHubGeEvMOYIVDQHJHubGeEvMOeYIVDQeHJHubGeEvMOYIVDQHJHubGeEvMOrYIVDQrHJHubGeEvMOYIVDQHJHubGeEvMOsYIVDQsHJHubGeEvMOYIVDQHJHubGeEvMO:YIVDQ:HJHubGeEvMOYIVDQHJHubGeEvMO YIVDQ 53147HJHubGeEvMOYIVDQHJHu">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d*)","bGeEvMO\\1YIVDQ&HJHu",[global])), 
-?line <<"I have tsI have cgpNHsI have I have U numbers: 53147">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)","\\1ts\\1cgpNHs\\1\\1U",[])), 
-?line <<"I have tsI have cgpNHsI have I have U numbers: ts numbers: cgpNHs numbers:  numbers: U">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)","\\1ts\\1cgpNHs\\1\\1U",[global])), 
-?line <<"mwinCVPlFdkqGucU">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)$","mwinCVPlFdkqGucU",[])), 
-?line <<"mwinCVPlFdkqGucU">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)$","mwinCVPlFdkqGucU",[global])), 
-?line <<"I have 2 numbers: 53147I have 2 numbers: 53147I have 2 numbers: 53147pEI have 2 numbers: 53147o">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)$","&&&pE&o",[])), 
-?line <<"I have 2 numbers: 53147I have 2 numbers: 53147I have 2 numbers: 53147pEI have 2 numbers: 53147o">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)$","&&&pE&o",[global])), 
-?line <<"ym">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)\\b(\\d+)$","ym",[])), 
-?line <<"ym">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)\\b(\\d+)$","ym",[global])), 
-?line <<"FI have 2 numbers: 53147QSb">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*\\D)(\\d+)$","F&QSb",[])), 
-?line <<"FI have 2 numbers: 53147QSb">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*\\D)(\\d+)$","F&QSb",[global])), 
-?line <<"ABDGFHjyNAtuJTC123">> = iolist_to_binary(re:replace("ABC123","^\\D*(?!123)","&DGFHjyNAtu\\1JT",[])), 
-?line <<"ABDGFHjyNAtuJTC123">> = iolist_to_binary(re:replace("ABC123","^\\D*(?!123)","&DGFHjyNAtu\\1JT",[global])), 
-?line <<"ABCUxCRnmWFAQVrawlJ445">> = iolist_to_binary(re:replace("ABC445","^(\\D*)(?=\\d)(?!123)","\\1UxCRnmWFAQVrawlJ",[])), 
-?line <<"ABCUxCRnmWFAQVrawlJ445">> = iolist_to_binary(re:replace("ABC445","^(\\D*)(?=\\d)(?!123)","\\1UxCRnmWFAQVrawlJ",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","X\\1uOv\\1PUbsw&IOcqB",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","X\\1uOv\\1PUbsw&IOcqB",[global])), 
-?line <<"ABC123">> = iolist_to_binary(re:replace("ABC123","^(\\D*)(?=\\d)(?!123)","&efpcH\\1vtp",[])), 
-?line <<"ABC123">> = iolist_to_binary(re:replace("ABC123","^(\\D*)(?=\\d)(?!123)","&efpcH\\1vtp",[global])), 
-?line <<"X789">> = iolist_to_binary(re:replace("W46]789","^[W-]46]","X",[])), 
-?line <<"X789">> = iolist_to_binary(re:replace("W46]789","^[W-]46]","X",[global])), 
-?line <<"-46]GqowvnKBMivOCTQ789">> = iolist_to_binary(re:replace("-46]789","^[W-]46]","&GqowvnKBMiv\\1\\1OCTQ",[])), 
-?line <<"-46]GqowvnKBMivOCTQ789">> = iolist_to_binary(re:replace("-46]789","^[W-]46]","&GqowvnKBMiv\\1\\1OCTQ",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-]46]","VkkVbQHsQJe\\1Oqgp",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-]46]","VkkVbQHsQJe\\1Oqgp",[global])), 
-?line <<"Wall">> = iolist_to_binary(re:replace("Wall","^[W-]46]","A\\1",[])), 
-?line <<"Wall">> = iolist_to_binary(re:replace("Wall","^[W-]46]","A\\1",[global])), 
-?line <<"Zebra">> = iolist_to_binary(re:replace("Zebra","^[W-]46]","D\\1Gh&rRMY",[])), 
-?line <<"Zebra">> = iolist_to_binary(re:replace("Zebra","^[W-]46]","D\\1Gh&rRMY",[global])), 
-?line <<"42">> = iolist_to_binary(re:replace("42","^[W-]46]","&NkVKe",[])), 
-?line <<"42">> = iolist_to_binary(re:replace("42","^[W-]46]","&NkVKe",[global])), 
-?line <<"[abcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-]46]","UhUNReBRM\\1AIyjJpNT",[])), 
-?line <<"[abcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-]46]","UhUNReBRM\\1AIyjJpNT",[global])), 
-?line <<"]abcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-]46]","&GSivk\\1PUgboDgD\\1Q&\\1",[])), 
-?line <<"]abcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-]46]","&GSivk\\1PUgboDgD\\1Q&\\1",[global])), 
-?line <<"CiPKWjJuYp46]789">> = iolist_to_binary(re:replace("W46]789","^[W-\\]46]","CiPK&jJuYp",[])), 
-?line <<"CiPKWjJuYp46]789">> = iolist_to_binary(re:replace("W46]789","^[W-\\]46]","CiPK&jJuYp",[global])), 
-?line <<"WWGQUxNBall">> = iolist_to_binary(re:replace("Wall","^[W-\\]46]","&&G\\1QUxN\\1\\1B",[])), 
-?line <<"WWGQUxNBall">> = iolist_to_binary(re:replace("Wall","^[W-\\]46]","&&G\\1QUxN\\1\\1B",[global])), 
-?line <<"BBmKOIEOebra">> = iolist_to_binary(re:replace("Zebra","^[W-\\]46]","BBmKOI\\1E\\1O",[])), 
-?line <<"BBmKOIEOebra">> = iolist_to_binary(re:replace("Zebra","^[W-\\]46]","BBmKOI\\1E\\1O",[global])), 
-?line <<"fsXBGOoQmDJroEwPIXEylophone">> = iolist_to_binary(re:replace("Xylophone","^[W-\\]46]","f\\1s&BGOoQmDJroEwPI&E",[])), 
-?line <<"fsXBGOoQmDJroEwPIXEylophone">> = iolist_to_binary(re:replace("Xylophone","^[W-\\]46]","f\\1s&BGOoQmDJroEwPI&E",[global])), 
-?line <<"rtkSPUv4c2">> = iolist_to_binary(re:replace("42","^[W-\\]46]","rtkSPUv&c",[])), 
-?line <<"rtkSPUv4c2">> = iolist_to_binary(re:replace("42","^[W-\\]46]","rtkSPUv&c",[global])), 
-?line <<"AqCR[dTqabcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-\\]46]","AqCR\\1&dTq",[])), 
-?line <<"AqCR[dTqabcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-\\]46]","AqCR\\1&dTq",[global])), 
-?line <<"XG]JRsPEtL]eoabcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-\\]46]","XG&JRsPEtL&e\\1o",[])), 
-?line <<"XG]JRsPEtL]eoabcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-\\]46]","XG&JRsPEtL&e\\1o",[global])), 
-?line <<"YrokgJhnnbackslash">> = iolist_to_binary(re:replace("\\backslash","^[W-\\]46]","YrokgJhnn\\1",[])), 
-?line <<"YrokgJhnnbackslash">> = iolist_to_binary(re:replace("\\backslash","^[W-\\]46]","YrokgJhnn\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-\\]46]","\\1l",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-\\]46]","\\1l",[global])), 
-?line <<"-46]789">> = iolist_to_binary(re:replace("-46]789","^[W-\\]46]","lUctT",[])), 
-?line <<"-46]789">> = iolist_to_binary(re:replace("-46]789","^[W-\\]46]","lUctT",[global])), 
-?line <<"well">> = iolist_to_binary(re:replace("well","^[W-\\]46]","xELX&QH\\1AsnFr&SH",[])), 
-?line <<"well">> = iolist_to_binary(re:replace("well","^[W-\\]46]","xELX&QH\\1AsnFr&SH",[global])), 
-?line <<"vword cat dog elephant mussel cow horse canary baboon snake shark otherwordword cat dog elephant mussel cow horse canary baboon snake shark otherwordKteyKVE">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword","v&&KteyKVE\\1",[])), 
-?line <<"vword cat dog elephant mussel cow horse canary baboon snake shark otherwordword cat dog elephant mussel cow horse canary baboon snake shark otherwordKteyKVE">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword","v&&KteyKVE\\1",[global])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword","wUEYJgw",[])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword","wUEYJgw",[global])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword","ABdTK\\1Y\\1",[])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword","ABdTK\\1Y\\1",[global])), 
-?line <<"CahYoKbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,0}","\\1CahYoK",[])), 
-?line <<"CahYoKbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,0}","\\1CahYoK",[global])), 
-?line <<"QcFabc">> = iolist_to_binary(re:replace("abc","^(a){0,0}","&QcF",[])), 
-?line <<"QcFabc">> = iolist_to_binary(re:replace("abc","^(a){0,0}","&QcF",[global])), 
-?line <<"BvdvcHaab">> = iolist_to_binary(re:replace("aab","^(a){0,0}","BvdvcH",[])), 
-?line <<"BvdvcHaab">> = iolist_to_binary(re:replace("aab","^(a){0,0}","BvdvcH",[global])), 
-?line <<"mtLIyIhdbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,1}","mtL\\1IyIhd",[])), 
-?line <<"mtLIyIhdbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,1}","mtL\\1IyIhd",[global])), 
-?line <<"oaDoeSPhHaNhncDqkiabc">> = iolist_to_binary(re:replace("abc","^(a){0,1}","o\\1DoeSPhH&NhncDqki\\1",[])), 
-?line <<"oaDoeSPhHaNhncDqkiabc">> = iolist_to_binary(re:replace("abc","^(a){0,1}","o\\1DoeSPhH&NhncDqki\\1",[global])), 
-?line <<"ahaXsxVhaFHSKPhapJQab">> = iolist_to_binary(re:replace("aab","^(a){0,1}","\\1h\\1XsxVh\\1FHSKPhapJQ",[])), 
-?line <<"ahaXsxVhaFHSKPhapJQab">> = iolist_to_binary(re:replace("aab","^(a){0,1}","\\1h\\1XsxVh\\1FHSKPhapJQ",[global])), 
-?line <<"iMdtvIhKruTIdObcd">> = iolist_to_binary(re:replace("bcd","^(a){0,2}","iMd\\1\\1\\1tvIhK&r\\1uTIdO",[])), 
-?line <<"iMdtvIhKruTIdObcd">> = iolist_to_binary(re:replace("bcd","^(a){0,2}","iMd\\1\\1\\1tvIhK&r\\1uTIdO",[global])), 
-?line <<"WYRQMjbc">> = iolist_to_binary(re:replace("abc","^(a){0,2}","WYRQMj",[])), 
-?line <<"WYRQMjbc">> = iolist_to_binary(re:replace("abc","^(a){0,2}","WYRQMj",[global])), 
-?line <<"XaKbiaaaEub">> = iolist_to_binary(re:replace("aab","^(a){0,2}","XaKbi\\1&Eu",[])), 
-?line <<"XaKbiaaaEub">> = iolist_to_binary(re:replace("aab","^(a){0,2}","XaKbi\\1&Eu",[global])), 
-?line <<"cFVbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,3}","&c&&FV&",[])), 
-?line <<"cFVbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,3}","&c&&FV&",[global])), 
-?line <<"gEwbc">> = iolist_to_binary(re:replace("abc","^(a){0,3}","gEw",[])), 
-?line <<"gEwbc">> = iolist_to_binary(re:replace("abc","^(a){0,3}","gEw",[global])), 
-?line <<"aaSuagMaaaaIaaKb">> = iolist_to_binary(re:replace("aab","^(a){0,3}","&Su\\1gM&&I&K",[])), 
-?line <<"aaSuagMaaaaIaaKb">> = iolist_to_binary(re:replace("aab","^(a){0,3}","&Su\\1gM&&I&K",[global])), 
-?line <<"GaaahIAJLaMaaaaaSBlaaaTU">> = iolist_to_binary(re:replace("aaa","^(a){0,3}","G&hIAJL\\1M\\1&aSBl&TU",[])), 
-?line <<"GaaahIAJLaMaaaaaSBlaaaTU">> = iolist_to_binary(re:replace("aaa","^(a){0,3}","G&hIAJL\\1M\\1&aSBl&TU",[global])), 
-?line <<"gcHyvqMebtbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,}","g&cHyvqMebt",[])), 
-?line <<"gcHyvqMebtbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,}","g&cHyvqMebt",[global])), 
-?line <<"atJaOxHRjOnDbc">> = iolist_to_binary(re:replace("abc","^(a){0,}","\\1tJaOxHRjOnD",[])), 
-?line <<"atJaOxHRjOnDbc">> = iolist_to_binary(re:replace("abc","^(a){0,}","\\1tJaOxHRjOnD",[global])), 
-?line <<"RlAewSMFrb">> = iolist_to_binary(re:replace("aab","^(a){0,}","RlAewSMFr",[])), 
-?line <<"RlAewSMFrb">> = iolist_to_binary(re:replace("aab","^(a){0,}","RlAewSMFr",[global])), 
-?line <<"FaaaBoIPaaaLaaaYfapavgA">> = iolist_to_binary(re:replace("aaa","^(a){0,}","F&BoIP&L&Yf\\1p\\1vgA",[])), 
-?line <<"FaaaBoIPaaaLaaaYfapavgA">> = iolist_to_binary(re:replace("aaa","^(a){0,}","F&BoIP&L&Yf\\1p\\1vgA",[global])), 
-?line <<"baaaaaaaacUvaaaaaaaaCgeDoaRaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){0,}","b&cUv&CgeDo\\1R&",[])), 
-?line <<"baaaaaaaacUvaaaaaaaaCgeDoaRaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){0,}","b&cUv&CgeDo\\1R&",[global])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,1}","F&vqwCbrndilc&Wb\\1LRH",[])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,1}","F&vqwCbrndilc&Wb\\1LRH",[global])), 
-?line <<"BaaYanfjPxbaabc">> = iolist_to_binary(re:replace("abc","^(a){1,1}","B\\1\\1Y\\1nfjPxb\\1&",[])), 
-?line <<"BaaYanfjPxbaabc">> = iolist_to_binary(re:replace("abc","^(a){1,1}","B\\1\\1Y\\1nfjPxb\\1&",[global])), 
-?line <<"Pab">> = iolist_to_binary(re:replace("aab","^(a){1,1}","P",[])), 
-?line <<"Pab">> = iolist_to_binary(re:replace("aab","^(a){1,1}","P",[global])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,2}","eK\\1B&ypECvCJqtlr&",[])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,2}","eK\\1B&ypECvCJqtlr&",[global])), 
-?line <<"QYbc">> = iolist_to_binary(re:replace("abc","^(a){1,2}","QY",[])), 
-?line <<"QYbc">> = iolist_to_binary(re:replace("abc","^(a){1,2}","QY",[global])), 
-?line <<"MbnVXaaaXhaab">> = iolist_to_binary(re:replace("aab","^(a){1,2}","MbnVX&\\1Xh&",[])), 
-?line <<"MbnVXaaaXhaab">> = iolist_to_binary(re:replace("aab","^(a){1,2}","MbnVX&\\1Xh&",[global])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,3}","UKOH",[])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,3}","UKOH",[global])), 
-?line <<"TJxKYHFmaaadWlbc">> = iolist_to_binary(re:replace("abc","^(a){1,3}","TJxKYHFm&&\\1dWl",[])), 
-?line <<"TJxKYHFmaaadWlbc">> = iolist_to_binary(re:replace("abc","^(a){1,3}","TJxKYHFm&&\\1dWl",[global])), 
-?line <<"ub">> = iolist_to_binary(re:replace("aab","^(a){1,3}","u",[])), 
-?line <<"ub">> = iolist_to_binary(re:replace("aab","^(a){1,3}","u",[global])), 
-?line <<"FOX">> = iolist_to_binary(re:replace("aaa","^(a){1,3}","FOX",[])), 
-?line <<"FOX">> = iolist_to_binary(re:replace("aaa","^(a){1,3}","FOX",[global])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,}","W\\1Urn\\1O",[])), 
-?line <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,}","W\\1Urn\\1O",[global])), 
-?line <<"awalKDgaLeMbc">> = iolist_to_binary(re:replace("abc","^(a){1,}","\\1w\\1lKDg&LeM",[])), 
-?line <<"awalKDgaLeMbc">> = iolist_to_binary(re:replace("abc","^(a){1,}","\\1w\\1lKDg&LeM",[global])), 
-?line <<"qHVYNjismoeaasSpb">> = iolist_to_binary(re:replace("aab","^(a){1,}","qHVYNjismoe&sSp",[])), 
-?line <<"qHVYNjismoeaasSpb">> = iolist_to_binary(re:replace("aab","^(a){1,}","qHVYNjismoe&sSp",[global])), 
-?line <<"laa">> = iolist_to_binary(re:replace("aaa","^(a){1,}","la\\1",[])), 
-?line <<"laa">> = iolist_to_binary(re:replace("aaa","^(a){1,}","la\\1",[global])), 
-?line <<"UJqaaaaaaaarcaaaaaaaaQHavwaGaaaaaaaaoX">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){1,}","UJq&rc&QH\\1vw\\1G&oX",[])), 
-?line <<"UJqaaaaaaaarcaaaaaaaaQHavwaGaaaaaaaaoX">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){1,}","UJq&rc&QH\\1vw\\1G&oX",[global])), 
-?line <<"borfle
-bib.gifs
+def","abc$","h&&nb\\1&NBSkhYb",[global])), 
+    <<"trlaTa">> = iolist_to_binary(re:replace("abcS","(abc)\\123","trlaTa",[])), 
+    <<"trlaTa">> = iolist_to_binary(re:replace("abcS","(abc)\\123","trlaTa",[global])), 
+    <<"Oabc“MWabcjRDvJhyeF">> = iolist_to_binary(re:replace("abc“","(abc)\\223","O&MW\\1jRDvJhyeF",[])), 
+    <<"Oabc“MWabcjRDvJhyeF">> = iolist_to_binary(re:replace("abc“","(abc)\\223","O&MW\\1jRDvJhyeF",[global])), 
+    <<"uLBUEpabcÓabcjn">> = iolist_to_binary(re:replace("abcÓ","(abc)\\323","uLBUEp&\\1jn",[])), 
+    <<"uLBUEpabcÓabcjn">> = iolist_to_binary(re:replace("abcÓ","(abc)\\323","uLBUEp&\\1jn",[global])), 
+    <<"Pi">> = iolist_to_binary(re:replace("abc@","(abc)\\100","Pi",[])), 
+    <<"Pi">> = iolist_to_binary(re:replace("abc@","(abc)\\100","Pi",[global])), 
+    <<"NLS">> = iolist_to_binary(re:replace("abc@","(abc)\\100","NLS",[])), 
+    <<"NLS">> = iolist_to_binary(re:replace("abc@","(abc)\\100","NLS",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","gshb&NCwCI&\\1&O\\1Y&OU",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","gshb&NCwCI&\\1&O\\1Y&OU",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","wfQfG",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","wfQfG",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","nlTLMMuUL\\1dek",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","nlTLMMuUL\\1dek",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","VP\\1&nVqym",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","VP\\1&nVqym",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","YmKMMo",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","YmKMMo",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","POFFExkEtjS",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1000","POFFExkEtjS",[global])), 
+    <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","FLXryNI\\1vKW\\1l",[])), 
+    <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","FLXryNI\\1vKW\\1l",[global])), 
+    <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","xwedFGU&&joLFV",[])), 
+    <<"abc81">> = iolist_to_binary(re:replace("abc81","abc\\81","xwedFGU&&joLFV",[global])), 
+    <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","QiTym",[])), 
+    <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","QiTym",[global])), 
+    <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","r",[])), 
+    <<"abc91">> = iolist_to_binary(re:replace("abc91","abc\\91","r",[global])), 
+    ok.
+run6() ->
+    <<"JavrrCGIJrabcdefghijkllSabcdefghijkllSRCgujabcdefghijkllSnS">> = iolist_to_binary(re:replace("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123","J\\1vrrCGIJr&&RCguj&nS",[])), 
+    <<"JavrrCGIJrabcdefghijkllSabcdefghijkllSRCgujabcdefghijkllSnS">> = iolist_to_binary(re:replace("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123","J\\1vrrCGIJr&&RCguj&nS",[global])), 
+    <<"Iabcdefghijk
+SoGoIaaBybRYC">> = iolist_to_binary(re:replace("abcdefghijk
+S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123","I&oGoI\\1\\1BybRYC",[])), 
+    <<"Iabcdefghijk
+SoGoIaaBybRYC">> = iolist_to_binary(re:replace("abcdefghijk
+S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123","I&oGoI\\1\\1BybRYC",[global])), 
+    <<"RGabidefuGO">> = iolist_to_binary(re:replace("abidef","ab\\idef","RG&u\\1G\\1O",[])), 
+    <<"RGabidefuGO">> = iolist_to_binary(re:replace("abidef","ab\\idef","RG&u\\1G\\1O",[global])), 
+    <<"khlnfNEs">> = iolist_to_binary(re:replace("bc","a{0}bc","khlnfNEs",[])), 
+    <<"khlnfNEs">> = iolist_to_binary(re:replace("bc","a{0}bc","khlnfNEs",[global])), 
+    <<"rqJj">> = iolist_to_binary(re:replace("xyz","(a|(bc)){0,0}?xyz","rqJj",[])), 
+    <<"rqJj">> = iolist_to_binary(re:replace("xyz","(a|(bc)){0,0}?xyz","rqJj",[global])), 
+    <<"lSP">> = iolist_to_binary(re:replace("abcde","abc[\\10]de","lSP",[])), 
+    <<"lSP">> = iolist_to_binary(re:replace("abcde","abc[\\10]de","lSP",[global])), 
+    <<"CKJxmayjvTnPabc
deFvA">> = iolist_to_binary(re:replace("abc
de","abc[\\1]de","CKJxmayjvTnP&FvA",[])), 
+    <<"CKJxmayjvTnPabc
deFvA">> = iolist_to_binary(re:replace("abc
de","abc[\\1]de","CKJxmayjvTnP&FvA",[global])), 
+    <<"WyBabc
deCxJkWabc
deipq">> = iolist_to_binary(re:replace("abc
de","(abc)[\\1]de","WyB&CxJkW&ipq",[])), 
+    <<"WyBabc
deCxJkWabc
deipq">> = iolist_to_binary(re:replace("abc
de","(abc)[\\1]de","WyB&CxJkW&ipq",[global])), 
+    <<"Ua
+bXVska
+bg">> = iolist_to_binary(re:replace("a
+b","(?s)a.b","U&XVsk&g",[])), 
+    <<"Ua
+bXVska
+bg">> = iolist_to_binary(re:replace("a
+b","(?s)a.b","U&XVsk&g",[global])), 
+    <<"WgjbaNOTcccckIbd">> = iolist_to_binary(re:replace("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","Wgj&kI\\1",[])), 
+    <<"WgjbaNOTcccckIbd">> = iolist_to_binary(re:replace("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","Wgj&kI\\1",[global])), 
+    <<"DoCtbaMWiqd">> = iolist_to_binary(re:replace("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","DoCt\\1aMWiq",[])), 
+    <<"DoCtbaMWiqd">> = iolist_to_binary(re:replace("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","DoCt\\1aMWiq",[global])), 
+    <<"thYPIiibbhwYvfLkd">> = iolist_to_binary(re:replace("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","thYPIii\\1bhwYvfLk",[])), 
+    <<"thYPIiibbhwYvfLkd">> = iolist_to_binary(re:replace("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","thYPIii\\1bhwYvfLk",[global])), 
+    <<"RibMcQxAKFpd">> = iolist_to_binary(re:replace("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","Ri\\1McQxAKFp",[])), 
+    <<"RibMcQxAKFpd">> = iolist_to_binary(re:replace("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","Ri\\1McQxAKFp",[global])), 
+    <<"vQUa">> = iolist_to_binary(re:replace("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})","vQUa",[])), 
+    <<"vQUa">> = iolist_to_binary(re:replace("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})","vQUa",[global])), 
+    <<"anything">> = iolist_to_binary(re:replace("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})","bR\\1Bb&yOfWxBSieYBnJ",[])), 
+    <<"anything">> = iolist_to_binary(re:replace("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})","bR\\1Bb&yOfWxBSieYBnJ",[global])), 
+    <<"bc">> = iolist_to_binary(re:replace("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})","W\\1i\\1DbDlQDP&rWwmD&",[])), 
+    <<"bc">> = iolist_to_binary(re:replace("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})","W\\1i\\1DbDlQDP&rWwmD&",[global])), 
+    <<"baccd">> = iolist_to_binary(re:replace("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","ICMQ\\1pRu",[])), 
+    <<"baccd">> = iolist_to_binary(re:replace("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})","ICMQ\\1pRu",[global])), 
+    <<"eUfAADRbc">> = iolist_to_binary(re:replace("Abc","[^a]","\\1\\1e\\1Uf&&\\1DR",[])), 
+    <<"eUfAADReUfbbDReUfccDR">> = iolist_to_binary(re:replace("Abc","[^a]","\\1\\1e\\1Uf&&\\1DR",[global])), 
+    <<"AbGc">> = iolist_to_binary(re:replace("Abc","[^a]","\\1&G\\1",[caseless])), 
+    <<"AbGcG">> = iolist_to_binary(re:replace("Abc","[^a]","\\1&G\\1",[caseless,
+                                                                                                                                                                          global])), 
+    <<"AAAGAAAIXPHIaAbc">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","&G&I\\1XPHI\\1",[])), 
+    <<"AAAGAAAIXPHIaAbcGAbcIXPHI">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","&G&I\\1XPHI\\1",[global])), 
+    <<"AAAaAIxSfS">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","IxSf\\1S",[caseless])), 
+    <<"AAAaAIxSfS">> = iolist_to_binary(re:replace("AAAaAbc","[^a]+","IxSf\\1S",[caseless,
+                                                                                                                                                                                  global])), 
+    <<"AfTCbbb
+cccEbbb
+cccfDUfwWtHuS">> = iolist_to_binary(re:replace("bbb
+ccc","[^a]+","AfTC&E&fDUfwWtH\\1uS",[])), 
+    <<"AfTCbbb
+cccEbbb
+cccfDUfwWtHuS">> = iolist_to_binary(re:replace("bbb
+ccc","[^a]+","AfTC&E&fDUfwWtH\\1uS",[global])), 
+    <<"abUUudTcI">> = iolist_to_binary(re:replace("abc","[^k]$","UUud\\1TcI",[])), 
+    <<"abUUudTcI">> = iolist_to_binary(re:replace("abc","[^k]$","UUud\\1TcI",[global])), 
+    <<"*** FailerAiOYV">> = iolist_to_binary(re:replace("*** Failers","[^k]$","AiOYV",[])), 
+    <<"*** FailerAiOYV">> = iolist_to_binary(re:replace("*** Failers","[^k]$","AiOYV",[global])), 
+    <<"abk">> = iolist_to_binary(re:replace("abk","[^k]$","UV&w&TjG&\\1O\\1m",[])), 
+    <<"abk">> = iolist_to_binary(re:replace("abk","[^k]$","UV&w&TjG&\\1O\\1m",[global])), 
+    <<"cabcH">> = iolist_to_binary(re:replace("abc","[^k]{2,3}$","\\1c&\\1H",[])), 
+    <<"cabcH">> = iolist_to_binary(re:replace("abc","[^k]{2,3}$","\\1c&\\1H",[global])), 
+    <<"kUyCfbcubJVf">> = iolist_to_binary(re:replace("kbc","[^k]{2,3}$","UyCf&\\1\\1ub\\1JVf",[])), 
+    <<"kUyCfbcubJVf">> = iolist_to_binary(re:replace("kbc","[^k]{2,3}$","UyCf&\\1\\1ub\\1JVf",[global])), 
+    <<"kgiGjY">> = iolist_to_binary(re:replace("kabc","[^k]{2,3}$","giGj\\1\\1\\1Y",[])), 
+    <<"kgiGjY">> = iolist_to_binary(re:replace("kabc","[^k]{2,3}$","giGj\\1\\1\\1Y",[global])), 
+    <<"*** FailWjNDersauWgsT">> = iolist_to_binary(re:replace("*** Failers","[^k]{2,3}$","WjND&auWgsT",[])), 
+    <<"*** FailWjNDersauWgsT">> = iolist_to_binary(re:replace("*** Failers","[^k]{2,3}$","WjND&auWgsT",[global])), 
+    <<"abk">> = iolist_to_binary(re:replace("abk","[^k]{2,3}$","Gu\\1",[])), 
+    <<"abk">> = iolist_to_binary(re:replace("abk","[^k]{2,3}$","Gu\\1",[global])), 
+    <<"akb">> = iolist_to_binary(re:replace("akb","[^k]{2,3}$","a&Wrx\\1hniTRTJRP\\1",[])), 
+    <<"akb">> = iolist_to_binary(re:replace("akb","[^k]{2,3}$","a&Wrx\\1hniTRTJRP\\1",[global])), 
+    <<"akk">> = iolist_to_binary(re:replace("akk","[^k]{2,3}$","AkLa&fhMYWpv",[])), 
+    <<"akk">> = iolist_to_binary(re:replace("akk","[^k]{2,3}$","AkLa&fhMYWpv",[global])), 
+    <<"12345678.b.c.d">> = iolist_to_binary(re:replace("12345678.b.c.d","^\\d{8,}\\@.+[^k]$","HDxYDn",[])), 
+    <<"12345678.b.c.d">> = iolist_to_binary(re:replace("12345678.b.c.d","^\\d{8,}\\@.+[^k]$","HDxYDn",[global])), 
+    <<"123456789.y.z">> = iolist_to_binary(re:replace("123456789.y.z","^\\d{8,}\\@.+[^k]$","VU\\1D",[])), 
+    <<"123456789.y.z">> = iolist_to_binary(re:replace("123456789.y.z","^\\d{8,}\\@.+[^k]$","VU\\1D",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8,}\\@.+[^k]$","GeBqm\\1Dmbs&G\\1vR",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\d{8,}\\@.+[^k]$","GeBqm\\1Dmbs&G\\1vR",[global])), 
+    <<"12345678.y.uk">> = iolist_to_binary(re:replace("12345678.y.uk","^\\d{8,}\\@.+[^k]$","a&VS\\1&BvR",[])), 
+    <<"12345678.y.uk">> = iolist_to_binary(re:replace("12345678.y.uk","^\\d{8,}\\@.+[^k]$","a&VS\\1&BvR",[global])), 
+    <<"1234567.b.c.d">> = iolist_to_binary(re:replace("1234567.b.c.d","^\\d{8,}\\@.+[^k]$","A&Ex&\\1\\1M\\1",[])), 
+    <<"1234567.b.c.d">> = iolist_to_binary(re:replace("1234567.b.c.d","^\\d{8,}\\@.+[^k]$","A&Ex&\\1\\1M\\1",[global])), 
+    <<"UNaaaaaaaaaASae">> = iolist_to_binary(re:replace("aaaaaaaaa","(a)\\1{8,}","UN&AS\\1e",[])), 
+    <<"UNaaaaaaaaaASae">> = iolist_to_binary(re:replace("aaaaaaaaa","(a)\\1{8,}","UN&AS\\1e",[global])), 
+    <<"tceAbivVhQav">> = iolist_to_binary(re:replace("aaaaaaaaaa","(a)\\1{8,}","tceAbivVhQ\\1v",[])), 
+    <<"tceAbivVhQav">> = iolist_to_binary(re:replace("aaaaaaaaaa","(a)\\1{8,}","tceAbivVhQ\\1v",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a)\\1{8,}","&\\1CR\\1G\\1lXwnVv",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a)\\1{8,}","&\\1CR\\1G\\1lXwnVv",[global])), 
+    <<"aaaaaaa">> = iolist_to_binary(re:replace("aaaaaaa","(a)\\1{8,}","\\1okyxc\\1yX\\1vEJ&&",[])), 
+    <<"aaaaaaa">> = iolist_to_binary(re:replace("aaaaaaa","(a)\\1{8,}","\\1okyxc\\1yX\\1vEJ&&",[global])), 
+    <<"aaaaXxrcd">> = iolist_to_binary(re:replace("aaaabcd","[^a]","Xxr",[])), 
+    <<"aaaaXxrXxrXxr">> = iolist_to_binary(re:replace("aaaabcd","[^a]","Xxr",[global])), 
+    <<"aaarLbBCUOMivTWabcd">> = iolist_to_binary(re:replace("aaAabcd","[^a]","arLbBC\\1UOMivTW",[])), 
+    <<"aaarLbBCUOMivTWaarLbBCUOMivTWarLbBCUOMivTWarLbBCUOMivTW">> = iolist_to_binary(re:replace("aaAabcd","[^a]","arLbBC\\1UOMivTW",[global])), 
+    ok.
+run7() ->
+    <<"aaaapwMAbnNcRDBcd">> = iolist_to_binary(re:replace("aaaabcd","[^a]","pwMA&\\1n\\1NcRDB",[caseless])), 
+    <<"aaaapwMAbnNcRDBpwMAcnNcRDBpwMAdnNcRDB">> = iolist_to_binary(re:replace("aaaabcd","[^a]","pwMA&\\1n\\1NcRDB",[caseless,
+                                                                                                                                                                                                    global])), 
+    <<"aaAaUjWwoTQoHtojaVMGDcd">> = iolist_to_binary(re:replace("aaAabcd","[^a]","UjWwoTQoHtoja\\1\\1VMGD\\1",[caseless])), 
+    <<"aaAaUjWwoTQoHtojaVMGDUjWwoTQoHtojaVMGDUjWwoTQoHtojaVMGD">> = iolist_to_binary(re:replace("aaAabcd","[^a]","UjWwoTQoHtoja\\1\\1VMGD\\1",[caseless,
+                                                                                                                                                                                                                      global])), 
+    <<"aaaapmJHbuyrGSgPWcd">> = iolist_to_binary(re:replace("aaaabcd","[^az]","pmJH&uyr\\1GSgPW",[])), 
+    <<"aaaapmJHbuyrGSgPWpmJHcuyrGSgPWpmJHduyrGSgPW">> = iolist_to_binary(re:replace("aaaabcd","[^az]","pmJH&uyr\\1GSgPW",[global])), 
+    <<"aaYcjbFRuBabcd">> = iolist_to_binary(re:replace("aaAabcd","[^az]","Y\\1cjbFRu\\1B",[])), 
+    <<"aaYcjbFRuBaYcjbFRuBYcjbFRuBYcjbFRuB">> = iolist_to_binary(re:replace("aaAabcd","[^az]","Y\\1cjbFRu\\1B",[global])), 
+    <<"aaaaBbjBVQSSpboacd">> = iolist_to_binary(re:replace("aaaabcd","[^az]","\\1B&jB\\1VQSSp&\\1\\1o\\1a",[caseless])), 
+    <<"aaaaBbjBVQSSpboaBcjBVQSSpcoaBdjBVQSSpdoa">> = iolist_to_binary(re:replace("aaaabcd","[^az]","\\1B&jB\\1VQSSp&\\1\\1o\\1a",[caseless,
+                                                                                                                                                                                                                              global])), 
+    <<"aaAaibNcd">> = iolist_to_binary(re:replace("aaAabcd","[^az]","i&N",[caseless])), 
+    <<"aaAaibNicNidN">> = iolist_to_binary(re:replace("aaAabcd","[^az]","i&N",[caseless,
+                                                                                                                                                                        global])), 
+    <<"xxxxxxxxxxxyxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL","y",[])), 
+    <<"xxxxxxxxxxxyxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL","y",[global])), 
+    <<"xxxxxxxxxxxPSTAIREISLLQxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL","&Q",[])), 
+    <<"xxxxxxxxxxxPSTAIREISLLQxxxxxxxxx">> = iolist_to_binary(re:replace("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL","&Q",[global])), 
+    <<"1uJmu.23V.23UHIOGab">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d[1-9]?)\\d+","uJmu\\1V\\1UHIOGab",[])), 
+    <<"1uJmu.23V.23UHIOGab">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d[1-9]?)\\d+","uJmu\\1V\\1UHIOGab",[global])), 
+    <<"1DI.875.875000282NK.875000282.875j">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d[1-9]?)\\d+","DI\\1&NK&\\1j",[])), 
+    <<"1DI.875.875000282NK.875000282.875j">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d[1-9]?)\\d+","DI\\1&NK&\\1j",[global])), 
+    <<"1L.235.23HWQNY.23KfHhq.235.23ggY">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d[1-9]?)\\d+","L&\\1HWQNY\\1KfHhq&\\1ggY",[])), 
+    <<"1L.235.23HWQNY.23KfHhq.235.23ggY">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d[1-9]?)\\d+","L&\\1HWQNY\\1KfHhq&\\1ggY",[global])), 
+    <<"1DSE0003938">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))","DSE",[])), 
+    <<"1DSE0003938">> = iolist_to_binary(re:replace("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))","DSE",[global])), 
+    <<"1LaUySoWUFF.875.875.875000282">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))","LaUySoWUFF&&\\1",[])), 
+    <<"1LaUySoWUFF.875.875.875000282">> = iolist_to_binary(re:replace("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))","LaUySoWUFF&&\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))","tRWNXmOIDc\\1&GGpOuk",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))","tRWNXmOIDc\\1&GGpOuk",[global])), 
+    <<"1.235">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))","lYmo&PAOYv",[])), 
+    <<"1.235">> = iolist_to_binary(re:replace("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))","lYmo&PAOYv",[global])), 
+    <<"reSOwDabTAGPdSa">> = iolist_to_binary(re:replace("ab","a(?)b","reSOwD\\1&TAGPdSa",[])), 
+    <<"reSOwDabTAGPdSa">> = iolist_to_binary(re:replace("ab","a(?)b","reSOwD\\1&TAGPdSa",[global])), 
+    <<"Food is on the OvbQHtTuN">> = iolist_to_binary(re:replace("Food is on the foo table","\\b(foo)\\s+(\\w+)","OvbQHtTuN",[caseless])), 
+    <<"Food is on the OvbQHtTuN">> = iolist_to_binary(re:replace("Food is on the foo table","\\b(foo)\\s+(\\w+)","OvbQHtTuN",[caseless,
+                                                                                                                                                                                                                                                  global])), 
+    <<"The jd is under the bar in the d is under the bar in the food is under the bar in the barRfood is under the bar in the barfood is under the bar in the barjESIDd is under the bar in the GWBDn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*)bar","j\\1\\1&R&&jESID\\1GWBD",[])), 
+    <<"The jd is under the bar in the d is under the bar in the food is under the bar in the barRfood is under the bar in the barfood is under the bar in the barjESIDd is under the bar in the GWBDn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*)bar","j\\1\\1&R&&jESID\\1GWBD",[global])), 
+    <<"The Mtfood is under the bard is under the sCjcC in the barn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*?)bar","Mt&\\1sCjcC",[])), 
+    <<"The Mtfood is under the bard is under the sCjcC in the barn.">> = iolist_to_binary(re:replace("The food is under the bar in the barn.","foo(.*?)bar","Mt&\\1sCjcC",[global])), 
+    <<"II have 2 numbers: 53147sQEJI have 2 numbers: 53147I have 2 numbers: 53147QI have 2 numbers: 53147I have 2 numbers: 53147Y">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d*)","I&sQEJ\\1\\1Q\\1\\1Y",[])), 
+    <<"II have 2 numbers: 53147sQEJI have 2 numbers: 53147I have 2 numbers: 53147QI have 2 numbers: 53147I have 2 numbers: 53147YIsQEJQY">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d*)","I&sQEJ\\1\\1Q\\1\\1Y",[global])), 
+    <<"BjeLtTBnKKfmuI have 2 numbers: 53147Q">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)","BjeLtTBnKKfmu&Q",[])), 
+    <<"BjeLtTBnKKfmuI have 2 numbers: 53147Q">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)","BjeLtTBnKKfmu&Q",[global])), 
+    <<"XjUoIVWVCosccRPCI have 2 numbers: 53147">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d*)","XjUoIVW\\1VCosccRPC&&",[])), 
+    <<"XjUoIVWVCosccRPCXjUoIVWIVCosccRPCIIXjUoIVWVCosccRPCXjUoIVW VCosccRPC  XjUoIVWVCosccRPCXjUoIVWhVCosccRPChhXjUoIVWVCosccRPCXjUoIVWaVCosccRPCaaXjUoIVWVCosccRPCXjUoIVWvVCosccRPCvvXjUoIVWVCosccRPCXjUoIVWeVCosccRPCeeXjUoIVWVCosccRPCXjUoIVW VCosccRPC 2 2XjUoIVWVCosccRPCXjUoIVW VCosccRPC  XjUoIVWVCosccRPCXjUoIVWnVCosccRPCnnXjUoIVWVCosccRPCXjUoIVWuVCosccRPCuuXjUoIVWVCosccRPCXjUoIVWmVCosccRPCmmXjUoIVWVCosccRPCXjUoIVWbVCosccRPCbbXjUoIVWVCosccRPCXjUoIVWeVCosccRPCeeXjUoIVWVCosccRPCXjUoIVWrVCosccRPCrrXjUoIVWVCosccRPCXjUoIVWsVCosccRPCssXjUoIVWVCosccRPCXjUoIVW:VCosccRPC::XjUoIVWVCosccRPCXjUoIVW VCosccRPC 53147 53147XjUoIVWVCosccRPC">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d*)","XjUoIVW\\1VCosccRPC&&",[global])), 
+    <<"LnetbRUI have woRN numbers: 53147">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)","LnetbRU\\1woRN",[])), 
+    <<"LnetbRUI have woRNLnetbRU numbers: woRN">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)","LnetbRU\\1woRN",[global])), 
+    <<"dD">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)$","dD",[])), 
+    <<"dD">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)(\\d+)$","dD",[global])), 
+    <<"I have 2 numbers: vpu">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)$","\\1vpu",[])), 
+    <<"I have 2 numbers: vpu">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*?)(\\d+)$","\\1vpu",[global])), 
+    <<"rEcQnOiThojYmI have 2 numbers: ysnN">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)\\b(\\d+)$","rEcQnOiThojYm\\1ysnN",[])), 
+    <<"rEcQnOiThojYmI have 2 numbers: ysnN">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*)\\b(\\d+)$","rEcQnOiThojYm\\1ysnN",[global])), 
+    <<"DI have 2 numbers: 53147WrwmlgEQLiI have 2 numbers: 53147NE">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*\\D)(\\d+)$","D&WrwmlgEQLi&NE",[])), 
+    <<"DI have 2 numbers: 53147WrwmlgEQLiI have 2 numbers: 53147NE">> = iolist_to_binary(re:replace("I have 2 numbers: 53147","(.*\\D)(\\d+)$","D&WrwmlgEQLi&NE",[global])), 
+    ok.
+run8() ->
+    <<"ABcsqUeQdAAByYxNC123">> = iolist_to_binary(re:replace("ABC123","^\\D*(?!123)","&csq\\1UeQdA&yYxN",[])), 
+    <<"ABcsqUeQdAAByYxNC123">> = iolist_to_binary(re:replace("ABC123","^\\D*(?!123)","&csq\\1UeQdA&yYxN",[global])), 
+    <<"KABCABCBP445">> = iolist_to_binary(re:replace("ABC445","^(\\D*)(?=\\d)(?!123)","K\\1&BP",[])), 
+    <<"KABCABCBP445">> = iolist_to_binary(re:replace("ABC445","^(\\D*)(?=\\d)(?!123)","K\\1&BP",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","kBiY&gp\\1BUO\\1l",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\D*)(?=\\d)(?!123)","kBiY&gp\\1BUO\\1l",[global])), 
+    <<"ABC123">> = iolist_to_binary(re:replace("ABC123","^(\\D*)(?=\\d)(?!123)","\\1YYe",[])), 
+    <<"ABC123">> = iolist_to_binary(re:replace("ABC123","^(\\D*)(?=\\d)(?!123)","\\1YYe",[global])), 
+    <<"W46]pbAIEqJRW46]W46]cNuYW46]789">> = iolist_to_binary(re:replace("W46]789","^[W-]46]","&pbAIEqJ\\1R&&cNuY&",[])), 
+    <<"W46]pbAIEqJRW46]W46]cNuYW46]789">> = iolist_to_binary(re:replace("W46]789","^[W-]46]","&pbAIEqJ\\1R&&cNuY&",[global])), 
+    <<"AXCFhT-46]LP-46]gILH-46]rA789">> = iolist_to_binary(re:replace("-46]789","^[W-]46]","AXCFhT&LP&gIL\\1H&rA",[])), 
+    <<"AXCFhT-46]LP-46]gILH-46]rA789">> = iolist_to_binary(re:replace("-46]789","^[W-]46]","AXCFhT&LP&gIL\\1H&rA",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-]46]","ke&s",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-]46]","ke&s",[global])), 
+    <<"Wall">> = iolist_to_binary(re:replace("Wall","^[W-]46]","\\1C\\1VS&grCoMvM\\1",[])), 
+    <<"Wall">> = iolist_to_binary(re:replace("Wall","^[W-]46]","\\1C\\1VS&grCoMvM\\1",[global])), 
+    <<"Zebra">> = iolist_to_binary(re:replace("Zebra","^[W-]46]","G\\1\\1",[])), 
+    <<"Zebra">> = iolist_to_binary(re:replace("Zebra","^[W-]46]","G\\1\\1",[global])), 
+    <<"42">> = iolist_to_binary(re:replace("42","^[W-]46]","k\\1p&\\1&E&OlmU",[])), 
+    <<"42">> = iolist_to_binary(re:replace("42","^[W-]46]","k\\1p&\\1&E&OlmU",[global])), 
+    <<"[abcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-]46]","BHuM&QWt&V&Fw&R\\1",[])), 
+    <<"[abcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-]46]","BHuM&QWt&V&Fw&R\\1",[global])), 
+    <<"]abcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-]46]","bm\\1kBng&&HJv",[])), 
+    <<"]abcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-]46]","bm\\1kBng&&HJv",[global])), 
+    <<"YiVQVvgWY46]789">> = iolist_to_binary(re:replace("W46]789","^[W-\\]46]","Yi\\1VQVv\\1g&Y",[])), 
+    <<"YiVQVvgWY46]789">> = iolist_to_binary(re:replace("W46]789","^[W-\\]46]","Yi\\1VQVv\\1g&Y",[global])), 
+    <<"KJall">> = iolist_to_binary(re:replace("Wall","^[W-\\]46]","K\\1J",[])), 
+    <<"KJall">> = iolist_to_binary(re:replace("Wall","^[W-\\]46]","K\\1J",[global])), 
+    <<"ghebra">> = iolist_to_binary(re:replace("Zebra","^[W-\\]46]","gh",[])), 
+    <<"ghebra">> = iolist_to_binary(re:replace("Zebra","^[W-\\]46]","gh",[global])), 
+    <<"TQpylophone">> = iolist_to_binary(re:replace("Xylophone","^[W-\\]46]","TQp\\1",[])), 
+    <<"TQpylophone">> = iolist_to_binary(re:replace("Xylophone","^[W-\\]46]","TQp\\1",[global])), 
+    <<"4yTdgOXvDDmWf2">> = iolist_to_binary(re:replace("42","^[W-\\]46]","&y\\1TdgOXvDDm\\1Wf",[])), 
+    <<"4yTdgOXvDDmWf2">> = iolist_to_binary(re:replace("42","^[W-\\]46]","&y\\1TdgOXvDDm\\1Wf",[global])), 
+    <<"[OVexyXabcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-\\]46]","&OVexyX",[])), 
+    <<"[OVexyXabcd]">> = iolist_to_binary(re:replace("[abcd]","^[W-\\]46]","&OVexyX",[global])), 
+    <<"HparACpuFCvG]abcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-\\]46]","HparACp\\1uFCvG&",[])), 
+    <<"HparACpuFCvG]abcd[">> = iolist_to_binary(re:replace("]abcd[","^[W-\\]46]","HparACp\\1uFCvG&",[global])), 
+    <<"HQnantyI\\wNbackslash">> = iolist_to_binary(re:replace("\\backslash","^[W-\\]46]","HQnantyI&wN",[])), 
+    <<"HQnantyI\\wNbackslash">> = iolist_to_binary(re:replace("\\backslash","^[W-\\]46]","HQnantyI&wN",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-\\]46]","AMd&J\\1SokjY\\1\\1nK",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[W-\\]46]","AMd&J\\1SokjY\\1\\1nK",[global])), 
+    <<"-46]789">> = iolist_to_binary(re:replace("-46]789","^[W-\\]46]","RyY&cCj",[])), 
+    <<"-46]789">> = iolist_to_binary(re:replace("-46]789","^[W-\\]46]","RyY&cCj",[global])), 
+    <<"well">> = iolist_to_binary(re:replace("well","^[W-\\]46]","XPRm\\1VTejwB",[])), 
+    <<"well">> = iolist_to_binary(re:replace("well","^[W-\\]46]","XPRm\\1VTejwB",[global])), 
+    <<"oroGlaQAqnbI">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword","oroGlaQAqnbI",[])), 
+    <<"oroGlaQAqnbI">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword","oroGlaQAqnbI",[global])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword","&E\\1",[])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword","&E\\1",[global])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword","b\\1sLq\\1\\1P",[])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword","b\\1sLq\\1\\1P",[global])), 
+    <<"fPbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,0}","fP",[])), 
+    <<"fPbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,0}","fP",[global])), 
+    <<"jFVHnjWvnETRabc">> = iolist_to_binary(re:replace("abc","^(a){0,0}","jFVHn&j&WvnETR",[])), 
+    <<"jFVHnjWvnETRabc">> = iolist_to_binary(re:replace("abc","^(a){0,0}","jFVHn&j&WvnETR",[global])), 
+    <<"NDaab">> = iolist_to_binary(re:replace("aab","^(a){0,0}","ND",[])), 
+    <<"NDaab">> = iolist_to_binary(re:replace("aab","^(a){0,0}","ND",[global])), 
+    <<"RNIIKIcNvfeSEvtOPRObcd">> = iolist_to_binary(re:replace("bcd","^(a){0,1}","RNIIKIcNvfeSEvtO\\1PRO",[])), 
+    <<"RNIIKIcNvfeSEvtOPRObcd">> = iolist_to_binary(re:replace("bcd","^(a){0,1}","RNIIKIcNvfeSEvtO\\1PRO",[global])), 
+    <<"dDaaaaCaSvbc">> = iolist_to_binary(re:replace("abc","^(a){0,1}","dD&&&&C&Sv",[])), 
+    <<"dDaaaaCaSvbc">> = iolist_to_binary(re:replace("abc","^(a){0,1}","dD&&&&C&Sv",[global])), 
+    <<"cBbGtgJQnrojHMab">> = iolist_to_binary(re:replace("aab","^(a){0,1}","cBbGtgJQnrojHM",[])), 
+    <<"cBbGtgJQnrojHMab">> = iolist_to_binary(re:replace("aab","^(a){0,1}","cBbGtgJQnrojHM",[global])), 
+    <<"Mhbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,2}","\\1&M\\1h",[])), 
+    <<"Mhbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,2}","\\1&M\\1h",[global])), 
+    <<"aauJmduMieraXgHfaobc">> = iolist_to_binary(re:replace("abc","^(a){0,2}","&&uJmduMier\\1XgHf&o",[])), 
+    <<"aauJmduMieraXgHfaobc">> = iolist_to_binary(re:replace("abc","^(a){0,2}","&&uJmduMier\\1XgHf&o",[global])), 
+    <<"aaunb">> = iolist_to_binary(re:replace("aab","^(a){0,2}","&un",[])), 
+    <<"aaunb">> = iolist_to_binary(re:replace("aab","^(a){0,2}","&un",[global])), 
+    <<"osculgsNbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,3}","osculg&s&N&",[])), 
+    <<"osculgsNbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,3}","osculg&s&N&",[global])), 
+    <<"gerhgaeJRbnhIdabc">> = iolist_to_binary(re:replace("abc","^(a){0,3}","gerhg&eJRbnhId&",[])), 
+    <<"gerhgaeJRbnhIdabc">> = iolist_to_binary(re:replace("abc","^(a){0,3}","gerhg&eJRbnhId&",[global])), 
+    <<"emmqaaaesYb">> = iolist_to_binary(re:replace("aab","^(a){0,3}","emmq&\\1esY",[])), 
+    <<"emmqaaaesYb">> = iolist_to_binary(re:replace("aab","^(a){0,3}","emmq&\\1esY",[global])), 
+    <<"Rfafau">> = iolist_to_binary(re:replace("aaa","^(a){0,3}","Rf\\1f\\1u",[])), 
+    <<"Rfafau">> = iolist_to_binary(re:replace("aaa","^(a){0,3}","Rf\\1f\\1u",[global])), 
+    <<"Bbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,}","B",[])), 
+    <<"Bbcd">> = iolist_to_binary(re:replace("bcd","^(a){0,}","B",[global])), 
+    <<"aOlCbc">> = iolist_to_binary(re:replace("abc","^(a){0,}","\\1OlC",[])), 
+    <<"aOlCbc">> = iolist_to_binary(re:replace("abc","^(a){0,}","\\1OlC",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("aab","^(a){0,}","\\1",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("aab","^(a){0,}","\\1",[global])), 
+    <<"ECTqSuTCy">> = iolist_to_binary(re:replace("aaa","^(a){0,}","ECTqSuTCy",[])), 
+    <<"ECTqSuTCy">> = iolist_to_binary(re:replace("aaa","^(a){0,}","ECTqSuTCy",[global])), 
+    <<"WQhDeFb">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){0,}","WQhDeFb",[])), 
+    <<"WQhDeFb">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){0,}","WQhDeFb",[global])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,1}","k&&&pAWV&FHAQeCpc",[])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,1}","k&&&pAWV&FHAQeCpc",[global])), 
+    <<"rorUbgMQXaSaYGambc">> = iolist_to_binary(re:replace("abc","^(a){1,1}","rorUbgMQX&S\\1YG\\1m",[])), 
+    <<"rorUbgMQXaSaYGambc">> = iolist_to_binary(re:replace("abc","^(a){1,1}","rorUbgMQX&S\\1YG\\1m",[global])), 
+    <<"aNaaab">> = iolist_to_binary(re:replace("aab","^(a){1,1}","aN&\\1",[])), 
+    <<"aNaaab">> = iolist_to_binary(re:replace("aab","^(a){1,1}","aN&\\1",[global])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,2}","j\\1w\\1UDgbH",[])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,2}","j\\1w\\1UDgbH",[global])), 
+    <<"kNacaAaaHgaaWTaWaubc">> = iolist_to_binary(re:replace("abc","^(a){1,2}","kN\\1c\\1Aa&Hg\\1&WT&W&u",[])), 
+    <<"kNacaAaaHgaaWTaWaubc">> = iolist_to_binary(re:replace("abc","^(a){1,2}","kN\\1c\\1Aa&Hg\\1&WT&W&u",[global])), 
+    <<"AjaaammeJIb">> = iolist_to_binary(re:replace("aab","^(a){1,2}","Aj&\\1mmeJI",[])), 
+    <<"AjaaammeJIb">> = iolist_to_binary(re:replace("aab","^(a){1,2}","Aj&\\1mmeJI",[global])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,3}","&&TTjl\\1nt",[])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,3}","&&TTjl\\1nt",[global])), 
+    <<"UeMuRbc">> = iolist_to_binary(re:replace("abc","^(a){1,3}","UeMuR",[])), 
+    <<"UeMuRbc">> = iolist_to_binary(re:replace("abc","^(a){1,3}","UeMuR",[global])), 
+    <<"vFaaaSDjb">> = iolist_to_binary(re:replace("aab","^(a){1,3}","vF\\1&SDj",[])), 
+    <<"vFaaaSDjb">> = iolist_to_binary(re:replace("aab","^(a){1,3}","vF\\1&SDj",[global])), 
+    <<"CNwXaaa">> = iolist_to_binary(re:replace("aaa","^(a){1,3}","CNwX&",[])), 
+    <<"CNwXaaa">> = iolist_to_binary(re:replace("aaa","^(a){1,3}","CNwX&",[global])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,}","E\\1eK",[])), 
+    <<"bcd">> = iolist_to_binary(re:replace("bcd","^(a){1,}","E\\1eK",[global])), 
+    <<"IWaNYMwyOaJnfoPPMbc">> = iolist_to_binary(re:replace("abc","^(a){1,}","IW&NYMwyO\\1JnfoPPM",[])), 
+    <<"IWaNYMwyOaJnfoPPMbc">> = iolist_to_binary(re:replace("abc","^(a){1,}","IW&NYMwyO\\1JnfoPPM",[global])), 
+    <<"SaaafHrCab">> = iolist_to_binary(re:replace("aab","^(a){1,}","S&\\1fHrCa",[])), 
+    <<"SaaafHrCab">> = iolist_to_binary(re:replace("aab","^(a){1,}","S&\\1fHrCa",[global])), 
+    <<"MaYaaaRaAXUO">> = iolist_to_binary(re:replace("aaa","^(a){1,}","M\\1Y&R\\1AXUO",[])), 
+    <<"MaYaaaRaAXUO">> = iolist_to_binary(re:replace("aaa","^(a){1,}","M\\1Y&R\\1AXUO",[global])), 
+    <<"BsHaS">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){1,}","BsH\\1S",[])), 
+    <<"BsHaS">> = iolist_to_binary(re:replace("aaaaaaaa","^(a){1,}","BsH\\1S",[global])), 
+    <<"borfle
+nJEnJAvwAybib.gifXvq
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","&s",[])), 
-?line <<"borfle
-bib.gifs
+no",".*\\.gif","nJEnJAvwAy&Xvq\\1",[])), 
+    <<"borfle
+nJEnJAvwAybib.gifXvq
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","&s",[global])), 
-?line <<"borfle
-BD
+no",".*\\.gif","nJEnJAvwAy&Xvq\\1",[global])), 
+    <<"borfle
+Nmmq
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".{0,}\\.gif","BD",[])), 
-?line <<"borfle
-BD
+no",".{0,}\\.gif","Nmmq",[])), 
+    <<"borfle
+Nmmq
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".{0,}\\.gif","BD",[global])), 
-?line <<"borfle
-vDNsbib.gif
+no",".{0,}\\.gif","Nmmq",[global])), 
+    <<"borfle
+BVKBwIDwbib.gifjgEqWxbib.gifEW
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","vDNs&",[multiline])), 
-?line <<"borfle
-vDNsbib.gif
+no",".*\\.gif","BVKBwIDw&jgEqW\\1x&EW",[multiline])), 
+    <<"borfle
+BVKBwIDwbib.gifjgEqWxbib.gifEW
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","vDNs&",[multiline,global])), 
-?line <<"dPgeQVbGVD
+no",".*\\.gif","BVKBwIDw&jgEqW\\1x&EW",[multiline,global])), 
+    <<"borfle
+bib.giffF
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","dPge\\1QVbGVD",[dotall])), 
-?line <<"dPgeQVbGVD
+no",".*\\.gif","&fF",[dotall])), 
+    <<"borfle
+bib.giffF
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","dPge\\1QVbGVD",[dotall,global])), 
-?line <<"SGyevborfle
-bib.gifCborfle
-bib.gifWUWborfle
-bib.gifHd
+no",".*\\.gif","&fF",[dotall,global])), 
+    ok.
+run9() ->
+    <<"ARdLYmTSnXAA
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","SGyev&C\\1&\\1\\1WUW&Hd\\1",[multiline,dotall])), 
-?line <<"SGyevborfle
-bib.gifCborfle
-bib.gifWUWborfle
-bib.gifHd
+no",".*\\.gif","AR\\1dLYmTSnXAA",[multiline,dotall])), 
+    <<"ARdLYmTSnXAA
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*\\.gif","SGyev&C\\1&\\1\\1WUW&Hd\\1",[multiline,dotall,
-                                                            global])), 
-?line <<"borfle
+no",".*\\.gif","AR\\1dLYmTSnXAA",[multiline,dotall,global])), 
+    <<"borfle
 bib.gif
-BKNYIMcbaV">> = iolist_to_binary(re:replace("borfle
+anoc">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","BKNYIMcbaV",[])), 
-?line <<"borfle
+no",".*$","a&c",[])), 
+    <<"borfle
 bib.gif
-BKNYIMcbaVBKNYIMcbaV">> = iolist_to_binary(re:replace("borfle
+anocac">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","BKNYIMcbaV",[global])), 
-?line <<"borflevLMilNh
+no",".*$","a&c",[global])), 
+    <<"fborfleDas
 bib.gif
 no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","&vLM\\1ilNh\\1",[multiline])), 
-?line <<"borflevLMilNhvLMilNh
-bib.gifvLMilNhvLMilNh
-novLMilNhvLMilNh">> = iolist_to_binary(re:replace("borfle
+no",".*$","f&Das",[multiline])), 
+    <<"fborfleDasfDas
+fbib.gifDasfDas
+fnoDasfDas">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","&vLM\\1ilNh\\1",[multiline,global])), 
-?line <<"borfle
+no",".*$","f&Das",[multiline,global])), 
+    <<"eUveborfle
 bib.gif
-noMtTxgborfle
+nopjBhborfle
 bib.gif
-noXborfle
+noEXborfle
 bib.gif
-noqKCRborfle
+nodborfle
 bib.gif
-noRFb">> = iolist_to_binary(re:replace("borfle
+noiGXw">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","&MtTxg&X&qKCR&RFb",[dotall])), 
-?line <<"borfle
+no",".*$","eUve&pjBh&EX&d&iGXw",[dotall])), 
+    <<"eUveborfle
 bib.gif
-noMtTxgborfle
+nopjBhborfle
 bib.gif
-noXborfle
+noEXborfle
 bib.gif
-noqKCRborfle
+nodborfle
 bib.gif
-noRFbMtTxgXqKCRRFb">> = iolist_to_binary(re:replace("borfle
+noiGXweUvepjBhEXdiGXw">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","&MtTxg&X&qKCR&RFb",[dotall,global])), 
-?line <<"rb">> = iolist_to_binary(re:replace("borfle
+no",".*$","eUve&pjBh&EX&d&iGXw",[dotall,global])), 
+    <<"RIMAHborfle
 bib.gif
-no",".*$","rb",[multiline,dotall])), 
-?line <<"rbrb">> = iolist_to_binary(re:replace("borfle
+norborfle
 bib.gif
-no",".*$","rb",[multiline,dotall,global])), 
-?line <<"borfle
+no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-dTAVnoxiWSnoiuGHA">> = iolist_to_binary(re:replace("borfle
+no",".*$","R\\1IMAH&\\1r&",[multiline,dotall])), 
+    <<"RIMAHborfle
 bib.gif
-no",".*$","dTAV&xiWS&iuGH\\1A\\1",[])), 
-?line <<"borfle
+norborfle
 bib.gif
-dTAVnoxiWSnoiuGHAdTAVxiWSiuGHA">> = iolist_to_binary(re:replace("borfle
+noRIMAHr">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","dTAV&xiWS&iuGH\\1A\\1",[global])), 
-?line <<"bcnFLv
+no",".*$","R\\1IMAH&\\1r&",[multiline,dotall,global])), 
+    <<"borfle
 bib.gif
-no">> = iolist_to_binary(re:replace("borfle
+IXHXnoNO">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","bc\\1nFLv",[multiline])), 
-?line <<"bcnFLvbcnFLv
-bcnFLvbcnFLv
-bcnFLvbcnFLv">> = iolist_to_binary(re:replace("borfle
+no",".*$","IXHX&NO",[])), 
+    <<"borfle
 bib.gif
-no",".*$","bc\\1nFLv",[multiline,global])), 
-?line <<"LIQosdWborfle
+IXHXnoNOIXHXNO">> = iolist_to_binary(re:replace("borfle
 bib.gif
-nogcg">> = iolist_to_binary(re:replace("borfle
+no",".*$","IXHX&NO",[global])), 
+    <<"iGCnBCJborfleUborflenLutTYS
 bib.gif
-no",".*$","L\\1IQosd\\1W&gcg",[dotall])), 
-?line <<"LIQosdWborfle
+no">> = iolist_to_binary(re:replace("borfle
 bib.gif
-nogcgLIQosdWgcg">> = iolist_to_binary(re:replace("borfle
+no",".*$","\\1iGCnBC\\1J&U&nL\\1utTYS",[multiline])), 
+    <<"iGCnBCJborfleUborflenLutTYSiGCnBCJUnLutTYS
+iGCnBCJbib.gifUbib.gifnLutTYSiGCnBCJUnLutTYS
+iGCnBCJnoUnonLutTYSiGCnBCJUnLutTYS">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","L\\1IQosd\\1W&gcg",[dotall,global])), 
-?line <<"EcPBKTVborfle
+no",".*$","\\1iGCnBC\\1J&U&nL\\1utTYS",[multiline,global])), 
+    <<"dkaborfle
 bib.gif
-noPrborfle
+nocxpCSRwborfle
 bib.gif
-noXxQSc">> = iolist_to_binary(re:replace("borfle
+noJQHcx">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","EcPBKTV&Pr&XxQSc",[multiline,dotall])), 
-?line <<"EcPBKTVborfle
+no",".*$","dka&cxpCSRw&JQ\\1Hc\\1x",[dotall])), 
+    <<"dkaborfle
 bib.gif
-noPrborfle
+nocxpCSRwborfle
 bib.gif
-noXxQScEcPBKTVPrXxQSc">> = iolist_to_binary(re:replace("borfle
+noJQHcxdkacxpCSRwJQHcx">> = iolist_to_binary(re:replace("borfle
 bib.gif
-no",".*$","EcPBKTV&Pr&XxQSc",[multiline,dotall,global])), 
-?line <<"abcde
-uhjjD1234XGTHcATIgH1234X1234XfbByz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","uhjjD&GTHcATIgH\\1\\1fbB",[])), 
-?line <<"abcde
-uhjjD1234XGTHcATIgH1234X1234XfbByz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","uhjjD&GTHcATIgH\\1\\1fbB",[global])), 
-?line <<"dbqarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","dbq",[])), 
-?line <<"dbqarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","dbq",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","tdwOa\\1DQul",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","tdwOa\\1DQul",[global])), 
-?line <<"abcde
-Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","j\\1&fFKu\\1tLJjDOmjkU",[])), 
-?line <<"abcde
-Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","j\\1&fFKu\\1tLJjDOmjkU",[global])), 
-?line <<"abcde
-cKv1234XFUwb1234XTPoWrycn1234XO1234Xyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","cKv&FUwb&TPoWrycn&O&",[multiline])), 
-?line <<"abcde
-cKv1234XFUwb1234XTPoWrycn1234XO1234Xyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","cKv&FUwb&TPoWrycn&O&",[multiline,global])), 
-?line <<"FBHWgBBNiGBkIarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","F&HWgB\\1NiG\\1kI",[multiline])), 
-?line <<"FBHWgBBNiGBkIarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","F&HWgB\\1NiG\\1kI",[multiline,
-                                                                                                                                                                                                            global])), 
-?line <<"abcde
-oArar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","oAr",[multiline])), 
-?line <<"abcde
-oArar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","oAr",[multiline,global])), 
-?line <<"abcde
-1234XpqJuWOcKJabcde
-1234XyXyvjQwPyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","\\1pqJuWOcKJ&yXyvjQwP",[dotall])), 
-?line <<"abcde
-1234XpqJuWOcKJabcde
-1234XyXyvjQwPyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","\\1pqJuWOcKJ&yXyvjQwP",[dotall,global])), 
-?line <<"BHBBBLbBBgBBoarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","BH\\1&&Lb&&g\\1&o",[dotall])), 
-?line <<"BHBBBLbBBgBBoarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","BH\\1&&Lb&&g\\1&o",[dotall,
-                                                                                                                                                                                                                global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","&LH",[dotall])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","&LH",[dotall,
-                                                                                                                                                                                        global])), 
-?line <<"abcde
+no",".*$","dka&cxpCSRw&JQ\\1Hc\\1x",[dotall,global])), 
+    <<"tnQDxLEhTFjTiWwouU">> = iolist_to_binary(re:replace("borfle
+bib.gif
+no",".*$","tnQDxLEhTF\\1jTiWwouU",[multiline,dotall])), 
+    <<"tnQDxLEhTFjTiWwouUtnQDxLEhTFjTiWwouU">> = iolist_to_binary(re:replace("borfle
+bib.gif
+no",".*$","tnQDxLEhTF\\1jTiWwouU",[multiline,dotall,global])), 
+    <<"abcde
+fSiqVi1234Xw1234XWyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","fSiqVi&w\\1W",[])), 
+    <<"abcde
+fSiqVi1234Xw1234XWyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","fSiqVi&w\\1W",[global])), 
+    <<"apCVoPCVMeDBpBBarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","apCVoPCVMeD&p\\1&",[])), 
+    <<"apCVoPCVMeDBpBBarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","apCVoPCVMeD&p\\1&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","FiTmKNSyXk",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","FiTmKNSyXk",[global])), 
+    <<"abcde
 Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","HvNOg&qrhICiO",[dotall])), 
-?line <<"abcde
+Bar","(.*X|^B)","&",[])), 
+    <<"abcde
 Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","HvNOg&qrhICiO",[dotall,global])), 
-?line <<"eabcde
+Bar","(.*X|^B)","&",[global])), 
+    <<"abcde
+1234XY1234X1234X1234XiJfcfLjk1234Xyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","&Y\\1\\1\\1iJfcfLjk\\1",[multiline])), 
+    <<"abcde
+1234XY1234X1234X1234XiJfcfLjk1234Xyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","&Y\\1\\1\\1iJfcfLjk\\1",[multiline,global])), 
+    <<"BUrWBJarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","&UrW\\1J",[multiline])), 
+    <<"BUrWBJarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","&UrW\\1J",[multiline,
+                                                                                                                                                                                       global])), 
+    <<"abcde
+vpiar">> = iolist_to_binary(re:replace("abcde
+Bar","(.*X|^B)","vpi",[multiline])), 
+    <<"abcde
+vpiar">> = iolist_to_binary(re:replace("abcde
+Bar","(.*X|^B)","vpi",[multiline,global])), 
+    <<"abcde
 1234Xabcde
-1234XIRtabcde
 1234Xabcde
-1234XCMGsyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","e\\1&IRt\\1\\1CMGs",[multiline,dotall])), 
-?line <<"eabcde
+1234XOwvyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","\\1\\1&Owv",[dotall])), 
+    <<"abcde
 1234Xabcde
-1234XIRtabcde
 1234Xabcde
-1234XCMGsyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(.*X|^B)","e\\1&IRt\\1\\1CMGs",[multiline,dotall,global])), 
-?line <<"MBMpwYiMLarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","M\\1MpwYiML",[multiline,
-                                                                                                                                                                                              dotall])), 
-?line <<"MBMpwYiMLarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","M\\1MpwYiML",[multiline,
-                                                                                                                                                                                               dotall,
-                                                                                                                                                                                               global])), 
-?line <<"abcde
-SOfar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","SOf",[multiline,dotall])), 
-?line <<"abcde
-SOfar">> = iolist_to_binary(re:replace("abcde
-Bar","(.*X|^B)","SOf",[multiline,dotall,global])), 
-?line <<"Xabcde
-1234XIabcde
-1234XJyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(?s)(.*X|^B)","X\\1I\\1J",[])), 
-?line <<"Xabcde
-1234XIabcde
-1234XJyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(?s)(.*X|^B)","X\\1I\\1J",[global])), 
-?line <<"ckBBgDwBNcECcmswBGrarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s)(.*X|^B)","ck\\1&gDw\\1NcECcmsw\\1Gr",[])), 
-?line <<"ckBBgDwBNcECcmswBGrarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s)(.*X|^B)","ck\\1&gDw\\1NcECcmsw\\1Gr",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s)(.*X|^B)","dC\\1SBGDJPgKye\\1iTO",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s)(.*X|^B)","dC\\1SBGDJPgKye\\1iTO",[global])), 
-?line <<"abcde
+1234XOwvyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","\\1\\1&Owv",[dotall,global])), 
+    <<"csBOSrLyBynarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","cs\\1OSrLy\\1yn",[dotall])), 
+    <<"csBOSrLyBynarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","cs\\1OSrLy\\1yn",[dotall,
+                                                                                                                                                                                                     global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","\\1qVOKf\\1jqa",[dotall])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(.*X|^B)","\\1qVOKf\\1jqa",[dotall,
+                                                                                                                                                                                                             global])), 
+    <<"abcde
 Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(?s)(.*X|^B)","hL&HrGi&",[])), 
-?line <<"abcde
+Bar","(.*X|^B)","p",[dotall])), 
+    <<"abcde
 Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(?s)(.*X|^B)","hL&HrGi&",[global])), 
-?line <<"abcde
-1234Xabcde
-1234XBpOYYilckyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(?s:.*X|^B)","&&\\1BpOYYilck",[])), 
-?line <<"abcde
-1234Xabcde
-1234XBpOYYilckyz">> = iolist_to_binary(re:replace("abcde
-1234Xyz","(?s:.*X|^B)","&&\\1BpOYYilck",[global])), 
-?line <<"ThDpSQKkSSwHarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s:.*X|^B)","ThDpSQ\\1KkSSwH",[])), 
-?line <<"ThDpSQKkSSwHarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s:.*X|^B)","ThDpSQ\\1KkSSwH",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s:.*X|^B)","H&KaW\\1iKok\\1x&gEh&",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s:.*X|^B)","H&KaW\\1iKok\\1x&gEh&",[global])), 
-?line <<"abcde
+Bar","(.*X|^B)","p",[dotall,global])), 
+    <<"YiHiyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","YiHi",[multiline,dotall])), 
+    <<"YiHiyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(.*X|^B)","YiHi",[multiline,dotall,global])), 
+    <<"DDQRgXBHBBSBcHarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","DDQRgXBH&&S\\1cH",[multiline,
+                                                                                                                                                                                                        dotall])), 
+    <<"DDQRgXBHBBSBcHarFoo">> = iolist_to_binary(re:replace("BarFoo","(.*X|^B)","DDQRgXBH&&S\\1cH",[multiline,
+                                                                                                                                                                                                         dotall,
+                                                                                                                                                                                                         global])), 
+    <<"abcde
+KTLNdCWtmar">> = iolist_to_binary(re:replace("abcde
+Bar","(.*X|^B)","KTLNdCWtm",[multiline,dotall])), 
+    <<"abcde
+KTLNdCWtmar">> = iolist_to_binary(re:replace("abcde
+Bar","(.*X|^B)","KTLNdCWtm",[multiline,dotall,global])), 
+    <<"UnqSIGfraCIjabcde
+1234Xlyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(?s)(.*X|^B)","UnqSIGfraCIj&l",[])), 
+    <<"UnqSIGfraCIjabcde
+1234Xlyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(?s)(.*X|^B)","UnqSIGfraCIj&l",[global])), 
+    <<"aDBarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s)(.*X|^B)","aDB",[])), 
+    <<"aDBarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s)(.*X|^B)","aDB",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s)(.*X|^B)","hbfv",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s)(.*X|^B)","hbfv",[global])), 
+    <<"abcde
 Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(?s:.*X|^B)","DFJoEUQUCdLTM\\1ETp",[])), 
-?line <<"abcde
+Bar","(?s)(.*X|^B)","&UWQV\\1&\\1\\1E",[])), 
+    <<"abcde
 Bar">> = iolist_to_binary(re:replace("abcde
-Bar","(?s:.*X|^B)","DFJoEUQUCdLTM\\1ETp",[global])), 
-?line <<"**** Failers">> = iolist_to_binary(re:replace("**** Failers","^.*B","N&QUc\\1IX&",[])), 
-?line <<"**** Failers">> = iolist_to_binary(re:replace("**** Failers","^.*B","N&QUc\\1IX&",[global])), 
-?line <<"abc
-B">> = iolist_to_binary(re:replace("abc
-B","^.*B","XtHO\\1dFCGIat\\1\\1A\\1yj\\1",[])), 
-?line <<"abc
-B">> = iolist_to_binary(re:replace("abc
-B","^.*B","XtHO\\1dFCGIat\\1\\1A\\1yj\\1",[global])), 
-?line <<"yKkFabc
+Bar","(?s)(.*X|^B)","&UWQV\\1&\\1\\1E",[global])), 
+    <<"KYpUjyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(?s:.*X|^B)","KY\\1\\1pUj\\1",[])), 
+    <<"KYpUjyz">> = iolist_to_binary(re:replace("abcde
+1234Xyz","(?s:.*X|^B)","KY\\1\\1pUj\\1",[global])), 
+    <<"BSkyfarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s:.*X|^B)","\\1BSk\\1y\\1\\1f",[])), 
+    <<"BSkyfarFoo">> = iolist_to_binary(re:replace("BarFoo","(?s:.*X|^B)","\\1BSk\\1y\\1\\1f",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s:.*X|^B)","IG\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s:.*X|^B)","IG\\1",[global])), 
+    <<"abcde
+Bar">> = iolist_to_binary(re:replace("abcde
+Bar","(?s:.*X|^B)","&OchEkLBdrDrxVm&",[])), 
+    <<"abcde
+Bar">> = iolist_to_binary(re:replace("abcde
+Bar","(?s:.*X|^B)","&OchEkLBdrDrxVm&",[global])), 
+    <<"**** Failers">> = iolist_to_binary(re:replace("**** Failers","^.*B","cYoDF\\1rwds&i&y&&XoFT",[])), 
+    <<"**** Failers">> = iolist_to_binary(re:replace("**** Failers","^.*B","cYoDF\\1rwds&i&y&&XoFT",[global])), 
+    <<"abc
 B">> = iolist_to_binary(re:replace("abc
-B","(?s)^.*B","yKkF&",[])), 
-?line <<"yKkFabc
+B","^.*B","gXmgvN\\1oh",[])), 
+    <<"abc
 B">> = iolist_to_binary(re:replace("abc
-B","(?s)^.*B","yKkF&",[global])), 
-?line <<"abc
-AQ">> = iolist_to_binary(re:replace("abc
-B","(?m)^.*B","AQ",[])), 
-?line <<"abc
-AQ">> = iolist_to_binary(re:replace("abc
-B","(?m)^.*B","AQ",[global])), 
-?line <<"abc
-BDabc
-BNabc
-BxoUHHabc
-Bo">> = iolist_to_binary(re:replace("abc
-B","(?ms)^.*B","\\1&D&N&xoUHH&o",[])), 
-?line <<"abc
-BDabc
-BNabc
-BxoUHHabc
-Bo">> = iolist_to_binary(re:replace("abc
-B","(?ms)^.*B","\\1&D&N&xoUHH&o",[global])), 
-?line <<"abc
-GHgiVrjlVxqskBLR">> = iolist_to_binary(re:replace("abc
-B","(?ms)^B","GHgiVrj\\1lVxqsk&LR",[])), 
-?line <<"abc
-GHgiVrjlVxqskBLR">> = iolist_to_binary(re:replace("abc
-B","(?ms)^B","GHgiVrj\\1lVxqsk&LR",[global])), 
-?line <<"RBtqaBce">> = iolist_to_binary(re:replace("B","(?s)B$","R&tqaBce",[])), 
-?line <<"RBtqaBce">> = iolist_to_binary(re:replace("B","(?s)B$","R&tqaBce",[global])), 
-?line <<"kG">> = iolist_to_binary(re:replace("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]","kG",[])), 
-?line <<"kG">> = iolist_to_binary(re:replace("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]","kG",[global])), 
-?line <<"Tx">> = iolist_to_binary(re:replace("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d","Tx",[])), 
-?line <<"Tx">> = iolist_to_binary(re:replace("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d","Tx",[global])), 
-?line <<"xB">> = iolist_to_binary(re:replace("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]","xB",[])), 
-?line <<"xB">> = iolist_to_binary(re:replace("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]","xB",[global])), 
-?line <<"OpPIBabcabcabcabcDcxDvlIdSoa">> = iolist_to_binary(re:replace("abcabcabcabc","^[abc]{12}","OpPIB&DcxDvlIdSoa",[])), 
-?line <<"OpPIBabcabcabcabcDcxDvlIdSoa">> = iolist_to_binary(re:replace("abcabcabcabc","^[abc]{12}","OpPIB&DcxDvlIdSoa",[global])), 
-?line <<"LGEMfnjAabcabcabcabcuAotOabcabcabcabcs">> = iolist_to_binary(re:replace("abcabcabcabc","^[a-c]{12}","LGEMfnj\\1A&uAotO&s",[])), 
-?line <<"LGEMfnjAabcabcabcabcuAotOabcabcabcabcs">> = iolist_to_binary(re:replace("abcabcabcabc","^[a-c]{12}","LGEMfnj\\1A&uAotO&s",[global])), 
-?line <<"PNcwcmOyx">> = iolist_to_binary(re:replace("abcabcabcabc","^(a|b|c){12}","PN\\1w\\1mOyx",[])), 
-?line <<"PNcwcmOyx">> = iolist_to_binary(re:replace("abcabcabcabc","^(a|b|c){12}","PN\\1w\\1mOyx",[global])), 
-?line <<"hVfRbFrAh">> = iolist_to_binary(re:replace("n","^[abcdefghijklmnopqrstuvwxy0123456789]","hVfRbFrAh",[])), 
-?line <<"hVfRbFrAh">> = iolist_to_binary(re:replace("n","^[abcdefghijklmnopqrstuvwxy0123456789]","hVfRbFrAh",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]","R\\1gE\\1TmOo&B&\\1EaaIWLL",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]","R\\1gE\\1TmOo&B&\\1EaaIWLL",[global])), 
-?line <<"z">> = iolist_to_binary(re:replace("z","^[abcdefghijklmnopqrstuvwxy0123456789]","dPAGng",[])), 
-?line <<"z">> = iolist_to_binary(re:replace("z","^[abcdefghijklmnopqrstuvwxy0123456789]","dPAGng",[global])), 
-?line <<"GalPHuLJkabcdJ">> = iolist_to_binary(re:replace("abcd","abcde{0,0}","Gal\\1PHu\\1LJk&J",[])), 
-?line <<"GalPHuLJkabcdJ">> = iolist_to_binary(re:replace("abcd","abcde{0,0}","Gal\\1PHu\\1LJk&J",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abcde{0,0}","nRSqklns\\1RNQ",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abcde{0,0}","nRSqklns\\1RNQ",[global])), 
-?line <<"abce">> = iolist_to_binary(re:replace("abce","abcde{0,0}","aYgl\\1WJ",[])), 
-?line <<"abce">> = iolist_to_binary(re:replace("abce","abcde{0,0}","aYgl\\1WJ",[global])), 
-?line <<"JSDhTpxGUy">> = iolist_to_binary(re:replace("abe","ab[cd]{0,0}e","J\\1SDhT\\1pxGUy",[])), 
-?line <<"JSDhTpxGUy">> = iolist_to_binary(re:replace("abe","ab[cd]{0,0}e","J\\1SDhT\\1pxGUy",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab[cd]{0,0}e","K\\1VVqQdlOY\\1IFC",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab[cd]{0,0}e","K\\1VVqQdlOY\\1IFC",[global])), 
-?line <<"abcde">> = iolist_to_binary(re:replace("abcde","ab[cd]{0,0}e","CBmXc&",[])), 
-?line <<"abcde">> = iolist_to_binary(re:replace("abcde","ab[cd]{0,0}e","CBmXc&",[global])), 
-?line <<"YKTMKcsKabd">> = iolist_to_binary(re:replace("abd","ab(c){0,0}d","YKT\\1MKcsK&",[])), 
-?line <<"YKTMKcsKabd">> = iolist_to_binary(re:replace("abd","ab(c){0,0}d","YKT\\1MKcsK&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab(c){0,0}d","&j&dtuA\\1A&vS",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab(c){0,0}d","&j&dtuA\\1A&vS",[global])), 
-?line <<"abcd">> = iolist_to_binary(re:replace("abcd","ab(c){0,0}d","&ceeJC\\1HRtWmI",[])), 
-?line <<"abcd">> = iolist_to_binary(re:replace("abcd","ab(c){0,0}d","&ceeJC\\1HRtWmI",[global])), 
-?line <<"k">> = iolist_to_binary(re:replace("a","a(b*)","\\1k",[])), 
-?line <<"k">> = iolist_to_binary(re:replace("a","a(b*)","\\1k",[global])), 
-?line <<"abnwnAb">> = iolist_to_binary(re:replace("ab","a(b*)","&nwnA\\1",[])), 
-?line <<"abnwnAb">> = iolist_to_binary(re:replace("ab","a(b*)","&nwnA\\1",[global])), 
-?line <<"nLIbbbbd">> = iolist_to_binary(re:replace("abbbb","a(b*)","nLI\\1d",[])), 
-?line <<"nLIbbbbd">> = iolist_to_binary(re:replace("abbbb","a(b*)","nLI\\1d",[global])), 
-?line <<"*** FMxgxBanxQaNgAilers">> = iolist_to_binary(re:replace("*** Failers","a(b*)","Mxgx\\1\\1B&nxQ&NgA",[])), 
-?line <<"*** FMxgxBanxQaNgAilers">> = iolist_to_binary(re:replace("*** Failers","a(b*)","Mxgx\\1\\1B&nxQ&NgA",[global])), 
-?line <<"bbbbb">> = iolist_to_binary(re:replace("bbbbb","a(b*)","Yho\\1QKp",[])), 
-?line <<"bbbbb">> = iolist_to_binary(re:replace("bbbbb","a(b*)","Yho\\1QKp",[global])), 
-?line <<"c">> = iolist_to_binary(re:replace("abe","ab\\d{0}e","c",[])), 
-?line <<"c">> = iolist_to_binary(re:replace("abe","ab\\d{0}e","c",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab\\d{0}e","e\\1Nu\\1BSg\\1Rxb",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab\\d{0}e","e\\1Nu\\1BSg\\1Rxb",[global])), 
-?line <<"ab1e">> = iolist_to_binary(re:replace("ab1e","ab\\d{0}e","C\\1xDlVAxYcYUK\\1fMs",[])), 
-?line <<"ab1e">> = iolist_to_binary(re:replace("ab1e","ab\\d{0}e","C\\1xDlVAxYcYUK\\1fMs",[global])), 
-?line <<"the MipoEquickBcm brown fox">> = iolist_to_binary(re:replace("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"","MipoE\\1Bcm",[])), 
-?line <<"the MipoEquickBcm brown fox">> = iolist_to_binary(re:replace("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"","MipoE\\1Bcm",[global])), 
-?line <<"\"the \\\"quick\\\" brown fox\"\"the \\\"quick\\\" brown fox\"K brown fox\"the \\\"quick\\\" brown fox\"twdFEi\"the \\\"quick\\\" brown fox\"Tf">> = iolist_to_binary(re:replace("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"","&&K\\1&twdFEi&Tf",[])), 
-?line <<"\"the \\\"quick\\\" brown fox\"\"the \\\"quick\\\" brown fox\"K brown fox\"the \\\"quick\\\" brown fox\"twdFEi\"the \\\"quick\\\" brown fox\"Tf">> = iolist_to_binary(re:replace("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"","&&K\\1&twdFEi&Tf",[global])), 
-?line <<"uOiYpObvYvnabc">> = iolist_to_binary(re:replace("abc","","uOiYp&\\1Obv&Yvn",[])), 
-?line <<"uOiYpObvYvnauOiYpObvYvnbuOiYpObvYvncuOiYpObvYvn">> = iolist_to_binary(re:replace("abc","","uOiYp&\\1Obv&Yvn",[global])), 
-?line <<"cacbJUVL">> = iolist_to_binary(re:replace("acb","a[^a]b","c&JUVL",[])), 
-?line <<"cacbJUVL">> = iolist_to_binary(re:replace("acb","a[^a]b","c&JUVL",[global])), 
-?line <<"a
-bnnciOUFa
-bttqb">> = iolist_to_binary(re:replace("a
-b","a[^a]b","&nnciOUF&ttq\\1b",[])), 
-?line <<"a
-bnnciOUFa
-bttqb">> = iolist_to_binary(re:replace("a
-b","a[^a]b","&nnciOUF&ttq\\1b",[global])), 
-?line <<"acbrJrBLmacbnacb">> = iolist_to_binary(re:replace("acb","a.b","&rJrBLm&n&",[])), 
-?line <<"acbrJrBLmacbnacb">> = iolist_to_binary(re:replace("acb","a.b","&rJrBLm&n&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.b","lUyaU",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.b","lUyaU",[global])), 
-?line <<"a
+B","^.*B","gXmgvN\\1oh",[global])), 
+    <<"EQuXabc
+Babc
+BcTMO">> = iolist_to_binary(re:replace("abc
+B","(?s)^.*B","EQuX&&\\1cTMO",[])), 
+    <<"EQuXabc
+Babc
+BcTMO">> = iolist_to_binary(re:replace("abc
+B","(?s)^.*B","EQuX&&\\1cTMO",[global])), 
+    <<"abc
+gtvPyITnci">> = iolist_to_binary(re:replace("abc
+B","(?m)^.*B","\\1gtvPyIT\\1\\1nci\\1",[])), 
+    <<"abc
+gtvPyITnci">> = iolist_to_binary(re:replace("abc
+B","(?m)^.*B","\\1gtvPyIT\\1\\1nci\\1",[global])), 
+    <<"Xiabc
+BFQs">> = iolist_to_binary(re:replace("abc
+B","(?ms)^.*B","Xi&FQs",[])), 
+    <<"Xiabc
+BFQs">> = iolist_to_binary(re:replace("abc
+B","(?ms)^.*B","Xi&FQs",[global])), 
+    <<"abc
+KEQlgWBJydBXBMDBU">> = iolist_to_binary(re:replace("abc
+B","(?ms)^B","KEQlgW&Jy\\1d&X&\\1\\1MD&U",[])), 
+    <<"abc
+KEQlgWBJydBXBMDBU">> = iolist_to_binary(re:replace("abc
+B","(?ms)^B","KEQlgW&Jy\\1d&X&\\1\\1MD&U",[global])), 
+    ok.
+run10() ->
+    <<"eucnXdJhktgj">> = iolist_to_binary(re:replace("B","(?s)B$","eucnXd\\1Jhktgj",[])), 
+    <<"eucnXdJhktgj">> = iolist_to_binary(re:replace("B","(?s)B$","eucnXd\\1Jhktgj",[global])), 
+    <<"huCb">> = iolist_to_binary(re:replace("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]","huCb",[])), 
+    <<"huCb">> = iolist_to_binary(re:replace("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]","huCb",[global])), 
+    <<"X123456654321">> = iolist_to_binary(re:replace("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d","X&",[])), 
+    <<"X123456654321">> = iolist_to_binary(re:replace("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d","X&",[global])), 
+    <<"TYfrdKv123456654321eOFnwwLVc">> = iolist_to_binary(re:replace("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]","TY\\1frdK\\1\\1v&eOFnwwLVc",[])), 
+    <<"TYfrdKv123456654321eOFnwwLVc">> = iolist_to_binary(re:replace("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]","TY\\1frdK\\1\\1v&eOFnwwLVc",[global])), 
+    <<"ARvxabcabcabcabcbhP">> = iolist_to_binary(re:replace("abcabcabcabc","^[abc]{12}","ARvx&bhP",[])), 
+    <<"ARvxabcabcabcabcbhP">> = iolist_to_binary(re:replace("abcabcabcabc","^[abc]{12}","ARvx&bhP",[global])), 
+    <<"VtabcabcabcabcaabcabcabcabcoPm">> = iolist_to_binary(re:replace("abcabcabcabc","^[a-c]{12}","V\\1t&a&oPm",[])), 
+    <<"VtabcabcabcabcaabcabcabcabcoPm">> = iolist_to_binary(re:replace("abcabcabcabc","^[a-c]{12}","V\\1t&a&oPm",[global])), 
+    <<"XSAxPcCWabcabcabcabccaabcabcabcabcC">> = iolist_to_binary(re:replace("abcabcabcabc","^(a|b|c){12}","XSAxPcCW&\\1a&C",[])), 
+    <<"XSAxPcCWabcabcabcabccaabcabcabcabcC">> = iolist_to_binary(re:replace("abcabcabcabc","^(a|b|c){12}","XSAxPcCW&\\1a&C",[global])), 
+    <<"KlnPsQA">> = iolist_to_binary(re:replace("n","^[abcdefghijklmnopqrstuvwxy0123456789]","Kl&\\1PsQA",[])), 
+    <<"KlnPsQA">> = iolist_to_binary(re:replace("n","^[abcdefghijklmnopqrstuvwxy0123456789]","Kl&\\1PsQA",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]","\\1fJAGtEidKGXUnys",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]","\\1fJAGtEidKGXUnys",[global])), 
+    <<"z">> = iolist_to_binary(re:replace("z","^[abcdefghijklmnopqrstuvwxy0123456789]","\\1rHkd&\\1jm&b&RxM\\1SHJ",[])), 
+    <<"z">> = iolist_to_binary(re:replace("z","^[abcdefghijklmnopqrstuvwxy0123456789]","\\1rHkd&\\1jm&b&RxM\\1SHJ",[global])), 
+    <<"imcGUm">> = iolist_to_binary(re:replace("abcd","abcde{0,0}","imcGUm",[])), 
+    <<"imcGUm">> = iolist_to_binary(re:replace("abcd","abcde{0,0}","imcGUm",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abcde{0,0}","Tqn",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abcde{0,0}","Tqn",[global])), 
+    <<"abce">> = iolist_to_binary(re:replace("abce","abcde{0,0}","&vfSkYqj",[])), 
+    <<"abce">> = iolist_to_binary(re:replace("abce","abcde{0,0}","&vfSkYqj",[global])), 
+    <<"DvcVJ">> = iolist_to_binary(re:replace("abe","ab[cd]{0,0}e","D\\1vc\\1VJ",[])), 
+    <<"DvcVJ">> = iolist_to_binary(re:replace("abe","ab[cd]{0,0}e","D\\1vc\\1VJ",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab[cd]{0,0}e","fqC",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab[cd]{0,0}e","fqC",[global])), 
+    <<"abcde">> = iolist_to_binary(re:replace("abcde","ab[cd]{0,0}e","EVGlB",[])), 
+    <<"abcde">> = iolist_to_binary(re:replace("abcde","ab[cd]{0,0}e","EVGlB",[global])), 
+    <<"ttqYHXMabdKMHbogw">> = iolist_to_binary(re:replace("abd","ab(c){0,0}d","ttqY\\1HXM&KMHbo\\1gw",[])), 
+    <<"ttqYHXMabdKMHbogw">> = iolist_to_binary(re:replace("abd","ab(c){0,0}d","ttqY\\1HXM&KMHbo\\1gw",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab(c){0,0}d","UO\\1n&&dgD&x&puRS\\1PEE",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab(c){0,0}d","UO\\1n&&dgD&x&puRS\\1PEE",[global])), 
+    <<"abcd">> = iolist_to_binary(re:replace("abcd","ab(c){0,0}d","AnMJgUHAxI\\1ekAaM",[])), 
+    <<"abcd">> = iolist_to_binary(re:replace("abcd","ab(c){0,0}d","AnMJgUHAxI\\1ekAaM",[global])), 
+    <<"OXylllC">> = iolist_to_binary(re:replace("a","a(b*)","OX\\1ylllC",[])), 
+    <<"OXylllC">> = iolist_to_binary(re:replace("a","a(b*)","OX\\1ylllC",[global])), 
+    <<"BDoOabpX">> = iolist_to_binary(re:replace("ab","a(b*)","BDoO&pX",[])), 
+    <<"BDoOabpX">> = iolist_to_binary(re:replace("ab","a(b*)","BDoO&pX",[global])), 
+    <<"WumvpDmPRlDEFbbbbbbbbw">> = iolist_to_binary(re:replace("abbbb","a(b*)","WumvpDmPRlDEF\\1\\1w",[])), 
+    <<"WumvpDmPRlDEFbbbbbbbbw">> = iolist_to_binary(re:replace("abbbb","a(b*)","WumvpDmPRlDEF\\1\\1w",[global])), 
+    <<"*** FXEpRailers">> = iolist_to_binary(re:replace("*** Failers","a(b*)","XEpR&",[])), 
+    <<"*** FXEpRailers">> = iolist_to_binary(re:replace("*** Failers","a(b*)","XEpR&",[global])), 
+    <<"bbbbb">> = iolist_to_binary(re:replace("bbbbb","a(b*)","oxX\\1mji\\1R&A",[])), 
+    <<"bbbbb">> = iolist_to_binary(re:replace("bbbbb","a(b*)","oxX\\1mji\\1R&A",[global])), 
+    <<"nabehjEWAKJbF">> = iolist_to_binary(re:replace("abe","ab\\d{0}e","n&hjEWA\\1\\1KJbF",[])), 
+    <<"nabehjEWAKJbF">> = iolist_to_binary(re:replace("abe","ab\\d{0}e","n&hjEWA\\1\\1KJbF",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab\\d{0}e","IK\\1nN\\1xr",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab\\d{0}e","IK\\1nN\\1xr",[global])), 
+    <<"ab1e">> = iolist_to_binary(re:replace("ab1e","ab\\d{0}e","S\\1HX\\1V\\1hjKR",[])), 
+    <<"ab1e">> = iolist_to_binary(re:replace("ab1e","ab\\d{0}e","S\\1HX\\1V\\1hjKR",[global])), 
+    <<"the quickf\"quick\"cqEH\"quick\"quickWsS brown fox">> = iolist_to_binary(re:replace("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"","\\1f&cqEH&\\1WsS",[])), 
+    <<"the quickf\"quick\"cqEH\"quick\"quickWsS brown fox">> = iolist_to_binary(re:replace("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"","\\1f&cqEH&\\1WsS",[global])), 
+    <<"mRaOvRxI">> = iolist_to_binary(re:replace("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"","mRaOvRxI",[])), 
+    <<"mRaOvRxI">> = iolist_to_binary(re:replace("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"","mRaOvRxI",[global])), 
+    <<"OVRmBCabc">> = iolist_to_binary(re:replace("abc","","OVR&m&BC",[])), 
+    <<"OVRmBCaOVRmBCbOVRmBCcOVRmBC">> = iolist_to_binary(re:replace("abc","","OVR&m&BC",[global])), 
+    <<"lMTacbbGqK">> = iolist_to_binary(re:replace("acb","a[^a]b","lMT&bGq\\1K",[])), 
+    <<"lMTacbbGqK">> = iolist_to_binary(re:replace("acb","a[^a]b","lMT&bGq\\1K",[global])), 
+    <<"a
+ba
+bLxcQMea
+bHjqB">> = iolist_to_binary(re:replace("a
+b","a[^a]b","\\1\\1&&LxcQMe&Hj\\1qB",[])), 
+    <<"a
+ba
+bLxcQMea
+bHjqB">> = iolist_to_binary(re:replace("a
+b","a[^a]b","\\1\\1&&LxcQMe&Hj\\1qB",[global])), 
+    <<"acbVVpcHAOaqv">> = iolist_to_binary(re:replace("acb","a.b","&VVpcHAOaqv",[])), 
+    <<"acbVVpcHAOaqv">> = iolist_to_binary(re:replace("acb","a.b","&VVpcHAOaqv",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.b","rP",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.b","rP",[global])), 
+    <<"a
 b">> = iolist_to_binary(re:replace("a
-b","a.b","&etys",[])), 
-?line <<"a
+b","a.b","rUNVcR\\1i\\1S",[])), 
+    <<"a
 b">> = iolist_to_binary(re:replace("a
-b","a.b","&etys",[global])), 
-?line <<"BRCBYDDacbacbacbLfVw">> = iolist_to_binary(re:replace("acb","a[^a]b","BRCBY\\1D\\1D&&\\1&LfVw",[dotall])), 
-?line <<"BRCBYDDacbacbacbLfVw">> = iolist_to_binary(re:replace("acb","a[^a]b","BRCBY\\1D\\1D&&\\1&LfVw",[dotall,
-                                                                                                                                                                                                                 global])), 
-?line <<"a
-bQkfhPqa
-bka
-byK">> = iolist_to_binary(re:replace("a
-b","a[^a]b","&Qk\\1fhPq&k&yK",[dotall])), 
-?line <<"a
-bQkfhPqa
-bka
-byK">> = iolist_to_binary(re:replace("a
-b","a[^a]b","&Qk\\1fhPq&k&yK",[dotall,global])), 
-?line <<"nKFpFMMacbmxur">> = iolist_to_binary(re:replace("acb","a.b","\\1nKF\\1\\1pF\\1MM\\1&mxur",[dotall])), 
-?line <<"nKFpFMMacbmxur">> = iolist_to_binary(re:replace("acb","a.b","\\1nKF\\1\\1pF\\1MM\\1&mxur",[dotall,
-                                                                                                                                                                                                                   global])), 
-?line <<"RESrDVpIxqsoAT">> = iolist_to_binary(re:replace("a
-b","a.b","\\1RES\\1rDVpIxqso\\1AT",[dotall])), 
-?line <<"RESrDVpIxqsoAT">> = iolist_to_binary(re:replace("a
-b","a.b","\\1RES\\1rDVpIxqso\\1AT",[dotall,global])), 
-?line <<"aNchRRBHywejNvbacE">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","\\1NchRRBHywejNv&E",[])), 
-?line <<"aNchRRBHywejNvbacE">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","\\1NchRRBHywejNv&E",[global])), 
-?line <<"tOamCbbacgsmxbbac">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","tO\\1mC&gsmx&",[])), 
-?line <<"tOamCbbacgsmxbbac">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","tO\\1mC&gsmx&",[global])), 
-?line <<"xHTFdauecabbbacGpaol">> = iolist_to_binary(re:replace("bbbac","^(b+?|a){1,2}?c","xHTFd\\1uec\\1&Gp\\1ol",[])), 
-?line <<"xHTFdauecabbbacGpaol">> = iolist_to_binary(re:replace("bbbac","^(b+?|a){1,2}?c","xHTFd\\1uec\\1&Gp\\1ol",[global])), 
-?line <<"baapjPEIagYbbbbacvbbbbacUPkPJ">> = iolist_to_binary(re:replace("bbbbac","^(b+?|a){1,2}?c","b\\1\\1pjPEI\\1gY&v&UPkPJ",[])), 
-?line <<"baapjPEIagYbbbbacvbbbbacUPkPJ">> = iolist_to_binary(re:replace("bbbbac","^(b+?|a){1,2}?c","b\\1\\1pjPEI\\1gY&v&UPkPJ",[global])), 
-?line <<"atqCLSTaKnviKn">> = iolist_to_binary(re:replace("bbbbbac","^(b+?|a){1,2}?c","\\1tqCLST\\1KnviKn",[])), 
-?line <<"atqCLSTaKnviKn">> = iolist_to_binary(re:replace("bbbbbac","^(b+?|a){1,2}?c","\\1tqCLST\\1KnviKn",[global])), 
-?line <<"x">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}?c","x",[])), 
-?line <<"x">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}?c","x",[global])), 
-?line <<"ysaxGbbachYTP">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}?c","ysaxG&hYTP",[])), 
-?line <<"ysaxGbbachYTP">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}?c","ysaxG&hYTP",[global])), 
-?line <<"IxpOsaoUxbbbacCEcBow">> = iolist_to_binary(re:replace("bbbac","^(b+|a){1,2}?c","IxpOs\\1oUx&CEcBow",[])), 
-?line <<"IxpOsaoUxbbbacCEcBow">> = iolist_to_binary(re:replace("bbbac","^(b+|a){1,2}?c","IxpOs\\1oUx&CEcBow",[global])), 
-?line <<"bbbbacDeITf">> = iolist_to_binary(re:replace("bbbbac","^(b+|a){1,2}?c","&DeITf",[])), 
-?line <<"bbbbacDeITf">> = iolist_to_binary(re:replace("bbbbac","^(b+|a){1,2}?c","&DeITf",[global])), 
-?line <<"XlWabAqKnj">> = iolist_to_binary(re:replace("bbbbbac","^(b+|a){1,2}?c","XlW\\1bAqKnj",[])), 
-?line <<"XlWabAqKnj">> = iolist_to_binary(re:replace("bbbbbac","^(b+|a){1,2}?c","XlW\\1bAqKnj",[global])), 
-?line <<"x
+b","a.b","rUNVcR\\1i\\1S",[global])), 
+    <<"UHo">> = iolist_to_binary(re:replace("acb","a[^a]b","UHo",[dotall])), 
+    <<"UHo">> = iolist_to_binary(re:replace("acb","a[^a]b","UHo",[dotall,
+                                                                                                                                                                 global])), 
+    <<"muQa
+bDGfm">> = iolist_to_binary(re:replace("a
+b","a[^a]b","muQ&DGfm",[dotall])), 
+    <<"muQa
+bDGfm">> = iolist_to_binary(re:replace("a
+b","a[^a]b","muQ&DGfm",[dotall,global])), 
+    <<"mPIfJVBacbQacbtacbVacb">> = iolist_to_binary(re:replace("acb","a.b","m\\1PIfJVB&Q&t\\1&V&",[dotall])), 
+    <<"mPIfJVBacbQacbtacbVacb">> = iolist_to_binary(re:replace("acb","a.b","m\\1PIfJVB&Q&t\\1&V&",[dotall,
+                                                                                                                                                                                                   global])), 
+    <<"aNa
+bBIrkip">> = iolist_to_binary(re:replace("a
+b","a.b","aN&BIrkip",[dotall])), 
+    <<"aNa
+bBIrkip">> = iolist_to_binary(re:replace("a
+b","a.b","aN&BIrkip",[dotall,global])), 
+    ok.
+run11() ->
+    <<"vhgx">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","vhgx",[])), 
+    <<"vhgx">> = iolist_to_binary(re:replace("bac","^(b+?|a){1,2}?c","vhgx",[global])), 
+    <<"ybvbbac">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","ybv&",[])), 
+    <<"ybvbbac">> = iolist_to_binary(re:replace("bbac","^(b+?|a){1,2}?c","ybv&",[global])), 
+    <<"KDBmQaFUbbbbacKDvahagVH">> = iolist_to_binary(re:replace("bbbac","^(b+?|a){1,2}?c","KDBmQ\\1FUb&KDv\\1h\\1gVH",[])), 
+    <<"KDBmQaFUbbbbacKDvahagVH">> = iolist_to_binary(re:replace("bbbac","^(b+?|a){1,2}?c","KDBmQ\\1FUb&KDv\\1h\\1gVH",[global])), 
+    <<"uPboDyBKbbbbaccsL">> = iolist_to_binary(re:replace("bbbbac","^(b+?|a){1,2}?c","uPboDyBK&csL",[])), 
+    <<"uPboDyBKbbbbaccsL">> = iolist_to_binary(re:replace("bbbbac","^(b+?|a){1,2}?c","uPboDyBK&csL",[global])), 
+    <<"QeDbbbbbacbbbbbacXxKbbbbbacTlGRhFObbbbbaccF">> = iolist_to_binary(re:replace("bbbbbac","^(b+?|a){1,2}?c","QeD&&XxK&TlGRhFO&cF",[])), 
+    <<"QeDbbbbbacbbbbbacXxKbbbbbacTlGRhFObbbbbaccF">> = iolist_to_binary(re:replace("bbbbbac","^(b+?|a){1,2}?c","QeD&&XxK&TlGRhFO&cF",[global])), 
+    <<"bacUbacihaieDLiAIBbacGLD">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}?c","&U&ih\\1ieDLiAIB&GLD",[])), 
+    <<"bacUbacihaieDLiAIBbacGLD">> = iolist_to_binary(re:replace("bac","^(b+|a){1,2}?c","&U&ih\\1ieDLiAIB&GLD",[global])), 
+    <<"YFsyGywxuIMvbbacmaha">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}?c","YFsyGywxuIMv&m\\1h\\1",[])), 
+    <<"YFsyGywxuIMvbbacmaha">> = iolist_to_binary(re:replace("bbac","^(b+|a){1,2}?c","YFsyGywxuIMv&m\\1h\\1",[global])), 
+    <<"qbbbacaLIOdWFbbbacbbbacJBItjgaqJ">> = iolist_to_binary(re:replace("bbbac","^(b+|a){1,2}?c","q&\\1LIOdWF&&JBItjg\\1qJ",[])), 
+    <<"qbbbacaLIOdWFbbbacbbbacJBItjgaqJ">> = iolist_to_binary(re:replace("bbbac","^(b+|a){1,2}?c","q&\\1LIOdWF&&JBItjg\\1qJ",[global])), 
+    <<"QqiEfi">> = iolist_to_binary(re:replace("bbbbac","^(b+|a){1,2}?c","QqiEfi",[])), 
+    <<"QqiEfi">> = iolist_to_binary(re:replace("bbbbac","^(b+|a){1,2}?c","QqiEfi",[global])), 
+    <<"YDPanLeWvajbbbbbacabnHyjk">> = iolist_to_binary(re:replace("bbbbbac","^(b+|a){1,2}?c","YDPanLeWv\\1j&\\1bnHyjk",[])), 
+    <<"YDPanLeWvajbbbbbacabnHyjk">> = iolist_to_binary(re:replace("bbbbbac","^(b+|a){1,2}?c","YDPanLeWv\\1j&\\1bnHyjk",[global])), 
+    <<"x
 b">> = iolist_to_binary(re:replace("x
-b","(?!\\A)x","DxdEs\\1&\\1LKts&",[multiline])), 
-?line <<"x
+b","(?!\\A)x","TB&e&lCSta",[multiline])), 
+    <<"x
 b">> = iolist_to_binary(re:replace("x
-b","(?!\\A)x","DxdEs\\1&\\1LKts&",[multiline,global])), 
-?line <<"aAx">> = iolist_to_binary(re:replace("ax","(?!\\A)x","Ax",[multiline])), 
-?line <<"aAx">> = iolist_to_binary(re:replace("ax","(?!\\A)x","Ax",[multiline,
-                                                                                                                                                                      global])), 
-?line <<"{ab}">> = iolist_to_binary(re:replace("{ab}","\\x0{ab}","aOVgpiCu\\1P\\1xjYe\\1",[])), 
-?line <<"{ab}">> = iolist_to_binary(re:replace("{ab}","\\x0{ab}","aOVgpiCu\\1P\\1xjYe\\1",[global])), 
-?line <<"PilCDnyDeI">> = iolist_to_binary(re:replace("CD","(A|B)*?CD","Pil&\\1nyDeI",[])), 
-?line <<"PilCDnyDeI">> = iolist_to_binary(re:replace("CD","(A|B)*?CD","Pil&\\1nyDeI",[global])), 
-?line <<"WrpDiffmnCDPINGCDSe">> = iolist_to_binary(re:replace("CD","(A|B)*CD","WrpDiffmn&PING&Se",[])), 
-?line <<"WrpDiffmnCDPINGCDSe">> = iolist_to_binary(re:replace("CD","(A|B)*CD","WrpDiffmn&PING&Se",[global])), 
-?line <<"mIeAB">> = iolist_to_binary(re:replace("ABABAB","(AB)*?\\1","mIe",[])), 
-?line <<"mIeAB">> = iolist_to_binary(re:replace("ABABAB","(AB)*?\\1","mIe",[global])), 
-?line <<"JThaowd">> = iolist_to_binary(re:replace("ABABAB","(AB)*\\1","JThaowd",[])), 
-?line <<"JThaowd">> = iolist_to_binary(re:replace("ABABAB","(AB)*\\1","JThaowd",[global])), 
-?line <<"mxivbdfooiW">> = iolist_to_binary(re:replace("foo","(?<!bar)foo","m\\1xi\\1\\1vbd&iW",[])), 
-?line <<"mxivbdfooiW">> = iolist_to_binary(re:replace("foo","(?<!bar)foo","m\\1xi\\1\\1vbd&iW",[global])), 
-?line <<"cathTPTYtGud">> = iolist_to_binary(re:replace("catfood","(?<!bar)foo","hTPTYtGu",[])), 
-?line <<"cathTPTYtGud">> = iolist_to_binary(re:replace("catfood","(?<!bar)foo","hTPTYtGu",[global])), 
-?line <<"arTMXuVvEElifooRfooXqctle">> = iolist_to_binary(re:replace("arfootle","(?<!bar)foo","TMXu\\1VvEEli&R&Xqc",[])), 
-?line <<"arTMXuVvEElifooRfooXqctle">> = iolist_to_binary(re:replace("arfootle","(?<!bar)foo","TMXu\\1VvEEli&R&Xqc",[global])), 
-?line <<"rCCfnfoopTfbpOVUOFBsh">> = iolist_to_binary(re:replace("rfoosh","(?<!bar)foo","CCfn&pT\\1fbpOVUOFB",[])), 
-?line <<"rCCfnfoopTfbpOVUOFBsh">> = iolist_to_binary(re:replace("rfoosh","(?<!bar)foo","CCfn&pT\\1fbpOVUOFB",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<!bar)foo","bxdEUE&SEpWXK&",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<!bar)foo","bxdEUE&SEpWXK&",[global])), 
-?line <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<!bar)foo","ghAth&\\1XCvK&&",[])), 
-?line <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<!bar)foo","ghAth&\\1XCvK&&",[global])), 
-?line <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","(?<!bar)foo","soY&O&QNmTi\\1xspnti&T",[])), 
-?line <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","(?<!bar)foo","soY&O&QNmTi\\1xspnti&T",[global])), 
-?line <<"JBHNVNd">> = iolist_to_binary(re:replace("catfood","\\w{3}(?<!bar)foo","J\\1BHN\\1VN\\1",[])), 
-?line <<"JBHNVNd">> = iolist_to_binary(re:replace("catfood","\\w{3}(?<!bar)foo","J\\1BHN\\1VN\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\w{3}(?<!bar)foo","&ucJ",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\w{3}(?<!bar)foo","&ucJ",[global])), 
-?line <<"foo">> = iolist_to_binary(re:replace("foo","\\w{3}(?<!bar)foo","uasVxSucjJKX",[])), 
-?line <<"foo">> = iolist_to_binary(re:replace("foo","\\w{3}(?<!bar)foo","uasVxSucjJKX",[global])), 
-?line <<"barfoo">> = iolist_to_binary(re:replace("barfoo","\\w{3}(?<!bar)foo","u&&Su\\1&YWVvwAftwcE&",[])), 
-?line <<"barfoo">> = iolist_to_binary(re:replace("barfoo","\\w{3}(?<!bar)foo","u&&Su\\1&YWVvwAftwcE&",[global])), 
-?line <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","\\w{3}(?<!bar)foo","IH",[])), 
-?line <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","\\w{3}(?<!bar)foo","IH",[global])), 
-?line <<"fooabarSWfoobar">> = iolist_to_binary(re:replace("fooabar","(?<=(foo)a)bar","&SW\\1&",[])), 
-?line <<"fooabarSWfoobar">> = iolist_to_binary(re:replace("fooabar","(?<=(foo)a)bar","&SW\\1&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo)a)bar","&ShYlKf",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo)a)bar","&ShYlKf",[global])), 
-?line <<"bar">> = iolist_to_binary(re:replace("bar","(?<=(foo)a)bar","Usk\\1PJ&",[])), 
-?line <<"bar">> = iolist_to_binary(re:replace("bar","(?<=(foo)a)bar","Usk\\1PJ&",[global])), 
-?line <<"foobbar">> = iolist_to_binary(re:replace("foobbar","(?<=(foo)a)bar","\\1pXSA",[])), 
-?line <<"foobbar">> = iolist_to_binary(re:replace("foobbar","(?<=(foo)a)bar","\\1pXSA",[global])), 
-?line <<"gWabcqJMuvLrGqnPLJK">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","gW&qJ\\1MuvLrGqnPLJK",[multiline])), 
-?line <<"gWabcqJMuvLrGqnPLJK">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","gW&qJ\\1MuvLrGqnPLJK",[multiline,
-                                                                                                                                                                                                               global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\z","tcIt&YpWtGEy\\1p",[multiline])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\z","tcIt&YpWtGEy\\1p",[multiline,
-                                                                                                                                                                                                                       global])), 
-?line <<"abcM">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","&M",[multiline])), 
-?line <<"abcM">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","&M",[multiline,
-                                                                                                                                                                          global])), 
-?line <<"qqq
+b","(?!\\A)x","TB&e&lCSta",[multiline,global])), 
+    <<"axHTxRqfqP">> = iolist_to_binary(re:replace("ax","(?!\\A)x","&HT&\\1Rq\\1fqP",[multiline])), 
+    <<"axHTxRqfqP">> = iolist_to_binary(re:replace("ax","(?!\\A)x","&HT&\\1Rq\\1fqP",[multiline,
+                                                                                                                                                                                                  global])), 
+    <<"{ab}">> = iolist_to_binary(re:replace("{ab}","\\x0{ab}","nqnNdxgun\\1T",[])), 
+    <<"{ab}">> = iolist_to_binary(re:replace("{ab}","\\x0{ab}","nqnNdxgun\\1T",[global])), 
+    <<"OrUCDJnCTtDo">> = iolist_to_binary(re:replace("CD","(A|B)*?CD","OrU&J\\1nCTtDo",[])), 
+    <<"OrUCDJnCTtDo">> = iolist_to_binary(re:replace("CD","(A|B)*?CD","OrU&J\\1nCTtDo",[global])), 
+    <<"MkLtcbirH">> = iolist_to_binary(re:replace("CD","(A|B)*CD","MkLtcbirH",[])), 
+    <<"MkLtcbirH">> = iolist_to_binary(re:replace("CD","(A|B)*CD","MkLtcbirH",[global])), 
+    <<"ABABrABABomDFFpAABABSfrABGABVAB">> = iolist_to_binary(re:replace("ABABAB","(AB)*?\\1","\\1\\1r&omDFFpA&Sfr\\1G\\1V",[])), 
+    <<"ABABrABABomDFFpAABABSfrABGABVAB">> = iolist_to_binary(re:replace("ABABAB","(AB)*?\\1","\\1\\1r&omDFFpA&Sfr\\1G\\1V",[global])), 
+    <<"NpABABABGmqeABABABABrmlyABABABdq">> = iolist_to_binary(re:replace("ABABAB","(AB)*\\1","Np&Gmqe\\1&rmly&dq",[])), 
+    <<"NpABABABGmqeABABABABrmlyABABABdq">> = iolist_to_binary(re:replace("ABABAB","(AB)*\\1","Np&Gmqe\\1&rmly&dq",[global])), 
+    <<"qRqrQeDLnUtUIooiI">> = iolist_to_binary(re:replace("foo","(?<!bar)foo","q\\1RqrQeDLn\\1UtUIoo\\1iI",[])), 
+    <<"qRqrQeDLnUtUIooiI">> = iolist_to_binary(re:replace("foo","(?<!bar)foo","q\\1RqrQeDLn\\1UtUIoo\\1iI",[global])), 
+    <<"catOdXBXoDHfooHbldUpfood">> = iolist_to_binary(re:replace("catfood","(?<!bar)foo","OdXBXoDH&HbldUp&",[])), 
+    <<"catOdXBXoDHfooHbldUpfood">> = iolist_to_binary(re:replace("catfood","(?<!bar)foo","OdXBXoDH&HbldUp&",[global])), 
+    <<"arDtle">> = iolist_to_binary(re:replace("arfootle","(?<!bar)foo","D",[])), 
+    <<"arDtle">> = iolist_to_binary(re:replace("arfootle","(?<!bar)foo","D",[global])), 
+    <<"rYPYoYugCsh">> = iolist_to_binary(re:replace("rfoosh","(?<!bar)foo","YPYoYug\\1C",[])), 
+    <<"rYPYoYugCsh">> = iolist_to_binary(re:replace("rfoosh","(?<!bar)foo","YPYoYug\\1C",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<!bar)foo","i",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<!bar)foo","i",[global])), 
+    <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<!bar)foo","cbUElrx&&\\1\\1YM\\1aBcUl",[])), 
+    <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<!bar)foo","cbUElrx&&\\1\\1YM\\1aBcUl",[global])), 
+    <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","(?<!bar)foo","saPM\\1\\1OgLT\\1h\\1KWyOtmQ",[])), 
+    <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","(?<!bar)foo","saPM\\1\\1OgLT\\1h\\1KWyOtmQ",[global])), 
+    <<"EPmld">> = iolist_to_binary(re:replace("catfood","\\w{3}(?<!bar)foo","EPml",[])), 
+    <<"EPmld">> = iolist_to_binary(re:replace("catfood","\\w{3}(?<!bar)foo","EPml",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\w{3}(?<!bar)foo","MhJ&dGwUuIb\\1JIoqE",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\w{3}(?<!bar)foo","MhJ&dGwUuIb\\1JIoqE",[global])), 
+    <<"foo">> = iolist_to_binary(re:replace("foo","\\w{3}(?<!bar)foo","&wjHKW&gb",[])), 
+    <<"foo">> = iolist_to_binary(re:replace("foo","\\w{3}(?<!bar)foo","&wjHKW&gb",[global])), 
+    <<"barfoo">> = iolist_to_binary(re:replace("barfoo","\\w{3}(?<!bar)foo","B",[])), 
+    <<"barfoo">> = iolist_to_binary(re:replace("barfoo","\\w{3}(?<!bar)foo","B",[global])), 
+    <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","\\w{3}(?<!bar)foo","Jspqw\\1R\\1ldUs",[])), 
+    <<"towbarfoo">> = iolist_to_binary(re:replace("towbarfoo","\\w{3}(?<!bar)foo","Jspqw\\1R\\1ldUs",[global])), 
+    <<"fooarfooVALbarfooUbfooCrGfoobarhbarlfu">> = iolist_to_binary(re:replace("fooabar","(?<=(foo)a)bar","r\\1VAL&\\1Ub\\1CrG\\1&h&lfu",[])), 
+    <<"fooarfooVALbarfooUbfooCrGfoobarhbarlfu">> = iolist_to_binary(re:replace("fooabar","(?<=(foo)a)bar","r\\1VAL&\\1Ub\\1CrG\\1&h&lfu",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo)a)bar","Xup&&F\\1h\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo)a)bar","Xup&&F\\1h\\1",[global])), 
+    <<"bar">> = iolist_to_binary(re:replace("bar","(?<=(foo)a)bar","IyyUVRu\\1&J&EmI&",[])), 
+    <<"bar">> = iolist_to_binary(re:replace("bar","(?<=(foo)a)bar","IyyUVRu\\1&J&EmI&",[global])), 
+    <<"foobbar">> = iolist_to_binary(re:replace("foobbar","(?<=(foo)a)bar","yUdI",[])), 
+    <<"foobbar">> = iolist_to_binary(re:replace("foobbar","(?<=(foo)a)bar","yUdI",[global])), 
+    <<"TjyabckVlQOnp">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","Tjy&kVlQOnp",[multiline])), 
+    <<"TjyabckVlQOnp">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","Tjy&kVlQOnp",[multiline,
+                                                                                                                                                                                          global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\z","jAW\\1V&Gcxh&iaRsV\\1",[multiline])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Aabc\\z","jAW\\1V&Gcxh&iaRsV\\1",[multiline,
+                                                                                                                                                                                                                                 global])), 
+    <<"xQWabcHT">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","\\1xQW&H\\1T",[multiline])), 
+    <<"xQWabcHT">> = iolist_to_binary(re:replace("abc","\\Aabc\\z","\\1xQW&H\\1T",[multiline,
+                                                                                                                                                                                              global])), 
+    <<"qqq
 abc">> = iolist_to_binary(re:replace("qqq
-abc","\\Aabc\\z","B\\1B\\1fqK\\1nocSHwGCCiM",[multiline])), 
-?line <<"qqq
+abc","\\Aabc\\z","Y\\1YcwSrGNHt&\\1bI&",[multiline])), 
+    <<"qqq
 abc">> = iolist_to_binary(re:replace("qqq
-abc","\\Aabc\\z","B\\1B\\1fqK\\1nocSHwGCCiM",[multiline,global])), 
-?line <<"abc
+abc","\\Aabc\\z","Y\\1YcwSrGNHt&\\1bI&",[multiline,global])), 
+    <<"abc
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","\\Aabc\\z","P",[multiline])), 
-?line <<"abc
+zzz","\\Aabc\\z","hxWEtDjrfttJGQ",[multiline])), 
+    <<"abc
 zzz">> = iolist_to_binary(re:replace("abc
-zzz","\\Aabc\\z","P",[multiline,global])), 
-?line <<"qqq
+zzz","\\Aabc\\z","hxWEtDjrfttJGQ",[multiline,global])), 
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","\\Aabc\\z","\\1adD\\1",[multiline])), 
-?line <<"qqq
+zzz","\\Aabc\\z","\\1AYG&TDth",[multiline])), 
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(re:replace("qqq
 abc
-zzz","\\Aabc\\z","\\1adD\\1",[multiline,global])), 
-?line <<"1U">> = iolist_to_binary(re:replace("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+","U",[])), 
-?line <<"1U">> = iolist_to_binary(re:replace("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+","U",[global])), 
-?line <<"1bJ.875fwFYOodDWXyr.875tm.875000282.875000282">> = iolist_to_binary(re:replace("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+","bJ\\1fwFYOodDWXyr\\1tm&&",[])), 
-?line <<"1bJ.875fwFYOodDWXyr.875tm.875000282.875000282">> = iolist_to_binary(re:replace("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+","bJ\\1fwFYOodDWXyr\\1tm&&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+","e\\1JPFf&",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+","e\\1JPFf&",[global])), 
-?line <<"1.235">> = iolist_to_binary(re:replace("1.235","(?>(\\.\\d\\d[1-9]?))\\d+","yOPhp&Vy&fKXLBmiJx\\1a",[])), 
-?line <<"1.235">> = iolist_to_binary(re:replace("1.235","(?>(\\.\\d\\d[1-9]?))\\d+","yOPhp&Vy&fKXLBmiJx\\1a",[global])), 
-?line <<"partynow is the time for all good men to come to the aid of the partycnow is the time for all good men to come to the aid of the partynow is the time for all good men to come to the aid of the partypartyyecj">> = iolist_to_binary(re:replace("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$","\\1&c&&\\1yecj",[])), 
-?line <<"partynow is the time for all good men to come to the aid of the partycnow is the time for all good men to come to the aid of the partynow is the time for all good men to come to the aid of the partypartyyecj">> = iolist_to_binary(re:replace("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$","\\1&c&&\\1yecj",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^((?>\\w+)|(?>\\s+))*$","\\1u",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^((?>\\w+)|(?>\\s+))*$","\\1u",[global])), 
-?line <<"this is not a line with only words and spaces!">> = iolist_to_binary(re:replace("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$","gH&CX\\1&vnufnGXYAun",[])), 
-?line <<"this is not a line with only words and spaces!">> = iolist_to_binary(re:replace("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$","gH&CX\\1&vnufnGXYAun",[global])), 
-?line <<"K1234512345aH12345a">> = iolist_to_binary(re:replace("12345a","(\\d+)(\\w)","K\\1&H&",[])), 
-?line <<"K1234512345aH12345a">> = iolist_to_binary(re:replace("12345a","(\\d+)(\\w)","K\\1&H&",[global])), 
-?line <<"IdNK+">> = iolist_to_binary(re:replace("12345+","(\\d+)(\\w)","IdNK",[])), 
-?line <<"IdNK+">> = iolist_to_binary(re:replace("12345+","(\\d+)(\\w)","IdNK",[global])), 
-?line <<"jvjjhmthsl">> = iolist_to_binary(re:replace("12345a","((?>\\d+))(\\w)","jvjjhmthsl",[])), 
-?line <<"jvjjhmthsl">> = iolist_to_binary(re:replace("12345a","((?>\\d+))(\\w)","jvjjhmthsl",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?>\\d+))(\\w)","eK&NTn&\\1T",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?>\\d+))(\\w)","eK&NTn&\\1T",[global])), 
-?line <<"12345+">> = iolist_to_binary(re:replace("12345+","((?>\\d+))(\\w)","&&TXSquRgMqkDs&K&",[])), 
-?line <<"12345+">> = iolist_to_binary(re:replace("12345+","((?>\\d+))(\\w)","&&TXSquRgMqkDs&K&",[global])), 
-?line <<"NeYcvQCaaabtbOkx">> = iolist_to_binary(re:replace("aaab","(?>a+)b","NeYcvQC&tbOkx\\1",[])), 
-?line <<"NeYcvQCaaabtbOkx">> = iolist_to_binary(re:replace("aaab","(?>a+)b","NeYcvQC&tbOkx\\1",[global])), 
-?line <<"aaabbaaabFOSaaabKKtRUNaaabLDTCH">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","&b&FOS&KKtRUN\\1LDTCH",[])), 
-?line <<"aaabbaaabFOSaaabKKtRUNaaabLDTCH">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","&b&FOS&KKtRUN\\1LDTCH",[global])), 
-?line <<"xaaabaaabaaaiaaabCaGaaaaaabaaaaaaaaabaaabaaaF">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","x\\1b&\\1i&CaG\\1&\\1\\1&&\\1F",[])), 
-?line <<"xaaabaaabaaaiaaabCaGaaaaaabaaaaaaaaabaaabaaaF">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","x\\1b&\\1i&CaG\\1&\\1\\1&&\\1F",[global])), 
-?line <<"aaaLDSAYvgtbbbotccc">> = iolist_to_binary(re:replace("aaabbbccc","(?>b)+","LDSAYvgt&ot",[])), 
-?line <<"aaaLDSAYvgtbbbotccc">> = iolist_to_binary(re:replace("aaabbbccc","(?>b)+","LDSAYvgt&ot",[global])), 
-?line <<"ABQFhQjYaaabbbbcAcccd">> = iolist_to_binary(re:replace("aaabbbbccccd","(?>a+|b+|c+)*c","ABQ\\1Fh\\1QjY&A",[])), 
-?line <<"ABQFhQjYaaabbbbcAABQFhQjYcAABQFhQjYcAABQFhQjYcAd">> = iolist_to_binary(re:replace("aaabbbbccccd","(?>a+|b+|c+)*c","ABQ\\1Fh\\1QjY&A",[global])), 
-?line <<"((xiabc(ade)ufh()()xpJf">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","\\1i&pJf",[])), 
-?line <<"((xiabc(ade)ufh()()xpJf">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","\\1i&pJf",[global])), 
-?line <<"NBF">> = iolist_to_binary(re:replace("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","NBF",[])), 
-?line <<"NBF">> = iolist_to_binary(re:replace("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","NBF",[global])), 
-?line <<"(abc(def)xyz)AFLTv">> = iolist_to_binary(re:replace("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","&AFLTv",[])), 
-?line <<"(abc(def)xyz)AFLTv">> = iolist_to_binary(re:replace("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","&AFLTv",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)","P\\1OC",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)","P\\1OC",[global])), 
-?line <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)","u\\1\\1H\\1TOt\\1fVI&X",[])), 
-?line <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)","u\\1\\1H\\1TOt\\1fVI&X",[global])), 
-?line <<"E">> = iolist_to_binary(re:replace("ab","a(?-i)b","E",[caseless])), 
-?line <<"E">> = iolist_to_binary(re:replace("ab","a(?-i)b","E",[caseless,
-                                                                                                                                                               global])), 
-?line <<"hAboOovpk">> = iolist_to_binary(re:replace("Ab","a(?-i)b","h&oOovpk",[caseless])), 
-?line <<"hAboOovpk">> = iolist_to_binary(re:replace("Ab","a(?-i)b","h&oOovpk",[caseless,
-                                                                                                                                                                              global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?-i)b","liOu",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?-i)b","liOu",[caseless,
-                                                                                                                                                                                       global])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","a(?-i)b","P",[caseless])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","a(?-i)b","P",[caseless,
-                                                                                                                                                               global])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","a(?-i)b","GdSF&e&",[caseless])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","a(?-i)b","GdSF&e&",[caseless,
-                                                                                                                                                                             global])), 
-?line <<"a bcd eSPWrUhOwa">> = iolist_to_binary(re:replace("a bcd e","(a (?x)b c)d e","&SPWrUhOwa",[])), 
-?line <<"a bcd eSPWrUhOwa">> = iolist_to_binary(re:replace("a bcd e","(a (?x)b c)d e","&SPWrUhOwa",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a (?x)b c)d e","IgDGvOUoEIi",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a (?x)b c)d e","IgDGvOUoEIi",[global])), 
-?line <<"a b cd e">> = iolist_to_binary(re:replace("a b cd e","(a (?x)b c)d e","C\\1Lora&uj\\1nePq",[])), 
-?line <<"a b cd e">> = iolist_to_binary(re:replace("a b cd e","(a (?x)b c)d e","C\\1Lora&uj\\1nePq",[global])), 
-?line <<"abcd e">> = iolist_to_binary(re:replace("abcd e","(a (?x)b c)d e","M",[])), 
-?line <<"abcd e">> = iolist_to_binary(re:replace("abcd e","(a (?x)b c)d e","M",[global])), 
-?line <<"a bcde">> = iolist_to_binary(re:replace("a bcde","(a (?x)b c)d e","mNwUc&",[])), 
-?line <<"a bcde">> = iolist_to_binary(re:replace("a bcde","(a (?x)b c)d e","mNwUc&",[global])), 
-?line <<"a bcde fTra bcde fnDatbuPn">> = iolist_to_binary(re:replace("a bcde f","(a b(?x)c d (?-x)e f)","&Tr\\1nDatbuPn",[])), 
-?line <<"a bcde fTra bcde fnDatbuPn">> = iolist_to_binary(re:replace("a bcde f","(a b(?x)c d (?-x)e f)","&Tr\\1nDatbuPn",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a b(?x)c d (?-x)e f)","\\1AXE&qrGnJBeg",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a b(?x)c d (?-x)e f)","\\1AXE&qrGnJBeg",[global])), 
-?line <<"abcdef">> = iolist_to_binary(re:replace("abcdef","(a b(?x)c d (?-x)e f)","YXaHuSXEMrxHLIUXuNu\\1",[])), 
-?line <<"abcdef">> = iolist_to_binary(re:replace("abcdef","(a b(?x)c d (?-x)e f)","YXaHuSXEMrxHLIUXuNu\\1",[global])), 
-?line <<"AmT">> = iolist_to_binary(re:replace("abc","(a(?i)b)c","AmT",[])), 
-?line <<"AmT">> = iolist_to_binary(re:replace("abc","(a(?i)b)c","AmT",[global])), 
-?line <<"CYjrwVi">> = iolist_to_binary(re:replace("aBc","(a(?i)b)c","CYjrwVi",[])), 
-?line <<"CYjrwVi">> = iolist_to_binary(re:replace("aBc","(a(?i)b)c","CYjrwVi",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)b)c","STYFgfjhE&dcc",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)b)c","STYFgfjhE&dcc",[global])), 
-?line <<"abC">> = iolist_to_binary(re:replace("abC","(a(?i)b)c","BAcmfc\\1fAfr&o",[])), 
-?line <<"abC">> = iolist_to_binary(re:replace("abC","(a(?i)b)c","BAcmfc\\1fAfr&o",[global])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","(a(?i)b)c","NGkAgBCJxbCgR",[])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","(a(?i)b)c","NGkAgBCJxbCgR",[global])), 
-?line <<"Abc">> = iolist_to_binary(re:replace("Abc","(a(?i)b)c","aS&kKYGwkOB&YhadhLX",[])), 
-?line <<"Abc">> = iolist_to_binary(re:replace("Abc","(a(?i)b)c","aS&kKYGwkOB&YhadhLX",[global])), 
-?line <<"ABc">> = iolist_to_binary(re:replace("ABc","(a(?i)b)c","hP\\1RiAIeDp",[])), 
-?line <<"ABc">> = iolist_to_binary(re:replace("ABc","(a(?i)b)c","hP\\1RiAIeDp",[global])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","(a(?i)b)c","Jj&j\\1&I&\\1&CR\\1qDG",[])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","(a(?i)b)c","Jj&j\\1&I&\\1&CR\\1qDG",[global])), 
-?line <<"AbC">> = iolist_to_binary(re:replace("AbC","(a(?i)b)c","\\1h\\1XCNuqcxa",[])), 
-?line <<"AbC">> = iolist_to_binary(re:replace("AbC","(a(?i)b)c","\\1h\\1XCNuqcxa",[global])), 
-?line <<"hsDxrqJjHQabc">> = iolist_to_binary(re:replace("abc","a(?i:b)c","hsDxrqJjHQ&",[])), 
-?line <<"hsDxrqJjHQabc">> = iolist_to_binary(re:replace("abc","a(?i:b)c","hsDxrqJjHQ&",[global])), 
-?line <<"QltXULOSWaBcFaBcS">> = iolist_to_binary(re:replace("aBc","a(?i:b)c","Qlt\\1XU\\1L\\1OSW&F&S",[])), 
-?line <<"QltXULOSWaBcFaBcS">> = iolist_to_binary(re:replace("aBc","a(?i:b)c","Qlt\\1XU\\1L\\1OSW&F&S",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)c","owyoniUsut",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)c","owyoniUsut",[global])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","a(?i:b)c","unB&TlphDWAD",[])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","a(?i:b)c","unB&TlphDWAD",[global])), 
-?line <<"abC">> = iolist_to_binary(re:replace("abC","a(?i:b)c","\\1XaX&kAbe&\\1V",[])), 
-?line <<"abC">> = iolist_to_binary(re:replace("abC","a(?i:b)c","\\1XaX&kAbe&\\1V",[global])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)c","IY\\1aQ&tM\\1",[])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)c","IY\\1aQ&tM\\1",[global])), 
-?line <<"aBcOHQouBOaBc">> = iolist_to_binary(re:replace("aBc","a(?i:b)*c","&O\\1HQo\\1uBO&",[])), 
-?line <<"aBcOHQouBOaBc">> = iolist_to_binary(re:replace("aBc","a(?i:b)*c","&O\\1HQo\\1uBO&",[global])), 
-?line <<"lvjhpFaBBceaBBciWQNaBBcr">> = iolist_to_binary(re:replace("aBBc","a(?i:b)*c","lvjhpF&e&i\\1WQN\\1&r",[])), 
-?line <<"lvjhpFaBBceaBBciWQNaBBcr">> = iolist_to_binary(re:replace("aBBc","a(?i:b)*c","lvjhpF&e&i\\1WQN\\1&r",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)*c","\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)*c","\\1",[global])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)*c","OaR&&ytX",[])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)*c","OaR&&ytX",[global])), 
-?line <<"aBBC">> = iolist_to_binary(re:replace("aBBC","a(?i:b)*c","Su",[])), 
-?line <<"aBBC">> = iolist_to_binary(re:replace("aBBC","a(?i:b)*c","Su",[global])), 
-?line <<"abcdabcdalFfabcdsPxC">> = iolist_to_binary(re:replace("abcd","a(?=b(?i)c)\\w\\wd","&&alFf&sPxC",[])), 
-?line <<"abcdabcdalFfabcdsPxC">> = iolist_to_binary(re:replace("abcd","a(?=b(?i)c)\\w\\wd","&&alFf&sPxC",[global])), 
-?line <<"hNuQEFvcSEabCdQTlwEabCd">> = iolist_to_binary(re:replace("abCd","a(?=b(?i)c)\\w\\wd","hNuQEFvcSE\\1&QTlwE&",[])), 
-?line <<"hNuQEFvcSEabCdQTlwEabCd">> = iolist_to_binary(re:replace("abCd","a(?=b(?i)c)\\w\\wd","hNuQEFvcSE\\1&QTlwE&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?=b(?i)c)\\w\\wd","YLT",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?=b(?i)c)\\w\\wd","YLT",[global])), 
-?line <<"aBCd">> = iolist_to_binary(re:replace("aBCd","a(?=b(?i)c)\\w\\wd","u",[])), 
-?line <<"aBCd">> = iolist_to_binary(re:replace("aBCd","a(?=b(?i)c)\\w\\wd","u",[global])), 
-?line <<"abcD">> = iolist_to_binary(re:replace("abcD","a(?=b(?i)c)\\w\\wd","PIaL\\1rCHujWQjtBluw",[])), 
-?line <<"abcD">> = iolist_to_binary(re:replace("abcD","a(?=b(?i)c)\\w\\wd","PIaL\\1rCHujWQjtBluw",[global])), 
-?line <<"JklClgvcUHdcbpmore than million">> = iolist_to_binary(re:replace("more than million","(?s-i:more.*than).*million","JklCl\\1gvc\\1UHdcbp&",[caseless])), 
-?line <<"JklClgvcUHdcbpmore than million">> = iolist_to_binary(re:replace("more than million","(?s-i:more.*than).*million","JklCl\\1gvc\\1UHdcbp&",[caseless,
-                                                                                                                                                                                                                                                                              global])), 
-?line <<"RaiCEcYVVcTj">> = iolist_to_binary(re:replace("more than MILLION","(?s-i:more.*than).*million","R\\1\\1\\1aiCEcYVVcTj",[caseless])), 
-?line <<"RaiCEcYVVcTj">> = iolist_to_binary(re:replace("more than MILLION","(?s-i:more.*than).*million","R\\1\\1\\1aiCEcYVVcTj",[caseless,
-                                                                                                                                                                                                                                                                              global])), 
-?line <<"AGtSe">> = iolist_to_binary(re:replace("more 
- than Million","(?s-i:more.*than).*million","AGtSe",[caseless])), 
-?line <<"AGtSe">> = iolist_to_binary(re:replace("more 
- than Million","(?s-i:more.*than).*million","AGtSe",[caseless,global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s-i:more.*than).*million","vIAbYe&Vw\\1&VD",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s-i:more.*than).*million","vIAbYe&Vw\\1&VD",[caseless,
-                                                                                                                                                                                                                                                      global])), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?s-i:more.*than).*million","LhBYPjwD\\1kJ\\1",[caseless])), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?s-i:more.*than).*million","LhBYPjwD\\1kJ\\1",[caseless,
-                                                                                                                                                                                                                                                                   global])), 
-?line <<"more 
+zzz","\\Aabc\\z","\\1AYG&TDth",[multiline,global])), 
+    <<"1D">> = iolist_to_binary(re:replace("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+","D",[])), 
+    <<"1D">> = iolist_to_binary(re:replace("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+","D",[global])), 
+    <<"1.875Vkl.875egB.875000282cg">> = iolist_to_binary(re:replace("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+","\\1Vkl\\1egB&cg",[])), 
+    <<"1.875Vkl.875egB.875000282cg">> = iolist_to_binary(re:replace("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+","\\1Vkl\\1egB&cg",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+","d&&VkB&QYebMC",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+","d&&VkB&QYebMC",[global])), 
+    <<"1.235">> = iolist_to_binary(re:replace("1.235","(?>(\\.\\d\\d[1-9]?))\\d+","i\\1S\\1\\1&Yq&Pg&J&\\1",[])), 
+    <<"1.235">> = iolist_to_binary(re:replace("1.235","(?>(\\.\\d\\d[1-9]?))\\d+","i\\1S\\1\\1&Yq&Pg&J&\\1",[global])), 
+    <<"cjqYdkkpartyparty">> = iolist_to_binary(re:replace("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$","cjqYdkk\\1\\1",[])), 
+    <<"cjqYdkkpartyparty">> = iolist_to_binary(re:replace("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$","cjqYdkk\\1\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^((?>\\w+)|(?>\\s+))*$","BK",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^((?>\\w+)|(?>\\s+))*$","BK",[global])), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(re:replace("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$","sakHEC\\1tyC",[])), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(re:replace("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$","sakHEC\\1tyC",[global])), 
+    <<"a12345ax12345a">> = iolist_to_binary(re:replace("12345a","(\\d+)(\\w)","a&x&",[])), 
+    <<"a12345ax12345a">> = iolist_to_binary(re:replace("12345a","(\\d+)(\\w)","a&x&",[global])), 
+    <<"12345Mx1234LDmSq+">> = iolist_to_binary(re:replace("12345+","(\\d+)(\\w)","&Mx\\1LDmSq",[])), 
+    <<"12345Mx1234LDmSq+">> = iolist_to_binary(re:replace("12345+","(\\d+)(\\w)","&Mx\\1LDmSq",[global])), 
+    <<"kx12345GkJIBKkR12345aIDW12345ar">> = iolist_to_binary(re:replace("12345a","((?>\\d+))(\\w)","kx\\1GkJIBKkR&IDW&r",[])), 
+    <<"kx12345GkJIBKkR12345aIDW12345ar">> = iolist_to_binary(re:replace("12345a","((?>\\d+))(\\w)","kx\\1GkJIBKkR&IDW&r",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?>\\d+))(\\w)","AFie\\1JMiAGf&BhuHi\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?>\\d+))(\\w)","AFie\\1JMiAGf&BhuHi\\1",[global])), 
+    <<"12345+">> = iolist_to_binary(re:replace("12345+","((?>\\d+))(\\w)","l&&bFVdpjaGHV",[])), 
+    <<"12345+">> = iolist_to_binary(re:replace("12345+","((?>\\d+))(\\w)","l&&bFVdpjaGHV",[global])), 
+    <<"EqHtaaabaaabaaabSwdBiGUaaab">> = iolist_to_binary(re:replace("aaab","(?>a+)b","EqHt&&&SwdBiGU&",[])), 
+    <<"EqHtaaabaaabaaabSwdBiGUaaab">> = iolist_to_binary(re:replace("aaab","(?>a+)b","EqHt&&&SwdBiGU&",[global])), 
+    <<"SfjgLalqtcaaabaaablpXe">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","SfjgLalqtc\\1&lpXe",[])), 
+    <<"SfjgLalqtcaaabaaablpXe">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","SfjgLalqtc\\1&lpXe",[global])), 
+    ok.
+run12() ->
+    <<"uUMJaaabSIfpB">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","uUMJ&SIfpB",[])), 
+    <<"uUMJaaabSIfpB">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","uUMJ&SIfpB",[global])), 
+    <<"aaaYgHODtKiOcNErSSbbbccc">> = iolist_to_binary(re:replace("aaabbbccc","(?>b)+","YgHODtKiOcNErSS&\\1",[])), 
+    <<"aaaYgHODtKiOcNErSSbbbccc">> = iolist_to_binary(re:replace("aaabbbccc","(?>b)+","YgHODtKiOcNErSS&\\1",[global])), 
+    <<"oaaabbbbcaaabbbbcEpdElkPiPeaeLnncccd">> = iolist_to_binary(re:replace("aaabbbbccccd","(?>a+|b+|c+)*c","o\\1&&EpdEl\\1kPiPeaeLnn",[])), 
+    <<"oaaabbbbcaaabbbbcEpdElkPiPeaeLnnoccEpdElkPiPeaeLnnoccEpdElkPiPeaeLnnoccEpdElkPiPeaeLnnd">> = iolist_to_binary(re:replace("aaabbbbccccd","(?>a+|b+|c+)*c","o\\1&&EpdEl\\1kPiPeaeLnn",[global])), 
+    <<"((HxYTsih">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","HxYTsih",[])), 
+    <<"((HxYTsih">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","HxYTsih",[global])), 
+    <<"iJnuXdUjqgsabcM(abc)OUgSEW">> = iolist_to_binary(re:replace("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","iJnuXdUjqgs\\1M&OUgSEW",[])), 
+    <<"iJnuXdUjqgsabcM(abc)OUgSEW">> = iolist_to_binary(re:replace("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","iJnuXdUjqgs\\1M&OUgSEW",[global])), 
+    <<"oxyzdq">> = iolist_to_binary(re:replace("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","o\\1dq",[])), 
+    <<"oxyzdq">> = iolist_to_binary(re:replace("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)","o\\1dq",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)","RViX",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)","RViX",[global])), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)","H",[])), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)","H",[global])), 
+    <<"tbhUMBhabLFA">> = iolist_to_binary(re:replace("ab","a(?-i)b","tbhUMBh&\\1LFA",[caseless])), 
+    <<"tbhUMBhabLFA">> = iolist_to_binary(re:replace("ab","a(?-i)b","tbhUMBh&\\1LFA",[caseless,
+                                                                                                                                                                                         global])), 
+    <<"QUAETVEmTTESUWK">> = iolist_to_binary(re:replace("Ab","a(?-i)b","QUAETVEmTT\\1\\1ESUWK",[caseless])), 
+    <<"QUAETVEmTTESUWK">> = iolist_to_binary(re:replace("Ab","a(?-i)b","QUAETVEmTT\\1\\1ESUWK",[caseless,
+                                                                                                                                                                                                       global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?-i)b","\\1UHB",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?-i)b","\\1UHB",[caseless,
+                                                                                                                                                                                          global])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","a(?-i)b","\\1\\1tHVtVAphgcPH",[caseless])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","a(?-i)b","\\1\\1tHVtVAphgcPH",[caseless,
+                                                                                                                                                                                                 global])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","a(?-i)b","EHcIhNYa\\1KSgqWOK",[caseless])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","a(?-i)b","EHcIhNYa\\1KSgqWOK",[caseless,
+                                                                                                                                                                                                global])), 
+    <<"FILLIygQ">> = iolist_to_binary(re:replace("a bcd e","(a (?x)b c)d e","FILLIygQ",[])), 
+    <<"FILLIygQ">> = iolist_to_binary(re:replace("a bcd e","(a (?x)b c)d e","FILLIygQ",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a (?x)b c)d e","wJGN&cKBOuESq\\1&Wj",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a (?x)b c)d e","wJGN&cKBOuESq\\1&Wj",[global])), 
+    <<"a b cd e">> = iolist_to_binary(re:replace("a b cd e","(a (?x)b c)d e","A\\1AwoRg&BJXQG",[])), 
+    <<"a b cd e">> = iolist_to_binary(re:replace("a b cd e","(a (?x)b c)d e","A\\1AwoRg&BJXQG",[global])), 
+    <<"abcd e">> = iolist_to_binary(re:replace("abcd e","(a (?x)b c)d e","u",[])), 
+    <<"abcd e">> = iolist_to_binary(re:replace("abcd e","(a (?x)b c)d e","u",[global])), 
+    <<"a bcde">> = iolist_to_binary(re:replace("a bcde","(a (?x)b c)d e","oNi\\1yapjj\\1GmPvu\\1Y\\1qv",[])), 
+    <<"a bcde">> = iolist_to_binary(re:replace("a bcde","(a (?x)b c)d e","oNi\\1yapjj\\1GmPvu\\1Y\\1qv",[global])), 
+    <<"Aa bcde fa bcde faa bcde fEL">> = iolist_to_binary(re:replace("a bcde f","(a b(?x)c d (?-x)e f)","A&&a&EL",[])), 
+    <<"Aa bcde fa bcde faa bcde fEL">> = iolist_to_binary(re:replace("a bcde f","(a b(?x)c d (?-x)e f)","A&&a&EL",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a b(?x)c d (?-x)e f)","tNNP\\1V&C",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a b(?x)c d (?-x)e f)","tNNP\\1V&C",[global])), 
+    <<"abcdef">> = iolist_to_binary(re:replace("abcdef","(a b(?x)c d (?-x)e f)","ty&TPg&J\\1hrKvQIX\\1",[])), 
+    <<"abcdef">> = iolist_to_binary(re:replace("abcdef","(a b(?x)c d (?-x)e f)","ty&TPg&J\\1hrKvQIX\\1",[global])), 
+    <<"Bfe">> = iolist_to_binary(re:replace("abc","(a(?i)b)c","Bfe",[])), 
+    <<"Bfe">> = iolist_to_binary(re:replace("abc","(a(?i)b)c","Bfe",[global])), 
+    <<"aBaBeoqaBaBdaIDJFJSKhel">> = iolist_to_binary(re:replace("aBc","(a(?i)b)c","\\1\\1eoq\\1\\1daIDJFJSKhel",[])), 
+    <<"aBaBeoqaBaBdaIDJFJSKhel">> = iolist_to_binary(re:replace("aBc","(a(?i)b)c","\\1\\1eoq\\1\\1daIDJFJSKhel",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)b)c","RRCuLD&CCSP&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)b)c","RRCuLD&CCSP&",[global])), 
+    <<"abC">> = iolist_to_binary(re:replace("abC","(a(?i)b)c","&YVGhj",[])), 
+    <<"abC">> = iolist_to_binary(re:replace("abC","(a(?i)b)c","&YVGhj",[global])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","(a(?i)b)c","&\\1ABy\\1Tud",[])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","(a(?i)b)c","&\\1ABy\\1Tud",[global])), 
+    <<"Abc">> = iolist_to_binary(re:replace("Abc","(a(?i)b)c","vHc&EssOdEtsm",[])), 
+    <<"Abc">> = iolist_to_binary(re:replace("Abc","(a(?i)b)c","vHc&EssOdEtsm",[global])), 
+    <<"ABc">> = iolist_to_binary(re:replace("ABc","(a(?i)b)c","&&O",[])), 
+    <<"ABc">> = iolist_to_binary(re:replace("ABc","(a(?i)b)c","&&O",[global])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","(a(?i)b)c","&&&G\\1GLMkRej\\1y\\1aOQ",[])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","(a(?i)b)c","&&&G\\1GLMkRej\\1y\\1aOQ",[global])), 
+    <<"AbC">> = iolist_to_binary(re:replace("AbC","(a(?i)b)c","ajN\\1emNFkTh&UCTlp&Y",[])), 
+    <<"AbC">> = iolist_to_binary(re:replace("AbC","(a(?i)b)c","ajN\\1emNFkTh&UCTlp&Y",[global])), 
+    <<"fabcabcccGlcVpJl">> = iolist_to_binary(re:replace("abc","a(?i:b)c","f&&ccGlcVpJl",[])), 
+    <<"fabcabcccGlcVpJl">> = iolist_to_binary(re:replace("abc","a(?i:b)c","f&&ccGlcVpJl",[global])), 
+    <<"NeHDaBcCVyaBcpFA">> = iolist_to_binary(re:replace("aBc","a(?i:b)c","Ne\\1\\1\\1HD&C\\1Vy&pFA",[])), 
+    <<"NeHDaBcCVyaBcpFA">> = iolist_to_binary(re:replace("aBc","a(?i:b)c","Ne\\1\\1\\1HD&C\\1Vy&pFA",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)c","Sqq",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)c","Sqq",[global])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","a(?i:b)c","&FRMp\\1nIrrC\\1IVSckPvd",[])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","a(?i:b)c","&FRMp\\1nIrrC\\1IVSckPvd",[global])), 
+    <<"abC">> = iolist_to_binary(re:replace("abC","a(?i:b)c","x\\1WM&dj&&KIBo",[])), 
+    <<"abC">> = iolist_to_binary(re:replace("abC","a(?i:b)c","x\\1WM&dj&&KIBo",[global])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)c","XiKEHtEtj",[])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)c","XiKEHtEtj",[global])), 
+    <<"SjNSaBcGWaBcwcaBcTf">> = iolist_to_binary(re:replace("aBc","a(?i:b)*c","\\1\\1SjNS&GW&wc&Tf",[])), 
+    <<"SjNSaBcGWaBcwcaBcTf">> = iolist_to_binary(re:replace("aBc","a(?i:b)*c","\\1\\1SjNS&GW&wc&Tf",[global])), 
+    <<"rOaBBckjJDolGaBBcie">> = iolist_to_binary(re:replace("aBBc","a(?i:b)*c","rO&kjJDolG&\\1ie",[])), 
+    <<"rOaBBckjJDolGaBBcie">> = iolist_to_binary(re:replace("aBBc","a(?i:b)*c","rO&kjJDolG&\\1ie",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)*c","rnHfd\\1uJBJn",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?i:b)*c","rnHfd\\1uJBJn",[global])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)*c","T",[])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","a(?i:b)*c","T",[global])), 
+    <<"aBBC">> = iolist_to_binary(re:replace("aBBC","a(?i:b)*c","qC&IV\\1WPwD&&raPOEJG",[])), 
+    <<"aBBC">> = iolist_to_binary(re:replace("aBBC","a(?i:b)*c","qC&IV\\1WPwD&&raPOEJG",[global])), 
+    <<"fxbDabcdcebhuXknd">> = iolist_to_binary(re:replace("abcd","a(?=b(?i)c)\\w\\wd","fxbD&cebhuX\\1knd",[])), 
+    <<"fxbDabcdcebhuXknd">> = iolist_to_binary(re:replace("abcd","a(?=b(?i)c)\\w\\wd","fxbD&cebhuX\\1knd",[global])), 
+    <<"hmNjfiwabCdOns">> = iolist_to_binary(re:replace("abCd","a(?=b(?i)c)\\w\\wd","hmN\\1jfiw&On\\1s",[])), 
+    <<"hmNjfiwabCdOns">> = iolist_to_binary(re:replace("abCd","a(?=b(?i)c)\\w\\wd","hmN\\1jfiw&On\\1s",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?=b(?i)c)\\w\\wd","l",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?=b(?i)c)\\w\\wd","l",[global])), 
+    <<"aBCd">> = iolist_to_binary(re:replace("aBCd","a(?=b(?i)c)\\w\\wd","QVfGTQBraI&PoV&&B\\1B",[])), 
+    <<"aBCd">> = iolist_to_binary(re:replace("aBCd","a(?=b(?i)c)\\w\\wd","QVfGTQBraI&PoV&&B\\1B",[global])), 
+    <<"abcD">> = iolist_to_binary(re:replace("abcD","a(?=b(?i)c)\\w\\wd","WTVxdU\\1Ql&Ori\\1DCqn&",[])), 
+    <<"abcD">> = iolist_to_binary(re:replace("abcD","a(?=b(?i)c)\\w\\wd","WTVxdU\\1Ql&Ori\\1DCqn&",[global])), 
+    <<"yHdfkVmore than millionmore than millione">> = iolist_to_binary(re:replace("more than million","(?s-i:more.*than).*million","yHd\\1fkV&&e\\1",[caseless])), 
+    <<"yHdfkVmore than millionmore than millione">> = iolist_to_binary(re:replace("more than million","(?s-i:more.*than).*million","yHd\\1fkV&&e\\1",[caseless,
+                                                                                                                                                                                                                                                                 global])), 
+    <<"mQsFkPLr">> = iolist_to_binary(re:replace("more than MILLION","(?s-i:more.*than).*million","mQsFkPLr",[caseless])), 
+    <<"mQsFkPLr">> = iolist_to_binary(re:replace("more than MILLION","(?s-i:more.*than).*million","mQsFkPLr",[caseless,
+                                                                                                                                                                                                                                               global])), 
+    <<"mvDmore 
+ than MillionmVTJEmore 
+ than MillionTJNmore 
+ than MillionLwu">> = iolist_to_binary(re:replace("more 
+ than Million","(?s-i:more.*than).*million","mvD&mVTJE&TJN&Lwu",[caseless])), 
+    <<"mvDmore 
+ than MillionmVTJEmore 
+ than MillionTJNmore 
+ than MillionLwu">> = iolist_to_binary(re:replace("more 
+ than Million","(?s-i:more.*than).*million","mvD&mVTJE&TJN&Lwu",[caseless,
+                                                                      global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s-i:more.*than).*million","t\\1vYtKJq&frCR\\1",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?s-i:more.*than).*million","t\\1vYtKJq&frCR\\1",[caseless,
+                                                                                                                                                                                                                                                          global])), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?s-i:more.*than).*million","\\1gn&G\\1&",[caseless])), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?s-i:more.*than).*million","\\1gn&G\\1&",[caseless,
+                                                                                                                                                                                                                                                         global])), 
+    <<"more 
  than 
  million">> = iolist_to_binary(re:replace("more 
  than 
- million","(?s-i:more.*than).*million","SSp\\1ttOwEGO&H",[caseless])), 
-?line <<"more 
+ million","(?s-i:more.*than).*million","WmlNcmK\\1\\1DMpX\\1WToOHF",[caseless])), 
+    <<"more 
  than 
  million">> = iolist_to_binary(re:replace("more 
  than 
- million","(?s-i:more.*than).*million","SSp\\1ttOwEGO&H",[caseless,
-                                                                 global])), 
-?line <<"dmore than millionhFexWTaTmclBHK">> = iolist_to_binary(re:replace("more than million","(?:(?s-i)more.*than).*million","d&hFexWTaT\\1\\1mc\\1\\1lBHK",[caseless])), 
-?line <<"dmore than millionhFexWTaTmclBHK">> = iolist_to_binary(re:replace("more than million","(?:(?s-i)more.*than).*million","d&hFexWTaT\\1\\1mc\\1\\1lBHK",[caseless,
-                                                                                                                                                                                                                                                                                                    global])), 
-?line <<"wcVAikDmore than MILLIONFsmore than MILLIONIceKiuDm">> = iolist_to_binary(re:replace("more than MILLION","(?:(?s-i)more.*than).*million","wcVAikD&Fs&Ice\\1KiuDm",[caseless])), 
-?line <<"wcVAikDmore than MILLIONFsmore than MILLIONIceKiuDm">> = iolist_to_binary(re:replace("more than MILLION","(?:(?s-i)more.*than).*million","wcVAikD&Fs&Ice\\1KiuDm",[caseless,
-                                                                                                                                                                                                                                                                                      global])), 
-?line <<"BMxnsX">> = iolist_to_binary(re:replace("more 
- than Million","(?:(?s-i)more.*than).*million","BMx\\1nsX",[caseless])), 
-?line <<"BMxnsX">> = iolist_to_binary(re:replace("more 
- than Million","(?:(?s-i)more.*than).*million","BMx\\1nsX",[caseless,
-                                                                   global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?s-i)more.*than).*million","e\\1KeC\\1LrMA",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?s-i)more.*than).*million","e\\1KeC\\1LrMA",[caseless,
-                                                                                                                                                                                                                                                         global])), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?:(?s-i)more.*than).*million","Oo&U&\\1O\\1royLyh\\1Uj\\1&e",[caseless])), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?:(?s-i)more.*than).*million","Oo&U&\\1O\\1royLyh\\1Uj\\1&e",[caseless,
-                                                                                                                                                                                                                                                                                                      global])), 
-?line <<"more 
+ million","(?s-i:more.*than).*million","WmlNcmK\\1\\1DMpX\\1WToOHF",[caseless,
+                                                                                global])), 
+    <<"psmore than millionTuKupIvfmRjB">> = iolist_to_binary(re:replace("more than million","(?:(?s-i)more.*than).*million","ps&T\\1uKupIvfmRjB",[caseless])), 
+    <<"psmore than millionTuKupIvfmRjB">> = iolist_to_binary(re:replace("more than million","(?:(?s-i)more.*than).*million","ps&T\\1uKupIvfmRjB",[caseless,
+                                                                                                                                                                                                                                                                           global])), 
+    <<"IhKcRCpQge">> = iolist_to_binary(re:replace("more than MILLION","(?:(?s-i)more.*than).*million","I\\1\\1hKcRCpQg\\1e",[caseless])), 
+    <<"IhKcRCpQge">> = iolist_to_binary(re:replace("more than MILLION","(?:(?s-i)more.*than).*million","I\\1\\1hKcRCpQg\\1e",[caseless,
+                                                                                                                                                                                                                                                                              global])), 
+    <<"more 
+ than MillionOISUnAOTGvtRakU">> = iolist_to_binary(re:replace("more 
+ than Million","(?:(?s-i)more.*than).*million","&OISU\\1nAOTGvtRakU\\1",[caseless])), 
+    <<"more 
+ than MillionOISUnAOTGvtRakU">> = iolist_to_binary(re:replace("more 
+ than Million","(?:(?s-i)more.*than).*million","&OISU\\1nAOTGvtRakU\\1",[caseless,
+                                                                                  global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?s-i)more.*than).*million","TNips\\1&J\\1mqnbuyC",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?s-i)more.*than).*million","TNips\\1&J\\1mqnbuyC",[caseless,
+                                                                                                                                                                                                                                                                    global])), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?:(?s-i)more.*than).*million","\\1qCci&VKLJ&QtwPOr",[caseless])), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(re:replace("MORE THAN MILLION","(?:(?s-i)more.*than).*million","\\1qCci&VKLJ&QtwPOr",[caseless,
+                                                                                                                                                                                                                                                                              global])), 
+    <<"more 
  than 
  million">> = iolist_to_binary(re:replace("more 
  than 
- million","(?:(?s-i)more.*than).*million","rsd\\1UhwpU\\1&S",[caseless])), 
-?line <<"more 
+ million","(?:(?s-i)more.*than).*million","N",[caseless])), 
+    <<"more 
  than 
  million">> = iolist_to_binary(re:replace("more 
  than 
- million","(?:(?s-i)more.*than).*million","rsd\\1UhwpU\\1&S",[caseless,
-                                                                       global])), 
-?line <<"rTdtycUabcoabcVaVEt">> = iolist_to_binary(re:replace("abc","(?>a(?i)b+)+c","r\\1\\1T\\1dtycU&o&V\\1aV\\1Et",[])), 
-?line <<"rTdtycUabcoabcVaVEt">> = iolist_to_binary(re:replace("abc","(?>a(?i)b+)+c","r\\1\\1T\\1dtycU&o&V\\1aV\\1Et",[global])), 
-?line <<"geFTAcqhWJc">> = iolist_to_binary(re:replace("aBbc","(?>a(?i)b+)+c","geFTAc\\1qhWJ\\1c",[])), 
-?line <<"geFTAcqhWJc">> = iolist_to_binary(re:replace("aBbc","(?>a(?i)b+)+c","geFTAc\\1qhWJ\\1c",[global])), 
-?line <<"lHStMaBBcnaBBcjCaBBcgdfm">> = iolist_to_binary(re:replace("aBBc","(?>a(?i)b+)+c","lHStM&n&jC&g\\1df\\1m",[])), 
-?line <<"lHStMaBBcnaBBcjCaBBcgdfm">> = iolist_to_binary(re:replace("aBBc","(?>a(?i)b+)+c","lHStM&n&jC&g\\1df\\1m",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>a(?i)b+)+c","U\\1pOiN&FCXl",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>a(?i)b+)+c","U\\1pOiN&FCXl",[global])), 
-?line <<"Abc">> = iolist_to_binary(re:replace("Abc","(?>a(?i)b+)+c","h",[])), 
-?line <<"Abc">> = iolist_to_binary(re:replace("Abc","(?>a(?i)b+)+c","h",[global])), 
-?line <<"abAb">> = iolist_to_binary(re:replace("abAb","(?>a(?i)b+)+c","f\\1\\1DwX\\1Y&y\\1dgv&A\\1",[])), 
-?line <<"abAb">> = iolist_to_binary(re:replace("abAb","(?>a(?i)b+)+c","f\\1\\1DwX\\1Y&y\\1dgv&A\\1",[global])), 
-?line <<"abbC">> = iolist_to_binary(re:replace("abbC","(?>a(?i)b+)+c","&\\1Gd&r\\1shP",[])), 
-?line <<"abbC">> = iolist_to_binary(re:replace("abbC","(?>a(?i)b+)+c","&\\1Gd&r\\1shP",[global])), 
-?line <<"VIaLabcabcCabcyvwsI">> = iolist_to_binary(re:replace("abc","(?=a(?i)b)\\w\\wc","VIaL&&C&yvwsI",[])), 
-?line <<"VIaLabcabcCabcyvwsI">> = iolist_to_binary(re:replace("abc","(?=a(?i)b)\\w\\wc","VIaL&&C&yvwsI",[global])), 
-?line <<"gaBcaBc">> = iolist_to_binary(re:replace("aBc","(?=a(?i)b)\\w\\wc","g&&",[])), 
-?line <<"gaBcaBc">> = iolist_to_binary(re:replace("aBc","(?=a(?i)b)\\w\\wc","g&&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=a(?i)b)\\w\\wc","RMcFr&",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=a(?i)b)\\w\\wc","RMcFr&",[global])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?=a(?i)b)\\w\\wc","y\\1&kD&os\\1E",[])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?=a(?i)b)\\w\\wc","y\\1&kD&os\\1E",[global])), 
-?line <<"abC">> = iolist_to_binary(re:replace("abC","(?=a(?i)b)\\w\\wc","ms\\1m",[])), 
-?line <<"abC">> = iolist_to_binary(re:replace("abC","(?=a(?i)b)\\w\\wc","ms\\1m",[global])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","(?=a(?i)b)\\w\\wc","lD&&vcs",[])), 
-?line <<"aBC">> = iolist_to_binary(re:replace("aBC","(?=a(?i)b)\\w\\wc","lD&&vcs",[global])), 
-?line <<"abxqXfVViuPuvfMxxcvcj">> = iolist_to_binary(re:replace("abxxc","(?<=a(?i)b)(\\w\\w)c","xqXfVViuPuvfM&vcj",[])), 
-?line <<"abxqXfVViuPuvfMxxcvcj">> = iolist_to_binary(re:replace("abxxc","(?<=a(?i)b)(\\w\\w)c","xqXfVViuPuvfM&vcj",[global])), 
-?line <<"aBXoxxcXtiuxxXqWYfixxKxxcxxUs">> = iolist_to_binary(re:replace("aBxxc","(?<=a(?i)b)(\\w\\w)c","Xo&Xtiu\\1XqWYfi\\1K&\\1Us",[])), 
-?line <<"aBXoxxcXtiuxxXqWYfixxKxxcxxUs">> = iolist_to_binary(re:replace("aBxxc","(?<=a(?i)b)(\\w\\w)c","Xo&Xtiu\\1XqWYfi\\1K&\\1Us",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a(?i)b)(\\w\\w)c","cGWOK&O&A\\1Xq&&aF\\1G",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a(?i)b)(\\w\\w)c","cGWOK&O&A\\1Xq&&aF\\1G",[global])), 
-?line <<"Abxxc">> = iolist_to_binary(re:replace("Abxxc","(?<=a(?i)b)(\\w\\w)c","uosfXS&Drr&Nsg",[])), 
-?line <<"Abxxc">> = iolist_to_binary(re:replace("Abxxc","(?<=a(?i)b)(\\w\\w)c","uosfXS&Drr&Nsg",[global])), 
-?line <<"ABxxc">> = iolist_to_binary(re:replace("ABxxc","(?<=a(?i)b)(\\w\\w)c","mKjv&im",[])), 
-?line <<"ABxxc">> = iolist_to_binary(re:replace("ABxxc","(?<=a(?i)b)(\\w\\w)c","mKjv&im",[global])), 
-?line <<"abxxC">> = iolist_to_binary(re:replace("abxxC","(?<=a(?i)b)(\\w\\w)c","ferUg\\1J\\1T\\1kWcDAY\\1jM",[])), 
-?line <<"abxxC">> = iolist_to_binary(re:replace("abxxC","(?<=a(?i)b)(\\w\\w)c","ferUg\\1J\\1T\\1kWcDAY\\1jM",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("aA","(?:(a)|b)(?(1)A|B)","\\1",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("aA","(?:(a)|b)(?(1)A|B)","\\1",[global])), 
-?line <<"YdvbBbBsFnnbBKbB">> = iolist_to_binary(re:replace("bB","(?:(a)|b)(?(1)A|B)","Y\\1\\1dv&&\\1sFnn&K&",[])), 
-?line <<"YdvbBbBsFnnbBKbB">> = iolist_to_binary(re:replace("bB","(?:(a)|b)(?(1)A|B)","Y\\1\\1dv&&\\1sFnn&K&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(a)|b)(?(1)A|B)","\\1\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(a)|b)(?(1)A|B)","\\1\\1",[global])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?:(a)|b)(?(1)A|B)","\\1To",[])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?:(a)|b)(?(1)A|B)","\\1To",[global])), 
-?line <<"bA">> = iolist_to_binary(re:replace("bA","(?:(a)|b)(?(1)A|B)","K\\1UMD",[])), 
-?line <<"bA">> = iolist_to_binary(re:replace("bA","(?:(a)|b)(?(1)A|B)","K\\1UMD",[global])), 
-?line <<"mLbykSwT">> = iolist_to_binary(re:replace("aa","^(a)?(?(1)a|b)+$","mLbykSwT",[])), 
-?line <<"mLbykSwT">> = iolist_to_binary(re:replace("aa","^(a)?(?(1)a|b)+$","mLbykSwT",[global])), 
-?line <<"br">> = iolist_to_binary(re:replace("b","^(a)?(?(1)a|b)+$","&r",[])), 
-?line <<"br">> = iolist_to_binary(re:replace("b","^(a)?(?(1)a|b)+$","&r",[global])), 
-?line <<"yaAboE">> = iolist_to_binary(re:replace("bb","^(a)?(?(1)a|b)+$","yaAb\\1o\\1E",[])), 
-?line <<"yaAboE">> = iolist_to_binary(re:replace("bb","^(a)?(?(1)a|b)+$","yaAb\\1o\\1E",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a)?(?(1)a|b)+$","QkLpQarHEu\\1Fi",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a)?(?(1)a|b)+$","QkLpQarHEu\\1Fi",[global])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a)?(?(1)a|b)+$","U",[])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","^(a)?(?(1)a|b)+$","U",[global])), 
-?line <<"MoTyD">> = iolist_to_binary(re:replace("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$","M\\1oTyD",[])), 
-?line <<"MoTyD">> = iolist_to_binary(re:replace("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$","M\\1oTyD",[global])), 
-?line <<"kawc12B">> = iolist_to_binary(re:replace("12","^(?(?=abc)\\w{3}:|\\d\\d)$","k\\1awc&B\\1",[])), 
-?line <<"kawc12B">> = iolist_to_binary(re:replace("12","^(?(?=abc)\\w{3}:|\\d\\d)$","k\\1awc&B\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$","TAqA",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$","TAqA",[global])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^(?(?=abc)\\w{3}:|\\d\\d)$","WlKxg",[])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^(?(?=abc)\\w{3}:|\\d\\d)$","WlKxg",[global])), 
-?line <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$","O",[])), 
-?line <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$","O",[global])), 
-?line <<"kNqQd">> = iolist_to_binary(re:replace("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$","kNq\\1Q\\1d",[])), 
-?line <<"kNqQd">> = iolist_to_binary(re:replace("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$","kNq\\1Q\\1d",[global])), 
-?line <<"Cr">> = iolist_to_binary(re:replace("12","^(?(?!abc)\\d\\d|\\w{3}:)$","\\1C\\1r",[])), 
-?line <<"Cr">> = iolist_to_binary(re:replace("12","^(?(?!abc)\\d\\d|\\w{3}:)$","\\1C\\1r",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$","&\\1\\1RHBBR",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$","&\\1\\1RHBBR",[global])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^(?(?!abc)\\d\\d|\\w{3}:)$","P",[])), 
-?line <<"123">> = iolist_to_binary(re:replace("123","^(?(?!abc)\\d\\d|\\w{3}:)$","P",[global])), 
-?line <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$","&awfl",[])), 
-?line <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$","&awfl",[global])), 
-?line <<"fooHSXSjJapIqY">> = iolist_to_binary(re:replace("foobar","(?(?<=foo)bar|cat)","HSXSjJ\\1apIqY",[])), 
-?line <<"fooHSXSjJapIqY">> = iolist_to_binary(re:replace("foobar","(?(?<=foo)bar|cat)","HSXSjJ\\1apIqY",[global])), 
-?line <<"IouuQfOcatNN">> = iolist_to_binary(re:replace("cat","(?(?<=foo)bar|cat)","Iouu\\1QfO&NN\\1",[])), 
-?line <<"IouuQfOcatNN">> = iolist_to_binary(re:replace("cat","(?(?<=foo)bar|cat)","Iouu\\1QfO&NN\\1",[global])), 
-?line <<"fcatxAWTu">> = iolist_to_binary(re:replace("fcat","(?(?<=foo)bar|cat)","&\\1xAWTu",[])), 
-?line <<"fcatxAWTu">> = iolist_to_binary(re:replace("fcat","(?(?<=foo)bar|cat)","&\\1xAWTu",[global])), 
-?line <<"fodYcNREMccatAcatyvscatidk">> = iolist_to_binary(re:replace("focat","(?(?<=foo)bar|cat)","dYc\\1N\\1REMc&A&yvs&idk",[])), 
-?line <<"fodYcNREMccatAcatyvscatidk">> = iolist_to_binary(re:replace("focat","(?(?<=foo)bar|cat)","dYc\\1N\\1REMc&A&yvs&idk",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<=foo)bar|cat)","FmDOEt&",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<=foo)bar|cat)","FmDOEt&",[global])), 
-?line <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<=foo)bar|cat)","Jj&OFdGEDut\\1HjNDH",[])), 
-?line <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<=foo)bar|cat)","Jj&OFdGEDut\\1HjNDH",[global])), 
-?line <<"fooEGbarEwDYbarCNxYJbarbD">> = iolist_to_binary(re:replace("foobar","(?(?<!foo)cat|bar)","EG&Ew\\1DY&CN\\1xYJ&bD",[])), 
-?line <<"fooEGbarEwDYbarCNxYJbarbD">> = iolist_to_binary(re:replace("foobar","(?(?<!foo)cat|bar)","EG&Ew\\1DY&CN\\1xYJ&bD",[global])), 
-?line <<"jHKKpLcatBtkhMt">> = iolist_to_binary(re:replace("cat","(?(?<!foo)cat|bar)","jHKKpL&BtkhMt",[])), 
-?line <<"jHKKpLcatBtkhMt">> = iolist_to_binary(re:replace("cat","(?(?<!foo)cat|bar)","jHKKpL&BtkhMt",[global])), 
-?line <<"fiJOnynFk">> = iolist_to_binary(re:replace("fcat","(?(?<!foo)cat|bar)","iJ\\1O\\1ny\\1nFk",[])), 
-?line <<"fiJOnynFk">> = iolist_to_binary(re:replace("fcat","(?(?<!foo)cat|bar)","iJ\\1O\\1ny\\1nFk",[global])), 
-?line <<"foWCSvhChIBqicatcatLjMieK">> = iolist_to_binary(re:replace("focat","(?(?<!foo)cat|bar)","WCSvh\\1ChIBqi&&LjMieK",[])), 
-?line <<"foWCSvhChIBqicatcatLjMieK">> = iolist_to_binary(re:replace("focat","(?(?<!foo)cat|bar)","WCSvh\\1ChIBqi&&LjMieK",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<!foo)cat|bar)","v&yn",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<!foo)cat|bar)","v&yn",[global])), 
-?line <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<!foo)cat|bar)","\\1&\\1\\1&dvNYDwrfFA\\1&d",[])), 
-?line <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<!foo)cat|bar)","\\1&\\1\\1&dvNYDwrfFA\\1&d",[global])), 
-?line <<"TQKeRLoqn">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) |) ","T\\1\\1QK\\1e\\1RLoqn",[extended])), 
-?line <<"TQKeRLoqn">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) |) ","T\\1\\1QK\\1e\\1RLoqn",[extended,
-                                                                                                                                                                                                                                                             global])), 
-?line <<"Qd(ovEgf(pkOYCuPDq(R">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ","Qd\\1ovEgf\\1pkOYCuPDq\\1R",[extended])), 
-?line <<"Qd(ovEgf(pkOYCuPDq(R">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ","Qd\\1ovEgf\\1pkOYCuPDq\\1R",[extended,
-                                                                                                                                                                                                                                                                          global])), 
-?line <<"Dmthe quick QWSbgBeLthe quick E(abcd) fox">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ","Dm\\1&QWSbgBeL&E",[extended])), 
-?line <<"Dmthe quick QWSbgBeLthe quick EDm((abcd)QWSbgBeL(abcd)EDm foxQWSbgBeL foxE">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ","Dm\\1&QWSbgBeL&E",[extended,
-                                                                                                                                                                                                                                                                                  global])), 
-?line <<"(Ld">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) |) ","Ld",[extended])), 
-?line <<"(Ld">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) |) ","Ld",[extended,
-                                                                                                                                                                                                                     global])), 
-?line <<"abcdiCLfuabcdkd">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) ) ","&iCLfu&kd",[extended])), 
-?line <<"abcdiCLfuabcdkd">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) ) ","&iCLfu&kd",[extended,
-                                                                                                                                                                                                                                 global])), 
-?line <<"uXgnII((abcd)SMj">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ","uXgnII\\1&SMj",[extended])), 
-?line <<"uXgnII((abcd)SMj">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ","uXgnII\\1&SMj",[extended,
-                                                                                                                                                                                                                                             global])), 
-?line <<"the quick the quick the quick xjaBhsFamkEL(abcd) fox">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ","&&&xjaBhsFa\\1mkEL\\1",[extended])), 
-?line <<"the quick the quick the quick xjaBhsFamkEL(abcd)(abcd)(abcd)xjaBhsFa(mkEL( fox fox foxxjaBhsFamkEL">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ","&&&xjaBhsFa\\1mkEL\\1",[extended,
+ million","(?:(?s-i)more.*than).*million","N",[caseless,global])), 
+    <<"dAgcabcrYrHG">> = iolist_to_binary(re:replace("abc","(?>a(?i)b+)+c","dAgc&rYrH\\1\\1G",[])), 
+    <<"dAgcabcrYrHG">> = iolist_to_binary(re:replace("abc","(?>a(?i)b+)+c","dAgc&rYrH\\1\\1G",[global])), 
+    <<"fXy">> = iolist_to_binary(re:replace("aBbc","(?>a(?i)b+)+c","fXy",[])), 
+    <<"fXy">> = iolist_to_binary(re:replace("aBbc","(?>a(?i)b+)+c","fXy",[global])), 
+    <<"y">> = iolist_to_binary(re:replace("aBBc","(?>a(?i)b+)+c","y",[])), 
+    <<"y">> = iolist_to_binary(re:replace("aBBc","(?>a(?i)b+)+c","y",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>a(?i)b+)+c","riGTl\\1gCN&tFIx",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>a(?i)b+)+c","riGTl\\1gCN&tFIx",[global])), 
+    <<"Abc">> = iolist_to_binary(re:replace("Abc","(?>a(?i)b+)+c","QnNFHC\\1\\1AJpJokFLyM",[])), 
+    <<"Abc">> = iolist_to_binary(re:replace("Abc","(?>a(?i)b+)+c","QnNFHC\\1\\1AJpJokFLyM",[global])), 
+    <<"abAb">> = iolist_to_binary(re:replace("abAb","(?>a(?i)b+)+c","yrdamBD",[])), 
+    <<"abAb">> = iolist_to_binary(re:replace("abAb","(?>a(?i)b+)+c","yrdamBD",[global])), 
+    <<"abbC">> = iolist_to_binary(re:replace("abbC","(?>a(?i)b+)+c","\\1&a&x",[])), 
+    <<"abbC">> = iolist_to_binary(re:replace("abbC","(?>a(?i)b+)+c","\\1&a&x",[global])), 
+    <<"WnabchdOabcXw">> = iolist_to_binary(re:replace("abc","(?=a(?i)b)\\w\\wc","Wn\\1\\1&hdO&Xw",[])), 
+    <<"WnabchdOabcXw">> = iolist_to_binary(re:replace("abc","(?=a(?i)b)\\w\\wc","Wn\\1\\1&hdO&Xw",[global])), 
+    <<"NUnsaGHpA">> = iolist_to_binary(re:replace("aBc","(?=a(?i)b)\\w\\wc","NUnsaGHp\\1A",[])), 
+    <<"NUnsaGHpA">> = iolist_to_binary(re:replace("aBc","(?=a(?i)b)\\w\\wc","NUnsaGHp\\1A",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=a(?i)b)\\w\\wc","J",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?=a(?i)b)\\w\\wc","J",[global])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?=a(?i)b)\\w\\wc","rA\\1tmLWYJdpHtIJ\\1",[])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?=a(?i)b)\\w\\wc","rA\\1tmLWYJdpHtIJ\\1",[global])), 
+    <<"abC">> = iolist_to_binary(re:replace("abC","(?=a(?i)b)\\w\\wc","O",[])), 
+    <<"abC">> = iolist_to_binary(re:replace("abC","(?=a(?i)b)\\w\\wc","O",[global])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","(?=a(?i)b)\\w\\wc","xrOeHr\\1Ws\\1FvkVpoU",[])), 
+    <<"aBC">> = iolist_to_binary(re:replace("aBC","(?=a(?i)b)\\w\\wc","xrOeHr\\1Ws\\1FvkVpoU",[global])), 
+    <<"abcFSPxxcxxctgbJkxxNdQS">> = iolist_to_binary(re:replace("abxxc","(?<=a(?i)b)(\\w\\w)c","cFSP&&tgbJk\\1NdQS",[])), 
+    <<"abcFSPxxcxxctgbJkxxNdQS">> = iolist_to_binary(re:replace("abxxc","(?<=a(?i)b)(\\w\\w)c","cFSP&&tgbJk\\1NdQS",[global])), 
+    <<"aBQNAt">> = iolist_to_binary(re:replace("aBxxc","(?<=a(?i)b)(\\w\\w)c","QNAt",[])), 
+    <<"aBQNAt">> = iolist_to_binary(re:replace("aBxxc","(?<=a(?i)b)(\\w\\w)c","QNAt",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a(?i)b)(\\w\\w)c","inxwegNttyrc",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a(?i)b)(\\w\\w)c","inxwegNttyrc",[global])), 
+    <<"Abxxc">> = iolist_to_binary(re:replace("Abxxc","(?<=a(?i)b)(\\w\\w)c","YUsRHD&",[])), 
+    <<"Abxxc">> = iolist_to_binary(re:replace("Abxxc","(?<=a(?i)b)(\\w\\w)c","YUsRHD&",[global])), 
+    <<"ABxxc">> = iolist_to_binary(re:replace("ABxxc","(?<=a(?i)b)(\\w\\w)c","CXJBefD\\1kemWbn&fyJ",[])), 
+    <<"ABxxc">> = iolist_to_binary(re:replace("ABxxc","(?<=a(?i)b)(\\w\\w)c","CXJBefD\\1kemWbn&fyJ",[global])), 
+    <<"abxxC">> = iolist_to_binary(re:replace("abxxC","(?<=a(?i)b)(\\w\\w)c","UjT\\1hGcc&\\1K",[])), 
+    <<"abxxC">> = iolist_to_binary(re:replace("abxxC","(?<=a(?i)b)(\\w\\w)c","UjT\\1hGcc&\\1K",[global])), 
+    <<"e">> = iolist_to_binary(re:replace("aA","(?:(a)|b)(?(1)A|B)","e",[])), 
+    <<"e">> = iolist_to_binary(re:replace("aA","(?:(a)|b)(?(1)A|B)","e",[global])), 
+    <<"NMcPpQyHaNfjCbBaD">> = iolist_to_binary(re:replace("bB","(?:(a)|b)(?(1)A|B)","\\1NMcPpQyHaNfjC&aD",[])), 
+    <<"NMcPpQyHaNfjCbBaD">> = iolist_to_binary(re:replace("bB","(?:(a)|b)(?(1)A|B)","\\1NMcPpQyHaNfjC&aD",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(a)|b)(?(1)A|B)","\\1Q",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(a)|b)(?(1)A|B)","\\1Q",[global])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?:(a)|b)(?(1)A|B)","&SMEo&XGCCInDGmiby",[])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?:(a)|b)(?(1)A|B)","&SMEo&XGCCInDGmiby",[global])), 
+    <<"bA">> = iolist_to_binary(re:replace("bA","(?:(a)|b)(?(1)A|B)","UUW&\\1&SC\\1",[])), 
+    <<"bA">> = iolist_to_binary(re:replace("bA","(?:(a)|b)(?(1)A|B)","UUW&\\1&SC\\1",[global])), 
+    <<"FeSwwOaSaLaaSV">> = iolist_to_binary(re:replace("aa","^(a)?(?(1)a|b)+$","FeSwwO\\1S\\1L&SV",[])), 
+    <<"FeSwwOaSaLaaSV">> = iolist_to_binary(re:replace("aa","^(a)?(?(1)a|b)+$","FeSwwO\\1S\\1L&SV",[global])), 
+    <<"JTW">> = iolist_to_binary(re:replace("b","^(a)?(?(1)a|b)+$","JTW",[])), 
+    <<"JTW">> = iolist_to_binary(re:replace("b","^(a)?(?(1)a|b)+$","JTW",[global])), 
+    <<"rbbbbmbfbxJobbhlCHbbbbdR">> = iolist_to_binary(re:replace("bb","^(a)?(?(1)a|b)+$","r&&mbfbxJo&hlCH&&dR\\1",[])), 
+    <<"rbbbbmbfbxJobbhlCHbbbbdR">> = iolist_to_binary(re:replace("bb","^(a)?(?(1)a|b)+$","r&&mbfbxJo&hlCH&&dR\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a)?(?(1)a|b)+$","RLV&s",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a)?(?(1)a|b)+$","RLV&s",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a)?(?(1)a|b)+$","QoxGv\\1Pa&\\1mowml",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","^(a)?(?(1)a|b)+$","QoxGv\\1Pa&\\1mowml",[global])), 
+    <<"cfabc:abc:">> = iolist_to_binary(re:replace("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$","cf&&",[])), 
+    <<"cfabc:abc:">> = iolist_to_binary(re:replace("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$","cf&&",[global])), 
+    <<"IKeMxScgslGf">> = iolist_to_binary(re:replace("12","^(?(?=abc)\\w{3}:|\\d\\d)$","IKeMxScgsl\\1\\1Gf",[])), 
+    <<"IKeMxScgslGf">> = iolist_to_binary(re:replace("12","^(?(?=abc)\\w{3}:|\\d\\d)$","IKeMxScgsl\\1\\1Gf",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$","cCGveJFFUHnS\\1S",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$","cCGveJFFUHnS\\1S",[global])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^(?(?=abc)\\w{3}:|\\d\\d)$","kudsG&Hdk",[])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^(?(?=abc)\\w{3}:|\\d\\d)$","kudsG&Hdk",[global])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$","&kyqj\\1U\\1\\1\\1",[])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$","&kyqj\\1U\\1\\1\\1",[global])), 
+    ok.
+run13() ->
+    <<"yLejabc:ClvDam">> = iolist_to_binary(re:replace("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$","yLej&C\\1lvDa\\1m",[])), 
+    <<"yLejabc:ClvDam">> = iolist_to_binary(re:replace("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$","yLej&C\\1lvDa\\1m",[global])), 
+    <<"eH12Ase">> = iolist_to_binary(re:replace("12","^(?(?!abc)\\d\\d|\\w{3}:)$","e\\1H&A\\1s\\1\\1e",[])), 
+    <<"eH12Ase">> = iolist_to_binary(re:replace("12","^(?(?!abc)\\d\\d|\\w{3}:)$","e\\1H&A\\1s\\1\\1e",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$","SMtlNLKd\\1Va",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$","SMtlNLKd\\1Va",[global])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^(?(?!abc)\\d\\d|\\w{3}:)$","VsMY&We",[])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^(?(?!abc)\\d\\d|\\w{3}:)$","VsMY&We",[global])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$","j&k\\1tUeAYRn",[])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$","j&k\\1tUeAYRn",[global])), 
+    <<"fooS">> = iolist_to_binary(re:replace("foobar","(?(?<=foo)bar|cat)","S\\1",[])), 
+    <<"fooS">> = iolist_to_binary(re:replace("foobar","(?(?<=foo)bar|cat)","S\\1",[global])), 
+    <<"catdEUboccGWTaRjQo">> = iolist_to_binary(re:replace("cat","(?(?<=foo)bar|cat)","&dEU\\1boccGWTaRjQo\\1",[])), 
+    <<"catdEUboccGWTaRjQo">> = iolist_to_binary(re:replace("cat","(?(?<=foo)bar|cat)","&dEU\\1boccGWTaRjQo\\1",[global])), 
+    <<"fcatrspJwF">> = iolist_to_binary(re:replace("fcat","(?(?<=foo)bar|cat)","\\1&rs\\1pJwF",[])), 
+    <<"fcatrspJwF">> = iolist_to_binary(re:replace("fcat","(?(?<=foo)bar|cat)","\\1&rs\\1pJwF",[global])), 
+    <<"foncatePTv">> = iolist_to_binary(re:replace("focat","(?(?<=foo)bar|cat)","n&ePTv",[])), 
+    <<"foncatePTv">> = iolist_to_binary(re:replace("focat","(?(?<=foo)bar|cat)","n&ePTv",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<=foo)bar|cat)","jI",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<=foo)bar|cat)","jI",[global])), 
+    <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<=foo)bar|cat)","\\1qBlA\\1veXv",[])), 
+    <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<=foo)bar|cat)","\\1qBlA\\1veXv",[global])), 
+    <<"fooYHnkCeSOb">> = iolist_to_binary(re:replace("foobar","(?(?<!foo)cat|bar)","YHnkCeSOb",[])), 
+    <<"fooYHnkCeSOb">> = iolist_to_binary(re:replace("foobar","(?(?<!foo)cat|bar)","YHnkCeSOb",[global])), 
+    <<"catcatQAKgfdmvWBVj">> = iolist_to_binary(re:replace("cat","(?(?<!foo)cat|bar)","&&QAK\\1gfdmvWBVj",[])), 
+    <<"catcatQAKgfdmvWBVj">> = iolist_to_binary(re:replace("cat","(?(?<!foo)cat|bar)","&&QAK\\1gfdmvWBVj",[global])), 
+    <<"fPR">> = iolist_to_binary(re:replace("fcat","(?(?<!foo)cat|bar)","PR",[])), 
+    <<"fPR">> = iolist_to_binary(re:replace("fcat","(?(?<!foo)cat|bar)","PR",[global])), 
+    <<"fo">> = iolist_to_binary(re:replace("focat","(?(?<!foo)cat|bar)","\\1",[])), 
+    <<"fo">> = iolist_to_binary(re:replace("focat","(?(?<!foo)cat|bar)","\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<!foo)cat|bar)","qsIpnmEbaYk\\1H",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?<!foo)cat|bar)","qsIpnmEbaYk\\1H",[global])), 
+    <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<!foo)cat|bar)","B",[])), 
+    <<"foocat">> = iolist_to_binary(re:replace("foocat","(?(?<!foo)cat|bar)","B",[global])), 
+    <<"bclabcdfaLGxBabcdHtjFC">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) |) ","bcl&faLGxB\\1&HtjFC",[extended])), 
+    <<"bclabcdfaLGxBabcdHtjFC">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) |) ","bcl&faLGxB\\1&HtjFC",[extended,
+                                                                                                                                                                                                                                                      global])), 
+    <<"JpguAHp((E(AF(">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ","JpguAHp\\1\\1E\\1AF\\1",[extended])), 
+    <<"JpguAHp((E(AF(">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ","JpguAHp\\1\\1E\\1AF\\1",[extended,
+                                                                                                                                                                                                                                                                 global])), 
+    <<"yBpRsrthe quick Nr(abcd) fox">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ","yBpRsr&Nr\\1",[extended])), 
+    <<"yBpRsrthe quick NryBpRsr(abcd)Nr(yBpRsr foxNr">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ","yBpRsr&Nr\\1",[extended,
+                                                                                                                                                                                                                                                                       global])), 
+    <<"(dfabcdMfidabcdORabcdXp">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) |) ","df&Mfid\\1\\1&OR&Xp",[extended])), 
+    <<"(dfabcdMfidabcdORabcdXp">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) |) ","df&Mfid\\1\\1&OR&Xp",[extended,
+                                                                                                                                                                                                                                                          global])), 
+    <<"NEKtshVcSbEQreXJUgabcd">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) ) ","NEKtshVcSbEQre\\1XJUg&",[extended])), 
+    <<"NEKtshVcSbEQreXJUgabcd">> = iolist_to_binary(re:replace("abcd","( \\( )? [^()]+ (?(1) \\) ) ","NEKtshVcSbEQre\\1XJUg&",[extended,
+                                                                                                                                                                                                                                                         global])), 
+    <<"C">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ","C",[extended])), 
+    <<"C">> = iolist_to_binary(re:replace("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ","C",[extended,
+                                                                                                                                                                                                                 global])), 
+    <<"VsQthe quick tPGwwMthe quick WRxuthe quick (abcd) fox">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ","VsQ&tP\\1Gww\\1M&WRxu&",[extended])), 
+    <<"VsQthe quick tPGwwMthe quick WRxuthe quick VsQ(abcd)tP(Gww(M(abcd)WRxu(abcd)VsQ foxtPGwwM foxWRxu fox">> = iolist_to_binary(re:replace("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ","VsQ&tP\\1Gww\\1M&WRxu&",[extended,
                                                                                                                                                                                                                                                                                             global])), 
-?line <<"(KuH">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) ) ","K\\1uH",[extended])), 
-?line <<"(KuH">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) ) ","K\\1uH",[extended,
-                                                                                                                                                                                                                            global])), 
-?line <<"IMNCUvkRpMGDtA">> = iolist_to_binary(re:replace("12","^(?(2)a|(1)(2))+$","IMNCUvkRpMGDtA",[])), 
-?line <<"IMNCUvkRpMGDtA">> = iolist_to_binary(re:replace("12","^(?(2)a|(1)(2))+$","IMNCUvkRpMGDtA",[global])), 
-?line <<"YQQcCpqUaDwGin12a1he">> = iolist_to_binary(re:replace("12a","^(?(2)a|(1)(2))+$","YQQcCpqUaDwGin&\\1he",[])), 
-?line <<"YQQcCpqUaDwGin12a1he">> = iolist_to_binary(re:replace("12a","^(?(2)a|(1)(2))+$","YQQcCpqUaDwGin&\\1he",[global])), 
-?line <<"LiJWEQyka">> = iolist_to_binary(re:replace("12aa","^(?(2)a|(1)(2))+$","LiJWEQyka",[])), 
-?line <<"LiJWEQyka">> = iolist_to_binary(re:replace("12aa","^(?(2)a|(1)(2))+$","LiJWEQyka",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(2)a|(1)(2))+$","jNpGudmNvPautj\\1\\1rc",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(2)a|(1)(2))+$","jNpGudmNvPautj\\1\\1rc",[global])), 
-?line <<"1234">> = iolist_to_binary(re:replace("1234","^(?(2)a|(1)(2))+$","TKb&DSqQCtNBSjto\\1",[])), 
-?line <<"1234">> = iolist_to_binary(re:replace("1234","^(?(2)a|(1)(2))+$","TKb&DSqQCtNBSjto\\1",[global])), 
-?line <<"OKbblah blahmEblah blahcAEblah">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+\\1","OKb&mE&cAE\\1",[])), 
-?line <<"OKbblah blahmEblah blahcAEblah">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+\\1","OKb&mE&cAE\\1",[global])), 
-?line <<"sHRABLAH BLAHDBLAH BLAHofBLAHMonBF">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+\\1","sHRA&D&of\\1MonBF",[])), 
-?line <<"sHRABLAH BLAHDBLAH BLAHofBLAHMonBF">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+\\1","sHRA&D&of\\1MonBF",[global])), 
-?line <<"rBlah BlahowtRMgXJKNBlah Blah">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+\\1","r&owtRMgXJKN&",[])), 
-?line <<"rBlah BlahowtRMgXJKNBlah Blah">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+\\1","r&owtRMgXJKN&",[global])), 
-?line <<"JblaHeNvblaHaSeblaHblaH blaHg">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+\\1","J\\1eNv\\1aSe\\1&g",[])), 
-?line <<"JblaHeNvblaHaSeblaHblaH blaHg">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+\\1","J\\1eNv\\1aSe\\1&g",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)blah)\\s+\\1","\\1LVUknDVfgj\\1ij\\1eDhAE",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)blah)\\s+\\1","\\1LVUknDVfgj\\1ij\\1eDhAE",[global])), 
-?line <<"blah BLAH">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+\\1","auAYHQ\\1S&PKut",[])), 
-?line <<"blah BLAH">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+\\1","auAYHQ\\1S&PKut",[global])), 
-?line <<"Blah blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+\\1","\\1&N\\1tNui&w&CgfgFCbPk",[])), 
-?line <<"Blah blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+\\1","\\1&N\\1tNui&w&CgfgFCbPk",[global])), 
-?line <<"blaH blah">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+\\1","rLouaVXAOeWe",[])), 
-?line <<"blaH blah">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+\\1","rLouaVXAOeWe",[global])), 
-?line <<"CXblahSqUjfblah blahblah blahblah">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+(?i:\\1)","CX\\1SqUjf&&\\1",[])), 
-?line <<"CXblahSqUjfblah blahblah blahblah">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+(?i:\\1)","CX\\1SqUjf&&\\1",[global])), 
-?line <<"XBLAHTkBLAHXUjMhbiRBLAH BLAHgXxxti">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+(?i:\\1)","X\\1Tk\\1XUjMhbiR&gXxxti",[])), 
-?line <<"XBLAHTkBLAHXUjMhbiRBLAH BLAHgXxxti">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+(?i:\\1)","X\\1Tk\\1XUjMhbiR&gXxxti",[global])), 
-?line <<"SBlahlpSqiBlah BlahLvYBlahJBlahxSbx">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+(?i:\\1)","S\\1lpSqi&LvY\\1J\\1xSbx",[])), 
-?line <<"SBlahlpSqiBlah BlahLvYBlahJBlahxSbx">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+(?i:\\1)","S\\1lpSqi&LvY\\1J\\1xSbx",[global])), 
-?line <<"oIFblaHCV">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+(?i:\\1)","oIF\\1CV",[])), 
-?line <<"oIFblaHCV">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+(?i:\\1)","oIF\\1CV",[global])), 
-?line <<"blahblah BLAHnOGRLblahgvVwkgjq">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+(?i:\\1)","\\1&nOGRL\\1gvVwkgjq",[])), 
-?line <<"blahblah BLAHnOGRLblahgvVwkgjq">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+(?i:\\1)","\\1&nOGRL\\1gvVwkgjq",[global])), 
-?line <<"PrLBlahTtgBlah blahpNNDBlah blahBlah blahBlah blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+(?i:\\1)","PrL\\1Ttg&pNND&&&",[])), 
-?line <<"PrLBlahTtgBlah blahpNNDBlah blahBlah blahBlah blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+(?i:\\1)","PrL\\1Ttg&pNND&&&",[global])), 
-?line <<"blaH blahGnDblaHFhNOIOmBhblaH blahfblaH blahKt">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+(?i:\\1)","&GnD\\1FhNOIOmBh&f&Kt",[])), 
-?line <<"blaH blahGnDblaHFhNOIOmBhblaH blahfblaH blahKt">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+(?i:\\1)","&GnD\\1FhNOIOmBh&f&Kt",[global])), 
-?line <<"aW">> = iolist_to_binary(re:replace("a","(?>a*)*","&W",[])), 
-?line <<"aWW">> = iolist_to_binary(re:replace("a","(?>a*)*","&W",[global])), 
-?line <<"Seaa">> = iolist_to_binary(re:replace("aa","(?>a*)*","Se&",[])), 
-?line <<"SeaaSe">> = iolist_to_binary(re:replace("aa","(?>a*)*","Se&",[global])), 
-?line <<"itILgCmaaaaioxBkDkO">> = iolist_to_binary(re:replace("aaaa","(?>a*)*","itIL\\1gCm&ioxBkDkO",[])), 
-?line <<"itILgCmaaaaioxBkDkOitILgCmioxBkDkO">> = iolist_to_binary(re:replace("aaaa","(?>a*)*","itIL\\1gCm&ioxBkDkO",[global])), 
-?line <<"aqm">> = iolist_to_binary(re:replace("abc","(abc|)+","\\1aqm",[])), 
-?line <<"aqmaqm">> = iolist_to_binary(re:replace("abc","(abc|)+","\\1aqm",[global])), 
-?line <<"tSWTMOLPTnvvJTwabcabcJwE">> = iolist_to_binary(re:replace("abcabc","(abc|)+","tSWTMOLPTnvvJTw\\1&JwE",[])), 
-?line <<"tSWTMOLPTnvvJTwabcabcJwEtSWTMOLPTnvvJTwJwE">> = iolist_to_binary(re:replace("abcabc","(abc|)+","tSWTMOLPTnvvJTw\\1&JwE",[global])), 
-?line <<"eMhIJbMyp">> = iolist_to_binary(re:replace("abcabcabc","(abc|)+","\\1eMh\\1\\1IJb\\1Myp",[])), 
-?line <<"eMhIJbMypeMhIJbMyp">> = iolist_to_binary(re:replace("abcabcabc","(abc|)+","\\1eMh\\1\\1IJb\\1Myp",[global])), 
-?line <<"dBxyz">> = iolist_to_binary(re:replace("xyz","(abc|)+","dB",[])), 
-?line <<"dBxdBydBzdB">> = iolist_to_binary(re:replace("xyz","(abc|)+","dB",[global])), 
-?line <<"wCrHnihkSygW">> = iolist_to_binary(re:replace("a","([a]*)*","wCrHnihkSygW",[])), 
-?line <<"wCrHnihkSygWwCrHnihkSygW">> = iolist_to_binary(re:replace("a","([a]*)*","wCrHnihkSygW",[global])), 
-?line <<"GjjjYNVefTgBaaaaafMw">> = iolist_to_binary(re:replace("aaaaa","([a]*)*","\\1Gjj\\1jYNVefTgB&fMw",[])), 
-?line <<"GjjjYNVefTgBaaaaafMwGjjjYNVefTgBfMw">> = iolist_to_binary(re:replace("aaaaa","([a]*)*","\\1Gjj\\1jYNVefTgB&fMw",[global])), 
-?line <<"pXFqCJUNaNU">> = iolist_to_binary(re:replace("a","([ab]*)*","pXFqCJUN&NU",[])), 
-?line <<"pXFqCJUNaNUpXFqCJUNNU">> = iolist_to_binary(re:replace("a","([ab]*)*","pXFqCJUN&NU",[global])), 
-?line <<"qbGbaTAUHHibHnl">> = iolist_to_binary(re:replace("b","([ab]*)*","q&\\1GbaTAUHHi&Hn\\1l",[])), 
-?line <<"qbGbaTAUHHibHnlqGbaTAUHHiHnl">> = iolist_to_binary(re:replace("b","([ab]*)*","q&\\1GbaTAUHHi&Hn\\1l",[global])), 
-?line <<"l">> = iolist_to_binary(re:replace("ababab","([ab]*)*","\\1l",[])), 
-?line <<"ll">> = iolist_to_binary(re:replace("ababab","([ab]*)*","\\1l",[global])), 
-?line <<"scde">> = iolist_to_binary(re:replace("aaaabcde","([ab]*)*","s\\1\\1",[])), 
-?line <<"sscsdses">> = iolist_to_binary(re:replace("aaaabcde","([ab]*)*","s\\1\\1",[global])), 
-?line <<"cLbwWRDkdHt">> = iolist_to_binary(re:replace("bbbb","([ab]*)*","cL\\1bwWRDkdHt",[])), 
-?line <<"cLbwWRDkdHtcLbwWRDkdHt">> = iolist_to_binary(re:replace("bbbb","([ab]*)*","cL\\1bwWRDkdHt",[global])), 
-?line <<"nmytevammko">> = iolist_to_binary(re:replace("b","([^a]*)*","nmytevammk\\1o",[])), 
-?line <<"nmytevammkonmytevammko">> = iolist_to_binary(re:replace("b","([^a]*)*","nmytevammk\\1o",[global])), 
-?line <<"bbbbqIbAMyI">> = iolist_to_binary(re:replace("bbbb","([^a]*)*","&qIbAMyI",[])), 
-?line <<"bbbbqIbAMyIqIbAMyI">> = iolist_to_binary(re:replace("bbbb","([^a]*)*","&qIbAMyI",[global])), 
-?line <<"ItRSFsauaaa">> = iolist_to_binary(re:replace("aaa","([^a]*)*","ItRS\\1Fs&a&&u",[])), 
-?line <<"ItRSFsauaItRSFsauaItRSFsauaItRSFsau">> = iolist_to_binary(re:replace("aaa","([^a]*)*","ItRS\\1Fs&a&&u",[global])), 
-?line <<"PKlYUFjsxy">> = iolist_to_binary(re:replace("cccc","([^ab]*)*","PKlYUFjsxy",[])), 
-?line <<"PKlYUFjsxyPKlYUFjsxy">> = iolist_to_binary(re:replace("cccc","([^ab]*)*","PKlYUFjsxy",[global])), 
-?line <<"eBumQabab">> = iolist_to_binary(re:replace("abab","([^ab]*)*","e\\1BumQ",[])), 
-?line <<"eBumQaeBumQbeBumQaeBumQbeBumQ">> = iolist_to_binary(re:replace("abab","([^ab]*)*","e\\1BumQ",[global])), 
-?line <<"VsNPa">> = iolist_to_binary(re:replace("a","([a]*?)*","&Vs\\1N&P",[])), 
-?line <<"VsNPaVsNaPVsNP">> = iolist_to_binary(re:replace("a","([a]*?)*","&Vs\\1N&P",[global])), 
-?line <<"oJTmjRIMESSEdaaaa">> = iolist_to_binary(re:replace("aaaa","([a]*?)*","o&JT\\1\\1\\1&m&jR&IMESSEd",[])), 
-?line <<"oJTmjRIMESSEdoaJTamajRaIMESSEdoJTmjRIMESSEdoaJTamajRaIMESSEdoJTmjRIMESSEdoaJTamajRaIMESSEdoJTmjRIMESSEdoaJTamajRaIMESSEdoJTmjRIMESSEd">> = iolist_to_binary(re:replace("aaaa","([a]*?)*","o&JT\\1\\1\\1&m&jR&IMESSEd",[global])), 
-?line <<"uSOa">> = iolist_to_binary(re:replace("a","([ab]*?)*","&\\1&u&SO",[])), 
-?line <<"uSOaauaSOuSO">> = iolist_to_binary(re:replace("a","([ab]*?)*","&\\1&u&SO",[global])), 
-?line <<"BfDNwUAfjUb">> = iolist_to_binary(re:replace("b","([ab]*?)*","B&fDNwU\\1Af&j\\1U\\1",[])), 
-?line <<"BfDNwUAfjUBbfDNwUAfbjUBfDNwUAfjU">> = iolist_to_binary(re:replace("b","([ab]*?)*","B&fDNwU\\1Af&j\\1U\\1",[global])), 
-?line <<"kTOkbSeRnabab">> = iolist_to_binary(re:replace("abab","([ab]*?)*","k&TOkb\\1\\1S&eR&n&",[])), 
-?line <<"kTOkbSeRnkaTOkbSaeRanakTOkbSeRnkbTOkbSbeRbnbkTOkbSeRnkaTOkbSaeRanakTOkbSeRnkbTOkbSbeRbnbkTOkbSeRn">> = iolist_to_binary(re:replace("abab","([ab]*?)*","k&TOkb\\1\\1S&eR&n&",[global])), 
-?line <<"Sbaba">> = iolist_to_binary(re:replace("baba","([ab]*?)*","S",[])), 
-?line <<"SSSSSSSSS">> = iolist_to_binary(re:replace("baba","([ab]*?)*","S",[global])), 
-?line <<"Aotb">> = iolist_to_binary(re:replace("b","([^a]*?)*","A\\1ot",[])), 
-?line <<"AotAotAot">> = iolist_to_binary(re:replace("b","([^a]*?)*","A\\1ot",[global])), 
-?line <<"CbPnbbbb">> = iolist_to_binary(re:replace("bbbb","([^a]*?)*","CbPn&&",[])), 
-?line <<"CbPnCbPnbbCbPnCbPnbbCbPnCbPnbbCbPnCbPnbbCbPn">> = iolist_to_binary(re:replace("bbbb","([^a]*?)*","CbPn&&",[global])), 
-?line <<"DUteaaa">> = iolist_to_binary(re:replace("aaa","([^a]*?)*","D\\1\\1Ute",[])), 
-?line <<"DUteaDUteaDUteaDUte">> = iolist_to_binary(re:replace("aaa","([^a]*?)*","D\\1\\1Ute",[global])), 
-?line <<"ATgsBhAkPic">> = iolist_to_binary(re:replace("c","([^ab]*?)*","ATg\\1sB\\1hAkP&i",[])), 
-?line <<"ATgsBhAkPiATgsBhAkPciATgsBhAkPi">> = iolist_to_binary(re:replace("c","([^ab]*?)*","ATg\\1sB\\1hAkP&i",[global])), 
-?line <<"lwFoWkRIxUcccc">> = iolist_to_binary(re:replace("cccc","([^ab]*?)*","l&wFoWk\\1RIxU",[])), 
-?line <<"lwFoWkRIxUlcwFoWkRIxUlwFoWkRIxUlcwFoWkRIxUlwFoWkRIxUlcwFoWkRIxUlwFoWkRIxUlcwFoWkRIxUlwFoWkRIxU">> = iolist_to_binary(re:replace("cccc","([^ab]*?)*","l&wFoWk\\1RIxU",[global])), 
-?line <<"QXSXCbaba">> = iolist_to_binary(re:replace("baba","([^ab]*?)*","&QXSXC",[])), 
-?line <<"QXSXCbQXSXCaQXSXCbQXSXCaQXSXC">> = iolist_to_binary(re:replace("baba","([^ab]*?)*","&QXSXC",[global])), 
-?line <<"epgEBpyDja">> = iolist_to_binary(re:replace("a","(?>a*)*","e\\1\\1pgEB\\1\\1pyD\\1j&",[])), 
-?line <<"epgEBpyDjaepgEBpyDj">> = iolist_to_binary(re:replace("a","(?>a*)*","e\\1\\1pgEB\\1\\1pyD\\1j&",[global])), 
-?line <<"SekThCelBbcde">> = iolist_to_binary(re:replace("aaabcde","(?>a*)*","SekT\\1hC\\1\\1elB",[])), 
-?line <<"SekThCelBSekThCelBbSekThCelBcSekThCelBdSekThCelBeSekThCelB">> = iolist_to_binary(re:replace("aaabcde","(?>a*)*","SekT\\1hC\\1\\1elB",[global])), 
-?line <<"goPCaaaaawO">> = iolist_to_binary(re:replace("aaaaa","((?>a*))*","go\\1PC\\1&\\1wO",[])), 
-?line <<"goPCaaaaawOgoPCwO">> = iolist_to_binary(re:replace("aaaaa","((?>a*))*","go\\1PC\\1&\\1wO",[global])), 
-?line <<"SCaadJliaaKfxRbbbaa">> = iolist_to_binary(re:replace("aabbaa","((?>a*))*","\\1S\\1C&\\1dJ\\1\\1li&KfxR\\1b",[])), 
-?line <<"SCaadJliaaKfxRbSCdJliKfxRbbSCdJliKfxRbbSCaadJliaaKfxRbSCdJliKfxRb">> = iolist_to_binary(re:replace("aabbaa","((?>a*))*","\\1S\\1C&\\1dJ\\1\\1li&KfxR\\1b",[global])), 
-?line <<"ssMfBjQEIebjdsmPRaaaaa">> = iolist_to_binary(re:replace("aaaaa","((?>a*?))*","s&s&MfBjQEIebjdsmPR",[])), 
-?line <<"ssMfBjQEIebjdsmPRassMfBjQEIebjdsmPRassMfBjQEIebjdsmPRassMfBjQEIebjdsmPRassMfBjQEIebjdsmPRassMfBjQEIebjdsmPR">> = iolist_to_binary(re:replace("aaaaa","((?>a*?))*","s&s&MfBjQEIebjdsmPR",[global])), 
-?line <<"VQJGaabbaa">> = iolist_to_binary(re:replace("aabbaa","((?>a*?))*","VQ\\1&J\\1G",[])), 
-?line <<"VQJGaVQJGaVQJGbVQJGbVQJGaVQJGaVQJG">> = iolist_to_binary(re:replace("aabbaa","((?>a*?))*","VQ\\1&J\\1G",[global])), 
-?line <<"t">> = iolist_to_binary(re:replace("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","t",[extended])), 
-?line <<"t">> = iolist_to_binary(re:replace("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","t",[extended,
-                                                                                                                                                                                                                                                                                                                global])), 
-?line <<"EIgEQmDKuIoMFts">> = iolist_to_binary(re:replace("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","EIgEQmDKuIoMFts",[extended])), 
-?line <<"EIgEQmDKuIoMFts">> = iolist_to_binary(re:replace("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","EIgEQmDKuIoMFts",[extended,
-                                                                                                                                                                                                                                                                                                                                          global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","M\\1K\\1N",[extended])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","M\\1K\\1N",[extended,
-                                                                                                                                                                                                                                                                                                                                      global])), 
-?line <<"sep-12-98">> = iolist_to_binary(re:replace("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","Xby\\1g&vVVPgw\\1",[extended])), 
-?line <<"sep-12-98">> = iolist_to_binary(re:replace("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","Xby\\1g&vVVPgw\\1",[extended,
-                                                                                                                                                                                                                                                                                                                                                   global])), 
-?line <<"foonfoobJpbIfooAbKhpTIXfoofooEN">> = iolist_to_binary(re:replace("foobarfoo","(?<=(foo))bar\\1","n\\1bJpbI\\1AbKhpTIX\\1\\1EN",[])), 
-?line <<"foonfoobJpbIfooAbKhpTIXfoofooEN">> = iolist_to_binary(re:replace("foobarfoo","(?<=(foo))bar\\1","n\\1bJpbI\\1AbKhpTIX\\1\\1EN",[global])), 
-?line <<"foobarfoofooUWdHfoofoocfifXWQdmKgtling">> = iolist_to_binary(re:replace("foobarfootling","(?<=(foo))bar\\1","&\\1UWdH\\1\\1cfifXWQdmKg",[])), 
-?line <<"foobarfoofooUWdHfoofoocfifXWQdmKgtling">> = iolist_to_binary(re:replace("foobarfootling","(?<=(foo))bar\\1","&\\1UWdH\\1\\1cfifXWQdmKg",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo))bar\\1","\\1A\\1Do\\1roQX",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo))bar\\1","\\1A\\1Do\\1roQX",[global])), 
-?line <<"foobar">> = iolist_to_binary(re:replace("foobar","(?<=(foo))bar\\1","WqywQ",[])), 
-?line <<"foobar">> = iolist_to_binary(re:replace("foobar","(?<=(foo))bar\\1","WqywQ",[global])), 
-?line <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<=(foo))bar\\1","g&dx",[])), 
-?line <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<=(foo))bar\\1","g&dx",[global])), 
-?line <<"EqLnXCi">> = iolist_to_binary(re:replace("saturday","(?i:saturday|sunday)","EqLnX\\1Ci\\1",[])), 
-?line <<"EqLnXCi">> = iolist_to_binary(re:replace("saturday","(?i:saturday|sunday)","EqLnX\\1Ci\\1",[global])), 
-?line <<"rXiCVoMssundayWVsundayg">> = iolist_to_binary(re:replace("sunday","(?i:saturday|sunday)","rXiCVoMs&WV&\\1g",[])), 
-?line <<"rXiCVoMssundayWVsundayg">> = iolist_to_binary(re:replace("sunday","(?i:saturday|sunday)","rXiCVoMs&WV&\\1g",[global])), 
-?line <<"DCML">> = iolist_to_binary(re:replace("Saturday","(?i:saturday|sunday)","D\\1CML",[])), 
-?line <<"DCML">> = iolist_to_binary(re:replace("Saturday","(?i:saturday|sunday)","D\\1CML",[global])), 
-?line <<"caYSundaylQsqBJmDFf">> = iolist_to_binary(re:replace("Sunday","(?i:saturday|sunday)","caY&l\\1Q\\1\\1sq\\1BJmD\\1Ff",[])), 
-?line <<"caYSundaylQsqBJmDFf">> = iolist_to_binary(re:replace("Sunday","(?i:saturday|sunday)","caY&l\\1Q\\1\\1sq\\1BJmD\\1Ff",[global])), 
-?line <<"LSATURDAYSATURDAYb">> = iolist_to_binary(re:replace("SATURDAY","(?i:saturday|sunday)","L&&b",[])), 
-?line <<"LSATURDAYSATURDAYb">> = iolist_to_binary(re:replace("SATURDAY","(?i:saturday|sunday)","L&&b",[global])), 
-?line <<"J">> = iolist_to_binary(re:replace("SUNDAY","(?i:saturday|sunday)","J",[])), 
-?line <<"J">> = iolist_to_binary(re:replace("SUNDAY","(?i:saturday|sunday)","J",[global])), 
-?line <<"cCHUgeqmaSunDaySunDayQSunDayHUJ">> = iolist_to_binary(re:replace("SunDay","(?i:saturday|sunday)","c\\1CHUgeqma&&Q&HUJ",[])), 
-?line <<"cCHUgeqmaSunDaySunDayQSunDayHUJ">> = iolist_to_binary(re:replace("SunDay","(?i:saturday|sunday)","c\\1CHUgeqma&&Q&HUJ",[global])), 
-?line <<"abcEbXpYQWabcxNabcxabcxVrPLd">> = iolist_to_binary(re:replace("abcx","(a(?i)bc|BB)x","\\1EbXpYQW&N&&VrPLd",[])), 
-?line <<"abcEbXpYQWabcxNabcxabcxVrPLd">> = iolist_to_binary(re:replace("abcx","(a(?i)bc|BB)x","\\1EbXpYQW&N&&VrPLd",[global])), 
-?line <<"jBMIviaBCvaBCxTRLe">> = iolist_to_binary(re:replace("aBCx","(a(?i)bc|BB)x","jBMIvi\\1v&TRLe",[])), 
-?line <<"jBMIviaBCvaBCxTRLe">> = iolist_to_binary(re:replace("aBCx","(a(?i)bc|BB)x","jBMIvi\\1v&TRLe",[global])), 
-?line <<"wDnyUbbxDgOUSgpsDtqV">> = iolist_to_binary(re:replace("bbx","(a(?i)bc|BB)x","wDnyU&DgOUSgpsDtqV",[])), 
-?line <<"wDnyUbbxDgOUSgpsDtqV">> = iolist_to_binary(re:replace("bbx","(a(?i)bc|BB)x","wDnyU&DgOUSgpsDtqV",[global])), 
-?line <<"Vx">> = iolist_to_binary(re:replace("BBx","(a(?i)bc|BB)x","Vx",[])), 
-?line <<"Vx">> = iolist_to_binary(re:replace("BBx","(a(?i)bc|BB)x","Vx",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)bc|BB)x","vuaWcgIs\\1SRUcqMEb",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)bc|BB)x","vuaWcgIs\\1SRUcqMEb",[global])), 
-?line <<"abcX">> = iolist_to_binary(re:replace("abcX","(a(?i)bc|BB)x","V\\1",[])), 
-?line <<"abcX">> = iolist_to_binary(re:replace("abcX","(a(?i)bc|BB)x","V\\1",[global])), 
-?line <<"aBCX">> = iolist_to_binary(re:replace("aBCX","(a(?i)bc|BB)x","kcaH&mISces&gy\\1Mv",[])), 
-?line <<"aBCX">> = iolist_to_binary(re:replace("aBCX","(a(?i)bc|BB)x","kcaH&mISces&gy\\1Mv",[global])), 
-?line <<"bbX">> = iolist_to_binary(re:replace("bbX","(a(?i)bc|BB)x","hfQHW",[])), 
-?line <<"bbX">> = iolist_to_binary(re:replace("bbX","(a(?i)bc|BB)x","hfQHW",[global])), 
-?line <<"BBX">> = iolist_to_binary(re:replace("BBX","(a(?i)bc|BB)x","QWSdgANNG&a&hUuhv&T",[])), 
-?line <<"BBX">> = iolist_to_binary(re:replace("BBX","(a(?i)bc|BB)x","QWSdgANNG&a&hUuhv&T",[global])), 
-?line <<"tEacrW">> = iolist_to_binary(re:replace("ac","^([ab](?i)[cd]|[ef])","tE\\1rW",[])), 
-?line <<"tEacrW">> = iolist_to_binary(re:replace("ac","^([ab](?i)[cd]|[ef])","tE\\1rW",[global])), 
-?line <<"jjqwaCaCyaCpaCPWnSv">> = iolist_to_binary(re:replace("aC","^([ab](?i)[cd]|[ef])","jjqw\\1\\1y\\1p&PWnSv",[])), 
-?line <<"jjqwaCaCyaCpaCPWnSv">> = iolist_to_binary(re:replace("aC","^([ab](?i)[cd]|[ef])","jjqw\\1\\1y\\1p&PWnSv",[global])), 
-?line <<"pbDoK">> = iolist_to_binary(re:replace("bD","^([ab](?i)[cd]|[ef])","p&oK",[])), 
-?line <<"pbDoK">> = iolist_to_binary(re:replace("bD","^([ab](?i)[cd]|[ef])","p&oK",[global])), 
-?line <<"hOUSaMTfcPejGlephant">> = iolist_to_binary(re:replace("elephant","^([ab](?i)[cd]|[ef])","hOUSaMTfcP&jG",[])), 
-?line <<"hOUSaMTfcPejGlephant">> = iolist_to_binary(re:replace("elephant","^([ab](?i)[cd]|[ef])","hOUSaMTfcP&jG",[global])), 
-?line <<"EOnTdEESsrQXxRPurope">> = iolist_to_binary(re:replace("Europe","^([ab](?i)[cd]|[ef])","\\1OnTd&&SsrQXxRP",[])), 
-?line <<"EOnTdEESsrQXxRPurope">> = iolist_to_binary(re:replace("Europe","^([ab](?i)[cd]|[ef])","\\1OnTd&&SsrQXxRP",[global])), 
-?line <<"fhfBHfIDHldAwNfEfqrog">> = iolist_to_binary(re:replace("frog","^([ab](?i)[cd]|[ef])","\\1h&BH\\1IDHldAwN&E\\1q",[])), 
-?line <<"fhfBHfIDHldAwNfEfqrog">> = iolist_to_binary(re:replace("frog","^([ab](?i)[cd]|[ef])","\\1h&BH\\1IDHldAwN&E\\1q",[global])), 
-?line <<"FFFxSuhnFwrance">> = iolist_to_binary(re:replace("France","^([ab](?i)[cd]|[ef])","\\1&FxSuhn&w",[])), 
-?line <<"FFFxSuhnFwrance">> = iolist_to_binary(re:replace("France","^([ab](?i)[cd]|[ef])","\\1&FxSuhn&w",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([ab](?i)[cd]|[ef])","&ff\\1J\\1I",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([ab](?i)[cd]|[ef])","&ff\\1J\\1I",[global])), 
-?line <<"Africa">> = iolist_to_binary(re:replace("Africa","^([ab](?i)[cd]|[ef])","nEbgaPXOn\\1",[])), 
-?line <<"Africa">> = iolist_to_binary(re:replace("Africa","^([ab](?i)[cd]|[ef])","nEbgaPXOn\\1",[global])), 
-?line <<"abcabDXAiaSg">> = iolist_to_binary(re:replace("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&c&DXAiaSg",[])), 
-?line <<"abcabDXAiaSg">> = iolist_to_binary(re:replace("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&c&DXAiaSg",[global])), 
-?line <<"aBdqaBdmLoaaBdEb">> = iolist_to_binary(re:replace("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&q&mLoa&Eb",[])), 
-?line <<"aBdqaBdmLoaaBdEb">> = iolist_to_binary(re:replace("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&q&mLoa&Eb",[global])), 
-?line <<"xxyvFo">> = iolist_to_binary(re:replace("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","x&vFo",[])), 
-?line <<"xxyvFo">> = iolist_to_binary(re:replace("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","x&vFo",[global])), 
-?line <<"eWy">> = iolist_to_binary(re:replace("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","eWy",[])), 
-?line <<"eWy">> = iolist_to_binary(re:replace("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","eWy",[global])), 
-?line <<"bzVONndeqzaVKebra">> = iolist_to_binary(re:replace("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","b&VONndeq\\1aVK",[])), 
-?line <<"bzVONndeqzaVKebra">> = iolist_to_binary(re:replace("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","b&VONndeq\\1aVK",[global])), 
-?line <<"ZNZZjZVZJeZnZZCXZambesi">> = iolist_to_binary(re:replace("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&N&&j&V&Je\\1n&\\1CX&",[])), 
-?line <<"ZNZZjZVZJeZnZZCXZambesi">> = iolist_to_binary(re:replace("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&N&&j&V&Je\\1n&\\1CX&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","vJ\\1\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","vJ\\1\\1",[global])), 
-?line <<"aCD">> = iolist_to_binary(re:replace("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","\\1FKPhO&",[])), 
-?line <<"aCD">> = iolist_to_binary(re:replace("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","\\1FKPhO&",[global])), 
-?line <<"XY">> = iolist_to_binary(re:replace("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","SEE",[])), 
-?line <<"XY">> = iolist_to_binary(re:replace("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","SEE",[global])), 
-?line <<"foo
-rwHxBqDqeLQ">> = iolist_to_binary(re:replace("foo
-bar","(?<=foo\\n)^bar","rwHxBqDq\\1eLQ",[multiline])), 
-?line <<"foo
-rwHxBqDqeLQ">> = iolist_to_binary(re:replace("foo
-bar","(?<=foo\\n)^bar","rwHxBqDq\\1eLQ",[multiline,global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=foo\\n)^bar","\\1P&&W&\\1oN",[multiline])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=foo\\n)^bar","\\1P&&W&\\1oN",[multiline,
-                                                                                                                                                                                                                               global])), 
-?line <<"bar">> = iolist_to_binary(re:replace("bar","(?<=foo\\n)^bar","rk\\1SSPj&JPOE",[multiline])), 
-?line <<"bar">> = iolist_to_binary(re:replace("bar","(?<=foo\\n)^bar","rk\\1SSPj&JPOE",[multiline,
-                                                                                                                                                                                                              global])), 
-?line <<"baz
+    <<"(BxtHoabcdhwabcdMSlPc">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) ) ","BxtHo&hw&MSlPc",[extended])), 
+    <<"(BxtHoabcdhwabcdMSlPc">> = iolist_to_binary(re:replace("(abcd","( \\( )? [^()]+ (?(1) \\) ) ","BxtHo&hw&MSlPc",[extended,
+                                                                                                                                                                                                                                           global])), 
+    <<"112MIb11212MLRT11">> = iolist_to_binary(re:replace("12","^(?(2)a|(1)(2))+$","\\1&MIb\\1&&MLRT\\1\\1",[])), 
+    <<"112MIb11212MLRT11">> = iolist_to_binary(re:replace("12","^(?(2)a|(1)(2))+$","\\1&MIb\\1&&MLRT\\1\\1",[global])), 
+    <<"NKCJyodsYQD">> = iolist_to_binary(re:replace("12a","^(?(2)a|(1)(2))+$","NKCJyodsYQD",[])), 
+    <<"NKCJyodsYQD">> = iolist_to_binary(re:replace("12a","^(?(2)a|(1)(2))+$","NKCJyodsYQD",[global])), 
+    <<"12aarChjGgkuN">> = iolist_to_binary(re:replace("12aa","^(?(2)a|(1)(2))+$","&rChjGgkuN",[])), 
+    <<"12aarChjGgkuN">> = iolist_to_binary(re:replace("12aa","^(?(2)a|(1)(2))+$","&rChjGgkuN",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(2)a|(1)(2))+$","\\1\\1be\\1ix",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?(2)a|(1)(2))+$","\\1\\1be\\1ix",[global])), 
+    <<"1234">> = iolist_to_binary(re:replace("1234","^(?(2)a|(1)(2))+$","cLDE&D",[])), 
+    <<"1234">> = iolist_to_binary(re:replace("1234","^(?(2)a|(1)(2))+$","cLDE&D",[global])), 
+    <<"kNHtojblahPblahcuUuarKNnoK">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+\\1","kNHtoj\\1P\\1cuUuarKNnoK",[])), 
+    <<"kNHtojblahPblahcuUuarKNnoK">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+\\1","kNHtoj\\1P\\1cuUuarKNnoK",[global])), 
+    <<"eNBLAHlXaMBLAH BLAH">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+\\1","eN\\1lXaM&",[])), 
+    <<"eNBLAHlXaMBLAH BLAH">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+\\1","eN\\1lXaM&",[global])), 
+    <<"rBlah BlahSGW">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+\\1","r&SGW",[])), 
+    <<"rBlah BlahSGW">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+\\1","r&SGW",[global])), 
+    <<"fUTblaH blaHblaH blaHtHeblaH blaHDlblaH blaHwQonyN">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+\\1","fUT&&tHe&Dl&wQonyN",[])), 
+    <<"fUTblaH blaHblaH blaHtHeblaH blaHDlblaH blaHwQonyN">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+\\1","fUT&&tHe&Dl&wQonyN",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)blah)\\s+\\1","rjKWYO&gqg",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)blah)\\s+\\1","rjKWYO&gqg",[global])), 
+    <<"blah BLAH">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+\\1","\\1PJEx&&NqPQ",[])), 
+    <<"blah BLAH">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+\\1","\\1PJEx&&NqPQ",[global])), 
+    <<"Blah blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+\\1","&IAtxxKcfurkyev\\1nvDJ",[])), 
+    <<"Blah blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+\\1","&IAtxxKcfurkyev\\1nvDJ",[global])), 
+    <<"blaH blah">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+\\1","\\1\\1H&YJdrM\\1qcj&&",[])), 
+    <<"blaH blah">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+\\1","\\1\\1H&YJdrM\\1qcj&&",[global])), 
+    <<"QROIQmblah blahmblahblah blahDWblahJ">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+(?i:\\1)","QROIQm&m\\1&DW\\1J",[])), 
+    <<"QROIQmblah blahmblahblah blahDWblahJ">> = iolist_to_binary(re:replace("blah blah","((?i)blah)\\s+(?i:\\1)","QROIQm&m\\1&DW\\1J",[global])), 
+    <<"vmvjMIXCFx">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+(?i:\\1)","vmvjMIXCFx",[])), 
+    <<"vmvjMIXCFx">> = iolist_to_binary(re:replace("BLAH BLAH","((?i)blah)\\s+(?i:\\1)","vmvjMIXCFx",[global])), 
+    <<"FBlahSrBlah BlahfdMtkYBlah Blah">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+(?i:\\1)","F\\1Sr&fdMtkY&",[])), 
+    <<"FBlahSrBlah BlahfdMtkYBlah Blah">> = iolist_to_binary(re:replace("Blah Blah","((?i)blah)\\s+(?i:\\1)","F\\1Sr&fdMtkY&",[global])), 
+    <<"cblaH blaHfGEblaHwablaH blaHDGblaH blaHblaH blaHLcblaHVyTC">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+(?i:\\1)","c&fGE\\1wa&DG&&Lc\\1VyTC",[])), 
+    <<"cblaH blaHfGEblaHwablaH blaHDGblaH blaHblaH blaHLcblaHVyTC">> = iolist_to_binary(re:replace("blaH blaH","((?i)blah)\\s+(?i:\\1)","c&fGE\\1wa&DG&&Lc\\1VyTC",[global])), 
+    <<"blahaefgWblah">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+(?i:\\1)","\\1aefgW\\1",[])), 
+    <<"blahaefgWblah">> = iolist_to_binary(re:replace("blah BLAH","((?i)blah)\\s+(?i:\\1)","\\1aefgW\\1",[global])), 
+    <<"Blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+(?i:\\1)","\\1",[])), 
+    <<"Blah">> = iolist_to_binary(re:replace("Blah blah","((?i)blah)\\s+(?i:\\1)","\\1",[global])), 
+    <<"RXsblaHe">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+(?i:\\1)","RXs\\1e",[])), 
+    <<"RXsblaHe">> = iolist_to_binary(re:replace("blaH blah","((?i)blah)\\s+(?i:\\1)","RXs\\1e",[global])), 
+    <<"lanoXtvE">> = iolist_to_binary(re:replace("a","(?>a*)*","lano\\1Xt\\1vE",[])), 
+    <<"lanoXtvElanoXtvE">> = iolist_to_binary(re:replace("a","(?>a*)*","lano\\1Xt\\1vE",[global])), 
+    <<"EfuiyyaaybkaaVI">> = iolist_to_binary(re:replace("aa","(?>a*)*","Ef\\1uiyy&ybk&VI",[])), 
+    <<"EfuiyyaaybkaaVIEfuiyyybkVI">> = iolist_to_binary(re:replace("aa","(?>a*)*","Ef\\1uiyy&ybk&VI",[global])), 
+    <<"DFPlAS">> = iolist_to_binary(re:replace("aaaa","(?>a*)*","DFPlAS",[])), 
+    <<"DFPlASDFPlAS">> = iolist_to_binary(re:replace("aaaa","(?>a*)*","DFPlAS",[global])), 
+    <<"swvEIpc">> = iolist_to_binary(re:replace("abc","(abc|)+","sw\\1vEIpc",[])), 
+    <<"swvEIpcswvEIpc">> = iolist_to_binary(re:replace("abc","(abc|)+","sw\\1vEIpc",[global])), 
+    <<"Vm">> = iolist_to_binary(re:replace("abcabc","(abc|)+","Vm",[])), 
+    <<"VmVm">> = iolist_to_binary(re:replace("abcabc","(abc|)+","Vm",[global])), 
+    <<"vabcabcabcIecAabcabcabcvabcabcabcabcabcabcPMS">> = iolist_to_binary(re:replace("abcabcabc","(abc|)+","v&\\1IecA&v\\1&&PMS",[])), 
+    <<"vabcabcabcIecAabcabcabcvabcabcabcabcabcabcPMSvIecAvPMS">> = iolist_to_binary(re:replace("abcabcabc","(abc|)+","v&\\1IecA&v\\1&&PMS",[global])), 
+    <<"YpHLvbPebgHxyz">> = iolist_to_binary(re:replace("xyz","(abc|)+","YpH&LvbPebgH\\1",[])), 
+    <<"YpHLvbPebgHxYpHLvbPebgHyYpHLvbPebgHzYpHLvbPebgH">> = iolist_to_binary(re:replace("xyz","(abc|)+","YpH&LvbPebgH\\1",[global])), 
+    <<"aaUe">> = iolist_to_binary(re:replace("a","([a]*)*","&&Ue",[])), 
+    <<"aaUeUe">> = iolist_to_binary(re:replace("a","([a]*)*","&&Ue",[global])), 
+    <<"PaaaaapgFufTSYIkBuaaaaabKYVD">> = iolist_to_binary(re:replace("aaaaa","([a]*)*","P&pgFufTSYIkBu&bKYVD",[])), 
+    <<"PaaaaapgFufTSYIkBuaaaaabKYVDPpgFufTSYIkBubKYVD">> = iolist_to_binary(re:replace("aaaaa","([a]*)*","P&pgFufTSYIkBu&bKYVD",[global])), 
+    <<"qFRFDX">> = iolist_to_binary(re:replace("a","([ab]*)*","qFRFDX",[])), 
+    <<"qFRFDXqFRFDX">> = iolist_to_binary(re:replace("a","([ab]*)*","qFRFDX",[global])), 
+    <<"rcPIcjqP">> = iolist_to_binary(re:replace("b","([ab]*)*","rcP\\1IcjqP",[])), 
+    <<"rcPIcjqPrcPIcjqP">> = iolist_to_binary(re:replace("b","([ab]*)*","rcP\\1IcjqP",[global])), 
+    <<"sRJuN">> = iolist_to_binary(re:replace("ababab","([ab]*)*","s\\1R\\1JuN",[])), 
+    <<"sRJuNsRJuN">> = iolist_to_binary(re:replace("ababab","([ab]*)*","s\\1R\\1JuN",[global])), 
+    <<"GIaaaabFaYFbcde">> = iolist_to_binary(re:replace("aaaabcde","([ab]*)*","GI&FaYFb",[])), 
+    <<"GIaaaabFaYFbGIFaYFbcGIFaYFbdGIFaYFbeGIFaYFb">> = iolist_to_binary(re:replace("aaaabcde","([ab]*)*","GI&FaYFb",[global])), 
+    <<"meTmwKOIyGCbbbbANbbbbbbbbH">> = iolist_to_binary(re:replace("bbbb","([ab]*)*","meTmwK\\1OIy\\1GC&AN&&H",[])), 
+    <<"meTmwKOIyGCbbbbANbbbbbbbbHmeTmwKOIyGCANH">> = iolist_to_binary(re:replace("bbbb","([ab]*)*","meTmwK\\1OIy\\1GC&AN&&H",[global])), 
+    <<"nbjCbhrDRrlgSUiVJ">> = iolist_to_binary(re:replace("b","([^a]*)*","nbjC&hrDRrlgSUiV\\1J",[])), 
+    <<"nbjCbhrDRrlgSUiVJnbjChrDRrlgSUiVJ">> = iolist_to_binary(re:replace("b","([^a]*)*","nbjC&hrDRrlgSUiV\\1J",[global])), 
+    <<"EDtjVbbbbKGDbbbbmbbbbwKLjiR">> = iolist_to_binary(re:replace("bbbb","([^a]*)*","EDtjV&KGD&m&wK\\1Lj\\1iR",[])), 
+    <<"EDtjVbbbbKGDbbbbmbbbbwKLjiREDtjVKGDmwKLjiR">> = iolist_to_binary(re:replace("bbbb","([^a]*)*","EDtjV&KGD&m&wK\\1Lj\\1iR",[global])), 
+    <<"HlaUYcKUiWycCnKHNaaa">> = iolist_to_binary(re:replace("aaa","([^a]*)*","HlaUYcKUiWycCnKH\\1N",[])), 
+    <<"HlaUYcKUiWycCnKHNaHlaUYcKUiWycCnKHNaHlaUYcKUiWycCnKHNaHlaUYcKUiWycCnKHN">> = iolist_to_binary(re:replace("aaa","([^a]*)*","HlaUYcKUiWycCnKH\\1N",[global])), 
+    <<"eaccccgCccccOYNUlccccTcccc">> = iolist_to_binary(re:replace("cccc","([^ab]*)*","ea&g\\1C&OYNUl&\\1T&",[])), 
+    <<"eaccccgCccccOYNUlccccTcccceagCOYNUlT">> = iolist_to_binary(re:replace("cccc","([^ab]*)*","ea&g\\1C&OYNUl&\\1T&",[global])), 
+    <<"JyKBqDRhnabab">> = iolist_to_binary(re:replace("abab","([^ab]*)*","Jy&\\1KBqDRhn",[])), 
+    <<"JyKBqDRhnaJyKBqDRhnbJyKBqDRhnaJyKBqDRhnbJyKBqDRhn">> = iolist_to_binary(re:replace("abab","([^ab]*)*","Jy&\\1KBqDRhn",[global])), 
+    <<"vnligHISDuDiBa">> = iolist_to_binary(re:replace("a","([a]*?)*","v\\1nli&\\1gHISDuD\\1iB",[])), 
+    <<"vnligHISDuDiBvnliagHISDuDiBvnligHISDuDiB">> = iolist_to_binary(re:replace("a","([a]*?)*","v\\1nli&\\1gHISDuD\\1iB",[global])), 
+    <<"CrarAftguXnYNULohKyaaaa">> = iolist_to_binary(re:replace("aaaa","([a]*?)*","CrarAftguXnYN&ULohKy",[])), 
+    <<"CrarAftguXnYNULohKyCrarAftguXnYNaULohKyCrarAftguXnYNULohKyCrarAftguXnYNaULohKyCrarAftguXnYNULohKyCrarAftguXnYNaULohKyCrarAftguXnYNULohKyCrarAftguXnYNaULohKyCrarAftguXnYNULohKy">> = iolist_to_binary(re:replace("aaaa","([a]*?)*","CrarAftguXnYN&ULohKy",[global])), 
+    <<"BOfINa">> = iolist_to_binary(re:replace("a","([ab]*?)*","B&OfIN&",[])), 
+    <<"BOfINBaOfINaBOfIN">> = iolist_to_binary(re:replace("a","([ab]*?)*","B&OfIN&",[global])), 
+    <<"HBxFab">> = iolist_to_binary(re:replace("b","([ab]*?)*","H\\1\\1BxF\\1a",[])), 
+    <<"HBxFaHBxFaHBxFa">> = iolist_to_binary(re:replace("b","([ab]*?)*","H\\1\\1BxF\\1a",[global])), 
+    <<"rkuWEckrabab">> = iolist_to_binary(re:replace("abab","([ab]*?)*","rkuWEc\\1kr",[])), 
+    <<"rkuWEckrrkuWEckrrkuWEckrrkuWEckrrkuWEckrrkuWEckrrkuWEckrrkuWEckrrkuWEckr">> = iolist_to_binary(re:replace("abab","([ab]*?)*","rkuWEc\\1kr",[global])), 
+    <<"dedrbsbaba">> = iolist_to_binary(re:replace("baba","([ab]*?)*","dedrbs",[])), 
+    <<"dedrbsdedrbsdedrbsdedrbsdedrbsdedrbsdedrbsdedrbsdedrbs">> = iolist_to_binary(re:replace("baba","([ab]*?)*","dedrbs",[global])), 
+    <<"b">> = iolist_to_binary(re:replace("b","([^a]*?)*","\\1",[])), 
+    <<"">> = iolist_to_binary(re:replace("b","([^a]*?)*","\\1",[global])), 
+    <<"rrARQqtjsbbbb">> = iolist_to_binary(re:replace("bbbb","([^a]*?)*","rr&ARQq\\1\\1tjs",[])), 
+    <<"rrARQqtjsrrbARQqtjsrrARQqtjsrrbARQqtjsrrARQqtjsrrbARQqtjsrrARQqtjsrrbARQqtjsrrARQqtjs">> = iolist_to_binary(re:replace("bbbb","([^a]*?)*","rr&ARQq\\1\\1tjs",[global])), 
+    <<"PGcsmlReJQeaaa">> = iolist_to_binary(re:replace("aaa","([^a]*?)*","PGcsm&&lReJQe&",[])), 
+    <<"PGcsmlReJQeaPGcsmlReJQeaPGcsmlReJQeaPGcsmlReJQe">> = iolist_to_binary(re:replace("aaa","([^a]*?)*","PGcsm&&lReJQe&",[global])), 
+    <<"nuspMpmvVOsyyChRc">> = iolist_to_binary(re:replace("c","([^ab]*?)*","nusp&Mp\\1mvVOsyyChR",[])), 
+    <<"nuspMpmvVOsyyChRnuspcMpmvVOsyyChRnuspMpmvVOsyyChR">> = iolist_to_binary(re:replace("c","([^ab]*?)*","nusp&Mp\\1mvVOsyyChR",[global])), 
+    <<"GbhjrQmJMQvcccc">> = iolist_to_binary(re:replace("cccc","([^ab]*?)*","Gbhj&rQmJMQv",[])), 
+    <<"GbhjrQmJMQvGbhjcrQmJMQvGbhjrQmJMQvGbhjcrQmJMQvGbhjrQmJMQvGbhjcrQmJMQvGbhjrQmJMQvGbhjcrQmJMQvGbhjrQmJMQv">> = iolist_to_binary(re:replace("cccc","([^ab]*?)*","Gbhj&rQmJMQv",[global])), 
+    <<"qlNFbaba">> = iolist_to_binary(re:replace("baba","([^ab]*?)*","qlNF",[])), 
+    <<"qlNFbqlNFaqlNFbqlNFaqlNF">> = iolist_to_binary(re:replace("baba","([^ab]*?)*","qlNF",[global])), 
+    <<"KQaNecIrOxNy">> = iolist_to_binary(re:replace("a","(?>a*)*","KQ\\1&NecIrOxNy",[])), 
+    <<"KQaNecIrOxNyKQNecIrOxNy">> = iolist_to_binary(re:replace("a","(?>a*)*","KQ\\1&NecIrOxNy",[global])), 
+    <<"VSaaaJEKwmaaaUrFoAmveCbcde">> = iolist_to_binary(re:replace("aaabcde","(?>a*)*","VS&JEKwm&UrFoAmv\\1eC",[])), 
+    <<"VSaaaJEKwmaaaUrFoAmveCVSJEKwmUrFoAmveCbVSJEKwmUrFoAmveCcVSJEKwmUrFoAmveCdVSJEKwmUrFoAmveCeVSJEKwmUrFoAmveC">> = iolist_to_binary(re:replace("aaabcde","(?>a*)*","VS&JEKwm&UrFoAmv\\1eC",[global])), 
+    <<"UCWWaaaaaSi">> = iolist_to_binary(re:replace("aaaaa","((?>a*))*","UCW\\1W&Si",[])), 
+    <<"UCWWaaaaaSiUCWWSi">> = iolist_to_binary(re:replace("aaaaa","((?>a*))*","UCW\\1W&Si",[global])), 
+    <<"Ynbbaa">> = iolist_to_binary(re:replace("aabbaa","((?>a*))*","Yn",[])), 
+    <<"YnYnbYnbYnYn">> = iolist_to_binary(re:replace("aabbaa","((?>a*))*","Yn",[global])), 
+    ok.
+run14() ->
+    <<"MLgsOWdfTvaaaaa">> = iolist_to_binary(re:replace("aaaaa","((?>a*?))*","MLgs&OW\\1df&T&v",[])), 
+    <<"MLgsOWdfTvaMLgsOWdfTvaMLgsOWdfTvaMLgsOWdfTvaMLgsOWdfTvaMLgsOWdfTv">> = iolist_to_binary(re:replace("aaaaa","((?>a*?))*","MLgs&OW\\1df&T&v",[global])), 
+    <<"aabbaa">> = iolist_to_binary(re:replace("aabbaa","((?>a*?))*","&",[])), 
+    <<"aabbaa">> = iolist_to_binary(re:replace("aabbaa","((?>a*?))*","&",[global])), 
+    <<"gTBVcFPFf12-sep-98nd">> = iolist_to_binary(re:replace("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","gTBVcFPFf&\\1nd",[extended])), 
+    <<"gTBVcFPFf12-sep-98nd">> = iolist_to_binary(re:replace("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","gTBVcFPFf&\\1nd",[extended,
+                                                                                                                                                                                                                                                                                                                                            global])), 
+    <<"12-09-98h12-09-98Vrh12-09-98">> = iolist_to_binary(re:replace("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","&h&\\1Vrh\\1&",[extended])), 
+    <<"12-09-98h12-09-98Vrh12-09-98">> = iolist_to_binary(re:replace("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","&h&\\1Vrh\\1&",[extended,
+                                                                                                                                                                                                                                                                                                                                         global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","W&ve&i&",[extended])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","W&ve&i&",[extended,
+                                                                                                                                                                                                                                                                                                                                 global])), 
+    <<"sep-12-98">> = iolist_to_binary(re:replace("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","UrC",[extended])), 
+    <<"sep-12-98">> = iolist_to_binary(re:replace("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ","UrC",[extended,
+                                                                                                                                                                                                                                                                                                                  global])), 
+    <<"foodfooCEjVBAfoo">> = iolist_to_binary(re:replace("foobarfoo","(?<=(foo))bar\\1","d\\1CEjVBA\\1",[])), 
+    <<"foodfooCEjVBAfoo">> = iolist_to_binary(re:replace("foobarfoo","(?<=(foo))bar\\1","d\\1CEjVBA\\1",[global])), 
+    <<"foovctling">> = iolist_to_binary(re:replace("foobarfootling","(?<=(foo))bar\\1","vc",[])), 
+    <<"foovctling">> = iolist_to_binary(re:replace("foobarfootling","(?<=(foo))bar\\1","vc",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo))bar\\1","UXvqXj\\1yXDrW\\1&UV&aD",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(foo))bar\\1","UXvqXj\\1yXDrW\\1&UV&aD",[global])), 
+    <<"foobar">> = iolist_to_binary(re:replace("foobar","(?<=(foo))bar\\1","VWpBPnVuwGDg",[])), 
+    <<"foobar">> = iolist_to_binary(re:replace("foobar","(?<=(foo))bar\\1","VWpBPnVuwGDg",[global])), 
+    <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<=(foo))bar\\1","&jX",[])), 
+    <<"barfoo">> = iolist_to_binary(re:replace("barfoo","(?<=(foo))bar\\1","&jX",[global])), 
+    <<"sQWfkfUNJnPcyC">> = iolist_to_binary(re:replace("saturday","(?i:saturday|sunday)","sQ\\1Wf\\1kfUNJnPcyC",[])), 
+    <<"sQWfkfUNJnPcyC">> = iolist_to_binary(re:replace("saturday","(?i:saturday|sunday)","sQ\\1Wf\\1kfUNJnPcyC",[global])), 
+    <<"xWJnRsundayofsundayP">> = iolist_to_binary(re:replace("sunday","(?i:saturday|sunday)","xWJn\\1R&of\\1&P",[])), 
+    <<"xWJnRsundayofsundayP">> = iolist_to_binary(re:replace("sunday","(?i:saturday|sunday)","xWJn\\1R&of\\1&P",[global])), 
+    <<"SaturdayWo">> = iolist_to_binary(re:replace("Saturday","(?i:saturday|sunday)","&W\\1o",[])), 
+    <<"SaturdayWo">> = iolist_to_binary(re:replace("Saturday","(?i:saturday|sunday)","&W\\1o",[global])), 
+    <<"TdQtxuqoDxI">> = iolist_to_binary(re:replace("Sunday","(?i:saturday|sunday)","TdQtxuqoDxI",[])), 
+    <<"TdQtxuqoDxI">> = iolist_to_binary(re:replace("Sunday","(?i:saturday|sunday)","TdQtxuqoDxI",[global])), 
+    <<"tSATURDAYpA">> = iolist_to_binary(re:replace("SATURDAY","(?i:saturday|sunday)","t&\\1pA",[])), 
+    <<"tSATURDAYpA">> = iolist_to_binary(re:replace("SATURDAY","(?i:saturday|sunday)","t&\\1pA",[global])), 
+    <<"PSUNDAYVdHPKeqeCHsbPht">> = iolist_to_binary(re:replace("SUNDAY","(?i:saturday|sunday)","P&VdHPKeqeCH\\1sbPht",[])), 
+    <<"PSUNDAYVdHPKeqeCHsbPht">> = iolist_to_binary(re:replace("SUNDAY","(?i:saturday|sunday)","P&VdHPKeqeCH\\1sbPht",[global])), 
+    <<"ADh">> = iolist_to_binary(re:replace("SunDay","(?i:saturday|sunday)","A\\1D\\1h\\1",[])), 
+    <<"ADh">> = iolist_to_binary(re:replace("SunDay","(?i:saturday|sunday)","A\\1D\\1h\\1",[global])), 
+    <<"mGKtRabcxPabcxJ">> = iolist_to_binary(re:replace("abcx","(a(?i)bc|BB)x","mGKtR&P&J",[])), 
+    <<"mGKtRabcxPabcxJ">> = iolist_to_binary(re:replace("abcx","(a(?i)bc|BB)x","mGKtR&P&J",[global])), 
+    <<"oaBCxMk">> = iolist_to_binary(re:replace("aBCx","(a(?i)bc|BB)x","o&Mk",[])), 
+    <<"oaBCxMk">> = iolist_to_binary(re:replace("aBCx","(a(?i)bc|BB)x","o&Mk",[global])), 
+    <<"BbbxAbbbbw">> = iolist_to_binary(re:replace("bbx","(a(?i)bc|BB)x","B&A\\1\\1w",[])), 
+    <<"BbbxAbbbbw">> = iolist_to_binary(re:replace("bbx","(a(?i)bc|BB)x","B&A\\1\\1w",[global])), 
+    <<"mJcBBAxatfogiBBBBOBBxw">> = iolist_to_binary(re:replace("BBx","(a(?i)bc|BB)x","mJc\\1Axatfogi\\1\\1O&w",[])), 
+    <<"mJcBBAxatfogiBBBBOBBxw">> = iolist_to_binary(re:replace("BBx","(a(?i)bc|BB)x","mJc\\1Axatfogi\\1\\1O&w",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)bc|BB)x","snLiVTr\\1v&GcLOx",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(a(?i)bc|BB)x","snLiVTr\\1v&GcLOx",[global])), 
+    <<"abcX">> = iolist_to_binary(re:replace("abcX","(a(?i)bc|BB)x","cUgeDoMeUddk\\1X&",[])), 
+    <<"abcX">> = iolist_to_binary(re:replace("abcX","(a(?i)bc|BB)x","cUgeDoMeUddk\\1X&",[global])), 
+    <<"aBCX">> = iolist_to_binary(re:replace("aBCX","(a(?i)bc|BB)x","x\\1a&yaxHWdGs&udxU",[])), 
+    <<"aBCX">> = iolist_to_binary(re:replace("aBCX","(a(?i)bc|BB)x","x\\1a&yaxHWdGs&udxU",[global])), 
+    <<"bbX">> = iolist_to_binary(re:replace("bbX","(a(?i)bc|BB)x","AmUQ&rURn&&",[])), 
+    <<"bbX">> = iolist_to_binary(re:replace("bbX","(a(?i)bc|BB)x","AmUQ&rURn&&",[global])), 
+    <<"BBX">> = iolist_to_binary(re:replace("BBX","(a(?i)bc|BB)x","&\\1bNvEcoUrediWbu&Pbp",[])), 
+    <<"BBX">> = iolist_to_binary(re:replace("BBX","(a(?i)bc|BB)x","&\\1bNvEcoUrediWbu&Pbp",[global])), 
+    <<"UvDhoExRiacBIgOkt">> = iolist_to_binary(re:replace("ac","^([ab](?i)[cd]|[ef])","UvDhoExRi&BIgOkt",[])), 
+    <<"UvDhoExRiacBIgOkt">> = iolist_to_binary(re:replace("ac","^([ab](?i)[cd]|[ef])","UvDhoExRi&BIgOkt",[global])), 
+    <<"xPaCaCRDAtETUaCMGcb">> = iolist_to_binary(re:replace("aC","^([ab](?i)[cd]|[ef])","xP&\\1RDAtETU\\1MGcb",[])), 
+    <<"xPaCaCRDAtETUaCMGcb">> = iolist_to_binary(re:replace("aC","^([ab](?i)[cd]|[ef])","xP&\\1RDAtETU\\1MGcb",[global])), 
+    <<"YrbDPg">> = iolist_to_binary(re:replace("bD","^([ab](?i)[cd]|[ef])","Yr&Pg",[])), 
+    <<"YrbDPg">> = iolist_to_binary(re:replace("bD","^([ab](?i)[cd]|[ef])","Yr&Pg",[global])), 
+    <<"vxPeqqmHlephant">> = iolist_to_binary(re:replace("elephant","^([ab](?i)[cd]|[ef])","vxP&qqmH",[])), 
+    <<"vxPeqqmHlephant">> = iolist_to_binary(re:replace("elephant","^([ab](?i)[cd]|[ef])","vxP&qqmH",[global])), 
+    <<"CXttEDburope">> = iolist_to_binary(re:replace("Europe","^([ab](?i)[cd]|[ef])","CXtt\\1Db",[])), 
+    <<"CXttEDburope">> = iolist_to_binary(re:replace("Europe","^([ab](?i)[cd]|[ef])","CXtt\\1Db",[global])), 
+    <<"ckdAsOrog">> = iolist_to_binary(re:replace("frog","^([ab](?i)[cd]|[ef])","ckdAsO",[])), 
+    <<"ckdAsOrog">> = iolist_to_binary(re:replace("frog","^([ab](?i)[cd]|[ef])","ckdAsO",[global])), 
+    <<"FLAarance">> = iolist_to_binary(re:replace("France","^([ab](?i)[cd]|[ef])","\\1LAa",[])), 
+    <<"FLAarance">> = iolist_to_binary(re:replace("France","^([ab](?i)[cd]|[ef])","\\1LAa",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([ab](?i)[cd]|[ef])","&dK",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^([ab](?i)[cd]|[ef])","&dK",[global])), 
+    <<"Africa">> = iolist_to_binary(re:replace("Africa","^([ab](?i)[cd]|[ef])","he&mN&m",[])), 
+    <<"Africa">> = iolist_to_binary(re:replace("Africa","^([ab](?i)[cd]|[ef])","he&mN&m",[global])), 
+    <<"QwnababababWRxgc">> = iolist_to_binary(re:replace("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","Qwn&\\1\\1&WRxgc",[])), 
+    <<"QwnababababWRxgc">> = iolist_to_binary(re:replace("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","Qwn&\\1\\1&WRxgc",[global])), 
+    <<"alixQPHvMhCA">> = iolist_to_binary(re:replace("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","alixQPHvMhCA",[])), 
+    <<"alixQPHvMhCA">> = iolist_to_binary(re:replace("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","alixQPHvMhCA",[global])), 
+    <<"fRTxgJVEjxyBxyliXrOuh">> = iolist_to_binary(re:replace("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","fRTxgJVEj\\1B\\1liXrOuh",[])), 
+    <<"fRTxgJVEjxyBxyliXrOuh">> = iolist_to_binary(re:replace("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","fRTxgJVEj\\1B\\1liXrOuh",[global])), 
+    <<"xYRFpytKCFxYlEt">> = iolist_to_binary(re:replace("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&RFpytKCF&lEt",[])), 
+    <<"xYRFpytKCFxYlEt">> = iolist_to_binary(re:replace("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&RFpytKCF&lEt",[global])), 
+    <<"vgzjebra">> = iolist_to_binary(re:replace("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","vg&j",[])), 
+    <<"vgzjebra">> = iolist_to_binary(re:replace("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","vg&j",[global])), 
+    <<"eZFmjyambesi">> = iolist_to_binary(re:replace("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","e&Fmjy",[])), 
+    <<"eZFmjyambesi">> = iolist_to_binary(re:replace("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","e&Fmjy",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","a",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","a",[global])), 
+    <<"aCD">> = iolist_to_binary(re:replace("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","gEOo",[])), 
+    <<"aCD">> = iolist_to_binary(re:replace("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","gEOo",[global])), 
+    <<"XY">> = iolist_to_binary(re:replace("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&OrTvY&r\\1a\\1tNgO\\1",[])), 
+    <<"XY">> = iolist_to_binary(re:replace("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)","&OrTvY&r\\1a\\1tNgO\\1",[global])), 
+    <<"foo
+sutSyiAVbardY">> = iolist_to_binary(re:replace("foo
+bar","(?<=foo\\n)^bar","sutSyiAV&dY",[multiline])), 
+    <<"foo
+sutSyiAVbardY">> = iolist_to_binary(re:replace("foo
+bar","(?<=foo\\n)^bar","sutSyiAV&dY",[multiline,global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=foo\\n)^bar","SbD\\1F&CKeqGUc\\1&",[multiline])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=foo\\n)^bar","SbD\\1F&CKeqGUc\\1&",[multiline,
+                                                                                                                                                                                                                                        global])), 
+    <<"bar">> = iolist_to_binary(re:replace("bar","(?<=foo\\n)^bar","yi&DP",[multiline])), 
+    <<"bar">> = iolist_to_binary(re:replace("bar","(?<=foo\\n)^bar","yi&DP",[multiline,
+                                                                                                                                                                                         global])), 
+    <<"baz
 bar">> = iolist_to_binary(re:replace("baz
-bar","(?<=foo\\n)^bar","&JIhqO&Da",[multiline])), 
-?line <<"baz
+bar","(?<=foo\\n)^bar","hGG",[multiline])), 
+    <<"baz
 bar">> = iolist_to_binary(re:replace("baz
-bar","(?<=foo\\n)^bar","&JIhqO&Da",[multiline,global])), 
-?line <<"baruQUCmWhYKFBWj">> = iolist_to_binary(re:replace("barbaz","(?<=(?<!foo)bar)baz","uQUCmWhYKF\\1BWj\\1",[])), 
-?line <<"baruQUCmWhYKFBWj">> = iolist_to_binary(re:replace("barbaz","(?<=(?<!foo)bar)baz","uQUCmWhYKF\\1BWj\\1",[global])), 
-?line <<"barbarTNMlbazRYUbazYJyQER">> = iolist_to_binary(re:replace("barbarbaz","(?<=(?<!foo)bar)baz","TNMl\\1&RYU&YJyQER",[])), 
-?line <<"barbarTNMlbazRYUbazYJyQER">> = iolist_to_binary(re:replace("barbarbaz","(?<=(?<!foo)bar)baz","TNMl\\1&RYU&YJyQER",[global])), 
-?line <<"koobarxhTvv">> = iolist_to_binary(re:replace("koobarbaz","(?<=(?<!foo)bar)baz","xhTvv\\1",[])), 
-?line <<"koobarxhTvv">> = iolist_to_binary(re:replace("koobarbaz","(?<=(?<!foo)bar)baz","xhTvv\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?<!foo)bar)baz","uHmyIQ&yV&hQ&Di&\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?<!foo)bar)baz","uHmyIQ&yV&hQ&Di&\\1",[global])), 
-?line <<"baz">> = iolist_to_binary(re:replace("baz","(?<=(?<!foo)bar)baz","B",[])), 
-?line <<"baz">> = iolist_to_binary(re:replace("baz","(?<=(?<!foo)bar)baz","B",[global])), 
-?line <<"foobarbaz">> = iolist_to_binary(re:replace("foobarbaz","(?<=(?<!foo)bar)baz","BuNXYgf",[])), 
-?line <<"foobarbaz">> = iolist_to_binary(re:replace("foobarbaz","(?<=(?<!foo)bar)baz","BuNXYgf",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?){4}$","N\\1&Psi",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?){4}$","N\\1&Psi",[global])), 
-?line <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?){4}$","&",[])), 
-?line <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?){4}$","&",[global])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?){4}$","\\1OPhpdjl&J&F&j",[])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?){4}$","\\1OPhpdjl&J&F&j",[global])), 
-?line <<"oEaaPaaaaFyHMpKbNxCqlyG">> = iolist_to_binary(re:replace("aaaa","^(a\\1?){4}$","oE\\1\\1P&FyHMpKbNxCqlyG",[])), 
-?line <<"oEaaPaaaaFyHMpKbNxCqlyG">> = iolist_to_binary(re:replace("aaaa","^(a\\1?){4}$","oE\\1\\1P&FyHMpKbNxCqlyG",[global])), 
-?line <<"aaaaaawR">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?){4}$","\\1&wR",[])), 
-?line <<"aaaaaawR">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?){4}$","\\1&wR",[global])), 
-?line <<"SaWUrMlNUaaaaaaaaaaaaaan">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?){4}$","S\\1WUrMlNU&&n",[])), 
-?line <<"SaWUrMlNUaaaaaaaaaaaaaan">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?){4}$","S\\1WUrMlNU&&n",[global])), 
-?line <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?){4}$","Vk&&RgxI\\1\\1pJ&&",[])), 
-?line <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?){4}$","Vk&&RgxI\\1\\1pJ&&",[global])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","x",[])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","x",[global])), 
-?line <<"FEkJCFraaaaaaaaaaaaaaaaaaaaMlwosy">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","FEkJCFr&&Mlwosy",[])), 
-?line <<"FEkJCFraaaaaaaaaaaaaaaaaaaaMlwosy">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","FEkJCFr&&Mlwosy",[global])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","&IO",[])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","&IO",[global])), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?){4}$","lKw",[])), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?){4}$","lKw",[global])), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?){4}$","nN&bSVJh\\1J\\1d&Ko",[])), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?){4}$","nN&bSVJh\\1J\\1d&Ko",[global])), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?){4}$","Fut\\1X\\1",[])), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?){4}$","Fut\\1X\\1",[global])), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?){4}$","v",[])), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?){4}$","v",[global])), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?){4}$","b",[])), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?){4}$","b",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","VC",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","VC",[global])), 
-?line <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","&&mKsMkXfPP",[])), 
-?line <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","&&mKsMkXfPP",[global])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","c\\1HhkFrF&vy&\\1bmNHPw",[])), 
-?line <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","c\\1HhkFrF&vy&\\1bmNHPw",[global])), 
-?line <<"SnJcTQRFQiat">> = iolist_to_binary(re:replace("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","SnJcTQRFQi\\1t",[])), 
-?line <<"SnJcTQRFQiat">> = iolist_to_binary(re:replace("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","SnJcTQRFQi\\1t",[global])), 
-?line <<"MaaaaakiYfFeaaaaaetD">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","M&kiYfFe&etD",[])), 
-?line <<"MaaaaakiYfFeaaaaaetD">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","M&kiYfFe&etD",[global])), 
-?line <<"WDaaaaaasEn">> = iolist_to_binary(re:replace("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","WD&sEn",[])), 
-?line <<"WDaaaaaasEn">> = iolist_to_binary(re:replace("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","WD&sEn",[global])), 
-?line <<"sauvrqyMaaaaaaaEvrD">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","s\\1uvrqyM&EvrD",[])), 
-?line <<"sauvrqyMaaaaaaaEvrD">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","s\\1uvrqyM&EvrD",[global])), 
-?line <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","WyhxEMLFTAGuL&Hymc",[])), 
-?line <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","WyhxEMLFTAGuL&Hymc",[global])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","\\1WXGI&T&rPigX\\1IAQu",[])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","\\1WXGI&T&rPigX\\1IAQu",[global])), 
-?line <<"HaaaaaaaaaajHUn">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","H&jHUn",[])), 
-?line <<"HaaaaaaaaaajHUn">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","H&jHUn",[global])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","e",[])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","e",[global])), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dSM\\1GGkyX&xNUIVG&",[])), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dSM\\1GGkyX&xNUIVG&",[global])), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","p\\1T",[])), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","p\\1T",[global])), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","wOWcxD\\1e&",[])), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","wOWcxD\\1e&",[global])), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","C&CWw&kAen&",[])), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","C&CWw&kAen&",[global])), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","rkiiFEQ&WDahG&lSqR",[])), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","rkiiFEQ&WDahG&lSqR",[global])), 
-?line <<"babcoabcabcESPlWKsDDog">> = iolist_to_binary(re:replace("abc","abc","b&o&&\\1ES\\1\\1PlWKsD\\1Dog",[])), 
-?line <<"babcoabcabcESPlWKsDDog">> = iolist_to_binary(re:replace("abc","abc","b&o&&\\1ES\\1\\1PlWKsD\\1Dog",[global])), 
-?line <<"xFfvcJy">> = iolist_to_binary(re:replace("xabcy","abc","FfvcJ",[])), 
-?line <<"xFfvcJy">> = iolist_to_binary(re:replace("xabcy","abc","FfvcJ",[global])), 
-?line <<"abaGvHrWEIIXoI">> = iolist_to_binary(re:replace("ababc","abc","a\\1\\1G\\1v\\1HrWEIIXoI\\1",[])), 
-?line <<"abaGvHrWEIIXoI">> = iolist_to_binary(re:replace("ababc","abc","a\\1\\1G\\1v\\1HrWEIIXoI\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","DOtxCgk&UIBKmk\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","DOtxCgk&UIBKmk\\1",[global])), 
-?line <<"xbc">> = iolist_to_binary(re:replace("xbc","abc","qmfvVTE\\1aHl\\1BT&U",[])), 
-?line <<"xbc">> = iolist_to_binary(re:replace("xbc","abc","qmfvVTE\\1aHl\\1BT&U",[global])), 
-?line <<"axc">> = iolist_to_binary(re:replace("axc","abc","uN&yFKoX\\1pBswe\\1HLf",[])), 
-?line <<"axc">> = iolist_to_binary(re:replace("axc","abc","uN&yFKoX\\1pBswe\\1HLf",[global])), 
-?line <<"abx">> = iolist_to_binary(re:replace("abx","abc","&v\\1\\1QwMhqY",[])), 
-?line <<"abx">> = iolist_to_binary(re:replace("abx","abc","&v\\1\\1QwMhqY",[global])), 
-?line <<"FIOGpcHeabcNHJ">> = iolist_to_binary(re:replace("abc","ab*c","FIOGpcHe&NHJ",[])), 
-?line <<"FIOGpcHeabcNHJ">> = iolist_to_binary(re:replace("abc","ab*c","FIOGpcHe&NHJ",[global])), 
-?line <<"abcbnCUabcnxKKHabcXVaO">> = iolist_to_binary(re:replace("abc","ab*bc","&bnCU&n\\1xKKH&\\1XVaO",[])), 
-?line <<"abcbnCUabcnxKKHabcXVaO">> = iolist_to_binary(re:replace("abc","ab*bc","&bnCU&n\\1xKKH&\\1XVaO",[global])), 
-?line <<"bFtejUbnDA">> = iolist_to_binary(re:replace("abbc","ab*bc","bFtejUbn\\1DA",[])), 
-?line <<"bFtejUbnDA">> = iolist_to_binary(re:replace("abbc","ab*bc","bFtejUbn\\1DA",[global])), 
-?line <<"W">> = iolist_to_binary(re:replace("abbbbc","ab*bc","W",[])), 
-?line <<"W">> = iolist_to_binary(re:replace("abbbbc","ab*bc","W",[global])), 
-?line <<"BlaEararHKSGaabbbbc">> = iolist_to_binary(re:replace("abbbbc",".{1}","Bl&E&r&r\\1HKSG&&\\1",[])), 
-?line <<"BlaEararHKSGaaBlbEbrbrHKSGbbBlbEbrbrHKSGbbBlbEbrbrHKSGbbBlbEbrbrHKSGbbBlcEcrcrHKSGcc">> = iolist_to_binary(re:replace("abbbbc",".{1}","Bl&E&r&r\\1HKSG&&\\1",[global])), 
-?line <<"pabbbcRXxcEabbbIabbbXTbc">> = iolist_to_binary(re:replace("abbbbc",".{3,4}","p&cRXxcE&I&XT",[])), 
-?line <<"pabbbcRXxcEabbbIabbbXTbc">> = iolist_to_binary(re:replace("abbbbc",".{3,4}","p&cRXxcE&I&XT",[global])), 
-?line <<"HkIFCqCBaabbbbcyHm">> = iolist_to_binary(re:replace("abbbbc","ab{0,}bc","Hk\\1IFCq\\1CBa&yHm",[])), 
-?line <<"HkIFCqCBaabbbbcyHm">> = iolist_to_binary(re:replace("abbbbc","ab{0,}bc","Hk\\1IFCq\\1CBa&yHm",[global])), 
-?line <<"HBKHabbcHxdabbciuxleGabbc">> = iolist_to_binary(re:replace("abbc","ab+bc","HBKH&\\1Hx\\1d&iuxleG&",[])), 
-?line <<"HBKHabbcHxdabbciuxleGabbc">> = iolist_to_binary(re:replace("abbc","ab+bc","HBKH&\\1Hx\\1d&iuxleG&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","&Pm&sRjS",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","&Pm&sRjS",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","ab+bc","IiWLkYFrIIhMk\\1D\\1vagP",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","ab+bc","IiWLkYFrIIhMk\\1D\\1vagP",[global])), 
-?line <<"abq">> = iolist_to_binary(re:replace("abq","ab+bc","&\\1\\1UiX\\1&MgPB",[])), 
-?line <<"abq">> = iolist_to_binary(re:replace("abq","ab+bc","&\\1\\1UiX\\1&MgPB",[global])), 
-?line <<"WLvlqVMuiA">> = iolist_to_binary(re:replace("abbbbc","ab+bc","WLvlqVMuiA",[])), 
-?line <<"WLvlqVMuiA">> = iolist_to_binary(re:replace("abbbbc","ab+bc","WLvlqVMuiA",[global])), 
-?line <<"qQ">> = iolist_to_binary(re:replace("abbbbc","ab{1,}bc","qQ",[])), 
-?line <<"qQ">> = iolist_to_binary(re:replace("abbbbc","ab{1,}bc","qQ",[global])), 
-?line <<"ALwvHVhFGH">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","A\\1LwvHVhFGH",[])), 
-?line <<"ALwvHVhFGH">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","A\\1LwvHVhFGH",[global])), 
-?line <<"ORLsuabbbbc">> = iolist_to_binary(re:replace("abbbbc","ab{3,4}bc","ORL\\1su&",[])), 
-?line <<"ORLsuabbbbc">> = iolist_to_binary(re:replace("abbbbc","ab{3,4}bc","ORL\\1su&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}bc","APwPKjxS\\1Di&\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}bc","APwPKjxS\\1Di&\\1",[global])), 
-?line <<"abq">> = iolist_to_binary(re:replace("abq","ab{4,5}bc","FVk",[])), 
-?line <<"abq">> = iolist_to_binary(re:replace("abq","ab{4,5}bc","FVk",[global])), 
-?line <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","ab{4,5}bc","PO&t",[])), 
-?line <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","ab{4,5}bc","PO&t",[global])), 
-?line <<"EHtIXyQbabbclaCBg">> = iolist_to_binary(re:replace("abbc","ab?bc","EHtIXyQb&laCBg",[])), 
-?line <<"EHtIXyQbabbclaCBg">> = iolist_to_binary(re:replace("abbc","ab?bc","EHtIXyQb&laCBg",[global])), 
-?line <<"SVx">> = iolist_to_binary(re:replace("abc","ab?bc","SVx",[])), 
-?line <<"SVx">> = iolist_to_binary(re:replace("abc","ab?bc","SVx",[global])), 
-?line <<"KJabcWtBNRX">> = iolist_to_binary(re:replace("abc","ab{0,1}bc","KJ&WtBNRX",[])), 
-?line <<"KJabcWtBNRX">> = iolist_to_binary(re:replace("abc","ab{0,1}bc","KJ&WtBNRX",[global])), 
-?line <<"oabcQlOwmmeXxTySSV">> = iolist_to_binary(re:replace("abc","ab?c","o&Q\\1lOwmmeXx\\1TySSV",[])), 
-?line <<"oabcQlOwmmeXxTySSV">> = iolist_to_binary(re:replace("abc","ab?c","o&Q\\1lOwmmeXx\\1TySSV",[global])), 
-?line <<"abcQpPYPtQcFabcCDEcWOl">> = iolist_to_binary(re:replace("abc","ab{0,1}c","&QpPY\\1PtQcF&CDEcWOl",[])), 
-?line <<"abcQpPYPtQcFabcCDEcWOl">> = iolist_to_binary(re:replace("abc","ab{0,1}c","&QpPY\\1PtQcF&CDEcWOl",[global])), 
-?line <<"YbB">> = iolist_to_binary(re:replace("abc","^abc$","YbB",[])), 
-?line <<"YbB">> = iolist_to_binary(re:replace("abc","^abc$","YbB",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","r&t\\1OLYfC",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","r&t\\1OLYfC",[global])), 
-?line <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","^abc$","P&QwAxc\\1vYfQF",[])), 
-?line <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","^abc$","P&QwAxc\\1vYfQF",[global])), 
-?line <<"abcc">> = iolist_to_binary(re:replace("abcc","^abc$","d\\1j&LhAN\\1JvojhyCmSwU",[])), 
-?line <<"abcc">> = iolist_to_binary(re:replace("abcc","^abc$","d\\1j&LhAN\\1JvojhyCmSwU",[global])), 
-?line <<"yabcxAc">> = iolist_to_binary(re:replace("abcc","^abc","y\\1&xA",[])), 
-?line <<"yabcxAc">> = iolist_to_binary(re:replace("abcc","^abc","y\\1&xA",[global])), 
-?line <<"awrOx">> = iolist_to_binary(re:replace("aabc","abc$","wrOx",[])), 
-?line <<"awrOx">> = iolist_to_binary(re:replace("aabc","abc$","wrOx",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","XLe",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","XLe",[global])), 
-?line <<"aRthCinfyGSJTg">> = iolist_to_binary(re:replace("aabc","abc$","\\1RthCi\\1nfyGSJTg",[])), 
-?line <<"aRthCinfyGSJTg">> = iolist_to_binary(re:replace("aabc","abc$","\\1RthCi\\1nfyGSJTg",[global])), 
-?line <<"aabcd">> = iolist_to_binary(re:replace("aabcd","abc$","UT&CPLaUA\\1nluQPA",[])), 
-?line <<"aabcd">> = iolist_to_binary(re:replace("aabcd","abc$","UT&CPLaUA\\1nluQPA",[global])), 
-?line <<"hYaxcodDoHwNTLtDQoabc">> = iolist_to_binary(re:replace("abc","^","hYaxc&o&dDoHwNTLtDQo",[])), 
-?line <<"hYaxcodDoHwNTLtDQoabc">> = iolist_to_binary(re:replace("abc","^","hYaxc&o&dDoHwNTLtDQo",[global])), 
-?line <<"abcepxRqYNdJMdQeRKr">> = iolist_to_binary(re:replace("abc","$","epxRqYNdJ&MdQeR&Kr",[])), 
-?line <<"abcepxRqYNdJMdQeRKr">> = iolist_to_binary(re:replace("abc","$","epxRqYNdJ&MdQeR&Kr",[global])), 
-?line <<"vnabcXvSRrFjWv">> = iolist_to_binary(re:replace("abc","a.c","\\1vn&X\\1vSRrFj\\1Wv",[])), 
-?line <<"vnabcXvSRrFjWv">> = iolist_to_binary(re:replace("abc","a.c","\\1vn&X\\1vSRrFj\\1Wv",[global])), 
-?line <<"YSYAvHCLl">> = iolist_to_binary(re:replace("axc","a.c","Y\\1\\1SYAvHCLl",[])), 
-?line <<"YSYAvHCLl">> = iolist_to_binary(re:replace("axc","a.c","Y\\1\\1SYAvHCLl",[global])), 
-?line <<"oTi">> = iolist_to_binary(re:replace("axyzc","a.*c","oTi",[])), 
-?line <<"oTi">> = iolist_to_binary(re:replace("axyzc","a.*c","oTi",[global])), 
-?line <<"abdd">> = iolist_to_binary(re:replace("abd","a[bc]d","&d",[])), 
-?line <<"abdd">> = iolist_to_binary(re:replace("abd","a[bc]d","&d",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bc]d","m",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bc]d","m",[global])), 
-?line <<"axyzd">> = iolist_to_binary(re:replace("axyzd","a[bc]d","xw\\1kClblo&A&pX",[])), 
-?line <<"axyzd">> = iolist_to_binary(re:replace("axyzd","a[bc]d","xw\\1kClblo&A&pX",[global])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","a[bc]d","DXVJBfd&&nWiQKDXx&p",[])), 
-?line <<"abc">> = iolist_to_binary(re:replace("abc","a[bc]d","DXVJBfd&&nWiQKDXx&p",[global])), 
-?line <<"qgcyq">> = iolist_to_binary(re:replace("ace","a[b-d]e","qgcyq\\1",[])), 
-?line <<"qgcyq">> = iolist_to_binary(re:replace("ace","a[b-d]e","qgcyq\\1",[global])), 
-?line <<"aSo">> = iolist_to_binary(re:replace("aac","a[b-d]","S\\1o",[])), 
-?line <<"aSo">> = iolist_to_binary(re:replace("aac","a[b-d]","S\\1o",[global])), 
-?line <<"FalJiLh">> = iolist_to_binary(re:replace("a-","a[-b]","FalJ\\1iL\\1h",[])), 
-?line <<"FalJiLh">> = iolist_to_binary(re:replace("a-","a[-b]","FalJ\\1iL\\1h",[global])), 
-?line <<"aea-">> = iolist_to_binary(re:replace("a-","a[b-]","ae&",[])), 
-?line <<"aea-">> = iolist_to_binary(re:replace("a-","a[b-]","ae&",[global])), 
-?line <<"Uxci">> = iolist_to_binary(re:replace("a]","a]","Uxci",[])), 
-?line <<"Uxci">> = iolist_to_binary(re:replace("a]","a]","Uxci",[global])), 
-?line <<"fuDs">> = iolist_to_binary(re:replace("a]b","a[]]b","fu\\1Ds",[])), 
-?line <<"fuDs">> = iolist_to_binary(re:replace("a]b","a[]]b","fu\\1Ds",[global])), 
-?line <<"S">> = iolist_to_binary(re:replace("aed","a[^bc]d","\\1S",[])), 
-?line <<"S">> = iolist_to_binary(re:replace("aed","a[^bc]d","\\1S",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^bc]d","q\\1c",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^bc]d","q\\1c",[global])), 
-?line <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","CwigRG\\1",[])), 
-?line <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","CwigRG\\1",[global])), 
-?line <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","G&sOiYoXxtvjC\\1C",[])), 
-?line <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","G&sOiYoXxtvjC\\1C",[global])), 
-?line <<"WjwradcGadcGdiadcJadcadc">> = iolist_to_binary(re:replace("adc","a[^-b]c","Wjwr&G&Gdi&J&&",[])), 
-?line <<"WjwradcGadcGdiadcJadcadc">> = iolist_to_binary(re:replace("adc","a[^-b]c","Wjwr&G&Gdi&J&&",[global])), 
-?line <<"sXuNQuSoADXQHaadcc">> = iolist_to_binary(re:replace("adc","a[^]b]c","sXuNQuS\\1oAD\\1XQH\\1a&c",[])), 
-?line <<"sXuNQuSoADXQHaadcc">> = iolist_to_binary(re:replace("adc","a[^]b]c","sXuNQuS\\1oAD\\1XQH\\1a&c",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^]b]c","\\1WTVFfqlY\\1I",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^]b]c","\\1WTVFfqlY\\1I",[global])), 
-?line <<"a-c">> = iolist_to_binary(re:replace("a-c","a[^]b]c","&",[])), 
-?line <<"a-c">> = iolist_to_binary(re:replace("a-c","a[^]b]c","&",[global])), 
-?line <<"a]c">> = iolist_to_binary(re:replace("a]c","a[^]b]c","U\\1ASb",[])), 
-?line <<"a]c">> = iolist_to_binary(re:replace("a]c","a[^]b]c","U\\1ASb",[global])), 
-?line <<"FhmTxP-">> = iolist_to_binary(re:replace("a-","\\ba\\b","FhmTxP",[])), 
-?line <<"FhmTxP-">> = iolist_to_binary(re:replace("a-","\\ba\\b","FhmTxP",[global])), 
-?line <<"-sIgAwOVeaIs">> = iolist_to_binary(re:replace("-a","\\ba\\b","sIgAwOVe&Is",[])), 
-?line <<"-sIgAwOVeaIs">> = iolist_to_binary(re:replace("-a","\\ba\\b","sIgAwOVe&Is",[global])), 
-?line <<"-K-">> = iolist_to_binary(re:replace("-a-","\\ba\\b","K",[])), 
-?line <<"-K-">> = iolist_to_binary(re:replace("-a-","\\ba\\b","K",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\by\\b","NFs\\1N&no&v&LBhrfD",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\by\\b","NFs\\1N&no&v&LBhrfD",[global])), 
-?line <<"xy">> = iolist_to_binary(re:replace("xy","\\by\\b","\\1&WFL&q",[])), 
-?line <<"xy">> = iolist_to_binary(re:replace("xy","\\by\\b","\\1&WFL&q",[global])), 
-?line <<"yz">> = iolist_to_binary(re:replace("yz","\\by\\b","pjeKdgSu&&",[])), 
-?line <<"yz">> = iolist_to_binary(re:replace("yz","\\by\\b","pjeKdgSu&&",[global])), 
-?line <<"xyz">> = iolist_to_binary(re:replace("xyz","\\by\\b","hyG",[])), 
-?line <<"xyz">> = iolist_to_binary(re:replace("xyz","\\by\\b","hyG",[global])), 
-?line <<"*** FCasopdebailers">> = iolist_to_binary(re:replace("*** Failers","\\Ba\\B","C\\1&sopdeb&",[])), 
-?line <<"*** FCasopdebailers">> = iolist_to_binary(re:replace("*** Failers","\\Ba\\B","C\\1&sopdeb&",[global])), 
-?line <<"a-">> = iolist_to_binary(re:replace("a-","\\Ba\\B","mnLWav",[])), 
-?line <<"a-">> = iolist_to_binary(re:replace("a-","\\Ba\\B","mnLWav",[global])), 
-?line <<"-a">> = iolist_to_binary(re:replace("-a","\\Ba\\B","X&NpSD\\1If",[])), 
-?line <<"-a">> = iolist_to_binary(re:replace("-a","\\Ba\\B","X&NpSD\\1If",[global])), 
-?line <<"-a-">> = iolist_to_binary(re:replace("-a-","\\Ba\\B","loFA&cpicKF&FLSfj&",[])), 
-?line <<"-a-">> = iolist_to_binary(re:replace("-a-","\\Ba\\B","loFA&cpicKF&FLSfj&",[global])), 
-?line <<"xyTAT">> = iolist_to_binary(re:replace("xy","\\By\\b","&TAT",[])), 
-?line <<"xyTAT">> = iolist_to_binary(re:replace("xy","\\By\\b","&TAT",[global])), 
-?line <<"fxz">> = iolist_to_binary(re:replace("yz","\\by\\B","fx\\1\\1",[])), 
-?line <<"fxz">> = iolist_to_binary(re:replace("yz","\\by\\B","fx\\1\\1",[global])), 
-?line <<"xKryOdAEz">> = iolist_to_binary(re:replace("xyz","\\By\\B","Kr&OdAE",[])), 
-?line <<"xKryOdAEz">> = iolist_to_binary(re:replace("xyz","\\By\\B","Kr&OdAE",[global])), 
-?line <<"IRVtaAqLDh">> = iolist_to_binary(re:replace("a","\\w","IRVt&AqLDh\\1",[])), 
-?line <<"IRVtaAqLDh">> = iolist_to_binary(re:replace("a","\\w","IRVt&AqLDh\\1",[global])), 
-?line <<"EckncnNqwHO">> = iolist_to_binary(re:replace("-","\\W","EckncnNq\\1wHO\\1",[])), 
-?line <<"EckncnNqwHO">> = iolist_to_binary(re:replace("-","\\W","EckncnNq\\1wHO\\1",[global])), 
-?line <<"Yf*VvjLGbD*h** Failers">> = iolist_to_binary(re:replace("*** Failers","\\W","Yf&VvjLGbD&h",[])), 
-?line <<"Yf*VvjLGbD*hYf*VvjLGbD*hYf*VvjLGbD*hYf VvjLGbD hFailers">> = iolist_to_binary(re:replace("*** Failers","\\W","Yf&VvjLGbD&h",[global])), 
-?line <<"GBjpbjk">> = iolist_to_binary(re:replace("-","\\W","GBjpbjk",[])), 
-?line <<"GBjpbjk">> = iolist_to_binary(re:replace("-","\\W","GBjpbjk",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","\\W","j",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","\\W","j",[global])), 
-?line <<"VAiCYGiBXpa bumnbi">> = iolist_to_binary(re:replace("a b","a\\sb","VAiCYGiBX\\1p&umn\\1bi",[])), 
-?line <<"VAiCYGiBXpa bumnbi">> = iolist_to_binary(re:replace("a b","a\\sb","VAiCYGiBX\\1p&umn\\1bi",[global])), 
-?line <<"Etv">> = iolist_to_binary(re:replace("a-b","a\\Sb","Etv",[])), 
-?line <<"Etv">> = iolist_to_binary(re:replace("a-b","a\\Sb","Etv",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Sb","EbhHjGSDvEtLT\\1cSURa",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Sb","EbhHjGSDvEtLT\\1cSURa",[global])), 
-?line <<"uD">> = iolist_to_binary(re:replace("a-b","a\\Sb","uD",[])), 
-?line <<"uD">> = iolist_to_binary(re:replace("a-b","a\\Sb","uD",[global])), 
-?line <<"a b">> = iolist_to_binary(re:replace("a b","a\\Sb","fQm&D&nJmqrWl",[])), 
-?line <<"a b">> = iolist_to_binary(re:replace("a b","a\\Sb","fQm&D&nJmqrWl",[global])), 
-?line <<"jti">> = iolist_to_binary(re:replace("1","\\d","jti",[])), 
-?line <<"jti">> = iolist_to_binary(re:replace("1","\\d","jti",[global])), 
-?line <<"-m">> = iolist_to_binary(re:replace("-","\\D","&m",[])), 
-?line <<"-m">> = iolist_to_binary(re:replace("-","\\D","&m",[global])), 
-?line <<"Tw** Failers">> = iolist_to_binary(re:replace("*** Failers","\\D","\\1Tw",[])), 
-?line <<"TwTwTwTwTwTwTwTwTwTwTw">> = iolist_to_binary(re:replace("*** Failers","\\D","\\1Tw",[global])), 
-?line <<"T">> = iolist_to_binary(re:replace("-","\\D","T",[])), 
-?line <<"T">> = iolist_to_binary(re:replace("-","\\D","T",[global])), 
-?line <<"1">> = iolist_to_binary(re:replace("1","\\D","QkyGdjVcibs",[])), 
-?line <<"1">> = iolist_to_binary(re:replace("1","\\D","QkyGdjVcibs",[global])), 
-?line <<"Vsg">> = iolist_to_binary(re:replace("a","[\\w]","Vsg",[])), 
-?line <<"Vsg">> = iolist_to_binary(re:replace("a","[\\w]","Vsg",[global])), 
-?line <<"AeUjdVITmvExYR">> = iolist_to_binary(re:replace("-","[\\W]","AeU\\1jdVITmvExYR\\1",[])), 
-?line <<"AeUjdVITmvExYR">> = iolist_to_binary(re:replace("-","[\\W]","AeU\\1jdVITmvExYR\\1",[global])), 
-?line <<"WhGTRj*eDnCm** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\W]","WhGTRj&eDnCm",[])), 
-?line <<"WhGTRj*eDnCmWhGTRj*eDnCmWhGTRj*eDnCmWhGTRj eDnCmFailers">> = iolist_to_binary(re:replace("*** Failers","[\\W]","WhGTRj&eDnCm",[global])), 
-?line <<"c-aqg-Be">> = iolist_to_binary(re:replace("-","[\\W]","c&aqg&Be",[])), 
-?line <<"c-aqg-Be">> = iolist_to_binary(re:replace("-","[\\W]","c&aqg&Be",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","[\\W]","lS",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","[\\W]","lS",[global])), 
-?line <<"aTa bLH">> = iolist_to_binary(re:replace("a b","a[\\s]b","aT&LH\\1",[])), 
-?line <<"aTa bLH">> = iolist_to_binary(re:replace("a b","a[\\s]b","aT&LH\\1",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a-b","a[\\S]b","a",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a-b","a[\\S]b","a",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[\\S]b","b\\1E&yC\\1kT&CwD",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[\\S]b","b\\1E&yC\\1kT&CwD",[global])), 
-?line <<"a-bfLEHcwVqa-bwEar">> = iolist_to_binary(re:replace("a-b","a[\\S]b","&fLE\\1\\1Hcw\\1V\\1q&wEar",[])), 
-?line <<"a-bfLEHcwVqa-bwEar">> = iolist_to_binary(re:replace("a-b","a[\\S]b","&fLE\\1\\1Hcw\\1V\\1q&wEar",[global])), 
-?line <<"a b">> = iolist_to_binary(re:replace("a b","a[\\S]b","E\\1NcSC&l",[])), 
-?line <<"a b">> = iolist_to_binary(re:replace("a b","a[\\S]b","E\\1NcSC&l",[global])), 
-?line <<"U1LgIwNodaqkLmOQ">> = iolist_to_binary(re:replace("1","[\\d]","U\\1&LgIwNo\\1daqkL\\1mOQ",[])), 
-?line <<"U1LgIwNodaqkLmOQ">> = iolist_to_binary(re:replace("1","[\\d]","U\\1&LgIwNo\\1daqkL\\1mOQ",[global])), 
-?line <<"XTGOaAL-XOENvmW">> = iolist_to_binary(re:replace("-","[\\D]","XTGOa\\1AL&XOE\\1NvmW",[])), 
-?line <<"XTGOaAL-XOENvmW">> = iolist_to_binary(re:replace("-","[\\D]","XTGOa\\1AL&XOE\\1NvmW",[global])), 
-?line <<"*rIhW*QnqjR*** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\D]","&\\1r\\1I\\1h\\1W&Q\\1n\\1qjR&",[])), 
-?line <<"*rIhW*QnqjR**rIhW*QnqjR**rIhW*QnqjR* rIhW QnqjR FrIhWFQnqjRFarIhWaQnqjRairIhWiQnqjRilrIhWlQnqjRlerIhWeQnqjRerrIhWrQnqjRrsrIhWsQnqjRs">> = iolist_to_binary(re:replace("*** Failers","[\\D]","&\\1r\\1I\\1h\\1W&Q\\1n\\1qjR&",[global])), 
-?line <<"TEOmg-mrq">> = iolist_to_binary(re:replace("-","[\\D]","TE\\1Omg&\\1mrq",[])), 
-?line <<"TEOmg-mrq">> = iolist_to_binary(re:replace("-","[\\D]","TE\\1Omg&\\1mrq",[global])), 
-?line <<"1">> = iolist_to_binary(re:replace("1","[\\D]","YI\\1o&\\1IwvchJgD&&",[])), 
-?line <<"1">> = iolist_to_binary(re:replace("1","[\\D]","YI\\1o&\\1IwvchJgD&&",[global])), 
-?line <<"DKXoAolSGIabc">> = iolist_to_binary(re:replace("abc","ab|cd","DKXoAolSGI&",[])), 
-?line <<"DKXoAolSGIabc">> = iolist_to_binary(re:replace("abc","ab|cd","DKXoAolSGI&",[global])), 
-?line <<"tFHUIrVcd">> = iolist_to_binary(re:replace("abcd","ab|cd","tFHUIrV\\1",[])), 
-?line <<"tFHUIrVtFHUIrV">> = iolist_to_binary(re:replace("abcd","ab|cd","tFHUIrV\\1",[global])), 
-?line <<"doeAAefCeUJ">> = iolist_to_binary(re:replace("def","()ef","oeAA&CeUJ",[])), 
-?line <<"doeAAefCeUJ">> = iolist_to_binary(re:replace("def","()ef","oeAA&CeUJ",[global])), 
-?line <<"B">> = iolist_to_binary(re:replace("a(b","a\\(b","B",[])), 
-?line <<"B">> = iolist_to_binary(re:replace("a(b","a\\(b","B",[global])), 
-?line <<"sFcBhj">> = iolist_to_binary(re:replace("ab","a\\(*b","sFcBhj",[])), 
-?line <<"sFcBhj">> = iolist_to_binary(re:replace("ab","a\\(*b","sFcBhj",[global])), 
-?line <<"iTla((bUcHSjwja((ba((b">> = iolist_to_binary(re:replace("a((b","a\\(*b","iTl&UcHSjwj\\1&&",[])), 
-?line <<"iTla((bUcHSjwja((ba((b">> = iolist_to_binary(re:replace("a((b","a\\(*b","iTl&UcHSjwj\\1&&",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","a\\\\b","AkoMVU&",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","a\\\\b","AkoMVU&",[global])), 
-?line <<"Gbc">> = iolist_to_binary(re:replace("abc","((a))","G",[])), 
-?line <<"Gbc">> = iolist_to_binary(re:replace("abc","((a))","G",[global])), 
-?line <<"aaabcTualQ">> = iolist_to_binary(re:replace("abc","(a)b(c)","\\1\\1&Tu\\1lQ",[])), 
-?line <<"aaabcTualQ">> = iolist_to_binary(re:replace("abc","(a)b(c)","\\1\\1&Tu\\1lQ",[global])), 
-?line <<"aabbCivt">> = iolist_to_binary(re:replace("aabbabc","a+b+c","\\1Civt",[])), 
-?line <<"aabbCivt">> = iolist_to_binary(re:replace("aabbabc","a+b+c","\\1Civt",[global])), 
-?line <<"aabbT">> = iolist_to_binary(re:replace("aabbabc","a{1,}b{1,}c","T",[])), 
-?line <<"aabbT">> = iolist_to_binary(re:replace("aabbabc","a{1,}b{1,}c","T",[global])), 
-?line <<"VxJHThVabcketabcebWabc">> = iolist_to_binary(re:replace("abcabc","a.+?c","VxJHThV&ket&ebW",[])), 
-?line <<"VxJHThVabcketabcebWVxJHThVabcketabcebW">> = iolist_to_binary(re:replace("abcabc","a.+?c","VxJHThV&ket&ebW",[global])), 
-?line <<"LXfabNabCqMabHb">> = iolist_to_binary(re:replace("ab","(a+|b)*","LXf&N&CqM&H\\1",[])), 
-?line <<"LXfabNabCqMabHbLXfNCqMH">> = iolist_to_binary(re:replace("ab","(a+|b)*","LXf&N&CqM&H\\1",[global])), 
-?line <<"NNopapyUJpabVxnQ">> = iolist_to_binary(re:replace("ab","(a+|b){0,}","NNopapyUJpa\\1VxnQ",[])), 
-?line <<"NNopapyUJpabVxnQNNopapyUJpaVxnQ">> = iolist_to_binary(re:replace("ab","(a+|b){0,}","NNopapyUJpa\\1VxnQ",[global])), 
-?line <<"cejhccpabbAd">> = iolist_to_binary(re:replace("ab","(a+|b)+","cejhccp&\\1Ad",[])), 
-?line <<"cejhccpabbAd">> = iolist_to_binary(re:replace("ab","(a+|b)+","cejhccp&\\1Ad",[global])), 
-?line <<"uMqbbBaYPvPbkabNdlb">> = iolist_to_binary(re:replace("ab","(a+|b){1,}","uMqb\\1BaYPvP\\1k&Ndl\\1",[])), 
-?line <<"uMqbbBaYPvPbkabNdlb">> = iolist_to_binary(re:replace("ab","(a+|b){1,}","uMqb\\1BaYPvP\\1k&Ndl\\1",[global])), 
-?line <<"cyKMb">> = iolist_to_binary(re:replace("ab","(a+|b)?","cyKM",[])), 
-?line <<"cyKMcyKMcyKM">> = iolist_to_binary(re:replace("ab","(a+|b)?","cyKM",[global])), 
-?line <<"uaaPjgxb">> = iolist_to_binary(re:replace("ab","(a+|b){0,1}","u\\1\\1Pjgx",[])), 
-?line <<"uaaPjgxubbPjgxuPjgx">> = iolist_to_binary(re:replace("ab","(a+|b){0,1}","u\\1\\1Pjgx",[global])), 
-?line <<"JsG">> = iolist_to_binary(re:replace("cde","[^ab]*","\\1J\\1sG",[])), 
-?line <<"JsGJsG">> = iolist_to_binary(re:replace("cde","[^ab]*","\\1J\\1sG",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","NyHCvfJjxj\\1SrM&BdF",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","NyHCvfJjxj\\1SrM&BdF",[global])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","abc","T&\\1Jd\\1tQxU\\1&\\1\\1bp",[])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","abc","T&\\1Jd\\1tQxU\\1&\\1\\1bp",[global])), 
-?line <<"AHcabbbcdabbbcdabbbcdSCcNR">> = iolist_to_binary(re:replace("abbbcd","([abc])*d","AH\\1&&&SC\\1NR",[])), 
-?line <<"AHcabbbcdabbbcdabbbcdSCcNR">> = iolist_to_binary(re:replace("abbbcd","([abc])*d","AH\\1&&&SC\\1NR",[global])), 
-?line <<"jDJabcdqabcdgNaaNoyaGm">> = iolist_to_binary(re:replace("abcd","([abc])*bcd","jDJ&q&gN\\1\\1Noy\\1Gm",[])), 
-?line <<"jDJabcdqabcdgNaaNoyaGm">> = iolist_to_binary(re:replace("abcd","([abc])*bcd","jDJ&q&gN\\1\\1Noy\\1Gm",[global])), 
-?line <<"IHdxtFuTeF">> = iolist_to_binary(re:replace("e","a|b|c|d|e","IHdxtFuT&F",[])), 
-?line <<"IHdxtFuTeF">> = iolist_to_binary(re:replace("e","a|b|c|d|e","IHdxtFuT&F",[global])), 
-?line <<"RjceNtss">> = iolist_to_binary(re:replace("ef","(a|b|c|d|e)f","Rjc\\1Ntss",[])), 
-?line <<"RjceNtss">> = iolist_to_binary(re:replace("ef","(a|b|c|d|e)f","Rjc\\1Ntss",[global])), 
-?line <<"nViLDabcdefg">> = iolist_to_binary(re:replace("abcdefg","abcd*efg","nViL\\1D&\\1",[])), 
-?line <<"nViLDabcdefg">> = iolist_to_binary(re:replace("abcdefg","abcd*efg","nViL\\1D&\\1",[global])), 
-?line <<"xoJUabyHFyabbbz">> = iolist_to_binary(re:replace("xabyabbbz","ab*","oJ\\1U&yHF",[])), 
-?line <<"xoJUabyHFyoJUabbbyHFz">> = iolist_to_binary(re:replace("xabyabbbz","ab*","oJ\\1U&yHF",[global])), 
-?line <<"xbaEdBayabbbz">> = iolist_to_binary(re:replace("xayabbbz","ab*","b&EdBa",[])), 
-?line <<"xbaEdBaybabbbEdBaz">> = iolist_to_binary(re:replace("xayabbbz","ab*","b&EdBa",[global])), 
-?line <<"abHqcde">> = iolist_to_binary(re:replace("abcde","(ab|cd)e","Hq&",[])), 
-?line <<"abHqcde">> = iolist_to_binary(re:replace("abcde","(ab|cd)e","Hq&",[global])), 
-?line <<"lrrKIUARhij">> = iolist_to_binary(re:replace("hij","[abhgefdc]ij","l\\1\\1r\\1rKIUAR&",[])), 
-?line <<"lrrKIUARhij">> = iolist_to_binary(re:replace("hij","[abhgefdc]ij","l\\1\\1r\\1rKIUAR&",[global])), 
-?line <<"abcdWfgkefnnefNPAQ">> = iolist_to_binary(re:replace("abcdef","(abc|)ef","\\1Wfgk&nn&\\1NPAQ\\1",[])), 
-?line <<"abcdWfgkefnnefNPAQ">> = iolist_to_binary(re:replace("abcdef","(abc|)ef","\\1Wfgk&nn&\\1NPAQ\\1",[global])), 
-?line <<"aUbGqmbcdWXLMCpYbbcd">> = iolist_to_binary(re:replace("abcd","(a|b)c*d","U\\1Gqm&WXLMCpY\\1&",[])), 
-?line <<"aUbGqmbcdWXLMCpYbbcd">> = iolist_to_binary(re:replace("abcd","(a|b)c*d","U\\1Gqm&WXLMCpY\\1&",[global])), 
-?line <<"vYALaabcfgsaUfyDabcjOtcQ">> = iolist_to_binary(re:replace("abc","(ab|ab*)bc","vYAL\\1&fgs\\1UfyD&jOtcQ",[])), 
-?line <<"vYALaabcfgsaUfyDabcjOtcQ">> = iolist_to_binary(re:replace("abc","(ab|ab*)bc","vYAL\\1&fgs\\1UfyD&jOtcQ",[global])), 
-?line <<"uyabcabcp">> = iolist_to_binary(re:replace("abc","a([bc]*)c*","uy&&p",[])), 
-?line <<"uyabcabcp">> = iolist_to_binary(re:replace("abc","a([bc]*)c*","uy&&p",[global])), 
-?line <<"iAyJUbcM">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c*d)","iAyJU\\1M",[])), 
-?line <<"iAyJUbcM">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c*d)","iAyJU\\1M",[global])), 
-?line <<"abcdabcdabcd">> = iolist_to_binary(re:replace("abcd","a([bc]+)(c*d)","&&&",[])), 
-?line <<"abcdabcdabcd">> = iolist_to_binary(re:replace("abcd","a([bc]+)(c*d)","&&&",[global])), 
-?line <<"UgwJmKabcddNBBm">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c+d)","UgwJmK&dNBBm",[])), 
-?line <<"UgwJmKabcddNBBm">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c+d)","UgwJmK&dNBBm",[global])), 
-?line <<"glXDRFe">> = iolist_to_binary(re:replace("adcdcde","a[bcd]*dcdcde","glXDRFe\\1",[])), 
-?line <<"glXDRFe">> = iolist_to_binary(re:replace("adcdcde","a[bcd]*dcdcde","glXDRFe\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bcd]+dcdcde","&\\1Tw",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bcd]+dcdcde","&\\1Tw",[global])), 
-?line <<"abcde">> = iolist_to_binary(re:replace("abcde","a[bcd]+dcdcde","OaFcNB\\1AbGk\\1RcX&\\1hU",[])), 
-?line <<"abcde">> = iolist_to_binary(re:replace("abcde","a[bcd]+dcdcde","OaFcNB\\1AbGk\\1RcX&\\1hU",[global])), 
-?line <<"adcdcde">> = iolist_to_binary(re:replace("adcdcde","a[bcd]+dcdcde","LRCnDGeISr",[])), 
-?line <<"adcdcde">> = iolist_to_binary(re:replace("adcdcde","a[bcd]+dcdcde","LRCnDGeISr",[global])), 
-?line <<"ab">> = iolist_to_binary(re:replace("abc","(ab|a)b*c","\\1",[])), 
-?line <<"ab">> = iolist_to_binary(re:replace("abc","(ab|a)b*c","\\1",[global])), 
-?line <<"abcdYujfprabcdqmHBi">> = iolist_to_binary(re:replace("abcd","((a)(b)c)(d)","&Yujfpr&qmHBi",[])), 
-?line <<"abcdYujfprabcdqmHBi">> = iolist_to_binary(re:replace("abcd","((a)(b)c)(d)","&Yujfpr&qmHBi",[global])), 
-?line <<"HSalphaw">> = iolist_to_binary(re:replace("alpha","[a-zA-Z_][a-zA-Z0-9_]*","HS&w",[])), 
-?line <<"HSalphaw">> = iolist_to_binary(re:replace("alpha","[a-zA-Z_][a-zA-Z0-9_]*","HS&w",[global])), 
-?line <<"amKrkJTTmWxwbhbhVXebhD">> = iolist_to_binary(re:replace("abh","^a(bc+|b[eh])g|.h$","mKrkJTT\\1mWxw&&VXe&D",[])), 
-?line <<"amKrkJTTmWxwbhbhVXebhD">> = iolist_to_binary(re:replace("abh","^a(bc+|b[eh])g|.h$","mKrkJTT\\1mWxw&&VXe&D",[global])), 
-?line <<"gkglaeffgzeffgzwvwD">> = iolist_to_binary(re:replace("effgz","(bc+d$|ef*g.|h?i(j|k))","gkgla\\1&wvwD",[])), 
-?line <<"gkglaeffgzeffgzwvwD">> = iolist_to_binary(re:replace("effgz","(bc+d$|ef*g.|h?i(j|k))","gkgla\\1&wvwD",[global])), 
-?line <<"ivMGijUoGoijri">> = iolist_to_binary(re:replace("ij","(bc+d$|ef*g.|h?i(j|k))","ivMG\\1UoGo\\1ri",[])), 
-?line <<"ivMGijUoGoijri">> = iolist_to_binary(re:replace("ij","(bc+d$|ef*g.|h?i(j|k))","ivMG\\1UoGo\\1ri",[global])), 
-?line <<"reffgzWeffgzJeffgzeffgzFUK">> = iolist_to_binary(re:replace("reffgz","(bc+d$|ef*g.|h?i(j|k))","&W\\1J\\1&FUK",[])), 
-?line <<"reffgzWeffgzJeffgzeffgzFUK">> = iolist_to_binary(re:replace("reffgz","(bc+d$|ef*g.|h?i(j|k))","&W\\1J\\1&FUK",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","qoREgh&sKvuYfqcVSQ",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","qoREgh&sKvuYfqcVSQ",[global])), 
-?line <<"effg">> = iolist_to_binary(re:replace("effg","(bc+d$|ef*g.|h?i(j|k))","OSMK&kVLNnI",[])), 
-?line <<"effg">> = iolist_to_binary(re:replace("effg","(bc+d$|ef*g.|h?i(j|k))","OSMK&kVLNnI",[global])), 
-?line <<"bcdd">> = iolist_to_binary(re:replace("bcdd","(bc+d$|ef*g.|h?i(j|k))","l\\1SFH&\\1WG\\1N&\\1WpNv",[])), 
-?line <<"bcdd">> = iolist_to_binary(re:replace("bcdd","(bc+d$|ef*g.|h?i(j|k))","l\\1SFH&\\1WG\\1N&\\1WpNv",[global])), 
-?line <<"uCcLk">> = iolist_to_binary(re:replace("a","((((((((((a))))))))))","uCcLk",[])), 
-?line <<"uCcLk">> = iolist_to_binary(re:replace("a","((((((((((a))))))))))","uCcLk",[global])), 
-?line <<"VCUvbvxORiulavLRaFa">> = iolist_to_binary(re:replace("aa","((((((((((a))))))))))\\10","VCUvbvxORiul\\1vLR\\1F\\1",[])), 
-?line <<"VCUvbvxORiulavLRaFa">> = iolist_to_binary(re:replace("aa","((((((((((a))))))))))\\10","VCUvbvxORiul\\1vLR\\1F\\1",[global])), 
-?line <<"vFhEaarfaQfeLfaFGiV">> = iolist_to_binary(re:replace("a","(((((((((a)))))))))","vFhE\\1&rf&QfeLf\\1FGiV",[])), 
-?line <<"vFhEaarfaQfeLfaFGiV">> = iolist_to_binary(re:replace("a","(((((((((a)))))))))","vFhE\\1&rf&QfeLf\\1FGiV",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","jlWax\\1&H",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","jlWax\\1&H",[global])), 
-?line <<"aa">> = iolist_to_binary(re:replace("aa","multiple words of text","hsUw",[])), 
-?line <<"aa">> = iolist_to_binary(re:replace("aa","multiple words of text","hsUw",[global])), 
-?line <<"uh-uh">> = iolist_to_binary(re:replace("uh-uh","multiple words of text","ASEw\\1gOsB",[])), 
-?line <<"uh-uh">> = iolist_to_binary(re:replace("uh-uh","multiple words of text","ASEw\\1gOsB",[global])), 
-?line <<"dmultiple wordsxkMtmultiple words, yeah">> = iolist_to_binary(re:replace("multiple words, yeah","multiple words","d&x\\1\\1kMt&",[])), 
-?line <<"dmultiple wordsxkMtmultiple words, yeah">> = iolist_to_binary(re:replace("multiple words, yeah","multiple words","d&x\\1\\1kMt&",[global])), 
-?line <<"ykkVabcdefmldQabUjIJjw">> = iolist_to_binary(re:replace("abcde","(.*)c(.*)","ykkV&fmldQ\\1UjIJjw",[])), 
-?line <<"ykkVabcdefmldQabUjIJjw">> = iolist_to_binary(re:replace("abcde","(.*)c(.*)","ykkV&fmldQ\\1UjIJjw",[global])), 
-?line <<"efWBSCaa(a, b)Q">> = iolist_to_binary(re:replace("(a, b)","\\((.*), (.*)\\)","efWBSC\\1\\1&Q",[])), 
-?line <<"efWBSCaa(a, b)Q">> = iolist_to_binary(re:replace("(a, b)","\\((.*), (.*)\\)","efWBSC\\1\\1&Q",[global])), 
-?line <<"abcdBdXhwHpBabcdPC">> = iolist_to_binary(re:replace("abcd","abcd","&Bd\\1XhwHp\\1B&PC",[])), 
-?line <<"abcdBdXhwHpBabcdPC">> = iolist_to_binary(re:replace("abcd","abcd","&Bd\\1XhwHp\\1B&PC",[global])), 
-?line <<"SbsAruCoIPbckBgbcSyqva">> = iolist_to_binary(re:replace("abcd","a(bc)d","SbsAruCoIP\\1kBg\\1Syqva",[])), 
-?line <<"SbsAruCoIPbckBgbcSyqva">> = iolist_to_binary(re:replace("abcd","a(bc)d","SbsAruCoIP\\1kBg\\1Syqva",[global])), 
-?line <<"XiUVfmkDnpfY">> = iolist_to_binary(re:replace("ac","a[-]?c","XiUVfmkDnpfY",[])), 
-?line <<"XiUVfmkDnpfY">> = iolist_to_binary(re:replace("ac","a[-]?c","XiUVfmkDnpfY",[global])), 
-?line <<"GYmabcndabcabcabcabcCjabcabcabcabctjmn">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","GYm\\1nd&&Cj&\\1\\1tjmn",[])), 
-?line <<"GYmabcndabcabcabcabcCjabcabcabcabctjmn">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","GYm\\1nd&&Cj&\\1\\1tjmn",[global])), 
-?line <<"AabcFabcabcOw">> = iolist_to_binary(re:replace("abcabc","([a-c]*)\\1","A\\1F&Ow",[])), 
-?line <<"AabcFabcabcOwAFOw">> = iolist_to_binary(re:replace("abcabc","([a-c]*)\\1","A\\1F&Ow",[global])), 
-?line <<"savneuiFiA">> = iolist_to_binary(re:replace("a","(a)|\\1","s&vneuiFiA",[])), 
-?line <<"savneuiFiA">> = iolist_to_binary(re:replace("a","(a)|\\1","s&vneuiFiA",[global])), 
-?line <<"*** FatXvbwaxGeTrgahaailers">> = iolist_to_binary(re:replace("*** Failers","(a)|\\1","\\1tXvbw&xGeTrg\\1h&\\1",[])), 
-?line <<"*** FatXvbwaxGeTrgahaailers">> = iolist_to_binary(re:replace("*** Failers","(a)|\\1","\\1tXvbw&xGeTrg\\1h&\\1",[global])), 
-?line <<"ShaaIOaiKrRarjaTFxavb">> = iolist_to_binary(re:replace("ab","(a)|\\1","Sh\\1\\1IO&iKrR\\1rj\\1TFx&v",[])), 
-?line <<"ShaaIOaiKrRarjaTFxavb">> = iolist_to_binary(re:replace("ab","(a)|\\1","Sh\\1\\1IO&iKrR\\1rj\\1TFx&v",[global])), 
-?line <<"x">> = iolist_to_binary(re:replace("x","(a)|\\1","wG&OmupsBaCA&ULU&br",[])), 
-?line <<"x">> = iolist_to_binary(re:replace("x","(a)|\\1","wG&OmupsBaCA&ULU&br",[global])), 
-?line <<"ababbsaHOnababbDlUpRwMMqlababbCbbbcbc">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2)*","&saHOn&DlUpRwMMql&C\\1",[])), 
-?line <<"ababbsaHOnababbDlUpRwMMqlababbCbbsaHOnDlUpRwMMqlCbcbcsaHOncbcDlUpRwMMqlcbcCcbcsaHOnDlUpRwMMqlC">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2)*","&saHOn&DlUpRwMMql&C\\1",[global])), 
-?line <<"YdAFYmyyababbbcbcHpJCababbbcbcQa">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2){3}","YdAFYmyy&HpJC&Qa",[])), 
-?line <<"YdAFYmyyababbbcbcHpJCababbbcbcQa">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2){3}","YdAFYmyy&HpJC&Qa",[global])), 
-?line <<"aaaxabaxbaaxabbax">> = iolist_to_binary(re:replace("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+","a\\1",[])), 
-?line <<"aaaxabaxbaaxabbax">> = iolist_to_binary(re:replace("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+","a\\1",[global])), 
-?line <<"bbaababbabaaaaaoh">> = iolist_to_binary(re:replace("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}","oh",[])), 
-?line <<"bbaababbabaaaaaoh">> = iolist_to_binary(re:replace("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}","oh",[global])), 
-?line <<"fABCaeUgIABCDABCNFvst">> = iolist_to_binary(re:replace("ABC","abc","f&aeUgI&D&\\1NFvst",[caseless])), 
-?line <<"fABCaeUgIABCDABCNFvst">> = iolist_to_binary(re:replace("ABC","abc","f&aeUgI&D&\\1NFvst",[caseless,
-                                                                                                                                                                                               global])), 
-?line <<"XgOY">> = iolist_to_binary(re:replace("XABCY","abc","gO",[caseless])), 
-?line <<"XgOY">> = iolist_to_binary(re:replace("XABCY","abc","gO",[caseless,
+bar","(?<=foo\\n)^bar","hGG",[multiline,global])), 
+    <<"barTsM">> = iolist_to_binary(re:replace("barbaz","(?<=(?<!foo)bar)baz","TsM",[])), 
+    <<"barTsM">> = iolist_to_binary(re:replace("barbaz","(?<=(?<!foo)bar)baz","TsM",[global])), 
+    <<"barbarbazJYNeeiOkukbazbaze">> = iolist_to_binary(re:replace("barbarbaz","(?<=(?<!foo)bar)baz","&JYNeeiOkuk&&e",[])), 
+    <<"barbarbazJYNeeiOkukbazbaze">> = iolist_to_binary(re:replace("barbarbaz","(?<=(?<!foo)bar)baz","&JYNeeiOkuk&&e",[global])), 
+    <<"koobarbazJDRvnHPtlJvlqbazha">> = iolist_to_binary(re:replace("koobarbaz","(?<=(?<!foo)bar)baz","&JD\\1RvnHPtlJvlq&ha",[])), 
+    <<"koobarbazJDRvnHPtlJvlqbazha">> = iolist_to_binary(re:replace("koobarbaz","(?<=(?<!foo)bar)baz","&JD\\1RvnHPtlJvlq&ha",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?<!foo)bar)baz","se&q\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?<!foo)bar)baz","se&q\\1",[global])), 
+    <<"baz">> = iolist_to_binary(re:replace("baz","(?<=(?<!foo)bar)baz","\\1FnT\\1ncG\\1qiLitBVlR",[])), 
+    <<"baz">> = iolist_to_binary(re:replace("baz","(?<=(?<!foo)bar)baz","\\1FnT\\1ncG\\1qiLitBVlR",[global])), 
+    <<"foobarbaz">> = iolist_to_binary(re:replace("foobarbaz","(?<=(?<!foo)bar)baz","TGjyDWNaukC\\1D",[])), 
+    <<"foobarbaz">> = iolist_to_binary(re:replace("foobarbaz","(?<=(?<!foo)bar)baz","TGjyDWNaukC\\1D",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?){4}$","PqtMwjvc&wXddSH",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?){4}$","PqtMwjvc&wXddSH",[global])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?){4}$","GgSSdPHMYJhXx",[])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?){4}$","GgSSdPHMYJhXx",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?){4}$","ucLn&Fx&kXfW",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?){4}$","ucLn&Fx&kXfW",[global])), 
+    <<"naaaaaaQNEaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?){4}$","n&\\1QNE&&&",[])), 
+    <<"naaaaaaQNEaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?){4}$","n&\\1QNE&&&",[global])), 
+    <<"ielIaAaXNwripBgIaHTa">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?){4}$","ielI\\1A\\1XNwripBgI\\1HT\\1",[])), 
+    <<"ielIaAaXNwripBgIaHTa">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?){4}$","ielI\\1A\\1XNwripBgI\\1HT\\1",[global])), 
+    <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?){4}$","HRYVEqqIFqY&Dl",[])), 
+    <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?){4}$","HRYVEqqIFqY&Dl",[global])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","&&t\\1s",[])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","&&t\\1s",[global])), 
+    <<"NaaaadLeaaaaxAL">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","N\\1dLe\\1xAL",[])), 
+    <<"NaaaadLeaaaaxAL">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","N\\1dLe\\1xAL",[global])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","\\1jr",[])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","\\1jr",[global])), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?){4}$","N\\1",[])), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?){4}$","N\\1",[global])), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?){4}$","sQ&xSjdecK&&rSQkA",[])), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?){4}$","sQ&xSjdecK&&rSQkA",[global])), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?){4}$","CsOa",[])), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?){4}$","CsOa",[global])), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?){4}$","&pAEvtoqYnBxGT&Uox",[])), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?){4}$","&pAEvtoqYnBxGT&Uox",[global])), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?){4}$","&icuBLN",[])), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?){4}$","&icuBLN",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","wxtPJAs&D\\1V&xlkaXy&",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","wxtPJAs&D\\1V&xlkaXy&",[global])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","GO\\1&NlEm",[])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","GO\\1&NlEm",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","trMv\\1vGRRdT&L",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","trMv\\1vGRRdT&L",[global])), 
+    <<"dtEvrhKayRa">> = iolist_to_binary(re:replace("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dtEvrhK\\1yR\\1",[])), 
+    <<"dtEvrhKayRa">> = iolist_to_binary(re:replace("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dtEvrhK\\1yR\\1",[global])), 
+    <<"swnY">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","swnY",[])), 
+    <<"swnY">> = iolist_to_binary(re:replace("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","swnY",[global])), 
+    <<"aaaaaarinTIDxAHEMa">> = iolist_to_binary(re:replace("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","&rinTIDxAHEM\\1",[])), 
+    <<"aaaaaarinTIDxAHEMa">> = iolist_to_binary(re:replace("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","&rinTIDxAHEM\\1",[global])), 
+    <<"UBvaoaaaaaaaaDUiX">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","UBvao\\1&DUiX",[])), 
+    <<"UBvaoaaaaaaaaDUiX">> = iolist_to_binary(re:replace("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","UBvao\\1&DUiX",[global])), 
+    <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","H\\1aLBBEpEaB",[])), 
+    <<"aaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","H\\1aLBBEpEaB",[global])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dpC",[])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dpC",[global])), 
+    <<"taaaaaaaaaahaaaaaaaaaaf">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","t&h&f",[])), 
+    <<"taaaaaaaaaahaaaaaaaaaaf">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","t&h&f",[global])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","rgxaXLiOHjVaKNJyPJ",[])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","rgxaXLiOHjVaKNJyPJ",[global])), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","a\\1UVnCvM\\1bOy",[])), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","a\\1UVnCvM\\1bOy",[global])), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","mnxwE",[])), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","mnxwE",[global])), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","R",[])), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","R",[global])), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","CKEn&",[])), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","CKEn&",[global])), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dr\\1B\\1G&W\\1\\1\\1",[])), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$","dr\\1B\\1G&W\\1\\1\\1",[global])), 
+    <<"mTTwWHMeBAnTMAy">> = iolist_to_binary(re:replace("abc","abc","mTTwWHMe\\1B\\1AnTMAy",[])), 
+    <<"mTTwWHMeBAnTMAy">> = iolist_to_binary(re:replace("abc","abc","mTTwWHMe\\1B\\1AnTMAy",[global])), 
+    <<"xFRFntrFXSabcyBabcRky">> = iolist_to_binary(re:replace("xabcy","abc","FRFntrFXS&yB&\\1Rk",[])), 
+    <<"xFRFntrFXSabcyBabcRky">> = iolist_to_binary(re:replace("xabcy","abc","FRFntrFXS&yB&\\1Rk",[global])), 
+    <<"abmabceyJl">> = iolist_to_binary(re:replace("ababc","abc","m&eyJl",[])), 
+    <<"abmabceyJl">> = iolist_to_binary(re:replace("ababc","abc","m&eyJl",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","\\1kN",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","\\1kN",[global])), 
+    <<"xbc">> = iolist_to_binary(re:replace("xbc","abc","Rd",[])), 
+    <<"xbc">> = iolist_to_binary(re:replace("xbc","abc","Rd",[global])), 
+    <<"axc">> = iolist_to_binary(re:replace("axc","abc","qQP\\1gBdX&cfJfv&f",[])), 
+    <<"axc">> = iolist_to_binary(re:replace("axc","abc","qQP\\1gBdX&cfJfv&f",[global])), 
+    <<"abx">> = iolist_to_binary(re:replace("abx","abc","VMtbG",[])), 
+    <<"abx">> = iolist_to_binary(re:replace("abx","abc","VMtbG",[global])), 
+    <<"jNyOabclmQAUUabcabcabcM">> = iolist_to_binary(re:replace("abc","ab*c","jNyO&lmQA\\1UU&&&M",[])), 
+    <<"jNyOabclmQAUUabcabcabcM">> = iolist_to_binary(re:replace("abc","ab*c","jNyO&lmQA\\1UU&&&M",[global])), 
+    <<"NuNKaVVP">> = iolist_to_binary(re:replace("abc","ab*bc","NuNKaVV\\1\\1P",[])), 
+    <<"NuNKaVVP">> = iolist_to_binary(re:replace("abc","ab*bc","NuNKaVV\\1\\1P",[global])), 
+    <<"v">> = iolist_to_binary(re:replace("abbc","ab*bc","v",[])), 
+    <<"v">> = iolist_to_binary(re:replace("abbc","ab*bc","v",[global])), 
+    <<"IabbbbcLNYRgEvYHyabbbbctwq">> = iolist_to_binary(re:replace("abbbbc","ab*bc","I&LNYRgEvYHy&tw\\1q",[])), 
+    <<"IabbbbcLNYRgEvYHyabbbbctwq">> = iolist_to_binary(re:replace("abbbbc","ab*bc","I&LNYRgEvYHy&tw\\1q",[global])), 
+    <<"dcWrPQwrWtCeinonDembbbbc">> = iolist_to_binary(re:replace("abbbbc",".{1}","dcWrPQwrWtCeinonDem",[])), 
+    <<"dcWrPQwrWtCeinonDemdcWrPQwrWtCeinonDemdcWrPQwrWtCeinonDemdcWrPQwrWtCeinonDemdcWrPQwrWtCeinonDemdcWrPQwrWtCeinonDem">> = iolist_to_binary(re:replace("abbbbc",".{1}","dcWrPQwrWtCeinonDem",[global])), 
+    <<"NwOwabbbabbbCOvabbbenaNbc">> = iolist_to_binary(re:replace("abbbbc",".{3,4}","NwOw&&COv&e\\1naN",[])), 
+    <<"NwOwabbbabbbCOvabbbenaNbc">> = iolist_to_binary(re:replace("abbbbc",".{3,4}","NwOw&&COv&e\\1naN",[global])), 
+    <<"abbbbcCeTetSKDvAvrabbbbcpa">> = iolist_to_binary(re:replace("abbbbc","ab{0,}bc","&CeTetSKDvAvr&pa",[])), 
+    <<"abbbbcCeTetSKDvAvrabbbbcpa">> = iolist_to_binary(re:replace("abbbbc","ab{0,}bc","&CeTetSKDvAvr&pa",[global])), 
+    <<"TbtqfbcUrEcTU">> = iolist_to_binary(re:replace("abbc","ab+bc","Tb\\1tqfb\\1cUrEcTU",[])), 
+    <<"TbtqfbcUrEcTU">> = iolist_to_binary(re:replace("abbc","ab+bc","Tb\\1tqfb\\1cUrEcTU",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","TeS\\1\\1F",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","TeS\\1\\1F",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","ab+bc","EHEtuOC&GTMRx",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","ab+bc","EHEtuOC&GTMRx",[global])), 
+    <<"abq">> = iolist_to_binary(re:replace("abq","ab+bc","\\1ywtK\\1hfkEVdoXy\\1eH",[])), 
+    <<"abq">> = iolist_to_binary(re:replace("abq","ab+bc","\\1ywtK\\1hfkEVdoXy\\1eH",[global])), 
+    <<"GlETcsroCIlRt">> = iolist_to_binary(re:replace("abbbbc","ab+bc","GlETcsro\\1CIlRt\\1",[])), 
+    <<"GlETcsroCIlRt">> = iolist_to_binary(re:replace("abbbbc","ab+bc","GlETcsro\\1CIlRt\\1",[global])), 
+    ok.
+run15() ->
+    <<"GjnPRabbbbcabbbbcANabbbbcH">> = iolist_to_binary(re:replace("abbbbc","ab{1,}bc","Gj\\1nPR&&A\\1N&H",[])), 
+    <<"GjnPRabbbbcabbbbcANabbbbcH">> = iolist_to_binary(re:replace("abbbbc","ab{1,}bc","Gj\\1nPR&&A\\1N&H",[global])), 
+    <<"iPhrUY">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","i\\1Phr\\1UY\\1",[])), 
+    <<"iPhrUY">> = iolist_to_binary(re:replace("abbbbc","ab{1,3}bc","i\\1Phr\\1UY\\1",[global])), 
+    <<"oBEnPKpabbbbcAUrXVFQn">> = iolist_to_binary(re:replace("abbbbc","ab{3,4}bc","oBEnPK\\1p&AUr\\1X\\1VFQn\\1",[])), 
+    <<"oBEnPKpabbbbcAUrXVFQn">> = iolist_to_binary(re:replace("abbbbc","ab{3,4}bc","oBEnPK\\1p&AUr\\1X\\1VFQn\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}bc","VJPhAjJ&qt&R",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}bc","VJPhAjJ&qt&R",[global])), 
+    <<"abq">> = iolist_to_binary(re:replace("abq","ab{4,5}bc","\\1issDnwN",[])), 
+    <<"abq">> = iolist_to_binary(re:replace("abq","ab{4,5}bc","\\1issDnwN",[global])), 
+    <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","ab{4,5}bc","&ty&x",[])), 
+    <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","ab{4,5}bc","&ty&x",[global])), 
+    <<"UWGc">> = iolist_to_binary(re:replace("abbc","ab?bc","UWGc",[])), 
+    <<"UWGc">> = iolist_to_binary(re:replace("abbc","ab?bc","UWGc",[global])), 
+    <<"QpFXHqWog">> = iolist_to_binary(re:replace("abc","ab?bc","QpFXHqWog",[])), 
+    <<"QpFXHqWog">> = iolist_to_binary(re:replace("abc","ab?bc","QpFXHqWog",[global])), 
+    <<"lFwRabc">> = iolist_to_binary(re:replace("abc","ab{0,1}bc","lFwR&\\1",[])), 
+    <<"lFwRabc">> = iolist_to_binary(re:replace("abc","ab{0,1}bc","lFwR&\\1",[global])), 
+    <<"abcmabcJvgabcabco">> = iolist_to_binary(re:replace("abc","ab?c","&m&Jvg&&\\1\\1o",[])), 
+    <<"abcmabcJvgabcabco">> = iolist_to_binary(re:replace("abc","ab?c","&m&Jvg&&\\1\\1o",[global])), 
+    <<"jJ">> = iolist_to_binary(re:replace("abc","ab{0,1}c","jJ",[])), 
+    <<"jJ">> = iolist_to_binary(re:replace("abc","ab{0,1}c","jJ",[global])), 
+    <<"uPAtKYsKtqCBkkp">> = iolist_to_binary(re:replace("abc","^abc$","uPAtKYsKtqCBkkp\\1",[])), 
+    <<"uPAtKYsKtqCBkkp">> = iolist_to_binary(re:replace("abc","^abc$","uPAtKYsKtqCBkkp\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","e\\1XAs",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","e\\1XAs",[global])), 
+    <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","^abc$","\\1o&fsbP\\1pwbiIRIGb\\1UD",[])), 
+    <<"abbbbc">> = iolist_to_binary(re:replace("abbbbc","^abc$","\\1o&fsbP\\1pwbiIRIGb\\1UD",[global])), 
+    <<"abcc">> = iolist_to_binary(re:replace("abcc","^abc$","WJthAfXWWmv\\1IWjIe",[])), 
+    <<"abcc">> = iolist_to_binary(re:replace("abcc","^abc$","WJthAfXWWmv\\1IWjIe",[global])), 
+    <<"UTlfrQeHrOQCMnfc">> = iolist_to_binary(re:replace("abcc","^abc","UTlfr\\1QeH\\1rOQCMnf",[])), 
+    <<"UTlfrQeHrOQCMnfc">> = iolist_to_binary(re:replace("abcc","^abc","UTlfr\\1QeH\\1rOQCMnf",[global])), 
+    <<"aARabcppSYabcEIbcGwjE">> = iolist_to_binary(re:replace("aabc","abc$","\\1AR&ppSY&EIbc\\1G\\1wjE",[])), 
+    <<"aARabcppSYabcEIbcGwjE">> = iolist_to_binary(re:replace("aabc","abc$","\\1AR&ppSY&EIbc\\1G\\1wjE",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","FnSwJ&tmv",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc$","FnSwJ&tmv",[global])), 
+    <<"aAmIBNLxa">> = iolist_to_binary(re:replace("aabc","abc$","Am\\1IB\\1NLxa",[])), 
+    <<"aAmIBNLxa">> = iolist_to_binary(re:replace("aabc","abc$","Am\\1IB\\1NLxa",[global])), 
+    <<"aabcd">> = iolist_to_binary(re:replace("aabcd","abc$","&EuxC&eEGEWnwI",[])), 
+    <<"aabcd">> = iolist_to_binary(re:replace("aabcd","abc$","&EuxC&eEGEWnwI",[global])), 
+    <<"cOryAkFNmtoLruabc">> = iolist_to_binary(re:replace("abc","^","cO\\1r&yAkFNmto\\1Lru&",[])), 
+    <<"cOryAkFNmtoLruabc">> = iolist_to_binary(re:replace("abc","^","cO\\1r&yAkFNmto\\1Lru&",[global])), 
+    <<"abcKpXarNeriGOdu">> = iolist_to_binary(re:replace("abc","$","Kp\\1XarNeriGOdu&",[])), 
+    <<"abcKpXarNeriGOdu">> = iolist_to_binary(re:replace("abc","$","Kp\\1XarNeriGOdu&",[global])), 
+    <<"FIusabcabcceEbtWBabc">> = iolist_to_binary(re:replace("abc","a.c","FIus&&ceEb\\1tWB&",[])), 
+    <<"FIusabcabcceEbtWBabc">> = iolist_to_binary(re:replace("abc","a.c","FIus&&ceEb\\1tWB&",[global])), 
+    <<"KqevmaxcVysaxcPaxc">> = iolist_to_binary(re:replace("axc","a.c","Kqevm&Vys&\\1\\1P&",[])), 
+    <<"KqevmaxcVysaxcPaxc">> = iolist_to_binary(re:replace("axc","a.c","Kqevm&Vys&\\1\\1P&",[global])), 
+    <<"xUdGxhaJQaxyzc">> = iolist_to_binary(re:replace("axyzc","a.*c","x\\1UdGxhaJQ&",[])), 
+    <<"xUdGxhaJQaxyzc">> = iolist_to_binary(re:replace("axyzc","a.*c","x\\1UdGxhaJQ&",[global])), 
+    <<"abdHpbYpV">> = iolist_to_binary(re:replace("abd","a[bc]d","&Hp\\1bYpV",[])), 
+    <<"abdHpbYpV">> = iolist_to_binary(re:replace("abd","a[bc]d","&Hp\\1bYpV",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bc]d","J&dGU\\1rioQPR\\1&S&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bc]d","J&dGU\\1rioQPR\\1&S&",[global])), 
+    <<"axyzd">> = iolist_to_binary(re:replace("axyzd","a[bc]d","LF\\1QgQx\\1kUO&\\1",[])), 
+    <<"axyzd">> = iolist_to_binary(re:replace("axyzd","a[bc]d","LF\\1QgQx\\1kUO&\\1",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","a[bc]d","tiUJYyxfVfeAM",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","a[bc]d","tiUJYyxfVfeAM",[global])), 
+    <<"lSBTQLYWjuaceCjDace">> = iolist_to_binary(re:replace("ace","a[b-d]e","lSBTQLYWju&CjD&",[])), 
+    <<"lSBTQLYWjuaceCjDace">> = iolist_to_binary(re:replace("ace","a[b-d]e","lSBTQLYWju&CjD&",[global])), 
+    <<"aWEgjXuNyAacQTNVqSl">> = iolist_to_binary(re:replace("aac","a[b-d]","WEgjXuNyA&QTNVqSl",[])), 
+    <<"aWEgjXuNyAacQTNVqSl">> = iolist_to_binary(re:replace("aac","a[b-d]","WEgjXuNyA&QTNVqSl",[global])), 
+    ok.
+run16() ->
+    <<"qQmna-Ga-a-rA">> = iolist_to_binary(re:replace("a-","a[-b]","q\\1Qmn&G&&rA",[])), 
+    <<"qQmna-Ga-a-rA">> = iolist_to_binary(re:replace("a-","a[-b]","q\\1Qmn&G&&rA",[global])), 
+    <<"QJ">> = iolist_to_binary(re:replace("a-","a[b-]","QJ",[])), 
+    <<"QJ">> = iolist_to_binary(re:replace("a-","a[b-]","QJ",[global])), 
+    <<"yia]ao">> = iolist_to_binary(re:replace("a]","a]","\\1yi&ao",[])), 
+    <<"yia]ao">> = iolist_to_binary(re:replace("a]","a]","\\1yi&ao",[global])), 
+    <<"FfC">> = iolist_to_binary(re:replace("a]b","a[]]b","FfC",[])), 
+    <<"FfC">> = iolist_to_binary(re:replace("a]b","a[]]b","FfC",[global])), 
+    <<"oXfcTOWQKFAlvTaedi">> = iolist_to_binary(re:replace("aed","a[^bc]d","oXfcTOWQKFAlvT\\1\\1&i",[])), 
+    <<"oXfcTOWQKFAlvTaedi">> = iolist_to_binary(re:replace("aed","a[^bc]d","oXfcTOWQKFAlvT\\1\\1&i",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^bc]d","&bDyTqTc",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^bc]d","&bDyTqTc",[global])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","FjC&R\\1",[])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","FjC&R\\1",[global])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","aENw",[])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","a[^bc]d","aENw",[global])), 
+    <<"adcdOJ">> = iolist_to_binary(re:replace("adc","a[^-b]c","&dOJ",[])), 
+    <<"adcdOJ">> = iolist_to_binary(re:replace("adc","a[^-b]c","&dOJ",[global])), 
+    <<"ANuydyM">> = iolist_to_binary(re:replace("adc","a[^]b]c","ANuydyM",[])), 
+    <<"ANuydyM">> = iolist_to_binary(re:replace("adc","a[^]b]c","ANuydyM",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^]b]c","SweRAVF\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^]b]c","SweRAVF\\1",[global])), 
+    <<"UoNrja-cLOLdIhqaTGLt">> = iolist_to_binary(re:replace("a-c","a[^]b]c","UoNrj&LOLdIhqaTGLt",[])), 
+    <<"UoNrja-cLOLdIhqaTGLt">> = iolist_to_binary(re:replace("a-c","a[^]b]c","UoNrj&LOLdIhqaTGLt",[global])), 
+    <<"a]c">> = iolist_to_binary(re:replace("a]c","a[^]b]c","w&UlR&\\1\\1Oo&I&",[])), 
+    <<"a]c">> = iolist_to_binary(re:replace("a]c","a[^]b]c","w&UlR&\\1\\1Oo&I&",[global])), 
+    <<"keSyyVigJfGa-">> = iolist_to_binary(re:replace("a-","\\ba\\b","\\1keSyy\\1VigJfG&",[])), 
+    <<"keSyyVigJfGa-">> = iolist_to_binary(re:replace("a-","\\ba\\b","\\1keSyy\\1VigJfG&",[global])), 
+    <<"-QajTaYNwiaOblsalRbJ">> = iolist_to_binary(re:replace("-a","\\ba\\b","Q&jT&YNwiaOb\\1ls&lRbJ",[])), 
+    <<"-QajTaYNwiaOblsalRbJ">> = iolist_to_binary(re:replace("-a","\\ba\\b","Q&jT&YNwiaOb\\1ls&lRbJ",[global])), 
+    <<"-jrLliKmS-">> = iolist_to_binary(re:replace("-a-","\\ba\\b","jrLliKm\\1S",[])), 
+    <<"-jrLliKmS-">> = iolist_to_binary(re:replace("-a-","\\ba\\b","jrLliKm\\1S",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\by\\b","tFe\\1K\\1&P&w",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\by\\b","tFe\\1K\\1&P&w",[global])), 
+    <<"xy">> = iolist_to_binary(re:replace("xy","\\by\\b","&&cw&p\\1BkixXR",[])), 
+    <<"xy">> = iolist_to_binary(re:replace("xy","\\by\\b","&&cw&p\\1BkixXR",[global])), 
+    <<"yz">> = iolist_to_binary(re:replace("yz","\\by\\b","Mlv\\1O",[])), 
+    <<"yz">> = iolist_to_binary(re:replace("yz","\\by\\b","Mlv\\1O",[global])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","\\by\\b","o&V\\1\\1&vaBPhc&YhjA\\1Hl",[])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","\\by\\b","o&V\\1\\1&vaBPhc&YhjA\\1Hl",[global])), 
+    <<"*** FEnnRHgdUlleafatdRwilers">> = iolist_to_binary(re:replace("*** Failers","\\Ba\\B","EnnRHgdUlle&f&tdRw",[])), 
+    <<"*** FEnnRHgdUlleafatdRwilers">> = iolist_to_binary(re:replace("*** Failers","\\Ba\\B","EnnRHgdUlle&f&tdRw",[global])), 
+    <<"a-">> = iolist_to_binary(re:replace("a-","\\Ba\\B","wXKR&jlEbdM&QBJmvK",[])), 
+    <<"a-">> = iolist_to_binary(re:replace("a-","\\Ba\\B","wXKR&jlEbdM&QBJmvK",[global])), 
+    <<"-a">> = iolist_to_binary(re:replace("-a","\\Ba\\B","f\\1dQc",[])), 
+    <<"-a">> = iolist_to_binary(re:replace("-a","\\Ba\\B","f\\1dQc",[global])), 
+    <<"-a-">> = iolist_to_binary(re:replace("-a-","\\Ba\\B","WTMu\\1drSum",[])), 
+    <<"-a-">> = iolist_to_binary(re:replace("-a-","\\Ba\\B","WTMu\\1drSum",[global])), 
+    <<"xheOtJ">> = iolist_to_binary(re:replace("xy","\\By\\b","\\1heOtJ\\1",[])), 
+    <<"xheOtJ">> = iolist_to_binary(re:replace("xy","\\By\\b","\\1heOtJ\\1",[global])), 
+    <<"xYHVuz">> = iolist_to_binary(re:replace("yz","\\by\\B","xYH\\1\\1Vu",[])), 
+    <<"xYHVuz">> = iolist_to_binary(re:replace("yz","\\by\\B","xYH\\1\\1Vu",[global])), 
+    <<"xUyfxgltgVyjPz">> = iolist_to_binary(re:replace("xyz","\\By\\B","\\1Uyf\\1xglt\\1gV\\1\\1&jP",[])), 
+    <<"xUyfxgltgVyjPz">> = iolist_to_binary(re:replace("xyz","\\By\\B","\\1Uyf\\1xglt\\1gV\\1\\1&jP",[global])), 
+    <<"PqSMLiChcHwx">> = iolist_to_binary(re:replace("a","\\w","PqSMLiChcHwx",[])), 
+    <<"PqSMLiChcHwx">> = iolist_to_binary(re:replace("a","\\w","PqSMLiChcHwx",[global])), 
+    <<"Bl">> = iolist_to_binary(re:replace("-","\\W","Bl",[])), 
+    <<"Bl">> = iolist_to_binary(re:replace("-","\\W","Bl",[global])), 
+    <<"**rPBnOGDkc** Failers">> = iolist_to_binary(re:replace("*** Failers","\\W","&&\\1rPBnOGDkc",[])), 
+    <<"**rPBnOGDkc**rPBnOGDkc**rPBnOGDkc  rPBnOGDkcFailers">> = iolist_to_binary(re:replace("*** Failers","\\W","&&\\1rPBnOGDkc",[global])), 
+    <<"rI">> = iolist_to_binary(re:replace("-","\\W","rI",[])), 
+    <<"rI">> = iolist_to_binary(re:replace("-","\\W","rI",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","\\W","N&\\1h&mf\\1eJ&T",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","\\W","N&\\1h&mf\\1eJ&T",[global])), 
+    <<"Ia bHMFKnjmeDa bNCX">> = iolist_to_binary(re:replace("a b","a\\sb","I&HMFKnjm\\1eD&NCX",[])), 
+    <<"Ia bHMFKnjmeDa bNCX">> = iolist_to_binary(re:replace("a b","a\\sb","I&HMFKnjm\\1eD&NCX",[global])), 
+    <<"a-ba-ba-bnaNLABX">> = iolist_to_binary(re:replace("a-b","a\\Sb","&&&naN\\1LABX\\1",[])), 
+    <<"a-ba-ba-bnaNLABX">> = iolist_to_binary(re:replace("a-b","a\\Sb","&&&naN\\1LABX\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Sb","\\1bI&cDB\\1Bpe",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Sb","\\1bI&cDB\\1Bpe",[global])), 
+    <<"ILRpJeKfXTxFTY">> = iolist_to_binary(re:replace("a-b","a\\Sb","I\\1L\\1RpJe\\1KfXTxFTY",[])), 
+    <<"ILRpJeKfXTxFTY">> = iolist_to_binary(re:replace("a-b","a\\Sb","I\\1L\\1RpJe\\1KfXTxFTY",[global])), 
+    <<"a b">> = iolist_to_binary(re:replace("a b","a\\Sb","\\1ngH\\1OgaFGbI",[])), 
+    <<"a b">> = iolist_to_binary(re:replace("a b","a\\Sb","\\1ngH\\1OgaFGbI",[global])), 
+    <<"oOycwxv1FKdF">> = iolist_to_binary(re:replace("1","\\d","oOycwxv&FK\\1dF\\1",[])), 
+    <<"oOycwxv1FKdF">> = iolist_to_binary(re:replace("1","\\d","oOycwxv&FK\\1dF\\1",[global])), 
+    <<"YdKRXgdlJSvnIO">> = iolist_to_binary(re:replace("-","\\D","YdKRXgdl\\1JSvnIO",[])), 
+    <<"YdKRXgdlJSvnIO">> = iolist_to_binary(re:replace("-","\\D","YdKRXgdl\\1JSvnIO",[global])), 
+    <<"lxE*lk*V** Failers">> = iolist_to_binary(re:replace("*** Failers","\\D","lx\\1E&lk&V",[])), 
+    <<"lxE*lk*VlxE*lk*VlxE*lk*VlxE lk VlxEFlkFVlxEalkaVlxEilkiVlxEllklVlxEelkeVlxErlkrVlxEslksV">> = iolist_to_binary(re:replace("*** Failers","\\D","lx\\1E&lk&V",[global])), 
+    <<"JRKLvPGXEGf-a">> = iolist_to_binary(re:replace("-","\\D","JRK\\1LvPG\\1XEGf&a",[])), 
+    <<"JRKLvPGXEGf-a">> = iolist_to_binary(re:replace("-","\\D","JRK\\1LvPG\\1XEGf&a",[global])), 
+    <<"1">> = iolist_to_binary(re:replace("1","\\D","aTH&MPmaOF\\1\\1r",[])), 
+    <<"1">> = iolist_to_binary(re:replace("1","\\D","aTH&MPmaOF\\1\\1r",[global])), 
+    <<"MGKXIbaJcyWbp">> = iolist_to_binary(re:replace("a","[\\w]","MGKXIb&Jc\\1yWbp",[])), 
+    <<"MGKXIbaJcyWbp">> = iolist_to_binary(re:replace("a","[\\w]","MGKXIb&Jc\\1yWbp",[global])), 
+    ok.
+run17() ->
+    <<"YqG">> = iolist_to_binary(re:replace("-","[\\W]","YqG",[])), 
+    <<"YqG">> = iolist_to_binary(re:replace("-","[\\W]","YqG",[global])), 
+    <<"*nxdd*geTTc** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\W]","&nx\\1dd&geTTc",[])), 
+    <<"*nxdd*geTTc*nxdd*geTTc*nxdd*geTTc nxdd geTTcFailers">> = iolist_to_binary(re:replace("*** Failers","[\\W]","&nx\\1dd&geTTc",[global])), 
+    <<"iqqe">> = iolist_to_binary(re:replace("-","[\\W]","iqqe",[])), 
+    <<"iqqe">> = iolist_to_binary(re:replace("-","[\\W]","iqqe",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","[\\W]","wwF\\1Q",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","[\\W]","wwF\\1Q",[global])), 
+    <<"a b">> = iolist_to_binary(re:replace("a b","a[\\s]b","&",[])), 
+    <<"a b">> = iolist_to_binary(re:replace("a b","a[\\s]b","&",[global])), 
+    <<"SPqkyVa-bP">> = iolist_to_binary(re:replace("a-b","a[\\S]b","SPqkyV&P",[])), 
+    <<"SPqkyVa-bP">> = iolist_to_binary(re:replace("a-b","a[\\S]b","SPqkyV&P",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[\\S]b","\\1FDeRsoK&IAJD&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[\\S]b","\\1FDeRsoK&IAJD&",[global])), 
+    <<"VDpMoFi">> = iolist_to_binary(re:replace("a-b","a[\\S]b","VDpMoFi",[])), 
+    <<"VDpMoFi">> = iolist_to_binary(re:replace("a-b","a[\\S]b","VDpMoFi",[global])), 
+    <<"a b">> = iolist_to_binary(re:replace("a b","a[\\S]b","r&\\1C&XvsB&",[])), 
+    <<"a b">> = iolist_to_binary(re:replace("a b","a[\\S]b","r&\\1C&XvsB&",[global])), 
+    <<"oHYpsb1fsM1IhN1n">> = iolist_to_binary(re:replace("1","[\\d]","oHY\\1psb&fsM&IhN\\1&n",[])), 
+    <<"oHYpsb1fsM1IhN1n">> = iolist_to_binary(re:replace("1","[\\d]","oHY\\1psb&fsM&IhN\\1&n",[global])), 
+    <<"-KJX">> = iolist_to_binary(re:replace("-","[\\D]","&KJX",[])), 
+    <<"-KJX">> = iolist_to_binary(re:replace("-","[\\D]","&KJX",[global])), 
+    <<"S*I*KU** Failers">> = iolist_to_binary(re:replace("*** Failers","[\\D]","S&\\1I&KU",[])), 
+    <<"S*I*KUS*I*KUS*I*KUS I KUSFIFKUSaIaKUSiIiKUSlIlKUSeIeKUSrIrKUSsIsKU">> = iolist_to_binary(re:replace("*** Failers","[\\D]","S&\\1I&KU",[global])), 
+    <<"WSKtUY">> = iolist_to_binary(re:replace("-","[\\D]","WSKtUY",[])), 
+    <<"WSKtUY">> = iolist_to_binary(re:replace("-","[\\D]","WSKtUY",[global])), 
+    <<"1">> = iolist_to_binary(re:replace("1","[\\D]","B\\1iB",[])), 
+    <<"1">> = iolist_to_binary(re:replace("1","[\\D]","B\\1iB",[global])), 
+    <<"bkabprVc">> = iolist_to_binary(re:replace("abc","ab|cd","bk&prV",[])), 
+    <<"bkabprVc">> = iolist_to_binary(re:replace("abc","ab|cd","bk&prV",[global])), 
+    <<"oxPHxnpgpabTabDdTmMcd">> = iolist_to_binary(re:replace("abcd","ab|cd","oxPHxnpgp&T&DdTmM",[])), 
+    <<"oxPHxnpgpabTabDdTmMoxPHxnpgpcdTcdDdTmM">> = iolist_to_binary(re:replace("abcd","ab|cd","oxPHxnpgp&T&DdTmM",[global])), 
+    <<"dpfHboradY">> = iolist_to_binary(re:replace("def","()ef","pfH\\1bor\\1adY",[])), 
+    <<"dpfHboradY">> = iolist_to_binary(re:replace("def","()ef","pfH\\1bor\\1adY",[global])), 
+    <<"Uma(b">> = iolist_to_binary(re:replace("a(b","a\\(b","Um&",[])), 
+    <<"Uma(b">> = iolist_to_binary(re:replace("a(b","a\\(b","Um&",[global])), 
+    <<"YyxabuKXMauxXBpkrd">> = iolist_to_binary(re:replace("ab","a\\(*b","Yyx&uKXMauxXBpkrd",[])), 
+    <<"YyxabuKXMauxXBpkrd">> = iolist_to_binary(re:replace("ab","a\\(*b","Yyx&uKXMauxXBpkrd",[global])), 
+    <<"pDTwGyKkiLEWnnefa((b">> = iolist_to_binary(re:replace("a((b","a\\(*b","pDTwGyKkiLEWnnef&",[])), 
+    <<"pDTwGyKkiLEWnnefa((b">> = iolist_to_binary(re:replace("a((b","a\\(*b","pDTwGyKkiLEWnnef&",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","a\\\\b","G\\1H\\1qrOi&\\1&aUty",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","a\\\\b","G\\1H\\1qrOi&\\1&aUty",[global])), 
+    <<"eaywaaaVSCBcjnuIfRXabc">> = iolist_to_binary(re:replace("abc","((a))","e&yw&\\1&VSCBcjnuIfRX\\1",[])), 
+    <<"eaywaaaVSCBcjnuIfRXabc">> = iolist_to_binary(re:replace("abc","((a))","e&yw&\\1&VSCBcjnuIfRX\\1",[global])), 
+    <<"IbabcEabc">> = iolist_to_binary(re:replace("abc","(a)b(c)","Ib&E&",[])), 
+    <<"IbabcEabc">> = iolist_to_binary(re:replace("abc","(a)b(c)","Ib&E&",[global])), 
+    <<"aabbgflabcrIsYKabcUvEj">> = iolist_to_binary(re:replace("aabbabc","a+b+c","gf\\1\\1l&rIsYK&UvEj",[])), 
+    <<"aabbgflabcrIsYKabcUvEj">> = iolist_to_binary(re:replace("aabbabc","a+b+c","gf\\1\\1l&rIsYK&UvEj",[global])), 
+    <<"aabbUMebt">> = iolist_to_binary(re:replace("aabbabc","a{1,}b{1,}c","UMeb\\1t",[])), 
+    <<"aabbUMebt">> = iolist_to_binary(re:replace("aabbabc","a{1,}b{1,}c","UMeb\\1t",[global])), 
+    <<"pPfLrjPUFRjvuHjcjabc">> = iolist_to_binary(re:replace("abcabc","a.+?c","pPf\\1LrjPUFRjvuH\\1jcj\\1",[])), 
+    <<"pPfLrjPUFRjvuHjcjpPfLrjPUFRjvuHjcj">> = iolist_to_binary(re:replace("abcabc","a.+?c","pPf\\1LrjPUFRjvuH\\1jcj\\1",[global])), 
+    <<"abocUabav">> = iolist_to_binary(re:replace("ab","(a+|b)*","&ocU&av",[])), 
+    <<"abocUabavocUav">> = iolist_to_binary(re:replace("ab","(a+|b)*","&ocU&av",[global])), 
+    <<"FWabLo">> = iolist_to_binary(re:replace("ab","(a+|b){0,}","FW&Lo",[])), 
+    <<"FWabLoFWLo">> = iolist_to_binary(re:replace("ab","(a+|b){0,}","FW&Lo",[global])), 
+    <<"EGbhiYYab">> = iolist_to_binary(re:replace("ab","(a+|b)+","EG\\1hiYY&",[])), 
+    <<"EGbhiYYab">> = iolist_to_binary(re:replace("ab","(a+|b)+","EG\\1hiYY&",[global])), 
+    <<"jbtiMbbNbCoAUbUC">> = iolist_to_binary(re:replace("ab","(a+|b){1,}","j\\1tiM\\1\\1N\\1CoAU\\1UC",[])), 
+    <<"jbtiMbbNbCoAUbUC">> = iolist_to_binary(re:replace("ab","(a+|b){1,}","j\\1tiM\\1\\1N\\1CoAU\\1UC",[global])), 
+    ok.
+run18() ->
+    <<"aLWaSkPahb">> = iolist_to_binary(re:replace("ab","(a+|b)?","\\1LW\\1SkP&h",[])), 
+    <<"aLWaSkPahbLWbSkPbhLWSkPh">> = iolist_to_binary(re:replace("ab","(a+|b)?","\\1LW\\1SkP&h",[global])), 
+    <<"Aab">> = iolist_to_binary(re:replace("ab","(a+|b){0,1}","A\\1",[])), 
+    <<"AaAbA">> = iolist_to_binary(re:replace("ab","(a+|b){0,1}","A\\1",[global])), 
+    <<"QOcdemOcded">> = iolist_to_binary(re:replace("cde","[^ab]*","QO&mO&d",[])), 
+    <<"QOcdemOcdedQOmOd">> = iolist_to_binary(re:replace("cde","[^ab]*","QO&mO&d",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","iTWYAHkkEiJ&r",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","iTWYAHkkEiJ&r",[global])), 
+    <<"b">> = iolist_to_binary(re:replace("b","abc","Q",[])), 
+    <<"b">> = iolist_to_binary(re:replace("b","abc","Q",[global])), 
+    <<"nboabbbcdffWetJfpMLDkabbbcdjOabbbcd">> = iolist_to_binary(re:replace("abbbcd","([abc])*d","nbo&ffWetJfpMLDk&jO&",[])), 
+    <<"nboabbbcdffWetJfpMLDkabbbcdjOabbbcd">> = iolist_to_binary(re:replace("abbbcd","([abc])*d","nbo&ffWetJfpMLDk&jO&",[global])), 
+    <<"JaabcduaabcdVPsa">> = iolist_to_binary(re:replace("abcd","([abc])*bcd","J\\1&ua&VPs\\1",[])), 
+    <<"JaabcduaabcdVPsa">> = iolist_to_binary(re:replace("abcd","([abc])*bcd","J\\1&ua&VPs\\1",[global])), 
+    <<"e">> = iolist_to_binary(re:replace("e","a|b|c|d|e","&",[])), 
+    <<"e">> = iolist_to_binary(re:replace("e","a|b|c|d|e","&",[global])), 
+    <<"kefefAeXq">> = iolist_to_binary(re:replace("ef","(a|b|c|d|e)f","k&&A\\1Xq",[])), 
+    <<"kefefAeXq">> = iolist_to_binary(re:replace("ef","(a|b|c|d|e)f","k&&A\\1Xq",[global])), 
+    <<"fsGDN">> = iolist_to_binary(re:replace("abcdefg","abcd*efg","fsG\\1D\\1\\1N\\1",[])), 
+    <<"fsGDN">> = iolist_to_binary(re:replace("abcdefg","abcd*efg","fsG\\1D\\1\\1N\\1",[global])), 
+    <<"xThMpLDjpnyabbbz">> = iolist_to_binary(re:replace("xabyabbbz","ab*","T\\1hMpLDjpn",[])), 
+    <<"xThMpLDjpnyThMpLDjpnz">> = iolist_to_binary(re:replace("xabyabbbz","ab*","T\\1hMpLDjpn",[global])), 
+    <<"xqjaJaVJVyabbbz">> = iolist_to_binary(re:replace("xayabbbz","ab*","qj&J&VJV",[])), 
+    <<"xqjaJaVJVyqjabbbJabbbVJVz">> = iolist_to_binary(re:replace("xayabbbz","ab*","qj&J&VJV",[global])), 
+    <<"abCcdeQnNecduqUkMSfcdGcdecdeh">> = iolist_to_binary(re:replace("abcde","(ab|cd)e","C&QnNe\\1uqUkMSf\\1G&&h",[])), 
+    <<"abCcdeQnNecduqUkMSfcdGcdecdeh">> = iolist_to_binary(re:replace("abcde","(ab|cd)e","C&QnNe\\1uqUkMSf\\1G&&h",[global])), 
+    <<"gJyOb">> = iolist_to_binary(re:replace("hij","[abhgefdc]ij","gJyOb",[])), 
+    <<"gJyOb">> = iolist_to_binary(re:replace("hij","[abhgefdc]ij","gJyOb",[global])), 
+    <<"abcdGbYcPqM">> = iolist_to_binary(re:replace("abcdef","(abc|)ef","GbY\\1cPqM",[])), 
+    <<"abcdGbYcPqM">> = iolist_to_binary(re:replace("abcdef","(abc|)ef","GbY\\1cPqM",[global])), 
+    <<"aUbcdUBbcdAUpIFAbVerWgt">> = iolist_to_binary(re:replace("abcd","(a|b)c*d","U&UB&AUpIFA\\1VerWgt",[])), 
+    <<"aUbcdUBbcdAUpIFAbVerWgt">> = iolist_to_binary(re:replace("abcd","(a|b)c*d","U&UB&AUpIFA\\1VerWgt",[global])), 
+    <<"abckK">> = iolist_to_binary(re:replace("abc","(ab|ab*)bc","&kK",[])), 
+    <<"abckK">> = iolist_to_binary(re:replace("abc","(ab|ab*)bc","&kK",[global])), 
+    <<"MFabcMbcbcabcXbcGWabcbc">> = iolist_to_binary(re:replace("abc","a([bc]*)c*","MF&M\\1\\1&X\\1GW&\\1",[])), 
+    <<"MFabcMbcbcabcXbcGWabcbc">> = iolist_to_binary(re:replace("abc","a([bc]*)c*","MF&M\\1\\1&X\\1GW&\\1",[global])), 
+    <<"bcEbcyv">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c*d)","\\1E\\1yv",[])), 
+    <<"bcEbcyv">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c*d)","\\1E\\1yv",[global])), 
+    <<"HJx">> = iolist_to_binary(re:replace("abcd","a([bc]+)(c*d)","HJx",[])), 
+    <<"HJx">> = iolist_to_binary(re:replace("abcd","a([bc]+)(c*d)","HJx",[global])), 
+    ok.
+run19() ->
+    <<"HdbW">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c+d)","Hd\\1W",[])), 
+    <<"HdbW">> = iolist_to_binary(re:replace("abcd","a([bc]*)(c+d)","Hd\\1W",[global])), 
+    <<"FqCeJOadcdcdeIvQpadcdcdeadcdcdeadcdcdeH">> = iolist_to_binary(re:replace("adcdcde","a[bcd]*dcdcde","FqCeJO&IvQp\\1\\1&&&H",[])), 
+    <<"FqCeJOadcdcdeIvQpadcdcdeadcdcdeadcdcdeH">> = iolist_to_binary(re:replace("adcdcde","a[bcd]*dcdcde","FqCeJO&IvQp\\1\\1&&&H",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bcd]+dcdcde","\\1&TNEyDw",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[bcd]+dcdcde","\\1&TNEyDw",[global])), 
+    <<"abcde">> = iolist_to_binary(re:replace("abcde","a[bcd]+dcdcde","PqeS\\1GQJ&vSq&YhS",[])), 
+    <<"abcde">> = iolist_to_binary(re:replace("abcde","a[bcd]+dcdcde","PqeS\\1GQJ&vSq&YhS",[global])), 
+    <<"adcdcde">> = iolist_to_binary(re:replace("adcdcde","a[bcd]+dcdcde","vdBav\\1Ild",[])), 
+    <<"adcdcde">> = iolist_to_binary(re:replace("adcdcde","a[bcd]+dcdcde","vdBav\\1Ild",[global])), 
+    <<"GIjXVoAJXroabclW">> = iolist_to_binary(re:replace("abc","(ab|a)b*c","GIjXVoAJXro&lW",[])), 
+    <<"GIjXVoAJXroabclW">> = iolist_to_binary(re:replace("abc","(ab|a)b*c","GIjXVoAJXro&lW",[global])), 
+    <<"pKabcabctabcdqabcdaAabcdpgPtdK">> = iolist_to_binary(re:replace("abcd","((a)(b)c)(d)","pK\\1\\1t&q&aA&pgPtdK",[])), 
+    <<"pKabcabctabcdqabcdaAabcdpgPtdK">> = iolist_to_binary(re:replace("abcd","((a)(b)c)(d)","pK\\1\\1t&q&aA&pgPtdK",[global])), 
+    <<"XrxalphaplnalphaMFGv">> = iolist_to_binary(re:replace("alpha","[a-zA-Z_][a-zA-Z0-9_]*","Xrx&pln&MFG\\1v",[])), 
+    <<"XrxalphaplnalphaMFGv">> = iolist_to_binary(re:replace("alpha","[a-zA-Z_][a-zA-Z0-9_]*","Xrx&pln&MFG\\1v",[global])), 
+    <<"ajbhHEObuuuMEIegbh">> = iolist_to_binary(re:replace("abh","^a(bc+|b[eh])g|.h$","j&HEObuu\\1uMEIeg&",[])), 
+    <<"ajbhHEObuuuMEIegbh">> = iolist_to_binary(re:replace("abh","^a(bc+|b[eh])g|.h$","j&HEObuu\\1uMEIeg&",[global])), 
+    <<"effgzFiGeffgzUwqI">> = iolist_to_binary(re:replace("effgz","(bc+d$|ef*g.|h?i(j|k))","&FiG\\1UwqI",[])), 
+    <<"effgzFiGeffgzUwqI">> = iolist_to_binary(re:replace("effgz","(bc+d$|ef*g.|h?i(j|k))","&FiG\\1UwqI",[global])), 
+    <<"ijJMstbxCWsijpVijVwQav">> = iolist_to_binary(re:replace("ij","(bc+d$|ef*g.|h?i(j|k))","&JMstbxCWs&pV\\1VwQav",[])), 
+    <<"ijJMstbxCWsijpVijVwQav">> = iolist_to_binary(re:replace("ij","(bc+d$|ef*g.|h?i(j|k))","&JMstbxCWs&pV\\1VwQav",[global])), 
+    <<"rqYdteffgzVIpOoenIHdd">> = iolist_to_binary(re:replace("reffgz","(bc+d$|ef*g.|h?i(j|k))","qYdt&VIpOoenIHdd",[])), 
+    <<"rqYdteffgzVIpOoenIHdd">> = iolist_to_binary(re:replace("reffgz","(bc+d$|ef*g.|h?i(j|k))","qYdt&VIpOoenIHdd",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","aq",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","aq",[global])), 
+    <<"effg">> = iolist_to_binary(re:replace("effg","(bc+d$|ef*g.|h?i(j|k))","yHtJLFej\\1yYR\\1sQo&np",[])), 
+    <<"effg">> = iolist_to_binary(re:replace("effg","(bc+d$|ef*g.|h?i(j|k))","yHtJLFej\\1yYR\\1sQo&np",[global])), 
+    <<"bcdd">> = iolist_to_binary(re:replace("bcdd","(bc+d$|ef*g.|h?i(j|k))","y\\1WeuT\\1",[])), 
+    <<"bcdd">> = iolist_to_binary(re:replace("bcdd","(bc+d$|ef*g.|h?i(j|k))","y\\1WeuT\\1",[global])), 
+    <<"wodvWYlegweBrV">> = iolist_to_binary(re:replace("a","((((((((((a))))))))))","wodvWYlegweBrV",[])), 
+    <<"wodvWYlegweBrV">> = iolist_to_binary(re:replace("a","((((((((((a))))))))))","wodvWYlegweBrV",[global])), 
+    <<"gqasCpaas">> = iolist_to_binary(re:replace("aa","((((((((((a))))))))))\\10","gq\\1sCp\\1\\1s",[])), 
+    <<"gqasCpaas">> = iolist_to_binary(re:replace("aa","((((((((((a))))))))))\\10","gq\\1sCp\\1\\1s",[global])), 
+    <<"GwagSDfa">> = iolist_to_binary(re:replace("a","(((((((((a)))))))))","Gw&gSDf&",[])), 
+    <<"GwagSDfa">> = iolist_to_binary(re:replace("a","(((((((((a)))))))))","Gw&gSDf&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","qj&H&TFbc&WmR",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","qj&H&TFbc&WmR",[global])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","multiple words of text","FwU",[])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","multiple words of text","FwU",[global])), 
+    <<"uh-uh">> = iolist_to_binary(re:replace("uh-uh","multiple words of text","Tf&&&bwM&KOaXHg\\1WRNk",[])), 
+    <<"uh-uh">> = iolist_to_binary(re:replace("uh-uh","multiple words of text","Tf&&&bwM&KOaXHg\\1WRNk",[global])), 
+    <<"RdXXlExbAbHAgDE, yeah">> = iolist_to_binary(re:replace("multiple words, yeah","multiple words","R\\1dXXl\\1ExbAbHAgDE",[])), 
+    <<"RdXXlExbAbHAgDE, yeah">> = iolist_to_binary(re:replace("multiple words, yeah","multiple words","R\\1dXXl\\1ExbAbHAgDE",[global])), 
+    <<"ababcCxabsCTYB">> = iolist_to_binary(re:replace("abcde","(.*)c(.*)","\\1\\1cCx\\1sCTYB",[])), 
+    <<"ababcCxabsCTYB">> = iolist_to_binary(re:replace("abcde","(.*)c(.*)","\\1\\1cCx\\1sCTYB",[global])), 
+    <<"rW">> = iolist_to_binary(re:replace("(a, b)","\\((.*), (.*)\\)","rW",[])), 
+    <<"rW">> = iolist_to_binary(re:replace("(a, b)","\\((.*), (.*)\\)","rW",[global])), 
+    <<"dabcd">> = iolist_to_binary(re:replace("abcd","abcd","d&",[])), 
+    <<"dabcd">> = iolist_to_binary(re:replace("abcd","abcd","d&",[global])), 
+    <<"bclAbcTn">> = iolist_to_binary(re:replace("abcd","a(bc)d","\\1lA\\1Tn",[])), 
+    <<"bclAbcTn">> = iolist_to_binary(re:replace("abcd","a(bc)d","\\1lA\\1Tn",[global])), 
+    <<"waf">> = iolist_to_binary(re:replace("ac","a[-]?c","waf",[])), 
+    <<"waf">> = iolist_to_binary(re:replace("ac","a[-]?c","waf",[global])), 
+    <<"HpOuFXbFnUEO">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","HpOuFXbFnUEO",[])), 
+    <<"HpOuFXbFnUEO">> = iolist_to_binary(re:replace("abcabc","(abc)\\1","HpOuFXbFnUEO",[global])), 
+    ok.
+run20() ->
+    <<"XvCLIKabcabcohl">> = iolist_to_binary(re:replace("abcabc","([a-c]*)\\1","XvCLIK&ohl",[])), 
+    <<"XvCLIKabcabcohlXvCLIKohl">> = iolist_to_binary(re:replace("abcabc","([a-c]*)\\1","XvCLIK&ohl",[global])), 
+    <<"THmLVdxHpEOamaQ">> = iolist_to_binary(re:replace("a","(a)|\\1","THmLVdxHpEOam\\1Q",[])), 
+    <<"THmLVdxHpEOamaQ">> = iolist_to_binary(re:replace("a","(a)|\\1","THmLVdxHpEOam\\1Q",[global])), 
+    <<"*** FjGfKKSoilers">> = iolist_to_binary(re:replace("*** Failers","(a)|\\1","jGfKKSo",[])), 
+    <<"*** FjGfKKSoilers">> = iolist_to_binary(re:replace("*** Failers","(a)|\\1","jGfKKSo",[global])), 
+    <<"pCab">> = iolist_to_binary(re:replace("ab","(a)|\\1","pC&",[])), 
+    <<"pCab">> = iolist_to_binary(re:replace("ab","(a)|\\1","pC&",[global])), 
+    <<"x">> = iolist_to_binary(re:replace("x","(a)|\\1","U",[])), 
+    <<"x">> = iolist_to_binary(re:replace("x","(a)|\\1","U",[global])), 
+    <<"nwvlinqmgabbLababbvbcbc">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2)*","nwvlinqmga\\1L&v",[])), 
+    <<"nwvlinqmgabbLababbvnwvlinqmgaLvbnwvlinqmgacbcLcbcvnwvlinqmgaLv">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2)*","nwvlinqmga\\1L&v",[global])), 
+    <<"XEababbbcbccbcnoei">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2){3}","XE&\\1noei",[])), 
+    <<"XEababbbcbccbcnoei">> = iolist_to_binary(re:replace("ababbbcbc","(([a-c])b*?\\2){3}","XE&\\1noei",[global])), 
+    <<"aaaxabaxbaaxbbaxQHJip">> = iolist_to_binary(re:replace("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+","&QHJip",[])), 
+    <<"aaaxabaxbaaxbbaxQHJip">> = iolist_to_binary(re:replace("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+","&QHJip",[global])), 
+    <<"bbaababbabaaaaaFjrtkQstbbaaaabbabbaaaabbaRobbaaaabbaQwbbaJbbaaaabbabbaaaabba">> = iolist_to_binary(re:replace("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}","FjrtkQst&&Ro&Qw\\1J&&",[])), 
+    <<"bbaababbabaaaaaFjrtkQstbbaaaabbabbaaaabbaRobbaaaabbaQwbbaJbbaaaabbabbaaaabba">> = iolist_to_binary(re:replace("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}","FjrtkQst&&Ro&Qw\\1J&&",[global])), 
+    <<"hryRShiLJ">> = iolist_to_binary(re:replace("ABC","abc","hryRShiL\\1J",[caseless])), 
+    <<"hryRShiLJ">> = iolist_to_binary(re:replace("ABC","abc","hryRShiL\\1J",[caseless,
+                                                                                                                                                                              global])), 
+    <<"XHUenvABCCmAOuuCY">> = iolist_to_binary(re:replace("XABCY","abc","HUenv&C\\1mAOuuC",[caseless])), 
+    <<"XHUenvABCCmAOuuCY">> = iolist_to_binary(re:replace("XABCY","abc","HUenv&C\\1mAOuuC",[caseless,
+                                                                                                                                                                                           global])), 
+    <<"AB">> = iolist_to_binary(re:replace("ABABC","abc","\\1",[caseless])), 
+    <<"AB">> = iolist_to_binary(re:replace("ABABC","abc","\\1",[caseless,
+                                                                                                                                                                global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","qc&a\\1M&&\\1qqO&&YaV",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","qc&a\\1M&&\\1qqO&&YaV",[caseless,
+                                                                                                                                                                                                                      global])), 
+    <<"aaxabxbaxbbx">> = iolist_to_binary(re:replace("aaxabxbaxbbx","abc","YoMmmB&v\\1N\\1voc",[caseless])), 
+    <<"aaxabxbaxbbx">> = iolist_to_binary(re:replace("aaxabxbaxbbx","abc","YoMmmB&v\\1N\\1voc",[caseless,
+                                                                                                                                                                                                              global])), 
+    <<"XBC">> = iolist_to_binary(re:replace("XBC","abc","\\1gwN\\1pcAL\\1le&B",[caseless])), 
+    <<"XBC">> = iolist_to_binary(re:replace("XBC","abc","\\1gwN\\1pcAL\\1le&B",[caseless,
+                                                                                                                                                                                                 global])), 
+    <<"AXC">> = iolist_to_binary(re:replace("AXC","abc","vQ&&a\\1Kw",[caseless])), 
+    <<"AXC">> = iolist_to_binary(re:replace("AXC","abc","vQ&&a\\1Kw",[caseless,
+                                                                                                                                                                            global])), 
+    <<"ABX">> = iolist_to_binary(re:replace("ABX","abc","pSJJqa&TbyEb",[caseless])), 
+    <<"ABX">> = iolist_to_binary(re:replace("ABX","abc","pSJJqa&TbyEb",[caseless,
+                                                                                                                                                                              global])), 
+    <<"ABCYSKriNcABCxqw">> = iolist_to_binary(re:replace("ABC","ab*c","&YSKriNc&xqw",[caseless])), 
+    <<"ABCYSKriNcABCxqw">> = iolist_to_binary(re:replace("ABC","ab*c","&YSKriNc&xqw",[caseless,
+                                                                                                                                                                                 global])), 
+    <<"">> = iolist_to_binary(re:replace("ABC","ab*bc","\\1",[caseless])), 
+    <<"">> = iolist_to_binary(re:replace("ABC","ab*bc","\\1",[caseless,
+                                                                                                                                                                global])), 
+    <<"xd">> = iolist_to_binary(re:replace("ABBC","ab*bc","xd",[caseless])), 
+    <<"xd">> = iolist_to_binary(re:replace("ABBC","ab*bc","xd",[caseless,
                                                                                                                                                                global])), 
-?line <<"ABnpaQvR">> = iolist_to_binary(re:replace("ABABC","abc","npaQvR",[caseless])), 
-?line <<"ABnpaQvR">> = iolist_to_binary(re:replace("ABABC","abc","npaQvR",[caseless,
+    <<"fSNABBBBCXyDgO">> = iolist_to_binary(re:replace("ABBBBC","ab*?bc","fSN&\\1\\1XyDgO\\1",[caseless])), 
+    <<"fSNABBBBCXyDgO">> = iolist_to_binary(re:replace("ABBBBC","ab*?bc","fSN&\\1\\1XyDgO\\1",[caseless,
+                                                                                                                                                                                                         global])), 
+    <<"kp">> = iolist_to_binary(re:replace("ABBBBC","ab{0,}?bc","kp",[caseless])), 
+    <<"kp">> = iolist_to_binary(re:replace("ABBBBC","ab{0,}?bc","kp",[caseless,
+                                                                                                                                                                           global])), 
+    <<"TjPcYlpdNDABBCAJoFsABBC">> = iolist_to_binary(re:replace("ABBC","ab+?bc","TjPcYlpdND\\1\\1&AJoFs&",[caseless])), 
+    <<"TjPcYlpdNDABBCAJoFsABBC">> = iolist_to_binary(re:replace("ABBC","ab+?bc","TjPcYlpdND\\1\\1&AJoFs&",[caseless,
+                                                                                                                                                                                                               global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","WWQXKaM\\1xLF&",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","WWQXKaM\\1xLF&",[caseless,
+                                                                                                                                                                                                       global])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","ab+bc","w",[caseless])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","ab+bc","w",[caseless,
+                                                                                                                                                           global])), 
+    <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab+bc","SYdD",[caseless])), 
+    <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab+bc","SYdD",[caseless,
+                                                                                                                                                                 global])), 
+    <<"TABBBBC">> = iolist_to_binary(re:replace("ABBBBC","ab+bc","T&",[caseless])), 
+    <<"TABBBBC">> = iolist_to_binary(re:replace("ABBBBC","ab+bc","T&",[caseless,
+                                                                                                                                                                    global])), 
+    <<"grMABBBBCABBBBCnRD">> = iolist_to_binary(re:replace("ABBBBC","ab{1,}?bc","grM&&nRD",[caseless])), 
+    <<"grMABBBBCABBBBCnRD">> = iolist_to_binary(re:replace("ABBBBC","ab{1,}?bc","grM&&nRD",[caseless,
+                                                                                                                                                                                         global])), 
+    <<"JJtIBfABBBBCaKtYmqwv">> = iolist_to_binary(re:replace("ABBBBC","ab{1,3}?bc","\\1JJtIBf&\\1aKtYmqwv",[caseless])), 
+    <<"JJtIBfABBBBCaKtYmqwv">> = iolist_to_binary(re:replace("ABBBBC","ab{1,3}?bc","\\1JJtIBf&\\1aKtYmqwv",[caseless,
+                                                                                                                                                                                                                      global])), 
+    <<"gwAlxwDfABBBBCNQKABBBBClABBBBCLxf">> = iolist_to_binary(re:replace("ABBBBC","ab{3,4}?bc","gw\\1AlxwDf&NQK&l\\1&Lxf",[caseless])), 
+    <<"gwAlxwDfABBBBCNQKABBBBClABBBBCLxf">> = iolist_to_binary(re:replace("ABBBBC","ab{3,4}?bc","gw\\1AlxwDf&NQK&l\\1&Lxf",[caseless,
+                                                                                                                                                                                                                              global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}?bc","qiwoP\\1bmIlc\\1&",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}?bc","qiwoP\\1bmIlc\\1&",[caseless,
+                                                                                                                                                                                                                        global])), 
+    <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab{4,5}?bc","aBG\\1YIvTYXxiuDt&",[caseless])), 
+    <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab{4,5}?bc","aBG\\1YIvTYXxiuDt&",[caseless,
+                                                                                                                                                                                                         global])), 
+    <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","ab{4,5}?bc","T\\1d&vifs\\1n\\1Jvt",[caseless])), 
+    <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","ab{4,5}?bc","T\\1d&vifs\\1n\\1Jvt",[caseless,
+                                                                                                                                                                                                                     global])), 
+    <<"MvyHLhAABBCiABBCN">> = iolist_to_binary(re:replace("ABBC","ab??bc","M\\1vyHLhA\\1&\\1i&N",[caseless])), 
+    <<"MvyHLhAABBCiABBCN">> = iolist_to_binary(re:replace("ABBC","ab??bc","M\\1vyHLhA\\1&\\1i&N",[caseless,
+                                                                                                                                                                                                          global])), 
+    <<"mlLABCgtDiemoB">> = iolist_to_binary(re:replace("ABC","ab??bc","mlL&gtDiemoB",[caseless])), 
+    <<"mlLABCgtDiemoB">> = iolist_to_binary(re:replace("ABC","ab??bc","mlL&gtDiemoB",[caseless,
+                                                                                                                                                                                    global])), 
+    ok.
+run21() ->
+    <<"aMKJBABCqBQrABCWvqqJABCVi">> = iolist_to_binary(re:replace("ABC","ab{0,1}?bc","aMKJB&qBQr&WvqqJ&Vi",[caseless])), 
+    <<"aMKJBABCqBQrABCWvqqJABCVi">> = iolist_to_binary(re:replace("ABC","ab{0,1}?bc","aMKJB&qBQr&WvqqJ&Vi",[caseless,
+                                                                                                                                                                                                            global])), 
+    <<"KABCqKjWXyABC">> = iolist_to_binary(re:replace("ABC","ab??c","K\\1&qKjWXy\\1&",[caseless])), 
+    <<"KABCqKjWXyABC">> = iolist_to_binary(re:replace("ABC","ab??c","K\\1&qKjWXy\\1&",[caseless,
+                                                                                                                                                                                           global])), 
+    <<"t">> = iolist_to_binary(re:replace("ABC","ab{0,1}?c","t",[caseless])), 
+    <<"t">> = iolist_to_binary(re:replace("ABC","ab{0,1}?c","t",[caseless,
+                                                                                                                                                                   global])), 
+    <<"djnySdABCABCxQAR">> = iolist_to_binary(re:replace("ABC","^abc$","djnyS\\1d&&\\1\\1x\\1QAR",[caseless])), 
+    <<"djnySdABCABCxQAR">> = iolist_to_binary(re:replace("ABC","^abc$","djnyS\\1d&&\\1\\1x\\1QAR",[caseless,
+                                                                                                                                                                                                                global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","&cOwCIe",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","&cOwCIe",[caseless,
+                                                                                                                                                                                         global])), 
+    <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","^abc$","DTRA&tGT\\1WCjF\\1\\1",[caseless])), 
+    <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","^abc$","DTRA&tGT\\1WCjF\\1\\1",[caseless,
+                                                                                                                                                                                                              global])), 
+    <<"ABCC">> = iolist_to_binary(re:replace("ABCC","^abc$","YC\\1",[caseless])), 
+    <<"ABCC">> = iolist_to_binary(re:replace("ABCC","^abc$","YC\\1",[caseless,
                                                                                                                                                                        global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","E&beuUX&&",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","abc","E&beuUX&&",[caseless,
-                                                                                                                                                                                            global])), 
-?line <<"aaxabxbaxbbx">> = iolist_to_binary(re:replace("aaxabxbaxbbx","abc","\\1hAU\\1hg&Pk",[caseless])), 
-?line <<"aaxabxbaxbbx">> = iolist_to_binary(re:replace("aaxabxbaxbbx","abc","\\1hAU\\1hg&Pk",[caseless,
-                                                                                                                                                                                                        global])), 
-?line <<"XBC">> = iolist_to_binary(re:replace("XBC","abc","yqsG",[caseless])), 
-?line <<"XBC">> = iolist_to_binary(re:replace("XBC","abc","yqsG",[caseless,
-                                                                                                                                                               global])), 
-?line <<"AXC">> = iolist_to_binary(re:replace("AXC","abc","\\1bi&Ff\\1kGVy&V",[caseless])), 
-?line <<"AXC">> = iolist_to_binary(re:replace("AXC","abc","\\1bi&Ff\\1kGVy&V",[caseless,
-                                                                                                                                                                                             global])), 
-?line <<"ABX">> = iolist_to_binary(re:replace("ABX","abc","x&m\\1jtf&ptFxBd",[caseless])), 
-?line <<"ABX">> = iolist_to_binary(re:replace("ABX","abc","x&m\\1jtf&ptFxBd",[caseless,
-                                                                                                                                                                                          global])), 
-?line <<"VOTkukABC">> = iolist_to_binary(re:replace("ABC","ab*c","V\\1OTkuk&\\1",[caseless])), 
-?line <<"VOTkukABC">> = iolist_to_binary(re:replace("ABC","ab*c","V\\1OTkuk&\\1",[caseless,
+    <<"oCxwvYlagrHYCUNjC">> = iolist_to_binary(re:replace("ABCC","^abc","oC\\1xwvYlagrHYCUN\\1j",[caseless])), 
+    <<"oCxwvYlagrHYCUNjC">> = iolist_to_binary(re:replace("ABCC","^abc","oC\\1xwvYlagrHYCUN\\1j",[caseless,
+                                                                                                                                                                                                       global])), 
+    <<"AABCYOABCqABCABCXABCKHJVXnu">> = iolist_to_binary(re:replace("AABC","abc$","&YO&q&&X&\\1KHJVXnu",[caseless])), 
+    <<"AABCYOABCqABCABCXABCKHJVXnu">> = iolist_to_binary(re:replace("AABC","abc$","&YO&q&&X&\\1KHJVXnu",[caseless,
+                                                                                                                                                                                                      global])), 
+    <<"YKSscFvdcxhKQAABC">> = iolist_to_binary(re:replace("ABC","^","YKSscFvdcx\\1hKQA\\1",[caseless])), 
+    <<"YKSscFvdcxhKQAABC">> = iolist_to_binary(re:replace("ABC","^","YKSscFvdcx\\1hKQA\\1",[caseless,
+                                                                                                                                                                                           global])), 
+    <<"ABCJPmJKxRqaJn">> = iolist_to_binary(re:replace("ABC","$","JPmJ&K\\1\\1x\\1RqaJ\\1n",[caseless])), 
+    <<"ABCJPmJKxRqaJn">> = iolist_to_binary(re:replace("ABC","$","JPmJ&K\\1\\1x\\1RqaJ\\1n",[caseless,
+                                                                                                                                                                                                       global])), 
+    <<"KovmYABCBPABCY">> = iolist_to_binary(re:replace("ABC","a.c","KovmY&BP&Y",[caseless])), 
+    <<"KovmYABCBPABCY">> = iolist_to_binary(re:replace("ABC","a.c","KovmY&BP&Y",[caseless,
+                                                                                                                                                                           global])), 
+    <<"tnMtqk">> = iolist_to_binary(re:replace("AXC","a.c","t\\1\\1n\\1Mtqk",[caseless])), 
+    <<"tnMtqk">> = iolist_to_binary(re:replace("AXC","a.c","t\\1\\1n\\1Mtqk",[caseless,
                                                                                                                                                                                       global])), 
-?line <<"gkYiABCuYNOFDNc">> = iolist_to_binary(re:replace("ABC","ab*bc","g\\1kYi&uYNOFDNc",[caseless])), 
-?line <<"gkYiABCuYNOFDNc">> = iolist_to_binary(re:replace("ABC","ab*bc","g\\1kYi&uYNOFDNc",[caseless,
-                                                                                                                                                                                             global])), 
-?line <<"GHfaNWh">> = iolist_to_binary(re:replace("ABBC","ab*bc","G\\1HfaNWh",[caseless])), 
-?line <<"GHfaNWh">> = iolist_to_binary(re:replace("ABBC","ab*bc","G\\1HfaNWh",[caseless,
-                                                                                                                                                                                  global])), 
-?line <<"IJJBqWcABBBBCmU">> = iolist_to_binary(re:replace("ABBBBC","ab*?bc","I\\1JJB\\1\\1qWc&mU",[caseless])), 
-?line <<"IJJBqWcABBBBCmU">> = iolist_to_binary(re:replace("ABBBBC","ab*?bc","I\\1JJB\\1\\1qWc&mU",[caseless,
-                                                                                                                                                                                                             global])), 
-?line <<"YOCTcABBBBCABBBBCbVDCpABBBBChP">> = iolist_to_binary(re:replace("ABBBBC","ab{0,}?bc","YOCTc&&bVDCp&hP",[caseless])), 
-?line <<"YOCTcABBBBCABBBBCbVDCpABBBBChP">> = iolist_to_binary(re:replace("ABBBBC","ab{0,}?bc","YOCTc&&bVDCp&hP",[caseless,
-                                                                                                                                                                                                          global])), 
-?line <<"j">> = iolist_to_binary(re:replace("ABBC","ab+?bc","j",[caseless])), 
-?line <<"j">> = iolist_to_binary(re:replace("ABBC","ab+?bc","j",[caseless,
+    <<"PTEd">> = iolist_to_binary(re:replace("AXYZC","a.*?c","PTEd",[caseless])), 
+    <<"PTEd">> = iolist_to_binary(re:replace("AXYZC","a.*?c","PTEd",[caseless,
+                                                                                                                                                                     global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.*c","\\1XFiq\\1uvPbLR",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.*c","\\1XFiq\\1uvPbLR",[caseless,
+                                                                                                                                                                                                         global])), 
+    <<"cqlTAABCy">> = iolist_to_binary(re:replace("AABC","a.*c","cqlT&\\1y",[caseless])), 
+    <<"cqlTAABCy">> = iolist_to_binary(re:replace("AABC","a.*c","cqlT&\\1y",[caseless,
+                                                                                                                                                                             global])), 
+    <<"AXYZD">> = iolist_to_binary(re:replace("AXYZD","a.*c","nHl&b\\1Xh",[caseless])), 
+    <<"AXYZD">> = iolist_to_binary(re:replace("AXYZD","a.*c","nHl&b\\1Xh",[caseless,
+                                                                                                                                                                                 global])), 
+    <<"ABDABDdC">> = iolist_to_binary(re:replace("ABD","a[bc]d","&&dC",[caseless])), 
+    <<"ABDABDdC">> = iolist_to_binary(re:replace("ABD","a[bc]d","&&dC",[caseless,
+                                                                                                                                                                     global])), 
+    <<"UqQFWlGkACEBdlidOCI">> = iolist_to_binary(re:replace("ACE","a[b-d]e","UqQF\\1WlGk&BdlidOCI\\1",[caseless])), 
+    <<"UqQFWlGkACEBdlidOCI">> = iolist_to_binary(re:replace("ACE","a[b-d]e","UqQF\\1WlGk&BdlidOCI\\1",[caseless,
+                                                                                                                                                                                                              global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[b-d]e","UKuM",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[b-d]e","UKuM",[caseless,
+                                                                                                                                                                                     global])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","a[b-d]e","W",[caseless])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","a[b-d]e","W",[caseless,
+                                                                                                                                                               global])), 
+    <<"ABD">> = iolist_to_binary(re:replace("ABD","a[b-d]e","HF",[caseless])), 
+    <<"ABD">> = iolist_to_binary(re:replace("ABD","a[b-d]e","HF",[caseless,
                                                                                                                                                                  global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","vLfo&Q\\1&uXHE",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab+bc","vLfo&Q\\1&uXHE",[caseless,
+    <<"AFX">> = iolist_to_binary(re:replace("AAC","a[b-d]","FX",[caseless])), 
+    <<"AFX">> = iolist_to_binary(re:replace("AAC","a[b-d]","FX",[caseless,
+                                                                                                                                                               global])), 
+    <<"aWjCeJjBuA-eA-wLdnI">> = iolist_to_binary(re:replace("A-","a[-b]","aWjCeJj\\1Bu&e&wLdnI",[caseless])), 
+    <<"aWjCeJjBuA-eA-wLdnI">> = iolist_to_binary(re:replace("A-","a[-b]","aWjCeJj\\1Bu&e&wLdnI",[caseless,
+                                                                                                                                                                                                  global])), 
+    <<"vEBoA-A-hhUA-oyIbqdTA">> = iolist_to_binary(re:replace("A-","a[b-]","vEBo&&hhU&oyIbq\\1d\\1TA",[caseless])), 
+    <<"vEBoA-A-hhUA-oyIbqdTA">> = iolist_to_binary(re:replace("A-","a[b-]","vEBo&&hhU&oyIbq\\1d\\1TA",[caseless,
+                                                                                                                                                                                                            global])), 
+    <<"lxsWAAwljA]">> = iolist_to_binary(re:replace("A]","a]","lxsW\\1AAwlj&",[caseless])), 
+    <<"lxsWAAwljA]">> = iolist_to_binary(re:replace("A]","a]","lxsW\\1AAwlj&",[caseless,
+                                                                                                                                                                             global])), 
+    <<"A]BBA]BwueRHPvA]BFaS">> = iolist_to_binary(re:replace("A]B","a[]]b","&B&\\1wueRHPv&FaS",[caseless])), 
+    <<"A]BBA]BwueRHPvA]BFaS">> = iolist_to_binary(re:replace("A]B","a[]]b","&B&\\1wueRHPv&FaS",[caseless,
+                                                                                                                                                                                               global])), 
+    ok.
+run22() ->
+    <<"UTPAEDUuRpFvTKUIXNAEDH">> = iolist_to_binary(re:replace("AED","a[^bc]d","U\\1TP&UuRpFvTKUIXN&H",[caseless])), 
+    <<"UTPAEDUuRpFvTKUIXNAEDH">> = iolist_to_binary(re:replace("AED","a[^bc]d","U\\1TP&UuRpFvTKUIXN&H",[caseless,
                                                                                                                                                                                                           global])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","ab+bc","hPVKmARvLrX&l",[caseless])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","ab+bc","hPVKmARvLrX&l",[caseless,
-                                                                                                                                                                                      global])), 
-?line <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab+bc","&\\1OP&EAg",[caseless])), 
-?line <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab+bc","&\\1OP&EAg",[caseless,
+    <<"EEkBKqX">> = iolist_to_binary(re:replace("ADC","a[^-b]c","EEk\\1BKqX",[caseless])), 
+    <<"EEkBKqX">> = iolist_to_binary(re:replace("ADC","a[^-b]c","EEk\\1BKqX",[caseless,
                                                                                                                                                                                   global])), 
-?line <<"PElq">> = iolist_to_binary(re:replace("ABBBBC","ab+bc","PElq",[caseless])), 
-?line <<"PElq">> = iolist_to_binary(re:replace("ABBBBC","ab+bc","PElq",[caseless,
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^-b]c","W&hcyn\\1LTFcrP",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^-b]c","W&hcyn\\1LTFcrP",[caseless,
+                                                                                                                                                                                                             global])), 
+    <<"ABD">> = iolist_to_binary(re:replace("ABD","a[^-b]c","l&hDcBVR&&P\\1HyoS&",[caseless])), 
+    <<"ABD">> = iolist_to_binary(re:replace("ABD","a[^-b]c","l&hDcBVR&&P\\1HyoS&",[caseless,
+                                                                                                                                                                                                        global])), 
+    <<"A-C">> = iolist_to_binary(re:replace("A-C","a[^-b]c","r&\\1",[caseless])), 
+    <<"A-C">> = iolist_to_binary(re:replace("A-C","a[^-b]c","r&\\1",[caseless,
                                                                                                                                                                          global])), 
-?line <<"aqDjyRpvS">> = iolist_to_binary(re:replace("ABBBBC","ab{1,}?bc","\\1a\\1\\1q\\1DjyRpvS\\1",[caseless])), 
-?line <<"aqDjyRpvS">> = iolist_to_binary(re:replace("ABBBBC","ab{1,}?bc","\\1a\\1\\1q\\1DjyRpvS\\1",[caseless,
-                                                                                                                                                                                                                              global])), 
-?line <<"aTWqxABBBBCInABBBBCpRFpO">> = iolist_to_binary(re:replace("ABBBBC","ab{1,3}?bc","aTW\\1qx&In&\\1pRFpO",[caseless])), 
-?line <<"aTWqxABBBBCInABBBBCpRFpO">> = iolist_to_binary(re:replace("ABBBBC","ab{1,3}?bc","aTW\\1qx&In&\\1pRFpO",[caseless,
-                                                                                                                                                                                                                       global])), 
-?line <<"ABBBBCTlrABBBBCJOlJvqwgABBBBCh">> = iolist_to_binary(re:replace("ABBBBC","ab{3,4}?bc","&T\\1lr&JOl\\1Jvqwg&h",[caseless])), 
-?line <<"ABBBBCTlrABBBBCJOlJvqwgABBBBCh">> = iolist_to_binary(re:replace("ABBBBC","ab{3,4}?bc","&T\\1lr&JOl\\1Jvqwg&h",[caseless,
-                                                                                                                                                                                                                          global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}?bc","QBVMd\\1eBP&j\\1Y\\1\\1",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","ab{4,5}?bc","QBVMd\\1eBP&j\\1Y\\1\\1",[caseless,
-                                                                                                                                                                                                                                        global])), 
-?line <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab{4,5}?bc","pvlNJ\\1o\\1yAcNJhSec\\1",[caseless])), 
-?line <<"ABQ">> = iolist_to_binary(re:replace("ABQ","ab{4,5}?bc","pvlNJ\\1o\\1yAcNJhSec\\1",[caseless,
-                                                                                                                                                                                                                        global])), 
-?line <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","ab{4,5}?bc","dGdgiMqW\\1X",[caseless])), 
-?line <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","ab{4,5}?bc","dGdgiMqW\\1X",[caseless,
-                                                                                                                                                                                                    global])), 
-?line <<"eqlxxIffIhfLhL">> = iolist_to_binary(re:replace("ABBC","ab??bc","eqlxxIffIhfLhL",[caseless])), 
-?line <<"eqlxxIffIhfLhL">> = iolist_to_binary(re:replace("ABBC","ab??bc","eqlxxIffIhfLhL",[caseless,
-                                                                                                                                                                                           global])), 
-?line <<"bQqNAjyKOqhMXyoABC">> = iolist_to_binary(re:replace("ABC","ab??bc","b\\1QqNAjyKOqhMXyo&",[caseless])), 
-?line <<"bQqNAjyKOqhMXyoABC">> = iolist_to_binary(re:replace("ABC","ab??bc","b\\1QqNAjyKOqhMXyo&",[caseless,
-                                                                                                                                                                                                     global])), 
-?line <<"jJQGABCIRM">> = iolist_to_binary(re:replace("ABC","ab{0,1}?bc","jJQG&IR\\1M",[caseless])), 
-?line <<"jJQGABCIRM">> = iolist_to_binary(re:replace("ABC","ab{0,1}?bc","jJQG&IR\\1M",[caseless,
-                                                                                                                                                                                             global])), 
-?line <<"gPABCCho">> = iolist_to_binary(re:replace("ABC","ab??c","gP&Cho",[caseless])), 
-?line <<"gPABCCho">> = iolist_to_binary(re:replace("ABC","ab??c","gP&Cho",[caseless,
+    <<"wsKsChmsBbyoCwJGFq">> = iolist_to_binary(re:replace("ADC","a[^]b]c","wsKsChm\\1sB\\1byoCwJGFq",[caseless])), 
+    <<"wsKsChmsBbyoCwJGFq">> = iolist_to_binary(re:replace("ADC","a[^]b]c","wsKsChm\\1sB\\1byoCwJGFq",[caseless,
+                                                                                                                                                                                                               global])), 
+    <<"AdCuC">> = iolist_to_binary(re:replace("ABC","ab|cd","AdCu",[caseless])), 
+    <<"AdCuC">> = iolist_to_binary(re:replace("ABC","ab|cd","AdCu",[caseless,
+                                                                                                                                                                 global])), 
+    <<"kPjHRmkRWABOFqNCD">> = iolist_to_binary(re:replace("ABCD","ab|cd","kPjHRm\\1k\\1RW&OFqN",[caseless])), 
+    <<"kPjHRmkRWABOFqNkPjHRmkRWCDOFqN">> = iolist_to_binary(re:replace("ABCD","ab|cd","kPjHRm\\1k\\1RW&OFqN",[caseless,
+                                                                                                                                                                                                      global])), 
+    <<"DipEFEFNEFXjXNBJMTG">> = iolist_to_binary(re:replace("DEF","()ef","ip&&N&XjXNBJMTG\\1",[caseless])), 
+    <<"DipEFEFNEFXjXNBJMTG">> = iolist_to_binary(re:replace("DEF","()ef","ip&&N&XjXNBJMTG\\1",[caseless,
+                                                                                                                                                                                               global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","$b","jl",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","$b","jl",[caseless,
+                                                                                                                                                                         global])), 
+    <<"A]C">> = iolist_to_binary(re:replace("A]C","$b","Ghx\\1\\1nMcXP&D\\1hXTKGqJ",[caseless])), 
+    <<"A]C">> = iolist_to_binary(re:replace("A]C","$b","Ghx\\1\\1nMcXP&D\\1hXTKGqJ",[caseless,
+                                                                                                                                                                                                             global])), 
+    <<"B">> = iolist_to_binary(re:replace("B","$b","&CU&s",[caseless])), 
+    <<"B">> = iolist_to_binary(re:replace("B","$b","&CU&s",[caseless,
+                                                                                                                                                             global])), 
+    <<"q">> = iolist_to_binary(re:replace("A(B","a\\(b","q",[caseless])), 
+    <<"q">> = iolist_to_binary(re:replace("A(B","a\\(b","q",[caseless,
+                                                                                                                                                            global])), 
+    <<"LbAKAddxuaGFABjds">> = iolist_to_binary(re:replace("AB","a\\(*b","LbAKAddx\\1\\1uaGF&jd\\1s",[caseless])), 
+    <<"LbAKAddxuaGFABjds">> = iolist_to_binary(re:replace("AB","a\\(*b","LbAKAddx\\1\\1uaGF&jd\\1s",[caseless,
+                                                                                                                                                                                                                global])), 
+    <<"WcHNHA((BeLNHyhL">> = iolist_to_binary(re:replace("A((B","a\\(*b","WcH\\1\\1\\1NH&\\1\\1eLNHy\\1hL",[caseless])), 
+    <<"WcHNHA((BeLNHyhL">> = iolist_to_binary(re:replace("A((B","a\\(*b","WcH\\1\\1\\1NH&\\1\\1eLNHy\\1hL",[caseless,
+                                                                                                                                                                                                                                   global])), 
+    <<"A">> = iolist_to_binary(re:replace("A","a\\\\b","FD\\1dW",[caseless,
+                                                                                                                                                                       notbol])), 
+    <<"A">> = iolist_to_binary(re:replace("A","a\\\\b","FD\\1dW",[caseless,
+                                                                                                                                                                        notbol,
                                                                                                                                                                         global])), 
-?line <<"iNBxUabjwtTABCLABCvXhABC">> = iolist_to_binary(re:replace("ABC","ab{0,1}?c","iNBxUabjw\\1tT&L&vXh&",[caseless])), 
-?line <<"iNBxUabjwtTABCLABCvXhABC">> = iolist_to_binary(re:replace("ABC","ab{0,1}?c","iNBxUabjw\\1tT&L&vXh&",[caseless,
-                                                                                                                                                                                                                 global])), 
-?line <<"iBkpxqXNa">> = iolist_to_binary(re:replace("ABC","^abc$","iBkpxqXNa",[caseless])), 
-?line <<"iBkpxqXNa">> = iolist_to_binary(re:replace("ABC","^abc$","iBkpxqXNa",[caseless,
-                                                                                                                                                                              global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","OhTwUeW&yJtn",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^abc$","OhTwUeW&yJtn",[caseless,
+    <<"AojAgACCaWeAfuBC">> = iolist_to_binary(re:replace("ABC","((a))","\\1oj&g\\1CCaWe\\1fu",[caseless])), 
+    <<"AojAgACCaWeAfuBC">> = iolist_to_binary(re:replace("ABC","((a))","\\1oj&g\\1CCaWe\\1fu",[caseless,
                                                                                                                                                                                                      global])), 
-?line <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","^abc$","LoawT&xKl\\1&",[caseless])), 
-?line <<"ABBBBC">> = iolist_to_binary(re:replace("ABBBBC","^abc$","LoawT&xKl\\1&",[caseless,
-                                                                                                                                                                                               global])), 
-?line <<"ABCC">> = iolist_to_binary(re:replace("ABCC","^abc$","iVcopu",[caseless])), 
-?line <<"ABCC">> = iolist_to_binary(re:replace("ABCC","^abc$","iVcopu",[caseless,
-                                                                                                                                                                          global])), 
-?line <<"ABCtC">> = iolist_to_binary(re:replace("ABCC","^abc","&t",[caseless])), 
-?line <<"ABCtC">> = iolist_to_binary(re:replace("ABCC","^abc","&t",[caseless,
-                                                                                                                                                                global])), 
-?line <<"AABCWBABCtLipJGm">> = iolist_to_binary(re:replace("AABC","abc$","&W\\1B&tLipJGm",[caseless])), 
-?line <<"AABCWBABCtLipJGm">> = iolist_to_binary(re:replace("AABC","abc$","&W\\1B&tLipJGm",[caseless,
-                                                                                                                                                                                           global])), 
-?line <<"wDvJtREmkCGdgtGtgABC">> = iolist_to_binary(re:replace("ABC","^","wDvJt\\1REmk\\1CGdgtGtg",[caseless])), 
-?line <<"wDvJtREmkCGdgtGtgABC">> = iolist_to_binary(re:replace("ABC","^","wDvJt\\1REmk\\1CGdgtGtg",[caseless,
-                                                                                                                                                                                                   global])), 
-?line <<"ABCWiqpRnpqRRBAD">> = iolist_to_binary(re:replace("ABC","$","W\\1iqpRnpq\\1RRB&\\1AD",[caseless])), 
-?line <<"ABCWiqpRnpqRRBAD">> = iolist_to_binary(re:replace("ABC","$","W\\1iqpRnpq\\1RRB&\\1AD",[caseless,
+    <<"xSJDAQoInQAfBNwlABCJAO">> = iolist_to_binary(re:replace("ABC","(a)b(c)","xSJD\\1QoInQ\\1fBNwl&J\\1O",[caseless])), 
+    <<"xSJDAQoInQAfBNwlABCJAO">> = iolist_to_binary(re:replace("ABC","(a)b(c)","xSJD\\1QoInQ\\1fBNwl&J\\1O",[caseless,
+                                                                                                                                                                                                                     global])), 
+    <<"AABBABCWpU">> = iolist_to_binary(re:replace("AABBABC","a+b+c","&W\\1pU",[caseless])), 
+    <<"AABBABCWpU">> = iolist_to_binary(re:replace("AABBABC","a+b+c","&W\\1pU",[caseless,
+                                                                                                                                                                                 global])), 
+    <<"AABBvuHyJYABClhsNABCABC">> = iolist_to_binary(re:replace("AABBABC","a{1,}b{1,}c","vuHyJY&lhsN&&",[caseless])), 
+    <<"AABBvuHyJYABClhsNABCABC">> = iolist_to_binary(re:replace("AABBABC","a{1,}b{1,}c","vuHyJY&lhsN&&",[caseless,
+                                                                                                                                                                                                          global])), 
+    <<"PuUbOABC">> = iolist_to_binary(re:replace("ABCABC","a.+?c","Pu\\1UbO",[caseless])), 
+    <<"PuUbOPuUbO">> = iolist_to_binary(re:replace("ABCABC","a.+?c","Pu\\1UbO",[caseless,
+                                                                                                                                                                                global])), 
+    <<"FGYfABCDdRACwIXABC">> = iolist_to_binary(re:replace("ABCABC","a.*?c","FGYf&DdRA\\1C\\1\\1wIX",[caseless])), 
+    <<"FGYfABCDdRACwIXFGYfABCDdRACwIX">> = iolist_to_binary(re:replace("ABCABC","a.*?c","FGYf&DdRA\\1C\\1\\1wIX",[caseless,
+                                                                                                                                                                                                               global])), 
+    <<"hfyssBtPoqABC">> = iolist_to_binary(re:replace("ABCABC","a.{0,5}?c","\\1hfyssBt\\1Poq",[caseless])), 
+    <<"hfyssBtPoqhfyssBtPoq">> = iolist_to_binary(re:replace("ABCABC","a.{0,5}?c","\\1hfyssBt\\1Poq",[caseless,
+                                                                                                                                                                                                         global])), 
+    <<"aoHgobCXYeRwABSXtABB">> = iolist_to_binary(re:replace("AB","(a+|b)*","aoHgobCXYeRw&SXt&\\1",[caseless])), 
+    <<"aoHgobCXYeRwABSXtABBaoHgobCXYeRwSXt">> = iolist_to_binary(re:replace("AB","(a+|b)*","aoHgobCXYeRw&SXt&\\1",[caseless,
                                                                                                                                                                                                       global])), 
-?line <<"FOABCHABCuJ">> = iolist_to_binary(re:replace("ABC","a.c","FO&H&uJ",[caseless])), 
-?line <<"FOABCHABCuJ">> = iolist_to_binary(re:replace("ABC","a.c","FO&H&uJ",[caseless,
+    <<"LYWAHKusKAgrXKh">> = iolist_to_binary(re:replace("AB","(a+|b){0,}","LYWAHKusKAgrXKh",[caseless])), 
+    <<"LYWAHKusKAgrXKhLYWAHKusKAgrXKh">> = iolist_to_binary(re:replace("AB","(a+|b){0,}","LYWAHKusKAgrXKh",[caseless,
+                                                                                                                                                                                               global])), 
+    <<"UVXSWR">> = iolist_to_binary(re:replace("AB","(a+|b)+","UVXSWR",[caseless])), 
+    <<"UVXSWR">> = iolist_to_binary(re:replace("AB","(a+|b)+","UVXSWR",[caseless,
                                                                                                                                                                        global])), 
-?line <<"mmAXCwHQUmyij">> = iolist_to_binary(re:replace("AXC","a.c","m\\1m&\\1wHQUmyi\\1j",[caseless])), 
-?line <<"mmAXCwHQUmyij">> = iolist_to_binary(re:replace("AXC","a.c","m\\1m&\\1wHQUmyi\\1j",[caseless,
-                                                                                                                                                                                                   global])), 
-?line <<"vKLhT">> = iolist_to_binary(re:replace("AXYZC","a.*?c","vKLhT",[caseless])), 
-?line <<"vKLhT">> = iolist_to_binary(re:replace("AXYZC","a.*?c","vKLhT",[caseless,
-                                                                                                                                                                         global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.*c","TrBPBlhlCyS&oLwXCYxT",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a.*c","TrBPBlhlCyS&oLwXCYxT",[caseless,
+    <<"lXCwBqLtjKMQjABBokVR">> = iolist_to_binary(re:replace("AB","(a+|b){1,}","lXCw\\1qLtjKMQj&\\1okVR",[caseless])), 
+    <<"lXCwBqLtjKMQjABBokVR">> = iolist_to_binary(re:replace("AB","(a+|b){1,}","lXCw\\1qLtjKMQj&\\1okVR",[caseless,
                                                                                                                                                                                                                   global])), 
-?line <<"oNBAABC">> = iolist_to_binary(re:replace("AABC","a.*c","oNB&",[caseless])), 
-?line <<"oNBAABC">> = iolist_to_binary(re:replace("AABC","a.*c","oNB&",[caseless,
-                                                                                                                                                                    global])), 
-?line <<"AXYZD">> = iolist_to_binary(re:replace("AXYZD","a.*c","v\\1byeTHd&vaDRL\\1",[caseless])), 
-?line <<"AXYZD">> = iolist_to_binary(re:replace("AXYZD","a.*c","v\\1byeTHd&vaDRL\\1",[caseless,
-                                                                                                                                                                                                      global])), 
-?line <<"puCobgfLFWkTABD">> = iolist_to_binary(re:replace("ABD","a[bc]d","puCobgf\\1LF\\1W\\1kT&",[caseless])), 
-?line <<"puCobgfLFWkTABD">> = iolist_to_binary(re:replace("ABD","a[bc]d","puCobgf\\1LF\\1W\\1kT&",[caseless,
-                                                                                                                                                                                                             global])), 
-?line <<"ACELM">> = iolist_to_binary(re:replace("ACE","a[b-d]e","&LM",[caseless])), 
-?line <<"ACELM">> = iolist_to_binary(re:replace("ACE","a[b-d]e","&LM",[caseless,
-                                                                                                                                                                      global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[b-d]e","YsqxG&B&NxQkv\\1RY",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[b-d]e","YsqxG&B&NxQkv\\1RY",[caseless,
-                                                                                                                                                                                                                      global])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","a[b-d]e","o&WeiJHAt\\1vpj",[caseless])), 
-?line <<"ABC">> = iolist_to_binary(re:replace("ABC","a[b-d]e","o&WeiJHAt\\1vpj",[caseless,
-                                                                                                                                                                                               global])), 
-?line <<"ABD">> = iolist_to_binary(re:replace("ABD","a[b-d]e","S",[caseless])), 
-?line <<"ABD">> = iolist_to_binary(re:replace("ABD","a[b-d]e","S",[caseless,
-                                                                                                                                                                 global])), 
-?line <<"AgdndBWDnHACACACVgB">> = iolist_to_binary(re:replace("AAC","a[b-d]","gdndBWDnH&&&VgB",[caseless])), 
-?line <<"AgdndBWDnHACACACVgB">> = iolist_to_binary(re:replace("AAC","a[b-d]","gdndBWDnH&&&VgB",[caseless,
-                                                                                                                                                                                              global])), 
-?line <<"lpIqxA-sQA-">> = iolist_to_binary(re:replace("A-","a[-b]","lpIqx&sQ&",[caseless])), 
-?line <<"lpIqxA-sQA-">> = iolist_to_binary(re:replace("A-","a[-b]","lpIqx&sQ&",[caseless,
-                                                                                                                                                                             global])), 
-?line <<"NJrfcO">> = iolist_to_binary(re:replace("A-","a[b-]","NJrfc\\1O",[caseless])), 
-?line <<"NJrfcO">> = iolist_to_binary(re:replace("A-","a[b-]","NJrfc\\1O",[caseless,
-                                                                                                                                                                            global])), 
-?line <<"eA]OcbkaA]qQEbtfTQD">> = iolist_to_binary(re:replace("A]","a]","e&Oc\\1bka&qQEbtfTQD",[caseless])), 
-?line <<"eA]OcbkaA]qQEbtfTQD">> = iolist_to_binary(re:replace("A]","a]","e&Oc\\1bka&qQEbtfTQD",[caseless,
+    ok.
+run23() ->
+    <<"MAFkB">> = iolist_to_binary(re:replace("AB","(a+|b)?","M\\1Fk",[caseless])), 
+    <<"MAFkMBFkMFk">> = iolist_to_binary(re:replace("AB","(a+|b)?","M\\1Fk",[caseless,
+                                                                                                                                                                        global])), 
+    <<"STYCeRAuyArB">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}","STYCeR\\1uy\\1r",[caseless])), 
+    <<"STYCeRAuyArSTYCeRBuyBrSTYCeRuyr">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}","STYCeR\\1uy\\1r",[caseless,
+                                                                                                                                                                                                   global])), 
+    <<"WBHxgnNQAB">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}?","W&BH\\1&\\1x&gnNQ",[caseless])), 
+    <<"WBHxgnNQWABHAAAxAgnNQWBHxgnNQWBBHBBBxBgnNQWBHxgnNQ">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}?","W&BH\\1&\\1x&gnNQ",[caseless,
+                                                                                                                                                                                                            global])), 
+    <<"MbLbSWbCDEggiClWfEM">> = iolist_to_binary(re:replace("CDE","[^ab]*","MbLbSWb&ggiClWfEM",[caseless])), 
+    <<"MbLbSWbCDEggiClWfEMMbLbSWbggiClWfEM">> = iolist_to_binary(re:replace("CDE","[^ab]*","MbLbSWb&ggiClWfEM",[caseless,
                                                                                                                                                                                               global])), 
-?line <<"GqJU">> = iolist_to_binary(re:replace("A]B","a[]]b","GqJU",[caseless])), 
-?line <<"GqJU">> = iolist_to_binary(re:replace("A]B","a[]]b","GqJU",[caseless,
-                                                                                                                                                                   global])), 
-?line <<"AEDdAEDiIAEDCTAEDj">> = iolist_to_binary(re:replace("AED","a[^bc]d","&d&iI&CT&j",[caseless])), 
-?line <<"AEDdAEDiIAEDCTAEDj">> = iolist_to_binary(re:replace("AED","a[^bc]d","&d&iI&CT&j",[caseless,
-                                                                                                                                                                                       global])), 
-?line <<"MOKnvQDsS">> = iolist_to_binary(re:replace("ADC","a[^-b]c","MOKn\\1\\1vQDsS\\1",[caseless])), 
-?line <<"MOKnvQDsS">> = iolist_to_binary(re:replace("ADC","a[^-b]c","MOKn\\1\\1vQDsS\\1",[caseless,
-                                                                                                                                                                                                      global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^-b]c","dr",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a[^-b]c","dr",[caseless,
-                                                                                                                                                                                   global])), 
-?line <<"ABD">> = iolist_to_binary(re:replace("ABD","a[^-b]c","IMKcT&fF&WXbjs\\1\\1",[caseless])), 
-?line <<"ABD">> = iolist_to_binary(re:replace("ABD","a[^-b]c","IMKcT&fF&WXbjs\\1\\1",[caseless,
-                                                                                                                                                                                                           global])), 
-?line <<"A-C">> = iolist_to_binary(re:replace("A-C","a[^-b]c","M&xDIfNL\\1W",[caseless])), 
-?line <<"A-C">> = iolist_to_binary(re:replace("A-C","a[^-b]c","M&xDIfNL\\1W",[caseless,
-                                                                                                                                                                                         global])), 
-?line <<"wR">> = iolist_to_binary(re:replace("ADC","a[^]b]c","wR",[caseless])), 
-?line <<"wR">> = iolist_to_binary(re:replace("ADC","a[^]b]c","wR",[caseless,
-                                                                                                                                                                   global])), 
-?line <<"HKTAABllCQjRABEnXDqjC">> = iolist_to_binary(re:replace("ABC","ab|cd","HKTA&llCQjR&EnXDqj",[caseless])), 
-?line <<"HKTAABllCQjRABEnXDqjC">> = iolist_to_binary(re:replace("ABC","ab|cd","HKTA&llCQjR&EnXDqj",[caseless,
-                                                                                                                                                                                                 global])), 
-?line <<"ABCD">> = iolist_to_binary(re:replace("ABCD","ab|cd","&",[caseless])), 
-?line <<"ABCD">> = iolist_to_binary(re:replace("ABCD","ab|cd","&",[caseless,
-                                                                                                                                                                global])), 
-?line <<"DmgTYsxtpkrXgnoJ">> = iolist_to_binary(re:replace("DEF","()ef","mgTYsxtpkrXgnoJ",[caseless])), 
-?line <<"DmgTYsxtpkrXgnoJ">> = iolist_to_binary(re:replace("DEF","()ef","mgTYsxtpkrXgnoJ",[caseless,
-                                                                                                                                                                                       global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","$b","KN\\1&V",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","$b","KN\\1&V",[caseless,
-                                                                                                                                                                                       global])), 
-?line <<"A]C">> = iolist_to_binary(re:replace("A]C","$b","jtB&",[caseless])), 
-?line <<"A]C">> = iolist_to_binary(re:replace("A]C","$b","jtB&",[caseless,
-                                                                                                                                                                global])), 
-?line <<"B">> = iolist_to_binary(re:replace("B","$b","&pRb",[caseless])), 
-?line <<"B">> = iolist_to_binary(re:replace("B","$b","&pRb",[caseless,
-                                                                                                                                                            global])), 
-?line <<"lBUQxBtA(BtBeKAEeJq">> = iolist_to_binary(re:replace("A(B","a\\(b","lBUQ\\1xBt&tBeK\\1AEeJq",[caseless])), 
-?line <<"lBUQxBtA(BtBeKAEeJq">> = iolist_to_binary(re:replace("A(B","a\\(b","lBUQ\\1xBt&tBeK\\1AEeJq",[caseless,
-                                                                                                                                                                                                             global])), 
-?line <<"oXCRABKrhGnMTcHtq">> = iolist_to_binary(re:replace("AB","a\\(*b","oXCR&\\1KrhGnMTcHtq",[caseless])), 
-?line <<"oXCRABKrhGnMTcHtq">> = iolist_to_binary(re:replace("AB","a\\(*b","oXCR&\\1KrhGnMTcHtq",[caseless,
+    <<"rjABBBCDfICJABBBCDABBBCDEjJ">> = iolist_to_binary(re:replace("ABBBCD","([abc])*d","rj&fICJ&&EjJ",[caseless])), 
+    <<"rjABBBCDfICJABBBCDABBBCDEjJ">> = iolist_to_binary(re:replace("ABBBCD","([abc])*d","rj&fICJ&&EjJ",[caseless,
+                                                                                                                                                                                                  global])), 
+    <<"xQ">> = iolist_to_binary(re:replace("ABCD","([abc])*bcd","xQ",[caseless])), 
+    <<"xQ">> = iolist_to_binary(re:replace("ABCD","([abc])*bcd","xQ",[caseless,
+                                                                                                                                                                           global])), 
+    <<"AllmaUiAaKG">> = iolist_to_binary(re:replace("E","a|b|c|d|e","AllmaUiAa\\1KG",[caseless])), 
+    <<"AllmaUiAaKG">> = iolist_to_binary(re:replace("E","a|b|c|d|e","AllmaUiAa\\1KG",[caseless,
+                                                                                                                                                                                          global])), 
+    <<"QdfE">> = iolist_to_binary(re:replace("EF","(a|b|c|d|e)f","Qdf\\1",[caseless])), 
+    <<"QdfE">> = iolist_to_binary(re:replace("EF","(a|b|c|d|e)f","Qdf\\1",[caseless,
+                                                                                                                                                                                  global])), 
+    <<"ABCDEFGTvQSeJABCDEFGWMXdIOTh">> = iolist_to_binary(re:replace("ABCDEFG","abcd*efg","\\1&TvQSeJ&\\1WMXdIO\\1Th",[caseless])), 
+    <<"ABCDEFGTvQSeJABCDEFGWMXdIOTh">> = iolist_to_binary(re:replace("ABCDEFG","abcd*efg","\\1&TvQSeJ&\\1WMXdIO\\1Th",[caseless,
+                                                                                                                                                                                                                              global])), 
+    <<"XlSgABJHbKHRjUuNjOrYABBBZ">> = iolist_to_binary(re:replace("XABYABBBZ","ab*","lSg&JHbKHRjUuNjOr",[caseless])), 
+    <<"XlSgABJHbKHRjUuNjOrYlSgABBBJHbKHRjUuNjOrZ">> = iolist_to_binary(re:replace("XABYABBBZ","ab*","lSg&JHbKHRjUuNjOr",[caseless,
                                                                                                                                                                                                     global])), 
-?line <<"VyDjHkfygiNMHC">> = iolist_to_binary(re:replace("A((B","a\\(*b","Vy\\1DjH\\1kfygi\\1NM\\1H\\1C",[caseless])), 
-?line <<"VyDjHkfygiNMHC">> = iolist_to_binary(re:replace("A((B","a\\(*b","Vy\\1DjH\\1kfygi\\1NM\\1H\\1C",[caseless,
-                                                                                                                                                                                                                               global])), 
-?line <<"A">> = iolist_to_binary(re:replace("A","a\\\\b","DhmiARyCBuVi",[caseless,
-                                                                                                                                                                                  notbol])), 
-?line <<"A">> = iolist_to_binary(re:replace("A","a\\\\b","DhmiARyCBuVi",[caseless,
-                                                                                                                                                                                   notbol,
-                                                                                                                                                                                   global])), 
-?line <<"FArKeEijRRtjoEBC">> = iolist_to_binary(re:replace("ABC","((a))","F\\1rKeEijRRtjoE",[caseless])), 
-?line <<"FArKeEijRRtjoEBC">> = iolist_to_binary(re:replace("ABC","((a))","F\\1rKeEijRRtjoE",[caseless,
+    <<"XNjAAesIAgAYABBBZ">> = iolist_to_binary(re:replace("XAYABBBZ","ab*","Nj&&esI&g&",[caseless])), 
+    <<"XNjAAesIAgAYNjABBBABBBesIABBBgABBBZ">> = iolist_to_binary(re:replace("XAYABBBZ","ab*","Nj&&esI&g&",[caseless,
+                                                                                                                                                                                       global])), 
+    <<"ABpvCDEayXCDEDCDSCDECDEwh">> = iolist_to_binary(re:replace("ABCDE","(ab|cd)e","pv&ayX&D\\1S&&wh",[caseless])), 
+    <<"ABpvCDEayXCDEDCDSCDECDEwh">> = iolist_to_binary(re:replace("ABCDE","(ab|cd)e","pv&ayX&D\\1S&&wh",[caseless,
+                                                                                                                                                                                                        global])), 
+    <<"HIJAJ">> = iolist_to_binary(re:replace("HIJ","[abhgefdc]ij","&A\\1J\\1",[caseless])), 
+    <<"HIJAJ">> = iolist_to_binary(re:replace("HIJ","[abhgefdc]ij","&A\\1J\\1",[caseless,
                                                                                                                                                                                             global])), 
-?line <<"shGABCXUFAQfAABCy">> = iolist_to_binary(re:replace("ABC","(a)b(c)","shG&XUF\\1Qf\\1&y",[caseless])), 
-?line <<"shGABCXUFAQfAABCy">> = iolist_to_binary(re:replace("ABC","(a)b(c)","shG&XUF\\1Qf\\1&y",[caseless,
-                                                                                                                                                                                                     global])), 
-?line <<"AABBABCmqnIoEABCugfABCNVyK">> = iolist_to_binary(re:replace("AABBABC","a+b+c","&m\\1qnIoE&\\1ug\\1f&NVyK",[caseless])), 
-?line <<"AABBABCmqnIoEABCugfABCNVyK">> = iolist_to_binary(re:replace("AABBABC","a+b+c","&m\\1qnIoE&\\1ug\\1f&NVyK",[caseless,
-                                                                                                                                                                                                                           global])), 
-?line <<"AABByABCrABC">> = iolist_to_binary(re:replace("AABBABC","a{1,}b{1,}c","y&r\\1&",[caseless])), 
-?line <<"AABByABCrABC">> = iolist_to_binary(re:replace("AABBABC","a{1,}b{1,}c","y&r\\1&",[caseless,
+    <<"ABCDE">> = iolist_to_binary(re:replace("ABCDE","^(ab|cd)e","y&gKEPudO&f\\1Vf",[caseless])), 
+    <<"ABCDE">> = iolist_to_binary(re:replace("ABCDE","^(ab|cd)e","y&gKEPudO&f\\1Vf",[caseless,
+                                                                                                                                                                                                        global])), 
+    <<"ABCDsEFmkoWgwo">> = iolist_to_binary(re:replace("ABCDEF","(abc|)ef","s&mkoWgwo",[caseless])), 
+    <<"ABCDsEFmkoWgwo">> = iolist_to_binary(re:replace("ABCDEF","(abc|)ef","s&mkoWgwo",[caseless,
+                                                                                                                                                                                        global])), 
+    <<"AEKBBQPBA">> = iolist_to_binary(re:replace("ABCD","(a|b)c*d","EK\\1\\1QP\\1A",[caseless])), 
+    <<"AEKBBQPBA">> = iolist_to_binary(re:replace("ABCD","(a|b)c*d","EK\\1\\1QP\\1A",[caseless,
                                                                                                                                                                                                 global])), 
-?line <<"tABC">> = iolist_to_binary(re:replace("ABCABC","a.+?c","t",[caseless])), 
-?line <<"tt">> = iolist_to_binary(re:replace("ABCABC","a.+?c","t",[caseless,
-                                                                                                                                                                   global])), 
-?line <<"UABC">> = iolist_to_binary(re:replace("ABCABC","a.*?c","\\1U",[caseless])), 
-?line <<"UU">> = iolist_to_binary(re:replace("ABCABC","a.*?c","\\1U",[caseless,
-                                                                                                                                                                          global])), 
-?line <<"EfjDOiBAosuABC">> = iolist_to_binary(re:replace("ABCABC","a.{0,5}?c","EfjDOiBAosu",[caseless])), 
-?line <<"EfjDOiBAosuEfjDOiBAosu">> = iolist_to_binary(re:replace("ABCABC","a.{0,5}?c","EfjDOiBAosu",[caseless,
-                                                                                                                                                                                               global])), 
-?line <<"CBBliVcPcv">> = iolist_to_binary(re:replace("AB","(a+|b)*","C\\1\\1liVcPcv",[caseless])), 
-?line <<"CBBliVcPcvCliVcPcv">> = iolist_to_binary(re:replace("AB","(a+|b)*","C\\1\\1liVcPcv",[caseless,
-                                                                                                                                                                                           global])), 
-?line <<"fSc">> = iolist_to_binary(re:replace("AB","(a+|b){0,}","fSc",[caseless])), 
-?line <<"fScfSc">> = iolist_to_binary(re:replace("AB","(a+|b){0,}","fSc",[caseless,
-                                                                                                                                                                         global])), 
-?line <<"sABpDnVVBAB">> = iolist_to_binary(re:replace("AB","(a+|b)+","s&pDnVV\\1&",[caseless])), 
-?line <<"sABpDnVVBAB">> = iolist_to_binary(re:replace("AB","(a+|b)+","s&pDnVV\\1&",[caseless,
-                                                                                                                                                                                      global])), 
-?line <<"bnGKKf">> = iolist_to_binary(re:replace("AB","(a+|b){1,}","bnGKKf",[caseless])), 
-?line <<"bnGKKf">> = iolist_to_binary(re:replace("AB","(a+|b){1,}","bnGKKf",[caseless,
-                                                                                                                                                                               global])), 
-?line <<"LpFAjhAtClIGSIAdYAB">> = iolist_to_binary(re:replace("AB","(a+|b)?","LpF&jhAtClIGSI\\1dY\\1",[caseless])), 
-?line <<"LpFAjhAtClIGSIAdYALpFBjhAtClIGSIBdYBLpFjhAtClIGSIdY">> = iolist_to_binary(re:replace("AB","(a+|b)?","LpF&jhAtClIGSI\\1dY\\1",[caseless,
-                                                                                                                                                                                                            global])), 
-?line <<"qbB">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}","qb",[caseless])), 
-?line <<"qbqbqb">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}","qb",[caseless,
-                                                                                                                                                                         global])), 
-?line <<"vLbrTRIJAB">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}?","v&L\\1brTRIJ\\1\\1",[caseless])), 
-?line <<"vLbrTRIJvALAbrTRIJAAvLbrTRIJvBLBbrTRIJBBvLbrTRIJ">> = iolist_to_binary(re:replace("AB","(a+|b){0,1}?","v&L\\1brTRIJ\\1\\1",[caseless,
+    <<"NnxIEABC">> = iolist_to_binary(re:replace("ABC","(ab|ab*)bc","NnxIE&",[caseless])), 
+    <<"NnxIEABC">> = iolist_to_binary(re:replace("ABC","(ab|ab*)bc","NnxIE&",[caseless,
+                                                                                                                                                                                global])), 
+    <<"owDpyYBCHVgp">> = iolist_to_binary(re:replace("ABC","a([bc]*)c*","owDpyY\\1HVgp",[caseless])), 
+    <<"owDpyYBCHVgp">> = iolist_to_binary(re:replace("ABC","a([bc]*)c*","owDpyY\\1HVgp",[caseless,
+                                                                                                                                                                                              global])), 
+    <<"ABCDABCDaSWTqABCDBCABCDKOABCD">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c*d)","&&aSWTq&\\1&KO&",[caseless])), 
+    <<"ABCDABCDaSWTqABCDBCABCDKOABCD">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c*d)","&&aSWTq&\\1&KO&",[caseless,
                                                                                                                                                                                                                global])), 
-?line <<"HtbhHKCDEwOT">> = iolist_to_binary(re:replace("CDE","[^ab]*","Ht\\1\\1bhHK&wOT",[caseless])), 
-?line <<"HtbhHKCDEwOTHtbhHKwOT">> = iolist_to_binary(re:replace("CDE","[^ab]*","Ht\\1\\1bhHK&wOT",[caseless,
+    ok.
+run24() ->
+    <<"llhYIK">> = iolist_to_binary(re:replace("ABCD","a([bc]+)(c*d)","llhYIK",[caseless])), 
+    <<"llhYIK">> = iolist_to_binary(re:replace("ABCD","a([bc]+)(c*d)","llhYIK",[caseless,
+                                                                                                                                                                                       global])), 
+    <<"qBhyABCDRsUdeBABCDcnABCDJOj">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c+d)","q\\1hy&RsUde\\1&cn&JOj",[caseless])), 
+    <<"qBhyABCDRsUdeBABCDcnABCDJOj">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c+d)","q\\1hy&RsUde\\1&cn&JOj",[caseless,
+                                                                                                                                                                                                                            global])), 
+    <<"sXpCRWnaew">> = iolist_to_binary(re:replace("ADCDCDE","a[bcd]*dcdcde","sXpCRWnae\\1w",[caseless])), 
+    <<"sXpCRWnaew">> = iolist_to_binary(re:replace("ADCDCDE","a[bcd]*dcdcde","sXpCRWnae\\1w",[caseless,
+                                                                                                                                                                                                            global])), 
+    <<"PKABCMuYNABCABCXtIsm">> = iolist_to_binary(re:replace("ABC","(ab|a)b*c","PK&MuYN&&XtIsm",[caseless])), 
+    <<"PKABCMuYNABCABCXtIsm">> = iolist_to_binary(re:replace("ABC","(ab|a)b*c","PK&MuYN&&XtIsm",[caseless,
                                                                                                                                                                                                 global])), 
-?line <<"vOowROtABBBCD">> = iolist_to_binary(re:replace("ABBBCD","([abc])*d","vOowROt&",[caseless])), 
-?line <<"vOowROtABBBCD">> = iolist_to_binary(re:replace("ABBBCD","([abc])*d","vOowROt&",[caseless,
-                                                                                                                                                                                          global])), 
-?line <<"TBIuDTLoAqOaABCDMcvVABCDPm">> = iolist_to_binary(re:replace("ABCD","([abc])*bcd","TBIuDTLo\\1qOa&McvV&Pm",[caseless])), 
-?line <<"TBIuDTLoAqOaABCDMcvVABCDPm">> = iolist_to_binary(re:replace("ABCD","([abc])*bcd","TBIuDTLo\\1qOa&McvV&Pm",[caseless,
-                                                                                                                                                                                                                        global])), 
-?line <<"EUpqELAv">> = iolist_to_binary(re:replace("E","a|b|c|d|e","&Upq&LAv",[caseless])), 
-?line <<"EUpqELAv">> = iolist_to_binary(re:replace("E","a|b|c|d|e","&Upq&LAv",[caseless,
+    <<"pMOU">> = iolist_to_binary(re:replace("ABCD","((a)(b)c)(d)","pMOU",[caseless])), 
+    <<"pMOU">> = iolist_to_binary(re:replace("ABCD","((a)(b)c)(d)","pMOU",[caseless,
                                                                                                                                                                                  global])), 
-?line <<"oViRJMyEkEPtcEFEM">> = iolist_to_binary(re:replace("EF","(a|b|c|d|e)f","oViRJMy\\1k\\1Ptc&\\1M",[caseless])), 
-?line <<"oViRJMyEkEPtcEFEM">> = iolist_to_binary(re:replace("EF","(a|b|c|d|e)f","oViRJMy\\1k\\1Ptc&\\1M",[caseless,
-                                                                                                                                                                                                                       global])), 
-?line <<"ABCDEFGeumABCDEFGxRcjHuSABCDEFGOABCDEFG">> = iolist_to_binary(re:replace("ABCDEFG","abcd*efg","&eum&xRcjHuS&O&",[caseless])), 
-?line <<"ABCDEFGeumABCDEFGxRcjHuSABCDEFGOABCDEFG">> = iolist_to_binary(re:replace("ABCDEFG","abcd*efg","&eum&xRcjHuS&O&",[caseless,
-                                                                                                                                                                                                           global])), 
-?line <<"XOvpxKbYuFMwABVhYABBBZ">> = iolist_to_binary(re:replace("XABYABBBZ","ab*","OvpxKbYuFMw&Vh",[caseless])), 
-?line <<"XOvpxKbYuFMwABVhYOvpxKbYuFMwABBBVhZ">> = iolist_to_binary(re:replace("XABYABBBZ","ab*","OvpxKbYuFMw&Vh",[caseless,
-                                                                                                                                                                                                global])), 
-?line <<"XXbAAHhcmmXVwkYABBBZ">> = iolist_to_binary(re:replace("XAYABBBZ","ab*","Xb&&Hhcmm\\1XVwk",[caseless])), 
-?line <<"XXbAAHhcmmXVwkYXbABBBABBBHhcmmXVwkZ">> = iolist_to_binary(re:replace("XAYABBBZ","ab*","Xb&&Hhcmm\\1XVwk",[caseless,
-                                                                                                                                                                                                    global])), 
-?line <<"ABPWMPmhUsCDEo">> = iolist_to_binary(re:replace("ABCDE","(ab|cd)e","PWMPmhUs&o",[caseless])), 
-?line <<"ABPWMPmhUsCDEo">> = iolist_to_binary(re:replace("ABCDE","(ab|cd)e","PWMPmhUs&o",[caseless,
-                                                                                                                                                                                          global])), 
-?line <<"jHIJ">> = iolist_to_binary(re:replace("HIJ","[abhgefdc]ij","j&",[caseless])), 
-?line <<"jHIJ">> = iolist_to_binary(re:replace("HIJ","[abhgefdc]ij","j&",[caseless,
-                                                                                                                                                                              global])), 
-?line <<"ABCDE">> = iolist_to_binary(re:replace("ABCDE","^(ab|cd)e","Dc&hlOsc\\1EL\\1Vl",[caseless])), 
-?line <<"ABCDE">> = iolist_to_binary(re:replace("ABCDE","^(ab|cd)e","Dc&hlOsc\\1EL\\1Vl",[caseless,
-                                                                                                                                                                                                              global])), 
-?line <<"ABCDBRPmLBtJGwEFEF">> = iolist_to_binary(re:replace("ABCDEF","(abc|)ef","\\1BRPmLBtJGw\\1&&",[caseless])), 
-?line <<"ABCDBRPmLBtJGwEFEF">> = iolist_to_binary(re:replace("ABCDEF","(abc|)ef","\\1BRPmLBtJGw\\1&&",[caseless,
-                                                                                                                                                                                                               global])), 
-?line <<"ABdnvuIvc">> = iolist_to_binary(re:replace("ABCD","(a|b)c*d","\\1dnvuIvc",[caseless])), 
-?line <<"ABdnvuIvc">> = iolist_to_binary(re:replace("ABCD","(a|b)c*d","\\1dnvuIvc",[caseless,
-                                                                                                                                                                                        global])), 
-?line <<"ACKWkV">> = iolist_to_binary(re:replace("ABC","(ab|ab*)bc","ACKWkV",[caseless])), 
-?line <<"ACKWkV">> = iolist_to_binary(re:replace("ABC","(ab|ab*)bc","ACKWkV",[caseless,
-                                                                                                                                                                                 global])), 
-?line <<"LepuBCXf">> = iolist_to_binary(re:replace("ABC","a([bc]*)c*","Lepu\\1Xf",[caseless])), 
-?line <<"LepuBCXf">> = iolist_to_binary(re:replace("ABC","a([bc]*)c*","Lepu\\1Xf",[caseless,
-                                                                                                                                                                                        global])), 
-?line <<"NDABCDxHBMEtfBGtV">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c*d)","ND&xHBMEtfBGtV",[caseless])), 
-?line <<"NDABCDxHBMEtfBGtV">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c*d)","ND&xHBMEtfBGtV",[caseless,
-                                                                                                                                                                                                          global])), 
-?line <<"eIDCKdi">> = iolist_to_binary(re:replace("ABCD","a([bc]+)(c*d)","eIDCKdi",[caseless])), 
-?line <<"eIDCKdi">> = iolist_to_binary(re:replace("ABCD","a([bc]+)(c*d)","eIDCKdi",[caseless,
-                                                                                                                                                                                           global])), 
-?line <<"fKBQepABCDABCDhHYaRKHjS">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c+d)","fK\\1Qep&&hHYaRKHjS",[caseless])), 
-?line <<"fKBQepABCDABCDhHYaRKHjS">> = iolist_to_binary(re:replace("ABCD","a([bc]*)(c+d)","fK\\1Qep&&hHYaRKHjS",[caseless,
+    <<"bnFWpQALPHAjXlptg">> = iolist_to_binary(re:replace("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*","bnFW\\1pQ&jXl\\1ptg\\1",[caseless])), 
+    <<"bnFWpQALPHAjXlptg">> = iolist_to_binary(re:replace("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*","bnFW\\1pQ&jXl\\1ptg\\1",[caseless,
+                                                                                                                                                                                                                                               global])), 
+    <<"ARTSHBHAfemfBHJIBHBHBH">> = iolist_to_binary(re:replace("ABH","^a(bc+|b[eh])g|.h$","RT\\1SH&Afemf&JI&&&",[caseless])), 
+    <<"ARTSHBHAfemfBHJIBHBHBH">> = iolist_to_binary(re:replace("ABH","^a(bc+|b[eh])g|.h$","RT\\1SH&Afemf&JI&&&",[caseless,
+                                                                                                                                                                                                                                global])), 
+    <<"lEFFGZichPjsHBEFFGZe">> = iolist_to_binary(re:replace("EFFGZ","(bc+d$|ef*g.|h?i(j|k))","l\\1ichPjsHB\\1e",[caseless])), 
+    <<"lEFFGZichPjsHBEFFGZe">> = iolist_to_binary(re:replace("EFFGZ","(bc+d$|ef*g.|h?i(j|k))","l\\1ichPjsHB\\1e",[caseless,
+                                                                                                                                                                                                                                  global])), 
+    <<"IJnqeTnhpIJ">> = iolist_to_binary(re:replace("IJ","(bc+d$|ef*g.|h?i(j|k))","&nqeTnhp\\1",[caseless])), 
+    <<"IJnqeTnhpIJ">> = iolist_to_binary(re:replace("IJ","(bc+d$|ef*g.|h?i(j|k))","&nqeTnhp\\1",[caseless,
+                                                                                                                                                                                                                  global])), 
+    <<"RTAEFFGZEFFGZtiL">> = iolist_to_binary(re:replace("REFFGZ","(bc+d$|ef*g.|h?i(j|k))","TA\\1&tiL",[caseless])), 
+    <<"RTAEFFGZEFFGZtiL">> = iolist_to_binary(re:replace("REFFGZ","(bc+d$|ef*g.|h?i(j|k))","TA\\1&tiL",[caseless,
                                                                                                                                                                                                                       global])), 
-?line <<"yYx">> = iolist_to_binary(re:replace("ADCDCDE","a[bcd]*dcdcde","yYx",[caseless])), 
-?line <<"yYx">> = iolist_to_binary(re:replace("ADCDCDE","a[bcd]*dcdcde","yYx",[caseless,
-                                                                                                                                                                                         global])), 
-?line <<"gCGlfM">> = iolist_to_binary(re:replace("ABC","(ab|a)b*c","gCGlfM",[caseless])), 
-?line <<"gCGlfM">> = iolist_to_binary(re:replace("ABC","(ab|a)b*c","gCGlfM",[caseless,
-                                                                                                                                                                               global])), 
-?line <<"GJGaABCEwhSGeABC">> = iolist_to_binary(re:replace("ABCD","((a)(b)c)(d)","GJGa\\1EwhSGe\\1",[caseless])), 
-?line <<"GJGaABCEwhSGeABC">> = iolist_to_binary(re:replace("ABCD","((a)(b)c)(d)","GJGa\\1EwhSGe\\1",[caseless,
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","QSIQtF",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","QSIQtF",[caseless,
+                                                                                                                                                                                                                        global])), 
+    <<"ADCDCDE">> = iolist_to_binary(re:replace("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))","hkkg&\\1M",[caseless])), 
+    <<"ADCDCDE">> = iolist_to_binary(re:replace("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))","hkkg&\\1M",[caseless,
+                                                                                                                                                                                                                        global])), 
+    <<"EFFG">> = iolist_to_binary(re:replace("EFFG","(bc+d$|ef*g.|h?i(j|k))","b",[caseless])), 
+    <<"EFFG">> = iolist_to_binary(re:replace("EFFG","(bc+d$|ef*g.|h?i(j|k))","b",[caseless,
+                                                                                                                                                                                                global])), 
+    <<"BCDD">> = iolist_to_binary(re:replace("BCDD","(bc+d$|ef*g.|h?i(j|k))","TW&UdGE\\1S&N\\1u&LM",[caseless])), 
+    <<"BCDD">> = iolist_to_binary(re:replace("BCDD","(bc+d$|ef*g.|h?i(j|k))","TW&UdGE\\1S&N\\1u&LM",[caseless,
+                                                                                                                                                                                                                                           global])), 
+    <<"APvAegF">> = iolist_to_binary(re:replace("A","((((((((((a))))))))))","\\1Pv\\1egF",[caseless])), 
+    <<"APvAegF">> = iolist_to_binary(re:replace("A","((((((((((a))))))))))","\\1Pv\\1egF",[caseless,
                                                                                                                                                                                                              global])), 
-?line <<"GwdBxNJCuOfALPHADSnt">> = iolist_to_binary(re:replace("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*","GwdBxNJCuOf&DSnt",[caseless])), 
-?line <<"GwdBxNJCuOfALPHADSnt">> = iolist_to_binary(re:replace("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*","GwdBxNJCuOf&DSnt",[caseless,
+    <<"vCaAAVsbLoAAcsIToC">> = iolist_to_binary(re:replace("AA","((((((((((a))))))))))\\10","vCa&VsbLo&csIToC",[caseless])), 
+    <<"vCaAAVsbLoAAcsIToC">> = iolist_to_binary(re:replace("AA","((((((((((a))))))))))\\10","vCa&VsbLo&csIToC",[caseless,
                                                                                                                                                                                                                                   global])), 
-?line <<"AMcmNBHqwYsXdABHJTBH">> = iolist_to_binary(re:replace("ABH","^a(bc+|b[eh])g|.h$","McmN&qwYsX\\1dA&JT&",[caseless])), 
-?line <<"AMcmNBHqwYsXdABHJTBH">> = iolist_to_binary(re:replace("ABH","^a(bc+|b[eh])g|.h$","McmN&qwYsX\\1dA&JT&",[caseless,
-                                                                                                                                                                                                                                global])), 
-?line <<"JEFFGZWDujiGKchTEFFGZd">> = iolist_to_binary(re:replace("EFFGZ","(bc+d$|ef*g.|h?i(j|k))","J&WDujiGKchT&d",[caseless])), 
-?line <<"JEFFGZWDujiGKchTEFFGZd">> = iolist_to_binary(re:replace("EFFGZ","(bc+d$|ef*g.|h?i(j|k))","J&WDujiGKchT&d",[caseless,
-                                                                                                                                                                                                                                global])), 
-?line <<"JIJIJVbIJOWIJT">> = iolist_to_binary(re:replace("IJ","(bc+d$|ef*g.|h?i(j|k))","J\\1\\1Vb\\1OW\\1T",[caseless])), 
-?line <<"JIJIJVbIJOWIJT">> = iolist_to_binary(re:replace("IJ","(bc+d$|ef*g.|h?i(j|k))","J\\1\\1Vb\\1OW\\1T",[caseless,
-                                                                                                                                                                                                                                    global])), 
-?line <<"REnKX">> = iolist_to_binary(re:replace("REFFGZ","(bc+d$|ef*g.|h?i(j|k))","EnKX",[caseless])), 
-?line <<"REnKX">> = iolist_to_binary(re:replace("REFFGZ","(bc+d$|ef*g.|h?i(j|k))","EnKX",[caseless,
-                                                                                                                                                                                                            global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","&bQK&gYPqvKo\\1Dxq&&&",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(bc+d$|ef*g.|h?i(j|k))","&bQK&gYPqvKo\\1Dxq&&&",[caseless,
-                                                                                                                                                                                                                                                              global])), 
-?line <<"ADCDCDE">> = iolist_to_binary(re:replace("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))","\\1D&uYGYYB\\1mXY",[caseless])), 
-?line <<"ADCDCDE">> = iolist_to_binary(re:replace("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))","\\1D&uYGYYB\\1mXY",[caseless,
-                                                                                                                                                                                                                                           global])), 
-?line <<"EFFG">> = iolist_to_binary(re:replace("EFFG","(bc+d$|ef*g.|h?i(j|k))","bqLaCGT&\\1\\1StNeJTj",[caseless])), 
-?line <<"EFFG">> = iolist_to_binary(re:replace("EFFG","(bc+d$|ef*g.|h?i(j|k))","bqLaCGT&\\1\\1StNeJTj",[caseless,
-                                                                                                                                                                                                                                             global])), 
-?line <<"BCDD">> = iolist_to_binary(re:replace("BCDD","(bc+d$|ef*g.|h?i(j|k))","M\\1v\\1T\\1H&OCM\\1",[caseless])), 
-?line <<"BCDD">> = iolist_to_binary(re:replace("BCDD","(bc+d$|ef*g.|h?i(j|k))","M\\1v\\1T\\1H&OCM\\1",[caseless,
-                                                                                                                                                                                                                                             global])), 
-?line <<"teSxBAbRcV">> = iolist_to_binary(re:replace("A","((((((((((a))))))))))","teSxB\\1bRcV",[caseless])), 
-?line <<"teSxBAbRcV">> = iolist_to_binary(re:replace("A","((((((((((a))))))))))","teSxB\\1bRcV",[caseless,
-                                                                                                                                                                                                                global])), 
-?line <<"AAAAA">> = iolist_to_binary(re:replace("AA","((((((((((a))))))))))\\10","&&\\1",[caseless])), 
-?line <<"AAAAA">> = iolist_to_binary(re:replace("AA","((((((((((a))))))))))\\10","&&\\1",[caseless,
-                                                                                                                                                                                                               global])), 
-?line <<"AAPBpi">> = iolist_to_binary(re:replace("A","(((((((((a)))))))))","&\\1PBpi",[caseless])), 
-?line <<"AAPBpi">> = iolist_to_binary(re:replace("A","(((((((((a)))))))))","&\\1PBpi",[caseless,
-                                                                                                                                                                                                     global])), 
-?line <<"htagTvaaMIaAkgtdgA">> = iolist_to_binary(re:replace("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))","htagTvaaMIaAkgtdg&",[caseless])), 
-?line <<"htagTvaaMIaAkgtdgA">> = iolist_to_binary(re:replace("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))","htagTvaaMIaAkgtdg&",[caseless,
-                                                                                                                                                                                                                                                                global])), 
-?line <<"iVCeGCCLesCClCCD">> = iolist_to_binary(re:replace("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))","iV&eG\\1CLesC&l&\\1D",[caseless])), 
-?line <<"iVCeGCCLesCClCCD">> = iolist_to_binary(re:replace("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))","iV&eG\\1CLesC&l&\\1D",[caseless,
-                                                                                                                                                                                                                                                                                global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","hKB&NgvvVpXbuP",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","hKB&NgvvVpXbuP",[caseless,
-                                                                                                                                                                                                                                          global])), 
-?line <<"AA">> = iolist_to_binary(re:replace("AA","multiple words of text","V&\\1e&n\\1",[caseless])), 
-?line <<"AA">> = iolist_to_binary(re:replace("AA","multiple words of text","V&\\1e&n\\1",[caseless,
-                                                                                                                                                                                                                     global])), 
-?line <<"UH-UH">> = iolist_to_binary(re:replace("UH-UH","multiple words of text","w\\1JcoWUQlAryay\\1",[caseless])), 
-?line <<"UH-UH">> = iolist_to_binary(re:replace("UH-UH","multiple words of text","w\\1JcoWUQlAryay\\1",[caseless,
+    <<"ADAqIbKy">> = iolist_to_binary(re:replace("A","(((((((((a)))))))))","\\1D\\1qIbKy",[caseless])), 
+    <<"ADAqIbKy">> = iolist_to_binary(re:replace("A","(((((((((a)))))))))","\\1D\\1qIbKy",[caseless,
+                                                                                                                                                                                                           global])), 
+    <<"HdAAToxA">> = iolist_to_binary(re:replace("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))","Hd\\1\\1Tox&",[caseless])), 
+    <<"HdAAToxA">> = iolist_to_binary(re:replace("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))","Hd\\1\\1Tox&",[caseless,
+                                                                                                                                                                                                                                                    global])), 
+    <<"FoLn">> = iolist_to_binary(re:replace("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))","FoLn",[caseless])), 
+    <<"FoLn">> = iolist_to_binary(re:replace("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))","FoLn",[caseless,
                                                                                                                                                                                                                                          global])), 
-?line <<"Ee, YEAH">> = iolist_to_binary(re:replace("MULTIPLE WORDS, YEAH","multiple words","Ee",[caseless])), 
-?line <<"Ee, YEAH">> = iolist_to_binary(re:replace("MULTIPLE WORDS, YEAH","multiple words","Ee",[caseless,
-                                                                                                                                                                                                                   global])), 
-?line <<"uTrQvyABCDEABCDEACeABCDE">> = iolist_to_binary(re:replace("ABCDE","(.*)c(.*)","uTrQvy&&ACe&",[caseless])), 
-?line <<"uTrQvyABCDEABCDEACeABCDE">> = iolist_to_binary(re:replace("ABCDE","(.*)c(.*)","uTrQvy&&ACe&",[caseless,
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","eKwT&ytF",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","multiple words of text","eKwT&ytF",[caseless,
+                                                                                                                                                                                                                            global])), 
+    <<"AA">> = iolist_to_binary(re:replace("AA","multiple words of text","&&naWXBUAJEX&uN\\1eWT&",[caseless])), 
+    <<"AA">> = iolist_to_binary(re:replace("AA","multiple words of text","&&naWXBUAJEX&uN\\1eWT&",[caseless,
+                                                                                                                                                                                                                                          global])), 
+    <<"UH-UH">> = iolist_to_binary(re:replace("UH-UH","multiple words of text","AxWlS&OyQU",[caseless])), 
+    <<"UH-UH">> = iolist_to_binary(re:replace("UH-UH","multiple words of text","AxWlS&OyQU",[caseless,
+                                                                                                                                                                                                                    global])), 
+    <<"WkAfGvMULTIPLE WORDSvMULTIPLE WORDS, YEAH">> = iolist_to_binary(re:replace("MULTIPLE WORDS, YEAH","multiple words","WkAfGv&v&\\1",[caseless])), 
+    <<"WkAfGvMULTIPLE WORDSvMULTIPLE WORDS, YEAH">> = iolist_to_binary(re:replace("MULTIPLE WORDS, YEAH","multiple words","WkAfGv&v&\\1",[caseless,
+                                                                                                                                                                                                                                        global])), 
+    <<"KN">> = iolist_to_binary(re:replace("ABCDE","(.*)c(.*)","KN",[caseless])), 
+    <<"KN">> = iolist_to_binary(re:replace("ABCDE","(.*)c(.*)","KN",[caseless,
+                                                                                                                                                                         global])), 
+    <<"TMyXAYMUnYaLqLp">> = iolist_to_binary(re:replace("(A, B)","\\((.*), (.*)\\)","TMyX\\1YMUnYaLqLp",[caseless])), 
+    <<"TMyXAYMUnYaLqLp">> = iolist_to_binary(re:replace("(A, B)","\\((.*), (.*)\\)","TMyX\\1YMUnYaLqLp",[caseless,
+                                                                                                                                                                                                                          global])), 
+    <<"trKKABCDSCXABCDotxTyYR">> = iolist_to_binary(re:replace("ABCD","abcd","t\\1rKK&SCX&otxTyY\\1R",[caseless])), 
+    <<"trKKABCDSCXABCDotxTyYR">> = iolist_to_binary(re:replace("ABCD","abcd","t\\1rKK&SCX&otxTyY\\1R",[caseless,
+                                                                                                                                                                                                         global])), 
+    ok.
+run25() ->
+    <<"DMHBCoABCDlywnlEABCDj">> = iolist_to_binary(re:replace("ABCD","a(bc)d","DMH\\1o&lywnlE&j",[caseless])), 
+    <<"DMHBCoABCDlywnlEABCDj">> = iolist_to_binary(re:replace("ABCD","a(bc)d","DMH\\1o&lywnlE&j",[caseless,
+                                                                                                                                                                                                global])), 
+    <<"T">> = iolist_to_binary(re:replace("AC","a[-]?c","T",[caseless])), 
+    <<"T">> = iolist_to_binary(re:replace("AC","a[-]?c","T",[caseless,
+                                                                                                                                                           global])), 
+    <<"ABCsVoEdFABCABCABCABCpABCyABCABCWmPtsF">> = iolist_to_binary(re:replace("ABCABC","(abc)\\1","\\1sVoEdF&&p\\1y&WmPtsF",[caseless])), 
+    <<"ABCsVoEdFABCABCABCABCpABCyABCABCWmPtsF">> = iolist_to_binary(re:replace("ABCABC","(abc)\\1","\\1sVoEdF&&p\\1y&WmPtsF",[caseless,
+                                                                                                                                                                                                                         global])), 
+    <<"KfsABCABCeufABC">> = iolist_to_binary(re:replace("ABCABC","([a-c]*)\\1","Kfs&euf\\1",[caseless])), 
+    <<"KfsABCABCeufABCKfseuf">> = iolist_to_binary(re:replace("ABCABC","([a-c]*)\\1","Kfs&euf\\1",[caseless,
                                                                                                                                                                                                   global])), 
-?line <<"ba(A, B)owqjAHEJ(A, B)qP">> = iolist_to_binary(re:replace("(A, B)","\\((.*), (.*)\\)","ba&owqj\\1HEJ&qP",[caseless])), 
-?line <<"ba(A, B)owqjAHEJ(A, B)qP">> = iolist_to_binary(re:replace("(A, B)","\\((.*), (.*)\\)","ba&owqj\\1HEJ&qP",[caseless,
+    <<"abfexgBadad">> = iolist_to_binary(re:replace("abad","a(?!b).","fexg\\1B&&",[])), 
+    <<"abfexgBadad">> = iolist_to_binary(re:replace("abad","a(?!b).","fexg\\1B&&",[global])), 
+    <<"abArfxtCIjx">> = iolist_to_binary(re:replace("abad","a(?=d).","ArfxtCIjx",[])), 
+    <<"abArfxtCIjx">> = iolist_to_binary(re:replace("abad","a(?=d).","ArfxtCIjx",[global])), 
+    <<"abQluadxad">> = iolist_to_binary(re:replace("abad","a(?=c|d).","Qlu&x&",[])), 
+    <<"abQluadxad">> = iolist_to_binary(re:replace("abad","a(?=c|d).","Qlu&x&",[global])), 
+    <<"YMKqcsWCacepOaceeY">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)(.)","YMKqcsWC&pO&\\1Y",[])), 
+    <<"YMKqcsWCacepOaceeY">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)(.)","YMKqcsWC&pO&\\1Y",[global])), 
+    <<"HHmlgyeRvN">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)*(.)","HHmlgyeRvN",[])), 
+    <<"HHmlgyeRvN">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)*(.)","HHmlgyeRvN",[global])), 
+    <<"xdTgRuweeyuwdlSacepeacee">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)+?(.)","xdTgRuw\\1\\1yuwdlS&p\\1&\\1",[])), 
+    <<"xdTgRuweeyuwdlSacepeacee">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)+?(.)","xdTgRuw\\1\\1yuwdlS&p\\1&\\1",[global])), 
+    <<"TYYAdCdfMbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+?(.)","TYYA\\1CdfM",[])), 
+    <<"TYYAdCdfMbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+?(.)","TYYA\\1CdfM",[global])), 
+    <<"rHwRaCuUc">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+(.)","rHwRaCuUc",[])), 
+    <<"rHwRaCuUc">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+(.)","rHwRaCuUc",[global])), 
+    <<"acdbWhFfMbSbtdcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){2}(.)","&WhFfM\\1S\\1td",[])), 
+    <<"acdbWhFfMbSbtdcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){2}(.)","&WhFfM\\1S\\1td",[global])), 
+    <<"bXacdbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}(.)","\\1X&",[])), 
+    <<"bXacdbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}(.)","\\1X&",[global])), 
+    <<"bCacdbcdobe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}?(.)","bC&o",[])), 
+    <<"bCacdbcdobe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}?(.)","bC&o",[global])), 
+    <<"barYfoobarsbxTHafoobarIbm">> = iolist_to_binary(re:replace("foobar","((foo)|(bar))*","\\1Y&sbxTHa&Ibm",[])), 
+    <<"barYfoobarsbxTHafoobarIbmYsbxTHaIbm">> = iolist_to_binary(re:replace("foobar","((foo)|(bar))*","\\1Y&sbxTHa&Ibm",[global])), 
+    <<"eeBieacdbcdbeeIHacdbcdbeNPRhLo">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}(.)","\\1\\1Bi\\1&\\1IH&NPRhLo",[])), 
+    <<"eeBieacdbcdbeeIHacdbcdbeNPRhLo">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}(.)","\\1\\1Bi\\1&\\1IH&NPRhLo",[global])), 
+    <<"acdbcdbeiacdbcdbevacdbcdbeorW">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}?(.)","&i&v&orW",[])), 
+    <<"acdbcdbeiacdbcdbevacdbcdbeorW">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}?(.)","&i&v&orW",[global])), 
+    <<"LeePacdbcdbeacdbcdbeCth">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}(.)","L\\1\\1P&&Cth",[])), 
+    <<"LeePacdbcdbeacdbcdbeCth">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}(.)","L\\1\\1P&&Cth",[global])), 
+    <<"uVacdbcdbWhMacdbcdbNbEue">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}?(.)","uV&WhM&N\\1Eu",[])), 
+    <<"uVacdbcdbWhMacdbcdbNbEue">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}?(.)","uV&WhM&N\\1Eu",[global])), 
+    <<"acdbcdbeuqWHNeI">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}(.)","&uqWHNeI",[])), 
+    <<"acdbcdbeuqWHNeI">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}(.)","&uqWHNeI",[global])), 
+    ok.
+run26() ->
+    <<"GacdbcdbbbPbGFTve">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}?(.)","G&\\1\\1P\\1GFTv",[])), 
+    <<"GacdbcdbbbPbGFTve">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}?(.)","G&\\1\\1P\\1GFTv",[global])), 
+    <<"taceacecgacefBmaHeYaceuace">> = iolist_to_binary(re:replace("ace","a(?:b|(c|e){1,2}?|d)+?(.)","t&&\\1g&fBmaHeY&u&",[])), 
+    <<"taceacecgacefBmaHeYaceuace">> = iolist_to_binary(re:replace("ace","a(?:b|(c|e){1,2}?|d)+?(.)","t&&\\1g&fBmaHeY&u&",[global])), 
+    <<"FcNioABABQKKAbfVA">> = iolist_to_binary(re:replace("AB","^(.+)?B","FcNio&&QKK\\1bfV\\1",[])), 
+    <<"FcNioABABQKKAbfVA">> = iolist_to_binary(re:replace("AB","^(.+)?B","FcNio&&QKK\\1bfV\\1",[global])), 
+    <<"QpJsSlDdk">> = iolist_to_binary(re:replace(".","^([^a-z])|(\\^)$","QpJsSlDdk",[])), 
+    <<"QpJsSlDdk">> = iolist_to_binary(re:replace(".","^([^a-z])|(\\^)$","QpJsSlDdk",[global])), 
+    <<"YtMLJWT<&GSA<&jOUT">> = iolist_to_binary(re:replace("<&OUT","^[<>]&","Y\\1tMLJWT&GSA&j",[])), 
+    <<"YtMLJWT<&GSA<&jOUT">> = iolist_to_binary(re:replace("<&OUT","^[<>]&","Y\\1tMLJWT&GSA&j",[global])), 
+    <<"RBbN">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","RBbN",[])), 
+    <<"RBbN">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","RBbN",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a\\1?){4}$","FHwc\\1\\1biSR",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a\\1?){4}$","FHwc\\1\\1biSR",[global])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","^(a\\1?){4}$","rqMyo&\\1IoOAjaJ\\1vY",[])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","^(a\\1?){4}$","rqMyo&\\1IoOAjaJ\\1vY",[global])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","ebuyIYAaCuRmxbiVR",[])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","ebuyIYAaCuRmxbiVR",[global])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","U&\\1R&jmiM\\1\\1W",[])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","U&\\1R&jmiM\\1\\1W",[global])), 
+    <<"SyepNqAqGr">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a(?(1)\\1)){4}$","SyepNqAqGr",[])), 
+    <<"SyepNqAqGr">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a(?(1)\\1)){4}$","SyepNqAqGr",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a(?(1)\\1)){4}$","idrNArkV&XUmhWGrp\\1rN",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a(?(1)\\1)){4}$","idrNArkV&XUmhWGrp\\1rN",[global])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a(?(1)\\1)){4}$","dVYMTCeoR",[])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a(?(1)\\1)){4}$","dVYMTCeoR",[global])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a(?(1)\\1)){4}$","wtDhOT\\1Pu\\1xOt&P&&&",[])), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a(?(1)\\1)){4}$","wtDhOT\\1Pu\\1xOt&P&&&",[global])), 
+    <<"oUbvLQMfrfVt">> = iolist_to_binary(re:replace("foobar","(?:(f)(o)(o)|(b)(a)(r))*","oUbvLQMfr\\1Vt",[])), 
+    <<"oUbvLQMfrfVtoUbvLQMfrVt">> = iolist_to_binary(re:replace("foobar","(?:(f)(o)(o)|(b)(a)(r))*","oUbvLQMfr\\1Vt",[global])), 
+    <<"aIbOkhquTbuWHx">> = iolist_to_binary(re:replace("ab","(?<=a)b","I&OkhquT&uWH\\1x",[])), 
+    <<"aIbOkhquTbuWHx">> = iolist_to_binary(re:replace("ab","(?<=a)b","I&OkhquT&uWH\\1x",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a)b","BQobLoQagH&I&Gf",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a)b","BQobLoQagH&I&Gf",[global])), 
+    <<"cb">> = iolist_to_binary(re:replace("cb","(?<=a)b","\\1qi\\1cF&xVKJl\\1&HHO&TH",[])), 
+    <<"cb">> = iolist_to_binary(re:replace("cb","(?<=a)b","\\1qi\\1cF&xVKJl\\1&HHO&TH",[global])), 
+    <<"b">> = iolist_to_binary(re:replace("b","(?<=a)b","aRw&xSWDbr\\1wsnnJ&G",[])), 
+    <<"b">> = iolist_to_binary(re:replace("b","(?<=a)b","aRw&xSWDbr\\1wsnnJ&G",[global])), 
+    <<"albBEJPbhoUqwpHlyll">> = iolist_to_binary(re:replace("ab","(?<!c)b","l&BEJPbhoUqwpHlyll",[])), 
+    <<"albBEJPbhoUqwpHlyll">> = iolist_to_binary(re:replace("ab","(?<!c)b","l&BEJPbhoUqwpHlyll",[global])), 
+    <<"iNbLxxT">> = iolist_to_binary(re:replace("b","(?<!c)b","iN&LxxT",[])), 
+    <<"iNbLxxT">> = iolist_to_binary(re:replace("b","(?<!c)b","iN&LxxT",[global])), 
+    <<"byOfPd">> = iolist_to_binary(re:replace("b","(?<!c)b","&yOfPd",[])), 
+    <<"byOfPd">> = iolist_to_binary(re:replace("b","(?<!c)b","&yOfPd",[global])), 
+    <<"IblabamNFubVS">> = iolist_to_binary(re:replace("aba","(?:..)*a","Ibl&mNFubVS",[])), 
+    <<"IblabamNFubVS">> = iolist_to_binary(re:replace("aba","(?:..)*a","Ibl&mNFubVS",[global])), 
+    <<"wvNuoyarrAWFba">> = iolist_to_binary(re:replace("aba","(?:..)*?a","wvNuo\\1y&rrAWF",[])), 
+    <<"wvNuoyarrAWFbwvNuoyarrAWF">> = iolist_to_binary(re:replace("aba","(?:..)*?a","wvNuo\\1y&rrAWF",[global])), 
+    <<"abVmnPSDabPXSc">> = iolist_to_binary(re:replace("abc","^(?:b|a(?=(.)))*\\1","&VmnPSD&PXS",[])), 
+    <<"abVmnPSDabPXSc">> = iolist_to_binary(re:replace("abc","^(?:b|a(?=(.)))*\\1","&VmnPSD&PXS",[global])), 
+    <<"MNhLuKuRgFcjoiabc">> = iolist_to_binary(re:replace("abc","^(){3,5}","MNhL\\1uK&uRgFcj\\1o&i\\1\\1",[])), 
+    <<"MNhLuKuRgFcjoiabc">> = iolist_to_binary(re:replace("abc","^(){3,5}","MNhL\\1uK&uRgFcj\\1o&i\\1\\1",[global])), 
+    <<"aax">> = iolist_to_binary(re:replace("aax","^(a+)*ax","&",[])), 
+    <<"aax">> = iolist_to_binary(re:replace("aax","^(a+)*ax","&",[global])), 
+    <<"aax">> = iolist_to_binary(re:replace("aax","^((a|b)+)*ax","&",[])), 
+    <<"aax">> = iolist_to_binary(re:replace("aax","^((a|b)+)*ax","&",[global])), 
+    <<"UaaxEVMyUJoaafaaxbXAGlnX">> = iolist_to_binary(re:replace("aax","^((a|bc)+)*ax","U&EVMyUJoa\\1f&bXAGlnX",[])), 
+    <<"UaaxEVMyUJoaafaaxbXAGlnX">> = iolist_to_binary(re:replace("aax","^((a|bc)+)*ax","U&EVMyUJoa\\1f&bXAGlnX",[global])), 
+    <<"cHRavababj">> = iolist_to_binary(re:replace("cab","(a|x)*ab","HR\\1av&&j",[])), 
+    <<"cHRavababj">> = iolist_to_binary(re:replace("cab","(a|x)*ab","HR\\1av&&j",[global])), 
+    <<"ceqqArfabLqGjflabab">> = iolist_to_binary(re:replace("cab","(a)*ab","eqqA\\1rf&LqGjfl&&",[])), 
+    <<"ceqqArfabLqGjflabab">> = iolist_to_binary(re:replace("cab","(a)*ab","eqqA\\1rf&LqGjfl&&",[global])), 
+    <<"aMdQQ">> = iolist_to_binary(re:replace("ab","(?:(?i)a)b","aMdQQ",[])), 
+    <<"aMdQQ">> = iolist_to_binary(re:replace("ab","(?:(?i)a)b","aMdQQ",[global])), 
+    ok.
+run27() ->
+    <<"qpLuqQJ">> = iolist_to_binary(re:replace("ab","((?i)a)b","qpLuqQJ",[])), 
+    <<"qpLuqQJ">> = iolist_to_binary(re:replace("ab","((?i)a)b","qpLuqQJ",[global])), 
+    <<"KU">> = iolist_to_binary(re:replace("Ab","(?:(?i)a)b","KU\\1",[])), 
+    <<"KU">> = iolist_to_binary(re:replace("Ab","(?:(?i)a)b","KU\\1",[global])), 
+    <<"HbAbcmtA">> = iolist_to_binary(re:replace("Ab","((?i)a)b","Hb&cmt\\1",[])), 
+    <<"HbAbcmtA">> = iolist_to_binary(re:replace("Ab","((?i)a)b","Hb&cmt\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?i)a)b","\\1&d\\1h",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?i)a)b","\\1&d\\1h",[global])), 
+    <<"cb">> = iolist_to_binary(re:replace("cb","(?:(?i)a)b","QGy\\1\\1s",[])), 
+    <<"cb">> = iolist_to_binary(re:replace("cb","(?:(?i)a)b","QGy\\1\\1s",[global])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?:(?i)a)b","h&LcJB&\\1koG",[])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?:(?i)a)b","h&LcJB&\\1koG",[global])), 
+    <<"hQoabBcSA">> = iolist_to_binary(re:replace("ab","(?i:a)b","h\\1Qo&B\\1cSA",[])), 
+    <<"hQoabBcSA">> = iolist_to_binary(re:replace("ab","(?i:a)b","h\\1Qo&B\\1cSA",[global])), 
+    <<"C">> = iolist_to_binary(re:replace("ab","((?i:a))b","C",[])), 
+    <<"C">> = iolist_to_binary(re:replace("ab","((?i:a))b","C",[global])), 
+    <<"GAMAbeosONsSFAblyS">> = iolist_to_binary(re:replace("Ab","(?i:a)b","GAM&eos\\1O\\1Ns\\1SF&lyS",[])), 
+    <<"GAMAbeosONsSFAblyS">> = iolist_to_binary(re:replace("Ab","(?i:a)b","GAM&eos\\1O\\1Ns\\1SF&lyS",[global])), 
+    <<"AbASQYAbA">> = iolist_to_binary(re:replace("Ab","((?i:a))b","&\\1SQY&\\1",[])), 
+    <<"AbASQYAbA">> = iolist_to_binary(re:replace("Ab","((?i:a))b","&\\1SQY&\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i:a)b","EW&tEN\\1\\1&\\1\\1yd",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i:a)b","EW&tEN\\1\\1&\\1\\1yd",[global])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","bK&xdvtcfqVCo",[])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","bK&xdvtcfqVCo",[global])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","rU",[])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","rU",[global])), 
+    <<"fabvvabeKvWlUCaababk">> = iolist_to_binary(re:replace("ab","(?:(?-i)a)b","f&vv&eKvWlUC\\1\\1a&\\1&k",[caseless])), 
+    <<"fabvvabeKvWlUCaababk">> = iolist_to_binary(re:replace("ab","(?:(?-i)a)b","f&vv&eKvWlUC\\1\\1a&\\1&k",[caseless,
                                                                                                                                                                                                                             global])), 
-?line <<"ABCDRIpLJwyEwDArCpanW">> = iolist_to_binary(re:replace("ABCD","abcd","&RIpLJwyEwDA\\1rCpan\\1W",[caseless])), 
-?line <<"ABCDRIpLJwyEwDArCpanW">> = iolist_to_binary(re:replace("ABCD","abcd","&RIpLJwyEwDA\\1rCpan\\1W",[caseless,
-                                                                                                                                                                                                              global])), 
-?line <<"xykYBC">> = iolist_to_binary(re:replace("ABCD","a(bc)d","xykY\\1",[caseless])), 
-?line <<"xykYBC">> = iolist_to_binary(re:replace("ABCD","a(bc)d","xykY\\1",[caseless,
-                                                                                                                                                                              global])), 
-?line <<"UMfPSTJEqdeS">> = iolist_to_binary(re:replace("AC","a[-]?c","U\\1M\\1\\1fPSTJEqdeS",[caseless])), 
-?line <<"UMfPSTJEqdeS">> = iolist_to_binary(re:replace("AC","a[-]?c","U\\1M\\1\\1fPSTJEqdeS",[caseless,
-                                                                                                                                                                                                        global])), 
-?line <<"ITABCABCABCnxfDlABCpYAXQvxABCABCE">> = iolist_to_binary(re:replace("ABCABC","(abc)\\1","IT\\1&nxfDl\\1pYAXQvx\\1\\1E",[caseless])), 
-?line <<"ITABCABCABCnxfDlABCpYAXQvxABCABCE">> = iolist_to_binary(re:replace("ABCABC","(abc)\\1","IT\\1&nxfDl\\1pYAXQvx\\1\\1E",[caseless,
-                                                                                                                                                                                                                                     global])), 
-?line <<"JXRRQqcKbpvOgISABCT">> = iolist_to_binary(re:replace("ABCABC","([a-c]*)\\1","JXRRQqcKbpvOgIS\\1T",[caseless])), 
-?line <<"JXRRQqcKbpvOgISABCTJXRRQqcKbpvOgIST">> = iolist_to_binary(re:replace("ABCABC","([a-c]*)\\1","JXRRQqcKbpvOgIS\\1T",[caseless,
-                                                                                                                                                                                                                     global])), 
-?line <<"abxuiiVt">> = iolist_to_binary(re:replace("abad","a(?!b).","xuiiVt",[])), 
-?line <<"abxuiiVt">> = iolist_to_binary(re:replace("abad","a(?!b).","xuiiVt",[global])), 
-?line <<"abMdtNqPOC">> = iolist_to_binary(re:replace("abad","a(?=d).","MdtNqPOC",[])), 
-?line <<"abMdtNqPOC">> = iolist_to_binary(re:replace("abad","a(?=d).","MdtNqPOC",[global])), 
-?line <<"abmkrHu">> = iolist_to_binary(re:replace("abad","a(?=c|d).","mkrHu",[])), 
-?line <<"abmkrHu">> = iolist_to_binary(re:replace("abad","a(?=c|d).","mkrHu",[global])), 
-?line <<"JfimtGueeaceUlTKvht">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)(.)","JfimtGu\\1\\1&UlTKvht",[])), 
-?line <<"JfimtGueeaceUlTKvht">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)(.)","JfimtGu\\1\\1&UlTKvht",[global])), 
-?line <<"IdKeqIicacekGQCace">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)*(.)","IdK\\1qIic&kGQC&",[])), 
-?line <<"IdKeqIicacekGQCace">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)*(.)","IdK\\1qIic&kGQC&",[global])), 
-?line <<"ovgdwiKdYGGace">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)+?(.)","ovgdwiKdYGG&",[])), 
-?line <<"ovgdwiKdYGGace">> = iolist_to_binary(re:replace("ace","a(?:b|c|d)+?(.)","ovgdwiKdYGG&",[global])), 
-?line <<"uJgdlOhWXUJpEBdwSbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+?(.)","uJg\\1lOhWXUJpEB\\1wS",[])), 
-?line <<"uJgdlOhWXUJpEBdwSbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+?(.)","uJg\\1lOhWXUJpEB\\1wS",[global])), 
-?line <<"UMpmieMJkQH">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+(.)","UMpmi\\1MJkQH",[])), 
-?line <<"UMpmieMJkQH">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d)+(.)","UMpmi\\1MJkQH",[global])), 
-?line <<"pCjGheRqYfSacdbhlDAvcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){2}(.)","pCjGheRqYfS&hlDAv",[])), 
-?line <<"pCjGheRqYfSacdbhlDAvcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){2}(.)","pCjGheRqYfS&hlDAv",[global])), 
-?line <<"yxwYmacdbcdbbAbacdbcdbbGABe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}(.)","yxwYm&\\1A\\1&bGAB",[])), 
-?line <<"yxwYmacdbcdbbAbacdbcdbbGABe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}(.)","yxwYm&\\1A\\1&bGAB",[global])), 
-?line <<"dkoReacdbcdhXacdbcdacdbcdcakNJbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}?(.)","\\1koRe&hX&&cakNJ",[])), 
-?line <<"dkoReacdbcdhXacdbcdacdbcdcakNJbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){4,5}?(.)","\\1koRe&hX&&cakNJ",[global])), 
-?line <<"nVjVDfoobarOjfoobarfoobareL">> = iolist_to_binary(re:replace("foobar","((foo)|(bar))*","nVjVD&Oj&&eL",[])), 
-?line <<"nVjVDfoobarOjfoobarfoobareLnVjVDOjeL">> = iolist_to_binary(re:replace("foobar","((foo)|(bar))*","nVjVD&Oj&&eL",[global])), 
-?line <<"bJacdbcdbeMVacdbcdbeFAiPYieyEAI">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}(.)","bJ&MV&FAiPYi\\1yEAI",[])), 
-?line <<"bJacdbcdbeMVacdbcdbeFAiPYieyEAI">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}(.)","bJ&MV&FAiPYi\\1yEAI",[global])), 
-?line <<"cW">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}?(.)","cW",[])), 
-?line <<"cW">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){6,7}?(.)","cW",[global])), 
-?line <<"EnymbYybacdbcdbeQeCacdbcdbeacdbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}(.)","EnymbYyb&Q\\1C&&",[])), 
-?line <<"EnymbYybacdbcdbeQeCacdbcdbeacdbcdbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}(.)","EnymbYyb&Q\\1C&&",[global])), 
-?line <<"XCacdbcdbVjuGQacdbcdbBqmsUJe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}?(.)","XC&VjuGQ&BqmsUJ",[])), 
-?line <<"XCacdbcdbVjuGQacdbcdbBqmsUJe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,6}?(.)","XC&VjuGQ&BqmsUJ",[global])), 
-?line <<"OacdbcdbeCSMacdbcdbensheuoDP">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}(.)","O&CSM&nsh\\1uoDP",[])), 
-?line <<"OacdbcdbeCSMacdbcdbensheuoDP">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}(.)","O&CSM&nsh\\1uoDP",[global])), 
-?line <<"YReNTbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}?(.)","YReNT\\1",[])), 
-?line <<"YReNTbe">> = iolist_to_binary(re:replace("acdbcdbe","a(?:b|c|d){5,7}?(.)","YReNT\\1",[global])), 
-?line <<"IJoaceaceHEIicnaaceaceacecq">> = iolist_to_binary(re:replace("ace","a(?:b|(c|e){1,2}?|d)+?(.)","IJo&&HEIi\\1na&&&\\1q",[])), 
-?line <<"IJoaceaceHEIicnaaceaceacecq">> = iolist_to_binary(re:replace("ace","a(?:b|(c|e){1,2}?|d)+?(.)","IJo&&HEIi\\1na&&&\\1q",[global])), 
-?line <<"PqnTibAldgKNACABm">> = iolist_to_binary(re:replace("AB","^(.+)?B","PqnTib\\1ldgKN\\1C&m",[])), 
-?line <<"PqnTibAldgKNACABm">> = iolist_to_binary(re:replace("AB","^(.+)?B","PqnTib\\1ldgKN\\1C&m",[global])), 
-?line <<"n.toDyHxNwuj.d.n..l">> = iolist_to_binary(re:replace(".","^([^a-z])|(\\^)$","n\\1toDyHxNwuj\\1d&n\\1\\1l",[])), 
-?line <<"n.toDyHxNwuj.d.n..l">> = iolist_to_binary(re:replace(".","^([^a-z])|(\\^)$","n\\1toDyHxNwuj\\1d&n\\1\\1l",[global])), 
-?line <<"GOUT">> = iolist_to_binary(re:replace("<&OUT","^[<>]&","G",[])), 
-?line <<"GOUT">> = iolist_to_binary(re:replace("<&OUT","^[<>]&","G",[global])), 
-?line <<"eQPwy">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","eQPwy",[])), 
-?line <<"eQPwy">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a\\1?){4}$","eQPwy",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a\\1?){4}$","fpysabFs",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a\\1?){4}$","fpysabFs",[global])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","^(a\\1?){4}$","iySaXMmSpF\\1wGu&i&",[])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","^(a\\1?){4}$","iySaXMmSpF\\1wGu&i&",[global])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","&E&t",[])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a\\1?){4}$","&E&t",[global])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","rv\\1nEUYoTcup\\1",[])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a\\1?){4}$","rv\\1nEUYoTcup\\1",[global])), 
-?line <<"Grouf">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a(?(1)\\1)){4}$","Grouf",[])), 
-?line <<"Grouf">> = iolist_to_binary(re:replace("aaaaaaaaaa","^(a(?(1)\\1)){4}$","Grouf",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a(?(1)\\1)){4}$","xJ\\1D",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a(?(1)\\1)){4}$","xJ\\1D",[global])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a(?(1)\\1)){4}$","w&PQ&n&C",[])), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a(?(1)\\1)){4}$","w&PQ&n&C",[global])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a(?(1)\\1)){4}$","fXiC",[])), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaa","^(a(?(1)\\1)){4}$","fXiC",[global])), 
-?line <<"fEfoobarodvfoobarmohu">> = iolist_to_binary(re:replace("foobar","(?:(f)(o)(o)|(b)(a)(r))*","\\1E&odv&mohu",[])), 
-?line <<"fEfoobarodvfoobarmohuEodvmohu">> = iolist_to_binary(re:replace("foobar","(?:(f)(o)(o)|(b)(a)(r))*","\\1E&odv&mohu",[global])), 
-?line <<"aaHgXnnrbsEWfBvCB">> = iolist_to_binary(re:replace("ab","(?<=a)b","aHgXnnr&sEWfBv\\1CB",[])), 
-?line <<"aaHgXnnrbsEWfBvCB">> = iolist_to_binary(re:replace("ab","(?<=a)b","aHgXnnr&sEWfBv\\1CB",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a)b","&\\1J\\1qs\\1\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=a)b","&\\1J\\1qs\\1\\1",[global])), 
-?line <<"cb">> = iolist_to_binary(re:replace("cb","(?<=a)b","PBhSDEP\\1&fa&&FAQ",[])), 
-?line <<"cb">> = iolist_to_binary(re:replace("cb","(?<=a)b","PBhSDEP\\1&fa&&FAQ",[global])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","(?<=a)b","VGBLJTb\\1",[])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","(?<=a)b","VGBLJTb\\1",[global])), 
-?line <<"aAjOnQvFo">> = iolist_to_binary(re:replace("ab","(?<!c)b","Aj\\1OnQvFo",[])), 
-?line <<"aAjOnQvFo">> = iolist_to_binary(re:replace("ab","(?<!c)b","Aj\\1OnQvFo",[global])), 
-?line <<"EcsuQFCLbrqGgAba">> = iolist_to_binary(re:replace("b","(?<!c)b","EcsuQ\\1FCLbrqGgA&a",[])), 
-?line <<"EcsuQFCLbrqGgAba">> = iolist_to_binary(re:replace("b","(?<!c)b","EcsuQ\\1FCLbrqGgA&a",[global])), 
-?line <<"OLbRynrb">> = iolist_to_binary(re:replace("b","(?<!c)b","OL&R\\1\\1ynr&\\1",[])), 
-?line <<"OLbRynrb">> = iolist_to_binary(re:replace("b","(?<!c)b","OL&R\\1\\1ynr&\\1",[global])), 
-?line <<"YnabankVVRQtUI">> = iolist_to_binary(re:replace("aba","(?:..)*a","Yn&nkVVRQtUI",[])), 
-?line <<"YnabankVVRQtUI">> = iolist_to_binary(re:replace("aba","(?:..)*a","Yn&nkVVRQtUI",[global])), 
-?line <<"dtatllgba">> = iolist_to_binary(re:replace("aba","(?:..)*?a","dt&tllg",[])), 
-?line <<"dtatllgbdtatllg">> = iolist_to_binary(re:replace("aba","(?:..)*?a","dt&tllg",[global])), 
-?line <<"abKyOHc">> = iolist_to_binary(re:replace("abc","^(?:b|a(?=(.)))*\\1","&KyOH",[])), 
-?line <<"abKyOHc">> = iolist_to_binary(re:replace("abc","^(?:b|a(?=(.)))*\\1","&KyOH",[global])), 
-?line <<"olabc">> = iolist_to_binary(re:replace("abc","^(){3,5}","ol",[])), 
-?line <<"olabc">> = iolist_to_binary(re:replace("abc","^(){3,5}","ol",[global])), 
-?line <<"tQmIRuA">> = iolist_to_binary(re:replace("aax","^(a+)*ax","tQmIRuA",[])), 
-?line <<"tQmIRuA">> = iolist_to_binary(re:replace("aax","^(a+)*ax","tQmIRuA",[global])), 
-?line <<"RaaxLDgyKaII">> = iolist_to_binary(re:replace("aax","^((a|b)+)*ax","R&LDgyK\\1II",[])), 
-?line <<"RaaxLDgyKaII">> = iolist_to_binary(re:replace("aax","^((a|b)+)*ax","R&LDgyK\\1II",[global])), 
-?line <<"jxJdaCNaaxAUxaofKF">> = iolist_to_binary(re:replace("aax","^((a|bc)+)*ax","jxJd\\1CN&AUx\\1ofKF",[])), 
-?line <<"jxJdaCNaaxAUxaofKF">> = iolist_to_binary(re:replace("aax","^((a|bc)+)*ax","jxJd\\1CN&AUx\\1ofKF",[global])), 
-?line <<"cxMJiMAGvYS">> = iolist_to_binary(re:replace("cab","(a|x)*ab","xMJiMA\\1G\\1vYS",[])), 
-?line <<"cxMJiMAGvYS">> = iolist_to_binary(re:replace("cab","(a|x)*ab","xMJiMA\\1G\\1vYS",[global])), 
-?line <<"cwXU">> = iolist_to_binary(re:replace("cab","(a)*ab","wXU\\1",[])), 
-?line <<"cwXU">> = iolist_to_binary(re:replace("cab","(a)*ab","wXU\\1",[global])), 
-?line <<"y">> = iolist_to_binary(re:replace("ab","(?:(?i)a)b","y",[])), 
-?line <<"y">> = iolist_to_binary(re:replace("ab","(?:(?i)a)b","y",[global])), 
-?line <<"xNpTab">> = iolist_to_binary(re:replace("ab","((?i)a)b","xNpT&",[])), 
-?line <<"xNpTab">> = iolist_to_binary(re:replace("ab","((?i)a)b","xNpT&",[global])), 
-?line <<"UUhQk">> = iolist_to_binary(re:replace("Ab","(?:(?i)a)b","UU\\1\\1h\\1Qk",[])), 
-?line <<"UUhQk">> = iolist_to_binary(re:replace("Ab","(?:(?i)a)b","UU\\1\\1h\\1Qk",[global])), 
-?line <<"To">> = iolist_to_binary(re:replace("Ab","((?i)a)b","To",[])), 
-?line <<"To">> = iolist_to_binary(re:replace("Ab","((?i)a)b","To",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?i)a)b","Iog\\1kPwXTNA\\1u",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?i)a)b","Iog\\1kPwXTNA\\1u",[global])), 
-?line <<"cb">> = iolist_to_binary(re:replace("cb","(?:(?i)a)b","\\1eeor\\1PcpHdMT&rFUGQX",[])), 
-?line <<"cb">> = iolist_to_binary(re:replace("cb","(?:(?i)a)b","\\1eeor\\1PcpHdMT&rFUGQX",[global])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?:(?i)a)b","f&&\\1Fnb&nOyDHT&Trng",[])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?:(?i)a)b","f&&\\1Fnb&nOyDHT&Trng",[global])), 
-?line <<"SCyJabaabEDejJdabuabG">> = iolist_to_binary(re:replace("ab","(?i:a)b","SCyJ\\1&a&EDejJd&\\1u\\1&G",[])), 
-?line <<"SCyJabaabEDejJdabuabG">> = iolist_to_binary(re:replace("ab","(?i:a)b","SCyJ\\1&a&EDejJd&\\1u\\1&G",[global])), 
-?line <<"nabMYvlVqabaabvabp">> = iolist_to_binary(re:replace("ab","((?i:a))b","n&MYvlVq&\\1&v&p",[])), 
-?line <<"nabMYvlVqabaabvabp">> = iolist_to_binary(re:replace("ab","((?i:a))b","n&MYvlVq&\\1&v&p",[global])), 
-?line <<"hQhGlGrAbAbxEKrc">> = iolist_to_binary(re:replace("Ab","(?i:a)b","hQhGlGr&&xEKrc\\1",[])), 
-?line <<"hQhGlGrAbAbxEKrc">> = iolist_to_binary(re:replace("Ab","(?i:a)b","hQhGlGr&&xEKrc\\1",[global])), 
-?line <<"fSgsAnoYq">> = iolist_to_binary(re:replace("Ab","((?i:a))b","fSgs\\1noYq",[])), 
-?line <<"fSgsAnoYq">> = iolist_to_binary(re:replace("Ab","((?i:a))b","fSgs\\1noYq",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i:a)b","Lsa",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i:a)b","Lsa",[global])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","&MKfO&mRWgP&yU",[])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","&MKfO&mRWgP&yU",[global])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","S",[])), 
-?line <<"aB">> = iolist_to_binary(re:replace("aB","(?i:a)b","S",[global])), 
-?line <<"QTabISRDlbwogmSuiJ">> = iolist_to_binary(re:replace("ab","(?:(?-i)a)b","QT&ISRDlbwogmSuiJ",[caseless])), 
-?line <<"QTabISRDlbwogmSuiJ">> = iolist_to_binary(re:replace("ab","(?:(?-i)a)b","QT&ISRDlbwogmSuiJ",[caseless,
-                                                                                                                                                                                                        global])), 
-?line <<"VabWOeTSwSGwOkyIabf">> = iolist_to_binary(re:replace("ab","((?-i)a)b","V&WOeTSwSGwOkyI&f",[caseless])), 
-?line <<"VabWOeTSwSGwOkyIabf">> = iolist_to_binary(re:replace("ab","((?-i)a)b","V&WOeTSwSGwOkyI&f",[caseless,
-                                                                                                                                                                                                     global])), 
-?line <<"pNtk">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","\\1pNtk",[caseless])), 
-?line <<"pNtk">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","\\1pNtk",[caseless,
+    <<"a">> = iolist_to_binary(re:replace("ab","((?-i)a)b","a",[caseless])), 
+    <<"a">> = iolist_to_binary(re:replace("ab","((?-i)a)b","a",[caseless,
+                                                                                                                                                                 global])), 
+    <<"YgwHaBaBEobvWdcKm">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","YgwH&&E\\1o\\1bvWdcKm",[caseless])), 
+    <<"YgwHaBaBEobvWdcKm">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","YgwH&&E\\1o\\1bvWdcKm",[caseless,
+                                                                                                                                                                                                                 global])), 
+    <<"gPQtaBiM">> = iolist_to_binary(re:replace("aB","((?-i)a)b","gPQt\\1BiM",[caseless])), 
+    <<"gPQtaBiM">> = iolist_to_binary(re:replace("aB","((?-i)a)b","gPQt\\1BiM",[caseless,
                                                                                                                                                                                     global])), 
-?line <<"MpdRBTE">> = iolist_to_binary(re:replace("aB","((?-i)a)b","MpdRBTE",[caseless])), 
-?line <<"MpdRBTE">> = iolist_to_binary(re:replace("aB","((?-i)a)b","MpdRBTE",[caseless,
-                                                                                                                                                                               global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","RiV",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","RiV",[caseless,
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","dAPB\\1lhgJnXJM\\1",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","dAPB\\1lhgJnXJM\\1",[caseless,
+                                                                                                                                                                                                                           global])), 
+    <<"cpmMjqeoMjqXPSCxgaB">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","cpmMjqeoMjqXPSC\\1xg&",[caseless])), 
+    <<"cpmMjqeoMjqXPSCxgaB">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","cpmMjqeoMjqXPSC\\1xg&",[caseless,
+                                                                                                                                                                                                               global])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","ehCMjHfdoLOUT",[caseless])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","ehCMjHfdoLOUT",[caseless,
                                                                                                                                                                                              global])), 
-?line <<"tjEITLaBaBtD">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","t\\1jEITL&&tD",[caseless])), 
-?line <<"tjEITLaBaBtD">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","t\\1jEITL&&tD",[caseless,
+    <<"aBaBXheDmRWIj">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","&&XheDmRW\\1Ij",[caseless])), 
+    <<"aBaBXheDmRWIj">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","&&XheDmRW\\1Ij",[caseless,
                                                                                                                                                                                                   global])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","hbvOWn",[caseless])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","hbvOWn",[caseless,
-                                                                                                                                                                                 global])), 
-?line <<"s">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","s",[caseless])), 
-?line <<"s">> = iolist_to_binary(re:replace("aB","(?:(?-i)a)b","s",[caseless,
-                                                                                                                                                                       global])), 
-?line <<"yfQaBvLFJJQMhKGx">> = iolist_to_binary(re:replace("aB","((?-i)a)b","yfQ&vLFJJQMhKGx",[caseless])), 
-?line <<"yfQaBvLFJJQMhKGx">> = iolist_to_binary(re:replace("aB","((?-i)a)b","yfQ&vLFJJQMhKGx",[caseless,
-                                                                                                                                                                                                global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","QM&L",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","QM&L",[caseless,
-                                                                                                                                                                                                global])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","aVF\\1dL&\\1",[caseless])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","aVF\\1dL&\\1",[caseless,
-                                                                                                                                                                                                global])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","(?:(?-i)a)b","GSb\\1bvleJ",[caseless])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","(?:(?-i)a)b","GSb\\1bvleJ",[caseless,
-                                                                                                                                                                                            global])), 
-?line <<"wAW">> = iolist_to_binary(re:replace("ab","(?-i:a)b","wAW",[caseless])), 
-?line <<"wAW">> = iolist_to_binary(re:replace("ab","(?-i:a)b","wAW",[caseless,
-                                                                                                                                                                     global])), 
-?line <<"Atl">> = iolist_to_binary(re:replace("ab","((?-i:a))b","Atl",[caseless])), 
-?line <<"Atl">> = iolist_to_binary(re:replace("ab","((?-i:a))b","Atl",[caseless,
+    <<"HaBaBwaBaBarQLsPaLaBH">> = iolist_to_binary(re:replace("aB","((?-i)a)b","H&&w&&\\1rQLsP\\1L&H",[caseless])), 
+    <<"HaBaBwaBaBarQLsPaLaBH">> = iolist_to_binary(re:replace("aB","((?-i)a)b","H&&w&&\\1rQLsP\\1L&H",[caseless,
+                                                                                                                                                                                                              global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","rA&&\\1Ox\\1x",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?:(?-i)a)b","rA&&\\1Ox\\1x",[caseless,
+                                                                                                                                                                                                                   global])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","qU\\1qgKirHcB",[caseless])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?:(?-i)a)b","qU\\1qgKirHcB",[caseless,
+                                                                                                                                                                                              global])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","(?:(?-i)a)b","rtc&FUes&I&&V\\1Wi&o",[caseless])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","(?:(?-i)a)b","rtc&FUes&I&&V\\1Wi&o",[caseless,
+                                                                                                                                                                                                                 global])), 
+    ok.
+run28() ->
+    <<"gGfbP">> = iolist_to_binary(re:replace("ab","(?-i:a)b","\\1gGfbP",[caseless])), 
+    <<"gGfbP">> = iolist_to_binary(re:replace("ab","(?-i:a)b","\\1gGfbP",[caseless,
+                                                                                                                                                                              global])), 
+    <<"oibsT">> = iolist_to_binary(re:replace("ab","((?-i:a))b","oibsT",[caseless])), 
+    <<"oibsT">> = iolist_to_binary(re:replace("ab","((?-i:a))b","oibsT",[caseless,
+                                                                                                                                                                           global])), 
+    <<"erLkRe">> = iolist_to_binary(re:replace("aB","(?-i:a)b","erLkRe",[caseless])), 
+    <<"erLkRe">> = iolist_to_binary(re:replace("aB","(?-i:a)b","erLkRe",[caseless,
                                                                                                                                                                          global])), 
-?line <<"gP">> = iolist_to_binary(re:replace("aB","(?-i:a)b","gP\\1",[caseless])), 
-?line <<"gP">> = iolist_to_binary(re:replace("aB","(?-i:a)b","gP\\1",[caseless,
+    <<"NcuVaBaPaBqlgVJaaAMaBjt">> = iolist_to_binary(re:replace("aB","((?-i:a))b","NcuV&aP&qlgVJ\\1\\1AM&jt",[caseless])), 
+    <<"NcuVaBaPaBqlgVJaaAMaBjt">> = iolist_to_binary(re:replace("aB","((?-i:a))b","NcuV&aP&qlgVJ\\1\\1AM&jt",[caseless,
+                                                                                                                                                                                                                      global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","xW",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","xW",[caseless,
+                                                                                                                                                                                   global])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","rBT\\1&D&jmNXx",[caseless])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","rBT\\1&D&jmNXx",[caseless,
+                                                                                                                                                                                            global])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","oyAx&&hEq\\1",[caseless])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","oyAx&&hEq\\1",[caseless,
+                                                                                                                                                                                        global])), 
+    <<"shG">> = iolist_to_binary(re:replace("aB","(?-i:a)b","\\1shG",[caseless])), 
+    <<"shG">> = iolist_to_binary(re:replace("aB","(?-i:a)b","\\1shG",[caseless,
                                                                                                                                                                           global])), 
-?line <<"LFcaNaJixv">> = iolist_to_binary(re:replace("aB","((?-i:a))b","LFc\\1N\\1Jixv",[caseless])), 
-?line <<"LFcaNaJixv">> = iolist_to_binary(re:replace("aB","((?-i:a))b","LFc\\1N\\1Jixv",[caseless,
-                                                                                                                                                                                                 global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","FRPuPJIi\\1",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","FRPuPJIi\\1",[caseless,
-                                                                                                                                                                                                        global])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","TYBp\\1aMFRUwXYyGS\\1&tH",[caseless])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","TYBp\\1aMFRUwXYyGS\\1&tH",[caseless,
-                                                                                                                                                                                                                  global])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","s",[caseless])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","s",[caseless,
-                                                                                                                                                                 global])), 
-?line <<"XBBaBVaBHwVHaBtFl">> = iolist_to_binary(re:replace("aB","(?-i:a)b","XBB\\1&V&H\\1wVH&t\\1Fl",[caseless])), 
-?line <<"XBBaBVaBHwVHaBtFl">> = iolist_to_binary(re:replace("aB","(?-i:a)b","XBB\\1&V&H\\1wVH&t\\1Fl",[caseless,
-                                                                                                                                                                                                                   global])), 
-?line <<"TfbKaBvxl">> = iolist_to_binary(re:replace("aB","((?-i:a))b","TfbK&vxl",[caseless])), 
-?line <<"TfbKaBvxl">> = iolist_to_binary(re:replace("aB","((?-i:a))b","TfbK&vxl",[caseless,
-                                                                                                                                                                                    global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","\\1B\\1v&LjNSAy",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","\\1B\\1v&LjNSAy",[caseless,
-                                                                                                                                                                                                                  global])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","HQTW",[caseless])), 
-?line <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","HQTW",[caseless,
-                                                                                                                                                                       global])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","pG",[caseless])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","pG",[caseless,
-                                                                                                                                                                   global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?-i:a.))b","U",[caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?-i:a.))b","U",[caseless,
-                                                                                                                                                                                         global])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","((?-i:a.))b","\\1uBjM&tv&\\1tD\\1UO\\1gVY",[caseless])), 
-?line <<"AB">> = iolist_to_binary(re:replace("AB","((?-i:a.))b","\\1uBjM&tv&\\1tD\\1UO\\1gVY",[caseless,
-                                                                                                                                                                                                                                 global])), 
-?line <<"a
+    <<"OKLO">> = iolist_to_binary(re:replace("aB","((?-i:a))b","OKLO",[caseless])), 
+    <<"OKLO">> = iolist_to_binary(re:replace("aB","((?-i:a))b","OKLO",[caseless,
+                                                                                                                                                                         global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","DV\\1NmsJ&bJn&F",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?-i:a)b","DV\\1NmsJ&bJn&F",[caseless,
+                                                                                                                                                                                                                global])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","I",[caseless])), 
+    <<"Ab">> = iolist_to_binary(re:replace("Ab","(?-i:a)b","I",[caseless,
+                                                                                                                                                               global])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","WVyTncmcNoIfn\\1B",[caseless])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","(?-i:a)b","WVyTncmcNoIfn\\1B",[caseless,
+                                                                                                                                                                                                global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?-i:a.))b","&UW\\1PRmJQx\\1inQ\\1o&&C",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?-i:a.))b","&UW\\1PRmJQx\\1inQ\\1o&&C",[caseless,
+                                                                                                                                                                                                                                             global])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","((?-i:a.))b","xFK&bFAyoLB\\1F",[caseless])), 
+    <<"AB">> = iolist_to_binary(re:replace("AB","((?-i:a.))b","xFK&bFAyoLB\\1F",[caseless,
+                                                                                                                                                                                                   global])), 
+    <<"a
 B">> = iolist_to_binary(re:replace("a
-B","((?-i:a.))b","SAx&Io",[caseless])), 
-?line <<"a
+B","((?-i:a.))b","\\1E\\1AL\\1QP",[caseless])), 
+    <<"a
 B">> = iolist_to_binary(re:replace("a
-B","((?-i:a.))b","SAx&Io",[caseless,global])), 
-?line <<"LPyepkdfnqsa
-oa
-a
+B","((?-i:a.))b","\\1E\\1AL\\1QP",[caseless,global])), 
+    <<"bja
 Ba
-M">> = iolist_to_binary(re:replace("a
-B","((?s-i:a.))b","LPyepkdfnqs\\1o\\1&\\1M",[caseless])), 
-?line <<"LPyepkdfnqsa
-oa
-a
+wRNOa
+LMvela
+w">> = iolist_to_binary(re:replace("a
+B","((?s-i:a.))b","bj&\\1wRNO\\1LMvel\\1w",[caseless])), 
+    <<"bja
 Ba
-M">> = iolist_to_binary(re:replace("a
-B","((?s-i:a.))b","LPyepkdfnqs\\1o\\1&\\1M",[caseless,global])), 
-?line <<"RG">> = iolist_to_binary(re:replace("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))","RG",[])), 
-?line <<"RG">> = iolist_to_binary(re:replace("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))","RG",[global])), 
-?line <<"SiMB">> = iolist_to_binary(re:replace("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))","\\1SiMB",[])), 
-?line <<"SiMB">> = iolist_to_binary(re:replace("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))","\\1SiMB",[global])), 
-?line <<"HNBAb4abYAb4abecqBPfYYBF">> = iolist_to_binary(re:replace("Ab4ab","(ab)\\d\\1","HNB&Y&ecqBPfYYBF",[caseless])), 
-?line <<"HNBAb4abYAb4abecqBPfYYBF">> = iolist_to_binary(re:replace("Ab4ab","(ab)\\d\\1","HNB&Y&ecqBPfYYBF",[caseless,
-                                                                                                                                                                                                             global])), 
-?line <<"eqbVWgJEcab4Ababe">> = iolist_to_binary(re:replace("ab4Ab","(ab)\\d\\1","eqbVWgJEc&\\1e",[caseless])), 
-?line <<"eqbVWgJEcab4Ababe">> = iolist_to_binary(re:replace("ab4Ab","(ab)\\d\\1","eqbVWgJEc&\\1e",[caseless,
-                                                                                                                                                                                                         global])), 
-?line <<"HvsmPfoobar1234bazCYfoobar1234bazqih">> = iolist_to_binary(re:replace("foobar1234baz","foo\\w*\\d{4}baz","HvsmP&CY&qih",[])), 
-?line <<"HvsmPfoobar1234bazCYfoobar1234bazqih">> = iolist_to_binary(re:replace("foobar1234baz","foo\\w*\\d{4}baz","HvsmP&CY&qih",[global])), 
-?line <<"x~~lsTkD~~qWUPtx~~wj~~R">> = iolist_to_binary(re:replace("x~~","x(~~)*(?:(?:F)?)?","&lsTkD\\1qWUPt&wj\\1R",[])), 
-?line <<"x~~lsTkD~~qWUPtx~~wj~~R">> = iolist_to_binary(re:replace("x~~","x(~~)*(?:(?:F)?)?","&lsTkD\\1qWUPt&wj\\1R",[global])), 
-?line <<"aaacPnBOLPeN">> = iolist_to_binary(re:replace("aaac","^a(?#xxx){3}c","&P\\1n\\1BOLPeN",[])), 
-?line <<"aaacPnBOLPeN">> = iolist_to_binary(re:replace("aaac","^a(?#xxx){3}c","&P\\1n\\1BOLPeN",[global])), 
-?line <<"Uh">> = iolist_to_binary(re:replace("aaac","^a (?#xxx) (?#yyy) {3}c","Uh",[extended])), 
-?line <<"Uh">> = iolist_to_binary(re:replace("aaac","^a (?#xxx) (?#yyy) {3}c","Uh",[extended,
-                                                                                                                                                                                                     global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<![cd])b","\\1CWOLaTxilNg\\1W",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<![cd])b","\\1CWOLaTxilNg\\1W",[global])), 
-?line <<"B
+wRNOa
+LMvela
+w">> = iolist_to_binary(re:replace("a
+B","((?s-i:a.))b","bj&\\1wRNO\\1LMvel\\1w",[caseless,global])), 
+    <<"oi">> = iolist_to_binary(re:replace("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))","oi",[])), 
+    <<"oi">> = iolist_to_binary(re:replace("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))","oi",[global])), 
+    <<"LPIaGAjcBB">> = iolist_to_binary(re:replace("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))","LPIaGAjc\\1B\\1B",[])), 
+    <<"LPIaGAjcBB">> = iolist_to_binary(re:replace("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))","LPIaGAjc\\1B\\1B",[global])), 
+    <<"Ab4abmaeqLAb4abK">> = iolist_to_binary(re:replace("Ab4ab","(ab)\\d\\1","&maeqL&K",[caseless])), 
+    <<"Ab4abmaeqLAb4abK">> = iolist_to_binary(re:replace("Ab4ab","(ab)\\d\\1","&maeqL&K",[caseless,
+                                                                                                                                                                                           global])), 
+    <<"AUMabjlQ">> = iolist_to_binary(re:replace("ab4Ab","(ab)\\d\\1","AUM\\1jlQ",[caseless])), 
+    <<"AUMabjlQ">> = iolist_to_binary(re:replace("ab4Ab","(ab)\\d\\1","AUM\\1jlQ",[caseless,
+                                                                                                                                                                                            global])), 
+    <<"XmYfoobar1234bazkhCJfoobar1234bazrE">> = iolist_to_binary(re:replace("foobar1234baz","foo\\w*\\d{4}baz","\\1\\1XmY&khCJ&rE",[])), 
+    <<"XmYfoobar1234bazkhCJfoobar1234bazrE">> = iolist_to_binary(re:replace("foobar1234baz","foo\\w*\\d{4}baz","\\1\\1XmY&khCJ&rE",[global])), 
+    <<"j">> = iolist_to_binary(re:replace("x~~","x(~~)*(?:(?:F)?)?","j",[])), 
+    <<"j">> = iolist_to_binary(re:replace("x~~","x(~~)*(?:(?:F)?)?","j",[global])), 
+    <<"dvmR">> = iolist_to_binary(re:replace("aaac","^a(?#xxx){3}c","dvmR",[])), 
+    <<"dvmR">> = iolist_to_binary(re:replace("aaac","^a(?#xxx){3}c","dvmR",[global])), 
+    <<"TcvCihggCC">> = iolist_to_binary(re:replace("aaac","^a (?#xxx) (?#yyy) {3}c","TcvCihggCC\\1",[extended])), 
+    <<"TcvCihggCC">> = iolist_to_binary(re:replace("aaac","^a (?#xxx) (?#yyy) {3}c","TcvCihggCC\\1",[extended,
+                                                                                                                                                                                                                          global])), 
+    ok.
+run29() ->
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<![cd])b","aDLvRLT\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<![cd])b","aDLvRLT\\1",[global])), 
+    <<"B
 B">> = iolist_to_binary(re:replace("B
-B","(?<![cd])b","ruaT\\1JrTa&\\1sLB&iVNCc",[])), 
-?line <<"B
+B","(?<![cd])b","&rX",[])), 
+    <<"B
 B">> = iolist_to_binary(re:replace("B
-B","(?<![cd])b","ruaT\\1JrTa&\\1sLB&iVNCc",[global])), 
-?line <<"dbcb">> = iolist_to_binary(re:replace("dbcb","(?<![cd])b","\\1l\\1yKVtpLoPXXvCkO",[])), 
-?line <<"dbcb">> = iolist_to_binary(re:replace("dbcb","(?<![cd])b","\\1l\\1yKVtpLoPXXvCkO",[global])), 
-?line <<"dbuWHWJTppUTaMYMjwHAacb">> = iolist_to_binary(re:replace("dbaacb","(?<![cd])[ab]","uWHWJTppUT&\\1MYM\\1jwHA",[])), 
-?line <<"dbuWHWJTppUTaMYMjwHAuWHWJTppUTaMYMjwHAcb">> = iolist_to_binary(re:replace("dbaacb","(?<![cd])[ab]","uWHWJTppUT&\\1MYM\\1jwHA",[global])), 
-?line <<"dbeacb">> = iolist_to_binary(re:replace("dbaacb","(?<!(c|d))[ab]","e",[])), 
-?line <<"dbeecb">> = iolist_to_binary(re:replace("dbaacb","(?<!(c|d))[ab]","e",[global])), 
-?line <<"cdaccbtNFbjDlrMmYMBg">> = iolist_to_binary(re:replace("cdaccb","(?<!cd)[ab]","\\1\\1btNF&jDlrM\\1mYMBg",[])), 
-?line <<"cdaccbtNFbjDlrMmYMBg">> = iolist_to_binary(re:replace("cdaccb","(?<!cd)[ab]","\\1\\1btNF&jDlrM\\1mYMBg",[global])), 
-?line <<"s">> = iolist_to_binary(re:replace("","^(?:a?b?)*$","s",[])), 
-?line <<"s">> = iolist_to_binary(re:replace("","^(?:a?b?)*$","s",[global])), 
-?line <<"odRhXAvKP">> = iolist_to_binary(re:replace("a","^(?:a?b?)*$","odRhXAvKP",[])), 
-?line <<"odRhXAvKP">> = iolist_to_binary(re:replace("a","^(?:a?b?)*$","odRhXAvKP",[global])), 
-?line <<"o">> = iolist_to_binary(re:replace("ab","^(?:a?b?)*$","\\1o",[])), 
-?line <<"o">> = iolist_to_binary(re:replace("ab","^(?:a?b?)*$","\\1o",[global])), 
-?line <<"d">> = iolist_to_binary(re:replace("aaa","^(?:a?b?)*$","d",[])), 
-?line <<"d">> = iolist_to_binary(re:replace("aaa","^(?:a?b?)*$","d",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?:a?b?)*$","fX&M\\1FCCOYOMH\\1lR&ISP",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?:a?b?)*$","fX&M\\1FCCOYOMH\\1lR&ISP",[global])), 
-?line <<"dbcb">> = iolist_to_binary(re:replace("dbcb","^(?:a?b?)*$","d\\1aeAWVouRdylpC",[])), 
-?line <<"dbcb">> = iolist_to_binary(re:replace("dbcb","^(?:a?b?)*$","d\\1aeAWVouRdylpC",[global])), 
-?line <<"a--">> = iolist_to_binary(re:replace("a--","^(?:a?b?)*$","uM",[])), 
-?line <<"a--">> = iolist_to_binary(re:replace("a--","^(?:a?b?)*$","uM",[global])), 
-?line <<"aa--">> = iolist_to_binary(re:replace("aa--","^(?:a?b?)*$","EhSvb&jryIv\\1O&oeR",[])), 
-?line <<"aa--">> = iolist_to_binary(re:replace("aa--","^(?:a?b?)*$","EhSvb&jryIv\\1O&oeR",[global])), 
-?line <<"yobOa
-ba
-ca
-bcItPS
+B","(?<![cd])b","&rX",[global])), 
+    <<"dbcb">> = iolist_to_binary(re:replace("dbcb","(?<![cd])b","RAdHe",[])), 
+    <<"dbcb">> = iolist_to_binary(re:replace("dbcb","(?<![cd])b","RAdHe",[global])), 
+    <<"dbLDvFpkRnyKFiqpapacb">> = iolist_to_binary(re:replace("dbaacb","(?<![cd])[ab]","LDvFpkRnyKFiqpap",[])), 
+    <<"dbLDvFpkRnyKFiqpapLDvFpkRnyKFiqpapcb">> = iolist_to_binary(re:replace("dbaacb","(?<![cd])[ab]","LDvFpkRnyKFiqpap",[global])), 
+    <<"dbpCgFRSanfBwdBHacb">> = iolist_to_binary(re:replace("dbaacb","(?<!(c|d))[ab]","pCgFRS&\\1nfBwdBH",[])), 
+    <<"dbpCgFRSanfBwdBHpCgFRSanfBwdBHcb">> = iolist_to_binary(re:replace("dbaacb","(?<!(c|d))[ab]","pCgFRS&\\1nfBwdBH",[global])), 
+    <<"cdaccJYb">> = iolist_to_binary(re:replace("cdaccb","(?<!cd)[ab]","J\\1Yb",[])), 
+    <<"cdaccJYb">> = iolist_to_binary(re:replace("cdaccb","(?<!cd)[ab]","J\\1Yb",[global])), 
+    <<"QQBKENcxCtDv">> = iolist_to_binary(re:replace("","^(?:a?b?)*$","\\1&QQ\\1BKENcxCtD&v",[])), 
+    <<"QQBKENcxCtDv">> = iolist_to_binary(re:replace("","^(?:a?b?)*$","\\1&QQ\\1BKENcxCtD&v",[global])), 
+    <<"EUVqGakpKtkaa">> = iolist_to_binary(re:replace("a","^(?:a?b?)*$","EUVqG&kp\\1\\1Ktk&&",[])), 
+    <<"EUVqGakpKtkaa">> = iolist_to_binary(re:replace("a","^(?:a?b?)*$","EUVqG&kp\\1\\1Ktk&&",[global])), 
+    <<"PJebYabVrwtUnyyi">> = iolist_to_binary(re:replace("ab","^(?:a?b?)*$","PJebY&Vrw\\1tUnyyi",[])), 
+    <<"PJebYabVrwtUnyyi">> = iolist_to_binary(re:replace("ab","^(?:a?b?)*$","PJebY&Vrw\\1tUnyyi",[global])), 
+    <<"TaaaaJgnBHpNaaaqW">> = iolist_to_binary(re:replace("aaa","^(?:a?b?)*$","Ta&JgnBHpN&qW",[])), 
+    <<"TaaaaJgnBHpNaaaqW">> = iolist_to_binary(re:replace("aaa","^(?:a?b?)*$","Ta&JgnBHpN&qW",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?:a?b?)*$","s",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?:a?b?)*$","s",[global])), 
+    <<"dbcb">> = iolist_to_binary(re:replace("dbcb","^(?:a?b?)*$","D",[])), 
+    <<"dbcb">> = iolist_to_binary(re:replace("dbcb","^(?:a?b?)*$","D",[global])), 
+    <<"a--">> = iolist_to_binary(re:replace("a--","^(?:a?b?)*$","xqeccmA\\1PK&\\1j\\1QcQv&",[])), 
+    <<"a--">> = iolist_to_binary(re:replace("a--","^(?:a?b?)*$","xqeccmA\\1PK&\\1j\\1QcQv&",[global])), 
+    <<"aa--">> = iolist_to_binary(re:replace("aa--","^(?:a?b?)*$","&y&JYUp&omM",[])), 
+    <<"aa--">> = iolist_to_binary(re:replace("aa--","^(?:a?b?)*$","&y&JYUp&omM",[global])), 
+    <<"suK
 c">> = iolist_to_binary(re:replace("a
 b
-c","((?s)^a(.))((?m)^b$)","yobO&\\1c&cItPS",[])), 
-?line <<"yobOa
-ba
-ca
-bcItPS
+c","((?s)^a(.))((?m)^b$)","suK",[])), 
+    <<"suK
 c">> = iolist_to_binary(re:replace("a
 b
-c","((?s)^a(.))((?m)^b$)","yobO&\\1c&cItPS",[global])), 
-?line <<"a
-EBbPgb
+c","((?s)^a(.))((?m)^b$)","suK",[global])), 
+    <<"a
+bsbrmbHobdxBbb
 c">> = iolist_to_binary(re:replace("a
 b
-c","((?m)^b$)","EB\\1Pg\\1",[])), 
-?line <<"a
-EBbPgb
+c","((?m)^b$)","\\1s&rm\\1Ho&dxB&\\1",[])), 
+    <<"a
+bsbrmbHobdxBbb
 c">> = iolist_to_binary(re:replace("a
 b
-c","((?m)^b$)","EB\\1Pg\\1",[global])), 
-?line <<"a
-AybVFSWPOkP">> = iolist_to_binary(re:replace("a
-b","(?m)^b","Ay\\1&VF\\1SWPOkP\\1",[])), 
-?line <<"a
-AybVFSWPOkP">> = iolist_to_binary(re:replace("a
-b","(?m)^b","Ay\\1&VF\\1SWPOkP\\1",[global])), 
-?line <<"a
-bbTbKbl">> = iolist_to_binary(re:replace("a
-b","(?m)^(b)","b\\1T&K\\1l",[])), 
-?line <<"a
-bbTbKbl">> = iolist_to_binary(re:replace("a
-b","(?m)^(b)","b\\1T&K\\1l",[global])), 
-?line <<"a
-bsyUb">> = iolist_to_binary(re:replace("a
-b","((?m)^b)","&syU\\1",[])), 
-?line <<"a
-bsyUb">> = iolist_to_binary(re:replace("a
-b","((?m)^b)","&syU\\1",[global])), 
-?line <<"abh">> = iolist_to_binary(re:replace("a
-b","\\n((?m)^b)","\\1h",[])), 
-?line <<"abh">> = iolist_to_binary(re:replace("a
-b","\\n((?m)^b)","\\1h",[global])), 
-?line <<"a
-bEu">> = iolist_to_binary(re:replace("a
+c","((?m)^b$)","\\1s&rm\\1Ho&dxB&\\1",[global])), 
+    <<"a
+DbLxnGxIyQMiaCJKYa">> = iolist_to_binary(re:replace("a
+b","(?m)^b","D&LxnGxIyQMiaCJKYa\\1",[])), 
+    <<"a
+DbLxnGxIyQMiaCJKYa">> = iolist_to_binary(re:replace("a
+b","(?m)^b","D&LxnGxIyQMiaCJKYa\\1",[global])), 
+    <<"a
+TbTgrAWgAV">> = iolist_to_binary(re:replace("a
+b","(?m)^(b)","T\\1TgrAWgAV",[])), 
+    <<"a
+TbTgrAWgAV">> = iolist_to_binary(re:replace("a
+b","(?m)^(b)","T\\1TgrAWgAV",[global])), 
+    <<"a
+KvbbbEUIbCFmvpdpI">> = iolist_to_binary(re:replace("a
+b","((?m)^b)","Kv\\1&&EUI&CFmvpdpI",[])), 
+    <<"a
+KvbbbEUIbCFmvpdpI">> = iolist_to_binary(re:replace("a
+b","((?m)^b)","Kv\\1&&EUI&CFmvpdpI",[global])), 
+    <<"amFIqrSY
+bYBDTRTmIb">> = iolist_to_binary(re:replace("a
+b","\\n((?m)^b)","mFIqrSY&YBDTRTmI\\1",[])), 
+    <<"amFIqrSY
+bYBDTRTmIb">> = iolist_to_binary(re:replace("a
+b","\\n((?m)^b)","mFIqrSY&YBDTRTmI\\1",[global])), 
+    <<"a
+bGyvT
+WAEIfT
+">> = iolist_to_binary(re:replace("a
 b
-c","((?s).)c(?!.)","Eu",[])), 
-?line <<"a
-bEu">> = iolist_to_binary(re:replace("a
+c","((?s).)c(?!.)","GyvT\\1WAEIfT\\1",[])), 
+    <<"a
+bGyvT
+WAEIfT
+">> = iolist_to_binary(re:replace("a
 b
-c","((?s).)c(?!.)","Eu",[global])), 
-?line <<"a
-bvKqN
-cF
-r
-n">> = iolist_to_binary(re:replace("a
+c","((?s).)c(?!.)","GyvT\\1WAEIfT\\1",[global])), 
+    <<"a
+bu
+
+ciY
+ONSatC
+q
+cgqg">> = iolist_to_binary(re:replace("a
 b
-c","((?s).)c(?!.)","vKqN&F\\1r\\1n",[])), 
-?line <<"a
-bvKqN
-cF
-r
-n">> = iolist_to_binary(re:replace("a
+c","((?s).)c(?!.)","u\\1&iY\\1ONSatC\\1q&gqg",[])), 
+    <<"a
+bu
+
+ciY
+ONSatC
+q
+cgqg">> = iolist_to_binary(re:replace("a
 b
-c","((?s).)c(?!.)","vKqN&F\\1r\\1n",[global])), 
-?line <<"a
-ctWb
-Kb
-cinb
-FvJ">> = iolist_to_binary(re:replace("a
+c","((?s).)c(?!.)","u\\1&iY\\1ONSatC\\1q&gqg",[global])), 
+    <<"a
+EaHhNb
+cc">> = iolist_to_binary(re:replace("a
 b
-c","((?s)b.)c(?!.)","ctW\\1K&in\\1FvJ",[])), 
-?line <<"a
-ctWb
-Kb
-cinb
-FvJ">> = iolist_to_binary(re:replace("a
+c","((?s)b.)c(?!.)","EaHhN&c",[])), 
+    <<"a
+EaHhNb
+cc">> = iolist_to_binary(re:replace("a
 b
-c","((?s)b.)c(?!.)","ctW\\1K&in\\1FvJ",[global])), 
-?line <<"a
-Tb
-cnVEJvb
-Bb
-yG">> = iolist_to_binary(re:replace("a
+c","((?s)b.)c(?!.)","EaHhN&c",[global])), 
+    <<"a
+Qyf">> = iolist_to_binary(re:replace("a
 b
-c","((?s)b.)c(?!.)","T&nVEJv\\1B\\1yG",[])), 
-?line <<"a
-Tb
-cnVEJvb
-Bb
-yG">> = iolist_to_binary(re:replace("a
+c","((?s)b.)c(?!.)","Qyf",[])), 
+    <<"a
+Qyf">> = iolist_to_binary(re:replace("a
 b
-c","((?s)b.)c(?!.)","T&nVEJv\\1B\\1yG",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","()^b","&\\1",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","()^b","&\\1",[global])), 
-?line <<"a
+c","((?s)b.)c(?!.)","Qyf",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","()^b","uPupHDfyOM",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","()^b","uPupHDfyOM",[global])), 
+    <<"a
 b
 c">> = iolist_to_binary(re:replace("a
 b
-c","()^b","ikT\\1",[])), 
-?line <<"a
+c","()^b","ie",[])), 
+    <<"a
 b
 c">> = iolist_to_binary(re:replace("a
 b
-c","()^b","ikT\\1",[global])), 
-?line <<"a
+c","()^b","ie",[global])), 
+    <<"a
 b
 c">> = iolist_to_binary(re:replace("a
 b
-c","()^b","&i&frU",[])), 
-?line <<"a
+c","()^b","XOjtYTE&",[])), 
+    <<"a
 b
 c">> = iolist_to_binary(re:replace("a
 b
-c","()^b","&i&frU",[global])), 
-?line <<"a
-bDbfDWKbixbSbxsSN
+c","()^b","XOjtYTE&",[global])), 
+    <<"a
+up
 c">> = iolist_to_binary(re:replace("a
 b
-c","((?m)^b)","bD\\1fDWK\\1ix\\1S\\1xsSN",[])), 
-?line <<"a
-bDbfDWKbixbSbxsSN
+c","((?m)^b)","up",[])), 
+    <<"a
+up
 c">> = iolist_to_binary(re:replace("a
 b
-c","((?m)^b)","bD\\1fDWK\\1ix\\1S\\1xsSN",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(x)?(?(1)a|b)","s&Rt",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(x)?(?(1)a|b)","s&Rt",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","S\\1EQcXTxxFE",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","S\\1EQcXTxxFE",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","JRHc\\1hvpt&&",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","JRHc\\1hvpt&&",[global])), 
-?line <<"bQs">> = iolist_to_binary(re:replace("a","(x)?(?(1)b|a)","bQs",[])), 
-?line <<"bQs">> = iolist_to_binary(re:replace("a","(x)?(?(1)b|a)","bQs",[global])), 
-?line <<"PQeYprqargqfYkWQsJ">> = iolist_to_binary(re:replace("a","()?(?(1)b|a)","PQeY\\1prq&rgqfYk\\1WQsJ",[])), 
-?line <<"PQeYprqargqfYkWQsJ">> = iolist_to_binary(re:replace("a","()?(?(1)b|a)","PQeY\\1prq&rgqfYk\\1WQsJ",[global])), 
-?line <<"HafNdwOXAFq">> = iolist_to_binary(re:replace("a","()?(?(1)a|b)","H&\\1f\\1NdwOXA\\1Fq",[])), 
-?line <<"HafNdwOXAFq">> = iolist_to_binary(re:replace("a","()?(?(1)a|b)","H&\\1f\\1NdwOXA\\1Fq",[global])), 
-?line <<"m">> = iolist_to_binary(re:replace("(blah)","^(\\()?blah(?(1)(\\)))$","m",[])), 
-?line <<"m">> = iolist_to_binary(re:replace("(blah)","^(\\()?blah(?(1)(\\)))$","m",[global])), 
-?line <<"elEwHf">> = iolist_to_binary(re:replace("blah","^(\\()?blah(?(1)(\\)))$","elEwHf",[])), 
-?line <<"elEwHf">> = iolist_to_binary(re:replace("blah","^(\\()?blah(?(1)(\\)))$","elEwHf",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\()?blah(?(1)(\\)))$","IGewW&v&qpGlghCJe\\1Y",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\()?blah(?(1)(\\)))$","IGewW&v&qpGlghCJe\\1Y",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","^(\\()?blah(?(1)(\\)))$","mxf",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","^(\\()?blah(?(1)(\\)))$","mxf",[global])), 
-?line <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\()?blah(?(1)(\\)))$","LxtdV",[])), 
-?line <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\()?blah(?(1)(\\)))$","LxtdV",[global])), 
-?line <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\()?blah(?(1)(\\)))$","Ni\\1CkEtaxcXXYB\\1",[])), 
-?line <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\()?blah(?(1)(\\)))$","Ni\\1CkEtaxcXXYB\\1",[global])), 
-?line <<"UaAfN(ELb">> = iolist_to_binary(re:replace("(blah)","^(\\(+)?blah(?(1)(\\)))$","UaAfN\\1ELb",[])), 
-?line <<"UaAfN(ELb">> = iolist_to_binary(re:replace("(blah)","^(\\(+)?blah(?(1)(\\)))$","UaAfN\\1ELb",[global])), 
-?line <<"XrxQosMn">> = iolist_to_binary(re:replace("blah","^(\\(+)?blah(?(1)(\\)))$","Xrx\\1QosMn\\1",[])), 
-?line <<"XrxQosMn">> = iolist_to_binary(re:replace("blah","^(\\(+)?blah(?(1)(\\)))$","Xrx\\1QosMn\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\(+)?blah(?(1)(\\)))$","QGGpmf",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\(+)?blah(?(1)(\\)))$","QGGpmf",[global])), 
-?line <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\(+)?blah(?(1)(\\)))$","HDFROCUS",[])), 
-?line <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\(+)?blah(?(1)(\\)))$","HDFROCUS",[global])), 
-?line <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\(+)?blah(?(1)(\\)))$","AVrY",[])), 
-?line <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\(+)?blah(?(1)(\\)))$","AVrY",[global])), 
-?line <<"HlgBXckVbhp">> = iolist_to_binary(re:replace("a","(?(?!a)b|a)","HlgBXckV\\1bhp",[])), 
-?line <<"HlgBXckVbhp">> = iolist_to_binary(re:replace("a","(?(?!a)b|a)","HlgBXckV\\1bhp",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=a)b|a)","&&PIwfc\\1cckXSEYaB",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=a)b|a)","&&PIwfc\\1cckXSEYaB",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","vKjGNVI&ySCYE",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","vKjGNVI&ySCYE",[global])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","lAvpym&eEJad\\1RMs\\1CLu",[])), 
-?line <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","lAvpym&eEJad\\1RMs\\1CLu",[global])), 
-?line <<"kHAy">> = iolist_to_binary(re:replace("a","(?(?=a)a|b)","kHAy",[])), 
-?line <<"kHAy">> = iolist_to_binary(re:replace("a","(?(?=a)a|b)","kHAy",[global])), 
-?line <<"amAyaheaaTPJaVdTAyU">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","mAyahe\\1\\1TPJ\\1VdTAyU",[])), 
-?line <<"amAyaheaaTPJaVdTAyU">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","mAyahe\\1\\1TPJ\\1VdTAyU",[global])), 
-?line <<"pEvYFTwEOhhryoVdG">> = iolist_to_binary(re:replace("one:","(\\w+:)+","pEvYFTwEOhhryoVdG",[])), 
-?line <<"pEvYFTwEOhhryoVdG">> = iolist_to_binary(re:replace("one:","(\\w+:)+","pEvYFTwEOhhryoVdG",[global])), 
-?line <<"aHho">> = iolist_to_binary(re:replace("a","$(?<=^(a))","Hho",[])), 
-?line <<"aHho">> = iolist_to_binary(re:replace("a","$(?<=^(a))","Hho",[global])), 
-?line <<"ajuOkagipUraRpaQiaabv">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","juOk\\1gipUr\\1Rp\\1Qi&v",[])), 
-?line <<"ajuOkagipUraRpaQiaabv">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","juOk\\1gipUr\\1Rp\\1Qi&v",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?=(a+?))\\1ab","g\\1\\1\\1v",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?=(a+?))\\1ab","g\\1\\1\\1v",[global])), 
-?line <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","dj\\1E&",[])), 
-?line <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","dj\\1E&",[global])), 
-?line <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","\\1UllJHtwTvaUdSmur",[])), 
-?line <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","\\1UllJHtwTvaUdSmur",[global])), 
-?line <<"juabcdvJAqaNxcabcdrDs">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","ju&vJAqaNxc&rDs\\1",[])), 
-?line <<"juabcdvJAqaNxcabcdrDs">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","ju&vJAqaNxc&rDs\\1",[global])), 
-?line <<"unOWEMklEbRjSO">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","unOWEMklEbRjSO",[])), 
-?line <<"unOWEMklEbRjSO">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","unOWEMklEbRjSO",[global])), 
-?line <<"nGqSeaexycfAmCxmxEaexycd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","nGqSe&fAmCxmxE&",[])), 
-?line <<"nGqSeaexycfAmCxmxEaexycd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","nGqSe&fAmCxmxE&",[global])), 
-?line <<"cwK">> = iolist_to_binary(re:replace("caab","(a*)b+","wK",[])), 
-?line <<"cwK">> = iolist_to_binary(re:replace("caab","(a*)b+","wK",[global])), 
-?line <<"VKunDTpabcd">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","VKunD\\1Tp&",[])), 
-?line <<"VKunDTpabcd">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","VKunD\\1Tp&",[global])), 
-?line <<"xy:z:::SXxy:z:::cMHreuKxy:z:::">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","\\1SX\\1cMHreuK\\1",[])), 
-?line <<"xy:z:::SXxy:z:::cMHreuKxy:z:::">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","\\1SX\\1cMHreuK\\1",[global])), 
-?line <<"*** FhLAjVJbYFailersvFailersQgrO">> = iolist_to_binary(re:replace("*** Failers","([\\w:]+::)?(\\w+)$","FhLAjVJbY&v&QgrO\\1\\1",[])), 
-?line <<"*** FhLAjVJbYFailersvFailersQgrO">> = iolist_to_binary(re:replace("*** Failers","([\\w:]+::)?(\\w+)$","FhLAjVJbY&v&QgrO\\1\\1",[global])), 
-?line <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","cwV&UpGIKN",[])), 
-?line <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","cwV&UpGIKN",[global])), 
-?line <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","S",[])), 
-?line <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","S",[global])), 
-?line <<"Fd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","F",[])), 
-?line <<"Fd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","F",[global])), 
-?line <<"jBpBHQR">> = iolist_to_binary(re:replace("aaab","(?>a+)b","jBpBHQR",[])), 
-?line <<"jBpBHQR">> = iolist_to_binary(re:replace("aaab","(?>a+)b","jBpBHQR",[global])), 
-?line <<"a:[J:[:[UyJMIwrPUq:[b]:">> = iolist_to_binary(re:replace("a:[b]:","([[:]+)","\\1J&\\1UyJMIwrPUq\\1",[])), 
-?line <<"a:[J:[:[UyJMIwrPUq:[b]:J::UyJMIwrPUq:">> = iolist_to_binary(re:replace("a:[b]:","([[:]+)","\\1J&\\1UyJMIwrPUq\\1",[global])), 
-?line <<"asI=[vo=[d=[Y=[nMpb]=">> = iolist_to_binary(re:replace("a=[b]=","([[=]+)","sI\\1vo\\1d\\1Y&nMp",[])), 
-?line <<"asI=[vo=[d=[Y=[nMpb]sI=vo=d=Y=nMp">> = iolist_to_binary(re:replace("a=[b]=","([[=]+)","sI\\1vo\\1d\\1Y&nMp",[global])), 
-?line <<"aChCrrVW.[ed.[eo.[h.[SYkIb].">> = iolist_to_binary(re:replace("a.[b].","([[.]+)","ChCrrVW\\1ed&eo\\1h\\1SYkI",[])), 
-?line <<"aChCrrVW.[ed.[eo.[h.[SYkIb]ChCrrVW.ed.eo.h.SYkI">> = iolist_to_binary(re:replace("a.[b].","([[.]+)","ChCrrVW\\1ed&eo\\1h\\1SYkI",[global])), 
-?line <<"BaaabaaabGBaaabJDn">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","B&\\1GB&JDn",[])), 
-?line <<"BaaabaaabGBaaabJDn">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","B&\\1GB&JDn",[global])), 
-?line <<"kaaabsaaXdPWUBV">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","k&saaXdPWUBV",[])), 
-?line <<"kaaabsaaXdPWUBV">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","k&saaXdPWUBV",[global])), 
-?line <<"((xpOHCg">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","\\1pOHCg",[])), 
-?line <<"((xpOHCg">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","\\1pOHCg",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Z","swCtIfMPh&\\1Yr",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Z","swCtIfMPh&\\1Yr",[global])), 
-?line <<"aaab">> = iolist_to_binary(re:replace("aaab","a\\Z","ysA\\1",[])), 
-?line <<"aaab">> = iolist_to_binary(re:replace("aaab","a\\Z","ysA\\1",[global])), 
-?line <<"a
+c","((?m)^b)","up",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(x)?(?(1)a|b)","Q&VpBvd&HCANVl",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(x)?(?(1)a|b)","Q&VpBvd&HCANVl",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","PJENMvR\\1&\\1nkq\\1j&P&",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","PJENMvR\\1&\\1nkq\\1j&P&",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","hStdV\\1o",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(x)?(?(1)a|b)","hStdV\\1o",[global])), 
+    <<"bpiiYpjmbL">> = iolist_to_binary(re:replace("a","(x)?(?(1)b|a)","bpiiYpjmbL",[])), 
+    <<"bpiiYpjmbL">> = iolist_to_binary(re:replace("a","(x)?(?(1)b|a)","bpiiYpjmbL",[global])), 
+    <<"ldpcm">> = iolist_to_binary(re:replace("a","()?(?(1)b|a)","ldpc\\1m",[])), 
+    <<"ldpcm">> = iolist_to_binary(re:replace("a","()?(?(1)b|a)","ldpc\\1m",[global])), 
+    ok.
+run30() ->
+    <<"XVaoQoPYY">> = iolist_to_binary(re:replace("a","()?(?(1)a|b)","\\1X\\1V&oQoPYY",[])), 
+    <<"XVaoQoPYY">> = iolist_to_binary(re:replace("a","()?(?(1)a|b)","\\1X\\1V&oQoPYY",[global])), 
+    <<"NIfcW(blah)G">> = iolist_to_binary(re:replace("(blah)","^(\\()?blah(?(1)(\\)))$","NIfcW&G",[])), 
+    <<"NIfcW(blah)G">> = iolist_to_binary(re:replace("(blah)","^(\\()?blah(?(1)(\\)))$","NIfcW&G",[global])), 
+    <<"pnblahSJOoELoLblah">> = iolist_to_binary(re:replace("blah","^(\\()?blah(?(1)(\\)))$","pn&SJOoELoL&",[])), 
+    <<"pnblahSJOoELoLblah">> = iolist_to_binary(re:replace("blah","^(\\()?blah(?(1)(\\)))$","pn&SJOoELoL&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\()?blah(?(1)(\\)))$","&qo&jitI",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\()?blah(?(1)(\\)))$","&qo&jitI",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(\\()?blah(?(1)(\\)))$","nvEsX\\1dtIq",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(\\()?blah(?(1)(\\)))$","nvEsX\\1dtIq",[global])), 
+    <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\()?blah(?(1)(\\)))$","QkLbrxtPSiEFXY",[])), 
+    <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\()?blah(?(1)(\\)))$","QkLbrxtPSiEFXY",[global])), 
+    <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\()?blah(?(1)(\\)))$","lAP",[])), 
+    <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\()?blah(?(1)(\\)))$","lAP",[global])), 
+    <<"(LsJwkbg(bfkt(NulbXR">> = iolist_to_binary(re:replace("(blah)","^(\\(+)?blah(?(1)(\\)))$","\\1LsJwkbg\\1bfkt\\1NulbXR",[])), 
+    <<"(LsJwkbg(bfkt(NulbXR">> = iolist_to_binary(re:replace("(blah)","^(\\(+)?blah(?(1)(\\)))$","\\1LsJwkbg\\1bfkt\\1NulbXR",[global])), 
+    <<"d">> = iolist_to_binary(re:replace("blah","^(\\(+)?blah(?(1)(\\)))$","\\1d",[])), 
+    <<"d">> = iolist_to_binary(re:replace("blah","^(\\(+)?blah(?(1)(\\)))$","\\1d",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\(+)?blah(?(1)(\\)))$","EMgTAXywJ\\1sx",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\(+)?blah(?(1)(\\)))$","EMgTAXywJ\\1sx",[global])), 
+    <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\(+)?blah(?(1)(\\)))$","LdpE",[])), 
+    <<"blah)">> = iolist_to_binary(re:replace("blah)","^(\\(+)?blah(?(1)(\\)))$","LdpE",[global])), 
+    <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\(+)?blah(?(1)(\\)))$","x",[])), 
+    <<"(blah">> = iolist_to_binary(re:replace("(blah","^(\\(+)?blah(?(1)(\\)))$","x",[global])), 
+    <<"DTG">> = iolist_to_binary(re:replace("a","(?(?!a)b|a)","DT\\1G\\1",[])), 
+    <<"DTG">> = iolist_to_binary(re:replace("a","(?(?!a)b|a)","DT\\1G\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=a)b|a)","d\\1lnf&YLYNM",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?(?=a)b|a)","d\\1lnf&YLYNM",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","\\1SGC\\1&hP&OBDNrG",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","\\1SGC\\1&hP&OBDNrG",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","\\1O",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(?(?=a)b|a)","\\1O",[global])), 
+    <<"ToKaPapJTYo">> = iolist_to_binary(re:replace("a","(?(?=a)a|b)","\\1ToKaP&pJTYo",[])), 
+    <<"ToKaPapJTYo">> = iolist_to_binary(re:replace("a","(?(?=a)a|b)","\\1ToKaP&pJTYo",[global])), 
+    <<"aaYfA">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","\\1YfA",[])), 
+    <<"aaYfA">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","\\1YfA",[global])), 
+    <<"Oone:LVumwJGPxKone:">> = iolist_to_binary(re:replace("one:","(\\w+:)+","O&LVumwJGPxK\\1",[])), 
+    <<"Oone:LVumwJGPxKone:">> = iolist_to_binary(re:replace("one:","(\\w+:)+","O&LVumwJGPxK\\1",[global])), 
+    <<"axOGBQtmfLikDGlXSft">> = iolist_to_binary(re:replace("a","$(?<=^(a))","xOGBQtmfLikDGlXSft",[])), 
+    <<"axOGBQtmfLikDGlXSft">> = iolist_to_binary(re:replace("a","$(?<=^(a))","xOGBQtmfLikDGlXSft",[global])), 
+    <<"auQKtSaabLmmqtekWvRQaWJ">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","uQKtS&LmmqtekWvRQ\\1WJ",[])), 
+    <<"auQKtSaabLmmqtekWvRQaWJ">> = iolist_to_binary(re:replace("aaab","(?=(a+?))(\\1ab)","uQKtS&LmmqtekWvRQ\\1WJ",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?=(a+?))\\1ab","&&USoct\\1R",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?=(a+?))\\1ab","&&USoct\\1R",[global])), 
+    <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","nNyoTw&TuS\\1oXos",[])), 
+    <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","nNyoTw&TuS\\1oXos",[global])), 
+    <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","MAutXFUx",[])), 
+    <<"aaab">> = iolist_to_binary(re:replace("aaab","^(?=(a+?))\\1ab","MAutXFUx",[global])), 
+    <<"cXabcdPLyeVVq">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","c\\1X&\\1PLyeV\\1Vq",[])), 
+    <<"cXabcdPLyeVVq">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","c\\1X&\\1PLyeV\\1Vq",[global])), 
+    <<"jxy:z:::abcdYDxy:z:::Ixy:z:::abcdA">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","j&YD\\1I&A",[])), 
+    <<"jxy:z:::abcdYDxy:z:::Ixy:z:::abcdA">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","j&YD\\1I&A",[global])), 
+    <<"IbkqaaexycIVtbd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","Ibkqa&IVtb",[])), 
+    <<"IbkqaaexycIVtbd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","Ibkqa&IVtb",[global])), 
+    <<"cSLuXFBaavfbUaahyxuWowk">> = iolist_to_binary(re:replace("caab","(a*)b+","SLuXFB\\1vfbU\\1hyxuWowk",[])), 
+    <<"cSLuXFBaavfbUaahyxuWowk">> = iolist_to_binary(re:replace("caab","(a*)b+","SLuXFB\\1vfbU\\1hyxuWowk",[global])), 
+    <<"n">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","n",[])), 
+    <<"n">> = iolist_to_binary(re:replace("abcd","([\\w:]+::)?(\\w+)$","n",[global])), 
+    <<"xy:z:::abcdSfCyKxy:z:::abcdxy:z:::rOIxy:z:::qaXJV">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","&SfCyK&\\1rOI\\1qaXJV",[])), 
+    <<"xy:z:::abcdSfCyKxy:z:::abcdxy:z:::rOIxy:z:::qaXJV">> = iolist_to_binary(re:replace("xy:z:::abcd","([\\w:]+::)?(\\w+)$","&SfCyK&\\1rOI\\1qaXJV",[global])), 
+    <<"*** FDIubo">> = iolist_to_binary(re:replace("*** Failers","([\\w:]+::)?(\\w+)$","FDIubo",[])), 
+    <<"*** FDIubo">> = iolist_to_binary(re:replace("*** Failers","([\\w:]+::)?(\\w+)$","FDIubo",[global])), 
+    <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","\\1\\1FqKhObWFBLnW",[])), 
+    <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","\\1\\1FqKhObWFBLnW",[global])), 
+    <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","\\1\\1\\1JSX&vwHeWnyicJH",[])), 
+    <<"abcd:">> = iolist_to_binary(re:replace("abcd:","([\\w:]+::)?(\\w+)$","\\1\\1\\1JSX&vwHeWnyicJH",[global])), 
+    <<"bsuraexycHejcJAclcd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","bsur&HejcJA\\1l\\1",[])), 
+    <<"bsuraexycHejcJAclcd">> = iolist_to_binary(re:replace("aexycd","^[^bcd]*(c+)","bsur&HejcJA\\1l\\1",[global])), 
+    ok.
+run31() ->
+    <<"C">> = iolist_to_binary(re:replace("aaab","(?>a+)b","\\1C",[])), 
+    <<"C">> = iolist_to_binary(re:replace("aaab","(?>a+)b","\\1C",[global])), 
+    <<"aNO:[pGn:[:[Hb]:">> = iolist_to_binary(re:replace("a:[b]:","([[:]+)","NO\\1pGn&\\1H",[])), 
+    <<"aNO:[pGn:[:[Hb]NO:pGn::H">> = iolist_to_binary(re:replace("a:[b]:","([[:]+)","NO\\1pGn&\\1H",[global])), 
+    <<"aUSAUCBri=[uNyXKFxsgAib]=">> = iolist_to_binary(re:replace("a=[b]=","([[=]+)","USAUCBri&uNyXKFxsgAi",[])), 
+    <<"aUSAUCBri=[uNyXKFxsgAib]USAUCBri=uNyXKFxsgAi">> = iolist_to_binary(re:replace("a=[b]=","([[=]+)","USAUCBri&uNyXKFxsgAi",[global])), 
+    <<"alNmxCu.[.[iUB.[.[b].">> = iolist_to_binary(re:replace("a.[b].","([[.]+)","lNmxCu&&iUB&\\1",[])), 
+    <<"alNmxCu.[.[iUB.[.[b]lNmxCu..iUB..">> = iolist_to_binary(re:replace("a.[b].","([[.]+)","lNmxCu&&iUB&\\1",[global])), 
+    <<"gGaaab">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","gG&",[])), 
+    <<"gGaaab">> = iolist_to_binary(re:replace("aaab","((?>a+)b)","gG&",[global])), 
+    <<"XaaaSaaaFUaaabJnaaabMCaaabedCQAgh">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","X\\1S\\1FU&Jn&MC&edCQAgh",[])), 
+    <<"XaaaSaaaFUaaabJnaaabMCaaabedCQAgh">> = iolist_to_binary(re:replace("aaab","(?>(a+))b","X\\1S\\1FU&Jn&MC&edCQAgh",[global])), 
+    <<"((nxgvJb">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","n\\1gvJb",[])), 
+    <<"((nxgvJb">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+","n\\1gvJb",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Z","dnHcIc\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a\\Z","dnHcIc\\1",[global])), 
+    <<"aaab">> = iolist_to_binary(re:replace("aaab","a\\Z","TMH",[])), 
+    <<"aaab">> = iolist_to_binary(re:replace("aaab","a\\Z","TMH",[global])), 
+    <<"a
 b">> = iolist_to_binary(re:replace("a
-b","a\\Z","&ajAlqYVsnk",[])), 
-?line <<"a
+b","a\\Z","Dt\\1LIek",[])), 
+    <<"a
 b">> = iolist_to_binary(re:replace("a
-b","a\\Z","&ajAlqYVsnk",[global])), 
-?line <<"a
-lKbbBrmbgrOVeW">> = iolist_to_binary(re:replace("a
-b","b\\Z","l\\1Kb&Brm&gr\\1OVeW",[])), 
-?line <<"a
-lKbbBrmbgrOVeW">> = iolist_to_binary(re:replace("a
-b","b\\Z","l\\1Kb&Brm&gr\\1OVeW",[global])), 
-?line <<"a
-gnI">> = iolist_to_binary(re:replace("a
-b","b\\Z","g\\1nI",[])), 
-?line <<"a
-gnI">> = iolist_to_binary(re:replace("a
-b","b\\Z","g\\1nI",[global])), 
-?line <<"a
-bcbdqlbVGu">> = iolist_to_binary(re:replace("a
-b","b\\z","bc&dql&VGu\\1",[])), 
-?line <<"a
-bcbdqlbVGu">> = iolist_to_binary(re:replace("a
-b","b\\z","bc&dql&VGu\\1",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","b\\z","e\\1yg",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","b\\z","e\\1yg",[global])), 
-?line <<"ad">> = iolist_to_binary(re:replace("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","&d",[])), 
-?line <<"ad">> = iolist_to_binary(re:replace("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","&d",[global])), 
-?line <<"Aq">> = iolist_to_binary(re:replace("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","Aq",[])), 
-?line <<"Aq">> = iolist_to_binary(re:replace("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","Aq",[global])), 
-?line <<"ca-ba-bhLfWdPLa-boe">> = iolist_to_binary(re:replace("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","c&&hLfWdPL&oe",[])), 
-?line <<"ca-ba-bhLfWdPLa-boe">> = iolist_to_binary(re:replace("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","c&&hLfWdPL&oe",[global])), 
-?line <<"0-90-9YeqrpXMpBjK">> = iolist_to_binary(re:replace("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","&\\1&YeqrpXMpBjK",[])), 
-?line <<"0-90-9YeqrpXMpBjK">> = iolist_to_binary(re:replace("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","&\\1&YeqrpXMpBjK",[global])), 
-?line <<"fa.bPwKXcUgqjJm">> = iolist_to_binary(re:replace("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1f&PwKX\\1cUgqjJm",[])), 
-?line <<"fa.bPwKXcUgqjJm">> = iolist_to_binary(re:replace("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1f&PwKX\\1cUgqjJm",[global])), 
-?line <<"um5.6.7cFpS">> = iolist_to_binary(re:replace("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","um&cFpS\\1",[])), 
-?line <<"um5.6.7cFpS">> = iolist_to_binary(re:replace("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","um&cFpS\\1",[global])), 
-?line <<"xqtEI">> = iolist_to_binary(re:replace("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","xqtEI",[])), 
-?line <<"xqtEI">> = iolist_to_binary(re:replace("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","xqtEI",[global])), 
-?line <<"sga100.b200.300cdqqwa100.b200.300cqSJINVa100.b200.300cOyeI">> = iolist_to_binary(re:replace("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","sg&dqqw&qSJINV&OyeI",[])), 
-?line <<"sga100.b200.300cdqqwa100.b200.300cqSJINVa100.b200.300cOyeI">> = iolist_to_binary(re:replace("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","sg&dqqw&qSJINV&OyeI",[global])), 
-?line <<"rabe12-ab.1245NInvoPCLW12-ab.1245">> = iolist_to_binary(re:replace("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","rabe&NI\\1nvo\\1PCLW&",[])), 
-?line <<"rabe12-ab.1245NInvoPCLW12-ab.1245">> = iolist_to_binary(re:replace("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","rabe&NI\\1nvo\\1PCLW&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","jhvaoUW\\1Wye\\1Qkrj",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","jhvaoUW\\1Wye\\1Qkrj",[global])), 
-?line <<"">> = iolist_to_binary(re:replace("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","Q&L\\1qk&QWuvQ\\1o",[])), 
-?line <<"">> = iolist_to_binary(re:replace("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","Q&L\\1qk&QWuvQ\\1o",[global])), 
-?line <<".a">> = iolist_to_binary(re:replace(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","j&I&\\1&myXAKjyO&Mw",[])), 
-?line <<".a">> = iolist_to_binary(re:replace(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","j&I&\\1&myXAKjyO&Mw",[global])), 
-?line <<"-a">> = iolist_to_binary(re:replace("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","yyHkNcANJB",[])), 
-?line <<"-a">> = iolist_to_binary(re:replace("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","yyHkNcANJB",[global])), 
-?line <<"a-">> = iolist_to_binary(re:replace("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","&\\1tGDVOXc&&\\1aF\\1",[])), 
-?line <<"a-">> = iolist_to_binary(re:replace("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","&\\1tGDVOXc&&\\1aF\\1",[global])), 
-?line <<"a.">> = iolist_to_binary(re:replace("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1\\1PTJg\\1\\1x",[])), 
-?line <<"a.">> = iolist_to_binary(re:replace("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1\\1PTJg\\1\\1x",[global])), 
-?line <<"a_b">> = iolist_to_binary(re:replace("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","w&",[])), 
-?line <<"a_b">> = iolist_to_binary(re:replace("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","w&",[global])), 
-?line <<"a.-">> = iolist_to_binary(re:replace("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","EYTDvAw&\\1hAJjtxh",[])), 
-?line <<"a.-">> = iolist_to_binary(re:replace("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","EYTDvAw&\\1hAJjtxh",[global])), 
-?line <<"a..">> = iolist_to_binary(re:replace("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","v&",[])), 
-?line <<"a..">> = iolist_to_binary(re:replace("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","v&",[global])), 
-?line <<"ab..bc">> = iolist_to_binary(re:replace("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","xi\\1TmyKwF&sc",[])), 
-?line <<"ab..bc">> = iolist_to_binary(re:replace("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","xi\\1TmyKwF&sc",[global])), 
-?line <<"the.quick.brown.fox-">> = iolist_to_binary(re:replace("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","qbJylT\\1",[])), 
-?line <<"the.quick.brown.fox-">> = iolist_to_binary(re:replace("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","qbJylT\\1",[global])), 
-?line <<"the.quick.brown.fox.">> = iolist_to_binary(re:replace("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","P&\\1dGVbFGwNJ",[])), 
-?line <<"the.quick.brown.fox.">> = iolist_to_binary(re:replace("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","P&\\1dGVbFGwNJ",[global])), 
-?line <<"the.quick.brown.fox_">> = iolist_to_binary(re:replace("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","V&e",[])), 
-?line <<"the.quick.brown.fox_">> = iolist_to_binary(re:replace("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","V&e",[global])), 
-?line <<"the.quick.brown.fox+">> = iolist_to_binary(re:replace("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1",[])), 
-?line <<"the.quick.brown.fox+">> = iolist_to_binary(re:replace("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1",[global])), 
-?line <<"alphabetabcdlJabcdabcdabcdWqGabcd">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*)(?<=(abcd|wxyz))","&lJ\\1\\1\\1WqG\\1",[])), 
-?line <<"alphabetabcdlJabcdabcdabcdWqGabcdlJabcdabcdabcdWqGabcd">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*)(?<=(abcd|wxyz))","&lJ\\1\\1\\1WqG\\1",[global])), 
-?line <<"Q">> = iolist_to_binary(re:replace("endingwxyz","(?>.*)(?<=(abcd|wxyz))","Q",[])), 
-?line <<"QQ">> = iolist_to_binary(re:replace("endingwxyz","(?>.*)(?<=(abcd|wxyz))","Q",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>.*)(?<=(abcd|wxyz))","qTAxLBxW",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>.*)(?<=(abcd|wxyz))","qTAxLBxW",[global])), 
-?line <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(re:replace("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))","HY\\1",[])), 
-?line <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(re:replace("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))","HY\\1",[global])), 
-?line <<"KxMJnKmSMrA">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","\\1KxMJnKmSMrA",[])), 
-?line <<"KxMJnKmSMrA">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","\\1KxMJnKmSMrA",[global])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","TgCuE\\1Jnjdu",[])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","TgCuE\\1Jnjdu",[global])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword","HJa&S&CWDAtFOINp\\1a",[])), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword","HJa&S&CWDAtFOINp\\1a",[global])), 
-?line <<"999GSL">> = iolist_to_binary(re:replace("999foo","(?<=\\d{3}(?!999))foo","GSL",[])), 
-?line <<"999GSL">> = iolist_to_binary(re:replace("999foo","(?<=\\d{3}(?!999))foo","GSL",[global])), 
-?line <<"123999Lxthrb">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999))foo","Lxthrb",[])), 
-?line <<"123999Lxthrb">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999))foo","Lxthrb",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999))foo","K&j&h&\\1&&&nJDCN",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999))foo","K&j&h&\\1&&&nJDCN",[global])), 
-?line <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999))foo","Y&X\\1Oe",[])), 
-?line <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999))foo","Y&X\\1Oe",[global])), 
-?line <<"999lwxfoov">> = iolist_to_binary(re:replace("999foo","(?<=(?!...999)\\d{3})foo","lwx&v",[])), 
-?line <<"999lwxfoov">> = iolist_to_binary(re:replace("999foo","(?<=(?!...999)\\d{3})foo","lwx&v",[global])), 
-?line <<"123999MgNvfoofooIVfoo">> = iolist_to_binary(re:replace("123999foo","(?<=(?!...999)\\d{3})foo","MgNv\\1&&IV&",[])), 
-?line <<"123999MgNvfoofooIVfoo">> = iolist_to_binary(re:replace("123999foo","(?<=(?!...999)\\d{3})foo","MgNv\\1&&IV&",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?!...999)\\d{3})foo","Iv&\\1uOjnSDBEaj",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?!...999)\\d{3})foo","Iv&\\1uOjnSDBEaj",[global])), 
-?line <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=(?!...999)\\d{3})foo","sanP",[])), 
-?line <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=(?!...999)\\d{3})foo","sanP",[global])), 
-?line <<"123abclcAPWfoouwtMfoofDv">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999)...)foo","lcAPW&uwtM&fDv",[])), 
-?line <<"123abclcAPWfoouwtMfoofDv">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999)...)foo","lcAPW&uwtM&fDv",[global])), 
-?line <<"123456nRFsuNto">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}(?!999)...)foo","nR\\1FsuNto",[])), 
-?line <<"123456nRFsuNto">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}(?!999)...)foo","nR\\1FsuNto",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999)...)foo","P&",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999)...)foo","P&",[global])), 
-?line <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999)...)foo","BdprjW\\1hk\\1K\\1",[])), 
-?line <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999)...)foo","BdprjW\\1hk\\1K\\1",[global])), 
-?line <<"123abcCB">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}...)(?<!999)foo","CB",[])), 
-?line <<"123abcCB">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}...)(?<!999)foo","CB",[global])), 
-?line <<"123456g">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}...)(?<!999)foo","g",[])), 
-?line <<"123456g">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}...)(?<!999)foo","g",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}...)(?<!999)foo","\\1R&",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}...)(?<!999)foo","\\1R&",[global])), 
-?line <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}...)(?<!999)foo","bh&&&M",[])), 
-?line <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}...)(?<!999)foo","bh&&&M",[global])), 
-?line <<"E<a href=abcd<a href=abcdTofh xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+b","a\\Z","Dt\\1LIek",[global])), 
+    <<"a
+ihO">> = iolist_to_binary(re:replace("a
+b","b\\Z","ihO",[])), 
+    <<"a
+ihO">> = iolist_to_binary(re:replace("a
+b","b\\Z","ihO",[global])), 
+    <<"a
+xaybR">> = iolist_to_binary(re:replace("a
+b","b\\Z","xaybR",[])), 
+    <<"a
+xaybR">> = iolist_to_binary(re:replace("a
+b","b\\Z","xaybR",[global])), 
+    <<"a
+b">> = iolist_to_binary(re:replace("a
+b","b\\z","&",[])), 
+    <<"a
+b">> = iolist_to_binary(re:replace("a
+b","b\\z","&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","b\\z","L\\1\\1ffT&Q\\1\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","b\\z","L\\1\\1ffT&Q\\1\\1",[global])), 
+    <<"lKtonNambJv">> = iolist_to_binary(re:replace("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","lKt\\1onN&mbJ\\1v",[])), 
+    <<"lKtonNambJv">> = iolist_to_binary(re:replace("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","lKt\\1onN&mbJ\\1v",[global])), 
+    <<"pabcYFSdblfLabcy">> = iolist_to_binary(re:replace("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","p&\\1YFSdbl\\1fL&y",[])), 
+    <<"pabcYFSdblfLabcy">> = iolist_to_binary(re:replace("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","p&\\1YFSdbl\\1fL&y",[global])), 
+    <<"Ta-bKyCljTYNdT">> = iolist_to_binary(re:replace("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","T&KyCljTYN\\1dT",[])), 
+    <<"Ta-bKyCljTYNdT">> = iolist_to_binary(re:replace("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","T&KyCljTYN\\1dT",[global])), 
+    <<"RHSJc">> = iolist_to_binary(re:replace("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","RHSJc",[])), 
+    <<"RHSJc">> = iolist_to_binary(re:replace("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","RHSJc",[global])), 
+    <<"dMwhrVYNNa.ba.bGa.br">> = iolist_to_binary(re:replace("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1dMwhrVYNN&&G&r",[])), 
+    <<"dMwhrVYNNa.ba.bGa.br">> = iolist_to_binary(re:replace("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","\\1dMwhrVYNN&&G&r",[global])), 
+    <<"kPaiiQUiPl">> = iolist_to_binary(re:replace("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","kPaiiQUiPl\\1",[])), 
+    <<"kPaiiQUiPl">> = iolist_to_binary(re:replace("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","kPaiiQUiPl\\1",[global])), 
+    <<"wvQrLEJUiDlAr">> = iolist_to_binary(re:replace("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","wvQ\\1rLEJUi\\1DlAr",[])), 
+    <<"wvQrLEJUiDlAr">> = iolist_to_binary(re:replace("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","wvQ\\1rLEJUi\\1DlAr",[global])), 
+    <<"iHa100.b200.300cGyVda100.b200.300cekCw">> = iolist_to_binary(re:replace("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","iH&GyVd&\\1ekCw",[])), 
+    <<"iHa100.b200.300cGyVda100.b200.300cekCw">> = iolist_to_binary(re:replace("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","iH&GyVd&\\1ekCw",[global])), 
+    <<"O">> = iolist_to_binary(re:replace("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","O",[])), 
+    <<"O">> = iolist_to_binary(re:replace("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","O",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","HUtU\\1hwSyIT&Oh\\1&&y",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","HUtU\\1hwSyIT&Oh\\1&&y",[global])), 
+    <<"">> = iolist_to_binary(re:replace("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","hNvuQF&Qs&",[])), 
+    <<"">> = iolist_to_binary(re:replace("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","hNvuQF&Qs&",[global])), 
+    <<".a">> = iolist_to_binary(re:replace(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","QqXr&DuJWM",[])), 
+    <<".a">> = iolist_to_binary(re:replace(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","QqXr&DuJWM",[global])), 
+    <<"-a">> = iolist_to_binary(re:replace("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","sk\\1IEt",[])), 
+    <<"-a">> = iolist_to_binary(re:replace("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","sk\\1IEt",[global])), 
+    <<"a-">> = iolist_to_binary(re:replace("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","q&NPicpE",[])), 
+    <<"a-">> = iolist_to_binary(re:replace("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","q&NPicpE",[global])), 
+    <<"a.">> = iolist_to_binary(re:replace("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","CQXy",[])), 
+    <<"a.">> = iolist_to_binary(re:replace("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","CQXy",[global])), 
+    <<"a_b">> = iolist_to_binary(re:replace("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","LYXq",[])), 
+    <<"a_b">> = iolist_to_binary(re:replace("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","LYXq",[global])), 
+    <<"a.-">> = iolist_to_binary(re:replace("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","MD\\1",[])), 
+    <<"a.-">> = iolist_to_binary(re:replace("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","MD\\1",[global])), 
+    <<"a..">> = iolist_to_binary(re:replace("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","L",[])), 
+    <<"a..">> = iolist_to_binary(re:replace("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","L",[global])), 
+    <<"ab..bc">> = iolist_to_binary(re:replace("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","BCKwcl\\1kueBcjj",[])), 
+    <<"ab..bc">> = iolist_to_binary(re:replace("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","BCKwcl\\1kueBcjj",[global])), 
+    <<"the.quick.brown.fox-">> = iolist_to_binary(re:replace("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","JT&&v&ADCCjyxv",[])), 
+    <<"the.quick.brown.fox-">> = iolist_to_binary(re:replace("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","JT&&v&ADCCjyxv",[global])), 
+    <<"the.quick.brown.fox.">> = iolist_to_binary(re:replace("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","ss",[])), 
+    <<"the.quick.brown.fox.">> = iolist_to_binary(re:replace("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","ss",[global])), 
+    <<"the.quick.brown.fox_">> = iolist_to_binary(re:replace("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","oN\\1QUG",[])), 
+    <<"the.quick.brown.fox_">> = iolist_to_binary(re:replace("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","oN\\1QUG",[global])), 
+    <<"the.quick.brown.fox+">> = iolist_to_binary(re:replace("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","dOn\\1&jl\\1b&",[])), 
+    <<"the.quick.brown.fox+">> = iolist_to_binary(re:replace("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$","dOn\\1&jl\\1b&",[global])), 
+    <<"fkIx">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*)(?<=(abcd|wxyz))","fkIx",[])), 
+    <<"fkIxfkIx">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*)(?<=(abcd|wxyz))","fkIx",[global])), 
+    <<"endingwxyzendingwxyzuyEXDtendingwxyzFCFendingwxyzgoLpALi">> = iolist_to_binary(re:replace("endingwxyz","(?>.*)(?<=(abcd|wxyz))","&&uyEXDt&FCF&goLpALi",[])), 
+    <<"endingwxyzendingwxyzuyEXDtendingwxyzFCFendingwxyzgoLpALiuyEXDtFCFgoLpALi">> = iolist_to_binary(re:replace("endingwxyz","(?>.*)(?<=(abcd|wxyz))","&&uyEXDt&FCF&goLpALi",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>.*)(?<=(abcd|wxyz))","ElH",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?>.*)(?<=(abcd|wxyz))","ElH",[global])), 
+    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(re:replace("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))","&GVy",[])), 
+    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(re:replace("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))","&GVy",[global])), 
+    <<"IpFbERword cat dog elephant mussel cow horse canary baboon snake shark otherwordvjword cat dog elephant mussel cow horse canary baboon snake shark otherwordaul">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","IpFbER&vj&aul",[])), 
+    <<"IpFbERword cat dog elephant mussel cow horse canary baboon snake shark otherwordvjword cat dog elephant mussel cow horse canary baboon snake shark otherwordaul">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","IpFbER&vj&aul",[global])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","JMrCXcb\\1Q&T\\1ypBy",[])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword","JMrCXcb\\1Q&T\\1ypBy",[global])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword","TD&O",[])), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(re:replace("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword","TD&O",[global])), 
+    <<"999fooKfooJ">> = iolist_to_binary(re:replace("999foo","(?<=\\d{3}(?!999))foo","&K&J",[])), 
+    <<"999fooKfooJ">> = iolist_to_binary(re:replace("999foo","(?<=\\d{3}(?!999))foo","&K&J",[global])), 
+    <<"123999ncsryomxOKBBikcY">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999))foo","\\1ncsry\\1omxOKBBikcY",[])), 
+    <<"123999ncsryomxOKBBikcY">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999))foo","\\1ncsry\\1omxOKBBikcY",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999))foo","NMXv",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999))foo","NMXv",[global])), 
+    <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999))foo","B\\1\\1",[])), 
+    <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999))foo","B\\1\\1",[global])), 
+    <<"999faWvYAfooyphbfooC">> = iolist_to_binary(re:replace("999foo","(?<=(?!...999)\\d{3})foo","f\\1aW\\1vYA\\1&yphb&C",[])), 
+    <<"999faWvYAfooyphbfooC">> = iolist_to_binary(re:replace("999foo","(?<=(?!...999)\\d{3})foo","f\\1aW\\1vYA\\1&yphb&C",[global])), 
+    <<"123999D">> = iolist_to_binary(re:replace("123999foo","(?<=(?!...999)\\d{3})foo","D",[])), 
+    <<"123999D">> = iolist_to_binary(re:replace("123999foo","(?<=(?!...999)\\d{3})foo","D",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?!...999)\\d{3})foo","xk\\1&NP",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=(?!...999)\\d{3})foo","xk\\1&NP",[global])), 
+    <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=(?!...999)\\d{3})foo","Cpoo",[])), 
+    <<"123abcfoo">> = iolist_to_binary(re:replace("123abcfoo","(?<=(?!...999)\\d{3})foo","Cpoo",[global])), 
+    <<"123abcKgjBJrwxNA">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999)...)foo","KgjBJrwxNA",[])), 
+    <<"123abcKgjBJrwxNA">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}(?!999)...)foo","KgjBJrwxNA",[global])), 
+    <<"123456foomfooUfooUg">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}(?!999)...)foo","&m&U&Ug\\1",[])), 
+    <<"123456foomfooUfooUg">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}(?!999)...)foo","&m&U&Ug\\1",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999)...)foo","Ccj\\1&vjH&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}(?!999)...)foo","Ccj\\1&vjH&",[global])), 
+    <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999)...)foo","&MeuE&",[])), 
+    <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}(?!999)...)foo","&MeuE&",[global])), 
+    <<"123abcMdRfooqtYhLSo">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}...)(?<!999)foo","Md\\1R&qtYhLSo",[])), 
+    <<"123abcMdRfooqtYhLSo">> = iolist_to_binary(re:replace("123abcfoo","(?<=\\d{3}...)(?<!999)foo","Md\\1R&qtYhLSo",[global])), 
+    <<"123456IfooHfooFgGWfoobS">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}...)(?<!999)foo","I&H\\1\\1&\\1FgGW&bS",[])), 
+    <<"123456IfooHfooFgGWfoobS">> = iolist_to_binary(re:replace("123456foo","(?<=\\d{3}...)(?<!999)foo","I&H\\1\\1&\\1FgGW&bS",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}...)(?<!999)foo","x&KVkVB\\1mIkDO\\1",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?<=\\d{3}...)(?<!999)foo","x&KVkVB\\1mIkDO\\1",[global])), 
+    <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}...)(?<!999)foo","imQyT&\\1",[])), 
+    <<"123999foo">> = iolist_to_binary(re:replace("123999foo","(?<=\\d{3}...)(?<!999)foo","imQyT&\\1",[global])), 
+    ok.
+run32() ->
+    <<"YXkVs xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","E&&Tofh",[caseless,
-                                                                                          dotall,
-                                                                                          extended])), 
-?line <<"E<a href=abcd<a href=abcdTofh xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+                                 # quote, otherwise match up to next space","YX\\1kVs",[caseless,
+                                                                                             dotall,
+                                                                                             extended])), 
+    <<"YXkVs xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","E&&Tofh",[caseless,
-                                                                                          dotall,
-                                                                                          extended,
-                                                                                          global])), 
-?line <<"<a href=\"abcd xyz pqr\"Y\"ylaR<a href=\"abcd xyz pqr\"bd cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+                                 # quote, otherwise match up to next space","YX\\1kVs",[caseless,
+                                                                                             dotall,
+                                                                                             extended,
+                                                                                             global])), 
+    <<"j\"rurrrUhbILCWDO<a href=\"abcd xyz pqr\" cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","&Y\\1ylaR&bd",[caseless,
+                                 # quote, otherwise match up to next space","j\\1rurrrUhbILCWDO&",[caseless,
+                                                                                                        dotall,
+                                                                                                        extended])), 
+    <<"j\"rurrrUhbILCWDO<a href=\"abcd xyz pqr\" cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+ ([\\\"\\'])?                       # find single or double quote
+ (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
+                                 # quote, otherwise match up to next space","j\\1rurrrUhbILCWDO&",[caseless,
+                                                                                                        dotall,
+                                                                                                        extended,
+                                                                                                        global])), 
+    <<"KHDcRniMHRJEBi cats">> = iolist_to_binary(re:replace("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+ ([\\\"\\'])?                       # find single or double quote
+ (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
+                                 # quote, otherwise match up to next space","KHDcRniMHRJEBi",[caseless,
                                                                                                  dotall,
                                                                                                  extended])), 
-?line <<"<a href=\"abcd xyz pqr\"Y\"ylaR<a href=\"abcd xyz pqr\"bd cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<"KHDcRniMHRJEBi cats">> = iolist_to_binary(re:replace("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","&Y\\1ylaR&bd",[caseless,
+                                 # quote, otherwise match up to next space","KHDcRniMHRJEBi",[caseless,
                                                                                                  dotall,
                                                                                                  extended,
                                                                                                  global])), 
-?line <<"CdADwL<a href='abcd xyz pqr'b'a'' cats">> = iolist_to_binary(re:replace("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
- ([\\\"\\'])?                       # find single or double quote
- (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","CdADwL&b\\1a\\1\\1",[caseless,
-                                                                                                           dotall,
-                                                                                                           extended])), 
-?line <<"CdADwL<a href='abcd xyz pqr'b'a'' cats">> = iolist_to_binary(re:replace("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
- ([\\\"\\'])?                       # find single or double quote
- (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","CdADwL&b\\1a\\1\\1",[caseless,
-                                                                                                           dotall,
-                                                                                                           extended,
-                                                                                                           global])), 
-?line <<"IAfhYumoIpB xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
+    <<"DRkc<a href=abcd xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","\\1\\1IAfhYumoIpB\\1",[caseless,
-                                                                                                             dotall,
-                                                                                                             extended])), 
-?line <<"IAfhYumoIpB xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
+                                 # quote, otherwise match up to next space","DRkc&\\1",[caseless,
+                                                                                             dotall,
+                                                                                             extended])), 
+    <<"DRkc<a href=abcd xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","\\1\\1IAfhYumoIpB\\1",[caseless,
-                                                                                                             dotall,
-                                                                                                             extended,
-                                                                                                             global])), 
-?line <<"xrs<a href=\"abcd xyz pqr\"\"tWWeQ\"K<a href=\"abcd xyz pqr\"LjVA\"<a href=\"abcd xyz pqr\" cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
+                                 # quote, otherwise match up to next space","DRkc&\\1",[caseless,
+                                                                                             dotall,
+                                                                                             extended,
+                                                                                             global])), 
+    <<"M\"b\"cG cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","xrs&\\1tWWeQ\\1K&LjVA\\1&",[caseless,
-                                                                                                                  dotall,
-                                                                                                                  extended])), 
-?line <<"xrs<a href=\"abcd xyz pqr\"\"tWWeQ\"K<a href=\"abcd xyz pqr\"LjVA\"<a href=\"abcd xyz pqr\" cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
+                                 # quote, otherwise match up to next space","M\\1b\\1cG",[caseless,
+                                                                                                 dotall,
+                                                                                                 extended])), 
+    <<"M\"b\"cG cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","xrs&\\1tWWeQ\\1K&LjVA\\1&",[caseless,
-                                                                                                                  dotall,
-                                                                                                                  extended,
-                                                                                                                  global])), 
-?line <<"QmbmFDyYfP cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
+                                 # quote, otherwise match up to next space","M\\1b\\1cG",[caseless,
+                                                                                                 dotall,
+                                                                                                 extended,
+                                                                                                 global])), 
+    <<"<a href       =       'abcd xyz pqr'K'RAApBAC'TjXhwL cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","QmbmFDyYfP",[caseless,
-                                                                                             dotall,
-                                                                                             extended])), 
-?line <<"QmbmFDyYfP cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
+                                 # quote, otherwise match up to next space","&K\\1RAApBAC\\1TjXhwL",[caseless,
+                                                                                                            dotall,
+                                                                                                            extended])), 
+    <<"<a href       =       'abcd xyz pqr'K'RAApBAC'TjXhwL cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","QmbmFDyYfP",[caseless,
-                                                                                             dotall,
-                                                                                             extended,
-                                                                                             global])), 
-?line <<"EokGsdLETK xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+                                 # quote, otherwise match up to next space","&K\\1RAApBAC\\1TjXhwL",[caseless,
+                                                                                                            dotall,
+                                                                                                            extended,
+                                                                                                            global])), 
+    <<"udPf<a href=abcd<a href=abcdVmHT xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","E\\1okGsdLETK",[caseless,
-                                                                                                  dotall,
-                                                                                                  extended])), 
-?line <<"EokGsdLETK xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+                                 # quote, otherwise match up to next space","\\1udPf&&VmHT\\1",[caseless,
+                                                                                                       dotall,
+                                                                                                       extended])), 
+    <<"udPf<a href=abcd<a href=abcdVmHT xyz">> = iolist_to_binary(re:replace("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","E\\1okGsdLETK",[caseless,
-                                                                                                  dotall,
-                                                                                                  extended,
-                                                                                                  global])), 
-?line <<"gy cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+                                 # quote, otherwise match up to next space","\\1udPf&&VmHT\\1",[caseless,
+                                                                                                       dotall,
+                                                                                                       extended,
+                                                                                                       global])), 
+    <<"lO<a href=\"abcd xyz pqr\"C<a href=\"abcd xyz pqr\"dAuVMQlg cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","gy",[caseless,
-                                                                                     dotall,
-                                                                                     extended])), 
-?line <<"gy cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+                                 # quote, otherwise match up to next space","lO&C&dAuVMQlg",[caseless,
+                                                                                                dotall,
+                                                                                                extended])), 
+    <<"lO<a href=\"abcd xyz pqr\"C<a href=\"abcd xyz pqr\"dAuVMQlg cats">> = iolist_to_binary(re:replace("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","gy",[caseless,
-                                                                                     dotall,
-                                                                                     extended,
-                                                                                     global])), 
-?line <<"i cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+                                 # quote, otherwise match up to next space","lO&C&dAuVMQlg",[caseless,
+                                                                                                dotall,
+                                                                                                extended,
+                                                                                                global])), 
+    <<"kNUDBNNpwgKs'j cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","i",[caseless,
-                                                                                    dotall,
-                                                                                    extended])), 
-?line <<"i cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+                                 # quote, otherwise match up to next space","kNUDBNNpwgKs\\1j",[caseless,
+                                                                                                     dotall,
+                                                                                                     extended])), 
+    <<"kNUDBNNpwgKs'j cats">> = iolist_to_binary(re:replace("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
-                                 # quote, otherwise match up to next space","i",[caseless,
-                                                                                    dotall,
-                                                                                    extended,
-                                                                                    global])), 
-?line <<"EZADCywAYhLBCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","((Z)+|A)*","E&DCywAYhL",[])), 
-?line <<"EZADCywAYhLEDCywAYhLBEDCywAYhLCEDCywAYhLDEDCywAYhLEEDCywAYhLFEDCywAYhLGEDCywAYhL">> = iolist_to_binary(re:replace("ZABCDEFG","((Z)+|A)*","E&DCywAYhL",[global])), 
-?line <<"nyATkLcbFTgYpAunmMXBCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","(Z()|A)*","ny\\1TkLcbFTgYp\\1unmMX",[])), 
-?line <<"nyATkLcbFTgYpAunmMXnyTkLcbFTgYpunmMXBnyTkLcbFTgYpunmMXCnyTkLcbFTgYpunmMXDnyTkLcbFTgYpunmMXEnyTkLcbFTgYpunmMXFnyTkLcbFTgYpunmMXGnyTkLcbFTgYpunmMX">> = iolist_to_binary(re:replace("ZABCDEFG","(Z()|A)*","ny\\1TkLcbFTgYp\\1unmMX",[global])), 
-?line <<"YiJonwVPQAqACHABCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","(Z(())|A)*","YiJonwVPQ\\1q\\1CH\\1",[])), 
-?line <<"YiJonwVPQAqACHAYiJonwVPQqCHBYiJonwVPQqCHCYiJonwVPQqCHDYiJonwVPQqCHEYiJonwVPQqCHFYiJonwVPQqCHGYiJonwVPQqCH">> = iolist_to_binary(re:replace("ZABCDEFG","(Z(())|A)*","YiJonwVPQ\\1q\\1CH\\1",[global])), 
-?line <<"bZAEAXcNeNwfBCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","((?>Z)+|A)*","b&E\\1XcNeNwf",[])), 
-?line <<"bZAEAXcNeNwfbEXcNeNwfBbEXcNeNwfCbEXcNeNwfDbEXcNeNwfEbEXcNeNwfFbEXcNeNwfGbEXcNeNwf">> = iolist_to_binary(re:replace("ZABCDEFG","((?>Z)+|A)*","b&E\\1XcNeNwf",[global])), 
-?line <<"UeIRbNvamSaniIQYPZABCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","((?>)+|A)*","UeIRbNv&amSaniIQYP",[])), 
-?line <<"UeIRbNvamSaniIQYPZUeIRbNvamSaniIQYPUeIRbNvAamSaniIQYPUeIRbNvamSaniIQYPBUeIRbNvamSaniIQYPCUeIRbNvamSaniIQYPDUeIRbNvamSaniIQYPEUeIRbNvamSaniIQYPFUeIRbNvamSaniIQYPGUeIRbNvamSaniIQYP">> = iolist_to_binary(re:replace("ZABCDEFG","((?>)+|A)*","UeIRbNv&amSaniIQYP",[global])), 
-?line <<"AnyTcLbbab">> = iolist_to_binary(re:replace("abbab","a*","AnyTcL",[])), 
-?line <<"AnyTcLAnyTcLbAnyTcLbAnyTcLAnyTcLbAnyTcL">> = iolist_to_binary(re:replace("abbab","a*","AnyTcL",[global])), 
-?line <<"EfoRdQVibcde">> = iolist_to_binary(re:replace("abcde","^[a-\\d]","EfoRdQVi",[])), 
-?line <<"EfoRdQVibcde">> = iolist_to_binary(re:replace("abcde","^[a-\\d]","EfoRdQVi",[global])), 
-?line <<"cCcyoUi-GT--drpjthings">> = iolist_to_binary(re:replace("-things","^[a-\\d]","cCcy\\1o\\1Ui&GT&&drpj",[])), 
-?line <<"cCcyoUi-GT--drpjthings">> = iolist_to_binary(re:replace("-things","^[a-\\d]","cCcy\\1o\\1Ui&GT&&drpj",[global])), 
-?line <<"eddigit">> = iolist_to_binary(re:replace("0digit","^[a-\\d]","ed",[])), 
-?line <<"eddigit">> = iolist_to_binary(re:replace("0digit","^[a-\\d]","ed",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-\\d]","\\1wCjwyJQB&COO&&Vyp\\1M",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-\\d]","\\1wCjwyJQB&COO&&Vyp\\1M",[global])), 
-?line <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[a-\\d]","EofOaus",[])), 
-?line <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[a-\\d]","EofOaus",[global])), 
-?line <<"kpGVaTiadJVwJbcde">> = iolist_to_binary(re:replace("abcde","^[\\d-a]","kpG\\1V&Ti&dJVwJ",[])), 
-?line <<"kpGVaTiadJVwJbcde">> = iolist_to_binary(re:replace("abcde","^[\\d-a]","kpG\\1V&Ti&dJVwJ",[global])), 
-?line <<"Chuymdqthings">> = iolist_to_binary(re:replace("-things","^[\\d-a]","Chu\\1ymdq",[])), 
-?line <<"Chuymdqthings">> = iolist_to_binary(re:replace("-things","^[\\d-a]","Chu\\1ymdq",[global])), 
-?line <<"TpWPVwVtHJWAdigit">> = iolist_to_binary(re:replace("0digit","^[\\d-a]","TpWPVwV\\1tHJWA",[])), 
-?line <<"TpWPVwVtHJWAdigit">> = iolist_to_binary(re:replace("0digit","^[\\d-a]","TpWPVwV\\1tHJWA",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[\\d-a]","WYnxbwypPj",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[\\d-a]","WYnxbwypPj",[global])), 
-?line <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[\\d-a]","bnUSwwhPJ",[])), 
-?line <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[\\d-a]","bnUSwwhPJ",[global])), 
-?line <<">mnfN 	
-
FbS 	
-
ghxwsq<">> = iolist_to_binary(re:replace("> 	
-
<","[[:space:]]+","mnfN&FbS\\1&ghxwsq",[])), 
-?line <<">mnfN 	
-
FbS 	
-
ghxwsq<">> = iolist_to_binary(re:replace("> 	
-
<","[[:space:]]+","mnfN&FbS\\1&ghxwsq",[global])), 
-?line <<">R
-
<">> = iolist_to_binary(re:replace("> 	
-
<","[[:blank:]]+","R",[])), 
-?line <<">R
-
<">> = iolist_to_binary(re:replace("> 	
-
<","[[:blank:]]+","R",[global])), 
-?line <<">PjX 	
-
<">> = iolist_to_binary(re:replace("> 	
-
<","[\\s]+","PjX&",[])), 
-?line <<">PjX 	
+                                 # quote, otherwise match up to next space","kNUDBNNpwgKs\\1j",[caseless,
+                                                                                                     dotall,
+                                                                                                     extended,
+                                                                                                     global])), 
+    <<"SBBCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","((Z)+|A)*","SB",[])), 
+    <<"SBSBBSBCSBDSBESBFSBGSB">> = iolist_to_binary(re:replace("ZABCDEFG","((Z)+|A)*","SB",[global])), 
+    <<"TGWhfNtEZAQBCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","(Z()|A)*","TGWhfNtE&Q",[])), 
+    <<"TGWhfNtEZAQTGWhfNtEQBTGWhfNtEQCTGWhfNtEQDTGWhfNtEQETGWhfNtEQFTGWhfNtEQGTGWhfNtEQ">> = iolist_to_binary(re:replace("ZABCDEFG","(Z()|A)*","TGWhfNtE&Q",[global])), 
+    <<"QATmcAAZABCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","(Z(())|A)*","Q\\1Tmc\\1\\1&",[])), 
+    <<"QATmcAAZAQTmcBQTmcCQTmcDQTmcEQTmcFQTmcGQTmc">> = iolist_to_binary(re:replace("ZABCDEFG","(Z(())|A)*","Q\\1Tmc\\1\\1&",[global])), 
+    <<"LUBCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","((?>Z)+|A)*","LU",[])), 
+    <<"LULUBLUCLUDLUELUFLUGLU">> = iolist_to_binary(re:replace("ZABCDEFG","((?>Z)+|A)*","LU",[global])), 
+    <<"YLMbVmHKJJdvuAVZABCDEFG">> = iolist_to_binary(re:replace("ZABCDEFG","((?>)+|A)*","YL&MbVmHKJJdv\\1&uAV",[])), 
+    <<"YLMbVmHKJJdvuAVZYLMbVmHKJJdvuAVYLAMbVmHKJJdvAuAVYLMbVmHKJJdvuAVBYLMbVmHKJJdvuAVCYLMbVmHKJJdvuAVDYLMbVmHKJJdvuAVEYLMbVmHKJJdvuAVFYLMbVmHKJJdvuAVGYLMbVmHKJJdvuAV">> = iolist_to_binary(re:replace("ZABCDEFG","((?>)+|A)*","YL&MbVmHKJJdv\\1&uAV",[global])), 
+    <<"qewqabbab">> = iolist_to_binary(re:replace("abbab","a*","qewq&",[])), 
+    <<"qewqaqewqbqewqbqewqaqewqbqewq">> = iolist_to_binary(re:replace("abbab","a*","qewq&",[global])), 
+    <<"Nabcde">> = iolist_to_binary(re:replace("abcde","^[a-\\d]","N&",[])), 
+    <<"Nabcde">> = iolist_to_binary(re:replace("abcde","^[a-\\d]","N&",[global])), 
+    <<"sg-aOs-tithings">> = iolist_to_binary(re:replace("-things","^[a-\\d]","sg&a\\1Os&ti",[])), 
+    <<"sg-aOs-tithings">> = iolist_to_binary(re:replace("-things","^[a-\\d]","sg&a\\1Os&ti",[global])), 
+    <<"DtMdigit">> = iolist_to_binary(re:replace("0digit","^[a-\\d]","DtM",[])), 
+    <<"DtMdigit">> = iolist_to_binary(re:replace("0digit","^[a-\\d]","DtM",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-\\d]","dJiX",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[a-\\d]","dJiX",[global])), 
+    <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[a-\\d]","AGDlhSs&Gk&u\\1L",[])), 
+    <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[a-\\d]","AGDlhSs&Gk&u\\1L",[global])), 
+    <<"crLvRhrTbcde">> = iolist_to_binary(re:replace("abcde","^[\\d-a]","crLvRhrT",[])), 
+    <<"crLvRhrTbcde">> = iolist_to_binary(re:replace("abcde","^[\\d-a]","crLvRhrT",[global])), 
+    <<"XaUtelthings">> = iolist_to_binary(re:replace("-things","^[\\d-a]","XaUtel",[])), 
+    <<"XaUtelthings">> = iolist_to_binary(re:replace("-things","^[\\d-a]","XaUtel",[global])), 
+    <<"0digit">> = iolist_to_binary(re:replace("0digit","^[\\d-a]","&",[])), 
+    <<"0digit">> = iolist_to_binary(re:replace("0digit","^[\\d-a]","&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[\\d-a]","E&gL&oOMM&E",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^[\\d-a]","E&gL&oOMM&E",[global])), 
+    <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[\\d-a]","\\1kIKJw&Id",[])), 
+    <<"bcdef">> = iolist_to_binary(re:replace("bcdef","^[\\d-a]","\\1kIKJw&Id",[global])), 
+    <<">Qi<">> = iolist_to_binary(re:replace("> 	
+
<","[[:space:]]+","\\1Qi",[])), 
+    <<">Qi<">> = iolist_to_binary(re:replace("> 	
+
<","[[:space:]]+","\\1Qi",[global])), 
+    <<">VYrL 	AlFvYN
 
<">> = iolist_to_binary(re:replace("> 	
-
<","[\\s]+","PjX&",[global])), 
-?line <<">EO 	
-
 	
-
g 	
-
 	
-
DMTFYSd 	
+
<","[[:blank:]]+","VYrL&AlFvYN",[])), 
+    <<">VYrL 	AlFvYN
 
<">> = iolist_to_binary(re:replace("> 	
-
<","\\s+","EO&&g&&DMT\\1FY\\1Sd&",[])), 
-?line <<">EO 	
-
 	
-
g 	
-
 	
-
DMTFYSd 	
-
<">> = iolist_to_binary(re:replace("> 	
-
<","\\s+","EO&&g&&DMT\\1FY\\1Sd&",[global])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","ab","qihC&Vy",[extended])), 
-?line <<"ab">> = iolist_to_binary(re:replace("ab","ab","qihC&Vy",[extended,
-                                                                                                                                                                    global])), 
-?line <<"a
-dxmjb">> = iolist_to_binary(re:replace("a
-xb","(?!\\A)x","dxmj",[multiline])), 
-?line <<"a
-dxmjb">> = iolist_to_binary(re:replace("a
-xb","(?!\\A)x","dxmj",[multiline,global])), 
-?line <<"a
+
<","[[:blank:]]+","VYrL&AlFvYN",[global])), 
+    <<">HJRfpOlI<">> = iolist_to_binary(re:replace("> 	
+
<","[\\s]+","HJRfpOlI",[])), 
+    <<">HJRfpOlI<">> = iolist_to_binary(re:replace("> 	
+
<","[\\s]+","HJRfpOlI",[global])), 
+    <<"> 	
+
t 	
+
FtuuC<">> = iolist_to_binary(re:replace("> 	
+
<","\\s+","&\\1t&FtuuC",[])), 
+    <<"> 	
+
t 	
+
FtuuC<">> = iolist_to_binary(re:replace("> 	
+
<","\\s+","&\\1t&FtuuC",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","ab","&lH\\1E&J\\1&L&&Rx",[extended])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","ab","&lH\\1E&J\\1&L&&Rx",[extended,
+                                                                                                                                                                                              global])), 
+    <<"a
+xWxKmxNIb">> = iolist_to_binary(re:replace("a
+xb","(?!\\A)x","&W&Km&NI",[multiline])), 
+    <<"a
+xWxKmxNIb">> = iolist_to_binary(re:replace("a
+xb","(?!\\A)x","&W&Km&NI",[multiline,global])), 
+    <<"a
 xb">> = iolist_to_binary(re:replace("a
-xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline])), 
-?line <<"a
+xb","(?!^)x","jRLFoYEov&K",[multiline])), 
+    <<"a
 xb">> = iolist_to_binary(re:replace("a
-xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
-                                                              global])), 
-?line <<"MYdx">> = iolist_to_binary(re:replace("abcabcabc","abc\\Qabc\\Eabc","MYdx",[])), 
-?line <<"MYdx">> = iolist_to_binary(re:replace("abcabcabc","abc\\Qabc\\Eabc","MYdx",[global])), 
-?line <<"abc(*+|abc">> = iolist_to_binary(re:replace("abc(*+|abc","abc\\Q(*+|\\Eabc","&",[])), 
-?line <<"abc(*+|abc">> = iolist_to_binary(re:replace("abc(*+|abc","abc\\Q(*+|\\Eabc","&",[global])), 
-?line <<"abc abcabcbMSm">> = iolist_to_binary(re:replace("abc abcabc","   abc\\Q abc\\Eabc","&bM\\1Sm",[extended])), 
-?line <<"abc abcabcbMSm">> = iolist_to_binary(re:replace("abc abcabc","   abc\\Q abc\\Eabc","&bM\\1Sm",[extended,
-                                                                                                                                                                                                                         global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   abc\\Q abc\\Eabc","X\\1\\1&",[extended])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   abc\\Q abc\\Eabc","X\\1\\1&",[extended,
-                                                                                                                                                                                                                            global])), 
-?line <<"abcabcabc">> = iolist_to_binary(re:replace("abcabcabc","   abc\\Q abc\\Eabc","qbvwJpk",[extended])), 
-?line <<"abcabcabc">> = iolist_to_binary(re:replace("abcabcabc","   abc\\Q abc\\Eabc","qbvwJpk",[extended,
-                                                                                                                                                                                                                   global])), 
-?line <<"UwGaabc#not comment
-    literal">> = iolist_to_binary(re:replace("abc#not comment
+xb","(?!^)x","jRLFoYEov&K",[multiline,global])), 
+    <<"JVoGaFQQ">> = iolist_to_binary(re:replace("abcabcabc","abc\\Qabc\\Eabc","JVoGaFQQ",[])), 
+    <<"JVoGaFQQ">> = iolist_to_binary(re:replace("abcabcabc","abc\\Qabc\\Eabc","JVoGaFQQ",[global])), 
+    <<"DSeVu">> = iolist_to_binary(re:replace("abc(*+|abc","abc\\Q(*+|\\Eabc","DSeVu",[])), 
+    <<"DSeVu">> = iolist_to_binary(re:replace("abc(*+|abc","abc\\Q(*+|\\Eabc","DSeVu",[global])), 
+    ok.
+run33() ->
+    <<"Li">> = iolist_to_binary(re:replace("abc abcabc","   abc\\Q abc\\Eabc","Li",[extended])), 
+    <<"Li">> = iolist_to_binary(re:replace("abc abcabc","   abc\\Q abc\\Eabc","Li",[extended,
+                                                                                                                                                                                                         global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   abc\\Q abc\\Eabc","njPc\\1Go\\1Mf&&HbU\\1&",[extended])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","   abc\\Q abc\\Eabc","njPc\\1Go\\1Mf&&HbU\\1&",[extended,
+                                                                                                                                                                                                                                                           global])), 
+    <<"abcabcabc">> = iolist_to_binary(re:replace("abcabcabc","   abc\\Q abc\\Eabc","&xP&fFtGb&mNes\\1GI\\1",[extended])), 
+    <<"abcabcabc">> = iolist_to_binary(re:replace("abcabcabc","   abc\\Q abc\\Eabc","&xP&fFtGb&mNes\\1GI\\1",[extended,
+                                                                                                                                                                                                                                                    global])), 
+    <<"gKHkeQRUc">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E","UwGa&",[extended])), 
-?line <<"UwGaabc#not comment
-    literal">> = iolist_to_binary(re:replace("abc#not comment
+    literal\\E","gKHkeQRUc",[extended])), 
+    <<"gKHkeQRUc">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E","UwGa&",[extended,global])), 
-?line <<"abc#not comment
-    literalSCWsV">> = iolist_to_binary(re:replace("abc#not comment
+    literal\\E","gKHkeQRUc",[extended,global])), 
+    <<"gmgWrrxBneXj">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal","&\\1SCWsV",[extended])), 
-?line <<"abc#not comment
-    literalSCWsV">> = iolist_to_binary(re:replace("abc#not comment
+    literal","gmgWrrxBneXj",[extended])), 
+    <<"gmgWrrxBneXj">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal","&\\1SCWsV",[extended,global])), 
-?line <<"T">> = iolist_to_binary(re:replace("abc#not comment
+    literal","gmgWrrxBneXj",[extended,global])), 
+    <<"JetiXL">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
-    ","T",[extended])), 
-?line <<"T">> = iolist_to_binary(re:replace("abc#not comment
+    ","J\\1etiX\\1L",[extended])), 
+    <<"JetiXL">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
-    ","T",[extended,global])), 
-?line <<"abc#not comment
-    literalDFMabc#not comment
-    literaliRRuHyq">> = iolist_to_binary(re:replace("abc#not comment
+    ","J\\1etiX\\1L",[extended,global])), 
+    <<"nxvXs">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E #more comment","&DFM&\\1\\1iR\\1RuHy\\1q",[extended])), 
-?line <<"abc#not comment
-    literalDFMabc#not comment
-    literaliRRuHyq">> = iolist_to_binary(re:replace("abc#not comment
+    literal\\E #more comment","\\1nxvXs",[extended])), 
+    <<"nxvXs">> = iolist_to_binary(re:replace("abc#not comment
     literal","abc#comment
     \\Q#not comment
-    literal\\E #more comment","&DFM&\\1\\1iR\\1RuHy\\1q",[extended,
-                                                                       global])), 
-?line <<"DkSX">> = iolist_to_binary(re:replace("abc\\$xyz","\\Qabc\\$xyz\\E","DkSX",[])), 
-?line <<"DkSX">> = iolist_to_binary(re:replace("abc\\$xyz","\\Qabc\\$xyz\\E","DkSX",[global])), 
-?line <<"EOaWuCabc$xyzeabc$xyzDrvLP">> = iolist_to_binary(re:replace("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E","EOaWuC&e&DrvLP",[])), 
-?line <<"EOaWuCabc$xyzeabc$xyzDrvLP">> = iolist_to_binary(re:replace("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E","EOaWuC&e&DrvLP",[global])), 
-?line <<"PUGabcRXWXakpQfboabcw">> = iolist_to_binary(re:replace("abc","\\Gabc","P\\1UG&R\\1XWXakpQfbo&w",[])), 
-?line <<"PUGabcRXWXakpQfboabcw">> = iolist_to_binary(re:replace("abc","\\Gabc","P\\1UG&R\\1XWXakpQfbo&w",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Gabc","sssS\\1AVaXM&Is&c",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Gabc","sssS\\1AVaXM&Is&c",[global])), 
-?line <<"xyzabc">> = iolist_to_binary(re:replace("xyzabc","\\Gabc","r",[])), 
-?line <<"xyzabc">> = iolist_to_binary(re:replace("xyzabc","\\Gabc","r",[global])), 
-?line <<"tScabc2xyzabc3">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","\\Gabc.","tSc",[])), 
-?line <<"tSctScxyzabc3">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","\\Gabc.","tSc",[global])), 
-?line <<"HcJuuopHFgbabc2xyzabc3">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","abc.","HcJuuopHFgb",[])), 
-?line <<"HcJuuopHFgbHcJuuopHFgbxyzHcJuuopHFgb">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","abc.","HcJuuopHFgb",[global])), 
-?line <<"XMSabcdaDVucwrGDirY">> = iolist_to_binary(re:replace("XabcdY","a(?x: b c )d","MS&aDVucwrGDir",[])), 
-?line <<"XMSabcdaDVucwrGDirY">> = iolist_to_binary(re:replace("XabcdY","a(?x: b c )d","MS&aDVucwrGDir",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?x: b c )d","paXT\\1iPxaNPv",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?x: b c )d","paXT\\1iPxaNPv",[global])), 
-?line <<"Xa b c d Y">> = iolist_to_binary(re:replace("Xa b c d Y","a(?x: b c )d","FRHntJTvUtt&w\\1Mhj",[])), 
-?line <<"Xa b c d Y">> = iolist_to_binary(re:replace("Xa b c d Y","a(?x: b c )d","FRHntJTvUtt&w\\1Mhj",[global])), 
-?line <<"XabcY">> = iolist_to_binary(re:replace("XabcY","((?x)x y z | a b c)","\\1",[])), 
-?line <<"XabcY">> = iolist_to_binary(re:replace("XabcY","((?x)x y z | a b c)","\\1",[global])), 
-?line <<"AxyznocmxyzxyzxyzfWlBxyzPEB">> = iolist_to_binary(re:replace("AxyzB","((?x)x y z | a b c)","&nocm\\1&&fWlB&PE",[])), 
-?line <<"AxyznocmxyzxyzxyzfWlBxyzPEB">> = iolist_to_binary(re:replace("AxyzB","((?x)x y z | a b c)","&nocm\\1&&fWlB&PE",[global])), 
-?line <<"XqabCRwY">> = iolist_to_binary(re:replace("XabCY","(?i)AB(?-i)C","q&Rw",[])), 
-?line <<"XqabCRwY">> = iolist_to_binary(re:replace("XabCY","(?i)AB(?-i)C","q&Rw",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i)AB(?-i)C","b&Qx",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i)AB(?-i)C","b&Qx",[global])), 
-?line <<"XabcY">> = iolist_to_binary(re:replace("XabcY","(?i)AB(?-i)C","VjuCQPxKgGiffeGDHugc",[])), 
-?line <<"XabcY">> = iolist_to_binary(re:replace("XabcY","(?i)AB(?-i)C","VjuCQPxKgGiffeGDHugc",[global])), 
-?line <<"abCEApGxObicabCaHXabCib">> = iolist_to_binary(re:replace("abCE","((?i)AB(?-i)C|D)E","&ApGxObic\\1aHX\\1ib",[])), 
-?line <<"abCEApGxObicabCaHXabCib">> = iolist_to_binary(re:replace("abCE","((?i)AB(?-i)C|D)E","&ApGxObic\\1aHX\\1ib",[global])), 
-?line <<"uLoeOQwJDEyFGS">> = iolist_to_binary(re:replace("DE","((?i)AB(?-i)C|D)E","uLoeOQwJ&yFGS",[])), 
-?line <<"uLoeOQwJDEyFGS">> = iolist_to_binary(re:replace("DE","((?i)AB(?-i)C|D)E","uLoeOQwJ&yFGS",[global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)AB(?-i)C|D)E","LUuqtYqP\\1RCe",[])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)AB(?-i)C|D)E","LUuqtYqP\\1RCe",[global])), 
-?line <<"abcE">> = iolist_to_binary(re:replace("abcE","((?i)AB(?-i)C|D)E","\\1sXBxu\\1",[])), 
-?line <<"abcE">> = iolist_to_binary(re:replace("abcE","((?i)AB(?-i)C|D)E","\\1sXBxu\\1",[global])), 
-?line <<"abCe">> = iolist_to_binary(re:replace("abCe","((?i)AB(?-i)C|D)E","Y\\1Rgo\\1Ican\\1",[])), 
-?line <<"abCe">> = iolist_to_binary(re:replace("abCe","((?i)AB(?-i)C|D)E","Y\\1Rgo\\1Ican\\1",[global])), 
-?line <<"dE">> = iolist_to_binary(re:replace("dE","((?i)AB(?-i)C|D)E","XvslPbYV&&PG",[])), 
-?line <<"dE">> = iolist_to_binary(re:replace("dE","((?i)AB(?-i)C|D)E","XvslPbYV&&PG",[global])), 
-?line <<"De">> = iolist_to_binary(re:replace("De","((?i)AB(?-i)C|D)E","Ry\\1rxj\\1\\1dTXtld&\\1D&&",[])), 
-?line <<"De">> = iolist_to_binary(re:replace("De","((?i)AB(?-i)C|D)E","Ry\\1rxj\\1\\1dTXtld&\\1D&&",[global])), 
-?line <<"vyabc">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","vy\\1",[])), 
-?line <<"vyabc">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","vy\\1",[global])), 
-?line <<"aLB">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","LB",[])), 
-?line <<"aLB">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","LB",[global])), 
-?line <<"HXjXabc123abcabc123abcabc123abcfUay">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","HXjX&&&fUay",[dotall])), 
-?line <<"HXjXabc123abcabc123abcabc123abcfUay">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","HXjX&&&fUay",[dotall,
-                                                                                                                                                                                                              global])), 
-?line <<"aCRabcRSbc123bcbcokUUyuMbc123bcm">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","CRa\\1RS&\\1okUUyuM&m",[dotall])), 
-?line <<"aCRabcRSbc123bcbcokUUyuMbc123bcm">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","CRa\\1RS&\\1okUUyuM&m",[dotall,
-                                                                                                                                                                                                                                 global])), 
-?line <<"RvRabcJIYH">> = iolist_to_binary(re:replace("abc123abc","((.*))\\d+\\1","RvR\\1JIYH",[])), 
-?line <<"RvRabcJIYH">> = iolist_to_binary(re:replace("abc123abc","((.*))\\d+\\1","RvR\\1JIYH",[global])), 
-?line <<"aRbc123bcmb">> = iolist_to_binary(re:replace("abc123bc","((.*))\\d+\\1","R&mb",[])), 
-?line <<"aRbc123bcmb">> = iolist_to_binary(re:replace("abc123bc","((.*))\\d+\\1","R&mb",[global])), 
-?line <<"ET">> = iolist_to_binary(re:replace("a123::a123","^(?!:)                       # colon disallowed at start
+    literal\\E #more comment","\\1nxvXs",[extended,global])), 
+    <<"NHOqEFFabc\\$xyzj">> = iolist_to_binary(re:replace("abc\\$xyz","\\Qabc\\$xyz\\E","NHOqEFF&j",[])), 
+    <<"NHOqEFFabc\\$xyzj">> = iolist_to_binary(re:replace("abc\\$xyz","\\Qabc\\$xyz\\E","NHOqEFF&j",[global])), 
+    <<"DjW">> = iolist_to_binary(re:replace("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E","DjW",[])), 
+    <<"DjW">> = iolist_to_binary(re:replace("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E","DjW",[global])), 
+    <<"WAnMpAVfX">> = iolist_to_binary(re:replace("abc","\\Gabc","W\\1AnMpAV\\1f\\1X",[])), 
+    <<"WAnMpAVfX">> = iolist_to_binary(re:replace("abc","\\Gabc","W\\1AnMpAV\\1f\\1X",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Gabc","rW&&AVMSknoPI&&w",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\Gabc","rW&&AVMSknoPI&&w",[global])), 
+    <<"xyzabc">> = iolist_to_binary(re:replace("xyzabc","\\Gabc","DFp\\1NhU&",[])), 
+    <<"xyzabc">> = iolist_to_binary(re:replace("xyzabc","\\Gabc","DFp\\1NhU&",[global])), 
+    <<"abc1ifEabc1hgAabc2xyzabc3">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","\\Gabc.","\\1&ifE&hgA",[])), 
+    <<"abc1ifEabc1hgAabc2ifEabc2hgAxyzabc3">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","\\Gabc.","\\1&ifE&hgA",[global])), 
+    <<"QCUPbyyjrEabc2xyzabc3">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","abc.","QC\\1\\1UPbyyj\\1rE",[])), 
+    <<"QCUPbyyjrEQCUPbyyjrExyzQCUPbyyjrE">> = iolist_to_binary(re:replace("abc1abc2xyzabc3","abc.","QC\\1\\1UPbyyj\\1rE",[global])), 
+    <<"XJIJfY">> = iolist_to_binary(re:replace("XabcdY","a(?x: b c )d","JIJf",[])), 
+    <<"XJIJfY">> = iolist_to_binary(re:replace("XabcdY","a(?x: b c )d","JIJf",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?x: b c )d","i&J&NwHJGVUFHoXlLB",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","a(?x: b c )d","i&J&NwHJGVUFHoXlLB",[global])), 
+    <<"Xa b c d Y">> = iolist_to_binary(re:replace("Xa b c d Y","a(?x: b c )d","y&kXPnw&sN&&BHba",[])), 
+    <<"Xa b c d Y">> = iolist_to_binary(re:replace("Xa b c d Y","a(?x: b c )d","y&kXPnw&sN&&BHba",[global])), 
+    <<"XUQRabcabcUrY">> = iolist_to_binary(re:replace("XabcY","((?x)x y z | a b c)","UQR&\\1Ur",[])), 
+    <<"XUQRabcabcUrY">> = iolist_to_binary(re:replace("XabcY","((?x)x y z | a b c)","UQR&\\1Ur",[global])), 
+    <<"AgqfObHxyztxyzMXSCB">> = iolist_to_binary(re:replace("AxyzB","((?x)x y z | a b c)","gqfObH\\1t&MXSC",[])), 
+    <<"AgqfObHxyztxyzMXSCB">> = iolist_to_binary(re:replace("AxyzB","((?x)x y z | a b c)","gqfObH\\1t&MXSC",[global])), 
+    <<"XAAvVabCAjGTsabCPBY">> = iolist_to_binary(re:replace("XabCY","(?i)AB(?-i)C","AAvV&AjGTs&\\1PB",[])), 
+    <<"XAAvVabCAjGTsabCPBY">> = iolist_to_binary(re:replace("XabCY","(?i)AB(?-i)C","AAvV&AjGTs&\\1PB",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i)AB(?-i)C","UmCr&Vrv",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(?i)AB(?-i)C","UmCr&Vrv",[global])), 
+    <<"XabcY">> = iolist_to_binary(re:replace("XabcY","(?i)AB(?-i)C","qxteX",[])), 
+    <<"XabcY">> = iolist_to_binary(re:replace("XabcY","(?i)AB(?-i)C","qxteX",[global])), 
+    <<"ai">> = iolist_to_binary(re:replace("abCE","((?i)AB(?-i)C|D)E","ai",[])), 
+    <<"ai">> = iolist_to_binary(re:replace("abCE","((?i)AB(?-i)C|D)E","ai",[global])), 
+    <<"qRLDKtDtqTDE">> = iolist_to_binary(re:replace("DE","((?i)AB(?-i)C|D)E","qRL\\1Kt\\1tqT&",[])), 
+    <<"qRLDKtDtqTDE">> = iolist_to_binary(re:replace("DE","((?i)AB(?-i)C|D)E","qRL\\1Kt\\1tqT&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)AB(?-i)C|D)E","tJGWHuAQJuV\\1ohL",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((?i)AB(?-i)C|D)E","tJGWHuAQJuV\\1ohL",[global])), 
+    <<"abcE">> = iolist_to_binary(re:replace("abcE","((?i)AB(?-i)C|D)E","SL",[])), 
+    <<"abcE">> = iolist_to_binary(re:replace("abcE","((?i)AB(?-i)C|D)E","SL",[global])), 
+    <<"abCe">> = iolist_to_binary(re:replace("abCe","((?i)AB(?-i)C|D)E","INyHgcjBTk",[])), 
+    <<"abCe">> = iolist_to_binary(re:replace("abCe","((?i)AB(?-i)C|D)E","INyHgcjBTk",[global])), 
+    <<"dE">> = iolist_to_binary(re:replace("dE","((?i)AB(?-i)C|D)E","x\\1",[])), 
+    <<"dE">> = iolist_to_binary(re:replace("dE","((?i)AB(?-i)C|D)E","x\\1",[global])), 
+    <<"De">> = iolist_to_binary(re:replace("De","((?i)AB(?-i)C|D)E","pgmpT&v&DORqu&",[])), 
+    <<"De">> = iolist_to_binary(re:replace("De","((?i)AB(?-i)C|D)E","pgmpT&v&DORqu&",[global])), 
+    <<"abcpy">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","\\1py",[])), 
+    <<"abcpy">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","\\1py",[global])), 
+    <<"aeCYXPUlXbcjXWbcK">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","eCYXPUlX\\1jXW\\1K",[])), 
+    <<"aeCYXPUlXbcjXWbcK">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","eCYXPUlX\\1jXW\\1K",[global])), 
+    <<"hxyLlgCxwsHwpLlIYe">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","hxyLlgCxwsHwpLlIYe",[dotall])), 
+    <<"hxyLlgCxwsHwpLlIYe">> = iolist_to_binary(re:replace("abc123abc","(.*)\\d+\\1","hxyLlgCxwsHwpLlIYe",[dotall,
+                                                                                                                                                                                                                       global])), 
+    <<"aubcbcBbcJobcFXYl">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","u\\1\\1B\\1Jo\\1FXYl",[dotall])), 
+    <<"aubcbcBbcJobcFXYl">> = iolist_to_binary(re:replace("abc123bc","(.*)\\d+\\1","u\\1\\1B\\1Jo\\1FXYl",[dotall,
+                                                                                                                                                                                                                             global])), 
+    <<"BSBMIqq">> = iolist_to_binary(re:replace("abc123abc","((.*))\\d+\\1","BSBMIqq",[])), 
+    <<"BSBMIqq">> = iolist_to_binary(re:replace("abc123abc","((.*))\\d+\\1","BSBMIqq",[global])), 
+    <<"aWbc123bcnWkNJItYcGAvsDNYbW">> = iolist_to_binary(re:replace("abc123bc","((.*))\\d+\\1","W&nWkNJItYcGAvsDNYbW",[])), 
+    <<"aWbc123bcnWkNJItYcGAvsDNYbW">> = iolist_to_binary(re:replace("abc123bc","((.*))\\d+\\1","W&nWkNJItYcGAvsDNYbW",[global])), 
+    <<"kDSa123::a123Tp">> = iolist_to_binary(re:replace("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18060,8 +18141,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","ET",[extended,caseless])), 
-?line <<"ET">> = iolist_to_binary(re:replace("a123::a123","^(?!:)                       # colon disallowed at start
+  ","kDS&T\\1p",[extended,caseless])), 
+    <<"kDSa123::a123Tp">> = iolist_to_binary(re:replace("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18069,8 +18150,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","ET",[extended,caseless,global])), 
-?line <<"nYalhKtcGgINbn">> = iolist_to_binary(re:replace("a123:b342::abcd","^(?!:)                       # colon disallowed at start
+  ","kDS&T\\1p",[extended,caseless,global])), 
+    <<"r">> = iolist_to_binary(re:replace("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18078,8 +18159,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","nY\\1a\\1lhKtcGgINbn",[extended,caseless])), 
-?line <<"nYalhKtcGgINbn">> = iolist_to_binary(re:replace("a123:b342::abcd","^(?!:)                       # colon disallowed at start
+  ","r",[extended,caseless])), 
+    <<"r">> = iolist_to_binary(re:replace("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18087,8 +18168,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","nY\\1a\\1lhKtcGgINbn",[extended,caseless,global])), 
-?line <<"xeKa123:b342::324e:abcdRvTn">> = iolist_to_binary(re:replace("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+  ","r",[extended,caseless,global])), 
+    <<"ia123:b342::324e:abcd">> = iolist_to_binary(re:replace("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18096,8 +18177,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","xeK&RvTn",[extended,caseless])), 
-?line <<"xeKa123:b342::324e:abcdRvTn">> = iolist_to_binary(re:replace("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+  ","i&",[extended,caseless])), 
+    <<"ia123:b342::324e:abcd">> = iolist_to_binary(re:replace("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18105,8 +18186,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","xeK&RvTn",[extended,caseless,global])), 
-?line <<"JHrQJuCtAvAt">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+  ","i&",[extended,caseless,global])), 
+    <<"eYuTiBYPtHa123:ddde:b342::324e:abcdJHIw">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18114,8 +18195,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","JHrQJuCtAvAt",[extended,caseless])), 
-?line <<"JHrQJuCtAvAt">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+  ","eYuTiBYPtH&J\\1HIw",[extended,caseless])), 
+    <<"eYuTiBYPtHa123:ddde:b342::324e:abcdJHIw">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18123,8 +18204,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","JHrQJuCtAvAt",[extended,caseless,global])), 
-?line <<"IphCja">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","eYuTiBYPtH&J\\1HIw",[extended,caseless,global])), 
+    <<"">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18132,8 +18213,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","Ip\\1hCj\\1a",[extended,caseless])), 
-?line <<"IphCja">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","\\1",[extended,caseless])), 
+    <<"">> = iolist_to_binary(re:replace("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18141,8 +18222,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","Ip\\1hCj\\1a",[extended,caseless,global])), 
-?line <<"xAGmJctxEa123:ddde:9999:b342::324e:dcba:abcdjhClw">> = iolist_to_binary(re:replace("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","\\1",[extended,caseless,global])), 
+    <<"a123:ddde:9999:b342::324e:dcba:abcdoLIelBa123:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18150,8 +18231,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","xAGmJctxE&jhClw",[extended,caseless])), 
-?line <<"xAGmJctxEa123:ddde:9999:b342::324e:dcba:abcdjhClw">> = iolist_to_binary(re:replace("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","&oLIelB&",[extended,caseless])), 
+    <<"a123:ddde:9999:b342::324e:dcba:abcdoLIelBa123:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18159,8 +18240,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","xAGmJctxE&jhClw",[extended,caseless,global])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?!:)                       # colon disallowed at start
+  ","&oLIelB&",[extended,caseless,global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18168,8 +18249,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","&jc&",[extended,caseless])), 
-?line <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?!:)                       # colon disallowed at start
+  ","&f\\1I",[extended,caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18177,8 +18258,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","&jc&",[extended,caseless,global])), 
-?line <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+  ","&f\\1I",[extended,caseless,global])), 
+    <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18186,8 +18267,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","xjuUU",[extended,caseless])), 
-?line <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+  ","yUIYbm&\\1qdJb",[extended,caseless])), 
+    <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18195,8 +18276,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","xjuUU",[extended,caseless,global])), 
-?line <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","yUIYbm&\\1qdJb",[extended,caseless,global])), 
+    <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18204,8 +18285,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","&\\1gJElxfvxu\\1ly",[extended,caseless])), 
-?line <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","Xhy\\1&M",[extended,caseless])), 
+    <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18213,8 +18294,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","&\\1gJElxfvxu\\1ly",[extended,caseless,global])), 
-?line <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","Xhy\\1&M",[extended,caseless,global])), 
+    <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18222,8 +18303,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","r",[extended,caseless])), 
-?line <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+  ","sw",[extended,caseless])), 
+    <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(re:replace("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18231,8 +18312,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","r",[extended,caseless,global])), 
-?line <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+  ","sw",[extended,caseless,global])), 
+    <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18240,8 +18321,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","\\1",[extended,caseless])), 
-?line <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+  ","pCUAeIjhQXp\\1K",[extended,caseless])), 
+    <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(re:replace("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18249,8 +18330,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","\\1",[extended,caseless,global])), 
-?line <<"::1">> = iolist_to_binary(re:replace("::1","^(?!:)                       # colon disallowed at start
+  ","pCUAeIjhQXp\\1K",[extended,caseless,global])), 
+    <<"::1">> = iolist_to_binary(re:replace("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18258,8 +18339,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","ymau\\1\\1NVl\\1WdO\\1",[extended,caseless])), 
-?line <<"::1">> = iolist_to_binary(re:replace("::1","^(?!:)                       # colon disallowed at start
+  ","rN\\1Dti&",[extended,caseless])), 
+    <<"::1">> = iolist_to_binary(re:replace("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18267,8 +18348,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","ymau\\1\\1NVl\\1WdO\\1",[extended,caseless,global])), 
-?line <<"abcd:fee0:123::">> = iolist_to_binary(re:replace("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
+  ","rN\\1Dti&",[extended,caseless,global])), 
+    <<"abcd:fee0:123::">> = iolist_to_binary(re:replace("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18276,8 +18357,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","KUuIBK&Px&",[extended,caseless])), 
-?line <<"abcd:fee0:123::">> = iolist_to_binary(re:replace("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
+  ","eRNkqHK\\1RXNGFgu",[extended,caseless])), 
+    <<"abcd:fee0:123::">> = iolist_to_binary(re:replace("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18285,8 +18366,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","KUuIBK&Px&",[extended,caseless,global])), 
-?line <<":1">> = iolist_to_binary(re:replace(":1","^(?!:)                       # colon disallowed at start
+  ","eRNkqHK\\1RXNGFgu",[extended,caseless,global])), 
+    <<":1">> = iolist_to_binary(re:replace(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18294,8 +18375,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","&BwNOmaJ\\1M&\\1TUCr",[extended,caseless])), 
-?line <<":1">> = iolist_to_binary(re:replace(":1","^(?!:)                       # colon disallowed at start
+  ","mbx",[extended,caseless])), 
+    <<":1">> = iolist_to_binary(re:replace(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18303,8 +18384,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","&BwNOmaJ\\1M&\\1TUCr",[extended,caseless,global])), 
-?line <<"1:">> = iolist_to_binary(re:replace("1:","^(?!:)                       # colon disallowed at start
+  ","mbx",[extended,caseless,global])), 
+    <<"1:">> = iolist_to_binary(re:replace("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18312,8 +18393,8 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","J\\1e\\1",[extended,caseless])), 
-?line <<"1:">> = iolist_to_binary(re:replace("1:","^(?!:)                       # colon disallowed at start
+  ","WJB",[extended,caseless])), 
+    <<"1:">> = iolist_to_binary(re:replace("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -18321,278 +18402,1557 @@ xb","(?!^)x","\\1tysI\\1v\\1BVwx\\1FOWG\\1&C",[multiline,
   ){1,7}                      # end item; 1-7 of them required               
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
-  ","J\\1e\\1",[extended,caseless,global])), 
-?line <<"XpmPL">> = iolist_to_binary(re:replace("z","[z\\Qa-d]\\E]","\\1X\\1pmPL",[])), 
-?line <<"XpmPL">> = iolist_to_binary(re:replace("z","[z\\Qa-d]\\E]","\\1X\\1pmPL",[global])), 
-?line <<"WrMTefTPBbaVhaDwab">> = iolist_to_binary(re:replace("a","[z\\Qa-d]\\E]","WrMTefTPBb&V\\1\\1h&Dwab",[])), 
-?line <<"WrMTefTPBbaVhaDwab">> = iolist_to_binary(re:replace("a","[z\\Qa-d]\\E]","WrMTefTPBb&V\\1\\1h&Dwab",[global])), 
-?line <<"uFU-rQ-">> = iolist_to_binary(re:replace("-","[z\\Qa-d]\\E]","uFU\\1\\1&rQ&",[])), 
-?line <<"uFU-rQ-">> = iolist_to_binary(re:replace("-","[z\\Qa-d]\\E]","uFU\\1\\1&rQ&",[global])), 
-?line <<"QliOKMpfH">> = iolist_to_binary(re:replace("d","[z\\Qa-d]\\E]","QliOKMpfH",[])), 
-?line <<"QliOKMpfH">> = iolist_to_binary(re:replace("d","[z\\Qa-d]\\E]","QliOKMpfH",[global])), 
-?line <<"t]KdBE">> = iolist_to_binary(re:replace("]","[z\\Qa-d]\\E]","t\\1&KdBE",[])), 
-?line <<"t]KdBE">> = iolist_to_binary(re:replace("]","[z\\Qa-d]\\E]","t\\1&KdBE",[global])), 
-?line <<"*** FNavaiaOJGqPkBilers">> = iolist_to_binary(re:replace("*** Failers","[z\\Qa-d]\\E]","N&v&i\\1&OJGqPkB",[])), 
-?line <<"*** FNavaiaOJGqPkBilers">> = iolist_to_binary(re:replace("*** Failers","[z\\Qa-d]\\E]","N&v&i\\1&OJGqPkB",[global])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[z\\Qa-d]\\E]","R&ba",[])), 
-?line <<"b">> = iolist_to_binary(re:replace("b","[z\\Qa-d]\\E]","R&ba",[global])), 
-?line <<"sjzSKziFAAJiTVWC">> = iolist_to_binary(re:replace("z","[\\z\\C]","sj&SK&iFAAJiTVWC",[])), 
-?line <<"sjzSKziFAAJiTVWC">> = iolist_to_binary(re:replace("z","[\\z\\C]","sj&SK&iFAAJiTVWC",[global])), 
-?line <<"DDSbIgCmsBKCTmEuitn">> = iolist_to_binary(re:replace("C","[\\z\\C]","D\\1DSbIg&msBK&TmEuitn",[])), 
-?line <<"DDSbIgCmsBKCTmEuitn">> = iolist_to_binary(re:replace("C","[\\z\\C]","D\\1DSbIg&msBK&TmEuitn",[global])), 
-?line <<"cY">> = iolist_to_binary(re:replace("M","\\M","cY\\1",[])), 
-?line <<"cY">> = iolist_to_binary(re:replace("M","\\M","cY\\1",[global])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b","yWOTIFhIX\\1H",[])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b","yWOTIFhIX\\1H",[global])), 
-?line <<"NREGularsRREGularWEYrVRr">> = iolist_to_binary(re:replace("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)","N&\\1sR&WEYrVRr",[])),
-?line <<"NREGularsRREGularWEYrVRr">> = iolist_to_binary(re:replace("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)","N&\\1sR&WEYrVRr",[global])),
-?line <<"G">> = iolist_to_binary(re:replace("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)","G",[])),
-?line <<"G">> = iolist_to_binary(re:replace("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)","G",[global])),
-?line <<"PSsXtwlmy">> = iolist_to_binary(re:replace("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)","PSsXtwlmy",[])),
-?line <<"PSsXtwlmy">> = iolist_to_binary(re:replace("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)","PSsXtwlmy",[global])),
-?line <<"regulärmiYTi">> = iolist_to_binary(re:replace("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)","&miYTi\\1\\1",[])),
-?line <<"regulärmiYTi">> = iolist_to_binary(re:replace("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)","&miYTi\\1\\1",[global])),
-?line <<"WÅæåäàrxhÅæåäàyUoaLOIegmSA">> = iolist_to_binary(re:replace("Åæåäà","Åæåä[à-ÿÀ-ß]+","W&rxh&yUoaL\\1OIegmS\\1A",[])),
-?line <<"WÅæåäàrxhÅæåäàyUoaLOIegmSA">> = iolist_to_binary(re:replace("Åæåäà","Åæåä[à-ÿÀ-ß]+","W&rxh&yUoaL\\1OIegmS\\1A",[global])),
-?line <<"FÅæåäÿgnWPyHehÅæåäÿtXTQ">> = iolist_to_binary(re:replace("Åæåäÿ","Åæåä[à-ÿÀ-ß]+","F&gnWPyHe\\1h&tXTQ",[])),
-?line <<"FÅæåäÿgnWPyHehÅæåäÿtXTQ">> = iolist_to_binary(re:replace("Åæåäÿ","Åæåä[à-ÿÀ-ß]+","F&gnWPyHe\\1h&tXTQ",[global])),
-?line <<"sHerHnAhAdx">> = iolist_to_binary(re:replace("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+","sHer\\1HnA\\1h\\1Adx",[])),
-?line <<"sHerHnAhAdx">> = iolist_to_binary(re:replace("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+","sHer\\1HnA\\1h\\1Adx",[global])),
-?line <<"trobAQoUÅæåäßn">> = iolist_to_binary(re:replace("Åæåäß","Åæåä[à-ÿÀ-ß]+","tr\\1obAQoU&n",[])),
-?line <<"trobAQoUÅæåäßn">> = iolist_to_binary(re:replace("Åæåäß","Åæåä[à-ÿÀ-ß]+","tr\\1obAQoU&n",[global])),
-?line <<"„XAZSd">> = iolist_to_binary(re:replace("„XAZXB","(?<=Z)X.","Sd",[])),
-?line <<"„XAZSd">> = iolist_to_binary(re:replace("„XAZXB","(?<=Z)X.","Sd",[global])),
-?line <<"A">> = iolist_to_binary(re:replace("ab cd defg","ab cd (?x) de fg","\\1A\\1",[])), 
-?line <<"A">> = iolist_to_binary(re:replace("ab cd defg","ab cd (?x) de fg","\\1A\\1",[global])), 
-?line <<"fab cddefgLdtKCtPab cddefgxvVUHDah">> = iolist_to_binary(re:replace("ab cddefg","ab cd(?x) de fg","f&LdtKC\\1\\1tP&xvVUHDah",[])), 
-?line <<"fab cddefgLdtKCtPab cddefgxvVUHDah">> = iolist_to_binary(re:replace("ab cddefg","ab cd(?x) de fg","f&LdtKC\\1\\1tP&xvVUHDah",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","ab cd(?x) de fg","BkO\\1dl&WNuvnGhG&Qkl",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","ab cd(?x) de fg","BkO\\1dl&WNuvnGhG&Qkl",[global])), 
-?line <<"abcddefg">> = iolist_to_binary(re:replace("abcddefg","ab cd(?x) de fg","SCJx&",[])), 
-?line <<"abcddefg">> = iolist_to_binary(re:replace("abcddefg","ab cd(?x) de fg","SCJx&",[global])), 
-?line <<"foobarLvX">> = iolist_to_binary(re:replace("foobarX","(?<![^f]oo)(bar)","&Lv",[])), 
-?line <<"foobarLvX">> = iolist_to_binary(re:replace("foobarX","(?<![^f]oo)(bar)","&Lv",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f]oo)(bar)","dRgI\\1vl\\1\\1eC\\1RFQ",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f]oo)(bar)","dRgI\\1vl\\1\\1eC\\1RFQ",[global])), 
-?line <<"boobarX">> = iolist_to_binary(re:replace("boobarX","(?<![^f]oo)(bar)","p\\1CU&Q",[])), 
-?line <<"boobarX">> = iolist_to_binary(re:replace("boobarX","(?<![^f]oo)(bar)","p\\1CU&Q",[global])), 
-?line <<"offmnXHaaIXuXOo">> = iolist_to_binary(re:replace("offX","(?<![^f])X","m\\1n&HaaI\\1&u&Oo",[])), 
-?line <<"offmnXHaaIXuXOo">> = iolist_to_binary(re:replace("offX","(?<![^f])X","m\\1n&HaaI\\1&u&Oo",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f])X","jhEwy&w\\1mfw\\1H&VBqnX\\1",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f])X","jhEwy&w\\1mfw\\1H&VBqnX\\1",[global])), 
-?line <<"onyX">> = iolist_to_binary(re:replace("onyX","(?<![^f])X","HyLQEU",[])), 
-?line <<"onyX">> = iolist_to_binary(re:replace("onyX","(?<![^f])X","HyLQEU",[global])), 
-?line <<"onyNXN">> = iolist_to_binary(re:replace("onyX","(?<=[^f])X","\\1N&N",[])), 
-?line <<"onyNXN">> = iolist_to_binary(re:replace("onyX","(?<=[^f])X","\\1N&N",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^f])X","kt&SCnnaVhTlQMnFltwd",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^f])X","kt&SCnnaVhTlQMnFltwd",[global])), 
-?line <<"offX">> = iolist_to_binary(re:replace("offX","(?<=[^f])X","UsgnsEG\\1LX&DB",[])), 
-?line <<"offX">> = iolist_to_binary(re:replace("offX","(?<=[^f])X","UsgnsEG\\1LX&DB",[global])), 
-?line <<"FOjOAeQxFFXja
+  ","WJB",[extended,caseless,global])), 
+    <<"NdcuJzCbxTd">> = iolist_to_binary(re:replace("z","[z\\Qa-d]\\E]","NdcuJ\\1&CbxTd",[])), 
+    <<"NdcuJzCbxTd">> = iolist_to_binary(re:replace("z","[z\\Qa-d]\\E]","NdcuJ\\1&CbxTd",[global])), 
+    <<"VLxNqfjwruLh">> = iolist_to_binary(re:replace("a","[z\\Qa-d]\\E]","VL\\1xNqfj\\1wruLh",[])), 
+    <<"VLxNqfjwruLh">> = iolist_to_binary(re:replace("a","[z\\Qa-d]\\E]","VL\\1xNqfj\\1wruLh",[global])), 
+    <<"jX">> = iolist_to_binary(re:replace("-","[z\\Qa-d]\\E]","jX",[])), 
+    <<"jX">> = iolist_to_binary(re:replace("-","[z\\Qa-d]\\E]","jX",[global])), 
+    <<"XRHLEUuwPyRxGJEv">> = iolist_to_binary(re:replace("d","[z\\Qa-d]\\E]","X\\1RHLEUuwP\\1yRxGJEv",[])), 
+    <<"XRHLEUuwPyRxGJEv">> = iolist_to_binary(re:replace("d","[z\\Qa-d]\\E]","X\\1RHLEUuwP\\1yRxGJEv",[global])), 
+    <<"Gtcd">> = iolist_to_binary(re:replace("]","[z\\Qa-d]\\E]","Gt\\1cd",[])), 
+    <<"Gtcd">> = iolist_to_binary(re:replace("]","[z\\Qa-d]\\E]","Gt\\1cd",[global])), 
+    <<"*** FCaQDFtaYgknvailers">> = iolist_to_binary(re:replace("*** Failers","[z\\Qa-d]\\E]","C&Q\\1\\1\\1DF\\1t&Ygknv&\\1",[])), 
+    <<"*** FCaQDFtaYgknvailers">> = iolist_to_binary(re:replace("*** Failers","[z\\Qa-d]\\E]","C&Q\\1\\1\\1DF\\1t&Ygknv&\\1",[global])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[z\\Qa-d]\\E]","rUhPPBvokQvYvRC",[])), 
+    <<"b">> = iolist_to_binary(re:replace("b","[z\\Qa-d]\\E]","rUhPPBvokQvYvRC",[global])), 
+    ok.
+run34() ->
+    <<"jOKAO">> = iolist_to_binary(re:replace("z","[\\z\\C]","jOKAO",[])), 
+    <<"jOKAO">> = iolist_to_binary(re:replace("z","[\\z\\C]","jOKAO",[global])), 
+    <<"UIfGQohtPCcNiR">> = iolist_to_binary(re:replace("C","[\\z\\C]","\\1UIfGQohtP&c\\1\\1NiR",[])), 
+    <<"UIfGQohtPCcNiR">> = iolist_to_binary(re:replace("C","[\\z\\C]","\\1UIfGQohtP&c\\1\\1NiR",[global])), 
+    <<"xjHNUJliwGsC">> = iolist_to_binary(re:replace("M","\\M","xjHNUJ\\1liwGsC",[])), 
+    <<"xjHNUJliwGsC">> = iolist_to_binary(re:replace("M","\\M","xjHNUJ\\1liwGsC",[global])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b","ss\\1vxH\\1fmwG",[])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b","ss\\1vxH\\1fmwG",[global])), 
+    <<"„XAZXS">> = iolist_to_binary(re:replace("„XAZXB","(?<=Z)X.","XS",[])), 
+    <<"„XAZXS">> = iolist_to_binary(re:replace("„XAZXB","(?<=Z)X.","XS",[global])), 
+    <<"fU">> = iolist_to_binary(re:replace("ab cd defg","ab cd (?x) de fg","fU",[])), 
+    <<"fU">> = iolist_to_binary(re:replace("ab cd defg","ab cd (?x) de fg","fU",[global])), 
+    <<"ditab cddefg">> = iolist_to_binary(re:replace("ab cddefg","ab cd(?x) de fg","\\1dit&",[])), 
+    <<"ditab cddefg">> = iolist_to_binary(re:replace("ab cddefg","ab cd(?x) de fg","\\1dit&",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","ab cd(?x) de fg","&Kr&\\1EgsvGfRsKlm",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","ab cd(?x) de fg","&Kr&\\1EgsvGfRsKlm",[global])), 
+    <<"abcddefg">> = iolist_to_binary(re:replace("abcddefg","ab cd(?x) de fg","\\1",[])), 
+    <<"abcddefg">> = iolist_to_binary(re:replace("abcddefg","ab cd(?x) de fg","\\1",[global])), 
+    <<"fooXSbarrbNX">> = iolist_to_binary(re:replace("foobarX","(?<![^f]oo)(bar)","XS\\1rbN",[])), 
+    <<"fooXSbarrbNX">> = iolist_to_binary(re:replace("foobarX","(?<![^f]oo)(bar)","XS\\1rbN",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f]oo)(bar)","P\\1\\1\\1&C\\1N\\1DLnhU&T",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f]oo)(bar)","P\\1\\1\\1&C\\1N\\1DLnhU&T",[global])), 
+    <<"boobarX">> = iolist_to_binary(re:replace("boobarX","(?<![^f]oo)(bar)","S&HuDj&pl&\\1K",[])), 
+    <<"boobarX">> = iolist_to_binary(re:replace("boobarX","(?<![^f]oo)(bar)","S&HuDj&pl&\\1K",[global])), 
+    <<"offAWvYjHsJodXLI">> = iolist_to_binary(re:replace("offX","(?<![^f])X","AWvYjHs\\1J\\1od&LI",[])), 
+    <<"offAWvYjHsJodXLI">> = iolist_to_binary(re:replace("offX","(?<![^f])X","AWvYjHs\\1J\\1od&LI",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f])X","\\1on",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<![^f])X","\\1on",[global])), 
+    <<"onyX">> = iolist_to_binary(re:replace("onyX","(?<![^f])X","&f&D",[])), 
+    <<"onyX">> = iolist_to_binary(re:replace("onyX","(?<![^f])X","&f&D",[global])), 
+    <<"onyE">> = iolist_to_binary(re:replace("onyX","(?<=[^f])X","E",[])), 
+    <<"onyE">> = iolist_to_binary(re:replace("onyX","(?<=[^f])X","E",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^f])X","lEuucWp\\1&m",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^f])X","lEuucWp\\1&m",[global])), 
+    <<"offX">> = iolist_to_binary(re:replace("offX","(?<=[^f])X","QNevBRs\\1&OKqB&\\1\\1H",[])), 
+    <<"offX">> = iolist_to_binary(re:replace("offX","(?<=[^f])X","QNevBRs\\1&OKqB&\\1\\1H",[global])), 
+    <<"lHqgba
 b
 c">> = iolist_to_binary(re:replace("a
 b
-c","^","FOjO&AeQx&FFXj",[multiline])), 
-?line <<"FOjOAeQxFFXja
-FOjOAeQxFFXjb
-FOjOAeQxFFXjc">> = iolist_to_binary(re:replace("a
+c","^","lHqg&b&",[multiline])), 
+    <<"lHqgba
+lHqgbb
+lHqgbc">> = iolist_to_binary(re:replace("a
 b
-c","^","FOjO&AeQx&FFXj",[multiline,global])), 
-?line <<"jwIVfrtVCpnVwNgju">> = iolist_to_binary(re:replace("","^","jwIVfrtVCpnVwNgju",[multiline])), 
-?line <<"jwIVfrtVCpnVwNgju">> = iolist_to_binary(re:replace("","^","jwIVfrtVCpnVwNgju",[multiline,
-                                                                                                                                                                               global])), 
-?line <<"A
+c","^","lHqg&b&",[multiline,global])), 
+    <<"VDMcObuOyb">> = iolist_to_binary(re:replace("","^","VDM&cObuOy\\1b",[multiline])), 
+    <<"VDMcObuOyb">> = iolist_to_binary(re:replace("","^","VDM&cObuOy\\1b",[multiline,
+                                                                                                                                                                         global])), 
+    <<"A
 C
-sugWOwdKBC">> = iolist_to_binary(re:replace("A
+luYGJMVrKYIkybC">> = iolist_to_binary(re:replace("A
 C
-C","(?<=C\\n)^","sugW&&\\1OwdKB",[multiline])), 
-?line <<"A
+C","(?<=C\\n)^","lu\\1Y&GJM\\1VrKY&Ikyb\\1",[multiline])), 
+    <<"A
 C
-sugWOwdKBC">> = iolist_to_binary(re:replace("A
+luYGJMVrKYIkybC">> = iolist_to_binary(re:replace("A
 C
-C","(?<=C\\n)^","sugW&&\\1OwdKB",[multiline,global])), 
-?line <<"dIXQXEThebXaXXcLjA">> = iolist_to_binary(re:replace("bXaX","(?:(?(1)a|b)(X))+","dI\\1Q\\1EThe&\\1cLjA",[])), 
-?line <<"dIXQXEThebXaXXcLjA">> = iolist_to_binary(re:replace("bXaX","(?:(?(1)a|b)(X))+","dI\\1Q\\1EThe&\\1cLjA",[global])), 
-?line <<"AvB">> = iolist_to_binary(re:replace("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+","AvB",[])), 
-?line <<"AvB">> = iolist_to_binary(re:replace("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+","AvB",[global])), 
-?line <<"EHtFjtbXESMPhXXYaXXaX">> = iolist_to_binary(re:replace("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+","EHtFjt&ESMPh\\1\\1",[])), 
-?line <<"EHtFjtbXESMPhXXYaXXaX">> = iolist_to_binary(re:replace("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+","EHtFjt&ESMPh\\1\\1",[global])), 
-?line <<"bXnIbjbXebXpecwXaYYaY">> = iolist_to_binary(re:replace("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+","&nIbj&\\1e&p\\1ecw",[])), 
-?line <<"bXnIbjbXebXpecwXaYYaY">> = iolist_to_binary(re:replace("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+","&nIbj&\\1e&p\\1ecw",[global])), 
-?line <<"Fv">> = iolist_to_binary(re:replace("abc]","[[,abc,]+]","Fv",[])), 
-?line <<"Fv">> = iolist_to_binary(re:replace("abc]","[[,abc,]+]","Fv",[global])), 
-?line <<"enGFFPGa,b]Vq">> = iolist_to_binary(re:replace("a,b]","[[,abc,]+]","enGFFPG&V\\1q",[])), 
-?line <<"enGFFPGa,b]Vq">> = iolist_to_binary(re:replace("a,b]","[[,abc,]+]","enGFFPG&V\\1q",[global])), 
-?line <<"SLU[a,b,c]KDFqnru[a,b,c]">> = iolist_to_binary(re:replace("[a,b,c]","[[,abc,]+]","SLU&KDFqnru&",[])), 
-?line <<"SLU[a,b,c]KDFqnru[a,b,c]">> = iolist_to_binary(re:replace("[a,b,c]","[[,abc,]+]","SLU&KDFqnru&",[global])), 
-?line <<"AFHpB">> = iolist_to_binary(re:replace("A B","(?-x: )","FHp",[extended])), 
-?line <<"AFHpB">> = iolist_to_binary(re:replace("A B","(?-x: )","FHp",[extended,
-                                                                                                                                                                     global])), 
-?line <<"ALptWSVme #  #  # B">> = iolist_to_binary(re:replace("A # B","(?x)(?-x: \\s*#\\s*)","LptWSVme&\\1&&",[])), 
-?line <<"ALptWSVme #  #  # B">> = iolist_to_binary(re:replace("A # B","(?x)(?-x: \\s*#\\s*)","LptWSVme&\\1&&",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x)(?-x: \\s*#\\s*)","enBY&\\1vE&\\1I\\1IhttjD\\1",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x)(?-x: \\s*#\\s*)","enBY&\\1vE&\\1I\\1IhttjD\\1",[global])), 
-?line <<"#">> = iolist_to_binary(re:replace("#","(?x)(?-x: \\s*#\\s*)","c\\1cwAsih",[])), 
-?line <<"#">> = iolist_to_binary(re:replace("#","(?x)(?-x: \\s*#\\s*)","c\\1cwAsih",[global])), 
-?line <<"ARtjg #includeDy #includeg">> = iolist_to_binary(re:replace("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","Rtjg&Dy\\1&g",[])), 
-?line <<"ARtjg #includeDy #includeg">> = iolist_to_binary(re:replace("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","Rtjg&Dy\\1&g",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include","tYbpFaHd\\1GjcqHIWx\\1a",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include","tYbpFaHd\\1GjcqHIWx\\1a",[global])), 
-?line <<"A#include">> = iolist_to_binary(re:replace("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","nv\\1tgvlSHVHyKOMPNXVF",[])), 
-?line <<"A#include">> = iolist_to_binary(re:replace("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","nv\\1tgvlSHVHyKOMPNXVF",[global])), 
-?line <<"A #Include">> = iolist_to_binary(re:replace("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","kQdv",[])), 
-?line <<"A #Include">> = iolist_to_binary(re:replace("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","kQdv",[global])), 
-?line <<"k">> = iolist_to_binary(re:replace("aaabbbb","a*b*\\w","k",[])), 
-?line <<"k">> = iolist_to_binary(re:replace("aaabbbb","a*b*\\w","k",[global])), 
-?line <<"xaaaa">> = iolist_to_binary(re:replace("aaaa","a*b*\\w","x&",[])), 
-?line <<"xaaaa">> = iolist_to_binary(re:replace("aaaa","a*b*\\w","x&",[global])), 
-?line <<"pOagbKtJauauHwjM">> = iolist_to_binary(re:replace("a","a*b*\\w","pOagbKtJ&uauHwjM",[])), 
-?line <<"pOagbKtJauauHwjM">> = iolist_to_binary(re:replace("a","a*b*\\w","pOagbKtJ&uauHwjM",[global])), 
-?line <<"tuaaabbPhWfMuDrCJEUabb">> = iolist_to_binary(re:replace("aaabbbb","a*b?\\w","tu&P\\1h\\1WfMu\\1Dr\\1CJEUa",[])), 
-?line <<"tuaaabbPhWfMuDrCJEUatubbPhWfMuDrCJEUa">> = iolist_to_binary(re:replace("aaabbbb","a*b?\\w","tu&P\\1h\\1WfMu\\1Dr\\1CJEUa",[global])), 
-?line <<"heEGaaaabPJaaaaaaaakUYNXaaaasNCaaaa">> = iolist_to_binary(re:replace("aaaa","a*b?\\w","heEG&bPJ&&kUYNX&sNC&",[])), 
-?line <<"heEGaaaabPJaaaaaaaakUYNXaaaasNCaaaa">> = iolist_to_binary(re:replace("aaaa","a*b?\\w","heEG&bPJ&&kUYNX&sNC&",[global])), 
-?line <<"cjDPFiqs">> = iolist_to_binary(re:replace("a","a*b?\\w","cjDPFiq\\1s",[])), 
-?line <<"cjDPFiqs">> = iolist_to_binary(re:replace("a","a*b?\\w","cjDPFiq\\1s",[global])), 
-?line <<"aaabbbbU">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,4}\\w","&U",[])), 
-?line <<"aaabbbbU">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,4}\\w","&U",[global])), 
-?line <<"kaaaavgaaaaFaaaa">> = iolist_to_binary(re:replace("aaaa","a*b{0,4}\\w","k&vg&F&",[])), 
-?line <<"kaaaavgaaaaFaaaa">> = iolist_to_binary(re:replace("aaaa","a*b{0,4}\\w","k&vg&F&",[global])), 
-?line <<"ahHM">> = iolist_to_binary(re:replace("a","a*b{0,4}\\w","&hHM",[])), 
-?line <<"ahHM">> = iolist_to_binary(re:replace("a","a*b{0,4}\\w","&hHM",[global])), 
-?line <<"aaabbbbkVyXSBUXNHaaabbbbSC">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,}\\w","\\1&kVyXSBUXNH&SC\\1",[])), 
-?line <<"aaabbbbkVyXSBUXNHaaabbbbSC">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,}\\w","\\1&kVyXSBUXNH&SC\\1",[global])), 
-?line <<"JsaaaaARjP">> = iolist_to_binary(re:replace("aaaa","a*b{0,}\\w","Js&ARjP",[])), 
-?line <<"JsaaaaARjP">> = iolist_to_binary(re:replace("aaaa","a*b{0,}\\w","Js&ARjP",[global])), 
-?line <<"safA">> = iolist_to_binary(re:replace("a","a*b{0,}\\w","s\\1&fA",[])), 
-?line <<"safA">> = iolist_to_binary(re:replace("a","a*b{0,}\\w","s\\1&fA",[global])), 
-?line <<"0aGcgVV0aXhLIJ">> = iolist_to_binary(re:replace("0a","a*\\d*\\w","&GcgVV&XhLIJ",[])), 
-?line <<"0aGcgVV0aXhLIJ">> = iolist_to_binary(re:replace("0a","a*\\d*\\w","&GcgVV&XhLIJ",[global])), 
-?line <<"OWJamuSoHvWtdO">> = iolist_to_binary(re:replace("a","a*\\d*\\w","OWJ&muSoHvWtdO",[])), 
-?line <<"OWJamuSoHvWtdO">> = iolist_to_binary(re:replace("a","a*\\d*\\w","OWJ&muSoHvWtdO",[global])), 
-?line <<"jLLQBsEdhgm">> = iolist_to_binary(re:replace("a","a*b *\\w","jLLQ\\1BsE\\1dhgm",[extended])), 
-?line <<"jLLQBsEdhgm">> = iolist_to_binary(re:replace("a","a*b *\\w","jLLQ\\1BsE\\1dhgm",[extended,
-                                                                                                                                                                                                  global])), 
-?line <<"JFKdkakQmYFCpg">> = iolist_to_binary(re:replace("a","a*b#comment
-  *\\w","JFKdk&kQmYFCpg",[extended])), 
-?line <<"JFKdkakQmYFCpg">> = iolist_to_binary(re:replace("a","a*b#comment
-  *\\w","JFKdk&kQmYFCpg",[extended,global])), 
-?line <<"UeHUaDNFkPaoa">> = iolist_to_binary(re:replace("a","a* b *\\w","UeHU&DNFkP&o&\\1",[extended])), 
-?line <<"UeHUaDNFkPaoa">> = iolist_to_binary(re:replace("a","a* b *\\w","UeHU&DNFkP&o&\\1",[extended,
-                                                                                                                                                                                                    global])), 
-?line <<"Qomltkg
+C","(?<=C\\n)^","lu\\1Y&GJM\\1VrKY&Ikyb\\1",[multiline,global])), 
+    <<"siXpqbXaXURhpboidbXaXRg">> = iolist_to_binary(re:replace("bXaX","(?:(?(1)a|b)(X))+","si\\1pq&URhpboid&Rg",[])), 
+    <<"siXpqbXaXURhpboidbXaXRg">> = iolist_to_binary(re:replace("bXaX","(?:(?(1)a|b)(X))+","si\\1pq&URhpboid&Rg",[global])), 
+    <<"AmhmmmbXXaYYaYAOkoG">> = iolist_to_binary(re:replace("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+","Amhmmm&AOkoG",[])), 
+    <<"AmhmmmbXXaYYaYAOkoG">> = iolist_to_binary(re:replace("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+","Amhmmm&AOkoG",[global])), 
+    <<"PtXQXEwjfhYaXXaX">> = iolist_to_binary(re:replace("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+","PtXQ\\1Ewjfh",[])), 
+    <<"PtXQXEwjfhYaXXaX">> = iolist_to_binary(re:replace("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+","PtXQ\\1Ewjfh",[global])), 
+    <<"qpflyycYXuQXaYYaY">> = iolist_to_binary(re:replace("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+","q\\1pflyycY\\1XuQ",[])), 
+    <<"qpflyycYXuQXaYYaY">> = iolist_to_binary(re:replace("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+","q\\1pflyycY\\1XuQ",[global])), 
+    <<"abc]GgJESKfdixjabc]">> = iolist_to_binary(re:replace("abc]","[[,abc,]+]","&GgJESKf\\1di\\1xj&",[])), 
+    <<"abc]GgJESKfdixjabc]">> = iolist_to_binary(re:replace("abc]","[[,abc,]+]","&GgJESKf\\1di\\1xj&",[global])), 
+    <<"wa,b]a,b]hta,b]NQ">> = iolist_to_binary(re:replace("a,b]","[[,abc,]+]","w&&ht&N\\1Q",[])), 
+    <<"wa,b]a,b]hta,b]NQ">> = iolist_to_binary(re:replace("a,b]","[[,abc,]+]","w&&ht&N\\1Q",[global])), 
+    <<"aDIlRnUPE[a,b,c]VAaV[a,b,c]V">> = iolist_to_binary(re:replace("[a,b,c]","[[,abc,]+]","aDIlRnU\\1PE&VAaV&V",[])), 
+    <<"aDIlRnUPE[a,b,c]VAaV[a,b,c]V">> = iolist_to_binary(re:replace("[a,b,c]","[[,abc,]+]","aDIlRnU\\1PE&VAaV&V",[global])), 
+    <<"AVNFmY XbCfJ B">> = iolist_to_binary(re:replace("A B","(?-x: )","V\\1NFmY\\1&X\\1bC\\1fJ&",[extended])), 
+    <<"AVNFmY XbCfJ B">> = iolist_to_binary(re:replace("A B","(?-x: )","V\\1NFmY\\1&X\\1bC\\1fJ&",[extended,
+                                                                                                                                                                                                                   global])), 
+    <<"ABB">> = iolist_to_binary(re:replace("A # B","(?x)(?-x: \\s*#\\s*)","B",[])), 
+    <<"ABB">> = iolist_to_binary(re:replace("A # B","(?x)(?-x: \\s*#\\s*)","B",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x)(?-x: \\s*#\\s*)","&CgSC",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x)(?-x: \\s*#\\s*)","&CgSC",[global])), 
+    <<"#">> = iolist_to_binary(re:replace("#","(?x)(?-x: \\s*#\\s*)","&&VXAaYSEf",[])), 
+    <<"#">> = iolist_to_binary(re:replace("#","(?x)(?-x: \\s*#\\s*)","&&VXAaYSEf",[global])), 
+    <<"A #includeu">> = iolist_to_binary(re:replace("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","&u",[])), 
+    <<"A #includeu">> = iolist_to_binary(re:replace("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","&u",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include","KyMhf",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include","KyMhf",[global])), 
+    <<"A#include">> = iolist_to_binary(re:replace("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","PFlBaBuo\\1\\1\\1&Uu",[])), 
+    <<"A#include">> = iolist_to_binary(re:replace("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","PFlBaBuo\\1\\1\\1&Uu",[global])), 
+    <<"A #Include">> = iolist_to_binary(re:replace("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","D\\1SrsbvVOeg\\1OC&Wy",[])), 
+    <<"A #Include">> = iolist_to_binary(re:replace("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include","D\\1SrsbvVOeg\\1OC&Wy",[global])), 
+    ok.
+run35() ->
+    <<"AYafQSUNhFRibaaabbbbT">> = iolist_to_binary(re:replace("aaabbbb","a*b*\\w","AYafQSUNhFRib&T",[])), 
+    <<"AYafQSUNhFRibaaabbbbT">> = iolist_to_binary(re:replace("aaabbbb","a*b*\\w","AYafQSUNhFRib&T",[global])), 
+    <<"vKBXMQS">> = iolist_to_binary(re:replace("aaaa","a*b*\\w","vKBXMQS\\1",[])), 
+    <<"vKBXMQS">> = iolist_to_binary(re:replace("aaaa","a*b*\\w","vKBXMQS\\1",[global])), 
+    <<"atbBVaRw">> = iolist_to_binary(re:replace("a","a*b*\\w","&tbBV&Rw",[])), 
+    <<"atbBVaRw">> = iolist_to_binary(re:replace("a","a*b*\\w","&tbBV&Rw",[global])), 
+    <<"QDXPfbb">> = iolist_to_binary(re:replace("aaabbbb","a*b?\\w","QDXPf\\1",[])), 
+    <<"QDXPfQDXPf">> = iolist_to_binary(re:replace("aaabbbb","a*b?\\w","QDXPf\\1",[global])), 
+    <<"qIIJaaaafyqkXQdN">> = iolist_to_binary(re:replace("aaaa","a*b?\\w","qIIJ&fyqkXQ\\1dN",[])), 
+    <<"qIIJaaaafyqkXQdN">> = iolist_to_binary(re:replace("aaaa","a*b?\\w","qIIJ&fyqkXQ\\1dN",[global])), 
+    <<"aqAJFQ">> = iolist_to_binary(re:replace("a","a*b?\\w","&qAJFQ",[])), 
+    <<"aqAJFQ">> = iolist_to_binary(re:replace("a","a*b?\\w","&qAJFQ",[global])), 
+    <<"qVNjOTqaaabbbbQfis">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,4}\\w","qV\\1NjOTq\\1&Qf\\1is\\1",[])), 
+    <<"qVNjOTqaaabbbbQfis">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,4}\\w","qV\\1NjOTq\\1&Qf\\1is\\1",[global])), 
+    <<"caaaaIqaaaa">> = iolist_to_binary(re:replace("aaaa","a*b{0,4}\\w","c&I\\1q&",[])), 
+    <<"caaaaIqaaaa">> = iolist_to_binary(re:replace("aaaa","a*b{0,4}\\w","c&I\\1q&",[global])), 
+    <<"MJLlapba">> = iolist_to_binary(re:replace("a","a*b{0,4}\\w","MJLl&\\1pb&",[])), 
+    <<"MJLlapba">> = iolist_to_binary(re:replace("a","a*b{0,4}\\w","MJLl&\\1pb&",[global])), 
+    <<"Uxbbm">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,}\\w","Uxbbm\\1",[])), 
+    <<"Uxbbm">> = iolist_to_binary(re:replace("aaabbbb","a*b{0,}\\w","Uxbbm\\1",[global])), 
+    <<"fHXfIxomDIMBKtdig">> = iolist_to_binary(re:replace("aaaa","a*b{0,}\\w","f\\1HXfIxomD\\1\\1IMBKtdig",[])), 
+    <<"fHXfIxomDIMBKtdig">> = iolist_to_binary(re:replace("aaaa","a*b{0,}\\w","f\\1HXfIxomD\\1\\1IMBKtdig",[global])), 
+    <<"hdaYrYD">> = iolist_to_binary(re:replace("a","a*b{0,}\\w","\\1hd&YrYD\\1",[])), 
+    <<"hdaYrYD">> = iolist_to_binary(re:replace("a","a*b{0,}\\w","\\1hd&YrYD\\1",[global])), 
+    <<"xIjjbHXKSKRKUhwCer">> = iolist_to_binary(re:replace("0a","a*\\d*\\w","xIjjbHXKSKRKUhwCer",[])), 
+    <<"xIjjbHXKSKRKUhwCer">> = iolist_to_binary(re:replace("0a","a*\\d*\\w","xIjjbHXKSKRKUhwCer",[global])), 
+    <<"aklRHKO">> = iolist_to_binary(re:replace("a","a*\\d*\\w","&klRHK\\1O",[])), 
+    <<"aklRHKO">> = iolist_to_binary(re:replace("a","a*\\d*\\w","&klRHK\\1O",[global])), 
+    <<"aaaTxVbkRpu">> = iolist_to_binary(re:replace("a","a*b *\\w","&&&TxVbk\\1Rpu",[extended])), 
+    <<"aaaTxVbkRpu">> = iolist_to_binary(re:replace("a","a*b *\\w","&&&TxVbk\\1Rpu",[extended,
+                                                                                                                                                                                            global])), 
+    <<"ekWkPj">> = iolist_to_binary(re:replace("a","a*b#comment
+  *\\w","ekWkPj",[extended])), 
+    <<"ekWkPj">> = iolist_to_binary(re:replace("a","a*b#comment
+  *\\w","ekWkPj",[extended,global])), 
+    <<"XxA">> = iolist_to_binary(re:replace("a","a* b *\\w","XxA",[extended])), 
+    <<"XxA">> = iolist_to_binary(re:replace("a","a* b *\\w","XxA",[extended,
+                                                                                                                                                                    global])), 
+    <<"FL
 pqr">> = iolist_to_binary(re:replace("abc=xyz\\
-pqr","^\\w+=.*(\\\\\\n.*)*","\\1Qomltkg",[])), 
-?line <<"Qomltkg
+pqr","^\\w+=.*(\\\\\\n.*)*","FL",[])), 
+    <<"FL
 pqr">> = iolist_to_binary(re:replace("abc=xyz\\
-pqr","^\\w+=.*(\\\\\\n.*)*","\\1Qomltkg",[global])), 
-?line <<"abcdVXTDna">> = iolist_to_binary(re:replace("abcd:","(?=(\\w+))\\1:","\\1VXTDna",[])), 
-?line <<"abcdVXTDna">> = iolist_to_binary(re:replace("abcd:","(?=(\\w+))\\1:","\\1VXTDna",[global])), 
-?line <<"dxHUL">> = iolist_to_binary(re:replace("abcd:","^(?=(\\w+))\\1:","dxHUL",[])), 
-?line <<"dxHUL">> = iolist_to_binary(re:replace("abcd:","^(?=(\\w+))\\1:","dxHUL",[global])), 
-?line <<"HsivTabcLabcC">> = iolist_to_binary(re:replace("abc","^\\Eabc","H\\1\\1sivT&L&C\\1",[])), 
-?line <<"HsivTabcLabcC">> = iolist_to_binary(re:replace("abc","^\\Eabc","H\\1\\1sivT&L&C\\1",[global])), 
-?line <<"HaCuWiasgghyJxOoaVMR">> = iolist_to_binary(re:replace("a","^[\\Eabc]","HaCuWi&sgghyJxOo&VMR",[])), 
-?line <<"HaCuWiasgghyJxOoaVMR">> = iolist_to_binary(re:replace("a","^[\\Eabc]","HaCuWi&sgghyJxOo&VMR",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\Eabc]","Lc&Jjl&YLfuY",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\Eabc]","Lc&Jjl&YLfuY",[global])), 
-?line <<"E">> = iolist_to_binary(re:replace("E","^[\\Eabc]","MS\\1e",[])), 
-?line <<"E">> = iolist_to_binary(re:replace("E","^[\\Eabc]","MS\\1e",[global])), 
-?line <<"rtpBWkcLbtGo">> = iolist_to_binary(re:replace("b","^[a-\\Ec]","rtpBWkcL&\\1tGo",[])), 
-?line <<"rtpBWkcLbtGo">> = iolist_to_binary(re:replace("b","^[a-\\Ec]","rtpBWkcL&\\1tGo",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a-\\Ec]","IC&T\\1r",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a-\\Ec]","IC&T\\1r",[global])), 
-?line <<"-">> = iolist_to_binary(re:replace("-","^[a-\\Ec]","CoL\\1S\\1d",[])), 
-?line <<"-">> = iolist_to_binary(re:replace("-","^[a-\\Ec]","CoL\\1S\\1d",[global])), 
-?line <<"E">> = iolist_to_binary(re:replace("E","^[a-\\Ec]","\\1T",[])), 
-?line <<"E">> = iolist_to_binary(re:replace("E","^[a-\\Ec]","\\1T",[global])), 
-?line <<"nbUnfwIYbbDEgCj">> = iolist_to_binary(re:replace("b","^[a\\E\\E-\\Ec]","n&Un\\1fwIY\\1&&DEgCj",[])), 
-?line <<"nbUnfwIYbbDEgCj">> = iolist_to_binary(re:replace("b","^[a\\E\\E-\\Ec]","n&Un\\1fwIY\\1&&DEgCj",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a\\E\\E-\\Ec]","P\\1VvOTyOaT",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a\\E\\E-\\Ec]","P\\1VvOTyOaT",[global])), 
-?line <<"-">> = iolist_to_binary(re:replace("-","^[a\\E\\E-\\Ec]","XYUeR",[])), 
-?line <<"-">> = iolist_to_binary(re:replace("-","^[a\\E\\E-\\Ec]","XYUeR",[global])), 
-?line <<"E">> = iolist_to_binary(re:replace("E","^[a\\E\\E-\\Ec]","PeFBbxifgd",[])), 
-?line <<"E">> = iolist_to_binary(re:replace("E","^[a\\E\\E-\\Ec]","PeFBbxifgd",[global])), 
-?line <<"pdeFkRdPoflblrWho">> = iolist_to_binary(re:replace("b","^[\\E\\Qa\\E-\\Qz\\E]+","pdeFkRdPofl&lrWho\\1",[])), 
-?line <<"pdeFkRdPoflblrWho">> = iolist_to_binary(re:replace("b","^[\\E\\Qa\\E-\\Qz\\E]+","pdeFkRdPofl&lrWho\\1",[global])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+","mXYgE\\1\\1",[])), 
-?line <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+","mXYgE\\1\\1",[global])), 
-?line <<"-">> = iolist_to_binary(re:replace("-","^[\\E\\Qa\\E-\\Qz\\E]+","KLdkiRi",[])), 
-?line <<"-">> = iolist_to_binary(re:replace("-","^[\\E\\Qa\\E-\\Qz\\E]+","KLdkiRi",[global])), 
-?line <<"CAXhbVsbB">> = iolist_to_binary(re:replace("a","^[a\\Q]bc\\E]","CAXh\\1bVsbB",[])), 
-?line <<"CAXhbVsbB">> = iolist_to_binary(re:replace("a","^[a\\Q]bc\\E]","CAXh\\1bVsbB",[global])), 
-?line <<"YFgJL]GhQVUD]Pbp">> = iolist_to_binary(re:replace("]","^[a\\Q]bc\\E]","YFgJL&GhQVU\\1D&Pbp",[])), 
-?line <<"YFgJL]GhQVUD]Pbp">> = iolist_to_binary(re:replace("]","^[a\\Q]bc\\E]","YFgJL&GhQVU\\1D&Pbp",[global])), 
-?line <<"waUcGiVGxIcKiccYmjc">> = iolist_to_binary(re:replace("c","^[a\\Q]bc\\E]","waU&GiVGxI&Ki&cYmj&",[])), 
-?line <<"waUcGiVGxIcKiccYmjc">> = iolist_to_binary(re:replace("c","^[a\\Q]bc\\E]","waU&GiVGxI&Ki&cYmj&",[global])), 
-?line <<"yfaacSB">> = iolist_to_binary(re:replace("a","^[a-\\Q\\E]","yf&\\1acSB",[])), 
-?line <<"yfaacSB">> = iolist_to_binary(re:replace("a","^[a-\\Q\\E]","yf&\\1acSB",[global])), 
-?line <<"f">> = iolist_to_binary(re:replace("-","^[a-\\Q\\E]","f",[])), 
-?line <<"f">> = iolist_to_binary(re:replace("-","^[a-\\Q\\E]","f",[global])), 
-?line <<"S">> = iolist_to_binary(re:replace("aaaa","^(a()*)*","S",[])), 
-?line <<"S">> = iolist_to_binary(re:replace("aaaa","^(a()*)*","S",[global])), 
-?line <<"BPPbuaaaaufIV">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))*)*","BPPbu&ufIV",[])), 
-?line <<"BPPbuaaaaufIV">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))*)*","BPPbu&ufIV",[global])), 
-?line <<"HBMaaaafDaRVOv">> = iolist_to_binary(re:replace("aaaa","^(a()+)+","HBM&fD\\1RVOv",[])), 
-?line <<"HBMaaaafDaRVOv">> = iolist_to_binary(re:replace("aaaa","^(a()+)+","HBM&fD\\1RVOv",[global])), 
-?line <<"JvvaaaaaaaaXGaaaawkPaaaaNqM">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))+)+","J\\1vv\\1\\1&&XG&w\\1kP&N\\1qM",[])), 
-?line <<"JvvaaaaaaaaXGaaaawkPaaaaNqM">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))+)+","J\\1vv\\1\\1&&XG&w\\1kP&N\\1qM",[global])), 
-?line <<"GlQPoT">> = iolist_to_binary(re:replace("abbD","(a){0,3}(?(1)b|(c|))*D","GlQPoT",[])), 
-?line <<"GlQPoT">> = iolist_to_binary(re:replace("abbD","(a){0,3}(?(1)b|(c|))*D","GlQPoT",[global])), 
-?line <<"ApBccccD">> = iolist_to_binary(re:replace("ccccD","(a){0,3}(?(1)b|(c|))*D","\\1\\1ApB&",[])), 
-?line <<"ApBccccD">> = iolist_to_binary(re:replace("ccccD","(a){0,3}(?(1)b|(c|))*D","\\1\\1ApB&",[global])), 
-?line <<"BC">> = iolist_to_binary(re:replace("D","(a){0,3}(?(1)b|(c|))*D","BC",[])), 
-?line <<"BC">> = iolist_to_binary(re:replace("D","(a){0,3}(?(1)b|(c|))*D","BC",[global])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d","gsB\\1",[])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d","gsB\\1",[global])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4FVLiMHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4hlau">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d","&F\\1VLiMH&hlau",[])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4FVLiMHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4hlau">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d","&F\\1VLiMH&hlau",[global])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d","PkrWG&pe\\1uUD&sBHqm",[])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d","PkrWG&pe\\1uUD&sBHqm",[global])), 
-?line <<"KmL">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d","KmL",[])), 
-?line <<"KmL">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d","KmL",[global])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d","&HUPIn&&&uUmDmrCoAY",[])), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d","&HUPIn&&&uUmDmrCoAY",[global])), 
-?line <<"Q">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d","Q",[])), 
-?line <<"Q">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d","Q",[global])), 
-?line <<"abcR">> = iolist_to_binary(re:replace("abc","\\Z","R",[])), 
-?line <<"abcR">> = iolist_to_binary(re:replace("abc","\\Z","R",[global])), 
-?line <<"GwfabcD">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","Gwf&D",[])), 
-?line <<"GwfabcD">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","Gwf&D",[global])), 
-?line <<"EWJHblKuypyqFbP">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","EWJHblKuypyqFbP",[])), 
-?line <<"EWJHblKuypyqFbP">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","EWJHblKuypyqFbP",[global])), 
-?line <<"fabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","f",[])), 
-?line <<"fabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","f",[global])), 
-?line <<"cKyLyGabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","cKyL\\1yG",[])), 
-?line <<"cKyLyGabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","cKyL\\1yG",[global])), 
-?line <<"abcKoYH">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","\\1\\1Ko\\1&Y&H",[])), 
-?line <<"abcKoYH">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","\\1\\1Ko\\1&Y&H",[global])), 
-?line <<"abcqWjyPjUTIdbm">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","qWjy\\1PjUTIdbm&",[])), 
-?line <<"abcqWjyPjUTIdbm">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","qWjy\\1PjUTIdbm&",[global])), 
-?line <<"labcdJabcdNUhUnH">> = iolist_to_binary(re:replace("abcd","(.*(.)?)*","l&J\\1&NUhUnH",[])), 
-?line <<"labcdJabcdNUhUnHlJNUhUnH">> = iolist_to_binary(re:replace("abcd","(.*(.)?)*","l&J\\1&NUhUnH",[global])), 
-?line <<"onfTbTLJLVnabcd">> = iolist_to_binary(re:replace("abcd","( (A | (?(1)0|) )*   )","onfTbTLJLVn",[extended])), 
-?line <<"onfTbTLJLVnaonfTbTLJLVnbonfTbTLJLVnconfTbTLJLVndonfTbTLJLVn">> = iolist_to_binary(re:replace("abcd","( (A | (?(1)0|) )*   )","onfTbTLJLVn",[extended,
-                                                                                                                                                                                                                     global])), 
-?line <<"rilgPabcd">> = iolist_to_binary(re:replace("abcd","( ( (?(1)0|) )*   )","ri\\1&lgP",[extended])), 
-?line <<"rilgParilgPbrilgPcrilgPdrilgP">> = iolist_to_binary(re:replace("abcd","( ( (?(1)0|) )*   )","ri\\1&lgP",[extended,
+pqr","^\\w+=.*(\\\\\\n.*)*","FL",[global])), 
+    <<"KDabcd:abcdSabcd:">> = iolist_to_binary(re:replace("abcd:","(?=(\\w+))\\1:","KD&\\1S&",[])), 
+    <<"KDabcd:abcdSabcd:">> = iolist_to_binary(re:replace("abcd:","(?=(\\w+))\\1:","KD&\\1S&",[global])), 
+    <<"CFNabcd:xwKNSfsabcd">> = iolist_to_binary(re:replace("abcd:","^(?=(\\w+))\\1:","CFN&xwKNSfs\\1",[])), 
+    <<"CFNabcd:xwKNSfsabcd">> = iolist_to_binary(re:replace("abcd:","^(?=(\\w+))\\1:","CFN&xwKNSfs\\1",[global])), 
+    <<"UabcWq">> = iolist_to_binary(re:replace("abc","^\\Eabc","U&Wq",[])), 
+    <<"UabcWq">> = iolist_to_binary(re:replace("abc","^\\Eabc","U&Wq",[global])), 
+    <<"yamyDjNjvdapUq">> = iolist_to_binary(re:replace("a","^[\\Eabc]","y&myDjNjvd&pUq\\1",[])), 
+    <<"yamyDjNjvdapUq">> = iolist_to_binary(re:replace("a","^[\\Eabc]","y&myDjNjvd&pUq\\1",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\Eabc]","YWGNdA&XaWp\\1",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\Eabc]","YWGNdA&XaWp\\1",[global])), 
+    <<"E">> = iolist_to_binary(re:replace("E","^[\\Eabc]","qtud&GONs\\1W\\1I",[])), 
+    <<"E">> = iolist_to_binary(re:replace("E","^[\\Eabc]","qtud&GONs\\1W\\1I",[global])), 
+    <<"kj">> = iolist_to_binary(re:replace("b","^[a-\\Ec]","kj",[])), 
+    <<"kj">> = iolist_to_binary(re:replace("b","^[a-\\Ec]","kj",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a-\\Ec]","U\\1",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a-\\Ec]","U\\1",[global])), 
+    <<"-">> = iolist_to_binary(re:replace("-","^[a-\\Ec]","dluKDBOTsxDtQKaGXQn",[])), 
+    <<"-">> = iolist_to_binary(re:replace("-","^[a-\\Ec]","dluKDBOTsxDtQKaGXQn",[global])), 
+    <<"E">> = iolist_to_binary(re:replace("E","^[a-\\Ec]","j\\1KKHVDRF&\\1hBX\\1nerh",[])), 
+    <<"E">> = iolist_to_binary(re:replace("E","^[a-\\Ec]","j\\1KKHVDRF&\\1hBX\\1nerh",[global])), 
+    <<"eU">> = iolist_to_binary(re:replace("b","^[a\\E\\E-\\Ec]","\\1eU",[])), 
+    <<"eU">> = iolist_to_binary(re:replace("b","^[a\\E\\E-\\Ec]","\\1eU",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a\\E\\E-\\Ec]","Gp\\1hoe\\1ft",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[a\\E\\E-\\Ec]","Gp\\1hoe\\1ft",[global])), 
+    <<"-">> = iolist_to_binary(re:replace("-","^[a\\E\\E-\\Ec]","&\\1&\\1dsAR\\1R&kfYLY&Nx",[])), 
+    <<"-">> = iolist_to_binary(re:replace("-","^[a\\E\\E-\\Ec]","&\\1&\\1dsAR\\1R&kfYLY&Nx",[global])), 
+    <<"E">> = iolist_to_binary(re:replace("E","^[a\\E\\E-\\Ec]","OmwiowAjJ&dB",[])), 
+    <<"E">> = iolist_to_binary(re:replace("E","^[a\\E\\E-\\Ec]","OmwiowAjJ&dB",[global])), 
+    <<"bLBVEBlTbNy">> = iolist_to_binary(re:replace("b","^[\\E\\Qa\\E-\\Qz\\E]+","&LBVEBlT&Ny",[])), 
+    <<"bLBVEBlTbNy">> = iolist_to_binary(re:replace("b","^[\\E\\Qa\\E-\\Qz\\E]+","&LBVEBlT&Ny",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+","&DGXW&\\1G",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+","&DGXW&\\1G",[global])), 
+    <<"-">> = iolist_to_binary(re:replace("-","^[\\E\\Qa\\E-\\Qz\\E]+","uh&tV&",[])), 
+    <<"-">> = iolist_to_binary(re:replace("-","^[\\E\\Qa\\E-\\Qz\\E]+","uh&tV&",[global])), 
+    <<"IgYyaXYfkYHvCal">> = iolist_to_binary(re:replace("a","^[a\\Q]bc\\E]","IgYy&XYf\\1kYH\\1vC&\\1l",[])), 
+    <<"IgYyaXYfkYHvCal">> = iolist_to_binary(re:replace("a","^[a\\Q]bc\\E]","IgYy&XYf\\1kYH\\1vC&\\1l",[global])), 
+    <<"DGTyeUFsoeifQI">> = iolist_to_binary(re:replace("]","^[a\\Q]bc\\E]","DGTyeUFsoeifQI",[])), 
+    <<"DGTyeUFsoeifQI">> = iolist_to_binary(re:replace("]","^[a\\Q]bc\\E]","DGTyeUFsoeifQI",[global])), 
+    <<"cdPJxbdO">> = iolist_to_binary(re:replace("c","^[a\\Q]bc\\E]","&dPJxb\\1dO",[])), 
+    <<"cdPJxbdO">> = iolist_to_binary(re:replace("c","^[a\\Q]bc\\E]","&dPJxb\\1dO",[global])), 
+    <<"achHbHOkynhnR">> = iolist_to_binary(re:replace("a","^[a-\\Q\\E]","&chHbHOkynhnR",[])), 
+    <<"achHbHOkynhnR">> = iolist_to_binary(re:replace("a","^[a-\\Q\\E]","&chHbHOkynhnR",[global])), 
+    <<"uu-MgaUIMliYd--">> = iolist_to_binary(re:replace("-","^[a-\\Q\\E]","uu\\1&MgaU\\1IMliYd&&",[])), 
+    <<"uu-MgaUIMliYd--">> = iolist_to_binary(re:replace("-","^[a-\\Q\\E]","uu\\1&MgaU\\1IMliYd&&",[global])), 
+    <<"CP">> = iolist_to_binary(re:replace("aaaa","^(a()*)*","CP",[])), 
+    <<"CP">> = iolist_to_binary(re:replace("aaaa","^(a()*)*","CP",[global])), 
+    <<"wQTHtaaaakYek">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))*)*","w\\1QTH\\1\\1t&kYe\\1k",[])), 
+    <<"wQTHtaaaakYek">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))*)*","w\\1QTH\\1\\1t&kYe\\1k",[global])), 
+    ok.
+run36() ->
+    <<"RGaXfvItI">> = iolist_to_binary(re:replace("aaaa","^(a()+)+","RG\\1XfvItI",[])), 
+    <<"RGaXfvItI">> = iolist_to_binary(re:replace("aaaa","^(a()+)+","RG\\1XfvItI",[global])), 
+    <<"dMSiHuvxupxlcaaaax">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))+)+","dMSiHuvxupxl\\1c&x",[])), 
+    <<"dMSiHuvxupxlcaaaax">> = iolist_to_binary(re:replace("aaaa","^(?:a(?:(?:))+)+","dMSiHuvxupxl\\1c&x",[global])), 
+    <<"iP">> = iolist_to_binary(re:replace("abbD","(a){0,3}(?(1)b|(c|))*D","iP",[])), 
+    <<"iP">> = iolist_to_binary(re:replace("abbD","(a){0,3}(?(1)b|(c|))*D","iP",[global])), 
+    <<"ccccDXbTvQpvdoaW">> = iolist_to_binary(re:replace("ccccD","(a){0,3}(?(1)b|(c|))*D","&XbTvQ\\1p\\1vd\\1o\\1\\1\\1aW",[])), 
+    <<"ccccDXbTvQpvdoaW">> = iolist_to_binary(re:replace("ccccD","(a){0,3}(?(1)b|(c|))*D","&XbTvQ\\1p\\1vd\\1o\\1\\1\\1aW",[global])), 
+    <<"RVoDDTkMDjhW">> = iolist_to_binary(re:replace("D","(a){0,3}(?(1)b|(c|))*D","RVo&&TkM&jhW",[])), 
+    <<"RVoDDTkMDjhW">> = iolist_to_binary(re:replace("D","(a){0,3}(?(1)b|(c|))*D","RVo&&TkM&jhW",[global])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d","&\\1DGFkfxXGJ\\1yJ",[])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d","&\\1DGFkfxXGJ\\1yJ",[global])), 
+    <<"Kaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4GiaQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4jWNATt">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d","K&GiaQ&jWNATt",[])), 
+    <<"Kaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4GiaQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4jWNATt">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d","K&GiaQ&jWNATt",[global])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d","qHVMyR\\1g\\1",[])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d","qHVMyR\\1g\\1",[global])), 
+    <<"kGFBeTsPIf">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d","kGFBeTsPI\\1f",[])), 
+    <<"kGFBeTsPIf">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d","kGFBeTsPI\\1f",[global])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d","Yx",[])), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d","Yx",[global])), 
+    <<"wkl">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d","wkl",[])), 
+    <<"wkl">> = iolist_to_binary(re:replace("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d","wkl",[global])), 
+    <<"abcqXmkEhjC">> = iolist_to_binary(re:replace("abc","\\Z","qXmkEhjC",[])), 
+    <<"abcqXmkEhjC">> = iolist_to_binary(re:replace("abc","\\Z","qXmkEhjC",[global])), 
+    <<"RdSYAact">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","RdSYAact",[])), 
+    <<"RdSYAact">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","RdSYAact",[global])), 
+    <<"JvTabcqFTcnkmyFJ">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","\\1JvT&qFTcnk\\1my\\1FJ",[])), 
+    <<"JvTabcqFTcnkmyFJ">> = iolist_to_binary(re:replace("abc","^(?s)(?>.*)(?<!\\n)","\\1JvT&qFTcnk\\1my\\1FJ",[global])), 
+    <<"cqXXOeFFGVUWkMabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","cqXXOeFF\\1GVUW\\1kM",[])), 
+    <<"cqXXOeFFGVUWkMabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","cqXXOeFF\\1GVUW\\1kM",[global])), 
+    <<"JbxrWfegLobSfGKabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","\\1Jbx&rWfe&gLobSfGK",[])), 
+    <<"JbxrWfegLobSfGKabc">> = iolist_to_binary(re:replace("abc","^(?![^\\n]*\\n\\z)","\\1Jbx&rWfe&gLobSfGK",[global])), 
+    <<"abceDUDjJoFtrgMYDo">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","eDUDjJoFtrgMYD&o",[])), 
+    <<"abceDUDjJoFtrgMYDo">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","eDUDjJoFtrgMYD&o",[global])), 
+    <<"abcL">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","L",[])), 
+    <<"abcL">> = iolist_to_binary(re:replace("abc","\\z(?<!\\n)","L",[global])), 
+    <<"abcdddXku">> = iolist_to_binary(re:replace("abcd","(.*(.)?)*","&dd\\1\\1Xku",[])), 
+    <<"abcdddXkuddXku">> = iolist_to_binary(re:replace("abcd","(.*(.)?)*","&dd\\1\\1Xku",[global])), 
+    <<"pkdLVDscUDDEBUBabcd">> = iolist_to_binary(re:replace("abcd","( (A | (?(1)0|) )*   )","pkd&L&VD&scUDDEBUB",[extended])), 
+    <<"pkdLVDscUDDEBUBapkdLVDscUDDEBUBbpkdLVDscUDDEBUBcpkdLVDscUDDEBUBdpkdLVDscUDDEBUB">> = iolist_to_binary(re:replace("abcd","( (A | (?(1)0|) )*   )","pkd&L&VD&scUDDEBUB",[extended,
+                                                                                                                                                                                                                                    global])), 
+    <<"AuDgWsdmnqYhabcd">> = iolist_to_binary(re:replace("abcd","( ( (?(1)0|) )*   )","AuDgW&s&dm&nqYh",[extended])), 
+    <<"AuDgWsdmnqYhaAuDgWsdmnqYhbAuDgWsdmnqYhcAuDgWsdmnqYhdAuDgWsdmnqYh">> = iolist_to_binary(re:replace("abcd","( ( (?(1)0|) )*   )","AuDgW&s&dm&nqYh",[extended,
+                                                                                                                                                                                                                        global])), 
+    <<"efinTcnmBlVFabcd">> = iolist_to_binary(re:replace("abcd","(  (?(1)0|)*   )","efinTc&nmB&\\1lV\\1F",[extended])), 
+    <<"efinTcnmBlVFaefinTcnmBlVFbefinTcnmBlVFcefinTcnmBlVFdefinTcnmBlVF">> = iolist_to_binary(re:replace("abcd","(  (?(1)0|)*   )","efinTc&nmB&\\1lV\\1F",[extended,
+                                                                                                                                                                                                                             global])), 
+    <<"EDiUXiAlYBAmCeNc">> = iolist_to_binary(re:replace("a]","[[:abcd:xyz]]","EDiUXiAlYBA\\1mCeNc",[])), 
+    <<"EDiUXiAlYBAmCeNc">> = iolist_to_binary(re:replace("a]","[[:abcd:xyz]]","EDiUXiAlYBA\\1mCeNc",[global])), 
+    <<"k:]h">> = iolist_to_binary(re:replace(":]","[[:abcd:xyz]]","k&h",[])), 
+    <<"k:]h">> = iolist_to_binary(re:replace(":]","[[:abcd:xyz]]","k&h",[global])), 
+    <<"hwNfUgfOoCtFayhAXX">> = iolist_to_binary(re:replace("a","[abc[:x\\]pqr]","hwNfUgfOo\\1CtF&yhA\\1XX",[])), 
+    <<"hwNfUgfOoCtFayhAXX">> = iolist_to_binary(re:replace("a","[abc[:x\\]pqr]","hwNfUgfOo\\1CtF&yhA\\1XX",[global])), 
+    <<"">> = iolist_to_binary(re:replace("[","[abc[:x\\]pqr]","\\1\\1",[])), 
+    <<"">> = iolist_to_binary(re:replace("[","[abc[:x\\]pqr]","\\1\\1",[global])), 
+    <<"fWMiJLaBnsaYQ">> = iolist_to_binary(re:replace(":","[abc[:x\\]pqr]","fWMiJLaBns\\1aYQ",[])), 
+    <<"fWMiJLaBnsaYQ">> = iolist_to_binary(re:replace(":","[abc[:x\\]pqr]","fWMiJLaBns\\1aYQ",[global])), 
+    <<"IlPjDF">> = iolist_to_binary(re:replace("]","[abc[:x\\]pqr]","IlPjDF\\1",[])), 
+    <<"IlPjDF">> = iolist_to_binary(re:replace("]","[abc[:x\\]pqr]","IlPjDF\\1",[global])), 
+    <<"jXFpSOncoxfPi">> = iolist_to_binary(re:replace("p","[abc[:x\\]pqr]","\\1jX\\1F&SOncoxf\\1Pi",[])), 
+    <<"jXFpSOncoxfPi">> = iolist_to_binary(re:replace("p","[abc[:x\\]pqr]","\\1jX\\1F&SOncoxf\\1Pi",[global])), 
+    <<"fooabcfoo">> = iolist_to_binary(re:replace("fooabcfoo",".*[op][xyz]","rU&wHuSyHLW\\1WUJxg\\1",[])), 
+    <<"fooabcfoo">> = iolist_to_binary(re:replace("fooabcfoo",".*[op][xyz]","rU&wHuSyHLW\\1WUJxg\\1",[global])), 
+    <<"Yadc">> = iolist_to_binary(re:replace("adc","(?(?=.*b)b|^)","\\1\\1Y",[])), 
+    <<"Yadc">> = iolist_to_binary(re:replace("adc","(?(?=.*b)b|^)","\\1\\1Y",[global])), 
+    <<"asQWunbuTsJvhIUbTxKxbc">> = iolist_to_binary(re:replace("abc","(?(?=.*b)b|^)","sQWun&uTsJvhIU&TxKx&",[])), 
+    <<"asQWunbuTsJvhIUbTxKxbc">> = iolist_to_binary(re:replace("abc","(?(?=.*b)b|^)","sQWun&uTsJvhIU&TxKx&",[global])), 
+    <<"WsShpCMbadc">> = iolist_to_binary(re:replace("adc","(?(?=^.*b)b|^)","WsShp\\1\\1C\\1Mb",[])), 
+    <<"WsShpCMbadc">> = iolist_to_binary(re:replace("adc","(?(?=^.*b)b|^)","WsShp\\1\\1C\\1Mb",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(?(?=^.*b)b|^)","PkFnM\\1TJjij\\1s",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(?(?=^.*b)b|^)","PkFnM\\1TJjij\\1s",[global])), 
+    <<"QgracuqfskDadc">> = iolist_to_binary(re:replace("adc","(?(?=.*b)b|^)*","Qg\\1r\\1\\1acuqfskD\\1&",[])), 
+    <<"QgracuqfskDaQgracuqfskDdQgracuqfskDcQgracuqfskD">> = iolist_to_binary(re:replace("adc","(?(?=.*b)b|^)*","Qg\\1r\\1\\1acuqfskD\\1&",[global])), 
+    <<"NOaxcgWJQdJabc">> = iolist_to_binary(re:replace("abc","(?(?=.*b)b|^)*","NOaxc\\1\\1gWJQdJ&",[])), 
+    <<"NOaxcgWJQdJaNOaxcgWJQdJbNOaxcgWJQdJcNOaxcgWJQdJ">> = iolist_to_binary(re:replace("abc","(?(?=.*b)b|^)*","NOaxc\\1\\1gWJQdJ&",[global])), 
+    ok.
+run37() ->
+    <<"egMccJuvVmsJadc">> = iolist_to_binary(re:replace("adc","(?(?=.*b)b|^)+","egMccJu&\\1vVmsJ",[])), 
+    <<"egMccJuvVmsJadc">> = iolist_to_binary(re:replace("adc","(?(?=.*b)b|^)+","egMccJu&\\1vVmsJ",[global])), 
+    <<"awbKLc">> = iolist_to_binary(re:replace("abc","(?(?=.*b)b|^)+","wbKL",[])), 
+    <<"awbKLc">> = iolist_to_binary(re:replace("abc","(?(?=.*b)b|^)+","wbKL",[global])), 
+    <<"aaOKbMsgbwbYMvqpaKc">> = iolist_to_binary(re:replace("abc","(?(?=b).*b|^d)","aOK\\1&Msg&w&YMvqpaK",[])), 
+    <<"aaOKbMsgbwbYMvqpaKc">> = iolist_to_binary(re:replace("abc","(?(?=b).*b|^d)","aOK\\1&Msg&w&YMvqpaK",[global])), 
+    <<"deMQjInIpkdMc">> = iolist_to_binary(re:replace("abc","(?(?=.*b).*b|^d)","deMQjInI\\1\\1pk\\1dM",[])), 
+    <<"deMQjInIpkdMc">> = iolist_to_binary(re:replace("abc","(?(?=.*b).*b|^d)","deMQjInI\\1\\1pk\\1dM",[global])), 
+    <<"xONBt%ab%fkt">> = iolist_to_binary(re:replace("%ab%","^%((?(?=[a])[^%])|b)*%$","xONBt\\1&fkt",[])), 
+    <<"xONBt%ab%fkt">> = iolist_to_binary(re:replace("%ab%","^%((?(?=[a])[^%])|b)*%$","xONBt\\1&fkt",[global])), 
+    <<"XtGNvTytylTOX">> = iolist_to_binary(re:replace("XabX","(?i)a(?-i)b|c","tGN\\1\\1vT\\1yty\\1lTO",[])), 
+    <<"XtGNvTytylTOX">> = iolist_to_binary(re:replace("XabX","(?i)a(?-i)b|c","tGN\\1\\1vT\\1yty\\1lTO",[global])), 
+    <<"XAbMBAbVAbatgNrMNMDX">> = iolist_to_binary(re:replace("XAbX","(?i)a(?-i)b|c","&MB\\1&V&\\1atgNrMNMD",[])), 
+    <<"XAbMBAbVAbatgNrMNMDX">> = iolist_to_binary(re:replace("XAbX","(?i)a(?-i)b|c","&MB\\1&V&\\1atgNrMNMD",[global])), 
+    <<"CIeFFRMtpcC">> = iolist_to_binary(re:replace("CcC","(?i)a(?-i)b|c","IeFFRMtp&",[])), 
+    <<"CIeFFRMtpcC">> = iolist_to_binary(re:replace("CcC","(?i)a(?-i)b|c","IeFFRMtp&",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?i)a(?-i)b|c","sJoTR\\1agT&QVpj&oo",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?i)a(?-i)b|c","sJoTR\\1agT&QVpj&oo",[global])), 
+    <<"XABX">> = iolist_to_binary(re:replace("XABX","(?i)a(?-i)b|c","Bx\\1L&vYQ&o",[])), 
+    <<"XABX">> = iolist_to_binary(re:replace("XABX","(?i)a(?-i)b|c","Bx\\1L&vYQ&o",[global])), 
+    <<"bPwO">> = iolist_to_binary(re:replace("
+
","[\\x00-\\xff\\s]+","bPwO",[])), 
+    <<"bPwO">> = iolist_to_binary(re:replace("
+
","[\\x00-\\xff\\s]+","bPwO",[global])), 
+    <<"tNnUXVoKd">> = iolist_to_binary(re:replace("?","^\\c","tNnUXVoKd\\1",[])), 
+    <<"tNnUXVoKd">> = iolist_to_binary(re:replace("?","^\\c","tNnUXVoKd\\1",[global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1","Xcx",[caseless])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1","Xcx",[caseless,
+                                                                                                                                                                      global])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1","yV\\1&bIy&bf",[])), 
+    <<"abc">> = iolist_to_binary(re:replace("abc","(abc)\\1","yV\\1&bIy&bf",[global])), 
+    <<"12llNQ12abc">> = iolist_to_binary(re:replace("12abc","[^a]*","&llNQ\\1&\\1",[caseless])), 
+    <<"12llNQ12llNQabcllNQbcllNQ">> = iolist_to_binary(re:replace("12abc","[^a]*","&llNQ\\1&\\1",[caseless,
+                                                                                                                                                                                         global])), 
+    <<"gDpABC">> = iolist_to_binary(re:replace("12ABC","[^a]*","gDp",[caseless])), 
+    <<"gDpgDpAgDpgDp">> = iolist_to_binary(re:replace("12ABC","[^a]*","gDp",[caseless,
+                                                                                                                                                                   global])), 
+    <<"DTxabc">> = iolist_to_binary(re:replace("12abc","[^a]*+","D\\1T\\1x",[caseless])), 
+    <<"DTxDTxaDTxDTx">> = iolist_to_binary(re:replace("12abc","[^a]*+","D\\1T\\1x",[caseless,
+                                                                                                                                                                                   global])), 
+    <<"KJ12jqgNXmTv12lyEP12SABC">> = iolist_to_binary(re:replace("12ABC","[^a]*+","KJ&jqgNXm\\1Tv&lyE\\1P&S",[caseless])), 
+    <<"KJ12jqgNXmTv12lyEP12SKJjqgNXmTvlyEPSAKJBCjqgNXmTvBClyEPBCSKJjqgNXmTvlyEPS">> = iolist_to_binary(re:replace("12ABC","[^a]*+","KJ&jqgNXm\\1Tv&lyE\\1P&S",[caseless,
+                                                                                                                                                                                                                    global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","[^a]*?X","Px&vXsBEFCysfMhDqV\\1P",[caseless])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","[^a]*?X","Px&vXsBEFCysfMhDqV\\1P",[caseless,
+                                                                                                                                                                                                                         global])), 
+    <<"12abc">> = iolist_to_binary(re:replace("12abc","[^a]*?X","q\\1a\\1jtOoCrLWAYsie",[caseless])), 
+    <<"12abc">> = iolist_to_binary(re:replace("12abc","[^a]*?X","q\\1a\\1jtOoCrLWAYsie",[caseless,
                                                                                                                                                                                                              global])), 
-?line <<"LjAUxSNabcd">> = iolist_to_binary(re:replace("abcd","(  (?(1)0|)*   )","L\\1jAUxSN\\1",[extended])), 
-?line <<"LjAUxSNaLjAUxSNbLjAUxSNcLjAUxSNdLjAUxSN">> = iolist_to_binary(re:replace("abcd","(  (?(1)0|)*   )","L\\1jAUxSN\\1",[extended,
+    <<"12ABC">> = iolist_to_binary(re:replace("12ABC","[^a]*?X","LCDXsQB\\1&fP&vNDlCH\\1",[caseless])), 
+    <<"12ABC">> = iolist_to_binary(re:replace("12ABC","[^a]*?X","LCDXsQB\\1&fP&vNDlCH\\1",[caseless,
+                                                                                                                                                                                                                   global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","[^a]+?X","g&\\1\\1wRCp",[caseless])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","[^a]+?X","g&\\1\\1wRCp",[caseless,
+                                                                                                                                                                                                      global])), 
+    <<"12abc">> = iolist_to_binary(re:replace("12abc","[^a]+?X","PO&\\1NINrfwP&\\1AcHiEa",[caseless])), 
+    <<"12abc">> = iolist_to_binary(re:replace("12abc","[^a]+?X","PO&\\1NINrfwP&\\1AcHiEa",[caseless,
+                                                                                                                                                                                                                   global])), 
+    <<"12ABC">> = iolist_to_binary(re:replace("12ABC","[^a]+?X","LesucI&TIspq&O\\1AkOp",[caseless])), 
+    <<"12ABC">> = iolist_to_binary(re:replace("12ABC","[^a]+?X","LesucI&TIspq&O\\1AkOp",[caseless,
+                                                                                                                                                                                                              global])), 
+    <<"12arSestlSfXbcX">> = iolist_to_binary(re:replace("12aXbcX","[^a]?X","\\1rSestlSf\\1&",[caseless])), 
+    <<"12arSestlSfXbrSestlSfcX">> = iolist_to_binary(re:replace("12aXbcX","[^a]?X","\\1rSestlSf\\1&",[caseless,
+                                                                                                                                                                                                    global])), 
+    <<"12AVBtPBCX">> = iolist_to_binary(re:replace("12AXBCX","[^a]?X","VBtP",[caseless])), 
+    <<"12AVBtPBVBtP">> = iolist_to_binary(re:replace("12AXBCX","[^a]?X","VBtP",[caseless,
+                                                                                                                                                                           global])), 
+    <<"BCXcYCXS">> = iolist_to_binary(re:replace("BCX","[^a]?X","&cY&S\\1",[caseless])), 
+    <<"BCXcYCXS">> = iolist_to_binary(re:replace("BCX","[^a]?X","&cY&S\\1",[caseless,
+                                                                                                                                                                              global])), 
+    <<"12aMPavbiGCbcX">> = iolist_to_binary(re:replace("12aXbcX","[^a]??X","MPavbi\\1GC",[caseless])), 
+    <<"12aMPavbiGCbMPavbiGC">> = iolist_to_binary(re:replace("12aXbcX","[^a]??X","MPavbi\\1GC",[caseless,
+                                                                                                                                                                                            global])), 
+    <<"12AOTaIyfCCPBCX">> = iolist_to_binary(re:replace("12AXBCX","[^a]??X","OTaIy\\1fC\\1CP",[caseless])), 
+    <<"12AOTaIyfCCPBOTaIyfCCP">> = iolist_to_binary(re:replace("12AXBCX","[^a]??X","OTaIy\\1fC\\1CP",[caseless,
+                                                                                                                                                                                                     global])), 
+    <<"BCXlQqcJ">> = iolist_to_binary(re:replace("BCX","[^a]??X","&\\1l\\1QqcJ",[caseless])), 
+    <<"BCXlQqcJ">> = iolist_to_binary(re:replace("BCX","[^a]??X","&\\1l\\1QqcJ",[caseless,
+                                                                                                                                                                                        global])), 
+    <<"12aXbEPWWBEweltvRcX">> = iolist_to_binary(re:replace("12aXbcX","[^a]?+X","EPWWBEweltvR&",[caseless])), 
+    <<"12aXbEPWWBEweltvRcX">> = iolist_to_binary(re:replace("12aXbcX","[^a]?+X","EPWWBEweltvR&",[caseless,
+                                                                                                                                                                                                global])), 
+    <<"12AXBLDKxRfr">> = iolist_to_binary(re:replace("12AXBCX","[^a]?+X","LD\\1KxRfr",[caseless])), 
+    <<"12AXBLDKxRfr">> = iolist_to_binary(re:replace("12AXBCX","[^a]?+X","LD\\1KxRfr",[caseless,
+                                                                                                                                                                                          global])), 
+    <<"BaWkje">> = iolist_to_binary(re:replace("BCX","[^a]?+X","aWkje",[caseless])), 
+    <<"BaWkje">> = iolist_to_binary(re:replace("BCX","[^a]?+X","aWkje",[caseless,
+                                                                                                                                                                       global])), 
+    <<"alsDrlAVvgef">> = iolist_to_binary(re:replace("abcdef","[^a]{2,3}","lsDrlAVvg",[caseless])), 
+    <<"alsDrlAVvglsDrlAVvg">> = iolist_to_binary(re:replace("abcdef","[^a]{2,3}","lsDrlAVvg",[caseless,
+                                                                                                                                                                                         global])), 
+    <<"AWnBBhxrEF">> = iolist_to_binary(re:replace("ABCDEF","[^a]{2,3}","WnBBhxr\\1",[caseless])), 
+    <<"AWnBBhxrWnBBhxr">> = iolist_to_binary(re:replace("ABCDEF","[^a]{2,3}","WnBBhxr\\1",[caseless,
+                                                                                                                                                                                            global])), 
+    <<"aQlBRWDWodef">> = iolist_to_binary(re:replace("abcdef","[^a]{2,3}?","QlBRWDWo",[caseless])), 
+    <<"aQlBRWDWoQlBRWDWof">> = iolist_to_binary(re:replace("abcdef","[^a]{2,3}?","QlBRWDWo",[caseless,
+                                                                                                                                                                                         global])), 
+    <<"ADysgJSywfPBCKKUUWYDEF">> = iolist_to_binary(re:replace("ABCDEF","[^a]{2,3}?","DysgJSywfP\\1&KKUUWY",[caseless])), 
+    <<"ADysgJSywfPBCKKUUWYDysgJSywfPDEKKUUWYF">> = iolist_to_binary(re:replace("ABCDEF","[^a]{2,3}?","DysgJSywfP\\1&KKUUWY",[caseless,
+                                                                                                                                                                                                                   global])), 
+    <<"aWjgnJGWef">> = iolist_to_binary(re:replace("abcdef","[^a]{2,3}+","WjgnJ\\1GW",[caseless])), 
+    <<"aWjgnJGWWjgnJGW">> = iolist_to_binary(re:replace("abcdef","[^a]{2,3}+","WjgnJ\\1GW",[caseless,
+                                                                                                                                                                                              global])), 
+    <<"ArlhBCDwHgMHHwjEiAEF">> = iolist_to_binary(re:replace("ABCDEF","[^a]{2,3}+","rlh&wHgMHHwjEiA",[caseless])), 
+    <<"ArlhBCDwHgMHHwjEiArlhEFwHgMHHwjEiA">> = iolist_to_binary(re:replace("ABCDEF","[^a]{2,3}+","rlh&wHgMHHwjEiA",[caseless,
+                                                                                                                                                                                                        global])), 
+    <<"JdTSxtdMYhvAoaO">> = iolist_to_binary(re:replace("Z","((a|)+)+Z","JdTSxtdMYhv\\1AoaO",[])), 
+    <<"JdTSxtdMYhvAoaO">> = iolist_to_binary(re:replace("Z","((a|)+)+Z","JdTSxtdMYhv\\1AoaO",[global])), 
+    ok.
+run38() ->
+    <<"dAWFejmOJacpU">> = iolist_to_binary(re:replace("ac","(a)b|(a)c","dA\\1\\1WFejmOJ&pU",[])), 
+    <<"dAWFejmOJacpU">> = iolist_to_binary(re:replace("ac","(a)b|(a)c","dA\\1\\1WFejmOJ&pU",[global])), 
+    <<"XacWp">> = iolist_to_binary(re:replace("ac","(?>(a))b|(a)c","X&Wp",[])), 
+    <<"XacWp">> = iolist_to_binary(re:replace("ac","(?>(a))b|(a)c","X&Wp",[global])), 
+    <<"VypacbfdlXdCGJofacdRt">> = iolist_to_binary(re:replace("ac","(?=(a))ab|(a)c","Vyp&bfdlXdCGJo\\1f&dRt",[])), 
+    <<"VypacbfdlXdCGJofacdRt">> = iolist_to_binary(re:replace("ac","(?=(a))ab|(a)c","Vyp&bfdlXdCGJo\\1f&dRt",[global])), 
+    <<"soXacAL">> = iolist_to_binary(re:replace("ac","((?>(a))b|(a)c)","soX&AL",[])), 
+    <<"soXacAL">> = iolist_to_binary(re:replace("ac","((?>(a))b|(a)c)","soX&AL",[global])), 
+    <<"ackacTacsYVlYVjKacCEL">> = iolist_to_binary(re:replace("ac","((?>(a))b|(a)c)++","&k\\1T&sYVlYVjK&CEL",[])), 
+    <<"ackacTacsYVlYVjKacCEL">> = iolist_to_binary(re:replace("ac","((?>(a))b|(a)c)++","&k\\1T&sYVlYVjK&CEL",[global])), 
+    <<"qiUiactJ">> = iolist_to_binary(re:replace("ac","(?:(?>(a))b|(a)c)++","qiUi&tJ\\1",[])), 
+    <<"qiUiactJ">> = iolist_to_binary(re:replace("ac","(?:(?>(a))b|(a)c)++","qiUi&tJ\\1",[global])), 
+    <<"KkacqeX">> = iolist_to_binary(re:replace("ac","(?=(?>(a))b|(a)c)(..)","Kk&qeX",[])), 
+    <<"KkacqeX">> = iolist_to_binary(re:replace("ac","(?=(?>(a))b|(a)c)(..)","Kk&qeX",[global])), 
+    <<"dtNNac">> = iolist_to_binary(re:replace("ac","(?>(?>(a))b|(a)c)","dtNN&",[])), 
+    <<"dtNNac">> = iolist_to_binary(re:replace("ac","(?>(?>(a))b|(a)c)","dtNN&",[global])), 
+    <<"maaaabaaabaababGEUEgWaaaabaaabaababRaaaabaaabaababYtLSDKaaaabaaabaababA">> = iolist_to_binary(re:replace("aaaabaaabaabab","((?>(a+)b)+(aabab))","m&GEUEgW\\1R&YtLSDK\\1A",[])), 
+    <<"maaaabaaabaababGEUEgWaaaabaaabaababRaaaabaaabaababYtLSDKaaaabaaabaababA">> = iolist_to_binary(re:replace("aaaabaaabaabab","((?>(a+)b)+(aabab))","m&GEUEgW\\1R&YtLSDK\\1A",[global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","(?>a+|ab)+?c","hd\\1shPpIuFmAa\\1aJk&q",[])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","(?>a+|ab)+?c","hd\\1shPpIuFmAa\\1aJk&q",[global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","(?>a+|ab)+c","ekKjsw&",[])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","(?>a+|ab)+c","ekKjsw&",[global])), 
+    <<"KRQcpPbvHhi">> = iolist_to_binary(re:replace("aabc","(?:a+|ab)+c","KRQcpPbvHhi",[])), 
+    <<"KRQcpPbvHhi">> = iolist_to_binary(re:replace("aabc","(?:a+|ab)+c","KRQcpPbvHhi",[global])), 
+    <<"iamaarURhafOTI">> = iolist_to_binary(re:replace("a","(?(?=(a))a)","i&m&&rURh\\1fOTI",[])), 
+    <<"iamaarURhafOTIimrURhfOTI">> = iolist_to_binary(re:replace("a","(?(?=(a))a)","i&m&&rURh\\1fOTI",[global])), 
+    <<"aba">> = iolist_to_binary(re:replace("ab","(?(?=(a))a)(b)","&a",[])), 
+    <<"aba">> = iolist_to_binary(re:replace("ab","(?(?=(a))a)(b)","&a",[global])), 
+    <<"aaaabc">> = iolist_to_binary(re:replace("aaaabc","^(?:a|ab)++c","Siik\\1BdqOkNdp\\1",[])), 
+    <<"aaaabc">> = iolist_to_binary(re:replace("aaaabc","^(?:a|ab)++c","Siik\\1BdqOkNdp\\1",[global])), 
+    <<"aaaabc">> = iolist_to_binary(re:replace("aaaabc","^(?>a|ab)++c","LpFM&EcaXt\\1b\\1",[])), 
+    <<"aaaabc">> = iolist_to_binary(re:replace("aaaabc","^(?>a|ab)++c","LpFM&EcaXt\\1b\\1",[global])), 
+    <<"FNLSSaaaabcr">> = iolist_to_binary(re:replace("aaaabc","^(?:a|ab)+c","FNLSS&r",[])), 
+    <<"FNLSSaaaabcr">> = iolist_to_binary(re:replace("aaaabc","^(?:a|ab)+c","FNLSS&r",[global])), 
+    <<"TxGxyzQbpeqVTpoEkrYqxyz">> = iolist_to_binary(re:replace("xyz","(?=abc){0}xyz","TxG\\1&QbpeqVTpoEkrYq&",[])), 
+    <<"TxGxyzQbpeqVTpoEkrYqxyz">> = iolist_to_binary(re:replace("xyz","(?=abc){0}xyz","TxG\\1&QbpeqVTpoEkrYq&",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?=abc){1}xyz","cR\\1y\\1Q\\1&okEra\\1h",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?=abc){1}xyz","cR\\1y\\1Q\\1&okEra\\1h",[global])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","(?=abc){1}xyz","reg\\1lU\\1RfQVPuOHJA\\1Cq",[])), 
+    <<"xyz">> = iolist_to_binary(re:replace("xyz","(?=abc){1}xyz","reg\\1lU\\1RfQVPuOHJA\\1Cq",[global])), 
+    <<"xcPaaLxpkaXVHb">> = iolist_to_binary(re:replace("ab","(?=(a))?.","xcP\\1aLxpkaXVH",[])), 
+    <<"xcPaaLxpkaXVHxcPaLxpkaXVH">> = iolist_to_binary(re:replace("ab","(?=(a))?.","xcP\\1aLxpkaXVH",[global])), 
+    <<"sOiVGLUSbixjsOGc">> = iolist_to_binary(re:replace("bc","(?=(a))?.","s\\1OiVGLUS&ixjsOG",[])), 
+    <<"sOiVGLUSbixjsOGsOiVGLUScixjsOG">> = iolist_to_binary(re:replace("bc","(?=(a))?.","s\\1OiVGLUS&ixjsOG",[global])), 
+    ok.
+run39() ->
+    <<"VDuEPkfWcTxyeUaBWb">> = iolist_to_binary(re:replace("ab","(?=(a))??.","VDuEPkfWcTxyeU&BW",[])), 
+    <<"VDuEPkfWcTxyeUaBWVDuEPkfWcTxyeUbBW">> = iolist_to_binary(re:replace("ab","(?=(a))??.","VDuEPkfWcTxyeU&BW",[global])), 
+    <<"mbbCUVsGVbqKPXic">> = iolist_to_binary(re:replace("bc","(?=(a))??.","m&bCUVsGVbqKPXi",[])), 
+    <<"mbbCUVsGVbqKPXimcbCUVsGVbqKPXi">> = iolist_to_binary(re:replace("bc","(?=(a))??.","m&bCUVsGVbqKPXi",[global])), 
+    <<"vckgammon">> = iolist_to_binary(re:replace("backgammon","^(?=(a)){0}b(?1)","v",[])), 
+    <<"vckgammon">> = iolist_to_binary(re:replace("backgammon","^(?=(a)){0}b(?1)","v",[global])), 
+    <<"jwhBBBtpN">> = iolist_to_binary(re:replace("abd","^(?=(?1))?[az]([abc])d","jwhBBBtpN",[])), 
+    <<"jwhBBBtpN">> = iolist_to_binary(re:replace("abd","^(?=(?1))?[az]([abc])d","jwhBBBtpN",[global])), 
+    <<"zcdBcKYPcEyoXnxVFxx">> = iolist_to_binary(re:replace("zcdxx","^(?=(?1))?[az]([abc])d","&B\\1KYPcEyoXnxVF",[])), 
+    <<"zcdBcKYPcEyoXnxVFxx">> = iolist_to_binary(re:replace("zcdxx","^(?=(?1))?[az]([abc])d","&B\\1KYPcEyoXnxVF",[global])), 
+    <<"eaaaaacuRrwVlw">> = iolist_to_binary(re:replace("aaaaa","^(?!a){0}\\w+","e&cuR\\1rwVlw",[])), 
+    <<"eaaaaacuRrwVlw">> = iolist_to_binary(re:replace("aaaaa","^(?!a){0}\\w+","e&cuR\\1rwVlw",[global])), 
+    <<"abcrjCWbwUOujlotBJKabcTxyz">> = iolist_to_binary(re:replace("abcxyz","(?<=(abc))?xyz","rjCWbwUOujlotBJK\\1T&",[])), 
+    <<"abcrjCWbwUOujlotBJKabcTxyz">> = iolist_to_binary(re:replace("abcxyz","(?<=(abc))?xyz","rjCWbwUOujlotBJK\\1T&",[global])), 
+    <<"pqrMKeGrgiv">> = iolist_to_binary(re:replace("pqrxyz","(?<=(abc))?xyz","MKeGrgi\\1v",[])), 
+    <<"pqrMKeGrgiv">> = iolist_to_binary(re:replace("pqrxyz","(?<=(abc))?xyz","MKeGrgi\\1v",[global])), 
+    <<"RxQ">> = iolist_to_binary(re:replace("ggg<<<aaa>>>","^[\\g<a>]+","\\1RxQ",[])), 
+    <<"RxQ">> = iolist_to_binary(re:replace("ggg<<<aaa>>>","^[\\g<a>]+","\\1RxQ",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\g<a>]+","dH",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^[\\g<a>]+","dH",[global])), 
+    <<"\\ga">> = iolist_to_binary(re:replace("\\ga","^[\\g<a>]+","Uga",[])), 
+    <<"\\ga">> = iolist_to_binary(re:replace("\\ga","^[\\g<a>]+","Uga",[global])), 
+    <<"kGIjWAmWxlixyz">> = iolist_to_binary(re:replace("gggagagaxyz","^[\\ga]+","kGIjWAmWxli",[])), 
+    <<"kGIjWAmWxlixyz">> = iolist_to_binary(re:replace("gggagagaxyz","^[\\ga]+","kGIjWAmWxli",[global])), 
+    <<"aaaa444:::osjAfaaaa444:::myeRjZ">> = iolist_to_binary(re:replace("aaaa444:::Z","^[:a[:digit:]]+","&\\1osjAf&my\\1e\\1Rj",[])), 
+    <<"aaaa444:::osjAfaaaa444:::myeRjZ">> = iolist_to_binary(re:replace("aaaa444:::Z","^[:a[:digit:]]+","&\\1osjAf&my\\1e\\1Rj",[global])), 
+    <<"qSUaaaa444:::bbbthaaaa444:::bbboRHpyZ">> = iolist_to_binary(re:replace("aaaa444:::bbbZ","^[:a[:digit:]:b]+","qSU&th&oR\\1Hpy",[])), 
+    <<"qSUaaaa444:::bbbthaaaa444:::bbboRHpyZ">> = iolist_to_binary(re:replace("aaaa444:::bbbZ","^[:a[:digit:]:b]+","qSU&th&oR\\1Hpy",[global])), 
+    <<"mxfweUe">> = iolist_to_binary(re:replace(":xxx:","[:a]xxx[b:]","mxf\\1weUe",[])), 
+    <<"mxfweUe">> = iolist_to_binary(re:replace(":xxx:","[:a]xxx[b:]","mxf\\1weUe",[global])), 
+    <<"xaaVrvSafReLAbLfQXc">> = iolist_to_binary(re:replace("xaabc","(?<=a{2})b","Vr\\1vSafReLA&\\1LfQX",[caseless])), 
+    <<"xaaVrvSafReLAbLfQXc">> = iolist_to_binary(re:replace("xaabc","(?<=a{2})b","Vr\\1vSafReLA&\\1LfQX",[caseless,
+                                                                                                                                                                                                                    global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=a{2})b","fcR",[caseless])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=a{2})b","fcR",[caseless,
+                                                                                                                                                                                       global])), 
+    <<"xabc">> = iolist_to_binary(re:replace("xabc","(?<=a{2})b","BoRyoqeTXWscX",[caseless])), 
+    <<"xabc">> = iolist_to_binary(re:replace("xabc","(?<=a{2})b","BoRyoqeTXWscX",[caseless,
+                                                                                                                                                                                               global])), 
+    <<"xabc">> = iolist_to_binary(re:replace("xabc","(?<!a{2})b","&",[caseless])), 
+    <<"xabc">> = iolist_to_binary(re:replace("xabc","(?<!a{2})b","&",[caseless,
+                                                                                                                                                                        global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<!a{2})b","\\1o\\1eK\\1cENK\\1&djd",[caseless])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<!a{2})b","\\1o\\1eK\\1cENK\\1&djd",[caseless,
+                                                                                                                                                                                                                                    global])), 
+    <<"xaabc">> = iolist_to_binary(re:replace("xaabc","(?<!a{2})b","&&o&KwHJm",[caseless])), 
+    <<"xaabc">> = iolist_to_binary(re:replace("xaabc","(?<!a{2})b","&&o&KwHJm",[caseless,
+                                                                                                                                                                                            global])), 
+    <<"xa ccEEJTcFn">> = iolist_to_binary(re:replace("xa c","(?<=a\\h)c","&&EEJ\\1T&F\\1n",[])), 
+    <<"xa ccEEJTcFn">> = iolist_to_binary(re:replace("xa c","(?<=a\\h)c","&&EEJ\\1T&F\\1n",[global])), 
+    <<"axxYHmPRLyCdYeBCTMFc">> = iolist_to_binary(re:replace("axxbc","(?<=[^a]{2})b","YHmPRLyCdYeBCTMF",[])), 
+    <<"axxYHmPRLyCdYeBCTMFc">> = iolist_to_binary(re:replace("axxbc","(?<=[^a]{2})b","YHmPRLyCdYeBCTMF",[global])), 
+    <<"aAAIbac">> = iolist_to_binary(re:replace("aAAbc","(?<=[^a]{2})b","I&a",[])), 
+    <<"aAAIbac">> = iolist_to_binary(re:replace("aAAbc","(?<=[^a]{2})b","I&a",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^a]{2})b","Qosgls",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^a]{2})b","Qosgls",[global])), 
+    <<"xaabc">> = iolist_to_binary(re:replace("xaabc","(?<=[^a]{2})b","Iry\\1",[])), 
+    <<"xaabc">> = iolist_to_binary(re:replace("xaabc","(?<=[^a]{2})b","Iry\\1",[global])), 
+    <<"axxbbc">> = iolist_to_binary(re:replace("axxbc","(?<=[^a]{2})b","&&",[caseless])), 
+    <<"axxbbc">> = iolist_to_binary(re:replace("axxbc","(?<=[^a]{2})b","&&",[caseless,
+                                                                                                                                                                                   global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^a]{2})b","oNddUdB\\1XA",[caseless])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=[^a]{2})b","oNddUdB\\1XA",[caseless,
+                                                                                                                                                                                                                global])), 
+    <<"aAAbc">> = iolist_to_binary(re:replace("aAAbc","(?<=[^a]{2})b","boNOPUMfK&\\1",[caseless])), 
+    <<"aAAbc">> = iolist_to_binary(re:replace("aAAbc","(?<=[^a]{2})b","boNOPUMfK&\\1",[caseless,
+                                                                                                                                                                                                         global])), 
+    <<"xaabc">> = iolist_to_binary(re:replace("xaabc","(?<=[^a]{2})b","W&iffNoQ\\1",[caseless])), 
+    <<"xaabc">> = iolist_to_binary(re:replace("xaabc","(?<=[^a]{2})b","W&iffNoQ\\1",[caseless,
+                                                                                                                                                                                                     global])), 
+    <<"abKnqCjyP">> = iolist_to_binary(re:replace("abc","(?<=a\\H)c","KnqCjyP",[])), 
+    <<"abKnqCjyP">> = iolist_to_binary(re:replace("abc","(?<=a\\H)c","KnqCjyP",[global])), 
+    <<"abTxeCfVaOhSYo">> = iolist_to_binary(re:replace("abc","(?<=a\\V)c","TxeCfV\\1aOhSYo",[])), 
+    <<"abTxeCfVaOhSYo">> = iolist_to_binary(re:replace("abc","(?<=a\\V)c","TxeCfV\\1aOhSYo",[global])), 
+    <<"a
+gxsYrXgNx">> = iolist_to_binary(re:replace("a
+c","(?<=a\\v)c","g\\1\\1xs\\1Yr\\1XgN\\1x",[])), 
+    <<"a
+gxsYrXgNx">> = iolist_to_binary(re:replace("a
+c","(?<=a\\v)c","g\\1\\1xs\\1Yr\\1XgN\\1x",[global])), 
+    <<"XcccddYLX">> = iolist_to_binary(re:replace("XcccddYX","(?(?=c)c|d)++Y","&L",[])), 
+    <<"XcccddYLX">> = iolist_to_binary(re:replace("XcccddYX","(?(?=c)c|d)++Y","&L",[global])), 
+    <<"XjcccddYxcccddYymX">> = iolist_to_binary(re:replace("XcccddYX","(?(?=c)c|d)*+Y","j&x\\1&\\1\\1ym",[])), 
+    <<"XjcccddYxcccddYymX">> = iolist_to_binary(re:replace("XcccddYX","(?(?=c)c|d)*+Y","j&x\\1&\\1\\1ym",[global])), 
+    ok.
+run40() ->
+    <<"P">> = iolist_to_binary(re:replace("aaaaaaa","^(a{2,3}){2,}+a","P",[])), 
+    <<"P">> = iolist_to_binary(re:replace("aaaaaaa","^(a{2,3}){2,}+a","P",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a{2,3}){2,}+a","&AJ",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a{2,3}){2,}+a","&AJ",[global])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(a{2,3}){2,}+a","bT&aphetNw&xcisR",[])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(a{2,3}){2,}+a","bT&aphetNw&xcisR",[global])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a{2,3}){2,}+a","g",[])), 
+    <<"aaaaaaaaa">> = iolist_to_binary(re:replace("aaaaaaaaa","^(a{2,3}){2,}+a","g",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a{2,3})++a","U",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a{2,3})++a","U",[global])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(a{2,3})++a","CjQf&BIE\\1m&vHKyV",[])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(a{2,3})++a","CjQf&BIE\\1m&vHKyV",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a{2,3})*+a","jEe&kL&\\1Wd",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a{2,3})*+a","jEe&kL&\\1Wd",[global])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(a{2,3})*+a","&VFXL\\1JOa\\1dHl&Yw",[])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(a{2,3})*+a","&VFXL\\1JOa\\1dHl&Yw",[global])), 
+    <<"fByANGarQU">> = iolist_to_binary(re:replace("abXde","ab\\Cde","\\1fByANGarQ\\1U",[])), 
+    <<"fByANGarQU">> = iolist_to_binary(re:replace("abXde","ab\\Cde","\\1fByANGarQ\\1U",[global])), 
+    <<"abZdeXdDJIltBeDyobKXo">> = iolist_to_binary(re:replace("abZdeX","(?<=ab\\Cde)X","&dDJIltBeDyobK&o",[])), 
+    <<"abZdeXdDJIltBeDyobKXo">> = iolist_to_binary(re:replace("abZdeX","(?<=ab\\Cde)X","&dDJIltBeDyobK&o",[global])), 
+    <<"hv">> = iolist_to_binary(re:replace("aCb","a[\\CD]b","h\\1v",[])), 
+    <<"hv">> = iolist_to_binary(re:replace("aCb","a[\\CD]b","h\\1v",[global])), 
+    <<"waDbEkr">> = iolist_to_binary(re:replace("aDb","a[\\CD]b","w&Ekr",[])), 
+    <<"waDbEkr">> = iolist_to_binary(re:replace("aDb","a[\\CD]b","w&Ekr",[global])), 
+    <<"RCcE">> = iolist_to_binary(re:replace("aJb","a[\\C-X]b","R\\1CcE",[])), 
+    <<"RCcE">> = iolist_to_binary(re:replace("aJb","a[\\C-X]b","R\\1CcE",[global])), 
+    <<"X X">> = iolist_to_binary(re:replace("X X","\\H\\h\\V\\v","B&pquMp\\1NBcoPfQTdr\\1o",[])), 
+    <<"X X">> = iolist_to_binary(re:replace("X X","\\H\\h\\V\\v","B&pquMp\\1NBcoPfQTdr\\1o",[global])), 
+    <<"bjVX	XX	XOAvV">> = iolist_to_binary(re:replace("X	X","\\H\\h\\V\\v","bjV&&OAv\\1V",[])), 
+    <<"bjVX	XX	XOAvV">> = iolist_to_binary(re:replace("X	X","\\H\\h\\V\\v","bjV&&OAv\\1V",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\H\\h\\V\\v","Y",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\H\\h\\V\\v","Y",[global])), 
+    <<"  X">> = iolist_to_binary(re:replace("  X","\\H\\h\\V\\v","VrvLpiABSBWYG",[])), 
+    <<"  X">> = iolist_to_binary(re:replace("  X","\\H\\h\\V\\v","VrvLpiABSBWYG",[global])), 
+    <<"UibLPUMxnHgluPEcwP">> = iolist_to_binary(re:replace("	  X
+
","\\H*\\h+\\V?\\v{3,4}","Ui\\1bLPUMxnHgluPEcwP",[])), 
+    <<"UibLPUMxnHgluPEcwP">> = iolist_to_binary(re:replace("	  X
+
","\\H*\\h+\\V?\\v{3,4}","Ui\\1bLPUMxnHgluPEcwP",[global])), 
+    <<"	  
+
	  
+
YOgvhC">> = iolist_to_binary(re:replace("	  
+
","\\H*\\h+\\V?\\v{3,4}","&&YOgvhC\\1\\1",[])), 
+    <<"	  
+
	  
+
YOgvhC">> = iolist_to_binary(re:replace("	  
+
","\\H*\\h+\\V?\\v{3,4}","&&YOgvhC\\1\\1",[global])), 
+    <<"o	  
+aixbY	  
+BtbY">> = iolist_to_binary(re:replace("	  
+","\\H*\\h+\\V?\\v{3,4}","o&aixbY&BtbY\\1",[])), 
+    <<"o	  
+aixbY	  
+BtbY">> = iolist_to_binary(re:replace("	  
+","\\H*\\h+\\V?\\v{3,4}","o&aixbY&BtbY\\1",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\H*\\h+\\V?\\v{3,4}","orCME\\1H",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\H*\\h+\\V?\\v{3,4}","orCME\\1H",[global])), 
+    <<"	  
+">> = iolist_to_binary(re:replace("	  
+","\\H*\\h+\\V?\\v{3,4}","h&L\\1\\1wk\\1",[])), 
+    <<"	  
+">> = iolist_to_binary(re:replace("	  
+","\\H*\\h+\\V?\\v{3,4}","h&L\\1\\1wk\\1",[global])), 
+    <<"XY  aeVjRE">> = iolist_to_binary(re:replace("XY  ABCDE","\\H{3,4}","aeVjR",[])), 
+    <<"XY  aeVjRE">> = iolist_to_binary(re:replace("XY  ABCDE","\\H{3,4}","aeVjR",[global])), 
+    <<"XY  inwBHwGPQRKvfoDb ST">> = iolist_to_binary(re:replace("XY  PQR ST","\\H{3,4}","in\\1wBHw\\1G&KvfoDb\\1",[])), 
+    <<"XY  inwBHwGPQRKvfoDb ST">> = iolist_to_binary(re:replace("XY  PQR ST","\\H{3,4}","in\\1wBHw\\1G&KvfoDb\\1",[global])), 
+    <<"XY  AcCVYFB    PYkLB    PHB    PFIQRB    PBeQRS">> = iolist_to_binary(re:replace("XY  AB    PQRS",".\\h{3,4}.","\\1cCVYF&YkL&H&FIQR&Be",[])), 
+    <<"XY  AcCVYFB    PYkLB    PHB    PFIQRB    PBeQRS">> = iolist_to_binary(re:replace("XY  AB    PQRS",".\\h{3,4}.","\\1cCVYF&YkL&H&FIQR&Be",[global])), 
+    <<">XNNNYZEbXNNNYZXNNNYZQsKnuk">> = iolist_to_binary(re:replace(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z","&E\\1b&&QsKnuk",[])), 
+    <<">XNNNYZEbXNNNYZXNNNYZQsKnuk">> = iolist_to_binary(re:replace(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z","&E\\1b&&QsKnuk",[global])), 
+    <<">m">> = iolist_to_binary(re:replace(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z","m",[])), 
+    <<">m">> = iolist_to_binary(re:replace(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z","m",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\h*X\\h?\\H+Y\\H?Z","W\\1BBQbt&HF\\1KkXwm\\1Vdn",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\h*X\\h?\\H+Y\\H?Z","W\\1BBQbt&HF\\1KkXwm\\1Vdn",[global])), 
+    <<">XYZ">> = iolist_to_binary(re:replace(">XYZ","\\h*X\\h?\\H+Y\\H?Z","&GW",[])), 
+    <<">XYZ">> = iolist_to_binary(re:replace(">XYZ","\\h*X\\h?\\H+Y\\H?Z","&GW",[global])), 
+    <<">  X NY Z">> = iolist_to_binary(re:replace(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z","JIYAqmdtuCSO",[])), 
+    <<">  X NY Z">> = iolist_to_binary(re:replace(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z","JIYAqmdtuCSO",[global])), 
+    <<">vctAlOgcGXY
+Z
+ANNh">> = iolist_to_binary(re:replace(">XY
+Z
+ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c","vc\\1tAl\\1O\\1gcG&h\\1",[])), 
+    <<">vctAlOgcGXY
+Z
+ANNh">> = iolist_to_binary(re:replace(">XY
+Z
+ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c","vc\\1tAl\\1O\\1gcG&h\\1",[global])), 
+    <<">bm
+
X
+Y
+ZZZ
+AAANNNuAMN">> = iolist_to_binary(re:replace(">
+
X
+Y
+ZZZ
+AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c","bm&\\1uAMN",[])), 
+    <<">bm
+
X
+Y
+ZZZ
+AAANNNuAMN">> = iolist_to_binary(re:replace(">
+
X
+Y
+ZZZ
+AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c","bm&\\1uAMN",[global])), 
+    <<"foojypfoojma">> = iolist_to_binary(re:replace("foobar","(foo)\\Kbar","jyp\\1jma",[])), 
+    <<"foojypfoojma">> = iolist_to_binary(re:replace("foobar","(foo)\\Kbar","jyp\\1jma",[global])), 
+    <<"fooUcOiqwyxvfoobar">> = iolist_to_binary(re:replace("foobar","(foo)(\\Kbar|baz)","UcOiqwyxv\\1&",[])), 
+    <<"fooUcOiqwyxvfoobar">> = iolist_to_binary(re:replace("foobar","(foo)(\\Kbar|baz)","UcOiqwyxv\\1&",[global])), 
+    <<"xXfoobazTfoobazneSQcxWfooBA">> = iolist_to_binary(re:replace("foobaz","(foo)(\\Kbar|baz)","xX&T&neSQcxW\\1BA",[])), 
+    <<"xXfoobazTfoobazneSQcxWfooBA">> = iolist_to_binary(re:replace("foobaz","(foo)(\\Kbar|baz)","xX&T&neSQcxW\\1BA",[global])), 
+    <<"foovYnKbarbazVqfoobarheyiy">> = iolist_to_binary(re:replace("foobarbaz","(foo\\Kbar)baz","vYnK&Vq\\1heyiy",[])), 
+    <<"foovYnKbarbazVqfoobarheyiy">> = iolist_to_binary(re:replace("foobarbaz","(foo\\Kbar)baz","vYnK&Vq\\1heyiy",[global])), 
+    <<"wYDabPababababbbabZygQUbMBoQiXXXX">> = iolist_to_binary(re:replace("ababababbbabZXXXX","^(a(b))\\1\\g1\\g{1}\\g-1\\g{-1}\\g{-02}Z","wYD\\1P&ygQUbMBoQi",[])), 
+    <<"wYDabPababababbbabZygQUbMBoQiXXXX">> = iolist_to_binary(re:replace("ababababbbabZXXXX","^(a(b))\\1\\g1\\g{1}\\g-1\\g{-1}\\g{-02}Z","wYD\\1P&ygQUbMBoQi",[global])), 
+    <<"QJyUVPxY">> = iolist_to_binary(re:replace("tom-tom","(?<A>tom|bon)-\\g{A}","QJyUVPxY",[])), 
+    <<"QJyUVPxY">> = iolist_to_binary(re:replace("tom-tom","(?<A>tom|bon)-\\g{A}","QJyUVPxY",[global])), 
+    <<"bonvRbon-bonECJDijVbonbon-bonnbonYtaYv">> = iolist_to_binary(re:replace("bon-bon","(?<A>tom|bon)-\\g{A}","\\1vR&ECJDijV\\1&n\\1YtaYv",[])), 
+    <<"bonvRbon-bonECJDijVbonbon-bonnbonYtaYv">> = iolist_to_binary(re:replace("bon-bon","(?<A>tom|bon)-\\g{A}","\\1vR&ECJDijV\\1&n\\1YtaYv",[global])), 
+    <<"bacxxx">> = iolist_to_binary(re:replace("bacxxx","(^(a|b\\g{-1}))","B",[])), 
+    <<"bacxxx">> = iolist_to_binary(re:replace("bacxxx","(^(a|b\\g{-1}))","B",[global])), 
+    <<"abcHN">> = iolist_to_binary(re:replace("abcabc","(?|(abc)|(xyz))\\1","\\1HN",[])), 
+    <<"abcHN">> = iolist_to_binary(re:replace("abcabc","(?|(abc)|(xyz))\\1","\\1HN",[global])), 
+    <<"i">> = iolist_to_binary(re:replace("xyzxyz","(?|(abc)|(xyz))\\1","i",[])), 
+    <<"i">> = iolist_to_binary(re:replace("xyzxyz","(?|(abc)|(xyz))\\1","i",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?|(abc)|(xyz))\\1","&RDdXS\\1",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?|(abc)|(xyz))\\1","&RDdXS\\1",[global])), 
+    <<"abcxyz">> = iolist_to_binary(re:replace("abcxyz","(?|(abc)|(xyz))\\1","xvrTYMBEX",[])), 
+    <<"abcxyz">> = iolist_to_binary(re:replace("abcxyz","(?|(abc)|(xyz))\\1","xvrTYMBEX",[global])), 
+    <<"xyzabc">> = iolist_to_binary(re:replace("xyzabc","(?|(abc)|(xyz))\\1","gkljK\\1CR\\1BykWHcqqC&G",[])), 
+    <<"xyzabc">> = iolist_to_binary(re:replace("xyzabc","(?|(abc)|(xyz))\\1","gkljK\\1CR\\1BykWHcqqC&G",[global])), 
+    ok.
+run41() ->
+    <<"EaIdWBoabck">> = iolist_to_binary(re:replace("abcabc","(?|(abc)|(xyz))(?1)","EaIdWBo\\1k",[])), 
+    <<"EaIdWBoabck">> = iolist_to_binary(re:replace("abcabc","(?|(abc)|(xyz))(?1)","EaIdWBo\\1k",[global])), 
+    <<"xyzabcxyzxyzMvxyzjgRaou">> = iolist_to_binary(re:replace("xyzabc","(?|(abc)|(xyz))(?1)","&\\1\\1Mv\\1jgRaou",[])), 
+    <<"xyzabcxyzxyzMvxyzjgRaou">> = iolist_to_binary(re:replace("xyzabc","(?|(abc)|(xyz))(?1)","&\\1\\1Mv\\1jgRaou",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?|(abc)|(xyz))(?1)","&vqt\\1Hv",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?|(abc)|(xyz))(?1)","&vqt\\1Hv",[global])), 
+    <<"xyzxyz">> = iolist_to_binary(re:replace("xyzxyz","(?|(abc)|(xyz))(?1)","LyN",[])), 
+    <<"xyzxyz">> = iolist_to_binary(re:replace("xyzxyz","(?|(abc)|(xyz))(?1)","LyN",[global])), 
+    <<"XYabcdYvXYabcdYXYabcdYXYabcdYjw">> = iolist_to_binary(re:replace("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)","&v&&&jw",[])), 
+    <<"XYabcdYvXYabcdYXYabcdYXYabcdYjw">> = iolist_to_binary(re:replace("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)","&v&&&jw",[global])), 
+    <<"uqndDBXYabcdYGahfmNcwsERUk">> = iolist_to_binary(re:replace("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)","uqndDB&G\\1hfmNcwsERUk",[])), 
+    <<"uqndDBXYabcdYGahfmNcwsERUk">> = iolist_to_binary(re:replace("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)","uqndDB&G\\1hfmNcwsERUk",[global])), 
+    <<"XYabcdYtahaNIsaeGvkDDLOQ">> = iolist_to_binary(re:replace("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)","&tah\\1NIs\\1eGvkDDLOQ",[])), 
+    <<"XYabcdYtahaNIsaeGvkDDLOQ">> = iolist_to_binary(re:replace("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)","&tah\\1NIs\\1eGvkDDLOQ",[global])), 
+    <<"boxyz">> = iolist_to_binary(re:replace("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}","bo",[])), 
+    <<"boxyz">> = iolist_to_binary(re:replace("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}","bo",[global])), 
+    <<"sqNrwMWMcRUxyz">> = iolist_to_binary(re:replace("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}","sqNrwMWMcRU",[])), 
+    <<"sqNrwMWMcRUxyz">> = iolist_to_binary(re:replace("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}","sqNrwMWMcRU",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?'abc'\\w+):\\k<abc>{2}","Ahbk",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?'abc'\\w+):\\k<abc>{2}","Ahbk",[global])), 
+    <<"a:axyz">> = iolist_to_binary(re:replace("a:axyz","(?'abc'\\w+):\\k<abc>{2}","yr&SM&HjpyRb",[])), 
+    <<"a:axyz">> = iolist_to_binary(re:replace("a:axyz","(?'abc'\\w+):\\k<abc>{2}","yr&SM&HjpyRb",[global])), 
+    <<"ab:abxyz">> = iolist_to_binary(re:replace("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}","BQwV",[])), 
+    <<"ab:abxyz">> = iolist_to_binary(re:replace("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}","BQwV",[global])), 
+    <<"a:aaxnnUMItwyNa:aamCRBaixyz">> = iolist_to_binary(re:replace("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}","&xnnUMItwyN&mCRB\\1i",[])), 
+    <<"a:aaxnnUMItwyNa:aamCRBaixyz">> = iolist_to_binary(re:replace("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}","&xnnUMItwyN&mCRB\\1i",[global])), 
+    <<"Labjab:ababqxyz">> = iolist_to_binary(re:replace("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}","L\\1j&q",[])), 
+    <<"Labjab:ababqxyz">> = iolist_to_binary(re:replace("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}","L\\1j&q",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?'abc'\\w+):\\g{abc}{2}","dLG\\1",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?'abc'\\w+):\\g{abc}{2}","dLG\\1",[global])), 
+    <<"a:axyz">> = iolist_to_binary(re:replace("a:axyz","(?'abc'\\w+):\\g{abc}{2}","MKB",[])), 
+    <<"a:axyz">> = iolist_to_binary(re:replace("a:axyz","(?'abc'\\w+):\\g{abc}{2}","MKB",[global])), 
+    <<"ab:abxyz">> = iolist_to_binary(re:replace("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}","BwHek&EFhbw",[])), 
+    <<"ab:abxyz">> = iolist_to_binary(re:replace("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}","BwHek&EFhbw",[global])), 
+    <<"abdqUabdFaabdtmIkaf">> = iolist_to_binary(re:replace("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)","&qU&Fa&tmIk\\1f",[extended])), 
+    <<"abdqUabdFaabdtmIkaf">> = iolist_to_binary(re:replace("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)","&qU&Fa&tmIk\\1f",[extended,
+                                                                                                                                                                                                                                                                         global])), 
+    <<"haacettwdUtIv">> = iolist_to_binary(re:replace("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)","haa&ttwdU\\1tIv",[extended])), 
+    <<"haacettwdUtIv">> = iolist_to_binary(re:replace("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)","haa&ttwdU\\1tIv",[extended,
+                                                                                                                                                                                                                                                                     global])), 
+    <<"uaXaXZYWULYgJXaXaXaXZg">> = iolist_to_binary(re:replace("aXaXZ","^(a.)\\g-1Z","u&YWULYgJX\\1&g",[])), 
+    <<"uaXaXZYWULYgJXaXaXaXZg">> = iolist_to_binary(re:replace("aXaXZ","^(a.)\\g-1Z","u&YWULYgJX\\1&g",[global])), 
+    <<"TpaXaXZmaXaXZQhnJ">> = iolist_to_binary(re:replace("aXaXZ","^(a.)\\g{-1}Z","Tp&m&QhnJ",[])), 
+    <<"TpaXaXZmaXaXZQhnJ">> = iolist_to_binary(re:replace("aXaXZ","^(a.)\\g{-1}Z","Tp&m&QhnJ",[global])), 
+    <<"cNcd">> = iolist_to_binary(re:replace("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ","cN",[extended])), 
+    <<"cNcd">> = iolist_to_binary(re:replace("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ","cN",[extended,
+                                                                                                                                                                                                                                               global])), 
+    <<"S">> = iolist_to_binary(re:replace("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?<NAME_PAT>[a-z]+)
+  (?<ADDRESS_PAT>\\d+)
+  )","S",[extended])), 
+    <<"S">> = iolist_to_binary(re:replace("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?<NAME_PAT>[a-z]+)
+  (?<ADDRESS_PAT>\\d+)
+  )","S",[extended,global])), 
+    <<"m1.2.3.4CNSbdi">> = iolist_to_binary(re:replace("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","m&CNSbd\\1i",[])), 
+    <<"m1.2.3.4CNSbdi">> = iolist_to_binary(re:replace("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","m&CNSbd\\1i",[global])), 
+    <<"131.111.10.206131.111.10.206DPiNTNK131.111.10.206grPeyEu">> = iolist_to_binary(re:replace("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","&&DPiNTN\\1\\1K&grPey\\1Eu",[])), 
+    <<"131.111.10.206131.111.10.206DPiNTNK131.111.10.206grPeyEu">> = iolist_to_binary(re:replace("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","&&DPiNTN\\1\\1K&grPey\\1Eu",[global])), 
+    <<"uBfPy10.0.0.010.0.0.0svWuRdbVVmys">> = iolist_to_binary(re:replace("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","u\\1BfPy&&svWuRdbVVmys",[])), 
+    <<"uBfPy10.0.0.010.0.0.0svWuRdbVVmys">> = iolist_to_binary(re:replace("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","u\\1BfPy&&svWuRdbVVmys",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","jVYSCLvb\\1Rm\\1Vn&",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","jVYSCLvb\\1Rm\\1Vn&",[global])), 
+    <<"10.6">> = iolist_to_binary(re:replace("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","dECob\\1\\1yakWA",[])), 
+    <<"10.6">> = iolist_to_binary(re:replace("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","dECob\\1\\1yakWA",[global])), 
+    <<"455.3.4.5">> = iolist_to_binary(re:replace("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","r",[])), 
+    <<"455.3.4.5">> = iolist_to_binary(re:replace("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}","r",[global])), 
+    <<"VjWQp">> = iolist_to_binary(re:replace("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","VjWQp",[])), 
+    <<"VjWQp">> = iolist_to_binary(re:replace("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","VjWQp",[global])), 
+    <<"VQs131.111.10.206131.111.10.206r.206.206">> = iolist_to_binary(re:replace("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","VQs&&r\\1\\1",[])), 
+    <<"VQs131.111.10.206131.111.10.206r.206.206">> = iolist_to_binary(re:replace("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","VQs&&r\\1\\1",[global])), 
+    <<"mebNTtCd10.0.0.010.0.0.010.0.0.010.0.0.0S.0">> = iolist_to_binary(re:replace("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","mebNTtCd&&&&S\\1",[])), 
+    <<"mebNTtCd10.0.0.010.0.0.010.0.0.010.0.0.0S.0">> = iolist_to_binary(re:replace("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","mebNTtCd&&&&S\\1",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","uvmK&GcQ&\\1u\\1",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","uvmK&GcQ&\\1u\\1",[global])), 
+    <<"10.6">> = iolist_to_binary(re:replace("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","TH\\1bkRaOVXKAGH&Wq\\1",[])), 
+    <<"10.6">> = iolist_to_binary(re:replace("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","TH\\1bkRaOVXKAGH&Wq\\1",[global])), 
+    <<"455.3.4.5">> = iolist_to_binary(re:replace("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","flY&",[])), 
+    <<"455.3.4.5">> = iolist_to_binary(re:replace("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))","flY&",[global])), 
+    <<"XIXOpartynow is the time for all good men to come to the aid of the partyenW">> = iolist_to_binary(re:replace("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$","XIXO\\1&enW",[])), 
+    <<"XIXOpartynow is the time for all good men to come to the aid of the partyenW">> = iolist_to_binary(re:replace("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$","XIXO\\1&enW",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\w++|\\s++)*$","bwiYg",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\w++|\\s++)*$","bwiYg",[global])), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(re:replace("this is not a line with only words and spaces!","^(\\w++|\\s++)*$","d\\1",[])), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(re:replace("this is not a line with only words and spaces!","^(\\w++|\\s++)*$","d\\1",[global])), 
+    <<"m12345sdTXRM1234512345a">> = iolist_to_binary(re:replace("12345a","(\\d++)(\\w)","m\\1sdTXRM\\1&",[])), 
+    <<"m12345sdTXRM1234512345a">> = iolist_to_binary(re:replace("12345a","(\\d++)(\\w)","m\\1sdTXRM\\1&",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(\\d++)(\\w)","eFU&\\1cQE\\1\\1grkNJ&Ad\\1f",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","(\\d++)(\\w)","eFU&\\1cQE\\1\\1grkNJ&Ad\\1f",[global])), 
+    <<"12345+">> = iolist_to_binary(re:replace("12345+","(\\d++)(\\w)","i&hvp\\1XhCAs&VRh",[])), 
+    <<"12345+">> = iolist_to_binary(re:replace("12345+","(\\d++)(\\w)","i&hvp\\1XhCAs&VRh",[global])), 
+    <<"NaaabIg">> = iolist_to_binary(re:replace("aaab","a++b","\\1N&Ig",[])), 
+    <<"NaaabIg">> = iolist_to_binary(re:replace("aaab","a++b","\\1N&Ig",[global])), 
+    <<"maaabaaabgBJFEHXaaabaaabaaabkAaaab">> = iolist_to_binary(re:replace("aaab","(a++b)","m&\\1gBJFEHX&&\\1kA&",[])), 
+    <<"maaabaaabgBJFEHXaaabaaabaaabkAaaab">> = iolist_to_binary(re:replace("aaab","(a++b)","m&\\1gBJFEHX&&\\1kA&",[global])), 
+    <<"TaaabRaaaaaaeBTpaaaTi">> = iolist_to_binary(re:replace("aaab","(a++)b","T&R\\1\\1eBTp\\1Ti",[])), 
+    <<"TaaabRaaaaaaeBTpaaaTi">> = iolist_to_binary(re:replace("aaab","(a++)b","T&R\\1\\1eBTp\\1Ti",[global])), 
+    <<"((PwxkrBxNdabc(ade)ufh()()xYBkxEabc(ade)ufh()()xFkxx">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+","Pw\\1krB\\1Nd&YBk\\1E&Fk\\1\\1",[])), 
+    <<"((PwxkrBxNdabc(ade)ufh()()xYBkxEabc(ade)ufh()()xFkxx">> = iolist_to_binary(re:replace("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+","Pw\\1krB\\1Nd&YBk\\1E&Fk\\1\\1",[global])), 
+    <<"F(abc)sMN">> = iolist_to_binary(re:replace("(abc)","\\(([^()]++|\\([^()]+\\))+\\)","F&sMN",[])), 
+    <<"F(abc)sMN">> = iolist_to_binary(re:replace("(abc)","\\(([^()]++|\\([^()]+\\))+\\)","F&sMN",[global])), 
+    <<"SMUJyftxyzxyz(abc(def)xyz)RpnMnA">> = iolist_to_binary(re:replace("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)","SMUJyft\\1\\1&RpnMnA",[])), 
+    <<"SMUJyftxyzxyz(abc(def)xyz)RpnMnA">> = iolist_to_binary(re:replace("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)","SMUJyft\\1\\1&RpnMnA",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)","p",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)","p",[global])), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)","gVbYV&vnkHNjeK",[])), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(re:replace("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)","gVbYV&vnkHNjeK",[global])), 
+    ok.
+run42() ->
+    <<"YHcxHwcJHhabcabcyqOabcio">> = iolist_to_binary(re:replace("abc","^([^()]|\\((?1)*\\))*$","YH\\1xHw\\1JHh&&yqO&io",[])), 
+    <<"YHcxHwcJHhabcabcyqOabcio">> = iolist_to_binary(re:replace("abc","^([^()]|\\((?1)*\\))*$","YH\\1xHw\\1JHh&&yqO&io",[global])), 
+    <<"Xua(b)ccOqkxg">> = iolist_to_binary(re:replace("a(b)c","^([^()]|\\((?1)*\\))*$","Xu&\\1Oqkxg",[])), 
+    <<"Xua(b)ccOqkxg">> = iolist_to_binary(re:replace("a(b)c","^([^()]|\\((?1)*\\))*$","Xu&\\1Oqkxg",[global])), 
+    <<"pHOdcaLUi">> = iolist_to_binary(re:replace("a(b(c))d","^([^()]|\\((?1)*\\))*$","pHO\\1caLUi",[])), 
+    <<"pHOdcaLUi">> = iolist_to_binary(re:replace("a(b(c))d","^([^()]|\\((?1)*\\))*$","pHO\\1caLUi",[global])), 
+    <<"*** Failers)">> = iolist_to_binary(re:replace("*** Failers)","^([^()]|\\((?1)*\\))*$","&YxG",[])), 
+    <<"*** Failers)">> = iolist_to_binary(re:replace("*** Failers)","^([^()]|\\((?1)*\\))*$","&YxG",[global])), 
+    <<"a(b(c)d">> = iolist_to_binary(re:replace("a(b(c)d","^([^()]|\\((?1)*\\))*$","s\\1BLqc",[])), 
+    <<"a(b(c)d">> = iolist_to_binary(re:replace("a(b(c)d","^([^()]|\\((?1)*\\))*$","s\\1BLqc",[global])), 
+    <<"puAth">> = iolist_to_binary(re:replace(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$","puAth",[])), 
+    <<"puAth">> = iolist_to_binary(re:replace(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$","puAth",[global])), 
+    <<"QVYB>abc>1(2)3<xyz<cFhyH">> = iolist_to_binary(re:replace(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$","QVYB&cFhyH",[])), 
+    <<"QVYB>abc>1(2)3<xyz<cFhyH">> = iolist_to_binary(re:replace(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$","QVYB&cFhyH",[global])), 
+    <<"(1(2)3)">> = iolist_to_binary(re:replace(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$","\\1",[])), 
+    <<"(1(2)3)">> = iolist_to_binary(re:replace(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$","\\1",[global])), 
+    <<"fb1221w122112211221Q1221yL1221d">> = iolist_to_binary(re:replace("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","fb\\1w\\1&&Q&yL&d",[caseless])), 
+    <<"fb1221w122112211221Q1221yL1221d">> = iolist_to_binary(re:replace("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","fb\\1w\\1&&Q&yL&d",[caseless,
+                                                                                                                                                                                                                                                                global])), 
+    <<"yadakp">> = iolist_to_binary(re:replace("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","ya\\1dakp\\1",[caseless])), 
+    <<"yadakp">> = iolist_to_binary(re:replace("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","ya\\1dakp\\1",[caseless,
+                                                                                                                                                                                                                                                                                                        global])), 
+    <<"aAmanaplanacanalPanamalDAmanaplanacanalPanamaiqyAmanaplanacanalPanamaOSvaJYbQ">> = iolist_to_binary(re:replace("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","a&lD&i\\1qy&OSv\\1aJYbQ",[caseless])), 
+    <<"aAmanaplanacanalPanamalDAmanaplanacanalPanamaiqyAmanaplanacanalPanamaOSvaJYbQ">> = iolist_to_binary(re:replace("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","a&lD&i\\1qy&OSv\\1aJYbQ",[caseless,
+                                                                                                                                                                                                                                                                                                             global])), 
+    <<"UcSlDNWgAva">> = iolist_to_binary(re:replace("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","UcSlD\\1NWgAva\\1",[caseless])), 
+    <<"UcSlDNWgAva">> = iolist_to_binary(re:replace("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","UcSlD\\1NWgAva\\1",[caseless,
+                                                                                                                                                                                                                                                                                          global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","n",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","n",[caseless,
+                                                                                                                                                                                                                                        global])), 
+    <<"Thequickbrownfox">> = iolist_to_binary(re:replace("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","MuY&Y&DfSiG&KPnRRGOO",[caseless])), 
+    <<"Thequickbrownfox">> = iolist_to_binary(re:replace("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$","MuY&Y&DfSiG&KPnRRGOO",[caseless,
+                                                                                                                                                                                                                                                                                           global])), 
+    <<"Dlcq12uvNpwj">> = iolist_to_binary(re:replace("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","Dlcq\\1uvNpwj",[])), 
+    <<"Dlcq12uvNpwj">> = iolist_to_binary(re:replace("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","Dlcq\\1uvNpwj",[global])), 
+    <<"(((2+2)*-3)-7)Hq(((2+2)*-3)-7)nwjc(((2+2)*-3)-7)OCxTARr">> = iolist_to_binary(re:replace("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","&Hq&nwjc\\1OCxTARr",[])), 
+    <<"(((2+2)*-3)-7)Hq(((2+2)*-3)-7)nwjc(((2+2)*-3)-7)OCxTARr">> = iolist_to_binary(re:replace("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","&Hq&nwjc\\1OCxTARr",[global])), 
+    <<"EjPI-12tsA-12ux-12-12-12MfkO">> = iolist_to_binary(re:replace("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","EjPI&tsA&ux&\\1\\1MfkO",[])), 
+    <<"EjPI-12tsA-12ux-12-12-12MfkO">> = iolist_to_binary(re:replace("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","EjPI&tsA&ux&\\1\\1MfkO",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","sxA&v\\1L\\1Q\\1FFDAm\\1hOOv",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","sxA&v\\1L\\1Q\\1FFDAm\\1hOOv",[global])), 
+    <<"((2+2)*-3)-7)">> = iolist_to_binary(re:replace("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","el\\1La",[])), 
+    <<"((2+2)*-3)-7)">> = iolist_to_binary(re:replace("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$","el\\1La",[global])), 
+    <<"vRxyzxyzrJYxyzxyzjNtdExyzSxeWm">> = iolist_to_binary(re:replace("xyz","^(x(y|(?1){2})z)","vR\\1\\1rJY&\\1jNtdE&SxeWm",[])), 
+    <<"vRxyzxyzrJYxyzxyzjNtdExyzSxeWm">> = iolist_to_binary(re:replace("xyz","^(x(y|(?1){2})z)","vR\\1\\1rJY&\\1jNtdE&SxeWm",[global])), 
+    <<"CRxxyzxyzzkQsxxyzxyzzHmiGvxxyzxyzzy">> = iolist_to_binary(re:replace("xxyzxyzz","^(x(y|(?1){2})z)","CR\\1kQs\\1HmiGv\\1y",[])), 
+    <<"CRxxyzxyzzkQsxxyzxyzzHmiGvxxyzxyzzy">> = iolist_to_binary(re:replace("xxyzxyzz","^(x(y|(?1){2})z)","CR\\1kQs\\1HmiGv\\1y",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(x(y|(?1){2})z)","qTfvW\\1q\\1&UXxp\\1b",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(x(y|(?1){2})z)","qTfvW\\1q\\1&UXxp\\1b",[global])), 
+    <<"xxyzz">> = iolist_to_binary(re:replace("xxyzz","^(x(y|(?1){2})z)","WRW&Ky",[])), 
+    <<"xxyzz">> = iolist_to_binary(re:replace("xxyzz","^(x(y|(?1){2})z)","WRW&Ky",[global])), 
+    <<"xxyzxyzxyzz">> = iolist_to_binary(re:replace("xxyzxyzxyzz","^(x(y|(?1){2})z)","SgB&TOTaVTG\\1\\1Sy",[])), 
+    <<"xxyzxyzxyzz">> = iolist_to_binary(re:replace("xxyzxyzxyzz","^(x(y|(?1){2})z)","SgB&TOTaVTG\\1\\1Sy",[global])), 
+    <<"p">> = iolist_to_binary(re:replace("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","p",[extended])), 
+    <<"p">> = iolist_to_binary(re:replace("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","p",[extended,
+                                                                                                                                                                                                                                          global])), 
+    <<"<abcd>oQy<abcd><abcd>UhI<abcd>g">> = iolist_to_binary(re:replace("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","\\1oQy\\1&UhI&g",[extended])), 
+    <<"<abcd>oQy<abcd><abcd>UhI<abcd>g">> = iolist_to_binary(re:replace("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","\\1oQy\\1&UhI&g",[extended,
+                                                                                                                                                                                                                                                                                  global])), 
+    <<"NymkAa">> = iolist_to_binary(re:replace("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","NymkAa",[extended])), 
+    <<"NymkAa">> = iolist_to_binary(re:replace("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","NymkAa",[extended,
+                                                                                                                                                                                                                                                                              global])), 
+    <<"<abc i<def>g<def>fMHHlJ<def><def> hij>">> = iolist_to_binary(re:replace("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","i&g\\1fMHHlJ\\1\\1",[extended])), 
+    <<"<abc i<def>g<def>fMHHlJ<def><def> hij>">> = iolist_to_binary(re:replace("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","i&g\\1fMHHlJ\\1\\1",[extended,
+                                                                                                                                                                                                                                                                                                          global])), 
+    <<"yJJ<abc<>def>yo<abc<>def>X">> = iolist_to_binary(re:replace("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","yJJ&yo\\1X",[extended])), 
+    <<"yJJ<abc<>def>yo<abc<>def>X">> = iolist_to_binary(re:replace("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","yJJ&yo\\1X",[extended,
+                                                                                                                                                                                                                                                                              global])), 
+    <<"<abcn<>LhiK<>ufT<>q<><>SodEfM">> = iolist_to_binary(re:replace("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","n\\1LhiK&ufT&q&&SodEfM",[extended])), 
+    <<"<abcn<>LhiK<>ufT<>q<><>SodEfM">> = iolist_to_binary(re:replace("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","n\\1LhiK&ufT&q&&SodEfM",[extended,
+                                                                                                                                                                                                                                                                                                 global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","R&",[extended])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","R&",[extended,
+                                                                                                                                                                                                                                                               global])), 
+    <<"<abc">> = iolist_to_binary(re:replace("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","l",[extended])), 
+    <<"<abc">> = iolist_to_binary(re:replace("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))","l",[extended,
+                                                                                                                                                                                                                                              global])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^a+(*FAIL)","oWDClek&Nwt&&aMO\\1",[])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^a+(*FAIL)","oWDClek&Nwt&&aMO\\1",[global])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?c+(*FAIL)","L\\1&&fllctiK\\1WqBCUQ",[])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?c+(*FAIL)","L\\1&&fllctiK\\1WqBCUQ",[global])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?(*PRUNE)c+(*FAIL)","Jpy\\1FAL",[])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?(*PRUNE)c+(*FAIL)","Jpy\\1FAL",[global])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?(*COMMIT)c+(*FAIL)","I",[])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?(*COMMIT)c+(*FAIL)","I",[global])), 
+    <<"aaabcccaaabccc">> = iolist_to_binary(re:replace("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)","cRBQ\\1mL",[])), 
+    <<"aaabcccaaabccc">> = iolist_to_binary(re:replace("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)","cRBQ\\1mL",[global])), 
+    <<"JRWgePSUsExfJfHo">> = iolist_to_binary(re:replace("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","\\1JRWgePSUsExfJf\\1Ho",[])), 
+    <<"JRWgePSUsExfJfHo">> = iolist_to_binary(re:replace("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","\\1JRWgePSUsExfJf\\1Ho",[global])), 
+    <<"AlHMdrRl++++++">> = iolist_to_binary(re:replace("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","AlHMdrRl",[])), 
+    <<"AlHMdrRl++++++">> = iolist_to_binary(re:replace("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","AlHMdrRl",[global])), 
+    <<"bKH">> = iolist_to_binary(re:replace("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","bKH",[])), 
+    <<"bKH">> = iolist_to_binary(re:replace("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","bKH",[global])), 
+    <<"AyqLHpWSaFmaN+++++">> = iolist_to_binary(re:replace("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","AyqLHpWSaFma\\1N",[])), 
+    <<"AyqLHpWSaFmaN+++++">> = iolist_to_binary(re:replace("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","AyqLHpWSaFma\\1N",[global])), 
+    <<"bvYRps">> = iolist_to_binary(re:replace("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","bvYR\\1ps",[])), 
+    <<"bvYRps">> = iolist_to_binary(re:replace("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","bvYR\\1ps",[global])), 
+    <<"KPYMvODtuotXNIo++++">> = iolist_to_binary(re:replace("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","KPYMv\\1\\1ODtuotXNIo",[])), 
+    <<"KPYMvODtuotXNIo++++">> = iolist_to_binary(re:replace("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","KPYMv\\1\\1ODtuotXNIo",[global])), 
+    <<"kddddd">> = iolist_to_binary(re:replace("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","k",[])), 
+    <<"kddddd">> = iolist_to_binary(re:replace("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","k",[global])), 
+    <<"kaaaxxxxxxrQaRFqL">> = iolist_to_binary(re:replace("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","k\\1rQaRFqL",[])), 
+    <<"kaaaxxxxxxrQaRFqL">> = iolist_to_binary(re:replace("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","k\\1rQaRFqL",[global])), 
+    <<"aaaw++++++">> = iolist_to_binary(re:replace("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","\\1w",[])), 
+    <<"aaaw++++++">> = iolist_to_binary(re:replace("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","\\1w",[global])), 
+    <<"JyQqJIbbbxxxxxBAVHEvuuRsYpC">> = iolist_to_binary(re:replace("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","JyQqJI&BAVHEvuuRsYpC",[])), 
+    <<"JyQqJIbbbxxxxxBAVHEvuuRsYpC">> = iolist_to_binary(re:replace("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","JyQqJI&BAVHEvuuRsYpC",[global])), 
+    <<"dBwHTombbbccbbbR+++++">> = iolist_to_binary(re:replace("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","dBwHTom&cc&R",[])), 
+    <<"dBwHTombbbccbbbR+++++">> = iolist_to_binary(re:replace("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","dBwHTom&cc&R",[global])), 
+    <<"OcccxxxxeA">> = iolist_to_binary(re:replace("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","O&eA",[])), 
+    <<"OcccxxxxeA">> = iolist_to_binary(re:replace("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","O&eA",[global])), 
+    <<"DyFCQsccclWCcccy++++">> = iolist_to_binary(re:replace("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","DyFCQs&lWC&y",[])), 
+    <<"DyFCQsccclWCcccy++++">> = iolist_to_binary(re:replace("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","DyFCQs&lWC&y",[global])), 
+    <<"cdddvddddd">> = iolist_to_binary(re:replace("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","c&v",[])), 
+    <<"cdddvddddd">> = iolist_to_binary(re:replace("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})","c&v",[global])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?(*THEN)c+(*FAIL)","PV&\\1x\\1vsUDLpYB\\1\\1t",[])), 
+    <<"aaabccc">> = iolist_to_binary(re:replace("aaabccc","a+b?(*THEN)c+(*FAIL)","PV&\\1x\\1vsUDLpYB\\1\\1t",[global])), 
+    <<"FhiABxmOfR">> = iolist_to_binary(re:replace("AB","(A (A|B(*ACCEPT)|C) D)(E)","Fhi\\1xmOfR",[extended])), 
+    <<"FhiABxmOfR">> = iolist_to_binary(re:replace("AB","(A (A|B(*ACCEPT)|C) D)(E)","Fhi\\1xmOfR",[extended,
+                                                                                                                                                                                                                      global])), 
+    <<"BHulABQjABrLtABEnSX">> = iolist_to_binary(re:replace("ABX","(A (A|B(*ACCEPT)|C) D)(E)","BHul&Qj&rLt\\1EnS",[extended])), 
+    <<"BHulABQjABrLtABEnSX">> = iolist_to_binary(re:replace("ABX","(A (A|B(*ACCEPT)|C) D)(E)","BHul&Qj&rLt\\1EnS",[extended,
+                                                                                                                                                                                                                                      global])), 
+    <<"fwi">> = iolist_to_binary(re:replace("AADE","(A (A|B(*ACCEPT)|C) D)(E)","fwi",[extended])), 
+    <<"fwi">> = iolist_to_binary(re:replace("AADE","(A (A|B(*ACCEPT)|C) D)(E)","fwi",[extended,
+                                                                                                                                                                                                         global])), 
+    <<"vpACDe">> = iolist_to_binary(re:replace("ACDE","(A (A|B(*ACCEPT)|C) D)(E)","vp\\1e",[extended])), 
+    <<"vpACDe">> = iolist_to_binary(re:replace("ACDE","(A (A|B(*ACCEPT)|C) D)(E)","vp\\1e",[extended,
+                                                                                                                                                                                                                global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(A (A|B(*ACCEPT)|C) D)(E)","YJgvKXOIgucMHsvWUdgN",[extended])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(A (A|B(*ACCEPT)|C) D)(E)","YJgvKXOIgucMHsvWUdgN",[extended,
+                                                                                                                                                                                                                                                       global])), 
+    <<"AD">> = iolist_to_binary(re:replace("AD","(A (A|B(*ACCEPT)|C) D)(E)","ssJb&\\1nwuF&t",[extended])), 
+    <<"AD">> = iolist_to_binary(re:replace("AD","(A (A|B(*ACCEPT)|C) D)(E)","ssJb&\\1nwuF&t",[extended,
+                                                                                                                                                                                                                              global])), 
+    <<"AjVOUn">> = iolist_to_binary(re:replace("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","AjVOUn",[caseless])), 
+    <<"AjVOUn">> = iolist_to_binary(re:replace("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","AjVOUn",[caseless,
+                                                                                                                                                                                                                                                                                                                            global])), 
+    <<"BDdMi">> = iolist_to_binary(re:replace("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","B\\1DdMi",[caseless])), 
+    <<"BDdMi">> = iolist_to_binary(re:replace("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","B\\1DdMi",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                                                   global])), 
+    <<"YfFtA man, a plan, a canal: Panama!pwRSbpA man, a plan, a canal: Panama!">> = iolist_to_binary(re:replace("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","YfFt\\1&\\1pwRSb\\1p&",[caseless])), 
+    <<"YfFtA man, a plan, a canal: Panama!pwRSbpA man, a plan, a canal: Panama!">> = iolist_to_binary(re:replace("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","YfFt\\1&\\1pwRSb\\1p&",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                                                                     global])), 
+    <<"xvAble was I ere I saw Elba.HqjQAble was I ere I saw Elba.vR">> = iolist_to_binary(re:replace("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","x\\1v&HqjQ&vR",[caseless])), 
+    <<"xvAble was I ere I saw Elba.HqjQAble was I ere I saw Elba.vR">> = iolist_to_binary(re:replace("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","x\\1v&HqjQ&vR",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                                         global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","\\1JH",[caseless])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","\\1JH",[caseless,
+                                                                                                                                                                                                                                                                                                                                         global])), 
+    <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","GCnEOe&\\1HfW&",[caseless])), 
+    <<"The quick brown fox">> = iolist_to_binary(re:replace("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$","GCnEOe&\\1HfW&",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                             global])), 
+    <<"EEBtpaXa">> = iolist_to_binary(re:replace("a","^((.)(?1)\\2|.)$","EEBtpaX\\1",[])), 
+    <<"EEBtpaXa">> = iolist_to_binary(re:replace("a","^((.)(?1)\\2|.)$","EEBtpaX\\1",[global])), 
+    <<"qXEWopOY">> = iolist_to_binary(re:replace("aba","^((.)(?1)\\2|.)$","qXEWopOY",[])), 
+    <<"qXEWopOY">> = iolist_to_binary(re:replace("aba","^((.)(?1)\\2|.)$","qXEWopOY",[global])), 
+    <<"fQRaabaaaabaaaabaavgdtLaabaaijxUaabaaV">> = iolist_to_binary(re:replace("aabaa","^((.)(?1)\\2|.)$","fQR\\1\\1&vgdtL\\1ijxU\\1V",[])), 
+    <<"fQRaabaaaabaaaabaavgdtLaabaaijxUaabaaV">> = iolist_to_binary(re:replace("aabaa","^((.)(?1)\\2|.)$","fQR\\1\\1&vgdtL\\1ijxU\\1V",[global])), 
+    <<"rfIabcdcbaQmGUaQxwnGtIhc">> = iolist_to_binary(re:replace("abcdcba","^((.)(?1)\\2|.)$","rfI&QmGUaQxwnGtIhc",[])), 
+    <<"rfIabcdcbaQmGUaQxwnGtIhc">> = iolist_to_binary(re:replace("abcdcba","^((.)(?1)\\2|.)$","rfI&QmGUaQxwnGtIhc",[global])), 
+    <<"QEpqaabaaqpcpqaabaaqpmxcBpqaabaaqpfErt">> = iolist_to_binary(re:replace("pqaabaaqp","^((.)(?1)\\2|.)$","QE\\1c\\1mxcB&fErt",[])), 
+    <<"QEpqaabaaqpcpqaabaaqpmxcBpqaabaaqpfErt">> = iolist_to_binary(re:replace("pqaabaaqp","^((.)(?1)\\2|.)$","QE\\1c\\1mxcB&fErt",[global])), 
+    <<"KLFablewasiereisawelbaablewasiereisawelbaIablewasiereisawelbarjablewasiereisawelbasD">> = iolist_to_binary(re:replace("ablewasiereisawelba","^((.)(?1)\\2|.)$","KLF\\1&I&rj&sD",[])), 
+    <<"KLFablewasiereisawelbaablewasiereisawelbaIablewasiereisawelbarjablewasiereisawelbasD">> = iolist_to_binary(re:replace("ablewasiereisawelba","^((.)(?1)\\2|.)$","KLF\\1&I&rj&sD",[global])), 
+    <<"rhubarb">> = iolist_to_binary(re:replace("rhubarb","^((.)(?1)\\2|.)$","g\\1WKOnON\\1\\1YO\\1\\1Uj\\1F",[])), 
+    <<"rhubarb">> = iolist_to_binary(re:replace("rhubarb","^((.)(?1)\\2|.)$","g\\1WKOnON\\1\\1YO\\1\\1Uj\\1F",[global])), 
+    <<"the quick brown fox">> = iolist_to_binary(re:replace("the quick brown fox","^((.)(?1)\\2|.)$","JgofHErdXPIu\\1&",[])), 
+    <<"the quick brown fox">> = iolist_to_binary(re:replace("the quick brown fox","^((.)(?1)\\2|.)$","JgofHErdXPIu\\1&",[global])), 
+    <<"bKFgOfuwLfpxaHaJaz">> = iolist_to_binary(re:replace("baz","(a)(?<=b(?1))","KFgOfuwLfpx&H\\1J\\1",[])), 
+    <<"bKFgOfuwLfpxaHaJaz">> = iolist_to_binary(re:replace("baz","(a)(?<=b(?1))","KFgOfuwLfpx&H\\1J\\1",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(a)(?<=b(?1))","i\\1&j&",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(a)(?<=b(?1))","i\\1&j&",[global])), 
+    <<"caz">> = iolist_to_binary(re:replace("caz","(a)(?<=b(?1))","l&U&&H&t&",[])), 
+    <<"caz">> = iolist_to_binary(re:replace("caz","(a)(?<=b(?1))","l&U&&H&t&",[global])), 
+    <<"zbaakOqTqMsiTyaSGadz">> = iolist_to_binary(re:replace("zbaaz","(?<=b(?1))(a)","\\1kOqTqMsiTy\\1SG&d",[])), 
+    <<"zbaakOqTqMsiTyaSGadz">> = iolist_to_binary(re:replace("zbaaz","(?<=b(?1))(a)","\\1kOqTqMsiTy\\1SG&d",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=b(?1))(a)","\\1osY\\1treCMjxk&Af",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=b(?1))(a)","\\1osY\\1treCMjxk&Af",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","(?<=b(?1))(a)","ykA&qS&nno",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","(?<=b(?1))(a)","ykA&qS&nno",[global])), 
+    <<"baOKaGPxYz">> = iolist_to_binary(re:replace("baz","(?<X>a)(?<=b(?&X))","\\1OK&GPxY",[])), 
+    <<"baOKaGPxYz">> = iolist_to_binary(re:replace("baz","(?<X>a)(?<=b(?&X))","\\1OK&GPxY",[global])), 
+    ok.
+run43() ->
+    <<"abckIo">> = iolist_to_binary(re:replace("abcabc","^(?|(abc)|(def))\\1","\\1kIo",[])), 
+    <<"abckIo">> = iolist_to_binary(re:replace("abcabc","^(?|(abc)|(def))\\1","\\1kIo",[global])), 
+    <<"sdefdefUbl">> = iolist_to_binary(re:replace("defdef","^(?|(abc)|(def))\\1","s&Ubl",[])), 
+    <<"sdefdefUbl">> = iolist_to_binary(re:replace("defdef","^(?|(abc)|(def))\\1","s&Ubl",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?|(abc)|(def))\\1","&m&bWQpRl",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?|(abc)|(def))\\1","&m&bWQpRl",[global])), 
+    <<"abcdef">> = iolist_to_binary(re:replace("abcdef","^(?|(abc)|(def))\\1","qwUmfoHo&tN",[])), 
+    <<"abcdef">> = iolist_to_binary(re:replace("abcdef","^(?|(abc)|(def))\\1","qwUmfoHo&tN",[global])), 
+    <<"defabc">> = iolist_to_binary(re:replace("defabc","^(?|(abc)|(def))\\1","KGoYhhlYddcruQ&k",[])), 
+    <<"defabc">> = iolist_to_binary(re:replace("defabc","^(?|(abc)|(def))\\1","KGoYhhlYddcruQ&k",[global])), 
+    <<"PdYfAnnabcPxabcabcHvAQabcabcabcabcabcls">> = iolist_to_binary(re:replace("abcabc","^(?|(abc)|(def))(?1)","PdYfAnn\\1Px&HvAQ&&\\1ls",[])), 
+    <<"PdYfAnnabcPxabcabcHvAQabcabcabcabcabcls">> = iolist_to_binary(re:replace("abcabc","^(?|(abc)|(def))(?1)","PdYfAnn\\1Px&HvAQ&&\\1ls",[global])), 
+    <<"PAdefabc">> = iolist_to_binary(re:replace("defabc","^(?|(abc)|(def))(?1)","PA&",[])), 
+    <<"PAdefabc">> = iolist_to_binary(re:replace("defabc","^(?|(abc)|(def))(?1)","PA&",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?|(abc)|(def))(?1)","Fqig",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?|(abc)|(def))(?1)","Fqig",[global])), 
+    <<"defdef">> = iolist_to_binary(re:replace("defdef","^(?|(abc)|(def))(?1)","e&yLb\\1&\\1D\\1q\\1UcBtn&",[])), 
+    <<"defdef">> = iolist_to_binary(re:replace("defdef","^(?|(abc)|(def))(?1)","e&yLb\\1&\\1D\\1q\\1UcBtn&",[global])), 
+    <<"abcdef">> = iolist_to_binary(re:replace("abcdef","^(?|(abc)|(def))(?1)","&\\1\\1\\1atTuOfcyl\\1RO&y",[])), 
+    <<"abcdef">> = iolist_to_binary(re:replace("abcdef","^(?|(abc)|(def))(?1)","&\\1\\1\\1atTuOfcyl\\1RO&y",[global])), 
+    <<"ACBCSBCTCMoOD">> = iolist_to_binary(re:replace("ABCD","(?:(?1)|B)(A(*F)|C)","C&S&T\\1MoO",[])), 
+    <<"ACBCSBCTCMoOD">> = iolist_to_binary(re:replace("ABCD","(?:(?1)|B)(A(*F)|C)","C&S&T\\1MoO",[global])), 
+    <<"bD">> = iolist_to_binary(re:replace("CCD","(?:(?1)|B)(A(*F)|C)","b",[])), 
+    <<"bD">> = iolist_to_binary(re:replace("CCD","(?:(?1)|B)(A(*F)|C)","b",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?:(?1)|B)(A(*F)|C)","u&dbYn\\1jVvV&V\\1XC",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?:(?1)|B)(A(*F)|C)","u&dbYn\\1jVvV&V\\1XC",[global])), 
+    <<"CAD">> = iolist_to_binary(re:replace("CAD","(?:(?1)|B)(A(*F)|C)","UbDT\\1DjcdPh",[])), 
+    <<"CAD">> = iolist_to_binary(re:replace("CAD","(?:(?1)|B)(A(*F)|C)","UbDT\\1DjcdPh",[global])), 
+    <<"CCahPD">> = iolist_to_binary(re:replace("CCD","^(?:(?1)|B)(A(*F)|C)","&ahP",[])), 
+    <<"CCahPD">> = iolist_to_binary(re:replace("CCD","^(?:(?1)|B)(A(*F)|C)","&ahP",[global])), 
+    <<"IYJaGD">> = iolist_to_binary(re:replace("BCD","^(?:(?1)|B)(A(*F)|C)","IYJaG",[])), 
+    <<"IYJaGD">> = iolist_to_binary(re:replace("BCD","^(?:(?1)|B)(A(*F)|C)","IYJaG",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:(?1)|B)(A(*F)|C)","uckGWWHQG&ocJD\\1l\\1T",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:(?1)|B)(A(*F)|C)","uckGWWHQG&ocJD\\1l\\1T",[global])), 
+    <<"ABCD">> = iolist_to_binary(re:replace("ABCD","^(?:(?1)|B)(A(*F)|C)","qbEQn",[])), 
+    <<"ABCD">> = iolist_to_binary(re:replace("ABCD","^(?:(?1)|B)(A(*F)|C)","qbEQn",[global])), 
+    <<"CAD">> = iolist_to_binary(re:replace("CAD","^(?:(?1)|B)(A(*F)|C)","kVqFM&D",[])), 
+    <<"CAD">> = iolist_to_binary(re:replace("CAD","^(?:(?1)|B)(A(*F)|C)","kVqFM&D",[global])), 
+    <<"BAD">> = iolist_to_binary(re:replace("BAD","^(?:(?1)|B)(A(*F)|C)","nKcCWd\\1",[])), 
+    <<"BAD">> = iolist_to_binary(re:replace("BAD","^(?:(?1)|B)(A(*F)|C)","nKcCWd\\1",[global])), 
+    <<"mCJFixrmAAAPiiNWHD">> = iolist_to_binary(re:replace("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","mCJFixrm&APiiNWH",[])), 
+    <<"mCJFixrmAAAPiiNWHD">> = iolist_to_binary(re:replace("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","mCJFixrm&APiiNWH",[global])), 
+    <<"fjOtIXCc">> = iolist_to_binary(re:replace("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","fjOtIXCc",[])), 
+    <<"fjOtIXCc">> = iolist_to_binary(re:replace("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","fjOtIXCc",[global])), 
+    <<"KSgQhFSAnBABD">> = iolist_to_binary(re:replace("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","KSgQhFS\\1n&B",[])), 
+    <<"KSgQhFSAnBABD">> = iolist_to_binary(re:replace("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","KSgQhFS\\1n&B",[global])), 
+    <<"KdBHaAwVPBCDCGCsRCBCD">> = iolist_to_binary(re:replace("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","KdBHaAwVP&\\1G\\1sRC&",[])), 
+    <<"KdBHaAwVPBCDCGCsRCBCD">> = iolist_to_binary(re:replace("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D","KdBHaAwVP&\\1G\\1sRC&",[global])), 
+    <<"iaomqEcFWGhoDBAAnBAiCX">> = iolist_to_binary(re:replace("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D","iaomqEcFWGhoD&\\1n&iC",[])), 
+    <<"iaomqEcFWGhoDBAAnBAiCX">> = iolist_to_binary(re:replace("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D","iaomqEcFWGhoD&\\1n&iC",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D","S\\1&OO",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D","S\\1&OO",[global])), 
+    <<"ACX">> = iolist_to_binary(re:replace("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D","F\\1&dqt",[])), 
+    <<"ACX">> = iolist_to_binary(re:replace("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D","F\\1&dqt",[global])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D","bL\\1I",[])), 
+    <<"ABC">> = iolist_to_binary(re:replace("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D","bL\\1I",[global])), 
+    <<"h">> = iolist_to_binary(re:replace("BAC","(?(DEFINE)(A))B(?1)C","\\1h",[])), 
+    <<"h">> = iolist_to_binary(re:replace("BAC","(?(DEFINE)(A))B(?1)C","\\1h",[global])), 
+    <<"EiDCVEGlgEGIr">> = iolist_to_binary(re:replace("BAAC","(?(DEFINE)((A)\\2))B(?1)C","E\\1iD\\1C\\1V\\1EG\\1lgEGIr",[])), 
+    <<"EiDCVEGlgEGIr">> = iolist_to_binary(re:replace("BAAC","(?(DEFINE)((A)\\2))B(?1)C","E\\1iD\\1C\\1V\\1EG\\1lgEGIr",[global])), 
+    <<"u(ab(cd)ef)(ab(cd)ef)v(ab(cd)ef)M">> = iolist_to_binary(re:replace("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )","u&\\1v&M",[extended])), 
+    <<"u(ab(cd)ef)(ab(cd)ef)v(ab(cd)ef)M">> = iolist_to_binary(re:replace("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )","u&\\1v&M",[extended,
+                                                                                                                                                                                                                                                              global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?=a(*SKIP)b|ac)","EhJBenWdk&&",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?=a(*SKIP)b|ac)","EhJBenWdk&&",[global])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","^(?=a(*SKIP)b|ac)","DVmcudRK&vBXmqcVY",[])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","^(?=a(*SKIP)b|ac)","DVmcudRK&vBXmqcVY",[global])), 
+    <<"qxyHbdqjab">> = iolist_to_binary(re:replace("ab","^(?=a(*PRUNE)b)","qxyH&bdqj",[])), 
+    <<"qxyHbdqjab">> = iolist_to_binary(re:replace("ab","^(?=a(*PRUNE)b)","qxyH&bdqj",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?=a(*PRUNE)b)","qDd\\1UHvpsMvHI\\1gEx&d",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?=a(*PRUNE)b)","qDd\\1UHvpsMvHI\\1gEx&d",[global])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","^(?=a(*PRUNE)b)","mB\\1\\1R&\\1Ax",[])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","^(?=a(*PRUNE)b)","mB\\1\\1R&\\1Ax",[global])), 
+    <<"FpGwac">> = iolist_to_binary(re:replace("ac","^(?=a(*ACCEPT)b)","Fp\\1Gw",[])), 
+    <<"FpGwac">> = iolist_to_binary(re:replace("ac","^(?=a(*ACCEPT)b)","Fp\\1Gw",[global])), 
+    <<"abCqbtkqunCIvDxbdMM">> = iolist_to_binary(re:replace("ab","(?>a\\Kb)","&Cq&t\\1kqunCIvDx&dMM",[])), 
+    <<"abCqbtkqunCIvDxbdMM">> = iolist_to_binary(re:replace("ab","(?>a\\Kb)","&Cq&t\\1kqunCIvDx&dMM",[global])), 
+    <<"aAk">> = iolist_to_binary(re:replace("ab","((?>a\\Kb))","Ak",[])), 
+    <<"aAk">> = iolist_to_binary(re:replace("ab","((?>a\\Kb))","Ak",[global])), 
+    <<"anKUUUFwaxNFjPabNJd">> = iolist_to_binary(re:replace("ab","(a\\Kb)","nKUUUFwaxNFjP\\1NJd",[])), 
+    <<"anKUUUFwaxNFjPabNJd">> = iolist_to_binary(re:replace("ab","(a\\Kb)","nKUUUFwaxNFjP\\1NJd",[global])), 
+    <<"acuYfxPcxoRKaceSXk">> = iolist_to_binary(re:replace("ac","^a\\Kcz|ac","&uYfxPcxoRK\\1\\1&eSXk",[])), 
+    <<"acuYfxPcxoRKaceSXk">> = iolist_to_binary(re:replace("ac","^a\\Kcz|ac","&uYfxPcxoRK\\1\\1&eSXk",[global])), 
+    <<"abCSFabuababvPlR">> = iolist_to_binary(re:replace("ab","(?>a\\Kbz|ab)","\\1&CSF&u&&vPlR",[])), 
+    <<"abCSFabuababvPlR">> = iolist_to_binary(re:replace("ab","(?>a\\Kbz|ab)","\\1&CSF&u&&vPlR",[global])), 
+    <<"aomXuCuVpjjUFcrWQIR">> = iolist_to_binary(re:replace("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$","omXuCuVpjjUFcrW\\1QIR",[])), 
+    <<"aomXuCuVpjjUFcrWQIR">> = iolist_to_binary(re:replace("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$","omXuCuVpjjUFcrW\\1QIR",[global])), 
+    <<"a(b)clxcg">> = iolist_to_binary(re:replace("a(b)c","^([^()]|\\((?1)*\\))*$","&lx\\1g",[])), 
+    <<"a(b)clxcg">> = iolist_to_binary(re:replace("a(b)c","^([^()]|\\((?1)*\\))*$","&lx\\1g",[global])), 
+    <<"dUeBGa(b(c)d)emKya(b(c)d)e">> = iolist_to_binary(re:replace("a(b(c)d)e","^([^()]|\\((?1)*\\))*$","dU\\1BG&mKy&",[])), 
+    <<"dUeBGa(b(c)d)emKya(b(c)d)e">> = iolist_to_binary(re:replace("a(b(c)d)e","^([^()]|\\((?1)*\\))*$","dU\\1BG&mKy&",[global])), 
+    <<"cP00f0uN">> = iolist_to_binary(re:replace("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))","cP&\\1f&uN",[])), 
+    <<"cP00f0uN">> = iolist_to_binary(re:replace("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))","cP&\\1f&uN",[global])), 
+    <<"pV00MD00p00haFc00MG00qG">> = iolist_to_binary(re:replace("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))","pV\\1MD\\1p\\1haFc&MG&qG",[])), 
+    <<"pV00MD00p00haFc00MG00qG">> = iolist_to_binary(re:replace("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))","pV\\1MD\\1p\\1haFc&MG&qG",[global])), 
+    <<"GdBC0000INu00000000Y0000">> = iolist_to_binary(re:replace("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))","GdBC&INu&&Y&",[])), 
+    <<"GdBC0000INu00000000Y0000">> = iolist_to_binary(re:replace("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))","GdBC&INu&&Y&",[global])), 
+    ok.
+run44() ->
+    <<"00RwFP">> = iolist_to_binary(re:replace("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))","&&RwFP",[])), 
+    <<"00RwFP">> = iolist_to_binary(re:replace("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))","&&RwFP",[global])), 
+    <<"TIRVuPlNk0">> = iolist_to_binary(re:replace("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))","TIRVuPlNk",[])), 
+    <<"TIRVuPlNkTIRVuPlNk">> = iolist_to_binary(re:replace("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))","TIRVuPlNk",[global])), 
+    <<"0IxIBm0KbqqiO000">> = iolist_to_binary(re:replace("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))","&IxIBm&KbqqiO",[])), 
+    <<"0IxIBm0KbqqiO0IxIBm0KbqqiO0IxIBm0KbqqiO0IxIBm0KbqqiO">> = iolist_to_binary(re:replace("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))","&IxIBm&KbqqiO",[global])), 
+    <<"ACABX">> = iolist_to_binary(re:replace("ACABX","A(*COMMIT)(B|D)","\\1&&\\1KWXWa",[])), 
+    <<"ACABX">> = iolist_to_binary(re:replace("ACABX","A(*COMMIT)(B|D)","\\1&&\\1KWXWa",[global])), 
+    <<"ABCgPYRRqRBOrABCABCAHBQDEFG">> = iolist_to_binary(re:replace("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)","&gPYRRqRBOr&&\\1HBQ",[])), 
+    <<"ABCgPYRRqRBOrABCABCAHBQDEFG">> = iolist_to_binary(re:replace("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)","&gPYRRqRBOr&&\\1HBQ",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(*COMMIT)(A|P)(B|P)(C|P)","awq\\1dexeIK&rKgbPrqk",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(*COMMIT)(A|P)(B|P)(C|P)","awq\\1dexeIK&rKgbPrqk",[global])), 
+    <<"DEFGABC">> = iolist_to_binary(re:replace("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)","NRfdYIv\\1HtrT",[])), 
+    <<"DEFGABC">> = iolist_to_binary(re:replace("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)","NRfdYIv\\1HtrT",[global])), 
+    <<"jYabbbAGmvaabbbXabbbTAaixGp">> = iolist_to_binary(re:replace("abbb","(\\w+)(?>b(*COMMIT))\\w{2}","jY&AGmv\\1&X&TA\\1ixGp",[])), 
+    <<"jYabbbAGmvaabbbXabbbTAaixGp">> = iolist_to_binary(re:replace("abbb","(\\w+)(?>b(*COMMIT))\\w{2}","jY&AGmv\\1&X&TA\\1ixGp",[global])), 
+    <<"abbb">> = iolist_to_binary(re:replace("abbb","(\\w+)b(*COMMIT)\\w{2}","\\1mM",[])), 
+    <<"abbb">> = iolist_to_binary(re:replace("abbb","(\\w+)b(*COMMIT)\\w{2}","\\1mM",[global])), 
+    <<"bofPRc">> = iolist_to_binary(re:replace("bac","(?&t)(?#()(?(DEFINE)(?<t>a))","ofPR",[])), 
+    <<"bofPRc">> = iolist_to_binary(re:replace("bac","(?&t)(?#()(?(DEFINE)(?<t>a))","ofPR",[global])), 
+    <<"yes">> = iolist_to_binary(re:replace("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?","&ItXS\\1Uh&ueLGo\\1AKJxK",[])), 
+    <<"yes">> = iolist_to_binary(re:replace("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?","&ItXS\\1Uh&ueLGo\\1AKJxK",[global])), 
+    <<"yes">> = iolist_to_binary(re:replace("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?","VnOG&\\1W",[])), 
+    <<"yes">> = iolist_to_binary(re:replace("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?","VnOG&\\1W",[global])), 
+    ok.
+run45() ->
+    <<"LVLUbcejbciMOvVvY">> = iolist_to_binary(re:replace("bc","b?(*SKIP)c","LV\\1LU&ej&iMOvVvY",[])), 
+    <<"LVLUbcejbciMOvVvY">> = iolist_to_binary(re:replace("bc","b?(*SKIP)c","LV\\1LU&ej&iMOvVvY",[global])), 
+    <<"aHUUUhKBfPpjU">> = iolist_to_binary(re:replace("abc","b?(*SKIP)c","\\1HUUUhKBf\\1P\\1pjU",[])), 
+    <<"aHUUUhKBfPpjU">> = iolist_to_binary(re:replace("abc","b?(*SKIP)c","\\1HUUUhKBf\\1P\\1pjU",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(*SKIP)bc","\\1F&mJF",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(*SKIP)bc","\\1F&mJF",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(*SKIP)b","P\\1EF",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","(*SKIP)b","P\\1EF",[global])), 
+    <<"EiQojDQBehRidDoNAxxx">> = iolist_to_binary(re:replace("xxx","(?P<abn>(?P=abn)xxx|)+","EiQojDQBehRidDoNA",[])), 
+    <<"EiQojDQBehRidDoNAxEiQojDQBehRidDoNAxEiQojDQBehRidDoNAxEiQojDQBehRidDoNA">> = iolist_to_binary(re:replace("xxx","(?P<abn>(?P=abn)xxx|)+","EiQojDQBehRidDoNA",[global])), 
+    <<"akmvYT">> = iolist_to_binary(re:replace("aa","(?i:([^b]))(?1)","akmvYT",[])), 
+    <<"akmvYT">> = iolist_to_binary(re:replace("aa","(?i:([^b]))(?1)","akmvYT",[global])), 
+    <<"alaAraWMaaaAKIgQdaAOaF">> = iolist_to_binary(re:replace("aA","(?i:([^b]))(?1)","\\1l&r\\1WM\\1\\1&KIgQd&O\\1F",[])), 
+    <<"alaAraWMaaaAKIgQdaAOaF">> = iolist_to_binary(re:replace("aA","(?i:([^b]))(?1)","\\1l&r\\1WM\\1\\1&KIgQd&O\\1F",[global])), 
+    <<"*XAfh**hlh Failers">> = iolist_to_binary(re:replace("** Failers","(?i:([^b]))(?1)","\\1XAfh&hlh",[])), 
+    <<"*XAfh**hlh XAfh FhlhaXAfhaihlhlXAfhlehlhrXAfhrshlh">> = iolist_to_binary(re:replace("** Failers","(?i:([^b]))(?1)","\\1XAfh&hlh",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","(?i:([^b]))(?1)","e\\1eCmoSn",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","(?i:([^b]))(?1)","e\\1eCmoSn",[global])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?i:([^b]))(?1)","hiocPQeyl&&Nx\\1",[])), 
+    <<"aB">> = iolist_to_binary(re:replace("aB","(?i:([^b]))(?1)","hiocPQeyl&&Nx\\1",[global])), 
+    <<"Ba">> = iolist_to_binary(re:replace("Ba","(?i:([^b]))(?1)","Q\\1ImC\\1ihLTYkO",[])), 
+    <<"Ba">> = iolist_to_binary(re:replace("Ba","(?i:([^b]))(?1)","Q\\1ImC\\1ihLTYkO",[global])), 
+    <<"ba">> = iolist_to_binary(re:replace("ba","(?i:([^b]))(?1)","R\\1bTV\\1\\1",[])), 
+    <<"ba">> = iolist_to_binary(re:replace("ba","(?i:([^b]))(?1)","R\\1bTV\\1\\1",[global])), 
+    <<"mwO">> = iolist_to_binary(re:replace("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$","mwO",[])), 
+    <<"mwO">> = iolist_to_binary(re:replace("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$","mwO",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$","EQl\\1AR",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$","EQl\\1AR",[global])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$","&yy\\1GJaXojFYo",[])), 
+    <<"aaaaaa">> = iolist_to_binary(re:replace("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$","&yy\\1GJaXojFYo",[global])), 
+    <<"WMarOaaaaaaXebFIbQKdmm">> = iolist_to_binary(re:replace("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$","\\1W\\1MarO&ebFIbQKdm\\1\\1m",[])), 
+    <<"WMarOaaaaaaXebFIbQKdmm">> = iolist_to_binary(re:replace("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$","\\1W\\1MarO&ebFIbQKdm\\1\\1m",[global])), 
+    <<"lWw">> = iolist_to_binary(re:replace("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$","lWw\\1",[])), 
+    <<"lWw">> = iolist_to_binary(re:replace("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$","lWw\\1",[global])), 
+    <<"IpraaaaXkaKXqwTNFSEgDP">> = iolist_to_binary(re:replace("aaaaX","^(a)*+(\\w)","Ipr&k\\1KXqwTNFSEgDP",[])), 
+    <<"IpraaaaXkaKXqwTNFSEgDP">> = iolist_to_binary(re:replace("aaaaX","^(a)*+(\\w)","Ipr&k\\1KXqwTNFSEgDP",[global])), 
+    <<"jnYLYhYZ">> = iolist_to_binary(re:replace("YZ","^(a)*+(\\w)","jn&L&\\1\\1hY",[])), 
+    <<"jnYLYhYZ">> = iolist_to_binary(re:replace("YZ","^(a)*+(\\w)","jn&L&\\1\\1hY",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a)*+(\\w)","d\\1&ohvven\\1&P\\1\\1exSs",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a)*+(\\w)","d\\1&ohvven\\1&P\\1\\1exSs",[global])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(a)*+(\\w)","biv&rxkne",[])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(a)*+(\\w)","biv&rxkne",[global])), 
+    <<"FVSRXhsNXQwYCX">> = iolist_to_binary(re:replace("aaaaX","^(?:a)*+(\\w)","FVSR\\1hsN\\1QwYC\\1",[])), 
+    <<"FVSRXhsNXQwYCX">> = iolist_to_binary(re:replace("aaaaX","^(?:a)*+(\\w)","FVSR\\1hsN\\1QwYC\\1",[global])), 
+    <<"MiyTnbYYLxIYkYvmDUZ">> = iolist_to_binary(re:replace("YZ","^(?:a)*+(\\w)","MiyTnb&&LxI\\1k\\1vmDU",[])), 
+    <<"MiyTnbYYLxIYkYvmDUZ">> = iolist_to_binary(re:replace("YZ","^(?:a)*+(\\w)","MiyTnb&&LxI\\1k\\1vmDU",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:a)*+(\\w)","&Ugr\\1y",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:a)*+(\\w)","&Ugr\\1y",[global])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(?:a)*+(\\w)","\\1\\1&Qbd\\1SyY&u",[])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(?:a)*+(\\w)","\\1\\1&Qbd\\1SyY&u",[global])), 
+    <<"uQsoweaaaaXLoVaaaaaXmpAeu">> = iolist_to_binary(re:replace("aaaaX","^(a)++(\\w)","uQsowe&LoVa&mpAeu",[])), 
+    <<"uQsoweaaaaXLoVaaaaaXmpAeu">> = iolist_to_binary(re:replace("aaaaX","^(a)++(\\w)","uQsowe&LoVa&mpAeu",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a)++(\\w)","Nqxlkpdpkdkbt",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a)++(\\w)","Nqxlkpdpkdkbt",[global])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(a)++(\\w)","rKpJsjRH&q",[])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(a)++(\\w)","rKpJsjRH&q",[global])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(a)++(\\w)","\\1kUJik\\1c\\1d\\1wcEQVl",[])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(a)++(\\w)","\\1kUJik\\1c\\1d\\1wcEQVl",[global])), 
+    <<"aaaaXaaaaX">> = iolist_to_binary(re:replace("aaaaX","^(?:a)++(\\w)","&&",[])), 
+    <<"aaaaXaaaaX">> = iolist_to_binary(re:replace("aaaaX","^(?:a)++(\\w)","&&",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:a)++(\\w)","qJF",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:a)++(\\w)","qJF",[global])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(?:a)++(\\w)","Myqjwdc&SqVjwe\\1ab\\1x",[])), 
+    <<"aaaa">> = iolist_to_binary(re:replace("aaaa","^(?:a)++(\\w)","Myqjwdc&SqVjwe\\1ab\\1x",[global])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(?:a)++(\\w)","pXmu",[])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(?:a)++(\\w)","pXmu",[global])), 
+    <<"dKaaX">> = iolist_to_binary(re:replace("aaaaX","^(a)?+(\\w)","dK",[])), 
+    <<"dKaaX">> = iolist_to_binary(re:replace("aaaaX","^(a)?+(\\w)","dK",[global])), 
+    <<"QtZ">> = iolist_to_binary(re:replace("YZ","^(a)?+(\\w)","Qt",[])), 
+    <<"QtZ">> = iolist_to_binary(re:replace("YZ","^(a)?+(\\w)","Qt",[global])), 
+    <<"yaaX">> = iolist_to_binary(re:replace("aaaaX","^(?:a)?+(\\w)","y",[])), 
+    <<"yaaX">> = iolist_to_binary(re:replace("aaaaX","^(?:a)?+(\\w)","y",[global])), 
+    <<"knhrTYKYCYLYLHYZ">> = iolist_to_binary(re:replace("YZ","^(?:a)?+(\\w)","knhrT\\1K&C&L\\1LH\\1",[])), 
+    <<"knhrTYKYCYLYLHYZ">> = iolist_to_binary(re:replace("YZ","^(?:a)?+(\\w)","knhrT\\1K&C&L\\1LH\\1",[global])), 
+    <<"qaFxAasVdrHD">> = iolist_to_binary(re:replace("aaaaX","^(a){2,}+(\\w)","q\\1FxAasVdrHD",[])), 
+    <<"qaFxAasVdrHD">> = iolist_to_binary(re:replace("aaaaX","^(a){2,}+(\\w)","q\\1FxAasVdrHD",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a){2,}+(\\w)","Ce",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(a){2,}+(\\w)","Ce",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a){2,}+(\\w)","Pr\\1pRjfic",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(a){2,}+(\\w)","Pr\\1pRjfic",[global])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(a){2,}+(\\w)","\\1qc&A\\1p\\1Ce",[])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(a){2,}+(\\w)","\\1qc&A\\1p\\1Ce",[global])), 
+    <<"TomaaaaXfexyXrPgPChaaaaXUaaaaX">> = iolist_to_binary(re:replace("aaaaX","^(?:a){2,}+(\\w)","Tom&fexy\\1rPgPCh&U&",[])), 
+    <<"TomaaaaXfexyXrPgPChaaaaXUaaaaX">> = iolist_to_binary(re:replace("aaaaX","^(?:a){2,}+(\\w)","Tom&fexy\\1rPgPCh&U&",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:a){2,}+(\\w)","QxuQNyMAkLj\\1N",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","^(?:a){2,}+(\\w)","QxuQNyMAkLj\\1N",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(?:a){2,}+(\\w)","qs&d\\1p&DFpaHv",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^(?:a){2,}+(\\w)","qs&d\\1p&DFpaHv",[global])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(?:a){2,}+(\\w)","&YUGUUNV&jklvBQ",[])), 
+    <<"YZ">> = iolist_to_binary(re:replace("YZ","^(?:a){2,}+(\\w)","&YUGUUNV&jklvBQ",[global])), 
+    <<"kRhvBb">> = iolist_to_binary(re:replace("b","(a|)*(?1)b","kRhvB&",[])), 
+    <<"kRhvBb">> = iolist_to_binary(re:replace("b","(a|)*(?1)b","kRhvB&",[global])), 
+    <<"UabqY">> = iolist_to_binary(re:replace("ab","(a|)*(?1)b","U&qY",[])), 
+    <<"UabqY">> = iolist_to_binary(re:replace("ab","(a|)*(?1)b","U&qY",[global])), 
+    <<"vmyFiqvLaabXSeOYAObD">> = iolist_to_binary(re:replace("aab","(a|)*(?1)b","vmyFiqvL&XSeOYAObD",[])), 
+    <<"vmyFiqvLaabXSeOYAObD">> = iolist_to_binary(re:replace("aab","(a|)*(?1)b","vmyFiqvL&XSeOYAObD",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(a)++(?1)b","aYXyIdVfFghDXyBuUsnK",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(a)++(?1)b","aYXyIdVfFghDXyBuUsnK",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","(a)++(?1)b","mJgf&UxblrhCqYENY",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","(a)++(?1)b","mJgf&UxblrhCqYENY",[global])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","(a)++(?1)b","Nji&a",[])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","(a)++(?1)b","Nji&a",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(a)*+(?1)b","oFCeDPwP&kYedB",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(a)*+(?1)b","oFCeDPwP&kYedB",[global])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","(a)*+(?1)b","&ws\\1adQnsr\\1NinVGyRsh",[])), 
+    <<"ab">> = iolist_to_binary(re:replace("ab","(a)*+(?1)b","&ws\\1adQnsr\\1NinVGyRsh",[global])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","(a)*+(?1)b","Sb&x&",[])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","(a)*+(?1)b","Sb&x&",[global])), 
+    <<"bQNe">> = iolist_to_binary(re:replace("b","(?1)(?:(b)){0}","&QNe",[])), 
+    <<"bQNe">> = iolist_to_binary(re:replace("b","(?1)(?:(b)){0}","&QNe",[global])), 
+    <<"KRfoo(bar(baz)+baz(bop))yTvP">> = iolist_to_binary(re:replace("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )","KR\\1yTvP",[extended])), 
+    <<"KRfoo(bar(baz)+baz(bop))yTvP">> = iolist_to_binary(re:replace("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )","KR\\1yTvP",[extended,
+                                                                                                                                                                                                                                                                                                global])), 
+    ok.
+run46() ->
+    <<"Cfqx">> = iolist_to_binary(re:replace("AB","(A (A|B(*ACCEPT)|C) D)(E)","Cfqx",[extended])), 
+    <<"Cfqx">> = iolist_to_binary(re:replace("AB","(A (A|B(*ACCEPT)|C) D)(E)","Cfqx",[extended,
+                                                                                                                                                                                                       global])), 
+    <<"abaaHraVohxea">> = iolist_to_binary(re:replace("ba","\\A.*?(a|bc)","a&\\1Hr\\1Vohxe\\1",[])), 
+    <<"abaaHraVohxea">> = iolist_to_binary(re:replace("ba","\\A.*?(a|bc)","a&\\1Hr\\1Vohxe\\1",[global])), 
+    <<"hEyjnxKIbWTujTtR">> = iolist_to_binary(re:replace("ba","\\A.*?(?:a|bc)++","hEyjnxKIbWT\\1ujT\\1tR",[])), 
+    <<"hEyjnxKIbWTujTtR">> = iolist_to_binary(re:replace("ba","\\A.*?(?:a|bc)++","hEyjnxKIbWT\\1ujT\\1tR",[global])), 
+    <<"oTgqSlaOSViBsWdYFa">> = iolist_to_binary(re:replace("ba","\\A.*?(a|bc)++","oTgqSl\\1OSViBsWdYF\\1",[])), 
+    <<"oTgqSlaOSViBsWdYFa">> = iolist_to_binary(re:replace("ba","\\A.*?(a|bc)++","oTgqSl\\1OSViBsWdYF\\1",[global])), 
+    <<"pATfIbaqPbaaOQbaSG">> = iolist_to_binary(re:replace("ba","\\A.*?(?:a|bc|d)","pATfI\\1&qP&aOQ&SG\\1",[])), 
+    <<"pATfIbaqPbaaOQbaSG">> = iolist_to_binary(re:replace("ba","\\A.*?(?:a|bc|d)","pATfI\\1&qP&aOQ&SG\\1",[global])), 
+    <<"bJYJaBVjnbvSceetle">> = iolist_to_binary(re:replace("beetle","(?:(b))++","bJYJaBVjn\\1vSc",[])), 
+    <<"bJYJaBVjnbvSceetle">> = iolist_to_binary(re:replace("beetle","(?:(b))++","bJYJaBVjn\\1vSc",[global])), 
+    <<"MEbqeMaqej">> = iolist_to_binary(re:replace("a","(?(?=(a(*ACCEPT)z))a)","MEbqeM\\1qej",[])), 
+    <<"MEbqeMaqejMEbqeMqej">> = iolist_to_binary(re:replace("a","(?(?=(a(*ACCEPT)z))a)","MEbqeM\\1qej",[global])), 
+    <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a)(?1)+ab","&",[])), 
+    <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a)(?1)+ab","&",[global])), 
+    <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a)(?1)++ab","O&\\1shXpvDpv&VVC",[])), 
+    <<"aaaab">> = iolist_to_binary(re:replace("aaaab","^(a)(?1)++ab","O&\\1shXpvDpv&VVC",[global])), 
+    <<"RARockgammon">> = iolist_to_binary(re:replace("backgammon","(?(DEFINE)(a))?b(?1)","RARo\\1",[])), 
+    <<"RARockgammon">> = iolist_to_binary(re:replace("backgammon","(?(DEFINE)(a))?b(?1)","RARo\\1",[global])), 
+    <<"wlgVxP
+def">> = iolist_to_binary(re:replace("abc
+def","^\\N+","wlgVxP",[])), 
+    <<"wlgVxP
+def">> = iolist_to_binary(re:replace("abc
+def","^\\N+","wlgVxP",[global])), 
+    <<"G
+def">> = iolist_to_binary(re:replace("abc
+def","^\\N{1,}","G",[])), 
+    <<"G
+def">> = iolist_to_binary(re:replace("abc
+def","^\\N{1,}","G",[global])), 
+    <<"Iocde">> = iolist_to_binary(re:replace("aaaabcde","(?(R)a+|(?R)b)","Io",[])), 
+    <<"Iocde">> = iolist_to_binary(re:replace("aaaabcde","(?(R)a+|(?R)b)","Io",[global])), 
+    <<"kXRsqrvOjaaaaanNXFFUcde">> = iolist_to_binary(re:replace("aaaabcde","(?(R)a+|((?R))b)","kXRsqrvOja\\1nNXFFU",[])), 
+    <<"kXRsqrvOjaaaaanNXFFUcde">> = iolist_to_binary(re:replace("aaaabcde","(?(R)a+|((?R))b)","kXRsqrvOja\\1nNXFFU",[global])), 
+    <<"QNpwCPcde">> = iolist_to_binary(re:replace("aaaabcde","((?(R)a+|(?1)b))","QNpwCP",[])), 
+    <<"QNpwCPcde">> = iolist_to_binary(re:replace("aaaabcde","((?(R)a+|(?1)b))","QNpwCP",[global])), 
+    <<"QcDpPOcde">> = iolist_to_binary(re:replace("aaaabcde","((?(R1)a+|(?1)b))","QcDpPO",[])), 
+    <<"QcDpPOcde">> = iolist_to_binary(re:replace("aaaabcde","((?(R1)a+|(?1)b))","QcDpPO",[global])), 
+    <<"hIv">> = iolist_to_binary(re:replace("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))","\\1hIv",[])), 
+    <<"hIv">> = iolist_to_binary(re:replace("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))","\\1hIv",[global])), 
+    <<"bHaeaxaaAF">> = iolist_to_binary(re:replace("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))","H&\\1eax&&AF",[])), 
+    <<"bHaeaxaaAF">> = iolist_to_binary(re:replace("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))","H&\\1eax&&AF",[global])), 
+    <<"bbyaRYN">> = iolist_to_binary(re:replace("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))","y&RYN",[])), 
+    <<"bbyaRYN">> = iolist_to_binary(re:replace("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))","y&RYN",[global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b) c","y\\1YaiS",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b) c","y\\1YaiS",[extended,
+                                                                                                                                                                                                      global])), 
+    ok.
+run47() ->
+    <<"LababMabJVX">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b|(*F)) c","L\\1\\1M\\1JVX",[extended])), 
+    <<"LababMabJVX">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b|(*F)) c","L\\1\\1M\\1JVX",[extended,
+                                                                                                                                                                                                                              global])), 
+    <<"jBPevabLaabcWNWjnnaabcpgwaabc">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b) | (*F) ) c","jBPev\\1L&WNWjnn&pgw&",[extended])), 
+    <<"jBPevabLaabcWNWjnnaabcpgwaabc">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b) | (*F) ) c","jBPev\\1L&WNWjnn&pgw&",[extended,
+                                                                                                                                                                                                                                                         global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b) ) c","GOxmfDqgi",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b) ) c","GOxmfDqgi",[extended,
                                                                                                                                                                                                                global])), 
-?line <<"xYgnYjja]Bgw">> = iolist_to_binary(re:replace("a]","[[:abcd:xyz]]","\\1xYgnYjj&Bgw",[])), 
-?line <<"xYgnYjja]Bgw">> = iolist_to_binary(re:replace("a]","[[:abcd:xyz]]","\\1xYgnYjj&Bgw",[global])), 
-?line <<"K:]Y:]tTEIHHPgm">> = iolist_to_binary(re:replace(":]","[[:abcd:xyz]]","K\\1&Y&tT\\1EI\\1H\\1HP\\1gm",[])), 
-?line <<"K:]Y:]tTEIHHPgm">> = iolist_to_binary(re:replace(":]","[[:abcd:xyz]]","K\\1&Y&tT\\1EI\\1H\\1HP\\1gm",[global])), 
-?line <<"pcaYhpF">> = iolist_to_binary(re:replace("a","[abc[:x\\]pqr]","pc&Y\\1hpF",[])), 
-?line <<"pcaYhpF">> = iolist_to_binary(re:replace("a","[abc[:x\\]pqr]","pc&Y\\1hpF",[global])), 
-?line <<"I[">> = iolist_to_binary(re:replace("[","[abc[:x\\]pqr]","I\\1&",[])), 
-?line <<"I[">> = iolist_to_binary(re:replace("[","[abc[:x\\]pqr]","I\\1&",[global])), 
-?line <<"SYn:iPpASU">> = iolist_to_binary(re:replace(":","[abc[:x\\]pqr]","SY\\1n&iP\\1pAS\\1U",[])), 
-?line <<"SYn:iPpASU">> = iolist_to_binary(re:replace(":","[abc[:x\\]pqr]","SY\\1n&iP\\1pAS\\1U",[global])), 
-?line <<"VwLRsMyuKqCwx">> = iolist_to_binary(re:replace("]","[abc[:x\\]pqr]","VwLRsMyuKqCwx",[])), 
-?line <<"VwLRsMyuKqCwx">> = iolist_to_binary(re:replace("]","[abc[:x\\]pqr]","VwLRsMyuKqCwx",[global])), 
-?line <<"YqUufuU">> = iolist_to_binary(re:replace("p","[abc[:x\\]pqr]","YqU\\1ufuU",[])), 
-?line <<"YqUufuU">> = iolist_to_binary(re:replace("p","[abc[:x\\]pqr]","YqU\\1ufuU",[global])), 
-ok.
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b) c","H\\1mWytdK\\1",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b) c","H\\1mWytdK\\1",[extended,
+                                                                                                                                                                                                                     global])), 
+    <<"bpmBlFODKYLa">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b|(*F)) c","bpmBlFO\\1DKYLa",[extended])), 
+    <<"bpmBlFODKYLa">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b|(*F)) c","bpmBlFO\\1DKYLa",[extended,
+                                                                                                                                                                                                                                  global])), 
+    <<"JjdAaabcVAKJYnJUNmb">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c","JjdA&VAKJYnJUN\\1mb",[extended])), 
+    <<"JjdAaabcVAKJYnJUNmb">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c","JjdA&VAKJYnJUN\\1mb",[extended,
+                                                                                                                                                                                                                                                           global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b) ) c","th\\1Srp\\1LGEBK",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b) ) c","th\\1Srp\\1LGEBK",[extended,
+                                                                                                                                                                                                                                       global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?>a(*THEN)b) c","ukgQQVa\\1qLglPHKE",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?>a(*THEN)b) c","ukgQQVa\\1qLglPHKE",[extended,
+                                                                                                                                                                                                                              global])), 
+    <<"PVXXt">> = iolist_to_binary(re:replace("aabc","^.*? (?>a(*THEN)b|(*F)) c","PVXXt",[extended])), 
+    <<"PVXXt">> = iolist_to_binary(re:replace("aabc","^.*? (?>a(*THEN)b|(*F)) c","PVXXt",[extended,
+                                                                                                                                                                                                             global])), 
+    <<"XNnaabcsJeaabciijbma">> = iolist_to_binary(re:replace("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c","XNn&sJe&iijbma",[extended])), 
+    <<"XNnaabcsJeaabciijbma">> = iolist_to_binary(re:replace("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c","XNn&sJe&iijbma",[extended,
+                                                                                                                                                                                                                                                 global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?> (?>a(*THEN)b) ) c","CtO\\1VdQgHMA&JMp",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?> (?>a(*THEN)b) ) c","CtO\\1VdQgHMA&JMp",[extended,
+                                                                                                                                                                                                                                         global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b)++ c","AAl\\1s\\1MAOnKUxaX",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b)++ c","AAl\\1s\\1MAOnKUxaX",[extended,
+                                                                                                                                                                                                                                 global])), 
+    <<"iaabcpWabNRGraabct">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b|(*F))++ c","i&pW\\1NRGr&t",[extended])), 
+    <<"iaabcpWabNRGraabct">> = iolist_to_binary(re:replace("aabc","^.*? (a(*THEN)b|(*F))++ c","i&pW\\1NRGr&t",[extended,
+                                                                                                                                                                                                                                global])), 
+    <<"aabcqfVFpeSPlabMdablfKabP">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c","&qfVFpeSPl\\1Md\\1lfK\\1P",[extended])), 
+    <<"aabcqfVFpeSPlabMdablfKabP">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c","&qfVFpeSPl\\1Md\\1lfK\\1P",[extended,
+                                                                                                                                                                                                                                                                         global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b)++ )++ c","b\\1de\\1",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? ( (a(*THEN)b)++ )++ c","b\\1de\\1",[extended,
+                                                                                                                                                                                                                         global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b)++ c","&\\1&MQR\\1u\\1SGG&\\1SpJ",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b)++ c","&\\1&MQR\\1u\\1SGG&\\1SpJ",[extended,
+                                                                                                                                                                                                                                                      global])), 
+    ok.
+run48() ->
+    <<"SaabcjaKGAOmOgHE">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b|(*F))++ c","S&\\1jaKGAOmOgHE",[extended])), 
+    <<"SaabcjaKGAOmOgHE">> = iolist_to_binary(re:replace("aabc","^.*? (?:a(*THEN)b|(*F))++ c","S&\\1jaKGAOmOgHE",[extended,
+                                                                                                                                                                                                                                         global])), 
+    <<"VvLaabclAtFq">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c","VvL&lAtFq",[extended])), 
+    <<"VvLaabclAtFq">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c","VvL&lAtFq",[extended,
+                                                                                                                                                                                                                                              global])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c","Mg&",[extended])), 
+    <<"aabc">> = iolist_to_binary(re:replace("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c","Mg&",[extended,
+                                                                                                                                                                                                                    global])), 
+    <<"prdTVmJacpUmv">> = iolist_to_binary(re:replace("ac","^(?(?=a(*THEN)b)ab|ac)","prdT\\1VmJ&pUmv",[])), 
+    <<"prdTVmJacpUmv">> = iolist_to_binary(re:replace("ac","^(?(?=a(*THEN)b)ab|ac)","prdT\\1VmJ&pUmv",[global])), 
+    <<"ba">> = iolist_to_binary(re:replace("ba","^.*?(?(?=a)a|b(*THEN)c)","wa",[])), 
+    <<"ba">> = iolist_to_binary(re:replace("ba","^.*?(?(?=a)a|b(*THEN)c)","wa",[global])), 
+    <<"JLcpcbaPX">> = iolist_to_binary(re:replace("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)","JLcpc&PX",[])), 
+    <<"JLcpcbaPX">> = iolist_to_binary(re:replace("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)","JLcpc&PX",[global])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","^.*?(?(?=a)a(*THEN)b|c)","P\\1eLsoy&h",[])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","^.*?(?(?=a)a(*THEN)b|c)","P\\1eLsoy&h",[global])), 
+    <<"aaQkbjSmrabIabc">> = iolist_to_binary(re:replace("aabc","^.*(?=a(*THEN)b)","&&Q\\1kbjSmr&\\1bI",[])), 
+    <<"aaQkbjSmrabIabc">> = iolist_to_binary(re:replace("aabc","^.*(?=a(*THEN)b)","&&Q\\1kbjSmr&\\1bI",[global])), 
+    <<"xascDcHDAWsCEkjCgcd">> = iolist_to_binary(re:replace("xacd","(?<=a(*ACCEPT)b)c","s\\1&D&HDAWsCEkjC\\1g&",[])), 
+    <<"xascDcHDAWsCEkjCgcd">> = iolist_to_binary(re:replace("xacd","(?<=a(*ACCEPT)b)c","s\\1&D&HDAWsCEkjC\\1g&",[global])), 
+    <<"xaTcalxCpPaREWFWqwSqLed">> = iolist_to_binary(re:replace("xacd","(?<=(a(*ACCEPT)b))c","T&\\1lxCpP\\1REWFWqwSqLe",[])), 
+    <<"xaTcalxCpPaREWFWqwSqLed">> = iolist_to_binary(re:replace("xacd","(?<=(a(*ACCEPT)b))c","T&\\1lxCpP\\1REWFWqwSqLe",[global])), 
+    <<"xababKJXd">> = iolist_to_binary(re:replace("xabcd","(?<=(a(*COMMIT)b))c","\\1KJX",[])), 
+    <<"xababKJXd">> = iolist_to_binary(re:replace("xabcd","(?<=(a(*COMMIT)b))c","\\1KJX",[global])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=(a(*COMMIT)b))c","caxcMW&&uQRuH",[])), 
+    <<"** Failers">> = iolist_to_binary(re:replace("** Failers","(?<=(a(*COMMIT)b))c","caxcMW&&uQRuH",[global])), 
+    <<"xacd">> = iolist_to_binary(re:replace("xacd","(?<=(a(*COMMIT)b))c","FOAJ",[])), 
+    <<"xacd">> = iolist_to_binary(re:replace("xacd","(?<=(a(*COMMIT)b))c","FOAJ",[global])), 
+    <<"xkklXcAWOSApWPhcsCd">> = iolist_to_binary(re:replace("xcd","(?<!a(*FAIL)b)c","kklX&AWOSApWPhcsC",[])), 
+    <<"xkklXcAWOSApWPhcsCd">> = iolist_to_binary(re:replace("xcd","(?<!a(*FAIL)b)c","kklX&AWOSApWPhcsC",[global])), 
+    <<"aEd">> = iolist_to_binary(re:replace("acd","(?<!a(*FAIL)b)c","E",[])), 
+    <<"aEd">> = iolist_to_binary(re:replace("acd","(?<!a(*FAIL)b)c","E",[global])), 
+    <<"xabXbpgbspePmyaYAcaQfd">> = iolist_to_binary(re:replace("xabcd","(?<=a(*PRUNE)b)c","XbpgbspePmyaYA&a\\1Qf\\1",[])), 
+    <<"xabXbpgbspePmyaYAcaQfd">> = iolist_to_binary(re:replace("xabcd","(?<=a(*PRUNE)b)c","XbpgbspePmyaYA&a\\1Qf\\1",[global])), 
+    <<"xabLEAOaSIPRfaaJd">> = iolist_to_binary(re:replace("xabcd","(?<=a(*SKIP)b)c","LEAO\\1a\\1SIPRfaaJ",[])), 
+    <<"xabLEAOaSIPRfaaJd">> = iolist_to_binary(re:replace("xabcd","(?<=a(*SKIP)b)c","LEAO\\1a\\1SIPRfaaJ",[global])), 
+    <<"xabaUocAdcnXoUlbd">> = iolist_to_binary(re:replace("xabcd","(?<=a(*THEN)b)c","aUocAdcnXoUlb",[])), 
+    <<"xabaUocAdcnXoUlbd">> = iolist_to_binary(re:replace("xabcd","(?<=a(*THEN)b)c","aUocAdcnXoUlb",[global])), 
+    <<"nkbGaaSijewUabcdnMG">> = iolist_to_binary(re:replace("abcd","(a)(?2){2}(.)","nkbG\\1aSijewU&nMG",[])), 
+    <<"nkbGaaSijewUabcdnMG">> = iolist_to_binary(re:replace("abcd","(a)(?2){2}(.)","nkbG\\1aSijewU&nMG",[global])), 
+    ok.
+run49() ->
+    <<"hello world SintestMnKXO">> = iolist_to_binary(re:replace("hello world test","(another)?(\\1?)test","Sin&MnKXO",[])), 
+    <<"hello world SintestMnKXO">> = iolist_to_binary(re:replace("hello world test","(another)?(\\1?)test","Sin&MnKXO",[global])), 
+    <<"hello world test">> = iolist_to_binary(re:replace("hello world test","(another)?(\\1+)test","EqY&e&Np",[])), 
+    <<"hello world test">> = iolist_to_binary(re:replace("hello world test","(another)?(\\1+)test","EqY&e&Np",[global])), 
+    <<"aacnRTVpYnGmPcIyAaacWH">> = iolist_to_binary(re:replace("aac","(a(*COMMIT)b){0}a(?1)|aac","\\1&n\\1RTVpYnGmPcIyA&WH",[])), 
+    <<"aacnRTVpYnGmPcIyAaacWH">> = iolist_to_binary(re:replace("aac","(a(*COMMIT)b){0}a(?1)|aac","\\1&n\\1RTVpYnGmPcIyA&WH",[global])), 
+    <<"saacAdlboHVPY">> = iolist_to_binary(re:replace("aac","((?:a?)*)*c","s&\\1Adlb\\1oHVPY",[])), 
+    <<"saacAdlboHVPY">> = iolist_to_binary(re:replace("aac","((?:a?)*)*c","s&\\1Adlb\\1oHVPY",[global])), 
+    <<"PQFQipl">> = iolist_to_binary(re:replace("aac","((?>a?)*)*c","\\1PQF\\1Qipl",[])), 
+    <<"PQFQipl">> = iolist_to_binary(re:replace("aac","((?>a?)*)*c","\\1PQF\\1Qipl",[global])), 
+    <<"aOSwgH">> = iolist_to_binary(re:replace("aba","(?>.*?a)(?<=ba)","OSwg\\1H",[])), 
+    <<"aOSwgH">> = iolist_to_binary(re:replace("aba","(?>.*?a)(?<=ba)","OSwg\\1H",[global])), 
+    <<"UL">> = iolist_to_binary(re:replace("aba","(?:.*?a)(?<=ba)","UL",[])), 
+    <<"UL">> = iolist_to_binary(re:replace("aba","(?:.*?a)(?<=ba)","UL",[global])), 
+    <<"akGFFqTULiWlebdQv">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","kGFFqTU\\1Li\\1\\1Wl\\1ebdQv",[])), 
+    <<"akGFFqTULiWlebdQv">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","kGFFqTU\\1Li\\1\\1Wl\\1ebdQv",[global])), 
+    <<"aXPTFWMMabnvLRLXcgs">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","XP\\1T\\1FWMM&nvLRL\\1Xcgs",[dotall])), 
+    <<"aXPTFWMMabnvLRLXcgs">> = iolist_to_binary(re:replace("aab",".*?a(*PRUNE)b","XP\\1T\\1FWMM&nvLRL\\1Xcgs",[dotall,
+                                                                                                                                                                                                                                 global])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","^a(*PRUNE)b","kTbd&d\\1IUxwe",[dotall])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","^a(*PRUNE)b","kTbd&d\\1IUxwe",[dotall,
+                                                                                                                                                                                                   global])), 
+    <<"atVababo">> = iolist_to_binary(re:replace("aab",".*?a(*SKIP)b","\\1tV&&o",[])), 
+    <<"atVababo">> = iolist_to_binary(re:replace("aab",".*?a(*SKIP)b","\\1tV&&o",[global])), 
+    <<"aWeRyiVpKsDiabnl">> = iolist_to_binary(re:replace("aab","(?>.*?a)b","WeR\\1yiVpKsDi&nl\\1",[dotall])), 
+    <<"aWeRyiVpKsDiabnl">> = iolist_to_binary(re:replace("aab","(?>.*?a)b","WeR\\1yiVpKsDi&nl\\1",[dotall,
+                                                                                                                                                                                                            global])), 
+    <<"aUabbhWWOF">> = iolist_to_binary(re:replace("aab","(?>.*?a)b","U&bhWWOF\\1",[])), 
+    <<"aUabbhWWOF">> = iolist_to_binary(re:replace("aab","(?>.*?a)b","U&bhWWOF\\1",[global])), 
+    ok.
+run50() ->
+    <<"aab">> = iolist_to_binary(re:replace("aab","(?>^a)b","l",[dotall])), 
+    <<"aab">> = iolist_to_binary(re:replace("aab","(?>^a)b","l",[dotall,
+                                                                                                                                                               global])), 
+    <<"alphabetabcdeY">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))","eY",[])), 
+    <<"alphabetabcdeY">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))","eY",[global])), 
+    <<"endingwxyzmUXcfh">> = iolist_to_binary(re:replace("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))","mUX&cf\\1\\1h",[])), 
+    <<"endingwxyzmUXcfh">> = iolist_to_binary(re:replace("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))","mUX&cf\\1\\1h",[global])), 
+    <<"alphabetabcddalphabetabcdHPabcdycalphabetabcdalphabetabcdabcdAsalphabetabcdnalphabetabcd">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))","&d&HP\\1yc&&\\1As&n&",[])), 
+    <<"alphabetabcddalphabetabcdHPabcdycalphabetabcdalphabetabcdabcdAsalphabetabcdnalphabetabcddHPabcdycabcdAsn">> = iolist_to_binary(re:replace("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))","&d&HP\\1yc&&\\1As&n&",[global])), 
+    <<"nuJausendingwxyzRQmendingwxyzxY">> = iolist_to_binary(re:replace("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))","nuJaus&RQm&xY",[])), 
+    <<"nuJausendingwxyzRQmendingwxyzxYnuJausRQmxY">> = iolist_to_binary(re:replace("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))","nuJaus&RQm&xY",[global])), 
+    <<"abcdfooxyz">> = iolist_to_binary(re:replace("abcdfooxyz","(?>.*)foo","tW\\1",[])), 
+    <<"abcdfooxyz">> = iolist_to_binary(re:replace("abcdfooxyz","(?>.*)foo","tW\\1",[global])), 
+    <<"abcdfooVDUixyz">> = iolist_to_binary(re:replace("abcdfooxyz","(?>.*?)foo","&VDUi",[])), 
+    <<"abcdfooVDUixyz">> = iolist_to_binary(re:replace("abcdfooxyz","(?>.*?)foo","&VDUi",[global])), 
+    <<"acxmMn">> = iolist_to_binary(re:replace("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)","&\\1xmMn",[])), 
+    <<"acxmMn">> = iolist_to_binary(re:replace("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)","&\\1xmMn",[global])), 
+    <<"PvKHsAacacQ">> = iolist_to_binary(re:replace("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)","P\\1vKHsA&&Q",[])), 
+    <<"PvKHsAacacQ">> = iolist_to_binary(re:replace("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)","P\\1vKHsA&&Q",[global])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","(?<=(*SKIP)ac)a","g",[])), 
+    <<"aa">> = iolist_to_binary(re:replace("aa","(?<=(*SKIP)ac)a","g",[global])), 
+    <<"aakcebaaaacgyaaaaceWGsoCOKKn">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*PRUNE)b|a+c","kceb&gy&eWG\\1soCOKKn",[])), 
+    <<"aakcebaaaacgyaaaaceWGsoCOKKn">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*PRUNE)b|a+c","kceb&gy&eWG\\1soCOKKn",[global])), 
+    <<"aaMwmkmaaaacTVDJaaaacSHIqUKYU">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c","Mwmk\\1m&TVDJ&SHIqUKYU",[])), 
+    <<"aaMwmkmaaaacTVDJaaaacSHIqUKYU">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c","Mwmk\\1m&TVDJ&SHIqUKYU",[global])), 
+    <<"aaaaaacWXE">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c","&WXE",[])), 
+    <<"aaaaaacWXE">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c","&WXE",[global])), 
+    <<"aalIbneaaaac">> = iolist_to_binary(re:replace("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c","\\1lI\\1b\\1ne&",[])), 
+    <<"aalIbneaaaac">> = iolist_to_binary(re:replace("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c","\\1lI\\1b\\1ne&",[global])), 
+    <<"aauaaaacUCgqIctaaaacOCUYF">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c","u&UCg\\1qIct&O\\1CU\\1\\1YF",[])), 
+    <<"aauaaaacUCgqIctaaaacOCUYF">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c","u&UCg\\1qIct&O\\1CU\\1\\1YF",[global])), 
+    ok.
+run51() ->
+    <<"aaaaaKQacStnP">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP)b|a+c","K\\1Q&St\\1nP",[])), 
+    <<"aaaaaKQacStnP">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP)b|a+c","K\\1Q&St\\1nP",[global])), 
+    <<"aaaaaYggUuQGacfRtKLJ">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c","YggUu\\1QG&\\1fRtKL\\1\\1J\\1",[])), 
+    <<"aaaaaYggUuQGacfRtKLJ">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c","YggUu\\1QG&\\1fRtKL\\1\\1J\\1",[global])), 
+    <<"aaaaa">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c","\\1",[])), 
+    <<"aaaaa">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c","\\1",[global])), 
+    <<"aaaaaU">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c","U",[])), 
+    <<"aaaaaU">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c","U",[global])), 
+    <<"aaaaaac">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*COMMIT)b|a+c","kAM",[])), 
+    <<"aaaaaac">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*COMMIT)b|a+c","kAM",[global])), 
+    <<"VvCwaaaaaacLKWgIbVKGB">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*THEN)b|a+c","VvCw&LKWgIbVKGB",[])), 
+    <<"VvCwaaaaaacLKWgIbVKGB">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*THEN)b|a+c","VvCw&LKWgIbVKGB",[global])), 
+    <<"abvTAmJ">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c","abvTA\\1mJ",[])), 
+    <<"abvTAmJ">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c","abvTA\\1mJ",[global])), 
+    <<"phVmoxx">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c","phVm\\1oxx",[])), 
+    <<"phVmoxx">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c","phVm\\1oxx",[global])), 
+    <<"GdHapg">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c","Gd\\1Hapg",[])), 
+    <<"GdHapg">> = iolist_to_binary(re:replace("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c","Gd\\1Hapg",[global])), 
+    ok.
+run52() ->
+    <<"aaaaa">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+","\\1",[])), 
+    <<"aaaaa">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+","\\1",[global])), 
+    <<"aaaaaQvaOuCaBoHYMapab">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+","\\1Qv&\\1OuC&BoHYM&pab",[])), 
+    <<"aaaaaQvaOuCaBoHYMapab">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+","\\1Qv&\\1OuC&BoHYM&pab",[global])), 
+    <<"aauaaaa">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+","u&",[])), 
+    <<"aauaaaa">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+","u&",[global])), 
+    <<"aaaaaTLn">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+","TLn\\1",[])), 
+    <<"aaaaaTLn">> = iolist_to_binary(re:replace("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+","TLn\\1",[global])), 
+    <<"aaaacEITBRXepyL">> = iolist_to_binary(re:replace("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c","&EITBRXepyL\\1",[])), 
+    <<"aaaacEITBRXepyL">> = iolist_to_binary(re:replace("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c","&EITBRXepyL\\1",[global])), 
+    <<"aaaMSacMdGgSm">> = iolist_to_binary(re:replace("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c","\\1MS&MdGg\\1Sm",[])), 
+    <<"aaaMSacMdGgSm">> = iolist_to_binary(re:replace("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c","\\1MS&MdGg\\1Sm",[global])), 
+    <<"aaKCBrjuDaackaactRB">> = iolist_to_binary(re:replace("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c","KCBrjuD&k&t\\1RB",[])), 
+    <<"aaKCBrjuDaackaactRB">> = iolist_to_binary(re:replace("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c","KCBrjuD&k&t\\1RB",[global])), 
+    <<"aaaKWuEddO">> = iolist_to_binary(re:replace("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c","KWuEddO",[])), 
+    <<"aaaKWuEddO">> = iolist_to_binary(re:replace("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c","KWuEddO",[global])), 
+    <<"QSDGhNmLAsnYtCIuka">> = iolist_to_binary(re:replace("ba",".?(a|b(*THEN)c)","QSDGhNmLAsnYtCIuka",[])), 
+    <<"QSDGhNmLAsnYtCIuka">> = iolist_to_binary(re:replace("ba",".?(a|b(*THEN)c)","QSDGhNmLAsnYtCIuka",[global])), 
+    <<"tARW">> = iolist_to_binary(re:replace("abc","(a(*COMMIT)b)c|abd","tARW",[])), 
+    <<"tARW">> = iolist_to_binary(re:replace("abc","(a(*COMMIT)b)c|abd","tARW",[global])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","(a(*COMMIT)b)c|abd","THra\\1QsHhH&NqVcHjK\\1",[])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","(a(*COMMIT)b)c|abd","THra\\1QsHhH&NqVcHjK\\1",[global])), 
+    <<"eJabcbgg">> = iolist_to_binary(re:replace("abc","(?=a(*COMMIT)b)abc|abd","\\1eJ&\\1bgg",[])), 
+    <<"eJabcbgg">> = iolist_to_binary(re:replace("abc","(?=a(*COMMIT)b)abc|abd","\\1eJ&\\1bgg",[global])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","(?=a(*COMMIT)b)abc|abd","&",[])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","(?=a(*COMMIT)b)abc|abd","&",[global])), 
+    <<"SJjtxKabcE">> = iolist_to_binary(re:replace("abc","(?>a(*COMMIT)b)c|abd","SJjt\\1xK&E",[])), 
+    <<"SJjtxKabcE">> = iolist_to_binary(re:replace("abc","(?>a(*COMMIT)b)c|abd","SJjt\\1xK&E",[global])), 
+    <<"nCO">> = iolist_to_binary(re:replace("abd","(?>a(*COMMIT)b)c|abd","\\1nCO",[])), 
+    <<"nCO">> = iolist_to_binary(re:replace("abd","(?>a(*COMMIT)b)c|abd","\\1nCO",[global])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","a(?=b(*COMMIT)c)[^d]|abd","sicBOgC",[])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","a(?=b(*COMMIT)c)[^d]|abd","sicBOgC",[global])), 
+    <<"OIc">> = iolist_to_binary(re:replace("abc","a(?=b(*COMMIT)c)[^d]|abd","OI",[])), 
+    <<"OIc">> = iolist_to_binary(re:replace("abc","a(?=b(*COMMIT)c)[^d]|abd","OI",[global])), 
+    <<"cBnM">> = iolist_to_binary(re:replace("abd","a(?=bc).|abd","cBnM",[])), 
+    <<"cBnM">> = iolist_to_binary(re:replace("abd","a(?=bc).|abd","cBnM",[global])), 
+    <<"uwVabvc">> = iolist_to_binary(re:replace("abc","a(?=bc).|abd","\\1uwV&v",[])), 
+    <<"uwVabvc">> = iolist_to_binary(re:replace("abc","a(?=bc).|abd","\\1uwV&v",[global])), 
+    <<"abceabd">> = iolist_to_binary(re:replace("abceabd","a(?>b(*COMMIT)c)d|abd","ON\\1oJApWbhJ&h\\1SDD",[])), 
+    <<"abceabd">> = iolist_to_binary(re:replace("abceabd","a(?>b(*COMMIT)c)d|abd","ON\\1oJApWbhJ&h\\1SDD",[global])), 
+    <<"abceabdFDcsKjWRPJwG">> = iolist_to_binary(re:replace("abceabd","a(?>bc)d|abd","&FDcsK\\1jWRPJwG",[])), 
+    <<"abceabdFDcsKjWRPJwG">> = iolist_to_binary(re:replace("abceabd","a(?>bc)d|abd","&FDcsK\\1jWRPJwG",[global])), 
+    <<"fTabdENuYeMabdK">> = iolist_to_binary(re:replace("abd","(?>a(*COMMIT)b)c|abd","fT&ENuY\\1eM&K",[])), 
+    <<"fTabdENuYeMabdK">> = iolist_to_binary(re:replace("abd","(?>a(*COMMIT)b)c|abd","fT&ENuY\\1eM&K",[global])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","(?>a(*COMMIT)c)d|abd","vbE",[])), 
+    <<"abd">> = iolist_to_binary(re:replace("abd","(?>a(*COMMIT)c)d|abd","vbE",[global])), 
+    <<"iKqJ">> = iolist_to_binary(re:replace("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))","iKq\\1J",[])), 
+    <<"iKqJ">> = iolist_to_binary(re:replace("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))","iKq\\1J",[global])), 
+    ok.
+run53() ->
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a)?(?(1)a|b)+$","YQRU&",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^(a)?(?(1)a|b)+$","YQRU&",[global])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(a)?(?(1)a|b)+$","SLSciT&&F",[])), 
+    <<"a">> = iolist_to_binary(re:replace("a","^(a)?(?(1)a|b)+$","SLSciT&&F",[global])), 
+    <<"aIbCe">> = iolist_to_binary(re:replace("ab","(?=a\\Kb)ab","IbCe",[])), 
+    <<"aIbCe">> = iolist_to_binary(re:replace("ab","(?=a\\Kb)ab","IbCe",[global])), 
+    <<"KWEhxbu">> = iolist_to_binary(re:replace("ac","(?!a\\Kb)ac","KWEhxbu",[])), 
+    <<"KWEhxbu">> = iolist_to_binary(re:replace("ac","(?!a\\Kb)ac","KWEhxbu",[global])), 
+    <<"abObpVTjlSnifUCddjn">> = iolist_to_binary(re:replace("abcd","^abc(?<=b\\Kc)d","ObpV\\1TjlSnifUCddjn",[])), 
+    <<"abObpVTjlSnifUCddjn">> = iolist_to_binary(re:replace("abcd","^abc(?<=b\\Kc)d","ObpV\\1TjlSnifUCddjn",[global])), 
+    <<"lljlodkrbhYabcdXWQwLIT">> = iolist_to_binary(re:replace("abcd","^abc(?<!b\\Kq)d","llj\\1lodkrbhY&XWQwLIT",[])), 
+    <<"lljlodkrbhYabcdXWQwLIT">> = iolist_to_binary(re:replace("abcd","^abc(?<!b\\Kq)d","llj\\1lodkrbhY&XWQwLIT",[global])), 
+    <<"abcdabcdabcdHLqtQeabcdEabcdJHiabcdP">> = iolist_to_binary(re:replace("abcd","^((abc|abcx)(*THEN)y|abcd)","&&\\1HLqtQe&E\\1JHi\\1P",[])), 
+    <<"abcdabcdabcdHLqtQeabcdEabcdJHiabcdP">> = iolist_to_binary(re:replace("abcd","^((abc|abcx)(*THEN)y|abcd)","&&\\1HLqtQe&E\\1JHi\\1P",[global])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^((abc|abcx)(*THEN)y|abcd)","NtVKEpoSj\\1\\1o\\1ESK",[])), 
+    <<"*** Failers">> = iolist_to_binary(re:replace("*** Failers","^((abc|abcx)(*THEN)y|abcd)","NtVKEpoSj\\1\\1o\\1ESK",[global])), 
+    <<"abcxy">> = iolist_to_binary(re:replace("abcxy","^((abc|abcx)(*THEN)y|abcd)","Jj\\1XL&TAaD",[])), 
+    <<"abcxy">> = iolist_to_binary(re:replace("abcxy","^((abc|abcx)(*THEN)y|abcd)","Jj\\1XL&TAaD",[global])), 
+    <<"yes">> = iolist_to_binary(re:replace("yes","^((yes|no)(*THEN)(*F))?","fA&L\\1bxmA\\1bu\\1w\\1Lh",[])), 
+    <<"yes">> = iolist_to_binary(re:replace("yes","^((yes|no)(*THEN)(*F))?","fA&L\\1bxmA\\1bu\\1w\\1Lh",[global])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","(?=a(*COMMIT)b|ac)ac|ac","uuCjDlLQYP",[])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","(?=a(*COMMIT)b|ac)ac|ac","uuCjDlLQYP",[global])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c","\\1W&y&PeDCK\\1cDLtO",[extended])), 
+    <<"ac">> = iolist_to_binary(re:replace("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c","\\1W&y&PeDCK\\1cDLtO",[extended,
+                                                                                                                                                                                                                                                     global])), 
+    <<"bnWqWn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*THEN)a)bn|bnn)","&WqW",[])), 
+    <<"bnWqWn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*THEN)a)bn|bnn)","&WqW",[global])), 
+    <<"PGnTXLBnIbnbnbnePKbnn">> = iolist_to_binary(re:replace("bnn","(?!b(*SKIP)a)bn|bnn","PGnTXLBnI&&&e\\1PK&",[])), 
+    <<"PGnTXLBnIbnbnbnePKbnn">> = iolist_to_binary(re:replace("bnn","(?!b(*SKIP)a)bn|bnn","PGnTXLBnI&&&e\\1PK&",[global])), 
+    <<"iMn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*SKIP)a)bn|bnn)","\\1iM",[])), 
+    <<"iMn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*SKIP)a)bn|bnn)","\\1iM",[global])), 
+    <<"gcbnaxAn">> = iolist_to_binary(re:replace("bnn","(?!b(*PRUNE)a)bn|bnn","\\1gc&ax\\1\\1A",[])), 
+    <<"gcbnaxAn">> = iolist_to_binary(re:replace("bnn","(?!b(*PRUNE)a)bn|bnn","\\1gc&ax\\1\\1A",[global])), 
+    <<"dAtbnrKybneTLNeBcn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*PRUNE)a)bn|bnn)","dAt&rKy&eTLNeBc",[])), 
+    <<"dAtbnrKybneTLNeBcn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*PRUNE)a)bn|bnn)","dAt&rKy&eTLNeBc",[global])), 
+    <<"vXn">> = iolist_to_binary(re:replace("bnn","(?!b(*COMMIT)a)bn|bnn","vX",[])), 
+    <<"vXn">> = iolist_to_binary(re:replace("bnn","(?!b(*COMMIT)a)bn|bnn","vX",[global])), 
+    <<"EUadjhULxavkwOtGbnqrPn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*COMMIT)a)bn|bnn)","EUadjhULxavkwOtG&qrP",[])), 
+    <<"EUadjhULxavkwOtGbnqrPn">> = iolist_to_binary(re:replace("bnn","(?(?!b(*COMMIT)a)bn|bnn)","EUadjhULxavkwOtG&qrP",[global])), 
+    <<"bnn">> = iolist_to_binary(re:replace("bnn","(?=b(*SKIP)a)bn|bnn","Fw",[])), 
+    <<"bnn">> = iolist_to_binary(re:replace("bnn","(?=b(*SKIP)a)bn|bnn","Fw",[global])), 
+    <<"JgfYWGl">> = iolist_to_binary(re:replace("bnn","(?=b(*THEN)a)bn|bnn","Jgf\\1Y\\1W\\1Gl\\1",[])), 
+    <<"JgfYWGl">> = iolist_to_binary(re:replace("bnn","(?=b(*THEN)a)bn|bnn","Jgf\\1Y\\1W\\1Gl\\1",[global])), 
+    <<"SacJCiWoykVpvXacd">> = iolist_to_binary(re:replace("acd","(?!a(*SKIP)b)..","S&JCiWoykVpvX\\1&",[])), 
+    <<"SacJCiWoykVpvXacd">> = iolist_to_binary(re:replace("acd","(?!a(*SKIP)b)..","S&JCiWoykVpvX\\1&",[global])), 
+    ok.
+run54() ->
+    <<"CxbMac">> = iolist_to_binary(re:replace("ac","^(?(?!a(*SKIP)b))","&Cxb&M",[])), 
+    <<"CxbMac">> = iolist_to_binary(re:replace("ac","^(?(?!a(*SKIP)b))","&Cxb&M",[global])), 
+    <<"OceGNacoaFRboacPKd">> = iolist_to_binary(re:replace("acd","^(?!a(*PRUNE)b)..","OceGN&o\\1aF\\1Rb\\1o&PK",[])), 
+    <<"OceGNacoaFRboacPKd">> = iolist_to_binary(re:replace("acd","^(?!a(*PRUNE)b)..","OceGN&o\\1aF\\1Rb\\1o&PK",[global])), 
+    <<"ysd">> = iolist_to_binary(re:replace("acd","(?!a(*PRUNE)b)..","ys",[])), 
+    <<"ysd">> = iolist_to_binary(re:replace("acd","(?!a(*PRUNE)b)..","ys",[global])), 
+    <<"nba">> = iolist_to_binary(re:replace("ba","\\A.*?(?:a|bc)","n\\1\\1&",[])), 
+    <<"nba">> = iolist_to_binary(re:replace("ba","\\A.*?(?:a|bc)","n\\1\\1&",[global])), 
+    <<"CDEeCDYuCDCDb">> = iolist_to_binary(re:replace("CD","^(A(*THEN)B|C(*THEN)D)","&Ee\\1Yu\\1\\1b",[])), 
+    <<"CDEeCDYuCDCDb">> = iolist_to_binary(re:replace("CD","^(A(*THEN)B|C(*THEN)D)","&Ee\\1Yu\\1\\1b",[global])), 
+    <<"AYtnukv">> = iolist_to_binary(re:replace("1234","^\\d*\\w{4}","AYtn\\1ukv",[])), 
+    <<"AYtnukv">> = iolist_to_binary(re:replace("1234","^\\d*\\w{4}","AYtn\\1ukv",[global])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^\\d*\\w{4}","oGBqK\\1EWY&VbHw\\1ue&",[])), 
+    <<"123">> = iolist_to_binary(re:replace("123","^\\d*\\w{4}","oGBqK\\1EWY&VbHw\\1ue&",[global])), 
+    <<"LhHvlYGR">> = iolist_to_binary(re:replace("aaaa","^[^b]*\\w{4}","\\1LhHvlYGR",[])), 
+    <<"LhHvlYGR">> = iolist_to_binary(re:replace("aaaa","^[^b]*\\w{4}","\\1LhHvlYGR",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^[^b]*\\w{4}","S\\1wy&o\\1v&ST",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^[^b]*\\w{4}","S\\1wy&o\\1v&ST",[global])), 
+    <<"aaaagQaaaalwFSxFUL">> = iolist_to_binary(re:replace("aaaa","^[^b]*\\w{4}","\\1\\1\\1&gQ&lwFSxFU\\1L",[caseless])), 
+    <<"aaaagQaaaalwFSxFUL">> = iolist_to_binary(re:replace("aaaa","^[^b]*\\w{4}","\\1\\1\\1&gQ&lwFSxFU\\1L",[caseless,
+                                                                                                                                                                                                                                global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^[^b]*\\w{4}","SfymhPOH",[caseless])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^[^b]*\\w{4}","SfymhPOH",[caseless,
+                                                                                                                                                                                        global])), 
+    <<"HTMLYQhAQNJHaaaaJKAva">> = iolist_to_binary(re:replace("aaaa","^a*\\w{4}","HTM\\1L\\1YQhAQNJH&JKAva",[])), 
+    <<"HTMLYQhAQNJHaaaaJKAva">> = iolist_to_binary(re:replace("aaaa","^a*\\w{4}","HTM\\1L\\1YQhAQNJH&JKAva",[global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^a*\\w{4}","bfScQRcKYl&\\1&\\1&Aq&C",[])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^a*\\w{4}","bfScQRcKYl&\\1&\\1&Aq&C",[global])), 
+    <<"aaaadgKVePEaaaaqdlcK">> = iolist_to_binary(re:replace("aaaa","^a*\\w{4}","&dgKVePE&qdl\\1cK",[caseless])), 
+    <<"aaaadgKVePEaaaaqdlcK">> = iolist_to_binary(re:replace("aaaa","^a*\\w{4}","&dgKVePE&qdl\\1cK",[caseless,
+                                                                                                                                                                                                         global])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^a*\\w{4}","ncXKavCFttF",[caseless])), 
+    <<"aaa">> = iolist_to_binary(re:replace("aaa","^a*\\w{4}","ncXKavCFttF",[caseless,
+                                                                                                                                                                                        global])), 
+    ok.
diff --git a/lib/stdlib/test/re_testoutput1_split_test.erl b/lib/stdlib/test/re_testoutput1_split_test.erl
index 4fc85b95c0..af3c3caa48 100644
--- a/lib/stdlib/test/re_testoutput1_split_test.erl
+++ b/lib/stdlib/test/re_testoutput1_split_test.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,1369 +19,1423 @@
 -module(re_testoutput1_split_test).
 -compile(export_all).
 -compile(no_native).
--include("test_server.hrl").
 %% This file is generated by running run_pcre_tests:gen_split_test("re_SUITE_data/testoutput1")
 join([]) -> [];
 join([A]) -> [A];
 join([H|T]) -> [H,<<":">>|join(T)].
 run() ->
-?line <<"">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[]))), 
-?line <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[trim]))), 
-?line <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-?line <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[trim]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[{parts,
-                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[]))), 
-?line <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[trim]))), 
-?line <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[{parts,
-                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless,
-                                                                                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless,
-                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless,
-                                                                                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless,
-                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless,
-                                                                                                                                                                                                                                                                            trim]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless,
-                                                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                                                               2}]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless,
-                                                                                                                                                                                                                                                                            trim]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless,
-                                                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                                                               2}]))), 
-?line <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd	
+    run0(),
+    run1(),
+    run2(),
+    run3(),
+    run4(),
+    run5(),
+    run6(),
+    run7(),
+    run8(),
+    run9(),
+    run10(),
+    run11(),
+    run12(),
+    run13(),
+    run14(),
+    run15(),
+    run16(),
+    run17(),
+    run18(),
+    run19(),
+    run20(),
+    run21(),
+    run22(),
+    run23(),
+    run24(),
+    run25(),
+    run26(),
+    run27(),
+    run28(),
+    run29(),
+    run30(),
+    run31(),
+    run32(),
+    run33(),
+    run34(),
+    run35(),
+    run36(),
+    run37(),
+    run38(),
+    run39(),
+    run40(),
+    run41(),
+    run42(),
+    run43(),
+    run44(),
+    run45(),
+    run46(),
+    run47(),
+    run48(),
+    run49(),
+    run50(),
+    run51(),
+    run52(),
+    run53(),
+    run54(),
+    ok.
+run0() ->
+    <<"">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[{parts,
+                                                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","the quick brown fox",[]))), 
+    <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[trim]))), 
+    <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[{parts,
+                                                                                                                                                                                                                            2}]))), 
+    <<"The quick brown FOX">> = iolist_to_binary(join(re:split("The quick brown FOX","the quick brown fox",[]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[trim]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[{parts,
+                                                                                                                                                                                                                                                                            2}]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","the quick brown fox",[]))), 
+    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[trim]))), 
+    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[{parts,
+                                                                                                                                                                                                                                                                            2}]))), 
+    <<"What do you know about THE QUICK BROWN FOX?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","the quick brown fox",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless,
+                                                                                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless,
+                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("the quick brown fox","The quick brown fox",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless,
+                                                                                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless,
+                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("The quick brown FOX","The quick brown fox",[caseless]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless,
+                                                                                                                                                                                                                                                                          trim]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless,
+                                                                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                                                                             2}]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about the quick brown fox?","The quick brown fox",[caseless]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless,
+                                                                                                                                                                                                                                                                          trim]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless,
+                                                                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                                                                             2}]))), 
+    <<"What do you know about :?">> = iolist_to_binary(join(re:split("What do you know about THE QUICK BROWN FOX?","The quick brown fox",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd	
 
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd	
+    <<":">> = iolist_to_binary(join(re:split("abcd	
 
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[{parts,
                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd	
+    <<":">> = iolist_to_binary(join(re:split("abcd	
 
9;$\\?caxyz","abcd\\t\\n\\r\\f\\a\\e\\071\\x3b\\$\\\\\\?caxyz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                          2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcxyzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aabcxyzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<">>>">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<">>>:">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypABBzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<">>>">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<">>>:">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<">>>:">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<">">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<">:">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<">>>:">> = iolist_to_binary(join(re:split(">>>aaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<">">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                              2}]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<">>>>">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<">>>>:">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<">:">> = iolist_to_binary(join(re:split(">aaaabxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<">>>>">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<">>>>:">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<">>>>:">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-?line <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                            2}]))), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
-                                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
-?line <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+    <<">>>>:">> = iolist_to_binary(join(re:split(">>>>abcxyzpqrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                    2}]))), 
+    <<"abxyzpqrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                        2}]))), 
+    <<"abxyzpqrrrrabbxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrrabbxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                    2}]))), 
+    <<"abxyzpqrrrabxyyyypqAzz">> = iolist_to_binary(join(re:split("abxyzpqrrrabxyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
                                                                                                                                                                                                                                                                                                           2}]))), 
-?line <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[]))), 
-?line <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[trim]))), 
-?line <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[]))), 
-?line <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[trim]))), 
-?line <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[]))), 
-?line <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[trim]))), 
-?line <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[{parts,
+    <<"aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyyyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                                    2}]))), 
+    <<"aaaabcxyzzzzpqrrrabbbxyyypqAzz">> = iolist_to_binary(join(re:split("aaaabcxyzzzzpqrrrabbbxyyypqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[trim]))), 
+    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[{parts,
+                                                                                                                                                                                                                                                                                                        2}]))), 
+    <<"aaabcxyzpqrrrabbxyyyypqqqqqqqAzz">> = iolist_to_binary(join(re:split("aaabcxyzpqrrrabbxyyyypqqqqqqqAzz","a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abczz","^(abc){1,2}zz",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[{parts,
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabczz","^(abc){1,2}zz",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(abc){1,2}zz",[]))), 
+    <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[trim]))), 
+    <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"zz">> = iolist_to_binary(join(re:split("zz","^(abc){1,2}zz",[]))), 
+    <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[trim]))), 
+    <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"abcabcabczz">> = iolist_to_binary(join(re:split("abcabcabczz","^(abc){1,2}zz",[]))), 
+    <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[trim]))), 
+    <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<">>abczz">> = iolist_to_binary(join(re:split(">>abczz","^(abc){1,2}zz",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                     2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+?|a){1,2}?c",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[{parts,
+    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[]))), 
+    <<":bb">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[trim]))), 
+    <<":bb:">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+?|a){1,2}?c",[]))), 
-?line <<":bb">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":bb:">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<":bb:">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[{parts,
+    <<":bb:">> = iolist_to_binary(join(re:split("bbbc","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[]))), 
+    <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[trim]))), 
+    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[]))), 
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[trim]))), 
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+?|a){1,2}?c",[]))), 
-?line <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[{parts,
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[]))), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                                           2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+?|a){1,2}?c",[]))), 
-?line <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+?|a){1,2}?c",[]))), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[{parts,
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+?|a){1,2}?c",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[]))), 
+    <<":bb">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[trim]))), 
+    <<":bb:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bc","^(b+|a){1,2}c",[]))), 
-?line <<":bb">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[trim]))), 
-?line <<":bb:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[{parts,
+    <<":bb:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[]))), 
+    <<":bbb">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[trim]))), 
+    <<":bbb:">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":bb:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}c",[]))), 
-?line <<":bbb">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[trim]))), 
-?line <<":bbb:">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":bbb:">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[{parts,
+    <<":bbb:">> = iolist_to_binary(join(re:split("bbbc","^(b+|a){1,2}c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[]))), 
+    <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[trim]))), 
+    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[]))), 
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[trim]))), 
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aac","^(b+|a){1,2}c",[]))), 
-?line <<":bbbbbbbbbbb">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[trim]))), 
-?line <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[{parts,
+    <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[]))), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))), 
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[{parts,
                                                                                                                                                                                                       2}]))), 
-?line <<":bbbbbbbbbbb:">> = iolist_to_binary(join(re:split("abbbbbbbbbbbc","^(b+|a){1,2}c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbbbbbbbac","^(b+|a){1,2}c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b+|a){1,2}c",[]))), 
-?line <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[trim]))), 
-?line <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[{parts,
+    <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[{parts,
                                                                                                                                                                                     2}]))), 
-?line <<"aaac">> = iolist_to_binary(join(re:split("aaac","^(b+|a){1,2}c",[]))), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[trim]))), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"abbbbbbbbbbbac">> = iolist_to_binary(join(re:split("abbbbbbbbbbbac","^(b+|a){1,2}c",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[]))), 
-?line <<":ba">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[trim]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[{parts,
+    <<":b:">> = iolist_to_binary(join(re:split("bbc","^(b+|a){1,2}?bc",[]))), 
+    <<":ba">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[trim]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[]))), 
+    <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[trim]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("babc","^(b*|ba){1,2}?bc",[]))), 
-?line <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[trim]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[{parts,
+    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[]))), 
+    <<":ba">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[trim]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(b*|ba){1,2}?bc",[]))), 
-?line <<":ba">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[trim]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[{parts,
+    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[]))), 
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[trim]))), 
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(b*|ba){1,2}?bc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(b*|ba){1,2}?bc",[]))), 
-?line <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[trim]))), 
-?line <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[{parts,
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[]))), 
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[trim]))), 
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(b*|ba){1,2}?bc",[]))), 
-?line <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[trim]))), 
-?line <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[]))), 
-?line <<":ba">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[trim]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[{parts,
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(b*|ba){1,2}?bc",[]))), 
+    <<":ba">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[trim]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[]))), 
+    <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[trim]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("babc","^(ba|b*){1,2}?bc",[]))), 
-?line <<":ba">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[trim]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[{parts,
+    <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[]))), 
+    <<":ba">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[trim]))), 
+    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bbabc","^(ba|b*){1,2}?bc",[]))), 
-?line <<":ba">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[trim]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[{parts,
+    <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[]))), 
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[trim]))), 
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<":ba:">> = iolist_to_binary(join(re:split("bababc","^(ba|b*){1,2}?bc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ba|b*){1,2}?bc",[]))), 
-?line <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[trim]))), 
-?line <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[{parts,
+    <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[]))), 
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[trim]))), 
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<"bababbc">> = iolist_to_binary(join(re:split("bababbc","^(ba|b*){1,2}?bc",[]))), 
-?line <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[trim]))), 
-?line <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[\\c{\\c:",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[\\c{\\c:",[{parts,
-                                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[\\c{\\c:",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[{parts,
+    <<"babababc">> = iolist_to_binary(join(re:split("babababc","^(ba|b*){1,2}?bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[\\c{\\c:",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[\\c{\\c:",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("

;z","^\\ca\\cA\\c[\\c{\\c:",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[]))), 
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[trim]))), 
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[]))), 
+    <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[trim]))), 
+    <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[]))), 
+    <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[trim]))), 
+    <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[]))), 
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[trim]))), 
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[]))), 
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[trim]))), 
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("athing","^[ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[{parts,
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("bthing","^[ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[{parts,
+    <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[{parts,
+                                                                                                                                                                                         2}]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[trim]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[]))), 
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[trim]))), 
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("]thing","^[ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[{parts,
+    <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[]))), 
+    <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[trim]))), 
+    <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("cthing","^[ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[{parts,
+    <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[]))), 
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[trim]))), 
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("dthing","^[ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[{parts,
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[]))), 
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[trim]))), 
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("ething","^[ab\\]cde]",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[ab\\]cde]",[]))), 
-?line <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[trim]))), 
-?line <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[{parts,
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[]))), 
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[trim]))), 
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[ab\\]cde]",[]))), 
-?line <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[trim]))), 
-?line <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[{parts,
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[]))), 
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[trim]))), 
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<"[thing">> = iolist_to_binary(join(re:split("[thing","^[ab\\]cde]",[]))), 
-?line <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[trim]))), 
-?line <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"\\thing">> = iolist_to_binary(join(re:split("\\thing","^[ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[{parts,
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("]thing","^[]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[{parts,
+    <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[trim]))), 
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("cthing","^[]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[{parts,
+    <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[trim]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[]))), 
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[trim]))), 
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("dthing","^[]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[{parts,
+    <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[]))), 
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[trim]))), 
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("ething","^[]cde]",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[]cde]",[]))), 
-?line <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[trim]))), 
-?line <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[{parts,
+    <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[]))), 
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[trim]))), 
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"athing">> = iolist_to_binary(join(re:split("athing","^[]cde]",[]))), 
-?line <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[trim]))), 
-?line <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[{parts,
+    <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[]))), 
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[trim]))), 
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"fthing">> = iolist_to_binary(join(re:split("fthing","^[]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("[thing","^[^ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                           2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("\\thing","^[^ab\\]cde]",[]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[trim]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                                 2}]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^ab\\]cde]",[]))), 
-?line <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[trim]))), 
-?line <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"athing">> = iolist_to_binary(join(re:split("athing","^[^ab\\]cde]",[]))), 
-?line <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[trim]))), 
-?line <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"bthing">> = iolist_to_binary(join(re:split("bthing","^[^ab\\]cde]",[]))), 
-?line <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[trim]))), 
-?line <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^ab\\]cde]",[]))), 
-?line <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[trim]))), 
-?line <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^ab\\]cde]",[]))), 
-?line <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[trim]))), 
-?line <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^ab\\]cde]",[]))), 
-?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[trim]))), 
-?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^ab\\]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("athing","^[^]cde]",[]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[trim]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":thing">> = iolist_to_binary(join(re:split("fthing","^[^]cde]",[]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[trim]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[^]cde]",[]))), 
-?line <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[trim]))), 
-?line <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"]thing">> = iolist_to_binary(join(re:split("]thing","^[^]cde]",[]))), 
-?line <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[trim]))), 
-?line <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"cthing">> = iolist_to_binary(join(re:split("cthing","^[^]cde]",[]))), 
-?line <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[trim]))), 
-?line <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"dthing">> = iolist_to_binary(join(re:split("dthing","^[^]cde]",[]))), 
-?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[trim]))), 
-?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^\\",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("","^\\",[{parts,
-                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("","^\\",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("ÿ","^ÿ",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("ÿ","^ÿ",[{parts,
-                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ÿ","^ÿ",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[{parts,
+    <<"ething">> = iolist_to_binary(join(re:split("ething","^[^]cde]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("0","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("1","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("2","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("3","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("4","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("5","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("6","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("7","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("8","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[{parts,
                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("9","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("10","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("enter","^.*nter",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("enter","^.*nter",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("enter","^.*nter",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("inter","^.*nter",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("inter","^.*nter",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("inter","^.*nter",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("uponter","^.*nter",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("uponter","^.*nter",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("uponter","^.*nter",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("100","^[0-9]+$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[{parts,
                                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[]))), 
-?line <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[trim]))), 
-?line <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[0-9]+$",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("enter","^.*nter",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("enter","^.*nter",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("enter","^.*nter",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("inter","^.*nter",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("inter","^.*nter",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("inter","^.*nter",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("uponter","^.*nter",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("uponter","^.*nter",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("uponter","^.*nter",[]))), 
+    ok.
+run1() ->
+    <<"">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("xxx0","^xxx[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("xxx1234","^xxx[0-9]+$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^xxx[0-9]+$",[]))), 
+    <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[trim]))), 
+    <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<"xxx">> = iolist_to_binary(join(re:split("xxx","^xxx[0-9]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[trim]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[{parts,
                                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x123","^.+[0-9][0-9][0-9]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[{parts,
                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xx123","^.+[0-9][0-9][0-9]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[{parts,
                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456","^.+[0-9][0-9][0-9]$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[{parts,
                                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+[0-9][0-9][0-9]$",[]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[trim]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[trim]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[{parts,
                                                                                                                                                                                                2}]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^.+[0-9][0-9][0-9]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[{parts,
+    <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[{parts,
                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x1234","^.+[0-9][0-9][0-9]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x123","^.+?[0-9][0-9][0-9]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("xx123","^.+?[0-9][0-9][0-9]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456","^.+?[0-9][0-9][0-9]$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.+?[0-9][0-9][0-9]$",[]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[trim]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                 2}]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^.+?[0-9][0-9][0-9]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[]))), 
-?line <<":abc:pqr">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
-?line <<":abc:pqr:">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<":abc:pqr:">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                   2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-?line <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
-?line <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-?line <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
-?line <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-?line <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
-?line <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("x1234","^.+?[0-9][0-9][0-9]$",[]))), 
+    <<":abc:pqr">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+    <<":abc:pqr:">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
+                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<":abc:pqr:">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
+                                                                                                                                                                                                                                                                 2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
+    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
+                                                                                                                                                                                                                                                                                             2}]))), 
+    <<"!pqr=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("!pqr=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
+    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
+                                                                                                                                                                                                                                                                                             2}]))), 
+    <<"abc!=apquxz.ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!=apquxz.ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
+    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
+                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
+    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
+    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
                                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"abc!pqr=apquxz:ixr.zzz.ac.uk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz:ixr.zzz.ac.uk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-?line <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[trim]))), 
-?line <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[{parts,
-                                                                                                                                                                                                                                                                                                       2}]))), 
-?line <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
-?line <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[trim]))), 
-?line <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-?line <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[]))), 
-?line <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[trim]))), 
-?line <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[]))), 
-?line <<":0abc">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<":0abc:">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<":0abc:">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                  trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                    {parts,
-                                                                                                                                                                                     2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless]))), 
-?line <<":fed">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless,
+    <<"abc!pqr=apquxz.ixr.zzz.ac.ukk">> = iolist_to_binary(join(re:split("abc!pqr=apquxz.ixr.zzz.ac.ukk","^([^!]+)!(.+)=apquxz\\.ixr\\.zzz\\.ac\\.uk$",[]))), 
+    <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[trim]))), 
+    <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<"Well, we need a colon: somewhere">> = iolist_to_binary(join(re:split("Well, we need a colon: somewhere",":",[]))), 
+    <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[trim]))), 
+    <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"*** Fail if we don't">> = iolist_to_binary(join(re:split("*** Fail if we don't",":",[]))), 
+    <<":0abc">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                   trim]))), 
-?line <<":fed:">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless,
+    <<":0abc:">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                     {parts,
                                                                                                                                                                                      2}]))), 
-?line <<":fed:">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless]))), 
-?line <<":E">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<":E:">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":E:">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless,
+    <<":0abc:">> = iolist_to_binary(join(re:split("0abc","([\\da-f:]+)$",[caseless]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                 trim]))), 
-?line <<"::::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless,
+    <<":abc:">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless,
                                                                                                                                                                                   {parts,
                                                                                                                                                                                    2}]))), 
-?line <<"::::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless]))), 
-?line <<":5f03:12C0::932e">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                          trim]))), 
-?line <<":5f03:12C0::932e:">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                            {parts,
-                                                                                                                                                                                                             2}]))), 
-?line <<":5f03:12C0::932e:">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless]))), 
-?line <<"fed :def">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                          trim]))), 
-?line <<"fed :def:">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                            {parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"fed :def:">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless]))), 
-?line <<"Any old stu:ff">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                      trim]))), 
-?line <<"Any old stu:ff:">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<"Any old stu:ff:">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                  trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless]))), 
-?line <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless]))), 
-?line <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless]))), 
-?line <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless]))), 
-?line <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                          trim]))), 
-?line <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless,
-                                                                                                                                                                                                            {parts,
-                                                                                                                                                                                                             2}]))), 
-?line <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless]))), 
-?line <<":1:2:3">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
-?line <<":1:2:3:">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                           2}]))), 
-?line <<":1:2:3:">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-?line <<":12:123:0">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
-?line <<":12:123:0:">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                                   2}]))), 
-?line <<":12:123:0:">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-?line <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
-?line <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
-                                                                                                                                                                                                                                                                 2}]))), 
-?line <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-?line <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
-?line <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
+    <<":abc:">> = iolist_to_binary(join(re:split("abc","([\\da-f:]+)$",[caseless]))), 
+    <<":fed">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                trim]))), 
+    <<":fed:">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                  {parts,
+                                                                                                                                                                                   2}]))), 
+    <<":fed:">> = iolist_to_binary(join(re:split("fed","([\\da-f:]+)$",[caseless]))), 
+    <<":E">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<":E:">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<":E:">> = iolist_to_binary(join(re:split("E","([\\da-f:]+)$",[caseless]))), 
+    <<":::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<"::::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<"::::">> = iolist_to_binary(join(re:split("::","([\\da-f:]+)$",[caseless]))), 
+    <<":5f03:12C0::932e">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                        trim]))), 
+    <<":5f03:12C0::932e:">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<":5f03:12C0::932e:">> = iolist_to_binary(join(re:split("5f03:12C0::932e","([\\da-f:]+)$",[caseless]))), 
+    <<"fed :def">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                        trim]))), 
+    <<"fed :def:">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                          {parts,
+                                                                                                                                                                                           2}]))), 
+    <<"fed :def:">> = iolist_to_binary(join(re:split("fed def","([\\da-f:]+)$",[caseless]))), 
+    <<"Any old stu:ff">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                    trim]))), 
+    <<"Any old stu:ff:">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"Any old stu:ff:">> = iolist_to_binary(join(re:split("Any old stuff","([\\da-f:]+)$",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\da-f:]+)$",[caseless]))), 
+    <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"0zzz">> = iolist_to_binary(join(re:split("0zzz","([\\da-f:]+)$",[caseless]))), 
+    <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"gzzz">> = iolist_to_binary(join(re:split("gzzz","([\\da-f:]+)$",[caseless]))), 
+    <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"fed ">> = iolist_to_binary(join(re:split("fed ","([\\da-f:]+)$",[caseless]))), 
+    <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                        trim]))), 
+    <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<"Any old rubbish">> = iolist_to_binary(join(re:split("Any old rubbish","([\\da-f:]+)$",[caseless]))), 
+    <<":1:2:3">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+    <<":1:2:3:">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
                                                                                                                                                                                                                                                          2}]))), 
-?line <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-?line <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
-?line <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
+    <<":1:2:3:">> = iolist_to_binary(join(re:split(".1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
+    <<":12:123:0">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+    <<":12:123:0:">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
+                                                                                                                                                                                                                                                                 2}]))), 
+    <<":12:123:0:">> = iolist_to_binary(join(re:split("A.12.123.0","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
+                                                                                                                                                                                                                                                                   2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
+    <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+    <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
                                                                                                                                                                                                                                                                2}]))), 
-?line <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
-?line <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
-?line <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                                                       2}]))), 
-?line <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-?line <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
-?line <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-?line <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
-?line <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
-                                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<":.pq-r">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<":.pq-r:">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<":.pq-r:">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<":.uk">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<":.uk:">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+    <<".1.2.3333">> = iolist_to_binary(join(re:split(".1.2.3333","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
+    <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+    <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
+                                                                                                                                                                                                                                                       2}]))), 
+    <<"1.2.3">> = iolist_to_binary(join(re:split("1.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
+    <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[trim]))), 
+    <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[{parts,
+                                                                                                                                                                                                                                                             2}]))), 
+    <<"1234.2.3">> = iolist_to_binary(join(re:split("1234.2.3","^.*\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$",[]))), 
+    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
                                                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<":.uk:">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<":.y-">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<":.y-:">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<":.y-:">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
-                                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
-?line <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1 IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
+    <<":1:non-sp1:non-sp2">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
+                                                                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<":1:non-sp1:non-sp2:">> = iolist_to_binary(join(re:split("1    IN    SOA    non-sp1    non-sp2   (","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
+                                                                                                                                                                                                                                                                                         2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
+    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[trim]))), 
+    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[{parts,
+                                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<"1IN SOA non-sp1 non-sp2(">> = iolist_to_binary(join(re:split("1IN SOA non-sp1 non-sp2(","^(\\d+)\\s+IN\\s+SOA\\s+(\\S+)\\s+(\\S+)\\s*\\(\\s*$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+                                                                                                                                                                                                                                                                                           2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+                                                                                                                                                                                                                                                                                           2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("Z.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+                                                                                                                                                                                                                                                                                           2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("2.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<":.pq-r">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<":.pq-r:">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
                                                                                                                                                                                                                                                                                                            2}]))), 
-?line <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<"::::">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<"::::">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<":0-a">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<":0-a:::">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                        2}]))), 
-?line <<":0-a:::">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<":3-b:.c">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<":3-b:.c::">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+    <<":.pq-r:">> = iolist_to_binary(join(re:split("ab-c.pq-r.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<":.uk">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<":.uk:">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+                                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<":.uk:">> = iolist_to_binary(join(re:split("sxk.zzz.ac.uk.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<":.y-">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<":.y-:">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<":.y-:">> = iolist_to_binary(join(re:split("x-.y-.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+                                                                                                                                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[trim]))), 
+    <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[{parts,
+                                                                                                                                                                                                                                                                                                         2}]))), 
+    <<"-abc.peq.">> = iolist_to_binary(join(re:split("-abc.peq.","^[a-zA-Z\\d][a-zA-Z\\d\\-]*(\\.[a-zA-Z\\d][a-zA-z\\d\\-]*)*\\.$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<"::::">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+                                                                                                                                                                                                                                                                                                                2}]))), 
+    <<"::::">> = iolist_to_binary(join(re:split("*.a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<":0-a">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<":0-a:::">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+                                                                                                                                                                                                                                                                                                                      2}]))), 
+    <<":0-a:::">> = iolist_to_binary(join(re:split("*.b0-a","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<":3-b:.c">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<":3-b:.c::">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+                                                                                                                                                                                                                                                                                                                          2}]))), 
+    <<":3-b:.c::">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<":-a:.b-c:-c">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<":-a:.b-c:-c:">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
                                                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<":3-b:.c::">> = iolist_to_binary(join(re:split("*.c3-b.c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<":-a:.b-c:-c">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<":-a:.b-c:-c:">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<":-a:.b-c:-c:">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+    <<":-a:.b-c:-c:">> = iolist_to_binary(join(re:split("*.c-a.b-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+                                                                                                                                                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+                                                                                                                                                                                                                                                                                                                2}]))), 
+    <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
                                                                                                                                                                                                                                                                                                                   2}]))), 
-?line <<"*.0">> = iolist_to_binary(join(re:split("*.0","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                    2}]))), 
-?line <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+    <<"*.a-">> = iolist_to_binary(join(re:split("*.a-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
+                                                                                                                                                                                                                                                                                                                          2}]))), 
+    <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
+    <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
                                                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<"*.a-b.c-">> = iolist_to_binary(join(re:split("*.a-b.c-","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[trim]))), 
-?line <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[{parts,
-                                                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
-?line <<":de:abd:e">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[trim]))), 
-?line <<":de:abd:e:">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<":de:abd:e:">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[]))), 
-?line <<"::abd:f">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[trim]))), 
-?line <<"::abd:f:">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<"::abd:f:">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[]))), 
-?line <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[trim]))), 
-?line <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[]))), 
-?line <<":.d">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                  trim]))), 
-?line <<":.d:">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                     2}]))), 
-?line <<":.d:">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
-?line <<":.D">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                  trim]))), 
-?line <<":.D:">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                     2}]))), 
-?line <<":.D:">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
-?line <<":.C">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                              trim]))), 
-?line <<":.C:">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless,
-                                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                                 2}]))), 
-?line <<":.C:">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-?line <<":;">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
-?line <<":;:">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-?line <<":;:">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-?line <<":; rhubarb">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
-?line <<":; rhubarb:">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                                    2}]))), 
-?line <<":; rhubarb:">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[{parts,
+    <<"*.c-a.0-c">> = iolist_to_binary(join(re:split("*.c-a.0-c","^\\*\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?(\\.[a-z]([a-z\\-\\d]*[a-z\\d]+)?)*$",[]))), 
+    <<":de:abd:e">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[trim]))), 
+    <<":de:abd:e:">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":de:abd:e:">> = iolist_to_binary(join(re:split("abde","^(?=ab(de))(abd)(e)",[]))), 
+    <<"::abd:f">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[trim]))), 
+    <<"::abd:f:">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"::abd:f:">> = iolist_to_binary(join(re:split("abdf","^(?!(ab)de|x)(abd)(f)",[]))), 
+    <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[trim]))), 
+    <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<":abcd:cd:ab:cd">> = iolist_to_binary(join(re:split("abcd","^(?=(ab(cd)))(ab)",[]))), 
+    <<":.d">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless,
+                                                                                                                                                                                                                trim]))), 
+    <<":.d:">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless,
+                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<":.d:">> = iolist_to_binary(join(re:split("a.b.c.d","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
+    <<":.D">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless,
+                                                                                                                                                                                                                trim]))), 
+    <<":.D:">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless,
+                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<":.D:">> = iolist_to_binary(join(re:split("A.B.C.D","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
+    <<":.C">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless,
+                                                                                                                                                                                                                            trim]))), 
+    <<":.C:">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless,
+                                                                                                                                                                                                                              {parts,
+                                                                                                                                                                                                                               2}]))), 
+    <<":.C:">> = iolist_to_binary(join(re:split("a.b.c.1.2.3.C","^[\\da-f](\\.[\\da-f])*$",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[{parts,
+                                                                                                                                                                                                                      2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("\"1234\"","^\\\".*\\\"\\s*(;.*)?$",[]))), 
+    <<":;">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+    <<":;:">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[{parts,
                                                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-?line <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
-?line <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[{parts,
-                                                                                                                                                                                                                                          2}]))), 
-?line <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^$",[trim]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^$",[{parts,
-                                                                                                                                                       2}]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                              trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+    <<":;:">> = iolist_to_binary(join(re:split("\"abcd\" ;","^\\\".*\\\"\\s*(;.*)?$",[]))), 
+    <<":; rhubarb">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+    <<":; rhubarb:">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[{parts,
+                                                                                                                                                                                                                                  2}]))), 
+    <<":; rhubarb:">> = iolist_to_binary(join(re:split("\"\" ; rhubarb","^\\\".*\\\"\\s*(;.*)?$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\\".*\\\"\\s*(;.*)?$",[]))), 
+    <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[trim]))), 
+    <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[{parts,
+                                                                                                                                                                                                                                        2}]))), 
+    <<"\"1234\" : things">> = iolist_to_binary(join(re:split("\"1234\" : things","^\\\".*\\\"\\s*(;.*)?$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^$",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^$",[{parts,
+                                                                                                                                                     2}]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
                                                                                                                                                                                                                                                                                               trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+    <<":">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
                                                                                                                                                                                                                                                                                                 {parts,
                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
-?line <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                    trim]))), 
-?line <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
-                                                                                                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                                                                                                       2}]))), 
-?line <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
-                                                                                                                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
-                                                                                                                                                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("ab c","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+                                                                                                                                                                                                                                                                                                            trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+                                                                                                                                                                                                                                                                                                              {parts,
+                                                                                                                                                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+                                                                                                                                                                                                                                                                                            trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+                                                                                                                                                                                                                                                                                              {parts,
+                                                                                                                                                                                                                                                                                               2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+                                                                                                                                                                                                                                                                                                  trim]))), 
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended,
+                                                                                                                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                                                                                                                     2}]))), 
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
                                                                                                                                                                                                                                                                                                         2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
-?line <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
-?line <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
-                                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                        trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                        trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                                    trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended,
-                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended]))), 
-?line <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended,
+    <<":">> = iolist_to_binary(join(re:split("ab c","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
+                                                                                                                                                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
+                                                                                                                                                                                                                                                                                                      2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[trim]))), 
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[{parts,
+                                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"ab cde">> = iolist_to_binary(join(re:split("ab cde","(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                       trim]))), 
-?line <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended,
+    <<":">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                         {parts,
                                                                                                                                                                                                          2}]))), 
-?line <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended]))), 
-?line <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended,
+    <<":">> = iolist_to_binary(join(re:split("a bcd","^   a\\ b[c ]d       $",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                       trim]))), 
-?line <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended,
+    <<":">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended,
                                                                                                                                                                                                         {parts,
                                                                                                                                                                                                          2}]))), 
-?line <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended]))), 
-?line <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[trim]))), 
-?line <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[{parts,
-                                                                                                                                                                                                                                                       2}]))), 
-?line <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[]))), 
-?line <<":bc:c:ef:f:ij:j:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[trim]))), 
-?line <<":bc:c:ef:f:ij:j:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[{parts,
-                                                                                                                                                                                                                                                                       2}]))), 
-?line <<":bc:c:ef:f:ij:j:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a+ Z0+
+    <<":">> = iolist_to_binary(join(re:split("a b d","^   a\\ b[c ]d       $",[extended]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended,
+                                                                                                                                                                                                                  trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended,
+                                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^   a\\ b[c ]d       $",[extended]))), 
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended,
+                                                                                                                                                                                                    trim]))), 
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","^   a\\ b[c ]d       $",[extended]))), 
+    <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended,
+                                                                                                                                                                                                    trim]))), 
+    <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"ab d">> = iolist_to_binary(join(re:split("ab d","^   a\\ b[c ]d       $",[extended]))), 
+    <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[trim]))), 
+    <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[{parts,
+                                                                                                                                                                                                                                                     2}]))), 
+    <<":abc:bc:c:def:ef:f:hij:ij:j:klm:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(a(b(c)))(d(e(f)))(h(i(j)))(k(l(m)))$",[]))), 
+    ok.
+run2() ->
+    <<":bc:c:ef:f:ij:j:lm:m">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[trim]))), 
+    <<":bc:c:ef:f:ij:j:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[{parts,
+                                                                                                                                                                                                                                                                     2}]))), 
+    <<":bc:c:ef:f:ij:j:lm:m:">> = iolist_to_binary(join(re:split("abcdefhijklm","^(?:a(b(c)))(?:d(e(f)))(?:h(i(j)))(?:k(l(m)))$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a+ Z0+
 ","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a+ Z0+
+    <<":">> = iolist_to_binary(join(re:split("a+ Z0+
 ","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[{parts,
                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a+ Z0+
+    <<":">> = iolist_to_binary(join(re:split("a+ Z0+
 ","^[\\w][\\W][\\s][\\S][\\d][\\D][\\b][\\n][\\c]][\\022]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("z","^a*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","^a*\\w",[{parts,
+    <<"">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split(".^$(*+)|{?,?}","^[.^$|()*+?{,}]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("z","^a*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("z","^a*\\w",[{parts,
+                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("z","^a*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("az","^a*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("az","^a*\\w",[{parts,
                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","^a*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("az","^a*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az","^a*\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("az","^a*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","^a*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^a*\\w",[{parts,
+                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^a*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aa","^a*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aa","^a*\\w",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aa","^a*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[]))), 
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[trim]))), 
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[]))), 
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[trim]))), 
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az","^a*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaz","^a*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","^a*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^a*\\w",[{parts,
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("z","^a*?\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("z","^a*?\\w",[{parts,
                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^a*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aa","^a*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","^a*\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("z","^a*?\\w",[]))), 
+    <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[trim]))), 
+    <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","^a*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[{parts,
+    <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[]))), 
+    <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[trim]))), 
+    <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w",[]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[trim]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[{parts,
+    <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","^a*?\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^a*?\\w",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^a*?\\w",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[trim]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("a+","^a*\\w",[]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[trim]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("z","^a*?\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","^a*?\\w",[{parts,
+    <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[]))), 
+    <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[trim]))), 
+    <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[]))), 
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[trim]))), 
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","^a*?\\w",[]))), 
-?line <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[trim]))), 
-?line <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[{parts,
+    <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[]))), 
+    <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[trim]))), 
+    <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[{parts,
                                                                                                                                                                      2}]))), 
-?line <<":z">> = iolist_to_binary(join(re:split("az","^a*?\\w",[]))), 
-?line <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[trim]))), 
-?line <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":aaz">> = iolist_to_binary(join(re:split("aaaz","^a*?\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","^a*?\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^a*?\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^a*?\\w",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[trim]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[{parts,
+    <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("az","^a+\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("az","^a+\\w",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("az","^a+\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[{parts,
                                                                                                                                                                      2}]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aa","^a*?\\w",[]))), 
-?line <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[trim]))), 
-?line <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":aaa">> = iolist_to_binary(join(re:split("aaaa","^a*?\\w",[]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[trim]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aa","^a+\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aa","^a+\\w",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aa","^a+\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[{parts,
                                                                                                                                                                      2}]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("a+","^a*?\\w",[]))), 
-?line <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[trim]))), 
-?line <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":a+">> = iolist_to_binary(join(re:split("aa+","^a*?\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("az","^a+\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az","^a+\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[]))), 
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[trim]))), 
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("az","^a+?\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("az","^a+?\\w",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az","^a+\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("az","^a+?\\w",[]))), 
+    <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[trim]))), 
+    <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaz","^a+\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aa","^a+\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","^a+\\w",[{parts,
+    <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","^a+\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[]))), 
+    <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[trim]))), 
+    <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^a+\\w",[]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[trim]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[{parts,
+    <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[]))), 
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[trim]))), 
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[{parts,
                                                                                                                                                                      2}]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a+\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("az","^a+?\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az","^a+?\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az","^a+?\\w",[]))), 
-?line <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[trim]))), 
-?line <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":az">> = iolist_to_binary(join(re:split("aaaz","^a+?\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","^a+?\\w",[]))), 
-?line <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[trim]))), 
-?line <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":aa">> = iolist_to_binary(join(re:split("aaaa","^a+?\\w",[]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[trim]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[{parts,
+    <<":+">> = iolist_to_binary(join(re:split("aa+","^a+?\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234567890","^\\d{8}\\w{2,}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("12345678ab","^\\d{8}\\w{2,}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[{parts,
                                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12345678__","^\\d{8}\\w{2,}",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[]))), 
-?line <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[trim]))), 
-?line <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8}\\w{2,}",[]))), 
+    <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[trim]))), 
+    <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"1234567">> = iolist_to_binary(join(re:split("1234567","^\\d{8}\\w{2,}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[]))), 
+    <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[trim]))), 
+    <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[aeiou\\d]{4,5}$",[]))), 
-?line <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[trim]))), 
-?line <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[{parts,
+    <<"123456">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[]))), 
+    <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[trim]))), 
+    <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[{parts,
                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("uoie","^[aeiou\\d]{4,5}?",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[{parts,
+    <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[trim]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[{parts,
                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^[aeiou\\d]{4,5}?",[]))), 
-?line <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[trim]))), 
-?line <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":5">> = iolist_to_binary(join(re:split("12345","^[aeiou\\d]{4,5}?",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[trim]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[{parts,
+    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[]))), 
+    <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[trim]))), 
+    <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[{parts,
                                                                                                                                                                                                2}]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaa","^[aeiou\\d]{4,5}?",[]))), 
-?line <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[trim]))), 
-?line <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[{parts,
-                                                                                                                                                                                                 2}]))), 
-?line <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[]))), 
-?line <<":abc:abc">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
-?line <<":abc:abc:">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
-                                                                                                                                                                                                                             2}]))), 
-?line <<":abc:abc:">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-?line <<":def:def">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
-?line <<":def:def:">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
-                                                                                                                                                                                                                                   2}]))), 
-?line <<":def:def:">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
-                                                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-?line <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
-?line <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
+    <<":56">> = iolist_to_binary(join(re:split("123456","^[aeiou\\d]{4,5}?",[]))), 
+    <<":abc:abc">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
+                                                                                                                                                                                                                           2}]))), 
+    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc=abcabc","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
+    <<":def:def">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+    <<":def:def:">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
+                                                                                                                                                                                                                                 2}]))), 
+    <<":def:def:">> = iolist_to_binary(join(re:split("def=defdefdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
                                                                                                                                                                                                                              2}]))), 
-?line <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[{parts,
-                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[{parts,
-                                                                                                                                                                                                                                                                                                           2}]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))), 
-?line <<":cataract:aract:ract::3">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
-?line <<":cataract:aract:ract::3:">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
-                                                                                                                                                                                                                                                                       2}]))), 
-?line <<":cataract:aract:ract::3:">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
-?line <<":catatonic:atonic:tonic::3">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
-?line <<":catatonic:atonic:tonic::3:">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
-                                                                                                                                                                                                                                                                           2}]))), 
-?line <<":catatonic:atonic:tonic::3:">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
-?line <<":caterpillar:erpillar:::3">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
-?line <<":caterpillar:erpillar:::3:">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
-                                                                                                                                                                                                                                                                                   2}]))), 
-?line <<":caterpillar:erpillar:::3:">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
-?line <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[trim]))), 
-?line <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                                    2}]))), 
-?line <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[]))), 
-?line <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
-?line <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
-?line <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
-?line <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
-?line <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
-?line <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
+    <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[trim]))), 
+    <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[{parts,
+                                                                                                                                                                                                                           2}]))), 
+    <<"abc=defdef">> = iolist_to_binary(join(re:split("abc=defdef","\\A(abc|def)=(\\1){2,3}\\Z",[]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[{parts,
+                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[trim]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[{parts,
+                                                                                                                                                                                                                                                                                                         2}]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:cd:">> = iolist_to_binary(join(re:split("abcdefghijkkkkcda2","^(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\11*(\\3\\4)\\1(?#)2$",[]))), 
+    <<":cataract:aract:ract::3">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
+    <<":cataract:aract:ract::3:">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
+                                                                                                                                                                                                                                                                     2}]))), 
+    <<":cataract:aract:ract::3:">> = iolist_to_binary(join(re:split("cataract cataract23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
+    <<":catatonic:atonic:tonic::3">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
+    <<":catatonic:atonic:tonic::3:">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
+                                                                                                                                                                                                                                                                         2}]))), 
+    <<":catatonic:atonic:tonic::3:">> = iolist_to_binary(join(re:split("catatonic catatonic23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
+    <<":caterpillar:erpillar:::3">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[trim]))), 
+    <<":caterpillar:erpillar:::3:">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[{parts,
+                                                                                                                                                                                                                                                                                 2}]))), 
+    <<":caterpillar:erpillar:::3:">> = iolist_to_binary(join(re:split("caterpillar caterpillar23","(cat(a(ract|tonic)|erpillar)) \\1()2(3)",[]))), 
+    <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[trim]))), 
+    <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[{parts,
+                                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<":abcd::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From +([^ ]+) +[a-zA-Z][a-zA-Z][a-zA-Z] +[a-zA-Z][a-zA-Z][a-zA-Z] +[0-9]?[0-9] +[0-9][0-9]:[0-9][0-9]",[]))), 
+    <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+    <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
+                                                                                                                                                                                                                                                                                                                                                            2}]))), 
+    <<":Sep ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
+    <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+    <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
+                                                                                                                                                                                                                                                                                                                                                            2}]))), 
+    <<":Sep  ::02 1997">> = iolist_to_binary(join(re:split("From abcd  Mon Sep  1 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
+                                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
+    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[trim]))), 
+    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[{parts,
+                                                                                                                                                                                                                                                                                                                                                    2}]))), 
+    <<"From abcd  Sep 01 12:33:02 1997">> = iolist_to_binary(join(re:split("From abcd  Sep 01 12:33:02 1997","^From\\s+\\S+\\s+([a-zA-Z]{3}\\s+){2}\\d{1,2}\\s+\\d\\d:\\d\\d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12
 34","^12.34",[dotall,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12
+    <<":">> = iolist_to_binary(join(re:split("12
 34","^12.34",[dotall,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12
+    <<":">> = iolist_to_binary(join(re:split("12
 34","^12.34",[dotall]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall,
-                                                                                                                                                                      trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall,
-                                                                                                                                                                        {parts,
-                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall]))), 
-?line <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[trim]))), 
-?line <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall,
+                                                                                                                                                                    trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall,
+                                                                                                                                                                      {parts,
+                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("12
34","^12.34",[dotall]))), 
+    <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[trim]))), 
+    <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[{parts,
                                                                                                                                                                                                                              2}]))), 
-?line <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[]))), 
-?line <<"foobar is :lish see?">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[trim]))), 
-?line <<"foobar is :lish see?:">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-?line <<"foobar is :lish see?:">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[]))), 
-?line <<"foobar c: etc">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
-?line <<"foobar c: etc:">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
-                                                                                                                                                                                                                                                2}]))), 
-?line <<"foobar c: etc:">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-?line <<":rel">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
-?line <<":rel:">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
+    <<"the quick :	 fox">> = iolist_to_binary(join(re:split("the quick brown	 fox","\\w+(?=\\t)",[]))), 
+    <<"foobar is :lish see?">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[trim]))), 
+    <<"foobar is :lish see?:">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[{parts,
                                                                                                                                                                                                                         2}]))), 
-?line <<":rel:">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-?line <<":rel">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
-?line <<":rel:">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
+    <<"foobar is :lish see?:">> = iolist_to_binary(join(re:split("foobar is foolish see?","foo(?!bar)(.*)",[]))), 
+    <<"foobar c: etc">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+    <<"foobar c: etc:">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
+                                                                                                                                                                                                                                              2}]))), 
+    <<"foobar c: etc:">> = iolist_to_binary(join(re:split("foobar crowbar etc","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
+    <<":rel">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+    <<":rel:">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
+                                                                                                                                                                                                                      2}]))), 
+    <<":rel:">> = iolist_to_binary(join(re:split("barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
+    <<":rel">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+    <<":rel:">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<":rel:">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
+    <<":rel">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
+    <<":rel:">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
                                                                                                                                                                                                                           2}]))), 
-?line <<":rel:">> = iolist_to_binary(join(re:split("2barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-?line <<":rel">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[trim]))), 
-?line <<":rel:">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-?line <<":rel:">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
-?line <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[trim]))), 
-?line <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))), 
-?line <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[trim]))), 
-?line <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
+    <<":rel:">> = iolist_to_binary(join(re:split("A barrel","(?:(?!foo)...|^.{0,2})bar(.*)",[]))), 
+    <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+    <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":abc:456">> = iolist_to_binary(join(re:split("abc456","^(\\D*)(?=\\d)(?!123)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))), 
+    <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+    <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"abc123">> = iolist_to_binary(join(re:split("abc123","^(\\D*)(?=\\d)(?!123)",[]))), 
+    ok.
+run3() ->
+    <<"">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
   inside)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
+    <<":">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
   inside)",[{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
+    <<":">> = iolist_to_binary(join(re:split("1234","^1234(?# test newlines
   inside)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
+    <<"">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
   ",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
+    <<":">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
   ",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
+    <<":">> = iolist_to_binary(join(re:split("1234","^1234 #comment in extended re
   ",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","#rhubarb
+    <<"">> = iolist_to_binary(join(re:split("abcd","#rhubarb
   abcd",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","#rhubarb
+    <<":">> = iolist_to_binary(join(re:split("abcd","#rhubarb
   abcd",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","#rhubarb
+    <<":">> = iolist_to_binary(join(re:split("abcd","#rhubarb
   abcd",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended,
-                                                                                                                                                                                  trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended,
-                                                                                                                                                                                    {parts,
-                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[trim]))), 
-?line <<":a:b:">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended,
+                                                                                                                                                                                trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended,
+                                                                                                                                                                                  {parts,
+                                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","^abcd#rhubarb",[extended]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[trim]))), 
+    <<":a:b:">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<":a:b:">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[trim]))), 
+    <<":a:b:">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[{parts,
                                                                                                                                                                                          2}]))), 
-?line <<":a:b:">> = iolist_to_binary(join(re:split("aaab","^(a)\\1{2,3}(.)",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[trim]))), 
-?line <<":a:b:">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[{parts,
+    <<":a:b:">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[]))), 
+    <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[trim]))), 
+    <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[{parts,
                                                                                                                                                                                            2}]))), 
-?line <<":a:b:">> = iolist_to_binary(join(re:split("aaaab","^(a)\\1{2,3}(.)",[]))), 
-?line <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[trim]))), 
-?line <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[{parts,
+    <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[]))), 
+    <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[trim]))), 
+    <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[{parts,
                                                                                                                                                                                              2}]))), 
-?line <<":a:a:b">> = iolist_to_binary(join(re:split("aaaaab","^(a)\\1{2,3}(.)",[]))), 
-?line <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[trim]))), 
-?line <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[]))), 
-?line <<"the ">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[trim]))), 
-?line <<"the :">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"the :">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[]))), 
-?line <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[trim]))), 
-?line <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[]))), 
-?line <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[trim]))), 
-?line <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[{parts,
+    <<":a:a:ab">> = iolist_to_binary(join(re:split("aaaaaab","^(a)\\1{2,3}(.)",[]))), 
+    <<"the ">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[trim]))), 
+    <<"the :">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"the :">> = iolist_to_binary(join(re:split("the abc","(?!^)abc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?!^)abc",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?!^)abc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=^)abc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=^)abc",[]))), 
+    <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[trim]))), 
+    <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"the abc">> = iolist_to_binary(join(re:split("the abc","(?=^)abc",[]))), 
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[trim]))), 
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[]))), 
+    <<":abbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[trim]))), 
+    <<":abbbbb:">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[{parts,
                                                                                                                                                                                                   2}]))), 
-?line <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*|b)",[]))), 
-?line <<":abbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[trim]))), 
-?line <<":abbbbb:">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<":abbbbb:">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[]))), 
-?line <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[trim]))), 
-?line <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[]))), 
-?line <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[trim]))), 
-?line <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[{parts,
+    <<":abbbbb:">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*|b)",[]))), 
+    <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[trim]))), 
+    <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[{parts,
                                                                                                                                                                                                     2}]))), 
-?line <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[]))), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
+    <<":a:bbbbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}?(ab*?|b)",[]))), 
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[trim]))), 
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":b:bbb">> = iolist_to_binary(join(re:split("aabbbbb","^[ab]{1,3}(ab*?|b)",[]))), 
+    <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1575,7 +1628,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
+    <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1769,7 +1822,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
+    <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -1962,7 +2015,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
+    <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2155,7 +2208,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
+    <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2349,7 +2402,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
+    <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2542,7 +2595,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
+    <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2735,7 +2788,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
+    <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -2929,7 +2982,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
+    <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3122,7 +3175,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3315,7 +3368,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3509,7 +3562,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3702,7 +3755,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -3895,7 +3948,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -4089,7 +4142,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -4282,7 +4335,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -4475,7 +4528,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -4669,7 +4722,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -4862,7 +4915,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
+    <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -5055,7 +5108,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
+    <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -5249,7 +5302,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
+    <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -5442,7 +5495,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -5635,7 +5688,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -5829,7 +5882,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -6022,7 +6075,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -6215,7 +6268,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,trim]))), 
-?line <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -6409,7 +6462,7 @@ run() ->
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended,
                                                                {parts,2}]))), 
-?line <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                          # optional leading comment
 (?:    (?:
@@ -6602,7 +6655,7 @@ run() ->
 )  (?: [\\040\\t] |  \\(
 (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*
 \\)  )*                       # optional trailing comment",[extended]))), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
+    <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -7183,7 +7236,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
+    <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -7764,7 +7817,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
+    <<"Alan Other <user.ain>">> = iolist_to_binary(join(re:split("Alan Other <user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -8345,7 +8398,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
+    <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -8926,7 +8979,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
+    <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -9507,7 +9560,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
+    <<"<user.ain>">> = iolist_to_binary(join(re:split("<user.ain>","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -10088,7 +10141,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
+    <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -10669,7 +10722,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
+    <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -11250,7 +11303,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
+    <<"user.ain">> = iolist_to_binary(join(re:split("user.ain","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -11831,7 +11884,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -12412,7 +12465,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -12993,7 +13046,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+    <<"\"A. Other\" <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("\"A. Other\" <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -13574,7 +13627,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -14155,7 +14208,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -14736,7 +14789,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
+    <<"A. Other <user.1234.ain> (a comment)">> = iolist_to_binary(join(re:split("A. Other <user.1234.ain> (a comment)","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -15317,7 +15370,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -15898,7 +15951,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -16479,7 +16532,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
+    <<"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay">> = iolist_to_binary(join(re:split("\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"-re.lay","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -17060,7 +17113,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
+    <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -17641,7 +17694,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
+    <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -18222,7 +18275,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
+    <<"A missing angle <user.where">> = iolist_to_binary(join(re:split("A missing angle <user.where","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -18803,7 +18856,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -19384,7 +19437,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -19965,7 +20018,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -20546,7 +20599,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -21127,7 +21180,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,trim]))), 
-?line <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -21708,7 +21761,7 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended,{parts,2}]))), 
-?line <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","[\\040\\t]*                    # Nab whitespace.
 (?:
 \\(                              #  (
 [^\\\\\\x80-\\xff\\n\\015()] *                             #     normal*
@@ -22289,5709 +22342,5763 @@ run() ->
 >                    #                 >
 # name and address
 )",[extended]))), 
-?line <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))), 
-?line <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[]))), 
-?line <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))), 
-?line <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[{parts,
-                                                                                                                                                                                                                                                                                2}]))), 
-?line <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[]))), 
-?line <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))), 
-?line <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[{parts,
-                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))), 
-?line <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))), 
-?line <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[{parts,
-                                                                                                                                                                                                                                                                                          2}]))), 
-?line <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[trim]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[]))), 
-?line <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[trim]))), 
-?line <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[trim]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","\\0*",[trim]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","\\0*",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","\\0*",[]))), 
-?line <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[trim]))), 
-?line <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[]))), 
-?line <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[trim]))), 
-?line <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[{parts,
+    <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))), 
+    <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[{parts,
+                                                                                                                                                                                                                                                          2}]))), 
+    <<"abcdefpqrxyz0AB">> = iolist_to_binary(join(re:split("abcdefpqrxyz0AB","abc\\0def\\00pqr\\000xyz\\0000AB",[]))), 
+    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[trim]))), 
+    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[{parts,
+                                                                                                                                                                                                                                                                              2}]))), 
+    <<"abc456 abcdefpqrxyz0ABCDE">> = iolist_to_binary(join(re:split("abc456 abcdefpqrxyz0ABCDE","abc\\0def\\00pqr\\000xyz\\0000AB",[]))), 
+    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))), 
+    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[{parts,
+                                                                                                                                                                                                                                                                    2}]))), 
+    <<"abc
efpqr0xyz00AB">> = iolist_to_binary(join(re:split("abc
efpqr0xyz00AB","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))), 
+    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[trim]))), 
+    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[{parts,
+                                                                                                                                                                                                                                                                                        2}]))), 
+    <<"abc456 abc
efpqr0xyz00ABCDE">> = iolist_to_binary(join(re:split("abc456 abc
efpqr0xyz00ABCDE","abc\\x0def\\x00pqr\\x000xyz\\x0000AB",[]))), 
+    <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[trim]))), 
+    <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"A">> = iolist_to_binary(join(re:split("A","^[\\000-\\037]",[]))), 
+    <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[trim]))), 
+    <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":B">> = iolist_to_binary(join(re:split("
B","^[\\000-\\037]",[]))), 
+    <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[trim]))), 
+    <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":C">> = iolist_to_binary(join(re:split("C","^[\\000-\\037]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("","\\0*",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("","\\0*",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"">> = iolist_to_binary(join(re:split("","\\0*",[]))), 
+    <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[trim]))), 
+    <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"The AZ">> = iolist_to_binary(join(re:split("The AZ","A\\x0{2,3}Z",[]))), 
+    <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[trim]))), 
+    <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[]))), 
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))), 
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))), 
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))), 
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))), 
+    <<":cow:bell">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[trim]))), 
+    <<":cow:bell:">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[{parts,
+                                                                                                                                                                                                     2}]))), 
+    <<":cow:bell:">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[]))), 
+    <<"::bell">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[trim]))), 
+    <<"::bell:">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[{parts,
                                                                                                                                                                                          2}]))), 
-?line <<"An AZ">> = iolist_to_binary(join(re:split("An AZ","A\\x0{2,3}Z",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","A\\x0{2,3}Z",[]))), 
-?line <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))), 
-?line <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))), 
-?line <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[trim]))), 
-?line <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"AZ">> = iolist_to_binary(join(re:split("AZ","A\\x0{2,3}Z",[]))), 
-?line <<":cow:bell">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[trim]))), 
-?line <<":cow:bell:">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[{parts,
+    <<"::bell:">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[{parts,
                                                                                                                                                                                                        2}]))), 
-?line <<":cow:bell:">> = iolist_to_binary(join(re:split("cowcowbell","^(cow|)\\1(bell)",[]))), 
-?line <<"::bell">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[trim]))), 
-?line <<"::bell:">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[{parts,
-                                                                                                                                                                                           2}]))), 
-?line <<"::bell:">> = iolist_to_binary(join(re:split("bell","^(cow|)\\1(bell)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[{parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[]))), 
-?line <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[trim]))), 
-?line <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[{parts,
-                                                                                                                                                                                                 2}]))), 
-?line <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[trim]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(cow|)\\1(bell)",[]))), 
+    <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[trim]))), 
+    <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<"cowbell">> = iolist_to_binary(join(re:split("cowbell","^(cow|)\\1(bell)",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":abc">> = iolist_to_binary(join(re:split(" abc","^\\s",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("
 abc","^\\s",[trim]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("
+    <<":abc">> = iolist_to_binary(join(re:split("
 abc","^\\s",[{parts,2}]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("
+    <<":abc">> = iolist_to_binary(join(re:split("
 abc","^\\s",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[trim]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[trim]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[{parts,
-                                                                                                                                                                           2}]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[{parts,
+    <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[{parts,
                                                                                                                                                                  2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^a	b
+    <<":abc">> = iolist_to_binary(join(re:split("
abc","^\\s",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("	abc","^\\s",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\s",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[{parts,
+                                                                                                                                                               2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^\\s",[]))), 
+    ok.
+run4() ->
+    <<"">> = iolist_to_binary(join(re:split("abc","^a	b
       c",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^a	b
+    <<":">> = iolist_to_binary(join(re:split("abc","^a	b
       c",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^a	b
+    <<":">> = iolist_to_binary(join(re:split("abc","^a	b
       c",[extended]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[{parts,
+    <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[]))), 
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[trim]))), 
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[{parts,
                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1*b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1*b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[{parts,
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[{parts,
                                                                                                                                                                          2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1*b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1*b",[]))), 
-?line <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[trim]))), 
-?line <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1*b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1+b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1+b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[{parts,
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[{parts,
                                                                                                                                                                          2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1+b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1+b",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[trim]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[{parts,
                                                                                                                                                                            2}]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1+b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[]))), 
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[trim]))), 
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[{parts,
                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","^(a|)\\1?b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aab","^(a|)\\1?b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1?b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1?b",[]))), 
-?line <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[trim]))), 
-?line <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[{parts,
+    <<"acb">> = iolist_to_binary(join(re:split("acb","^(a|)\\1?b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2}b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2}b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2}b",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[trim]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[{parts,
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[trim]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2}b",[]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[trim]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[]))), 
-?line <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[trim]))), 
-?line <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[{parts,
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2}b",[]))), 
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[trim]))), 
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2}b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[{parts,
                                                                                                                                                                                        2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaab","^(a|)\\1{2,3}b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a|)\\1{2,3}b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[{parts,
                                                                                                                                                                                  2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a|)\\1{2,3}b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a|)\\1{2,3}b",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[trim]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[{parts,
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[trim]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[{parts,
                                                                                                                                                                                    2}]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a|)\\1{2,3}b",[]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[trim]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[]))), 
-?line <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[trim]))), 
-?line <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[{parts,
-                                                                                                                                                                                           2}]))), 
-?line <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[{parts,
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a|)\\1{2,3}b",[]))), 
+    <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[trim]))), 
+    <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[{parts,
+                                                                                                                                                                                         2}]))), 
+    <<"aaaaab">> = iolist_to_binary(join(re:split("aaaaab","^(a|)\\1{2,3}b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abbbc","ab{1,3}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[]))), 
-?line <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[trim]))), 
-?line <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab{1,3}bc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{1,3}bc",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab{1,3}bc",[]))), 
+    <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[trim]))), 
+    <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[]))), 
+    <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[trim]))), 
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[{parts,
+                                                                                                                                                                                                                                                               2}]))), 
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[]))), 
+    <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless,
+                                                                                                                                                                                                                                                             trim]))), 
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless,
+                                                                                                                                                                                                                                                               {parts,
+                                                                                                                                                                                                                                                                2}]))), 
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless]))), 
+    <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless,
+                                                                                                                                                                                                                                                             trim]))), 
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless,
+                                                                                                                                                                                                                                                               {parts,
+                                                                                                                                                                                                                                                                2}]))), 
+    <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[]))), 
+    <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[trim]))), 
+    <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless,
+                                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless,
+                                                                                                                                                                                 {parts,
                                                                                                                                                                                   2}]))), 
-?line <<"abbbbbc">> = iolist_to_binary(join(re:split("abbbbbc","ab{1,3}bc",[]))), 
-?line <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[trim]))), 
-?line <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[{parts,
-                                                                                                                                                                                                                                                                 2}]))), 
-?line <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[]))), 
-?line <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless,
-                                                                                                                                                                                                                                                               trim]))), 
-?line <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless,
-                                                                                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                                                                                  2}]))), 
-?line <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[T ]+(.*)",[caseless]))), 
-?line <<":track1:title:Blah blah blah">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless,
-                                                                                                                                                                                                                                                               trim]))), 
-?line <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless,
-                                                                                                                                                                                                                                                                 {parts,
-                                                                                                                                                                                                                                                                  2}]))), 
-?line <<":track1:title:Blah blah blah:">> = iolist_to_binary(join(re:split("track1.title:TBlah blah blah","([^.]*)\\.([^:]*):[t ]+(.*)",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-c]+$",[]))), 
-?line <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[trim]))), 
-?line <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<"wxy">> = iolist_to_binary(join(re:split("wxy","^[W-c]+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless,
-                                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless,
-                                                                                                                                                                                   {parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless,
-                                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless,
-                                                                                                                                                                                   {parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless,
-                                                                                                                                                                                                   trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless,
-                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless,
-                                                                                                                                                                                                   trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless,
-                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline,
-                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline,
-                                                                                                                                                                   {parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline]))), 
-?line <<"qqq
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[W-c]+$",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless,
+                                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless,
+                                                                                                                                                                                 {parts,
+                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[W-c]+$",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless,
+                                                                                                                                                                                                 trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless,
+                                                                                                                                                                                                   {parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("WXY_^abc","^[\\x3f-\\x5F]+$",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless,
+                                                                                                                                                                                                 trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless,
+                                                                                                                                                                                                   {parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("wxy_^ABC","^[\\x3f-\\x5F]+$",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline,
+                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline,
+                                                                                                                                                                 {parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[multiline]))), 
+    <<"qqq
 ">> = iolist_to_binary(join(re:split("qqq
 abc","^abc$",[multiline,trim]))), 
-?line <<"qqq
+    <<"qqq
 :">> = iolist_to_binary(join(re:split("qqq
 abc","^abc$",[multiline,{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 :">> = iolist_to_binary(join(re:split("qqq
 abc","^abc$",[multiline]))), 
-?line <<":
+    <<":
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","^abc$",[multiline,trim]))), 
-?line <<":
+    <<":
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","^abc$",[multiline,{parts,2}]))), 
-?line <<":
+    <<":
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","^abc$",[multiline]))), 
-?line <<"qqq
+    <<"qqq
 :
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","^abc$",[multiline,trim]))), 
-?line <<"qqq
+    <<"qqq
 :
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","^abc$",[multiline,{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 :
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","^abc$",[multiline]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))), 
-?line <<"qqq
+    <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))), 
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","^abc$",[trim]))), 
-?line <<"qqq
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","^abc$",[{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","^abc$",[]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","^abc$",[trim]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","^abc$",[{parts,2}]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","^abc$",[]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","^abc$",[trim]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","^abc$",[{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","^abc$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline,
-                                                                                                                                                                                          trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline,
-                                                                                                                                                                                            {parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline]))), 
-?line <<"qqq
+    <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
+                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
+                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\Z",[multiline]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline,
+                                                                                                                                                                                        trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline,
+                                                                                                                                                                                          {parts,
+                                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\Z",[multiline]))), 
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","\\Aabc\\Z",[multiline,trim]))), 
-?line <<"qqq
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","\\Aabc\\Z",[multiline,{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","\\Aabc\\Z",[multiline]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","\\Aabc\\Z",[multiline,trim]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","\\Aabc\\Z",[multiline,{parts,2}]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","\\Aabc\\Z",[multiline]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","\\Aabc\\Z",[multiline,trim]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","\\Aabc\\Z",[multiline,{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","\\Aabc\\Z",[multiline]))), 
-?line <<":f">> = iolist_to_binary(join(re:split("abc
+    <<":f">> = iolist_to_binary(join(re:split("abc
 def","\\A(.)*\\Z",[dotall,trim]))), 
-?line <<":f:">> = iolist_to_binary(join(re:split("abc
+    <<":f:">> = iolist_to_binary(join(re:split("abc
 def","\\A(.)*\\Z",[dotall,{parts,2}]))), 
-?line <<":f:">> = iolist_to_binary(join(re:split("abc
+    <<":f:">> = iolist_to_binary(join(re:split("abc
 def","\\A(.)*\\Z",[dotall]))), 
-?line <<":s">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline,
-                                                                                                                                                                                            trim]))), 
-?line <<":s:">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline,
-                                                                                                                                                                                              {parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":s:">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline]))), 
-?line <<"abc
+    <<":s">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline,
+                                                                                                                                                                                          trim]))), 
+    <<":s:">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline,
+                                                                                                                                                                                            {parts,
+                                                                                                                                                                                             2}]))), 
+    <<":s:">> = iolist_to_binary(join(re:split("*** Failers","\\A(.)*\\Z",[multiline]))), 
+    <<"abc
 def">> = iolist_to_binary(join(re:split("abc
 def","\\A(.)*\\Z",[multiline,trim]))), 
-?line <<"abc
+    <<"abc
 def">> = iolist_to_binary(join(re:split("abc
 def","\\A(.)*\\Z",[multiline,{parts,2}]))), 
-?line <<"abc
+    <<"abc
 def">> = iolist_to_binary(join(re:split("abc
 def","\\A(.)*\\Z",[multiline]))), 
-?line <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[trim]))), 
-?line <<":::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[{parts,
+    <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[trim]))), 
+    <<":::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[]))), 
+    <<"c">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[trim]))), 
+    <<"c:b">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"c::">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("az-","[-az]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("az-","[-az]+",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("az-","[-az]+",[]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[trim]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<"::c">> = iolist_to_binary(join(re:split("b::c","(?:b)|(?::+)",[]))), 
-?line <<"c">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[trim]))), 
-?line <<"c:b">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[{parts,
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[trim]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[{parts,
+                                                                                                                                                              2}]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[]))), 
+    ok.
+run5() ->
+    <<"">> = iolist_to_binary(join(re:split("za-","[az-]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("za-","[az-]+",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("za-","[az-]+",[]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[trim]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<"c::">> = iolist_to_binary(join(re:split("c::b","(?:b)|(?::+)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("az-","[-az]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az-","[-az]+",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("az-","[-az]+",[]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[trim]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[-az]+",[]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[trim]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[-az]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("za-","[az-]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("za-","[az-]+",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("za-","[az-]+",[]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[trim]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[trim]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[trim]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[trim]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[{parts,
-                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[trim]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[{parts,
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[az-]+",[]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[trim]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[{parts,
+                                                                                                                                                              2}]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[az-]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[trim]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("a-z","[a\\-z]+",[]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[trim]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[a\\-z]+",[]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[trim]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[a\\-z]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcdxyz","[a-z]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[{parts,
                                                                                                                                                                          2}]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[]))), 
-?line <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[trim]))), 
-?line <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("12-34","[\\d-]+",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-]+",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[{parts,
                                                                                                                                                                      2}]))), 
-?line <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[]))), 
-?line <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[trim]))), 
-?line <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[{parts,
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[]))), 
-?line <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[trim]))), 
-?line <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("12-34z","[\\d-z]+",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\d-z]+",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless,
-                                                                                                                                                                             trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless,
-                                                                                                                                                                               {parts,
-                                                                                                                                                                                2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless]))), 
-?line <<":ABC">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless,
-                                                                                                                                                                             trim]))), 
-?line <<":ABC:">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless,
-                                                                                                                                                                               {parts,
-                                                                                                                                                                                2}]))), 
-?line <<":ABC:">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless,
-                                                                                                                                                                             trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless,
-                                                                                                                                                                               {parts,
-                                                                                                                                                                                2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[{parts,
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","[\\d-z]+",[]))), 
+    <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[trim]))), 
+    <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<": ">> = iolist_to_binary(join(re:split("\\ ","\\x5c",[]))), 
+    <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[trim]))), 
+    <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"the:oo">> = iolist_to_binary(join(re:split("the Zoo","\\x20Z",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\x20Z",[]))), 
+    <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[trim]))), 
+    <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<"Zulu">> = iolist_to_binary(join(re:split("Zulu","\\x20Z",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless,
+                                                                                                                                                                           trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless,
+                                                                                                                                                                             {parts,
                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","abc$",[{parts,
-                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","abc$",[{parts,
-                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))), 
-?line <<"abc
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[caseless]))), 
+    <<":ABC">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless,
+                                                                                                                                                                           trim]))), 
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless,
+                                                                                                                                                                             {parts,
+                                                                                                                                                                              2}]))), 
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCabc","(abc)\\1",[caseless]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless,
+                                                                                                                                                                           trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless,
+                                                                                                                                                                             {parts,
+                                                                                                                                                                              2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcABC","(abc)\\1",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab{3cd","ab{3cd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab{3,cd","ab{3,cd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab{3,4a}cd","ab{3,4a}cd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("{4,5a}bc","{4,5a}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[{parts,
+                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","abc$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[{parts,
+                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","abc$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))), 
+    <<"abc
 def">> = iolist_to_binary(join(re:split("abc
 def","abc$",[trim]))), 
-?line <<"abc
+    <<"abc
 def">> = iolist_to_binary(join(re:split("abc
 def","abc$",[{parts,2}]))), 
-?line <<"abc
+    <<"abc
 def">> = iolist_to_binary(join(re:split("abc
 def","abc$",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[trim]))),
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[]))),
-?line <<":abc">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[trim]))),
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[]))),
-?line <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
-?line <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[trim]))), 
-?line <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[{parts,
+    <<":abc">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[]))), 
-?line <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[trim]))), 
-?line <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[{parts,
+    <<":abc:">> = iolist_to_binary(join(re:split("abcS","(abc)\\123",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[]))), 
-?line <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[trim]))), 
-?line <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[{parts,
+    <<":abc:">> = iolist_to_binary(join(re:split("abc“","(abc)\\223",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[]))), 
-?line <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[trim]))), 
-?line <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[{parts,
+    <<":abc:">> = iolist_to_binary(join(re:split("abcÓ","(abc)\\323",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:l">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[trim]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:l:">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[{parts,
-                                                                                                                                                                                                                                                                          2}]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:l:">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k">> = iolist_to_binary(join(re:split("abcdefghijk
+    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc@","(abc)\\100",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1000",[]))), 
+    <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[trim]))), 
+    <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[]))), 
+    <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[trim]))), 
+    <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"abc81">> = iolist_to_binary(join(re:split("abc81","abc\\81",[]))), 
+    <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[trim]))), 
+    <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[]))), 
+    <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[trim]))), 
+    <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"abc91">> = iolist_to_binary(join(re:split("abc91","abc\\91",[]))), 
+    ok.
+run6() ->
+    <<":a:b:c:d:e:f:g:h:i:j:k:l">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[trim]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:l:">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[{parts,
+                                                                                                                                                                                                                                                                        2}]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k:l:">> = iolist_to_binary(join(re:split("abcdefghijkllS","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)(l)\\12\\123",[]))), 
+    <<":a:b:c:d:e:f:g:h:i:j:k">> = iolist_to_binary(join(re:split("abcdefghijk
 S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[trim]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:">> = iolist_to_binary(join(re:split("abcdefghijk
+    <<":a:b:c:d:e:f:g:h:i:j:k:">> = iolist_to_binary(join(re:split("abcdefghijk
 S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[{parts,2}]))), 
-?line <<":a:b:c:d:e:f:g:h:i:j:k:">> = iolist_to_binary(join(re:split("abcdefghijk
+    <<":a:b:c:d:e:f:g:h:i:j:k:">> = iolist_to_binary(join(re:split("abcdefghijk
 S","(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)\\12\\123",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("bc","a{0}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("bc","a{0}bc",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("bc","a{0}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[trim]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abidef","ab\\idef",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bc","a{0}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("bc","a{0}bc",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("bc","a{0}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("xyz","(a|(bc)){0,0}?xyz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[{parts,
                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("abcde","abc[\\10]de",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc
de","abc[\\1]de",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc
de","(abc)[\\1]de",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a
 b","(?s)a.b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","(?s)a.b",[{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","(?s)a.b",[]))), 
-?line <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                         2}]))), 
-?line <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+    <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
                                                                                                                                                                                                                                        2}]))), 
-?line <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+    <<":b:a:NOT:cccc:d">> = iolist_to_binary(join(re:split("baNOTccccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
                                                                                                                                                                                                                                      2}]))), 
-?line <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                 2}]))), 
-?line <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<":*:*:* Fail:ers">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<":*:*:* Fail:ers:">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                           2}]))), 
-?line <<":*:*:* Fail:ers:">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                                     2}]))), 
-?line <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
-                                                                                                                                                                                                                           2}]))), 
-?line <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
-?line <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+    <<":b:a:NOT:ccc:d">> = iolist_to_binary(join(re:split("baNOTcccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+                                                                                                                                                                                                                                   2}]))), 
+    <<":b:a:NO:Tcc:d">> = iolist_to_binary(join(re:split("baNOTccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
                                                                                                                                                                                                                                2}]))), 
-?line <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Abc","[^a]",[trim]))), 
-?line <<":bc">> = iolist_to_binary(join(re:split("Abc","[^a]",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("Abc","[^a]",[]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless,
-                                                                                                                                                              trim]))), 
-?line <<"A:c">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless,
-                                                                                                                                                                {parts,
-                                                                                                                                                                 2}]))), 
-?line <<"A::">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[trim]))), 
-?line <<":aAbc">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[]))), 
-?line <<"AAAaA">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless,
-                                                                                                                                                                        trim]))), 
-?line <<"AAAaA:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless,
-                                                                                                                                                                          {parts,
-                                                                                                                                                                           2}]))), 
-?line <<"AAAaA:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("bbb
+    <<":b:a::ccc:d">> = iolist_to_binary(join(re:split("bacccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<":*:*:* Fail:ers">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<":*:*:* Fail:ers:">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+                                                                                                                                                                                                                                         2}]))), 
+    <<":*:*:* Fail:ers:">> = iolist_to_binary(join(re:split("*** Failers","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+                                                                                                                                                                                                                                   2}]))), 
+    <<"anything">> = iolist_to_binary(join(re:split("anything","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+                                                                                                                                                                                                                         2}]))), 
+    <<"bc">> = iolist_to_binary(join(re:split("bc","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[trim]))), 
+    <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[{parts,
+                                                                                                                                                                                                                             2}]))), 
+    <<"baccd">> = iolist_to_binary(join(re:split("baccd","^([^a])([^\\b])([^c]*)([^d]{3,4})",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("Abc","[^a]",[trim]))), 
+    <<":bc">> = iolist_to_binary(join(re:split("Abc","[^a]",[{parts,
+                                                                                                                                                              2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("Abc","[^a]",[]))), 
+    <<"A">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless,
+                                                                                                                                                            trim]))), 
+    <<"A:c">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless,
+                                                                                                                                                              {parts,
+                                                                                                                                                               2}]))), 
+    <<"A::">> = iolist_to_binary(join(re:split("Abc","[^a]",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[trim]))), 
+    <<":aAbc">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[]))), 
+    <<"AAAaA">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"AAAaA:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"AAAaA:">> = iolist_to_binary(join(re:split("AAAaAbc","[^a]+",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("bbb
 ccc","[^a]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("bbb
+    <<":">> = iolist_to_binary(join(re:split("bbb
 ccc","[^a]+",[{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("bbb
+    <<":">> = iolist_to_binary(join(re:split("bbb
 ccc","[^a]+",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("abc","[^k]$",[trim]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abc","[^k]$",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abc","[^k]$",[]))), 
-?line <<"*** Failer">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[trim]))), 
-?line <<"*** Failer:">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"*** Failer:">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[]))), 
-?line <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[trim]))), 
-?line <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[]))), 
-?line <<"k">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[trim]))), 
-?line <<"k:">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"k:">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[]))), 
-?line <<"k">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[trim]))), 
-?line <<"k:">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<"k:">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[]))), 
-?line <<"*** Fail">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[trim]))), 
-?line <<"*** Fail:">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Fail:">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[]))), 
-?line <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[trim]))), 
-?line <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[]))), 
-?line <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[trim]))), 
-?line <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[]))), 
-?line <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[trim]))), 
-?line <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[{parts,
+    <<"ab">> = iolist_to_binary(join(re:split("abc","[^k]$",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","[^k]$",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","[^k]$",[]))), 
+    <<"*** Failer">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[trim]))), 
+    <<"*** Failer:">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"*** Failer:">> = iolist_to_binary(join(re:split("*** Failers","[^k]$",[]))), 
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[trim]))), 
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","[^k]{2,3}$",[]))), 
+    <<"k">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[trim]))), 
+    <<"k:">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"k:">> = iolist_to_binary(join(re:split("kbc","[^k]{2,3}$",[]))), 
+    <<"k">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[trim]))), 
+    <<"k:">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[]))), 
-?line <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))), 
-?line <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-?line <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[]))), 
-?line <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[trim]))), 
-?line <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[]))), 
-?line <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[trim]))), 
-?line <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[]))), 
-?line <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))), 
-?line <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[{parts,
+    <<"k:">> = iolist_to_binary(join(re:split("kabc","[^k]{2,3}$",[]))), 
+    <<"*** Fail">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[trim]))), 
+    <<"*** Fail:">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"*** Fail:">> = iolist_to_binary(join(re:split("*** Failers","[^k]{2,3}$",[]))), 
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[trim]))), 
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"abk">> = iolist_to_binary(join(re:split("abk","[^k]{2,3}$",[]))), 
+    <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[trim]))), 
+    <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"akb">> = iolist_to_binary(join(re:split("akb","[^k]{2,3}$",[]))), 
+    <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[trim]))), 
+    <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"akk">> = iolist_to_binary(join(re:split("akk","[^k]{2,3}$",[]))), 
+    <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))), 
+    <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[{parts,
                                                                                                                                                                                                                        2}]))), 
-?line <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[{parts,
+    <<"12345678.b.c.d">> = iolist_to_binary(join(re:split("12345678.b.c.d","^\\d{8,}\\@.+[^k]$",[]))), 
+    <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[trim]))), 
+    <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[{parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"123456789.y.z">> = iolist_to_binary(join(re:split("123456789.y.z","^\\d{8,}\\@.+[^k]$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\d{8,}\\@.+[^k]$",[]))), 
+    <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[trim]))), 
+    <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[{parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"12345678.y.uk">> = iolist_to_binary(join(re:split("12345678.y.uk","^\\d{8,}\\@.+[^k]$",[]))), 
+    <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[trim]))), 
+    <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[{parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"1234567.b.c.d">> = iolist_to_binary(join(re:split("1234567.b.c.d","^\\d{8,}\\@.+[^k]$",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[{parts,
                                                                                                                                                                                          2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaa","(a)\\1{8,}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[{parts,
                                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","(a)\\1{8,}",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[]))), 
-?line <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[trim]))), 
-?line <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[]))), 
-?line <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[trim]))), 
-?line <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a)\\1{8,}",[]))), 
+    <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[trim]))), 
+    <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"aaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaa","(a)\\1{8,}",[]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[trim]))), 
+    <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[]))), 
+    <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[trim]))), 
+    <<"aa:abcd">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[]))), 
+    ok.
+run7() ->
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless,
+                                                                                                                                                                    trim]))), 
+    <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless,
+                                                                                                                                                                      {parts,
+                                                                                                                                                                       2}]))), 
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless]))), 
+    <<"aaAa">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless,
+                                                                                                                                                                    trim]))), 
+    <<"aaAa:cd">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless,
+                                                                                                                                                                      {parts,
+                                                                                                                                                                       2}]))), 
+    <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[trim]))), 
+    <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[]))), 
-?line <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[trim]))), 
-?line <<"aa:abcd">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[{parts,
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[]))), 
+    <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[trim]))), 
+    <<"aa:abcd">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[]))), 
-?line <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless,
+    <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless,
                                                                                                                                                                       trim]))), 
-?line <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless,
+    <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless,
                                                                                                                                                                         {parts,
                                                                                                                                                                          2}]))), 
-?line <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^a]",[caseless]))), 
-?line <<"aaAa">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless,
+    <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless]))), 
+    <<"aaAa">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless,
                                                                                                                                                                       trim]))), 
-?line <<"aaAa:cd">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless,
+    <<"aaAa:cd">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless,
                                                                                                                                                                         {parts,
                                                                                                                                                                          2}]))), 
-?line <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^a]",[caseless]))), 
-?line <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[trim]))), 
-?line <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[]))), 
-?line <<"aa:a">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[trim]))), 
-?line <<"aa:abcd">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"aa:a:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[]))), 
-?line <<"aaaa">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless,
-                                                                                                                                                                        trim]))), 
-?line <<"aaaa:cd">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless,
-                                                                                                                                                                          {parts,
-                                                                                                                                                                           2}]))), 
-?line <<"aaaa:::">> = iolist_to_binary(join(re:split("aaaabcd","[^az]",[caseless]))), 
-?line <<"aaAa">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless,
-                                                                                                                                                                        trim]))), 
-?line <<"aaAa:cd">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless,
-                                                                                                                                                                          {parts,
-                                                                                                                                                                           2}]))), 
-?line <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless]))), 
-?line <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[trim]))), 
-?line <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[]))), 
-?line <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[trim]))), 
-?line <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[{parts,
+    <<"aaAa:::">> = iolist_to_binary(join(re:split("aaAabcd","[^az]",[caseless]))), 
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[trim]))), 
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[{parts,
                                                                                                                                                                                                                                                           2}]))), 
-?line <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[]))), 
-?line <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
-?line <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[]))), 
-?line <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
-?line <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[]))), 
-?line <<"1:.23">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
-?line <<"1:.23:">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<"1:.23:">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[]))), 
-?line <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
-?line <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                                       2}]))), 
-?line <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-?line <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
-?line <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                                       2}]))), 
-?line <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-?line <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
-?line <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
-                                                                                                                                                                                                                           2}]))), 
-?line <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","a(?)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","a(?)b",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","a(?)b",[]))), 
-?line <<"Food is on the :foo:table">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless,
-                                                                                                                                                                                                                                       trim]))), 
-?line <<"Food is on the :foo:table:">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless,
-                                                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                                                          2}]))), 
-?line <<"Food is on the :foo:table:">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless]))), 
-?line <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[trim]))), 
-?line <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[{parts,
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,6}?LL",[]))), 
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[trim]))), 
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[{parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<"xxxxxxxxxxx:xxxxxxxxx">> = iolist_to_binary(join(re:split("xxxxxxxxxxxPSTAIREISLLxxxxxxxxx","P[^*]TAIRE[^*]{1,}?LL",[]))), 
+    <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d[1-9]?)\\d+",[]))), 
+    <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
+    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d[1-9]?)\\d+",[]))), 
+    <<"1:.23">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[trim]))), 
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d[1-9]?)\\d+",[]))), 
+    <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+    <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
+                                                                                                                                                                                                                                     2}]))), 
+    <<"1:.23::0003938">> = iolist_to_binary(join(re:split("1.230003938","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
+    <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+    <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
+                                                                                                                                                                                                                                     2}]))), 
+    <<"1:.875:5:000282">> = iolist_to_binary(join(re:split("1.875000282","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
+                                                                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[trim]))), 
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[{parts,
+                                                                                                                                                                                                                         2}]))), 
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(\\.\\d\\d((?=0)|\\d(?=\\d)))",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","a(?)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","a(?)b",[{parts,
+                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","a(?)b",[]))), 
+    <<"Food is on the :foo:table">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless,
+                                                                                                                                                                                                                                     trim]))), 
+    <<"Food is on the :foo:table:">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless,
+                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                        2}]))), 
+    <<"Food is on the :foo:table:">> = iolist_to_binary(join(re:split("Food is on the foo table","\\b(foo)\\s+(\\w+)",[caseless]))), 
+    <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[trim]))), 
+    <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[{parts,
+                                                                                                                                                                                                                                                2}]))), 
+    <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[]))), 
+    <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[trim]))), 
+    <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[{parts,
                                                                                                                                                                                                                                                   2}]))), 
-?line <<"The :d is under the bar in the :n.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*)bar",[]))), 
-?line <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[trim]))), 
-?line <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[{parts,
-                                                                                                                                                                                                                                                    2}]))), 
-?line <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[]))), 
-?line <<":I have 2 numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[trim]))), 
-?line <<":I have 2 numbers: 53147::">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[{parts,
+    <<"The :d is under the : in the barn.">> = iolist_to_binary(join(re:split("The food is under the bar in the barn.","foo(.*?)bar",[]))), 
+    <<":I have 2 numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[trim]))), 
+    <<":I have 2 numbers: 53147::">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<":I have 2 numbers: 53147::">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[]))), 
+    <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[trim]))), 
+    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[]))), 
+    <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[trim]))), 
+    <<":I:: have 2 numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[{parts,
                                                                                                                                                                                                                      2}]))), 
-?line <<":I have 2 numbers: 53147::">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d*)",[]))), 
-?line <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[trim]))), 
-?line <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[{parts,
+    <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[]))), 
+    <<":I have :2:: numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[trim]))), 
+    <<":I have :2: numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[{parts,
                                                                                                                                                                                                                      2}]))), 
-?line <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)",[]))), 
-?line <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[trim]))), 
-?line <<":I:: have 2 numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<":I::: :::h:::a:::v:::e::: :2:: :::n:::u:::m:::b:::e:::r:::s::::::: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d*)",[]))), 
-?line <<":I have :2:: numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[trim]))), 
-?line <<":I have :2: numbers: 53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<":I have :2:: numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[]))), 
-?line <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[trim]))), 
-?line <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[{parts,
+    <<":I have :2:: numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)",[]))), 
+    <<":I have 2 numbers: 5314:7">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[trim]))), 
+    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[{parts,
+                                                                                                                                                                                                                      2}]))), 
+    <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[]))), 
+    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[trim]))), 
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[{parts,
                                                                                                                                                                                                                         2}]))), 
-?line <<":I have 2 numbers: 5314:7:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)(\\d+)$",[]))), 
-?line <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[trim]))), 
-?line <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-?line <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[]))), 
-?line <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[trim]))), 
-?line <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[{parts,
-                                                                                                                                                                                                                               2}]))), 
-?line <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[]))), 
-?line <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[trim]))), 
-?line <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[{parts,
-                                                                                                                                                                                                                               2}]))), 
-?line <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[]))), 
-?line <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[trim]))), 
-?line <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[]))), 
-?line <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[trim]))), 
-?line <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))), 
-?line <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[trim]))), 
-?line <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[]))), 
-?line <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[trim]))), 
-?line <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[]))), 
-?line <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[trim]))), 
-?line <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[]))), 
-?line <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[trim]))), 
-?line <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[]))), 
-?line <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[trim]))), 
-?line <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[]))), 
-?line <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[trim]))), 
-?line <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[]))), 
-?line <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[trim]))), 
-?line <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[{parts,
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*?)(\\d+)$",[]))), 
+    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[trim]))), 
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[{parts,
+                                                                                                                                                                                                                             2}]))), 
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*)\\b(\\d+)$",[]))), 
+    <<":I have 2 numbers: :53147">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[trim]))), 
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[{parts,
+                                                                                                                                                                                                                             2}]))), 
+    <<":I have 2 numbers: :53147:">> = iolist_to_binary(join(re:split("I have 2 numbers: 53147","(.*\\D)(\\d+)$",[]))), 
+    ok.
+run8() ->
+    <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[trim]))), 
+    <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":C123">> = iolist_to_binary(join(re:split("ABC123","^\\D*(?!123)",[]))), 
+    <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+    <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":ABC:445">> = iolist_to_binary(join(re:split("ABC445","^(\\D*)(?=\\d)(?!123)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\D*)(?=\\d)(?!123)",[]))), 
+    <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[trim]))), 
+    <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"ABC123">> = iolist_to_binary(join(re:split("ABC123","^(\\D*)(?=\\d)(?!123)",[]))), 
+    <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[trim]))), 
+    <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[]))), 
-?line <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[trim]))), 
-?line <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[{parts,
+    <<":789">> = iolist_to_binary(join(re:split("W46]789","^[W-]46]",[]))), 
+    <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[trim]))), 
+    <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[]))), 
-?line <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[trim]))), 
-?line <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[]))), 
-?line <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[trim]))), 
-?line <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[{parts,
+    <<":789">> = iolist_to_binary(join(re:split("-46]789","^[W-]46]",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-]46]",[]))), 
+    <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[trim]))), 
+    <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"Wall">> = iolist_to_binary(join(re:split("Wall","^[W-]46]",[]))), 
+    <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[trim]))), 
+    <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"Zebra">> = iolist_to_binary(join(re:split("Zebra","^[W-]46]",[]))), 
+    <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[trim]))), 
+    <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"42">> = iolist_to_binary(join(re:split("42","^[W-]46]",[]))), 
+    <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[trim]))), 
+    <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"[abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-]46]",[]))), 
+    <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[trim]))), 
+    <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"]abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-]46]",[]))), 
+    <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[trim]))), 
+    <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":46]789">> = iolist_to_binary(join(re:split("W46]789","^[W-\\]46]",[]))), 
+    <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[trim]))), 
+    <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[]))), 
+    <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[trim]))), 
+    <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":all">> = iolist_to_binary(join(re:split("Wall","^[W-\\]46]",[]))), 
-?line <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[trim]))), 
-?line <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[{parts,
+    <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[]))), 
+    <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[trim]))), 
+    <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[]))), 
+    <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[trim]))), 
+    <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[]))), 
+    <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[trim]))), 
+    <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[{parts,
                                                                                                                                                                                  2}]))), 
-?line <<":ebra">> = iolist_to_binary(join(re:split("Zebra","^[W-\\]46]",[]))), 
-?line <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[trim]))), 
-?line <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<":ylophone">> = iolist_to_binary(join(re:split("Xylophone","^[W-\\]46]",[]))), 
-?line <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[trim]))), 
-?line <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[{parts,
-                                                                                                                                                                           2}]))), 
-?line <<":2">> = iolist_to_binary(join(re:split("42","^[W-\\]46]",[]))), 
-?line <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[trim]))), 
-?line <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[]))), 
-?line <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[trim]))), 
-?line <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[]))), 
-?line <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[trim]))), 
-?line <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[{parts,
+    <<":abcd]">> = iolist_to_binary(join(re:split("[abcd]","^[W-\\]46]",[]))), 
+    <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[trim]))), 
+    <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":abcd[">> = iolist_to_binary(join(re:split("]abcd[","^[W-\\]46]",[]))), 
+    <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[trim]))), 
+    <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[{parts,
                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[]))), 
-?line <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[trim]))), 
-?line <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[]))), 
-?line <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[trim]))), 
-?line <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                            2}]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[trim]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    2}]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[trim]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[]))), 
-?line <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[trim]))), 
-?line <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[{parts,
+    <<":backslash">> = iolist_to_binary(join(re:split("\\backslash","^[W-\\]46]",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[W-\\]46]",[]))), 
+    <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[trim]))), 
+    <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"-46]789">> = iolist_to_binary(join(re:split("-46]789","^[W-\\]46]",[]))), 
+    <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[trim]))), 
+    <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<"well">> = iolist_to_binary(join(re:split("well","^[W-\\]46]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[{parts,
+                                                                                                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[trim]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[{parts,
+                                                                                                                                                                                                                                                                                                                                                          2}]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?:[a-zA-Z0-9]+ ){0,10}otherword",[]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[trim]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[{parts,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?:[a-zA-Z0-9]+ ){0,300}otherword",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[{parts,
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,0}",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[{parts,
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(a){0,0}",[]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[trim]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[{parts,
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^(a){0,0}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[]))), 
-?line <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[trim]))), 
-?line <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[trim]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[{parts,
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,1}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[trim]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[{parts,
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,1}",[]))), 
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[trim]))), 
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[{parts,
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){0,1}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[{parts,
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,2}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[]))), 
-?line <<"borfle
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,2}",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,2}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,3}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,3}",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,3}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,3}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){0,}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){0,}",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){0,}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){0,}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){0,}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,1}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,1}",[]))), 
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[trim]))), 
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:ab">> = iolist_to_binary(join(re:split("aab","^(a){1,1}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,2}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,2}",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,2}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,3}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,3}",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,3}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,3}",[]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[trim]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"bcd">> = iolist_to_binary(join(re:split("bcd","^(a){1,}",[]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[trim]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:bc">> = iolist_to_binary(join(re:split("abc","^(a){1,}",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("aab","^(a){1,}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaa","^(a){1,}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a){1,}",[]))), 
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[trim]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[{parts,2}]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".{0,}\\.gif",[trim]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".{0,}\\.gif",[{parts,2}]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".{0,}\\.gif",[]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[multiline,trim]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[multiline,{parts,2}]))), 
-?line <<"borfle
+    <<"borfle
 :
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[multiline]))), 
-?line <<":
+    <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[dotall,trim]))), 
-?line <<":
+    <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[dotall,{parts,2}]))), 
-?line <<":
+    <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[dotall]))), 
-?line <<":
+    ok.
+run9() ->
+    <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[multiline,dotall,trim]))), 
-?line <<":
+    <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[multiline,dotall,{parts,2}]))), 
-?line <<":
+    <<":
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*\\.gif",[multiline,dotall]))), 
-?line <<"borfle
+    <<"borfle
 bib.gif
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[trim]))), 
-?line <<"borfle
+    <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[{parts,2}]))), 
-?line <<"borfle
+    <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[]))), 
-?line <<":
+    <<":
 :
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,trim]))), 
-?line <<":
+    <<":
 bib.gif
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,{parts,2}]))), 
-?line <<":
+    <<":
 :
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline]))), 
-?line <<"">> = iolist_to_binary(join(re:split("borfle
+    <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[dotall,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[dotall,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[dotall]))), 
-?line <<"">> = iolist_to_binary(join(re:split("borfle
+    <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,dotall,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,dotall,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,dotall]))), 
-?line <<"borfle
+    <<"borfle
 bib.gif
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[trim]))), 
-?line <<"borfle
+    <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[{parts,2}]))), 
-?line <<"borfle
+    <<"borfle
 bib.gif
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[]))), 
-?line <<":
+    <<":
 :
 ">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,trim]))), 
-?line <<":
+    <<":
 bib.gif
 no">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,{parts,2}]))), 
-?line <<":
+    <<":
 :
 :">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline]))), 
-?line <<"">> = iolist_to_binary(join(re:split("borfle
+    <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[dotall,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[dotall,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[dotall]))), 
-?line <<"">> = iolist_to_binary(join(re:split("borfle
+    <<"">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,dotall,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,dotall,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("borfle
+    <<":">> = iolist_to_binary(join(re:split("borfle
 bib.gif
 no",".*$",[multiline,dotall]))), 
-?line <<"abcde
+    <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[trim]))), 
-?line <<"abcde
+    <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[trim]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[]))), 
-?line <<"abcde
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[trim]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[]))), 
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[trim]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[]))), 
-?line <<"abcde
+    <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[multiline,trim]))), 
-?line <<"abcde
+    <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[multiline,{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 :1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[multiline]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
-                                                                                                                                                                            trim]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
-                                                                                                                                                                              {parts,
-                                                                                                                                                                               2}]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline]))), 
-?line <<"abcde
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
+                                                                                                                                                                          trim]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline]))), 
+    <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[multiline,trim]))), 
-?line <<"abcde
+    <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[multiline,{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[multiline]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[dotall,trim]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[dotall,{parts,2}]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[dotall]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall,
-                                                                                                                                                                            trim]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall,
-                                                                                                                                                                              {parts,
-                                                                                                                                                                               2}]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall,
-                                                                                                                                                                                      trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall,
-                                                                                                                                                                                        {parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall]))), 
-?line <<"abcde
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall,
+                                                                                                                                                                          trim]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[dotall]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall,
+                                                                                                                                                                                    trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall,
+                                                                                                                                                                                      {parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(.*X|^B)",[dotall]))), 
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[dotall,trim]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[dotall,{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[dotall]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[multiline,dotall,trim]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[multiline,dotall,{parts,2}]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(.*X|^B)",[multiline,dotall]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
+                                                                                                                                                                           dotall,
+                                                                                                                                                                           trim]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
                                                                                                                                                                              dotall,
-                                                                                                                                                                             trim]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
-                                                                                                                                                                               dotall,
-                                                                                                                                                                               {parts,
-                                                                                                                                                                                2}]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
-                                                                                                                                                                                dotall]))), 
-?line <<"abcde
+                                                                                                                                                                             {parts,
+                                                                                                                                                                              2}]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(.*X|^B)",[multiline,
+                                                                                                                                                                              dotall]))), 
+    <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[multiline,dotall,trim]))), 
-?line <<"abcde
+    <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[multiline,dotall,{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 :B:ar">> = iolist_to_binary(join(re:split("abcde
 Bar","(.*X|^B)",[multiline,dotall]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(?s)(.*X|^B)",[trim]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(?s)(.*X|^B)",[{parts,2}]))), 
-?line <<":abcde
+    <<":abcde
 1234X:yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(?s)(.*X|^B)",[]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[trim]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[]))), 
-?line <<"abcde
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[trim]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":B:arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s)(.*X|^B)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s)(.*X|^B)",[]))), 
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(?s)(.*X|^B)",[trim]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(?s)(.*X|^B)",[{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(?s)(.*X|^B)",[]))), 
-?line <<":yz">> = iolist_to_binary(join(re:split("abcde
+    <<":yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(?s:.*X|^B)",[trim]))), 
-?line <<":yz">> = iolist_to_binary(join(re:split("abcde
+    <<":yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(?s:.*X|^B)",[{parts,2}]))), 
-?line <<":yz">> = iolist_to_binary(join(re:split("abcde
+    <<":yz">> = iolist_to_binary(join(re:split("abcde
 1234Xyz","(?s:.*X|^B)",[]))), 
-?line <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[trim]))), 
-?line <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[]))), 
-?line <<"abcde
+    <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[trim]))), 
+    <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":arFoo">> = iolist_to_binary(join(re:split("BarFoo","(?s:.*X|^B)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s:.*X|^B)",[]))), 
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(?s:.*X|^B)",[trim]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(?s:.*X|^B)",[{parts,2}]))), 
-?line <<"abcde
+    <<"abcde
 Bar">> = iolist_to_binary(join(re:split("abcde
 Bar","(?s:.*X|^B)",[]))), 
-?line <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[trim]))), 
-?line <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[]))), 
-?line <<"abc
+    <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[trim]))), 
+    <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"**** Failers">> = iolist_to_binary(join(re:split("**** Failers","^.*B",[]))), 
+    <<"abc
 B">> = iolist_to_binary(join(re:split("abc
 B","^.*B",[trim]))), 
-?line <<"abc
+    <<"abc
 B">> = iolist_to_binary(join(re:split("abc
 B","^.*B",[{parts,2}]))), 
-?line <<"abc
+    <<"abc
 B">> = iolist_to_binary(join(re:split("abc
 B","^.*B",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc
+    <<"">> = iolist_to_binary(join(re:split("abc
 B","(?s)^.*B",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc
+    <<":">> = iolist_to_binary(join(re:split("abc
 B","(?s)^.*B",[{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc
+    <<":">> = iolist_to_binary(join(re:split("abc
 B","(?s)^.*B",[]))), 
-?line <<"abc
+    <<"abc
 ">> = iolist_to_binary(join(re:split("abc
 B","(?m)^.*B",[trim]))), 
-?line <<"abc
+    <<"abc
 :">> = iolist_to_binary(join(re:split("abc
 B","(?m)^.*B",[{parts,2}]))), 
-?line <<"abc
+    <<"abc
 :">> = iolist_to_binary(join(re:split("abc
 B","(?m)^.*B",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc
+    <<"">> = iolist_to_binary(join(re:split("abc
 B","(?ms)^.*B",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc
+    <<":">> = iolist_to_binary(join(re:split("abc
 B","(?ms)^.*B",[{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc
+    <<":">> = iolist_to_binary(join(re:split("abc
 B","(?ms)^.*B",[]))), 
-?line <<"abc
+    <<"abc
 ">> = iolist_to_binary(join(re:split("abc
 B","(?ms)^B",[trim]))), 
-?line <<"abc
+    <<"abc
 :">> = iolist_to_binary(join(re:split("abc
 B","(?ms)^B",[{parts,2}]))), 
-?line <<"abc
+    <<"abc
 :">> = iolist_to_binary(join(re:split("abc
 B","(?ms)^B",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("B","(?s)B$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("B","(?s)B$",[{parts,
-                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("B","(?s)B$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[{parts,
-                                                                                                                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[{parts,
-                                                                                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[{parts,
-                                                                                                                                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[trim]))), 
-?line <<":c:">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<":c:">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
-                                                                                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
-?line <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
-?line <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-?line <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[{parts,
+    ok.
+run10() ->
+    <<"">> = iolist_to_binary(join(re:split("B","(?s)B$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("B","(?s)B$",[{parts,
+                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("B","(?s)B$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[{parts,
+                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[{parts,
+                                                                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[{parts,
+                                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("123456654321","^[\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d][\\d]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[]))), 
-?line <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[trim]))), 
-?line <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[abc]{12}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcabcabcabc","^[a-c]{12}",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[trim]))), 
+    <<":c:">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[]))), 
-?line <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[trim]))), 
-?line <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[{parts,
+    <<":c:">> = iolist_to_binary(join(re:split("abcabcabcabc","^(a|b|c){12}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("n","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
+                                                                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
+    <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[trim]))), 
+    <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"z">> = iolist_to_binary(join(re:split("z","^[abcdefghijklmnopqrstuvwxy0123456789]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","abcde{0,0}",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abcde{0,0}",[]))), 
+    <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[trim]))), 
+    <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"abce">> = iolist_to_binary(join(re:split("abce","abcde{0,0}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abe","ab[cd]{0,0}e",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[]))), 
-?line <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[trim]))), 
-?line <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a(b*)",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","a(b*)",[{parts,
-                                                                                                                                                              2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","a(b*)",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("ab","a(b*)",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","a(b*)",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","a(b*)",[]))), 
-?line <<":bbbb">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[trim]))), 
-?line <<":bbbb:">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":bbbb:">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[]))), 
-?line <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[trim]))), 
-?line <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab[cd]{0,0}e",[]))), 
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[trim]))), 
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[]))), 
-?line <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[trim]))), 
-?line <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[{parts,
-                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[{parts,
-                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[]))), 
-?line <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[trim]))), 
-?line <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[]))), 
-?line <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[trim]))), 
-?line <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[{parts,
-                                                                                                                                                                                                                                                         2}]))), 
-?line <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[]))), 
-?line <<": brown fox">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[trim]))), 
-?line <<": brown fox:">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[{parts,
-                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<": brown fox:">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[]))), 
-?line <<"a:b:c">> = iolist_to_binary(join(re:split("abc","",[trim]))), 
-?line <<"a:bc">> = iolist_to_binary(join(re:split("abc","",[{parts,
-                                                                                                                                                        2}]))), 
-?line <<"a:b:c:">> = iolist_to_binary(join(re:split("abc","",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("acb","a[^a]b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[{parts,
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","ab[cd]{0,0}e",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abd","ab(c){0,0}d",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab(c){0,0}d",[]))), 
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[trim]))), 
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"abcd">> = iolist_to_binary(join(re:split("abcd","ab(c){0,0}d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a(b*)",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","a(b*)",[{parts,
+                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","a(b*)",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("ab","a(b*)",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","a(b*)",[{parts,
+                                                                                                                                                              2}]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","a(b*)",[]))), 
+    <<":bbbb">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[trim]))), 
+    <<":bbbb:">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":bbbb:">> = iolist_to_binary(join(re:split("abbbb","a(b*)",[]))), 
+    <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[trim]))), 
+    <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"*** F::ilers">> = iolist_to_binary(join(re:split("*** Failers","a(b*)",[]))), 
+    <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[trim]))), 
+    <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a
+    <<"bbbbb">> = iolist_to_binary(join(re:split("bbbbb","a(b*)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abe","ab\\d{0}e",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[{parts,
+                                                                                                                                                                                         2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab\\d{0}e",[]))), 
+    <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[trim]))), 
+    <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"ab1e">> = iolist_to_binary(join(re:split("ab1e","ab\\d{0}e",[]))), 
+    <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[trim]))), 
+    <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[{parts,
+                                                                                                                                                                                                                                                       2}]))), 
+    <<"the :quick: brown fox">> = iolist_to_binary(join(re:split("the \"quick\" brown fox","\"([^\\\\\"]+|\\\\.)*\"",[]))), 
+    <<": brown fox">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[trim]))), 
+    <<": brown fox:">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[{parts,
+                                                                                                                                                                                                                                                                               2}]))), 
+    <<": brown fox:">> = iolist_to_binary(join(re:split("\"the \\\"quick\\\" brown fox\"","\"([^\\\\\"]+|\\\\.)*\"",[]))), 
+    <<"a:b:c">> = iolist_to_binary(join(re:split("abc","",[trim]))), 
+    <<"a:bc">> = iolist_to_binary(join(re:split("abc","",[{parts,
+                                                                                                                                                      2}]))), 
+    <<"a:b:c:">> = iolist_to_binary(join(re:split("abc","",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("acb","a[^a]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a
 b","a[^a]b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","a[^a]b",[{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","a[^a]b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("acb","a.b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a.b",[{parts,
-                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a.b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[]))), 
-?line <<"a
+    <<"">> = iolist_to_binary(join(re:split("acb","a.b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[{parts,
+                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.b",[]))), 
+    <<"a
 b">> = iolist_to_binary(join(re:split("a
 b","a.b",[trim]))), 
-?line <<"a
+    <<"a
 b">> = iolist_to_binary(join(re:split("a
 b","a.b",[{parts,2}]))), 
-?line <<"a
+    <<"a
 b">> = iolist_to_binary(join(re:split("a
 b","a.b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall,
-                                                                                                                                                                  trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a
+    <<"">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall,
+                                                                                                                                                                trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a[^a]b",[dotall]))), 
+    <<"">> = iolist_to_binary(join(re:split("a
 b","a[^a]b",[dotall,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","a[^a]b",[dotall,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","a[^a]b",[dotall]))), 
-?line <<"">> = iolist_to_binary(join(re:split("acb","a.b",[dotall,
-                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a.b",[dotall,
-                                                                                                                                                              {parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("acb","a.b",[dotall]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a
+    <<"">> = iolist_to_binary(join(re:split("acb","a.b",[dotall,
+                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[dotall,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("acb","a.b",[dotall]))), 
+    <<"">> = iolist_to_binary(join(re:split("a
 b","a.b",[dotall,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","a.b",[dotall,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a
+    <<":">> = iolist_to_binary(join(re:split("a
 b","a.b",[dotall]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[{parts,
+    ok.
+run11() ->
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+?|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[{parts,
                                                                                                                                                                                     2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bac","^(b+|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbac","^(b+|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[{parts,
                                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbac","^(b+|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbac","^(b+|a){1,2}?c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[]))), 
-?line <<"x
+    <<":a:">> = iolist_to_binary(join(re:split("bbbbbac","^(b+|a){1,2}?c",[]))), 
+    <<"x
 b">> = iolist_to_binary(join(re:split("x
 b","(?!\\A)x",[multiline,trim]))), 
-?line <<"x
+    <<"x
 b">> = iolist_to_binary(join(re:split("x
 b","(?!\\A)x",[multiline,{parts,2}]))), 
-?line <<"x
+    <<"x
 b">> = iolist_to_binary(join(re:split("x
 b","(?!\\A)x",[multiline]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline,
-                                                                                                                                                                       trim]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline,
-                                                                                                                                                                         {parts,
-                                                                                                                                                                          2}]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline]))), 
-?line <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[trim]))), 
-?line <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[{parts,
+    <<"a">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline,
+                                                                                                                                                                     trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline,
+                                                                                                                                                                       {parts,
                                                                                                                                                                         2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[{parts,
+    <<"a:">> = iolist_to_binary(join(re:split("ax","(?!\\A)x",[multiline]))), 
+    <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[trim]))), 
+    <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"{ab}">> = iolist_to_binary(join(re:split("{ab}","\\x0{ab}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[]))), 
-?line <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[trim]))), 
-?line <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[]))), 
-?line <<":AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[trim]))), 
-?line <<":AB:">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*?CD",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("CD","(A|B)*CD",[]))), 
+    <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[trim]))), 
+    <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":AB:">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[]))), 
-?line <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[trim]))), 
-?line <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[{parts,
+    <<":AB:AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*?\\1",[]))), 
+    <<":AB">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[trim]))), 
+    <<":AB:">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":AB:">> = iolist_to_binary(join(re:split("ABABAB","(AB)*\\1",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("foo","(?<!bar)foo",[]))), 
+    <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[trim]))), 
+    <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[]))), 
+    <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[trim]))), 
+    <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<"cat:d">> = iolist_to_binary(join(re:split("catfood","(?<!bar)foo",[]))), 
-?line <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[trim]))), 
-?line <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[{parts,
+    <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[]))), 
+    <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[trim]))), 
+    <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[trim]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[]))), 
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[trim]))), 
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[{parts,
                                                                                                                                                                                         2}]))), 
-?line <<"ar:tle">> = iolist_to_binary(join(re:split("arfootle","(?<!bar)foo",[]))), 
-?line <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[trim]))), 
-?line <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"r:sh">> = iolist_to_binary(join(re:split("rfoosh","(?<!bar)foo",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<!bar)foo",[]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[trim]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<!bar)foo",[]))), 
-?line <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[trim]))), 
-?line <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[{parts,
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[]))), 
+    <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[trim]))), 
+    <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[]))), 
+    <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[trim]))), 
+    <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[{parts,
+                                                                                                                                                                                         2}]))), 
+    <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[trim]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[]))), 
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[trim]))), 
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[{parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[]))), 
+    <<"fooa:foo">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[trim]))), 
+    <<"fooa:foo:">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","(?<!bar)foo",[]))), 
-?line <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[trim]))), 
-?line <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                                   2}]))), 
-?line <<":d">> = iolist_to_binary(join(re:split("catfood","\\w{3}(?<!bar)foo",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\w{3}(?<!bar)foo",[]))), 
-?line <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[trim]))), 
-?line <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[{parts,
+    <<"fooa:foo:">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[]))), 
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[trim]))), 
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[]))), 
+    <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[trim]))), 
+    <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
+                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline,
+                                                                                                                                                                                        trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline,
+                                                                                                                                                                                          {parts,
                                                                                                                                                                                            2}]))), 
-?line <<"foo">> = iolist_to_binary(join(re:split("foo","\\w{3}(?<!bar)foo",[]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[trim]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                                 2}]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","\\w{3}(?<!bar)foo",[]))), 
-?line <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[trim]))), 
-?line <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[{parts,
-                                                                                                                                                                                                       2}]))), 
-?line <<"towbarfoo">> = iolist_to_binary(join(re:split("towbarfoo","\\w{3}(?<!bar)foo",[]))), 
-?line <<"fooa:foo">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[trim]))), 
-?line <<"fooa:foo:">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"fooa:foo:">> = iolist_to_binary(join(re:split("fooabar","(?<=(foo)a)bar",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo)a)bar",[]))), 
-?line <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[trim]))), 
-?line <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=(foo)a)bar",[]))), 
-?line <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[trim]))), 
-?line <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"foobbar">> = iolist_to_binary(join(re:split("foobbar","(?<=(foo)a)bar",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline,
-                                                                                                                                                                                          trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline,
-                                                                                                                                                                                            {parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))), 
-?line <<"qqq
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc\\z",[multiline]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
+                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc\\z",[multiline]))), 
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","\\Aabc\\z",[multiline,trim]))), 
-?line <<"qqq
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","\\Aabc\\z",[multiline,{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 abc">> = iolist_to_binary(join(re:split("qqq
 abc","\\Aabc\\z",[multiline]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","\\Aabc\\z",[multiline,trim]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","\\Aabc\\z",[multiline,{parts,2}]))), 
-?line <<"abc
+    <<"abc
 zzz">> = iolist_to_binary(join(re:split("abc
 zzz","\\Aabc\\z",[multiline]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","\\Aabc\\z",[multiline,trim]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","\\Aabc\\z",[multiline,{parts,2}]))), 
-?line <<"qqq
+    <<"qqq
 abc
 zzz">> = iolist_to_binary(join(re:split("qqq
 abc
 zzz","\\Aabc\\z",[multiline]))), 
-?line <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
-?line <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-?line <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-?line <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
-?line <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-?line <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-?line <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
-?line <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
-?line <<":party">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
-?line <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[{parts,
-                                                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[]))), 
-?line <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
-?line <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[]))), 
-?line <<":12345:a">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[trim]))), 
-?line <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[]))), 
-?line <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[trim]))), 
-?line <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[]))), 
-?line <<":12345:a">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[trim]))), 
-?line <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[]))), 
-?line <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[trim]))), 
-?line <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))), 
-?line <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))), 
-?line <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))), 
-?line <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))), 
-?line <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))), 
-?line <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[trim]))), 
-?line <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[]))), 
-?line <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[trim]))), 
-?line <<":cccd">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[{parts,
+    <<"1:.23">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
+                                                                                                                                                                                                                            2}]))), 
+    <<"1:.23:">> = iolist_to_binary(join(re:split("1.230003938","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
+    <<"1:.875">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
+                                                                                                                                                                                                                            2}]))), 
+    <<"1:.875:">> = iolist_to_binary(join(re:split("1.875000282","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
+                                                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[trim]))), 
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"1.235">> = iolist_to_binary(join(re:split("1.235","(?>(\\.\\d\\d[1-9]?))\\d+",[]))), 
+    <<":party">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
+    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[{parts,
+                                                                                                                                                                                                                                                                                                                               2}]))), 
+    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^((?>\\w+)|(?>\\s+))*$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[{parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((?>\\w+)|(?>\\s+))*$",[]))), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[trim]))), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[{parts,
+                                                                                                                                                                                                                                                                                           2}]))), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^((?>\\w+)|(?>\\s+))*$",[]))), 
+    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[trim]))), 
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d+)(\\w)",[]))), 
+    <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[trim]))), 
+    <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":1234:5:+">> = iolist_to_binary(join(re:split("12345+","(\\d+)(\\w)",[]))), 
+    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[trim]))), 
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","((?>\\d+))(\\w)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[{parts,
                                                                                                                                                                                                       2}]))), 
-?line <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[]))), 
-?line <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))), 
-?line <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[{parts,
-                                                                                                                                                                                                                                            2}]))), 
-?line <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
-?line <<":xyz">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
-?line <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                                2}]))), 
-?line <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
-?line <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
-?line <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
-                                                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless]))), 
-?line <<":a bc">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[trim]))), 
-?line <<":a bc:">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?>\\d+))(\\w)",[]))), 
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[trim]))), 
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":a bc:">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[]))), 
-?line <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[trim]))), 
-?line <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[]))), 
-?line <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[trim]))), 
-?line <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[]))), 
-?line <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[trim]))), 
-?line <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[]))), 
-?line <<":a bcde f">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[trim]))), 
-?line <<":a bcde f:">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<":a bcde f:">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[]))), 
-?line <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[trim]))), 
-?line <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[]))), 
-?line <<":ab">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[trim]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[{parts,
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","((?>\\d+))(\\w)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))), 
+    <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))), 
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[]))), 
-?line <<":aB">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[trim]))), 
-?line <<":aB:">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[{parts,
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))), 
+    ok.
+run12() ->
+    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))), 
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<":aB:">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[{parts,
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))), 
+    <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[trim]))), 
+    <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"aaa:ccc">> = iolist_to_binary(join(re:split("aaabbbccc","(?>b)+",[]))), 
+    <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[trim]))), 
+    <<":cccd">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"::::d">> = iolist_to_binary(join(re:split("aaabbbbccccd","(?>a+|b+|c+)*c",[]))), 
+    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))), 
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[{parts,
+                                                                                                                                                                                                                                          2}]))), 
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
+    <<":xyz">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                                              2}]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[trim]))), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                                                                                                                    2}]))), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(((?>[^()]+)|\\([^()]+\\))+\\)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless,
+                                                                                                                                                                trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","a(?-i)b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless,
+                                                                                                                                                                trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("Ab","a(?-i)b",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?-i)b",[caseless]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless,
+                                                                                                                                                                trim]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","a(?-i)b",[caseless]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless,
+                                                                                                                                                                trim]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","a(?-i)b",[caseless]))), 
+    <<":a bc">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[trim]))), 
+    <<":a bc:">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[trim]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[trim]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[]))), 
-?line <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[trim]))), 
-?line <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[]))), 
-?line <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[trim]))), 
-?line <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[trim]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[]))), 
-?line <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[trim]))), 
-?line <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[{parts,
+    <<":a bc:">> = iolist_to_binary(join(re:split("a bcd e","(a (?x)b c)d e",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a (?x)b c)d e",[]))), 
+    <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[trim]))), 
+    <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"a b cd e">> = iolist_to_binary(join(re:split("a b cd e","(a (?x)b c)d e",[]))), 
+    <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[trim]))), 
+    <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"abcd e">> = iolist_to_binary(join(re:split("abcd e","(a (?x)b c)d e",[]))), 
+    <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[trim]))), 
+    <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"a bcde">> = iolist_to_binary(join(re:split("a bcde","(a (?x)b c)d e",[]))), 
+    <<":a bcde f">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[trim]))), 
+    <<":a bcde f:">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<":a bcde f:">> = iolist_to_binary(join(re:split("a bcde f","(a b(?x)c d (?-x)e f)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a b(?x)c d (?-x)e f)",[]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[trim]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","(a b(?x)c d (?-x)e f)",[]))), 
+    <<":ab">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[trim]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[{parts,
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(?i)b)c",[]))), 
+    <<":aB">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[trim]))), 
+    <<":aB:">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[{parts,
+    <<":aB:">> = iolist_to_binary(join(re:split("aBc","(a(?i)b)c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[{parts,
                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[trim]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)b)c",[]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[trim]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(a(?i)b)c",[]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[trim]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(a(?i)b)c",[]))), 
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[trim]))), 
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[trim]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[{parts,
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(a(?i)b)c",[]))), 
+    <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[trim]))), 
+    <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[trim]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[{parts,
+    <<"ABc">> = iolist_to_binary(join(re:split("ABc","(a(?i)b)c",[]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[trim]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(a(?i)b)c",[]))), 
+    <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[trim]))), 
+    <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"AbC">> = iolist_to_binary(join(re:split("AbC","(a(?i)b)c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","a(?i:b)c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)c",[]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[trim]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a(?i:b)c",[]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[trim]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","a(?i:b)c",[]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[trim]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBc","a(?i:b)*c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[trim]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aBBc","a(?i:b)*c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?i:b)*c",[]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[trim]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[]))), 
+    <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[trim]))), 
+    <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","a(?i:b)*c",[]))), 
-?line <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[trim]))), 
-?line <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[]))), 
-?line <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[trim]))), 
-?line <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[]))), 
-?line <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[trim]))), 
-?line <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                      trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                      trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("more 
+    <<"aBBC">> = iolist_to_binary(join(re:split("aBBC","a(?i:b)*c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","a(?=b(?i)c)\\w\\wd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abCd","a(?=b(?i)c)\\w\\wd",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?=b(?i)c)\\w\\wd",[]))), 
+    <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[trim]))), 
+    <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"aBCd">> = iolist_to_binary(join(re:split("aBCd","a(?=b(?i)c)\\w\\wd",[]))), 
+    <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[trim]))), 
+    <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"abcD">> = iolist_to_binary(join(re:split("abcD","a(?=b(?i)c)\\w\\wd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                                    trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than million","(?s-i:more.*than).*million",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                                    trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?s-i:more.*than).*million",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("more 
  than Million","(?s-i:more.*than).*million",[caseless,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more 
+    <<":">> = iolist_to_binary(join(re:split("more 
  than Million","(?s-i:more.*than).*million",[caseless,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more 
+    <<":">> = iolist_to_binary(join(re:split("more 
  than Million","(?s-i:more.*than).*million",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                          trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                            {parts,
-                                                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless]))), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                      trim]))), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless,
-                                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                                         2}]))), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless]))), 
-?line <<"more 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                        trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?s-i:more.*than).*million",[caseless]))), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                                    trim]))), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless,
+                                                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                                                       2}]))), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?s-i:more.*than).*million",[caseless]))), 
+    <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
  million","(?s-i:more.*than).*million",[caseless,trim]))), 
-?line <<"more 
+    <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
  million","(?s-i:more.*than).*million",[caseless,{parts,2}]))), 
-?line <<"more 
+    <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
  million","(?s-i:more.*than).*million",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("more 
+    <<"">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than million","(?:(?s-i)more.*than).*million",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("more than MILLION","(?:(?s-i)more.*than).*million",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("more 
  than Million","(?:(?s-i)more.*than).*million",[caseless,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more 
+    <<":">> = iolist_to_binary(join(re:split("more 
  than Million","(?:(?s-i)more.*than).*million",[caseless,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("more 
+    <<":">> = iolist_to_binary(join(re:split("more 
  than Million","(?:(?s-i)more.*than).*million",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                                                   2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless]))), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                            trim]))), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless,
-                                                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                                                               2}]))), 
-?line <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless]))), 
-?line <<"more 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                              trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                                {parts,
+                                                                                                                                                                                                                                 2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?s-i)more.*than).*million",[caseless]))), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                                          trim]))), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless,
+                                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                                             2}]))), 
+    <<"MORE THAN MILLION">> = iolist_to_binary(join(re:split("MORE THAN MILLION","(?:(?s-i)more.*than).*million",[caseless]))), 
+    <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
  million","(?:(?s-i)more.*than).*million",[caseless,trim]))), 
-?line <<"more 
+    <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
  million","(?:(?s-i)more.*than).*million",[caseless,{parts,2}]))), 
-?line <<"more 
+    <<"more 
  than 
  million">> = iolist_to_binary(join(re:split("more 
  than 
  million","(?:(?s-i)more.*than).*million",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","(?>a(?i)b+)+c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[]))), 
-?line <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[trim]))), 
-?line <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aBbc","(?>a(?i)b+)+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[]))), 
-?line <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[trim]))), 
-?line <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[]))), 
-?line <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[trim]))), 
-?line <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[trim]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[trim]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[trim]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[]))), 
-?line <<"ab:xx">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
-?line <<"ab:xx:">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"ab:xx:">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-?line <<"aB:xx">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
-?line <<"aB:xx:">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"aB:xx:">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[]))), 
-?line <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
-?line <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-?line <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
-?line <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
-?line <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
-?line <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aBBc","(?>a(?i)b+)+c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>a(?i)b+)+c",[]))), 
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[trim]))), 
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"Abc">> = iolist_to_binary(join(re:split("Abc","(?>a(?i)b+)+c",[]))), 
+    <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[trim]))), 
+    <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"abAb">> = iolist_to_binary(join(re:split("abAb","(?>a(?i)b+)+c",[]))), 
+    <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[trim]))), 
+    <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"abbC">> = iolist_to_binary(join(re:split("abbC","(?>a(?i)b+)+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(?i)b)\\w\\wc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[trim]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aBc","(?=a(?i)b)\\w\\wc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?=a(?i)b)\\w\\wc",[]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[trim]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?=a(?i)b)\\w\\wc",[]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[trim]))), 
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[]))), 
-?line <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[trim]))), 
-?line <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[{parts,
+    <<"abC">> = iolist_to_binary(join(re:split("abC","(?=a(?i)b)\\w\\wc",[]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[trim]))), 
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[trim]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
+    <<"aBC">> = iolist_to_binary(join(re:split("aBC","(?=a(?i)b)\\w\\wc",[]))), 
+    <<"ab:xx">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+    <<"ab:xx:">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"ab:xx:">> = iolist_to_binary(join(re:split("abxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
+    <<"aB:xx">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+    <<"aB:xx:">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"aB:xx:">> = iolist_to_binary(join(re:split("aBxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[{parts,
                                                                                                                                                                                                                 2}]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a(?i)b)(\\w\\w)c",[]))), 
+    <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+    <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"Abxxc">> = iolist_to_binary(join(re:split("Abxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
+    <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+    <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"ABxxc">> = iolist_to_binary(join(re:split("ABxxc","(?<=a(?i)b)(\\w\\w)c",[]))), 
+    <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[trim]))), 
+    <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"abxxC">> = iolist_to_binary(join(re:split("abxxC","(?<=a(?i)b)(\\w\\w)c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aA","(?:(a)|b)(?(1)A|B)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bB","(?:(a)|b)(?(1)A|B)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(a)|b)(?(1)A|B)",[]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[trim]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(a)|b)(?(1)A|B)",[]))), 
+    <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[trim]))), 
+    <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"bA">> = iolist_to_binary(join(re:split("bA","(?:(a)|b)(?(1)A|B)",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aa","^(a)?(?(1)a|b)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","^(a)?(?(1)a|b)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bb","^(a)?(?(1)a|b)+$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(a)?(?(1)a|b)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
                                                                                                                                                                                                                 2}]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("12","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
-                                                                                                                                                                                                                2}]))), 
-?line <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[trim]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?=abc)\\w{3}:|\\d\\d)$",[]))), 
+    ok.
+run13() ->
+    <<"">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
                                                                                                                                                                                                                 2}]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
-?line <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[trim]))), 
-?line <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abc:","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("12","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[trim]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","^(?(?!abc)\\d\\d|\\w{3}:)$",[]))), 
+    <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[trim]))), 
+    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<=foo)bar|cat)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[]))), 
+    <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[trim]))), 
+    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cat","(?(?<=foo)bar|cat)",[]))), 
-?line <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[trim]))), 
-?line <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[{parts,
+    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[]))), 
+    <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[trim]))), 
+    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<=foo)bar|cat)",[]))), 
-?line <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[trim]))), 
-?line <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[{parts,
+    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[]))), 
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[trim]))), 
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<=foo)bar|cat)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<=foo)bar|cat)",[]))), 
-?line <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[trim]))), 
-?line <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[]))), 
-?line <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[trim]))), 
-?line <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[{parts,
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<=foo)bar|cat)",[]))), 
+    <<"foo">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[trim]))), 
+    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"foo:">> = iolist_to_binary(join(re:split("foobar","(?(?<!foo)cat|bar)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[]))), 
+    <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[trim]))), 
+    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cat","(?(?<!foo)cat|bar)",[]))), 
-?line <<"f">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[trim]))), 
-?line <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[{parts,
+    <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[]))), 
+    <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[trim]))), 
+    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<"f:">> = iolist_to_binary(join(re:split("fcat","(?(?<!foo)cat|bar)",[]))), 
-?line <<"fo">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[trim]))), 
-?line <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[{parts,
+    <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[]))), 
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[trim]))), 
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<"fo:">> = iolist_to_binary(join(re:split("focat","(?(?<!foo)cat|bar)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?<!foo)cat|bar)",[]))), 
-?line <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[trim]))), 
-?line <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                    trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
-?line <<":(">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                        trim]))), 
-?line <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                                           2}]))), 
-?line <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
-?line <<":::(">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                                                    trim]))), 
-?line <<"::(abcd) fox">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                                                       2}]))), 
-?line <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
-?line <<"(">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                      trim]))), 
-?line <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
-                                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                                         2}]))), 
-?line <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<"foocat">> = iolist_to_binary(join(re:split("foocat","(?(?<!foo)cat|bar)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                   trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                     {parts,
                                                                                                                                                                                                                      2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
-?line <<":(">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+    <<":(">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                       trim]))), 
-?line <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                         {parts,
                                                                                                                                                                                                                          2}]))), 
-?line <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
-?line <<":::(">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+    <<":::(">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                                                   trim]))), 
-?line <<"::(abcd) fox">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<"::(abcd) fox">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                                                     {parts,
                                                                                                                                                                                                                                                      2}]))), 
-?line <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
-?line <<"(">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+    <<"(">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                     trim]))), 
-?line <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended,
                                                                                                                                                                                                                       {parts,
                                                                                                                                                                                                                        2}]))), 
-?line <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
-?line <<":1:2">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[trim]))), 
-?line <<":1:2:">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[{parts,
+    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) |) ",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
+    <<":(">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                    trim]))), 
+    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                                       2}]))), 
+    <<":(:">> = iolist_to_binary(join(re:split("(abcd)","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
+    <<":::(">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                                                trim]))), 
+    <<"::(abcd) fox">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                                                   2}]))), 
+    <<":::(:::">> = iolist_to_binary(join(re:split("the quick (abcd) fox","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
+    <<"(">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                  trim]))), 
+    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended,
+                                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"(::">> = iolist_to_binary(join(re:split("(abcd","( \\( )? [^()]+ (?(1) \\) ) ",[extended]))), 
+    <<":1:2">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[trim]))), 
+    <<":1:2:">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<":1:2:">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[]))), 
+    <<":1:2">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[trim]))), 
+    <<":1:2:">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[{parts,
                                                                                                                                                                                          2}]))), 
-?line <<":1:2:">> = iolist_to_binary(join(re:split("12","^(?(2)a|(1)(2))+$",[]))), 
-?line <<":1:2">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[trim]))), 
-?line <<":1:2:">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[{parts,
+    <<":1:2:">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[]))), 
+    <<":1:2">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[trim]))), 
+    <<":1:2:">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[{parts,
                                                                                                                                                                                            2}]))), 
-?line <<":1:2:">> = iolist_to_binary(join(re:split("12a","^(?(2)a|(1)(2))+$",[]))), 
-?line <<":1:2">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[trim]))), 
-?line <<":1:2:">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<":1:2:">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[]))), 
-?line <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[trim]))), 
-?line <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[]))), 
-?line <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[trim]))), 
-?line <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[]))), 
-?line <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[trim]))), 
-?line <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[]))), 
-?line <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[trim]))), 
-?line <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[]))), 
-?line <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[trim]))), 
-?line <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[]))), 
-?line <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[trim]))), 
-?line <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[]))), 
-?line <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[trim]))), 
-?line <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[]))), 
-?line <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[trim]))), 
-?line <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[]))), 
-?line <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
-?line <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-?line <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
-?line <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[]))), 
-?line <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
-?line <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-?line <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
-?line <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[]))), 
-?line <<":blah">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
-?line <<":blah:">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":blah:">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[]))), 
-?line <<":Blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
-?line <<":Blah:">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":Blah:">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-?line <<":blaH">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
-?line <<":blaH:">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":blaH:">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[{parts,
+    <<":1:2:">> = iolist_to_binary(join(re:split("12aa","^(?(2)a|(1)(2))+$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?(2)a|(1)(2))+$",[]))), 
+    <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[trim]))), 
+    <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"1234">> = iolist_to_binary(join(re:split("1234","^(?(2)a|(1)(2))+$",[]))), 
+    <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[trim]))), 
+    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+\\1",[]))), 
+    <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[trim]))), 
+    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+\\1",[]))), 
+    <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[trim]))), 
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+\\1",[]))), 
+    <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[trim]))), 
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+\\1",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)blah)\\s+\\1",[]))), 
+    <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[trim]))), 
+    <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"blah BLAH">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+\\1",[]))), 
+    <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[trim]))), 
+    <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"Blah blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+\\1",[]))), 
+    <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[trim]))), 
+    <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"blaH blah">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+\\1",[]))), 
+    <<":blah">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":blah:">> = iolist_to_binary(join(re:split("blah blah","((?i)blah)\\s+(?i:\\1)",[]))), 
+    <<":BLAH">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":BLAH:">> = iolist_to_binary(join(re:split("BLAH BLAH","((?i)blah)\\s+(?i:\\1)",[]))), 
+    <<":Blah">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah Blah","((?i)blah)\\s+(?i:\\1)",[]))), 
+    <<":blaH">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blaH","((?i)blah)\\s+(?i:\\1)",[]))), 
+    <<":blah">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+    <<":blah:">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":blah:">> = iolist_to_binary(join(re:split("blah BLAH","((?i)blah)\\s+(?i:\\1)",[]))), 
+    <<":Blah">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":Blah:">> = iolist_to_binary(join(re:split("Blah blah","((?i)blah)\\s+(?i:\\1)",[]))), 
+    <<":blaH">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[trim]))), 
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":blaH:">> = iolist_to_binary(join(re:split("blaH blah","((?i)blah)\\s+(?i:\\1)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","(abc|)+",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abc","(abc|)+",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aa","(?>a*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("abc","(abc|)+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[]))), 
+    <<"x::y::z">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[trim]))), 
+    <<"x::yz">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"x::y::z::">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","([a]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","([a]*)*",[{parts,
+                                                                                                                                                                2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","([a]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","(?>a*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","(abc|)+",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abc","(abc|)+",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abc","(abc|)+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","([ab]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*)*",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","([ab]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*)*",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcabc","(abc|)+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcabcabc","(abc|)+",[]))), 
-?line <<"x::y::z">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[trim]))), 
-?line <<"x::yz">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"x::y::z::">> = iolist_to_binary(join(re:split("xyz","(abc|)+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","([a]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([a]*)*",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[]))), 
+    <<"::c::d::e">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[trim]))), 
+    <<"::cde">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"::c::d::e::">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","([^a]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*)*",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([a]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[]))), 
+    <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[trim]))), 
+    <<"a::aa">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[]))), 
+    <<"a::b::a::b">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[trim]))), 
+    <<"a::bab">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("aaaaa","([a]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","([ab]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([ab]*)*",[{parts,
+    <<"a::b::a::b::">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","([a]*?)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","([a]*?)*",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","([a]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[trim]))), 
+    <<"::aaa">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"::::::::">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([ab]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","([ab]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([ab]*)*",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([ab]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("ababab","([ab]*)*",[]))), 
-?line <<"::c::d::e">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[trim]))), 
-?line <<"::cde">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<"::c::d::e::">> = iolist_to_binary(join(re:split("aaaabcde","([ab]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[trim]))), 
+    <<"::bab">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bbbb","([ab]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","([^a]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([^a]*)*",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([^a]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[{parts,
+    <<"::::::::">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[trim]))), 
+    <<"::aba">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("bbbb","([^a]*)*",[]))), 
-?line <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[trim]))), 
-?line <<"a::aa">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("cccc","([^ab]*)*",[]))), 
-?line <<"a::b::a::b">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[trim]))), 
-?line <<"a::bab">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"a::b::a::b::">> = iolist_to_binary(join(re:split("abab","([^ab]*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","([a]*?)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([a]*?)*",[{parts,
+    <<"::::::::">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([a]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[trim]))), 
-?line <<"::aaa">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[trim]))), 
+    <<"::bbb">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"::::::::">> = iolist_to_binary(join(re:split("aaaa","([a]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","([ab]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[{parts,
+    <<"::::::::">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[]))), 
+    <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[trim]))), 
+    <<"a::aa">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([ab]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[trim]))), 
-?line <<"::bab">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[trim]))), 
+    <<"::ccc">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"::::::::">> = iolist_to_binary(join(re:split("abab","([ab]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[trim]))), 
-?line <<"::aba">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[{parts,
+    <<"::::::::">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[]))), 
+    <<"b::a::b::a">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[trim]))), 
+    <<"b::aba">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"::::::::">> = iolist_to_binary(join(re:split("baba","([ab]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("b","([^a]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[trim]))), 
-?line <<"::bbb">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[{parts,
+    <<"b::a::b::a::">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))), 
+    <<":b:c:d:e">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[trim]))), 
+    <<":bcde">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"::::::::">> = iolist_to_binary(join(re:split("bbbb","([^a]*?)*",[]))), 
-?line <<"a::a::a">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[trim]))), 
-?line <<"a::aa">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"a::a::a::">> = iolist_to_binary(join(re:split("aaa","([^a]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("c","([^ab]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[trim]))), 
-?line <<"::ccc">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"::::::::">> = iolist_to_binary(join(re:split("cccc","([^ab]*?)*",[]))), 
-?line <<"b::a::b::a">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[trim]))), 
-?line <<"b::aba">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"b::a::b::a::">> = iolist_to_binary(join(re:split("baba","([^ab]*?)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","(?>a*)*",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?>a*)*",[]))), 
-?line <<":b:c:d:e">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[trim]))), 
-?line <<":bcde">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[{parts,
+    <<":b:c:d:e:">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[]))), 
+    <<"::b::b">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[trim]))), 
+    <<"::bbaa">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<":b:c:d:e:">> = iolist_to_binary(join(re:split("aaabcde","(?>a*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[{parts,
+    <<"::b::b::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[]))), 
+    ok.
+run14() ->
+    <<"a::a::a::a::a">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[trim]))), 
+    <<"a::aaaa">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*))*",[]))), 
-?line <<"::b::b">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[trim]))), 
-?line <<"::bbaa">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"::b::b::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*))*",[]))), 
-?line <<"a::a::a::a::a">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[trim]))), 
-?line <<"a::aaaa">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[{parts,
+    <<"a::a::a::a::a::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[]))), 
+    <<"a::a::b::b::a::a">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[trim]))), 
+    <<"a::abbaa">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<"a::a::a::a::a::">> = iolist_to_binary(join(re:split("aaaaa","((?>a*?))*",[]))), 
-?line <<"a::a::b::b::a::a">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[trim]))), 
-?line <<"a::abbaa">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<"a::a::b::b::a::a::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                   trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+    <<"a::a::b::b::a::a::">> = iolist_to_binary(join(re:split("aabbaa","((?>a*?))*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
                                                                                                                                                                                                                                                                                                                  trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+    <<":">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
                                                                                                                                                                                                                                                                                                                    {parts,
                                                                                                                                                                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                       trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                                                                                                                                          2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
-?line <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                   trim]))), 
-?line <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
-                                                                                                                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                                                                                                                      2}]))), 
-?line <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
-?line <<"foo:foo">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[trim]))), 
-?line <<"foo:foo:">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<"foo:foo:">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[]))), 
-?line <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[trim]))), 
-?line <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[]))), 
-?line <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[trim]))), 
-?line <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[trim]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[]))), 
-?line <<":aBC">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[trim]))), 
-?line <<":aBC:">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":aBC:">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[]))), 
-?line <<":bb">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[trim]))), 
-?line <<":bb:">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("12-sep-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+                                                                                                                                                                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+                                                                                                                                                                                                                                                                                                                 {parts,
+                                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("12-09-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+                                                                                                                                                                                                                                                                                                                     trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+                                                                                                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                                                                                                        2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
+    <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+                                                                                                                                                                                                                                                                                                                 trim]))), 
+    <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended,
+                                                                                                                                                                                                                                                                                                                   {parts,
+                                                                                                                                                                                                                                                                                                                    2}]))), 
+    <<"sep-12-98">> = iolist_to_binary(join(re:split("sep-12-98","(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ",[extended]))), 
+    <<"foo:foo">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[trim]))), 
+    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobarfoo","(?<=(foo))bar\\1",[]))), 
+    <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[trim]))), 
+    <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"foo:foo:tling">> = iolist_to_binary(join(re:split("foobarfootling","(?<=(foo))bar\\1",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(foo))bar\\1",[]))), 
+    <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[trim]))), 
+    <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"foobar">> = iolist_to_binary(join(re:split("foobar","(?<=(foo))bar\\1",[]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[trim]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"barfoo">> = iolist_to_binary(join(re:split("barfoo","(?<=(foo))bar\\1",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("saturday","(?i:saturday|sunday)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("sunday","(?i:saturday|sunday)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("Saturday","(?i:saturday|sunday)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("Sunday","(?i:saturday|sunday)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("SATURDAY","(?i:saturday|sunday)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("SUNDAY","(?i:saturday|sunday)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("SunDay","(?i:saturday|sunday)",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":bb:">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[]))), 
-?line <<":BB">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[trim]))), 
-?line <<":BB:">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[{parts,
+    <<":abc:">> = iolist_to_binary(join(re:split("abcx","(a(?i)bc|BB)x",[]))), 
+    <<":aBC">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[trim]))), 
+    <<":aBC:">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":BB:">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[]))), 
-?line <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[trim]))), 
-?line <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[]))), 
-?line <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[trim]))), 
-?line <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[]))), 
-?line <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[trim]))), 
-?line <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[{parts,
+    <<":aBC:">> = iolist_to_binary(join(re:split("aBCx","(a(?i)bc|BB)x",[]))), 
+    <<":bb">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[trim]))), 
+    <<":bb:">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":bb:">> = iolist_to_binary(join(re:split("bbx","(a(?i)bc|BB)x",[]))), 
+    <<":BB">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[trim]))), 
+    <<":BB:">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":BB:">> = iolist_to_binary(join(re:split("BBx","(a(?i)bc|BB)x",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(a(?i)bc|BB)x",[]))), 
+    <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[trim]))), 
+    <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[]))), 
-?line <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[trim]))), 
-?line <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[{parts,
+    <<"abcX">> = iolist_to_binary(join(re:split("abcX","(a(?i)bc|BB)x",[]))), 
+    <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[trim]))), 
+    <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[]))), 
-?line <<":ac">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<":ac:">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":ac:">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<":aC">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<":aC:">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":aC:">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<":bD">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<":bD:">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":bD:">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[trim]))), 
-?line <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[]))), 
-?line <<":ab">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<":aBd">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<":aBd:">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-?line <<":aBd:">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<":xy">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<":xy:">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<":xy:">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<":xY">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<":xY:">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+    <<"aBCX">> = iolist_to_binary(join(re:split("aBCX","(a(?i)bc|BB)x",[]))), 
+    <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[trim]))), 
+    <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"bbX">> = iolist_to_binary(join(re:split("bbX","(a(?i)bc|BB)x",[]))), 
+    <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[trim]))), 
+    <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"BBX">> = iolist_to_binary(join(re:split("BBX","(a(?i)bc|BB)x",[]))), 
+    <<":ac">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<":ac:">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":ac:">> = iolist_to_binary(join(re:split("ac","^([ab](?i)[cd]|[ef])",[]))), 
+    <<":aC">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<":aC:">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":aC:">> = iolist_to_binary(join(re:split("aC","^([ab](?i)[cd]|[ef])",[]))), 
+    <<":bD">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<":bD:">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":bD:">> = iolist_to_binary(join(re:split("bD","^([ab](?i)[cd]|[ef])",[]))), 
+    <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":e:lephant">> = iolist_to_binary(join(re:split("elephant","^([ab](?i)[cd]|[ef])",[]))), 
+    <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":E:urope">> = iolist_to_binary(join(re:split("Europe","^([ab](?i)[cd]|[ef])",[]))), 
+    <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":f:rog">> = iolist_to_binary(join(re:split("frog","^([ab](?i)[cd]|[ef])",[]))), 
+    <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":F:rance">> = iolist_to_binary(join(re:split("France","^([ab](?i)[cd]|[ef])",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^([ab](?i)[cd]|[ef])",[]))), 
+    <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[trim]))), 
+    <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"Africa">> = iolist_to_binary(join(re:split("Africa","^([ab](?i)[cd]|[ef])",[]))), 
+    <<":ab">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("ab","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<":aBd">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<":aBd:">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
                                                                                                                                                                                                                       2}]))), 
-?line <<":xY:">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                            2}]))), 
-?line <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                                2}]))), 
-?line <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-?line <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
-?line <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+    <<":aBd:">> = iolist_to_binary(join(re:split("aBd","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<":xy">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<":xy:">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<":xy:">> = iolist_to_binary(join(re:split("xy","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<":xY">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<":xY:">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<":xY:">> = iolist_to_binary(join(re:split("xY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+                                                                                                                                                                                                                          2}]))), 
+    <<":z:ebra">> = iolist_to_binary(join(re:split("zebra","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<":Z:ambesi">> = iolist_to_binary(join(re:split("Zambesi","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+                                                                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
                                                                                                                                                                                                                       2}]))), 
-?line <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
-?line <<"foo
+    <<"aCD">> = iolist_to_binary(join(re:split("aCD","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[trim]))), 
+    <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"XY">> = iolist_to_binary(join(re:split("XY","^(ab|a(?i)[b-c](?m-i)d|x(?i)y|z)",[]))), 
+    <<"foo
 ">> = iolist_to_binary(join(re:split("foo
 bar","(?<=foo\\n)^bar",[multiline,trim]))), 
-?line <<"foo
+    <<"foo
 :">> = iolist_to_binary(join(re:split("foo
 bar","(?<=foo\\n)^bar",[multiline,{parts,2}]))), 
-?line <<"foo
+    <<"foo
 :">> = iolist_to_binary(join(re:split("foo
 bar","(?<=foo\\n)^bar",[multiline]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline,
-                                                                                                                                                                                                     trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline,
-                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline]))), 
-?line <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline,
-                                                                                                                                                                                     trim]))), 
-?line <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline,
-                                                                                                                                                                                       {parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline]))), 
-?line <<"baz
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline,
+                                                                                                                                                                                                   trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline,
+                                                                                                                                                                                                     {parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=foo\\n)^bar",[multiline]))), 
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline,
+                                                                                                                                                                                   trim]))), 
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline,
+                                                                                                                                                                                     {parts,
+                                                                                                                                                                                      2}]))), 
+    <<"bar">> = iolist_to_binary(join(re:split("bar","(?<=foo\\n)^bar",[multiline]))), 
+    <<"baz
 bar">> = iolist_to_binary(join(re:split("baz
 bar","(?<=foo\\n)^bar",[multiline,trim]))), 
-?line <<"baz
+    <<"baz
 bar">> = iolist_to_binary(join(re:split("baz
 bar","(?<=foo\\n)^bar",[multiline,{parts,2}]))), 
-?line <<"baz
+    <<"baz
 bar">> = iolist_to_binary(join(re:split("baz
 bar","(?<=foo\\n)^bar",[multiline]))), 
-?line <<"bar">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[trim]))), 
-?line <<"bar:">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<"bar:">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[]))), 
-?line <<"barbar">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
-?line <<"barbar:">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<"barbar:">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[]))), 
-?line <<"koobar">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
-?line <<"koobar:">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<"koobar:">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[]))), 
-?line <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[trim]))), 
-?line <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[]))), 
-?line <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
-?line <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[{parts,
+    <<"bar">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+    <<"bar:">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"bar:">> = iolist_to_binary(join(re:split("barbaz","(?<=(?<!foo)bar)baz",[]))), 
+    <<"barbar">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+    <<"barbar:">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"barbar:">> = iolist_to_binary(join(re:split("barbarbaz","(?<=(?<!foo)bar)baz",[]))), 
+    <<"koobar">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+    <<"koobar:">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"koobar:">> = iolist_to_binary(join(re:split("koobarbaz","(?<=(?<!foo)bar)baz",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?<!foo)bar)baz",[]))), 
+    <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[trim]))), 
+    <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"baz">> = iolist_to_binary(join(re:split("baz","(?<=(?<!foo)bar)baz",[]))), 
+    <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[trim]))), 
+    <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"foobarbaz">> = iolist_to_binary(join(re:split("foobarbaz","(?<=(?<!foo)bar)baz",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[trim]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?){4}$",[]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[trim]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[{parts,
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?){4}$",[]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?){4}$",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?){4}$",[{parts,
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?){4}$",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                     2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?){4}$",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?){4}$",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                                   2}]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                                     2}]))), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                                       2}]))), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                                         2}]))), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                                           2}]))), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                      2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                        2}]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<":a:a:a:a">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<":a:a:a:a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                          2}]))), 
-?line <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<":a:a:a:a">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<":a:a:a:a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<":a:a:a:a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<":a:aa:a:a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<":a:aa:a:a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                            2}]))), 
-?line <<":a:a:a:a:">> = iolist_to_binary(join(re:split("aaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<":a:aa:a:a">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<":a:aa:a:a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<":a:aa:a:a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<":a:aa:a:aa">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<":a:aa:a:aa:">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                              2}]))), 
-?line <<":a:aa:a:a:">> = iolist_to_binary(join(re:split("aaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<":a:aa:a:aa">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<":a:aa:a:aa:">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<":a:aa:a:aa:">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<":a:aa:aaa:a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<":a:aa:aaa:a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                2}]))), 
-?line <<":a:aa:a:aa:">> = iolist_to_binary(join(re:split("aaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<":a:aa:aaa:a">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<":a:aa:aaa:a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<":a:aa:aaa:a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                  2}]))), 
-?line <<":a:aa:aaa:a:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                    2}]))), 
-?line <<"aaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<":a:aa:aaa:aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<":a:aa:aaa:aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                      2}]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<":a:aa:aaa:aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<":a:aa:aaa:aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<":a:aa:aaa:aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                        2}]))), 
-?line <<":a:aa:aaa:aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                          2}]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                            2}]))), 
-?line <<"aaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                              2}]))), 
-?line <<"aaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                                2}]))), 
-?line <<"aaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
+    <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
                                                                                                                                                                                                                                                  2}]))), 
-?line <<"aaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[trim]))), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[{parts,
-                                                                                                                                                                                                                                                   2}]))), 
-?line <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","abc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","abc",[{parts,
-                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","abc",[]))), 
-?line <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[trim]))), 
-?line <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ababc","abc",[trim]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("ababc","abc",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("ababc","abc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))), 
-?line <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[trim]))), 
-?line <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[{parts,
-                                                                                                                                                              2}]))), 
-?line <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[]))), 
-?line <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[trim]))), 
-?line <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[{parts,
-                                                                                                                                                              2}]))), 
-?line <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[]))), 
-?line <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[trim]))), 
-?line <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[{parts,
+    <<"aaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaa","^(a\\1?)(a\\1?)(a\\2?)(a\\3?)$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","abc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","abc",[{parts,
+                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","abc",[]))), 
+    <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[trim]))), 
+    <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[{parts,
+                                                                                                                                                                2}]))), 
+    <<"x:y">> = iolist_to_binary(join(re:split("xabcy","abc",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ababc","abc",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("ababc","abc",[{parts,
+                                                                                                                                                                2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("ababc","abc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))), 
+    <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[trim]))), 
+    <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[{parts,
+                                                                                                                                                            2}]))), 
+    <<"xbc">> = iolist_to_binary(join(re:split("xbc","abc",[]))), 
+    <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[trim]))), 
+    <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[{parts,
+                                                                                                                                                            2}]))), 
+    <<"axc">> = iolist_to_binary(join(re:split("axc","abc",[]))), 
+    <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[trim]))), 
+    <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[{parts,
+                                                                                                                                                            2}]))), 
+    <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","ab*c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab*c",[{parts,
                                                                                                                                                               2}]))), 
-?line <<"abx">> = iolist_to_binary(join(re:split("abx","abc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","ab*c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab*c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abc","ab*c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","ab*bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab*bc",[{parts,
                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab*c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","ab*bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab*bc",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abc","ab*bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab*bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab*bc",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab*bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbc","ab*bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab*bc",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab*bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[trim]))), 
+    <<":bbbbc">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab*bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[{parts,
+    <<"::::::">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[]))), 
+    <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[trim]))), 
+    <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab*bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[trim]))), 
-?line <<":bbbbc">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[{parts,
+    <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab+bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab+bc",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab+bc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[{parts,
+                                                                                                                                                                2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[]))), 
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[trim]))), 
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[{parts,
+                                                                                                                                                                2}]))), 
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<"::::::">> = iolist_to_binary(join(re:split("abbbbc",".{1}",[]))), 
-?line <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[trim]))), 
-?line <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":bc">> = iolist_to_binary(join(re:split("abbbbc",".{3,4}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[]))), 
+    ok.
+run15() ->
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{0,}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbc","ab+bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab+bc",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab+bc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","ab+bc",[]))), 
-?line <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[trim]))), 
-?line <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<"abq">> = iolist_to_binary(join(re:split("abq","ab+bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[]))), 
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[trim]))), 
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab+bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[{parts,
+    <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[]))), 
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[trim]))), 
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{1,3}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbbbc","ab{3,4}bc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}bc",[]))), 
-?line <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[trim]))), 
-?line <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"abq">> = iolist_to_binary(join(re:split("abq","ab{4,5}bc",[]))), 
-?line <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[trim]))), 
-?line <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abbc","ab?bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab?bc",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abbc","ab?bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","ab?bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab?bc",[{parts,
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","ab{4,5}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abbc","ab?bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab?bc",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab?bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","ab?c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab?c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abbc","ab?bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","ab?bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab?bc",[{parts,
                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab?c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abc","ab?bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))), 
-?line <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[trim]))), 
-?line <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[]))), 
-?line <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[trim]))), 
-?line <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[trim]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}bc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","ab?c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab?c",[{parts,
+                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab?c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","ab{0,1}c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","^abc$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^abc$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[{parts,
                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[]))), 
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[trim]))), 
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"abbbbc">> = iolist_to_binary(join(re:split("abbbbc","^abc$",[]))), 
+    <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[trim]))), 
+    <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))), 
-?line <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[trim]))), 
-?line <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^",[{parts,
-                                                                                                                                                          2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","$",[trim]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","$",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","a.c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","a.c",[{parts,
+    <<"abcc">> = iolist_to_binary(join(re:split("abcc","^abc$",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[trim]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abcc","^abc",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc$",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aabc","abc$",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aabc","abc$",[]))), 
+    <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[trim]))), 
+    <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<"aabcd">> = iolist_to_binary(join(re:split("aabcd","abc$",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^",[{parts,
+                                                                                                                                                        2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","$",[trim]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","$",[{parts,
+                                                                                                                                                         2}]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","a.c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","a.c",[{parts,
+                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","a.c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("axc","a.c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("axc","a.c",[{parts,
+                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("axc","a.c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("axyzc","a.*c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("axyzc","a.*c",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("axyzc","a.*c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abd","a[bc]d",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","a[bc]d",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","a[bc]d",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[]))), 
+    <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[trim]))), 
+    <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aac","a[b-d]",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aac","a[b-d]",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aac","a[b-d]",[]))), 
+    ok.
+run16() ->
+    <<"">> = iolist_to_binary(join(re:split("a-","a[-b]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-","a[-b]",[{parts,
                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","a.c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("axc","a.c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("axc","a.c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("a-","a[-b]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-","a[b-]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-","a[b-]",[{parts,
                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("axc","a.c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("axyzc","a.*c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("axyzc","a.*c",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("a-","a[b-]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a]","a]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a]","a]",[{parts,
+                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a]","a]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a]b","a[]]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a]b","a[]]b",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a]b","a[]]b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("axyzc","a.*c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abd","a[bc]d",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abd","a[bc]d",[{parts,
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abd","a[bc]d",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[{parts,
                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bc]d",[]))), 
-?line <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[trim]))), 
-?line <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"axyzd">> = iolist_to_binary(join(re:split("axyzd","a[bc]d",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","a[bc]d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ace","a[b-d]e",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("aac","a[b-d]",[trim]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("aac","a[b-d]",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[]))), 
+    <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[trim]))), 
+    <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("aac","a[b-d]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-","a[-b]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-","a[-b]",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-","a[-b]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-","a[b-]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-","a[b-]",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-","a[b-]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a]","a]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a]","a]",[{parts,
-                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a]","a]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a]b","a[]]b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a]b","a[]]b",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a]b","a[]]b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[{parts,
+    <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[]))), 
+    <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[trim]))), 
+    <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[trim]))), 
+    <<"-:">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"-:">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[]))), 
+    <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[trim]))), 
+    <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aed","a[^bc]d",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[{parts,
+    <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^bc]d",[]))), 
-?line <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))), 
-?line <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))), 
-?line <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[trim]))), 
-?line <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"abd">> = iolist_to_binary(join(re:split("abd","a[^bc]d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("adc","a[^-b]c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[]))), 
+    <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[trim]))), 
+    <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[]))), 
+    <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[trim]))), 
+    <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[trim]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("adc","a[^]b]c",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[{parts,
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[trim]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^]b]c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-c","a[^]b]c",[]))), 
-?line <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[trim]))), 
-?line <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"a]c">> = iolist_to_binary(join(re:split("a]c","a[^]b]c",[]))), 
-?line <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[trim]))), 
-?line <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":-">> = iolist_to_binary(join(re:split("a-","\\ba\\b",[]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[trim]))), 
-?line <<"-:">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"-:">> = iolist_to_binary(join(re:split("-a","\\ba\\b",[]))), 
-?line <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[trim]))), 
-?line <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"-:-">> = iolist_to_binary(join(re:split("-a-","\\ba\\b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\by\\b",[]))), 
-?line <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[trim]))), 
-?line <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"xy">> = iolist_to_binary(join(re:split("xy","\\by\\b",[]))), 
-?line <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[trim]))), 
-?line <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"yz">> = iolist_to_binary(join(re:split("yz","\\by\\b",[]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[trim]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"xyz">> = iolist_to_binary(join(re:split("xyz","\\by\\b",[]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[trim]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[]))), 
-?line <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[trim]))), 
-?line <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[]))), 
-?line <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[trim]))), 
-?line <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[]))), 
-?line <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[trim]))), 
-?line <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[]))), 
-?line <<"x">> = iolist_to_binary(join(re:split("xy","\\By\\b",[trim]))), 
-?line <<"x:">> = iolist_to_binary(join(re:split("xy","\\By\\b",[{parts,
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","\\Ba\\B",[]))), 
+    <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[trim]))), 
+    <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"a-">> = iolist_to_binary(join(re:split("a-","\\Ba\\B",[]))), 
+    <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[trim]))), 
+    <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"-a">> = iolist_to_binary(join(re:split("-a","\\Ba\\B",[]))), 
+    <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[trim]))), 
+    <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<"x:">> = iolist_to_binary(join(re:split("xy","\\By\\b",[]))), 
-?line <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[trim]))), 
-?line <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[{parts,
+    <<"-a-">> = iolist_to_binary(join(re:split("-a-","\\Ba\\B",[]))), 
+    <<"x">> = iolist_to_binary(join(re:split("xy","\\By\\b",[trim]))), 
+    <<"x:">> = iolist_to_binary(join(re:split("xy","\\By\\b",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"x:">> = iolist_to_binary(join(re:split("xy","\\By\\b",[]))), 
+    <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[trim]))), 
+    <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[]))), 
+    <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[trim]))), 
+    <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<":z">> = iolist_to_binary(join(re:split("yz","\\by\\B",[]))), 
-?line <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[trim]))), 
-?line <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","\\w",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\W",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))), 
-?line <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[trim]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\W",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","\\W",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","\\W",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","\\W",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a b","a\\sb",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a b","a\\sb",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a b","a\\sb",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))), 
-?line <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[trim]))), 
-?line <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1","\\d",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1","\\d",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1","\\d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\D",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("*** Failers","\\D",[trim]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\D",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","\\D",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\D",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))), 
-?line <<"1">> = iolist_to_binary(join(re:split("1","\\D",[trim]))), 
-?line <<"1">> = iolist_to_binary(join(re:split("1","\\D",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<"1">> = iolist_to_binary(join(re:split("1","\\D",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","[\\w]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","[\\w]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","[\\w]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))), 
-?line <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[trim]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))), 
-?line <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[trim]))), 
-?line <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("1","[\\d]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1","[\\d]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("1","[\\d]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[trim]))), 
-?line <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[{parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))), 
-?line <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[trim]))), 
-?line <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[trim]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[{parts,
+    <<"x:z">> = iolist_to_binary(join(re:split("xyz","\\By\\B",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","\\w",[{parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\W",[{parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))), 
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[trim]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","\\W",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","\\W",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\W",[{parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\W",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","\\W",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","\\W",[{parts,
+                                                                                                                                                         2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","\\W",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a b","a\\sb",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a b","a\\sb",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a b","a\\sb",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Sb",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a\\Sb",[]))), 
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[trim]))), 
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a\\Sb",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("1","\\d",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("1","\\d",[{parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("1","\\d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\D",[{parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("*** Failers","\\D",[trim]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\D",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","\\D",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","\\D",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\D",[{parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","\\D",[]))), 
+    <<"1">> = iolist_to_binary(join(re:split("1","\\D",[trim]))), 
+    <<"1">> = iolist_to_binary(join(re:split("1","\\D",[{parts,
+                                                                                                                                                         2}]))), 
+    <<"1">> = iolist_to_binary(join(re:split("1","\\D",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","[\\w]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","[\\w]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","[\\w]",[]))), 
+    ok.
+run17() ->
+    <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))), 
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[trim]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"::::Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\W]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","[\\W]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\W]",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","[\\W]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a b","a[\\s]b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[\\S]b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a-b","a[\\S]b",[]))), 
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[trim]))), 
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<"a b">> = iolist_to_binary(join(re:split("a b","a[\\S]b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("1","[\\d]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("1","[\\d]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("1","[\\d]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[trim]))), 
+    <<":** Failers">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":::::::::::">> = iolist_to_binary(join(re:split("*** Failers","[\\D]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","[\\D]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[\\D]",[]))), 
+    <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[trim]))), 
+    <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[{parts,
+                                                                                                                                                             2}]))), 
+    <<"1">> = iolist_to_binary(join(re:split("1","[\\D]",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[trim]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","ab|cd",[trim]))), 
+    <<":cd">> = iolist_to_binary(join(re:split("abcd","ab|cd",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abc","ab|cd",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","ab|cd",[trim]))), 
-?line <<":cd">> = iolist_to_binary(join(re:split("abcd","ab|cd",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcd","ab|cd",[]))), 
-?line <<"d">> = iolist_to_binary(join(re:split("def","()ef",[trim]))), 
-?line <<"d::">> = iolist_to_binary(join(re:split("def","()ef",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("abcd","ab|cd",[]))), 
+    <<"d">> = iolist_to_binary(join(re:split("def","()ef",[trim]))), 
+    <<"d::">> = iolist_to_binary(join(re:split("def","()ef",[{parts,
+                                                                                                                                                              2}]))), 
+    <<"d::">> = iolist_to_binary(join(re:split("def","()ef",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a(b","a\\(b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a(b","a\\(b",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a(b","a\\(b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","a\\(*b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","a\\(*b",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","a\\(*b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[]))), 
+    <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[trim]))), 
+    <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[{parts,
                                                                                                                                                                 2}]))), 
-?line <<"d::">> = iolist_to_binary(join(re:split("def","()ef",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a(b","a\\(b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a(b","a\\(b",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a(b","a\\(b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","a\\(*b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","a\\(*b",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","a\\(*b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a((b","a\\(*b",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[{parts,
+    <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[]))), 
+    <<":a:c">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[trim]))), 
+    <<":a:c:">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","a\\\\b",[]))), 
-?line <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[trim]))), 
-?line <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<":a:a:bc">> = iolist_to_binary(join(re:split("abc","((a))",[]))), 
-?line <<":a:c">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[trim]))), 
-?line <<":a:c:">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[{parts,
+    <<":a:c:">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[]))), 
+    <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[trim]))), 
+    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[]))), 
+    <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[trim]))), 
+    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<":a:c:">> = iolist_to_binary(join(re:split("abc","(a)b(c)",[]))), 
-?line <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[trim]))), 
-?line <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a+b+c",[]))), 
-?line <<"aabb">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[trim]))), 
-?line <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<"aabb:">> = iolist_to_binary(join(re:split("aabbabc","a{1,}b{1,}c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[trim]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abcabc","a.+?c",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)*",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[trim]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[{parts,
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,}",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b)+",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[]))), 
+    ok.
+run18() ->
+    <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[]))), 
+    <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("ab","(a+|b){1,}",[]))), 
-?line <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b)?",[]))), 
-?line <<":a::b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[{parts,
+    <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("cde","[^ab]*",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("cde","[^ab]*",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("cde","[^ab]*",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<":a::b:">> = iolist_to_binary(join(re:split("ab","(a+|b){0,1}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("cde","[^ab]*",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cde","[^ab]*",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cde","[^ab]*",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","abc",[trim]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","abc",[{parts,
+                                                                                                                                                        2}]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","abc",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[trim]))), 
+    <<":c:">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","abc",[trim]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","abc",[{parts,
-                                                                                                                                                          2}]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","abc",[]))), 
-?line <<":c">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[trim]))), 
-?line <<":c:">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":c:">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[{parts,
+    <<":c:">> = iolist_to_binary(join(re:split("abbbcd","([abc])*d",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[]))), 
-?line <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[trim]))), 
-?line <<"x:yabbbz">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[]))), 
-?line <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[trim]))), 
-?line <<"x:yabbbz">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[]))), 
-?line <<"ab:cd">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[trim]))), 
-?line <<"ab:cd:">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("abcd","([abc])*bcd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("e","a|b|c|d|e",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"ab:cd:">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[]))), 
-?line <<"abcd">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[trim]))), 
-?line <<"abcd::">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[{parts,
+    <<":e:">> = iolist_to_binary(join(re:split("ef","(a|b|c|d|e)f",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"abcd::">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[]))), 
-?line <<"a:b">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[trim]))), 
-?line <<"a:b:">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("abcdefg","abcd*efg",[]))), 
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[trim]))), 
+    <<"x:yabbbz">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xabyabbbz","ab*",[]))), 
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[trim]))), 
+    <<"x:yabbbz">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"x:y:z">> = iolist_to_binary(join(re:split("xayabbbz","ab*",[]))), 
+    <<"ab:cd">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[trim]))), 
+    <<"ab:cd:">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"a:b:">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[]))), 
-?line <<":bc">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[trim]))), 
-?line <<":bc:">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[{parts,
+    <<"ab:cd:">> = iolist_to_binary(join(re:split("abcde","(ab|cd)e",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("hij","[abhgefdc]ij",[]))), 
+    <<"abcd">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[trim]))), 
+    <<"abcd::">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<":bc:">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[]))), 
-?line <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[trim]))), 
-?line <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[]))), 
-?line <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[trim]))), 
-?line <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[]))), 
-?line <<":b:cd">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[trim]))), 
-?line <<":b:cd:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":b:cd:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[]))), 
-?line <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[trim]))), 
-?line <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[]))), 
-?line <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[trim]))), 
-?line <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[]))), 
-?line <<":ab">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[trim]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[{parts,
+    <<"abcd::">> = iolist_to_binary(join(re:split("abcdef","(abc|)ef",[]))), 
+    <<"a:b">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[trim]))), 
+    <<"a:b:">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"a:b:">> = iolist_to_binary(join(re:split("abcd","(a|b)c*d",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("abc","(ab|ab*)bc",[]))), 
+    <<":bc">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[trim]))), 
+    <<":bc:">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[]))), 
-?line <<":abc:a:b:d">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[trim]))), 
-?line <<":abc:a:b:d:">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[{parts,
+    <<":bc:">> = iolist_to_binary(join(re:split("abc","a([bc]*)c*",[]))), 
+    <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[trim]))), 
+    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":abc:a:b:d:">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[trim]))), 
-?line <<"a::">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[{parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"a::">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[]))), 
-?line <<":effgz">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
-?line <<":effgz::">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<":effgz::">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-?line <<":ij:j">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
-?line <<":ij:j:">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                   2}]))), 
-?line <<":ij:j:">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-?line <<"r:effgz">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
-?line <<"r:effgz::">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                           2}]))), 
-?line <<"r:effgz::">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-?line <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
-?line <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[{parts,
-                                                                                                                                                                                                       2}]))), 
-?line <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-?line <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
-?line <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[{parts,
+    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c*d)",[]))), 
+    <<":bc:d">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[trim]))), 
+    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":bc:d:">> = iolist_to_binary(join(re:split("abcd","a([bc]+)(c*d)",[]))), 
+    ok.
+run19() ->
+    <<":b:cd">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[trim]))), 
+    <<":b:cd:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":b:cd:">> = iolist_to_binary(join(re:split("abcd","a([bc]*)(c+d)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]*dcdcde",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[bcd]+dcdcde",[]))), 
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[trim]))), 
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"abcde">> = iolist_to_binary(join(re:split("abcde","a[bcd]+dcdcde",[]))), 
+    <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[trim]))), 
+    <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"adcdcde">> = iolist_to_binary(join(re:split("adcdcde","a[bcd]+dcdcde",[]))), 
+    <<":ab">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[trim]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(ab|a)b*c",[]))), 
+    <<":abc:a:b:d">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[trim]))), 
+    <<":abc:a:b:d:">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":abc:a:b:d:">> = iolist_to_binary(join(re:split("abcd","((a)(b)c)(d)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("alpha","[a-zA-Z_][a-zA-Z0-9_]*",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[trim]))), 
+    <<"a::">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"a::">> = iolist_to_binary(join(re:split("abh","^a(bc+|b[eh])g|.h$",[]))), 
+    <<":effgz">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+    <<":effgz::">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[{parts,
                                                                                                                                                                                                        2}]))), 
-?line <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[]))), 
-?line <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[trim]))), 
-?line <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[]))), 
-?line <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[trim]))), 
-?line <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[{parts,
+    <<":effgz::">> = iolist_to_binary(join(re:split("effgz","(bc+d$|ef*g.|h?i(j|k))",[]))), 
+    <<":ij:j">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+    <<":ij:j:">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<":ij:j:">> = iolist_to_binary(join(re:split("ij","(bc+d$|ef*g.|h?i(j|k))",[]))), 
+    <<"r:effgz">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+    <<"r:effgz::">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[{parts,
                                                                                                                                                                                                          2}]))), 
-?line <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[]))), 
-?line <<":a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[trim]))), 
-?line <<":a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<":a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[trim]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[]))), 
-?line <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[trim]))), 
-?line <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[]))), 
-?line <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[trim]))), 
-?line <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[]))), 
-?line <<":ab:de">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[trim]))), 
-?line <<":ab:de:">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":ab:de:">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[trim]))), 
-?line <<":a:b:">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[{parts,
+    <<"r:effgz::">> = iolist_to_binary(join(re:split("reffgz","(bc+d$|ef*g.|h?i(j|k))",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[]))), 
+    <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+    <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[{parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"effg">> = iolist_to_binary(join(re:split("effg","(bc+d$|ef*g.|h?i(j|k))",[]))), 
+    <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[trim]))), 
+    <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[{parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"bcdd">> = iolist_to_binary(join(re:split("bcdd","(bc+d$|ef*g.|h?i(j|k))",[]))), 
+    <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[trim]))), 
+    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","((((((((((a))))))))))",[]))), 
+    <<":a:a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[trim]))), 
+    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<":a:a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("aa","((((((((((a))))))))))\\10",[]))), 
+    <<":a:a:a:a:a:a:a:a:a">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[trim]))), 
+    <<":a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":a:a:a:a:a:a:a:a:a:">> = iolist_to_binary(join(re:split("a","(((((((((a)))))))))",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[trim]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<":a:b:">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","abcd",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","abcd",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcd","abcd",[]))), 
-?line <<":bc">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[trim]))), 
-?line <<":bc:">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":bc:">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ac","a[-]?c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ac","a[-]?c",[{parts,
-                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ac","a[-]?c",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[{parts,
+    <<"aa">> = iolist_to_binary(join(re:split("aa","multiple words of text",[]))), 
+    <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[trim]))), 
+    <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"uh-uh">> = iolist_to_binary(join(re:split("uh-uh","multiple words of text",[]))), 
+    <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[trim]))), 
+    <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<":, yeah">> = iolist_to_binary(join(re:split("multiple words, yeah","multiple words",[]))), 
+    <<":ab:de">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[trim]))), 
+    <<":ab:de:">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":ab:de:">> = iolist_to_binary(join(re:split("abcde","(.*)c(.*)",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[trim]))), 
+    <<":a:b:">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":a:b:">> = iolist_to_binary(join(re:split("(a, b)","\\((.*), (.*)\\)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","abcd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","abcd",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","abcd",[]))), 
+    <<":bc">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[trim]))), 
+    <<":bc:">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":bc:">> = iolist_to_binary(join(re:split("abcd","a(bc)d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ac","a[-]?c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","a[-]?c",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","a[-]?c",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(abc)\\1",[]))), 
+    ok.
+run20() ->
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("a","(a)|\\1",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("a","(a)|\\1",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("a","(a)|\\1",[]))), 
+    <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[trim]))), 
+    <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abcabc","([a-c]*)\\1",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("a","(a)|\\1",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("a","(a)|\\1",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("a","(a)|\\1",[]))), 
-?line <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[trim]))), 
-?line <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[trim]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[]))), 
-?line <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[trim]))), 
-?line <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[]))), 
-?line <<":bb:b:b:cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[trim]))), 
-?line <<":bb:b:bcbc">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<":bb:b:b:cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[]))), 
-?line <<":cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[trim]))), 
-?line <<":cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[{parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<":cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[]))), 
-?line <<"aaaxabaxbaax:bbax:b:a">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[trim]))), 
-?line <<"aaaxabaxbaax:bbax:b:a:">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<"aaaxabaxbaax:bbax:b:a:">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[]))), 
-?line <<"bbaababbabaaaaa:bba:b:a">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[trim]))), 
-?line <<"bbaababbabaaaaa:bba:b:a:">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[{parts,
-                                                                                                                                                                                                                                          2}]))), 
-?line <<"bbaababbabaaaaa:bba:b:a:">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","abc",[caseless,
-                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","abc",[caseless,
-                                                                                                                                                              {parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","abc",[caseless]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless,
-                                                                                                                                                                trim]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless,
-                                                                                                                                                                  {parts,
+    <<"*** F:a:ilers">> = iolist_to_binary(join(re:split("*** Failers","(a)|\\1",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[{parts,
                                                                                                                                                                    2}]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless,
-                                                                                                                                                                trim]))), 
-?line <<"AB:">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless,
-                                                                                                                                                                  {parts,
-                                                                                                                                                                   2}]))), 
-?line <<"AB:">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless,
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(a)|\\1",[]))), 
+    <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[trim]))), 
+    <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"x">> = iolist_to_binary(join(re:split("x","(a)|\\1",[]))), 
+    <<":bb:b:b:cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[trim]))), 
+    <<":bb:b:bcbc">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<":bb:b:b:cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2)*",[]))), 
+    <<":cbc:c">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[trim]))), 
+    <<":cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<":cbc:c:">> = iolist_to_binary(join(re:split("ababbbcbc","(([a-c])b*?\\2){3}",[]))), 
+    <<"aaaxabaxbaax:bbax:b:a">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[trim]))), 
+    <<"aaaxabaxbaax:bbax:b:a:">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"aaaxabaxbaax:bbax:b:a:">> = iolist_to_binary(join(re:split("aaaxabaxbaaxbbax","((\\3|b)\\2(a)x)+",[]))), 
+    <<"bbaababbabaaaaa:bba:b:a">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[trim]))), 
+    <<"bbaababbabaaaaa:bba:b:a:">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[{parts,
+                                                                                                                                                                                                                                        2}]))), 
+    <<"bbaababbabaaaaa:bba:b:a:">> = iolist_to_binary(join(re:split("bbaababbabaaaaabbaaaabba","((\\3|b)\\2(a)){2,}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","abc",[caseless,
+                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","abc",[caseless,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","abc",[caseless]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless,
+                                                                                                                                                              trim]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XABCY","abc",[caseless]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless,
+                                                                                                                                                              trim]))), 
+    <<"AB:">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<"AB:">> = iolist_to_binary(join(re:split("ABABC","abc",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless]))), 
+    <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless,
                                                                                                                                                                             trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless,
+    <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless,
                                                                                                                                                                               {parts,
                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","abc",[caseless]))), 
-?line <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless]))), 
-?line <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless,
-                                                                                                                                                            trim]))), 
-?line <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless,
-                                                                                                                                                              {parts,
-                                                                                                                                                               2}]))), 
-?line <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless]))), 
-?line <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless,
-                                                                                                                                                            trim]))), 
-?line <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless,
-                                                                                                                                                              {parts,
-                                                                                                                                                               2}]))), 
-?line <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless]))), 
-?line <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless,
+    <<"aaxabxbaxbbx">> = iolist_to_binary(join(re:split("aaxabxbaxbbx","abc",[caseless]))), 
+    <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless,
+                                                                                                                                                          trim]))), 
+    <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<"XBC">> = iolist_to_binary(join(re:split("XBC","abc",[caseless]))), 
+    <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless,
+                                                                                                                                                          trim]))), 
+    <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<"AXC">> = iolist_to_binary(join(re:split("AXC","abc",[caseless]))), 
+    <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless,
+                                                                                                                                                          trim]))), 
+    <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless,
                                                                                                                                                             trim]))), 
-?line <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless,
                                                                                                                                                               {parts,
                                                                                                                                                                2}]))), 
-?line <<"ABX">> = iolist_to_binary(join(re:split("ABX","abc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless,
                                                                                                                                                               trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless,
                                                                                                                                                                 {parts,
                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab*c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless,
                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless,
                                                                                                                                                                   {parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab*bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless,
                                                                                                                                                                   trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless,
                                                                                                                                                                     {parts,
                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBC","ab*bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless,
-                                                                                                                                                                        trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless,
-                                                                                                                                                                          {parts,
-                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab*?bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless,
                                                                                                                                                                               trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless,
                                                                                                                                                                                 {parts,
                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{0,}?bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless,
+                                                                                                                                                              trim]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless]))), 
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless,
+                                                                                                                                                              trim]))), 
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless,
                                                                                                                                                                     trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless,
                                                                                                                                                                       {parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBC","ab+?bc",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless,
-                                                                                                                                                                                trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless,
-                                                                                                                                                                                  {parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab+bc",[caseless]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless,
-                                                                                                                                                                trim]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless,
-                                                                                                                                                                  {parts,
-                                                                                                                                                                   2}]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","ab+bc",[caseless]))), 
-?line <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless,
-                                                                                                                                                                trim]))), 
-?line <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless,
-                                                                                                                                                                  {parts,
-                                                                                                                                                                   2}]))), 
-?line <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab+bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless,
-                                                                                                                                                                      trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless,
-                                                                                                                                                                        {parts,
-                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab+bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless,
                                                                                                                                                                               trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless,
                                                                                                                                                                                 {parts,
                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,}?bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless,
-                                                                                                                                                                                trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless,
-                                                                                                                                                                                  {parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless,
-                                                                                                                                                                                trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless,
-                                                                                                                                                                                  {parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless,
-                                                                                                                                                                                          trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless,
-                                                                                                                                                                                            {parts,
-                                                                                                                                                                                             2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless]))), 
-?line <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless]))), 
-?line <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless,
-                                                                                                                                                                                trim]))), 
-?line <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless,
-                                                                                                                                                                                  {parts,
-                                                                                                                                                                                   2}]))), 
-?line <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{1,3}?bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABBBBC","ab{3,4}?bc",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless,
+                                                                                                                                                                                        trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless,
+                                                                                                                                                                                          {parts,
+                                                                                                                                                                                           2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","ab{4,5}?bc",[caseless]))), 
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<"ABQ">> = iolist_to_binary(join(re:split("ABQ","ab{4,5}?bc",[caseless]))), 
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","ab{4,5}?bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless,
                                                                                                                                                                   trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless,
                                                                                                                                                                     {parts,
                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABBC","ab??bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless,
                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless,
                                                                                                                                                                   {parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab??bc",[caseless]))), 
+    ok.
+run21() ->
+    <<"">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless,
                                                                                                                                                                         trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless,
                                                                                                                                                                           {parts,
                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?bc",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless,
+                                                                                                                                                              trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab??c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","ab{0,1}?c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless,
+                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless,
+                                                                                                                                                                 {parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless,
+                                                                                                                                                                               trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless,
+                                                                                                                                                                                 {parts,
+                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless]))), 
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless,
+                                                                                                                                                                     trim]))), 
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless,
+                                                                                                                                                                       {parts,
+                                                                                                                                                                        2}]))), 
+    <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless]))), 
+    <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless,
                                                                                                                                                                  trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless,
+    <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless,
                                                                                                                                                                    {parts,
                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","^abc$",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless,
-                                                                                                                                                                                 trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless,
-                                                                                                                                                                                   {parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^abc$",[caseless]))), 
-?line <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless,
-                                                                                                                                                                       trim]))), 
-?line <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless,
-                                                                                                                                                                         {parts,
-                                                                                                                                                                          2}]))), 
-?line <<"ABBBBC">> = iolist_to_binary(join(re:split("ABBBBC","^abc$",[caseless]))), 
-?line <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless,
-                                                                                                                                                                   trim]))), 
-?line <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless,
-                                                                                                                                                                     {parts,
-                                                                                                                                                                      2}]))), 
-?line <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless,
+    <<"ABCC">> = iolist_to_binary(join(re:split("ABCC","^abc$",[caseless]))), 
+    <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless,
+                                                                                                                                                              trim]))), 
+    <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless]))), 
+    <<"A">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless,
+                                                                                                                                                               trim]))), 
+    <<"A:">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless,
+                                                                                                                                                                 {parts,
+                                                                                                                                                                  2}]))), 
+    <<"A:">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless,
+                                                                                                                                                      trim]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless,
+                                                                                                                                                        {parts,
+                                                                                                                                                         2}]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","$",[caseless,
+                                                                                                                                                       trim]))), 
+    <<"ABC:">> = iolist_to_binary(join(re:split("ABC","$",[caseless,
+                                                                                                                                                         {parts,
+                                                                                                                                                          2}]))), 
+    <<"ABC:">> = iolist_to_binary(join(re:split("ABC","$",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless,
+                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless,
+                                                                                                                                                          trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless,
+                                                                                                                                                              trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless]))), 
+    <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless,
                                                                                                                                                                 trim]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless,
+    <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless,
                                                                                                                                                                   {parts,
                                                                                                                                                                    2}]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("ABCC","^abc",[caseless]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless,
-                                                                                                                                                                 trim]))), 
-?line <<"A:">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless,
-                                                                                                                                                                   {parts,
-                                                                                                                                                                    2}]))), 
-?line <<"A:">> = iolist_to_binary(join(re:split("AABC","abc$",[caseless]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless,
-                                                                                                                                                        trim]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless,
-                                                                                                                                                          {parts,
-                                                                                                                                                           2}]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","^",[caseless]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","$",[caseless,
-                                                                                                                                                         trim]))), 
-?line <<"ABC:">> = iolist_to_binary(join(re:split("ABC","$",[caseless,
-                                                                                                                                                           {parts,
-                                                                                                                                                            2}]))), 
-?line <<"ABC:">> = iolist_to_binary(join(re:split("ABC","$",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless,
-                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless,
-                                                                                                                                                              {parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABC","a.c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless,
-                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless,
-                                                                                                                                                              {parts,
-                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AXC","a.c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AXYZC","a.*?c",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a.*c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless,
+    <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless,
                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless,
                                                                                                                                                                   {parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AABC","a.*c",[caseless]))), 
-?line <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless,
                                                                                                                                                                   trim]))), 
-?line <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless,
                                                                                                                                                                     {parts,
                                                                                                                                                                      2}]))), 
-?line <<"AXYZD">> = iolist_to_binary(join(re:split("AXYZD","a.*c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless,
                                                                                                                                                                   trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless,
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless,
                                                                                                                                                                     {parts,
                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABD","a[bc]d",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ACE","a[b-d]e",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[b-d]e",[caseless]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless]))), 
-?line <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless,
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","a[b-d]e",[caseless]))), 
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless,
                                                                                                                                                                   trim]))), 
-?line <<"A:">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless,
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless,
                                                                                                                                                                     {parts,
                                                                                                                                                                      2}]))), 
-?line <<"A:">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless,
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[b-d]e",[caseless]))), 
+    <<"A">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless,
+                                                                                                                                                                trim]))), 
+    <<"A:">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<"A:">> = iolist_to_binary(join(re:split("AAC","a[b-d]",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless,
+                                                                                                                                                            trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless,
+                                                                                                                                                              {parts,
+                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless,
+                                                                                                                                                            trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless,
+                                                                                                                                                              {parts,
+                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("A]","a]",[caseless,
+                                                                                                                                                      trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("A]","a]",[caseless,
+                                                                                                                                                        {parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("A]","a]",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless,
                                                                                                                                                               trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless,
                                                                                                                                                                 {parts,
                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A-","a[-b]",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless]))), 
+    ok.
+run22() ->
+    <<"">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless]))), 
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless]))), 
+    <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless]))), 
+    <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless,
                                                                                                                                                               trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless,
+    <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless,
                                                                                                                                                                 {parts,
                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A-","a[b-]",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("A]","a]",[caseless,
-                                                                                                                                                        trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A]","a]",[caseless,
-                                                                                                                                                          {parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A]","a]",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless,
+    <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless,
                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless,
+    <<":CD">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless,
                                                                                                                                                                   {parts,
                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A]B","a[]]b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AED","a[^bc]d",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ADC","a[^-b]c",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a[^-b]c",[caseless]))), 
-?line <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<"ABD">> = iolist_to_binary(join(re:split("ABD","a[^-b]c",[caseless]))), 
-?line <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless,
+    <<"::">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless]))), 
+    <<"D">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless,
+                                                                                                                                                            trim]))), 
+    <<"D::">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless,
+                                                                                                                                                              {parts,
+                                                                                                                                                               2}]))), 
+    <<"D::">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless]))), 
+    <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless,
+                                                                                                                                                          trim]))), 
+    <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless,
+                                                                                                                                                            {parts,
+                                                                                                                                                             2}]))), 
+    <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless]))), 
+    <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless,
+                                                                                                                                                      trim]))), 
+    <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless,
+                                                                                                                                                        {parts,
+                                                                                                                                                         2}]))), 
+    <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless,
+                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless,
+                                                                                                                                                                 {parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless,
+                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless,
+                                                                                                                                                                 {parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless,
+                                                                                                                                                                   trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless,
+                                                                                                                                                                     {parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless]))), 
+    <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
+                                                                                                                                                              notbol,
+                                                                                                                                                              trim]))), 
+    <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
+                                                                                                                                                                notbol,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
+                                                                                                                                                                 notbol]))), 
+    <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless,
+                                                                                                                                                              trim]))), 
+    <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless]))), 
+    <<":A:C">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":A:C:">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":A:C:">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless]))), 
+    <<"AABB">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless]))), 
+    <<"AABB">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless,
                                                                                                                                                                     trim]))), 
-?line <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless,
+    <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless,
                                                                                                                                                                       {parts,
                                                                                                                                                                        2}]))), 
-?line <<"A-C">> = iolist_to_binary(join(re:split("A-C","a[^-b]c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless,
+    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless,
                                                                                                                                                                     trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless,
+    <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless,
                                                                                                                                                                       {parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ADC","a[^]b]c",[caseless]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless,
-                                                                                                                                                                trim]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless,
-                                                                                                                                                                  {parts,
-                                                                                                                                                                   2}]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("ABC","ab|cd",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<":CD">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("ABCD","ab|cd",[caseless]))), 
-?line <<"D">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless,
-                                                                                                                                                              trim]))), 
-?line <<"D::">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless,
-                                                                                                                                                                {parts,
-                                                                                                                                                                 2}]))), 
-?line <<"D::">> = iolist_to_binary(join(re:split("DEF","()ef",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless,
+    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless,
                                                                                                                                                                             trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless,
+    <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless,
                                                                                                                                                                               {parts,
                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","$b",[caseless]))), 
-?line <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless,
-                                                                                                                                                            trim]))), 
-?line <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless,
-                                                                                                                                                              {parts,
-                                                                                                                                                               2}]))), 
-?line <<"A]C">> = iolist_to_binary(join(re:split("A]C","$b",[caseless]))), 
-?line <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless,
-                                                                                                                                                        trim]))), 
-?line <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless,
-                                                                                                                                                          {parts,
-                                                                                                                                                           2}]))), 
-?line <<"B">> = iolist_to_binary(join(re:split("B","$b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless,
-                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless,
-                                                                                                                                                                   {parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A(B","a\\(b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless,
-                                                                                                                                                                 trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless,
-                                                                                                                                                                   {parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AB","a\\(*b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless,
-                                                                                                                                                                     trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless,
-                                                                                                                                                                       {parts,
-                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("A((B","a\\(*b",[caseless]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
-                                                                                                                                                                notbol,
-                                                                                                                                                                trim]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
-                                                                                                                                                                  notbol,
-                                                                                                                                                                  {parts,
-                                                                                                                                                                   2}]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("A","a\\\\b",[caseless,
-                                                                                                                                                                   notbol]))), 
-?line <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless,
+    <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless]))), 
+    <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless,
                                                                                                                                                                 trim]))), 
-?line <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless,
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless,
                                                                                                                                                                   {parts,
                                                                                                                                                                    2}]))), 
-?line <<":A:A:BC">> = iolist_to_binary(join(re:split("ABC","((a))",[caseless]))), 
-?line <<":A:C">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":A:C:">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":A:C:">> = iolist_to_binary(join(re:split("ABC","(a)b(c)",[caseless]))), 
-?line <<"AABB">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless,
-                                                                                                                                                                        trim]))), 
-?line <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless,
-                                                                                                                                                                          {parts,
-                                                                                                                                                                           2}]))), 
-?line <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a+b+c",[caseless]))), 
-?line <<"AABB">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless,
-                                                                                                                                                                                    trim]))), 
-?line <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless,
-                                                                                                                                                                                      {parts,
-                                                                                                                                                                                       2}]))), 
-?line <<"AABB:">> = iolist_to_binary(join(re:split("AABBABC","a{1,}b{1,}c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless,
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless]))), 
+    <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless,
                                                                                                                                                                       trim]))), 
-?line <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless,
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless,
                                                                                                                                                                         {parts,
                                                                                                                                                                          2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.+?c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless,
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless]))), 
+    <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless,
+                                                                                                                                                                trim]))), 
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless]))), 
+    <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless,
                                                                                                                                                                       trim]))), 
-?line <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless,
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless,
                                                                                                                                                                         {parts,
                                                                                                                                                                          2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.*?c",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("ABCABC","a.{0,5}?c",[caseless]))), 
-?line <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)*",[caseless]))), 
-?line <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless,
-                                                                                                                                                                        trim]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless,
-                                                                                                                                                                          {parts,
-                                                                                                                                                                           2}]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,}",[caseless]))), 
-?line <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b)+",[caseless]))), 
-?line <<":B">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless,
+    <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless]))), 
+    ok.
+run23() ->
+    <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless,
+                                                                                                                                                                trim]))), 
+    <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless]))), 
+    <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless,
                                                                                                                                                                         trim]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless,
+    <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless,
                                                                                                                                                                           {parts,
                                                                                                                                                                            2}]))), 
-?line <<":B:">> = iolist_to_binary(join(re:split("AB","(a+|b){1,}",[caseless]))), 
-?line <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b)?",[caseless]))), 
-?line <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless,
+    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless]))), 
+    <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless,
                                                                                                                                                                           trim]))), 
-?line <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless,
+    <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless,
                                                                                                                                                                             {parts,
                                                                                                                                                                              2}]))), 
-?line <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}",[caseless]))), 
-?line <<":A::B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless,
+    <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless,
+                                                                                                                                                                trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless]))), 
+    <<":C">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless,
                                                                                                                                                                             trim]))), 
-?line <<":A:B">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless,
+    <<":C:">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless,
                                                                                                                                                                               {parts,
                                                                                                                                                                                2}]))), 
-?line <<":A::B:">> = iolist_to_binary(join(re:split("AB","(a+|b){0,1}?",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless,
-                                                                                                                                                                  trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless,
-                                                                                                                                                                    {parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("CDE","[^ab]*",[caseless]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<":C:">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":C:">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless]))), 
-?line <<":A">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless]))), 
-?line <<":E">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless,
+    <<":C:">> = iolist_to_binary(join(re:split("ABBBCD","([abc])*d",[caseless]))), 
+    <<":A">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless,
                                                                                                                                                                             trim]))), 
-?line <<":E:">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless,
+    <<":A:">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless,
                                                                                                                                                                               {parts,
                                                                                                                                                                                2}]))), 
-?line <<":E:">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless]))), 
-?line <<"X:Y:Z">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless,
-                                                                                                                                                                        trim]))), 
-?line <<"X:YABBBZ">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless,
-                                                                                                                                                                          {parts,
-                                                                                                                                                                           2}]))), 
-?line <<"X:Y:Z">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless]))), 
-?line <<"X:Y:Z">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless,
-                                                                                                                                                                      trim]))), 
-?line <<"X:YABBBZ">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless,
-                                                                                                                                                                        {parts,
-                                                                                                                                                                         2}]))), 
-?line <<"X:Y:Z">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless]))), 
-?line <<"AB:CD">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless,
+    <<":A:">> = iolist_to_binary(join(re:split("ABCD","([abc])*bcd",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("E","a|b|c|d|e",[caseless]))), 
+    <<":E">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless,
                                                                                                                                                                           trim]))), 
-?line <<"AB:CD:">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless,
+    <<":E:">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless,
                                                                                                                                                                             {parts,
                                                                                                                                                                              2}]))), 
-?line <<"AB:CD:">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless,
-                                                                                                                                                                              trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless,
-                                                                                                                                                                                {parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless]))), 
-?line <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless,
+    <<":E:">> = iolist_to_binary(join(re:split("EF","(a|b|c|d|e)f",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless,
                                                                                                                                                                             trim]))), 
-?line <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless,
                                                                                                                                                                               {parts,
                                                                                                                                                                                2}]))), 
-?line <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless]))), 
-?line <<"ABCD">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless,
-                                                                                                                                                                            trim]))), 
-?line <<"ABCD::">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless,
-                                                                                                                                                                              {parts,
-                                                                                                                                                                               2}]))), 
-?line <<"ABCD::">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless]))), 
-?line <<"A:B">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ABCDEFG","abcd*efg",[caseless]))), 
+    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"X:YABBBZ">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XABYABBBZ","ab*",[caseless]))), 
+    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless,
+                                                                                                                                                                    trim]))), 
+    <<"X:YABBBZ">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless,
+                                                                                                                                                                      {parts,
+                                                                                                                                                                       2}]))), 
+    <<"X:Y:Z">> = iolist_to_binary(join(re:split("XAYABBBZ","ab*",[caseless]))), 
+    <<"AB:CD">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless,
                                                                                                                                                                         trim]))), 
-?line <<"A:B:">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless,
+    <<"AB:CD:">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless,
                                                                                                                                                                           {parts,
                                                                                                                                                                            2}]))), 
-?line <<"A:B:">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless]))), 
-?line <<":A">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless,
+    <<"AB:CD:">> = iolist_to_binary(join(re:split("ABCDE","(ab|cd)e",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("HIJ","[abhgefdc]ij",[caseless]))), 
+    <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless,
                                                                                                                                                                           trim]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless,
+    <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless,
                                                                                                                                                                             {parts,
                                                                                                                                                                              2}]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless]))), 
-?line <<":BC">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless,
+    <<"ABCDE">> = iolist_to_binary(join(re:split("ABCDE","^(ab|cd)e",[caseless]))), 
+    <<"ABCD">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless,
                                                                                                                                                                           trim]))), 
-?line <<":BC:">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless,
+    <<"ABCD::">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless,
                                                                                                                                                                             {parts,
                                                                                                                                                                              2}]))), 
-?line <<":BC:">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless]))), 
-?line <<":BC:D">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless,
-                                                                                                                                                                                  trim]))), 
-?line <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless,
-                                                                                                                                                                                    {parts,
-                                                                                                                                                                                     2}]))), 
-?line <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless]))), 
-?line <<":BC:D">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless,
-                                                                                                                                                                                  trim]))), 
-?line <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless,
-                                                                                                                                                                                    {parts,
-                                                                                                                                                                                     2}]))), 
-?line <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless]))), 
-?line <<":B:CD">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless,
-                                                                                                                                                                                  trim]))), 
-?line <<":B:CD:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless,
-                                                                                                                                                                                    {parts,
-                                                                                                                                                                                     2}]))), 
-?line <<":B:CD:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless,
-                                                                                                                                                                                        trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless,
-                                                                                                                                                                                          {parts,
-                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless]))), 
-?line <<":AB">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless,
+    <<"ABCD::">> = iolist_to_binary(join(re:split("ABCDEF","(abc|)ef",[caseless]))), 
+    <<"A:B">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"A:B:">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"A:B:">> = iolist_to_binary(join(re:split("ABCD","(a|b)c*d",[caseless]))), 
+    <<":A">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless,
                                                                                                                                                                         trim]))), 
-?line <<":AB:">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless,
+    <<":A:">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless,
                                                                                                                                                                           {parts,
                                                                                                                                                                            2}]))), 
-?line <<":AB:">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless]))), 
-?line <<":ABC:A:B:D">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless,
+    <<":A:">> = iolist_to_binary(join(re:split("ABC","(ab|ab*)bc",[caseless]))), 
+    <<":BC">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<":BC:">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<":BC:">> = iolist_to_binary(join(re:split("ABC","a([bc]*)c*",[caseless]))), 
+    <<":BC:D">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless,
                                                                                                                                                                                 trim]))), 
-?line <<":ABC:A:B:D:">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless,
+    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless,
                                                                                                                                                                                   {parts,
                                                                                                                                                                                    2}]))), 
-?line <<":ABC:A:B:D:">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless,
-                                                                                                                                                                                                      trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless,
-                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless,
-                                                                                                                                                                                           trim]))), 
-?line <<"A::">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless,
-                                                                                                                                                                                             {parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"A::">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless]))), 
-?line <<":EFFGZ">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c*d)",[caseless]))), 
+    ok.
+run24() ->
+    <<":BC:D">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless,
+                                                                                                                                                                                trim]))), 
+    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless,
+                                                                                                                                                                                  {parts,
+                                                                                                                                                                                   2}]))), 
+    <<":BC:D:">> = iolist_to_binary(join(re:split("ABCD","a([bc]+)(c*d)",[caseless]))), 
+    <<":B:CD">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless,
+                                                                                                                                                                                trim]))), 
+    <<":B:CD:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless,
+                                                                                                                                                                                  {parts,
+                                                                                                                                                                                   2}]))), 
+    <<":B:CD:">> = iolist_to_binary(join(re:split("ABCD","a([bc]*)(c+d)",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless,
+                                                                                                                                                                                      trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless,
+                                                                                                                                                                                        {parts,
+                                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ADCDCDE","a[bcd]*dcdcde",[caseless]))), 
+    <<":AB">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<":AB:">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<":AB:">> = iolist_to_binary(join(re:split("ABC","(ab|a)b*c",[caseless]))), 
+    <<":ABC:A:B:D">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<":ABC:A:B:D:">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<":ABC:A:B:D:">> = iolist_to_binary(join(re:split("ABCD","((a)(b)c)(d)",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless,
+                                                                                                                                                                                                    trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ALPHA","[a-zA-Z_][a-zA-Z0-9_]*",[caseless]))), 
+    <<"A">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless,
+                                                                                                                                                                                         trim]))), 
+    <<"A::">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless,
+                                                                                                                                                                                           {parts,
+                                                                                                                                                                                            2}]))), 
+    <<"A::">> = iolist_to_binary(join(re:split("ABH","^a(bc+|b[eh])g|.h$",[caseless]))), 
+    <<":EFFGZ">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                     trim]))), 
+    <<":EFFGZ::">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":EFFGZ::">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+    <<":IJ:J">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                               trim]))), 
+    <<":IJ:J:">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                 {parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":IJ:J:">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+    <<"R:EFFGZ">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                        trim]))), 
-?line <<":EFFGZ::">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+    <<"R:EFFGZ::">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                          {parts,
                                                                                                                                                                                                           2}]))), 
-?line <<":EFFGZ::">> = iolist_to_binary(join(re:split("EFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
-?line <<":IJ:J">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                 trim]))), 
-?line <<":IJ:J:">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                   {parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<":IJ:J:">> = iolist_to_binary(join(re:split("IJ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
-?line <<"R:EFFGZ">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+    <<"R:EFFGZ::">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                                 trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                                   {parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+    <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                          trim]))), 
-?line <<"R:EFFGZ::">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+    <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless,
                                                                                                                                                                                                            {parts,
                                                                                                                                                                                                             2}]))), 
-?line <<"R:EFFGZ::">> = iolist_to_binary(join(re:split("REFFGZ","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                                   trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                                     {parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
-?line <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                           trim]))), 
-?line <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                             {parts,
-                                                                                                                                                                                                              2}]))), 
-?line <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
-?line <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                     trim]))), 
-?line <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless,
-                                                                                                                                                                                                       {parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
-?line <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+    <<"ADCDCDE">> = iolist_to_binary(join(re:split("ADCDCDE","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+    <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                   trim]))), 
+    <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                     {parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"EFFG">> = iolist_to_binary(join(re:split("EFFG","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+    <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                   trim]))), 
+    <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+                                                                                                                                                                                                     {parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
+    <<":A:A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless,
+                                                                                                                                                                                          trim]))), 
+    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless,
+                                                                                                                                                                                            {parts,
+                                                                                                                                                                                             2}]))), 
+    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless]))), 
+    <<":A:A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless,
                                                                                                                                                                                                      trim]))), 
-?line <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless,
+    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless,
                                                                                                                                                                                                        {parts,
                                                                                                                                                                                                         2}]))), 
-?line <<"BCDD">> = iolist_to_binary(join(re:split("BCDD","(bc+d$|ef*g.|h?i(j|k))",[caseless]))), 
-?line <<":A:A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless,
-                                                                                                                                                                                            trim]))), 
-?line <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless,
-                                                                                                                                                                                              {parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","((((((((((a))))))))))",[caseless]))), 
-?line <<":A:A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless,
-                                                                                                                                                                                                       trim]))), 
-?line <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless,
-                                                                                                                                                                                                         {parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless]))), 
-?line <<":A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless,
-                                                                                                                                                                                        trim]))), 
-?line <<":A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless,
-                                                                                                                                                                                          {parts,
-                                                                                                                                                                                           2}]))), 
-?line <<":A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless]))), 
-?line <<":A">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless,
-                                                                                                                                                                                                                                trim]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless,
-                                                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                                                   2}]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless]))), 
-?line <<":C">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless,
-                                                                                                                                                                                                                                        trim]))), 
-?line <<":C:">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless,
-                                                                                                                                                                                                                                          {parts,
-                                                                                                                                                                                                                                           2}]))), 
-?line <<":C:">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless,
-                                                                                                                                                                                                                  trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless,
-                                                                                                                                                                                                                    {parts,
-                                                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless]))), 
-?line <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless,
-                                                                                                                                                                                                trim]))), 
-?line <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless,
-                                                                                                                                                                                                  {parts,
-                                                                                                                                                                                                   2}]))), 
-?line <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless]))), 
-?line <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless,
-                                                                                                                                                                                                      trim]))), 
-?line <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless,
-                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless]))), 
-?line <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless,
-                                                                                                                                                                                                                    trim]))), 
-?line <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless,
-                                                                                                                                                                                                                      {parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless]))), 
-?line <<":AB:DE">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless,
-                                                                                                                                                                            trim]))), 
-?line <<":AB:DE:">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless,
-                                                                                                                                                                              {parts,
-                                                                                                                                                                               2}]))), 
-?line <<":AB:DE:">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless]))), 
-?line <<":A:B">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless,
+    <<":A:A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("AA","((((((((((a))))))))))\\10",[caseless]))), 
+    <<":A:A:A:A:A:A:A:A:A">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless,
+                                                                                                                                                                                      trim]))), 
+    <<":A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless,
+                                                                                                                                                                                        {parts,
+                                                                                                                                                                                         2}]))), 
+    <<":A:A:A:A:A:A:A:A:A:">> = iolist_to_binary(join(re:split("A","(((((((((a)))))))))",[caseless]))), 
+    <<":A">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless,
+                                                                                                                                                                                                                              trim]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless,
+                                                                                                                                                                                                                                {parts,
+                                                                                                                                                                                                                                 2}]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("A","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))",[caseless]))), 
+    <<":C">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless,
+                                                                                                                                                                                                                                      trim]))), 
+    <<":C:">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless,
+                                                                                                                                                                                                                                        {parts,
+                                                                                                                                                                                                                                         2}]))), 
+    <<":C:">> = iolist_to_binary(join(re:split("C","(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless,
+                                                                                                                                                                                                                trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless,
+                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","multiple words of text",[caseless]))), 
+    <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless,
                                                                                                                                                                                               trim]))), 
-?line <<":A:B:">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless,
+    <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless,
                                                                                                                                                                                                 {parts,
                                                                                                                                                                                                  2}]))), 
-?line <<":A:B:">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless,
-                                                                                                                                                                trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless,
-                                                                                                                                                                  {parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless]))), 
-?line <<":BC">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":BC:">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":BC:">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless,
-                                                                                                                                                                trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless,
-                                                                                                                                                                  {parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless]))), 
-?line <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless,
-                                                                                                                                                                             trim]))), 
-?line <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless,
-                                                                                                                                                                               {parts,
+    <<"AA">> = iolist_to_binary(join(re:split("AA","multiple words of text",[caseless]))), 
+    <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless,
+                                                                                                                                                                                                    trim]))), 
+    <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"UH-UH">> = iolist_to_binary(join(re:split("UH-UH","multiple words of text",[caseless]))), 
+    <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless,
+                                                                                                                                                                                                                  trim]))), 
+    <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless,
+                                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<":, YEAH">> = iolist_to_binary(join(re:split("MULTIPLE WORDS, YEAH","multiple words",[caseless]))), 
+    <<":AB:DE">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<":AB:DE:">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<":AB:DE:">> = iolist_to_binary(join(re:split("ABCDE","(.*)c(.*)",[caseless]))), 
+    <<":A:B">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless,
+                                                                                                                                                                                            trim]))), 
+    <<":A:B:">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless,
+                                                                                                                                                                                              {parts,
+                                                                                                                                                                                               2}]))), 
+    <<":A:B:">> = iolist_to_binary(join(re:split("(A, B)","\\((.*), (.*)\\)",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless,
+                                                                                                                                                              trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ABCD","abcd",[caseless]))), 
+    ok.
+run25() ->
+    <<":BC">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":BC:">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":BC:">> = iolist_to_binary(join(re:split("ABCD","a(bc)d",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless,
+                                                                                                                                                              trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless,
+                                                                                                                                                                {parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("AC","a[-]?c",[caseless]))), 
+    <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless,
+                                                                                                                                                                           trim]))), 
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless,
+                                                                                                                                                                             {parts,
+                                                                                                                                                                              2}]))), 
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless]))), 
+    <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless,
+                                                                                                                                                                                 trim]))), 
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless,
+                                                                                                                                                                                   {parts,
+                                                                                                                                                                                    2}]))), 
+    <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?!b).",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?!b).",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?!b).",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=d).",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=d).",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=d).",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","(abc)\\1",[caseless]))), 
-?line <<":ABC">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless,
-                                                                                                                                                                                   trim]))), 
-?line <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless,
-                                                                                                                                                                                     {parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":ABC:">> = iolist_to_binary(join(re:split("ABCABC","([a-c]*)\\1",[caseless]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("abad","a(?!b).",[trim]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?!b).",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?!b).",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=d).",[trim]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=d).",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=d).",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[trim]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"ab:">> = iolist_to_binary(join(re:split("abad","a(?=c|d).",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[{parts,
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)(.)",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[{parts,
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[{parts,
                                                                                                                                                                                     2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)*(.)",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[]))), 
-?line <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[trim]))), 
-?line <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[{parts,
+    <<":e:">> = iolist_to_binary(join(re:split("ace","a(?:b|c|d)+?(.)",[]))), 
+    <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[trim]))), 
+    <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[]))), 
-?line <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[trim]))), 
-?line <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[trim]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[{parts,
+    <<":d:bcdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+?(.)",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d)+(.)",[]))), 
+    <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[trim]))), 
+    <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":b:cdbe">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){2}(.)",[]))), 
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[trim]))), 
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[]))), 
+    <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[trim]))), 
+    <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[{parts,
                                                                                                                                                                                                       2}]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}(.)",[]))), 
-?line <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[trim]))), 
-?line <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[]))), 
-?line <<":bar:foo:bar">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[trim]))), 
-?line <<":bar:foo:bar:">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<":bar:foo:bar:">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[{parts,
+    <<":d:be">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){4,5}?(.)",[]))), 
+    <<":bar:foo:bar">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[trim]))), 
+    <<":bar:foo:bar:">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":bar:foo:bar:">> = iolist_to_binary(join(re:split("foobar","((foo)|(bar))*",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[{parts,
                                                                                                                                                                                                       2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}(.)",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[{parts,
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){6,7}?(.)",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[]))), 
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[trim]))), 
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[{parts,
                                                                                                                                                                                                       2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}(.)",[]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[trim]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[]))), 
-?line <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[trim]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[{parts,
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,6}?(.)",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[]))), 
+    ok.
+run26() ->
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[trim]))), 
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[{parts,
                                                                                                                                                                                                       2}]))), 
-?line <<":e:">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}(.)",[]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[trim]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[{parts,
+    <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[]))), 
+    <<":c:e">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[trim]))), 
+    <<":c:e:">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[{parts,
                                                                                                                                                                                                         2}]))), 
-?line <<":b:e">> = iolist_to_binary(join(re:split("acdbcdbe","a(?:b|c|d){5,7}?(.)",[]))), 
-?line <<":c:e">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[trim]))), 
-?line <<":c:e:">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":c:e:">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[]))), 
-?line <<":A">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[trim]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[]))), 
-?line <<":.">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[trim]))), 
-?line <<":.::">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":.::">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[]))), 
-?line <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[trim]))), 
-?line <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[]))), 
-?line <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[trim]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[{parts,
+    <<":c:e:">> = iolist_to_binary(join(re:split("ace","a(?:b|(c|e){1,2}?|d)+?(.)",[]))), 
+    <<":A">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[trim]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("AB","^(.+)?B",[]))), 
+    <<":.">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[trim]))), 
+    <<":.::">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":.::">> = iolist_to_binary(join(re:split(".","^([^a-z])|(\\^)$",[]))), 
+    <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[trim]))), 
+    <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":OUT">> = iolist_to_binary(join(re:split("<&OUT","^[<>]&",[]))), 
+    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))), 
-?line <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
-?line <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[{parts,
-                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a\\1?){4}$",[]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[trim]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[trim]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a\\1?){4}$",[]))), 
+    <<":aaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
                                                                                                                                                                                                         2}]))), 
-?line <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
+    <<":aaaa:">> = iolist_to_binary(join(re:split("aaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a(?(1)\\1)){4}$",[]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[trim]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
+    <<":f:o:o:b:a:r">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[trim]))), 
+    <<":f:o:o:b:a:r:">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[{parts,
                                                                                                                                                                                                             2}]))), 
-?line <<"aaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaa","^(a(?(1)\\1)){4}$",[]))), 
-?line <<":f:o:o:b:a:r">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[trim]))), 
-?line <<":f:o:o:b:a:r:">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[{parts,
-                                                                                                                                                                                                              2}]))), 
-?line <<":f:o:o:b:a:r:">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[trim]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[]))), 
-?line <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[trim]))), 
-?line <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[trim]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[{parts,
+    <<":f:o:o:b:a:r:">> = iolist_to_binary(join(re:split("foobar","(?:(f)(o)(o)|(b)(a)(r))*",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[trim]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<"a:">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[{parts,
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<=a)b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=a)b",[]))), 
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[trim]))), 
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[{parts,
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?<=a)b",[]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[trim]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[{parts,
+                                                                                                                                                                2}]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","(?<=a)b",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[{parts,
                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[]))), 
-?line <<":b">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[trim]))), 
-?line <<":ba">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":b:">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[]))), 
-?line <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[trim]))), 
-?line <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[]))), 
-?line <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[trim]))), 
-?line <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[]))), 
-?line <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[trim]))), 
-?line <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[{parts,
-                                                                                                                                                                                  2}]))), 
-?line <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[]))), 
-?line <<"c">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[trim]))), 
-?line <<"c::">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[{parts,
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?<!c)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","(?<!c)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","(?<!c)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aba","(?:..)*a",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[trim]))), 
+    <<":ba">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<"c::">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[]))), 
-?line <<"c">> = iolist_to_binary(join(re:split("cab","(a)*ab",[trim]))), 
-?line <<"c::">> = iolist_to_binary(join(re:split("cab","(a)*ab",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<"c::">> = iolist_to_binary(join(re:split("cab","(a)*ab",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[{parts,
+    <<":b:">> = iolist_to_binary(join(re:split("aba","(?:..)*?a",[]))), 
+    <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[trim]))), 
+    <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<":b:c">> = iolist_to_binary(join(re:split("abc","^(?:b|a(?=(.)))*\\1",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[]))), 
-?line <<":A">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[trim]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[{parts,
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(){3,5}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[]))), 
-?line <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[trim]))), 
-?line <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[trim]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("aax","^(a+)*ax",[]))), 
+    <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[trim]))), 
+    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|b)+)*ax",[]))), 
+    <<":a:a">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[trim]))), 
+    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":a:a:">> = iolist_to_binary(join(re:split("aax","^((a|bc)+)*ax",[]))), 
+    <<"c">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[trim]))), 
+    <<"c::">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"c::">> = iolist_to_binary(join(re:split("cab","(a|x)*ab",[]))), 
+    <<"c">> = iolist_to_binary(join(re:split("cab","(a)*ab",[trim]))), 
+    <<"c::">> = iolist_to_binary(join(re:split("cab","(a)*ab",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"c::">> = iolist_to_binary(join(re:split("cab","(a)*ab",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?i)a)b",[]))), 
+    ok.
+run27() ->
+    <<":a">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[]))), 
-?line <<":A">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[trim]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i)a)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("Ab","(?:(?i)a)b",[]))), 
+    <<":A">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[trim]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[{parts,
                                                                                                                                                                     2}]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[{parts,
-                                                                                                                                                                    2}]))), 
-?line <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless,
-                                                                                                                                                                      trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless,
-                                                                                                                                                                        {parts,
-                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
-                                                                                                                                                                      trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
-                                                                                                                                                                        {parts,
-                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                                            trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                                              {parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
-                                                                                                                                                                      trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
-                                                                                                                                                                        {parts,
-                                                                                                                                                                         2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                                            trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                                              {parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless,
+    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i)a)b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?i)a)b",[]))), 
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[trim]))), 
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"cb">> = iolist_to_binary(join(re:split("cb","(?:(?i)a)b",[]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[trim]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?:(?i)a)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","(?i:a)b",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?i:a))b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("Ab","(?i:a)b",[]))), 
+    <<":A">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[trim]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("Ab","((?i:a))b",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i:a)b",[]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[trim]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:a)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless,
                                                                                                                                                                         trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("ab","(?:(?-i)a)b",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless,
                                                                                                                                                                     trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless,
                                                                                                                                                                       {parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i)a)b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                         trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
-                                                                                                                                                                                      trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
-                                                                                                                                                                                        {parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
                                                                                                                                                                     trim]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
                                                                                                                                                                       {parts,
                                                                                                                                                                        2}]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                                          trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                                            {parts,
+                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                         trim]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
                                                                                                                                                                           {parts,
                                                                                                                                                                            2}]))), 
-?line <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
-                                                                                                                                                                                      trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
-                                                                                                                                                                                        {parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
-                                                                                                                                                                    trim]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aB","(?:(?-i)a)b",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
                                                                                                                                                                     trim]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless,
                                                                                                                                                                       {parts,
                                                                                                                                                                        2}]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless,
-                                                                                                                                                                                            trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless,
-                                                                                                                                                                                              {parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless,
-                                                                                                                                                                          trim]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless,
-                                                                                                                                                                            {parts,
-                                                                                                                                                                             2}]))), 
-?line <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless]))), 
-?line <<"a
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i)a)b",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                                          trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                                            {parts,
+                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?:(?-i)a)b",[caseless]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?:(?-i)a)b",[caseless]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?:(?-i)a)b",[caseless]))), 
+    ok.
+run28() ->
+    <<"">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","(?-i:a)b",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ab","((?-i:a))b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
+                                                                                                                                                                                    trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
+                                                                                                                                                                                      {parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aB","(?-i:a)b",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aB","((?-i:a))b",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
+                                                                                                                                                                                    trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless,
+                                                                                                                                                                                      {parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?-i:a)b",[caseless]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"Ab">> = iolist_to_binary(join(re:split("Ab","(?-i:a)b",[caseless]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","(?-i:a)b",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless,
+                                                                                                                                                                                          trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless,
+                                                                                                                                                                                            {parts,
+                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?-i:a.))b",[caseless]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<"AB">> = iolist_to_binary(join(re:split("AB","((?-i:a.))b",[caseless]))), 
+    <<"a
 B">> = iolist_to_binary(join(re:split("a
 B","((?-i:a.))b",[caseless,trim]))), 
-?line <<"a
+    <<"a
 B">> = iolist_to_binary(join(re:split("a
 B","((?-i:a.))b",[caseless,{parts,2}]))), 
-?line <<"a
+    <<"a
 B">> = iolist_to_binary(join(re:split("a
 B","((?-i:a.))b",[caseless]))), 
-?line <<":a
+    <<":a
 ">> = iolist_to_binary(join(re:split("a
 B","((?s-i:a.))b",[caseless,trim]))), 
-?line <<":a
+    <<":a
 :">> = iolist_to_binary(join(re:split("a
 B","((?s-i:a.))b",[caseless,{parts,2}]))), 
-?line <<":a
+    <<":a
 :">> = iolist_to_binary(join(re:split("a
 B","((?s-i:a.))b",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[{parts,
-                                                                                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[]))), 
-?line <<":Ab">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless,
-                                                                                                                                                                                trim]))), 
-?line <<":Ab:">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless,
-                                                                                                                                                                                  {parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":Ab:">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless]))), 
-?line <<":ab">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless,
-                                                                                                                                                                                trim]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless,
-                                                                                                                                                                                  {parts,
-                                                                                                                                                                                   2}]))), 
-?line <<":ab:">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[{parts,
-                                                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[]))), 
-?line <<":~~">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[trim]))), 
-?line <<":~~:">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[{parts,
+                                                                                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("cabbbb","(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[{parts,
+                                                                                                                                                                                                                                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb","(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))",[]))), 
+    <<":Ab">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<":Ab:">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<":Ab:">> = iolist_to_binary(join(re:split("Ab4ab","(ab)\\d\\1",[caseless]))), 
+    <<":ab">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("ab4Ab","(ab)\\d\\1",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("foobar1234baz","foo\\w*\\d{4}baz",[]))), 
+    <<":~~">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[trim]))), 
+    <<":~~:">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":~~:">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended,
+                                                                                                                                                                                                    trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended]))), 
+    ok.
+run29() ->
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":~~:">> = iolist_to_binary(join(re:split("x~~","x(~~)*(?:(?:F)?)?",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaac","^a(?#xxx){3}c",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended,
-                                                                                                                                                                                                      trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended,
-                                                                                                                                                                                                        {parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaac","^a (?#xxx) (?#yyy) {3}c",[extended]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[]))), 
-?line <<"B
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<![cd])b",[]))), 
+    <<"B
 B">> = iolist_to_binary(join(re:split("B
 B","(?<![cd])b",[trim]))), 
-?line <<"B
+    <<"B
 B">> = iolist_to_binary(join(re:split("B
 B","(?<![cd])b",[{parts,2}]))), 
-?line <<"B
+    <<"B
 B">> = iolist_to_binary(join(re:split("B
 B","(?<![cd])b",[]))), 
-?line <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[trim]))), 
-?line <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[]))), 
-?line <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[trim]))), 
-?line <<"db:acb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[{parts,
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[trim]))), 
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","(?<![cd])b",[]))), 
+    <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[trim]))), 
+    <<"db:acb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[]))), 
+    <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[trim]))), 
+    <<"db::acb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[{parts,
                                                                                                                                                                                         2}]))), 
-?line <<"db::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<![cd])[ab]",[]))), 
-?line <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[trim]))), 
-?line <<"db::acb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[]))), 
-?line <<"cdacc">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[trim]))), 
-?line <<"cdacc:">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"cdacc:">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[trim]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[{parts,
+    <<"db::::cb">> = iolist_to_binary(join(re:split("dbaacb","(?<!(c|d))[ab]",[]))), 
+    <<"cdacc">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[trim]))), 
+    <<"cdacc:">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"cdacc:">> = iolist_to_binary(join(re:split("cdaccb","(?<!cd)[ab]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[{parts,
                                                                                                                                                                          2}]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^(?:a?b?)*$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[{parts,
                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^(?:a?b?)*$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab","^(?:a?b?)*$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[]))), 
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[trim]))), 
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaa","^(?:a?b?)*$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:a?b?)*$",[]))), 
-?line <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[trim]))), 
-?line <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[]))), 
-?line <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[trim]))), 
-?line <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[{parts,
+    <<"dbcb">> = iolist_to_binary(join(re:split("dbcb","^(?:a?b?)*$",[]))), 
+    <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[trim]))), 
+    <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[]))), 
+    <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[trim]))), 
+    <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<"a--">> = iolist_to_binary(join(re:split("a--","^(?:a?b?)*$",[]))), 
-?line <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[trim]))), 
-?line <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[]))), 
-?line <<":a
+    <<"aa--">> = iolist_to_binary(join(re:split("aa--","^(?:a?b?)*$",[]))), 
+    <<":a
 :
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)^a(.))((?m)^b$)",[trim]))), 
-?line <<":a
+    <<":a
 :
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)^a(.))((?m)^b$)",[{parts,2}]))), 
-?line <<":a
+    <<":a
 :
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)^a(.))((?m)^b$)",[]))), 
-?line <<"a
+    <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?m)^b$)",[trim]))), 
-?line <<"a
+    <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?m)^b$)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?m)^b$)",[]))), 
-?line <<"a
+    <<"a
 ">> = iolist_to_binary(join(re:split("a
 b","(?m)^b",[trim]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","(?m)^b",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","(?m)^b",[]))), 
-?line <<"a
+    <<"a
 :b">> = iolist_to_binary(join(re:split("a
 b","(?m)^(b)",[trim]))), 
-?line <<"a
+    <<"a
 :b:">> = iolist_to_binary(join(re:split("a
 b","(?m)^(b)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :b:">> = iolist_to_binary(join(re:split("a
 b","(?m)^(b)",[]))), 
-?line <<"a
+    <<"a
 :b">> = iolist_to_binary(join(re:split("a
 b","((?m)^b)",[trim]))), 
-?line <<"a
+    <<"a
 :b:">> = iolist_to_binary(join(re:split("a
 b","((?m)^b)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :b:">> = iolist_to_binary(join(re:split("a
 b","((?m)^b)",[]))), 
-?line <<"a:b">> = iolist_to_binary(join(re:split("a
+    <<"a:b">> = iolist_to_binary(join(re:split("a
 b","\\n((?m)^b)",[trim]))), 
-?line <<"a:b:">> = iolist_to_binary(join(re:split("a
+    <<"a:b:">> = iolist_to_binary(join(re:split("a
 b","\\n((?m)^b)",[{parts,2}]))), 
-?line <<"a:b:">> = iolist_to_binary(join(re:split("a
+    <<"a:b:">> = iolist_to_binary(join(re:split("a
 b","\\n((?m)^b)",[]))), 
-?line <<"a
+    <<"a
 b:
 ">> = iolist_to_binary(join(re:split("a
 b
 c","((?s).)c(?!.)",[trim]))), 
-?line <<"a
+    <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s).)c(?!.)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s).)c(?!.)",[]))), 
-?line <<"a
+    <<"a
 b:
 ">> = iolist_to_binary(join(re:split("a
 b
 c","((?s).)c(?!.)",[trim]))), 
-?line <<"a
+    <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s).)c(?!.)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 b:
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s).)c(?!.)",[]))), 
-?line <<"a
+    <<"a
 :b
 ">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)b.)c(?!.)",[trim]))), 
-?line <<"a
+    <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)b.)c(?!.)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)b.)c(?!.)",[]))), 
-?line <<"a
+    <<"a
 :b
 ">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)b.)c(?!.)",[trim]))), 
-?line <<"a
+    <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)b.)c(?!.)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :b
 :">> = iolist_to_binary(join(re:split("a
 b
 c","((?s)b.)c(?!.)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[]))), 
-?line <<"a
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","()^b",[]))), 
+    <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
 c","()^b",[trim]))), 
-?line <<"a
+    <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
 c","()^b",[{parts,2}]))), 
-?line <<"a
+    <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
 c","()^b",[]))), 
-?line <<"a
+    <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
 c","()^b",[trim]))), 
-?line <<"a
+    <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
 c","()^b",[{parts,2}]))), 
-?line <<"a
+    <<"a
 b
 c">> = iolist_to_binary(join(re:split("a
 b
 c","()^b",[]))), 
-?line <<"a
+    <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?m)^b)",[trim]))), 
-?line <<"a
+    <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?m)^b)",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :b:
 c">> = iolist_to_binary(join(re:split("a
 b
 c","((?m)^b)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(x)?(?(1)a|b)",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[{parts,
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[{parts,
                                                                                                                                                                             2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[]))), 
-?line <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[trim]))), 
-?line <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[{parts,
+    <<"a">> = iolist_to_binary(join(re:split("a","(x)?(?(1)a|b)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","(x)?(?(1)b|a)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)b|a)",[]))), 
+    ok.
+run30() ->
+    <<"">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","()?(?(1)a|b)",[]))), 
+    <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[{parts,
+                                                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[]))), 
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[{parts,
+                                                                                                                                                                                                           2}]))), 
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[]))), 
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[trim]))), 
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[{parts,
+                                                                                                                                                                                                           2}]))), 
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[]))), 
+    <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[{parts,
                                                                                                                                                                                                                2}]))), 
-?line <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\()?blah(?(1)(\\)))$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[trim]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[{parts,
+    <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[{parts,
                                                                                                                                                                                                            2}]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("blah","^(\\()?blah(?(1)(\\)))$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[{parts,
+    <<":::">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[{parts,
                                                                                                                                                                                                                          2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\()?blah(?(1)(\\)))$",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","^(\\()?blah(?(1)(\\)))$",[]))), 
-?line <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[trim]))), 
-?line <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                             2}]))), 
-?line <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\()?blah(?(1)(\\)))$",[]))), 
-?line <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[trim]))), 
-?line <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[]))), 
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[{parts,
                                                                                                                                                                                                              2}]))), 
-?line <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\()?blah(?(1)(\\)))$",[]))), 
-?line <<":(:)">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
-?line <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                                 2}]))), 
-?line <<":(:):">> = iolist_to_binary(join(re:split("(blah)","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[{parts,
+    <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[]))), 
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[{parts,
                                                                                                                                                                                                              2}]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("blah","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[{parts,
-                                                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-?line <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
-?line <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[{parts,
+    <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[]))), 
+    <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))), 
+    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[{parts,
+                                                                                                                                                                                         2}]))), 
+    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))), 
+    <<":one:">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[trim]))), 
+    <<":one::">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<":one::">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[]))), 
+    <<"a:a">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[trim]))), 
+    <<"a:a:">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"a:a:">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[]))), 
+    <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))), 
+    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[{parts,
+                                                                                                                                                                                         2}]))), 
+    <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[{parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))), 
+    <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))), 
+    <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[{parts,
                                                                                                                                                                                                                2}]))), 
-?line <<"blah)">> = iolist_to_binary(join(re:split("blah)","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-?line <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[trim]))), 
-?line <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[{parts,
+    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))), 
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))), 
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))), 
+    <<"c:aa">> = iolist_to_binary(join(re:split("caab","(a*)b+",[trim]))), 
+    <<"c:aa:">> = iolist_to_binary(join(re:split("caab","(a*)b+",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"c:aa:">> = iolist_to_binary(join(re:split("caab","(a*)b+",[]))), 
+    <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))), 
+    <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
+    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[{parts,
                                                                                                                                                                                                                2}]))), 
-?line <<"(blah">> = iolist_to_binary(join(re:split("(blah","^(\\(+)?blah(?(1)(\\)))$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[{parts,
+    <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))), 
+    <<"*** ::Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[trim]))), 
+    <<"*** ::Failers:">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[{parts,
+                                                                                                                                                                                                               2}]))), 
+    <<"*** ::Failers:">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[]))), 
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))), 
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))), 
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))), 
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))), 
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))), 
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))), 
+    ok.
+run31() ->
+    <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))), 
+    <<"a::[:b]::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[trim]))), 
+    <<"a::[:b]:">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?(?!a)b|a)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?(?=a)b|a)",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[{parts,
+    <<"a::[:b]:::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[]))), 
+    <<"a:=[:b]:=">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[trim]))), 
+    <<"a:=[:b]=">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[trim]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[{parts,
+    <<"a:=[:b]:=:">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[]))), 
+    <<"a:.[:b]:.">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[trim]))), 
+    <<"a:.[:b].">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<"a">> = iolist_to_binary(join(re:split("a","(?(?=a)b|a)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[{parts,
+    <<"a:.[:b]:.:">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[]))), 
+    <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))), 
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[{parts,
                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","(?(?=a)a|b)",[]))), 
-?line <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))), 
-?line <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[{parts,
-                                                                                                                                                                                           2}]))), 
-?line <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))), 
-?line <<":one:">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[trim]))), 
-?line <<":one::">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[{parts,
-                                                                                                                                                                           2}]))), 
-?line <<":one::">> = iolist_to_binary(join(re:split("one:","(\\w+:)+",[]))), 
-?line <<"a:a">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[trim]))), 
-?line <<"a:a:">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<"a:a:">> = iolist_to_binary(join(re:split("a","$(?<=^(a))",[]))), 
-?line <<"a:a:aab">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[trim]))), 
-?line <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[{parts,
-                                                                                                                                                                                           2}]))), 
-?line <<"a:a:aab:">> = iolist_to_binary(join(re:split("aaab","(?=(a+?))(\\1ab)",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[{parts,
-                                                                                                                                                                                                       2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?=(a+?))\\1ab",[]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[trim]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","^(?=(a+?))\\1ab",[]))), 
-?line <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
-?line <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-?line <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))), 
-?line <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
-?line <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                                 2}]))), 
-?line <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))), 
-?line <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))), 
-?line <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))), 
-?line <<"c:aa">> = iolist_to_binary(join(re:split("caab","(a*)b+",[trim]))), 
-?line <<"c:aa:">> = iolist_to_binary(join(re:split("caab","(a*)b+",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<"c:aa:">> = iolist_to_binary(join(re:split("caab","(a*)b+",[]))), 
-?line <<"::abcd">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
-?line <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                   2}]))), 
-?line <<"::abcd:">> = iolist_to_binary(join(re:split("abcd","([\\w:]+::)?(\\w+)$",[]))), 
-?line <<":xy:z::::abcd">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[trim]))), 
-?line <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                                 2}]))), 
-?line <<":xy:z::::abcd:">> = iolist_to_binary(join(re:split("xy:z:::abcd","([\\w:]+::)?(\\w+)$",[]))), 
-?line <<"*** ::Failers">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[trim]))), 
-?line <<"*** ::Failers:">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                                 2}]))), 
-?line <<"*** ::Failers:">> = iolist_to_binary(join(re:split("*** Failers","([\\w:]+::)?(\\w+)$",[]))), 
-?line <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))), 
-?line <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))), 
-?line <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[trim]))), 
-?line <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<"abcd:">> = iolist_to_binary(join(re:split("abcd:","([\\w:]+::)?(\\w+)$",[]))), 
-?line <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[trim]))), 
-?line <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":c:d">> = iolist_to_binary(join(re:split("aexycd","^[^bcd]*(c+)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[{parts,
-                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaab","(?>a+)b",[]))), 
-?line <<"a::[:b]::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[trim]))), 
-?line <<"a::[:b]:">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"a::[:b]:::">> = iolist_to_binary(join(re:split("a:[b]:","([[:]+)",[]))), 
-?line <<"a:=[:b]:=">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[trim]))), 
-?line <<"a:=[:b]=">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"a:=[:b]:=:">> = iolist_to_binary(join(re:split("a=[b]=","([[=]+)",[]))), 
-?line <<"a:.[:b]:.">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[trim]))), 
-?line <<"a:.[:b].">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<"a:.[:b]:.:">> = iolist_to_binary(join(re:split("a.[b].","([[.]+)",[]))), 
-?line <<":aaab">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[trim]))), 
-?line <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))), 
-?line <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))), 
-?line <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))), 
-?line <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))), 
-?line <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[{parts,
-                                                                                                                                                                                                                                            2}]))), 
-?line <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[trim]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[]))), 
-?line <<"a
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","((?>a+)b)",[]))), 
+    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[trim]))), 
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(?>(a+))b",[]))), 
+    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[trim]))), 
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[{parts,
+                                                                                                                                                                                                                                          2}]))), 
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","((?>[^()]+)|\\([^()]*\\))+",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a\\Z",[]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[trim]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<"aaab">> = iolist_to_binary(join(re:split("aaab","a\\Z",[]))), 
+    <<"a
 b">> = iolist_to_binary(join(re:split("a
 b","a\\Z",[trim]))), 
-?line <<"a
+    <<"a
 b">> = iolist_to_binary(join(re:split("a
 b","a\\Z",[{parts,2}]))), 
-?line <<"a
+    <<"a
 b">> = iolist_to_binary(join(re:split("a
 b","a\\Z",[]))), 
-?line <<"a
+    <<"a
 ">> = iolist_to_binary(join(re:split("a
 b","b\\Z",[trim]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","b\\Z",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","b\\Z",[]))), 
-?line <<"a
+    <<"a
 ">> = iolist_to_binary(join(re:split("a
 b","b\\Z",[trim]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","b\\Z",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","b\\Z",[]))), 
-?line <<"a
+    <<"a
 ">> = iolist_to_binary(join(re:split("a
 b","b\\z",[trim]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","b\\z",[{parts,2}]))), 
-?line <<"a
+    <<"a
 :">> = iolist_to_binary(join(re:split("a
 b","b\\z",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                        2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                            2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                          2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                            2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","b\\z",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
                                                                                                                                                                                                                                                       2}]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
                                                                                                                                                                                                                                                           2}]))), 
-?line <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("abc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
                                                                                                                                                                                                                                                           2}]))), 
-?line <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("a-b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
                                                                                                                                                                                                                                                           2}]))), 
-?line <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("0-9","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
                                                                                                                                                                                                                                                           2}]))), 
-?line <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                            2}]))), 
-?line <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                  2}]))), 
-?line <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
-?line <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
-                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
-?line <<":abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
-?line <<":abcd:">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[{parts,
-                                                                                                                                                                                                                      2}]))), 
-?line <<":abcd:">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[]))), 
-?line <<":wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
-?line <<":wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[{parts,
+    <<"::">> = iolist_to_binary(join(re:split("a.b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                              2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("5.6.7","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                                          2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("the.quick.brown.fox","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                                2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a100.b200.300c","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                        2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("12-ab.1245","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                    2}]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<".a">> = iolist_to_binary(join(re:split(".a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<"-a">> = iolist_to_binary(join(re:split("-a","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<"a-">> = iolist_to_binary(join(re:split("a-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<"a.">> = iolist_to_binary(join(re:split("a.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                          2}]))), 
+    <<"a_b">> = iolist_to_binary(join(re:split("a_b","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                          2}]))), 
+    <<"a.-">> = iolist_to_binary(join(re:split("a.-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                          2}]))), 
+    <<"a..">> = iolist_to_binary(join(re:split("a..","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                2}]))), 
+    <<"ab..bc">> = iolist_to_binary(join(re:split("ab..bc","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"the.quick.brown.fox-">> = iolist_to_binary(join(re:split("the.quick.brown.fox-","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"the.quick.brown.fox.">> = iolist_to_binary(join(re:split("the.quick.brown.fox.","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"the.quick.brown.fox_">> = iolist_to_binary(join(re:split("the.quick.brown.fox_","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[trim]))), 
+    <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"the.quick.brown.fox+">> = iolist_to_binary(join(re:split("the.quick.brown.fox+","^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$",[]))), 
+    <<":abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+    <<":abcd:">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[{parts,
                                                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[]))), 
-?line <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
-?line <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[{parts,
-                                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                              2}]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[trim]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[{parts,
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  2}]))), 
-?line <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[]))), 
-?line <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[trim]))), 
-?line <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[{parts,
-                                                                                                                                                                                                         2}]))), 
-?line <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[]))), 
-?line <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[trim]))), 
-?line <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[{parts,
+    <<":abcd:">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd|wxyz))",[]))), 
+    <<":wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+    <<":wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd|wxyz))",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?>.*)(?<=(abcd|wxyz))",[]))), 
+    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[trim]))), 
+    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[{parts,
+                                                                                                                                                                                                                                                                                                                2}]))), 
+    <<"a rather long string that doesn't end with one of them">> = iolist_to_binary(join(re:split("a rather long string that doesn't end with one of them","(?>.*)(?<=(abcd|wxyz))",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[{parts,
+                                                                                                                                                                                                                                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark otherword","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[trim]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[{parts,
+                                                                                                                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark","word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword",[]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[trim]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[{parts,
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                2}]))), 
+    <<"word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope">> = iolist_to_binary(join(re:split("word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope","word (?>[a-zA-Z0-9]+ ){0,30}otherword",[]))), 
+    <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[trim]))), 
+    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=\\d{3}(?!999))foo",[]))), 
+    <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[trim]))), 
+    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999))foo",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[{parts,
+                                                                                                                                                                                                                 2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[]))), 
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[trim]))), 
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[]))), 
+    <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[trim]))), 
+    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[]))), 
+    <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[trim]))), 
+    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[{parts,
                                                                                                                                                                                                                    2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999))foo",[]))), 
-?line <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[trim]))), 
-?line <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999))foo",[]))), 
-?line <<"999">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[trim]))), 
-?line <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<"999:">> = iolist_to_binary(join(re:split("999foo","(?<=(?!...999)\\d{3})foo",[]))), 
-?line <<"123999">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[trim]))), 
-?line <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-?line <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[]))), 
-?line <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[trim]))), 
-?line <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[{parts,
-                                                                                                                                                                                                                     2}]))), 
-?line <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[]))), 
-?line <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
-?line <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[{parts,
+    <<"123999:">> = iolist_to_binary(join(re:split("123999foo","(?<=(?!...999)\\d{3})foo",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[{parts,
+                                                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=(?!...999)\\d{3})foo",[]))), 
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[trim]))), 
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"123abcfoo">> = iolist_to_binary(join(re:split("123abcfoo","(?<=(?!...999)\\d{3})foo",[]))), 
+    <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[]))), 
+    <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[{parts,
+                                                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[]))), 
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[{parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[]))), 
+    <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[{parts,
                                                                                                                                                                                                                      2}]))), 
-?line <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}(?!999)...)foo",[]))), 
-?line <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
-?line <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[{parts,
+    <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[]))), 
+    <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[{parts,
                                                                                                                                                                                                                      2}]))), 
-?line <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}(?!999)...)foo",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[{parts,
+    <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[{parts,
                                                                                                                                                                                                                          2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}(?!999)...)foo",[]))), 
-?line <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[trim]))), 
-?line <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[{parts,
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[]))), 
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[{parts,
                                                                                                                                                                                                                      2}]))), 
-?line <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}(?!999)...)foo",[]))), 
-?line <<"123abc">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
-?line <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"123abc:">> = iolist_to_binary(join(re:split("123abcfoo","(?<=\\d{3}...)(?<!999)foo",[]))), 
-?line <<"123456">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
-?line <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"123456:">> = iolist_to_binary(join(re:split("123456foo","(?<=\\d{3}...)(?<!999)foo",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                           2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?<=\\d{3}...)(?<!999)foo",[]))), 
-?line <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[trim]))), 
-?line <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[{parts,
-                                                                                                                                                                                                                       2}]))), 
-?line <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<"123999foo">> = iolist_to_binary(join(re:split("123999foo","(?<=\\d{3}...)(?<!999)foo",[]))), 
+    ok.
+run32() ->
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -27999,20 +28106,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28020,20 +28127,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28041,20 +28148,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href='abcd xyz pqr' cats","<a[\\s]+href[\\s]*=[\\s]*          # find <a href=
  ([\\\"\\'])?                       # find single or double quote
  (?(1) (.*?)\\1 | ([^\\s]+))       # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28062,20 +28169,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28083,20 +28190,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28104,20 +28211,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href\\s*=\\s*                # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28125,20 +28232,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":::abcd: xyz">> = iolist_to_binary(join(re:split("<a href=abcd xyz","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28146,20 +28253,20 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":\":abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href=\"abcd xyz pqr\" cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended,
                                                                               trim]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
@@ -28167,321 +28274,323 @@ b","b\\z",[]))),
                                                                               extended,
                                                                               {parts,
                                                                                2}]))), 
-?line <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
+    <<":':abcd xyz pqr:: cats">> = iolist_to_binary(join(re:split("<a href       =       'abcd xyz pqr' cats","<a\\s+href(?>\\s*)=(?>\\s*)        # find <a href=
  ([\"'])?                         # find single or double quote
  (?(1) (.*?)\\1 | (\\S+))          # if quote found, match up to next matching
                                  # quote, otherwise match up to next space",[caseless,
                                                                               dotall,
                                                                               extended]))), 
-?line <<":A:Z:B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[trim]))), 
-?line <<":A:Z:BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":A:Z:B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[]))), 
-?line <<":A::B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[trim]))), 
-?line <<":A::BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[{parts,
+    <<":A:Z:B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[trim]))), 
+    <<":A:Z:BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[{parts,
                                                                                                                                                                                   2}]))), 
-?line <<":A::B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[]))), 
-?line <<":A:::B::::C::::D::::E::::F::::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[trim]))), 
-?line <<":A:::BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":A:::B::::C::::D::::E::::F::::G::::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[]))), 
-?line <<":A:B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[trim]))), 
-?line <<":A:BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<":A:B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[]))), 
-?line <<"Z::::B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[trim]))), 
-?line <<"Z::ABCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[{parts,
+    <<":A:Z:B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","((Z)+|A)*",[]))), 
+    <<":A::B:::C:::D:::E:::F:::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[trim]))), 
+    <<":A::BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":A::B:::C:::D:::E:::F:::G:::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z()|A)*",[]))), 
+    <<":A:::B::::C::::D::::E::::F::::G">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[trim]))), 
+    <<":A:::BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":A:::B::::C::::D::::E::::F::::G::::">> = iolist_to_binary(join(re:split("ZABCDEFG","(Z(())|A)*",[]))), 
+    <<":A:B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[trim]))), 
+    <<":A:BCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<"Z::::B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[]))), 
-?line <<":b:b:b">> = iolist_to_binary(join(re:split("abbab","a*",[trim]))), 
-?line <<":bbab">> = iolist_to_binary(join(re:split("abbab","a*",[{parts,
-                                                                                                                                                                2}]))), 
-?line <<":b:b:b:">> = iolist_to_binary(join(re:split("abbab","a*",[]))), 
-?line <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[a-\\d]",[trim]))), 
-?line <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[a-\\d]",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[a-\\d]",[]))), 
-?line <<":things">> = iolist_to_binary(join(re:split("-things","^[a-\\d]",[trim]))), 
-?line <<":things">> = iolist_to_binary(join(re:split("-things","^[a-\\d]",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":things">> = iolist_to_binary(join(re:split("-things","^[a-\\d]",[]))), 
-?line <<":digit">> = iolist_to_binary(join(re:split("0digit","^[a-\\d]",[trim]))), 
-?line <<":digit">> = iolist_to_binary(join(re:split("0digit","^[a-\\d]",[{parts,
+    <<":A:B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>Z)+|A)*",[]))), 
+    <<"Z::::B::C::D::E::F::G">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[trim]))), 
+    <<"Z::ABCDEFG">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"Z::::B::C::D::E::F::G::">> = iolist_to_binary(join(re:split("ZABCDEFG","((?>)+|A)*",[]))), 
+    <<":b:b:b">> = iolist_to_binary(join(re:split("abbab","a*",[trim]))), 
+    <<":bbab">> = iolist_to_binary(join(re:split("abbab","a*",[{parts,
+                                                                                                                                                              2}]))), 
+    <<":b:b:b:">> = iolist_to_binary(join(re:split("abbab","a*",[]))), 
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[a-\\d]",[trim]))), 
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[a-\\d]",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[a-\\d]",[]))), 
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[a-\\d]",[trim]))), 
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[a-\\d]",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":digit">> = iolist_to_binary(join(re:split("0digit","^[a-\\d]",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-\\d]",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-\\d]",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-\\d]",[]))), 
-?line <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[a-\\d]",[trim]))), 
-?line <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[a-\\d]",[{parts,
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[a-\\d]",[]))), 
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[a-\\d]",[trim]))), 
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[a-\\d]",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[a-\\d]",[]))), 
-?line <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[trim]))), 
-?line <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[{parts,
-                                                                                                                                                                             2}]))), 
-?line <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[]))), 
-?line <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[trim]))), 
-?line <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[]))), 
-?line <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[trim]))), 
-?line <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[{parts,
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[a-\\d]",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-\\d]",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-\\d]",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[a-\\d]",[]))), 
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[a-\\d]",[trim]))), 
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[a-\\d]",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[a-\\d]",[]))), 
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[trim]))), 
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<":bcde">> = iolist_to_binary(join(re:split("abcde","^[\\d-a]",[]))), 
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[trim]))), 
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[{parts,
-                                                                                                                                                                                         2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[]))), 
-?line <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[trim]))), 
-?line <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[{parts,
+    <<":things">> = iolist_to_binary(join(re:split("-things","^[\\d-a]",[]))), 
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[trim]))), 
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[{parts,
                                                                                                                                                                              2}]))), 
-?line <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<":digit">> = iolist_to_binary(join(re:split("0digit","^[\\d-a]",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^[\\d-a]",[]))), 
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[trim]))), 
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"bcdef">> = iolist_to_binary(join(re:split("bcdef","^[\\d-a]",[]))), 
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","[[:space:]]+",[trim]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","[[:space:]]+",[{parts,2}]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","[[:space:]]+",[]))), 
-?line <<">:
+    <<">:
 
<">> = iolist_to_binary(join(re:split("> 	
 
<","[[:blank:]]+",[trim]))), 
-?line <<">:
+    <<">:
 
<">> = iolist_to_binary(join(re:split("> 	
 
<","[[:blank:]]+",[{parts,2}]))), 
-?line <<">:
+    <<">:
 
<">> = iolist_to_binary(join(re:split("> 	
 
<","[[:blank:]]+",[]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","[\\s]+",[trim]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","[\\s]+",[{parts,2}]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","[\\s]+",[]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","\\s+",[trim]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","\\s+",[{parts,2}]))), 
-?line <<">:<">> = iolist_to_binary(join(re:split("> 	
+    <<">:<">> = iolist_to_binary(join(re:split("> 	
 
<","\\s+",[]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","ab",[extended,
-                                                                                                                                                          trim]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","ab",[extended,
-                                                                                                                                                            {parts,
-                                                                                                                                                             2}]))), 
-?line <<"ab">> = iolist_to_binary(join(re:split("ab","ab",[extended]))), 
-?line <<"a
+    <<"ab">> = iolist_to_binary(join(re:split("ab","ab",[extended,
+                                                                                                                                                        trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","ab",[extended,
+                                                                                                                                                          {parts,
+                                                                                                                                                           2}]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","ab",[extended]))), 
+    <<"a
 :b">> = iolist_to_binary(join(re:split("a
 xb","(?!\\A)x",[multiline,trim]))), 
-?line <<"a
+    <<"a
 :b">> = iolist_to_binary(join(re:split("a
 xb","(?!\\A)x",[multiline,{parts,2}]))), 
-?line <<"a
+    <<"a
 :b">> = iolist_to_binary(join(re:split("a
 xb","(?!\\A)x",[multiline]))), 
-?line <<"a
+    <<"a
 xb">> = iolist_to_binary(join(re:split("a
 xb","(?!^)x",[multiline,trim]))), 
-?line <<"a
+    <<"a
 xb">> = iolist_to_binary(join(re:split("a
 xb","(?!^)x",[multiline,{parts,2}]))), 
-?line <<"a
+    <<"a
 xb">> = iolist_to_binary(join(re:split("a
 xb","(?!^)x",[multiline]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended,
-                                                                                                                                                                                                            trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended,
-                                                                                                                                                                                                              {parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended,
-                                                                                                                                                                                                              trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended,
-                                                                                                                                                                                                                {parts,
-                                                                                                                                                                                                                 2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended]))), 
-?line <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended,
+    <<"">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcabcabc","abc\\Qabc\\Eabc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc(*+|abc","abc\\Q(*+|\\Eabc",[]))), 
+    ok.
+run33() ->
+    <<"">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended,
                                                                                                                                                                                                           trim]))), 
-?line <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended,
+    <<":">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended,
                                                                                                                                                                                                             {parts,
                                                                                                                                                                                                              2}]))), 
-?line <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc abcabc","   abc\\Q abc\\Eabc",[extended]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended,
+                                                                                                                                                                                                            trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended,
+                                                                                                                                                                                                              {parts,
+                                                                                                                                                                                                               2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","   abc\\Q abc\\Eabc",[extended]))), 
+    <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended,
+                                                                                                                                                                                                        trim]))), 
+    <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<"abcabcabc">> = iolist_to_binary(join(re:split("abcabcabc","   abc\\Q abc\\Eabc",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc#not comment
+    <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc#not comment
+    <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
     ",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
     ",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment
     ",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc#not comment
+    <<"">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc#not comment
+    <<":">> = iolist_to_binary(join(re:split("abc#not comment
     literal","abc#comment
     \\Q#not comment
     literal\\E #more comment",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[{parts,
-                                                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc",[{parts,
-                                                                                                                                                                     2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[]))), 
-?line <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[trim]))), 
-?line <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[{parts,
-                                                                                                                                                                           2}]))), 
-?line <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[]))), 
-?line <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[trim]))), 
-?line <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[]))), 
-?line <<"::xyz">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[trim]))), 
-?line <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"::xyz:">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[trim]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc\\$xyz","\\Qabc\\$xyz\\E",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc$xyz","\\Qabc\\E\\$\\Qxyz\\E",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","\\Aabc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","\\Aabc",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\Aabc",[]))), 
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[trim]))), 
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","\\Aabc",[]))), 
+    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[trim]))), 
+    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","\\Aabc.",[]))), 
+    <<"::xyz">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[trim]))), 
+    <<":abc2xyzabc3">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[{parts,
                                                                                                                                                                                       2}]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[]))), 
-?line <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[trim]))), 
-?line <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[]))), 
-?line <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[trim]))), 
-?line <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[]))), 
-?line <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[trim]))), 
-?line <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[trim]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[]))), 
-?line <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[trim]))), 
-?line <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[{parts,
+    <<"::xyz:">> = iolist_to_binary(join(re:split("abc1abc2xyzabc3","abc.",[]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[trim]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[{parts,
                                                                                                                                                                                     2}]))), 
-?line <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[]))), 
-?line <<":abC">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[trim]))), 
-?line <<":abC:">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<":abC:">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[]))), 
-?line <<":D">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[trim]))), 
-?line <<":D:">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<":D:">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                                          2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[]))), 
-?line <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[trim]))), 
-?line <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[]))), 
-?line <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[trim]))), 
-?line <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[]))), 
-?line <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[trim]))), 
-?line <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[]))), 
-?line <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[trim]))), 
-?line <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[{parts,
-                                                                                                                                                                                        2}]))), 
-?line <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[{parts,
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabcdY","a(?x: b c )d",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","a(?x: b c )d",[]))), 
+    <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[trim]))), 
+    <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[]))), 
-?line <<"a:bc">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[trim]))), 
-?line <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[{parts,
+    <<"Xa b c d Y">> = iolist_to_binary(join(re:split("Xa b c d Y","a(?x: b c )d",[]))), 
+    <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[trim]))), 
+    <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"X:abc:Y">> = iolist_to_binary(join(re:split("XabcY","((?x)x y z | a b c)",[]))), 
+    <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[trim]))), 
+    <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"A:xyz:B">> = iolist_to_binary(join(re:split("AxyzB","((?x)x y z | a b c)",[]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[trim]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"X:Y">> = iolist_to_binary(join(re:split("XabCY","(?i)AB(?-i)C",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(?i)AB(?-i)C",[]))), 
+    <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[trim]))), 
+    <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"XabcY">> = iolist_to_binary(join(re:split("XabcY","(?i)AB(?-i)C",[]))), 
+    <<":abC">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[trim]))), 
+    <<":abC:">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[]))), 
-?line <<":abc">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall,
-                                                                                                                                                                                          trim]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall,
-                                                                                                                                                                                            {parts,
-                                                                                                                                                                                             2}]))), 
-?line <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall]))), 
-?line <<"a:bc">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall,
+    <<":abC:">> = iolist_to_binary(join(re:split("abCE","((?i)AB(?-i)C|D)E",[]))), 
+    <<":D">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[trim]))), 
+    <<":D:">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<":D:">> = iolist_to_binary(join(re:split("DE","((?i)AB(?-i)C|D)E",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((?i)AB(?-i)C|D)E",[]))), 
+    <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[trim]))), 
+    <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"abcE">> = iolist_to_binary(join(re:split("abcE","((?i)AB(?-i)C|D)E",[]))), 
+    <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[trim]))), 
+    <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"abCe">> = iolist_to_binary(join(re:split("abCe","((?i)AB(?-i)C|D)E",[]))), 
+    <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[trim]))), 
+    <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"dE">> = iolist_to_binary(join(re:split("dE","((?i)AB(?-i)C|D)E",[]))), 
+    <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[trim]))), 
+    <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"De">> = iolist_to_binary(join(re:split("De","((?i)AB(?-i)C|D)E",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[]))), 
+    <<"a:bc">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[trim]))), 
+    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall,
                                                                                                                                                                                         trim]))), 
-?line <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall,
+    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall,
                                                                                                                                                                                           {parts,
                                                                                                                                                                                            2}]))), 
-?line <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall]))), 
-?line <<":abc:abc">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[trim]))), 
-?line <<":abc:abc:">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<":abc:abc:">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[]))), 
-?line <<"a:bc:bc">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[trim]))), 
-?line <<"a:bc:bc:">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[{parts,
+    <<":abc:">> = iolist_to_binary(join(re:split("abc123abc","(.*)\\d+\\1",[dotall]))), 
+    <<"a:bc">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall,
+                                                                                                                                                                                      trim]))), 
+    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall,
+                                                                                                                                                                                        {parts,
+                                                                                                                                                                                         2}]))), 
+    <<"a:bc:">> = iolist_to_binary(join(re:split("abc123bc","(.*)\\d+\\1",[dotall]))), 
+    <<":abc:abc">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[trim]))), 
+    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[{parts,
                                                                                                                                                                                               2}]))), 
-?line <<"a:bc:bc:">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
+    <<":abc:abc:">> = iolist_to_binary(join(re:split("abc123abc","((.*))\\d+\\1",[]))), 
+    <<"a:bc:bc">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[trim]))), 
+    <<"a:bc:bc:">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"a:bc:bc:">> = iolist_to_binary(join(re:split("abc123bc","((.*))\\d+\\1",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28490,7 +28599,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28499,7 +28608,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123::a123","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28508,7 +28617,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
+    <<"">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28517,7 +28626,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28526,7 +28635,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:b342::abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28535,7 +28644,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+    <<"">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28544,7 +28653,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28553,7 +28662,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28562,7 +28671,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+    <<"">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28571,7 +28680,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28580,7 +28689,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28589,7 +28698,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28598,7 +28707,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28607,7 +28716,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:ddde:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28616,7 +28725,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28625,7 +28734,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28634,7 +28743,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"::">> = iolist_to_binary(join(re:split("a123:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28643,7 +28752,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28652,7 +28761,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28661,7 +28770,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28670,7 +28779,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+    <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28679,7 +28788,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+    <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28688,7 +28797,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+    <<"1:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("1:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28697,7 +28806,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28706,7 +28815,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28715,7 +28824,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"a123:bce:ddde:9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123:bce:ddde:9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28724,7 +28833,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28733,7 +28842,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28742,7 +28851,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
+    <<"a123::9999:b342::324e:dcba:abcd">> = iolist_to_binary(join(re:split("a123::9999:b342::324e:dcba:abcd","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28751,7 +28860,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+    <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28760,7 +28869,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+    <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28769,7 +28878,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
+    <<"abcde:2:3:4:5:6:7:8">> = iolist_to_binary(join(re:split("abcde:2:3:4:5:6:7:8","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28778,7 +28887,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
+    <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28787,7 +28896,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
+    <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28796,7 +28905,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
+    <<"::1">> = iolist_to_binary(join(re:split("::1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28805,7 +28914,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
+    <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28814,7 +28923,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
+    <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28823,7 +28932,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
+    <<"abcd:fee0:123::">> = iolist_to_binary(join(re:split("abcd:fee0:123::","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28832,7 +28941,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
+    <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28841,7 +28950,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
+    <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28850,7 +28959,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
+    <<":1">> = iolist_to_binary(join(re:split(":1","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28859,7 +28968,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
+    <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28868,7 +28977,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,trim]))), 
-?line <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
+    <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28877,7 +28986,7 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless,{parts,2}]))), 
-?line <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
+    <<"1:">> = iolist_to_binary(join(re:split("1:","^(?!:)                       # colon disallowed at start
   (?:                         # start of item
     (?: [0-9a-f]{1,4} |       # 1-4 hex digits or
     (?(1)0 | () ) )           # if null previously matched, fail; else null
@@ -28886,535 +28995,2980 @@ xb","(?!^)x",[multiline]))),
   [0-9a-f]{1,4} $             # final hex number at end of string
   (?(1)|.)                    # check that there was an empty component
   ",[extended,caseless]))), 
-?line <<"">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[trim]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[trim]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[{parts,
-                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("M","\\M",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("M","\\M",[{parts,
-                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("M","\\M",[]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[trim]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[{parts,
-                                                                                                                                                                                                                                                                                                          2}]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("REGular","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
-                                                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("regulaer","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
-                                                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Regex","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[{parts,
-                                                                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("regulär","(?i)reg(?:ul(?:[aä]|ae)r|ex)",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("Åæåäà","Åæåä[à-ÿÀ-ß]+",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("Åæåäà","Åæåä[à-ÿÀ-ß]+",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Åæåäà","Åæåä[à-ÿÀ-ß]+",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("Åæåäÿ","Åæåä[à-ÿÀ-ß]+",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("Åæåäÿ","Åæåä[à-ÿÀ-ß]+",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Åæåäÿ","Åæåä[à-ÿÀ-ß]+",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ÅæåäÀ","Åæåä[à-ÿÀ-ß]+",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("Åæåäß","Åæåä[à-ÿÀ-ß]+",[trim]))),
-?line <<":">> = iolist_to_binary(join(re:split("Åæåäß","Åæåä[à-ÿÀ-ß]+",[{parts,
-                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("Åæåäß","Åæåä[à-ÿÀ-ß]+",[]))),
-?line <<"„XAZ">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[trim]))),
-?line <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[{parts,
+    <<"">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[]))),
-?line <<"">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[{parts,
-                                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[{parts,
-                                                                                                                                                                                                    2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[]))), 
-?line <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[trim]))), 
-?line <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[]))), 
-?line <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[trim]))), 
-?line <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[]))), 
-?line <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[trim]))), 
-?line <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[{parts,
-                                                                                                                                                                                                2}]))), 
-?line <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[]))), 
-?line <<"off">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[trim]))), 
-?line <<"off:">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("z","[z\\Qa-d]\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"off:">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[]))), 
-?line <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[trim]))), 
-?line <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("a","[z\\Qa-d]\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[]))), 
-?line <<"ony">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[trim]))), 
-?line <<"ony:">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("-","[z\\Qa-d]\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"ony:">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[]))), 
-?line <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[trim]))), 
-?line <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("d","[z\\Qa-d]\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[{parts,
                                                                                                                                                                               2}]))), 
-?line <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[]))), 
-?line <<"a
+    <<":">> = iolist_to_binary(join(re:split("]","[z\\Qa-d]\\E]",[]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[trim]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"*** F:ilers">> = iolist_to_binary(join(re:split("*** Failers","[z\\Qa-d]\\E]",[]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[trim]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"b">> = iolist_to_binary(join(re:split("b","[z\\Qa-d]\\E]",[]))), 
+    ok.
+run34() ->
+    <<"">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("z","[\\z\\C]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("C","[\\z\\C]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("M","\\M",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("M","\\M",[{parts,
+                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("M","\\M",[]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[trim]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[{parts,
+                                                                                                                                                                                                                                                                                                        2}]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a+)*b",[]))), 
+    <<"„XAZ">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[trim]))), 
+    <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"„XAZ:">> = iolist_to_binary(join(re:split("„XAZXB","(?<=Z)X.",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab cd defg","ab cd (?x) de fg",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab cddefg","ab cd(?x) de fg",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","ab cd(?x) de fg",[]))), 
+    <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[trim]))), 
+    <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"abcddefg">> = iolist_to_binary(join(re:split("abcddefg","ab cd(?x) de fg",[]))), 
+    <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[trim]))), 
+    <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"foo:bar:X">> = iolist_to_binary(join(re:split("foobarX","(?<![^f]oo)(bar)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f]oo)(bar)",[]))), 
+    <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[trim]))), 
+    <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"boobarX">> = iolist_to_binary(join(re:split("boobarX","(?<![^f]oo)(bar)",[]))), 
+    <<"off">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[trim]))), 
+    <<"off:">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"off:">> = iolist_to_binary(join(re:split("offX","(?<![^f])X",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<![^f])X",[]))), 
+    <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[trim]))), 
+    <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"onyX">> = iolist_to_binary(join(re:split("onyX","(?<![^f])X",[]))), 
+    <<"ony">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[trim]))), 
+    <<"ony:">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"ony:">> = iolist_to_binary(join(re:split("onyX","(?<=[^f])X",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^f])X",[]))), 
+    <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[trim]))), 
+    <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"offX">> = iolist_to_binary(join(re:split("offX","(?<=[^f])X",[]))), 
+    <<"a
 :b
 :c">> = iolist_to_binary(join(re:split("a
 b
 c","^",[multiline,trim]))), 
-?line <<"a
+    <<"a
 :b
 c">> = iolist_to_binary(join(re:split("a
 b
 c","^",[multiline,{parts,2}]))), 
-?line <<"a
+    <<"a
 :b
 :c">> = iolist_to_binary(join(re:split("a
 b
 c","^",[multiline]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^",[multiline,
-                                                                                                                                                  trim]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^",[multiline,
-                                                                                                                                                    {parts,
-                                                                                                                                                     2}]))), 
-?line <<"">> = iolist_to_binary(join(re:split("","^",[multiline]))), 
-?line <<"A
+    <<"">> = iolist_to_binary(join(re:split("","^",[multiline,
+                                                                                                                                                trim]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^",[multiline,
+                                                                                                                                                  {parts,
+                                                                                                                                                   2}]))), 
+    <<"">> = iolist_to_binary(join(re:split("","^",[multiline]))), 
+    <<"A
 C
 :C">> = iolist_to_binary(join(re:split("A
 C
 C","(?<=C\\n)^",[multiline,trim]))), 
-?line <<"A
+    <<"A
 C
 :C">> = iolist_to_binary(join(re:split("A
 C
 C","(?<=C\\n)^",[multiline,{parts,2}]))), 
-?line <<"A
+    <<"A
 C
 :C">> = iolist_to_binary(join(re:split("A
 C
 C","(?<=C\\n)^",[multiline]))), 
-?line <<":X">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[trim]))), 
-?line <<":X:">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[{parts,
+    <<":X">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[trim]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[]))), 
+    <<":Y">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[trim]))), 
+    <<":Y:">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<":Y:">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[]))), 
+    <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[trim]))), 
+    <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[]))), 
+    <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[trim]))), 
+    <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[{parts,
+                                                                                                                                                                                                                                                     2}]))), 
+    <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[]))), 
+    <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended,
+                                                                                                                                                                  trim]))), 
+    <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended]))), 
+    <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[trim]))), 
+    <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[]))), 
+    <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[trim]))), 
+    <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[{parts,
                                                                                                                                                                                             2}]))), 
-?line <<":X:">> = iolist_to_binary(join(re:split("bXaX","(?:(?(1)a|b)(X))+",[]))), 
-?line <<":Y">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[trim]))), 
-?line <<":Y:">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<":Y:">> = iolist_to_binary(join(re:split("bXXaYYaY","(?:(?(1)\\1a|b)(X|Y))+",[]))), 
-?line <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[trim]))), 
-?line <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[{parts,
-                                                                                                                                                                                                               2}]))), 
-?line <<":X:YaXXaX">> = iolist_to_binary(join(re:split("bXYaXXaX","(?:(?(1)\\1a|b)(X|Y))+",[]))), 
-?line <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[trim]))), 
-?line <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[{parts,
-                                                                                                                                                                                                                                                       2}]))), 
-?line <<"::::::::::X:XaYYaY">> = iolist_to_binary(join(re:split("bXXaYYaY","()()()()()()()()()(?:(?(10)\\10a|b)(X|Y))+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc]","[[,abc,]+]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[{parts,
-                                                                                                                                                                              2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a,b]","[[,abc,]+]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[{parts,
-                                                                                                                                                                                    2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("[a,b,c]","[[,abc,]+]",[]))), 
-?line <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended,
-                                                                                                                                                                    trim]))), 
-?line <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended,
-                                                                                                                                                                      {parts,
-                                                                                                                                                                       2}]))), 
-?line <<"A:B">> = iolist_to_binary(join(re:split("A B","(?-x: )",[extended]))), 
-?line <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[trim]))), 
-?line <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<"A:B">> = iolist_to_binary(join(re:split("A # B","(?x)(?-x: \\s*#\\s*)",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[{parts,
-                                                                                                                                                                                                                2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x)(?-x: \\s*#\\s*)",[]))), 
-?line <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[trim]))), 
-?line <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[{parts,
-                                                                                                                                                                                              2}]))), 
-?line <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[]))), 
-?line <<"A">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
-?line <<"A:">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
-                                                                                                                                                                                                                                                2}]))), 
-?line <<"A:">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
-                                                                                                                                                                                                                                                2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
-?line <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
-?line <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
+    <<"#">> = iolist_to_binary(join(re:split("#","(?x)(?-x: \\s*#\\s*)",[]))), 
+    <<"A">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+    <<"A:">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
                                                                                                                                                                                                                                               2}]))), 
-?line <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
-?line <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
-?line <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
-                                                                                                                                                                                                                                                2}]))), 
-?line <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a*b*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b*\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[trim]))), 
-?line <<":bb">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[{parts,
-                                                                                                                                                                               2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[{parts,
-                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a*b?\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b?\\w",[{parts,
-                                                                                                                                                                   2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b?\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[{parts,
-                                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[{parts,
-                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[{parts,
+    <<"A:">> = iolist_to_binary(join(re:split("A #include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
+                                                                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
+    <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+    <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
+                                                                                                                                                                                                                                            2}]))), 
+    <<"A#include">> = iolist_to_binary(join(re:split("A#include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
+    <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[trim]))), 
+    <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[{parts,
+                                                                                                                                                                                                                                              2}]))), 
+    <<"A #Include">> = iolist_to_binary(join(re:split("A #Include","(?x-is)(?:(?-ixs) \\s*#\\s*) include",[]))), 
+    ok.
+run35() ->
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a*b*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b*\\w",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[trim]))), 
+    <<":bb">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaabbbb","a*b?\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b?\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a*b?\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b?\\w",[{parts,
+                                                                                                                                                                 2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b?\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,4}\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[{parts,
                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,4}\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[{parts,
                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,4}\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaabbbb","a*b{0,}\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","a*b{0,}\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b{0,}\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[{parts,
                                                                                                                                                                         2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended,
-                                                                                                                                                                   trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended,
-                                                                                                                                                                     {parts,
+    <<":">> = iolist_to_binary(join(re:split("0a","a*\\d*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[{parts,
                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a*b#comment
+    <<":">> = iolist_to_binary(join(re:split("a","a*\\d*\\w",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended,
+                                                                                                                                                                 trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended,
+                                                                                                                                                                   {parts,
+                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a*b *\\w",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","a*b#comment
   *\\w",[extended,trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b#comment
+    <<":">> = iolist_to_binary(join(re:split("a","a*b#comment
   *\\w",[extended,{parts,2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a*b#comment
+    <<":">> = iolist_to_binary(join(re:split("a","a*b#comment
   *\\w",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended,
-                                                                                                                                                                     trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended,
-                                                                                                                                                                       {parts,
-                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended]))), 
-?line <<"::
+    <<"">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended,
+                                                                                                                                                                   trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended,
+                                                                                                                                                                     {parts,
+                                                                                                                                                                      2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","a* b *\\w",[extended]))), 
+    <<"::
 pqr">> = iolist_to_binary(join(re:split("abc=xyz\\
 pqr","^\\w+=.*(\\\\\\n.*)*",[trim]))), 
-?line <<"::
+    <<"::
 pqr">> = iolist_to_binary(join(re:split("abc=xyz\\
 pqr","^\\w+=.*(\\\\\\n.*)*",[{parts,2}]))), 
-?line <<"::
+    <<"::
 pqr">> = iolist_to_binary(join(re:split("abc=xyz\\
 pqr","^\\w+=.*(\\\\\\n.*)*",[]))), 
-?line <<":abcd">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[trim]))), 
-?line <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[{parts,
+    <<":abcd">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[trim]))), 
+    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[]))), 
+    <<":abcd">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[trim]))), 
+    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","(?=(\\w+))\\1:",[]))), 
-?line <<":abcd">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[trim]))), 
-?line <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[{parts,
-                                                                                                                                                                                            2}]))), 
-?line <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[{parts,
-                                                                                                                                                                       2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[{parts,
+    <<":abcd:">> = iolist_to_binary(join(re:split("abcd:","^(?=(\\w+))\\1:",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^\\Eabc",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^[\\Eabc]",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[trim]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[trim]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[trim]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[{parts,
+                                                                                                                                                                     2}]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[{parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[trim]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[trim]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[trim]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[]))), 
+    ok.
+run36() ->
+    <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[trim]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[trim]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[{parts,
+                                                                                                                                                                                                                                                                                         2}]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[{parts,
+                                                                                                                                                                                                                                                                                           2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[trim]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[{parts,
+                                                                                                                                                                                                                                                                                             2}]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[{parts,
+                                                                                                                                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[trim]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[{parts,
+                                                                                                                                                                                                                                                                                             2}]))), 
+    <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[{parts,
+                                                                                                                                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","\\Z",[trim]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\Z",[{parts,
+                                                                                                                                                             2}]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\Z",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[]))), 
+    <<"a:::b:::c:::d">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended,
+                                                                                                                                                                                                  trim]))), 
+    <<"a:::bcd">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended,
+                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended]))), 
+    <<"a:::b:::c:::d">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended,
+                                                                                                                                                                                            trim]))), 
+    <<"a:::bcd">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended,
+                                                                                                                                                                                              {parts,
+                                                                                                                                                                                               2}]))), 
+    <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended]))), 
+    <<"a::b::c::d">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended,
+                                                                                                                                                                                      trim]))), 
+    <<"a::bcd">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended,
+                                                                                                                                                                                        {parts,
                                                                                                                                                                                          2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\Eabc]",[]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[trim]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[{parts,
+    <<"a::b::c::d::">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[]))), 
+    <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[trim]))), 
+    <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"fooabcfoo">> = iolist_to_binary(join(re:split("fooabcfoo",".*[op][xyz]",[]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[trim]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)",[]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[trim]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)",[]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[trim]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=^.*b)b|^)",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(?(?=^.*b)b|^)",[]))), 
+    <<"a:d:c">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[trim]))), 
+    <<"a:dc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"a:d:c:">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)*",[]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[trim]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"a:c:">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)*",[]))), 
+    ok.
+run37() ->
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[trim]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"adc">> = iolist_to_binary(join(re:split("adc","(?(?=.*b)b|^)+",[]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[trim]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b)b|^)+",[]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[trim]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"a:c">> = iolist_to_binary(join(re:split("abc","(?(?=b).*b|^d)",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[trim]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","(?(?=.*b).*b|^d)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("%ab%","^%((?(?=[a])[^%])|b)*%$",[]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[trim]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XabX","(?i)a(?-i)b|c",[]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[trim]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XAbX","(?i)a(?-i)b|c",[]))), 
+    <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[trim]))), 
+    <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"C:C">> = iolist_to_binary(join(re:split("CcC","(?i)a(?-i)b|c",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?i)a(?-i)b|c",[]))), 
+    <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[trim]))), 
+    <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"XABX">> = iolist_to_binary(join(re:split("XABX","(?i)a(?-i)b|c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("
+
","[\\x00-\\xff\\s]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("
+
","[\\x00-\\xff\\s]+",[{parts,2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("
+
","[\\x00-\\xff\\s]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("?","^\\c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("?","^\\c",[{parts,
+                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("?","^\\c",[]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[caseless,
+                                                                                                                                                                     trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[caseless,
+                                                                                                                                                                       {parts,
+                                                                                                                                                                        2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[caseless]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[trim]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"abc">> = iolist_to_binary(join(re:split("abc","(abc)\\1",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("12abc","[^a]*",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("12abc","[^a]*",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("12abc","[^a]*",[caseless]))), 
+    <<":A">> = iolist_to_binary(join(re:split("12ABC","[^a]*",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<":ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<":A:">> = iolist_to_binary(join(re:split("12ABC","[^a]*",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("12abc","[^a]*+",[caseless,
+                                                                                                                                                                    trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("12abc","[^a]*+",[caseless,
+                                                                                                                                                                      {parts,
                                                                                                                                                                        2}]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[\\Eabc]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[{parts,
+    <<":a:">> = iolist_to_binary(join(re:split("12abc","[^a]*+",[caseless]))), 
+    <<":A">> = iolist_to_binary(join(re:split("12ABC","[^a]*+",[caseless,
+                                                                                                                                                                    trim]))), 
+    <<":ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*+",[caseless,
+                                                                                                                                                                      {parts,
                                                                                                                                                                        2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","^[a-\\Ec]",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[{parts,
+    <<":A:">> = iolist_to_binary(join(re:split("12ABC","[^a]*+",[caseless]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]*?X",[caseless,
+                                                                                                                                                                                trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]*?X",[caseless,
+                                                                                                                                                                                  {parts,
+                                                                                                                                                                                   2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]*?X",[caseless]))), 
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]*?X",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]*?X",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]*?X",[caseless]))), 
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*?X",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*?X",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]*?X",[caseless]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]+?X",[caseless,
+                                                                                                                                                                                trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]+?X",[caseless,
+                                                                                                                                                                                  {parts,
+                                                                                                                                                                                   2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","[^a]+?X",[caseless]))), 
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]+?X",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]+?X",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"12abc">> = iolist_to_binary(join(re:split("12abc","[^a]+?X",[caseless]))), 
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]+?X",[caseless,
+                                                                                                                                                                      trim]))), 
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]+?X",[caseless,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"12ABC">> = iolist_to_binary(join(re:split("12ABC","[^a]+?X",[caseless]))), 
+    <<"12a:b">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?X",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<"12a:bcX">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?X",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<"12a:b:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?X",[caseless]))), 
+    <<"12A:B">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?X",[caseless,
+                                                                                                                                                                        trim]))), 
+    <<"12A:BCX">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?X",[caseless,
+                                                                                                                                                                          {parts,
+                                                                                                                                                                           2}]))), 
+    <<"12A:B:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?X",[caseless]))), 
+    <<"B">> = iolist_to_binary(join(re:split("BCX","[^a]?X",[caseless,
+                                                                                                                                                                trim]))), 
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?X",[caseless,
+                                                                                                                                                                  {parts,
+                                                                                                                                                                   2}]))), 
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?X",[caseless]))), 
+    <<"12a:b">> = iolist_to_binary(join(re:split("12aXbcX","[^a]??X",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"12a:bcX">> = iolist_to_binary(join(re:split("12aXbcX","[^a]??X",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"12a:b:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]??X",[caseless]))), 
+    <<"12A:B">> = iolist_to_binary(join(re:split("12AXBCX","[^a]??X",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"12A:BCX">> = iolist_to_binary(join(re:split("12AXBCX","[^a]??X",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"12A:B:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]??X",[caseless]))), 
+    <<"B">> = iolist_to_binary(join(re:split("BCX","[^a]??X",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]??X",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]??X",[caseless]))), 
+    <<"12aXb">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?+X",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"12aXb:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?+X",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"12aXb:">> = iolist_to_binary(join(re:split("12aXbcX","[^a]?+X",[caseless]))), 
+    <<"12AXB">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?+X",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"12AXB:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?+X",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"12AXB:">> = iolist_to_binary(join(re:split("12AXBCX","[^a]?+X",[caseless]))), 
+    <<"B">> = iolist_to_binary(join(re:split("BCX","[^a]?+X",[caseless,
+                                                                                                                                                                  trim]))), 
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?+X",[caseless,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"B:">> = iolist_to_binary(join(re:split("BCX","[^a]?+X",[caseless]))), 
+    <<"a">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<"a:ef">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<"a::">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}",[caseless]))), 
+    <<"A">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<"A:EF">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<"A::">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}",[caseless]))), 
+    <<"a::f">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}?",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<"a:def">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}?",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<"a::f">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}?",[caseless]))), 
+    <<"A::F">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}?",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<"A:DEF">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}?",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<"A::F">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}?",[caseless]))), 
+    <<"a">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}+",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<"a:ef">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}+",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<"a::">> = iolist_to_binary(join(re:split("abcdef","[^a]{2,3}+",[caseless]))), 
+    <<"A">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}+",[caseless,
+                                                                                                                                                                              trim]))), 
+    <<"A:EF">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}+",[caseless,
+                                                                                                                                                                                {parts,
+                                                                                                                                                                                 2}]))), 
+    <<"A::">> = iolist_to_binary(join(re:split("ABCDEF","[^a]{2,3}+",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("Z","((a|)+)+Z",[]))), 
+    ok.
+run38() ->
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[trim]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(a)b|(a)c",[]))), 
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[trim]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(a))b|(a)c",[]))), 
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[trim]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?=(a))ab|(a)c",[]))), 
+    <<":ac::a">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[trim]))), 
+    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)",[]))), 
+    <<":ac::a">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[trim]))), 
+    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<":ac::a:">> = iolist_to_binary(join(re:split("ac","((?>(a))b|(a)c)++",[]))), 
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[trim]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?:(?>(a))b|(a)c)++",[]))), 
+    <<"::a:ac">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[trim]))), 
+    <<"::a:ac:">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"::a:ac:">> = iolist_to_binary(join(re:split("ac","(?=(?>(a))b|(a)c)(..)",[]))), 
+    <<"::a">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[trim]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"::a:">> = iolist_to_binary(join(re:split("ac","(?>(?>(a))b|(a)c)",[]))), 
+    <<":aaaabaaabaabab:aaa:aabab">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[trim]))), 
+    <<":aaaabaaabaabab:aaa:aabab:">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<":aaaabaaabaabab:aaa:aabab:">> = iolist_to_binary(join(re:split("aaaabaaabaabab","((?>(a+)b)+(aabab))",[]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+?c",[]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","(?>a+|ab)+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","(?:a+|ab)+c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a))a)",[]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[trim]))), 
+    <<":a:b:">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":a:b:">> = iolist_to_binary(join(re:split("ab","(?(?=(a))a)(b)",[]))), 
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[trim]))), 
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)++c",[]))), 
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[trim]))), 
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"aaaabc">> = iolist_to_binary(join(re:split("aaaabc","^(?>a|ab)++c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaabc","^(?:a|ab)+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("xyz","(?=abc){0}xyz",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?=abc){1}xyz",[]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[trim]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"xyz">> = iolist_to_binary(join(re:split("xyz","(?=abc){1}xyz",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[trim]))), 
+    <<":a:b">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<":a:::">> = iolist_to_binary(join(re:split("ab","(?=(a))?.",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[trim]))), 
+    <<"::c">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"::::">> = iolist_to_binary(join(re:split("bc","(?=(a))?.",[]))), 
+    ok.
+run39() ->
+    <<"">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[trim]))), 
+    <<"::b">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"::::">> = iolist_to_binary(join(re:split("ab","(?=(a))??.",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[trim]))), 
+    <<"::c">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"::::">> = iolist_to_binary(join(re:split("bc","(?=(a))??.",[]))), 
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","^(?=(a)){0}b(?1)",[trim]))), 
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","^(?=(a)){0}b(?1)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","^(?=(a)){0}b(?1)",[]))), 
+    <<":b">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[trim]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":b:">> = iolist_to_binary(join(re:split("abd","^(?=(?1))?[az]([abc])d",[]))), 
+    <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[trim]))), 
+    <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":c:xx">> = iolist_to_binary(join(re:split("zcdxx","^(?=(?1))?[az]([abc])d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaa","^(?!a){0}\\w+",[]))), 
+    <<"abc:abc">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[trim]))), 
+    <<"abc:abc:">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"abc:abc:">> = iolist_to_binary(join(re:split("abcxyz","(?<=(abc))?xyz",[]))), 
+    <<"pqr">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[trim]))), 
+    <<"pqr::">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"pqr::">> = iolist_to_binary(join(re:split("pqrxyz","(?<=(abc))?xyz",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[{parts,
+                                                                                                                                                                                             2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ggg<<<aaa>>>","^[\\g<a>]+",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[{parts,
+                                                                                                                                                                                         2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\g<a>]+",[]))), 
+    <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[trim]))), 
+    <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"\\ga">> = iolist_to_binary(join(re:split("\\ga","^[\\g<a>]+",[]))), 
+    <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[trim]))), 
+    <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<":xyz">> = iolist_to_binary(join(re:split("gggagagaxyz","^[\\ga]+",[]))), 
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[trim]))), 
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::Z","^[:a[:digit:]]+",[]))), 
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[trim]))), 
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<":Z">> = iolist_to_binary(join(re:split("aaaa444:::bbbZ","^[:a[:digit:]:b]+",[]))), 
+    <<"">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split(":xxx:","[:a]xxx[b:]",[]))), 
+    <<"xaa:c">> = iolist_to_binary(join(re:split("xaabc","(?<=a{2})b",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<"xaa:c">> = iolist_to_binary(join(re:split("xaabc","(?<=a{2})b",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<"xaa:c">> = iolist_to_binary(join(re:split("xaabc","(?<=a{2})b",[caseless]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=a{2})b",[caseless,
+                                                                                                                                                                                      trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=a{2})b",[caseless,
+                                                                                                                                                                                        {parts,
+                                                                                                                                                                                         2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=a{2})b",[caseless]))), 
+    <<"xabc">> = iolist_to_binary(join(re:split("xabc","(?<=a{2})b",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"xabc">> = iolist_to_binary(join(re:split("xabc","(?<=a{2})b",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"xabc">> = iolist_to_binary(join(re:split("xabc","(?<=a{2})b",[caseless]))), 
+    <<"xa:c">> = iolist_to_binary(join(re:split("xabc","(?<!a{2})b",[caseless,
+                                                                                                                                                                          trim]))), 
+    <<"xa:c">> = iolist_to_binary(join(re:split("xabc","(?<!a{2})b",[caseless,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"xa:c">> = iolist_to_binary(join(re:split("xabc","(?<!a{2})b",[caseless]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<!a{2})b",[caseless,
+                                                                                                                                                                                      trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<!a{2})b",[caseless,
+                                                                                                                                                                                        {parts,
                                                                                                                                                                                          2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a-\\Ec]",[]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[trim]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[{parts,
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<!a{2})b",[caseless]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<!a{2})b",[caseless,
+                                                                                                                                                                            trim]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<!a{2})b",[caseless,
+                                                                                                                                                                              {parts,
+                                                                                                                                                                               2}]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<!a{2})b",[caseless]))), 
+    <<"xa ">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[trim]))), 
+    <<"xa :">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<"xa :">> = iolist_to_binary(join(re:split("xa c","(?<=a\\h)c",[]))), 
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[trim]))), 
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[]))), 
+    <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[trim]))), 
+    <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"aAA:c">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[trim]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[]))), 
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"axx:c">> = iolist_to_binary(join(re:split("axxbc","(?<=[^a]{2})b",[caseless]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                            trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                              {parts,
+                                                                                                                                                                                               2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=[^a]{2})b",[caseless]))), 
+    <<"aAAbc">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"aAAbc">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"aAAbc">> = iolist_to_binary(join(re:split("aAAbc","(?<=[^a]{2})b",[caseless]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                  trim]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[caseless,
+                                                                                                                                                                                    {parts,
+                                                                                                                                                                                     2}]))), 
+    <<"xaabc">> = iolist_to_binary(join(re:split("xaabc","(?<=[^a]{2})b",[caseless]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\H)c",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abc","(?<=a\\V)c",[]))), 
+    <<"a
+">> = iolist_to_binary(join(re:split("a
+c","(?<=a\\v)c",[trim]))), 
+    <<"a
+:">> = iolist_to_binary(join(re:split("a
+c","(?<=a\\v)c",[{parts,2}]))), 
+    <<"a
+:">> = iolist_to_binary(join(re:split("a
+c","(?<=a\\v)c",[]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[trim]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)++Y",[]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[trim]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"X:X">> = iolist_to_binary(join(re:split("XcccddYX","(?(?=c)c|d)*+Y",[]))), 
+    ok.
+run40() ->
+    <<":aaa">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[trim]))), 
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaaaaaa","^(a{2,3}){2,}+a",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3}){2,}+a",[]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[trim]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3}){2,}+a",[]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[trim]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"aaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaa","^(a{2,3}){2,}+a",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})++a",[]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[trim]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})++a",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a{2,3})*+a",[]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[trim]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(a{2,3})*+a",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abXde","ab\\Cde",[]))), 
+    <<"abZde">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[trim]))), 
+    <<"abZde:">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"abZde:">> = iolist_to_binary(join(re:split("abZdeX","(?<=ab\\Cde)X",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[a-\\Ec]",[]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[trim]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aCb","a[\\CD]b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[{parts,
                                                                                                                                                                        2}]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[a-\\Ec]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("aDb","a[\\CD]b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aJb","a[\\C-X]b",[]))), 
+    <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[trim]))), 
+    <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"X X">> = iolist_to_binary(join(re:split("X X","\\H\\h\\V\\v",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("X	X","\\H\\h\\V\\v",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H\\h\\V\\v",[]))), 
+    <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[trim]))), 
+    <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"  X">> = iolist_to_binary(join(re:split("  X","\\H\\h\\V\\v",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("	  X
+
","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("	  X
+
","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("	  X
+
","\\H*\\h+\\V?\\v{3,4}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("	  
+
","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("	  
+
","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("	  
+
","\\H*\\h+\\V?\\v{3,4}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("	  
+","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("	  
+","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("	  
+","\\H*\\h+\\V?\\v{3,4}",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\H*\\h+\\V?\\v{3,4}",[]))), 
+    <<"	  
+">> = iolist_to_binary(join(re:split("	  
+","\\H*\\h+\\V?\\v{3,4}",[trim]))), 
+    <<"	  
+">> = iolist_to_binary(join(re:split("	  
+","\\H*\\h+\\V?\\v{3,4}",[{parts,2}]))), 
+    <<"	  
+">> = iolist_to_binary(join(re:split("	  
+","\\H*\\h+\\V?\\v{3,4}",[]))), 
+    <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[trim]))), 
+    <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"XY  :E">> = iolist_to_binary(join(re:split("XY  ABCDE","\\H{3,4}",[]))), 
+    <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[trim]))), 
+    <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","^[a\\E\\E-\\Ec]",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[{parts,
+    <<"XY  : ST">> = iolist_to_binary(join(re:split("XY  PQR ST","\\H{3,4}",[]))), 
+    <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[trim]))), 
+    <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"XY  A:QRS">> = iolist_to_binary(join(re:split("XY  AB    PQRS",".\\h{3,4}.",[]))), 
+    <<">">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">XNNNYZ","\\h*X\\h?\\H+Y\\H?Z",[]))), 
+    <<">">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">  X NYQZ","\\h*X\\h?\\H+Y\\H?Z",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\h*X\\h?\\H+Y\\H?Z",[]))), 
+    <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+    <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<">XYZ">> = iolist_to_binary(join(re:split(">XYZ","\\h*X\\h?\\H+Y\\H?Z",[]))), 
+    <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[trim]))), 
+    <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<">  X NY Z">> = iolist_to_binary(join(re:split(">  X NY Z","\\h*X\\h?\\H+Y\\H?Z",[]))), 
+    <<">">> = iolist_to_binary(join(re:split(">XY
+Z
+ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[trim]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">XY
+Z
+ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[{parts,
+                                                                               2}]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">XY
+Z
+ANN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[]))), 
+    <<">">> = iolist_to_binary(join(re:split(">
+
X
+Y
+ZZZ
+AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[trim]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">
+
X
+Y
+ZZZ
+AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[{parts,
+                                                                                  2}]))), 
+    <<">:">> = iolist_to_binary(join(re:split(">
+
X
+Y
+ZZZ
+AAANNN","\\v*X\\v?Y\\v+Z\\V*\\x0a\\V+\\x0b\\V{2,3}\\x0c",[]))), 
+    <<"foo:foo">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[trim]))), 
+    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"foo:foo:">> = iolist_to_binary(join(re:split("foobar","(foo)\\Kbar",[]))), 
+    <<"foo:foo:bar">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[trim]))), 
+    <<"foo:foo:bar:">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<"foo:foo:bar:">> = iolist_to_binary(join(re:split("foobar","(foo)(\\Kbar|baz)",[]))), 
+    <<":foo:baz">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[trim]))), 
+    <<":foo:baz:">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<":foo:baz:">> = iolist_to_binary(join(re:split("foobaz","(foo)(\\Kbar|baz)",[]))), 
+    <<"foo:foobar">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[trim]))), 
+    <<"foo:foobar:">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[{parts,
+                                                                                                                                                                                               2}]))), 
+    <<"foo:foobar:">> = iolist_to_binary(join(re:split("foobarbaz","(foo\\Kbar)baz",[]))), 
+    <<":ab:b:XXXX">> = iolist_to_binary(join(re:split("ababababbbabZXXXX","^(a(b))\\1\\g1\\g{1}\\g-1\\g{-1}\\g{-02}Z",[trim]))), 
+    <<":ab:b:XXXX">> = iolist_to_binary(join(re:split("ababababbbabZXXXX","^(a(b))\\1\\g1\\g{1}\\g-1\\g{-1}\\g{-02}Z",[{parts,
+                                                                                                                                                                                                                                                                          2}]))), 
+    <<":ab:b:XXXX">> = iolist_to_binary(join(re:split("ababababbbabZXXXX","^(a(b))\\1\\g1\\g{1}\\g-1\\g{-1}\\g{-02}Z",[]))), 
+    <<":tom">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[trim]))), 
+    <<":tom:">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[{parts,
                                                                                                                                                                                                        2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[a\\E\\E-\\Ec]",[]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[trim]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[{parts,
-                                                                                                                                                                                     2}]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[a\\E\\E-\\Ec]",[]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[trim]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[{parts,
+    <<":tom:">> = iolist_to_binary(join(re:split("tom-tom","(?<A>tom|bon)-\\g{A}",[]))), 
+    <<":bon">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[trim]))), 
+    <<":bon:">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<":bon:">> = iolist_to_binary(join(re:split("bon-bon","(?<A>tom|bon)-\\g{A}",[]))), 
+    <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[trim]))), 
+    <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"bacxxx">> = iolist_to_binary(join(re:split("bacxxx","(^(a|b\\g{-1}))",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))\\1",[]))), 
+    <<":xyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[trim]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))\\1",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))\\1",[]))), 
+    <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[trim]))), 
+    <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"abcxyz">> = iolist_to_binary(join(re:split("abcxyz","(?|(abc)|(xyz))\\1",[]))), 
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[trim]))), 
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"xyzabc">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))\\1",[]))), 
+    ok.
+run41() ->
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","(?|(abc)|(xyz))(?1)",[]))), 
+    <<":xyz">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[trim]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("xyzabc","(?|(abc)|(xyz))(?1)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?|(abc)|(xyz))(?1)",[]))), 
+    <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[trim]))), 
+    <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"xyzxyz">> = iolist_to_binary(join(re:split("xyzxyz","(?|(abc)|(xyz))(?1)",[]))), 
+    <<":a:b:c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[trim]))), 
+    <<":a:b:c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<":a:b:c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?5)(a)(?|(b)|(q))(c)(d)(Y)",[]))), 
+    <<":a:b:::c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[trim]))), 
+    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[{parts,
+                                                                                                                                                                                                                                      2}]))), 
+    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(r)(s))|(q))(c)(d)(Y)",[]))), 
+    <<":a:b:::c:d:Y">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[trim]))), 
+    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[{parts,
+                                                                                                                                                                                                                                                      2}]))), 
+    <<":a:b:::c:d:Y:">> = iolist_to_binary(join(re:split("XYabcdY","^X(?7)(a)(?|(b|(?|(r)|(t))(s))|(q))(c)(d)(Y)",[]))), 
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
+                                                                                                                                                                                                                                2}]))), 
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
+                                                                                                                                                                                                                                      2}]))), 
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[{parts,
+                                                                                                                                                                                                                                      2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\k<abc>{2}",[]))), 
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[trim]))), 
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[{parts,
+                                                                                                                                                                                                                                  2}]))), 
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\k<abc>{2}",[]))), 
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
+                                                                                                                                                                                                                                2}]))), 
+    <<":a:xyz">> = iolist_to_binary(join(re:split("a:aaxyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
+                                                                                                                                                                                                                                      2}]))), 
+    <<":ab:xyz">> = iolist_to_binary(join(re:split("ab:ababxyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[{parts,
+                                                                                                                                                                                                                                      2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?'abc'\\w+):\\g{abc}{2}",[]))), 
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"a:axyz">> = iolist_to_binary(join(re:split("a:axyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[trim]))), 
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[{parts,
+                                                                                                                                                                                                                                  2}]))), 
+    <<"ab:abxyz">> = iolist_to_binary(join(re:split("ab:abxyz","(?'abc'\\w+):\\g{abc}{2}",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
+                                                                                                                                                                                                                                            trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
+                                                                                                                                                                                                                                              {parts,
+                                                                                                                                                                                                                                               2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("abd","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
+                                                                                                                                                                                                                                          trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended,
+                                                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                                                             2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ce","^(?<ab>a)? (?(<ab>)b|c) (?('ab')d|e)",[extended]))), 
+    <<":aX">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[trim]))), 
+    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g-1Z",[]))), 
+    <<":aX">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[trim]))), 
+    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[{parts,
                                                                                                                                                                                      2}]))), 
-?line <<"E">> = iolist_to_binary(join(re:split("E","^[a\\E\\E-\\Ec]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
+    <<":aX:">> = iolist_to_binary(join(re:split("aXaXZ","^(a.)\\g{-1}Z",[]))), 
+    <<":::cd">> = iolist_to_binary(join(re:split("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ",[extended,
+                                                                                                                                                                                                                                                trim]))), 
+    <<":::cd">> = iolist_to_binary(join(re:split("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ",[extended,
+                                                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                                                   2}]))), 
+    <<":::cd">> = iolist_to_binary(join(re:split("abcd","^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) ",[extended]))), 
+    <<":metcalfe:33">> = iolist_to_binary(join(re:split("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?<NAME_PAT>[a-z]+)
+  (?<ADDRESS_PAT>\\d+)
+  )",[extended,trim]))), 
+    <<":metcalfe:33:::">> = iolist_to_binary(join(re:split("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?<NAME_PAT>[a-z]+)
+  (?<ADDRESS_PAT>\\d+)
+  )",[extended,{parts,2}]))), 
+    <<":metcalfe:33:::">> = iolist_to_binary(join(re:split("metcalfe 33","(?<NAME>(?&NAME_PAT))\\s+(?<ADDR>(?&ADDRESS_PAT))
+  (?(DEFINE)
+  (?<NAME_PAT>[a-z]+)
+  (?<ADDRESS_PAT>\\d+)
+  )",[extended]))), 
+    <<"::.4">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+    <<"::.4:">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
+                                                                                                                                                                                                                                                                                                                                        2}]))), 
+    <<"::.4:">> = iolist_to_binary(join(re:split("1.2.3.4","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
+    <<"::.206">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+    <<"::.206:">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
+                                                                                                                                                                                                                                                                                                                                                      2}]))), 
+    <<"::.206:">> = iolist_to_binary(join(re:split("131.111.10.206","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
+    <<"::.0">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+    <<"::.0:">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
+                                                                                                                                                                                                                                                                                                                                          2}]))), 
+    <<"::.0:">> = iolist_to_binary(join(re:split("10.0.0.0","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
+                                                                                                                                                                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
+                                                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[trim]))), 
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[{parts,
+                                                                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))\\b(?&byte)(\\.(?&byte)){3}",[]))), 
+    <<":.4">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+    <<":.4::">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
+                                                                                                                                                                                                                                                                                                                                        2}]))), 
+    <<":.4::">> = iolist_to_binary(join(re:split("1.2.3.4","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
+    <<":.206">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+    <<":.206::">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
+                                                                                                                                                                                                                                                                                                                                                      2}]))), 
+    <<":.206::">> = iolist_to_binary(join(re:split("131.111.10.206","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
+    <<":.0">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+    <<":.0::">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
+                                                                                                                                                                                                                                                                                                                                          2}]))), 
+    <<":.0::">> = iolist_to_binary(join(re:split("10.0.0.0","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
+                                                                                                                                                                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
+                                                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<"10.6">> = iolist_to_binary(join(re:split("10.6","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[trim]))), 
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[{parts,
+                                                                                                                                                                                                                                                                                                                                            2}]))), 
+    <<"455.3.4.5">> = iolist_to_binary(join(re:split("455.3.4.5","\\b(?&byte)(\\.(?&byte)){3}(?(DEFINE)(?<byte>2[0-4]\\d|25[0-5]|1\\d\\d|[1-9]?\\d))",[]))), 
+    <<":party">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[trim]))), 
+    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[{parts,
+                                                                                                                                                                                                                                                                                                                   2}]))), 
+    <<":party:">> = iolist_to_binary(join(re:split("now is the time for all good men to come to the aid of the party","^(\\w++|\\s++)*$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\w++|\\s++)*$",[]))), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[trim]))), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[{parts,
+                                                                                                                                                                                                                                                                               2}]))), 
+    <<"this is not a line with only words and spaces!">> = iolist_to_binary(join(re:split("this is not a line with only words and spaces!","^(\\w++|\\s++)*$",[]))), 
+    <<":12345:a">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[trim]))), 
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<":12345:a:">> = iolist_to_binary(join(re:split("12345a","(\\d++)(\\w)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","(\\d++)(\\w)",[]))), 
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[trim]))), 
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"12345+">> = iolist_to_binary(join(re:split("12345+","(\\d++)(\\w)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaab","a++b",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaab","a++b",[{parts,
+                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaab","a++b",[]))), 
+    <<":aaab">> = iolist_to_binary(join(re:split("aaab","(a++b)",[trim]))), 
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","(a++b)",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":aaab:">> = iolist_to_binary(join(re:split("aaab","(a++b)",[]))), 
+    <<":aaa">> = iolist_to_binary(join(re:split("aaab","(a++)b",[trim]))), 
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(a++)b",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<":aaa:">> = iolist_to_binary(join(re:split("aaab","(a++)b",[]))), 
+    <<"((:x">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[trim]))), 
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[{parts,
+                                                                                                                                                                                                                                    2}]))), 
+    <<"((:x:">> = iolist_to_binary(join(re:split("((abc(ade)ufh()()x","([^()]++|\\([^()]*\\))+",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("(abc)","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
+    <<":xyz">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                                        2}]))), 
+    <<":xyz:">> = iolist_to_binary(join(re:split("(abc(def)xyz)","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                                    2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[trim]))), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[{parts,
+                                                                                                                                                                                                                                                                                                              2}]))), 
+    <<"((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","\\(([^()]++|\\([^()]+\\))+\\)",[]))), 
+    ok.
+run42() ->
+    <<":c">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[trim]))), 
+    <<":c:">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[{parts,
                                                                                                                                                                                                      2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("b","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
+    <<":c:">> = iolist_to_binary(join(re:split("abc","^([^()]|\\((?1)*\\))*$",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[trim]))), 
+    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[]))), 
+    <<":d">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[trim]))), 
+    <<":d:">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[{parts,
+                                                                                                                                                                                                               2}]))), 
+    <<":d:">> = iolist_to_binary(join(re:split("a(b(c))d","^([^()]|\\((?1)*\\))*$",[]))), 
+    <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[trim]))), 
+    <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[{parts,
                                                                                                                                                                                                                        2}]))), 
-?line <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[trim]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[{parts,
-                                                                                                                                                                                                     2}]))), 
-?line <<"-">> = iolist_to_binary(join(re:split("-","^[\\E\\Qa\\E-\\Qz\\E]+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[{parts,
+    <<"*** Failers)">> = iolist_to_binary(join(re:split("*** Failers)","^([^()]|\\((?1)*\\))*$",[]))), 
+    <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[trim]))), 
+    <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[{parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"a(b(c)d">> = iolist_to_binary(join(re:split("a(b(c)d","^([^()]|\\((?1)*\\))*$",[]))), 
+    <<":3">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))), 
+    <<":3:">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[{parts,
+                                                                                                                                                                                                                                             2}]))), 
+    <<":3:">> = iolist_to_binary(join(re:split(">abc>123<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))), 
+    <<":3">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))), 
+    <<":3:">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[{parts,
+                                                                                                                                                                                                                                                 2}]))), 
+    <<":3:">> = iolist_to_binary(join(re:split(">abc>1(2)3<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))), 
+    <<":(1(2)3)">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[trim]))), 
+    <<":(1(2)3):">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[{parts,
+                                                                                                                                                                                                                                                     2}]))), 
+    <<":(1(2)3):">> = iolist_to_binary(join(re:split(">abc>(1(2)3)<xyz<","^>abc>([^()]|\\((?1)*\\))*<xyz<$",[]))), 
+    <<":1221:1">> = iolist_to_binary(join(re:split("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                             trim]))), 
+    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                               {parts,
+                                                                                                                                                                                                                                2}]))), 
+    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+    <<":::Satanoscillatemymetallicsonatas:S">> = iolist_to_binary(join(re:split("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                                                   trim]))), 
+    <<":::Satanoscillatemymetallicsonatas:S:">> = iolist_to_binary(join(re:split("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                                                     {parts,
+                                                                                                                                                                                                                                                                                      2}]))), 
+    <<":::Satanoscillatemymetallicsonatas:S:">> = iolist_to_binary(join(re:split("Satanoscillatemymetallicsonatas","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+    <<":::AmanaplanacanalPanama:A">> = iolist_to_binary(join(re:split("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                               trim]))), 
+    <<":::AmanaplanacanalPanama:A:">> = iolist_to_binary(join(re:split("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                                 {parts,
+                                                                                                                                                                                                                                                                  2}]))), 
+    <<":::AmanaplanacanalPanama:A:">> = iolist_to_binary(join(re:split("AmanaplanacanalPanama","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+    <<":::AblewasIereIsawElba:A">> = iolist_to_binary(join(re:split("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                           trim]))), 
+    <<":::AblewasIereIsawElba:A:">> = iolist_to_binary(join(re:split("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                             {parts,
+                                                                                                                                                                                                                                                              2}]))), 
+    <<":::AblewasIereIsawElba:A:">> = iolist_to_binary(join(re:split("AblewasIereIsawElba","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                           trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                             {parts,
+                                                                                                                                                                                                                                              2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+    <<"Thequickbrownfox">> = iolist_to_binary(join(re:split("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                     trim]))), 
+    <<"Thequickbrownfox">> = iolist_to_binary(join(re:split("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless,
+                                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<"Thequickbrownfox">> = iolist_to_binary(join(re:split("Thequickbrownfox","^(?:((.)(?1)\\2|)|((.)(?3)\\4|.))$",[caseless]))), 
+    <<":12">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+    <<":12::">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
+                                                                                                                                                                                                                                2}]))), 
+    <<":12::">> = iolist_to_binary(join(re:split("12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
+    <<":(((2+2)*-3)-7):-">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+    <<":(((2+2)*-3)-7):-:">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<":(((2+2)*-3)-7):-:">> = iolist_to_binary(join(re:split("(((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
+    <<":-12">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+    <<":-12::">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
+                                                                                                                                                                                                                                  2}]))), 
+    <<":-12::">> = iolist_to_binary(join(re:split("-12","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
+                                                                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
+    <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[trim]))), 
+    <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[{parts,
+                                                                                                                                                                                                                                                      2}]))), 
+    <<"((2+2)*-3)-7)">> = iolist_to_binary(join(re:split("((2+2)*-3)-7)","^(\\d+|\\((?1)([+*-])(?1)\\)|-(?1))$",[]))), 
+    <<":xyz:y">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[trim]))), 
+    <<":xyz:y:">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<":xyz:y:">> = iolist_to_binary(join(re:split("xyz","^(x(y|(?1){2})z)",[]))), 
+    <<":xxyzxyzz:xyzxyz">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[trim]))), 
+    <<":xxyzxyzz:xyzxyz:">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":xxyzxyzz:xyzxyz:">> = iolist_to_binary(join(re:split("xxyzxyzz","^(x(y|(?1){2})z)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(x(y|(?1){2})z)",[]))), 
+    <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[trim]))), 
+    <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"xxyzz">> = iolist_to_binary(join(re:split("xxyzz","^(x(y|(?1){2})z)",[]))), 
+    <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[trim]))), 
+    <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"xxyzxyzxyzz">> = iolist_to_binary(join(re:split("xxyzxyzxyzz","^(x(y|(?1){2})z)",[]))), 
+    <<":<>:<>">> = iolist_to_binary(join(re:split("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                             trim]))), 
+    <<":<>:<>:">> = iolist_to_binary(join(re:split("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                               {parts,
+                                                                                                                                                                                                                                                2}]))), 
+    <<":<>:<>:">> = iolist_to_binary(join(re:split("<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<":<abcd>:<abcd>">> = iolist_to_binary(join(re:split("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                     trim]))), 
+    <<":<abcd>:<abcd>:">> = iolist_to_binary(join(re:split("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<":<abcd>:<abcd>:">> = iolist_to_binary(join(re:split("<abcd>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<":<abc <123> hij>:<abc <123> hij>">> = iolist_to_binary(join(re:split("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                                       trim]))), 
+    <<":<abc <123> hij>:<abc <123> hij>:">> = iolist_to_binary(join(re:split("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                                         {parts,
+                                                                                                                                                                                                                                                                          2}]))), 
+    <<":<abc <123> hij>:<abc <123> hij>:">> = iolist_to_binary(join(re:split("<abc <123> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<"<abc :<def>:<def>: hij>">> = iolist_to_binary(join(re:split("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                                       trim]))), 
+    <<"<abc :<def>:<def>: hij>">> = iolist_to_binary(join(re:split("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                                         {parts,
+                                                                                                                                                                                                                                                                          2}]))), 
+    <<"<abc :<def>:<def>: hij>">> = iolist_to_binary(join(re:split("<abc <def> hij>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<":<abc<>def>:<abc<>def>">> = iolist_to_binary(join(re:split("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                             trim]))), 
+    <<":<abc<>def>:<abc<>def>:">> = iolist_to_binary(join(re:split("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                               {parts,
+                                                                                                                                                                                                                                                                2}]))), 
+    <<":<abc<>def>:<abc<>def>:">> = iolist_to_binary(join(re:split("<abc<>def>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<"<abc:<>:<>">> = iolist_to_binary(join(re:split("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                     trim]))), 
+    <<"<abc:<>:<>:">> = iolist_to_binary(join(re:split("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                                        2}]))), 
+    <<"<abc:<>:<>:">> = iolist_to_binary(join(re:split("<abc<>","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                               trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                                 {parts,
+                                                                                                                                                                                                                                                                  2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<"<abc">> = iolist_to_binary(join(re:split("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                 trim]))), 
+    <<"<abc">> = iolist_to_binary(join(re:split("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended,
+                                                                                                                                                                                                                                                   {parts,
+                                                                                                                                                                                                                                                    2}]))), 
+    <<"<abc">> = iolist_to_binary(join(re:split("<abc","((< (?: (?(R) \\d++  | [^<>]*+) | (?2)) * >))",[extended]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[trim]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^[a\\Q]bc\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[{parts,
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^a+(*FAIL)",[]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[trim]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?c+(*FAIL)",[]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[trim]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*PRUNE)c+(*FAIL)",[]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[trim]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*COMMIT)c+(*FAIL)",[]))), 
+    <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[trim]))), 
+    <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"aaabcccaaabccc">> = iolist_to_binary(join(re:split("aaabcccaaabccc","a+b?(*SKIP)c+(*FAIL)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                                  2}]))), 
+    <<":++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("bbbxxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                                2}]))), 
+    <<":+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("cccxxxx","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":++++">> = iolist_to_binary(join(re:split("ccc++++","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                                2}]))), 
+    <<":ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(?:aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":aaaxxxxxx">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":aaaxxxxxx:">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":aaaxxxxxx:">> = iolist_to_binary(join(re:split("aaaxxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":aaa:++++++">> = iolist_to_binary(join(re:split("aaa++++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":bbbxxxxx">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":bbbxxxxx:">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<":bbbxxxxx:">> = iolist_to_binary(join(re:split("bbbxxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<":bbb:+++++">> = iolist_to_binary(join(re:split("bbb+++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":cccxxxx">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":cccxxxx:">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                          2}]))), 
+    <<":cccxxxx:">> = iolist_to_binary(join(re:split("cccxxxx","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                          2}]))), 
+    <<":ccc:++++">> = iolist_to_binary(join(re:split("ccc++++","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[trim]))), 
+    <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[{parts,
+                                                                                                                                                                                                                                                                                            2}]))), 
+    <<":ddd:ddddd">> = iolist_to_binary(join(re:split("dddddddd","^(aaa(*THEN)\\w{6}|bbb(*THEN)\\w{5}|ccc(*THEN)\\w{4}|\\w{3})",[]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[trim]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"aaabccc">> = iolist_to_binary(join(re:split("aaabccc","a+b?(*THEN)c+(*FAIL)",[]))), 
+    <<":AB:B">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                    trim]))), 
+    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+    <<":AB:B::X">> = iolist_to_binary(join(re:split("ABX","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                      trim]))), 
+    <<":AB:B::X">> = iolist_to_binary(join(re:split("ABX","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                        {parts,
+                                                                                                                                                                                                         2}]))), 
+    <<":AB:B::X">> = iolist_to_binary(join(re:split("ABX","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+    <<":AAD:A:E">> = iolist_to_binary(join(re:split("AADE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                        trim]))), 
+    <<":AAD:A:E:">> = iolist_to_binary(join(re:split("AADE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<":AAD:A:E:">> = iolist_to_binary(join(re:split("AADE","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+    <<":ACD:C:E">> = iolist_to_binary(join(re:split("ACDE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                        trim]))), 
+    <<":ACD:C:E:">> = iolist_to_binary(join(re:split("ACDE","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<":ACD:C:E:">> = iolist_to_binary(join(re:split("ACDE","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                                    trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                                       2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+    <<"AD">> = iolist_to_binary(join(re:split("AD","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                    trim]))), 
+    <<"AD">> = iolist_to_binary(join(re:split("AD","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"AD">> = iolist_to_binary(join(re:split("AD","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+    <<":1221:1">> = iolist_to_binary(join(re:split("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                     trim]))), 
+    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                       {parts,
+                                                                                                                                                                                                                                                                                                                        2}]))), 
+    <<":1221:1:::">> = iolist_to_binary(join(re:split("1221","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+    <<":::Satan, oscillate my metallic sonatas:S">> = iolist_to_binary(join(re:split("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                                       trim]))), 
+    <<":::Satan, oscillate my metallic sonatas:S:">> = iolist_to_binary(join(re:split("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                                         {parts,
+                                                                                                                                                                                                                                                                                                                                                                                          2}]))), 
+    <<":::Satan, oscillate my metallic sonatas:S:">> = iolist_to_binary(join(re:split("Satan, oscillate my metallic sonatas!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+    <<":::A man, a plan, a canal: Panama:A">> = iolist_to_binary(join(re:split("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                           trim]))), 
+    <<":::A man, a plan, a canal: Panama:A:">> = iolist_to_binary(join(re:split("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                             {parts,
+                                                                                                                                                                                                                                                                                                                                                                              2}]))), 
+    <<":::A man, a plan, a canal: Panama:A:">> = iolist_to_binary(join(re:split("A man, a plan, a canal: Panama!","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+    <<":::Able was I ere I saw Elba:A">> = iolist_to_binary(join(re:split("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                 trim]))), 
+    <<":::Able was I ere I saw Elba:A:">> = iolist_to_binary(join(re:split("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                                   {parts,
+                                                                                                                                                                                                                                                                                                                                                                    2}]))), 
+    <<":::Able was I ere I saw Elba:A:">> = iolist_to_binary(join(re:split("Able was I ere I saw Elba.","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                   trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                     {parts,
+                                                                                                                                                                                                                                                                                                                                      2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                   trim]))), 
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless,
+                                                                                                                                                                                                                                                                                                                                                     {parts,
+                                                                                                                                                                                                                                                                                                                                                      2}]))), 
+    <<"The quick brown fox">> = iolist_to_binary(join(re:split("The quick brown fox","^\\W*+(?:((.)\\W*+(?1)\\W*+\\2|)|((.)\\W*+(?3)\\W*+\\4|\\W*+.\\W*+))\\W*+$",[caseless]))), 
+    <<":a">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[trim]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":a::">> = iolist_to_binary(join(re:split("a","^((.)(?1)\\2|.)$",[]))), 
+    <<":aba:a">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[trim]))), 
+    <<":aba:a:">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":aba:a:">> = iolist_to_binary(join(re:split("aba","^((.)(?1)\\2|.)$",[]))), 
+    <<":aabaa:a">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[trim]))), 
+    <<":aabaa:a:">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":aabaa:a:">> = iolist_to_binary(join(re:split("aabaa","^((.)(?1)\\2|.)$",[]))), 
+    <<":abcdcba:a">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[trim]))), 
+    <<":abcdcba:a:">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":abcdcba:a:">> = iolist_to_binary(join(re:split("abcdcba","^((.)(?1)\\2|.)$",[]))), 
+    <<":pqaabaaqp:p">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[trim]))), 
+    <<":pqaabaaqp:p:">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":pqaabaaqp:p:">> = iolist_to_binary(join(re:split("pqaabaaqp","^((.)(?1)\\2|.)$",[]))), 
+    <<":ablewasiereisawelba:a">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[trim]))), 
+    <<":ablewasiereisawelba:a:">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<":ablewasiereisawelba:a:">> = iolist_to_binary(join(re:split("ablewasiereisawelba","^((.)(?1)\\2|.)$",[]))), 
+    <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[trim]))), 
+    <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"rhubarb">> = iolist_to_binary(join(re:split("rhubarb","^((.)(?1)\\2|.)$",[]))), 
+    <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[trim]))), 
+    <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<"the quick brown fox">> = iolist_to_binary(join(re:split("the quick brown fox","^((.)(?1)\\2|.)$",[]))), 
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[trim]))), 
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("]","^[a\\Q]bc\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[{parts,
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(a)(?<=b(?1))",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)(?<=b(?1))",[]))), 
+    <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[trim]))), 
+    <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("c","^[a\\Q]bc\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","^[a-\\Q\\E]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("-","^[a-\\Q\\E]",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[trim]))), 
-?line <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()*)*",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[{parts,
-                                                                                                                                                                                          2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))*)*",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[trim]))), 
-?line <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[{parts,
-                                                                                                                                                                          2}]))), 
-?line <<":a::">> = iolist_to_binary(join(re:split("aaaa","^(a()+)+",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[{parts,
+    <<"caz">> = iolist_to_binary(join(re:split("caz","(a)(?<=b(?1))",[]))), 
+    <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[trim]))), 
+    <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"zba:a:z">> = iolist_to_binary(join(re:split("zbaaz","(?<=b(?1))(a)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=b(?1))(a)",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","(?<=b(?1))(a)",[]))), 
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[trim]))), 
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[{parts,
                                                                                                                                                                                           2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaa","^(?:a(?:(?:))+)+",[]))), 
-?line <<":a">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
-?line <<":a::">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[{parts,
-                                                                                                                                                                                                      2}]))), 
-?line <<":a::">> = iolist_to_binary(join(re:split("abbD","(a){0,3}(?(1)b|(c|))*D",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[{parts,
-                                                                                                                                                                                                        2}]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("ccccD","(a){0,3}(?(1)b|(c|))*D",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[trim]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[{parts,
+    <<"b:a:z">> = iolist_to_binary(join(re:split("baz","(?<X>a)(?<=b(?&X))",[]))), 
+    ok.
+run43() ->
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))\\1",[]))), 
+    <<":def">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[trim]))), 
+    <<":def:">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<":def:">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))\\1",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[{parts,
+                                                                                                                                                                                                           2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))\\1",[]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[trim]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))\\1",[]))), 
+    <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[trim]))), 
+    <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[{parts,
+                                                                                                                                                                                                   2}]))), 
+    <<"defabc">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))\\1",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[trim]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":abc:">> = iolist_to_binary(join(re:split("abcabc","^(?|(abc)|(def))(?1)",[]))), 
+    <<":def">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[trim]))), 
+    <<":def:">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":def:">> = iolist_to_binary(join(re:split("defabc","^(?|(abc)|(def))(?1)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?|(abc)|(def))(?1)",[]))), 
+    <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[trim]))), 
+    <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"defdef">> = iolist_to_binary(join(re:split("defdef","^(?|(abc)|(def))(?1)",[]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[trim]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"abcdef">> = iolist_to_binary(join(re:split("abcdef","^(?|(abc)|(def))(?1)",[]))), 
+    <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"A:C:D">> = iolist_to_binary(join(re:split("ABCD","(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("CCD","^(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":C:D">> = iolist_to_binary(join(re:split("BCD","^(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[{parts,
                                                                                                                                                                                                 2}]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("D","(a){0,3}(?(1)b|(c|))*D",[]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[trim]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                           2}]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(a|)*\\d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[trim]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                             2}]))), 
-?line <<"::">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(a|)*\\d",[]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[trim]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?>a|)*\\d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?>a|)*\\d",[]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[trim]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                               2}]))), 
-?line <<"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa","(?:a|)*\\d",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[{parts,
-                                                                                                                                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4","(?:a|)*\\d",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","\\Z",[trim]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","\\Z",[{parts,
-                                                                                                                                                               2}]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","\\Z",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[{parts,
-                                                                                                                                                                                               2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("abc","^(?s)(?>.*)(?<!\\n)",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[{parts,
+    <<"ABCD">> = iolist_to_binary(join(re:split("ABCD","^(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"CAD">> = iolist_to_binary(join(re:split("CAD","^(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[trim]))), 
+    <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"BAD">> = iolist_to_binary(join(re:split("BAD","^(?:(?1)|B)(A(*F)|C)",[]))), 
+    <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":A:D">> = iolist_to_binary(join(re:split("AAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<":C">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<":C:">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":C:">> = iolist_to_binary(join(re:split("ACD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":A:D">> = iolist_to_binary(join(re:split("BAD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<":C">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<":C:">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":C:">> = iolist_to_binary(join(re:split("BCD","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":A:X">> = iolist_to_binary(join(re:split("BAX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                                          2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<"ACX">> = iolist_to_binary(join(re:split("ACX","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[trim]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<"ABC">> = iolist_to_binary(join(re:split("ABC","(?:(?1)|B)(A(*ACCEPT)XX|C)D",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("BAC","(?(DEFINE)(A))B(?1)C",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[trim]))), 
+    <<":::">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[{parts,
+                                                                                                                                                                                                           2}]))), 
+    <<":::">> = iolist_to_binary(join(re:split("BAAC","(?(DEFINE)((A)\\2))B(?1)C",[]))), 
+    <<":(ab(cd)ef):ef">> = iolist_to_binary(join(re:split("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )",[extended,
+                                                                                                                                                                                                                                                trim]))), 
+    <<":(ab(cd)ef):ef:">> = iolist_to_binary(join(re:split("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )",[extended,
+                                                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                                                   2}]))), 
+    <<":(ab(cd)ef):ef:">> = iolist_to_binary(join(re:split("(ab(cd)ef)","(?<pn> \\( ( [^()]++ | (?&pn) )* \\) )",[extended]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*SKIP)b|ac)",[]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[trim]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*SKIP)b|ac)",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","^(?=a(*PRUNE)b)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?=a(*PRUNE)b)",[]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[trim]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*PRUNE)b)",[]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[trim]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?=a(*ACCEPT)b)",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[{parts,
+                                                                                                                                                                       2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?>a\\Kb)",[]))), 
+    <<"a:ab">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[trim]))), 
+    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","((?>a\\Kb))",[]))), 
+    <<"a:ab">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[trim]))), 
+    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[{parts,
+                                                                                                                                                                   2}]))), 
+    <<"a:ab:">> = iolist_to_binary(join(re:split("ab","(a\\Kb)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","^a\\Kcz|ac",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ab","(?>a\\Kbz|ab)",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[trim]))), 
+    <<"a::">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"a::">> = iolist_to_binary(join(re:split("ab","^(?&t)(?(DEFINE)(?<t>a\\Kb))$",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[trim]))), 
+    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[{parts,
+                                                                                                                                                                                                         2}]))), 
+    <<":c:">> = iolist_to_binary(join(re:split("a(b)c","^([^()]|\\((?1)*\\))*$",[]))), 
+    <<":e">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[trim]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[{parts,
+                                                                                                                                                                                                                 2}]))), 
+    <<":e:">> = iolist_to_binary(join(re:split("a(b(c)d)e","^([^()]|\\((?1)*\\))*$",[]))), 
+    <<":0">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))), 
+    <<":0::">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<":0::">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))), 
+    <<":00:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))), 
+    <<":00:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<":00:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))), 
+    <<":0000:0">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[trim]))), 
+    <<":0000:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<":0000:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)(?P>L1)|(?P>L2))",[]))), 
+    ok.
+run44() ->
+    <<":0:0">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))), 
+    <<":0:0:">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<":0:0:">> = iolist_to_binary(join(re:split("0","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))), 
+    <<":0:0::0:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))), 
+    <<":0:0:0">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<":0:0::0:0:">> = iolist_to_binary(join(re:split("00","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))), 
+    <<":0:0::0:0::0:0::0:0">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[trim]))), 
+    <<":0:0:000">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<":0:0::0:0::0:0::0:0:">> = iolist_to_binary(join(re:split("0000","(?P<L1>(?P<L2>0)|(?P>L2)(?P>L1))",[]))), 
+    <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[trim]))), 
+    <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"ACABX">> = iolist_to_binary(join(re:split("ACABX","A(*COMMIT)(B|D)",[]))), 
+    <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))), 
+    <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<":A:B:C:DEFG">> = iolist_to_binary(join(re:split("ABCDEFG","(*COMMIT)(A|P)(B|P)(C|P)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(*COMMIT)(A|P)(B|P)(C|P)",[]))), 
+    <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[trim]))), 
+    <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"DEFGABC">> = iolist_to_binary(join(re:split("DEFGABC","(*COMMIT)(A|P)(B|P)(C|P)",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("abbb","(\\w+)(?>b(*COMMIT))\\w{2}",[]))), 
+    <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[trim]))), 
+    <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"abbb">> = iolist_to_binary(join(re:split("abbb","(\\w+)b(*COMMIT)\\w{2}",[]))), 
+    <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[trim]))), 
+    <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"b::c">> = iolist_to_binary(join(re:split("bac","(?&t)(?#()(?(DEFINE)(?<t>a))",[]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[trim]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[{parts,
+                                                                                                                                                                                                                            2}]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(?>yes|no)(*THEN)(*F))?",[]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[trim]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","(?>(*COMMIT)(yes|no)(*THEN)(*F))?",[]))), 
+    ok.
+run45() ->
+    <<"">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("bc","b?(*SKIP)c",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("abc","b?(*SKIP)c",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[{parts,
+                                                                                                                                                                    2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)bc",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[{parts,
+                                                                                                                                                                  2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","(*SKIP)b",[]))), 
+    <<"x::x::x">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[trim]))), 
+    <<"x::xx">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"x::x::x::">> = iolist_to_binary(join(re:split("xxx","(?P<abn>(?P=abn)xxx|)+",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aa","(?i:([^b]))(?1)",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aA","(?i:([^b]))(?1)",[]))), 
+    <<":*:: ::a::l::r">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[trim]))), 
+    <<":*: Failers">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":*:: ::a::l::r:">> = iolist_to_binary(join(re:split("** Failers","(?i:([^b]))(?1)",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(?i:([^b]))(?1)",[]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[trim]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"aB">> = iolist_to_binary(join(re:split("aB","(?i:([^b]))(?1)",[]))), 
+    <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[trim]))), 
+    <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"Ba">> = iolist_to_binary(join(re:split("Ba","(?i:([^b]))(?1)",[]))), 
+    <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[trim]))), 
+    <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"ba">> = iolist_to_binary(join(re:split("ba","(?i:([^b]))(?1)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[{parts,
+                                                                                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[{parts,
+                                                                                                                                                                                                                                  2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[{parts,
+                                                                                                                                                                                                                          2}]))), 
+    <<"aaaaaa">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*+(?(DEFINE)(?<t>a))\\w$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[{parts,
+                                                                                                                                                                                                                          2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaaX","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aaaaaa","^(?&t)*(?(DEFINE)(?<t>a))\\w$",[]))), 
+    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[trim]))), 
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)*+(\\w)",[]))), 
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[trim]))), 
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)*+(\\w)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)*+(\\w)",[]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[trim]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)*+(\\w)",[]))), 
+    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[trim]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)*+(\\w)",[]))), 
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[trim]))), 
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)*+(\\w)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[{parts,
                                                                                                                                                                                                2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[trim]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[{parts,
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)*+(\\w)",[]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[trim]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)*+(\\w)",[]))), 
+    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[trim]))), 
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a)++(\\w)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a)++(\\w)",[]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[trim]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(a)++(\\w)",[]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[trim]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a)++(\\w)",[]))), 
+    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[trim]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)++(\\w)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[{parts,
                                                                                                                                                                                                2}]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","^(?![^\\n]*\\n\\z)",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))), 
-?line <<"abc">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[trim]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[{parts,
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a)++(\\w)",[]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[trim]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"aaaa">> = iolist_to_binary(join(re:split("aaaa","^(?:a)++(\\w)",[]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[trim]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a)++(\\w)",[]))), 
+    <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[trim]))), 
+    <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":a:a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(a)?+(\\w)",[]))), 
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[trim]))), 
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"::Y:Z">> = iolist_to_binary(join(re:split("YZ","^(a)?+(\\w)",[]))), 
+    <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[trim]))), 
+    <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":a:aaX">> = iolist_to_binary(join(re:split("aaaaX","^(?:a)?+(\\w)",[]))), 
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[trim]))), 
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<":Y:Z">> = iolist_to_binary(join(re:split("YZ","^(?:a)?+(\\w)",[]))), 
+    <<":a:X">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[trim]))), 
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<":a:X:">> = iolist_to_binary(join(re:split("aaaaX","^(a){2,}+(\\w)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(a){2,}+(\\w)",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(a){2,}+(\\w)",[]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[trim]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(a){2,}+(\\w)",[]))), 
+    <<":X">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[trim]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                           2}]))), 
+    <<":X:">> = iolist_to_binary(join(re:split("aaaaX","^(?:a){2,}+(\\w)",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","^(?:a){2,}+(\\w)",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^(?:a){2,}+(\\w)",[]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[trim]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<"YZ">> = iolist_to_binary(join(re:split("YZ","^(?:a){2,}+(\\w)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[{parts,
+                                                                                                                                                                      2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","(a|)*(?1)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ab","(a|)*(?1)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aab","(a|)*(?1)b",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)++(?1)b",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)++(?1)b",[]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[trim]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)++(?1)b",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(a)*+(?1)b",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[trim]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("ab","(a)*+(?1)b",[]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[trim]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[{parts,
+                                                                                                                                                                          2}]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(a)*+(?1)b",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("b","(?1)(?:(b)){0}",[]))), 
+    <<":foo(bar(baz)+baz(bop)):(bar(baz)+baz(bop)):bar(baz)+baz(bop)">> = iolist_to_binary(join(re:split("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )",[extended,
+                                                                                                                                                                                                                                                                                  trim]))), 
+    <<":foo(bar(baz)+baz(bop)):(bar(baz)+baz(bop)):bar(baz)+baz(bop):">> = iolist_to_binary(join(re:split("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )",[extended,
+                                                                                                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                                                                                                     2}]))), 
+    <<":foo(bar(baz)+baz(bop)):(bar(baz)+baz(bop)):bar(baz)+baz(bop):">> = iolist_to_binary(join(re:split("foo(bar(baz)+baz(bop))","(foo ( \\( ((?:(?> [^()]+ )|(?2))*) \\) ) )",[extended]))), 
+    ok.
+run46() ->
+    <<":AB:B">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                    trim]))), 
+    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended,
+                                                                                                                                                                                                      {parts,
+                                                                                                                                                                                                       2}]))), 
+    <<":AB:B::">> = iolist_to_binary(join(re:split("AB","(A (A|B(*ACCEPT)|C) D)(E)",[extended]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[{parts,
+                                                                                                                                                                             2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)++",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[{parts,
+                                                                                                                                                                                 2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ba","\\A.*?(a|bc)++",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[{parts,
+                                                                                                                                                                                     2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc|d)",[]))), 
+    <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[trim]))), 
+    <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":b:eetle">> = iolist_to_binary(join(re:split("beetle","(?:(b))++",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("a","(?(?=(a(*ACCEPT)z))a)",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<"abc:">> = iolist_to_binary(join(re:split("abc","\\z(?<!\\n)",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[trim]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[{parts,
-                                                                                                                                                                            2}]))), 
-?line <<":::">> = iolist_to_binary(join(re:split("abcd","(.*(.)?)*",[]))), 
-?line <<"a:::b:::c:::d">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended,
+    <<":a:">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)+ab",[]))), 
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[trim]))), 
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"aaaab">> = iolist_to_binary(join(re:split("aaaab","^(a)(?1)++ab",[]))), 
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[trim]))), 
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<"::ckgammon">> = iolist_to_binary(join(re:split("backgammon","(?(DEFINE)(a))?b(?1)",[]))), 
+    <<":
+def">> = iolist_to_binary(join(re:split("abc
+def","^\\N+",[trim]))), 
+    <<":
+def">> = iolist_to_binary(join(re:split("abc
+def","^\\N+",[{parts,2}]))), 
+    <<":
+def">> = iolist_to_binary(join(re:split("abc
+def","^\\N+",[]))), 
+    <<":
+def">> = iolist_to_binary(join(re:split("abc
+def","^\\N{1,}",[trim]))), 
+    <<":
+def">> = iolist_to_binary(join(re:split("abc
+def","^\\N{1,}",[{parts,2}]))), 
+    <<":
+def">> = iolist_to_binary(join(re:split("abc
+def","^\\N{1,}",[]))), 
+    <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[trim]))), 
+    <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|(?R)b)",[]))), 
+    <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[trim]))), 
+    <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":aaaa:cde">> = iolist_to_binary(join(re:split("aaaabcde","(?(R)a+|((?R))b)",[]))), 
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[trim]))), 
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R)a+|(?1)b))",[]))), 
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[trim]))), 
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":aaaab:cde">> = iolist_to_binary(join(re:split("aaaabcde","((?(R1)a+|(?1)b))",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[{parts,
+                                                                                                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("a","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))), 
+    <<"b">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))), 
+    <<"b::">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[{parts,
+                                                                                                                                                                                                                                              2}]))), 
+    <<"b::">> = iolist_to_binary(join(re:split("ba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))), 
+    <<"bb">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[trim]))), 
+    <<"bb::">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[{parts,
+                                                                                                                                                                                                                                                2}]))), 
+    <<"bb::">> = iolist_to_binary(join(re:split("bba","(?>(?&t)c|(?&t))(?(DEFINE)(?<t>a|b(*PRUNE)c))",[]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b) c",[extended,
+                                                                                                                                                                                          trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b) c",[extended,
+                                                                                                                                                                                            {parts,
+                                                                                                                                                                                             2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b) c",[extended]))), 
+    ok.
+run47() ->
+    <<":ab">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F)) c",[extended,
                                                                                                                                                                                                     trim]))), 
-?line <<"a:::bcd">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended,
+    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F)) c",[extended,
                                                                                                                                                                                                       {parts,
                                                                                                                                                                                                        2}]))), 
-?line <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( (A | (?(1)0|) )*   )",[extended]))), 
-?line <<"a:::b:::c:::d">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended,
+    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F)) c",[extended]))), 
+    <<":ab:ab">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) | (*F) ) c",[extended,
+                                                                                                                                                                                                                trim]))), 
+    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) | (*F) ) c",[extended,
+                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                   2}]))), 
+    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) | (*F) ) c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) ) c",[extended,
+                                                                                                                                                                                                  trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) ) c",[extended,
+                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b) ) c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b) c",[extended,
                                                                                                                                                                                               trim]))), 
-?line <<"a:::bcd">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended,
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b) c",[extended,
                                                                                                                                                                                                 {parts,
                                                                                                                                                                                                  2}]))), 
-?line <<"a:::b:::c:::d:::">> = iolist_to_binary(join(re:split("abcd","( ( (?(1)0|) )*   )",[extended]))), 
-?line <<"a::b::c::d">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended,
-                                                                                                                                                                                        trim]))), 
-?line <<"a::bcd">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended,
-                                                                                                                                                                                          {parts,
-                                                                                                                                                                                           2}]))), 
-?line <<"a::b::c::d::">> = iolist_to_binary(join(re:split("abcd","(  (?(1)0|)*   )",[extended]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[{parts,
-                                                                                                                                                                                2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a]","[[:abcd:xyz]]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[{parts,
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b) c",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F)) c",[extended,
+                                                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F)) c",[extended,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F)) c",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c",[extended,
+                                                                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c",[extended,
+                                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) | (*F) ) c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) ) c",[extended,
+                                                                                                                                                                                                          trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) ) c",[extended,
+                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b) ) c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b) c",[extended,
+                                                                                                                                                                                              trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b) c",[extended,
+                                                                                                                                                                                                {parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b) c",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b|(*F)) c",[extended,
+                                                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b|(*F)) c",[extended,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?>a(*THEN)b|(*F)) c",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c",[extended,
+                                                                                                                                                                                                                        trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c",[extended,
+                                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) | (*F) ) c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) ) c",[extended,
+                                                                                                                                                                                                          trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) ) c",[extended,
+                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?> (?>a(*THEN)b) ) c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b)++ c",[extended,
+                                                                                                                                                                                              trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b)++ c",[extended,
+                                                                                                                                                                                                {parts,
+                                                                                                                                                                                                 2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b)++ c",[extended]))), 
+    <<":ab">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F))++ c",[extended,
+                                                                                                                                                                                                        trim]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F))++ c",[extended,
+                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                           2}]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("aabc","^.*? (a(*THEN)b|(*F))++ c",[extended]))), 
+    <<":ab:ab">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c",[extended,
+                                                                                                                                                                                                                        trim]))), 
+    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c",[extended,
+                                                                                                                                                                                                                          {parts,
+                                                                                                                                                                                                                           2}]))), 
+    <<":ab:ab:">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ | (*F) )++ c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ )++ c",[extended,
+                                                                                                                                                                                                          trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ )++ c",[extended,
+                                                                                                                                                                                                            {parts,
+                                                                                                                                                                                                             2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? ( (a(*THEN)b)++ )++ c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b)++ c",[extended,
+                                                                                                                                                                                                  trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b)++ c",[extended,
+                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                     2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b)++ c",[extended]))), 
+    ok.
+run48() ->
+    <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F))++ c",[extended,
+                                                                                                                                                                                                            trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F))++ c",[extended,
+                                                                                                                                                                                                              {parts,
+                                                                                                                                                                                                               2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?:a(*THEN)b|(*F))++ c",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c",[extended,
+                                                                                                                                                                                                                                trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c",[extended,
+                                                                                                                                                                                                                                  {parts,
+                                                                                                                                                                                                                                   2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ | (*F) )++ c",[extended]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c",[extended,
+                                                                                                                                                                                                                  trim]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c",[extended,
+                                                                                                                                                                                                                    {parts,
+                                                                                                                                                                                                                     2}]))), 
+    <<"aabc">> = iolist_to_binary(join(re:split("aabc","^.*? (?: (?:a(*THEN)b)++ )++ c",[extended]))), 
+    <<"">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","^(?(?=a(*THEN)b)ab|ac)",[]))), 
+    <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[trim]))), 
+    <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"ba">> = iolist_to_binary(join(re:split("ba","^.*?(?(?=a)a|b(*THEN)c)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ba","^.*?(?:(?(?=a)a|b(*THEN)c)|d)",[]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[trim]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^.*?(?(?=a)a(*THEN)b|c)",[]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[trim]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":abc">> = iolist_to_binary(join(re:split("aabc","^.*(?=a(*THEN)b)",[]))), 
+    <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[trim]))), 
+    <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"xa:d">> = iolist_to_binary(join(re:split("xacd","(?<=a(*ACCEPT)b)c",[]))), 
+    <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[trim]))), 
+    <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"xa:a:d">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*ACCEPT)b))c",[]))), 
+    <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[trim]))), 
+    <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"xab:ab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=(a(*COMMIT)b))c",[]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[trim]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[{parts,
+                                                                                                                                                                                                          2}]))), 
+    <<"** Failers">> = iolist_to_binary(join(re:split("** Failers","(?<=(a(*COMMIT)b))c",[]))), 
+    <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[trim]))), 
+    <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"xacd">> = iolist_to_binary(join(re:split("xacd","(?<=(a(*COMMIT)b))c",[]))), 
+    <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[trim]))), 
+    <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"x:d">> = iolist_to_binary(join(re:split("xcd","(?<!a(*FAIL)b)c",[]))), 
+    <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[trim]))), 
+    <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"a:d">> = iolist_to_binary(join(re:split("acd","(?<!a(*FAIL)b)c",[]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[trim]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*PRUNE)b)c",[]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[trim]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*SKIP)b)c",[]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[trim]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"xab:d">> = iolist_to_binary(join(re:split("xabcd","(?<=a(*THEN)b)c",[]))), 
+    <<":a:d">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[trim]))), 
+    <<":a:d:">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":a:d:">> = iolist_to_binary(join(re:split("abcd","(a)(?2){2}(.)",[]))), 
+    ok.
+run49() ->
+    <<"hello world ">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[trim]))), 
+    <<"hello world :::">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[{parts,
+                                                                                                                                                                                                                         2}]))), 
+    <<"hello world :::">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1?)test",[]))), 
+    <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[trim]))), 
+    <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[{parts,
+                                                                                                                                                                                                                         2}]))), 
+    <<"hello world test">> = iolist_to_binary(join(re:split("hello world test","(another)?(\\1+)test",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aac","(a(*COMMIT)b){0}a(?1)|aac",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aac","((?:a?)*)*c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[{parts,
+                                                                                                                                                                            2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("aac","((?>a?)*)*c",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aba","(?>.*?a)(?<=ba)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aba","(?:.*?a)(?<=ba)",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[{parts,
                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split(":]","[[:abcd:xyz]]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("a","[abc[:x\\]pqr]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[{parts,
-                                                                                                                                                                                 2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("[","[abc[:x\\]pqr]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[{parts,
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall,
+                                                                                                                                                                              trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall,
+                                                                                                                                                                                {parts,
                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split(":","[abc[:x\\]pqr]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[{parts,
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*PRUNE)b",[dotall]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall,
+                                                                                                                                                                          trim]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall,
+                                                                                                                                                                            {parts,
+                                                                                                                                                                             2}]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","^a(*PRUNE)b",[dotall]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab",".*?a(*SKIP)b",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall,
+                                                                                                                                                                      trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall,
+                                                                                                                                                                        {parts,
+                                                                                                                                                                         2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[dotall]))), 
+    <<"a">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[{parts,
+                                                                                                                                                                        2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("aab","(?>.*?a)b",[]))), 
+    ok.
+run50() ->
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(?>^a)b",[dotall,
+                                                                                                                                                                  trim]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(?>^a)b",[dotall,
+                                                                                                                                                                    {parts,
+                                                                                                                                                                     2}]))), 
+    <<"aab">> = iolist_to_binary(join(re:split("aab","(?>^a)b",[dotall]))), 
+    <<"alphabetabcd:abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[trim]))), 
+    <<"alphabetabcd:abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[{parts,
+                                                                                                                                                                                                                          2}]))), 
+    <<"alphabetabcd:abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*?)(?<=(abcd)|(wxyz))",[]))), 
+    <<"endingwxyz::wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[trim]))), 
+    <<"endingwxyz::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[{parts,
+                                                                                                                                                                                                                      2}]))), 
+    <<"endingwxyz::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*?)(?<=(abcd)|(wxyz))",[]))), 
+    <<":abcd">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[trim]))), 
+    <<":abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[{parts,
+                                                                                                                                                                                                                        2}]))), 
+    <<":abcd::">> = iolist_to_binary(join(re:split("alphabetabcd","(?>.*)(?<=(abcd)|(wxyz))",[]))), 
+    <<"::wxyz">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[trim]))), 
+    <<"::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"::wxyz:">> = iolist_to_binary(join(re:split("endingwxyz","(?>.*)(?<=(abcd)|(wxyz))",[]))), 
+    <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[trim]))), 
+    <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"abcdfooxyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*)foo",[]))), 
+    <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[trim]))), 
+    <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<"abcd:xyz">> = iolist_to_binary(join(re:split("abcdfooxyz","(?>.*?)foo",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*PRUNE)b)){0}(?:(?1)|ac)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[trim]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"::">> = iolist_to_binary(join(re:split("ac","(?:(a(*SKIP)b)){0}(?:(?1)|ac)",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[trim]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aa","(?<=(*SKIP)ac)a",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)b|a+c",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*PRUNE)b|a+c",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[{parts,
+                                                                                                                                                                                                                    2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP:N)(*PRUNE)b|a+c",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaa(*:N)a(*SKIP:N)(*PRUNE)b|a+c",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*PRUNE)b|a+c",[]))), 
+    ok.
+run51() ->
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[trim]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)b|a+c",[]))), 
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[trim]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*SKIP)b|a+c",[]))), 
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[trim]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)(*SKIP)b|a+c",[]))), 
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[trim]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*SKIP)b|a+c",[]))), 
+    <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[trim]))), 
+    <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"aaaaaac">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)b|a+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*THEN)b|a+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*SKIP)(*THEN)b|a+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*PRUNE)(*THEN)b|a+c",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaaaac","aaaaa(*COMMIT)(*THEN)b|a+c",[]))), 
+    ok.
+run52() ->
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[trim]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*PRUNE:m)(*SKIP:m)m|a+",[]))), 
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[trim]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[{parts,
+                                                                                                                                                                                                                                            2}]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:m)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[{parts,
+                                                                                                                                                                                                                              2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*PRUNE:m)(*SKIP:m)m|a+",[]))), 
+    <<"aaaaa">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[trim]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[{parts,
+                                                                                                                                                                                                                                            2}]))), 
+    <<"aaaaa:">> = iolist_to_binary(join(re:split("aaaaaa","aaaaa(*:n)(*MARK:m)(*PRUNE)(*SKIP:m)m|a+",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[{parts,
+                                                                                                                                                                                                                                    2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*PRUNE:A)a(*SKIP:A)b|a+c",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[trim]))), 
+    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[{parts,
+                                                                                                                                                                                                                                  2}]))), 
+    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","a(*MARK:A)aa(*MARK:A)a(*SKIP:A)b|a+c",[]))), 
+    <<"aa">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[trim]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[{parts,
+                                                                                                                                                                                                                  2}]))), 
+    <<"aa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*PRUNE:A)a(*SKIP:A)b|a+c",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[trim]))), 
+    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[{parts,
+                                                                                                                                                                                                                2}]))), 
+    <<"aaa:">> = iolist_to_binary(join(re:split("aaaac","aaa(*MARK:A)a(*SKIP:A)b|a+c",[]))), 
+    <<":a">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[trim]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[{parts,
+                                                                                                                                                                                  2}]))), 
+    <<":a:">> = iolist_to_binary(join(re:split("ba",".?(a|b(*THEN)c)",[]))), 
+    <<":ab">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[trim]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<":ab:">> = iolist_to_binary(join(re:split("abc","(a(*COMMIT)b)c|abd",[]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[trim]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[{parts,
+                                                                                                                                                                                          2}]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(a(*COMMIT)b)c|abd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?=a(*COMMIT)b)abc|abd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","(?=a(*COMMIT)b)abc|abd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abc","(?>a(*COMMIT)b)c|abd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[trim]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","a(?=b(*COMMIT)c)[^d]|abd",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[trim]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=b(*COMMIT)c)[^d]|abd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","a(?=bc).|abd",[]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[trim]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<":c">> = iolist_to_binary(join(re:split("abc","a(?=bc).|abd",[]))), 
+    <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[trim]))), 
+    <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[{parts,
+                                                                                                                                                                                                        2}]))), 
+    <<"abceabd">> = iolist_to_binary(join(re:split("abceabd","a(?>b(*COMMIT)c)d|abd",[]))), 
+    <<"abce">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[trim]))), 
+    <<"abce:">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"abce:">> = iolist_to_binary(join(re:split("abceabd","a(?>bc)d|abd",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)b)c|abd",[]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[trim]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<"abd">> = iolist_to_binary(join(re:split("abd","(?>a(*COMMIT)c)d|abd",[]))), 
+    <<"::c">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[trim]))), 
+    <<"::c:">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[{parts,
+                                                                                                                                                                                                                                2}]))), 
+    <<"::c:">> = iolist_to_binary(join(re:split("ac","((?=a(*COMMIT)b)ab|ac){0}(?:(?1)|a(c))",[]))), 
+    ok.
+run53() ->
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[{parts,
+                                                                                                                                                                                                       2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^(a)?(?(1)a|b)+$",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[trim]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[{parts,
+                                                                                                                                                                                   2}]))), 
+    <<"a">> = iolist_to_binary(join(re:split("a","^(a)?(?(1)a|b)+$",[]))), 
+    <<"a">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[trim]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<"a:">> = iolist_to_binary(join(re:split("ab","(?=a\\Kb)ab",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("ac","(?!a\\Kb)ac",[]))), 
+    <<"ab">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[trim]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<"ab:">> = iolist_to_binary(join(re:split("abcd","^abc(?<=b\\Kc)d",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[{parts,
+                                                                                                                                                                                       2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("abcd","^abc(?<!b\\Kq)d",[]))), 
+    <<":abcd">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[trim]))), 
+    <<":abcd::">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[{parts,
+                                                                                                                                                                                                            2}]))), 
+    <<":abcd::">> = iolist_to_binary(join(re:split("abcd","^((abc|abcx)(*THEN)y|abcd)",[]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[trim]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[{parts,
+                                                                                                                                                                                                                          2}]))), 
+    <<"*** Failers">> = iolist_to_binary(join(re:split("*** Failers","^((abc|abcx)(*THEN)y|abcd)",[]))), 
+    <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[trim]))), 
+    <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[{parts,
+                                                                                                                                                                                                              2}]))), 
+    <<"abcxy">> = iolist_to_binary(join(re:split("abcxy","^((abc|abcx)(*THEN)y|abcd)",[]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[trim]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<"yes">> = iolist_to_binary(join(re:split("yes","^((yes|no)(*THEN)(*F))?",[]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[trim]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|ac)ac|ac",[]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c",[extended,
+                                                                                                                                                                                                              trim]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c",[extended,
+                                                                                                                                                                                                                {parts,
+                                                                                                                                                                                                                 2}]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","(?=a(*COMMIT)b|(ac)) ac | (a)c",[extended]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[trim]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*THEN)a)bn|bnn)",[]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[trim]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*SKIP)a)bn|bnn",[]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[trim]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[{parts,
+                                                                                                                                                                                                  2}]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*SKIP)a)bn|bnn)",[]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[trim]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[{parts,
+                                                                                                                                                                                              2}]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*PRUNE)a)bn|bnn",[]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[trim]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[{parts,
+                                                                                                                                                                                                    2}]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*PRUNE)a)bn|bnn)",[]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[trim]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?!b(*COMMIT)a)bn|bnn",[]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[trim]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[{parts,
+                                                                                                                                                                                                      2}]))), 
+    <<":n">> = iolist_to_binary(join(re:split("bnn","(?(?!b(*COMMIT)a)bn|bnn)",[]))), 
+    <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[trim]))), 
+    <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<"bnn">> = iolist_to_binary(join(re:split("bnn","(?=b(*SKIP)a)bn|bnn",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[{parts,
+                                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("bnn","(?=b(*THEN)a)bn|bnn",[]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[trim]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[{parts,
+                                                                                                                                                                                    2}]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*SKIP)b)..",[]))), 
+    ok.
+run54() ->
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[trim]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<"ac">> = iolist_to_binary(join(re:split("ac","^(?(?!a(*SKIP)b))",[]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[trim]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[{parts,
+                                                                                                                                                                                        2}]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","^(?!a(*PRUNE)b)..",[]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[trim]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[{parts,
+                                                                                                                                                                                      2}]))), 
+    <<":d">> = iolist_to_binary(join(re:split("acd","(?!a(*PRUNE)b)..",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[{parts,
                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("]","[abc[:x\\]pqr]",[]))), 
-?line <<"">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[trim]))), 
-?line <<":">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[{parts,
+    <<":">> = iolist_to_binary(join(re:split("ba","\\A.*?(?:a|bc)",[]))), 
+    <<":CD">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[trim]))), 
+    <<":CD:">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[{parts,
+                                                                                                                                                                                                2}]))), 
+    <<":CD:">> = iolist_to_binary(join(re:split("CD","^(A(*THEN)B|C(*THEN)D)",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[{parts,
+                                                                                                                                                                                2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("1234","^\\d*\\w{4}",[]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[trim]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[{parts,
+                                                                                                                                                                              2}]))), 
+    <<"123">> = iolist_to_binary(join(re:split("123","^\\d*\\w{4}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[{parts,
                                                                                                                                                                                  2}]))), 
-?line <<":">> = iolist_to_binary(join(re:split("p","[abc[:x\\]pqr]",[]))), 
-ok.
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[{parts,
+                                                                                                                                                                               2}]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[caseless,
+                                                                                                                                                                               trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[caseless,
+                                                                                                                                                                                 {parts,
+                                                                                                                                                                                  2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^[^b]*\\w{4}",[caseless]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[caseless,
+                                                                                                                                                                             trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[caseless,
+                                                                                                                                                                               {parts,
+                                                                                                                                                                                2}]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^[^b]*\\w{4}",[caseless]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[{parts,
+                                                                                                                                                                           2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[{parts,
+                                                                                                                                                                         2}]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[]))), 
+    <<"">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[caseless,
+                                                                                                                                                                         trim]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[caseless,
+                                                                                                                                                                           {parts,
+                                                                                                                                                                            2}]))), 
+    <<":">> = iolist_to_binary(join(re:split("aaaa","^a*\\w{4}",[caseless]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[caseless,
+                                                                                                                                                                       trim]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[caseless,
+                                                                                                                                                                         {parts,
+                                                                                                                                                                          2}]))), 
+    <<"aaa">> = iolist_to_binary(join(re:split("aaa","^a*\\w{4}",[caseless]))), 
+    ok.
diff --git a/lib/stdlib/test/run_pcre_tests.erl b/lib/stdlib/test/run_pcre_tests.erl
index 78b4803fc8..c4a8afc092 100644
--- a/lib/stdlib/test/run_pcre_tests.erl
+++ b/lib/stdlib/test/run_pcre_tests.erl
@@ -468,25 +468,26 @@ stru([{Line,<<Ch,Re0/binary>>}|T0]) ->
     {NewRe,<< Ch, Options/binary >>} = end_of_re(Ch,Re),
     case interpret_options_x(backstrip(frontstrip(Options)),NewRe) of
 	{Olist,<<>>} -> 
+	    U = lists:member(unicode,Olist),
 	    case T of
 		[{_,<<$-,_/binary>>}|Con] ->
 		    %Debug output, we skip those 
 		    %io:format("Skipping debug (~w)~n",[Line]),
 		    TmpT = skip_debug(Con),
-		    {NewT,Matches} = stru2(TmpT),
+		    {NewT,Matches} = stru2(TmpT,U),
 		    [{NewRe,Line,Olist,Matches}|stru(NewT)];
 		[{_,<<$C,$a,$p,$t,$u,$r,$i,$n,$g,_/binary>>}|_] ->
 		    NewT0 = skip_extra_info(T),
-		    {NewT,Matches} = stru2(NewT0),
+		    {NewT,Matches} = stru2(NewT0,U),
 		    [{NewRe,Line,Olist,Matches}|stru(NewT)];
 		[{_,<<Bla,_/binary>>}|_] when Bla =/= $  ->
 		    %io:format("Skipping blabla (~w)~n",[Line]),
 		    NewT = skip_until_empty(T),
 		    stru(NewT);
 		_ ->
-		    {NewT,Matches} = stru2(T),
+		    {NewT,Matches} = stru2(T,U),
 		    %erlang:display({NewRe,Line,Olist,Matches}),
-		    Matches1 = case lists:member(unicode,Olist) of
+		    Matches1 = case U of
 				   true ->
 				       Matches ++
 					   [ {unicode:characters_to_list(E1,unicode),E2,E3,E4} ||
@@ -498,14 +499,7 @@ stru([{Line,<<Ch,Re0/binary>>}|T0]) ->
 		    [{NewRe,Line,Olist,Matches1}|stru(NewT)]
 	    end;
 	{_,Rest} ->
-%% 	    case T of
-%% 		[{_,<<Bla,_/binary>>}|_] when Bla =/= $  ->
-%% 		    io:format("Skipping blabla (~w)~n",[Line]);
-%% 		_ ->
-%% 		    ok
-%% 	    end,
 	    NewT = skip_until_empty(T),
-	    %{NewT,_Matches} = stru2(T),
 	    info("Skipping options ~s for now (~w)~n",[binary_to_list(Rest),Line]),
 	    case NewT of
 		[{Li,_}|_] ->
@@ -568,10 +562,16 @@ tr_option($g) ->
 tr_option(_) ->
     false.
 
+
 interpret_options(<<$<,Rest0/binary>>) ->
     {Option,Rest} = pinch_cr(Rest0),
-    {Olist,NRest} = interpret_options(Rest),
-    {[Option | Olist], NRest};
+    case Option of
+	{not_supported,{newline,_Offender}} ->
+	    {[],<<$<,Rest0/binary>>};
+	_ ->
+	    {Olist,NRest} = interpret_options(Rest),
+	    {[Option | Olist], NRest}
+    end;
 interpret_options(<<$L,$f,$r,$_,$F,$R,Rest/binary>>) ->
     info("Accepting (and ignoring) french locale~n",[]),
     {Olist,NRest} = interpret_options(Rest),
@@ -603,13 +603,11 @@ backslash_end(<<_>>) ->
 backslash_end(<<_,R/binary>>) ->
     backslash_end(R).
 
-%stru2([<<$ ,$ ,$ ,$ , $*,$*,$*,$ ,_/binary>> | T]) ->
-%    stru2(T);
-stru2([{Line,<<$ ,Rest/binary>>} | T]) ->
+stru2([{Line,<<$ ,Rest/binary>>} | T],U) ->
     % A challenge
-    case  (catch responses(T)) of
+    case  (catch responses(T,U)) of
 	{NewT,Rlist} ->
-	    {NewNewT,StrList} = stru2(NewT),
+	    {NewNewT,StrList} = stru2(NewT,U),
 	    %% Hack...
 	    FS = case backstrip(frontstrip(Rest)) of
 		     <<"\\">> -> 
@@ -624,7 +622,7 @@ stru2([{Line,<<$ ,Rest/binary>>} | T]) ->
 				 OFS
 			 end
 		 end,
-	    {ExecOpts,NFS} = escape(FS),
+	    {ExecOpts,NFS} = escape(FS,U),
 	    case find_unsupported(ExecOpts) of
 		[] ->
 		    {NewNewT,[{NFS,Line,ExecOpts,
@@ -641,30 +639,29 @@ stru2([{Line,<<$ ,Rest/binary>>} | T]) ->
 	    {NewT,[]}
     end;
 	
-stru2(X) ->
+stru2(X,_) ->
     {X,[]}.
-%responses([<< $ ,$ ,$ ,$ ,$*,$*,$*,$ ,_/binary>>|T]) ->
-%    responses(T);
-responses([{_Line,<< X:2/binary,$:,$ ,Resp/binary>>}|T]) ->
-    {NT,R2} = responses(T),
+
+responses([{_Line,<< X:2/binary,$:,$ ,Resp/binary>>}|T],U) ->
+    {NT,R2} = responses(T,U),
     NX=list_to_integer(binary_to_list(frontstrip(X))),
-    {NT,[{NX,escape2(Resp)} | R2]};
-responses([{_Line,<< X:3/binary,$:,$ ,Resp/binary>>}|T]) ->
-    {NT,R2} = responses(T),
+    {NT,[{NX,escape2(Resp,U)} | R2]};
+responses([{_Line,<< X:3/binary,$:,$ ,Resp/binary>>}|T],U) ->
+    {NT,R2} = responses(T,U),
     NX=list_to_integer(binary_to_list(frontstrip(X))),
-    {NT,[{NX,escape2(Resp)} | R2]};
-responses([{_Line,<<$N,$o,$ ,$m,$a,$t,$c,$h,_/binary>>}|T]) ->
+    {NT,[{NX,escape2(Resp,U)} | R2]};
+responses([{_Line,<<$N,$o,$ ,$m,$a,$t,$c,$h,_/binary>>}|T],_) ->
     {T,nomatch};
-responses([{Line,<<$ ,No,Ch,_/binary>>}|T]) when No >= $0, No =< $9, Ch >= $A, Ch =< $Z ->
+responses([{Line,<<$ ,No,Ch,_/binary>>}|T],U) when No >= $0, No =< $9, Ch >= $A, Ch =< $Z ->
     info("Skipping strange debug response at line ~p~n",[Line]),
-    responses(T);
-responses([{Line,<<$ ,$ ,Ch,_/binary>>}|T]) when Ch =:= $G; Ch =:= $C ->
+    responses(T,U);
+responses([{Line,<<$ ,$ ,Ch,_/binary>>}|T],U) when Ch =:= $G; Ch =:= $C ->
     info("Skipping stranger debug response at line ~p~n",[Line]),
-    responses(T);
-responses([{Line,<<C,_/binary>>=X}|_]) when C =/= $  ->
+    responses(T,U);
+responses([{Line,<<C,_/binary>>=X}|_],_) when C =/= $  ->
     info("Offending response line(~w)! ~p~n",[Line,X]),
     throw(fail);
-responses(X) ->
+responses(X,_) ->
     {X,[]}.
     
 
@@ -753,24 +750,38 @@ splitby(Ch,<<Ch,Rest/binary>>,Acc) ->
     {Acc,Rest};
 splitby(Ch,<<OCh,Rest/binary>>,Acc) ->
     splitby(Ch,Rest,<<Acc/binary,OCh>>).
+
+pick_number(N,<<Ch:8,Rest/binary>>) when Ch >= $0, Ch =< $9 ->
+    pick_number(N*10+(Ch - $0),Rest);
+pick_number(N,Rest) ->
+    {N,Rest}.
+
+pick_offset(Rest) ->
+    {Int,NRest} = pick_number(0,Rest),
+    {{offset,Int},NRest}.
 	    
 
-escape(<<>>) ->
+escape(<<>>,_) ->
     {[],<<>>};
-escape(<<$\\, Ch, Rest/binary>>) when Ch >= $A, Ch =< $Z; Ch =:= $? ->
+escape(<<$\\, Ch, Rest/binary>>,U) when Ch >= $A, Ch =< $Z; Ch =:= $? ->
     %Options in the string...
     NewOpts = eopt(Ch),
-    {MoreOpts,Tail} = escape(Rest),
+    {MoreOpts,Tail} = escape(Rest,U),
     {NewOpts ++ MoreOpts,Tail};
-escape(<<$\\, $<, Rest/binary>>) ->
+escape(<<$\\, $>, Rest/binary>>,U) ->
+    %Offset Options in the string...
+    {NewOpt,NewRest} = pick_offset(Rest),
+    {MoreOpts,Tail} = escape(NewRest,U),
+    {[NewOpt|MoreOpts],Tail};
+escape(<<$\\, $<, Rest/binary>>,U) ->
     %CR Options in the string...
     {NewOpt,NewRest} = pinch_cr(Rest),
-    {MoreOpts,Tail} = escape(NewRest),
+    {MoreOpts,Tail} = escape(NewRest,U),
     {[NewOpt|MoreOpts],Tail};
-escape(<<$\\, Ch, Rest/binary>>) ->
+escape(<<$\\, Ch, Rest/binary>>,U) ->
     {C,NR} = case single_esc(Ch) of
 		 no ->
-		     case multi_esc(<<Ch,Rest/binary>>) of
+		     case multi_esc(<<Ch,Rest/binary>>,U) of
 			 {CharBin,NewRest} ->
 			     {CharBin,NewRest};
 			 no ->
@@ -780,30 +791,28 @@ escape(<<$\\, Ch, Rest/binary>>) ->
 		     %erlang:display({escape,CCC}),
 		     {<<CCC>>,Rest}
 	     end,
-    {MoreOpts,Tail} = escape(NR),
+    {MoreOpts,Tail} = escape(NR,U),
     {MoreOpts,<<C/binary,Tail/binary>>};
-%escape(<<$\\,Rest/binary>>) ->
-%    escape(<<Rest/binary>>);
-escape(<<Ch,Rest/binary>>) ->
-    {X,RR} = escape(<<Rest/binary>>),
+escape(<<Ch,Rest/binary>>,U) ->
+    {X,RR} = escape(<<Rest/binary>>,U),
     {X,<<Ch,RR/binary>>};
-escape(Any) ->
+escape(Any,_) ->
     {[],Any}.
-escape2(<<>>) ->
+escape2(<<>>,_) ->
     <<>>;
-escape2(<<$\\, Ch, Rest/binary>>) ->
-    {C,NR} = case multi_esc(<<Ch,Rest/binary>>) of
+escape2(<<$\\, Ch, Rest/binary>>,U) ->
+    {C,NR} = case multi_esc(<<Ch,Rest/binary>>,U) of
 		 {CharBin,NewRest} ->
 		     {CharBin,NewRest};
 		 no ->
 		     {<<$\\>>,<<Ch,Rest/binary>>}
 	     end,
-    Tail = escape2(NR),
+    Tail = escape2(NR,U),
     <<C/binary,Tail/binary>>;
-escape2(<<Ch,Rest/binary>>) ->
-    RR = escape2(<<Rest/binary>>),
+escape2(<<Ch,Rest/binary>>,U) ->
+    RR = escape2(<<Rest/binary>>,U),
     <<Ch,RR/binary>>;
-escape2(Any) ->
+escape2(Any,_) ->
     Any.
 
 
@@ -848,28 +857,34 @@ list_to_utf8(L) when is_list(L); is_binary(L) ->
 list_to_utf8({Tag,_,_}) when Tag =:= incomplete ; Tag =:= error ->
     throw(skip).
 
-multi_esc(<<M,N,O,Rest/binary>>) 
+multi_esc(<<M,N,O,Rest/binary>>,_) 
    when M >= $0, M =< $7, N >= $0, N =< $7, O  >= $0, O =< $7 ->
     Cha = ((M - $0) bsl 6) bor ((N - $0) bsl 3) bor (O - $0),
     {<<Cha>>,Rest};
-multi_esc(<<N,O,Rest/binary>>) 
+multi_esc(<<N,O,Rest/binary>>,_) 
    when N >= $0, N =< $7, O  >= $0, O =< $7 ->
     Cha = ((N - $0) bsl 3) bor (O - $0),
     {<<Cha>>,Rest};
-multi_esc(<<O,Rest/binary>>) 
+multi_esc(<<O,Rest/binary>>,_) 
    when O  >= $0, O =< $7 ->
     Cha = (O - $0),
     {<<Cha>>,Rest};
 
 
-multi_esc(<<$x,${,N,O,$},Rest/binary>>) 
+multi_esc(<<$x,${,N,O,$},Rest/binary>>,Unicode) 
     when ((((N >= $0) and (N =< $9)) or ((N >= $A) and (N =< $F)) or 
 	 ((N >= $a) and (N =< $f))) and 
 	(((O >= $0) and (O =< $9)) or ((O >= $A) and (O =< $F)) or 
 	 ((O >= $a) and (O =< $f)))) -> 
+    %io:format("~p(~p)~n",[<<$x,${,N,O,$}>>,get(unicode)]),
     Cha = (trx(N) bsl 4) bor trx(O),
-    {int_to_utf8(Cha),Rest};
-multi_esc(<<$x,${,N,O,P,$},Rest/binary>>) 
+    case Unicode of
+	false ->
+	    {<<Cha:8>>,Rest};
+	_ ->
+	    {int_to_utf8(Cha),Rest}
+    end;
+multi_esc(<<$x,${,N,O,P,$},Rest/binary>>,_) 
     when ((((N >= $0) and (N =< $9)) or ((N >= $A) and (N =< $F)) or 
 	 ((N >= $a) and (N =< $f))) and 
 	(((O >= $0) and (O =< $9)) or ((O >= $A) and (O =< $F)) or 
@@ -878,7 +893,7 @@ multi_esc(<<$x,${,N,O,P,$},Rest/binary>>)
 	 ((P >= $a) and (P =< $f)))) -> 
     Cha = (trx(N) bsl 8) bor (trx(O) bsl 4) bor trx(P),
     {int_to_utf8(Cha),Rest};
-multi_esc(<<$x,${,N,O,P,Q,$},Rest/binary>>) 
+multi_esc(<<$x,${,N,O,P,Q,$},Rest/binary>>,_) 
     when ((((N >= $0) and (N =< $9)) or ((N >= $A) and (N =< $F)) or 
 	 ((N >= $a) and (N =< $f))) and 
 	(((O >= $0) and (O =< $9)) or ((O >= $A) and (O =< $F)) or 
@@ -889,7 +904,7 @@ multi_esc(<<$x,${,N,O,P,Q,$},Rest/binary>>)
 	 ((Q >= $a) and (Q =< $f)))) -> 
     Cha = (trx(N) bsl 12) bor (trx(O) bsl 8) bor (trx(P) bsl 4) bor trx(Q),
     {int_to_utf8(Cha),Rest};
-multi_esc(<<$x,${,N,O,P,Q,R,$},Rest/binary>>) 
+multi_esc(<<$x,${,N,O,P,Q,R,$},Rest/binary>>,_) 
     when ((((N >= $0) and (N =< $9)) or ((N >= $A) and (N =< $F)) or 
 	 ((N >= $a) and (N =< $f))) and 
 	(((O >= $0) and (O =< $9)) or ((O >= $A) and (O =< $F)) or 
@@ -902,7 +917,7 @@ multi_esc(<<$x,${,N,O,P,Q,R,$},Rest/binary>>)
 	 ((R >= $a) and (R =< $f)))) -> 
     Cha = (trx(N) bsl 16) bor (trx(O) bsl 12) bor (trx(P) bsl 8) bor (trx(Q) bsl 4) bor trx(R),
     {int_to_utf8(Cha),Rest};
-multi_esc(<<$x,${,N,O,P,Q,R,S,$},Rest/binary>>) 
+multi_esc(<<$x,${,N,O,P,Q,R,S,$},Rest/binary>>,_) 
     when ((((N >= $0) and (N =< $9)) or ((N >= $A) and (N =< $F)) or 
 	 ((N >= $a) and (N =< $f))) and 
 	(((O >= $0) and (O =< $9)) or ((O >= $A) and (O =< $F)) or 
@@ -917,19 +932,19 @@ multi_esc(<<$x,${,N,O,P,Q,R,S,$},Rest/binary>>)
 	 ((S >= $a) and (S =< $f)))) -> 
     Cha = (trx(N) bsl 20) bor (trx(O) bsl 16) bor (trx(P) bsl 12) bor (trx(Q) bsl 8) bor (trx(R) bsl 4) bor trx(S),
     {int_to_utf8(Cha),Rest};
-multi_esc(<<$x,N,O,Rest/binary>>) 
+multi_esc(<<$x,N,O,Rest/binary>>,_) 
   when ((((N >= $0) and (N =< $9)) or ((N >= $A) and (N =< $F)) or 
 	 ((N >= $a) and (N =< $f))) and 
 	(((O >= $0) and (O =< $9)) or ((O >= $A) and (O =< $F)) or 
 	 ((O >= $a) and (O =< $f)))) -> 
     Cha = (trx(N) bsl 4) bor trx(O),
     {<<Cha>>,Rest};
-multi_esc(<<$x,N,Rest/binary>>) 
+multi_esc(<<$x,N,Rest/binary>>,_) 
   when (((N >= $0) and (N =< $9)) or ((N >= $A) and (N =< $F)) or 
 	 ((N >= $a) and (N =< $f)))  -> 
     Cha = trx(N),
     {<<Cha>>,Rest};
-multi_esc(_) ->
+multi_esc(_,_) ->
     no.
 
 single_esc($") ->
@@ -980,15 +995,14 @@ gen_split_test(OneFile) ->
     Lines = splitfile(0,Bin,1),
     Structured = stru(Lines),
     PerlShellScript = OneFile++"_split_test_gen.sh",
-    dumpsplit(Structured,PerlShellScript),
-    PerlShellScript,
+    FunList = dumpsplit(Structured,PerlShellScript),
     ErlModule = "re_"++filename:basename(OneFile)++"_split_test",
     ErlFileName = ErlModule++".erl",
     {ok,F}= file:open(ErlFileName,[write]),
     io:format(F,"-module(~s).~n",[ErlModule]),
     io:format(F,"-compile(export_all).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
-    io:format(F,"-include(\"test_server.hrl\").~n",[]),
+    %io:format(F,"-include(\"test_server.hrl\").~n",[]),
     %io:format(F,"-define(line,erlang:display(?LINE),).~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_split_test(~p)~n",
 	      [?MODULE,OneFile]),
@@ -996,62 +1010,72 @@ gen_split_test(OneFile) ->
     io:format(F,"join([A]) -> [A];~n",[]),
     io:format(F,"join([H|T]) -> [H,<<\":\">>|join(T)].~n",[]),
     io:format(F,"run() ->~n",[]),
+    [ io:format(F,"    ~s(),~n",[FunName]) || FunName <- FunList ],
     file:close(F),
     os:cmd("sh "++ PerlShellScript++" 2>/dev/null >> "++ErlFileName),
-    {ok,F2}= file:open(ErlFileName,[append]),
-    io:format(F2,"ok.~n",[]),
-    file:close(F2),
     io:format("~s~n",[os:cmd("wc -l "++ErlFileName)]),
     ok.
 
 dumpsplit(S,Fname) ->
     {ok,F}= file:open(Fname,[write]),
-    dodumpsplit(F,S),
-    file:close(F).
-
-dodumpsplit(_,[]) ->
-    ok;
-dodumpsplit(F,[H|T]) ->
+    Res = dodumpsplit(F,S,0,[],0),
+    file:close(F),
+    Res.
+
+dodumpsplit(F,[],_,Acc,_) ->
+    io:format(F,"echo \"    ok.\"~n",[]),
+    lists:reverse(Acc);
+dodumpsplit(F,L,0,Acc,FunNum) ->
+    NewFun = "run"++integer_to_list(FunNum),
+    io:format(F,"echo \"    ok.\"~n",[]),
+    io:format(F,"echo \"~s() ->\"~n",[NewFun]),
+    dodumpsplit(F,L,20,[NewFun|Acc],FunNum+1);
+dodumpsplit(F,[H|T],N,Acc,FunNum) ->
     dumponesplit(F,H),
-    dodumpsplit(F,T).
+    dodumpsplit(F,T,N-1,Acc,FunNum).
 
-dumponesplit(F,{RE,_,O,TS}) ->
+dumponesplit(F,{RE,Line,O,TS}) ->
     [begin
 	 {NO,_} = pick_exec_options(O++Op),
 	 SSS = opt_to_string(NO),
-	 io:format(F,"perl -e '$x = join(\":\",split(/~s/~s,\"~s\")); "
-		   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
-		   "print \"?line <<\\\"$x\\\">> = "
-		   "iolist_to_binary(join(re:split(\\\"~s\\\","
-		   "\\\"~s\\\",~p))), \\n\";'~n",
-		   [zsafe(safe(RE)),
-		    SSS,
-		    ysafe(safe(Str)),
-		    dsafe(safe(Str)),
-		    dsafe2(safe(RE)),
-		    NO++[trim]]),
-	 io:format(F,"perl -e '$x = join(\":\",split(/~s/~s,\"~s\",2)); "
-		   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
-		   "print \"?line <<\\\"$x\\\">> = "
-		   "iolist_to_binary(join(re:split(\\\"~s\\\","
-		   "\\\"~s\\\",~p))), \\n\";'~n",
-		   [zsafe(safe(RE)),
-		    SSS,
-		    ysafe(safe(Str)),
-		    dsafe(safe(Str)),
-		    dsafe2(safe(RE)),
-		    NO++[{parts,2}]]),
-	 io:format(F,"perl -e '$x = join(\":\",split(/~s/~s,\"~s\",-1)); "
-		   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
-		   "print \"?line <<\\\"$x\\\">> = "
-		   "iolist_to_binary(join(re:split(\\\"~s\\\","
-		   "\\\"~s\\\",~p))), \\n\";'~n",
-		   [zsafe(safe(RE)),
-		    SSS,
-		    ysafe(safe(Str)),
-		    dsafe(safe(Str)),
-		    dsafe2(safe(RE)),
-		    NO])
+	 LLL = unicode:characters_to_list(RE),
+	 case (catch iolist_to_binary(LLL)) of
+	     X when is_binary(X) -> 
+		 io:format(F,"perl -e '$x = join(\":\",split(/~s/~s,\"~s\")); "
+			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
+			   "print \"    <<\\\"$x\\\">> = "
+			   "iolist_to_binary(join(re:split(\\\"~s\\\","
+			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   [zsafe(safe(RE)),
+			    SSS,
+			    ysafe(safe(Str)),
+			    dsafe(safe(Str)),
+			    dsafe2(safe(RE)),
+			    NO++[trim]]),
+		 io:format(F,"perl -e '$x = join(\":\",split(/~s/~s,\"~s\",2)); "
+			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
+			   "print \"    <<\\\"$x\\\">> = "
+			   "iolist_to_binary(join(re:split(\\\"~s\\\","
+			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   [zsafe(safe(RE)),
+			    SSS,
+			    ysafe(safe(Str)),
+			    dsafe(safe(Str)),
+			    dsafe2(safe(RE)),
+			    NO++[{parts,2}]]),
+		 io:format(F,"perl -e '$x = join(\":\",split(/~s/~s,\"~s\",-1)); "
+			   "$x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; "
+			   "print \"    <<\\\"$x\\\">> = "
+			   "iolist_to_binary(join(re:split(\\\"~s\\\","
+			   "\\\"~s\\\",~p))), \\n\";'~n",
+			   [zsafe(safe(RE)),
+			    SSS,
+			    ysafe(safe(Str)),
+			    dsafe(safe(Str)),
+			    dsafe2(safe(RE)),
+			    NO]);
+	     _ -> io:format("Found fishy character at line ~w~n",[Line])
+	 end
      end ||
 	{Str,_,Op,_} <- TS].
 
@@ -1063,42 +1087,51 @@ gen_repl_test(OneFile) ->
     Lines = splitfile(0,Bin,1),
     Structured = stru(Lines),
     PerlShellScript = OneFile++"_replacement_test_gen.sh",
-    dump(Structured,PerlShellScript),
+    FunList = dump(Structured,PerlShellScript),
     ErlModule = "re_"++filename:basename(OneFile)++"_replacement_test",
     ErlFileName = ErlModule++".erl",
     {ok,F}= file:open(ErlFileName,[write]),
     io:format(F,"-module(~s).~n",[ErlModule]),
     io:format(F,"-compile(export_all).~n",[]),
     io:format(F,"-compile(no_native).~n",[]),
-    io:format(F,"-include(\"test_server.hrl\").~n",[]),
+    %io:format(F,"-include(\"test_server.hrl\").~n",[]),
     io:format(F,"%% This file is generated by running ~w:gen_repl_test(~p)~n",
 	      [?MODULE,OneFile]),
     io:format(F,"run() ->~n",[]),
+    [ io:format(F,"    ~s(),~n",[FunName]) || FunName <- FunList ],
     file:close(F),
     os:cmd("sh "++ PerlShellScript++" 2>/dev/null >> "++ErlFileName),
-    {ok,F2}= file:open(ErlFileName,[append]),
-    io:format(F2,"ok.~n",[]),
-    file:close(F2),
     io:format("~s~n",[os:cmd("wc -l "++ErlFileName)]),
     ok.
 dump(S,Fname) ->
     {ok,F}= file:open(Fname,[write]),
-    dodump(F,S),
-    file:close(F).
+    Res = dodump(F,S,0,[],0),
+    file:close(F),
+    Res.
     
-dodump(_,[]) ->
-    ok;
-dodump(F,[H|T]) ->
+dodump(F,[],_,Acc,_) ->
+    io:format(F,"echo \"    ok.\"~n",[]),
+    lists:reverse(Acc);
+dodump(F,L,0,Acc,FunNum) ->
+    NewFun = "run"++integer_to_list(FunNum),
+    io:format(F,"echo \"    ok.\"~n",[]),
+    io:format(F,"echo \"~s() ->\"~n",[NewFun]),
+    dodump(F,L,20,[NewFun|Acc],FunNum+1);
+dodump(F,[H|T],N,Acc,FunNum) ->
     dumpone(F,H),
-    dodump(F,T).
+    dodump(F,T,N-1,Acc,FunNum).
 
-dumpone(F,{RE,_,O,TS}) ->
+dumpone(F,{RE,Line,O,TS}) ->
     [begin
 	 {NO,_} = pick_exec_options(O++Op),
 	 SSS = opt_to_string(NO),
 	 RS = ranstring(),
-	 io:format(F,"perl -e '$x = \"~s\"; $x =~~ s/~s/~s/~s; $x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; print \"?line <<\\\"$x\\\">> = iolist_to_binary(re:replace(\\\"~s\\\",\\\"~s\\\",\\\"~s\\\",~p)), \\n\";'~n",[ysafe(safe(Str)),zsafe(safe(RE)),perlify(binary_to_list(RS)),SSS,dsafe(safe(Str)),dsafe(safe(RE)),xsafe(RS),NO]),
-	 io:format(F,"perl -e '$x = \"~s\"; $x =~~ s/~s/~s/g~s; $x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; print \"?line <<\\\"$x\\\">> = iolist_to_binary(re:replace(\\\"~s\\\",\\\"~s\\\",\\\"~s\\\",~p)), \\n\";'~n",[ysafe(safe(Str)),zsafe(safe(RE)),perlify(binary_to_list(RS)),SSS,dsafe(safe(Str)),dsafe(safe(RE)),xsafe(RS),NO++[global]])
+	 LLL = unicode:characters_to_list(RE),
+	 case (catch iolist_to_binary(LLL)) of
+	     X when is_binary(X) -> io:format(F,"perl -e '$x = \"~s\"; $x =~~ s/~s/~s/~s; $x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; print \"    <<\\\"$x\\\">> = iolist_to_binary(re:replace(\\\"~s\\\",\\\"~s\\\",\\\"~s\\\",~p)), \\n\";'~n",[ysafe(safe(Str)),zsafe(safe(RE)),perlify(binary_to_list(RS)),SSS,dsafe(safe(Str)),dsafe(safe(RE)),xsafe(RS),NO]),
+	 io:format(F,"perl -e '$x = \"~s\"; $x =~~ s/~s/~s/g~s; $x =~~ s/\\\\/\\\\\\\\/g; $x =~~ s/\\\"/\\\\\"/g; print \"    <<\\\"$x\\\">> = iolist_to_binary(re:replace(\\\"~s\\\",\\\"~s\\\",\\\"~s\\\",~p)), \\n\";'~n",[ysafe(safe(Str)),zsafe(safe(RE)),perlify(binary_to_list(RS)),SSS,dsafe(safe(Str)),dsafe(safe(RE)),xsafe(RS),NO++[global]]);
+	     _ -> io:format("Found fishy character at line ~w~n",[Line])
+	 end
      end ||
 	{Str,_,Op,_} <- TS].
 
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 3c49aaa103..692dfe0faa 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -147,7 +146,7 @@ start_restricted_from_shell(Config) when is_list(Config) ->
 			 "test_restricted) end.">>),
     ?line {ok, test_restricted} = 
 	application:get_env(stdlib, restricted_shell),
-    ?line "Module" ++ _ = t(<<"begin m() end.">>),
+    ?line "Module" ++ _ = t({<<"begin m() end.">>, utf8}),
     ?line "exception exit: restricted shell does not allow c(foo)" = 
 	comm_err(<<"begin c(foo) end.">>),
     ?line "exception exit: restricted shell does not allow init:stop()" = 
@@ -226,7 +225,7 @@ start_restricted_on_command_line(Config) when is_list(Config) ->
     ?line {ok,Node2} = start_node(shell_suite_helper_2,
 				 "-pa "++?config(priv_dir,Config)++ 
 				 " -stdlib restricted_shell test_restricted2"),
-    ?line "Module" ++ _ = t({Node2,<<"begin m() end.">>}),
+    ?line "Module" ++ _ = t({Node2,<<"begin m() end.">>, utf8}),
     ?line "exception exit: restricted shell does not allow c(foo)" = 
 	comm_err({Node2,<<"begin c(foo) end.">>}),
     ?line "exception exit: restricted shell does not allow init:stop()" = 
@@ -2601,9 +2600,9 @@ otp_7232(doc) ->
     "OTP-7232. qlc:info() bug.";
 otp_7232(suite) -> [];
 otp_7232(Config) when is_list(Config) ->
-    Info = <<"qlc:info(qlc:sort(qlc:q([X || X <- [1000,2000]]), "
+    Info = <<"qlc:info(qlc:sort(qlc:q([X || X <- [55296,56296]]), "
              "{order, fun(A,B)-> A>B end})).">>,
-    "qlc:sort([1000,2000],\n"
+    "qlc:sort([55296,56296],\n"
     "         [{order,\n"
     "           fun(A, B) ->\n"
     "                  A > B\n"
@@ -2928,14 +2927,14 @@ t1(Parent, {Bin,Enc}, F) ->
         server_loop(S)
     catch exit:R -> Parent ! {self(), R};
           throw:{?MODULE,LoopReply,latin1} ->
-                   L0 = binary_to_list(list_to_binary(LoopReply)),
-                   [$\n | L1] = lists:dropwhile(fun(X) -> X =/= $\n end, L0),
-                   Parent ! {self(), dotify(L1)};
+	    L0 = binary_to_list(list_to_binary(LoopReply)),
+	    [$\n | L1] = lists:dropwhile(fun(X) -> X =/= $\n end, L0),
+	    Parent ! {self(), dotify(L1)};
           throw:{?MODULE,LoopReply,_Uni} ->
-                   Tmp = unicode:characters_to_binary(LoopReply),
-                   L0 = unicode:characters_to_list(Tmp),
-                   [$\n | L1] = lists:dropwhile(fun(X) -> X =/= $\n end, L0),
-                   Parent ! {self(), dotify(L1)}
+	    Tmp = unicode:characters_to_binary(LoopReply),
+	    L0 = unicode:characters_to_list(Tmp),
+	    [$\n | L1] = lists:dropwhile(fun(X) -> X =/= $\n end, L0),
+	    Parent ! {self(), dotify(L1)}
     after group_leader(S#state.leader, self())
     end.
 
diff --git a/lib/stdlib/test/slave_SUITE.erl b/lib/stdlib/test/slave_SUITE.erl
index 37fc694083..1d6a3ac90d 100644
--- a/lib/stdlib/test/slave_SUITE.erl
+++ b/lib/stdlib/test/slave_SUITE.erl
@@ -230,7 +230,7 @@ rsh_test(ResultTo) ->
     link(ResultTo),
     ?line {error, no_rsh} = slave:start(super, slave3).
 
-
+
 %%% Utilities.    
 
 
diff --git a/lib/stdlib/test/stdlib_SUITE.erl b/lib/stdlib/test/stdlib_SUITE.erl
index 8a2cb5ea6b..53a34511d9 100644
--- a/lib/stdlib/test/stdlib_SUITE.erl
+++ b/lib/stdlib/test/stdlib_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. All Rights Reserved.
 %% 
 %% The 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,10 +23,6 @@
 -include_lib("test_server/include/test_server.hrl").
 
 
-% Default timetrap timeout (set in init_per_testcase).
--define(default_timeout, ?t:minutes(1)).
--define(application, stdlib).
-
 % Test server specific exports
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
@@ -60,11 +56,8 @@ end_per_group(_GroupName, Config) ->
 
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
-    [{watchdog, Dog}|Config].
-end_per_testcase(_Case, Config) ->
-    Dog=?config(watchdog, Config),
-    test_server:timetrap_cancel(Dog),
+    Config.
+end_per_testcase(_Case, _Config) ->
     ok.
 
 %
@@ -78,56 +71,80 @@ app_test(Config) when is_list(Config) ->
     ?t:app_test(stdlib),
     ok.
 
-%% Test that appup allows upgrade from/downgrade to a maximum of two
-%% major releases back.
+%% Test that appup allows upgrade from/downgrade to a maximum of one
+%% major release back.
 appup_test(_Config) ->
-    application:load(stdlib),
-    {_,_,Vsn} = lists:keyfind(stdlib,1,application:loaded_applications()),
-    AppupFile = filename:join([code:lib_dir(stdlib),ebin,"stdlib.appup"]),
+    appup_tests(stdlib,create_test_vsns(stdlib)).
+
+appup_tests(_App,{[],[]}) ->
+    {skip,"no previous releases available"};
+appup_tests(App,{OkVsns,NokVsns}) ->
+    application:load(App),
+    {_,_,Vsn} = lists:keyfind(App,1,application:loaded_applications()),
+    AppupFileName = atom_to_list(App) ++ ".appup",
+    AppupFile = filename:join([code:lib_dir(App),ebin,AppupFileName]),
     {ok,[{Vsn,UpFrom,DownTo}=AppupScript]} = file:consult(AppupFile),
     ct:log("~p~n",[AppupScript]),
-    {OkVsns,NokVsns} = create_test_vsns(Vsn),
+    ct:log("Testing ok versions: ~p~n",[OkVsns]),
     check_appup(OkVsns,UpFrom,{ok,[restart_new_emulator]}),
     check_appup(OkVsns,DownTo,{ok,[restart_new_emulator]}),
+    ct:log("Testing not ok versions: ~p~n",[NokVsns]),
     check_appup(NokVsns,UpFrom,error),
     check_appup(NokVsns,DownTo,error),
     ok.
 
-create_test_vsns(Current) ->
-    [XStr,YStr|Rest] = string:tokens(Current,"."),
-    X = list_to_integer(XStr),
-    Y = list_to_integer(YStr),
-    SecondMajor = vsn(X,Y-2),
-    SecondMinor = SecondMajor ++ ".1.3",
-    FirstMajor = vsn(X,Y-1),
-    FirstMinor = FirstMajor ++ ".57",
-    ThisMajor = vsn(X,Y),
-    This =
-	case Rest of
-	    [] ->
-		[];
-	    ["1"] ->
-		[ThisMajor];
-	    _ ->
-		ThisMinor = ThisMajor ++ ".1",
-		[ThisMajor,ThisMinor]
+create_test_vsns(App) ->
+    This = erlang:system_info(otp_release),
+    FirstMajor = previous_major(This),
+    SecondMajor = previous_major(FirstMajor),
+    Ok = app_vsn(App,[FirstMajor]),
+    Nok0 = app_vsn(App,[SecondMajor]),
+    Nok = case Ok of
+	       [Ok1|_] ->
+		   [Ok1 ++ ",1" | Nok0]; % illegal
+	       _ ->
+		   Nok0
+	   end,
+    {Ok,Nok}.
+
+previous_major("17") ->
+    "r16";
+previous_major("r"++Rel) ->
+    "r"++previous_major(Rel);
+previous_major(Rel) ->
+    integer_to_list(list_to_integer(Rel)-1).
+
+app_vsn(App,[R|Rs]) ->
+    OldRel =
+	case test_server:is_release_available(R) of
+	    true ->
+		{release,R};
+	    false ->
+		case ct:get_config({otp_releases,list_to_atom(R)}) of
+		    undefined ->
+			false;
+		    Prog0 ->
+			case os:find_executable(Prog0) of
+			    false ->
+				false;
+			    Prog ->
+				{prog,Prog}
+			end
+		end
 	end,
-    OkVsns = This ++ [FirstMajor, FirstMinor, SecondMajor, SecondMinor],
-
-    ThirdMajor = vsn(X,Y-3),
-    ThirdMinor = ThirdMajor ++ ".10.12",
-    Illegal = ThisMajor ++ ",1",
-    Newer1Major = vsn(X,Y+1),
-    Newer1Minor = Newer1Major ++ ".1",
-    Newer2Major = ThisMajor ++ "1",
-    NokVsns = [ThirdMajor,ThirdMinor,
-	       Illegal,
-	       Newer1Major,Newer1Minor,
-	       Newer2Major],
-    {OkVsns,NokVsns}.
-
-vsn(X,Y) ->
-    integer_to_list(X) ++ "." ++ integer_to_list(Y).
+    case OldRel of
+	false ->
+	    app_vsn(App,Rs);
+	_ ->
+	    {ok,N} = test_server:start_node(prevrel,peer,[{erl,[OldRel]}]),
+	    _ = rpc:call(N,application,load,[App]),
+	    As = rpc:call(N,application,loaded_applications,[]),
+	    {_,_,V} = lists:keyfind(App,1,As),
+	    test_server:stop_node(N),
+	    [V|app_vsn(App,Rs)]
+    end;
+app_vsn(_App,[]) ->
+    [].
 
 check_appup([Vsn|Vsns],Instrs,Expected) ->
     case systools_relup:appup_search_for_version(Vsn, Instrs) of
diff --git a/lib/stdlib/test/string_SUITE.erl b/lib/stdlib/test/string_SUITE.erl
index 96e653985f..fccd1bef95 100644
--- a/lib/stdlib/test/string_SUITE.erl
+++ b/lib/stdlib/test/string_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %% 
 %% The 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/vsn.mk b/lib/stdlib/vsn.mk
index ba6f7cdb8a..37a6590b06 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 1.19.3
+STDLIB_VSN = 2.0
diff --git a/lib/syntax_tools/doc/src/book.xml b/lib/syntax_tools/doc/src/book.xml
index 793b219ffb..6a8a3a3ca6 100644
--- a/lib/syntax_tools/doc/src/book.xml
+++ b/lib/syntax_tools/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/syntax_tools/doc/src/fascicules.xml b/lib/syntax_tools/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/syntax_tools/doc/src/fascicules.xml
+++ b/lib/syntax_tools/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/syntax_tools/doc/src/notes.xml b/lib/syntax_tools/doc/src/notes.xml
index 8ae69539a7..a9d3f68d1d 100644
--- a/lib/syntax_tools/doc/src/notes.xml
+++ b/lib/syntax_tools/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,54 @@
   <p>This document describes the changes made to the Syntax_Tools
     application.</p>
 
+<section><title>Syntax_Tools 1.6.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    In syntax_tools-1.6.12 (OTP R16B03) a bug was introduced
+	    which broke reverting of local implicit funs. Implicit
+	    funs were mistakenly thought to be using abstract terms
+	    for their name and arity. This has now been corrected.
+	    (Thanks to Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11576</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> The default encoding of Erlang files has been changed
+	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
+	    files has also been changed to UTF-8. </p>
+          <p>
+	    Own Id: OTP-10907</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Syntax_Tools 1.6.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix transformation of implicit funs in igor (Thanks to
+	    Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11506</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Syntax_Tools 1.6.11</title>
 
     <section><title>Improvements and New Features</title>
diff --git a/lib/syntax_tools/doc/src/part.xml b/lib/syntax_tools/doc/src/part.xml
index 4a3bae29eb..ee8e796561 100644
--- a/lib/syntax_tools/doc/src/part.xml
+++ b/lib/syntax_tools/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/syntax_tools/doc/src/part_notes.xml b/lib/syntax_tools/doc/src/part_notes.xml
index 3656b3ddb6..6962145618 100644
--- a/lib/syntax_tools/doc/src/part_notes.xml
+++ b/lib/syntax_tools/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2007</year><year>2009</year>
+      <year>2007</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/syntax_tools/doc/src/ref_man.xml b/lib/syntax_tools/doc/src/ref_man.xml
index 9249b42184..598f656011 100644
--- a/lib/syntax_tools/doc/src/ref_man.xml
+++ b/lib/syntax_tools/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/syntax_tools/src/erl_prettypr.erl b/lib/syntax_tools/src/erl_prettypr.erl
index 1ffcf31134..877675772f 100644
--- a/lib/syntax_tools/src/erl_prettypr.erl
+++ b/lib/syntax_tools/src/erl_prettypr.erl
@@ -637,6 +637,14 @@ lay_2(Node, Ctxt) ->
 	    sep([follow(text("fun"), D, Ctxt1#ctxt.sub_indent),
 		 text("end")]);
 
+        named_fun_expr ->
+            Ctxt1 = reset_prec(Ctxt),
+            D1 = lay(erl_syntax:named_fun_expr_name(Node), Ctxt1),
+            D = lay_clauses(erl_syntax:named_fun_expr_clauses(Node),
+                            {function,D1}, Ctxt1),
+            sep([follow(text("fun"), D, Ctxt1#ctxt.sub_indent),
+                 text("end")]);
+
 	module_qualifier ->
 	    {PrecL, _Prec, PrecR} = inop_prec(':'),
 	    D1 = lay(erl_syntax:module_qualifier_argument(Node),
@@ -892,6 +900,32 @@ lay_2(Node, Ctxt) ->
 			beside(floating(text(".")), D2)),
 	    maybe_parentheses(D3, Prec, Ctxt);
 
+        map_expr ->
+            {PrecL, Prec, _} = inop_prec('#'),
+            Ctxt1 = reset_prec(Ctxt),
+            D1 = par(seq(erl_syntax:map_expr_fields(Node),
+                         floating(text(",")), Ctxt1, fun lay/2)),
+            D2 = beside(text("#{"), beside(D1, floating(text("}")))),
+            D3 = case erl_syntax:map_expr_argument(Node) of
+                         none ->
+                             D2;
+                         A ->
+                             beside(lay(A, set_prec(Ctxt, PrecL)), D2)
+                 end,
+            maybe_parentheses(D3, Prec, Ctxt);
+
+        map_field_assoc ->
+            Ctxt1 = reset_prec(Ctxt),
+            D1 = lay(erl_syntax:map_field_assoc_name(Node), Ctxt1),
+            D2 = lay(erl_syntax:map_field_assoc_value(Node), Ctxt1),
+            par([D1, floating(text("=>")), D2], Ctxt1#ctxt.break_indent);
+
+        map_field_exact ->
+            Ctxt1 = reset_prec(Ctxt),
+            D1 = lay(erl_syntax:map_field_exact_name(Node), Ctxt1),
+            D2 = lay(erl_syntax:map_field_exact_value(Node), Ctxt1),
+            par([D1, floating(text(":=")), D2], Ctxt1#ctxt.break_indent);
+
 	rule ->
 	    %% Comments on the name will be repeated; cf.
 	    %% `function'.
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index bdb2b5bcd7..ed9decd4b5 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -220,12 +220,26 @@
 	 macro/2,
 	 macro_arguments/1,
 	 macro_name/1,
+         map_expr/1,
+         map_expr/2,
+         map_expr_argument/1,
+         map_expr_fields/1,
+         map_field_assoc/2,
+         map_field_assoc_name/1,
+         map_field_assoc_value/1,
+         map_field_exact/2,
+         map_field_exact_name/1,
+         map_field_exact_value/1,
 	 match_expr/2,
 	 match_expr_body/1,
 	 match_expr_pattern/1,
 	 module_qualifier/2,
 	 module_qualifier_argument/1,
 	 module_qualifier_body/1,
+	 named_fun_expr/2,
+	 named_fun_expr_arity/1,
+	 named_fun_expr_clauses/1,
+	 named_fun_expr_name/1,
 	 nil/0,
 	 operator/1,
 	 operator_literal/1,
@@ -439,8 +453,13 @@
 %%  </tr><tr>
 %%   <td>list_comp</td>
 %%   <td>macro</td>
+%%   <td>map_expr</td>
+%%   <td>map_field_assoc</td>
+%%  </tr><tr>
+%%   <td>map_field_exact</td>
 %%   <td>match_expr</td>
 %%   <td>module_qualifier</td>
+%%   <td>named_fun_expr</td>
 %%  </tr><tr>
 %%   <td>nil</td>
 %%   <td>operator</td>
@@ -449,21 +468,23 @@
 %%  </tr><tr>
 %%   <td>receive_expr</td>
 %%   <td>record_access</td>
-%%  </tr><tr>
 %%   <td>record_expr</td>
 %%   <td>record_field</td>
+%%  </tr><tr>
 %%   <td>record_index_expr</td>
 %%   <td>rule</td>
-%%  </tr><tr>
 %%   <td>size_qualifier</td>
 %%   <td>string</td>
+%%  </tr><tr>
 %%   <td>text</td>
 %%   <td>try_expr</td>
-%%  </tr><tr>
 %%   <td>tuple</td>
 %%   <td>underscore</td>
+%%  </tr><tr>
 %%   <td>variable</td>
 %%   <td>warning_marker</td>
+%%   <td></td>
+%%   <td></td>
 %%  </tr>
 %% </table></center>
 %%
@@ -504,8 +525,12 @@
 %% @see list/2
 %% @see list_comp/2
 %% @see macro/2
+%% @see map_expr/2
+%% @see map_field_assoc/2
+%% @see map_field_exact/2
 %% @see match_expr/2
 %% @see module_qualifier/2
+%% @see named_fun_expr/2
 %% @see nil/0
 %% @see operator/1
 %% @see parentheses/1
@@ -554,6 +579,7 @@ type(Node) ->
 	{'catch', _, _} -> catch_expr;
 	{'cond', _, _} -> cond_expr;
 	{'fun', _, {clauses, _}} -> fun_expr;
+	{named_fun, _, _, _} -> named_fun_expr;
 	{'fun', _, {function, _, _}} -> implicit_fun;
 	{'fun', _, {function, _, _, _}} -> implicit_fun;
 	{'if', _, _} -> if_expr;
@@ -572,6 +598,10 @@ type(Node) ->
 	{lc, _, _, _} -> list_comp;
 	{bc, _, _, _} -> binary_comp;		
 	{match, _, _, _} -> match_expr;
+        {map, _, _, _} -> map_expr;
+        {map, _, _} -> map_expr;
+        {map_field_assoc, _, _, _} -> map_field_assoc;
+        {map_field_exact, _, _, _} -> map_field_exact;
 	{op, _, _, _, _} -> infix_expr;
 	{op, _, _, _} -> prefix_expr;
 	{record, _, _, _, _} -> record_expr;
@@ -1902,6 +1932,208 @@ atom_literal(Node) ->
 
 
 %% =====================================================================
+%% @equiv map_expr(none, Fields)
+
+-spec map_expr([syntaxTree()]) -> syntaxTree().
+
+map_expr(Fields) ->
+    map_expr(none, Fields).
+
+
+%% =====================================================================
+%% @doc Creates an abstract map expression. If `Fields' is
+%% `[F1, ..., Fn]', then if `Argument' is `none', the result represents
+%% "<code>#{<em>F1</em>, ..., <em>Fn</em>}</code>",
+%% otherwise it represents
+%% "<code><em>Argument</em>#{<em>F1</em>, ..., <em>Fn</em>}</code>".
+%%
+%% @see map_expr/1
+%% @see map_expr_argument/1
+%% @see map_expr_fields/1
+%% @see map_field_assoc/2
+%% @see map_field_exact/2
+
+-record(map_expr, {argument :: 'none' | syntaxTree(),
+                   fields   :: [syntaxTree()]}).
+
+%% `erl_parse' representation:
+%%
+%% {map, Pos, Fields}
+%% {map, Pos, Argument, Fields}
+
+-spec map_expr('none' | syntaxTree(), [syntaxTree()]) -> syntaxTree().
+
+map_expr(Argument, Fields) ->
+    tree(map_expr, #map_expr{argument = Argument, fields = Fields}).
+
+revert_map_expr(Node) ->
+    Pos = get_pos(Node),
+    Argument = map_expr_argument(Node),
+    Fields = map_expr_fields(Node),
+    case Argument of
+        none ->
+            {map, Pos, Fields};
+        _ ->
+            {map, Pos, Argument, Fields}
+    end.
+
+
+%% =====================================================================
+%% @doc Returns the argument subtree of a `map_expr' node, if any. If `Node'
+%% represents "<code>#{...}</code>", `none' is returned.
+%% Otherwise, if `Node' represents "<code><em>Argument</em>#{...}</code>",
+%% `Argument' is returned.
+%%
+%% @see map_expr/3
+
+-spec map_expr_argument(syntaxTree()) -> 'none' | syntaxTree().
+
+map_expr_argument(Node) ->
+    case unwrap(Node) of
+        {map, _, _} ->
+            none;
+        {map, _, Argument, _} ->
+            Argument;
+        Node1 ->
+            (data(Node1))#map_expr.argument
+    end.
+
+
+%% =====================================================================
+%% @doc Returns the list of field subtrees of a `map_expr' node.
+%%
+%% @see map_expr/3
+
+-spec map_expr_fields(syntaxTree()) -> [syntaxTree()].
+
+map_expr_fields(Node) ->
+    case unwrap(Node) of
+        {map, _, Fields} ->
+            Fields;
+        {map, _, _, Fields} ->
+            Fields;
+        Node1 ->
+            (data(Node1))#map_expr.fields
+    end.
+
+
+%% =====================================================================
+%% @doc Creates an abstract map assoc field. The result represents
+%% "<code><em>Name</em> => <em>Value</em></code>".
+%%
+%% @see map_field_assoc_name/1
+%% @see map_field_assoc_value/1
+%% @see map_expr/3
+
+-record(map_field_assoc, {name :: syntaxTree(), value :: syntaxTree()}).
+
+%% `erl_parse' representation:
+%%
+%% {map_field_assoc, Pos, Name, Value}
+
+-spec map_field_assoc(syntaxTree(), syntaxTree()) -> syntaxTree().
+
+map_field_assoc(Name, Value) ->
+    tree(map_field_assoc, #map_field_assoc{name = Name, value = Value}).
+
+revert_map_field_assoc(Node) ->
+    Pos = get_pos(Node),
+    Name = map_field_assoc_name(Node),
+    Value = map_field_assoc_value(Node),
+    {map_field_assoc, Pos, Name, Value}.
+
+
+%% =====================================================================
+%% @doc Returns the name subtree of a `map_field_assoc' node.
+%%
+%% @see map_field_assoc/2
+
+-spec map_field_assoc_name(syntaxTree()) -> syntaxTree().
+
+map_field_assoc_name(Node) ->
+    case Node of
+        {map_field_assoc, _, Name, _} ->
+            Name;
+        _ ->
+            (data(Node))#map_field_assoc.name
+    end.
+
+
+%% =====================================================================
+%% @doc Returns the value subtree of a `map_field_assoc' node.
+%%
+%% @see map_field_assoc/2
+
+-spec map_field_assoc_value(syntaxTree()) -> syntaxTree().
+
+map_field_assoc_value(Node) ->
+    case Node of
+        {map_field_assoc, _, _, Value} ->
+            Value;
+        _ ->
+            (data(Node))#map_field_assoc.name
+    end.
+
+
+%% =====================================================================
+%% @doc Creates an abstract map exact field. The result represents
+%% "<code><em>Name</em> := <em>Value</em></code>".
+%%
+%% @see map_field_exact_name/1
+%% @see map_field_exact_value/1
+%% @see map_expr/3
+
+-record(map_field_exact, {name :: syntaxTree(), value :: syntaxTree()}).
+
+%% `erl_parse' representation:
+%%
+%% {map_field_exact, Pos, Name, Value}
+
+-spec map_field_exact(syntaxTree(), syntaxTree()) -> syntaxTree().
+
+map_field_exact(Name, Value) ->
+    tree(map_field_exact, #map_field_exact{name = Name, value = Value}).
+
+revert_map_field_exact(Node) ->
+    Pos = get_pos(Node),
+    Name = map_field_exact_name(Node),
+    Value = map_field_exact_value(Node),
+    {map_field_exact, Pos, Name, Value}.
+
+
+%% =====================================================================
+%% @doc Returns the name subtree of a `map_field_exact' node.
+%%
+%% @see map_field_exact/2
+
+-spec map_field_exact_name(syntaxTree()) -> syntaxTree().
+
+map_field_exact_name(Node) ->
+    case Node of
+        {map_field_exact, _, Name, _} ->
+            Name;
+        _ ->
+            (data(Node))#map_field_exact.name
+    end.
+
+
+%% =====================================================================
+%% @doc Returns the value subtree of a `map_field_exact' node.
+%%
+%% @see map_field_exact/2
+
+-spec map_field_exact_value(syntaxTree()) -> syntaxTree().
+
+map_field_exact_value(Node) ->
+    case Node of
+        {map_field_exact, _, _, Value} ->
+            Value;
+        _ ->
+            (data(Node))#map_field_exact.name
+    end.
+
+
+%% =====================================================================
 %% @doc Creates an abstract tuple. If `Elements' is
 %% `[X1, ..., Xn]', the result represents
 %% "<code>{<em>X1</em>, ..., <em>Xn</em>}</code>".
@@ -5495,12 +5727,11 @@ revert_implicit_fun(Node) ->
 	module_qualifier ->
 	    M = module_qualifier_argument(Name),
 	    Name1 = module_qualifier_body(Name),
-	    F = arity_qualifier_body(Name1),
-	    A = arity_qualifier_argument(Name1),
-	    case {type(M), type(F), type(A)} of
-		{atom, atom, integer} ->
-		    {'fun', Pos,
-		     {function, concrete(M), concrete(F), concrete(A)}};
+	    case type(Name1) of
+		arity_qualifier ->
+		    F = arity_qualifier_body(Name1),
+		    A = arity_qualifier_argument(Name1),
+		    {'fun', Pos, {function, M, F, A}};
 		_ ->
 		    Node
 	    end;
@@ -5623,6 +5854,110 @@ fun_expr_arity(Node) ->
 
 
 %% =====================================================================
+%% @doc Creates an abstract named fun-expression. If `Clauses' is
+%% `[C1, ..., Cn]', the result represents "<code>fun
+%% <em>Name</em> <em>C1</em>; ...; <em>Name</em> <em>Cn</em> end</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>fun <em>Name</em>(<em>P11</em>, ..., <em>P1m</em>) <em>G1</em> ->
+%% <em>B1</em>; ...; <em>Name</em>(<em>Pn1</em>, ..., <em>Pnm</em>)
+%% <em>Gn</em> -> <em>Bn</em> end</code>".
+%%
+%% @see named_fun_expr_name/1
+%% @see named_fun_expr_clauses/1
+%% @see named_fun_expr_arity/1
+
+-record(named_fun_expr, {name :: syntaxTree(), clauses :: [syntaxTree()]}).
+
+%% type(Node) = named_fun_expr
+%% data(Node) = #named_fun_expr{name :: Name, clauses :: Clauses}
+%%
+%%	Name = syntaxTree()
+%%	Clauses = [syntaxTree()]
+%%
+%%	(See `function' for notes; e.g. why the arity is not stored.)
+%%
+%% `erl_parse' representation:
+%%
+%% {named_fun, Pos, Name, Clauses}
+%%
+%%	Clauses = [Clause] \ []
+%%	Clause = {clause, ...}
+%%
+%%	See `clause' for documentation on `erl_parse' clauses.
+
+-spec named_fun_expr(syntaxTree(), [syntaxTree()]) -> syntaxTree().
+
+named_fun_expr(Name, Clauses) ->
+    tree(named_fun_expr, #named_fun_expr{name = Name, clauses = Clauses}).
+
+revert_named_fun_expr(Node) ->
+    Pos = get_pos(Node),
+    Name = named_fun_expr_name(Node),
+    Clauses = [revert_clause(C) || C <- named_fun_expr_clauses(Node)],
+    case type(Name) of
+	variable ->
+	    {named_fun, Pos, variable_name(Name), Clauses};
+	_ ->
+	    Node
+    end.
+
+
+%% =====================================================================
+%% @doc Returns the name subtree of a `named_fun_expr' node.
+%%
+%% @see named_fun_expr/2
+
+-spec named_fun_expr_name(syntaxTree()) -> syntaxTree().
+
+named_fun_expr_name(Node) ->
+    case unwrap(Node) of
+	{named_fun, Pos, Name, _} ->
+	    set_pos(variable(Name), Pos);
+	Node1 ->
+	    (data(Node1))#named_fun_expr.name
+    end.
+
+
+%% =====================================================================
+%% @doc Returns the list of clause subtrees of a `named_fun_expr' node.
+%%
+%% @see named_fun_expr/2
+
+-spec named_fun_expr_clauses(syntaxTree()) -> [syntaxTree()].
+
+named_fun_expr_clauses(Node) ->
+    case unwrap(Node) of
+	{named_fun, _, _, Clauses} ->
+	    Clauses;
+	Node1 ->
+	    (data(Node1))#named_fun_expr.clauses
+    end.
+
+
+%% =====================================================================
+%% @doc Returns the arity of a `named_fun_expr' node. The result is
+%% the number of parameter patterns in the first clause of the
+%% named fun-expression; subsequent clauses are ignored.
+%%
+%% An exception is thrown if `named_fun_expr_clauses(Node)'
+%% returns an empty list, or if the first element of that list is not a
+%% syntax tree `C' of type `clause' such that
+%% `clause_patterns(C)' is a nonempty list.
+%%
+%% @see named_fun_expr/2
+%% @see named_fun_expr_clauses/1
+%% @see clause/3
+%% @see clause_patterns/1
+
+-spec named_fun_expr_arity(syntaxTree()) -> arity().
+
+named_fun_expr_arity(Node) ->
+    length(clause_patterns(hd(named_fun_expr_clauses(Node)))).
+
+
+%% =====================================================================
 %% @doc Creates an abstract parenthesised expression. The result
 %% represents "<code>(<em>Body</em>)</code>", independently of the
 %% context.
@@ -5981,10 +6316,18 @@ revert_root(Node) ->
 	    revert_list(Node);
 	list_comp ->
 	    revert_list_comp(Node);
+        map_expr ->
+            revert_map_expr(Node);
+        map_field_assoc ->
+            revert_map_field_assoc(Node);
+        map_field_exact ->
+            revert_map_field_exact(Node);
 	match_expr ->
 	    revert_match_expr(Node);
 	module_qualifier ->
 	    revert_module_qualifier(Node);
+	named_fun_expr ->
+	    revert_named_fun_expr(Node);
 	nil ->
 	    revert_nil(Node);
 	parentheses ->
@@ -6220,12 +6563,28 @@ subtrees(T) ->
 			As ->
 			    [[macro_name(T)], As]
 		    end;
+                map_expr ->
+                    case map_expr_argument(T) of
+                        none ->
+                            [map_expr_fields(T)];
+                        V ->
+                            [[V], map_expr_fields(T)]
+                    end;
+                map_field_assoc ->
+                    [[map_field_assoc_name(T)],
+                     [map_field_assoc_value(T)]];
+                map_field_exact ->
+                    [[map_field_exact_name(T)],
+                     [map_field_exact_value(T)]];
 		match_expr ->
 		    [[match_expr_pattern(T)],
 		     [match_expr_body(T)]];
 		module_qualifier ->
 		    [[module_qualifier_argument(T)],
 		     [module_qualifier_body(T)]];
+		named_fun_expr ->
+			[[named_fun_expr_name(T)],
+			 named_fun_expr_clauses(T)];
 		parentheses ->
 		    [[parentheses_body(T)]];
 		prefix_expr ->
@@ -6355,7 +6714,12 @@ make_tree(list, [P, [S]]) -> list(P, S);
 make_tree(list_comp, [[T], B]) -> list_comp(T, B);
 make_tree(macro, [[N]]) -> macro(N);
 make_tree(macro, [[N], A]) -> macro(N, A);
+make_tree(map_expr, [Fs]) -> map_expr(Fs);
+make_tree(map_expr, [[E], Fs]) -> map_expr(E, Fs);
+make_tree(map_field_assoc, [[K], [V]]) -> map_field_assoc(K, V);
+make_tree(map_field_exact, [[K], [V]]) -> map_field_exact(K, V);
 make_tree(match_expr, [[P], [E]]) -> match_expr(P, E);
+make_tree(named_fun_expr, [[N], C]) -> named_fun_expr(N, C);
 make_tree(module_qualifier, [[M], [N]]) -> module_qualifier(M, N);
 make_tree(parentheses, [[E]]) -> parentheses(E);
 make_tree(prefix_expr, [[F], [A]]) -> prefix_expr(F, A);
diff --git a/lib/syntax_tools/src/erl_syntax_lib.erl b/lib/syntax_tools/src/erl_syntax_lib.erl
index 2c94ac776d..2f0488abec 100644
--- a/lib/syntax_tools/src/erl_syntax_lib.erl
+++ b/lib/syntax_tools/src/erl_syntax_lib.erl
@@ -288,7 +288,7 @@ mapfoldl(_, S, []) ->
 %%
 %% @see //stdlib/sets
 
--spec variables(erl_syntax:syntaxTree()) -> set().
+-spec variables(erl_syntax:syntaxTree()) -> sets:set(atom()).
 
 variables(Tree) ->
     variables(Tree, sets:new()).
@@ -343,7 +343,7 @@ default_variable_name(N) ->
 %%
 %% @see new_variable_name/2
 
--spec new_variable_name(set()) -> atom().
+-spec new_variable_name(sets:set(atom())) -> atom().
 
 new_variable_name(S) ->
     new_variable_name(fun default_variable_name/1, S).
@@ -369,7 +369,7 @@ new_variable_name(S) ->
 %% @see //stdlib/sets
 %% @see //stdlib/random
 
--spec new_variable_name(fun((integer()) -> atom()), set()) -> atom().
+-spec new_variable_name(fun((integer()) -> atom()), sets:set(atom())) -> atom().
 
 new_variable_name(F, S) ->
     R = start_range(S),
@@ -416,7 +416,7 @@ generate(_Key, Range) ->
 %% 
 %% @see new_variable_name/1
 
--spec new_variable_names(integer(), set()) -> [atom()].
+-spec new_variable_names(integer(), sets:set(atom())) -> [atom()].
 
 new_variable_names(N, S) ->
     new_variable_names(N, fun default_variable_name/1, S).
@@ -432,7 +432,7 @@ new_variable_names(N, S) ->
 %% 
 %% @see new_variable_name/2
 
--spec new_variable_names(integer(), fun((integer()) -> atom()), set()) ->
+-spec new_variable_names(integer(), fun((integer()) -> atom()), sets:set(atom())) ->
 	[atom()].
 
 new_variable_names(N, F, S) when is_integer(N) ->
@@ -1357,8 +1357,6 @@ analyze_attribute(file, Node) ->
     analyze_file_attribute(Node);
 analyze_attribute(record, Node) ->
     analyze_record_attribute(Node);
-analyze_attribute(define, _Node) ->
-    define;
 analyze_attribute(spec, _Node) ->
     spec;
 analyze_attribute(_, Node) ->
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl
index 0c149634f6..38e0c2099b 100644
--- a/lib/syntax_tools/src/erl_tidy.erl
+++ b/lib/syntax_tools/src/erl_tidy.erl
@@ -14,7 +14,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% @copyright 1999-2006 Richard Carlsson
+%% @copyright 1999-2014 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
@@ -269,6 +269,13 @@ file(Name) ->
 %%       is typically most useful if the `verbose' flag is enabled, to
 %%       generate reports about the program files without affecting
 %%       them. The default value is `false'.</dd>
+%%
+%%   <dt>{stdout, boolean()}</dt>
+%%
+%%      <dd>If the value is `true', instead of the file being written
+%%      to disk it will be printed to stdout. The default value is
+%%      `false'.</dd>
+%%
 %% </dl>
 %%
 %% See the function `module/2' for further options.
@@ -309,9 +316,15 @@ file_2(Name, Opts) ->
         true ->
             ok;
         false ->
-            write_module(Tree, Name, Opts1),
-            ok
-    end.
+			case proplists:get_bool(stdout, Opts1) of
+				true ->
+					print_module(Tree, Opts1),
+					ok;
+				false ->
+					write_module(Tree, Name, Opts1),
+					ok
+			end
+	end.
 
 read_module(Name, Opts) ->
     verbose("reading module `~ts'.", [filename(Name)], Opts),
@@ -399,6 +412,10 @@ write_module(Tree, Name, Opts) ->
             throw(R)
     end.
 
+print_module(Tree, Opts) ->
+	Printer = proplists:get_value(printer, Opts),
+	io:format(Printer(Tree, Opts)).
+
 output(FD, Printer, Tree, Opts) ->
     io:put_chars(FD, Printer(Tree, Opts)),
     io:nl(FD).
@@ -941,7 +958,7 @@ hidden_uses_2(Tree, Used) ->
 -record(env, {file		       :: file:filename(),
               module                   :: atom(),
               current                  :: fa(),
-              imports = dict:new()     :: dict(),
+              imports = dict:new()     :: dict:dict(atom(), atom()),
               context = normal	       :: context(),
               verbosity = 1	       :: 0 | 1 | 2,
               quiet = false            :: boolean(),
@@ -953,12 +970,12 @@ hidden_uses_2(Tree, Used) ->
 	      old_guard_tests = false  :: boolean()}).
 
 -record(st, {varc              :: non_neg_integer(),
-	     used = sets:new() :: set(),
-	     imported          :: set(),
-	     vars              :: set(),
-	     functions         :: set(),
+	     used = sets:new() :: sets:set({atom(), arity()}),
+	     imported          :: sets:set({atom(), arity()}),
+	     vars              :: sets:set(atom()),
+	     functions         :: sets:set({atom(), arity()}),
 	     new_forms = []    :: [erl_syntax:syntaxTree()],
-	     rename            :: dict()}).
+	     rename            :: dict:dict(mfa(), {atom(), atom()})}).
 
 visit_used(Names, Defs, Roots, Imports, Module, Opts) ->
     File = proplists:get_value(file, Opts, ""),
diff --git a/lib/syntax_tools/src/igor.erl b/lib/syntax_tools/src/igor.erl
index d385c2b690..e6aff7b20a 100644
--- a/lib/syntax_tools/src/igor.erl
+++ b/lib/syntax_tools/src/igor.erl
@@ -14,7 +14,7 @@
 %% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 %% USA
 %%
-%% @copyright 1998-2006 Richard Carlsson
+%% @copyright 1998-2014 Richard Carlsson
 %% @author Richard Carlsson <[email protected]>
 %% @end
 %% =====================================================================
@@ -695,7 +695,7 @@ merge_files1(Files, Opts) ->
 		preserved  :: boolean(),
 		no_headers :: boolean(),
 		notes      :: notes(),
-		redirect   :: dict(),	% = dict(atom(), atom())
+		redirect   :: dict:dict(atom(), atom()),
 		no_imports :: ordsets:ordset(atom()),
 		options	   :: [option()]
 	       }).
@@ -727,7 +727,7 @@ merge_sources(Name, Sources, Opts) ->
 
 %% Data structure for keeping state during transformation.
 
--record(state, {export :: set()}).
+-record(state, {export :: sets:set(atom(), arity())}).
 
 state__add_export(Name, Arity, S) ->
     S#state{export = sets:add_element({Name, Arity},
@@ -1039,7 +1039,7 @@ make_stub(M, Map, Env) ->
 -type atts()      :: 'delete' | 'kill'.
 -type file_atts() :: 'delete' | 'keep' | 'kill'.
 
--record(filter, {records         :: set(),
+-record(filter, {records         :: sets:set(atom()),
 		 file_attributes :: file_atts(),
 		 attributes      :: atts()}).
 
@@ -1588,17 +1588,17 @@ alias_expansions_2(Modules, Table) ->
 
 -record(code, {module     :: atom(),
 	       target     :: atom(),
-	       sources    :: set(),	% set(atom()),
-	       static     :: set(),	% set(atom()),
-	       safe       :: set(),	% set(atom()),
+	       sources    :: sets:set(atom()),
+	       static     :: sets:set(atom()),
+	       safe       :: sets:set(atom()),
 	       preserved  :: boolean(),
 	       no_headers :: boolean(),
 	       notes      :: notes(),
 	       map        :: map_fun(),
 	       renaming   :: fun((atom()) -> map_fun()),
-	       expand     :: dict(),	% = dict({atom(), integer()},
-					%      {atom(), {atom(), integer()}})
-	       redirect	  :: dict()	% = dict(atom(), atom())
+	       expand     :: dict:dict({atom(), integer()},
+                                       {atom(), {atom(), integer()}}),
+	       redirect	  :: dict:dict(atom(), atom())
 	      }).
 
 %% `Trees' must be a list of syntax trees of type `form_list'. The
@@ -1803,20 +1803,25 @@ transform_rule(T, Env, St) ->
 
 transform_implicit_fun(T, Env, St) ->
     {T1, St1} = default_transform(T, Env, St),
-    F = erl_syntax_lib:analyze_implicit_fun(T1),
-    {V, Text} = case (Env#code.map)(F) of
-		    F ->
-			%% Not renamed
-			{none, []};
-		    {Atom, Arity} ->
-			%% Renamed
-			N = rewrite(
-			      erl_syntax:implicit_fun_name(T1),
-			      erl_syntax:arity_qualifier(
-				erl_syntax:atom(Atom),
-				erl_syntax:integer(Arity))),
-			T2 = erl_syntax:implicit_fun(N),
-			{{value, T2}, ["function was renamed"]}
+    {V, Text} = case erl_syntax:type(erl_syntax:implicit_fun_name(T1)) of
+		    arity_qualifier ->
+			F = erl_syntax_lib:analyze_implicit_fun(T1),
+			case (Env#code.map)(F) of
+			    F ->
+				%% Not renamed
+				{none, []};
+			    {Atom, Arity} ->
+				%% Renamed
+				N = rewrite(
+				      erl_syntax:implicit_fun_name(T1),
+				      erl_syntax:arity_qualifier(
+					erl_syntax:atom(Atom),
+					erl_syntax:integer(Arity))),
+				T2 = erl_syntax:implicit_fun(N),
+				{{value, T2}, ["function was renamed"]}
+			end;
+		    module_qualifier ->
+			{none, []}
 		end,
     {maybe_modified_quiet(V, T1, 2, Text, Env), St1}.
 
diff --git a/lib/syntax_tools/src/syntax_tools.appup.src b/lib/syntax_tools/src/syntax_tools.appup.src
index 54a63833e6..89c25d14d7 100644
--- a/lib/syntax_tools/src/syntax_tools.appup.src
+++ b/lib/syntax_tools/src/syntax_tools.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, syntax_tools}]}],
+ [{<<".*">>,[{restart_application, syntax_tools}]}]
+}.
diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl
index fd381f0b25..d4c54a72aa 100644
--- a/lib/syntax_tools/test/syntax_tools_SUITE.erl
+++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl
@@ -24,12 +24,12 @@
 	 init_per_group/2,end_per_group/2]).
 
 %% Test cases
--export([smoke_test/1]).
+-export([app_test/1,appup_test/1,smoke_test/1,revert/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [smoke_test].
+    [app_test,appup_test,smoke_test,revert].
 
 groups() -> 
     [].
@@ -46,6 +46,11 @@ init_per_group(_GroupName, Config) ->
 end_per_group(_GroupName, Config) ->
     Config.
 
+app_test(Config) when is_list(Config) ->
+    ok = ?t:app_test(syntax_tools).
+
+appup_test(Config) when is_list(Config) ->
+    ok = ?t:appup_test(syntax_tools).
 
 %% Read and parse all source in the OTP release.
 smoke_test(Config) when is_list(Config) ->
@@ -73,12 +78,37 @@ print_error_markers(F, File) ->
     case erl_syntax:type(F) of
 	error_marker ->
 	    {L,M,Info} = erl_syntax:error_marker_info(F),
-	    io:format("~s:~p: ~s", [File,L,M:format_error(Info)]);
+	    io:format("~ts:~p: ~s", [File,L,M:format_error(Info)]);
 	_ ->
 	    ok
     end.
     
 
+%% Read with erl_parse, wrap and revert with erl_syntax and check for equality.
+revert(Config) when is_list(Config) ->
+    Dog = ?t:timetrap(?t:minutes(12)),
+    Wc = filename:join([code:lib_dir("stdlib"),"src","*.erl"]),
+    Fs = filelib:wildcard(Wc),
+    Path = [filename:join(code:lib_dir(stdlib), "include"),
+            filename:join(code:lib_dir(kernel), "include")],
+    io:format("~p files\n", [length(Fs)]),
+    case p_run(fun (File) -> revert_file(File, Path) end, Fs) of
+        0 -> ok;
+        N -> ?line ?t:fail({N,errors})
+        end,
+    ?line ?t:timetrap_cancel(Dog).
+
+revert_file(File, Path) ->
+    case epp:parse_file(File, Path, []) of
+        {ok,Fs0} ->
+            Fs1 = erl_syntax:form_list(Fs0),
+            Fs2 = erl_syntax_lib:map(fun (Node) -> Node end, Fs1),
+            Fs3 = erl_syntax:form_list_elements(Fs2),
+            Fs4 = [ erl_syntax:revert(Form) || Form <- Fs3 ],
+            {ok,_} = compile:forms(Fs4, [report,strong_validation]),
+            ok
+    end.
+
 p_run(Test, List) ->
     N = erlang:system_info(schedulers),
     p_run_loop(Test, List, N, [], 0).
diff --git a/lib/syntax_tools/vsn.mk b/lib/syntax_tools/vsn.mk
index 01569687bf..26153a55f1 100644
--- a/lib/syntax_tools/vsn.mk
+++ b/lib/syntax_tools/vsn.mk
@@ -1 +1 @@
-SYNTAX_TOOLS_VSN = 1.6.11
+SYNTAX_TOOLS_VSN = 1.6.13
diff --git a/lib/test_server/doc/src/basics_chapter.xml b/lib/test_server/doc/src/basics_chapter.xml
index 2e60d412e9..eba24615cb 100644
--- a/lib/test_server/doc/src/basics_chapter.xml
+++ b/lib/test_server/doc/src/basics_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/test_server/doc/src/book.xml b/lib/test_server/doc/src/book.xml
index 960ce48cf7..006a2f167d 100644
--- a/lib/test_server/doc/src/book.xml
+++ b/lib/test_server/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/test_server/doc/src/example_chapter.xml b/lib/test_server/doc/src/example_chapter.xml
index 8a06526528..0ebc85da09 100644
--- a/lib/test_server/doc/src/example_chapter.xml
+++ b/lib/test_server/doc/src/example_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/test_server/doc/src/fascicules.xml b/lib/test_server/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/test_server/doc/src/fascicules.xml
+++ b/lib/test_server/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/test_server/doc/src/notes.xml b/lib/test_server/doc/src/notes.xml
index c6c166c796..d05626094a 100644
--- a/lib/test_server/doc/src/notes.xml
+++ b/lib/test_server/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -32,6 +32,110 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Test_Server 3.6.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The way Common Test handles skipping of test cases has
+	    been updated. In previous versions, returning
+	    <c>{skip,Reason}</c> from a configuration function (such
+	    as init_per_suite or init_per_group), resulted in all
+	    affected test cases getting skipped with status
+	    <c>auto_skipped</c>. This was inappropriate, since this
+	    status is supposed to be used to inform that Common Test
+	    has taken the initiative to skip something (e.g. a test
+	    case group if init_per_group failed). Therefore, in this
+	    version of Common Test, whenever the user skips a suite,
+	    group, or individual test case (by means of a
+	    configuration function or test specification term), the
+	    affected test cases get the status <c>user_skipped</c>
+	    instead.</p> <p>This update has meant a few changes that
+	    may affect Common Test users in various ways: <list>
+	    <item>The test results and statistics will be affected,
+	    which is important to know when running regression tests
+	    and comparing results to previous test runs.</item>
+	    <item>Users that read or parse the textual log file
+	    <c>suite.log</c> will notice that an auto skipped
+	    function is now reported as <c>auto_skipped</c> rather
+	    than <c>skipped</c> as before.</item> <item>When
+	    <c>require</c> fails in an info function (such as suite/0
+	    or group/1), all affected configuration functions and
+	    test cases are marked as <c>auto_skipped</c>.</item>
+	    <item>If Common Test detects an error in the test suite
+	    (such as e.g. an invalid all/0 function), all affected
+	    configuration functions and test cases are marked as
+	    <c>auto_skipped</c>.</item> <item>If a repeated test run
+	    session reaches a deadline with <c>force_stop</c>
+	    enabled, all remaining test cases are marked as
+	    <c>auto_skipped</c> rather than <c>user_skipped</c> as
+	    before.</item> <item>The event messages that Common Test
+	    generates during test runs have been affected by this
+	    update. For details see OTP-11524.</item> </list> </p>
+          <p>
+	    Own Id: OTP-11305 Aux Id: OTP-11524 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Test_Server 3.6.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Test Server installed an error handler (test_server_h)
+	    only to be able to write the name of the current test
+	    case to stdout whenever it received an error- or progress
+	    report. This functionality was not useful and has been
+	    removed. The built-in Common Test hook, cth_log_redirect,
+	    has instead been improved to now also tag all error- and
+	    progress reports in the log with suite-, group-, and/or
+	    test case name.</p>
+          <p>
+	    Own Id: OTP-11263 Aux Id: seq12251 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    A new log, the "Pre- and Post Test I/O Log", has been
+	    introduced, which makes it possible to capture error- and
+	    progress reports, as well as printouts made with ct:log/2
+	    and ct:pal/2, before and after a test run. (Some minor
+	    improvements of the logging system have been made at the
+	    same time). Links to the new log are found on the Common
+	    Test Framework Log page. The Common Test User's Guide has
+	    been updated with information about the new log and also
+	    with a new section on how to synchronize external
+	    applications with Common Test by means of the CT Hook
+	    init and terminate functions.</p>
+          <p>
+	    Own Id: OTP-11272</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Known Bugs and Problems</title>
+      <list>
+        <item>
+          <p>
+	    Test Server: Report auto_skipped in major log.</p>
+          <p>
+	    Own Id: OTP-11297</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Test_Server 3.6.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/test_server/doc/src/notes_history.xml b/lib/test_server/doc/src/notes_history.xml
index 0392bd74a2..898717cbf0 100644
--- a/lib/test_server/doc/src/notes_history.xml
+++ b/lib/test_server/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/test_server/doc/src/part.xml b/lib/test_server/doc/src/part.xml
index a20835e035..43693ff9cb 100644
--- a/lib/test_server/doc/src/part.xml
+++ b/lib/test_server/doc/src/part.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/lib/test_server/doc/src/part_notes.xml b/lib/test_server/doc/src/part_notes.xml
index abf949dfda..e0656942cd 100644
--- a/lib/test_server/doc/src/part_notes.xml
+++ b/lib/test_server/doc/src/part_notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/lib/test_server/doc/src/part_notes_history.xml b/lib/test_server/doc/src/part_notes_history.xml
index 4746f583b9..d3ff49830f 100644
--- a/lib/test_server/doc/src/part_notes_history.xml
+++ b/lib/test_server/doc/src/part_notes_history.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
diff --git a/lib/test_server/doc/src/ref_man.xml b/lib/test_server/doc/src/ref_man.xml
index ca0b38e0c8..cc0e7eaf5c 100644
--- a/lib/test_server/doc/src/ref_man.xml
+++ b/lib/test_server/doc/src/ref_man.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
diff --git a/lib/test_server/doc/src/run_test_chapter.xml b/lib/test_server/doc/src/run_test_chapter.xml
index 36bd41da1f..35344255d4 100644
--- a/lib/test_server/doc/src/run_test_chapter.xml
+++ b/lib/test_server/doc/src/run_test_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/test_server/doc/src/test_server.xml b/lib/test_server/doc/src/test_server.xml
index 5ef43dd628..ed5569e1fe 100644
--- a/lib/test_server/doc/src/test_server.xml
+++ b/lib/test_server/doc/src/test_server.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
@@ -625,6 +625,31 @@ Only valid for peer nodes. Note that slave nodes always
       </desc>
     </func>
     <func>
+      <name>appup_test(App) -> ok | test_server:fail()</name>
+      <fsummary>Checks an applications .appup file for obvious errors</fsummary>
+      <type>
+        <v>App = term()</v>
+        <d>The name of the application to test</d>
+      </type>
+      <desc>
+        <p>Checks an applications .appup file for obvious errors.
+          The following is checked:
+          </p>
+        <list type="bulleted">
+          <item>syntax
+          </item>
+          <item>that .app file version and .appup file version match
+          </item>
+          <item>for non-library applications: validity of high-level upgrade
+           instructions, specifying no instructions is explicitly allowed
+           (in this case the application is not upgradeable)</item>
+          <item>for library applications: that there is exactly one wildcard
+           regexp clause restarting the application when upgrading or
+           downgrading from any version</item>
+        </list>
+      </desc>
+    </func>
+    <func>
       <name>comment(Comment) -> ok</name>
       <fsummary>Print a comment on the HTML result page</fsummary>
       <type>
diff --git a/lib/test_server/doc/src/test_server_app.xml b/lib/test_server/doc/src/test_server_app.xml
index ea4b5ffecf..e5481495a2 100644
--- a/lib/test_server/doc/src/test_server_app.xml
+++ b/lib/test_server/doc/src/test_server_app.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE appref SYSTEM "appref.dtd">
 
 <appref>
diff --git a/lib/test_server/doc/src/test_server_ctrl.xml b/lib/test_server/doc/src/test_server_ctrl.xml
index 9252cdce4f..f4aae724e0 100644
--- a/lib/test_server/doc/src/test_server_ctrl.xml
+++ b/lib/test_server/doc/src/test_server_ctrl.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/test_server/doc/src/test_spec_chapter.xml b/lib/test_server/doc/src/test_spec_chapter.xml
index c197e03bed..342f772f0b 100644
--- a/lib/test_server/doc/src/test_spec_chapter.xml
+++ b/lib/test_server/doc/src/test_spec_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
index 82ba3a5017..bd5a3cbaa3 100644
--- a/lib/test_server/doc/src/ts.xml
+++ b/lib/test_server/doc/src/ts.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2007</year>
-      <year>2012</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/test_server/doc/src/why_test_chapter.xml b/lib/test_server/doc/src/why_test_chapter.xml
index 745d4218f1..9b0ffc6f12 100644
--- a/lib/test_server/doc/src/why_test_chapter.xml
+++ b/lib/test_server/doc/src/why_test_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/test_server/doc/src/write_framework_chapter.xml b/lib/test_server/doc/src/write_framework_chapter.xml
index 5c1c657d9e..3a6fda9610 100644
--- a/lib/test_server/doc/src/write_framework_chapter.xml
+++ b/lib/test_server/doc/src/write_framework_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/test_server/doc/src/write_test_chapter.xml b/lib/test_server/doc/src/write_test_chapter.xml
index 086ed2a18d..ce7f76549d 100644
--- a/lib/test_server/doc/src/write_test_chapter.xml
+++ b/lib/test_server/doc/src/write_test_chapter.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile
index ebc5f5b71b..ab4dd4d95d 100644
--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
@@ -45,7 +45,6 @@ MODULES= test_server_ctrl \
 	 test_server_node \
 	 test_server \
 	 test_server_sup \
-	 test_server_h \
 	 erl2html2
 
 TS_MODULES= \
diff --git a/lib/test_server/src/configure.in b/lib/test_server/src/configure.in
index 3815027721..cd723bcd4d 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-2013. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2014. 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
@@ -38,6 +38,35 @@ AC_ARG_ENABLE(debug-mode,
     *)  CFLAGS=$DEBUG_FLAGS ;;
   esac ], )
 
+AC_ARG_ENABLE(m64-build,
+AS_HELP_STRING([--enable-m64-build],
+               [build 64-bit binaries using the -m64 flag to (g)cc]),
+[ case "$enableval" in
+    no) enable_m64_build=no ;;
+    *)  enable_m64_build=yes ;;
+  esac
+],enable_m64_build=no)
+
+AC_ARG_ENABLE(m32-build,
+AS_HELP_STRING([--enable-m32-build],
+               [build 32-bit binaries using the -m32 flag to (g)cc]),
+[ case "$enableval" in
+    no) enable_m32_build=no ;;
+    *)  enable_m32_build=yes ;;
+  esac
+],enable_m32_build=no)
+
+no_mXX_LDFLAGS="$LDFLAGS"
+
+if test X${enable_m64_build} = Xyes; then
+	CFLAGS="-m64 $CFLAGS"
+	LDFLAGS="-m64 $LDFLAGS"
+fi
+if test X${enable_m32_build} = Xyes; then
+	CFLAGS="-m32 $CFLAGS"
+	LDFLAGS="-m32 $LDFLAGS"
+fi
+
 AC_CHECK_LIB(m, sin)
 
 #--------------------------------------------------------------------
@@ -132,21 +161,56 @@ case $system in
 	    AC_CHECK_HEADER(dld.h, [
 		SHLIB_LD="ld"
 		SHLIB_LDFLAGS="-shared"])
+	    if test X${enable_m64_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
+	    fi
+	    if test X${enable_m32_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	    fi
 	fi
 	SHLIB_EXTRACT_ALL=""
 	;;
-    *-netbsd*|*-freebsd*|*-openbsd*|*-dragonfly*)
+    *-openbsd*)
+	# Not available on all versions:  check for include file.
+	AC_CHECK_HEADER(dlfcn.h, [
+	    SHLIB_CFLAGS="-fpic"
+	    SHLIB_LD="${CC}"
+	    SHLIB_LDFLAGS="$LDFLAGS -shared"
+	    SHLIB_SUFFIX=".so"
+	    if test X${enable_m64_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
+	    fi
+	    if test X${enable_m32_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	    fi
+	], [
+	    # No dynamic loading.
+	    SHLIB_CFLAGS=""
+	    SHLIB_LD="ld"
+	    SHLIB_LDFLAGS=""
+	    SHLIB_SUFFIX=""
+	    AC_MSG_ERROR(don't know how to compile and link dynamic drivers)
+	])
+	SHLIB_EXTRACT_ALL=""
+	;;
+    *-netbsd*|*-freebsd*|*-dragonfly*)
 	# Not available on all versions:  check for include file.
 	AC_CHECK_HEADER(dlfcn.h, [
 	    SHLIB_CFLAGS="-fpic"
 	    SHLIB_LD="ld"
 	    SHLIB_LDFLAGS="$LDFLAGS -Bshareable -x"
 	    SHLIB_SUFFIX=".so"
+	    if test X${enable_m64_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
+	    fi
+	    if test X${enable_m32_build} = Xyes; then
+	        AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	    fi
 	], [
 	    # No dynamic loading.
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld"
-	    SHLIB_LDFLAGS="$LDFLAGS"
+	    SHLIB_LDFLAGS=""
 	    SHLIB_SUFFIX=""
 	    AC_MSG_ERROR(don't know how to compile and link dynamic drivers)
 	])
@@ -155,7 +219,13 @@ case $system in
     *-solaris2*|*-sysv4*)
 	SHLIB_CFLAGS="-KPIC"
 	SHLIB_LD="/usr/ccs/bin/ld"
-	SHLIB_LDFLAGS="$LDFLAGS -G -z text"
+	SHLIB_LDFLAGS="$no_mXX_LDFLAGS -G -z text"
+	if test X${enable_m64_build} = Xyes; then
+	   SHLIB_LDFLAGS="-64 $SHLIB_LDFLAGS"
+	fi
+	if test X${enable_m32_build} = Xyes; then
+	   AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	fi
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL="-z allextract"
 	;;
@@ -170,6 +240,12 @@ case $system in
 	SHLIB_CFLAGS="-fPIC"
 	SHLIB_LD="ld"
 	SHLIB_LDFLAGS="$LDFLAGS -shared"
+	if test X${enable_m64_build} = Xyes; then
+	   AC_MSG_ERROR(don't know how to link 64-bit dynamic drivers)
+	fi
+	if test X${enable_m32_build} = Xyes; then
+	   AC_MSG_ERROR(don't know how to link 32-bit dynamic drivers)
+	fi
 	SHLIB_SUFFIX=".so"
 	SHLIB_EXTRACT_ALL=""
 	;;
diff --git a/lib/test_server/src/erl2html2.erl b/lib/test_server/src/erl2html2.erl
index d0f40c47a7..952036502a 100644
--- a/lib/test_server/src/erl2html2.erl
+++ b/lib/test_server/src/erl2html2.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
diff --git a/lib/test_server/src/test_server.app.src b/lib/test_server/src/test_server.app.src
index 163f370a47..42e78ed279 100644
--- a/lib/test_server/src/test_server.app.src
+++ b/lib/test_server/src/test_server.app.src
@@ -23,7 +23,6 @@
 	     erl2html2,
 	     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.appup.src b/lib/test_server/src/test_server.appup.src
index 0fbe5f23f7..42c6fe2e46 100644
--- a/lib/test_server/src/test_server.appup.src
+++ b/lib/test_server/src/test_server.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
\ No newline at end of file
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, test_server}]}],
+ [{<<".*">>,[{restart_application, test_server}]}]
+}.
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index c350f758ce..82672521f7 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -40,7 +40,7 @@
 -export([call_crash/3,call_crash/4,call_crash/5]).
 -export([temp_name/1]).
 -export([start_node/3, stop_node/1, wait_for_node/1, is_release_available/1]).
--export([app_test/1, app_test/2]).
+-export([app_test/1, app_test/2, appup_test/1]).
 -export([is_native/1]).
 -export([comment/1, make_priv_dir/0]).
 -export([os_type/0]).
@@ -176,8 +176,6 @@ module_names(Beams) ->
 do_cover_compile(Modules) ->
     do_cover_compile1(lists:usort(Modules)). % remove duplicates
 
-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
 	{true,_} ->
@@ -389,7 +387,6 @@ run_test_case_apply({CaseNum,Mod,Func,Args,Name,
 	    os:putenv("VALGRIND_LOGFILE_INFIX",atom_to_list(Mod)++"."++
 		      atom_to_list(Func)++"-")
     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),
@@ -406,6 +403,7 @@ run_test_case_apply({CaseNum,Mod,Func,Args,Name,
 	  ref :: reference(),
 	  pid :: pid(),
 	  mf :: {atom(),atom()},
+	  last_known_loc :: term(),
 	  status :: tc_status() | 'undefined',
 	  ret_val :: term(),
 	  comment :: list(char()),
@@ -437,8 +435,9 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
 				     LogOpts, TCCallback)
 	  end),
     put(test_server_detected_fail, []),
-    St = #st{ref=Ref,pid=Pid,mf={Mod,Func},status=starting,ret_val=[],
-	     comment="",timeout=infinity,config=hd(Args)},
+    St = #st{ref=Ref,pid=Pid,mf={Mod,Func},last_known_loc=unknown,
+	     status=starting,ret_val=[],comment="",timeout=infinity,
+	     config=hd(Args)},
     run_test_case_msgloop(St).
 
 %% Ugly bug (pre R5A):
@@ -538,7 +537,22 @@ run_test_case_msgloop(#st{ref=Ref,pid=Pid,end_conf_pid=EndConfPid0}=St0) ->
 	    St = setup_termination(RetVal, St0#st{config=undefined}),
 	    run_test_case_msgloop(St);
 	{'EXIT',Pid,Reason} ->
-	    St = handle_tc_exit(Reason, St0),
+	    %% This exit typically happens when an unknown external process
+	    %% has caused a test case process to terminate (e.g. if a linked
+	    %% process has crashed).
+	    St =
+		case Reason of
+		    {What,[Loc0={_M,_F,A,[{file,_}|_]}|_]} when 
+			  is_integer(A) ->
+			Loc = rewrite_loc_item(Loc0),
+			handle_tc_exit(What, St0#st{last_known_loc=[Loc]});
+		    {What,[Details,Loc0={_M,_F,A,[{file,_}|_]}|_]} when
+			  is_integer(A) ->
+			Loc = rewrite_loc_item(Loc0),
+			handle_tc_exit({What,Details}, St0#st{last_known_loc=[Loc]});
+		    _ ->
+			handle_tc_exit(Reason, St0)
+		end,
 	    run_test_case_msgloop(St);
 	{EndConfPid0,{call_end_conf,Data,_Result}} ->
 	    #st{mf={Mod,Func},config=CurrConf} = St0,
@@ -696,7 +710,7 @@ handle_tc_exit(Reason, #st{config=Config,mf={Mod,Func0},pid=Pid,
 		   {testcase_aborted=E,AbortReason,Loc0} ->
 		       {{E,AbortReason},Loc0};
 		   Other ->
-		       {Other,unknown}
+		       {Other,St#st.last_known_loc}
 	       end,
     Func = case Status of
 	       init_per_testcase=F -> {F,Func0};
@@ -838,9 +852,13 @@ spawn_fw_call(FwMod,FwFunc,_,_Pid,{framework_error,FwError},_,SendTo) ->
     spawn_link(FwCall);
 
 spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
+    Func1 = case Func of
+		{_InitOrEndPerTC,F} -> F;
+		F -> F
+	    end,
     FwCall =
 	fun() ->
-		case catch fw_error_notify(Mod,Func,[],
+		case catch fw_error_notify(Mod,Func1,[],
 					   Error,Loc) of
 		    {'EXIT',FwErrorNotifyErr} ->
 			exit({fw_notify_done,error_notification,
@@ -848,8 +866,8 @@ spawn_fw_call(Mod,Func,CurrConf,Pid,Error,Loc,SendTo) ->
 		    _ ->
 			ok
 		end,
-		Conf = [{tc_status,{failed,timetrap_timeout}}|CurrConf],
-		case catch do_end_tc_call(Mod,Func,
+		Conf = [{tc_status,{failed,Error}}|CurrConf],
+		case catch do_end_tc_call(Mod,Func1,
 					  {Pid,Error,[Conf]},Error) of
 		    {'EXIT',FwEndTCErr} ->
 			exit({fw_notify_done,end_tc,FwEndTCErr});
@@ -916,6 +934,7 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
     put(test_server_logopts, LogOpts),
     Where = [{Mod,Func}],
     put(test_server_loc, Where),
+
     FWInitResult = test_server_sup:framework_call(init_tc,[Mod,Func,Args0],
 						  {ok,Args0}),
     set_tc_state(running),
@@ -925,7 +944,7 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
 		run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback);
 	    Error = {error,_Reason} ->
 		NewResult = do_end_tc_call(Mod,Func, {Error,Args0},
-					   {skip,{failed,Error}}),
+					   {auto_skip,{failed,Error}}),
 		{{0,NewResult},Where,[]};
 	    {fail,Reason} ->
 		Conf = [{tc_status,{failed,Reason}} | hd(Args0)],
@@ -936,9 +955,9 @@ run_test_case_eval(Mod, Func, Args0, Name, Ref, RunInit,
 	    Skip = {skip,_Reason} ->
 		NewResult = do_end_tc_call(Mod,Func, {Skip,Args0}, Skip),
 		{{0,NewResult},Where,[]};
-	    {auto_skip,Reason} ->
-		NewResult = do_end_tc_call(Mod,Func, {{skip,Reason},Args0},
-					   {skip,Reason}),
+	    AutoSkip = {auto_skip,_Reason} ->
+		%% special case where a conf case "pretends" to be skipped
+		NewResult = do_end_tc_call(Mod,Func, {AutoSkip,Args0}, AutoSkip),
 		{{0,NewResult},Where,[]}
 	end,
     exit({Ref,Time,Value,Loc,Opts}).
@@ -956,7 +975,8 @@ run_test_case_eval1(Mod, Func, Args, Name, RunInit, TCCallback) ->
 		    {{0,NewRes},Line,[]};
 		{skip_and_save,Reason,SaveCfg} ->
 		    Line = get_loc(),
-		    Conf = [{tc_status,{skipped,Reason}},{save_config,SaveCfg}|hd(Args)],
+		    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,[]};
@@ -2428,8 +2448,11 @@ app_test(App) ->
 app_test(App, Mode) ->
     test_server_sup:app_test(App, Mode).
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% appup_test/1
+%%
+appup_test(App) ->
+    test_server_sup:appup_test(App).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% is_native(Mod) -> true | false
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index ffa21d054c..dcf905db24 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -479,12 +479,6 @@ init([]) ->
 	    test_server_sup:call_trace(TraceSpec)
     end,
     process_flag(trap_exit, true),
-    case lists:keysearch(sasl, 1, application:which_applications()) of
-	{value,_} ->
-	    test_server_h:install();
-	false ->
-	    ok
-    end,
     %% copy format_exception setting from init arg to application environment
     case init:get_argument(test_server_format_exception) of
 	{ok,[[TSFE]]} ->
@@ -493,6 +487,7 @@ init([]) ->
 	    ok
     end,
     test_server_sup:cleanup_crash_dumps(),
+    test_server_sup:util_start(),
     State = #state{jobs=[],finish=false},
     TI0 = test_server:init_target_info(),
     TargetHost = test_server_sup:hoststr(),
@@ -1061,18 +1056,13 @@ handle_info(_, State) ->
 %% test suites (if any) and any possible remainting slave node
 
 terminate(_Reason, State) ->
+    test_server_sup:util_stop(),
     case State#state.trc of
 	false -> ok;
 	Sock -> test_server_node:stop_tracer_node(Sock)
     end,
     kill_all_jobs(State#state.jobs),
     test_server_node:kill_nodes(),
-    case lists:keysearch(sasl, 1, application:which_applications()) of
-	{value,_} ->
-	    test_server_h:restore();
-	_ ->
-	    ok
-    end,
     ok.
 
 kill_all_jobs([{_Name,JobPid}|Jobs]) ->
@@ -1173,8 +1163,11 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
 	end,
     {SkippedN,SkipStr} =
 	case get(test_server_skipped) of
-	    {0,_} -> {0,""};
-	    {Skipped,_} -> {Skipped,io_lib:format(", ~w Skipped", [Skipped])}
+	    {0,0} -> 
+		{0,""};
+	    {USkipped,ASkipped} ->
+		Skipped = USkipped+ASkipped,
+		{Skipped,io_lib:format(", ~w Skipped", [Skipped])}
 	end,
     OkN = get(test_server_ok),
     FailedN = get(test_server_failed),
@@ -1183,7 +1176,13 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
 	  "<td>~.3fs</td><td><b>~ts</b></td><td>~w Ok, ~w Failed~ts of ~w</td></tr>\n"
 	  "</tfoot>\n",
 	  [Time,SuccessStr,OkN,FailedN,SkipStr,OkN+FailedN+SkippedN]),
-    test_server_io:stop([major,html,unexpected_io]).
+
+    test_server_io:stop([major,html,unexpected_io]),
+    {UnexpectedIoName,UnexpectedIoFooter} = get(test_server_unexpected_footer),
+    {ok,UnexpectedIoFd} = open_html_file(UnexpectedIoName, [append]),
+    io:put_chars(UnexpectedIoFd, "\n</pre>\n"++UnexpectedIoFooter),
+    file:close(UnexpectedIoFd),
+    ok.
 
 report_severe_error(Reason) ->
     test_server_sup:framework_call(report, [severe_error,Reason]).
@@ -1408,10 +1407,23 @@ remove_conf([{conf, _Ref, Props, _MF}|Cases], NoConf, Repeats) ->
     end;
 remove_conf([{make,_Ref,_MF}|Cases], NoConf, Repeats) ->
     remove_conf(Cases, NoConf, Repeats);
+remove_conf([{skip_case,{{_M,all},_Cmt}}|Cases], NoConf, Repeats) ->
+    remove_conf(Cases, NoConf, Repeats);
 remove_conf([{skip_case,{Type,_Ref,_MF,_Cmt}}|Cases],
 	    NoConf, Repeats) when Type==conf;
 				   Type==make ->
     remove_conf(Cases, NoConf, Repeats);
+remove_conf([{skip_case,{Type,_Ref,_MF,_Cmt},_Mode}|Cases],
+	    NoConf, Repeats) when Type==conf;
+				  Type==make ->
+    remove_conf(Cases, NoConf, Repeats);
+remove_conf([C={Mod,error_in_suite,_}|Cases], NoConf, Repeats) ->
+    FwMod = get_fw_mod(?MODULE),
+    if Mod == FwMod ->
+	    remove_conf(Cases, NoConf, Repeats);
+       true ->
+	    remove_conf(Cases, [C|NoConf], Repeats)
+    end;
 remove_conf([C|Cases], NoConf, Repeats) ->
     remove_conf(Cases, [C|NoConf], Repeats);
 remove_conf([], NoConf, true) ->
@@ -1419,6 +1431,11 @@ remove_conf([], NoConf, true) ->
 remove_conf([], NoConf, false) ->
     lists:reverse(NoConf).
 
+get_suites([{skip_case,{{Mod,_Func},_Cmt}}|Tests], Mods) when is_atom(Mod) ->
+    case add_mod(Mod, Mods) of
+	true ->  get_suites(Tests, [Mod|Mods]);
+	false -> get_suites(Tests, Mods)
+    end;
 get_suites([{Mod,_Case}|Tests], Mods) when is_atom(Mod) ->
     case add_mod(Mod, Mods) of
 	true ->  get_suites(Tests, [Mod|Mods]);
@@ -1484,8 +1501,10 @@ do_test_cases(TopCases, SkipCases,
 		end,
 	    put(test_server_cases, N),
 	    put(test_server_case_num, 0),
+
 	    TestSpec =
 		add_init_and_end_per_suite(TestSpec0, undefined, undefined, FwMod),
+
 	    TI = get_target_info(),
 	    print(1, "Starting test~ts",
 		  [print_if_known(N, {", ~w test cases",[N]},
@@ -1642,15 +1661,13 @@ start_log_file() ->
 		    FilenameMode),
     ok = write_file(?last_file, TestDir1 ++ "\n", FilenameMode),
     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} = open_utf8_file(MajorName),
     {ok,Html}  = open_html_file(HtmlName),
-    {ok,Unexpected}  = open_html_file(UnexpectedName),
-    test_server_io:set_fd(major, Major),
-    test_server_io:set_fd(html, Html),
-    test_server_io:set_fd(unexpected_io, Unexpected),
 
     {UnexpHeader,UnexpFooter} =
 	case test_server_sup:framework_call(get_html_wrapper,
@@ -1663,8 +1680,17 @@ start_log_file() ->
 	    {xhtml,UH,UF} ->
 		{UH,UF}
 	end,
-    io:put_chars(Unexpected, UnexpHeader++"\n<pre>\n"),
-    put(test_server_unexpected_footer,UnexpFooter),
+
+    {ok,Unexpected} = open_html_file(UnexpectedName),
+    io:put_chars(Unexpected, [UnexpHeader,			      
+			      xhtml("<br>\n<h2>Unexpected I/O</h2>",
+				    "<br />\n<h3>Unexpected I/O</h3>"),
+			      "\n<pre>\n"]),
+    put(test_server_unexpected_footer,{UnexpectedName,UnexpFooter}),
+
+    test_server_io:set_fd(major, Major),
+    test_server_io:set_fd(html, Html),
+    test_server_io:set_fd(unexpected_io, Unexpected),
 
     make_html_link(filename:absname(?last_test ++ ?html_ext),
 		   HtmlName, filename:basename(Dir)),
@@ -1701,30 +1727,33 @@ make_html_link(LinkName, Target, Explanation) ->
     ok = write_html_file(LinkName, H).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% start_minor_log_file(Mod, Func) -> AbsName
+%% start_minor_log_file(Mod, Func, ParallelTC) -> AbsName
 %% Mod = atom()
 %% Func = atom()
+%% ParallelTC = bool()
 %% AbsName = string()
 %%
 %% Create a minor log file for the test case Mod,Func,Args. The log file
-%% will be stored in the log directory under the name <Mod>.<Func>.log.
-%% Some header info will also be inserted into the log file.
+%% will be stored in the log directory under the name <Mod>.<Func>.html.
+%% Some header info will also be inserted into the log file. If the test
+%% case runs in a parallel group, then to avoid clashing file names if the
+%% case is executed more than once, the name <Mod>.<Func>.<Timestamp>.html
+%% is used.
 
-start_minor_log_file(Mod, Func) ->
+start_minor_log_file(Mod, Func, ParallelTC) ->
     MFA = {Mod,Func,1},
     LogDir = get(test_server_log_dir_base),
     Name0 = lists:flatten(io_lib:format("~w.~w~ts", [Mod,Func,?html_ext])),
     Name = downcase(Name0),
     AbsName = filename:join(LogDir, Name),
-    case file:read_file_info(AbsName) of
-	{error,_} ->                         %% normal case, unique name
+    case (ParallelTC orelse (element(1,file:read_file_info(AbsName))==ok)) of
+	false ->                           %% normal case, unique name
 	    start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA);
-	{ok,_} ->                            %% special case, duplicate names
-	    {_,S,Us} = now(),
+	true ->                            %% special case, duplicate names
+	    Tag = test_server_sup:unique_name(),
 	    Name1_0 =
-		lists:flatten(io_lib:format("~w.~w.~w.~w~ts", [Mod,Func,S,
-							       trunc(Us/1000),
-							       ?html_ext])),
+		lists:flatten(io_lib:format("~w.~w.~ts~ts", [Mod,Func,Tag,
+							      ?html_ext])),
 	    Name1 = downcase(Name1_0),
 	    AbsName1 = filename:join(LogDir, Name1),
 	    start_minor_log_file1(Mod, Func, LogDir, AbsName1, MFA)
@@ -1794,23 +1823,40 @@ downcase([], Result) ->
 %%
 %%  Errors are silently ignored.
 
-html_convert_modules(TestSpec, _Config) ->
-    Mods = html_isolate_modules(TestSpec),
+html_convert_modules(TestSpec, _Config, FwMod) ->
+    Mods = html_isolate_modules(TestSpec, FwMod),
     html_convert_modules(Mods),
     copy_html_files(get(test_server_dir), get(test_server_log_dir_base)).
 
 %% Retrieve a list of modules out of the test spec.
-html_isolate_modules(List) -> html_isolate_modules(List, sets:new()).
-
-html_isolate_modules([], Set) -> sets:to_list(Set);
-html_isolate_modules([{skip_case,_}|Cases], Set) ->
-    html_isolate_modules(Cases, Set);
-html_isolate_modules([{conf,_Ref,_Props,{Mod,_Func}}|Cases], Set) ->
-    html_isolate_modules(Cases, sets:add_element(Mod, Set));
-html_isolate_modules([{Mod,_Case}|Cases], Set) ->
-    html_isolate_modules(Cases, sets:add_element(Mod, Set));
-html_isolate_modules([{Mod,_Case,_Args}|Cases], Set) ->
-    html_isolate_modules(Cases, sets:add_element(Mod, Set)).
+html_isolate_modules(List, FwMod) ->
+    html_isolate_modules(List, sets:new(), FwMod).
+
+html_isolate_modules([], Set, _) -> sets:to_list(Set);
+html_isolate_modules([{skip_case,_}|Cases], Set, FwMod) ->
+    html_isolate_modules(Cases, Set, FwMod);
+html_isolate_modules([{conf,_Ref,Props,{FwMod,_Func}}|Cases], Set, FwMod) ->
+    Set1 = case proplists:get_value(suite, Props) of
+	       undefined -> Set;
+	       Mod -> sets:add_element(Mod, Set)
+	   end,
+    html_isolate_modules(Cases, Set1, FwMod);
+html_isolate_modules([{conf,_Ref,_Props,{Mod,_Func}}|Cases], Set, FwMod) ->
+    html_isolate_modules(Cases, sets:add_element(Mod, Set), FwMod);
+html_isolate_modules([{skip_case,{conf,_Ref,{FwMod,_Func},_Cmt},Mode}|Cases],
+		     Set, FwMod) ->
+    Set1 = case proplists:get_value(suite, get_props(Mode)) of
+	       undefined -> Set;
+	       Mod -> sets:add_element(Mod, Set)
+	   end,
+    html_isolate_modules(Cases, Set1, FwMod);
+html_isolate_modules([{skip_case,{conf,_Ref,{Mod,_Func},_Cmt},_Props}|Cases],
+		     Set, FwMod) ->
+    html_isolate_modules(Cases, sets:add_element(Mod, Set), FwMod);
+html_isolate_modules([{Mod,_Case}|Cases], Set, FwMod) ->
+    html_isolate_modules(Cases, sets:add_element(Mod, Set), FwMod);
+html_isolate_modules([{Mod,_Case,_Args}|Cases], Set, FwMod) ->
+    html_isolate_modules(Cases, sets:add_element(Mod, Set), FwMod).
 
 %% Given a list of modules, convert each module's source code to HTML.
 html_convert_modules([Mod|Mods]) ->
@@ -1901,13 +1947,16 @@ add_init_and_end_per_suite([{skip_case,{{Mod,_},_}}=Case|Cases], LastMod,
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([{skip_case,{conf,_,{Mod,_},_},_}=Case|Cases], LastMod,
+			   LastRef, FwMod) when Mod =/= LastMod ->
+    {PreCases, NextMod, NextRef} =
+	do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod),
+    PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
 add_init_and_end_per_suite([{skip_case,{conf,_,{Mod,_},_}}=Case|Cases], LastMod,
 			   LastRef, FwMod) when Mod =/= LastMod ->
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
-add_init_and_end_per_suite([{skip_case,_}=Case|Cases], LastMod, LastRef, FwMod) ->
-    [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
 add_init_and_end_per_suite([{conf,Ref,Props,{FwMod,Func}}=Case|Cases], LastMod,
 			   LastRef, FwMod) ->
     %% if Mod == FwMod, this conf test is (probably) a test case group where
@@ -1917,7 +1966,8 @@ add_init_and_end_per_suite([{conf,Ref,Props,{FwMod,Func}}=Case|Cases], LastMod,
 	Suite when Suite =/= undefined, Suite =/= LastMod ->
 	    {PreCases, NextMod, NextRef} =
 		do_add_init_and_end_per_suite(LastMod, LastRef, Suite, FwMod),
-	    Case1 = {conf,Ref,proplists:delete(suite,Props),{FwMod,Func}},
+	    Case1 = {conf,Ref,[{suite,NextMod}|proplists:delete(suite,Props)],
+		     {FwMod,Func}},
 	    PreCases ++ [Case1|add_init_and_end_per_suite(Cases, NextMod,
 							  NextRef, FwMod)];
 	_ ->
@@ -1928,6 +1978,9 @@ add_init_and_end_per_suite([{conf,_,_,{Mod,_}}=Case|Cases], LastMod,
     {PreCases, NextMod, NextRef} =
 	do_add_init_and_end_per_suite(LastMod, LastRef, Mod, FwMod),
     PreCases ++ [Case|add_init_and_end_per_suite(Cases, NextMod, NextRef, FwMod)];
+add_init_and_end_per_suite([SkipCase|Cases], LastMod, LastRef, FwMod)
+  when element(1,SkipCase) == skip_case ->
+    [SkipCase|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
 add_init_and_end_per_suite([{conf,_,_,_}=Case|Cases], LastMod, LastRef, FwMod) ->
     [Case|add_init_and_end_per_suite(Cases, LastMod, LastRef, FwMod)];
 add_init_and_end_per_suite([{Mod,_}=Case|Cases], LastMod, LastRef, FwMod)
@@ -2042,7 +2095,8 @@ run_test_cases(TestSpec, Config, TimetrapData) ->
 	true ->
 	    ok;
 	false ->
-	    html_convert_modules(TestSpec, Config)
+	    FwMod = get_fw_mod(?MODULE),
+	    html_convert_modules(TestSpec, Config, FwMod)
     end,
 
     run_test_cases_loop(TestSpec, [Config], TimetrapData, [], []),
@@ -2208,34 +2262,50 @@ run_test_cases(TestSpec, Config, TimetrapData) ->
 %% group1_end                                              | --->
 %%
 
-run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
-		    Config, TimetrapData, Mode, Status) when Type==conf;
-							     Type==make ->
+run_test_cases_loop([{SkipTag,CaseData={Type,_Ref,_Case,_Comment}}|Cases],
+		    Config, TimetrapData, Mode, Status) when
+      ((SkipTag==auto_skip_case) or (SkipTag==skip_case)) and
+      ((Type==conf) or (Type==make)) ->
+    run_test_cases_loop([{SkipTag,CaseData,Mode}|Cases],
+			Config, TimetrapData, Mode, Status);
+
+run_test_cases_loop([{SkipTag,{Type,Ref,Case,Comment},SkipMode}|Cases],
+		    Config, TimetrapData, Mode, Status) when
+      ((SkipTag==auto_skip_case) or (SkipTag==skip_case)) and
+      ((Type==conf) or (Type==make)) ->
     file:set_cwd(filename:dirname(get(test_server_dir))),
     CurrIOHandler = get(test_server_common_io_handler),
     ParentMode = tl(Mode),
 
+    {AutoOrUser,ReportTag} = 
+	if SkipTag == auto_skip_case -> {auto,tc_auto_skip};
+	   SkipTag == skip_case      -> {user,tc_user_skip}
+	end,
+
     %% check and update the mode for test case execution and io msg handling
     case {curr_ref(Mode),check_props(parallel, Mode)} of
 	{Ref,Ref} ->
 	    case check_props(parallel, ParentMode) of
 		false ->
-		    %% this is a skipped end conf for a top level parallel group,
-		    %% buffered io can be flushed
+		    %% this is a skipped end conf for a top level parallel
+		    %% group, buffered io can be flushed
 		    handle_test_case_io_and_status(),
 		    set_io_buffering(undefined),
-		    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, false, SkipMode),
-		    test_server_sup:framework_call(report, [tc_auto_skip,
-							    {Mod,Func,Comment}]),
+		    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
+					   false, SkipMode),
+		    ConfData = {Mod,{Func,get_name(SkipMode)},Comment},
+		    test_server_sup:framework_call(report,
+						   [ReportTag,ConfData]),
 		    run_test_cases_loop(Cases, Config, TimetrapData, ParentMode,
 					delete_status(Ref, Status));
 		_ ->
-		    %% this is a skipped end conf for a parallel group nested under a
-		    %% parallel group (io buffering is active)
+		    %% this is a skipped end conf for a parallel group nested
+		    %% under a parallel group (io buffering is active)
 		    wait_for_cases(Ref),
-		    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
-		    test_server_sup:framework_call(report, [tc_auto_skip,
-							    {Mod,Func,Comment}]),
+		    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
+					   true, SkipMode),
+		    ConfData = {Mod,{Func,get_name(SkipMode)},Comment},
+		    test_server_sup:framework_call(report, [ReportTag,ConfData]),
 		    case CurrIOHandler of
 			{Ref,_} ->
 			    %% current_io_handler was set by start conf of this
@@ -2245,18 +2315,21 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 			_ ->
 			    ok
 		    end,
-		    run_test_cases_loop(Cases, Config, TimetrapData, ParentMode,
+		    run_test_cases_loop(Cases, Config,
+					TimetrapData, ParentMode,
 					delete_status(Ref, Status))
 	    end;
 	{Ref,false} ->
 	    %% this is a skipped end conf for a non-parallel group that's not
 	    %% nested under a parallel group
-	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, false, SkipMode),
-	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
-
-	    %% Check if this group is auto skipped because of error in the init conf.
-	    %% If so, check if the parent group is a sequence, and if it is, skip
-	    %% all proceeding tests in that group.
+	    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
+				   false, SkipMode),
+	    ConfData = {Mod,{Func,get_name(SkipMode)},Comment},
+	    test_server_sup:framework_call(report, [ReportTag,ConfData]),
+
+	    %% Check if this group is auto skipped because of error in the
+	    %% init conf. If so, check if the parent group is a sequence,
+	    %% and if it is, skip all proceeding tests in that group.
 	    GrName = get_name(Mode),
 	    Cases1 =
 		case get_tc_results(Status) of
@@ -2269,7 +2342,8 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 				    ParentRef ->
 					Reason = {group_result,GrName,failed},
 					skip_cases_upto(ParentRef, Cases,
-							Reason, tc, Mode)
+							Reason, tc, Mode,
+							SkipTag)
 				end;
 			    false ->
 				Cases
@@ -2282,8 +2356,10 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	{Ref,_} ->
 	    %% this is a skipped end conf for a non-parallel group nested under
 	    %% a parallel group (io buffering is active)
-	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
-	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
+	    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
+				   true, SkipMode),
+	    ConfData = {Mod,{Func,get_name(SkipMode)},Comment},
+	    test_server_sup:framework_call(report, [ReportTag,ConfData]),
 	    case CurrIOHandler of
 		{Ref,_} ->
 		    %% current_io_handler was set by start conf of this
@@ -2298,20 +2374,27 @@ run_test_cases_loop([{auto_skip_case,{Type,Ref,Case,Comment},SkipMode}|Cases],
 	{_,false} ->
 	    %% this is a skipped start conf for a group which is not nested
 	    %% under a parallel group
-	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, false, SkipMode),
-	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
-	    run_test_cases_loop(Cases, Config, TimetrapData, [conf(Ref,[])|Mode], Status);
+	    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
+				   false, SkipMode),
+	    ConfData = {Mod,{Func,get_name(SkipMode)},Comment},
+	    test_server_sup:framework_call(report, [ReportTag,ConfData]),
+	    run_test_cases_loop(Cases, Config, TimetrapData,
+				[conf(Ref,[])|Mode], Status);
 	{_,Ref0} when is_reference(Ref0) ->
-	    %% this is a skipped start conf for a group nested under a parallel group
-	    %% and if this is the first nested group, io buffering must be activated
+	    %% this is a skipped start conf for a group nested under a parallel
+	    %% group and if this is the first nested group, io buffering must
+	    %% be activated
 	    if CurrIOHandler == undefined ->
 		    set_io_buffering({Ref,self()});
 	       true ->
 		    ok
 	    end,
-	    {Mod,Func} = skip_case(auto, Ref, 0, Case, Comment, true, SkipMode),
-	    test_server_sup:framework_call(report, [tc_auto_skip,{Mod,Func,Comment}]),
-	    run_test_cases_loop(Cases, Config, TimetrapData, [conf(Ref,[])|Mode], Status)
+	    {Mod,Func} = skip_case(AutoOrUser, Ref, 0, Case, Comment,
+				   true, SkipMode),
+	    ConfData = {Mod,{Func,get_name(SkipMode)},Comment},
+	    test_server_sup:framework_call(report, [ReportTag,ConfData]),
+	    run_test_cases_loop(Cases, Config, TimetrapData,
+				[conf(Ref,[])|Mode], Status)
     end;
 
 run_test_cases_loop([{auto_skip_case,{Case,Comment},SkipMode}|Cases],
@@ -2322,21 +2405,12 @@ run_test_cases_loop([{auto_skip_case,{Case,Comment},SkipMode}|Cases],
     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],
+run_test_cases_loop([{skip_case,{{Mod,all}=Case,Comment}}|Cases],
 		    Config, TimetrapData, Mode, Status) ->
-    {Mod,Func} = skip_case(user, Ref, 0, Case, Comment, is_io_buffered()),
-    {Cases,Config1} =
-	case curr_ref(Mode) of
-	    Ref ->
-		%% skipped end conf
-		{Cases0,tl(Config)};
-	    _ ->
-		%% skipped start conf
-		{skip_cases_upto(Ref, Cases0, Comment, conf, Mode),Config}
-	end,
-    test_server_sup:framework_call(report, [tc_user_skip,{Mod,Func,Comment}]),
-    run_test_cases_loop(Cases, Config1, TimetrapData, Mode,
-			update_status(skipped, Mod, Func, Status));
+    skip_case(user, undefined, 0, Case, Comment, false, Mode),
+    test_server_sup:framework_call(report, [tc_user_skip,
+					    {Mod,all,Comment}]),
+    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status);
 
 run_test_cases_loop([{skip_case,{Case,Comment}}|Cases],
 		    Config, TimetrapData, Mode, Status) ->
@@ -2596,7 +2670,8 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 			  "~n*** ~w returned bad elements in Config: ~p.~n",
 			  [Func,Bad]),
 		    Reason = {failed,{Mod,init_per_suite,bad_return}},
-		    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
+		    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode,
+					     auto_skip_case),
 		    set_io_buffering(IOHandler),
 		    stop_minor_log_file(),
 		    run_test_cases_loop(Cases2, Config, TimetrapData, Mode,
@@ -2622,7 +2697,8 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 			print(minor, "~n*** ~w failed.~n"
 			      "    Skipping all cases.", [Func]),
 			Reason = {failed,{Mod,Func,Fail}},
-			{skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
+			{skip_cases_upto(Ref, Cases, Reason, conf, CurrMode,
+					 auto_skip_case),
 			 Config,
 			 update_status(failed, group_result, get_name(Mode),
 				       delete_status(Ref, Status2))};
@@ -2634,14 +2710,37 @@ 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);
+
+	{_,{auto_skip,SkipReason},_} ->
+	    %% this case can only happen if the framework (not the user)
+	    %% decides to skip execution of a conf function
+	    {Cases2,Config1,Status3} =
+		if StartConf ->
+			ReportAbortRepeat(auto_skipped),
+			print(minor, "~n*** ~w auto skipped.~n"
+			      "    Skipping all cases.", [Func]),
+			{skip_cases_upto(Ref, Cases, SkipReason, conf, CurrMode,
+					 auto_skip_case),
+			 Config,
+			 delete_status(Ref, Status2)};
+		   not StartConf ->
+			ReportRepeatStop(),
+			print_conf_time(ConfTime),
+			{Cases,tl(Config),delete_status(Ref, Status2)}
+		end,
+	    set_io_buffering(IOHandler),
+	    stop_minor_log_file(),
+	    run_test_cases_loop(Cases2, Config1, TimetrapData, Mode, Status3);
+
 	{_,{Skip,Reason},_} when StartConf and ((Skip==skip) or (Skip==skipped)) ->
 	    ReportAbortRepeat(skipped),
 	    print(minor, "~n*** ~w skipped.~n"
 		  "    Skipping all cases.", [Func]),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
-				Config, TimetrapData, Mode,
+	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf,
+						CurrMode, skip_case),
+				[hd(Config)|Config], TimetrapData, Mode,
 				delete_status(Ref, Status2));
 	{_,{skip_and_save,Reason,_SavedConfig},_} when StartConf ->
 	    ReportAbortRepeat(skipped),
@@ -2649,13 +2748,15 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 		  "    Skipping all cases.", [Func]),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
-				Config, TimetrapData, Mode,
+	    run_test_cases_loop(skip_cases_upto(Ref, Cases, Reason, conf,
+						CurrMode, skip_case),
+				[hd(Config)|Config], TimetrapData, Mode,
 				delete_status(Ref, Status2));
 	{_,_Other,_} when Func == init_per_suite ->
 	    print(minor, "~n*** init_per_suite failed to return a Config list.~n", []),
 	    Reason = {failed,{Mod,init_per_suite,bad_return}},
-	    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode),
+	    Cases2 = skip_cases_upto(Ref, Cases, Reason, conf, CurrMode,
+				     auto_skip_case),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
 	    run_test_cases_loop(Cases2, Config, TimetrapData, Mode,
@@ -2667,7 +2768,6 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    stop_minor_log_file(),
 	    run_test_cases_loop(Cases, [hd(Config)|Config], TimetrapData,
 				Mode, Status2);
-
 	{_,_EndConfRetVal,Opts} ->
 	    %% Check if return_group_result is set (ok, skipped or failed) and
 	    %% if so:
@@ -2682,7 +2782,8 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 			case {curr_ref(Mode),check_prop(sequence, Mode)} of
 			    {ParentRef,ParentRef} ->
 				Reason = {group_result,GrName,failed},
-				{skip_cases_upto(ParentRef, Cases, Reason, tc, Mode),
+				{skip_cases_upto(ParentRef, Cases, Reason, tc,
+						 Mode, auto_skip_case),
 				 update_status(failed, group_result, GrName,
 					       delete_status(Ref, Status2))};
 			    _ ->
@@ -2700,16 +2801,19 @@ run_test_cases_loop([{conf,Ref,Props,{Mod,Func}}|_Cases]=Cs0,
 	    ReportRepeatStop(),
 	    set_io_buffering(IOHandler),
 	    stop_minor_log_file(),
-	    run_test_cases_loop(Cases2, tl(Config), TimetrapData, Mode, Status3)
+	    run_test_cases_loop(Cases2, tl(Config), TimetrapData,
+				Mode, Status3)
     end;
 
-run_test_cases_loop([{make,Ref,{Mod,Func,Args}}|Cases0], Config, TimetrapData, Mode, Status) ->
+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, TimetrapData) of
 	{_,Why={'EXIT',_},_} ->
 	    print(minor, "~n*** ~w failed.~n"
  		  "    Skipping all cases.", [Func]),
 	    Reason = {failed,{Mod,Func,Why}},
-	    Cases = skip_cases_upto(Ref, Cases0, Reason, conf, Mode),
+	    Cases = skip_cases_upto(Ref, Cases0, Reason, conf, Mode,
+				    auto_skip_case),
 	    stop_minor_log_file(),
 	    run_test_cases_loop(Cases, Config, TimetrapData, Mode, Status);
 	{_,_Whatever,_} ->
@@ -2734,7 +2838,14 @@ run_test_cases_loop([{Mod,Case}|Cases], Config, TimetrapData, Mode, Status) ->
 			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),
+    {Num,RunInit} =
+	case FwMod = get_fw_mod(?MODULE) of
+	    Mod when Func == error_in_suite ->
+		{-1,skip_init};
+	    _ ->
+		{put(test_server_case_num, get(test_server_case_num)+1),
+		 run_init}
+	end,
 
     %% check the current execution mode and save info about the case if
     %% detected that printouts to common log files is handled later
@@ -2749,7 +2860,7 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
     end,
 
     case run_test_case(undefined, Num+1, Mod, Func, Args,
-		       run_init, TimetrapData, Mode) of
+		       RunInit, TimetrapData, Mode) of
 	%% callback to framework module failed, exit immediately
 	{_,{framework_error,{FwMod,FwFunc},Reason},_} ->
 	    print(minor, "~n*** ~w failed in ~w. Reason: ~p~n",
@@ -2790,7 +2901,8 @@ run_test_cases_loop([{Mod,Func,Args}|Cases], Config, TimetrapData, Mode, Status)
 				  "    Skipping all other cases in sequence.",
 				  [Func]),
 			    Reason = {failed,{Mod,Func}},
-			    Cases2 = skip_cases_upto(Ref, Cases, Reason, tc, Mode),
+			    Cases2 = skip_cases_upto(Ref, Cases, Reason, tc,
+						     Mode, auto_skip_case),
 			    stop_minor_log_file(),
 			    run_test_cases_loop(Cases2, Config, TimetrapData, Mode, Status1)
 		    end
@@ -3011,13 +3123,13 @@ cases_to_shuffle(Ref, Cases) ->
 
 cases_to_shuffle(Ref, [{conf,Ref,_,_} | _]=Cs, N, Ix) ->          % end
     {N-1,Ix,Cs};
-cases_to_shuffle(Ref, [{skip_case,{_,Ref,_,_}} | _]=Cs, N, Ix) -> % end
+cases_to_shuffle(Ref, [{skip_case,{_,Ref,_,_},_} | _]=Cs, N, Ix) -> % end
     {N-1,Ix,Cs};
 
 cases_to_shuffle(Ref, [{conf,Ref1,_,_}=C | Cs], N, Ix) ->          % nested group
     {Cs1,Rest} = get_subcases(Ref1, Cs, []),
     cases_to_shuffle(Ref, Rest, N+1, [{N,[C|Cs1]} | Ix]);
-cases_to_shuffle(Ref, [{skip_case,{_,Ref1,_,_}}=C | Cs], N, Ix) -> % nested group
+cases_to_shuffle(Ref, [{skip_case,{_,Ref1,_,_},_}=C | Cs], N, Ix) -> % nested group
     {Cs1,Rest} = get_subcases(Ref1, Cs, []),
     cases_to_shuffle(Ref, Rest, N+1, [{N,[C|Cs1]} | Ix]);
 
@@ -3026,7 +3138,7 @@ cases_to_shuffle(Ref, [C | Cs], N, Ix) ->
 
 get_subcases(SubRef, [{conf,SubRef,_,_}=C | Cs], SubCs) ->
     {lists:reverse([C|SubCs]),Cs};
-get_subcases(SubRef, [{skip_case,{_,SubRef,_,_}}=C | Cs], SubCs) ->
+get_subcases(SubRef, [{skip_case,{_,SubRef,_,_},_}=C | Cs], SubCs) ->
     {lists:reverse([C|SubCs]),Cs};
 get_subcases(SubRef, [C|Cs], SubCs) ->
     get_subcases(SubRef, Cs, [C|SubCs]).
@@ -3074,13 +3186,27 @@ skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
     ResultCol = if Type == auto -> ?auto_skip_color;
 		   Type == user -> ?user_skip_color
 		end,
-
-    Comment1 = reason_to_string(Comment),
-
     print(major, "~n=case          ~w:~w", [Mod,Func]),
-    print(major, "=started         ~s", [lists:flatten(timestamp_get(""))]),
-    print(major, "=result          skipped: ~ts", [Comment1]),
-    print(2,"*** Skipping test case #~w ~w ***", [CaseNum,{Mod,Func}]),
+    GroupName =	case get_name(Mode) of
+		    undefined ->
+			"";
+		    GrName ->
+			GrName1 = cast_to_list(GrName),
+			print(major, "=group_props   ~p", [[{name,GrName1}]]),
+			GrName1
+		end,
+    print(major, "=started       ~s", [lists:flatten(timestamp_get(""))]),
+    Comment1 = reason_to_string(Comment),
+    if Type == auto ->
+	    print(major, "=result        auto_skipped: ~ts", [Comment1]);
+       Type == user ->
+	    print(major, "=result        skipped: ~ts", [Comment1])
+    end,
+    if CaseNum == 0 ->
+	    print(2,"*** Skipping ~w ***", [{Mod,Func}]);
+       true ->
+	    print(2,"*** Skipping test case #~w ~w ***", [CaseNum,{Mod,Func}])
+    end,
     TR = xhtml("<tr valign=\"top\">", ["<tr class=\"",odd_or_even(),"\">"]),	       
     GroupName =	case get_name(Mode) of
 		    undefined -> "";
@@ -3096,6 +3222,7 @@ skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
 	  "<td><font color=\"~ts\">SKIPPED</font></td>"
 	  "<td>~ts</td></tr>\n",
 	  [num2str(CaseNum),fw_name(Mod),GroupName,Func,ResultCol,Comment1]),
+
     if CaseNum > 0 ->
 	    {US,AS} = get(test_server_skipped),
 	    case Type of
@@ -3109,12 +3236,14 @@ skip_case1(Type, CaseNum, Mod, Func, Comment, Mode) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% skip_cases_upto(Ref, Cases, Reason, Origin, Mode) -> Cases1
+%% skip_cases_upto(Ref, Cases, Reason, Origin, Mode, SkipType) -> Cases1
 %%
+%% SkipType = skip_case | auto_skip_case
 %% Mark all cases tagged with Ref as skipped.
 
-skip_cases_upto(Ref, Cases, Reason, Origin, Mode) ->
-    {_,Modified,Rest} = modify_cases_upto(Ref, {skip,Reason,Origin,Mode}, Cases),
+skip_cases_upto(Ref, Cases, Reason, Origin, Mode, SkipType) ->
+    {_,Modified,Rest} =
+	modify_cases_upto(Ref, {skip,Reason,Origin,Mode,SkipType}, Cases),
     Modified++Rest.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3150,6 +3279,7 @@ modify_cases_upto(Ref, ModOp, Cases, Orig, Alt) ->
     %% same ref in the list, if not, this *is* an end conf case
     case lists:any(fun({_,R,_,_}) when R == Ref -> true;
 		      ({_,R,_})   when R == Ref -> true;
+		      ({skip_case,{_,R,_,_},_}) when R == Ref -> true;
 		      ({skip_case,{_,R,_,_}}) when R == Ref -> true;
 		      (_) -> false
 		   end, Cases) of
@@ -3160,25 +3290,39 @@ modify_cases_upto(Ref, ModOp, Cases, Orig, Alt) ->
     end.
 
 %% next case is a conf with same ref, must be end conf = we're done
-modify_cases_upto1(Ref, {skip,Reason,conf,Mode}, [{conf,Ref,_Props,MF}|T], Orig, Alt) ->
+modify_cases_upto1(Ref, {skip,Reason,conf,Mode,skip_case},
+		   [{conf,Ref,_Props,MF}|T], Orig, Alt) ->
+    {Orig,[{skip_case,{conf,Ref,MF,Reason},Mode}|Alt],T};
+modify_cases_upto1(Ref, {skip,Reason,conf,Mode,auto_skip_case},
+		   [{conf,Ref,_Props,MF}|T], Orig, Alt) ->
     {Orig,[{auto_skip_case,{conf,Ref,MF,Reason},Mode}|Alt],T};
 modify_cases_upto1(Ref, {copy,NewRef}, [{conf,Ref,Props,MF}=C|T], Orig, Alt) ->
     {[C|Orig],[{conf,NewRef,update_repeat(Props),MF}|Alt],T};
 
 %% we've skipped all remaining cases in a sequence
-modify_cases_upto1(Ref, {skip,_,tc,_}, [{conf,Ref,_Props,_MF}|_]=Cs, Orig, Alt) ->
+modify_cases_upto1(Ref, {skip,_,tc,_,_},
+		   [{conf,Ref,_Props,_MF}|_]=Cs, Orig, Alt) ->
     {Orig,Alt,Cs};
 
 %% next is a make case
-modify_cases_upto1(Ref, {skip,Reason,_,Mode}, [{make,Ref,MF}|T], Orig, Alt) ->
-    {Orig,[{auto_skip_case,{make,Ref,MF,Reason},Mode}|Alt],T};
+modify_cases_upto1(Ref, {skip,Reason,_,Mode,SkipType},
+		   [{make,Ref,MF}|T], Orig, Alt) ->
+    {Orig,[{SkipType,{make,Ref,MF,Reason},Mode}|Alt],T};
 modify_cases_upto1(Ref, {copy,NewRef}, [{make,Ref,MF}=M|T], Orig, Alt) ->
     {[M|Orig],[{make,NewRef,MF}|Alt],T};
 
 %% next case is a user skipped end conf with the same ref = we're done
-modify_cases_upto1(Ref, {skip,Reason,_,Mode}, [{skip_case,{Type,Ref,MF,_Cmt}}|T], Orig, Alt) ->
-    {Orig,[{auto_skip_case,{Type,Ref,MF,Reason},Mode}|Alt],T};
-modify_cases_upto1(Ref, {copy,NewRef}, [{skip_case,{Type,Ref,MF,Cmt}}=C|T], Orig, Alt) ->
+modify_cases_upto1(Ref, {skip,Reason,_,Mode,SkipType},
+		   [{skip_case,{Type,Ref,MF,_Cmt},_}|T], Orig, Alt) ->
+    {Orig,[{SkipType,{Type,Ref,MF,Reason},Mode}|Alt],T};
+modify_cases_upto1(Ref, {skip,Reason,_,Mode,SkipType},
+		   [{skip_case,{Type,Ref,MF,_Cmt}}|T], Orig, Alt) ->
+    {Orig,[{SkipType,{Type,Ref,MF,Reason},Mode}|Alt],T};
+modify_cases_upto1(Ref, {copy,NewRef},
+		   [{skip_case,{Type,Ref,MF,Cmt},Mode}=C|T], Orig, Alt) ->
+    {[C|Orig],[{skip_case,{Type,NewRef,MF,Cmt},Mode}|Alt],T};
+modify_cases_upto1(Ref, {copy,NewRef},
+		   [{skip_case,{Type,Ref,MF,Cmt}}=C|T], Orig, Alt) ->
     {[C|Orig],[{skip_case,{Type,NewRef,MF,Cmt}}|Alt],T};
 
 %% next is a skip_case, could be one test case or 'all' in suite, we must proceed
@@ -3186,13 +3330,17 @@ modify_cases_upto1(Ref, ModOp, [{skip_case,{_F,_Cmt}}=MF|T], Orig, Alt) ->
     modify_cases_upto1(Ref, ModOp, T, [MF|Orig], [MF|Alt]);
 
 %% next is a normal case (possibly in a sequence), mark as skipped, or copy, and proceed
-modify_cases_upto1(Ref, {skip,Reason,_,Mode}=Op, [{_M,_F}=MF|T], Orig, Alt) ->
+modify_cases_upto1(Ref, {skip,Reason,_,_,skip_case}=Op,
+		   [{_M,_F}=MF|T], Orig, Alt) ->
+    modify_cases_upto1(Ref, Op, T, Orig, [{skip_case,{MF,Reason}}|Alt]);
+modify_cases_upto1(Ref, {skip,Reason,_,Mode,auto_skip_case}=Op,
+		   [{_M,_F}=MF|T], Orig, Alt) ->
     modify_cases_upto1(Ref, Op, T, Orig, [{auto_skip_case,{MF,Reason},Mode}|Alt]);
 modify_cases_upto1(Ref, CopyOp, [{_M,_F}=MF|T], Orig, Alt) ->
     modify_cases_upto1(Ref, CopyOp, T, [MF|Orig], [MF|Alt]);
 
 %% next is some other case, ignore or copy
-modify_cases_upto1(Ref, {skip,_,_,_}=Op, [_|T], Orig, Alt) ->
+modify_cases_upto1(Ref, {skip,_,_,_,_}=Op, [_|T], Orig, Alt) ->
     modify_cases_upto1(Ref, Op, T, Orig, Alt);
 modify_cases_upto1(Ref, CopyOp, [C|T], Orig, Alt) ->
     modify_cases_upto1(Ref, CopyOp, T, [C|Orig], [C|Alt]).
@@ -3488,7 +3636,7 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
     TSDir = get(test_server_dir),
 
     print(major, "=case          ~w:~w", [Mod, Func]),
-    MinorName = start_minor_log_file(Mod, Func),
+    MinorName = start_minor_log_file(Mod, Func, self() /= Main),
     print(minor, "<a name=\"top\"></a>", [], internal_raw),
     MinorBase = filename:basename(MinorName),
     print(major, "=logfile       ~ts", [filename:basename(MinorName)]),
@@ -3566,7 +3714,8 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 	    {died,Reason} ->
 		progress(failed, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
-	    {_,{'EXIT',{Skip,Reason}}} when Skip==skip; Skip==skipped ->
+	    {_,{'EXIT',{Skip,Reason}}} when Skip==skip; Skip==skipped;
+					    Skip==auto_skip ->
 		progress(skip, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
 	    {_,{'EXIT',_Pid,{Skip,Reason}}} when Skip==skip; Skip==skipped ->
@@ -3578,10 +3727,13 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit,
 	    {_,{'EXIT',Reason}} ->
 		progress(failed, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
-	    {_, {Fail, Reason}} when Fail =:= fail; Fail =:= failed ->
+	    {_,{Fail,Reason}} when Fail =:= fail; Fail =:= failed ->
 		progress(failed, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
-	    {_, {Skip, Reason}} when Skip==skip; Skip==skipped ->
+	    {_,Reason={auto_skip,_Why}} ->
+		progress(skip, Num, Mod, Func, Loc, Reason,
+			 Time, Comment, Style);		
+	    {_,{Skip,Reason}} when Skip==skip; Skip==skipped ->
 		progress(skip, Num, Mod, Func, Loc, Reason,
 			 Time, Comment, Style);
 	    {Time,RetVal} ->
@@ -3698,15 +3850,15 @@ num2str(N) -> integer_to_list(N).
 
 progress(skip, CaseNum, Mod, Func, Loc, Reason, Time,
 	 Comment, {St0,St1}) ->
-    {Reason1,{Color,Ret}} = 
+    {Reason1,{Color,Ret,ReportTag}} = 
 	if_auto_skip(Reason,
-		     fun() -> {?auto_skip_color,auto_skip} end,
-		     fun() -> {?user_skip_color,skip} end),
-    print(major, "=result        skipped", []),
-    print(1, "*** SKIPPED *** ~ts",
-	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
+		     fun() -> {?auto_skip_color,auto_skip,auto_skipped} end,
+		     fun() -> {?user_skip_color,skip,skipped} end),
+    print(major, "=result        ~w: ~p", [ReportTag,Reason1]),
+    print(1, "*** SKIPPED ~ts ***",
+	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{Mod,Func,
-						     {skipped,Reason1}}]),
+						     {ReportTag,Reason1}}]),
     ReasonStr = reason_to_string(Reason1),
     ReasonStr1 = lists:flatten([string:strip(S,left) ||
 				S <- string:tokens(ReasonStr,[$\n])]),
@@ -3733,8 +3885,8 @@ progress(skip, CaseNum, Mod, Func, Loc, Reason, Time,
 progress(failed, CaseNum, Mod, Func, Loc, timetrap_timeout, T,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: timeout, ~p", [Loc]),
-    print(1, "*** FAILED *** ~ts",
-	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
+    print(1, "*** FAILED ~ts ***",
+	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report,
 				   [tc_done,{Mod,Func,
 					     {failed,timetrap_timeout}}]),
@@ -3759,8 +3911,8 @@ progress(failed, CaseNum, Mod, Func, Loc, timetrap_timeout, T,
 progress(failed, CaseNum, Mod, Func, Loc, {testcase_aborted,Reason}, _T,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: testcase_aborted, ~p", [Loc]),
-    print(1, "*** FAILED *** ~ts",
-	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
+    print(1, "*** FAILED ~ts ***",
+	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report,
 				   [tc_done,{Mod,Func,
 					     {failed,testcase_aborted}}]),
@@ -3785,8 +3937,8 @@ progress(failed, CaseNum, Mod, Func, Loc, {testcase_aborted,Reason}, _T,
 progress(failed, CaseNum, Mod, Func, unknown, Reason, Time,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: ~p, ~w", [Reason,unknown]),
-    print(1, "*** FAILED *** ~ts",
-	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
+    print(1, "*** FAILED ~ts ***",
+	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{Mod,Func,
 						     {failed,Reason}}]),
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
@@ -3821,8 +3973,8 @@ progress(failed, CaseNum, Mod, Func, unknown, Reason, Time,
 progress(failed, CaseNum, Mod, Func, Loc, Reason, Time,
 	 Comment0, {St0,St1}) ->
     print(major, "=result        failed: ~p, ~p", [Reason,Loc]),
-    print(1, "*** FAILED *** ~ts",
-	  [get_info_str(Func, CaseNum, get(test_server_cases))]),
+    print(1, "*** FAILED ~ts ***",
+	  [get_info_str(Mod,Func, CaseNum, get(test_server_cases))]),
     test_server_sup:framework_call(report, [tc_done,{Mod,Func,
 						     {failed,Reason}}]),
     TimeStr = io_lib:format(if is_float(Time) -> "~.3fs";
@@ -3919,24 +4071,25 @@ fw_name(Mod) ->
 
 if_auto_skip(Reason={failed,{_,init_per_testcase,_}}, True, _False) ->
     {Reason,True()};
-if_auto_skip({_T,{skip,Reason={failed,{_,init_per_testcase,_}}},_Opts}, True, _False) ->
+if_auto_skip({skip,Reason={failed,{_,init_per_testcase,_}}}, True, _False) ->
     {Reason,True()};
-if_auto_skip({fw_auto_skip,Reason}, True, _False) ->
-    {Reason,True()};
-if_auto_skip({_T,{skip,{fw_auto_skip,Reason}},_Opts}, True, _False) ->
+if_auto_skip({auto_skip,Reason}, True, _False) ->
     {Reason,True()};
 if_auto_skip(Reason, _True, False) ->
     {Reason,False()}.
 
-update_skip_counters(RetVal, {US,AS}) ->
-    {_,Result} = if_auto_skip(RetVal, fun() -> {US,AS+1} end, fun() -> {US+1,AS} end),
+update_skip_counters({_T,Pat,_Opts}, {US,AS}) ->
+    {_,Result} = if_auto_skip(Pat, fun() -> {US,AS+1} end, fun() -> {US+1,AS} end),
+    Result;    
+update_skip_counters(Pat, {US,AS}) ->
+    {_,Result} = if_auto_skip(Pat, fun() -> {US,AS+1} end, fun() -> {US+1,AS} end),
     Result.
 
-get_info_str(Func, 0, _Cases) ->
-    atom_to_list(Func);
-get_info_str(_Func, CaseNum, unknown) ->
+get_info_str(Mod,Func, 0, _Cases) ->
+    io_lib:format("~w", [{Mod,Func}]);
+get_info_str(_Mod,_Func, CaseNum, unknown) ->
     "test case " ++ integer_to_list(CaseNum);
-get_info_str(_Func, CaseNum, Cases) ->
+get_info_str(_Mod,_Func, CaseNum, Cases) ->
     "test case " ++ integer_to_list(CaseNum) ++
 	" of " ++ integer_to_list(Cases).
 
@@ -4395,12 +4548,27 @@ collect_cases({conf,Props,InitMF,CaseList,FinMF} = Conf, St) ->
 	Props1 ->
 	    Ref = make_ref(),
 	    Skips = St#cc.skip,
+	    Props2 = [{suite,St#cc.mod} | lists:delete(suite,Props1)],
+	    Mode = [{Ref,Props2,undefined}],
 	    case in_skip_list({St#cc.mod,Conf}, Skips) of
 		{true,Comment} ->	    	           % conf init skipped
-		    {ok,[{skip_case,{conf,Ref,InitMF,Comment}} |
+		    {ok,[{skip_case,{conf,Ref,InitMF,Comment},Mode} |
 			 [] ++ [{conf,Ref,[],FinMF}]],St};
 		{true,Name,Comment} when is_atom(Name) ->  % all cases skipped
-		    {ok,[{skip_case,{{St#cc.mod,{group,Name}},Comment}}],St};
+		    case collect_cases(CaseList, St) of
+			{ok,[],_St} = Empty ->
+			    Empty;
+			{ok,FlatCases,St1} ->
+			    Cases2Skip = FlatCases ++ [{conf,Ref,
+							keep_name(Props1),
+							FinMF}],
+			    Skipped = skip_cases_upto(Ref, Cases2Skip, Comment,
+						      conf, Mode, skip_case),
+			    {ok,[{skip_case,{conf,Ref,InitMF,Comment},Mode} |
+				 Skipped],St1};
+			{error,_Reason} = Error ->
+			    Error
+		    end;
 		{true,ToSkip,_} when is_list(ToSkip) ->    % some cases skipped
 		    case collect_cases(CaseList,
 				       St#cc{skip=ToSkip++Skips}) of
@@ -4677,7 +4845,7 @@ start_node(Name, Type, Options) ->
     case controller_call({start_node,Name,Type,Options}, T) of
 	{{ok,Nodename}, Host, Cmd, Info, Warning} ->
 	    format(minor,
-		   "Successfully started node ~w on ~tp with command: ~tp",
+		   "Successfully started node ~w on ~tp with command: ~ts",
 		   [Nodename, Host, Cmd]),
 	    format(major, "=node_start    ~w", [Nodename]),
 	    case Info of
@@ -4693,7 +4861,7 @@ start_node(Name, Type, Options) ->
 	    {ok, Nodename};
 	{fail,{Ret, Host, Cmd}}  ->
 	    format(minor,
-		   "Failed to start node ~tp on ~tp with command: ~tp~n"
+		   "Failed to start node ~tp on ~tp with command: ~ts~n"
 		   "Reason: ~p",
 		   [Name, Host, Cmd, Ret]),
 	    {fail,Ret};
@@ -4702,7 +4870,7 @@ start_node(Name, Type, Options) ->
 	    Ret;
 	{Ret, Host, Cmd} ->
 	    format(minor,
-		   "Failed to start node ~tp on ~tp with command: ~tp~n"
+		   "Failed to start node ~tp on ~tp with command: ~ts~n"
 		   "Reason: ~p",
 		   [Name, Host, Cmd, Ret]),
 	    Ret
@@ -5299,6 +5467,9 @@ html_header(Title) ->
 open_html_file(File) ->
     open_utf8_file(File).
 
+open_html_file(File,Opts) ->
+    open_utf8_file(File,Opts).
+
 write_html_file(File,Content) ->
     write_file(File,Content,utf8).
 
@@ -5307,6 +5478,9 @@ write_html_file(File,Content) ->
 open_utf8_file(File) ->
     file:open(File,[write,{encoding,utf8}]).
 
+open_utf8_file(File,Opts) ->
+    file:open(File,[{encoding,utf8}|Opts]).
+
 %% Write a file with specified encoding
 write_file(File,Content,latin1) ->
     file:write_file(File,Content);
diff --git a/lib/test_server/src/test_server_h.erl b/lib/test_server/src/test_server_h.erl
deleted file mode 100644
index 24063ddb10..0000000000
--- a/lib/test_server/src/test_server_h.erl
+++ /dev/null
@@ -1,148 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
-%% 
-%% The 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_h).
--behaviour(gen_event).
-
-%% API
--export([install/0, restore/0]).
--export([testcase/1]).
-
-%% gen_event callbacks
--export([init/1, handle_event/2, handle_call/2, 
-	 handle_info/2, terminate/2, code_change/3]).
-
--record(state, {kernel, sasl, testcase}).
-
-%%====================================================================
-%% API
-%%====================================================================
-
-install() ->
-    case gen_event:add_handler(error_logger, ?MODULE, []) of
-	ok ->
-	    error_logger:delete_report_handler(sasl_report_tty_h),
-	    gen_event:delete_handler(error_logger, error_logger_tty_h, []),
-	    ok;
-	Error ->
-	    Error
-    end.
-
-restore() ->
-    gen_event:add_handler(error_logger, error_logger_tty_h, []),
-    error_logger:add_report_handler(sasl_report_tty_h, all),
-    gen_event:delete_handler(error_logger, ?MODULE, []).
-
-testcase(Testcase) ->
-    gen_event:call(error_logger, ?MODULE, {set_testcase, Testcase}, 10*60*1000).
-
-%%====================================================================
-%% gen_event callbacks
-%%====================================================================
-
-init([]) ->
-
-    %% error_logger_tty_h initialization
-    User = set_group_leader(),
-
-    %% sasl_report_tty_h initialization
-    Type = all,
-
-    {ok, #state{kernel={User, []}, sasl=Type}}.
-
-set_group_leader() ->
-    case whereis(user) of
-	User when is_pid(User) ->
-	    link(User),
-	    group_leader(User, self()),
-	    User;
-	_ ->
-	    false
-    end.
-
-handle_event({_Type, GL, _Msg}, State) when node(GL)/=node() ->
-    {ok, State};
-handle_event({Tag, _GL, {_Pid, Type, _Report}} = Event, State) ->
-    SASL = lists:keyfind(sasl, 1, application:which_applications()),
-    case report_receiver(Tag, Type) of
-	sasl when SASL /= false ->
-	    {ok,ErrLogType} = application:get_env(sasl, errlog_type),
-	    SReport = sasl_report:format_report(group_leader(), ErrLogType,
-						tag_event(Event)),
-	    if is_list(SReport) ->
-		    tag(State#state.testcase),
-		    sasl_report_tty_h:handle_event(Event,
-						   State#state.sasl);
-	       true -> %% Report is an atom if no logging is to be done
-		    ignore
-	    end;
-	sasl -> %% SASL not running
-	    ignore;
-	kernel ->
-	    tag(State#state.testcase),
-	    error_logger_tty_h:handle_event(Event, State#state.kernel);
-	none ->
-	    ignore
-    end,
-    {ok, State};
-handle_event(_Event, State) ->
-    {ok, State}.
-
-handle_call({set_testcase, Testcase}, State) ->
-    {ok, ok, State#state{testcase=Testcase}};
-handle_call(_Query, _State) ->
-    {error, bad_query}.
-
-handle_info({emulator,GL,_Chars}=Event, State) when node(GL)==node() ->
-    tag(State#state.testcase),
-    error_logger_tty_h:handle_info(Event, State#state.kernel),
-    {ok, State};
-handle_info(_Msg, State) ->
-    {ok, State}.
-
-terminate(_Reason, _State) ->
-    ok.
-
-code_change(_OldVsn, State, _Extra) ->
-    {ok, State}.
-
-report_receiver(error_report, supervisor_report) -> sasl;
-report_receiver(error_report, crash_report) -> sasl;
-report_receiver(info_report, progress) -> sasl;
-report_receiver(error, _) -> kernel;
-report_receiver(error_report, _) -> kernel;
-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.
-
-tag({M,F,A}) when is_atom(M), is_atom(F), is_integer(A) ->
-    io:format(user, "~n=TESTCASE: ~w:~w/~w", [M,F,A]);
-tag(Testcase) ->
-    io:format(user, "~n=TESTCASE: ~p", [Testcase]).
-
-tag_event(Event) ->
-    {calendar:local_time(), Event}.
diff --git a/lib/test_server/src/test_server_io.erl b/lib/test_server/src/test_server_io.erl
index 73d4468bda..62af3d5b28 100644
--- a/lib/test_server/src/test_server_io.erl
+++ b/lib/test_server/src/test_server_io.erl
@@ -32,27 +32,39 @@
 -export([start_link/0,stop/1,get_gl/1,set_fd/2,
 	 start_transaction/0,end_transaction/0,
 	 print_buffered/1,print/3,print_unexpected/1,
-	 set_footer/1,set_job_name/1,set_gl_props/1]).
+	 set_footer/1,set_job_name/1,set_gl_props/1,
+	 reset_state/0,finish/0]).
 
 -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
+-record(st, {fds,			    % Singleton fds (gb_tree)
+	     tags=[],                       % Known tag types   
+	     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
+	     phase,                         % Indicates current mode
+	     offline_buffer,                % Buffer I/O during startup
+	     stopping,                      % Reply to when process stopped
+	     pending_ops                    % Perform when process idle 
 	    }).
 
 start_link() ->
-    case gen_server:start_link({local,?MODULE}, ?MODULE, [], []) of
-	{ok,Pid} ->
-	    {ok,Pid};
-	Other ->
-	    Other
+    case whereis(?MODULE) of
+	undefined ->
+	    case gen_server:start_link({local,?MODULE}, ?MODULE, [], []) of
+		{ok,Pid} ->
+		    {ok,Pid};
+		Other ->
+		    Other
+	    end;
+	Pid ->
+	    %% already running, reset the state
+	    reset_state(),
+	    {ok,Pid}
     end.
 
 stop(FilesToClose) ->
@@ -62,6 +74,9 @@ stop(FilesToClose) ->
     group_leader(OldGL, self()),
     ok.
 
+finish() ->
+    req(finish).
+
 %% get_gl(Shared) -> Pid
 %%  Shared = boolean()
 %%  Pid = pid()
@@ -142,19 +157,27 @@ 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}).
 
+%% reset_state
+%%
+%% Reset the initial state
+reset_state() ->
+    req(reset_state).
 
 %%% Internal functions.
 
@@ -167,7 +190,10 @@ init([]) ->
 	    buffered=Empty,
 	    html_footer="</body>\n</html>\n",
 	    job_name="<name not set>",
-	    gl_props=[]}}.
+	    gl_props=[],
+	    phase=starting,
+	    offline_buffer=[],
+	    pending_ops=[]}}.
 
 req(Req) ->
     gen_server:call(?MODULE, Req, infinity).
@@ -178,9 +204,24 @@ handle_call({get_gl,false}, _From, #st{gls=Gls,gl_props=Props}=St) ->
     {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) ->
+handle_call({set_fd,Tag,Fd}, _From, #st{fds=Fds0,tags=Tags0,
+					offline_buffer=OfflineBuff}=St) ->
     Fds = gb_trees:enter(Tag, Fd, Fds0),
-    {reply,ok,St#st{fds=Fds}};
+    St1 = St#st{fds=Fds,tags=[Tag|lists:delete(Tag, Tags0)]},
+    OfflineBuff1 =
+	if OfflineBuff == [] ->
+		[];
+	   true ->
+		%% Fd ready, print anything buffered for associated Tag
+		lists:filtermap(fun({T,From,Str}) when T == Tag ->
+					output(From, Tag, Str, St1),
+					false;
+				   (_) ->
+					true
+				end, lists:reverse(OfflineBuff))
+	end,
+    {reply,ok,St1#st{phase=started,
+		     offline_buffer=lists:reverse(OfflineBuff1)}};
 handle_call({start_transaction,Pid}, _From, #st{io_buffering=Buffer0,
 						buffered=Buf0}=St) ->
     Buf = case gb_trees:is_defined(Pid, Buf0) of
@@ -213,12 +254,15 @@ handle_call({set_job_name,Name}, _From, St) ->
 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,FdTags}, From, #st{fds=Fds,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),
+handle_call(reset_state, From, #st{phase=stopping,pending_ops=Ops}=St) ->
+    %% can't reset during stopping phase, save op for later
+    Op = fun(NewSt) -> 
+		 {_,Result,NewSt1} = handle_call(reset_state, From, NewSt),
+		 {Result,NewSt1}
+	 end,
+    {noreply,St#st{pending_ops=[{From,Op}|Ops]}};
+handle_call(reset_state, _From, #st{fds=Fds,tags=Tags,gls=Gls,
+				    offline_buffer=OfflineBuff}) ->
     %% close open log files
     lists:foreach(fun(Tag) ->
 			  case gb_trees:lookup(Tag, Fds) of
@@ -227,8 +271,50 @@ handle_call({stop,FdTags}, From, #st{fds=Fds,shared_gl=SGL,gls=Gls0}=St0) ->
 			      {value,Fd} ->
 				  file:close(Fd)
 			  end
-		  end, FdTags),
-    {noreply,St}.
+		  end, Tags),
+    GlList = gb_sets:to_list(Gls),
+    [test_server_gl:stop(GL) || GL <- GlList],
+    timer:sleep(100),
+    case lists:filter(fun(GlPid) -> is_process_alive(GlPid) end, GlList) of
+	[] ->
+	    ok;
+	_ ->
+	    timer:sleep(2000),
+	    [exit(GL, kill) || GL <- GlList]
+    end,
+    Empty = gb_trees:empty(),
+    {ok,Shared} = test_server_gl:start_link(),
+    {reply,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=[],
+		  phase=starting,
+		  offline_buffer=OfflineBuff,
+		  pending_ops=[]}};
+handle_call({stop,FdTags}, From, #st{fds=Fds0,tags=Tags0,
+				     shared_gl=SGL,gls=Gls0}=St0) ->
+    St = St0#st{gls=gb_sets:insert(SGL, Gls0),phase=stopping,stopping=From},
+    gc(St),
+    %% close open log files
+    {Fds1,Tags1} = lists:foldl(fun(Tag, {Fds,Tags}) ->
+			       case gb_trees:lookup(Tag, Fds) of
+				   none ->
+				       {Fds,Tags};
+				   {value,Fd} ->
+				       file:close(Fd),
+				       {gb_trees:delete(Tag, Fds),
+					lists:delete(Tag, Tags)}
+			       end
+		       end, {Fds0,Tags0}, FdTags),
+    %% Give the users of the surviving group leaders some
+    %% time to finish.
+    erlang:send_after(1000, self(), stop_group_leaders),    
+    {noreply,St#st{fds=Fds1,tags=Tags1}};
+handle_call(finish, From, St) ->
+    gen_server:reply(From, ok),
+    {stop,normal,St}.
 
 handle_info({'EXIT',Pid,normal}, #st{gls=Gls0,stopping=From}=St) ->
     Gls = gb_sets:delete_any(Pid, Gls0),
@@ -236,22 +322,40 @@ handle_info({'EXIT',Pid,normal}, #st{gls=Gls0,stopping=From}=St) ->
 	true ->
 	    %% No more group leaders left.
 	    gen_server:reply(From, ok),
-	    {stop,normal,St#st{gls=Gls,stopping=undefined}};
+	    {noreply,St#st{gls=Gls,phase=stopping,stopping=undefined}};
 	false ->
 	    %% Wait for more group leaders to finish.
-	    {noreply,St#st{gls=Gls}}
+	    {noreply,St#st{gls=Gls,phase=stopping}}
     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),
+    GlPids = gb_sets:to_list(Gls),
+    [test_server_gl:stop(GL) || GL <- GlPids],
+    timer:sleep(100),
+    Wait = 
+	case lists:filter(fun(GlPid) -> is_process_alive(GlPid) end, GlPids) of
+	    [] -> 0;
+	    _  -> 2000
+	end,
+    erlang:send_after(Wait, self(), kill_group_leaders),
     {noreply,St};
-handle_info(kill_group_leaders, #st{gls=Gls,stopping=From}=St) ->
+handle_info(kill_group_leaders, #st{gls=Gls,stopping=From,
+				    pending_ops=Ops}=St) ->
     [exit(GL, kill) || GL <- gb_sets:to_list(Gls)],
-    gen_server:reply(From, ok),
-    {stop,normal,St};
+    if From /= undefined ->
+	    gen_server:reply(From, ok);
+       true ->					% reply has been sent already
+	    ok
+    end,
+    %% we're idle, check if any ops are pending
+    St1 = lists:foldr(fun({ReplyTo,Op},NewSt) ->
+			      {Result,NewSt1} = Op(NewSt),
+			      gen_server:reply(ReplyTo, Result),
+			      NewSt1
+		      end, St#st{phase=idle,pending_ops=[]}, Ops),
+    {noreply,St1};
 handle_info(Other, St) ->
     io:format("Ignoring: ~p\n", [Other]),
     {noreply,St}.
@@ -259,11 +363,19 @@ handle_info(Other, St) ->
 terminate(_, _) ->
     ok.
 
-output(From, Tag, Str, #st{io_buffering=Buffered,buffered=Buf0}=St) ->
+output(From, Tag, Str, #st{io_buffering=Buffered,buffered=Buf0,
+			   phase=Phase,offline_buffer=OfflineBuff}=St) ->
     case gb_sets:is_member(From, Buffered) of
 	false ->
-	    do_output(Tag, Str, St),
-	    St;
+	    case do_output(Tag, Str, Phase, St) of
+		buffer when length(OfflineBuff)>500 ->
+		    %% something's wrong, clear buffer
+		    St#st{offline_buffer=[]};
+		buffer ->
+		    St#st{offline_buffer=[{Tag,From,Str}|OfflineBuff]};
+		_ ->
+		    St
+	    end;
 	true ->
 	    Q0 = gb_trees:get(From, Buf0),
 	    Q = queue:in({Tag,Str}, Q0),
@@ -271,17 +383,19 @@ output(From, Tag, Str, #st{io_buffering=Buffered,buffered=Buf0}=St) ->
 	    St#st{buffered=Buf}
     end.
 
-do_output(stdout, Str, #st{job_name=undefined}) ->
+do_output(stdout, Str, _, #st{job_name=undefined}) ->
     io:put_chars(Str);
-do_output(stdout, Str0, #st{job_name=Name}) ->
+do_output(stdout, Str0, _, #st{job_name=Name}) ->
     Str = io_lib:format("Testing ~ts: ~ts\n", [Name,Str0]),
     io:put_chars(Str);
-do_output(Tag, Str, #st{fds=Fds}=St) ->
+do_output(Tag, Str, Phase, #st{fds=Fds}=St) ->
     case gb_trees:lookup(Tag, Fds) of
+	none when Phase /= started ->
+	    buffer;
 	none ->
 	    S = io_lib:format("\n*** ERROR: ~w, line ~w: No known '~p' log file\n",
 			      [?MODULE,?LINE,Tag]),
-	    do_output(stdout, [S,Str], St);
+	    do_output(stdout, [S,Str], Phase, St);
 	{value,Fd} ->
 	    try
 		io:put_chars(Fd, Str),
@@ -293,14 +407,14 @@ do_output(Tag, Str, #st{fds=Fds}=St) ->
 		    S = io_lib:format("\n*** ERROR: ~w, line ~w: Error writing to "
 				      "log file '~p': ~p\n",
 				      [?MODULE,?LINE,Tag,Error]),
-		    do_output(stdout, [S,Str], St)
+		    do_output(stdout, [S,Str], Phase, 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 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]),
@@ -319,7 +433,7 @@ do_print_buffered(Q0, St) ->
 	eot ->
 	    Q;
 	{Tag,Str} ->
-	    do_output(Tag, Str, St),
+	    do_output(Tag, Str, undefined, St),
 	    do_print_buffered(Q, St)
     end.
 
diff --git a/lib/test_server/src/test_server_node.erl b/lib/test_server/src/test_server_node.erl
index 619fd463de..582abb2153 100644
--- a/lib/test_server/src/test_server_node.erl
+++ b/lib/test_server/src/test_server_node.erl
@@ -82,7 +82,7 @@ start_tracer_node(TraceFile,TI) ->
     Cookie = TI#target_info.cookie,
     {ok,LSock} = gen_tcp:listen(0,[binary,{reuseaddr,true},{packet,2}]),
     {ok,TracePort} = inet:port(LSock),
-    Prog = pick_erl_program(default),
+    Prog = quote_progname(pick_erl_program(default)),
     Cmd = lists:concat([Prog, " -sname tracer -hidden -setcookie ", Cookie, 
 			" -s ", ?MODULE, " trc ", TraceFile, " ", 
 			TracePort, " ", TI#target_info.os_family]),
@@ -312,7 +312,7 @@ start_node_peer(SlaveName, OptList, From, TI) ->
     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),
-    Prog = pick_erl_program(Prog0),
+    Prog = quote_progname(pick_erl_program(Prog0)),
     Args = 
 	case string:str(SuppliedArgs,"-setcookie") of
 	    0 -> "-setcookie " ++ TI#target_info.cookie ++ " " ++ SuppliedArgs;
@@ -589,7 +589,32 @@ pick_erl_program(L) ->
 	{release, S} ->
 	    find_release(S);
 	this ->
-	    lib:progname()
+	    cast_to_list(lib:progname())
+    end.
+
+%% This is an attempt to distinguish between spaces in the program
+%% path and spaces that separate arguments. The program is quoted to
+%% allow spaces in the path.
+%%
+%% Arguments could exist either if the executable is excplicitly given
+%% ({prog,String}) or if the -program switch to beam is used and
+%% includes arguments (typically done by cerl in OTP test environment
+%% in order to ensure that slave/peer nodes are started with the same
+%% emulator and flags as the test node. The return from lib:progname()
+%% could then typically be '/<full_path_to>/cerl -gcov').
+quote_progname(Progname) ->
+    do_quote_progname(string:tokens(Progname," ")).
+
+do_quote_progname([Prog]) ->
+    "\""++Prog++"\"";
+do_quote_progname([Prog,Arg|Args]) ->
+    case os:find_executable(Prog) of
+	false ->
+	    do_quote_progname([Prog++" "++Arg | Args]);
+	_ ->
+	    %% this one has an executable - we assume the rest are arguments
+	    "\""++Prog++"\""++
+		lists:flatten(lists:map(fun(X) -> [" ",X] end, [Arg|Args]))
     end.
 
 random_element(L) ->
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 377aa21018..3cfa84a52f 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -29,10 +29,13 @@
 	 hostatom/0, hostatom/1, hoststr/0, hoststr/1,
 	 framework_call/2,framework_call/3,framework_call/4,
 	 format_loc/1,
-	 call_trace/1]).
+	 util_start/0, util_stop/0, unique_name/0,
+	 call_trace/1,
+	 appup_test/1]).
 -include("test_server_internal.hrl").
 -define(crash_dump_tar,"crash_dumps.tar.gz").
 -define(src_listing_ext, ".src.html").
+-record(util_state, {starter, latest_name}).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% timetrap(Timeout,Scale,Pid) -> Handle
@@ -263,6 +266,249 @@ app_check_export_all([Mod|Mods]) ->
 	    end
     end.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% appup_test/1
+%%
+%% Checks one applications .appup file for obvious errors.
+%% Checks..
+%% * .. syntax
+%% * .. that version in app file matches appup file version
+%% * .. validity of appup instructions
+%%
+%% For library application this function checks that the proper
+%% 'restart_application' upgrade and downgrade clauses exist.
+appup_test(Application) ->
+    case is_app(Application) of
+        {ok, AppFile} ->
+            case is_appup(Application, proplists:get_value(vsn, AppFile)) of
+                {ok, Up, Down} ->
+                    StartMod = proplists:get_value(mod, AppFile),
+                    Modules = proplists:get_value(modules, AppFile),
+                    do_appup_tests(StartMod, Application, Up, Down, Modules);
+                Error ->
+                    test_server:fail(Error)
+            end;
+        Error ->
+            test_server:fail(Error)
+    end.
+
+is_appup(Application, Version) ->
+    AppupFile = atom_to_list(Application) ++ ".appup",
+    AppupPath = filename:join([code:lib_dir(Application), "ebin", AppupFile]),
+    case file:consult(AppupPath) of
+        {ok, [{Version, Up, Down}]} when is_list(Up), is_list(Down) ->
+            {ok, Up, Down};
+        _ ->
+            test_server:format(
+              minor,
+              "Application upgrade (.appup) file not found, "
+              "or it has very bad syntax.~n"),
+            {error, appup_not_readable}
+    end.
+
+do_appup_tests(undefined, Application, Up, Down, _Modules) ->
+    %% library application
+    case Up of
+        [{<<".*">>, [{restart_application, Application}]}] ->
+            case Down of
+                [{<<".*">>, [{restart_application, Application}]}] ->
+                    ok;
+                _ ->
+                    test_server:format(
+                      minor,
+                      "Library application needs restart_application "
+                      "downgrade instruction.~n"),
+                    {error, library_downgrade_instruction_malformed}
+            end;
+        _ ->
+            test_server:format(
+              minor,
+              "Library application needs restart_application "
+              "upgrade instruction.~n"),
+            {error, library_upgrade_instruction_malformed}
+    end;
+do_appup_tests(_, _Application, Up, Down, Modules) ->
+    %% normal application
+    case check_appup_clauses_plausible(Up, up, Modules) of
+        ok ->
+            case check_appup_clauses_plausible(Down, down, Modules) of
+                ok ->
+                    test_server:format(minor, "OK~n");
+                Error ->
+                    test_server:format(minor, "ERROR ~p~n", [Error]),
+                    test_server:fail(Error)
+            end;
+        Error ->
+            test_server:format(minor, "ERROR ~p~n", [Error]),
+            test_server:fail(Error)
+    end.
+    
+check_appup_clauses_plausible([], _Direction, _Modules) ->
+    ok;
+check_appup_clauses_plausible([{Re, Instrs} | Rest], Direction, Modules)
+  when is_binary(Re) ->
+    case re:compile(Re) of
+        {ok, _} ->
+            case check_appup_instructions(Instrs, Direction, Modules) of
+                ok ->
+                    check_appup_clauses_plausible(Rest, Direction, Modules);
+                Error ->
+                    Error
+            end;
+        {error, Error} ->
+            {error, {version_regex_malformed, Re, Error}}
+    end;
+check_appup_clauses_plausible([{V, Instrs} | Rest], Direction, Modules)
+  when is_list(V) ->
+    case check_appup_instructions(Instrs, Direction, Modules) of
+        ok ->
+            check_appup_clauses_plausible(Rest, Direction, Modules);
+        Error ->
+            Error
+    end;
+check_appup_clauses_plausible(Clause, _Direction, _Modules) ->
+    {error, {clause_malformed, Clause}}.
+
+check_appup_instructions(Instrs, Direction, Modules) ->
+    case check_instructions(Direction, Instrs, Instrs, [], [], Modules) of
+        {_Good, []} ->
+            ok;
+        {_, Bad} ->
+            {error, {bad_instructions, Bad}}
+    end.
+
+check_instructions(_, [], _, Good, Bad, _) ->
+    {lists:reverse(Good), lists:reverse(Bad)};
+check_instructions(UpDown, [Instr | Rest], All, Good, Bad, Modules) ->
+    case catch check_instruction(UpDown, Instr, All, Modules) of
+        ok ->
+            check_instructions(UpDown, Rest, All, [Instr | Good], Bad, Modules);
+        {error, Reason} ->
+            NewBad = [{Instr, Reason} | Bad],
+            check_instructions(UpDown, Rest, All, Good, NewBad, Modules)
+    end.
+
+check_instruction(up, {add_module, Module}, _, Modules) ->
+    %% A new module is added
+    check_module(Module, Modules);
+check_instruction(down, {add_module, Module}, _, Modules) ->
+    %% An old module is re-added
+    case (catch check_module(Module, Modules)) of
+        {error, {unknown_module, Module, Modules}} -> ok;
+        ok -> throw({error, {existing_readded_module, Module}})
+    end;
+check_instruction(_, {load_module, Module}, _, Modules) ->
+    check_module(Module, Modules);
+check_instruction(_, {load_module, Module, DepMods}, _, Modules) ->
+    check_module(Module, Modules),
+    check_depend(DepMods);
+check_instruction(_, {load_module, Module, Pre, Post, DepMods}, _, Modules) ->
+    check_module(Module, Modules),
+    check_depend(DepMods),
+    check_purge(Pre),
+    check_purge(Post);
+check_instruction(up, {delete_module, Module}, _, Modules) ->
+    case (catch check_module(Module, Modules)) of
+        {error, {unknown_module, Module, Modules}} ->
+            ok;
+        ok ->
+            throw({error,{existing_module_deleted, Module}})
+    end;
+check_instruction(down, {delete_module, Module}, _, Modules) ->
+    check_module(Module, Modules);
+check_instruction(_, {update, Module}, _, Modules) ->
+    check_module(Module, Modules);
+check_instruction(_, {update, Module, supervisor}, _, Modules) ->
+    check_module(Module, Modules);
+check_instruction(_, {update, Module, DepMods}, _, Modules)
+  when is_list(DepMods) ->
+    check_module(Module, Modules);
+check_instruction(_, {update, Module, Change}, _, Modules) ->
+    check_module(Module, Modules),
+    check_change(Change);
+check_instruction(_, {update, Module, Change, DepMods}, _, Modules) ->
+    check_module(Module, Modules),
+    check_change(Change),
+    check_depend(DepMods);
+check_instruction(_, {update, Module, Change, Pre, Post, DepMods}, _, Modules) ->
+    check_module(Module, Modules),
+    check_change(Change),
+    check_purge(Pre),
+    check_purge(Post),
+    check_depend(DepMods);
+check_instruction(_,
+                  {update, Module, Timeout, Change, Pre, Post, DepMods},
+                  _,
+                  Modules) ->
+    check_module(Module, Modules),
+    check_timeout(Timeout),
+    check_change(Change),
+    check_purge(Pre),
+    check_purge(Post),
+    check_depend(DepMods);
+check_instruction(_,
+                  {update, Module, ModType, Timeout, Change, Pre, Post, DepMods},
+                  _,
+                  Modules) ->
+    check_module(Module, Modules),
+    check_mod_type(ModType),
+    check_timeout(Timeout),
+    check_change(Change),
+    check_purge(Pre),
+    check_purge(Post),
+    check_depend(DepMods);
+check_instruction(_, {restart_application, Application}, _, _) ->
+    check_application(Application);
+check_instruction(_, {remove_application, Application}, _, _) ->
+    check_application(Application);
+check_instruction(_, {add_application, Application}, _, _) ->
+    check_application(Application);
+check_instruction(_, {add_application, Application, Type}, _, _) ->
+    check_application(Application),
+    check_restart_type(Type);
+check_instruction(_, Instr, _, _) ->
+    throw({error, {low_level_or_invalid_instruction, Instr}}).
+
+check_module(Module, Modules) when is_atom(Module) ->
+    case {is_atom(Module), lists:member(Module, Modules)} of
+        {true, true}  -> ok;
+        {true, false} -> throw({error, {unknown_module, Module}});
+        {false, _}    -> throw({error, {bad_module, Module}})
+    end.
+
+check_application(App) ->
+    case is_atom(App) of
+        true  -> ok;
+        false -> throw({error, {bad_application, App}})
+    end.
+
+check_depend(Dep) when is_list(Dep) -> ok;
+check_depend(Dep)                   -> throw({error, {bad_depend, Dep}}).
+
+check_restart_type(permanent) -> ok;
+check_restart_type(transient) -> ok;
+check_restart_type(temporary) -> ok;
+check_restart_type(load)      -> ok;
+check_restart_type(none)      -> ok;
+check_restart_type(Type)      -> throw({error, {bad_restart_type, Type}}).
+
+check_timeout(T) when is_integer(T), T > 0 -> ok;
+check_timeout(default)                     -> ok;
+check_timeout(infinity)                    -> ok;
+check_timeout(T)                           -> throw({error, {bad_timeout, T}}).
+
+check_mod_type(static)  -> ok;
+check_mod_type(dynamic) -> ok;
+check_mod_type(Type)    -> throw({error, {bad_mod_type, Type}}).
+
+check_purge(soft_purge)   -> ok;
+check_purge(brutal_purge) -> ok;
+check_purge(Purge)        -> throw({error, {bad_purge, Purge}}).
+
+check_change(soft)          -> ok;
+check_change({advanced, _}) -> ok;
+check_change(Change)        -> throw({error, {bad_change, Change}}).
+
 %% Given two sorted lists, L1 and L2, returns {NotInL2, NotInL1},
 %% NotInL2 is the elements of L1 which don't occurr in L2,
 %% NotInL1 is the elements of L2 which don't ocurr in L1.
@@ -583,6 +829,69 @@ downcase([], Result) ->
     lists:reverse(Result).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% util_start() -> ok
+%%
+%% Start local utility process
+util_start() ->
+    Starter = self(),
+    case whereis(?MODULE) of
+	undefined ->	
+	    spawn_link(fun() ->
+			       register(?MODULE, self()),
+			       util_loop(#util_state{starter=Starter})
+		       end);
+	_Pid ->
+	    ok
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% util_stop() -> ok
+%%
+%% Stop local utility process
+util_stop() ->
+    try (?MODULE ! {self(),stop}) of
+	_ ->
+	    receive {?MODULE,stopped} -> ok
+	    after 5000 -> exit(whereis(?MODULE), kill)
+	    end
+    catch
+	_:_ ->
+	    ok
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% unique_name() -> string()
+%%
+unique_name() ->
+    ?MODULE ! {self(),unique_name},
+    receive {?MODULE,Name} -> Name
+    after 5000 -> exit({?MODULE,no_util_process})
+    end.
+	    
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% util_loop(State) -> ok
+%%
+util_loop(State) ->		       
+    receive
+	{From,unique_name} ->
+	    {_,S,Us} = now(),
+	    Ms = trunc(Us/1000),
+	    Name = lists:flatten(io_lib:format("~w.~w", [S,Ms])),
+	    if Name == State#util_state.latest_name ->
+		    timer:sleep(1),
+		    self() ! {From,unique_name},
+		    util_loop(State);
+	       true ->
+		    From ! {?MODULE,Name},
+		    util_loop(State#util_state{latest_name = Name})
+	    end;
+	{From,stop} ->
+	    catch unlink(State#util_state.starter),
+	    From ! {?MODULE,stopped},
+	    ok
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% call_trace(TraceSpecFile) -> ok
 %%
 %% Read terms on format {m,Mod} | {f,Mod,Func}
diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index 4e5dc1b759..11d6f7af4d 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -28,6 +28,7 @@
 	 tests/0, tests/1,
 	 install/0, install/1,
 	 bench/0, bench/1, bench/2, benchmarks/0,
+	 smoke_test/0, smoke_test/1,smoke_test/2, smoke_tests/0,
 	 estone/0, estone/1,
 	 cross_cover_analyse/1,
 	 compile_testcases/0, compile_testcases/1,
@@ -174,6 +175,13 @@ help(installed) ->
 	 "  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"
+	 "Smoke test functions:\n"
+	 "  ts:smoke_tests()  - Get all available families of smoke tests\n"
+	 "  ts:smoke_test()   - Runs all smoke tests\n"
+	 "  ts:smoke_test(Spec)\n"
+	 "                    - Runs all smoke tests in the given spec file.\n"
+	 "                      The spec file is actually ../*_test/Spec_smoke.spec\n\n"
+	 "                      ts:smoke_test can take the same Options argument as ts:run.\n"
 	 "\n"
 	 "Installation (already done):\n"
 	],
@@ -204,6 +212,12 @@ run_all(_Vars) ->
 
 run_some([], _Opts) ->
     ok;
+run_some([{Spec,Mod}|Specs], Opts) ->
+    case run(Spec, Mod, Opts) of
+	ok -> ok;
+	Error -> io:format("~p: ~p~n",[{Spec,Mod},Error])
+    end,
+    run_some(Specs, Opts);
 run_some([Spec|Specs], Opts) ->
     case run(Spec, Opts) of
 	ok -> ok;
@@ -255,9 +269,19 @@ run(List, Opts) when is_list(List), is_list(Opts) ->
     run_some(List, Opts);
 
 %% run/2
-%% Runs one test spec with Options
-run(Testspec, Config) when is_atom(Testspec), is_list(Config) ->
+%% Runs one test spec with list of suites or with options
+run(Testspec, ModsOrConfig) when is_atom(Testspec),
+				 is_list(ModsOrConfig) ->
+    case is_list_of_suites(ModsOrConfig) of
+	false ->
+	    run(Testspec, {config_list,ModsOrConfig});
+	true ->
+	    run_some([{Testspec,M} || M <- ModsOrConfig],
+		     [batch])
+    end;
+run(Testspec, {config_list,Config}) ->
     Options=check_test_get_opts(Testspec, Config),
+    IsSmoke=proplists:get_value(smoke,Config),
     File=atom_to_list(Testspec),
     WhatToDo =
 	case Testspec of
@@ -293,40 +317,93 @@ run(Testspec, Config) when is_atom(Testspec), is_list(Config) ->
 	case WhatToDo of
 	    skip ->
 		create_skip_spec(Testspec, tests(Testspec));
+	    test when IsSmoke ->
+		File++"_smoke.spec";
 	    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) ->
-    run_test({atom_to_list(Testspec), Mod}, 
+    run_test({atom_to_list(Testspec),Mod}, 
 	     [{suite,Mod}], 
 	     [interactive]).
 
 %% run/3
 %% Run one module in a spec with Config
-run(Testspec,Mod,Config) when is_atom(Testspec), is_atom(Mod), is_list(Config) ->
+run(Testspec, Mod, Config) when is_atom(Testspec),
+				is_atom(Mod),
+				is_list(Config) ->
     Options=check_test_get_opts(Testspec, Config),
-    run_test({atom_to_list(Testspec), Mod},
-	     [{suite,Mod}], 
-	     Options);
-
-%% Runs one testcase in a module.
-run(Testspec, Mod, Case) when is_atom(Testspec), is_atom(Mod), is_atom(Case) ->
+    run_test({atom_to_list(Testspec),Mod},
+	     [{suite,Mod}], Options);
+%% Run multiple modules with Config
+run(Testspec, Mods, Config) when is_atom(Testspec),
+				 is_list(Mods),
+				 is_list(Config) ->
+    run_some([{Testspec,M} || M <- Mods], Config);
+%% Runs one test case in a module.
+run(Testspec, Mod, Case) when is_atom(Testspec),
+			      is_atom(Mod),
+			      is_atom(Case) ->
+    Options=check_test_get_opts(Testspec, []),
+    Args = [{suite,Mod},{testcase,Case}],
+    run_test(atom_to_list(Testspec), Args, Options);
+%% Runs one or more groups in a module.
+run(Testspec, Mod, Grs={group,_Groups}) when is_atom(Testspec),
+					    is_atom(Mod) ->
+    Options=check_test_get_opts(Testspec, []),
+    Args = [{suite,Mod},Grs],
+    run_test(atom_to_list(Testspec), Args, Options);
+%% Runs one or more test cases in a module.
+run(Testspec, Mod, TCs={testcase,_Cases}) when is_atom(Testspec),
+					       is_atom(Mod) ->
     Options=check_test_get_opts(Testspec, []),
-    Args = [{suite,atom_to_list(Mod)},{testcase,atom_to_list(Case)}],
+    Args = [{suite,Mod},TCs],
     run_test(atom_to_list(Testspec), Args, Options).
 
 %% run/4
-%% Run one testcase in a module with Options.
+%% Run one test case in a module with Options.
 run(Testspec, Mod, Case, Config) when is_atom(Testspec), 
 				      is_atom(Mod), 
 				      is_atom(Case), 
 				      is_list(Config) ->
     Options=check_test_get_opts(Testspec, Config),
-    Args = [{suite,atom_to_list(Mod)}, {testcase,atom_to_list(Case)}],
+    Args = [{suite,Mod},{testcase,Case}],
+    run_test(atom_to_list(Testspec), Args, Options);
+%% Run one or more test cases in a module with Options.
+run(Testspec, Mod, {testcase,Cases}, Config) when is_atom(Testspec), 
+						  is_atom(Mod) ->
+    run(Testspec, Mod, Cases, Config);
+run(Testspec, Mod, Cases, Config) when is_atom(Testspec), 
+				       is_atom(Mod),
+				       is_list(Cases),
+				       is_list(Config) ->
+    Options=check_test_get_opts(Testspec, Config),
+    Args = [{suite,Mod},Cases],
+    run_test(atom_to_list(Testspec), Args, Options);
+%% Run one or more groups in a module with Options.
+run(Testspec, Mod, Grs={group,_Groups}, Config) when is_atom(Testspec), 
+						     is_atom(Mod) ->
+    Options=check_test_get_opts(Testspec, Config),
+    Args = [{suite,Mod},Grs],
     run_test(atom_to_list(Testspec), Args, Options).
 
+
+is_list_of_suites(List) ->
+    lists:all(fun(Suite) ->
+		      S = if is_atom(Suite) -> atom_to_list(Suite);
+			     true -> Suite
+			  end,
+		      try lists:last(string:tokens(S,"_")) of
+			  "SUITE" -> true;
+			  "suite" -> true;
+			  _ -> false
+		      catch
+			  _:_ -> false
+		      end
+	      end, List).	
+
 %% Create a spec to skip all SUITES, this is used when the application
 %% to be tested is not part of the OTP release to be tested.
 create_skip_spec(Testspec, SuitesToSkip) ->
@@ -507,7 +584,22 @@ bench(Specs, Opts) ->
 benchmarks() ->
     ts_benchmark:benchmarks().
 
+smoke_test() ->
+    smoke_test([]).
 
+smoke_test(Opts) when is_list(Opts) ->
+    smoke_test(smoke_tests(),Opts);
+smoke_test(Spec) ->
+    smoke_test([Spec],[]).
+
+smoke_test(Spec, Opts) when is_atom(Spec) ->
+    smoke_test([Spec],Opts);
+smoke_test(Specs, Opts) ->
+    run(Specs, [{smoke,true}|Opts]).
+
+smoke_tests() ->
+    {ok, Cwd} = file:get_cwd(),
+    ts_lib:specialized_specs(Cwd,"smoke").
 
 %% 
 %% estone/0, estone/1
@@ -596,7 +688,7 @@ run_test(File, Args, Options) ->
 run_test(File, Args, Options, Vars) ->
     ts_run:run(File, Args, Options, Vars).
 
-
+
 %% This module provides some convenient shortcuts to running
 %% the test server from within a started Erlang shell.
 %% (This are here for backwards compatibility.)
diff --git a/lib/test_server/src/ts.unix.config b/lib/test_server/src/ts.unix.config
index 5a2580f464..a34857b9e5 100644
--- a/lib/test_server/src/ts.unix.config
+++ b/lib/test_server/src/ts.unix.config
@@ -2,3 +2,5 @@
 
 %% Always run a (VNC) X server on host
 %% {xserver, "xserver.example.com:66"}.
+
+{unix,[{telnet,"belegost"},{username,"bofh"},{password,"root"},{keep_alive,true}]}.
diff --git a/lib/test_server/src/ts_benchmark.erl b/lib/test_server/src/ts_benchmark.erl
index 516d22fd2d..bd6abc3372 100644
--- a/lib/test_server/src/ts_benchmark.erl
+++ b/lib/test_server/src/ts_benchmark.erl
@@ -30,12 +30,7 @@
 
 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].
+    ts_lib:specialized_specs(Cwd,"bench").
 
 run(Specs, Opts, Vars) ->
     {ok, Cwd} = file:get_cwd(),
diff --git a/lib/test_server/src/ts_erl_config.erl b/lib/test_server/src/ts_erl_config.erl
index 8cd6a333d8..2d45d39700 100644
--- a/lib/test_server/src/ts_erl_config.erl
+++ b/lib/test_server/src/ts_erl_config.erl
@@ -109,7 +109,10 @@ erts_lib(Vars,OsType) ->
      ErtsLibIncludeInternal,
      ErtsLibIncludeInternalGenerated,
      ErtsLibPath,
-     ErtsLibInternalPath}
+     ErtsLibInternalPath,
+     ErtsLibEthreadMake,
+     ErtsLibInternalMake
+    }
 	= case erl_root(Vars) of
 	      {installed, _Root} ->
 		  Erts = lib_dir(Vars, erts),
@@ -117,12 +120,17 @@ erts_lib(Vars,OsType) ->
 		  ErtsIncludeInternal = filename:join([ErtsInclude, "internal"]),
 		  ErtsLib = filename:join([Erts, "lib"]),
 		  ErtsLibInternal = filename:join([ErtsLib, "internal"]),
+		  ErtsEthreadMake = filename:join([ErtsIncludeInternal, "ethread.mk"]),
+		  ErtsInternalMake = filename:join([ErtsIncludeInternal, "erts_internal.mk"]),
+
 		  {ErtsInclude,
 		   ErtsInclude,
 		   ErtsIncludeInternal,
 		   ErtsIncludeInternal,
 		   ErtsLib,
-		   ErtsLibInternal};
+		   ErtsLibInternal,
+		   ErtsEthreadMake,
+		   ErtsInternalMake};
 	      {srctree, Root, Target} ->
 		  Erts = filename:join([Root, "erts"]),
 		  ErtsInclude = filename:join([Erts, "include"]),
@@ -136,12 +144,17 @@ erts_lib(Vars,OsType) ->
 						   "lib",
 						   "internal",
 						   Target]),
+		  ErtsEthreadMake = filename:join([ErtsIncludeInternalTarget, "ethread.mk"]),
+		  ErtsInternalMake = filename:join([ErtsIncludeInternalTarget, "erts_internal.mk"]),
+
 		  {ErtsInclude,
 		   ErtsIncludeTarget,
 		   ErtsIncludeInternal,
 		   ErtsIncludeInternalTarget,
 		   ErtsLib,
-		   ErtsLibInternal}
+		   ErtsLibInternal,
+		   ErtsEthreadMake,
+		   ErtsInternalMake}
 	  end,
     [{erts_lib_include,
       quote(filename:nativename(ErtsLibInclude))},
@@ -154,7 +167,9 @@ erts_lib(Vars,OsType) ->
      {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)}
+     {erts_lib_single_threaded, erts_lib_name(single_threaded, OsType)},
+     {erts_lib_make_ethread, quote(ErtsLibEthreadMake)},
+     {erts_lib_make_internal, quote(ErtsLibInternalMake)}
      | Vars].
 
 erl_include(Vars) ->
@@ -190,10 +205,10 @@ erl_interface(Vars,OsType) ->
 		 case erl_root(Vars) of
 		     {installed, _Root} ->
 			 {filename:join(Dir, "lib"),
-			  filename:join(Dir, "src")};
+			  filename:join([Dir, "src", "eidefs.mk"])};
 		     {srctree, _Root, Target} ->
 			 {filename:join([Dir, "obj", Target]),
-			  filename:join([Dir, "src", Target])}
+			  filename:join([Dir, "src", Target, "eidefs.mk"])}
 		 end}
 	end,
     Lib = link_library("erl_interface",OsType),
@@ -234,10 +249,10 @@ erl_interface(Vars,OsType) ->
 		end,
     [{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_lib, quote(filename:join(LibPath, Lib))},
+     {erl_interface_eilib, quote(filename:join(LibPath, Lib1))},
+     {erl_interface_lib_drv, quote(filename:join(LibPath, LibDrv))},
+     {erl_interface_eilib_drv, quote(filename:join(LibPath, Lib1Drv))},
      {erl_interface_threadlib, ThreadLib},
      {erl_interface_include, quote(filename:nativename(Incl))},
      {erl_interface_mk_include, quote(filename:nativename(MkIncl))}
@@ -260,7 +275,7 @@ ic(Vars, OsType) ->
 	end,
     [{ic_classpath, quote(filename:nativename(ClassPath))},
      {ic_libpath, quote(filename:nativename(LibPath))},
-     {ic_lib, link_library("ic", OsType)},
+     {ic_lib, quote(filename:join(filename:nativename(LibPath),link_library("ic", OsType)))},
      {ic_include_path, quote(filename:nativename(Incl))}|Vars].
 
 jinterface(Vars, _OsType) ->
@@ -370,9 +385,18 @@ separators(Vars, {win32,_}) ->
 separators(Vars, _) ->
     [{'DS',"/"},{'PS',":"}|Vars].
 
-quote([$ |R]) ->
-    "\\ "++quote(R);
-quote([C|R]) ->
-    [C|quote(R)];
-quote([]) ->
-    [].
+quote(List) ->
+    case lists:member($ , List) of
+	false -> List;
+	true -> make_quote(List)
+    end.
+
+make_quote(List) ->
+    case os:type() of
+	{win32, _} -> %% nmake"
+	    [$"] ++ List ++ [$"];
+	_ -> %% make
+	    BackQuote = fun($ , Acc) -> [$\\ , $  |Acc];
+			   (Char, Acc) -> [Char|Acc] end,
+	    lists:foldr(BackQuote, [], List)
+    end.
diff --git a/lib/test_server/src/ts_install.erl b/lib/test_server/src/ts_install.erl
index e9e559df5d..bc62015ac3 100644
--- a/lib/test_server/src/ts_install.erl
+++ b/lib/test_server/src/ts_install.erl
@@ -112,6 +112,12 @@ get_vars([], name, [], Result) ->
 get_vars(_, _, _, _) ->
     {error, fatal_bad_conf_vars}.
 
+config_flags() ->
+    case os:getenv("CONFIG_FLAGS") of
+	false -> [];
+	CF -> string:tokens(CF, " \t\n")
+    end.
+
 unix_autoconf(XConf) ->
     Configure = filename:absname("configure"),
     Flags = proplists:get_value(crossflags,XConf,[]),
@@ -122,11 +128,14 @@ unix_autoconf(XConf) ->
 		  erlang:system_info(threads) /= false],
     Debug = [" --enable-debug-mode" ||
 		string:str(erlang:system_info(system_version),"debug") > 0],
-    Args = Host ++ Build ++ Threads ++ Debug,
+    MXX_Build = [Y || Y <- config_flags(),
+		      Y == "--enable-m64-build"
+			  orelse Y == "--enable-m32-build"],
+    Args = Host ++ Build ++ Threads ++ Debug ++ " " ++ MXX_Build,
     case filelib:is_file(Configure) of
 	true ->
 	    OSXEnv = macosx_cflags(),
-	    io:format("Running ~sEnv: ~p~n",
+	    io:format("Running ~s~nEnv: ~p~n",
 		      [lists:flatten(Configure ++ Args),Env++OSXEnv]),
 	    Port = open_port({spawn, lists:flatten(["\"",Configure,"\"",Args])},
 			     [stream, eof, {env,Env++OSXEnv}]),
@@ -135,7 +144,6 @@ unix_autoconf(XConf) ->
 	    {error, no_configure_script}
     end.
 
-
 get_xcomp_flag(Flag, Flags) ->
     get_xcomp_flag(Flag, Flag, Flags).
 get_xcomp_flag(Flag, Tag, Flags) ->
diff --git a/lib/test_server/src/ts_lib.erl b/lib/test_server/src/ts_lib.erl
index a00f607fc1..5368960446 100644
--- a/lib/test_server/src/ts_lib.erl
+++ b/lib/test_server/src/ts_lib.erl
@@ -27,6 +27,7 @@
 	 erlang_type/1,
 	 initial_capital/1,
 	 specs/1, suites/2,
+	 specialized_specs/2,
 	 subst_file/3, subst/2, print_data/1,
 	 make_non_erlang/2,
 	 maybe_atom_to_list/1, progress/4,
@@ -91,13 +92,22 @@ initial_capital([C|Rest]) when $a =< C, C =< $z ->
 initial_capital(String) ->
     String.
 
+specialized_specs(Dir,PostFix) ->
+    Specs = filelib:wildcard(filename:join([filename:dirname(Dir),
+					    "*_test", "*_"++PostFix++".spec"])),
+    sort_tests([begin
+		    Base = filename:basename(Name),
+		    list_to_atom(string:substr(Base,1,string:rstr(Base,"_")-1))
+		end || Name <- Specs]).
+
 specs(Dir) ->
     Specs = filelib:wildcard(filename:join([filename:dirname(Dir),
 					    "*_test", "*.{dyn,}spec"])),
-    % Filter away all spec which end with _bench.spec
+    % Filter away all spec which end with {_bench,_smoke}.spec
     NoBench = fun(SpecName) ->
 		      case lists:reverse(SpecName) of
 			  "ceps.hcneb_"++_ -> false;
+			  "ceps.ekoms_"++_ -> false;
 			  _ -> true
 		      end
 	      end,
@@ -135,16 +145,13 @@ suite_order(sasl) -> 16;
 suite_order(tools) -> 18;
 suite_order(runtime_tools) -> 19;
 suite_order(parsetools) -> 20;
-suite_order(pman) -> 21;
 suite_order(debugger) -> 22;
-suite_order(toolbar) -> 23;
 suite_order(ic) -> 24;
 suite_order(orber) -> 26;
 suite_order(inets) -> 28;
 suite_order(asn1) -> 30;
 suite_order(os_mon) -> 32;
 suite_order(snmp) -> 38;
-suite_order(mnesia_session) -> 42;
 suite_order(mnesia) -> 44;
 suite_order(system) -> 999; %% IMPORTANT: system SHOULD always be last!
 suite_order(_) -> 200.
@@ -157,7 +164,7 @@ subst_file(In, Out, Vars) ->
     case file:read_file(In) of
 	{ok, Bin} ->
 	    Subst = subst(b2s(Bin), Vars, []),
-	    case file:write_file(Out, Subst) of
+	    case file:write_file(Out, unicode:characters_to_binary(Subst)) of
 		ok ->
 		    ok;
 		{error, Reason} ->
diff --git a/lib/test_server/src/ts_make.erl b/lib/test_server/src/ts_make.erl
index f3266f5836..8727f7ebfe 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-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
 %% 
 %% The 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,7 +67,7 @@ get_port_data(Port, Last0, Complete0) ->
     end.
 
 update_last([C|Rest], Line, true) ->
-    io:put_chars(Line),
+    io:put_chars(list_to_binary(Line)), %% Utf-8 list to utf-8 binary
     io:nl(),
     update_last([C|Rest], [], false);
 update_last([$\r|Rest], Result, Complete) ->
@@ -79,7 +79,7 @@ update_last([C|Rest], Result, Complete) ->
 update_last([], Result, Complete) ->
     {Result, Complete};
 update_last(eof, Result, _) ->
-    Result.
+    unicode:characters_to_list(list_to_binary(Result)).
 
 run_make_script({win32, _}, Make, Dir, Makefile) ->
     {"run_make.bat",
diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index 60c9a7a4b7..d96abfc55a 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -224,7 +224,7 @@ make_command(Vars, Spec, State) ->
     CrashFile = filename:join(Cwd,State#state.file ++ "_erl_crash.dump"),
     case filelib:is_file(CrashFile) of
 	true -> 
-	    io:format("ts_run: Deleting dump: ~s\n",[CrashFile]),
+	    io:format("ts_run: Deleting dump: ~ts\n",[CrashFile]),
 	    file:delete(CrashFile);
 	false -> 
 	    ok
@@ -258,8 +258,8 @@ make_command(Vars, Spec, State) ->
 run_batch(Vars, _Spec, State) ->
     process_flag(trap_exit, true),
     Command = State#state.command ++ " -noinput -s erlang halt",
-    ts_lib:progress(Vars, 1, "Command: ~s~n", [Command]),
-    io:format(user, "Command: ~s~n",[Command]),
+    ts_lib:progress(Vars, 1, "Command: ~ts~n", [Command]),
+    io:format(user, "Command: ~ts~n",[Command]),
     Port = open_port({spawn, Command}, [stream, in, eof]),
     Timeout = 30000 * case os:getenv("TS_RUN_VALGRIND") of
 			  false -> 1;
diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 8ad5fcfb5c..d1772ac411 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
@@ -117,7 +116,7 @@ test_server_shuffle01_SUITE(Config) ->
 
 test_server_skip_SUITE(Config) ->
     run_test_server_tests("test_server_skip_SUITE", [],
-			  3, 0, 1, 0, 0, 1, 3, 0, 0, Config).
+			  3, 0, 1, 0, 1, 0, 3, 0, 0, Config).
 
 test_server_conf01_SUITE(Config) ->
     run_test_server_tests("test_server_conf01_SUITE", [],
@@ -248,11 +247,13 @@ run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc,
     {NActualSkip,NActualFail,NActualSucc} = 
 	lists:foldl(fun(#tc{ result = skip },{S,F,Su}) ->
 			     {S+1,F,Su};
-			 (#tc{ result = ok },{S,F,Su}) ->
-			     {S,F,Su+1};
-			(#tc{ result = failed },{S,F,Su}) ->
-			     {S,F+1,Su}
-			  end,{0,0,0},Data#suite.cases),
+		       (#tc{ result = auto_skip },{S,F,Su}) ->
+			    {S+1,F,Su};
+		       (#tc{ result = ok },{S,F,Su}) ->
+			    {S,F,Su+1};
+		       (#tc{ result = failed },{S,F,Su}) ->
+			    {S,F+1,Su}
+		    end,{0,0,0},Data#suite.cases),
     Data.
 
 translate_filename(Filename,EncodingOnTestNode) ->
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl
index 284b51babe..03f371fc8c 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_unicode_SUITE.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/test_server/test/test_server_test_lib.erl b/lib/test_server/test/test_server_test_lib.erl
index cd6804f7ad..82a702d59f 100644
--- a/lib/test_server/test/test_server_test_lib.erl
+++ b/lib/test_server/test/test_server_test_lib.erl
@@ -17,6 +17,7 @@
 %% %CopyrightEnd%
 %%
 -module(test_server_test_lib).
+
 -export([parse_suite/1]).
 -export([init/2, pre_init_per_testcase/3, post_end_per_testcase/4]).
 
@@ -185,7 +186,9 @@ parse_case("=result" ++ Result, _, Tc) ->
 	"failed" ++ _ ->
 	    {ok, Tc#tc{ result = failed } };
 	"skipped" ++ _ ->
-	    {ok, Tc#tc{ result = skip } }
+	    {ok, Tc#tc{ result = skip } };
+	"auto_skipped" ++ _ ->
+	    {ok, Tc#tc{ result = auto_skip } }
     end;
 parse_case("=finished" ++ _ , _Fd, #tc{ name = undefined }) ->
     finished;
diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk
index 1753bbb913..6871b5bd14 100644
--- a/lib/test_server/vsn.mk
+++ b/lib/test_server/vsn.mk
@@ -1 +1 @@
-TEST_SERVER_VSN = 3.6.2
+TEST_SERVER_VSN = 3.6.4
diff --git a/lib/toolbar/AUTHORS b/lib/toolbar/AUTHORS
deleted file mode 100644
index c5a649d938..0000000000
--- a/lib/toolbar/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Original Authors and Contributors:
-
-Gunilla Arendt
\ No newline at end of file
diff --git a/lib/toolbar/Makefile b/lib/toolbar/Makefile
deleted file mode 100644
index 5326457976..0000000000
--- a/lib/toolbar/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# %CopyrightBegin%
-# 
-# Copyright Ericsson AB 1996-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%
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src doc/src
-
-include vsn.mk
-VSN = $(TOOLBAR_VSN)
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/toolbar/doc/html/.gitignore b/lib/toolbar/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/toolbar/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/toolbar/doc/man3/.gitignore b/lib/toolbar/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/toolbar/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/toolbar/doc/pdf/.gitignore b/lib/toolbar/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/toolbar/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/toolbar/doc/src/Makefile b/lib/toolbar/doc/src/Makefile
deleted file mode 100644
index 2239421556..0000000000
--- a/lib/toolbar/doc/src/Makefile
+++ /dev/null
@@ -1,115 +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%
-#
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(TOOLBAR_VSN)
-APPLICATION=toolbar
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = toolbar.xml
-
-XML_PART_FILES = part.xml part_notes.xml
-XML_CHAPTER_FILES = toolbar_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 = \
-	bar.gif \
-	create_tool.gif \
-	note.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/toolbar/doc/src/bar.gif b/lib/toolbar/doc/src/bar.gif
deleted file mode 100644
index c249d891dd..0000000000
--- a/lib/toolbar/doc/src/bar.gif
+++ /dev/null
diff --git a/lib/toolbar/doc/src/bar.ps b/lib/toolbar/doc/src/bar.ps
deleted file mode 100644
index 850ebdbee5..0000000000
--- a/lib/toolbar/doc/src/bar.ps
+++ /dev/null
@@ -1,846 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: /home/kent/otp/toolbar/doc/bar.ps
-%%Creator: XV Version 3.10a  Rev: 12/29/94  -  by John Bradley
-%%BoundingBox: 165 346 447 446
-%%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 282 string def
-
-% define space for color conversions
-/grays 282 string def  % space for gray scale line
-/npixls 0 def
-/rgbindx 0 def
-
-% lower left corner
-165 346 translate
-
-% size of image (on paper, in 1/72inch coords)
-282.02400 100.00800 scale
-
-282 100 8			% dimensions of data
-[282 0 0 -100 0 100]		% mapping matrix
-{currentfile pix readhexstring pop}
-image
-
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c000
-c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffff7300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-14141414141414141414141414141414141414141414141414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-14141414141414141414141414141414141414141414141414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffffffffffffffffffffffffffffff00ffffffffffffffffffffff
-ffffffff001414ffffffffffffffffffffffffffffff001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c0c0c0c0c0c0c0c0c0
-c0c0c073001414ffc0c0c0c0c0c0c0c0c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141457575757571414141414141457141414141414ffffffffffff1414
-14141414ffff1414141414141414141414141414141414141414141414141414ffffffff
-ffffffff1414141414141414141414141414ffff14141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c00000000000000000
-00c0c073001414ffc0c0c0c0c0c0c0c0c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414575757575714141414145714141414141414ffff141414141414
-14141414ffff1414141414141414141414141414141414141414141414141414141414ff
-ff1414141414141414141414141414141414ffff14141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c00000000000000000
-00c0c073001414ffc0c0c00000c0c0c0c00000c0c073001414c0c0c07300
-c0ffc0c0c01414141414145757575757141414571414141414141414ffff1414141414ff
-ff14ffffffff1414ffffffff1414ffff14ffff141414ffff14ffff1414141414141414ff
-ff14141414ffffffff141414ffffffff1414ffff1414ffffffff14141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c0
-00c0c073001414ffc0c0c0c00000c0c00000c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141457575757571457141414141414141414ffff1414141414ff
-ffffffffffff14ffff1414ffff14ffffff14ffff14ffff14ffffff1414141414141414ff
-ff141414ffff1414ffff14ffff1414ffff14ffff14ffff1414ffff141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c0
-00c0c073001414ffc0c0c0c0c000000000c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141414575757145714141414141414141414ffffffffffff14ff
-ffff1414ffff1414141414ffff14ffff1414ffff14ffff1414ffff1414141414141414ff
-ff141414ffff1414ffff14ffff1414ffff14ffff14ffffff141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c0
-00c0c073001414ffc0c0c0c0c0c00000c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141414145714575757141414141414141414ffff1414141414ff
-ff141414ffff1414ffffffffff14ffff1414ffff14ffff1414ffff1414141414141414ff
-ff141414ffff1414ffff14ffff1414ffff14ffff141414ffffff14141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c0
-00c0c073001414ffc0c0c0c0c000000000c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141414571457575757571414141414141414ffff1414141414ff
-ff141414ffff14ffff1414ffff14ffff1414ffff14ffff1414ffff1414141414141414ff
-ff141414ffff1414ffff14ffff1414ffff14ffff14141414ffffff141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c0
-00c0c073001414ffc0c0c0c00000c0c00000c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141457141414575757575714141414141414ffff1414141414ff
-ff141414ffff14ffff1414ffff14ffff1414ffff14ffff14ffffff1414141414141414ff
-ff141414ffff1414ffff14ffff1414ffff14ffff14ffff1414ffff141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0000000000000c0c0c0c07300ffc0c000c0c0c0c0c0c0c0
-00c0c073001414ffc0c0c00000c0c0c0c00000c0c073001414c0c0c07300
-c0ffc0c0c01414141414145714141414145757575757141414141414ffffffffffff14ff
-ff141414ffff1414ffffff14ffffffff1414ffff1414ffff14ffff1414141414141414ff
-ff14141414ffffffff141414ffffffff1414ffff1414ffffffff14141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0000000000000c0c0c0c07300ffc0c00000000000000000
-00c0c073001414ffc0c0c0c0c0c0c0c0c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c014141414145714141414141414575757575714141414141414141414141414
-14141414141414141414141414141414141414141414141414ffff141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ffc0c0c0c0c0c0c0c0c0c0c0c0c07300ffc0c0c0c0c0c0c0c0c0c0
-c0c0c073001414ffc0c0c0c0c0c0c0c0c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414ffff1414ffff141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414ff737373737373737373737373737300ff73737373737373737373
-73737373001414ff7373737373737373737373737373001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-14141414141414141414141414141414141414141414ffffffff14141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414000000000000000000000000000000000000000000000000000000
-00000000001414000000000000000000000000000000001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-14141414141414141414141414141414141414141414141414c0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffc0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffff82c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d90000000000d9d9d9d9d900d9d9d9d9000000d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d90000000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900d9d9d9d9d9d9d9000000d9d9d9d9d9d900d9d9d9d90000
-00d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9000000d9d9d9d9000000d9d9d9d9d9d9
-00d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-000000d9d9d9d9d9d900d9d9d900d90000d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d9d9d9d900d9d9d900d9d9
-d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-00d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d900
-d9d9d900d9d9d9d9d900d9d9d90000d9d900d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900000000d9d9d9d9d9d900d9d9d9d9d9d900d9d9d900d9d9
-d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-00d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000000000d9d900
-d9d9d900d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d9d9d9d900d9d9d9000000
-0000d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-00d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d900
-00000000d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d9d9d9d900d9d9d900d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-00d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d900
-d9d9d9d9d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d9d9d9d900d9d9d900d9d9
-d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-00d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d900
-d9d9d900d9d9d9d9d900d9d9d90000d9d900d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d9d9d9d900d9d9d9d90000
-00d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9000000d9d9d9d9000000d9d9d9d9d9d9
-00d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-000000d9d9d9d9d9d900d9d9d900d90000d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffff8282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282c0c0c07300
-c0ffc0c0c0ff828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282c0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffff57c0c0c07300
-c0ffc0c0c0ffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d957c0c0c07300
-c0ffc0c0c0ffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d957c0c0c07300
-c0ffc0c0c0ffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9dbbdd0dbd9d9d9d9d9d9d9dec7a9ded9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d7d7d7d7474747474747474727272747474747474747474747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d95757bebebebe
-bebebebebebebebebebebebebebebebebebebebebe5757d957c0c0c07300
-c0ffc0c0c0ffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9dcd0a9dadad9dbdbd9d9dcd0a9d0dcd9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d7d7d747474747472727272727272727272747474747474747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9575757bebebe
-bebebebebebebebebebebebebebebebebebebebe575757d957c0c0c07300
-c0ffc0c0c0ffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9dad0c3bdb3dadcd4d5dbdbc7b3d0e1d5d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebe000000000000000000bebebebebebebebebebed9ffff
-d9d9bebebebebed7d7d7bebebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d7d74747474727272727272727272777777727274747474747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9be575757bebe
-bebebebebebebebebebebebebebebebebebebe57575757d957c0c0c07300
-c0ffc0c0c0ffd9d9bebebe000000000000000000000000000000000000007dbebebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9dcc79ce1bda9bd6f60a9bdbddbe5a9a9d0dad5d4d4d4d9
-ffffd9d9bebebebebebebebebebe007f7f7f7f7f7f7f00bebebebebebebebebebed9ffff
-d9d9bebebebed7d7d7d7d7bebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d7d747474727272727272727277779e769e777772727474747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9bebe575757be
-bebebebebebebebebebebebebebebebebebe57575757bed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9dbd083bde5bd8f536f9cc3dedea96fa9bddcd5d4d4d4d9
-ffffd9d9bebebebebebebebebebe007f7f7f7f7f7f7f00bebebebebebebebebebed9ffff
-d9d9bebebed7d7d7d7d7d7d7bebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebe000000000000000000000000000000000000000000bebebebed9ffffd9d97d7d
-7d747472727272727272727777779e9e7695897777727274747474d9ffffd9d9bebebebe
-000000000000bebebebebebebebebe000000000000bebebebed9ffffd9d9bebebe575757
-bebebebebe00000000000000bebebebebe57575757bebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00000000000000000000000000000000007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9e1b379ded6831f6083d0e58379deded9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebe000000000000000000bebebebebebebebebebed9ffff
-d9d9bebebed7d7d7d7d7d7d7bebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d7d
-7d7472727272727272727777779e9e7697a6829e77777272747474d9ffffd9d9bebebebe
-002727272700bebebebebebebebebe005757575700bebebebed9ffffd9d9bebebebe5757
-57bebebe0000ffffffffff000000bebe57575757bebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00272727272727272727272727272727007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9dcd03cc3d948531f3cdcda60c3ded9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebe00bebebebebebebebebebebebebebed9ffff
-d9d9bebebed7d7d7d7d7d7d7bebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d7d
-7474727272727272727777777789899d00008d899e777272727474d9ffffd9d9bebebebe
-002727272700bebebebebebebebebe005757575700bebebebed9ffffd9d9bebebebebe57
-5757be0000ffffffffffffffff00be57575757bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d0027ffff2727ff2727ffff2727ffff27007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9d9ea79a99c489c3c11a99c83e5d9d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebe00bebebebebebebebebebebebebebed9ffff
-d9d9bebebebed7d7d7d7d7bebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d7d
-7472727272727272777777897f8d7f7f40007f9782827772727274d9ffffd9d9bebebebe
-002727272700bebebebebebebebebe005757575700bebebebed9ffffd9d9bebebebebebe
-57575700ffffffffffffffffffff57575757bebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00272727272727272727272727272727007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9d9e1a9606f1f532a116f48bdded9d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebe00000000000000000000000000000000bebebebebebebed9ffff
-d9d9bebebebebed7d7d7bebebebebebebebebebebebed7d7d7bebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d7d
-7272727272727277779e9e897f005600000000007f959e72727274d9ffffd9d9bebebebe
-002727272700bebebebebebebebebe005757575700bebebebed9ffffd9d9bebebebebebe
-be575757ffff00ffffffff00ff57575700bebebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d0027ffff2727ff2727ffff2727ffff27007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9d9d9ea9c3648362a1148d0ded9d9d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebe00bebebebebebebebebebebebebebe00bebebebebebebed9ffff
-d9d9bebebebebebebe00bebebebebebebebebebebed7d7d7d7d7bebebebebed9ffffd9d9
-bebebebe000000000000000000000000000000000000000000bebebebed9ffffd9d97d74
-727272727272779e9e9e8976970000000000000000009e77727272d9ffffd9d9bebebebe
-000000000000bebebebe0000000000000000000000bebebebed9ffffd9d9bebebebebebe
-0000575757ffff00ffff00ff575757000000bebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00272727272727272727272727272727007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9dae5a9534883363c1f1fb3dedcd9d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebe00bebebebebebebebebebebebebebe00bebebebebebebed9ffff
-d9d9bebebebebebebe00bebebebebebebebebebed7d7d7d7d7d7d7bebebebed9ffffd9d9
-bebebebe00515151510051ffff510051000051005151515100bebebebed9ffffd9d97d72
-727272779e8982828282827d000000000000000000008977727272d9ffffd9d9bebebebe
-007f7f7f7f00bebebebe0027272727007f7f7f7f00bebebebed9ffffd9d9bebebebebebe
-000000575757ffffffffff57575700000000bebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d0027ffff2727ff2727ffff2727ffff27007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9e59c36606083603c2a1f5379dbdbd9d9d9d5d4d4d4d9
-ffffd9d9bebe000000000000000000bebebebebebe000000000000000000bebebed9ffff
-d9d9bebebebebebebebe00bebebebebebebebebed7d7d7d7d7d7d7bebebebed9ffffd9d9
-bebebebe005151515100ffffffff0000000000005151515100bebebebed9ffffd9d97d72
-727777779e893197958d8d89000000000000000000008977727272d9ffffd9d9bebebebe
-007f7f7f7f00bebebebe0027272727007f7f7f7f00bebebebed9ffffd9d9bebebebebebe
-00ff0000575757000000575757000000ff00bebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00272727272727272727272727272727007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9d9e1a953bd79608f8348302ab34879dedad9d9d5d4d4d4d9
-ffffd9d9bebe005757575757575700bebebebebebe007f7f7f7f7f7f7f00bebebed9ffff
-d9d9bebebebebebebebe00bebebebebebebebebed7d7d7d7d7d7d7bebebebed9ffffd9d9
-bebebebe005151515100ffffffff0000000000005151515100bebebebed9ffffd9d97d72
-7777779e9e823800006e7f00000000000000000000008977727272d9ffffd9d9bebebebe
-007f7f7f7f00bebebebe0027272727007f7f7f7f00bebebebed9ffffd9d9bebebebebe00
-ffff00000057575700575757000000ffffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d0027ffff2727ff2727ffff2727ffff27007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9dbdb53b3ea6f798f7930301fd4a92ad0dcd9d9d5d4d4d4d9
-ffffd9d9bebe005757575757575700bebebebebebe007f7f7f7f7f7f7f00bebebed9ffff
-d9d9bebebebebebebebebe00bebebebebebebebebed7d7d7d7d7bebebebebed9ffffd9d9
-bebebebe00515151510051ffff510051000051005151515100bebebebed9ffffd9d97d77
-77778989567f000000000000000000000000000000009e77727272d9ffffd9d9bebebebe
-007f7f7f7f00bebebebe0027272727007f7f7f7f00bebebebed9ffffd9d9bebebebebe00
-ffffff000000575757575700000000ffffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00272727272727272727272727272727007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4d9e1a99cdee58f6f9c6f303c1fb3e560bde1d9d9d5d4d4d4d9
-ffffd9d9bebe000000000000000000bebebebebebe000000000000000000bebebed9ffff
-d9d9bebebebebebebebebe00bebebebebebebebebe00d7d7d7bebebebebebed9ffffd9d9
-bebebebe000000000000000000000000000000000000000000bebebebed9ffffd9d97d9e
-8282768d9500000000000000000000000000000000899e77777272d9ffffd9d9bebebebe
-000000000000000000000000000000000000000000bebebebed9ffffd9d9bebebebebe00
-ffffffff00000057575700000000ffffffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00272727272727272727272727272727007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d4dbd06fd4e19c48608f532a3630bdeaa953d0ded9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebe00bebebebebebebed9ffff
-d9d9bebebebebebebebebebe00bebebebebebebe00bebebebebebebebebebed9ffffd9d9
-bebebebe005151515100510000510051ffff51005151515100bebebebed9ffffd9d97d9e
-8282768d9500000000000000000000000000000000899e77777272d9ffffd9d9bebebebe
-005757575700d7d7d7d7005757575700ffffffff00bebebebed9ffffd9d9bebebebebe00
-ffffffffff0057575757570000ffffffffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d00000000000000000000000000000000007d007dbebebebe
-bed9ffffd9d9d4d4d4d4d5de6f79ea9c112a606f6f3c11116fc7ea606fdad9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebe00bebebebebebebed9ffff
-d9d9bebebebebebebebebebe00bebebebebebe00bebebebebebebebebebebed9ffffd9d9
-bebebebe0051515151000000000000ffffffff005151515100bebebebed9ffffd9d97d77
-77778989567f000000000000000000000000000000009e77727272d9ffffd9d9bebebebe
-005757575700d7d7d7d7005757575700ffffffff00bebebebed9ffffd9d9bebebebebe00
-ffff00ffffff575700575757ffffff00ffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebe007d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d007dbebebebe
-bed9ffffd9d9d4d4d4d4d6d053c7c71f1f3c484848361f034860a9d57983d9d6d4d4d4d9
-ffffd9d9bebebebebebebebebe00000000000000000000000000bebebebebebebed9ffff
-d9d9bebebebebebebebebebebe00bebebebebe00bebebebebebebebebebebed9ffffd9d9
-bebebebe0051515151000000000000ffffffff005151515100bebebebed9ffffd9d97d72
-7777779e9e823800006e7f00000000000000000000008977727272d9ffffd9d9bebebebe
-005757575700d7d7d7d7005757575700ffffffff00bebebebed9ffffd9d9bebebebebe00
-ffff00ffff570057ffff575757ffff00ffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9bebebe000000000000000000000000000000000000007d7d7dbebebe
-bed9ffffd9d9d4d4d4d4d6d0a9da601130363648111f111160303cc7d09cd4d6d4d4d4d9
-ffffd9d9bebebebebebebebebe00bebebebebebebebebebebe00bebebebebebebed9ffff
-d9d9bebebebebebebebebebebe00be7f7f7f00bebebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100510000510051ffff51005151515100bebebebed9ffffd9d97d72
-727777779e893197958d8d89000000000000000000008977727272d9ffffd9d9bebebebe
-005757575700d7d7d7d7005757575700ffffffff00bebebebed9ffffd9d9bebebebebe00
-ffff000057005700ffff005757570000ffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9be00000000000000000000000000000000000000000000007dbebebe
-bed9ffffd9d9d4d4d4d4d4d9e5bd111f489c1f2a11030330bd79366fe5dedad5d4d4d4d9
-ffffd9d9bebebebebe000000000000000000bebebe000000000000000000bebebed9ffff
-d9d9bebebebebebebebebebebebe7f7f7f7f7fbebebebebebebebebebebebed9ffffd9d9
-bebebebe000000000000000000000000000000000000000000bebebebed9ffffd9d97d72
-727272779e8982828282827d000000000000000000008977727272d9ffffd9d9bebebebe
-000000000000000000000000000000000000000000bebebebed9ffffd9d9bebebebebebe
-00ffff570057ff0000000000575757ffffff00bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9be007d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d007dbebe
-bed9ffffd9d9d4d4d4d4d4d9e58f0379d6d653111f11116fead41f83e5dad9d5d4d4d4d9
-ffffd9d9bebebebebe007f7f7f7f7f7f7f00bebebe005757575757575700bebebed9ffff
-d9d9bebebebebebebebebebebe7f7f7f7f7f7f7fbebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d74
-727272727272779e9e9e8976970000000000000000009e77727272d9ffffd9d9bebebebe
-00d7d7d7d700ffffffff007f7f7f7f002727272700bebebebed9ffffd9d9bebebebebebe
-00ff5757570000000000000000575757ff00bebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9be007d7d007d007d007d007d007d007d007d007d007d7d007d7dbebe
-bed9ffffd9d9d4d4d4d4d4d9e57903c7e5e5831103032ac3ea8f48d0dcd9d9d5d4d4d4d9
-ffffd9d9bebebebebe007f7f7f7f7f7f7f00bebebe005757575757575700bebebed9ffff
-d9d9bebebebebebebebebebebe7f7f7f7f7f7f7fbebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d7d
-7272727272727277779e9e897f005600000000007f959e72727274d9ffffd9d9bebebebe
-00d7d7d7d700ffffffff007f7f7f7f002727272700bebebebed9ffffd9d9bebebebebebe
-be57575700000000000000000000575757bebebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9be007d00be00be00be00be00be00be00be00be00be007d007d7dbebe
-bed9ffffd9d9d4d4d4d4d4d9debd2a60dee1d060112a9ceac3368fe5d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebe000000000000000000bebebe000000000000000000bebebed9ffff
-d9d9bebebebebebebebebebebe7f7f7f7f7f7f7fbebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d7d
-7472727272727272777777897f8d7f7f40007f9782827772727274d9ffffd9d9bebebebe
-00d7d7d7d700ffffffff007f7f7f7f002727272700bebebebed9ffffd9d9bebebebebebe
-57575700ff0000ff0000ff0000ffff575757bebebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9be007d7d007d007d007d007d007d007d007d007d007d7d00007dbebe
-bed9ffffd9d9d4d4d4d4d4d9d9e1c34860d9e5d6a9c3e5c7481fd0ded9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebe7f7f7f7f7fbebebebebebebebebebebebed9ffffd9d9
-bebebebe005151515100515151510051515151005151515100bebebebed9ffffd9d97d7d
-7474727272727272727777777789899d00008d899e777272727474d9ffffd9d9bebebebe
-00d7d7d7d700ffffffff007f7f7f7f002727272700bebebebed9ffffd9d9bebebebebe57
-5757be0000ffffffffffffffffff00be575757bebebebed957c0c0c07300
-c0ffc0c0c0ffd9d9be007d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d0000bebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9e1d65360d4e1deded453308fe1d9d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebebe7f7f7fbebebebebebebebebebebebebed9ffffd9d9
-bebebebe000000000000000000000000000000000000000000bebebebed9ffffd9d97d7d
-7d7472727272727272727777779e9e7697a6829e77777272747474d9ffffd9d9bebebebe
-000000000000000000000000000000000000000000bebebebed9ffffd9d9bebebebe5757
-57bebebe00ffffffffffffff0000bebebe575757bebebed957c0c0c07300
-c0ffc0c0c0ffd9d9be007d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d0000bebe
-bed9ffffd9d9d4d4d4d4d4d9d9d9d9dee13c60d9dbdebd7960d0dcd9d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d747472727272727272727777779e9e7695897777727274747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9bebebe575757
-bebebebebe00000000000000bebebebebebe575757bebed957c0c0c07300
-c0ffc0c0c0ffd9d9be0000000000000000000000000000000000000000000000007dbebe
-bed9ffffd9d9d4d4d4d4d4d9d9dadee19c2a8fc7dcd9dcde83bde1d9d9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d7d747474727272727272727277779e769e777772727474747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9bebe575757be
-bebebebebebebebebebebebebebebebebebebe575757bed957c0c0c07300
-c0ffc0c0c0ffd9d9bebebe7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7dbebe
-bed9ffffd9d9d4d4d4d4d4d9dad0bd9c9cb3dedbd9d9d9dbd083c3dcd9d9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d7d74747474727272727272727272777777727274747474747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9be575757bebe
-bebebebebebebebebebebebebebebebebebebebe575757d957c0c0c07300
-c0ffc0c0c0ffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebe
-bed9ffffd9d9d4d4d4d4d4d9dbd09ca9e5e1dad9d9d9d9d9debda9d6dad9d9d5d4d4d4d9
-ffffd9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffff
-d9d9bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9
-bebebebebebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d97d7d
-7d7d7d747474747472727272727272727272747474747474747474d9ffffd9d9bebebebe
-bebebebebebebebebebebebebebebebebebebebebebebebebed9ffffd9d9575757bebebe
-bebebebebebebebebebebebebebebebebebebebebe5757d957c0c0c07300
-c0ffc0c0c0ffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d957c0c0c07300
-c0ffc0c0c057575757575757575757575757575757575757575757575757575757575757
-5757ff575757575757575757575757575757575757575757575757575757575757575757
-ff575757575757575757575757575757575757575757575757575757575757575757ff57
-5757575757575757575757575757575757575757575757575757575757575757ff575757
-575757575757575757575757575757575757575757575757575757575757ff5757575757
-57575757575757575757575757575757575757575757575757575757ff57575757575757
-5757575757575757575757575757575757575757575757575757ff575757575757575757
-57575757575757575757575757575757575757575757575757c0c0c07300
-c0ffc0c0c0bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbf
-bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbf
-bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbf
-bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbf
-bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbf
-bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbf
-bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbf
-bfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfbfc0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0bfd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c07300
-c07373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737300
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000
-
-showpage
-
-% stop using temporary dictionary
-end
-
-% restore original state
-origstate restore
-
-%%Trailer
diff --git a/lib/toolbar/doc/src/book.xml b/lib/toolbar/doc/src/book.xml
deleted file mode 100644
index ec264782f9..0000000000
--- a/lib/toolbar/doc/src/book.xml
+++ /dev/null
@@ -1,49 +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>1997</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>Toolbar</title>
-    <prepared>Joakim Greben&ouml;</prepared>
-    <docno></docno>
-    <date>1997-05-02</date>
-    <rev>1.0.2</rev>
-    <file>book.sgml</file>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>Toolbar</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/toolbar/doc/src/create_tool.gif b/lib/toolbar/doc/src/create_tool.gif
deleted file mode 100644
index b55bb809d3..0000000000
--- a/lib/toolbar/doc/src/create_tool.gif
+++ /dev/null
diff --git a/lib/toolbar/doc/src/create_tool.ps b/lib/toolbar/doc/src/create_tool.ps
deleted file mode 100644
index 8d6961bb9f..0000000000
--- a/lib/toolbar/doc/src/create_tool.ps
+++ /dev/null
@@ -1,5050 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: /home/kent/otp/toolbar/doc/create_tool.ps
-%%Creator: XV Version 3.10a  Rev: 12/29/94  -  by John Bradley
-%%BoundingBox: 165 29 575 446
-%%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 410 string def
-
-% define space for color conversions
-/grays 410 string def  % space for gray scale line
-/npixls 0 def
-/rgbindx 0 def
-
-% lower left corner
-165 29 translate
-
-% size of image (on paper, in 1/72inch coords)
-409.96800 417.02400 scale
-
-410 417 8			% dimensions of data
-[410 0 0 -417 0 417]		% mapping matrix
-{currentfile pix readhexstring pop}
-image
-
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c000
-c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffff7300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffffffffffffff
-ffffffffffffffff00ffffffffffffffffffffffffffffff001414ffffffffffffffffff
-ffffffffffff001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c0c0c0c0c0c0c0c0c0c0c0c073001414ffc0c0c0c0c0c0c0c0
-c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c014141414575757575714141414141414571414141414141414ffffffff1414
-14141414141414141414141414141414141414ffff14141414141414141414141414ffff
-ffffffffffff1414141414141414141414141414ffff141414141414ffffffffffffffff
-14ffff141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c0000000000000000000c0c073001414ffc0c0c0c0c0c0c0c0
-c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c0141414141457575757571414141414571414141414141414ffff1414ffff14
-14141414141414141414141414141414141414ffff141414141414141414141414141414
-14ffff1414141414141414141414141414141414ffff141414141414ffff141414141414
-14ffff141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c0000000000000000000c0c073001414ffc0c0c00000c0c0c0
-c00000c0c073001414c0c0c07300
-c0ffc0c0c01414141414145757575757141414571414141414141414ffff1414141414ff
-ff14ffff14ffffffff141414ffffffff1414ffffffff1414ffffffff1414141414141414
-14ffff14141414ffffffff141414ffffffff1414ffff141414141414ffff14141414ffff
-14ffff1414ffffffff141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c000c0c073001414ffc0c0c0c00000c0c0
-0000c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141457575757571457141414141414141414ffff1414141414ff
-ffffffffffff1414ffff14ffff1414ffff1414ffff1414ffff1414ffff14141414141414
-14ffff141414ffff1414ffff14ffff1414ffff14ffff141414141414ffff14141414ffff
-14ffff14ffff1414ffff1414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c000c0c073001414ffc0c0c0c0c0000000
-00c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141414575757145714141414141414141414ffff1414141414ff
-ffff1414ffff1414ffff1414141414ffff1414ffff1414ffff1414ffff14141414141414
-14ffff141414ffff1414ffff14ffff1414ffff14ffff141414141414ffffffffff14ffff
-14ffff14ffff1414ffff1414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c000c0c073001414ffc0c0c0c0c0c00000
-c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141414145714575757141414141414141414ffff1414141414ff
-ff141414ffffffffffff1414ffffffffff1414ffff1414ffffffffffff14141414141414
-14ffff141414ffff1414ffff14ffff1414ffff14ffff141414141414ffff14141414ffff
-14ffff14ffffffffffff1414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c000c0c073001414ffc0c0c0c0c0000000
-00c0c0c0c073001414c0c0c07300
-c0ffc0c0c01414141414141414571457575757571414141414141414ffff1414141414ff
-ff141414ffff1414141414ffff1414ffff1414ffff1414ffff1414141414141414141414
-14ffff141414ffff1414ffff14ffff1414ffff14ffff141414141414ffff14141414ffff
-14ffff14ffff141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c000c0c0c0c0c0c0c000c0c073001414ffc0c0c0c00000c0c0
-0000c0c0c073001414c0c0c07300
-c0ffc0c0c0141414141414145714141457575757571414141414141414ffff1414ffffff
-ff141414ffff1414ffff14ffff1414ffff1414ffff14ffffff1414ffff14141414141414
-14ffff141414ffff1414ffff14ffff1414ffff14ffff141414141414ffff14141414ffff
-14ffff14ffff1414ffff1414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0000000
-000000c0c0c0c07300ffc0c000c0c0c0c0c0c0c000c0c073001414ffc0c0c00000c0c0c0
-c00000c0c073001414c0c0c07300
-c0ffc0c0c014141414141457141414141457575757571414141414141414ffffffff14ff
-ff14141414ffffffff141414ffffff14ffff1414ffff1414ffffffff1414141414141414
-14ffff14141414ffffffff141414ffffffff1414ffff141414141414ffff14141414ffff
-14ffff1414ffffffff141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0000000
-000000c0c0c0c07300ffc0c0000000000000000000c0c073001414ffc0c0c0c0c0c0c0c0
-c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c014141414145714141414141414575757575714141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ffc0c0c0c0c0c0
-c0c0c0c0c0c0c07300ffc0c0c0c0c0c0c0c0c0c0c0c0c073001414ffc0c0c0c0c0c0c0c0
-c0c0c0c0c073001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-1414141414141414141414141414141414141414141414141414141414ff737373737373
-737373737373737300ff7373737373737373737373737373001414ff7373737373737373
-737373737373001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141400000000000000
-000000000000000000000000000000000000000000000000001414000000000000000000
-000000000000001414c0c0c07300
-c0ffc0c0c014141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414141414141414141414141414141414141414141414141414141414
-141414141414141414c0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffc0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffff82c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-8282828282828282828282828282828282828282828282828282828282828282828282d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282828282828282828282ffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000000000d9d9d9
-d9d900d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9
-000000d9d9d9d9d9d900d9d9d9d9000000d9d9d9d9d9d9d9d9d9d900d90000d9d9d9d900
-0000d9d9d90000d900d9d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d9d9000000d9d9d900d90000d9d9d9
-d9000000d9d9d9d9d9d900d9d9d90000d900d9d9d900d9d9d900d9d90000000000d9d9d9
-000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d90000000000d9d9d900
-0000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d9d9d9d9d90000d9d900d9d900d9
-d9d900d9d900d900d900d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d900d9d9d9d900d9d9d900d9d90000d9d900d9d9
-00d9d9d900d9d9d9d900d9d9d9d900d900d900d9d900d9d9d900d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9
-d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900000000d9d9d9d9
-d9d900d9d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-d9d900d9d900d900d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d900d9d9d9d900d9d9d9d9d9d900d9d9d9d9d9d9
-00d9d9d9d9d9d9d9d900d9d9d9d900d900d900d9d9d900d9d900d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9
-d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d900d9d9d90000000000d9d9d9d9d9d9d9d9d900d9d9d900d9d9d900
-000000d9d900d900d900d9d90000000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d900d9d9d9d9d9d9000000d9d9d900d9d9d9d9d9d9
-00d9d9d9d9d9d9d900d9d9d9d9d900d900d900d9d9d900d9d900d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9
-d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d900d9
-d9d900d9d900d900d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d900d9d9d9d9d9d9d9d9d900d9d900d9d9d9d9d9d9
-00d9d9d9d9d9d9d900d9d9d9d9d900d900d900d9d9d9d900d900d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9
-d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d9d9d9d9d900d9d9d900d9d900d9
-d9d900d9d900d900d900d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d900d9d9d9d9d9d900d9d9d900d9d900d9d9d9d9d9d9
-00d9d9d900d9d900d9d9d9d9d9d900d900d900d9d9d9d90000d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d90000d9d9d9d9d900d9d9d9d900d9
-d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d900d9d9d9d9000000d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d900
-000000d9d900d900d900d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d900d9d9d9d9d9d9d9000000d9d9d900d9d9d9d9d9d9
-d9000000d9d9d900d9d9d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d9d90000d9d9d9
-000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d90000d9d9d9d9d9d90000d9d9d900
-0000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d900d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282ffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982ffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffff8282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0ff828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffc0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffff82c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-8282828282828282828282828282828282828282828282828282828282828282828282d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282828282828282828282ffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000000000d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d90000d9d9d9d900
-0000d9d9d90000d900d9d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d90000d9d90000d9d900d9d9d900d9d9d9d9d9d9d9d9d9
-d9000000d9d9d900d9d9d900d9d900d90000d9d9d9d9d9d9d9d9d9d90000000000d9d9d9
-000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d90000d9d900d9d900d9
-d9d900d9d900d900d900d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d90000d9d90000d9d900d9d9d900d9d9d9d9d9d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d90000d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-d9d900d9d900d900d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d90000d900d9d9d900d9d900d9d9d9d9d9d9d9d9d9
-00d9d9d900d9d900d900d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d900
-000000d9d900d900d900d9d90000000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d90000d900d9d9d900d9d900d9d9d9d9d9d9d9d9d9
-00d9d9d900d9d900d900d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d900d9
-d9d900d9d900d900d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d900d900d9d9d9d9d9d9d9d9d9
-00d9d9d900d9d900d900d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d900d9
-d9d900d9d900d900d900d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9
-00d9d9d900d9d900d900d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d900
-000000d9d900d900d900d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9
-d9000000d9d9d9d900d900d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d90000d9d9d9
-000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d900d900d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282ffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982ffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282828282828282828282d9d9
-d9d982828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282ffd9d9
-d9d982828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282ffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d900d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d900d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d90000000000d9d9d900
-0000d9d9d900d90000d9d9d90000000000d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9000000d9d9d900d90000d9d9d90000000000d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d90000d900d9d9d900d9d9d900d9d90000000000d9d9d9000000d9d9d9d900
-0000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d900d9d9d9d900d9
-d9d900d9d90000d9d900d9d9d9d900d9d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d90000d9d900d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d900d900d900d9d900d9d9d900d9d9d9d900d9d9d9d900d9d9d900d9d900d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000d9d9d9d9d900d9d9d9d9d9d9
-d9d900d9d900d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d900d9d9d900d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d900d900d900d9d9d900d9d900d9d9d9d900d9d9d9d900d9d9d900d9d900d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d9d9d900
-000000d9d900d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d900d9d9d900d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d900d900d900d9d9d900d9d900d9d9d9d900d9d9d9d900d9d9d900d9d900d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d900d9d9d9d900d9
-d9d900d9d900d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d900d9d9d900d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d900d900d900d9d9d9d900d900d9d9d9d900d9d9d9d900d9d9d900d9d900d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d900d9d9d9d900d9
-d9d900d9d900d9d9d9d9d9d9d9d900d9d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d900d9d9d900d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d900d900d900d9d9d9d90000d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d90000d9d9d900
-000000d9d900d9d9d9d9d9d9d9d9d90000d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d90000d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d900d900d900d9d9d9d9d900d9d9d9d9d9d90000d9d9d9000000d9d9d9d900
-0000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d900d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9
-d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282ffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9d9
-d9d98282ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982ffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9d9
-d9d982ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffd9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828200
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282828282828282828282ff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082820000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082820000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000000000d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000d9d9d9d9
-d900d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082820000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082820000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-000000d9d9d9d9000000d9d9d900d90000d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d900
-0000d9d9d9d9d9d900d9d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d90000828200000000d900d9d9d900d9d9d900d9d90000000000d9d9
-d9000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d90000d900d9d9d9
-000000d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d90000d9d900d9d9d9d9d9d9d9d9d90000000000d9d9d9d9
-d900d9d9d9d9d9d900d9d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282000000d900d900d9d900d9d9d900d9d9d9d900d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d90000d9d9d9
-d9d900d9d9d90000000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d900d9d9d9d9d9d900d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282000000d900d900d9d9d900d9d900d9d9d9d900d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d900d9d9d9d9d9d900d9d9d90000000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282000000d900d900d9d9d900d9d900d9d9d9d900d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d900d9d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282000000d900d900d9d9d9d900d900d9d9d9d900d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d900
-d9d9d900d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d900d9d9d9d9d9d900d9d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282000000d900d900d9d9d9d90000d9d9d9d9d900d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d90000d9d9d900d9d90000d9d9d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000000000d9d9d9
-000000d9d9d9d9000000d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9
-d900d9d9d9d9d9d900d9d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282000000d900d900d9d9d9d9d900d9d9d9d9d9d90000d9d9
-d9000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d90000d9d9d9d90000d900d9d9d9
-d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082820000d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082820000d9d9d9d9d9d9d900d900d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082820000d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900008282ffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000082ffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-00d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-8282828282828282828282828282828282828282828282828282828282828282828282d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282828282828282828282ffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d90000d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d90000d9d90000d9d9d9000000d9d9d9d9000000d9d9d9d9000000d9d9d9d900
-0000d9d9d9d90000d900d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d90000d9d90000d9d900d9d9d900d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9000000d9d9d900d90000d9d9d9d9000000d9d9d90000000000d9d9d9
-d9d9d9d9d9d90000000000d9d9d9000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d90000d9d90000d9d900d9d9d900d9d900d9d9d900d9d900d9d9d900d9d900d9
-d9d900d9d900d9d90000d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d90000d9d90000d9d900d9d9d900d9d9d9d9d9d9d9d9d9
-0000000000d9d9d9d9d900d9d9d90000d9d900d9d900d9d9d900d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d90000d900d9d900d9d9d900d9d900d9d9d9d9d9d900d9d9d9d9d9d9d9d9
-d9d900d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d90000d900d9d9d900d9d900d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d9d900d9d9d900d9d9d9d9d9d900d9d9d9d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d90000d900d9d90000000000d9d9d9000000d9d9d9d9000000d9d9d9d900
-000000d9d900d9d9d900d9d90000000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d90000d900d9d9d900d9d900d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9000000d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d9d9d9d900d9d900d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d900d9d900d9
-d9d900d9d900d9d9d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d900d900d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d9d9d9d900d9d900d9d9d900d9d900d9d9d900d9d900d9d9d900d9d900d9
-d9d900d9d900d9d90000d9d900d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d90000d9d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d9d900d9d9d900d9d9d9d9d9d900d9d9d900d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d9d9d9d900d9d9d9000000d9d9d9d9000000d9d9d9d9000000d9d9d9d900
-000000d9d9d90000d900d9d9d9000000d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d900d9d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9
-d9d900d9d9d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9000000d9d9d9d9d9d90000d9d9d9
-d9d9d9d9d9d9d9d9d90000d9d9d9000000d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9d9
-00d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d900d900d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282ffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982ffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-8282828282828282828282828282828282828282828282828282828282828282828282d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282828282828282828282828282828282828282ffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d90000
-000000d900d9d9d9d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9
-d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d900d9d9d9d9d9d9d9
-d900d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d900d9d9d9d9d900d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9
-d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-00d9d9d900d9d9d9d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9
-d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9
-d900d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9
-d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-00d9d9d90000d9d90000d9d900d9d9d9d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9
-d90000d900d9d9d9000000d9d9d9d9000000d9d9d9d9d9d900d9d9d900d90000d9d9d900
-00000000d9d90000d900d9d9d9d9d9d900d9d9d9d9d9d900d9d9d9d9000000d9d9d900d9
-0000d9d9d9d90000d900d9d9d9000000d9d9d900d9d9d900d9d9d9d9d9d9d9d9d900d900
-00d9d9d90000000000d9d90000d900d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-00d9d9d90000d9d90000d9d900d9d9d9d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9
-00d9d90000d9d900d9d9d900d9d900d9d9d900d9d9d9d900d9d9d9d90000d9d900d9d9d9
-d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d900d9d9d9d9d9d9d900d9d9d90000
-d9d900d9d900d9d90000d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9d9d9d9d90000d9
-d900d9d9d9d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d90000000000d9d9d9d9
-00d9d9d900d90000d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d900d9d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d9d9
-d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d900d9d9d9d9d9d9d900d9d9d900d9
-d9d900d9d900d9d9d900d9d900d9d9d900d9d9d900d900d9d9d9d9d9d9d9d9d9d900d9d9
-d900d9d9d9d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-00d9d9d900d90000d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d900d9d9d9d9d9d9d900d9d9d9d9d900d9d9d900d9d9d9
-d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d900d9d9d9d9d9d9d9d900d9d9d900d9
-d9d900d9d900d9d9d900d9d90000000000d9d9d9d900d9d9d9d9d9d9d9d9d9d9d900d9d9
-d900d9d9d9d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-00d9d9d900d9d9d9d900d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9
-00d9d9d900d9d900d9d9d900d9d900d9d9d9d9d9d9d900d9d9d9d9d900d9d9d900d9d9d9
-d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d900d9d9d9d9d9d9d9d900d9d9d900d9
-d9d900d9d900d9d9d900d9d900d9d9d9d9d9d9d900d900d9d9d9d9d9d9d9d9d9d900d9d9
-d900d9d9d9d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-00d9d9d900d9d9d9d900d9d900d9d9d9d9d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d90000d9d9d9d9d90000d9d9d900d9d9d9d9d9d9
-00d9d90000d9d900d9d9d900d9d900d9d9d900d9d900d9d9d9d9d9d900d9d9d900d9d9d9
-d900d9d9d9d900d900d900d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9d9d900d9d9d900d9
-d9d900d9d900d9d90000d9d900d9d9d900d9d900d9d9d900d9d9d9d90000d9d9d900d9d9
-d900d9d9d9d900d9d9d9d900d900d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9
-00d9d9d900d9d9d9d900d9d90000000000d9d9d9d90000d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d90000d9d9d9d9d90000d9d9d900d9d9d9d9d9d9
-d90000d900d9d9d9000000d9d9d9d9000000d9d9d900d9d9d9d9d9d900d9d9d900d9d9d9
-d9d90000d9d900d900d900d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9d9d900d9d9d900d9
-d9d900d9d9d90000d900d9d9d9000000d9d9d900d9d9d900d9d9d9d90000d9d9d900d9d9
-d900d9d9d9d9d90000d9d900d900d900d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d98282ffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d982ffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffff8282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0ff828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffc0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffff82c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffd9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffff82d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffff82d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffff82d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9000000d9d9d9d9000000d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9000000d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9000000d9d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d900d9d9d900d9d9d9d9d900d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d900d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d900d9d9d900d9d9d9d900d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d900d9d9d900d9d9d9d9d900d9d9d9d9000000d9
-d9d9d9000000d9d9d900d90000d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9000000d9d9d900d9d9d900d9d9d900
-0000d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d900d9d9d9d9d9d90000000000d9d9d9000000d9d9d900d90000d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d900d9d9d900
-d9d900d9d9d900d9d90000d9d900d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d900d9d9d9d9d900d9d9d900d9d900d9d9d900d9d900d9
-d9d900d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d900d9d9d9d9d9d9d900d9d9d9d900d9d9d900d9d90000d9d900d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d900d9d9d900
-d9d9d9d9d9d900d9d900d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d90000d9d9d9d9d9d9d900d9d900d9d9d900d9d900d9
-d9d900d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d90000d9d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d900d9d9d9d9d9d9d9d9d900d9d9d90000000000
-d9d9d900000000d9d900d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d900000000d9d9d900d900d9d9d90000
-000000d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d900d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d900d9d9d900d9d9d9d9d900d9d9d900d9d9d9d9
-d9d900d9d9d900d9d900d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d900d9d9d900d9d900d9d9d900d9d9d900d900d9d9d900d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d900d9d9d900d9d9d9d900d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d900d9d9d900d9d9d9d9d900d9d9d900d9d9d900
-d9d900d9d9d900d9d900d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d900d9d9d900d9d900d9d9d900d9d9d9d900d9d9d9d900d9
-d9d900d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d900d9d9d900d9d9d9d900d9d9d9d900d9d9d900d9d90000d9d900d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9000000d9d9d9d9d9d900d9d9d9d9000000d9
-d9d9d900000000d9d900d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9000000d9d9d9d900000000d9d9d9d900d9d9d9d9d900
-0000d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9000000d9d9d9d9d9d90000d9d9d9000000d9d9d900d90000d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d900d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffffd9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d98282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ffff828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ffff8282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ffff82828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-8282828282828282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9ff82828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9ff828282828282828282828282828282828282828282828282828282828282828282
-82828282828282828282828282828282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9ff8282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-8282828282828282d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffff8282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0ff828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffc0c0c07300
-c0ffc0c0c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffff82c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffffd9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9d9
-d9d9d9d9d9d9d98282c0c0c07300
-c0ffc0c0c0ffff8282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0ff828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282828282828282828282828282828282828282828282828282828282
-828282828282828282c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c07300
-c0ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0
-c0c0c0c0c0c0c0c0c0c0c0c07300
-c07373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-737373737373737373737373737373737373737373737373737373737373737373737373
-7373737373737373737373737300
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-000000000000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000
-
-showpage
-
-% stop using temporary dictionary
-end
-
-% restore original state
-origstate restore
-
-%%Trailer
diff --git a/lib/toolbar/doc/src/fascicules.xml b/lib/toolbar/doc/src/fascicules.xml
deleted file mode 100644
index 0678195e07..0000000000
--- a/lib/toolbar/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/toolbar/doc/src/note.gif b/lib/toolbar/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/toolbar/doc/src/note.gif
+++ /dev/null
diff --git a/lib/toolbar/doc/src/notes.xml b/lib/toolbar/doc/src/notes.xml
deleted file mode 100644
index 0ae8e261d6..0000000000
--- a/lib/toolbar/doc/src/notes.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</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>Toolbar Release Notes</title>
-    <prepared>otp_appnotes</prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the Toolbar
-    application.</p>
-
-<section><title>Toolbar 1.4.2.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Toolbar 1.4.2.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The GS applications is now deprecated and will be
-	    removed in the R16 release. The following GS-based
-	    applications have been superseded by the Observer
-	    application and will removed in R16: Appmon, Pman,
-	    Tv.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-9907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Toolbar 1.4.2.1</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Miscellaneous documentation build updates</p>
-          <p>
-	    Own Id: OTP-9813</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Toolbar 1.4.2</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    Improve spelling throughout documentation, code comments
-	    and error messages</p>
-          <p>
-	    Own Id: OTP-9555</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>Toolbar 1.4.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>Toolbar 1.4</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The copyright notices have been updated.</p>
-          <p>
-	    Own Id: OTP-7851</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-  <section>
-    <title>Toolbar 1.3.0.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own Id: OTP-6689</p>
-        </item>
-        <item>
-          <p>Obsolete guard tests (such as list()) have been replaced
-            with the modern guard tests (such as is_list()).</p>
-          <p>Own Id: OTP-6725</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Toolbar 1.3</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Notification windows are now centered over a parent
-            window.</p>
-          <p>Own Id: OTP-6013 Aux Id: OTP-5987 </p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>Toolbar 1.2.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>The graphic applications now search for HTML
-            documentation in the correct place.</p>
-          <p>Own Id: OTP-5381</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/toolbar/doc/src/part.xml b/lib/toolbar/doc/src/part.xml
deleted file mode 100644
index 0590ed8566..0000000000
--- a/lib/toolbar/doc/src/part.xml
+++ /dev/null
@@ -1,38 +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>1996</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>Toolbar User's Guide</title>
-    <prepared>Gunilla Hugosson</prepared>
-    <docno></docno>
-    <date>1997-04-19</date>
-    <rev>1.0.2</rev>
-    <file>part.sgml</file>
-  </header>
-  <description>
-    <p>The <em>Toolbar</em> application simplifies access to
-      the Erlang/OTP tools. It consists of a number of power buttons, one
-      for each available tool.</p>
-  </description>
-  <xi:include href="toolbar_chapter.xml"/>
-</part>
-
diff --git a/lib/toolbar/doc/src/part_notes.xml b/lib/toolbar/doc/src/part_notes.xml
deleted file mode 100644
index 28e1932505..0000000000
--- a/lib/toolbar/doc/src/part_notes.xml
+++ /dev/null
@@ -1,38 +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>2004</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>Toolbar Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2004-09-07</date>
-    <rev>1.0</rev>
-    <file>part_notes.sgml</file>
-  </header>
-  <description>
-    <p>The <em>Toolbar</em> application simplifies access to
-      the Erlang/OTP tools. It consists of a number of power buttons,
-      one for each available tool.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
diff --git a/lib/toolbar/doc/src/ref_man.xml b/lib/toolbar/doc/src/ref_man.xml
deleted file mode 100644
index a11e1a553a..0000000000
--- a/lib/toolbar/doc/src/ref_man.xml
+++ /dev/null
@@ -1,38 +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>1996</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>Toolbar Reference Manual</title>
-    <prepared>Gunilla Hugosson</prepared>
-    <docno></docno>
-    <date>1997-04-15</date>
-    <rev>1.0.2</rev>
-    <file>application.sgml</file>
-  </header>
-  <description>
-    <p>The <em>Toolbar</em> application simplifies access to
-      the Erlang/OTP tools. It consists of a number of power buttons, one
-      for each available tool.</p>
-  </description>
-  <xi:include href="toolbar.xml"/>
-</application>
-
diff --git a/lib/toolbar/doc/src/toolbar.xml b/lib/toolbar/doc/src/toolbar.xml
deleted file mode 100644
index 2580de2242..0000000000
--- a/lib/toolbar/doc/src/toolbar.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1996</year>
-      <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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>toolbar</title>
-    <prepared>Gunilla Hugosson</prepared>
-    <docno></docno>
-    <date>1997-04-21</date>
-    <rev>A</rev>
-    <file>toolbar.sgml</file>
-  </header>
-  <module>toolbar</module>
-  <modulesummary>GUI for Starting Tools and User Contributions</modulesummary>
-  <description>
-    <warning>
-      <p>
-	The Toolbar application is deprecated and will be removed in R16.
-      </p>
-    </warning>
-    <p>Toolbar makes it easier to use
-      the different Erlang tools - and the user contributions - which are provided.
-      It has a graphical user interface with an icon for each tool.
-      Clicking the icon activates the corresponding tool.
-      </p>
-    <p>All tools to be included on Toolbar must
-      have a configuration file containing information about the tool,
-      for example its start function and help information location.
-      Configuration files must have the <c>.tool</c> suffix.
-      </p>
-    <p>When started, Toolbar automatically checks for <c>*.tool</c>
-      files in the current path and adds the corresponding tools. For
-      each <c>ebin</c> directory found in the path, it will also look
-      in a <c>priv</c> directory next to it. This is a feature of the Erlang
-      file structure.</p>
-  </description>
-  <funcs>
-    <func>
-      <name>start() -> ok | already_started</name>
-      <fsummary>Start Toolbar</fsummary>
-      <desc>
-        <p>Creates a window containing tool icons.</p>
-      </desc>
-    </func>
-    <func>
-      <name>version() -> string()</name>
-      <fsummary>Return current version number</fsummary>
-      <desc>
-        <p>Returns the current version number of Toolbar.</p>
-      </desc>
-    </func>
-    <func>
-      <name>update() -> ok | {error,not_started}</name>
-      <fsummary>Update Toolbar</fsummary>
-      <desc>
-        <p>Makes a search for new tool files in the current path and
-          adds the corresponding tools to Toolbar window.</p>
-      </desc>
-    </func>
-    <func>
-      <name>quit() -> ok | {error,not_started}</name>
-      <fsummary>Quit Toolbar.</fsummary>
-    </func>
-    <func>
-      <name>create_tool_file() -> ok | {error,not_started}</name>
-      <fsummary>Create tool files</fsummary>
-      <desc>
-        <p>Starts the GUI used for creating and editing tool files.</p>
-      </desc>
-    </func>
-    <func>
-      <name>add_gs_contribs() -> ok | {error,not_started}</name>
-      <fsummary>Add GS contributions</fsummary>
-      <desc>
-        <p>Adds the path to the directory where the GS contributions are
-          situated and add the tools found there, if any.</p>
-      </desc>
-    </func>
-  </funcs>
-</erlref>
-
diff --git a/lib/toolbar/doc/src/toolbar_chapter.xml b/lib/toolbar/doc/src/toolbar_chapter.xml
deleted file mode 100644
index ebd47ef2fe..0000000000
--- a/lib/toolbar/doc/src/toolbar_chapter.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1996</year><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>Toolbar</title>
-    <prepared>Gunilla Hugosson, Kenneth Lundin</prepared>
-    <docno></docno>
-    <date>1997-04-21</date>
-    <rev>A</rev>
-    <file>toolbar_chapter.xml</file>
-  </header>
-    <warning>
-      <p>
-	The Toolbar application is deprecated and will be removed in R16.
-      </p>
-    </warning>
-  <p>Toolbar provides an interface to the various Erlang tools which are available. Toolbar can also provide access to user supplied tools which are included with the Erlang software release. These tools are called GS Contributions.</p>
-  <p>All tools included in Toolbar must have a configuration file which contains information about the tool, such as its start function and the location of help information. The name of a configuration file must include the suffix <c>.tool</c>.
-    </p>
-  <p>Start the Toolbar application with one of the following commands:
-    </p>
-  <list type="bulleted">
-    <item>enter the command <c>toolbar:start().</c> from the command line after Erlang has been started.</item>
-    <item>start Erlang with the command <c>erl -s toolbar</c>.</item>
-  </list>
-  <p>When started, Toolbar automatically checks for <c>*.tool</c> files in the current path and adds the corresponding tools. For each <c>ebin</c> directory found in the path, it will also look in a <c>priv</c> directory next to it. This is a function of the Erlang file structure.
-    </p>
-  <p>You can update Toolbar with menu commands on Toolbar window. Refer to the File Menu and Tools Menu sections below for details.
-    </p>
-
-  <section>
-    <title>Toolbar Window</title>
-    <p>The following illustration shows <seealso marker="#fig_1">The Toolbar Window</seealso>.
-      </p>
-    <marker id="fig_1"></marker>
-    <image file="bar.gif">
-      <icaption>The Toolbar Window</icaption>
-    </image>
-    <p>Each icon on Toolbar represents a separate tool, which is started by clicking on the icon. You can also display place the mouse pointer over an icon to display the name of the tool at the bottom of Toolbar window.
-      </p>
-    <p>The Toolbar window also has a menu which includes the following menu items:
-      </p>
-    <list type="bulleted">
-      <item>File menu</item>
-      <item>Tools menu</item>
-      <item>Help menu</item>
-    </list>
-    <p>These menu are described in the following sections.
-      </p>
-
-    <section>
-      <marker id="file_menu"></marker>
-      <title>The File menu</title>
-      <p>The File menu has the following two menu items:
-        </p>
-      <taglist>
-        <tag>Update Toolbar</tag>
-        <item>Select this menu item to search for new tool files in the current path and add the corresponding tools to the Toolbar window. This action is performed automatically every the Toolbar application is started.</item>
-        <tag>Quit</tag>
-        <item>Select this menu item to exit the oolbar application.</item>
-      </taglist>
-    </section>
-
-    <section>
-      <marker id="tools_menu"></marker>
-      <title>The Tools menu</title>
-      <p>The Tool menu has the following menu items:
-        </p>
-      <taglist>
-        <tag>Create Tool File</tag>
-        <item>Choose this menu item to display the Create Tools File Window, where you create a new tools file, or edit an existing tools file. This window is described in detail below.</item>
-        <tag>Add GS Contributions</tag>
-        <item>Choose this menu item to add GS contributions by entering the path to the directory where these tools are situated. GS contributions are user supplied tools which are included with the Erlang software release. These tools are not supported by Erlang/OTP.</item>
-      </taglist>
-
-      <section>
-        <title>The Create Tool File Window</title>
-        <p>This window is displayed when you select <em>Create Tool File</em> from the <em>Tools</em> menu. The following illustration shows <seealso marker="#fig_2">The Create Tool File  Window</seealso>.
-          </p>
-	<marker id="fig_2"></marker>
-        <image file="create_tool.gif">
-          <icaption>The Create Tool File Window</icaption>
-        </image>
-        <p>Follow these steps to create a new tool file, or to edit an existing tool file:</p>
-        <list type="bulleted">
-          <item>To edit an existing tools file, enter the file name of the tools file into the field <em>File name</em> and press <em>Enter</em>. The contents of the tool file are displayed in the information fields. Edit the information in the following fields as required.</item>
-          <item>To create a new tools file, enter information into the following fields.</item>
-          <item>When finished, select <em>Update Toolbar</em> from the <em>File</em> menu.</item>
-        </list>
-        <list type="ordered">
-          <item><em>File name</em>. Enter the name of the tools file. The application will add the <c>.tool</c> suffix if omitted.</item>
-          <item><em>Tool name</em>. Enter the name of the tool. This field defaults to the name entered into the File name field. For example, if you enter <c>mytool.tool</c> as a file name, this field defaults to <c>mytool</c>.</item>
-          <item><em>Start function</em>. Enter a module name and a function name into the fields titled module and function respectively. The function must exist and take zero arguments.</item>
-          <item><em>Icon file</em>. Enter the file name of the icon to be displayed in the Toolbar. The file must be a bitmap file or a GIF image with the file extension <c>.xbm</c> or <c>.gif</c> respectively. If no path name is entered, the system assumes that the file is located in the same directory as the tools file. This field is optional.</item>
-          <item><em>Message</em>. Enter a descriptive string of maximum 30 characters for the tool.  This field is optional. The information entered here is displayed at the bottom of the Toolbar window when the mouse pointer is placed on the Toolbar icon.</item>
-          <item><em>HTML</em>. Enter an URL, a HTML file name, or a plain text file name, which points to the help text file for the tool. An URL should be given in the form <c>http://...</c>. If no path is given, the system assumes that the file is located in the same directory as the tool file. For an HTML file name ending with <c>.html</c>, it is possible to add an index which points to a specific location in the file. This is written as <c>.html#index</c>. This field is optional.</item>
-        </list>
-        <p>The window has the following command buttons:
-          </p>
-        <list type="bulleted">
-          <item><em>Clear</em>. Click on this button to clear the information fields.</item>
-          <item><em>Save</em>. Click on this button to save the information. A new tool file can be saved only when mandatory information such as file name, tool name and start function has been entered.</item>
-          <item><em>Stop</em>. Click on this button to quit the Create Tool File window.</item>
-        </list>
-        <note>
-          <p>No error check is performed on the information entered.</p>
-          <p>You must select <em>Update Toolbar</em> from the <em>File</em> menu to update the configuration and make the tool visible on the Toolbar.</p>
-        </note>
-      </section>
-    </section>
-
-    <section>
-      <marker id="help_menu"></marker>
-      <title>The Help menu</title>
-      <p>The Help Menu has the following two menu items, plus additional help menu items for those tools which have a help system.
-        </p>
-      <taglist>
-        <tag>About</tag>
-        <item>This menu item displays a short message about accessing the help information.</item>
-        <tag>Toolbar</tag>
-        <item>This menu item provides access to the Toolbar documentation.</item>
-      </taglist>
-    </section>
-  </section>
-</chapter>
-
diff --git a/lib/toolbar/doc/src/warning.gif b/lib/toolbar/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/toolbar/doc/src/warning.gif
+++ /dev/null
diff --git a/lib/toolbar/ebin/.gitignore b/lib/toolbar/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/toolbar/ebin/.gitignore
+++ /dev/null
diff --git a/lib/toolbar/info b/lib/toolbar/info
deleted file mode 100644
index 706cbdfdf2..0000000000
--- a/lib/toolbar/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: tools
-short: A tool bar simplifying access to the Erlang tools
diff --git a/lib/toolbar/src/canvasbutton.erl b/lib/toolbar/src/canvasbutton.erl
deleted file mode 100644
index 81e0ed43bb..0000000000
--- a/lib/toolbar/src/canvasbutton.erl
+++ /dev/null
@@ -1,239 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(canvasbutton).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,read,2}}]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Erlang Toolbar
-%
-%%% Description %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Extension to GS used to imitate buttons but instead using images drawn
-% on a canvas. Enables usage of .gif files as button images and not only
-% .xbm (bitmap) files.
-%
-%%% Constants %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--define(gray,{87,87,87}).
-%
-%%% Internal data structures %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% canvasbutton()
--record(canvasbutton,{image,rect,ul,ll}).
-%
-% cboptions()
--record(cboptions,
-	{imagefile=nofile, % nofile |
-	                   % string()   Name of image file
-	 x=0,              % integer()  X coordinate relative the canvas
-	 y=0,              % integer()  Y coordinate relative the canvas
-	 width=10,         % integer()  Button width
-	 height=10,        % integer()  Button heigth
-	 fg=black,         % atom()     Foreground color
-	 data=[]}).        % term()     Data associated with button events
-%
-%%% Exports %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--export([create/1,create/2,read/2,press/1,release/1]).
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% Exported functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% create(Canvas) => create(Canvas,[])
-% create(Canvas,OptionList) => canvasbutton()
-%   Canvas - GS canvas object
-%   OptionList - [{Option,Value}]
-%   Option, Value - see below
-% Create a canvasbutton with the given image on Canvas
-%
-%   Option     Value      Default  Comment
-%   ----------------------------------------------------------------
-%   image    nofile |    nofile   Name of image file. Must be a bitmap
-%            string()             file (.xbm) or a GIF file (.gif).
-%   x        integer()   0        X coordinate relative to Canvas
-%   y        integer()   0        Y coordinate relative to Canvas
-%   width    integer()   10       Button width
-%   height   integer()   10       Button height
-%   fg       atom()      black    Foreground color, bitmaps only
-%   data     term()      []       Data associated with button events
-%
-% The process calling this function will receive the following events:
-%   {gs,GsObj,enter,{canvasbutton,Canvasbutton,Data},Args}
-%   {gs,GsObj,leave,{canvasbutton,Canvasbutton,Data},Args}
-%   {gs,GsObj,buttonpress,{canvasbutton,Canvasbutton,Data},Args}
-%   {gs,GsObj,buttonrelease,{canvasbutton,Canvasbutton,Data},Args}
-% where GsObj and Args are a GS object and its Args field, respectively.
-%
-% Note that press/1 and release/1 has to be called explicitly to create
-% the illusion of the button being pressed or released.
-%----------------------------------------
-create(Canvas) ->
-    create(Canvas,[]).
-create(Canvas,OptionList) ->
-    Options = sort_out_options(OptionList),
-    X = Options#cboptions.x,
-    Y = Options#cboptions.y,
-    W = Options#cboptions.width,
-    H = Options#cboptions.height,
-
-    %% Buttons should have the same background color as the canvas
-    Bg = gs:read(Canvas,bc),
-
-    %% Draw image
-    Image = create_image(Options#cboptions.imagefile,Canvas,Bg,
-			 Options#cboptions.fg,X,Y,W,H),
-
-    %% Draw upper left corner line
-    Ul = gs:create(line,Canvas,[{coords,[{X,Y+H},{X,Y},{X+W,Y}]},
-				{fg,white},{width,2}]),
-
-    %% Draw lower right corner line
-    Ll = gs:create(line,Canvas,[{coords,[{X,Y+H},{X+W,Y+H},{X+W,Y}]},
-				{fg,?gray},{width,2}]),
-				
-
-    %% Draw a rectangle around all (for event catching when width and
-    %% height of button is larger than image)
-    Rect = gs:create(rectangle,Canvas,[{coords,[{X,Y},{X+W,Y+H}]},
-				       {fill,Bg},
-				       {buttonpress,true},
-				       {buttonrelease,true},
-				       {enter,true},{leave,true}]),
-
-    %% Now the canvas button is created
-    Canvasbutton = #canvasbutton{image=Image,rect=Rect,ul=Ul,ll=Ll},
-
-    Data = Options#cboptions.data,
-    gs:config(Rect,{data,{canvasbutton,Canvasbutton,Data}}),
-    gs:config(Image,{data,{canvasbutton,Canvasbutton,Data}}),
-    gs:config(Rect,lower),
-    gs:config(Image,raise),
-
-    Canvasbutton.
-
-%----------------------------------------
-% read(Canvasbutton,coords) => [{L,T},{R,B}]
-%   Canvasbutton - canvasbutton()
-% Read a Canvasbutton's coordinates
-%----------------------------------------
-read(Canvasbutton,coords) ->
-    gs:read(Canvasbutton#canvasbutton.rect,coords).
-
-%----------------------------------------
-% press(Canvasbutton)
-%   Canvasbutton - canvasbutton()
-% Create the illusion that Canvasbutton is pressed
-%----------------------------------------
-press(Canvasbutton) ->
-    gs:config(Canvasbutton#canvasbutton.ul,{fg,?gray}),
-    gs:config(Canvasbutton#canvasbutton.ll,{fg,white}),
-    case Canvasbutton#canvasbutton.image of
-	noimage ->
-	    ignore;
-	Image ->
-	    gs:config(Image,{move,{-1,-1}})
-    end.
-
-%----------------------------------------
-% release(Canvasbutton)
-%   Canvasbutton - canvasbutton()
-% Create the illusion that Canvasbutton is released
-%----------------------------------------
-release(Canvasbutton) ->
-    gs:config(Canvasbutton#canvasbutton.ul,{fg,white}),
-    gs:config(Canvasbutton#canvasbutton.ll,{fg,?gray}),
-    case Canvasbutton#canvasbutton.image of
-	noimage ->
-	    ignore;
-	Image ->
-	    gs:config(Image,{move,{1,1}})
-    end.
-
-
-%%% Internal functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% create_image(ImageFile,Canvas,Bg,Fg,X,Y,W,H) => Image
-%   ImageFile - string() Image file, must exist and be a bitmap file ending
-%               with .xbm or a GIF file ending with .gif.
-%   Canvas - GS canvas object
-%   Bg - atom() Background color (bitmaps only)
-%   Fg - atom() Foreground color (bitmaps only)
-%   X, Y - int() X and Y coordinates for Image relative to Canvas
-%   W, H - int() Width and height of Image
-%   Image - GS canvas image object
-%----------------------------------------
-create_image(nofile,_,_,_,_,_,_,_) ->
-    noimage;
-create_image(ImageFile,Canvas,Bg,Fg,X,Y,W,H) ->
-    case lists:last(string:tokens(ImageFile,".")) of
-	"xbm" ->
-	    gs:create(image,Canvas,
-		      [{bitmap,ImageFile},
-		       {bg,Bg},{fg,Fg},
-		       {anchor,c},
-		       {coords,[{X+1+W/2,Y+1+H/2}]},
-		       {buttonpress,true},
-		       {buttonrelease,true},
-		       {enter,true},{leave,true}]);
-	"gif" ->
-	    gs:create(image,Canvas,
-		      [{load_gif,ImageFile},
-		       {anchor,c},
-		       {coords,[{X+W/2,Y+H/2}]},
-		       {buttonpress,true},
-		       {buttonrelease,true},
-		       {enter,true},{leave,true}])
-    end.
-
-%----------------------------------------
-% sort_out_options(OptionList) => cboptions()
-%   OptionList - see create/2
-% Insert members of option list into a cboptions record.
-%----------------------------------------
-sort_out_options(OptionList) ->
-    sort_out_options(OptionList,#cboptions{}).
-
-%----------------------------------------
-% sort_out_options(OptionList,Options) => cboptions()
-%   OptionList - see create/2
-%   Options - cboptions()
-% Called by sort_out_options/1.
-%----------------------------------------
-sort_out_options([{image,Image}|Rest],Options) ->
-    sort_out_options(Rest,Options#cboptions{imagefile=Image});
-sort_out_options([{x,X}|Rest],Options) ->
-    sort_out_options(Rest,Options#cboptions{x=X});
-sort_out_options([{y,Y}|Rest],Options) ->
-    sort_out_options(Rest,Options#cboptions{y=Y});
-sort_out_options([{width,Width}|Rest],Options) ->
-    sort_out_options(Rest,Options#cboptions{width=Width});
-sort_out_options([{height,Height}|Rest],Options) ->
-    sort_out_options(Rest,Options#cboptions{height=Height});
-sort_out_options([{fg,Fg}|Rest],Options) ->
-    sort_out_options(Rest,Options#cboptions{fg=Fg});
-sort_out_options([{data,Data}|Rest],Options) ->
-    sort_out_options(Rest,Options#cboptions{data=Data});
-sort_out_options([],Options) ->
-    Options.
diff --git a/lib/toolbar/src/toolbar.app.src b/lib/toolbar/src/toolbar.app.src
deleted file mode 100644
index 16f03c497d..0000000000
--- a/lib/toolbar/src/toolbar.app.src
+++ /dev/null
@@ -1,30 +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%
-%%
-{application, toolbar,
- [{description, "Toolbar"},
-  {vsn, "%VSN%"},
-  {modules, [
-	     toolbar,
-	     toolbar_graphics,
-	     toolbar_lib,
-	     toolbar_toolconfig,
-	     canvasbutton
-	    ]},
-  {registered,[toolbar]},
-  {applications, [kernel, stdlib, gs]}]}.
diff --git a/lib/toolbar/src/toolbar.erl b/lib/toolbar/src/toolbar.erl
deleted file mode 100644
index b37c323008..0000000000
--- a/lib/toolbar/src/toolbar.erl
+++ /dev/null
@@ -1,579 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(toolbar).
--compile([{nowarn_deprecated_function,{gs,start,1}}]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Erlang Toolbar
-%
-%%% Description %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Main module
-%
-%%% Includes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--include("toolbar.hrl").
-%
-%%% Exports %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--export([start/0,version/0]).
--export([update/0,quit/0]).
--export([create_tool_file/0,add_gs_contribs/0]).
-
-%
--define (STARTUP_TIMEOUT, 20000).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% Exported functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% start() => ok | already_started
-%----------------------------------------
-start() ->
-    case whereis(toolbar) of
-	undefined ->
-	    Self = self(),
-	    PidInit = spawn(fun() -> init(Self)  end),
-	    init_ok (PidInit);
-
-	_Pid ->
-	    already_started
-    end.
-
-
-
-%%% init_ok  /1
-%%%
-%%% init_ok returns the pid from this process given from
-%%% init/1 after its initialization, or else it timeouts.
-%%%
-
-init_ok (PidInit) ->
-    %% Wait for a initialization completion message from
-    %% the spawned process before returning its Pid.
-    %% 
- 
-    receive
-        {initialization_complete, PidInit} ->
-            PidInit
- 
-    %% (Conditional) Failure to start within the time limit will
-    %% result in termination
- 
-    after
-        ?STARTUP_TIMEOUT ->
-            exit(PidInit, kill),
-            exit({startup_timeout, ?MODULE})
-    end.
- 
-
-
-%----------------------------------------
-% version() -> string()
-% Returns the version number.  
-%----------------------------------------
-version() ->
-    "1.1".
-
-%----------------------------------------
-% update() => ok | {error,not_started}
-% Make a search for new tools (*.tool files) in the current path.
-%----------------------------------------
-update() ->
-    call(update_toolbar).
-
-%----------------------------------------
-% quit() => ok | {error,not_started}
-% Quit the Toolbar.
-%----------------------------------------
-quit() ->
-    call(quit).
-
-%----------------------------------------
-% create_tool_file() => ok | {error,not_started}
-% Start the GUI for creating .tool files.
-%----------------------------------------
-create_tool_file() ->
-    call(create_tool_file).
-
-%----------------------------------------
-% add_gs_contribs() => ok | {error,not_started}
-% Add GS contributions.
-%----------------------------------------
-add_gs_contribs() ->
-    call(add_gs_contribs).
-
-
-%%% Internal functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%=============================================================================
-% Main loop
-%=============================================================================
-
-%----------------------------------------
-% init()
-%----------------------------------------
-init(PidCaller) ->
-    register (toolbar, self ()),
-
-    %% Start GS
-    S = gs:start([{kernel,true}]),
-    
-    %% Draw main window
-    Window = toolbar_graphics:draw_window(S),
-
-    %% Add system defined Tool icons to main window
-    toolbar_graphics:cursor(Window,busy),
-    NewWindow = add_tools(Window,code:get_path()),
-    toolbar_graphics:cursor(Window,arrow),
-    
-    %% Listen to configure events from the window
-    toolbar_graphics:listen_configure(NewWindow),
-    
-    %% Notify caller that the process appears
-    %% to have been started.
-    PidCaller ! {initialization_complete, self()},
-     
-    loop(S,NewWindow,null,undefined).
-
-%----------------------------------------
-% loop(S,Window,LoopData,TimerRef)
-%   S - pid() GS
-%   Window - tbwindow record (see toolbar_graphics.erl)
-%   LoopData - term()
-%   TimerRef - undefined | timer_ref()
-%----------------------------------------
-loop(S,Window,LoopData,TimerRef) ->
-    receive
-	%% test events
-	{ping, Pid} ->
-            Pid ! {toolbar, alive},
-            loop (S, Window, LoopData, TimerRef);
- 
-        {stop, Pid} ->
-            Pid ! {toolbar, stopped},
-	    finished;
- 
-  	%% ----- GS events ----- %%
-
-	{gs,_Object,Event,Data,Args} ->
-	    case toolbar_graphics:event(LoopData,Event,Data,Args) of
-		
-		noevent ->
-		    loop(S,Window,LoopData,TimerRef);
-
-		%% Display short information message
-		{display,Msg} ->
-		    
-		    {ok,Ref} = timer:apply_after(500,toolbar_graphics,
-						 display_show,[Window,Msg]),
-		    loop(S,Window,LoopData,Ref);
-
-		%% Clear display area
-		display_clear ->
-		    timer:cancel(TimerRef),
-		    toolbar_graphics:display_clear(Window),
-		    loop(S,Window,LoopData,undefined);
-		
-		%% New LoopData
-		{newData,NewLoopData} ->
-		    loop(S,Window,NewLoopData,TimerRef);
-
-		%% Icon button clicked, start corresponding tool/uc
-		{start,Start} ->
-		    WinObj = toolbar_graphics:get_window(Window),
-		    start_tool(Start,WinObj),
-		    loop(S,Window,LoopData,TimerRef);
-		
-		%% Update Toolbar
-		update_toolbar ->
-		    toolbar_graphics:cursor(Window,busy),
-		    NewWindow = add_tools(Window,code:get_path()),
-		    toolbar_graphics:cursor(Window,arrow),
-		    loop(S,NewWindow,LoopData,TimerRef);
-
-		%% Start Tool Configuration tool
-		create_tool_file ->
-		    toolbar_toolconfig:start(),
-		    loop(S,Window,LoopData,TimerRef);
-		
-		%% Add GS contributions
-		add_gs_contribs ->
-		    toolbar_graphics:cursor(Window,busy),
-		    GsDir = toolbar_lib:gs_contribs_dir(),
-		    code:add_path(GsDir),
-		    NewWindow = add_tools(Window,[GsDir]),
-		    toolbar_graphics:cursor(Window,arrow),
-		    loop(S,NewWindow,LoopData,TimerRef);
-		
-		%% Help
-		{help,Html} ->
-		    toolbar_graphics:cursor(Window,busy),
-		    WinObj = toolbar_graphics:get_window(Window),
-		    tool_utils:open_help(WinObj, Html),
-		    toolbar_graphics:cursor(Window,arrow),
-		    loop(S,Window,LoopData,TimerRef);
-		
-		%% About help
-		about_help ->
-		    WinObj = toolbar_graphics:get_window(Window),
-		    Text = ["Help text is on HTML format",
-			    "Requires Netscape to be up and running"],
-		    tool_utils:notify(WinObj, Text),
-		    loop(S,Window,LoopData,TimerRef);
-
-		%% Window has been resized, redraw it
-		{redraw,Size} ->
-		    NewWindow = toolbar_graphics:redraw_window(Window,Size),
-		    loop(S,NewWindow,LoopData,TimerRef);
-
-		%% Quit
-		quit ->
-		    finished
-	    end;
-
-	%% ----- Events from user ----- %%
-	
-	%% Update Toolbar
-	update_toolbar ->
-	    toolbar_graphics:cursor(Window,busy),
-	    NewWindow = add_tools(Window,code:get_path()),
-	    toolbar_graphics:cursor(Window,arrow),
-	    loop(S,NewWindow,LoopData,TimerRef);
-	
-	%% Quit
-	quit ->
-	    finished;
-
-	%% Start Tool Configuration tool
-	create_tool_file ->
-	    toolbar_toolconfig:start(),
-	    loop(S,Window,LoopData,TimerRef);
-		
-	%% Add GS contributions
-	add_gs_contribs ->
-	    toolbar_graphics:cursor(Window,busy),
-	    GsDir = toolbar_lib:gs_contribs_dir(),
-	    code:add_path(GsDir),
-	    NewWindow = add_tools(Window,[GsDir]),
-	    toolbar_graphics:cursor(Window,arrow),
-	    loop(S,NewWindow,LoopData,TimerRef);
-	
-	Other ->
-	    io:format("toolbar: unexp msg ~p~n",[Other]),
-	    loop(S,Window,LoopData,TimerRef)
-    end.
-
-%----------------------------------------
-% call(Msg) => ok | {error,not_started}
-%   Msg - term()
-% Send message to toolbar if it is started, otherwise return an error
-%----------------------------------------
-call(Msg) ->
-    case whereis(toolbar) of
-	undefined ->
-	    {error,not_started};
-	_ ->
-	    toolbar ! Msg,
-	    ok
-    end.
-
-
-%=============================================================================
-% Addition of new tools
-%=============================================================================
-%----------------------------------------
-% add_tools(Window,Dirs) => NewWindow
-%   Window, NewWindow - tbwindow record (see toolbar_graphics.erl)
-%   Dirs - [string()] Directory names
-% Calls add_tools2/2 recursively for a number of directories
-%----------------------------------------
-add_tools(Window,[Dir|Rest]) when is_list(Dir) ->
-
-    %% Add all tools in the directory Dir
-    NewWindow = add_tools2(Window,tool_files(Dir)),
-
-    case filename:basename(Dir) of
-	%% Dir is an 'ebin' directory, check in '../priv' as well
-	"ebin" ->
-	    NewerWindow =
-		add_tools2(NewWindow,
-			   tool_files(filename:join(filename:dirname(Dir),
-						    "priv"))),
-	    add_tools(NewerWindow,Rest);
-	_ ->
-	    add_tools(NewWindow,Rest)
-    end;
-add_tools(Window,[]) ->
-    Window.
-
-%----------------------------------------
-% add_tools2(Window,ToolFiles) => NewWindow
-%   Window, NewWindow - tbwindow record (see toolbar_graphics.erl)
-%   ToolFiles - [string()] *.tool file names
-% Calls add_tool/2 recursively for a number of .tool files in a directory
-%----------------------------------------
-add_tools2(Window,[ToolFile|Rest]) ->
-    case add_tool(Window,ToolFile) of
-	{ok,NewWindow} ->
-	    add_tools2(NewWindow,Rest);
-	{error,_Reason} ->
-	    add_tools2(Window,Rest)
-    end;
-add_tools2(Window,[]) ->
-    Window.
-
-%----------------------------------------
-% add_tool(Window,ToolFile) => {ok,NewWindow} | {error,Reason}
-%   Window, NewWindow - tbwindow record (see toolbar_graphics.erl)
-%   ToolFile - string() A .tool file
-%   Reason - noname | nostart | version | format | read | open
-% Reads tool information from a .tool file and adds it to the toolbar
-% Returns the new window information
-%----------------------------------------
-add_tool(Window,ToolFile) ->
-    case tool_info(ToolFile) of
-	{ok,ToolInfo} ->
-	    case toolbar_graphics:already_added(Window,ToolInfo) of
-		true ->
-		    {ok,Window};
-		false ->
-		    NewWindow = toolbar_graphics:add_icon(Window,ToolInfo),
-		    {ok,NewWindow}
-	    end;
-	{error,Reason} ->
-	    %% Log
-	    {error,Reason}
-    end.
-
-
-%=============================================================================
-% Functions for getting *.tool configuration files
-%=============================================================================
-
-%----------------------------------------
-% tool_files(Dir) => ToolFiles
-%   Dir - string() Directory name
-%   ToolFiles - [string()]
-% Return the list of all files in Dir ending with .tool (appended to Dir)
-%----------------------------------------
-tool_files(Dir) ->
-    case file:list_dir(Dir) of
-	{ok,Files} ->
-	    filter_tool_files(Dir,Files);
-	{error,_Reason} ->
-	    []
-    end.
-
-%----------------------------------------
-% filter_tool_files(Dir,Files) => ToolFiles
-%   Dir - string() Directory name
-%   Files, ToolFiles - [string()] File names
-% Filters out the files in Files ending with .tool and append them to Dir
-%----------------------------------------
-filter_tool_files(_Dir,[]) ->
-    [];
-filter_tool_files(Dir,[File|Rest]) ->
-    case filename:extension(File) of
-	".tool" ->
-	    [filename:join(Dir,File)|filter_tool_files(Dir,Rest)];
-	_ ->
-	    filter_tool_files(Dir,Rest)
-    end.
-
-
-%=============================================================================
-% Functions for retrieving tool information from *.tool files
-%=============================================================================
-
-%----------------------------------------
-% tool_info(ToolFile) => {ok,ToolInfo} | {error,Reason}
-%   ToolFile - string() .tool file
-%   ToolInfo - toolinfo record
-%   Reason - nofile | format | noname | nostart
-% Retreives tool information from ToolFile
-%----------------------------------------
-tool_info(ToolFile) ->
-    case file:consult(ToolFile) of
-	{error,open} ->
-	    {error,nofile};
-	{error,read} ->
-	    {error,format};
-	{ok,[{version,Vsn},InfoTuple]} when is_tuple(InfoTuple)->
-	    case toolbar_lib:tool_info_syntax(Vsn,InfoTuple) of
-		
-		%% Syntax check ok, start additional checks
-		{ok,InfoList} ->
-
-		    tool_info2(filename:dirname(ToolFile),
-			       InfoList,#toolinfo{});
-		
-		%% Syntax error
-		Error ->
-		    Error
-	    end;
-	{ok,[{version,Vsn},ToolInfo]} when is_list(ToolInfo)->
-	    case toolbar_lib:tool_info_syntax(Vsn,ToolInfo) of
-		
-		%% Syntax check ok, start additional checks
-		{ok,InfoList} ->
-		    tool_info2(filename:dirname(ToolFile),
-			       InfoList,#toolinfo{});
-		
-		%% Syntax error
-		Error ->
-		    Error
-	    end;
-	{ok,_Other} ->
-	    {error,format}
-    end.
-
-%----------------------------------------
-% tool_info2(Dir,Info,ToolInfo) => {ok,ToolInfo}
-%   Dir - string() Directory where this .tool file is situated
-%   Info - [{Key,Val}] List of tuples in the .tool file
-%   ToolInfo - toolinfo record being filled in
-% Used by tool_info2/1
-%----------------------------------------
-%%% Tool name
-tool_info2(Dir,[{tool,Name}|Rest],TI) ->
-    tool_info2(Dir,Rest,TI#toolinfo{tool=Name});
-
-%%% Start function
-tool_info2(Dir,[{start,{M,F,A}}|Rest],TI) ->
-    tool_info2(Dir,Rest,TI#toolinfo{start={M,F,A}});
-
-%%% Icon file
-%%% It must exist since the icon is drawn immediately after this .tool
-%%% file has been successfully read
-%%% It must also end with a .gif or .xbm suffix
-%%% Otherwise the icon is ignored!
-%%% Uses absolute path: If a relative path is given, it is assumed to be
-%%% relative to the directory of the .tool file
-tool_info2(Dir,[{icon,Icon}|Rest],TI) ->
-
-    %% Check that the image file ends with .xbm or .gif
-    case image_suffix(Icon) of
-	true ->
-
-	    %% Add absolute path (if necessary)
-	    File = absolute_path(Dir,Icon),
-		
-	    case toolbar_lib:legal_file(File) of
-		ok ->
-		    tool_info2(Dir,Rest,TI#toolinfo{icon=File});
-		_Error ->
-		    %% LOG File does not exist or cannot be read
-		    tool_info2(Dir,Rest,TI)
-	    end;
-		
-	false ->
-	    %% LOG Illegal icon file name
-	    tool_info2(Dir,Rest,TI)
-    end;
-
-%%% Message string
-tool_info2(Dir,[{message,Msg}|Rest],TI) ->
-    tool_info2(Dir,Rest,TI#toolinfo{message=Msg});
-
-%%% Html file is found
-%%% Check if file exists at "view-time", not now!
-%%% Uses absolute path: If a relative path is given, it is assumed to be
-%%% relative to the directory of the .tool file
-tool_info2(Dir,[{html,Html}|Rest],TI) ->
-    
-    %% Check if the HTML file is a remote URL or a local file
-    case Html of
-
-	%% http://... Remote URL, save as is
-	[$h,$t,$t,$p,$:,$/,$/|_] ->
-	    tool_info2(Dir,Rest,TI#toolinfo{html=Html});
-
-	%% file:... Local file, save file with absolute path
-	[$f,$i,$l,$e,$:|File] ->
-	    tool_info2(Dir,Rest,TI#toolinfo{html=absolute_path(Dir,File)});
-
-	%% Everything else is assumed to be a file name
-	%% Save file with absolute path
-	_ ->
-	    tool_info2(Dir,Rest,TI#toolinfo{html=absolute_path(Dir,Html)})
-    end;
-
-%%% Info has been traversed
-tool_info2(_Dir,[],ToolInfo) ->
-    {ok,ToolInfo}.
-		       
-%----------------------------------------
-% image_suffix(File) => true | false
-%   File - string() File name
-% Returns true if File end with an image suffix: gif or xbm
-%----------------------------------------
-image_suffix(File) ->
-    case filename:extension(File) of
-	".gif" ->
-	    true;
-	".xbm" ->
-	    true;
-	_ ->
-	    false
-    end.
-
-%----------------------------------------
-% absolute_path(Dir,File) => string()
-%   Dir, File - string()
-% Given a directory and a file name, return the appended result if the file
-% name does not already contain an absolute path.
-% Dir is supposed to be an absolute path, if it is '.', it is replaced
-% with the current working directory.
-%----------------------------------------
-absolute_path(".",File) ->
-    {ok,Cwd} = file:get_cwd(),
-    absolute_path(Cwd,File);
-absolute_path(Dir,File) ->
-    filename:join(Dir,File).
-
-
-%=============================================================================
-% Start of a tool
-%=============================================================================
-
-%----------------------------------------
-% start_tool({Module,Function,Arguments}, GSobj)
-%   Module - atom() Module name
-%   Function - atom() Function name
-%   Argument - [term()] Function arguments
-%   GSobj - gs_obj()
-% Applies the given function in order to start a tool.
-%----------------------------------------
-start_tool({M,F,A}, GSobj) ->
-    spawn(fun() -> start_tool(M, F, A, GSobj) end).
-
-start_tool(M,F,A,GSobj) ->
-    case catch apply(M,F,A) of
-	{'EXIT',Reason} ->
-	    String1 = io_lib:format("Failed to call apply(~p,~p,~p)",
-				    [M,F,A]),
-	    String2 = io_lib:format("Reason: ~p",[Reason]),
-	    tool_utils:notify(GSobj,[String1,String2]),
-	    false;
-	_ ->
-	    true
-    end.
diff --git a/lib/toolbar/src/toolbar.hrl b/lib/toolbar/src/toolbar.hrl
deleted file mode 100644
index 1793cd1833..0000000000
--- a/lib/toolbar/src/toolbar.hrl
+++ /dev/null
@@ -1,34 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-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%
-%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Erlang Toolbar
-%
-%%% Common data structures %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Tool configuration information
--record(toolinfo,
-	{tool,
-	 start,
-	 icon=nofile,
-	 message="",
-	 html=nofile}).
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/lib/toolbar/src/toolbar_graphics.erl b/lib/toolbar/src/toolbar_graphics.erl
deleted file mode 100644
index c4c4273c63..0000000000
--- a/lib/toolbar/src/toolbar_graphics.erl
+++ /dev/null
@@ -1,404 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(toolbar_graphics).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,read,2}}]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Erlang Toolbar
-%
-%%% Description %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Toolbar graphics.
-% The Toolbar window looks something like this:
-%
-%  |-----------------------------|
-%  | File Tools             Help |
-%  |-----------------------------|
-%  | |-----|  |-----|   |-----|  |
-%  | |     |  |     |   |     |  |
-%  | |Icon1|  |Icon2|...|IconN|  |
-%  | |-----|  |-----|   |-----|  |
-%  |-----------------------------|
-%  | Help text area              |
-%  |-----------------------------|
-%
-%%% Includes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--include("toolbar.hrl").
-%
-%%% Internal data structures %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Toolbar window record
--record(tbwindow,
-	{window,menubar,canvas,labelframe,
-	 label,helpmenu,
-	 no_of_buttons,
-	 min_height,min_width,cur_height,icons}).
-%
-%%% Constants %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Window width
--define(width,215).
-%
-% Icon width and height
--define(icon,34).
-%
-% Margin around icons
--define(pad,0).
-%
-% Default label width and height
--define(wlabel,50).
--define(hlabel,15).
-%
-% Default button width and height
--define(wbutton,50).
--define(hbutton,30).
-%
-%%% Exports %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--export([event/4]).
--export([draw_window/1,redraw_window/2,already_added/2,add_icon/2]).
--export([get_window/1]).
--export([cursor/2]).
--export([listen_configure/1]).
--export([display_show/2,display_clear/1]).
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% Exported functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% event(Data,GsEvent,Data,Args) => Event
-%   Data - term()
-%   GsEvent - GS event
-%   Data, Args - Data and Arg fields associated with the GS event
-%   Event - {display,String} | display_clear | noevent | {start,{M,F,A}} |
-%           update_toolbar | create_tool_file | add_gs_contribs |
-%           {help,Html} | about_help | {redraw,{Width,Height}} | quit |
-%           {newData,NewData}
-%   String - string()
-%   M, F - atom() Module and function name
-%   A - [term()] Function argument
-%   Html - string() HTML file | nofile
-%   Width, Height - integer()
-%   NewData - term()
-% Tries to convert a GS event to an internal toolbar event. The separation
-% is intented to keep the implementation details of the graphics hidden
-% for toolbar.erl. Pure graphical events triggered by the GS event will
-% be executed by this function.
-% The Data field is used for saving information between different events
-% (without having to use put/get or ets). Right now it is only used to save
-% the coordinates of the last canvasbutton pressed, making it possible to
-% check if the canvasbutton is released with the mouse moved outside the
-% button (= no action) or with the mouse still inside the button (= action).
-%----------------------------------------
-%%% Mouse enters a icon, display short help message
-event(_LoopData,enter,{canvasbutton,_Cbtn,{_Start,{message,String}}},_Args) ->
-    {display,String};
-
-%% Mouse leaves a icon, clear display area
-event(_LoopData,leave,{canvasbutton,_Cbtn,_Data},_Args) ->
-    display_clear;
-
-%% An icon is pressed, create graphical illusion of this
-event(_LoopData,buttonpress,{canvasbutton,Canvasbutton,_},_Args) ->
-    canvasbutton:press(Canvasbutton),
-    {newData,canvasbutton:read(Canvasbutton,coords)};
-
-%% An icon is released, create graphical illusion of this
-event(LoopData,buttonrelease,{canvasbutton,Cbtn,{{start,Start},_Msg}},
-      [_,X,Y|_]) ->
-    canvasbutton:release(Cbtn),
-    case within(X,Y,LoopData) of
-	true ->
-	    {start,Start};
-	false ->
-	    noevent
-    end;
-
-%%% Update Toolbar button pressed
-event(_LoopData,click,_Data,["Update Toolbar"|_]) ->
-    update_toolbar;
-
-%%% Tool configuration button pressed
-event(_LoopData,click,_Data,["Create Tool File..."|_]) ->
-    create_tool_file;
-
-%%% Add GS contribution button pressed
-event(_LoopData,click,_Data,["Add GS Contributions"|_]) ->
-    add_gs_contribs;
-
-%%% Help menu button selected
-event(_LoopData,click,{help,Html},_Args) ->
-    {help,Html};
-
-%%% About Help menu button selected
-event(_LoopData,click,about_help,_Args) ->
-    about_help;
-
-%% Window resized, redraw it
-event(_LoopData,configure,_Data,[Width,Height|_]) ->
-    {redraw,{Width,Height}};
-	    
-%%% Quit button pressed
-event(_LoopData,click,_Data,["Quit"|_]) ->
-    quit;
-
-%%% Window closed
-event(_LoopData,destroy,_Data,_Args) ->
-    quit;
-
-event(_LoopData,_GsEvent,_Data,_Args) ->
-    noevent.
-
-%=============================================================================
-% Main window functions
-%=============================================================================
-
-%----------------------------------------
-% draw_window(S) => Window
-%   S - pid() GS
-%   Window - tbwindow record
-% This functions create the main window, initially without any tool icons
-%----------------------------------------
-draw_window(S) ->
-
-    Norm = ?icon + 2*?pad,
-
-    %% Main window
-    Win = gs:create(window,S,[{title,"Erlang Tools"},{width,?width}]),
-
-    %% Menu bar with menu buttons
-    Menubar = gs:create(menubar,Win,[]),
-
-    %% File menu
-    File = gs:create(menubutton,Menubar,[{label,{text,"File"}},{side,left}]),
-    FileM = gs:create(menu,File,[]),
-    gs:create(menuitem,FileM,[{label,{text,"Update Toolbar"}}]),
-    gs:create(menuitem,FileM,[{label,{text,"Quit"}}]),
-
-    %% Tools menu
-    Tool = gs:create(menubutton,Menubar,[{label,{text,"Tools"}},{side,left}]),
-    ToolM = gs:create(menu,Tool,[]),
-    gs:create(menuitem,ToolM,[{label,{text,"Create Tool File..."}}]),
-    gs:create(menuitem,ToolM,[{label,{text,"Add GS Contributions"}}]),
-
-    %% Help menu
-    Help = gs:create(menubutton,Menubar,[{label,{text,"Help"}},{side,right}]),
-    HelpM = gs:create(menu,Help,[]),
-    gs:create(menuitem,HelpM,[{label,{text,"About..."}},
-			      {data,about_help}]),
-    gs:create(menuitem,HelpM,[{label,{text,"Toolbar"}},
-			      {data,{help,toolbar_lib:help_file()}}]),
-    gs:create(menuitem,HelpM,[{label,{text,"OTP"}},
-			      {data,{help,toolbar_lib:otp_file()}}]),
-    gs:create(menuitem,HelpM,[{itemtype,separator}]),
-    
-    %% Check height of menu bar
-    H = gs:read(Menubar,height),
-
-    %% Now the height of the window can be computed
-    Height = H+Norm+?hlabel+2*?pad,
-    gs:config(Win,{height,Height}),
-
-    %% Canvas, here will the Tool canvasbuttons be inserted
-    Canvas = gs:create(canvas,Win,[{width,?width},{height,Norm},{x,0},{y,H}]),
-
-    %% Label for displaying help messages and the frame containing it
-    LabelF = gs:create(frame,Win,[{bg,green},{bw,1},
-				  {width,?width},{height,?hlabel+2*?pad},
-				  {x,0},{y,H+Norm}]),
-    Label = gs:create(label,LabelF,[{align,w},{height,?hlabel},
-				    {width,?width},{x,?pad},{y,?pad},
-				    {label,{text,string:copies(" ",30)}}]),
-
-    gs:config(Win,{map,true}),
-
-    #tbwindow{window=Win,
-	      menubar=Menubar,canvas=Canvas,labelframe=LabelF,
-	      label=Label,helpmenu=HelpM,
-	      no_of_buttons=0,
-	      min_height=Height,min_width=?width,cur_height=Height,
-	      icons=[]}.
-
-%----------------------------------------
-% redraw_window(Window,{NewWidth,NewHeight}) => NewWindow
-%   Window, NewWindow - tbwindow record
-%   NewWidth, NewHeight - integer()
-% Redraw main window contents according to a new size
-%----------------------------------------
-redraw_window(Window,{NewWidth,NewHeight}) ->
-    
-    MinWidth = Window#tbwindow.min_width,
-    if
-	NewWidth=<MinWidth ->
-	    true;
-	true ->
-	    gs:config(Window#tbwindow.canvas,{width,NewWidth}),
-	    gs:config(Window#tbwindow.labelframe,{width,NewWidth}),
-	    gs:config(Window#tbwindow.label,{width,NewWidth-2*?pad})
-    end,
-
-    MinHeight = Window#tbwindow.min_height,
-    if
-	NewHeight=<MinHeight ->
-	    Window;
-	true ->
-
-	    %% Compute size difference
-	    Diff = NewHeight - Window#tbwindow.cur_height,
-
-	    %% Resize button frame
-	    Canvas = Window#tbwindow.canvas,
-	    gs:config(Canvas,{height,gs:read(Canvas,height)+Diff}),
-
-	    %% Move label frame accordingly
-	    LabelF = Window#tbwindow.labelframe,
-	    gs:config(LabelF,{y,gs:read(LabelF,y)+Diff}),
-
-	    %% Return updated tbwindow record
-	    Window#tbwindow{cur_height=NewHeight}
-    end.
-
-%----------------------------------------
-% already_added(Window,ToolInfo) => true | false
-%   Window - tbwindow record
-%   ToolInfo - toolinfo record
-% Returns true if ToolInfo contains information about a tool that
-% is already included in Window
-%----------------------------------------
-already_added(Window,ToolInfo) ->
-    already_added2(Window#tbwindow.icons,ToolInfo#toolinfo.tool).
-
-%----------------------------------------
-% already_added2(ToolInfos,Tool) => true | false
-%   ToolInfos - [toolinfo record]
-%   Tool - atom() Tool name
-%----------------------------------------
-already_added2([#toolinfo{tool=Tool}|_Rest],Tool) ->
-    true;
-already_added2([_|Rest],Tool) ->
-    already_added2(Rest,Tool);
-already_added2([],_ToolInfo) ->
-    false.
-
-%----------------------------------------
-% add_icon(Window,ToolInfo) => NewWindow
-%   Window, NewWindow - tbwindow record
-%   ToolInfo - toolinfo record
-% Add an icon to the main window
-%----------------------------------------
-add_icon(Window,ToolInfo) ->
-    Norm = ?icon + 2*?pad,
-    
-    %% Extend window if necessary
-    N = Window#tbwindow.no_of_buttons,
-    ReqWidth = N*Norm+Norm,
-    CurWidth = gs:read(Window#tbwindow.window,width),
-    if
-	ReqWidth>CurWidth ->
-	    gs:config(Window#tbwindow.window,{width,ReqWidth}),
-	    gs:config(Window#tbwindow.canvas,{width,ReqWidth}),
-	    gs:config(Window#tbwindow.labelframe,{width,ReqWidth}),
-	    gs:config(Window#tbwindow.label,{width,ReqWidth-2*?pad});
-	true ->
-	    true
-    end,
-    
-    %% Insert icon into button frame
-    canvasbutton:create(Window#tbwindow.canvas,
-			[{image,ToolInfo#toolinfo.icon},
-			 {x,N*Norm+?pad},{y,?pad},
-			 {width,?icon},{height,?icon},
-			 {data,{{start,ToolInfo#toolinfo.start},
-				{message,ToolInfo#toolinfo.message}}}]),
-    
-    %% Insert tool name into help menu (if there is any help available)
-    case ToolInfo#toolinfo.html of 
-	nofile ->
-	    true;
-	Html ->
-	    gs:create(menuitem,Window#tbwindow.helpmenu,
-		      [{label,{text,ToolInfo#toolinfo.tool}},
-		       {data,{help,Html}}])
-    end,
-    
-    MinWidth = gs:read(Window#tbwindow.window,width),
-    Window#tbwindow{no_of_buttons=N+1,min_width=MinWidth,
-		    icons=[ToolInfo|Window#tbwindow.icons]}.
-
-%----------------------------------------
-% get_window(Window) -> gs_obj()
-%   Window - tbwindow record
-%----------------------------------------
-get_window(Window) ->    
-    Window#tbwindow.window.
-
-%----------------------------------------
-% cursor(Window,Cursor)
-%   Window - tbwindow record
-%   Cursor - arrow | busy
-%----------------------------------------
-cursor(Window,Cursor) ->
-    gs:config(Window#tbwindow.window,{cursor,Cursor}).
-
-%----------------------------------------
-% listen_configure(Window)
-%   Window - tbwindow record
-% Configure Window to listen for configure events
-%----------------------------------------
-listen_configure(Window) ->
-    gs:config(Window#tbwindow.window,{configure,true}).
-
-%----------------------------------------
-% display_show(Window,Text)
-%   Window - tbwindow record
-%   Text - string()
-% Display text in the help text area
-%----------------------------------------
-display_show(Window,Text) ->
-    gs:config(Window#tbwindow.label,{label,{text,Text}}).
-
-%----------------------------------------
-% display_clear(Window)
-%   Window - tbwindow record
-% Clear the help text area
-%----------------------------------------
-display_clear(Window) ->
-    display_show(Window,"").
-
-%%% Internal functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% within(X,Y,[{Left,Top},{Right,Bot}]) => true | false
-% Return true if {X,Y} is within the given rectangle.
-%----------------------------------------
-within(X,Y,[{L,T},{R,B}]) ->
-    if
-	X>=L,
-	X=<R,
-	Y>=T,
-	Y=<B ->
-	    true;
-	true ->
-	    false
-    end.
diff --git a/lib/toolbar/src/toolbar_lib.erl b/lib/toolbar/src/toolbar_lib.erl
deleted file mode 100644
index 9d3b9fdeb5..0000000000
--- a/lib/toolbar/src/toolbar_lib.erl
+++ /dev/null
@@ -1,223 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-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(toolbar_lib).
--include_lib("kernel/include/file.hrl").
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Erlang Toolbar
-%
-%%% Description %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Library functions
-%
-%%% Exports %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--export([gs_contribs_dir/0,help_file/0,otp_file/0]).
--export([error_string/1]).
--export([legal_file/1]).
--export([insert_newlines/1]).
--export([tool_info_syntax/2]).
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%% Exported functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% gs_contribs_dir() => string()
-% Return the directory of the GS contributions
-%----------------------------------------
-gs_contribs_dir() ->
-    filename:join(code:lib_dir(gs),"contribs/ebin/").
-
-%----------------------------------------
-% help_file() => string()
-% Returns the address to the toolbar help file
-%----------------------------------------
-help_file() ->
-    filename:join([code:lib_dir(toolbar),"doc", "html", "index.html"]).
-
-%----------------------------------------
-% otp_file() => string()
-% Returns the address to the OTP documentation
-%----------------------------------------
-otp_file() ->
-    filename:join([code:root_dir(),"doc", "index.html"]).
-
-%----------------------------------------
-% error_string(Reason) => string()
-%   Reason - nofile | format | noname | nostart | illegal | raccess | waccess
-% Given Reason, returns a short "explanation string"
-%----------------------------------------
-error_string(nofile) -> "File does not exist";
-error_string(format) -> "File on wrong format";
-
-error_string(noname) -> "No tool name is specified";
-error_string(nostart) -> "No start function is specified";
-
-error_string(illegal) -> "Illegal file name";
-
-error_string(raccess) ->  "File is not readable";
-error_string(waccess) ->  "File is not writeable".
-
-%----------------------------------------
-% legal_file(File) => ok | directory | {error,nofile} | {error,raccess}
-%   File - string() File name
-% Checks if File is an existing and readable file.
-%----------------------------------------
-legal_file(File) ->
-    case file:read_file_info(File) of
-
-	%% File exists...
-	{ok,#file_info{type=regular,access=Access}} ->
-	    if
-		
-		%% ...but is read protected
-		Access/=read,
-		Access/=read_write ->
-		    {error,raccess};
-		
-		%% ...and is possible to read
-		true ->
-		    ok
-	    end;
-
-	{ok,#file_info{type=directory}} ->
-	    directory;
-	
-	%% File does not exist
-	_Error ->
-	    {error,nofile}
-    end.
-
-%----------------------------------------
-% insert_newlines(Strings) => string()
-%   Strings - string() | [string()]
-% If Strings is a list of strings, return a string where all these strings
-% are concatenated with newlines in between, otherwise return Strings.
-%----------------------------------------
-insert_newlines([String|Rest]) when is_list(String), Rest/=[]->
-    String ++ "\n" ++ insert_newlines(Rest);
-insert_newlines([Last]) ->
-    [Last];
-insert_newlines(Other) ->
-    Other.
-
-%----------------------------------------
-% tool_info_syntax(Version,ToolInfo) => {ok,CorrToolInfo} | {error,Reason}
-%   Version - string()
-%   ToolInfo - tuple()
-%   CorrToolInfo - list()
-%   Reason - version | format | noname | nostart
-% Return a corrected (blanks removed etc) version of ToolInfo
-% if the syntax of ToolInfo is correct (ie contains all
-% mandatory elements and all values are of the specified type).
-%
-% Currently accepted versions:
-%   "0.1" (which should be "1.0")
-%   "1.1" (same as "0.1")
-%----------------------------------------
-tool_info_syntax("1.1",ToolInfo) ->
-    tool_info_syntax("0.1",ToolInfo);
-tool_info_syntax("0.1",ToolInfo) when is_tuple(ToolInfo) ->
-    syntax01(tuple_to_list(ToolInfo),false,false,[]);
-tool_info_syntax("0.1",_) ->
-    {error,format};
-tool_info_syntax("1.2",ToolInfo) when is_list(ToolInfo)->
-    syntax01(ToolInfo,false,false,[]);
-tool_info_syntax(_Vsn,_) ->
-    {error,version}.
-
-
-%%% Internal functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% syntax01(List,NameF,StartF,Res) => {ok,Res} | {error,Reason}
-%   List - [tuple()]
-%   NameF, StartF - boolean()
-%   Res - [tuple()]
-%   Reason - format | noname | nostart
-% Version 0.1 syntax check of .tool file.
-%----------------------------------------
-syntax01([{tool,Str}|Rest],false,StartF,Res) when is_list(Str) ->
-    case string:strip(Str) of
-	[] ->
-	    {error,format};
-	Tool ->
-	    syntax01(Rest,true,StartF,[{tool,Tool}|Res])
-    end;
-syntax01([{start,{M,F,A}}|Rest],NameF,false,Res) when is_atom(M),
-						      is_atom(F),
-						      is_list(A) ->
-    syntax01(Rest,NameF,true,[{start,{M,F,A}}|Res]);
-syntax01([{icon,Str}|Rest],NameF,StartF,Res) when is_list(Str) ->
-    case string:strip(Str) of
-	[] ->
-	    syntax01(Rest,NameF,StartF,Res);
-	Icon ->
-	    syntax01(Rest,NameF,StartF,[{icon,Icon}|Res])
-    end;
-syntax01([{message,Str}|Rest],NameF,StartF,Res) when is_list(Str) ->
-    case string:strip(Str) of
-	[] ->
-	    syntax01(Rest,NameF,StartF,Res);
-	Message ->
-	    syntax01(Rest,NameF,StartF,
-		     [{message,lists:sublist(Message,1,30)}|Res])
-    end;
-syntax01([{html,Str}|Rest],NameF,StartF,Res) when is_list(Str) ->
-    case string:strip(Str) of
-	[] ->
-	    syntax01(Rest,NameF,StartF,Res);
-	Html ->
-	    syntax01(Rest,NameF,StartF,[{html,Html}|Res])
-    end;
-%%The fields used by webtool must be removed
-syntax01([_|Rest],NameF,StartF,Res) ->
-    syntax01(Rest,NameF,StartF,Res);
-
-syntax01([],true,true,Res) ->
-    {ok,Res};
-syntax01([],false,_,_) ->
-    {error,noname};
-syntax01([],_,false,_) ->
-    {error,nostart};
-syntax01(_,_,_,_) ->
-    {error,format}.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/toolbar/src/toolbar_toolconfig.erl b/lib/toolbar/src/toolbar_toolconfig.erl
deleted file mode 100644
index 479033fa22..0000000000
--- a/lib/toolbar/src/toolbar_toolconfig.erl
+++ /dev/null
@@ -1,549 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(toolbar_toolconfig).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Erlang Toolbar
-%
-%%% Description %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Tool configuration tool, edit and creates .tool files
-% This tool works separately from the toolbar.
-%
-%%% External data types %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% toolinfo() -- Tool configuration information
--include("toolbar.hrl").
-%
-%%% Internal data types %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% tfwindow() -- Toolfile configuration window
--record(tfwindow,
-	{window,
-	 fileentry,
-	 toolentry,moduleentry,functionentry,
-	 iconentry,messageentry,htmlentry,
-	 label}).
-%
-%%% Exports %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
--export([start/0]).
-%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
--export([init/0]). % spawn
-
-
-%%% Exported functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%----------------------------------------
-% start() => pid()
-%----------------------------------------
-start() ->
-    spawn(toolbar_toolconfig,init,[]).
-
-
-%%% Internal functions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%=============================================================================
-% Main loop
-%=============================================================================
-
-%----------------------------------------
-% init()
-%----------------------------------------
-init() ->
-
-    %% Start GS (or get the pid if it is already running)
-    S = gs:start(),
-
-    %% Draw the window
-    Window = draw_window(S),
-
-    loop(S,Window).
-
-%----------------------------------------
-% loop(S,Window)
-%   S - pid() GS
-%   Window - tfwindow()
-%----------------------------------------
-loop(S,Window) ->
-    receive
-
-	%% 'Return' pressed in the 'File' entry
-	{gs,_Obj,keypress,file,['Return'|_]} ->
-
-	    %% Check if a file name is specified
-	    case string:strip(gs:read(Window#tfwindow.fileentry,text)) of
-		
-		%% No file name specified, move focus to next entry
-		"" ->
-		    move_focus(Window,file);
-
-		%% A name is specified
-		String ->
-		    
-		    %% Add a .tool suffix to the file name if necessary
-		    FileName = tool_file(String),
-		    
-		    %% Write the complete file name to the file entry
-		    gs:config(Window#tfwindow.fileentry,{text,FileName}),
-		    
-		    %% Try to open the file
-		    case file:consult(FileName) of
-			
-			%% File exists and seems ok
-			{ok,[{version,Vsn},T]} ->
-			    
-			    %% Check the syntax of the file contents
-			    %% (All mandatory information specified,
-			    %%  correct types, etc)
-			    case toolbar_lib:tool_info_syntax(Vsn,T) of
-				
-				%% Ok -- Show the file contents in the window
-				%% and move focus to the next entry
-				{ok,Info} ->
-				    display(Window,"File: "++FileName++
-					           " opened"),
-				    clear_info(Window),
-				    show_info(Window,Info),
-				    move_focus(Window,file);
-				
-				%% Erroneous version number -- Notify user
-				{error,version} ->
-				    Win = Window#tfwindow.window,
-				    tool_utils:notify(Win,[FileName,
-				       "File has wrong version number"]);
-
-				%% Other error -- Notify user
-				_Error ->
-				    Win = Window#tfwindow.window,
-				    tool_utils:notify(Win,[FileName,
-				       "File is in erroneous format"])
-			    end;
-				
-			%% The file can not be read, show default values
-			%% according to the file name in the window and
-			%% move focus to the next entry
-			_ ->
-			    display(Window,"File: "++FileName ++
-				    " could not be read, new file"),
-			    Tool = filename:basename(FileName,".tool"),
-			    clear_info(Window),
-			    show_info(Window,[{tool,Tool},
-					      {start,{list_to_atom(Tool),
-						      start,[]}},
-					      {icon,Tool++".gif"},
-					      {html,Tool++".html"}]),
-			    move_focus(Window,file)
-		    end
-	    end,
-	    loop(S,Window);
-
-	%% 'Return' pressed in another entry, move focus to next entry
-	{gs,_Obj,keypress,Focus,['Return'|_]} ->
-	    move_focus(Window,Focus),
-	    loop(S,Window);
-	
-	%% Any oher keypress, clear the display
-	{gs,_Obj,keypress,_Data,_Args} ->
-	    display_clear(Window),
-	    loop(S,Window);
-
-	%% 'Clear' button pressed, clear the window
-	{gs,_Obj,click,_Data,["Clear"|_]} ->
-	    clear_info(Window),
-	    loop(S,Window);
-
-	%% 'Save' button pressed, save the given information to file
-	{gs,_Obj,click,_Data,["Save"|_]} ->
-
-	    %% Check if a file name is specified
-	    case string:strip(gs:read(Window#tfwindow.fileentry,text)) of
-		
-		%% No file name specified, notify user
-		"" ->
-		    Win = Window#tfwindow.window,
-		    tool_utils:notify(Win,
-				      "A file name must be specified");
-
-		%% A name is specified
-		String ->
-		    
-		    %% Add a .tool suffix to the file name if necessary
-		    FileName = tool_file(String),
-		    
-		    %% Write the complete file name to the file entry
-		    gs:config(Window#tfwindow.fileentry,{text,FileName}),
-		    
-		    %% Check the other information given
-		    case check_info(Window) of
-		
-			%% If given info is correct, try to save
-			%% it to the file
-			{ok,ToolInfo} ->
-			    Win = Window#tfwindow.window,
-			    case save_info(Win,FileName,ToolInfo) of
-
-				%% Ok, display confirmation
-				ok ->
-				    display(Window,
-					    "Tool information saved to "++
-					    FileName);
-
-				%% Cancel, do nothing
-				cancel ->
-				    ignore;
-				
-				%% Error, display error message
-				{error,Reason} ->
-				    display(Window,
-					    toolbar_lib:error_string(Reason)++
-					    FileName)
-			    end;
-
-			%% Given info incorrect, notify user
-			{error,Reason} ->
-			    Win = Window#tfwindow.window,
-			    Str = toolbar_lib:error_string(Reason),
-			    tool_utils:notify(Win,Str)
-		    end
-	    end,
-	    loop(S,Window);
-
-	%% 'Stop' button, close window and exit
-	{gs,_Obj,click,_Data,["Stop"|_]} ->
-	    gs:destroy(Window#tfwindow.window),
-	    finished;
-
-	%% Window closed, exit
-	{gs,_Obj,destroy,_Data,_Args} ->
-	    finished;
-
-	Other ->
-	    io:format("toolbar_toolconfig: unexp msg: ~p~n",[Other]),
-	    loop(S,Window)
-    end.
-
-
-%=============================================================================
-% Graphics
-%=============================================================================
-
-%----------------------------------------
-% draw_window(S)
-%   S - pid() GS
-% Draw the main window.
-%----------------------------------------
-draw_window(S) ->
-
-    %% -----   Open a new window   ----- 
-    Win = gs:create(window,S,[{width,400},{height,390},
-			      {title,"Create Tool File"}]),
-
-    %% -----   Top frame containing a 'File name' label and entry   -----
-    Top = gs:create(frame,Win,[{x,0},{y,0},{width,400},{height,60},{bw,2},
-			       {keypress,true}]),
-
-    %% File name
-    gs:create(label,Top,[{x,10},{y,10},{width,80},{height,30},{align,e},
-			 {keypress,true},
-			 {label,{text,"File name:"}}]),
-    File = gs:create(entry,Top,[{x,110},{y,10},{width,280},{height,30},
-				{keypress,true},{data,file}]),
-
-    %% -----   Middle frame containing other labels and entries   -----
-    Mid = gs:create(frame,Win,[{x,0},{y,60},{width,400},{height,250},{bw,2},
-			       {keypress,true}]),
-
-    %% Tool name
-    gs:create(label,Mid,[{x,10},{y,10},{width,80},{height,30},{align,e},
-			 {keypress,true},
-			 {label,{text,"Tool name:"}}]),
-    Tool = gs:create(entry,Mid,[{x,110},{y,10},{width,280},{height,30},
-				{keypress,true},{data,tool}]),
-    
-    %% Start function
-    gs:create(label,Mid,[{x,10},{y,60},{width,80},{height,30},{align,e},
-			 {keypress,true},
-			 {label,{text,"Start:"}}]),
-    Mod = gs:create(entry,Mid,[{x,110},{y,60},{width,135},{height,30},
-			       {keypress,true},{data,module}]),
-    Fun = gs:create(entry,Mid,[{x,245},{y,60},{width,135},{height,30},
-			       {keypress,true},{data,function}]),
-    
-    %% Icon file
-    gs:create(label,Mid,[{x,10},{y,110},{width,80},{height,30},{align,e},
-			 {keypress,true},
-			 {label,{text,"Icon file:"}}]),
-    Icon = gs:create(entry,Mid,[{x,110},{y,110},{width,280},{height,30},
-				{keypress,true},{data,icon}]),
-    
-    %% Message
-    gs:create(label,Mid,[{x,10},{y,160},{width,80},{height,30},{align,e},
-			 {keypress,true},
-			 {label,{text,"Message:"}}]),
-    Msg = gs:create(entry,Mid,[{x,110},{y,160},{width,280},{height,30},
-			       {keypress,true},{data,message}]),
-    
-    %% HTML file
-    gs:create(label,Mid,[{x,10},{y,210},{width,80},{height,30},{align,e},
-			 {keypress,true},
-			 {label,{text,"HTML:"}}]),
-    Html = gs:create(entry,Mid,[{x,110},{y,210},{width,280},{height,30},
-				{keypress,true},{data,html}]),
-
-    %% -----   Bottom frame containing the buttons   -----
-    Bot = gs:create(frame,Win,[{x,0},{y,310},{width,400},{height,50},
-			       {bw,2},{keypress,true}]),
-
-    gs:create(button,Bot,[{x,75},{y,10},{width,50},{height,30},
-			  {keypress,true},
-			  {label,{text,"Clear"}}]),
-    gs:create(button,Bot,[{x,175},{y,10},{width,50},{height,30},
-			  {keypress,true},
-			  {label,{text,"Save"}}]),
-    gs:create(button,Bot,[{x,275},{y,10},{width,50},{height,30},
-			  {keypress,true},
-			  {label,{text,"Stop"}}]),
-
-    %% -----   Label for displaying help messages   -----
-    Lbl = gs:create(label,Win,[{x,0},{y,360},{width,400},{height,30},{bw,2},
-			       {relief,raised},
-			       {keypress,true},
-			       {align,c},{label,{text,""}}]),
-
-    gs:config(Win,{map,true}),
-    gs:config(File,{setfocus,true}),
-
-    #tfwindow{window=Win,
-	      fileentry=File,
-	      toolentry=Tool,
-	      moduleentry=Mod,
-	      functionentry=Fun,
-	      iconentry=Icon,
-	      messageentry=Msg,
-	      htmlentry=Html,
-	      label=Lbl}.
-
-%----------------------------------------
-% move_focus(Window,Focus)
-%   Window - tfwindow()
-%   Focus - file | tool | module | function | icon | message | html | none
-% Move the input focus to the entry following Focus
-%----------------------------------------
-move_focus(Window,file) ->
-    gs:config(Window#tfwindow.toolentry,{setfocus,true});
-move_focus(Window,tool) ->
-    gs:config(Window#tfwindow.moduleentry,{setfocus,true});
-move_focus(Window,module) ->
-    gs:config(Window#tfwindow.functionentry,{setfocus,true});
-move_focus(Window,function) ->
-    gs:config(Window#tfwindow.iconentry,{setfocus,true});
-move_focus(Window,icon) ->
-    gs:config(Window#tfwindow.messageentry,{setfocus,true});
-move_focus(Window,message) ->
-    gs:config(Window#tfwindow.htmlentry,{setfocus,true});
-move_focus(Window,html) ->
-    gs:config(Window#tfwindow.htmlentry,{setfocus,false});
-move_focus(_Window,none) ->
-    true.
-
-%----------------------------------------
-% display(Window,Text)
-%   Window - tfwindow()
-%   Text - string()
-% Display a help message in the window
-%----------------------------------------
-display(Window,Text) ->
-    gs:config(Window#tfwindow.label,{label,{text,Text}}).
-    
-%----------------------------------------
-% display_clear(Window)
-%   Window - tfwindow()
-% Clear the help message display
-%----------------------------------------
-display_clear(Window) ->
-    display(Window,"").
-
-%----------------------------------------
-% clear_info(Window)
-%   Window - tfwindow()
-% Clear the entries of Window (except the file entry)
-%----------------------------------------
-clear_info(Window) ->
-    gs:config(Window#tfwindow.toolentry,{text,""}),
-    gs:config(Window#tfwindow.moduleentry,{text,""}),
-    gs:config(Window#tfwindow.functionentry,{text,""}),
-    gs:config(Window#tfwindow.iconentry,{text,""}),
-    gs:config(Window#tfwindow.messageentry,{text,""}),
-    gs:config(Window#tfwindow.htmlentry,{text,""}).
-
-%----------------------------------------
-% show_info(Window,List)
-%   Window - tfwindow()
-%   List - [{Key,Val}]
-%     Key - tool,     Val - string()
-%     Key - start,    Val - {atom(),atom(),_}
-%     Key - icon,     Val - string()
-%     Key - message,  Val - string()
-%     Key - html,     Val - string()
-% Display the different Val's in the appropriate entries of Window
-%----------------------------------------
-show_info(_Window,[]) ->
-    ok;
-show_info(Window,[{tool,Tool}|Rest]) ->
-    gs:config(Window#tfwindow.toolentry,{text,Tool}),
-    show_info(Window,Rest);
-show_info(Window,[{start,{M,F,_}}|Rest]) ->
-    gs:config(Window#tfwindow.moduleentry,{text,M}),
-    gs:config(Window#tfwindow.functionentry,{text,F}),
-    show_info(Window,Rest);
-show_info(Window,[{icon,Icon}|Rest]) ->
-    gs:config(Window#tfwindow.iconentry,{text,Icon}),
-    show_info(Window,Rest);
-show_info(Window,[{message,Message}|Rest]) ->
-    gs:config(Window#tfwindow.messageentry,{text,Message}),
-    show_info(Window,Rest);
-show_info(Window,[{html,Html}|Rest]) ->
-    gs:config(Window#tfwindow.htmlentry,{text,Html}),
-    show_info(Window,Rest).
-
-
-%=============================================================================
-% Retrieve user specified information
-%=============================================================================
-    
-%----------------------------------------
-% check_info(Window) => {ok,ToolInfo} | {error,Reason}
-%   Window - tfwindow()
-%   ToolInfo - toolinfo()
-%   Reason - noname | nostart
-% Check the information given in the entries and insert it into ToolInfo
-% if all mandatory information is given.
-%----------------------------------------
-check_info(Window) ->
-
-    %% First check mandatory elements: name and start function
-    Tool = gs:read(Window#tfwindow.toolentry,text),
-    M = gs:read(Window#tfwindow.moduleentry,text),
-    F = gs:read(Window#tfwindow.functionentry,text),
-    
-    if
-	Tool/="",M/="",F/="" ->
-	    ToolInfo =
-		#toolinfo{tool=Tool,
-			  start={list_to_atom(M),list_to_atom(F),[]},
-			  icon=gs:read(Window#tfwindow.iconentry,text),
-			  message=gs:read(Window#tfwindow.messageentry,text),
-			  html=gs:read(Window#tfwindow.htmlentry,text)},
-	    {ok,ToolInfo};
-
-	Tool=="" ->
-	    {error,noname};
-		
-	true ->
-	    {error,nostart}
-    end.
-
-
-%=============================================================================
-% Save information to file
-%=============================================================================
-
-%----------------------------------------
-% save_info(Win,File,ToolInfo) => ok | cancel | {error,waccess}
-%   Win - GS object
-%   File - string()
-%   ToolInfo - toolinfo()
-% Saves the information in ToolInfo to File on a predefined format.
-%----------------------------------------
-save_info(Win,File,ToolInfo) ->
-
-    %% First check if file already exists
-    case file:read_file_info(File) of
-	{ok,_FileInfo} ->
-
-	    %% Request the user to confirm that the file should
-	    %% be overwritten
-	    case tool_utils:confirm(Win,[File,
-					 "exists, will be overwritten"]) of
-		ok ->
-		    save_info2(File,ToolInfo);
-		cancel ->
-		    cancel
-	    end;
-
-	{error,_Reason} -> % _Reason = "No such file or directory"
-	    save_info2(File,ToolInfo)
-    end.
-
-%----------------------------------------
-% save_info2(File,ToolInfo) => ok | {error,waccess}
-%   File - string() File name
-%   ToolInfo - toolinfo record
-% Called by save_info/3
-%----------------------------------------
-save_info2(File,ToolInfo) ->
-    case file:open(File, [write]) of
-	{ok,Fd} ->
-	    io:format(Fd,"{version,\"~s\"}.~n",[toolbar:version()]),
-	    io:format(Fd,"{{tool,\"~s\"},~n",[ToolInfo#toolinfo.tool]),
-	    io:format(Fd," {start,~w}",[ToolInfo#toolinfo.start]),
-	    case ToolInfo#toolinfo.icon of
-		"" -> ignore;
-		Icon -> io:format(Fd,",~n {icon,\"~s\"}",[Icon])
-	    end,
-	    case ToolInfo#toolinfo.message of
-		"" -> ignore;
-		Message -> io:format(Fd,",~n {message,\"~s\"}",[Message])
-	    end,
-	    case ToolInfo#toolinfo.html of
-		"" -> ignore;
-		Html -> io:format(Fd,",~n {html,\"~s\"}",[Html])
-	    end,
-	    io:format(Fd,"}.~n",[]),
-	    file:close(Fd),
-	    ok;
-	_Error ->
-	    {error,waccess}
-    end.
-
-
-%=============================================================================
-% Auxiliary functions
-%=============================================================================
-
-%----------------------------------------
-% tool_file(File) => string()
-%   File - string()
-% Return a file name consisting of File with the suffix .tool added,
-% if File does not already have this suffix.
-%----------------------------------------
-tool_file(File) ->
-    case filename:extension(File) of
-	".tool" -> File;
-	_ -> File ++ ".tool"
-    end.
diff --git a/lib/toolbar/vsn.mk b/lib/toolbar/vsn.mk
deleted file mode 100644
index e84fb4e37b..0000000000
--- a/lib/toolbar/vsn.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-TOOLBAR_VSN = 1.4.2.3
-
-
-
-
-
-
-
-
-
diff --git a/lib/tools/c_src/erl_memory.c b/lib/tools/c_src/erl_memory.c
index 86e84723b1..c4e126a7b1 100644
--- a/lib/tools/c_src/erl_memory.c
+++ b/lib/tools/c_src/erl_memory.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2003-2012. All Rights Reserved.
+ * Copyright Ericsson AB 2003-2013. All Rights Reserved.
  *
  * The 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,7 @@
 #	undef WIN32_LEAN_AND_MEAN
 #	define WIN32_LEAN_AND_MEAN
 #	include <windows.h>
+typedef int socklen_t;
 #else
 #	if defined(__linux__) && defined(__GNUC__)
 #   		define _GNU_SOURCE 1
@@ -149,11 +150,11 @@ typedef struct {
 typedef struct em_buffer_ {
     struct em_buffer_ *next;
     int write;
-    usgnd_int_8 *data;
-    usgnd_int_8 *data_end;
-    usgnd_int_8 *end;
+    char *data;
+    char *data_end;
+    char *end;
     size_t size;
-    usgnd_int_8 start[EM_DEFAULT_BUF_SZ];
+    char start[EM_DEFAULT_BUF_SZ];
 } em_buffer;
 
 typedef struct {
@@ -173,7 +174,7 @@ typedef struct {
 } em_buf_queue;
 
 typedef struct {
-    usgnd_int_8 *ptr;
+    char *ptr;
     size_t size;
 } em_area;
 
@@ -460,7 +461,7 @@ enqueue(em_state *state, em_buf_queue *queue, size_t min_size)
 	    bsize = min_size;
 	
 	buf = (em_buffer *) (*state->alloc)(sizeof(em_buffer)
-					    + (sizeof(usgnd_int_8)
+					    + (sizeof(char)
 					       * (bsize-EM_DEFAULT_BUF_SZ)));
 	if (buf) {
 	    buf->size = bsize;
@@ -595,12 +596,12 @@ get_next_write_area(em_area *area, em_state *state, em_buf_queue *queue,
 \*                                                                         */
 
 static INLINE size_t
-write_str(usgnd_int_8 **dstpp, char *srcp)
+write_str(char **dstpp, char *srcp)
 {
     size_t i = 0;
     if (dstpp)
 	while (srcp[i])
-	    *((*dstpp)++) = (usgnd_int_8) srcp[i++];
+	    *((*dstpp)++) = srcp[i++];
     else
 	while (srcp[i]) i++;
     return i;
@@ -608,7 +609,7 @@ write_str(usgnd_int_8 **dstpp, char *srcp)
 
 
 static size_t
-write_strings(usgnd_int_8 **ptr,
+write_strings(char **ptr,
 	      char **strings,
 	      char *first_line_prefix,
 	      char *line_prefix,
@@ -640,10 +641,10 @@ write_strings(usgnd_int_8 **ptr,
 }
 
 static size_t
-write_title(usgnd_int_8 **bufp, size_t *overflow, size_t width, char *str)
+write_title(char **bufp, size_t *overflow, size_t width, char *str)
 {
     size_t i, sz, ws;
-    usgnd_int_8 *p, *endp;
+    char *p, *endp;
 
     /*
      * Writes at least one '|' character at the beginning.
@@ -689,16 +690,16 @@ write_title(usgnd_int_8 **bufp, size_t *overflow, size_t width, char *str)
     *(p++) = '|';
     while (ws > 1) {
 	ws--;
-	*(p++) = (usgnd_int_8) ' ';
+	*(p++) = ' ';
     }
 
     i = 0;
     while (str[i] && (overflow || p < endp))
-	*(p++) = (usgnd_int_8) str[i++];
+	*(p++) = str[i++];
 
     while (ws) {
 	ws--;
-	*(p++) = (usgnd_int_8) ' ';
+	*(p++) = ' ';
     }
 
     ASSERT(overflow || p == endp);
@@ -708,7 +709,7 @@ write_title(usgnd_int_8 **bufp, size_t *overflow, size_t width, char *str)
 }
 
 static size_t
-write_obj_sub_titles(em_state *state, usgnd_int_8 **bufp, size_t *overflow)
+write_obj_sub_titles(em_state *state, char **bufp, size_t *overflow)
 {
     size_t field_width = state->output.field_width;
     size_t size = write_title(bufp, overflow, field_width, "size");
@@ -733,12 +734,12 @@ write_obj_sub_titles(em_state *state, usgnd_int_8 **bufp, size_t *overflow)
 }
 
 static size_t
-write_header(em_state *state, usgnd_int_8 *ptr, int trunc)
+write_header(em_state *state, char *ptr, int trunc)
 {
 #define MIN_LTEXT_SZ 18
 #define HEADER_EOL_STR "|\n"
-    usgnd_int_8 *p;
-    usgnd_int_8 **pp;
+    char *p;
+    char **pp;
     int i;
     size_t overflow;
     size_t *ofp;
@@ -855,7 +856,7 @@ write_header(em_state *state, usgnd_int_8 *ptr, int trunc)
 }
 
 static INLINE void
-write_mem_info(em_state *state, usgnd_int_8 **p, em_mem_info *mi)
+write_mem_info(em_state *state, char **p, em_mem_info *mi)
 {
     int fw = state->output.field_width - 1;
     *p += sprintf(*p, "%*" USGND_INT_MAX_FSTR " ", fw, mi->size);
@@ -894,7 +895,7 @@ write_mem_info(em_state *state, usgnd_int_8 **p, em_mem_info *mi)
 }
 
 static INLINE void
-write_max_ever_mem_info(em_state *state, usgnd_int_8 **p, em_mem_info *mi)
+write_max_ever_mem_info(em_state *state, char **p, em_mem_info *mi)
 {
     int fw = state->output.field_width - 1;
     *p += sprintf(*p, "%*" USGND_INT_MAX_FSTR " ", fw, mi->max_ever_size);
@@ -913,13 +914,13 @@ static void
 print_string(em_state *state, char *str)
 {
     em_area area = {NULL, 0};
-    usgnd_int_8 *p;
+    char *p;
 
     /* Get area */
 
     get_next_write_area(&area,state,&state->output.queue,write_str(NULL,str));
 
-    p = (usgnd_int_8 *) area.ptr;
+    p = area.ptr;
     area.size = write_str(&p, str);
 
     /* Leave area */
@@ -938,7 +939,7 @@ print_emu_arg(em_state *state)
     struct hostent *hp;
     struct in_addr iaddr;
     usgnd_int_16 port;
-    int saddr_size = sizeof(saddr);
+    socklen_t saddr_size = sizeof(saddr);
     size_t size;
     char *format = "> Emulator command line argument: +Mit %s\n";
 
@@ -996,7 +997,7 @@ print_emu_arg(em_state *state)
 }
 
 static size_t
-write_allocator_info(em_state *state, usgnd_int_8 *ptr)
+write_allocator_info(em_state *state, char *ptr)
 {
     usgnd_int_32 aix, i, j;
     char *header =	"> Allocator information:\n";
@@ -1008,8 +1009,8 @@ write_allocator_info(em_state *state, usgnd_int_8 *ptr)
     char **strings;
     size_t strings_size;
     size_t max_line_size = 80;
-    usgnd_int_8 *p = ptr;
-    usgnd_int_8 **pp = ptr ? &p : NULL;
+    char *p = ptr;
+    char **pp = ptr ? &p : NULL;
 
     strings_size = state->trace_info.max_block_type_ix + 1;
     if (strings_size < state->trace_info.max_allocator_ix + 1)
@@ -1140,7 +1141,7 @@ static void
 print_main_footer(em_state *state)
 {
     em_area area = {NULL, 0};
-    usgnd_int_8 *p;
+    char *p;
     int i;
     char *stop_str =
 	"> Trace stopped\n";
@@ -1248,7 +1249,7 @@ print_main_footer(em_state *state)
 static void
 print_info(em_state *state, usgnd_int_32 secs, char *extra)
 {
-    usgnd_int_8 *p;
+    char *p;
     int i;
     size_t size;
     em_area area = {NULL, 0};
@@ -1913,7 +1914,7 @@ error_msg(int res, char *msg)
 #if EMEM_d_SWITCH
 
 static size_t
-write_output_filename(usgnd_int_8 *ptr,
+write_output_filename(char *ptr,
 		      char *dirname,
 		      char *nodename,
 		      char *hostname,
@@ -1921,8 +1922,8 @@ write_output_filename(usgnd_int_8 *ptr,
 		      char *pid)
 {
     size_t sz = 0;
-    usgnd_int_8 *p = ptr;
-    usgnd_int_8 **pp = ptr ? &p : NULL;
+    char *p = ptr;
+    char **pp = ptr ? &p : NULL;
     sz += write_str(pp, dirname);
     if (pp) *((*pp)++) = DIR_SEP_CHAR;
     sz++;
@@ -2246,7 +2247,7 @@ process_trace(em_state *state)
 	if (!area.size)
 	    return EM_TRUNCATED_TRACE_ERROR;
 	res = emtp_parse(state->trace_state,
-			 &area.ptr, &area.size,
+			 (usgnd_int_8 **)&area.ptr, &area.size,
 			 NULL, 0, NULL);
 	if (res == EMTP_HEADER_PARSED)
 	    break;
@@ -2277,7 +2278,7 @@ process_trace(em_state *state)
 	while (area.size) {
 	    ops_len = EM_NO_OF_OPS;
 	    res = emtp_parse(state->trace_state,
-			     &area.ptr, &area.size,
+			     (usgnd_int_8 **)&area.ptr, &area.size,
 			     ops, sizeof(emtp_operation), &ops_len);
 	    if (res < 0)
 		return res;
@@ -2555,7 +2556,7 @@ init_connection(em_state *state)
     SOCKET lsock;
     SOCKET sock = INVALID_SOCKET;
     struct sockaddr_in my_addr;
-    int oth_addr_len;
+    socklen_t oth_addr_len;
     struct sockaddr_in oth_addr;
 #ifdef __WIN32__
     WORD wVersionRequested = MAKEWORD(2,0);
@@ -2738,7 +2739,7 @@ output_thread_func(void *arg)
 		error_msg(EIO, "Output queue");
 	}
 	if (fwrite((void *) area.ptr,
-		   sizeof(usgnd_int_8),
+		   sizeof(char),
 		   area.size,
 		   state->output.stream) != area.size) {
 	    disconnect_queue_reader(&state->output.queue);
diff --git a/lib/tools/doc/src/book.xml b/lib/tools/doc/src/book.xml
index 96f6c426c3..6260bcdf3a 100644
--- a/lib/tools/doc/src/book.xml
+++ b/lib/tools/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/cover.xml b/lib/tools/doc/src/cover.xml
index beefd4ee8d..07ffa65e3d 100644
--- a/lib/tools/doc/src/cover.xml
+++ b/lib/tools/doc/src/cover.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/tools/doc/src/cover_chapter.xml b/lib/tools/doc/src/cover_chapter.xml
index 5083b01f1d..f29f59bee0 100644
--- a/lib/tools/doc/src/cover_chapter.xml
+++ b/lib/tools/doc/src/cover_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/cprof.xml b/lib/tools/doc/src/cprof.xml
index 2dc419d29c..553597837e 100644
--- a/lib/tools/doc/src/cprof.xml
+++ b/lib/tools/doc/src/cprof.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2002</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/cprof_chapter.xml b/lib/tools/doc/src/cprof_chapter.xml
index cf6a6f843a..6536d43e0f 100644
--- a/lib/tools/doc/src/cprof_chapter.xml
+++ b/lib/tools/doc/src/cprof_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2009</year>
+      <year>2002</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/eprof.xml b/lib/tools/doc/src/eprof.xml
index 8b4986297a..3ebacf5546 100644
--- a/lib/tools/doc/src/eprof.xml
+++ b/lib/tools/doc/src/eprof.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/tools/doc/src/erlang_mode.xml b/lib/tools/doc/src/erlang_mode.xml
index 794224d601..747c41d554 100644
--- a/lib/tools/doc/src/erlang_mode.xml
+++ b/lib/tools/doc/src/erlang_mode.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/erlang_mode_chapter.xml b/lib/tools/doc/src/erlang_mode_chapter.xml
index 4ffa224ea5..3be1d53ca2 100644
--- a/lib/tools/doc/src/erlang_mode_chapter.xml
+++ b/lib/tools/doc/src/erlang_mode_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2003</year><year>2011</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/fascicules.xml b/lib/tools/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/tools/doc/src/fascicules.xml
+++ b/lib/tools/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/tools/doc/src/fprof.xml b/lib/tools/doc/src/fprof.xml
index 8babf50033..ef8b82c9fa 100644
--- a/lib/tools/doc/src/fprof.xml
+++ b/lib/tools/doc/src/fprof.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/fprof_chapter.xml b/lib/tools/doc/src/fprof_chapter.xml
index 3f40d93f40..462b3f9579 100644
--- a/lib/tools/doc/src/fprof_chapter.xml
+++ b/lib/tools/doc/src/fprof_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/instrument.xml b/lib/tools/doc/src/instrument.xml
index b7e48ea306..3f278b63cd 100644
--- a/lib/tools/doc/src/instrument.xml
+++ b/lib/tools/doc/src/instrument.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
-      <year>1998</year><year>2011</year>
+      <year>1998</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/lcnt.xml b/lib/tools/doc/src/lcnt.xml
index 3c55e4e422..9754b107fe 100644
--- a/lib/tools/doc/src/lcnt.xml
+++ b/lib/tools/doc/src/lcnt.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
     <header>
 	<copyright>
 	    <year>2009</year>
-	    <year>2010</year>
+	    <year>2013</year>
 	    <holder>Ericsson AB, All Rights Reserved</holder>
 	</copyright>
 	<legalnotice>
diff --git a/lib/tools/doc/src/lcnt_chapter.xml b/lib/tools/doc/src/lcnt_chapter.xml
index 8f44b23f59..1b8595749d 100644
--- a/lib/tools/doc/src/lcnt_chapter.xml
+++ b/lib/tools/doc/src/lcnt_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
     <header>
 	<copyright>
-	    <year>2009</year><year>2010</year>
+	    <year>2009</year><year>2013</year>
 	    <holder>Ericsson AB. All Rights Reserved.</holder>
 	</copyright>
 	<legalnotice>
diff --git a/lib/tools/doc/src/make.xml b/lib/tools/doc/src/make.xml
index 1c8df67abf..f4d64fa9e2 100644
--- a/lib/tools/doc/src/make.xml
+++ b/lib/tools/doc/src/make.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1996</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/notes.xml b/lib/tools/doc/src/notes.xml
index 05049d7107..2e4c354fbd 100644
--- a/lib/tools/doc/src/notes.xml
+++ b/lib/tools/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -30,6 +30,81 @@
   </header>
   <p>This document describes the changes made to the Tools application.</p>
 
+<section><title>Tools 2.6.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Erlang-specific compilation error regexp is added in
+	    erlang-eunit.el. This defvar was earlier in erlang.el,
+	    but was erroneously removed in R15B02, while still used
+	    by erlang-eunit.el.</p>
+          <p>
+	    Own Id: OTP-11417 Aux Id: seq12447 </p>
+        </item>
+        <item>
+          <p>
+	    Take compiler options from beam in cover:compile_beam.
+	    Thanks to Péter Gömöri.</p>
+          <p>
+	    Own Id: OTP-11439</p>
+        </item>
+        <item>
+          <p>
+	    Silence warnings (Thanks to Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11517</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add iodata, nonempty_string to built-in type highlighting
+	    for emacs. Thanks to Paul Oliver.</p>
+          <p>
+	    Own Id: OTP-11394</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Tools 2.6.12</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Remove trailing spaces in Emacs templates. Thanks to
+	    Roberto Aloi.</p>
+          <p>
+	    Own Id: OTP-11198</p>
+        </item>
+        <item>
+          <p>
+	    Fixed the Emacs erlang-mode to accommodate the coding
+	    style where lists written across several lines have each
+	    line starting with a comma. Thanks to Magnus Henoch.</p>
+          <p>
+	    Own Id: OTP-11242</p>
+        </item>
+        <item>
+          <p>
+	    Make the Emacs Erlang mode TRAMP-aware when compiling.
+	    Thanks to Tomas Abrahamsson.</p>
+          <p>
+	    Own Id: OTP-11270</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Tools 2.6.11</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -103,7 +178,7 @@
         <item>
           <p>
 	    Fix a bug in cover when used with no_auto_import. Thanks
-	    to Jos� Valim.</p>
+	    to José Valim.</p>
           <p>
 	    Own Id: OTP-10778</p>
         </item>
@@ -138,7 +213,7 @@
         <item>
           <p>
 	    Add separate face for exported functions (Thanks to
-	    Thomas J�rvstrand)</p>
+	    Thomas Järvstrand)</p>
           <p>
 	    Own Id: OTP-10637</p>
         </item>
@@ -223,7 +298,7 @@
         </item>
         <item>
           <p>
-	    Documentation fixes (Thanks to Ricardo Catalinas Jim�nez
+	    Documentation fixes (Thanks to Ricardo Catalinas Jiménez
 	    )</p>
           <p>
 	    Own Id: OTP-10121</p>
diff --git a/lib/tools/doc/src/notes_history.xml b/lib/tools/doc/src/notes_history.xml
index 3791d5270a..2058dd8fde 100644
--- a/lib/tools/doc/src/notes_history.xml
+++ b/lib/tools/doc/src/notes_history.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2006</year><year>2009</year>
+      <year>2006</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/part.xml b/lib/tools/doc/src/part.xml
index bf9e1ebbec..5b03e1db55 100644
--- a/lib/tools/doc/src/part.xml
+++ b/lib/tools/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/part_notes.xml b/lib/tools/doc/src/part_notes.xml
index b8b67889c2..3527d5e3d9 100644
--- a/lib/tools/doc/src/part_notes.xml
+++ b/lib/tools/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/part_notes_history.xml b/lib/tools/doc/src/part_notes_history.xml
index da637f380a..43c0abd05a 100644
--- a/lib/tools/doc/src/part_notes_history.xml
+++ b/lib/tools/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/ref_man.xml b/lib/tools/doc/src/ref_man.xml
index d4861af9f3..7b68e18a75 100644
--- a/lib/tools/doc/src/ref_man.xml
+++ b/lib/tools/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/tags.xml b/lib/tools/doc/src/tags.xml
index 54b5a4914c..0aa0ca8e35 100644
--- a/lib/tools/doc/src/tags.xml
+++ b/lib/tools/doc/src/tags.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>1998</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/doc/src/xref.xml b/lib/tools/doc/src/xref.xml
index 891a81639a..da16efa005 100644
--- a/lib/tools/doc/src/xref.xml
+++ b/lib/tools/doc/src/xref.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
diff --git a/lib/tools/doc/src/xref_chapter.xml b/lib/tools/doc/src/xref_chapter.xml
index 566776eab0..db9f774186 100644
--- a/lib/tools/doc/src/xref_chapter.xml
+++ b/lib/tools/doc/src/xref_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2012</year>
+      <year>2000</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/tools/emacs/erlang-eunit.el b/lib/tools/emacs/erlang-eunit.el
index f2c0db67dd..0adeff1a02 100644
--- a/lib/tools/emacs/erlang-eunit.el
+++ b/lib/tools/emacs/erlang-eunit.el
@@ -40,6 +40,10 @@ This is useful, reducing the save-compile-load-test cycle to one keychord.")
 (defvar erlang-eunit-recent-info '((mode . nil) (module . nil) (test . nil) (cover . nil))
   "Info about the most recent running of an EUnit test representation.")
 
+(defvar erlang-error-regexp-alist
+  '(("^\\([^:( \t\n]+\\)[:(][ \t]*\\([0-9]+\\)[:) \t]" . (1 2)))
+  "*Patterns for matching Erlang errors.")
+
 ;;;
 ;;; Switch between src/EUnit test buffers
 ;;;
diff --git a/lib/tools/emacs/erlang-skels.el b/lib/tools/emacs/erlang-skels.el
index 355b223822..7379215d68 100644
--- a/lib/tools/emacs/erlang-skels.el
+++ b/lib/tools/emacs/erlang-skels.el
@@ -109,32 +109,32 @@ include separators of the form %%--...")
 ;; Expression templates:
 (defvar erlang-skel-case
   '((erlang-skel-skip-blank) o >
-    "case " p " of" n> p "_ ->" n> p "ok" n> "end" p)
+    "case " p " of" n> p "_ ->" n> p "ok" n "end" > p)
   "*The skeleton of a `case' expression.
 Please see the function `tempo-define-template'.")
 
 (defvar erlang-skel-if
   '((erlang-skel-skip-blank) o >
-    "if"  n> p " ->" n> p "ok" n> "end" p)
+    "if"  n> p " ->" n> p "ok" n "end" > p)
   "The skeleton of an `if' expression.
 Please see the function `tempo-define-template'.")
 
 (defvar erlang-skel-receive
   '((erlang-skel-skip-blank) o >
-    "receive" n> p "_ ->" n> p "ok" n> "end" p)
+    "receive" n> p "_ ->" n> p "ok" n "end" > p)
   "*The skeleton of a `receive' expression.
 Please see the function `tempo-define-template'.")
 
 (defvar erlang-skel-receive-after
   '((erlang-skel-skip-blank) o >
-    "receive" n> p "_ ->" n> p "ok" n> "after " p "T ->" n>
-    p "ok" n> "end" p)
+    "receive" n> p "_ ->" n> p "ok" n "after " > p "T ->" n>
+    p "ok" n "end" > p)
   "*The skeleton of a `receive' expression with an `after' clause.
 Please see the function `tempo-define-template'.")
 
 (defvar erlang-skel-receive-loop
   '(& o "loop(" p ") ->" n> "receive" n> p "_ ->" n>
-      "loop(" p ")" n> "end.")
+      "loop(" p ")" n "end." >)
   "*The skeleton of a simple `receive' loop.
 Please see the function `tempo-define-template'.")
 
@@ -256,8 +256,8 @@ Please see the function `tempo-define-template'.")
     "loop(From) ->" n>
     "receive" n>
     p "_ ->" n>
-    "loop(From)" n>
-    "end." n
+    "loop(From)" n
+    "end." > n
     )
   "*Template of a small server.
 Please see the function `tempo-define-template'.")
@@ -291,8 +291,8 @@ Please see the function `tempo-define-template'.")
     "{ok, Pid} ->" n>
     "{ok, Pid};" n>
     "Error ->" n>
-    "Error" n>
-    "end." n
+    "Error" n
+    "end." > n
     n
     (erlang-skel-separator-start 2)
     "%% @private" n
@@ -421,8 +421,8 @@ Please see the function `tempo-define-template'.")
     "{ok, Pid} ->" n>
     "{ok, Pid, #state{}};" n>
     "Error ->" n>
-    "Error" n>
-    "end." n
+    "Error" n
+    "end." > n
     n
     (erlang-skel-separator-start 2)
     "%% @private" n
@@ -457,7 +457,7 @@ Please see the function `tempo-define-template'.")
     "handle_info/2," n>
     "terminate/2, code_change/3])." n n
 
-    "-define(SERVER, ?MODULE). " n n
+    "-define(SERVER, ?MODULE)." n n
 
     "-record(state, {})." n n
 
@@ -572,7 +572,7 @@ Please see the function `tempo-define-template'.")
     "-export([init/1, handle_event/2, handle_call/2, " n>
     "handle_info/2, terminate/2, code_change/3])." n n
 
-    "-define(SERVER, ?MODULE). " n n
+    "-define(SERVER, ?MODULE)." n n
 
     "-record(state, {})." n n
 
diff --git a/lib/tools/emacs/erlang-start.el b/lib/tools/emacs/erlang-start.el
index e1dc86621e..76e0575e68 100644
--- a/lib/tools/emacs/erlang-start.el
+++ b/lib/tools/emacs/erlang-start.el
@@ -52,7 +52,7 @@
 ;;
 ;; To set the variable you can use the following command:
 ;;     M-x set-variable RET debug-on-error RET t RET
-
+
 ;;; Code:
 
 ;;
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index f3bc95e3e5..f007f780eb 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -73,6 +73,8 @@
 ;;     M-x set-variable RET debug-on-error RET t RET
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 ;; Variables:
 
 (defconst erlang-version "2.7"
@@ -620,7 +622,6 @@ resulting regexp is surrounded by \\_< and \\_>."
       "if"
       "let"
       "of"
-      "query"
       "receive"
       "try"
       "when")
@@ -663,6 +664,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "is_function"
       "is_integer"
       "is_list"
+      "is_map"
       "is_number"
       "is_pid"
       "is_port"
@@ -697,6 +699,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "char"
       "cons"
       "deep_string"
+      "iodata"
       "iolist"
       "maybe_improper_list"
       "module"
@@ -708,11 +711,13 @@ resulting regexp is surrounded by \\_< and \\_>."
       "nonempty_list"
       "nonempty_improper_list"
       "nonempty_maybe_improper_list"
+      "nonempty_string"
       "no_return"
       "pos_integer"
       "string"
       "term"
-      "timeout")
+      "timeout"
+      "map")
     "Erlang type specs types"))
 
 (eval-and-compile
@@ -769,6 +774,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "is_function"
       "is_integer"
       "is_list"
+      "is_map"
       "is_number"
       "is_pid"
       "is_port"
@@ -788,6 +794,7 @@ resulting regexp is surrounded by \\_< and \\_>."
       "list_to_tuple"
       "load_module"
       "make_ref"
+      "map_size"
       "max"
       "min"
       "module_loaded"
@@ -1025,7 +1032,7 @@ behaviour.")
 (defvar erlang-mode-syntax-table nil
   "Syntax table in use in Erlang-mode buffers.")
 
-
+
 
 (defvar erlang-skel-file "erlang-skels"
   "The type of erlang-skeletons that should be used, default
@@ -1272,7 +1279,7 @@ Unfortunately, XEmacs hasn't got support for a special Font
 Lock syntax table.  The effect is that `apply' in the atom
 `foo_apply' will be highlighted as a bif.")
 
-
+
 ;;; Avoid errors while compiling this file.
 
 ;; `eval-when-compile' is not defined in Emacs 18.  We define it as a
@@ -1321,7 +1328,7 @@ Lock syntax table.  The effect is that `apply' in the atom
 	(require 'tempo)
 	(require 'compile))))
 
-
+
 (defun erlang-version ()
   "Return the current version of Erlang mode."
   (interactive)
@@ -1516,7 +1523,7 @@ Other commands:
   (set (make-local-variable 'outline-level) (lambda () 1))
   (set (make-local-variable 'add-log-current-defun-function)
        'erlang-current-defun))
-
+
 (defun erlang-font-lock-init ()
   "Initialize Font Lock for Erlang mode."
   (or erlang-font-lock-syntax-table
@@ -1686,7 +1693,7 @@ plus variables, macros and records."
   (font-lock-mode 1)
   (funcall (symbol-function 'font-lock-fontify-buffer)))
 
-
+
 (defun erlang-menu-init ()
   "Init menus for Erlang mode.
 
@@ -1905,7 +1912,7 @@ Example:
 The new menu is returned.  No guarantee is given that the original
 menu is left unchanged."
   (delq entry items))
-
+
 ;; Man code:
 
 (defun erlang-man-init ()
@@ -2228,7 +2235,7 @@ For example:
 
 After installing the line, kill and restart Emacs, or restart Erlang
 mode with the command `M-x erlang-mode RET'.")))
-
+
 ;; Skeleton code:
 
 ;; This code is based on the package `tempo' which is part of modern
@@ -2349,7 +2356,7 @@ The first character of DD is space if the value is less than 10."
 	    (erlang-string-to-int (substring date 8 10))
 	    (substring date 4 7)
 	    (substring date -4))))
-
+
 ;; Indentation code:
 
 (defun erlang-indent-command (&optional whole-exp)
@@ -2598,9 +2605,15 @@ Value is list (stack token-start token-type in-what)."
 	     (if (save-excursion
 		   (goto-char (match-end 1))
 		   (erlang-skip-blank to)
+		   ;; Use erlang-variable-regexp here to look for an
+		   ;; optional variable name to match EEP37 named funs.
+		   (if (looking-at erlang-variable-regexp)
+		       (progn
+			 (goto-char (match-end 0))
+			 (erlang-skip-blank to)))
 		   (eq (following-char) ?\())
 		 (erlang-push (list 'fun token (current-column)) stack)))
-	    ((looking-at "\\(begin\\|query\\)[^_a-zA-Z0-9]")
+	    ((looking-at "\\(begin\\)[^_a-zA-Z0-9]")
 	     (erlang-push (list 'begin token (current-column)) stack))
 	    ;; Normal when case
 	    ;;((looking-at "when\\s ")
@@ -2813,6 +2826,9 @@ Return nil if inside string, t if in a comment."
 			     (- (+ previous erlang-argument-indent) 1))))
 		   	(t
 		   	 (nth 2 stack-top))))
+		 ((= (following-char) ?,)
+		  ;; a comma at the start of the line: line up with opening parenthesis.
+		  (nth 2 stack-top))
 		 (t 
 		  (goto-char (nth 1 stack-top))
 		  (let ((base (cond ((looking-at "[({]\\s *\\($\\|%\\)")
@@ -3033,7 +3049,7 @@ This assumes that the preceding expression is either simple
 \(i.e. an atom) or parenthesized."
   (save-excursion
     (or arg (setq arg 1))
-    (forward-sexp (- arg))
+    (ignore-errors (forward-sexp (- arg)))
     (let ((col (current-column)))
       (skip-chars-backward " \t")
       ;; Special hack to handle: (note line break)
@@ -3107,7 +3123,7 @@ This assumes that the preceding expression is either simple
 
 (defun erlang-at-keyword ()
   "Are we looking at an Erlang keyword which will increase indentation?"
-  (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|query\\|"
+  (looking-at (concat "\\(when\\|if\\|fun\\|case\\|begin\\|"
 		      "of\\|receive\\|after\\|catch\\|try\\)[^_a-zA-Z0-9]")))
 
 (defun erlang-at-operator ()
@@ -3129,7 +3145,7 @@ commands."
 	   (skip-chars-backward " \t")
 	   (max (if (bolp) 0 (1+ (current-column)))
 		comment-column)))))
-
+
 ;;; Erlang movement commands
 
 ;; All commands below work as movement commands.  I.e. if the point is
@@ -3333,7 +3349,7 @@ With negative argument go towards the beginning of the buffer."
       (forward-sexp 1)
       (buffer-substring start (point)))))
 
-
+
 ;;; Miscellaneous
 
 (defun erlang-fill-paragraph (&optional justify)
@@ -3442,7 +3458,7 @@ at the end."
 	(error "Can't clone argument list"))
     (insert args)
     (set-mark p)))
-
+
 ;;; Information retrieval functions.
 
 (defun erlang-buffer-substring (beg end)
@@ -3640,6 +3656,10 @@ Normally used in conjunction with `erlang-beginning-of-clause', e.g.:
 			(setq cont nil))
 		       ((looking-at "\\s *\\($\\|%\\)")
 			(forward-line 1))
+		       ((looking-at "\\s *<<[^>]*?>>")
+			(when (zerop res)
+			  (setq res (+ 1 res)))
+			(goto-char (match-end 0)))
 		       ((looking-at "\\s *,")
 			(setq res (+ 1 res))
 			(goto-char (match-end 0)))
@@ -3769,7 +3789,7 @@ exported function."
       (store-match-data old-match-data)
       (member (cons name arity) exports))))
 
-
+
 ;;; Check module name
 
 ;; The function `write-file', bound to C-x C-w, calls
@@ -3832,7 +3852,7 @@ This function is normally placed in the hook `local-write-file-hooks'."
   ;; Must return nil since it is added to `local-write-file-hook'.
   nil)
 
-
+
 ;;; Electric functions.
 
 (defun erlang-electric-semicolon (&optional arg)
@@ -3921,7 +3941,7 @@ non-whitespace characters following the point on the current line."
   (self-insert-command arg)
 
   ;; Was this the second char in bit-syntax open (`<<')?
-  (unless (< (point) 2)
+  (unless (<= (point) 2)
     (save-excursion
       (backward-char 2)
       (when (and (eq (char-after (point)) ?<)
@@ -3942,7 +3962,7 @@ non-whitespace characters following the point on the current line."
 
 (defun erlang-after-bitsyntax-close ()
   "Return t if point is immediately after a bit-syntax close parenthesis (`>>')."
-  (and (>= (point) 2)
+  (and (>= (point) 3)
        (save-excursion
 	 (backward-char 2)
 	 (and (eq (char-after (point)) ?>)
@@ -4226,7 +4246,7 @@ This function is designed to be a member of a criteria list."
     (erlang-skip-blank)
     (looking-at "end[^_a-zA-Z0-9]")))
 
-
+
 ;; Erlang tags support which is aware of erlang modules.
 ;;
 ;; Not yet implemented under XEmacs.  (Hint:  The Emacs 19 etags
@@ -4536,7 +4556,7 @@ Tags can be given on the forms `tag', `module:', `module:tag'."
 		(or default (error "There is no default tag"))
 	      spec)))))
 
-
+
 ;; Search tag functions which are aware of Erlang modules.  The tactic
 ;; is to store new search functions into the local variables of the
 ;; TAGS buffers.  The variables are restored directly after the
@@ -4712,7 +4732,7 @@ for a tag on the form `module:tag'."
 	     (string= mod (erlang-get-module-from-file-name
 			   (file-of-tag)))))))
 
-
+
 ;;; Tags completion, Emacs 19 `etags' specific.
 ;;;
 ;;; The basic idea is to create a second completion table `erlang-tags-
@@ -4831,7 +4851,7 @@ about Erlang modules."
 		;; Only the first one will be stored in the table.
 		(intern (concat module ":") table))))))
     table))
-
+
 ;;;
 ;;; Prepare for other methods to run an Erlang slave process.
 ;;;
@@ -4913,7 +4933,7 @@ future, a new shell on an already running host will be started."
   (call-interactively erlang-next-error-function))
 
 
-
+
 ;;;
 ;;; Erlang Shell Mode -- Major mode used for Erlang shells.
 ;;;
@@ -5049,7 +5069,7 @@ Selects Comint or Compilation mode command as appropriate."
   (define-key map "\M-\C-m"  'compile-goto-error)
   (unless inferior-erlang-use-cmm
     (define-key map "\C-x`"    'erlang-next-error)))
-
+
 ;;;
 ;;; Inferior Erlang -- Run an Erlang shell as a subprocess.
 ;;;
@@ -5365,7 +5385,7 @@ There exists two workarounds for this bug:
   (inferior-erlang-prepare-for-input)
   (let* ((dir (inferior-erlang-compile-outdir))
 ;;; (file (file-name-nondirectory (buffer-file-name)))
-	 (noext (substring (buffer-file-name) 0 -4))
+	 (noext (substring (erlang-local-buffer-file-name) 0 -4))
 	 (opts (append (list (cons 'outdir dir))
 		       (if current-prefix-arg
 			   (list 'debug_info 'export_all))
@@ -5403,7 +5423,7 @@ unless the optional NO-DISPLAY is non-nil."
 (defun inferior-erlang-compile-outdir ()
   "Return the directory to compile the current buffer into."
   (let* ((buffer-dir (directory-file-name
-		      (file-name-directory (buffer-file-name))))
+		      (file-name-directory (erlang-local-buffer-file-name))))
 	 (parent-dir (directory-file-name
 		      (file-name-directory buffer-dir)))
          (ebin-dir (concat (file-name-as-directory parent-dir) "ebin"))
@@ -5421,11 +5441,11 @@ unless the optional NO-DISPLAY is non-nil."
 	(res (inferior-erlang-compute-erl-compile-command module-name opts))
 	ccfn-entry
 	done)
-    (if (not (null (buffer-file-name)))
+    (if (not (null (erlang-local-buffer-file-name)))
 	(while (and (not done) (not (null ccfn)))
 	  (setq ccfn-entry (car ccfn))
 	  (setq ccfn (cdr ccfn))
-	  (if (string-match (car ccfn-entry) (buffer-file-name))
+	  (if (string-match (car ccfn-entry) (erlang-local-buffer-file-name))
 	      (let ((c-fn (cdr ccfn-entry)))
 		(setq done t)
 		(if (not (null c-fn))
@@ -5457,7 +5477,7 @@ unless the optional NO-DISPLAY is non-nil."
 	 tmpvar tmpvar tmpvar2)))))
 
 (defun inferior-erlang-compute-leex-compile-command (module-name opts)
-  (let ((file-name        (buffer-file-name))
+  (let ((file-name        (erlang-local-buffer-file-name))
 	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
 			   (inferior-erlang-compute-erl-compile-command
 			    module-name opts))))
@@ -5476,7 +5496,7 @@ unless the optional NO-DISPLAY is non-nil."
 	    erl-compile-expr)))
 
 (defun inferior-erlang-compute-yecc-compile-command (module-name opts)
-  (let ((file-name        (buffer-file-name))
+  (let ((file-name        (erlang-local-buffer-file-name))
 	(erl-compile-expr (inferior-erlang-remove-any-trailing-dot
 			   (inferior-erlang-compute-erl-compile-command
 			    module-name opts))))
@@ -5527,6 +5547,36 @@ unless the optional NO-DISPLAY is non-nil."
       (setq strs (cdr strs)))
     result))
 
+(defun erlang-local-buffer-file-name ()
+  ;; When editing a file remotely via tramp,
+  ;; the buffer's file name may be for example
+  ;; "/ssh:host.example.com:/some/path/x.erl"
+  ;;
+  ;; If I try to compile such a file using C-c C-k, an
+  ;; erlang shell on the remote host is automatically
+  ;; started if needed, but for it to successfully compile
+  ;; the file, the c(...)  command that is sent must contain
+  ;; the file name "/some/path/x.erl" without the
+  ;; tramp-prefix "/ssh:host.example.com:".
+  (cond ((null (buffer-file-name))
+	 nil)
+	((erlang-tramp-remote-file-p)
+	 (erlang-tramp-get-localname))
+	(t
+	 (buffer-file-name))))
+
+(defun erlang-tramp-remote-file-p ()
+  (and (fboundp 'tramp-tramp-file-p)
+       (tramp-tramp-file-p (buffer-file-name))))
+
+(defun erlang-tramp-get-localname ()
+  (let ((tramp-info (tramp-dissect-file-name (buffer-file-name))))
+    (if (fboundp 'tramp-file-name-localname)
+	(tramp-file-name-localname tramp-info)
+      ;; In old versions of tramp, it was `tramp-file-name-path'
+      ;; instead of the newer `tramp-file-name-localname'
+      (tramp-file-name-path tramp-info))))
+
 ;; `next-error' only accepts buffers with major mode `compilation-mode'
 ;; or with the minor mode `compilation-minor-mode' activated.
 ;; (To activate the minor mode is out of the question, since it will
@@ -5561,7 +5611,7 @@ Capable of finding error messages in an inferior Erlang buffer."
   "Make the inferior Erlang change directory.
 The default is to go to the directory of the current buffer."
   (interactive)
-  (or dir (setq dir (file-name-directory (buffer-file-name))))
+  (or dir (setq dir (file-name-directory (erlang-local-buffer-file-name))))
   (or (inferior-erlang-running-p)
       (error "No inferior Erlang is running"))
   (inferior-erlang-display-buffer)
diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented
index 6c9343f6cb..0dc1b47f0d 100644
--- a/lib/tools/emacs/test.erl.indented
+++ b/lib/tools/emacs/test.erl.indented
@@ -483,6 +483,19 @@ indent_fun() ->
 			Y = true andalso
 			    kalle
 		end),
+    %% check EEP37 named funs
+    Fn1 = fun Fact(N) when N > 0 ->
+		  F = Fact(N-1),
+		  N * F;
+	      Fact(0) ->
+		  1
+	  end,
+    %% check anonymous funs too
+    Fn2 = fun(0) ->
+		  1;
+	     (N) ->
+		  N
+	  end,
     ok.
 
 indent_try_catch() ->
@@ -700,3 +713,39 @@ some_function_name_xyz(xyzzy, #some_record{
 			       field2 = Field1,
 			       field2 = Field2}}),
     {ok, SomeVariable}.
+
+commas_first() ->
+    {abc, [ {some_var, 1}
+	  , {some_other_var, 2}
+	  , {erlang_ftw, 9}
+	  , {erlang_cookie, 'cookie'}
+	  , {cmds,
+	     [ {one,   "sudo ls"}
+	     , {one,   "sudo ls"}
+	     , {two,   "sudo ls"}
+	     , {three, "sudo ls"}
+	     , {four,  "sudo ls"}
+	     , {three, "sudo ls"}
+	     ] }
+	  , {ssh_username, "yow"}
+	  , {cluster,
+	     [ {aaaa, [ {"10.198.55.12" , "" }
+		      , {"10.198.55.13" , "" }
+		      ] }
+	     , {bbbb, [ {"10.198.55.151", "" }
+		      , {"10.198.55.123", "" }
+		      , {"10.198.55.34" , "" }
+		      , {"10.198.55.85" , "" }
+		      , {"10.198.55.67" , "" }
+		      ] }
+	     , {cccc, [ {"10.198.55.68" , "" }
+		      , {"10.198.55.69" , "" }
+		      ] }
+	     ] }
+	  ]
+    }.
+
+
+%% this used to result in a scan-sexp error
+[{
+ }].
diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig
index 0f8c4a9175..c7d2dc4ce5 100644
--- a/lib/tools/emacs/test.erl.orig
+++ b/lib/tools/emacs/test.erl.orig
@@ -483,6 +483,19 @@ Var = spawn(fun(X)
   Y = true andalso
 	  kalle
  end),
+%% check EEP37 named funs
+Fn1 = fun Fact(N) when N > 0 ->
+   F = Fact(N-1),
+          N * F;
+Fact(0) ->
+                 1
+  end,
+%% check anonymous funs too
+   Fn2 = fun(0) ->
+1;
+   (N) ->
+   N
+ end,
   ok.
 
 indent_try_catch() ->
@@ -700,3 +713,39 @@ some_function_name_xyz(xyzzy, #some_record{
  field2 = Field1,
  field2 = Field2}}),
  {ok, SomeVariable}.
+
+commas_first() ->
+ {abc, [ {some_var, 1}
+        , {some_other_var, 2}
+        , {erlang_ftw, 9}
+        , {erlang_cookie, 'cookie'}
+        , {cmds,
+            [ {one,   "sudo ls"}
+              , {one,   "sudo ls"}
+              , {two,   "sudo ls"}
+              , {three, "sudo ls"}
+              , {four,  "sudo ls"}
+              , {three, "sudo ls"}
+            ] }
+        , {ssh_username, "yow"}
+        , {cluster,
+            [ {aaaa, [ {"10.198.55.12" , "" }
+                     , {"10.198.55.13" , "" }
+                     ] }
+            , {bbbb, [ {"10.198.55.151", "" }
+                     , {"10.198.55.123", "" }
+                     , {"10.198.55.34" , "" }
+                     , {"10.198.55.85" , "" }
+                     , {"10.198.55.67" , "" }
+                     ] }
+            , {cccc, [ {"10.198.55.68" , "" }
+                     , {"10.198.55.69" , "" }
+                     ] }
+            ] }
+]
+}.
+
+
+%% this used to result in a scan-sexp error
+[{
+}].
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index bf21aa6b48..a24d70ed92 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -89,8 +89,9 @@
 	 flush/1,
 	 stop/0, stop/1]).
 -export([remote_start/1,get_main_node/0]).
-%-export([bump/5]).
--export([transform/4]). % for test purposes
+
+%% Used internally to ensure we upgrade the code to the latest version.
+-export([main_process_loop/1,remote_process_loop/1]).
 
 -record(main_state, {compiled=[],           % [{Module,File}]
 		     imported=[],           % [{Module,File,ImportFile}]
@@ -110,7 +111,6 @@
 -define(BUMP_REC_NAME,bump).
 
 -record(vars, {module,                      % atom() Module name
-	       vsn,                         % atom()
 	       
 	       init_info=[],                % [{M,F,A,C,L}]
 
@@ -230,49 +230,35 @@ compile_directory(Dir) when is_list(Dir) ->
 compile_directory(Dir, Options) when is_list(Dir), is_list(Options) ->
     case file:list_dir(Dir) of
 	{ok, Files} ->
-	    
-	    %% Filter out all erl files (except cover.erl)
-	    ErlFileNames =
-		lists:filter(fun("cover.erl") ->
-				     false;
-				(File) ->
-				     case filename:extension(File) of
-					 ".erl" -> true;
-					 _ -> false
-				     end
-			     end,
-			     Files),
-
-	    %% Create a list of .erl file names (incl path) and call
-	    %% compile_modules/2 with the list of file names.
-	    ErlFiles = lists:map(fun(ErlFileName) ->
-					 filename:join(Dir, ErlFileName)
-				 end,
-				 ErlFileNames),
+	    ErlFiles = [filename:join(Dir, File) ||
+			   File <- Files,
+			   filename:extension(File) =:= ".erl"],
 	    compile_modules(ErlFiles, Options);
 	Error ->
 	    Error
     end.
 
 compile_modules(Files,Options) ->
-    Options2 = lists:filter(fun(Option) ->
-				    case Option of
-					{i, Dir} when is_list(Dir) -> true;
-					{d, _Macro} -> true;
-					{d, _Macro, _Value} -> true;
-					export_all -> true;
-					_ -> false
-				    end
-			    end,
-			    Options),
+    Options2 = filter_options(Options),
     compile_modules(Files,Options2,[]).
 
 compile_modules([File|Files], Options, Result) ->
     R = call({compile, File, Options}),
     compile_modules(Files,Options,[R|Result]);
 compile_modules([],_Opts,Result) ->
-    reverse(Result).
-
+    lists:reverse(Result).
+
+filter_options(Options) ->
+    lists:filter(fun(Option) ->
+                         case Option of
+                             {i, Dir} when is_list(Dir) -> true;
+                             {d, _Macro} -> true;
+                             {d, _Macro, _Value} -> true;
+                             export_all -> true;
+                             _ -> false
+                         end
+                 end,
+                 Options).
 
 %% compile_beam(ModFile) -> Result | {error,Reason}
 %%   ModFile - see compile/1
@@ -318,25 +304,9 @@ compile_beam_directory() ->
 compile_beam_directory(Dir) when is_list(Dir) ->
     case file:list_dir(Dir) of
 	{ok, Files} ->
-	    
-	    %% Filter out all beam files (except cover.beam)
-	    BeamFileNames =
-		lists:filter(fun("cover.beam") ->
-				     false;
-				(File) ->
-				     case filename:extension(File) of
-					 ".beam" -> true;
-					 _ -> false
-				     end
-			     end,
-			     Files),
-
-	    %% Create a list of .beam file names (incl path) and call
-	    %% compile_beam/1 for each such file name
-	    BeamFiles = lists:map(fun(BeamFileName) ->
-					  filename:join(Dir, BeamFileName)
-				  end,
-				  BeamFileNames),
+	    BeamFiles =  [filename:join(Dir, File) ||
+			     File <- Files,
+			     filename:extension(File) =:= ".beam"],
 	    compile_beams(BeamFiles);
 	Error ->
 	    Error
@@ -348,7 +318,7 @@ compile_beams([File|Files],Result) ->
     R = compile_beam(File),
     compile_beams(Files,[R|Result]);
 compile_beams([],Result) ->
-    reverse(Result).
+    lists:reverse(Result).
 
 
 %% analyse(Module) ->
@@ -611,8 +581,11 @@ main_process_loop(State) ->
 		    Compiled = add_compiled(Module, File,
 					    State#main_state.compiled),
 		    Imported = remove_imported(Module,State#main_state.imported),
-		    main_process_loop(State#main_state{compiled = Compiled,
-						       imported = Imported});
+		    NewState = State#main_state{compiled = Compiled,
+						imported = Imported},
+		    %% This module (cover) could have been reloaded. Make
+		    %% sure we run the new code.
+		    ?MODULE:main_process_loop(NewState);
 		error ->
 		    reply(From, {error, File}),
 		    main_process_loop(State)
@@ -622,8 +595,9 @@ main_process_loop(State) ->
 	    Compiled0 = State#main_state.compiled,
 	    case get_beam_file(Module,BeamFile0,Compiled0) of
 		{ok,BeamFile} ->
+		    UserOptions = get_compile_options(Module,BeamFile),
 		    {Reply,Compiled} = 
-			case do_compile_beam(Module,BeamFile,[]) of
+			case do_compile_beam(Module,BeamFile,UserOptions) of
 			    {ok, Module} ->
 				remote_load_compiled(State#main_state.nodes,
 						     [{Module,BeamFile}]),
@@ -636,8 +610,11 @@ main_process_loop(State) ->
 			end,
 		    reply(From,Reply),
 		    Imported = remove_imported(Module,State#main_state.imported),
-		    main_process_loop(State#main_state{compiled = Compiled,
-						       imported = Imported});
+		    NewState = State#main_state{compiled = Compiled,
+						imported = Imported},
+		    %% This module (cover) could have been reloaded. Make
+		    %% sure we run the new code.
+		    ?MODULE:main_process_loop(NewState);
 		{error,no_beam} ->
 		    %% The module has first been compiled from .erl, and now
 		    %% someone tries to compile it from .beam
@@ -854,7 +831,7 @@ remote_process_loop(State) ->
 	{remote,load_compiled,Compiled} ->
 	    Compiled1 = load_compiled(Compiled,State#remote_state.compiled),
 	    remote_reply(State#remote_state.main_node, ok),
-	    remote_process_loop(State#remote_state{compiled=Compiled1});
+	    ?MODULE:remote_process_loop(State#remote_state{compiled=Compiled1});
 
 	{remote,unload,UnloadedModules} ->
 	    unload(UnloadedModules),
@@ -1254,12 +1231,12 @@ add_imported(M, F1, ImportFile, [{M,_F2,ImportFiles}|Imported], Acc) ->
 	    dont_import;
 	false ->
 	    NewEntry = {M, F1, [ImportFile | ImportFiles]},
-	    {ok, reverse([NewEntry | Acc]) ++ Imported}
+	    {ok, lists:reverse([NewEntry | Acc]) ++ Imported}
     end;
 add_imported(M, F, ImportFile, [H|Imported], Acc) ->
     add_imported(M, F, ImportFile, Imported, [H|Acc]);
 add_imported(M, F, ImportFile, [], Acc) ->
-    {ok, reverse([{M, F, [ImportFile]} | Acc])}.
+    {ok, lists:reverse([{M, F, [ImportFile]} | Acc])}.
     
 %% Removes a module from the list of imported modules and writes a warning
 %% This is done when a module is compiled.
@@ -1380,9 +1357,9 @@ do_compile_beam(Module,Beam,UserOptions) ->
 	    {error,E};
 	encrypted_abstract_code=E ->
 	    {error,E};
-	{Vsn,Code} ->
+	{raw_abstract_v1,Code} ->
             Forms0 = epp:interpret_file_attribute(Code),
-	    {Forms,Vars} = transform(Vsn, Forms0, Module, Beam),
+	    {Forms,Vars} = transform(Forms0, Module),
 
 	    %% We need to recover the source from the compilation
 	    %% info otherwise the newly compiled module will have
@@ -1397,7 +1374,7 @@ do_compile_beam(Module,Beam,UserOptions) ->
 		{module, Module} ->
 		    
 		    %% Store info about all function clauses in database
-		    InitInfo = reverse(Vars#vars.init_info),
+		    InitInfo = lists:reverse(Vars#vars.init_info),
 		    ets:insert(?COVER_CLAUSE_TABLE, {Module, InitInfo}),
 		    
 		    %% Store binary code so it can be loaded on remote nodes
@@ -1408,7 +1385,11 @@ do_compile_beam(Module,Beam,UserOptions) ->
 		_Error ->
 		    do_clear(Module),
 		    error
-	    end
+	    end;
+	{_VSN,_Code} ->
+	    %% Wrong version of abstract code. Just report that there
+	    %% is no abstract code.
+	    {error,no_abstract_code}
     end.
 
 get_abstract_code(Module, Beam) ->
@@ -1421,38 +1402,30 @@ get_abstract_code(Module, Beam) ->
     end.
 
 get_source_info(Module, Beam) ->
+    Compile = get_compile_info(Module, Beam),
+    case lists:keyfind(source, 1, Compile) of
+        { source, _ } = Tuple -> [Tuple];
+        false -> []
+    end.
+
+get_compile_options(Module, Beam) ->
+    Compile = get_compile_info(Module, Beam),
+    case lists:keyfind(options, 1, Compile) of
+        {options, Options } -> filter_options(Options);
+        false -> []
+    end.
+
+get_compile_info(Module, Beam) ->
     case beam_lib:chunks(Beam, [compile_info]) of
 	{ok, {Module, [{compile_info, Compile}]}} ->
-		case lists:keyfind(source, 1, Compile) of
-			{ source, _ } = Tuple -> [Tuple];
-			false -> []
-		end;
+		Compile;
 	_ ->
 		[]
     end.
 
-transform(Vsn, Code, Module, Beam) when Vsn=:=abstract_v1; Vsn=:=abstract_v2 ->
-    Vars0 = #vars{module=Module, vsn=Vsn},
+transform(Code, Module) ->
     MainFile=find_main_filename(Code),
-    {ok, MungedForms,Vars} = transform_2(Code,[],Vars0,MainFile,on),
-    
-    %% Add module and export information to the munged forms
-    %% Information about module_info must be removed as this function
-    %% is added at compilation
-    {ok, {Module, [{exports,Exports1}]}} = beam_lib:chunks(Beam, [exports]),
-    Exports2 = lists:filter(fun(Export) ->
-				    case Export of
-					{module_info,_} -> false;
-					_ -> true
-				    end
-			    end,
-			    Exports1),
-    Forms = [{attribute,1,module,Module},
-	     {attribute,2,export,Exports2}]++ MungedForms,
-    {Forms,Vars};
-transform(Vsn=raw_abstract_v1, Code, Module, _Beam) ->
-    MainFile=find_main_filename(Code),
-    Vars0 = #vars{module=Module, vsn=Vsn},
+    Vars0 = #vars{module=Module},
     {ok,MungedForms,Vars} = transform_2(Code,[],Vars0,MainFile,on),
     {MungedForms,Vars}.
     
@@ -1472,7 +1445,7 @@ transform_2([Form0|Forms],MungedForms,Vars,MainFile,Switch) ->
 	    transform_2(Forms,[MungedForm|MungedForms],Vars2,MainFile,NewSwitch)
     end;
 transform_2([],MungedForms,Vars,_,_) ->
-    {ok, reverse(MungedForms), Vars}.
+    {ok, lists:reverse(MungedForms), Vars}.
 
 %% Expand short-circuit Boolean expressions.
 expand(Expr) ->
@@ -1539,14 +1512,9 @@ aux_var(Vars, N) ->
     end.
 
 %% This code traverses the abstract code, stored as the abstract_code
-%% chunk in the BEAM file, as described in absform(3) for Erlang/OTP R8B
-%% (Vsn=abstract_v2).
-%% The abstract format after preprocessing differs slightly from the abstract
-%% format given eg using epp:parse_form, this has been noted in comments.
-%% The switch is turned off when we encounter other files then the main file.
+%% chunk in the BEAM file, as described in absform(3).
+%% The switch is turned off when we encounter other files than the main file.
 %% This way we will be able to exclude functions defined in include files.
-munge({function,0,module_info,_Arity,_Clauses},_Vars,_MainFile,_Switch) ->
-    ignore; % module_info will be added again when the forms are recompiled
 munge({function,Line,Function,Arity,Clauses},Vars,_MainFile,on) ->
     Vars2 = Vars#vars{function=Function,
 		      arity=Arity,
@@ -1604,7 +1572,7 @@ munge_clauses([Clause|Clauses], Vars, Lines, MClauses) ->
 			   MClauses])
     end;
 munge_clauses([], Vars, Lines, MungedClauses) -> 
-    {reverse(MungedClauses), Vars#vars{lines = Lines}}.
+    {lists:reverse(MungedClauses), Vars#vars{lines = Lines}}.
 
 munge_body(Expr, Vars) ->
     munge_body(Expr, Vars, [], []).
@@ -1648,7 +1616,7 @@ munge_body([Expr|Body], Vars, MungedBody, LastExprBumpLines) ->
 	    munge_body(Body, Vars3, MungedExprs1, NewBumps)
     end;
 munge_body([], Vars, MungedBody, _LastExprBumpLines) ->
-    {reverse(MungedBody), Vars}.
+    {lists:reverse(MungedBody), Vars}.
 
 %%% Fix last expression (OTP-8188). A typical example:
 %%%
@@ -1786,16 +1754,16 @@ munge_expr({match,Line,ExprL,ExprR}, Vars) ->
 munge_expr({tuple,Line,Exprs}, Vars) ->
     {MungedExprs, Vars2} = munge_exprs(Exprs, Vars, []),
     {{tuple,Line,MungedExprs}, Vars2};
-munge_expr({record,Line,Expr,Exprs}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedExprName, Vars2} = munge_expr(Expr, Vars),
+munge_expr({record,Line,Name,Exprs}, Vars) ->
+    {MungedExprFields, Vars2} = munge_exprs(Exprs, Vars, []),
+    {{record,Line,Name,MungedExprFields}, Vars2};
+munge_expr({record,Line,Arg,Name,Exprs}, Vars) ->
+    {MungedArg, Vars2} = munge_expr(Arg, Vars),
     {MungedExprFields, Vars3} = munge_exprs(Exprs, Vars2, []),
-    {{record,Line,MungedExprName,MungedExprFields}, Vars3};
+    {{record,Line,MungedArg,Name,MungedExprFields}, Vars3};
 munge_expr({record_field,Line,ExprL,ExprR}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
-    {MungedExprL, Vars2} = munge_expr(ExprL, Vars),
-    {MungedExprR, Vars3} = munge_expr(ExprR, Vars2),
-    {{record_field,Line,MungedExprL,MungedExprR}, Vars3};
+    {MungedExprR, Vars2} = munge_expr(ExprR, Vars),
+    {{record_field,Line,ExprL,MungedExprR}, Vars2};
 munge_expr({cons,Line,ExprH,ExprT}, Vars) ->
     {MungedExprH, Vars2} = munge_expr(ExprH, Vars),
     {MungedExprT, Vars3} = munge_expr(ExprT, Vars2),
@@ -1857,18 +1825,12 @@ munge_expr({'try',Line,Body,Clauses,CatchClauses,After}, Vars) ->
     {MungedAfter, Vars4} = munge_body(After, Vars3),
     {{'try',Line,MungedBody,MungedClauses,MungedCatchClauses,MungedAfter}, 
      Vars4};
-%% Difference in abstract format after preprocessing: Funs get an extra
-%% element Extra.
-%% NOT NECESSARY FOR Vsn=raw_abstract_v1
-munge_expr({'fun',Line,{function,Name,Arity},_Extra}, Vars) ->
-    {{'fun',Line,{function,Name,Arity}}, Vars};
-munge_expr({'fun',Line,{clauses,Clauses},_Extra}, Vars) ->
-    {MungedClauses,Vars2}=munge_clauses(Clauses, Vars),
-    {{'fun',Line,{clauses,MungedClauses}}, Vars2};
 munge_expr({'fun',Line,{clauses,Clauses}}, Vars) ->
-    %% Only for Vsn=raw_abstract_v1
     {MungedClauses,Vars2}=munge_clauses(Clauses, Vars),
     {{'fun',Line,{clauses,MungedClauses}}, Vars2};
+munge_expr({named_fun,Line,Name,Clauses}, Vars) ->
+    {MungedClauses,Vars2}=munge_clauses(Clauses, Vars),
+    {{named_fun,Line,Name,MungedClauses}, Vars2};
 munge_expr({bin,Line,BinElements}, Vars) ->
     {MungedBinElements,Vars2} = munge_exprs(BinElements, Vars, []),
     {{bin,Line,MungedBinElements}, Vars2};
@@ -1887,7 +1849,7 @@ munge_exprs([Expr|Exprs], Vars, MungedExprs) ->
     {MungedExpr, Vars2} = munge_expr(Expr, Vars),
     munge_exprs(Exprs, Vars2, [MungedExpr|MungedExprs]);
 munge_exprs([], Vars, MungedExprs) ->
-    {reverse(MungedExprs), Vars}.
+    {lists:reverse(MungedExprs), Vars}.
 
 %% Every qualifier is decorated with a counter.
 munge_qualifiers(Qualifiers, Vars) ->
@@ -1906,7 +1868,7 @@ munge_qs([Expr|Qs], Vars, MQs) ->
     {MungedExpr, Vars2} = munge_expr(Expr, Vars),
     munge_qs1(Qs, L, MungedExpr, Vars, Vars2, MQs);
 munge_qs([], Vars, MQs) ->
-    {reverse(MQs), Vars}.
+    {lists:reverse(MQs), Vars}.
 
 munge_qs1(Qs, Line, NQ, Vars, Vars2, MQs) ->
     case new_bumps(Vars2, Vars) of
@@ -2099,7 +2061,7 @@ merge_clauses([{{M,F,A,_C1},R1},{{M,F,A,C2},R2}|Clauses], MFun, Result) ->
 merge_clauses([{{M,F,A,_C},R}|Clauses], MFun, Result) ->
     merge_clauses(Clauses, MFun, [{{M,F,A},R}|Result]);
 merge_clauses([], _Fun, Result) ->
-    reverse(Result).
+    lists:reverse(Result).
 
 merge_functions([{_MFA,R}|Functions], MFun) ->
     merge_functions(Functions, MFun, R);
@@ -2420,14 +2382,6 @@ not_loaded(_Module,_Else, State) ->
 
 %%%--Div-----------------------------------------------------------------
 
-reverse(List) ->
-    reverse(List,[]).
-reverse([H|T],Acc) ->
-    reverse(T,[H|Acc]);
-reverse([],Acc) ->
-    Acc.
-
-
 escape_lt_and_gt(Rawline,HTML) when HTML =/= true ->
     Rawline;
 escape_lt_and_gt(Rawline,_HTML) ->
diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index f13a297ecf..20ee32c861 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -1,4 +1,3 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/tools/src/tags.erl b/lib/tools/src/tags.erl
index 1c72ef8db5..e3cc51cdb2 100644
--- a/lib/tools/src/tags.erl
+++ b/lib/tools/src/tags.erl
@@ -292,7 +292,7 @@ word_char(C) when C >= $0, C =< $9 -> true;
 word_char($_) -> true;
 word_char(_) -> false.
 
-
+
 %%% Output routines
 
 %% Check the options `outfile' and `outdir'.
@@ -323,7 +323,7 @@ genout(Os, Name, Entries) ->
     io:put_chars(Os, lists:reverse(Entries)).
 
 
-    
+    
 %%% help routines
 
 %% Flatten and reverse a nested list.
diff --git a/lib/tools/src/tools.appup.src b/lib/tools/src/tools.appup.src
index 8de1ec76c9..9a27456a81 100644
--- a/lib/tools/src/tools.appup.src
+++ b/lib/tools/src/tools.appup.src
@@ -1,19 +1,21 @@
-#
-# %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%
-#
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, tools}]}],
+ [{<<".*">>,[{restart_application, tools}]}]
+}.
diff --git a/lib/tools/src/xref_compiler.erl b/lib/tools/src/xref_compiler.erl
index f0fed502a5..c4b5c04c12 100644
--- a/lib/tools/src/xref_compiler.erl
+++ b/lib/tools/src/xref_compiler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -885,7 +885,7 @@ evaluate([pop | P], T, [_ | S]) ->
 evaluate([], T, [R]) ->
     {T, R}.
 
-%% (PossibleGraph, 1 | -1, dict()) -> dict()
+%% (PossibleGraph, 1 | -1, dict:dict()) -> dict:dict()
 %% Use the same table for everything... Here: Reference counters for digraphs.
 update_graph_counter(Value, Inc, T) ->
     case catch digraph:info(Value) of
diff --git a/lib/tools/src/xref_reader.erl b/lib/tools/src/xref_reader.erl
index d3601c6ea0..142d28ebe6 100644
--- a/lib/tools/src/xref_reader.erl
+++ b/lib/tools/src/xref_reader.erl
@@ -171,6 +171,11 @@ expr({'fun', Line, {function, Name, Arity}, _Extra}, S) ->
     handle_call(local, S#xrefr.module, Name, Arity, Line, S);
 expr({'fun', _Line, {clauses, Cs}, _Extra}, S) ->
     clauses(Cs, S);
+expr({named_fun, _Line, '_', Cs, _Extra}, S) ->
+    clauses(Cs, S);
+expr({named_fun, _Line, Name, Cs, _Extra}, S) ->
+    S1 = S#xrefr{funvars = [Name | S#xrefr.funvars]},
+    clauses(Cs, S1);
 expr({call, Line, {atom, _, Name}, As}, S) ->
     S1 = handle_call(local, S#xrefr.module, Name, length(As), Line, S),
     expr(As, S1);
@@ -186,6 +191,9 @@ expr({match, _Line, {var,_,Var}, {'fun', _, {clauses, Cs}, _Extra}}, S) ->
     %% that are passed around by the "expansion" of list comprehension.
     S1 = S#xrefr{funvars = [Var | S#xrefr.funvars]},
     clauses(Cs, S1);
+expr({match, _Line, {var,_,Var}, {named_fun, _, _, _, _} = Fun}, S) ->
+    S1 = S#xrefr{funvars = [Var | S#xrefr.funvars]},
+    expr(Fun, S1);
 expr({match, _Line, {var,_,Var}, E}, S) ->
     %% Used for resolving code like
     %%     Args = [A,B], apply(m, f, Args)
@@ -288,6 +296,8 @@ funarg({'fun', _, _Clauses, _Extra}, _S) -> true;
 funarg({'fun', _, {function,_,_,_}}, _S) ->
     %% New abstract format for fun M:F/A in R15.
     true;
+funarg({named_fun, _, _, _, _}, _S) ->
+    true;
 funarg({var, _, Var}, S) -> member(Var, S#xrefr.funvars);
 funarg(_, _S) -> false.
 
diff --git a/lib/tools/src/xref_utils.erl b/lib/tools/src/xref_utils.erl
index 7b72165e6f..49c397a140 100644
--- a/lib/tools/src/xref_utils.erl
+++ b/lib/tools/src/xref_utils.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -437,7 +437,7 @@ regexpr({ModExpr, FunExpr, ArityExpr}, Var) ->
 	    V2
     end.
 
-%% -> digraph()
+%% -> digraph:graph()
 relation_to_graph(S) ->
     G = digraph:new(),
     Fun = fun({From, To}) -> 
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index c033be98a3..ec61c57cec 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -22,13 +22,16 @@
 	 suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2]).
 
--export([start/1, compile/1, analyse/1, misc/1, stop/1, 
+-export([coverage/1, coverage_analysis/1,
+	 start/1, compile/1, analyse/1, misc/1, stop/1,
 	 distribution/1, reconnect/1, die_and_reconnect/1,
 	 dont_reconnect_after_stop/1, stop_node_after_disconnect/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,
-	 otp_10979_hanging_node/1]).
+	 otp_10979_hanging_node/1, compile_beam_opts/1, eep37/1]).
+
+-export([do_coverage/1]).
 
 -include_lib("test_server/include/test_server.hrl").
 
@@ -46,25 +49,25 @@
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
+    NoStartStop = [eif,otp_5305,otp_5418,otp_7095,otp_8273,
+		   otp_8340,otp_8188,compile_beam_opts,eep37],
+    StartStop = [start, compile, analyse, misc, stop,
+		 distribution, reconnect, die_and_reconnect,
+		 dont_reconnect_after_stop, stop_node_after_disconnect,
+		 export_import, otp_5031, otp_6115,
+		 otp_8270, otp_10979_hanging_node],
     case whereis(cover_server) of
 	undefined ->
-	    [start, compile, analyse, misc, stop,
-	     distribution, reconnect, die_and_reconnect,
-	     dont_reconnect_after_stop, stop_node_after_disconnect,
-	     export_import, otp_5031, eif, otp_5305, otp_5418,
-	     otp_6115, otp_7095, otp_8188, otp_8270, otp_8273,
-	     otp_8340, otp_10979_hanging_node];
+	    [coverage,StartStop ++ NoStartStop];
 	_pid ->
-	    {skip,
-	     "It looks like the test server is running "
-	     "cover. Can't run cover test."}
+	    [coverage|NoStartStop++[coverage_analysis]]
     end.
 
 groups() -> 
     [].
 
 init_per_suite(Config) ->
-    Config.
+    [{ct_is_running_cover,whereis(cover_server) =/= undefined}|Config].
 
 end_per_suite(_Config) ->
     ok.
@@ -90,13 +93,64 @@ init_per_testcase(TC, Config) when TC =:= misc;
 init_per_testcase(_TestCase, Config) ->
     Config.
 
-end_per_testcase(TestCase, _Config) ->
-    case lists:member(TestCase,[start,compile,analyse,misc]) of
+end_per_testcase(TestCase, Config) ->
+    NoStop = [start,compile,analyse,misc],
+    DontStop = proplists:get_bool(ct_is_running_cover, Config) orelse
+	lists:member(TestCase, NoStop),
+    case DontStop of
 	true -> ok;
 	false -> cover:stop()
     end,
     ok.
 
+coverage(Config) when is_list(Config) ->
+    {ok,?MODULE} = cover:compile_beam(?MODULE),
+    ?MODULE:do_coverage(Config).
+
+do_coverage(Config) ->
+    Outdir = ?config(priv_dir, Config),
+    ExportFile = filename:join(Outdir, "export"),
+    ok = cover:export(ExportFile, ?MODULE),
+    {error,{already_started,_}} = cover:start(),
+    {error,_} = cover:compile_beam(non_existing_module),
+    _ = cover:which_nodes(),
+    _ = cover:modules(),
+    _ = cover:imported(),
+    {error,{not_cover_compiled,lists}} = cover:analyze(lists),
+
+    %% Cover escaping of '&' in HTML files.
+
+    case proplists:get_bool(ct_is_running_cover, Config) of
+	false ->
+	    %% Cover server was implicitly started when this module
+	    %% was cover-compiled. We must stop the cover server, but
+	    %% we must ensure that this module is not on the call
+	    %% stack when it is unloaded. Therefore, the call that
+	    %% follows MUST be tail-recursive.
+	    cover:stop();
+	true ->
+	    %% Cover server was started by common_test; don't stop it.
+	    ok
+    end.
+
+%% This test case will only be run when common_test is running cover.
+coverage_analysis(Config) when is_list(Config) ->
+    {ok,Analysis1} = cover:analyze(?MODULE),
+    io:format("~p\n", [Analysis1]),
+    {ok,Analysis2} = cover:analyze(?MODULE, calls),
+    io:format("~p\n", [Analysis2]),
+    {ok,_Analysis3} = cover:analyze(?MODULE, calls, line),
+
+    Outdir = ?config(priv_dir, Config),
+    Outfile = filename:join(Outdir, ?MODULE),
+
+    {ok,Outfile} = cover:analyze_to_file(?MODULE, Outfile),
+    {ok,Contents} = file:read_file(Outfile),
+    ok = file:delete(Outfile),
+    ok = io:put_chars(Contents),
+    {ok,Outfile} = cover:analyze_to_file(?MODULE, Outfile, [html]),
+    ok.
+
 start(suite) -> [];
 start(Config) when is_list(Config) ->
     ?line ok = file:set_cwd(?config(data_dir, Config)),
@@ -759,7 +813,6 @@ eif(Config) when is_list(Config) ->
     %% in cover_inc.beam - not the ones from the included file.
     ?line cover_inc:func(),
     ?line {ok, [_, _]} = cover:analyse(cover_inc, line),
-    ?line cover:stop(),
     ok.
     
 otp_5305(suite) -> [];
@@ -775,7 +828,6 @@ otp_5305(Config) when is_list(Config) ->
              ">>,
     ?line ok = file:write_file(File, Test),
     ?line {ok, t} = cover:compile(File),
-    ?line cover:stop(),
     ?line ok = file:delete(File),
 
     ok.
@@ -790,7 +842,6 @@ otp_5418(Config) when is_list(Config) ->
     ?line ok = file:write_file(File, Test),
     ?line {ok, t} = cover:compile(File),
     ?line {ok,{t,{0,0}}} = cover:analyse(t, module),
-    ?line cover:stop(),
     ?line ok = file:delete(File),
 
     ok.
@@ -952,7 +1003,6 @@ otp_7095(Config) when is_list(Config) ->
                {{t,67},1},{{t,69},1},{{t,71},1},{{t,74},1},
                     {{t,76},0},{{t,78},1},
                {{t,82},2}]} = cover:analyse(t, calls, line),
-    ?line cover:stop(),
     ?line ok = file:delete(File),
 
     ok.
@@ -1028,7 +1078,6 @@ otp_8273(Config) when is_list(Config) ->
              ">>,
     ?line File = cc_mod(t, Test, Config),
     ?line ok = t:t(),
-    ?line cover:stop(),
     ?line ok = file:delete(File),
 
     ok.
@@ -1066,7 +1115,6 @@ otp_8188(Config) when is_list(Config) ->
     ?line File = cc_mod(t, Test, Config),
     ?line false = t:test(nok),
     ?line {ok,[{{t,11},1},{{t,12},1}]} = cover:analyse(t, calls, line),
-    ?line cover:stop(),
     ?line ok = file:delete(File),
 
     %% Bit string comprehensions are now traversed;
@@ -1382,6 +1430,20 @@ comprehension_8188(Cf) ->
 
     ok.
 
+eep37(Config) when is_list(Config) ->
+    [{{t,1},1},{{t,2},1},{{t,4},6},{{t,6},1},{{t,8},1}] =
+        analyse_expr(<<"begin\n" % 1
+                       "    F =\n" % 1
+                       "        fun Fact(N) when N > 0 ->\n"
+                       "                N * Fact(N - 1);\n" % 6
+                       "            Fact(0) ->\n"
+                       "                1\n" % 1
+                       "        end,\n"
+                       "    F(6)\n" % 1
+                       "end\n">>,
+                    Config),
+    ok.
+
 otp_10979_hanging_node(_Config) ->
 
     P1 = processes(),
@@ -1401,6 +1463,40 @@ otp_10979_hanging_node(_Config) ->
 
     ok.
 
+compile_beam_opts(doc) ->
+    ["Take compiler options from beam in cover:compile_beam"];
+compile_beam_opts(suite) -> [];
+compile_beam_opts(Config) when is_list(Config) ->
+    {ok, Cwd} = file:get_cwd(),
+    ok = file:set_cwd(?config(priv_dir, Config)),
+    IncDir = filename:join(?config(data_dir, Config),
+                                 "included_functions"),
+    File = filename:join([?config(data_dir, Config), "otp_11439", "t.erl"]),
+    %% use all compiler options allowed by cover:filter_options
+    %% i and d don't make sense when compiling from beam though
+    {ok, t} =
+        compile:file(File, [{i, IncDir},
+                            {d, 'BOOL'},
+                            {d, 'MACRO', macro_defined},
+                            export_all,
+                            debug_info,
+                            return_errors]),
+    code:purge(t),
+    code:delete(t),
+    Exports =
+        [{func1,0},
+         {macro, 0},
+         {exported,0},
+         {nonexported,0},
+         {module_info,0},
+         {module_info,1}],
+    Exports = t:module_info(exports),
+    {ok, t} = cover:compile_beam("t"),
+    Exports = t:module_info(exports),
+    ok = file:delete("t.beam"),
+    ok = file:set_cwd(Cwd),
+    ok.
+
 %%--Auxiliary------------------------------------------------------------
 
 analyse_expr(Expr, Config) ->
diff --git a/lib/tools/test/cover_SUITE_data/otp_11439/t.erl b/lib/tools/test/cover_SUITE_data/otp_11439/t.erl
new file mode 100644
index 0000000000..d1eb9f16ee
--- /dev/null
+++ b/lib/tools/test/cover_SUITE_data/otp_11439/t.erl
@@ -0,0 +1,11 @@
+-module(t).
+-export([exported/0]).
+-include("cover_inc.hrl").
+-ifdef(BOOL).
+macro() ->
+    ?MACRO.
+-endif.
+exported() ->
+    ok.
+nonexported() ->
+    ok.
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 26685a6a84..1227d5b841 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -127,6 +127,14 @@ basic(Config) when is_list(Config) ->
     ok.
 
 basic_option(Config) when is_list(Config) ->
+    %% Eprof is not supported on native-compile code.
+    case lists:module_info(native_addresses) of
+	[] -> basic_option_1(Config);
+	[_|_] -> {skip,"lists is native-compiled"}
+    end.
+
+basic_option_1(Config) ->
+
     %% load eprof_test and change directory
 
     {ok, OldCurDir} = file:get_cwd(),
diff --git a/lib/tools/test/eprof_SUITE_data/eed.erl b/lib/tools/test/eprof_SUITE_data/eed.erl
index 520c5f3dd1..5f2a21aa60 100644
--- a/lib/tools/test/eprof_SUITE_data/eed.erl
+++ b/lib/tools/test/eprof_SUITE_data/eed.erl
@@ -146,7 +146,7 @@ format_error({'EXIT', {Code, {Mod, Func, Args}}}) ->
 				[{Code, {Mod, Func, length(Args)}}]));
 format_error(A) -> atom_to_list(A).
 
-
+
 
 %%% Parsing commands.
 
@@ -327,7 +327,7 @@ when 0 =< Num1, Num1 =< Num2, Num2 =< State#state.lines ->
 check_lines(_, _, _, _) ->
     error(bad_linenum).
 
-
+
 %%% Executing commands.
 
 %% ($)= - print line number
@@ -657,7 +657,7 @@ undo_command(_, _, _) ->
 write_command(_Cmd, [_First, _Last], _St) ->
     error(not_implemented).
     
-
+
 %%% Primitive buffer operations.
 
 print_current(St) ->
@@ -717,7 +717,7 @@ wrap_next_line(State) when State#state.dot == State#state.lines ->
 wrap_next_line(State) ->
     next_line(State).
 
-
+
 %%% Utilities.
 
 get_pattern(End, Cmd, State) ->
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index ea3f59dbe1..e3582b995b 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -30,12 +30,12 @@
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
--export([app_test/1]).
+-export([app_test/1, appup_test/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [app_test].
+    [app_test, appup_test].
 
 groups() -> 
     [].
@@ -71,3 +71,7 @@ app_test(suite) ->
     [];
 app_test(Config) when is_list(Config) ->
     ?line ?t:app_test(tools, tolerant).
+
+%% Test that the .appup file does not contain any `basic' errors
+appup_test(Config) when is_list(Config) ->
+    ok = ?t:appup_test(tools).
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index dc06678b8e..353275ae3b 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2000-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1048,7 +1047,7 @@ read_expected(Version) ->
     POS1 = 28, POS2 = POS1+10, POS3 = POS2+6, POS4 = POS3+6, POS5 = POS4+10,
     POS6 = POS5+5, POS7 = POS6+6, POS8 = POS7+6, POS9 = POS8+8,
     POS10 = POS9+10, POS11 = POS10+7, POS12 = POS11+8, POS13 = POS12+10,
-    POS14 = POS13+18, % POS15 = POS14+23,
+    POS14 = POS13+18, POS15 = POS14+23,
 
     FF = {read,funfuns,0},
     U = [{POS1+5,{FF,{dist,'$F_EXPR',0}}},
@@ -1099,6 +1098,7 @@ read_expected(Version) ->
 	  {POS1+1,{FF,{mod17,fun17,0}}},
 	  {POS1+2,{FF,{erlang,spawn,1}}},
 	  {POS1+2,{FF,{read,local,0}}},
+	  {POS1+3,{FF,{erlang,binary_to_term,1}}},
 	  {POS1+3,{FF,{erlang,spawn,1}}},
 	  {POS1+4,{FF,{dist,func,0}}},
 	  {POS1+4,{FF,{erlang,spawn,1}}},
@@ -1197,11 +1197,6 @@ read_expected(Version) ->
                   {0,{FF,{modul,'$F_EXPR',179}}}]
                  ++ O1;
 	     _ ->
-%                 [{POS15+2,{{read,bi,0},{foo,t,0}}},
-%                  {POS15+3,{{read,bi,0},{bar,t,0}}},
-%                  {POS15+6,{{read,bi,0},{read,local,0}}},
-%                  {POS15+8,{{read,bi,0},{foo,t,0}}},
-%                  {POS15+10,{{read,bi,0},{bar,t,0}}}] ++
                  [{16,{FF,{read,'$F_EXPR',178}}},
                   {17,{FF,{modul,'$F_EXPR',179}}}]
                  ++
@@ -1212,7 +1207,6 @@ read_expected(Version) ->
     OKB1 = [{POS13+1,{FF,{erts_debug,apply,4}}},
             {POS13+2,{FF,{erts_debug,apply,4}}},
             {POS13+3,{FF,{erts_debug,apply,4}}},
-            {POS1+3, {FF,{erlang,binary_to_term,1}}},
             {POS3+1, {FF,{erlang,spawn,3}}},
             {POS3+2, {FF,{erlang,spawn,3}}},
             {POS3+3,  {FF,{erlang,spawn_link,3}}},
@@ -1228,7 +1222,11 @@ read_expected(Version) ->
               _ ->
                   [{POS13+16, {{read,bi,0},{erlang,'!',2}}},
                    {POS13+16, {{read,bi,0},{erlang,'-',1}}},
-                   {POS13+16, {{read,bi,0},{erlang,self,0}}}]
+                   {POS13+16, {{read,bi,0},{erlang,self,0}}},
+                   {POS15+1,  {{read,bi,0},{erlang,'>',2}}},
+                   {POS15+2,  {{read,bi,0},{erlang,'-',2}}},
+                   {POS15+2,  {{read,bi,0},{erlang,'*',2}}},
+                   {POS15+8,  {{read,bi,0},{erlang,'/',2}}}]
           end
         ++ [{POS14+19, {{read,bi,0},{erlang,'+',2}}},
             {POS14+21, {{read,bi,0},{erlang,'+',2}}},
diff --git a/lib/tools/test/xref_SUITE_data/read/read.erl b/lib/tools/test/xref_SUITE_data/read/read.erl
index 19694c9e25..5f388194b0 100644
--- a/lib/tools/test/xref_SUITE_data/read/read.erl
+++ b/lib/tools/test/xref_SUITE_data/read/read.erl
@@ -156,20 +156,19 @@ bi() ->
     <<D:16, E, F/binary>> = Bin3,
     X = 9, <<(X+1):8>>,
     _Fyy = <<X:4/little-signed-integer-unit:8>>,
-    D + E + F.
-%bi() ->
-%    %% POS15=POS14+13
-%    try
-%       foo:t(),
-%       bar:t()
-%    of
-%       {v,1} ->
-%             local();
-%       {v,2} ->
-%             foo:t()
-%    catch
-%       {'EXIT',_} -> bar:t()
-%    end.
+    D + E + F;
+bi() ->
+    %% EEP37. POS15=POS14+23
+    F = fun Fact(N) when N > 0 ->
+                N * Fact(N - 1);
+            Fact(0) ->
+                1
+        end,
+    F(6),
+    G = fun _(foo) -> bar;
+            _(X) -> X / 3
+        end,
+    G(foo).
 
 local() ->
     true.
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index a30b16fc49..0cead00554 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.6.11
+TOOLS_VSN = 2.6.13
diff --git a/lib/tv/AUTHORS b/lib/tv/AUTHORS
deleted file mode 100644
index 7736a75b2f..0000000000
--- a/lib/tv/AUTHORS
+++ /dev/null
@@ -1,5 +0,0 @@
-Original Authors and Contributors:
-
-Fredrik Gustafson
-
-
diff --git a/lib/tv/Makefile b/lib/tv/Makefile
deleted file mode 100644
index 1c6d4b54f6..0000000000
--- a/lib/tv/Makefile
+++ /dev/null
@@ -1,35 +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%
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-SUB_DIRECTORIES = src priv doc/src
-
-include vsn.mk
-VSN = $(TV_VSN)
-
-SPECIAL_TARGETS = 
-
-# ----------------------------------------------------
-# Default Subdir Targets
-# ----------------------------------------------------
-include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/lib/tv/doc/html/.gitignore b/lib/tv/doc/html/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/tv/doc/html/.gitignore
+++ /dev/null
diff --git a/lib/tv/doc/man3/.gitignore b/lib/tv/doc/man3/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/tv/doc/man3/.gitignore
+++ /dev/null
diff --git a/lib/tv/doc/pdf/.gitignore b/lib/tv/doc/pdf/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/tv/doc/pdf/.gitignore
+++ /dev/null
diff --git a/lib/tv/doc/src/Makefile b/lib/tv/doc/src/Makefile
deleted file mode 100644
index 413eb8f634..0000000000
--- a/lib/tv/doc/src/Makefile
+++ /dev/null
@@ -1,138 +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%
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../../vsn.mk
-VSN=$(TV_VSN)
-APPLICATION=tv
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
-
-# ----------------------------------------------------
-# Target Specs
-# ----------------------------------------------------
-XML_APPLICATION_FILES = ref_man.xml
-XML_REF3_FILES = tv.xml
-
-XML_PART_FILES = \
-	part.xml \
-	part_notes.xml
-
-XML_CHAPTER_FILES = \
-	table_visualizer_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 = tv_start.gif \
-	tv_start_mnesia.gif \
-	tv_start_system.gif \
-	tv_start_system_unreadable.gif \
-	tv_start_pid_sorted.gif \
-	tv_start_other_node.gif \
-	tv_table_browser.gif \
-	tv_table_browser_updated.gif \
-	set_poll_int.gif \
-	tv_record_editor_mnesia.gif \
-	tv_search_window.gif \
-	tv_search_result.gif \
-	tv_row_marked.gif \
-	tv_row_marked_popup.gif \
-	info_window.gif \
-	tv_create_table.gif
-
-# ----------------------------------------------------
-
-HTML_FILES = $(XML_APPLICATION_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_PART_FILES:%.xml=$(HTMLDIR)/%.html)
-
-INFO_FILE = ../../info
-EXTRA_FILES = \
-	$(DEFAULT_GIF_FILES) \
-	$(DEFAULT_HTML_FILES) \
-	$(XML_REF3_FILES:%.xml=$(HTMLDIR)/%.html) \
-	$(XML_CHAPTER_FILES:%.xml=$(HTMLDIR)/%.html)
-
-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)
-
-
-clean clean_docs:
-	rm -rf $(HTMLDIR)/*
-	rm -f $(MAN3DIR)/*
-	rm -f $(TOP_PDF_FILE) $(TOP_PDF_FILE:%.pdf=%.fo)
-	rm -f errs core *~ 
-
-man: $(MAN3_FILES)
-
-gifs: $(GIF_FILES:%=$(HTMLDIR)/%)
-
-debug opt: 
-
-
-# ----------------------------------------------------
-# 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) $(MAN3_FILES) "$(RELEASE_PATH)/man/man3"
-
-release_spec:
-
diff --git a/lib/tv/doc/src/book.xml b/lib/tv/doc/src/book.xml
deleted file mode 100644
index d16165ab8f..0000000000
--- a/lib/tv/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>1997</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>Table Visualizer (TV)</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date></date>
-    <rev>2.0.3</rev>
-  </header>
-  <insidecover>
-  </insidecover>
-  <pagetext>Table Visualizer (TV)</pagetext>
-  <preamble>
-  </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/tv/doc/src/fascicules.xml b/lib/tv/doc/src/fascicules.xml
deleted file mode 100644
index 101e745722..0000000000
--- a/lib/tv/doc/src/fascicules.xml
+++ /dev/null
@@ -1,19 +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/tv/doc/src/info_window.gif b/lib/tv/doc/src/info_window.gif
deleted file mode 100644
index 7913fc4230..0000000000
--- a/lib/tv/doc/src/info_window.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/info_window.ps b/lib/tv/doc/src/info_window.ps
deleted file mode 100644
index b459523d0f..0000000000
--- a/lib/tv/doc/src/info_window.ps
+++ /dev/null
@@ -1,814 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./info_window.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:12:33 2001)
-%%BoundingBox: 0 60 377 354
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 60 377 354
-userdict begin
-%%BeginData:
-DisplayImage
-0 60
-377.000000 294.000000
-12
-590 460
-1
-0
-0
-8
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-828282
-000a01ff01ff0137000b0208040001ff01ff013700000208040000000208040002ff02ff
-0237000002080400000002080400020000ff00ff00340400020000000208040000000202
-04060200000004ff04ff0434020000000405020204000000020204000209000d02ff02ff
-022b00000202040000000202040002080000020d040002ea010102060101021d01020229
-010102e700000202040000000202040002080000020d040002d801070209010102060101
-020e0101020b0101022601000203010102e700000202040000000202040002080000020d
-040002db0101020c010102060101020e0101020b01010225010102ed0000020204000000
-0202040002080000020204060203040002db010102040103020301010200010102030101
-020201030207010102020101020001010202010402010103020201010200010102010101
-020001010201010102030103020101040201010102020103020301010200010102d70000
-02020400000004030208000002020400030400000203040002db01010203010102010101
-020201020200010102020101020101010201010102060101020201020200010102020101
-020201010201010102010101020001010201010202000102020001010201010102010101
-02010101020301010201010102010101020201020200010102d6000004030101020b0000
-02030400030200000204040002db01010207010102020101020101010202010102010101
-020101010206010102020101020101010202010102020101020101010201010202030101
-020101010201010102050101020101010203010102010101020101010202010102010101
-02d90103020b000002030400030200000204040002db0101020401040202010102010101
-020201010201010502060101020201010201010102020101020201010201010102010101
-020401010201010102010101020201040201010102030101020101010201010102020101
-0201010102d90103020b000002040400030000000205040002db01010203010102010101
-02020101020101010202010102010101020a010102020101020101010202010102020101
-020101010201010102040101020101010201010102010101020101010201010102030101
-0201010102010101020201010201010102d90103020b0000020404000300000002050400
-02db01010203010102010101020201010201010102020101020101010202010002060101
-020201010201010102020101020201010201010102010101020401010201010102010101
-020101010201010102010101020301010201010102010101020201010201010102d90103
-020b0000020500000206040002db01010204010202000101020101040203010102020103
-020701010202010102010101020201010203010302020101020401010201010102010101
-0202010202000101020101020201010102020103020301010201010102d90103020b0000
-020d040002ff02ff022d0103020b0000020d040002ff02ff022d0103020b0000020d0400
-02ff02ff022d0103020c040d02ff02ff022e010302ff02ff0249010302ff02ff02490103
-020200ff00ff00420400020201030202000004ff04ff04420202010302ff02ff02490103
-020200ff00ff004302020103020200ff00ff00420700020201030202000105ff05ff053f
-0701020201030202000105ff05ff053f0701020201030202000105ff05ff053f07010202
-01030202000105ff05ff053f0701020201030202000105ff05ff053f0701020201030202
-0001050b0604050406000503060205ff05ff052107010202010302020001050b0600050f
-060005ff05ff052107010202010302020001050b060005060602050506000503060205ff
-05ff051a07010202010302020001050b06000508060005050600050206000502060005ff
-05ff051907010202010302020001050b06030505060005050600050206000502060005ff
-05ff051907010202010302020001050b060005080600050506000502060405ff05ff0519
-07010202010302020001050b060005080600050506000502060005ff05ff051d07010202
-010302020001050b06000508060005050600050206000502060005ff05ff051907010202
-010302020001050b060005080600050506000503060205ff05ff051a0701020201030202
-000105ff05ff053f07010202010302020001050a060605ff05ff052d0701020201030202
-0001050a060605ff05ff052d0701020201030202000105ff05ff053f0701020201030202
-000105ff05ff053f0701020201030202000105ff05ff053f0701020201030202000107ff
-07ff0741020201030202000007ff07ff074202020103020205ff05ff0543020201030202
-05ff05ff054302020103020205ff05ff054302020103020205ff05ff0543020201030202
-05ff05ff054302020103020205ff05ff054302020103020205ff05ff0543020201030202
-05ff05ff054302020103020205ff05ff054302020103020205ff05ff0543020201030202
-05ff05ff0543020201030202050400770501007705010077050100770558020201030202
-050400760700050100760700050100760700050100760700055802020103020205040001
-057307010501000105730701050100010573070105010001057307010558020201030202
-050400010573070105010001057307010501000105730701050100010573070105580202
-010302020504000105730701050100010573070105010001057307010501000105730701
-055802020103020205040001057307010501000105730701050100010573070105010001
-057307010558020201030202050400010573070105010001057307010501000105730701
-050100010573070105580202010302020504000105730701050100010573070105010001
-057307010501000105730701055802020103020205040001057307010501000105730701
-050100010573070105010001057307010558020201030202050400010573070105010001
-057307010501000105730701050100010573070105580202010302020504000105730701
-050100010573070105010001057307010501000105730701055802020103020205040001
-057307010501000105730701050100010573070105010001057307010558020201030202
-05040001051d010405080100050601020510010405050100051f07010501000105080102
-0514010005110102050b010005050100050601000520070105010001052c010205050100
-053c070105010001052101020504010005480701055802020103020205040001051f0100
-050a0100050801000512010005070100051f070105010001050801000501010005250100
-05020100050a0100050501000528070105010001052b0100050201000542070105010001
-05200100050201000503010005480701055802020103020205040001051f010005040102
-05020100050001010505010005030102050b01000504010105000100051f070105010001
-050801000501010005030102050301020503010205030102050901000506010205020104
-05010104050201020502010005000101050301010500010005020102050b070105010001
-052b0100050601020502010405020102052e070105010001052001000505010405020102
-050201000500010105030102050301010500010005020102052407010558020201030202
-05040001051f010005030100050201000501010105010100050401000502010005020100
-050a01000503010005010101051f07010501000105080100050101000502010005020100
-050101000502010005040100050201000502010005090100050401000502010005030100
-0505010005060100050201010501010005010100050101010501010005020100050a0701
-05010001052c010005070100050601000501010005020100052d07010501000105210100
-050601000503010005020100050101010501010005010100050201000501010005010101
-050101000502010005230701055802020103020205040001051f01000507010005010100
-05020100050401000502010005020100050a01000503010005020100051f070105010001
-0508010305060100050101000508010005020100050e0101050201000502010005030100
-05050100050601000502010005020100050101000502010005010100050e070105010001
-052d010105050100050501000502010005020100052d0701050100010522010105040100
-050301000502010005010100050901000501010005020100050101000502010005230701
-055802020103020205040001051f01000504010305010100050201000504010005020104
-050a01000503010005020100051f07010501000105080100050201000502010305020102
-050501000502010005100100050101040503010005050100050601000502010005020100
-050101000502010005020102050b070105010001052f0100050401000504010005030104
-052d07010501000105240100050301000503010005020100050101000506010305010100
-050201000501010405230701055802020103020205040001051f01000503010005020100
-05010100050201000504010005020100050e01000503010005020100051f070105010001
-05080100050201000501010005020100050501000504010005020100050c010005020100
-050101000507010005050100050601000502010005020100050101000502010005050100
-050a070105010001052b0100050201000504010005030100050401000531070105010001
-052001000502010005030100050301000502010005010100050501000502010005010100
-050201000501010005270701055802020103020205040001051f01000503010005020100
-0501010105010100050401000502010005020100050a01000503010005010101051f0701
-050100010508010005020100050101000502010005010100050201000504010005020100
-050201000508010005020100050101000502010005030100050501000506010005020100
-0502010005010100050101010501010005020100050a070105010001052b010005020100
-05040100050201000505010005020100052d070105010001052001000502010005030100
-050301000502010005010100050501000502010005010100050101010501010005020100
-05230701055802020103020205040001051f010005040103050101000500010105050100
-05030102050901040502010105000100051f070105010001050801030503010305020102
-0505010005030102050a0102050301020505010105040101050401000502010005020100
-050201010500010005020102050b070105010001052c0102050501000502010405020102
-052e07010501000105210102050501010502010205020100050601030502010105000100
-050201020524070105580202010302020504000105730701050100010560010005110701
-05010001057307010501000105470100052a070105580202010302020504000105730701
-05010001055c010005020100051107010501000105730701050100010543010005020100
-052a07010558020201030202050400010573070105010001055d01020512070105010001
-057307010501000105440102052b07010558020201030202050400010573070105010001
-057307010501000105730701050100010573070105580202010302020504000105730701
-050100010573070105010001057307010501000105730701055802020103020205040001
-057307010501000105730701050100010573070105010001057307010558020201030202
-050400010573070105010001057307010501000105730701050100010573070105580202
-010302020504000105730701050100010573070105010001057307010501000105730701
-055802020103020205040001057307010501000105730701050100010573070105010001
-05730701055802020103020205040001057400ff00c20504020201030202050400010574
-00ff00c1070005040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105d101ff0158050a0701
-05040202010302020504000105d1010000ff00560100050a070105040202010302020504
-000105d1010000ff00560100050a070105040202010302020504000105d1010000ff0056
-0100050a070105040202010302020504000105d1010000ff00560100050a070105040202
-010302020504000105d1010000ff00560100050a070105040202010302020504000105d1
-010000ff00560100050a0701050402020103020205040001050a01040508010005060102
-05100104059701000010010000ff00440100050a0701050402020103020205040001050c
-0100050a01000508010005120100059901000010010000ff00440100050a070105040202
-0103020205040001050c01000504010205020100050001010505010005030102050b0100
-050301000502010005010100050001010503010205040101057c01000008010200020104
-0002010200ff003c0100050a0701050402020103020205040001050c0100050301000502
-01000501010105010100050401000502010005020100050a010005030100050201000501
-010105010100050101000502010005030101057c01000007010000020100000301000003
-01000002010000ff003b0100050a0701050402020103020205040001050c010005070100
-0501010005020100050401000502010005020100050a0100050401000501010005010100
-050201000501010005020100058201000007010000020100000301000003010000ff003f
-0100050a0701050402020103020205040001050c01000504010305010100050201000504
-010005020104050a01000504010005010100050101000502010005010104058201000007
-0104000301000004010200ff003c0100050a0701050402020103020205040001050c0100
-050301000502010005010100050201000504010005020100050e01000505010005000100
-0501010005020100050101000586010000070100000701000007010000ff003b0100050a
-0701050402020103020205040001050c0100050301000502010005010101050101000504
-01000502010005020100050a010005050101050201010501010005010100050201000503
-0101057c0100000701000002010000030100000301000002010000ff003b0100050a0701
-050402020103020205040001050c01000504010305010100050001010505010005030102
-050b01000506010005020100050001010503010205040101057c01000008010200050101
-0002010200ff003c0100050a0701050402020103020205040001053e010005020100058d
-010000ff00560100050a0701050402020103020205040001053b01000500010005030100
-058d010000ff00560100050a0701050402020103020205040001053c010005040100058d
-010000ff00560100050a070105040202010302020504000105d1010000ff00560100050a
-070105040202010302020504000105d1010000ff00560100050a07010504020201030202
-0504000105d1010000ff00560100050a070105040202010302020504000105d1010000ff
-00560100050a070105040202010302020504000105d101ff0158050a0701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105d101ff0158050a070105040202010302020504000105d10100
-00ff00560100050a070105040202010302020504000105d1010000ff00560100050a0701
-05040202010302020504000105d1010000ff00560100050a070105040202010302020504
-000105d1010000ff00560100050a070105040202010302020504000105d10100000a0101
-00a2010100a40100050a070105040202010302020504000105d101000009010000700100
-002a01000008010000a30100050a0701050402020103020205040001050a010405080100
-050601020510010405050100059001000009010000040102001901000006010000190100
-000a0100000601020013010000040101000a010200040100000c01010002010000070100
-00a30100050a0701050402020103020205040001050c0100050a01000508010005120100
-050701000590010000090100000601000019010000210100000a01000008010000120100
-0004010000010100000801000002010000020101000b0100000101000002010000060100
-00a30100050a0701050402020103020205040001050c0100050401020502010005000101
-0505010005030102050b0100050401010500010005030101058a01000009010000060100
-000301020003010200030102000201040002010200030102000201000000010100090104
-0002010200020100000001010005010000030102000a01000005010000010100000c0100
-0001010000000100000b010000010100000301000005010000a30100050a070105040202
-0103020205040001050c0100050301000502010005010101050101000504010005020100
-05020100050a0100050301000501010105030101058a0100000901000006010000020100
-000201000001010000020100000101000002010000030100000601000002010000020100
-0001010100010100000a0100000301000002010000010101000101000004010000020100
-00020100000801000006010000010100000c010000030100000b01000001010000040100
-0004010000a30100050a0701050402020103020205040001050c01000507010005010100
-05020100050401000502010005020100050a010005030100050201000590010000070101
-000701000002010000020100000101000009010000030100000601000002010000020100
-0001010000020100000a0100000701000001010000020100000401000002010000020100
-000701000007010000010100000a010100040100000b0100000101000005010000040101
-00a10100050a0701050402020103020205040001050c0100050401030501010005020100
-0504010005020104050a0100050301000502010005900100000901000006010000020100
-000201000001010000060103000301000006010000020100000201000001010000020100
-000a01000004010300010100000201000004010000020104000801000006010000010100
-000c010000030100000b010000010100000401000004010000a30100050a070105040202
-0103020205040001050c0100050301000502010005010100050201000504010005020100
-050e01000503010005020100059001000009010000060100000201000002010000010100
-0005010000020100000301000006010000020100000201000001010000020100000a0100
-000301000002010000010100000201000004010000020100000d01000005010000010100
-000c010000030100000b010000010100000301000005010000a30100050a070105040202
-0103020205040001050c0100050301000502010005010101050101000504010005020100
-05020100050a0100050301000501010105030101058a0100000901000006010000020100
-000201000001010000020100000101000002010000030100000601000002010000020100
-0001010000020100000a0100000301000002010000010101000101000004010000020100
-000201000003010100040100000401000001010000030101000201000002010000030100
-000501010003010000010100000201000006010000a30100050a07010504020201030202
-05040001050c010005040103050101000500010105050100050301020509010405020101
-0500010005030101058a0100000901000006010000030102000301020003010300040101
-00040100000301020002010000020100000b010100020103000101000000010100050100
-000301020004010100050100000401010004010100030102000201040003010100040101
-000201000007010000a30100050a070105040202010302020504000105d1010000090100
-003a01050027010000060100002a01000008010000a30100050a07010504020201030202
-0504000105d10100000a010100640101003b010100a40100050a07010504020201030202
-0504000105d1010000ff00560100050a070105040202010302020504000105d1010000ff
-00560100050a070105040202010302020504000105d1010000ff00560100050a07010504
-0202010302020504000105d1010000ff00560100050a0701050402020103020205040001
-05d1010000ff00560100050a070105040202010302020504000105d101ff0158050a0701
-05040202010302020504000105ff05ff0535070105040202010302020504000105ff05ff
-0535070105040202010302020504000105ff05ff05350701050402020103020205040001
-05ff05ff0535070105040202010302020504000105ff05ff053507010504020201030202
-0504000105ff05ff0535070105040202010302020504000105ff05ff0535070105040202
-010302020504000105ff05ff0535070105040202010302020504000105ff05ff05350701
-05040202010302020504000105ff05ff0535070105040202010302020504000105ff05ff
-0535070105040202010302020504000105ff05ff05350701050402020103020205040001
-05ff05ff0535070105040202010302020504000105ff05ff053507010504020201030202
-0504000105ff05ff0535070105040202010302020504000105ff05ff0535070105040202
-010302020504000105ff05ff0535070105040202010302020504000105ff05ff05350701
-05040202010302020504000105ff05ff0535070105040202010302020504000105ff05ff
-0535070105040202010302020504000105d101ff0158050a070105040202010302020504
-000105d1010000ff00560100050a070105040202010302020504000105d1010000ff0056
-0100050a070105040202010302020504000105d1010000ff00560100050a070105040202
-010302020504000105d1010000ff00560100050a070105040202010302020504000105d1
-010000ff00560100050a070105040202010302020504000105d1010000ff00560100050a
-0701050402020103020205040001050a0104050801000506010205100100050201000597
-010000080102001901000006010000190100000a01000006010200f60100050a07010504
-02020103020205040001050c0100050a010005080100051001010501010005970100000a
-01000019010000210100000a01000008010000f60100050a070105040202010302020504
-0001050c0100050401020502010005000101050501000503010205090101050101000502
-010205020101050001000503010205040101057c0100000a010000030102000301020003
-010200020104000201020003010200020100000001010009010400020102000201000000
-0101000501000003010200ef0100050a0701050402020103020205040001050c01000503
-010005020100050101010501010005040100050201000502010005080100050001000500
-01000501010005020100050101000500010005000100050101000502010005030101057c
-0100000a0100000201000002010000010100000201000001010000020100000301000006
-010000020100000201000001010100010100000a01000003010000020100000101010001
-010000040100000201000002010000ee0100050a0701050402020103020205040001050c
-010005070100050101000502010005040100050201000502010005080100050001000500
-010005050100050101000500010005000100050101000502010005820100000a01000002
-010000020100000101000009010000030100000601000002010000020100000101000002
-0100000a010000070100000101000002010000040100000201000002010000ee0100050a
-0701050402020103020205040001050c0100050401030501010005020100050401000502
-01040508010005010101050201030501010005000100050001000501010405820100000a
-010000020100000201000001010000060103000301000006010000020100000201000001
-010000020100000a0100000401030001010000020100000401000002010400ee0100050a
-0701050402020103020205040001050c0100050301000502010005010100050201000504
-010005020100050c01000501010105010100050201000501010005000100050001000501
-010005860100000a01000002010000020100000101000005010000020100000301000006
-010000020100000201000001010000020100000a01000003010000020100000101000002
-0100000401000002010000f20100050a0701050402020103020205040001050c01000503
-010005020100050101010501010005040100050201000502010005080100050201000501
-010005020100050101000500010005000100050101000502010005030101057c0100000a
-010000020100000201000001010000020100000101000002010000030100000601000002
-0100000201000001010000020100000a0100000301000002010000010101000101000004
-0100000201000002010000ee0100050a0701050402020103020205040001050c01000504
-010305010100050001010505010005030102050901000502010005020103050101000500
-0100050001000502010205040101057c0100000a01000003010200030102000301030004
-010100040100000301020002010000020100000b01010002010300010100000001010005
-01000003010200ef0100050a070105040202010302020504000105d10100003e010500ff
-00110100050a070105040202010302020504000105d1010000ff00560100050a07010504
-0202010302020504000105d1010000ff00560100050a0701050402020103020205040001
-05d1010000ff00560100050a070105040202010302020504000105d1010000ff00560100
-050a070105040202010302020504000105d1010000ff00560100050a0701050402020103
-02020504000105d1010000ff00560100050a070105040202010302020504000105d101ff
-0158050a070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105d101ff0158050a070105040202
-010302020504000105d1010000ff00560100050a070105040202010302020504000105d1
-010000ff00560100050a070105040202010302020504000105d1010000ff00560100050a
-070105040202010302020504000105d1010000ff00560100050a07010504020201030202
-0504000105d1010000ff00560100050a070105040202010302020504000105d1010000ff
-00560100050a0701050402020103020205040001050a0104050801000506010205100100
-05020100051d010305130100050b0100051c0100053501000009010000ff004b0100050a
-0701050402020103020205040001050c0100050a0100050801000510010105010100051d
-010005020100051f0100051c0100053501000009010000ff004b0100050a070105040202
-0103020205040001050c0100050401020502010005000101050501000503010205090101
-050101000502010205020101050001000503010205090100050201000502010205030101
-050001000502010205030102050201040502010205020100050001010503010205030101
-0500010005030101052f0100000701040001010000000101000201000002010000020102
-00ff00350100050a0701050402020103020205040001050c010005030100050201000501
-010105010100050401000502010005020100050801000500010005000100050101000502
-010005010100050001000500010005010100050201000508010005020100050101000502
-010005010100050101010504010005020100050201000503010005030100050201000501
-0101050101000501010005020100050101000501010105030101052f0100000901000003
-0101000101000001010000020100000101000002010000ff00340100050a070105040202
-0103020205040001050c0100050701000501010005020100050401000502010005020100
-050801000500010005000100050501000501010005000100050001000501010005020100
-050801030502010005020100050101000502010005040100050201000507010005030100
-050201000501010005050100050201000501010005020100053501000009010000030100
-0005010000020100000101000002010000ff00340100050a070105040202010302020504
-0001050c0100050401030501010005020100050401000502010405080100050101010502
-010305010100050001000500010005010104050801000501010005020104050101000502
-010005040100050301020504010005030104050101000505010405010100050201000535
-0100000901000003010000050100000201000001010400ff00340100050a070105040202
-0103020205040001050c0100050301000502010005010100050201000504010005020100
-050c010005010101050101000502010005010100050001000500010005010100050c0100
-050201000501010005050100050201000504010005060100050301000503010005050100
-050501000505010005020100053501000009010000030100000501000002010000010100
-00ff00380100050a0701050402020103020205040001050c010005030100050201000501
-010105010100050401000502010005020100050801000502010005010100050201000501
-010005000100050001000501010005020100050801000502010005010100050201000501
-010005010101050401000502010005020100050301000503010005020100050101000505
-010005020100050101000501010105030101052f01000009010000030100000501000001
-0101000101000002010000ff00340100050a0701050402020103020205040001050c0100
-050401030501010005000101050501000503010205090100050201000502010305010100
-050001000500010005020102050901000502010005020102050301010500010005040100
-0503010205050101050201020502010005060102050301010500010005030101052f0100
-000a01010001010000060101000001000002010200ff00350100050a0701050402020103
-020205040001056901000566010000ff00560100050a0701050402020103020205040001
-05650100050201000566010000ff00560100050a07010504020201030202050400010566
-01020567010000ff00560100050a070105040202010302020504000105d1010000ff0056
-0100050a070105040202010302020504000105d1010000ff00560100050a070105040202
-010302020504000105d1010000ff00560100050a070105040202010302020504000105d1
-010000ff00560100050a070105040202010302020504000105d101ff0158050a07010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105d101ff0158050a0701050402020103020205040001
-05d1010000ff00560100050a070105040202010302020504000105d1010000ff00560100
-050a070105040202010302020504000105d1010000ff00560100050a0701050402020103
-02020504000105d1010000ff00560100050a070105040202010302020504000105d10100
-00ff00560100050a070105040202010302020504000105d10100000b0100002a010000ff
-001d0100050a0701050402020103020205040001050a0103053401020513010005190100
-0503010005130104050801000506010205280100000a010000040101000a010200040100
-000c01010002010000ff001c0100050a0701050402020103020205040001050a01000502
-01000532010005020100052d01000503010005150100050a010005080100052801000009
-01000004010000010100000801000002010000020101000b0100000101000002010000ff
-001b0100050a0701050402020103020205040001050a0100050201000501010005000101
-050301020503010205030102050301020503010205090100050201000501010005020100
-050101000500010105030102050201000500010105030101050001000508010405010100
-0500010105030102050b0100050401020502010005000101050501000503010205040101
-051a0100000801000005010000010100000c01000001010000000100000b010000010100
-0003010000ff001a0100050a0701050402020103020205040001050a0100050201000501
-010105010100050101000502010005010100050201000501010005020100050101000502
-010005010100050201000508010005020100050101000502010005010101050101000504
-010005020101050101000501010005010101050a01000503010105010100050101000502
-0100050a0100050301000502010005010101050101000504010005020100050201000503
-0101051a0100000701000006010000010100000c010000030100000b0100000101000004
-010000ff00190100050a0701050402020103020205040001050a01030502010005050100
-050201000501010005050100050201000501010005050100050c01000502010005010100
-050001000500010005010100050201000504010005020100050201000501010005020100
-050a010005030100050201000501010005020100050a0100050701000501010005020100
-05040100050201000502010005200100000601000007010000010100000a010100040100
-000b0100000101000005010000ff00180100050a0701050402020103020205040001050a
-010005050100050501000502010005010100050501040502010205030102050901000502
-010005010100050001000500010005010100050201000504010005020100050201000501
-010005020100050a0100050301000502010005010104050a010005040103050101000502
-0100050401000502010405200100000701000006010000010100000c010000030100000b
-0100000101000004010000ff00190100050a0701050402020103020205040001050a0100
-050501000505010005020100050101000505010005090100050501000508010005020100
-050101000500010005000100050101000502010005040100050201000502010005010100
-05020100050a0100050301000502010005010100050e0100050301000502010005010100
-05020100050401000502010005240100000801000005010000010100000c010000030100
-000b0100000101000003010000ff001a0100050a0701050402020103020205040001050a
-010005050100050501000502010005010100050201000501010005020100050101000502
-010005010100050201000508010005020100050101000500010005000100050101000502
-01000504010005020100050201000501010005010101050a010005030100050201000501
-010005020100050a01000503010005020100050101010501010005040100050201000502
-010005030101051a01000009010000040100000101000003010100020100000201000003
-01000005010100030100000101000002010000ff001b0100050a07010504020201030202
-05040001050a0100050501000506010205030102050301020503010205030102050a0102
-050301000500010005020100050201000504010005020100050201000502010105000100
-050b0101050101000502010005020102050b010005040103050101000500010105050100
-0503010205040101051a0100000a01000004010100040101000301020002010400030101
-000401010002010000ff001c0100050a0701050402020103020205040001056901000566
-0100000b0100002a010000ff001d0100050a070105040202010302020504000105650100
-050201000566010000ff00560100050a0701050402020103020205040001056601020567
-010000ff00560100050a070105040202010302020504000105d1010000ff00560100050a
-070105040202010302020504000105d1010000ff00560100050a07010504020201030202
-0504000105d1010000ff00560100050a070105040202010302020504000105d1010000ff
-00560100050a070105040202010302020504000105d101ff0158050a0701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105d101ff0158050a070105040202010302020504000105d10100
-00ff00560100050a070105040202010302020504000105d1010000ff00560100050a0701
-05040202010302020504000105d1010000ff00560100050a070105040202010302020504
-000105d1010000ff00560100050a070105040202010302020504000105d1010000ff0056
-0100050a070105040202010302020504000105d1010000ff00560100050a070105040202
-0103020205040001050a0100050201000527010105090102051301000517010305590100
-00ff00560100050a0701050402020103020205040001050a01010501010005260100050a
-010005020100052b0100050201000558010000ff00560100050a07010504020201030202
-05040001050a01010501010005020102050201010500010005030102050a010205040100
-050a01000502010005010100050201000501010005000101050301020502010005000101
-050301010500010005080100050201000501010005000101050301020503010205030102
-0503010205030102050401010528010000ff00560100050a070105040202010302020504
-0001050a0100050001000500010005010100050201000501010005000100050001000501
-010005020100050801000502010005010104050801000502010005010100050201000501
-010105010100050401000502010105010100050101000501010105080100050201000501
-010105010100050101000502010005010100050201000501010005020100050101000502
-01000501010005020100050301010528010000ff00560100050a07010504020201030202
-05040001050a010005000100050001000505010005010100050001000500010005010100
-05020100050801000502010005030100050a010005020100050101000500010005000100
-050101000502010005040100050201000502010005010100050201000508010305020100
-050501000502010005010100050501000502010005010100050501000532010000ff0056
-0100050a0701050402020103020205040001050a01000501010105020103050101000500
-01000500010005010104050801000502010005030100050a010005020100050101000500
-010005000100050101000502010005040100050201000502010005010100050201000508
-010005050100050501000502010005010100050501040502010205030102052f010000ff
-00560100050a0701050402020103020205040001050a0100050101010501010005020100
-05010100050001000500010005010100050c01000502010005030100050a010005020100
-050101000500010005000100050101000502010005040100050201000502010005010100
-050201000508010005050100050501000502010005010100050501000509010005050100
-052e010000ff00560100050a0701050402020103020205040001050a0100050201000501
-010005020100050101000500010005000100050101000502010005080100050201000503
-0100050a0100050201000501010005000100050001000501010005020100050401000502
-010005020100050101000501010105080100050501000505010005020100050101000502
-0100050101000502010005010100050201000501010005020100050301010528010000ff
-00560100050a0701050402020103020205040001050a0100050201000502010305010100
-050001000500010005020102050a010205040100050b0102050301000500010005020100
-050201000504010005020100050201000502010105000100050801000505010005060102
-05030102050301020503010205030102050401010528010000ff00560100050a07010504
-02020103020205040001056901000566010000ff00560100050a07010504020201030202
-0504000105650100050201000566010000ff00560100050a070105040202010302020504
-0001056601020567010000ff00560100050a070105040202010302020504000105d10100
-00ff00560100050a070105040202010302020504000105d1010000ff00560100050a0701
-05040202010302020504000105d1010000ff00560100050a070105040202010302020504
-000105d1010000ff00560100050a070105040202010302020504000105d101ff0158050a
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000105ff05ff0535070105040202010302020504000105ff
-05ff0535070105040202010302020504000105ff05ff0535070105040202010302020504
-000105ff05ff0535070105040202010302020504000105ff05ff05350701050402020103
-02020504000105ff05ff0535070105040202010302020504000105ff05ff053507010504
-0202010302020504000105ff05ff0535070105040202010302020504000105ff05ff0535
-070105040202010302020504000107ff07ff073705040202010100040504000007ff07ff
-0738050400050202040005ff05ff054300000202040000000202040005ff05ff05430000
-0202040000000202040005ff05ff054300000202040000000202040005ff05ff05430000
-0202040000000202040005ff05ff0543000002020400000002020400000502ff02ff0237
-00060202040000000208040002ff02ff023700000208040000000208040002ff02ff0237
-00000208040000000208040001ff01ff01370000020804000000040901ff01ff01370000
-0409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 60 377 354
-%%EOF
diff --git a/lib/tv/doc/src/note.gif b/lib/tv/doc/src/note.gif
deleted file mode 100644
index 6fffe30419..0000000000
--- a/lib/tv/doc/src/note.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/notes.xml b/lib/tv/doc/src/notes.xml
deleted file mode 100644
index c95171568f..0000000000
--- a/lib/tv/doc/src/notes.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>2004</year><year>2013</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>TV Release Notes</title>
-    <prepared>otp_appnotes</prepared>
-    <docno>nil</docno>
-    <date>nil</date>
-    <rev>nil</rev>
-    <file>notes.xml</file>
-  </header>
-  <p>This document describes the changes made to the TV application.</p>
-
-<section><title>TV 2.1.4.10</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Misc build updates</p>
-          <p>
-	    Own Id: OTP-10784</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TV 2.1.4.9</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-	    <p>The GS applications is now deprecated and will be
-	    removed in the R16 release. The following GS-based
-	    applications have been superseded by the Observer
-	    application and will removed in R16: Appmon, Pman,
-	    Tv.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-9907</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TV 2.1.4.8</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Eliminate use of deprecated regexp module</p>
-          <p>
-	    Own Id: OTP-9810</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TV 2.1.4.7</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    tv: Allow table viewer to display refs, ports and small
-	    binaries</p>
-          <p>
-	    Table viewer displayed #Port, #Ref, or #Bin as place
-	    holders for their respective object types in ets and
-	    mnesia tables. This can make table viewer difficult to
-	    use when viewing tables containing those data types. It
-	    doesn't make sense to render large binaries so #Bin will
-	    still be used for binaries that exceed 100 bytes. (Thanks
-	    to Blaine whittle)</p>
-          <p>
-	    Own Id: OTP-9153</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TV 2.1.4.6</title>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <list>
-        <item>
-          <p>
-	    With some window managers (e.g. stumpwm), <c>tv</c> would
-	    constantly restart while trying to open a table. (Thanks
-	    to Dmitriy Budashny.)</p>
-          <p>
-	    Own Id: OTP-8751</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TV 2.1.4.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Warnings due to new autoimported BIFs removed</p>
-          <p>
-	    Own Id: OTP-8674 Aux Id: OTP-8579 </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TV 2.1.4.4</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>TV 2.1.4.3</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-           Updated the application with new tags for automatic updates 
-           of copyright notices.
-          </p>
-          <p>
-	    Own Id: OTP-7851
-          </p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-<section><title>TV 2.1.4.2</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    Minor updates.</p>
-          <p>
-	    Own Id: OTP-7261</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
-  <section>
-    <title>TV 2.1.4.1</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Minor Makefile changes.</p>
-          <p>Own Id: OTP-6689</p>
-        </item>
-        <item>
-          <p>Obsolete guard tests (such as list()) have been replaced
-            with the modern guard tests (such as is_list()).</p>
-          <p>Own Id: OTP-6728</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>TV 2.1.4</title>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Removed some dead code from
-            <c>tv_pg_gridfcns:mark_cell_and_notify/4</c>
-            and <c>tv_nodewin:handle_error/1</c>.</p>
-          <p>Own Id: OTP-6455</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>TV 2.1.3</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>A compiler warning has been fixed.</p>
-          <p>Own Id: OTP-6016</p>
-        </item>
-      </list>
-    </section>
-
-    <section>
-      <title>Improvements and New Features</title>
-      <list type="bulleted">
-        <item>
-          <p>Notification windows are now centered over a parent
-            window.</p>
-          <p>Own Id: OTP-6014 Aux Id: OTP-5987</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>TV 2.1.2</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>Some dead code reported by Dialyzer was eliminated. </p>
-          <p>A
-            bug in 'dbg' when tracing to wrap trace files has been
-            corrected. It failed to delete any already existing wrap
-            trace files with the same names when starting a new wrap
-            trace.</p>
-          <p>Own Id: OTP-5329</p>
-        </item>
-        <item>
-          <p>The graphic applications now search for HTML
-            documentation in the correct place.</p>
-          <p>Own Id: OTP-5381</p>
-        </item>
-      </list>
-    </section>
-  </section>
-
-  <section>
-    <title>TV 2.1.1</title>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-      <list type="bulleted">
-        <item>
-          <p>TV no longer crashes on Mac OS X. (Thanks to Sean Hinde.)</p>
-          <p>Own Id: OTP-5219</p>
-        </item>
-      </list>
-    </section>
-  </section>
-</chapter>
-
-
diff --git a/lib/tv/doc/src/part.xml b/lib/tv/doc/src/part.xml
deleted file mode 100644
index e6c94fa0b8..0000000000
--- a/lib/tv/doc/src/part.xml
+++ /dev/null
@@ -1,40 +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>1997</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>TV User's Guide</title>
-    <prepared>Fredrik Gustafson</prepared>
-    <docno></docno>
-    <date>1997-06-04</date>
-    <rev>1.0.1</rev>
-    <file>part.xml</file>
-  </header>
-  <description>
-    <p>The Table Visualizer application, <em>TV</em>, enables the user
-      to examine ETS and Mnesia tables. Once a certain table has been
-      opened in the tool, the content may be viewed in various levels
-      of detail.</p>
-  </description>
-  <xi:include href="table_visualizer_chapter.xml"/>
-</part>
-
-
diff --git a/lib/tv/doc/src/part_notes.xml b/lib/tv/doc/src/part_notes.xml
deleted file mode 100644
index 7a5b359592..0000000000
--- a/lib/tv/doc/src/part_notes.xml
+++ /dev/null
@@ -1,40 +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>2004</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>TV Release Notes</title>
-    <prepared></prepared>
-    <docno></docno>
-    <date>2004-09-07</date>
-    <rev>1.0</rev>
-    <file>part_notes.sgml</file>
-  </header>
-  <description>
-    <p>The Table Visualizer application, <em>TV</em>, enables the user
-      to examine ETS and Mnesia tables. Once a certain table has been
-      opened in the tool, the content may be viewed in various levels
-      of detail.</p>
-  </description>
-  <xi:include href="notes.xml"/>
-</part>
-
-
diff --git a/lib/tv/doc/src/ref_man.xml b/lib/tv/doc/src/ref_man.xml
deleted file mode 100644
index 56e0798cf1..0000000000
--- a/lib/tv/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>1997</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>TV Reference Manual</title>
-    <prepared>Fredrik Gustafson</prepared>
-    <docno></docno>
-    <date>1997-06-04</date>
-    <rev>1.0.1</rev>
-    <file>application.sgml</file>
-  </header>
-  <description>
-    <p>The TV application  enables the user
-      to examine ETS and Mnesia tables. Once a certain table has been
-      opened in the tool, the content may be viewed in various levels
-      of detail.</p>
-  </description>
-  <xi:include href="tv.xml"/>
-</application>
-
-
diff --git a/lib/tv/doc/src/set_poll_int.gif b/lib/tv/doc/src/set_poll_int.gif
deleted file mode 100644
index c09c84322f..0000000000
--- a/lib/tv/doc/src/set_poll_int.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/set_poll_int.ps b/lib/tv/doc/src/set_poll_int.ps
deleted file mode 100644
index cceb30486f..0000000000
--- a/lib/tv/doc/src/set_poll_int.ps
+++ /dev/null
@@ -1,483 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./set_poll_int.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:08:39 2001)
-%%BoundingBox: 0 17 200 154
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 17 200 154
-userdict begin
-%%BeginData:
-DisplayImage
-0 17
-200.000000 137.000000
-12
-315 215
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-828282
-aa2455
-c3c3c3
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000a01ff0124000b0208040001ff012400000208040000000208040002ff022400000208
-0400000002080400020000ff0021040002000000020804000000020204060200000004ff
-0421020000000405020204000000020204000209000d02ff021800000202040000000202
-040002080000020d04000281010102020101023701010254000002020400000002020400
-02080000020d040002580103020b010002070104020a01010202010102060101020b0100
-02210101025400000202040000000202040002080000020d040002570101020101010209
-01010207010102010101020901010202010102060101020a010102210101025400000202
-040000000202040002080000020204060203040002570101020601030201010402050101
-020101010201010302030101020201010206010102020101020001010201010402010103
-020201010200010102000101020101010202010302030101025400000202040000000403
-020800000202040003040000020304000257010202040101020101010201010102070101
-020101010200010102010101020201010202010102060101020201020200010102010101
-020201010201010102010101020001010200010102010101020101010201010102020101
-0254000004030101020b0000020304000302000002040400025801030202010102010101
-020101010207010102010100020101010201010102020101020201010206010102020101
-020101010201010102020101020101010201010202020101020101010205010102020101
-02570103020b0000020304000302000002040400025a0102020101050201010102070103
-020201010201010102020101020201010206010102020101020101010201010102020105
-020101010204010102000100020301040202010102570103020b00000204040003000000
-02050400025b010102010101020501010207010102040101020101010202010102020101
-020601010202010102010101020101010202010102050101020401010200010002020101
-020101010202010102570103020b00000204040003000000020504000257010102010101
-020101010202010002010101020701010204010102010101020201010202010102060101
-020201010201010102010101020201010202010002010101020501010203010102010101
-0202010102570103020b0000020500000206040002580103020301030203010202050101
-020501030203010102020101020601010202010102010101020201020201010302020101
-0205010102040102020001010201010102570103020b0000020d040002ff021a0103020b
-0000020d040002ff021a0103020b0000020d040002ff021a0103020c040d02ff021b0103
-02ff0236010302ff02360103020200ff002f0400020201030202000004ff042f02020103
-02ff02360103020205ff053002020103020205ff053002020103020205ff053002020103
-020205ff053002020103020205ff053002020103020205ff053002020103020205ff0530
-02020103020205ff053002020103020205ff053002020103020205ff0530020201030202
-05e5003b050e02020103020205e5003a0600050e02020103020205e5000105370601050e
-02020103020205e5000105370601050e02020103020205e5000105370601050e02020103
-020205e5000105370601050e02020103020205e5000105370601050e02020103020205e5
-000105370601050e02020103020205e5000105370601050e020201030202051b000105c7
-000105150102050201000502010005160601050e020201030202051a0003050b01000503
-0100051e010205090103050a010205030102050501000568000105140100050201000501
-01000501010005170601050e02020103020205190005050a010005030100052001000509
-010005020100050b010005050100056f0001051401000502010005010100050001000518
-0601050e0202010302020518000205010002050901010501010105020102050201000500
-010105020100050201000502010205050100050901000502010005020102050501000505
-010005030102050201000500010105030101050001000559000105140100050201000501
-010105190601050e02020103020205170002050300020508010105010101050101000502
-010005010101050101000501010005020100050101000502010005040100050901000502
-010005010100050201000504010005050100050501000502010105010100050101000501
-0101055900010514010005020100050101000500010005180601050e0202010302020516
-000205050002050701000500010105000100050501000501010005020100050101000502
-010005050100050401000509010305020100050201000504010005050100050501000502
-010005020100050101000502010005590001051401000502010005010100050101000517
-0601050e0202010302020515060205070602050601000500010105000100050201030501
-010005020100050101000502010005020103050401000509010005050100050201000504
-010005050100050501000502010005020100050101000502010005590001051401000502
-0100050101000501010005170601050e0202010302020516060205050602050701000503
-010005010100050201000501010005020100050101000502010005010100050201000504
-010005090100050501000502010005040100050501000505010005020100050201000501
-010005020100055900010514010005020100050101000502010005160601050e02020103
-020205170602050306020508010005030100050101000502010005010100050201000501
-010005010101050101000502010005040100050901000505010005020100050401000505
-010005050100050201000502010005010100050101010559000105150102050201000502
-010005160601050e02020103020205180602050106020509010005030100050201030501
-010005020100050201010500010005020103050401000509010005060102050501000505
-010005050100050201000502010005020101050001000559000105370601050e02020103
-020205190605056a01000559000105370601050e020201030202051a0603056701000502
-01000559000105370601050e020201030202051b060105690102055a000105370601050e
-02020103020205e5000105370601050e02020103020205e5000105370601050e02020103
-020205e5000105370601050e02020103020205e5000105370601050e02020103020205e5
-000105370601050e02020103020205e5000105370601050e02020103020205e500010639
-050e02020103020205e50000063a050e02020103020205ff053002020103020205ff0530
-02020103020205ff053002020103020205ff053002020103020205ff0530020201030202
-05ff053002020103020205ff053002020103020205ff053002020103020205ff05300202
-0103020205ff053002020103020205ff053002020103020205ff053002020103020205ff
-053002020103020205ff053002020103020205ff053002020103020205ff053002020103
-020205ff053002020103020205ff053002020103020205ff053002020103020205ff0530
-02020103020205e5003b050e02020103020205e5003a0600050e02020103020205e50001
-05370601050e02020103020205e5000105370601050e02020103020205e5000105370601
-050e02020103020205e5000105370601050e02020103020205e5000105370601050e0202
-0103020205e5000105370601050e02020103020205e5000105370601050e020201030202
-051a060105c8000105070102051f010205090601050e02020103020205190603050e0100
-050c0100051a01000506010005100103050a010205030102050501000554000105060100
-050201000520010005090601050e02020103020205180605050d0100050c0100051a0100
-0518010005020100050b010005050100055b000105060100050201000502010205020100
-0500010105030102050301020505010005090601050e0202010302020517060207010602
-050b01000500010005020100050201000501010405020102050201010500010005030102
-050201040502010205030102050901000502010005020102050501000505010005030102
-050201000500010105030101050001000545000105060100050501000502010005010101
-05010100050101000502010005010100050201000504010005090601050e020201030202
-0516060207030602050a0100050001000502010005020100050301000503010005020100
-050101000500010005000100050101000502010005030100050601000502010005020100
-050801000502010005010100050201000504010005050100050501000502010105010100
-050101000501010105450001050601000509010005010100050201000501010005050100
-050201000504010005090601050e02020103020205150602070506020509010005000100
-050201000502010005030100050301000502010005010100050001000500010005050100
-050301000506010005020100050c01030502010005020100050401000505010005050100
-050201000502010005010100050201000545000105060100050601030501010005020100
-05010100050501040504010005090601050e020201030202051400020707000205070100
-050201000501010005020100050301000503010005020100050101000500010005000100
-05020103050301000506010005020100050c010005050100050201000504010005050100
-050501000502010005020100050101000502010005450001050601000502010005010100
-05020100050101000502010005010100050501000508010005090601050e020201030202
-051500020705000205080104050101000502010005030100050301000502010005010100
-05000100050001000501010005020100050301000506010005020100050c010005050100
-050201000504010005050100050501000502010005020100050101000502010005450001
-050601000502010005010100050201000501010005020100050101000502010005010100
-050201000504010005090601050e02020103020205160002070300020509010005020100
-050101000501010105030100050301000502010005010100050001000500010005010100
-050201000503010005060100050201000502010005080100050501000502010005040100
-050501000505010005020100050201000501010005010101054500010507010205030103
-050101000502010005020102050301020505010005090601050e02020103020205170002
-07010002050a010005020100050201010500010005040101050201020502010005000100
-050001000502010305040101050401000503010205090100050601020505010005050100
-05050100050201000502010005020101050001000545000105370601050e020201030202
-05180005057f01000545000105370601050e02020103020205190003057c010005020100
-0545000105370601050e020201030202051a0001057e01020546000105370601050e0202
-0103020205e5000105370601050e02020103020205e5000105370601050e020201030202
-05e5000105370601050e02020103020205e5000105370601050e02020103020205e50001
-05370601050e02020103020205e5000105370601050e02020103020205e500010639050e
-02020103020205e50000063a050e02020103020205ff053002020103020205ff05300202
-0103020205ff053002020103020205ff053002020103020205ff053002020103020205ff
-053002020103020205ff053002020103020205ff053002020103020205ff053002020103
-020205ff053002020103020205ff053002020103020205ff053002020103020205ff0530
-02020103020205ff053002020103020205ff053002020103020205ff0530020201030202
-05ff053002020103020205ff053002020103020205ff0530020201030202057601000534
-0100058202020103020205110103050a01020503010205090104050a010005200102050b
-0100052a0100050a010005810202010302020511010005020100050b010005050100050b
-0100050c010005220100050b0100052a0100050a01000581020201030202051101000502
-0100050201020505010005050100050b0100050301000500010105020104050201020502
-01000500010105020100050201000502010205050100050a010005050102050301020503
-010205030102050201000500010105030101050001000502010205050100050401010579
-020201030202051101000502010005010100050201000504010005050100050b01000503
-010105010100050301000503010005020100050101010501010005010100050201000501
-01000502010005040100050a010005040100050201000501010005020100050101000502
-010005010100050201000501010105010100050101000501010105010100050201000504
-01000504010105790202010302020511010305020100050201000504010005050100050b
-010005030100050201000503010005030100050201000501010005050100050201000505
-010005040100050a01000504010005050100050201000501010005050100050201000501
-010005020100050101000502010005010100050801000580020201030202051101000505
-0100050201000504010005050100050b0100050301000502010005030100050301040501
-010005060100050001000503010305040100050a01000505010205020104050101000505
-010005020100050101000502010005010100050201000502010205050100058002020103
-02020511010005050100050201000504010005050100050b010005030100050201000503
-010005030100050501000506010005000100050201000502010005040100050a01000508
-010005010100050501000505010005020100050101000502010005010100050201000505
-01000504010005800202010302020511010005050100050201000504010005050100050b
-010005030100050201000503010005030100050201000501010005070100050301000502
-010005040100050b01000503010005020100050101000502010005010100050201000501
-010005020100050101000502010005010100050101010501010005020100050301000505
-010105790202010302020511010005060102050501000505010005090104050101000502
-0100050401010502010205020100050701000504010305040100050b0100050401020503
-010205030102050301020502010005020100050201010500010005020102050401000505
-010105790202010302020576010005340100058202020103020205ff0530020201030202
-05ff053002020103020205ff053002020103020205ff053002020103020205ff05300202
-0103020205ff053002020103020205ff053002020103020205ff053002020103020205ff
-053002020103020205ff053002020103020205ff053002020103020205ff053002020103
-020205ff053002020103020205ff053002020103020205ff053002020103020205ff0530
-02020103020205ff053002020103020205ff0530020201030202056f0100050401020504
-010105b0020201030202056e01010503010005020100050201000501010005af02020103
-0202056d01000500010005070100050201000501010005af020201030202056f01000507
-0100050201000501010005af020201030202056f010005060100050301000501010005af
-020201030202056f010005050100050401000501010005af020201030202056f01000504
-0100050501000501010005af020201030202056f010005030100050601000501010005af
-020201030202056d0104050101040503010105b002020103020205ff0530020201030202
-05ff053002020103020205ff053002020103020205ff053002020103020205ff05300202
-01030202050d06ff0614050d020201030202050d06ff06130000050d020201030202050d
-06010856001d089b0001050d020201030202050d06010856001c0600089b0001050d0202
-01030202050d060108560001050b06000000050b0601089b0001050d020201030202050d
-060108560001050b06000000050b0601089b0001050d020201030202050d060108560001
-050b06000000050b0601089b0001050d020201030202050d060108560001050b06000000
-050b0601089b0001050d020201030202050d060108560001050b06000000050b0601089b
-0001050d020201030202050d060108560001050b06000000050b0601089b0001050d0202
-01030202050d060108560001050b06000000050b0601089b0001050d020201030202050d
-060108560001050b06000000050b0601089b0001050d020201030202050d060108560001
-050b06000000050b0601089b0001050d020201030202050d060108560001050b06000000
-050b0601089b0001050d020201030202050d060108560001050b06000000050b0601089b
-0001050d020201030202050d060108560001060c0000060d089b0001050d020201030202
-050d060108560000061c089b0001050d020201030202050d060100ff0012050d02020103
-0202050d060000ff0013050d02020103020205ff053002020103020205ff053002020103
-020205ff053002020103020205ff053002020103020205ff053002020103020205ff0530
-02020103020205ff053002020103020205ff053002020101000405ff0530000502020400
-05ff053000000202040000000202040005ff053000000202040000000202040005ff0530
-00000202040000000202040005ff053000000202040000000202040005ff053000000202
-0400000002020400000502ff022400060202040000000208040002ff0224000002080400
-00000208040002ff022400000208040000000208040001ff012400000208040000000409
-01ff012400000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 17 200 154
-%%EOF
diff --git a/lib/tv/doc/src/table_visualizer_chapter.xml b/lib/tv/doc/src/table_visualizer_chapter.xml
deleted file mode 100644
index 8b757f82f3..0000000000
--- a/lib/tv/doc/src/table_visualizer_chapter.xml
+++ /dev/null
@@ -1,658 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE chapter SYSTEM "chapter.dtd">
-
-<chapter>
-  <header>
-    <copyright>
-      <year>1997</year><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>The Table Visualizer</title>
-    <prepared>EPK/TK Fredrik Gustafson</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved>EPK/TK (Fredrik Gustafson)</approved>
-    <checked></checked>
-    <date>1998-01-19</date>
-    <rev>C</rev>
-    <file>table_visualizer.xml</file>
-  </header>
-    <warning>
-      <p>
-	The TV application has been superseded by the Observer application.
-	TV will be removed in R16.
-      </p>
-    </warning>
-  <p>The TV, TV, is a tool that enables the user to examine 
-    ETS and Mnesia tables on any (connected) node in the currently running Erlang
-    system. Once a certain table has been opened in the tool, the content may be
-    viewed in various levels of detail. The content may also be edited, as well as
-    sorted, using any element as key. It is also possible to search for a specified object or
-    element. The table may be polled anytime, either regularly, at specified
-    intervals, or manually. New and deleted objects, as well as those altered, are
-    marked with characteristic colours.</p>
-  <p>Information about the table itself (permissions, storage type, and so on) may
-    also be obtained.
-    </p>
-
-  <section>
-    <title>Terminology and Background</title>
-    <p>To avoid confusion, we have to distinguish between the <em>actual table</em>, i.e.,
-      the data stored in ETS or Mnesia, and the <em>image of the table</em>, i.e., the
-      data shown in the TV. The <em>image of the table</em> is simply a copy
-      of the <em>actual table</em>, and can be manipulated in a number of ways, for example
-      sorted. It follows that these manipulations in no way affects the <em>actual table</em>!</p>
-    <p>The expression <em>poll the table</em> is used for the operation of scanning through the
-      content of the actual table (in order to keep the image of the table consistent with the
-      actual table).</p>
-    <p>The ETS and Mnesia modules provides the user with the ability to store vast quantities
-      of data in, the data organized as dynamic, unordered tables. The ETS
-      facility stores <em>tuples</em>, while Mnesia stores <em>records</em>.
-      Each tuple consists of one or more <em>elements</em>; each record consists of one or
-      more <em>fields</em>. It should be noted that, since records are implemented as tuples,
-      with the record name as the first element, the first field of a record becomes the second
-      element in the corresponding tuple!
-            <br></br>
-
-      In the following, all table objects are mainly referred to as tuples, regardless of the
-      table type.</p>
-    <p>For further information about ETS and Mnesia, please see the manual pages and Mnesia User's Guide.</p>
-  </section>
-
-  <section>
-    <title>Starting the TV</title>
-    <p>The TV tool is started by giving the command</p>
-    <pre>
-      tv:start().
-    </pre>
-    <p>The window that appears, is hereafter referred to as <em>the TV main window</em>. It consists of:</p>
-    <list type="bulleted">
-      <item>
-        <p>a <em>menubar</em>.</p>
-      </item>
-      <item>
-        <p>a <em>grid</em>, i.e., a multicolumnar array, where tables existing on
-          the current node is shown. Each square in the grid is called a <em>cell</em>.</p>
-      </item>
-    </list>
-    <image file="tv_start.gif">
-      <icaption>The TV Main Window at startup.</icaption>
-    </image>
-    <p>For each table, the following information is shown, in order:
-      </p>
-    <list type="bulleted">
-      <item>
-        <p>the <em>table name</em>. If the table is accessible through this name, as is the
-          case with Mnesia tables and named ETS tables, the table name is shown in
-          black, otherwise in medium grey.</p>
-      </item>
-      <item>
-        <p>the <em>table identifier</em>, if there is one; since Mnesia tables are accessed
-          solely through the table name, this cell will in those cases be blank.</p>
-      </item>
-      <item>
-        <p>the <em>process identifier (PID) of the process owning the table</em>.</p>
-      </item>
-      <item>
-        <p>the <em>name of the process owning the table</em>, provided the process
-          is registered.</p>
-      </item>
-      <item>
-        <p>the <em>table size</em>, i.e., the number of objects currently stored in
-          the table.</p>
-      </item>
-    </list>
-  </section>
-
-  <section>
-    <title>Changing View</title>
-    <p>The TV will by default show currently existing ETS tables,
-      but the user may easily switch to a Mnesia table view, by choosing the
-      <em>Mnesia Tables</em> option in the <em>View</em> menu:
-      </p>
-    <image file="tv_start_mnesia.gif">
-      <icaption>The TV Main Window, showing Mnesia tables.</icaption>
-    </image>
-    <p>Normally, system tables (i.e., tables used by system applications) and unreadable
-      tables are not shown. The menu option <em>System Tables</em>, in the <em>Options</em>
-      menu, makes the system tables visible:
-      </p>
-    <image file="tv_start_system.gif">
-      <icaption>The TV Main Window, showing readable user and system tables.</icaption>
-    </image>
-    <p>Still unreadable tables are hidden, but the menu option <em>Unreadable Tables</em>,
-      also in the <em>Options</em> menu, makes even those tables visible. It shall be noted
-      that rows containing unreadable tables are shaded, using a grey colour:
-      </p>
-    <image file="tv_start_system_unreadable.gif">
-      <icaption>The TV Main Window, showing both readable and unreadable user and system tables.</icaption>
-    </image>
-    <p>Once a table view has been opened, the user may choose how to view it: it may be sorted
-      by the table names, by the table identifiers, by the process identifiers of the owner
-      processes, or by the names of the owning processes. These sorting options are found in the
-      <em>Options</em> menu.
-      </p>
-    <image file="tv_start_pid_sorted.gif">
-      <icaption>The TV Main Window, tables sorted by owner PID.</icaption>
-    </image>
-  </section>
-
-  <section>
-    <title>Changing the Current Node</title>
-    <p>By default, the Table Vizualizer will show tables residing on the node
-      it was started from. However, the user may easily view tables on other nodes.
-      By choosing the <em>Nodes</em> option, in the <em>File</em> menu, a window showing
-      all connected nodes will appear. Clicking on any of the nodes in the list will cause
-      the main window to immediately show the tables residing on the specified node:
-      </p>
-    <image file="tv_start_other_node.gif">
-      <icaption>The Connected Nodes window, and the TV Main Window, showing tables on the selected node.</icaption>
-    </image>
-  </section>
-
-  <section>
-    <title>Opening a Table in the Table Browser</title>
-    <p>Whenever a table shall be opened, the first step is to choose the corresponding
-      <em>Table Name</em> or <em>Table ID</em> cell. Secondly, the <em>Open Table</em>
-      menu item, in the <em>File</em> menu, has to be chosen. (Or, one may directly
-      double-click on a <em>Table Name</em> or <em>Table Id</em> cell.)</p>
-    <p>If the table selected table is readable, a window will appear after a short delay. This new
-      window is hereafter denoted the <em>Table Browser</em> window. Should the table be
-      unreadable, the Table Information window will appear instead (see further description
-      below).
-      </p>
-
-    <section>
-      <title>The Table Browser Window</title>
-      <p>The Table Browser window consists of:</p>
-      <list type="bulleted">
-        <item>
-          <p>a <em>menubar</em>.</p>
-        </item>
-        <item>
-          <p>a <em>toolbar</em> with buttons providing shortcuts to the menubar options. If the
-            cursor rests on any button, a so-called toolbar tip, explaining the button,
-            will appear.             <br></br>
- 
-            (In the picture below, the cursor has lingered on the <em>Open Table</em>
-            button for a while.)</p>
-        </item>
-        <item>
-          <p>a <em>content and edit field</em>, showing the content of a specified row or cell.
-            Through this field the row, or cell, may also be edited (see below for a detailed
-            description).</p>
-        </item>
-        <item>
-          <p>a <em>grid</em>, i.e., a multicolumnar array, where the content of the
-            opened table will be shown. (As above, each square in the grid is called a cell.</p>
-        </item>
-      </list>
-      <image file="tv_table_browser.gif">
-        <icaption>The Table Browser Window.</icaption>
-      </image>
-      <p>The successful appearance of the Table Browser window means that an image of
-        the selected table has been created in the TV. It is this image
-        that is shown in the Table Browser.
-        </p>
-
-      <section>
-        <title>How Table Data Is Presented</title>
-        <p>Each object in the table is presented on a row of its own in the grid.
-          Each element in the object is presented in a cell of its own.          <br></br>
-
-          The colours on the <em>vertical</em> buttons to the left of the grid show the status
-          of the object on that very row: a bright red colour indicates that the object just
-          has been inserted (when the table is opened, all objects are regarded as being
-          just inserted), while a bright green colour indicates that the object has been
-          changed. The colour fades away, shade by shade, every time the actual table is polled,
-          until the normal background colour is encountered.          <br></br>
-
-          When an object has been deleted, the colour of the corresponding
-          <em>vertical button</em> turns to black. The next time the table is polled, the
-          object will be removed from the grid.</p>
-        <image file="tv_table_browser_updated.gif">
-          <icaption>The Table Browser Window, with new, changed, and deleted objects.</icaption>
-        </image>
-        <p>Normally, new objects are placed at the end of the grid, while all other objects
-          maintain their positions between successive polls. However, when sorting mode has
-          been ordered, all objects, even new ones, are placed at the correct position
-          according to the sorting ordered (see also below).</p>
-        <p>Immediately above the <em>horizontal buttons</em>, one or more <em>keys</em> may
-          appear. These keys indicates which elements that are used as indices in the
-          ETS/Mnesia table, i.e., which fields that are used by ETS/Mnesia as search keys when
-          looking up data.</p>
-        <p>The grid columns may be resized, by clicking and dragging on the small black <em>resize areas</em> between any two horizontal buttons.</p>
-        <p>The rows are enumerated, as a help when navigating through the table. Note: it shall
-          not be assumed that these numbers correspond to the placement of the objects in the
-          <em>actual table</em>! The row numbers, as presented in the TV, are
-          only temporary, and only valid within the TV!
-                    <br></br>
-
-          The number on the <em>vertical scrollbar</em> corresponds to the number the
-          uppermost row has (or will have).</p>
-        <p>The number shown on the horizontal scrollbar relates to the leftmost column shown.</p>
-      </section>
-
-      <section>
-        <title>How to Poll the Table</title>
-        <p>The table is polled whenever the <em>Poll Table</em> option in the <em>Options</em>
-          menu is chosen (or the <em>Poll Table</em> toolbar button is pressed).           <br></br>
-
-          The user may also choose to let the TV poll the table at regular
-          intervals. This is done via the <em>Set Poll Interval...</em> option in the
-          <em>Options</em> menu, which causes the <em>Set Poll Interval window</em> to appear. </p>
-        <p>In the Set Poll Interval window the user selects whether manual or automatic
-          polling shall be used, and, in the automatic polling case, the poll interval.</p>
-        <image file="set_poll_int.gif">
-          <icaption>The Set Poll Interval Window.</icaption>
-        </image>
-        <p>It shall be noted that, in the case of a large table (or a slow computer/operating
-          system), a short poll interval may cause the TV to be flooded, i.e., the
-          data resulting from one poll has not been fully treated and presented when the data from
-          the next poll arrives. The user is therefore kindly requested to use the automatic
-          polling facility with care!</p>
-      </section>
-
-      <section>
-        <title>How to Edit Objects in the Table</title>
-        <p>Provided that the table is writable for other processes than the owning process,
-          the user may insert, change and delete objects.</p>
-        <p>To <em>delete</em> an object, the corresponding row, or a single cell in the
-          corresponding row, has to be chosen, by clicking either on the vertical button
-          to the left of the row, or on a cell. Thereafter the <em>Delete Object</em>
-          option in the <em>Edit Menu</em>
-          is chosen. (Should the user regret the delete operation, the row may once again
-          be selected, whereupon the <em>Return</em> button simply is pressed.)</p>
-        <p>To <em>insert</em> an object, the user may use the <em>Record Editor</em>, or simply
-          enter the object in the content and edit field, and then press the <em>Return</em>
-          button.          <br></br>
-
-          The <em>Record Editor</em> is started via the <em>Edit Object</em> option in the
-          <em>Edit</em> menu, or via the <em>Edit Object</em> toolbar button. The editor that
-          appears looks different depending on the kind of table: for Mnesia tables,
-          a writable field is shown for each record entry, as well as the name of the entry.
-          For ETS tables, only a writable field is shown; this is due to the fact that the
-          size of the tuples inserted in ETS tables may vary, whereas the size of the records
-          inserted in a Mnesia table (more or less) is fixed.
-          One may select the next field in the record editor by pressing
-          the 'Tab' (or 'Arrow Down') button, and select the previous field by pressing
-          'Shift'+'Tab' (or 'Arrow Up').          <br></br>
-
-          When the editing is finished, the <em>OK</em> button may be clicked, or
-          'Return' pressed. The TV will then try to insert the new object.
-          </p>
-        <image file="tv_record_editor_mnesia.gif">
-          <icaption>The Record Editor (shown for a Mnesia table).</icaption>
-        </image>
-        <p>To <em>change</em> an already existing object, the corresponding row, or a single cell
-          in the corresponding row, has to be selected first (see below). Then one may edit the
-          whole object (or the selected field in the object), either using the record editor
-          or the content and edit field, whereupon 'Return' may be pressed (or the 'OK' button
-          clicked).
-          </p>
-        <p>It shall be noted that it is hard to edit objects containing
-          <em>process identifiers</em>, <em>references</em>, <em>binaries</em> and <em>ports</em>,
-          since it is only a textual representation of these terms that is shown on the screen.
-          It is in the general case impossible for the TV to correctly
-          convert this textual representation back to the original term. As a courtesy to
-          the user, an attempt to do this will nevertheless be done if the edited field
-          consists of a single process identifier; however, this conversion will only be
-          correct provided
-          that the process identifier originates from the current Erlang session. (On
-          the other hand, why on earth should any user want to store old process identifiers?)
-          </p>
-        <p>It shall also be noted that it may be more or less confusing to edit the table,
-          depending on whether the table type is <em>set</em>, <em>bag</em>, or
-          <em>duplicate_bag</em>, i.e., depending on whether or not objects having the
-          same key (or even duplicate objects) are allowed. Please study the ETS or Mnesia
-          manual pages, should confusion arise!
-          </p>
-      </section>
-
-      <section>
-        <title>How to Search For Objects</title>
-        <p>One may search for an object, by choosing the <em>Search Object</em>
-          option in the <em>Options</em> menu (or by pressing the <em>Search Object</em>
-          toolbar button). In the <em>Search Object window</em> that appears, any valid
-          Erlang term or regular expression may be entered, whereupon all objects
-          containing (or consisting of) this term, or matching the regular expression,
-          will be shown.</p>
-        <image file="tv_search_window.gif">
-          <icaption>The Search Object Window.</icaption>
-        </image>
-        <p>In the search result list, by clicking on any object, the Table Browser will
-          immediately scroll to the corresponding row in the table shown. This enables
-          the user to in a very powerful way quickly find the objects he's interested in.</p>
-        <image file="tv_search_result.gif">
-          <icaption>The Search Object Window interworking with the Table Browser.</icaption>
-        </image>
-      </section>
-
-      <section>
-        <title>How to Mark Table Data</title>
-        <p>One may mark a row or a column by clicking on the buttons to the left and above
-          the grid, respectively. A single cell is marked by clicking on it. Even empty
-          rows and columns may be marked; an empty cell cannot be marked - on the contrary,
-          by clicking on an empty cell, all marks are removed.</p>
-        <p>Marks are indicated by a cyan blue colour.</p>
-        <image file="tv_row_marked.gif">
-          <icaption>The TV Main Window: a row has been marked.</icaption>
-        </image>
-        <p>When a row or a cell has been marked, the content will be shown in the content field,
-          together with an indication of the row (and column when applicable) the marked area
-          corresponds to. Should the object be very big, only a fraction of it may be shown in
-          this field. By clicking on the down-arrow button to the right of the content and
-          edit field, a pop-up content field will be shown, where the whole marked object
-          may be viewed. The content of this pop-up field may be marked and copied to
-          other windows; however, this field cannot be edited.</p>
-        <image file="tv_row_marked_popup.gif">
-          <icaption>The Table Browser: the pop-up content field.</icaption>
-        </image>
-        <p>It shall be noted that the user may choose whether lists shall be shown as
-          strings or lists; this is done via the <em>View</em> menu.
-          </p>
-        <p>A marked column may be subject to sorting, see below. When sorting is ordered,
-          marks are removed at each polling of the table (because of the difficulties to
-          keep track of a certain object, or element, in this case).</p>
-      </section>
-
-      <section>
-        <title>How to Sort Table Data</title>
-        <p>The image of the table may be sorted in rising or falling order, using any element as
-          sorting key. The element desired is chosen by marking the corresponding column, and
-          then choose (either via the <em>Options</em> menu, or via the toolbar buttons) any
-          of the sorting options available, i.e., sorting in ascending or descending order.
-          The colour of the column button will then change to gold, to indicate that this
-          column is the basis for the sorting currently chosen.</p>
-        <p>Should no column have been marked, when sorting is ordered, the first element in each
-          object (i.e, tuple) will be used as sorting key if the table is an ETS table; the
-          second element (i.e., the first field in the record) will be used if the table is a
-          Mnesia table.</p>
-        <p>Even columns with no elements in them may be subject to sorting. In this case the
-          whole object is used as the sorting key.</p>
-        <p>When sorting is ordered, new elements will be inserted according to the current
-          sorting mode. When the sorting is interrupted (via the <em>No Sorting</em> option),
-          the current image of the table keep the current order, but new elements will from
-          now on once again be inserted at the end of the image of the table.</p>
-      </section>
-
-      <section>
-        <title>How to Obtain Table Information</title>
-        <p>Information about the actual table is obtained via the <em>File</em> menu (or via the
-          <em>Table Info</em> toolbar button). The information is printed in a separate window,
-          with similar pieces of information grouped together on "flap cards" of their own.
-          By clicking on a flap, the information on the corresponding card is made visible.</p>
-        <image file="info_window.gif">
-          <icaption>The Table Information Window, showing information about a Mnesia table.</icaption>
-        </image>
-        <p>The Table Information window may also be opened from the TV Main
-          Window, by selecting a table and then choose the <em>Table Info</em> option
-          in the <em>File</em> menu (or by double-clicking on the <em>Table Size</em>
-          field.</p>
-        <p>Note: The Table Information window will automatically be opened if the user tries
-          to open an unreadable table, since this is the only information available in this
-          case.</p>
-      </section>
-    </section>
-
-    <section>
-      <title>The Table Browser Menus</title>
-      <p>The Table Browser offers the following menus:</p>
-      <p></p>
-
-      <section>
-        <title>The File Menu</title>
-        <taglist>
-          <tag><em>Table Info</em></tag>
-          <item>
-            <p>Opens the Table Information window, which shows the available information
-              about the current table. </p>
-          </item>
-          <tag><em>Close</em></tag>
-          <item>
-            <p>Closes the Table Browser window.</p>
-          </item>
-        </taglist>
-      </section>
-
-      <section>
-        <title>The Edit Menu</title>
-        <taglist>
-          <tag><em>Edit Object...</em></tag>
-          <item>
-            <p>Opens the Record Editor. If an object is marked, it will be shown in
-              the Record Editor.</p>
-          </item>
-          <tag><em>Delete Object</em></tag>
-          <item>
-            <p>Deletes a marked object.</p>
-          </item>
-        </taglist>
-      </section>
-
-      <section>
-        <title>The View Menu</title>
-        <taglist>
-          <tag><em>Lists As Lists</em></tag>
-          <item>
-            <p>Causes lists in the table to be shown as lists.</p>
-          </item>
-          <tag><em>Lists As Strings</em></tag>
-          <item>
-            <p>Causes lists in the table to be shown as strings.</p>
-          </item>
-        </taglist>
-      </section>
-
-      <section>
-        <title>The Options Menu</title>
-        <taglist>
-          <tag><em>Poll Table</em></tag>
-          <item>
-            <p>An explicit order to poll the table, i.e., to scan the content.</p>
-          </item>
-          <tag><em>Poll Interval...</em></tag>
-          <item>
-            <p>Choose between manual and automatic polling. In the case of automatic
-              polling, the user gets the opportunity to choose the polling interval.</p>
-          </item>
-          <tag><em>Search Object</em></tag>
-          <item>
-            <p>Enables search for objects containing (or consisting of) a specified
-              Erlang term, or matching a regular pattern. The search result may be used
-              for quick navigation in the table.</p>
-          </item>
-          <tag><em>Sort Ascending Order</em></tag>
-          <item>
-            <p>Shows the table content sorted in ascending (i.e., rising) order.
-              New objects will be shown with correct placement as long the as the sorting
-              is going on.              <br></br>
-
-              Please note that it is only the image of the table that is affected,
-              <em>not</em> the table itself!</p>
-          </item>
-          <tag><em>Sort Descending Order</em></tag>
-          <item>
-            <p>Shows the table content sorted in descending (i.e., falling) order.
-              New objects will be shown with correct placement as long the as the
-              sorting is going on.</p>
-          </item>
-          <tag><em>No Sorting</em></tag>
-          <item>
-            <p>Sorting mode is left. New objects will be shown last in the
-              table. However, older objects will remain in the position they had when
-              the sorting mode was left, i.e., their placement will not reflect their
-              actual placement in the ETS/Mnesia table.</p>
-          </item>
-        </taglist>
-      </section>
-
-      <section>
-        <title>The Help Menu</title>
-        <taglist>
-          <tag><em>Help</em></tag>
-          <item>
-            <p>Shows the help (about TV usage) that is available.
-              (The help will be shown in the Netscape Internet browser, if available.)</p>
-          </item>
-          <tag><em>OTP Documentation</em></tag>
-          <item>
-            <p>Shows the Documentation about all OTP components that is available
-              in the local installation of OTP.</p>
-          </item>
-        </taglist>
-      </section>
-    </section>
-  </section>
-
-  <section>
-    <title>Tracing the Owner Process</title>
-    <p>The process owning the table may easily be traced, by selecting either
-      the <em>Owner Pid</em> or the <em>Owner Name</em> field, and then choosing
-      the <em>Trace Process</em> option in the <em>File</em> menu.       <br></br>
-
-      (It is also possible to double-click on any of these fields.)</p>
-  </section>
-
-  <section>
-    <title>Creating a New Table</title>
-    <p>A new table may easily be created using the <em>New Table window</em>.
-      Currently only ETS tables may be created. Since ETS tables
-      dies together with the parent process, a special process, registered
-      as <em>tv_table_owner</em>, will be the owner of tables created this way.
-      This process will not be affected by any termination of the TV,
-      i.e., the ETS tables created will live on until they are explicitly killed.
-      </p>
-    <image file="tv_create_table.gif">
-      <icaption>The New Table Window, enabling easy creation of ETS tables.</icaption>
-    </image>
-    <p>Note: the <em>tv_table_owner</em> is local to each node, meaning
-      that the creation of a table on a new node also will start such a process
-      on that node. This way only the tables on a specific node dies, should that
-      specific node crash.</p>
-  </section>
-
-  <section>
-    <title>The TV Main Window Menus</title>
-    <p>The Main Window offers the following menus:</p>
-    <p></p>
-
-    <section>
-      <title>The File Menu</title>
-      <taglist>
-        <tag><em>Open Table</em></tag>
-        <item>
-          <p>Open a selected table in a new Table Browser.</p>
-        </item>
-        <tag><em>New Table</em></tag>
-        <item>
-          <p>Open the New Table window, enabling easy creation of ETS tables.</p>
-        </item>
-        <tag><em>Table Info</em></tag>
-        <item>
-          <p>Opens the Table Information window, showing the available
-            information about a selected table. </p>
-        </item>
-        <tag><em>Nodes...</em></tag>
-        <item>
-          <p>Open the Connected Nodes window, enabling the user to view
-            tables residing on remote nodes.</p>
-        </item>
-        <tag><em>Trace Process</em></tag>
-        <item>Opens a trace window, where the process owning a selected table can
-         be traced.</item>
-        <tag><em>Exit</em></tag>
-        <item>
-          <p>Terminates the TV.</p>
-        </item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The View Menu</title>
-      <taglist>
-        <tag><em>ETS Tables</em></tag>
-        <item>
-          <p>Shows ETS tables on the current node.</p>
-        </item>
-        <tag><em>Mnesia tables</em></tag>
-        <item>
-          <p>Shows Mnesia tables on the current node.</p>
-        </item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Options Menu</title>
-      <taglist>
-        <tag><em>Refresh</em></tag>
-        <item>
-          <p>An explicit order to once again check the current node for existing
-            tables, and list them.</p>
-        </item>
-        <tag><em>Unreadable Tables</em></tag>
-        <item>
-          <p>Option to choose whether or not unreadable tables shall be shown.</p>
-        </item>
-        <tag><em>System Tables</em></tag>
-        <item>
-          <p>Option to choose whether or not system tables shall be shown.</p>
-        </item>
-        <tag><em>Sort by Name</em></tag>
-        <item>
-          <p>Shows the tables sorted by their names.</p>
-        </item>
-        <tag><em>Sort by Id</em></tag>
-        <item>
-          <p>Shows the tables sorted by their table identifiers.</p>
-        </item>
-        <tag><em>Sort by Owner PID</em></tag>
-        <item>
-          <p>Shows the tables sorted by the process identifiers of the owning
-            processes.</p>
-        </item>
-        <tag><em>Sort by Owner Name</em></tag>
-        <item>
-          <p>Shows the tables sorted by the registered names of the owning processes.</p>
-        </item>
-        <tag><em>Error Messages in Haiku</em></tag>
-        <item>
-          <p>Option to choose whether or not error messages shall be shown
-            in the Japanes poetry style called <em>Haiku</em>.</p>
-        </item>
-      </taglist>
-    </section>
-
-    <section>
-      <title>The Help Menu</title>
-      <taglist>
-        <tag><em>Help</em></tag>
-        <item>
-          <p>Shows the help (about TV usage) that is available.
-            (The help will be shown in the Netscape Internet browser, if available.)</p>
-        </item>
-        <tag><em>OTP Documentation</em></tag>
-        <item>
-          <p>Shows the Documentation about all OTP components that is available
-            in the local installation of OTP.</p>
-        </item>
-      </taglist>
-    </section>
-  </section>
-</chapter>
-
-
diff --git a/lib/tv/doc/src/tv.gif b/lib/tv/doc/src/tv.gif
deleted file mode 100644
index d78cf7d8ed..0000000000
--- a/lib/tv/doc/src/tv.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv.xml b/lib/tv/doc/src/tv.xml
deleted file mode 100644
index 05dd60b34a..0000000000
--- a/lib/tv/doc/src/tv.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="latin1" ?>
-<!DOCTYPE erlref SYSTEM "erlref.dtd">
-
-<erlref>
-  <header>
-    <copyright>
-      <year>1997</year>
-      <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.
-
-  The Initial Developer of the Original Code is Ericsson AB.
-    </legalnotice>
-
-    <title>tv</title>
-    <prepared>Fredrik Gustafson</prepared>
-    <responsible></responsible>
-    <docno></docno>
-    <approved></approved>
-    <checked></checked>
-    <date>1997-11-17</date>
-    <rev>1.0</rev>
-    <file>table_visualizer.sgml</file>
-  </header>
-  <module>tv</module>
-  <modulesummary>TV graphically examines ETS and Mnesia tables. </modulesummary>
-  <description>
-    <warning>
-      <p>
-	The TV application has been superseded by the Observer application.
-	TV will be removed in R16.
-      </p>
-    </warning>
-    <p>TV enables the user to examine ETS and Mnesia tables. Once 
-      a certain table has been opened in the tool, the content may be viewed at 
-      various levels of detail. The content viewed may also be sorted, using any 
-      element as key. The table may be polled anytime; either regularly at 
-      specified intervals, or manually. New and deleted objects, as well as those 
-      altered, are marked with characteristic colors. </p>
-  </description>
-  <funcs>
-    <func>
-      <name>start() -> Pid</name>
-      <fsummary>Start TV.</fsummary>
-      <type>
-        <v>Pid = pid() </v>
-      </type>
-      <desc>
-        <p><c>start/0</c> starts the TV. </p>
-      </desc>
-    </func>
-  </funcs>
-
-  <section>
-    <title>See Also</title>
-    <p>For a complete description of the TV, please 
-      see the TV User's Guide. </p>
-  </section>
-</erlref>
-
-
diff --git a/lib/tv/doc/src/tv_create_table.gif b/lib/tv/doc/src/tv_create_table.gif
deleted file mode 100644
index 7fae7f30cf..0000000000
--- a/lib/tv/doc/src/tv_create_table.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_create_table.ps b/lib/tv/doc/src/tv_create_table.ps
deleted file mode 100644
index 0a3b24bcf5..0000000000
--- a/lib/tv/doc/src/tv_create_table.ps
+++ /dev/null
@@ -1,1120 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./tv_create_table.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:14:11 2001)
-%%BoundingBox: 0 114 250 471
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 114 250 471
-userdict begin
-%%BeginData:
-DisplayImage
-0 114
-250.000000 357.000000
-12
-410 585
-1
-0
-0
-8
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-aa2455
-999999
-000a01ff0183000b0208040001ff018300000208040000000208040002ff028300000208
-0400000002080400020000ff0080040002000000020804000000020204060200000004ff
-0480020000000405020204000000020204000209000d02ff027700000202040000000202
-040002080000020d0400025e010302110103028d01010206010102640000020204000000
-0202040002080000020d0400025e01010202010702000101020301010201010102100103
-02180100020f010202020100021901050200010702010103020601070209010102060101
-026400000202040000000202040002080000020d0400025e010102050101020301010203
-010102010101020f01010201010102160101020f01020202010002190101020701010203
-01010201010102080101020c010102060101026400000202040000000202040002080000
-0202040602030400025e010102050101020301010203010102010101020e010102050101
-020001010201010302030103020101040201010302070100020001010201010002020103
-0202010102050101020501010207010102030101020c0101020401030203010102000101
-0203010102020103025d0000020204000000040302080000020204000304000002030400
-025e010102050101020401010202010002020101020e0101020501010200010102000101
-020101010201010102010101020101010202010102010101020601000200010102010100
-0201010102010101020101010201010102010101020501010207010102030102020b0101
-02030101020101010202010202000101020201010201010102010101025c000004030101
-020b0000020304000302000002040400025e010102050101020401010201010102020101
-020e01010205010202020101020101010205010102010101020201010201010102060100
-020001020200010002010101020101010202010102000101020001010206010402040101
-0204010302090101020701010202010102010101020201010201010102010101025f0103
-020b0000020304000302000002040400025e010102050101020501010200010002030101
-020e01010205010102030105020201040201010102020105020601000201010102000100
-020101050202010102000101020001010206010102070101020601020208010102040104
-02020101020101010202010102010105025f0103020b0000020404000300000002050400
-025e0101020501010205010302030101020e010102050101020301010205010102010101
-0201010102020101020a0100020201020201010102060107020601010207010102070101
-0208010102030101020101010202010102010101020201010201010102630103020b0000
-020404000300000002050400025e0101020501010206010102040101020f010102020100
-020001010203010102020100020101010201010102010101020201010202010002060100
-020201020201010102020100020301010201010102070101020701010203010102010101
-0208010102030101020101010202010102010101020201010201010102020100025f0103
-020b00000205000002060400025e01010205010102060101020401010210010302010101
-020401030203010202000101020101020201010302070100020301010202010302040101
-020101010207010502030101020401030209010102040102020001010201010402030101
-0202010302600103020b0000020d0400025e01030211010302ff02000103020b0000020d
-040002ff02790103020b0000020d040002ff02790103020c040d02ff027a010302ff0295
-010302ff02950103020200ff008e0400020201030202000004ff048e0202010302ff0295
-010302020500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000020201030202000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050002020103020205000000
-05ff058c0100020201030202000005ff058c010005000202010302020500000005ff058c
-0100020201030202000005ff058c010005000202010302020500000005ff058c01000202
-01030202000005ff058c010005000202010302020500000005ff058c0100020201030202
-000005ff058c010005000202010302020500000005ff058c0100020201030202000005ff
-058c010005000202010302020500000005ff058c0100020201030202000005ff058c0100
-05000202010302020500000005ff058c0100020201030202000005ff058c010005000202
-010302020500000005ff058c0100020201030202000005ff058c01000500020201030202
-0500000005ff058c0100020201030202000005ff058c0100050002020103020205000000
-05ff058c0100020201030202000005ff058c010005000202010302020500000005ff058c
-0100020201030202000005ff058c0100050002020103020205000000056f07ff070e050d
-01000202010302020000057007ff070d0000050c0100050002020103020205000000056f
-070100ff000c050d010002020103020200000570070100ff000c050c0100050002020103
-020205000000056f070100ff000c050d010002020103020200000570070100ff000c050c
-0100050002020103020205000000056f070100ff000c050d010002020103020200000570
-070100040100002001000030010000b2050c0100050002020103020205000000050a0100
-05020100050c0100055107010004010000130100000a0100000001000018010200130100
-00b2050d01000202010302020000050b010105010100050c01000551070100030100001f
-010000020100001901000012010000b3050c0100050002020103020205000000050a0101
-050101000502010205030101050001000502010205040101054407010002010000040101
-000001000003010200030102000201000000010100020100000001020001010100000100
-000301020002010000000101000501000003010200020100000201000002010000b4050d
-01000202010302020000050b010005000100050001000501010005020100050101000501
-010105010100050201000503010105440701000801000000010000000100000101000002
-010000040100000201010001010000010100000001000000010000010100000001000000
-010000010100000201000001010100010100000401000002010000020100000101000002
-010000b8050c0100050002020103020205000000050a0100050001000500010005010100
-0502010005010100050201000501010005020100054a0701000801000000010000000100
-000501000004010000020100000201000001010000000100000001000001010000000100
-000001000005010000010100000801000002010000020100000201000001010000b8050d
-01000202010302020000050b010005010101050101000502010005010100050201000501
-0104054a0701000801000000010000000100000201030004010000020100000201000001
-010000000102000101000000010000000100000201030001010000080100000201040002
-01000001010000b8050c0100050002020103020205000000050a01000501010105010100
-05020100050101000502010005010100054e070100080100000001000000010000010100
-000201000004010000020100000201000001010000050100000001000000010000010100
-00020100000101000008010000020100000701000000010000b8050d0100020201030202
-0000050b0100050201000501010005020100050101000501010105010100050201000503
-010105440701000801000000010000000100000101000002010000040100000201000002
-010000020100000101000001010000000100000001000001010000020100000101000008
-010000020100000201000003010100b9050c0100050002020103020205000000050a0100
-050201000502010205030101050001000502010205040101054407010008010000000100
-000001000002010300040100000201000002010000030101000201000000010000000100
-000201030001010000080100000301020005010000b9050d010002020103020200000570
-07010051010000b9050c0100050002020103020205000000056f0701004e010000000100
-00ba050d0100020201030202000005700701004f010000bb050c01000500020201030202
-05000000056f070100ff000c050d010002020103020200000570070100ff000c050c0100
-050002020103020205000000056f070100ff000c050d0100020201030202000005700701
-00ff000c050c0100050002020103020205000000056f070100ff000c050d010002020103
-020200000570070000ff000d050c010005000202010302020500000005ff058c01000202
-01030202000005ff058c010005000202010302020500000005ff058c0100020201030202
-000005ff058c010005000202010302020500000005ff058c0100020201030202000005ff
-058c010005000202010302020500000005ff058c0100020201030202000005ff058c0100
-05000202010302020500000005ff058c0100020201030202000005ff058c010005000202
-010302020500000005ff058c0100020201030202000005ff058c01000500020201030202
-0500000005ff058c0100020201030202000005ff058c0100050002020103020205000000
-05ff058c0100020201030202000005ff058c010005000202010302020500000005ff058c
-0100020201030202000005ff058c010005000202010302020500000005ff058c01000202
-01030202000005ff058c010005000202010302020500000005ff058c0100020201030202
-000005ff058c010005000202010302020500000005ff058c0100020201030202000005ff
-058c010005000202010302020500000005ff058c0100020201030202000005ff058c0100
-05000202010302020500000005ff058c0100020201030202000005ff058c010005000202
-010302020500000005ff058c0100020201030202000005ff058c01000500020201030202
-0500000005ff058c0100020201030202000005ff058c0100050002020103020205000000
-056d01ff0112050b01000202010302020000056e01ff0112050a01000500020201030202
-05000000056d010107ff070e0101050b01000202010302020000056e010107ff070d0000
-0101050a0100050002020103020205000000056d0101070100ff000c0101050b01000202
-010302020000056e0101070100ff000c0101050a0100050002020103020205000000056d
-0101070100ff000c0101050b01000202010302020000056e010107010000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-00d20101050a0100050002020103020205000000056d010107010337010100d20101050b
-01000202010302020000056e0101070100000336010100d20101050a0100050002020103
-020205000000050a0104050801000506010205490101070103180100030a010003060102
-0307010100d20101050b01000202010302020000050d0100050a01000508010005490101
-0701000003170100030a0100030801000307010100d20101050a01000500020201030202
-05000000050c010005040102050201000500010105050100050301020509010005000101
-050301020502010105000100050301020504010105180101070103010101030001000302
-0100030201000308010403020102030201000300010103050100030301020300010100d2
-0101050b01000202010302020000050d0100050301000502010005010101050101000504
-010005020100050201000508010105010100050101000502010005010100050001000500
-010005010100050201000503010105180101070100000300010003000100030001000301
-010003020100030a01000303010003020100030101010301010003040100030201000302
-010200d20101050a0100050002020103020205000000050c010005070100050101000502
-010005040100050201000502010005080100050201000505010005010100050001000500
-01000501010005020100051e010107010301010003000100030001000302010003010100
-030a010003070100030101000302010003040100030201000302010200d20101050b0100
-0202010302020000050d0100050401030501010005020100050401000502010405080100
-050201000502010305010100050001000500010005010104051e01010701000003000100
-03000100030001000302010003010100030a010003040103030101000302010003040100
-0302010600d20101050a0100050002020103020205000000050c01000503010005020100
-05010100050201000504010005020100050c010005020100050101000502010005010100
-050001000500010005010100052201010701030101000300010003000100030301000300
-0100030a01000303010003020100030101000302010003040100030201000303010100d2
-0101050b01000202010302020000050d0100050301000502010005010101050101000504
-010005020100050201000508010005020100050101000502010005010100050001000500
-010005010100050201000503010105180101070100000300010003000100030001000303
-0101030b01000303010003020100030101010301010003040100030201000302010200d2
-0101050a0100050002020103020205000000050c01000504010305010100050001010505
-010005030102050901000502010005020103050101000500010005000100050201020504
-010105180101070103010100030001000300010003040100030c01010302010303010100
-0300010103050100030301020300010100d20101050b01000202010302020000056e0101
-07010000030a0100030101050322010100d20101050a0100050002020103020205000000
-056d010107010308010003000100032b010100d20101050b01000202010302020000056e
-01010701000003080100032c010100d20101050a0100050002020103020205000000056d
-010107010300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-03000100030001000300010000d20101050b01000202010302020000056e0101070100ff
-000c0101050a0100050002020103020205000000056d0101070100ff000c0101050b0100
-0202010302020000056e0101070100ff000c0101050a0100050002020103020205000000
-056d0101070100ff000c0101050b01000202010302020000056e0101070000ff000d0101
-050a0100050002020103020205000000056d01ff0112050b01000202010302020000056e
-01ff0112050a010005000202010302020500000005ff058c0100020201030202000005ff
-058c010005000202010302020500000005ff058c0100020201030202000005ff058c0100
-05000202010302020500000005ff058c0100020201030202000005ff058c010005000202
-010302020500000005ff058c0100020201030202000005ff058c01000500020201030202
-0500000005ff058c0100020201030202000005ff058c0100050002020103020205000000
-05ff058c0100020201030202000005ff058c010005000202010302020500000005ff058c
-0100020201030202000005ff058c010005000202010302020500000005ff058c01000202
-01030202000005ff058c010005000202010302020500000005ff058c0100020201030202
-000005ff058c010005000202010302020500000005ff058c0100020201030202000005ff
-058c01000500020201030202050000000570000005000000050000000500000005000000
-0508010005020100051a0100050a0100050a01000506010205c601000202010302020000
-0570000005000000050000000500000005000000050001000507010105010100051a0100
-050a0100050a01000508010005c501000500020201030202050000000570000005060100
-050801010501010005020102050201010500010005030102050301010500010005080104
-050201020502010005000101050501000503010205bf0100020201030202000005700000
-050801000507010005000100050001000501010005020100050101000500010005000100
-05010100050201000501010005010101050a010005030100050201000501010105010100
-05040100050201000502010005bd01000500020201030202050000000570000005060100
-050801000500010005000100050501000501010005000100050001000501010005020100
-0501010005020100050a0100050701000501010005020100050401000502010005020100
-05be01000202010302020000057000000508010005070100050101010502010305010100
-0500010005000100050101040501010005020100050a0100050401030501010005020100
-050401000502010405bd0100050002020103020205000000057000000506010005080100
-050101010501010005020100050101000500010005000100050101000505010005020100
-050a010005030100050201000501010005020100050401000502010005c2010002020103
-020200000570000005080100050701000502010005010100050201000501010005000100
-0500010005010100050201000501010005010101050a0100050301000502010005010101
-0501010005040100050201000502010005bd010005000202010302020500000005700000
-050601000508010005020100050201030501010005000100050001000502010205030101
-05000100050b0101050201030501010005000101050501000503010205bf010002020103
-0202000005700000050001000500010005000100050001000500010005ff051001000500
-02020103020205000000057001000500010005000100050001000500010005ff05120100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100020201030202000005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050002020103
-020205000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000202010302020000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-0000050000000500000005000000050000000500000005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c0100050002020103020205000000050a010405ff
-057c01000202010302020000050d010005ff057d0100050002020103020205000000050c
-010005030100050201000501010005000101050301020504010105ff0561010002020103
-02020000050d010005030100050201000501010105010100050101000502010005030101
-05ff05600100050002020103020205000000050c01000504010005010100050101000502
-0100050101000502010005ff056701000202010302020000050d01000504010005010100
-05010100050201000501010405ff05660100050002020103020205000000050c01000505
-01000500010005010100050201000501010005ff056b01000202010302020000050d0100
-05050101050201010501010005010100050201000503010105ff05600100050002020103
-020205000000050c0100050601000502010005000101050301020504010105ff05610100
-0202010302020000051501000502010005ff057101000500020201030202050000000511
-0100050001000503010005ff057201000202010302020000051301000504010005ff0571
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005440100
-0567000005670000057401000500020201030202050000000542010005000100051d0100
-0546000005000000050d0100055600000500000005110100051001020505010005120100
-05110100051f01000202010302020000054201000500010005000100051c010005450000
-0500000005000000050c0100055500000500000005000000051001000512010005190100
-05110100051e01000500020201030202050000000540010005000100060105000100050c
-01020503010205020104054200000500000005020000050b010005000101050301020503
-010105000100054200000500000005020000050c01010500010005010100050201000501
-010005000101050501000503010205030102050301020502010405020102050901000500
-0101050301020503010105000100050d0100020201030202000005400100050001000603
-05000100050a010005020100050101000502010005030100054300000500000005040000
-050a01010501010005010100050201000501010005010101054100000500000005040000
-050a01000501010105010100050201000501010105010100050401000505010005020100
-050201000501010005020100050301000503010005020100050801010501010005010100
-050201000501010005010101050c0100050002020103020205000000053e010005000100
-060505000100050901000505010005020100050301000542000005000000050600000509
-010005020100050501000501010005020100054000000500000005060000050901000502
-010005010100050201000501010005020100050401000505010005020100050901000503
-010005030100050201000508010005020100050501000501010005020100050d01000202
-010302020000053e00000500000006070500000005090102050201040503010005410100
-05000100050801000508010005020100050201030501010005020100053f010005000100
-050801000508010005020100050101000502010005010100050201000504010005050100
-050201000506010305030100050301040508010005020100050201030501010005020100
-050c0100050002020103020205000000053e000005000000060505000000050d01000501
-010005070100054201000500010005060100050901000502010005010100050201000501
-010005020100054001000500010005060100050901000502010005010100050201000501
-01000502010005040100050501000502010005050100050201000503010005030100050c
-01000502010005010100050201000501010005020100050d010002020103020200000540
-000005000000060305000000050a01000502010005010100050201000503010005430100
-0500010005040100050a0101050101000501010005020100050101000501010105410100
-0500010005040100050a0100050101010501010005010101050101010501010005040100
-050501000502010005020100050101000502010005030100050301000502010005080101
-0501010005010100050201000501010005010101050c0100050002020103020205000000
-0540000005000000060105000000050c0102050301020505010105420100050001000502
-0100050b010005000101050301030502010105000100054201000500010005020100050c
-010105000100050201010500010005010100050001010505010005050100050301020503
-010305040101050201020509010005000101050301030502010105000100050d01000202
-010302020000054200000500000005000000056301000500010005000100051e01000543
-01000500010005000100051a0100052e010505130100050c010005000202010302020500
-000005420000050000000565010005000100051b0100050201000544010005000100051b
-01000544010005020100050d010002020103020200000544000005670100051d01020546
-0100051c010005450102050d010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-0000050a010305120100051301000506010005ff054c01000202010302020000050b0100
-05020100051101000513010005ff05530100050002020103020205000000050a01000502
-010005010100050001010503010205020104050201020503010205020104050201020503
-010205020100050001010504010105ff053701000202010302020000050b010005020100
-050101010501010005010100050201000503010005030100050201000501010005020100
-0503010005060100050201000502010005010101050101000503010105ff053601000500
-02020103020205000000050a010305020100050501000502010005030100050301000502
-01000501010005070100050601000502010005020100050101000502010005ff053d0100
-0202010302020000050b0100050501000505010005020100050301000503010405010100
-05070100050601000502010005020100050101000502010005ff053c0100050002020103
-020205000000050a01000505010005050100050201000503010005030100050501000507
-0100050601000502010005020100050101000502010005ff053d01000202010302020000
-050b01000505010005050100050201000503010005030100050201000501010005020100
-0503010005060100050201000502010005010100050201000503010105ff053601000500
-02020103020205000000050a010005050100050601020505010105020102050301020505
-0101050401000503010205020100050201000503010105ff053701000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005440100
-0567000005670000057401000500020201030202050000000542010005000100051b0100
-050601020505010005370000050000000524010005130100050e0100051a000005000000
-051e010005120100054001000202010302020000054201000500010005000100051a0100
-05080100053d000005000000050000000523010005130100050e01000519000005000000
-0500000005310100053f0100050002020103020205000000054001000500010006010500
-0100050b0100050001010502010005020100050101000500010105050100050301020503
-0102052e00000500000005020000050b0100050001010502010005000101050301020502
-010405020102050301020502010405020102050301010500010005180000050000000502
-0000050b0100050001010502010005000101050301020502010005020100050201020502
-0104050201020538010002020103020200000540010005000100060305000100050a0101
-050101000501010005020100050101010501010005040100050501000502010005020100
-052c00000500000005040000050a01010501010005010101050101000501010005020100
-050301000503010005020100050101000502010005030100050301000502010005010100
-05010101051700000500000005040000050a010105010100050101010501010005040100
-050201000502010005010100050201000503010005030100050201000536010005000202
-0103020205000000053e0100050001000605050001000509010005020100050101000502
-01000501010005020100050401000505010005020100052f000005000000050600000509
-010005020100050101000505010005020100050301000503010005020100050101000507
-010005030100050201000501010005020100051600000500000005060000050901000502
-010005010100050801000502010005020100050501000503010005030100050201000537
-01000202010302020000053e000005000000060705000000050801000502010005010100
-050201000501010005020100050401000505010005020100052e01000500010005080100
-050801000502010005010100050501000502010005030100050301040501010005070100
-050301040501010005020100051501000500010005080100050801000502010005010100
-050801000503010005000100050301030503010005030104053601000500020201030202
-05000000053e000005000000060505000000050901000502010005010100050201000501
-010005020100050401000505010005020100052f01000500010005060100050901000502
-010005010100050501000502010005030100050301000505010005070100050301000505
-010005020100051601000500010005060100050901000502010005010100050801000503
-01000500010005020100050201000503010005030100053b010002020103020200000540
-000005000000060305000000050a01010501010005010100050101010501010105010100
-05040100050501000502010005020100052c01000500010005040100050a010105010100
-050101000505010005020100050301000503010005020100050101000502010005030100
-05030100050201000501010005010101051701000500010005040100050a010105010100
-050101000508010005040100050301000502010005030100050301000502010005360100
-0500020201030202050000000540000005000000060105000000050b0100050001010503
-0101050001000501010005000101050501000505010005030102052e0100050001000502
-0100050b0100050001010502010005060102050501010502010205030102050501010502
-01020503010105000100051801000500010005020100050b010005000101050201000508
-010005040100050401030504010105020102053801000202010302020000054200000500
-000005000000050c0100055501000500010005000100050c010005550100050001000500
-0100050c0100056401000500020201030202050000000542000005000000050d01000556
-010005000100050d01000556010005000100050d01000565010002020103020200000544
-0000050e010005570100050e010005570100050e01000564010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-02020103020205000000056f072d05ee010002020103020200000570072c000005ed0100
-050002020103020205000000056f0701002b05ee0100020201030202000005700701002b
-05ed0100050002020103020205000000056f0701002b05ee010002020103020200000570
-0701002b05ed0100050002020103020205000000056f0701002b05ee0100020201030202
-000005700701002b05ed0100050002020103020205000000050a010005020100052e0100
-05040100050601000521070100030100002605ee01000202010302020000050b01000501
-0100053501000529070100020101002605ed0100050002020103020205000000050a0100
-050001000504010205020100050201000508010005000101050301020503010205030102
-050201040502010205030102050201000500010105040101050c07010001010000000100
-002605ee01000202010302020000050b0101050401000502010005010100050201000508
-010105010100050101000502010005010100050201000504010005040100050601000502
-010005020100050101010501010005030101050c070100030100002605ed010005000202
-0103020205000000050a0100050001000503010005020100050201000501010005080100
-050201000501010005020100050101000508010005040100050601000502010005020100
-05010100050201000512070100030100002605ee01000202010302020000050b01000501
-010005020104050201000501010005080100050201000501010005020100050201020505
-010005040100050601000502010005020100050101000502010005120701000301000026
-05ed0100050002020103020205000000050a010005010100050201000507010005000100
-050801000502010005010100050201000505010005040100050401000506010005020100
-0502010005010100050201000512070100030100002605ee01000202010302020000050b
-010005020100050101000502010005030101050901010501010005010100050201000501
-010005020100050401000504010005060100050201000502010005010100050201000503
-0101050c070100030100002605ed0100050002020103020205000000050a010005020100
-050201020505010005090100050001010503010205030102050501000505010105040100
-05030102050201000502010005030101050c070100010104002405ee0100020201030202
-0000051c01000509010005470701002b05ed010005000202010302020500000005180100
-05000100050a010005470701002b05ee01000202010302020000051a0100050b01000547
-0701002b05ed0100050002020103020205000000056f0701002b05ee0100020201030202
-000005700701002b05ed0100050002020103020205000000056f0701002b05ee01000202
-01030202000005700701002b05ed0100050002020103020205000000056f0701002b05ee
-0100020201030202000005700700002c05ed010005000202010302020500000005ff058c
-0100020201030202000005ff058c010005000202010302020500000005ff058c01000202
-01030202000005ff058c010005000202010302020500000005ff058c0100020201030202
-000005ff058c010005000202010302020500000005ff058c0100020201030202000005ff
-058c010005000202010302020500000005ff058c0100020201030202000005ff058c0100
-05000202010302020500000005ff058c0100020201030202000005ff058c010005000202
-010302020500000005ff058c0100020201030202000005ff058c01000500020201030202
-0500000005ff058c0100020201030202000005ff058c0100050002020103020205000000
-05ff058c0100020201030202000005ff058c010005000202010302020500000005ff058c
-0100020201030202000005ff058c010005000202010302020500000005ff058c01000202
-01030202000005ff058c010005000202010302020500000005ff058c0100020201030202
-000005ff058c010005000202010302020500000005ff058c0100020201030202000005ff
-058c010005000202010302020500000005ff058c0100020201030202000005ff058c0100
-050002020103020205000000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000202010302020000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500020201030202
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000002020103020200000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000202010302020500000005ff058c
-0100020201030202000005ff058c010005000202010302020500000005ff058c01000202
-01030202000005ff058c010005000202010302020500000005ff058c0100020201030202
-000005ff058c010005000202010302020500000005ff058c0100020201030202000005ff
-058c010005000202010302020500000005ff058c0100020201030202000005ff058c0100
-05000202010302020500000005ff058c0100020201030202000005ff058c010005000202
-010302020500000005ff058c0100020201030202000005ff058c01000500020201030202
-0500000005ff058c0100020201030202000005ff058c0100050002020103020205000000
-05ff058c0100020201030202000005ff058c010005000202010302020500000005ff058c
-0100020201030202000005ff058c01000500020201030202050000000557010005000100
-05000100050001000500010005090102051e010005fe0100020201030202000005570100
-05000100050001000500010005000100050000000507010005020100051d010005fd0100
-050002020103020205000000055701000606000005080100050201000501010005000101
-050301020502010005000101050901000500010105020100050001010503010205020100
-050201000502010205030102050201000500010105d10100020201030202000005570100
-050006060500000005070100050201000501010105010100050101000502010005010101
-050101000508010105010100050101010501010005010100050201000501010005020100
-05010100050201000501010005020100050101010501010005cf01000500020201030202
-050000000557010006060000050801000502010005010100050201000501010005020100
-050101000502010005080100050201000501010005050100050201000501010005000100
-050001000501010005050100050201000501010005d40100020201030202000005570100
-050006060500000005070100050201000501010005020100050101040501010005020100
-050801000502010005010100050501000502010005010100050001000500010005020102
-050201040501010005d30100050002020103020205000000055701000606000005080100
-050201000501010005020100050101000505010005020100050801000502010005010100
-050501000502010005010100050001000500010005050100050101000505010005d40100
-020201030202000005570100050006060500000005070100050201000501010105010100
-050101000502010005010100050201000508010105010100050101000505010005020100
-050101000500010005000100050101000502010005010100050201000501010005d30100
-050002020103020205000000055701000606000005090102050201000500010105030102
-050201000502010005080100050001010502010005060102050301000500010005030102
-050301020502010005d40100020201030202000005570100050000000500000005000000
-0500000005000000050e010005ff05190100050002020103020205000000055700000500
-0000050000000500000005000000050f010005ff051a0100020201030202000005710100
-05ff0519010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-020200000556000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000052800000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005460100050002020103020205000000055400000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005280000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000548010002020103
-020200000556000005600100052800000560010005460100050002020103020205000000
-055400000560010005280000056001000548010002020103020200000556000005600100
-052800000560010005460100050002020103020205000000055400000560010005280000
-056001000548010002020103020200000556000005600100052800000560010005460100
-050002020103020205000000055400000560010005280000056001000548010002020103
-020200000556000005600100052800000560010005460100050002020103020205000000
-05540000052a01020502010005020100052a010005280000051c0102051f0102051d0100
-0548010002020103020200000556000005280100050201000501010005010100052c0100
-05280000051a01000502010005200100051e010005460100050002020103020205000000
-0554000005290100050201000501010005000100052c010005280000051b010005020100
-050201020502010005000101050301020503010205050100051d01000548010002020103
-0202000005560000052801000502010005010101052e010005280000051a010005050100
-0502010005010101050101000501010005020100050101000502010005040100051e0100
-054601000500020201030202050000000554000005290100050201000501010005000100
-052c010005280000051b0100050901000501010005020100050101000505010005020100
-05040100051d010005480100020201030202000005560000052801000502010005010100
-05010100052c010005280000051a01000506010305010100050201000501010005050104
-05040100051e010005460100050002020103020205000000055400000529010005020100
-0501010005010100052b010005280000051b010005020100050101000502010005010100
-05020100050101000505010005080100051d010005480100020201030202000005560000
-05280100050201000501010005020100052b010005280000051a01000502010005010100
-0502010005010100050201000501010005020100050101000502010005040100051e0100
-0546010005000202010302020500000005540000052a01020502010005020100052a0100
-05280000051c0102050301030501010005020100050201020503010205050100051d0100
-054801000202010302020000055600000560010005280000056001000546010005000202
-010302020500000005540000056001000528000005600100054801000202010302020000
-055600000560010005280000056001000546010005000202010302020500000005540000
-056001000528000005600100054801000202010302020000055600000560010005280000
-056001000546010005000202010302020500000005540000056001000528000005600100
-054801000202010302020000055600000560010005280000056001000546010005000202
-010302020500000005540000056001000528000005600100054801000202010302020000
-055600000560010005280000056001000546010005000202010302020500000005540000
-056001000528000005600100054801000202010302020000055600000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005280000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000546010005000202
-010302020500000005540000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000528000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001000500010005480100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c0100020201030202000005ff058c010005000202010302020500000005ff
-058c0100020201030202000005ff058c010005000202010302020500000005ff058c0100
-020201030202000005ff058c010005000202010302020500000005ff058c010002020103
-0202000005ff058c010005000202010302020500000005ff058c01000202010302020000
-05ff058c010005000202010302020500000005ff058c0100020201030202000005ff058c
-010005000202010302020500000005ff058c0100020201030202000005ff058c01000500
-0202010302020500000005ff058c0100020201030202000005ff058c0100050002020103
-02020500000005ff058c0100020201030202000005ff058c010005000202010302020500
-000005ff058c010002020101000505ff058c010005000005020204000500000005ff058c
-0100000002020400000002020400000005ff058c01000500000002020400000002020400
-0500000005ff058c01000000020204000000020204000000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500000002020400
-000002020400050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100000002020400000002020400000502ff028300060202
-040000000208040002ff028300000208040000000208040002ff02830000020804000000
-0208040001ff01830000020804000000040901ff018300000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 114 250 471
-%%EOF
diff --git a/lib/tv/doc/src/tv_record_editor_mnesia.gif b/lib/tv/doc/src/tv_record_editor_mnesia.gif
deleted file mode 100644
index fbbdcab515..0000000000
--- a/lib/tv/doc/src/tv_record_editor_mnesia.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_record_editor_mnesia.ps b/lib/tv/doc/src/tv_record_editor_mnesia.ps
deleted file mode 100644
index b4d19f963f..0000000000
--- a/lib/tv/doc/src/tv_record_editor_mnesia.ps
+++ /dev/null
@@ -1,897 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./tv_record_editor_mnesia.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:09:57 2001)
-%%BoundingBox: 0 41 300 330
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 41 300 330
-userdict begin
-%%BeginData:
-DisplayImage
-0 41
-300.000000 289.000000
-12
-385 371
-1
-0
-0
-8
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-999999
-000a01ff016a000b0208040001ff016a00000208040000000208040002ff026a00000208
-0400000002080400020000ff0067040002000000020804000000020204060200000004ff
-0467020000000405020204000000020204000209000d02ff025e00000202040000000202
-040002080000020d04000242010302110103023701010211010102020101022301010231
-01010206010102090101023e00000202040000000202040002080000020d040002420101
-02020107020001010203010102010101020e010402230101020601050204010102020101
-02020100021f01010201010002130100020c0100020b01010206010102090101023e0000
-0202040000000202040002080000020d0400024201010205010102030101020301010201
-0101020e0101020101010222010102060101020801010206010102200100020001010212
-0101020b0101020b010102060101020a0100023e00000202040000000202040002080000
-02020406020304000242010102050101020301010203010102010101020e010102010101
-020201030203010302020103020201010200010102010104020601010205010402020101
-0200010402010103020201010200010102000101020c0100020001040201010302030104
-0200010402080104020101030203010102000101020301010202010302020100023f0000
-020204000000040302080000020204000304000002030400024201010205010102040101
-0202010002020101020e0101020101000202010102010101020101010201010102000101
-020101010201010102000101020001010201010102060101020401010201010102020101
-020101010202010102010101020101010200010102000101020f01010202010102010101
-0201010102050101020b0101020201010201010102020102020001010202010102010101
-020101010242000004030101020b00000203040003020000020404000242010102050101
-020401010201010102020101020e01030203010102010101020101010204010102010101
-020101020202010102010101020601040201010102010101020201010201010102020101
-02010101020101020214010102020101020101010201010202040101020b010102060101
-020201010201010102020101020101010201010102450103020b00000203040003020000
-020404000242010102050101020501010200010002030101020e01010200010102020105
-020101010204010102010101020101010203010102010101020601010204010102010101
-020201010201010102020101020101010201010102150101020201050202010302020101
-020b0101020301040202010102010101020201010201010502450103020b000002040400
-030000000205040002420101020501010205010302030101020e01010200010102020101
-020501010204010102010101020101010203010102010101020601010204010102010101
-020201010201010102020101020101010201010102150101020201010208010202010101
-020b010102020101020101010202010102010101020201010201010102490103020b0000
-02040400030000000205040002420101020501010206010102040101020e010102010101
-020101010202010002010101020201000200010102010101020101010203010102000102
-020601010204010102000102020201010201010102020101020101010201010102030101
-020f010102020101020201000205010102010101020b0101020201010201010102020101
-0201010102020101020101010202010002450103020b0000020500000206040002420101
-020501010206010102040101020e01010201010202010103020301030202010302020101
-020401010200010102060105020101010200010102020101020201020201010302020101
-0203010102100102020101030202010402030102020a0102020101020200010102010104
-020301010202010302460103020b0000020d040002420103021101030293010602680103
-020b0000020d040002ff02600103020b0000020d040002ff02600103020c040d02ff0261
-010302ff027c010302ff027c0103020200ff00750400020201030202000004ff04750202
-010302ff027c010302020500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000202010302020000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050001000202010302020500000005ff057201000500020201030202000005ff05740100
-0202010302020500000005ff057201000500020201030202000005ff0574010002020103
-02020500000005ff057201000500020201030202000005ff057401000202010302020500
-000005ff057201000500020201030202000005ff057401000202010302020500000005ff
-057201000500020201030202000005ff057401000202010302020500000005ff05720100
-0500020201030202000005ff057401000202010302020500000005ff0572010005000202
-01030202000005ff057401000202010302020500000005ff057201000500020201030202
-000005ff057401000202010302020500000005ff057201000500020201030202000005ff
-057401000202010302020500000005ff057201000500020201030202000005ff05740100
-02020103020205000000054e01ff0116050c010005000202010302020000054f01ff0116
-050d010002020103020205000000054e010107ff07120101050c01000500020201030202
-0000054f010107ff071100000101050d010002020103020205000000054e0101070100ff
-00100101050c010005000202010302020000054f0101070100ff00100101050d01000202
-0103020205000000054e0101070100ff00100101050c010005000202010302020000054f
-010107010000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-00000300000003000000030000000300000003000000030000d00101050d010002020103
-020205000000054e01010701034000cf0101050c010005000202010302020000054f0101
-07010000033e010000cf0101050d010002020103020205000000054e0101070103130100
-030b01010304010003140100030100cf0101050c010005000202010302020000054f0101
-0701000003120100030a0100031c01000300010000cf0101050d01000202010302020500
-0000050f0100050001010503010205020101050001000503010205250101070103010100
-030201000301010003000101030301010300010003020102030401000304010203020100
-03000101030301020303010103000100030100cf0101050c010005000202010302020000
-051001010501010005010100050201000501010005000100050001000501010005020100
-052401010701000003000100030201000301010103010100030101000301010103010100
-030201000301010403040100030201010301010003010100030201000301010003010101
-0300010000cf0101050d010002020103020205000000050f010005020100050501000501
-010005000100050001000501010005020100052401010701030101000302010003010100
-030201000301010003020100030101000302010003030100030601000302010003020100
-03010100030201000301010003020100030100cf0101050c010005000202010302020000
-051001000502010005020103050101000500010005000100050101040524010107010000
-030001000302010003010100030201000301010003020100030101040303010003060100
-03020100030201000301010403010100030201000300010000cf0101050d010002020103
-020205000000050f01000502010005010100050201000501010005000100050001000501
-010005280101070103010100030201000301010003020100030101000302010003010100
-03070100030601000302010003020100030101000305010003020100030100cf0101050c
-010005000202010302020000051001000502010005010100050201000501010005000100
-050001000501010005020100052401010701000003000100030101010301010003020100
-030101000301010103010100030201000303010003060100030201000302010003010100
-0302010003010100030101010300010000cf0101050d010002020103020205000000050f
-010005020100050201030501010005000100050001000502010205250101070103020101
-030001000301010003020100030201010300010003020102030401000306010003020100
-03020100030201020303010103000100030100cf0101050c010005000202010302020000
-054f010107010000033e010000cf0101050d010002020103020205000000054e01010701
-034000cf0101050c010005000202010302020000054f010107010000033e010000cf0101
-050d010002020103020205000000054e0101070103000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-03000100030000cf0101050c010005000202010302020000054f0101070100ff00100101
-050d010002020103020205000000054e0101070100ff00100101050c0100050002020103
-02020000054f0101070100ff00100101050d010002020103020205000000054e01010701
-00ff00100101050c010005000202010302020000054f0101070000ff00110101050d0100
-02020103020205000000054e01ff0116050c010005000202010302020000054f01ff0116
-050d01000202010302020500000005ff057201000500020201030202000005ff05740100
-0202010302020500000005ff057201000500020201030202000005ff0574010002020103
-02020500000005ff057201000500020201030202000005ff057401000202010302020500
-000005ff057201000500020201030202000005ff057401000202010302020500000005ff
-057201000500020201030202000005ff057401000202010302020500000005ff05720100
-0500020201030202000005ff0574010002020103020205000000055007ff0712050e0100
-05000202010302020000055107ff07110000050f01000202010302020500000005500701
-00ff0010050e0100050002020103020200000551070100ff0010050f0100020201030202
-050000000550070100ff0010050e0100050002020103020200000551070100ff0010050f
-0100020201030202050000000550070100ff0010050e0100050002020103020200000551
-070100ff0010050f010002020103020205000000051a010005050100052d070100130100
-000b0101000401000014010000d1050e010005000202010302020000051b010005050100
-052d070100130100000a0100001c010000d1050f01000202010302020500000005100102
-050301010500010005020101050001000501010005000101050301020503010205030102
-051207010001010000020100000101000000010100030101000001000002010200040100
-00040102000201000000010100030102000301010000010000d1050e0100050002020103
-020200000510010005020100050101000501010105010100050101010501010105010100
-050101000502010005010100050201000501010005020100051107010001010000020100
-000101010001010000010100000101010001010000020100000101040004010000020101
-000101000001010000020100000101000001010100d1050f010002020103020205000000
-051301000501010005020100050101000502010005010100050501000502010005010100
-050501000515070100010100000201000001010000020100000101000002010000010100
-000201000003010000060100000201000002010000010100000201000001010000020100
-00d1050e0100050002020103020200000511010305010100050201000501010005020100
-050101000505010405020102050301020512070100010100000201000001010000020100
-000101000002010000010104000301000006010000020100000201000001010400010100
-0002010000d1050f010002020103020205000000050f0100050201000501010005020100
-050101000502010005010100050501000509010005050100051107010001010000020100
-000101000002010000010100000201000001010000070100000601000002010000020100
-00010100000501000002010000d1050e0100050002020103020200000510010005020100
-050101000501010105010100050101010501010005050100050201000501010005020100
-050101000502010005110701000101000001010100010100000201000001010000010101
-000101000002010000030100000601000002010000020100000101000002010000010100
-0001010100d1050f01000202010302020500000005100103050201010500010005020101
-050001000501010005060102050301020503010205120701000201010000010000010100
-000201000002010100000100000201020004010000060100000201000002010000020102
-000301010000010000d1050e0100050002020103020200000551070100ff0010050f0100
-020201030202050000000550070100ff0010050e01000500020201030202000005510701
-00ff0010050f0100020201030202050000000550070100ff0010050e0100050002020103
-020200000551070100ff0010050f0100020201030202050000000550070100ff0010050e
-0100050002020103020200000551070100ff0010050f0100020201030202050000000550
-070100ff0010050e0100050002020103020200000551070000ff0011050f010002020103
-02020500000005ff057201000500020201030202000005ff057401000202010302020500
-000005ff057201000500020201030202000005ff057401000202010302020500000005ff
-057201000500020201030202000005ff057401000202010302020500000005ff05720100
-0500020201030202000005ff057401000202010302020500000005ff0572010005000202
-01030202000005ff057401000202010302020500000005ff057201000500020201030202
-000005ff057401000202010302020500000005ff057201000500020201030202000005ff
-0574010002020103020205000000055007ff0712050e0100050002020103020200000551
-07ff07110000050f0100020201030202050000000550070100ff0010050e010005000202
-0103020200000551070100ff0010050f0100020201030202050000000550070100ff0010
-050e0100050002020103020200000551070100ff0010050f010002020103020205000000
-0550070100ff0010050e0100050002020103020200000551070100ff0010050f01000202
-010302020500000005190100052201000511070100130100000b01010004010000140100
-00d1050e010005000202010302020000053e01000511070100130100000a0100001c0100
-00d1050f010002020103020205000000050f0104050201020502010005000101050a0102
-05030102050301010500010005020102050b070100010100000201000001010000000101
-000301010000010000020102000401000004010200020100000001010003010200030101
-0000010000d1050e01000500020201030202000005140100050401000502010105010100
-0508010005020100050101000502010005010100050101010501010005020100050a0701
-000101000002010000010101000101000001010000010101000101000002010000010104
-0004010000020101000101000001010000020100000101000001010100d1050f01000202
-010302020500000005120100050501000502010005020100050801000505010005020100
-05010100050201000501010005020100050a070100010100000201000001010000020100
-000101000002010000010100000201000003010000060100000201000002010000010100
-00020100000101000002010000d1050e0100050002020103020200000512010005060100
-0502010005020100050801000505010005020100050101000502010005010104050a0701
-000101000002010000010100000201000001010000020100000101040003010000060100
-000201000002010000010104000101000002010000d1050f010002020103020205000000
-051001000507010005020100050201000508010005050100050201000501010005020100
-05010100050e070100010100000201000001010000020100000101000002010000010100
-0007010000060100000201000002010000010100000501000002010000d1050e01000500
-020201030202000005100100050801000502010105010100050801000502010005010100
-0502010005010100050101010501010005020100050a0701000101000001010100010100
-000201000001010000010101000101000002010000030100000601000002010000020100
-0001010000020100000101000001010100d1050f010002020103020205000000050f0104
-050401000502010005000101050a010205030102050301010500010005020102050b0701
-000201010000010000010100000201000002010100000100000201020004010000060100
-000201000002010000020102000301010000010000d1050e010005000202010302020000
-051e0100050401050526070100ff0010050f010002020103020205000000051d01000531
-070100ff0010050e010005000202010302020000051e01000531070100ff0010050f0100
-020201030202050000000550070100ff0010050e01000500020201030202000005510701
-00ff0010050f0100020201030202050000000550070100ff0010050e0100050002020103
-020200000551070100ff0010050f0100020201030202050000000550070100ff0010050e
-0100050002020103020200000551070000ff0011050f01000202010302020500000005ff
-057201000500020201030202000005ff057401000202010302020500000005ff05720100
-0500020201030202000005ff057401000202010302020500000005ff0572010005000202
-01030202000005ff057401000202010302020500000005ff057201000500020201030202
-000005ff057401000202010302020500000005ff057201000500020201030202000005ff
-057401000202010302020500000005ff057201000500020201030202000005ff05740100
-0202010302020500000005ff057201000500020201030202000005ff0574010002020103
-020205000000055007ff0712050e010005000202010302020000055107ff07110000050f
-0100020201030202050000000550070100ff0010050e0100050002020103020200000551
-070100ff0010050f0100020201030202050000000550070100ff0010050e010005000202
-0103020200000551070100ff0010050f0100020201030202050000000550070100ff0010
-050e0100050002020103020200000551070100ff0010050f010002020103020205000000
-05180100050c01000528070100130100000b0101000401000014010000d1050e01000500
-020201030202000005190100050c01000528070100130100000a0100001c010000d1050f
-010002020103020205000000051001020502010405020102050201040502010205200701
-000101000002010000010100000001010003010100000100000201020004010000040102
-000201000000010100030102000301010000010000d1050e010005000202010302020000
-0510010005020100050301000503010005020100050301000503010005020100051f0701
-000101000002010000010101000101000001010000010101000101000002010000010104
-0004010000020101000101000001010000020100000101000001010100d1050f01000202
-0103020205000000050f01000507010005070100050301000503010005020100051f0701
-000101000002010000010100000201000001010000020100000101000002010000030100
-0006010000020100000201000001010000020100000101000002010000d1050e01000500
-02020103020200000511010205040100050401030503010005030104051f070100010100
-000201000001010000020100000101000002010000010104000301000006010000020100
-0002010000010104000101000002010000d1050f01000202010302020500000005130100
-050301000503010005020100050301000503010005230701000101000002010000010100
-000201000001010000020100000101000007010000060100000201000002010000010100
-000501000002010000d1050e010005000202010302020000051001000502010005030100
-0503010005020100050301000503010005020100051f0701000101000001010100010100
-000201000001010000010101000101000002010000030100000601000002010000020100
-0001010000020100000101000001010100d1050f01000202010302020500000005100102
-050501010502010305040101050201020520070100020101000001000001010000020100
-000201010000010000020102000401000006010000020100000201000002010200030101
-0000010000d1050e0100050002020103020200000551070100ff0010050f010002020103
-0202050000000550070100ff0010050e0100050002020103020200000551070100ff0010
-050f0100020201030202050000000550070100ff0010050e010005000202010302020000
-0551070100ff0010050f0100020201030202050000000550070100ff0010050e01000500
-02020103020200000551070100ff0010050f0100020201030202050000000550070100ff
-0010050e0100050002020103020200000551070000ff0011050f01000202010302020500
-000005ff057201000500020201030202000005ff057401000202010302020500000005ff
-057201000500020201030202000005ff057401000202010302020500000005ff05720100
-0500020201030202000005ff057401000202010302020500000005ff0572010005000202
-01030202000005ff057401000202010302020500000005ff057201000500020201030202
-000005ff057401000202010302020500000005ff057201000500020201030202000005ff
-057401000202010302020500000005ff057201000500020201030202000005ff05740100
-02020103020205000000055007ff0712050e010005000202010302020000055107ff0711
-0000050f0100020201030202050000000550070100ff0010050e01000500020201030202
-00000551070100ff0010050f0100020201030202050000000550070100ff0010050e0100
-050002020103020200000551070100ff0010050f01000202010302020500000005500701
-00ff0010050e0100050002020103020200000551070100ff0010050f0100020201030202
-05000000052d01000521070100130100000b0101000401000014010000d1050e01000500
-0202010302020000052e01000521070100130100000a0100001c010000d1050f01000202
-010302020500000005100102050301020502010005020100050101000500010105020104
-050101000500010105020100050201000511070100010100000201000001010000000101
-000301010000010000020102000401000004010200020100000001010003010200030101
-0000010000d1050e01000500020201030202000005100100050201000501010005020100
-050101000502010005010101050101000503010005030101050101000501010005020100
-051107010001010000020100000101010001010000010100000101010001010000020100
-000101040004010000020101000101000001010000020100000101000001010100d1050f
-010002020103020205000000050f01000505010005020100050101000502010005010100
-050201000503010005030100050601000501010005110701000101000002010000010100
-000201000001010000020100000101000002010000030100000601000002010000020100
-0001010000020100000101000002010000d1050e01000500020201030202000005100100
-050501000502010005010100050201000501010005020100050301000503010005060100
-050101000511070100010100000201000001010000020100000101000002010000010104
-0003010000060100000201000002010000010104000101000002010000d1050f01000202
-0103020205000000050f0100050501000502010005010100050201000501010005020100
-050301000503010005070100050001000511070100010100000201000001010000020100
-000101000002010000010100000701000006010000020100000201000001010000050100
-0002010000d1050e01000500020201030202000005100100050201000501010005020100
-050101000501010105010100050201000503010005030100050701010512070100010100
-000101010001010000020100000101000001010100010100000201000003010000060100
-00020100000201000001010000020100000101000001010100d1050f0100020201030202
-050000000510010205030102050301010500010005010100050201000504010105010100
-050801000512070100020101000001000001010000020100000201010000010000020102
-0004010000060100000201000002010000020102000301010000010000d1050e01000500
-0202010302020000053d01000512070100ff0010050f0100020201030202050000000539
-0100050001000513070100ff0010050e010005000202010302020000053b010005140701
-00ff0010050f0100020201030202050000000550070100ff0010050e0100050002020103
-020200000551070100ff0010050f0100020201030202050000000550070100ff0010050e
-0100050002020103020200000551070100ff0010050f0100020201030202050000000550
-070100ff0010050e0100050002020103020200000551070000ff0011050f010002020103
-02020500000005ff057201000500020201030202000005ff057401000202010302020500
-000005ff057201000500020201030202000005ff057401000202010302020500000005ff
-057201000500020201030202000005ff057401000202010302020500000005ff05720100
-0500020201030202000005ff057401000202010302020500000005ff0572010005000202
-01030202000005ff057401000202010302020500000005ff057201000500020201030202
-000005ff057401000202010302020500000005ff057201000500020201030202000005ff
-057401000202010302020500000005ff057201000500020201030202000005ff05740100
-0202010302020500000005ff057201000500020201030202000005ff0574010002020103
-02020500000005ff057201000500020201030202000005ff057401000202010302020500
-000005ff052f000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050b01000500020201030202000005ff052f00000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000050000000500000005000100050b0100
-0202010302020500000005ff052f000005340100050b01000500020201030202000005ff
-052f000005360100050b01000202010302020500000005ff052f0000052a060005080100
-050b01000500020201030202000005ff052f0000050906000502060005110600050a0600
-05080100050b01000202010302020500000005ff052f0000050806010501060005110600
-050b060005060100050b01000500020201030202000005ff052f00000509060105010600
-05020602050206000502060005010604050a060005060100050b01000202010302020500
-000005ff052f000005080600050006000500060005010600050206000501060005020600
-05030600050d060005040100050b01000500020201030202000005ff052f000005090600
-05000600050006000501060005020600050206000500060005040600050e060005040100
-050b01000202010302020500000005ff052f000005080600050106010501060405030600
-05050600050d060005040100050b01000500020201030202000005ff052f000005090600
-0501060105010600050606000500060005040600050c060005060100050b010002020103
-02020500000005ff052f0000050806000502060005010600050206000501060005020600
-05030600050b060005060100050b01000500020201030202000005ff052f000005090600
-05020600050206020502060005020600050406010508060005080100050b010002020103
-02020500000005ff052f0000052a060005080100050b01000500020201030202000005ff
-052f000005360100050b01000202010302020500000005ff052f000005340100050b0100
-0500020201030202000005ff052f000005360100050b01000202010302020500000005ff
-052f000005340100050b01000500020201030202000005ff052f000005360100050b0100
-0202010302020500000005ff052f00000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001000500010005000100050b01000500020201030202000005ff052f0000
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050b01000202010302020500000005ff057201000500020201030202000005ff
-057401000202010302020500000005ff057201000500020201030202000005ff05740100
-0202010302020500000005ff057201000500020201030202000005ff0574010002020103
-02020500000005ff057201000500020201030202000005ff057401000202010302020500
-000005ff057201000500020201030202000005ff057401000202010302020500000005ff
-057201000500020201030202000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100020201030202050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500020201030202050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500020201030202000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-0000050001000202010302020500000005ff057201000500020201030202000005ff0574
-01000202010302020500000005ff057201000500020201030202000005ff057401000202
-010302020500000005ff057201000500020201030202000005ff05740100020201030202
-0500000005ff057201000500020201030202000005ff0574010002020103020205000000
-05ff057201000500020201030202000005ff057401000202010302020500000005ff0572
-01000500020201030202000005ff057401000202010302020500000005ff057201000500
-020201030202000005ff057401000202010302020500000005ff05720100050002020103
-0202000005ff057401000202010302020500000005ff0572010005000202010302020000
-05ff057401000202010302020500000005ff057201000500020201030202000005ff0574
-01000202010302020500000005ff057201000500020201030202000005ff057401000202
-010302020500000005ff0572010005000202010302020000052e00000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000517000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005170000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0528010002020103020205000000052c0000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000051700000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000517000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005280100050002020103
-02020000052e0000054c010005170000054c010005170000054c01000528010002020103
-020205000000052c0000054c010005170000054c010005170000054c0100052801000500
-0202010302020000052e0000054c010005170000054c010005170000054c010005280100
-02020103020205000000052c0000054c010005170000054c010005170000054c01000528
-010005000202010302020000052e0000054c010005170000054c010005170000054c0100
-0528010002020103020205000000052c0000054c010005170000054c010005170000054c
-01000528010005000202010302020000052e0000054c010005170000054c010005170000
-054c01000528010002020103020205000000052c000005110104051f0100051401000517
-000005120102051f01020513010005170000051401030519010005180100052801000500
-0202010302020000052e0000051201000521010005150100051700000510010005020100
-052001000514010005170000051301000502010005180100051901000528010002020103
-020205000000052c00000513010005030100050001010503010205030102050201000500
-010105020104051201000517000005110100050201000502010205020100050001010503
-010205030102050501000513010005170000051401000502010005020102050301020503
-010205020104051601000528010005000202010302020000052e00000512010005030101
-050101000501010005020100050101000502010005010101050101000503010005150100
-051700000510010005050100050201000501010105010100050101000502010005010100
-050201000504010005140100051700000513010005020100050101000502010005010100
-05020100050101000502010005030100051901000528010002020103020205000000052c
-000005130100050301000502010005010100050501000502010005010100050701000514
-010005170000051101000509010005010100050201000501010005050100050201000504
-010005130100051700000514010305020100050201000501010005050100050201000503
-0100051801000528010005000202010302020000052e0000051201000503010005020100
-050201020502010405010100050701000515010005170000051001000506010305010100
-050201000501010005050104050401000514010005170000051301000501010005020104
-050201020502010405030100051901000528010002020103020205000000052c00000513
-010005030100050201000505010005010100050501000507010005140100051700000511
-010005020100050101000502010005010100050201000501010005050100050801000513
-010005170000051401000502010005010100050901000501010005070100051801000528
-010005000202010302020000052e00000512010005030100050201000501010005020100
-050101000502010005010100050701000515010005170000051001000502010005010100
-050201000501010005020100050101000502010005010100050201000504010005140100
-051700000513010005020100050101000502010005010100050201000501010005020100
-05030100051901000528010002020103020205000000052c000005110104050101000502
-010005020102050301020502010005080101051201000517000005120102050301030501
-010005020100050201020503010205050100051301000517000005140100050201000502
-0102050301020503010205050101051601000528010005000202010302020000052e0000
-054c010005170000054c010005170000054c01000528010002020103020205000000052c
-0000054c010005170000054c010005170000054c01000528010005000202010302020000
-052e0000054c010005170000054c010005170000054c0100052801000202010302020500
-0000052c0000054c010005170000054c010005170000054c010005280100050002020103
-02020000052e0000054c010005170000054c010005170000054c01000528010002020103
-020205000000052c0000054c010005170000054c010005170000054c0100052801000500
-0202010302020000052e0000054c010005170000054c010005170000054c010005280100
-02020103020205000000052c0000054c010005170000054c010005170000054c01000528
-010005000202010302020000052e0000054c010005170000054c010005170000054c0100
-0528010002020103020205000000052c0000054c010005170000054c010005170000054c
-01000528010005000202010302020000052e000005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005170000
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100051700000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000528010002020103
-020205000000052c00000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000517000005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005170000050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100052801000500020201030202000005ff0574
-01000202010302020500000005ff057201000500020201030202000005ff057401000202
-010302020500000005ff057201000500020201030202000005ff05740100020201030202
-0500000005ff057201000500020201030202000005ff0574010002020103020205000000
-05ff057201000500020201030202000005ff057401000202010302020500000005ff0572
-01000500020201030202000005ff057401000202010302020500000005ff057201000500
-020201030202000005ff057401000202010302020500000005ff05720100050002020103
-0202000005ff057401000202010100040500000005ff0572010005000005020204000000
-05ff057401000000020204000000020204000500000005ff057201000500000002020400
-000002020400000005ff0574010000000202040000000202040005000000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050000000202040000000202040000000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010000000202040000000202
-0400000502ff026a00060202040000000208040002ff026a000002080400000002080400
-02ff026a00000208040000000208040001ff016a0000020804000000040901ff016a0000
-0409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 41 300 330
-%%EOF
diff --git a/lib/tv/doc/src/tv_row_marked.gif b/lib/tv/doc/src/tv_row_marked.gif
deleted file mode 100644
index bc80eb34f1..0000000000
--- a/lib/tv/doc/src/tv_row_marked.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_row_marked.ps b/lib/tv/doc/src/tv_row_marked.ps
deleted file mode 100644
index 99631c5046..0000000000
--- a/lib/tv/doc/src/tv_row_marked.ps
+++ /dev/null
@@ -1,1611 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./tv_row_marked.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:11:48 2001)
-%%BoundingBox: 0 61 377 359
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 61 377 359
-userdict begin
-%%BeginData:
-DisplayImage
-0 61
-377.000000 298.000000
-12
-719 569
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-00ff00
-ff0000
-990000
-7f7f7f
-999999
-ff7f7f
-c8ffff
-009900
-7fff7f
-000a01ff01ff01b8000b0208040001ff01ff01b800000208040000000208040002ff02ff
-02b8000002080400000002080400020000ff00ff00b50400020000000208040000000202
-04060200000004ff04ff04b5020000000405020204000000020204000209000d02ff02ff
-02ac00000202040000000202040002080000020d04000274010302110103023201020258
-0102020c010102010101021e010102290101020601010208010102310101022a01010230
-0101028200000202040000000202040002080000020d0400027401010202010702000101
-0203010102010101020e01050200010702010103020d0101020401010204010302030103
-020e010302060103020301030203010302060103020b0101020a01010202010102190100
-02030101021c0100020b01010206010102090101021b010202020100020d0101022a0101
-020c0104021e0101028200000202040000000202040002080000020d0400027401010205
-0101020301010203010102010101020e0101020701010203010102010101020c01010202
-010302030101020101010201010102010101020801010201010102010101020401010201
-01010201010102010101020101010201010102040101020101010201010102060101020a
-0101020201010218010102210101020b01010206010102090101021b010202020100020d
-01010238010102020101021d010102820000020204000000020204000208000002020406
-020304000274010102050101020301010203010102010101020e01010207010102030101
-020501010209010102030101020701010201010102010101020601020202010102010101
-020801010201010102010101020101010201010102040101020101010202010202030101
-020a01010203010102020103020301030202010302010104020101010202010302030101
-02000101020a0104020101030203010102000101020301010202010302030101021a0100
-020001010201010002020103020301040202010302020101020901010200010102010101
-020301030203010102020101020001010202010102010103020201010200010102010101
-020301030202010102000101020101010202010302020101020201010271000002020400
-000004030208000002020400030400000203040002740101020501010204010102020100
-02020101020e0101020701010203010202040101020a0100020301010207010102010101
-020101010205010102040101020101010208010102010101020101010201010102010101
-02040101020101010204010102020100020b010102030101020101010201010102010101
-020101010200010102010101020101010203010102010101020101010202010202000101
-020a01010202010102010101020201020200010102020101020101010201010102020101
-021a01000200010102010100020101010201010102010101020101010201010102010101
-020101010209010202000102020001010201010102010101020201010202010202000101
-020101010200010102000101020201020200010202000101020101010201010102010101
-0200010102010101020101010201010102010101020201010271000004030101020b0000
-0203040003020000020404000274010102050101020401010201010102020101020e0104
-0204010102040103020d0101020401010205010202020101020101010204010102050101
-020101010207010102020101020101010202010402040101020101010205010102020101
-020901010203010102010101020101010201010102080101020101010203010102010101
-020101010202010102010101020a01010206010102020101020101010202010102010101
-0201010102020101021a0100020001020200010002010101020101010201010102010101
-0201010102010101020d0101020101010201010102050101020201010202010102010101
-020101010200010102000101020201010201010102010101020501010201010202030101
-0201010102010101020101010202010002750103020b0000020304000302000002040400
-0274010102050101020501010200010002030101020e01010207010102060102020e0100
-020301010207010102010101020101010205010102040101020101010206010102030101
-020101010205010102040101020101010204010102020100020b01010203010102010101
-020101010201010102050104020101010203010102010101020101010202010102010101
-020a0101020301040202010102010101020201010201010502020101021a010002010101
-020001000201010102010101020101010201010102010105020d01010201010102010101
-020201040202010102020101020101010201010102000101020001010202010102010101
-0201010102020104020101010204010102010105020201010200010102750103020b0000
-02040400030000000205040002740101020501010205010302030101020e010102070101
-02070101020d010102030101020701010201010102010101020601020202010102010101
-0205010102040101020101010205010102040101020101010202010202030101020a0101
-020301010201010102010101020101010204010102010101020101010203010102010101
-020101010202010102010101020a01010202010102010101020201010201010102020101
-0201010102060101021a0100020201020201010102010101020101010201010102010101
-021101010201010102010101020101010201010102020101020201010201010102010101
-020101010200010102010101020101010201010102010101020101010201010102040101
-02010101020601010200010002760103020b000002040400030000000205040002740101
-020501010206010102040101020e01010207010102030101020101010201010102080101
-020401010203010102010101020101010201010102010101020401010201010102010101
-020101010200010502010101020101010201010102010101020101010200010102010101
-0201010102060101020a0101020201010201010102010101020101010202010002000101
-02010101020101010203010102010101020101010202010102010101020a010102020101
-02010101020201010201010102020101020101010202010002010101021b010002020102
-020101010201010102010101020001020201010102020100020101010209010102010101
-020101010201010102010101020201010202010102010101020201010207010102010101
-020101010201010102010101020101010204010102010101020201000203010202760103
-020b0000020500000206040002740101020501010206010102040101020e010502030101
-020401030202010102080101020401010204010302030103020201010209010302020101
-0200010502020103020301030202010102010103020b0101020a01010202010102020103
-0203010302020102020001010201010202010101020201030203010102010101020b0102
-020101020200010102010104020301010202010302020101021b01000203010102020103
-020301010200010102020103020201010209010102010101020101010202010202000101
-020101010202010102010101020301050202010102010101020101010202010202000101
-0200010102040101020201030204010102770103020b0000020d04000274010302110103
-0232010202190100023d0102020c01010237010602230101029e010102780103020b0000
-020d040002dd010002ff0254010102780103020b0000020d040002ff02ff02ae0103020c
-040d02ff02ff02af010302ff02ff02ca010302ff02ff02ca0103020200ff00ff00c30400
-020201030202000004ff04ff04c30202010302ff02ff02ca010302020500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500020201030202000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500010002020103020205000000
-05ff05ff05c001000500020201030202000005ff05ff05c2010002020103020205000000
-05ff05ff05c001000500020201030202000005ff05ff05c2010002020103020205000000
-05ff05ff05c0010005000202010302020000050c06040504060005030602051f06040505
-0600050406000504060005190600050206000504060005270602050b06000506060005ff
-05df060005020600050906020514010002020103020205000000050b0600050f0600051f
-060005090600050a06000519060005020600052c060005020600050a060005ff05e70600
-05020600050b06000513010005000202010302020000050c060005060602050506000503
-060205180600050606010500060005020602050206040517060005020600050206020503
-060205020600050206000517060005020600050106000500060105020604050206020503
-060205020600050006010503060205ff05ca060005020600050206020505060005020600
-05000601050d010002020103020205000000050b06000508060005050600050206000502
-06000517060005050600050106010504060005040600051a060005000600050506000502
-060005020600050106000502060005170600050206000501060105010600050306000506
-060005020600050206000501060105010600050106000502060005ff05c9060005020600
-0501060005020600050406000502060105010600050b010005000202010302020000050c
-060305050600050506000502060005020600051706030502060005020600050406000504
-0600051a0600050006000505060005020600050206000501060005000600050006000517
-060005020600050106000502060005030600050606000502060005020600050106000502
-06000501060005ff05cd06040501060005020600050406000502060005020600050c0100
-02020103020205000000050b060005080600050506000502060405170600050506000502
-06000504060005040600051a060005000600050506000502060405010600050006000500
-060005170600050206000501060005020600050306000506060005020600050206000501
-0600050206000502060205ff05ca06000502060005010604050406000502060005020600
-050b010005000202010302020000050c0600050806000505060005020600051b06000505
-0600050206000504060005040600051b0600050606000502060005050600050006000500
-060005170600050206000501060005020600050306000506060005020600050206000501
-0600050206000505060005ff05c906000502060005010600050806000502060005020600
-050c010002020103020205000000050b0600050806000505060005020600050206000517
-060005050600050106010504060005040600051b06000506060005020600050206000501
-060005000600050006000517060005020600050106010501060005030600050606000502
-0600050206000501060005020600050106000502060005ff05c906000502060005010600
-05020600050406000502060105010600050b010005000202010302020000050c06000508
-060005050600050306020518060405020601050006000504060005050601051906000506
-060005030602050306000500060005190602050206000500060105050601050406000503
-060205020600050206000502060205ff05ca060005020600050206020505060005020600
-05000601050d01000202010302020500000005a8060005ff05ff05050600050f01000500
-0202010302020000050b0606052a0606052a0606052a06060500060005ff05ef0606050e
-06000510010002020103020205000000050a0606052a0606052a0606052a060605000600
-05ff05ef0606050e0600050f01000500020201030202000005ff05ff05c2010002020103
-02020500000005ff05ff05c001000500020201030202000005ff05ff05c2010002020103
-020205000000050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000202010302020000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-02020103020205ff05ff05c402020103020205ff05ff05c402020103020205ff05ff05c4
-02020103020205ff05ff05c402020103020205ff05ff05c402020103020205ff05ff05c4
-02020103020205ff05ff05c402020103020205ff05ff05c4020201030202053600000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000051a00000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050100000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050100000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000051a00000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000051a00000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000051a00000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-00000500000005ff057c0202010302020535000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500010005180000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000100000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500010000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050001000518000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500010005180000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000100
-051800000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500010005ff057b0202010302020536000005140100051a
-00000514010005010000051401000501000005140100051a000005140100051a00000514
-0100051a00000514010005ff057c02020103020205350000051601000518000005160100
-000005160100000005160100051800000516010005180000051601000518000005160100
-05ff057b0202010302020536000005140100051a00000514010005010000051401000501
-000005140100051a000005140100051a000005140100051a00000514010005ff057c0202
-010302020535000005050602050306020506010005180000051601000000051601000000
-0516010005180000051601000518000005160100051800000516010005ff057b02020103
-020205360000050406020503060205050100051a00000514010005010000051401000501
-000005140100051a00000506060405080100051a00000508060105090100051a00000508
-06030507010005ff057c0202010302020535000005040604050106040505010005180000
-051006000504010000000510060005040100000005040600051001000518000005050608
-0507010005180000050806030509010005180000050706070506010005ff057b02020103
-0202053600000503060005010601050106000501060105040100051a0000050f06000503
-010005010000050f0600050301000501000005030600050f0100051a00000503060a0505
-0100051a00000507060305080100051a000005050603050106030504010005ff057c0202
-01030202053500000503060d0504010005180000050d0600050106000504010000000504
-0600050a06000504010000000504060005010600050d0100051800000504060305020603
-050601000518000005090601050a01000518000005060602050306020505010005ff057b
-020201030202053600000501060005000603050006020500060405020100051a0000050c
-060005010600050301000501000005030600050a06000503010005010000050306000501
-0600050c0100051a0000050206030504060305040100051a000005140100051a00000505
-0602050306020504010005ff057c02020103020205350000050206000500060305000602
-050006040503010005180000050a06000501060005010600050401000000050406000504
-060005040600050401000000050406000501060005010600050a01000518000005030602
-050306070503010005180000050706040509010005180000050706010502060205060100
-05ff057b020201030202053600000501060005000603050006020500060405020100051a
-000005090600050106000501060005030100050100000503060005040600050406000503
-01000501000005030600050106000501060005090100051a000005020602050406050503
-0100051a00000507060305080100051a0000050a06020506010005ff057c020201030202
-053500000502060005000603050006020500060405030100051800000507060005010600
-050106000501060005040100000005040600050406000501060005010600050401000000
-050406000501060005010600050106000507010005180000050306020505060305050100
-05180000050906020509010005180000050a06020508010005ff057b0202010302020536
-000005010600050006070500060405020100051a00000506060005010600050106000501
-060005030100050100000503060005040600050106000501060005030100050100000503
-060005010600050106000501060005060100051a0000050206030505060105050100051a
-00000508060205080100051a0000050806020508010005ff057c02020103020205350000
-050206000500060405010600050006040503010005180000050406000501060005010600
-050106000501060005040100000005040600050106000501060005010600050106000504
-010000000504060005010600050106000501060005010600050401000518000005040603
-050d010005180000050906020509010005180000050906020509010005ff057b02020103
-020205360000050106060501060605020100051a00000503060005010600050106000501
-060005010600050301000501000005030600050106000501060005010600050106000503
-010005010000050306000501060005010600050106000501060005030100051a00000503
-060905060100051a00000508060205080100051a00000514010005ff057c020201030202
-053500000502060005000602050506000500060205030100051800000504060005010600
-050106000501060005010600050401000000050406000501060005010600050106000501
-060005040100000005040600050106000501060005010600050106000504010005180000
-050506070508010005180000050806040508010005180000050906020509010005ff057b
-020201030202053600000501060005000602050506000500060205020100051a00000503
-060005010600050106000501060005010600050301000501000005030600050106000501
-060005010600050106000503010005010000050306000501060005010600050106000501
-060005030100051a00000506060405080100051a00000506060605060100051a00000508
-06020508010005ff057c0202010302020535000005020604050506040503010005180000
-051601000000051601000000051601000518000005160100051800000516010005180000
-0516010005ff057b0202010302020536000005140100051a000005140100050100000514
-01000501000005140100051a000005140100051a000005140100051a00000514010005ff
-057c02020103020205350000051601000518000005160100000005160100000005160100
-05180000051601000518000005160100051800000516010005ff057b0202010302020536
-000005140100051a00000514010005010000051401000501000005140100051a00000514
-0100051a000005140100051a00000514010005ff057c0202010302020535000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005180000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100000005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010000000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000518000005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005180000
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100051800000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001000500010005ff057b02020103
-020205360100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100051a0100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005010100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005010100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100051a0100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000100051a0100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100051a0100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005ff057c02020103020205ff05ff05c4020201030202
-05ff05ff05c402020103020205ff05ff05c402020103020205ff05ff05c4020201030202
-05ff05ff05c402020103020205ff05ff05c402020103020205ff05ff05c4020201030202
-05ff05ff05c402020103020205ff05ff05c402020103020205ff05ff05c4020201030202
-05ff05ff05c4020201030202050301ff01ff01bc0503020201030202050301ff01ff01a8
-050000000500000005000000050000000500000005000000050000000500000005000000
-050001000503020201030202050301ff01ff01a800000500000005000000050000000500
-000005000000050000000500000005000000050001010503020201030202050301020bff
-0bff0ba2010205000000050e0100050001000503020201030202050301020bff0bff0ba1
-000001020000051001010503020201030202050301020b0100ff00ff00a0010205000000
-050e0100050001000503020201030202050301020b0100040101007101010002010100ff
-00ff002001020000051001010503020201030202050301020b0100030100007501000001
-010100ff00ff0020010205000000050e0100050001000503020201030202050301020b01
-000301000003010000160100001001000006010200100100000c0100001c010000010101
-00ff00ff002001020000051001010503020201030202050301020b010003010000030100
-002801000008010000100100000c0100001c01000001010100ff00ff0020010205000000
-050e0100050001000503020201030202050301020b010003010000030100000101000003
-010200020100000001010003010200020100000001010009010000000101000501000003
-010200030102000201000001010000030102000201000000010100030102000201000000
-01010003010100000100000301000001010100ff00ff0020010200000502010a05020101
-0503020201030202050301020b0100030100000301000000010000030100000201000001
-010100010100000401000002010100010100000801010001010000040100000201000002
-010000010100000201000001010000000100000301000002010000010101000101000001
-01000002010000010101000101000001010000010101000301000001010100ff00ff0020
-0102050000000502010805020100050001000503020201030202050301020b0100010101
-000401010008010000010100000801000002010000020100000801000002010000040100
-000601000001010000050101000401000002010000010100000201000001010000020100
-0001010000050100000201000004010300ff00ff00200102000005040106050401010503
-020201030202050301020b01000301000003010100050103000101000008010000020100
-000201000008010000020100000401000003010300010100000501010004010400010100
-0002010000010104000101000005010000020100000301000001010100ff00ff00200102
-050000000504010405040100050001000503020201030202050301020b01000301000003
-010000000100000301000002010000010100000801000002010000020100000801000002
-010000040100000201000002010000010100000501000000010000030100000501000002
-010000010100000501000005010000020100000301000001010100ff00ff002001020000
-05060102050601010503020201030202050301020b010003010000030100000101000002
-010000020100000101000008010000020100000201000003010100020101000101000004
-010000020100000201000001010000020100000101000001010000020100000201000001
-0101000101000001010000020100000101000005010000010101000301000001010100ff
-00ff00200102050000000506010005060100050001000503020201030202050301020b01
-000301000003010000020100000201030001010000080100000201000002010000030101
-000201000000010100050100000301030002010200020100000201000002010200020100
-0000010100030102000201000006010100000100000301000001010100ff00ff00200102
-0000051001010503020201030202050301020b0100030100002901000045010000030100
-0001010100ff00ff0020010205000000050e010005000100050302020103020205030102
-0b0100040101002501010042010000020100000101010002010100ff00ff002001020000
-051001010503020201030202050301020b01007201020007010100ff00ff002001020500
-0000050e0100050001000503020201030202050301020b0100ff00ff00a0010200000510
-01010503020201030202050301020b0100ff00ff00a0010205000000050e010005000100
-0503020201030202050301020b0000ff00ff00a101020000051001010503020201030202
-050301ff01ff01a805000000050001000500010005000100050001000500010005000100
-0500010005000100050001000503020201030202050301ff01ff01a80000050001000500
-010005000100050001000500010005000100050001000500010005000101050302020103
-0202050301ff01ff01bc05030202010302020503010005ff05ff05a80100050001000500
-010005000100050001000500010005000100050001000500010005000100050302020103
-02020503010005ff05ff05a7010005000100050001000500010005000100050001000500
-0100050001000500010005000000010005030202010302020503010005010bff0bff0ba3
-0502010003060100030600000500010005030202010302020503010005010bff0bff0ba2
-000005010100050003050000050003060500000001000503020201030202050301000501
-0b0100ff00ff00a105020100030505000100050003050000050001000503020201030202
-0503010005010b0100ff00ff00a105010100050003040500000005000100030505000000
-010005030202010302020503010005010b0100ff00ff00a1050201000304000005020100
-030400000500010005030202010302020503010005010b0100ff00ff00a1050101000500
-03030000050201000500030405000000010005030202010302020503010005010b0100ff
-00ff00a10502010003030500000005020100050003030000050001000503020201030202
-0503010005010b0100ff00ff00a105010100050003020500000005040100030305000000
-010005030202010302020503010005010b0100ff00ff00a1050201000302000005060100
-030200000500010005030202010302020503010005010b0100ff00ff00a1050101000500
-03010000050601000500030205000000010005030202010302020503010005010b0100ff
-00ff00a10502010003010500000005060100050003010000050001000503020201030202
-0503010005010b0100ff00ff00a105010100050003000500000005080100030105000000
-010005030202010302020503010005010b0100ff00ff00a10502010003000000050a0100
-030000000500010005030202010302020503010005010b0100ff00ff00a1050101000500
-000005000100050001000500010005000100050001000500010005000300050000000100
-05030202010302020503010005010b0100ff00ff00a10502010005000100050001000500
-010005000100050001000500010005000100050000000500010005030202010302020503
-010005010b0100ff00ff00a1050101000500030e05000000010005030202010302020503
-010005010b01000301010071010100ff00ff002705020100050000000500000005000000
-050000000500000005000000050000000500000005000100050302020103020205030100
-05010b01000201000075010000ff00ff0026050101000500000005000000050000000500
-000005000000050000000500000005000100050000000100050302020103020205030100
-05010b01000201000003010000160100001001000006010200100100000c0100001c0100
-00ff00ff00260502010005000000050a0100050000000500010005030202010302020503
-010005010b010002010000030100002801000008010000100100000c0100001c010000ff
-00ff00260501010005000000050c01000500000001000503020201030202050301000501
-0b0100020100000301000001010000030102000201000000010100030102000201000000
-010100090100000001010005010000030102000301020002010000010100000301020002
-01000000010100030102000201000000010100030101000001000003010000ff00ff0026
-0502010005000000050a0100050000000500010005030202010302020503010005010b01
-000201000003010000000100000301000002010000010101000101000004010000020101
-000101000008010100010100000401000002010000020100000101000002010000010100
-000001000003010000020100000101010001010000010100000201000001010100010100
-00010100000101010003010000ff00ff00260501010005000000050c0100050000000100
-05030202010302020503010005010b010000010100040101000801000001010000080100
-000201000002010000080100000201000004010000060100000101000005010100040100
-000201000001010000020100000101000002010000010100000501000002010000040101
-00ff00ff00240502010005000000050a0100050000000500010005030202010302020503
-010005010b01000201000003010100050103000101000008010000020100000201000008
-010000020100000401000003010300010100000501010004010400010100000201000001
-01040001010000050100000201000003010000ff00ff00260501010005000000050c0100
-05000000010005030202010302020503010005010b010002010000030100000001000003
-010000020100000101000008010000020100000201000008010000020100000401000002
-010000020100000101000005010000000100000301000005010000020100000101000005
-010000050100000201000003010000ff00ff00260502010005000000050a010005000000
-0500010005030202010302020503010005010b0100020100000301000001010000020100
-000201000001010000080100000201000002010000030101000201010001010000040100
-000201000002010000010100000201000001010000010100000201000002010000010101
-0001010000010100000201000001010000050100000101010003010000ff00ff00260501
-010005000000050c010005000000010005030202010302020503010005010b0100020100
-000301000002010000020103000101000008010000020100000201000003010100020100
-000001010005010000030103000201020002010000020100000201020002010000000101
-000301020002010000060101000001000003010000ff00ff00260502010005000000050a
-0100050000000500010005030202010302020503010005010b0100020100002901000045
-01000003010000ff00ff00260501010005000000050c0100050000000100050302020103
-02020503010005010b01000301010025010100420100000201000001010100ff00ff0027
-0502010005000000050a0100050000000500010005030202010302020503010005010b01
-0071010200ff00ff002c0501010005000000050c01000500000001000503020201030202
-0503010005010b0100ff00ff00a10502010005000000050a010005000000050001000503
-0202010302020503010005010b0100ff00ff00a10501010005000000050c010005000000
-010005030202010302020503010005010b0100ff00ff00a10502010005000000050a0100
-050000000500010005030202010302020503010005010b0100ff00ff00a1050101000500
-0000050c010005000000010005030202010302020503010005010b0100ff00ff00a10502
-010005000000050a0100050000000500010005030202010302020503010005010b0100ff
-00ff00a10501010005000000050c01000500000001000503020201030202050301000501
-0b0100ff00ff00a10502010005000000050a010005000000050001000503020201030202
-0503010005010b0100ff00ff00a10501010005000000050c010005000000010005030202
-010302020503010005010b0100ff00ff00a10502010005000000050a0100050000000500
-010005030202010302020503010005010b0100ff00ff00a10501010005000000050c0100
-05000000010005030202010302020503010005010b0100ff00ff00a10502010005000000
-050a0100050000000500010005030202010302020503010005010b0100ff00ff00a10501
-010005000000050c010005000000010005030202010302020503010005010b0100ff00ff
-00a10502010005000000050a010005000000050001000503020201030202050301000501
-0b0100ff00ff00a10501010005000000050c010005000000010005030202010302020503
-010005010b0100ff00ff00a10502010005000000050a0100050000000500010005030202
-010302020503010005010b0100ff00ff00a10501010005000000050c0100050000000100
-05030202010302020503010005010b0100ff00ff00a10502010005000000050a01000500
-00000500010005030202010302020503010005010b0100ff00ff00a10501010005000000
-050c010005000000010005030202010302020503010005010b0100ff00ff00a105020100
-05000000050a0100050000000500010005030202010302020503010005010b0100ff00ff
-00a10501010005000000050c010005000000010005030202010302020503010005010b01
-00ff00ff00a10502010005000000050a0100050000000500010005030202010302020503
-010005010b0100ff00ff00a10501010005000000050c0100050000000100050302020103
-02020503010005010b0100ff00ff00a10502010005000000050a01000500000005000100
-05030202010302020503010005010b0100ff00ff00a10501010005000000050c01000500
-0000010005030202010302020503010005010b0100ff00ff00a10502010005000000050a
-0100050000000500010005030202010302020503010005010b0100ff00ff00a105010100
-05000000050c010005000000010005030202010302020503010005010b0100ff00ff00a1
-0502010005000000050a0100050000000500010005030202010302020503010005010b01
-00ff00ff00a10501010005000000050c0100050000000100050302020103020205030100
-05010b0100ff00ff00a10502010005000000050a01000500000005000100050302020103
-02020503010005010b0100ff00ff00a10501010005000000050c01000500000001000503
-0202010302020503010005010b0100ff00ff00a10502010005000000050a010005000000
-0500010005030202010302020503010005010b0100ff00ff00a10501010005000000050c
-010005000000010005030202010302020503010005010b0100ff00ff00a1050201000500
-0000050a0100050000000500010005030202010302020503010005010b0100ff00ff00a1
-0501010005000000050c010005000000010005030202010302020503010005010b0100ff
-00ff00a10502010005000000050a01000500000005000100050302020103020205030100
-05010b0100ff00ff00a10501010005000000050c01000500000001000503020201030202
-0503010005010b0100ff00ff00a10502010005000000050a010005000000050001000503
-0202010302020503010005010b0100ff00ff00a10501010005000000050c010005000000
-010005030202010302020503010005010b0100ff00ff00a10502010005000000050a0100
-050000000500010005030202010302020503010005010b0100ff00ff00a1050101000500
-0000050c010005000000010005030202010302020503010005010b0100ff00ff00a10502
-010005000000050a0100050000000500010005030202010302020503010005010b0100ff
-00ff00a10501010005000000050c01000500000001000503020201030202050301000501
-0b0100ff00ff00a10502010005000000050a010005000000050001000503020201030202
-0503010005010b0100ff00ff00a10501010005000000050c010005000000010005030202
-010302020503010005010b0100ff00ff00a10502010005000000050a0100050000000500
-010005030202010302020503010005010b0100ff00ff00a10501010005000000050c0100
-05000000010005030202010302020503010005010b0100ff00ff00a10502010005000000
-050a0100050000000500010005030202010302020503010005010b0100ff00ff00a10501
-010005000000050c010005000000010005030202010302020503010005010b0100ff00ff
-00a10502010005000000050a010005000000050001000503020201030202050301000501
-0b0100ff00ff00a10501010005000000050c010005000000010005030202010302020503
-010005010b0100ff00ff00a10502010005000000050a0100050000000500010005030202
-010302020503010005010b0100ff00ff00a10501010005000000050c0100050000000100
-05030202010302020503010005010b0100ff00ff00a10502010005000000050a01000500
-00000500010005030202010302020503010005010b0100ff00ff00a10501010005000000
-050c010005000000010005030202010302020503010005010b0100ff00ff00a105020100
-05000000050a0100050000000500010005030202010302020503010005010b0100ff00ff
-00a10501010005000000050c010005000000010005030202010302020503010005010b01
-00ff00ff00a10502010005000000050a0100050000000500010005030202010302020503
-010005010b0100ff00ff00a10501010005000000050c0100050000000100050302020103
-02020503010005010b0100ff00ff00a10502010005000000050a01000500000005000100
-05030202010302020503010005010b0100ff00ff00a10501010005000000050c01000500
-0000010005030202010302020503010005010b0100ff00ff00a10502010005000000050a
-0100050000000500010005030202010302020503010005010b0100ff00ff00a105010100
-05000000050c010005000000010005030202010302020503010005010b0100ff00ff00a1
-0502010005000000050a0100050000000500010005030202010302020503010005010b01
-00ff00ff00a10501010005000000050c0100050000000100050302020103020205030100
-05010b0100ff00ff00a10502010005000000050a01000500000005000100050302020103
-02020503010005010b0100ff00ff00a10501010005000000050c01000500000001000503
-0202010302020503010005010b0100ff00ff00a10502010005000000050a010005000000
-0500010005030202010302020503010005010b0100ff00ff00a10501010005000000050c
-010005000000010005030202010302020503010005010b0100ff00ff00a1050201000500
-0000050a0100050000000500010005030202010302020503010005010b0100ff00ff00a1
-0501010005000000050c010005000000010005030202010302020503010005010b0100ff
-00ff00a10502010005000000050a01000500000005000100050302020103020205030100
-05010b0100ff00ff00a10501010005000000050c01000500000001000503020201030202
-0503010005010b0100ff00ff00a10502010005000000050a010005000000050001000503
-0202010302020503010005010b0100ff00ff00a10501010005000000050c010005000000
-010005030202010302020503010005010b0100ff00ff00a10502010005000000050a0100
-050000000500010005030202010302020503010005010b0100ff00ff00a1050101000500
-0000050c010005000000010005030202010302020503010005010b0100ff00ff00a10502
-010005000000050a0100050000000500010005030202010302020503010005010b0100ff
-00ff00a10501010005000000050c01000500000001000503020201030202050301000501
-0b0100ff00ff00a10502010005000000050a010005000000050001000503020201030202
-0503010005010b0100ff00ff00a10501010005000000050c010005000000010005030202
-010302020503010005010b0100ff00ff00a10502010005000000050a0100050000000500
-010005030202010302020503010005010b0100ff00ff00a10501010005000000050c0100
-05000000010005030202010302020503010005010b0100ff00ff00a10502010005000000
-050a0100050000000500010005030202010302020503010005010b0100ff00ff00a10501
-010005000000050c010005000000010005030202010302020503010005010b0100ff00ff
-00a10502010005000000050a010005000000050001000503020201030202050301000501
-0b0100ff00ff00a10501010005000000050c010005000000010005030202010302020503
-010005010b0100ff00ff00a10502010005000000050a0100050000000500010005030202
-010302020503010005010b0100ff00ff00a10501010005000000050c0100050000000100
-05030202010302020503010005010b0100ff00ff00a10502010005000000050a01000500
-00000500010005030202010302020503010005010b0100ff00ff00a10501010005000000
-050c010005000000010005030202010302020503010005010b0100ff00ff00a105020100
-05000000050a0100050000000500010005030202010302020503010005010b0100ff00ff
-00a10501010005000000050c010005000000010005030202010302020503010005010b01
-00ff00ff00a10502010005000000050a0100050000000500010005030202010302020503
-010005010b0100ff00ff00a10501010005000000050c0100050000000100050302020103
-02020503010005010b0100ff00ff00a10502010005000000050a01000500000005000100
-05030202010302020503010005010b0100ff00ff00a10501010005000000050c01000500
-0000010005030202010302020503010005010b0100ff00ff00a10502010005000000050a
-0100050000000500010005030202010302020503010005010b0100ff00ff00a105010100
-05000000050c010005000000010005030202010302020503010005010b0100ff00ff00a1
-0502010005000000050a0100050000000500010005030202010302020503010005010b01
-00ff00ff00a10501010005000000050c0100050000000100050302020103020205030100
-05010b0100ff00ff00a10502010005000000050a01000500000005000100050302020103
-02020503010005010b0100ff00ff00a10501010005000000050c01000500000001000503
-0202010302020503010005010b0100ff00ff00a10502010005000000050a010005000000
-0500010005030202010302020503010005010b0100ff00ff00a10501010005000000050c
-010005000000010005030202010302020503010005010b0100ff00ff00a1050201000500
-0000050a0100050000000500010005030202010302020503010005010b0100ff00ff00a1
-0501010005000000050c010005000000010005030202010302020503010005010b0100ff
-00ff00a10502010005000000050a01000500000005000100050302020103020205030100
-05010b0100ff00ff00a10501010005000000050c01000500000001000503020201030202
-0503010005010b0100ff00ff00a10502010005000000050a010005000000050001000503
-0202010302020503010005010b0100ff00ff00a10501010005000000050c010005000000
-010005030202010302020503010005010b0100ff00ff00a10502010005000000050a0100
-050000000500010005030202010302020503010005010b0100ff00ff00a1050101000500
-0000050c010005000000010005030202010302020503010005010b0100ff00ff00a10502
-010005000000050a0100050000000500010005030202010302020503010005010b0100ff
-00ff00a10501010005000000050c01000500000001000503020201030202050301000501
-0b0100ff00ff00a10502010005000000050a010005000000050001000503020201030202
-0503010005010b0100ff00ff00a10501010005000000050c010005000000010005030202
-010302020503010005010b0100ff00ff00a10502010005000000050a0100050000000500
-010005030202010302020503010005010b0100ff00ff00a10501010005000000050c0100
-05000000010005030202010302020503010005010b0100ff00ff00a10502010005000000
-050a0100050000000500010005030202010302020503010005010b0100ff00ff00a10501
-010005000000050c010005000000010005030202010302020503010005010b0100ff00ff
-00a10502010005000000050a010005000000050001000503020201030202050301000501
-0b0100ff00ff00a10501010005000000050c010005000000010005030202010302020503
-010005010b0100ff00ff00a10502010005000000050a0100050000000500010005030202
-010302020503010005010b0100ff00ff00a10501010005000000050c0100050000000100
-05030202010302020503010005010b0100ff00ff00a10502010005000000050a01000500
-00000500010005030202010302020503010005010b0100ff00ff00a10501010005000000
-050c010005000000010005030202010302020503010005010b0100ff00ff00a105020100
-05000000050a0100050000000500010005030202010302020503010005010b0100ff00ff
-00a10501010005000000050c010005000000010005030202010302020503010005010b01
-00ff00ff00a10502010005000000050a0100050000000500010005030202010302020503
-010005010b0100ff00ff00a10501010005000000050c0100050000000100050302020103
-02020503010005010b0100ff00ff00a10502010005000000050a01000500000005000100
-05030202010302020503010005010b0100ff00ff00a10501010005000000050c01000500
-0000010005030202010302020503010005010b0100ff00ff00a10502010005000000050a
-0100050000000500010005030202010302020503010005010b0100ff00ff00a105010100
-05000000050c010005000000010005030202010302020503010005010b0100ff00ff00a1
-0502010005000000050a0100050000000500010005030202010302020503010005010b01
-00ff00ff00a10501010005000000050c0100050000000100050302020103020205030100
-05010b0100ff00ff00a10502010005000000050a01000500000005000100050302020103
-02020503010005010b0100ff00ff00a10501010005000000050c01000500000001000503
-0202010302020503010005010b0100ff00ff00a10502010005000000050a010005000000
-0500010005030202010302020503010005010b0100ff00ff00a10501010005000000050c
-010005000000010005030202010302020503010005010b0100ff00ff00a1050201000500
-0000050a0100050000000500010005030202010302020503010005010b0100ff00ff00a1
-0501010005000000050c010005000000010005030202010302020503010005010b0100ff
-00ff00a10502010005000000050a01000500000005000100050302020103020205030100
-05010b0100ff00ff00a10501010005000000050c01000500000001000503020201030202
-0503010005010b0100ff00ff00a10502010005000000050a010005000000050001000503
-0202010302020503010005010b0100ff00ff00a10501010005000000050c010005000000
-010005030202010302020503010005010b0100ff00ff00a1050201000500000005000100
-050001000500010005000100050001000500010005000000050001000503020201030202
-0503010005010b0100ff00ff00a105010100050000000500010005000100050001000500
-010005000100050001000500010005000000010005030202010302020503010005010b01
-00ff00ff00a105020100030e00000500010005030202010302020503010005010b0100ff
-00ff00a10501010005000000050000000500000005000000050000000500000005000000
-0500000005000000010005030202010302020503010005010b0100ff00ff00a105020100
-030000000500000005000000050000000500000005000000050000000500000005000100
-05030202010302020503010005010b0100ff00ff00a10501010005000300050000000508
-01000500030005000000010005030202010302020503010005010b0100ff00ff00a10502
-010003010500000005080100030000000500010005030202010302020503010005010b01
-00ff00ff00a1050101000500030100000508010003010500000001000503020201030202
-0503010005010b0100ff00ff00a105020100030200000506010005000301000005000100
-05030202010302020503010005010b0100ff00ff00a10501010005000302050000000504
-01000500030205000000010005030202010302020503010005010b0100ff00ff00a10502
-010003030500000005040100030200000500010005030202010302020503010005010b01
-00ff00ff00a1050101000500030300000504010003030500000001000503020201030202
-0503010005010b0100ff00ff00a105020100030400000502010005000303000005000100
-05030202010302020503010005010b0100ff00ff00a10501010005000304050000000500
-01000500030405000000010005030202010302020503010005010b0100ff00ff00a10502
-010003050500010005000100030400000500010005030202010302020503010005010b01
-00ff00ff00a1050101000500030500000500010003050500000001000503020201030202
-0503010005010b0100ff00ff00a105020100030601000500030500000500010005030202
-010302020503010005010b0000ff00ff00a2050101000500030605000306050000000100
-05030202010302020503010005ff05ff05a8010005000000050000000500000005000000
-050000000500000005000000050000000500010005030202010302020503010005ff05ff
-05a701000500000005000000050000000500000005000000050000000500000005000000
-0500000001000503020201030202050301ff01ff01bc0503020201030202050301000f01
-0717010007190e01000a0100000201000002010000050100000101000007010000060100
-000201000002010000010100002901000008010000000100000201000002010000050100
-000101000002010000050100000301000003010000020100000101000002010000250100
-006301000063010000630100003e0100051301000500030e050000000523010005030202
-01030202050301000f010717010007190e01000a01000002010000020100000101000002
-010000010100000201000003010000060100000201000002010000010100000201000025
-010000090100000301000002010000010100000201000001010000020100000101000002
-010000030100000301000002010000010100000201000025010000630100006301000063
-0100003e010005140100030e0000052401000503020201030202050301000f0107320e01
-000a01000003010200030102000301020004010000060100000201000002010000020102
-002601000009010000040103000201020003010300020102000501010002010300010100
-0002010000250100006301000063010000630100003e0100051301000500030e05000000
-052301000503020201030202050301000f0107320e01000a010000570100006301000063
-01000063010000630100003e010005140100030e00000524010005030202010302020503
-01000f0107320e0100070100000101000057010000630100006301000063010000630100
-003e0100051301000500030e05000000052301000503020201030202050301000f010732
-0e01000801010058010000630100006301000063010000630100003e010005140100030e
-0000052401000503020201030202050301000f0107320e01006301000063010000630100
-0063010000630100003e0100051301000500030e05000000052301000503020201030202
-050301000f0107320e010063010000630100006301000063010000630100003e01000514
-0100030e0000052401000503020201030202050301000f010e3400630100006301000063
-01000063010000630100003e0100051301000500030e0500000005230100050302020103
-0202050301000f000e3501ff01ff013805140100030e0000052401000503020201030202
-050301000c360d6301000d6301000d6301000d6301000d6301000d3e0100051301000500
-030e05000000052301000503020201030202050301000c3509000d6301000d6301000d63
-01000d6301000d6301000d3e010005140100030e00000524010005030202010302020503
-01000c01083209010d6301000d6301000d6301000d6301000d6301000d3e010005130100
-0500030e05000000052301000503020201030202050301000c01083209010d6301000d63
-01000d6301000d6301000d6301000d3e010005140100030e000005240100050302020103
-0202050301000c0108160102081809010d6301000d6301000d6301000d6301000d630100
-0d3e0100051301000500030e05000000052301000503020201030202050301000c010815
-010008020100081709010d0701000d1601000d4201000d0701000d0601020d1001000d0c
-01000d3001000d6301000d6301000d6301000d3e010005140100030e0000052401000503
-020201030202050301000c010815010008020100081709010d0701000d5a01000d070100
-0d0801000d1001000d0c01000d3001000d6301000d6301000d6301000d3e010005130100
-0500030e05000000052301000503020201030202050301000c0108150100080201000817
-09010d0701000d0101000d0301020d0201000d0001010d0301020d0201000d0001010d3b
-01000d0701000d0001010d0501000d0301020d0301020d0201000d0101000d0301020d02
-01000d0001010d0301020d0201000d0001010d0301010d0001000d1701000d6301000d63
-01000d6301000d3e010005140100030e0000052401000503020201030202050301000c01
-08160102081809010d0701000d0001000d0301000d0201000d0101010d0101000d040100
-0d0201010d0101000d3a01000d0701010d0101000d0401000d0201000d0201000d010100
-0d0201000d0101000d0001000d0301000d0201000d0101010d0101000d0101000d020100
-0d0101010d0101000d0101000d0101010d1701000d6301000d6301000d6301000d3e0100
-051301000500030e05000000052301000503020201030202050301000c01081501000802
-0100081709010d0701010d0801000d0101000d0801000d0201000d0201000d3a01000d07
-01000d0201000d0401000d0601000d0101000d0501010d0401000d0201000d0101000d02
-01000d0101000d0201000d0101000d0501000d0201000d1701000d6301000d6301000d63
-01000d3e010005140100030e0000052401000503020201030202050301000c0108150100
-08020100081709010d0701010d0501030d0101000d0801000d0201000d0201000d3a0100
-0d0701000d0201000d0401000d0301030d0101000d0501010d0401040d0101000d020100
-0d0101040d0101000d0501000d0201000d1701000d6301000d6301000d6301000d3e0100
-051301000500030e05000000052301000503020201030202050301000c01081501000802
-0100081709010d0701000d0001000d0301000d0201000d0101000d0801000d0201000d02
-01000d3a01000d0701000d0201000d0401000d0201000d0201000d0101000d0501000d00
-01000d0301000d0501000d0201000d0101000d0501000d0501000d0201000d1701000d63
-01000d6301000d6301000d3e010005140100030e00000524010005030202010302020503
-01000c0108160102081809010d0701000d0101000d0201000d0201000d0101000d080100
-0d0201000d0201000d3a01000d0701010d0101000d0401000d0201000d0201000d010100
-0d0201000d0101000d0101000d0201000d0201000d0101010d0101000d0101000d020100
-0d0101000d0501000d0101010d1701000d6301000d6301000d6301000d3e010005130100
-0500030e05000000052301000503020201030202050301000c01083209010d0701000d02
-01000d0201030d0101000d0801000d0201000d0201000d3a01000d0701000d0001010d05
-01000d0301030d0201020d0201000d0201000d0201020d0201000d0001010d0301020d02
-01000d0601010d0001000d1701000d6301000d6301000d6301000d3e010005140100030e
-0000052401000503020201030202050301000c01083209010d6301000d4a01000d170100
-0d6301000d6301000d6301000d3e0100051301000500030e050000000523010005030202
-01030202050301000c01083209010d6301000d4601000d0201000d1701000d6301000d63
-01000d6301000d3e010005140100030e0000052401000503020201030202050301000c01
-083209010d6301000d4701020d1801000d6301000d6301000d6301000d3e010005130100
-0500030e05000000052301000503020201030202050301000c01083209010d6301000d63
-01000d6301000d6301000d6301000d3e010005140100030e000005240100050302020103
-0202050301000c01083209010d6301000d6301000d6301000d6301000d6301000d3e0100
-051301000500030e05000000052301000503020201030202050301000c0109340d630100
-0d6301000d6301000d6301000d6301000d3e010005140100030e00000524010005030202
-01030202050301000c00093501ff01ff0138051301000500030e05000000052301000503
-020201030202050301000a360063010000630100006301000063010000630100003e0100
-05140100030e0000052401000503020201030202050301000a3501000063010000630100
-006301000063010000630100003e0100051301000500030e050000000523010005030202
-01030202050301000a0101340063010000630100006301000063010000630100003e0100
-05140100030e0000052401000503020201030202050301000a0101340063010000630100
-006301000063010000630100003e0100051301000500030e050000000523010005030202
-01030202050301000a0101160002011a0063010000630100006301000063010000630100
-003e010005140100030e0000052401000503020201030202050301000a01011500000102
-0000011900070100000e01000014010000340100002b0102003401000063010000630100
-00630100003e0100051301000500030e0500000005230100050302020103020205030100
-0a010115000001020000011900070100000e0100004a0100002d01000034010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-0a0101150000010200000119000701000001010000030102000201040002010200020100
-000001010003010200020100000001010003010200260100000701000002010000010100
-00000101000201000000010100030102000301020005010000030102002d010000630100
-0063010000630100003e0100051301000500030e05000000052301000503020201030202
-050301000a01011500000102000001190007010000000100000301000002010000030100
-000301000002010000010101000101000004010000020101000101000001010000020100
-002501000007010000020100000101010001010000010101000101000001010000020100
-0001010000020100000401000002010000020100002c0100006301000063010000630100
-003e010005140100030e0000052401000503020201030202050301000a01011600030119
-000701010008010000030100000701000001010000080100000201000002010000050100
-002501000007010000020100000101000002010000010100000201000001010000090100
-0004010000060100002c0100006301000063010000630100003e0100051301000500030e
-05000000052301000503020201030202050301000a010119000001190007010100050103
-000301000004010300010100000801000002010000020100000201030025010000070100
-000201000001010000020100000101000002010000020102000301030004010000030103
-002c0100006301000063010000630100003e010005140100030e00000524010005030202
-01030202050301000a0101180000011a0007010000000100000301000002010000030100
-000301000002010000010100000801000002010000020100000101000002010000250100
-000701000002010000010100000201000001010000020100000501000001010000020100
-000401000002010000020100002c0100006301000063010000630100003e010005130100
-0500030e05000000052301000503020201030202050301000a0101150002011b00070100
-000101000002010000020100000301000003010000020100000101000008010000020100
-000201000001010000020100002501000007010000010101000101010001010000010101
-0001010000010100000201000001010000020100000401000002010000020100002c0100
-006301000063010000630100003e010005140100030e0000052401000503020201030202
-050301000a01013400070100000201000002010300040101000201030001010000080100
-000201000002010000020103002501000008010100000100000101000000010100020100
-0000010100030102000301030004010000030103002c0100006301000063010000630100
-003e0100051301000500030e05000000052301000503020201030202050301000a010134
-00630100000e010000050100004c0100006301000063010000630100003e010005140100
-030e0000052401000503020201030202050301000a01013400630100000e010000050100
-004c0100006301000063010000630100003e0100051301000500030e0500000005230100
-0503020201030202050301000a01013400630100000e010000050100004c010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-0a0101340063010000630100006301000063010000630100003e0100051301000500030e
-05000000052301000503020201030202050301000a010134006301000063010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-0a0101340063010000630100006301000063010000630100003e0100051301000500030e
-05000000052301000503020201030202050301000a0001ff01ff016e05140100030e0000
-052401000503020201030202050301000c36006301000063010000630100006301000063
-0100003e0100051301000500030e05000000052301000503020201030202050301000c35
-09000063010000630100006301000063010000630100003e010005140100030e00000524
-01000503020201030202050301000c010832090100630100006301000063010000630100
-00630100003e0100051301000500030e0500000005230100050302020103020205030100
-0c01083209010063010000630100006301000063010000630100003e010005140100030e
-0000052401000503020201030202050301000c0108130100080401020815090100630100
-00630100006301000063010000630100003e0100051301000500030e0500000005230100
-0503020201030202050301000c0108110102080301000802010008140901006301000032
-0102002d0100006301000063010000630100003e010005140100030e0000052401000503
-020201030202050301000c01081301000803010008020100081409010063010000340100
-002d0100006301000063010000630100003e0100051301000500030e0500000005230100
-0503020201030202050301000c0108130100080301000802010008140901000701010000
-010000030102000301010000010000010100000001010002010000020100000201020034
-010000070100000001010003010200020100000001010002010000000101000201010000
-01000003010200050100000201010000010000260100006301000063010000630100003e
-010005140100030e0000052401000503020201030202050301000c010813010008030100
-080201000814090100070100000001000000010000010100000201000001010000010101
-000101010001010000010100000201000001010000020100003301000007010100010100
-000101000002010000010101000101000001010100010100000101000000010000000100
-000101000002010000040100000201000000010000000100002501000063010000630100
-00630100003e0100051301000500030e0500000005230100050302020103020205030100
-0c0108130100080301000802010008140901000701000000010000000100000501000001
-010000020100000101000002010000010100000201000001010000370100000701000002
-010000010100000201000001010000050100000501000000010000000100000501000004
-010000020100000001000000010000250100006301000063010000630100003e01000514
-0100030e0000052401000503020201030202050301000c01081301000803010008020100
-081409010007010000000100000001000002010300010100000201000001010000020100
-000101000002010000020102003401000007010000020100000101000002010000010100
-000501000005010000000100000001000002010300040100000201000000010000000100
-00250100006301000063010000630100003e0100051301000500030e0500000005230100
-0503020201030202050301000c0108130100080301000802010008140901000701000000
-010000000100000101000002010000010100000201000001010000020100000101000002
-010000050100003301000007010000020100000101000002010000010100000501000005
-010000000100000001000001010000020100000401000002010000000100000001000025
-0100006301000063010000630100003e010005140100030e000005240100050302020103
-0202050301000c0108110104080201020815090100070100000001000000010000010100
-000201000001010000010101000101000002010000010100000101010001010000020100
-003301000007010000020100000101000002010000010100000501000005010000000100
-000001000001010000020100000401000002010000000100000001000025010000630100
-0063010000630100003e0100051301000500030e05000000052301000503020201030202
-050301000c01083209010007010000000100000001000002010300020101000001000001
-010000020100000201010000010000020102003401000007010000020100000201020002
-010000050100000501000000010000000100000201030004010000020100000001000000
-010000250100006301000063010000630100003e010005140100030e0000052401000503
-020201030202050301000c01083209010019010000480100006301000063010000630100
-00630100003e0100051301000500030e0500000005230100050302020103020205030100
-0c010832090100150100000201000048010000630100006301000063010000630100003e
-010005140100030e0000052401000503020201030202050301000c010832090100160102
-0049010000630100006301000063010000630100003e0100051301000500030e05000000
-052301000503020201030202050301000c01083209010063010000630100006301000063
-010000630100003e010005140100030e0000052401000503020201030202050301000c01
-083209010063010000630100006301000063010000630100003e0100051301000500030e
-05000000052301000503020201030202050301000c010934006301000063010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-0c00093501ff01ff0138051301000500030e050000000523010005030202010302020503
-01000c360063010000630100006301000063010000630100003e010005140100030e0000
-052401000503020201030202050301000c35090000630100006301000063010000630100
-00630100003e0100051301000500030e0500000005230100050302020103020205030100
-0c01083209010063010000630100006301000063010000630100003e010005140100030e
-0000052401000503020201030202050301000c0108320901006301000063010000630100
-0063010000630100003e0100051301000500030e05000000052301000503020201030202
-050301000c01081301000805010008160901006301000063010000630100006301000063
-0100003e010005140100030e0000052401000503020201030202050301000c0108110102
-0803010208160901001601020005010000420100002b0102003401000063010000630100
-00630100003e0100051301000500030e0500000005230100050302020103020205030100
-0c010813010008050100081609010018010000490100002d010000340100006301000063
-010000630100003e010005140100030e0000052401000503020201030202050301000c01
-081301000805010008160901000701010000010000030102000501000003010200020100
-00000101003b010000070100000201000001010000000101000201000000010100030102
-000301020005010000030102002d0100006301000063010000630100003e010005130100
-0500030e05000000052301000503020201030202050301000c0108130100080501000816
-090100070100000001000000010000010100000201000004010000050100000201010001
-0100003a0100000701000002010000010101000101000001010100010100000101000002
-01000001010000020100000401000002010000020100002c010000630100006301000063
-0100003e010005140100030e0000052401000503020201030202050301000c0108130100
-080501000816090100070100000001000000010000050100000401000005010000020100
-00020100003a010000070100000201000001010000020100000101000002010000010100
-000901000004010000060100002c0100006301000063010000630100003e010005130100
-0500030e05000000052301000503020201030202050301000c0108130100080501000816
-09010007010000000100000001000002010300040100000501000002010000020100003a
-010000070100000201000001010000020100000101000002010000020102000301030004
-010000030103002c0100006301000063010000630100003e010005140100030e00000524
-01000503020201030202050301000c010813010008050100081609010007010000000100
-00000100000101000002010000040100000501000002010000020100003a010000070100
-000201000001010000020100000101000002010000050100000101000002010000040100
-0002010000020100002c0100006301000063010000630100003e0100051301000500030e
-05000000052301000503020201030202050301000c010811010408010104081409010007
-01000000010000000100000101000002010000040100000501000002010000020100003a
-010000070100000101010001010100010100000101010001010000010100000201000001
-010000020100000401000002010000020100002c0100006301000063010000630100003e
-010005140100030e0000052401000503020201030202050301000c010832090100070100
-00000100000001000002010300040100000501000002010000020100003a010000080101
-000001000001010000000101000201000000010100030102000301030004010000030103
-002c0100006301000063010000630100003e0100051301000500030e0500000005230100
-0503020201030202050301000c010832090100630100000e010000050100004c01000063
-01000063010000630100003e010005140100030e00000524010005030202010302020503
-01000c010832090100630100000e010000050100004c0100006301000063010000630100
-003e0100051301000500030e05000000052301000503020201030202050301000c010832
-090100630100000e010000050100004c0100006301000063010000630100003e01000514
-0100030e0000052401000503020201030202050301000c01083209010063010000630100
-006301000063010000630100003e0100051301000500030e050000000523010005030202
-01030202050301000c01083209010063010000630100006301000063010000630100003e
-010005140100030e0000052401000503020201030202050301000c010934006301000063
-0100006301000063010000630100003e0100051301000500030e05000000052301000503
-020201030202050301000c00093501ff01ff013805140100030e00000524010005030202
-010302020503010005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000063010000630100006301000063010000630100003e01000513
-01000500030e050000000523010005030202010302020503010000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050001000063010000630100
-006301000063010000630100003e010005140100030e0000052401000503020201030202
-05030100050000000532010005000063010000630100006301000063010000630100003e
-0100051301000500030e0500000005230100050302020103020205030100000005340100
-0063010000630100006301000063010000630100003e010005140100030e000005240100
-050302020103020205030100050000000513010005040102051501000500006301000063
-0100006301000063010000630100003e0100051301000500030e05000000052301000503
-02020103020205030100000005120102050301000502010005150100001f010000420100
-001201000017010200340100006301000063010000630100003e010005140100030e0000
-052401000503020201030202050301000500000005130100050301000502010005140100
-050000630100001201000019010000340100006301000063010000630100003e01000513
-01000500030e050000000523010005030202010302020503010000000514010005030100
-050201000515010000070101000001000003010200020100000001010003010200030102
-003b01000008010200030101000001000002010200020100000001010002010000000101
-0005010000030102000201000000010100260100006301000063010000630100003e0100
-05140100030e000005240100050302020103020205030100050000000513010005060100
-051501000500000701000000010000000100000101000002010000010101000101000004
-01000002010000020100003a010000070100000201000001010000010101000101000002
-010000010101000101000001010100010100000401000002010000020100000101010001
-010000250100006301000063010000630100003e0100051301000500030e050000000523
-010005030202010302020503010000000514010005050100051701000007010000000100
-0000010000050100000101000008010000060100003a0100000701000002010000010100
-000201000001010000020100000101000002010000010100000201000004010000060100
-000101000002010000250100006301000063010000630100003e010005140100030e0000
-052401000503020201030202050301000500000005130100050401000517010005000007
-0100000001000000010000020103000101000008010000030103003a0100000701000002
-010000010100000201000001010400010100000201000001010000020100000401000003
-0103000101000002010000250100006301000063010000630100003e0100051301000500
-030e05000000052301000503020201030202050301000000051401000503010005020100
-051501000007010000000100000001000001010000020100000101000008010000020100
-00020100003a010000070100000201000001010000020100000101000005010000020100
-000101000002010000040100000201000002010000010100000201000025010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-050000000511010405010104051401000500000701000000010000000100000101000002
-010000010100000801000002010000020100003a01000007010000020100000101000001
-010100010100000201000001010000020100000101010001010000040100000201000002
-0100000101000002010000250100006301000063010000630100003e0100051301000500
-030e05000000052301000503020201030202050301000000053401000007010000000100
-0000010000020103000101000008010000030103003a0100000801020003010100000100
-000201020002010000020100000101000000010100050100000301030001010000020100
-00250100006301000063010000630100003e010005140100030e00000524010005030202
-0103020205030100050000000532010005000063010000230100003e0100006301000063
-010000630100003e0100051301000500030e050000000523010005030202010302020503
-01000000053401000063010000230100003e0100006301000063010000630100003e0100
-05140100030e000005240100050302020103020205030100050000000532010005000063
-010000230100003e0100006301000063010000630100003e0100051301000500030e0500
-000005230100050302020103020205030100000005340100006301000063010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-050000000532010005000063010000630100006301000063010000630100003e01000513
-01000500030e050000000523010005030202010302020503010000000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000063010000630100
-006301000063010000630100003e010005140100030e0000052401000503020201030202
-050301000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001ff01ff0138051301000500030e05000000052301000503020201030202
-050301000c360063010000630100006301000063010000630100003e010005140100030e
-0000052401000503020201030202050301000c3509000063010000630100006301000063
-010000630100003e0100051301000500030e050000000523010005030202010302020503
-01000c01083209010063010000630100006301000063010000630100003e010005140100
-030e0000052401000503020201030202050301000c010832090100630100006301000063
-01000063010000630100003e0100051301000500030e0500000005230100050302020103
-0202050301000c0108130100080401020815090100630100006301000063010000630100
-00630100003e010005140100030e0000052401000503020201030202050301000c010811
-010208030100080201000814090100170100004a01000007010000300102002601000063
-01000063010000630100003e0100051301000500030e0500000005230100050302020103
-0202050301000c0108130100080701000814090100170100004a01000007010000320100
-00260100006301000063010000630100003e010005140100030e00000524010005030202
-01030202050301000c010813010008070100081409010007010100000100000301020002
-010400020102004201000007010000000101000201000000010100030102000201010000
-010000020101000001000003010200020100000001010005010000030102000201000000
-010100180100006301000063010000630100003e0100051301000500030e050000000523
-01000503020201030202050301000c010813010008050101081509010007010000000100
-000001000001010000020100000301000003010000020100004101000007010100010100
-000101010001010000010100000201000001010000000100000001000001010000000100
-000001000001010000020100000101010001010000040100000201000002010000010101
-0001010000170100006301000063010000630100003e010005140100030e000005240100
-0503020201030202050301000c0108130100080701000814090100070100000001000000
-010000050100000301000003010000450100000701000002010000010100000501000002
-010000010100000001000000010000010100000001000000010000050100000101000002
-01000004010000060100000101000002010000170100006301000063010000630100003e
-0100051301000500030e05000000052301000503020201030202050301000c0108130100
-080701000814090100070100000001000000010000020103000301000004010200420100
-000701000002010000010100000501000002010000010100000001000000010000010100
-000001000000010000020103000101000002010000040100000301030001010000020100
-00170100006301000063010000630100003e010005140100030e00000524010005030202
-01030202050301000c010813010008030100080201000814090100070100000001000000
-010000010100000201000003010000070100004101000007010000020100000101000005
-010000020100000101000000010000000100000101000000010000000100000101000002
-010000010100000201000004010000020100000201000001010000020100001701000063
-01000063010000630100003e0100051301000500030e0500000005230100050302020103
-0202050301000c0108110104080201020815090100070100000001000000010000010100
-000201000003010000030100000201000041010000070101000101000001010000050100
-000201000001010000000100000001000001010000000100000001000001010000020100
-000101010001010000040100000201000002010000010100000201000017010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-0c0108320901000701000000010000000100000201030004010100020102004201000007
-010000000101000201000006010200020100000001000000010000010100000001000000
-010000020103000101000000010100050100000301030001010000020100001701000063
-01000063010000630100003e0100051301000500030e0500000005230100050302020103
-0202050301000c0108320901006301000031010000300100006301000063010000630100
-003e010005140100030e0000052401000503020201030202050301000c01083209010063
-01000031010000300100006301000063010000630100003e0100051301000500030e0500
-0000052301000503020201030202050301000c0108320901006301000031010000300100
-006301000063010000630100003e010005140100030e0000052401000503020201030202
-050301000c01083209010063010000630100006301000063010000630100003e01000513
-01000500030e05000000052301000503020201030202050301000c010832090100630100
-00630100006301000063010000630100003e010005140100030e00000524010005030202
-01030202050301000c0109340063010000630100006301000063010000630100003e0100
-051301000500030e05000000052301000503020201030202050301000c00093501ff01ff
-013805140100030e0000052401000503020201030202050301000c360063010000630100
-006301000063010000630100003e0100051301000500030e050000000523010005030202
-01030202050301000c3509000063010000630100006301000063010000630100003e0100
-05140100030e0000052401000503020201030202050301000c0108320901006301000063
-0100006301000063010000630100003e0100051301000500030e05000000052301000503
-020201030202050301000c01083209010063010000630100006301000063010000630100
-003e010005140100030e0000052401000503020201030202050301000c01081301000806
-0100081509010063010000630100006301000063010000630100003e0100051301000500
-030e05000000052301000503020201030202050301000c01081101020805010108150901
-0011010000500100001e01000018010000290100006301000063010000630100003e0100
-05140100030e0000052401000503020201030202050301000c0108130100080401000800
-01000815090100630100001e01000018010000290100006301000063010000630100003e
-0100051301000500030e05000000052301000503020201030202050301000c0108130100
-080401000800010008150901000701000000010100030102000201000000010100030102
-004201000008010100000100000101000002010000020102000201040002010200020100
-000201000002010200020100000001010003010200020100000001010003010100000100
-00100100006301000063010000630100003e010005140100030e00000524010005030202
-01030202050301000c010813010008030100080101000815090100070101000101000004
-010000020101000101000001010000020100004101000007010000010101000101000002
-010000010100000201000003010000030100000201000001010000020100000101000002
-010000010101000101000001010000020100000101010001010000010100000101010010
-0100006301000063010000630100003e0100051301000500030e05000000052301000503
-020201030202050301000c01081301000802010008020100081509010007010000020100
-000401000002010000020100000501000041010000070100000201000001010000020100
-000101000007010000070100000101000002010000010100000501000002010000010100
-0002010000010100000501000002010000100100006301000063010000630100003e0100
-05140100030e0000052401000503020201030202050301000c0108130100080201050814
-090100070100000201000004010000020100000201000002010300410100000701000002
-010000010100000201000002010200040100000401030002010000000100000301020002
-010000020100000101040001010000050100000201000010010000630100006301000063
-0100003e0100051301000500030e05000000052301000503020201030202050301000c01
-081301000806010008150901000701000002010000040100000201000002010000010100
-000201000041010000070100000201000001010000020100000501000003010000030100
-000201000002010000000100000601000001010000020100000101000005010000050100
-0002010000100100006301000063010000630100003e010005140100030e000005240100
-0503020201030202050301000c0108110104080301020814090100070100000201000004
-010000020100000201000001010000020100004101000007010000010101000101000001
-010100010100000201000003010000030100000201000003010000030100000201000001
-010100010100000101000002010000010100000501000001010100100100006301000063
-010000630100003e0100051301000500030e050000000523010005030202010302020503
-01000c010832090100070100000201000004010000020100000201000002010300410100
-000801010000010000020101000001000002010200050101000201030003010000040102
-000201000000010100030102000201000006010100000100001001000063010000630100
-00630100003e010005140100030e0000052401000503020201030202050301000c010832
-090100630100000b01000044010000100100006301000063010000630100003e01000513
-01000500030e05000000052301000503020201030202050301000c010832090100630100
-0007010000020100004001000002010000100100006301000063010000630100003e0100
-05140100030e0000052401000503020201030202050301000c0108320901006301000008
-01020042010200110100006301000063010000630100003e0100051301000500030e0500
-0000052301000503020201030202050301000c0108320901006301000063010000630100
-0063010000630100003e010005140100030e000005240100050302020103020205030100
-0c01083209010063010000630100006301000063010000630100003e0100051301000500
-030e05000000052301000503020201030202050301000c01093400630100006301000063
-01000063010000630100003e010005140100030e00000524010005030202010302020503
-01000c00093501ff01ff0138051301000500030e05000000052301000503020201030202
-050301000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000063010000630100006301000063010000630100003e010005140100030e
-000005240100050302020103020205030100000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500010000630100006301000063010000630100
-00630100003e0100051301000500030e0500000005230100050302020103020205030100
-050000000532010005000063010000630100006301000063010000630100003e01000514
-0100030e0000052401000503020201030202050301000000053401000063010000630100
-006301000063010000630100003e0100051301000500030e050000000523010005030202
-010302020503010005000000051301000503010405140100050000630100006301000063
-01000063010000630100003e010005140100030e00000524010005030202010302020503
-01000000051201020503010005190100000f010200030102004901000007010000230100
-000b010200030102001f0100006301000063010000630100003e0100051301000500030e
-050000000523010005030202010302020503010005000000051301000503010005180100
-05000011010000050100004901000007010000230100000d010000050100001f01000063
-01000063010000630100003e010005140100030e00000524010005030202010302020503
-010000000514010005030100051901000008010200050100000501000003010200420100
-000701000000010100030102000201000000010100020100000001010003010200020104
-00010100000201000004010000050100001f0100006301000063010000630100003e0100
-051301000500000005000000050000000500000005000000050000000500000005000000
-05000000052301000503020201030202050301ff01ff0170051400000500000005000000
-050000000500000005000000050000000500000005000000052401000503020201030202
-0503010005ff05ff05ba010005030202010302020503010005ff05ff05ba010005030202
-010302020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba0100
-05030202010302020503010005ff05ff05ba010005030202010302020503010005ff05ff
-05ba010005030202010302020503010005ff05ff05ba0100050302020103020205030100
-05ff05ff05ba01000503020201030202050301000549010005ff05ff056f010005030202
-01030202050301000548010105ff05ff056f010005030202010302020503010005470100
-0500010005ff05ff056f01000503020201030202050301000549010005ff05ff056f0100
-0503020201030202050301000549010005ff05ff056f0100050302020103020205030100
-0549010005ff05ff056f01000503020201030202050301000549010005ff05ff056f0100
-0503020201030202050301000549010005ff05ff056f0100050302020103020205030100
-0547010405ff05ff056d010005030202010302020503010005ff05ff05ba010005030202
-010302020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba0100
-05030202010302020503010005ff05ff05ba010005030202010302020503010005ff05ff
-05ba01000503020201030202050301000538010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-054a01000503020201030202050301000537010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-054b01000503020201030202050301000538010005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000003ff03ff031505000000054a01000503020201030202050301000537
-010005000000050000000500000005000000050000000500000005000000050000000500
-0000050000000500000005000000050000000500000005000000050003ff03ff03150000
-054b01000503020201030202050301000538010005000000050c0000050c010003ff03ff
-031505000000054a01000503020201030202050301000537010005000000050c0100050c
-0100050003ff03ff03150000054b01000503020201030202050301000538010005000000
-050c0000050c010003ff03ff031505000000054a01000503020201030202050301000537
-010005000000050c0100050c0100050003ff03ff03150000054b01000503020201030202
-050301000538010005000000050c0000050c010003ff03ff031505000000054a01000503
-020201030202050301000537010005000000050c0100050c0100050003ff03ff03150000
-054b01000503020201030202050301000538010005000000050c0000050c010003ff03ff
-031505000000054a01000503020201030202050301000537010005000000050c0100050c
-0100050003ff03ff03150000054b01000503020201030202050301000538010005000000
-050c0000050c010003ff03ff031505000000054a01000503020201030202050301000537
-010005000000050c0100050c0100050003ff03ff03150000054b01000503020201030202
-050301000538010005000000050c0000050c010003ff03ff031505000000054a01000503
-020201030202050301000537010005000000050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050003ff03ff03150000054b01000503020201030202050301000538010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010003ff03ff031505000000054a01000503
-020201030202050301000537010005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000054b01000503
-020201030202050301000538000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000054a01000503
-0202010302020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba
-010005030202010302020503010005ff05ff05ba010005030202010302020503010005ff
-05ff05ba010005030202010302020503010005ff05ff05ba010005030202010302020503
-010005ff05ff05ba010005030202010302020503010005ff05ff05ba0100050302020103
-02020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba01000503
-0202010302020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba
-010005030202010302020503010005ff05ff05ba010005030202010302020503010005ff
-05ff05ba010005030202010302020503010005ff05ff05ba010005030202010302020503
-010005ff05ff05ba010005030202010302020503010005ff05ff05ba0100050302020103
-02020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba01000503
-0202010302020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba
-010005030202010302020503010005ff05ff05ba010005030202010302020503010005ff
-05ff05ba010005030202010302020503010005ff05ff05ba010005030202010302020503
-010005ff05ff05ba010005030202010302020503010005ff05ff05ba0100050302020103
-02020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba01000503
-0202010302020503010005ff05ff05ba010005030202010302020503010005ff05ff05ba
-010005030202010302020503010005ff05ff05ba010005030202010302020503010005ff
-05ff05ba010005030202010302020503010005ff05ff05ba010005030202010302020503
-010005ff05ff05ba010005030202010100040503010005ff05ff05ba0100050300050202
-0400050301ff01ff01bc050300000202040000000202040005ff05ff05c4000002020400
-00000202040005ff05ff05c400000202040000000202040005ff05ff05c4000002020400
-00000202040005ff05ff05c4000002020400000002020400000502ff02ff02b800060202
-040000000208040002ff02ff02b800000208040000000208040002ff02ff02b800000208
-040000000208040001ff01ff01b80000020804000000040901ff01ff01b800000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 61 377 359
-%%EOF
diff --git a/lib/tv/doc/src/tv_row_marked_popup.gif b/lib/tv/doc/src/tv_row_marked_popup.gif
deleted file mode 100644
index 9b3bc87959..0000000000
--- a/lib/tv/doc/src/tv_row_marked_popup.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_row_marked_popup.ps b/lib/tv/doc/src/tv_row_marked_popup.ps
deleted file mode 100644
index 7a909110d9..0000000000
--- a/lib/tv/doc/src/tv_row_marked_popup.ps
+++ /dev/null
@@ -1,1324 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./tv_row_marked_popup.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:12:10 2001)
-%%BoundingBox: 0 64 377 377
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 64 377 377
-userdict begin
-%%BeginData:
-DisplayImage
-0 64
-377.000000 313.000000
-12
-760 630
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-ff0000
-d9d9d9
-b22222
-828282
-00ff00
-009100
-90ee90
-c3c3c3
-999999
-757575
-c8ffff
-000a01ff01ff01e1000b0208040001ff01ff01e100000208040000000208040002ff02ff
-02e1000002080400000002080400020000ff00ff00de0400020000000208040000000202
-04060200000004ff04ff04de020000000405020204000000020204000209000d02ff02ff
-02d500000202040000000202040002080000020d040002a501010206010102150101021e
-0101022901010206010102430101022a010102260101023201010233010102ae00000202
-040000000202040002080000020d04000277010502000107020101030206010702090101
-02060101021501010219010002030101021c0100020b010102060101022e010202020100
-020d0101022a0101020c0104021401010232010102160100021b010102ae000002020400
-00000202040002080000020d04000277010102070101020301010201010102080101020c
-010102060101021501010218010102210101020b010102060101022e010202020100020d
-01010238010102020101024801010215010102cc00000202040000000202040002080000
-0202040602030400027701010207010102030101020c0101020401030203010102000101
-020301010202010302020101020901010202010302030103020201030201010402010101
-020201030203010102000101020a01040201010302030101020001010203010102020103
-022701000200010102010100020201030203010402020103020201010209010102000101
-020101010203010302030101020201010200010102020101020101030202010402020101
-020101010202010102020101020001010203010102000101020301030203010402020104
-020501040202010102010101020501030201010402000101020101010204010302020101
-020001010201010102020103020201040202010402020103020301010200010102060104
-020201030274000002020400000004030208000002020400030400000203040002770101
-0207010102030102020b0101020301010201010102020102020001010202010102010101
-020101010201010102090101020101010201010102010101020101010200010102010101
-020101010203010102010101020101010202010202000101020a01010202010102010101
-020201020200010102020101020101010201010102260100020001010201010002010101
-020101010201010102010101020101010201010102010101020901020200010202000101
-020101010201010102020101020201020200010102010101020001010200010102010101
-020101010202010102010101020201010202010202000101020201020200010102010101
-020101010201010102050101020801010201010102020101020101010204010102010101
-020101010202010102010101020301010201010102010101020001010201010102010101
-020101010200010102050101020501010201010102020102020001010204010102050101
-020101010273000004030101020b00000203040003020000020404000277010402040101
-0204010302090101020701010202010102010101020201010201010102010101020d0101
-020101010201010102010101020801010201010102030101020101010201010102020101
-02010101020a010102060101020201010201010102020101020101010201010102260100
-0200010202000100020101010201010102010101020101010201010102010101020d0101
-020101010201010102050101020201010202010102010101020101010200010102000101
-020101010201010102020101020101010202010102020101020101010202010102010101
-020101010201010102010102020401020207010102010101020201010201010102040101
-020101010201010102030101020001000204010102010101020101020203010102010101
-020401020204010202040101020101010202010102010101020401020204010102010101
-02760103020b000002030400030200000204040002770101020701010206010202080101
-0204010402020101020101010202010102010105020d0101020101010201010102010101
-02050104020101010203010102010101020101010202010102010101020a010102030104
-020201010201010102020101020101050226010002010101020001000201010102010101
-020101010201010102010105020d01010201010102010101020201040202010102020101
-020101010201010102000101020001010201010102010101020201010201010102020101
-020201010201010102020101020101010201010502020103020301030205010102010101
-020201010201010102040105020101010204010102050105020101010204010102010101
-020501030203010302020101020101010202010102010101020501030202010502760103
-020b00000204040003000000020504000277010102070101020701010208010102030101
-020101010202010102010101020201010201010102110101020101010201010102010101
-0204010102010101020101010203010102010101020101010202010102010101020a0101
-020201010201010102020101020101010202010102010101022a01000202010202010101
-020101010201010102010101020101010211010102010101020101010201010102010101
-020201010202010102010101020101010201010102000101020001010200010202020101
-020101010202010102020101020101010202010102010101020101010208010202040102
-020401010201010102020101020101010204010102050101020301000200010102040101
-020501010204010102010101020701020204010202010101020101010202010102010101
-0207010202010101027a0103020b00000204040003000000020504000277010102070101
-020301010201010102080101020301010201010102020101020101010202010102010101
-020201000201010102090101020101010201010102010101020201000200010102010101
-020101010203010102010101020101010202010102010101020a01010202010102010101
-020201010201010102020101020101010202010002260100020201020201010102010101
-020101010200010202010101020201000201010102090101020101010201010102010101
-020101010202010102020101020101010202010102070101020001010202010102000102
-020201010202010102010101020201010201010102010101020201000205010102050101
-020101010200010102000102020201010200010202010101020001010202010002010101
-020201010201010102000101020001010202010002010101020401010201010102020100
-020401010205010102010101020101010202010102010101020101010204010102010101
-0202010002760103020b0000020500000206040002770105020301010204010302090101
-020401020200010102010104020301010202010302020101020901010202010302030103
-02020102020001010201010202010101020201030203010102010101020b010202010102
-020001010201010402030101020201030227010002030101020201030203010102000101
-020201030202010102090101020101010201010102020102020001010201010102020101
-020101010203010502050101020301010200010102020101020201010201010102020101
-020101010202010302020104020201040202010102010101020001010203010102000101
-020101010201010302030102020001010201010102000101020101030202010102040101
-020201030201010402020104020301030203010102010101020101010200010402030103
-02770103020b0000020d040002fc010602a201010201010102ff022a0103020b0000020d
-040002ff02a7010302ff022b0103020b0000020d040002ff02ff02d70103020c040d02ff
-02ff02d8010302ff02ff02f3010302ff02ff02f30103020200ff00ff00ec040002020103
-0202000004ff04ff04ec0202010302ff02ff02f30103020200ff00ff00ed020201030202
-00ff00ff00ec0800020201030202000106ff06ff06e90801020201030202000106ff06ff
-06e90801020201030202000106ff06ff06e90801020201030202000106ff06ff06e90801
-020201030202000106ff06ff06e908010202010302020001060b07040604070006030702
-061f07040610070206200702060b070006060700062d0700060207000604070006ff06fa
-07000602070006090702061308010202010302020001060b0700060f0700062107000614
-0700061f070006020700060a0700063507000602070006ff06ff0600070006020700060b
-0700061308010202010302020001060b0700060607020605070006030702061a07000604
-070206030702060507000603070206180700060207000601070006000701060207040602
-070206030702060207000600070106030702061807000602070006020702060307020602
-07000602070006ff06eb07000602070006020702060507000602070006000701060c0801
-0202010302020001060b0700060807000605070006020700060207000619070006030700
-060207000601070006020700060407000602070006020700061707000602070006010701
-060107000603070006060700060207000602070006010701060107000601070006020700
-0618070006000700060507000602070006020700060107000602070006ff06eb07000602
-07000601070006020700060407000602070106010700060b08010202010302020001060b
-070306050700060507000602070006020700061907000603070006020700060107000602
-07000604070006020700061b070006020700060107000602070006030700060607000602
-070006020700060107000602070006010700061c07000600070006050700060207000602
-070006010700060007000600070006ff06eb070406010700060207000604070006020700
-06020700060b08010202010302020001060b070006080700060507000602070406190700
-060307000602070006010700060207000604070006030702061807000602070006010700
-060207000603070006060700060207000602070006010700060207000602070206190700
-06000700060507000602070406010700060007000600070006ff06eb0700060207000601
-0704060407000602070006020700060b08010202010302020001060b0700060807000605
-070006020700061d07000603070006020700060107000602070006040700060607000617
-070006020700060107000602070006030700060607000602070006020700060107000602
-07000605070006190700060607000602070006050700060007000600070006ff06eb0700
-0602070006010700060807000602070006020700060b08010202010302020001060b0700
-060807000605070006020700060207000619070006030700060207000601070006020700
-060407000602070006020700061707000602070006010701060107000603070006060700
-060207000602070006010700060207000601070006020700061907000606070006020700
-0602070006010700060007000600070006ff06eb07000602070006010700060207000604
-07000602070106010700060b08010202010302020001060b070006080700060507000603
-0702061a0700060407020603070206050700060307020619070206020700060007010605
-07010604070006030702060207000602070006020702061a070006060700060307020603
-07000600070006ff06ec07000602070006020702060507000602070006000701060c0801
-0202010302020001067d070006ff06ff06590700060f08010202010302020001060a0706
-062a07060631070606000700063d070606ff06fe0706060e0700060f0801020201030202
-0001060a0706062a07060631070606000700063d070606ff06fe0706060e0700060f0801
-020201030202000106ff06ff06e90801020201030202000106ff06ff06e9080102020103
-0202000106ff06ff06e90801020201030202000108ff08ff08eb020201030202000008ff
-08ff08ec02020103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff
-06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff
-06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202010302020603
-0016061600160616004406160016061600160616001606ff06be02020103020206030015
-080006160015080006160015080000150800001508000616001508000616001508000616
-0015080006ff06be02020103020206030001061208010616000106120801061600010612
-080100010612080100010612080106160001061208010616000106120801061600010612
-080106ff06be020201030202060300010612080106160001061208010616000106120801
-000106120801000106120801061600010612080106160001061208010616000106120801
-06ff06be0202010302020603000106120801061600010603070206030702060408010616
-000106120801000106120801000106120801061600010612080106160001061208010616
-00010612080106ff06be0202010302020603000106080702060608010616000106030702
-060307020604080106160001061208010001061208010001061208010616000106050704
-0607080106160001060707010608080106160001060707030606080106ff06be02020103
-020206030001060b0701060408010616000106020704060107040603080106160001060e
-0700060208010001060e070006020801000106020700060e080106160001060307080605
-080106160001060607030607080106160001060507070604080106ff06be020201030202
-06030001060d070006000700060108010616000106020700060107010601070006010701
-0603080106160001060e0700060208010001060e070006020801000106020700060e0801
-061600010602070a06040801061600010606070306070801061600010604070306010703
-0603080106ff06be02020103020206030001060207020608070106010801061600010601
-070d0602080106160001060b07000601070006020801000106020700060a070006020801
-00010602070006010700060b080106160001060207030602070306040801061600010607
-0701060808010616000106040702060307020603080106ff06be02020103020206030001
-060107080602070206010801061600010600070006000703060007020600070406010801
-06160001060b07000601070006020801000106020700060a070006020801000106020700
-06010700060b080106160001060107030604070306030801061600010612080106160001
-06040702060307020603080106ff06be0202010302020603000106010709060608010616
-000106000700060007030600070206000704060108010616000106080700060107000601
-070006020801000106020700060407000604070006020801000106020700060107000601
-070006080801061600010601070206030707060108010616000106050704060708010616
-000106050701060207020604080106ff06be020201030202060300010601070906060801
-061600010600070006000703060007020600070406010801061600010608070006010700
-060107000602080100010602070006040700060407000602080100010602070006010700
-060107000608080106160001060107020604070506020801061600010606070306070801
-06160001060907020605080106ff06be0202010302020603000106010709060608010616
-000106000700060007030600070206000704060108010616000106050700060107000601
-070006010700060208010001060207000604070006010700060107000602080100010602
-070006010700060107000601070006050801061600010601070206050703060308010616
-0001060707020607080106160001060807020606080106ff06be02020103020206030001
-0601070d0602080106160001060007000600070706000704060108010616000106050700
-060107000601070006010700060208010001060207000604070006010700060107000602
-080100010602070006010700060107000601070006050801061600010601070306050701
-0604080106160001060707020607080106160001060707020607080106ff06be02020103
-020206030001060107030607070006030801061600010600070006000704060107000600
-070406010801061600010602070006010700060107000601070006010700060208010001
-060207000601070006010700060107000601070006020801000106020700060107000601
-07000601070006010700060208010616000106020703060b080106160001060707020607
-080106160001060707020607080106ff06be020201030202060300010601070206070700
-060408010616000106000706060107060601080106160001060207000601070006010700
-060107000601070006020801000106020700060107000601070006010700060107000602
-080100010602070006010700060107000601070006010700060208010616000106020709
-06050801061600010607070206070801061600010612080106ff06be0202010302020603
-000106010701060707000605080106160001060007000600070206050700060007020601
-080106160001060207000601070006010700060107000601070006020801000106020700
-060107000601070006010700060107000602080100010602070006010700060107000601
-070006010700060208010616000106030707060608010616000106060704060608010616
-0001060707020607080106ff06be02020103020206030001060107090606080106160001
-060007000600070206050700060007020601080106160001060207000601070006010700
-060107000601070006020801000106020700060107000601070006010700060107000602
-080100010602070006010700060107000601070006010700060208010616000106050704
-0607080106160001060507060605080106160001060707020607080106ff06be02020103
-020206030001061208010616000106000704060507040601080106160001061208010001
-0612080100010612080106160001061208010616000106120801061600010612080106ff
-06be02020103020206030001061208010616000106120801061600010612080100010612
-080100010612080106160001061208010616000106120801061600010612080106ff06be
-020201030202060300010612080106160001061208010616000106120801000106120801
-00010612080106160001061208010616000106120801061600010612080106ff06be0202
-010302020603000108140616000108140616000108140001081400010814061600010814
-06160001081406160001081406ff06be0202010302020603000008150616000008150616
-00000815000008150000081506160000081506160000081506160000081506ff06be0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed020201030202060301ff01ff01e5
-06030202010302020603010000ff00ff00cf010000120100060302020103020206030100
-00ff00ff00cf010000110800010006030202010302020603010000ff00ff00cf01000001
-060e0801010006030202010302020603010000ff00ff00cf01000001060e080101000603
-0202010302020603010000ff00ff00cf01000001060e0801010006030202010302020603
-0100003401010071010100ff00ff002401000001060e0801010006030202010302020603
-0100003301000075010000ff00ff002301000001060e0801010006030202010302020603
-010000070103000401000005010100190100000301000016010000100100000601020010
-0100000c0100001c010000ff00ff002301000001060e0801010006030202010302020603
-010000070100000201000002010100040100000101000018010000030100002801000008
-010000100100000c0100001c010000ff00ff002301000001060e08010100060302020103
-020206030100000701000002010000010100000001000004010000010100000301010012
-010000030100000101000003010200020100000001010003010200020100000001010009
-010000000101000501000003010200030102000201000001010000030102000201000000
-010100030102000201000000010100030101000001000003010000ff00ff002301000001
-0601010a0601080101000603020201030202060301000007010000020100000301000004
-010000010100000301010012010000030100000001000003010000020100000101010001
-010000040100000201010001010000080101000101000004010000020100000201000001
-010000020100000101000000010000030100000201000001010100010100000101000002
-0100000101010001010000010100000101010003010000ff00ff00230100000106020108
-060208010100060302020103020206030100000701030004010000040100000101000016
-010100040101000801000001010000080100000201000002010000080100000201000004
-010000060100000101000005010100040100000201000001010000020100000101000002
-01000001010000050100000201000004010100ff00ff0021010000010603010606030801
-010006030202010302020603010000070100000101000004010000040100000101000018
-010000030101000501030001010000080100000201000002010000080100000201000004
-010000030103000101000005010100040104000101000002010000010104000101000005
-0100000201000003010000ff00ff00230100000106040104060408010100060302020103
-020206030100000701000002010000030100000401000001010000180100000301000000
-010000030100000201000001010000080100000201000002010000080100000201000004
-010000020100000201000001010000050100000001000003010000050100000201000001
-01000005010000050100000201000003010000ff00ff0023010000010605010206050801
-010006030202010302020603010000070100000201000003010000040100000101000003
-010100120100000301000001010000020100000201000001010000080100000201000002
-010000030101000201010001010000040100000201000002010000010100000201000001
-010000010100000201000002010000010101000101000001010000020100000101000005
-0100000101010003010000ff00ff00230100000106060100060608010100060302020103
-020206030100000701000002010000010104000301010004010100120100000301000002
-010000020103000101000008010000020100000201000003010100020100000001010005
-010000030103000201020002010000020100000201020002010000000101000301020002
-010000060101000001000003010000ff00ff002301000001060e08010100060302020103
-0202060301000033010000290100004501000003010000ff00ff002301000001060e0801
-0100060302020103020206030100003401010025010100420100000201000001010100ff
-00ff002401000001060e0801010006030202010302020603010000a2010200ff00ff0029
-01000001060e0801010006030202010302020603010000ff00ff00cf01000001060e0801
-010006030202010302020603010000ff00ff00cf01000001060e08010100060302020103
-02020603010000ff00ff00cf01000001060e0801010006030202010302020603010000ff
-00ff00cf010000010810010006030202010302020603010000ff00ff00cf010000000811
-01000603020201030202060301ff01ff01e50603020201030202060301ff01ff01d10617
-0202010302020603010006ff06ff06bc0812010006170202010302020603010006ff06ff
-06bc08110000010006170202010302020603010006010dff0dff0db8060108010c060800
-0c060001010006170202010302020603010006010dff0dff0db70000060108010c050000
-08000c060001010006170202010302020603010006010d0100ff00ff00b6060108010c05
-000008010c050001010006170202010302020603010006010d0100ff00ff00b606010801
-0c04000108010c050001010006170202010302020603010006010d0100ff00ff00b60601
-08010c040001060008010c040001010006170202010302020603010006010d0100ff00ff
-00b6060108010c030001060108010c040001011406030202010302020603010006010d01
-00ff00ff00b6060108010c030001060208010c0300010100061201000603020201030202
-0603010006010d0100ff00ff00b6060108010c020001060308010c030001010006120100
-06030202010302020603010006010d0100ff00ff00b6060108010c020001060408010c02
-000101000612010006030202010302020603010006010d0100ff00ff00b6060108010c01
-0001060508010c02000101000612010006030202010302020603010006010d0100ff00ff
-00b6060108010c010001060608010c010001010006120100060302020103020206030100
-06010d0100ff00ff00b6060108010c000001060708010c01000101000612010006030202
-010302020603010006010d0100ff00ff00b6060108010c000001060808010c0000010100
-0612010006030202010302020603010006010d0100ff00ff00b6060108010001080b0c00
-000101000612010006030202010302020603010006010d0100ff00ff00b6060108010000
-080d000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0c0e000101000612010006030202010302020603010006010d01000301010071010100ff
-00ff003c06010801001001000612010006030202010302020603010006010d0100000c01
-01000c7501000c010e0000ff00ff003806010801000d0800000101000612010006030202
-010302020603010006010d0100000c0101000c0301000c1601000c1001000c0601020c10
-01000c0c01000c1c01000c010e0000ff00ff0038060108010001060a0801000101000612
-010006030202010302020603010006010d0100000c0101000c0301000c2801000c080100
-0c1001000c0c01000c1c01000c010e0000ff00ff0038060108010001060a080100010100
-0612010006030202010302020603010006010d0100000c0101000c0301000c0101000c03
-01020c0201000c0001010c0301020c0201000c0001010c0901000c0001010c0501000c03
-01020c0301020c0201000c0101000c0301020c0201000c0001010c0301020c0201000c00
-01010c0301010c0001000c0301000c010e0000ff00ff0038060108010001060a08010001
-01000612010006030202010302020603010006010d0100000c0101000c0301000c000100
-0c0301000c0201000c0101010c0101000c0401000c0201010c0101000c0801010c010100
-0c0401000c0201000c0201000c0101000c0201000c0101000c0001000c0301000c020100
-0c0101010c0101000c0101000c0201000c0101010c0101000c0101000c0101010c030100
-0c010e0000ff00ff0038060108010001060a080100010100061201000603020201030202
-0603010006010d01000001010c0401010c0801000c0101000c0801000c0201000c020100
-0c0801000c0201000c0401000c0601000c0101000c0501010c0401000c0201000c010100
-0c0201000c0101000c0201000c0101000c0501000c0201000c0401010e0000ff00ff0038
-060108010001060a0801000101000612010006030202010302020603010006010d010000
-0c0101000c0301010c0501030c0101000c0801000c0201000c0201000c0801000c020100
-0c0401000c0301030c0101000c0501010c0401040c0101000c0201000c0101040c010100
-0c0501000c0201000c0301000c010e0000ff00ff0038060108010001060a080100010100
-0612010006030202010302020603010006010d0100000c0101000c0301000c0001000c03
-01000c0201000c0101000c0801000c0201000c0201000c0801000c0201000c0401000c02
-01000c0201000c0101000c0501000c0001000c0301000c0501000c0201000c0101000c05
-01000c0501000c0201000c0301000c010e0000ff00ff0038060108010001060a08010001
-01000612010006030202010302020603010006010d0100000c0101000c0301000c010100
-0c0201000c0201000c0101000c0801000c0201000c0201000c0301010c0201010c010100
-0c0401000c0201000c0201000c0101000c0201000c0101000c0101000c0201000c020100
-0c0101010c0101000c0101000c0201000c0101000c0501000c0101010c0301000c010e00
-00ff00ff0038060108010001060a08010001010006120100060302020103020206030100
-06010d0100000c0101000c0301000c0201000c0201030c0101000c0801000c0201000c02
-01000c0301010c0201000c0001010c0501000c0301030c0201020c0201000c0201000c02
-01020c0201000c0001010c0301020c0201000c0601010c0001000c0301000c010e0000ff
-00ff0038060108010001060a080100010100061201000603020201030202060301000601
-0d0100000c0101000c2901000c4501000c0301000c010e0000ff00ff0038060108010001
-060a0801000101000612010006030202010302020603010006010d0100000c0201010c25
-01010c4201000c0201000c0101010c020e0000ff00ff0038060108010001060a08010001
-01000612010006030202010302020603010006010d0100000e7001020e0800ff00ff0038
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001060a08010001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010001060a080100010100061201000603
-0202010302020603010006010d0100ff00ff00b6060108010001060a0801000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010001060a08010001
-01000612010006030202010302020603010006010d0100ff00ff00b6060108010001060a
-0801000101000612010006030202010302020603010006010d0100ff00ff00b606010801
-0001060a0801000101000612010006030202010302020603010006010d0100ff00ff00b6
-060108010001060a0801000101000612010006030202010302020603010006010d0100ff
-00ff00b6060108010001060a080100010100061201000603020201030202060301000601
-0d0100ff00ff00b6060108010001060a0801000101000612010006030202010302020603
-010006010d0100ff00ff00b6060108010001080c00010100061201000603020201030202
-0603010006010d0100ff00ff00b6060108010000080d0001010006120100060302020103
-02020603010006010d0100ff00ff00b6060108010c0e0001010006120100060302020103
-02020603010006010d0100ff00ff00b60601080100100100061201000603020201030202
-0603010006010d0100ff00ff00b6060108010c00000c0800000101000612010006030202
-010302020603010006010d0100ff00ff00b6060108010c000001060808010c0000010100
-0612010006030202010302020603010006010d0100ff00ff00b6060108010c0100010607
-08010c00000101000612010006030202010302020603010006010d0100ff00ff00b60601
-08010c010001060608010c01000101000612010006030202010302020603010006010d01
-00ff00ff00b6060108010c020001060508010c0100010100061201000603020201030202
-0603010006010d0100ff00ff00b6060108010c020001060408010c020001010006120100
-06030202010302020603010006010d0100ff00ff00b6060108010c030001060308010c02
-000101000612010006030202010302020603010006010d0100ff00ff00b6060108010c03
-0001060208010c03000101000612010006030202010302020603010006010d0100ff00ff
-00b6060108010c040001060108010c030001010006120100060302020103020206030100
-06010d0100ff00ff00b6060108010c040001060008010c04000101000612010006030202
-010302020603010006010d0100ff00ff00b6060108010c05000008020c04000101000612
-010006030202010302020603010006010d0100ff00ff00b6060108010c05000008010c05
-000101000612010006030202010302020603010006010d0100ff00ff00b6060108010c06
-08010c05000101000612010006030202010302020603010006010d0000ff00ff00b70601
-08010c0608000c06000101000612010006030202010302020603010006ff06ff06bc0801
-001001000612010006030202010302020603010006ff06ff06bc08000011010006120100
-0603020201030202060301ff01ff01d1061201000603020201030202060301000b010932
-0a0100630100006301000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000b010916010209180a010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-01030202060301000b01091501000902010009170a010063010000170100002001020026
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000b01091501000902010009170a01006301000017010000220100
-002601000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000b01091501000902010009170a01000e0100000001010003
-0102000201000000010100420100000f0102000201040001010000020100000101000000
-010100030102000201000000010100050100000301020002010000000101001801000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000b010916010209180a01000e010100010100000101000002010000010101
-0001010000410100000e0100000201000003010000030100000201000001010100010100
-000101000002010000010101000101000004010000020100000201000001010100010100
-001701000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000b01091501000902010009170a01000e0100000201000001
-0100000201000001010000450100000e0100000701000003010000020100000101000005
-010000020100000101000002010000040100000601000001010000020100001701000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000b01091501000902010009170a01000e0100000201000001010400010100
-00450100000f010200040100000301000002010000010100000501040001010000020100
-000401000003010300010100000201000017010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000b01091501000902
-010009170a01000e01000002010000010100000501000045010000120100000301000003
-010000020100000101000005010000050100000201000004010000020100000201000001
-010000020100001701000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000b010916010209180a01000e010100010100
-00010100000201000001010000450100000e010000020100000301000003010000010101
-000101000005010000020100000101010001010000040100000201000002010000010100
-00020100001701000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000b0109320a01000e010000000101000301020002
-010000450100000f01020005010100020101000001000001010000060102000201000000
-010100050100000301030001010000020100001701000063010000630100006301000063
-010000020100061308010c0e0001062301000603020201030202060301000b0109320a01
-000e01000053010000310100003001000063010000630100006301000063010000020100
-061308010c0e0001062301000603020201030202060301000b0109320a01000e01000053
-010000310100003001000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000b0109320a01000e01000053010000310100
-003001000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000b0109320a01006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000b01
-09320a010063010000630100006301000063010000630100006301000002010006130801
-0c0e0001062301000603020201030202060301000b010a34006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000b000a3501ff01ff0161061308010c0e00010623010006030202010302020603
-0100009a0100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100003508000063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061601020618080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106150100060201000617080100260100003b01000019010000170102002d01000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000001061501000602010006170801006301000019010000190100002d0100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-01030202060301000001061501000602010006170801000e010100000100000301020002
-010000000101000301020003010200340100000f01020003010100000100000201020002
-010000000101000201000000010100050100000301020002010000000101001f01000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000001061501000602010006170801000e0100000001000000010000010100
-00020100000101010001010000040100000201000002010000330100000e010000020100
-000101000001010100010100000201000001010100010100000101010001010000040100
-00020100000201000001010100010100001e010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061601030617
-0801000e010000000100000001000005010000010100000801000006010000330100000e
-010000020100000101000002010000010100000201000001010000020100000101000002
-010000040100000601000001010000020100001e01000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106190100
-06170801000e010000000100000001000002010300010100000801000003010300330100
-000e01000002010000010100000201000001010400010100000201000001010000020100
-00040100000301030001010000020100001e010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061801000618
-0801000e0100000001000000010000010100000201000001010000080100000201000002
-010000330100000e01000002010000010100000201000001010000050100000201000001
-0100000201000004010000020100000201000001010000020100001e0100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010615010206190801000e01000000010000000100000101000002010000010100
-00080100000201000002010000330100000e010000020100000101000001010100010100
-000201000001010000020100000101010001010000040100000201000002010000010100
-00020100001e01000063010000630100006301000063010000020100061308010c0e0001
-06230100060302020103020206030100000106320801000e010000000100000001000002
-010300010100000801000003010300330100000f01020003010100000100000201020002
-010000020100000101000000010100050100000301030001010000020100001e01000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-02020603010000010632080100630100002a010000370100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100002a01000037010000630100006301000063010000630100000201000613
-08010c0e00010623010006030202010302020603010000010632080100630100002a0100
-003701000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010834006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000000083501ff01ff0161061308010c0e00010623010006030202010302020603
-010005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000f6301000f6301000f6301000f6301000f6301000f6301000f02010006130801
-0c0e00010623010006030202010302020603010000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050001000f6301000f6301000f6301000f63
-01000f6301000f6301000f020100061308010c0e00010623010006030202010302020603
-0100050000000532010005000f6301000f6301000f6301000f6301000f6301000f630100
-0f020100061308010c0e0001062301000603020201030202060301000000053401000f63
-01000f6301000f6301000f6301000f6301000f6301000f020100061308010c0e00010623
-01000603020201030202060301000500000005130100050401020515010005000f630100
-0f6301000f6301000f6301000f6301000f6301000f020100061308010c0e000106230100
-0603020201030202060301000000051201020503010005020100051501000f0e01000f16
-01000f3b01000f0e01000f0601020f1001000f0c01000f2901000f6301000f6301000f63
-01000f6301000f020100061308010c0e0001062301000603020201030202060301000500
-00000513010005030100050201000514010005000f0e01000f5301000f0e01000f080100
-0f1001000f0c01000f2901000f6301000f6301000f6301000f6301000f02010006130801
-0c0e00010623010006030202010302020603010000000514010005030100050201000515
-01000f0e01000f0101000f0301020f0201000f0001010f0301020f0201000f0001010f34
-01000f0e01000f0001010f0501000f0301020f0301020f0201000f0101000f0301020f02
-01000f0001010f0301020f0201000f0001010f0301010f0001000f1001000f6301000f63
-01000f6301000f6301000f020100061308010c0e00010623010006030202010302020603
-0100050000000513010005030100050201000514010005000f0e01000f0001000f030100
-0f0201000f0101010f0101000f0401000f0201010f0101000f3301000f0e01010f010100
-0f0401000f0201000f0201000f0101000f0201000f0101000f0001000f0301000f020100
-0f0101010f0101000f0101000f0201000f0101010f0101000f0101000f0101010f100100
-0f6301000f6301000f6301000f6301000f020100061308010c0e00010623010006030202
-01030202060301000000051401000503010005020100051501000f0e01010f0801000f01
-01000f0801000f0201000f0201000f3301000f0e01000f0201000f0401000f0601000f01
-01000f0501010f0401000f0201000f0101000f0201000f0101000f0201000f0101000f05
-01000f0201000f1001000f6301000f6301000f6301000f6301000f020100061308010c0e
-000106230100060302020103020206030100050000000513010005030100050201000514
-010005000f0e01010f0501030f0101000f0801000f0201000f0201000f3301000f0e0100
-0f0201000f0401000f0301030f0101000f0501010f0401040f0101000f0201000f010104
-0f0101000f0501000f0201000f1001000f6301000f6301000f6301000f6301000f020100
-061308010c0e000106230100060302020103020206030100000005140100050301000502
-0100051501000f0e01000f0001000f0301000f0201000f0101000f0801000f0201000f02
-01000f3301000f0e01000f0201000f0401000f0201000f0201000f0101000f0501000f00
-01000f0301000f0501000f0201000f0101000f0501000f0501000f0201000f1001000f63
-01000f6301000f6301000f6301000f020100061308010c0e000106230100060302020103
-0202060301000500000005110104050201020515010005000f0e01000f0101000f020100
-0f0201000f0101000f0801000f0201000f0201000f3301000f0e01010f0101000f040100
-0f0201000f0201000f0101000f0201000f0101000f0101000f0201000f0201000f010101
-0f0101000f0101000f0201000f0101000f0501000f0101010f1001000f6301000f630100
-0f6301000f6301000f020100061308010c0e000106230100060302020103020206030100
-0000053401000f0e01000f0201000f0201030f0101000f0801000f0201000f0201000f33
-01000f0e01000f0001010f0501000f0301030f0201020f0201000f0201000f0201020f02
-01000f0001010f0301020f0201000f0601010f0001000f1001000f6301000f6301000f63
-01000f6301000f020100061308010c0e0001062301000603020201030202060301000500
-00000532010005000f6301000f5101000f1001000f6301000f6301000f6301000f630100
-0f020100061308010c0e0001062301000603020201030202060301000000053401000f63
-01000f4d01000f0201000f1001000f6301000f6301000f6301000f6301000f0201000613
-08010c0e000106230100060302020103020206030100050000000532010005000f630100
-0f4e01020f1101000f6301000f6301000f6301000f6301000f020100061308010c0e0001
-062301000603020201030202060301000000053401000f6301000f6301000f6301000f63
-01000f6301000f6301000f020100061308010c0e00010623010006030202010302020603
-0100050000000532010005000f6301000f6301000f6301000f6301000f6301000f630100
-0f020100061308010c0e0001062301000603020201030202060301000000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000100050001000f6301000f63
-01000f6301000f6301000f6301000f6301000f020100061308010c0e0001062301000603
-020201030202060301000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000100050001ff01ff0161061308010c0e000106230100060302020103
-020206030100050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500010000630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100050000000532010005000063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000000534
-010000630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100050000000513010005050100051601000500
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000000051201020503010205170100001e01000043
-0100000e01000006010200100100000c0100002901000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100050000000513
-010005050100051601000500001e010000430100000e01000008010000100100000c0100
-002901000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000000051401000505010005170100000e0101000001000003
-01020002010400020102003b0100000e0100000001010005010000030102000301020002
-010000010100000301020002010000000101000301020002010000000101000301010000
-0100001001000063010000630100006301000063010000020100061308010c0e00010623
-0100060302020103020206030100050000000513010005050100051601000500000e0100
-00000100000001000001010000020100000301000003010000020100003a0100000e0101
-000101000004010000020100000201000001010000020100000101000000010000030100
-000201000001010100010100000101000002010000010101000101000001010000010101
-001001000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000000051401000505010005170100000e0100000001000000
-0100000501000003010000030100003e0100000e01000002010000040100000601000001
-010000050101000401000002010000010100000201000001010000020100000101000005
-010000020100001001000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100050000000513010005050100051601000500
-000e01000000010000000100000201030003010000040102003b0100000e010000020100
-000401000003010300010100000501010004010400010100000201000001010400010100
-000501000002010000100100006301000063010000630100006301000002010006130801
-0c0e0001062301000603020201030202060301000000051401000505010005170100000e
-0100000001000000010000010100000201000003010000070100003a0100000e01000002
-010000040100000201000002010000010100000501000000010000030100000501000002
-010000010100000501000005010000020100001001000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100050000000511
-010405010104051401000500000e01000000010000000100000101000002010000030100
-0003010000020100003a0100000e01010001010000040100000201000002010000010100
-000201000001010000010100000201000002010000010101000101000001010000020100
-000101000005010000010101001001000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000005340100000e01000000
-010000000100000201030004010100020102003b0100000e010000000101000501000003
-010300020102000201000002010000020102000201000000010100030102000201000006
-010100000100001001000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100050000000532010005000063010000510100
-001001000063010000630100006301000063010000020100061308010c0e000106230100
-06030202010302020603010000000534010000630100004d010000020100001001000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000500000005320100050000630100004e0102001101000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000005340100006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000500000005320100050000630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010000630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001ff01ff
-0161061308010c0e000106230100060302020103020206030100009a0100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100003508000063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000604010206150801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061101020603
-010006020100061408010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006030100
-060201000614080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106130100060301000602
-010006140801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061301000606010006150801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000605010006160801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061301000604010006170801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000603010006020100061408010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010611010406010104061408010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010834006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000000083501ff01ff0161061308010c0e00010623010006030202010302020603
-0100009a0100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100003508000063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061301000604010206150801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061101020603010006020100061408010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010613010006070100061408010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010613
-010006070100061408010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006050101
-061508010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010613010006070100061408010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006070100061408010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010613010006030100060201000614080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106110104060201020615080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106320801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000108340063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-01030202060301000000083501ff01ff0161061308010c0e000106230100060302020103
-020206030100009a01000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000035080000630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006060100061508010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010611010206050101061508010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010613010006040100060001000615080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106130100060401000600010006150801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000603010006010100061508010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010613
-010006020100060201000615080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106130100
-060201050614080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106130100060601000615
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106110104060301020614080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000108340063010000630100006301000063010000630100006301000002010006130801
-0c0e0001062301000603020201030202060301000000083501ff01ff0161061308010c0e
-000106230100060302020103020206030100009a01000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000035
-080000630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006030104
-061408010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010611010206030100061808010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006030100061808010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010613010006030100061808010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010613010006030103061508010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010613
-010006070100061408010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006070100
-061408010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010613010006020100060301000614
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106110104060101030615080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000108340063010000630100006301000063010000630100006301000002010006130801
-0c0e0001062301000603020201030202060301000000083501ff01ff0161061308010c0e
-000106230100060302020103020206030100009a01000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000035
-080000630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006050102
-061408010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010611010206040100061708010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006030100061808010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010613010006030100061808010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010613010006030103061508010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010613
-010006030100060201000614080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106130100
-060301000602010006140801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061301000603
-010006020100061408010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010611010406020102
-061508010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106320801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010834006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000000083501ff01ff
-0161061308010c0e000106230100060302020103020206030100009a0100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100003508000063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000603010406140801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061101020603
-010006020100061408010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006060100
-061508010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010613010006060100061508010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006060100061508010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010613010006060100061508010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010613010006050100061608010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010613
-010006050100061608010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010611010406030100
-061608010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106320801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010834006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000000083501ff01ff
-0161061308010c0e000106230100060302020103020206030100009a0100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100003508000063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000604010206150801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061101020603
-010006020100061408010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006030100
-060201000614080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106130100060301000602
-010006140801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061301000604010206150801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000603010006020100061408010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006030100060201000614080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106130100060301000602010006140801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061101040602010206150801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001083400630100
-006301000063010000630100006301000063010000020100061308010010062301000603
-020201030202060301ff01ff019906130800001106230100060302020103020206030100
-06ff06ff06e3010006030202010302020603010006ff06ff06e301000603020201030202
-0603010006ff06ff06e3010006030202010302020603010006ff06ff06e3010006030202
-010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e30100
-06030202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff
-06e301000603020201030202060301000649010006ff06ff069801000603020201030202
-060301000648010106ff06ff069801000603020201030202060301000647010006000100
-06ff06ff069801000603020201030202060301000649010006ff06ff0698010006030202
-01030202060301000649010006ff06ff0698010006030202010302020603010006490100
-06ff06ff069801000603020201030202060301000649010006ff06ff0698010006030202
-01030202060301000649010006ff06ff0698010006030202010302020603010006470104
-06ff06ff0696010006030202010302020603010006ff06ff06e301000603020201030202
-0603010006ff06ff06e3010006030202010302020603010006ff06ff06e3010006030202
-010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e30100
-060302020103020206030100063708ff08ff0860064a0100060302020103020206030100
-063708ff08ff085f0000064a010006030202010302020603010006370801001d0cff0cff
-0c3e0001064a010006030202010302020603010006370801001c08000cff0cff0c3e0001
-064a0100060302020103020206030100063708010001060b08000000060b08010cff0cff
-0c3e0001064a0100060302020103020206030100063708010001060b08000000060b0801
-0cff0cff0c3e0001064a0100060302020103020206030100063708010001060b08000000
-060b08010cff0cff0c3e0001064a0100060302020103020206030100063708010001060b
-08000000060b08010cff0cff0c3e0001064a010006030202010302020603010006370801
-0001060b08000000060b08010cff0cff0c3e0001064a0100060302020103020206030100
-063708010001060b08000000060b08010cff0cff0c3e0001064a01000603020201030202
-06030100063708010001060b08000000060b08010cff0cff0c3e0001064a010006030202
-0103020206030100063708010001060b08000000060b08010cff0cff0c3e0001064a0100
-060302020103020206030100063708010001060b08000000060b08010cff0cff0c3e0001
-064a0100060302020103020206030100063708010001060b08000000060b08010cff0cff
-0c3e0001064a0100060302020103020206030100063708010001060b08000000060b0801
-0cff0cff0c3e0001064a0100060302020103020206030100063708010001080c0000080d
-0cff0cff0c3e0001064a0100060302020103020206030100063708010000081c0cff0cff
-0c3e0001064a01000603020201030202060301000637080100ff00ff005e064a01000603
-020201030202060301000637080000ff00ff005f064a0100060302020103020206030100
-06ff06ff06e3010006030202010302020603010006ff06ff06e301000603020201030202
-0603010006ff06ff06e3010006030202010302020603010006ff06ff06e3010006030202
-010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e30100
-06030202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff
-06e3010006030202010302020603010006ff06ff06e30100060302020103020206030100
-06ff06ff06e3010006030202010302020603010006ff06ff06e301000603020201030202
-0603010006ff06ff06e3010006030202010302020603010006ff06ff06e3010006030202
-010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e30100
-06030202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff
-06e3010006030202010302020603010006ff06ff06e30100060302020103020206030100
-06ff06ff06e3010006030202010302020603010006ff06ff06e301000603020201030202
-0603010006ff06ff06e3010006030202010302020603010006ff06ff06e3010006030202
-010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e30100
-06030202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff
-06e3010006030202010302020603010006ff06ff06e30100060302020103020206030100
-06ff06ff06e3010006030202010302020603010006ff06ff06e301000603020201030202
-0603010006ff06ff06e3010006030202010302020603010006ff06ff06e3010006030202
-010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e30100
-06030202010100040603010006ff06ff06e301000603000502020400060301ff01ff01e5
-060300000202040000000202040006ff06ff06ed00000202040000000202040006ff06ff
-06ed00000202040000000202040006ff06ff06ed00000202040000000202040006ff06ff
-06ed000002020400000002020400000502ff02ff02e100060202040000000208040002ff
-02ff02e100000208040000000208040002ff02ff02e100000208040000000208040001ff
-01ff01e10000020804000000040901ff01ff01e100000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 64 377 377
-%%EOF
diff --git a/lib/tv/doc/src/tv_search_result.gif b/lib/tv/doc/src/tv_search_result.gif
deleted file mode 100644
index 3e615b4875..0000000000
--- a/lib/tv/doc/src/tv_search_result.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_search_result.ps b/lib/tv/doc/src/tv_search_result.ps
deleted file mode 100644
index 14d0331a8f..0000000000
--- a/lib/tv/doc/src/tv_search_result.ps
+++ /dev/null
@@ -1,2739 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./tv_search_result.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:10:46 2001)
-%%BoundingBox: 0 34 400 249
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 34 400 249
-userdict begin
-%%BeginData:
-DisplayImage
-0 34
-400.000000 215.000000
-12
-1051 565
-1
-0
-0
-32
-ffffff
-000000
-d8d8d8
-4ac1df
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-00ff00
-ff0000
-aa2455
-990000
-7f7f7f
-999999
-ff7f7f
-009900
-7fff7f
-ffd700
-998100
-ffff7f
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-03ba01010000010100000100000001000000010000000100000001000000010000000100
-000101000002010103ff03ff03ff03ff0300010200000100000001000000010000000100
-000001000000010000000100000101000002010103f5000a01ff01ff0137000a03be0101
-000101000000010000000100000001000000010000000100000101000002010103f60000
-0208050001ff01ff013700000208050003bf010100010100000001000000010000000100
-00000100000101000002010103f700000208050002ff02ff023700000208050003c00101
-00010100000001000000010000000100000101000002010103f800000208050002ff02ff
-023700000208050003c10101000101000000010000000100000101000002010103f90000
-0202050602ff02ff0237000005050202050003c201010001010000000100000101000002
-010103fa0000020205000209000d02ff02ff022b00000202050003c30101000101000001
-01000002010103fb00000202050002080000020d05000234010302110103023201020258
-0102020c010102010101021e010102290101020601010208010102310101022a01010230
-0101024100000202050003c40101000201000002010103fc00000202050002080000020d
-05000234010102020107020001010203010102010101020e01050200010702010103020d
-0101020401010204010302030103020e010302060103020301030203010302060103020b
-0101020a0101020201010219010002030101021c0100020b01010206010102090101021b
-010202020100020d0101022a0101020c0104021e0101024100000202050003c501010000
-01000002010103fd00000202050002080000020d05000234010102050101020301010203
-010102010101020e0101020701010203010102010101020c010102020103020301010201
-010102010101020101010208010102010101020101010204010102010101020101010201
-0101020101010201010102040101020101010201010102060101020a0101020201010218
-010102210101020b01010206010102090101021b010202020100020d0101023801010202
-0101021d0101024100000202050003c601010002010103fe000002020500020800000202
-0506020305000234010102050101020301010203010102010101020e0101020701010203
-010102050101020901010203010102070101020101010201010102060102020201010201
-010102080101020101010201010102010101020101010204010102010101020201020203
-0101020a0101020301010202010302030103020201030201010402010101020201030203
-010102000101020a0104020101030203010102000101020301010202010302030101021a
-010002000101020101000202010302030104020201030202010102090101020001010201
-010102030103020301010202010102000101020201010201010302020101020001010201
-010102030103020201010200010102010101020201030202010102020101023000000202
-050003c701000001010103ff000005030208000002020500040400000203050002340101
-02050101020401010202010002020101020e0101020701010203010202040101020a0100
-020301010207010102010101020101010205010102040101020101010208010102010101
-02010101020101010201010102040101020101010204010102020100020b010102030101
-020101010201010102010101020101010200010102010101020101010203010102010101
-020101010202010202000101020a01010202010102010101020201020200010102020101
-020101010201010102020101021a01000200010102010100020101010201010102010101
-020101010201010102010101020101010209010202000102020001010201010102010101
-020201010202010202000101020101010200010102000101020201020200010202000101
-020101010201010102010101020001010201010102010101020101010201010102020101
-02300000050303c7010303ff03000101020b000002030500040200000204050002340101
-02050101020401010201010102020101020e01040204010102040103020d010102040101
-020501020202010102010101020401010205010102010101020701010202010102010101
-020201040204010102010101020501010202010102090101020301010201010102010101
-0201010102080101020101010203010102010101020101010202010102010101020a0101
-02060101020201010201010102020101020101010201010102020101021a010002000102
-02000100020101010201010102010101020101010201010102010101020d010102010101
-020101010205010102020101020201010201010102010101020001010200010102020101
-020101010201010102050101020101020203010102010101020101010201010102020100
-0234010103c8010103ff03010101020b0000020305000402000002040500023401010205
-0101020501010200010002030101020e01010207010102060102020e0100020301010207
-010102010101020101010205010102040101020101010206010102030101020101010205
-010102040101020101010204010102020100020b01010203010102010101020101010201
-010102050104020101010203010102010101020101010202010102010101020a01010203
-01040202010102010101020201010201010502020101021a010002010101020001000201
-010102010101020101010201010102010105020d01010201010102010101020201040202
-010102020101020101010201010102000101020001010202010102010101020101010202
-010402010101020401010201010502020101020001010234010103ff03cc0101020b0000
-02040500040000000205050002340101020501010205010302030101020e010102070101
-02070101020d010102030101020701010201010102010101020601020202010102010101
-0205010102040101020101010205010102040101020101010202010202030101020a0101
-020301010201010102010101020101010204010102010101020101010203010102010101
-020101010202010102010101020a01010202010102010101020201010201010102020101
-0201010102060101021a0100020201020201010102010101020101010201010102010101
-021101010201010102010101020101010201010102020101020201010201010102010101
-020101010200010102010101020101010201010102010101020101010201010102040101
-0201010102060101020001000235010103ff03cc0101020b000002040500040000000205
-050002340101020501010206010102040101020e01010207010102030101020101010201
-010102080101020401010203010102010101020101010201010102010101020401010201
-010102010101020101010200010502010101020101010201010102010101020101010200
-0101020101010201010102060101020a0101020201010201010102010101020101010202
-01000200010102010101020101010203010102010101020101010202010102010101020a
-01010202010102010101020201010201010102020101020101010202010002010101021b
-010002020102020101010201010102010101020001020201010102020100020101010209
-010102010101020101010201010102010101020201010202010102010101020201010207
-010102010101020101010201010102010101020101010204010102010101020201000203
-01020235010103ff03cc0101020b00000205000002060500023401010205010102060101
-02040101020e010502030101020401030202010102080101020401010204010302030103
-0202010102090103020201010200010502020103020301030202010102010103020b0101
-020a01010202010102020103020301030202010202000101020101020201010102020103
-0203010102010101020b0102020101020200010102010104020301010202010302020101
-021b01000203010102020103020301010200010102020103020201010209010102010101
-020101010202010202000101020101010202010102010101020301050202010102010101
-020101010202010202000101020001010204010102020103020401010236010103ff03cc
-0101020b0000020d050002340103021101030232010202190100023d0102020c01010237
-010602230101029e01010237010103ff03cc0101020b0000020d0500029d010002ff0254
-01010237010103ae0100030801000305010103ff030a0101020b0000020d050002ff02ff
-022d010103ae0100030801000306010003ff030a0101020c050d02ff02ff022e010103ae
-0100030801000306010003ff030a010102ff02ff0249010103ac01040301010303000103
-0303010003030102030201030307010203010100030001010307010003e2010102ff02ff
-0249010103ae010003020100030201000300010003020100030201000302010003020100
-03000100030a01000302010003000101030101000306010003e2010102ff02ff02490101
-03ae01000302010003020100030001000302010003020100030201040301010203070100
-0302010003000100030201000306010003e2010102ff02ff0249010103ae010003020100
-030101010300010003020100030201000302010003080100030601000302010003000100
-030201000306010003e2010102ff02ff0249010103af0101030101010300010003000103
-0302010203020102030101030308010203010100030201000306010003e2010102020600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-0000060000000202010103ff03cc01010202000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060000000600000006000000060000000600000006000202010103ff03cc0101
-02020600000006ff06ff064001000202010103ff03cc01010202000006ff06ff06400100
-06000202010103ff03cc010102020600000006ff06ff064001000202010103ff03cc0101
-0202000006ff06ff0640010006000202010103ff03cc010102020600000006ff06ff0640
-01000202010103ff03cc010102020000060c07040604070006030702061f070406050700
-060407000604070006190700060207000604070006270702060b07000606070006ff065e
-070006020700060907020613010006000202010103ff03cc0101020206000000060b0700
-060f0700061f070006090700060a07000619070006020700062c070006020700060a0700
-06ff0666070006020700060b0700061401000202010103ff03cc010102020000060c0700
-060607020605070006030702061807000606070106000700060207020602070406170700
-060207000602070206030702060207000602070006170700060207000601070006000701
-06020704060207020603070206020700060007010603070206ff06490700060207000602
-0702060507000602070006000701060c010006000202010103ff03cc0101020206000000
-060b07000608070006050700060207000602070006170700060507000601070106040700
-06040700061a070006000700060507000602070006020700060107000602070006170700
-060207000601070106010700060307000606070006020700060207000601070106010700
-060107000602070006ff0648070006020700060107000602070006040700060207010601
-0700060c01000202010103ff03cc010102020000060c0703060507000605070006020700
-060207000617070306020700060207000604070006040700061a07000600070006050700
-060207000602070006010700060007000600070006170700060207000601070006020700
-0603070006060700060207000602070006010700060207000601070006ff064c07040601
-070006020700060407000602070006020700060b010006000202010103ff03cc01010202
-06000000060b070006080700060507000602070406170700060507000602070006040700
-06040700061a070006000700060507000602070406010700060007000600070006170700
-060207000601070006020700060307000606070006020700060207000601070006020700
-0602070206ff064907000602070006010704060407000602070006020700060c01000202
-010103ff03cc010102020000060c0700060807000605070006020700061b070006050700
-060207000604070006040700061b07000606070006020700060507000600070006000700
-061707000602070006010700060207000603070006060700060207000602070006010700
-060207000605070006ff064807000602070006010700060807000602070006020700060b
-010006000202010103ff03cc0101020206000000060b0700060807000605070006020700
-060207000617070006050700060107010604070006040700061b07000606070006020700
-060207000601070006000700060007000617070006020700060107010601070006030700
-0606070006020700060207000601070006020700060107000602070006ff064807000602
-07000601070006020700060407000602070106010700060c01000202010103ff03cc0101
-02020000060c070006080700060507000603070206180704060207010600070006040700
-060507010619070006060700060307020603070006000700061907020602070006000701
-06050701060407000603070206020700060207000602070206ff06490700060207000602
-0702060507000602070006000701060c010006000202010103ff03cc0101020206000000
-06a8070006ff06840700061001000202010103ff03cc010102020000060b0706062a0706
-062a0706062a07060600070006ff066e0706060e0700060f010006000202010103ff03cc
-0101020206000000060a0706062a0706062a0706062a07060600070006ff066e0706060e
-0700061001000202010103ff03cc01010202000006ff06ff0640010006000202010103ff
-03cc010102020600000006ff06ff064001000202010103ff03cc01010202000006ff06ff
-0640010006000202010103ff03cc01010202060000000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-01000600010006000100060001000600010006000100060001000202010103ff03cc0101
-020200000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000202010103ff03cc0101020206ff06ff06430202010103ff03cc
-0101020206ff06ff06430202010103ff03cc0101020206ff06ff06430202010103ff03cc
-0101020206ff06ff06430202010103ff03cc0101020206ff06ff06430202010103ff03cc
-0101020206ff06ff06430202010103ff03cc0101020206ff06ff06430202010103ff03cc
-0101020206ff06ff06430202010103ff03cc010102020636000006000000060000000600
-00000600000006000000060000000600000006000000060000000600000006000000061a
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000601000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000601000006000000060000000600
-00000600000006000000060000000600000006000000060000000600000006000000061a
-000006000000060000000600000006000000060000000600000006000000060000000600
-00000600000006000000061a000006000000060000000600000006000000060000000600
-00000600000006000000060000000600000006000000061a000006000000060000000600
-0000060000000600000006000000060000000600000006000000060000000600000006fb
-0202010103ff03cc01010202063500000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060001000618000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600010000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060001000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000100
-061800000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060001000618000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600010006180000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060000000600010006fa0202010103ff03cc010102020636000006140100061a
-00000614010006010000061401000601000006140100061a000006140100061a00000614
-0100061a00000614010006fb0202010103ff03cc01010202063500000616010006180000
-061601000000061601000000061601000618000006160100061800000616010006180000
-0616010006fa0202010103ff03cc010102020636000006140100061a0000061401000601
-0000061401000601000006140100061a000006140100061a000006140100061a00000614
-010006fb0202010103ff03cc010102020635000006050702060307020606010006180000
-061601000000061601000000061601000618000006160100061800000616010006180000
-0616010006fa0202010103ff03cc0101020206360000060407020603070206050100061a
-00000614010006010000061401000601000006140100061a00000606070406080100061a
-00000608070106090100061a0000060807030607010006fb0202010103ff03cc01010202
-063500000604070406010704060501000618000006100700060401000000061007000604
-010000000604070006100100061800000605070806070100061800000608070306090100
-06180000060707070606010006fa0202010103ff03cc0101020206360000060307000601
-0701060107000601070106040100061a0000060f07000603010006010000060f07000603
-01000601000006030700060f0100061a00000603070a06050100061a0000060707030608
-0100061a000006050703060107030604010006fb0202010103ff03cc0101020206350000
-0603070d0604010006180000060d07000601070006040100000006040700060a07000604
-010000000604070006010700060d01000618000006040703060207030606010006180000
-06090701060a01000618000006060702060307020605010006fa0202010103ff03cc0101
-0202063600000601070006000703060007020600070406020100061a0000060c07000601
-0700060301000601000006030700060a070006030100060100000603070006010700060c
-0100061a0000060207030604070306040100061a000006140100061a0000060507020603
-07020604010006fb0202010103ff03cc0101020206350000060207000600070306000702
-060007040603010006180000060a07000601070006010700060401000000060407000604
-070006040700060401000000060407000601070006010700060a01000618000006030702
-060307070603010006180000060707040609010006180000060707010602070206060100
-06fa0202010103ff03cc0101020206360000060107000600070306000702060007040602
-0100061a0000060907000601070006010700060301000601000006030700060407000604
-0700060301000601000006030700060107000601070006090100061a0000060207020604
-070506030100061a00000607070306080100061a0000060a07020606010006fb02020101
-03ff03cc0101020206350000060207000600070306000702060007040603010006180000
-060707000601070006010700060107000604010000000604070006040700060107000601
-070006040100000006040700060107000601070006010700060701000618000006030702
-060507030605010006180000060907020609010006180000060a07020608010006fa0202
-010103ff03cc010102020636000006010700060007070600070406020100061a00000606
-070006010700060107000601070006030100060100000603070006040700060107000601
-070006030100060100000603070006010700060107000601070006060100061a00000602
-07030605070106050100061a00000608070206080100061a0000060807020608010006fb
-0202010103ff03cc01010202063500000602070006000704060107000600070406030100
-061800000604070006010700060107000601070006010700060401000000060407000601
-070006010700060107000601070006040100000006040700060107000601070006010700
-06010700060401000618000006040703060d010006180000060907020609010006180000
-060907020609010006fa0202010103ff03cc010102020636000006010706060107060602
-0100061a0000060307000601070006010700060107000601070006030100060100000603
-070006010700060107000601070006010700060301000601000006030700060107000601
-0700060107000601070006030100061a00000603070906060100061a0000060807020608
-0100061a00000614010006fb0202010103ff03cc01010202063500000602070006000702
-060507000600070206030100061800000604070006010700060107000601070006010700
-060401000000060407000601070006010700060107000601070006040100000006040700
-060107000601070006010700060107000604010006180000060507070608010006180000
-060807040608010006180000060907020609010006fa0202010103ff03cc010102020636
-00000601070006000702060507000600070206020100061a000006030700060107000601
-070006010700060107000603010006010000060307000601070006010700060107000601
-07000603010006010000060307000601070006010700060107000601070006030100061a
-00000606070406080100061a00000606070606060100061a0000060807020608010006fb
-0202010103ff03cc01010202063500000602070406050704060301000618000006160100
-000006160100000006160100061800000616010006180000061601000618000006160100
-06fa0202010103ff03cc010102020636000006140100061a000006140100060100000614
-01000601000006140100061a000006140100061a000006140100061a00000614010006fb
-0202010103ff03cc01010202063500000616010006180000061601000000061601000000
-0616010006180000061601000618000006160100061800000616010006fa0202010103ff
-03cc010102020636000006140100061a0000061401000601000006140100060100000614
-0100061a000006140100061a000006140100061a00000614010006fb0202010103ff03cc
-010102020635000006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006180000060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-000006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010000000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000618000006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006180000060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100061800000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-0600010006fa0202010103ff03cc01010202063601000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100061a01000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060101000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060101000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100061a01000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100061a01000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100061a01000600010006000100060001000600
-01000600010006000100060001000600010006000100060001000600010006fb02020101
-03ff03cc0101020206ff06ff06430202010103ff03cc0101020206ff06ff064302020101
-0303000a01ff01b0000a03010101020206ff06ff064302020101030300000208050001ff
-01b000000208050003010101020206ff06ff064302020101030300000208050002ff02b0
-00000208050003010101020206ff06ff064302020101030300000208050002ff02b00000
-0208050003010101020206ff06ff064302020101030300000202050602ff02b000000505
-0202050003010101020206ff06ff06430202010103030000020205000209000d02ff02a4
-00000202050003010101020206ff06ff064302020101030300000202050002080000020d
-0500029001030211010302330101021501010206010102a1000002020500030101010202
-06ff06ff064302020101030300000202050002080000020d050002900101020201070200
-01010203010102010101020e010302200101020c0103020401010206010102110100028e
-00000202050003010101020206ff06ff064302020101030300000202050002080000020d
-05000290010102050101020301010203010102010101020d010102010101021f0101020b
-0101020101010203010102190101028e00000202050003010101020206ff06ff06430202
-010103030000020205000208000002020506020305000290010102050101020301010203
-010102010101020d01010206010302030103020201010200010102010103020201010200
-01010207010102030101020201010200010102030101020201030203010302000104028c
-000002020500030101010202060301ff01ff013b06030202010103030000050302080000
-0202050004040000020305000290010102050101020401010202010002020101020d0102
-020401010201010102010101020101010201010102000101020001010201010102010102
-020001010206010102030101020201020200010102020101020101010201010102010101
-0201010102000101028e000005030301010102020603010006ff06ff0625010006000000
-060000000600000006000000060000000600000006000000060000000600000006000100
-06030202010103030101020b000002030500040200000204050002900101020501010204
-01010201010102020101020e010302020101020101010205010102010102020201010205
-010102010101020601010203010102020101020101010202010102010101020101010201
-010102040101029101010301010102020603010006ff06ff062501000000060000000600
-000006000000060000000600000006000000060000000600000006000101060302020101
-03030101020b000002030500040200000204050002900101020501010205010102000100
-020301010210010202010105020201040201010102030101020501010201010102060101
-020301010202010102010101020201010201010502010101020401010291010103010101
-02020603010006010dff0dff0d210601010006000000060e010006000100060302020101
-03030101020b000002040500040000000205050002900101020501010205010302030101
-021101010201010102050101020101010201010102030101020501010201010102060101
-020301010202010102010101020201010201010102050101020401010291010103010101
-02020603010006010dff0dff0d2000000601010000000610010106030202010103030101
-020b000002040500040000000205050002900101020501010206010102040101020d0101
-020101010201010102020100020101010201010102010101020301010202010002010101
-020101010207010102010101020301010201010102020101020101010202010002010101
-0202010002000101029101010301010102020603010006010d0100ff00ff001f06010100
-06000000060e01000600010006030202010103030101020b000002050000020605000290
-0101020501010206010102040101020e0103020301030203010202000101020001010204
-01030202010102010101020801030204010402030101020201030203010302020102028f
-01010301010102020603010006010d0100ff00ff001f0601010000000610010106030202
-010103030101020b0000020d050002900103021101030254010102a40101030101010202
-0603010006010d0100ff00ff001f0601010006000000060e010006000100060302020101
-03030101020b0000020d050002fd010202a501010301010102020603010006010d0100ff
-00ff001f0601010000000610010106030202010103030101020b0000020d050002ff02a6
-01010301010102020603010006010d0100ff00ff001f0601010006000000060e01000600
-010006030202010103030101020c050d02ff02a701010301010102020603010006010d01
-00ff00ff001f0601010000000602010a060201010603020201010303010102ff02c20101
-0301010102020603010006010d0100ff00ff001f06010100060000000602010806020100
-060001000603020201010303010102ff02c201010301010102020603010006010d0100ff
-00ff001f06010100000006040106060401010603020201010303010102ff02c201010301
-010102020603010006010d0100ff00ff001f060101000600000006040104060401000600
-01000603020201010303010102ff02c201010301010102020603010006010d0100ff00ff
-001f06010100000006060102060601010603020201010303010102ff02c2010103010101
-02020603010006010d0100ff00ff001f0601010006000000060601000606010006000100
-06030202010103030101020206ff06bc020201010301010102020603010006010d0100ff
-00ff001f0601010000000610010106030202010103030101020206ff06bc020201010301
-010102020603010006010d0100ff00ff001f0601010006000000060e0100060001000603
-0202010103030101020206ff06bc020201010301010102020603010006010d0100ff00ff
-001f0601010000000610010106030202010103030101020206ff06bc0202010103010101
-02020603010006010d0100ff00ff001f0601010006000000060e01000600010006030202
-010103030101020206ff06bc020201010301010102020603010006010d0100ff00ff001f
-0601010000000610010106030202010103030101020206ff06bc02020101030101010202
-0603010006010d0100ff00ff001f0601010006000000060e010006000100060302020101
-03030101020206ff06bc020201010301010102020603010006010d0000ff00ff00200601
-010000000610010106030202010103030101020206ff06bc020201010301010102020603
-010006ff06ff062501000600000006000100060001000600010006000100060001000600
-010006000100060001000600010006030202010103030101020206ff06bc020201010301
-010102020603010006ff06ff062501000000060001000600010006000100060001000600
-01000600010006000100060001000600010106030202010103030101020206ff06bc0202
-0101030101010202060301ff01ff013b0603020201010303010102020608000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006080202010103010101020206ff06ff
-064302020101030301010202060700000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600010006070202010103010101020206ff06ff064302020101030301010202
-0608000006ff06a8010006080202010103010101020206ff06ff06430202010103030101
-02020607000006ff06aa010006070202010103010101020206ff06ff0643020201010303
-010102020608000006ff06a8010006080202010103010101020206ff06ff064302020101
-0303010102020607000006ff06aa010006070202010103010101020206ff06ff06430202
-01010303010102020608000006ff06a8010006080202010103010101020206ff06ff0643
-020201010303010102020607000006ff06aa010006070202010103010101020206ff06ff
-0643020201010303010102020608000006ff06a8010006080202010103010101020206ff
-06ff0643020201010303010102020607000006ff06aa0100060702020101030101010202
-06ff06ff0643020201010303010102020608000006ff06a8010006080202010103010101
-020206ff06ff0643020201010303010102020607000006ff06aa01000607020201010301
-0101020206ff06ff0643020201010303010102020608000006ff06a80100060802020101
-03010101020206ff06ff0643020201010303010102020607000006ff0649000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060000000611010006070202010103010101020206ff06ff0643020201010303
-010102020608000006ff0647000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006110100060802020101
-03010101020206ff06ff0643020201010303010102020607000006ff06490000064c0100
-0611010006070202010103010101020206ff06ff06430202010103030101020206080000
-06ff06470000064c01000611010006080202010103010101020206ff06ff064302020101
-03030101020206070000060d0102061e0100060f010106ff06060000064c010006110100
-06070202010103010101020206ff06ff06430202010103030101020206080000060b0100
-06020100061d0100060e010006ff06070000064c01000611010006080202010103010101
-020206ff06ff06430202010103030101020206070000060c010006060102060301020602
-010006000101060301020602010006000101060b01000604010206020100060001010604
-010106f20000064c01000611010006070202010103010101020206ff06ff064302020101
-03030101020206080000060c010006040100060201000601010006020100060101010601
-010006010100060201000601010106010100060801040601010006020100060101010601
-01000603010106f10000064c010006110100060802020101030101010202060301ff01ff
-013b06030202010103030101020206070000060e01010602010006020100060501000601
-0100060501000605010006020100060a010006030100060201000601010006fc0000064c
-0100061101000607020201010301010102020603010006ff06ed0100064a010006030202
-010103030101020206080000060f01000601010406020103060101000605010006050100
-06020100060a010006030100060201000601010006fb000006120102061e010006160100
-06110100060802020101030101010202060301000663010506ff06830100064a01000603
-0202010103030101020206070000060c0100060201000601010006050100060201000601
-0100060501000605010006020100060a010006030100060201000601010006fc00000610
-010006020100061d01000617010006110100060702020101030101010202060301000662
-010706ff06820100064a010006030202010103030101020206080000060b010006020100
-060101000602010006010100060201000601010006050100060201000601010006020100
-060a01000603010006020100060101000607010106f10000061101000606010206030102
-060201000600010106030102060201000600010106130100061101000608020201010301
-0101020206030100066101020603010206ff06810100064a010006030202010103030101
-020206070000060d0102060301020603010306010100060601020602010006020100060a
-010006040102060201000607010106f20000061101000604010006020100060101000602
-010006010101060101000601010006020100060101010601010006130100061101000607
-0202010103010101020206030100066101010605010106ff06810100064a010006030202
-01010303010102020608000006ff06470000061301010602010006020100060501000601
-010006050100060501000602010006120100061101000608020201010301010102020603
-0100066101020603010206ff06810100064a010006030202010103030101020206070000
-06ff06490000061401000601010406020103060101000605010006050100060201000613
-010006110100060702020101030101010202060301000662010706ff06820100064a0100
-0603020201010303010102020608000006ff064700000611010006020100060101000605
-010006020100060101000605010006050100060201000612010006110100060802020101
-030101010202060301000663010506ff06830100064a0100060302020101030301010202
-0607000006ff064900000610010006020100060101000602010006010100060201000601
-010006050100060201000601010006020100061301000611010006070202010103010101
-0202060301000665010106ff06850100064a010006030202010103030101020206080000
-06ff06470000061201020603010206030103060101000606010206020100060201000612
-010006110100060802020101030101010202060301000665010106ff06850100064a0100
-0603020201010303010102020607000006ff06490000064c010006110100060702020101
-030101010202060301000665010106ff06850100064a0100060302020101030301010202
-0608000006ff06470000064c010006110100060802020101030101010202060301000665
-010106ff06850100064a01000603020201010303010102020607000006ff06490000064c
-010006110100060702020101030101010202060301000665010106ff06850100064a0100
-0603020201010303010102020608000006ff06470000064c010006110100060802020101
-030101010202060301000665010106ff06850100064a0100060302020101030301010202
-06070000060b0dff0d2806140000064c0100061101000607020201010301010102020603
-0100066101010600010206ff06850100064a010006030202010103030101020206080000
-060a0dff0d27000006130000064c01000611010006080202010103010101020206030100
-066101010600010206ff06850100064a010006030202010103030101020206070000060b
-0d0100ff002606140000064c010006110100060702020101030101010202060301000661
-010506ff06850100064a010006030202010103030101020206080000060a0d0100ff0026
-06130000064c010006110100060802020101030101010202060301000661010506ff0685
-0100064a010006030202010103030101020206070000060b0d0100ff002606140000064c
-01000611010006070202010103010101020206030100066101020600010106ff06850100
-064a010006030202010103030101020206080000060a0d0100ff002606130000064c0100
-061101000608020201010301010102020603010006ff06ed0100064a0100060302020101
-03030101020206070000060b0d0100ff0026061400000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000611
-0100060702020101030101010202060301ff01ef064a0100060302020101030301010202
-06080000060a0d0100ff0026061300000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000611010006080202
-010103010101020206030100063513610c04060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-0000060000000600000006000000060000000600000006000000060000000c0406000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060000000c040600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000c04060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000001000614010006000100060001000600
-010006000100060001000600010006000100060001000624010006030202010103030101
-020206070000060b0d01001f010000ff0005067501000607020201010301010102020603
-01000635136012000c030100000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-0000060000000600000006000000060000000600000006000c0301000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000c03010000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-00000600000006000000060000000600000006000c030100000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060001000613010006000100060001000600
-010006000100060001000600010006000100060001000600000006230100060302020101
-03030101020206080000060a0d01001d0100000001000000010000ff0003067401000608
-020201010301010102020603010006351301115d12010c01010206000000065c01000c01
-010206000000065c01000c01010206000000065c01000c01010206000000061f01000614
-0100040e00000624010006030202010103030101020206070000060b0d01000101000002
-01000002010200030102000301020003010200ff00040675010006070202010103010101
-02020603010006351301112c0100112f12010c0101020000062b0102062d010006000c01
-01020000062b0102062d010006000c0101020000062d0100062d010006000c0101020000
-06200100061301000600040e060000000623010006030202010103030101020206080000
-060a0d010001010000020100000101000002010000010100000201000001010000020100
-0002010200ff0004067401000608020201010301010102020603010006351301112a0102
-112f12010c010102060000000629010006020100062d01000c0101020600000006290100
-06020100062d01000c01010206000000062b0101062e01000c01010206000000061f0100
-06140100040e00000624010006030202010103030101020206070000060b0d0100010100
-0002010000050100000101000009010000010100000001000000010000ff000306750100
-0607020201010301010102020603010006351301112c0100112f12010c0101020000062a
-010006020100062c010006000c0101020000062e0100062c010006000c0101020000062b
-010006000100062d010006000c010102000006200100061301000600040e060000000623
-010006030202010103030101020206080000060a0d010002010000000100000301030002
-0102000301030003010000ff000506740100060802020101030101010202060301000635
-1301112c0100112f12010c010102060000000629010006020100062d01000c0101020600
-0000062d0100062d01000c01010206000000062a010006000100062e01000c0101020600
-0000061f010006140100040e00000624010006030202010103030101020206070000060b
-0d010002010000000100000201000002010000050100000101000002010000ff000a0675
-01000607020201010301010102020603010006351301112c0100112f12010c0101020000
-062d0100062d010006000c0101020000062c0101062d010006000c0101020000062a0100
-06010100062d010006000c010102000006200100061301000600040e0600000006230100
-06030202010103030101020206080000060a0d0100030100000301000002010000010100
-00020100000101000002010000ff000a0674010006080202010103010101020206030100
-06351301112c0100112f12010c01010206000000062b0100062f01000c01010206000000
-062d0100062d01000c010102060000000628010006020100062e01000c01010206000000
-061f010006140100040e00000624010006030202010103030101020206070000060b0d01
-0003010000040103000201020003010300ff000a06750100060702020101030101010202
-0603010006351301112c0100112f12010c0101020000062b0100062f010006000c010102
-0000062e0100062c010006000c010102000006290105062c010006000c01010200000620
-0100061301000600040e060000000623010006030202010103030101020206080000060a
-0d0100ff0026067401000608020201010301010102020603010006351301112c0100112f
-12010c010102060000000629010006020100062d01000c01010206000000062901000602
-0100062d01000c01010206000000062c0100062e01000c01010206000000061f01000614
-0100040e00000624010006030202010103030101020206070000060b0d0100ff00260614
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006110100060702020101030101010202060301000635
-1301112a0104112d12010c0101020000062a0104062c010006000c0101020000062b0102
-062d010006000c0101020000062c0102062c010006000c01010200000620010006130100
-0600040e060000000623010006030202010103030101020206080000060a0d0100ff0026
-061300000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000611010006080202010103010101020206030100
-06351301115d12010c01010206000000065c01000c01010206000000065c01000c010102
-06000000065c01000c01010206000000061f010006140100040e00000624010006030202
-010103030101020206070000060b0d0100ff002606140000064c01000611010006070202
-01010301010102020603010006351301115d12010c0101020000065c010006000c010102
-0000065c010006000c0101020000065c010006000c010102000006200100061301000600
-040e060000000623010006030202010103030101020206080000060a0d0100ff00260613
-0000064c0100061101000608020201010301010102020603010006351301115d12010c01
-010206000000065c01000c01010206000000065c01000c01010206000000065c01000c01
-010206000000061f010006140100040e0000062401000603020201010303010102020607
-0000060b0d0100ff002606140000064c0100061101000607020201010301010102020603
-010006351301115d12010c0101020000065c010006000c0101020000065c010006000c01
-01020000065c010006000c010102000006200100061301000600040e0600000006230100
-06030202010103030101020206080000060a0d0100ff002606130000064c010006110100
-0608020201010301010102020603010006351301115d12010c01010206000000065c0100
-0c01010206000000065c01000c01010206000000065c01000c01010206000000061f0100
-06140100040e00000624010006030202010103030101020206070000060b0d0100ff0026
-06140000064c0100061101000607020201010301010102020603010006351301115d1201
-0c0101020000065c010006000c0101020000065c010006000c0101020000065c01000600
-0c010102000006200100061301000600040e060000000623010006030202010103030101
-020206080000060a0d0000ff002706130000064c01000611010006080202010103010101
-02020603010006351301125f0c0101020600000006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000c01010206000000
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-06000100060001000c010102060000000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-0600010006000100060001000600010006000100060001000c0101020600000006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-06000100060001000600010006000100060001000600010106140100040e000006240100
-0603020201010303010102020607000006ff06490000064c010006110100060702020101
-030101010202060301000635130012600c00010300000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-01000600010006000100060001000600010006000100060001000600010006000c000103
-000006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-0100060001000600010006000c0001030000060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000c00010300000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100061301000600
-040e06000000062301000603020201010303010102020608000006ff0647000006120102
-061f01020613010006110100060802020101030101010202060301001036006301000063
-010000630100006301000022010006140100040e00000624010006030202010103030101
-02020607000006ff06490000061001000602010006200100061401000611010006070202
-01010301010102020603010010350f000063010000630100006301000063010000220100
-061301000600040e06000000062301000603020201010303010102020608000006ff0647
-000006110100060201000602010206020100060001010603010206030102060501000613
-01000611010006080202010103010101020206030100100108320f010063010000630100
-00630100006301000022010006140100040e000006240100060302020101030301010202
-0607000006ff064900000610010006050100060201000601010106010100060101000602
-010006010100060201000604010006140100061101000607020201010301010102020603
-0100100108320f010063010000630100006301000063010000220100061301000600040e
-06000000062301000603020201010303010102020608000006ff06470000061101000609
-010006010100060201000601010006050100060201000604010006130100061101000608
-020201010301010102020603010010010815010408170f01006301000063010000630100
-006301000022010006140100040e00000624010006030202010103030101020206070000
-06ff06490000061001000606010306010100060201000601010006050104060401000614
-010006110100060702020101030101010202060301001001081501000802010008170f01
-000a0100001a01010004010000340100002c010000350100006301000063010000220100
-061301000600040e06000000062301000603020201010303010102020608000006ff0647
-000006110100060201000601010006020100060101000602010006010100060501000608
-010006130100061101000608020201010301010102020603010010010818010008180f01
-00250100003c0100002c01000035010000630100006301000022010006140100040e0000
-062401000603020201010303010102020607000006ff0649000006100100060201000601
-010006020100060101000602010006010100060201000601010006020100060401000614
-0100061101000607020201010301010102020603010010010818010008180f0100080102
-000301020003010200030102000401000004010200020100000001010003010200260100
-000701000002010000020102000301020003010200030102000201040002010200020100
-0000010100260100006301000063010000220100061301000600040e0600000006230100
-0603020201010303010102020608000006ff064700000612010206030103060101000602
-010006020102060301020605010006130100061101000608020201010301010102020603
-010010010818010008180f01000a01000002010000020100000101000002010000010100
-000201000001010400040100000201010001010000010100000201000025010000070100
-000201000001010000020100000101000002010000010100000201000001010000020100
-000301000003010000020100000101010001010000250100006301000063010000220100
-06140100040e0000062401000603020201010303010102020607000006ff06490000064c
-0100061101000607020201010301010102020603010010010818010008180f01000a0100
-000201000002010000010100000501000002010000030100000601000002010000020100
-000101000002010000250100000701000002010000050100000101000009010000010100
-000701000007010000010100000201000025010000630100006301000022010006130100
-0600040e06000000062301000603020201010303010102020608000006ff06470000064c
-0100061101000608020201010301010102020603010010010817010008190f01000a0100
-000201000002010000020102000201040003010000060100000201000002010000010104
-002501000008010000000100000301030002010200030103000201020004010000040103
-00010100000201000025010000630100006301000022010006140100040e000006240100
-0603020201010303010102020607000006ff06490000064c010006110100060702020101
-0301010102020603010010010817010008190f01000a0100000201000002010000050100
-000101000007010000060100000201000002010000010100002901000008010000000100
-000201000002010000050100000101000002010000050100000301000003010000020100
-000101000002010000250100006301000063010000220100061301000600040e06000000
-062301000603020201010303010102020608000006ff06470000064c0100061101000608
-020201010301010102020603010010010817010008190f01000a01000002010000020100
-000101000002010000010100000201000003010000060100000201000002010000010100
-000201000025010000090100000301000002010000010100000201000001010000020100
-000101000002010000030100000301000002010000010100000201000025010000630100
-006301000022010006140100040e00000624010006030202010103030101020206070000
-06ff06490000064c01000611010006070202010103010101020206030100100108320f01
-000a01000003010200030102000301020004010000060100000201000002010000020102
-002601000009010000040103000201020003010300020102000501010002010300010100
-0002010000250100006301000063010000220100061301000600040e0600000006230100
-0603020201010303010102020608000006ff06470000064c010006110100060802020101
-03010101020206030100100108320f01000a010000570100006301000063010000630100
-0022010006140100040e0000062401000603020201010303010102020607000006ff0649
-0000064c01000611010006070202010103010101020206030100100108320f0100070100
-000101000057010000630100006301000063010000220100061301000600040e06000000
-062301000603020201010303010102020608000006ff06470000064c0100061101000608
-0202010103010101020206030100100108320f0100080101005801000063010000630100
-006301000022010006140100040e00000624010006030202010103030101020206070000
-062200000663010006c00000064c01000611010006070202010103010101020206030100
-100108320f010063010000630100006301000063010000220100061301000600040e0600
-00000623010006030202010103030101020206080000062000000600000006230100063c
-010006000100063e0102064b0100062f0000064c01000611010006080202010103010101
-020206030100100108320f01006301000063010000630100006301000022010006140100
-040e00000624010006030202010103030101020206070000062000000600000006000000
-06220100063b01000600010006000100063f0100067d0000060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-061101000607020201010301010102020603010010010f34006301000063010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06080000061e00000602000006000000060b010206030102060901040602010206020100
-0600010106020101060001000624010006000a01010006000100060b0102060301020609
-010006000101060301020603010106000100060101000602010006040100060301020602
-010006000101060a01020602010006020100060101000600010106020100060001010603
-010206030102060301020603010206030102060201000600010106210000060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100061101000608020201010301010102020603010010000f3501ff01b70614
-0100040e00000624010006030202010103030101020206070000061e0000060400000600
-000006090100060201000601010006020100060a01000603010006020100060101010601
-01000601010006000100060001000622010006000a030100060001000609010006020100
-060101000602010006080101060101000601010006020100060101000601010106010100
-060201000604010006020100060201000601010106010100060801000602010006010100
-060201000601010106010100060101010601010006010100060201000601010006020100
-060101000602010006040100060201000602010006010101060101000682010006070202
-0101030101010202060301000e3600630100006301000063010000630100002201000613
-01000600040e060000000623010006030202010103030101020206080000061c00000606
-000006000000060c010006010100060e0100060301000602010006010100060501000600
-0100060001000621010006000a05010006000100060c010006010100060c010006050100
-0602010006010100060201000601010006020100060401000606010006010100060c0100
-060201000602010006000100060201000602010006010100060501000602010006010100
-060501000608010006020100060201000601010006020100068101000608020201010301
-01010202060301000e350b00006301000063010000630100006301000022010006140100
-040e00000624010006030202010103030101020206070000061c01000608010006000100
-0608010306020102060b0100060301040601010006050100060001000600010006200000
-06000a070000060000000608010306020102060901000605010406010100060201000601
-010006020100060401000603010306010100060c01040603010006030100060201000601
-010006050104060201020603010206050100060201000602010006010100060201000682
-0100060702020101030101010202060301000e0109320b01006301000063010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06080000061c01000606010006000100060801000602010006050100060a010006030100
-060501000605010006000100060001000621000006000a05000006000000060801000602
-010006050100060801000605010006050100060201000601010006020100060401000602
-01000602010006010100060c010006060100060001000602010006020100060101000605
-010006090100060501000604010006020100060201000601010006020100068101000608
-02020101030101010202060301000e0109320b0100630100006301000063010000630100
-0022010006140100040e00000624010006030202010103030101020206070000061e0100
-060401000600010006090100060201000601010006020100060a01000603010006020100
-060101000605010006000100060001000622000006000a03000006000000060901000602
-010006010100060201000608010006050100060201000601010006010101060101000601
-010106040100060201000602010006010100060c01000602010006010100060201000601
-010106010100060101000605010006020100060101000602010006010100060201000604
-010006020100060201000601010006020100068201000607020201010301010102020603
-01000e010916010209180b01006301000063010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206080000061e010006020100
-06000100060b010306020102060c01010602010206020100060501000600010006000100
-0623000006000a01000006000000060b0103060201020609010006060102060301010600
-01000602010106000100060401000603010306010100060d010206020100060201000601
-010006000101060201000606010206030102060301020605010006030102060201000602
-010006810100060802020101030101010202060301000e01091501000902010009170b01
-000701000016010000420100000701000006010200100100000c01000030010000630100
-006301000022010006140100040e00000624010006030202010103030101020206070000
-062001000600010006000100065f00000600000006000000063201000632010006b70100
-060702020101030101010202060301000e01091501000902010009170b0100070100005a
-0100000701000008010000100100000c0100003001000063010000630100002201000613
-01000600040e060000000623010006030202010103030101020206080000062001000600
-01000661000006000000062f0100060201000632010006b6010006080202010103010101
-0202060301000e01091501000902010009170b0100070100000101000003010200020100
-00000101000301020002010000000101003b010000070100000001010005010000030102
-000301020002010000010100000301020002010000000101000301020002010000000101
-00030101000001000017010000630100006301000022010006140100040e000006240100
-060302020101030301010202060700000622010006630000063101020633010006b70100
-060702020101030101010202060301000e010916010209180b0100070100000001000003
-0100000201000001010100010100000401000002010100010100003a0100000701010001
-010000040100000201000002010000010100000201000001010000000100000301000002
-010000010101000101000001010000020100000101010001010000010100000101010017
-0100006301000063010000220100061301000600040e0600000006230100060302020101
-0303010102020608000006ff06a80100060802020101030101010202060301000e010915
-01000902010009170b01000701010008010000010100000801000002010000020100003a
-010000070100000201000004010000060100000101000005010100040100000201000001
-010000020100000101000002010000010100000501000002010000170100006301000063
-01000022010006140100040e0000062401000603020201010303010102020607000006ff
-06aa0100060702020101030101010202060301000e01091501000902010009170b010007
-01010005010300010100000801000002010000020100003a010000070100000201000004
-010000030103000101000005010100040104000101000002010000010104000101000005
-01000002010000170100006301000063010000220100061301000600040e060000000623
-01000603020201010303010102020608000006ff06a80100060802020101030101010202
-060301000e01091501000902010009170b01000701000000010000030100000201000001
-0100000801000002010000020100003a0100000701000002010000040100000201000002
-010000010100000501000000010000030100000501000002010000010100000501000005
-0100000201000017010000630100006301000022010006140100040e0000062401000603
-020201010303010102020607000006ff06aa010006070202010103010101020206030100
-0e010916010209180b010007010000010100000201000002010000010100000801000002
-010000020100003a01000007010100010100000401000002010000020100000101000002
-010000010100000101000002010000020100000101010001010000010100000201000001
-0100000501000001010100170100006301000063010000220100061301000600040e0600
-0000062301000603020201010303010102020608000006ff06a801000608020201010301
-01010202060301000e0109320b0100070100000201000002010300010100000801000002
-010000020100003a01000007010000000101000501000003010300020102000201000002
-010000020102000201000000010100030102000201000006010100000100001701000063
-0100006301000022010006140100040e0000062401000603020201010303010102020607
-000006ff06aa0100060702020101030101010202060301000e0109320b0100630100004a
-010000170100006301000063010000220100061301000600040e06000000062301000603
-020201010303010102020608000006ff06a8010006080202010103010101020206030100
-0e0109320b01006301000046010000020100001701000063010000630100002201000614
-0100040e0000062401000603020201010303010102020607000006ff06aa010006070202
-0101030101010202060301000e0109320b01006301000047010200180100006301000063
-010000220100061301000600040e06000000062301000603020201010303010102020608
-000006ff06a80100060802020101030101010202060301000e0109320b01006301000063
-010000630100006301000022010006140100040e00000624010006030202010103030101
-02020607000006ff06aa0100060702020101030101010202060301000e0109320b010063
-010000630100006301000063010000220100061301000600040e06000000062301000603
-020201010303010102020608000006ff06a8010006080202010103010101020206030100
-0e010b34006301000063010000630100006301000022010006140100040e000006240100
-060302020101030301010202060700000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-0600010006000100060702020101030101010202060301000e000b3501ff01b706130100
-0600040e0600000006230100060302020101030301010202060801000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-06000100060001000600010006000100060802020101030101010202060301000c360063
-01000063010000630100006301000022010006140100040e000006240100060302020101
-03030101020206ff06bc02020101030101010202060301000c3501000063010000630100
-006301000063010000220100061301000600040e06000000062301000603020201010303
-0101020206ff06bc02020101030101010202060301000c01013400630100006301000063
-0100006301000022010006140100040e00000624010006030202010103030101020206ff
-06bc02020101030101010202060301000c01013400630100006301000063010000630100
-00220100061301000600040e060000000623010006030202010103030101020206ff06bc
-02020101030101010202060301000c0101160002011a0063010000630100006301000063
-01000022010006140100040e00000624010006030202010103030101020206ff06bc0202
-0101030101010202060301000c010115000001020000011900070100000e010000140100
-00340100002b010200340100006301000063010000220100061301000600040e06000000
-0623010006030202010103030101020206ff06bc02020101030101010202060301000c01
-0115000001020000011900070100000e0100004a0100002d010000340100006301000063
-01000022010006140100040e00000624010006030202010103030101020206ff06bc0202
-0101030101010202060301000c0101150000010200000119000701000001010000030102
-000201040002010200020100000001010003010200020100000001010003010200260100
-000701000002010000010100000001010002010000000101000301020003010200050100
-00030102002d0100006301000063010000220100061301000600040e0600000006230100
-06030202010103030101020206ff06bc02020101030101010202060301000c0101150000
-010200000119000701000000010000030100000201000003010000030100000201000001
-010100010100000401000002010100010100000101000002010000250100000701000002
-010000010101000101000001010100010100000101000002010000010100000201000004
-01000002010000020100002c010000630100006301000022010006140100040e00000624
-010006030202010103030101020206ff06bc02020101030101010202060301000c010116
-000301190007010100080100000301000007010000010100000801000002010000020100
-000501000025010000070100000201000001010000020100000101000002010000010100
-000901000004010000060100002c0100006301000063010000220100061301000600040e
-060000000623010006030202010103030101020206ff06bc020201010301010102020603
-01000c010119000001190007010100050103000301000004010300010100000801000002
-010000020100000201030025010000070100000201000001010000020100000101000002
-010000020102000301030004010000030103002c01000063010000630100002201000614
-0100040e00000624010006030202010103030101020206ff06a101000600010006000100
-060001000600010006000100060001000600010006000100060902020101030101010202
-060301000c0101180000011a000701000000010000030100000201000003010000030100
-000201000001010000080100000201000002010000010100000201000025010000070100
-000201000001010000020100000101000002010000050100000101000002010000040100
-0002010000020100002c0100006301000063010000220100061301000600040e06000000
-0623010006030202010103030101020206ff06a001000600010006000100060001000600
-010006000100060001000600010006000100060000000608020201010301010102020603
-01000c0101150002011b0007010000010100000201000002010000030100000301000002
-010000010100000801000002010000020100000101000002010000250100000701000001
-010100010101000101000001010100010100000101000002010000010100000201000004
-01000002010000020100002c010000630100006301000022010006140100040e00000624
-010006030202010103030101020206070dff0d9606020100060601000606000006090202
-0101030101010202060301000c0101340007010000020100000201030004010100020103
-000101000008010000020100000201000002010300250100000801010000010000010100
-00000101000201000000010100030102000301030004010000030103002c010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06070dff0d95000006010100060600000608000006080202010103010101020206030100
-0c01013400630100000e010000050100004c010000630100006301000022010006140100
-040e00000624010006030202010103030101020206070d0100ff00940602010006060100
-06060000060902020101030101010202060301000c01013400630100000e010000050100
-004c0100006301000063010000220100061301000600040e060000000623010006030202
-010103030101020206070d0100580101006a010100cc0601010006060000060001000606
-0000060802020101030101010202060301000c01013400630100000e010000050100004c
-010000630100006301000022010006140100040e00000624010006030202010103030101
-020206070d0100570100006e010000cb0602010006040000060201000604000006090202
-0101030101010202060301000c0101340063010000630100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d01000f0103
-00180102002701000020010200050100002e01000013010000cb06010100060400000602
-010006060000060802020101030101010202060301000c01013400630100006301000063
-0100006301000022010006140100040e0000062401000603020201010303010102020607
-0d01000f01000002010000160100000201000026010000220100003501000013010000cb
-06020100060400000602010006040000060902020101030101010202060301000c010134
-0063010000630100006301000063010000220100061301000600040e0600000006230100
-06030202010103030101020206070d01000f010000020100000201020002010000020100
-000c01000003010100200100000401020002010000000101000201000000010100030102
-000501000003010200090100000201000002010200030102000301020003010200020104
-0002010200020100000001010004010000cb060101000604000006040100060400000608
-02020101030101010202060301000c0001ff01ed06140100040e00000624010006030202
-010103030101020206070d01000f01000002010000010100000201000001010000020100
-000c01000003010100200100000301000002010000010101000101000001010100010100
-000101000002010000040100000501000009010000020100000101000002010000010100
-000201000001010000020100000101000002010000030100000301000002010000010101
-000101000003010000cb0602010006020000060601000602000006090202010103010101
-0202060301000e360063010000630100006301000063010000220100061301000600040e
-060000000623010006030202010103030101020206070d01000f01030002010000020100
-000101000000010000000100000b01000025010100080100000101000002010000010100
-000201000001010000020100000401000005010000090100000201000005010000010100
-0009010000010100000701000007010000010100000201000004010100c9060101000602
-00000606010006040000060802020101030101010202060301000e350b00006301000063
-010000630100006301000022010006140100040e00000624010006030202010103030101
-020206070d01000f0100000101000002010000020100000101000000010000000100000a
-010000280100000401030001010000020100000101000002010000010104000401000005
-0100000a0100000001000003010300020102000301030002010200040100000401030001
-0100000201000003010000cb060201000602000006060100060200000609020201010301
-01010202060301000e0109320b0100630100006301000063010000630100002201000613
-01000600040e060000000623010006030202010103030101020206070d01000f01000002
-010000010100000201000001010000000100000001000009010000290100000301000002
-010000010100000201000001010000020100000101000008010000050100000a01000000
-010000020100000201000005010000010100000201000005010000030100000301000002
-010000010100000201000003010000cb0601010006020000060801000602000006080202
-0101030101010202060301000e0109320b01006301000063010000630100006301000022
-010006140100040e00000624010006030202010103030101020206070d01000f01000002
-010000010100000201000001010000000100000001000008010000070101002001000003
-010000020100000101000002010000010100000201000001010000020100000401000005
-010000040101000401000003010000020100000101000002010000010100000201000001
-01000002010000030100000301000002010000010100000201000003010000cb06020100
-06000000060a010006000000060902020101030101010202060301000e01091301000904
-010209150b010063010000630100006301000063010000220100061301000600040e0600
-00000623010006030202010103030101020206070d01000f010000020100000201020003
-010000000100000901040003010100200100000401030001010000020100000101000002
-010000020102000501000005010000040101000401000004010300020102000301030002
-0102000501010002010300010100000201000003010000cb060101000600000006000100
-060001000600010006000100060001000600010006020000060802020101030101010202
-060301000e0109110102090301000902010009140b010063010000320102002d01000063
-0100006301000022010006140100040e0000062401000603020201010303010102020607
-0d010057010000300100003c010000cb0602010006000100060001000600010006000100
-06000100060001000600010006000000060902020101030101010202060301000e010913
-0100090301000902010009140b010063010000340100002d010000630100006301000022
-0100061301000600040e060000000623010006030202010103030101020206070d010058
-0101002c0101003b010100cc060101000610000006080202010103010101020206030100
-0e0109130100090301000902010009140b01000701010000010000030102000301010000
-010000010100000001010002010000020100000201020034010000070100000001010003
-010200020100000001010002010000000101000201010000010000030102000501000002
-0101000001000026010000630100006301000022010006140100040e0000062401000603
-0202010103030101020206070d0100ff0094060201000600000006000000060000000600
-000006000000060000000600000006000000060902020101030101010202060301000e01
-09130100090301000902010009140b010007010000000100000001000001010000020100
-000101000001010100010101000101000001010000020100000101000002010000330100
-000701010001010000010100000201000001010100010100000101010001010000010100
-000001000000010000010100000201000004010000020100000001000000010000250100
-006301000063010000220100061301000600000006000000060000000600000006000000
-060000000600000006000000060000000623010006030202010103030101020206070d01
-00ff00940601010006000000060000000600000006000000060000000600000006000000
-0600010006000000060802020101030101010202060301000e0109130100090301000902
-010009140b01000701000000010000000100000501000001010000020100000101000002
-010000010100000201000001010000370100000701000002010000010100000201000001
-010000050100000501000000010000000100000501000004010000020100000001000000
-010000250100006301000063010000220100061401000600000006000000060000000600
-000006000000060000000600000006000000062401000603020201010303010102020607
-0d0100ff00940602010006000000060a0100060000000609020201010301010102020603
-01000e0109130100090301000902010009140b0100070100000001000000010000020103
-000101000002010000010100000201000001010000020100000201020034010000070100
-000201000001010000020100000101000005010000050100000001000000010000020103
-000401000002010000000100000001000025010000630100006301000022010006130100
-06000000060c0100060000000623010006030202010103030101020206070d0100ff0094
-0601010006000000060c010006000000060802020101030101010202060301000e010913
-0100090301000902010009140b0100070100000001000000010000010100000201000001
-010000020100000101000002010000010100000201000005010000330100000701000002
-010000010100000201000001010000050100000501000000010000000100000101000002
-010000040100000201000000010000000100002501000063010000630100002201000614
-010006000000060a0100060000000624010006030202010103030101020206070d010058
-01010063010100d30602010006000000060a010006000000060902020101030101010202
-060301000e01091101040902010209150b01000701000000010000000100000101000002
-010000010100000101010001010000020100000101000001010100010100000201000033
-010000070100000201000001010000020100000101000005010000050100000001000000
-010000010100000201000004010000020100000001000000010000250100006301000063
-0100002201000613010006000000060c0100060000000623010006030202010103030101
-020206070d01005701000067010000d20601010006000000060c01000600000006080202
-0101030101010202060301000e0109320b01000701000000010000000100000201030002
-010100000100000101000002010000020101000001000002010200340100000701000002
-010000020102000201000005010000050100000001000000010000020103000401000002
-01000000010000000100002501000063010000630100002201000614010006000000060a
-0100060000000624010006030202010103030101020206070d01000f0103001801020027
-0100000d010000130100002e01000013010000d20602010006000000060a010006000000
-060902020101030101010202060301000e0109320b010019010000480100006301000063
-010000630100002201000613010006000000060c01000600000006230100060302020101
-03030101020206070d01000f010000020100001601000002010000260100005201000013
-010000d20601010006000000060c01000600000006080202010103010101020206030100
-0e0109320b01001501000002010000480100006301000063010000630100002201000614
-010006000000060a0100060000000624010006030202010103030101020206070d01000f
-010000020100000201020002010000020100000c01000003010100200100000401020003
-010200030102000301020003010200090100000201000002010200030102000301020003
-0102000201040002010200020100000001010004010000d20602010006000000060a0100
-06000000060902020101030101010202060301000e0109320b0100160102004901000063
-01000063010000630100002201000613010006000000060c010006000000062301000603
-0202010103030101020206070d01000f0100000201000001010000020100000101000002
-0100000c0100000301010020010000030100000201000004010000020100000201000001
-010000020100000401000009010000020100000101000002010000010100000201000001
-010000020100000101000002010000030100000301000002010000010101000101000003
-010000d20601010006000000060c01000600000006080202010103010101020206030100
-0e0109320b0100630100006301000063010000630100002201000614010006000000060a
-0100060000000624010006030202010103030101020206070d01000f0103000201000002
-0100000101000000010000000100000a0101002501010004010000080100000201000005
-010000080100000901000002010000050100000101000009010000010100000701000007
-010000010100000201000004010100d00602010006000000060a01000600000006090202
-0101030101010202060301000e0109320b01006301000063010000630100006301000022
-01000613010006000000060c010006000000062301000603020201010303010102020607
-0d01000f0100000101000002010000020100000101000000010000000100000c01000026
-01000003010000080100000201000005010000080100000a010000000100000301030002
-01020003010300020102000401000004010300010100000201000003010000d206010100
-06000000060c010006000000060802020101030101010202060301000e010b3400630100
-006301000063010000630100002201000614010006000000060a01000600000006240100
-06030202010103030101020206070d01000f010000020100000101000002010000010100
-0000010000000100000c0100002601000003010000080100000201000005010000080100
-000a01000000010000020100000201000005010000010100000201000005010000030100
-000301000002010000010100000201000003010000d20602010006000000060a01000600
-0000060902020101030101010202060301000e000b3501ff01b7060c0104060101000600
-0000060c0100060000000623010006030202010103030101020206070d01000f01000002
-010000010100000201000001010000000100000001000008010000020100000301010020
-010000030100000201000004010000020100000201000001010000020100000401000004
-010100040100000301000002010000010100000201000001010000020100000101000002
-010000030100000301000002010000010100000201000003010000d20601010006000000
-060c010006000000060802020101030101010202060301000e3600630100006301000063
-01000063010000220100060c0100060201000602010006000000060a0100060000000624
-010006030202010103030101020206070d01000f01000002010000020102000301000000
-0100000a0102000401010020010000040102000501000003010200030102000501000004
-010100040100000401030002010200030103000201020005010100020103000101000002
-01000003010000d20602010006000000060a010006000000060902020101030101010202
-060301000e350b0000630100006301000063010000630100002201000610010006010100
-060000000600010006000100060001000600010006000100060001000600010006000000
-0623010006030202010103030101020206070d010057010000290100003c010000d20601
-010006000000060c010006000000060802020101030101010202060301000e0109320b01
-0063010000630100006301000063010000220100060f0100060301000600000006000000
-060000000600000006000000060000000600000006000000062401000603020201010303
-0101020206070d010058010100250101003b010100d30602010006000000060a01000600
-0000060902020101030101010202060301000e0109320b01006301000063010000630100
-0063010000220100060f01000602010006000000060c0100060000000623010006030202
-010103030101020206070d0100ff00940601010006000000060c01000600000006080202
-0101030101010202060301000e01091301000905010009160b0100630100006301000063
-01000063010000220100060f01000603010006000000060a010006000000062401000603
-0202010103030101020206070d0100ff00940602010006000000060a0100060000000609
-02020101030101010202060301000e01091101020903010209160b010016010200050100
-00420100002b010200340100006301000063010000220100060e01000603010006000000
-060c0100060000000623010006030202010103030101020206070d0100ff009406010100
-06000000060c010006000000060802020101030101010202060301000e01091301000905
-010009160b010018010000490100002d010000340100006301000063010000220100060e
-01000604010006000000060a010006000000062401000603020201010303010102020607
-0d0100ff00940602010006000000060a0100060000000609020201010301010102020603
-01000e01091301000905010009160b010007010100000100000301020005010000030102
-0002010000000101003b0100000701000002010000010100000001010002010000000101
-00030102000301020005010000030102002d0100006301000063010000220100060e0100
-0603010006000000060c0100060000000623010006030202010103030101020206070d01
-005801010055010100e10601010006000000060c01000600000006080202010103010101
-0202060301000e01091301000905010009160b0100070100000001000000010000010100
-0002010000040100000501000002010100010100003a0100000701000002010000010101
-000101000001010100010100000101000002010000010100000201000004010000020100
-00020100002c01000063010000630100002201000614010006000000060a010006000000
-0624010006030202010103030101020206070d01005701000059010000e0060201000600
-0000060a010006000000060902020101030101010202060301000e010913010009050100
-09160b010007010000000100000001000005010000040100000501000002010000020100
-003a01000007010000020100000101000002010000010100000201000001010000090100
-0004010000060100002c01000063010000630100002201000613010006000000060c0100
-060000000623010006030202010103030101020206070d01000f0103001b010000260100
-004401000013010000e00601010006000000060c01000600000006080202010103010101
-0202060301000e01091301000905010009160b0100070100000001000000010000020103
-00040100000501000002010000020100003a010000070100000201000001010000020100
-000101000002010000020102000301030004010000030103002c01000063010000630100
-002201000614010006000000060a01000600000006240100060302020101030301010202
-06070d01000f0100000201000019010100260100004401000013010000e0060201000600
-0000060a010006000000060902020101030101010202060301000e010913010009050100
-09160b010007010000000100000001000001010000020100000401000005010000020100
-00020100003a010000070100000201000001010000020100000101000002010000050100
-0001010000020100000401000002010000020100002c0100006301000063010000220100
-0613010006000000060c0100060000000623010006030202010103030101020206070d01
-000f010000020100000201020002010000020100000a0100000001000003010100200100
-000401020002010000020100000201020009010000020100000201020003010200030102
-00030102000201040002010200020100000001010004010000e00601010006000000060c
-010006000000060802020101030101010202060301000e01091101040901010409140b01
-000701000000010000000100000101000002010000040100000501000002010000020100
-003a01000007010000010101000101010001010000010101000101000001010000020100
-0001010000020100000401000002010000020100002c0100006301000063010000220100
-0614010006000000060a0100060000000624010006030202010103030101020206070d01
-000f01000002010000010100000201000001010000020100000901000001010000030101
-002001000003010000020100000101000002010000010100000201000008010000020100
-000101000002010000010100000201000001010000020100000101000002010000030100
-000301000002010000010101000101000003010000e00602010006000000060a01000600
-0000060902020101030101010202060301000e0109320b01000701000000010000000100
-0002010300040100000501000002010000020100003a0100000801010000010000010100
-00000101000201000000010100030102000301030004010000030103002c010000630100
-00630100002201000613010006000000060c010006000000062301000603020201010303
-0101020206070d01000f0103000201000002010000010100000001000000010000080100
-000201000024010100040100000201000001010000020100000501000008010000020100
-000501000001010000090100000101000007010000070100000101000002010000040101
-00de0601010006000000060c010006000000060802020101030101010202060301000e01
-09320b0100630100000e010000050100004c010000630100006301000022010006140100
-06000000060a0100060000000624010006030202010103030101020206070d01000f0100
-000101000002010000020100000101000000010000000100000801000002010000260100
-000301040002010000000100000301030009010000000100000301030002010200030103
-00020102000401000004010300010100000201000003010000e00602010006000000060a
-010006000000060902020101030101010202060301000e0109320b0100630100000e0100
-00050100004c010000630100006301000022010006130100060000000600010006000100
-060001000600010006000100060001000600010006000000062301000603020201010303
-0101020206070d01000f0100000201000001010000020100000101000000010000000100
-000801050025010000030100000601000000010000020100000201000009010000000100
-000201000002010000050100000101000002010000050100000301000003010000020100
-00010100000201000003010000e00601010006000000060c010006000000060802020101
-030101010202060301000e0109320b0100630100000e010000050100004c010000630100
-006301000022010006140100060001000600010006000100060001000600010006000100
-06000100060000000624010006030202010103030101020206070d01000f010000020100
-0001010000020100000101000000010000000100000c0100000301010020010000030100
-000201000003010000030100000201000003010100040100000301000002010000010100
-000201000001010000020100000101000002010000030100000301000002010000010100
-000201000003010000e00602010006000000060a01000600000006090202010103010101
-0202060301000e0109320b01006301000063010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206070d01000f010000020100
-000201020003010000000100000d01000003010100200100000401020004010000040103
-000301010004010000040103000201020003010300020102000501010002010300010100
-000201000003010000e00601010006000000060c01000600000006080202010103010101
-0202060301000e0109320b01006301000063010000630100006301000022010006140100
-040e00000624010006030202010103030101020206070d0100570100001b0100003c0100
-00e00602010006000000060a010006000000060902020101030101010202060301000e01
-0b340063010000630100006301000063010000220100061301000600040e060000000623
-010006030202010103030101020206070d010058010100170101003b010100e106010100
-06000000060c010006000000060802020101030101010202060301000e000b3501ff01b7
-06140100040e00000624010006030202010103030101020206070d0100ff009406020100
-06000000060a010006000000060902020101030101010202060301000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600006301000063
-0100006301000063010000220100061301000600040e0600000006230100060302020101
-03030101020206070d0100ff00940601010006000000060c010006000000060802020101
-030101010202060301000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000100006301000063010000630100006301000022010006140100
-040e00000624010006030202010103030101020206070d0100ff00940602010006000000
-060a01000600000006090202010103010101020206030100060000000632010006000063
-010000630100006301000063010000220100061301000600040e06000000062301000603
-0202010103030101020206070d0100000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000020601010006000000
-060c01000600000006080202010103010101020206030100000006340100006301000063
-010000630100006301000022010006140100040e00000624010006030202010103030101
-020206070d01045801010478010104bc00010602010006000000060a0100060000000609
-020201010301010102020603010006000000061301000604010206150100060000630100
-00630100006301000063010000220100061301000600040e060000000623010006030202
-010103030101020206070d01000004560100047c010004ba010000010601010006000000
-060c01000600000006080202010103010101020206030100000006120102060301000602
-010006150100001f01000042010000120100001701020034010000630100006301000022
-010006140100040e00000624010006030202010103030101020206070d01040f01030417
-01040426010004060100041a010104040100043c01000413010004bb0001060201000600
-0000060a0100060000000609020201010301010102020603010006000000061301000603
-010006020100061401000600006301000012010000190100003401000063010000630100
-00220100061301000600040e060000000623010006030202010103030101020206070d01
-0000040e01000402010004160100040201000426010004210100044401000413010004ba
-010000010601010006000000060c01000600000006080202010103010101020206030100
-000006140100060301000602010006150100000701010000010000030102000201000000
-01010003010200030102003b010000080102000301010000010000020102000201000000
-010100020100000001010005010000030102000201000000010100260100006301000063
-01000022010006140100040e00000624010006030202010103030101020206070d01040f
-010004020100040201020402010004020100040c01000403010104200100040401020403
-010204030102040301020404010004040102040201000400010104030102040901000402
-010004020102040301020403010204030102040201040402010204020100040001010404
-010004bb00010602010006000000060a0100060000000609020201010301010102020603
-010006000000061301000606010006150100060000070100000001000000010000010100
-000201000001010100010100000401000002010000020100003a01000007010000020100
-000101000001010100010100000201000001010100010100000101010001010000040100
-000201000002010000010101000101000025010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206070d010000040e01000402
-010004010100040201000401010004020100040b01000404010104200100040601000402
-010004020100040101000402010004010100040201000401010404040100040201010401
-010004010100040201000408010004020100040101000402010004010100040201000401
-010004020100040101000402010004030100040301000402010004010101040101000403
-010004ba010000010601010006000000060c010006000000060802020101030101010202
-060301000000061401000605010006170100000701000000010000000100000501000001
-01000008010000060100003a010000070100000201000001010000020100000101000002
-010000010100000201000001010000020100000401000006010000010100000201000025
-010000630100006301000022010006140100040e00000624010006030202010103030101
-020206070d01040f01030402010004020100040101000400010004000100040b01000425
-010104070100040201000402010004010100040501000402010004030100040601000402
-010004020100040101000402010004080100040201000405010004010100040901000401
-0100040701000407010004010100040201000404010104b900010602010006000000060a
-010006000000060902020101030101010202060301000600000006130100060401000617
-0100060000070100000001000000010000020103000101000008010000030103003a0100
-000701000002010000010100000201000001010400010100000201000001010000020100
-000401000003010300010100000201000025010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206070d010000040e01000401
-01000402010004020100040101000400010004000100040b010004270100040601000402
-010004020100040201020402010404030100040601000402010004020100040101040409
-010004000100040301030402010204030103040201020404010004040103040101000402
-01000403010004ba010000010601010006000000060c0100060000000608020201010301
-010102020603010000000614010006030100060201000615010000070100000001000000
-0100000101000002010000010100000801000002010000020100003a0100000701000002
-010000010100000201000001010000050100000201000001010000020100000401000002
-01000002010000010100000201000025010000630100006301000022010006140100040e
-00000624010006030202010103030101020206070d01040f010004020100040101000402
-0100040101000400010004000100040a0100042801000406010004020100040201000405
-0100040101000407010004060100040201000402010004010100040d0100040001000402
-010004020100040501000401010004020100040501000403010004030100040201000401
-0100040201000403010004bb00010602010006000000060a010006000000060902020101
-030101010202060301000600000006110104060101040614010006000007010000000100
-00000100000101000002010000010100000801000002010000020100003a010000070100
-000201000001010000010101000101000002010000010100000201000001010100010100
-000401000002010000020100000101000002010000250100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d010000040e
-0100040201000401010004020100040101000400010004000100040a0100040501010420
-010004060100040201000402010004010100040201000401010004020100040301000406
-010004020100040201000401010004020100040301010404010004030100040201000401
-010004020100040101000402010004010100040201000403010004030100040201000401
-0100040201000403010004ba010000010601010006000000060c01000600000006080202
-010103010101020206030100000006340100000701000000010000000100000201030001
-01000008010000030103003a010000080102000301010000010000020102000201000002
-010000010100000001010005010000030103000101000002010000250100006301000063
-01000022010006140100040e00000624010006030202010103030101020206070d01040f
-010004020100040201020403010004000100040b01000405010104200100040601000403
-010204030102040301020404010004060100040201000402010004020102040401010404
-010004040103040201020403010304020102040501010402010304010100040201000403
-010004bb00010602010006000000060a0100060000000609020201010301010102020603
-0100060000000632010006000063010000230100003e0100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100000456
-01000406010004360100043c010004ba010000010601010006000000060c010006000000
-060802020101030101010202060301000000063401000063010000230100003e01000063
-0100006301000022010006140100040e0000062401000603020201010303010102020607
-0d0104580101040101000401010004340101043b010104bc00010602010006000000060a
-010006000000060902020101030101010202060301000600000006320100060000630100
-00230100003e0100006301000063010000220100061301000600040e0600000006230100
-06030202010103030101020206070d010000045c010104ff043101000001060101000600
-0000060c0100060000000608020201010301010102020603010000000634010000630100
-0063010000630100006301000022010006140100040e0000062401000603020201010303
-0101020206070d0104ff049200010602010006000000060a010006000000060902020101
-030101010202060301000600000006320100060000630100006301000063010000630100
-00220100061301000600040e060000000623010006030202010103030101020206070d01
-000004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010000010601010006000000060c01000600000006080202
-010103010101020206030100000006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010000630100006301000063010000630100002201000614
-0100040e00000624010006030202010103030101020206070d0100ff0094060201000600
-0000060a0100060000000609020201010301010102020603010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-0100060001000600010006000100060001000600010006000100060001ff01b706130100
-0600040e060000000623010006030202010103030101020206070d010058010100710101
-00c50601010006000000060c010006000000060802020101030101010202060301000e36
-006301000063010000630100006301000022010006140100040e00000624010006030202
-010103030101020206070d01005701000075010000c40602010006000000060a01000600
-0000060902020101030101010202060301000e350b000063010000630100006301000063
-010000220100061301000600040e06000000062301000603020201010303010102020607
-0d01000f0103001901000004010200200100000d01000009010000170100002d01000013
-010000c40601010006000000060c01000600000006080202010103010101020206030100
-0e0109320b01006301000063010000630100006301000022010006140100040e00000624
-010006030202010103030101020206070d01000f01000002010000170101000301000002
-0100001f01000018010000170100002d01000013010000c40602010006000000060a0100
-06000000060902020101030101010202060301000e0109320b0100630100006301000063
-01000063010000220100061301000600040e060000000623010006030202010103030101
-020206070d01000f01000002010000020102000201000002010000080100000001000003
-010000020100000301010019010000030100000001010003010200030102000201000000
-010100030102000201000000010100030101000001000008010000020100000201020003
-01020003010200030102000201040002010200020100000001010004010000c406010100
-06000000060c010006000000060802020101030101010202060301000e01091301000904
-010209150b01006301000063010000630100006301000022010006140100040e00000624
-010006030202010103030101020206070d01000f01000002010000010100000201000001
-010000020100000a01000003010000020100000301010019010000030101000101000004
-010000020100000201000001010100010100000101000002010000010101000101000001
-010000010101000801000002010000010100000201000001010000020100000101000002
-0100000101000002010000030100000301000002010000010101000101000003010000c4
-0602010006000000060a010006000000060902020101030101010202060301000e010911
-0102090301000902010009140b0100170100004a01000007010000300102002601000063
-01000063010000220100061301000600040e060000000623010006030202010103030101
-020206070d01000f01030002010000020100000101000000010000000100000a01000004
-0102001e0101000401000008010000020100000501000002010000050100000101000005
-010000020100000801000002010000050100000101000009010000010100000701000007
-010000010100000201000004010100c20601010006000000060c01000600000006080202
-0101030101010202060301000e01091301000907010009140b0100170100004a01000007
-0100003201000026010000630100006301000022010006140100040e0000062401000603
-0202010103030101020206070d01000f0100000101000002010000020100000101000000
-010000000100000a01000003010000020100001f01000003010000080100000201000005
-010000020100000201030001010000050100000201000009010000000100000301030002
-01020003010300020102000401000004010300010100000201000003010000c406020100
-06000000060a010006000000060902020101030101010202060301000e01091301000907
-010009140b01000701010000010000030102000201040002010200420100000701000000
-010100020100000001010003010200020101000001000002010100000100000301020002
-010000000101000501000003010200020100000001010018010000630100006301000022
-0100061301000600040e060000000623010006030202010103030101020206070d01000f
-0100000201000001010000020100000101000000010000000100000a0100000301000002
-0100001f0100000301000008010000020100000501000002010000010100000201000001
-010000050100000201000009010000000100000201000002010000050100000101000002
-01000005010000030100000301000002010000010100000201000003010000c406010100
-06000000060c010006000000060802020101030101010202060301000e01091301000905
-010109150b01000701000000010000000100000101000002010000030100000301000002
-010000410100000701010001010000010101000101000001010000020100000101000000
-010000000100000101000000010000000100000101000002010000010101000101000004
-010000020100000201000001010100010100001701000063010000630100002201000614
-0100040e00000624010006030202010103030101020206070d01000f0100000201000001
-010000020100000101000000010000000100000a01000003010000020100000301010019
-010000030100000801000002010000020100000101000002010000010100000201000001
-010000050100000101010003010100040100000301000002010000010100000201000001
-010000020100000101000002010000030100000301000002010000010100000201000003
-010000c40602010006000000060a01000600000006090202010103010101020206030100
-0e01091301000907010009140b0100070100000001000000010000050100000301000003
-010000450100000701000002010000010100000501000002010000010100000001000000
-010000010100000001000000010000050100000101000002010000040100000601000001
-01000002010000170100006301000063010000220100061301000600040e060000000623
-010006030202010103030101020206070d01000f01000002010000020102000301000000
-010000090104000201020004010100190100000301000008010000030102000201000002
-010000020103000101000006010100000100000301010004010000040103000201020003
-010300020102000501010002010300010100000201000003010000c40601010006000000
-060c010006000000060802020101030101010202060301000e0109130100090701000914
-0b0100070100000001000000010000020103000301000004010200420100000701000002
-010000010100000501000002010000010100000001000000010000010100000001000000
-010000020103000101000002010000040100000301030001010000020100001701000063
-0100006301000022010006140100040e0000062401000603020201010303010102020607
-0d010057010000370100003c010000c40602010006000000060a01000600000006090202
-0101030101010202060301000e0109130100090301000902010009140b01000701000000
-010000000100000101000002010000030100000701000041010000070100000201000001
-010000050100000201000001010000000100000001000001010000000100000001000001
-010000020100000101000002010000040100000201000002010000010100000201000017
-0100006301000063010000220100061301000600040e0600000006230100060302020101
-03030101020206070d010058010100330101003b010100c50601010006000000060c0100
-06000000060802020101030101010202060301000e01091101040902010209150b010007
-010000000100000001000001010000020100000301000003010000020100004101000007
-010100010100000101000005010000020100000101000000010000000100000101000000
-010000000100000101000002010000010101000101000004010000020100000201000001
-0100000201000017010000630100006301000022010006140100040e0000062401000603
-0202010103030101020206070d0100ff00940602010006000000060a0100060000000609
-02020101030101010202060301000e0109320b0100070100000001000000010000020103
-000401010002010200420100000701000000010100020100000601020002010000000100
-000001000001010000000100000001000002010300010100000001010005010000030103
-000101000002010000170100006301000063010000220100061301000600040e06000000
-0623010006030202010103030101020206070d0100ff00940601010006000000060c0100
-06000000060802020101030101010202060301000e0109320b0100630100003101000030
-010000630100006301000022010006140100040e00000624010006030202010103030101
-020206070d0100ff00940602010006000000060a01000600000006090202010103010101
-0202060301000e0109320b01006301000031010000300100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100ff0094
-0601010006000000060c010006000000060802020101030101010202060301000e010932
-0b0100630100003101000030010000630100006301000022010006140100040e00000624
-010006030202010103030101020206070d01005801010071010100c50602010006000000
-060a010006000000060902020101030101010202060301000e0109320b01006301000063
-0100006301000063010000220100061301000600040e0600000006230100060302020101
-03030101020206070d01005701000075010000c40601010006000000060c010006000000
-060802020101030101010202060301000e0109320b010063010000630100006301000063
-01000022010006140100040e00000624010006030202010103030101020206070d01000f
-0103001801020004010100200100006001000013010000c40602010006000000060a0100
-06000000060902020101030101010202060301000e010b34006301000063010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06070d01000f01000002010000160100000201000002010000010100001f010000600100
-0013010000c40601010006000000060c0100060000000608020201010301010102020603
-01000e000b3501ff01b706140100040e0000062401000603020201010303010102020607
-0d01000f010000020100000201020002010000020100000c010000020100000101000003
-010100190100000401020002010000020100000201020003010200020100000001010002
-010000000101000301020009010000020100000201020003010200030102000301020002
-01040002010200020100000001010004010000c40602010006000000060a010006000000
-060902020101030101010202060301000e36006301000063010000630100006301000022
-0100061301000600040e060000000623010006030202010103030101020206070d01000f
-01000002010000010100000201000001010000020100000c010000020100000101000003
-010100190100000301000002010000010100000201000001010000020100000101000002
-010000010101000101000001010100010100000101000002010000080100000201000001
-010000020100000101000002010000010100000201000001010000020100000301000003
-01000002010000010101000101000003010000c40601010006000000060c010006000000
-060802020101030101010202060301000e350b0000630100006301000063010000630100
-0022010006140100040e00000624010006030202010103030101020206070d01000f0103
-0002010000020100000101000000010000000100000b01000003010000010100001d0101
-000401000005010000020100000101000009010000010100000201000001010000020100
-000101000002010000080100000201000005010000010100000901000001010000070100
-0007010000010100000201000004010100c20602010006000000060a0100060000000609
-02020101030101010202060301000e0109320b0100630100006301000063010000630100
-00220100061301000600040e060000000623010006030202010103030101020206070d01
-000f0100000101000002010000020100000101000000010000000100000a010000040100
-00010100001f010000040102000201000002010000020102000301030001010000020100
-000101000002010000010104000901000000010000030103000201020003010300020102
-000401000004010300010100000201000003010000c40601010006000000060c01000600
-0000060802020101030101010202060301000e0109320b01006301000063010000630100
-006301000022010006140100040e00000624010006030202010103030101020206070d01
-000f01000002010000010100000201000001010000000100000001000009010000050100
-00010100001f010000070100000101000002010000050100000101000002010000010100
-00020100000101000002010000010100000d010000000100000201000002010000050100
-000101000002010000050100000301000003010000020100000101000002010000030100
-00c40602010006000000060a010006000000060902020101030101010202060301000e01
-091301000906010009150b01006301000063010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206070d01000f010000020100
-000101000002010000010100000001000000010000080100000601000001010000030101
-001901000003010000020100000101000001010100010100000201000001010000020100
-000101000002010000010100000201000001010000020100000301010004010000030100
-000201000001010000020100000101000002010000010100000201000003010000030100
-0002010000010100000201000003010000c40601010006000000060c0100060000000608
-02020101030101010202060301000e01091101020905010109150b010011010000500100
-001e0100001801000029010000630100006301000022010006140100040e000006240100
-06030202010103030101020206070d01000f010000020100000201020003010000000100
-000901040003010100040101001901000004010200030101000001000002010200030103
-000101000002010000010100000201000002010200040101000401000004010300020102
-0003010300020102000501010002010300010100000201000003010000c4060201000600
-0000060a010006000000060902020101030101010202060301000e010913010009040100
-0900010009150b0100630100001e01000018010000290100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100570100
-00370100003c010000c40601010006000000060c01000600000006080202010103010101
-0202060301000e0109130100090401000900010009150b01000701000000010100030102
-000201000000010100030102004201000008010100000100000101000002010000020102
-000201040002010200020100000201000002010200020100000001010003010200020100
-0000010100030101000001000010010000630100006301000022010006140100040e0000
-0624010006030202010103030101020206070d010058010100330101003b010100c50602
-010006000000060a010006000000060902020101030101010202060301000e0109130100
-090301000901010009150b01000701010001010000040100000201010001010000010100
-000201000041010000070100000101010001010000020100000101000002010000030100
-000301000002010000010100000201000001010000020100000101010001010000010100
-000201000001010100010100000101000001010100100100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100ff0094
-0601010006000000060c010006000000060802020101030101010202060301000e010913
-0100090201000902010009150b0100070100000201000004010000020100000201000005
-010000410100000701000002010000010100000201000001010000070100000701000001
-010000020100000101000005010000020100000101000002010000010100000501000002
-01000010010000630100006301000022010006140100040e000006240100060302020101
-03030101020206070d0100ff00940602010006000000060a010006000000060902020101
-030101010202060301000e01091301000902010509140b01000701000002010000040100
-000201000002010000020103004101000007010000020100000101000002010000020102
-000401000004010300020100000001000003010200020100000201000001010400010100
-000501000002010000100100006301000063010000220100061301000600040e06000000
-0623010006030202010103030101020206070d0100ff00940601010006000000060c0100
-06000000060802020101030101010202060301000e01091301000906010009150b010007
-010000020100000401000002010000020100000101000002010000410100000701000002
-010000010100000201000005010000030100000301000002010000020100000001000006
-010000010100000201000001010000050100000501000002010000100100006301000063
-01000022010006140100040e00000624010006030202010103030101020206070d0100ff
-00940602010006000000060a010006000000060902020101030101010202060301000e01
-091101040903010209140b01000701000002010000040100000201000002010000010100
-000201000041010000070100000101010001010000010101000101000002010000030100
-000301000002010000030100000301000002010000010101000101000001010000020100
-00010100000501000001010100100100006301000063010000220100061301000600040e
-060000000623010006030202010103030101020206070d0100ff00940601010006000000
-060c010006000000060802020101030101010202060301000e0109320b01000701000002
-010000040100000201000002010000020103004101000008010100000100000201010000
-010000020102000501010002010300030100000401020002010000000101000301020002
-010000060101000001000010010000630100006301000022010006140100040e00000624
-010006030202010103030101020206070d0100ff00940602010006000000060a01000600
-0000060902020101030101010202060301000e0109320b0100630100000b010000440100
-00100100006301000063010000220100061301000600040e060000000623010006030202
-010103030101020206070d0100ff00940601010006000000060c01000600000006080202
-0101030101010202060301000e0109320b01006301000007010000020100004001000002
-01000010010000630100006301000022010006140100040e000006240100060302020101
-03030101020206070d0100ff00940602010006000000060a010006000000060902020101
-030101010202060301000e0109320b010063010000080102004201020011010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06070d0100ff00940601010006000000060c010006000000060802020101030101010202
-060301000e0109320b01006301000063010000630100006301000022010006140100040e
-00000624010006030202010103030101020206070d0100ff00940602010006000000060a
-010006000000060902020101030101010202060301000e0109320b010063010000630100
-006301000063010000220100061301000600040e06000000062301000603020201010303
-0101020206070d0100ff00940601010006000000060c0100060000000608020201010301
-01010202060301000e010b34006301000063010000630100006301000022010006140100
-040e00000624010006030202010103030101020206070d0100ff00940602010006000000
-060a010006000000060902020101030101010202060301000e000b3501ff01b706130100
-0600040e060000000623010006030202010103030101020206070d0100ff009406010100
-06000000060c010006000000060802020101030101010202060301000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600006301000063
-010000630100006301000022010006140100040e00000624010006030202010103030101
-020206070d0100ff00940602010006000000060a01000600000006090202010103010101
-020206030100000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060001000063010000630100006301000063010000220100061301000600040e
-060000000623010006030202010103030101020206070d0100ff00940601010006000000
-060c01000600000006080202010103010101020206030100060000000632010006000063
-01000063010000630100006301000022010006140100040e000006240100060302020101
-03030101020206070d0100ff00940602010006000000060a010006000000060902020101
-030101010202060301000000063401000063010000630100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100ff0094
-0601010006000000060c0100060000000608020201010301010102020603010006000000
-061301000603010406140100060000630100006301000063010000630100002201000614
-0100040e00000624010006030202010103030101020206070d0100ff0094060201000600
-0000060a0100060000000609020201010301010102020603010000000612010206030100
-06190100000f010200030102004901000007010000230100000b010200030102001f0100
-006301000063010000220100061301000600040e06000000062301000603020201010303
-0101020206070d0100ff00940601010006000000060c0100060000000608020201010301
-010102020603010006000000061301000603010006180100060000110100000501000049
-01000007010000230100000d010000050100001f01000063010000630100002201000614
-0100040e00000624010006030202010103030101020206070d0100ff0094060201000600
-0000060a0100060000000609020201010301010102020603010000000614010006030100
-061901000008010200050100000501000003010200420100000701000000010100030102
-000201000000010100020100000001010003010200020104000101000002010000040100
-00050100001f0100006301000063010000220100061301000600040e0600000006230100
-06030202010103030101020206070d0100ff009406010100060000000600010006000100
-060001000600010006000100060001000600010006000000060802020101030101010202
-060301000600000006130100060301030615010006000007010000020100000401000005
-010000020100000201000041010000070101000101000001010000020100000101010001
-010000010101000101000001010000020100000301000003010000020100000401000005
-0100001f010000630100006301000022010006140100040e000006240100060302020101
-03030101020206070d0100ff009406020100060001000600010006000100060001000600
-010006000100060001000600000006090202010103010101020206030100000006140100
-060701000615010000070100000201000004010000050100000201000002010000410100
-000701000002010000010100000201000001010000050100000201000001010000070100
-00030100000201000004010000050100001f010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206070d0100ff009406010100
-061000000608020201010301010102020603010006000000061301000607010006140100
-060000070100000201000004010000050100000201040041010000070100000201000001
-010000020100000101000005010000020100000201020004010000030100000201000004
-010000050100001f010000630100006301000022010006140100040e0000062401000603
-0202010103030101020206070d0100ff0094060201000600000006000000060000000600
-000006000000060000000600000006000000060902020101030101010202060301000000
-061401000602010006030100061501000007010000020100000401000005010000020100
-004501000007010000020100000101000002010000010100000501000002010000050100
-0003010000030100000201000004010000050100001f0100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100ff0094
-060101000602000006000000060000000600000006000000060000000600010006000000
-060802020101030101010202060301000600000006110104060101030615010006000007
-010000020100000401000005010000020100000201000041010000070100000201000001
-010000020100000101000005010000020100000101000002010000030100000301000001
-01010004010000050100001f010000630100006301000022010006140100040e00000624
-010006030202010103030101020206070d0100ff00940602010006000000060a01000600
-000006090202010103010101020206030100000006340100000801020005010000050100
-000301020042010000070100000201000002010200020100000501000002010000020102
-0005010100020101000001000004010000050100001f0100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100ff0094
-060101000602000006080100060200000608020201010301010102020603010006000000
-063201000600006301000063010000630100006301000022010006140100040e00000624
-010006030202010103030101020206070d0100ff00940602010006020000060601000602
-000006090202010103010101020206030100000006340100006301000063010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06070d0100ff009406010100060400000606010006020000060802020101030101010202
-060301000600000006320100060000630100006301000063010000630100002201000614
-0100040e00000624010006030202010103030101020206070d0100ff0094060201000602
-000006060100060200000609020201010301010102020603010000000634010000630100
-00630100006301000063010000220100061301000600040e060000000623010006030202
-010103030101020206070d0100ff00940601010006040000060401000604000006080202
-010103010101020206030100060000000632010006000063010000630100006301000063
-01000022010006140100040e00000624010006030202010103030101020206070d0100ff
-009406020100060400000602010006040000060902020101030101010202060301000000
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-0063010000630100006301000063010000220100061301000600040e0600000006230100
-06030202010103030101020206070d0100ff009406010100060600000602010006040000
-060802020101030101010202060301000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-06000100060001000600010006000100060001ff01b706140100040e0000062401000603
-0202010103030101020206070d0100ff0094060201000604000006020100060400000609
-02020101030101010202060301000e360063010000630100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206070d0100ff0094
-06010100060600000600010006060000060802020101030101010202060301000e350b00
-006301000063010000630100006301000022010006140100040e00000624010006030202
-010103030101020206070d0100ff00940602010006060100060600000609020201010301
-01010202060301000e0109320b0100630100006301000063010000630100002201000613
-01000600040e060000000623010006030202010103030101020206070d0100ff00940601
-01000608010006060000060802020101030101010202060301000e0109320b0100630100
-0063010000630100006301000022010006140100040e0000062401000603020201010303
-0101020206070d0000ff0095060201000606010006060000060902020101030101010202
-060301000e01091301000905010209140b01006301000063010000630100006301000022
-0100061301000600040e060000000623010006030202010103030101020206ff06a00100
-060000000600000006000000060000000600000006000000060000000600000006000000
-060802020101030101010202060301000e01091101020904010009170b0100170100000d
-010000020100003701000008010200050100000301020005010000090100000d01020026
-010000630100006301000022010006140100040e00000624010006030202010103030101
-020206ff06a1000006000000060000000600000006000000060000000600000006000000
-06000000060902020101030101010202060301000e01091301000903010009180b010017
-01000011010000370100000a0100000c010000100100000f010000260100006301000063
-010000220100061301000600040e06000000062301000603020201010303010102020606
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000618
-02020101030101010202060301000e01091301000903010009180b010007010000000101
-0003010200020104000101000000010100030102000201000001010000340100000a0100
-000301020005010000030102000301020002010000000101000301020005010000020101
-000001000003010200020100000001010011010000630100006301000022010006140100
-040e00000624010006030202010103030101020206050100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000000061702020101030101010202
-060301000e01091301000903010309150b01000701010001010000010100000201000003
-0100000301010001010000040100000201000000010000350100000a0100000501000005
-010000050100000201000002010000010101000101000001010000020100000401000002
-010000000100000001000001010000020100000101010001010000100100006301000063
-010000220100061301000600040e06000000062301000603020201010303010102020606
-010006100000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006020000060c0000061802020101030101010202060301000e010913010009030100
-0902010009140b0100070100000201000005010000030100000301000008010000020101
-00360100000a010000050100000501000005010000020100000201000001010000020100
-000101000002010000040100000201000000010000000100000101000002010000010100
-000201000010010000630100006301000022010006140100040e00000624010006030202
-010103030101020206050100060c00000600010006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-0600000006000000060000000600000006000000060001000600000006000000060c0000
-061702020101030101010202060301000e0109130100090301000902010009140b010007
-010000020100000201030003010000030100000801000002010100360100000a01000005
-010000050100000501000002010400010100000201000001010000020100000401000002
-010000000100000001000001010400010100000201000010010000630100006301000022
-0100061301000600040e060000000623010006030202010103030101020206060100060a
-0000060001000602000006ff067601000602000006000000060000000608000006180202
-0101030101010202060301000e0109130100090301000902010009140b01000701000002
-01000001010000020100000301000003010000080100000201000000010000350100000a
-010000050100000501000005010000020100000501000002010000010100000201000004
-010000020100000001000000010000010100000501000002010000100100006301000063
-01000022010006140100040e000006240100060302020101030301010202060501000608
-000006000000060201000600000006ff0678010006000000060200000600000006080000
-061702020101030101010202060301000e01091101040902010209150b01000701010001
-01000001010000020100000301000003010000080100000201000001010000340100000a
-010000050100000501000005010000020100000201000001010000020100000101000002
-010000040100000201000000010000000100000101000002010000010100000201000010
-0100006301000063010000220100061301000600040e0600000006230100060302020101
-030301010202060601000606000006000000060201000602000006ff0676010006020000
-060400000600000006040000061802020101030101010202060301000e0109320b010007
-01000000010100030103000401010001010000080100000201000002010000330100000a
-010000050100000501000005010000030102000201000002010000020102000501000002
-010000000100000001000002010200020100000201000010010000630100006301000022
-010006140100040e00000624010006030202010103030101020206050100060400000600
-0000060601000600000006ff067801000600000006060000060000000604000006170202
-0101030101010202060301000e0109320b0100070100005a0100001f0100004201000063
-01000063010000220100061301000600040e060000000623010006030202010103030101
-0202060601000602000006000000060601000602000006ff067601000602000006080000
-0600000006000000061802020101030101010202060301000e0109320b0100070100005a
-0100001c0100000101000042010000630100006301000022010006140100040e00000624
-0100060302020101030301010202060501000600010006000100060a01000600000006ff
-0678010006000000060a0100060001000600000006170202010103010101020206030100
-0e0109320b0100070100005a0100001d0101004301000063010000630100002201000613
-01000600040e060000000623010006030202010103030101020206060100060201000600
-0100060601000602000006ff067601000602000006080100060001000600000006180202
-0101030101010202060301000e0109320b01006301000063010000630100006301000022
-010006140100040e00000624010006030202010103030101020206050100060401000600
-0100060601000600000006ff067801000600000006060100060001000604000006170202
-0101030101010202060301000e0109320b01006301000063010000630100006301000022
-0100061301000600040e0600000006230100060302020101030301010202060601000606
-010006000100060201000602000006ff0676010006020000060401000600010006040000
-061802020101030101010202060301000e010b3400630100006301000063010000630100
-0022010006140100040e0000062401000603020201010303010102020605010006080100
-06000100060201000600000006ff06780100060000000602010006000100060800000617
-02020101030101010202060301000e000b3501ff01b7061301000600040e060000000623
-010006030202010103030101020206060100060a0100060001000602000006ff06760100
-060200000600010006000100060800000618020201010301010102020603010010360063
-01000063010000630100006301000022010006140100040e000006240100060302020101
-03030101020206050100060c010006000100060000000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600000006000100060c00000617
-020201010301010102020603010010350f00006301000063010000630100006301000022
-0100061301000600040e0600000006230100060302020101030301010202060601000610
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000602
-0100060c000006180202010103010101020206030100100108320f010063010000630100
-00630100006301000022010006140100040e000006240100060302020101030301010202
-060501000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-0600000006170202010103010101020206030100100108320f0100630100006301000063
-01000063010000220100061301000600040e060000000623010006030202010103030101
-020206060000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-0000061802020101030101010202060301001001081301000803010408140f0100630100
-0063010000630100006301000022010006140100040e0000062401000603020201010303
-0101020206ff06bc02020101030101010202060301001001081101020803010008020100
-08140f01006301000010010000200102002d010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206ff06bc0202010103010101
-0202060301001001081301000806010008150f01006301000010010000220100002d0100
-00630100006301000022010006140100040e000006240100060302020101030301010202
-06ff06bc02020101030101010202060301001001081301000806010008150f0100070100
-000001010003010200020100000001010049010000080102000201040001010000020100
-000101000000010100030102000201000000010100050100000301020002010000000101
-001f0100006301000063010000220100061301000600040e060000000623010006030202
-010103030101020206ff06bc020201010301010102020603010010010813010008060100
-08150f010007010100010100000101000002010000010101000101000048010000070100
-000201000003010000030100000201000001010100010100000101000002010000010101
-000101000004010000020100000201000001010100010100001e01000063010000630100
-0022010006140100040e00000624010006030202010103030101020206ff06bc02020101
-030101010202060301001001081301000806010008150f01000701000002010000010100
-0002010000010100004c0100000701000007010000030100000201000001010000050100
-00020100000101000002010000040100000601000001010000020100001e010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06ff06bc02020101030101010202060301001001081301000805010008160f0100070100
-000201000001010400010100004c01000008010200040100000301000002010000010100
-00050104000101000002010000040100000301030001010000020100001e010000630100
-006301000022010006140100040e00000624010006030202010103030101020206ff06bc
-02020101030101010202060301001001081301000805010008160f010007010000020100
-0001010000050100004c0100000b01000003010000030100000201000001010000050100
-00050100000201000004010000020100000201000001010000020100001e010000630100
-0063010000220100061301000600040e0600000006230100060302020101030301010202
-06ff06bc02020101030101010202060301001001081101040803010008160f0100070101
-00010100000101000002010000010100004c010000070100000201000003010000030100
-000101010001010000050100000201000001010100010100000401000002010000020100
-0001010000020100001e010000630100006301000022010006140100040e000006240100
-06030202010103030101020206ff06bc0202010103010101020206030100100108320f01
-00070100000001010003010200020100004c010000080102000501010002010100000100
-0001010000060102000201000000010100050100000301030001010000020100001e0100
-006301000063010000220100061301000600040e06000000062301000603020201010303
-0101020206ff06bc0202010103010101020206030100100108320f0100070100005a0100
-002a01000037010000630100006301000022010006140100040e00000624010006030202
-010103030101020206ff06bc0202010103010101020206030100100108320f0100070100
-005a0100002a010000370100006301000063010000220100061301000600040e06000000
-0623010006030202010103030101020206ff06bc02020101030101010202060301001001
-08320f0100070100005a0100002a01000037010000630100006301000022010006140100
-040e00000624010006030202010103030101020206ff06bc020201010301010102020603
-0100100108320f010063010000630100006301000063010000220100061301000600040e
-060000000623010006030202010103030101020206ff06bc020201010301010102020603
-0100100108320f01006301000063010000630100006301000022010006140100040e0000
-0624010006030202010103030101020206ff06bc02020101030101010202060301001001
-0f340063010000630100006301000063010000220100061301000600040e060000000623
-010006030202010103030101020206ff06bc020201010301010102020603010010000f35
-01ff01b706140100040e00000624010006030202010103030101020206ff06bc02020101
-030101010202060301000e36006301000063010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206ff06bc0202010103010101
-0202060301000e350b00006301000063010000630100006301000022010006140100040e
-00000624010006030202010103030101020206ff06bc0202010103010101020206030100
-0e0109320b010063010000630100006301000063010000220100061301000600040e0600
-00000623010006030202010103030101020206410100060a010006ff066d020201010301
-01010202060301000e0109320b0100630100006301000063010000630100002201000614
-0100040e0000062401000603020201010303010102020607010206100100060801000612
-010006050100060c0100060d0101061a010006ff06400202010103010101020206030100
-0e01091301000904010209150b0100630100006301000063010000630100002201000613
-01000600040e06000000062301000603020201010303010102020606010006020100060f
-0100061c010006050100060c0100060c0100061c010006ff064002020101030101010202
-060301000e0109110102090301000902010009140b01001101000009010000170100002c
-0100002c01000035010000630100006301000022010006140100040e0000062401000603
-0202010103030101020206060100060d0102060201000600010106030102060301020603
-010206020104060201000605010206050100060b01000604010206020100060201000601
-010006000101060301010600010006ff064002020101030101010202060301000e010913
-0100090301000902010009140b01001c010000170100002c0100002c0100003501000063
-01000063010000220100061301000600040e060000000623010006030202010103030101
-020206060100060c01000602010006010101060101000604010006020100060201000601
-010006020100060301000604010006040100060201000604010006090104060101000602
-010006010100060201000601010106010100060101000601010106ff0640020201010301
-01010202060301000e0109130100090301000902010009140b0100070100000001010003
-01020003010200020100000001010003010200020100000001010003010100000100002c
-010000070100000201000002010200030102000301020003010200020104000201020002
-0100000001010026010000630100006301000022010006140100040e0000062401000603
-020201010303010102020606010306090100060201000601010006020100060401000602
-0100060201000601010006070100060401000604010006080100060b0100060301000602
-010006010100060201000601010006020100060101000602010006ff0640020201010301
-01010202060301000e01091301000904010209150b010007010100010100000401000002
-010000020100000101010001010000010100000201000001010100010100000101000001
-0101002c0100000701000002010000010100000201000001010000020100000101000002
-010000010100000201000003010000030100000201000001010100010100002501000063
-01000063010000220100061301000600040e060000000623010006030202010103030101
-020206060100060201000608010006020100060101000602010006040100060201040601
-010006070100060401000605010206050100060b01000603010006020100060101000602
-01000601010006020100060101000602010006ff06400202010103010101020206030100
-0e0109130100090301000902010009140b01000701000008010000020100000501000002
-010000050100000101000005010000020100002c01000007010000020100000501000001
-010000090100000101000007010000070100000101000002010000250100006301000063
-01000022010006140100040e000006240100060302020101030301010202060601000602
-010006080100060201000601010006020100060401000602010006050100060701000604
-01000608010006040100060b010006030100060201000601010006020100060101000602
-0100060101000602010006ff064002020101030101010202060301000e01091301000903
-01000902010009140b010007010000080100000201000005010000020100000201030001
-01000005010000020100002c010000080100000001000003010300020102000301030002
-010200040100000401030001010000020100002501000063010000630100002201000613
-01000600040e060000000623010006030202010103030101020206060100060201000608
-010006020100060101010601010006040100060201000602010006010100060201000603
-010006050100060301000602010006030100060c01000603010006020100060101000601
-01010601010006020100060101000601010106ff06400202010103010101020206030100
-0e0109130100090301000902010009140b01000701000008010000020100000501000002
-01000001010000020100000101000005010000020100002c010000080100000001000002
-010000020100000501000001010000020100000501000003010000030100000201000001
-0100000201000025010000630100006301000022010006140100040e0000062401000603
-0202010103030101020206070102060a0102060201000600010106050100060301020603
-010206050101060301000604010206040100060c01000604010206030101060001000601
-010006020100060201010600010006ff064002020101030101010202060301000e010911
-01040902010209150b010007010000080100000201000002010000010100000201000001
-010000020100000101000005010000010101002c01000009010000030100000201000001
-010000020100000101000002010000010100000201000003010000030100000201000001
-01000002010000250100006301000063010000220100061301000600040e060000000623
-010006030202010103030101020206250100061a0100060a010006ff066d020201010301
-01010202060301000e0109320b0100070100000801000003010200020100000201000002
-0103000101000006010100000100002c0100000901000004010300020102000301030002
-010200050101000201030001010000020100002501000063010000630100002201000614
-0100040e000006240100060302020101030301010202062201000601010006ff06950202
-0101030101010202060301000e0109320b01006301000063010000630100006301000022
-0100061301000600040e06000000062301000603020201010303010102020623010106ff
-069602020101030101010202060301000e0109320b010063010000630100006301000063
-01000022010006140100040e00000624010006030202010103030101020206ff06bc0202
-0101030101010202060301000e0109320b01006301000063010000630100006301000022
-0100061301000600040e060000000623010006030202010103030101020206ff06bc0202
-0101030101010202060301000e0109320b01006301000063010000630100006301000022
-010006140100040e00000624010006030202010103030101020206ff06bc020201010301
-01010202060301000e0109320b0100630100006301000063010000630100002201000613
-01000600040e060000000623010006030202010103030101020206ff06bc020201010301
-01010202060301000e010b34006301000063010000630100006301000022010006140100
-040e00000624010006030202010103030101020206ff06bc020201010301010102020603
-01000e000b3501ff01b7061301000600040e060000000623010006030202010103030101
-020206ff06bc020201010301010102020603010010360063010000630100006301000063
-01000022010006140100040e00000624010006030202010103030101020206ff06bc0202
-01010301010102020603010010350f000063010000630100006301000063010000220100
-061301000600040e060000000623010006030202010103030101020206ff06bc02020101
-03010101020206030100100108320f010063010000630100006301000063010000220100
-06140100040e00000624010006030202010103030101020206ff06bc0202010103010101
-020206030100100108320f01006301000063010000630100006301000022010006130100
-0600040e060000000623010006030202010103030101020206ff06bc0202010103010101
-0202060301001001081301000804010208150f0100630100006301000063010000630100
-0022010006140100040e0000062401000603020201010303000406ff06bc000403010101
-020206030100100108110102080301000802010008140f01001001000006010000490100
-000e0100001c0100000b010200030102001f010000630100006301000022010006130100
-0600040e0600000006230100060302020101030300000202050006ff06bc000002020500
-03010101020206030100100108130100080301000802010008140f010010010000510100
-000e0100001c0100000d010000050100001f010000630100006301000022010006140100
-040e000006240100060302020101030300000202050006ff06bc00000202050003010101
-020206030100100108130100080301000802010008140f01000801020002010400020102
-000201000000010100030102003b01000008010200020100000101000003010200020100
-00000101000301020002010400010100000201000004010000050100001f010000630100
-0063010000220100061301000600040e0600000006230100060302020101030300000202
-050006ff06bc000002020500030101010202060301001001081301000803010008020100
-08140f010007010000020100000301000006010000020101000101000001010000020100
-003a01000007010000020100000101000000010000030100000201000001010100010100
-00010100000201000003010000030100000201000004010000050100001f010000630100
-006301000022010006140100040e000006240100060302020101030300000202050006ff
-06bc000002020500030101010202060301001001081301000804010308140f0100070100
-0007010000060100000201000002010000050100003a0100000701000005010100080100
-0001010000020100000101000007010000030100000201000004010000050100001f0100
-006301000063010000220100061301000600040e06000000062301000603020201010303
-00000202050006ff06bc0000020205000301010102020603010010010813010008070100
-08140f01000801020004010000060100000201000002010000020103003a010000080102
-000201010005010300010100000201000002010200040100000301000002010000040100
-00050100001f010000630100006301000022010006140100040e00000624010006030202
-01010303000002020500000502ff02b00006020205000301010102020603010010010813
-01000806010008150f01000b010000030100000601000002010000020100000101000002
-0100003a0100000b01000001010000000100000301000002010000010100000201000005
-01000003010000030100000201000004010000050100001f010000630100006301000022
-0100061301000600040e0600000006230100060302020101030300000208050002ff02b0
-000002080500030101010202060301001001081101040801010208160f01000701000002
-0100000301000006010000020100000201000001010000020100003a0100000701000002
-010000010100000101000002010000020100000101000002010000010100000201000003
-010000030100000101010004010000050100001f01000063010000630100002201000614
-0100040e000006240100060302020101030300000208050002ff02b00000020805000301
-0101020206030100100108320f0100080102000501010004010000020100000201000002
-0103003a0100000801020002010000020100000201030001010000020100000201020005
-010100020101000001000004010000050100001f01000063010000630100002201000613
-01000600040e0600000006230100060302020101030300000208050001ff01b000000208
-050003010101020206030100100108320f01006301000063010000630100006301000022
-010006140100040e00000624010006030202010103030000050901ff01b0000005090301
-0101020206030100100108320f0100630100006301000063010000630100002201000613
-01000600040e060000000623010006030202010103ff03cc010102020603010010010832
-0f01006301000063010000630100006301000022010006140100040e0000062401000603
-0202010103ff03cc0101020206030100100108320f010063010000630100006301000063
-010000220100061301000600040e060000000623010006030202010103ff03cc01010202
-06030100100108320f01006301000063010000630100006301000022010006140100040e
-00000624010006030202010103ff03cc010102020603010010010f340063010000630100
-006301000063010000220100061301000600040e060000000623010006030202010103ff
-03cc010102020603010010000f3501ff01b706140100040e000006240100060302020101
-03ff03cc01010202060301000e3600630100006301000063010000630100002201000613
-01000600040e060000000623010006030202010103ff03cc01010202060301000e350b00
-006301000063010000630100006301000022010006140100040e00000624010006030202
-010103ff03cc01010202060301000e0109320b0100630100006301000063010000630100
-00220100061301000600040e060000000623010006030202010103ff03cc010102020603
-01000e0109320b01006301000063010000630100006301000022010006140100040e0000
-0624010006030202010103ff03cc01010202060301000e01091201020903010209150b01
-0063010000630100006301000063010000220100061301000600040e0600000006230100
-06030202010103ff03cc01010202060301000e0109110100090201000901010009020100
-09140b0100630100002c01000035010000630100006301000022010006140100040e0000
-0624010006030202010103ff03cc01010202060301000e01091101000902010009010100
-0902010009140b0100630100002c01000035010000630100006301000022010006130100
-0600040e060000000623010006030202010103ff03cc01010202060301000e0109110100
-09020100090101000902010009140b010008010200020100000201000002010200030102
-0002010000000101000201000000010100030102002d0100000701000002010000020102
-000301020003010200030102000201040002010200020100000001010026010000630100
-006301000022010006140100040e00000624010006030202010103ff03cc010102020603
-01000e0109140100090201000902010009140b0100070100000201000001010000020100
-000101000002010000010100000201000001010100010100000101010001010000010100
-00020100002c010000070100000201000001010000020100000101000002010000010100
-000201000001010000020100000301000003010000020100000101010001010000250100
-006301000063010000220100061301000600040e060000000623010006030202010103ff
-03cc01010202060301000e0109130100090301000902010009140b010007010000050100
-000201000001010000090100000101000002010000010100000201000001010000020100
-002c01000007010000020100000501000001010000090100000101000007010000070100
-00010100000201000025010000630100006301000022010006140100040e000006240100
-06030202010103ff03cc01010202060301000e0109120100090401000902010009140b01
-000801020002010000020100000201020003010300010100000201000001010000020100
-00010104002c010000080100000001000003010300020102000301030002010200040100
-00040103000101000002010000250100006301000063010000220100061301000600040e
-060000000623010006030202010103ff03cc01010202060301000e010911010009020100
-090101000902010009140b01000b01000001010000020100000501000001010000020100
-000101000002010000010100000201000001010000300100000801000000010000020100
-000201000005010000010100000201000005010000030100000301000002010000010100
-000201000025010000630100006301000022010006140100040e00000624010006030202
-010103ff03cc01010202060301000e01091101040902010209150b010007010000020100
-000101000001010100010100000201000001010000020100000101000002010000010100
-000201000001010000020100002c01000009010000030100000201000001010000020100
-000101000002010000010100000201000003010000030100000201000001010000020100
-00250100006301000063010000220100061301000600040e060000000623010006030202
-010103ff03cc01010202060301000e0109320b0100080102000301010000010000020102
-000301030001010000020100000101000002010000020102002d01000009010000040103
-000201020003010300020102000501010002010300010100000201000025010000630100
-006301000022010006140100040e00000624010006030202010103ff03cc010102020603
-01000e0109320b010063010000630100006301000063010000220100061301000600040e
-060000000623010006030202010103ff03cc01010202060301000e0109320b0100630100
-0063010000630100006301000022010006140100040e00000624010006030202010103ff
-03cc01010202060301000e0109320b010063010000630100006301000063010000220100
-061301000600040e060000000623010006030202010103ff03cc01010202060301000e01
-09320b01006301000063010000630100006301000022010006140100040e000006240100
-06030202010103ff03cc01010202060301000e0109320b01006301000063010000630100
-0063010000220100061301000600040e060000000623010006030202010103ff03cc0101
-0202060301000e010b34006301000063010000630100006301000022010006140100040e
-00000624010006030202010103ff03cc01010202060301000e000b3501ff01b706130100
-0600040e060000000623010006030202010103ff03cc0101020206030100060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000630100
-006301000063010000630100002201000614010006000000060000000600000006000000
-060000000600000006000000060000000624010006030202010103ff03cc010102020603
-01ff01ef0613010006000000060000000600000006000000060000000600000006000000
-06000000060000000623010006030202010103ff03cc010102020603010006ff06ff0639
-010006030202010103ff03cc010102020603010006ff06ff0639010006030202010103ff
-03cc010102020603010006ff06ff0639010006030202010103ff03cc0101020206030100
-06ff06ff0639010006030202010103ff03cc010102020603010006ff06ff063901000603
-0202010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc0101
-02020603010006ff06ff0639010006030202010103ff03cc010102020603010006ff06ff
-0639010006030202010103ff03cc01010202060301000649010006ff06ee010006030202
-010103ff03cc01010202060301000648010106ff06ee010006030202010103ff03cc0101
-020206030100064701000600010006ff06ee010006030202010103ff03cc010102020603
-01000649010006ff06ee010006030202010103ff03cc01010202060301000649010006ff
-06ee010006030202010103ff03cc01010202060301000649010006ff06ee010006030202
-010103ff03cc01010202060301000649010006ff06ee010006030202010103ff03cc0101
-0202060301000649010006ff06ee010006030202010103ff03cc01010202060301000647
-010406ff06ec010006030202010103ff03cc010102020603010006ff06ff063901000603
-0202010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc0101
-02020603010006ff06ff0639010006030202010103ff03cc010102020603010006ff06ff
-0639010006030202010103ff03cc010102020603010006ff06ff06390100060302020101
-03ff03cc0101020206030100063801000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100064b010006030202010103ff
-03cc01010202060301000637010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-0100060001000600010006000100060001000600010006000000064a0100060302020101
-03ff03cc0101020206030100063801000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-0600000004ff04940000064b010006030202010103ff03cc010102020603010006370100
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060004ff049406000000064a
-010006030202010103ff03cc01010202060301000638010006000000060c0000060c0100
-04ff04940000064b010006030202010103ff03cc01010202060301000637010006000000
-060c0100060c0100060004ff049406000000064a010006030202010103ff03cc01010202
-060301000638010006000000060c0000060c010004ff04940000064b0100060302020101
-03ff03cc01010202060301000637010006000000060c0100060c0100060004ff04940600
-0000064a010006030202010103ff03cc01010202060301000638010006000000060c0000
-060c010004ff04940000064b010006030202010103ff03cc010102020603010006370100
-06000000060c0100060c0100060004ff049406000000064a010006030202010103ff03cc
-01010202060301000638010006000000060c0000060c010004ff04940000064b01000603
-0202010103ff03cc01010202060301000637010006000000060c0100060c0100060004ff
-049406000000064a010006030202010103ff03cc01010202060301000638010006000000
-060c0000060c010004ff04940000064b010006030202010103ff03cc0101020206030100
-0637010006000000060c0100060c0100060004ff049406000000064a0100060302020101
-03ff03cc01010202060301000638010006000000060c0000060c010004ff04940000064b
-010006030202010103ff03cc010102020603010006370100060000000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060004ff049406000000064a010006030202010103ff03cc
-010102020603010006380100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-04ff04940000064b010006030202010103ff03cc01010202060301000637010006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-0600000006000000064a010006030202010103ff03cc0101020206030100063800000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000064b010006030202010103ff03cc010102020603010006ff06ff06390100
-06030202010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc
-010102020603010006ff06ff0639010006030202010103ff03cc010102020603010006ff
-06ff0639010006030202010103ff03cc010102020603010006ff06ff0639010006030202
-010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc01010202
-0603010006ff06ff0639010006030202010103ff03cc010102020603010006ff06ff0639
-010006030202010103ff03cc010102020603010006ff06ff0639010006030202010103ff
-03cc010102020603010006ff06ff0639010006030202010103ff03cc0101020206030100
-06ff06ff0639010006030202010103ff03cc010102020603010006ff06ff063901000603
-0202010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc0101
-02020603010006ff06ff0639010006030202010103ff03cc010102020603010006ff06ff
-0639010006030202010103ff03cc010102020603010006ff06ff06390100060302020101
-03ff03cc010102020603010006ff06ff0639010006030202010103ff03cc010102020603
-010006ff06ff0639010006030202010103ff03cc010102020603010006ff06ff06390100
-06030202010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc
-010102020603010006ff06ff0639010006030202010103ff03cc010102020603010006ff
-06ff0639010006030202010103ff03cc010102020603010006ff06ff0639010006030202
-010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc01010202
-0603010006ff06ff0639010006030202010103ff03cc010102020603010006ff06ff0639
-010006030202010103ff03cc010102020603010006ff06ff0639010006030202010103ff
-03cc010102020603010006ff06ff0639010006030202010103ff03cc0101020206030100
-06ff06ff0639010006030202010103ff03cc010102020603010006ff06ff063901000603
-0202010103ff03cc010102020603010006ff06ff0639010006030202010103ff03cc0101
-02020603010006ff06ff0639010006030202010103ff03cc010102020603010006ff06ff
-0639010006030202010103ff03cc00040603010006ff06ff063901000603000403ff03cc
-000002020500060301ff01ff013b060300000202050003ff03cc00000202050006ff06ff
-064300000202050003ff03cc00000202050006ff06ff064300000202050003ff03cc0000
-0202050006ff06ff064300000202050003ff03cc00000202050006ff06ff064300000202
-050003ff03cc000002020500000502ff02ff023700060202050003ff03cc000002080500
-02ff02ff023700000208050003ff03cc00000208050002ff02ff023700000208050003ff
-03cc00000208050001ff01ff013700000208050003ff03cc0000050901ff01ff01370000
-050903ff03ff03ff03ff03ff03ff03ff03ff0337
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 34 400 249
-%%EOF
diff --git a/lib/tv/doc/src/tv_search_window.gif b/lib/tv/doc/src/tv_search_window.gif
deleted file mode 100644
index d6e72dda2f..0000000000
--- a/lib/tv/doc/src/tv_search_window.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_search_window.ps b/lib/tv/doc/src/tv_search_window.ps
deleted file mode 100644
index a6dd2ef9fc..0000000000
--- a/lib/tv/doc/src/tv_search_window.ps
+++ /dev/null
@@ -1,975 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_search_window.eps)
-%%CreationDate: (Mon Mar 19 17:15:21 2001)
-%%BoundingBox: 0 0 228 183
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 228 183
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-228.000000 183.000000
-12
-455 365
-1
-0
-0
-8
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-aa2455
-999999
-000a01ff01b0000b0208040001ff01b000000208040000000208040002ff02b000000208
-0400000002080400020000ff00ad040002000000020804000000020204060200000004ff
-04ad020000000405020204000000020204000209000d02ff02a400000202040000000202
-040002080000020d0400029001030211010302330101021501010206010102a100000202
-040000000202040002080000020d04000290010102020107020001010203010102010101
-020e010302200101020c0103020401010206010102110100028e00000202040000000202
-040002080000020d04000290010102050101020301010203010102010101020d01010201
-0101021f0101020b0101020101010203010102190101028e000002020400000002020400
-0208000002020406020304000290010102050101020301010203010102010101020d0101
-020601030203010302020101020001010201010302020101020001010207010102030101
-020201010200010102030101020201030203010302000104028c00000202040000000403
-020800000202040003040000020304000290010102050101020401010202010002020101
-020d01020204010102010101020101010201010102010101020001010200010102010101
-020101020200010102060101020301010202010202000101020201010201010102010101
-020101010201010102000101028e000004030101020b0000020304000302000002040400
-0290010102050101020401010201010102020101020e0103020201010201010102050101
-020101020202010102050101020101010206010102030101020201010201010102020101
-0201010102010101020101010204010102910103020b0000020304000302000002040400
-029001010205010102050101020001000203010102100102020101050202010402010101
-020301010205010102010101020601010203010102020101020101010202010102010105
-020101010204010102910103020b00000204040003000000020504000290010102050101
-020501030203010102110101020101010205010102010101020101010203010102050101
-020101010206010102030101020201010201010102020101020101010205010102040101
-02910103020b000002040400030000000205040002900101020501010206010102040101
-020d01010201010102010101020201000201010102010101020101010203010102020100
-020101010201010102070101020101010203010102010101020201010201010102020100
-02010101020201000200010102910103020b000002050000020604000290010102050101
-0206010102040101020e0103020301030203010202000101020001010204010302020101
-02010101020801030204010402030101020201030203010302020102028f0103020b0000
-020d040002900103021101030254010102a40103020b0000020d040002fd010202a50103
-020b0000020d040002ff02a60103020c040d02ff02a7010302ff02c2010302ff02c20103
-020200ff00bb0400020201030202000004ff04bb0202010302ff02c20103020205ff05bc
-02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc020201030202
-05ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc0202
-0103020205ff05bc02020103020205ff05bc020201030202050800000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000508020201030202050700000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500010005070202010302020508000005ff05a8
-010005080202010302020507000005ff05aa010005070202010302020508000005ff05a8
-010005080202010302020507000005ff05aa010005070202010302020508000005ff05a8
-010005080202010302020507000005ff05aa010005070202010302020508000005ff05a8
-010005080202010302020507000005ff05aa010005070202010302020508000005ff05a8
-010005080202010302020507000005ff05aa010005070202010302020508000005ff05a8
-010005080202010302020507000005ff0549000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005110100
-05070202010302020508000005ff05470000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000051101000508
-0202010302020507000005ff05490000054c010005110100050702020103020205080000
-05ff05470000054c010005110100050802020103020205070000050d0102051e0100050f
-010105ff05060000054c010005110100050702020103020205080000050b010005020100
-051d0100050e010005ff05070000054c010005110100050802020103020205070000050c
-010005060102050301020502010005000101050301020502010005000101050b01000504
-010205020100050001010504010105f20000054c01000511010005070202010302020508
-0000050c0100050401000502010005010100050201000501010105010100050101000502
-0100050101010501010005080104050101000502010005010101050101000503010105f1
-0000054c010005110100050802020103020205070000050e010105020100050201000505
-010005010100050501000505010005020100050a010005030100050201000501010005fc
-0000054c010005110100050702020103020205080000050f010005010104050201030501
-0100050501000505010005020100050a010005030100050201000501010005fb00000512
-0102051e01000516010005110100050802020103020205070000050c0100050201000501
-0100050501000502010005010100050501000505010005020100050a0100050301000502
-01000501010005fc00000510010005020100051d01000517010005110100050702020103
-020205080000050b01000502010005010100050201000501010005020100050101000505
-0100050201000501010005020100050a01000503010005020100050101000507010105f1
-000005110100050601020503010205020100050001010503010205020100050001010513
-010005110100050802020103020205070000050d01020503010205030103050101000506
-01020502010005020100050a010005040102050201000507010105f20000051101000504
-010005020100050101000502010005010101050101000501010005020100050101010501
-0100051301000511010005070202010302020508000005ff054700000513010105020100
-050201000505010005010100050501000505010005020100051201000511010005080202
-010302020507000005ff0549000005140100050101040502010305010100050501000505
-010005020100051301000511010005070202010302020508000005ff0547000005110100
-050201000501010005050100050201000501010005050100050501000502010005120100
-0511010005080202010302020507000005ff054900000510010005020100050101000502
-010005010100050201000501010005050100050201000501010005020100051301000511
-010005070202010302020508000005ff0547000005120102050301020503010305010100
-050601020502010005020100051201000511010005080202010302020507000005ff0549
-0000054c01000511010005070202010302020508000005ff05470000054c010005110100
-050802020103020205070000050901ff012c05120000054c010005110100050702020103
-020205080000050801ff012c05110000054c010005110100050802020103020205070000
-0509010107ff0728010105120000054c0100051101000507020201030202050800000508
-010107ff07270000010105110000054c0100051101000508020201030202050700000509
-0101070100ff0026010105120000054c0100051101000507020201030202050800000508
-0101070100ff0026010105110000054c0100051101000508020201030202050700000509
-0101070100ff0026010105120000054c0100051101000507020201030202050800000508
-010107010000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000000300000003000000030000000300
-000003000000030000000300000003000000030000a0010105110000054c010005110100
-05080202010302020507000005090101070103840101009f010105120000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100051101000507020201030202050800000508010107010000030401000377
-010003040101009f01010511000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005110100050802020103
-0202050700000509010107010304010003030102031e0100034001000310010003030101
-009f01010573010005070202010302020508000005080101070100000302010003030100
-03020100031d01000353010003020101009f010105720100050802020103020205070000
-050901010701030201000304010003060102030301020302010003000101030301020302
-010003000101030a01020302010003020100030101000300010103020100030001010303
-01020303010203030102030301020303010203020100030001010304010003010101009f
-010105730100050702020103020205080000050801010701000003000100030601000304
-010003020100030101000302010003010101030101000301010003020100030101010301
-010003080100030201000301010003020100030101010301010003010101030101000301
-010003020100030101000302010003010100030201000304010003020100030201000301
-0101030101000304010003000101009f0101057201000508020201030202050700000509
-010107010300010003080101030201000302010003050100030101000305010003050100
-030201000308010003020100030201000300010003020100030201000301010003050100
-030201000301010003050100030801000302010003020100030101000302010003050102
-009f01010573010005070202010302020508000005080101070100000300010003090100
-030101040302010303010100030501000305010003020100030801040303010003030100
-030201000301010003050104030201020303010203050100030201000302010003010100
-030201000304010003000101009f01010572010005080202010302020507000005090101
-070103020100030401000302010003010100030501000302010003010100030501000305
-010003020100030801000306010003000100030201000302010003010100030501000309
-01000305010003040100030201000302010003010100030201000303010003010101009f
-010105730100050702020103020205080000050801010701000003020100030301000302
-010003010100030201000301010003020100030101000305010003020100030101000302
-010003080100030201000301010003020100030101010301010003010100030501000302
-010003010100030201000301010003020100030401000302010003020100030101000302
-01000302010003020101009f010105720100050802020103020205070000050901010701
-030401000303010203030102030301030301010003060102030201000302010003090102
-030201000302010003010100030001010302010003060102030301020303010203050100
-0303010203020100030201000301010003030101009f0101057301000507020201030202
-05080000050801010701000003040100034001000335010003040101009f010105720100
-05080202010302020507000005090101070103470100033b0101009f0101051200000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000511010005070202010302020508000005080101070100000346
-0100033b0101009f01010511000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005110100050802020103
-020205070000050901010701030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300010003000100
-030001000300010003000100030001000300010003000100030001000300009f01010512
-0000054c01000511010005070202010302020508000005080101070100ff002601010511
-0000054c01000511010005080202010302020507000005090101070100ff002601010512
-0000054c01000511010005070202010302020508000005080101070100ff002601010511
-0000054c01000511010005080202010302020507000005090101070100ff002601010512
-0000054c01000511010005070202010302020508000005080101070000ff002701010511
-0000054c010005110100050802020103020205070000050901ff012c05120000054c0100
-05110100050702020103020205080000050801ff012c0511000005120102051f01020513
-01000511010005080202010302020507000005ff05490000051001000502010005200100
-051401000511010005070202010302020508000005ff0547000005110100050201000502
-010205020100050001010503010205030102050501000513010005110100050802020103
-02020507000005ff05490000051001000505010005020100050101010501010005010100
-050201000501010005020100050401000514010005110100050702020103020205080000
-05ff05470000051101000509010005010100050201000501010005050100050201000504
-0100051301000511010005080202010302020507000005ff054900000510010005060103
-050101000502010005010100050501040504010005140100051101000507020201030202
-0508000005ff054700000511010005020100050101000502010005010100050201000501
-01000505010005080100051301000511010005080202010302020507000005ff05490000
-051001000502010005010100050201000501010005020100050101000502010005010100
-0502010005040100051401000511010005070202010302020508000005ff054700000512
-010205030103050101000502010005020102050301020505010005130100051101000508
-0202010302020507000005ff05490000054c010005110100050702020103020205080000
-05ff05470000054c01000511010005080202010302020507000005ff05490000054c0100
-0511010005070202010302020508000005ff05470000054c010005110100050802020103
-02020507000005ff05490000054c01000511010005070202010302020508000005ff0547
-0000054c01000511010005080202010302020507000005ff05490000054c010005110100
-05070202010302020508000005ff05470000054c01000511010005080202010302020507
-0000052201000563000005c00000054c0100051101000507020201030202050800000520
-01000500010005230100053c000005000000053e0102054b0100052f0000054c01000511
-010005080202010302020507000005200100050001000500010005220100053b00000500
-000005000000053f0100057d000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005110100050702020103
-020205080000051e010005000601010005000100050b0102050301020509010405020102
-05020100050001010502010105000100052400000502000005000000050b010205030102
-050901000500010105030102050301010500010005010100050201000504010005030102
-0502010005000101050a0102050201000502010005010100050001010502010005000101
-050301020503010205030102050301020503010205020100050001010521000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005110100050802020103020205070000051e01000500060301000500
-010005090100050201000501010005020100050a01000503010005020100050101010501
-010005010100050001000500010005220000050400000500000005090100050201000501
-010005020100050801010501010005010100050201000501010005010101050101000502
-010005040100050201000502010005010101050101000508010005020100050101000502
-010005010101050101000501010105010100050101000502010005010100050201000501
-010005020100050401000502010005020100050101010501010005820100050702020103
-020205080000051c010005000605010005000100050c010005010100050e010005030100
-0502010005010100050501000500010005000100052100000506000005000000050c0100
-05010100050c010005050100050201000501010005020100050101000502010005040100
-0506010005010100050c0100050201000502010005000100050201000502010005010100
-050501000502010005010100050501000508010005020100050201000501010005020100
-05810100050802020103020205070000051c000005000607000005000000050801030502
-0102050b0100050301040501010005050100050001000500010005200100050801000500
-010005080103050201020509010005050104050101000502010005010100050201000504
-01000503010305010100050c010405030100050301000502010005010100050501040502
-010205030102050501000502010005020100050101000502010005820100050702020103
-020205080000051c000005000605000005000000050801000502010005050100050a0100
-050301000505010005050100050001000500010005210100050601000500010005080100
-050201000505010005080100050501000505010005020100050101000502010005040100
-050201000502010005010100050c01000506010005000100050201000502010005010100
-050501000509010005050100050401000502010005020100050101000502010005810100
-050802020103020205070000051e00000500060300000500000005090100050201000501
-010005020100050a01000503010005020100050101000505010005000100050001000522
-010005040100050001000509010005020100050101000502010005080100050501000502
-01000501010005010101050101000501010105040100050201000502010005010100050c
-010005020100050101000502010005010101050101000501010005050100050201000501
-010005020100050101000502010005040100050201000502010005010100050201000582
-0100050702020103020205080000051e000005000601000005000000050b010305020102
-050c01010502010205020100050501000500010005000100052301000502010005000100
-050b01030502010205090100050601020503010105000100050201010500010005040100
-0503010305010100050d0102050201000502010005010100050001010502010005060102
-050301020503010205050100050301020502010005020100058101000508020201030202
-05070000052000000500000005000000055f010005000100050001000532010005320100
-05b7010005070202010302020508000005200000050000000561010005000100052f0100
-050201000532010005b60100050802020103020205070000052200000563010005310102
-0533010005b7010005070202010302020508000005ff05a8010005080202010302020507
-000005ff05aa010005070202010302020508000005ff05a8010005080202010302020507
-000005ff05aa010005070202010302020508000005ff05a8010005080202010302020507
-000005ff05aa010005070202010302020508000005ff05a8010005080202010302020507
-000005ff05aa010005070202010302020508000005ff05a8010005080202010302020507
-000005ff05aa010005070202010302020508000005ff05a8010005080202010302020507
-000005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050702020103
-020205080100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050802020103
-020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc
-02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc020201030202
-05ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05a10100
-050001000500010005000100050001000500010005000100050001000500010005090202
-0103020205ff05a001000500010005000100050001000500010005000100050001000500
-010005000100050000000508020201030202050707ff0796050201000506010005060000
-0509020201030202050707ff079500000501010005060000050800000508020201030202
-0507070100ff009405020100050601000506000005090202010302020507070100ff0094
-0501010005060000050001000506000005080202010302020507070100ff009405020100
-05040000050201000504000005090202010302020507070100ff00940501010005040000
-050201000506000005080202010302020507070100ff0094050201000504000005020100
-0504000005090202010302020507070100ff009405010100050400000504010005040000
-05080202010302020507070100ff00940502010005020000050601000502000005090202
-010302020507070100ff0094050101000502000005060100050400000508020201030202
-0507070100ff009405020100050200000506010005020000050902020103020205070701
-00ff00940501010005020000050801000502000005080202010302020507070100ff0094
-0502010005000000050a01000500000005090202010302020507070100ff009405010100
-050000000500010005000100050001000500010005000100050001000502000005080202
-010302020507070100ff0094050201000500010005000100050001000500010005000100
-05000100050001000500000005090202010302020507070100ff00940501010005100000
-05080202010302020507070100ff00940502010005000000050000000500000005000000
-0500000005000000050000000500000005090202010302020507070100ff009405010100
-050000000500000005000000050000000500000005000000050000000500010005000000
-05080202010302020507070100ff00940502010005000000050a01000500000005090202
-010302020507070100ff00940501010005000000050c0100050000000508020201030202
-0507070100ff00940502010005000000050a010005000000050902020103020205070701
-00ff00940501010005000000050c01000500000005080202010302020507070100ff0094
-0502010005000000050a01000500000005090202010302020507070100ff009405010100
-05000000050c01000500000005080202010302020507070100ff00940502010005000000
-050a01000500000005090202010302020507070100ff00940501010005000000050c0100
-0500000005080202010302020507070100ff00940502010005000000050a010005000000
-05090202010302020507070100ff00940501010005000000050c01000500000005080202
-010302020507070100ff00940502010005000000050a0100050000000509020201030202
-0507070100ff00940501010005000000050c010005000000050802020103020205070701
-00ff00940502010005000000050a01000500000005090202010302020507070100ff0094
-0501010005000000050c01000500000005080202010302020507070100ff009405020100
-05000000050a01000500000005090202010302020507070100ff00940501010005000000
-050c01000500000005080202010302020507070100ff00940502010005000000050a0100
-0500000005090202010302020507070100ff00940501010005000000050c010005000000
-05080202010302020507070100ff00940502010005000000050a01000500000005090202
-010302020507070100ff00940501010005000000050c0100050000000508020201030202
-0507070100ff00940502010005000000050a010005000000050902020103020205070701
-00ff00940501010005000000050c01000500000005080202010302020507070100ff0094
-0502010005000000050a01000500000005090202010302020507070100ff009405010100
-05000000050c01000500000005080202010302020507070100ff00940502010005000000
-050a01000500000005090202010302020507070100ff00940501010005000000050c0100
-0500000005080202010302020507070100ff00940502010005000000050a010005000000
-05090202010302020507070100ff00940501010005000000050c01000500000005080202
-010302020507070100ff00940502010005000000050a0100050000000509020201030202
-0507070100ff00940501010005000000050c010005000000050802020103020205070701
-00ff00940502010005000000050a01000500000005090202010302020507070100ff0094
-0501010005000000050c01000500000005080202010302020507070100ff009405020100
-05000000050a01000500000005090202010302020507070100ff00940501010005000000
-050c01000500000005080202010302020507070100ff00940502010005000000050a0100
-0500000005090202010302020507070100ff00940501010005000000050c010005000000
-05080202010302020507070100ff00940502010005000000050a01000500000005090202
-010302020507070100ff00940501010005000000050c0100050000000508020201030202
-0507070100ff00940502010005000000050a010005000000050902020103020205070701
-00ff00940501010005000000050c01000500000005080202010302020507070100ff0094
-0502010005000000050a01000500000005090202010302020507070100ff009405010100
-05000000050c01000500000005080202010302020507070100ff00940502010005000000
-050a01000500000005090202010302020507070100ff00940501010005000000050c0100
-0500000005080202010302020507070100ff00940502010005000000050a010005000000
-05090202010302020507070100ff00940501010005000000050c01000500000005080202
-010302020507070100ff00940502010005000000050a0100050000000509020201030202
-0507070100ff00940501010005000000050c010005000000050802020103020205070701
-00ff00940502010005000000050a01000500000005090202010302020507070100ff0094
-0501010005000000050c01000500000005080202010302020507070100ff009405020100
-05000000050a01000500000005090202010302020507070100ff00940501010005000000
-050c01000500000005080202010302020507070100ff00940502010005000000050a0100
-0500000005090202010302020507070100ff00940501010005000000050c010005000000
-05080202010302020507070100ff00940502010005000000050a01000500000005090202
-010302020507070100ff00940501010005000000050c0100050000000508020201030202
-0507070100ff00940502010005000000050a010005000000050902020103020205070701
-00ff00940501010005000000050c01000500000005080202010302020507070100ff0094
-0502010005000000050a01000500000005090202010302020507070100ff009405010100
-05000000050c01000500000005080202010302020507070100ff00940502010005000000
-050a01000500000005090202010302020507070100ff00940501010005000000050c0100
-0500000005080202010302020507070100ff00940502010005000000050a010005000000
-05090202010302020507070100ff00940501010005000000050c01000500000005080202
-010302020507070100ff00940502010005000000050a0100050000000509020201030202
-0507070100ff00940501010005000000050c010005000000050802020103020205070701
-00ff00940502010005000000050a01000500000005090202010302020507070100ff0094
-0501010005000000050c01000500000005080202010302020507070100ff009405020100
-05000000050a01000500000005090202010302020507070100ff00940501010005000000
-050c01000500000005080202010302020507070100ff00940502010005000000050a0100
-0500000005090202010302020507070100ff00940501010005000000050c010005000000
-05080202010302020507070100ff00940502010005000000050a01000500000005090202
-010302020507070100ff00940501010005000000050c0100050000000508020201030202
-0507070100ff00940502010005000000050a010005000000050902020103020205070701
-00ff00940501010005000000050c01000500000005080202010302020507070100ff0094
-0502010005000000050a01000500000005090202010302020507070100ff009405010100
-05000000050c01000500000005080202010302020507070100ff00940502010005000000
-050a01000500000005090202010302020507070100ff00940501010005000000050c0100
-0500000005080202010302020507070100ff00940502010005000000050a010005000000
-05090202010302020507070100ff00940501010005000000050c01000500000005080202
-010302020507070100ff00940502010005000000050a0100050000000509020201030202
-0507070100ff00940501010005000000050c010005000000050802020103020205070701
-00ff00940502010005000000050a01000500000005090202010302020507070100ff0094
-0501010005000000050c01000500000005080202010302020507070100ff009405020100
-05000000050a01000500000005090202010302020507070100ff00940501010005000000
-050c01000500000005080202010302020507070100ff00940502010005000000050a0100
-0500000005090202010302020507070100ff00940501010005000000050c010005000000
-05080202010302020507070100ff00940502010005000000050a01000500000005090202
-010302020507070100ff00940501010005000000050c0100050000000508020201030202
-0507070100ff00940502010005000000050a010005000000050902020103020205070701
-00ff00940501010005000000050c01000500000005080202010302020507070100ff0094
-0502010005000000050a01000500000005090202010302020507070100ff009405010100
-05000000050c01000500000005080202010302020507070100ff00940502010005000000
-050a01000500000005090202010302020507070100ff00940501010005000000050c0100
-0500000005080202010302020507070100ff00940502010005000000050a010005000000
-05090202010302020507070100ff00940501010005000000050c01000500000005080202
-010302020507070100ff00940502010005000000050a0100050000000509020201030202
-0507070100ff00940501010005000000050c010005000000050802020103020205070701
-00ff00940502010005000000050a01000500000005090202010302020507070100ff0094
-050101000500000005000100050001000500010005000100050001000500010005000100
-0500000005080202010302020507070100ff009405020100050001000500010005000100
-050001000500010005000100050001000500000005090202010302020507070100ff0094
-050101000510000005080202010302020507070100ff0094050201000500000005000000
-050000000500000005000000050000000500000005000000050902020103020205070701
-00ff00940501010005020000050000000500000005000000050000000500000005000100
-0500000005080202010302020507070100ff00940502010005000000050a010005000000
-05090202010302020507070100ff00940501010005020000050801000502000005080202
-010302020507070100ff0094050201000502000005060100050200000509020201030202
-0507070100ff009405010100050400000506010005020000050802020103020205070701
-00ff00940502010005020000050601000502000005090202010302020507070100ff0094
-0501010005040000050401000504000005080202010302020507070100ff009405020100
-05040000050201000504000005090202010302020507070100ff00940501010005060000
-050201000504000005080202010302020507070100ff0094050201000504000005020100
-0504000005090202010302020507070100ff009405010100050600000500010005060000
-05080202010302020507070100ff00940502010005060100050600000509020201030202
-0507070100ff009405010100050801000506000005080202010302020507070000ff0095
-050201000506010005060000050902020103020205ff05a0010005000000050000000500
-0000050000000500000005000000050000000500000005000000050802020103020205ff
-05a100000500000005000000050000000500000005000000050000000500000005000000
-050902020103020205060100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005180202010302020505010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500000005170202010302020506010005100000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005020000
-050c0000051802020103020205050100050c000005000100050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050001000500000005000000
-050c0000051702020103020205060100050a0000050001000502000005ff057601000502
-000005000000050000000508000005180202010302020505010005080000050000000502
-01000500000005ff05780100050000000502000005000000050800000517020201030202
-050601000506000005000000050201000502000005ff0576010005020000050400000500
-0000050400000518020201030202050501000504000005000000050601000500000005ff
-057801000500000005060000050000000504000005170202010302020506010005020000
-05000000050601000502000005ff05760100050200000508000005000000050000000518
-020201030202050501000500010005000100050a01000500000005ff0578010005000000
-050a01000500010005000000051702020103020205060100050201000500010005060100
-0502000005ff057601000502000005080100050001000500000005180202010302020505
-01000504010005000100050601000500000005ff05780100050000000506010005000100
-050400000517020201030202050601000506010005000100050201000502000005ff0576
-010005020000050401000500010005040000051802020103020205050100050801000500
-0100050201000500000005ff057801000500000005020100050001000508000005170202
-0103020205060100050a0100050001000502000005ff0576010005020000050001000500
-010005080000051802020103020205050100050c01000500010005000000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050000000500
-0100050c0000051702020103020205060100051001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000100050001000500010005020100050c000005180202010302020505
-010005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005170202010302020506000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-00000500000005000000051802020103020205ff05bc02020103020205ff05bc02020103
-020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc
-02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc020201030202
-05ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc0202
-0103020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff
-05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103
-020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc
-02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc020201030202
-05ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc0202
-0103020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff
-05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103
-020205ff05bc02020103020205ff05bc02020103020205ff05bc02020103020205ff05bc
-02020101000405ff05bc00050202040005ff05bc00000202040000000202040005ff05bc
-00000202040000000202040005ff05bc00000202040000000202040005ff05bc00000202
-040000000202040005ff05bc000002020400000002020400000502ff02b0000602020400
-00000208040002ff02b000000208040000000208040002ff02b000000208040000000208
-040001ff01b00000020804000000040901ff01b000000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 228 183
-%%EOF
diff --git a/lib/tv/doc/src/tv_start.gif b/lib/tv/doc/src/tv_start.gif
deleted file mode 100644
index 7a8a0cf6ce..0000000000
--- a/lib/tv/doc/src/tv_start.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_start.ps b/lib/tv/doc/src/tv_start.ps
deleted file mode 100644
index 7dae8e4a5a..0000000000
--- a/lib/tv/doc/src/tv_start.ps
+++ /dev/null
@@ -1,828 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./tv_start.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:02:24 2001)
-%%BoundingBox: 0 42 377 247
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 42 377 247
-userdict begin
-%%BeginData:
-DisplayImage
-0 42
-377.000000 205.000000
-12
-755 410
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-828282
-aab6aa
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000a01ff01ff01dc000b0208040001ff01ff01dc00000208040000000208040002ff02ff
-02dc000002080400000002080400020000ff00ff00d90400020000000208040000000202
-04060200000004ff04ff04d9020000000405020204000000020204000209000d02ff02ff
-02d000000202040000000202040002080000020d040002f6010302110103023801010206
-0101024001010230010102ff020400000202040000000202040002080000020d040002f6
-010102020107020001010203010102010101020e0105020001070201010302070100020b
-01010206010102400101020c0104021e010102ff02040000020204000000020204000208
-0000020d040002f6010102050101020301010203010102010101020e0101020701010203
-01010201010102050101020b010102060101024e010102020101021d010102ff02040000
-0202040000000202040002080000020204060203040002f6010102050101020301010203
-010102010101020e01010207010102030101020801040201010302030101020001010203
-010102020103020301040206010302030101020001010207010102000101020101010203
-010302030101020201010200010102020101020101030202010102000101020101010203
-010302020101020001010201010102020103020201010202010102f30000020204000000
-04030208000002020400030400000203040002f601010205010102040101020201000202
-0101020e0101020701010203010202080101020201010201010102020102020001010202
-010102010101020101010201010102090101020101010202010202000101020601020200
-010202000101020101010201010102020101020201020200010102010101020001010200
-010102020102020001020200010102010101020101010201010102000101020101010201
-010102010101020101010202010102f3000004030101020b000002030400030200000204
-040002f6010102050101020401010201010102020101020e010402040101020401030206
-010102060101020201010201010102020101020101010201010102010102020801010201
-010102020101020101010206010102010101020101010205010102020101020201010201
-010102010101020001010200010102020101020101010201010102050101020101020203
-01010201010102010101020101010202010002f70103020b000002030400030200000204
-040002f6010102050101020501010200010002030101020e010102070101020601020205
-010102030104020201010201010102020101020101050202010302060101020101010202
-010102010101020601010201010102010101020201040202010102020101020101010201
-010102000101020001010202010102010101020101010202010402010101020401010201
-0105020201010200010102f70103020b000002040400030000000205040002f601010205
-01010205010302030101020e010102070101020701010205010102020101020101010202
-010102010101020201010201010102080102020501010201010102020101020101010206
-010102010101020101010201010102010101020201010202010102010101020101010201
-010102000101020101010201010102010101020101010201010102010101020401010201
-0101020601010200010002f80103020b000002040400030000000205040002f601010205
-01010206010102040101020e010102070101020301010201010102050101020201010201
-010102020101020101010202010102010101020201000205010102050101020101010202
-010102010101020601010201010102010101020101010201010102020101020201010201
-010102020101020701010201010102010101020101010201010102010101020401010201
-0101020201000203010202f80103020b0000020500000206040002f60101020501010206
-010102040101020e01050203010102040103020701020201010202000101020101040203
-010102020103020201040207010302030101020101010206010102010101020101010202
-010202000101020101010202010102010101020301050202010102010101020101010202
-0102020001010200010102040101020201030204010102f90103020b0000020d040002f6
-01030211010302c4010102fa0103020b0000020d040002ff02d5010102fa0103020b0000
-020d040002ff02ff02d20103020c040d02ff02ff02d3010302ff02ff02ee010302ff02ff
-02ee0103020200ff00ff00e70400020201030202000004ff04ff04e70202010302ff02ff
-02ee0103020200ff00ff00e802020103020200ff00ff00e70700020201030202000105ff
-05ff05e40701020201030202000105ff05ff05e40701020201030202000105ff05ff05e4
-0701020201030202000105ff05ff05e40701020201030202000105ff05ff05e407010202
-010302020001050b06040504060005030602051f0600050206000504060005270602050b
-06000506060005ff05ff053506000502060005090602051307010202010302020001050b
-0600050f0600051f060005020600052c060005020600050a060005ff05ff053d06000502
-0600050b0600051307010202010302020001050b06000506060205050600050306020518
-060005020600050206020503060205020600050206000517060005020600050106000500
-060105020604050206020503060205020600050006010503060205ff05ff052006000502
-060005020602050506000502060005000601050c07010202010302020001050b06000508
-060005050600050206000502060005180600050006000505060005020600050206000501
-060005020600051706000502060005010601050106000503060005060600050206000502
-06000501060105010600050106000502060005ff05ff051f060005020600050106000502
-0600050406000502060105010600050b07010202010302020001050b0603050506000505
-060005020600050206000518060005000600050506000502060005020600050106000500
-060005000600051706000502060005010600050206000503060005060600050206000502
-060005010600050206000501060005ff05ff052306040501060005020600050406000502
-060005020600050b07010202010302020001050b06000508060005050600050206040518
-060005000600050506000502060405010600050006000500060005170600050206000501
-0600050206000503060005060600050206000502060005010600050206000502060205ff
-05ff052006000502060005010604050406000502060005020600050b0701020201030202
-0001050b0600050806000505060005020600051d06000506060005020600050506000500
-060005000600051706000502060005010600050206000503060005060600050206000502
-060005010600050206000505060005ff05ff051f06000502060005010600050806000502
-060005020600050b07010202010302020001050b06000508060005050600050206000502
-060005190600050606000502060005020600050106000500060005000600051706000502
-060005010601050106000503060005060600050206000502060005010600050206000501
-06000502060005ff05ff051f060005020600050106000502060005040600050206010501
-0600050b07010202010302020001050b0600050806000505060005030602051a06000506
-060005030602050306000500060005190602050206000500060105050601050406000503
-060205020600050206000502060205ff05ff052006000502060005020602050506000502
-060005000601050c070102020103020200010576060005ff05ff055b0600050f07010202
-010302020001050a0606052a0606052a06060500060005ff05ff05450606050e0600050f
-07010202010302020001050a0606052a0606052a06060500060005ff05ff05450606050e
-0600050f0701020201030202000105ff05ff05e40701020201030202000105ff05ff05e4
-0701020201030202000105ff05ff05e40701020201030202000107ff07ff07e602020103
-0202000007ff07ff07e702020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e8020201030202051c010205040103
-05c1010205040103051a0102057f01010505010205f001020504010305190101052f0202
-01030202050e01060508010005060101050f010205010102059b01060508010005060101
-0510010505040101054d010205240104050d0101051e0102052401020501010205930106
-0508010005060101051101030535020201030202050e0100050101010500010005070101
-050601000511010105010100059d01000501010105000100050701010506010005130101
-05060100054d0101050001010524010105000101050c0100051e01010500010105240101
-050101000595010005010101050001000507010105060100051101010501010105340202
-010302020510010105030103050201030503010105030103050801020500010105010103
-05000101050001000500010005020103058b010105030103050201030503010105030103
-050a010105030104054c0101050101050500010305000102050201030501010105000102
-05070101050101010500010305030104051d010105010105050001030500010205020103
-050101010500010205070102050001010501010305000101050001000500010005020103
-058301010503010305020103050301010503010305090101050101000500010305020105
-050101030521020201030202051001010506010105000101050101010502010105020101
-0501010105070100050001000500010005050101050001050500010105010101058a0101
-050601010500010105010101050201010502010105010101050901010502010105010101
-054c01000502010105000101050201000500010205000101050001010501010105010102
-050001000507010105010101050201010502010105010101051d01000502010105000101
-050201000500010205000101050001010501010105010102050001000507010005000100
-050001000505010105000105050001010501010105820101050601010500010105010101
-050201010502010105010101050801020504010105020101050001010501010105010101
-052002020103020205100100050401040500010105010101050201010501010605070100
-0500010205020104050001010500010005000107058a0100050401040500010105010101
-0502010105010106050901010501010105020101054b0101050201000501010105000100
-05000100050001010501010805010101050a0103050401010501010105020101051c0101
-05020100050101010500010005000100050001010501010805010101050a010005000102
-050201040500010105000100050001070582010005040104050001010501010105020101
-05010106050901020503010105040101050101060520020201030202050f010105020101
-0501010105000101050201010501010105020101050b0101050001010501010105010101
-05010100050001000500010005000101058e010105020101050101010500010105020101
-0501010105020101050d01010502010105010101054c0101050101010501010205000100
-05010100050201000500010105050101050a0101050601010502010105010101051d0101
-05010101050101020500010005010100050201000500010105050101050a010105000101
-050101010501010105010100050001000500010005000101058601010502010105010101
-05000101050201010501010105020101050b010105010101050201010503010105030101
-0525020201030202050f0101050201010501010105000101050101010502010105020101
-050101010507010005010101050101010501010105000101050001000500010005000101
-05010101058a010105020101050101010500010105010101050201010502010105010101
-050901010502010105010101054c01010500010105020103050101010501010105000101
-0501010105010101050a0101050601010502010105010101051d01010500010105020103
-0501010105010101050001010501010105010101050a0100050101010501010105010101
-050001010500010005000100050001010501010105820101050201010501010105000101
-050101010502010105020101050101010507010105010101050201010502010205000101
-05000101050101010521020201030202050e01030502010a050101050501010305070102
-0500010105020107050001000500010105000103058a01030502010a0501010505010103
-0508010505010105054c0102050301010500010005000103050001020500010305010104
-050701030503010505010105051d01020503010105000100050001030500010205000103
-05010104050701020500010105020107050001000500010105000103058201030502010a
-050101050501010305090103050101050500010505010103052202020103020205ff05ff
-05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff
-05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff
-05e8020201030202050201ff01ff01e205020202010302020503080000cb080001000081
-01010059010100c30101005801000711000005020202010302020503080000cb08000100
-000b0101004e0101002201010059010100c3010100580100070103060700030600010502
-0202010302020503080000cb08000100000a0100001c0100002a01000008010000210101
-000c0100002a0100001f010100c301010058010007010305000007000306000105020202
-0103020205030800001f0800000a080000060802009408000100000a0100000401020003
-0102000c010000040101000a010200030102000b0101000201000007010000210101000b
-010000040101000a010200030102000b010100020100001e010100c30101000a0101004b
-0100070103050000070103050001050202020103020205030800001f0800000a08000008
-0800009408000100000a010000030100000201000001010000020100000a010000040100
-000101000008010000020100000101000002010000090100000101000002010000060100
-00210101000a010000040100000101000008010000020100000101000002010000090100
-0001010000020100001d010100c301010009010000010100004a01000701030400010701
-030500010502020201030202050308000008080100000800000208000002080000080804
-0002080200020800000008010005080000030802008d08000100000a0100000701000005
-0100000901000005010000010100000c0100000501000009010000010100000301000005
-010000210101000901000005010000010100000c01000005010000090100000101000003
-0100001c010100c301010009010000010100004a01000701030400010500070103040001
-0502020201030202050308000008080000000800000008000001080000020800000a0800
-00030800000208000001080100010800000408000002080000020800008c08000100000a
-01000007010000050100000801000006010000010100000c010000050100000901000001
-0100000401000004010000210101000801000006010000010100000c0100000501000009
-01000001010000040100001b010100c301010009010000010100004a0100070103030001
-050107010304000105020202010302020503080000080800000008000000080000020800
-00010800000a0800000708000001080000020800000408000002080000020800008c0800
-0100000801010007010000050100000801000007010000010100000a010100040101000a
-0100000101000005010000040101001f0101000701000007010000010100000a01010004
-0101000a01000001010000050100001a010100c301010009010000010100004a01000701
-030300010502070103030001050202020103020205030800000808000000080000000800
-0002080000010800000a08000004080300010800000208000004080000020804008c0800
-0100000a01000005010000050100000a01000006010000010100000c0100000501000009
-010000010100000401000004010000210101000801000006010000010100000c01000005
-0100000901000001010000040100001b010100c301010009010000010100004a01000701
-030200010503070103030001050202020103020205030800000808000000080000000800
-0003080000000800000a0800000308000002080000010800000208000004080000020800
-009008000100000a01000004010000050100000c01000005010000010100000c01000005
-01000009010000010100000301000005010000210101000901000005010000010100000c
-010000050100000901000001010000030100001c010100c301010009010000010100004a
-010007010302000105040701030200010502020201030202050308000008080000000800
-0000080000030801000b0800000308000002080000010801000108000004080000020800
-00020800008c08000100000a010000030100000501000007010100040100000401000001
-010000030101000201000002010000010100000201000003010100030100000101000002
-01000006010000210101000a010000040100000101000003010100020100000201000001
-01000002010000030101000301000001010000020100001d010100c30101000901000001
-0100004a0100070103010001050507010302000105020202010302020503080000080800
-000008000000080000040800000c08010002080300010800000008010005080000030802
-008d08000100000a01000003010400010104000301010005010000040101000401010003
-0102000301020004010100040101000201000007010000210101000b0100000401010004
-01010003010200030102000401010004010100020100001e010100c30101000a0101004b
-010007010301000105060701030100010502020201030202050308000012080000010805
-00af08000100000a01000014010000060100002a01000008010000210101000c0100002a
-0100001f010100c301010058010007010300000105070701030100010502020201030202
-05030800000f08000000080000b808000100000b010100100101003b0101002201010059
-010100c30101005801000701030000010508070103000001050202020103020205030800
-0010080000b908000100008101010059010100c301010058010007010001070b03000001
-05020202010302020503080000cb08000100008101010059010100c30101005801000701
-0000070d000105020202010302020503080000cb08000100008101010059010100c30101
-005801000701030e000105020202010302020503080000cb080001000081010100590101
-00c30101005801000701001005020202010302020503080000cb08000100008101010059
-010100c30101005801000701000d070000010502020201030202050308cd01ff01ff0100
-07010001050a070100010502020201030202050301ff01ff01ce07010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a070100010502020201030202050301ff01ff01ce07010001050a0701000105020202
-01030202050301ff01ff01ce07010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-050301ff01ff01ce07010001050a070100010502020201030202050301ff01ff01ce0701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a070100010502020201030202050301ff01ff01ce07010001050a
-070100010502020201030202050301ff01ff01ce07010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-0502020201030202050301ff01ff01ce07010001050a0701000105020202010302020503
-01ff01ff01ce07010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a070100010502020201030202050301ff01ff
-01ce07010001050a070100010502020201030202050301ff01ff01ce07010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a070100010502020201030202050301ff01ff01ce07010001050a070100010502
-020201030202050301ff01ff01ce07010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-0202050301ff01ff01ce07010001050a070100010502020201030202050301ff01ff01ce
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a070100010502020201030202050301ff01ff01ce07010001
-050a070100010502020201030202050301ff01ff01ce07010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-00010502020201030202050301ff01ff01ce07010001050a070100010502020201030202
-050301ff01ff01ce07010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a070100010502020201030202050301ff
-01ff01ce07010001050a070100010502020201030202050301ff01ff01ce07010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001070c
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0000070d00010502020201030202050301ff01ff01ce0701030e00010502020201030202
-050301ff01ff01ce0701030e000105020202010302020503010000cb0101008101010059
-010100c30101005801000701030e000105020202010302020503010000cb010100810101
-0059010100c30101005801000701030e000105020202010302020503010000cb01010081
-01010059010100c30101005801000701030e000105020202010302020503010000cb0101
-008101010059010100c30101005801000701030e000105020202010302020503010000cb
-0101008101010059010100c30101005801000701030e0001050202020103020205030100
-00cb0101008101010059010100c30101005801000701030e000105020202010302020503
-010000cb0101008101010059010100c30101005801000701030e00010502020201030202
-0503010000cb0101008101010059010100c30101005801000701030e0001050202020103
-02020503010000cb0101008101010059010100c30101005801000701030e000105020202
-010302020503010000cb0101008101010059010100c30101005801000701030e00010502
-0202010302020503010000cb0101008101010059010100c30101005801000701030e0001
-05020202010302020503010000cb0101008101010059010100c30101005801000701030e
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-030e000105020202010302020503010000cb0101008101010059010100c3010100580100
-0701030e000105020202010302020503010000cb0101008101010059010100c301010058
-01000701030e000105020202010302020503010000cb0101008101010059010100c30101
-005801000701030e000105020202010302020503010000cb0101008101010059010100c3
-0101005801000701030e000105020202010302020503010000cb01010081010100590101
-00c30101005801000701030e000105020202010302020503010000cb0101008101010059
-010100c30101005801000701030e00010502020201030202050301ff01ff01ce0701030e
-00010502020201030202050301ff01ff01ce0701001005020202010302020503010000cb
-0101008101010059010100c301010058010007010300000c070000010502020201030202
-0503010000cb0101008101010059010100c3010100580100070103000001050807010300
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-03010001050707010300000105020202010302020503010000cb01010081010100590101
-00c3010100580100070103010001050607010301000105020202010302020503010000cb
-0101008101010059010100c3010100580100070103020001050507010301000105020202
-010302020503010000cb0101008101010059010100c30101005801000701030200010504
-07010302000105020202010302020503010000cb0101008101010059010100c301010058
-0100070103030001050307010302000105020202010302020503010000cb010100810101
-0059010100c3010100580100070103030001050207010303000105020202010302020503
-010000cb0101008101010059010100c30101005801000701030400010501070103030001
-05020202010302020503010000cb0101008101010059010100c301010058010007010304
-0001050007010304000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010305000007020304000105020202010302020503010000cb01010081
-01010059010100c301010058010007010305000007010305000105020202010302020503
-010000cb0101008101010059010100c30101005801000701030607010305000105020202
-010302020503010000cb0101008101010059010100c30101005801000701030607000306
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-001005020202010302020503010000cb0101008101010059010100c30101005801000700
-00110502020201030202050207ff07ff07d30511020201030202050207ff07ff07d20000
-051102020103020205020701030d0000030000ff00ff00af03000001030c000105110202
-0103020205020701030b00010700030000ff00ff00ae070003000003030a000105110202
-01030202050207010309000207010300000105ff05ff05ab070103000005030800010511
-0202010302020502070103070003050007010300000105ff05ff05ab0701030000010501
-00030306000105110202010302020502070103050003050207010300000105ff05ff05ab
-070103000001050300030304000105110202010302020502070103030003050407010300
-000105ff05ff05ab07010300000105050003030200010511020201030202050207010301
-0003050607010300000105ff05ff05ab0701030000010507000303000001051102020103
-020205020705050807010300000105ff05ff05ab07010300000105080703000105110202
-010302020502070103010703050607010300000105ff05ff05ab07010300000105070703
-0300000105110202010302020502070103030703050407010300000105ff05ff05ab0701
-030000010505070303020001051102020103020205020701030507030502070103000001
-05ff05ff05ab070103000001050307030304000105110202010302020502070103070703
-050007010300000105ff05ff05ab07010300000105010703030600010511020201030202
-05020701030907040300000105ff05ff05ab070103000001070303080001051102020103
-020205020701030b07020300000107ff07ff07ad030000010701030a0001051102020101
-000405020701030d07000300000007ff07ff07ae030000000700030c0001051100050202
-04000502070100ff00ff00d105110000020204000000020204000502070000ff00ff00d2
-051100000202040000000202040005ff05ff05e800000202040000000202040005ff05ff
-05e800000202040000000202040005ff05ff05e8000002020400000002020400000502ff
-02ff02dc00060202040000000208040002ff02ff02dc00000208040000000208040002ff
-02ff02dc00000208040000000208040001ff01ff01dc0000020804000000040901ff01ff
-01dc00000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 42 377 247
-%%EOF
diff --git a/lib/tv/doc/src/tv_start_mnesia.gif b/lib/tv/doc/src/tv_start_mnesia.gif
deleted file mode 100644
index 0ad04331cd..0000000000
--- a/lib/tv/doc/src/tv_start_mnesia.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_start_mnesia.ps b/lib/tv/doc/src/tv_start_mnesia.ps
deleted file mode 100644
index a90185089d..0000000000
--- a/lib/tv/doc/src/tv_start_mnesia.ps
+++ /dev/null
@@ -1,835 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_start_mnesia.eps)
-%%CreationDate: (Mon Mar 19 17:15:23 2001)
-%%BoundingBox: 0 0 377 205
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 377 205
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-377.000000 205.000000
-12
-755 410
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-828282
-a3a3a3
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000a01ff01ff01dc000b0208040001ff01ff01dc00000208040000000208040002ff02ff
-02dc000002080400000002080400020000ff00ff00d90400020000000208040000000202
-04060200000004ff04ff04d9020000000405020204000000020204000209000d02ff02ff
-02d000000202040000000202040002080000020d040002ea01030211010302330101021b
-010102060101024001010230010102f700000202040000000202040002080000020d0400
-02ea010102020107020001010203010102010101020e010202020102021b0101020e0100
-020b01010206010102400101020c0104021e010102f70000020204000000020204000208
-0000020d040002ea010102050101020301010203010102010101020e010202020102022b
-0101020b010102060101024e010102020101021d010102f7000002020400000002020400
-02080000020204060203040002ea010102050101020301010203010102010101020e0102
-020201020202010102000101020301030203010402020101020201030205010402010103
-020301010200010102030101020201030203010402060103020301010200010102070101
-020001010201010102030103020301010202010102000101020201010201010302020101
-020001010201010102030103020201010200010102010101020201030202010102020101
-02e6000002020400000004030208000002020400030400000203040002ea010102050101
-020401010202010002020101020e01000200010102000100020001010202010202000101
-020101010201010102010101020601010201010102010101020501010202010102010101
-020201020200010102020101020101010201010102010101020901010201010102020102
-020001010206010202000102020001010201010102010101020201010202010202000101
-020101010200010102000101020201020200010202000101020101010201010102010101
-02000101020101010201010102010101020101010202010102e6000004030101020b0000
-02030400030200000204040002ea010102050101020401010201010102020101020e0100
-020001010200010002000101020201010201010102010101020101010201010202050101
-020501010205010102060101020201010201010102020101020101010201010102010102
-020801010201010102020101020101010206010102010101020101010205010102020101
-020201010201010102010101020001010200010102020101020101010201010102050101
-02010102020301010201010102010101020101010202010002ea0103020b000002030400
-030200000204040002ea010102050101020501010200010002030101020e010002000101
-020001000200010102020101020101010201010502020103020301010202010402050101
-020301040202010102010101020201010201010502020103020601010201010102020101
-020101010206010102010101020101010202010402020101020201010201010102010101
-020001010200010102020101020101010201010102020104020101010204010102010105
-020201010200010102ea0103020b000002040400030000000205040002ea010102050101
-0205010302030101020e0100020101010201010102020101020101010201010102080102
-020201010201010102010101020501010202010102010101020201010201010102020101
-020101010208010202050101020101010202010102010101020601010201010102010101
-020101010201010102020101020201010201010102010101020101010200010102010101
-020101010201010102010101020101010201010102040101020101010206010102000100
-02eb0103020b000002040400030000000205040002ea0101020501010206010102040101
-020e01000201010102010101020201010201010102010101020201000205010102020101
-020101010201010102050101020201010201010102020101020101010202010102010101
-020201000205010102050101020101010202010102010101020601010201010102010101
-020101010201010102020101020201010201010102020101020701010201010102010101
-0201010102010101020101010204010102010101020201000203010202eb0103020b0000
-020500000206040002ea0101020501010206010102040101020e01000205010102020101
-020101010202010302020104020301010202010202000101020501020201010202000101
-020101040203010102020103020201040207010302030101020101010206010102010101
-020101010202010202000101020101010202010102010101020301050202010102010101
-0201010102020102020001010200010102040101020201030204010102ec0103020b0000
-020d040002ea01030211010302dd010102ed0103020b0000020d040002ff02e2010102ed
-0103020b0000020d040002ff02ff02d20103020c040d02ff02ff02d3010302ff02ff02ee
-010302ff02ff02ee0103020200ff00ff00e70400020201030202000004ff04ff04e70202
-010302ff02ff02ee0103020200ff00ff00e802020103020200ff00ff00e7070002020103
-0202000105ff05ff05e40701020201030202000105ff05ff05e407010202010302020001
-05ff05ff05e40701020201030202000105ff05ff05e40701020201030202000105ff05ff
-05e407010202010302020001050b06040504060005030602051f06000502060005040600
-05270602050b06000506060005ff05ff0535060005020600050906020513070102020103
-02020001050b0600050f0600051f060005020600052c060005020600050a060005ff05ff
-053d060005020600050b0600051307010202010302020001050b06000506060205050600
-050306020518060005020600050206020503060205020600050206000517060005020600
-050106000500060105020604050206020503060205020600050006010503060205ff05ff
-052006000502060005020602050506000502060005000601050c07010202010302020001
-050b06000508060005050600050206000502060005180600050006000505060005020600
-050206000501060005020600051706000502060005010601050106000503060005060600
-05020600050206000501060105010600050106000502060005ff05ff051f060005020600
-0501060005020600050406000502060105010600050b07010202010302020001050b0603
-050506000505060005020600050206000518060005000600050506000502060005020600
-050106000500060005000600051706000502060005010600050206000503060005060600
-050206000502060005010600050206000501060005ff05ff052306040501060005020600
-050406000502060005020600050b07010202010302020001050b06000508060005050600
-050206040518060005000600050506000502060405010600050006000500060005170600
-050206000501060005020600050306000506060005020600050206000501060005020600
-0502060205ff05ff052006000502060005010604050406000502060005020600050b0701
-0202010302020001050b0600050806000505060005020600051d06000506060005020600
-050506000500060005000600051706000502060005010600050206000503060005060600
-050206000502060005010600050206000505060005ff05ff051f06000502060005010600
-050806000502060005020600050b07010202010302020001050b06000508060005050600
-050206000502060005190600050606000502060005020600050106000500060005000600
-051706000502060005010601050106000503060005060600050206000502060005010600
-05020600050106000502060005ff05ff051f060005020600050106000502060005040600
-0502060105010600050b07010202010302020001050b0600050806000505060005030602
-051a06000506060005030602050306000500060005190602050206000500060105050601
-050406000503060205020600050206000502060205ff05ff052006000502060005020602
-050506000502060005000601050c070102020103020200010576060005ff05ff055b0600
-050f07010202010302020001050a0606052a0606052a06060500060005ff05ff05450606
-050e0600050f07010202010302020001050a0606052a0606052a06060500060005ff05ff
-05450606050e0600050f0701020201030202000105ff05ff05e407010202010302020001
-05ff05ff05e40701020201030202000105ff05ff05e40701020201030202000107ff07ff
-07e6020201030202000007ff07ff07e702020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e8020201030202051c
-01020504010305c1080205040803051a0802057f01010505010205f00102050401030519
-0101052f020201030202050e01060508010005060101050f010205010102059b08060508
-0800050608010510080505040801054d010205240104050d0101051e0102052401020501
-0102059301060508010005060101051101030535020201030202050e0100050101010500
-010005070101050601000511010105010100059d08000501080105000800050708010506
-08000513080105060800054d0101050001010524010105000101050c0100051e01010500
-010105240101050101000595010005010101050001000507010105060100051101010501
-010105340202010302020510010105030103050201030503010105030103050801020500
-01010501010305000101050001000500010005020103058b080105030803050208030503
-080105030803050a080105030804054c0101050101050500010305000102050201030501
-01010500010205070101050101010500010305030104051d010105010105050001030500
-010205020103050101010500010205070102050001010501010305000101050001000500
-010005020103058301010503010305020103050301010503010305090101050101000500
-010305020105050101030521020201030202051001010506010105000101050101010502
-010105020101050101010507010005000100050001000505010105000105050001010501
-0101058a0801050608010500080105010801050208010502080105010801050908010502
-080105010801054c01000502010105000101050201000500010205000101050001010501
-010105010102050001000507010105010101050201010502010105010101051d01000502
-010105000101050201000500010205000101050001010501010105010102050001000507
-010005000100050001000505010105000105050001010501010105820101050601010500
-010105010101050201010502010105010101050801020504010105020101050001010501
-010105010101052002020103020205100100050401040500010105010101050201010501
-0106050701000500010205020104050001010500010005000107058a0800050408040500
-0801050108010502080105010806050908010501080105020801054b0101050201000501
-01010500010005000100050001010501010805010101050a010305040101050101010502
-0101051c010105020100050101010500010005000100050001010501010805010101050a
-010005000102050201040500010105000100050001070582010005040104050001010501
-01010502010105010106050901020503010105040101050101060520020201030202050f
-0101050201010501010105000101050201010501010105020101050b0101050001010501
-01010501010105010100050001000500010005000101058e080105020801050108010500
-0801050208010501080105020801050d08010502080105010801054c0101050101010501
-01020500010005010100050201000500010105050101050a010105060101050201010501
-0101051d010105010101050101020500010005010100050201000500010105050101050a
-010105000101050101010501010105010100050001000500010005000101058601010502
-01010501010105000101050201010501010105020101050b010105010101050201010503
-0101050301010525020201030202050f0101050201010501010105000101050101010502
-010105020101050101010507010005010101050101010501010105000101050001000500
-01000500010105010101058a080105020801050108010500080105010801050208010502
-080105010801050908010502080105010801054c01010500010105020103050101010501
-0101050001010501010105010101050a0101050601010502010105010101051d01010500
-0101050201030501010105010101050001010501010105010101050a0100050101010501
-010105010101050001010500010005000100050001010501010105820101050201010501
-010105000101050101010502010105020101050101010507010105010101050201010502
-01020500010105000101050101010521020201030202050e01030502010a050101050501
-0103050701020500010105020107050001000500010105000103058a08030502080a0501
-0805050108030508080505010805054c0102050301010500010005000103050001020500
-010305010104050701030503010505010105051d01020503010105000100050001030500
-010205000103050101040507010205000101050201070500010005000101050001030582
-01030502010a050101050501010305090103050101050500010505010103052202020103
-020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103
-020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103
-020205ff05ff05e8020201030202050201ff01ff01e205020202010302020503010000cb
-0101008101010059010100c30101005801000711000005020202010302020503010000cb
-0101008101010059010100c3010100580100070103060700030600010502020201030202
-0503010000cb010100810101000c0100002a0100001f010100c301010058010007010305
-0000070003060001050202020103020205030100000a010000130100000c0100000a0100
-000601020086010100810101000b0100000401010009010400010104000a010100020100
-001e0101002701000028010000040100006a0101000a0101004b01000701030500000701
-03050001050202020103020205030100000a010000130100000c0100000a010000080100
-0086010100810101000a01000004010000010100000801000002010000010100000d0100
-0001010000020100001d010100570100006a01010009010000010100004a010007010304
-000107010305000105020202010302020503010000080104000201020003010200020104
-000801040002010200020100000001010005010000030102007f01010081010100090100
-0005010000010100000c010000010100000d01000001010000030100001c010100080101
-000001000002010000000101000301020003010200030102000301020009010100000100
-0003010200020100000001010003010200020104000201020002010000000101005b0101
-0009010000010100004a0100070103040001050007010304000105020202010302020503
-0100000a01000003010000020100000101000002010000030100000c0100000301000002
-01000001010100010100000401000002010000020100007e010100810101000801000006
-010000010100000b010000020103000a01000001010000040100001b0101000801000000
-010000000100000101010001010000010100000201000001010000020100000401000002
-010000020100000801000000010000000100000101000002010000010101000101000004
-01000004010000030100000201000001010100010100005a01010009010000010100004a
-01000701030300010501070103040001050202020103020205030100000a010000030100
-000201000001010000070100000c01000007010000010100000201000004010000020100
-00020100007e010100810101000701000007010000010100000b01000006010000090100
-0001010000050100001a0101000801000000010000000100000101000002010000010100
-000201000001010000080100000601000008010000000100000001000001010000020100
-00010100000201000004010000040100000301000002010000010100005e010100090100
-00010100004a01000701030300010502070103030001050202020103020205030100000a
-0100000301040002010200040100000c0100000401030001010000020100000401000002
-0104007e010100810101000801000006010000010100000b010000060100000901000001
-010000040100001b01010008010000000100000001000001010000020100000101040002
-010200050100000301030008010000000100000001000001010000020100000101000002
-01000004010000040100000301000002010000010100005e01010009010000010100004a
-01000701030200010503070103030001050202020103020205030100000a010000030100
-0009010000030100000c0100000301000002010000010100000201000004010000020100
-0082010100810101000901000005010000010100000a0100000301000002010000090100
-0001010000030100001c0101000801000000010000000100000101000002010000010100
-000901000004010000020100000201000008010000000100000001000001010000020100
-00010100000201000004010000040100000301000002010000010100005e010100090100
-00010100004a01000701030200010504070103020001050202020103020205030100000a
-01000003010000020100000101000002010000030100000c010000030100000201000001
-010100010100000401000002010000020100007e010100810101000a0100000401000001
-01000003010100040100000301000002010000030101000301000001010000020100001d
-010100080100000001000000010000010100000201000001010000020100000101000002
-010000040100000201000002010000080100000001000000010000010100000201000001
-0100000201000004010000040100000301000002010000010100005e0101000901000001
-0100004a01000701030100010505070103020001050202020103020205030100000b0101
-000201020003010200050101000b01010002010300010100000001010005010000030102
-007f010100810101000b0100000401010004010100040100000401020004010100040101
-00020100001e010100080100000001000000010000010100000201000002010200030102
-000501000003010300080100000001000000010000020102000201000002010000040100
-000501010002010200020100005e0101000a0101004b0100070103010001050607010301
-00010502020201030202050301000023010500a1010100810101000c0100002a0100001f
-010100310105008b01010058010007010300000105070701030100010502020201030202
-0503010000cb0101008101010059010100c3010100580100070103000001050807010300
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001070b0300000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010000070d000105020202010302020503010000cb01010081010100590101
-00c30101005801000701030e000105020202010302020503010000cb0101008101010059
-010100c30101005801000701001005020202010302020503010000cb0101008101010059
-010100c30101005801000701000d070000010502020201030202050301ff01ff01ce0701
-0001050a070100010502020201030202050301ff01ff01ce07010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-070100010502020201030202050301ff01ff01ce07010001050a07010001050202020103
-0202050301ff01ff01ce07010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-01ff01ff01ce07010001050a070100010502020201030202050301ff01ff01ce07010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a070100010502020201030202050301ff01ff01ce07010001050a0701
-00010502020201030202050301ff01ff01ce07010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-020201030202050301ff01ff01ce07010001050a070100010502020201030202050301ff
-01ff01ce07010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a070100010502020201030202050301ff01ff01ce
-07010001050a070100010502020201030202050301ff01ff01ce07010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a070100010502020201030202050301ff01ff01ce07010001050a0701000105020202
-01030202050301ff01ff01ce07010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-050301ff01ff01ce07010001050a070100010502020201030202050301ff01ff01ce0701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a070100010502020201030202050301ff01ff01ce07010001050a
-070100010502020201030202050301ff01ff01ce07010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-0502020201030202050301ff01ff01ce07010001050a0701000105020202010302020503
-01ff01ff01ce07010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a070100010502020201030202050301ff01ff
-01ce07010001050a070100010502020201030202050301ff01ff01ce07010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001070c0001
-05020202010302020503010000cb0101008101010059010100c301010058010007010000
-070d00010502020201030202050301ff01ff01ce0701030e000105020202010302020503
-01ff01ff01ce0701030e000105020202010302020503010000cb01010081010100590101
-00c30101005801000701030e000105020202010302020503010000cb0101008101010059
-010100c30101005801000701030e000105020202010302020503010000cb010100810101
-0059010100c30101005801000701030e000105020202010302020503010000cb01010081
-01010059010100c30101005801000701030e000105020202010302020503010000cb0101
-008101010059010100c30101005801000701030e000105020202010302020503010000cb
-0101008101010059010100c30101005801000701030e0001050202020103020205030100
-00cb0101008101010059010100c30101005801000701030e000105020202010302020503
-010000cb0101008101010059010100c30101005801000701030e00010502020201030202
-0503010000cb0101008101010059010100c30101005801000701030e0001050202020103
-02020503010000cb0101008101010059010100c30101005801000701030e000105020202
-010302020503010000cb0101008101010059010100c30101005801000701030e00010502
-0202010302020503010000cb0101008101010059010100c30101005801000701030e0001
-05020202010302020503010000cb0101008101010059010100c30101005801000701030e
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-030e000105020202010302020503010000cb0101008101010059010100c3010100580100
-0701030e000105020202010302020503010000cb0101008101010059010100c301010058
-01000701030e000105020202010302020503010000cb0101008101010059010100c30101
-005801000701030e000105020202010302020503010000cb0101008101010059010100c3
-0101005801000701030e000105020202010302020503010000cb01010081010100590101
-00c30101005801000701030e00010502020201030202050301ff01ff01ce0701030e0001
-0502020201030202050301ff01ff01ce0701001005020202010302020503010000cb0101
-008101010059010100c301010058010007010300000c0700000105020202010302020503
-010000cb0101008101010059010100c30101005801000701030000010508070103000001
-05020202010302020503010000cb0101008101010059010100c301010058010007010301
-0001050707010300000105020202010302020503010000cb0101008101010059010100c3
-010100580100070103010001050607010301000105020202010302020503010000cb0101
-008101010059010100c30101005801000701030200010505070103010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010302000105040701
-0302000105020202010302020503010000cb0101008101010059010100c3010100580100
-070103030001050307010302000105020202010302020503010000cb0101008101010059
-010100c30101005801000701030300010502070103030001050202020103020205030100
-00cb0101008101010059010100c301010058010007010304000105010701030300010502
-0202010302020503010000cb0101008101010059010100c3010100580100070103040001
-050007010304000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010305000007020304000105020202010302020503010000cb010100810101
-0059010100c3010100580100070103050000070103050001050202020103020205030100
-00cb0101008101010059010100c301010058010007010306070103050001050202020103
-02020503010000cb0101008101010059010100c301010058010007010306070003060001
-05020202010302020503010000cb0101008101010059010100c301010058010007010010
-05020202010302020503010000cb0101008101010059010100c301010058010007000011
-0502020201030202050207ff07ff07d30511020201030202050207ff07ff07d200000511
-02020103020205020701030d0000030000ff00ff00af03000001030c0001051102020103
-020205020701030b00010700030000ff00ff00ae070003000003030a0001051102020103
-0202050207010309000207010300000105ff05ff05ab0701030000050308000105110202
-010302020502070103070003050007010300000105ff05ff05ab07010300000105010003
-0306000105110202010302020502070103050003050207010300000105ff05ff05ab0701
-030000010503000303040001051102020103020205020701030300030504070103000001
-05ff05ff05ab070103000001050500030302000105110202010302020502070103010003
-050607010300000105ff05ff05ab07010300000105070003030000010511020201030202
-05020705050807010300000105ff05ff05ab070103000001050807030001051102020103
-02020502070103010703050607010300000105ff05ff05ab070103000001050707030300
-000105110202010302020502070103030703050407010300000105ff05ff05ab07010300
-0001050507030302000105110202010302020502070103050703050207010300000105ff
-05ff05ab0701030000010503070303040001051102020103020205020701030707030500
-07010300000105ff05ff05ab070103000001050107030306000105110202010302020502
-0701030907040300000105ff05ff05ab0701030000010703030800010511020201030202
-05020701030b07020300000107ff07ff07ad030000010701030a00010511020201010004
-05020701030d07000300000007ff07ff07ae030000000700030c00010511000502020400
-0502070100ff00ff00d105110000020204000000020204000502070000ff00ff00d20511
-00000202040000000202040005ff05ff05e800000202040000000202040005ff05ff05e8
-00000202040000000202040005ff05ff05e8000002020400000002020400000502ff02ff
-02dc00060202040000000208040002ff02ff02dc00000208040000000208040002ff02ff
-02dc00000208040000000208040001ff01ff01dc0000020804000000040901ff01ff01dc
-00000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 377 205
-%%EOF
diff --git a/lib/tv/doc/src/tv_start_other_node.gif b/lib/tv/doc/src/tv_start_other_node.gif
deleted file mode 100644
index 897686e5ef..0000000000
--- a/lib/tv/doc/src/tv_start_other_node.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_start_other_node.ps b/lib/tv/doc/src/tv_start_other_node.ps
deleted file mode 100644
index 34477bed6c..0000000000
--- a/lib/tv/doc/src/tv_start_other_node.ps
+++ /dev/null
@@ -1,2316 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (./tv_start_other_node.tmp.eps)
-%%CreationDate: (Tue Jun 12 16:05:42 2001)
-%%BoundingBox: 0 21 400 186
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 21 400 186
-userdict begin
-%%BeginData:
-DisplayImage
-0 21
-400.000000 165.000000
-12
-1001 414
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-4ac1df
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-aab6aa
-e7e7e7
-000000
-000000
-000000
-000000
-000000
-000000
-03ff03ff03ff03ff03ff03ff03ff03ff03c5000a01ff01ff01dc000a03f5000002080500
-01ff01ff01dc00000208050003f500000208050002ff02ff02dc00000208050003f50000
-0208050002ff02ff02dc00000208050003f500000202050602ff02ff02dc000005050202
-050003f50000020205000209000d02ff02ff02d000000202050003f50000020205000208
-0000020d050002e101030211010302380101020601010238010102310101022f010102ee
-00000202050003f500000202050002080000020d050002e1010102020107020001010203
-010102010101020e0105020001070201010302070100020b010102060101023301000203
-010102310101020b0104021e010102ee00000202050003f500000202050002080000020d
-050002e1010102050101020301010203010102010101020e010102070101020301010201
-010102050101020b010102060101023201010203010102310101020a010102020101021d
-010102ee00000202050003f500000202050002080000020205060203050002e101010205
-0101020301010203010102010101020e0101020701010203010102080104020101030203
-010102000101020301010202010302030104020601030203010102000101020701030201
-01040201010102000101020301030202010102000101020a010102000101020301030203
-010402020103020201010201010302020101020001010201010102030103020201010200
-01010201010102020103020201010202010102dd00000202050003f50000050302080000
-02020500040400000203050002e1010102050101020401010202010002020101020e0101
-020701010203010202080101020201010201010102020102020001010202010102010101
-020101010201010102090101020101010202010202000101020501010201010102010101
-020301020200010102010101020101010201010102000101020a01020200010102010101
-020101010201010102010101020101010201010102010101020001010200010102020102
-020001020200010102010101020101010201010102000101020101010201010102010101
-020101010202010102dd0000050303f50101020b000002030500040200000204050002e1
-010102050101020401010201010102020101020e01040204010102040103020601010206
-010102020101020101010202010102010101020101010201010202080101020101010202
-010102010101020501010201010102010101020301010201010102010101020101010201
-0102020c0101020101010201010102010101020101010201010102010101020101010201
-010102000101020001010202010102010101020101010205010102010102020301010201
-010102010101020101010202010002e1010103f50101020b000002030500040200000204
-050002e1010102050101020501010200010002030101020e010102070101020601020205
-010102030104020201010201010102020101020101050202010302060101020101010202
-01010201010102050101020101010201010102030101020101010201010502010101020d
-010102010101020101010201010102010101020101010201010502010101020001010200
-010102020101020101010201010102020104020101010204010102010105020201010200
-010102e1010103f50101020b000002040500040000000205050002e10101020501010205
-010302030101020e01010207010102070101020501010202010102010101020201010201
-010102020101020101010208010202050101020101010202010102010101020501010201
-01010201010102030101020101010201010102050101020d010102010101020101010201
-010102010101020101010201010102050101020101010200010102010101020101010201
-01010201010102010101020101010204010102010101020601010200010002e2010103f5
-0101020b000002040500040000000205050002e10101020501010206010102040101020e
-010102070101020301010201010102050101020201010201010102020101020101010202
-010102010101020201000205010102050101020101010202010102010101020501010201
-0101020101010203010102010101020101010202010002010101020d0101020101010201
-010102010101020101010200010202010101020201000202010102070101020101010201
-01010201010102010101020101010204010102010101020201000203010202e2010103f5
-0101020b0000020500000206050002e10101020501010206010102040101020e01050203
-010102040103020701020201010202000101020101040203010102020103020201040207
-01030203010102010101020601030203010202010101020101010202010302020101020d
-010102010101020201030203010102000101020201030204010502020101020101010201
-010102020102020001010200010102040101020201030204010102e3010103f50101020b
-0000020d050002e1010302110103029201060255010102e4010103f50101020b0000020d
-050002ff02eb010102e4010103f50101020b0000020d050002ff02ff02d2010103f50101
-020c050d02ff02ff02d3010103f5010102ff02ff02ee010103f5010102ff02ff02ee0101
-03f5010102ff02ff02ee010103f5010102ff02ff02ee010103f5010102ff02ff02ee0101
-03f501010202060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-00000600000006000000060000000600000006000202010103f501010202000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060001000202010103f5010102020600000006ff06ff06e40100060002020101
-03f501010202000006ff06ff06e601000202010103f5010102020600000006ff06ff06e4
-010006000202010103f501010202000006ff06ff06e601000202010103f5010102020600
-000006ff06ff06e4010006000202010103f5010102020000060c07040604070006030702
-061f0700060207000604070006270702060b07000606070006ff06ff0635070006020700
-06090702061401000202010103f50101020206000000060b0700060f0700061f07000602
-0700062c070006020700060a070006ff06ff063d070006020700060b0700061301000600
-0202010103f5010102020000060c07000606070206050700060307020618070006020700
-060207020603070206020700060207000617070006020700060107000600070106020704
-060207020603070206020700060007010603070206ff06ff062007000602070006020702
-060507000602070006000701060d01000202010103f50101020206000000060b07000608
-070006050700060207000602070006180700060007000605070006020700060207000601
-070006020700061707000602070006010701060107000603070006060700060207000602
-07000601070106010700060107000602070006ff06ff061f070006020700060107000602
-0700060407000602070106010700060b010006000202010103f5010102020000060c0703
-060507000605070006020700060207000618070006000700060507000602070006020700
-060107000600070006000700061707000602070006010700060207000603070006060700
-060207000602070006010700060207000601070006ff06ff062307040601070006020700
-060407000602070006020700060c01000202010103f50101020206000000060b07000608
-070006050700060207040618070006000700060507000602070406010700060007000600
-070006170700060207000601070006020700060307000606070006020700060207000601
-0700060207000602070206ff06ff06200700060207000601070406040700060207000602
-0700060b010006000202010103f5010102020000060c0700060807000605070006020700
-061d07000606070006020700060507000600070006000700061707000602070006010700
-060207000603070006060700060207000602070006010700060207000605070006ff06ff
-061f07000602070006010700060807000602070006020700060c01000202010103f50101
-020206000000060b07000608070006050700060207000602070006190700060607000602
-070006020700060107000600070006000700061707000602070006010701060107000603
-07000606070006020700060207000601070006020700060107000602070006ff06ff061f
-0700060207000601070006020700060407000602070106010700060b0100060002020101
-03f5010102020000060c0700060807000605070006030702061a07000606070006030702
-060307000600070006190702060207000600070106050701060407000603070206020700
-060207000602070206ff06ff062007000602070006020702060507000602070006000701
-060d01000202010103f501010202060000000676070006ff06ff065b0700060f01000600
-0202010103f5010102020000060b0706062a0706062a07060600070006ff06ff06450706
-060e0700061001000202010103f50101020206000000060a0706062a0706062a07060600
-070006ff06ff06450706060e0700060f010006000202010103f501010202000006ff06ff
-06e601000202010103f5010102020600000006ff06ff06e4010006000202010103f50101
-0202000006ff06ff06e601000202010103f5010102020600000006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-0202010103f5010102020000060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-0600010006000100060001000600010006000100060001000202010103f50101020206ff
-06ff06e80202010103f50101020206ff06ff06e80202010103f50101020206ff06ff06e8
-0202010103f50101020206ff06ff06e80202010103f50101020206ff06ff06e802020101
-0303000a01d9000a03010101020206ff06ff06e802020101030300000208050001d90000
-0208050003010101020206ff06ff06e802020101030300000208050002d9000002080500
-03010101020206ff06ff06e802020101030300000208050002d900000208050003010101
-020206ff06ff06e802020101030300000202050602d90000050502020500030101010202
-06ff06ff06e80202010103030000020205000209000d02cd000002020500030101010202
-06ff06ff06e802020101030300000202050002080000020d0500021a0103021101030250
-0101021a0101022700000202050003010101020206ff06ff06e802020101030300000202
-050002080000020d0500021a01010202010702000101020301010201010102100103022b
-0100020e0101021a0101022700000202050003010101020206ff06ff06e8020201010303
-00000202050002080000020d0500021a010102050101020301010203010102010101020f
-01010201010102290101020e0101021a0101022700000202050003010101020206ff06ff
-06e8020201010303000002020500020800000202050602030500021a0101020501010203
-01010203010102010101020e010102060103020301010200010102030101020001010203
-010302030103020001040201010302030104020601010200010102030103020301040202
-010302030104021700000202050003010101020206ff06ff06e802020101030300000503
-02080000020205000404000002030500021a010102050101020401010202010002020101
-020e01010205010102010101020201020200010102020102020001010201010102010101
-020101010201010102000101020201010201010102010101020101010206010202000101
-02010101020101010201010102010101020101010201010102010101021b000005030301
-0101020206ff06ff06e80202010103030101020b0000020305000402000002040500021a
-010102050101020401010201010102020101020e01010205010102010101020201010201
-010102020101020101010201010102010101020101010204010102020101020101010201
-010102010101020601010201010102010101020101010201010102010101020101010201
-010102010102021d010103010101020206ff06ff06e80202010103030101020b00000203
-05000402000002040500021a010102050101020501010200010002030101020e01010205
-010102010101020201010201010102020101020101010201010502010101020401010202
-010502010101020101010206010102010101020101010201010102010101020101010201
-010502020103021b010103010101020206ff06ff06e80202010103030101020b00000204
-05000400000002050500021a0101020501010205010302030101020e0101020501010201
-010102020101020101010202010102010101020101010205010102040101020201010205
-010102010101020601010201010102010101020101010201010102010101020101010208
-0102021a010103010101020206ff06ff06e80202010103030101020b0000020405000400
-000002050500021a0101020501010206010102040101020f010102020100020001010201
-010102020101020101010202010102010101020101010202010002010101020201000200
-010102020101020201000201010102000102020601010201010102010101020101010201
-010102000102020101010202010002050101021a010103010101020206ff06ff06e80202
-010103030101020b00000205000002060500021a01010205010102060101020401010210
-010302020103020301010201010102020101020101010202010302030103020201020201
-010302030101020001010206010102010101020201030203010102000101020201030202
-0104021b010103010101020206ff06ff06e80202010103030101020b0000020d0500021a
-010302110103029a010103010101020206ff06ff06e80202010103030101020b0000020d
-050002cf010103010101020206ff06ff06e80202010103030101020b0000020d050002cf
-010103010101020206ff06ff06e80202010103030101020c050d02d00101030101010202
-06ff06ff06e8020201010303010102eb010103010101020206ff06ff06e8020201010303
-010102eb010103010101020206ff06ff06e8020201010303010102eb0101030101010202
-06ff06ff06e8020201010303010102eb0101030101010202061c01020604010306c10102
-06040103061a0102067f01010605010206f001020604010306190101062f020201010303
-010102eb0101030101010202060e01060608010006060101060f010206010102069b0106
-06080100060601010610010506040101064d010206240104060d0101061e010206240102
-060101020693010606080100060601010611010306350202010103030101020206000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060000000600000006000000060000000600000002020101030101010202060e
-0100060101010600010006070101060601000611010106010100069d0100060101010600
-010006070101060601000613010106060100064d0101060001010624010106000101060c
-0100061e0101060001010624010106010100069501000601010106000100060701010606
-010006110101060101010634020201010303010102020000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060002020101030101010202061001010603010306020103
-060301010603010306080102060001010601010306000101060001000600010006020103
-068b010106030103060201030603010106030103060a010106030104064c010106010105
-060001030600010206020103060101010600010206070101060101010600010306030104
-061d01010601010506000103060001020602010306010101060001020607010206000101
-060101030600010106000100060001000602010306830101060301030602010306030101
-060301030609010106010100060001030602010506010103062102020101030301010202
-0600000006e2010002020101030101010202061001010606010106000101060101010602
-010106020101060101010607010006000100060001000605010106000105060001010601
-0101068a0101060601010600010106010101060201010602010106010101060901010602
-010106010101064c01000602010106000101060201000600010206000101060001010601
-010106010102060001000607010106010101060201010602010106010101061d01000602
-010106000101060201000600010206000101060001010601010106010102060001000607
-010006000100060001000605010106000105060001010601010106820101060601010600
-010106010101060201010602010106010101060801020604010106020101060001010601
-010106010101062002020101030301010202000006e20100060002020101030101010202
-061001000604010406000101060101010602010106010106060701000600010206020104
-060001010600010006000107068a01000604010406000101060101010602010106010106
-060901010601010106020101064b01010602010006010101060001000600010006000101
-0601010806010101060a0103060401010601010106020101061c01010602010006010101
-0600010006000100060001010601010806010101060a0100060001020602010406000101
-060001000600010706820100060401040600010106010101060201010601010606090102
-0603010106040101060101060620020201010303010102020600000006e2010002020101
-030101010202060f0101060201010601010106000101060201010601010106020101060b
-010106000101060101010601010106010100060001000600010006000101068e01010602
-01010601010106000101060201010601010106020101060d01010602010106010101064c
-010106010101060101020600010006010100060201000600010106050101060a01010606
-01010602010106010101061d010106010101060101020600010006010100060201000600
-010106050101060a01010600010106010101060101010601010006000100060001000600
-010106860101060201010601010106000101060201010601010106020101060b01010601
-0101060201010603010106030101062502020101030301010202000006e2010006000202
-0101030101010202060f0101060201010601010106000101060101010602010106020101
-060101010607010006010101060101010601010106000101060001000600010006000101
-06010101068a010106020101060101010600010106010101060201010602010106010101
-060901010602010106010101064c01010600010106020103060101010601010106000101
-0601010106010101060a0101060601010602010106010101061d01010600010106020103
-0601010106010101060001010601010106010101060a0100060101010601010106010101
-060001010600010006000100060001010601010106820101060201010601010106000101
-060101010602010106020101060101010607010106010101060201010602010206000101
-06000101060101010621020201010303010102020600000006e201000202010103010101
-0202060e01030602010a0601010506010103060701020600010106020107060001000600
-010106000103068a01030602010a06010105060101030608010506010105064c01020603
-01010600010006000103060001020600010306010104060701030603010506010105061d
-010206030101060001000600010306000102060001030601010406070102060001010602
-0107060001000600010106000103068201030602010a0601010506010103060901030601
-010506000105060101030622020201010303010102020000060c07040604070006030702
-06c3010006000202010103010101020206ff06ff06e80202010103030101020206000000
-060b0700060f070006c401000202010103010101020206ff06ff06e80202010103030101
-02020000060c070006060702060507000603070206bc0100060002020101030101010202
-06ff06ff06e80202010103030101020206000000060b0700060807000605070006020700
-0602070006bc01000202010103010101020206ff06ff06e8020201010303010102020000
-060c07030605070006050700060207000602070006bb0100060002020101030101010202
-06ff06ff06e80202010103030101020206000000060b0700060807000605070006020704
-06bc01000202010103010101020206ff06ff06e8020201010303010102020000060c0700
-06080700060507000602070006bf010006000202010103010101020206ff06ff06e80202
-010103030101020206000000060b07000608070006050700060207000602070006bc0100
-02020101030101010202060201ff01ff01e20602020201010303010102020000060c0700
-06080700060507000603070206bc01000600020201010301010102020603010000cb0101
-008101010059010100c30101005801010600010006000100060001000600010006000100
-060001000600010006000100060000000602020201010303010102020600000006e20100
-020201010301010102020603010000cb0101008101010059010100c30101005801000600
-010004060100040600000603020201010303010102020000060b070606cf010006000202
-01010301010102020603010000cb010100810101000c0100002a0100001f010100c30101
-00580101060004050000060004060600000006020202010103030101020206000000060a
-070606d001000202010103010101020206030100001f0100000a0100009e010100810101
-000b0100000301020003010200090104000a010100020100001e0101001e010200050100
-0012010000060100002e010000120102000301020031010100080104004a010006000100
-040506000100060004050000060302020101030301010202000006e20100060002020101
-03010101020206030100001f0100000a0100009e010100810101000a0100000301000002
-0100000101000002010000080100000d01000001010000020100001d0101002001000019
-0100003601000014010000050100003101010008010000020100004a0101060004040600
-0000060001000405060000000602020201010303010102020600000006e2010002020101
-03010101020206030100000901020003010200090104000201020002010000000101009b
-010100810101000901000008010000010100000c0100000d01000001010000030100001c
-010100090102000201000000010100020100000001010005010000030102000301020003
-01020002010400020102000301020002010000000101000a010200030102000201000000
-010100020104000101000000010100030102000501000005010000030102000201000000
-010100230101000c0100004a010006000100040400000602010004040000060302020101
-030301010202000006e20100060002020101030101010202060301000008010000020100
-0001010000020100000a010000030100000201000001010100010100009a010100810101
-000801000009010000010100000c0103000a01000001010000040100001b010100080100
-000201000001010100010100000101010001010000040100000501000002010000020100
-000101000002010000030100000601000002010000020100000101010001010000080100
-000201000001010000020100000101010001010000030100000301010001010000010100
-0002010000040100000501000002010000020100000101010001010000220101000b0100
-004b01010600040300000602010006000404060000000602020201010303010102020600
-000006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010002020101030101010202
-06030100000c010000010100000e0100000701000001010000020100009a010100810101
-000701000009010000020103000d0100000901000001010000050100001a0101000c0100
-000101000002010000010100000201000004010000050100000201000009010000030100
-000601000002010000020100000101000002010000080100000501000002010000010100
-000201000003010000030100000501000002010000040100000501000002010000020100
-0001010000260101000b0100004b01000600010004030600000006020100060004030000
-060302020101030301010202000006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-0100060002020101030101010202060301000009010300010100000e0100000401030001
-010000020100009a01010081010100080100000701000003010000020100000c01000009
-01000001010000040100001b010100090103000101000002010000010100000201000004
-010000050100000201000006010300030100000601000002010000020100000101000002
-010000080100000501000002010000010100000201000003010000030100000501000002
-01000004010000050100000201040001010000260101000b0100004b0101060004020600
-00000604010004030600000006020202010103030101020206e502020101030101010202
-06030100000801000002010000010100000e010000030100000201000001010000020100
-009a01010081010100090100000501000004010000020100000801000002010000090100
-0001010000030100001c0101000801000002010000010100000201000001010000020100
-000401000005010000020100000501000002010000030100000601000002010000020100
-000101000002010000080100000501000002010000010100000201000003010000030100
-00050100000201000004010000050100000201000005010000260101000a0100004c0100
-0600010004020000060601000402000006030202010103030101020206e5020201010301
-010102020603010000080100000201000001010000020100000a01000003010000020100
-0001010100010100009a010100810101000a010000030100000501000002010000030101
-000201000002010000030101000301000001010000020100001d01010008010000020100
-000101010001010000010101000101000004010000050100000201000002010000010100
-000201000003010000060100000201000002010000010100000201000008010000020100
-000101000002010000010100000201000003010000030100000501000002010000040100
-0005010000020100000201000001010000260101000a0100004c01010600040100000606
-0100060004020600000006020202010103030101020206e5020201010301010102020603
-01000009010300020102000c0101000201030001010000000101009b010100810101000b
-010000020104000201020004010100030102000401010004010100020100001e01010009
-010300010100000001010002010000000101000501000005010000030102000301030004
-010100040100000301020002010000020100000901020003010200020100000201000004
-010100010100000601020005010000050100000301020002010000260101000a0100004c
-0100060001000401060000000606010006000401000006030202010103030101020206e5
-02020101030101010202060301000015010500af010100810101000c0100002a0100001f
-0101000f010000050100003c010500680101005801010600040006000000060801000401
-0600000006020202010103030101020206e5020201010301010102020603010000cb0101
-0081010100590101000f01000005010000ab0101005801000600010004000000060a0100
-0400000006030202010103030101020206e5020201010301010102020603010000cb0101
-0081010100590101000f01000005010000ab010100580101060000000600010006000100
-060001000600010006000100060001000600040006000000060202020101030301010202
-06e5020201010301010102020603010000cb0101008101010059010100c3010100580100
-060001000600010006000100060001000600010006000100060001000600010006000000
-06030202010103030101020206e5020201010301010102020603010000cb010100810101
-0059010100c30101005801010600040e0600000006020202010103030101020206e50202
-01010301010102020603010000cb0101008101010059010100c301010058010006000100
-060000000600000006000000060000000600000006000000060000000600000006030202
-010103030101020206e5020201010301010102020603010000cb01010081010100590101
-00c301010058010106000000060000000600000006000000060000000600000006000000
-060001000600000006020202010103030101020206e502020101030101010202060301ff
-01ff01ce0600010006000000060a01000600000006030202010103030101020206e50202
-0101030101010202060308cd01ff01ff010106000000060c010006000000060202020101
-03030101020206e5020201010301010102020603080009cb080001000981010109590101
-09c30101095801000600010006000000060a010006000000060302020101030301010202
-06e5020201010301010102020603080009cb08000100090b010109550101091b01010959
-010109c301010958010106000000060c01000600000006020202010103030101020206e5
-020201010301010102020603080009cb08000100090a0100091c01000931010009080100
-091a0101090c0100093101000918010109c30101095801000600010006000000060a0100
-0600000006030202010103030101020206e50202010103010101020206030800091a0800
-09af08000100090a01000905010009050101090c01000903010209030102090a01020902
-0104090a01010902010009070100091a0101090b01000903010209030102090a01020902
-0104090a01010902010009170101091a010009a70101090901020904010109030102093d
-010106000000060c01000600000006020202010103030101020206cf0100060001000600
-010006000100060001000600010006000100060001000600010006040202010103010101
-020206030800091a080009af08000100090a0100090401010904010009010100090a0100
-090301000902010009010100090201000908010009020100090101000902010009090100
-090101000902010009060100091a0101090a010009030100090201000901010009020100
-0908010009020100090101000902010009090100090101000902010009160101091a0100
-09a70101090801000902010009020100090101000901010009020100093c010006000100
-06000000060a01000600000006030202010103030101020206ce01000600010006000100
-060001000600010006000100060001000600010006000100060000000603020201010301
-0101020206030800090908020903080209030801090008000902080209a908000100090a
-010009030100090001000904010009010100090901000908010009010100091001000905
-010009090100090101000903010009050100091a01010909010009080100090101000910
-010009050100090901000901010009030100091501010909010209030102090301010900
-010009020102090a01020903010209020100090001010902010009020100090201020902
-01000900010109700101090c01000902010009010100090101000940010106000000060c
-010006000000060202020101030301010202060500000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000602010004060100040600000604
-020201010301010102020603080009080800090208000901080009020800090108000901
-0801090108000902080009a808000100090a010009050100090401000901010009080100
-09090100090101000910010009040100090a0100090101000904010009040100091a0101
-0908010009090100090101000910010009040100090a0100090101000904010009140101
-090801000902010009010100090201000901010009010101090101000902010009080100
-090201000901010009020100090101010901010009010100090201000901010009020100
-0901010109010100096f0101090c01000902010009010100090101000940010006000100
-06000000060a010006000000060302020101030301010202060501000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000001000000010000000100
-000001000000010000000100000001000000010000000100000106010100060004050000
-060004060600000006030202010103010101020206030800090808000905080009020800
-0901080009020800090108000902080009a8080001000908010109060100090401000901
-0100090701000909010009020103090c010009050100090a010009010100090501000904
-010109180101090701000909010009020103090c010009050100090a0100090101000905
-010009130101090801000905010009020100090101000902010009010100090201000908
-010009050100090201000901010009050100090201000901010009020100090101000973
-0101090b0100090301000901010009010103093d010106000000060c0100060000000602
-0202010103030101020206050000010000c4060201000405060001000600040500000604
-020201010301010102020603080009080800090508000902080009010800090208000901
-080409a808000100090a0100090501000904010009010100090801000907010009030100
-09020100090a010009060100090a0100090101000904010009040100091a010109080100
-090701000903010009020100090a010009060100090a0100090101000904010009140101
-090801000905010009020100090101000902010009010104090901020902010409010100
-0906010009000100090201040901010009730101090a0100090401000901010009010100
-09020100093c01000600010006000000060a010006000000060302020101030301010202
-0605010000c5060101000600040406000000060001000405060000000603020201010301
-010102020603080009080800090508000902080009010800090208000901080009ac0800
-0100090a0100090501000904010009010100090901000905010009040100090201000909
-010009060100090b0100090101000903010009050100091a010109090100090501000904
-0100090201000909010009060100090b0100090101000903010009150101090801000905
-010009020100090101000902010009010100091001000901010009050100090601000900
-01000902010009050100097301010909010009050100090101000901010009020100093c
-010106000000060c01000600000006020202010103030101020206050000010000260100
-009c06020100040400000602010004040000060402020101030101010202060308000908
-08000902080009010800090208000901080009010801090108000902080009a808000100
-090a01000905010009040100090101000903010109040100090301000905010009020100
-0903010109020100090701000905010109030100090101000902010009060100091a0101
-090a01000903010009050100090201000903010109020100090701000905010109030100
-090101000902010009160101090801000902010009010100090201000901010009010101
-090101000902010009080100090201000901010009020100090101000907010009030100
-0902010009010100097301010908010009060100090101000901010009020100093c0100
-0600010006000000060a01000600000006030202010103030101020206050100001a0100
-000a01000000010000180102007f06010100060004030000060201000600040406000000
-060302020101030101010202060308000909080209030802090308010900080009020802
-09a908000100090a01000903010409030101090401010905010009020104090201020904
-0101090201040903010009050101090401010902010009070100091a0101090b01000902
-010409020102090401010902010409030100090501010904010109020100091701010909
-010209030102090301010900010009020102090a01020903010209020100090701000904
-01020902010009730101090801040903010109030102093d010106000000060c01000600
-0000060202020101030301010202060500000100002401000002010000190100007f0602
-0100040306000000060201000600040300000604020201010301010102020603080009cb
-08000100090a010009140100090601000931010009080100091a0101090c010009310100
-091801010923010509990101095801000600010006000000060a01000600000006030202
-010103030101020206050100000901010000010000030102000301020002010000000101
-000201000000010200010101000001000003010200020100000001010005010000030102
-000201000002010000700601010006000402060000000604010004030600000006030202
-01010301010102020603080009cb08000100090b01010910010109420101091b01010959
-010109c301010958010106000000060c0100060000000602020201010303010102020605
-000001000008010000000100000001000001010000020100000401000002010100010100
-000101000000010000000100000101000000010000000100000101000002010000010101
-000101000004010000020100000201000001010000020100007006020100040200000606
-0100040200000604020201010301010102020603080009cb080001000981010109590101
-09c30101095801000600010006000000060a010006000000060302020101030301010202
-060501000009010000000100000001000005010000040100000201000002010000010100
-000001000000010000010100000001000000010000050100000101000008010000020100
-000201000002010000010100007006010100060004010000060601000600040206000000
-0603020201010301010102020603080009cb08000100098101010959010109c301010958
-010106000000060c01000600000006020202010103030101020206050000010000080100
-000001000000010000020103000401000002010000020100000101000000010200010100
-000001000000010000020103000101000008010000020104000201000001010000700602
-0100040106000000060601000600040100000604020201010301010102020603080009cb
-08000100098101010959010109c30101095801000600010006000000060a010006000000
-060302020101030301010202060501000009010000000100000001000001010000020100
-000401000002010000020100000101000005010000000100000001000001010000020100
-000101000008010000020100000701000000010000700601010006000400060000000608
-01000401060000000603020201010301010102020603080009cb08000100098101010959
-010109c301010958010106000000060c0100060000000602020201010303010102020605
-000001000008010000000100000001000001010000020100000401000002010000020100
-000201000001010000010100000001000000010000010100000201000001010000080100
-00020100000201000003010100710602010004000000060a010004000000060402020101
-0301010102020603080009cb08000100098101010959010109c301010958010006000100
-06000000060a010006000000060302020101030301010202060501000009010000000100
-000001000002010300040100000201000002010000030101000201000000010000000100
-000201030001010000080100000301020005010000710601010006000000060001000600
-010006000100060001000600010006000100060004000600000006030202010103010101
-0202060308cd01ff01ff010106000000060c010006000000060202020101030301010202
-060500000100005101000071060201000600010006000100060001000600010006000100
-060001000600010006000000060402020101030101010202060308cd01ff01ff01000600
-010006000000060a01000600000006030202010103030101020206050100004f01000000
-01000072060101000600040e060000000603020201010301010102020603080009cb0800
-0100098101010959010109c301010958010106000000060c010006000000060202020101
-030301010202060500000100004f01000073060201000600000006000000060000000600
-0000060000000600000006000000060000000604020201010301010102020603080009cb
-08000100090b010109550101091b01010959010109c30101095801000600010006000000
-060a0100060000000603020201010303010102020605010000c506010100060000000600
-000006000000060000000600000006000000060000000600010006000000060302020101
-0301010102020603080009cb08000100090a0100091c01000931010009080100091a0101
-090c0100093101000918010109c301010958010106000000060c01000600000006020202
-010103030101020206050000010000c40602010006000000060a01000600000006040202
-010103010101020206030800091a080009af08000100090a01000905010009050100090d
-01000903010209030102090a010209020104090a01010902010009070100091a0101090b
-01000903010209030102090a010209020104090a01010902010009170101091a010009a7
-01010909010209030102094401000600010006000000060a010006000000060302020101
-030301010202060501000001040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000000400000004000000040000000400000004000000040000000400000004000000
-040000020601010006000000060c01000600000006030202010103010101020206030800
-091a080009af08000100090a01000904010109040101090c010009030100090201000901
-010009020100090801000902010009010100090201000909010009010100090201000906
-0100091a0101090a01000903010009020100090101000902010009080100090201000901
-01000902010009090100090101000902010009160101091a010009a70101090801000902
-010009010100090201000943010106000000060c01000600000006020202010103030101
-020206050000010004c200010602010006000000060a0100060000000604020201010301
-010102020603080009090802090308020903080109000800090208020909080009000801
-0903080209020801090008000903080209030802097f08000100090a0100090301000900
-01000903010009000100090b010009080100090101000910010009050100090901000901
-01000903010009050100091a010109090100090801000901010009100100090501000909
-01000901010009030100091501010909010209030102090301010900010009020102090a
-010209030102090201000900010109020100090201000902010209020100090001010970
-0101090c010009050100094301000600010006000000060a010006000000060302020101
-030301010202060501000001044f0100046f010000010601010006000000060c01000600
-000006030202010103010101020206030800090808000902080009010800090208000901
-080009010801090108000902080009080801090108000901080009020800090108000900
-08000900080009010800090208000901080009020800097e08000100090a010009050100
-09050100090a010009090100090101000910010009040100090a01000901010009040100
-09040100091a01010908010009090100090101000910010009040100090a010009010100
-090401000914010109080100090201000901010009020100090101000901010109010100
-090201000908010009020100090101000902010009010101090101000901010009020100
-09010100090201000901010109010100096f0101090c0100090501000943010106000000
-060c0100060000000602020201010303010102020605000001000411010004030100042c
-0100040901000400010004180102045300010602010006000000060a0100060000000604
-020201010301010102020603080009080800090508000902080009010800090208000901
-080009020800090808000902080009050800090108000900080009000800090108000902
-080009010800098208000100090801010906010009050100090901000909010009020103
-090c010009050100090a0100090101000905010009040101091801010907010009090100
-09020103090c010009050100090a01000901010009050100091301010908010009050100
-090201000901010009020100090101000902010009080100090501000902010009010100
-090501000902010009010100090201000901010009730101090a01010904010109440100
-0600010006000000060a0100060000000603020201010303010102020605010000010410
-010004030100042c01000408010004020100041901000452010000010601010006000000
-060c01000600000006030202010103010101020206030800090808000905080009020800
-090108000902080009010804090808000902080009020803090108000900080009000800
-0901080409020802097f08000100090a01000905010009050100090a0100090701000903
-010009020100090a010009060100090a0100090101000904010009040100091a01010908
-0100090701000903010009020100090a010009060100090a010009010100090401000914
-010109080100090501000902010009010100090201000901010409090102090201040901
-01000906010009000100090201040901010009730101090c010009050100094301010600
-0000060c0100060000000602020201010303010102020605000001000409010204020104
-040101000400010104030102040201000400010104090100040001010403010204030101
-040001000402010204020100040001020401010104000100040301020402010004000101
-04050100040301020402010004020100044400010602010006000000060a010006000000
-060402020101030101010202060308000908080009050800090208000901080009020800
-09010800090c080009020800090108000902080009010800090008000900080009010800
-09090800097e08000100090a01000905010009050100090b010009050100090401000902
-01000909010009060100090b0100090101000903010009050100091a0101090901000905
-010009040100090201000909010009060100090b01000901010009030100091501010908
-010009050100090201000901010009020100090101000910010009010100090501000906
-010009000100090201000905010009730101090c01000905010009430100060001000600
-0000060a0100060000000603020201010303010102020605010000010407010004020100
-040301000403010104010100040101000402010004010101040101000408010104010100
-040101000402010004010100040101010401010004020100040101000400010004000100
-040101000400010004000100040101000402010004010101040101000404010004020100
-0402010004010100040201000443010000010601010006000000060c0100060000000603
-020201010301010102020603080009080800090208000901080009020800090108000901
-080109010800090208000908080009020800090108000902080009010800090008000900
-080009010800090208000901080009020800097e08000100090a01000905010009050100
-090501010904010009030100090501000902010009030101090201000907010009050101
-09030100090101000902010009060100091a0101090a0100090301000905010009020100
-090301010902010009070100090501010903010009010100090201000916010109080100
-090201000901010009020100090101000901010109010100090201000908010009020100
-090101000902010009010100090701000903010009020100090101000973010109080100
-0902010009010100090201000943010106000000060c0100060000000602020201010303
-010102020605000001000408010004020100040301000403010004020100040101000402
-010004010100040c01000402010004010100040201000401010004020100040101000402
-010004010100040001000400010004010100040001000400010004050100040101000408
-010004020100040201000402010004010100044400010602010006000000060a01000600
-000006040202010103010101020206030800090908020903080209030801090008000902
-08020909080009020800090208030901080009000800090008000902080209030802097f
-08000100090a010009030104090101040903010109050100090201040902010209040101
-090201040903010009050101090401010902010009070100091a0101090b010009020104
-090201020904010109020104090301000905010109040101090201000917010109090102
-09030102090301010900010009020102090a010209030102090201000907010009040102
-09020100097301010909010209030102094401000600010006000000060a010006000000
-060302020101030301010202060501000001040701000402010004030100040301000402
-01000401010404010100040c010004020100040101000402010004010100040201000401
-010404010100040001020401010004000100040001000402010304010100040801000402
-010404020100040101000443010000010601010006000000060c01000600000006030202
-0101030101010202060308000923080509a108000100090a010009140100090601000931
-010009080100091a0101090c010009310100091801010923010509990101095801010600
-0000060c0100060000000602020201010303010102020605000001000408010004020100
-0403010004030100040201000401010004050100040c0100040201000401010004020100
-040101000402010004010100040501000405010004000100040001000401010004020100
-0401010004080100040201000407010004000100044400010602010006000000060a0100
-060000000604020201010301010102020603080009cb08000100090b0101091001010942
-0101091b01010959010109c30101095801000600010006000000060a0100060000000603
-020201010303010102020605010000010407010004020100040301000403010004020100
-040101000402010004010100040c01000402010004010100040201000401010004010101
-040101000402010004020100040101000401010004000100040001000401010004020100
-04010100040801000402010004020100040301010444010000010601010006000000060c
-0100060000000603020201010301010102020603080009cb080001000981010109590101
-09c301010958010106000000060c01000600000006020202010103030101020206050000
-0100040901020405010104010100040201000402010204020100040c0100040201000402
-010204030101040001000402010204040101040201000400010004000100040201030401
-0100040801000403010204050100044500010602010006000000060a0100060000000604
-020201010301010102020603080009cb08000100098101010959010109c3010109580100
-0600010006000000060a0100060000000603020201010303010102020605010000010429
-0105044a01000444010000010601010006000000060c0100060000000603020201010301
-010102020603080009cb08000100098101010959010109c301010958010106000000060c
-010006000000060202020101030301010202060500000100047801000400010004460001
-0602010006000000060a0100060000000604020201010301010102020603080009cb0800
-0100098101010959010109c30101095801000600010006000000060a0100060000000603
-02020101030301010202060501000001047801000446010000010601010006000000060c
-0100060000000603020201010301010102020603080009cb080001000981010109590101
-09c301010958010106000000060c01000600000006020202010103030101020206050000
-010004c200010602010006000000060a0100060000000604020201010301010102020603
-08cd01ff01ff01000600010006000000060a010006000000060302020101030301010202
-060501000001040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000400
-010004000100040001000400010004000100040001000400010004000100040001000001
-0601010006000000060c010006000000060302020101030101010202060308cd01ff01ff
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a0100060000000604020201010301010102020603080009cb08000100
-098101010959010109c30101095801000600010006000000060a01000600000006030202
-01010303010102020605010000c50601010006000000060c010006000000060302020101
-0301010102020603080009cb08000100090b0101094e0101092201010959010109c30101
-0958010106000000060c01000600000006020202010103030101020206050000010000c4
-0602010006000000060a0100060000000604020201010301010102020603080009cb0800
-0100090a010009150100093101000908010009210101090c0100093101000918010109c3
-0101095801000600010006000000060a0100060000000603020201010303010102020605
-010000c50601010006000000060c01000600000006030202010103010101020206030800
-091d08000908080009a208000100090a010009040102090c01000903010209030102090b
-010009030104090a0101090201000907010009210101090b01000903010209030102090b
-010009030104090a0101090201000917010109180100090a010009220102097701010909
-0102094b010106000000060c010006000000060202020101030301010202060500000100
-00c40602010006000000060a01000600000006040202010103010101020206030800091d
-080009ac08000100090a01000903010009020100090a0100090301000902010009010100
-090201000909010109030100090201000909010009010100090201000906010009210101
-090a01000903010009020100090101000902010009090101090301000902010009090100
-09010100090201000916010109180100090a010009240100097701010908010009020100
-094a01000600010006000000060a01000600000006030202010103030101020206050100
-00c50601010006000000060c010006000000060302020101030101010202060308000909
-080209030802090308020902080009010800090308020903080209030802099408000100
-090a01000903010009020100090901000908010009010100090c01000900010009070100
-0909010009010100090301000905010009210101090901000908010009010100090c0100
-090001000907010009090100090101000903010009150101090801000900010109030102
-090201040908010009010100090301020902010009000101090201000900010109030102
-0905010009770101090c0100094a010106000000060c0100060000000602020201010303
-0101020206050000010000c40602010006000000060a0100060000000604020201010301
-010102020603080009080800090208000901080009020800090108000902080009010800
-090008000906080009020800090208000901080009020800099308000100090a01000903
-010009020100090801000909010009010100090e010009060100090a0100090101000904
-01000904010009210101090801000909010009010100090e010009060100090a01000901
-010009040100091401010908010109010100090101000902010009030100090a01000900
-010009030100090201000901010109010100090101010901010009010100090201000904
-010009770101090c0100094a01000600010006000000060a010006000000060302020101
-0303010102020605010000c50601010006000000060c0100060000000603020201010301
-010102020603080009080800090508000902080009010800090208000901080109070800
-090208000902080009010800099708000100090801010905010209080100090901000902
-0103090b010009060100090a0100090101000905010009040101091f0101090701000909
-010009020103090b010009060100090a0100090101000905010009130101090801000902
-0100090101000902010009030100090a0101090401000902010009010100090501000902
-010009010100090201000904010009770101090b0100094b010106000000060c01000600
-000006020202010103030101020206050000010000c40602010006000000060a01000600
-000006040202010103010101020206030800090808000905080009020800090108000902
-080009010801090708000902080409020802099408000100090a01000903010009020100
-09080100090701000903010009020100090a010009060100090a01000901010009040100
-090401000921010109080100090701000903010009020100090a010009060100090a0100
-09010100090401000914010109080100090201000901010409030100090a010109040104
-090101000905010009020100090101040904010009770101090a0100094c010006000100
-06000000060a0100060000000603020201010303010102020605010000c5060101000600
-0000060c0100060000000603020201010301010102020603080009080800090508000902
-080009010800090208000901080009000800090608000902080009090800099308000100
-090a0100090301000902010009090100090501000904010009020100090a010009050100
-090b01000901010009030100090501000921010109090100090501000904010009020100
-090a010009050100090b0100090101000903010009150101090801000902010009010100
-09070100090a010009000100090301000905010009050100090201000901010009080100
-0977010109090100094d010106000000060c010006000000060202020101030301010202
-06050000010000c40602010006000000060a010006000000060402020101030101010202
-060308000908080009020800090108000902080009010800090208000901080009010800
-0905080009020800090208000901080009020800099308000100090a0100090301000902
-010009030101090401000903010009050100090201000903010109040100090501000905
-01010903010009010100090201000906010009210101090a010009030100090501000902
-010009030101090401000905010009050101090301000901010009020100091601010908
-010009020100090101000902010009030100090a01000901010009020100090201000901
-010009050100090201000901010009020100090401000977010109080100094e01000600
-010006000000060a0100060000000603020201010303010102020605010000c506010100
-06000000060c010006000000060302020101030101010202060308000909080209030802
-090308020902080009020800090408000903080209030802099408000100090a01000904
-010209040101090501000902010409020102090401010902010409030100090501010904
-0101090201000907010009210101090b0100090201040902010209040101090201040903
-010009050101090401010902010009170101090801000902010009020102090501010908
-010009020100090201020902010009050100090201000902010209050100097701010908
-0104094a010106000000060c010006000000060202020101030301010202060500000100
-00c40602010006000000060a0100060000000604020201010301010102020603080009cb
-08000100090a0100090d010009060100093101000908010009210101090c010009310100
-09180101091c010509a00101095801000600010006000000060a01000600000006030202
-01010303010102020605010000c50601010006000000060c010006000000060302020101
-0301010102020603080009cb08000100090b010109090101094201010922010109590101
-09c301010958010106000000060c01000600000006020202010103030101020206050000
-010000c40602010006000000060a01000600000006040202010103010101020206030800
-09cb08000100098101010959010109c30101095801000600010006000000060a01000600
-00000603020201010303010102020605010000c50601010006000000060c010006000000
-0603020201010301010102020603080009cb08000100098101010959010109c301010958
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a0100060000000604020201010301010102020603080009cb08000100
-098101010959010109c30101095801000600010006000000060a01000600000006030202
-01010303010102020605010000c50601010006000000060c010006000000060302020101
-0301010102020603080009cb08000100098101010959010109c301010958010106000000
-060c01000600000006020202010103030101020206050000010000c40602010006000000
-060a0100060000000604020201010301010102020603080009cb08000100098101010959
-010109c30101095801000600010006000000060a01000600000006030202010103030101
-02020605010000c50601010006000000060c010006000000060302020101030101010202
-060308cd01ff01ff010106000000060c0100060000000602020201010303010102020605
-0000010000c40602010006000000060a0100060000000604020201010301010102020603
-01ff01ff01ce0600010006000000060a0100060000000603020201010303010102020605
-010000c50601010006000000060c01000600000006030202010103010101020206030100
-00cb0101008101010059010100c301010058010106000000060c01000600000006020202
-010103030101020206050000010000c40602010006000000060a01000600000006040202
-01010301010102020603010000cb0101008101010059010100c301010058010006000100
-06000000060a0100060000000603020201010303010102020605010000c5060101000600
-0000060c0100060000000603020201010301010102020603010000cb010100810101000c
-0100003101000018010100c301010058010106000000060c010006000000060202020101
-03030101020206050000010000c40602010006000000060a010006000000060402020101
-030101010202060301000010010200090100000d0102000a010200100100007b01010081
-0101000b01000003010200030102000b010000050100000c010100020100001701010010
-010200090100000d010200930101000a0101004b01000600010006000000060a01000600
-00000603020201010303010102020605010000c50601010006000000060c010006000000
-060302020101030101010202060301000012010000090100000f0100000c010000100100
-007b010100810101000a0100000301000002010000010100000201000009010100040101
-000b01000001010000020100001601010012010000090100000f01000093010100090100
-00010100004a010106000000060c01000600000006020202010103030101020206050000
-010000c40602010006000000060a01000600000006040202010103010101020206030100
-0009010100000100000401000003010200020100000001010003010200050100000c0100
-000301020003010200020100000101000003010200710101008101010009010000080100
-00010100000c0100000001000003010000000100000b0100000101000003010000150101
-000901010000010000040100000301020002010000000101000301020005010000090100
-0000010100030102000201010000010000030102000a0102000301020002010000000101
-0002010000020100000201020002010000000101003f01010009010000010100004a0100
-0600010006000000060a0100060000000603020201010303010102020605010000c50601
-010006000000060c01000600000006030202010103010101020206030100000801000001
-01010004010000020100000201000001010100010100000101000002010000040100000c
-010000020100000201000001010000020100000101000000010000030100000201000070
-010100810101000801000009010000010100000e010000050100000b0100000101000004
-010000140101000801000001010100040100000201000002010000010101000101000001
-010000020100000401000009010100010100000101000002010000010100000001000000
-010000010100000201000008010000020100000101000002010000010101000101000001
-01000002010000010100000201000001010100010100003e01010009010000010100004a
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a01000600000006040202010103010101020206030100000801000002
-010000040100000201000002010000010100000201000005010000040100000c01000002
-010000020100000101000005010100040100007401010081010100070100000901000002
-0103000b010000050100000b010000010100000501000013010100080100000201000004
-010000020100000201000001010000020100000501000004010000090100000201000005
-010000010100000001000000010000010100000201000008010000050100000201000001
-01000005010000020100000101000002010000010100004201010009010000010100004a
-01000600010006000000060a0100060000000603020201010303010102020605010000c5
-0601010006000000060c0100060000000603020201010301010102020603010000080100
-0002010000040100000201000002010000010100000201000002010300040100000c0100
-000201000002010000010100000501010005010200710101008101010008010000070100
-0003010000020100000a010000050100000b010000010100000401000014010100080100
-000201000004010000020100000201000001010000020100000201030004010000090100
-000201000002010300010100000001000000010000010104000901020002010400010100
-00060100000001000002010400010100004201010009010000010100004a010106000000
-060c01000600000006020202010103030101020206050000010000c40602010006000000
-060a01000600000006040202010103010101020206030100000801000002010000040100
-00020100000201000001010000020100000101000002010000040100000c010000020100
-000201000001010000050100000001000007010000700101008101010009010000050100
-0004010000020100000a010000050100000b010000010100000301000015010100080100
-000201000004010000020100000201000001010000020100000101000002010000040100
-000901000002010000010100000201000001010000000100000001000001010000100100
-000101000005010000060100000001000002010000050100004201010009010000010100
-004a01000600010006000000060a01000600000006030202010103030101020206050100
-00c50601010006000000060c010006000000060302020101030101010202060301000008
-010000010101000401000002010000020100000101010001010000010100000201000004
-0100000c0100000201000002010000010100000201000001010000010100000201000002
-01000070010100810101000a010000030100000501000002010000030101000401000005
-010000050101000301000001010000020100001601010008010000010101000401000002
-010000020100000101010001010000010100000201000004010000090100000201000001
-010000020100000101000000010000000100000101000002010000080100000201000001
-010000020100000101000007010000030100000201000001010000420101000901000001
-0100004a010106000000060c010006000000060202020101030301010202060500000100
-00c40602010006000000060a010006000000060402020101030101010202060301000009
-010100000100000401000003010200020100000001010003010300040100000c01000003
-0102000301020002010000020100000201020071010100810101000b0100000201040002
-010200040101000201040001010400030101000401010002010000170101000901010000
-010000040100000301020002010000000101000301030004010000090100000201000002
-010300010100000001000000010000020102000a01020003010200020100000701000004
-01020002010000420101000a0101004b01000600010006000000060a0100060000000603
-020201010303010102020605010000c50601010006000000060c01000600000006030202
-010103010101020206030100000c0100002301050093010100810101000c010000310100
-00180101000c010000230105001c0105006801010058010106000000060c010006000000
-06020202010103030101020206050000010000c40602010006000000060a010006000000
-06040202010103010101020206030100000801000002010000bd01010081010100590101
-000801000002010000b50101005801000600010006000000060a01000600000006030202
-01010303010102020605010000c50601010006000000060c010006000000060302020101
-030101010202060301000009010200be010100810101005901010009010200b601010058
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a0100060000000604020201010301010102020603010000cb01010081
-01010059010100c30101005801000600010006000000060a010006000000060302020101
-0303010102020605010000c50601010006000000060c0100060000000603020201010301
-010102020603010000cb0101008101010059010100c301010058010106000000060c0100
-0600000006020202010103030101020206050000010000c40602010006000000060a0100
-060000000604020201010301010102020603010000cb0101008101010059010100c30101
-005801000600010006000000060a01000600000006030202010103030101020206050100
-00c50601010006000000060c0100060000000603020201010301010102020603010000cb
-0101008101010059010100c301010058010106000000060c010006000000060202020101
-03030101020206050000010000c40602010006000000060a010006000000060402020101
-030101010202060301ff01ff01ce0600010006000000060a010006000000060302020101
-0303010102020605010000c50601010006000000060c0100060000000603020201010301
-01010202060301ff01ff01cf06000000060c010006000000060202020101030301010202
-06050000010000c40602010006000000060a010006000000060402020101030101010202
-0603010000cb0101008101010059010100c30101005801000600010006000000060a0100
-060000000603020201010303010102020605010000c50601010006000000060c01000600
-00000603020201010301010102020603010000cb0101008101010059010100c301010058
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a0100060000000604020201010301010102020603010000cb01010081
-0101000c0100003101000018010100c30101005801000600010006000000060a01000600
-00000603020201010303010102020605010000c50601010006000000060c010006000000
-060302020101030101010202060301000010010200090100000d0102009b010100810101
-000b01000003010200030102000b010000050100000c0101000201000017010100100102
-00090100000d010200930101000a0101004b010106000000060c01000600000006020202
-010103030101020206050000010000c40602010006000000060a01000600000006040202
-0101030101010202060301000012010000090100000f0100009b010100810101000a0100
-000301000002010000010100000201000009010100040101000b01000001010000020100
-001601010012010000090100000f0100009301010009010000010100004a010006000100
-06000000060a0100060000000603020201010303010102020605010000c5060101000600
-0000060c0100060000000603020201010301010102020603010000090101000001000004
-010000030102000201000000010100030102000501000009010000000101000301020002
-01010000010000030102000301020071010100810101000901000008010000010100000c
-0100000001000003010000000100000b0100000101000003010000150101000901010000
-010000040100000301020002010000000101000301020005010000090100000001010003
-0102000201010000010000030102000a0102000301020002010000000101000201000002
-0100000201020002010000000101003f01010009010000010100004a010106000000060c
-01000600000006020202010103030101020206050000010000c40602010006000000060a
-010006000000060402020101030101010202060301000008010000010101000401000002
-010000020100000101010001010000010100000201000004010000090101000101000001
-010000020100000101000000010000000100000101000002010000010100000201000070
-010100810101000801000009010000010100000e010000050100000b0100000101000004
-010000140101000801000001010100040100000201000002010000010101000101000001
-010000020100000401000009010100010100000101000002010000010100000001000000
-010000010100000201000008010000020100000101000002010000010101000101000001
-01000002010000010100000201000001010100010100003e01010009010000010100004a
-01000600010006000000060a0100060000000603020201010303010102020605010000c5
-0601010006000000060c0100060000000603020201010301010102020603010000080100
-000201000004010000020100000201000001010000020100000501000004010000090100
-000201000005010000010100000001000000010000010100000201000001010000740101
-00810101000701000009010000020103000b010000050100000b01000001010000050100
-001301010008010000020100000401000002010000020100000101000002010000050100
-000401000009010000020100000501000001010000000100000001000001010000020100
-000801000005010000020100000101000005010000020100000101000002010000010100
-004201010009010000010100004a010106000000060c0100060000000602020201010303
-0101020206050000010000c40602010006000000060a0100060000000604020201010301
-010102020603010000080100000201000004010000020100000201000001010000020100
-000201030004010000090100000201000002010300010100000001000000010000010104
-00020102007101010081010100080100000701000003010000020100000a010000050100
-000b01000001010000040100001401010008010000020100000401000002010000020100
-000101000002010000020103000401000009010000020100000201030001010000000100
-000001000001010400090102000201040001010000060100000001000002010400010100
-004201010009010000010100004a01000600010006000000060a01000600000006030202
-01010303010102020605010000c50601010006000000060c010006000000060302020101
-030101010202060301000008010000020100000401000002010000020100000101000002
-010000010100000201000004010000090100000201000001010000020100000101000000
-010000000100000101000009010000700101008101010009010000050100000401000002
-0100000a010000050100000b010000010100000301000015010100080100000201000004
-010000020100000201000001010000020100000101000002010000040100000901000002
-010000010100000201000001010000000100000001000001010000100100000101000005
-010000060100000001000002010000050100004201010009010000010100004a01010600
-0000060c01000600000006020202010103030101020206050000010000c4060201000600
-0000060a0100060000000604020201010301010102020603010000080100000101010004
-010000020100000201000001010100010100000101000002010000040100000901000002
-010000010100000201000001010000000100000001000001010000020100000101000002
-01000070010100810101000a010000030100000501000002010000030101000401000005
-010000050101000301000001010000020100001601010008010000010101000401000002
-010000020100000101010001010000010100000201000004010000090100000201000001
-010000020100000101000000010000000100000101000002010000080100000201000001
-010000020100000101000007010000030100000201000001010000420101000901000001
-0100004a01000600010006000000060a0100060000000603020201010303010102020605
-010000c50601010006000000060c01000600000006030202010103010101020206030100
-000901010000010000040100000301020002010000000101000301030004010000090100
-000201000002010300010100000001000000010000020102000301020071010100810101
-000b01000002010400020102000401010002010400010104000301010004010100020100
-001701010009010100000100000401000003010200020100000001010003010300040100
-00090100000201000002010300010100000001000000010000020102000a010200030102
-0002010000070100000401020002010000420101000a0101004b010106000000060c0100
-0600000006020202010103030101020206050000010000c40602010006000000060a0100
-0600000006040202010103010101020206030100000c0100002301050093010100810101
-000c01000031010000180101000c010000230105001c0105006801010058010006000100
-06000000060a0100060000000603020201010303010102020605010000c5060101000600
-0000060c01000600000006030202010103010101020206030100000801000002010000bd
-01010081010100590101000801000002010000b501010058010106000000060c01000600
-000006020202010103030101020206050000010000c40602010006000000060a01000600
-0000060402020101030101010202060301000009010200be010100810101005901010009
-010200b60101005801000600010006000000060a01000600000006030202010103030101
-02020605010000c50601010006000000060c010006000000060302020101030101010202
-0603010000cb0101008101010059010100c301010058010106000000060c010006000000
-06020202010103030101020206050000010000c40602010006000000060a010006000000
-0604020201010301010102020603010000cb0101008101010059010100c3010100580100
-0600010006000000060a0100060000000603020201010303010102020605010000c50601
-010006000000060c0100060000000603020201010301010102020603010000cb01010081
-01010059010100c301010058010106000000060c01000600000006020202010103030101
-020206050000010000c40602010006000000060a01000600000006040202010103010101
-02020603010000cb0101008101010059010100c30101005801000600010006000000060a
-0100060000000603020201010303010102020605010000c50601010006000000060c0100
-06000000060302020101030101010202060301ff01ff01cf06000000060c010006000000
-06020202010103030101020206050000010000c40602010006000000060a010006000000
-060402020101030101010202060301ff01ff01ce0600010006000000060a010006000000
-0603020201010303010102020605010000c50601010006000000060c0100060000000603
-020201010301010102020603010000cb0101008101010059010100c30101005801010600
-0000060c01000600000006020202010103030101020206050000010000c4060201000600
-0000060a0100060000000604020201010301010102020603010000cb0101008101010059
-010100c30101005801000600010006000000060a01000600000006030202010103030101
-02020605010000c50601010006000000060c010006000000060302020101030101010202
-0603010000cb010100810101000c0100003101000018010100c301010058010106000000
-060c01000600000006020202010103030101020206050000010000c40602010006000000
-060a010006000000060402020101030101010202060301000010010200090100000d0102
-004301000056010100810101000b01000003010200030102000b010000050100000c0101
-00020100001701010010010200090100000d010200930101000a0101004b010006000100
-06000000060a0100060000000603020201010303010102020605010000c5060101000600
-0000060c010006000000060302020101030101010202060301000012010000090100000f
-0100004301000056010100810101000a0100000301000002010000010100000201000009
-010100040101000b01000001010000020100001601010012010000090100000f01000093
-01010009010000010100004a010106000000060c01000600000006020202010103030101
-020206050000010000c40602010006000000060a01000600000006040202010103010101
-020206030100000901010000010000040100000301020002010000000101000301020005
-010000090100000001010003010200020101000001000003010200030102000a01020002
-010000020100000101040054010100810101000901000008010000010100000c01000000
-01000003010000000100000b010000010100000301000015010100090101000001000004
-010000030102000201000000010100030102000501000009010000000101000301020002
-01010000010000030102000a010200030102000201000000010100020100000201000002
-01020002010000000101003f01010009010000010100004a01000600010006000000060a
-0100060000000603020201010303010102020605010000c50601010006000000060c0100
-060000000603020201010301010102020603010000080100000101010004010000020100
-000201000001010100010100000101000002010000040100000901010001010000010100
-000201000001010000000100000001000001010000020100000101000002010000080100
-000201000001010000020100000301000056010100810101000801000009010000010100
-000e010000050100000b0100000101000004010000140101000801000001010100040100
-000201000002010000010101000101000001010000020100000401000009010100010100
-000101000002010000010100000001000000010000010100000201000008010000020100
-000101000002010000010101000101000001010000020100000101000002010000010101
-00010100003e01010009010000010100004a010106000000060c01000600000006020202
-010103030101020206050000010000c40602010006000000060a01000600000006040202
-010103010101020206030100000801000002010000040100000201000002010000010100
-000201000005010000040100000901000002010000050100000101000000010000000100
-000101000002010000010100000c01000002010000020100000001000004010000560101
-00810101000701000009010000020103000b010000050100000b01000001010000050100
-001301010008010000020100000401000002010000020100000101000002010000050100
-000401000009010000020100000501000001010000000100000001000001010000020100
-000801000005010000020100000101000005010000020100000101000002010000010100
-004201010009010000010100004a01000600010006000000060a01000600000006030202
-01010303010102020605010000c50601010006000000060c010006000000060302020101
-030101010202060301000008010000020100000401000002010000020100000101000002
-010000020103000401000009010000020100000201030001010000000100000001000001
-010400020102000901040003010000050100005601010081010100080100000701000003
-010000020100000a010000050100000b0100000101000004010000140101000801000002
-010000040100000201000002010000010100000201000002010300040100000901000002
-010000020103000101000000010000000100000101040009010200020104000101000006
-0100000001000002010400010100004201010009010000010100004a010106000000060c
-01000600000006020202010103030101020206050000010000c40602010006000000060a
-010006000000060402020101030101010202060301000008010000020100000401000002
-010000020100000101000002010000010100000201000004010000090100000201000001
-010000020100000101000000010000000100000101000009010000080100000601000000
-010000040100005601010081010100090100000501000004010000020100000a01000005
-0100000b0100000101000003010000150101000801000002010000040100000201000002
-010000010100000201000001010000020100000401000009010000020100000101000002
-010000010100000001000000010000010100001001000001010000050100000601000000
-01000002010000050100004201010009010000010100004a01000600010006000000060a
-0100060000000603020201010303010102020605010000c50601010006000000060c0100
-060000000603020201010301010102020603010000080100000101010004010000020100
-000201000001010100010100000101000002010000040100000901000002010000010100
-000201000001010000000100000001000001010000020100000101000002010000080100
-000201000001010000020100000301000056010100810101000a01000003010000050100
-000201000003010100040100000501000005010100030100000101000002010000160101
-000801000001010100040100000201000002010000010101000101000001010000020100
-000401000009010000020100000101000002010000010100000001000000010000010100
-000201000008010000020100000101000002010000010100000701000003010000020100
-00010100004201010009010000010100004a010106000000060c01000600000006020202
-010103030101020206050000010000c40602010006000000060a01000600000006040202
-010103010101020206030100000901010000010000040100000301020002010000000101
-000301030004010000090100000201000002010300010100000001000000010000020102
-00030102000a01020002010000020100000401010054010100810101000b010000020104
-000201020004010100020104000101040003010100040101000201000017010100090101
-000001000004010000030102000201000000010100030103000401000009010000020100
-0002010300010100000001000000010000020102000a0102000301020002010000070100
-000401020002010000420101000a0101004b01000600010006000000060a010006000000
-0603020201010303010102020605010000c50601010006000000060c0100060000000603
-0202010103010101020206030100000c010000230105002301050069010100810101000c
-01000031010000180101000c010000230105001c0105006801010058010106000000060c
-01000600000006020202010103030101020206050000010000c40602010006000000060a
-01000600000006040202010103010101020206030100000801000002010000bd01010081
-010100590101000801000002010000b50101005801000600010006000000060a01000600
-00000603020201010303010102020605010000c50601010006000000060c010006000000
-060302020101030101010202060301000009010200be0101008101010059010100090102
-00b601010058010106000000060c01000600000006020202010103030101020206050000
-010000c40602010006000000060a01000600000006040202010103010101020206030100
-00cb0101008101010059010100c30101005801000600010006000000060a010006000000
-0603020201010303010102020605010000c50601010006000000060c0100060000000603
-020201010301010102020603010000cb0101008101010059010100c30101005801010600
-0000060c01000600000006020202010103030101020206050000010000c4060201000600
-0000060a0100060000000604020201010301010102020603010000cb0101008101010059
-010100c30101005801000600010006000000060a01000600000006030202010103030101
-02020605010000c50601010006000000060c010006000000060302020101030101010202
-0603010000cb0101008101010059010100c301010058010106000000060c010006000000
-06020202010103030101020206050000010000c40602010006000000060a010006000000
-060402020101030101010202060301ff01ff01ce0600010006000000060a010006000000
-0603020201010303010102020605010000c50601010006000000060c0100060000000603
-02020101030101010202060301ff01ff01cf06000000060c010006000000060202020101
-03030101020206050000010000c40602010006000000060a010006000000060402020101
-0301010102020603010000cb0101008101010059010100c3010100580100060001000600
-0000060a0100060000000603020201010303010102020605010000c50601010006000000
-060c0100060000000603020201010301010102020603010000cb01010081010100590101
-00c301010058010106000000060c01000600000006020202010103030101020206050000
-010000c40602010006000000060a01000600000006040202010103010101020206030100
-00cb010100810101000c0100003101000018010100c30101005801000600010006000000
-060a0100060000000603020201010303010102020605010000c50601010006000000060c
-01000600000006030202010103010101020206030100000b010000120100001f01000089
-010100810101000b01000003010200030102000b010000040102000b0101000201000017
-0101000b010000120100000e010000010100008f0101000a0101004b010106000000060c
-01000600000006020202010103030101020206050000010000c40602010006000000060a
-01000600000006040202010103010101020206030100001f0100001f0100008901010081
-0101000a0100000301000002010000010100000201000009010100030100000201000009
-0100000101000002010000160101001f0100000e010000010100008f0101000901000001
-0100004a01000600010006000000060a0100060000000603020201010303010102020605
-010000c50601010006000000060c01000600000006030202010103010101020206030100
-000901020002010000000101000301020002010400090102000301020003010200020100
-0000010100030102007f010100810101000901000008010000010100000c010000000100
-000701000009010000010100000301000015010100090102000201000000010100030102
-0002010400090101000001000001010000000101008c01010009010000010100004a0101
-06000000060c01000600000006020202010103030101020206050000010000c406020100
-06000000060a01000600000006040202010103010101020206030100000b010000020101
-00010100000101000002010000030100000a010000020100000101000002010000010100
-0002010000010101000101000001010000020100007e0101008101010008010000090100
-00010100000e01000007010000090100000101000004010000140101000b010000020101
-00010100000101000002010000030100000a0100000101010001010100010100008b0101
-0009010000010100004a01000600010006000000060a0100060000000603020201010303
-010102020605010000c50601010006000000060c01000600000006030202010103010101
-020206030100000b01000002010000020100000101000002010000030100000a01000009
-01000001010000050100000201000001010000020100007e010100810101000701000009
-010000020103000b010000060100000a0100000101000005010000130101000b01000002
-010000020100000101000002010000030100000a0100000201000001010000020100008b
-01010009010000010100004a010106000000060c01000600000006020202010103030101
-020206050000010000c40602010006000000060a01000600000006040202010103010101
-020206030100000b010000020100000201000001010400030100000a0100000601030001
-0100000501000002010000010104007e0101008101010008010000070100000301000002
-0100000a010000050100000b0100000101000004010000140101000b0100000201000002
-01000001010400030100000a0100000201000001010000020100008b0101000901000001
-0100004a01000600010006000000060a0100060000000603020201010303010102020605
-010000c50601010006000000060c01000600000006030202010103010101020206030100
-000b010000020100000201000001010000070100000a0100000501000002010000010100
-000501000002010000010100008201010081010100090100000501000004010000020100
-000a010000040100000c0100000101000003010000150101000b01000002010000020100
-0001010000070100000a0100000201000001010000020100008b01010009010000010100
-004a010106000000060c01000600000006020202010103030101020206050000010000c4
-0602010006000000060a01000600000006040202010103010101020206030100000b0100
-0002010000020100000101000002010000030100000a0100000201000001010000020100
-000101000002010000010100000201000001010000020100007e010100810101000a0100
-000301000005010000020100000301010004010000030100000701010003010000010100
-0002010000160101000b01000002010000020100000101000002010000030100000a0100
-000101010001010100010100008b01010009010000010100004a01000600010006000000
-060a0100060000000603020201010303010102020605010000c50601010006000000060c
-01000600000006030202010103010101020206030100000b010000020100000201000002
-010200050101000901020003010300020102000201000002010000020102007f01010081
-0101000b0100000201040002010200040101000201040001010400030101000401010002
-010000170101000b01000002010000020100000201020005010100090101000001000001
-010000000101008c0101000a0101004b010106000000060c010006000000060202020101
-03030101020206050000010000c40602010006000000060a010006000000060402020101
-030101010202060301000023010500a1010100810101000c010000310100001801010023
-010500990101005801000600010006000000060a01000600000006030202010103030101
-02020605010000c50601010006000000060c010006000000060302020101030101010202
-0603010000cb0101008101010059010100c301010058010106000000060c010006000000
-06020202010103030101020206050000010000c40602010006000000060a010006000000
-0604020201010301010102020603010000cb0101008101010059010100c3010100580100
-0600010006000000060a0100060000000603020201010303010102020605010000c50601
-010006000000060c0100060000000603020201010301010102020603010000cb01010081
-01010059010100c301010058010106000000060c01000600000006020202010103030101
-020206050000010000c40602010006000000060a01000600000006040202010103010101
-02020603010000cb0101008101010059010100c30101005801000600010006000000060a
-0100060000000603020201010303010102020605010000c50601010006000000060c0100
-060000000603020201010301010102020603010000cb0101008101010059010100c30101
-0058010106000000060c01000600000006020202010103030101020206050000010000c4
-0602010006000000060a0100060000000604020201010301010102020603010000cb0101
-008101010059010100c30101005801000600010006000000060a01000600000006030202
-01010303010102020605010000c50601010006000000060c010006000000060302020101
-030101010202060301ff01ff01cf06000000060c01000600000006020202010103030101
-020206050000010000c40602010006000000060a01000600000006040202010103010101
-0202060301ff01ff01ce0600010006000000060a01000600000006030202010103030101
-02020605010000c50601010006000000060c010006000000060302020101030101010202
-0603010000cb0101008101010059010100c301010058010106000000060c010006000000
-06020202010103030101020206050000010000c40602010006000000060a010006000000
-0604020201010301010102020603010000cb0101008101010059010100c3010100580100
-0600010006000000060a0100060000000603020201010303010102020605010000c50601
-010006000000060c0100060000000603020201010301010102020603010000cb01010081
-0101000c0100003101000018010100c301010058010106000000060c0100060000000602
-0202010103030101020206050000010000c40602010006000000060a0100060000000604
-0202010103010101020206030100000b010000120100000e010000010100009701010081
-0101000b01000003010200030102000b010000040102000b01010002010000170101000b
-010000120100000e010000010100008f0101000a01000004010200440100060001000600
-0000060a0100060000000603020201010303010102020605010000c50601010006000000
-060c01000600000006030202010103010101020206030100001f0100000e010000010100
-0097010100810101000a0100000301000002010000010100000201000009010100030100
-0002010000090100000101000002010000160101001f0100000e010000010100008f0101
-0009010100030100000201000043010106000000060c0100060000000602020201010303
-0101020206050000010000c40602010006000000060a0100060000000604020201010301
-010102020603010000090102000201000000010100030102000201040009010100000100
-00010100000001010094010100810101000901000008010000010100000c010000000100
-000701000009010000010100000301000015010100090102000201000000010100030102
-0002010400090101000001000001010000000101008c0101000801000000010000030100
-00020100004301000600010006000000060a010006000000060302020101030301010202
-0605010000c50601010006000000060c0100060000000603020201010301010102020603
-0100000b01000002010100010100000101000002010000030100000a0100000101010001
-0101000101000093010100810101000801000009010000010100000e0100000701000009
-0100000101000004010000140101000b0100000201010001010000010100000201000003
-0100000a0100000101010001010100010100008b0101000a010000030100000201000043
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a01000600000006040202010103010101020206030100000b01000002
-010000020100000101000002010000030100000a01000002010000010100000201000093
-010100810101000701000009010000020103000b010000060100000a0100000101000005
-010000130101000b01000002010000020100000101000002010000030100000a01000002
-01000001010000020100008b0101000a010000040103004301000600010006000000060a
-0100060000000603020201010303010102020605010000c50601010006000000060c0100
-0600000006030202010103010101020206030100000b0100000201000002010000010104
-00030100000a010000020100000101000002010000930101008101010008010000070100
-0003010000020100000a010000050100000b0100000101000004010000140101000b0100
-00020100000201000001010400030100000a0100000201000001010000020100008b0101
-000a0100000701000043010106000000060c010006000000060202020101030301010202
-06050000010000c40602010006000000060a010006000000060402020101030101010202
-06030100000b010000020100000201000001010000070100000a01000002010000010100
-00020100009301010081010100090100000501000004010000020100000a010000040100
-000c0100000101000003010000150101000b010000020100000201000001010000070100
-000a0100000201000001010000020100008b0101000a0100000701000043010006000100
-06000000060a0100060000000603020201010303010102020605010000c5060101000600
-0000060c01000600000006030202010103010101020206030100000b0100000201000002
-0100000101000002010000030100000a0100000101010001010100010100009301010081
-0101000a0100000301000005010000020100000301010004010000030100000701010003
-0100000101000002010000160101000b0100000201000002010000010100000201000003
-0100000a0100000101010001010100010100008b0101000a010000030100000201000043
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a01000600000006040202010103010101020206030100000b01000002
-010000020100000201020005010100090101000001000001010000000101009401010081
-0101000b0100000201040002010200040101000201040001010400030101000401010002
-010000170101000b01000002010000020100000201020005010100090101000001000001
-010000000101008c01010008010400020102004401000600010006000000060a01000600
-00000603020201010303010102020605010000c50601010006000000060c010006000000
-060302020101030101010202060301000023010500a1010100810101000c010000310100
-0018010100230105009901010058010106000000060c0100060000000602020201010303
-0101020206050000010000c40602010006000000060a0100060000000604020201010301
-010102020603010000cb0101008101010059010100c30101005801000600010006000000
-060a0100060000000603020201010303010102020605010000c50601010006000000060c
-0100060000000603020201010301010102020603010000cb0101008101010059010100c3
-01010058010106000000060c010006000000060202020101030301010202060500000100
-00c40602010006000000060a0100060000000604020201010301010102020603010000cb
-0101008101010059010100c30101005801000600010006000000060a0100060000000603
-020201010303010102020605010000c50601010006000000060c01000600000006030202
-01010301010102020603010000cb0101008101010059010100c301010058010106000000
-060c01000600000006020202010103030101020206050000010000c40602010006000000
-060a0100060000000604020201010301010102020603010000cb01010081010100590101
-00c30101005801000600010006000000060a010006000000060302020101030301010202
-0605010000c50601010006000000060c0100060000000603020201010301010102020603
-010000cb0101008101010059010100c301010058010106000000060c0100060000000602
-0202010103030101020206050000010000c40602010006000000060a0100060000000604
-02020101030101010202060301ff01ff01ce0600010006000000060a0100060000000603
-020201010303010102020605010000c50601010006000000060c01000600000006030202
-0101030101010202060301ff01ff01cf06000000060c0100060000000602020201010303
-0101020206050000010000c40602010006000000060a0100060000000604020201010301
-010102020603010000cb0101008101010059010100c30101005801000600010006000000
-060a0100060000000603020201010303010102020605010000c50601010006000000060c
-0100060000000603020201010301010102020603010000cb0101008101010059010100c3
-01010058010106000000060c010006000000060202020101030301010202060500000100
-00c40602010006000000060a0100060000000604020201010301010102020603010000cb
-010100810101000c0100003101000018010100c30101005801000600010006000000060a
-0100060000000603020201010303010102020605010000c50601010006000000060c0100
-0600000006030202010103010101020206030100000b010000120100000a010000150100
-0087010100810101000b01000003010200030102000b010000040102000b010100020100
-00170101000b010000120100000e010000010100008f0101000c0100004a010106000000
-060c01000600000006020202010103030101020206050000010000c40602010006000000
-060a01000600000006040202010103010101020206030100001f0100000a010000150100
-0087010100810101000a0100000301000002010000010100000201000009010100030100
-0002010000090100000101000002010000160101001f0100000e010000010100008f0101
-000b0101004a01000600010006000000060a010006000000060302020101030301010202
-0605010000c50601010006000000060c0100060000000603020201010301010102020603
-010000090102000201000000010100030102000201040008010000000101000301020003
-01020002010400020102007f010100810101000901000008010000010100000c01000000
-010000070100000901000001010000030100001501010009010200020100000001010003
-01020002010400090101000001000001010000000101008c0101000a010000000100004a
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a01000600000006040202010103010101020206030100000b01000002
-010100010100000101000002010000030100000a01010001010000010100000201000001
-010000020100000301000003010000020100007e01010081010100080100000901000001
-0100000e01000007010000090100000101000004010000140101000b0100000201010001
-0100000101000002010000030100000a0100000101010001010100010100008b01010009
-010000010100004a01000600010006000000060a01000600000006030202010103030101
-02020605010000c50601010006000000060c010006000000060302020101030101010202
-06030100000b01000002010000020100000101000002010000030100000a010000020100
-000101000002010000010100000701000003010000820101008101010007010000090100
-00020103000b010000060100000a0100000101000005010000130101000b010000020100
-00020100000101000002010000030100000a0100000201000001010000020100008b0101
-0008010000020100004a010106000000060c010006000000060202020101030301010202
-06050000010000c40602010006000000060a010006000000060402020101030101010202
-06030100000b010000020100000201000001010400030100000a01000002010000010100
-00020100000201020004010000040102007f010100810101000801000007010000030100
-00020100000a010000050100000b0100000101000004010000140101000b010000020100
-000201000001010400030100000a0100000201000001010000020100008b010100080100
-00020100004a01000600010006000000060a010006000000060302020101030301010202
-0605010000c50601010006000000060c0100060000000603020201010301010102020603
-0100000b010000020100000201000001010000070100000a010000020100000101000002
-0100000501000003010000070100007e0101008101010009010000050100000401000002
-0100000a010000040100000c0100000101000003010000150101000b0100000201000002
-01000001010000070100000a0100000201000001010000020100008b0101000801050049
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000000060a01000600000006040202010103010101020206030100000b01000002
-010000020100000101000002010000030100000a01000002010000010100000201000001
-010000020100000301000003010000020100007e010100810101000a0100000301000005
-010000020100000301010004010000030100000701010003010000010100000201000016
-0101000b01000002010000020100000101000002010000030100000a0100000101010001
-010100010100008b0101000c0100004a01000600010006000000060a0100060000000603
-020201010303010102020605010000c50601010006000000060c01000600000006030202
-010103010101020206030100000b01000002010000020100000201020005010100080100
-0002010000020102000301020005010100020102007f010100810101000b010000020104
-0002010200040101000201040001010400030101000401010002010000170101000b0100
-0002010000020100000201020005010100090101000001000001010000000101008c0101
-000c0100004a010106000000060c01000600000006020202010103030101020206050000
-010000c40602010006000000060a01000600000006040202010103010101020206030100
-0023010500a1010100810101000c01000031010000180101002301050099010100580100
-0600010006000000060a0100060000000603020201010303010102020605010000c50601
-010006000000060001000600010006000100060001000600010006000100060001000600
-00000603020201010301010102020603010000cb0101008101010059010100c301010058
-010106000000060c01000600000006020202010103030101020206050000010000c40602
-010006000100060001000600010006000100060001000600010006000100060000000604
-020201010301010102020603010000cb0101008101010059010100c30101005801000600
-010006000000060a0100060000000603020201010303010102020605010000c506010100
-0600040e060000000603020201010301010102020603010000cb01010081010100590101
-00c301010058010106000000060c01000600000006020202010103030101020206050000
-010000c40602010006000000060000000600000006000000060000000600000006000000
-060000000604020201010301010102020603010000cb0101008101010059010100c30101
-005801000600010006000000060a01000600000006030202010103030101020206050100
-00c506010100060004000600000006000000060000000600000006000000060000000600
-0100060000000603020201010301010102020603010000cb0101008101010059010100c3
-01010058010106000000060c010006000000060202020101030301010202060500000100
-00c40602010004000000060a0100040000000604020201010301010102020603010000cb
-0101008101010059010100c30101005801000600010006000000060a0100060000000603
-020201010303010102020605010000c50601010006000401000006080100060004000600
-0000060302020101030101010202060301ff01ff01cf06000000060c0100060000000602
-0202010103030101020206050000010000c4060201000401060000000606010006000401
-0000060402020101030101010202060301ff01ff01ce0600010006000000060a01000600
-00000603020201010303010102020605010000c506010100060004020600000006060100
-0401060000000603020201010301010102020603010000cb0101008101010059010100c3
-01010058010106000000060c010006000000060202020101030301010202060500000100
-00c4060201000402000006060100040200000604020201010301010102020603010000cb
-0101008101010059010100c30101005801000600010006000000060a0100060000000603
-020201010303010102020605010000c50601010006000403000006040100060004020600
-00000603020201010301010102020603010000cb010100810101000c0100003101000018
-010100c301010058010106000000060c0100060000000602020201010303010102020605
-0000010000c4060201000403060000000602010006000403000006040202010103010101
-0202060301000028010000040100000b0100008e010100810101000b0100000301020003
-0102000b010000030104000a0101000201000017010100180100000a0100002201020077
-0101000a0100004c01000600010006000000060a01000600000006030202010103030101
-02020605010000c506010100060004040600000006020100040306000000060302020101
-030101010202060301000028010000110100008e010100810101000a0100000301000002
-010000010100000201000009010100030100000201000009010000010100000201000016
-010100180100000a0100002401000077010100090101004c010106000000060c01000600
-000006020202010103030101020206050000010000c40602010004040000060201000404
-00000604020201010301010102020603010000090102000201000002010000020102000a
-010100000100000201020003010200020104008c01010081010100090100000801000001
-0100000c0100000001000007010000090100000101000003010000150101000801000000
-010100030102000201040008010000010100000301020002010000000101000201000000
-01010003010200050100007701010008010000000100004c01000600010006000000060a
-0100060000000603020201010303010102020605010000c5060101000600040500000600
-010006000404060000000603020201010301010102020603010000080100000201000001
-010000020100000101000002010000080100000101010004010000020100000201000003
-0100008e010100810101000801000009010000010100000e010000060100000a01000001
-010000040100001401010008010100010100000101000002010000030100000a01000000
-010000030100000201000001010100010100000101010001010000010100000201000004
-010000770101000a0100004c010106000000060c01000600000006020202010103030101
-020206050000010000c40602010004050600010006000405000006040202010103010101
-02020603010000080100000601000001010000010100000c010000020100000401000002
-010000070100008e010100810101000701000009010000020103000b010000060100000a
-01000001010000050100001301010008010000020100000101000002010000030100000a
-010100040100000201000001010000050100000201000001010000020100000401000077
-0101000a0100004c01000600010006000000060a01000600000006030202010103030101
-02020605010000c506010100060004060600010004050600000006030202010103010101
-020206030100000901020003010000010100000201020009010000020100000401000003
-010200040100008e01010081010100080100000701000003010000020100000a01000006
-0100000a010000010100000401000014010100080100000201000001010400030100000a
-010100040104000101000005010000020100000101040004010000770101000a0100004c
-010106000000060c010006000000060202020101030301010202060500c6060201000406
-01000406000006040202010103010101020206030100000c010000030100000001000005
-01000008010000020100000401000006010000030100008e010100810101000901000005
-01000004010000020100000a010000050100000b01000001010000030100001501010008
-0100000201000001010000070100000a0100000001000003010000050100000501000002
-0100000101000008010000770101000a0100004c01000600010006000000060a01000600
-000006030202010103030101020206ce0100060000000600000006000000060000000600
-000006000000060000000600000006000000060302020101030101010202060301000008
-010000020100000301010002010000020100000801000001010100040100000201000002
-010000030100008e010100810101000a0100000301000005010000020100000301010004
-010000050100000501010003010000010100000201000016010100080100000201000001
-01000002010000030100000a010000010100000201000002010000010100000501000002
-010000010100000201000004010000770101000a0100004c010106000000060c01000600
-000006020202010103030101020206cf0000060000000600000006000000060000000600
-000006000000060000000600000006040202010103010101020206030100000901020005
-010000030102000a010100000100000401000003010200050101008c010100810101000b
-010000020104000201020004010100020104000301000005010100040101000201000017
-010100080100000201000002010200050101000801000002010000020102000201000005
-01000002010000020102000501000077010100080104004a01000600010006000000060a
-010006000000060302020101030301010202060401000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000613
-0202010103010101020206030100001201000008010500a8010100810101000c01000031
-010000180101001c010500a001010058010106000000060c010006000000060202020101
-030301010202060301000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600000006120202010103010101
-020206030100000f01000000010000b80101008101010059010100c30101005801000600
-010006000000060a01000600000006030202010103030101020206040100040d06000400
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600040006000000040c00000613020201010301
-01010202060301000010010000b90101008101010059010100c301010058010106000000
-060c010006000000060202020101030301010202060301000600040b0000060001000400
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-00000600000006000000060000000600010004000000060000000600040a060000000612
-020201010301010102020603010000cb0101008101010059010100c30101005801000600
-010006000000060a01000600000006030202010103030101020206040100040906000000
-06000100060004000600000006a601000600040006000000060000000600000004080000
-0613020201010301010102020603010000cb0101008101010059010100c3010100580101
-06000000060c010006000000060202020101030301010202060301000600040700000600
-0000060201000400000006a8010004000000060200000600000006000406060000000612
-020201010301010102020603010000cb0101008101010059010100c30101005801000600
-010006000000060a01000600000006030202010103030101020206040100040506000000
-0600000006020100060004000600000006a6010006000400060000000604000006000000
-040400000613020201010301010102020603010000cb0101008101010059010100c30101
-0058010106000000060c0100060000000602020201010303010102020603010006000403
-000006000000060601000400000006a80100040000000606000006000000060004020600
-0000061202020101030101010202060301ff01ff01ce0600010006000000060a01000600
-000006030202010103030101020206040100040106000000060000000606010006000400
-0600000006a6010006000400060000000608000006000000040000000613020201010301
-01010202060301ff01ff01cf06000000060c010006000000060202020101030301010202
-060301000600010006000100060a01000400000006a8010004000000060a010006000100
-060000000612020201010301010102020603010000cb0101008101010059010100c30101
-005801000600010006000000060a01000600000006030202010103030101020206040100
-0401060001000600010006060100060004000600000006a6010006000400060000000608
-010006000100040000000613020201010301010102020603010000cb0101008101010059
-010100c301010058010106000000060c0100060000000602020201010303010102020603
-010006000403010006000100060601000400000006a80100040000000606010006000100
-06000402060000000612020201010301010102020603010000cb01010081010100590101
-00c30101005801000600010006000000060a010006000000060302020101030301010202
-060401000405060001000600010006020100060004000600000006a60100060004000600
-00000604010006000100040400000613020201010301010102020603010000cb01010081
-01010059010100c301010058010106000000060c01000600000006020202010103030101
-02020603010006000407010006000100060201000400000006a801000400000006020100
-0600010006000406060000000612020201010301010102020603010000cb010100810101
-0059010100c30101005801000600010006000000060a0100060000000603020201010303
-010102020604010004090600010006000100060004000600000006a60100060004000600
-00000600010006000100040800000613020201010301010102020603010000cb01010081
-01010059010100c301010058010106000000060c01000600000006020202010103030101
-0202060301000600040b0100060001000400000006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-04000000060001000600040a060000000612020201010301010102020603010000cb0101
-008101010059010100c30101005801000600010006000000060a01000600000006030202
-010103030101020206040100040d06000400060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-040006000100040c00000613020201010301010102020603010000cb0101008101010059
-010100c301010058010106000000060c0100060000000602020201010303000406030100
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-06000000060000000600000006000000061200040301010102020603010000cb01010081
-01010059010100c30101005801000600010006000000060a010006000000060302020101
-030300000202050006040000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000061300000202050003010101
-02020603010000cb0101008101010059010100c301010058010106000000060c01000600
-0000060202020101030300000202050006e50000020205000301010102020603010000cb
-0101008101010059010100c30101005801000600010006000000060a0100060000000603
-02020101030300000202050006e50000020205000301010102020603010000cb01010081
-01010059010100c301010058010106000000060c01000600000006020202010103030000
-0202050006e50000020205000301010102020603010000cb0101008101010059010100c3
-0101005801000600010006000000060a0100060000000603020201010303000002020500
-06e50000020205000301010102020603010000cb0101008101010059010100c301010058
-010106000000060c0100060000000602020201010303000002020500000502d900060202
-05000301010102020603010000cb0101008101010059010100c301010058010006000100
-06000000060a010006000000060302020101030300000208050002d90000020805000301
-010102020603010000cb0101008101010059010100c301010058010106000000060c0100
-06000000060202020101030300000208050002d900000208050003010101020206030100
-00cb0101008101010059010100c30101005801000600010006000000060a010006000000
-060302020101030300000208050001d90000020805000301010102020603010000cb0101
-008101010059010100c30101005801010600000006000100060001000600010006000100
-0600010006000100060001000600000006020202010103030000050901d9000005090301
-010102020603010000cb0101008101010059010100c30101005801000600010006000100
-0600010006000100060001000600010006000100060001000600000006030202010103f5
-01010202060301ff01ff01cf0600040e0600000006020202010103f501010202060301ff
-01ff01ce06000100040e000006030202010103f5010102020603010000cb010100810101
-0059010100c30101005801010600040e0600000006020202010103f50101020206030100
-00cb0101008101010059010100c301010058010006000100040e000006030202010103f5
-010102020603010000cb0101008101010059010100c30101005801010600040e06000000
-06020202010103f5010102020603010000cb0101008101010059010100c3010100580100
-06000100040e000006030202010103f5010102020603010000cb01010081010100590101
-00c30101005801010600040e0600000006020202010103f5010102020603010000cb0101
-008101010059010100c301010058010006000100040e000006030202010103f501010202
-0603010000cb0101008101010059010100c30101005801010600040e0600000006020202
-010103f5010102020603010000cb0101008101010059010100c301010058010006000100
-040e000006030202010103f5010102020603010000cb0101008101010059010100c30101
-005801010600040e0600000006020202010103f5010102020603010000cb010100810101
-0059010100c301010058010006000100040e000006030202010103f50101020206030100
-00cb0101008101010059010100c30101005801010600040e0600000006020202010103f5
-010102020603010000cb0101008101010059010100c301010058010006000100040e0000
-06030202010103f5010102020603010000cb0101008101010059010100c3010100580101
-0600040e0600000006020202010103f5010102020603010000cb01010081010100590101
-00c301010058010006000100040e000006030202010103f5010102020603010000cb0101
-008101010059010100c30101005801010600040e0600000006020202010103f501010202
-0603010000cb0101008101010059010100c301010058010006000100040e000006030202
-010103f5010102020603010000cb0101008101010059010100c30101005801010600040e
-0600000006020202010103f5010102020603010000cb0101008101010059010100c30101
-0058010006000100040e000006030202010103f5010102020603010000cb010100810101
-0059010100c30101005801010600040e0600000006020202010103f501010202060301ff
-01ff01ce06000100040e000006030202010103f501010202060301ff01ff01cf06000000
-060000000600000006000000060000000600000006000000060000000600000006020202
-010103f5010102020603010000cb0101008101010059010100c301010058010006000100
-040000000600000006000000060000000600000006000000060000000600000006030202
-010103f5010102020603010000cb0101008101010059010100c301010058010106000400
-0600000006080100060004000600000006020202010103f5010102020603010000cb0101
-008101010059010100c30101005801000600010004010600000006080100040000000603
-0202010103f5010102020603010000cb0101008101010059010100c30101005801010600
-040100000608010004010600000006020202010103f5010102020603010000cb01010081
-01010059010100c301010058010006000100040200000606010006000401000006030202
-010103f5010102020603010000cb0101008101010059010100c301010058010106000402
-0600000006040100060004020600000006020202010103f5010102020603010000cb0101
-008101010059010100c30101005801000600010004030600000006040100040200000603
-0202010103f5010102020603010000cb0101008101010059010100c30101005801010600
-040300000604010004030600000006020202010103f5010102020603010000cb01010081
-01010059010100c301010058010006000100040400000602010006000403000006030202
-010103f5010102020603010000cb0101008101010059010100c301010058010106000404
-0600000006000100060004040600000006020202010103f5010102020603010000cb0101
-008101010059010100c30101005801000600010004050600010006000100040400000603
-0202010103f5010102020603010000cb0101008101010059010100c30101005801010600
-040500000600010004050600000006020202010103f5010102020603010000cb01010081
-01010059010100c3010100580100060001000406010006000405000006030202010103f5
-010102020603010000cb0101008101010059010100c30101005801010600040606000406
-0600000006020202010103f5010102020603010000cb0101008101010059010100c30101
-005801000600010006000000060000000600000006000000060000000600000006000000
-0600000006030202010103f5010102020603010000cb0101008101010059010100c30101
-005801010600000006000000060000000600000006000000060000000600000006000000
-0600000006020202010103f5010102020603010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-06000100060001000600010006000100060001000600010006110202010103f501010202
-060201000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006000100060001000600010006000100060001000600010006000100
-060001000600010006120202010103f50101020206030100040d06000400060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-0000040000000600040c0600000006110202010103f501010202060201000600040b0000
-060001000400000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060000000600000006000000060000000600000006000000
-060000000600000006000000060004000600000006000000040a000006120202010103f5
-010102020603010004090600000006000100060004000600000006ff06ff06ac01000400
-00000600000006000000060004080600000006110202010103f501010202060201000600
-0407000006000000060201000400000006ff06ff06ac0100060004000600000006020000
-060000000406000006120202010103f50101020206030100040506000000060000000602
-0100060004000600000006ff06ff06ac0100040000000604000006000000060004040600
-000006110202010103f50101020206020100060004030000060000000606010004000000
-06ff06ff06ac0100060004000600000006060000060000000402000006120202010103f5
-01010202060301000401060000000600000006060100060004000600000006ff06ff06ac
-0100040000000608000006000000060004000600000006110202010103f5010102020602
-01000600010006000100060a01000400000006ff06ff06ac010006000400060000000608
-0100060001000600000006120202010103f5010102020603010004010600010006000100
-06060100060004000600000006ff06ff06ac010004000000060801000600010006000400
-0600000006110202010103f5010102020602010006000403010006000100060601000400
-000006ff06ff06ac01000600040006000000060601000600010004020000061202020101
-03f501010202060301000405060001000600010006020100060004000600000006ff06ff
-06ac0100040000000604010006000100060004040600000006110202010103f501010202
-0602010006000407010006000100060201000400000006ff06ff06ac0100060004000600
-000006020100060001000406000006120202010103f50101020206030100040906000100
-06000100060004000600000006ff06ff06ac010004000000060001000600010006000408
-0600000006110202010103f501010202060201000600040b010006000100040000000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-0100060004000600000006000100040a000006120202010103f5000406030100040d0600
-040006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-010006000100060001000600010006000100060001000600010006000100060001000600
-01000600010006000100040000000600040c060000000611000403f50000020205000602
-010006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000061200000202050003f50000020205000603000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000060000000600
-000006000000060000000600000006000000060000000600000006000000061100000202
-050003f500000202050006ff06ff06e800000202050003f500000202050006ff06ff06e8
-00000202050003f500000202050006ff06ff06e800000202050003f50000020205000005
-02ff02ff02dc00060202050003f500000208050002ff02ff02dc00000208050003f50000
-0208050002ff02ff02dc00000208050003f500000208050001ff01ff01dc000002080500
-03f50000050901ff01ff01dc0000050903ff03ff03ff03ff03ff03ff03ff03d3
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 21 400 186
-%%EOF
diff --git a/lib/tv/doc/src/tv_start_pid_sorted.gif b/lib/tv/doc/src/tv_start_pid_sorted.gif
deleted file mode 100644
index 390f98541f..0000000000
--- a/lib/tv/doc/src/tv_start_pid_sorted.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_start_pid_sorted.ps b/lib/tv/doc/src/tv_start_pid_sorted.ps
deleted file mode 100644
index 13ef2ed027..0000000000
--- a/lib/tv/doc/src/tv_start_pid_sorted.ps
+++ /dev/null
@@ -1,1853 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_start_pid_sorted.eps)
-%%CreationDate: (Mon Mar 19 17:15:26 2001)
-%%BoundingBox: 0 0 377 205
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 377 205
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-377.000000 205.000000
-12
-755 410
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-aab6aa
-e7e7e7
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000a01ff01ff01dc000b0208040001ff01ff01dc00000208040000000208040002ff02ff
-02dc000002080400000002080400020000ff00ff00d90400020000000208040000000202
-04060200000004ff04ff04d9020000000405020204000000020204000209000d02ff02ff
-02d000000202040000000202040002080000020d040002f6010302110103023801010206
-0101024001010230010102ff020400000202040000000202040002080000020d040002f6
-010102020107020001010203010102010101020e0105020001070201010302070100020b
-01010206010102400101020c0104021e010102ff02040000020204000000020204000208
-0000020d040002f6010102050101020301010203010102010101020e0101020701010203
-01010201010102050101020b010102060101024e010102020101021d010102ff02040000
-0202040000000202040002080000020204060203040002f6010102050101020301010203
-010102010101020e01010207010102030101020801040201010302030101020001010203
-010102020103020301040206010302030101020001010207010102000101020101010203
-010302030101020201010200010102020101020101030202010102000101020101010203
-010302020101020001010201010102020103020201010202010102f30000020204000000
-04030208000002020400030400000203040002f601010205010102040101020201000202
-0101020e0101020701010203010202080101020201010201010102020102020001010202
-010102010101020101010201010102090101020101010202010202000101020601020200
-010202000101020101010201010102020101020201020200010102010101020001010200
-010102020102020001020200010102010101020101010201010102000101020101010201
-010102010101020101010202010102f3000004030101020b000002030400030200000204
-040002f6010102050101020401010201010102020101020e010402040101020401030206
-010102060101020201010201010102020101020101010201010102010102020801010201
-010102020101020101010206010102010101020101010205010102020101020201010201
-010102010101020001010200010102020101020101010201010102050101020101020203
-01010201010102010101020101010202010002f70103020b000002030400030200000204
-040002f6010102050101020501010200010002030101020e010102070101020601020205
-010102030104020201010201010102020101020101050202010302060101020101010202
-010102010101020601010201010102010101020201040202010102020101020101010201
-010102000101020001010202010102010101020101010202010402010101020401010201
-0105020201010200010102f70103020b000002040400030000000205040002f601010205
-01010205010302030101020e010102070101020701010205010102020101020101010202
-010102010101020201010201010102080102020501010201010102020101020101010206
-010102010101020101010201010102010101020201010202010102010101020101010201
-010102000101020101010201010102010101020101010201010102010101020401010201
-0101020601010200010002f80103020b000002040400030000000205040002f601010205
-01010206010102040101020e010102070101020301010201010102050101020201010201
-010102020101020101010202010102010101020201000205010102050101020101010202
-010102010101020601010201010102010101020101010201010102020101020201010201
-010102020101020701010201010102010101020101010201010102010101020401010201
-0101020201000203010202f80103020b0000020500000206040002f60101020501010206
-010102040101020e01050203010102040103020701020201010202000101020101040203
-010102020103020201040207010302030101020101010206010102010101020101010202
-010202000101020101010202010102010101020301050202010102010101020101010202
-0102020001010200010102040101020201030204010102f90103020b0000020d040002f6
-01030211010302c4010102fa0103020b0000020d040002ff02d5010102fa0103020b0000
-020d040002ff02ff02d20103020c040d02ff02ff02d3010302ff02ff02ee010302ff02ff
-02ee0103020200ff00ff00e70400020201030202000004ff04ff04e70202010302ff02ff
-02ee01030202050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050002020103020200000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050001000202010302020500000005ff05ff05e401000500020201030202000005ff05ff
-05e601000202010302020500000005ff05ff05e401000500020201030202000005ff05ff
-05e601000202010302020500000005ff05ff05e4010005000202010302020000050c0604
-0504060005030602051f0600050206000504060005270602050b06000506060005ff05ff
-0535060005020600050906020514010002020103020205000000050b0600050f0600051f
-060005020600052c060005020600050a060005ff05ff053d060005020600050b06000513
-010005000202010302020000050c06000506060205050600050306020518060005020600
-050206020503060205020600050206000517060005020600050106000500060105020604
-050206020503060205020600050006010503060205ff05ff052006000502060005020602
-050506000502060005000601050d010002020103020205000000050b0600050806000505
-060005020600050206000518060005000600050506000502060005020600050106000502
-060005170600050206000501060105010600050306000506060005020600050206000501
-060105010600050106000502060005ff05ff051f06000502060005010600050206000504
-06000502060105010600050b010005000202010302020000050c06030505060005050600
-050206000502060005180600050006000505060005020600050206000501060005000600
-050006000517060005020600050106000502060005030600050606000502060005020600
-05010600050206000501060005ff05ff0523060405010600050206000504060005020600
-05020600050c010002020103020205000000050b06000508060005050600050206040518
-060005000600050506000502060405010600050006000500060005170600050206000501
-0600050206000503060005060600050206000502060005010600050206000502060205ff
-05ff052006000502060005010604050406000502060005020600050b0100050002020103
-02020000050c0600050806000505060005020600051d0600050606000502060005050600
-050006000500060005170600050206000501060005020600050306000506060005020600
-0502060005010600050206000505060005ff05ff051f0600050206000501060005080600
-0502060005020600050c010002020103020205000000050b060005080600050506000502
-060005020600051906000506060005020600050206000501060005000600050006000517
-060005020600050106010501060005030600050606000502060005020600050106000502
-0600050106000502060005ff05ff051f0600050206000501060005020600050406000502
-060105010600050b010005000202010302020000050c0600050806000505060005030602
-051a06000506060005030602050306000500060005190602050206000500060105050601
-050406000503060205020600050206000502060205ff05ff052006000502060005020602
-050506000502060005000601050d0100020201030202050000000576060005ff05ff055b
-0600050f010005000202010302020000050b0606052a0606052a06060500060005ff05ff
-05450606050e06000510010002020103020205000000050a0606052a0606052a06060500
-060005ff05ff05450606050e0600050f01000500020201030202000005ff05ff05e60100
-0202010302020500000005ff05ff05e401000500020201030202000005ff05ff05e60100
-020201030202050000000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050002020103020200000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010002020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff
-05ff05e802020103020205ff05ff05e8020201030202051c01020504010305c101020504
-0103051a0102057f01010505010205f001020504010305190101052f020201030202050e
-01060508010005060101050f010205010102059b01060508010005060101051001050504
-0101054d010205240104050d0101051e0102052401020501010205930106050801000506
-0101051101030535020201030202050e0100050101010500010005070101050601000511
-010105010100059d0100050101010500010005070101050601000513010105060100054d
-0101050001010524010105000101050c0100051e01010500010105240101050101000595
-010005010101050001000507010105060100051101010501010105340202010302020510
-010105030103050201030503010105030103050801020500010105010103050001010500
-01000500010005020103058b010105030103050201030503010105030103050a01010503
-0104054c0101050101050500010305000102050201030501010105000102050701010501
-01010500010305030104051d010105010105050001030500010205020103050101010500
-010205070102050001010501010305000101050001000500010005020103058301010503
-010305020103050301010503010305090101050101000500010305020105050101030521
-020201030202051001010506010105000101050101010502010105020101050101010507
-0100050001000500010005050101050001050500010105010101058a0101050601010500
-010105010101050201010502010105010101050901010502010105010101054c01000502
-010105000101050201000500010205000101050001010501010105010102050001000507
-010105010101050201010502010105010101051d01000502010105000101050201000500
-010205000101050001010501010105010102050001000507010005000100050001000505
-010105000105050001010501010105820101050601010500010105010101050201010502
-010105010101050801020504010105020101050001010501010105010101052002020103
-020205100100050401040500010105010101050201010501010605070100050001020502
-0104050001010500010005000107058a0100050401040500010105010101050201010501
-0106050901010501010105020101054b0101050201000501010105000100050001000500
-01010501010805010101050a0103050401010501010105020101051c0101050201000501
-01010500010005000100050001010501010805010101050a010005000102050201040500
-010105000100050001070582010005040104050001010501010105020101050101060509
-01020503010105040101050101060520020201030202050f010105020101050101010500
-0101050201010501010105020101050b0101050001010501010105010101050101000500
-01000500010005000101058e010105020101050101010500010105020101050101010502
-0101050d01010502010105010101054c0101050101010501010205000100050101000502
-01000500010105050101050a0101050601010502010105010101051d0101050101010501
-01020500010005010100050201000500010105050101050a010105000101050101010501
-010105010100050001000500010005000101058601010502010105010101050001010502
-01010501010105020101050b010105010101050201010503010105030101052502020103
-0202050f0101050201010501010105000101050101010502010105020101050101010507
-01000501010105010101050101010500010105000100050001000500010105010101058a
-010105020101050101010500010105010101050201010502010105010101050901010502
-010105010101054c01010500010105020103050101010501010105000101050101010501
-0101050a0101050601010502010105010101051d01010500010105020103050101010501
-0101050001010501010105010101050a0100050101010501010105010101050001010500
-010005000100050001010501010105820101050201010501010105000101050101010502
-010105020101050101010507010105010101050201010502010205000101050001010501
-01010521020201030202050e01030502010a050101050501010305070102050001010502
-0107050001000500010105000103058a01030502010a0501010505010103050801050501
-0105054c0102050301010500010005000103050001020500010305010104050701030503
-010505010105051d01020503010105000100050001030500010205000103050101040507
-01020500010105020107050001000500010105000103058201030502010a050101050501
-010305090103050101050500010505010103052202020103020205ff05ff05e802020103
-020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103
-020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e802020103
-0202050201ff01ff01e205020202010302020503010000cb0101008101010059010100c3
-010100580101050001000500010005000100050001000500010005000100050001000500
-01000500000005020202010302020503010000cb0101008101010059010100c301010058
-010005000100030601000306000005030202010302020503010000cb010100810101000c
-0100002301000026010100c3010100580101050003050000050003060500000005020202
-0103020205030100001f0100000a0100009e010100810101000b01000004010100090104
-000a01010002010000250101001e0102000501000012010000060100002e010000120102
-0003010200310101000a0100000501010044010005000100030505000100050003050000
-050302020103020205030100001f0100000a0100009e010100810101000a010000040100
-0001010000080100000d0100000101000002010000240101002001000019010000360100
-001401000005010000310101000901010004010000010100004301010500030405000000
-050001000305050000000502020201030202050301000009010200030102000901040002
-01020002010000000101009b01010081010100090100000501000001010000080100000d
-010000010100000301000023010100090102000201000000010100020100000001010005
-01000003010200030102000301020002010400020102000301020002010000000101000a
-010200030102000201000000010100020104000101000000010100030102000501000005
-010000030102000201000000010100230101000801000000010000040100000101000043
-010005000100030400000502010003040000050302020103020205030100000801000002
-01000001010000020100000a010000030100000201000001010100010100009a01010081
-010100080100000601000001010000080103000a01000001010000040100002201010008
-010000020100000101010001010000010101000101000004010000050100000201000002
-010000010100000201000003010000060100000201000002010000010101000101000008
-010000020100000101000002010000010101000101000003010000030101000101000001
-01000002010000040100000501000002010000020100000101010001010000220101000a
-010000040100000101000043010105000303000005020100050003040500000005020202
-0103020205030100000c010000010100000e0100000701000001010000020100009a0101
-00810101000701000007010000010100000c010000090100000101000005010000210101
-000c01000001010000020100000101000002010000040100000501000002010000090100
-000301000006010000020100000201000001010000020100000801000005010000020100
-000101000002010000030100000301000005010000020100000401000005010000020100
-000201000001010000260101000a01000004010000010100004301000500010003030500
-0000050201000500030300000503020201030202050301000009010300010100000e0100
-000401030001010000020100009a010100810101000801000006010000010100000c0100
-000901000001010000040100002201010009010300010100000201000001010000020100
-000401000005010000020100000601030003010000060100000201000002010000010100
-000201000008010000050100000201000001010000020100000301000003010000050100
-000201000004010000050100000201040001010000260101000a01000004010000010100
-004301010500030205000000050401000303050000000502020201030202050301000008
-01000002010000010100000e010000030100000201000001010000020100009a01010081
-010100090100000501000001010000080100000201000009010000010100000301000023
-010100080100000201000001010000020100000101000002010000040100000501000002
-010000050100000201000003010000060100000201000002010000010100000201000008
-010000050100000201000001010000020100000301000003010000050100000201000004
-010000050100000201000005010000260101000a01000004010000010100004301000500
-010003020000050601000302000005030202010302020503010000080100000201000001
-010000020100000a010000030100000201000001010100010100009a010100810101000a
-010000040100000101000003010100020100000201000003010100030100000101000002
-010000240101000801000002010000010101000101000001010100010100000401000005
-010000020100000201000001010000020100000301000006010000020100000201000001
-010000020100000801000002010000010100000201000001010000020100000301000003
-01000005010000020100000401000005010000020100000201000001010000260101000a
-010000040100000101000043010105000301000005060100050003020500000005020202
-01030202050301000009010300020102000c0101000201030001010000000101009b0101
-00810101000b010000040101000401010003010200040101000401010002010000250101
-000901030001010000000101000201000000010100050100000501000003010200030103
-000401010004010000030102000201000002010000090102000301020002010000020100
-000401010001010000060102000501000005010000030102000201000026010100080104
-000301010044010005000100030105000000050601000500030100000503020201030202
-050301000015010500af010100810101000c01000023010000260101000f010000050100
-003c01050068010100580101050003000500000005080100030105000000050202020103
-02020503010000cb01010081010100590101000f01000005010000ab0101005801000500
-010003000000050a01000300000005030202010302020503010000cb0101008101010059
-0101000f01000005010000ab010100580101050000000500010005000100050001000500
-01000500010005000100050003000500000005020202010302020503010000cb01010081
-01010059010100c301010058010005000100050001000500010005000100050001000500
-010005000100050001000500000005030202010302020503010000cb0101008101010059
-010100c30101005801010500030e0500000005020202010302020503010000cb01010081
-01010059010100c301010058010005000100050000000500000005000000050000000500
-000005000000050000000500000005030202010302020503010000cb0101008101010059
-010100c30101005801010500000005000000050000000500000005000000050000000500
-000005000100050000000502020201030202050301ff01ff01ce0500010005000000050a
-0100050000000503020201030202050301ff01ff01cf05000000050c0100050000000502
-0202010302020503010000cb0101008101010059010100c3010100580100050001000500
-0000050a01000500000005030202010302020503010000cb0101008101010059010100c3
-01010058010105000000050c01000500000005020202010302020503010000cb01010081
-0101000c0100002a0100001f010100c30101005801000500010005000000050a01000500
-00000503020201030202050301000010010200090100000d0102000a010200100100007b
-010100810101000b010000040101000b010000050100000c010100020100001e01010010
-010200090100000d010200930101000a0101004b010105000000050c0100050000000502
-020201030202050301000012010000090100000f0100000c010000100100007b01010081
-0101000a010000040100000101000009010100040101000b01000001010000020100001d
-01010012010000090100000f0100009301010009010000010100004a0100050001000500
-0000050a0100050000000503020201030202050301000009010100000100000401000003
-010200020100000001010003010200050100000c01000003010200030102000201000001
-010000030102007101010081010100090100000501000001010000080100000001000003
-010000000100000b01000001010000030100001c01010009010100000100000401000003
-010200020100000001010003010200050100000901000000010100030102000201010000
-010000030102000a01020003010200020100000001010002010000020100000201020002
-010000000101003f01010009010000010100004a010105000000050c0100050000000502
-020201030202050301000008010000010101000401000002010000020100000101010001
-0100000101000002010000040100000c0100000201000002010000010100000201000001
-01000000010000030100000201000070010100810101000801000006010000010100000a
-010000050100000b01000001010000040100001b01010008010000010101000401000002
-010000020100000101010001010000010100000201000004010000090101000101000001
-010000020100000101000000010000000100000101000002010000080100000201000001
-010000020100000101010001010000010100000201000001010000020100000101010001
-0100003e01010009010000010100004a01000500010005000000050a0100050000000503
-020201030202050301000008010000020100000401000002010000020100000101000002
-01000005010000040100000c010000020100000201000001010000050101000401000074
-010100810101000701000007010000010100000a010000050100000b0100000101000005
-0100001a0101000801000002010000040100000201000002010000010100000201000005
-010000040100000901000002010000050100000101000000010000000100000101000002
-010000080100000501000002010000010100000501000002010000010100000201000001
-0100004201010009010000010100004a010105000000050c010005000000050202020103
-020205030100000801000002010000040100000201000002010000010100000201000002
-010300040100000c01000002010000020100000101000005010100050102007101010081
-0101000801000006010000010100000a010000050100000b01000001010000040100001b
-010100080100000201000004010000020100000201000001010000020100000201030004
-010000090100000201000002010300010100000001000000010000010104000901020002
-01040001010000060100000001000002010400010100004201010009010000010100004a
-01000500010005000000050a010005000000050302020103020205030100000801000002
-01000004010000020100000201000001010000020100000101000002010000040100000c
-010000020100000201000001010000050100000001000007010000700101008101010009
-01000005010000010100000a010000050100000b01000001010000030100001c01010008
-010000020100000401000002010000020100000101000002010000010100000201000004
-010000090100000201000001010000020100000101000000010000000100000101000010
-010000010100000501000006010000000100000201000005010000420101000901000001
-0100004a010105000000050c010005000000050202020103020205030100000801000001
-01010004010000020100000201000001010100010100000101000002010000040100000c
-010000020100000201000001010000020100000101000001010000020100000201000070
-010100810101000a01000004010000010100000301010004010000050100000501010003
-01000001010000020100001d010100080100000101010004010000020100000201000001
-010100010100000101000002010000040100000901000002010000010100000201000001
-010000000100000001000001010000020100000801000002010000010100000201000001
-010000070100000301000002010000010100004201010009010000010100004a01000500
-010005000000050a01000500000005030202010302020503010000090101000001000004
-01000003010200020100000001010003010300040100000c010000030102000301020002
-010000020100000201020071010100810101000b01000004010100040101000201040001
-0104000301010004010100020100001e0101000901010000010000040100000301020002
-010000000101000301030004010000090100000201000002010300010100000001000000
-010000020102000a0102000301020002010000070100000401020002010000420101000a
-0101004b010105000000050c010005000000050202020103020205030100000c01000023
-01050093010100810101000c0100002a0100001f0101000c010000230105001c01050068
-0101005801000500010005000000050a0100050000000503020201030202050301000008
-01000002010000bd01010081010100590101000801000002010000b50101005801010500
-0000050c0100050000000502020201030202050301000009010200be0101008101010059
-01010009010200b60101005801000500010005000000050a010005000000050302020103
-02020503010000cb0101008101010059010100c301010058010105000000050c01000500
-000005020202010302020503010000cb0101008101010059010100c30101005801000500
-010005000000050a01000500000005030202010302020503010000cb0101008101010059
-010100c301010058010105000000050c01000500000005020202010302020503010000cb
-0101008101010059010100c30101005801000500010005000000050a0100050000000503
-020201030202050301ff01ff01cf05000000050c01000500000005020202010302020503
-01ff01ff01ce0500010005000000050a01000500000005030202010302020503010000cb
-0101008101010059010100c301010058010105000000050c010005000000050202020103
-02020503010000cb0101008101010059010100c30101005801000500010005000000050a
-01000500000005030202010302020503010000cb010100810101000c0100002a0100001f
-010100c301010058010105000000050c0100050000000502020201030202050301000010
-010200090100000d0102009b010100810101000b010000040101000b010000050100000c
-010100020100001e01010010010200090100000d010200930101000a0101004b01000500
-010005000000050a0100050000000503020201030202050301000012010000090100000f
-0100009b010100810101000a010000040100000101000009010100040101000b01000001
-010000020100001d01010012010000090100000f0100009301010009010000010100004a
-010105000000050c01000500000005020202010302020503010000090101000001000004
-010000030102000201000000010100030102000501000009010000000101000301020002
-010100000100000301020003010200710101008101010009010000050100000101000008
-0100000001000003010000000100000b01000001010000030100001c0101000901010000
-010000040100000301020002010000000101000301020005010000090100000001010003
-0102000201010000010000030102000a0102000301020002010000000101000201000002
-0100000201020002010000000101003f01010009010000010100004a0100050001000500
-0000050a0100050000000503020201030202050301000008010000010101000401000002
-010000020100000101010001010000010100000201000004010000090101000101000001
-010000020100000101000000010000000100000101000002010000010100000201000070
-010100810101000801000006010000010100000a010000050100000b0100000101000004
-0100001b0101000801000001010100040100000201000002010000010101000101000001
-010000020100000401000009010100010100000101000002010000010100000001000000
-010000010100000201000008010000020100000101000002010000010101000101000001
-01000002010000010100000201000001010100010100003e01010009010000010100004a
-010105000000050c01000500000005020202010302020503010000080100000201000004
-010000020100000201000001010000020100000501000004010000090100000201000005
-010000010100000001000000010000010100000201000001010000740101008101010007
-01000007010000010100000a010000050100000b01000001010000050100001a01010008
-010000020100000401000002010000020100000101000002010000050100000401000009
-010000020100000501000001010000000100000001000001010000020100000801000005
-010000020100000101000005010000020100000101000002010000010100004201010009
-010000010100004a01000500010005000000050a01000500000005030202010302020503
-010000080100000201000004010000020100000201000001010000020100000201030004
-010000090100000201000002010300010100000001000000010000010104000201020071
-010100810101000801000006010000010100000a010000050100000b0100000101000004
-0100001b0101000801000002010000040100000201000002010000010100000201000002
-010300040100000901000002010000020103000101000000010000000100000101040009
-010200020104000101000006010000000100000201040001010000420101000901000001
-0100004a010105000000050c010005000000050202020103020205030100000801000002
-010000040100000201000002010000010100000201000001010000020100000401000009
-010000020100000101000002010000010100000001000000010000010100000901000070
-010100810101000901000005010000010100000a010000050100000b0100000101000003
-0100001c0101000801000002010000040100000201000002010000010100000201000001
-010000020100000401000009010000020100000101000002010000010100000001000000
-010000010100001001000001010000050100000601000000010000020100000501000042
-01010009010000010100004a01000500010005000000050a010005000000050302020103
-020205030100000801000001010100040100000201000002010000010101000101000001
-010000020100000401000009010000020100000101000002010000010100000001000000
-0100000101000002010000010100000201000070010100810101000a0100000401000001
-010000030101000401000005010000050101000301000001010000020100001d01010008
-010000010101000401000002010000020100000101010001010000010100000201000004
-010000090100000201000001010000020100000101000000010000000100000101000002
-010000080100000201000001010000020100000101000007010000030100000201000001
-0100004201010009010000010100004a010105000000050c010005000000050202020103
-020205030100000901010000010000040100000301020002010000000101000301030004
-010000090100000201000002010300010100000001000000010000020102000301020071
-010100810101000b01000004010100040101000201040001010400030101000401010002
-0100001e0101000901010000010000040100000301020002010000000101000301030004
-010000090100000201000002010300010100000001000000010000020102000a01020003
-01020002010000070100000401020002010000420101000a0101004b0100050001000500
-0000050a010005000000050302020103020205030100000c010000230105009301010081
-0101000c0100002a0100001f0101000c010000230105001c010500680101005801010500
-0000050c010005000000050202020103020205030100000801000002010000bd01010081
-010100590101000801000002010000b50101005801000500010005000000050a01000500
-00000503020201030202050301000009010200be010100810101005901010009010200b6
-01010058010105000000050c01000500000005020202010302020503010000cb01010081
-01010059010100c30101005801000500010005000000050a010005000000050302020103
-02020503010000cb0101008101010059010100c301010058010105000000050c01000500
-000005020202010302020503010000cb0101008101010059010100c30101005801000500
-010005000000050a01000500000005030202010302020503010000cb0101008101010059
-010100c301010058010105000000050c0100050000000502020201030202050301ff01ff
-01ce0500010005000000050a0100050000000503020201030202050301ff01ff01cf0500
-0000050c01000500000005020202010302020503010000cb0101008101010059010100c3
-0101005801000500010005000000050a01000500000005030202010302020503010000cb
-0101008101010059010100c301010058010105000000050c010005000000050202020103
-02020503010000cb010100810101000c0100002a0100001f010100c30101005801000500
-010005000000050a0100050000000503020201030202050301000010010200090100000d
-0102004301000056010100810101000b010000040101000b010000050100000c01010002
-0100001e01010010010200090100000d010200930101000a0101004b010105000000050c
-0100050000000502020201030202050301000012010000090100000f0100004301000056
-010100810101000a010000040100000101000009010100040101000b0100000101000002
-0100001d01010012010000090100000f0100009301010009010000010100004a01000500
-010005000000050a01000500000005030202010302020503010000090101000001000004
-010000030102000201000000010100030102000501000009010000000101000301020002
-0101000001000003010200030102000a0102000201000002010000010104005401010081
-010100090100000501000001010000080100000001000003010000000100000b01000001
-010000030100001c01010009010100000100000401000003010200020100000001010003
-010200050100000901000000010100030102000201010000010000030102000a01020003
-010200020100000001010002010000020100000201020002010000000101003f01010009
-010000010100004a010105000000050c0100050000000502020201030202050301000008
-010000010101000401000002010000020100000101010001010000010100000201000004
-010000090101000101000001010000020100000101000000010000000100000101000002
-010000010100000201000008010000020100000101000002010000030100005601010081
-0101000801000006010000010100000a010000050100000b01000001010000040100001b
-010100080100000101010004010000020100000201000001010100010100000101000002
-010000040100000901010001010000010100000201000001010000000100000001000001
-010000020100000801000002010000010100000201000001010100010100000101000002
-010000010100000201000001010100010100003e01010009010000010100004a01000500
-010005000000050a01000500000005030202010302020503010000080100000201000004
-010000020100000201000001010000020100000501000004010000090100000201000005
-0100000101000000010000000100000101000002010000010100000c0100000201000002
-010000000100000401000056010100810101000701000007010000010100000a01000005
-0100000b01000001010000050100001a0101000801000002010000040100000201000002
-010000010100000201000005010000040100000901000002010000050100000101000000
-010000000100000101000002010000080100000501000002010000010100000501000002
-0100000101000002010000010100004201010009010000010100004a010105000000050c
-010005000000050202020103020205030100000801000002010000040100000201000002
-010000010100000201000002010300040100000901000002010000020103000101000000
-010000000100000101040002010200090104000301000005010000560101008101010008
-01000006010000010100000a010000050100000b01000001010000040100001b01010008
-010000020100000401000002010000020100000101000002010000020103000401000009
-010000020100000201030001010000000100000001000001010400090102000201040001
-010000060100000001000002010400010100004201010009010000010100004a01000500
-010005000000050a01000500000005030202010302020503010000080100000201000004
-010000020100000201000001010000020100000101000002010000040100000901000002
-010000010100000201000001010000000100000001000001010000090100000801000006
-010000000100000401000056010100810101000901000005010000010100000a01000005
-0100000b01000001010000030100001c0101000801000002010000040100000201000002
-010000010100000201000001010000020100000401000009010000020100000101000002
-010000010100000001000000010000010100001001000001010000050100000601000000
-01000002010000050100004201010009010000010100004a010105000000050c01000500
-000005020202010302020503010000080100000101010004010000020100000201000001
-010100010100000101000002010000040100000901000002010000010100000201000001
-010000000100000001000001010000020100000101000002010000080100000201000001
-010000020100000301000056010100810101000a01000004010000010100000301010004
-01000005010000050101000301000001010000020100001d010100080100000101010004
-010000020100000201000001010100010100000101000002010000040100000901000002
-010000010100000201000001010000000100000001000001010000020100000801000002
-010000010100000201000001010000070100000301000002010000010100004201010009
-010000010100004a01000500010005000000050a01000500000005030202010302020503
-010000090101000001000004010000030102000201000000010100030103000401000009
-010000020100000201030001010000000100000001000002010200030102000a01020002
-010000020100000401010054010100810101000b01000004010100040101000201040001
-0104000301010004010100020100001e0101000901010000010000040100000301020002
-010000000101000301030004010000090100000201000002010300010100000001000000
-010000020102000a0102000301020002010000070100000401020002010000420101000a
-0101004b010105000000050c010005000000050202020103020205030100000c01000023
-0105002301050069010100810101000c0100002a0100001f0101000c010000230105001c
-010500680101005801000500010005000000050a01000500000005030202010302020503
-0100000801000002010000bd01010081010100590101000801000002010000b501010058
-010105000000050c0100050000000502020201030202050301000009010200be01010081
-0101005901010009010200b60101005801000500010005000000050a0100050000000503
-0202010302020503010000cb0101008101010059010100c301010058010105000000050c
-01000500000005020202010302020503010000cb0101008101010059010100c301010058
-01000500010005000000050a01000500000005030202010302020503010000cb01010081
-01010059010100c301010058010105000000050c01000500000005020202010302020503
-010000cb0101008101010059010100c30101005801000500010005000000050a01000500
-00000503020201030202050301ff01ff01cf05000000050c010005000000050202020103
-0202050301ff01ff01ce0500010005000000050a01000500000005030202010302020503
-010000cb0101008101010059010100c301010058010105000000050c0100050000000502
-0202010302020503010000cb0101008101010059010100c3010100580100050001000500
-0000050a01000500000005030202010302020503010000cb010100810101000c0100002a
-0100001f010100c301010058010105000000050c01000500000005020202010302020503
-0100000b010000120100001f01000089010100810101000b010000040101000b01000004
-0102000b010100020100001e0101000b010000120100000e010000010100008f0101000a
-0101004b01000500010005000000050a010005000000050302020103020205030100001f
-0100001f01000089010100810101000a0100000401000001010000090101000301000002
-0100000901000001010000020100001d0101001f0100000e010000010100008f01010009
-010000010100004a010105000000050c0100050000000502020201030202050301000009
-010200020100000001010003010200020104000901020003010200030102000201000000
-010100030102007f01010081010100090100000501000001010000080100000001000007
-0100000901000001010000030100001c0101000901020002010000000101000301020002
-010400090101000001000001010000000101008c01010009010000010100004a01000500
-010005000000050a010005000000050302020103020205030100000b0100000201010001
-0100000101000002010000030100000a0100000201000001010000020100000101000002
-010000010101000101000001010000020100007e01010081010100080100000601000001
-0100000a010000070100000901000001010000040100001b0101000b0100000201010001
-0100000101000002010000030100000a0100000101010001010100010100008b01010009
-010000010100004a010105000000050c010005000000050202020103020205030100000b
-01000002010000020100000101000002010000030100000a010000090100000101000005
-0100000201000001010000020100007e010100810101000701000007010000010100000a
-010000060100000a01000001010000050100001a0101000b010000020100000201000001
-01000002010000030100000a0100000201000001010000020100008b0101000901000001
-0100004a01000500010005000000050a010005000000050302020103020205030100000b
-010000020100000201000001010400030100000a01000006010300010100000501000002
-010000010104007e010100810101000801000006010000010100000a010000050100000b
-01000001010000040100001b0101000b010000020100000201000001010400030100000a
-0100000201000001010000020100008b01010009010000010100004a010105000000050c
-010005000000050202020103020205030100000b01000002010000020100000101000007
-0100000a0100000501000002010000010100000501000002010000010100008201010081
-0101000901000005010000010100000a010000040100000c01000001010000030100001c
-0101000b010000020100000201000001010000070100000a010000020100000101000002
-0100008b01010009010000010100004a01000500010005000000050a0100050000000503
-02020103020205030100000b01000002010000020100000101000002010000030100000a
-010000020100000101000002010000010100000201000001010000020100000101000002
-0100007e010100810101000a010000040100000101000003010100040100000301000007
-0101000301000001010000020100001d0101000b01000002010000020100000101000002
-010000030100000a0100000101010001010100010100008b01010009010000010100004a
-010105000000050c010005000000050202020103020205030100000b0100000201000002
-01000002010200050101000901020003010300020102000201000002010000020102007f
-010100810101000b01000004010100040101000201040001010400030101000401010002
-0100001e0101000b01000002010000020100000201020005010100090101000001000001
-010000000101008c0101000a0101004b01000500010005000000050a0100050000000503
-020201030202050301000023010500a1010100810101000c0100002a0100001f01010023
-0105009901010058010105000000050c01000500000005020202010302020503010000cb
-0101008101010059010100c30101005801000500010005000000050a0100050000000503
-0202010302020503010000cb0101008101010059010100c301010058010105000000050c
-01000500000005020202010302020503010000cb0101008101010059010100c301010058
-01000500010005000000050a01000500000005030202010302020503010000cb01010081
-01010059010100c301010058010105000000050c01000500000005020202010302020503
-010000cb0101008101010059010100c30101005801000500010005000000050a01000500
-000005030202010302020503010000cb0101008101010059010100c30101005801010500
-0000050c0100050000000502020201030202050301ff01ff01ce0500010005000000050a
-0100050000000503020201030202050301ff01ff01cf05000000050c0100050000000502
-0202010302020503010000cb0101008101010059010100c3010100580100050001000500
-0000050a01000500000005030202010302020503010000cb0101008101010059010100c3
-01010058010105000000050c01000500000005020202010302020503010000cb01010081
-0101000c0100002a0100001f010100c30101005801000500010005000000050a01000500
-0000050302020103020205030100000b010000120100000e010000010100009701010081
-0101000b010000040101000b010000040102000b010100020100001e0101000b01000012
-0100000e010000010100008f0101000a0100000401020044010105000000050c01000500
-0000050202020103020205030100001f0100000e0100000101000097010100810101000a
-01000004010000010100000901010003010000020100000901000001010000020100001d
-0101001f0100000e010000010100008f0101000901010003010000020100004301000500
-010005000000050a01000500000005030202010302020503010000090102000201000000
-010100030102000201040009010100000100000101000000010100940101008101010009
-01000005010000010100000801000000010000070100000901000001010000030100001c
-010100090102000201000000010100030102000201040009010100000100000101000000
-0101008c0101000801000000010000030100000201000043010105000000050c01000500
-0000050202020103020205030100000b0100000201010001010000010100000201000003
-0100000a0100000101010001010100010100009301010081010100080100000601000001
-0100000a010000070100000901000001010000040100001b0101000b0100000201010001
-0100000101000002010000030100000a0100000101010001010100010100008b0101000a
-01000003010000020100004301000500010005000000050a010005000000050302020103
-020205030100000b01000002010000020100000101000002010000030100000a01000002
-010000010100000201000093010100810101000701000007010000010100000a01000006
-0100000a01000001010000050100001a0101000b01000002010000020100000101000002
-010000030100000a0100000201000001010000020100008b0101000a0100000401030043
-010105000000050c010005000000050202020103020205030100000b0100000201000002
-01000001010400030100000a010000020100000101000002010000930101008101010008
-01000006010000010100000a010000050100000b01000001010000040100001b0101000b
-010000020100000201000001010400030100000a0100000201000001010000020100008b
-0101000a010000070100004301000500010005000000050a010005000000050302020103
-020205030100000b010000020100000201000001010000070100000a0100000201000001
-0100000201000093010100810101000901000005010000010100000a010000040100000c
-01000001010000030100001c0101000b010000020100000201000001010000070100000a
-0100000201000001010000020100008b0101000a0100000701000043010105000000050c
-010005000000050202020103020205030100000b01000002010000020100000101000002
-010000030100000a01000001010100010101000101000093010100810101000a01000004
-01000001010000030101000401000003010000070101000301000001010000020100001d
-0101000b01000002010000020100000101000002010000030100000a0100000101010001
-010100010100008b0101000a01000003010000020100004301000500010005000000050a
-010005000000050302020103020205030100000b01000002010000020100000201020005
-0101000901010000010000010100000001010094010100810101000b0100000401010004
-01010002010400010104000301010004010100020100001e0101000b0100000201000002
-0100000201020005010100090101000001000001010000000101008c0101000801040002
-01020044010105000000050c0100050000000502020201030202050301000023010500a1
-010100810101000c0100002a0100001f0101002301050099010100580100050001000500
-0000050a01000500000005030202010302020503010000cb0101008101010059010100c3
-01010058010105000000050c01000500000005020202010302020503010000cb01010081
-01010059010100c30101005801000500010005000000050a010005000000050302020103
-02020503010000cb0101008101010059010100c301010058010105000000050c01000500
-000005020202010302020503010000cb0101008101010059010100c30101005801000500
-010005000000050a01000500000005030202010302020503010000cb0101008101010059
-010100c301010058010105000000050c01000500000005020202010302020503010000cb
-0101008101010059010100c30101005801000500010005000000050a0100050000000503
-020201030202050301ff01ff01cf05000000050c01000500000005020202010302020503
-01ff01ff01ce0500010005000000050a01000500000005030202010302020503010000cb
-0101008101010059010100c301010058010105000000050c010005000000050202020103
-02020503010000cb0101008101010059010100c30101005801000500010005000000050a
-01000500000005030202010302020503010000cb010100810101000c0100002a0100001f
-010100c301010058010105000000050c010005000000050202020103020205030100000b
-010000120100000a0100001501000087010100810101000b010000040101000b01000004
-0102000b010100020100001e0101000b010000120100000e010000010100008f0101000c
-0100004a01000500010005000000050a010005000000050302020103020205030100001f
-0100000a0100001501000087010100810101000a01000004010000010100000901010003
-010000020100000901000001010000020100001d0101001f0100000e010000010100008f
-0101000b0101004a010105000000050c0100050000000502020201030202050301000009
-010200020100000001010003010200020104000801000000010100030102000301020002
-010400020102007f01010081010100090100000501000001010000080100000001000007
-0100000901000001010000030100001c0101000901020002010000000101000301020002
-010400090101000001000001010000000101008c0101000a010000000100004a01000500
-010005000000050001000500010005000100050001000500010005000100050000000503
-02020103020205030100000b01000002010100010100000101000002010000030100000a
-01010001010000010100000201000001010000020100000301000003010000020100007e
-010100810101000801000006010000010100000a01000007010000090100000101000004
-0100001b0101000b01000002010100010100000101000002010000030100000a01000001
-01010001010100010100008b01010009010000010100004a010105000000050001000500
-010005000100050001000500010005000100050001000500000005020202010302020503
-0100000b01000002010000020100000101000002010000030100000a0100000201000001
-010000020100000101000007010000030100008201010081010100070100000701000001
-0100000a010000060100000a01000001010000050100001a0101000b0100000201000002
-0100000101000002010000030100000a0100000201000001010000020100008b01010008
-010000020100004a010005000100030e0000050302020103020205030100000b01000002
-0100000201000001010400030100000a0100000201000001010000020100000201020004
-010000040102007f010100810101000801000006010000010100000a010000050100000b
-01000001010000040100001b0101000b010000020100000201000001010400030100000a
-0100000201000001010000020100008b01010008010000020100004a01010500030e0500
-0000050202020103020205030100000b010000020100000201000001010000070100000a
-0100000201000001010000020100000501000003010000070100007e0101008101010009
-01000005010000010100000a010000040100000c01000001010000030100001c0101000b
-010000020100000201000001010000070100000a0100000201000001010000020100008b
-0101000801050049010005000100030e0000050302020103020205030100000b01000002
-010000020100000101000002010000030100000a01000002010000010100000201000001
-010000020100000301000003010000020100007e010100810101000a0100000401000001
-010000030101000401000003010000070101000301000001010000020100001d0101000b
-01000002010000020100000101000002010000030100000a010000010101000101010001
-0100008b0101000c0100004a01010500030e05000000050202020103020205030100000b
-010000020100000201000002010200050101000801000002010000020102000301020005
-010100020102007f010100810101000b0100000401010004010100020104000101040003
-01010004010100020100001e0101000b0100000201000002010000020102000501010009
-0101000001000001010000000101008c0101000c0100004a010005000100030e00000503
-020201030202050301000023010500a1010100810101000c0100002a0100001f01010023
-010500990101005801010500030e0500000005020202010302020503010000cb01010081
-01010059010100c301010058010005000100030e000005030202010302020503010000cb
-0101008101010059010100c30101005801010500030e0500000005020202010302020503
-010000cb0101008101010059010100c301010058010005000100030e0000050302020103
-02020503010000cb0101008101010059010100c30101005801010500030e050000000502
-0202010302020503010000cb0101008101010059010100c301010058010005000100030e
-000005030202010302020503010000cb0101008101010059010100c30101005801010500
-030e050000000502020201030202050301ff01ff01ce05000100030e0000050302020103
-0202050307cd01ff01ff01010500030e0500000005020202010302020503070008cb0700
-0100088101010859010108c301010858010005000100030e000005030202010302020503
-070008cb07000100080b010108470101082901010859010108c30101085801010500030e
-0500000005020202010302020503070008cb07000100080a010008150100082a01000808
-010008280101080c0100082a0100081f010108c301010858010005000100030e00000503
-02020103020205030700081d07000808070008a207000100080a010008040102080c0100
-08040101080b010008030104080a0101080201000807010008280101080b010008040101
-080b010008030104080a010108020100081e010108180100080a01000822010208770101
-080a0100084c01010500030e05000000050202020103020205030700081d070008ac0700
-0100080a01000803010008020100080a0100080401000801010008090101080301000802
-01000809010008010100080201000806010008280101080a010008040100080101000809
-01010803010008020100080901000801010008020100081d010108180100080a01000824
-01000877010108090101084c010005000100030e00000503020201030202050307000809
-070208030702080307020802070008010700080307020803070208030702089407000100
-080a01000803010008020100080901000805010008010100080801000800010008070100
-080901000801010008030100080501000828010108090100080501000801010008080100
-0800010008070100080901000801010008030100081c0101080801000800010108030102
-080201040808010008010100080301020802010008000101080201000800010108030102
-08050100087701010808010008000100084c01010500030e050000000502020201030202
-050307000808070008020700080107000802070008010700080207000801070008000700
-0806070008020700080207000801070008020700089307000100080a0100080301000802
-0100080801000806010008010100080a010008060100080a010008010100080401000804
-010008280101080801000806010008010100080a010008060100080a0100080101000804
-0100081b01010808010108010100080101000802010008030100080a0100080001000803
-010008020100080101010801010008010101080101000801010008020100080401000877
-0101080a0100084c010005000100030e0000050302020103020205030700080807000805
-070008020700080107000802070008010701080707000802070008020700080107000897
-070001000808010108050102080801000807010008010100080a010008060100080a0100
-08010100080501000804010108260101080701000807010008010100080a010008060100
-080a01000801010008050100081a01010808010008020100080101000802010008030100
-080a01010804010008020100080101000805010008020100080101000802010008040100
-08770101080a0100084c01010500030e0500000005020202010302020503070008080700
-080507000802070008010700080207000801070108070700080207040802070208940700
-0100080a01000803010008020100080801000806010008010100080a010008060100080a
-010008010100080401000804010008280101080801000806010008010100080a01000806
-0100080a01000801010008040100081b010108080100080201000801010408030100080a
-010108040104080101000805010008020100080101040804010008770101080a0100084c
-010005000100030e00000503020201030202050307000808070008050700080207000801
-0700080207000801070008000700080607000802070008090700089307000100080a0100
-0803010008020100080901000805010008010100080a010008050100080b010008010100
-080301000805010008280101080901000805010008010100080a010008050100080b0100
-0801010008030100081c010108080100080201000801010008070100080a010008000100
-08030100080501000805010008020100080101000808010008770101080a0100084c0101
-0500030e0500000005020202010302020503070008080700080207000801070008020700
-080107000802070008010700080107000805070008020700080207000801070008020700
-089307000100080a01000803010008020100080301010804010008040100080101000803
-01010804010008050100080501010803010008010100080201000806010008280101080a
-010008040100080101000803010108040100080501000805010108030100080101000802
-0100081d01010808010008020100080101000802010008030100080a0100080101000802
-01000802010008010100080501000802010008010100080201000804010008770101080a
-0100084c010005000100030e000005030202010302020503070008090702080307020803
-07020802070008020700080407000803070208030702089407000100080a010008040102
-080401010805010008040101080401010802010408030100080501010804010108020100
-0807010008280101080b0100080401010804010108020104080301000805010108040101
-08020100081e010108080100080201000802010208050101080801000802010008020102
-08020100080501000802010008020102080501000877010108080104084a01010500030e
-0500000005020202010302020503070008cb07000100080a0100080d010008060100082a
-01000808010008280101080c0100082a0100081f0101081c010508a00101085801000500
-0100030e000005030202010302020503070008cb07000100080b010108090101083b0101
-082901010859010108c30101085801010500030e05000000050202020103020205030700
-08cb07000100088101010859010108c301010858010005000100030e0000050302020103
-02020503070008cb07000100088101010859010108c30101085801010500030e05000000
-05020202010302020503070008cb07000100088101010859010108c30101085801000500
-0100030e000005030202010302020503070008cb07000100088101010859010108c30101
-085801010500030e0500000005020202010302020503070008cb07000100088101010859
-010108c301010858010005000100030e00000503020201030202050307cd01ff01ff0101
-0500030e050000000502020201030202050301ff01ff01ce05000100030e000005030202
-010302020503010000cb0101008101010059010100c30101005801010500030e05000000
-05020202010302020503010000cb0101008101010059010100c301010058010005000100
-030e000005030202010302020503010000cb010100810101000c0100002a0100001f0101
-00c30101005801010500030e050000000502020201030202050301000028010000040100
-000b0100008e010100810101000b010000040101000b010000030104000a010100020100
-001e010100180100000a01000022010200770101000a0101004b010005000100030e0000
-0503020201030202050301000028010000110100008e010100810101000a010000040100
-00010100000901010003010000020100000901000001010000020100001d010100180100
-000a010000240100007701010009010000010100004a01010500030e0500000005020202
-010302020503010000090102000201000002010000020102000a01010000010000020102
-0003010200020104008c0101008101010009010000050100000101000008010000000100
-00070100000901000001010000030100001c010100080100000001010003010200020104
-000801000001010000030102000201000000010100020100000001010003010200050100
-007701010009010000010100004a010005000100030e0000050302020103020205030100
-000801000002010000010100000201000001010000020100000801000001010100040100
-000201000002010000030100008e010100810101000801000006010000010100000a0100
-00060100000a01000001010000040100001b010100080101000101000001010000020100
-00030100000a010000000100000301000002010000010101000101000001010100010100
-000101000002010000040100007701010009010000010100004a01010500030e05000000
-05020202010302020503010000080100000601000001010000010100000c010000020100
-000401000002010000070100008e010100810101000701000007010000010100000a0100
-00060100000a01000001010000050100001a010100080100000201000001010000020100
-00030100000a010100040100000201000001010000050100000201000001010000020100
-00040100007701010009010000010100004a010005000100030e00000503020201030202
-050301000009010200030100000101000002010200090100000201000004010000030102
-00040100008e010100810101000801000006010000010100000a010000060100000a0100
-0001010000040100001b010100080100000201000001010400030100000a010100040104
-0001010000050100000201000001010400040100007701010009010000010100004a0101
-0500030e05000000050202020103020205030100000c0100000301000000010000050100
-0008010000020100000401000006010000030100008e0101008101010009010000050100
-00010100000a010000050100000b01000001010000030100001c01010008010000020100
-0001010000070100000a0100000001000003010000050100000501000002010000010100
-00080100007701010009010000010100004a010005000100030e00000503020201030202
-050301000008010000020100000301010002010000020100000801000001010100040100
-000201000002010000030100008e010100810101000a0100000401000001010000030101
-000401000005010000050101000301000001010000020100001d01010008010000020100
-000101000002010000030100000a01000001010000020100000201000001010000050100
-00020100000101000002010000040100007701010009010000010100004a01010500030e
-05000000050202020103020205030100000901020005010000030102000a010100000100
-000401000003010200050101008c010100810101000b0100000401010004010100020104
-00030100000501010004010100020100001e010100080100000201000002010200050101
-000801000002010000020102000201000005010000020100000201020005010000770101
-000a0101004b010005000100030e00000503020201030202050301000012010000080105
-00a8010100810101000c0100002a0100001f0101001c010500a00101005801010500030e
-05000000050202020103020205030100000f01000000010000b801010081010100590101
-00c301010058010005000100030e00000503020201030202050301000010010000b90101
-008101010059010100c30101005801010500030e05000000050202020103020205030100
-00cb0101008101010059010100c301010058010005000100030e00000503020201030202
-0503010000cb0101008101010059010100c30101005801010500030e0500000005020202
-010302020503010000cb0101008101010059010100c301010058010005000100030e0000
-05030202010302020503010000cb0101008101010059010100c30101005801010500030e
-050000000502020201030202050301ff01ff01ce05000100030e00000503020201030202
-050307cd01ff01ff01010500030e0500000005020202010302020503070008cb07000100
-088101010859010108c301010858010005000100030e0000050302020103020205030700
-08cb07000100080b0101084e0101082201010859010108c30101085801010500030e0500
-000005020202010302020503070008cb07000100080a0100081c0100082a010008080100
-08210101080c0100082a0100081f010108c301010858010005000100030e000005030202
-0103020205030700081a070008af07000100080a01000805010008050101080c01000804
-0101080a010208020104080a0101080201000807010008210101080b010008040101080a
-010208020104080a010108020100081e0101081a010008a7010108090102080201040802
-0102083d01010500030e05000000050202020103020205030700081a070008af07000100
-080a0100080401010804010008010100080a010008040100080101000808010008020100
-08010100080201000809010008010100080201000806010008210101080a010008040100
-0801010008080100080201000801010008020100080901000801010008020100081d0101
-081a010008a701010808010008020100080101000805010008020100083c010005000100
-030e00000503020201030202050307000809070208030702080307010800070008020702
-08a907000100080a01000803010008000100080401000801010008090100080501000801
-0100080c0100080501000809010008010100080301000805010008210101080901000805
-010008010100080c010008050100080901000801010008030100081c0101080901020803
-0102080301010800010008020102080a0102080301020802010008000101080201000802
-010008020102080201000800010108700101080c01000801010008090100083c01010500
-030e05000000050202020103020205030700080807000802070008010700080207000801
-070008010701080107000802070008a807000100080a0100080501000804010008010100
-080801000806010008010100080c010008040100080a0100080101000804010008040100
-08210101080801000806010008010100080c010008040100080a01000801010008040100
-081b01010808010008020100080101000802010008010100080101010801010008020100
-080801000802010008010100080201000801010108010100080101000802010008010100
-080201000801010108010100086f0101080c01000801010308060100083c010005000100
-030e00000503020201030202050307000808070008050700080207000801070008020700
-080107000802070008a80700010008080101080601000804010008010100080701000807
-010008010100080b010008050100080a0100080101000805010008040101081f01010807
-01000807010008010100080b010008050100080a01000801010008050100081a01010808
-010008050100080201000801010008020100080101000802010008080100080501000802
-010008010100080501000802010008010100080201000801010008730101080b01000806
-010008040100083d01010500030e05000000050202020103020205030700080807000805
-07000802070008010700080207000801070408a807000100080a01000805010008040100
-08010100080801000806010008010100080a010008060100080a01000801010008040100
-0804010008210101080801000806010008010100080a010008060100080a010008010100
-08040100081b010108080100080501000802010008010100080201000801010408090102
-08020104080101000806010008000100080201040801010008730101080a010008070100
-08030100083e010005000100030e00000503020201030202050307000808070008050700
-0802070008010700080207000801070008ac07000100080a010008050100080401000801
-01000809010008050100080101000809010008060100080b010008010100080301000805
-0100082101010809010008050100080101000809010008060100080b0100080101000803
-0100081c0101080801000805010008020100080101000802010008010100081001000801
-010008050100080601000800010008020100080501000873010108090100080401000802
-010008020100083f01010500030e05000000050202020103020205030700080807000802
-070008010700080207000801070008010701080107000802070008a807000100080a0100
-080501000804010008010100080301010804010008040100080101000803010108020100
-08070100080501010803010008010100080201000806010008210101080a010008040100
-0801010008030101080201000807010008050101080301000801010008020100081d0101
-080801000802010008010100080201000801010008010101080101000802010008080100
-080201000801010008020100080101000807010008030100080201000801010008730101
-080801000805010008020100080101000840010005000100030e00000503020201030202
-05030700080907020803070208030701080007000802070208a907000100080a01000803
-010408030101080401010805010008040101080401010802010408030100080501010804
-0101080201000807010008210101080b0100080401010804010108020104080301000805
-01010804010108020100081e01010809010208030102080301010800010008020102080a
-010208030102080201000807010008040102080201000873010108080104080201020802
-0104083c01010500030e0500000005020202010302020503070008cb07000100080a0100
-0814010008060100082a01000808010008210101080c0100082a0100081f010108230105
-089901010858010005000100030e000005030202010302020503070008cb07000100080b
-010108100101083b0101082201010859010108c30101085801010500030e050000000502
-0202010302020503070008cb07000100088101010859010108c301010858010005000100
-030e000005030202010302020503070008cb07000100088101010859010108c301010858
-01010500030e0500000005020202010302020503070008cb070001000881010108590101
-08c301010858010005000100030e000005030202010302020503070008cb070001000881
-01010859010108c30101085801010500030e0500000005020202010302020503070008cb
-07000100088101010859010108c301010858010005000100030e00000503020201030202
-050307cd01ff01ff01010500030e050000000502020201030202050307cd01ff01ff0100
-05000100030e000005030202010302020503070008cb07000100088101010859010108c3
-0101085801010500030e0500000005020202010302020503070008cb07000100080b0101
-084e0101082201010859010108c301010858010005000100030e00000503020201030202
-0503070008cb07000100080a0100081c0100082a01000808010008210101080c0100082a
-0100081f010108c30101085801010500030e05000000050202020103020205030700081a
-070008af07000100080a01000805010008050100080d010008040101080a010208020104
-080a0101080201000807010008210101080b010008040101080a010208020104080a0101
-08020100081e0101081a010008a7010108090102080301020844010005000100030e0000
-050302020103020205030700081a070008af07000100080a01000804010108040101080c
-010008040100080101000808010008020100080101000802010008090100080101000802
-01000806010008210101080a010008040100080101000808010008020100080101000802
-0100080901000801010008020100081d0101081a010008a7010108080100080201000801
-010008020100084301010500030e05000000050202020103020205030700080907020803
-070208030701080007000802070208090700080007010803070208020701080007000803
-070208030702087f07000100080a010008030100080001000803010008000100080b0100
-0805010008010100080c0100080501000809010008010100080301000805010008210101
-080901000805010008010100080c010008050100080901000801010008030100081c0101
-0809010208030102080301010800010008020102080a0102080301020802010008000101
-080201000802010008020102080201000800010108700101080c01000805010008430100
-05000100030e000005030202010302020503070008080700080207000801070008020700
-080107000801070108010700080207000808070108010700080107000802070008010700
-080007000800070008010700080207000801070008020700087e07000100080a01000805
-010008050100080a01000806010008010100080c010008040100080a0100080101000804
-01000804010008210101080801000806010008010100080c010008040100080a01000801
-010008040100081b01010808010008020100080101000802010008010100080101010801
-010008020100080801000802010008010100080201000801010108010100080101000802
-010008010100080201000801010108010100086f0101080c010008050100084301010500
-030e05000000050202020103020205030700080807000805070008020700080107000802
-070008010700080207000808070008020700080507000801070008000700080007000801
-070008020700080107000882070001000808010108060100080501000809010008070100
-08010100080b010008050100080a0100080101000805010008040101081f010108070100
-0807010008010100080b010008050100080a01000801010008050100081a010108080100
-080501000802010008010100080201000801010008020100080801000805010008020100
-08010100080501000802010008010100080201000801010008730101080a010108040101
-0844010005000100030e0000050302020103020205030700080807000805070008020700
-080107000802070008010704080807000802070008020703080107000800070008000700
-0801070408020702087f07000100080a01000805010008050100080a0100080601000801
-0100080a010008060100080a010008010100080401000804010008210101080801000806
-010008010100080a010008060100080a01000801010008040100081b0101080801000805
-010008020100080101000802010008010104080901020802010408010100080601000800
-0100080201040801010008730101080c010008050100084301010500030e050000000502
-02020103020205030700080807000805070008020700080107000802070008010700080c
-07000802070008010700080207000801070008000700080007000801070008090700087e
-07000100080a01000805010008050100080b010008050100080101000809010008060100
-080b01000801010008030100080501000821010108090100080501000801010008090100
-08060100080b01000801010008030100081c010108080100080501000802010008010100
-080201000801010008100100080101000805010008060100080001000802010008050100
-08730101080c0100080501000843010005000100030e0000050302020103020205030700
-080807000802070008010700080207000801070008010701080107000802070008080700
-080207000801070008020700080107000800070008000700080107000802070008010700
-08020700087e07000100080a010008050100080501000805010108040100080401000801
-010008030101080201000807010008050101080301000801010008020100080601000821
-0101080a0100080401000801010008030101080201000807010008050101080301000801
-010008020100081d01010808010008020100080101000802010008010100080101010801
-010008020100080801000802010008010100080201000801010008070100080301000802
-0100080101000873010108080100080201000801010008020100084301010500030e0500
-000005020202010302020503070008090702080307020803070108000700080207020809
-070008020700080207030801070008000700080007000802070208030702087f07000100
-080a01000803010408010104080301010805010008040101080401010802010408030100
-0805010108040101080201000807010008210101080b0100080401010804010108020104
-08030100080501010804010108020100081e010108090102080301020803010108000100
-08020102080a010208030102080201000807010008040102080201000873010108090102
-080301020844010005000100030e00000503020201030202050307000823070508a10700
-0100080a01000814010008060100082a01000808010008210101080c0100082a0100081f
-01010823010508990101085801010500030e0500000005020202010302020503070008cb
-07000100080b010108100101083b0101082201010859010108c301010858010005000100
-030e000005030202010302020503070008cb07000100088101010859010108c301010858
-01010500030e0500000005020202010302020503070008cb070001000881010108590101
-08c301010858010005000100030e000005030202010302020503070008cb070001000881
-01010859010108c30101085801010500030e0500000005020202010302020503070008cb
-07000100088101010859010108c301010858010005000100030e00000503020201030202
-0503070008cb07000100088101010859010108c30101085801010500030e050000000502
-020201030202050307cd01ff01ff010005000100030e00000503020201030202050301ff
-01ff01cf0500030e0500000005020202010302020503010000cb01010081010100590101
-00c301010058010005000100030e000005030202010302020503010000cb010100810101
-0059010100c30101005801010500030e0500000005020202010302020503010000cb0101
-00810101000c0100002a0100001f010100c301010058010005000100030e000005030202
-0103020205030100003d0100000a0100000a010000060102006a010100810101000b0100
-00040101000a010200030102000b010100020100001e010100c30101000a0101004b0101
-0500030e05000000050202020103020205030100003d0100000a0100000a010000080100
-006a010100810101000a0100000401000001010000080100000201000001010000020100
-000901000001010000020100001d010100c301010009010000010100004a010005000100
-030e00000503020201030202050301000008010100000100000201000002010000080100
-000001010003010200020101000001000003010200030101000001000008010400020102
-000201000000010100050100000301020063010100810101000901000005010000010100
-000c010000050100000901000001010000030100001c010100c301010009010000010100
-004a01010500030e05000000050202020103020205030100000801000000010000000100
-000101000002010000080101000101000001010000020100000101000000010000000100
-00010100000201000001010000010101000a010000030100000201000001010100010100
-0004010000020100000201000062010100810101000801000006010000010100000c0100
-00050100000901000001010000040100001b010100c301010009010000010100004a0100
-05000100030e000005030202010302020503010000080100000001000000010000020100
-000101000008010000020100000501000001010000000100000001000001010000020100
-0001010000020100000a0100000701000001010000020100000401000002010000020100
-0062010100810101000701000007010000010100000a010100040101000a010000010100
-00050100001a010100c301010009010000010100004a01010500030e0500000005020202
-010302020503010000080100000001000000010000020100000101000008010000020100
-00020103000101000000010000000100000101040001010000020100000a010000040103
-000101000002010000040100000201040062010100810101000801000006010000010100
-000c010000050100000901000001010000040100001b010100c301010009010000010100
-004a010005000100030e0000050302020103020205030100000801000000010000000100
-000301000000010000080100000201000001010000020100000101000000010000000100
-000101000005010000020100000a01000003010000020100000101000002010000040100
-000201000066010100810101000901000005010000010100000c01000005010000090100
-0001010000030100001c010100c301010009010000010100004a01010500030e05000000
-050202020103020205030100000801000000010000000100000301010009010000020100
-000101000002010000010100000001000000010000010100000201000001010000010101
-000a01000003010000020100000101010001010000040100000201000002010000620101
-00810101000a010000040100000101000003010100020100000201000001010000020100
-00030101000301000001010000020100001d010100c301010009010000010100004a0100
-05000100030e000005030202010302020503010000080100000001000000010000040100
-000901000002010000020103000101000000010000000100000201020003010100000100
-000b010100020103000101000000010100050100000301020063010100810101000b0100
-00040101000401010003010200030102000401010004010100020100001e010100c30101
-000a0101004b01010500030e050000000502020201030202050301000012010000010105
-002301050085010100810101000c0100002a0100001f010100c301010058010005000100
-030e0000050302020103020205030100000f01000000010000b801010081010100590101
-00c30101005801010500030e050000000502020201030202050301000010010000b90101
-008101010059010100c301010058010005000100030e0000050302020103020205030100
-00cb0101008101010059010100c30101005801010500030e050000000502020201030202
-0503010000cb0101008101010059010100c301010058010005000100030e000005030202
-010302020503010000cb0101008101010059010100c30101005801010500030e05000000
-05020202010302020503010000cb0101008101010059010100c301010058010005000100
-030e00000503020201030202050301ff01ff01cf0500030e050000000502020201030202
-050307cd01ff01ff010005000100030e000005030202010302020503070000cb07000100
-008101010059010100c30101005801010500030e05000000050202020103020205030700
-00cb07000100000b0101004e0101002201010059010100c301010058010005000100030e
-000005030202010302020503070000cb07000100000a0100001c0100002a010000080100
-00210101000c0100002a0100001f010100c30101005801010500030e0500000005020202
-0103020205030700001f0700000a070000060702009407000100000a0100000401020003
-0102000c010000040101000a010200030102000b0101000201000007010000210101000b
-010000040101000a010200030102000b010100020100001e010100c30101000a0101004b
-010005000100030e0000050302020103020205030700001f0700000a0700000807000094
-07000100000a010000030100000201000001010000020100000a01000004010000010100
-000801000002010000010100000201000009010000010100000201000006010000210101
-000a01000004010000010100000801000002010000010100000201000009010000010100
-00020100001d010100c301010009010000010100004a01010500030e0500000005020202
-010302020503070000080701000007000002070000020700000807040002070200020700
-000007010005070000030702008d07000100000a01000007010000050100000901000005
-010000010100000c01000005010000090100000101000003010000050100002101010009
-01000005010000010100000c010000050100000901000001010000030100001c010100c3
-01010009010000010100004a010005000100030e00000503020201030202050307000008
-070000000700000007000001070000020700000a07000003070000020700000107010001
-0700000407000002070000020700008c07000100000a0100000701000005010000080100
-0006010000010100000c0100000501000009010000010100000401000004010000210101
-000801000006010000010100000c010000050100000901000001010000040100001b0101
-00c301010009010000010100004a01010500030e05000000050202020103020205030700
-0008070000000700000007000002070000010700000a0700000707000001070000020700
-000407000002070000020700008c07000100000801010007010000050100000801000007
-010000010100000a010100040101000a0100000101000005010000040101001f01010007
-01000007010000010100000a010100040101000a01000001010000050100001a010100c3
-01010009010000010100004a010005000100030e00000503020201030202050307000008
-070000000700000007000002070000010700000a07000004070300010700000207000004
-070000020704008c07000100000a01000005010000050100000a01000006010000010100
-000c01000005010000090100000101000004010000040100002101010008010000060100
-00010100000c010000050100000901000001010000040100001b010100c3010100090100
-00010100004a01010500030e050000000502020201030202050307000008070000000700
-000007000003070000000700000a07000003070000020700000107000002070000040700
-00020700009007000100000a01000004010000050100000c01000005010000010100000c
-010000050100000901000001010000030100000501000021010100090100000501000001
-0100000c010000050100000901000001010000030100001c010100c30101000901000001
-0100004a010005000100030e000005030202010302020503070000080700000007000000
-070000030701000b07000003070000020700000107010001070000040700000207000002
-0700008c07000100000a0100000301000005010000070101000401000004010000010100
-000301010002010000020100000101000002010000030101000301000001010000020100
-0006010000210101000a0100000401000001010000030101000201000002010000010100
-0002010000030101000301000001010000020100001d010100c301010009010000010100
-004a01010500030e05000000050202020103020205030700000807000000070000000700
-00040700000c07010002070300010700000007010005070000030702008d07000100000a
-010000030104000101040003010100050100000401010004010100030102000301020004
-010100040101000201000007010000210101000b01000004010100040101000301020003
-0102000401010004010100020100001e010100c30101000a0101004b010005000100030e
-0000050302020103020205030700001207000001070500af07000100000a010000140100
-00060100002a01000008010000210101000c0100002a0100001f010100c3010100580101
-0500030e05000000050202020103020205030700000f07000000070000b807000100000b
-010100100101003b0101002201010059010100c301010058010005000100030e00000503
-020201030202050307000010070000b907000100008101010059010100c3010100580101
-0500030e0500000005020202010302020503070000cb07000100008101010059010100c3
-01010058010005000100030e000005030202010302020503070000cb0700010000810101
-0059010100c30101005801010500030e0500000005020202010302020503070000cb0700
-0100008101010059010100c301010058010005000100030e000005030202010302020503
-070000cb07000100008101010059010100c30101005801010500030e0500000005020202
-01030202050307cd01ff01ff010005000100030e00000503020201030202050307cd01ff
-01ff01010500000005000000050000000500000005000000050000000500000005000000
-0500000005020202010302020503070000cb07000100008101010059010100c301010058
-010005000100030000000500000005000000050000000500000005000000050000000500
-000005030202010302020503070000cb07000100000b0101004e01010022010100590101
-00c301010058010105000300050000000508010005000300050000000502020201030202
-0503070000cb07000100000a0100001c0100002a01000008010000210101000c0100002a
-0100001f010100c301010058010005000100030105000000050801000300000005030202
-010302020503070000cb07000100000a01000005010000040102000c010000040101000d
-010000020102000b0101000201000007010000210101000b010000040101000d01000002
-0102000b010100020100001e0101002001010018010000150100006f0101000a01000005
-010100040101003d01010500030100000508010003010500000005020202010302020503
-070000cb07000100000a0100000401010003010000020100000a01000004010000010100
-000b010100010100000201000009010000010100000201000006010000210101000a0100
-0004010000010100000b01010001010000020100000901000001010000020100001d0101
-001f0100001a010000150100006f01010009010100040100000101000002010000010100
-003c01000500010003020000050601000500030100000503020201030202050307000009
-070100000700000207020009070000000701000307020002070100000700000307020003
-0702008d07000100000a0100000301000000010000070100000901000005010000010100
-000a01000000010000050100000901000001010000030100000501000021010100090100
-0005010000010100000a01000000010000050100000901000001010000030100001c0101
-000901010000010000020102000b01000003010000000101000301020002010000000101
-000201040002010200020100000001010003010100000100006f01010008010000000100
-00040100000101000002010000010100003c010105000302050000000504010005000302
-050000000502020201030202050307000008070000010701000107000002070000080701
-000107000001070000020700000107000000070000000700000107000002070000010700
-00020700008c07000100000a010000050100000701000008010000060100000101000009
-010000010100000501000009010000010100000401000004010000210101000801000006
-010000010100000901000001010000050100000901000001010000040100001b01010008
-010000010101000101000002010000080104000101010001010000010100000201000001
-01010001010000030100000301000002010000010101000101000001010000010101006f
-0101000a010000040100000101000002010000010100003c010005000100030305000000
-0504010003020000050302020103020205030700000807000002070000010700000c0700
-000207000005070000010700000007000000070000010700000207000001070000900700
-010000080101000601000006010000080100000701000001010000080100000201000003
-0101000a0100000101000005010000040101001f01010007010000070100000101000008
-01000002010000030101000a01000001010000050100001a010100080100000201000001
-0100000e0100000301000005010000020100000101000002010000030100000301000002
-010000010100000201000001010000020100006f0101000a010000040100000101000002
-010000010100003c01010500030300000504010003030500000005020202010302020503
-070000080700000207000002070200090700000207000002070300010700000007000000
-07000001070400020702008d07000100000a01000005010000050100000a010000060100
-000101000008010000020100000501000009010000010100000401000004010000210101
-000801000006010000010100000801000002010000050100000901000001010000040100
-001b0101000801000002010000020102000b010000030100000501000002010000010100
-00020100000301000003010400010100000201000001010000020100006f0101000a0100
-00040100000101000002010000010100003c010005000100030400000502010005000303
-000005030202010302020503070000080700000207000005070000080700000207000001
-0700000207000001070000000700000007000001070000090700008c07000100000a0100
-0005010000040100000c0100000501000001010000080105000401000009010000010100
-000301000005010000210101000901000005010000010100000801050004010000090100
-0001010000030100001c0101000801000002010000050100000a01000003010000050100
-000201000001010000020100000301000003010000050100000201000001010000020100
-006f0101000a010000040100000101000002010000010100003c01010500030405000000
-050001000500030405000000050202020103020205030700000807000001070100010700
-000207000008070000020700000107000002070000010700000007000000070000010700
-000207000001070000020700008c07000100000a01000005010000030100000701010004
-010000040100000101000003010100060100000101000002010000030101000301000001
-0100000201000006010000210101000a0100000401000001010000030101000601000001
-01000002010000030101000301000001010000020100001d010100080100000101010001
-010000020100000a01000003010000050100000201000001010000020100000301000003
-01000002010000010100000201000001010000010101006f0101000a0100000401000001
-01000002010000010100003c010005000100030505000100050001000304000005030202
-010302020503070000090701000007000002070200090700000207000002070300010700
-00000700000007000002070200030702008d07000100000a010000030104000101040003
-010100050100000401010004010100060100000201020004010100040101000201000007
-010000210101000b01000004010100040101000601000002010200040101000401010002
-0100001e0101000901010000010000020102000b01000003010000060102000201000002
-0100000401010002010200020100000201000002010100000100006f0101000801040003
-010100040101003d01010500030500000500010003050500000005020202010302020503
-0700000c07000007070500af07000100000a01000014010000060100002a010000080100
-00210101000c0100002a0100001f0101000c01000007010500a701010058010005000100
-03060100050003050000050302020103020205030700000807000002070000bd07000100
-000b010100100101003b01010022010100590101000801000002010000b5010100580101
-0500030605000306050000000502020201030202050307000009070200be070001000081
-0101005901010009010200b6010100580100050001000500000005000000050000000500
-00000500000005000000050000000500000005030202010302020503070000cb07000100
-008101010059010100c30101005801010500000005000000050000000500000005000000
-050000000500000005000000050000000502020201030202050301000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005110202
-010302020502010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100051202020103020205030100030d05000300050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-0000030000000500030c050000000511020201030202050201000500030b000005000100
-030000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050003000500000005000000030a0000051202020103020205030100
-03090500000005000100050003000500000005ff05ff05ac010003000000050000000500
-000005000308050000000511020201030202050201000500030700000500000005020100
-0300000005ff05ff05ac0100050003000500000005020000050000000306000005120202
-01030202050301000305050000000500000005020100050003000500000005ff05ff05ac
-010003000000050400000500000005000304050000000511020201030202050201000500
-0303000005000000050601000300000005ff05ff05ac0100050003000500000005060000
-050000000302000005120202010302020503010003010500000005000000050601000500
-03000500000005ff05ff05ac010003000000050800000500000005000300050000000511
-020201030202050201000500010005000100050a01000300000005ff05ff05ac01000500
-030005000000050801000500010005000000051202020103020205030100030105000100
-0500010005060100050003000500000005ff05ff05ac0100030000000508010005000100
-050003000500000005110202010302020502010005000303010005000100050601000300
-000005ff05ff05ac01000500030005000000050601000500010003020000051202020103
-0202050301000305050001000500010005020100050003000500000005ff05ff05ac0100
-030000000504010005000100050003040500000005110202010302020502010005000307
-010005000100050201000300000005ff05ff05ac01000500030005000000050201000500
-010003060000051202020103020205030100030905000100050001000500030005000000
-05ff05ff05ac010003000000050001000500010005000308050000000511020201030202
-050201000500030b01000500010003000000050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000100050001000500010005000100050003000500000005000100030a
-0000051202020101000405030100030d0500030005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001000500010005000100050001000500010005000100030000000500030c
-050000000511000502020400050201000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005120000020204000000020204000503
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000051100000202040000000202040005ff05ff05e800000202040000000202
-040005ff05ff05e800000202040000000202040005ff05ff05e800000202040000000202
-0400000502ff02ff02dc00060202040000000208040002ff02ff02dc0000020804000000
-0208040002ff02ff02dc00000208040000000208040001ff01ff01dc0000020804000000
-040901ff01ff01dc00000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 377 205
-%%EOF
diff --git a/lib/tv/doc/src/tv_start_system.gif b/lib/tv/doc/src/tv_start_system.gif
deleted file mode 100644
index 3d9502b00c..0000000000
--- a/lib/tv/doc/src/tv_start_system.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_start_system.ps b/lib/tv/doc/src/tv_start_system.ps
deleted file mode 100644
index 5c115328c5..0000000000
--- a/lib/tv/doc/src/tv_start_system.ps
+++ /dev/null
@@ -1,1330 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_start_system.eps)
-%%CreationDate: (Mon Mar 19 17:15:27 2001)
-%%BoundingBox: 0 0 377 205
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 377 205
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-377.000000 205.000000
-12
-755 410
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-828282
-aab6aa
-000000
-000000
-000000
-000000
-000000
-000000
-000000
-000a01ff01ff01dc000b0208040001ff01ff01dc00000208040000000208040002ff02ff
-02dc000002080400000002080400020000ff00ff00d90400020000000208040000000202
-04060200000004ff04ff04d9020000000405020204000000020204000209000d02ff02ff
-02d000000202040000000202040002080000020d040002f6010302110103023801010206
-0101024001010230010102ff020400000202040000000202040002080000020d040002f6
-010102020107020001010203010102010101020e0105020001070201010302070100020b
-01010206010102400101020c0104021e010102ff02040000020204000000020204000208
-0000020d040002f6010102050101020301010203010102010101020e0101020701010203
-01010201010102050101020b010102060101024e010102020101021d010102ff02040000
-0202040000000202040002080000020204060203040002f6010102050101020301010203
-010102010101020e01010207010102030101020801040201010302030101020001010203
-010102020103020301040206010302030101020001010207010102000101020101010203
-010302030101020201010200010102020101020101030202010102000101020101010203
-010302020101020001010201010102020103020201010202010102f30000020204000000
-04030208000002020400030400000203040002f601010205010102040101020201000202
-0101020e0101020701010203010202080101020201010201010102020102020001010202
-010102010101020101010201010102090101020101010202010202000101020601020200
-010202000101020101010201010102020101020201020200010102010101020001010200
-010102020102020001020200010102010101020101010201010102000101020101010201
-010102010101020101010202010102f3000004030101020b000002030400030200000204
-040002f6010102050101020401010201010102020101020e010402040101020401030206
-010102060101020201010201010102020101020101010201010102010102020801010201
-010102020101020101010206010102010101020101010205010102020101020201010201
-010102010101020001010200010102020101020101010201010102050101020101020203
-01010201010102010101020101010202010002f70103020b000002030400030200000204
-040002f6010102050101020501010200010002030101020e010102070101020601020205
-010102030104020201010201010102020101020101050202010302060101020101010202
-010102010101020601010201010102010101020201040202010102020101020101010201
-010102000101020001010202010102010101020101010202010402010101020401010201
-0105020201010200010102f70103020b000002040400030000000205040002f601010205
-01010205010302030101020e010102070101020701010205010102020101020101010202
-010102010101020201010201010102080102020501010201010102020101020101010206
-010102010101020101010201010102010101020201010202010102010101020101010201
-010102000101020101010201010102010101020101010201010102010101020401010201
-0101020601010200010002f80103020b000002040400030000000205040002f601010205
-01010206010102040101020e010102070101020301010201010102050101020201010201
-010102020101020101010202010102010101020201000205010102050101020101010202
-010102010101020601010201010102010101020101010201010102020101020201010201
-010102020101020701010201010102010101020101010201010102010101020401010201
-0101020201000203010202f80103020b0000020500000206040002f60101020501010206
-010102040101020e01050203010102040103020701020201010202000101020101040203
-010102020103020201040207010302030101020101010206010102010101020101010202
-010202000101020101010202010102010101020301050202010102010101020101010202
-0102020001010200010102040101020201030204010102f90103020b0000020d040002f6
-01030211010302c4010102fa0103020b0000020d040002ff02d5010102fa0103020b0000
-020d040002ff02ff02d20103020c040d02ff02ff02d3010302ff02ff02ee010302ff02ff
-02ee0103020200ff00ff00e70400020201030202000004ff04ff04e70202010302ff02ff
-02ee0103020200ff00ff00e802020103020200ff00ff00e70700020201030202000105ff
-05ff05e40701020201030202000105ff05ff05e40701020201030202000105ff05ff05e4
-0701020201030202000105ff05ff05e40701020201030202000105ff05ff05e407010202
-010302020001050b06040504060005030602051f0600050206000504060005270602050b
-06000506060005ff05ff053506000502060005090602051307010202010302020001050b
-0600050f0600051f060005020600052c060005020600050a060005ff05ff053d06000502
-0600050b0600051307010202010302020001050b06000506060205050600050306020518
-060005020600050206020503060205020600050206000517060005020600050106000500
-060105020604050206020503060205020600050006010503060205ff05ff052006000502
-060005020602050506000502060005000601050c07010202010302020001050b06000508
-060005050600050206000502060005180600050006000505060005020600050206000501
-060005020600051706000502060005010601050106000503060005060600050206000502
-06000501060105010600050106000502060005ff05ff051f060005020600050106000502
-0600050406000502060105010600050b07010202010302020001050b0603050506000505
-060005020600050206000518060005000600050506000502060005020600050106000500
-060005000600051706000502060005010600050206000503060005060600050206000502
-060005010600050206000501060005ff05ff052306040501060005020600050406000502
-060005020600050b07010202010302020001050b06000508060005050600050206040518
-060005000600050506000502060405010600050006000500060005170600050206000501
-0600050206000503060005060600050206000502060005010600050206000502060205ff
-05ff052006000502060005010604050406000502060005020600050b0701020201030202
-0001050b0600050806000505060005020600051d06000506060005020600050506000500
-060005000600051706000502060005010600050206000503060005060600050206000502
-060005010600050206000505060005ff05ff051f06000502060005010600050806000502
-060005020600050b07010202010302020001050b06000508060005050600050206000502
-060005190600050606000502060005020600050106000500060005000600051706000502
-060005010601050106000503060005060600050206000502060005010600050206000501
-06000502060005ff05ff051f060005020600050106000502060005040600050206010501
-0600050b07010202010302020001050b0600050806000505060005030602051a06000506
-060005030602050306000500060005190602050206000500060105050601050406000503
-060205020600050206000502060205ff05ff052006000502060005020602050506000502
-060005000601050c070102020103020200010576060005ff05ff055b0600050f07010202
-010302020001050a0606052a0606052a06060500060005ff05ff05450606050e0600050f
-07010202010302020001050a0606052a0606052a06060500060005ff05ff05450606050e
-0600050f0701020201030202000105ff05ff05e40701020201030202000105ff05ff05e4
-0701020201030202000105ff05ff05e40701020201030202000107ff07ff07e602020103
-0202000007ff07ff07e702020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e8020201030202051c010205040103
-05c1010205040103051a0102057f01010505010205f001020504010305190101052f0202
-01030202050e01060508010005060101050f010205010102059b01060508010005060101
-0510010505040101054d010205240104050d0101051e0102052401020501010205930106
-0508010005060101051101030535020201030202050e0100050101010500010005070101
-050601000511010105010100059d01000501010105000100050701010506010005130101
-05060100054d0101050001010524010105000101050c0100051e01010500010105240101
-050101000595010005010101050001000507010105060100051101010501010105340202
-010302020510010105030103050201030503010105030103050801020500010105010103
-05000101050001000500010005020103058b010105030103050201030503010105030103
-050a010105030104054c0101050101050500010305000102050201030501010105000102
-05070101050101010500010305030104051d010105010105050001030500010205020103
-050101010500010205070102050001010501010305000101050001000500010005020103
-058301010503010305020103050301010503010305090101050101000500010305020105
-050101030521020201030202051001010506010105000101050101010502010105020101
-0501010105070100050001000500010005050101050001050500010105010101058a0101
-050601010500010105010101050201010502010105010101050901010502010105010101
-054c01000502010105000101050201000500010205000101050001010501010105010102
-050001000507010105010101050201010502010105010101051d01000502010105000101
-050201000500010205000101050001010501010105010102050001000507010005000100
-050001000505010105000105050001010501010105820101050601010500010105010101
-050201010502010105010101050801020504010105020101050001010501010105010101
-052002020103020205100100050401040500010105010101050201010501010605070100
-0500010205020104050001010500010005000107058a0100050401040500010105010101
-0502010105010106050901010501010105020101054b0101050201000501010105000100
-05000100050001010501010805010101050a0103050401010501010105020101051c0101
-05020100050101010500010005000100050001010501010805010101050a010005000102
-050201040500010105000100050001070582010005040104050001010501010105020101
-05010106050901020503010105040101050101060520020201030202050f010105020101
-0501010105000101050201010501010105020101050b0101050001010501010105010101
-05010100050001000500010005000101058e010105020101050101010500010105020101
-0501010105020101050d01010502010105010101054c0101050101010501010205000100
-05010100050201000500010105050101050a0101050601010502010105010101051d0101
-05010101050101020500010005010100050201000500010105050101050a010105000101
-050101010501010105010100050001000500010005000101058601010502010105010101
-05000101050201010501010105020101050b010105010101050201010503010105030101
-0525020201030202050f0101050201010501010105000101050101010502010105020101
-050101010507010005010101050101010501010105000101050001000500010005000101
-05010101058a010105020101050101010500010105010101050201010502010105010101
-050901010502010105010101054c01010500010105020103050101010501010105000101
-0501010105010101050a0101050601010502010105010101051d01010500010105020103
-0501010105010101050001010501010105010101050a0100050101010501010105010101
-050001010500010005000100050001010501010105820101050201010501010105000101
-050101010502010105020101050101010507010105010101050201010502010205000101
-05000101050101010521020201030202050e01030502010a050101050501010305070102
-0500010105020107050001000500010105000103058a01030502010a0501010505010103
-0508010505010105054c0102050301010500010005000103050001020500010305010104
-050701030503010505010105051d01020503010105000100050001030500010205000103
-05010104050701020500010105020107050001000500010105000103058201030502010a
-050101050501010305090103050101050500010505010103052202020103020205ff05ff
-05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff
-05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff
-05e8020201030202050201ff01ff01e205020202010302020503010000cb010100810101
-0059010100c30101005801000711000005020202010302020503010000cb010100810101
-0059010100c30101005801000701030607000306000105020202010302020503010000cb
-010100810101000c0100002301000026010100c301010058010007010305000007000306
-0001050202020103020205030100001f0100000a0100009e010100810101000b01000004
-010100090104000a01010002010000250101001e0102000501000012010000060100002e
-010000120102000301020031010100080104004a01000701030500000701030500010502
-02020103020205030100001f0100000a0100009e010100810101000a0100000401000001
-010000080100000d01000001010000020100002401010020010000190100003601000014
-010000050100003101010008010000020100004a01000701030400010701030500010502
-02020103020205030100000901020003010200090104000201020002010000000101009b
-01010081010100090100000501000001010000080100000d010000010100000301000023
-010100090102000201000000010100020100000001010005010000030102000301020003
-01020002010400020102000301020002010000000101000a010200030102000201000000
-010100020104000101000000010100030102000501000005010000030102000201000000
-010100230101000c0100004a010007010304000105000701030400010502020201030202
-0503010000080100000201000001010000020100000a0100000301000002010000010101
-00010100009a01010081010100080100000601000001010000080103000a010000010100
-000401000022010100080100000201000001010100010100000101010001010000040100
-000501000002010000020100000101000002010000030100000601000002010000020100
-000101010001010000080100000201000001010000020100000101010001010000030100
-000301010001010000010100000201000004010000050100000201000002010000010101
-0001010000220101000b0100004b01000701030300010501070103040001050202020103
-020205030100000c010000010100000e0100000701000001010000020100009a01010081
-0101000701000007010000010100000c010000090100000101000005010000210101000c
-010000010100000201000001010000020100000401000005010000020100000901000003
-010000060100000201000002010000010100000201000008010000050100000201000001
-010000020100000301000003010000050100000201000004010000050100000201000002
-01000001010000260101000b0100004b0100070103030001050207010303000105020202
-01030202050301000009010300010100000e0100000401030001010000020100009a0101
-00810101000801000006010000010100000c010000090100000101000004010000220101
-000901030001010000020100000101000002010000040100000501000002010000060103
-000301000006010000020100000201000001010000020100000801000005010000020100
-000101000002010000030100000301000005010000020100000401000005010000020104
-0001010000260101000b0100004b01000701030200010503070103030001050202020103
-020205030100000801000002010000010100000e01000003010000020100000101000002
-0100009a0101008101010009010000050100000101000008010000020100000901000001
-010000030100002301010008010000020100000101000002010000010100000201000004
-010000050100000201000005010000020100000301000006010000020100000201000001
-010000020100000801000005010000020100000101000002010000030100000301000005
-0100000201000004010000050100000201000005010000260101000a0100004c01000701
-030200010504070103020001050202020103020205030100000801000002010000010100
-00020100000a010000030100000201000001010100010100009a010100810101000a0100
-000401000001010000030101000201000002010000030101000301000001010000020100
-002401010008010000020100000101010001010000010101000101000004010000050100
-000201000002010000010100000201000003010000060100000201000002010000010100
-000201000008010000020100000101000002010000010100000201000003010000030100
-0005010000020100000401000005010000020100000201000001010000260101000a0100
-004c01000701030100010505070103020001050202020103020205030100000901030002
-0102000c0101000201030001010000000101009b010100810101000b0100000401010004
-010100030102000401010004010100020100002501010009010300010100000001010002
-010000000101000501000005010000030102000301030004010100040100000301020002
-010000020100000901020003010200020100000201000004010100010100000601020005
-010000050100000301020002010000260101000a0100004c010007010301000105060701
-030100010502020201030202050301000015010500af010100810101000c010000230100
-00260101000f010000050100003c01050068010100580100070103000001050707010301
-000105020202010302020503010000cb01010081010100590101000f01000005010000ab
-010100580100070103000001050807010300000105020202010302020503010000cb0101
-0081010100590101000f01000005010000ab01010058010007010001070b030000010502
-0202010302020503010000cb0101008101010059010100c301010058010007010000070d
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-030e000105020202010302020503010000cb0101008101010059010100c3010100580100
-0701001005020202010302020503010000cb0101008101010059010100c3010100580100
-0701000d070000010502020201030202050301ff01ff01ce07010001050a070100010502
-020201030202050301ff01ff01ce07010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb010100810101000c0100002a0100001f010100c30101
-0058010007010001050a070100010502020201030202050301000010010200090100000d
-0102000a010200100100007b010100810101000b010000040101000b010000050100000c
-010100020100001e01010010010200090100000d010200930101000a0101004b01000701
-0001050a070100010502020201030202050301000012010000090100000f0100000c0100
-00100100007b010100810101000a010000040100000101000009010100040101000b0100
-0001010000020100001d01010012010000090100000f0100009301010009010000010100
-004a010007010001050a0701000105020202010302020503010000090101000001000004
-01000003010200020100000001010003010200050100000c010000030102000301020002
-010000010100000301020071010100810101000901000005010000010100000801000000
-01000003010000000100000b01000001010000030100001c010100090101000001000004
-010000030102000201000000010100030102000501000009010000000101000301020002
-01010000010000030102000a010200030102000201000000010100020100000201000002
-01020002010000000101003f01010009010000010100004a010007010001050a07010001
-050202020103020205030100000801000001010100040100000201000002010000010101
-00010100000101000002010000040100000c010000020100000201000001010000020100
-000101000000010000030100000201000070010100810101000801000006010000010100
-000a010000050100000b01000001010000040100001b0101000801000001010100040100
-000201000002010000010101000101000001010000020100000401000009010100010100
-000101000002010000010100000001000000010000010100000201000008010000020100
-000101000002010000010101000101000001010000020100000101000002010000010101
-00010100003e01010009010000010100004a010007010001050a07010001050202020103
-020205030100000801000002010000040100000201000002010000010100000201000005
-010000040100000c01000002010000020100000101000005010100040100007401010081
-0101000701000007010000010100000a010000050100000b01000001010000050100001a
-010100080100000201000004010000020100000201000001010000020100000501000004
-010000090100000201000005010000010100000001000000010000010100000201000008
-010000050100000201000001010000050100000201000001010000020100000101000042
-01010009010000010100004a010007010001050a07010001050202020103020205030100
-000801000002010000040100000201000002010000010100000201000002010300040100
-000c01000002010000020100000101000005010100050102007101010081010100080100
-0006010000010100000a010000050100000b01000001010000040100001b010100080100
-000201000004010000020100000201000001010000020100000201030004010000090100
-000201000002010300010100000001000000010000010104000901020002010400010100
-00060100000001000002010400010100004201010009010000010100004a010007010001
-050a07010001050202020103020205030100000801000002010000040100000201000002
-01000001010000020100000101000002010000040100000c010000020100000201000001
-01000005010000000100000701000070010100810101000901000005010000010100000a
-010000050100000b01000001010000030100001c01010008010000020100000401000002
-010000020100000101000002010000010100000201000004010000090100000201000001
-010000020100000101000000010000000100000101000010010000010100000501000006
-0100000001000002010000050100004201010009010000010100004a010007010001050a
-070100010502020201030202050301000008010000010101000401000002010000020100
-0001010100010100000101000002010000040100000c0100000201000002010000010100
-00020100000101000001010000020100000201000070010100810101000a010000040100
-0001010000030101000401000005010000050101000301000001010000020100001d0101
-000801000001010100040100000201000002010000010101000101000001010000020100
-000401000009010000020100000101000002010000010100000001000000010000010100
-000201000008010000020100000101000002010000010100000701000003010000020100
-00010100004201010009010000010100004a010007010001050a07010001050202020103
-020205030100000901010000010000040100000301020002010000000101000301030004
-0100000c010000030102000301020002010000020100000201020071010100810101000b
-010000040101000401010002010400010104000301010004010100020100001e01010009
-010100000100000401000003010200020100000001010003010300040100000901000002
-01000002010300010100000001000000010000020102000a010200030102000201000007
-0100000401020002010000420101000a0101004b010007010001050a0701000105020202
-0103020205030100000c0100002301050093010100810101000c0100002a0100001f0101
-000c010000230105001c0105006801010058010007010001050a07010001050202020103
-020205030100000801000002010000bd01010081010100590101000801000002010000b5
-01010058010007010001050a070100010502020201030202050301000009010200be0101
-00810101005901010009010200b601010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a070100010502020201030202050301ff01ff01ce0701
-0001050a070100010502020201030202050301ff01ff01ce07010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb010100810101000c0100002a
-0100001f010100c301010058010007010001050a07010001050202020103020205030100
-0010010200090100000d0102009b010100810101000b010000040101000b010000050100
-000c010100020100001e01010010010200090100000d010200930101000a0101004b0100
-07010001050a070100010502020201030202050301000012010000090100000f0100009b
-010100810101000a010000040100000101000009010100040101000b0100000101000002
-0100001d01010012010000090100000f0100009301010009010000010100004a01000701
-0001050a0701000105020202010302020503010000090101000001000004010000030102
-000201000000010100030102000501000009010000000101000301020002010100000100
-000301020003010200710101008101010009010000050100000101000008010000000100
-0003010000000100000b01000001010000030100001c0101000901010000010000040100
-000301020002010000000101000301020005010000090100000001010003010200020101
-0000010000030102000a0102000301020002010000000101000201000002010000020102
-0002010000000101003f01010009010000010100004a010007010001050a070100010502
-020201030202050301000008010000010101000401000002010000020100000101010001
-010000010100000201000004010000090101000101000001010000020100000101000000
-010000000100000101000002010000010100000201000070010100810101000801000006
-010000010100000a010000050100000b01000001010000040100001b0101000801000001
-010100040100000201000002010000010101000101000001010000020100000401000009
-010100010100000101000002010000010100000001000000010000010100000201000008
-010000020100000101000002010000010101000101000001010000020100000101000002
-01000001010100010100003e01010009010000010100004a010007010001050a07010001
-050202020103020205030100000801000002010000040100000201000002010000010100
-000201000005010000040100000901000002010000050100000101000000010000000100
-0001010000020100000101000074010100810101000701000007010000010100000a0100
-00050100000b01000001010000050100001a010100080100000201000004010000020100
-000201000001010000020100000501000004010000090100000201000005010000010100
-000001000000010000010100000201000008010000050100000201000001010000050100
-00020100000101000002010000010100004201010009010000010100004a010007010001
-050a07010001050202020103020205030100000801000002010000040100000201000002
-010000010100000201000002010300040100000901000002010000020103000101000000
-01000000010000010104000201020071010100810101000801000006010000010100000a
-010000050100000b01000001010000040100001b01010008010000020100000401000002
-010000020100000101000002010000020103000401000009010000020100000201030001
-010000000100000001000001010400090102000201040001010000060100000001000002
-010400010100004201010009010000010100004a010007010001050a0701000105020202
-010302020503010000080100000201000004010000020100000201000001010000020100
-000101000002010000040100000901000002010000010100000201000001010000000100
-0000010000010100000901000070010100810101000901000005010000010100000a0100
-00050100000b01000001010000030100001c010100080100000201000004010000020100
-000201000001010000020100000101000002010000040100000901000002010000010100
-000201000001010000000100000001000001010000100100000101000005010000060100
-000001000002010000050100004201010009010000010100004a010007010001050a0701
-000105020202010302020503010000080100000101010004010000020100000201000001
-010100010100000101000002010000040100000901000002010000010100000201000001
-01000000010000000100000101000002010000010100000201000070010100810101000a
-010000040100000101000003010100040100000501000005010100030100000101000002
-0100001d0101000801000001010100040100000201000002010000010101000101000001
-010000020100000401000009010000020100000101000002010000010100000001000000
-010000010100000201000008010000020100000101000002010000010100000701000003
-01000002010000010100004201010009010000010100004a010007010001050a07010001
-050202020103020205030100000901010000010000040100000301020002010000000101
-000301030004010000090100000201000002010300010100000001000000010000020102
-000301020071010100810101000b01000004010100040101000201040001010400030101
-0004010100020100001e0101000901010000010000040100000301020002010000000101
-000301030004010000090100000201000002010300010100000001000000010000020102
-000a0102000301020002010000070100000401020002010000420101000a0101004b0100
-07010001050a07010001050202020103020205030100000c010000230105009301010081
-0101000c0100002a0100001f0101000c010000230105001c010500680101005801000701
-0001050a07010001050202020103020205030100000801000002010000bd010100810101
-00590101000801000002010000b501010058010007010001050a07010001050202020103
-0202050301000009010200be010100810101005901010009010200b60101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb0101008101010059010100c301010058010007010001050a0701000105020202
-01030202050301ff01ff01ce07010001050a070100010502020201030202050301ff01ff
-01ce07010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb010100810101000c0100002a0100001f010100c301010058010007010001050a0701
-00010502020201030202050301000010010200090100000d010200430100005601010081
-0101000b010000040101000b010000050100000c010100020100001e0101001001020009
-0100000d010200930101000a0101004b010007010001050a070100010502020201030202
-050301000012010000090100000f0100004301000056010100810101000a010000040100
-000101000009010100040101000b01000001010000020100001d01010012010000090100
-000f0100009301010009010000010100004a010007010001050a07010001050202020103
-020205030100000901010000010000040100000301020002010000000101000301020005
-010000090100000001010003010200020101000001000003010200030102000a01020002
-010000020100000101040054010100810101000901000005010000010100000801000000
-01000003010000000100000b01000001010000030100001c010100090101000001000004
-010000030102000201000000010100030102000501000009010000000101000301020002
-01010000010000030102000a010200030102000201000000010100020100000201000002
-01020002010000000101003f01010009010000010100004a010007010001050a07010001
-050202020103020205030100000801000001010100040100000201000002010000010101
-000101000001010000020100000401000009010100010100000101000002010000010100
-000001000000010000010100000201000001010000020100000801000002010000010100
-00020100000301000056010100810101000801000006010000010100000a010000050100
-000b01000001010000040100001b01010008010000010101000401000002010000020100
-000101010001010000010100000201000004010000090101000101000001010000020100
-000101000000010000000100000101000002010000080100000201000001010000020100
-0001010100010100000101000002010000010100000201000001010100010100003e0101
-0009010000010100004a010007010001050a070100010502020201030202050301000008
-010000020100000401000002010000020100000101000002010000050100000401000009
-01000002010000050100000101000000010000000100000101000002010000010100000c
-010000020100000201000000010000040100005601010081010100070100000701000001
-0100000a010000050100000b01000001010000050100001a010100080100000201000004
-010000020100000201000001010000020100000501000004010000090100000201000005
-010000010100000001000000010000010100000201000008010000050100000201000001
-01000005010000020100000101000002010000010100004201010009010000010100004a
-010007010001050a07010001050202020103020205030100000801000002010000040100
-000201000002010000010100000201000002010300040100000901000002010000020103
-000101000000010000000100000101040002010200090104000301000005010000560101
-00810101000801000006010000010100000a010000050100000b01000001010000040100
-001b01010008010000020100000401000002010000020100000101000002010000020103
-000401000009010000020100000201030001010000000100000001000001010400090102
-000201040001010000060100000001000002010400010100004201010009010000010100
-004a010007010001050a0701000105020202010302020503010000080100000201000004
-010000020100000201000001010000020100000101000002010000040100000901000002
-010000010100000201000001010000000100000001000001010000090100000801000006
-010000000100000401000056010100810101000901000005010000010100000a01000005
-0100000b01000001010000030100001c0101000801000002010000040100000201000002
-010000010100000201000001010000020100000401000009010000020100000101000002
-010000010100000001000000010000010100001001000001010000050100000601000000
-01000002010000050100004201010009010000010100004a010007010001050a07010001
-050202020103020205030100000801000001010100040100000201000002010000010101
-000101000001010000020100000401000009010000020100000101000002010000010100
-000001000000010000010100000201000001010000020100000801000002010000010100
-00020100000301000056010100810101000a010000040100000101000003010100040100
-0005010000050101000301000001010000020100001d0101000801000001010100040100
-000201000002010000010101000101000001010000020100000401000009010000020100
-000101000002010000010100000001000000010000010100000201000008010000020100
-000101000002010000010100000701000003010000020100000101000042010100090100
-00010100004a010007010001050a07010001050202020103020205030100000901010000
-010000040100000301020002010000000101000301030004010000090100000201000002
-01030001010000000100000001000002010200030102000a010200020100000201000004
-01010054010100810101000b010000040101000401010002010400010104000301010004
-010100020100001e01010009010100000100000401000003010200020100000001010003
-01030004010000090100000201000002010300010100000001000000010000020102000a
-0102000301020002010000070100000401020002010000420101000a0101004b01000701
-0001050a07010001050202020103020205030100000c0100002301050023010500690101
-00810101000c0100002a0100001f0101000c010000230105001c01050068010100580100
-07010001050a07010001050202020103020205030100000801000002010000bd01010081
-010100590101000801000002010000b501010058010007010001050a0701000105020202
-01030202050301000009010200be010100810101005901010009010200b6010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-020201030202050301ff01ff01ce07010001050a070100010502020201030202050308cd
-01ff01ff010007010001050a0701000105020202010302020503080000cb080001000081
-01010059010100c301010058010007010001050a07010001050202020103020205030800
-00cb08000100000b0101004e0101002201010059010100c301010058010007010001050a
-0701000105020202010302020503080000cb08000100000a0100001c0100002a01000008
-010000210101000c0100002a0100001f010100c301010058010007010001050a07010001
-05020202010302020503080000cb08000100000a01000005010000040102000c01000004
-0101000d010000020102000b0101000201000007010000210101000b010000040101000d
-010000020102000b010100020100001e0101002001010018010000150100006f01010008
-0104000301010044010007010001050a0701000105020202010302020503080000cb0800
-0100000a0100000401010003010000020100000a01000004010000010100000b01010001
-0100000201000009010000010100000201000006010000210101000a0100000401000001
-0100000b01010001010000020100000901000001010000020100001d0101001f0100001a
-010000150100006f0101000801000002010000020100000101000043010007010001050a
-070100010502020201030202050308000009080100000800000208020009080000000801
-0003080200020801000008000003080200030802008d08000100000a0100000301000000
-010000070100000901000005010000010100000a01000000010000050100000901000001
-0100000301000005010000210101000901000005010000010100000a0100000001000005
-0100000901000001010000030100001c0101000901010000010000020102000b01000003
-010000000101000301020002010000000101000201040002010200020100000001010003
-010100000100006f0101000c010000020100000101000043010007010001050a07010001
-050202020103020205030800000808000001080100010800000208000008080100010800
-000108000002080000010800000008000000080000010800000208000001080000020800
-008c08000100000a01000005010000070100000801000006010000010100000901000001
-010000050100000901000001010000040100000401000021010100080100000601000001
-0100000901000001010000050100000901000001010000040100001b0101000801000001
-010100010100000201000008010400010101000101000001010000020100000101010001
-010000030100000301000002010000010101000101000001010000010101006f0101000b
-010000030100000101000043010007010001050a07010001050202020103020205030800
-000808000002080000010800000c08000002080000050800000108000000080000000800
-000108000002080000010800009008000100000801010006010000060100000801000007
-010000010100000801000002010000030101000a0100000101000005010000040101001f
-0101000701000007010000010100000801000002010000030101000a0100000101000005
-0100001a0101000801000002010000010100000e01000003010000050100000201000001
-01000002010000030100000301000002010000010100000201000001010000020100006f
-0101000b010000030100000101000043010007010001050a070100010502020201030202
-050308000008080000020800000208020009080000020800000208030001080000000800
-000008000001080400020802008d08000100000a01000005010000050100000a01000006
-010000010100000801000002010000050100000901000001010000040100000401000021
-010100080100000601000001010000080100000201000005010000090100000101000004
-0100001b0101000801000002010000020102000b01000003010000050100000201000001
-010000020100000301000003010400010100000201000001010000020100006f0101000b
-010000030100000101000043010007010001050a07010001050202020103020205030800
-000808000002080000050800000808000002080000010800000208000001080000000800
-000008000001080000090800008c08000100000a01000005010000040100000c01000005
-010000010100000801050004010000090100000101000003010000050100002101010009
-010000050100000101000008010500040100000901000001010000030100001c01010008
-01000002010000050100000a010000030100000501000002010000010100000201000003
-01000003010000050100000201000001010000020100006f0101000a0100000401000001
-01000043010007010001050a070100010502020201030202050308000008080000010801
-000108000002080000080800000208000001080000020800000108000000080000000800
-00010800000208000001080000020800008c08000100000a010000050100000301000007
-010100040100000401000001010000030101000601000001010000020100000301010003
-010000010100000201000006010000210101000a01000004010000010100000301010006
-0100000101000002010000030101000301000001010000020100001d0101000801000001
-01010001010000020100000a010000030100000501000002010000010100000201000003
-0100000301000002010000010100000201000001010000010101006f0101000a01000004
-0100000101000043010007010001050a0701000105020202010302020503080000090801
-000008000002080200090800000208000002080300010800000008000000080000020802
-00030802008d08000100000a010000030104000101040003010100050100000401010004
-010100060100000201020004010100040101000201000007010000210101000b01000004
-0101000401010006010000020102000401010004010100020100001e0101000901010000
-010000020102000b01000003010000060102000201000002010000040101000201020002
-0100000201000002010100000100006f0101000a0100000501010044010007010001050a
-07010001050202020103020205030800000c08000007080500af08000100000a01000014
-010000060100002a01000008010000210101000c0100002a0100001f0101000c01000007
-010500a701010058010007010001050a0701000105020202010302020503080000080800
-0002080000bd08000100000b010100100101003b01010022010100590101000801000002
-010000b501010058010007010001050a0701000105020202010302020503080000090802
-00be0800010000810101005901010009010200b601010058010007010001050a07010001
-05020202010302020503080000cb08000100008101010059010100c30101005801000701
-0001050a0701000105020202010302020503080000cb08000100008101010059010100c3
-01010058010007010001050a0701000105020202010302020503080000cb080001000081
-01010059010100c301010058010007010001050a07010001050202020103020205030800
-00cb08000100008101010059010100c301010058010007010001050a0701000105020202
-01030202050308cd01ff01ff010007010001050a070100010502020201030202050308cd
-01ff01ff010007010001050a0701000105020202010302020503080000cb080001000081
-01010059010100c301010058010007010001050a07010001050202020103020205030800
-00cb08000100000b0101004e0101002201010059010100c301010058010007010001050a
-0701000105020202010302020503080000cb08000100000a0100001c0100002a01000008
-010000210101000c0100002a0100001f010100c301010058010007010001050a07010001
-05020202010302020503080000110800000308000010080000010800009e08000100000a
-01000005010000040102000c010000040101000d010000050100000a0101000201000007
-010000210101000b010000040101000d010000050100000a010100020100001e010100c3
-0101000a0100000401020044010007010001050a07010001050202020103020205030800
-00110800000308000010080000010800009e08000100000a010000040101000301000002
-0100000a01000004010000010100000b0101000401010009010000010100000201000006
-010000210101000a01000004010000010100000b01010004010100090100000101000002
-0100001d010100c301010009010100030100000201000043010007010001050a07010001
-0502020201030202050308000009080100000800000108040001080000010800000a0801
-000008000001080000000801009b08000100000a01000003010000000100000701000009
-01000005010000010100000a010000000100000301000000010000090100000101000003
-01000005010000210101000901000005010000010100000a010000000100000301000000
-0100000901000001010000030100001c010100c301010008010000000100000301000002
-01000043010007010001050a070100010502020201030202050308000008080000010801
-000308000003080000000800000a0800000108010001080100010800009a08000100000a
-010000050100000701000008010000060100000101000009010000010100000201000001
-010000090100000101000004010000040100002101010008010000060100000101000009
-0100000101000002010000010100000901000001010000040100001b010100c30101000a
-010000030100000201000043010007010001050a07010001050202020103020205030800
-00080800000208000003080000030801000b0800000208000001080000020800009a0800
-010000080101000601000005010100080100000701000001010000080100000201000001
-01000002010000090100000101000005010000040101001f010100070100000701000001
-010000080100000201000001010000020100000901000001010000050100001a010100c3
-0101000a0100000401030043010007010001050a07010001050202020103020205030800
-00080800000208000003080000030801000b0800000208000001080000020800009a0800
-0100000a0100000501000007010000080100000601000001010000080100000201000001
-010000020100000901000001010000040100000401000021010100080100000601000001
-010000080100000201000001010000020100000901000001010000040100001b010100c3
-0101000a0100000701000043010007010001050a07010001050202020103020205030800
-0008080000020800000308000003080000000800000a0800000208000001080000020800
-009a08000100000a01000005010000070100000901000005010000010100000801050000
-010500080100000101000003010000050100002101010009010000050100000101000008
-010500000105000801000001010000030100001c010100c30101000a0100000701000043
-010007010001050a07010001050202020103020205030800000808000001080100030800
-000308000001080000090800000108010001080100010800009a08000100000a01000005
-010000030100000201000003010100040100000401000001010000030101000601000005
-0100000301010003010000010100000201000006010000210101000a0100000401000001
-010000030101000601000005010000030101000301000001010000020100001d010100c3
-0101000a010000030100000201000043010007010001050a070100010502020201030202
-050308000009080100000800000408010001080000020800000908010000080000010800
-00000801009b08000100000a010000030104000201020004010100050100000401010004
-010100060100000501000003010100040101000201000007010000210101000b01000004
-0101000401010006010000050100000301010004010100020100001e010100c301010008
-0104000201020044010007010001050a07010001050202020103020205030800000c0800
-000e080500a808000100000a01000014010000060100002a01000008010000210101000c
-0100002a0100001f010100c301010058010007010001050a070100010502020201030202
-05030800000808000002080000bd08000100000b010100100101003b0101002201010059
-010100c301010058010007010001050a0701000105020202010302020503080000090802
-00be08000100008101010059010100c301010058010007010001050a0701000105020202
-010302020503080000cb08000100008101010059010100c301010058010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100008101010059
-010100c301010058010007010001050a0701000105020202010302020503080000cb0800
-0100008101010059010100c301010058010007010001050a070100010502020201030202
-050308cd01ff01ff010007010001050a070100010502020201030202050308cd01ff01ff
-010007010001050a0701000105020202010302020503080000cb08000100008101010059
-010100c301010058010007010001050a0701000105020202010302020503080000cb0800
-0100000b0101004e0101002201010059010100c301010058010007010001050a07010001
-05020202010302020503080000cb08000100000a0100001c0100002a0100000801000021
-0101000c0100002a0100001f010100c301010058010007010001050a0701000105020202
-010302020503080000110800000308000010080000010800009e08000100000a01000005
-010000070100000b010000040101000d010000050100000a010100020100000701000021
-0101000b010000040101000d010000050100000a010100020100001e010100c30101000c
-0100000201020044010007010001050a0701000105020202010302020503080000110800
-000308000010080000010800009e08000100000a01000004010100060101000a01000004
-010000010100000b0101000401010009010000010100000201000006010000210101000a
-01000004010000010100000b010100040101000901000001010000020100001d010100c3
-0101000b010100010100000201000043010007010001050a070100010502020201030202
-050308000009080100000800000108040001080000010800000a08010000080000010800
-00000801009b08000100000a010000030100000001000005010000000100000901000005
-010000010100000a01000000010000030100000001000009010000010100000301000005
-010000210101000901000005010000010100000a01000000010000030100000001000009
-01000001010000030100001c010100c30101000a01000000010000050100004301000701
-0001050a0701000105020202010302020503080000080800000108010003080000030800
-00000800000a0800000108010001080100010800009a08000100000a0100000501000004
-010000010100000801000006010000010100000901000001010000020100000101000009
-010000010100000401000004010000210101000801000006010000010100000901000001
-01000002010000010100000901000001010000040100001b010100c30101000901000001
-0100000501000043010007010001050a0701000105020202010302020503080000080800
-000208000003080000030801000b0800000208000001080000020800009a080001000008
-010100060100000301000002010000070100000701000001010000080100000201000001
-01000002010000090100000101000005010000040101001f010100070100000701000001
-010000080100000201000001010000020100000901000001010000050100001a010100c3
-01010008010000020100000301010044010007010001050a070100010502020201030202
-0503080000080800000208000003080000030801000b0800000208000001080000020800
-009a08000100000a01000005010000030100000201000008010000060100000101000008
-010000020100000101000002010000090100000101000004010000040100002101010008
-010000060100000101000008010000020100000101000002010000090100000101000004
-0100001b010100c301010008010000020100000501000043010007010001050a07010001
-0502020201030202050308000008080000020800000308000003080000000800000a0800
-000208000001080000020800009a08000100000a01000005010000030105000801000005
-010000010100000801050000010500080100000101000003010000050100002101010009
-010000050100000101000008010500000105000801000001010000030100001c010100c3
-010100080105000401000043010007010001050a07010001050202020103020205030800
-000808000001080100030800000308000001080000090800000108010001080100010800
-009a08000100000a01000005010000070100000301010004010000040100000101000003
-01010006010000050100000301010003010000010100000201000006010000210101000a
-010000040100000101000003010100060100000501000003010100030100000101000002
-0100001d010100c30101000c010000010100000201000043010007010001050a07010001
-050202020103020205030800000908010000080000040801000108000002080000090801
-000008000001080000000801009b08000100000a01000003010400050100000301010005
-010000040101000401010006010000050100000301010004010100020100000701000021
-0101000b010000040101000401010006010000050100000301010004010100020100001e
-010100c30101000c0100000201020044010007010001050a070100010502020201030202
-05030800000c0800000e080500a808000100000a01000014010000060100002a01000008
-010000210101000c0100002a0100001f010100c301010058010007010001050a07010001
-050202020103020205030800000808000002080000bd08000100000b010100100101003b
-0101002201010059010100c301010058010007010001050a070100010502020201030202
-050308000009080200be08000100008101010059010100c301010058010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100008101010059
-010100c301010058010007010001050a0701000105020202010302020503080000cb0800
-0100008101010059010100c301010058010007010001050a070100010502020201030202
-0503080000cb08000100008101010059010100c301010058010007010001050a07010001
-0502020201030202050308cd01ff01ff010007010001050a070100010502020201030202
-050308cd01ff01ff010007010001050a0701000105020202010302020503080000cb0800
-0100008101010059010100c301010058010007010001050a070100010502020201030202
-0503080000cb08000100000b0101004e0101002201010059010100c30101005801000701
-0001050a0701000105020202010302020503080000cb08000100000a0100001c0100002a
-01000008010000210101000c0100002a0100001f010100c301010058010007010001050a
-0701000105020202010302020503080000110800000308000010080000010800009e0800
-0100000a01000005010000030104000b010000040101000d010000050100000a01010002
-01000007010000210101000b010000040101000d010000050100000a010100020100001e
-010100c3010100090102000301020044010007010001050a070100010502020201030202
-0503080000110800000308000010080000010800009e08000100000a0100000401010003
-0100000e01000004010000010100000b0101000401010009010000010100000201000006
-010000210101000a01000004010000010100000b01010004010100090100000101000002
-0100001d010100c30101000801000002010000010100000201000043010007010001050a
-070100010502020201030202050308000009080100000800000108040001080000010800
-000a0801000008000001080000000801009b08000100000a010000030100000001000003
-0100000d01000005010000010100000a0100000001000003010000000100000901000001
-0100000301000005010000210101000901000005010000010100000a0100000001000003
-010000000100000901000001010000030100001c010100c30101000c0100000501000043
-010007010001050a07010001050202020103020205030800000808000001080100030800
-0003080000000800000a0800000108010001080100010800009a08000100000a01000005
-010000030103000901000006010000010100000901000001010000020100000101000009
-010000010100000401000004010000210101000801000006010000010100000901000001
-01000002010000010100000901000001010000040100001b010100c30101000c01000005
-01000043010007010001050a070100010502020201030202050308000008080000020800
-0003080000030801000b0800000208000001080000020800009a08000100000801010006
-010000070100000701000007010000010100000801000002010000010100000201000009
-0100000101000005010000040101001f0101000701000007010000010100000801000002
-01000001010000020100000901000001010000050100001a010100c30101000a01010004
-01010044010007010001050a070100010502020201030202050308000008080000020800
-0003080000030801000b0800000208000001080000020800009a08000100000a01000005
-010000070100000801000006010000010100000801000002010000010100000201000009
-010000010100000401000004010000210101000801000006010000010100000801000002
-01000001010000020100000901000001010000040100001b010100c30101000c01000005
-01000043010007010001050a070100010502020201030202050308000008080000020800
-000308000003080000000800000a0800000208000001080000020800009a08000100000a
-010000050100000301000002010000090100000501000001010000080105000001050008
-010000010100000301000005010000210101000901000005010000010100000801050000
-0105000801000001010000030100001c010100c30101000c010000050100004301000701
-0001050a0701000105020202010302020503080000080800000108010003080000030800
-0001080000090800000108010001080100010800009a08000100000a0100000501000003
-010000020100000301010004010000040100000101000003010100060100000501000003
-01010003010000010100000201000006010000210101000a010000040100000101000003
-0101000601000005010000030101000301000001010000020100001d010100c301010008
-01000002010000010100000201000043010007010001050a070100010502020201030202
-050308000009080100000800000408010001080000020800000908010000080000010800
-00000801009b08000100000a010000030104000201020004010100050100000401010004
-010100060100000501000003010100040101000201000007010000210101000b01000004
-0101000401010006010000050100000301010004010100020100001e010100c301010009
-0102000301020044010007010001050a07010001050202020103020205030800000c0800
-000e080500a808000100000a01000014010000060100002a01000008010000210101000c
-0100002a0100001f010100c301010058010007010001050a070100010502020201030202
-05030800000808000002080000bd08000100000b010100100101003b0101002201010059
-010100c301010058010007010001050a0701000105020202010302020503080000090802
-00be08000100008101010059010100c301010058010007010001050a0701000105020202
-010302020503080000cb08000100008101010059010100c301010058010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100008101010059
-010100c301010058010007010001050a0701000105020202010302020503080000cb0800
-0100008101010059010100c301010058010007010001050a070100010502020201030202
-050308cd01ff01ff010007010001050a070100010502020201030202050308cd01ff01ff
-010007010001050a0701000105020202010302020503080000cb08000100008101010059
-010100c301010058010007010001050a0701000105020202010302020503080000cb0800
-0100000b0101004e0101002201010059010100c301010058010007010001050a07010001
-05020202010302020503080000cb08000100000a0100001c0100002a0100000801000021
-0101000c0100002a0100001f010100c301010058010007010001050a0701000105020202
-010302020503080000110800000308000010080000010800009e08000100000a01000005
-010000040102000c010000040101000d010000050100000a010100020100000701000021
-0101000b010000040101000d010000050100000a010100020100001e010100c30101000a
-0101004b010007010001050a070100010502020201030202050308000011080000030800
-0010080000010800009e08000100000a0100000401010003010000020100000a01000004
-010000010100000b0101000401010009010000010100000201000006010000210101000a
-01000004010000010100000b010100040101000901000001010000020100001d010100c3
-01010009010000010100004a010007010001050a07010001050202020103020205030800
-0009080100000800000108040001080000010800000a0801000008000001080000000801
-009b08000100000a0100000301000000010000030100000d01000005010000010100000a
-010000000100000301000000010000090100000101000003010000050100002101010009
-01000005010000010100000a010000000100000301000000010000090100000101000003
-0100001c010100c301010009010000010100004a010007010001050a0701000105020202
-01030202050308000008080000010801000308000003080000000800000a080000010801
-0001080100010800009a08000100000a01000005010000030100000c0100000601000001
-010000090100000101000002010000010100000901000001010000040100000401000021
-010100080100000601000001010000090100000101000002010000010100000901000001
-010000040100001b010100c301010009010000010100004a010007010001050a07010001
-05020202010302020503080000080800000208000003080000030801000b080000020800
-0001080000020800009a0800010000080101000601000003010300080100000701000001
-01000008010000020100000101000002010000090100000101000005010000040101001f
-010100070100000701000001010000080100000201000001010000020100000901000001
-010000050100001a010100c301010009010000010100004a010007010001050a07010001
-05020202010302020503080000080800000208000003080000030801000b080000020800
-0001080000020800009a08000100000a0100000501000003010000020100000801000006
-010000010100000801000002010000010100000201000009010000010100000401000004
-010000210101000801000006010000010100000801000002010000010100000201000009
-01000001010000040100001b010100c301010009010000010100004a010007010001050a
-070100010502020201030202050308000008080000020800000308000003080000000800
-000a0800000208000001080000020800009a08000100000a010000050100000301000002
-010000090100000501000001010000080105000001050008010000010100000301000005
-010000210101000901000005010000010100000801050000010500080100000101000003
-0100001c010100c301010009010000010100004a010007010001050a0701000105020202
-010302020503080000080800000108010003080000030800000108000009080000010801
-0001080100010800009a08000100000a0100000501000003010000020100000301010004
-010000040100000101000003010100060100000501000003010100030100000101000002
-01000006010000210101000a010000040100000101000003010100060100000501000003
-0101000301000001010000020100001d010100c301010009010000010100004a01000701
-0001050a0701000105020202010302020503080000090801000008000004080100010800
-0002080000090801000008000001080000000801009b08000100000a0100000301040002
-010200040101000501000004010100040101000601000005010000030101000401010002
-01000007010000210101000b010000040101000401010006010000050100000301010004
-010100020100001e010100c30101000a0101004b010007010001050a0701000105020202
-0103020205030800000c0800000e080500a808000100000a01000014010000060100002a
-01000008010000210101000c0100002a0100001f010100c301010058010007010001050a
-07010001050202020103020205030800000808000002080000bd08000100000b01010010
-0101003b0101002201010059010100c301010058010007010001050a0701000105020202
-01030202050308000009080200be08000100008101010059010100c30101005801000701
-0001050a0701000105020202010302020503080000cb08000100008101010059010100c3
-01010058010007010001050a0701000105020202010302020503080000cb080001000081
-01010059010100c301010058010007010001050a07010001050202020103020205030800
-00cb08000100008101010059010100c301010058010007010001050a0701000105020202
-010302020503080000cb08000100008101010059010100c301010058010007010001050a
-070100010502020201030202050308cd01ff01ff010007010001050a0701000105020202
-01030202050308cd01ff01ff010007010001050a07010001050202020103020205030800
-00cb08000100008101010059010100c301010058010007010001050a0701000105020202
-010302020503080000cb08000100000b0101004e0101002201010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100000a0100001c
-0100002a01000008010000210101000c0100002a0100001f010100c30101005801000701
-0001050a0701000105020202010302020503080000110800000308000010080000010800
-009e08000100000a01000005010000030104000b010000040101000d010000050100000a
-0101000201000007010000210101000b010000040101000d010000050100000a01010002
-0100001e010100c3010100090102000401010044010007010001050a0701000105020202
-010302020503080000110800000308000010080000010800009e08000100000a01000004
-01010003010000020100000a01000004010000010100000b010100040101000901000001
-0100000201000006010000210101000a01000004010000010100000b0101000401010009
-01000001010000020100001d010100c30101000801000002010000020100000101000043
-010007010001050a07010001050202020103020205030800000908010000080000010804
-0001080000010800000a0801000008000001080000000801009b08000100000a01000003
-01000000010000070100000901000005010000010100000a010000000100000301000000
-01000009010000010100000301000005010000210101000901000005010000010100000a
-0100000001000003010000000100000901000001010000030100001c010100c301010008
-01000002010000020100000101000043010007010001050a070100010502020201030202
-050308000008080000010801000308000003080000000800000a08000001080100010801
-00010800009a08000100000a010000050100000601000009010000060100000101000009
-010000010100000201000001010000090100000101000004010000040100002101010008
-010000060100000101000009010000010100000201000001010000090100000101000004
-0100001b010100c30101000801000002010000020100000101000043010007010001050a
-0701000105020202010302020503080000080800000208000003080000030801000b0800
-000208000001080000020800009a08000100000801010006010000060100000801000007
-010000010100000801000002010000010100000201000009010000010100000501000004
-0101001f0101000701000007010000010100000801000002010000010100000201000009
-01000001010000050100001a010100c30101000901030002010000010100004301000701
-0001050a0701000105020202010302020503080000080800000208000003080000030801
-000b0800000208000001080000020800009a08000100000a010000050100000601000009
-010000060100000101000008010000020100000101000002010000090100000101000004
-010000040100002101010008010000060100000101000008010000020100000101000002
-0100000901000001010000040100001b010100c30101000c010000020100000101000043
-010007010001050a07010001050202020103020205030800000808000002080000030800
-0003080000000800000a0800000208000001080000020800009a08000100000a01000005
-010000050100000b01000005010000010100000801050000010500080100000101000003
-010000050100002101010009010000050100000101000008010500000105000801000001
-010000030100001c010100c30101000c010000020100000101000043010007010001050a
-070100010502020201030202050308000008080000010801000308000003080000010800
-00090800000108010001080100010800009a08000100000a010000050100000501000005
-010100040100000401000001010000030101000601000005010000030101000301000001
-0100000201000006010000210101000a0100000401000001010000030101000601000005
-010000030101000301000001010000020100001d010100c3010100080100000201000002
-0100000101000043010007010001050a0701000105020202010302020503080000090801
-0000080000040801000108000002080000090801000008000001080000000801009b0800
-0100000a0100000301040003010000050101000501000004010100040101000601000005
-01000003010100040101000201000007010000210101000b010000040101000401010006
-010000050100000301010004010100020100001e010100c3010100090102000401010044
-010007010001050a07010001050202020103020205030800000c0800000e080500a80800
-0100000a01000014010000060100002a01000008010000210101000c0100002a0100001f
-010100c301010058010007010001050a0701000105020202010302020503080000080800
-0002080000bd08000100000b010100100101003b0101002201010059010100c301010058
-010007010001050a070100010502020201030202050308000009080200be080001000081
-01010059010100c301010058010007010001050a07010001050202020103020205030800
-00cb08000100008101010059010100c301010058010007010001050a0701000105020202
-010302020503080000cb08000100008101010059010100c301010058010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100008101010059
-010100c301010058010007010001050a070100010502020201030202050308cd01ff01ff
-010007010001050a070100010502020201030202050308cd01ff01ff010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100000b0101004e
-0101002201010059010100c301010058010007010001050a070100010502020201030202
-0503080000cb08000100000a0100001c0100002a01000008010000210101000c0100002a
-0100001f010100c301010058010007010001050a07010001050202020103020205030800
-00110800000308000010080000010800009e08000100000a01000005010000040102000c
-010000040101000d010000050100000a0101000201000007010000210101000b01000004
-0101000d010000050100000a010100020100001e010100c3010100090102000301020044
-010007010001050a07010001050202020103020205030800001108000003080000100800
-00010800009e08000100000a0100000401010003010000020100000a0100000401000001
-0100000b0101000401010009010000010100000201000006010000210101000a01000004
-010000010100000b010100040101000901000001010000020100001d010100c301010008
-01000002010000010100000201000043010007010001050a070100010502020201030202
-050308000009080100000800000108040001080000010800000a08010000080000010800
-00000801009b08000100000a010000030100000001000003010000020100000901000005
-010000010100000a01000000010000030100000001000009010000010100000301000005
-010000210101000901000005010000010100000a01000000010000030100000001000009
-01000001010000030100001c010100c3010100080100000901000043010007010001050a
-070100010502020201030202050308000008080000010801000308000003080000000800
-000a0800000108010001080100010800009a08000100000a010000050100000301000002
-010000080100000601000001010000090100000101000002010000010100000901000001
-010000040100000401000021010100080100000601000001010000090100000101000002
-010000010100000901000001010000040100001b010100c3010100080100000901000043
-010007010001050a07010001050202020103020205030800000808000002080000030800
-00030801000b0800000208000001080000020800009a0800010000080101000601000004
-010200080100000701000001010000080100000201000001010000020100000901000001
-01000005010000040101001f010100070100000701000001010000080100000201000001
-010000020100000901000001010000050100001a010100c3010100080103000501000044
-010007010001050a07010001050202020103020205030800000808000002080000030800
-00030801000b0800000208000001080000020800009a08000100000a0100000501000003
-010000020100000801000006010000010100000801000002010000010100000201000009
-010000010100000401000004010000210101000801000006010000010100000801000002
-01000001010000020100000901000001010000040100001b010100c30101000801000002
-0100000301000045010007010001050a0701000105020202010302020503080000080800
-00020800000308000003080000000800000a0800000208000001080000020800009a0800
-0100000a0100000501000003010000020100000901000005010000010100000801050000
-010500080100000101000003010000050100002101010009010000050100000101000008
-010500000105000801000001010000030100001c010100c3010100080100000201000002
-01000046010007010001050a070100010502020201030202050308000008080000010801
-00030800000308000001080000090800000108010001080100010800009a08000100000a
-010000050100000301000002010000030101000401000004010000010100000301010006
-010000050100000301010003010000010100000201000006010000210101000a01000004
-01000001010000030101000601000005010000030101000301000001010000020100001d
-010100c301010008010000020100000101000047010007010001050a0701000105020202
-010302020503080000090801000008000004080100010800000208000009080100000800
-0001080000000801009b08000100000a0100000301040002010200040101000501000004
-01010004010100060100000501000003010100040101000201000007010000210101000b
-010000040101000401010006010000050100000301010004010100020100001e010100c3
-010100090102000201040043010007010001050a07010001050202020103020205030800
-000c0800000e080500a808000100000a01000014010000060100002a0100000801000021
-0101000c0100002a0100001f010100c301010058010007010001050a0701000105020202
-0103020205030800000808000002080000bd08000100000b010100100101003b01010022
-01010059010100c301010058010007010001050a07010001050202020103020205030800
-0009080200be08000100008101010059010100c301010058010007010001050a07010001
-05020202010302020503080000cb08000100008101010059010100c30101005801000701
-0001050a0701000105020202010302020503080000cb08000100008101010059010100c3
-01010058010007010001050a0701000105020202010302020503080000cb080001000081
-01010059010100c301010058010007010001050a07010001050202020103020205030800
-00cb08000100008101010059010100c301010058010007010001050a0701000105020202
-01030202050308cd01ff01ff010007010001050a070100010502020201030202050301ff
-01ff01ce07010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001050a0701000105020202010302020503
-010000cb010100810101000c0100002a0100001f010100c301010058010007010001050a
-07010001050202020103020205030100000b010000120100001f01000089010100810101
-000b010000040101000b010000040102000b010100020100001e0101000b010000120100
-000e010000010100008f0101000a0101004b010007010001050a07010001050202020103
-020205030100001f0100001f01000089010100810101000a010000040100000101000009
-01010003010000020100000901000001010000020100001d0101001f0100000e01000001
-0100008f01010009010000010100004a010007010001050a070100010502020201030202
-050301000009010200020100000001010003010200020104000901020003010200030102
-000201000000010100030102007f01010081010100090100000501000001010000080100
-0000010000070100000901000001010000030100001c0101000901020002010000000101
-000301020002010400090101000001000001010000000101008c01010009010000010100
-004a010007010001050a07010001050202020103020205030100000b0100000201010001
-0100000101000002010000030100000a0100000201000001010000020100000101000002
-010000010101000101000001010000020100007e01010081010100080100000601000001
-0100000a010000070100000901000001010000040100001b0101000b0100000201010001
-0100000101000002010000030100000a0100000101010001010100010100008b01010009
-010000010100004a010007010001050a07010001050202020103020205030100000b0100
-0002010000020100000101000002010000030100000a0100000901000001010000050100
-000201000001010000020100007e010100810101000701000007010000010100000a0100
-00060100000a01000001010000050100001a0101000b0100000201000002010000010100
-0002010000030100000a0100000201000001010000020100008b01010009010000010100
-004a010007010001050a07010001050202020103020205030100000b0100000201000002
-01000001010400030100000a01000006010300010100000501000002010000010104007e
-010100810101000801000006010000010100000a010000050100000b0100000101000004
-0100001b0101000b010000020100000201000001010400030100000a0100000201000001
-010000020100008b01010009010000010100004a010007010001050a0701000105020202
-0103020205030100000b010000020100000201000001010000070100000a010000050100
-000201000001010000050100000201000001010000820101008101010009010000050100
-00010100000a010000040100000c01000001010000030100001c0101000b010000020100
-000201000001010000070100000a0100000201000001010000020100008b010100090100
-00010100004a010007010001050a07010001050202020103020205030100000b01000002
-010000020100000101000002010000030100000a01000002010000010100000201000001
-01000002010000010100000201000001010000020100007e010100810101000a01000004
-01000001010000030101000401000003010000070101000301000001010000020100001d
-0101000b01000002010000020100000101000002010000030100000a0100000101010001
-010100010100008b01010009010000010100004a010007010001050a0701000105020202
-0103020205030100000b0100000201000002010000020102000501010009010200030103
-00020102000201000002010000020102007f010100810101000b01000004010100040101
-0002010400010104000301010004010100020100001e0101000b01000002010000020100
-000201020005010100090101000001000001010000000101008c0101000a0101004b0100
-07010001050a070100010502020201030202050301000023010500a1010100810101000c
-0100002a0100001f010100230105009901010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a0701000105020202010302020503010000cb0101
-008101010059010100c301010058010007010001070c0001050202020103020205030100
-00cb0101008101010059010100c301010058010007010000070d00010502020201030202
-050301ff01ff01ce0701030e00010502020201030202050301ff01ff01ce0701030e0001
-05020202010302020503010000cb0101008101010059010100c30101005801000701030e
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-030e000105020202010302020503010000cb010100810101000c0100002a0100001f0101
-00c30101005801000701030e0001050202020103020205030100000b010000120100000e
-0100000101000097010100810101000b010000040101000b010000040102000b01010002
-0100001e0101000b010000120100000e010000010100008f0101000a0100000401020044
-01000701030e0001050202020103020205030100001f0100000e01000001010000970101
-00810101000a010000040100000101000009010100030100000201000009010000010100
-00020100001d0101001f0100000e010000010100008f0101000901010003010000020100
-004301000701030e00010502020201030202050301000009010200020100000001010003
-010200020104000901010000010000010100000001010094010100810101000901000005
-010000010100000801000000010000070100000901000001010000030100001c01010009
-01020002010000000101000301020002010400090101000001000001010000000101008c
-010100080100000001000003010000020100004301000701030e00010502020201030202
-05030100000b01000002010100010100000101000002010000030100000a010000010101
-00010101000101000093010100810101000801000006010000010100000a010000070100
-000901000001010000040100001b0101000b010000020101000101000001010000020100
-00030100000a0100000101010001010100010100008b0101000a01000003010000020100
-004301000701030e0001050202020103020205030100000b010000020100000201000001
-01000002010000030100000a010000020100000101000002010000930101008101010007
-01000007010000010100000a010000060100000a01000001010000050100001a0101000b
-01000002010000020100000101000002010000030100000a010000020100000101000002
-0100008b0101000a010000040103004301000701030e0001050202020103020205030100
-000b010000020100000201000001010400030100000a0100000201000001010000020100
-0093010100810101000801000006010000010100000a010000050100000b010000010100
-00040100001b0101000b010000020100000201000001010400030100000a010000020100
-0001010000020100008b0101000a010000070100004301000701030e0001050202020103
-020205030100000b010000020100000201000001010000070100000a0100000201000001
-0100000201000093010100810101000901000005010000010100000a010000040100000c
-01000001010000030100001c0101000b010000020100000201000001010000070100000a
-0100000201000001010000020100008b0101000a010000070100004301000701030e0001
-050202020103020205030100000b01000002010000020100000101000002010000030100
-000a01000001010100010101000101000093010100810101000a01000004010000010100
-00030101000401000003010000070101000301000001010000020100001d0101000b0100
-0002010000020100000101000002010000030100000a0100000101010001010100010100
-008b0101000a01000003010000020100004301000701030e000105020202010302020503
-0100000b0100000201000002010000020102000501010009010100000100000101000000
-01010094010100810101000b010000040101000401010002010400010104000301010004
-010100020100001e0101000b010000020100000201000002010200050101000901010000
-01000001010000000101008c01010008010400020102004401000701030e000105020202
-01030202050301000023010500a1010100810101000c0100002a0100001f010100230105
-00990101005801000701030e000105020202010302020503010000cb0101008101010059
-010100c30101005801000701030e000105020202010302020503010000cb010100810101
-0059010100c30101005801000701030e000105020202010302020503010000cb01010081
-01010059010100c30101005801000701030e000105020202010302020503010000cb0101
-008101010059010100c30101005801000701030e000105020202010302020503010000cb
-0101008101010059010100c30101005801000701030e0001050202020103020205030100
-00cb0101008101010059010100c30101005801000701030e000105020202010302020503
-01ff01ff01ce0701030e00010502020201030202050301ff01ff01ce0701001005020202
-010302020503010000cb0101008101010059010100c301010058010007010300000c0700
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-03000001050807010300000105020202010302020503010000cb010100810101000c0100
-002a0100001f010100c30101005801000701030100010507070103000001050202020103
-020205030100000b010000120100000a0100001501000087010100810101000b01000004
-0101000b010000040102000b010100020100001e0101000b010000120100000e01000001
-0100008f0101000c0100004a010007010301000105060701030100010502020201030202
-05030100001f0100000a0100001501000087010100810101000a01000004010000010100
-000901010003010000020100000901000001010000020100001d0101001f0100000e0100
-00010100008f0101000b0101004a01000701030200010505070103010001050202020103
-020205030100000901020002010000000101000301020002010400080100000001010003
-0102000301020002010400020102007f0101008101010009010000050100000101000008
-01000000010000070100000901000001010000030100001c010100090102000201000000
-0101000301020002010400090101000001000001010000000101008c0101000a01000000
-0100004a01000701030200010504070103020001050202020103020205030100000b0100
-0002010100010100000101000002010000030100000a0101000101000001010000020100
-0001010000020100000301000003010000020100007e0101008101010008010000060100
-00010100000a010000070100000901000001010000040100001b0101000b010000020101
-00010100000101000002010000030100000a0100000101010001010100010100008b0101
-0009010000010100004a0100070103030001050307010302000105020202010302020503
-0100000b01000002010000020100000101000002010000030100000a0100000201000001
-010000020100000101000007010000030100008201010081010100070100000701000001
-0100000a010000060100000a01000001010000050100001a0101000b0100000201000002
-0100000101000002010000030100000a0100000201000001010000020100008b01010008
-010000020100004a01000701030300010502070103030001050202020103020205030100
-000b010000020100000201000001010400030100000a0100000201000001010000020100
-000201020004010000040102007f010100810101000801000006010000010100000a0100
-00050100000b01000001010000040100001b0101000b0100000201000002010000010104
-00030100000a0100000201000001010000020100008b01010008010000020100004a0100
-0701030400010501070103030001050202020103020205030100000b0100000201000002
-01000001010000070100000a010000020100000101000002010000050100000301000007
-0100007e010100810101000901000005010000010100000a010000040100000c01000001
-010000030100001c0101000b010000020100000201000001010000070100000a01000002
-01000001010000020100008b010100080105004901000701030400010500070103040001
-050202020103020205030100000b01000002010000020100000101000002010000030100
-000a01000002010000010100000201000001010000020100000301000003010000020100
-007e010100810101000a0100000401000001010000030101000401000003010000070101
-000301000001010000020100001d0101000b010000020100000201000001010000020100
-00030100000a0100000101010001010100010100008b0101000c0100004a010007010305
-0000070203040001050202020103020205030100000b0100000201000002010000020102
-00050101000801000002010000020102000301020005010100020102007f010100810101
-000b010000040101000401010002010400010104000301010004010100020100001e0101
-000b01000002010000020100000201020005010100090101000001000001010000000101
-008c0101000c0100004a0100070103050000070103050001050202020103020205030100
-0023010500a1010100810101000c0100002a0100001f0101002301050099010100580100
-0701030607010305000105020202010302020503010000cb0101008101010059010100c3
-0101005801000701030607000306000105020202010302020503010000cb010100810101
-0059010100c30101005801000701001005020202010302020503010000cb010100810101
-0059010100c3010100580100070000110502020201030202050207ff07ff07d305110202
-01030202050207ff07ff07d20000051102020103020205020701030d0000030000ff00ff
-00af03000001030c0001051102020103020205020701030b00010700030000ff00ff00ae
-070003000003030a00010511020201030202050207010309000207010300000105ff05ff
-05ab07010300000503080001051102020103020205020701030700030500070103000001
-05ff05ff05ab070103000001050100030306000105110202010302020502070103050003
-050207010300000105ff05ff05ab07010300000105030003030400010511020201030202
-0502070103030003050407010300000105ff05ff05ab0701030000010505000303020001
-05110202010302020502070103010003050607010300000105ff05ff05ab070103000001
-0507000303000001051102020103020205020705050807010300000105ff05ff05ab0701
-0300000105080703000105110202010302020502070103010703050607010300000105ff
-05ff05ab0701030000010507070303000001051102020103020205020701030307030504
-07010300000105ff05ff05ab070103000001050507030302000105110202010302020502
-070103050703050207010300000105ff05ff05ab07010300000105030703030400010511
-0202010302020502070103070703050007010300000105ff05ff05ab0701030000010501
-070303060001051102020103020205020701030907040300000105ff05ff05ab07010300
-0001070303080001051102020103020205020701030b07020300000107ff07ff07ad0300
-00010701030a0001051102020101000405020701030d07000300000007ff07ff07ae0300
-00000700030c000105110005020204000502070100ff00ff00d105110000020204000000
-020204000502070000ff00ff00d2051100000202040000000202040005ff05ff05e80000
-0202040000000202040005ff05ff05e800000202040000000202040005ff05ff05e80000
-02020400000002020400000502ff02ff02dc00060202040000000208040002ff02ff02dc
-00000208040000000208040002ff02ff02dc00000208040000000208040001ff01ff01dc
-0000020804000000040901ff01ff01dc00000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 377 205
-%%EOF
diff --git a/lib/tv/doc/src/tv_start_system_unreadable.gif b/lib/tv/doc/src/tv_start_system_unreadable.gif
deleted file mode 100644
index 38b69deb8e..0000000000
--- a/lib/tv/doc/src/tv_start_system_unreadable.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_start_system_unreadable.ps b/lib/tv/doc/src/tv_start_system_unreadable.ps
deleted file mode 100644
index 4486557837..0000000000
--- a/lib/tv/doc/src/tv_start_system_unreadable.ps
+++ /dev/null
@@ -1,1377 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_start_system_unreadable.eps)
-%%CreationDate: (Mon Mar 19 17:15:29 2001)
-%%BoundingBox: 0 0 377 205
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 377 205
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-377.000000 205.000000
-12
-755 410
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-828282
-aab6aa
-e7e7e7
-000000
-000000
-000000
-000000
-000000
-000000
-000a01ff01ff01dc000b0208040001ff01ff01dc00000208040000000208040002ff02ff
-02dc000002080400000002080400020000ff00ff00d90400020000000208040000000202
-04060200000004ff04ff04d9020000000405020204000000020204000209000d02ff02ff
-02d000000202040000000202040002080000020d040002f6010302110103023801010206
-0101024001010230010102ff020400000202040000000202040002080000020d040002f6
-010102020107020001010203010102010101020e0105020001070201010302070100020b
-01010206010102400101020c0104021e010102ff02040000020204000000020204000208
-0000020d040002f6010102050101020301010203010102010101020e0101020701010203
-01010201010102050101020b010102060101024e010102020101021d010102ff02040000
-0202040000000202040002080000020204060203040002f6010102050101020301010203
-010102010101020e01010207010102030101020801040201010302030101020001010203
-010102020103020301040206010302030101020001010207010102000101020101010203
-010302030101020201010200010102020101020101030202010102000101020101010203
-010302020101020001010201010102020103020201010202010102f30000020204000000
-04030208000002020400030400000203040002f601010205010102040101020201000202
-0101020e0101020701010203010202080101020201010201010102020102020001010202
-010102010101020101010201010102090101020101010202010202000101020601020200
-010202000101020101010201010102020101020201020200010102010101020001010200
-010102020102020001020200010102010101020101010201010102000101020101010201
-010102010101020101010202010102f3000004030101020b000002030400030200000204
-040002f6010102050101020401010201010102020101020e010402040101020401030206
-010102060101020201010201010102020101020101010201010102010102020801010201
-010102020101020101010206010102010101020101010205010102020101020201010201
-010102010101020001010200010102020101020101010201010102050101020101020203
-01010201010102010101020101010202010002f70103020b000002030400030200000204
-040002f6010102050101020501010200010002030101020e010102070101020601020205
-010102030104020201010201010102020101020101050202010302060101020101010202
-010102010101020601010201010102010101020201040202010102020101020101010201
-010102000101020001010202010102010101020101010202010402010101020401010201
-0105020201010200010102f70103020b000002040400030000000205040002f601010205
-01010205010302030101020e010102070101020701010205010102020101020101010202
-010102010101020201010201010102080102020501010201010102020101020101010206
-010102010101020101010201010102010101020201010202010102010101020101010201
-010102000101020101010201010102010101020101010201010102010101020401010201
-0101020601010200010002f80103020b000002040400030000000205040002f601010205
-01010206010102040101020e010102070101020301010201010102050101020201010201
-010102020101020101010202010102010101020201000205010102050101020101010202
-010102010101020601010201010102010101020101010201010102020101020201010201
-010102020101020701010201010102010101020101010201010102010101020401010201
-0101020201000203010202f80103020b0000020500000206040002f60101020501010206
-010102040101020e01050203010102040103020701020201010202000101020101040203
-010102020103020201040207010302030101020101010206010102010101020101010202
-010202000101020101010202010102010101020301050202010102010101020101010202
-0102020001010200010102040101020201030204010102f90103020b0000020d040002f6
-01030211010302c4010102fa0103020b0000020d040002ff02d5010102fa0103020b0000
-020d040002ff02ff02d20103020c040d02ff02ff02d3010302ff02ff02ee010302ff02ff
-02ee0103020200ff00ff00e70400020201030202000004ff04ff04e70202010302ff02ff
-02ee0103020200ff00ff00e802020103020200ff00ff00e70700020201030202000105ff
-05ff05e40701020201030202000105ff05ff05e40701020201030202000105ff05ff05e4
-0701020201030202000105ff05ff05e40701020201030202000105ff05ff05e407010202
-010302020001050b06040504060005030602051f0600050206000504060005270602050b
-06000506060005ff05ff053506000502060005090602051307010202010302020001050b
-0600050f0600051f060005020600052c060005020600050a060005ff05ff053d06000502
-0600050b0600051307010202010302020001050b06000506060205050600050306020518
-060005020600050206020503060205020600050206000517060005020600050106000500
-060105020604050206020503060205020600050006010503060205ff05ff052006000502
-060005020602050506000502060005000601050c07010202010302020001050b06000508
-060005050600050206000502060005180600050006000505060005020600050206000501
-060005020600051706000502060005010601050106000503060005060600050206000502
-06000501060105010600050106000502060005ff05ff051f060005020600050106000502
-0600050406000502060105010600050b07010202010302020001050b0603050506000505
-060005020600050206000518060005000600050506000502060005020600050106000500
-060005000600051706000502060005010600050206000503060005060600050206000502
-060005010600050206000501060005ff05ff052306040501060005020600050406000502
-060005020600050b07010202010302020001050b06000508060005050600050206040518
-060005000600050506000502060405010600050006000500060005170600050206000501
-0600050206000503060005060600050206000502060005010600050206000502060205ff
-05ff052006000502060005010604050406000502060005020600050b0701020201030202
-0001050b0600050806000505060005020600051d06000506060005020600050506000500
-060005000600051706000502060005010600050206000503060005060600050206000502
-060005010600050206000505060005ff05ff051f06000502060005010600050806000502
-060005020600050b07010202010302020001050b06000508060005050600050206000502
-060005190600050606000502060005020600050106000500060005000600051706000502
-060005010601050106000503060005060600050206000502060005010600050206000501
-06000502060005ff05ff051f060005020600050106000502060005040600050206010501
-0600050b07010202010302020001050b0600050806000505060005030602051a06000506
-060005030602050306000500060005190602050206000500060105050601050406000503
-060205020600050206000502060205ff05ff052006000502060005020602050506000502
-060005000601050c070102020103020200010576060005ff05ff055b0600050f07010202
-010302020001050a0606052a0606052a06060500060005ff05ff05450606050e0600050f
-07010202010302020001050a0606052a0606052a06060500060005ff05ff05450606050e
-0600050f0701020201030202000105ff05ff05e40701020201030202000105ff05ff05e4
-0701020201030202000105ff05ff05e40701020201030202000107ff07ff07e602020103
-0202000007ff07ff07e702020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff05e80202
-0103020205ff05ff05e802020103020205ff05ff05e8020201030202051c010205040103
-05c1010205040103051a0102057f01010505010205f001020504010305190101052f0202
-01030202050e01060508010005060101050f010205010102059b01060508010005060101
-0510010505040101054d010205240104050d0101051e0102052401020501010205930106
-0508010005060101051101030535020201030202050e0100050101010500010005070101
-050601000511010105010100059d01000501010105000100050701010506010005130101
-05060100054d0101050001010524010105000101050c0100051e01010500010105240101
-050101000595010005010101050001000507010105060100051101010501010105340202
-010302020510010105030103050201030503010105030103050801020500010105010103
-05000101050001000500010005020103058b010105030103050201030503010105030103
-050a010105030104054c0101050101050500010305000102050201030501010105000102
-05070101050101010500010305030104051d010105010105050001030500010205020103
-050101010500010205070102050001010501010305000101050001000500010005020103
-058301010503010305020103050301010503010305090101050101000500010305020105
-050101030521020201030202051001010506010105000101050101010502010105020101
-0501010105070100050001000500010005050101050001050500010105010101058a0101
-050601010500010105010101050201010502010105010101050901010502010105010101
-054c01000502010105000101050201000500010205000101050001010501010105010102
-050001000507010105010101050201010502010105010101051d01000502010105000101
-050201000500010205000101050001010501010105010102050001000507010005000100
-050001000505010105000105050001010501010105820101050601010500010105010101
-050201010502010105010101050801020504010105020101050001010501010105010101
-052002020103020205100100050401040500010105010101050201010501010605070100
-0500010205020104050001010500010005000107058a0100050401040500010105010101
-0502010105010106050901010501010105020101054b0101050201000501010105000100
-05000100050001010501010805010101050a0103050401010501010105020101051c0101
-05020100050101010500010005000100050001010501010805010101050a010005000102
-050201040500010105000100050001070582010005040104050001010501010105020101
-05010106050901020503010105040101050101060520020201030202050f010105020101
-0501010105000101050201010501010105020101050b0101050001010501010105010101
-05010100050001000500010005000101058e010105020101050101010500010105020101
-0501010105020101050d01010502010105010101054c0101050101010501010205000100
-05010100050201000500010105050101050a0101050601010502010105010101051d0101
-05010101050101020500010005010100050201000500010105050101050a010105000101
-050101010501010105010100050001000500010005000101058601010502010105010101
-05000101050201010501010105020101050b010105010101050201010503010105030101
-0525020201030202050f0101050201010501010105000101050101010502010105020101
-050101010507010005010101050101010501010105000101050001000500010005000101
-05010101058a010105020101050101010500010105010101050201010502010105010101
-050901010502010105010101054c01010500010105020103050101010501010105000101
-0501010105010101050a0101050601010502010105010101051d01010500010105020103
-0501010105010101050001010501010105010101050a0100050101010501010105010101
-050001010500010005000100050001010501010105820101050201010501010105000101
-050101010502010105020101050101010507010105010101050201010502010205000101
-05000101050101010521020201030202050e01030502010a050101050501010305070102
-0500010105020107050001000500010105000103058a01030502010a0501010505010103
-0508010505010105054c0102050301010500010005000103050001020500010305010104
-050701030503010505010105051d01020503010105000100050001030500010205000103
-05010104050701020500010105020107050001000500010105000103058201030502010a
-050101050501010305090103050101050500010505010103052202020103020205ff05ff
-05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff
-05e802020103020205ff05ff05e802020103020205ff05ff05e802020103020205ff05ff
-05e8020201030202050201ff01ff01e205020202010302020503010000cb010100810101
-0059010100c30101005801000711000005020202010302020503010000cb010100810101
-0059010100c30101005801000701030607000306000105020202010302020503010000cb
-010100810101000c0100002301000026010100c301010058010007010305000007000306
-0001050202020103020205030100001f0100000a0100009e010100810101000b01000004
-010100090104000a01010002010000250101001e0102000501000012010000060100002e
-010000120102000301020031010100080104004a01000701030500000701030500010502
-02020103020205030100001f0100000a0100009e010100810101000a0100000401000001
-010000080100000d01000001010000020100002401010020010000190100003601000014
-010000050100003101010008010000020100004a01000701030400010701030500010502
-02020103020205030100000901020003010200090104000201020002010000000101009b
-01010081010100090100000501000001010000080100000d010000010100000301000023
-010100090102000201000000010100020100000001010005010000030102000301020003
-01020002010400020102000301020002010000000101000a010200030102000201000000
-010100020104000101000000010100030102000501000005010000030102000201000000
-010100230101000c0100004a010007010304000105000701030400010502020201030202
-0503010000080100000201000001010000020100000a0100000301000002010000010101
-00010100009a01010081010100080100000601000001010000080103000a010000010100
-000401000022010100080100000201000001010100010100000101010001010000040100
-000501000002010000020100000101000002010000030100000601000002010000020100
-000101010001010000080100000201000001010000020100000101010001010000030100
-000301010001010000010100000201000004010000050100000201000002010000010101
-0001010000220101000b0100004b01000701030300010501070103040001050202020103
-020205030100000c010000010100000e0100000701000001010000020100009a01010081
-0101000701000007010000010100000c010000090100000101000005010000210101000c
-010000010100000201000001010000020100000401000005010000020100000901000003
-010000060100000201000002010000010100000201000008010000050100000201000001
-010000020100000301000003010000050100000201000004010000050100000201000002
-01000001010000260101000b0100004b0100070103030001050207010303000105020202
-01030202050301000009010300010100000e0100000401030001010000020100009a0101
-00810101000801000006010000010100000c010000090100000101000004010000220101
-000901030001010000020100000101000002010000040100000501000002010000060103
-000301000006010000020100000201000001010000020100000801000005010000020100
-000101000002010000030100000301000005010000020100000401000005010000020104
-0001010000260101000b0100004b01000701030200010503070103030001050202020103
-020205030100000801000002010000010100000e01000003010000020100000101000002
-0100009a0101008101010009010000050100000101000008010000020100000901000001
-010000030100002301010008010000020100000101000002010000010100000201000004
-010000050100000201000005010000020100000301000006010000020100000201000001
-010000020100000801000005010000020100000101000002010000030100000301000005
-0100000201000004010000050100000201000005010000260101000a0100004c01000701
-030200010504070103020001050202020103020205030100000801000002010000010100
-00020100000a010000030100000201000001010100010100009a010100810101000a0100
-000401000001010000030101000201000002010000030101000301000001010000020100
-002401010008010000020100000101010001010000010101000101000004010000050100
-000201000002010000010100000201000003010000060100000201000002010000010100
-000201000008010000020100000101000002010000010100000201000003010000030100
-0005010000020100000401000005010000020100000201000001010000260101000a0100
-004c01000701030100010505070103020001050202020103020205030100000901030002
-0102000c0101000201030001010000000101009b010100810101000b0100000401010004
-010100030102000401010004010100020100002501010009010300010100000001010002
-010000000101000501000005010000030102000301030004010100040100000301020002
-010000020100000901020003010200020100000201000004010100010100000601020005
-010000050100000301020002010000260101000a0100004c010007010301000105060701
-030100010502020201030202050301000015010500af010100810101000c010000230100
-00260101000f010000050100003c01050068010100580100070103000001050707010301
-000105020202010302020503010000cb01010081010100590101000f01000005010000ab
-010100580100070103000001050807010300000105020202010302020503010000cb0101
-0081010100590101000f01000005010000ab01010058010007010001070b030000010502
-0202010302020503010000cb0101008101010059010100c301010058010007010000070d
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-030e000105020202010302020503010000cb0101008101010059010100c3010100580100
-0701001005020202010302020503010000cb0101008101010059010100c3010100580100
-0701000d070000010502020201030202050301ff01ff01ce07010001050a070100010502
-020201030202050308cd01ff01ff010007010001050a0701000105020202010302020503
-080009cb08000100098101010959010109c301010958010007010001050a070100010502
-0202010302020503080009cb08000100090b0101094e0101092201010959010109c30101
-0958010007010001050a0701000105020202010302020503080009cb08000100090a0100
-091c0100092a01000908010009210101090c0100092a0100091f010109c3010109580100
-07010001050a07010001050202020103020205030800091a080009af08000100090a0100
-0905010009050101090c010009040101090a010209020104090a01010902010009070100
-09210101090b010009040101090a010209020104090a010109020100091e0101091a0100
-09a70101090901020903010209020104093c010007010001050a07010001050202020103
-020205030800091a080009af08000100090a0100090401010904010009010100090a0100
-090401000901010009080100090201000901010009020100090901000901010009020100
-0906010009210101090a0100090401000901010009080100090201000901010009020100
-090901000901010009020100091d0101091a010009a70101090801000902010009010100
-090201000901010009020100093c010007010001050a0701000105020202010302020503
-0800090908020903080209030801090008000902080209a908000100090a010009030100
-090001000904010009010100090901000905010009010100090c01000905010009090100
-09010100090301000905010009210101090901000905010009010100090c010009050100
-090901000901010009030100091c01010909010209030102090301010900010009020102
-090a01020903010209020100090001010902010009020100090201020902010009000101
-09700101090c01000905010009050100093c010007010001050a07010001050202020103
-020205030800090808000902080009010800090208000901080009010801090108000902
-080009a808000100090a0100090501000904010009010100090801000906010009010100
-090c010009040100090a0100090101000904010009040100092101010908010009060100
-09010100090c010009040100090a01000901010009040100091b01010908010009020100
-090101000902010009010100090101010901010009020100090801000902010009010100
-090201000901010109010100090101000902010009010100090201000901010109010100
-096f0101090c01000905010009040100093d010007010001050a07010001050202020103
-0202050308000908080009050800090208000901080009020800090108000902080009a8
-0800010009080101090601000904010009010100090701000907010009010100090b0100
-09050100090a0100090101000905010009040101091f0101090701000907010009010100
-090b010009050100090a01000901010009050100091a0101090801000905010009020100
-090101000902010009010100090201000908010009050100090201000901010009050100
-0902010009010100090201000901010009730101090b01000905010009050100093d0100
-07010001050a070100010502020201030202050308000908080009050800090208000901
-0800090208000901080409a808000100090a010009050100090401000901010009080100
-0906010009010100090a010009060100090a010009010100090401000904010009210101
-090801000906010009010100090a010009060100090a01000901010009040100091b0101
-090801000905010009020100090101000902010009010104090901020902010409010100
-0906010009000100090201040901010009730101090a01000905010009060100093d0100
-07010001050a070100010502020201030202050308000908080009050800090208000901
-0800090208000901080009ac08000100090a010009050100090401000901010009090100
-09050100090101000909010009060100090b010009010100090301000905010009210101
-0909010009050100090101000909010009060100090b01000901010009030100091c0101
-090801000905010009020100090101000902010009010100091001000901010009050100
-0906010009000100090201000905010009730101090901000905010009060100093e0100
-07010001050a070100010502020201030202050308000908080009020800090108000902
-08000901080009010801090108000902080009a808000100090a01000905010009040100
-090101000903010109040100090401000901010009030101090201000907010009050101
-0903010009010100090201000906010009210101090a0100090401000901010009030101
-090201000907010009050101090301000901010009020100091d01010908010009020100
-090101000902010009010100090101010901010009020100090801000902010009010100
-090201000901010009070100090301000902010009010100097301010908010009050100
-09070100093e010007010001050a07010001050202020103020205030800090908020903
-080209030801090008000902080209a908000100090a0100090301040903010109040101
-090501000904010109040101090201040903010009050101090401010902010009070100
-09210101090b010009040101090401010902010409030100090501010904010109020100
-091e01010909010209030102090301010900010009020102090a01020903010209020100
-09070100090401020902010009730101090801040901010409030100093e010007010001
-050a0701000105020202010302020503080009cb08000100090a01000914010009060100
-092a01000908010009210101090c0100092a0100091f0101092301050999010109580100
-07010001050a0701000105020202010302020503080009cb08000100090b010109100101
-093b0101092201010959010109c301010958010007010001050a07010001050202020103
-02020503080009cb08000100098101010959010109c301010958010007010001050a0701
-000105020202010302020503080009cb08000100098101010959010109c3010109580100
-07010001050a0701000105020202010302020503080009cb080001000981010109590101
-09c301010958010007010001050a0701000105020202010302020503080009cb08000100
-098101010959010109c301010958010007010001050a0701000105020202010302020503
-080009cb08000100098101010959010109c301010958010007010001050a070100010502
-020201030202050308cd01ff01ff010007010001050a0701000105020202010302020503
-08cd01ff01ff010007010001050a0701000105020202010302020503080009cb08000100
-098101010959010109c301010958010007010001050a0701000105020202010302020503
-080009cb08000100090b0101094e0101092201010959010109c301010958010007010001
-050a0701000105020202010302020503080009cb08000100090a0100091c0100092a0100
-0908010009210101090c0100092a0100091f010109c301010958010007010001050a0701
-0001050202020103020205030800091a080009af08000100090a01000905010009050100
-090d010009040101090a010209020104090a0101090201000907010009210101090b0100
-09040101090a010209020104090a010109020100091e0101091a010009a7010109090102
-090301020944010007010001050a07010001050202020103020205030800091a080009af
-08000100090a01000904010109040101090c010009040100090101000908010009020100
-09010100090201000909010009010100090201000906010009210101090a010009040100
-0901010009080100090201000901010009020100090901000901010009020100091d0101
-091a010009a70101090801000902010009010100090201000943010007010001050a0701
-000105020202010302020503080009090802090308020903080109000800090208020909
-0800090008010903080209020801090008000903080209030802097f08000100090a0100
-09030100090001000903010009000100090b01000905010009010100090c010009050100
-0909010009010100090301000905010009210101090901000905010009010100090c0100
-09050100090901000901010009030100091c010109090102090301020903010109000100
-09020102090a010209030102090201000900010109020100090201000902010209020100
-0900010109700101090c0100090501000943010007010001050a07010001050202020103
-020205030800090808000902080009010800090208000901080009010801090108000902
-080009080801090108000901080009020800090108000900080009000800090108000902
-08000901080009020800097e08000100090a01000905010009050100090a010009060100
-09010100090c010009040100090a01000901010009040100090401000921010109080100
-0906010009010100090c010009040100090a01000901010009040100091b010109080100
-090201000901010009020100090101000901010109010100090201000908010009020100
-090101000902010009010101090101000901010009020100090101000902010009010101
-09010100096f0101090c0100090501000943010007010001050a07010001050202020103
-020205030800090808000905080009020800090108000902080009010800090208000908
-080009020800090508000901080009000800090008000901080009020800090108000982
-08000100090801010906010009050100090901000907010009010100090b010009050100
-090a0100090101000905010009040101091f0101090701000907010009010100090b0100
-09050100090a01000901010009050100091a010109080100090501000902010009010100
-090201000901010009020100090801000905010009020100090101000905010009020100
-09010100090201000901010009730101090a0101090401010944010007010001050a0701
-000105020202010302020503080009080800090508000902080009010800090208000901
-08040908080009020800090208030901080009000800090008000901080409020802097f
-08000100090a01000905010009050100090a01000906010009010100090a010009060100
-090a010009010100090401000904010009210101090801000906010009010100090a0100
-09060100090a01000901010009040100091b010109080100090501000902010009010100
-090201000901010409090102090201040901010009060100090001000902010409010100
-09730101090c0100090501000943010007010001050a0701000105020202010302020503
-0800090808000905080009020800090108000902080009010800090c0800090208000901
-0800090208000901080009000800090008000901080009090800097e08000100090a0100
-0905010009050100090b010009050100090101000909010009060100090b010009010100
-0903010009050100092101010909010009050100090101000909010009060100090b0100
-0901010009030100091c0101090801000905010009020100090101000902010009010100
-0910010009010100090501000906010009000100090201000905010009730101090c0100
-090501000943010007010001050a07010001050202020103020205030800090808000902
-080009010800090208000901080009010801090108000902080009080800090208000901
-08000902080009010800090008000900080009010800090208000901080009020800097e
-08000100090a010009050100090501000905010109040100090401000901010009030101
-0902010009070100090501010903010009010100090201000906010009210101090a0100
-090401000901010009030101090201000907010009050101090301000901010009020100
-091d01010908010009020100090101000902010009010100090101010901010009020100
-090801000902010009010100090201000901010009070100090301000902010009010100
-09730101090801000902010009010100090201000943010007010001050a070100010502
-020201030202050308000909080209030802090308010900080009020802090908000902
-0800090208030901080009000800090008000902080209030802097f08000100090a0100
-090301040901010409030101090501000904010109040101090201040903010009050101
-09040101090201000907010009210101090b010009040101090401010902010409030100
-090501010904010109020100091e01010909010209030102090301010900010009020102
-090a01020903010209020100090701000904010209020100097301010909010209030102
-0944010007010001050a070100010502020201030202050308000923080509a108000100
-090a01000914010009060100092a01000908010009210101090c0100092a0100091f0101
-09230105099901010958010007010001050a0701000105020202010302020503080009cb
-08000100090b010109100101093b0101092201010959010109c301010958010007010001
-050a0701000105020202010302020503080009cb08000100098101010959010109c30101
-0958010007010001050a0701000105020202010302020503080009cb0800010009810101
-0959010109c301010958010007010001050a0701000105020202010302020503080009cb
-08000100098101010959010109c301010958010007010001050a07010001050202020103
-02020503080009cb08000100098101010959010109c301010958010007010001050a0701
-000105020202010302020503080009cb08000100098101010959010109c3010109580100
-07010001050a070100010502020201030202050308cd01ff01ff010007010001050a0701
-00010502020201030202050308cd01ff01ff010007010001050a07010001050202020103
-02020503080009cb08000100098101010959010109c301010958010007010001050a0701
-000105020202010302020503080009cb08000100090b0101094701010929010109590101
-09c301010958010007010001050a0701000105020202010302020503080009cb08000100
-090a010009150100092a01000908010009280101090c0100092a0100091f010109c30101
-0958010007010001050a07010001050202020103020205030800091d08000908080009a2
-08000100090a010009040102090c010009040101090b010009030104090a010109020100
-0907010009280101090b010009040101090b010009030104090a010109020100091e0101
-09180100090a01000922010209770101090a0100094c010007010001050a070100010502
-02020103020205030800091d080009ac08000100090a01000903010009020100090a0100
-090401000901010009090101090301000902010009090100090101000902010009060100
-09280101090a010009040100090101000909010109030100090201000909010009010100
-09020100091d010109180100090a0100092401000977010109090101094c010007010001
-050a07010001050202020103020205030800090908020903080209030802090208000901
-0800090308020903080209030802099408000100090a0100090301000902010009090100
-090501000901010009080100090001000907010009090100090101000903010009050100
-092801010909010009050100090101000908010009000100090701000909010009010100
-09030100091c010109080100090001010903010209020104090801000901010009030102
-090201000900010109020100090001010903010209050100097701010908010009000100
-094c010007010001050a0701000105020202010302020503080009080800090208000901
-080009020800090108000902080009010800090008000906080009020800090208000901
-080009020800099308000100090a01000903010009020100090801000906010009010100
-090a010009060100090a0100090101000904010009040100092801010908010009060100
-09010100090a010009060100090a01000901010009040100091b01010908010109010100
-090101000902010009030100090a01000900010009030100090201000901010109010100
-090101010901010009010100090201000904010009770101090a0100094c010007010001
-050a07010001050202020103020205030800090808000905080009020800090108000902
-080009010801090708000902080009020800090108000997080001000908010109050102
-090801000907010009010100090a010009060100090a0100090101000905010009040101
-09260101090701000907010009010100090a010009060100090a01000901010009050100
-091a01010908010009020100090101000902010009030100090a01010904010009020100
-09010100090501000902010009010100090201000904010009770101090a0100094c0100
-07010001050a070100010502020201030202050308000908080009050800090208000901
-08000902080009010801090708000902080409020802099408000100090a010009030100
-09020100090801000906010009010100090a010009060100090a01000901010009040100
-0904010009280101090801000906010009010100090a010009060100090a010009010100
-09040100091b010109080100090201000901010409030100090a01010904010409010100
-0905010009020100090101040904010009770101090a0100094c010007010001050a0701
-000105020202010302020503080009080800090508000902080009010800090208000901
-080009000800090608000902080009090800099308000100090a01000903010009020100
-090901000905010009010100090a010009050100090b0100090101000903010009050100
-09280101090901000905010009010100090a010009050100090b01000901010009030100
-091c010109080100090201000901010009070100090a0100090001000903010009050100
-0905010009020100090101000908010009770101090a0100094c010007010001050a0701
-000105020202010302020503080009080800090208000901080009020800090108000902
-080009010800090108000905080009020800090208000901080009020800099308000100
-090a01000903010009020100090301010904010009040100090101000903010109040100
-09050100090501010903010009010100090201000906010009280101090a010009040100
-0901010009030101090401000905010009050101090301000901010009020100091d0101
-0908010009020100090101000902010009030100090a0100090101000902010009020100
-09010100090501000902010009010100090201000904010009770101090a0100094c0100
-07010001050a070100010502020201030202050308000909080209030802090308020902
-080009020800090408000903080209030802099408000100090a01000904010209040101
-090501000904010109040101090201040903010009050101090401010902010009070100
-09280101090b010009040101090401010902010409030100090501010904010109020100
-091e01010908010009020100090201020905010109080100090201000902010209020100
-090501000902010009020102090501000977010109080104094a010007010001050a0701
-000105020202010302020503080009cb08000100090a0100090d010009060100092a0100
-0908010009280101090c0100092a0100091f0101091c010509a001010958010007010001
-050a0701000105020202010302020503080009cb08000100090b010109090101093b0101
-092901010959010109c301010958010007010001050a0701000105020202010302020503
-080009cb08000100098101010959010109c301010958010007010001050a070100010502
-0202010302020503080009cb08000100098101010959010109c301010958010007010001
-050a0701000105020202010302020503080009cb08000100098101010959010109c30101
-0958010007010001050a0701000105020202010302020503080009cb0800010009810101
-0959010109c301010958010007010001050a0701000105020202010302020503080009cb
-08000100098101010959010109c301010958010007010001050a07010001050202020103
-0202050308cd01ff01ff010007010001050a070100010502020201030202050301ff01ff
-01ce07010001050a0701000105020202010302020503010000cb01010081010100590101
-00c301010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb010100810101000c0100002a0100001f010100c301010058010007010001050a0701
-00010502020201030202050301000010010200090100000d0102000a010200100100007b
-010100810101000b010000040101000b010000050100000c010100020100001e01010010
-010200090100000d010200930101000a0101004b010007010001050a0701000105020202
-01030202050301000012010000090100000f0100000c010000100100007b010100810101
-000a010000040100000101000009010100040101000b01000001010000020100001d0101
-0012010000090100000f0100009301010009010000010100004a010007010001050a0701
-000105020202010302020503010000090101000001000004010000030102000201000000
-01010003010200050100000c010000030102000301020002010000010100000301020071
-01010081010100090100000501000001010000080100000001000003010000000100000b
-01000001010000030100001c010100090101000001000004010000030102000201000000
-01010003010200050100000901000000010100030102000201010000010000030102000a
-01020003010200020100000001010002010000020100000201020002010000000101003f
-01010009010000010100004a010007010001050a07010001050202020103020205030100
-000801000001010100040100000201000002010000010101000101000001010000020100
-00040100000c010000020100000201000001010000020100000101000000010000030100
-000201000070010100810101000801000006010000010100000a010000050100000b0100
-0001010000040100001b0101000801000001010100040100000201000002010000010101
-000101000001010000020100000401000009010100010100000101000002010000010100
-000001000000010000010100000201000008010000020100000101000002010000010101
-00010100000101000002010000010100000201000001010100010100003e010100090100
-00010100004a010007010001050a07010001050202020103020205030100000801000002
-010000040100000201000002010000010100000201000005010000040100000c01000002
-010000020100000101000005010100040100007401010081010100070100000701000001
-0100000a010000050100000b01000001010000050100001a010100080100000201000004
-010000020100000201000001010000020100000501000004010000090100000201000005
-010000010100000001000000010000010100000201000008010000050100000201000001
-01000005010000020100000101000002010000010100004201010009010000010100004a
-010007010001050a07010001050202020103020205030100000801000002010000040100
-000201000002010000010100000201000002010300040100000c01000002010000020100
-0001010000050101000501020071010100810101000801000006010000010100000a0100
-00050100000b01000001010000040100001b010100080100000201000004010000020100
-000201000001010000020100000201030004010000090100000201000002010300010100
-000001000000010000010104000901020002010400010100000601000000010000020104
-00010100004201010009010000010100004a010007010001050a07010001050202020103
-020205030100000801000002010000040100000201000002010000010100000201000001
-01000002010000040100000c010000020100000201000001010000050100000001000007
-01000070010100810101000901000005010000010100000a010000050100000b01000001
-010000030100001c01010008010000020100000401000002010000020100000101000002
-010000010100000201000004010000090100000201000001010000020100000101000000
-010000000100000101000010010000010100000501000006010000000100000201000005
-0100004201010009010000010100004a010007010001050a070100010502020201030202
-050301000008010000010101000401000002010000020100000101010001010000010100
-0002010000040100000c0100000201000002010000010100000201000001010000010100
-00020100000201000070010100810101000a010000040100000101000003010100040100
-0005010000050101000301000001010000020100001d0101000801000001010100040100
-000201000002010000010101000101000001010000020100000401000009010000020100
-000101000002010000010100000001000000010000010100000201000008010000020100
-000101000002010000010100000701000003010000020100000101000042010100090100
-00010100004a010007010001050a07010001050202020103020205030100000901010000
-0100000401000003010200020100000001010003010300040100000c0100000301020003
-01020002010000020100000201020071010100810101000b010000040101000401010002
-010400010104000301010004010100020100001e01010009010100000100000401000003
-010200020100000001010003010300040100000901000002010000020103000101000000
-01000000010000020102000a010200030102000201000007010000040102000201000042
-0101000a0101004b010007010001050a07010001050202020103020205030100000c0100
-002301050093010100810101000c0100002a0100001f0101000c010000230105001c0105
-006801010058010007010001050a07010001050202020103020205030100000801000002
-010000bd01010081010100590101000801000002010000b501010058010007010001050a
-070100010502020201030202050301000009010200be0101008101010059010100090102
-00b601010058010007010001050a0701000105020202010302020503010000cb01010081
-01010059010100c301010058010007010001050a07010001050202020103020205030100
-00cb0101008101010059010100c301010058010007010001050a07010001050202020103
-02020503010000cb0101008101010059010100c301010058010007010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a070100010502020201030202050301ff01ff01ce07010001050a0701000105020202
-01030202050301ff01ff01ce07010001050a0701000105020202010302020503010000cb
-0101008101010059010100c301010058010007010001050a070100010502020201030202
-0503010000cb0101008101010059010100c301010058010007010001050a070100010502
-0202010302020503010000cb010100810101000c0100002a0100001f010100c301010058
-010007010001050a070100010502020201030202050301000010010200090100000d0102
-009b010100810101000b010000040101000b010000050100000c010100020100001e0101
-0010010200090100000d010200930101000a0101004b010007010001050a070100010502
-020201030202050301000012010000090100000f0100009b010100810101000a01000004
-0100000101000009010100040101000b01000001010000020100001d0101001201000009
-0100000f0100009301010009010000010100004a010007010001050a0701000105020202
-010302020503010000090101000001000004010000030102000201000000010100030102
-000501000009010000000101000301020002010100000100000301020003010200710101
-0081010100090100000501000001010000080100000001000003010000000100000b0100
-0001010000030100001c0101000901010000010000040100000301020002010000000101
-0003010200050100000901000000010100030102000201010000010000030102000a0102
-0003010200020100000001010002010000020100000201020002010000000101003f0101
-0009010000010100004a010007010001050a070100010502020201030202050301000008
-010000010101000401000002010000020100000101010001010000010100000201000004
-010000090101000101000001010000020100000101000000010000000100000101000002
-010000010100000201000070010100810101000801000006010000010100000a01000005
-0100000b01000001010000040100001b0101000801000001010100040100000201000002
-010000010101000101000001010000020100000401000009010100010100000101000002
-010000010100000001000000010000010100000201000008010000020100000101000002
-01000001010100010100000101000002010000010100000201000001010100010100003e
-01010009010000010100004a010007010001050a07010001050202020103020205030100
-000801000002010000040100000201000002010000010100000201000005010000040100
-000901000002010000050100000101000000010000000100000101000002010000010100
-0074010100810101000701000007010000010100000a010000050100000b010000010100
-00050100001a010100080100000201000004010000020100000201000001010000020100
-000501000004010000090100000201000005010000010100000001000000010000010100
-000201000008010000050100000201000001010000050100000201000001010000020100
-00010100004201010009010000010100004a010007010001050a07010001050202020103
-020205030100000801000002010000040100000201000002010000010100000201000002
-010300040100000901000002010000020103000101000000010000000100000101040002
-01020071010100810101000801000006010000010100000a010000050100000b01000001
-010000040100001b01010008010000020100000401000002010000020100000101000002
-010000020103000401000009010000020100000201030001010000000100000001000001
-010400090102000201040001010000060100000001000002010400010100004201010009
-010000010100004a010007010001050a0701000105020202010302020503010000080100
-000201000004010000020100000201000001010000020100000101000002010000040100
-000901000002010000010100000201000001010000000100000001000001010000090100
-0070010100810101000901000005010000010100000a010000050100000b010000010100
-00030100001c010100080100000201000004010000020100000201000001010000020100
-000101000002010000040100000901000002010000010100000201000001010000000100
-000001000001010000100100000101000005010000060100000001000002010000050100
-004201010009010000010100004a010007010001050a0701000105020202010302020503
-010000080100000101010004010000020100000201000001010100010100000101000002
-010000040100000901000002010000010100000201000001010000000100000001000001
-01000002010000010100000201000070010100810101000a010000040100000101000003
-0101000401000005010000050101000301000001010000020100001d0101000801000001
-010100040100000201000002010000010101000101000001010000020100000401000009
-010000020100000101000002010000010100000001000000010000010100000201000008
-010000020100000101000002010000010100000701000003010000020100000101000042
-01010009010000010100004a010007010001050a07010001050202020103020205030100
-000901010000010000040100000301020002010000000101000301030004010000090100
-000201000002010300010100000001000000010000020102000301020071010100810101
-000b010000040101000401010002010400010104000301010004010100020100001e0101
-000901010000010000040100000301020002010000000101000301030004010000090100
-000201000002010300010100000001000000010000020102000a01020003010200020100
-00070100000401020002010000420101000a0101004b010007010001050a070100010502
-02020103020205030100000c0100002301050093010100810101000c0100002a0100001f
-0101000c010000230105001c0105006801010058010007010001050a0701000105020202
-0103020205030100000801000002010000bd010100810101005901010008010000020100
-00b501010058010007010001050a070100010502020201030202050301000009010200be
-010100810101005901010009010200b601010058010007010001050a0701000105020202
-010302020503010000cb0101008101010059010100c301010058010007010001050a0701
-000105020202010302020503010000cb0101008101010059010100c30101005801000701
-0001050a0701000105020202010302020503010000cb0101008101010059010100c30101
-0058010007010001050a0701000105020202010302020503010000cb0101008101010059
-010100c301010058010007010001050a070100010502020201030202050301ff01ff01ce
-07010001050a070100010502020201030202050301ff01ff01ce07010001050a07010001
-05020202010302020503010000cb0101008101010059010100c301010058010007010001
-050a0701000105020202010302020503010000cb0101008101010059010100c301010058
-010007010001050a0701000105020202010302020503010000cb010100810101000c0100
-002a0100001f010100c301010058010007010001050a0701000105020202010302020503
-01000010010200090100000d0102004301000056010100810101000b010000040101000b
-010000050100000c010100020100001e01010010010200090100000d010200930101000a
-0101004b010007010001050a070100010502020201030202050301000012010000090100
-000f0100004301000056010100810101000a010000040100000101000009010100040101
-000b01000001010000020100001d01010012010000090100000f01000093010100090100
-00010100004a010007010001050a07010001050202020103020205030100000901010000
-010000040100000301020002010000000101000301020005010000090100000001010003
-010200020101000001000003010200030102000a01020002010000020100000101040054
-01010081010100090100000501000001010000080100000001000003010000000100000b
-01000001010000030100001c010100090101000001000004010000030102000201000000
-01010003010200050100000901000000010100030102000201010000010000030102000a
-01020003010200020100000001010002010000020100000201020002010000000101003f
-01010009010000010100004a010007010001050a07010001050202020103020205030100
-000801000001010100040100000201000002010000010101000101000001010000020100
-000401000009010100010100000101000002010000010100000001000000010000010100
-000201000001010000020100000801000002010000010100000201000003010000560101
-00810101000801000006010000010100000a010000050100000b01000001010000040100
-001b01010008010000010101000401000002010000020100000101010001010000010100
-000201000004010000090101000101000001010000020100000101000000010000000100
-000101000002010000080100000201000001010000020100000101010001010000010100
-0002010000010100000201000001010100010100003e01010009010000010100004a0100
-07010001050a070100010502020201030202050301000008010000020100000401000002
-010000020100000101000002010000050100000401000009010000020100000501000001
-01000000010000000100000101000002010000010100000c010000020100000201000000
-0100000401000056010100810101000701000007010000010100000a010000050100000b
-01000001010000050100001a010100080100000201000004010000020100000201000001
-010000020100000501000004010000090100000201000005010000010100000001000000
-010000010100000201000008010000050100000201000001010000050100000201000001
-01000002010000010100004201010009010000010100004a010007010001050a07010001
-050202020103020205030100000801000002010000040100000201000002010000010100
-000201000002010300040100000901000002010000020103000101000000010000000100
-000101040002010200090104000301000005010000560101008101010008010000060100
-00010100000a010000050100000b01000001010000040100001b01010008010000020100
-000401000002010000020100000101000002010000020103000401000009010000020100
-000201030001010000000100000001000001010400090102000201040001010000060100
-000001000002010400010100004201010009010000010100004a010007010001050a0701
-000105020202010302020503010000080100000201000004010000020100000201000001
-010000020100000101000002010000040100000901000002010000010100000201000001
-010000000100000001000001010000090100000801000006010000000100000401000056
-010100810101000901000005010000010100000a010000050100000b0100000101000003
-0100001c0101000801000002010000040100000201000002010000010100000201000001
-010000020100000401000009010000020100000101000002010000010100000001000000
-010000010100001001000001010000050100000601000000010000020100000501000042
-01010009010000010100004a010007010001050a07010001050202020103020205030100
-000801000001010100040100000201000002010000010101000101000001010000020100
-000401000009010000020100000101000002010000010100000001000000010000010100
-000201000001010000020100000801000002010000010100000201000003010000560101
-00810101000a010000040100000101000003010100040100000501000005010100030100
-0001010000020100001d0101000801000001010100040100000201000002010000010101
-000101000001010000020100000401000009010000020100000101000002010000010100
-000001000000010000010100000201000008010000020100000101000002010000010100
-00070100000301000002010000010100004201010009010000010100004a010007010001
-050a07010001050202020103020205030100000901010000010000040100000301020002
-010000000101000301030004010000090100000201000002010300010100000001000000
-01000002010200030102000a01020002010000020100000401010054010100810101000b
-010000040101000401010002010400010104000301010004010100020100001e01010009
-010100000100000401000003010200020100000001010003010300040100000901000002
-01000002010300010100000001000000010000020102000a010200030102000201000007
-0100000401020002010000420101000a0101004b010007010001050a0701000105020202
-0103020205030100000c010000230105002301050069010100810101000c0100002a0100
-001f0101000c010000230105001c0105006801010058010007010001050a070100010502
-02020103020205030100000801000002010000bd01010081010100590101000801000002
-010000b501010058010007010001050a0701000105020202010302020503010000090102
-00be010100810101005901010009010200b601010058010007010001050a070100010502
-0202010302020503010000cb0101008101010059010100c301010058010007010001050a
-0701000105020202010302020503010000cb0101008101010059010100c3010100580100
-07010001050a0701000105020202010302020503010000cb0101008101010059010100c3
-01010058010007010001050a0701000105020202010302020503010000cb010100810101
-0059010100c301010058010007010001050a070100010502020201030202050301ff01ff
-01ce07010001050a070100010502020201030202050308cd01ff01ff010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100000b0101004e
-0101002201010059010100c301010058010007010001050a070100010502020201030202
-0503080000cb08000100000a0100001c0100002a01000008010000210101000c0100002a
-0100001f010100c301010058010007010001050a07010001050202020103020205030800
-00cb08000100000a01000005010000040102000c010000040101000d010000020102000b
-0101000201000007010000210101000b010000040101000d010000020102000b01010002
-0100001e0101002001010018010000150100006f01010009010200020104004301000701
-0001050a0701000105020202010302020503080000cb08000100000a0100000401010003
-010000020100000a01000004010000010100000b01010001010000020100000901000001
-0100000201000006010000210101000a01000004010000010100000b0101000101000002
-0100000901000001010000020100001d0101001f0100001a010000150100006f01010008
-010000020100000101000047010007010001050a07010001050202020103020205030800
-000908010000080000020802000908000000080100030802000208010000080000030802
-00030802008d08000100000a010000030100000001000007010000090100000501000001
-0100000a0100000001000005010000090100000101000003010000050100002101010009
-01000005010000010100000a01000000010000050100000901000001010000030100001c
-0101000901010000010000020102000b0100000301000000010100030102000201000000
-0101000201040002010200020100000001010003010100000100006f0101000801000002
-0100000101000047010007010001050a0701000105020202010302020503080000080800
-000108010001080000020800000808010001080000010800000208000001080000000800
-0000080000010800000208000001080000020800008c08000100000a0100000501000007
-010000080100000601000001010000090100000101000005010000090100000101000004
-010000040100002101010008010000060100000101000009010000010100000501000009
-01000001010000040100001b010100080100000101010001010000020100000801040001
-010100010100000101000002010000010101000101000003010000030100000201000001
-0101000101000001010000010101006f0101000801000002010000010103004401000701
-0001050a07010001050202020103020205030800000808000002080000010800000c0800
-000208000005080000010800000008000000080000010800000208000001080000900800
-010000080101000601000006010000080100000701000001010000080100000201000003
-0101000a0100000101000005010000040101001f01010007010000070100000101000008
-01000002010000030101000a01000001010000050100001a010100080100000201000001
-0100000e0100000301000005010000020100000101000002010000030100000301000002
-010000010100000201000001010000020100006f01010009010200060100004301000701
-0001050a0701000105020202010302020503080000080800000208000002080200090800
-00020800000208030001080000000800000008000001080400020802008d08000100000a
-01000005010000050100000a010000060100000101000008010000020100000501000009
-010000010100000401000004010000210101000801000006010000010100000801000002
-010000050100000901000001010000040100001b0101000801000002010000020102000b
-010000030100000501000002010000010100000201000003010000030104000101000002
-01000001010000020100006f01010008010000020100000501000043010007010001050a
-070100010502020201030202050308000008080000020800000508000008080000020800
-00010800000208000001080000000800000008000001080000090800008c08000100000a
-01000005010000040100000c010000050100000101000008010500040100000901000001
-010000030100000501000021010100090100000501000001010000080105000401000009
-01000001010000030100001c0101000801000002010000050100000a0100000301000005
-010000020100000101000002010000030100000301000005010000020100000101000002
-0100006f0101000801000002010000010100000201000043010007010001050a07010001
-050202020103020205030800000808000001080100010800000208000008080000020800
-000108000002080000010800000008000000080000010800000208000001080000020800
-008c08000100000a01000005010000030100000701010004010000040100000101000003
-010100060100000101000002010000030101000301000001010000020100000601000021
-0101000a0100000401000001010000030101000601000001010000020100000301010003
-01000001010000020100001d010100080100000101010001010000020100000a01000003
-010000050100000201000001010000020100000301000003010000020100000101000002
-01000001010000010101006f010100080100000201000001010000020100004301000701
-0001050a0701000105020202010302020503080000090801000008000002080200090800
-00020800000208030001080000000800000008000002080200030802008d08000100000a
-010000030104000101040003010100050100000401010004010100060100000201020004
-010100040101000201000007010000210101000b01000004010100040101000601000002
-0102000401010004010100020100001e0101000901010000010000020102000b01000003
-010000060102000201000002010000040101000201020002010000020100000201010000
-0100006f010100090102000301020044010007010001050a070100010502020201030202
-05030800000c08000007080500af08000100000a01000014010000060100002a01000008
-010000210101000c0100002a0100001f0101000c01000007010500a70101005801000701
-0001050a07010001050202020103020205030800000808000002080000bd08000100000b
-010100100101003b01010022010100590101000801000002010000b50101005801000701
-0001050a070100010502020201030202050308000009080200be08000100008101010059
-01010009010200b601010058010007010001050a07010001050202020103020205030800
-00cb08000100008101010059010100c301010058010007010001050a0701000105020202
-010302020503080000cb08000100008101010059010100c301010058010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100008101010059
-010100c301010058010007010001050a070100010502020201030202050308cd01ff01ff
-010007010001050a070100010502020201030202050308cd01ff01ff010007010001050a
-0701000105020202010302020503080000cb08000100008101010059010100c301010058
-010007010001050a0701000105020202010302020503080000cb08000100000b0101004e
-0101002201010059010100c301010058010007010001050a070100010502020201030202
-0503080000cb08000100000a0100001c0100002a01000008010000210101000c0100002a
-0100001f010100c301010058010007010001050a07010001050202020103020205030800
-00110800000308000010080000010800009e08000100000a01000005010000040102000c
-010000040101000d010000050100000a0101000201000007010000210101000b01000004
-0101000d010000050100000a010100020100001e010100c30101000a0100000401020044
-010007010001050a07010001050202020103020205030800001108000003080000100800
-00010800009e08000100000a0100000401010003010000020100000a0100000401000001
-0100000b0101000401010009010000010100000201000006010000210101000a01000004
-010000010100000b010100040101000901000001010000020100001d010100c301010009
-010100030100000201000043010007010001050a07010001050202020103020205030800
-0009080100000800000108040001080000010800000a0801000008000001080000000801
-009b08000100000a0100000301000000010000070100000901000005010000010100000a
-010000000100000301000000010000090100000101000003010000050100002101010009
-01000005010000010100000a010000000100000301000000010000090100000101000003
-0100001c010100c30101000801000000010000030100000201000043010007010001050a
-070100010502020201030202050308000008080000010801000308000003080000000800
-000a0800000108010001080100010800009a08000100000a010000050100000701000008
-010000060100000101000009010000010100000201000001010000090100000101000004
-010000040100002101010008010000060100000101000009010000010100000201000001
-0100000901000001010000040100001b010100c30101000a010000030100000201000043
-010007010001050a07010001050202020103020205030800000808000002080000030800
-00030801000b0800000208000001080000020800009a0800010000080101000601000005
-010100080100000701000001010000080100000201000001010000020100000901000001
-01000005010000040101001f010100070100000701000001010000080100000201000001
-010000020100000901000001010000050100001a010100c30101000a0100000401030043
-010007010001050a07010001050202020103020205030800000808000002080000030800
-00030801000b0800000208000001080000020800009a08000100000a0100000501000007
-010000080100000601000001010000080100000201000001010000020100000901000001
-010000040100000401000021010100080100000601000001010000080100000201000001
-010000020100000901000001010000040100001b010100c30101000a0100000701000043
-010007010001050a07010001050202020103020205030800000808000002080000030800
-0003080000000800000a0800000208000001080000020800009a08000100000a01000005
-010000070100000901000005010000010100000801050000010500080100000101000003
-010000050100002101010009010000050100000101000008010500000105000801000001
-010000030100001c010100c30101000a0100000701000043010007010001050a07010001
-050202020103020205030800000808000001080100030800000308000001080000090800
-000108010001080100010800009a08000100000a01000005010000030100000201000003
-010100040100000401000001010000030101000601000005010000030101000301000001
-0100000201000006010000210101000a0100000401000001010000030101000601000005
-010000030101000301000001010000020100001d010100c30101000a0100000301000002
-01000043010007010001050a070100010502020201030202050308000009080100000800
-00040801000108000002080000090801000008000001080000000801009b08000100000a
-010000030104000201020004010100050100000401010004010100060100000501000003
-010100040101000201000007010000210101000b01000004010100040101000601000005
-0100000301010004010100020100001e010100c301010008010400020102004401000701
-0001050a07010001050202020103020205030800000c0800000e080500a808000100000a
-01000014010000060100002a01000008010000210101000c0100002a0100001f010100c3
-01010058010007010001050a070100010502020201030202050308000008080000020800
-00bd08000100000b010100100101003b0101002201010059010100c30101005801000701
-0001050a070100010502020201030202050308000009080200be08000100008101010059
-010100c301010058010007010001070c000105020202010302020503080000cb08000100
-008101010059010100c301010058010007010000070d0001050202020103020205030800
-00cb08000100008101010059010100c30101005801000701030e00010502020201030202
-0503080000cb08000100008101010059010100c30101005801000701030e000105020202
-010302020503080000cb08000100008101010059010100c30101005801000701030e0001
-0502020201030202050308cd01ff01ff01000701030e00010502020201030202050308cd
-01ff01ff01000701030e000105020202010302020503080000cb08000100008101010059
-010100c30101005801000701030e000105020202010302020503080000cb08000100000b
-0101004e0101002201010059010100c30101005801000701030e00010502020201030202
-0503080000cb08000100000a0100001c0100002a01000008010000210101000c0100002a
-0100001f010100c30101005801000701030e000105020202010302020503080000110800
-000308000010080000010800009e08000100000a01000005010000070100000b01000004
-0101000d010000050100000a0101000201000007010000210101000b010000040101000d
-010000050100000a010100020100001e010100c301010008010400020102004401000701
-030e000105020202010302020503080000110800000308000010080000010800009e0800
-0100000a01000004010100060101000a01000004010000010100000b0101000401010009
-010000010100000201000006010000210101000a01000004010000010100000b01010004
-0101000901000001010000020100001d010100c301010008010000050100000201000043
-01000701030e000105020202010302020503080000090801000008000001080400010800
-00010800000a0801000008000001080000000801009b08000100000a0100000301000000
-01000005010000000100000901000005010000010100000a010000000100000301000000
-01000009010000010100000301000005010000210101000901000005010000010100000a
-0100000001000003010000000100000901000001010000030100001c010100c301010008
-01000005010000020100004301000701030e000105020202010302020503080000080800
-00010801000308000003080000000800000a0800000108010001080100010800009a0800
-0100000a0100000501000004010000010100000801000006010000010100000901000001
-010000020100000101000009010000010100000401000004010000210101000801000006
-01000001010000090100000101000002010000010100000901000001010000040100001b
-010100c30101000801030002010000020100004301000701030e00010502020201030202
-0503080000080800000208000003080000030801000b0800000208000001080000020800
-009a08000100000801010006010000030100000201000007010000070100000101000008
-010000020100000101000002010000090100000101000005010000040101001f01010007
-010000070100000101000008010000020100000101000002010000090100000101000005
-0100001a010100c30101000c010000020102004401000701030e00010502020201030202
-0503080000080800000208000003080000030801000b0800000208000001080000020800
-009a08000100000a01000005010000030100000201000008010000060100000101000008
-010000020100000101000002010000090100000101000004010000040100002101010008
-010000060100000101000008010000020100000101000002010000090100000101000004
-0100001b010100c30101000c01000001010000020100004301000701030e000105020202
-01030202050308000008080000020800000308000003080000000800000a080000020800
-0001080000020800009a08000100000a0100000501000003010500080100000501000001
-010000080105000001050008010000010100000301000005010000210101000901000005
-0100000101000008010500000105000801000001010000030100001c010100c301010008
-0100000201000001010000020100004301000701030e0001050202020103020205030800
-000808000001080100030800000308000001080000090800000108010001080100010800
-009a08000100000a01000005010000070100000301010004010000040100000101000003
-01010006010000050100000301010003010000010100000201000006010000210101000a
-010000040100000101000003010100060100000501000003010100030100000101000002
-0100001d010100c3010100080100000201000001010000020100004301000701030e0001
-050202020103020205030800000908010000080000040801000108000002080000090801
-000008000001080000000801009b08000100000a01000003010400050100000301010005
-010000040101000401010006010000050100000301010004010100020100000701000021
-0101000b010000040101000401010006010000050100000301010004010100020100001e
-010100c301010009010200030102004401000701030e0001050202020103020205030800
-000c0800000e080500a808000100000a01000014010000060100002a0100000801000021
-0101000c0100002a0100001f010100c30101005801000701030e00010502020201030202
-05030800000808000002080000bd08000100000b010100100101003b0101002201010059
-010100c30101005801000701030e00010502020201030202050308000009080200be0800
-0100008101010059010100c30101005801000701030e0001050202020103020205030800
-00cb08000100008101010059010100c30101005801000701030e00010502020201030202
-0503080000cb08000100008101010059010100c30101005801000701030e000105020202
-010302020503080000cb08000100008101010059010100c30101005801000701030e0001
-05020202010302020503080000cb08000100008101010059010100c30101005801000701
-030e00010502020201030202050308cd01ff01ff01000701030e00010502020201030202
-050308cd01ff01ff01000701030e000105020202010302020503080000cb080001000081
-01010059010100c30101005801000701030e000105020202010302020503080000cb0800
-0100000b0101004e0101002201010059010100c30101005801000701030e000105020202
-010302020503080000cb08000100000a0100001c0100002a01000008010000210101000c
-0100002a0100001f010100c30101005801000701030e0001050202020103020205030800
-00110800000308000010080000010800009e08000100000a01000005010000030104000b
-010000040101000d010000050100000a0101000201000007010000210101000b01000004
-0101000d010000050100000a010100020100001e010100c3010100090102000301020044
-01000701030e000105020202010302020503080000110800000308000010080000010800
-009e08000100000a01000004010100030100000e01000004010000010100000b01010004
-01010009010000010100000201000006010000210101000a01000004010000010100000b
-010100040101000901000001010000020100001d010100c3010100080100000201000001
-010000020100004301000701030e00010502020201030202050308000009080100000800
-000108040001080000010800000a0801000008000001080000000801009b08000100000a
-0100000301000000010000030100000d01000005010000010100000a0100000001000003
-010000000100000901000001010000030100000501000021010100090100000501000001
-0100000a0100000001000003010000000100000901000001010000030100001c010100c3
-0101000c010000050100004301000701030e000105020202010302020503080000080800
-00010801000308000003080000000800000a0800000108010001080100010800009a0800
-0100000a0100000501000003010300090100000601000001010000090100000101000002
-010000010100000901000001010000040100000401000021010100080100000601000001
-010000090100000101000002010000010100000901000001010000040100001b010100c3
-0101000c010000050100004301000701030e000105020202010302020503080000080800
-000208000003080000030801000b0800000208000001080000020800009a080001000008
-010100060100000701000007010000070100000101000008010000020100000101000002
-010000090100000101000005010000040101001f01010007010000070100000101000008
-0100000201000001010000020100000901000001010000050100001a010100c30101000a
-010100040101004401000701030e00010502020201030202050308000008080000020800
-0003080000030801000b0800000208000001080000020800009a08000100000a01000005
-010000070100000801000006010000010100000801000002010000010100000201000009
-010000010100000401000004010000210101000801000006010000010100000801000002
-01000001010000020100000901000001010000040100001b010100c30101000c01000005
-0100004301000701030e0001050202020103020205030800000808000002080000030800
-0003080000000800000a0800000208000001080000020800009a08000100000a01000005
-010000030100000201000009010000050100000101000008010500000105000801000001
-010000030100000501000021010100090100000501000001010000080105000001050008
-01000001010000030100001c010100c30101000c010000050100004301000701030e0001
-050202020103020205030800000808000001080100030800000308000001080000090800
-000108010001080100010800009a08000100000a01000005010000030100000201000003
-010100040100000401000001010000030101000601000005010000030101000301000001
-0100000201000006010000210101000a0100000401000001010000030101000601000005
-010000030101000301000001010000020100001d010100c3010100080100000201000001
-010000020100004301000701030e00010502020201030202050308000009080100000800
-00040801000108000002080000090801000008000001080000000801009b08000100000a
-010000030104000201020004010100050100000401010004010100060100000501000003
-010100040101000201000007010000210101000b01000004010100040101000601000005
-0100000301010004010100020100001e010100c301010009010200030102004401000701
-030e0001050202020103020205030800000c0800000e080500a808000100000a01000014
-010000060100002a01000008010000210101000c0100002a0100001f010100c301010058
-01000701030e0001050202020103020205030800000808000002080000bd08000100000b
-010100100101003b0101002201010059010100c30101005801000701030e000105020202
-01030202050308000009080200be08000100008101010059010100c30101005801000701
-030e000105020202010302020503080000cb08000100008101010059010100c301010058
-01000701030e000105020202010302020503080000cb08000100008101010059010100c3
-0101005801000701030e000105020202010302020503080000cb08000100008101010059
-010100c30101005801000701030e000105020202010302020503080000cb080001000081
-01010059010100c30101005801000701030e00010502020201030202050308cd01ff01ff
-01000701030e00010502020201030202050308cd01ff01ff01000701030e000105020202
-010302020503080000cb08000100008101010059010100c30101005801000701030e0001
-05020202010302020503080000cb08000100000b0101004e0101002201010059010100c3
-0101005801000701030e000105020202010302020503080000cb08000100000a0100001c
-0100002a01000008010000210101000c0100002a0100001f010100c30101005801000701
-030e000105020202010302020503080000110800000308000010080000010800009e0800
-0100000a01000005010000040102000c010000040101000d010000050100000a01010002
-01000007010000210101000b010000040101000d010000050100000a010100020100001e
-010100c30101000a0101004b01000701030e000105020202010302020503080000110800
-000308000010080000010800009e08000100000a0100000401010003010000020100000a
-01000004010000010100000b010100040101000901000001010000020100000601000021
-0101000a01000004010000010100000b010100040101000901000001010000020100001d
-010100c301010009010000010100004a01000701030e0001050202020103020205030800
-0009080100000800000108040001080000010800000a0801000008000001080000000801
-009b08000100000a0100000301000000010000030100000d01000005010000010100000a
-010000000100000301000000010000090100000101000003010000050100002101010009
-01000005010000010100000a010000000100000301000000010000090100000101000003
-0100001c010100c301010009010000010100004a01000701030e00010502020201030202
-050308000008080000010801000308000003080000000800000a08000001080100010801
-00010800009a08000100000a01000005010000030100000c010000060100000101000009
-010000010100000201000001010000090100000101000004010000040100002101010008
-010000060100000101000009010000010100000201000001010000090100000101000004
-0100001b010100c301010009010000010100004a01000701030e00010502020201030202
-0503080000080800000208000003080000030801000b0800000208000001080000020800
-009a08000100000801010006010000030103000801000007010000010100000801000002
-0100000101000002010000090100000101000005010000040101001f0101000701000007
-01000001010000080100000201000001010000020100000901000001010000050100001a
-010100c301010009010000010100004a01000701030e0001050202020103020205030800
-00080800000208000003080000030801000b0800000208000001080000020800009a0800
-0100000a0100000501000003010000020100000801000006010000010100000801000002
-010000010100000201000009010000010100000401000004010000210101000801000006
-01000001010000080100000201000001010000020100000901000001010000040100001b
-010100c301010009010000010100004a01000701030e0001050202020103020205030800
-0008080000020800000308000003080000000800000a0800000208000001080000020800
-009a08000100000a01000005010000030100000201000009010000050100000101000008
-010500000105000801000001010000030100000501000021010100090100000501000001
-01000008010500000105000801000001010000030100001c010100c30101000901000001
-0100004a01000701030e0001050202020103020205030800000808000001080100030800
-000308000001080000090800000108010001080100010800009a08000100000a01000005
-010000030100000201000003010100040100000401000001010000030101000601000005
-0100000301010003010000010100000201000006010000210101000a0100000401000001
-010000030101000601000005010000030101000301000001010000020100001d010100c3
-01010009010000010100004a01000701030e000105020202010302020503080000090801
-0000080000040801000108000002080000090801000008000001080000000801009b0800
-0100000a0100000301040002010200040101000501000004010100040101000601000005
-01000003010100040101000201000007010000210101000b010000040101000401010006
-010000050100000301010004010100020100001e010100c30101000a0101004b01000701
-030e0001050202020103020205030800000c0800000e080500a808000100000a01000014
-010000060100002a01000008010000210101000c0100002a0100001f010100c301010058
-01000701030e0001050202020103020205030800000808000002080000bd08000100000b
-010100100101003b0101002201010059010100c30101005801000701030e000105020202
-01030202050308000009080200be08000100008101010059010100c30101005801000701
-030e000105020202010302020503080000cb08000100008101010059010100c301010058
-01000701030e000105020202010302020503080000cb08000100008101010059010100c3
-0101005801000701030e000105020202010302020503080000cb08000100008101010059
-010100c30101005801000701030e000105020202010302020503080000cb080001000081
-01010059010100c30101005801000701030e00010502020201030202050308cd01ff01ff
-01000701030e00010502020201030202050308cd01ff01ff01000701030e000105020202
-010302020503080000cb08000100008101010059010100c30101005801000701030e0001
-05020202010302020503080000cb08000100000b0101004e0101002201010059010100c3
-0101005801000701030e000105020202010302020503080000cb08000100000a0100001c
-0100002a01000008010000210101000c0100002a0100001f010100c30101005801000701
-030e000105020202010302020503080000110800000308000010080000010800009e0800
-0100000a01000005010000030104000b010000040101000d010000050100000a01010002
-01000007010000210101000b010000040101000d010000050100000a010100020100001e
-010100c30101000a01000003010400030101003d01000701030e00010502020201030202
-0503080000110800000308000010080000010800009e08000100000a0100000401010003
-010000020100000a01000004010000010100000b01010004010100090100000101000002
-01000006010000210101000a01000004010000010100000b010100040101000901000001
-010000020100001d010100c3010100090101000301000006010000010100003c01000701
-030e00010502020201030202050308000009080100000800000108040001080000010800
-000a0801000008000001080000000801009b08000100000a010000030100000001000007
-0100000901000005010000010100000a0100000001000003010000000100000901000001
-0100000301000005010000210101000901000005010000010100000a0100000001000003
-010000000100000901000001010000030100001c010100c3010100080100000001000003
-01000006010000010100003c01000701030e000105020202010302020503080000080800
-00010801000308000003080000000800000a0800000108010001080100010800009a0800
-0100000a0100000501000006010000090100000601000001010000090100000101000002
-010000010100000901000001010000040100000401000021010100080100000601000001
-010000090100000101000002010000010100000901000001010000040100001b010100c3
-0101000a0100000301030003010000010100003c01000701030e00010502020201030202
-0503080000080800000208000003080000030801000b0800000208000001080000020800
-009a08000100000801010006010000060100000801000007010000010100000801000002
-0100000101000002010000090100000101000005010000040101001f0101000701000007
-01000001010000080100000201000001010000020100000901000001010000050100001a
-010100c30101000a0100000701000002010000010100003c01000701030e000105020202
-010302020503080000080800000208000003080000030801000b08000002080000010800
-00020800009a08000100000a010000050100000601000009010000060100000101000008
-010000020100000101000002010000090100000101000004010000040100002101010008
-010000060100000101000008010000020100000101000002010000090100000101000004
-0100001b010100c30101000a0100000701000002010000010100003c01000701030e0001
-0502020201030202050308000008080000020800000308000003080000000800000a0800
-000208000001080000020800009a08000100000a01000005010000050100000b01000005
-010000010100000801050000010500080100000101000003010000050100002101010009
-010000050100000101000008010500000105000801000001010000030100001c010100c3
-0101000a010000030100000201000002010000010100003c01000701030e000105020202
-010302020503080000080800000108010003080000030800000108000009080000010801
-0001080100010800009a08000100000a0100000501000005010000050101000401000004
-010000010100000301010006010000050100000301010003010000010100000201000006
-010000210101000a01000004010000010100000301010006010000050100000301010003
-01000001010000020100001d010100c30101000a01000003010000020100000201000001
-0100003c01000701030e0001050202020103020205030800000908010000080000040801
-000108000002080000090801000008000001080000000801009b08000100000a01000003
-010400030100000501010005010000040101000401010006010000050100000301010004
-0101000201000007010000210101000b0100000401010004010100060100000501000003
-01010004010100020100001e010100c30101000801040002010200040101003d01000701
-030e0001050202020103020205030800000c0800000e080500a808000100000a01000014
-010000060100002a01000008010000210101000c0100002a0100001f010100c301010058
-01000701030e0001050202020103020205030800000808000002080000bd08000100000b
-010100100101003b0101002201010059010100c30101005801000701030e000105020202
-01030202050308000009080200be08000100008101010059010100c30101005801000701
-030e000105020202010302020503080000cb08000100008101010059010100c301010058
-01000701030e000105020202010302020503080000cb08000100008101010059010100c3
-0101005801000701030e000105020202010302020503080000cb08000100008101010059
-010100c30101005801000701030e000105020202010302020503080000cb080001000081
-01010059010100c30101005801000701030e00010502020201030202050308cd01ff01ff
-01000701030e00010502020201030202050308cd01ff01ff010007010010050202020103
-02020503080000cb08000100008101010059010100c301010058010007010300000c0700
-000105020202010302020503080000cb08000100000b0101004e01010022010100590101
-00c3010100580100070103000001050807010300000105020202010302020503080000cb
-08000100000a0100001c0100002a01000008010000210101000c0100002a0100001f0101
-00c301010058010007010301000105070701030000010502020201030202050308000011
-0800000308000010080000010800009e08000100000a01000005010000040102000c0100
-00040101000d010000050100000a0101000201000007010000210101000b010000040101
-000d010000050100000a010100020100001e010100c30101000801040001010400430100
-070103010001050607010301000105020202010302020503080000110800000308000010
-080000010800009e08000100000a0100000401010003010000020100000a010000040100
-00010100000b0101000401010009010000010100000201000006010000210101000a0100
-0004010000010100000b010100040101000901000001010000020100001d010100c30101
-000801000002010000010100000201000043010007010302000105050701030100010502
-020201030202050308000009080100000800000108040001080000010800000a08010000
-08000001080000000801009b08000100000a010000030100000001000003010000020100
-000901000005010000010100000a01000000010000030100000001000009010000010100
-000301000005010000210101000901000005010000010100000a01000000010000030100
-00000100000901000001010000030100001c010100c30101000c01000005010000430100
-070103020001050407010302000105020202010302020503080000080800000108010003
-08000003080000000800000a0800000108010001080100010800009a08000100000a0100
-000501000003010000020100000801000006010000010100000901000001010000020100
-000101000009010000010100000401000004010000210101000801000006010000010100
-00090100000101000002010000010100000901000001010000040100001b010100c30101
-000b01000005010000440100070103030001050307010302000105020202010302020503
-080000080800000208000003080000030801000b0800000208000001080000020800009a
-080001000008010100060100000401020008010000070100000101000008010000020100
-000101000002010000090100000101000005010000040101001f01010007010000070100
-0001010000080100000201000001010000020100000901000001010000050100001a0101
-00c30101000b010000050100004401000701030300010502070103030001050202020103
-02020503080000080800000208000003080000030801000b080000020800000108000002
-0800009a08000100000a0100000501000003010000020100000801000006010000010100
-000801000002010000010100000201000009010000010100000401000004010000210101
-000801000006010000010100000801000002010000010100000201000009010000010100
-00040100001b010100c30101000b01000005010000440100070103040001050107010303
-00010502020201030202050308000008080000020800000308000003080000000800000a
-0800000208000001080000020800009a08000100000a0100000501000003010000020100
-000901000005010000010100000801050000010500080100000101000003010000050100
-002101010009010000050100000101000008010500000105000801000001010000030100
-001c010100c30101000a0100000501000045010007010304000105000701030400010502
-020201030202050308000008080000010801000308000003080000010800000908000001
-08010001080100010800009a08000100000a010000050100000301000002010000030101
-000401000004010000010100000301010006010000050100000301010003010000010100
-000201000006010000210101000a01000004010000010100000301010006010000050100
-00030101000301000001010000020100001d010100c30101000a01000005010000450100
-070103050000070203040001050202020103020205030800000908010000080000040801
-000108000002080000090801000008000001080000000801009b08000100000a01000003
-010400020102000401010005010000040101000401010006010000050100000301010004
-0101000201000007010000210101000b0100000401010004010100060100000501000003
-01010004010100020100001e010100c30101000a01000005010000450100070103050000
-070103050001050202020103020205030800000c0800000e080500a808000100000a0100
-0014010000060100002a01000008010000210101000c0100002a0100001f010100c30101
-0058010007010306070103050001050202020103020205030800000808000002080000bd
-08000100000b010100100101003b0101002201010059010100c301010058010007010306
-0700030600010502020201030202050308000009080200be080001000081010100590101
-00c30101005801000701001005020202010302020503080000cb08000100008101010059
-010100c3010100580100070000110502020201030202050207ff07ff07d3051102020103
-0202050207ff07ff07d20000051102020103020205020701030d0000030000ff00ff00af
-03000001030c0001051102020103020205020701030b00010700030000ff00ff00ae0700
-03000003030a00010511020201030202050207010309000207010300000105ff05ff05ab
-0701030000050308000105110202010302020502070103070003050007010300000105ff
-05ff05ab0701030000010501000303060001051102020103020205020701030500030502
-07010300000105ff05ff05ab070103000001050300030304000105110202010302020502
-070103030003050407010300000105ff05ff05ab07010300000105050003030200010511
-0202010302020502070103010003050607010300000105ff05ff05ab0701030000010507
-000303000001051102020103020205020705050807010300000105ff05ff05ab07010300
-000105080703000105110202010302020502070103010703050607010300000105ff05ff
-05ab07010300000105070703030000010511020201030202050207010303070305040701
-0300000105ff05ff05ab0701030000010505070303020001051102020103020205020701
-03050703050207010300000105ff05ff05ab070103000001050307030304000105110202
-010302020502070103070703050007010300000105ff05ff05ab07010300000105010703
-03060001051102020103020205020701030907040300000105ff05ff05ab070103000001
-070303080001051102020103020205020701030b07020300000107ff07ff07ad03000001
-0701030a0001051102020101000405020701030d07000300000007ff07ff07ae03000000
-0700030c000105110005020204000502070100ff00ff00d1051100000202040000000202
-04000502070000ff00ff00d2051100000202040000000202040005ff05ff05e800000202
-040000000202040005ff05ff05e800000202040000000202040005ff05ff05e800000202
-0400000002020400000502ff02ff02dc00060202040000000208040002ff02ff02dc0000
-0208040000000208040002ff02ff02dc00000208040000000208040001ff01ff01dc0000
-020804000000040901ff01ff01dc00000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 377 205
-%%EOF
diff --git a/lib/tv/doc/src/tv_table_browser.gif b/lib/tv/doc/src/tv_table_browser.gif
deleted file mode 100644
index 9c7cb042ff..0000000000
--- a/lib/tv/doc/src/tv_table_browser.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_table_browser.ps b/lib/tv/doc/src/tv_table_browser.ps
deleted file mode 100644
index e2b195a2e5..0000000000
--- a/lib/tv/doc/src/tv_table_browser.ps
+++ /dev/null
@@ -1,2024 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_table_browser.eps)
-%%CreationDate: (Mon Mar 19 17:15:30 2001)
-%%BoundingBox: 0 0 380 315
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 380 315
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-380.000000 315.000000
-12
-760 630
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-ff0000
-990000
-7f7f7f
-999999
-ff7f7f
-000000
-000000
-000000
-000000
-000a01ff01ff01e1000b0208040001ff01ff01e100000208040000000208040002ff02ff
-02e1000002080400000002080400020000ff00ff00de0400020000000208040000000202
-04060200000004ff04ff04de020000000405020204000000020204000209000d02ff02ff
-02d500000202040000000202040002080000020d04000289010302110103023201020258
-0102020c010102010101021e010102290101020601010208010102310101022a01010230
-0101029600000202040000000202040002080000020d0400028901010202010702000101
-0203010102010101020e01050200010702010103020d0101020401010204010302030103
-020e010302060103020301030203010302060103020b0101020a01010202010102190100
-02030101021c0100020b01010206010102090101021b010202020100020d0101022a0101
-020c0104021e0101029600000202040000000202040002080000020d0400028901010205
-0101020301010203010102010101020e0101020701010203010102010101020c01010202
-010302030101020101010201010102010101020801010201010102010101020401010201
-01010201010102010101020101010201010102040101020101010201010102060101020a
-0101020201010218010102210101020b01010206010102090101021b010202020100020d
-01010238010102020101021d010102960000020204000000020204000208000002020406
-020304000289010102050101020301010203010102010101020e01010207010102030101
-020501010209010102030101020701010201010102010101020601020202010102010101
-020801010201010102010101020101010201010102040101020101010202010202030101
-020a01010203010102020103020301030202010302010104020101010202010302030101
-02000101020a0104020101030203010102000101020301010202010302030101021a0100
-020001010201010002020103020301040202010302020101020901010200010102010101
-020301030203010102020101020001010202010102010103020201010200010102010101
-020301030202010102000101020101010202010302020101020201010285000002020400
-000004030208000002020400030400000203040002890101020501010204010102020100
-02020101020e0101020701010203010202040101020a0100020301010207010102010101
-020101010205010102040101020101010208010102010101020101010201010102010101
-02040101020101010204010102020100020b010102030101020101010201010102010101
-020101010200010102010101020101010203010102010101020101010202010202000101
-020a01010202010102010101020201020200010102020101020101010201010102020101
-021a01000200010102010100020101010201010102010101020101010201010102010101
-020101010209010202000102020001010201010102010101020201010202010202000101
-020101010200010102000101020201020200010202000101020101010201010102010101
-0200010102010101020101010201010102010101020201010285000004030101020b0000
-0203040003020000020404000289010102050101020401010201010102020101020e0104
-0204010102040103020d0101020401010205010202020101020101010204010102050101
-020101010207010102020101020101010202010402040101020101010205010102020101
-020901010203010102010101020101010201010102080101020101010203010102010101
-020101010202010102010101020a01010206010102020101020101010202010102010101
-0201010102020101021a0100020001020200010002010101020101010201010102010101
-0201010102010101020d0101020101010201010102050101020201010202010102010101
-020101010200010102000101020201010201010102010101020501010201010202030101
-0201010102010101020101010202010002890103020b0000020304000302000002040400
-0289010102050101020501010200010002030101020e01010207010102060102020e0100
-020301010207010102010101020101010205010102040101020101010206010102030101
-020101010205010102040101020101010204010102020100020b01010203010102010101
-020101010201010102050104020101010203010102010101020101010202010102010101
-020a0101020301040202010102010101020201010201010502020101021a010002010101
-020001000201010102010101020101010201010102010105020d01010201010102010101
-020201040202010102020101020101010201010102000101020001010202010102010101
-0201010102020104020101010204010102010105020201010200010102890103020b0000
-02040400030000000205040002890101020501010205010302030101020e010102070101
-02070101020d010102030101020701010201010102010101020601020202010102010101
-0205010102040101020101010205010102040101020101010202010202030101020a0101
-020301010201010102010101020101010204010102010101020101010203010102010101
-020101010202010102010101020a01010202010102010101020201010201010102020101
-0201010102060101021a0100020201020201010102010101020101010201010102010101
-021101010201010102010101020101010201010102020101020201010201010102010101
-020101010200010102010101020101010201010102010101020101010201010102040101
-020101010206010102000100028a0103020b000002040400030000000205040002890101
-020501010206010102040101020e01010207010102030101020101010201010102080101
-020401010203010102010101020101010201010102010101020401010201010102010101
-020101010200010502010101020101010201010102010101020101010200010102010101
-0201010102060101020a0101020201010201010102010101020101010202010002000101
-02010101020101010203010102010101020101010202010102010101020a010102020101
-02010101020201010201010102020101020101010202010002010101021b010002020102
-020101010201010102010101020001020201010102020100020101010209010102010101
-020101010201010102010101020201010202010102010101020201010207010102010101
-0201010102010101020101010201010102040101020101010202010002030102028a0103
-020b0000020500000206040002890101020501010206010102040101020e010502030101
-020401030202010102080101020401010204010302030103020201010209010302020101
-0200010502020103020301030202010102010103020b0101020a01010202010102020103
-0203010302020102020001010201010202010101020201030203010102010101020b0102
-020101020200010102010104020301010202010302020101021b01000203010102020103
-020301010200010102020103020201010209010102010101020101010202010202000101
-020101010202010102010101020301050202010102010101020101010202010202000101
-02000101020401010202010302040101028b0103020b0000020d04000289010302110103
-0232010202190100023d0102020c01010237010602230101029e0101028c0103020b0000
-020d040002f2010002ff02540101028c0103020b0000020d040002ff02ff02d70103020c
-040d02ff02ff02d8010302ff02ff02f3010302ff02ff02f30103020200ff00ff00ec0400
-020201030202000004ff04ff04ec0202010302ff02ff02f3010302020500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000202010302020000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000202010302020500000005ff05ff05ea01000202010302020000
-05ff05ff05ea010005000202010302020500000005ff05ff05ea01000202010302020000
-05ff05ff05ea010005000202010302020500000005ff05ff05ea01000202010302020000
-050c06040504060005030602051f06040505060005040600050406000519060005020600
-0504060005270602050b06000506060005ff05ff05080600050206000509060205130100
-050002020103020205000000050b0600050f0600051f060005090600050a060005190600
-05020600052c060005020600050a060005ff05ff0510060005020600050b060005140100
-0202010302020000050c0600050606020505060005030602051806000506060105000600
-050206020502060405170600050206000502060205030602050206000502060005170600
-050206000501060005000601050206040502060205030602050206000500060105030602
-05ff05f306000502060005020602050506000502060005000601050c0100050002020103
-020205000000050b06000508060005050600050206000502060005170600050506000501
-06010504060005040600051a060005000600050506000502060005020600050106000502
-060005170600050206000501060105010600050306000506060005020600050206000501
-060105010600050106000502060005ff05f2060005020600050106000502060005040600
-0502060105010600050c01000202010302020000050c0603050506000505060005020600
-050206000517060305020600050206000504060005040600051a06000500060005050600
-050206000502060005010600050006000500060005170600050206000501060005020600
-0503060005060600050206000502060005010600050206000501060005ff05f606040501
-060005020600050406000502060005020600050b0100050002020103020205000000050b
-06000508060005050600050206040517060005050600050206000504060005040600051a
-060005000600050506000502060405010600050006000500060005170600050206000501
-0600050206000503060005060600050206000502060005010600050206000502060205ff
-05f306000502060005010604050406000502060005020600050c01000202010302020000
-050c0600050806000505060005020600051b060005050600050206000504060005040600
-051b06000506060005020600050506000500060005000600051706000502060005010600
-050206000503060005060600050206000502060005010600050206000505060005ff05f2
-06000502060005010600050806000502060005020600050b010005000202010302020500
-0000050b0600050806000505060005020600050206000517060005050600050106010504
-060005040600051b06000506060005020600050206000501060005000600050006000517
-060005020600050106010501060005030600050606000502060005020600050106000502
-0600050106000502060005ff05f206000502060005010600050206000504060005020601
-05010600050c01000202010302020000050c060005080600050506000503060205180604
-050206010500060005040600050506010519060005060600050306020503060005000600
-051906020502060005000601050506010504060005030602050206000502060005020602
-05ff05f306000502060005020602050506000502060005000601050c0100050002020103
-02020500000005a8060005ff05ff052e0600051001000202010302020000050b0606052a
-0606052a0606052a06060500060005ff05ff05180606050e0600050f0100050002020103
-020205000000050a0606052a0606052a0606052a06060500060005ff05ff05180606050e
-060005100100020201030202000005ff05ff05ea010005000202010302020500000005ff
-05ff05ea0100020201030202000005ff05ff05ea01000500020201030202050000000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100020201030202000005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000100050002020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-020201030202053600000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000051a00000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050100000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050100000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000051a00000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000051a00000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000051a00000500000005000000050000000500000005000000050000000500
-00000500000005000000050000000500000005ff05a50202010302020535000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500010005180000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000100000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-010000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050001000518000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500010005180000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000100051800000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000050000000500010005ff05a402020103
-02020536000005140100051a00000514010005010000051401000501000005140100051a
-000005140100051a000005140100051a00000514010005ff05a502020103020205350000
-051601000518000005160100000005160100000005160100051800000516010005180000
-05160100051800000516010005ff05a40202010302020536000005140100051a00000514
-010005010000051401000501000005140100051a000005140100051a000005140100051a
-00000514010005ff05a50202010302020535000005050602050306020506010005180000
-051601000000051601000000051601000518000005160100051800000516010005180000
-0516010005ff05a402020103020205360000050406020503060205050100051a00000514
-010005010000051401000501000005140100051a00000506060405080100051a00000508
-060105090100051a0000050806030507010005ff05a50202010302020535000005040604
-050106040505010005180000051006000504010000000510060005040100000005040600
-051001000518000005050608050701000518000005080603050901000518000005070607
-0506010005ff05a402020103020205360000050306000501060105010600050106010504
-0100051a0000050f06000503010005010000050f0600050301000501000005030600050f
-0100051a00000503060a05050100051a00000507060305080100051a0000050506030501
-06030504010005ff05a5020201030202053500000503060d0504010005180000050d0600
-0501060005040100000005040600050a06000504010000000504060005010600050d0100
-051800000504060305020603050601000518000005090601050a01000518000005060602
-050306020505010005ff05a4020201030202053600000501060005000603050006020500
-060405020100051a0000050c060005010600050301000501000005030600050a06000503
-0100050100000503060005010600050c0100051a0000050206030504060305040100051a
-000005140100051a000005050602050306020504010005ff05a502020103020205350000
-050206000500060305000602050006040503010005180000050a06000501060005010600
-050401000000050406000504060005040600050401000000050406000501060005010600
-050a01000518000005030602050306070503010005180000050706040509010005180000
-05070601050206020506010005ff05a40202010302020536000005010600050006030500
-06020500060405020100051a000005090600050106000501060005030100050100000503
-06000504060005040600050301000501000005030600050106000501060005090100051a
-0000050206020504060505030100051a00000507060305080100051a0000050a06020506
-010005ff05a5020201030202053500000502060005000603050006020500060405030100
-051800000507060005010600050106000501060005040100000005040600050406000501
-060005010600050401000000050406000501060005010600050106000507010005180000
-05030602050506030505010005180000050906020509010005180000050a060205080100
-05ff05a40202010302020536000005010600050006070500060405020100051a00000506
-060005010600050106000501060005030100050100000503060005040600050106000501
-060005030100050100000503060005010600050106000501060005060100051a00000502
-06030505060105050100051a00000508060205080100051a0000050806020508010005ff
-05a502020103020205350000050206000500060405010600050006040503010005180000
-050406000501060005010600050106000501060005040100000005040600050106000501
-060005010600050106000504010000000504060005010600050106000501060005010600
-050401000518000005040603050d01000518000005090602050901000518000005090602
-0509010005ff05a402020103020205360000050106060501060605020100051a00000503
-060005010600050106000501060005010600050301000501000005030600050106000501
-060005010600050106000503010005010000050306000501060005010600050106000501
-060005030100051a00000503060905060100051a00000508060205080100051a00000514
-010005ff05a5020201030202053500000502060005000602050506000500060205030100
-051800000504060005010600050106000501060005010600050401000000050406000501
-060005010600050106000501060005040100000005040600050106000501060005010600
-050106000504010005180000050506070508010005180000050806040508010005180000
-050906020509010005ff05a4020201030202053600000501060005000602050506000500
-060205020100051a00000503060005010600050106000501060005010600050301000501
-000005030600050106000501060005010600050106000503010005010000050306000501
-060005010600050106000501060005030100051a00000506060405080100051a00000506
-060605060100051a0000050806020508010005ff05a50202010302020535000005020604
-050506040503010005180000051601000000051601000000051601000518000005160100
-0518000005160100051800000516010005ff05a40202010302020536000005140100051a
-00000514010005010000051401000501000005140100051a000005140100051a00000514
-0100051a00000514010005ff05a502020103020205350000051601000518000005160100
-000005160100000005160100051800000516010005180000051601000518000005160100
-05ff05a40202010302020536000005140100051a00000514010005010000051401000501
-000005140100051a000005140100051a000005140100051a00000514010005ff05a50202
-010302020535000005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005180000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-000005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010000000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000518000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005180000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100051800000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005ff05a402020103020205360100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000100051a0100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005010100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005010100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000100051a0100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100051a0100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100051a0100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005ff05a5020201030202
-05ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed020201030202
-05ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed020201030202
-05ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed020201030202
-05ff05ff05ed02020103020205ff05ff05ed020201030202050301ff01ff01e505030202
-01030202050301ff01ff01d1050000000500000005000000050000000500000005000000
-050000000500000005000000050001000503020201030202050301ff01ff01d100000500
-000005000000050000000500000005000000050000000500000005000000050001010503
-020201030202050301020aff0aff0acb010205000000050e010005000100050302020103
-0202050301020aff0aff0aca000001020000051001010503020201030202050301020a01
-00ff00ff00c9010205000000050e0100050001000503020201030202050301020a0100ff
-00ff00c901020000051001010503020201030202050301020a0100ff00ff00c901020500
-0000050e0100050001000503020201030202050301020a0100ff00ff00c9010200000510
-01010503020201030202050301020a0100ff00ff00c9010205000000050e010005000100
-0503020201030202050301020a0100ff00ff00c9010200000502010a0502010105030202
-01030202050301020a0100ff00ff00c90102050000000502010805020100050001000503
-020201030202050301020a0100ff00ff00c9010200000504010605040101050302020103
-0202050301020a0100ff00ff00c901020500000005040104050401000500010005030202
-01030202050301020a0100ff00ff00c90102000005060102050601010503020201030202
-050301020a0100ff00ff00c9010205000000050601000506010005000100050302020103
-0202050301020a0100ff00ff00c901020000051001010503020201030202050301020a01
-00ff00ff00c9010205000000050e0100050001000503020201030202050301020a0100ff
-00ff00c901020000051001010503020201030202050301020a0100ff00ff00c901020500
-0000050e0100050001000503020201030202050301020a0100ff00ff00c9010200000510
-01010503020201030202050301020a0100ff00ff00c9010205000000050e010005000100
-0503020201030202050301020a0000ff00ff00ca01020000051001010503020201030202
-050301ff01ff01d105000000050001000500010005000100050001000500010005000100
-0500010005000100050001000503020201030202050301ff01ff01d10000050001000500
-010005000100050001000500010005000100050001000500010005000101050302020103
-0202050301ff01ff01e5050302020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-020201030202050301ff01ff01e505030202010302020503010005ff05ff05970100054a
-01000503020201030202050301000563010505ff05ff052d0100054a0100050302020103
-0202050301000562010705ff05ff052c0100054a01000503020201030202050301000561
-01020503010205ff05ff052b0100054a0100050302020103020205030100056101010505
-010105ff05ff052b0100054a0100050302020103020205030100056101020503010205ff
-05ff052b0100054a01000503020201030202050301000562010705ff05ff052c0100054a
-01000503020201030202050301000563010505ff05ff052d0100054a0100050302020103
-0202050301000565010105ff05ff052f0100054a01000503020201030202050301000565
-010105ff05ff052f0100054a01000503020201030202050301000565010105ff05ff052f
-0100054a01000503020201030202050301000565010105ff05ff052f0100054a01000503
-020201030202050301000565010105ff05ff052f0100054a010005030202010302020503
-01000565010105ff05ff052f0100054a0100050302020103020205030100056101010500
-010205ff05ff052f0100054a0100050302020103020205030100056101010500010205ff
-05ff052f0100054a01000503020201030202050301000561010505ff05ff052f0100054a
-01000503020201030202050301000561010505ff05ff052f0100054a0100050302020103
-020205030100056101020500010105ff05ff052f0100054a010005030202010302020503
-010005ff05ff05970100054a01000503020201030202050301ff01ff0199054a01000503
-020201030202050301000536000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000009040500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000904050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000090405000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000009040500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000904050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000050000000904050000000100050c0100
-050001000500010005000100050001000500010005000100050001000500010005000100
-052a01000503020201030202050301000535000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000903
-010000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050009030100000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500090301000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000903010000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050009030100000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-05000000050009030100000005000100050d010005000100050001000500010005000100
-05000100050001000500010005000100052b010005030202010302020503010005360000
-055e01000901010205000000055c01000901010205000000055c01000901010205000000
-055c01000901010205000000055c01000901010205000000055c01000901010205000000
-0100050c0100050000000500000005000000050000000500000005000000050000000500
-000005000000052a010005030202010302020503010005350000052d0100052f01000500
-090101020000052b0102052d01000500090101020000052b0102052d0100050009010102
-0000052d0100052d01000500090101020000052a0104052c01000500090101020000052c
-0102052c0100050009010102000005000100050d01000500000005000000050000000500
-000005000000050000000500000005000000052b01000503020201030202050301000536
-0000052a01020530010009010102050000000529010005020100052d0100090101020500
-00000529010005020100052d01000901010205000000052b0101052e0100090101020500
-000005290100053101000901010205000000052a01000530010009010102050000000100
-050c010005000000050c010005000000052a010005030202010302020503010005350000
-052d0100052f01000500090101020000052a010005020100052c01000500090101020000
-052e0100052c01000500090101020000052b010005000100052d01000500090101020000
-052a0100053001000500090101020000052a010005300100050009010102000005000100
-050d010005000000050a010005000000052b010005030202010302020503010005360000
-052c01000530010009010102050000000529010005020100052d01000901010205000000
-052d0100052d01000901010205000000052a010005000100052e01000901010205000000
-05290100053101000901010205000000052901000531010009010102050000000100050c
-010005000000050c010005000000052a010005030202010302020503010005350000052d
-0100052f01000500090101020000052d0100052d01000500090101020000052c0101052d
-01000500090101020000052a010005010100052d01000500090101020000052a0103052d
-01000500090101020000052a0103052d0100050009010102000005000100050d01000500
-0000050a010005000000052b010005030202010302020503010005360000052c01000530
-01000901010205000000052b0100052f01000901010205000000052d0100052d01000901
-0102050000000528010005020100052e01000901010205000000052d0100052d01000901
-0102050000000529010005020100052d010009010102050000000100050c010005000000
-050c010005000000052a010005030202010302020503010005350000052d0100052f0100
-0500090101020000052b0100052f01000500090101020000052e0100052c010005000901
-0102000005290105052c01000500090101020000052e0100052c01000500090101020000
-052a010005020100052c0100050009010102000005000100050d010005000000050a0100
-05000000052b010005030202010302020503010005360000052c01000530010009010102
-050000000529010005020100052d010009010102050000000529010005020100052d0100
-0901010205000000052c0100052e010009010102050000000528010005030100052d0100
-09010102050000000529010005020100052d010009010102050000000100050c01000500
-0000050c010005000000052a010005030202010302020503010005350000052b0104052d
-01000500090101020000052a0104052c01000500090101020000052b0102052d01000500
-090101020000052c0102052c01000500090101020000052a0103052d0100050009010102
-0000052b0102052d0100050009010102000005000100050d010005000000050a01000500
-0000052b010005030202010302020503010005360000055e01000901010205000000055c
-01000901010205000000055c01000901010205000000055c01000901010205000000055c
-01000901010205000000055c010009010102050000000100050c010005000000050c0100
-05000000052a010005030202010302020503010005350000055e01000500090101020000
-055c01000500090101020000055c01000500090101020000055c01000500090101020000
-055c01000500090101020000055c0100050009010102000005000100050d010005000000
-050a010005000000052b010005030202010302020503010005360000055e010009010102
-05000000055c01000901010205000000055c01000901010205000000055c010009010102
-05000000055c01000901010205000000055c010009010102050000000100050701000503
-010005000000050c010005000000052a010005030202010302020503010005350000055e
-01000500090101020000055c01000500090101020000055c01000500090101020000055c
-01000500090101020000055c01000500090101020000055c010005000901010200000500
-0100050601010504010005000000050a010005000000052b010005030202010302020503
-010005360000055e01000901010205000000055c01000901010205000000055c01000901
-010205000000055c01000901010205000000055c01000901010205000000055c01000901
-010205000000010005050100050001000503010005000000050001000500010005000100
-0500010005000100050001000500010005000000052a0100050302020103020205030100
-05350000055e01000500090101020000055c01000500090101020000055c010005000901
-01020000055c01000500090101020000055c01000500090101020000055c010005000901
-010200000500010005070100050401000500000005000000050000000500000005000000
-050000000500000005000000052b01000503020201030202050301000536000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010009010102050000000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100090101020500000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000901010205000000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010009010102050000000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-090101020500000005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000901010205000000010005070100050301000500
-0000050c010005000000052a010005030202010302020503010005350000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050009000103000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500090001030000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000900010300000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050009000103000005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-090001030000050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000900010300000500010005070100050401000500
-0000050a010005000000052b01000503020201030202050301000b360063010000630100
-0063010000630100006301000063010000020100050701000503010005000000050c0100
-05000000052a01000503020201030202050301000b350800006301000063010000630100
-00630100006301000063010000020100050701000504010005000000050a010005000000
-052b01000503020201030202050301000b01073208010063010000630100006301000063
-0100006301000063010000020100050501040501010005000000050c010005000000052a
-01000503020201030202050301000b010732080100630100006301000063010000630100
-006301000063010000020100050d010005000000050a010005000000052b010005030202
-01030202050301000b010717010007190801006301000063010000630100006301000063
-01000063010000020100050c010005000000050c010005000000052a0100050302020103
-0202050301000b010715010207190801000f010200030102004901000007010000230100
-000b010200030102001f01000063010000630100006301000063010000020100050d0100
-05000000050a010005000000052b01000503020201030202050301000b01071701000719
-08010011010000050100004901000007010000230100000d010000050100001f01000063
-010000630100006301000063010000020100050c010005000000050c010005000000052a
-01000503020201030202050301000b010717010007190801000801020005010000050100
-000301020042010000070100000001010003010200020100000001010002010000000101
-000301020002010400010100000201000004010000050100001f01000063010000630100
-006301000063010000020100050d010005000000050a010005000000052b010005030202
-01030202050301000b010717010007190801000701000002010000040100000501000002
-010000020100004101000007010100010100000101000002010000010101000101000001
-01010001010000010100000201000003010000030100000201000004010000050100001f
-01000063010000630100006301000063010000020100050c010005000000050c01000500
-0000052a01000503020201030202050301000b0107170100071908010007010000020100
-000401000005010000020100000201000041010000070100000201000001010000020100
-000101000005010000020100000101000007010000030100000201000004010000050100
-001f01000063010000630100006301000063010000020100050d010005000000050a0100
-05000000052b01000503020201030202050301000b010717010007190801000701000002
-010000040100000501000002010400410100000701000002010000010100000201000001
-01000005010000020100000201020004010000030100000201000004010000050100001f
-01000063010000630100006301000063010000020100050c010005000000050001000500
-0100050001000500010005000100050001000500010005000000052a0100050302020103
-0202050301000b0107170100071908010007010000020100000401000005010000020100
-004501000007010000020100000101000002010000010100000501000002010000050100
-0003010000030100000201000004010000050100001f0100006301000063010000630100
-0063010000020100050d0100050001000500010005000100050001000500010005000100
-0500010005000000052b01000503020201030202050301000b0107150104071708010007
-010000020100000401000005010000020100000201000041010000070100000201000001
-010000020100000101000005010000020100000101000002010000030100000301000001
-01010004010000050100001f01000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010732080100080102
-000501000005010000030102004201000007010000020100000201020002010000050100
-00020100000201020005010100020101000001000004010000050100001f010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01073208010063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107320801
-00630100006301000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000b01073208010063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-0202050301000b0107320801006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000b01073208010063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0108340063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-01000b00083501ff01ff0161050c01000500030e05000000052a01000503020201030202
-050301000b3600630100006301000063010000630100006301000063010000020100050d
-0100030e0000052b01000503020201030202050301000b35080000630100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01073208010063010000630100006301000063010000630100
-0063010000020100050d0100030e0000052b01000503020201030202050301000b010732
-080100630100006301000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000b01071601020718080100630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b01071501000702010007170801001f0100000301020003
-010200340100000f0102005001000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010715010007020100
-071708010026010000050100003401000011010000500100006301000063010000630100
-0063010000020100050d0100030e0000052b01000503020201030202050301000b010715
-010007020100071708010008010100000100000101000002010000010100000001010003
-0102000501000005010000030102002d0100000801020005010000020100000201000002
-010200030102000301020002010000000101002d01000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000b01
-071801000718080100070100000101010001010000020100000101010001010000040100
-00050100000501000002010000020100002c010000070100000201000004010000020100
-000201000001010000020100000101000002010000010100000201000001010100010100
-002c01000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0107170100071908010007010000020100000101000002
-0100000101000002010000040100000501000005010000060100002c0100000701000008
-01000002010000020100000101000005010000050100000201000001010000020100002c
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b0107160100071a0801000701000002010000010100
-00020100000101000002010000040100000501000005010000030103002c010000080102
-0005010000020100000201000002010200030102000201040001010000020100002c0100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b010715010007020100071708010007010000020100000101000002
-010000010100000201000004010000050100000501000002010000020100002c0100000b
-01000004010000020100000201000005010000050100000101000005010000020100002c
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010715010407170801000701000001010100010100
-0001010100010100000201000004010000050100000501000002010000020100002c0100
-000701000002010000040100000201000001010100010100000201000001010000020100
-00010100000201000001010000020100002c010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000b01073208010008
-010100000100000201010000010000010100000201000004010000050100000501000003
-0103002c0100000801020005010000030101000001000002010200030102000301020002
-010000020100002c01000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000b0107320801000b010000560100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0107320801000701000002010000560100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01073208010008010200570100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b010732080100630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010732080100630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0108340063010000630100006301000063010000630100
-0063010000020100050c01000500030e05000000052a0100050302020103020205030100
-0b00083501ff01ff0161050d0100030e0000052b01000503020201030202050301000b36
-00630100006301000063010000630100006301000063010000020100050c01000500030e
-05000000052a01000503020201030202050301000b350800006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01073208010063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107320801
-00630100006301000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000b01071601020718080100630100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b010715010007020100071708010063010000070100005a0100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b0107190100071708010063010000070100005a0100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-0202050301000b0107190100071708010008010200020100000001010002010000000101
-000301020042010000070100000001010002010000000101000301020002010100000100
-000201010000010000030102003401000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107170101071808010007
-010000020100000101010001010000010101000101000001010000020100004101000007
-010100010100000101010001010000010100000201000001010000000100000001000001
-010000000100000001000001010000020100003301000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000b01
-0719010007170801000b0100000101000002010000010100000201000005010000410100
-000701000002010000010100000501000002010000010100000001000000010000010100
-000001000000010000050100003301000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107190100071708010008
-010300010100000201000001010000020100000201030041010000070100000201000001
-010000050100000201000001010000000100000001000001010000000100000001000002
-0103003301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107150100070201000717080100070100
-000201000001010000020100000101000002010000010100000201000041010000070100
-000201000001010000050100000201000001010000000100000001000001010000000100
-000001000001010000020100003301000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107160102071808010007
-010000020100000101000002010000010100000201000001010000020100004101000007
-010100010100000101000005010000020100000101000000010000000100000101000000
-010000000100000101000002010000330100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107320801
-000801030001010000020100000101000002010000020103004101000007010000000101
-000201000006010200020100000001000000010000010100000001000000010000020103
-003301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0107320801006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-01000b010732080100630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107320801006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010732080100630100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b010732080100630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010834006301000063
-01000063010000630100006301000063010000020100050d0100030e0000052b01000503
-020201030202050301000b00083501ff01ff0161050c01000500030e05000000052a0100
-0503020201030202050301000b3600630100006301000063010000630100006301000063
-010000020100050d0100030e0000052b01000503020201030202050301000b3508000063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107320801006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01073208010063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107180100
-0718080100630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b01000503020201030202050301000b010717010107180801001001000006
-010000490100000e0100001c0100000b010200030102001f010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-01000b010716010007000100071808010010010000510100000e0100001c0100000d0100
-00050100001f01000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000b01071601000700010007180801000801020002
-010400020102000201000000010100030102003b01000008010200020100000101000003
-01020002010000000101000301020002010400010100000201000004010000050100001f
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010715010007010100071808010007010000020100
-000301000006010000020101000101000001010000020100003a01000007010000020100
-000101000000010000030100000201000001010100010100000101000002010000030100
-00030100000201000004010000050100001f010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000b01071401000702
-010007180801000701000007010000060100000201000002010000050100003a01000007
-010000050101000801000001010000020100000101000007010000030100000201000004
-010000050100001f01000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000b01071401050717080100080102
-0004010000060100000201000002010000020103003a0100000801020002010100050103
-0001010000020100000201020004010000030100000201000004010000050100001f0100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b010718010007180801000b01000003010000060100000201000002
-01000001010000020100003a0100000b0100000101000000010000030100000201000001
-010000020100000501000003010000030100000201000004010000050100001f01000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01071701020717080100070100000201000003010000060100
-00020100000201000001010000020100003a010000070100000201000001010000010100
-000201000002010000010100000201000001010000020100000301000003010000010101
-0004010000050100001f01000063010000630100006301000063010000020100050d0100
-030e0000052b01000503020201030202050301000b010732080100080102000501010004
-0100000201000002010000020103003a0100000801020002010000020100000201030001
-010000020100000201020005010100020101000001000004010000050100001f01000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01073208010063010000630100006301000063010000630100
-0063010000020100050d0100030e0000052b01000503020201030202050301000b010732
-080100630100006301000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000b01073208010063010000630100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b010732080100630100006301000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000b01
-0732080100630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b01000503020201030202050301000b010834006301000063010000630100
-00630100006301000063010000020100050c01000500030e05000000052a010005030202
-01030202050301000b00083501ff01ff0161050d0100030e0000052b0100050302020103
-0202050301000b3600630100006301000063010000630100006301000063010000020100
-050c01000500030e05000000052a01000503020201030202050301000b35080000630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0107320801006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-01000b010732080100630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107150104071708010063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107150100071b080100070100000e0100
-0014010000340100002b0102003401000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107150100071b08010007
-0100000e0100004a0100002d010000340100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107150100
-071b08010007010000010100000301020002010400020102000201000000010100030102
-000201000000010100030102002601000007010000020100000101000000010100020100
-0000010100030102000301020005010000030102002d0100006301000063010000630100
-0063010000020100050d0100030e0000052b01000503020201030202050301000b010715
-010307180801000701000000010000030100000201000003010000030100000201000001
-010100010100000401000002010100010100000101000002010000250100000701000002
-010000010101000101000001010100010100000101000002010000010100000201000004
-01000002010000020100002c01000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010719010007170801
-000701010008010000030100000701000001010000080100000201000002010000050100
-002501000007010000020100000101000002010000010100000201000001010000090100
-0004010000060100002c01000063010000630100006301000063010000020100050d0100
-030e0000052b01000503020201030202050301000b010719010007170801000701010005
-010300030100000401030001010000080100000201000002010000020103002501000007
-010000020100000101000002010000010100000201000002010200030103000401000003
-0103002c01000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107140100070301000717080100070100
-000001000003010000020100000301000003010000020100000101000008010000020100
-000201000001010000020100002501000007010000020100000101000002010000010100
-00020100000501000001010000020100000401000002010000020100002c010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01071501030718080100070100000101000002010000020100000301000003
-010000020100000101000008010000020100000201000001010000020100002501000007
-010000010101000101010001010000010101000101000001010000020100000101000002
-0100000401000002010000020100002c0100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107320801
-000701000002010000020103000401010002010300010100000801000002010000020100
-000201030025010000080101000001000001010000000101000201000000010100030102
-000301030004010000030103002c01000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b010732080100630100000e
-010000050100004c01000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000b010732080100630100000e0100
-00050100004c01000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000b010732080100630100000e010000050100004c
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010732080100630100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b010732080100630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010834006301000063
-01000063010000630100006301000063010000020100050d0100030e0000052b01000503
-020201030202050301000b00083501ff01ff0161050c01000500030e05000000052a0100
-0503020201030202050301000b3600630100006301000063010000630100006301000063
-010000020100050d0100030e0000052b01000503020201030202050301000b3508000063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107320801006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01073208010063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107170102
-0717080100630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b01000503020201030202050301000b0107160100071a0801000a0100001a
-01010004010000340100000f0102000c010000020100003e010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-01000b0107150100071b080100250100003c01000011010000100100003e010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b0107150100071b080100080102000301020003010200030102000401000004
-010200020100000001010003010200260100000801020005010000020100000201000002
-01020002010000010100003b01000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010715010307180801
-000a01000002010000020100000101000002010000010100000201000001010400040100
-000201010001010000010100000201000025010000070100000201000004010000020100
-00020100000401000002010000000100003c010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000b01071501000702
-010007170801000a01000002010000020100000101000005010000020100000301000006
-01000002010000020100000101000002010000250100000b010000040100000201000002
-01000004010000020101003d01000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010715010007020100
-07170801000a010000020100000201000002010200020104000301000006010000020100
-000201000001010400250100000801030004010000030100000001000005010000020101
-003d01000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b01071501000702010007170801000a0100000201000002
-010000050100000101000007010000060100000201000002010000010100002901000007
-010000020100000401000003010000000100000501000002010000000100003c01000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b010716010207180801000a0100000201000002010000010100
-000201000001010000020100000301000006010000020100000201000001010000020100
-0025010000070100000201000004010000040100000601000002010000010100003b0100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b0107320801000a0100000301020003010200030102000401000006
-010000020100000201000002010200260100000801030004010000040100000601000002
-010000020100003a01000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000b0107320801000a010000570100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0107320801000701000001010000570100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01073208010008010100580100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b010732080100630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010732080100630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0108340063010000630100006301000063010000630100
-0063010000020100050c01000500030e05000000052a0100050302020103020205030100
-0b00083501ff01ff0161050d0100030e0000052b01000503020201030202050301000b36
-00630100006301000063010000630100006301000063010000020100050c01000500030e
-05000000052a01000503020201030202050301000b350800006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01073208010063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107320801
-00630100006301000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000b01071501040717080100630100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01071501000702010007170801000a010100130100000b0100
-000201000030010000250100000b01020003010200260100006301000063010000630100
-0063010000020100050d0100030e0000052b01000503020201030202050301000b010718
-0100071808010009010000150100000f01000030010000250100000d0100000501000026
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010718010007180801000901000003010000000101
-0003010200030101000001000001010000000101000301020002010000010100002d0100
-000701000000010100030102000201000000010100020100000001010002010400010100
-000201000004010000050100002601000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107180100071808010007
-010400010101000101000001010000020100000101000001010100010101000101000004
-01000002010000000100002e010000070101000101000001010000020100000101010001
-010000010101000101000003010000030100000201000004010000050100002601000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01071801000718080100090100000301000005010000020100
-0001010000020100000101000008010000020101002f0100000701000002010000010100
-000201000001010000050100000701000003010000020100000401000005010000260100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b010717010007190801000901000003010000050104000101000002
-0100000101000008010000020101002f0100000701000002010000010100000201000001
-010000050100000701000003010000020100000401000005010000260100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-0202050301000b0107170100071908010009010000030100000501000005010000020100
-00010100000801000002010000000100002e010000070100000201000001010000020100
-000101000005010000070100000301000002010000040100000501000026010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01071701000719080100090100000301000005010000020100000101000001
-010100010100000801000002010000010100002d01000007010000020100000101000002
-010000010100000501000007010000030100000101010004010000050100002601000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01073208010009010000030100000601020003010100000100
-00010100000801000002010000020100002c010000070100000201000002010200020100
-000501000008010100020101000001000004010000050100002601000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b010732080100630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010732080100630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0107320801006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-01000b010732080100630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107320801006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010834006301000063010000630100006301000063
-01000063010000020100050d0100030e0000052b01000503020201030202050301000b00
-083501ff01ff0161050c01000500030e05000000052a0100050302020103020205030100
-0b3600630100006301000063010000630100006301000063010000020100050d0100030e
-0000052b01000503020201030202050301000b3508000063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-0202050301000b0107320801006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000b01073208010063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107160102071808010063010000630100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b010715010007020100071708010063010000070100000f0100000b
-01000006010000100100002201000063010000630100006301000063010000020100050c
-01000500030e05000000052a01000503020201030202050301000b010715010007020100
-071708010063010000070100001c01000018010000220100006301000063010000630100
-0063010000020100050d0100030e0000052b01000503020201030202050301000b010715
-010007020100071708010007010000000101000301020002010000000101004901000007
-010000010100000201000000010100030102000301020002010400020102000201000000
-010100030102000201000000010100030102000201000000010100030101000001000009
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010716010207180801000701010001010000010100
-000201000001010100010100004801000007010000000100000301010001010000040100
-000201000002010000030100000601000002010100010100000101000002010000010101
-000101000001010000020100000101010001010000010100000101010009010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01071501000702010007170801000701000002010000010100000201000001
-0100004c0100000701010004010000080100000201000007010000060100000201000002
-010000010100000201000001010000020100000101000002010000010100000501000002
-0100000901000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107150100070201000717080100070100
-000201000001010400010100004c01000007010100040100000801000003010200040100
-000601000002010000020100000101040001010000020100000101040001010000050100
-00020100000901000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000b01071501000702010007170801000701000002
-01000001010000050100004c010000070100000001000003010000080100000601000003
-010000060100000201000002010000010100000501000002010000010100000501000005
-010000020100000901000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000b01071601020718080100070101
-00010100000101000002010000010100004c010000070100000101000002010000080100
-000201000002010000030100000601000002010000020100000101000002010000010101
-000101000001010000020100000101000005010000010101000901000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b010732080100070100000001010003010200020100004c010000070100000201000001
-010000080100000301020005010100040100000201000002010000020102000201000000
-010100030102000201000006010100000100000901000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000b01
-0732080100070100005a0100005801000009010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000b01073208010007
-0100005a0100005401000002010000090100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107320801
-00070100005a010000550102000a01000063010000630100006301000063010000020100
-050d0100030e0000052b01000503020201030202050301000b0107320801006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b010732080100630100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b01083400630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a01000503020201030202050301000b00083501ff01ff0161050d
-0100030e0000052b01000503020201030202050301000b36006301000063010000630100
-00630100006301000063010000020100050c01000500030e05000000052a010005030202
-01030202050301000b350800006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000b01073208010063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a01000503020201030202050301000b0107320801006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01071601020718080100630100006301000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000b01
-071501000702010007170801001f01000042010000120100001701020034010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01071501000702010007170801006301000012010000190100003401000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01071501000702010007170801000701010000010000030102
-00020100000001010003010200030102003b010000080102000301010000010000020102
-000201000000010100020100000001010005010000030102000201000000010100260100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-01030202050301000b010715010007020100071708010007010000000100000001000001
-0100000201000001010100010100000401000002010000020100003a0100000701000002
-010000010100000101010001010000020100000101010001010000010101000101000004
-010000020100000201000001010100010100002501000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000b01
-071601030717080100070100000001000000010000050100000101000008010000060100
-003a01000007010000020100000101000002010000010100000201000001010000020100
-000101000002010000040100000601000001010000020100002501000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-0b0107190100071708010007010000000100000001000002010300010100000801000003
-0103003a0100000701000002010000010100000201000001010400010100000201000001
-010000020100000401000003010300010100000201000025010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-01000b010718010007180801000701000000010000000100000101000002010000010100
-000801000002010000020100003a01000007010000020100000101000002010000010100
-000501000002010000010100000201000004010000020100000201000001010000020100
-002501000063010000630100006301000063010000020100050d0100030e0000052b0100
-0503020201030202050301000b0107150102071908010007010000000100000001000001
-01000002010000010100000801000002010000020100003a010000070100000201000001
-010000010101000101000002010000010100000201000001010100010100000401000002
-010000020100000101000002010000250100006301000063010000630100006301000002
-0100050c01000500030e05000000052a01000503020201030202050301000b0107320801
-00070100000001000000010000020103000101000008010000030103003a010000080102
-000301010000010000020102000201000002010000010100000001010005010000030103
-0001010000020100002501000063010000630100006301000063010000020100050d0100
-030e0000052b01000503020201030202050301000b01073208010063010000230100003e
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-01000503020201030202050301000b01073208010063010000230100003e010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000b01073208010063010000230100003e01000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000b01
-0732080100630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b01000503020201030202050301000b010732080100630100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000b01083400630100006301000063010000630100006301000063
-010000020100050d0100030e0000052b01000503020201030202050301000b00083501ff
-01ff0161050c01000500030e05000000052a010005030202010302020503010005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050001000063010000630100006301000063010000630100
-0063010000020100050c01000500030e05000000052a0100050302020103020205030100
-050000000532010005000063010000630100006301000063010000630100006301000002
-0100050d0100030e0000052b010005030202010302020503010000000534010000630100
-006301000063010000630100006301000063010000020100050c01000500030e05000000
-052a01000503020201030202050301000500000005130100050401020515010005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000512010205030100050201000515010000630100
-006301000063010000630100006301000063010000020100050c01000500030e05000000
-052a01000503020201030202050301000500000005130100050301000502010005140100
-050000630100006301000063010000630100006301000063010000020100050d0100030e
-0000052b0100050302020103020205030100000005140100050301000502010005150100
-00630100006301000063010000630100006301000063010000020100050c01000500030e
-05000000052a010005030202010302020503010005000000051301000503010005020100
-05140100050000630100006301000063010000630100006301000063010000020100050d
-0100030e0000052b01000503020201030202050301000000051401000503010005020100
-0515010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000513010005030100
-050201000514010005000063010000630100006301000063010000630100006301000002
-0100050d0100030e0000052b010005030202010302020503010000000514010005030100
-050201000515010000630100006301000063010000630100006301000063010000020100
-050c01000500030e05000000052a01000503020201030202050301000500000005110104
-050201020515010005000063010000630100006301000063010000630100006301000002
-0100050d0100030e0000052b010005030202010302020503010000000534010000630100
-006301000063010000630100006301000063010000020100050c01000500030e05000000
-052a01000503020201030202050301000500000005320100050000630100006301000063
-010000630100006301000063010000020100050d0100030e0000052b0100050302020103
-020205030100000005340100006301000063010000630100006301000063010000630100
-00020100050c01000500030e05000000052a010005030202010302020503010005000000
-05320100050000630100006301000063010000630100006301000063010000020100050d
-0100030e0000052b01000503020201030202050301000000053401000063010000630100
-0063010000630100006301000063010000020100050c01000500030e05000000052a0100
-050302020103020205030100050000000532010005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001ff01ff0161050d0100
-030e0000052b010005030202010302020503010005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-020205030100000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500010000630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b0100050302020103020205030100050000000532010005000063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a0100050302020103020205030100000005340100006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000500000005130100050501000516010005000063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-020205030100000005120102050301020517010000630100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-050000000513010005050100051601000500006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-010000000514010005050100051701000063010000630100006301000063010000630100
-0063010000020100050d0100030e0000052b010005030202010302020503010005000000
-051301000505010005160100050000630100006301000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000000
-051401000505010005170100006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000500000005130100
-050501000516010005000063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a0100050302020103020205030100000005140100
-050501000517010000630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b0100050302020103020205030100050000000511010405010104
-05140100050000630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a010005030202010302020503010000000534010000630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-050302020103020205030100050000000532010005000063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-020205030100000005340100006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000500000005320100
-050000630100006301000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000000053401000063010000630100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-010302020503010005000000053201000500006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-010000000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010000630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b010005030202010302020503010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001ff01ff0161050c01000500030e
-05000000052a010005030202010302020503010005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000532010005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000534010000630100006301000063010000630100
-006301000063010000020100050c01000500030e05000000052a01000503020201030202
-050301000500000005130100050401020515010005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000512010205030100050201000515010000630100006301000063010000630100
-006301000063010000020100050c01000500030e05000000052a01000503020201030202
-050301000500000005130100050301000502010005140100050000630100006301000063
-010000630100006301000063010000020100050d0100030e0000052b0100050302020103
-020205030100000005140100050301000502010005150100006301000063010000630100
-00630100006301000063010000020100050c01000500030e05000000052a010005030202
-010302020503010005000000051301000506010005150100050000630100006301000063
-010000630100006301000063010000020100050d0100030e0000052b0100050302020103
-020205030100000005140100050501000517010000630100006301000063010000630100
-006301000063010000020100050c01000500030e05000000052a01000503020201030202
-050301000500000005130100050401000517010005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000514010005030100050201000515010000630100006301000063010000630100
-006301000063010000020100050c01000500030e05000000052a01000503020201030202
-050301000500000005110104050101040514010005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000534010000630100006301000063010000630100006301000063010000020100
-050c01000500030e05000000052a01000503020201030202050301000500000005320100
-050000630100006301000063010000630100006301000063010000020100050d0100030e
-0000052b0100050302020103020205030100000005340100006301000063010000630100
-00630100006301000063010000020100050c01000500030e05000000052a010005030202
-010302020503010005000000053201000500006301000063010000630100006301000063
-01000063010000020100050d0100030e0000052b01000503020201030202050301000000
-0534010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000532010005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000063010000630100006301000063010000630100
-0063010000020100050c01000500030e05000000052a0100050302020103020205030100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001ff01ff0161050d0100030e0000052b010005030202010302020503010005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a0100050302020103020205030100000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500010000630100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-050000000532010005000063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a0100050302020103020205030100000005340100
-00630100006301000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000500000005130100050401020515010005000063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a0100050302020103020205030100000005120102050301000502010005150100
-00630100006301000063010000630100006301000063010000020100050d0100030e0000
-052b01000503020201030202050301000500000005130100050701000514010005000063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a0100050302020103020205030100000005140100050701000515010000630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-050302020103020205030100050000000513010005050101051501000500006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-010005030202010302020503010000000514010005070100051501000063010000630100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-010302020503010005000000051301000507010005140100050000630100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000000051401000503010005020100051501000063010000630100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-010302020503010005000000051101040502010205150100050000630100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000000053401000063010000630100006301000063010000630100
-0063010000020100050d0100030e0000052b010005030202010302020503010005000000
-05320100050000630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a010005030202010302020503010000000534010000630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-050302020103020205030100050000000532010005000063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-020205030100000005340100006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000500000005320100
-050000630100006301000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001ff01ff0161050c01000500030e05000000052a01000503020201030202
-050301000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-05000000050000630100006301000063010000630100006301000063010000020100050d
-0100030e0000052b01000503020201030202050301000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000100006301000063010000630100
-00630100006301000063010000020100050c01000500030e05000000052a010005030202
-010302020503010005000000053201000500006301000063010000630100006301000063
-01000063010000020100050d0100030e0000052b01000503020201030202050301000000
-0534010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000513010005060100
-05150100050000630100006301000063010000630100006301000063010000020100050d
-0100030e0000052b01000503020201030202050301000000051201020505010105160100
-00630100006301000063010000630100006301000063010000020100050c01000500030e
-05000000052a010005030202010302020503010005000000051301000504010005000100
-05150100050000630100006301000063010000630100006301000063010000020100050d
-0100030e0000052b01000503020201030202050301000000051401000504010005000100
-0516010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000513010005030100
-050101000515010005000063010000630100006301000063010000630100006301000002
-0100050d0100030e0000052b010005030202010302020503010000000514010005020100
-050201000516010000630100006301000063010000630100006301000063010000020100
-050c01000500030e05000000052a01000503020201030202050301000500000005130100
-050201050514010005000063010000630100006301000063010000630100006301000002
-0100050d0100030e0000052b010005030202010302020503010000000514010005060100
-0516010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000511010405030102
-05140100050000630100006301000063010000630100006301000063010000020100050d
-0100030e0000052b01000503020201030202050301000000053401000063010000630100
-0063010000630100006301000063010000020100050c01000500030e05000000052a0100
-050302020103020205030100050000000532010005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000534010000630100006301000063010000630100006301000063010000020100
-050c01000500030e05000000052a01000503020201030202050301000500000005320100
-050000630100006301000063010000630100006301000063010000020100050d0100030e
-0000052b0100050302020103020205030100000005340100006301000063010000630100
-00630100006301000063010000020100050c01000500030e05000000052a010005030202
-010302020503010005000000053201000500006301000063010000630100006301000063
-01000063010000020100050d0100030e0000052b01000503020201030202050301000000
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-00630100006301000063010000630100006301000063010000020100050c01000500030e
-05000000052a010005030202010302020503010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001ff01ff0161050d0100030e0000
-052b01000503020201030202050301000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-010000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500010000630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b010005030202010302020503010005000000053201000500006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-010005030202010302020503010000000534010000630100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-050000000513010005030104051401000500006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-010000000512010205030100051901000063010000630100006301000063010000630100
-0063010000020100050d0100030e0000052b010005030202010302020503010005000000
-051301000503010005180100050000630100006301000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000000
-051401000503010005190100006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000500000005130100
-050301030515010005000063010000630100006301000063010000630100006301000002
-0100050c01000500030e05000000052a0100050302020103020205030100000005140100
-050701000515010000630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b0100050302020103020205030100050000000513010005070100
-05140100050000630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a010005030202010302020503010000000514010005020100
-050301000515010000630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b0100050302020103020205030100050000000511010405010103
-05150100050000630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a010005030202010302020503010000000534010000630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-050302020103020205030100050000000532010005000063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-020205030100000005340100006301000063010000630100006301000063010000630100
-00020100050d0100030e0000052b01000503020201030202050301000500000005320100
-050000630100006301000063010000630100006301000063010000020100050c01000500
-030e05000000052a01000503020201030202050301000000053401000063010000630100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-010302020503010005000000053201000500006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-010000000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010000630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b010005030202010302020503010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001ff01ff0161050c01000500030e
-05000000052a010005030202010302020503010005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000532010005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000534010000630100006301000063010000630100
-006301000063010000020100050c01000500030e05000000052a01000503020201030202
-050301000500000005130100050501020514010005000063010000630100006301000063
-0100006301000063010000020100050d0100030e0000052b010005030202010302020503
-010000000512010205040100051801000063010000630100006301000063010000630100
-0063010000020100050c01000500030e05000000052a0100050302020103020205030100
-050000000513010005030100051801000500006301000063010000630100006301000063
-01000063010000020100050d0100030e0000052b01000503020201030202050301000000
-051401000503010005190100006301000063010000630100006301000063010000630100
-00020100050c01000500030e05000000052a010005030202010302020503010005000000
-051301000503010305150100050000630100006301000063010000630100006301000063
-010000020100050d0100030e0000052b0100050302020103020205030100000005140100
-050301000502010005150100006301000063010000630100006301000063010000630100
-00020100050c01000500030e05000000052a010005030202010302020503010005000000
-051301000503010005020100051401000500006301000063010000630100006301000063
-01000063010000020100050d0100030e0000052b01000503020201030202050301000000
-051401000503010005020100051501000063010000630100006301000063010000630100
-0063010000020100050c01000500030e05000000052a0100050302020103020205030100
-050000000511010405020102051501000500006301000063010000630100006301000063
-01000063010000020100050d0100030e0000052b01000503020201030202050301000000
-0534010000630100006301000063010000630100006301000063010000020100050c0100
-0500030e05000000052a0100050302020103020205030100050000000532010005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000534010000630100006301000063010000630100
-006301000063010000020100050c01000500030e05000000052a01000503020201030202
-050301000500000005320100050000630100006301000063010000630100006301000063
-010000020100050d0100030e0000052b0100050302020103020205030100000005340100
-00630100006301000063010000630100006301000063010000020100050c01000500030e
-05000000052a010005030202010302020503010005000000053201000500006301000063
-01000063010000630100006301000063010000020100050d0100030e0000052b01000503
-020201030202050301000000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100006301000063010000630100006301000063010000630100
-00020100050c01000500030e05000000052a010005030202010302020503010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001000500010005000100050001ff
-01ff0161050d0100030e0000052b01000503020201030202050301000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-010005030202010302020503010000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050001000063010000630100006301000063010000630100
-0063010000020100050d0100030e0000052b010005030202010302020503010005000000
-05320100050000630100006301000063010000630100006301000063010000020100050c
-01000500030e05000000052a010005030202010302020503010000000534010000630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-050302020103020205030100050000000513010005030104051401000500006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-010005030202010302020503010000000512010205030100050201000515010000630100
-006301000063010000630100006301000063010000020100050d0100030e0000052b0100
-050302020103020205030100050000000513010005060100051501000500006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-010005030202010302020503010000000514010005060100051601000063010000630100
-0063010000630100006301000063010000020100050d0100030e0000052b010005030202
-010302020503010005000000051301000506010005150100050000630100006301000063
-010000630100006301000063010000020100050c01000500030e05000000052a01000503
-020201030202050301000000051401000506010005160100006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000500000005130100050501000516010005000063010000630100006301000063
-0100006301000063010000020100050c01000500030e05000000052a0100050302020103
-020205030100000005140100050501000517010000630100006301000063010000630100
-006301000063010000020100050d0100030e0000052b0100050302020103020205030100
-050000000511010405030100051601000500006301000063010000630100006301000063
-01000063010000020100050c01000500030e05000000052a010005030202010302020503
-010000000534010000630100006301000063010000630100006301000063010000020100
-050d0100030e0000052b0100050302020103020205030100050000000532010005000063
-0100006301000063010000630100006301000063010000020100050c01000500030e0500
-0000052a0100050302020103020205030100000005340100006301000063010000630100
-00630100006301000063010000020100050d0100030e0000052b01000503020201030202
-050301000500000005320100050000630100006301000063010000630100006301000063
-010000020100050c01000500030e05000000052a01000503020201030202050301000000
-0534010000630100006301000063010000630100006301000063010000020100050d0100
-030e0000052b010005030202010302020503010005000000053201000500006301000063
-01000063010000630100006301000063010000020100050c01000500030e05000000052a
-010005030202010302020503010000000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000063010000630100006301000063010000630100
-0063010000020100050d0100030e0000052b010005030202010302020503010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001000500010005000100050001ff
-01ff0161050c01000500030e05000000052a010005030202010302020503010005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050001000063010000630100006301000063010000630100
-0063010000020100050c01000500030e05000000052a0100050302020103020205030100
-050000000532010005000063010000630100006301000063010000630100006301000002
-0100050d0100030e0000052b010005030202010302020503010000000534010000630100
-006301000063010000630100006301000063010000020100050c01000500030e05000000
-052a01000503020201030202050301000500000005130100050401020515010005000063
-0100006301000063010000630100006301000063010000020100050d0100030e0000052b
-010005030202010302020503010000000512010205030100050201000515010000630100
-006301000063010000630100006301000063010000020100050c01000500000005000000
-05000000050000000500000005000000050000000500000005000000052a010005030202
-01030202050301ff01ff0199050d00000500000005000000050000000500000005000000
-050000000500000005000000052b010005030202010302020503010005ff05ff05e30100
-05030202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff
-05e3010005030202010302020503010005ff05ff05e30100050302020103020205030100
-05ff05ff05e3010005030202010302020503010005ff05ff05e301000503020201030202
-0503010005ff05ff05e3010005030202010302020503010005ff05ff05e3010005030202
-01030202050301000549010005ff05ff0598010005030202010302020503010005480101
-05ff05ff05980100050302020103020205030100054701000500010005ff05ff05980100
-0503020201030202050301000549010005ff05ff05980100050302020103020205030100
-0549010005ff05ff059801000503020201030202050301000549010005ff05ff05980100
-0503020201030202050301000549010005ff05ff05980100050302020103020205030100
-0549010005ff05ff059801000503020201030202050301000547010405ff05ff05960100
-05030202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff
-05e3010005030202010302020503010005ff05ff05e30100050302020103020205030100
-05ff05ff05e3010005030202010302020503010005ff05ff05e301000503020201030202
-050301000538010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001000500010005000100054b0100
-050302020103020205030100053701000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000000054a0100050302020103020205030100053801000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500000003ff03ff033e0000054b01000503020201030202
-050301000537010005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000050000000500000005000000050003ff
-03ff033e05000000054a01000503020201030202050301000538010005000000050c0000
-050c010003ff03ff033e0000054b01000503020201030202050301000537010005000000
-050c0100050c0100050003ff03ff033e05000000054a0100050302020103020205030100
-0538010005000000050c0000050c010003ff03ff033e0000054b01000503020201030202
-050301000537010005000000050c0100050c0100050003ff03ff033e05000000054a0100
-0503020201030202050301000538010005000000050c0000050c010003ff03ff033e0000
-054b01000503020201030202050301000537010005000000050c0100050c0100050003ff
-03ff033e05000000054a01000503020201030202050301000538010005000000050c0000
-050c010003ff03ff033e0000054b01000503020201030202050301000537010005000000
-050c0100050c0100050003ff03ff033e05000000054a0100050302020103020205030100
-0538010005000000050c0000050c010003ff03ff033e0000054b01000503020201030202
-050301000537010005000000050c0100050c0100050003ff03ff033e05000000054a0100
-0503020201030202050301000538010005000000050c0000050c010003ff03ff033e0000
-054b01000503020201030202050301000537010005000000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050003ff03ff033e05000000054a0100050302020103020205030100
-053801000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001000500010003ff03ff033e0000
-054b01000503020201030202050301000537010005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000054a01000503020201030202050301000538000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000054b0100050302020103020205030100
-05ff05ff05e3010005030202010302020503010005ff05ff05e301000503020201030202
-0503010005ff05ff05e3010005030202010302020503010005ff05ff05e3010005030202
-010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e30100
-05030202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff
-05e3010005030202010302020503010005ff05ff05e30100050302020103020205030100
-05ff05ff05e3010005030202010302020503010005ff05ff05e301000503020201030202
-0503010005ff05ff05e3010005030202010302020503010005ff05ff05e3010005030202
-010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e30100
-05030202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff
-05e3010005030202010302020503010005ff05ff05e30100050302020103020205030100
-05ff05ff05e3010005030202010302020503010005ff05ff05e301000503020201030202
-0503010005ff05ff05e3010005030202010302020503010005ff05ff05e3010005030202
-010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e30100
-05030202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff
-05e3010005030202010302020503010005ff05ff05e30100050302020103020205030100
-05ff05ff05e3010005030202010302020503010005ff05ff05e301000503020201030202
-0503010005ff05ff05e3010005030202010302020503010005ff05ff05e3010005030202
-010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e30100
-05030202010100040503010005ff05ff05e301000503000502020400050301ff01ff01e5
-050300000202040000000202040005ff05ff05ed00000202040000000202040005ff05ff
-05ed00000202040000000202040005ff05ff05ed00000202040000000202040005ff05ff
-05ed000002020400000002020400000502ff02ff02e100060202040000000208040002ff
-02ff02e100000208040000000208040002ff02ff02e100000208040000000208040001ff
-01ff01e10000020804000000040901ff01ff01e100000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 380 315
-%%EOF
diff --git a/lib/tv/doc/src/tv_table_browser_updated.gif b/lib/tv/doc/src/tv_table_browser_updated.gif
deleted file mode 100644
index 547497487d..0000000000
--- a/lib/tv/doc/src/tv_table_browser_updated.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_table_browser_updated.ps b/lib/tv/doc/src/tv_table_browser_updated.ps
deleted file mode 100644
index 0a944565e8..0000000000
--- a/lib/tv/doc/src/tv_table_browser_updated.ps
+++ /dev/null
@@ -1,2124 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_table_browser_updated.eps)
-%%CreationDate: (Mon Mar 19 17:15:32 2001)
-%%BoundingBox: 0 0 380 315
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 380 315
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-380.000000 315.000000
-12
-760 630
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-d9d9d9
-b22222
-00ff00
-ff0000
-990000
-7f7f7f
-999999
-ff7f7f
-009900
-7fff7f
-000000
-000a01ff01ff01e1000b0208040001ff01ff01e100000208040000000208040002ff02ff
-02e1000002080400000002080400020000ff00ff00de0400020000000208040000000202
-04060200000004ff04ff04de020000000405020204000000020204000209000d02ff02ff
-02d500000202040000000202040002080000020d04000289010302110103023201020258
-0102020c010102010101021e010102290101020601010208010102310101022a01010230
-0101029600000202040000000202040002080000020d0400028901010202010702000101
-0203010102010101020e01050200010702010103020d0101020401010204010302030103
-020e010302060103020301030203010302060103020b0101020a01010202010102190100
-02030101021c0100020b01010206010102090101021b010202020100020d0101022a0101
-020c0104021e0101029600000202040000000202040002080000020d0400028901010205
-0101020301010203010102010101020e0101020701010203010102010101020c01010202
-010302030101020101010201010102010101020801010201010102010101020401010201
-01010201010102010101020101010201010102040101020101010201010102060101020a
-0101020201010218010102210101020b01010206010102090101021b010202020100020d
-01010238010102020101021d010102960000020204000000020204000208000002020406
-020304000289010102050101020301010203010102010101020e01010207010102030101
-020501010209010102030101020701010201010102010101020601020202010102010101
-020801010201010102010101020101010201010102040101020101010202010202030101
-020a01010203010102020103020301030202010302010104020101010202010302030101
-02000101020a0104020101030203010102000101020301010202010302030101021a0100
-020001010201010002020103020301040202010302020101020901010200010102010101
-020301030203010102020101020001010202010102010103020201010200010102010101
-020301030202010102000101020101010202010302020101020201010285000002020400
-000004030208000002020400030400000203040002890101020501010204010102020100
-02020101020e0101020701010203010202040101020a0100020301010207010102010101
-020101010205010102040101020101010208010102010101020101010201010102010101
-02040101020101010204010102020100020b010102030101020101010201010102010101
-020101010200010102010101020101010203010102010101020101010202010202000101
-020a01010202010102010101020201020200010102020101020101010201010102020101
-021a01000200010102010100020101010201010102010101020101010201010102010101
-020101010209010202000102020001010201010102010101020201010202010202000101
-020101010200010102000101020201020200010202000101020101010201010102010101
-0200010102010101020101010201010102010101020201010285000004030101020b0000
-0203040003020000020404000289010102050101020401010201010102020101020e0104
-0204010102040103020d0101020401010205010202020101020101010204010102050101
-020101010207010102020101020101010202010402040101020101010205010102020101
-020901010203010102010101020101010201010102080101020101010203010102010101
-020101010202010102010101020a01010206010102020101020101010202010102010101
-0201010102020101021a0100020001020200010002010101020101010201010102010101
-0201010102010101020d0101020101010201010102050101020201010202010102010101
-020101010200010102000101020201010201010102010101020501010201010202030101
-0201010102010101020101010202010002890103020b0000020304000302000002040400
-0289010102050101020501010200010002030101020e01010207010102060102020e0100
-020301010207010102010101020101010205010102040101020101010206010102030101
-020101010205010102040101020101010204010102020100020b01010203010102010101
-020101010201010102050104020101010203010102010101020101010202010102010101
-020a0101020301040202010102010101020201010201010502020101021a010002010101
-020001000201010102010101020101010201010102010105020d01010201010102010101
-020201040202010102020101020101010201010102000101020001010202010102010101
-0201010102020104020101010204010102010105020201010200010102890103020b0000
-02040400030000000205040002890101020501010205010302030101020e010102070101
-02070101020d010102030101020701010201010102010101020601020202010102010101
-0205010102040101020101010205010102040101020101010202010202030101020a0101
-020301010201010102010101020101010204010102010101020101010203010102010101
-020101010202010102010101020a01010202010102010101020201010201010102020101
-0201010102060101021a0100020201020201010102010101020101010201010102010101
-021101010201010102010101020101010201010102020101020201010201010102010101
-020101010200010102010101020101010201010102010101020101010201010102040101
-020101010206010102000100028a0103020b000002040400030000000205040002890101
-020501010206010102040101020e01010207010102030101020101010201010102080101
-020401010203010102010101020101010201010102010101020401010201010102010101
-020101010200010502010101020101010201010102010101020101010200010102010101
-0201010102060101020a0101020201010201010102010101020101010202010002000101
-02010101020101010203010102010101020101010202010102010101020a010102020101
-02010101020201010201010102020101020101010202010002010101021b010002020102
-020101010201010102010101020001020201010102020100020101010209010102010101
-020101010201010102010101020201010202010102010101020201010207010102010101
-0201010102010101020101010201010102040101020101010202010002030102028a0103
-020b0000020500000206040002890101020501010206010102040101020e010502030101
-020401030202010102080101020401010204010302030103020201010209010302020101
-0200010502020103020301030202010102010103020b0101020a01010202010102020103
-0203010302020102020001010201010202010101020201030203010102010101020b0102
-020101020200010102010104020301010202010302020101021b01000203010102020103
-020301010200010102020103020201010209010102010101020101010202010202000101
-020101010202010102010101020301050202010102010101020101010202010202000101
-02000101020401010202010302040101028b0103020b0000020d04000289010302110103
-0232010202190100023d0102020c01010237010602230101029e0101028c0103020b0000
-020d040002f2010002ff02540101028c0103020b0000020d040002ff02ff02d70103020c
-040d02ff02ff02d8010302ff02ff02f3010302ff02ff02f30103020200ff00ff00ec0400
-020201030202000004ff04ff04ec0202010302ff02ff02f3010302020500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000202010302020000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000202010302020500000005ff05ff05ea01000202010302020000
-05ff05ff05ea010005000202010302020500000005ff05ff05ea01000202010302020000
-05ff05ff05ea010005000202010302020500000005ff05ff05ea01000202010302020000
-050c06040504060005030602051f06040505060005040600050406000519060005020600
-0504060005270602050b06000506060005ff05ff05080600050206000509060205130100
-050002020103020205000000050b0600050f0600051f060005090600050a060005190600
-05020600052c060005020600050a060005ff05ff0510060005020600050b060005140100
-0202010302020000050c0600050606020505060005030602051806000506060105000600
-050206020502060405170600050206000502060205030602050206000502060005170600
-050206000501060005000601050206040502060205030602050206000500060105030602
-05ff05f306000502060005020602050506000502060005000601050c0100050002020103
-020205000000050b06000508060005050600050206000502060005170600050506000501
-06010504060005040600051a060005000600050506000502060005020600050106000502
-060005170600050206000501060105010600050306000506060005020600050206000501
-060105010600050106000502060005ff05f2060005020600050106000502060005040600
-0502060105010600050c01000202010302020000050c0603050506000505060005020600
-050206000517060305020600050206000504060005040600051a06000500060005050600
-050206000502060005010600050006000500060005170600050206000501060005020600
-0503060005060600050206000502060005010600050206000501060005ff05f606040501
-060005020600050406000502060005020600050b0100050002020103020205000000050b
-06000508060005050600050206040517060005050600050206000504060005040600051a
-060005000600050506000502060405010600050006000500060005170600050206000501
-0600050206000503060005060600050206000502060005010600050206000502060205ff
-05f306000502060005010604050406000502060005020600050c01000202010302020000
-050c0600050806000505060005020600051b060005050600050206000504060005040600
-051b06000506060005020600050506000500060005000600051706000502060005010600
-050206000503060005060600050206000502060005010600050206000505060005ff05f2
-06000502060005010600050806000502060005020600050b010005000202010302020500
-0000050b0600050806000505060005020600050206000517060005050600050106010504
-060005040600051b06000506060005020600050206000501060005000600050006000517
-060005020600050106010501060005030600050606000502060005020600050106000502
-0600050106000502060005ff05f206000502060005010600050206000504060005020601
-05010600050c01000202010302020000050c060005080600050506000503060205180604
-050206010500060005040600050506010519060005060600050306020503060005000600
-051906020502060005000601050506010504060005030602050206000502060005020602
-05ff05f306000502060005020602050506000502060005000601050c0100050002020103
-02020500000005a8060005ff05ff052e0600051001000202010302020000050b0606052a
-0606052a0606052a06060500060005ff05ff05180606050e0600050f0100050002020103
-020205000000050a0606052a0606052a0606052a06060500060005ff05ff05180606050e
-060005100100020201030202000005ff05ff05ea010005000202010302020500000005ff
-05ff05ea0100020201030202000005ff05ff05ea01000500020201030202050000000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100020201030202000005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000100050002020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-020201030202053600000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000051a00000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050100000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050100000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000051a00000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000051a00000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000051a00000500000005000000050000000500000005000000050000000500
-00000500000005000000050000000500000005ff05a50202010302020535000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500010005180000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000100000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-010000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050001000518000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500010005180000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000100051800000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000050000000500010005ff05a402020103
-02020536000005140100051a00000514010005010000051401000501000005140100051a
-000005140100051a000005140100051a00000514010005ff05a502020103020205350000
-051601000518000005160100000005160100000005160100051800000516010005180000
-05160100051800000516010005ff05a40202010302020536000005140100051a00000514
-010005010000051401000501000005140100051a000005140100051a000005140100051a
-00000514010005ff05a50202010302020535000005050602050306020506010005180000
-051601000000051601000000051601000518000005160100051800000516010005180000
-0516010005ff05a402020103020205360000050406020503060205050100051a00000514
-010005010000051401000501000005140100051a00000506060405080100051a00000508
-060105090100051a0000050806030507010005ff05a50202010302020535000005040604
-050106040505010005180000051006000504010000000510060005040100000005040600
-051001000518000005050608050701000518000005080603050901000518000005070607
-0506010005ff05a402020103020205360000050306000501060105010600050106010504
-0100051a0000050f06000503010005010000050f0600050301000501000005030600050f
-0100051a00000503060a05050100051a00000507060305080100051a0000050506030501
-06030504010005ff05a5020201030202053500000503060d0504010005180000050d0600
-0501060005040100000005040600050a06000504010000000504060005010600050d0100
-051800000504060305020603050601000518000005090601050a01000518000005060602
-050306020505010005ff05a4020201030202053600000501060005000603050006020500
-060405020100051a0000050c060005010600050301000501000005030600050a06000503
-0100050100000503060005010600050c0100051a0000050206030504060305040100051a
-000005140100051a000005050602050306020504010005ff05a502020103020205350000
-050206000500060305000602050006040503010005180000050a06000501060005010600
-050401000000050406000504060005040600050401000000050406000501060005010600
-050a01000518000005030602050306070503010005180000050706040509010005180000
-05070601050206020506010005ff05a40202010302020536000005010600050006030500
-06020500060405020100051a000005090600050106000501060005030100050100000503
-06000504060005040600050301000501000005030600050106000501060005090100051a
-0000050206020504060505030100051a00000507060305080100051a0000050a06020506
-010005ff05a5020201030202053500000502060005000603050006020500060405030100
-051800000507060005010600050106000501060005040100000005040600050406000501
-060005010600050401000000050406000501060005010600050106000507010005180000
-05030602050506030505010005180000050906020509010005180000050a060205080100
-05ff05a40202010302020536000005010600050006070500060405020100051a00000506
-060005010600050106000501060005030100050100000503060005040600050106000501
-060005030100050100000503060005010600050106000501060005060100051a00000502
-06030505060105050100051a00000508060205080100051a0000050806020508010005ff
-05a502020103020205350000050206000500060405010600050006040503010005180000
-050406000501060005010600050106000501060005040100000005040600050106000501
-060005010600050106000504010000000504060005010600050106000501060005010600
-050401000518000005040603050d01000518000005090602050901000518000005090602
-0509010005ff05a402020103020205360000050106060501060605020100051a00000503
-060005010600050106000501060005010600050301000501000005030600050106000501
-060005010600050106000503010005010000050306000501060005010600050106000501
-060005030100051a00000503060905060100051a00000508060205080100051a00000514
-010005ff05a5020201030202053500000502060005000602050506000500060205030100
-051800000504060005010600050106000501060005010600050401000000050406000501
-060005010600050106000501060005040100000005040600050106000501060005010600
-050106000504010005180000050506070508010005180000050806040508010005180000
-050906020509010005ff05a4020201030202053600000501060005000602050506000500
-060205020100051a00000503060005010600050106000501060005010600050301000501
-000005030600050106000501060005010600050106000503010005010000050306000501
-060005010600050106000501060005030100051a00000506060405080100051a00000506
-060605060100051a0000050806020508010005ff05a50202010302020535000005020604
-050506040503010005180000051601000000051601000000051601000518000005160100
-0518000005160100051800000516010005ff05a40202010302020536000005140100051a
-00000514010005010000051401000501000005140100051a000005140100051a00000514
-0100051a00000514010005ff05a502020103020205350000051601000518000005160100
-000005160100000005160100051800000516010005180000051601000518000005160100
-05ff05a40202010302020536000005140100051a00000514010005010000051401000501
-000005140100051a000005140100051a000005140100051a00000514010005ff05a50202
-010302020535000005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005180000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-000005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010000000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000518000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005180000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100051800000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005ff05a402020103020205360100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000100051a0100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005010100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005010100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000100051a0100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100051a0100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100051a0100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005ff05a5020201030202
-05ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed020201030202
-05ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed020201030202
-05ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed020201030202
-05ff05ff05ed02020103020205ff05ff05ed020201030202050301ff01ff01e505030202
-01030202050301ff01ff01d1050000000500000005000000050000000500000005000000
-050000000500000005000000050001000503020201030202050301ff01ff01d100000500
-000005000000050000000500000005000000050000000500000005000000050001010503
-020201030202050301020bff0bff0bcb010205000000050e010005000100050302020103
-0202050301020bff0bff0bca000001020000051001010503020201030202050301020b01
-00ff00ff00c9010205000000050e0100050001000503020201030202050301020b0100ff
-00ff00c901020000051001010503020201030202050301020b0100ff00ff00c901020500
-0000050e0100050001000503020201030202050301020b0100ff00ff00c9010200000510
-01010503020201030202050301020b0100ff00ff00c9010205000000050e010005000100
-0503020201030202050301020b0100ff00ff00c9010200000502010a0502010105030202
-01030202050301020b0100ff00ff00c90102050000000502010805020100050001000503
-020201030202050301020b0100ff00ff00c9010200000504010605040101050302020103
-0202050301020b0100ff00ff00c901020500000005040104050401000500010005030202
-01030202050301020b0100ff00ff00c90102000005060102050601010503020201030202
-050301020b0100ff00ff00c9010205000000050601000506010005000100050302020103
-0202050301020b0100ff00ff00c901020000051001010503020201030202050301020b01
-00ff00ff00c9010205000000050e0100050001000503020201030202050301020b0100ff
-00ff00c901020000051001010503020201030202050301020b0100ff00ff00c901020500
-0000050e0100050001000503020201030202050301020b0100ff00ff00c9010200000510
-01010503020201030202050301020b0100ff00ff00c9010205000000050e010005000100
-0503020201030202050301020b0000ff00ff00ca01020000051001010503020201030202
-050301ff01ff01d105000000050001000500010005000100050001000500010005000100
-0500010005000100050001000503020201030202050301ff01ff01d10000050001000500
-010005000100050001000500010005000100050001000500010005000101050302020103
-0202050301ff01ff01e5050302020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-02020103020205ff05ff05ed02020103020205ff05ff05ed02020103020205ff05ff05ed
-020201030202050301ff01ff01e505030202010302020503010005ff05ff05970100054a
-01000503020201030202050301000563010505ff05ff052d0100054a0100050302020103
-0202050301000562010705ff05ff052c0100054a01000503020201030202050301000561
-01020503010205ff05ff052b0100054a0100050302020103020205030100056101010505
-010105ff05ff052b0100054a0100050302020103020205030100056101020503010205ff
-05ff052b0100054a01000503020201030202050301000562010705ff05ff052c0100054a
-01000503020201030202050301000563010505ff05ff052d0100054a0100050302020103
-0202050301000565010105ff05ff052f0100054a01000503020201030202050301000565
-010105ff05ff052f0100054a01000503020201030202050301000565010105ff05ff052f
-0100054a01000503020201030202050301000565010105ff05ff052f0100054a01000503
-020201030202050301000565010105ff05ff052f0100054a010005030202010302020503
-01000565010105ff05ff052f0100054a0100050302020103020205030100056101010500
-010205ff05ff052f0100054a0100050302020103020205030100056101010500010205ff
-05ff052f0100054a01000503020201030202050301000561010505ff05ff052f0100054a
-01000503020201030202050301000561010505ff05ff052f0100054a0100050302020103
-020205030100056101020500010105ff05ff052f0100054a010005030202010302020503
-010005ff05ff05970100054a01000503020201030202050301ff01ff0199054a01000503
-020201030202050301000536000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-00000500000005000000050000000500000005000000050000000a040500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000a04050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-0000050000000500000005000000050000000a0405000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-05000000050000000500000005000000050000000500000005000000050000000a040500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000a04050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000050000000a0405000000010005140100
-050001000500010005000100050001000500010005000100050001000500010005240100
-050302020103020205030100053500000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000000050000000500000005000000050000000500000005000a0301000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000a03010000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-05000000050000000500000005000000050000000500000005000a030100000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-0500000005000a0301000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000a03010000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-05000a030100000005000100051301000500010005000100050001000500010005000100
-050001000500010005000100050000000523010005030202010302020503010005360000
-055e01000a01010205000000055c01000a01010205000000055c01000a01010205000000
-055c01000a01010205000000055c01000a01010205000000055c01000a01010205000000
-010005140100050000000500000005000000050000000500000005000000050000000500
-00000524010005030202010302020503010005350000052d0100052f010005000a010102
-0000052b0102052d010005000a0101020000052b0102052d010005000a0101020000052d
-0100052d010005000a0101020000052a0104052c010005000a0101020000052c0102052c
-010005000a01010200000500010005130100050000000500000005000000050000000500
-000005000000050000000500010005000000052301000503020201030202050301000536
-0000052a0102053001000a010102050000000529010005020100052d01000a0101020500
-00000529010005020100052d01000a01010205000000052b0101052e01000a0101020500
-000005290100053101000a01010205000000052a0100053001000a010102050000000100
-0514010005000000050a0100050000000524010005030202010302020503010005350000
-052d0100052f010005000a0101020000052a010005020100052c010005000a0101020000
-052e0100052c010005000a0101020000052b010005000100052d010005000a0101020000
-052a01000530010005000a0101020000052a01000530010005000a010102000005000100
-0513010005000000050c0100050000000523010005030202010302020503010005360000
-052c0100053001000a010102050000000529010005020100052d01000a01010205000000
-052d0100052d01000a01010205000000052a010005000100052e01000a01010205000000
-05290100053101000a0101020500000005290100053101000a0101020500000001000514
-010005000000050a0100050000000524010005030202010302020503010005350000052d
-0100052f010005000a0101020000052d0100052d010005000a0101020000052c0101052d
-010005000a0101020000052a010005010100052d010005000a0101020000052a0103052d
-010005000a0101020000052a0103052d010005000a010102000005000100051301000500
-0000050c0100050000000523010005030202010302020503010005360000052c01000530
-01000a01010205000000052b0100052f01000a01010205000000052d0100052d01000a01
-0102050000000528010005020100052e01000a01010205000000052d0100052d01000a01
-0102050000000529010005020100052d01000a0101020500000001000514010005000000
-050a0100050000000524010005030202010302020503010005350000052d0100052f0100
-05000a0101020000052b0100052f010005000a0101020000052e0100052c010005000a01
-0102000005290105052c010005000a0101020000052e0100052c010005000a0101020000
-052a010005020100052c010005000a0101020000050001000513010005000000050c0100
-050000000523010005030202010302020503010005360000052c0100053001000a010102
-050000000529010005020100052d01000a010102050000000529010005020100052d0100
-0a01010205000000052c0100052e01000a010102050000000528010005030100052d0100
-0a010102050000000529010005020100052d01000a010102050000000100051401000500
-0000050a0100050000000524010005030202010302020503010005350000052b0104052d
-010005000a0101020000052a0104052c010005000a0101020000052b0102052d01000500
-0a0101020000052c0102052c010005000a0101020000052a0103052d010005000a010102
-0000052b0102052d010005000a0101020000050001000513010005000000050c01000500
-00000523010005030202010302020503010005360000055e01000a01010205000000055c
-01000a01010205000000055c01000a01010205000000055c01000a01010205000000055c
-01000a01010205000000055c01000a0101020500000001000514010005000000050a0100
-050000000524010005030202010302020503010005350000055e010005000a0101020000
-055c010005000a0101020000055c010005000a0101020000055c010005000a0101020000
-055c010005000a0101020000055c010005000a0101020000050001000513010005000000
-050c0100050000000523010005030202010302020503010005360000055e01000a010102
-05000000055c01000a01010205000000055c01000a01010205000000055c01000a010102
-05000000055c01000a01010205000000055c01000a010102050000000100050e01000504
-010005000000050a0100050000000524010005030202010302020503010005350000055e
-010005000a0101020000055c010005000a0101020000055c010005000a0101020000055c
-010005000a0101020000055c010005000a0101020000055c010005000a01010200000500
-0100050d01010503010005000000050c0100050000000523010005030202010302020503
-010005360000055e01000a01010205000000055c01000a01010205000000055c01000a01
-010205000000055c01000a01010205000000055c01000a01010205000000055c01000a01
-0102050000000100050c0100050001000504010005000000050001000500010005000100
-050001000500010005000100050000000524010005030202010302020503010005350000
-055e010005000a0101020000055c010005000a0101020000055c010005000a0101020000
-055c010005000a0101020000055c010005000a0101020000055c010005000a0101020000
-05000100050e010005030100050000000500000005000000050000000500000005000000
-050000000500010005000000052301000503020201030202050301000536000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001000a010102050000000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001000a0101020500000005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000a01010205000000050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001000500010005000100050001000a010102050000000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0a0101020500000005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000a010102050000000100050e0100050401000500
-0000050a0100050000000524010005030202010302020503010005350000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000a000103000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000a0001030000050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000a00010300000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000100050001000500010005000a000103000005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0a0001030000050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000a000103000005000100050e0100050301000500
-0000050c0100050000000523010005030202010302020503010005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000063010000630100
-0063010000630100006301000063010000020100050e01000504010005000000050a0100
-050000000524010005030202010302020503010000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050001000063010000630100006301000063
-0100006301000063010000020100050e01000503010005000000050c0100050000000523
-010005030202010302020503010005000000053201000500006301000063010000630100
-00630100006301000063010000020100050c01040502010005000000050a010005000000
-052401000503020201030202050301000000053401000063010000630100006301000063
-01000063010000630100000201000513010005000000050c010005000000052301000503
-020201030202050301000500000005170100051901000500006301000063010000630100
-006301000063010000630100000201000514010005000000050a01000500000005240100
-050302020103020205030100000005160102051a0100000f010200030102004901000007
-010000230100000b010200030102001f0100006301000063010000630100006301000002
-01000513010005000000050c010005000000052301000503020201030202050301000500
-0000051701000519010005000011010000050100004901000007010000230100000d0100
-00050100001f010000630100006301000063010000630100000201000514010005000000
-050a01000500000005240100050302020103020205030100000005180100051a01000008
-010200050100000501000003010200420100000701000000010100030102000201000000
-01010002010000000101000301020002010400010100000201000004010000050100001f
-010000630100006301000063010000630100000201000513010005000000050c01000500
-000005230100050302020103020205030100050000000517010005190100050000070100
-000201000004010000050100000201000002010000410100000701010001010000010100
-000201000001010100010100000101010001010000010100000201000003010000030100
-000201000004010000050100001f01000063010000630100006301000063010000020100
-0514010005000000050a0100050000000524010005030202010302020503010000000518
-0100051a0100000701000002010000040100000501000002010000020100004101000007
-010000020100000101000002010000010100000501000002010000010100000701000003
-0100000201000004010000050100001f0100006301000063010000630100006301000002
-01000513010005000000050c010005000000052301000503020201030202050301000500
-000005170100051901000500000701000002010000040100000501000002010400410100
-000701000002010000010100000201000001010000050100000201000002010200040100
-00030100000201000004010000050100001f010000630100006301000063010000630100
-000201000514010005000000050001000500010005000100050001000500010005000100
-0500000005240100050302020103020205030100000005180100051a0100000701000002
-010000040100000501000002010000450100000701000002010000010100000201000001
-01000005010000020100000501000003010000030100000201000004010000050100001f
-010000630100006301000063010000630100000201000513010005000000050001000500
-010005000100050001000500010005000100050001000500000005230100050302020103
-020205030100050000000515010405170100050000070100000201000004010000050100
-000201000002010000410100000701000002010000010100000201000001010000050100
-0002010000010100000201000003010000030100000101010004010000050100001f0100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-010302020503010000000534010000080102000501000005010000030102004201000007
-010000020100000201020002010000050100000201000002010200050101000201010000
-01000004010000050100001f010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000000053201000500
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000000053401000063010000630100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-006301000002010005140100030e00000524010005030202010302020503010000000534
-010000630100006301000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000500000005320100050000630100
-00630100006301000063010000630100006301000002010005140100030e000005240100
-050302020103020205030100000005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010000630100006301000063010000630100006301000063
-010000020100051301000500030e05000000052301000503020201030202050301000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01ff01ff016105140100030e000005240100050302020103020205030100050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000630100
-006301000063010000630100006301000063010000020100051301000500030e05000000
-052301000503020201030202050301000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000100006301000063010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000500
-000005320100050000630100006301000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000000053401000063
-010000630100006301000063010000630100006301000002010005140100030e00000524
-010005030202010302020503010005000000051601020518010005000063010000630100
-0063010000630100006301000063010000020100051301000500030e0500000005230100
-0503020201030202050301000000051601000502010005180100001f0100000301020003
-010200340100000f01020050010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005150100050201000517
-010005000026010000050100003401000011010000500100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005160100050201000518010000080101000001000001010000020100000101000000
-010100030102000501000005010000030102002d01000008010200050100000201000002
-01000002010200030102000301020002010000000101002d010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000500
-000005180100051801000500000701000001010100010100000201000001010100010100
-0004010000050100000501000002010000020100002c0100000701000002010000040100
-000201000002010000010100000201000001010000020100000101000002010000010101
-00010100002c01000063010000630100006301000063010000020100051301000500030e
-0500000005230100050302020103020205030100000005180100051a0100000701000002
-01000001010000020100000101000002010000040100000501000005010000060100002c
-010000070100000801000002010000020100000101000005010000050100000201000001
-010000020100002c0100006301000063010000630100006301000002010005140100030e
-0000052401000503020201030202050301000500000005160100051a0100050000070100
-000201000001010000020100000101000002010000040100000501000005010000030103
-002c01000008010200050100000201000002010000020102000301020002010400010100
-00020100002c01000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000516010005020100051801000007
-010000020100000101000002010000010100000201000004010000050100000501000002
-010000020100002c0100000b010000040100000201000002010000050100000501000001
-01000005010000020100002c010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005150104051701000500
-000701000001010100010100000101010001010000020100000401000005010000050100
-0002010000020100002c0100000701000002010000040100000201000001010100010100
-00020100000101000002010000010100000201000001010000020100002c010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000534010000080101000001000002010100000100000101000002
-010000040100000501000005010000030103002c01000008010200050100000301010000
-01000002010200030102000301020002010000020100002c010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000500
-0000053201000500000b0100005601000063010000630100006301000063010000630100
-00020100051301000500030e050000000523010005030202010302020503010000000534
-010000070100000201000056010000630100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010005000000053201000500
-000801020057010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005340100006301000063
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000500000005320100050000630100006301000063010000630100
-006301000063010000020100051301000500030e05000000052301000503020201030202
-050301000000050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000500010005000100050001000500010005000100050001ff01ff0161051301000500
-030e05000000052301000503020201030202050301000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500006301000063010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000100006301000063010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000000053201000500
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000000053401000063010000630100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100050000000516010205180100050000630100006301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-00000516010005020100051801000063010000070100005a010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-010005000000051901000517010005000063010000070100005a01000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-0000051a0100051801000008010200020100000001010002010000000101000301020042
-010000070100000001010002010000000101000301020002010100000100000201010000
-010000030102003401000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000500000005170101051801000500
-000701000002010000010101000101000001010100010100000101000002010000410100
-000701010001010000010101000101000001010000020100000101000000010000000100
-000101000000010000000100000101000002010000330100006301000063010000630100
-006301000002010005140100030e0000052401000503020201030202050301000000051a
-010005180100000b01000001010000020100000101000002010000050100004101000007
-010000020100000101000005010000020100000101000000010000000100000101000000
-010000000100000501000033010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000000051901000517
-010005000008010300010100000201000001010000020100000201030041010000070100
-000201000001010000050100000201000001010000000100000001000001010000000100
-000001000002010300330100006301000063010000630100006301000002010005140100
-030e00000524010005030202010302020503010000000516010005020100051801000007
-010000020100000101000002010000010100000201000001010000020100004101000007
-010000020100000101000005010000020100000101000000010000000100000101000000
-010000000100000101000002010000330100006301000063010000630100006301000002
-0100051301000500030e0500000005230100050302020103020205030100050000000516
-010205180100050000070100000201000001010000020100000101000002010000010100
-000201000041010000070101000101000001010000050100000201000001010000000100
-000001000001010000000100000001000001010000020100003301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-000005340100000801030001010000020100000101000002010000020103004101000007
-010000000101000201000006010200020100000001000000010000010100000001000000
-010000020103003301000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000500000005320100050000630100
-00630100006301000063010000630100006301000002010005140100030e000005240100
-050302020103020205030100000005340100006301000063010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-010005000000053201000500006301000063010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000000053401000063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100050000000532010005000063010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-010302020503010000000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000063010000630100006301000063010000630100006301000002
-0100051301000500030e0500000005230100050302020103020205030100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001ff01ff
-016105140100030e00000524010005030202010302020503010005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000063010000630100
-0063010000630100006301000063010000020100051301000500030e0500000005230100
-050302020103020205030100000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500010000630100006301000063010000630100006301000063
-01000002010005140100030e000005240100050302020103020205030100050000000532
-010005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005340100006301000063
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000500000005180100051801000500006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000518010105190100001001000006010000490100000e0100001c
-0100000b010200030102001f010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005160100050001000518
-010005000010010000510100000e0100001c0100000d010000050100001f010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000517010005000100051901000008010200020104000201020002
-01000000010100030102003b010000080102000201000001010000030102000201000000
-0101000301020002010400010100000201000004010000050100001f0100006301000063
-010000630100006301000002010005140100030e00000524010005030202010302020503
-010005000000051501000501010005180100050000070100000201000003010000060100
-00020101000101000001010000020100003a010000070100000201000001010000000100
-000301000002010000010101000101000001010000020100000301000003010000020100
-0004010000050100001f0100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005150100050201000519
-0100000701000007010000060100000201000002010000050100003a0100000701000005
-010100080100000101000002010000010100000701000003010000020100000401000005
-0100001f0100006301000063010000630100006301000002010005140100030e00000524
-010005030202010302020503010005000000051401050517010005000008010200040100
-00060100000201000002010000020103003a010000080102000201010005010300010100
-00020100000201020004010000030100000201000004010000050100001f010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000519010005190100000b01000003010000060100000201000002
-01000001010000020100003a0100000b0100000101000000010000030100000201000001
-010000020100000501000003010000030100000201000004010000050100001f01000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000517010205170100050000070100000201000003010000060100
-00020100000201000001010000020100003a010000070100000201000001010000010100
-000201000002010000010100000201000001010000020100000301000003010000010101
-0004010000050100001f0100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005340100000801020005
-010100040100000201000002010000020103003a01000008010200020100000201000002
-01030001010000020100000201020005010100020101000001000004010000050100001f
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000500000005320100050000630100006301000063010000630100
-006301000063010000020100051301000500030e05000000052301000503020201030202
-050301000000053401000063010000630100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010005000000053201000500
-00630100006301000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000534010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000063010000630100006301000063010000630100006301000002010005140100030e
-000005240100050302020103020205030100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001ff01ff0161051301000500030e0500
-0000052301000503020201030202050301000a3600630100006301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-0a3501000063010000630100006301000063010000630100006301000002010005130100
-0500030e05000000052301000503020201030202050301000a0101340063010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-01030202050301000a010134006301000063010000630100006301000063010000630100
-00020100051301000500030e05000000052301000503020201030202050301000a010115
-000401190063010000630100006301000063010000630100006301000002010005140100
-030e0000052401000503020201030202050301000a0101150000011d00070100000e0100
-0014010000340100002b0102003401000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000a0101150000011d
-00070100000e0100004a0100002d01000034010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000a0101150000011d
-000701000001010000030102000201040002010200020100000001010003010200020100
-000001010003010200260100000701000002010000010100000001010002010000000101
-00030102000301020005010000030102002d010000630100006301000063010000630100
-00020100051301000500030e05000000052301000503020201030202050301000a010115
-0003011a0007010000000100000301000002010000030100000301000002010000010101
-000101000004010000020101000101000001010000020100002501000007010000020100
-000101010001010000010101000101000001010000020100000101000002010000040100
-0002010000020100002c0100006301000063010000630100006301000002010005140100
-030e0000052401000503020201030202050301000a010119000001190007010100080100
-000301000007010000010100000801000002010000020100000501000025010000070100
-000201000001010000020100000101000002010000010100000901000004010000060100
-002c01000063010000630100006301000063010000020100051301000500030e05000000
-052301000503020201030202050301000a01011900000119000701010005010300030100
-000401030001010000080100000201000002010000020103002501000007010000020100
-0001010000020100000101000002010000020102000301030004010000030103002c0100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-01030202050301000a010114000001030000011900070100000001000003010000020100
-000301000003010000020100000101000008010000020100000201000001010000020100
-002501000007010000020100000101000002010000010100000201000005010000010100
-00020100000401000002010000020100002c010000630100006301000063010000630100
-00020100051301000500030e05000000052301000503020201030202050301000a010115
-0003011a0007010000010100000201000002010000030100000301000002010000010100
-000801000002010000020100000101000002010000250100000701000001010100010101
-000101000001010100010100000101000002010000010100000201000004010000020100
-00020100002c0100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000a01013400070100000201000002010300040101
-000201030001010000080100000201000002010000020103002501000008010100000100
-0001010000000101000201000000010100030102000301030004010000030103002c0100
-0063010000630100006301000063010000020100051301000500030e0500000005230100
-0503020201030202050301000a01013400630100000e010000050100004c010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000a01013400630100000e010000050100004c0100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-0a01013400630100000e010000050100004c010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000a01013400630100
-006301000063010000630100006301000063010000020100051301000500030e05000000
-052301000503020201030202050301000a01013400630100006301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-0a0101340063010000630100006301000063010000630100006301000002010005130100
-0500030e05000000052301000503020201030202050301000a0001ff01ff019705140100
-030e00000524010005030202010302020503010005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000063010000630100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500010000630100006301000063010000630100006301000063010000020100
-05140100030e000005240100050302020103020205030100050000000532010005000063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100000005340100006301000063010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000500000005170102051701000500006301000063010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-0100000005170100051b0100000a0100001a01010004010000340100000f0102000c0100
-00020100003e0100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000500000005150100051b0100050000250100003c
-01000011010000100100003e010000630100006301000063010000630100000201000513
-01000500030e0500000005230100050302020103020205030100000005160100051c0100
-000801020003010200030102000301020004010000040102000201000000010100030102
-0026010000080102000501000002010000020100000201020002010000010100003b0100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-01030202050301000500000005150103051801000500000a010000020100000201000001
-010000020100000101000002010000010104000401000002010100010100000101000002
-010000250100000701000002010000040100000201000002010000040100000201000000
-0100003c01000063010000630100006301000063010000020100051301000500030e0500
-0000052301000503020201030202050301000000051601000502010005180100000a0100
-000201000002010000010100000501000002010000030100000601000002010000020100
-000101000002010000250100000b01000004010000020100000201000004010000020101
-003d0100006301000063010000630100006301000002010005140100030e000005240100
-050302020103020205030100050000000515010005020100051701000500000a01000002
-010000020100000201020002010400030100000601000002010000020100000101040025
-0100000801030004010000030100000001000005010000020101003d0100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-0202050301000000051601000502010005180100000a0100000201000002010000050100
-000101000007010000060100000201000002010000010100002901000007010000020100
-000401000003010000000100000501000002010000000100003c01000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-0500000005160102051801000500000a0100000201000002010000010100000201000001
-010000020100000301000006010000020100000201000001010000020100002501000007
-0100000201000004010000040100000601000002010000010100003b0100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100000005340100000a01000003010200030102000301020004010000060100
-000201000002010000020102002601000008010300040100000401000006010000020100
-00020100003a0100006301000063010000630100006301000002010005140100030e0000
-0524010005030202010302020503010005000000053201000500000a0100005701000063
-01000063010000630100006301000063010000020100051301000500030e050000000523
-010005030202010302020503010000000534010000070100000101000057010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-010302020503010005000000053201000500000801010058010000630100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100000005340100006301000063010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000500000005320100
-050000630100006301000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000000050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100006301000063010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-05000100050001ff01ff0161051301000500030e05000000052301000503020201030202
-050301000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000100006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010005000000053201000500006301000063010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000000
-053401000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100050000000515010405170100
-05000063010000630100006301000063010000630100006301000002010005140100030e
-0000052401000503020201030202050301000000051601000502010005180100000a0101
-00130100000b0100000201000030010000250100000b0102000301020026010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010005000000051801000518010005000009010000150100000f01000030
-010000250100000d01000005010000260100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010000000519010005190100
-000901000003010000000101000301020003010100000100000101000000010100030102
-0002010000010100002d0100000701000000010100030102000201000000010100020100
-000001010002010400010100000201000004010000050100002601000063010000630100
-006301000063010000020100051301000500030e05000000052301000503020201030202
-050301000500000005180100051801000500000701040001010100010100000101000002
-010000010100000101010001010100010100000401000002010000000100002e01000007
-010100010100000101000002010000010101000101000001010100010100000301000003
-010000020100000401000005010000260100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010000000519010005190100
-000901000003010000050100000201000001010000020100000101000008010000020101
-002f01000007010000020100000101000002010000010100000501000007010000030100
-000201000004010000050100002601000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000500000005170100
-051901000500000901000003010000050104000101000002010000010100000801000002
-0101002f0100000701000002010000010100000201000001010000050100000701000003
-010000020100000401000005010000260100006301000063010000630100006301000002
-010005140100030e000005240100050302020103020205030100000005180100051a0100
-000901000003010000050100000501000002010000010100000801000002010000000100
-002e01000007010000020100000101000002010000010100000501000007010000030100
-000201000004010000050100002601000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000500000005170100
-051901000500000901000003010000050100000201000001010000010101000101000008
-01000002010000010100002d010000070100000201000001010000020100000101000005
-010000070100000301000001010100040100000501000026010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000000
-053401000009010000030100000601020003010100000100000101000008010000020100
-00020100002c010000070100000201000002010200020100000501000008010100020101
-000001000004010000050100002601000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000500000005320100
-05000063010000630100006301000063010000630100006301000002010005140100030e
-000005240100050302020103020205030100000005340100006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010005000000053201000500006301000063010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000000
-053401000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100050000000532010005000063
-010000630100006301000063010000630100006301000002010005140100030e00000524
-010005030202010302020503010000000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001ff01ff016105140100030e0000052401000503020201030202050301000e360063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-0000052301000503020201030202050301000e350d000063010000630100006301000063
-010000630100006301000002010005140100030e00000524010005030202010302020503
-01000e0107320d0100630100006301000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000e0107320d010063
-010000630100006301000063010000630100006301000002010005140100030e00000524
-01000503020201030202050301000e010716010207180d01006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-01030202050301000e01071501000702010007170d01006301000010010000200102002d
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000e01071501000702010007170d01006301000010010000220100
-002d01000063010000630100006301000063010000020100051301000500030e05000000
-052301000503020201030202050301000e01071501000702010007170d01000701000000
-010100030102000201000000010100490100000801020002010400010100000201000001
-01000000010100030102000201000000010100050100000301020002010000000101001f
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000e010716010207180d0100070101000101000001010000020100
-000101010001010000480100000701000002010000030100000301000002010000010101
-000101000001010000020100000101010001010000040100000201000002010000010101
-00010100001e01000063010000630100006301000063010000020100051301000500030e
-05000000052301000503020201030202050301000e01071501000702010007170d010007
-010000020100000101000002010000010100004c01000007010000070100000301000002
-010000010100000501000002010000010100000201000004010000060100000101000002
-0100001e0100006301000063010000630100006301000002010005140100030e00000524
-01000503020201030202050301000e01071501000702010007170d010007010000020100
-0001010400010100004c0100000801020004010000030100000201000001010000050104
-000101000002010000040100000301030001010000020100001e01000063010000630100
-006301000063010000020100051301000500030e05000000052301000503020201030202
-050301000e01071501000702010007170d0100070100000201000001010000050100004c
-0100000b0100000301000003010000020100000101000005010000050100000201000004
-010000020100000201000001010000020100001e01000063010000630100006301000063
-01000002010005140100030e0000052401000503020201030202050301000e0107160102
-07180d010007010100010100000101000002010000010100004c01000007010000020100
-000301000003010000010101000101000005010000020100000101010001010000040100
-00020100000201000001010000020100001e010000630100006301000063010000630100
-00020100051301000500030e05000000052301000503020201030202050301000e010732
-0d0100070100000001010003010200020100004c01000008010200050101000201010000
-01000001010000060102000201000000010100050100000301030001010000020100001e
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000e0107320d0100070100005a0100002a01000037010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-01030202050301000e0107320d0100070100005a0100002a010000370100006301000063
-010000630100006301000002010005140100030e00000524010005030202010302020503
-01000e0107320d0100070100005a0100002a010000370100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-0e0107320d01006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000e0107320d010063010000630100
-0063010000630100006301000063010000020100051301000500030e0500000005230100
-0503020201030202050301000e010d340063010000630100006301000063010000630100
-006301000002010005140100030e0000052401000503020201030202050301000e000d35
-01ff01ff0161051301000500030e05000000052301000503020201030202050301000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000100006301000063010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-010005000000053201000500006301000063010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000000053401000063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100050000000516010205180100050000630100
-00630100006301000063010000630100006301000002010005140100030e000005240100
-0503020201030202050301000000051601000502010005180100001f0100004201000012
-010000170102003401000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000500000005150100050201000517
-010005000063010000120100001901000034010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000000051601000502
-01000518010000070101000001000003010200020100000001010003010200030102003b
-010000080102000301010000010000020102000201000000010100020100000001010005
-010000030102000201000000010100260100006301000063010000630100006301000002
-0100051301000500030e0500000005230100050302020103020205030100050000000515
-010005020100051701000500000701000000010000000100000101000002010000010101
-00010100000401000002010000020100003a010000070100000201000001010000010101
-000101000002010000010101000101000001010100010100000401000002010000020100
-000101010001010000250100006301000063010000630100006301000002010005140100
-030e00000524010005030202010302020503010000000517010305180100000701000000
-01000000010000050100000101000008010000060100003a010000070100000201000001
-010000020100000101000002010000010100000201000001010000020100000401000006
-010000010100000201000025010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000000051901000517
-0100050000070100000001000000010000020103000101000008010000030103003a0100
-000701000002010000010100000201000001010400010100000201000001010000020100
-000401000003010300010100000201000025010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000000051901000519
-010000070100000001000000010000010100000201000001010000080100000201000002
-0100003a0100000701000002010000010100000201000001010000050100000201000001
-010000020100000401000002010000020100000101000002010000250100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100050000000515010205190100050000070100000001000000010000010100
-0002010000010100000801000002010000020100003a0100000701000002010000010100
-000101010001010000020100000101000002010000010101000101000004010000020100
-000201000001010000020100002501000063010000630100006301000063010000020100
-05140100030e000005240100050302020103020205030100000005340100000701000000
-01000000010000020103000101000008010000030103003a010000080102000301010000
-010000020102000201000002010000010100000001010005010000030103000101000002
-0100002501000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100050000000532010005000063010000230100
-003e0100006301000063010000630100006301000002010005140100030e000005240100
-0503020201030202050301000000053401000063010000230100003e0100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100050000000532010005000063010000230100003e01000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-000005340100006301000063010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000000053201000500
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000000050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100006301000063010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050001ff01ff016105140100030e0000052401000503020201030202050301000c36
-00630100006301000063010000630100006301000063010000020100051301000500030e
-05000000052301000503020201030202050301000c350900006301000063010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000c01083209010063010000630100006301000063010000630100006301000002
-0100051301000500030e05000000052301000503020201030202050301000c0108320901
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000c01081301000804010208150901006301000063
-01000063010000630100006301000063010000020100051301000500030e050000000523
-01000503020201030202050301000c010811010208030100080201000814090100070100
-0016010000420100000701000006010200100100000c0100003001000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-0c010813010008030100080201000814090100070100005a010000070100000801000010
-0100000c0100003001000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000c01081301000803010008020100
-081409010007010000010100000301020002010000000101000301020002010000000101
-003b01000007010000000101000501000003010200030102000201000001010000030102
-000201000000010100030102000201000000010100030101000001000017010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000c01081301000803010008020100081409010007010000000100000301000002
-01000001010100010100000401000002010100010100003a010000070101000101000004
-010000020100000201000001010000020100000101000000010000030100000201000001
-010100010100000101000002010000010101000101000001010000010101001701000063
-010000630100006301000063010000020100051301000500030e05000000052301000503
-020201030202050301000c01081301000803010008020100081409010007010100080100
-00010100000801000002010000020100003a010000070100000201000004010000060100
-000101000005010100040100000201000001010000020100000101000002010000010100
-000501000002010000170100006301000063010000630100006301000002010005140100
-030e0000052401000503020201030202050301000c010813010008030100080201000814
-0901000701010005010300010100000801000002010000020100003a0100000701000002
-010000040100000301030001010000050101000401040001010000020100000101040001
-010000050100000201000017010000630100006301000063010000630100000201000513
-01000500030e05000000052301000503020201030202050301000c010813010008030100
-080201000814090100070100000001000003010000020100000101000008010000020100
-00020100003a010000070100000201000004010000020100000201000001010000050100
-000001000003010000050100000201000001010000050100000501000002010000170100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-01030202050301000c010811010408020102081509010007010000010100000201000002
-010000010100000801000002010000020100003a01000007010100010100000401000002
-010000020100000101000002010000010100000101000002010000020100000101010001
-010000010100000201000001010000050100000101010017010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-01000c010832090100070100000201000002010300010100000801000002010000020100
-003a01000007010000000101000501000003010300020102000201000002010000020102
-000201000000010100030102000201000006010100000100001701000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-0c010832090100630100004a010000170100006301000063010000630100006301000002
-0100051301000500030e05000000052301000503020201030202050301000c0108320901
-006301000046010000020100001701000063010000630100006301000063010000020100
-05140100030e0000052401000503020201030202050301000c0108320901006301000047
-0102001801000063010000630100006301000063010000020100051301000500030e0500
-0000052301000503020201030202050301000c0108320901006301000063010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000c01083209010063010000630100006301000063010000630100006301000002
-0100051301000500030e05000000052301000503020201030202050301000c0109340063
-010000630100006301000063010000630100006301000002010005140100030e00000524
-01000503020201030202050301000c00093501ff01ff0161051301000500030e05000000
-052301000503020201030202050301000c36006301000063010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000c35
-090000630100006301000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000c01083209010063010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-01030202050301000c010832090100630100006301000063010000630100006301000063
-010000020100051301000500030e05000000052301000503020201030202050301000c01
-081301000805010008160901006301000063010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000c01081101020803
-01020816090100170100004a010000070100003001020026010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-01000c0108130100080501000816090100170100004a0100000701000032010000260100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-01030202050301000c010813010008050100081609010007010100000100000301020002
-010400020102004201000007010000000101000201000000010100030102000201010000
-010000020101000001000003010200020100000001010005010000030102000201000000
-0101001801000063010000630100006301000063010000020100051301000500030e0500
-0000052301000503020201030202050301000c0108130100080501000816090100070100
-000001000000010000010100000201000003010000030100000201000041010000070101
-000101000001010100010100000101000002010000010100000001000000010000010100
-000001000000010000010100000201000001010100010100000401000002010000020100
-000101010001010000170100006301000063010000630100006301000002010005140100
-030e0000052401000503020201030202050301000c010813010008050100081609010007
-010000000100000001000005010000030100000301000045010000070100000201000001
-010000050100000201000001010000000100000001000001010000000100000001000005
-010000010100000201000004010000060100000101000002010000170100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-0202050301000c0108130100080501000816090100070100000001000000010000020103
-000301000004010200420100000701000002010000010100000501000002010000010100
-000001000000010000010100000001000000010000020103000101000002010000040100
-000301030001010000020100001701000063010000630100006301000063010000020100
-05140100030e0000052401000503020201030202050301000c0108130100080501000816
-090100070100000001000000010000010100000201000003010000070100004101000007
-010000020100000101000005010000020100000101000000010000000100000101000000
-010000000100000101000002010000010100000201000004010000020100000201000001
-010000020100001701000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000c01081101040801010408140901
-000701000000010000000100000101000002010000030100000301000002010000410100
-000701010001010000010100000501000002010000010100000001000000010000010100
-000001000000010000010100000201000001010100010100000401000002010000020100
-000101000002010000170100006301000063010000630100006301000002010005140100
-030e0000052401000503020201030202050301000c010832090100070100000001000000
-010000020103000401010002010200420100000701000000010100020100000601020002
-010000000100000001000001010000000100000001000002010300010100000001010005
-010000030103000101000002010000170100006301000063010000630100006301000002
-0100051301000500030e05000000052301000503020201030202050301000c0108320901
-006301000031010000300100006301000063010000630100006301000002010005140100
-030e0000052401000503020201030202050301000c010832090100630100003101000030
-01000063010000630100006301000063010000020100051301000500030e050000000523
-01000503020201030202050301000c010832090100630100003101000030010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000c01083209010063010000630100006301000063010000630100006301000002
-0100051301000500030e05000000052301000503020201030202050301000c0108320901
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000c01093400630100006301000063010000630100
-006301000063010000020100051301000500030e05000000052301000503020201030202
-050301000c00093501ff01ff016105140100030e00000524010005030202010302020503
-010005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005340100006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005130100050401020515
-010005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005120102050301000502
-010005150100006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005130100050301000502
-010005140100050000630100006301000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000000051401000503
-010005020100051501000063010000630100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010005000000051301000506
-010005150100050000630100006301000063010000630100006301000063010000020100
-051301000500030e05000000052301000503020201030202050301000000051401000505
-010005170100006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005130100050401000517
-010005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005140100050301000502
-010005150100006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005110104050101040514
-010005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005340100006301000063
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000500000005320100050000630100006301000063010000630100
-006301000063010000020100051301000500030e05000000052301000503020201030202
-050301000000053401000063010000630100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010005000000053201000500
-00630100006301000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000534010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-01000063010000630100006301000063010000630100006301000002010005140100030e
-000005240100050302020103020205030100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001ff01ff0161051301000500030e0500
-000005230100050302020103020205030100050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000630100006301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-010000630100006301000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000500000005320100050000630100
-00630100006301000063010000630100006301000002010005140100030e000005240100
-050302020103020205030100000005340100006301000063010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-010005000000051301000504010205150100050000630100006301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-000005120102050301000502010005150100006301000063010000630100006301000063
-01000063010000020100051301000500030e050000000523010005030202010302020503
-010005000000051301000507010005140100050000630100006301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-000005140100050701000515010000630100006301000063010000630100006301000063
-010000020100051301000500030e05000000052301000503020201030202050301000500
-000005130100050501010515010005000063010000630100006301000063010000630100
-006301000002010005140100030e00000524010005030202010302020503010000000514
-010005070100051501000063010000630100006301000063010000630100006301000002
-0100051301000500030e0500000005230100050302020103020205030100050000000513
-010005070100051401000500006301000063010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000000051401000503
-010005020100051501000063010000630100006301000063010000630100006301000002
-0100051301000500030e0500000005230100050302020103020205030100050000000511
-010405020102051501000500006301000063010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000000053401000063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100050000000532010005000063010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-010302020503010000000534010000630100006301000063010000630100006301000063
-010000020100051301000500030e05000000052301000503020201030202050301000500
-000005320100050000630100006301000063010000630100006301000063010000020100
-05140100030e000005240100050302020103020205030100000005340100006301000063
-01000063010000630100006301000063010000020100051301000500030e050000000523
-010005030202010302020503010005000000053201000500006301000063010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000000050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100006301000063010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100050001000500010005000100050001ff01ff01610514
-0100030e0000052401000503020201030202050301000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050001000063010000630100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010005000000053201000500
-00630100006301000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000534010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000513010005060100051501000500006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000512010205050101051601000063010000630100006301000063
-010000630100006301000002010005140100030e00000524010005030202010302020503
-010005000000051301000504010005000100051501000500006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000514010005040100050001000516010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000513010005030100050101000515010005000063010000630100
-0063010000630100006301000063010000020100051301000500030e0500000005230100
-050302020103020205030100000005140100050201000502010005160100006301000063
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000500000005130100050201050514010005000063010000630100
-0063010000630100006301000063010000020100051301000500030e0500000005230100
-050302020103020205030100000005140100050601000516010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000511010405030102051401000500006301000063010000630100
-00630100006301000063010000020100051301000500030e050000000523010005030202
-010302020503010000000534010000630100006301000063010000630100006301000063
-01000002010005140100030e000005240100050302020103020205030100050000000532
-010005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005340100006301000063
-0100006301000063010000630100006301000002010005140100030e0000052401000503
-020201030202050301000500000005320100050000630100006301000063010000630100
-006301000063010000020100051301000500030e05000000052301000503020201030202
-050301000000053401000063010000630100006301000063010000630100006301000002
-010005140100030e00000524010005030202010302020503010005000000053201000500
-00630100006301000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000063010000630100006301000063
-010000630100006301000002010005140100030e00000524010005030202010302020503
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050001ff01ff0161051301000500030e050000000523010005030202010302020503
-010005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000063010000630100006301000063010000630100006301000002010005140100
-030e00000524010005030202010302020503010000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050001000063010000630100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-006301000002010005140100030e00000524010005030202010302020503010000000534
-010000630100006301000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000500000005130100050301040514
-010005000063010000630100006301000063010000630100006301000002010005140100
-030e00000524010005030202010302020503010000000512010205030100051901000063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100050000000513010005030100051801000500
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000000051401000503010005190100006301000063
-01000063010000630100006301000063010000020100051301000500030e050000000523
-010005030202010302020503010005000000051301000503010305150100050000630100
-00630100006301000063010000630100006301000002010005140100030e000005240100
-050302020103020205030100000005140100050701000515010000630100006301000063
-010000630100006301000063010000020100051301000500030e05000000052301000503
-020201030202050301000500000005130100050701000514010005000063010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-010302020503010000000514010005020100050301000515010000630100006301000063
-010000630100006301000063010000020100051301000500030e05000000052301000503
-020201030202050301000500000005110104050101030515010005000063010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-010302020503010000000534010000630100006301000063010000630100006301000063
-010000020100051301000500030e05000000052301000503020201030202050301000500
-000005320100050000630100006301000063010000630100006301000063010000020100
-05140100030e000005240100050302020103020205030100000005340100006301000063
-01000063010000630100006301000063010000020100051301000500030e050000000523
-010005030202010302020503010005000000053201000500006301000063010000630100
-0063010000630100006301000002010005140100030e0000052401000503020201030202
-050301000000053401000063010000630100006301000063010000630100006301000002
-0100051301000500030e0500000005230100050302020103020205030100050000000532
-010005000063010000630100006301000063010000630100006301000002010005140100
-030e00000524010005030202010302020503010000000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000063010000630100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001ff01ff016105140100030e00000524010005030202010302020503
-010005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005340100006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005130100050501020514
-010005000063010000630100006301000063010000630100006301000002010005130100
-0500030e0500000005230100050302020103020205030100000005120102050401000518
-01000063010000630100006301000063010000630100006301000002010005140100030e
-000005240100050302020103020205030100050000000513010005030100051801000500
-00630100006301000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000514010005030100051901000063
-010000630100006301000063010000630100006301000002010005140100030e00000524
-010005030202010302020503010005000000051301000503010305150100050000630100
-006301000063010000630100006301000063010000020100051301000500030e05000000
-052301000503020201030202050301000000051401000503010005020100051501000063
-010000630100006301000063010000630100006301000002010005140100030e00000524
-010005030202010302020503010005000000051301000503010005020100051401000500
-00630100006301000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000514010005030100050201000515
-01000063010000630100006301000063010000630100006301000002010005140100030e
-000005240100050302020103020205030100050000000511010405020102051501000500
-00630100006301000063010000630100006301000063010000020100051301000500030e
-050000000523010005030202010302020503010000000534010000630100006301000063
-01000063010000630100006301000002010005140100030e000005240100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005340100006301000063010000630100006301000063010000630100000201000514
-0100030e0000052401000503020201030202050301000500000005320100050000630100
-006301000063010000630100006301000063010000020100051301000500030e05000000
-052301000503020201030202050301000000053401000063010000630100006301000063
-010000630100006301000002010005140100030e00000524010005030202010302020503
-010005000000053201000500006301000063010000630100006301000063010000630100
-00020100051301000500030e050000000523010005030202010302020503010000000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000063
-010000630100006301000063010000630100006301000002010005140100030e00000524
-010005030202010302020503010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-0100050001000500010005000100050001ff01ff0161051301000500030e050000000523
-010005030202010302020503010005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000063010000630100006301000063010000630100
-006301000002010005140100030e00000524010005030202010302020503010000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050001000063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100050000000532010005000063010000630100
-006301000063010000630100006301000002010005140100030e00000524010005030202
-010302020503010000000534010000630100006301000063010000630100006301000063
-010000020100051301000500030e05000000052301000503020201030202050301000500
-000005130100050301040514010005000063010000630100006301000063010000630100
-006301000002010005140100030e00000524010005030202010302020503010000000512
-010205030100050201000515010000630100006301000063010000630100006301000063
-010000020100051301000500030e05000000052301000503020201030202050301000500
-000005130100050601000515010005000063010000630100006301000063010000630100
-006301000002010005140100030e00000524010005030202010302020503010000000514
-010005060100051601000063010000630100006301000063010000630100006301000002
-0100051301000500030e0500000005230100050302020103020205030100050000000513
-010005060100051501000500006301000063010000630100006301000063010000630100
-0002010005140100030e0000052401000503020201030202050301000000051401000506
-010005160100006301000063010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000000051301000505
-010005160100050000630100006301000063010000630100006301000063010000020100
-05140100030e000005240100050302020103020205030100000005140100050501000517
-010000630100006301000063010000630100006301000063010000020100051301000500
-030e05000000052301000503020201030202050301000500000005110104050301000516
-010005000063010000630100006301000063010000630100006301000002010005140100
-030e00000524010005030202010302020503010000000534010000630100006301000063
-010000630100006301000063010000020100051301000500030e05000000052301000503
-020201030202050301000500000005320100050000630100006301000063010000630100
-00630100006301000002010005140100030e000005240100050302020103020205030100
-000005340100006301000063010000630100006301000063010000630100000201000513
-01000500030e050000000523010005030202010302020503010005000000053201000500
-0063010000630100006301000063010000630100006301000002010005140100030e0000
-052401000503020201030202050301000000053401000063010000630100006301000063
-0100006301000063010000020100051301000500030e0500000005230100050302020103
-020205030100050000000532010005000063010000630100006301000063010000630100
-006301000002010005140100030e00000524010005030202010302020503010000000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000063
-0100006301000063010000630100006301000063010000020100051301000500030e0500
-000005230100050302020103020205030100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001ff01ff016105140100030e00000524
-010005030202010302020503010005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-01000063010000630100006301000063010000630100006301000002010005140100030e
-000005240100050302020103020205030100050000000532010005000063010000630100
-0063010000630100006301000063010000020100051301000500030e0500000005230100
-050302020103020205030100000005340100006301000063010000630100006301000063
-0100006301000002010005140100030e0000052401000503020201030202050301000500
-000005130100050401020515010005000063010000630100006301000063010000630100
-0063010000020100051301000500030e0500000005230100050302020103020205030100
-000005120102050301000502010005150100006301000063010000630100006301000063
-010000630100000201000514010005000000050000000500000005000000050000000500
-00000500000005000000052401000503020201030202050301ff01ff0199051301000500
-000005000000050000000500000005000000050000000500000005000000050000000523
-010005030202010302020503010005ff05ff05e3010005030202010302020503010005ff
-05ff05e3010005030202010302020503010005ff05ff05e3010005030202010302020503
-010005ff05ff05e3010005030202010302020503010005ff05ff05e30100050302020103
-02020503010005ff05ff05e3010005030202010302020503010005ff05ff05e301000503
-0202010302020503010005ff05ff05e301000503020201030202050301000549010005ff
-05ff059801000503020201030202050301000548010105ff05ff05980100050302020103
-020205030100054701000500010005ff05ff059801000503020201030202050301000549
-010005ff05ff059801000503020201030202050301000549010005ff05ff059801000503
-020201030202050301000549010005ff05ff059801000503020201030202050301000549
-010005ff05ff059801000503020201030202050301000549010005ff05ff059801000503
-020201030202050301000547010405ff05ff0596010005030202010302020503010005ff
-05ff05e3010005030202010302020503010005ff05ff05e3010005030202010302020503
-010005ff05ff05e3010005030202010302020503010005ff05ff05e30100050302020103
-02020503010005ff05ff05e3010005030202010302020503010005380100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100054b01000503020201030202050301000537
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000000054a01000503
-020201030202050301000538010005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000003ff03ff033e0000054b010005030202010302020503010005370100050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050003ff03ff033e05000000054a01000503
-020201030202050301000538010005000000050c0000050c010003ff03ff033e0000054b
-01000503020201030202050301000537010005000000050c0100050c0100050003ff03ff
-033e05000000054a01000503020201030202050301000538010005000000050c0000050c
-010003ff03ff033e0000054b01000503020201030202050301000537010005000000050c
-0100050c0100050003ff03ff033e05000000054a01000503020201030202050301000538
-010005000000050c0000050c010003ff03ff033e0000054b010005030202010302020503
-01000537010005000000050c0100050c0100050003ff03ff033e05000000054a01000503
-020201030202050301000538010005000000050c0000050c010003ff03ff033e0000054b
-01000503020201030202050301000537010005000000050c0100050c0100050003ff03ff
-033e05000000054a01000503020201030202050301000538010005000000050c0000050c
-010003ff03ff033e0000054b01000503020201030202050301000537010005000000050c
-0100050c0100050003ff03ff033e05000000054a01000503020201030202050301000538
-010005000000050c0000050c010003ff03ff033e0000054b010005030202010302020503
-010005370100050000000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050003ff03ff
-033e05000000054a01000503020201030202050301000538010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010003ff03ff033e0000054b010005030202010302020503
-010005370100050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-00000500000005000000050000000500000005000000050000000500000005000000054a
-010005030202010302020503010005380000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000054b010005030202010302020503010005ff05ff05e30100050302020103
-02020503010005ff05ff05e3010005030202010302020503010005ff05ff05e301000503
-0202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e3
-010005030202010302020503010005ff05ff05e3010005030202010302020503010005ff
-05ff05e3010005030202010302020503010005ff05ff05e3010005030202010302020503
-010005ff05ff05e3010005030202010302020503010005ff05ff05e30100050302020103
-02020503010005ff05ff05e3010005030202010302020503010005ff05ff05e301000503
-0202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e3
-010005030202010302020503010005ff05ff05e3010005030202010302020503010005ff
-05ff05e3010005030202010302020503010005ff05ff05e3010005030202010302020503
-010005ff05ff05e3010005030202010302020503010005ff05ff05e30100050302020103
-02020503010005ff05ff05e3010005030202010302020503010005ff05ff05e301000503
-0202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e3
-010005030202010302020503010005ff05ff05e3010005030202010302020503010005ff
-05ff05e3010005030202010302020503010005ff05ff05e3010005030202010302020503
-010005ff05ff05e3010005030202010302020503010005ff05ff05e30100050302020103
-02020503010005ff05ff05e3010005030202010302020503010005ff05ff05e301000503
-0202010302020503010005ff05ff05e3010005030202010302020503010005ff05ff05e3
-010005030202010302020503010005ff05ff05e3010005030202010100040503010005ff
-05ff05e301000503000502020400050301ff01ff01e50503000002020400000002020400
-05ff05ff05ed00000202040000000202040005ff05ff05ed000002020400000002020400
-05ff05ff05ed00000202040000000202040005ff05ff05ed000002020400000002020400
-000502ff02ff02e100060202040000000208040002ff02ff02e100000208040000000208
-040002ff02ff02e100000208040000000208040001ff01ff01e100000208040000000409
-01ff01ff01e100000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 380 315
-%%EOF
diff --git a/lib/tv/doc/src/tv_table_loaded.gif b/lib/tv/doc/src/tv_table_loaded.gif
deleted file mode 100644
index 1786426f4d..0000000000
--- a/lib/tv/doc/src/tv_table_loaded.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_table_loaded.ps b/lib/tv/doc/src/tv_table_loaded.ps
deleted file mode 100644
index 3f0cf9d707..0000000000
--- a/lib/tv/doc/src/tv_table_loaded.ps
+++ /dev/null
@@ -1,1430 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_table_loaded.eps)
-%%CreationDate: (Mon Mar 19 17:15:33 2001)
-%%BoundingBox: 0 0 532 441
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 532 441
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-532.000000 441.000000
-12
-760 630
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-ff0000
-d9d9d9
-b22222
-828282
-ff9155
-c3c3c3
-7f7f7f
-990000
-000000
-000000
-000000
-000a01ff01ff01e1000b0208040001ff01ff01e100000208040000000208040002ff02ff
-02e1000002080400000002080400020000ff00ff00de0400020000000208040000000202
-04060200000004ff04ff04de020000000405020204000000020204000209000d02ff02ff
-02d500000202040000000202040002080000020d040002a501010206010102150101021e
-0101022901010206010102430101022a010102260101023201010233010102ae00000202
-040000000202040002080000020d04000277010502000107020101030206010702090101
-02060101021501010219010002030101021c0100020b010102060101022e010202020100
-020d0101022a0101020c0104021401010232010102160100021b010102ae000002020400
-00000202040002080000020d04000277010102070101020301010201010102080101020c
-010102060101021501010218010102210101020b010102060101022e010202020100020d
-01010238010102020101024801010215010102cc00000202040000000202040002080000
-0202040602030400027701010207010102030101020c0101020401030203010102000101
-020301010202010302020101020901010202010302030103020201030201010402010101
-020201030203010102000101020a01040201010302030101020001010203010102020103
-022701000200010102010100020201030203010402020103020201010209010102000101
-020101010203010302030101020201010200010102020101020101030202010402020101
-020101010202010102020101020001010203010102000101020301030203010402020104
-020501040202010102010101020501030201010402000101020101010204010302020101
-020001010201010102020103020201040202010402020103020301010200010102060104
-020201030274000002020400000004030208000002020400030400000203040002770101
-0207010102030102020b0101020301010201010102020102020001010202010102010101
-020101010201010102090101020101010201010102010101020101010200010102010101
-020101010203010102010101020101010202010202000101020a01010202010102010101
-020201020200010102020101020101010201010102260100020001010201010002010101
-020101010201010102010101020101010201010102010101020901020200010202000101
-020101010201010102020101020201020200010102010101020001010200010102010101
-020101010202010102010101020201010202010202000101020201020200010102010101
-020101010201010102050101020801010201010102020101020101010204010102010101
-020101010202010102010101020301010201010102010101020001010201010102010101
-020101010200010102050101020501010201010102020102020001010204010102050101
-020101010273000004030101020b00000203040003020000020404000277010402040101
-0204010302090101020701010202010102010101020201010201010102010101020d0101
-020101010201010102010101020801010201010102030101020101010201010102020101
-02010101020a010102060101020201010201010102020101020101010201010102260100
-0200010202000100020101010201010102010101020101010201010102010101020d0101
-020101010201010102050101020201010202010102010101020101010200010102000101
-020101010201010102020101020101010202010102020101020101010202010102010101
-020101010201010102010102020401020207010102010101020201010201010102040101
-020101010201010102030101020001000204010102010101020101020203010102010101
-020401020204010202040101020101010202010102010101020401020204010102010101
-02760103020b000002030400030200000204040002770101020701010206010202080101
-0204010402020101020101010202010102010105020d0101020101010201010102010101
-02050104020101010203010102010101020101010202010102010101020a010102030104
-020201010201010102020101020101050226010002010101020001000201010102010101
-020101010201010102010105020d01010201010102010101020201040202010102020101
-020101010201010102000101020001010201010102010101020201010201010102020101
-020201010201010102020101020101010201010502020103020301030205010102010101
-020201010201010102040105020101010204010102050105020101010204010102010101
-020501030203010302020101020101010202010102010101020501030202010502760103
-020b00000204040003000000020504000277010102070101020701010208010102030101
-020101010202010102010101020201010201010102110101020101010201010102010101
-0204010102010101020101010203010102010101020101010202010102010101020a0101
-020201010201010102020101020101010202010102010101022a01000202010202010101
-020101010201010102010101020101010211010102010101020101010201010102010101
-020201010202010102010101020101010201010102000101020001010200010202020101
-020101010202010102020101020101010202010102010101020101010208010202040102
-020401010201010102020101020101010204010102050101020301000200010102040101
-020501010204010102010101020701020204010202010101020101010202010102010101
-0207010202010101027a0103020b00000204040003000000020504000277010102070101
-020301010201010102080101020301010201010102020101020101010202010102010101
-020201000201010102090101020101010201010102010101020201000200010102010101
-020101010203010102010101020101010202010102010101020a01010202010102010101
-020201010201010102020101020101010202010002260100020201020201010102010101
-020101010200010202010101020201000201010102090101020101010201010102010101
-020101010202010102020101020101010202010102070101020001010202010102000102
-020201010202010102010101020201010201010102010101020201000205010102050101
-020101010200010102000102020201010200010202010101020001010202010002010101
-020201010201010102000101020001010202010002010101020401010201010102020100
-020401010205010102010101020101010202010102010101020101010204010102010101
-0202010002760103020b0000020500000206040002770105020301010204010302090101
-020401020200010102010104020301010202010302020101020901010202010302030103
-02020102020001010201010202010101020201030203010102010101020b010202010102
-020001010201010402030101020201030227010002030101020201030203010102000101
-020201030202010102090101020101010201010102020102020001010201010102020101
-020101010203010502050101020301010200010102020101020201010201010102020101
-020101010202010302020104020201040202010102010101020001010203010102000101
-020101010201010302030102020001010201010102000101020101030202010102040101
-020201030201010402020104020301030203010102010101020101010200010402030103
-02770103020b0000020d040002fc010602a201010201010102ff022a0103020b0000020d
-040002ff02a7010302ff022b0103020b0000020d040002ff02ff02d70103020c040d02ff
-02ff02d8010302ff02ff02f3010302ff02ff02f30103020200ff00ff00ec040002020103
-0202000004ff04ff04ec0202010302ff02ff02f30103020200ff00ff00ed020201030202
-00ff00ff00ec0800020201030202000106ff06ff06e90801020201030202000106ff06ff
-06e90801020201030202000106ff06ff06e90801020201030202000106ff06ff06e90801
-020201030202000106ff06ff06e908010202010302020001060b07040604070006030702
-061f07040610070206200702060b070006060700062d0700060207000604070006ff06fa
-07000602070006090702061308010202010302020001060b0700060f0700062107000614
-0700061f070006020700060a0700063507000602070006ff06ff0600070006020700060b
-0700061308010202010302020001060b0700060607020605070006030702061a07000604
-070206030702060507000603070206180700060207000601070006000701060207040602
-070206030702060207000600070106030702061807000602070006020702060307020602
-07000602070006ff06eb07000602070006020702060507000602070006000701060c0801
-0202010302020001060b0700060807000605070006020700060207000619070006030700
-060207000601070006020700060407000602070006020700061707000602070006010701
-060107000603070006060700060207000602070006010701060107000601070006020700
-0618070006000700060507000602070006020700060107000602070006ff06eb07000602
-07000601070006020700060407000602070106010700060b08010202010302020001060b
-070306050700060507000602070006020700061907000603070006020700060107000602
-07000604070006020700061b070006020700060107000602070006030700060607000602
-070006020700060107000602070006010700061c07000600070006050700060207000602
-070006010700060007000600070006ff06eb070406010700060207000604070006020700
-06020700060b08010202010302020001060b070006080700060507000602070406190700
-060307000602070006010700060207000604070006030702061807000602070006010700
-060207000603070006060700060207000602070006010700060207000602070206190700
-06000700060507000602070406010700060007000600070006ff06eb0700060207000601
-0704060407000602070006020700060b08010202010302020001060b0700060807000605
-070006020700061d07000603070006020700060107000602070006040700060607000617
-070006020700060107000602070006030700060607000602070006020700060107000602
-07000605070006190700060607000602070006050700060007000600070006ff06eb0700
-0602070006010700060807000602070006020700060b08010202010302020001060b0700
-060807000605070006020700060207000619070006030700060207000601070006020700
-060407000602070006020700061707000602070006010701060107000603070006060700
-060207000602070006010700060207000601070006020700061907000606070006020700
-0602070006010700060007000600070006ff06eb07000602070006010700060207000604
-07000602070106010700060b08010202010302020001060b070006080700060507000603
-0702061a0700060407020603070206050700060307020619070206020700060007010605
-07010604070006030702060207000602070006020702061a070006060700060307020603
-07000600070006ff06ec07000602070006020702060507000602070006000701060c0801
-0202010302020001067d070006ff06ff06590700060f08010202010302020001060a0706
-062a07060631070606000700063d070606ff06fe0706060e0700060f0801020201030202
-0001060a0706062a07060631070606000700063d070606ff06fe0706060e0700060f0801
-020201030202000106ff06ff06e90801020201030202000106ff06ff06e9080102020103
-0202000106ff06ff06e90801020201030202000108ff08ff08eb020201030202000008ff
-08ff08ec02020103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff
-06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff
-06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202010302020603
-0016061600160616004406160016061600160616001606ff06be02020103020206030015
-080006160015080006160015080000150800001508000616001508000616001508000616
-0015080006ff06be02020103020206030001061208010616000106120801061600010612
-080100010612080100010612080106160001061208010616000106120801061600010612
-080106ff06be020201030202060300010612080106160001061208010616000106120801
-000106120801000106120801061600010612080106160001061208010616000106120801
-06ff06be0202010302020603000106120801061600010603070206030702060408010616
-000106120801000106120801000106120801061600010612080106160001061208010616
-00010612080106ff06be0202010302020603000106080702060608010616000106030702
-060307020604080106160001061208010001061208010001061208010616000106050704
-0607080106160001060707010608080106160001060707030606080106ff06be02020103
-020206030001060b0701060408010616000106020704060107040603080106160001060e
-0700060208010001060e070006020801000106020700060e080106160001060307080605
-080106160001060607030607080106160001060507070604080106ff06be020201030202
-06030001060d070006000700060108010616000106020700060107010601070006010701
-0603080106160001060e0700060208010001060e070006020801000106020700060e0801
-061600010602070a06040801061600010606070306070801061600010604070306010703
-0603080106ff06be02020103020206030001060207020608070106010801061600010601
-070d0602080106160001060b07000601070006020801000106020700060a070006020801
-00010602070006010700060b080106160001060207030602070306040801061600010607
-0701060808010616000106040702060307020603080106ff06be02020103020206030001
-060107080602070206010801061600010600070006000703060007020600070406010801
-06160001060b07000601070006020801000106020700060a070006020801000106020700
-06010700060b080106160001060107030604070306030801061600010612080106160001
-06040702060307020603080106ff06be0202010302020603000106010709060608010616
-000106000700060007030600070206000704060108010616000106080700060107000601
-070006020801000106020700060407000604070006020801000106020700060107000601
-070006080801061600010601070206030707060108010616000106050704060708010616
-000106050701060207020604080106ff06be020201030202060300010601070906060801
-061600010600070006000703060007020600070406010801061600010608070006010700
-060107000602080100010602070006040700060407000602080100010602070006010700
-060107000608080106160001060107020604070506020801061600010606070306070801
-06160001060907020605080106ff06be0202010302020603000106010709060608010616
-000106000700060007030600070206000704060108010616000106050700060107000601
-070006010700060208010001060207000604070006010700060107000602080100010602
-070006010700060107000601070006050801061600010601070206050703060308010616
-0001060707020607080106160001060807020606080106ff06be02020103020206030001
-0601070d0602080106160001060007000600070706000704060108010616000106050700
-060107000601070006010700060208010001060207000604070006010700060107000602
-080100010602070006010700060107000601070006050801061600010601070306050701
-0604080106160001060707020607080106160001060707020607080106ff06be02020103
-020206030001060107030607070006030801061600010600070006000704060107000600
-070406010801061600010602070006010700060107000601070006010700060208010001
-060207000601070006010700060107000601070006020801000106020700060107000601
-07000601070006010700060208010616000106020703060b080106160001060707020607
-080106160001060707020607080106ff06be020201030202060300010601070206070700
-060408010616000106000706060107060601080106160001060207000601070006010700
-060107000601070006020801000106020700060107000601070006010700060107000602
-080100010602070006010700060107000601070006010700060208010616000106020709
-06050801061600010607070206070801061600010612080106ff06be0202010302020603
-000106010701060707000605080106160001060007000600070206050700060007020601
-080106160001060207000601070006010700060107000601070006020801000106020700
-060107000601070006010700060107000602080100010602070006010700060107000601
-070006010700060208010616000106030707060608010616000106060704060608010616
-0001060707020607080106ff06be02020103020206030001060107090606080106160001
-060007000600070206050700060007020601080106160001060207000601070006010700
-060107000601070006020801000106020700060107000601070006010700060107000602
-080100010602070006010700060107000601070006010700060208010616000106050704
-0607080106160001060507060605080106160001060707020607080106ff06be02020103
-020206030001061208010616000106000704060507040601080106160001061208010001
-0612080100010612080106160001061208010616000106120801061600010612080106ff
-06be02020103020206030001061208010616000106120801061600010612080100010612
-080100010612080106160001061208010616000106120801061600010612080106ff06be
-020201030202060300010612080106160001061208010616000106120801000106120801
-00010612080106160001061208010616000106120801061600010612080106ff06be0202
-010302020603000108140616000108140616000108140001081400010814061600010814
-06160001081406160001081406ff06be0202010302020603000008150616000008150616
-00000815000008150000081506160000081506160000081506160000081506ff06be0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed020201030202060301ff01ff01e5
-06030202010302020603010000ff00ff00cf010000120100060302020103020206030100
-00ff00ff00cf010000110800010006030202010302020603010000ff00ff00cf01000001
-060e0801010006030202010302020603010000ff00ff00cf01000001060e080101000603
-0202010302020603010000ff00ff00cf01000001060e0801010006030202010302020603
-010000ff00ff00cf01000001060e0801010006030202010302020603010000ff00ff00cf
-01000001060e0801010006030202010302020603010000ff00ff00cf01000001060e0801
-010006030202010302020603010000ff00ff00cf01000001060e08010100060302020103
-02020603010000ff00ff00cf010000010601010a06010801010006030202010302020603
-010000ff00ff00cf010000010602010806020801010006030202010302020603010000ff
-00ff00cf010000010603010606030801010006030202010302020603010000ff00ff00cf
-010000010604010406040801010006030202010302020603010000ff00ff00cf01000001
-0605010206050801010006030202010302020603010000ff00ff00cf0100000106060100
-06060801010006030202010302020603010000ff00ff00cf01000001060e080101000603
-0202010302020603010000ff00ff00cf01000001060e0801010006030202010302020603
-010000ff00ff00cf01000001060e0801010006030202010302020603010000ff00ff00cf
-01000001060e0801010006030202010302020603010000ff00ff00cf01000001060e0801
-010006030202010302020603010000ff00ff00cf01000001060e08010100060302020103
-02020603010000ff00ff00cf01000001060e0801010006030202010302020603010000ff
-00ff00cf010000010810010006030202010302020603010000ff00ff00cf010000000811
-01000603020201030202060301ff01ff01e5060302020103020206ff06ff06ed02020103
-020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed02020103
-020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed02020103
-020206ff06ff06ed020201030202060301ff01ff01e506030202010302020603010006ff
-06ff06970100064a01000603020201030202060301000663010506ff06ff062d0100064a
-01000603020201030202060301000662010706ff06ff062c0100064a0100060302020103
-020206030100066101020603010206ff06ff062b0100064a010006030202010302020603
-0100066101010605010106ff06ff062b0100064a01000603020201030202060301000661
-01020603010206ff06ff062b0100064a01000603020201030202060301000662010706ff
-06ff062c0100064a01000603020201030202060301000663010506ff06ff062d0100064a
-01000603020201030202060301000665010106ff06ff062f0100064a0100060302020103
-0202060301000665010106ff06ff062f0100064a01000603020201030202060301000665
-010106ff06ff062f0100064a01000603020201030202060301000665010106ff06ff062f
-0100064a01000603020201030202060301000665010106ff06ff062f0100064a01000603
-020201030202060301000665010106ff06ff062f0100064a010006030202010302020603
-0100066101010600010206ff06ff062f0100064a01000603020201030202060301000661
-01010600010206ff06ff062f0100064a01000603020201030202060301000661010506ff
-06ff062f0100064a01000603020201030202060301000661010506ff06ff062f0100064a
-0100060302020103020206030100066101020600010106ff06ff062f0100064a01000603
-0202010302020603010006ff06ff06970100064a01000603020201030202060301ff01ff
-0199064a0100060302020103020206030100063500610b04005f0b04005f0b04005f0b04
-005f0b04005f0b0400010100060c0812062a010006030202010302020603010006350060
-08000b030100005e08000b030100005e08000b030100005e08000b030100005e08000b03
-0100005e08000b03010000010100060c08110000062a0100060302020103020206030100
-06350001065d08010b0101020001065b08010b0101020001065b08010b0101020001065b
-08010b0101020001065b08010b0101020001065b08010b01010200010100060c08010010
-062a010006030202010302020603010006350001062c0100062f08010b0101020001062a
-0102062d08010b0101020001062a0102062d08010b0101020001062c0100062d08010b01
-0102000106290104062c08010b0101020001062b0102062c08010b01010200010100060c
-0801000d08000001062a010006030202010302020603010006350001062a0102062f0801
-0b01010200010629010006020100062c08010b01010200010629010006020100062c0801
-0b0101020001062b0101062d08010b010102000106290100063008010b0101020001062a
-0100062f08010b01010200010100060c08010001060a08010001062a0100060302020103
-02020603010006350001062c0100062f08010b01010200010629010006020100062c0801
-0b0101020001062d0100062c08010b0101020001062a010006000100062d08010b010102
-000106290100063008010b010102000106290100063008010b01010200010100060c0801
-0001060a08010001062a010006030202010302020603010006350001062c0100062f0801
-0b01010200010629010006020100062c08010b0101020001062d0100062c08010b010102
-0001062a010006000100062d08010b010102000106290100063008010b01010200010629
-0100063008010b01010200010100060c08010001060a08010001062a0100060302020103
-02020603010006350001062c0100062f08010b0101020001062c0100062d08010b010102
-0001062b0101062d08010b01010200010629010006010100062d08010b01010200010629
-0103062d08010b010102000106290103062d08010b01010200010100060c08010001060a
-08010001062a010006030202010302020603010006350001062c0100062f08010b010102
-0001062b0100062e08010b0101020001062d0100062c08010b0101020001062801000602
-0100062d08010b0101020001062d0100062c08010b01010200010629010006020100062c
-08010b01010200010100060c08010001060a08010001062a010006030202010302020603
-010006350001062c0100062f08010b0101020001062a0100062f08010b0101020001062d
-0100062c08010b010102000106280105062c08010b0101020001062d0100062c08010b01
-010200010629010006020100062c08010b01010200010100060c08010001060a08010001
-062a010006030202010302020603010006350001062c0100062f08010b01010200010629
-010006020100062c08010b01010200010629010006020100062c08010b0101020001062c
-0100062d08010b01010200010628010006030100062c08010b0101020001062901000602
-0100062c08010b01010200010100060c08010001060a08010001062a0100060302020103
-02020603010006350001062a0104062d08010b010102000106290104062c08010b010102
-0001062a0102062d08010b0101020001062b0102062c08010b010102000106290103062d
-08010b0101020001062a0102062d08010b01010200010100060c08010001060a08010001
-062a010006030202010302020603010006350001065d08010b0101020001065b08010b01
-01020001065b08010b0101020001065b08010b0101020001065b08010b0101020001065b
-08010b01010200010100060c08010001060a08010001062a010006030202010302020603
-010006350001065d08010b0101020001065b08010b0101020001065b08010b0101020001
-065b08010b0101020001065b08010b0101020001065b08010b01010200010100060c0801
-0001060a08010001062a010006030202010302020603010006350001065d08010b010102
-0001065b08010b0101020001065b08010b0101020001065b08010b0101020001065b0801
-0b0101020001065b08010b0101020001010006070100060308010001060a08010001062a
-010006030202010302020603010006350001065d08010b0101020001065b08010b010102
-0001065b08010b0101020001065b08010b0101020001065b08010b0101020001065b0801
-0b0101020001010006060101060308010001060a08010001062a01000603020201030202
-0603010006350001065d08010b0101020001065b08010b0101020001065b08010b010102
-0001065b08010b0101020001065b08010b0101020001065b08010b010102000101000605
-010006000100060308010001080c0001062a010006030202010302020603010006350001
-065d08010b0101020001065b08010b0101020001065b08010b0101020001065b08010b01
-01020001065b08010b0101020001065b08010b010102000101000607010006030801000d
-08000001062a010006030202010302020603010006350001085f0b0101020001085d0b01
-01020001085d0b0101020001085d0b0101020001085d0b0101020001085d0b0101020001
-010006070100060308010001060a08010001062a01000603020201030202060301000635
-000008600b0001030000085e0b0001030000085e0b0001030000085e0b0001030000085e
-0b0001030000085e0b00010300000800010006070100060308010001060a08010001062a
-010006030202010302020603010009360063010000630100006301000063010000630100
-006301000002010006070100060308010001060a08010001062a01000603020201030202
-0603010009350c0000630100006301000063010000630100006301000063010000020100
-06070100060308010001060a08010001062a010006030202010302020603010009010532
-0c0100630100006301000063010000630100006301000063010000020100060501040601
-08010001060a08010001062a0100060302020103020206030100090105320c0100630100
-006301000063010000630100006301000063010000020100060c08010001060a08010001
-062a010006030202010302020603010009010517010005190c0100630100006301000063
-010000630100006301000063010000020100060c08010001060a08010001062a01000603
-0202010302020603010009010515010205190c01001601020003010200420100000e0100
-00230100000b010200030102001801000063010000630100006301000063010000020100
-060c08010001060a08010001062a01000603020201030202060301000901051701000519
-0c01001801000005010000420100000e010000230100000d010000050100001801000063
-010000630100006301000063010000020100060c08010001060a08010001062a01000603
-0202010302020603010009010517010005190c01000f0102000501000005010000030102
-003b0100000e010000000101000301020002010000000101000201000000010100030102
-000201040001010000020100000401000005010000180100006301000063010000630100
-0063010000020100060c08010001060a08010001062a0100060302020103020206030100
-09010517010005190c01000e01000002010000040100000501000002010000020100003a
-0100000e0101000101000001010000020100000101010001010000010101000101000001
-010000020100000301000003010000020100000401000005010000180100006301000063
-0100006301000063010000020100060c08010001060a08010001062a0100060302020103
-02020603010009010517010005190c01000e010000020100000401000005010000020100
-00020100003a0100000e0100000201000001010000020100000101000005010000020100
-000101000007010000030100000201000004010000050100001801000063010000630100
-006301000063010000020100060c08010001060a08010001062a01000603020201030202
-0603010009010517010005190c01000e010000020100000401000005010000020104003a
-0100000e0100000201000001010000020100000101000005010000020100000201020004
-010000030100000201000004010000050100001801000063010000630100006301000063
-010000020100060c08010001080c0001062a010006030202010302020603010009010517
-010005190c01000e010000020100000401000005010000020100003e0100000e01000002
-010000010100000201000001010000050100000201000005010000030100000301000002
-01000004010000050100001801000063010000630100006301000063010000020100060c
-08010000080d0001062a010006030202010302020603010009010515010405170c01000e
-01000002010000040100000501000002010000020100003a0100000e0100000201000001
-010000020100000101000005010000020100000101000002010000030100000301000001
-01010004010000050100001801000063010000630100006301000063010000020100060c
-08010a0e0001062a0100060302020103020206030100090105320c01000f010200050100
-0005010000030102003b0100000e01000002010000020102000201000005010000020100
-000201020005010100020101000001000004010000050100001801000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-090105320c0100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a0100060302020103020206030100090105320c010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-0103020206030100090105320c0100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105320c01
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a0100060302020103020206030100090105320c010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010009010c3400630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a010006030202010302020603010009000c3501ff01ff0161060c0801
-0a0e0001062a010006030202010302020603010009360063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010009350c0000630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a0100060302020103020206030100090105320c010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-0103020206030100090105320c0100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105160102
-05180c0100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a01000603020201030202060301000901051501000502010005170c010026
-01000003010200030102002d010000160102004901000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105150100
-0502010005170c01002d010000050100002d010000180100004901000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-0901051501000502010005170c01000f0101000001000001010000020100000101000000
-01010003010200050100000501000003010200260100000f010200050100000201000002
-010000020102000301020003010200020100000001010026010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000901
-0518010005180c01000e0100000101010001010000020100000101010001010000040100
-0005010000050100000201000002010000250100000e0100000201000004010000020100
-000201000001010000020100000101000002010000010100000201000001010100010100
-002501000063010000630100006301000063010000020100060c08010a0e0001062a0100
-06030202010302020603010009010517010005190c01000e010000020100000101000002
-010000010100000201000004010000050100000501000006010000250100000e01000008
-010000020100000201000001010000050100000501000002010000010100000201000025
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-02020103020206030100090105160100051a0c01000e0100000201000001010000020100
-00010100000201000004010000050100000501000003010300250100000f010200050100
-000201000002010000020102000301020002010400010100000201000025010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000901051501000502010005170c01000e01000002010000010100000201000001
-010000020100000401000005010000050100000201000002010000250100001201000004
-010000020100000201000005010000050100000101000005010000020100002501000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-02020603010009010515010405170c01000e010000010101000101000001010100010100
-00020100000401000005010000050100000201000002010000250100000e010000020100
-000401000002010000010101000101000002010000010100000201000001010000020100
-0001010000020100002501000063010000630100006301000063010000020100060c0801
-0a0e0001062a0100060302020103020206030100090105320c01000f0101000001000002
-01010000010000010100000201000004010000050100000501000003010300250100000f
-010200050100000301010000010000020102000301020003010200020100000201000025
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-02020103020206030100090105320c0100120100004f0100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-090105320c01000e010000020100004f0100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105320c01
-000f010200500100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a0100060302020103020206030100090105320c0100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100090105320c01006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a010006030202010302020603010009010c3400630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-06030202010302020603010009000c3501ff01ff0161060c08010a0e0001062a01000603
-020201030202060301000936006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a010006030202010302020603010009350c0000630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100090105320c01006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000901
-05320c0100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010009010516010205180c01006301000063
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-020201030202060301000901051501000502010005170c0100630100000e010000530100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010009010519010005170c0100630100000e010000530100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010009010519010005170c01000f01020002010000000101000201000000010100030102
-003b0100000e010000000101000201000000010100030102000201010000010000020101
-0000010000030102002d01000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010009010517010105180c01000e01000002
-0100000101010001010000010101000101000001010000020100003a0100000e01010001
-010000010101000101000001010000020100000101000000010000000100000101000000
-0100000001000001010000020100002c0100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010009010519010005170c01
-001201000001010000020100000101000002010000050100003a0100000e010000020100
-000101000005010000020100000101000000010000000100000101000000010000000100
-00050100002c01000063010000630100006301000063010000020100060c08010a0e0001
-062a010006030202010302020603010009010519010005170c01000f0103000101000002
-0100000101000002010000020103003a0100000e01000002010000010100000501000002
-010000010100000001000000010000010100000001000000010000020103002c01000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-0202060301000901051501000502010005170c01000e0100000201000001010000020100
-00010100000201000001010000020100003a0100000e0100000201000001010000050100
-000201000001010000000100000001000001010000000100000001000001010000020100
-002c01000063010000630100006301000063010000020100060c08010a0e0001062a0100
-06030202010302020603010009010516010205180c01000e010000020100000101000002
-010000010100000201000001010000020100003a0100000e010100010100000101000005
-010000020100000101000000010000000100000101000000010000000100000101000002
-0100002c01000063010000630100006301000063010000020100060c08010a0e0001062a
-0100060302020103020206030100090105320c01000f0103000101000002010000010100
-0002010000020103003a0100000e01000000010100020100000601020002010000000100
-0000010000010100000001000000010000020103002c0100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010009010532
-0c0100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100090105320c01006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-06030100090105320c010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a0100060302020103020206030100090105320c0100630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100090105320c01006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000901
-0c3400630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a010006030202010302020603010009000c3501ff01ff0161060c08010a0e0001
-062a01000603020201030202060301000936006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000935
-0c0000630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100090105320c01006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-06030100090105320c010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010009010518010005180c01
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a010006030202010302020603010009010517010105180c0100170100000601000042
-010000150100001c0100000b010200030102001801000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105160100
-0500010005180c0100170100004a010000150100001c0100000d01000005010000180100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-01030202060301000901051601000500010005180c01000f010200020104000201020002
-0100000001010003010200340100000f0102000201000001010000030102000201000000
-010100030102000201040001010000020100000401000005010000180100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-01000901051501000501010005180c01000e010000020100000301000006010000020101
-00010100000101000002010000330100000e010000020100000101000000010000030100
-000201000001010100010100000101000002010000030100000301000002010000040100
-00050100001801000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000901051401000502010005180c01000e01000007
-01000006010000020100000201000005010000330100000e010000050101000801000001
-010000020100000101000007010000030100000201000004010000050100001801000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-02020603010009010514010505170c01000f010200040100000601000002010000020100
-0002010300330100000f0102000201010005010300010100000201000002010200040100
-000301000002010000040100000501000018010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000901051801000518
-0c0100120100000301000006010000020100000201000001010000020100003301000012
-010000010100000001000003010000020100000101000002010000050100000301000003
-010000020100000401000005010000180100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010009010517010205170c01
-000e01000002010000030100000601000002010000020100000101000002010000330100
-000e01000002010000010100000101000002010000020100000101000002010000010100
-000201000003010000030100000101010004010000050100001801000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-090105320c01000f0102000501010004010000020100000201000002010300330100000f
-010200020100000201000002010300010100000201000002010200050101000201010000
-01000004010000050100001801000063010000630100006301000063010000020100060c
-08010a0e0001062a0100060302020103020206030100090105320c010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-0103020206030100090105320c0100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105320c01
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a0100060302020103020206030100090105320c010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-0100090105320c0100630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a010006030202010302020603010009010c340063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010009000c3501ff01ff0161060c08010a0e0001062a0100060302020103
-020206030100093600630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a010006030202010302020603010009350c000063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-0103020206030100090105320c0100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105320c01
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a010006030202010302020603010009010515010405170c0100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100090105150100051b0c01000e0100000e010000140100002d010000320102
-002d01000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100090105150100051b0c01000e0100000e0100004301000034
-0100002d01000063010000630100006301000063010000020100060c08010a0e0001062a
-0100060302020103020206030100090105150100051b0c01000e01000001010000030102
-0002010400020102000201000000010100030102000201000000010100030102001f0100
-000e01000002010000010100000001010002010000000101000301020003010200050100
-00030102002601000063010000630100006301000063010000020100060c08010a0e0001
-062a010006030202010302020603010009010515010305180c01000e0100000001000003
-010000020100000301000003010000020100000101010001010000040100000201010001
-01000001010000020100001e0100000e0100000201000001010100010100000101010001
-010000010100000201000001010000020100000401000002010000020100002501000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-02020603010009010519010005170c01000e010100080100000301000007010000010100
-00080100000201000002010000050100001e0100000e0100000201000001010000020100
-000101000002010000010100000901000004010000060100002501000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-09010519010005170c01000e010100050103000301000004010300010100000801000002
-01000002010000020103001e0100000e0100000201000001010000020100000101000002
-010000020102000301030004010000030103002501000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105140100
-0503010005170c01000e0100000001000003010000020100000301000003010000020100
-000101000008010000020100000201000001010000020100001e0100000e010000020100
-000101000002010000010100000201000005010000010100000201000004010000020100
-00020100002501000063010000630100006301000063010000020100060c08010a0e0001
-062a010006030202010302020603010009010515010305180c01000e0100000101000002
-010000020100000301000003010000020100000101000008010000020100000201000001
-010000020100001e0100000e010000010101000101010001010000010101000101000001
-010000020100000101000002010000040100000201000002010000250100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-0100090105320c01000e0100000201000002010300040101000201030001010000080100
-000201000002010000020103001e0100000f010100000100000101000000010100020100
-000001010003010200030103000401000003010300250100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010009010532
-0c0100630100001501000005010000450100006301000063010000630100006301000002
-0100060c08010a0e0001062a0100060302020103020206030100090105320c0100630100
-0015010000050100004501000063010000630100006301000063010000020100060c0801
-0a0e0001062a0100060302020103020206030100090105320c0100630100001501000005
-0100004501000063010000630100006301000063010000020100060c08010a0e0001062a
-0100060302020103020206030100090105320c0100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-090105320c0100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a010006030202010302020603010009010c3400630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-02020603010009000c3501ff01ff0161060c08010a0e0001062a01000603020201030202
-06030100093600630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a010006030202010302020603010009350c0000630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100090105320c01006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a0100060302020103020206030100090105320c010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010009010517010205170c01006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-06030100090105160100051a0c0100110100001a010100040100002d010000160102000c
-010000020100003701000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100090105150100051b0c01002c010000350100
-0018010000100100003701000063010000630100006301000063010000020100060c0801
-0a0e0001062a0100060302020103020206030100090105150100051b0c01000f01020003
-010200030102000301020004010000040102000201000000010100030102001f0100000f
-010200050100000201000002010000020102000201000001010000340100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010009010515010305180c01001101000002010000020100000101000002010000010100
-00020100000101040004010000020101000101000001010000020100001e0100000e0100
-000201000004010000020100000201000004010000020100000001000035010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000901051501000502010005170c01001101000002010000020100000101000005
-010000020100000301000006010000020100000201000001010000020100001e01000012
-010000040100000201000002010000040100000201010036010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000901
-051501000502010005170c01001101000002010000020100000201020002010400030100
-00060100000201000002010000010104001e0100000f0103000401000003010000000100
-0005010000020101003601000063010000630100006301000063010000020100060c0801
-0a0e0001062a01000603020201030202060301000901051501000502010005170c010011
-010000020100000201000005010000010100000701000006010000020100000201000001
-010000220100000e01000002010000040100000301000000010000050100000201000000
-0100003501000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010009010516010205180c01001101000002010000020100
-000101000002010000010100000201000003010000060100000201000002010000010100
-00020100001e0100000e0100000201000004010000040100000601000002010000010100
-003401000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100090105320c01001101000003010200030102000301020004
-010000060100000201000002010000020102001f0100000f010300040100000401000006
-01000002010000020100003301000063010000630100006301000063010000020100060c
-08010a0e0001062a0100060302020103020206030100090105320c010011010000500100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100090105320c01000e01000001010000500100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100090105320c01000f01010051010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010009010532
-0c0100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100090105320c01006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-0603010009010c3400630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a010006030202010302020603010009000c3501ff01ff0161060c
-08010a0e0001062a01000603020201030202060301000936006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-0603010009350c0000630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a0100060302020103020206030100090105320c01006301000063
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-02020103020206030100090105320c010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010009010515
-010405170c0100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000901051501000502010005170c01
-0011010100130100000b01000002010000290100002c0100000b010200030102001f0100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010009010518010005180c010010010000150100000f010000290100002c
-0100000d010000050100001f01000063010000630100006301000063010000020100060c
-08010a0e0001062a010006030202010302020603010009010518010005180c0100100100
-000301000000010100030102000301010000010000010100000001010003010200020100
-0001010000260100000e0100000001010003010200020100000001010002010000000101
-0002010400010100000201000004010000050100001f0100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010009010518
-010005180c01000e01040001010100010100000101000002010000010100000101010001
-01010001010000040100000201000000010000270100000e010100010100000101000002
-010000010101000101000001010100010100000301000003010000020100000401000005
-0100001f01000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010009010518010005180c01001001000003010000050100
-00020100000101000002010000010100000801000002010100280100000e010000020100
-000101000002010000010100000501000007010000030100000201000004010000050100
-001f01000063010000630100006301000063010000020100060c08010a0e0001062a0100
-06030202010302020603010009010517010005190c010010010000030100000501040001
-01000002010000010100000801000002010100280100000e010000020100000101000002
-010000010100000501000007010000030100000201000004010000050100001f01000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-02020603010009010517010005190c010010010000030100000501000005010000020100
-0001010000080100000201000000010000270100000e0100000201000001010000020100
-00010100000501000007010000030100000201000004010000050100001f010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-0603010009010517010005190c0100100100000301000005010000020100000101000001
-01010001010000080100000201000001010000260100000e010000020100000101000002
-010000010100000501000007010000030100000101010004010000050100001f01000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100090105320c01001001000003010000060102000301010000010000010100
-00080100000201000002010000250100000e010000020100000201020002010000050100
-0008010100020101000001000004010000050100001f0100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010009010532
-0c0100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100090105320c01006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-06030100090105320c010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a0100060302020103020206030100090105320c0100630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100090105320c01006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000901
-0c3400630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a010006030202010302020603010009000c3501ff01ff0161060c08010a0e0001
-062a01000603020201030202060301000936006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000935
-0c0000630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100090105320c01006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-06030100090105320c010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010009010516010205180c01
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000901051501000502010005170c0100630100000e
-0100000f0100000b01000006010000100100001b01000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105150100
-0502010005170c0100630100000e0100001c010000180100001b01000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-0901051501000502010005170c01000e0100000001010003010200020100000001010042
-0100000e0100000101000002010000000101000301020003010200020104000201020002
-010000000101000301020002010000000101000301020002010000000101000301010000
-0100000201000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010009010516010205180c01000e01010001010000010100
-00020100000101010001010000410100000e010000000100000301010001010000040100
-000201000002010000030100000601000002010100010100000101000002010000010101
-000101000001010000020100000101010001010000010100000101010002010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000901051501000502010005170c01000e01000002010000010100000201000001
-010000450100000e01010004010000080100000201000007010000060100000201000002
-010000010100000201000001010000020100000101000002010000010100000501000002
-0100000201000063010000630100006301000063010000020100060c08010a0e0001062a
-01000603020201030202060301000901051501000502010005170c01000e010000020100
-000101040001010000450100000e01010004010000080100000301020004010000060100
-000201000002010000010104000101000002010000010104000101000005010000020100
-000201000063010000630100006301000063010000020100060c08010a0e0001062a0100
-0603020201030202060301000901051501000502010005170c01000e0100000201000001
-01000005010000450100000e010000000100000301000008010000060100000301000006
-010000020100000201000001010000050100000201000001010000050100000501000002
-0100000201000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010009010516010205180c01000e01010001010000010100
-000201000001010000450100000e01000001010000020100000801000002010000020100
-000301000006010000020100000201000001010000020100000101010001010000010100
-000201000001010000050100000101010002010000630100006301000063010000630100
-00020100060c08010a0e0001062a0100060302020103020206030100090105320c01000e
-010000000101000301020002010000450100000e01000002010000010100000801000003
-010200050101000401000002010000020100000201020002010000000101000301020002
-01000006010100000100000201000063010000630100006301000063010000020100060c
-08010a0e0001062a0100060302020103020206030100090105320c01000e010000530100
-005f0100000201000063010000630100006301000063010000020100060c08010a0e0001
-062a0100060302020103020206030100090105320c01000e010000530100005b01000002
-0100000201000063010000630100006301000063010000020100060c08010a0e0001062a
-0100060302020103020206030100090105320c01000e010000530100005c010200030100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-0103020206030100090105320c0100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105320c01
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a010006030202010302020603010009010c3400630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-09000c3501ff01ff0161060c08010a0e0001062a01000603020201030202060301000936
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a010006030202010302020603010009350c0000630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-090105320c0100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a0100060302020103020206030100090105320c010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010009010516010205180c01006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000901
-051501000502010005170c0100260100003b01000019010000170102002d010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000901051501000502010005170c01006301000019010000190100002d01000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-0202060301000901051501000502010005170c01000e0101000001000003010200020100
-00000101000301020003010200340100000f010200030101000001000002010200020100
-00000101000201000000010100050100000301020002010000000101001f010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000901051501000502010005170c01000e01000000010000000100000101000002
-0100000101010001010000040100000201000002010000330100000e0100000201000001
-010000010101000101000002010000010101000101000001010100010100000401000002
-0100000201000001010100010100001e0100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010009010516010305170c01
-000e010000000100000001000005010000010100000801000006010000330100000e0100
-000201000001010000020100000101000002010000010100000201000001010000020100
-00040100000601000001010000020100001e010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000901051901000517
-0c01000e010000000100000001000002010300010100000801000003010300330100000e
-010000020100000101000002010000010104000101000002010000010100000201000004
-0100000301030001010000020100001e0100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010009010518010005180c01
-000e01000000010000000100000101000002010000010100000801000002010000020100
-00330100000e010000020100000101000002010000010100000501000002010000010100
-000201000004010000020100000201000001010000020100001e01000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-09010515010205190c01000e010000000100000001000001010000020100000101000008
-0100000201000002010000330100000e0100000201000001010000010101000101000002
-010000010100000201000001010100010100000401000002010000020100000101000002
-0100001e01000063010000630100006301000063010000020100060c08010a0e0001062a
-0100060302020103020206030100090105320c01000e0100000001000000010000020103
-00010100000801000003010300330100000f010200030101000001000002010200020100
-00020100000101000000010100050100000301030001010000020100001e010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-06030100090105320c0100630100002a0100003701000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100090105320c01
-00630100002a0100003701000063010000630100006301000063010000020100060c0801
-0a0e0001062a0100060302020103020206030100090105320c0100630100002a01000037
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-02020103020206030100090105320c010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010009010532
-0c0100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a010006030202010302020603010009010c340063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010009000c3501ff01ff0161060c08010a0e0001062a0100060302020103020206030100
-009a0100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000035080000630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006040102061508010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010611010206030100060201000614080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-000106130100060301000602010006140801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-061301000603010006020100061408010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006030100060201000614080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000106130100
-060301000602010006140801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001061301000603
-010006020100061408010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010613010006030100
-060201000614080100630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a0100060302020103020206030100000106110104060201020615
-080100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-0632080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000108340063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a01000603020201030202060301000000083501ff01ff0161
-060c08010a0e0001062a0100060302020103020206030100009a01000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000035080000630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a0100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006050100061608010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010611010206030102
-0616080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006050100061608010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010613010006050100061608010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006050100061608010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010613010006050100061608010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006050100061608010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010613010006050100
-0616080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010611010406010104061408010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-01000001083400630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000000083501ff01ff0161060c0801
-0a0e0001062a0100060302020103020206030100009a0100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-0035080000630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001061301000604
-01020615080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001061101020603010006020100
-0614080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006030100060201000614
-080100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100000106130100060301000602010006140801
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000001061301000606010006150801006301000063
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-020201030202060301000001061301000605010006160801006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000001061301000604010006170801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-061301000603010006020100061408010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010611
-010406010104061408010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-0632080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010834006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000000
-083501ff01ff0161060c08010a0e0001062a0100060302020103020206030100009a0100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100003508000063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000001061301000604010206150801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-061101020603010006020100061408010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006070100061408010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010613010006070100
-0614080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006050101061508010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010613010006070100061408010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006070100061408010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010613010006030100060201000614080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-000106110104060201020615080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a0100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100000108340063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-01000000083501ff01ff0161060c08010a0e0001062a0100060302020103020206030100
-009a0100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000035080000630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006060100061508010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010611010206050101061508010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006040100060001000615080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000106130100
-060401000600010006150801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001061301000603
-010006010100061508010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010613010006020100
-060201000615080100630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a0100060302020103020206030100000106130100060201050614
-080100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100000106130100060601000615080100630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100000106110104060301020614080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000108340063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-01000603020201030202060301000000083501ff01ff0161060c08010a0e0001062a0100
-060302020103020206030100009a01000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000035080000630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-0632080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006030104061408010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010611010206030100061808010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006030100061808010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010613010006030100061808010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006030103061508010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010613010006070100
-0614080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006070100061408010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010613010006020100060301000614080100630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100000106110104060101030615080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000108340063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-01000603020201030202060301000000083501ff01ff0161060c08010a0e0001062a0100
-060302020103020206030100009a01000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000035080000630100
-006301000063010000630100006301000063010000020100060c08010a0e0001062a0100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-0632080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006050102061408010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010611010206040100061708010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006030100061808010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010613010006030100061808010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006030103061508010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010613010006030100
-060201000614080100630100006301000063010000630100006301000063010000020100
-060c08010a0e0001062a0100060302020103020206030100000106130100060301000602
-01000614080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001061301000603010006020100
-0614080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010611010406020102061508010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-01000001083400630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000000083501ff01ff0161060c0801
-0a0e0001062a0100060302020103020206030100009a0100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-0035080000630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001061301000603
-01040614080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001061101020603010006020100
-0614080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006060100061508010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010613010006060100061508010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006060100061508010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-010000010613010006060100061508010063010000630100006301000063010000630100
-0063010000020100060c08010a0e0001062a010006030202010302020603010000010613
-010006050100061608010063010000630100006301000063010000630100006301000002
-0100060c08010a0e0001062a010006030202010302020603010000010613010006050100
-0616080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010611010406030100061608010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100060c08010a0e0001062a0100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100060c08010a0e0001062a010006030202010302020603
-01000001083400630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000000083501ff01ff0161060c0801
-0a0e0001062a0100060302020103020206030100009a0100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-0035080000630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001061301000604
-01020615080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001061101020603010006020100
-0614080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010613010006030100060201000614
-080100630100006301000063010000630100006301000063010000020100060c08010a0e
-0001062a0100060302020103020206030100000106130100060301000602010006140801
-00630100006301000063010000630100006301000063010000020100060c08010a0e0001
-062a01000603020201030202060301000001061301000604010206150801006301000063
-01000063010000630100006301000063010000020100060c08010a0e0001062a01000603
-020201030202060301000001061301000603010006020100061408010063010000630100
-0063010000630100006301000063010000020100060c08010a0e0001062a010006030202
-010302020603010000010613010006030100060201000614080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106130100060301000602010006140801006301000063010000630100
-00630100006301000063010000020100060c08010a0e0001062a01000603020201030202
-060301000001061101040602010206150801006301000063010000630100006301000063
-01000063010000020100060c08010a0e0001062a01000603020201030202060301000001
-0632080100630100006301000063010000630100006301000063010000020100060c0801
-0a0e0001062a010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100060c08010a0e0001062a0100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100060c08010a0e0001062a01000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100060c08010a0e0001062a
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100060c08010a0e0001062a0100060302020103020206030100
-00010632080100630100006301000063010000630100006301000063010000020100060c
-08010a0e0001062a01000603020201030202060301000001083400630100006301000063
-010000630100006301000063010000020100060c08010010062a01000603020201030202
-060301ff01ff0199060c08000011062a010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-02020603010006ff06ff06e3010006030202010302020603010006ff06ff06e301000603
-020201030202060301000649010006ff06ff069801000603020201030202060301000648
-010106ff06ff06980100060302020103020206030100064701000600010006ff06ff0698
-01000603020201030202060301000649010006ff06ff0698010006030202010302020603
-01000649010006ff06ff069801000603020201030202060301000649010006ff06ff0698
-01000603020201030202060301000649010006ff06ff0698010006030202010302020603
-01000649010006ff06ff069801000603020201030202060301000647010406ff06ff0696
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-020206030100063708ff08ff0860064a0100060302020103020206030100063708ff08ff
-085f0000064a010006030202010302020603010006370801001d0aff0aff0a3e0001064a
-010006030202010302020603010006370801001c08000aff0aff0a3e0001064a01000603
-02020103020206030100063708010001060b08000000060b08010aff0aff0a3e0001064a
-0100060302020103020206030100063708010001060b08000000060b08010aff0aff0a3e
-0001064a0100060302020103020206030100063708010001060b08000000060b08010aff
-0aff0a3e0001064a0100060302020103020206030100063708010001060b08000000060b
-08010aff0aff0a3e0001064a0100060302020103020206030100063708010001060b0800
-0000060b08010aff0aff0a3e0001064a0100060302020103020206030100063708010001
-060b08000000060b08010aff0aff0a3e0001064a01000603020201030202060301000637
-08010001060b08000000060b08010aff0aff0a3e0001064a010006030202010302020603
-0100063708010001060b08000000060b08010aff0aff0a3e0001064a0100060302020103
-020206030100063708010001060b08000000060b08010aff0aff0a3e0001064a01000603
-02020103020206030100063708010001060b08000000060b08010aff0aff0a3e0001064a
-0100060302020103020206030100063708010001060b08000000060b08010aff0aff0a3e
-0001064a0100060302020103020206030100063708010001080c0000080d0aff0aff0a3e
-0001064a0100060302020103020206030100063708010000081c0aff0aff0a3e0001064a
-01000603020201030202060301000637080100ff00ff005e064a01000603020201030202
-060301000637080000ff00ff005f064a010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-02020603010006ff06ff06e3010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-02020603010006ff06ff06e3010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-02020603010006ff06ff06e3010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020101
-00040603010006ff06ff06e301000603000502020400060301ff01ff01e5060300000202
-040000000202040006ff06ff06ed00000202040000000202040006ff06ff06ed00000202
-040000000202040006ff06ff06ed00000202040000000202040006ff06ff06ed00000202
-0400000002020400000502ff02ff02e100060202040000000208040002ff02ff02e10000
-0208040000000208040002ff02ff02e100000208040000000208040001ff01ff01e10000
-020804000000040901ff01ff01e100000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 532 441
-%%EOF
diff --git a/lib/tv/doc/src/tv_table_sorted.gif b/lib/tv/doc/src/tv_table_sorted.gif
deleted file mode 100644
index fd69e3cc58..0000000000
--- a/lib/tv/doc/src/tv_table_sorted.gif
+++ /dev/null
diff --git a/lib/tv/doc/src/tv_table_sorted.ps b/lib/tv/doc/src/tv_table_sorted.ps
deleted file mode 100644
index 681b2f4d19..0000000000
--- a/lib/tv/doc/src/tv_table_sorted.ps
+++ /dev/null
@@ -1,1502 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Creator: (ImageMagick)
-%%Title: (/clearcase/otp/erts/lib/tv/doc/src/tv_table_sorted.eps)
-%%CreationDate: (Mon Mar 19 17:15:35 2001)
-%%BoundingBox: 0 0 532 441
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 1
-%%Pages: 0
-%%EndComments
-
-%%BeginDefaults
-%%PageOrientation: Portrait
-%%EndDefaults
-
-%%BeginProlog
-%
-% Display a color image.  The image is displayed in color on
-% Postscript viewers or printers that support color, otherwise
-% it is displayed as grayscale.
-%
-/buffer 512 string def
-/byte 1 string def
-/color_packet 3 string def
-/pixels 768 string def
-
-/DirectClassPacket
-{
-  %
-  % Get a DirectClass packet.
-  %
-  % Parameters:
-  %   red.
-  %   green.
-  %   blue.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/DirectClassImage
-{
-  %
-  % Display a DirectClass image.
-  %
-  systemdict /colorimage known
-  {
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { DirectClassPacket } false 3 colorimage
-  }
-  {
-    %
-    % No colorimage operator;  convert to grayscale.
-    %
-    columns rows 8
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { GrayDirectClassPacket } image
-  } ifelse
-} bind def
-
-/GrayDirectClassPacket
-{
-  %
-  % Get a DirectClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   red
-  %   green
-  %   blue
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile color_packet readhexstring pop pop
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/GrayPseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet;  convert to grayscale.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  color_packet 0 get 0.299 mul
-  color_packet 1 get 0.587 mul add
-  color_packet 2 get 0.114 mul add
-  cvi
-  /gray_packet exch def
-  compression 0 gt
-  {
-    /number_pixels 1 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add def
-  } ifelse
-  0 1 number_pixels 1 sub
-  {
-    pixels exch gray_packet put
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassPacket
-{
-  %
-  % Get a PseudoClass packet.
-  %
-  % Parameters:
-  %   index: index into the colormap.
-  %   length: number of pixels minus one of this color (optional).
-  %
-  currentfile byte readhexstring pop 0 get
-  /offset exch 3 mul def
-  /color_packet colormap offset 3 getinterval def
-  compression 0 gt
-  {
-    /number_pixels 3 def
-  }
-  {
-    currentfile byte readhexstring pop 0 get
-    /number_pixels exch 1 add 3 mul def
-  } ifelse
-  0 3 number_pixels 1 sub
-  {
-    pixels exch color_packet putinterval
-  } for
-  pixels 0 number_pixels getinterval
-} bind def
-
-/PseudoClassImage
-{
-  %
-  % Display a PseudoClass image.
-  %
-  % Parameters:
-  %   class: 0-PseudoClass or 1-Grayscale.
-  %
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  class 0 gt
-  {
-    currentfile buffer readline pop
-    token pop /depth exch def pop
-    /grays columns 8 add depth sub depth mul 8 idiv string def
-    columns rows depth
-    [
-      columns 0 0
-      rows neg 0 rows
-    ]
-    { currentfile grays readhexstring pop } image
-  }
-  {
-    %
-    % Parameters:
-    %   colors: number of colors in the colormap.
-    %   colormap: red, green, blue color packets.
-    %
-    currentfile buffer readline pop
-    token pop /colors exch def pop
-    /colors colors 3 mul def
-    /colormap colors string def
-    currentfile colormap readhexstring pop pop
-    systemdict /colorimage known
-    {
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { PseudoClassPacket } false 3 colorimage
-    }
-    {
-      %
-      % No colorimage operator;  convert to grayscale.
-      %
-      columns rows 8
-      [
-        columns 0 0
-        rows neg 0 rows
-      ]
-      { GrayPseudoClassPacket } image
-    } ifelse
-  } ifelse
-} bind def
-
-/DisplayImage
-{
-  %
-  % Display a DirectClass or PseudoClass image.
-  %
-  % Parameters:
-  %   x & y translation.
-  %   x & y scale.
-  %   label pointsize.
-  %   image label.
-  %   image columns & rows.
-  %   class: 0-DirectClass or 1-PseudoClass.
-  %   compression: 0-RunlengthEncodedCompression or 1-NoCompression.
-  %   hex color packets.
-  %
-  gsave
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  x y translate
-  currentfile buffer readline pop
-  token pop /x exch def
-  token pop /y exch def pop
-  currentfile buffer readline pop
-  token pop /pointsize exch def pop
-  /Helvetica findfont pointsize scalefont setfont
-  x y scale
-  currentfile buffer readline pop
-  token pop /columns exch def
-  token pop /rows exch def pop
-  currentfile buffer readline pop
-  token pop /class exch def pop
-  currentfile buffer readline pop
-  token pop /compression exch def pop
-  class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
-  grestore
-} bind def
-%%EndProlog
-%%Page:  1 1
-%%PageBoundingBox: 0 0 532 441
-userdict begin
-%%BeginData:
-DisplayImage
-0 0
-532.000000 441.000000
-12
-760 630
-1
-0
-0
-16
-ffffff
-000000
-d8d8d8
-c2c2c2
-6b6b6b
-ff0000
-d9d9d9
-b22222
-828282
-00ff00
-ffda00
-ffff80
-c3c3c3
-7f7f7f
-998300
-000000
-000a01ff01ff01e1000b0208040001ff01ff01e100000208040000000208040002ff02ff
-02e1000002080400000002080400020000ff00ff00de0400020000000208040000000202
-04060200000004ff04ff04de020000000405020204000000020204000209000d02ff02ff
-02d500000202040000000202040002080000020d040002a501010206010102150101021e
-0101022901010206010102430101022a010102260101023201010233010102ae00000202
-040000000202040002080000020d04000277010502000107020101030206010702090101
-02060101021501010219010002030101021c0100020b010102060101022e010202020100
-020d0101022a0101020c0104021401010232010102160100021b010102ae000002020400
-00000202040002080000020d04000277010102070101020301010201010102080101020c
-010102060101021501010218010102210101020b010102060101022e010202020100020d
-01010238010102020101024801010215010102cc00000202040000000202040002080000
-0202040602030400027701010207010102030101020c0101020401030203010102000101
-020301010202010302020101020901010202010302030103020201030201010402010101
-020201030203010102000101020a01040201010302030101020001010203010102020103
-022701000200010102010100020201030203010402020103020201010209010102000101
-020101010203010302030101020201010200010102020101020101030202010402020101
-020101010202010102020101020001010203010102000101020301030203010402020104
-020501040202010102010101020501030201010402000101020101010204010302020101
-020001010201010102020103020201040202010402020103020301010200010102060104
-020201030274000002020400000004030208000002020400030400000203040002770101
-0207010102030102020b0101020301010201010102020102020001010202010102010101
-020101010201010102090101020101010201010102010101020101010200010102010101
-020101010203010102010101020101010202010202000101020a01010202010102010101
-020201020200010102020101020101010201010102260100020001010201010002010101
-020101010201010102010101020101010201010102010101020901020200010202000101
-020101010201010102020101020201020200010102010101020001010200010102010101
-020101010202010102010101020201010202010202000101020201020200010102010101
-020101010201010102050101020801010201010102020101020101010204010102010101
-020101010202010102010101020301010201010102010101020001010201010102010101
-020101010200010102050101020501010201010102020102020001010204010102050101
-020101010273000004030101020b00000203040003020000020404000277010402040101
-0204010302090101020701010202010102010101020201010201010102010101020d0101
-020101010201010102010101020801010201010102030101020101010201010102020101
-02010101020a010102060101020201010201010102020101020101010201010102260100
-0200010202000100020101010201010102010101020101010201010102010101020d0101
-020101010201010102050101020201010202010102010101020101010200010102000101
-020101010201010102020101020101010202010102020101020101010202010102010101
-020101010201010102010102020401020207010102010101020201010201010102040101
-020101010201010102030101020001000204010102010101020101020203010102010101
-020401020204010202040101020101010202010102010101020401020204010102010101
-02760103020b000002030400030200000204040002770101020701010206010202080101
-0204010402020101020101010202010102010105020d0101020101010201010102010101
-02050104020101010203010102010101020101010202010102010101020a010102030104
-020201010201010102020101020101050226010002010101020001000201010102010101
-020101010201010102010105020d01010201010102010101020201040202010102020101
-020101010201010102000101020001010201010102010101020201010201010102020101
-020201010201010102020101020101010201010502020103020301030205010102010101
-020201010201010102040105020101010204010102050105020101010204010102010101
-020501030203010302020101020101010202010102010101020501030202010502760103
-020b00000204040003000000020504000277010102070101020701010208010102030101
-020101010202010102010101020201010201010102110101020101010201010102010101
-0204010102010101020101010203010102010101020101010202010102010101020a0101
-020201010201010102020101020101010202010102010101022a01000202010202010101
-020101010201010102010101020101010211010102010101020101010201010102010101
-020201010202010102010101020101010201010102000101020001010200010202020101
-020101010202010102020101020101010202010102010101020101010208010202040102
-020401010201010102020101020101010204010102050101020301000200010102040101
-020501010204010102010101020701020204010202010101020101010202010102010101
-0207010202010101027a0103020b00000204040003000000020504000277010102070101
-020301010201010102080101020301010201010102020101020101010202010102010101
-020201000201010102090101020101010201010102010101020201000200010102010101
-020101010203010102010101020101010202010102010101020a01010202010102010101
-020201010201010102020101020101010202010002260100020201020201010102010101
-020101010200010202010101020201000201010102090101020101010201010102010101
-020101010202010102020101020101010202010102070101020001010202010102000102
-020201010202010102010101020201010201010102010101020201000205010102050101
-020101010200010102000102020201010200010202010101020001010202010002010101
-020201010201010102000101020001010202010002010101020401010201010102020100
-020401010205010102010101020101010202010102010101020101010204010102010101
-0202010002760103020b0000020500000206040002770105020301010204010302090101
-020401020200010102010104020301010202010302020101020901010202010302030103
-02020102020001010201010202010101020201030203010102010101020b010202010102
-020001010201010402030101020201030227010002030101020201030203010102000101
-020201030202010102090101020101010201010102020102020001010201010102020101
-020101010203010502050101020301010200010102020101020201010201010102020101
-020101010202010302020104020201040202010102010101020001010203010102000101
-020101010201010302030102020001010201010102000101020101030202010102040101
-020201030201010402020104020301030203010102010101020101010200010402030103
-02770103020b0000020d040002fc010602a201010201010102ff022a0103020b0000020d
-040002ff02a7010302ff022b0103020b0000020d040002ff02ff02d70103020c040d02ff
-02ff02d8010302ff02ff02f3010302ff02ff02f30103020200ff00ff00ec040002020103
-0202000004ff04ff04ec0202010302ff02ff02f30103020200ff00ff00ed020201030202
-00ff00ff00ec0800020201030202000106ff06ff06e90801020201030202000106ff06ff
-06e90801020201030202000106ff06ff06e90801020201030202000106ff06ff06e90801
-020201030202000106ff06ff06e908010202010302020001060b07040604070006030702
-061f07040610070206200702060b070006060700062d0700060207000604070006ff06fa
-07000602070006090702061308010202010302020001060b0700060f0700062107000614
-0700061f070006020700060a0700063507000602070006ff06ff0600070006020700060b
-0700061308010202010302020001060b0700060607020605070006030702061a07000604
-070206030702060507000603070206180700060207000601070006000701060207040602
-070206030702060207000600070106030702061807000602070006020702060307020602
-07000602070006ff06eb07000602070006020702060507000602070006000701060c0801
-0202010302020001060b0700060807000605070006020700060207000619070006030700
-060207000601070006020700060407000602070006020700061707000602070006010701
-060107000603070006060700060207000602070006010701060107000601070006020700
-0618070006000700060507000602070006020700060107000602070006ff06eb07000602
-07000601070006020700060407000602070106010700060b08010202010302020001060b
-070306050700060507000602070006020700061907000603070006020700060107000602
-07000604070006020700061b070006020700060107000602070006030700060607000602
-070006020700060107000602070006010700061c07000600070006050700060207000602
-070006010700060007000600070006ff06eb070406010700060207000604070006020700
-06020700060b08010202010302020001060b070006080700060507000602070406190700
-060307000602070006010700060207000604070006030702061807000602070006010700
-060207000603070006060700060207000602070006010700060207000602070206190700
-06000700060507000602070406010700060007000600070006ff06eb0700060207000601
-0704060407000602070006020700060b08010202010302020001060b0700060807000605
-070006020700061d07000603070006020700060107000602070006040700060607000617
-070006020700060107000602070006030700060607000602070006020700060107000602
-07000605070006190700060607000602070006050700060007000600070006ff06eb0700
-0602070006010700060807000602070006020700060b08010202010302020001060b0700
-060807000605070006020700060207000619070006030700060207000601070006020700
-060407000602070006020700061707000602070006010701060107000603070006060700
-060207000602070006010700060207000601070006020700061907000606070006020700
-0602070006010700060007000600070006ff06eb07000602070006010700060207000604
-07000602070106010700060b08010202010302020001060b070006080700060507000603
-0702061a0700060407020603070206050700060307020619070206020700060007010605
-07010604070006030702060207000602070006020702061a070006060700060307020603
-07000600070006ff06ec07000602070006020702060507000602070006000701060c0801
-0202010302020001067d070006ff06ff06590700060f08010202010302020001060a0706
-062a07060631070606000700063d070606ff06fe0706060e0700060f0801020201030202
-0001060a0706062a07060631070606000700063d070606ff06fe0706060e0700060f0801
-020201030202000106ff06ff06e90801020201030202000106ff06ff06e9080102020103
-0202000106ff06ff06e90801020201030202000108ff08ff08eb020201030202000008ff
-08ff08ec02020103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff
-06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff
-06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202010302020603
-0016061600160616004406160016061600160616001606ff06be02020103020206030015
-080006160015080006160015080000150800001508000616001508000616001508000616
-0015080006ff06be02020103020206030001061208010616000106120801061600010612
-080100010612080100010612080106160001061208010616000106120801061600010612
-080106ff06be020201030202060300010612080106160001061208010616000106120801
-000106120801000106120801061600010612080106160001061208010616000106120801
-06ff06be0202010302020603000106120801061600010603070206030702060408010616
-000106120801000106120801000106120801061600010612080106160001061208010616
-00010612080106ff06be0202010302020603000106080702060608010616000106030702
-060307020604080106160001061208010001061208010001061208010616000106050704
-0607080106160001060707010608080106160001060707030606080106ff06be02020103
-020206030001060b0701060408010616000106020704060107040603080106160001060e
-0700060208010001060e070006020801000106020700060e080106160001060307080605
-080106160001060607030607080106160001060507070604080106ff06be020201030202
-06030001060d070006000700060108010616000106020700060107010601070006010701
-0603080106160001060e0700060208010001060e070006020801000106020700060e0801
-061600010602070a06040801061600010606070306070801061600010604070306010703
-0603080106ff06be02020103020206030001060207020608070106010801061600010601
-070d0602080106160001060b07000601070006020801000106020700060a070006020801
-00010602070006010700060b080106160001060207030602070306040801061600010607
-0701060808010616000106040702060307020603080106ff06be02020103020206030001
-060107080602070206010801061600010600070006000703060007020600070406010801
-06160001060b07000601070006020801000106020700060a070006020801000106020700
-06010700060b080106160001060107030604070306030801061600010612080106160001
-06040702060307020603080106ff06be0202010302020603000106010709060608010616
-000106000700060007030600070206000704060108010616000106080700060107000601
-070006020801000106020700060407000604070006020801000106020700060107000601
-070006080801061600010601070206030707060108010616000106050704060708010616
-000106050701060207020604080106ff06be020201030202060300010601070906060801
-061600010600070006000703060007020600070406010801061600010608070006010700
-060107000602080100010602070006040700060407000602080100010602070006010700
-060107000608080106160001060107020604070506020801061600010606070306070801
-06160001060907020605080106ff06be0202010302020603000106010709060608010616
-000106000700060007030600070206000704060108010616000106050700060107000601
-070006010700060208010001060207000604070006010700060107000602080100010602
-070006010700060107000601070006050801061600010601070206050703060308010616
-0001060707020607080106160001060807020606080106ff06be02020103020206030001
-0601070d0602080106160001060007000600070706000704060108010616000106050700
-060107000601070006010700060208010001060207000604070006010700060107000602
-080100010602070006010700060107000601070006050801061600010601070306050701
-0604080106160001060707020607080106160001060707020607080106ff06be02020103
-020206030001060107030607070006030801061600010600070006000704060107000600
-070406010801061600010602070006010700060107000601070006010700060208010001
-060207000601070006010700060107000601070006020801000106020700060107000601
-07000601070006010700060208010616000106020703060b080106160001060707020607
-080106160001060707020607080106ff06be020201030202060300010601070206070700
-060408010616000106000706060107060601080106160001060207000601070006010700
-060107000601070006020801000106020700060107000601070006010700060107000602
-080100010602070006010700060107000601070006010700060208010616000106020709
-06050801061600010607070206070801061600010612080106ff06be0202010302020603
-000106010701060707000605080106160001060007000600070206050700060007020601
-080106160001060207000601070006010700060107000601070006020801000106020700
-060107000601070006010700060107000602080100010602070006010700060107000601
-070006010700060208010616000106030707060608010616000106060704060608010616
-0001060707020607080106ff06be02020103020206030001060107090606080106160001
-060007000600070206050700060007020601080106160001060207000601070006010700
-060107000601070006020801000106020700060107000601070006010700060107000602
-080100010602070006010700060107000601070006010700060208010616000106050704
-0607080106160001060507060605080106160001060707020607080106ff06be02020103
-020206030001061208010616000106000704060507040601080106160001061208010001
-0612080100010612080106160001061208010616000106120801061600010612080106ff
-06be02020103020206030001061208010616000106120801061600010612080100010612
-080100010612080106160001061208010616000106120801061600010612080106ff06be
-020201030202060300010612080106160001061208010616000106120801000106120801
-00010612080106160001061208010616000106120801061600010612080106ff06be0202
-010302020603000108140616000108140616000108140001081400010814061600010814
-06160001081406160001081406ff06be0202010302020603000008150616000008150616
-00000815000008150000081506160000081506160000081506160000081506ff06be0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed0202
-0103020206ff06ff06ed02020103020206ff06ff06ed020201030202060301ff01ff01e5
-06030202010302020603010000ff00ff00cf010000120100060302020103020206030100
-00ff00ff00cf010000110800010006030202010302020603010000ff00ff00cf01000001
-060e0801010006030202010302020603010000ff00ff00cf01000001060e080101000603
-0202010302020603010000ff00ff00cf01000001060e0801010006030202010302020603
-010000ff00ff00cf01000001060e0801010006030202010302020603010000ff00ff00cf
-01000001060e0801010006030202010302020603010000ff00ff00cf01000001060e0801
-010006030202010302020603010000ff00ff00cf01000001060e08010100060302020103
-02020603010000ff00ff00cf010000010601010a06010801010006030202010302020603
-010000ff00ff00cf010000010602010806020801010006030202010302020603010000ff
-00ff00cf010000010603010606030801010006030202010302020603010000ff00ff00cf
-010000010604010406040801010006030202010302020603010000ff00ff00cf01000001
-0605010206050801010006030202010302020603010000ff00ff00cf0100000106060100
-06060801010006030202010302020603010000ff00ff00cf01000001060e080101000603
-0202010302020603010000ff00ff00cf01000001060e0801010006030202010302020603
-010000ff00ff00cf01000001060e0801010006030202010302020603010000ff00ff00cf
-01000001060e0801010006030202010302020603010000ff00ff00cf01000001060e0801
-010006030202010302020603010000ff00ff00cf01000001060e08010100060302020103
-02020603010000ff00ff00cf01000001060e0801010006030202010302020603010000ff
-00ff00cf010000010810010006030202010302020603010000ff00ff00cf010000000811
-01000603020201030202060301ff01ff01e5060302020103020206ff06ff06ed02020103
-020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed02020103
-020206ff06ff06ed02020103020206ff06ff06ed02020103020206ff06ff06ed02020103
-020206ff06ff06ed020201030202060301ff01ff01e506030202010302020603010006ff
-06ff06970100064a01000603020201030202060301000663010506ff06ff062d0100064a
-01000603020201030202060301000662010706ff06ff062c0100064a0100060302020103
-020206030100066101020603010206ff06ff062b0100064a010006030202010302020603
-0100066101010605010106ff06ff062b0100064a01000603020201030202060301000661
-01020603010206ff06ff062b0100064a01000603020201030202060301000662010706ff
-06ff062c0100064a01000603020201030202060301000663010506ff06ff062d0100064a
-01000603020201030202060301000665010106ff06ff062f0100064a0100060302020103
-0202060301000665010106ff06ff062f0100064a01000603020201030202060301000665
-010106ff06ff062f0100064a01000603020201030202060301000665010106ff06ff062f
-0100064a01000603020201030202060301000665010106ff06ff062f0100064a01000603
-020201030202060301000665010106ff06ff062f0100064a010006030202010302020603
-0100066101010600010206ff06ff062f0100064a01000603020201030202060301000661
-01010600010206ff06ff062f0100064a01000603020201030202060301000661010506ff
-06ff062f0100064a01000603020201030202060301000661010506ff06ff062f0100064a
-0100060302020103020206030100066101020600010106ff06ff062f0100064a01000603
-0202010302020603010006ff06ff06970100064a01000603020201030202060301ff01ff
-0199064a010006030202010302020603010006350b610d04005f0d04005f0d04005f0d04
-005f0d04005f0d0400010100061308120623010006030202010302020603010006350b60
-0e000d030100005e08000d030100005e08000d030100005e08000d030100005e08000d03
-0100005e08000d0301000001010006130811000006230100060302020103020206030100
-06350b010a5d0e010d0101020001065b08010d0101020001065b08010d0101020001065b
-08010d0101020001065b08010d0101020001065b08010d01010200010100061308010010
-0623010006030202010302020603010006350b010a2c01000a2f0e010d0101020001062a
-0102062d08010d0101020001062a0102062d08010d0101020001062c0100062d08010d01
-0102000106290104062c08010d0101020001062b0102062c08010d010102000101000613
-0801000d080000010623010006030202010302020603010006350b010a2a01020a2f0e01
-0d01010200010629010006020100062c08010d01010200010629010006020100062c0801
-0d0101020001062b0101062d08010d010102000106290100063008010d0101020001062a
-0100062f08010d01010200010100061308010001060a0801000106230100060302020103
-02020603010006350b010a2c01000a2f0e010d01010200010629010006020100062c0801
-0d0101020001062d0100062c08010d0101020001062a010006000100062d08010d010102
-000106290100063008010d010102000106290100063008010d0101020001010006130801
-0001060a080100010623010006030202010302020603010006350b010a2c01000a2f0e01
-0d01010200010629010006020100062c08010d0101020001062d0100062c08010d010102
-0001062a010006000100062d08010d010102000106290100063008010d01010200010629
-0100063008010d01010200010100061308010001060a0801000106230100060302020103
-02020603010006350b010a2c01000a2f0e010d0101020001062c0100062d08010d010102
-0001062b0101062d08010d01010200010629010006010100062d08010d01010200010629
-0103062d08010d010102000106290103062d08010d01010200010100061308010001060a
-080100010623010006030202010302020603010006350b010a2c01000a2f0e010d010102
-0001062b0100062e08010d0101020001062d0100062c08010d0101020001062801000602
-0100062d08010d0101020001062d0100062c08010d01010200010629010006020100062c
-08010d01010200010100061308010001060a080100010623010006030202010302020603
-010006350b010a2c01000a2f0e010d0101020001062a0100062f08010d0101020001062d
-0100062c08010d010102000106280105062c08010d0101020001062d0100062c08010d01
-010200010629010006020100062c08010d01010200010100061308010001060a08010001
-0623010006030202010302020603010006350b010a2c01000a2f0e010d01010200010629
-010006020100062c08010d01010200010629010006020100062c08010d0101020001062c
-0100062d08010d01010200010628010006030100062c08010d0101020001062901000602
-0100062c08010d01010200010100061308010001060a0801000106230100060302020103
-02020603010006350b010a2a01040a2d0e010d010102000106290104062c08010d010102
-0001062a0102062d08010d0101020001062b0102062c08010d010102000106290103062d
-08010d0101020001062a0102062d08010d01010200010100061308010001060a08010001
-0623010006030202010302020603010006350b010a5d0e010d0101020001065b08010d01
-01020001065b08010d0101020001065b08010d0101020001065b08010d0101020001065b
-08010d01010200010100061308010001060a080100010623010006030202010302020603
-010006350b010a5d0e010d0101020001065b08010d0101020001065b08010d0101020001
-065b08010d0101020001065b08010d0101020001065b08010d0101020001010006130801
-0001060a080100010623010006030202010302020603010006350b010a5d0e010d010102
-0001065b08010d0101020001065b08010d0101020001065b08010d0101020001065b0801
-0d0101020001065b08010d01010200010100060e0100060308010001060a080100010623
-010006030202010302020603010006350b010a5d0e010d0101020001065b08010d010102
-0001065b08010d0101020001065b08010d0101020001065b08010d0101020001065b0801
-0d01010200010100060d0101060308010001060a08010001062301000603020201030202
-0603010006350b010a5d0e010d0101020001065b08010d0101020001065b08010d010102
-0001065b08010d0101020001065b08010d0101020001065b08010d01010200010100060c
-010006000100060308010001080c00010623010006030202010302020603010006350b01
-0a5d0e010d0101020001065b08010d0101020001065b08010d0101020001065b08010d01
-01020001065b08010d0101020001065b08010d01010200010100060e010006030801000d
-080000010623010006030202010302020603010006350b010e5f0d0101020001085d0d01
-01020001085d0d0101020001085d0d0101020001085d0d0101020001085d0d0101020001
-0100060e0100060308010001060a08010001062301000603020201030202060301000635
-0b000e600d0001030000085e0d0001030000085e0d0001030000085e0d0001030000085e
-0d0001030000085e0d000103000008000100060e0100060308010001060a080100010623
-0100060302020103020206030100009a0100006301000063010000630100006301000063
-010000020100060e0100060308010001060a080100010623010006030202010302020603
-01000035080000630100006301000063010000630100006301000063010000020100060e
-0100060308010001060a0801000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100060c010406010801
-0001060a0801000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010001060a080100010623
-010006030202010302020603010000010617010006190801006301000063010000630100
-00630100006301000063010000020100061308010001060a080100010623010006030202
-01030202060301000001061501020619080100630100000e010000530100006301000063
-0100006301000063010000020100061308010001060a0801000106230100060302020103
-0202060301000001061701000619080100630100000e0100005301000063010000630100
-006301000063010000020100061308010001060a08010001062301000603020201030202
-0603010000010617010006190801000f0102000201000000010100020100000001010003
-0102003b0100000e01000000010100020100000001010003010200020101000001000002
-01010000010000030102002d010000630100006301000063010000630100000201000613
-08010001060a080100010623010006030202010302020603010000010617010006190801
-000e010000020100000101010001010000010101000101000001010000020100003a0100
-000e01010001010000010101000101000001010000020100000101000000010000000100
-0001010000000100000001000001010000020100002c0100006301000063010000630100
-0063010000020100061308010001060a0801000106230100060302020103020206030100
-00010617010006190801001201000001010000020100000101000002010000050100003a
-0100000e0100000201000001010000050100000201000001010000000100000001000001
-0100000001000000010000050100002c0100006301000063010000630100006301000002
-0100061308010001060a0801000106230100060302020103020206030100000106170100
-06190801000f01030001010000020100000101000002010000020103003a0100000e0100
-000201000001010000050100000201000001010000000100000001000001010000000100
-0000010000020103002c0100006301000063010000630100006301000002010006130801
-0001080c00010623010006030202010302020603010000010617010006190801000e0100
-00020100000101000002010000010100000201000001010000020100003a0100000e0100
-000201000001010000050100000201000001010000000100000001000001010000000100
-000001000001010000020100002c01000063010000630100006301000063010000020100
-061308010000080d00010623010006030202010302020603010000010615010406170801
-000e010000020100000101000002010000010100000201000001010000020100003a0100
-000e01010001010000010100000501000002010000010100000001000000010000010100
-00000100000001000001010000020100002c010000630100006301000063010000630100
-00020100061308010c0e000106230100060302020103020206030100000106320801000f
-01030001010000020100000101000002010000020103003a0100000e0100000001010002
-01000006010200020100000001000000010000010100000001000000010000020103002c
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000108340063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000000835
-01ff01ff0161061308010c0e000106230100060302020103020206030100009a01000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000035080000630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010616010206180801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061501000602
-0100061708010011010100130100000b01000002010000290100002c0100000b01020003
-0102001f01000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010615010006020100061708010010010000150100
-000f010000290100002c0100000d010000050100001f0100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010615
-010006020100061708010010010000030100000001010003010200030101000001000001
-01000000010100030102000201000001010000260100000e010000000101000301020002
-01000000010100020100000001010002010400010100000201000004010000050100001f
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-0202010302020603010000010618010006180801000e0104000101010001010000010100
-000201000001010000010101000101010001010000040100000201000000010000270100
-000e01010001010000010100000201000001010100010100000101010001010000030100
-00030100000201000004010000050100001f010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061701000619
-080100100100000301000005010000020100000101000002010000010100000801000002
-010100280100000e01000002010000010100000201000001010000050100000701000003
-0100000201000004010000050100001f0100006301000063010000630100006301000002
-0100061308010c0e000106230100060302020103020206030100000106160100061a0801
-001001000003010000050104000101000002010000010100000801000002010100280100
-000e01000002010000010100000201000001010000050100000701000003010000020100
-0004010000050100001f0100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010615010006020100061708010010
-010000030100000501000005010000020100000101000008010000020100000001000027
-0100000e0100000201000001010000020100000101000005010000070100000301000002
-01000004010000050100001f010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061501040617080100100100
-000301000005010000020100000101000001010100010100000801000002010000010100
-00260100000e010000020100000101000002010000010100000501000007010000030100
-000101010004010000050100001f01000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801001001000003
-01000006010200030101000001000001010000080100000201000002010000250100000e
-010000020100000201020002010000050100000801010002010100000100000401000005
-0100001f01000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106320801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001083400630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-0000083501ff01ff0161061308010c0e000106230100060302020103020206030100009a
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000350800006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106160102061808010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010615
-01000602010006170801002601000003010200030102002d010000160102004901000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-02020603010000010619010006170801002d010000050100002d01000018010000490100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010619010006170801000f01010000010000010100000201000001
-0100000001010003010200050100000501000003010200260100000f0102000501000002
-010000020100000201020003010200030102000201000000010100260100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010617010106180801000e01000001010100010100000201000001010100010100
-000401000005010000050100000201000002010000250100000e01000002010000040100
-000201000002010000010100000201000001010000020100000101000002010000010101
-00010100002501000063010000630100006301000063010000020100061308010c0e0001
-0623010006030202010302020603010000010619010006170801000e0100000201000001
-01000002010000010100000201000004010000050100000501000006010000250100000e
-010000080100000201000002010000010100000501000005010000020100000101000002
-0100002501000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010619010006170801000e01000002010000010100
-0002010000010100000201000004010000050100000501000003010300250100000f0102
-000501000002010000020100000201020003010200020104000101000002010000250100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-01030202060301000001061501000602010006170801000e010000020100000101000002
-010000010100000201000004010000050100000501000002010000020100002501000012
-010000040100000201000002010000050100000501000001010000050100000201000025
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-0202010302020603010000010616010206180801000e0100000101010001010000010101
-0001010000020100000401000005010000050100000201000002010000250100000e0100
-000201000004010000020100000101010001010000020100000101000002010000010100
-000201000001010000020100002501000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801000f01010000
-010000020101000001000001010000020100000401000005010000050100000301030025
-0100000f0102000501000003010100000100000201020003010200030102000201000002
-0100002501000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100120100004f01000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-06030100000106320801000e010000020100004f01000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-06320801000f010200500100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010834
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000000083501ff01ff0161061308010c0e00010623
-0100060302020103020206030100009a0100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100003508000063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106320801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061801000618080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000001061701010618080100110100001a010100040100002d
-010000160102000c01000002010000370100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010616010006000100
-06180801002c010000350100001801000010010000370100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010616
-01000600010006180801000f010200030102000301020003010200040100000401020002
-01000000010100030102001f0100000f0102000501000002010000020100000201020002
-010000010100003401000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106150100060101000618080100110100
-000201000002010000010100000201000001010000020100000101040004010000020101
-000101000001010000020100001e0100000e010000020100000401000002010000020100
-000401000002010000000100003501000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106140100060201000618
-080100110100000201000002010000010100000501000002010000030100000601000002
-0100000201000001010000020100001e0100001201000004010000020100000201000004
-010000020101003601000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106140105061708010011010000020100
-0002010000020102000201040003010000060100000201000002010000010104001e0100
-000f01030004010000030100000001000005010000020101003601000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106180100061808010011010000020100000201000005010000010100000701000006
-010000020100000201000001010000220100000e01000002010000040100000301000000
-010000050100000201000000010000350100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010617010206170801
-001101000002010000020100000101000002010000010100000201000003010000060100
-00020100000201000001010000020100001e0100000e0100000201000004010000040100
-000601000002010000010100003401000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801001101000003
-010200030102000301020004010000060100000201000002010000020102001f0100000f
-010300040100000401000006010000020100000201000033010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010011010000500100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801000e01000001
-010000500100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801000f01010051010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001083400630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-0000083501ff01ff0161061308010c0e0001062301000603020201030202060301000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000000050000000500000005000000050000000500
-000005000000050000000500000005000100006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000500
-000005320100050000630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000005340100006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000500000005150104051701000500006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-06030100000005160100051c0100000e010000160100003b0100000e0100000601020010
-0100000c0100002901000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000500000005150100051b01000500000e0100
-00530100000e01000008010000100100000c010000290100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000000516
-0100051c0100000e01000001010000030102000201000000010100030102000201000000
-010100340100000e01000000010100050100000301020003010200020100000101000003
-010200020100000001010003010200020100000001010003010100000100001001000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000500000005150103051801000500000e0100000001000003010000020100
-000101010001010000040100000201010001010000330100000e01010001010000040100
-000201000002010000010100000201000001010000000100000301000002010000010101
-000101000001010000020100000101010001010000010100000101010010010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000000051a010005180100000e0101000801000001010000080100000201000002
-010000330100000e01000002010000040100000601000001010000050101000401000002
-010000010100000201000001010000020100000101000005010000020100001001000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000500000005190100051701000500000e0101000501030001010000080100
-000201000002010000330100000e01000002010000040100000301030001010000050101
-000401040001010000020100000101040001010000050100000201000010010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000000051501000503010005180100000e01000000010000030100000201000001
-010000080100000201000002010000330100000e01000002010000040100000201000002
-010000010100000501000000010000030100000501000002010000010100000501000005
-010000020100001001000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000500000005150103051801000500000e0100
-0001010000020100000201000001010000080100000201000002010000330100000e0101
-000101000004010000020100000201000001010000020100000101000001010000020100
-000201000001010100010100000101000002010000010100000501000001010100100100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-0103020206030100000005340100000e0100000201000002010300010100000801000002
-01000002010000330100000e010000000101000501000003010300020102000201000002
-010000020102000201000000010100030102000201000006010100000100001001000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100050000000532010005000063010000510100001001000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-00000534010000630100004d010000020100001001000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100050000000532
-0100050000630100004e0102001101000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000005340100006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000500000005320100050000630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010000630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001000500010005000100050001000500
-010005000100050001000500010005000100050001ff01ff0161061308010c0e00010623
-01000603020201030202060301000d360063010000630100006301000063010000630100
-0063010000020100061308010c0e0001062301000603020201030202060301000d350100
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000d01013400630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-0d0101340063010000630100006301000063010000630100006301000002010006130801
-0c0e0001062301000603020201030202060301000d010117000201190063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-01030202060301000d0101160000011c000e0100000e010000140100002d010000320102
-002d01000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000d0101150000011d000e0100000e01000043010000340100
-002d01000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000d0101150000011d000e0100000101000003010200020104
-00020102000201000000010100030102000201000000010100030102001f0100000e0100
-000201000001010000000101000201000000010100030102000301020005010000030102
-002601000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000d0101150003011a000e0100000001000003010000020100
-000301000003010000020100000101010001010000040100000201010001010000010100
-00020100001e0100000e0100000201000001010100010100000101010001010000010100
-000201000001010000020100000401000002010000020100002501000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-0d0101150000010200000119000e01010008010000030100000701000001010000080100
-000201000002010000050100001e0100000e010000020100000101000002010000010100
-000201000001010000090100000401000006010000250100006301000063010000630100
-0063010000020100061308010c0e0001062301000603020201030202060301000d010115
-0000010200000119000e0101000501030003010000040103000101000008010000020100
-0002010000020103001e0100000e01000002010000010100000201000001010000020100
-000201020003010300040100000301030025010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000d01011500000102
-00000119000e010000000100000301000002010000030100000301000002010000010100
-0008010000020100000201000001010000020100001e0100000e01000002010000010100
-000201000001010000020100000501000001010000020100000401000002010000020100
-002501000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000d0101160002011a000e0100000101000002010000020100
-000301000003010000020100000101000008010000020100000201000001010000020100
-001e0100000e010000010101000101010001010000010101000101000001010000020100
-000101000002010000040100000201000002010000250100006301000063010000630100
-0063010000020100061308010c0e0001062301000603020201030202060301000d010134
-000e01000002010000020103000401010002010300010100000801000002010000020100
-00020103001e0100000f0101000001000001010000000101000201000000010100030102
-000301030004010000030103002501000063010000630100006301000063010000020100
-061308010c0e0001062301000603020201030202060301000d0101340063010000150100
-00050100004501000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000d01013400630100001501000005010000450100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-01030202060301000d010134006301000015010000050100004501000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-0d0101340063010000630100006301000063010000630100006301000002010006130801
-0c0e0001062301000603020201030202060301000d010134006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000d01013400630100006301000063010000630100006301000063010000020100
-061308010c0e0001062301000603020201030202060301000d0001ff01ff019706130801
-0c0e000106230100060302020103020206030100009a0100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-003508000063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061501040617
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106150100060201000617080100260100
-003b01000019010000170102002d01000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106180100061808010063
-01000019010000190100002d010000630100006301000063010000630100000201000613
-08010c0e00010623010006030202010302020603010000010618010006180801000e0101
-00000100000301020002010000000101000301020003010200340100000f010200030101
-000001000002010200020100000001010002010000000101000501000003010200020100
-00000101001f01000063010000630100006301000063010000020100061308010c0e0001
-0623010006030202010302020603010000010618010006180801000e0100000001000000
-01000001010000020100000101010001010000040100000201000002010000330100000e
-010000020100000101000001010100010100000201000001010100010100000101010001
-01000004010000020100000201000001010100010100001e010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-0618010006180801000e0100000001000000010000050100000101000008010000060100
-00330100000e010000020100000101000002010000010100000201000001010000020100
-000101000002010000040100000601000001010000020100001e01000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-00010617010006190801000e010000000100000001000002010300010100000801000003
-010300330100000e01000002010000010100000201000001010400010100000201000001
-01000002010000040100000301030001010000020100001e010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-0617010006190801000e0100000001000000010000010100000201000001010000080100
-000201000002010000330100000e01000002010000010100000201000001010000050100
-0002010000010100000201000004010000020100000201000001010000020100001e0100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010617010006190801000e01000000010000000100000101000002
-01000001010000080100000201000002010000330100000e010000020100000101000001
-010100010100000201000001010000020100000101010001010000040100000201000002
-01000001010000020100001e010000630100006301000063010000630100000201000613
-08010c0e000106230100060302020103020206030100000106320801000e010000000100
-000001000002010300010100000801000003010300330100000f01020003010100000100
-000201020002010000020100000101000000010100050100000301030001010000020100
-001e01000063010000630100006301000063010000020100061308010c0e000106230100
-06030202010302020603010000010632080100630100002a010000370100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100002a01000037010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100002a0100003701000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010834006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000000083501ff01ff0161061308010c0e00010623010006030202
-010302020603010005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050000000500000005000000
-050000000500000005000000050000000500000005000000050001000063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010005000000053201000500006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000000
-053401000063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010005000000051601020518010005000063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-01000603020201030202060301000000051601000502010005180100001e010000430100
-000e01000006010200100100000c01000029010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000500000005150100
-05020100051701000500001e010000430100000e01000008010000100100000c01000029
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000000051601000502010005180100000e01010000010000030102
-0002010400020102003b0100000e01000000010100050100000301020003010200020100
-000101000003010200020100000001010003010200020100000001010003010100000100
-001001000063010000630100006301000063010000020100061308010c0e000106230100
-0603020201030202060301000500000005160102051801000500000e0100000001000000
-01000001010000020100000301000003010000020100003a0100000e0101000101000004
-010000020100000201000001010000020100000101000000010000030100000201000001
-010100010100000101000002010000010101000101000001010000010101001001000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000000051601000502010005180100000e0100000001000000010000050100
-0003010000030100003e0100000e01000002010000040100000601000001010000050101
-000401000002010000010100000201000001010000020100000101000005010000020100
-001001000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100050000000515010005020100051701000500000e01000000
-010000000100000201030003010000040102003b0100000e010000020100000401000003
-010300010100000501010004010400010100000201000001010400010100000501000002
-0100001001000063010000630100006301000063010000020100061308010c0e00010623
-01000603020201030202060301000000051601000502010005180100000e010000000100
-0000010000010100000201000003010000070100003a0100000e01000002010000040100
-000201000002010000010100000501000000010000030100000501000002010000010100
-000501000005010000020100001001000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100050000000516010205180100
-0500000e010000000100000001000001010000020100000301000003010000020100003a
-0100000e0101000101000004010000020100000201000001010000020100000101000001
-010000020100000201000001010100010100000101000002010000010100000501000001
-0101001001000063010000630100006301000063010000020100061308010c0e00010623
-0100060302020103020206030100000005340100000e0100000001000000010000020103
-0004010100020102003b0100000e01000000010100050100000301030002010200020100
-000201000002010200020100000001010003010200020100000601010000010000100100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010005000000053201000500006301000051010000100100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000000534010000630100004d01000002010000100100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010005000000
-05320100050000630100004e010200110100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000000534010000630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100050000000532010005000063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-050001000500010005000100050001000500010005000100050001000500010005000100
-0500010005000100050001000500010005000100050001ff01ff0161061308010c0e0001
-06230100060302020103020206030100009a010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000350800
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106160102061808010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010615010006020100061708010016010200030102
-00420100000e010000230100000b01020003010200180100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010615
-01000602010006170801001801000005010000420100000e010000230100000d01000005
-0100001801000063010000630100006301000063010000020100061308010c0e00010623
-01000603020201030202060301000001061501000602010006170801000f010200050100
-0005010000030102003b0100000e01000000010100030102000201000000010100020100
-000001010003010200020104000101000002010000040100000501000018010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061501000602010006170801000e01000002010000040100000501000002
-010000020100003a0100000e010100010100000101000002010000010101000101000001
-010100010100000101000002010000030100000301000002010000040100000501000018
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-0202010302020603010000010616010306170801000e0100000201000004010000050100
-0002010000020100003a0100000e01000002010000010100000201000001010000050100
-000201000001010000070100000301000002010000040100000501000018010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-0603010000010619010006170801000e010000020100000401000005010000020104003a
-0100000e0100000201000001010000020100000101000005010000020100000201020004
-010000030100000201000004010000050100001801000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106180100
-06180801000e010000020100000401000005010000020100003e0100000e010000020100
-000101000002010000010100000501000002010000050100000301000003010000020100
-000401000005010000180100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010615010206190801000e01000002
-010000040100000501000002010000020100003a0100000e010000020100000101000002
-010000010100000501000002010000010100000201000003010000030100000101010004
-010000050100001801000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801000f01020005010000050100
-00030102003b0100000e0100000201000002010200020100000501000002010000020102
-000501010002010100000100000401000005010000180100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-083400630100006301000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000000083501ff01ff0161061308010c0e0001
-062301000603020201030202060301000900000009000000090000000900000009000000
-090000000900000009000000090000000900000009000000090000000900000009000000
-090000000900000009000000090000000900000009000000090000000900000009000000
-090000000900000009000000090000000900006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000000
-090000000900000009000000090000000900000009000000090000000900000009000000
-090000000900000009000000090000000900000009000000090000000900000009000000
-090000000900000009000000090000000900000009000000090000000900000009000100
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000900000009320100090000630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000009340100006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000900000009130100
-090401020915010009000063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000000912010209030100
-090201000915010000630100001701000020010200260100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010009000000
-091301000903010009020100091401000900006301000017010000220100002601000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000009140100090301000902010009150100000e01000000010100030102
-000201000000010100420100000f01020002010400010100000201000001010000000101
-000301020002010000000101000501000003010200020100000001010018010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-0603010009000000091301000903010009020100091401000900000e0101000101000001
-010000020100000101010001010000410100000e01000002010000030100000301000002
-010000010101000101000001010000020100000101010001010000040100000201000002
-010000010101000101000017010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000000091401000903010009020100
-09150100000e01000002010000010100000201000001010000450100000e010000070100
-000301000002010000010100000501000002010000010100000201000004010000060100
-000101000002010000170100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010009000000091301000903010009020100
-091401000900000e010000020100000101040001010000450100000f0102000401000003
-010000020100000101000005010400010100000201000004010000030103000101000002
-0100001701000063010000630100006301000063010000020100061308010c0e00010623
-0100060302020103020206030100000009140100090301000902010009150100000e0100
-000201000001010000050100004501000012010000030100000301000002010000010100
-000501000005010000020100000401000002010000020100000101000002010000170100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-0103020206030100090000000911010409020102091501000900000e0101000101000001
-0100000201000001010000450100000e0100000201000003010000030100000101010001
-010000050100000201000001010100010100000401000002010000020100000101000002
-0100001701000063010000630100006301000063010000020100061308010c0e00010623
-0100060302020103020206030100000009340100000e0100000001010003010200020100
-00450100000f010200050101000201010000010000010100000601020002010000000101
-000501000003010300010100000201000017010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000900000009320100
-0900000e0100005301000031010000300100006301000063010000630100006301000002
-0100061308010c0e000106230100060302020103020206030100000009340100000e0100
-005301000031010000300100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010009000000093201000900000e01000053
-010000310100003001000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000009340100006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000900000009320100090000630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000009000100
-090001000900010009000100090001000900010009000100090001000900010009000100
-090001000900010009000100090001000900010009000100090001000900010009000100
-090001000900010009000100090001000900010009000100090001000900010000630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100090001000900010009000100090001000900010009000100
-090001000900010009000100090001000900010009000100090001000900010009000100
-090001000900010009000100090001000900010009000100090001000900010009000100
-090001000900010009000100090001ff01ff0161061308010c0e00010623010006030202
-0103020206030100009a0100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100003508000063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000605010006160801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061101020603010206160801001701000006010000420100
-00150100001c0100000b0102000301020018010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061301000605
-01000616080100170100004a010000150100001c0100000d010000050100001801000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-0202060301000001061301000605010006160801000f0102000201040002010200020100
-000001010003010200340100000f01020002010000010100000301020002010000000101
-000301020002010400010100000201000004010000050100001801000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-0001061301000605010006160801000e0100000201000003010000060100000201010001
-0100000101000002010000330100000e0100000201000001010000000100000301000002
-010000010101000101000001010000020100000301000003010000020100000401000005
-0100001801000063010000630100006301000063010000020100061308010c0e00010623
-01000603020201030202060301000001061301000605010006160801000e010000070100
-0006010000020100000201000005010000330100000e0100000501010008010000010100
-000201000001010000070100000301000002010000040100000501000018010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000605010006160801000f01020004010000060100000201000002
-01000002010300330100000f010200020101000501030001010000020100000201020004
-010000030100000201000004010000050100001801000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106130100
-060501000616080100120100000301000006010000020100000201000001010000020100
-003301000012010000010100000001000003010000020100000101000002010000050100
-000301000003010000020100000401000005010000180100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010611
-01040601010406140801000e010000020100000301000006010000020100000201000001
-01000002010000330100000e010000020100000101000001010000020100000201000001
-010000020100000101000002010000030100000301000001010100040100000501000018
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-02020103020206030100000106320801000f010200050101000401000002010000020100
-0002010300330100000f0102000201000002010000020103000101000002010000020102
-000501010002010100000100000401000005010000180100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-083400630100006301000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000000083501ff01ff0161061308010c0e0001
-06230100060302020103020206030100009a010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000350800
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106130100060401020615
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106110102060301000602010006140801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000603010006020100061408010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006030100060201000614080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106130100060601000615080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106130100060501000616080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106130100060401000617080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106130100
-060301000602010006140801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061101040601
-010406140801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001063208010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001083400630100006301000063010000630100006301000063
-010000020100061308010c0e0001062301000603020201030202060301000000083501ff
-01ff0161061308010c0e000106230100060302020103020206030100009a010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000350800006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010632080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106130100060401020615080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106110102
-060301000602010006140801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061301000607
-010006140801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061301000607010006140801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000605010106150801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061301000607010006140801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000607010006140801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000603010006020100061408010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010611
-010406020102061508010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-063208010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010632080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106320801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001063208010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010834006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000000
-083501ff01ff0161061308010c0e000106230100060302020103020206030100009a0100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100003508000063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000606010006150801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061101020605010106150801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061301000604
-010006000100061508010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010613010006040100
-060001000615080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106130100060301000601
-010006150801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061301000602010006020100
-061508010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010613010006020105061408010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006060100061508010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010611010406030102061408010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010834006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000000083501ff01ff0161061308010c0e00010623010006030202
-0103020206030100009a0100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100003508000063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000603010406140801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061101020603010006180801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000603010006180801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000603010006180801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061301000603
-010306150801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061301000607010006140801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000607010006140801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061301000602010006030100061408010063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010611010406010103061508010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010834006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000000083501ff01ff0161061308010c0e00010623010006030202
-0103020206030100009a0100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100003508000063010000630100
-0063010000630100006301000063010000020100061308010c0e00010623010006030202
-010302020603010000010632080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000605010206140801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061101020604010006170801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000603010006180801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000603010006180801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061301000603
-010306150801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061301000603010006020100
-061408010063010000630100006301000063010000630100006301000002010006130801
-0c0e00010623010006030202010302020603010000010613010006030100060201000614
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106130100060301000602010006140801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061101040602010206150801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-083400630100006301000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000000083501ff01ff0161061308010c0e0001
-06230100060302020103020206030100009a010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000350800
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106130100060301040614
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106110102060301000602010006140801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000606010006150801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001061301000606010006150801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000606010006150801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-061301000606010006150801006301000063010000630100006301000063010000630100
-00020100061308010c0e0001062301000603020201030202060301000001061301000605
-010006160801006301000063010000630100006301000063010000630100000201000613
-08010c0e0001062301000603020201030202060301000001061301000605010006160801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061101040603010006160801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106320801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001063208010063010000630100006301000063010000630100006301000002
-0100061308010c0e00010623010006030202010302020603010000010632080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106320801006301000063010000630100006301000063
-01000063010000020100061308010c0e0001062301000603020201030202060301000001
-083400630100006301000063010000630100006301000063010000020100061308010c0e
-0001062301000603020201030202060301000000083501ff01ff0161061308010c0e0001
-06230100060302020103020206030100009a010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000350800
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106130100060401020615
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000106110102060301000602010006140801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001061301000603010006020100061408010063
-0100006301000063010000630100006301000063010000020100061308010c0e00010623
-010006030202010302020603010000010613010006030100060201000614080100630100
-006301000063010000630100006301000063010000020100061308010c0e000106230100
-060302020103020206030100000106130100060401020615080100630100006301000063
-010000630100006301000063010000020100061308010c0e000106230100060302020103
-020206030100000106130100060301000602010006140801006301000063010000630100
-00630100006301000063010000020100061308010c0e0001062301000603020201030202
-060301000001061301000603010006020100061408010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010613010006030100060201000614080100630100006301000063010000630100
-006301000063010000020100061308010c0e000106230100060302020103020206030100
-000106110104060201020615080100630100006301000063010000630100006301000063
-010000020100061308010c0e000106230100060302020103020206030100000106320801
-00630100006301000063010000630100006301000063010000020100061308010c0e0001
-062301000603020201030202060301000001063208010063010000630100006301000063
-0100006301000063010000020100061308010c0e00010623010006030202010302020603
-010000010632080100630100006301000063010000630100006301000063010000020100
-061308010c0e000106230100060302020103020206030100000106320801006301000063
-01000063010000630100006301000063010000020100061308010c0e0001062301000603
-020201030202060301000001063208010063010000630100006301000063010000630100
-0063010000020100061308010c0e00010623010006030202010302020603010000010632
-080100630100006301000063010000630100006301000063010000020100061308010c0e
-000106230100060302020103020206030100000108340063010000630100006301000063
-0100006301000063010000020100061308010010062301000603020201030202060301ff
-01ff01990613080000110623010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-0202060301000649010006ff06ff069801000603020201030202060301000648010106ff
-06ff06980100060302020103020206030100064701000600010006ff06ff069801000603
-020201030202060301000649010006ff06ff069801000603020201030202060301000649
-010006ff06ff069801000603020201030202060301000649010006ff06ff069801000603
-020201030202060301000649010006ff06ff069801000603020201030202060301000649
-010006ff06ff069801000603020201030202060301000647010406ff06ff069601000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-0100063708ff08ff0860064a0100060302020103020206030100063708ff08ff085f0000
-064a010006030202010302020603010006370801001d0cff0cff0c3e0001064a01000603
-0202010302020603010006370801001c08000cff0cff0c3e0001064a0100060302020103
-020206030100063708010001060b08000000060b08010cff0cff0c3e0001064a01000603
-02020103020206030100063708010001060b08000000060b08010cff0cff0c3e0001064a
-0100060302020103020206030100063708010001060b08000000060b08010cff0cff0c3e
-0001064a0100060302020103020206030100063708010001060b08000000060b08010cff
-0cff0c3e0001064a0100060302020103020206030100063708010001060b08000000060b
-08010cff0cff0c3e0001064a0100060302020103020206030100063708010001060b0800
-0000060b08010cff0cff0c3e0001064a0100060302020103020206030100063708010001
-060b08000000060b08010cff0cff0c3e0001064a01000603020201030202060301000637
-08010001060b08000000060b08010cff0cff0c3e0001064a010006030202010302020603
-0100063708010001060b08000000060b08010cff0cff0c3e0001064a0100060302020103
-020206030100063708010001060b08000000060b08010cff0cff0c3e0001064a01000603
-02020103020206030100063708010001060b08000000060b08010cff0cff0c3e0001064a
-0100060302020103020206030100063708010001080c0000080d0cff0cff0c3e0001064a
-0100060302020103020206030100063708010000081c0cff0cff0c3e0001064a01000603
-020201030202060301000637080100ff00ff005e064a0100060302020103020206030100
-0637080000ff00ff005f064a010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-02020603010006ff06ff06e3010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-02020603010006ff06ff06e3010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010302020603
-010006ff06ff06e3010006030202010302020603010006ff06ff06e30100060302020103
-02020603010006ff06ff06e3010006030202010302020603010006ff06ff06e301000603
-0202010302020603010006ff06ff06e3010006030202010302020603010006ff06ff06e3
-010006030202010302020603010006ff06ff06e3010006030202010302020603010006ff
-06ff06e3010006030202010302020603010006ff06ff06e3010006030202010100040603
-010006ff06ff06e301000603000502020400060301ff01ff01e506030000020204000000
-0202040006ff06ff06ed00000202040000000202040006ff06ff06ed0000020204000000
-0202040006ff06ff06ed00000202040000000202040006ff06ff06ed0000020204000000
-02020400000502ff02ff02e100060202040000000208040002ff02ff02e1000002080400
-00000208040002ff02ff02e100000208040000000208040001ff01ff01e1000002080400
-0000040901ff01ff01e100000409
-%%EndData
-end
-%%PageTrailer
-%%Trailer
-%%BoundingBox: 0 0 532 441
-%%EOF
diff --git a/lib/tv/doc/src/warning.gif b/lib/tv/doc/src/warning.gif
deleted file mode 100644
index 96af52360e..0000000000
--- a/lib/tv/doc/src/warning.gif
+++ /dev/null
diff --git a/lib/tv/ebin/.gitignore b/lib/tv/ebin/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/lib/tv/ebin/.gitignore
+++ /dev/null
diff --git a/lib/tv/info b/lib/tv/info
deleted file mode 100644
index 63e88b04b5..0000000000
--- a/lib/tv/info
+++ /dev/null
@@ -1,2 +0,0 @@
-group: tools
-short: An ETS and MNESIA graphical table visualizer
diff --git a/lib/tv/priv/Makefile b/lib/tv/priv/Makefile
deleted file mode 100644
index 679a76fe88..0000000000
--- a/lib/tv/priv/Makefile
+++ /dev/null
@@ -1,72 +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%
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-include ../vsn.mk
-VSN = $(TV_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/tv-$(VSN)
-
-#
-# Macros
-#
-TOOLBAR_FILES = \
-	arrow_left.xbm \
-	arrow_right.xbm \
-	edit1.xbm \
-	erlang.gif \
-	help.xbm \
-	info.xbm \
-	key.xbm \
-	more.xbm \
-	no_sort.xbm \
-	open.xbm \
-	poll.xbm \
-	search.xbm \
-	sort.xbm \
-	sort_reverse.xbm \
-	tv.gif \
-	tv.tool
-
-#
-# Rules
-#
-
-debug opt:
-
-docs:
-
-clean:
-
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-include $(ERL_TOP)/make/otp_release_targets.mk
-
-release_spec: opt
-	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
-	$(INSTALL_DATA) $(TOOLBAR_FILES) "$(RELSYSDIR)/priv"
-
-release_docs_spec:
-
-FORCE:
diff --git a/lib/tv/priv/arrow_left.xbm b/lib/tv/priv/arrow_left.xbm
deleted file mode 100644
index 58db123a00..0000000000
--- a/lib/tv/priv/arrow_left.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_left_width 16
-#define arrow_left_height 8
-static unsigned char arrow_left_bits[] = {
-   0x70, 0x00, 0x38, 0x00, 0x1c, 0x00, 0xfe, 0xff, 0xfe, 0xff, 0x1c, 0x00,
-   0x38, 0x00, 0x70, 0x00};
diff --git a/lib/tv/priv/arrow_right.xbm b/lib/tv/priv/arrow_right.xbm
deleted file mode 100644
index 7eca80303d..0000000000
--- a/lib/tv/priv/arrow_right.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_right_width 16
-#define arrow_right_height 8
-static unsigned char arrow_right_bits[] = {
-   0x00, 0x1c, 0x00, 0x38, 0x00, 0x70, 0xfc, 0xff, 0xfc, 0xff, 0x00, 0x70,
-   0x00, 0x38, 0x00, 0x1c};
diff --git a/lib/tv/priv/edit1.xbm b/lib/tv/priv/edit1.xbm
deleted file mode 100644
index dc13f274c0..0000000000
--- a/lib/tv/priv/edit1.xbm
+++ /dev/null
@@ -1,12 +0,0 @@
-#define edit1_width 25
-#define edit1_height 25
-static unsigned char edit1_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x0f, 0x00,
-   0x00, 0x01, 0x14, 0x00, 0x70, 0xf9, 0x27, 0x00, 0xf8, 0x01, 0x3c, 0x00,
-   0xf8, 0xf9, 0x27, 0x00, 0xf0, 0x03, 0x20, 0x00, 0xe0, 0xff, 0x27, 0x00,
-   0xc0, 0x07, 0x20, 0x00, 0x80, 0xff, 0x27, 0x00, 0x00, 0x1f, 0x20, 0x00,
-   0x00, 0xfd, 0x27, 0x00, 0x00, 0x79, 0x20, 0x00, 0x00, 0xf9, 0x27, 0x00,
-   0x00, 0x21, 0x21, 0x00, 0x00, 0xf9, 0x27, 0x00, 0x00, 0x01, 0x20, 0x00,
-   0x00, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/erlang.gif b/lib/tv/priv/erlang.gif
deleted file mode 100644
index 8d06e98065..0000000000
--- a/lib/tv/priv/erlang.gif
+++ /dev/null
diff --git a/lib/tv/priv/help.xbm b/lib/tv/priv/help.xbm
deleted file mode 100644
index b2cbc541e4..0000000000
--- a/lib/tv/priv/help.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define help_width 20
-#define help_height 20
-static unsigned char help_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0xff, 0x00, 0x80, 0xe7, 0x01,
-   0x80, 0xc3, 0x01, 0x80, 0xc3, 0x01, 0x00, 0xe3, 0x00, 0x00, 0x70, 0x00,
-   0x00, 0x38, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/info.xbm b/lib/tv/priv/info.xbm
deleted file mode 100644
index d5157661c2..0000000000
--- a/lib/tv/priv/info.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define info_width 20
-#define info_height 20
-static unsigned char info_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x1e, 0x00,
-   0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x1e, 0x00,
-   0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00,
-   0x00, 0x3e, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/key.xbm b/lib/tv/priv/key.xbm
deleted file mode 100644
index 222be32219..0000000000
--- a/lib/tv/priv/key.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define key_width 10
-#define key_height 18
-static char key_bits[] = {
- 0xfc,0x00,0xfe,0x01,0x87,0x03,0x03,0x03,0x87,0x03,0xfe,0x01,0xfc,0x00,0x30,
- 0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x30,0x00,0x3b,0x00,0x3b,0x00,
- 0x3f,0x00,0x3f,0x00,0x37,0x00};
diff --git a/lib/tv/priv/more.xbm b/lib/tv/priv/more.xbm
deleted file mode 100644
index 38ef738768..0000000000
--- a/lib/tv/priv/more.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define more_width 16
-#define more_height 26
-static unsigned char more_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x7f,
-   0xe0, 0x3f, 0xc0, 0x1f, 0x80, 0x0f, 0x00, 0x07, 0x00, 0x02, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/no_sort.xbm b/lib/tv/priv/no_sort.xbm
deleted file mode 100644
index 90568dd828..0000000000
--- a/lib/tv/priv/no_sort.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define no_sort_width 20
-#define no_sort_height 20
-static unsigned char no_sort_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02,
-   0x20, 0x00, 0x02, 0x20, 0x00, 0x02, 0x20, 0x08, 0x02, 0x20, 0x08, 0x02,
-   0x20, 0x48, 0x02, 0x20, 0x48, 0x02, 0x20, 0x49, 0x02, 0x20, 0x49, 0x02,
-   0x20, 0x49, 0x02, 0x20, 0x49, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/open.xbm b/lib/tv/priv/open.xbm
deleted file mode 100644
index fe77d2c38b..0000000000
--- a/lib/tv/priv/open.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define open_width 20
-#define open_height 20
-static unsigned char open_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x05,
-   0xe0, 0x00, 0x06, 0xf0, 0x1f, 0x07, 0xf0, 0x3f, 0x00, 0xf0, 0x3f, 0x00,
-   0xf0, 0x3f, 0x00, 0xf0, 0xff, 0x03, 0xf0, 0x00, 0x01, 0x70, 0x80, 0x00,
-   0x30, 0x40, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/poll.xbm b/lib/tv/priv/poll.xbm
deleted file mode 100644
index 6ec1dbeaf2..0000000000
--- a/lib/tv/priv/poll.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define poll2_width 20
-#define poll2_height 20
-static unsigned char poll2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0xc0, 0x7f, 0x00, 0xe0, 0xff, 0x00,
-   0xe0, 0xf1, 0x00, 0xf0, 0xe0, 0x01, 0x70, 0xf8, 0x07, 0x70, 0xf0, 0x03,
-   0x70, 0xe0, 0x01, 0xf0, 0xc0, 0x00, 0xe0, 0x01, 0x00, 0xe0, 0x7f, 0x00,
-   0xc0, 0x3f, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/search.xbm b/lib/tv/priv/search.xbm
deleted file mode 100644
index 3498e66b0d..0000000000
--- a/lib/tv/priv/search.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define search2_width 20
-#define search2_height 20
-static unsigned char search2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0xc0, 0xe1, 0x00, 0xc0, 0xe1, 0x00, 0xe0, 0xf3, 0x01, 0x20, 0x93, 0x01,
-   0xf0, 0xff, 0x03, 0xe8, 0xdd, 0x07, 0xe8, 0xdd, 0x07, 0xe8, 0xdd, 0x07,
-   0xe8, 0xdd, 0x07, 0xe8, 0xdf, 0x07, 0xe8, 0xd3, 0x07, 0xf8, 0xf3, 0x07,
-   0xe8, 0x40, 0x07, 0xe8, 0x40, 0x07, 0xf8, 0xc0, 0x07, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/sort.xbm b/lib/tv/priv/sort.xbm
deleted file mode 100644
index 576564b817..0000000000
--- a/lib/tv/priv/sort.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define sort_width 20
-#define sort_height 20
-static unsigned char sort_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02,
-   0x00, 0x40, 0x02, 0x00, 0x40, 0x02, 0x00, 0x48, 0x02, 0x00, 0x48, 0x02,
-   0x00, 0x49, 0x02, 0x00, 0x49, 0x02, 0x20, 0x49, 0x02, 0x20, 0x49, 0x02,
-   0x20, 0x49, 0x02, 0x20, 0x49, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/sort_reverse.xbm b/lib/tv/priv/sort_reverse.xbm
deleted file mode 100644
index b58e6308f5..0000000000
--- a/lib/tv/priv/sort_reverse.xbm
+++ /dev/null
@@ -1,8 +0,0 @@
-#define sort_reverse_width 20
-#define sort_reverse_height 20
-static unsigned char sort_reverse_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00,
-   0x20, 0x01, 0x00, 0x20, 0x01, 0x00, 0x20, 0x09, 0x00, 0x20, 0x09, 0x00,
-   0x20, 0x49, 0x00, 0x20, 0x49, 0x00, 0x20, 0x49, 0x02, 0x20, 0x49, 0x02,
-   0x20, 0x49, 0x02, 0x20, 0x49, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/lib/tv/priv/tv.gif b/lib/tv/priv/tv.gif
deleted file mode 100644
index 44daac2912..0000000000
--- a/lib/tv/priv/tv.gif
+++ /dev/null
diff --git a/lib/tv/priv/tv.tool b/lib/tv/priv/tv.tool
deleted file mode 100644
index 770424d283..0000000000
--- a/lib/tv/priv/tv.tool
+++ /dev/null
@@ -1,23 +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%
-{version,"0.1"}.
-{{tool,"Table Visualizer"},
- {start,{tv,start,[]}},
- {icon,"tv.gif"},
- {message,"The Table Visualizer"},
- {html,"../doc/html/index.html"}}.
diff --git a/lib/tv/src/Makefile b/lib/tv/src/Makefile
deleted file mode 100644
index 3d680c1eaf..0000000000
--- a/lib/tv/src/Makefile
+++ /dev/null
@@ -1,135 +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%
-include $(ERL_TOP)/make/target.mk
-include $(ERL_TOP)/make/$(TARGET)/otp.mk
-
-# ----------------------------------------------------
-# Application version
-# ----------------------------------------------------
-include ../vsn.mk
-VSN=$(TV_VSN)
-
-# ----------------------------------------------------
-# Release directory specification
-# ----------------------------------------------------
-RELSYSDIR = $(RELEASE_PATH)/lib/tv-$(VSN)
-
-# ----------------------------------------------------
-# Common Macros
-# ----------------------------------------------------
-
-MODULES= \
-	tv \
-	tv_comm_func \
-	tv_db \
-	tv_db_search \
-	tv_db_sort \
-	tv_ets_rpc \
-	tv_etsread \
-	tv_info \
-	tv_io_lib \
-	tv_io_lib_format \
-	tv_io_lib_pretty \
-	tv_ip \
-	tv_main \
-	tv_mnesia_rpc \
-	tv_new_table \
-	tv_nodewin \
-	tv_pb \
-	tv_pb_funcs \
-	tv_pc \
-	tv_pc_graph_ctrl \
-	tv_pc_menu_handling \
-	tv_pd \
-	tv_pd_display \
-	tv_pd_frames \
-	tv_pd_scale \
-	tv_pg \
-	tv_pg_gridfcns \
-	tv_poll_dialog \
-	tv_pw \
-	tv_pw_window \
-	tv_rec_edit \
-	tv_table_owner \
-	tv_utils
-
-
-
-HRL_FILES= \
-	tv_db_int_def.hrl \
-	tv_int_def.hrl \
-	tv_int_msg.hrl \
-	tv_main.hrl \
-	tv_pb_int_def.hrl \
-	tv_pc_int_def.hrl \
-	tv_pd_int_def.hrl \
-	tv_pd_int_msg.hrl \
-	tv_pg_int_def.hrl \
-	tv_pw_int_def.hrl
-
-ERL_FILES= $(MODULES:%=%.erl)
-
-TARGET_FILES = $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-
-APP_FILE = tv.app
-APP_SRC = $(APP_FILE).src
-APP_TARGET = $(EBIN)/$(APP_FILE)
-
-APPUP_FILE = tv.appup
-APPUP_SRC = $(APPUP_FILE).src
-APPUP_TARGET = $(EBIN)/$(APPUP_FILE)
-# ----------------------------------------------------
-# FLAGS
-# ----------------------------------------------------
-ERL_COMPILE_FLAGS += +warn_obsolete_guard
-
-# ----------------------------------------------------
-# Targets
-# ----------------------------------------------------
-
-debug opt: $(TARGET_FILES)
-
-clean:
-	rm -f $(TARGET_FILES)
-	rm -f errs core *~
-
-$(APP_TARGET): $(APP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-$(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
-	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
-
-docs:
-
-# ----------------------------------------------------
-# Special Targets
-# ----------------------------------------------------
-
-# ----------------------------------------------------
-# Release Target
-# ---------------------------------------------------- 
-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"
-
-release_docs_spec:
-
diff --git a/lib/tv/src/tv.app.src b/lib/tv/src/tv.app.src
deleted file mode 100644
index e76c587868..0000000000
--- a/lib/tv/src/tv.app.src
+++ /dev/null
@@ -1,56 +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%
-{application, tv,
- [{description, "tv Table Visualizer"},
-  {vsn, "%VSN%"},
-  {modules, [tv,
-	     tv_comm_func,
-	     tv_db,
-	     tv_db_search,
-	     tv_db_sort,
-	     tv_ets_rpc,
-	     tv_etsread,
-	     tv_info,
-	     tv_io_lib,
-	     tv_io_lib_format,
-	     tv_io_lib_pretty,
-	     tv_ip,
-	     tv_main,
-	     tv_mnesia_rpc,
-	     tv_new_table,
-	     tv_nodewin,
-	     tv_pb,
-	     tv_pb_funcs,
-	     tv_pc,
-	     tv_pc_graph_ctrl,
-	     tv_pc_menu_handling,
-	     tv_pd,
-	     tv_pd_display,
-	     tv_pd_frames,
-	     tv_pd_scale,
-	     tv_pg,
-	     tv_pg_gridfcns,
-	     tv_poll_dialog,
-	     tv_pw,
-	     tv_pw_window,
-	     tv_rec_edit,
-	     tv_table_owner,
-	     tv_utils
-         ]},
-  {registered,[tv_table_owner]},
-  {applications, [kernel, stdlib, gs]}]}.
diff --git a/lib/tv/src/tv.appup.src b/lib/tv/src/tv.appup.src
deleted file mode 100644
index 0d918b6081..0000000000
--- a/lib/tv/src/tv.appup.src
+++ /dev/null
@@ -1,18 +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%
-{"%VSN%",[],[]}.
diff --git a/lib/tv/src/tv.erl b/lib/tv/src/tv.erl
deleted file mode 100644
index 70bc945c63..0000000000
--- a/lib/tv/src/tv.erl
+++ /dev/null
@@ -1,38 +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(tv).
-
--export([start/0,
-	start_browser/6]).
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-start() ->
-    tv_main:start().
-
-
-start_browser(Node, LocalNode, TableId, KindOfTable, TableName, ErrMsgMode) ->
-    spawn_link(tv_pc, pc, [self(), Node, LocalNode, TableId, KindOfTable, TableName, ErrMsgMode]).
-
-
-
-
-
diff --git a/lib/tv/src/tv_comm_func.erl b/lib/tv/src/tv_comm_func.erl
deleted file mode 100644
index d57960e303..0000000000
--- a/lib/tv/src/tv_comm_func.erl
+++ /dev/null
@@ -1,77 +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(tv_comm_func).
-
-
-
-
--export([max/2, 
-	 min/2
-	]).
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-max(X, Y) when X > Y ->
-    X;
-max(_X, Y) ->
-    Y.
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-min(X, Y) when X < Y ->
-    X;
-min(_X, Y) ->
-    Y.
-
-
-
diff --git a/lib/tv/src/tv_db.erl b/lib/tv/src/tv_db.erl
deleted file mode 100644
index 75537418b3..0000000000
--- a/lib/tv/src/tv_db.erl
+++ /dev/null
@@ -1,1271 +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:      Module handling the internal database in the table tool.
-%%%
-%%%*********************************************************************
-
--module(tv_db).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([dbs/2]).
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_db_int_def.hrl").
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-dbs(Master, ErrMsgMode) ->
-    process_flag(trap_exit, true),
-    put(error_msg_mode, ErrMsgMode),
-    ProcVars = #process_variables{master_pid = Master},
-    blocked(ProcVars).
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-blocked(ProcVars) ->
-    receive
-        Msg ->
-            case Msg of 
-
-                #dbs_deblock{} ->
-                    deblock(Msg, ProcVars, false);
-
-		{error_msg_mode, Mode} ->
-		    put(error_msg_mode, Mode),
-		    blocked(ProcVars);
-
-                {'EXIT', Pid, Reason} ->
-                    MasterPid = ProcVars#process_variables.master_pid,
-                    exit_signals({Pid, Reason}, MasterPid),
-                    blocked(ProcVars);
-
-                _Other ->
-                    blocked(ProcVars)
-            end
-    end.
-
-
-
-
-
-
-
-deblock(Msg, ProcVars, SearchWinCreated) ->
-    #dbs_deblock{sender         = Sender,
-		 etsread_pid    = EtsreadPid,
-		 type           = Type,
-		 keypos         = KeyPos,
-		 sublist_length = SublistLength} = Msg,
-
-    NewDbData = #db_data{subset_size = SublistLength,
-			 subset_pos  = 1,
-			 key_no      = KeyPos,
-			 ets_type    = Type
-			},
-    NewProcVars = ProcVars#process_variables{db_data     = NewDbData,
-					     etsread_pid = EtsreadPid},
-    Sender ! #dbs_deblock_cfm{sender = self()},
-    deblocked_loop(NewProcVars, SearchWinCreated, [], undefined).
-    
-
-
-
-
-
-
-
-deblocked_loop(ProcVars, SearchWinCreated, SearchData, RegExp) ->
-    receive
-	Msg ->
-	    case Msg of
-		
-		{gs,entry,keypress,_Data,['Return' | _T]} ->
-		    NewSearchData = search_object(ProcVars, RegExp),
-		    deblocked_loop(ProcVars, SearchWinCreated, NewSearchData, RegExp);
-
-		{gs,entry,keypress,_Data,['Tab' | _T]} ->
-		    gs:config(entry, [{select, {0,1000}}]),
-		    deblocked_loop(ProcVars, SearchWinCreated, SearchData, RegExp);
-		
-		{gs,entry,keypress,_Data,_Args} ->
-		    deblocked_loop(ProcVars, SearchWinCreated, SearchData, RegExp);
-
-		{gs,expr_term,click,_Data,_Args} ->
-		    deblocked_loop(ProcVars, SearchWinCreated, SearchData, false);
-
-		{gs,expr_regexp,click,_Data,_Args} ->
-		    deblocked_loop(ProcVars, SearchWinCreated, SearchData, true);
-
-		{gs,search,click,_Data,_Args} ->
-		    NewSearchData = search_object(ProcVars, RegExp),
-		    deblocked_loop(ProcVars, SearchWinCreated, NewSearchData, RegExp);
-		
-		{gs,cancel,click,cancel,_Args} ->
-		    tv_db_search:destroy_window(SearchWinCreated),
-		    deblocked_loop(ProcVars, false, [], RegExp);
-		
-		{gs,listbox,click,_LbData,[Idx | _T]} when SearchData =/= [] ->
-		    tv_db_search:mark_busy(SearchWinCreated),
-		    {Row,_Obj} = lists:nth(Idx+1, SearchData),
-		    DbData     = ProcVars#process_variables.db_data,
-		       %% Never allow 'subset_pos' to have zero as value! 
-		       %% No list can begin with the 0:th element!!! 
-		       %% Has to be at least 1!
-		    NewDbData  = DbData#db_data{subset_pos=?COMM_FUNC_FILE:max(1,
-									       Row),
-						subset_size=?ITEMS_TO_DISPLAY},
-		    NewProcVars = ProcVars#process_variables{db_data=NewDbData},
-		    send_subset(NewProcVars, undefined, undefined),
-		    tv_db_search:mark_nonbusy(SearchWinCreated),
-		    deblocked_loop(NewProcVars, SearchWinCreated, SearchData, RegExp);
-
-		{gs,win,configure,_Data,_Args} ->
-		    tv_db_search:resize_window(SearchWinCreated),
-		    deblocked_loop(ProcVars, SearchWinCreated, SearchData, RegExp);
-
-		{gs,win,destroy,_Data,_Args} ->
-		    deblocked_loop(ProcVars, false, [], RegExp);
-
-
-		#dbs_new_data{data = NewData, keys = ListOfKeys, 
-			      time_to_read_table = ElapsedTimeEtsread} ->
-		    tv_db_search:reset_window(SearchWinCreated),
-		    T1 = time(),
-		    NewProcVars = update_db(NewData, ListOfKeys, ProcVars),
-		    T2 = time(),
-		    ElapsedTimeDbs = compute_elapsed_seconds(T1, T2),
-		    send_subset(NewProcVars, ElapsedTimeEtsread, ElapsedTimeDbs),
-		    deblocked_loop(NewProcVars, SearchWinCreated, [], RegExp);
-
-		#dbs_subset_req{subset_pos = Pos,subset_length = Length} ->
-		    DbData    = ProcVars#process_variables.db_data,
-		       %% Never allow 'subset_pos' to have zero as value! 
-		       %% No list can begin with the 0:th element!!! 
-		       %% Has to be at least 1!
-		    NewDbData = DbData#db_data{subset_pos=?COMM_FUNC_FILE:max(1, 
-									      Pos),
-					       subset_size=Length},
-		    NewProcVars = ProcVars#process_variables{db_data = NewDbData},
-		    send_subset(NewProcVars, undefined, undefined),
-		    deblocked_loop(NewProcVars, SearchWinCreated, SearchData, RegExp);
-
-		#dbs_marked_row{row_no = RowNo} ->
-		    DbData      = ProcVars#process_variables.db_data,
-		    NewDbData   = DbData#db_data{requested_row = RowNo},
-		    NewProcVars = ProcVars#process_variables{db_data = NewDbData},
-		    deblocked_loop(NewProcVars, SearchWinCreated, SearchData, RegExp);
-		    
-		#dbs_search_req{} ->
-		    tv_db_search:create_window(SearchWinCreated),
-		    deblocked_loop(ProcVars, true, SearchData, false);
-
-		#dbs_sorting_mode{} ->
-		    {NewProcVars, NewSearchData} = 
-			update_sorting_mode(Msg, ProcVars, 
-					    SearchWinCreated, SearchData, RegExp),
-		    deblocked_loop(NewProcVars, SearchWinCreated, NewSearchData, RegExp);
-
-		#dbs_deblock{} ->
-		    tv_db_search:reset_window(SearchWinCreated),
-		    deblock(Msg, ProcVars, SearchWinCreated);
-
-		#dbs_updated_object{object=Obj,old_object=OldObj,old_color=Color,obj_no=ObjNo} ->
-		    {Success, NewProcVars} = update_object(Obj, OldObj, Color, ObjNo, ProcVars),
-		    case Success of
-			true ->
-			    tv_db_search:reset_window(SearchWinCreated),
-			    send_subset(NewProcVars, undefined, undefined);
-			false ->
-			    done
-		    end,
-		    deblocked_loop(NewProcVars, SearchWinCreated, SearchData, RegExp);
-
-		#dbs_new_object{object=Obj} ->
-		    {Success, NewProcVars} = new_object(Obj, ProcVars),
-		    case Success of
-			true ->
-			    tv_db_search:reset_window(SearchWinCreated),
-			    send_subset(NewProcVars, undefined, undefined);
-			false ->
-			    done
-		    end,
-		    deblocked_loop(NewProcVars, SearchWinCreated, SearchData, RegExp);
-
-		#dbs_delete_object{object=Obj, color=Color, obj_no=ObjNo} ->
-		    {Success, NewProcVars} = delete_object(Obj, Color, ObjNo, ProcVars),
-		    case Success of
-			true ->
-			    tv_db_search:reset_window(SearchWinCreated), 
-			    send_subset(NewProcVars, undefined, undefined);
-			false ->
-			    done
-		    end,
-		    deblocked_loop(NewProcVars, SearchWinCreated, SearchData, RegExp);
-
-		#pc_list_info{lists_as_strings=ListAsStr} ->
-		    NewProcVars = ProcVars#process_variables{lists_as_strings=ListAsStr},
-		    deblocked_loop(NewProcVars, SearchWinCreated, SearchData, RegExp);
-
-		{error_msg_mode, Mode} ->
-		    put(error_msg_mode, Mode),
-		    deblocked_loop(ProcVars, SearchWinCreated, SearchData, RegExp);
-
-                {'EXIT', Pid, Reason} ->
-                    MasterPid = ProcVars#process_variables.master_pid,
-                    exit_signals({Pid, Reason}, MasterPid),
-                    deblocked_loop(ProcVars, SearchWinCreated, SearchData, RegExp);
-
-                _Other ->
-                       %% io:format("Received message: ~w ~n", [_Other]),
-                    deblocked_loop(ProcVars, SearchWinCreated, SearchData, RegExp)
-	    end
-    end.
-
-
-
-
-
-
-
-search_object(ProcVars, RegExp) ->
-    DbData    = ProcVars#process_variables.db_data,
-    DbList    = dblist2list(DbData#db_data.db),
-    ListAsStr = ProcVars#process_variables.lists_as_strings,
-    case catch tv_db_search:get_input_and_search(DbList, RegExp, ListAsStr) of
-	{'EXIT', _Reason} ->
-	    tv_db_search:reset_window(true),
-	    [];
-	List ->
-	    List
-    end.
-
-
-
-
-
-
-update_sorting_mode(Msg, ProcVars, SearchWinCreated, OldSearchData, RegExp) ->
-    #dbs_sorting_mode{sorting     = Sorting,
-		      reverse     = Reverse,
-		      sort_key_no = SortKeyNo} = Msg,
-
-    DbData = ProcVars#process_variables.db_data,
-
-    #db_data{db          = DbList,
-	     sorting     = OldSorting,
-	     rev_sorting = OldReverse,
-	     sort_key_no = OldSortKeyNo} = DbData,
-    
-
-    NewDbList = sort_db_list(DbList, Sorting, OldSorting, Reverse, OldReverse, 
-			     SortKeyNo, OldSortKeyNo),
-    
-    NewDbData = DbData#db_data{db          = NewDbList,
-			       sorting     = Sorting,
-			       rev_sorting = Reverse,
-			       sort_key_no = SortKeyNo
-			      },
-
-    NewProcVars = ProcVars#process_variables{db_data = NewDbData},
-    send_subset(NewProcVars, undefined, undefined),
-
-    SearchData = 
-	case Sorting of
-	    false ->
-		OldSearchData;
-	    OldSorting when Reverse =:= OldReverse,
-			    SortKeyNo =:= OldSortKeyNo ->
-		[];
-	    OldSorting when Reverse =:= OldReverse,
-			    OldSortKeyNo =:= undefined->
-		[];
-	    _Other ->
-		ListAsStr = ProcVars#process_variables.lists_as_strings,
-		case catch tv_db_search:update_search(SearchWinCreated, 
-						      NewDbList, RegExp,
-						      ListAsStr) of
-		    {'EXIT', _Reason} ->
-			tv_db_search:reset_window(true),
-			[];
-		    List ->
-			List
-		end
-	end,
-
-    {NewProcVars, SearchData}.
-
-
-
-
-
-
-
-
-sort_db_list(DbList, Sort, Sort, Rev, Rev, KeyNo, KeyNo) ->
-       % Already sorted!
-    DbList;
-sort_db_list(DbList, false, _OldSort, _Rev, _OldRev, _KeyNo, _OldKeyNo) ->
-       % No sorting, i.e., the old list order suffices!
-    DbList;
-sort_db_list(DbList, _Sort, _OldSort, Rev, _OldRev, KeyNo, _OldKeyNo) ->
-    tv_db_sort:mergesort(KeyNo, DbList, Rev).
-    
-
-
-
-
-
-
-send_subset(ProcVars, EtsreadTime, DbsTime) ->
-    #process_variables{master_pid    = MasterPid,
-		       db_data       = DbData,
-		       list_of_keys  = ListOfKeys}   = ProcVars,
-    
-    #db_data{subset_size   = SubsetSize,
-	     subset_pos    = SubsetPos,
-	     requested_row = RowNo,
-	     db_size       = DbSize,
-	     db            = DbList,
-	     max_elem_size = MaxElemSize}  = DbData,
-    
-
-    RowData = get_requested_row_data(RowNo, DbList),
-
-    if 
-	DbSize > 0 ->
-	    Pos = ?COMM_FUNC_FILE:min(SubsetPos, DbSize),
-	       % Requested_data may be shorter than requested, but that's OK,
-               % pd handles that correctly!
-	    Subset = lists:sublist(DbList, Pos, SubsetSize),
-	    MasterPid ! #dbs_subset{sender                = self(),
-				    data                  = Subset,
-				    subset_pos            = Pos,
-				    db_length             = DbSize,
-				    list_of_keys          = ListOfKeys,
-				    max_elem_size         = MaxElemSize,
-				    requested_row         = RowData,
-				    required_time_etsread = EtsreadTime,
-				    required_time_dbs     = DbsTime
-				   };
-	true ->
-	    MasterPid ! #dbs_subset{sender                = self(),
-				    data                  = [],
-				    subset_pos            = 1,
-				    db_length             = 0,
-				    list_of_keys          = ListOfKeys,
-				    max_elem_size         = MaxElemSize,
-				    requested_row         = RowData,
-				    required_time_etsread = EtsreadTime,
-				    required_time_dbs     = DbsTime
-				   }
-    end.
-    
-    
-
-
-
-get_requested_row_data(undefined, _DbList) ->
-    [];
-get_requested_row_data(_RowNo, []) ->
-    [];
-get_requested_row_data(RowNo, DbList) ->
-    case catch lists:nth(RowNo, DbList) of
-	{'EXIT', _Reason} ->
-	    [];
-	RowData ->
-	    [RowData]
-    end.
-
-
-
-
-exit_signals(ExitInfo, MasterPid) ->
-    case ExitInfo of
-        {MasterPid, _Reason} ->
-               % When from master, just quit!
-            exit(normal);
-        _Other ->
-            done
-    end.
-
-
-
-
-update_db(NewList, ListOfKeys, ProcVars) ->
-    DbData = ProcVars#process_variables.db_data,
-    #db_data{db            = OldDbList,
-	     max_elem_size = MaxElemSize,
-	     deleted       = DelList,
-	     ets_type      = EtsType,
-	     sorting       = Sorting,
-	     rev_sorting   = RevSorting,
-	     sort_key_no   = SortKeyNo,
-	     key_no        = KeyNo} = DbData,
-    
-    DbList   = update_colors(OldDbList -- DelList),
-    OldList  = dblist2list(DbList),
-    InsOrUpd = (NewList -- OldList),
-    DelOrUpd = (OldList -- NewList),
-    
-    {Inserted, Deleted, Updated} = group_difflists(basetype(EtsType), KeyNo, 
-						   InsOrUpd, 
-						   DelOrUpd),
-    DelMarked = mark_deleted(KeyNo, Deleted, DbList),
-    Replaced  = replace_elements(KeyNo, Updated, DelMarked),
-    NewDbList = add_elements(KeyNo, Inserted, Replaced, Sorting, RevSorting, 
-			     SortKeyNo),
-
-    NewMaxSize = ?COMM_FUNC_FILE:max(MaxElemSize, 
-				     ?COMM_FUNC_FILE:max(max_size(Replaced), 
-							 max_size(Inserted))),
-
-    NewDbData = DbData#db_data{db            = NewDbList,
-			       db_size       = length(NewDbList),
-			       max_elem_size = NewMaxSize,
-			       deleted       = list2dblist(Deleted, ?BLACK)
-			      },
-
-    ProcVars#process_variables{db_data = NewDbData,
-			       list_of_keys = ListOfKeys
-			      }.
-    
-
-
-
-
-
-update_object(Obj, OldObj, OldColor, ObjNo, ProcVars) ->
-    #process_variables{db_data     = DbData,
-		       etsread_pid = EtsreadPid}  = ProcVars,
-    
-    #db_data{key_no        = KeyNo} = DbData,
-
-       %% Don't update if there are no changes!
-    case OldObj of
-	Obj when OldColor =/= ?BLACK ->   %% Allow deleted objects to be inserted!
-	    gs:window(dbwin, gs:start(), []),
-	    case get(error_msg_mode) of
-		normal ->
-		    tv_utils:notify(dbwin, "TV Notification", ["The object is unchanged!"]);
-		haiku ->
-		    tv_utils:notify(dbwin, "TV Notification", 
-				    ["Stay the patient course,",
-				     "Of little worth is your ire:",
-				     "The object's unchanged." ])
-	    end,
-	    gs:destroy(dbwin),
-	    {false, ProcVars};
-	_Other ->
-	       %% Before we try to update the internal database, we have to check to see
-	       %% whether the ETS/Mnesia update is allowed!
-	    Result = 
-		case OldColor of
-		    ?BLACK ->
-			EtsreadPid ! #etsread_new_object{sender     = self(),
-							 object     = Obj}, 
-			receive 
-			    #etsread_new_object_cfm{success = Success} ->
-				Success
-			after 
-			    60000 ->
-				exit(etsread_not_responding)
-			end;
-		    _OtherColor ->
-			EtsreadPid ! #etsread_update_object{sender     = self(),
-							    key_no     = KeyNo,
-							    object     = Obj,
-							    old_object = OldObj}, 
-			receive 
-			    #etsread_update_object_cfm{success = Success} ->
-				Success
-			after 
-			    60000 ->
-				exit(etsread_not_responding)
-			end
-		end,
-	    case Result of
-		false ->
-		    gs:window(dbwin, gs:start(), [beep]),
-		    case get(error_msg_mode) of
-			normal ->
-			    tv_utils:notify(dbwin, "TV Notification", 
-					    ["Couldn't update table!"]);
-			haiku ->
-			    tv_utils:notify(dbwin, "TV Notification", 
-					    ["Three things are certain:",
-					     "Death, taxes, and lost updates.",
-					     "Guess which has occurred."])
-		    end,
-		    gs:destroy(dbwin),
-		    {false, ProcVars};
-		true ->
-		    {true, update_object2(Obj, OldObj, OldColor, ObjNo, ProcVars)}
-	    end
-    end.
-
-
-
-
-
-update_object2(Obj, OldObj, OldColor, ObjNo, ProcVars) ->
-    #process_variables{db_data = DbData}  = ProcVars,
-    
-    #db_data{db            = DbList,
-	     ets_type      = EtsType,     %% 'bag', 'set', 'ordered_set' or 
-					  %% 'duplicate_bag'
-	     max_elem_size = MaxElemSize,
-	     sorting       = Sorting,
-	     rev_sorting   = RevSorting,
-	     sort_key_no   = SortKeyNo,
-	     key_no        = KeyNo} = DbData,
-
-       %% Replace the old element...
-    Key    = element(KeyNo, Obj),
-    OldKey = element(KeyNo, OldObj),
-       %% If Key == OldKey, the old object shall only be replaced!
-       %% Otherwise the updated object shall be treated as a new 
-       %% object when inserting it in the list!
-       %% In that latter case, we also have to check for duplicates!
-
-    Fun = 
-	case basetype(EtsType) of
-	    set ->
-		case Key of
-		    OldKey ->
-			fun({Data,Color}, {Replaced,AccDb}) when element(KeyNo,Data) =/= Key ->
-				{Replaced, [{Data,Color} | AccDb]};
-			   ({_Data,Color}, {Replaced,AccDb}) when not Replaced,
-								 OldColor =:= ?BLACK,
-								 Color =:= ?BLACK ->
-				{true, [{Obj,?RED1} | AccDb]};
-			   ({_Data,Color}, {Replaced,AccDb}) when not Replaced,
-								 OldColor =/= ?BLACK,
-								 Color =/= ?BLACK ->
-				{true, [{Obj,?GREEN1} | AccDb]};
-			   ({_Data,_Color}, {Replaced,AccDb}) ->
-				{Replaced, AccDb}
-			end;
-		    _NewKey ->
-			fun({Data,Color}, {Replaced,AccDb}) ->
-				ElemKey = element(KeyNo,Data),
-				case ElemKey of
-				    OldKey when not Replaced,
-						OldColor =:= ?BLACK,
-						Color    =:= ?BLACK ->
-					{true, [{Obj,?RED1} | AccDb]};
-				    OldKey when not Replaced,
-						OldColor =/= ?BLACK,
-						Color =/= ?BLACK ->
-					{true, [{Obj,?GREEN1} | AccDb]};
-				    OldKey ->
-					{Replaced, AccDb};
-				    Key ->
-					{Replaced, AccDb};
-				    _OtherKey ->
-					{Replaced, [{Data,Color} | AccDb]}
-				end
-			end
-		end;
-
-	    bag ->
-		case Key of
-		    OldKey ->
-			fun({Data,_Color}, {Replaced,AccDb}) when Data =:= Obj ->
-				{Replaced, AccDb};
-			   ({Data,Color}, {Replaced,AccDb}) when Data =/= OldObj ->
-				{Replaced, [{Data,Color} | AccDb]};
-			      %% Clauses when Data =:= OldObj.
-			   ({_Data,Color}, {Replaced,AccDb}) when not Replaced,
-								 OldColor =:= ?BLACK,
-								 Color =:= ?BLACK ->
-				{true, [{Obj,?RED1} | AccDb]};
-			   ({_Data,Color}, {Replaced,AccDb}) when not Replaced,
-								 OldColor =/= ?BLACK,
-								 Color =/= ?BLACK ->
-				{true, [{Obj,Color} | AccDb]};
-			   ({_Data,_Color}, {Replaced,AccDb}) ->
-				{Replaced, AccDb}
-			end;
-		    _NewKey ->
-			fun({Data,Color}, {Replaced,AccDb}) when Data =:= OldObj,
-								 not Replaced,
-								 OldColor =:= ?BLACK,
-								 Color =:= ?BLACK ->
-				{true, [{Obj,?RED1} | AccDb]};
-			   ({Data,Color}, {Replaced,AccDb}) when Data =:= OldObj,
-								 not Replaced,
-								 OldColor =/= ?BLACK,
-								 Color =/= ?BLACK ->
-				{true, [{Obj,?GREEN1} | AccDb]};
-			   ({Data,_Color}, {Replaced,AccDb}) when Data =:= OldObj ->
-				{Replaced, AccDb};
-			   ({Data,_Color}, {Replaced,AccDb}) when Data =:= Obj ->
-				{Replaced, AccDb};
-			   ({Data,Color}, {Replaced,AccDb}) ->
-				{Replaced, [{Data,Color} | AccDb]}
-			end
-		end;
-
-	    duplicate_bag ->
-		   %% Multiple identical objects allowed, meaning that we shall not
-		   %% remove anything, just replace one element.
-		case Key of
-		    OldKey ->
-			fun({Data,Color}, {Replaced,AccDb}) when Data =:= Obj ->
-				{Replaced, [{Data,Color} | AccDb]};
-			   ({Data,Color}, {Replaced,AccDb}) when Data =/= OldObj ->
-				{Replaced, [{Data,Color} | AccDb]};
-			   ({_Data,Color}, {Replaced,AccDb}) when not Replaced,
-								 OldColor =:= ?BLACK,
-								 Color =:= ?BLACK ->
-				{true, [{Obj,?RED1} | AccDb]};
-			   ({_Data,Color}, {Replaced,AccDb}) when not Replaced,
-								 OldColor =/= ?BLACK,
-								 Color =/= ?BLACK ->
-				{true, [{Obj,Color} | AccDb]};
-			   ({Data,Color}, {Replaced,AccDb}) ->
-				{Replaced, [{Data,Color} | AccDb]}
-			end;
-		    _NewKey ->
-			fun({Data,Color}, {Replaced,AccDb}) when Data =:= OldObj,
-								 not Replaced,
-								 OldColor =:= ?BLACK,
-								 Color =:= ?BLACK ->
-				{true, [{Obj,?RED1} | AccDb]};
-			   ({Data,Color}, {Replaced,AccDb}) when Data =:= OldObj,
-								 not Replaced,
-								 OldColor =/= ?BLACK,
-								 Color =/= ?BLACK ->
-				{true, [{Obj,?GREEN1} | AccDb]};
-			   ({Data,Color}, {Replaced,AccDb}) when Data =:= OldObj ->
-				{Replaced, [{Data,Color} | AccDb]};
-			   ({Data,Color}, {Replaced,AccDb}) when Data =:= Obj ->
-				{Replaced, [{Data,Color} | AccDb]};
-			   ({Data,Color}, {Replaced,AccDb}) ->
-				{Replaced, [{Data,Color} | AccDb]}
-			end
-		end
-	end,
-    
-    FilterFun = fun(Acc0, L) ->
-			lists:foldl(Fun, Acc0, L)
-		end,
-    
-    
-    {Repl, TmpList} =
-	case split(ObjNo, DbList) of
-	    {L1, [{OldObj,OldColor} | T]} when OldColor =/= ?BLACK ->
-		{true, 
-		 lists:reverse(element(2, FilterFun({true,[]}, L1))) ++ 
-		 [{Obj,?GREEN1} | lists:reverse(element(2, FilterFun({true,[]},T)))]};
-	    {L1, [{OldObj,OldColor} | T]} ->
-		{true, 
-		 lists:reverse(element(2, FilterFun({true,[]}, L1))) ++ 
-		 [{Obj,?RED1} | lists:reverse(element(2, FilterFun({true,[]}, T)))]};
-	    {L1, L2} ->
-		{R1, NewL1} = FilterFun({false,[]}, L1),
-		{R2, NewL2} = FilterFun({false,[]}, L2),
-		{R1 or R2, lists:reverse(NewL1) ++ lists:reverse(NewL2)}
-	end,
-
-    NewDbList = 
-	case Repl of
-	    true when not Sorting ->
-		TmpList;
-	    true ->
-		tv_db_sort:mergesort(SortKeyNo, TmpList, RevSorting);
-	    false ->
-		TmpList2 = 
-		    case Key of
-			OldKey ->
-			    lists:reverse(element(2, FilterFun({false,[]}, TmpList)));
-			_OtherKey ->
-			    lists:reverse(element(2, FilterFun({true,[]}, TmpList))) ++ 
-				[{Obj,?RED1}]
-		    end,
-		case Sorting of
-		    false ->
-			TmpList2;
-		    true ->
-			tv_db_sort:mergesort(SortKeyNo, TmpList2, RevSorting)
-		end
-	end,
-    NewMaxSize = ?COMM_FUNC_FILE:max(MaxElemSize, max_size([Obj])),
-    NewDbData = DbData#db_data{db            = NewDbList,
-			       db_size       = length(NewDbList),
-			       max_elem_size = NewMaxSize
-			      },
-    ProcVars#process_variables{db_data = NewDbData}.
-
-
-
-
-
-delete_object(_Obj, ?BLACK, _ObjNo, ProcVars) ->
-       %% Don't delete already deleted objects!!!
-    {false, ProcVars};
-delete_object(undefined, undefined, _ObjNo, ProcVars) ->
-    {false, ProcVars};
-delete_object(Obj, _ObjColor, ObjNo, ProcVars) ->
-    #process_variables{db_data     = DbData,
-		       etsread_pid = EtsreadPid}  = ProcVars,
-    
-    #db_data{db            = DbList,
-	     deleted       = OldDeleted} = DbData,
-    
-       %% Before we try to update the internal database, we have to check to see
-       %% whether the ETS/Mnesia update is allowed!
-    EtsreadPid ! #etsread_delete_object{sender     = self(),
-					object     = Obj}, 
-    Result = 
-	receive 
-	    #etsread_delete_object_cfm{success = Success} ->
-		Success
-	after
-	    60000 ->
-		exit(etsread_not_responding)
-	end,
-    
-    case Result of
-	false ->
-	    gs:window(dbwin, gs:start(), [beep]),
-	    case get(error_msg_mode) of
-		normal ->
-		    tv_utils:notify(dbwin, "TV Notification", 
-				    ["Couldn't update table!"]);
-		haiku ->
-		    tv_utils:notify(dbwin, "TV Notification", 
-				    ["Three things are certain:",
-				     "Death, taxes, and lost updates.",
-				     "Guess which has occurred."])
-	    end,
-	    gs:destroy(dbwin),
-	    {false, ProcVars};
-	true ->
-	       %% Replace the old element...
-	       %% Have to beware of duplicate_bag tables,
-	       %% i.e., the same object may occur more than
-	       %% once, but we only want to remove it once!
-	    {Repl, TmpList} =
-		case split(ObjNo, DbList) of
-		    {L1, [{Obj,_Color} | T]} ->
-			{true, L1 ++ [{Obj,?BLACK} | T]};
-		    {L1, L2} ->
-			{false, L1 ++ L2}
-		end,
-	    NewDbList = 
-		case Repl of
-		    true ->
-			TmpList;
-		    false ->
-			Fun = fun({Data,TmpColor}, 
-				  {Removed,AccDb}) when Data =/= Obj ->
-				      {Removed, [{Data,TmpColor} | AccDb]};
-				 ({_Data,TmpColor}, 
-				  {Removed,AccDb}) when not Removed, TmpColor =/= ?BLACK ->
-				      {true, [{Obj,?BLACK} | AccDb]};
-				 ({Data,TmpColor}, 
-				  {Removed,AccDb}) ->
-				      {Removed, [{Data,TmpColor} | AccDb]}
-			      end,
-			lists:reverse(element(2, lists:foldl(Fun, {false,[]}, DbList)))
-		end,
-	    NewDbData = DbData#db_data{db      = NewDbList,
-				       db_size = length(NewDbList),
-				       deleted = [{Obj,?BLACK} | OldDeleted]},
-	    {true, ProcVars#process_variables{db_data = NewDbData}}
-    end.
-
-
-
-
-
-new_object(Obj, ProcVars) ->
-    #process_variables{db_data     = DbData,
-		       etsread_pid = EtsreadPid}  = ProcVars,
-    
-    #db_data{db            = DbList,
-	     max_elem_size = MaxElemSize,
-	     ets_type      = EtsType,     %% 'bag', 'set' or 'duplicate_bag'
-	     sorting       = Sorting,
-	     rev_sorting   = RevSorting,
-	     sort_key_no   = SortKeyNo,
-	     key_no        = KeyNo} = DbData,
-
-       %% Before we try to update the internal database, we have to check to see
-       %% whether the ETS/Mnesia update is allowed!
-    EtsreadPid ! #etsread_new_object{sender     = self(),
-				     object     = Obj}, 
-    Result = 
-	receive 
-	    #etsread_new_object_cfm{success = Success} ->
-		Success
-	after
-	    60000 ->
-		exit(etsread_not_responding)
-	end,
-    
-    case Result of
-	false ->
-	    gs:window(dbwin, gs:start(), [beep]),
-	    case get(error_msg_mode) of
-		normal ->
-		    tv_utils:notify(dbwin, "TV Notification", 
-				    ["Couldn't update table!"]);
-		haiku ->
-		    tv_utils:notify(dbwin, "TV Notification", 
-				    ["Three things are certain:",
-				     "Death, taxes, and lost updates.",
-				     "Guess which has occurred."])
-	    end,
-	    gs:destroy(dbwin),
-	    {false, ProcVars};
-	true ->
-	    Key = element(KeyNo, Obj),
-	    NewDbList = insert_new_object(EtsType, Key, KeyNo, Obj, DbList, Sorting, 
-					  RevSorting, SortKeyNo),
-	    NewMaxSize = ?COMM_FUNC_FILE:max(MaxElemSize, max_size([Obj])),
-	    NewDbData = DbData#db_data{db            = NewDbList,
-				       db_size       = length(NewDbList),
-				       max_elem_size = NewMaxSize
-				      },
-	    {true, ProcVars#process_variables{db_data = NewDbData}}
-    end.
-
-
-
-
-
-insert_new_object(EtsType,Key,KeyNo,Obj,DbList,Sorting,RevSorting,SortKeyNo) ->
-       %% Remove elements from the list that ought not to be there,
-       %% according to the table type!
-
-    Fun = 
-	case basetype(EtsType) of
-	    set ->
-		fun({Data,Color}, {Replaced,AccDb}) when element(KeyNo,Data) =/= Key ->
-			{Replaced, [{Data,Color} | AccDb]};
-		   ({Data,Color}, {Replaced,AccDb}) when not Replaced, 
-							 Color =/= ?BLACK,
-							 Data =/= Obj->
-			{true, [{Obj,?GREEN1} | AccDb]};
-		   ({_Data,Color}, {Replaced,AccDb}) when not Replaced, 
-							 Color =/= ?BLACK ->
-			{true, [{Obj,Color} | AccDb]};
-		   ({_Data,Color}, {Replaced,AccDb}) when not Replaced, 
-							 Color =:= ?BLACK ->
-			{true, [{Obj, ?RED1} | AccDb]};
-		   ({_Data,Color}, {Replaced,AccDb}) when Replaced, 
-							 Color =:= ?BLACK ->
-			{false, AccDb};
-		   ({_Data,_Color}, {Replaced,AccDb}) ->
-			{Replaced, AccDb}
-		end;
-	    bag ->
-		fun({Data,Color}, {Replaced,AccDb}) when Data =/= Obj ->
-			{Replaced, [{Data,Color} | AccDb]};
-		   ({_Data,Color}, {Replaced,AccDb}) when not Replaced, 
-							 Color =/= ?BLACK ->
-			{true, [{Obj,Color} | AccDb]};
-		   ({_Data,Color}, {Replaced,AccDb}) when Replaced, 
-							 Color =/= ?BLACK ->
-			{true, AccDb};
-		   ({_Data,Color}, {Replaced,AccDb}) when Replaced, 
-							 Color =:= ?BLACK ->
-			{true, AccDb};
-		   ({_Data,Color}, {Replaced,AccDb}) when not Replaced, 
-							 Color =:= ?BLACK ->
-			{true, [{Obj, ?RED1} | AccDb]};
-		   ({_Data,_Color}, {Replaced,AccDb}) ->
-			{Replaced, AccDb}
-		end;
-	    duplicate_bag ->
-		   %% The fun is never called if the type is duplicate_bag,
-		   %% because all we have to do with new elements is to insert 
-		   %% them (multiple identical objects allowed). 
-		not_used
-	end,
-    
-    FilterFun = fun(Acc0, L) ->
-			lists:foldl(Fun, Acc0, L)
-		end,
-    
-    {_Replaced, TmpDbList} = 
-	case EtsType of
-	    duplicate_bag ->
-		{false, DbList};
-	    _OtherType ->
-		{R,L} = FilterFun({false,[]}, DbList),
-		{R, lists:reverse(L)}
-	end,
-
-    case Sorting of
-	false ->
-	    TmpDbList ++ [{Obj,?RED1}];
-	true ->
-	       %% The original list is already sorted!
-	       %% Just merge the two lists together!
-	    tv_db_sort:merge(SortKeyNo, TmpDbList, [{Obj,?RED1}], RevSorting)
-    end.
-    
-
-
-
-
-
-max_size([]) ->    
-    0;
-max_size(L) ->
-    max_size(L, 0).
-
-
-
-max_size([], CurrMax) ->
-    CurrMax;
-max_size([H | T], CurrMax) when is_tuple(H) ->
-    Size = size(H),
-    if
-	Size >= CurrMax ->
-	    max_size(T, Size);
-	true ->
-	    max_size(T, CurrMax)
-    end;
-max_size([_H | T], CurrMax) ->
-    Size = 1,
-    if
-	Size >= CurrMax ->
-	    max_size(T, Size);
-	true ->
-	    max_size(T, CurrMax)
-    end.
-
-
-
-
-
-add_elements(_KeyNo, Inserted, List, false, _RevSorting, _SortKeyNo) ->
-       % Remember that the order of the original list has to be preserved!
-    List ++ list2dblist(Inserted, ?RED1);
-add_elements(_KeyNo, Inserted, List, _Sorting, RevSorting, SortKeyNo) ->
-       % The original list is already sorted - sort the new elements, and
-       % just merge the two lists together!
-    SortedInsertedList = tv_db_sort:mergesort(SortKeyNo, 
-					       list2dblist(Inserted, ?RED1), 
-					       RevSorting),
-    tv_db_sort:merge(SortKeyNo, List, SortedInsertedList, RevSorting).
-    
-
-
-
-
-   %% We assume the list already has been sorted, i.e., since the order won't 
-   %% be changed by marking an element deleted, we DON'T have to sort the list
-   %% once again!
-
-mark_deleted(_KeyNo, [], List) ->
-    List;
-mark_deleted(KeyNo, [Data | T], List) ->
-    KeyValue = tv_db_sort:get_compare_value(KeyNo, Data),
-    NewList  = mark_one_element_deleted(KeyNo, KeyValue, Data, List, []),
-    mark_deleted(KeyNo, T, NewList).
-  
-  
-
-
-
-
-
-
-mark_one_element_deleted(_KeyNo, _KeyValue, _Data, [], Acc) ->
-    Acc;
-mark_one_element_deleted(KeyNo, {tuple, KeyValue}, 
-			 Data, [{DataTuple, Color} | Tail], Acc) ->
-    OldKeyValue = tv_db_sort:get_compare_value(KeyNo, DataTuple),
-       % Remember that the order of the original list has to be preserved!
-    if
-	OldKeyValue =:= {tuple, KeyValue} ->
-	    Acc ++ [{Data, ?BLACK}] ++ Tail;
-	true ->
-	    mark_one_element_deleted(KeyNo, {tuple, KeyValue}, Data, Tail, 
-				     Acc ++ [{DataTuple, Color}])
-    end;
-mark_one_element_deleted(KeyNo, _KeyValue, Data, [{DataTuple, Color} | Tail], Acc) ->
-    if
-	Data =:= DataTuple ->
-	    Acc ++ [{Data, ?BLACK}] ++ Tail;
-	true ->
-	    mark_one_element_deleted(KeyNo, _KeyValue, Data, Tail, 
-				     Acc ++ [{DataTuple, Color}])
-    end.
-  
-  
-  
-  
-
-
-
-   %% We assume the list already has been sorted, i.e., since the order won't 
-   %% be changed by marking an element updated, we DON'T have to sort the list
-   %% once again!
-
-replace_elements(_KeyNo, [], List) ->
-    List;
-replace_elements(KeyNo, [Data | T], List) ->
-    KeyValue = tv_db_sort:get_compare_value(KeyNo, Data),
-    NewList  = replace_one_element(KeyNo, KeyValue, Data, List, []),
-    replace_elements(KeyNo, T, NewList).
-
-
-
-
-
-    
-    
-replace_one_element(_KeyNo, _Key, _Data, [], Acc) ->
-    Acc;
-replace_one_element(KeyNo, {tuple, Key1}, Data, [{DataTuple, Color} | Tail], Acc) ->
-    Key2 = tv_db_sort:get_compare_value(KeyNo, DataTuple),
-    % Remember that the order of the original list has to be preserved!
-    if
-	Key2 =:= {tuple, Key1} ->
-	    Acc ++ [{Data, ?GREEN1}] ++ Tail;
-	true ->
-	    replace_one_element(KeyNo, {tuple, Key1}, Data, Tail, 
-				Acc ++ [{DataTuple, Color}])
-    end;
-replace_one_element(_KeyNo, _KeyValue, _Data, [{DataTuple, Color} | Tail], Acc) ->
-       % Can't replace an element with no key!
-    Acc ++ [{DataTuple, Color} | Tail].
-    
-
-
-
-
-
-
-
-group_difflists(bag, _KeyNo, Inserted, Deleted) ->	     
-       %% Since the ETS table is of bag type, no element can be updated, i.e.,
-       %% it can only be deleted and re-inserted, otherwise a new element will be added.
-    {Inserted, Deleted, []};
-group_difflists(duplicate_bag, _KeyNo, Inserted, Deleted) ->	     
-       %% Since the ETS table is of duplicate_bag type, no element can be updated, i.e.,
-       %% it can only be deleted and re-inserted, otherwise a new element will be added.
-    {Inserted, Deleted, []};
-group_difflists(set, _KeyNo, [], Deleted) ->
-       %% Updated elements have to be present in both lists, i.e., if one list is empty,
-       %% the other contains no updated elements - they are either inserted or deleted!
-    {[], Deleted, []};
-group_difflists(set, _KeyNo, Inserted, []) ->
-    {Inserted, [], []};
-group_difflists(set, KeyNo, InsOrUpd, DelOrUpd) ->
-    match_difflists(KeyNo, InsOrUpd, DelOrUpd, [], []).    
-
-
-
-
-
-
-match_difflists(_KeyNo, [], Deleted, Inserted, Updated) ->
-    {Inserted, Deleted, Updated};
-match_difflists(KeyNo, [Data | T], DelOrUpd, InsAcc, UpdAcc) ->
-    % This function is only called in case of a 'set' ETS table.
-    % 'Set' type of ETS table means there are unique keys. If two elements in 
-    % InsOrUpd and DelOrUpd have the same key, that element has been updated, 
-    % and is added to the Updated list, and removed from the original two lists.
-    % After the two lists have been traversed in this way, the remaining elements
-    % in DelOrUpd forms the new Deleted list (analogous for InsOrUpd).
-    % If we want to improve the performance, we could check which list is the 
-    % shortest, since the traversing time depends on this. 
-    Key = element(KeyNo, Data),
-    case searchdelete(Key, KeyNo, DelOrUpd) of
-	{true, NewDelOrUpd} ->
-	    match_difflists(KeyNo, T, NewDelOrUpd, InsAcc, [Data | UpdAcc]);
-	{false, SameDelOrUpd} ->
-	    match_difflists(KeyNo, T, SameDelOrUpd, [Data | InsAcc], UpdAcc)
-    end.
-
-
-
-
-searchdelete(_Key, _ElemNo, []) ->
-    {false, []};
-searchdelete(Key, ElemNo, List) ->
-    searchdelete(Key, ElemNo, List, []).
-
-
-
-
-
-searchdelete(_Key, _ElemNo, [], Acc) ->
-    {false, Acc};
-searchdelete(Key, ElemNo, [Tuple | Tail], Acc) ->
-    % We don't use standard libraries, 'cause we want to make an 'atomic'
-    % operation, i.e., we will not search the list two times...
-    case (element(ElemNo, Tuple) =:= Key) of
-	true ->
-	    {true, Acc ++ Tail};   % Return the list without the matching element
-	_Other ->
-	    searchdelete(Key, ElemNo, Tail, [Tuple | Acc])
-    end.
-	
-    
-
-
-
-
-
-dblist2list([]) ->
-    [];
-dblist2list([{Data, _Color} | T]) ->
-    [Data | dblist2list(T)].
-    
-    
-    
-
-
-
-
-list2dblist([], _Color) ->    
-    [];
-list2dblist([Data | T], Color) ->
-    [{Data, Color} | list2dblist(T, Color)].
-
-
-
-
-
-
-
-
-update_colors([]) ->
-    [];
-update_colors([{Data, Color} | T]) ->
-    [{Data, new_color(Color)} | update_colors(T)].
-    
-
-
-
-
-
-
-
-new_color(?GREEN1) ->
-    ?GREEN2;
-new_color(?GREEN2) ->
-    ?GREEN3;
-new_color(?GREEN3) ->
-    ?GREEN4;
-new_color(?GREEN4) ->
-    ?GREEN5;
-new_color(?GREEN5) ->
-    ?DEFAULT_BTN_COLOR;
-new_color(?RED1) ->
-    ?RED2;
-new_color(?RED2) ->
-    ?RED3;
-new_color(?RED3) ->
-    ?RED4;
-new_color(?RED4) ->
-    ?RED5;
-new_color(?RED5) ->
-    ?DEFAULT_BTN_COLOR;
-new_color(_Other) ->
-    ?DEFAULT_BTN_COLOR.                  % Default shall be gray.
-
-
-
-
-
-
-
-
-compute_elapsed_seconds({H1, M1, S1}, {H2, M2, S2}) ->
-    ElapsedHours   = get_time_diff(hours, H1, H2),
-    ElapsedMinutes = get_time_diff(minutes, M1, M2),
-    ElapsedSeconds = get_time_diff(seconds, S1, S2),
-    (ElapsedHours * 3600) + (ElapsedMinutes * 60) + ElapsedSeconds + 1.
-
-
-
-
-
-
-
-get_time_diff(_Type, T1, T2) when T1 =< T2 ->
-    T2 - T1;
-get_time_diff(hours, T1, T2) ->
-    T2 + 24 - T1;
-get_time_diff(minutes, T1, T2) ->
-    T2 + 60 - T1;
-get_time_diff(seconds, T1, T2) ->
-    T2 + 60 - T1.
-
-
-
-
-split(_N, []) ->
-    {[], []};
-split(0, List) ->
-    {[], List};
-split(N, List) ->
-    split2(0, N - 1, [], List).
-
-
-
-split2(Ctr, N, Acc, [H | T]) when Ctr < N ->
-    split2(Ctr + 1, N, [H | Acc], T);
-split2(_Ctr, _N, Acc, []) ->
-    {lists:reverse(Acc), []};
-split2(_Ctr, _N, Acc, List) ->
-    {lists:reverse(Acc), List}.
-
-basetype(ordered_set) ->	    
-    set;
-basetype(Any) ->
-    Any.
diff --git a/lib/tv/src/tv_db_int_def.hrl b/lib/tv/src/tv_db_int_def.hrl
deleted file mode 100644
index d2cb8adee5..0000000000
--- a/lib/tv/src/tv_db_int_def.hrl
+++ /dev/null
@@ -1,80 +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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      Internal definitions for the database part of the table 
-%%%                     tool.
-%%%
-%%%*********************************************************************
-
--define(WHITE,             {255, 255, 255}).
--define(MEDIUM_GRAY,       {170, 170, 170}).
-
-
--define(LIGHT_GREEN,       {  0, 255,   0}).
--define(GREEN,             { 50, 215,  50}).
--define(DARK_GREEN,        { 50, 170,  50}).
--define(FOREST_GREEN,      { 34, 139,  34}).
--define(DARK_FOREST_GREEN, { 15, 100,  15}).
-
-
-
--define(RED,               {255,   0,   0}).
--define(PINK,              {255, 130, 170}).
--define(LIGHT_VIOLET,      {220, 150, 225}).
--define(VIOLET,            {160,  70, 180}).
--define(DARK_VIOLET,       {100,  10, 130}).
-
-
-
-
-
-
--record(db_data, {db            = [],     % List containing all elements
-		  db_size       = 0,      % Number of elements in 'db'
-		  max_elem_size = 0,      % Size of largest element in db.
-		  hidden        = [],     % Elements (i.e., keys) not to be shown
-		  deleted       = [],     % Elements just deleted
-		  subset_size,            % Size of the subset to be extracted and 
-		                          % shown
-		  subset_pos,             % Position in list where subset starts
-		  sorting       = false,  % Tells whether sorting is used ('true' 
-		                          % or 'false')
-		  requested_row = 0,
-		  rev_sorting   = false,  % Tells whether the sorting (if any) is
-		                          % in reversed order or not ('true' or 
-		                          % 'false')
-		  sort_key_no,            % Element in each tuple to use as sorting
-		                          % element
-		  key_no,                 % Element in each tuple to use as key
-		                          % (this element is used when updating the
-					  % dblist, i.e., inserting, deleting a.s.o)
-		  ets_type                % 'bag' or 'set'
-		 }).
-                      
-
--record(process_variables, {master_pid,
-			    etsread_pid,
-                            db_data      = #db_data{},
-			    list_of_keys = [],
-			    lists_as_strings = true
-                           }).
-
-
-
-
diff --git a/lib/tv/src/tv_db_search.erl b/lib/tv/src/tv_db_search.erl
deleted file mode 100644
index edfa57df04..0000000000
--- a/lib/tv/src/tv_db_search.erl
+++ /dev/null
@@ -1,475 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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:      Code for the search window.
-%%%
-%%%*********************************************************************
--module(tv_db_search).
--compile([{nowarn_deprecated_function,{gs,button,3}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,entry,3}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,label,3}},
-          {nowarn_deprecated_function,{gs,listbox,3}},
-          {nowarn_deprecated_function,{gs,radiobutton,3}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([create_window/1,
-	 resize_window/1,
-	 reset_window/1,
-	 destroy_window/1,
-	 mark_busy/1,
-	 mark_nonbusy/1,
-	 get_input_and_search/3,
-	 update_search/4,
-	 string_to_term/1
-	]).
-
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_db_int_def.hrl").
-
-
-
-
--define(WIN_WIDTH, 445).
--define(SMALL_WIN_HEIGHT, 117).
--define(BIG_WIN_HEIGHT, 335).
--define(FRAME_WIDTH, 429).  % 334
--define(OLD_FRAME_WIDTH, 334). 
--define(FRAME_HEIGHT, 105).
--define(FRAME_XPOS, (10-2)).
--define(FRAME_YPOS, 10).
--define(ENTRY_XPOS, 9).
--define(ENTRY_YPOS, 31).
--define(ENTRY_WIDTH, (?OLD_FRAME_WIDTH-10-2*?ENTRY_XPOS-5)).
--define(LISTBOX_WIDTH, ?WIN_WIDTH-2*?FRAME_XPOS+1).
--define(LISTBOX_HEIGHT, 162).
--define(LISTBOX_XPOS, ?FRAME_XPOS-2).
--define(LISTBOX_YPOS, ?SMALL_WIN_HEIGHT+8).
--define(BTN_WIDTH, 80).
--define(BTN_HEIGHT, 30).
--define(BTN_XPOS, ?OLD_FRAME_WIDTH-6).
--define(BG_COLOUR, {217,217,217}).
-
-
-
-
-
-
-create_window(true) ->
-    gs:config(win, [raise]);
-create_window(false) ->
-    gs:window(win, gs:start(), [{width,?WIN_WIDTH},
-				{height,?SMALL_WIN_HEIGHT},
-				{data,small},
-				{bg,?BG_COLOUR},
-				{title,"[TV]   Search Object"},
-				{destroy,true},
-				{configure,true},
-				{cursor,arrow}
-			       ]),
-
-    F = gs:frame(win, [{width,?FRAME_WIDTH},
-		       {height,?FRAME_HEIGHT},
-		       {x,?FRAME_XPOS},
-		       {y,?FRAME_YPOS},
-		       {bw,2},
-		       {bg,?BG_COLOUR}
-		      ]),
-
-    gs:label(F, [{width,80},
-		 {height,25},
-		 {x,?ENTRY_XPOS+2},
-		 {y,8},
-		 {align,w},
-		 {bg,?BG_COLOUR},
-		 {fg, {0,0,0}},
-		 {label, {text,"Search for:"}}
-		]),
-
-    gs:entry(entry, F, [{width,?ENTRY_WIDTH},
-			{height,30},
-			{x,?ENTRY_XPOS},
-			{y,?ENTRY_YPOS},
-			{insert, {0,"<Search expression>"}},
-			{bg, {255,255,255}},
-			{fg, {0,0,0}},
-			{cursor,text},
-			{justify,left},
-			{keypress,true},
-			{setfocus,true}
-		       ]),
-
-    Group = list_to_atom("expr" ++ pid_to_list(self())),
-    RadioWidth = round(?ENTRY_WIDTH / 2),
-    gs:radiobutton(expr_term, F, [{width,RadioWidth - 45},
-				  {height,25},
-				  {x,?ENTRY_XPOS},
-				  {y,?ENTRY_YPOS+40},
-				  {group,Group},
-				  {align, c},
-				  {label,{text,"as term"}},
-				  {select,true}
-				 ]),
-    gs:radiobutton(expr_regexp, F, [{width,RadioWidth + 45},
-				    {height,25},
-				    {x,?ENTRY_XPOS+RadioWidth-20-26},
-				    {y,?ENTRY_YPOS+40},
-				    {group,Group},
-				    {align,c},
-				    {label,{text,"as regular expression"}}
-				   ]),
-        
-    gs:button(search, F, [{width,?BTN_WIDTH},
-			  {height,?BTN_HEIGHT},
-			  {x,?BTN_XPOS},
-			  {y,11},
-			  {label, {text,"Search"}},
-			  {bg,?BG_COLOUR},
-			  {fg, {0,0,0}}
-			 ]),
-    gs:button(cancel, F, [{width,?BTN_WIDTH},
-			  {height,?BTN_HEIGHT},
-			  {x,?BTN_XPOS},
-			  {y,?BTN_HEIGHT+11+10},
-			  {label, {text,"Cancel"}},
-			  {data,cancel},
-			  {bg,?BG_COLOUR},
-			  {fg, {0,0,0}}
-			 ]),
-    expand_window(),
-    gs:config(entry, [{select, {0,1000}}]),
-    gs:config(win, [{map,true}]).
-    
-			    
-
-
-resize_window(false) ->
-    done;
-resize_window(true) ->
-    gs:config(win, [{width,?WIN_WIDTH},
-		    {height,?BIG_WIN_HEIGHT}
-		   ]).
-			    
-
-
-		   
-reset_window(false) ->
-    done;
-reset_window(true) ->
-    gs:config(listbox, [clear]),
-    gs:config(objects_found, [{label, {text,""}}]).
-
-
-				
-
-destroy_window(false) ->
-    done;
-destroy_window(true) ->
-    gs:destroy(win).
-
-
-
-mark_busy(false) ->
-    done;
-mark_busy(true) ->
-    gs:config(win, [{cursor,busy}]),
-    gs:config(entry, [{cursor,busy}]).
-    
-
-
-
-mark_nonbusy(false) ->
-    done;
-mark_nonbusy(true) ->
-    gs:config(win, [{cursor,arrow}]),
-    gs:config(entry, [{cursor,text}]).
-
-	    
-
-
-get_input_and_search(DbList, IsRegExp, ListAsStr) ->
-    get_input_and_search(DbList, IsRegExp, true, ListAsStr).
-    
-
-
-
-get_input_and_search(DbList, IsRegExp, Notify, ListAsStr) ->
-    Str = get_entry_text(),
-    StrConvRes = case IsRegExp of 
-		     true ->
-			 string_to_regexp(Str);
-		     false ->
-			 string_to_term(Str)
-		 end,
-
-    case StrConvRes of
-	{ok, TermOrRE} ->
-	    search(IsRegExp, TermOrRE, DbList, ListAsStr);
-	{error, {_Reason, Msg}} when Notify ->
-	    gs:config(win, [beep]),
-	    tv_utils:notify(win, "TV Notification", Msg);
-	{error, {_Reason, _Msg}} ->
-	    done
-    end.
-
-
-
-update_search(false, _DbList, _IsRegExp, _ListAsStr) ->
-    done;
-update_search(true, DbList, true, ListAsStr) ->
-    get_input_and_search(DbList, false, false, ListAsStr);
-update_search(true, DbList, false, ListAsStr) ->
-    get_input_and_search(DbList, true, false, ListAsStr).
-    
-	    
-
-get_entry_text() ->
-    gs:read(entry,text).
-
-
-
-string_to_regexp(Str) ->
-    case re:compile(Str) of
-	{ok, RegExp} ->
-	    {ok, RegExp};
-	{error, _Error} ->
-	    case get(error_msg_mode) of
-		normal ->
-		    {error, {not_a_regexp, "Please enter a regular expression!"}};
-		haiku ->
-		    {error, {not_a_regexp, ["Being incorrect",
-					    "The regular expression",
-					    "Must now be retyped."]}}
-	    end
-    end.
-
-
-
-string_to_term(Str) ->
-    case catch erl_scan:string(Str ++ ". ") of
-	{ok, ScannedStr, _No} ->
-	    case erl_parse:parse_term(ScannedStr) of
-		{ok, Term} ->
-		    {ok, Term};
-		_Other ->
-		       %% May be a PID, have to check this, since erl_scan
-		       %% currently cannot handle this case...  :-(
-		    case catch list_to_pid(Str) of
-			Pid when is_pid(Pid) ->
-			    {ok, Pid};
-			_Error ->
-			    case get(error_msg_mode) of
-				normal ->
-				    {error, {not_a_term, "Please enter a valid term!"}};
-				haiku ->
-				    {error, {not_a_term, ["Aborted effort.",
-							  "Reflect, repent and retype:",
-							  "Enter valid term."]}}
-			    end
-		    end
-	    end;
-	_Error ->
-	    case get(error_msg_mode) of
-		normal ->
-		    {error, {not_a_term, "Please enter a valid term!"}};
-		haiku ->
-		    {error, {not_a_term, ["Aborted effort.",
-					  "Reflect, repent and retype:",
-					  "Enter valid term."]}}
-	    end
-    end.
-    
-
-
-search(IsRegExp, SearchValue, DbList, ListAsStr) ->
-    gs:config(cancel, [{label, {text,"Stop"}}]),
-    mark_busy(true),
-    reset_window(true),
-    SearchRes = traverse(SearchValue, DbList, 1, length(DbList), [], IsRegExp, ListAsStr),
-    gs:config(cancel, [{label, {text,"Cancel"}}]),
-    mark_nonbusy(true),
-    SearchRes.
-
-
-
-
-
-expand_window() ->
-    gs:listbox(listbox, win, [{width,?LISTBOX_WIDTH},
-			      {height,?LISTBOX_HEIGHT},
-			      {x,?LISTBOX_XPOS},
-			      {y,?LISTBOX_YPOS},
-			      {bg, {255,255,255}},
-			      {fg, {0,0,0}},
-			      {scrollbg,?BG_COLOUR},
-			      {scrollfg,?BG_COLOUR},
-			      {hscroll,bottom},
-			      {vscroll,right},
-			      {click,true},
-			      {doubleclick,false},
-			      {selectmode,single}
-			     ]),
-    gs:label(objects_found, win, [{width,?LISTBOX_WIDTH},
-				  {height,25},
-				  {x,?LISTBOX_XPOS},
-				  {y,?LISTBOX_YPOS+?LISTBOX_HEIGHT+13},
-				  {align,w},
-				  {bg,?BG_COLOUR},
-				  {fg, {0,0,0}}
-				 ]),
-    gs:config(win, [{width,?WIN_WIDTH},
-		    {height,?BIG_WIN_HEIGHT}
-		   ]).
-    
-
-
-    
-
-
-
-traverse(Pattern, [Object | T], Row, Length, Acc, IsRegExp, ListAsStr) ->
-    SearchRes = 
-	case IsRegExp of
-	    true ->
-		search_for_regexp(Pattern, Object, ListAsStr);
-	    false ->
-		compare_terms(Pattern, Object)
-	end,
-
-    NewAcc 
-	= case SearchRes of
-	      found ->
-		  RowStr    = integer_to_list(Row),
-		  LengthStr = integer_to_list(Length),
-		  ObjectStr = case ListAsStr of
-				  true ->
-				      lists:flatten(tv_io_lib:format("~p", [Object]));
-				  false ->
-				      lists:flatten(tv_io_lib:write(Object))
-			      end,
-		  
-		  gs:config(listbox, 
-			    [{add,
-			      "  Row " ++ RowStr ++ ":" ++
-			      lists:duplicate(length(LengthStr)-length(RowStr), " ") ++ 
-			      "   " ++ ObjectStr}
-			    ]),
-		  gs:config(objects_found, 
-			    [{label, 
-			      {text,integer_to_list(length(Acc)+1) ++ 
-			       " object(s) found"}}
-			    ]),
-		  [{Row,Object} | Acc];
-	      not_found ->
-		  Acc
-	  end,
-    receive 
-	{gs,cancel,click,_Data,_Args} ->
-	    gs:config(objects_found, 
-		      [{label, 
-			{text,integer_to_list(gs:read(listbox,size)) ++ 
-			 " object(s) found"}}
-		      ]),
-	    lists:reverse(NewAcc)
-    after 
-	0 ->
-	    traverse(Pattern, T, Row+1, Length, NewAcc, IsRegExp, ListAsStr)
-    end;
-traverse(_Pattern, [], _N, _Length, Acc, _IsRegExp, _ListAsStr) ->
-    gs:config(objects_found, 
-	      [{label, 
-		{text,integer_to_list(gs:read(listbox,size)) ++ 
-		 " object(s) found"}}
-	      ]),
-    lists:reverse(Acc).
-
-
-
-
-search_for_regexp(Pattern, Elem, ListAsStr) -> 
-    ListToSearch = 
-	case ListAsStr of
-	    true ->
-		lists:flatten(tv_io_lib:format("~p", [Elem]));
-	    false ->
-		lists:flatten(tv_io_lib:write(Elem))
-	end,
-
-    case re:run(ListToSearch, Pattern, [{capture,none}]) of
-	match ->
-	    found;
-	nomatch ->
-	    not_found
-    end.
-
-
-
-
-
-compare_terms(Term, Elem) when not is_tuple(Elem), not is_list(Elem), Term =/= Elem ->
-    not_found;
-compare_terms(Term, Term) ->
-       %% Even the case Term = "{}" or "[]"!!!
-    found;
-compare_terms(Term, Elem) when is_list(Elem) ->
-    traverse_list(Term, Elem);
-compare_terms(Term, Elem) when is_tuple(Elem) ->
-    traverse_tuple(Term, Elem, 1, size(Elem)).
-
-
-
-	
-
-traverse_tuple(Pattern, Tuple, N, Stop) when N =< Stop ->
-    Elem = element(N,Tuple),
-    case compare_terms(Pattern, Elem) of
-	found ->
-	    found;
-	not_found ->
-	    traverse_tuple(Pattern, Tuple, N+1, Stop)
-    end;
-traverse_tuple(_Pattern, _Tuple, N, Stop) when N > Stop ->
-    not_found.
-
-
-
-
-
-
-traverse_list(Pattern, [H | T]) ->
-    case compare_terms(Pattern, H) of
-	found ->
-	    found;
-	not_found ->
-	    traverse_list(Pattern, T)
-    end;
-traverse_list(_Pattern, []) ->
-    not_found.
-
diff --git a/lib/tv/src/tv_db_sort.erl b/lib/tv/src/tv_db_sort.erl
deleted file mode 100644
index 3675c7b413..0000000000
--- a/lib/tv/src/tv_db_sort.erl
+++ /dev/null
@@ -1,141 +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(tv_db_sort).
-
-
-
--export([mergesort/3, merge/4, get_compare_value/2]).
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-
-mergesort(_KeyNo, [X], _ReverseOrder) -> 
-    [X];
-mergesort(_KeyNo, [], _ReverseOrder) -> 
-    [];
-mergesort(KeyNo, X, ReverseOrder) -> 
-    split(KeyNo, X, [], [], ReverseOrder).
-
-
-
-
-
-
-
-
-   %% If we want reverse order when just merging two lists,
-   %% each of them has to be in reverse order first!
-
-merge(KeyNo, [{E1, C1} | T1], [{E2, C2} | T2], Reverse) when not Reverse ->
-    K1 = get_compare_value(KeyNo, E1),
-    K2 = get_compare_value(KeyNo, E2),
-    case get_correct_order(K1, E1, K2, E2) of
-	{1, 2} ->
-	    [{E1, C1} | merge(KeyNo, T1, [{E2, C2} | T2], Reverse)]; 
-	{2, 1} ->
-	    [{E2, C2} | merge(KeyNo, [{E1, C1} | T1], T2, Reverse)]
-    end;
-merge(KeyNo, [{E1, C1} | T1], [{E2, C2} | T2], Reverse) ->
-    K1 = get_compare_value(KeyNo, E1),
-    K2 = get_compare_value(KeyNo, E2),
-    case get_correct_order(K1, E1, K2, E2) of
-	{1, 2} ->
-	    [{E2, C2} | merge(KeyNo, [{E1, C1} | T1], T2, Reverse)];
-	{2, 1} ->
-	    [{E1, C1} | merge(KeyNo, T1, [{E2, C2} | T2], Reverse)] 
-    end;
-merge(_KeyNo, [], L2, _Reverse) ->       % L2 may be the empty list also!
-    L2;
-merge(_KeyNo, L1, [], _Reverse) ->       % L1 may be the empty list also!
-    L1.
-
-    
-
-
-
-
-get_compare_value(KeyNo, E) when is_tuple(E) ->
-    case catch element(KeyNo, E) of
-	{'EXIT', {badarg, {?MODULE, get_compare_value, [KeyNo, E]}}} ->
-	    short_tuple;
-	V ->
-	    {tuple, V}
-    end;
-get_compare_value(_KeyNo, _E) ->
-    no_tuple.
-
-
-
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-split(KeyNo, [A,B|T], X, Y, Reverse) ->
-    split(KeyNo, T, [A|X], [B|Y], Reverse);
-split(KeyNo, [H], X, Y, Reverse) ->
-    split(KeyNo, [], [H|X], Y, Reverse);
-split(KeyNo, [], X, Y, Reverse) ->
-    merge(KeyNo, 
-	  mergesort(KeyNo, X, Reverse), 
-	  mergesort(KeyNo, Y, Reverse), 
-	  Reverse).
-
-
-
-
-
-
-get_correct_order({tuple, V1}, _E1, {tuple, V2}, _E2) when V1 < V2 ->
-    {1, 2};
-get_correct_order({tuple, _V1}, _E1, {tuple, _V2}, _E2) ->
-    {2, 1};
-get_correct_order(short_tuple, _E1, {tuple, _V2}, _E2) ->
-    {1, 2};
-get_correct_order({tuple, _V1}, _E1, short_tuple, _E2) ->
-    {2, 1};
-get_correct_order(short_tuple, E1, short_tuple, E2) when E1 < E2 ->
-    {1, 2};
-get_correct_order(short_tuple, _E1, short_tuple, _E2) ->
-    {2, 1};
-get_correct_order(no_tuple, E1, no_tuple, E2) when E1 < E2 ->
-    {1, 2};
-get_correct_order(no_tuple, _E1, no_tuple, _E2) ->
-    {2, 1};
-get_correct_order(_Anything, _E1, no_tuple, _E2) ->     % Tuples first, then other 
-    {1, 2};                                           % terms in correct order!
-get_correct_order(no_tuple, _E1, _Anything, _E2) ->
-    {2, 1}.
diff --git a/lib/tv/src/tv_ets_rpc.erl b/lib/tv/src/tv_ets_rpc.erl
deleted file mode 100644
index ec2fde30ac..0000000000
--- a/lib/tv/src/tv_ets_rpc.erl
+++ /dev/null
@@ -1,140 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-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(tv_ets_rpc).
-
-
-
--export([all/2,
-	 info/4,
-	 new/4,
-	 tab2list/3,
-	 insert/4,
-	 lookup/4,
-	 delete/4
-	]).
-
-
-
-
-all(_Node, true) ->                  
-    chk(catch ets:all());
-all(Node, false) ->
-    chk(catch rpc:block_call(Node, ets, all, [])).
-
-
-
-
-info(_Node, true, TabId, What) ->
-    chk(catch ets:info(TabId, What));
-info(Node, false, TabId, What) ->
-    chk(catch rpc:block_call(Node, ets, info, [TabId, What])).
-    
-
-
-
-new(_Node, true, TabName, Options) ->
-    case catch ets:new(TabName, Options) of
-	{TabName, Pid} when is_pid(Pid) ->
-	    {TabName,Pid};
-	{TabNo, Pid} when is_pid(Pid) ->
-	    {TabNo,Pid};
-	OtherResult ->
-	    chk(OtherResult)
-    end;
-new(Node, false, TabName, Options) ->
-    case catch rpc:block_call(Node, ets, new, [TabName, Options]) of
-	{TabName, Pid} when is_pid(Pid) ->
-	    {TabName,Pid};
-	{TabNo, Pid} when is_pid(Pid) ->
-	    {TabNo, Pid};
-	OtherResult ->
-	    chk(OtherResult)
-    end.
-    
-
-
-
-tab2list(_Node, true, TabId) ->
-    chk(catch ets:tab2list(TabId));
-tab2list(Node, false, TabId) ->
-    chk(catch rpc:call(Node, ets, tab2list, [TabId])).
-
-
-
-
-insert(_Node, true, TabId, Object) ->
-    chk(catch ets:insert(TabId, Object));
-insert(Node, false, TabId, Object) ->
-    chk(catch rpc:call(Node, ets, insert, [TabId, Object])).
-
-
-
-
-lookup(_Node, true, TabId, Key) ->
-    chk(catch ets:lookup(TabId, Key));
-lookup(Node, false, TabId, Key) ->
-    chk(catch rpc:call(Node, ets, lookup, [TabId, Key])).
-
-
-
-
-delete(_Node, true, TabId, Key) ->
-    chk(catch ets:delete(TabId, Key));
-delete(Node, false, TabId, Key) ->
-    chk(catch rpc:call(Node, ets, delete, [TabId, Key])).
-
-
-
-
-chk(Result) ->
-    case Result of
-	undefined ->
-	    throw(no_table);
-	_Anything when is_list(Result) ->
-	    Result;
-	_Anything when is_atom(Result) ->
-	    Result;
-	_Anything when is_integer(Result) ->
-	    Result;
-	_Anything when is_pid(Result) ->
-	    Result;
-
-	%% Messages received when node is down.
-	{badrpc, nodedown} ->
-	    throw(nodedown);
-	{'EXIT', nodedown} ->
-	    throw(nodedown);
-	{'EXIT', {{badarg, {gen, set_monitor_node, _Args}}, _Reason}} ->
-	    throw(nodedown);
-
-	%% Messages received when table doesn't exist.
-	{'EXIT', {badarg, {ets,local_info,_Args}}} ->  
-	       %% Due to inconsistencies in R2D and earlier versions:
-	       %% ets:info/1 returned 'undefined' when table didn't
-	       %% exist, while ets:info/2 returned the exit-signal 
-	       %% above. This was corrected in R3A - now both functions 
-	       %% return 'undefined'  :-)
-	    throw(no_table);
-	{badrpc, {'EXIT', {badarg,_Reason}}} ->
-	    throw(no_table);
-	{'EXIT', {badarg,_Reason}} ->
-	    throw(no_table);
-	Error when is_tuple(Error) ->   
-	    throw({unexpected_error,Error})
-    end.
-	
diff --git a/lib/tv/src/tv_etsread.erl b/lib/tv/src/tv_etsread.erl
deleted file mode 100644
index 32f111c9a1..0000000000
--- a/lib/tv/src/tv_etsread.erl
+++ /dev/null
@@ -1,770 +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:      Module containing the interface towards ETS tables,
-%%%                     i.e., handling the polling and thereafter sending the 
-%%%                     result to the database part of the table tool.
-%%%
-%%%*********************************************************************
-
-
--module(tv_etsread).
--compile([{nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([etsread/2]).
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-etsread(MasterPid, ErrorMsgMode) ->
-    process_flag(trap_exit, true),
-    put(error_msg_mode, ErrorMsgMode),
-    blocked(MasterPid).
-
-
-
-
-
-%%%*********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-blocked(MasterPid) ->
-    receive
-        Msg ->
-            case Msg of 
-
-                #etsread_deblock{} ->
-                    deblock(Msg, MasterPid);
-
-		{'EXIT', Pid, Reason} ->
-	            exit_signals({Pid, Reason}, MasterPid),
-		    blocked(MasterPid);
-
-		{error_msg_mode, Mode} ->
-		    put(error_msg_mode, Mode),
-		    blocked(MasterPid);
-
-                _Other ->
-		    %% io:format("Received signal ~p~n", [_Other]),
-                    blocked(MasterPid)
-            end
-    end.
-    
-
-
-
-
-
-
-deblock(Msg, MasterPid) ->
-    #etsread_deblock{dbs_pid       = DbsPid,
-		     table_type    = KindOfTable,
-		     node          = Node,
-		     local_node    = LocalNode,
-		     table_id      = TableId,
-		     poll_interval = PollInt}  = Msg,
-    PollInterval = case PollInt of 
-		       infinity ->
-			   PollInt;
-		       _Other ->
-			   PollInt * 1000
-		   end,
-       %% Get table info!
-    case catch get_table_info(Node, LocalNode, TableId, KindOfTable) of
-	nodedown ->
-	    MasterPid ! #pc_nodedown{sender            = self(),
-				     automatic_polling = false},
-	    blocked(MasterPid);
-	no_table ->
-	    MasterPid ! #pc_dead_table{sender = self(),
-				       automatic_polling = false},
-	    blocked(MasterPid);
-	mnesia_not_started ->
-	    MasterPid ! #pc_dead_table{sender = self(),
-				       automatic_polling = false},
-	    blocked(MasterPid);
-	{unexpected_error,_Reason} ->
-	    MasterPid ! #pc_dead_table{sender = self(),
-				       automatic_polling = false},
-	    blocked(MasterPid);
-	{Type, Pos, Protection} ->
-	    MasterPid ! #etsread_deblock_cfm{sender     = self(),
-					     type       = Type,
-					     keypos     = Pos,
-					     protection = Protection
-					    },
-	    
-	    timer:sleep(500),
-	    case catch read_table(Node, LocalNode, TableId, KindOfTable, DbsPid) of
-		nodedown ->
-		    MasterPid ! #pc_nodedown{sender            = self(),
-					     automatic_polling = false},
-		    blocked(MasterPid);
-		no_table ->
-		    MasterPid ! #pc_dead_table{sender = self(),
-					       automatic_polling = false},
-		    blocked(MasterPid);
-		mnesia_not_started ->
-		    MasterPid ! #pc_dead_table{sender = self(),
-					       automatic_polling = false},
-		    blocked(MasterPid);
-		{unexpected_error,_Reason} ->
-		    MasterPid ! #pc_dead_table{sender = self(),
-					       automatic_polling = false},
-		    blocked(MasterPid);
-		_ElapsedTime ->
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode, TableId, 
-				   KindOfTable, PollInterval)
-	    end
-    end.
-
-
-		    
-	    
-					     
-
-get_table_info(Node, LocalNode, TableId, KindOfTable) ->
-    case KindOfTable of
-	ets ->
-	       % Check whether table is 'bag' or 'set' type.
-	    Type       = tv_ets_rpc:info(Node, LocalNode, TableId, type),
-	       % Get position for the key.
-	    Pos        = tv_ets_rpc:info(Node, LocalNode, TableId, keypos),
-	    Protection = tv_ets_rpc:info(Node, LocalNode, TableId, protection),
-	    {Type, Pos, Protection};
-	mnesia ->
-	    Type = tv_mnesia_rpc:table_info(Node, LocalNode, TableId, type),
-	    Pos  = 2,
-	       %% All Mnesia tables are regarded as being public!
-	    {Type, Pos, public}
-    end.
-	    
-
-
-
-    
-
-deblocked_loop(MasterPid,DbsPid,Node,LocalNode,TableId,KindOfTable,PollInterval) ->
-    receive
-	Msg ->
-
-	    case Msg of 
-		
-		#etsread_poll_table{} ->
-		    case catch read_table(Node, LocalNode, TableId, KindOfTable, DbsPid) of
-			   %% No automatic polling here!
-			nodedown ->
-			    MasterPid ! #pc_nodedown{sender            = self(),
-						     automatic_polling = false};
-			no_table ->
-			    MasterPid ! #pc_dead_table{sender = self(),
-						       automatic_polling = false};
-			mnesia_not_started ->
-			    MasterPid ! #pc_dead_table{sender = self(),
-						       automatic_polling = false};
-			{unexpected_error,_Reason} ->
-			    MasterPid ! #pc_dead_table{sender = self(),
-						       automatic_polling = false};
-			_ElapsedTime ->
-			    done
-		    end,
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode,
-				   TableId, KindOfTable, PollInterval);
-		    
-
-		#etsread_set_poll_interval{interval = PollInt} ->
-		    NewPollInterval = case PollInt of 
-					  infinity ->
-					      PollInt;
-					  _Other ->
-					      PollInt * 1000
-				      end,
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode,
-				   TableId, KindOfTable, NewPollInterval);
-
-
-		#etsread_deblock{} ->
-		    deblock(Msg, MasterPid);
-		
-
-		#etsread_update_object{key_no=KeyNo, object=Obj, old_object=OldObj} ->
-		    update_object(KindOfTable, Node, LocalNode, TableId, DbsPid, 
-				  KeyNo, Obj, OldObj, MasterPid, PollInterval),
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode, TableId, KindOfTable, 
-				   PollInterval);
-
-
-		#etsread_new_object{object=Obj} ->
-		    new_object(KindOfTable, Node, LocalNode, TableId, DbsPid, 
-				  Obj, MasterPid, PollInterval),
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode, TableId, KindOfTable, 
-				   PollInterval);
-
-
-		#etsread_delete_object{object=Obj} ->
-		    delete_object(KindOfTable, Node, LocalNode, TableId, DbsPid, 
-				  Obj, MasterPid, PollInterval),
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode, TableId, KindOfTable, 
-				   PollInterval);
-
-
-		#ip_dead_table{} ->
-		    AutoPoll = case PollInterval of
-				   infinity ->
-				       false;
-				   _Other ->
-				       true
-			       end,
-		    MasterPid ! #pc_dead_table{sender            = self(),
-					       automatic_polling = AutoPoll},
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode, TableId, 
-				   KindOfTable, infinity);
-		    
-
-		#etsread_nodedown{} ->
-		    AutoPoll = case PollInterval of
-				   infinity ->
-				       false;
-				   _Other ->
-				       true
-			       end,
-		    MasterPid ! #pc_nodedown{sender            = self(),
-					     automatic_polling = AutoPoll},
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode, TableId, 
-				   KindOfTable, infinity);
-
-
-		{error_msg_mode, Mode} ->
-		    put(error_msg_mode, Mode),
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode, TableId, KindOfTable, 
-				   PollInterval);
-		
-
-		{'EXIT', Pid, Reason} ->
-	            exit_signals({Pid, Reason}, MasterPid),
-		    deblocked_loop(MasterPid, DbsPid, Node, LocalNode,
-				   TableId, KindOfTable, PollInterval)
-	    end
-    
-    after PollInterval ->
-	       %% Automatic polling must be on, otherwise these 
-	       %% lines would never be executed!
-	    NewPollInterval =
-		case catch read_table(Node,LocalNode,TableId,KindOfTable,DbsPid) of
-		    nodedown ->
-			MasterPid ! #pc_nodedown{sender            = self(),
-						 automatic_polling = true},
-			infinity;
-		    no_table ->
-			MasterPid ! #pc_dead_table{sender = self(),
-						   automatic_polling = true},
-			infinity;
-		    mnesia_not_started ->
-			MasterPid ! #pc_dead_table{sender = self(),
-						   automatic_polling = true},
-			infinity;
-		    {unexpected_error,_Reason} ->
-			MasterPid ! #pc_dead_table{sender = self(),
-						   automatic_polling = true},
-			infinity;
-		    ElapsedMilliseconds ->
-			if
-			    (ElapsedMilliseconds * 1000) >= PollInterval ->
-				infinity;
-			    true ->
-				PollInterval
-			end
-		end,
-	    deblocked_loop(MasterPid, DbsPid, Node, LocalNode,
-			   TableId, KindOfTable, NewPollInterval)
-    end.
-
-
-
-
-
-exit_signals(ExitInfo, MasterPid) ->
-    case ExitInfo of
-        {MasterPid, _Reason} ->
-            exit(normal);
-        _Other ->
-	    done
-    end.
-
-
-
-
-update_object(KindOfTable, Node, LocalNode, TableId, DbsPid, KeyNo, Obj, OldObj, MasterPid, PollInterval) ->
-    AutoPoll = 
-	case PollInterval of
-	    infinity ->
-		false;
-	    _Other ->
-		true
-	end,
-    case check_record_format(KindOfTable, Node, LocalNode, TableId, Obj) of
-	bad_format ->
-	    DbsPid ! #etsread_update_object_cfm{sender   = self(),
-						success  = false};
-	ok ->
-	       %% Check that we are allowed to edit the table!
-	    case catch update_object2(KindOfTable, Node, LocalNode, TableId, DbsPid, KeyNo, 
-				      Obj, OldObj) of
-		
-		nodedown ->
-		    DbsPid ! #etsread_update_object_cfm{sender  = self(),
-							success = false},
-		    MasterPid ! #pc_nodedown{sender             = self(),
-					     automatic_polling  = AutoPoll};
-		
-		no_table ->
-		    DbsPid ! #etsread_update_object_cfm{sender   = self(),
-							success  = false},
-		    MasterPid ! #pc_dead_table{sender = self(),
-					       automatic_polling = AutoPoll};
-		
-		mnesia_not_started ->
-		    DbsPid ! #etsread_update_object_cfm{sender   = self(),
-							success  = false},
-		    MasterPid ! #pc_dead_table{sender            = self(),
-					       automatic_polling = AutoPoll};
-		
-		
-		{unexpected_error,_Reason} ->
-		    DbsPid ! #etsread_update_object_cfm{sender   = self(),
-							success  = false},
-		    MasterPid ! #pc_dead_table{sender            = self(),
-					       automatic_polling = AutoPoll};
-		
-		ok ->
-		    DbsPid ! #etsread_update_object_cfm{sender  = self(),
-							success = true}
-	    end
-    end.
-
-
-
-
-
-update_object2(ets, Node, LocalNode, Tab, _DbsPid, KeyNo, Obj, OldObj) ->
-       %% We shall update a specific object! If the table is a 'set' table,
-       %% it is just to insert the altered object. However, if the table
-       %% is a 'bag', or a 'duplicate_bag', we first have to remove the
-       %% old object, and then insert the altered one. 
-       %% But, we aren't finished with that... we also want to preserve
-       %% the time order, meaning we have to delete *ALL* objects having the
-       %% very same key, and then insert them again! (Actually we would have 
-       %% to do this anyhow, due to limitations in the interface functions,
-       %% but this remark has to be noted!)
-    OldKey = element(KeyNo, OldObj),
-    InsertList = 
-	case tv_ets_rpc:info(Node, LocalNode, Tab, type) of
-	    set ->
-		   %% Have to remove old object, because the key may be what's changed.
-		tv_ets_rpc:delete(Node, LocalNode, Tab, OldKey),
-		[Obj];
-	    ordered_set ->
-		   %% Have to remove old object, because the key may be what's changed.
-		tv_ets_rpc:delete(Node, LocalNode, Tab, OldKey),
-		[Obj];
-	    _Other ->  %% 'bag' or 'duplicate_bag'
-		OldList = tv_ets_rpc:lookup(Node, LocalNode, Tab, OldKey),
-		tv_ets_rpc:delete(Node, LocalNode, Tab, OldKey),
-		   %% Have to beware of duplicate_bag tables,
-		   %% i.e., the same object may occur more than
-		   %% once, but we only want to replace it once!
-		{_Replaced, TmpList} =
-		    lists:foldl(
-		      fun(Data, {Replaced,Acc}) when Data =/= OldObj ->
-			      {Replaced, [Data | Acc]};
-			 (_Data, {Replaced,Acc}) when not Replaced ->
-			      {true, [Obj | Acc]};
-			 (Data, {Replaced,Acc}) ->
-			      {Replaced, [Data | Acc]}
-		      end,
-		      {false, []},
-		      OldList),
-		lists:reverse(TmpList)
-	end,
-    lists:foreach(fun(H) ->
-			  tv_ets_rpc:insert(Node, LocalNode, Tab, H)
-		  end,
-		  InsertList),
-    ok;
-update_object2(mnesia, Node, LocalNode, Tab, _DbsPid, KeyNo, Obj, OldObj) ->
-    OldKey = element(KeyNo, OldObj),
-    InsertList = 
-	case tv_mnesia_rpc:table_info(Node, LocalNode, Tab, type) of
-	    set ->
-		tv_mnesia_rpc:transaction(
-		  Node,
-		  LocalNode,
-		  fun() ->
-			  mnesia:delete(Tab,OldKey,write)
-		  end),
-		[Obj];
-	    ordered_set ->
-		tv_mnesia_rpc:transaction(
-		  Node,
-		  LocalNode,
-		  fun() ->
-			  mnesia:delete(Tab,OldKey,write)
-		  end),
-		[Obj];
-	    _Other ->  %% 'bag' or 'duplicate_bag'
-		{atomic, OldList} = 
-		    tv_mnesia_rpc:transaction(
-		      Node, 
-		      LocalNode,
-		      fun() -> 
-			      mnesia:read(Tab,OldKey,read)
-		      end),
-		   %% We can't use mnesia:delete_object here, because
-		   %% time order wouldn't be preserved then!!!
-		tv_mnesia_rpc:transaction(
-		  Node,
-		  LocalNode,
-		  fun() ->
-			  mnesia:delete(Tab,OldKey,write)
-		  end),
-		ChangeFun =
-		    fun(H) when H =:= OldObj ->
-			    Obj;
-		       (H) ->
-			    H
-		    end,
-		[ChangeFun(X) || X <- OldList]
-	end,
-    lists:foreach(fun(H) ->
-			  tv_mnesia_rpc:transaction(
-			    Node, 
-			    LocalNode,
-			    fun() ->
-				       %% This mnesia call shall not be distributed,
-				       %% since the transaction sees to that it is
-				       %% executed on the right node!!!
-				    mnesia:write(Tab,H,write)
-			    end)
-		  end,
-		  InsertList),
-    ok.
-
-		  
-
-
-
-
-delete_object(KindOfTable, Node, LocalNode, TableId, DbsPid, Obj, MasterPid, PollInterval) ->
-    AutoPoll = 
-	case PollInterval of
-	    infinity ->
-		false;
-	    _Other ->
-		true
-	end,
-    case catch delete_object2(KindOfTable, Node, LocalNode, TableId, DbsPid, Obj) of
-
-	nodedown ->
-	    DbsPid ! #etsread_delete_object_cfm{sender  = self(),
-						success = false},
-	    MasterPid ! #pc_nodedown{sender             = self(),
-				     automatic_polling  = AutoPoll};
-
-	no_table ->
-	    DbsPid ! #etsread_delete_object_cfm{sender   = self(),
-						success  = false},
-	    MasterPid ! #pc_dead_table{sender = self(),
-				       automatic_polling = AutoPoll};
-	
-	mnesia_not_started ->
-	    DbsPid ! #etsread_delete_object_cfm{sender   = self(),
-						success  = false},
-	    MasterPid ! #pc_dead_table{sender            = self(),
-				       automatic_polling = AutoPoll};
-
-	{unexpected_error,_Reason} ->
-	    DbsPid ! #etsread_delete_object_cfm{sender   = self(),
-						success  = false},
-	    MasterPid ! #pc_dead_table{sender            = self(),
-				       automatic_polling = AutoPoll};
-
-	ok ->
-	    DbsPid ! #etsread_delete_object_cfm{sender  = self(),
-						success = true}
-    end.
-
-
-
-
-delete_object2(ets, Node, LocalNode, Tab, _DbsPid, Obj) ->
-    KeyNo = tv_ets_rpc:info(Node, LocalNode, Tab, keypos),
-    Key   = element(KeyNo, Obj),
-    InsertList = 
-	case tv_ets_rpc:info(Node, LocalNode, Tab, type) of
-	    set ->
-		   %% Have to remove old object, because the key may be what's changed.
-		tv_ets_rpc:delete(Node, LocalNode, Tab, Key),
-		[];
-	    ordered_set ->
-		   %% Have to remove old object, because the key may be what's changed.
-		tv_ets_rpc:delete(Node, LocalNode, Tab, Key),
-		[];
-	    _Other ->  %% 'bag' or 'duplicate_bag'
-		OldList = tv_ets_rpc:lookup(Node, LocalNode, Tab, Key),
-		tv_ets_rpc:delete(Node, LocalNode, Tab, Key),
-		OldList -- [Obj]
-	end,
-
-    lists:foreach(fun(H) ->
-			  tv_ets_rpc:insert(Node, LocalNode, Tab, H)
-		  end,
-		  InsertList),
-    ok;
-delete_object2(mnesia, Node, LocalNode, Tab, _DbsPid, Obj) ->
-    tv_mnesia_rpc:transaction(
-      Node, 
-      LocalNode,
-      fun() ->
-	         %% This mnesia call shall not be distributed,
-	         %% since the transaction sees to that it is
-	         %% executed on the right node!!!
-	      mnesia:delete_object(Tab,Obj,write)
-      end),
-    ok.
-
-
-
-
-
-new_object(KindOfTable, Node, LocalNode, TableId, DbsPid, Obj, MasterPid, PollInterval) ->
-    AutoPoll = 
-	case PollInterval of
-	    infinity ->
-		false;
-	    _Other ->
-		true
-	end,
-    case check_record_format(KindOfTable, Node, LocalNode, TableId, Obj) of
-	bad_format ->
-	    DbsPid ! #etsread_new_object_cfm{sender   = self(),
-						success  = false};
-	ok ->
-	       %% Check that we are allowed to edit the table!
-	    case catch new_object2(KindOfTable, Node, LocalNode, TableId, DbsPid, Obj) of
-		
-		nodedown ->
-		    DbsPid ! #etsread_new_object_cfm{sender  = self(),
-						     success = false},
-		    MasterPid ! #pc_nodedown{sender             = self(),
-					     automatic_polling  = AutoPoll};
-		
-		no_table ->
-		    DbsPid ! #etsread_new_object_cfm{sender   = self(),
-						     success  = false},
-		    MasterPid ! #pc_dead_table{sender = self(),
-					       automatic_polling = AutoPoll};
-		
-		mnesia_not_started ->
-		    DbsPid ! #etsread_new_object_cfm{sender   = self(),
-						     success  = false},
-		    MasterPid ! #pc_dead_table{sender            = self(),
-					       automatic_polling = AutoPoll};
-		
-		{unexpected_error,_Reason} ->
-		    DbsPid ! #etsread_new_object_cfm{sender   = self(),
-						     success  = false},
-		    MasterPid ! #pc_dead_table{sender            = self(),
-					       automatic_polling = AutoPoll};
-		
-		ok ->
-		    DbsPid ! #etsread_new_object_cfm{sender  = self(),
-						     success = true}
-	    end
-    end.
-
-
-
-
-
-new_object2(ets, Node, LocalNode, Tab, _DbsPid, Obj) ->
-    tv_ets_rpc:insert(Node, LocalNode, Tab, Obj),
-    ok;
-new_object2(mnesia, Node, LocalNode, Tab, _DbsPid, Obj) ->
-    tv_mnesia_rpc:transaction(
-      Node, 
-      LocalNode,
-      fun() ->
-	         %% This mnesia call shall not be distributed,
-	         %% since the transaction sees to that it is
-	         %% executed on the right node!!!
-	      mnesia:write(Tab,Obj,write)
-      end),
-    ok.
-    
-		  
-
-
-
-check_record_format(mnesia, Node, LocalNode, Tab, Obj) ->
-    Arity = tv_mnesia_rpc:table_info(Node, LocalNode, Tab, arity),
-    case size(Obj) of
-	Arity ->
-	    ok;
-	_Other ->
-	    gs:window(etsreadwin, gs:start(), []),
-	    case get(error_msg_mode) of
-		normal ->
-		    tv_utils:notify(etsreadwin, "TV Notification", 
-				    ["The record is not complete,",
-				     "too few fields are specified!"]);
-		haiku ->
-		    tv_utils:notify(etsreadwin, "TV Notification", 
-				    ["The attempt to change",
-				     "The specified record size",
-				     "Is simply ignored."])
-	    end,
-	    gs:destroy(etsreadwin),
-	    bad_format
-    end;
-check_record_format(ets, _Node, _LocalNode, _Tab, _Obj) ->
-    ok.
-	    
-	    
-		      
-
-
-
-
-read_table(Node, LocalNode, Tab, KindOfTable, DbsPid) ->
-    T1 = time(),
-
-    {TableContent, ListOfKeys} = 
-	case KindOfTable of
-	    ets ->
-		{tv_ets_rpc:tab2list(Node, LocalNode, Tab), 
-		 [tv_ets_rpc:info(Node, LocalNode, Tab, keypos)]
-		};
-	    mnesia ->
-		   %% It may be tempting to use Mnesia event subscription,
-		   %% but will this really save the day? The main drawback
-		   %% is that we will then have to update the table copy we
-		   %% store internally in two different ways: one for the 
-		   %% Mnesia tables, and one for the ETS tables. Also, if
-		   %% the Mnesia tables are frequently updated, this will 
-		   %% cause TV to work all the time too (either updating the
-		   %% table copy for each inserted/deleted object, or storing
-		   %% these objects until polling is ordered). To make this 
-		   %% work smoothly requires a bit of work...
-		   %% The second drawback is that it doesn't seem clear in all
-		   %% circumstances how the subscription actually works - i.e.,
-		   %% if we only use subscriptions, can we actually be sure that
-		   %% the *real* state of the table is the same as the one kept
-		   %% in TV? For example, imagine the scenario that Mnesia is
-		   %% stopped, all Mnesia directories are removed (from the UNIX 
-		   %% shell), and then Mnesia once again is started. The first 
-		   %% problem is that we have to check for start/stop of Mnesia,
-		   %% the second is that we then have to rescan the actual table.
-		   %% The logic for this may require som effort to write!
-		   %% Also, what will happen if the table is killed/dies? 
-		   %% Will we get messages for each element in the table?
-		   %% (I havent't checked this last issue, this is just som thoughts.)
-		   %% And generally, there is always a risk that a message is lost,
-		   %% which will result in TV showing an erroneous table content.
-		   %%
-		   %% All in all, using Mnesia subscriptions *may* be a sub-optimization.
-		   %% The current solution works fine, is also easy to control, and is 
-		   %% mainly the same for both ETS and Mnesia tables.
-		   %% My suggestion is that it is used until someone actually complains
-		   %% about the polling time being too long for huge tables!  :-)
-		   %% (However, it shall be emphasized that it is this module that
-		   %% actually polls the Mnesia/ETS tables, meaning that it is
-		   %% mainly this module that has to be modified, should the usage of
-		   %% subscriptions be desired. The other module that has to be modified
-		   %% is the one maintaining the internal copy of the table.)
-                WildPattern = tv_mnesia_rpc:table_info(Node,LocalNode,Tab,wild_pattern),
-                {atomic, Content} = 
-                    tv_mnesia_rpc:transaction(
-		      Node,
-		      LocalNode,
-		      fun() ->
-			         %% This mnesia call shall not be distributed,
-			         %% since the transaction sees to that it is
-			         %% executed on the right node!!!
-			      mnesia:match_object(Tab, WildPattern, read)
-		      end),
-                {Content, [2 | tv_mnesia_rpc:table_info(Node, LocalNode,Tab, index)]}
-	end,
-    
-    T2 = time(),
-
-    ElapsedTime = compute_elapsed_seconds(T1, T2),
-
-    DbsPid ! #dbs_new_data{sender             = self(),
-			   data               = TableContent,
-			   keys               = ListOfKeys,
-			   time_to_read_table = ElapsedTime
-			  },
-
-    ElapsedTime.
-
-
-
-
-
-
-
-compute_elapsed_seconds({H1, M1, S1}, {H2, M2, S2}) ->
-    ElapsedHours   = get_time_diff(hours, H1, H2),
-    ElapsedMinutes = get_time_diff(minutes, M1, M2),
-    ElapsedSeconds = get_time_diff(seconds, S1, S2),
-    (ElapsedHours * 3600) + (ElapsedMinutes * 60) + ElapsedSeconds + 1.
-
-
-
-
-
-get_time_diff(_Type, T1, T2) when T1 =< T2 ->
-    T2 - T1;
-get_time_diff(hours, T1, T2) ->
-    T2 + 24 - T1;
-get_time_diff(minutes, T1, T2) ->
-    T2 + 60 - T1;
-get_time_diff(seconds, T1, T2) ->
-    T2 + 60 - T1.
diff --git a/lib/tv/src/tv_info.erl b/lib/tv/src/tv_info.erl
deleted file mode 100644
index c744888c38..0000000000
--- a/lib/tv/src/tv_info.erl
+++ /dev/null
@@ -1,884 +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%
--module(tv_info).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,listbox,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([info/6
-	]).
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
-
-
-
-
--define(DEFAULT_BG_COLOR, {217, 217, 217}).
-
-
--record(card_field_ids, {parent_pid,
-			 window_id,
-			 window_frame,
-			 table_id,
-			 table_type,
-			 table_name,
-			 named_table,
-			 owner_pid,
-			 owner_name,
-			 bag_or_set,
-			 arity,
-			 attributes,
-			 wild_pattern,
-			 keypos,
-			 index,
-			 snmp,
-			 protection,
-			 size, 
-			 memory,
-			 storage_type,
-			 disc_copies,
-			 where_to_read,
-			 ram_copies,
-			 disc_only_copies,
-			 where_to_write,
-			 checkpoints,
-			 node
-			}).
-	       
-
-
--define(WINDOW_WIDTH, 580).
--define(WINDOW_HEIGHT, 430).
-
-
-
--define(MNESIA_INFO_ITEMS, [type,
-			    arity,
-			    attributes,
-			    index,
-			    size,
-			    memory,
-			    storage_type,
-			    where_to_read,
-			    disc_copies,
-			    disc_only_copies,
-			    ram_copies,
-			    where_to_write,
-			    checkpoints
-			   ]).
-
-
-
-
-info(Master, Node, LocalNode, TabId, TabType, ErrMsgMode) ->
-    process_flag(trap_exit,true),
-    WinId = create_window(),
-    {CardIds, MaskLabel} = init(Master, Node, LocalNode, TabId, TabType, WinId),
-    put(error_msg_mode, ErrMsgMode),
-    gs:config(WinId, [{map, true}]),
-    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType).
-
-
-
-
-
-
-create_window() ->
-    WinWidth = ?WINDOW_WIDTH,
-    WinHeight = ?WINDOW_HEIGHT,
-    Win = gs:window(win, gs:start(), [{width, WinWidth},
-				      {height, WinHeight},
-				      {bg, ?DEFAULT_BG_COLOR},
-				      {destroy, true},
-				      {configure, true},
-				      {keypress, true}
-				     ]),
-
-    MenubarId = gs:create(menubar, Win, [{bg, ?DEFAULT_BG_COLOR}
-					]),
-    Mbutt = gs:create(menubutton, MenubarId, [{bg, ?DEFAULT_BG_COLOR},
-					      {fg, {178, 34, 34}},  % firebrick
-					      {label, {text, " File "}},
-					      {underline, 1}
-					     ]),
-    Obutt = gs:create(menubutton, MenubarId, [{bg, ?DEFAULT_BG_COLOR},
-					      {fg, {178, 34, 34}},  % firebrick
-					      {label, {text, " Options "}},
-					      {underline, 1}
-					     ]),
-
-       % Create the actual menu!
-    FMenu = gs:create(menu, Mbutt, [{bg, ?DEFAULT_BG_COLOR},
-				   {fg, {178, 34, 34}}]), 
-    OMenu = gs:create(menu, Obutt, [{bg, ?DEFAULT_BG_COLOR},
-				   {fg, {178, 34, 34}}]), 
-    gs:create(menuitem, FMenu, [{bg, ?DEFAULT_BG_COLOR},
-				{fg, {178, 34, 34}},
-				{label, {text, " Close    Ctrl-C "}},
-				{data, close_menu},
-				{underline, 1}
-			       ]),
-    gs:create(menuitem, OMenu, [{bg, ?DEFAULT_BG_COLOR},
-				{fg, {178, 34, 34}},
-				{label, {text, " Refresh    Ctrl-R "}},
-				{data, update},
-				{underline, 1}
-			       ]),
-    Win.
-
-    
-
-
-
-
-
-
-init(Master, Node, LocalNode, TabId, TabType, WinId) ->
-    WinWidth  = ?WINDOW_WIDTH,
-    WinHeight = ?WINDOW_HEIGHT,
-
-    WinFrame = gs:frame(WinId, [{width, WinWidth},
-				{height, WinHeight},
-				{x, 0},
-				{y, 30},
-				{bg, ?DEFAULT_BG_COLOR},
-				{bw, 0}
-			       ]),
-
-    TableIdFlap       = create_flap(1, "Table Id", WinFrame),
-    BasicSettingsFlap = create_flap(2, "Basic Settings", WinFrame),
-    SizeFlap          = create_flap(3, "Size", WinFrame),
-    StorageFlap       = create_flap(4, "Storage", WinFrame),
-
-    TableIdCard       = create_card(WinFrame, TableIdFlap),
-    BasicSettingsCard = create_card(WinFrame, BasicSettingsFlap),
-    SizeCard          = create_card(WinFrame, SizeFlap),
-    StorageCard       = create_card(WinFrame, StorageFlap),
-        
-
-    set_flap_label(TableIdFlap, "Table Id"),
-    set_flap_label(BasicSettingsFlap, "Basic Settings"),
-    set_flap_label(SizeFlap, "Size"),
-    set_flap_label(StorageFlap, "Storage"),
-
-
-    gs:config(TableIdCard, [raise]),
-
-    CardIds = print_cards(TabType, TableIdCard, BasicSettingsCard, SizeCard, StorageCard),
-
-    {_CardId, FirstMaskXpos} = gs:read(TableIdFlap, data),
-    Mask = gs:label(WinFrame, [{width, gs:read(TableIdFlap, width) - 2 * gs:read(TableIdFlap, bw) + 1},
-			       {height, gs:read(TableIdCard, bw)},
-			       {x, FirstMaskXpos},
-			       {y, gs:read(TableIdCard, y)},
-			       {bg, ?DEFAULT_BG_COLOR}
-			      ]),
-
-    update_info_flaps(TabType, Node, LocalNode, TabId, CardIds, Master),
-    {CardIds#card_field_ids{parent_pid   = Master,
-			    window_id    = WinId, 
-			    window_frame = WinFrame}, Mask}.
-
-    
-
-
-
-check_node(OldNode, LocalNode) ->
-    HomeNode = node(),
-    case net_adm:ping(OldNode) of
-	pong ->
-	    OldNode;
-	pang when LocalNode ->  
-	       %% The system has gone either distributed or undistributed.
-	       %% No matter which, HomeNode tells the current correct node.
-	    HomeNode;
-	pang ->
-	    OldNode
-    end.
-
-
-
-
-
-
-update_data_field(notext, {label, Id}) ->
-    gs:config(Id, [{label, {text, "" }}]);
-update_data_field(notext, {listbox, Id}) ->
-    gs:config(Id, [{items, []}]);
-update_data_field({Data}, {label, Id}) ->
-    gs:config(Id, [{label, {text, " " ++ lists:flatten(io_lib:write(Data))}}]);
-update_data_field({Data}, {listbox, Id}) ->
-    gs:config(Id, [{items, lists:map(fun(E) -> " " ++ lists:flatten(io_lib:write(E)) 
-				     end, Data)}]).
-
-    
-
-    
-print_info(mnesia, Node, LocalNode, TabId, CardIds) ->
-    update_data_field({mnesia}, 
-		      CardIds#card_field_ids.table_type),
-    update_data_field({TabId}, 
-		      CardIds#card_field_ids.table_name),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, type)}, 
-		      CardIds#card_field_ids.bag_or_set),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, arity) - 1}, 
-		      CardIds#card_field_ids.arity),
-
-    AttributesList = tv_mnesia_rpc:table_info(Node, LocalNode, TabId, attributes),
-    update_data_field({AttributesList}, 
-		      CardIds#card_field_ids.attributes),
-    update_data_field({lists:map(fun(N) -> 
-					 lists:nth(N - 1, AttributesList) 
-				 end, 
-				 [2] ++ tv_mnesia_rpc:table_info(Node, 
-								 LocalNode, 
-								 TabId, 
-								 index)
-				)
-		      }, 
-		      CardIds#card_field_ids.index),
-
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, size)}, 
-		      CardIds#card_field_ids.size),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, memory)}, 
-		      CardIds#card_field_ids.memory),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, storage_type)}, 
-		      CardIds#card_field_ids.storage_type),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, where_to_read)}, 
-		      CardIds#card_field_ids.where_to_read),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, disc_copies)}, 
-		      CardIds#card_field_ids.disc_copies),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, disc_only_copies)}, 
-		      CardIds#card_field_ids.disc_only_copies),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, ram_copies)}, 
-		      CardIds#card_field_ids.ram_copies),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, where_to_write)}, 
-		      CardIds#card_field_ids.where_to_write),
-    update_data_field({tv_mnesia_rpc:table_info(Node, LocalNode, TabId, checkpoints)}, 
-		      CardIds#card_field_ids.checkpoints),
-    {ok, TabId};
-print_info(ets, Node, LocalNode, TabId, CardIds) ->
-    update_data_field({ets}, 
-		      CardIds#card_field_ids.table_type),
-    update_data_field({TabId}, 
-		      CardIds#card_field_ids.table_id),
-    TabName = tv_ets_rpc:info(Node, LocalNode, TabId, name),
-    update_data_field({TabName}, 
-		      CardIds#card_field_ids.table_name),
-    update_data_field({tv_ets_rpc:info(Node, LocalNode, TabId, named_table)}, 
-		      CardIds#card_field_ids.named_table),
-
-    OwnerPid              = tv_ets_rpc:info(Node, LocalNode, TabId, owner),
-    OwnerNameSearchResult = lists:keysearch(registered_name, 
-					    1, 
-					    rpc:block_call(Node, 
-							   erlang, 
-							   process_info, 
-							   [OwnerPid])),
-    OwnerName             = case OwnerNameSearchResult of
-				false ->
-				    notext;
-				{value, {registered_name, WantedName}} ->
-				    {WantedName}
-			    end,
-    update_data_field({OwnerPid}, 
-		      CardIds#card_field_ids.owner_pid),
-    update_data_field(OwnerName, 
-		      CardIds#card_field_ids.owner_name),
-    
-    update_data_field({tv_ets_rpc:info(Node, LocalNode, TabId, keypos)},  
-		      CardIds#card_field_ids.keypos),
-    update_data_field({tv_ets_rpc:info(Node, LocalNode, TabId, type)},  
-		      CardIds#card_field_ids.bag_or_set),
-    update_data_field({tv_ets_rpc:info(Node, LocalNode, TabId, protection)},  
-		      CardIds#card_field_ids.protection),
-    update_data_field({tv_ets_rpc:info(Node, LocalNode, TabId, size)}, 
-		      CardIds#card_field_ids.size),
-    update_data_field({tv_ets_rpc:info(Node, LocalNode, TabId, memory)},  
-		      CardIds#card_field_ids.memory),
-    update_data_field({tv_ets_rpc:info(Node, LocalNode, TabId, node)}, 
-		      CardIds#card_field_ids.node),
-    {ok, TabName}.
-    
-
-
-
-
-
-print_cards(mnesia, Card1, Card2, Card3, Card4) ->
-    create_card_text(1, "Table Type:", Card1),
-    create_card_text(2, "Table Name:", Card1),
-    
-    create_card_text(1, "Table Type:", Card2),
-    create_card_text(2, "Number of Attributes:", Card2),
-%    create_card_text(3, "Attribute Names:", Card2),
-%    create_card_text(4, "Index Positions:", Card2),
-
-    create_card_text(1, "Number of Elements Stored:", Card3),
-    create_card_text(2, "Number of Words Allocated:", Card3),
-
-    create_card_text(1, "Local Storage Type:", Card4),
-    create_card_text(2, "Table Readable at Node:", Card4),
-%    create_card_text(3, "Disc Copy Nodes:", Card4),
-%    create_card_text(4, "Disc Copy Only Nodes:", Card4),
-%    create_card_text(5, "RAM Copy Nodes:", Card4),
-%    create_card_text(6, "Active Table Replica Nodes:", Card4),
-%    create_card_text(7, "Active Checkpoints:", Card4),
-    
-    {AttributesId, IndexId} = create_special_fields(mnesia, size_card, Card2),
-
-    
-    {DiscCopiesId, DiscOnlyCopiesId, RamCopiesId, WhereToWriteId, CheckpointsId} = 
-	create_special_fields(mnesia, storage_card, Card4),
-
-    #card_field_ids{table_name       = {label, create_card_data_field(2, Card1)},
-		    table_type       = {label, create_card_data_field(1, Card1)},
-		    bag_or_set       = {label, create_card_data_field(1, Card2)},
-		    arity            = {label, create_card_data_field(2, Card2)},
-		    attributes       = AttributesId,
-		    index            = IndexId,
-		    size             = {label, create_card_data_field(1, Card3)},
-		    memory           = {label, create_card_data_field(2, Card3)},
-		    storage_type     = {label, create_card_data_field(1, Card4)},
-		    where_to_read    = {label, create_card_data_field(2, Card4)},
-		    disc_copies      = DiscCopiesId,
-		    disc_only_copies = DiscOnlyCopiesId,
-		    ram_copies       = RamCopiesId,
-		    where_to_write   = WhereToWriteId,
-		    checkpoints      = CheckpointsId
-		   };
-print_cards(ets, Card1, Card2, Card3, Card4) ->
-    create_card_text(1, "Table Type:", Card1),
-    create_card_text(2, "Table Id:", Card1),
-    create_card_text(3, "Table Name:", Card1),
-    create_card_text(4, "Table Name Registered:", Card1),
-    create_card_text(5, "Process Owning the Table:", Card1),
-    create_card_text(6, "Name of Owning Process:", Card1),
-
-    create_card_text(1, "Index Position:", Card2),
-    create_card_text(2, "Table Type:", Card2),
-    create_card_text(3, "Protection Mode:", Card2),
-    
-    create_card_text(1, "Number of Elements Stored:", Card3),
-    create_card_text(2, "Number of Words Allocated:", Card3),
-    
-    create_card_text(1, "Table Stored at Node:", Card4),
-    
-    #card_field_ids{table_id    = {label, create_card_data_field(2, Card1)},
-		    table_type  = {label, create_card_data_field(1, Card1)},
-		    table_name  = {label, create_card_data_field(3, Card1)},
-		    named_table = {label, create_card_data_field(4, Card1)},
-		    owner_pid   = {label, create_card_data_field(5, Card1)},
-		    owner_name  = {label, create_card_data_field(6, Card1)},
-		    	       			      
-		    keypos      = {label, create_card_data_field(1, Card2)},
-		    bag_or_set  = {label, create_card_data_field(2, Card2)},
-		    protection  = {label, create_card_data_field(3, Card2)},
-			       			      
-		    size        = {label, create_card_data_field(1, Card3)},
-		    memory      = {label, create_card_data_field(2, Card3)},
-			       			      
-		    node        = {label, create_card_data_field(1, Card4)}
-		   }.
-
-
-
-    
-
-
-create_special_fields(mnesia, size_card, CardId) ->
-    LabelWidth      = 195,
-    LabelHeight     = 24,
-    ListboxWidth    = 210,
-    ListboxHeight   = 160,
-    VerticalSpacing = 20,
-    LXpos           = 30,
-    RXpos           = 330,
-    Ypos            = 40 + (LabelHeight + VerticalSpacing) * 2 + 25,
-    gs:label(CardId, [{width, LabelWidth},
-		      {height, LabelHeight},
-		      {x, LXpos},
-		      {y, Ypos},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}},
-		      {align, center},
-		      {label, {text, "Attribute Names:"}}
-		    ]),
-    
-    gs:label(CardId, [{width, LabelWidth},
-		      {height, LabelHeight},
-		      {x, RXpos},
-		      {y, Ypos},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}},
-		      {align, center},
-		      {label, {text, "Attributes Used as Indices:"}}
-		     ]),
-    
-    AttributesId = gs:listbox(CardId, [{width, ListboxWidth},
-				       {height, ListboxHeight},
-				       {x, LXpos},
-				       {y, Ypos + LabelHeight - 3},
-				       {bg, {255, 255, 255}},
-				       {fg, {0, 0, 0}},
-				       {hscroll, bottom},
-				       {vscroll, right},
-				       {selectmode, single},
-				       {click, true},
-				       {doubleclick, true},
-				       {data, listbox}
-				      ]),
-    
-    IndexId = gs:listbox(CardId, [{width, ListboxWidth},
-				  {height, ListboxHeight},
-				  {x, RXpos},
-				  {y, Ypos + LabelHeight - 3},
-				  {bg, {255, 255, 255}},
-				  {fg, {0, 0, 0}},
-				  {hscroll, bottom},
-				  {vscroll, right},
-				  {selectmode, single},
-				  {click, true},
-				  {doubleclick, true},
-				  {data, listbox}				  
-				]),
-    
-    {{listbox, AttributesId}, 
-     {listbox, IndexId}
-    };
-create_special_fields(mnesia, storage_card, CardId) ->
-    LabelWidth      = 155,
-    LabelHeight     = 24,
-    ListboxHeight   = 80,
-    ListboxWidth    = 170,
-    VerticalSpacing = 20,
-    LXpos           = 10,
-    MXpos           = 197,
-    RXpos           = 385,
-    % Y-positions for upper and lower row.
-    UYpos           = 40 + (LabelHeight + VerticalSpacing) * 2,
-    LYpos           = UYpos +  ListboxHeight + 37,
-    gs:label(CardId, [{width, LabelWidth},
-		      {height, LabelHeight},
-		      {x, LXpos},
-		      {y, UYpos},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}},
-		      {align, center},
-		      {label, {text, "Disc Copy Nodes:"}}
-		     ]),
-
-    gs:label(CardId, [{width, LabelWidth},
-		      {height, LabelHeight},
-		      {x, MXpos},
-		      {y, UYpos},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}},
-		      {align, center},
-		      {label, {text, "Disc Only Copy Nodes:"}}
-		     ]),
-    
-    gs:label(CardId, [{width, LabelWidth},
-		      {height, LabelHeight},
-		      {x, RXpos},
-		      {y, UYpos},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}},
-		      {align, center},
-		      {label, {text, "RAM Copy Nodes:"}}
-		     ]),
-
-
-    gs:label(CardId, [{width, LabelWidth},
-		      {height, LabelHeight},
-		      {x, LXpos},
-		      {y, LYpos},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}},
-		      {align, center},
-		      {label, {text, "Table Replica Nodes:"}}
-		     ]),
-
-    gs:label(CardId, [{width, LabelWidth},
-		      {height, LabelHeight},
-		      {x, MXpos},
-		      {y, LYpos},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}},
-		      {align, center},
-		      {label, {text, "Active Checkpoints:"}}
-		    ]),
-    
-
-    DiscCopiesId = gs:listbox(CardId, [{width, ListboxWidth},
-				       {height, ListboxHeight},
-				       {x, LXpos},
-				       {y, UYpos + LabelHeight - 3},
-				       {bg, {255, 255, 255}},
-				       {fg, {0, 0, 0}},
-				       {hscroll, bottom},
-				       {vscroll, right},
-				       {selectmode, single},
-				       {click, true},
-				       {doubleclick, true},
-				       {data, listbox}				       
-				      ]),
-    
-    DiscCopiesOnlyId = gs:listbox(CardId, [{width, ListboxWidth},
-					   {height, ListboxHeight},
-					   {x, MXpos},
-					   {y, UYpos + LabelHeight - 3},
-					   {bg, {255, 255, 255}},
-					   {fg, {0, 0, 0}},
-					   {hscroll, bottom},
-					   {vscroll, right},
-					   {selectmode, single},
-					   {click, true},
-					   {doubleclick, true},
-					   {data, listbox}
-					  ]),
-
-    RamCopiesId = gs:listbox(CardId, [{width, ListboxWidth},
-				      {height, ListboxHeight},
-				      {x, RXpos},
-				      {y, UYpos + LabelHeight - 3},
-				      {bg, {255, 255, 255}},
-				      {fg, {0, 0, 0}},
-				      {hscroll, bottom},
-				      {vscroll, right},
-				      {selectmode, single},
-				      {click, true},
-				      {doubleclick, true},
-				      {data, listbox}
-				     ]),
-    
-
-
-    WhereToWriteId = gs:listbox(CardId, [{width, ListboxWidth},
-					 {height, ListboxHeight},
-					 {x, LXpos},
-					 {y, LYpos + LabelHeight - 3},
-					 {bg, {255, 255, 255}},
-					 {fg, {0, 0, 0}},
-					 {hscroll, bottom},
-					 {vscroll, right},
-					 {selectmode, single},
-					 {click, true},
-					 {doubleclick, true},
-					 {data, listbox}
-					]),
-    
-    CheckpointsId = gs:listbox(CardId, [{width, ListboxWidth},
-					{height, ListboxHeight},
-					{x, MXpos},
-					{y, LYpos + LabelHeight - 3},
-					{bg, {255, 255, 255}},
-					{fg, {0, 0, 0}},
-					{hscroll, bottom},
-					{vscroll, right},
-					{selectmode, single},
-					{click, true},
-					{doubleclick, true},
-					{data, listbox}
-				       ]),
-    
-    {{listbox, DiscCopiesId}, 
-     {listbox, DiscCopiesOnlyId}, 
-     {listbox, RamCopiesId}, 
-     {listbox, WhereToWriteId}, 
-     {listbox, CheckpointsId}
-    }.
-
-
-
-
-
-
-
-create_card_data_field(N, ParentId) ->
-    Width           = 345,
-    Height          = 24,
-    VerticalSpacing = 20,
-    Xpos            = 210,
-    Ypos            = 40 + (Height + VerticalSpacing) * (N - 1),
-
-    BgFrame = gs:frame(ParentId, [{width, Width},
-				  {height, Height},
-				  {x, Xpos},
-				  {y, Ypos},
-				  {bg, {0, 0, 0}},
-				  {bw, 0}
-				 ]),
-    gs:label(BgFrame, [{width, Width - 2},
-		       {height, Height - 2},
-		       {x, 1},
-		       {y, 1},
-		       {bg, {255, 255, 255}},
-		       {fg, {0, 0, 0}},
-		       {align, w}
-		      ]).
-
-
-
-
-
-
-create_card_text(N, Text, ParentId) ->
-    LabelWidth      = 205,
-    LabelHeight     = 24,
-    VerticalSpacing = 20,
-    Xpos            = 10,
-    Ypos            = 40 + (LabelHeight + VerticalSpacing) * (N - 1),
-    gs:label(ParentId, [{width, LabelWidth},
-			{height, LabelHeight},
-			{x, Xpos},
-			{y, Ypos},
-			{bg, ?DEFAULT_BG_COLOR},
-			{fg, {0, 0, 0}},
-			{align, w},
-			{label, {text, Text}}
-		       ]).
-    
-
-
-
-create_card(ParentId, FlapId) ->
-    CardId = gs:frame(ParentId, [{width, 570},
-				 {height, 360},
-				 {x, 5},
-				 {y, 35},
-				 {bg, ?DEFAULT_BG_COLOR},
-				 {bw, 2}
-				]),
-    FlapXpos = gs:read(FlapId, data),
-    gs:config(FlapId, [{data, {CardId, FlapXpos}}
-		      ]),
-    CardId.
-    
-    
-
-
-
-set_flap_label(ParentId, Text) ->
-    Bw     = gs:read(ParentId, bw),     % It is assumed that the parent is a frame!  :-)
-    Width  = gs:read(ParentId, width) - 2 * Bw - 2,
-    Height = gs:read(ParentId, height) - 2 * Bw - 6,
-    Xpos   = 0,
-    Ypos   = 0,
-    Data   = gs:read(ParentId, data),
-    
-    gs:label(ParentId, [{width, Width},
-			{height, Height},
-			{x, Xpos},
-			{y, Ypos},
-			% {fg, {178, 34, 34}},
-			{bg, ?DEFAULT_BG_COLOR},
-			{fg, {0, 0, 0}},
-			{label, {text, Text}},
-			{align, center},
-			{buttonpress, true},
-			{data, Data}
-		       ]).
-
-
-
-create_flap(N, _Text, ParentId) ->
-    Width       = 120,
-    Height      = 40,
-    Spacing     = 2,
-    FirstXpos   = 5,
-    Xpos        = FirstXpos + ((Width + Spacing) * (N - 1)),
-    Ypos        = 5,
-    BorderWidth = 2,
-    
-    gs:frame(ParentId, [{width, Width},
-			{height, Height},
-			{x, Xpos},
-			{y, Ypos},
-			{bg, ?DEFAULT_BG_COLOR},
-			{bw, BorderWidth},
-			{cursor, hand},
-			{buttonpress, true},
-			{data, Xpos + BorderWidth}
-		       ]).
-				   
-
-
-update_info_flaps(TabType, Node, LocalNode, TabId, CardIds, MasterPid) ->
-    case catch print_info(TabType, Node, LocalNode, TabId, CardIds) of
-	{ok, TabName} ->
-	    WinTitle = tv_pc_menu_handling:get_window_title(TabType,Node,TabId,TabName),
-	    gs:config(win, [{title, "[TV]   " ++ WinTitle}]),
-	    done;
-	nodedown ->
-	    nodedown;
-	no_table ->
-	    gs:config(win, [beep]),
-	    case get(error_msg_mode) of
-		normal ->
-		    Msg = ["The table " ++ lists:flatten(io_lib:write(TabId)) ++ " on node",
-			   lists:flatten(io_lib:write(Node)) ++ " no longer exists!"],
-		    tv_utils:notify(win, "TV Notification", Msg);
-		haiku ->
-		    Msg = ["Three things are certain:",
-			   "Death, taxes, and lost tables.",
-			   "Guess which has occurred."],
-		    tv_utils:notify(win, "TV Notification", Msg)
-	    end,
-	    MasterPid ! #ip_dead_table{sender = self()};
-	mnesia_not_started ->
-	    gs:config(win, [beep]),
-	    case get(error_msg_mode) of
-		normal ->
-		    Msg = ["The table " ++ lists:flatten(io_lib:write(TabId)) ++ " on node",
-			   lists:flatten(io_lib:write(Node)) ++ " no longer exists!"],
-		    tv_utils:notify(win, "TV Notification", Msg);
-		haiku ->
-		    Msg = ["A table that big?",
-			   "It might be very useful.",
-			   "But now it is gone."],
-		    tv_utils:notify(win, "TV Notification", Msg)
-	    end,
-	    MasterPid ! #ip_dead_table{sender = self()};
-	{unexpected_error,Reason} ->
-	    io:format("Unexpected error:  ~p~n", [Reason]);
-	_Other ->
-	    io:format("Unexpected return value: ~p~n", [_Other]),
-	    done
-    end.
-
-
-
-    
-loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType) ->				 
-    receive
-	#info_update_table_info{sender = Sender} ->
-	    NewNode = check_node(Node, LocalNode),
-	    update_info_flaps(TabType, NewNode, LocalNode, TabId, CardIds, Sender),
-	    loop(CardIds, MaskLabel, NewNode, LocalNode, TabId, TabType);
-
-
-	#info_raise_window{sender = Sender} ->
-	    gs:config(CardIds#card_field_ids.window_id, [raise]),
-	    NewNode = check_node(Node, LocalNode),
-	    chk(update_info_flaps(TabType, NewNode, LocalNode, TabId, CardIds, Sender)),
-	    loop(CardIds, MaskLabel, NewNode, LocalNode, TabId, TabType);
-	
-
-	#info_quit{} ->
-	    exit(normal);
-
-	{gs, _FlapId, buttonpress, {CardId, Xpos}, [1 | _]} ->
-	    gs:config(CardId, [raise
-			      ]),
-	    gs:config(MaskLabel, [raise,
-				  {x, Xpos}
-				 ]),
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType);
-
-	{gs, _Id, buttonpress, {_CardId, _Xpos}, _Args} ->
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType);
-
-	{gs, _LblId, enter, _Data, _Args} ->
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType);
-	
-	{gs, WinId, configure, _Data, _Args} ->
-	    gs:config(WinId, [{width, ?WINDOW_WIDTH},
-			      {height, ?WINDOW_HEIGHT}
-			     ]),
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType);
-
-	{gs, ListboxId, click, listbox, _Args} ->
-	    gs:config(ListboxId, [{selection, clear}]),
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType);
-
-	{gs, ListboxId, doubleclick, listbox, _Args} ->
-	    gs:config(ListboxId, [{selection, clear}]),
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType);
-
-	{gs, _Id, click, update, _Args} ->
-	    NewNode = check_node(Node, LocalNode),
-	    chk(update_info_flaps(TabType,NewNode,LocalNode,TabId,CardIds,
-				  CardIds#card_field_ids.parent_pid)),
-	    loop(CardIds, MaskLabel, NewNode, LocalNode, TabId, TabType);
-
-	{gs, _Id, keypress, _, [r, _, 0, 1 | _]} ->
-	    NewNode = check_node(Node, LocalNode),
-	    chk(update_info_flaps(TabType,NewNode,LocalNode,TabId,CardIds,
-				  CardIds#card_field_ids.parent_pid)),
-	    loop(CardIds, MaskLabel, NewNode, LocalNode, TabId, TabType);
-
-	{gs, _Id, keypress, _, ['R', _, 1, 1 | _]} ->
-	    NewNode = check_node(Node, LocalNode),
-	    chk(update_info_flaps(TabType,NewNode,LocalNode,TabId,CardIds,
-				  CardIds#card_field_ids.parent_pid)),
-	    loop(CardIds, MaskLabel, NewNode, LocalNode, TabId, TabType);
-
-	{gs, _Id, click, close_menu, _Args} ->
-	    exit(normal);
-
-	{gs, _Id, keypress, _, [c, _, 0, 1 | _]} ->
-	    exit(normal);
-	
-	{gs, _Id, keypress, _, ['C', _, 1, 1 | _]} ->
-	    exit(normal);
-
-	{gs, _Id, destroy, _Data, _Args} ->
-	    exit(normal);
-
-	{'EXIT', _Pid, _Reason} ->
-	    exit(normal);
-
-	{error_msg_mode, Mode} ->
-	    put(error_msg_mode, Mode),
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType);
-
-	_Other ->
-	    loop(CardIds, MaskLabel, Node, LocalNode, TabId, TabType)  
-    end.
-    
-
-
-
-
-
-chk(nodedown) ->
-    gs:config(win, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(win, "TV Notification", 
-			    ["The node is down, and the",
-			     "table cannot be reached."]);
-	haiku ->
-	    ErrMsg1 = ["With searching comes loss",
-		       "And the presence of absence:",
-		       "Node is down."],
-	    tv_utils:notify(win, "TV Notification", ErrMsg1)
-    end;
-chk(_Other) ->
-    done.
-    
diff --git a/lib/tv/src/tv_int_def.hrl b/lib/tv/src/tv_int_def.hrl
deleted file mode 100644
index 6d4263c51b..0000000000
--- a/lib/tv/src/tv_int_def.hrl
+++ /dev/null
@@ -1,56 +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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      Internal definitions for the table tool as a whole.
-%%%
-%%%*********************************************************************
-
--define(COMM_FUNC_FILE, tv_comm_func).
-
--define(ITEMS_TO_DISPLAY, 35).
-
-
--define(DEFAULT_BACKGROUND_COLOR, {255, 255, 255}).    % white
-
-
-% Colors used for marking updates.
-
--define(BLACK,  {  0,   0,   0}).
-
--define(RED1,   {255,   0,   0}).
--define(RED2,   {255, 100, 100}).
--define(RED3,   {255, 150, 150}).
--define(RED4,   {255, 200, 200}).
--define(RED5,   {235, 217, 217}).
-
-
--define(GREEN1, {  0, 255,   0}).
--define(GREEN2, {115, 255, 135}).
--define(GREEN3, {125, 225, 150}).
--define(GREEN4, {170, 225, 185}).
--define(GREEN5, {195, 219, 202}).
-
--define(DEFAULT_BTN_COLOR, {217, 217, 217}).
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_int_msg.hrl b/lib/tv/src/tv_int_msg.hrl
deleted file mode 100644
index 75ce8eca3b..0000000000
--- a/lib/tv/src/tv_int_msg.hrl
+++ /dev/null
@@ -1,504 +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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      File containing all messages used internally 
-%%%                     between the various table tool components.
-%%%
-%%%*********************************************************************
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY PC
-%%%*********************************************************************
-
-
-
--record(pc_raise_window, {sender}).
-
-
-
--record(pc_menu_msg, {sender, 
-		      data}).
-
-
-
--record(pc_win_conf, {sender, 
-		      width, 
-		      height}).
-
-
-
--record(pc_show_table_info, {sender}).
-
-
-
--record(pc_poll_table, {sender}).
-
-
-
--record(pc_select, {sender}).
-
-
-
--record(pc_help, {sender}).
-
-
-
--record(pc_set_sorting_mode, {sender,
-			      sorting,         % 'true' or 'false'
-			      reverse,         % 'true' or 'false',
-			      sort_key_no = 1
-			     }).
-
-
-
--record(pc_set_sorting_mode_cfm, {sender,
-				  sort_key_no
-				 }).
-
-
-
--record(pc_marked_row, {sender,
-			row_no,
-			object,
-			color
-		       }).
-
-
-
--record(pc_data_req, {sender, 
-		      element, 
-		      nof_elements
-		     }).
-
-
-
--record(pc_resend_data, {sender}).
-
-
-
-
--record(pc_data, {sender, 
-		  scale_pos,     % vertical scale
-		  scale_range,   % vertical scale
-		  max_elem_size,
-		  list_range, 
-		  elementlist,
-		  marked_row,
-		  list_of_keys,
-		  color}).
-
-
-
-
--record(pc_list_info, {sender,
-		       lists_as_strings}).
-
-
-
--record(pc_dead_table, {sender,
-			automatic_polling}).
-
-
-
--record(pc_nodedown, {sender,
-		      automatic_polling}).
-
-
-
--record(pc_search_req, {sender
-		       }).
-
-
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY PD
-%%%*********************************************************************
-
-
-
--record(pd_win_conf, {sender, 
-		      width, 
-		      height}).
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       sender:      Pid of the sender of the message.
-%%             win:         Id of window to create canvas and scale in.
-%%             win_width:   width of the window to create the canvas in.
-%%             win_height:  height of the window to create the canvas in.
-%%             scale:       whether a scale shall be shown or not.
-%%                          Possible values: true  -- scale is shown.
-%%                                           false -- scale is not shown.
-%%======================================================================
-
--record(pd_deblock, {sender, 
-		     win,
-		     win_width, 
-		     win_height,
-		     scale = false,
-		     range}).
-		     
-
-
-
--record(pd_deblock_cfm, {sender}).
-
-
-
--record(pd_new_table, {sender,
-		       table_type,
-		       table_name,
-		       record_name,   %% Only valid for Mnesia tables.
-		       writable
-		      }).
-
-
-
--record(pd_get_sort_settings, {sender,
-			       sorting,
-			       reverse
-			      }).
-
-
-
--record(pd_no_sorting, {sender
-		       }).
-
-
-
-
--record(pd_ignore, {sender
-		   }).
-
-
-
-
--record(pd_updated_object, {sender, 
-			    object,
-			    old_object,
-			    old_color,    %% Tells status of the object, if deleted or present.
-			    obj_no
-			   }).
-
-
-
--record(pd_new_object, {sender,       %% Used when no row is marked. 
-			object        %% Note: may still be an updated object!
-		       }).
-
-
-
--record(pd_delete_object, {sender, 
-			   object,
-			   color
-			  }).
-
-
-
--record(pd_rec_edit, {sender,
-		      attributes
-		     }).
-
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY PW
-%%%*********************************************************************
-
-
-
-
--record(pw_deblock, {sender, 
-		     win_title, 
-		     win_width,
-		     win_height,
-		     min_win_width,
-		     min_win_height}).
-		     
-
-
--record(pw_set_window_title, {sender,
-			      win_title}).
-
-
-
--record(pw_deblock_cfm, {sender,
-			 win_id}).
-
-
-
-
-%%======================================================================
-%% Message:    pw_create_menu.
-%%
-%% Function:   Order to pw to create a menu according to the content of the message.
-%%
-%% Data:       menutitle: string containing the name of the menu, e.g., "File".
-%%             menulist:  list of tuples having the following format: 
-%%                        {Text, Data}, where Text is the string that shall be 
-%%                        written in each menulist item, and Data is optional data,
-%%                        presumably the name of a function that is to be called 
-%%                        when the corresponding menulist message is received.
-%%======================================================================
-
--record(pw_create_menu, {sender,
-			 menutitle, 
-			 title_acc_pos,
-			 menulist}).
-
-
-
--record(pw_create_menu_cfm, {sender}).
-
-
-
--record(pw_select_menu, {sender,
-			 menu,
-			 old_menus}).
-
-
-
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY DBS
-%%%*********************************************************************
-
-
-
--record(dbs_deblock, {sender,
-		      etsread_pid,
-		      type,
-		      keypos,
-		      sublist_length}).
-
-
-
--record(dbs_deblock_cfm, {sender}).
-
-
-
-
--record(dbs_new_data, {sender,
-		       data,
-		       keys,
-		       time_to_read_table
-		      }).
-
-
-
--record(dbs_new_mnesia_data, {sender,
-			      new_or_changed,
-			      deleted,
-			      keys
-			     }).
-
-
-
--record(dbs_subset, {sender,
-		     data,
-		     requested_row,
-		     subset_pos,
-		     db_length,
-		     max_elem_size,
-		     list_of_keys,
-		     required_time_etsread,
-		     required_time_dbs}).
-
-
-
-
-
--record(dbs_subset_req, {sender,
-			 subset_pos, 
-			 subset_length
-			}).
-
-
-
-
--record(dbs_sorting_mode, {sender,
-			   sorting,    % 'true' or 'false'
-			   reverse,    % 'true' or 'false'
-			   sort_key_no
-			  }).
-			   
-
-
--record(dbs_marked_row, {sender,
-			 row_no
-			}).
-
-
-
-
--record(dbs_search_req, {sender
-		       }).
-
-
-
--record(dbs_updated_object, {sender,
-			     object,
-			     old_object,
-			     old_color,
-			     obj_no
-			    }).
-
-
--record(dbs_new_object, {sender,
-			 object
-			}).
-
-
--record(dbs_delete_object, {sender,
-			    object,
-			    color,
-			    obj_no
-			    }).
-
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY ETSREAD
-%%%*********************************************************************
-
-
-
--record(etsread_update_object, {sender, 
-				object,
-				old_object,
-				key_no
-			       }).
-
--record(etsread_update_object_cfm, {sender,
-				    success
-				   }).
-
-
-
--record(etsread_new_object, {sender, 
-			     object
-			    }).
-
-
--record(etsread_new_object_cfm, {sender,
-				 success
-				}).
-
-
-
--record(etsread_delete_object, {sender, 
-				object,
-				key_no
-			       }).
-
-
--record(etsread_delete_object_cfm, {sender,
-				    success
-				   }).
-
-
-
--record(etsread_deblock, {sender,
-			  dbs_pid,
-			  node,
-			  local_node,
-			  table_id,
-			  table_type,       % One of 'ets' or 'mnesia'
-			  poll_interval
-			 }).
-
-
-
--record(etsread_deblock_cfm, {sender,
-			      type,
-			      keypos,
-			      protection
-			     }).
-
-
-
--record(etsread_set_poll_interval, {sender,
-				    interval}).
-
-
-
--record(etsread_poll_table, {sender}).
-
-
-
--record(etsread_nodedown, {sender}).
-
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY IP
-%%%*********************************************************************
-
-
-
-
--record(ip_dead_table, {sender}).
-
-
--record(ip_register_parent, {sender}).
-
-
-
--record(ip_update, {sender,
-		    nof_elements_to_mark,
-		    text}).
-
-
-
--record(ip_quit, {sender}).
-
-
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY INFO
-%%%*********************************************************************
-
-
--record(info_update_table_info, {sender}).
-
-
-
--record(info_raise_window, {sender}).
-
-
-
--record(info_restart, {sender,
-		       node,
-		       table_id,
-		       table_type}).
-
-
-
--record(info_quit, {sender}).
-
-
diff --git a/lib/tv/src/tv_io_lib.erl b/lib/tv/src/tv_io_lib.erl
deleted file mode 100644
index 5457575b7d..0000000000
--- a/lib/tv/src/tv_io_lib.erl
+++ /dev/null
@@ -1,223 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      This file contains io functions adapted to the 
-%%%                     TV requirements.
-%%%
-%%%*********************************************************************
-
--module(tv_io_lib).
-
-
--export([format/2]).
-
--export([write/1,write/2]).
--export([write_atom/1,write_string/2]).
-
--export([char_list/1,deep_char_list/1,printable_list/1]).
-
-
-
-%% Interface calls to sub-modules.
-
-format(Format, Args) ->
-    tv_io_lib_format:fwrite(Format, Args).
-
-
-%% write(Term)
-%% write(Term, Depth)
-%% write(Term, Depth, Pretty)
-%%  Return a (non-flattened) list of characters giving a printed
-%%  representation of the term.
-
-write(Term) -> write(Term, -1).
-
-write(_Term, 0) -> "...";
-write(Term, _D) when is_integer(Term) -> integer_to_list(Term);
-write(Term, _D) when is_float(Term) -> tv_io_lib_format:fwrite_g(Term);
-write(Atom, _D) when is_atom(Atom) -> write_atom(Atom);
-write(Term, _D) when is_port(Term) -> lists:flatten(io_lib:write(Term));
-write(Term, _D) when is_pid(Term) -> pid_to_list(Term);
-write(Term, _D) when is_reference(Term) -> io_lib:write(Term);
-write(Term, _D) when is_binary(Term), byte_size(Term) > 100 -> "#Bin";
-write(Term, _D) when is_binary(Term) -> "<<\"" ++ binary_to_list(Term)  ++ "\">>";
-write(Term, _D) when is_bitstring(Term) -> "#Bitstr";
-write([], _D) -> "[]";
-write({}, _D) -> "{}";
-write([H|T], D) ->
-    if
-	D =:= 1 -> "[...]";
-	true ->
-	    [$[,[write(H, D-1)|write_tail(T, D-1)],$]]
-    end;
-write(F, _D) when is_function(F) ->
-    {module,M} = erlang:fun_info(F, module),
-    ["#Fun<",atom_to_list(M),">"];
-write(T, D) when is_tuple(T) ->
-    if
-	D =:= 1 -> "{...}";
-	true ->
-	    [${,
-	     [write(element(1, T), D-1)|write_tail(tl(tuple_to_list(T)), D-1)],
-	     $}]
-    end.
-
-%% write_tail(List, Depth)
-%%  Test the terminating case first as this looks better with depth.
-
-write_tail([], _D) -> "";
-write_tail(_List, 1) -> "|...";
-write_tail([H|T], D) ->
-    [$,,write(H, D-1)|write_tail(T, D-1)];
-write_tail(Other, D) ->
-    [$|,write(Other, D-1)].
-
-%% write_atom(Atom) -> [Char]
-%%  Generate the list of characters needed to print an atom.
-
-write_atom(Atom) ->
-    Chars = atom_to_list(Atom),
-    case quote_atom(Atom, Chars) of
-	true ->
-	    write_string(Chars, $');
-	false ->
-	    Chars
-    end.
-
-
-write_string(S, Q) ->
-    [Q|write_string1(S, Q)].
-
-write_string1([], Q) ->
-    [Q];
-write_string1([C|Cs], Q) ->
-    write_char(C, Q, write_string1(Cs, Q)).
-
-
-write_char(Q, Q, Tail) ->			%Must check this first
-    [$\\,Q|Tail];
-write_char($\\, _, Tail) ->			%In printable character range
-    [$\\,$\\|Tail];
-write_char(C, _, Tail) when C >= $ , C =< $~ ->
-    [C|Tail];
-write_char(C, _, Tail) when C >= 128+$ , C =< 255 ->
-    [C|Tail];
-write_char($\n, _Q, Tail) ->			%\n = LF
-    [$\\,$n|Tail];
-write_char($\r, _, Tail) ->			%\r = CR
-    [$\\,$r|Tail];
-write_char($\t, _, Tail) ->			%\t = TAB
-    [$\\,$t|Tail];
-write_char($\v, _, Tail) ->			%\v = VT
-    [$\\,$v|Tail];
-write_char($\b, _, Tail) ->			%\b = BS
-    [$\\,$b|Tail];
-write_char($\f, _, Tail) ->			%\f = FF
-    [$\\,$f|Tail];
-write_char($\e, _, Tail) ->			%\e = ESC
-    [$\\,$e|Tail];
-write_char($\d, _, Tail) ->			%\d = DEL
-    [$\\,$d|Tail];
-write_char(C, _, Tail) when C < $  ->
-    C1 = (C bsr 3) + $0,
-    C2 = (C band 7) + $0,
-    [$\\,$0,C1,C2|Tail];
-write_char(C, _, Tail) when C > $~ ->
-    C1 = (C bsr 6) + $0,
-    C2 = ((C bsr 3) band 7) + $0,
-    C3 = (C band 7) + $0,
-    [$\\,C1,C2,C3|Tail].
-
-%% quote_atom(Atom, CharList)
-%%  Return 'true' if atom with chars in CharList needs to be quoted, else
-%%  return 'false'.
-
-quote_atom(Atom, Cs0) ->
-    case erl_scan:reserved_word(Atom) of
-	true -> true;
-	false ->
-	    case Cs0 of
-		[C|Cs] when C >= $a, C =< $z ->
-		    quote_atom(Cs);
-		_ -> true
-	    end
-    end.
-
-quote_atom([C|Cs]) when C >= $a, C =< $z ->
-    quote_atom(Cs);
-quote_atom([C|Cs]) when C >= $A, C =< $Z ->
-    quote_atom(Cs);
-quote_atom([C|Cs]) when C >= $0, C =< $9 ->
-    quote_atom(Cs);
-quote_atom([$_|Cs]) ->
-    quote_atom(Cs);
-quote_atom([$@|Cs]) ->
-    quote_atom(Cs);
-quote_atom([_|_]) ->
-    true;
-quote_atom([]) ->
-    false.
-
-%% char_list(CharList)
-%% deep_char_list(CharList)
-%%  Return true if CharList is a (possibly deep) list of characters, else
-%%  false.
-
-char_list([C|Cs]) when is_integer(C), C >= 0, C =< 255 ->
-    char_list(Cs);
-char_list([]) -> true;
-char_list(_Other) -> false.			%Everything else is false
-
-deep_char_list(Cs) ->
-    deep_char_list(Cs, []).
-
-deep_char_list([C|Cs], More) when is_list(C) ->
-    deep_char_list(C, [Cs|More]);
-deep_char_list([C|Cs], More) when is_integer(C), C >= 0, C =< 255 ->
-    deep_char_list(Cs, More);
-deep_char_list([], [Cs|More]) ->
-    deep_char_list(Cs, More);
-deep_char_list([], []) -> true;
-deep_char_list(_Other, _More) ->	     %Everything else is false
-    false.
-
-%% printable_list([Char]) -> bool()
-%%  Return true if CharList is a list of printable characters, else
-%%  false.
-
-printable_list([C|Cs]) when is_integer(C), C >= $ , C =< 255 ->
-    printable_list(Cs);
-printable_list([$\n|Cs]) ->
-    printable_list(Cs);
-printable_list([$\r|Cs]) ->
-    printable_list(Cs);
-printable_list([$\t|Cs]) ->
-    printable_list(Cs);
-printable_list([$\v|Cs]) ->
-    printable_list(Cs);
-printable_list([$\b|Cs]) ->
-    printable_list(Cs);
-printable_list([$\f|Cs]) ->
-    printable_list(Cs);
-printable_list([$\e|Cs]) ->
-    printable_list(Cs);
-printable_list([]) -> true;
-printable_list(_Other) -> false.	     %Everything else is false
-
-
diff --git a/lib/tv/src/tv_io_lib_format.erl b/lib/tv/src/tv_io_lib_format.erl
deleted file mode 100644
index e043d9296e..0000000000
--- a/lib/tv/src/tv_io_lib_format.erl
+++ /dev/null
@@ -1,386 +0,0 @@
-%%
-%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 1998-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(tv_io_lib_format).
-
-
--export([fwrite/2,fwrite_g/1,indentation/2]).
-
-
-%% fwrite(Format, ArgList) -> [Char].
-%%  Format the arguments in ArgList after string Format. Just generate
-%%  an error if there is an error in the arguments.
-%%
-%%  To do the printing command correctly we need to calculate the
-%%  current indentation for everything before it. This may be very
-%%  expensive, especially when it is not needed, so we first determine
-%%  if, and for how long, we need to calculate the indentations. We do
-%%  this by first collecting all the control sequences and
-%%  corresponding arguments, then counting the print sequences and
-%%  then building the output.  This method has some drawbacks, it does
-%%  two passes over the format string and creates more temporary data,
-%%  and it also splits the handling of the control characters into two
-%%  parts.
-
-fwrite(Format, Args) when is_atom(Format) ->
-    fwrite(atom_to_list(Format), Args);
-fwrite(Format, Args) ->
-    Cs = collect(Format, Args),
-    Pc = pcount(Cs),
-    build(Cs, Pc, 0).
-
-collect([$~|Fmt0], Args0) ->
-    {C,Fmt1,Args1} = collect_cseq(Fmt0, Args0),
-    [C|collect(Fmt1, Args1)];
-collect([C|Fmt], Args) ->
-    [C|collect(Fmt, Args)];
-collect([], []) -> [].
-
-collect_cseq(Fmt0, Args0) ->
-    {F,Ad,Fmt1,Args1} = field_width(Fmt0, Args0),
-    {P,Fmt2,Args2} = precision(Fmt1, Args1),
-    {Pad,Fmt3,Args3} = pad_char(Fmt2, Args2),
-    {C,As,Fmt4,Args4} = collect_cc(Fmt3, Args3),
-    {{C,As,F,Ad,P,Pad},Fmt4,Args4}.
-
-field_width([$-|Fmt0], Args0) ->
-    {F,Fmt,Args} = field_value(Fmt0, Args0),
-    field_width(-F, Fmt, Args);
-field_width(Fmt0, Args0) ->
-    {F,Fmt,Args} = field_value(Fmt0, Args0),
-    field_width(F, Fmt, Args).
-
-field_width(F, Fmt, Args) when F < 0 ->
-    {-F,left,Fmt,Args};
-field_width(F, Fmt, Args) when F >= 0 ->
-    {F,right,Fmt,Args}.
-
-precision([$.|Fmt], Args) ->
-    field_value(Fmt, Args);
-precision(Fmt, Args) ->
-    {none,Fmt,Args}.
-
-field_value([$*|Fmt], [A|Args]) when is_integer(A) ->
-    {A,Fmt,Args};
-field_value([C|Fmt], Args) when C >= $0, C =< $9 ->
-    field_value([C|Fmt], Args, 0);
-field_value(Fmt, Args) ->
-    {none,Fmt,Args}.
-
-field_value([C|Fmt], Args, F) when C >= $0, C =< $9 ->
-    field_value(Fmt, Args, 10*F + (C - $0));
-field_value(Fmt, Args, F) ->		%Default case
-    {F,Fmt,Args}.
-
-pad_char([$.,$*|Fmt], [Pad|Args]) -> {Pad,Fmt,Args};
-pad_char([$.,Pad|Fmt], Args) -> {Pad,Fmt,Args};
-pad_char(Fmt, Args) -> {$ ,Fmt,Args}.
-
-%% collect_cc([FormatChar], [Argument]) ->
-%%	{Control,[ControlArg],[FormatChar],[Arg]}.
-%%  Here we collect the argments for each control character.
-%%  Be explicit to cause failure early.
-
-collect_cc([$w|Fmt], [A|Args]) -> {$w,[A],Fmt,Args};
-collect_cc([$p|Fmt], [A|Args]) -> {$p,[A],Fmt,Args};
-collect_cc([$W|Fmt], [A,Depth|Args]) -> {$W,[A,Depth],Fmt,Args};
-collect_cc([$P|Fmt], [A,Depth|Args]) -> {$P,[A,Depth],Fmt,Args};
-collect_cc([$s|Fmt], [A|Args]) -> {$s,[A],Fmt,Args};
-collect_cc([$e|Fmt], [A|Args]) -> {$e,[A],Fmt,Args};
-collect_cc([$f|Fmt], [A|Args]) -> {$f,[A],Fmt,Args};
-collect_cc([$g|Fmt], [A|Args]) -> {$g,[A],Fmt,Args};
-collect_cc([$c|Fmt], [A|Args]) -> {$c,[A],Fmt,Args};
-collect_cc([$~|Fmt], Args) -> {$~,[],Fmt,Args};
-collect_cc([$n|Fmt], Args) -> {$n,[],Fmt,Args};
-collect_cc([$i|Fmt], [A|Args]) -> {$i,[A],Fmt,Args}.
-
-%% pcount([ControlC]) -> Count.
-%%  Count the number of print requests.
-
-pcount(Cs) -> pcount(Cs, 0).
-
-pcount([{$p,_As,_F,_Ad,_P,_Pad}|Cs], Acc) -> pcount(Cs, Acc+1);
-pcount([{$P,_As,_F,_Ad,_P,_Pad}|Cs], Acc) -> pcount(Cs, Acc+1);
-pcount([_|Cs], Acc) -> pcount(Cs, Acc);
-pcount([], Acc) -> Acc.
-
-%% build([Control], Pc, Indentation) -> [Char].
-%%  Interpret the control structures. Count the number of print
-%%  remaining and only calculate indentation when necessary. Must also
-%%  be smart when calculating indentation for characters in format.
-
-build([{C,As,F,Ad,P,Pad}|Cs], Pc0, I) ->
-    S = control(C, As, F, Ad, P, Pad, I),
-    Pc1 = decr_pc(C, Pc0),
-    if
-	Pc1 > 0 -> [S|build(Cs, Pc1, indentation(S, I))];
-	true -> [S|build(Cs, Pc1, I)]
-    end;
-build([$\n|Cs], Pc, _I) -> [$\n|build(Cs, Pc, 0)];
-build([$\t|Cs], Pc, I) -> [$\t|build(Cs, Pc, ((I + 8) div 8) * 8)];
-build([C|Cs], Pc, I) -> [C|build(Cs, Pc, I+1)];
-build([], _, _) -> [].
-
-decr_pc($p, Pc) -> Pc - 1;
-decr_pc($P, Pc) -> Pc - 1;
-decr_pc(_C, Pc) -> Pc.
-
-%% control(FormatChar, [Argument], FieldWidth, Adjust, Precision, PadChar,
-
-%%	   Indentation) ->
-%%	[Char]
-%%  This is the main dispatch function for the various formatting commands.
-%%  Field widths and precisions have already been calculated.
-
-control($w, [A], F, Adj, P, Pad, _I) ->
-    term(tv_io_lib:write(A, -1), F, Adj, P, Pad);
-control($p, [A], F, Adj, P, Pad, I) ->
-    print(A, -1, F, Adj, P, Pad, I);
-control($W, [A,Depth], F, Adj, P, Pad, _I) when is_integer(Depth) ->
-    term(tv_io_lib:write(A, Depth), F, Adj, P, Pad);
-control($P, [A,Depth], F, Adj, P, Pad, I) when is_integer(Depth) ->
-    print(A, Depth, F, Adj, P, Pad, I);
-control($s, [A], F, Adj, P, Pad, _I) when is_atom(A) ->
-    string(atom_to_list(A), F, Adj, P, Pad);
-control($s, [L], F, Adj, P, Pad, _I) ->
-    true = tv_io_lib:deep_char_list(L),		%Check if L a character list
-    string(L, F, Adj, P, Pad);
-control($e, [A], F, Adj, P, Pad, _I) when is_float(A) ->
-    fwrite_e(A, F, Adj, P, Pad);
-control($f, [A], F, Adj, P, Pad, _I) when is_float(A) ->
-    fwrite_f(A, F, Adj, P, Pad);
-control($g, [A], F, Adj, P, Pad, _I) when is_float(A) ->
-    fwrite_g(A, F, Adj, P, Pad);
-control($c, [A], F, Adj, P, Pad, _I) when is_integer(A) ->
-    char(A band 255, F, Adj, P, Pad);
-control($~, [], F, Adj, P, Pad, _I) -> char($~, F, Adj, P, Pad);
-control($n, [], F, Adj, P, Pad, _I) -> newline(F, Adj, P, Pad);
-control($i, [_A], _F, _Adj, _P, _Pad, _I) -> [].
-
-%% indentation([Char], Indentation) -> Indentation.
-%%  Calculate the indentation of the end of a string given its start
-%%  indentation. We assume tabs at 8 cols.
-
-indentation([$\n|Cs], _I) -> indentation(Cs, 0);
-indentation([$\t|Cs], I) -> indentation(Cs, ((I + 8) div 8) * 8);
-indentation([C|Cs], I) when is_integer(C) ->
-    indentation(Cs, I+1);
-indentation([C|Cs], I) ->
-    indentation(Cs, indentation(C, I));
-indentation([], I) -> I.
-
-%% term(TermList, Field, Adjust, Precision, PadChar)
-%%  Output the characters in a term.
-
-term(T, none, _Adj, none, _Pad) -> T;
-term(T, none, Adj, P, Pad) -> term(T, P, Adj, P, Pad);
-term(T, F, Adj, none, Pad) -> term(T, F, Adj, erlang:min(flat_length(T), F), Pad);
-term(T, F, Adj, P, Pad) when F >= P ->
-    adjust_error(T, F, Adj, P, Pad).
-
-%% print(Term, Depth, Field, Adjust, Precision, PadChar, Indentation)
-%%  Print a term.
-
-print(T, D, none, Adj, P, Pad, I) -> print(T, D, 80, Adj, P, Pad, I);
-print(T, D, F, Adj, none, Pad, I) -> print(T, D, F, Adj, I+1, Pad, I);
-print(T, D, F, right, P, _Pad, _I) ->
-    tv_io_lib_pretty:pretty_print(T, P, F, D).
-
-%% fwrite_e(Float, Field, Adjust, Precision, PadChar)
-
-fwrite_e(Fl, none, Adj, none, Pad) ->		%Default values
-    fwrite_e(Fl, none, Adj, 6, Pad);
-fwrite_e(Fl, none, _Adj, P, _Pad) when P >= 2 ->
-    float_e(Fl, float_data(Fl), P);
-fwrite_e(Fl, F, Adj, none, Pad) ->
-    fwrite_e(Fl, F, Adj, 6, Pad);
-fwrite_e(Fl, F, Adj, P, Pad) when P >= 2 ->
-    adjust_error(float_e(Fl, float_data(Fl), P), F, Adj, F, Pad).
-
-float_e(Fl, Fd, P) when Fl < 0.0 ->		%Negative numbers
-    [$-|float_e(-Fl, Fd, P)];
-float_e(_Fl, {Ds,E}, P) ->
-    case float_man(Ds, 1, P-1) of
-	{[$0|Fs],true} -> [[$1|Fs]|float_exp(E)];
-	{Fs,false} -> [Fs|float_exp(E-1)]
-    end.
-
-%% float_man([Digit], Icount, Dcount) -> {[Chars],CarryFlag}.
-%%  Generate the characters in the mantissa from the digits with Icount
-%%  characters before the '.' and Dcount decimals. Handle carry and let
-%%  caller decide what to do at top.
-
-float_man(Ds, 0, Dc) ->
-    {Cs,C} = float_man(Ds, Dc),
-    {[$.|Cs],C};
-float_man([D|Ds], I, Dc) ->
-    case float_man(Ds, I-1, Dc) of
-	{Cs,true} when D =:= $9 -> {[$0|Cs],true};
-	{Cs,true} -> {[D+1|Cs],false};
-	{Cs,false} -> {[D|Cs],false}
-    end;
-float_man([], I, Dc) ->				%Pad with 0's
-    {string:chars($0, I, [$.|string:chars($0, Dc)]),false}.
-
-float_man([D|_Ds], 0) when D >= $5 -> {[],true};
-float_man([_|_], 0) -> {[],false};
-float_man([D|Ds], Dc) ->
-    case float_man(Ds, Dc-1) of
-	{Cs,true} when D =:= $9 -> {[$0|Cs],true};
-	{Cs,true} -> {[D+1|Cs],false}; 
-	{Cs,false} -> {[D|Cs],false}
-    end;
-float_man([], Dc) -> {string:chars($0, Dc),false}.	%Pad with 0's
-
-%% float_exp(Exponent) -> [Char].
-%%  Generate the exponent of a floating point number. Alwayd include sign.
-
-float_exp(E) when E >= 0 ->
-    [$e,$+|integer_to_list(E)];
-float_exp(E) ->
-    [$e|integer_to_list(E)].
-
-%% fwrite_f(FloatData, Field, Adjust, Precision, PadChar)
-
-fwrite_f(Fl, none, Adj, none, Pad) ->		%Default values
-    fwrite_f(Fl, none, Adj, 6, Pad);
-fwrite_f(Fl, none, _Adj, P, _Pad) when P >= 1 ->
-    float_f(Fl, float_data(Fl), P);
-fwrite_f(Fl, F, Adj, none, Pad) ->
-    fwrite_f(Fl, F, Adj, 6, Pad);
-fwrite_f(Fl, F, Adj, P, Pad) when P >= 1 ->
-    adjust_error(float_f(Fl, float_data(Fl), P), F, Adj, F, Pad).
-
-float_f(Fl, Fd, P) when Fl < 0.0 ->
-    [$-|float_f(-Fl, Fd, P)];
-float_f(Fl, {Ds,E}, P) when E =< 0 ->
-    float_f(Fl, {string:chars($0, -E+1, Ds),1}, P);	%Prepend enough 0's
-float_f(_Fl, {Ds,E}, P) ->
-    case float_man(Ds, E, P) of
-	{Fs,true} -> "1" ++ Fs;			%Handle carry
-	{Fs,false} -> Fs
-    end.
-
-%% float_data([FloatChar]) -> {[Digit],Exponent}
-
-float_data(Fl) ->
-    float_data(float_to_list(Fl), []).
-
-float_data([$e|E], Ds) ->
-    {reverse(Ds),list_to_integer(E)+1};
-float_data([D|Cs], Ds) when D >= $0, D =< $9 ->
-    float_data(Cs, [D|Ds]);
-float_data([_D|Cs], Ds) ->
-    float_data(Cs, Ds).
-
-
-%% fwrite_g(Float, Field, Adjust, Precision, PadChar)
-%%  Use the f form if Float is > 0.1 and < 10^4, else the e form.
-%%  Precision always means the # of significant digits.
-
-fwrite_g(Fl) ->
-    fwrite_g(Fl, none, right, none, $\s).
-
-fwrite_g(Fl, F, Adj, none, Pad) ->
-    fwrite_g(Fl, F, Adj, 6, Pad);
-fwrite_g(Fl, F, Adj, P, Pad) when abs(Fl) < 0.1 ->
-    fwrite_e(Fl, F, Adj, P, Pad);
-fwrite_g(Fl, F, Adj, P, Pad) when abs(Fl) < 1.0 ->
-    fwrite_f(Fl, F, Adj, P, Pad);
-fwrite_g(Fl, F, Adj, P, Pad) when abs(Fl) < 10.0 ->
-    fwrite_f(Fl, F, Adj, P-1, Pad);
-fwrite_g(Fl, F, Adj, P, Pad) when abs(Fl) < 100.0 ->
-    fwrite_f(Fl, F, Adj, P-2, Pad);
-fwrite_g(Fl, F, Adj, P, Pad) when abs(Fl) < 1000.0 ->
-    fwrite_f(Fl, F, Adj, P-3, Pad);
-fwrite_g(Fl, F, Adj, P, Pad) when abs(Fl) < 10000.0 ->
-    fwrite_f(Fl, F, Adj, P-4, Pad);
-fwrite_g(Fl, F, Adj, P, Pad) ->
-    fwrite_e(Fl, F, Adj, P, Pad).
-
-%% string(String, Field, Adjust, Precision, PadChar)
-
-string(S, none, _Adj, none, _Pad) -> S;
-string(S, F, Adj, none, Pad) ->
-    string(S, F, Adj, erlang:min(flat_length(S), F), Pad);
-string(S, none, _Adj, P, Pad) ->
-    string:left(flatten(S), P, Pad);
-string(S, F, Adj, P, Pad) when F >= P ->
-    adjust(string:left(flatten(S), P, Pad), string:chars(Pad, F - P), Adj).
-
-%% char(Char, Field, Adjust, Precision, PadChar) -> [Char].
-
-char(C, none, _Adj, none, _Pad) -> [C];
-char(C, F, _Adj, none, _Pad) -> string:chars(C, F);
-char(C, none, _Adj, P, _Pad) -> string:chars(C, P);
-char(C, F, Adj, P, Pad) when F >= P ->
-    adjust(string:chars(C, P), string:chars(Pad, F - P), Adj).
-
-%% newline(Field, Adjust, Precision, PadChar) -> [Char].
-
-newline(none, _Adj, _P, _Pad) -> "\n";
-newline(F, right, _P, _Pad) -> string:chars($\n, F).
-
-%% adjust_error([Char], Field, Adjust, Max, PadChar) -> [Char].
-%%  Adjust the characters within the field if length less than Max padding
-%%  with PadChar.
-
-adjust_error(Cs, F, Adj, M, Pad) ->
-    L = flat_length(Cs),
-    if
-	L > M ->
-	    adjust(string:chars($*, M), string:chars(Pad, F - M), Adj);
-	true ->
-	    adjust(Cs, string:chars(Pad, F - L), Adj)
-    end.
-
-adjust(Data, Pad, left) -> [Data,Pad];
-adjust(Data, Pad, right) -> [Pad,Data].
-
-%%
-%% Utilities
-%%
-
-reverse(List) ->
-    reverse(List, []).
-
-reverse([H|T], Stack) ->
-    reverse(T, [H|Stack]);
-reverse([], Stack) -> Stack.
-
-%% flatten(List)
-%%  Flatten a list.
-
-flatten(List) -> flatten(List, []).
-
-flatten([H|T], Cont) when is_list(H) ->
-    flatten(H, [T|Cont]);
-flatten([H|T], Cont) ->
-    [H|flatten(T, Cont)];
-flatten([], [H|Cont]) -> flatten(H, Cont);
-flatten([], []) -> [].
-
-%% flat_length(List)
-%%  Calculate the length of a list of lists.
-
-flat_length(List) -> flat_length(List, 0).
-
-flat_length([H|T], L) when is_list(H) ->
-    flat_length(H, flat_length(T, L));
-flat_length([_|T], L) ->
-    flat_length(T, L + 1);
-flat_length([], L) -> L.
diff --git a/lib/tv/src/tv_io_lib_pretty.erl b/lib/tv/src/tv_io_lib_pretty.erl
deleted file mode 100644
index c19277d006..0000000000
--- a/lib/tv/src/tv_io_lib_pretty.erl
+++ /dev/null
@@ -1,171 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-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(tv_io_lib_pretty).
-
-
-
--export([pretty_print/4]).
-
-%% pretty_print(Term, Column, LineLength, Depth) -> [Chars]
-%% Depth = -1 gives unlimited print depth. Use tv_io_lib:write for atomic terms.
-
-pretty_print(_, _, _, 0) -> "...";
-pretty_print([], _, _, _) -> "[]";
-pretty_print({}, _, _, _) -> "{}";
-pretty_print(List, Col, Ll, D) when is_list(List) ->
-    case tv_io_lib:printable_list(List) of
-	true ->
-	    tv_io_lib:write_string(List, $");
-	false ->
-	    Len = write_length(List, D, 0, Ll - Col),
-	    if
-		D =:= 1 -> "[...]";
-		Len + Col < Ll ->
-		    write(List, D);
-		true ->
-		    [$[,
-		     [pretty_print(hd(List), Col + 1, Ll, D - 1)|
-		      pretty_print_tail(tl(List), Col + 1, Ll, D - 1)],
-		     $]]
-	    end
-    end;
-pretty_print(Fun, _Col, _Ll, _D) when is_function(Fun) ->
-    tv_io_lib:write(Fun);
-pretty_print(Tuple, Col, Ll, D) when is_tuple(Tuple) ->
-    Len = write_length(Tuple, D, 0, Ll - Col),
-    if
-	D =:= 1 -> "{...}";
-	Len + Col < Ll ->
-	    write(Tuple, D);
-	is_atom(element(1, Tuple)), size(Tuple) > 1 ->
-	    print_tag_tuple(Tuple, Col, Ll, D);
-	true ->
-	    [${,
-	     [pretty_print(element(1, Tuple), Col + 1, Ll, D - 1)|
-	      pretty_print_tail(tl(tuple_to_list(Tuple)), Col + 1, Ll, D - 1)],
-	     $}]
-    end;
-pretty_print(Term, _Col, _Ll, D) -> tv_io_lib:write(Term, D).
-
-%% print_tag_tuple(Tuple, Column, LineLength, Depth) -> [Char]
-%%  Print a tagged tuple by indenting the rest of the elements differently
-%%  to the tag. Start beside the tag if start column not too far to
-%%  the right. Tuple has size >= 2.
-
-print_tag_tuple(Tuple, Col, Ll, D) ->
-    Tag = tv_io_lib:write_atom(element(1, Tuple)),
-    Tlen = length(Tag),
-    Tcol = Col + Tlen + 2,
-    if
-	Tcol >= Ll div 2, Tlen > 2 ->
-	    [${,Tag,
-	     pretty_print_tail(tl(tuple_to_list(Tuple)), Col + 4, Ll, D - 2),
-	     $}];
-	true ->
-	    [${,Tag,$,,
-	     [pretty_print(element(2, Tuple), Col + Tlen + 2, Ll, D - 2)|
-	      pretty_print_tail(tl(tl(tuple_to_list(Tuple))), Tcol, Ll, D - 3)],
-	     $}]
-    end.
-
-%% pretty_print_tail([Element], Column, LineLength, D) -> [Char]
-%%  Pretty print the elements of a list or tuple.
-
-pretty_print_tail([], _Col, _Ll, _D) -> "";
-pretty_print_tail(_Es, _Col, _Ll, 1) -> "|...";
-pretty_print_tail([E|Es], Col, Ll, D) ->
-    [$,,nl_indent(Col-1),
-     pretty_print(E, Col, Ll, D-1)|
-     pretty_print_tail(Es, Col, Ll, D-1)];
-pretty_print_tail(E, Col, Ll, D) ->
-    [$|,nl_indent(Col-1),pretty_print(E, Col, Ll, D-1)].
-
-%% write(Term, Depth) -> [Char]
-%%  Write a term down to Depth on one line. Use tv_io_lib:write/2 for
-%%  atomic terms.
-
-write(_, 0) -> "...";
-write([], _) -> "[]";
-write({}, _) -> "{}";
-write(List, D) when is_list(List) ->
-    case tv_io_lib:printable_list(List) of
-	true ->
-	    tv_io_lib:write_string(List, $");
-	false ->
-	    if
-		D =:= 1 -> "[...]";
-		true ->
-		    [$[,
-		     [write(hd(List), D-1)|write_tail(tl(List), D-1)],
-		     $]]
-	    end
-    end;
-write(Fun, _D) when is_function(Fun) -> tv_io_lib:write(Fun); %Must catch this first
-write(T, D) when is_tuple(T) ->
-    if
-	D =:= 1 -> "{...}";
-	true ->
-	    [${,
-	     [write(element(1, T), D-1)|write_tail(tl(tuple_to_list(T)), D-1)],
-	     $}]
-    end;
-write(Term, D) -> tv_io_lib:write(Term, D).
-
-write_tail([], _D) -> "";
-write_tail(_Es, 1) -> "|...";
-write_tail([E|Es], D) ->
-    [$,,write(E, D - 1)|write_tail(Es, D - 1)];
-write_tail(E, D) ->
-    [$|,write(E, D - 1)].
-     
-%% write_length(Term, Depth, Accumulator, MaxLength) -> integer()
-%%  Calculate the print length of a term, but exit when length becomes
-%%  greater than MaxLength.
-
-write_length(_T, _D, Acc, Max) when Acc > Max -> Acc;
-write_length(_T, 0, Acc, _Max) -> Acc + 3;
-write_length([], _, Acc, _) -> Acc + 2;
-write_length({}, _, Acc, _) -> Acc + 2;
-write_length(List, D, Acc, Max) when is_list(List) ->
-    case tv_io_lib:printable_list(List) of
-	true ->
-	    Acc + length(tv_io_lib:write_string(List, $"));
-	false ->
-	    write_length_list(List, D, Acc, Max)
-    end;
-write_length(Fun, _D, Acc, _Max) when is_function(Fun) ->
-    Acc + length(tv_io_lib:write(Fun));
-write_length(Tuple, D, Acc, Max) when is_tuple(Tuple) ->
-    write_length_list(tuple_to_list(Tuple), D, Acc, Max);
-write_length(Term, _D, Acc, _Max) ->
-    Acc + length(tv_io_lib:write(Term)).
-
-write_length_list(_, _, Acc, Max) when Acc > Max -> Acc;
-write_length_list([], _, Acc, _) -> Acc + 1;	%]
-write_length_list(_Es, 1, Acc, _) -> Acc + 5;	%|...]
-write_length_list([E|Es], D, Acc, Max) ->
-    write_length_list(Es,
-		      D - 1,
-		      write_length(E, D - 1, Acc + 1, Max),
-		      Max);
-write_length_list(E, D, Acc, Max) ->
-    write_length(E, D - 1, Acc + 2, Max).	%| ]
-
-
-
-nl_indent(_) -> "".
diff --git a/lib/tv/src/tv_ip.erl b/lib/tv/src/tv_ip.erl
deleted file mode 100644
index 9f66917362..0000000000
--- a/lib/tv/src/tv_ip.erl
+++ /dev/null
@@ -1,242 +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%
--module(tv_ip).
--compile([{nowarn_deprecated_function,{gs,canvas,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([ip/1]).
-
-
-
--include("tv_int_msg.hrl").
-
-
--define(NOF_LABELS, 25).
-
--define(DEFAULT_BG_COLOR, {217, 217, 217}).
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-ip(_Master) ->
-    W = gs:window(win, gs:start(), [{width, 302},
-				    {height, 38},
-				    {bg, ?DEFAULT_BG_COLOR},
-				    {title, "Launching..."}
-				   ]),
-    C = gs:canvas(W, [{width, 40},
-		      {height, 35},
-		      {x, 0},
-		      {bg, {255, 255, 255}}
-		     ]),
-    gs:create(image, C, [{load_gif, code:priv_dir(tv) ++ "/erlang.gif"}]),
-    gs:label(W, [{width, 252},
-		 {height, 12}, 
-		 {x, 47},
-		 {y, 23},
-		 {bg, {0, 0, 0}},
-		 {cursor, arrow}
-		]),
-    
-    LabelList = create_labels(?NOF_LABELS, W, 48),
-    
-    L = gs:label(W, [{width, 250},
-		     {height, 18},
-		     {x, 47},
-		     {y, 0},
-		     {bg, ?DEFAULT_BG_COLOR},
-		     {fg, {0, 0, 0}},
-		     {align, w}
-		    ]),
-    gs:config(win, [{map, true}]),
-    loop(1, LabelList, L).
-
-
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_labels(0, _WinId, _Xpos) ->
-    [];
-create_labels(N, WinId, Xpos) ->
-    Width = 10,
-    Xdiff = Width,
-    LabelId = gs:label(WinId, [{width, Width},
-			       {height, 10}, 
-			       {x, Xpos},
-			       {y, 24},
-			       {bg, {235, 235, 235}},
-			       {cursor, arrow}
-			      ]),
-
-    [LabelId | create_labels(N - 1, WinId, Xpos + Xdiff)].
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-loop(N, LabelList, L) ->
-    receive
-	Msg ->
-	    case Msg of
-
-		#ip_update{nof_elements_to_mark = X, text = Text} ->
-		    update_window(LabelList, N, N + X, L, Text),
-		    loop(N + X, LabelList, L);
-
-		#ip_quit{} ->
-		    update_labels(LabelList, N, ?NOF_LABELS),
-		    receive
-		    after 1000 ->
-			    done
-		    end,
-		    done;
-
-		_Other ->
-		    loop(N, LabelList, L)
-	    end
-    end.
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_window(LabelList, N, Hi, LblId, Text) ->
-    gs:config(win, [raise]),
-    gs:config(LblId, [{label, {text, Text}}]),
-    update_labels(LabelList, N, Hi).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_labels(_LabelList, N, _Hi) when N > ?NOF_LABELS ->
-    done;
-update_labels(_LabelList, N, Hi) when N >= Hi ->
-    done;
-update_labels(LabelList, N, Hi) ->
-    LabelId = lists:nth(N, LabelList),
-    gs:config(LabelId, [{bg, {0, 0, 255}}]),
-    update_labels(LabelList, N + 1, Hi).
-    
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_main.erl b/lib/tv/src/tv_main.erl
deleted file mode 100644
index b6ffbd7c49..0000000000
--- a/lib/tv/src/tv_main.erl
+++ /dev/null
@@ -1,1821 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(tv_main).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,frame,3}},
-          {nowarn_deprecated_function,{gs,grid,3}},
-          {nowarn_deprecated_function,{gs,gridline,2}},
-          {nowarn_deprecated_function,{gs,label,3}},
-          {nowarn_deprecated_function,{gs,menu,2}},
-          {nowarn_deprecated_function,{gs,menubar,3}},
-          {nowarn_deprecated_function,{gs,menubutton,2}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,menuitem,3}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([start/0,
-	 init/0
-	]).
-
-
--export([get_ets_tables/1,
-	 get_mnesia_tables/1
-	]).
-
-
-
--include("tv_main.hrl").
--include("tv_int_msg.hrl").
--include("tv_pd_int_msg.hrl").
--include("tv_pd_int_def.hrl").
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-start() ->
-    spawn(?MODULE, init, []).
-
-
-
-init() ->
-    process_flag(trap_exit,true),
-       %% OK, so it's *BAD* to use the process dictionary...
-       %% So why have I used it? Because it is simple to remove the haiku-functionality,
-       %% if that is desired. Otherwise a lot of functions (the parameters) would have 
-       %% to be changed.
-    put(error_msg_mode, ?ERROR_MSG_MODE),
-    KindOfTable  = ets,
-    SysTabHidden = true,
-    UnreadHidden = true,
-    SortKey      = ?NAME_COL,
-    CurrNode     = node(),
-    Children     = start_tv_nodewin(CurrNode),
-    {MarkedCell, TempGridLines, WinSize, ShortcutList} = create_window([]),
-    Tables       = get_tables(CurrNode, KindOfTable, UnreadHidden, SysTabHidden,SortKey),
-    gs:config(grid, [{rows, {1, get_nof_rows(length(Tables), 
-					     gs:read(grid, height))}}]),
-    GridLines = update_gridlines(Tables, TempGridLines, 1),
-    gs:config(win, [{map, true}, {cursor,arrow}]),
-       %% To avoid unpleasant error/exit messages, we surround the loop with a catch.
-    catch loop(KindOfTable, CurrNode, MarkedCell, GridLines, WinSize, Tables, ShortcutList,
-	       UnreadHidden, SysTabHidden, SortKey, Children).
-
-
-
-start_tv_nodewin(CurrNode) ->
-    NodewinPid = tv_nodewin:start(CurrNode, get(error_msg_mode)),
-    [{NodewinPid, tv_nodewin, CurrNode}].
-    
-
-
-    
-    
-get_ets_tables(SysTabHidden) ->
-    Tables = ets:all(),
-    get_ets_table_info(Tables, 
-		       hidden_tables(ets, SysTabHidden) ++ 
-		       current_mnesia_tables(SysTabHidden),
-		       owners_to_hide(ets, SysTabHidden),
-		       []).
-    
-    
-
-get_mnesia_tables(SysTabHidden) ->
-    Tables = mnesia:system_info(tables),
-    get_mnesia_table_info(Tables -- hidden_tables(mnesia, SysTabHidden), 
-			  owners_to_hide(mnesia, SysTabHidden),
-			  []).
-    
-
-
-
-
-owners_to_hide(ets, true) ->
-    ?SYSTEM_OWNERS;
-owners_to_hide(ets, false) ->
-    [];
-owners_to_hide(mnesia, true) ->
-    [];
-owners_to_hide(mnesia, false) ->
-    [].
-
-
-
-
-get_mnesia_table_info([], _OwnersToHide, Acc) ->
-    lists:keysort(?NAME_ELEM, Acc);
-get_mnesia_table_info([TabId | Tail], OwnersToHide, Acc) ->
-    case catch get_mnesia_owner_size(TabId) of
-	{'EXIT', _Reason} ->  
-	       %% Ignore tables ceasing to exist. 
-	       %% Nodedown errors caught above!
-	    get_mnesia_table_info(Tail, OwnersToHide, Acc);
-	{OwnerPid, OwnerName, Size} ->
-	    case lists:member(OwnerName, OwnersToHide) of
-		true ->
-		    get_mnesia_table_info(Tail, OwnersToHide, Acc);
-		false ->
-		    Readable = not(lists:member(TabId, ?UNREADABLE_MNESIA_TABLES)),
-		    get_mnesia_table_info(Tail, 
-					  OwnersToHide,
-					  [{TabId, {notext}, {notext}, Readable, 
-					    OwnerPid, OwnerName, Size} | Acc])
-	    end
-    end.
-
-
-
-
-get_mnesia_owner_size(TabId) ->
-    {OwnerPid, OwnerName} = 
-	case catch mnesia:table_info(TabId, owner) of
-	    Pid when is_pid(Pid) ->
-		case lists:keysearch(registered_name, 1, process_info(Pid)) of
-		    false ->
-			{Pid, {notext}};
-		    {value, {registered_name, ProcName}} ->
-			{Pid, ProcName}
-		end;
-	    _Other ->
-		{{notext}, {notext}}
-	end,
-    Size = mnesia:table_info(TabId, size),
-    {OwnerPid, OwnerName, Size}.
-
-
-
-
-
-
-
-hidden_tables(_Any, true) ->
-    ?SYSTEM_TABLES ++ ?MNESIA_TABLES;
-hidden_tables(ets, _SysTabHidden) ->
-    ?MNESIA_TABLES;
-hidden_tables(mnesia, _SysTabHidden) ->
-    [].
-
-
-
-
-get_tables(Node, KindOfTable, UnreadHidden, SysTabHidden,SortKey) ->
-    LocalNode = (Node =:= node()),
-    Tables = 
-	case catch get_table_list(Node,LocalNode,KindOfTable,SysTabHidden) of
-	    Result when is_list(Result) ->
-		case UnreadHidden of 
-		    true ->
-			lists:filter(fun(H) ->
-					     element(?READABLE_ELEM, H)
-				     end, 
-				     Result);
-		    _Other ->
-			Result
-		end;
-	    Error ->
-		analyze_error(Error, Node, undefined),
-		[]
-	end,
-    case SortKey of
-	?PROCNAME_ELEM ->
-	    lists:keysort(SortKey, 
-			  lists:keysort(?PID_ELEM, Tables));
-	_OtherCol ->
-	    lists:keysort(SortKey, 
-			  lists:keysort(?NAME_ELEM, Tables))
-    end.
-
-        
-
-
-
-get_ets_table_info([], _TablesToHide, _OwnersToHide, Acc) ->
-    lists:keysort(?ID_ELEM, Acc);
-get_ets_table_info([TabId | Tail], TablesToHide, OwnersToHide, Acc) ->
-    case catch get_ets_name_owner_protection(TabId) of
-	{'EXIT', _Reason} ->  
-	       %% Ignore tables ceasing to exist. 
-	       %% Nodedown errors caught above!
-	    get_ets_table_info(Tail, TablesToHide, OwnersToHide, Acc);
-	{Name, NamedTable, Id, Readable, OwnerPid, OwnerName, Size} ->
-	    case lists:member(Name, TablesToHide) of
-		true ->
-		    get_ets_table_info(Tail, TablesToHide, OwnersToHide, Acc);
-		false ->
-		    case lists:member(OwnerName, OwnersToHide) of
-			true ->
-			    get_ets_table_info(Tail, TablesToHide, OwnersToHide, Acc);
-			false ->
-			    get_ets_table_info(Tail, TablesToHide, OwnersToHide,
-					       [{Name,NamedTable,Id,Readable,
-						 OwnerPid,OwnerName,Size} | Acc])
-		    end
-	    end
-    end.
-
-
-
-get_ets_name_owner_protection(TabId) ->
-    Name       = ets:info(TabId, name),
-    OwnerPid   = ets:info(TabId, owner),
-    Readable   = case ets:info(TabId, protection) of
-		     private ->
-			 false;
-		     _Other ->
-			 true
-		 end,
-    Size            = ets:info(TabId, size),
-    {NamedTable,Id} = case ets:info(TabId, named_table) of
-			  true ->
-			      {true,{notext}};
-			  false ->
-			      {false, TabId}
-		      end,
-    PName      = case lists:keysearch(registered_name, 1, process_info(OwnerPid)) of
-		     false ->
-			 {notext};
-		     {value, {registered_name, ProcName}} ->
-			 ProcName
-		 end,
-    {Name, NamedTable, Id, Readable, OwnerPid, PName, Size}.
-
-    
-
-
-
-
-current_mnesia_tables(SysTabHidden) ->
-    case catch get_table_list(node(), true, mnesia, SysTabHidden) of
-	Result when is_list(Result) ->
-	    lists:map(fun(H) ->
-			      element(?NAME_ELEM, H)
-		      end,
-		      Result);
-	nodedown ->
-	    handle_error(nodedown, node(), undefined),
-	    [];
-	_Other ->
-	    []
-    end.
-	    
-
-
-
-get_table_list(_Node, true, ets, SysTabHidden) ->
-    get_ets_tables(SysTabHidden);
-get_table_list(Node, false, ets, SysTabHidden) ->
-    case rpc:block_call(Node, ?MODULE, get_ets_tables, [SysTabHidden]) of
-	{badrpc, Reason} ->
-	    throw({badrpc,Reason});
-	Result ->
-	    Result
-    end;
-get_table_list(_Node, true, mnesia, SysTabHidden) ->
-    get_mnesia_tables(SysTabHidden);
-get_table_list(Node, false, mnesia, SysTabHidden) ->
-    case rpc:block_call(Node, ?MODULE, get_mnesia_tables, [SysTabHidden]) of
-	{badrpc,Reason} ->
-	    throw({badrpc,Reason});
-	Result ->
-	    Result
-    end.
-
-
-
-
-analyze_error(Cause, Node, Table) ->
-    case Cause of
-	{badrpc, {'EXIT', {badarg,_Reason}}} ->
-	    done;  %% Table has ceased to exist.
-	{'EXIT', {badarg, {ets,local_info,_Args}}} ->  
-	    done;
-	
-	{badrpc, nodedown} ->
-            handle_error(nodedown, Node, Table);
-	{'EXIT', nodedown} ->
-            handle_error(nodedown, Node, Table);
-
-        {'EXIT', {aborted, {node_not_running,_ErrNode}}} ->
-            handle_error(mnesia_not_started, Node, Table);
-        {'EXIT', {'EXIT', {aborted, {node_not_running,_ErrNode}}}} ->
-            handle_error(mnesia_not_started, Node, Table);
-        {badrpc, {'EXIT', {aborted, {node_not_running,_ErrNode}}}} ->
-            handle_error(mnesia_not_started, Node, Table);
-	{'EXIT', {undef, {mnesia,_Fcn,_Args,_}}} ->
-	    handle_error(mnesia_not_started, Node, Table);
-
-        {'EXIT', Reason} ->
-            handle_error({unexpected_error,Reason}, Node, Table);
-        Error when is_tuple(Error) ->
-            handle_error({unexpected_error,Error}, Node, Table)
-    end.
-    
-	    
-
-handle_error(mnesia_not_started, _Node, _Table) ->
-    gs:config(win, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(win, "TV Notification", ["Mnesia not started!"]);
-	haiku ->
-	    tv_utils:notify(win, "TV Notification", ["Mnesia is stopped.",
-						     "We wish to reach all data",
-						     "But we never will."])
-    end;
-handle_error(nodedown, _Node, _Table) ->
-    gs:config(win, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(win, "TV Notification", ["The selected node is down!"]);
-	haiku ->
-	    Msg = ["With searching comes loss",
-		   "And the presence of absence:",
-		   "Node is down."],
-	    tv_utils:notify(win, "TV Notification", Msg)
-    end,
-    self() ! nodedown;
-handle_error({unexpected_error,Cause}, _Node, _Table) ->
-    io:format("Unexpected error:  ~p~n", [Cause]),
-    gs:config(win, [beep]).
-
-
-
-
-loop(KindOfTable,CurrNode,MarkedCell,GridLines,
-     WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    receive
-
-	{gs, Gridline, click, {grid,Readable}, [Col,Row,Text | _]} when Text =/= "" ->
-	    unmark_cell(MarkedCell, Tables),
-	    NewMarkedCell = mark_cell({Gridline, Col, Row}, MarkedCell, Readable),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, _Gridline, click, {grid,_Readable}, [_Col,_Row,"" | _]} ->
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, Gridline, doubleclick, {grid,Data}, [?NAME_COL,Row,Text | _]} when Text =/= "" ->
-	    unmark_cell(MarkedCell, Tables),	    
-	    NewMarkedCell = mark_cell({Gridline, ?NAME_COL, Row}, undefined, Data),
-	    {Table, Name, Readable} = get_table_id(KindOfTable, Row, Tables),
-	    case start_tv_browser(Table,CurrNode,Name,KindOfTable,Readable,Children) of
-		Children ->
-		    {FinalMarkedCell, NewTables, NewGridLines} = 
-			refresh_window(NewMarkedCell,Tables,KindOfTable,CurrNode,GridLines,
-				       UnreadHidden,SysTabHidden,SortKey, Children),
-		    loop(KindOfTable,CurrNode,FinalMarkedCell,NewGridLines,WinSize,NewTables,
-			 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		NewChildren ->
-		    loop(KindOfTable,CurrNode,NewMarkedCell,GridLines,WinSize,Tables,Shortcuts,
-			 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-	    end;
-	    
-
-	{gs, Gridline, doubleclick, {grid,Data}, [?ID_COL,Row,Text | _]} when Text =/= "" ->
-	    unmark_cell(MarkedCell, Tables),	    
-	    NewMarkedCell = mark_cell({Gridline, ?ID_COL, Row}, undefined, Data),
-	    {Table, Name, Readable} = get_table_id(KindOfTable, Row, Tables),
-	    case start_tv_browser(Table,CurrNode,Name,KindOfTable,Readable,Children) of
-		Children ->
-		    {FinalMarkedCell, NewTables, NewGridLines} = 
-			refresh_window(NewMarkedCell,Tables,KindOfTable,CurrNode,GridLines,
-				       UnreadHidden,SysTabHidden,SortKey, Children),
-		    loop(KindOfTable,CurrNode,FinalMarkedCell,NewGridLines,WinSize,NewTables,
-			 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		NewChildren ->
-		    loop(KindOfTable,CurrNode,NewMarkedCell,GridLines,WinSize,Tables,Shortcuts,
-			 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-	    end;
-	    
-
-	{gs, Gridline, doubleclick, {grid,Data}, [?INFO_COL,Row,Text | _]} when Text =/= "" ->
-	    unmark_cell(MarkedCell, Tables),	    
-	    NewMarkedCell = mark_cell({Gridline, ?INFO_COL, Row}, undefined, Data),
-	    {Table, _Name, _Readable} = get_table_id(KindOfTable, Row, Tables),
-	    case start_tv_info(Table, CurrNode, CurrNode =:= node(), KindOfTable, Children) of
-		Children ->
-		    {FinalMarkedCell, NewTables, NewGridLines} = 
-			refresh_window(NewMarkedCell,Tables,KindOfTable,CurrNode,GridLines,
-				       UnreadHidden,SysTabHidden,SortKey, Children),
-		    loop(KindOfTable,CurrNode,FinalMarkedCell,NewGridLines,WinSize,NewTables,
-			 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		NewChildren ->
-		    loop(KindOfTable,CurrNode,NewMarkedCell,GridLines,WinSize,Tables,Shortcuts,
-			 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-	    end;
-
-
-	{gs, Gridline, doubleclick, {grid,Data}, [?PID_COL,Row,Text | _]} when Text =/= "" ->
-	    unmark_cell(MarkedCell, Tables),	    
-	    NewMarkedCell = mark_cell({Gridline, ?PID_COL, Row}, undefined, Data),
-	    OwnerPid = element(?PID_ELEM, lists:nth(Row, Tables)),
-	    NewChildren = start_pman(OwnerPid, Children),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey, NewChildren);
-
-
-	{gs, Gridline, doubleclick, {grid,Data}, [?PROCNAME_COL,Row,Text | _]} when Text =/= "" ->
-	    unmark_cell(MarkedCell, Tables),	    
-	    NewMarkedCell = mark_cell({Gridline, ?PROCNAME_COL, Row}, undefined, Data),
-	    OwnerPid = element(?PID_ELEM, lists:nth(Row, Tables)),
-	    NewChildren = start_pman(OwnerPid, Children),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey, NewChildren);
-
-
-%%	{gs, win, configure, _Data, [Width, Height | _]} when {Width,Height} /= WinSize ->
-	Msg0 = {gs, win, configure, _Data, [Width0, Height0 | _]} 
-	when {Width0,Height0} =/= WinSize ->
-	    {gs, win, configure, _, [Width,Height|_]} = flush_msgs(Msg0),
-
-	    NewSize = resize_window(Width, Height, length(Tables)),
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,NewSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-	
-
-	{gs, _Id, click, update, _Args} ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable,CurrNode,GridLines,UnreadHidden,SysTabHidden,SortKey),
-	    update_tv_info(Children),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, _Id, click, open_table, _Args} ->
-	    {Table, Name, Readable} = get_table_id(KindOfTable, element(3, MarkedCell), 
-						   Tables),
-	    case start_tv_browser(Table,CurrNode,Name,KindOfTable,Readable,Children) of
-		Children ->
-		    {NewMarkedCell, NewTables, NewGridLines} = 
-			refresh_window(MarkedCell,Tables,KindOfTable,CurrNode,GridLines,
-				       UnreadHidden,SysTabHidden,SortKey, Children),
-		    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,
-			 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		NewChildren ->
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-			 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-	    end;
-	
-
-	{gs, _Id, click, new_table, _Args} ->
-	    NewChildren = start_tv_new_table(CurrNode, Children),
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,NewChildren);
-	
-
-	{gs, _Id, click, select_node, _Args} ->
-	    show_tv_nodewin(Children),
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, _Id, click, show_mnesia, _Args} when KindOfTable =:= ets ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    gs:config(label2, [{fg, ?DISABLED_COLOR}]),
-	    gs:config(sort_table_id, [{enable, false}]),
-	    NewSortKey = 
-		case SortKey of
-		    ?ID_ELEM ->
-			gs:config(sort_table_name, [{select,true}]),
-			?NAME_ELEM;
-		    _Other ->
-			SortKey
-		end,
-	    {NewTables, NewGridLines} = 
-		update_grid(mnesia, CurrNode, GridLines, UnreadHidden, SysTabHidden, NewSortKey),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(mnesia,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,NewSortKey,Children);
-
-
-	{gs, _Id, click, show_ets, _Args} when KindOfTable =:= mnesia ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    gs:config(label2, [{fg, ?NORMAL_FG_COLOR}]),
-	    gs:config(label3, [{fg, ?NORMAL_FG_COLOR}]),
-	    gs:config(label4, [{fg, ?NORMAL_FG_COLOR}]),
-	    {NewTables, NewGridLines} = 
-		update_grid(ets, CurrNode, GridLines, UnreadHidden, SysTabHidden,SortKey),
-	    %% gs:config(show_unreadable, [{enable, true},
-	    %%				   {select, not(UnreadHidden)}]),
-	    gs:config(sort_table_id, [{enable, true}]),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(ets,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-	    
-
-	{gs, _Id, click, show_system, _Args} when SysTabHidden ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} 
-		= update_grid(KindOfTable, CurrNode, GridLines, UnreadHidden, false, SortKey),
-	    gs:config(show_system, [{data, hide_system}]),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,false,SortKey,Children);
-
-
-	{gs, _Id, click, hide_system, _Args} when not SysTabHidden ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable, CurrNode, GridLines, UnreadHidden, true, SortKey),
-	    gs:config(show_system, [{label, {text, " System Tables "}},
-				    {data, show_system}]),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,true,SortKey,Children);
-
-
-	{gs, _Id, click, show_unreadable, _Args} when UnreadHidden ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} 
-		= update_grid(KindOfTable, CurrNode, GridLines, false, SysTabHidden, SortKey),
-	    gs:config(show_unreadable, [{data, hide_unreadable}]),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 false,SysTabHidden,SortKey,Children);
-
-
-	{gs, _Id, click, hide_unreadable, _Args} when not UnreadHidden ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable, CurrNode, GridLines, true, SysTabHidden, SortKey),
-	    gs:config(show_unreadable, [{label, {text, " Unreadable Tables "}},
-					{data, show_unreadable}]),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 true,SysTabHidden,SortKey,Children);
-
-
-	{gs, _Id, click, show_info, _Args} ->
-	    {Table, _Name, _Readable} = get_table_id(KindOfTable, element(3,MarkedCell),
-					      Tables),
-	    case start_tv_info(Table, CurrNode, CurrNode =:= node(), KindOfTable, Children) of
-		Children ->
-		    {NewMarkedCell, NewTables, NewGridLines} = 
-			refresh_window(MarkedCell,Tables,KindOfTable,CurrNode,GridLines,
-				       UnreadHidden,SysTabHidden,SortKey, Children),
-		    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,
-			 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		NewChildren ->
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-			 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-	    end;
-
-
-	{gs, _Id, click, sort_table_name, _Args} when SortKey =/= ?NAME_ELEM ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable,CurrNode,GridLines,UnreadHidden,SysTabHidden,?NAME_ELEM),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,?NAME_ELEM,Children);
-	
-
-	{gs, _Id, click, sort_table_id, _Args} when SortKey =/= ?ID_ELEM ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable,CurrNode,GridLines,UnreadHidden,SysTabHidden,?ID_ELEM),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,?ID_ELEM,Children);
-		    
-
-	{gs, _Id, click, sort_owner_name, _Args} when SortKey =/= ?PROCNAME_ELEM ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable,CurrNode,GridLines,UnreadHidden,SysTabHidden,
-			    ?PROCNAME_ELEM),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,?PROCNAME_ELEM,Children);
-	
-
-	{gs, _Id, click, sort_owner_pid, _Args} when SortKey =/= ?PID_ELEM ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable,CurrNode,GridLines,UnreadHidden,SysTabHidden,?PID_ELEM),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,?PID_ELEM,Children);
-	
-	    
-	{gs, _Id, click, trace_process, _Args} ->
-	    OwnerPid = element(?PID_ELEM, lists:nth(element(3,MarkedCell), Tables)),
-	    NewChildren = start_pman(OwnerPid, Children),
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,NewChildren);
-	    
-
-	{gs, _Id, click, help_button, _Args} ->
-	    HelpFile = filename:join([code:lib_dir(tv), "doc", "html", "index.html"]),
-	    tool_utils:open_help(win, HelpFile),
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, _Id, click, otp_help_button, _Args} ->
-	    IndexFile = filename:join([code:root_dir(), "doc", "index.html"]),
-	    tool_utils:open_help(win, IndexFile),
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, win, configure, _Data, _Args} ->
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, _Id, click, exit_button, _Args} ->
-	    lists:foreach(
-	      fun({Pid,pman,_OP}) ->
-		      exit(Pid,kill);
-		 (_) ->
-		      done
-	      end, 
-	      Children),
-	    exit(normal);
-
-
-	{gs, _Id, click, show_haiku, _Args} ->
-	    gs:config(win, [{cursor,busy}]),
-	    gs:config(show_haiku, [{data, hide_haiku}]),
-	    lists:foreach(
-	      fun({Pid,tv_info,_Data}) ->
-		      Pid ! {error_msg_mode,haiku};
-		 ({Pid,tv_browser,_Data}) ->
-		      Pid ! {error_msg_mode,haiku};
-		 ({Pid,tv_nodewin,_Data}) ->
-		      Pid ! {error_msg_mode,haiku};
-		 ({Pid,tv_new_table,_Data}) ->
-		      Pid ! {error_msg_mode,haiku};
-		 (_Other) ->
-		      done
-	      end,
-	      Children),
-	    put(error_msg_mode, haiku),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable, CurrNode, MarkedCell, GridLines, WinSize, Tables, Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-		
-
-	{gs, _Id, click, hide_haiku, _Args} ->
-	    gs:config(win, [{cursor,busy}]),
-	    gs:config(show_haiku, [{data, show_haiku}]),
-	    lists:foreach(
-	      fun({Pid,tv_info,_Data}) ->
-		      Pid ! {error_msg_mode,normal};
-		 ({Pid,tv_browser,_Data}) ->
-		      Pid ! {error_msg_mode,normal};
-		 ({Pid,tv_nodewin,_Data}) ->
-		      Pid ! {error_msg_mode,normal};
-		 ({Pid,tv_new_table,_Data}) ->
-		      Pid ! {error_msg_mode,normal};
-		 (_Other) ->
-		      done
-	      end,
-	      Children),
-	    put(error_msg_mode, normal),
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable, CurrNode, MarkedCell, GridLines, WinSize, Tables, Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{gs, win, destroy, _Data, _Args} ->
-	    lists:foreach(
-	      fun({Pid,pman,_OP}) ->
-		      exit(Pid,kill);
-		 (_) ->
-		      done
-	      end, 
-	      Children),
-	    exit(normal);
-
-
-	{gs, win, keypress, _Data, [Key, _, _, 1 | _]} ->
-	    case lists:keysearch(Key, 1, Shortcuts) of
-		{value, {Key, Value}} ->
-		    handle_keypress(Value,KindOfTable,CurrNode,MarkedCell,
-				    GridLines,WinSize,Tables, Shortcuts,
-				    UnreadHidden,SysTabHidden,SortKey,Children);
-		false ->
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-			 UnreadHidden,SysTabHidden,SortKey,Children)
-	    end;
-
-
-	{gs, win, keypress, _Data, _Args} ->
-	    loop(KindOfTable, CurrNode, MarkedCell, GridLines, WinSize, Tables, Shortcuts,
-		UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-	{tv_new_node, _Sender, NewCurrNode} ->
-	    gs:config(win, [{cursor,busy}]),
-	    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-	    {NewTables, NewGridLines} = 
-		update_grid(KindOfTable,NewCurrNode,GridLines,UnreadHidden,SysTabHidden,SortKey),
-	    update_tv_info(Children),
-	    update_tv_browser(Children),
-	    NewChildren = 
-		case replace_node_name(NewCurrNode, CurrNode) of
-		    false ->
-			Children;
-		    true ->
-			update_node_name(Children)
-		end,
-	    gs:config(win, [{cursor,arrow}]),
-	    loop(KindOfTable,NewCurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,NewChildren);
-
-
-	{tv_start_infowin, Table, Node, LocalNode, TableType} ->
-	    case start_tv_info(Table, Node, LocalNode, TableType, Children) of
-		Children ->
-		    {NewMarkedCell, NewTables, NewGridLines} = 
-			refresh_window(MarkedCell,Tables,KindOfTable,CurrNode,GridLines,
-				       UnreadHidden,SysTabHidden,SortKey, Children),
-		    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,
-			 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		NewChildren ->
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-			 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-	    end;
-
-
-	{tv_update_infowin, Table, Node, _Type} ->
-	    case get_tv_info_pid(Table, Node, Children) of
-		undefined ->
-		    done;
-		Pid ->
-		    Pid ! #info_update_table_info{sender=self()}
-	    end,
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize, 
-		 Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-	    
-
-	{tv_new_table, NewTabWinPid, Node, Name, Options, KindOfTableToCreate, _Readable, false} ->
-	    case create_table(KindOfTableToCreate, Node, Node =:= node(), Name, Options, 
-			      NewTabWinPid) of
-		error ->
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize, 
-			 Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		_TabId ->
-		    case KindOfTable of
-			mnesia ->
-			    done;
-			ets ->
-			    self() ! {gs, tv_main, click, update, []}
-		    end,
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,
-			 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children)
-	    end;
-	
-
-	
-	{tv_new_table, NewTabWinPid, Node, Name, Options, KindOfTableToCreate, Readable, true} ->
-	    case create_table(KindOfTableToCreate, Node, Node =:= node(), Name, Options, 
-			      NewTabWinPid) of
-		error ->
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize, 
-			 Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		TabId ->
-		    case start_tv_browser(TabId,Node,Name,KindOfTableToCreate,Readable,Children) of
-			Children ->
-			    {FinalMarkedCell, NewTables, NewGridLines} = 
-				case KindOfTable of
-				    mnesia ->
-					{MarkedCell, Tables, GridLines};
-				    ets ->
-					refresh_window(MarkedCell,Tables,KindOfTable,
-						       CurrNode,GridLines,UnreadHidden,
-						       SysTabHidden,SortKey, Children)
-				end,
-			    loop(KindOfTable,CurrNode,FinalMarkedCell,NewGridLines,WinSize,
-				 NewTables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-			NewChildren ->
-			    case KindOfTable of
-				mnesia ->
-				    done;
-				ets ->
-				    self() ! {gs, tv_main, click, update, []}
-			    end,
-			    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,
-				 Shortcuts,UnreadHidden,SysTabHidden,SortKey,NewChildren)
-		    end
-	    end;
-	
-
-	
-	{'EXIT', Pid, _Reason} ->
-	    case lists:keysearch(Pid, 1, Children) of
-		false ->
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize, 
-			 Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-		{value, {Pid,Prog,_Data}} ->
-		    NewChildren = 
-			case Prog of
-			    tv_nodewin ->
-				lists:keydelete(Pid, 1, Children) ++ start_tv_nodewin(CurrNode);
-			    _Other ->
-				lists:keydelete(Pid, 1, Children)
-			end,
-		    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize, 
-			 Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,NewChildren)
-	    end;
-
-
-	_Other ->
-	    loop(KindOfTable, CurrNode, MarkedCell, GridLines, WinSize, Tables, Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,Children)
-    end.
-
-
-flush_msgs(Msg0 = {gs, Win, Op, _, _}) ->
-    receive Msg = {gs, Win,Op,_,_} ->
-	    flush_msgs(Msg)
-    after 100 ->
-	    Msg0
-    end.
-
-handle_keypress(open_table,KindOfTable,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    NewChildren = 
-	case MarkedCell of
-	    {undefined,_,_} ->
-		case get(error_msg_mode) of
-		    normal ->
-			gs:config(win, [beep]),
-			tv_utils:notify(win, "TV Notification", "No table selected!");
-		    haiku ->
-			Msg = ["Rather than a beep",
-			       "Or a rude error message",
-			       "These words: make a choice."],
-			tv_utils:notify(win, "TV Notification", Msg)
-		end,
-		Children;
-	    _OtherCell ->
-		{Table, Name, Readable} = get_table_id(KindOfTable, element(3, MarkedCell), 
-						       Tables),
-		start_tv_browser(Table, CurrNode, Name, KindOfTable, Readable, Children)
-	end,
-    case NewChildren of
-	Children ->
-	    {NewMarkedCell, NewTables, NewGridLines} = 
-		refresh_window(MarkedCell,Tables,KindOfTable,CurrNode,GridLines,UnreadHidden,
-			       SysTabHidden, SortKey, Children),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,
-		 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-	_Other ->
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-    end;
-
-
-handle_keypress(update,KindOfTable,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    gs:config(win, [{cursor,busy}]),
-    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-    {NewTabs, NewGrLines} = 
-	update_grid(KindOfTable,CurrNode,GridLines,UnreadHidden,SysTabHidden,SortKey),
-    update_tv_info(Children),
-    gs:config(win, [{cursor,arrow}]),
-    loop(KindOfTable,CurrNode,NewMarkedCell,NewGrLines,WinSize,NewTabs,Shortcuts,
-	 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-handle_keypress(show_mnesia,ets,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    gs:config(win, [{cursor,busy}]),
-    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-    gs:config(label2, [{fg, ?DISABLED_COLOR}]),
-    gs:config(label3, [{fg, ?DISABLED_COLOR}]),
-    gs:config(label4, [{fg, ?DISABLED_COLOR}]),
-    gs:config(show_unreadable, [{label, {text, " Unreadable Tables "}},
-				{data, show_unreadable}]),
-    %% gs:config(show_unreadable, [{enable, false},
-    %% 				   {select, false}]),
-    gs:config(sort_table_id, [{enable, false}]),
-    NewSortKey = 
-	case SortKey of
-	    ?ID_ELEM ->
-		gs:config(sort_table_name, [{select,true}]),
-		?NAME_ELEM;
-	    _Other ->
-		SortKey
-	end,
-    {NewTables, NewGridLines} = 
-	update_grid(mnesia,CurrNode,GridLines,UnreadHidden,SysTabHidden,NewSortKey),
-    gs:config(win, [{cursor,arrow}]),
-    loop(mnesia,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-	 UnreadHidden,SysTabHidden,NewSortKey,Children);
-
-
-
-handle_keypress(show_ets,mnesia,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    gs:config(win, [{cursor,busy}]),
-    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-    gs:config(label2, [{fg, ?NORMAL_FG_COLOR}]),
-    gs:config(label3, [{fg, ?NORMAL_FG_COLOR}]),
-    gs:config(label4, [{fg, ?NORMAL_FG_COLOR}]),
-    {NewTables, NewGridLines} = 
-	update_grid(ets,CurrNode,GridLines,UnreadHidden,SysTabHidden,SortKey),
-    %% gs:config(show_unreadable, [{enable, true},
-    %%				   {select, not(UnreadHidden)}]),
-    gs:config(sort_table_id, [{enable, true}]),
-    gs:config(win, [{cursor,arrow}]),
-    loop(ets,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,Shortcuts,
-	 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-handle_keypress(trace_process,KindOfTable,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    NewChildren = 
-	case MarkedCell of
-	    {_Id, ?PID_COL, Row} ->
-		OwnerPid = element(?PID_ELEM, lists:nth(Row, Tables)),
-		start_pman(OwnerPid, Children);
-	    {_Id, ?PROCNAME_COL, Row} ->
-		OwnerPid = element(?PID_ELEM, lists:nth(Row, Tables)),
-		start_pman(OwnerPid, Children);
-	    _Other ->
-		Children
-	end,
-    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-	 UnreadHidden,SysTabHidden,SortKey, NewChildren);
-
-
-handle_keypress(select_node,KindOfTable,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    show_tv_nodewin(Children),
-    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-	 UnreadHidden,SysTabHidden,SortKey,Children);
-
-
-handle_keypress(show_info,KindOfTable,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    NewChildren = 
-	case MarkedCell of
-	    {_Id, ?NAME_COL, Row} ->
-		{Table, _Name, _Readable} = get_table_id(KindOfTable, Row, Tables),
-		start_tv_info(Table, CurrNode, CurrNode =:= node(), KindOfTable, Children);
-	    {_Id, ?ID_COL, Row} ->
-		{Table, _Name, _Readable} = get_table_id(KindOfTable, Row, Tables),
-		start_tv_info(Table, CurrNode, CurrNode =:= node(), KindOfTable, Children);
-	    {_Id, ?INFO_COL, Row} ->
-		{Table, _Name, _Readable} = get_table_id(KindOfTable, Row, Tables),
-		start_tv_info(Table, CurrNode, CurrNode =:= node(), KindOfTable, Children);
-	    _OtherCell ->
-		Children
-	end,
-    case NewChildren of
-	Children ->
-	    {NewMarkedCell, NewTables, NewGridLines} = 
-		refresh_window(MarkedCell,Tables,KindOfTable,CurrNode,GridLines,UnreadHidden,
-			       SysTabHidden, SortKey, Children),
-	    loop(KindOfTable,CurrNode,NewMarkedCell,NewGridLines,WinSize,NewTables,
-		 Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children);
-	_Other ->
-	    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-		 UnreadHidden,SysTabHidden,SortKey,NewChildren)
-    end;
-    
-
-handle_keypress(help_button,KindOfTable,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    HelpFile = filename:join([code:lib_dir(tv), "doc", "html", "index.html"]),
-    tool_utils:open_help(win, HelpFile),
-    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-	 UnreadHidden,SysTabHidden,SortKey,Children);
-
-handle_keypress(exit_button,_KindOfTable,_CurrNode,_MarkedCell,_GridLines,
-		_WinSize,_Tables,_Shortcuts,_UnreadHidden,_SysTabHidden,_SortKey,Children) ->
-    lists:foreach(
-      fun({Pid,pman,_OP}) ->
-	      exit(Pid,kill);
-	 (_) ->
-	      done
-      end, 
-      Children),
-    exit(normal);
-
-
-handle_keypress(_Any,KindOfTable,CurrNode,MarkedCell,GridLines,
-		WinSize,Tables,Shortcuts,UnreadHidden,SysTabHidden,SortKey,Children) ->
-    loop(KindOfTable,CurrNode,MarkedCell,GridLines,WinSize,Tables,Shortcuts,
-	 UnreadHidden,SysTabHidden,SortKey,Children).
-
-
-
-
-refresh_window(MarkedCell,Tables,KindOfTable,
-	       CurrNode,GridLines,UnreadHidden,SysTabHidden, SortKey, Children) ->
-    gs:config(win, [{cursor,busy}]),
-    NewMarkedCell = unmark_cell(MarkedCell, Tables),
-    {NewTables, NewGridLines} = 
-	update_grid(KindOfTable,CurrNode,GridLines,UnreadHidden,SysTabHidden,
-		    SortKey),
-    update_tv_info(Children),
-    gs:config(win, [{cursor,arrow}]),
-    {NewMarkedCell, NewTables, NewGridLines}.
-    
-
-
-
-
-get_table_id(mnesia, Row, Tables) ->
-    TabTuple = lists:nth(Row, Tables),
-    Readable = element(?READABLE_ELEM, TabTuple),
-    Id       = element(?NAME_ELEM, TabTuple),
-    {Id, Id, Readable};
-get_table_id(ets, Row, Tables) ->
-    TabTuple = lists:nth(Row, Tables),
-    Readable = element(?READABLE_ELEM, TabTuple),
-    Name     = element(?NAME_ELEM, TabTuple),
-    case element(?NAMED_TABLE_ELEM, TabTuple) of
-	false ->
-	    {element(?ID_ELEM, TabTuple), Name, Readable};
-	_Other ->
-	    {Name, Name, Readable}
-    end.
-	
-
-
-replace_node_name('nonode@nohost', 'nonode@nohost') ->
-       %% Still undistributed...
-    false;
-replace_node_name(_Node, _OldNode) when node() =:= 'nonode@nohost' ->
-       %% No longer distributed, but previously was!
-    true;
-replace_node_name(_Node, 'nonode@nohost') ->
-       %% The system has been distributed!
-    true;
-replace_node_name(_Node, _OldNode) ->
-    false.
-
-
-
-update_node_name(Children) when node() =:= 'nonode@nohost' ->
-       %% We have been distributed, but no longer are!
-       %% We change all node names stored to 'nonode@nohost'!
-       %% This works because we *will* receive exit signals
-       %% for those processes that have died on other nodes,
-       %% whereupon these processes will be removed from the
-       %% 'Children' list.
-    lists:map(fun({Pid, Prog, {Table,_Node}}) ->
-		      {Pid, Prog, {Table,'nonode@nohost'}};
-		 (H) ->
-		      H
-	      end,
-	      Children);
-update_node_name(Children) ->
-       %% We have become distributed!
-       %% Change all occurrences of 'nonode@nohost'
-       %% to the new current node name!
-    HomeNode = node(),
-    lists:map(fun({Pid, Prog, {Table,'nonode@nohost'}}) ->
-		      {Pid, Prog, {Table,HomeNode}};
-		 (H) ->
-		      H
-	      end,
-	      Children).
-    
-
-
-
-show_tv_nodewin(Children) ->
-    {value, {Pid,tv_nodewin,_Node}} = lists:keysearch(tv_nodewin, 2, Children),
-    Pid ! show_window.
-
-
-
-update_tv_info(Children) ->
-    Sender = self(),
-    lists:foreach(fun({Pid,tv_info,{_Table,_Node}}) ->
-			  Pid ! #info_update_table_info{sender=Sender};
-		     (_) ->
-			  done
-		  end,
-		  Children).
-
-
-
-update_tv_browser(Children) ->
-    lists:foreach(fun({Pid,tv_browser,{_Table,_Node}}) ->
-			  Pid ! check_node;
-		     (_) ->
-			  done
-		  end,
-		  Children).
-
-
-
-get_tv_info_pid(TabId,Node,Children) ->
-    TvInfoChildren = [X || X <- Children, element(2,X) =:= tv_info],
-    case lists:keysearch({TabId,Node}, 3, TvInfoChildren) of
-	{value, {Pid, tv_info, {_Table,Node}}} ->
-	    Pid;
-	_Other ->
-	    undefined
-    end.
-
-
-
-start_tv_browser(Tab,Node,_Name,KindOfTable,false,Children) ->
-    gs:config(win, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(win, "TV Notification", 
-			    ["The selected table is unreadable!", 
-			     "Only table information may be viewed!"]);
-	haiku ->
-	    Msg = ["Table protected.",
-		   "The answers that you're seeking",
-		   "will remain unknown."],
-	    tv_utils:notify(win, "TV Notification", Msg)
-    end,
-    start_tv_info(Tab, Node, Node =:= node(), KindOfTable, Children);
-start_tv_browser(Table,Node,Name,KindOfTable,_Readable,Children) ->
-    TvBrowserChildren = [X || X <- Children, element(2,X) =:= tv_browser],
-    case lists:keysearch({Table,Node}, 3, TvBrowserChildren) of
-	{value, {BPid,tv_browser,{Table,Node}}} ->
-	    BPid ! raise,
-	    Children;
-	_Other ->
-	       %% Check that table still exists!
-	    case table_still_there(KindOfTable, Node, Node =:= node(), Table, Name) of
-		true ->
-		    LocalNode = (Node =:= node()),
-		    NewBPid = tv:start_browser(Node, LocalNode, Table, KindOfTable, Name, 
-					       get(error_msg_mode)),
-		    [{NewBPid, tv_browser, {Table,Node}} | Children];
-		_TableDead ->
-		    gs:config(win, [beep]),
-		    case get(error_msg_mode) of
-			normal ->
-			    tv_utils:notify(win, "TV Notification", 
-					    ["The table no longer exists!"]);
-			haiku ->
-			    Msg = ["A table that big?",
-				   "It might be very useful.",
-				   "But now it is gone."],
-			    tv_utils:notify(win, "TV Notification", Msg)
-		    end,
-		    Children
-	    end
-    end.
-
-
-
-
-
-table_still_there(ets, Node, LocalNode, Table, Name) ->
-    case catch tv_ets_rpc:all(Node, LocalNode) of
-	Tables when is_list(Tables) ->
-	    case lists:member(Table, Tables) of   
-		true ->
-		    true;
-		false ->   %% May be a named table...
-		    lists:keymember(Name, 1, Tables)
-	    end;
-	Error ->
-	    analyze_error(Error, Node, Table),
-	    false
-    end;
-table_still_there(mnesia, Node, LocalNode, Table, Name) ->
-    case catch tv_mnesia_rpc:system_info(Node, LocalNode, tables) of
-	Tables when is_list(Tables) ->
-	    lists:member(Name, Tables);
-	Error ->
-	    analyze_error(Error, Node, Table),
-	    false
-    end.
-
-    
-
-
-
-
-start_tv_info(Table, Node, LocalNode, KindOfTable, Children) ->
-    TvInfoChildren = [X || X <- Children, element(2,X) =:= tv_info],
-    case lists:keysearch({Table,Node}, 3, TvInfoChildren) of
-	{value, {Pid,tv_info,{Table,Node}}} ->
-	    Pid ! #info_raise_window{sender = self()},
-	    Children;
-	_Other ->
-	       %% May have started a browser but no info window!
-	       %% Info window may have been started from that browser, but
-	       %% don't bother with checking *that*.
-	    Pid = spawn_link(tv_info, info, [self(), Node, LocalNode, Table, KindOfTable, 
-					     get(error_msg_mode)]),
-	    [{Pid, tv_info, {Table,Node}} | Children]
-    end.
-    
-
-
-
-
-start_tv_new_table(CurrNode, Children) ->
-    TvNewTableChild = [X || X <- Children, element(2,X) =:= tv_new_table],
-    case TvNewTableChild of
-	[{Pid,tv_new_table,undefined}] ->
-	    Pid ! raise,
-	    Children;
-	[] ->
-	    Pid = tv_new_table:start(CurrNode, get(error_msg_mode)),
-	    [{Pid, tv_new_table, undefined} | Children]
-    end.
-    
-
-
-
-create_table(mnesia, _Node, _LocalNode, _TabName, _Options, _NewTabWinPid) ->
-    error;
-create_table(ets, Node, LocalNode, TabName, Options, NewTabWinPid) ->
-    case tv_table_owner:create(ets, Node, LocalNode, TabName, Options) of
-	{ok, TabId} ->
-	    NewTabWinPid ! ok,
-	    TabId;
-	error ->
-	    NewTabWinPid ! error,
-	    error
-    end.
-
-
-
-
-start_pman(OwnerPid, Children) ->
-    Pid = pman_shell:start(OwnerPid),
-    [{Pid,pman,OwnerPid} | Children].
-
-
-
-
-update_grid(TableType, CurrNode, GridLines, UnreadHidden, SysTabHidden,SortKey) ->
-    NewTables = get_tables(CurrNode, TableType, UnreadHidden, SysTabHidden,SortKey),
-    TabStr = case TableType of
-		 mnesia ->
-		     "Mnesia ";
-		 ets ->
-		     "ETS "
-	     end,
-    NodeStr = atom_to_list(CurrNode),
-    gs:config(win, [{title, "[TV]   " ++ TabStr ++ "tables on " ++ NodeStr}]),
-    gs:config(grid, [{rows, {1, get_nof_rows(length(NewTables), gs:read(grid,height))}}]),
-    NewGridLines = update_gridlines(NewTables, GridLines, 1),
-    {NewTables, NewGridLines}.
-    
-    
-
-unmark_cell({undefined, AnyCol, AnyRow}, _Tables) ->
-    {undefined, AnyCol, AnyRow};
-unmark_cell({Id, Col, Row}, Tables) ->
-    disable_menus(),
-    TabTuple = lists:nth(Row, Tables),
-    ReadableTable = element(?READABLE_ELEM, TabTuple),
-    NamedTable = element(?NAMED_TABLE_ELEM, TabTuple),
-    BgColor = 
-	case ReadableTable of
-	    false ->
-		?UNREADABLE_BG_COLOR;
-	    _Other1 ->
-		?READABLE_BG_COLOR
-	end,
-    
-    FgColor = 
-	case NamedTable of
-	    false when Col =:= ?NAME_COL ->
-		?UNNAMED_FG_COLOR;
-	    _Other2 ->
-		?NORMAL_FG_COLOR
-	end,
-
-    gs:config(Id, [{bg, {Col, BgColor}},
-		   {fg, {Col, FgColor}}]),
-    {undefined, undefined, undefined}.
-
-
-
-
-mark_cell({Id,Col,Row}, {Id,Col,Row}, _Readable) ->
-    {undefined, undefined, undefined};
-mark_cell({Id,Col,Row}, _Any, Readable) ->
-    case lists:member(Col, ?POSSIBLE_MARK_COLS) of
-	true ->
-	    enable_menus(Col, Readable),
-	    gs:config(Id, [{bg, {Col, ?GRID_MARK_COLOR}},
-			   {fg, {Col, ?NORMAL_FG_COLOR}}]),
-	    {Id, Col,Row};
-	false ->
-	    {undefined, undefined, undefined}
-    end.
-
-
-disable_menus() ->
-    disable_open_menu(),
-    disable_trace_menu(),
-    disable_info_menu().
-
-
-enable_menus(?ID_COL, true) ->
-    enable_open_menu(),
-    enable_info_menu();
-enable_menus(?ID_COL, {notext}) ->
-    enable_open_menu(),
-    enable_info_menu();
-enable_menus(?ID_COL, false) ->
-    enable_info_menu();
-enable_menus(?NAME_COL, true) ->
-    enable_open_menu(),
-    enable_info_menu();
-enable_menus(?NAME_COL, {notext}) ->
-    enable_open_menu(),
-    enable_info_menu();
-enable_menus(?NAME_COL, false) ->
-    enable_info_menu();
-enable_menus(?PID_COL, _Any) ->
-    enable_trace_menu();
-enable_menus(?PROCNAME_COL, _Any) ->
-    enable_trace_menu();
-enable_menus(?INFO_COL, _Any) ->
-    enable_info_menu();
-enable_menus(_Col, _Any) ->
-    done.
-    
-
-
-resize_window(Width, Height, NofElems) ->
-    WinWidth  = lists:max([Width, ?MIN_WIN_WIDTH]),
-    WinHeight = lists:max([Height, ?MIN_WIN_HEIGHT]),
-    gs:config(win, [{width, WinWidth},
-		    {height, WinHeight}
-		   ]),
-    {BgWidth, BgHeight, FgWidth, FgHeight} = get_frame_coords(WinWidth, WinHeight),
-    {GridWidth, GridHeight} = get_grid_coords(FgWidth, FgHeight),
-    ColWidths = get_col_widths(?COL_WIDTHS, GridWidth),
-    resize_header_labels(ColWidths, 
-			 [label1,label2,label3,label4,label5], 
-			 ?GRID_XPOS),
-    gs:config(bgframe, [{width, BgWidth},
-			{height, BgHeight}
-		       ]),
-    gs:config(fgframe, [{width, FgWidth},
-			{height, FgHeight}
-		       ]),
-    gs:config(grid, [{width, GridWidth},
-		     {height, GridHeight},
-		     {columnwidths, ColWidths},
-		     {rows, {1, get_nof_rows(NofElems, GridHeight)}}
-		    ]),
-    {WinWidth, WinHeight}.
-
-
-
-
-create_window(Tables) ->
-    gs:window(win, gs:start(), [{width, ?WIN_WIDTH},
-				{height, ?WIN_HEIGHT},
-				{bg, ?DEFAULT_BG_COLOR},
-				{title, "[TV]   ETS tables on " ++ 
-				atom_to_list(node())},
-				{destroy, true},
-				{configure, true},
-				{keypress, true}
-			       ]),
-
-    ShortcutList = create_menus(),
-
-    disable_menus(),
-
-    {BgFrameWidth, BgFrameHeight, FgFrameWidth, FgFrameHeight} = 
-	get_frame_coords(?WIN_WIDTH, ?WIN_HEIGHT),
-
-    {GridWidth, GridHeight} = get_grid_coords(FgFrameWidth, FgFrameHeight),
-
-    ColWidths = get_col_widths(?COL_WIDTHS, GridWidth),
-
-    gs:frame(bgframe, win, [{width, BgFrameWidth},
-			    {height, BgFrameHeight},
-			    {x, ?GRID_XPOS},
-			    {y, ?GRID_YPOS},
-			    {bg, {0,0,0}}
-			   ]),
-    gs:frame(fgframe, bgframe, [{width, FgFrameWidth},
-				{height, FgFrameHeight},
-				{x, 0},
-				{y, 1},
-				{bg, ?DEFAULT_BG_COLOR}
-			       ]),
-
-
-    create_header_labels(ColWidths, ?HEADER_LABELS),
-    gs:grid(grid, fgframe, [{width, GridWidth},
-			    {height, GridHeight},
-			    {x, 0},
-			    {y, -1},
-			    {hscroll,bottom},
-			    {vscroll,right},
-			    {rows, {1, get_nof_rows(length(Tables), GridHeight)}},
-			    {columnwidths, ColWidths},
-			    {fg, ?NORMAL_FG_COLOR},
-			    {bg, {255,255,255}},
-			    {font, ?FONT}
-			   ]),
-    GridLines = update_gridlines(Tables, [], 1),
-    {{undefined,undefined,undefined}, GridLines, {?WIN_WIDTH,?WIN_HEIGHT}, ShortcutList}.
-    
-			 
-
-
-get_frame_coords(WinWidth, WinHeight) ->
-    BgWidth  = WinWidth - 2 * ?GRID_XPOS,
-    BgHeight = WinHeight - ?GRID_YPOS - ?GRID_XPOS,
-    FgWidth  = BgWidth,
-    FgHeight = BgHeight - 1,
-    {BgWidth, BgHeight, FgWidth, FgHeight}.
-
-
-
-
-get_grid_coords(ParentWidth, ParentHeight) ->
-    {ParentWidth, ParentHeight + 1}.
-
-
-
-get_col_widths(Cols, GridWidth) ->
-    SbWidth = 25, %% OK, OK, don't bother about it, this constant makes it work...  :-/
-    FixColWidthSum = lists:sum(lists:map(fun(H) ->
-						 lists:nth(H, Cols)
-					 end,
-					 ?FIX_WIDTH_COLS)),
-    AvailableWidth = GridWidth - FixColWidthSum - SbWidth,
-    OriginalWidth  = ?WIN_WIDTH - 2 * ?GRID_XPOS - FixColWidthSum - SbWidth,
-    get_col_widths(1, Cols, AvailableWidth, OriginalWidth).
-    
-
-
-get_col_widths(N, [H | T], AvailWidth, OrigWidth) ->
-    NewColWidth = 
-	case lists:member(N, ?FIX_WIDTH_COLS) of
-	    true ->
-		H;
-	    _Other ->
-		round(H * (AvailWidth / OrigWidth) + 0.1)
-	end,
-    [NewColWidth | get_col_widths(N + 1, T, AvailWidth, OrigWidth)];
-get_col_widths(_N, [], _AvailWidth, _OrigWidth) ->
-    [].
-
-
-
-create_header_labels(ColWidths, Text) ->
-    create_header_labels(ColWidths, Text, 1, ?GRID_XPOS).
-
-
-
-create_header_labels([W | T], [{Name, Text} | TextT], N, Xpos) ->
-    Ypos = ?GRID_YPOS - 20,
-    gs:label(Name, win, [{width, W + 1 - 3},
-			 {height, 20},
-			 {x, Xpos + 1 + 3},
-			 {y, Ypos},
-			 {bg, ?DEFAULT_BG_COLOR},
-			 {fg, ?NORMAL_FG_COLOR},
-			 {font, ?HEADER_FONT},
-			 {align, w},
-			 {label, {text, Text}}
-			]),
-    create_header_labels(T, TextT, N + 1, Xpos + 1 + W);
-create_header_labels([], [], _N, _Xpos) ->
-    done.
-
-
-
-resize_header_labels([W | T], [Name | NT], Xpos) ->
-    gs:config(Name, [{width, W + 1 - 3},
-		     {x, Xpos + 1 + 3}
-		    ]),
-    resize_header_labels(T, NT, Xpos + 1 + W);
-resize_header_labels([], [], _Xpos) ->
-    done.
-
-
-
-disable_open_menu() ->
-    gs:config(open_table, [{enable,false}]).
-
-
-disable_info_menu() ->
-    gs:config(show_info, [{enable,false}]).
-
-disable_trace_menu() ->
-    gs:config(trace_process, [{enable,false}]).
-
-
-enable_open_menu() ->
-    gs:config(open_table, [{enable,true}]).
-
-
-enable_info_menu() ->
-    gs:config(show_info, [{enable,true}]).
-
-
-enable_trace_menu() ->
-    gs:config(trace_process, [{enable,true}]).
-
-
-create_menus() ->
-    gs:menubar(menubar, win, [{bg, ?DEFAULT_BG_COLOR}]),
-
-    HelpButt = gs:menubutton(menubar, [{bg, ?DEFAULT_BG_COLOR},
-				       {fg, ?FIREBRICK},  % firebrick
-				       {label, {text, " Help "}},
-				       {underline, 1},
-				       {side, right}
-				      ]),
-    FileButt = gs:menubutton(menubar, [{bg, ?DEFAULT_BG_COLOR},
-				       {fg, ?FIREBRICK},  % firebrick
-				       {label, {text, " File "}},
-				       {underline, 1},
-				       {side, left}
-				      ]),
-    ViewButt = gs:menubutton(menubar, [{bg, ?DEFAULT_BG_COLOR},
-				       {fg, ?FIREBRICK},  % firebrick
-				       {label, {text, " View "}}, 
-				       {underline, 1},
-				       {side, left}
-				      ]),
-    OptionsButt = gs:menubutton(menubar, [{bg, ?DEFAULT_BG_COLOR},
-					  {fg, ?FIREBRICK},  % firebrick
-					  {label, {text, " Options "}},
-					  {underline, 1},
-					  {side, left}
-					 ]),
-
-    HelpMenu = gs:menu(HelpButt, [{bg, ?DEFAULT_BG_COLOR},
-				  {fg, ?FIREBRICK},
-				  {disabledfg,?DISABLED_COLOR}
-				 ]), 
-    FileMenu = gs:menu(FileButt, [{bg, ?DEFAULT_BG_COLOR},
-				  {fg, ?FIREBRICK},
-				  {disabledfg,?DISABLED_COLOR}
-				 ]), 
-
-    OptionsMenu = gs:menu(OptionsButt, [{bg, ?DEFAULT_BG_COLOR},
-					{fg, ?FIREBRICK},
-					{disabledfg,?DISABLED_COLOR}
-				       ]), 
-
-    ViewMenu = gs:menu(ViewButt, [{bg, ?DEFAULT_BG_COLOR},
-				  {fg, ?FIREBRICK},
-				  {disabledfg,?DISABLED_COLOR}
-				 ]),
-
-    ShortCutList = 
-	create_menulist([{" Help ",normal,help_button,1,h},
-			 separator,
-			 {" OTP Documentation ",normal,otp_help_button,1,no_char}], HelpMenu) ++
-	create_menulist([{" Open Table ",normal,open_table,1,o}, 
-			 {" New Table... ",normal,new_table,1,no_char},
-			 {" Table Info ",normal,show_info,7,i},
-			 separator, 
-			 {" Nodes... ",normal,select_node,1,n},
-			 separator,
-			 {" Trace Process ",normal,trace_process,1,t},
-			 separator,
-			 {" Exit ",normal, exit_button,2,x}], FileMenu) ++
-	[{c,exit_button}, {'C',exit_button}] ++
-	create_menulist([{" Refresh ",normal,update,1,r},
-			 separator,
-			 {" Unreadable Tables ",check,show_unreadable,1,no_char},
-			 separator,
-			 {" System Tables ",check,show_system,1,no_char},
-			 separator,
-			 {" Sort by Name ",radio,sort_table_name,9,no_char},
-			 {" Sort by Id ",radio,sort_table_id,9,no_char},
-			 {" Sort by Owner PID ",radio,sort_owner_pid,15,no_char},
-			 {" Sort by Owner Name ",radio,sort_owner_name,9,no_char},
-			 separator,
-			 {" Error Messages in Haiku ",check,show_haiku,1,no_char}
-			], 
-			OptionsMenu) ++
-	create_menulist([{" ETS Tables ",radio,show_ets,1,e},
-			 {" Mnesia Tables ",radio,show_mnesia,1,m}], ViewMenu),
-    gs:config(show_unreadable, [{select,false}]),
-    gs:config(show_system, [{select,false}]),
-    gs:config(show_haiku, [{select,false}]),
-       %% Due to a bug (or some other reason), only one of the radiobuttons belonging
-       %% to a specified group can be selected, even if different processes have created
-       %% the radiobuttons! This means that, if we have started more than one tv_main 
-       %% process, selecting one radiobutton will affect the radiobuttons in the other 
-       %% tv_main process(es)!!! Since this is a highly undesirable bahaviour, we have to 
-       %% create unique group names (i.e., atoms). 
-       %% (We need to group the radiobuttons, since otherwise all created by one process
-       %% belongs to the same group, which also is undesirable...)
-    SelfStr     = pid_to_list(self()),
-    SortGroup   = list_to_atom("sorting" ++ SelfStr),
-    TypeGroup   = list_to_atom("table_type" ++ SelfStr),
-    gs:config(sort_table_name, [{group,SortGroup},{select,true}]),
-    gs:config(sort_table_id, [{group,SortGroup}]),
-    gs:config(sort_owner_pid, [{group,SortGroup}]),
-    gs:config(sort_owner_name, [{group,SortGroup}]),
-    gs:config(show_ets, [{group,TypeGroup}, {select,true}]),
-    gs:config(show_mnesia, [{group,TypeGroup}]),
-    ShortCutList.
-
-
-
-
-
-create_menulist(List, Menu) ->
-    MaxLength = get_length_of_longest_menu_text(List, 0),
-    create_menulist(List, Menu, MaxLength).
-
-
-
-
-create_menulist([], _Menu, _MaxLength) ->
-    [];
-create_menulist([{Text, Type, Data, AccCharPos, ShortcutChar} | Rest], Menu, MaxLength) ->
-    ShortcutCapitalChar = 
-	if
-	    ShortcutChar =:= no_char ->
-		no_char;
-	    true ->
-		CharAsciiValue   = lists:nth(1, atom_to_list(ShortcutChar)),
-		CapitalCharValue = CharAsciiValue - ($a - $A),
-		list_to_atom([CapitalCharValue])
-	end,
-    
-    FinalText = if 
-		    ShortcutChar =:= no_char ->
-			Text;
-		    true ->
-			Text ++ lists:duplicate(MaxLength - length(Text), " ") ++ 
-			    "   Ctrl+" ++ atom_to_list(ShortcutCapitalChar) ++ " "
-		end,
-    gs:menuitem(Data, Menu, [{bg, ?DEFAULT_BG_COLOR},
-			     {fg, ?FIREBRICK},
-			     {itemtype, Type},
-			     {label, {text, FinalText}},
-			     {underline, AccCharPos},
-			     {data, Data}
-			    ]),
-    [{ShortcutChar, Data}, {ShortcutCapitalChar, Data} | create_menulist(Rest, Menu, MaxLength)];
-create_menulist([separator | Rest], Menu, MaxLength) ->
-    gs:menuitem(Menu, [{itemtype, separator}]),
-    create_menulist(Rest, Menu, MaxLength).
-
-
-    
-    
-    
-
-
-get_length_of_longest_menu_text([], MaxLength) ->
-    MaxLength;
-get_length_of_longest_menu_text([{Text, _Type, _Data, _APos, _SChar} | Rest], CurrMax) ->
-    L = length(Text),
-    if 
-	L > CurrMax ->
-	    get_length_of_longest_menu_text(Rest, L);
-	true ->
-	    get_length_of_longest_menu_text(Rest, CurrMax)
-    end;
-get_length_of_longest_menu_text([separator | Rest], CurrMax) ->
-    get_length_of_longest_menu_text(Rest, CurrMax).
-
-
-
-
-
-
-get_nof_rows(NofElems, GridHeight) ->
-    lists:max([NofElems, round((GridHeight - 20) / 21) + 1]).
-
-
-
-config_gridline(LineId, TabTuple) ->
-    Readable   = element(?READABLE_ELEM, TabTuple),
-    NamedTable = element(?NAMED_TABLE_ELEM, TabTuple),
-    {FgColor, BgColor} = 
-	case Readable of
-	    true ->
-		{?NORMAL_FG_COLOR, ?READABLE_BG_COLOR};
-	    false ->
-		{?UNREADABLE_FG_COLOR, ?UNREADABLE_BG_COLOR};
-	    {notext} ->
-		{?NORMAL_FG_COLOR, ?READABLE_BG_COLOR}
-	end,
-    
-    NameFgColor = 
-	case NamedTable of
-	    false ->
-		?UNNAMED_FG_COLOR;
-	    _Other ->
-		?NORMAL_FG_COLOR
-	end,
-    
-    gs:config(LineId, [{bg, BgColor},
-		       {fg, FgColor},
-		       {fg, {?NAME_COL, NameFgColor}},
-		       {click, true},
-		       {doubleclick, true},
-		       {data, {grid,Readable}} |
-
-		       lists:map(
-			 fun({Elem,Col}) ->
-				 case element(Elem, TabTuple) of
-				     {notext} ->
-					 {text, {Col, ""}};
-				     Other when Elem =:= ?NAME_ELEM ->
-					 case NamedTable of
-					     false ->
-						 {text, {Col, " " ++ 
-							 lists:flatten(
-							   io_lib:write(
-							     Other)) ++ " "}};
-					     _AnyOther ->
-						 {text, {Col, " " ++ lists:flatten(
-								       io_lib:write(
-									 Other))}}
-					 end;
-				     Other ->
-					 {text, {Col, " " ++ lists:flatten(
-							       io_lib:write(
-								 Other))}}
-				 end
-			 end, 
-			 [{?NAME_ELEM,     ?NAME_COL}, 
-			  {?ID_ELEM,       ?ID_COL}, 
-			  {?PID_ELEM,      ?PID_COL}, 
-			  {?PROCNAME_ELEM, ?PROCNAME_COL}, 
-			  {?INFO_ELEM,     ?INFO_COL}]
-			)
-		      ]).
-
-
-
-
-
-update_gridlines([TabTuple | TT], [LineId | GT], CurrRow) ->
-    config_gridline(LineId, TabTuple),
-    [LineId | update_gridlines(TT, GT, CurrRow + 1)];
-update_gridlines([TabTuple | TT], [], CurrRow) ->
-    LineId = gs:gridline(grid, [{row, CurrRow}]),
-    config_gridline(LineId, TabTuple),
-    [LineId | update_gridlines(TT, [], CurrRow + 1)];
-update_gridlines([], [LineId | GT], _CurrRow) ->
-    gs:destroy(LineId),
-    update_gridlines([], GT, _CurrRow);
-update_gridlines([], [], _CurrRow) ->
-    [].
-
-
-
-
-
-
-
-    
-			   
diff --git a/lib/tv/src/tv_main.hrl b/lib/tv/src/tv_main.hrl
deleted file mode 100644
index c9db1d9484..0000000000
--- a/lib/tv/src/tv_main.hrl
+++ /dev/null
@@ -1,285 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-2013. All Rights Reserved.
-%% 
-%% The 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%
-
--define(ERROR_MSG_MODE, normal).
-
--define(WIN_WIDTH, 745).  % 779
--define(WIN_HEIGHT, 380).
--define(MIN_WIN_WIDTH, 524).
--define(MIN_WIN_HEIGHT, 150).
-
--define(FONT, {screen, 12}).
--define(HEADER_FONT, {screen, [bold,italic], 12}).
-
--define(GRID_XPOS, 3).
--define(GRID_YPOS, 68).
-
-
-%% Unreadable tables are indicated by the background color.
-%% Unnamed tables are indicated by the foreground color.
-
--define(NORMAL_FG_COLOR, {0,0,0}).
--define(READABLE_BG_COLOR, {255,255,255}).
--define(UNREADABLE_FG_COLOR, ?NORMAL_FG_COLOR).
--define(UNREADABLE_BG_COLOR, {240,240,240}).
-%-define(UNREADABLE_BG_COLOR, {255,250,230}).
-%-define(UNREADABLE_BG_COLOR, {242,242,242}).
--define(UNNAMED_FG_COLOR, {175,175,175}).
-%-define(UNNAMED_FG_COLOR, {140,35,35}).
-
-
--define(DISABLED_COLOR, {160,160,160}).
-
--define(NAME_ELEM, 1).
--define(NAMED_TABLE_ELEM, 2).
--define(ID_ELEM, 3).
--define(READABLE_ELEM, 4).
--define(PID_ELEM, 5).
--define(PROCNAME_ELEM, 6).
--define(INFO_ELEM, 7).
-
--define(NAME_COL, 1).
--define(ID_COL, 2).
--define(PID_COL, 3).
--define(PROCNAME_COL, 4).
--define(INFO_COL, 5).
-
--define(POSSIBLE_MARK_COLS, [?NAME_COL, ?ID_COL, ?PID_COL, ?PROCNAME_COL, ?INFO_COL]).
--define(COL_WIDTHS, [205,131,91,197,90]).   % [140,95,125,75,85,140,90]).
--define(FIX_WIDTH_COLS, [2,3,5]).
-
-
--define(HEADER_LABELS, [{label1, " Table Name"}, 
-			% {label2, " Named Table"}, 
-			{label2, " Table Id"}, 
-			% {label4, " Readable"}, 
-			{label3, " Owner Pid"}, 
-			{label4, " Owner Name"}, 
-			{label5, " Table Size"}
-		       ]).
-
-
-
-%% TABLES_TO_HIDE shall contain both Mnesia and ETS tables that we want to hide.  :-)
-
--define(SYSTEM_TABLES, [ac_tab,
-			asn1,
-			cdv_dump_index_table,
-			cdv_menu_table,
-			cdv_decode_heap_table,
-			cell_id,
-			cell_pos,
-			clist, 
-			cover_internal_data_table,
-			cover_collected_remote_data_table,
-			cover_binary_code_table,
-			code,
-			code_names,
-			cookies,
-			corba_policy,
-			corba_policy_associations,
-                        dets,
-                        dets_owners,
-			dets_registry,
-			disk_log_names,
-                        disk_log_pids,
-			eprof,
-			erl_atom_cache,
-			erl_epmd_nodes,
-			etop_accum_tab,
-			etop_tr,
-			ets_coverage_data,
-			file_io_servers,
-			global,
-			global_locks,
-			global_names,
-			global_names_ext,
-			gs_mapping,
-			gs_names,
-			gstk_db,
-			gstk_grid_cellid,
-			gstk_grid_cellpos,
-			gstk_grid_id,
-			gvar,
-			httpd,
-			id,
-			ig,
-			ign_req_index,
-			ign_requests,
-			index,
-			inet_cache,
-			inet_db,
-			inet_hosts,
-			'InitialReferences',
-			int_db,
-			interpreter_includedirs_macros,
-			ir_WstringDef,
-			lmcounter,
-			locks, 
-			pg2_table,
-			queue,
-			snmp_agent_table,
-			snmp_local_db2,
-			snmp_mib_data,
-			snmp_note_store,
-			snmp_symbolic_ets,
-			sticky,
-			sys_dist,			
-			tid_locks,
-			tkFun,
-			tkLink,
-			tkPriv,
-			ttb,
-			ttb_history_table,
-			udp_fds,
-			udp_pids
-		       ]).
-
-
--define(MNESIA_TABLES, [alarm,
-			alarmTable,
-			evaLogDiscriminatorTable,
-			eva_snmp_map,
-			eventTable,
-			group,
-			imprec,
-			ir_AliasDef,
-			ir_ArrayDef,
-			ir_AttributeDef,
-			ir_ConstantDef,
-			ir_Contained,
-			ir_Container,
-			ir_EnumDef,
-			ir_ExceptionDef,
-			ir_IDLType,
-			ir_IRObject,
-			ir_InterfaceDef,
-			ir_ModuleDef,
-			ir_ORB,
-			ir_OperationDef,
-			ir_PrimitiveDef,
-			ir_Repository,
-			ir_SequenceDef,
-			ir_StringDef,
-			ir_StructDef,
-			ir_TypedefDef,
-			ir_UnionDef,
-			logTable,
-			logTransferTable,
-			mesh_meas,
-			mesh_type,
-			mnesia_clist,
-			mnesia_decision,
-			mnesia_transient_decision,
-			orber_CosNaming,
-			orber_objkeys,
-			schema,
-			user
-		       ]).
-
-
--define(UNREADABLE_MNESIA_TABLES, [schema]).
-
-
--define(SYSTEM_OWNERS, [alarm_handler,
-			application_controller,
-			auth,
-			coast_server,
-			code_server,
-			cover_server_001,
-			dbg,
-			dets,
-                        dets_sup,
-			disk_log_server,
-			disk_log_sup,
-			erl_epmd,
-			erl_prim_loader,
-			error_logger,
-			eva_log_sup,
-			eva_server,
-			eva_sup,
-			file_server,
-			file_server_2,
-			global_group,
-			global_group_check,
-			global_name_server,
-			gs_frontend,
-			heart,
-			help_main,
-			inet_db,
-			inet_gethost_native,
-			init,
-			int_db,
-			interpret,
-			jive_server,
-			kernel_safe_sup,
-			kernel_sup,
-			log_server,
-			mandel_server,
-			mesh_sup,
-			mesh_server,
-			mnesia_checkpoint_sup,
-			mnesia_dumper,
-			mnesia_event,
-			mnesia_fallback,
-			mnesia_init,
-			mnesia_kernel_sup,
-			mnesia_late_loader,
-			mnesia_locker,
-			mnesia_monitor,
-			mnesia_recover,
-			mnesia_snmp_sup,
-			mnesia_subscr,
-			mnesia_sup,
-			mnesia_tm,
-			net_kernel,
-			net_sup,
-			overload,
-			perfmon_sampler,
-			pxw_server,
-			release_handler,
-			%% rex,    %% Otherwise we won't see tables we've created on other nodes!
-			rsh_starter,
-			sasl_safe_sup,
-			sasl_sup,
-			snmp_agent_sup,
-			snmp_local_db,
-			snmp_master_agent,
-			snmp_misc_sup,
-			snmp_note_store,
-			snmp_supervisor,
-			snmp_symbolic_store,
-			socket,
-			sounder,
-			ssl_socket,
-			take_over_monitor,
-			timer_server,
-			tk,
-			udp_server,
-			user,
-			winshell_controller,
-			xerl_copy,
-			xerl_monitor
-		       ]).
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_mnesia_rpc.erl b/lib/tv/src/tv_mnesia_rpc.erl
deleted file mode 100644
index b2434fcdd3..0000000000
--- a/lib/tv/src/tv_mnesia_rpc.erl
+++ /dev/null
@@ -1,106 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-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(tv_mnesia_rpc).
-
-
-
--export([system_info/3,
-	 table_info/4,
-	 transaction/3
-	]).
-
-
-
-
-
-
-system_info(_Node, true, Key) ->
-    chk(catch mnesia:system_info(Key));
-system_info(Node, false, Key) ->
-    chk(catch rpc:block_call(Node, mnesia, system_info, [Key])).
-
-
-
-
-table_info(_Node, true, Tab, Item) ->
-    chk(catch mnesia:table_info(Tab, Item));
-table_info(Node, false, Tab, Item) ->
-    chk(catch rpc:block_call(Node, mnesia, table_info, [Tab, Item])).
-
-
-
-
-transaction(_Node, true, Fun) ->
-    chk(catch mnesia:transaction(Fun));
-transaction(Node, false, Fun) ->
-    chk(catch rpc:block_call(Node, mnesia, transaction, [Fun])).
-
-
-
-
-chk(Result) ->
-    case Result of
-	_Anything when is_list(Result) ->
-	    Result;
-	_Anything when is_atom(Result) ->
-	    Result;
-	_Anything when is_integer(Result) ->
-	    Result;
-	_Anything when is_pid(Result) ->
-	    Result;
-
-	{aborted, {bad_type, _Rec}} ->
-	    throw(bad_format);
-
-	{badrpc,nodedown} ->
-	    throw(nodedown);
-	{'EXIT', nodedown} ->
-	    throw(nodedown);
-
-	{'EXIT', {aborted, {no_exists, _Table, _Arg}}} ->
-	    throw(no_table);
-	
-	{'EXIT', {aborted, {node_not_running, _Node}}} ->
-	    throw(mnesia_not_started);
-	{'EXIT', {{badarg, {gen, set_monitor_mode, _Data}}, _Info}} ->
-	    throw(mnesia_not_started);
-	{'EXIT', {'EXIT', {aborted, {node_not_running,_Node}}}} ->
-	    throw(mnesia_not_started);
-	{badrpc, {'EXIT', {aborted, {node_not_running,_Node}}}} ->
-	    throw(mnesia_not_started);
-	{badrpc, {'EXIT', {aborted, {no_exists,_Table,_Args}}}} ->
-	    throw(mnesia_not_started);
-	{badrpc, _Reason} ->
-	    throw(mnesia_not_started);
-	{'EXIT', {undef, {mnesia,_Fcn,_Args,_}}} ->
-	    throw(mnesia_not_started);
-	{'EXIT', {undef, {mnesia,_Fcn,_Args}}} ->
-	    throw(mnesia_not_started);
-	
-	{'EXIT', Reason} ->
-	    throw({unexpected_error, Reason});
-	
-	Other when is_tuple(Other) ->
-	       %% For example wild_pattern requests return a tuple!
-	    Other;
-	
-	Other ->
-	    io:format("Unexpected return value: ~p~n", [Other])
-    end.
-	
-
diff --git a/lib/tv/src/tv_new_table.erl b/lib/tv/src/tv_new_table.erl
deleted file mode 100644
index 779835d78a..0000000000
--- a/lib/tv/src/tv_new_table.erl
+++ /dev/null
@@ -1,666 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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%k
--module(tv_new_table).
--compile([{nowarn_deprecated_function,{gs,button,3}},
-          {nowarn_deprecated_function,{gs,checkbutton,3}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,entry,3}},
-          {nowarn_deprecated_function,{gs,frame,3}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,radiobutton,3}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([start/2,
-	 init/3
-	]).
-
-
-
--define(DEFAULT_BG_COLOR, {217, 217, 217}).
--define(FONT, {screen, 12}).
-
--define(WIN_WIDTH, 400).
--define(WIN_HEIGHT, 555).   %% 510
-
--define(FRAME_WIDTH, 400).
--define(FRAME1_HEIGHT, 170).
--define(FRAME2_HEIGHT, 260).
--define(FRAME3_HEIGHT, 125). %% 80
--define(BW, 2).
-
--define(FRAME_X, 0).
--define(FRAME1_Y, 0).
--define(FRAME2_Y, 170).
--define(FRAME3_Y, 430).
-
-
--define(LBL_HEIGHT, 30).
--define(NODE_LBL_WIDTH, 45).
--define(NAME_LBL_WIDTH, 85).
--define(TYPE_LBL_WIDTH, 45).
--define(PROT_LBL_WIDTH, 85).
--define(KEYPOS_LBL_WIDTH, 95).
-
--define(LBL_X, 10).
--define(NODE_LBL_Y, 20).
--define(NAME_LBL_Y, 80).
--define(TYPE_LBL_Y, 10).
--define(PROT_LBL_Y, 100).
--define(KEYPOS_LBL_Y, 200).
-
-
--define(ENTRY_HEIGHT, 30).
--define(NODE_ENTRY_WIDTH, 275).
--define(NAME_ENTRY_WIDTH, 275).
--define(KEYPOS_ENTRY_WIDTH, 50).
-
--define(ENTRY_X1, 110).
--define(ENTRY_X2, 110).
--define(NODE_ENTRY_Y, 20).
--define(NAME_ENTRY_Y, 80).
--define(KEYPOS_ENTRY_Y, 200).
-
--define(RBTN_HEIGHT, 30).
--define(RBTN_WIDTH1, 105).
--define(RBTN_WIDTH2, 115).
-
--define(RBTN_X1, 60).
--define(RBTN_X2, 165).
--define(RBTN_X3, 270).
--define(RBTN_Y1, 40).
--define(RBTN_Y1PLUS, 70).
--define(RBTN_Y2, 130).
-
-
--define(CBTN_HEIGHT, 30).
--define(NAMED_TABLE_CBTN_WIDTH, 100).
--define(OPEN_BROWSER_CBTN_WIDTH, 105).
-
--define(NAMED_TABLE_CBTN_X, 110).
--define(NAMED_TABLE_CBTN_Y, 120).
-
--define(OPEN_BROWSER_CBTN_X, 85).  %% 215
--define(OPEN_BROWSER_CBTN_Y, 10).  %% 200
-
-
--define(BTN_WIDTH, 100).
--define(BTN_HEIGHT, 30).
-
--define(BTN_X1, 85). 
--define(BTN_X2, 225).
--define(BTN_Y, 65).   %% 30
-
-
--define(VLINE_LBL_WIDTH, (380 - 2 * ?BW)).
--define(VLINE_LBL_HEIGHT, 1).
--define(HLINE_LBL_WIDTH, 1).
--define(HLINE_LBL_HEIGHT, 70).
-
--define(VLINE_LBL_X, (10 - ?BW)).
--define(VLINE_LBL_Y1, 85).
--define(VLINE_LBL_Y2, 180).
--define(HLINE_LBL_X, 188).
--define(HLINE_LBL_Y, 180).
-
-
--define(DEFAULT_NAME, my_table).
--define(DEFAULT_TYPE, set).
--define(DEFAULT_PROT, public).
--define(DEFAULT_KEYPOS, 1).
-
-
-
-
-start(Node, ErrMsgMode) ->
-    spawn_link(?MODULE, init, [Node, ErrMsgMode, self()]).
-
-
-
-
-
-init(Node, ErrMsgMode, MPid) ->
-    process_flag(trap_exit, true),
-    put(error_msg_mode, ErrMsgMode),
-    create_window(Node),
-    loop(false, ?DEFAULT_TYPE, ?DEFAULT_PROT, true, MPid).
-
-
-
-
-
-loop(NamedTab, Type, Prot, OpenBrowser, MPid) ->
-    receive
-	
-	{gs, ok, click, _Data, _Args} ->
-	    gs:config(win, [{cursor, busy}]),
-	    case create_table(NamedTab, Type, Prot, OpenBrowser, MPid) of
-		ok ->
-		    exit(normal);
-		error ->
-		    gs:config(win, [{cursor, arrow}]),
-		    loop(NamedTab, Type, Prot, OpenBrowser, MPid)
-	    end;
-
-
-	{gs, cancel, click, _Data, _Args} ->
-	    exit(normal);
-
-
-	{gs, set, click, _Data, _Args} ->
-	    loop(NamedTab, set, Prot, OpenBrowser, MPid);
-
-
-	{gs, ordered_set, click, _Data, _Args} ->
-	    loop(NamedTab, ordered_set, Prot, OpenBrowser, MPid);
-
-
-	{gs, bag, click, _Data, _Args} ->
-	    loop(NamedTab, bag, Prot, OpenBrowser, MPid);
-
-
-	{gs, duplicate_bag, click, _Data, _Args} ->
-	    loop(NamedTab, duplicate_bag, Prot, OpenBrowser, MPid);
-
-
-	{gs, public, click, _Data, _Args} ->
-	    gs:config(open_browser, [{enable, true}, {select, OpenBrowser}]),
-	    loop(NamedTab, Type, public, OpenBrowser, MPid);
-
-
-	{gs, protected, click, _Data, _Args} ->
-	    gs:config(open_browser, [{enable, true}, {select, OpenBrowser}]),
-	    loop(NamedTab, Type, protected, OpenBrowser, MPid);
-
-	
-	{gs, private, click, _Data, _Args} ->
-	    gs:config(open_browser, [{select, false}, {enable, false}]),
-	    loop(NamedTab, Type, private, OpenBrowser, MPid);
-
-
-	{gs, named_table, click, Data, _Args} ->
-	    gs:config(named_table, [{data, not(Data)}]),
-	    loop(Data, Type, Prot, OpenBrowser, MPid);
-	    
-
-	{gs, open_browser, click, Data, _Args} ->
-	    gs:config(open_browser, [{data, not(Data)}]),
-	    loop(Data, Type, Prot, Data, MPid);
-	    
-
-	{gs, EntryId, keypress, _Data, ['Tab', _No, 0 | _T]} ->
-	    case get_entry_term(EntryId) of
-		{ok, _Term} ->
-		    gs:config(next_entry(EntryId, forward), [{setfocus, true},
-							     {select, {0, 100000000}}]);
-		error ->
-		    done
-	    end,
-	    loop(NamedTab, Type, Prot, OpenBrowser, MPid);
-	
-
-	{gs, EntryId, keypress, _Data, ['Tab', _No, 1 | _T]} ->
-	    case get_entry_term(EntryId) of
-		{ok, _Term} ->
-		    gs:config(next_entry(EntryId, backward), [{setfocus, true},
-							      {select, {0, 100000000}}]);
-		error ->
-		    done
-	    end,
-	    loop(NamedTab, Type, Prot, OpenBrowser, MPid);
-	
-
-	{gs, EntryId, keypress, _Data, ['Down' | _T]} ->
-	    case get_entry_term(EntryId) of
-		{ok, _Term} ->
-		    gs:config(next_entry(EntryId, forward), [{setfocus, true},
-							     {select, {0, 100000000}}]);
-		error ->
-		    done
-	    end,
-	    loop(NamedTab, Type, Prot, OpenBrowser, MPid);
-	
-
-	{gs, EntryId, keypress, _Data, ['Up' | _T]} ->
-	    case get_entry_term(EntryId) of
-		{ok, _Term} ->
-		    gs:config(next_entry(EntryId, backward), [{setfocus, true},
-							      {select, {0, 100000000}}]);
-		error ->
-		    done
-	    end,
-	    loop(NamedTab, Type, Prot, OpenBrowser, MPid);
-	
-
-	{gs, _EntryId, keypress, _Data, ['Return' | _T]} ->
-	    gs:config(win, [{cursor, busy}]),
-	    case create_table(NamedTab, Type, Prot, OpenBrowser, MPid) of
-		ok ->
-		    exit(normal);
-		error ->
-		    gs:config(win, [{cursor, arrow}]),
-		    loop(NamedTab, Type, Prot, OpenBrowser, MPid)
-	    end;
-
-
-	{gs, win, configure, _Data, _Args} ->
-	    gs:config(win, [{width, ?WIN_WIDTH},
-			    {height, ?WIN_HEIGHT}]),
-	    loop(NamedTab, Type, Prot, OpenBrowser, MPid);
-
-	
-	{gs, win, destroy, _Data, _Args} ->
-	    exit(normal);
-	
-
-	raise ->
-	    gs:config(win, [raise]),
-	    loop(NamedTab, Type, Prot, OpenBrowser, MPid);	    
-
-
-	{error_msg_mode, ErrMsgMode} ->
-	    put(error_msg_mode, ErrMsgMode),
-	    loop(NamedTab, Type, Prot, OpenBrowser, MPid);
-	
-
-	{'EXIT', _Pid, _Reason} ->
-	    exit(normal);
-
-
-	_Other ->
-    	    loop(NamedTab, Type, Prot, OpenBrowser, MPid)
-    
-    end.
-
-
-
-
-create_table(NamedTab, Type, Prot, OpenBrowser, MPid) ->
-    case get_entry_term(node_entry) of
-	error ->
-	    error;
-	{ok, Node} ->
-	    case get_entry_term(name_entry) of
-		error ->
-		    error;
-		{ok, TabName} ->
-		    case get_entry_term(keypos_entry) of
-			error ->
-			    error;
-			{ok, KeyPos} ->
-			    Options = 
-				[Type, Prot, {keypos, KeyPos}] ++
-				case NamedTab of
-				    true ->
-					[named_table];
-				    false ->
-					[]
-				end,
-			    {Readable, NewOpenBrowser} = 
-				case Prot of
-				    private ->
-					{false, false};
-				    _Other ->
-					{true, OpenBrowser}
-				end,
-			    MPid ! {tv_new_table, self(), Node, TabName, Options, ets,
-				    Readable, NewOpenBrowser},
-			    receive
-				ok ->
-				    ok;
-				error ->
-				    show_error_msg(),
-				    error
-			    after 
-				5000 ->
-				    show_error_msg(),
-				    error
-			    end
-		    end
-	    end
-    end.
-
-
-
-
-
-show_error_msg() ->
-    Msg = 
-	case get(error_msg_mode) of
-	    normal ->
-		["Couldn't create a table using",
-		 "the specified settings!"];
-	    haiku ->
-		["The table you want",
-		 "Could maybe be created.",
-		 "But I don't know how."]
-	end,
-    tv_utils:notify(win, "TV Notification", Msg).
-
-    
-
-
-
-
-
-get_entry_term(Id) ->
-    EditedStr = gs:read(Id, text),
-    case tv_db_search:string_to_term(EditedStr) of
-	{ok, NewTerm} when Id =:= node_entry, is_atom(NewTerm) ->
-	    {ok,NewTerm};
-	{ok, NewTerm} when Id =:= name_entry, is_atom(NewTerm) ->
-	    {ok,NewTerm};
-	{ok, NewTerm} when Id =:= keypos_entry, is_integer(NewTerm), NewTerm > 0 ->
-	    {ok,NewTerm};
-	_Other ->
-	    NewMsg =
-		case get(error_msg_mode) of
-		    normal ->
-			case Id of
-			    node_entry ->
-				["Please enter a valid node name!"];
-			    name_entry ->
-				["Please enter a valid table name!"];
-			    keypos_entry ->
-				["Please enter a valid key position!"]
-			end;
-		    haiku ->
-			E1 = "Aborted effort",
-			L  =
-			    case Id of 
-				node_entry ->
-				    ["Reflect, repent and retype:",
-				     "Enter valid node."];
-				name_entry ->
-				    ["Reflect, repent and retype:",
-				     "Enter valid name."];
-				keypos_entry ->
-				    ["Reflect, repent and retype",
-				     "Key position, please."]
-			    end,
-			[E1 | L]
-		end,
-	    gs:config(Id, [beep, {select, {0, 100000000}}, {setfocus, true}]),
-	    tv_utils:notify(win, "TV Notification", NewMsg),
-	    error
-    end.
-
-
-    
-
-
-next_entry(node_entry, forward) ->
-    name_entry;
-next_entry(node_entry, backward) ->
-    keypos_entry;
-next_entry(name_entry, forward) ->
-    keypos_entry;
-next_entry(name_entry, backward) ->
-    node_entry;
-next_entry(keypos_entry, forward) ->
-    node_entry;
-next_entry(keypos_entry, backward) ->
-    name_entry.
-
-
-
-
-create_window(Node) ->
-    gs:window(win, gs:start(), [{width, ?WIN_WIDTH},
-				{height, ?WIN_HEIGHT},
-				{bg, ?DEFAULT_BG_COLOR},
-				{title, "[TV]   Create New ETS Table"},
-				{configure, true},
-				{destroy, true},
-				{cursor, arrow}
-			       ]),
-    
-    gs:frame(frame1, win, [{width, ?FRAME_WIDTH},
-			   {height, ?FRAME1_HEIGHT},
-			   {x, ?FRAME_X},
-			   {y, ?FRAME1_Y},
-			   {bg, ?DEFAULT_BG_COLOR},
-			   {bw, ?BW}]),
-    gs:frame(frame2, win, [{width, ?FRAME_WIDTH},
-			   {height, ?FRAME2_HEIGHT},
-			   {x, ?FRAME_X},
-			   {y, ?FRAME2_Y},
-			   {bg, ?DEFAULT_BG_COLOR},
-			   {bw, ?BW}]),
-    gs:frame(frame3, win, [{width, ?FRAME_WIDTH},
-			   {height, ?FRAME3_HEIGHT},
-			   {x, ?FRAME_X},
-			   {y, ?FRAME3_Y},
-			   {bg, ?DEFAULT_BG_COLOR},
-			   {bw, ?BW}]),
-
-    gs:label(frame1, [{width, ?NODE_LBL_WIDTH},
-		      {height, ?LBL_HEIGHT},
-		      {x, ?LBL_X},
-		      {y, ?NODE_LBL_Y},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0,0,0}},
-		      {align, w},
-		      {font, ?FONT},
-		      {label, {text, "Node:"}}
-		     ]),
-    gs:label(frame1, [{width, ?NAME_LBL_WIDTH},
-		      {height, ?LBL_HEIGHT},
-		      {x, ?LBL_X},
-		      {y, ?NAME_LBL_Y},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0,0,0}},
-		      {align, w},
-		      {font, ?FONT},
-		      {label, {text, "Table name:"}}
-		     ]),
-    gs:label(frame2, [{width, ?TYPE_LBL_WIDTH},
-		      {height, ?LBL_HEIGHT},
-		      {x, ?LBL_X},
-		      {y, ?TYPE_LBL_Y},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0,0,0}},
-		      {align, w},
-		      {font, ?FONT},
-		      {label, {text, "Type:"}}
-		     ]),
-    gs:label(frame2, [{width, ?PROT_LBL_WIDTH},
-		      {height, ?LBL_HEIGHT},
-		      {x, ?LBL_X},
-		      {y, ?PROT_LBL_Y},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0,0,0}},
-		      {align, w},
-		      {font, ?FONT},
-		      {label, {text, "Protection:"}}
-		     ]),
-    gs:label(frame2, [{width, ?KEYPOS_LBL_WIDTH},
-		      {height, ?LBL_HEIGHT},
-		      {x, ?LBL_X},
-		      {y, ?KEYPOS_LBL_Y},
-		      {bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0,0,0}},
-		      {align, w},
-		      {font, ?FONT},
-		      {label, {text, "Key position:"}}
-		     ]),
-        
-    gs:entry(node_entry, frame1, [{width, ?NODE_ENTRY_WIDTH},
-				  {height, ?ENTRY_HEIGHT},
-				  {x, ?ENTRY_X1},
-				  {y, ?NODE_ENTRY_Y},
-				  {bg, {255,255,255}},
-				  {fg, {0,0,0}},
-				  {font, ?FONT},
-				  {enable, true},
-				  {text, "'" ++ atom_to_list(Node) ++ "'"},
-				  {keypress, true}
-				 ]),
-    gs:entry(name_entry, frame1, [{width, ?NAME_ENTRY_WIDTH},
-				  {height, ?ENTRY_HEIGHT},
-				  {x, ?ENTRY_X1},
-				  {y, ?NAME_ENTRY_Y},
-				  {bg, {255,255,255}},
-				  {fg, {0,0,0}},
-				  {font, ?FONT},
-				  {enable, true},
-				  {text, atom_to_list(?DEFAULT_NAME)},
-				  {keypress, true},
-				  {setfocus, true},
-				  {select, {0,100000000}}
-				 ]),
-    gs:entry(keypos_entry, frame2, [{width, ?KEYPOS_ENTRY_WIDTH},
-				    {height, ?ENTRY_HEIGHT},
-				    {x, ?ENTRY_X2},
-				    {y, ?KEYPOS_ENTRY_Y},
-				    {bg, {255,255,255}},
-				    {fg, {0,0,0}},
-				    {font, ?FONT},
-				    {enable, true},
-				    {keypress, true},
-				    {text, integer_to_list(?DEFAULT_KEYPOS)}
-				   ]),
-    
-    gs:radiobutton(set, frame2, [{width, ?RBTN_WIDTH1},
-				 {height, ?RBTN_HEIGHT},
-				 {x, ?RBTN_X1},
-				 {y, ?RBTN_Y1},
-				 {align, w},
-				 {label, {text, "set"}},
-				 {group, type}
-				 ]),
-    gs:radiobutton(ordered_set, frame2, [{width, ?RBTN_WIDTH1},
-					 {height, ?RBTN_HEIGHT},
-					 {x, ?RBTN_X2},
-					 {y, ?RBTN_Y1},
-					 {align, w},
-					 {label, {text, "ordered_set"}},
-					 {group, type}
-					]),
-    gs:radiobutton(bag, frame2, [{width, ?RBTN_WIDTH1},
-				 {height, ?RBTN_HEIGHT},
-				 {x, ?RBTN_X1},
-				 {y, ?RBTN_Y1PLUS},
-				 {align, w},
-				 {label, {text, "bag"}},
-				 {group, type}
-				 ]),
-    gs:radiobutton(duplicate_bag, frame2, [{width, ?RBTN_WIDTH2},
-					   {height, ?RBTN_HEIGHT},
-					   {x, ?RBTN_X2},
-					   {y, ?RBTN_Y1PLUS},
-					   {align, w},
-					   {label, {text, "duplicate_bag"}},
-					   {group, type}
-					  ]),
-    
-    gs:radiobutton(public, frame2, [{width, ?RBTN_WIDTH1},
-				    {height, ?RBTN_HEIGHT},
-				    {x, ?RBTN_X1},
-				    {y, ?RBTN_Y2},
-				    {align, w},
-				    {label, {text, "public"}},
-				    {group, protection}
-				   ]),
-    gs:radiobutton(protected, frame2, [{width, ?RBTN_WIDTH1},
-				       {height, ?RBTN_HEIGHT},
-				       {x, ?RBTN_X2},
-				       {y, ?RBTN_Y2},
-				       {align, w},
-				       {label, {text, "protected"}},
-				       {group, protection}
-				      ]),
-    gs:radiobutton(private, frame2, [{width, ?RBTN_WIDTH2},
-				     {height, ?RBTN_HEIGHT},
-				     {x, ?RBTN_X3},
-				     {y, ?RBTN_Y2},
-				     {align, w},
-				     {label, {text, "private"}},
-				     {group, protection}
-				    ]),
-    
-    gs:checkbutton(named_table, frame1, [{width, ?NAMED_TABLE_CBTN_WIDTH},
-					 {height, ?CBTN_HEIGHT},
-					 {x, ?NAMED_TABLE_CBTN_X},
-					 {y, ?NAMED_TABLE_CBTN_Y},
-					 {align, w},
-					 {label, {text, "Named table"}},
-					 {select, false},
-					 {data, true}
-					]),
-
-    gs:checkbutton(open_browser, frame3, [{width, ?OPEN_BROWSER_CBTN_WIDTH},
-					  {height, ?CBTN_HEIGHT},
-					  {x, ?OPEN_BROWSER_CBTN_X},
-					  {y, ?OPEN_BROWSER_CBTN_Y},
-					  {align, w},
-					  {label, {text, "Open browser"}},
-					  {select, true},
-					  {data, false}
-					 ]),
-
-%%    gs:label(frame2, [{width, ?VLINE_LBL_WIDTH},
-%%		      {height, ?VLINE_LBL_HEIGHT},
-%%		      {x, ?VLINE_LBL_X},
-%%		      {y, ?VLINE_LBL_Y1},
-%%		      {bg, {0,0,0}}
-%%		     ]),
-%%    gs:label(frame2, [{width, ?VLINE_LBL_WIDTH},
-%%		      {height, ?VLINE_LBL_HEIGHT},
-%%		      {x, ?VLINE_LBL_X},
-%%		      {y, ?VLINE_LBL_Y2},
-%%		      {bg, {0,0,0}}
-%%		     ]),
-%%    gs:label(frame2, [{width, ?HLINE_LBL_WIDTH},
-%%		      {height, ?HLINE_LBL_HEIGHT},
-%%		      {x, ?HLINE_LBL_X},
-%%		      {y, ?HLINE_LBL_Y},
-%%		      {bg, {0,0,0}}
-%%		     ]),
-%%    
-    gs:button(ok, frame3, [{width, ?BTN_WIDTH},
-			   {height, ?BTN_HEIGHT},
-			   {x, ?BTN_X1},
-			   {y, ?BTN_Y},
-			   {bg, ?DEFAULT_BG_COLOR},
-			   {fg, {0,0,0}},
-			   {label, {text, "OK"}}
-			  ]),
-    gs:button(cancel, frame3, [{width, ?BTN_WIDTH},
-			       {height, ?BTN_HEIGHT},
-			       {x, ?BTN_X2},
-			       {y, ?BTN_Y},
-			       {bg, ?DEFAULT_BG_COLOR},
-			       {fg, {0,0,0}},
-			       {label, {text, "Cancel"}}
-			      ]),
-
-    gs:config(?DEFAULT_TYPE, [{select, true}]),
-    gs:config(?DEFAULT_PROT, [{select, true}]),
-    
-    gs:config(win, [{map, true}]).
-    
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_nodewin.erl b/lib/tv/src/tv_nodewin.erl
deleted file mode 100644
index 8376c4a7aa..0000000000
--- a/lib/tv/src/tv_nodewin.erl
+++ /dev/null
@@ -1,412 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(tv_nodewin).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,listbox,3}},
-          {nowarn_deprecated_function,{gs,menu,3}},
-          {nowarn_deprecated_function,{gs,menubar,3}},
-          {nowarn_deprecated_function,{gs,menubutton,3}},
-          {nowarn_deprecated_function,{gs,menuitem,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([start/2, init/3]).
-
-
--include("tv_int_msg.hrl").
-
-
-
--define(WINDOW_WIDTH, 230).
--define(WINDOW_HEIGHT, 260).
--define(DEFAULT_BG_COLOR, {217,217,217}).
--define(POLL_INTERVAL, 5000).
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-start(CurrNode, ErrMsgMode) ->
-    spawn_link(?MODULE, init, [self(), CurrNode, ErrMsgMode]).
-
-
-
-
-
-init(Pid, CurrNode, ErrMsgMode) ->
-    process_flag(trap_exit, true),
-    net_kernel:monitor_nodes(true),
-    put(error_msg_mode, ErrMsgMode),
-    gs:start(),
-    NewCurrNode = update_node_listbox(CurrNode, false),
-    tell_master(NewCurrNode, CurrNode, Pid),
-    loop(Pid, NewCurrNode, node(), false).
-
-
-
-
-%%%*********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-init_window(CurrNode, Pid) ->
-    create_window(),
-    NewCurrNode = update_node_listbox(CurrNode, true),
-    tell_master(NewCurrNode, CurrNode, Pid),
-    gs:config(win, [{map,true}]),
-    NewCurrNode.
-
-
-
-
-handle_error(nodedown) ->
-    gs:window(errorwin, gs:start(), []),
-    gs:config(errorwin, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(errorwin, "TV Notification", ["The selected node is down!"]);
-	haiku ->
-	    Msg = ["With searching comes loss",
-		   "And the presence of absence:",
-		   "Node is down."],
-	    tv_utils:notify(errorwin, "TV Notification", Msg)
-    end,
-    gs:destroy(errorwin);
-handle_error(distributed) ->
-    gs:window(errorwin, gs:start(), []),
-    gs:config(errorwin, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(errorwin, "TV Notification", 
-			    ["The system has become distributed!"]);
-	haiku ->
-	    Msg = [],
-	    tv_utils:notify(errorwin, "TV Notification", Msg)
-    end,
-    gs:destroy(errorwin);
-handle_error(undistributed) ->
-    gs:window(errorwin, gs:start(), []),
-    gs:config(errorwin, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(errorwin, "TV Notification", 
-			    ["The system is no longer distributed!"]);
-	haiku ->
-	    Msg = ["The system you see",
-		   "Is not a distributed",
-		   "system anymore."],
-	    tv_utils:notify(errorwin, "TV Notification", Msg)
-    end,
-    gs:destroy(errorwin).
-
-get_node_lists(CurrNode) ->
-    NodeDataList = lists:sort([node() | nodes()]),
-    NodeTextList = lists:map(fun(Item) ->
-					 " " ++ atom_to_list(Item)
-				 end, 
-				 NodeDataList),
-
-    %% It *may* be possible that CurrNode has disappeared!
-    %% If this is the case, use the node where TV resides
-    %% as new current node.
-    %% This also covers the case when our own node (or some
-    %% other node) suddenly goes distributed.
-
-    NewCurrNode = case lists:member(CurrNode, NodeDataList) of
-		      true ->
-			  CurrNode;
-		      false ->
-			  node()
-		  end,
-    
-       %% Now get the index that shall be marked in the node listbox.
-       %% Remember that the first item has number 0 (zero)!
-    NodeMarkIndex = get_node_mark_index(NewCurrNode, NodeDataList, 0),
-    
-    {NewCurrNode, NodeDataList, NodeTextList, NodeMarkIndex}.
-    
-
-
-
-%% We know that CurrNode is *somewhere* in the list, since we have checked.
-%% If the original CurrNode wasn't there, then we are using node() instead,
-%% which definitely is in the list. (node() may have gone distributed in the 
-%% meantime, but it *IS* in the list!)  :-)
-
-get_node_mark_index(CurrNode, [H | T], Acc) when CurrNode =/= H ->
-    get_node_mark_index(CurrNode, T, Acc + 1);
-get_node_mark_index(CurrNode, [CurrNode | _], Acc) ->
-    Acc.  %% Acc tells the index of the current head.  :-)
-    
-
-
-
-
-check_selected_node('nonode@nohost', _OldNode, _WinCreated) when node() =:= 'nonode@nohost' ->
-       %% Not distributed, OK!
-    'nonode@nohost';
-check_selected_node(_Node, _OldNode, WinCreated) when node() =:= 'nonode@nohost' ->
-       %% No longer distributed, but previously was!
-    handle_error(undistributed),
-    update_node_listbox('nonode@nohost', WinCreated);
-check_selected_node(Node, _OldNode, _WinCreated) when Node =:= node() ->
-       %% We are distributed, but on 
-       %% our own node! Since we 
-       % still are running, the node 
-       %% is up.
-    Node;
-check_selected_node(Node, 'nonode@nohost', WinCreated) ->
-       %% The system has been distributed!
-    net_kernel:monitor_nodes(true),
-    handle_error(distributed),
-    update_node_listbox(Node, WinCreated);
-check_selected_node(Node, _OldNode, WinCreated) ->
-       %% We are distributed, and a new node has been chosen!
-       %% We better check this node!
-    case net_adm:ping(Node) of
-	pong ->
-	    Node;
-	_Other ->
-	    handle_error(nodedown),
-	    update_node_listbox(Node, WinCreated)
-    end.
-
-
-
-available_nodes() ->
-    lists:sort([node() | nodes()]).
-
-
-
-loop(Pid, CurrNode, HomeNode, WinCreated) ->
-    receive
-
-	{nodedown, _Node} ->
-	    flush_nodedown_messages(),
-	    flush_nodeup_messages(),
-	    case lists:member(CurrNode, available_nodes()) of
-		true ->
-		    done;
-		false when node() =:= 'nonode@nohost', CurrNode =/= 'nonode@nohost' ->
-		    handle_error(undistributed);
-		false ->
-		    handle_error(nodedown)
-	    end,
-	    NewCurrNode = update_node_listbox(CurrNode, WinCreated),
-	    tell_master(NewCurrNode, CurrNode, Pid),
-	    loop(Pid, NewCurrNode, node(), WinCreated);
-
-
-	{nodeup, _Node} ->
-	    flush_nodeup_messages(),
-	    flush_nodedown_messages(),
-	    case lists:member(CurrNode, available_nodes()) of
-		true ->
-		    done;
-		false when node() =:= 'nonode@nohost', CurrNode =/= 'nonode@nohost' ->
-		    handle_error(undistributed);
-		false when CurrNode =:= 'nonode@nohost' ->
-		    net_kernel:monitor_nodes(true),
-		    handle_error(distributed);
-		false ->
-		    handle_error(nodedown)
-	    end,
-	    NewCurrNode = update_node_listbox(CurrNode, WinCreated),
-	    tell_master(NewCurrNode, CurrNode, Pid),
-	    loop(Pid, NewCurrNode, node(), WinCreated);
-
-
-	{gs, node_listbox, click, Data, [Idx, _Txt | _]} ->
-	    NewCurrNode = check_selected_node(lists:nth(Idx + 1, Data), CurrNode, WinCreated),
-	    tell_master(NewCurrNode, CurrNode, Pid),
-	    loop(Pid, NewCurrNode, node(), WinCreated);
-
-
-	{gs, win, configure, _, _} ->
-	    gs:config(win, [{width, ?WINDOW_WIDTH}, {height, ?WINDOW_HEIGHT}]),
-	    loop(Pid, CurrNode, HomeNode, WinCreated);
-
-
-	show_window when WinCreated->
-	    gs:config(win, [raise]),
-	    loop(Pid, CurrNode, HomeNode, WinCreated);
-	
-	show_window when not WinCreated ->
-	    init_window(CurrNode, Pid),
-	    loop(Pid, CurrNode, HomeNode, true);
-
-	{gs, _Id, click, close_menu, _Args} ->
-	    gs:destroy(win),
-	    loop(Pid, CurrNode, HomeNode, false);
-
-
-	{gs, _Id, keypress, _Data, [c, _, 0, 1 | _]} ->
-	    gs:destroy(win),
-	    loop(Pid, CurrNode, HomeNode, false);
-	
-
-	{gs, _Id, keypress, _Data, ['C', _, 1, 1 | _]} ->
-	    gs:destroy(win),
-	    loop(Pid, CurrNode, HomeNode, false);
-
-
-	{gs, _Id, keypress, _Data, _Args} ->
-	    loop(Pid, CurrNode, HomeNode, WinCreated);    
-	
-
-	{gs, _, destroy, _, _} ->
-	    loop(Pid, CurrNode, HomeNode, false);    
-
-
-	{error_msg_mode, Mode} ->
-	    put(error_msg_mode, Mode),
-	    loop(Pid, CurrNode, HomeNode, WinCreated);
-
-	{'EXIT', Pid, _Reason} ->
-	    net_kernel:monitor_nodes(false),
-	    exit(normal);
-
-
-	{'EXIT', _OtherPid, _Reason} ->
-	    loop(Pid, CurrNode, HomeNode, WinCreated);
-
-	
-	_Other ->
-	    io:format("Node window received message ~p ~n", [_Other]),
-	    loop(Pid, CurrNode, HomeNode, WinCreated)
-
-    after 
-	1000 ->
-	    NewHomeNode = case node() of
-			      HomeNode ->
-				  HomeNode;
-			      Other ->
-				  self() ! {nodeup, Other}
-			  end,
-	    loop(Pid, CurrNode, NewHomeNode, WinCreated)
-    end.
-
-			      
-
-
-tell_master(NewNode, NewNode, _Pid) ->
-    done;
-tell_master(NewNode, _OldNode, Pid) ->
-    Pid ! {tv_new_node, self(), NewNode}.
-
-
-
-
-flush_nodedown_messages() ->
-    receive
-	{nodedown,_Node} ->
-	    flush_nodedown_messages()
-    after
-	0 ->
-	    done
-    end.
-
-
-
-
-flush_nodeup_messages() ->
-    receive
-	{nodeup,_Node} ->
-	    flush_nodeup_messages()
-    after
-	0 ->
-	    done
-    end.
-
-
-
-
-update_node_listbox(Node, WinCreated) ->
-    {NewNode, NodeDataList, NodeTextList, MarkIndex} = get_node_lists(Node),
-    case WinCreated of
-	false ->
-	    done;
-	true ->
-	    catch gs:config(node_listbox, [{data, NodeDataList},
-					   {items, NodeTextList},
-					   {selection, MarkIndex}
-					  ])
-    end,
-    NewNode.
-
-
-
-
-
-create_window() ->
-    gs:window(win, gs:start(), [{width, ?WINDOW_WIDTH},
-				{height, ?WINDOW_HEIGHT},
-				{bg, ?DEFAULT_BG_COLOR},
-				{title, "[TV]   Connected nodes"},
-				{configure, true},
-				{destroy, true},
-				{cursor, arrow},
-				{keypress, true}
-			       ]),
-    gs:menubar(menubar, win, [{bg, ?DEFAULT_BG_COLOR}
-					]),
-    gs:menubutton(mbutt, menubar, [{bg, ?DEFAULT_BG_COLOR},
-				   {fg, {178, 34, 34}},  % firebrick
-				   {label, {text, " File "}},
-				   {underline, 1}
-				  ]),
-    
-       % Create the actual menu!
-    gs:menu(menu, mbutt, [{bg, ?DEFAULT_BG_COLOR},
-			  {fg, {178, 34, 34}}]), 
-    gs:menuitem(menu, [{bg, ?DEFAULT_BG_COLOR},
-		       {fg, {178, 34, 34}},
-		       {label, {text, " Close    Ctrl-C "}},
-		       {data, close_menu},
-		       {underline, 1}
-		      ]),
-
-    Xpos = 4, 
-    Ypos = 40,
-    gs:listbox(node_listbox, win, [{x, Xpos},
-				   {y, Ypos},
-				   {width, ?WINDOW_WIDTH - 2 * Xpos},
-				   {height, ?WINDOW_HEIGHT - Ypos - Xpos},
-				   {bg, {255,255,255}},
-				   {vscroll, right},
-				   {hscroll, true},
-				   {click, true}
-			      ]).
-    
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_pb.erl b/lib/tv/src/tv_pb.erl
deleted file mode 100644
index 81e7e7e2d1..0000000000
--- a/lib/tv/src/tv_pb.erl
+++ /dev/null
@@ -1,663 +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%
--module(tv_pb).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,frame,2}}]).
-
-
-
--export([pb/1]).
-
-
--include("tv_int_def.hrl").
--include("tv_pd_int_msg.hrl").
--include("tv_pb_int_def.hrl").
-
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      pb.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Process controlling the grid buttons on the display.
-%%
-%% Parameters:    None.
-%%======================================================================
-
-
-pb(ParentPid) ->
-    process_flag(trap_exit, true),
-    ProcVars = #process_variables{parent_pid = ParentPid},
-    loop(ProcVars).
-
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-%%======================================================================
-%% Function:      loop.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Eternal (well, almost) loop, receiving messages and 
-%%                handling them.
-%%
-%% Parameters:    
-%%======================================================================
-
-
-loop(ProcVars) ->
-    receive
-	Msg ->
-	    case Msg of
-		
-		#pb_update_vbtns{} ->
-		    NewProcVars = update_vbtns(Msg, ProcVars),
-		    loop(NewProcVars);
-
-		#pb_key_info{} ->
-		    NewProcVars = update_keys(Msg, ProcVars),
-		    loop(NewProcVars);
-
-		#pb_update_hbtns{} ->
-		    NewProcVars = update_hbtns(Msg, ProcVars),
-		    loop(NewProcVars);
-
-		#pb_set_sort_col{} ->
-		    NewProcVars = set_sort_col(Msg, ProcVars),
-		    loop(NewProcVars);
-
-		#pb_remove_marks{} ->
-		    NewProcVars = remove_marks(ProcVars),
-		    loop(NewProcVars);
-
-		#pb_init_btns{} ->
-		    NewProcVars = init_btns(Msg, ProcVars),
-		    loop(NewProcVars);
-
-		{gs, Id, Event, Data, Args} ->
-		    NewProcVars = gs_messages({Id, Event, Data, Args}, ProcVars),
-		    loop(NewProcVars);
-
-
-		{'EXIT', Pid, Reason} ->
-		    ParentPid = ProcVars#process_variables.parent_pid,
-		    exit_signals({Pid, Reason}, ParentPid, ProcVars),
-		    loop(ProcVars);
-
-		_Other ->
-		    loop(ProcVars)
-	    end
-    end.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-exit_signals(ExitInfo, ParentPid, _ProcVars) ->
-    case ExitInfo of
-	{ParentPid, _Reason} ->
-	    exit(normal);
-	_Other ->
-	    done
-    end.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-gs_messages(Msg, ProcVars) ->
-
-    case Msg of
-
-	{Id, click, {hbtn, RealCol, VirtualCol}, _Args} ->
-	    handle_col_marking(Id, RealCol, VirtualCol, ProcVars);
-
-	{Id, buttonpress, {resbtn, RealCol, VirtualCol, Xpos}, [1 | _Tail]} ->
-	    handle_col_resizing(Id, RealCol, VirtualCol, Xpos, ProcVars),
-	    ProcVars;
-
-	{_Id, click, {vbtn, RealRow, VirtualRow}, _Args} ->
-	    handle_row_marking(RealRow, VirtualRow, ProcVars);
-
-	_OtherMessage ->
-	    ProcVars
-
-    end.
-	    
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-remove_marks(ProcVars) ->
-    #process_variables{col_mark_params = ColMarkP,
-		       row_mark_params = RowMarkP}  = ProcVars,
-
-    #col_mark_params{col_btn_id          = BtnId,
-		     virtual_col_marked  = VirtualCol,
-		     virtual_sort_col    = SortCol}  = ColMarkP,
-    
-    case BtnId of 
-	undefined ->
-	    done;
-	_AnyId ->
-	    case VirtualCol of
-		SortCol ->
-		    gs:config(BtnId, [{bg, ?SORT_MARK_COLOR},
-				      {fg, {0, 0, 0}}
-				     ]);
-		_Other ->
-		    gs:config(BtnId, [{bg, ?DEFAULT_BG_COLOR},
-				      {fg, {0, 0, 0}}
-				     ])
-	    end
-    end,
-    
-    NewRowMarkP = RowMarkP#row_mark_params{virtual_row_marked = undefined,
-					   real_row_marked    = undefined
-					  },
-    NewColMarkP = ColMarkP#col_mark_params{col_btn_id         = undefined,
-					   virtual_col_marked = undefined
-					  },
-    ProcVars#process_variables{col_mark_params = NewColMarkP,
-			       row_mark_params = NewRowMarkP
-			      }.
-    
-				   
-		    
-		    
-		    
-    
-    
-    
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-handle_col_marking(BtnId, RealCol, VirtualCol, ProcVars) ->
-    #process_variables{parent_pid      = PdPid,
-		       col_mark_params = ColMarkP,
-		       row_mark_params = RowMarkP}  = ProcVars,
-
-    #col_mark_params{col_btn_id          = OldBtnId,
-		     virtual_col_marked  = OldVirtualCol,
-		     virtual_sort_col    = SortCol}  = ColMarkP,
-
-    {ColMarked, NewColMarkP} = mark_col_btn(BtnId, OldBtnId, VirtualCol, 
-					    OldVirtualCol, RealCol, SortCol, 
-					    ColMarkP),
-
-    PdPid ! #pb_col_marked{sender      = self(),
-			   col_marked  = ColMarked,
-			   real_col    = RealCol,
-			   virtual_col = VirtualCol
-			  },
-
-    NewRowMarkP = RowMarkP#row_mark_params{virtual_row_marked = undefined,
-					   real_row_marked    = undefined
-					  },
-    ProcVars#process_variables{col_mark_params = NewColMarkP,
-			       row_mark_params = NewRowMarkP
-			      }.
-
-    
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-handle_row_marking(RealRow, VirtualRow, ProcVars) ->
-    #process_variables{parent_pid      = PdPid,
-		       col_mark_params = ColMarkP,
-		       row_mark_params = RowMarkP}  = ProcVars,
-
-    #col_mark_params{col_btn_id          = OldBtnId,
-		     virtual_col_marked  = OldVirtualCol,
-		     virtual_sort_col    = SortCol}  = ColMarkP,
-
-    {_ColMarked, NewColMarkP} = mark_col_btn(OldBtnId, OldBtnId, OldVirtualCol, 
-					     OldVirtualCol, undefined, SortCol, 
-					     ColMarkP),
-
-    #row_mark_params{virtual_row_marked = OldVirtualRow} = RowMarkP,
-
-       % Check if row shall be marked or unmarked!
-    {RowMarked, NewRowMarkP} = check_marked_row(VirtualRow, OldVirtualRow, RealRow,
-						RowMarkP),
-
-    PdPid ! #pb_row_marked{sender      = self(),
-			   row_marked  = RowMarked,
-			   real_row    = RealRow,
-			   virtual_row = VirtualRow
-			  },
-    
-    ProcVars#process_variables{row_mark_params = NewRowMarkP,
-			       col_mark_params = NewColMarkP}.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-%% Three cases: no button previously clicked, or same button clicked,
-%% or some other button clicked.
-
-check_marked_row(NewVirtRow, undefined, RealRow, RowMarkP) ->
-       % No btn already pressed!
-    {true, RowMarkP#row_mark_params{virtual_row_marked = NewVirtRow,
-				    real_row_marked    = RealRow}};
-check_marked_row(NewVirtRow, OldVirtRow, _RealRow, RowMarkP) when NewVirtRow =:= OldVirtRow ->
-       % The button previously pressed has been pressed again!
-    {false, RowMarkP#row_mark_params{virtual_row_marked = undefined,
-				     real_row_marked    = undefined}};
-check_marked_row(NewVirtRow, _OldVirtRow, RealRow, RowMarkP) ->
-       % A new btn has been pressed!
-    {true, RowMarkP#row_mark_params{virtual_row_marked = NewVirtRow,
-				    real_row_marked    = RealRow}}.
-
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-set_sort_col(Msg, ProcVars) ->
-    #pb_set_sort_col{virtual_col = SortCol} = Msg,
-    tv_pb_funcs:set_new_sort_col(SortCol, ProcVars).
-    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-%% Three cases: no button previously clicked, or same button clicked,
-%% or some other button clicked.
-
-mark_col_btn(NewId, undefined, NewVirtCol, _OldVirtCol, _RealCol, _SortCol, ColMarkP) ->
-       % No btn already pressed!
-    gs:config(NewId, [{bg, ?COL_MARK_COLOR},
-		      {fg, {255, 255, 255}}
-		     ]),
-    {true, ColMarkP#col_mark_params{col_btn_id         = NewId,
-				    virtual_col_marked = NewVirtCol}};
-mark_col_btn(NewId, _OldId, NewVirtCol, OldVirtCol, _RealCol, SortCol, ColMarkP) when NewVirtCol =:= OldVirtCol, NewVirtCol =:= SortCol ->
-       % The button previously pressed has been pressed again!
-    gs:config(NewId, [{bg, ?SORT_MARK_COLOR},
-		      {fg, {0, 0, 0}}
-		     ]),
-    {false, ColMarkP#col_mark_params{col_btn_id         = undefined,
-				     virtual_col_marked = undefined}};
-mark_col_btn(NewId, _OldId, NewVirtCol, OldVirtCol, _RealCol, _SortCol, ColMarkP) when NewVirtCol =:= OldVirtCol ->
-       % The button previously pressed has been pressed again!
-    gs:config(NewId, [{bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0, 0, 0}}
-		     ]),
-    {false, ColMarkP#col_mark_params{col_btn_id         = undefined,
-				     virtual_col_marked = undefined}};
-mark_col_btn(NewId, OldId, NewVirtCol, _OldVirtCol, _RealCol, _SortCol, ColMarkP) ->
-       % A new btn has been pressed!
-    gs:config(OldId, [{bg, ?DEFAULT_BG_COLOR},
-			 {fg, {0, 0, 0}}
-			]),
-    gs:config(NewId, [{bg, ?COL_MARK_COLOR},
-		      {fg, {255, 255, 255}}
-		     ]),
-    {true, ColMarkP#col_mark_params{col_btn_id         = NewId,
-				    virtual_col_marked = NewVirtCol}}.
-    		    
-		    
-	    
-	    
-    
-    
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-handle_col_resizing(RbtnId, RealCol, VirtualCol, Xpos, ProcVars) ->
-    gs:config(RbtnId, [{motion, true}]),
-    #process_variables{parent_pid        = ParentPid,
-		       grid_frame_id     = GrFrId,
-		       grid_frame_height = Height,
-		       hbtn_height       = HbtnH,
-		       resbtn_width      = RbtnW,
-		       cols_shown        = ColsShown} = ProcVars,
-    
-    LineId = gs:frame(GrFrId, [{width, 1},
-			       {height, Height - HbtnH},
-			       {x, Xpos},
-			       {y, HbtnH - 1},
-			       {bg, ?DEFAULT_BG_COLOR}
-			      ]),
-    MinColWidth = RbtnW,
-    
-    OldColWidth = lists:nth(RealCol, ColsShown),
-    Xdiff = get_xdiff(RbtnId, 1, 0, LineId, Xpos, MinColWidth - OldColWidth),
-
-    ParentPid ! #pb_new_colwidth{sender      = self(),
-				 real_col    = RealCol,
-				 virtual_col = VirtualCol,
-				 xdiff       = Xdiff},
-
-    gs:config(RbtnId, [{motion, false}]),
-    gs:destroy(LineId).
-
-
-    
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_xdiff(Id, Btn, LastXdiff, LineId, LineXpos, MinAllowedXdiff) ->
-    receive
-	{gs, Id, motion, {resbtn, _RealCol, _VirtCol, _OldXpos}, [NewXdiff | _T]} ->
-	    UsedXdiff = erlang:max(MinAllowedXdiff, NewXdiff),
-	    gs:config(LineId, [{x, LineXpos + UsedXdiff}]),
-	    get_xdiff(Id, Btn, UsedXdiff, LineId, LineXpos, MinAllowedXdiff);
-	{gs, Id, buttonrelease, _Data, [Btn | _T]} ->
-	    LastXdiff;
-	{gs, Id, buttonrelease, _Data, _Args} ->
-	    get_xdiff(Id, Btn, LastXdiff, LineId, LineXpos, MinAllowedXdiff);
-	{gs, Id, buttonpress, _Data, _Args} ->
-	    get_xdiff(Id, Btn, LastXdiff, LineId, LineXpos, MinAllowedXdiff)
-    end.
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-init_btns(Msg, ProcVars) ->
-    #pb_init_btns{parent_id       = ParentId,
-		  parent_width    = Width,
-		  parent_height   = Height,
-		  ypos            = Ypos,
-		  hbtn_height     = HbtnH,
-		  resbtn_width    = RbtnW,
-		  vbtn_width      = VbtnW,
-		  nof_rows        = NofRows,
-		  row_height      = RowHeight,
-		  first_col_shown = FirstColShown,
-		  cols_shown      = ColsShown} = Msg,
-
-    NewProcVars = tv_pb_funcs:init_btns(ParentId, Ypos, HbtnH, VbtnW, RbtnW, 
-					 FirstColShown, ColsShown, NofRows, 
-					 RowHeight, ProcVars),
-
-    gs:frame(ParentId, [{bg, {0, 0, 0}},
-			{bw, 0},
-			{width, 1300},
-			{height, 1},
-			{x, 0},
-			{y, Ypos - 1}
-		       ]),
-    NewProcVars#process_variables{grid_frame_width  = Width,
-				  grid_frame_height = Height
-				 }.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_hbtns(Msg, ProcVars) ->
-    #pb_update_hbtns{parent_width    = Width,
-		     parent_height   = Height,
-		     first_col_shown = FirstColShown,
-		     cols_shown      = ColsShown} = Msg,
-
-    NewProcVars = tv_pb_funcs:update_hbtns(FirstColShown, ColsShown, ProcVars),
-
-    NewProcVars#process_variables{grid_frame_width  = Width,
-				  grid_frame_height = Height
-				 }.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_vbtns(Msg, ProcVars) ->
-    #pb_update_vbtns{color_list       = Colors,
-		     first_row_shown  = FirstRowShown,
-		     nof_rows_shown   = NofRowsShown,
-		     blinking_enabled = BlinkEnabled} = Msg,
-    
-    tv_pb_funcs:update_vbtns(NofRowsShown, FirstRowShown, Colors, BlinkEnabled, 
-			      ProcVars).
-    
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_keys(Msg, ProcVars) ->
-    #pb_key_info{list_of_keys = KeyList} = Msg,
-    tv_pb_funcs:update_keys(KeyList, ProcVars).
diff --git a/lib/tv/src/tv_pb_funcs.erl b/lib/tv/src/tv_pb_funcs.erl
deleted file mode 100644
index 24d1120597..0000000000
--- a/lib/tv/src/tv_pb_funcs.erl
+++ /dev/null
@@ -1,1056 +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%
--module(tv_pb_funcs).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,canvas,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}}]).
-
-
-
--export([init_btns/10, 
-	 update_hbtns/3, 
-	 update_vbtns/5, 
-	 update_keys/2, 
-	 set_new_sort_col/2]).
-
-
--include("tv_int_def.hrl").
--include("tv_pb_int_def.hrl").
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-
-init_btns(ParentId, Ypos, HbtnH, 
-	  VbtnW, ResbtnW, FirstColShown, ColsShown, NofRows, RowH, ProcVars) ->
-
-    #process_variables{key_numbers = KeyNos,
-		       key_ids     = KeyIds} = ProcVars,
-
-%    C = gs:canvas(ParentId, [{width, VbtnW - 1},
-%			     {height, HbtnH},
-%			     {x, 0},
-%			     {y, HbtnH + 1},
-%			     {bg, white}
-%			    ]),
-%    gs:create(image, C, [{load_gif, "erlang.gif"}]),
-
-    {HbtnsShown, ResBtnsShown} = update_hbtns(ColsShown, [], [], 
-					      FirstColShown, ParentId, Ypos,
-					      HbtnH, ResbtnW, VbtnW),
-
-    NewKeyIds = update_keys(KeyNos, KeyIds, FirstColShown, 
-			    FirstColShown + length(ColsShown) - 1, HbtnsShown, 
-			    ParentId, []),
-
-    VbtnsShown = create_vbtns(ParentId, Ypos, NofRows, RowH, VbtnW, HbtnH),
-    ProcVars#process_variables{grid_frame_id   = ParentId,
-			       ypos            = Ypos,
-			       hbtn_height     = HbtnH,
-			       vbtn_width      = VbtnW,
-			       resbtn_width    = ResbtnW,
-			       first_col_shown = FirstColShown,
-			       hbtns_shown     = HbtnsShown,
-			       resbtns_shown   = ResBtnsShown,
-			       vbtns_shown     = VbtnsShown,
-			       cols_shown      = ColsShown,
-			       key_ids         = NewKeyIds
-			      }.
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_hbtns(FirstColShown, ColsShown, ProcVars) ->
-    #process_variables{grid_frame_id   = ParentId,
-		       first_col_shown = OldFirstColShown,
-		       cols_shown      = OldColsShown,
-		       ypos            = Ypos,
-		       hbtn_height     = HbtnH,
-		       vbtn_width      = VbtnW,
-		       resbtn_width    = ResbtnW,
-		       hbtns_shown     = HbtnsShown,
-		       resbtns_shown   = ResbtnsShown,
-		       key_numbers     = KeyNos,
-		       key_ids         = KeyIds,
-		       col_mark_params = ColMarkP}  = ProcVars,
-
-       % Only if the grid has been scrolled horizontally need we move the
-       % col mark!
-    case FirstColShown of
-	OldFirstColShown ->
-	    done;
-	_NewValue ->
-	    #col_mark_params{col_btn_id         = MarkedBtnId,
-			     virtual_col_marked = ColMarked,
-			     sort_btn_id        = SortBtnId,
-			     virtual_sort_col   = SortCol}  = ColMarkP,
-	    unmark_marked_col(MarkedBtnId, ColMarked, SortCol),
-	    unmark_sort_col(SortBtnId, ColMarked, SortCol)
-    end,
-
-    {NewHbtns, NewResbtns, NewKeys} = 
-	case {FirstColShown, ColsShown} of
-	    {OldFirstColShown, OldColsShown} ->
-		{HbtnsShown, ResbtnsShown, KeyIds};
-	    _Other ->
-		{NewHbtnsShown, NewResbtnsShown} = update_hbtns(ColsShown, 
-								HbtnsShown, 
-								ResbtnsShown, 
-								FirstColShown, 
-								ParentId, 
-								Ypos, 
-								HbtnH, 
-								ResbtnW,
-								VbtnW),
-		NewKeyIds = update_keys(KeyNos, KeyIds, FirstColShown, 
-					FirstColShown + length(ColsShown) - 1, 
-					NewHbtnsShown, ParentId, []),
-		{NewHbtnsShown, NewResbtnsShown, NewKeyIds}
-	end,
-	    
-       % Now mark the marked column again!
-    NewColMarkP = mark_marked_col(NewHbtns, FirstColShown, ColMarkP),
-
-    ProcVars#process_variables{first_col_shown = FirstColShown,
-			       hbtns_shown     = NewHbtns,
-			       resbtns_shown   = NewResbtns,
-			       cols_shown      = ColsShown,
-			       key_ids         = NewKeys,
-			       col_mark_params = NewColMarkP
-			      }.
-    
-    
-		       
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_vbtns(NofRowsShown, FirstRowShown, Colors, BlinkEnabled, ProcVars) ->
-    #process_variables{vbtns_shown      = Vbtns,
-		       blink_color_list = BlinkList} = ProcVars,
-    
-    update_vbtns(1, NofRowsShown, FirstRowShown, Vbtns, Colors, BlinkEnabled, BlinkList),
-    NewProcVars = update_sort_btn_mark(ProcVars),
-    NewProcVars.
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-set_new_sort_col(SortCol, ProcVars) ->
-    #process_variables{hbtns_shown     = HbtnsShown,
-		       col_mark_params = ColMarkP} = ProcVars,
-    
-    #col_mark_params{col_btn_id         = MarkedColBtnId,
-		     sort_btn_id        = OldSortBtnId}  = ColMarkP,
-    
-       % Set the new color of the sort btn, and remove the mark, if it is the same
-       % column!
-
-    case MarkedColBtnId of
-	undefined ->
-	    done;
-	_AnyId ->
-	    gs:config(MarkedColBtnId, [{bg, ?DEFAULT_BG_COLOR},
-				       {fg, {0, 0, 0}}
-				      ])
-    end,
-    
-    SortBtnId = get_btn_id(SortCol, HbtnsShown),
-    case SortBtnId of 
-	undefined ->
-	       % The btn isn't visible, or no sorting shall be performed!
-	    gs:config(OldSortBtnId, [{bg, ?DEFAULT_BG_COLOR},
-				     {fg, {0, 0, 0}}
-				    ]);
-	_Other ->
-	       % Unmark the old sort btn id!
-	    gs:config(OldSortBtnId, [{bg, ?DEFAULT_BG_COLOR},
-				     {fg, {0, 0, 0}}
-				    ]),
-	    gs:config(SortBtnId, [{bg, ?SORT_MARK_COLOR},
-				  {fg, {0, 0, 0}}
-				 ])
-    end,
-    
-    NewColMarkP = ColMarkP#col_mark_params{col_btn_id         = undefined,
-					   virtual_col_marked = undefined,
-					   sort_btn_id        = SortBtnId,
-					   virtual_sort_col   = SortCol
-					  },
-    ProcVars#process_variables{col_mark_params = NewColMarkP}.
-    
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_keys(KeyList, ProcVars) ->
-    #process_variables{key_numbers     = OldKeyList,
-		       key_ids         = KeyIds,
-		       first_col_shown = FirstColShown,
-		       cols_shown      = ColsShown,
-		       hbtns_shown     = HbtnsShown,
-		       grid_frame_id   = ParentId} = ProcVars,
-
-    NewKeyIds = case KeyList of
-		    OldKeyList ->
-			KeyIds;
-		    NewKeyList ->
-			update_keys(NewKeyList, KeyIds, FirstColShown, 
-				    FirstColShown + length(ColsShown) - 1, 
-				    HbtnsShown, ParentId, [])
-		end,
-
-    ProcVars#process_variables{key_numbers = KeyList,
-			       key_ids     = NewKeyIds
-			      }.
-
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-unmark_sort_col(undefined, _ColMarked, _SortCol) ->
-    done;
-unmark_sort_col(SortBtnId, _ColMarked, _SortCol) ->
-    gs:config(SortBtnId, [{bg, ?DEFAULT_BG_COLOR},
-			  {fg, {0, 0, 0}}
-			 ]).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_marked_col(HbtnsShown, _FirstColShown, ColMarkP) ->
-    #col_mark_params{virtual_col_marked = VirtualCol,
-		     virtual_sort_col   = SortCol} = ColMarkP,
-
-    {NewMarkBtnId, NewSortBtnId} = 
-	case VirtualCol of
-	    SortCol ->
-		   % Same btn!
-		BtnId = get_btn_id(VirtualCol, 
-				   HbtnsShown),
-		gs:config(BtnId, [{bg, ?SORT_MARK_COLOR},
-				  {fg, {0, 0, 0}}
-				 ]),
-		{BtnId, BtnId};
-	    _OtherCol ->
-		MarkBtnId = get_btn_id(VirtualCol, HbtnsShown),
-		case MarkBtnId of
-		    undefined ->
-			done;
-		    _Else ->
-			gs:config(MarkBtnId, [{bg, ?COL_MARK_COLOR},
-					      {fg, {255, 255, 255}}
-					     ])
-		end,
-
-		SortBtnId = get_btn_id(SortCol, HbtnsShown),
-		case SortBtnId of
-		    undefined ->
-			done;
-		    _OtherId ->
-			gs:config(SortBtnId, [{bg, ?SORT_MARK_COLOR},
-					      {fg, {0, 0, 0}}
-					     ])
-		end,
-
-		{MarkBtnId, SortBtnId}
-	end,
-    
-    ColMarkP#col_mark_params{col_btn_id = NewMarkBtnId,
-			     sort_btn_id = NewSortBtnId}.
-    
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-unmark_marked_col(undefined, _ColMarked, _SortCol) ->
-    done;
-unmark_marked_col(BtnId, _ColMarked, _SortCol) ->
-    gs:config(BtnId, [{bg, ?DEFAULT_BG_COLOR},
-		      {fg, {0,0,0}}
-		     ]).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_sort_btn_mark(ProcVars) ->
-    #process_variables{hbtns_shown     = HbtnsShown,
-		       col_mark_params = ColMarkP}  = ProcVars,
-
-    #col_mark_params{col_btn_id         = MarkedColBtnId,
-		     virtual_col_marked = ColMarked,
-		     sort_btn_id        = OldSortBtnId,
-		     virtual_sort_col   = SortCol}  = ColMarkP,
-    
-    {NewMarkedColBtnId, NewColMarked} = case ColMarked of
-					    SortCol ->
-						{undefined, undefined};
-					    _Other ->
-						{MarkedColBtnId, ColMarked}
-					end,
-
-    NewSortBtnId = set_sort_btn_color(OldSortBtnId, SortCol, HbtnsShown),
-
-    NewColMarkP = ColMarkP#col_mark_params{col_btn_id         = NewMarkedColBtnId,
-					   virtual_col_marked = NewColMarked,
-					   sort_btn_id        = NewSortBtnId},
-
-    ProcVars#process_variables{col_mark_params = NewColMarkP}.
-    
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_btn_id(VirtualCol, HbtnsShown) ->
-    case lists:keysearch(VirtualCol, #hbtn.virtual_col, HbtnsShown) of
-	false ->
-	    undefined;
-	{value, HbtnRec} ->
-	    HbtnRec#hbtn.id
-    end.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-set_sort_btn_color(undefined, SortCol, HbtnsShown) ->
-    case lists:keysearch(SortCol, #hbtn.virtual_col, HbtnsShown) of
-	false ->
-	    undefined;
-	{value, HbtnRec} ->
-	    BtnId = HbtnRec#hbtn.id,
-	    gs:config(BtnId, [{bg, ?SORT_MARK_COLOR}]),
-	    BtnId
-    end;
-set_sort_btn_color(BtnId, undefined, _HbtnsShown) ->
-    gs:config(BtnId, [{bg, ?DEFAULT_BG_COLOR}]);
-set_sort_btn_color(OldSortBtnId, SortCol, HbtnsShown) ->
-    case gs:read(OldSortBtnId, bg) of 
-	SortCol ->
-	       % Btn is already marked!
-	    OldSortBtnId;
-	_OtherColor ->
-	       % Unmark old btn, mark new btn, if visible.
-	    gs:config(OldSortBtnId, [{bg, ?DEFAULT_BG_COLOR}]),
-	    case lists:keysearch(SortCol, #hbtn.virtual_col, HbtnsShown) of
-		false ->
-		    undefined;
-		{value, HbtnRec} ->
-		    BtnId = HbtnRec#hbtn.id,
-		    gs:config(BtnId, [{bg, ?SORT_MARK_COLOR}]),
-		    BtnId
-	    end
-    end.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_vbtns(N, NofRowsShown, _VirtualRowNo,
-	     _Vbtns, _Colors, _BlinkEnabled, _BlinkList) when N > NofRowsShown ->
-    done;
-update_vbtns(_N, _NofRowsShown, _VirtualRowNo, [], [], _BlinkEnabled, _BlinkList) ->
-    done;
-update_vbtns(_N, _NofRowsShown, _VirtualRowNo, [], _Colors, _BlinkEnabled, _BlinkList) ->
-       % Right now we don't bother with dynamically creating row buttons:
-       % we ought too know in advance the maximum number of rows that can
-       % be visible.
-    io:format("Configuration error: too few rows in grid.~n"),
-    done;
-update_vbtns(N, NofRowsShown, 
-	     VirtualRowNo, [VbtnRec | VT], [], BlinkEnabled, BlinkList) ->
-    VbtnId = VbtnRec#vbtn.id,
-    gs:config(VbtnId, [{bg, ?DEFAULT_BG_COLOR},
-		       {fg, ?BLACK},
-		       {label, {text, integer_to_list(VirtualRowNo)}},
-		       {data, {vbtn, N, VirtualRowNo}}      % Real row + virtual row
-		      ]),
-    update_vbtns(N + 1, NofRowsShown, VirtualRowNo + 1,VT, [], BlinkEnabled, 
-		 BlinkList);
-update_vbtns(N, NofRowsShown, 
-	     VirtualRowNo, [VbtnRec | VT], [Color | CT], true, BlinkList) ->
-    VbtnId = VbtnRec#vbtn.id,
-    {Text, TextColor} = get_vbtn_text_and_textcolor(Color, VirtualRowNo),
-    case lists:member(Color, BlinkList) of
-	true ->
-	    gs:config(VbtnId, [{bg, Color}, 
-			       {fg, TextColor},
-			       {label, {text, Text}},
-			       {data, {vbtn, N, VirtualRowNo}}, % Real + virtual row
-			       flash
-			      ]);
-	false ->
-	    gs:config(VbtnId, [{bg, Color},
-			       {fg, TextColor},
-			       {label, {text, Text}},
-			       {data, {vbtn, N, VirtualRowNo}} % Real + virtual row
-			      ])
-    end,
-    update_vbtns(N + 1, NofRowsShown, VirtualRowNo + 1, VT, CT, true, BlinkList);
-update_vbtns(N, NofRowsShown, 
-	     VirtualRowNo, [VbtnRec | VT], [Color | CT], false, BlinkList) ->
-    VbtnId = VbtnRec#vbtn.id,
-    {Text, TextColor} = get_vbtn_text_and_textcolor(Color, VirtualRowNo),
-    gs:config(VbtnId, [{bg, Color},
-		       {fg, TextColor},
-		       {label, {text, Text}},
-		       {data, {vbtn, N, VirtualRowNo}}  % Real row + virtual row
-		      ]),
-    update_vbtns(N + 1, NofRowsShown, VirtualRowNo + 1, VT, CT, false, BlinkList).
-    
-    
-    
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_vbtn_text_and_textcolor(?BLACK, N) ->
-    {integer_to_list(N), ?WHITE};
-get_vbtn_text_and_textcolor(?RED1, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?RED2, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?RED3, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?RED4, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?RED5, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?GREEN1, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?GREEN2, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?GREEN3, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?GREEN4, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(?GREEN5, N) ->
-    {integer_to_list(N), ?BLACK};
-get_vbtn_text_and_textcolor(_AnyOtherColor, N) ->
-    {integer_to_list(N), ?BLACK}.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_vbtns(ParentId, Ypos, NofRows, RowHeight, VbtnW, HbtnH) ->
-    create_vbtns(1, NofRows, RowHeight, ParentId, VbtnW, Ypos + HbtnH, []).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_vbtns(N, NofRows, _RowHeight, _ParId, _VbtnW, _Ypos, VAcc) when N > NofRows ->
-    lists:reverse(VAcc);
-create_vbtns(N, NofRows, RowHeight, ParId, VbtnW, Ypos, VAcc) ->
-    VHeight = RowHeight + 1,
-    VInfo   = create_one_vbtn(ParId, VHeight, VbtnW, Ypos, N),
-    create_vbtns(N + 1, NofRows, RowHeight, ParId, VbtnW, Ypos + VHeight,
-		 [VInfo | VAcc]).
-    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_one_vbtn(ParentId, Height, VbtnW, Ypos, N) ->
-    Id = gs:button(ParentId, [{width, VbtnW},
-			      {height, Height},
-			      {x, 0},
-			      {y, Ypos},
-			      {font, ?BTN_FONT},
-			      {bg, ?DEFAULT_BG_COLOR},
-			      {align, center},
-			      {label, {text,integer_to_list(N)}},
-			      {data, {vbtn, N, N}}      % Real row + virtual row
-			     ]),
-    #vbtn{virtual_row = N,
-	  real_row    = N,
-	  id          = Id,
-	  height      = Height,
-	  ypos        = Ypos}.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_hbtns([], _HBtnsShown, 
-	     _ResBtns, _VirtualColNo, _FrId, _Ypos, _HbtnH, _ResBtnW, _VbtnW) ->
-    {[], []};
-update_hbtns(ColsShown, HBtns, 
-	     ResBtns, VirtualColNo, FrId, Ypos, HbtnH, ResBtnW, VbtnW) ->
-    update_hbtns(1, ColsShown, HBtns, ResBtns, HbtnH, ResBtnW, VbtnW, 
-		 VirtualColNo, FrId, 0, Ypos, [], []).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_hbtns(_N, [], 
-	     [], [], _HbtnH, _ResBtnW, _VbtnW, _ColNo, _FrId, _Xpos, _Ypos, HAcc, RAcc) ->
-    {lists:reverse(HAcc), lists:reverse(RAcc)};
-
-update_hbtns(N, [], [HInfo | HT], [RInfo | RT],  
-	     HbtnH, ResBtnW, VbtnW, ColNo, FrId, Xpos, Ypos, HAcc, RAcc) ->
-       % If too many buttons, i.e., if the ColsShown list 
-       % has become empty.
-    gs:destroy(HInfo#hbtn.id),
-    gs:destroy(RInfo#resbtn.id),
-    update_hbtns(N, [], HT, RT,  HbtnH, ResBtnW, VbtnW, ColNo, FrId, 
-		 Xpos, Ypos, HAcc, RAcc);
-
-update_hbtns(1, [ColW | T], [], [],  
-	     HbtnH, ResBtnW, VbtnW, ColNo, FrId, _Xpos, Ypos, HAcc, RAcc) ->
-       % The first button has to be bigger than the others.
-    {HInfo, RInfo} = create_one_hbtn_and_resbtn(FrId, ColW - 2, 
-						HbtnH, VbtnW - 1, 
-						Ypos, ResBtnW, 1, ColNo),
-    update_hbtns(2, T, [], [],  HbtnH, ResBtnW, VbtnW, ColNo + 1, 
-		 FrId, VbtnW - 1 + ColW - 2 + ResBtnW, Ypos, [HInfo | HAcc], 
-		 [RInfo | RAcc]);
-
-update_hbtns(N, [ColW | T], [], [],  
-	     HbtnH, ResBtnW, VbtnW, ColNo, FrId, Xpos, Ypos, HAcc, RAcc) ->
-    {HInfo, RInfo} = create_one_hbtn_and_resbtn(FrId, ColW - 4, 
-						HbtnH, Xpos, 
-						Ypos, ResBtnW, N, ColNo),
-    update_hbtns(N + 1, T, [], [],  HbtnH, ResBtnW, VbtnW, ColNo + 1, 
-		 FrId, Xpos + ColW - 4 + ResBtnW, Ypos, [HInfo | HAcc], 
-		 [RInfo | RAcc]);
-
-update_hbtns(1, [ColW | T], [HInfo | HT], [RInfo | RT], 
-	     HbtnH, ResBtnW, VbtnW, ColNo, FrId, _Xpos, Ypos, HAcc, RAcc) ->
-    {NewHInfo, NewRInfo} = config_one_hbtn_and_resbtn(HInfo, RInfo, 
-						      ColW - 2, 
-						      VbtnW - 1, 
-						      1, ColNo),
-    update_hbtns(2, T, HT, RT,  HbtnH, ResBtnW, VbtnW, ColNo + 1, 
-		 FrId, VbtnW - 1 + ColW - 2 + ResBtnW, Ypos, 
-		 [NewHInfo | HAcc], [NewRInfo | RAcc]);
-
-update_hbtns(N, [ColW | T], [HInfo | HT], [RInfo | RT],  
-	     HbtnH, ResBtnW, VbtnW, ColNo, FrId, Xpos, Ypos, HAcc, RAcc) ->
-    {NewHInfo, NewRInfo} = config_one_hbtn_and_resbtn(HInfo, RInfo, 
-						      ColW - 4, 
-						      Xpos, N, 
-						      ColNo),
-    update_hbtns(N + 1, T, HT, RT,  HbtnH, ResBtnW, VbtnW, ColNo + 1, 
-		 FrId, Xpos + ColW - 4 + ResBtnW, Ypos, [NewHInfo | HAcc], 
-		 [NewRInfo | RAcc]).
-
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_one_hbtn_and_resbtn(ParId, HWidth, HHeight, HXpos, Ypos, RWidth, N, ColNo) ->
-    HId = gs:button(ParId, [{width, HWidth},
-			    {height, HHeight},
-			    {x, HXpos},
-			    {y, Ypos},
-			    {font, ?BTN_FONT},
-			    {bg, ?DEFAULT_BG_COLOR},
-			    {data, {hbtn, N, ColNo}},
-			    {label, {text, integer_to_list(ColNo)}}
-			   ]),
-    RId = gs:button(ParId, [{width, RWidth},
-			    {height, HHeight},
-			    {x, HXpos + HWidth},
-			    {y, Ypos},
-			    {cursor, resize},
-			    {buttonpress, true},
-			    {buttonrelease, true},
-			    {data, {resbtn, N, ColNo, (HXpos + HWidth + RWidth div 2)}},
-			    {bg, ?BLACK}
-			   ]),
-    HInfo = #hbtn{virtual_col = ColNo,
-		  real_col    = N,
-		  id          = HId,
-		  width       = HWidth,
-		  xpos        = HXpos},
-    RInfo = #resbtn{virtual_col = ColNo,
-		    real_col    = N,
-		    id          = RId,
-		    width       = RWidth,
-		    xpos        = HXpos + HWidth},
-    {HInfo, RInfo}.
-
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-config_one_hbtn_and_resbtn(HInfo, RInfo, HWidth, HXpos, N, ColNo) ->
-    gs:config(HInfo#hbtn.id, [{width, HWidth},
-			      {x, HXpos},
-			      {data, {hbtn, N, ColNo}},
-			      {label, {text, integer_to_list(ColNo)}}
-			     ]),
-    gs:config(RInfo#resbtn.id, [{x, HXpos + HWidth},
-				{data, {resbtn, N, ColNo, 
-					(HXpos + HWidth + RInfo#resbtn.width div 2)}}
-			]),
-    NewHInfo = HInfo#hbtn{virtual_col = ColNo,
-			  width       = HWidth,
-			  xpos        = HXpos},
-    NewRInfo = RInfo#resbtn{virtual_col = ColNo,
-			    xpos        = HXpos + HWidth},
-    {NewHInfo, NewRInfo}.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_keys([], [], _FirstCol, _LastCol, _HBtns, _ParentId, KeyIdsAcc) ->
-    lists:reverse(KeyIdsAcc);
-
-update_keys([], [KeyId | IdT], FirstCol, LastCol, HBtns, ParentId, KeyIdsAcc) ->
-    gs:config(KeyId, [{x, 1200}]),
-    update_keys([], IdT, FirstCol, LastCol, HBtns, ParentId, 
-		[KeyId | KeyIdsAcc]);
-
-update_keys([KeyNo | KT], [], FirstCol, LastCol, 
-	    HBtns,ParentId,  KeyIdsAcc) when KeyNo >= FirstCol, KeyNo =< LastCol ->
-    {_Width, Xpos} = get_keywidth_and_pos(KeyNo, FirstCol, HBtns),
-    NewKeyId = create_key(ParentId, Xpos, 1),
-    update_keys(KT, [], FirstCol, LastCol, HBtns, ParentId, 
-		[NewKeyId | KeyIdsAcc]);
-
-update_keys([_KeyNo | KT], [], FirstCol, LastCol, HBtns, ParentId, KeyIdsAcc) ->
-    update_keys(KT, [], FirstCol, LastCol, HBtns, ParentId, 
-		KeyIdsAcc);
-
-update_keys([KeyNo | KT], [KeyId | IdT], FirstCol, LastCol, 
-	    HBtns, ParentId, KeyIdsAcc) when KeyNo >= FirstCol, KeyNo =< LastCol ->
-    {Width, Xpos} = get_keywidth_and_pos(KeyNo, FirstCol, HBtns),
-    gs:config(KeyId, [{width, Width},
-		      {x, Xpos}
-		     ]),
-    update_keys(KT, IdT, FirstCol, LastCol, HBtns, ParentId, 
-		[KeyId | KeyIdsAcc]);
-
-update_keys([_KeyNo | KT], 
-	    [KeyId | IdT], FirstCol, LastCol, HBtns, ParentId, KeyIdsAcc) ->
-    update_keys(KT, [KeyId | IdT], FirstCol, LastCol, HBtns, ParentId, 
-		KeyIdsAcc).
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_keywidth_and_pos(VirtualCol, FirstCol, HBtns) ->
-    RealColNo = VirtualCol - FirstCol + 1,
-    HBtnR = lists:nth(RealColNo, HBtns),
-    #hbtn{width = Width,
-	  xpos  = Xpos}  = HBtnR,
-    KeyWidth = 10,
-       % Compute the x position for the key!
-    KeyXpos = (Xpos + (Width div 2) - (KeyWidth div 2)),
-    {KeyWidth, KeyXpos}.
-    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_key(ParentId, Xpos, Ypos) ->
-    PicDir = code:priv_dir(tv),
-    C = gs:canvas(ParentId, [{width, 10},
-			     {height, 18},
-			     {x, Xpos},
-			     {y, Ypos},
-			     {bg, ?DEFAULT_BG_COLOR}
-			    ]),
-    gs:create(image, C, [{bitmap, PicDir ++ "/key.xbm"}]),
-    C.
-
-
-
-
-
-
-
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_pb_int_def.hrl b/lib/tv/src/tv_pb_int_def.hrl
deleted file mode 100644
index 0fe9df193a..0000000000
--- a/lib/tv/src/tv_pb_int_def.hrl
+++ /dev/null
@@ -1,99 +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%
-
--define(WHITE, {255,255,255}).
-
--define(DEFAULT_BG_COLOR, {217,217,217}).
-
--define(COL_MARK_COLOR, {0, 0, 0}).
--define(SORT_MARK_COLOR, {255,215,0}).
-
--define(BLINK_COLOR1, {255,0,0}).
--define(BLINK_COLOR2, {0,255,0}).
--define(BLINK_COLOR3, {0,0,0}).
--define(BTN_FONT, {courier,12}).
-
-
-
-
--record(col_mark_params, {col_btn_id,
-			  virtual_col_marked,
-			  sort_btn_id,
-			  virtual_sort_col
-			 }).
-
-
-
--record(row_mark_params, {virtual_row_marked,
-			  real_row_marked
-			 }).
-
-
-
-
--record(process_variables, {parent_pid,
-			    grid_frame_id,
-			    grid_frame_width,
-			    grid_frame_height,
-			    ypos,
-			    hbtn_height,
-			    vbtn_width,
-			    resbtn_width,
-			    first_col_shown,
-			    hbtns_shown      = [],
-			    vbtns_shown      = [],
-			    resbtns_shown    = [],
-			    cols_shown       = [],
-			    key_numbers      = [],
-			    key_ids          = [],
-			    blink_color_list = [?BLINK_COLOR1, 
-						?BLINK_COLOR2, 
-						?BLINK_COLOR3],
-			    col_mark_params  = #col_mark_params{},
-			    row_mark_params  = #row_mark_params{}
-			   }).
-
-
-
--record(hbtn, {virtual_col,
-	       real_col,
-	       id,
-	       width,
-	       xpos
-	      }).
-
-
-
--record(resbtn, {virtual_col,
-		 real_col,
-		 id,
-		 width,
-		 xpos
-		}).
-
-
-
--record(vbtn, {virtual_row,
-	       real_row,
-	       id,
-	       height,
-	       ypos
-	      }).
-
-
-
diff --git a/lib/tv/src/tv_pc.erl b/lib/tv/src/tv_pc.erl
deleted file mode 100644
index e0612e13eb..0000000000
--- a/lib/tv/src/tv_pc.erl
+++ /dev/null
@@ -1,795 +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:      pc part of the table tool, i.e., the process 
-%%%                     controlling all other processes, and managing
-%%%                     the actions to take.
-%%%
-%%%*********************************************************************
-
-
--module(tv_pc).
--compile([{nowarn_deprecated_function,{gs,config,2}}]).
-
-
-
--export([pc/7,
-	 send_data/2
-	]).
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_pc_int_def.hrl").
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-%%======================================================================
-%% Function:      pc.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Process controlling the processes 'pd', 'pw', 'dbs' and 'etsread'.
-%%                After necessary initialisations, an eternal loop is
-%%                entered, where window created messages are received and 
-%%                handled, as well as user input.
-%%
-%% Parameters:    
-%%======================================================================
-
-
-pc(Master, Node, LocalNode, TableId, KindOfTable, TableName, ErrMsgMode) ->
-    process_flag(trap_exit, true),
-    put(error_msg_mode, ErrMsgMode),
-    ProcVars = prepare_and_open_table(Node, LocalNode, TableId, KindOfTable, TableName, 
-				false, #process_variables{parent_pid=Master}),
-    loop(ProcVars).
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-prepare_and_open_table(Node, LocalNode, TabId, TabType, TabName, Raise, ProcVars) ->
-    IpPid      = spawn(tv_ip, ip, [self()]),
-    show_progress(IpPid, 5, "Initializing graphics..."),
-
-    TmpProcVars = start_procs(IpPid, ProcVars),
-
-    show_progress(IpPid, 5, "Loading table..."),
-    NewProcVars = ?MENU_FUNC_FILE:open_table(Node, LocalNode, TabId, TabType, TabName, 
-					     Raise, TmpProcVars),
-
-    IpPid ! #ip_quit{sender = self()},
-       % Now make window visible!
-    WinP = NewProcVars#process_variables.window_params,
-    gs:config(WinP#window_params.window_id, [{map, true}]),
-    NewProcVars.
-
-
-
-
-
-start_procs(IpPid, ProcVars) ->
-    ErrorMsgMode = get(error_msg_mode),
-    PwPid        = spawn_link(tv_pw, pw, [self()]),
-    PdPid        = spawn_link(tv_pd, pd, [self(), ErrorMsgMode]),
-    DbsPid       = spawn_link(tv_db, dbs, [self(), ErrorMsgMode]),
-    EtsreadPid   = spawn_link(tv_etsread, etsread, [self(), ErrorMsgMode]),
-
-    show_progress(IpPid, 5, "Initializing graphics..."),
-    NewWinP = init_pw(PwPid, ProcVars),
-
-    show_progress(IpPid, 5, "Initializing graphics..."),
-    init_pd(PdPid, NewWinP),
-    ProcVars#process_variables{pw_pid        = PwPid,
-			       pd_pid        = PdPid,
-			       dbs_pid       = DbsPid,
-			       etsread_pid   = EtsreadPid,
-			       current_node  = node(),  %% Will be replaced, when table opened.
-			       local_node    = true,
-			       window_params = NewWinP
-			       }.
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-show_progress(IpPid, NofElements, Text) ->
-    IpPid ! #ip_update{sender               = self(),
-		       nof_elements_to_mark = NofElements,
-		       text                 = Text
-		      }.
-
-    
-
-
-
-
-
-%%======================================================================
-%% Function:      loop.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Eternal (well, almost) loop, receiving messages and 
-%%                handling them.
-%%
-%% Parameters:    None.
-%%======================================================================
-
-
-loop(ProcVars) ->
-    receive
-	Msg ->
-	    case Msg of 
-
-                   % Normal messages!
-		#dbs_subset{} ->
-		    NewProcVars1 = send_data(Msg, ProcVars),
-		    NewProcVars2 = check_time_to_poll_table(Msg, NewProcVars1),
-		    loop(NewProcVars2);
-
-		#pc_poll_table{} ->
-		    TmpProcVars  = check_node(ProcVars),
-		    NewProcVars = ?MENU_FUNC_FILE:poll_table(TmpProcVars),
-		    loop(NewProcVars);
-
-		#pc_search_req{} ->
-		    DbsPid = ProcVars#process_variables.dbs_pid,
-		    DbsPid ! #dbs_search_req{sender=self()},
-		    loop(ProcVars);
-
-		#pc_set_sorting_mode{} ->
-		    set_sorting_mode(Msg, ProcVars),
-		    loop(ProcVars);
-
-
-                #pc_data_req{element = Pos, nof_elements = Length} ->
-		    DbsPid = ProcVars#process_variables.dbs_pid,
-		    DbsPid ! #dbs_subset_req{sender           = self(), 
-					     subset_pos       = Pos,
-					     subset_length    = Length
-					    },
-                    loop(ProcVars);
-
-
-		#pc_marked_row{row_no=RowNo, object=Obj, color=Color} ->
-		    DbsPid = ProcVars#process_variables.dbs_pid,
-		    DbsPid ! #dbs_marked_row{sender = self(),
-					     row_no = RowNo
-					    },
-		    NewProcVars = ProcVars#process_variables{marked_row    = RowNo,
-							     marked_object = Obj,
-							     marked_color  = Color},
-		    loop(NewProcVars);
-		
-
-                #pc_menu_msg{} ->
-                    Fcn = Msg#pc_menu_msg.data,
-                    NewProcVars = ?MENU_FUNC_FILE:Fcn(ProcVars),
-                    loop(NewProcVars);
- 
-
-		#pd_updated_object{object=Obj,old_object=OldObj,old_color=Color,obj_no=ObjNo} ->
-		    DbsPid = ProcVars#process_variables.dbs_pid,
-		    DbsPid ! #dbs_updated_object{sender     = self(),
-						 object     = Obj,
-						 old_object = OldObj,
-						 old_color  = Color,
-						 obj_no     = ObjNo},
-		    loop(ProcVars);
-
-
-		#pd_new_object{object=Obj} ->
-		    DbsPid = ProcVars#process_variables.dbs_pid,
-		    DbsPid ! #dbs_new_object{sender     = self(),
-					     object     = Obj},
-		    loop(ProcVars);
-
-
-		#pc_show_table_info{} ->
-		    NewProcVars = ?MENU_FUNC_FILE:table_info(ProcVars),
-		    loop(NewProcVars);
-
-                #pc_win_conf{} ->
-                    NewProcVars = ?GRAPH_FUNC_FILE:win_conf(Msg, ProcVars),
-                    loop(NewProcVars);
-		
-		#pc_help{} ->
-		    NewProcVars = ?MENU_FUNC_FILE:help_button(ProcVars),
-		    loop(NewProcVars);
-
-		#pc_dead_table{automatic_polling = AutoPoll} ->
-		    WinP  = ProcVars#process_variables.window_params,
-		    WinId = WinP#window_params.window_id,
-		    gs:config(WinId, [beep]),
-		    case get(error_msg_mode) of
-			normal ->
-			    tv_utils:notify(WinId, "TV Notification", 
-					    ["The table no longer exists!"]);
-			haiku ->
-			    ErrMsg1 = ["A table that big?",
-				       "It might be very useful.",
-				       "But now it is gone."],
-			    tv_utils:notify(WinId, "TV Notification", ErrMsg1)
-		    end,
-		    NewProcVars =
-			case AutoPoll of
-			    true ->
-				gs:config(WinId, [beep]),
-				case get(error_msg_mode) of
-				    normal ->
-					tv_utils:notify(WinId, "TV Notification",
-							["The automatic polling is turned off!"]);
-				    haiku ->
-					ErrMsg2 = ["Previously on",
-						  "The polling is now idled.",
-						  "That's the way it is."],
-					tv_utils:notify(WinId, "TV Notification", ErrMsg2)
-				end,
-				ProcVars#process_variables{poll_interval = infinity};
-			    false ->
-				ProcVars
-			end,
-		    loop(NewProcVars);
-
-		#pc_nodedown{automatic_polling = AutoPoll} ->
-		    WinP = ProcVars#process_variables.window_params,
-		    WinId = WinP#window_params.window_id,
-		    gs:config(WinId, [beep]),
-		    case get(error_msg_mode) of
-			normal ->
-			    tv_utils:notify(WinId, "TV Notification", 
-					    ["The node is down, and the",
-					     "table cannot be reached."]);
-			haiku ->
-			    ErrMsg1 = ["With searching comes loss",
-				       "And the presence of absence:",
-				       "Node is down."],
-			    tv_utils:notify(WinId, "TV Notification", ErrMsg1)
-		    end,
-		    NewProcVars = 
-			case AutoPoll of
-			    true ->
-				gs:config(WinId, [beep]),
-				case get(error_msg_mode) of
-				    normal ->
-					tv_utils:notify(WinId, "TV Notification",
-							["The automatic polling is turned off!"]);
-				    haiku ->
-					ErrMsg = ["Previously on,",
-						  "The polling is now idled.",
-						  "That's the way it is."],
-					tv_utils:notify(WinId, "TV Notification", ErrMsg)
-				end,
-				ProcVars#process_variables{poll_interval = infinity};
-			    false ->
-				ProcVars
-			end,
-		    loop(NewProcVars);
-		    
-
-		{pc_edit_object, _Sender} ->
-		    NewProcVars = ?MENU_FUNC_FILE:insert_object(ProcVars),
-		    loop(NewProcVars);
-		    
-
-		check_node ->
-		    NewProcVars  = check_node(ProcVars),
-		    loop(NewProcVars);
-
-
-		raise ->
-		    WinP = ProcVars#process_variables.window_params,
-		    gs:config(WinP#window_params.window_id, [raise]),
-		    loop(ProcVars);
-
-
-		{error_msg_mode, Mode} ->
-		    ProcVars#process_variables.dbs_pid ! {error_msg_mode, Mode},
-		    ProcVars#process_variables.etsread_pid ! {error_msg_mode, Mode},
-		    ProcVars#process_variables.pd_pid ! {error_msg_mode, Mode},
-		    put(error_msg_mode, Mode),
-		    loop(ProcVars);
-
-		   % Exit messages!
-		{'EXIT', Sender, Reason} ->
-		    exit_signals({Sender, Reason}, ProcVars);
-		
-
-		_Other ->
-		    loop(ProcVars)
-
-	    end
-    end.
-	
-
-
-
-
-
-check_node(ProcVars) ->
-    #process_variables{pw_pid       = PwPid,
-		       current_node = OldCurrNode,
-		       local_node   = LocalNode,
-		       table_id     = TableId,
-		       table_type   = TableType,
-		       table_name   = TableName}  = ProcVars,
-
-    HomeNode = node(),
-    case net_adm:ping(OldCurrNode) of
-	pong ->
-	    ProcVars;
-	pang when not LocalNode ->
-	    ProcVars;
-	pang when LocalNode ->
-	    %% XXX [siri] Will this ever happen? I thought local_node
-	    %% indicated if current_node was the node where tv was
-	    %% started. If so, we are pinging ourselves here, and
-	    %% a pang can never happen??
-	    WinTitle = ?MENU_FUNC_FILE:get_window_title(TableType,HomeNode,TableId,TableName),
-	    PwPid ! #pw_set_window_title{sender = self(),
-					 win_title = WinTitle},
-	    ProcVars#process_variables{current_node = HomeNode}
-    end.
-
-
-
-
-
-
-
-send_data(Msg, ProcVars) ->
-    #process_variables{pd_pid           = PdPid,
-		       parent_pid       = ParentPid,
-		       table_id         = Table,
-		       table_type       = Type,
-		       current_node     = Node}  = ProcVars,
-    
-    ParentPid ! {tv_update_infowin, Table, Node, Type},
-
-    #dbs_subset{data                  = DbData,
-		subset_pos            = ScalePos,
-		db_length             = DbLength,
-		list_of_keys          = ListOfKeys,
-		max_elem_size         = MaxElemSize, 
-		requested_row         = ReqRowData}  = Msg,
-
-    Range = case ScalePos of
-		0 ->
-		    {0, 0};
-		_Other ->
-		    {1, DbLength}
-	    end,
-
-    PdPid ! #pc_data{sender           = self(),
-		     scale_pos        = ScalePos, 
-		     scale_range      = Range, 
-		     elementlist      = DbData,
-		     list_of_keys     = ListOfKeys,
-		     max_elem_size    = MaxElemSize,
-		     marked_row       = ReqRowData
-		    },
-    
-    {MarkedObject, MarkedColor} =
-	case ReqRowData of
-	    [] ->
-		{undefined, undefined};
-	    [Data] ->
-		Data
-	end,
-    ProcVars#process_variables{marked_object = MarkedObject,
-			       marked_color  = MarkedColor}.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-set_sorting_mode(Msg, ProcVars) ->
-    #pc_set_sorting_mode{sorting     = Sorting,
-			 reverse     = Reverse,
-			 sort_key_no = SortKeyNo} = Msg,
-
-    DbsPid       = ProcVars#process_variables.dbs_pid,
-    PdPid        = ProcVars#process_variables.pd_pid,
-    PwPid        = ProcVars#process_variables.pw_pid,
-    TableType    = ProcVars#process_variables.table_type,
-
-    NewSortKeyNo = 
-	case SortKeyNo of 
-	    undefined ->
-		if
-		    TableType =:= mnesia ->
-			2;
-		    true ->
-			1
-		end;
-	    _Other ->
-		SortKeyNo
-	end,
-    
-    Menu = 
-	case Sorting of
-	    true ->
-		case Reverse of 
-		    true ->
-			sort_falling_order;
-		    false ->
-			sort_rising_order
-		end;
-	    false ->
-		no_sorting
-	end,
-
-    PwPid ! #pw_select_menu{sender = self(),
-			    menu   = Menu},
-    
-    DbsPid ! #dbs_sorting_mode{sender      = self(),
-			       sorting     = Sorting,
-			       reverse     = Reverse,
-			       sort_key_no = NewSortKeyNo
-			      },
-
-    PdPid ! #pc_set_sorting_mode_cfm{sender = self(),
-				     sort_key_no = NewSortKeyNo
-				    }.
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      init_pw.
-%%
-%% Return Value:  Tuple containing the Pid of the pw process, and the id of 
-%%                the window created by the pw process.
-%%
-%% Description:   Starts the pw process, and orders it to create a window.
-%%                (The size of the window may be given as option.)
-%%
-%% Parameters:    None.
-%%======================================================================
-
-
-
-init_pw(PwPid, ProcVars) ->
-    #process_variables{window_params = WinP}  = ProcVars,
-
-       % Now deblock pw, and order it to create a window!
-    PwPid ! #pw_deblock{sender         = self(),
-			win_title      = ?APPLICATION_NAME,
-			win_width      = ?DEFAULT_WINDOW_WIDTH,
-			win_height     = ?DEFAULT_WINDOW_HEIGHT,
-			min_win_width  = ?DEFAULT_MIN_WINDOW_WIDTH,
-			min_win_height = ?DEFAULT_MIN_WINDOW_HEIGHT
-		       },
-    
-
-    receive
-	#pw_deblock_cfm{win_id = WindowId} ->
-	    ?MENU_FUNC_FILE:create_menus(PwPid),
-	    
-	       % Store the window id as well as the size of it.
-	    WinP#window_params{window_id     = WindowId,
-			       window_width  = ?DEFAULT_WINDOW_WIDTH,
-			       window_height = ?DEFAULT_WINDOW_HEIGHT
-			      }
-
-    
-    after 180000 ->      % A timeout of 1000 ms is too short, at least the first
-	                % time the system is started!
-	    exit(error)
-    end.
-	    
-		    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-init_pd(PdPid, WinP) ->
-    #window_params{window_id     = WindowId,
-		   window_width  = WindowWidth,
-		   window_height = WindowHeight} = WinP,
-    
-       % Now deblock pd, and order it to create a canvas and a scale!
-    PdPid ! #pd_deblock{sender      = self(),
-			 win        = WindowId,
-			 win_width  = WindowWidth,
-			 win_height = WindowHeight,
-			 scale      = true
-			},
-
-    receive
-	#pd_deblock_cfm{} ->
-	    done
-    after 180000 ->
-	    exit(error)
-    end.
-	    
-		    
-
-
-    
-
-
-
-
-
-%%======================================================================
-%% Function:      exit_signals.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Decides, given an error message, action to take, i.e., whether
-%%                operation shall procede, any process shall be restarted, or
-%%                the table tool terminated.
-%%
-%% Parameters:    Exit_info:  tuple containing sender of the error message, and the 
-%%                reason.
-%%======================================================================
-
-
-exit_signals(ExitInfo, ProcVars) ->
-    #process_variables{parent_pid   = ParentPid, 
-		       pd_pid       = PdPid,
-		       pw_pid       = PwPid,
-		       dbs_pid      = DbsPid,
-		       etsread_pid  = EtsreadPid,
-		       table_id     = TabId,
-		       table_type   = TabType,
-		       table_name   = TabName,
-		       current_node = Node,
-		       local_node   = LocalNode
-		      } = ProcVars,
-
-    case ExitInfo of
-	{ParentPid, Reason} ->
-	    exit(Reason);
-
-        {PwPid, normal} ->
-            exit(normal);
-
-	{PwPid, error} ->
-	    io:format("Internal error... restarting. ~n"),
-	    kill_procs(normal, [PdPid, EtsreadPid, DbsPid]),
-	    NewProcVars = pc(ParentPid, Node, LocalNode, TabId, TabType, TabName, 
-			     get(error_msg_mode)),
-	    loop(NewProcVars);	    
-
-	{PdPid, _Reason} ->
-	    io:format("Internal error... restarting. ~n"),
-	    kill_procs(normal, [PwPid, EtsreadPid, DbsPid]),
-	    NewProcVars = pc(ParentPid, Node, LocalNode, TabId, TabType, TabName, 
-			     get(error_msg_mode)),
-	    loop(NewProcVars);
-	
-	{DbsPid, _Reason} ->
-	    io:format("Internal error... restarting. ~n"),
-	    kill_procs(normal, [PdPid, PwPid, EtsreadPid]),
-	    NewProcVars = pc(ParentPid, Node, LocalNode, TabId, TabType, TabName, 
-			     get(error_msg_mode)),
-	    loop(NewProcVars);
-	
-	{EtsreadPid, _Reason} ->
-	    io:format("Internal error... restarting. ~n"),
-	    kill_procs(normal, [PdPid, PwPid, DbsPid]),
-	    NewProcVars = pc(ParentPid, Node, LocalNode, TabId, TabType, TabName, 
-			     get(error_msg_mode)),
-	    loop(NewProcVars);
-	
-        {_Sender, _OtherReason} ->
-	    loop(ProcVars)
-    end.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-kill_procs(_Status, []) ->
-    done;
-kill_procs(Status, [Pid | Tail]) ->
-    exit(Pid, Status),
-    kill_procs(Status, Tail).
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-check_time_to_poll_table(Msg, ProcVars) ->
-    #dbs_subset{required_time_etsread = EtsreadTime,
-		required_time_dbs     = DbsTime}  = Msg,
-
-    UserSetPollInterval = ProcVars#process_variables.poll_interval,
-    WinP                = ProcVars#process_variables.window_params,
-    WinId               = WinP#window_params.window_id,
-    
-    case too_short_pollinterval_chosen(UserSetPollInterval, EtsreadTime, DbsTime) of
-	true ->
-	    EtsreadPid   = ProcVars#process_variables.etsread_pid,
-	    EtsreadPid ! #etsread_set_poll_interval{sender   = self(),
-						    interval = infinity},
-	    
-	    TimeRequired = trunc(max_time_required(EtsreadTime, DbsTime) / 10 + 0.5) * 10 + 20,
-	    
-	    gs:config(WinId, [beep]),
-	    case get(error_msg_mode) of
-		normal ->
-		    tv_utils:notify(WinId, "TV Notification", 
-				    ["The current poll interval is too short!"]),
-		    Str = "to " ++ lists:flatten(io_lib:write(TimeRequired)) ++ " seconds!",
-		    tv_utils:notify(WinId, "TV Notification", ["Setting the poll interval", Str]);
-		haiku ->
-		    ErrMsg = ["Being way too short",
-			      "The interval of polling",
-			      "Is simply increased."],
-		    tv_utils:notify(WinId, "TV Notification", ErrMsg)		    
-	    end,
-	    clear_message_buffer(),
-	    EtsreadPid ! #etsread_set_poll_interval{sender   = self(),
-						    interval = TimeRequired},
-	    
-	    ProcVars#process_variables{poll_interval = TimeRequired};
-	false ->
-	    ProcVars
-    end.
-
-
-
-
-
-
-clear_message_buffer() ->
-    receive 
-	#dbs_subset{} ->
-	    clear_message_buffer()
-    after 100 ->
-	    done
-    end.
-
-
-
-
-
-max_time_required(T1, T2) when is_number(T1), is_number(T2) ->
-    if
-	T1 > T2 ->
-	    T1;
-	true ->
-	    T2
-    end;
-max_time_required(T1, _T2) when is_number(T1) ->
-    T1;
-max_time_required(_T1, T2) ->
-    T2.
-    
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-too_short_pollinterval_chosen(infinity, _EtsreadTime, _DbsTime) ->
-    false;
-too_short_pollinterval_chosen(undefined, _EtsreadTime, _DbsTime) ->
-    false;
-too_short_pollinterval_chosen(PollInt, EtsreadTime, _DbsTime) when EtsreadTime >= PollInt, is_number(EtsreadTime) ->
-    true;
-too_short_pollinterval_chosen(PollInt, _EtsreadTime, DbsTime) when DbsTime >= PollInt, is_number(DbsTime) ->
-    true;
-too_short_pollinterval_chosen(_PollInt, _EtsreadTime, _DbsTime) ->
-    false.
diff --git a/lib/tv/src/tv_pc_graph_ctrl.erl b/lib/tv/src/tv_pc_graph_ctrl.erl
deleted file mode 100644
index 3fc3ded565..0000000000
--- a/lib/tv/src/tv_pc_graph_ctrl.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(tv_pc_graph_ctrl).
-
-
-
--export([create_menu/4, win_conf/2]).
-
-
--include("tv_int_msg.hrl").
--include("tv_pc_int_def.hrl").
-
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_menu(PwPid, MenuTitle, TitleAccPos, MenuList) ->
-    PwPid ! #pw_create_menu{sender        = self(),
-			    menutitle     = MenuTitle,
-			    title_acc_pos = TitleAccPos,
-			    menulist      = MenuList
-			   },
-    receive 
-	#pw_create_menu_cfm{} ->
-	    done
-    after 10000 ->
-	    exit(error)
-    end.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      win_conf.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Configures all objects in the window according to new coordinates.
-%%
-%% Parameters:    
-%%======================================================================
-
-
-win_conf(Msg, ProcVars) ->
-    #pc_win_conf{width  = NewWidth, 
-		 height = NewHeight}  = Msg,
-
-    #process_variables{pd_pid        = PdPid,
-		       window_params = WinP}  = ProcVars,
-    
-    #window_params{window_width  = OldWindowWidth,
-		   window_height = OldWindowHeight}  = WinP,
-		   
-
-    case {NewWidth, NewHeight} of
-	{OldWindowWidth, OldWindowHeight} ->
-	    ProcVars;
-	_Other ->
-	    PdPid ! #pd_win_conf{sender = self(),
-				 width  = NewWidth,
-				 height = NewHeight
-				},
-	    NewWinP = WinP#window_params{window_width  = NewWidth,
-					 window_height = NewHeight},
-	    
-	    ProcVars#process_variables{window_params = NewWinP}
-    end.
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_pc_int_def.hrl b/lib/tv/src/tv_pc_int_def.hrl
deleted file mode 100644
index 22f8dcd5d8..0000000000
--- a/lib/tv/src/tv_pc_int_def.hrl
+++ /dev/null
@@ -1,62 +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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      Include file for the pc parts of the table tool.
-%%%
-%%%*********************************************************************
-
-
--define(HEAD_FILE, pc).
--define(GRAPH_FUNC_FILE, tv_pc_graph_ctrl).
--define(MENU_FUNC_FILE, tv_pc_menu_handling).
-
-
-
--define(APPLICATION_NAME, "Table Visualizer").
--define(DEFAULT_WINDOW_WIDTH, 750).
--define(DEFAULT_WINDOW_HEIGHT, 600).
--define(DEFAULT_MIN_WINDOW_WIDTH, 300).
--define(DEFAULT_MIN_WINDOW_HEIGHT, 250).
-
-
--record(window_params, {window_id,
-			window_width,
-			window_height
-			}).
-
-
-		 
--record(process_variables, {parent_pid,
-			    pw_pid,
-			    pd_pid,
-			    dbs_pid,
-			    etsread_pid,
-			    current_node,
-			    local_node,
-			    table_id      = undefined,
-			    table_type    = ets,
-			    table_name,
-			    table_protection,
-			    marked_row,
-			    marked_object,
-			    marked_color,
-			    lists_as_strings = true,
-			    poll_interval = infinity,   % seconds or 'infinity'
-			    window_params = #window_params{}
-			   }).
diff --git a/lib/tv/src/tv_pc_menu_handling.erl b/lib/tv/src/tv_pc_menu_handling.erl
deleted file mode 100644
index 64a06743b7..0000000000
--- a/lib/tv/src/tv_pc_menu_handling.erl
+++ /dev/null
@@ -1,489 +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:      Part of pc handling the creation of menus, as well as 
-%%%                     treating the signals these menus results in, 
-%%%                     when chosen.
-%%%
-%%%*********************************************************************
-
-
--module(tv_pc_menu_handling).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([create_menus/1, 
-	 exit_button/1, 
-	 insert_object/1,
-	 delete_object/1,
-	 search_object/1,
-	 open_table/7, 
-	 set_poll_interval/1, 
-	 poll_table/1, 
-	 sort_rising_order/1, 
-	 sort_falling_order/1, 
-	 no_sorting/1,
-	 lists_as_strings/1,
-	 lists_as_lists/1,
-	 table_info/1, 
-	 help_button/1,
-	 otp_help_button/1,
-	 get_window_title/4]).
-
-
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_pc_int_def.hrl").
-
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-%%    Shortcuts currently used, in alphabetical order:
-%% 
-%%    c  ->  "Exit"
-%%    d  ->  "Delete Object"
-%%    f  ->  "Sort Falling Order"
-%%    h  ->  "Help"
-%%    i  ->  "Table Info"
-%%    n  ->  "No Sorting"
-%%    o  ->  "Edit Object"
-%%    p  ->  "Poll Table"
-%%    r  ->  "Sort Rising Order"
-%%    s  ->  "Search Object"
-%%    v  ->  "Set Poll Interval"
-%%    x  ->  "Exit"
-
-
-create_menus(PwPid) ->
-       %% Due to a bug (or some other reason), only one of the radiobuttons belonging
-       %% to a specified group can be selected, even if different processes have created
-       %% the radiobuttons! This means that, if we have started more than one tv_main 
-       %% process, selecting one radiobutton will affect the radiobuttons in the other 
-       %% tv_main process(es)!!! Since this is a highly undesirable bahaviour, we have to 
-       %% create unique group names (i.e., atoms). 
-       %% (We need to group the radiobuttons, since otherwise all created by one process
-       %% belongs to the same group, which also is undesirable...)
-    SelfStr   = pid_to_list(self()),
-    SortGroup = list_to_atom("sorting" ++ SelfStr),
-    ListGroup = list_to_atom("lists" ++ SelfStr),
-
-       % Order pw to create the 'File' menu.
-    ?GRAPH_FUNC_FILE:create_menu(PwPid,
-				 " File ", 
-				 1,
-				 [{" Table Info ", normal, table_info, 7, i},
-				  separator,
-				  {" Close ", normal, exit_button, 1, c}
-				 ]),
-    ?GRAPH_FUNC_FILE:create_menu(PwPid,
-				 " Edit ", 
-				 1,
-				 [{" Edit Object... ", normal, insert_object, 1, o},
-				  {" Delete Object ", normal, delete_object, 1, d}
-				 ]),
-    ?GRAPH_FUNC_FILE:create_menu(PwPid,
-				 " View ", 
-				 1,
-				 [{" Lists as Lists ",{radio,false,ListGroup},lists_as_lists,10,no_char},
-				  {" Lists as Strings ",{radio,true,ListGroup},lists_as_strings,10,no_char}
-				 ]),
-       % Order pw to create the 'Options' menu.
-    ?GRAPH_FUNC_FILE:create_menu(PwPid,
-				 " Options ", 
-				 1,
-				 [{" Poll Table ", normal, poll_table, 1, p},
-				  {" Poll Interval... ",normal,set_poll_interval,6,no_char},
-				  separator,
-				  {" Search Object ", normal, search_object, 1, s},
-				  separator,
-				  {" Sort Ascending Order ",{radio,false,SortGroup},sort_rising_order,6,no_char},
-				  {" Sort Descending Order ",{radio,false,SortGroup},sort_falling_order,6,no_char},	
-				  {" No Sorting ",{radio,true,SortGroup},no_sorting,1,no_char}
-				 ]).
-    
-    
-    
-
-
-exit_button(_ProcVars) ->
-    exit(normal).
-
-
-
-help_button(ProcVars) ->
-    WinP = ProcVars#process_variables.window_params,
-    HelpFile = filename:join([code:lib_dir(tv), "doc", "html", "index.html"]),
-    tool_utils:open_help(WinP#window_params.window_id, HelpFile),
-    ProcVars.
-
-
-
-
-otp_help_button(ProcVars) ->
-    WinP = ProcVars#process_variables.window_params,
-    IndexFile = filename:join([code:root_dir(), "doc", "index.html"]),
-    
-    tool_utils:open_help(WinP#window_params.window_id, IndexFile),
-    ProcVars.
-
-
-
-
-table_info(ProcVars) ->
-    #process_variables{table_id     = TableId, 
-		       current_node = Node,
-		       local_node   = LocalNode,
-		       table_type   = Type,
-		       parent_pid   = ParentPid} = ProcVars,
-    
-    case TableId of 
-	undefined ->
-	    done;
-	_OtherValue ->
-	    ParentPid ! {tv_start_infowin, TableId, Node, LocalNode, Type}
-    end,
-    ProcVars.
-
-
-
-sort_rising_order(ProcVars) ->
-    request_sort_settings(ProcVars#process_variables.pd_pid, true, false), 
-    ProcVars.
-    
-
-sort_falling_order(ProcVars) ->
-    request_sort_settings(ProcVars#process_variables.pd_pid, true, true), 
-    ProcVars.
-
-
-no_sorting(ProcVars) ->
-    request_sort_settings(ProcVars#process_variables.pd_pid, false, false), 
-    ProcVars.    
-
-
-set_poll_interval(ProcVars) ->
-    #process_variables{etsread_pid   = EtsreadPid,
-		       poll_interval = PollInterval}  = ProcVars,
-    
-    case tv_poll_dialog:start(PollInterval) of
-	cancel ->
-	    ProcVars;
-	NewPollInterval ->
-	    EtsreadPid ! #etsread_set_poll_interval{sender   = self(),
-						    interval = NewPollInterval},
-	    ProcVars#process_variables{poll_interval = NewPollInterval}
-    end.
-	    
-	    
-    
-poll_table(ProcVars) ->
-    EtsreadPid = ProcVars#process_variables.etsread_pid,
-    EtsreadPid ! #etsread_poll_table{sender = self()},
-    ProcVars.
-    
-    
-search_object(ProcVars) ->
-    DbsPid = ProcVars#process_variables.dbs_pid,
-    DbsPid ! #dbs_search_req{sender=self()},
-    ProcVars.
-
-
-
-lists_as_strings(ProcVars) ->
-    PdPid = ProcVars#process_variables.pd_pid,    
-    PdPid ! #pc_list_info{sender=self(), lists_as_strings=true},
-    DbsPid = ProcVars#process_variables.dbs_pid,
-    DbsPid ! #pc_list_info{sender=self(), lists_as_strings=true},
-    ProcVars#process_variables{lists_as_strings=true}.
-
-
-
-
-lists_as_lists(ProcVars) ->
-    PdPid = ProcVars#process_variables.pd_pid,
-    PdPid ! #pc_list_info{sender=self(), lists_as_strings=false},
-    DbsPid = ProcVars#process_variables.dbs_pid,
-    DbsPid ! #pc_list_info{sender=self(), lists_as_strings=false},
-    ProcVars#process_variables{lists_as_strings=false}.
-
-
-
-
-
-
-insert_object(ProcVars) ->
-    #process_variables{pd_pid           = PdPid,
-		       current_node     = Node,
-		       local_node       = LocalNode,
-		       table_type       = TabType,
-		       table_name       = TabName,
-		       table_protection = Protection,
-		       window_params    = WinP}  = ProcVars,
-
-    case Protection of
-	public ->
-	    case TabType of
-		mnesia ->
-		    case catch tv_mnesia_rpc:table_info(Node, LocalNode, TabName, attributes) of
-			nodedown ->
-			    handle_error(nodedown);
-			no_table ->
-			    handle_error(nodedown);
-			mnesia_not_started ->
-			    handle_error(mnesia_not_started);
-			{unexpected_error,Reason} ->
-			    handle_error({unexpected_error,Reason});
-			AttrList ->
-			    PdPid ! #pd_rec_edit{sender      = self(),
-						 attributes  = AttrList
-						}
-		    end;
-		ets ->
-		    PdPid ! #pd_rec_edit{sender     = self(),
-					 attributes = [tuple]
-					}
-	    end;
-	_OtherProtection ->
-	    WinId = WinP#window_params.window_id,
-	    gs:config(WinId, [beep]),
-	    ErrMsg = 
-		case get(error_msg_mode) of
-		    normal ->
-			["The table is protected and",
-			 " cannot be edited."];
-		    haiku ->
-			["The table you see",
-			 "Is cunningly protected:",
-			 "You can only watch."]
-		end,
-	    tv_utils:notify(WinId, "TV Notification", ErrMsg)		    
-    end,
-    ProcVars.
-
-
-
-
-
-
-delete_object(ProcVars) ->
-    #process_variables{dbs_pid          = DbsPid,
-		       table_protection = Protection,
-		       marked_row       = MarkedRow,
-		       marked_object    = MarkedObject,
-		       marked_color     = MarkedColor,
-		       window_params    = WinP}  = ProcVars,
-
-    case MarkedRow of
-	undefined ->
-	    done;
-	_AnyRow ->
-	    case Protection of
-		public ->
-		    DbsPid ! #dbs_delete_object{sender = self(),
-						object = MarkedObject,
-						color  = MarkedColor,
-						obj_no = MarkedRow};
-		_OtherProtection ->
-		    WinId = WinP#window_params.window_id,
-		    gs:config(WinId, [beep]),
-		    ErrMsg = 
-			case get(error_msg_mode) of
-			    normal ->
-				["The table is protected and",
-				 " cannot be edited."];
-			    haiku ->
-				["The table you see",
-				 "Is cunningly protected:",
-				 "You can only watch."]
-			end,
-		    tv_utils:notify(WinId, "TV Notification", ErrMsg)		    
-	    end
-    end,
-    ProcVars.
-
-
-
-
-
-
-open_table(CurrNode, LocalNode, TableId, TableType, TableName, Raise, ProcVars) ->
-    #process_variables{dbs_pid       = DbsPid,
-		       etsread_pid   = EtsreadPid,
-		       pw_pid        = PwPid,
-		       pd_pid        = PdPid,
-		       poll_interval = PollInterval,
-		       window_params = WinP}  = ProcVars,
-    
-    case Raise of
-	true ->
-	    gs:config(WinP#window_params.window_id, [raise]);
-	false ->
-	    done
-    end,
-
-    {Type, KeyPos, Protection} = init_etsread(EtsreadPid, DbsPid, CurrNode, LocalNode, TableId, 
-					      TableType, PollInterval),
-    WinTitle = get_window_title(TableType, CurrNode, TableId, TableName),
-    PwPid ! #pw_set_window_title{sender    = self(),
-				 win_title = WinTitle},
-    Writable = 
-	case Protection of
-	    public ->
-		true;
-	    _Other ->
-		false
-	end,
-    RecordName = 
-	case TableType of
-	    mnesia ->
-		tv_mnesia_rpc:table_info(CurrNode, LocalNode, TableId, record_name);
-	    ets ->
-		undefined
-	end,
-    PdPid ! #pd_new_table{sender      = self(),
-			  table_type  = TableType,
-			  table_name  = TableName,
-			  record_name = RecordName,
-			  writable    = Writable},
-    init_dbs(DbsPid, Type, KeyPos, EtsreadPid),
-    ProcVars#process_variables{current_node     = CurrNode,
-			       local_node       = LocalNode, 
-			       table_id         = TableId,
-			       table_type       = TableType,
-			       table_name       = TableName,
-			       table_protection = Protection}.
-
-
-
-
-
-
-get_window_title(ets, Node, TableId, TableName) ->
-    NameStr = lists:flatten(io_lib:write(TableName)),
-    TableStr   = case TableId of
-		     {TableName, _Pid} ->
-			 NameStr;
-		     TableName ->
-			 NameStr;
-		     _Other ->
-			 lists:flatten(io_lib:write(TableId)) ++ "  (" ++ NameStr ++ ")"
-		 end,
-    
-    WinTitleSuffix = "      Node:  " ++ atom_to_list(Node),
-    "ETS:  " ++ TableStr ++ WinTitleSuffix;
-get_window_title(mnesia, Node, _TableId, TableName) ->
-    TableNameStr   = lists:flatten(io_lib:write(TableName)),
-    WinTitleSuffix = "      Node:  " ++ atom_to_list(Node),
-    "Mnesia:  " ++ TableNameStr ++ WinTitleSuffix.
-
-
-
-
-%%%*********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-init_etsread(EtsreadPid, DbsPid, Node, LocalNode, TableId, TableType, PollInterval) ->
-    EtsreadPid ! #etsread_deblock{sender        = self(),
-				  dbs_pid       = DbsPid,
-				  node          = Node,
-				  local_node    = LocalNode,
-				  table_id      = TableId,
-				  table_type    = TableType, 
-				  poll_interval = PollInterval
-				 },
-    receive
-	#etsread_deblock_cfm{type=Type, keypos=KeyPos, protection=Protection} ->
-	    {Type, KeyPos, Protection}
-    after 10000 ->
-	    exit(error)
-    end.
-
-	
-
-
-init_dbs(DbsPid, Type, KeyPos, EtsreadPid) ->
-    DbsPid ! #dbs_deblock{sender         = self(),
-			  etsread_pid    = EtsreadPid,
-			  type           = Type,
-			  keypos         = KeyPos,
-			  sublist_length = ?ITEMS_TO_DISPLAY
-			 },
-    receive
-	#dbs_deblock_cfm{} ->
-	    done
-    after 10000 ->
-	    exit(error)
-    end.
-
-
-
-
-
-
-request_sort_settings(PdPid, Sorting, Reverse) ->
-    PdPid ! #pd_get_sort_settings{sender  = self(),
-				  sorting = Sorting,
-				  reverse = Reverse
-				 }.
-	    
-	
-
-
-
-
-handle_error(mnesia_not_started) ->
-    gs:window(errorwin, gs:start(), []),
-    gs:config(errorwin, [beep]),
-    case get(error_msg_mode) of
-	normal ->
-	    tv_utils:notify(errorwin, "TV Notification", ["Mnesia not started!"]);
-	haiku ->
-	    tv_utils:notify(errorwin, "TV Notification", ["Mnesia is stopped.",
-							  "We wish to reach all data",
-							  "But we never will."])
-    end,
-    gs:destroy(errorwin);
-handle_error(nodedown) ->
-    done;   %% Main process handles this!
-handle_error({unexpected_error,Cause}) ->
-    gs:window(errorwin, gs:start(), []),
-    io:format("Unexpected error:  ~p~n", [Cause]),
-    gs:config(errorwin, [beep]),
-    gs:destroy(errorwin).
-
-
diff --git a/lib/tv/src/tv_pd.erl b/lib/tv/src/tv_pd.erl
deleted file mode 100644
index 6c38148fdd..0000000000
--- a/lib/tv/src/tv_pd.erl
+++ /dev/null
@@ -1,1127 +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:      Code for pd, i.e., the data displaying part of the table 
-%%%                     tool.
-%%%
-%%%*********************************************************************
-
-
--module(tv_pd).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,destroy,1}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([pd/2]).
-
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_pd_int_def.hrl").
--include("tv_pd_int_msg.hrl").
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      pd.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Process controlling the display part of the window,
-%%                i.e., showing diagrams and handling the scale used for scrolling.
-%%
-%% Parameters:    None.
-%%======================================================================
-
-
-pd(Master, ErrMsgMode) ->
-    process_flag(trap_exit, true),
-    put(error_msg_mode, ErrMsgMode),
-    PgPid = spawn_link(tv_pg, pg, [self()]),
-    PbPid = spawn_link(tv_pb, pb, [self()]),
-
-    ProcVars = #process_variables{master_pid = Master,
-				  pg_pid     = PgPid,
-				  pb_pid     = PbPid},
-    blocked(ProcVars).
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-%%======================================================================
-%% Function:      blocked.
-%%
-%% Return Value:  None.
-%%
-%% Description:   When started or explicitly blocked, pd enters this state,
-%%                where nothing is performed until the module explicitly is 
-%%                deblocked.
-%%
-%% Parameters:    
-%%======================================================================
-
-
-blocked(ProcVars) ->
-    receive
-	Msg ->
-	    case Msg of 
-
-		#pd_deblock{} ->
-		    deblock(Msg, ProcVars);
-		
-
-		{error_msg_mode, Mode} ->
-		    put(error_msg_mode, Mode),
-		    blocked(ProcVars);
-		
-
-		_Other ->
-		    blocked(ProcVars)
-	    end
-    end.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      deblock.
-%%
-%% Return Value:  None.
-%%
-%% Description:   When deblocked, a canvas and scale shall be created according to 
-%%                specification received in pd_deblock message.
-%%
-%% Parameters:    Rec:  received pd_deblock message.
-%%======================================================================
-
-
-
-deblock(Msg, ProcVars) ->
-    #pd_deblock{win        = WindowId, 
-		win_width  = WindowWidth,
-		win_height = WindowHeight}          = Msg,
-
-    NewProcVars = ?DISP_FUNC_FILE:init_display(WindowId, WindowWidth, WindowHeight,
-					       ProcVars),
-    receive 
-
-	#pg_ready{} ->    
-	    Sender = Msg#pd_deblock.sender,
-	    Sender ! #pd_deblock_cfm{sender = self()},
-	    deblocked_loop(NewProcVars)
-
-    end.
-    
-    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      deblocked_loop.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Eternal (well, almost) loop, receiving messages and 
-%%                handling them.
-%%
-%% Parameters:    Master:  Pid to the 'pc' process.
-%%                Win:     Id of the window created.
-%%======================================================================
-
-
-
-deblocked_loop(ProcVars) ->
-    receive
-	Msg ->
-	    case Msg of
-
-		{gs, Id, Event, Data, Args} ->
-		    NewProcVars = gs_messages({Id, Event, Data, Args}, ProcVars),
-		    deblocked_loop(NewProcVars);
-
-		_Other ->
-		    NewProcVars = tv_messages(Msg, ProcVars),
-		    deblocked_loop(NewProcVars)
-	    end
-    end.
-	
-
-
-
-
-tv_messages(Msg, ProcVars) ->
-    WinId = ProcVars#process_variables.window_id,
-
-    case Msg of
-	#pg_cell_marked{} ->
-	    mark_busy(WinId),
-	    NewProcVars = handle_cell_marked(Msg, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-	#pc_data{} ->
-	    mark_busy(WinId),
-	    NewProcVars = show_data(Msg, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-	#pc_list_info{} ->
-	    handle_list_info(Msg, ProcVars);
-
-	#pb_col_marked{} ->
-	    mark_busy(WinId),
-	    NewProcVars = handle_col_marked(Msg, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-
-	#pb_row_marked{} ->
-	    mark_busy(WinId),
-	    NewProcVars = handle_row_marked(Msg, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-	#pb_new_colwidth{} ->
-	    mark_busy(WinId),
-	    NewProcVars = resize_column(Msg, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-	#pd_get_sort_settings{sorting = Sorting, reverse = Reverse} ->
-	    mark_busy(WinId),
-	    NewProcVars =
-		case send_sort_info_signal(Sorting, Reverse, ProcVars) of
-		    ignore ->
-			ProcVars;
-		    TempNewProcVars ->
-			set_sort_col(Sorting, TempNewProcVars)
-		end,
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-
-	#pd_new_table{table_type=TabType,table_name=TabName,
-		      record_name=RecName,writable=Writable} ->
-	    mark_busy(WinId),		    
-	    ToolP = ProcVars#process_variables.toolbar_params,
-	    ?DISP_FUNC_FILE:update_toolbar_label(notext, ToolP, undefined, undefined, Writable),
-	    mark_nonbusy(WinId),
-	    ProcVars#process_variables{table_type  = TabType,
-				       table_name  = TabName,
-				       record_name = RecName,
-				       writable    = Writable};
-
-	#pd_win_conf{} ->
-	    mark_busy(WinId),
-	    NewProcVars = resize_window(Msg, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-	#pd_rec_edit{} ->
-	    mark_busy(WinId),
-	    NewProcVars = open_rec_edit(Msg, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-
-
-	{updated_object, UpdObj} ->
-	    get_updated_elem2(true, UpdObj, ProcVars),
-	    ProcVars;
-	
-	{new_object, NewObj} ->
-	    get_updated_elem2(true, NewObj, ProcVars),
-	    ProcVars;
-
-	{error_msg_mode, Mode} ->
-	    put(error_msg_mode, Mode),
-	    ProcVars;
-	
-	{'EXIT', Pid, Reason} ->
-	    exit_signals({Pid, Reason}, ProcVars);
-	
-	_Other ->
-	    ProcVars
-    end.
-
-
-
-
-
-
-exit_signals(ExitInfo, ProcVars) ->
-    #process_variables{master_pid = MasterPid,
-		       pg_pid     = PgPid,
-		       pb_pid     = PbPid,
-		       rec_pid    = RecPid}  = ProcVars,
-    
-    case ExitInfo of
-	{MasterPid, _Reason} ->
-	    exit(normal);
-	{PgPid, _Reason} ->
-	    exit(normal);
-	{PbPid, _Reason} ->
-	    exit(normal);
-	{RecPid, _Reason} ->
-	    ProcVars#process_variables{rec_pid = undefined};
-	_Other ->
-	    ProcVars
-    end.
-
-
-
-
-open_rec_edit(Msg, ProcVars) ->
-    #pd_rec_edit{attributes = AttrList}  = Msg,
-    
-    #process_variables{rec_pid          = RecPid,
-		       table_type       = TabType,
-		       table_name       = TabName,
-		       record_name      = RecordName,
-		       lists_as_strings = ListsAsStr,
-		       mark_params      = MarkP}  = ProcVars,
-    
-    #mark_params{marked_object = MarkedObject}  = MarkP,
-    
-    TabOrRecName = 
-	case TabType of 
-	    mnesia ->
-		RecordName;
-	    ets ->
-		TabName
-	end,
-
-    case RecPid of
-	undefined ->
-	    NewRecPid = 
-		case MarkedObject of
-		    undefined ->
-			tv_rec_edit:start(TabType, TabOrRecName, AttrList, ListsAsStr, 
-					  get(error_msg_mode));
-		    _Other ->
-			AttrVals = 
-			    case TabType of
-				mnesia ->
-				    tl(tuple_to_list(MarkedObject));
-				ets ->
-				    [MarkedObject]
-			    end,
-			tv_rec_edit:start(TabType, TabOrRecName, AttrList, AttrVals, ListsAsStr,
-					  get(error_msg_mode))
-		end,
-	    ProcVars#process_variables{rec_pid = NewRecPid};
-	_AnyPid ->
-	    RecPid ! raise,
-	    ProcVars
-    end.
-
-
-
-
-
-
-
-gs_messages(Msg, ProcVars) ->
-    
-    case Msg of
-
-	{editentry, keypress, _Data, ['Tab' | _T]} ->
-	    gs:config(editentry, [{select, {0,100000000}}]),
-	    ProcVars;
-
-	{editentry, keypress, _Data, ['Return' | _T]} ->
-	    get_updated_elem(ProcVars),
-	    ProcVars;
-
-	{Id, enter, {toolbar, Btn, Str}, _} ->
-	    gs:config(Id, [{motion, true}]),
-	    NewProcVars = handle_toolbar_buttons(Id, Btn, Str, false, 0, 0, 
-						 ProcVars),
-	    NewProcVars;
-
-
-	{_Id, buttonpress, _Data, [3 | _Rest]} ->
-	    ProcVars;
-
-
-	{_Id, buttonpress, vscale, [MouseBtn | _Tail]} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    NewProcVars = ?DISP_FUNC_FILE:scroll_vertically(MouseBtn, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-
-	   % The order of messages from gs ought to be 
-	   %   1. 'buttonpress' 
-	   %   2. 'click'  and
-	   %   3. 'buttonrelease'
-	   % However, quite often the 'click' message comes last, meaning we have
-	   % to check for this.  :-(
-
-	{_Id, click, vscale, [NewScalePos | _Tail]} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    NewProcVars = ?DISP_FUNC_FILE:perform_vertical_scroll(NewScalePos, 
-								  ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-
-	{_Id, buttonpress, hscale, [MouseBtn | _Tail]} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    NewProcVars = ?DISP_FUNC_FILE:scroll_horizontally(MouseBtn, ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-
-	{_Id, click, hscale, [NewScalePos | _Tail]} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    NewProcVars = ?DISP_FUNC_FILE:perform_horizontal_scroll(NewScalePos, 
-								    ProcVars),
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-	
-
-	{_Id, click, {toolbar, poll_table, _Str}, _Arg} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_poll_table{sender = self()},
-	    mark_nonbusy(WinId),
-	    ProcVars;
-
-
-	{_Id, click, {toolbar, select_browser, _Str}, _Arg} ->
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_select{sender = self()},
-	    ProcVars;
-
-
-	{_Id, click, {toolbar, help_button, _Str}, _Arg} ->
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_help{sender = self()},
-	    ProcVars;
-
-
-
-	{_Id, click, {toolbar, insert_object, _Str}, _Arg} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! {pc_edit_object, self()},
-	    mark_nonbusy(WinId),
-	    ProcVars;
-
-
-	{_Id, click, {toolbar, search_object, _Str}, _Arg} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_search_req{sender = self()},
-	    mark_nonbusy(WinId),
-	    ProcVars;
-
-
-	{_Id, click, {toolbar, sort_rising_order, _Str}, _Arg} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    NewProcVars = case send_sort_info_signal(true, false, ProcVars) of
-			      ignore ->
-				  ProcVars;
-			      TempNewProcVars ->
-				  set_sort_col(true, TempNewProcVars)
-			  end,
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-
-
-	{_Id, click, {toolbar, sort_falling_order, _Str}, _Arg} ->
-	    WinId = ProcVars#process_variables.window_id,
-	    mark_busy(WinId),
-	    NewProcVars = case send_sort_info_signal(true, true, ProcVars) of
-			      ignore ->
-				  ProcVars;
-			      TempNewProcVars ->
-				  set_sort_col(true, TempNewProcVars)
-			  end,
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-
-
-	{_Id, click, {toolbar, no_sorting, _Str}, _Arg} ->
-	    NewProcVars = case send_sort_info_signal(false, false, ProcVars) of
-			      ignore ->
-				  ProcVars;
-			      TempNewProcVars ->
-				  set_sort_col(false, TempNewProcVars)
-			  end,
-	    NewProcVars;
-	
-
-	{Id, click, {toolbar, table_info, _Str}, _Arg} ->
-	    ToolP = ProcVars#process_variables.toolbar_params,
-	    F     = ToolP#toolbar_params.pop_up_frame_id,
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_show_table_info{sender = self()},
-	    ProcVars;
-	
-
-	{Id, click, {labelbtn, pop_up}, _Arg} ->
-	    gs:config(Id, [{data, {labelbtn, pop_down}}]),
-	    NewProcVars = ?DISP_FUNC_FILE:show_toolbar_editor(ProcVars),
-	    NewProcVars;
-
-
-	{Id, click, {labelbtn, pop_down}, _Arg} ->
-	    gs:config(Id, [{data, {labelbtn, pop_up}}]),
-	    NewProcVars = ?DISP_FUNC_FILE:hide_toolbar_editor(ProcVars),
-	    NewProcVars;
-
-
-	_OtherMessage ->
-	    ProcVars
-
-    end.
-	    
-
-
-
-
-get_updated_elem(ProcVars) ->
-    EditedStr = gs:read(editentry, text),
-    case tv_db_search:string_to_term(EditedStr) of
-	{error, {_Reason, Msg}} ->
-	    gs:config(editentry, [beep]),
-	    gs:window(pdwin, gs:start(), []),
-	    tv_utils:notify(pdwin, "TV Notification", Msg),
-	    gs:destroy(pdwin),
-	    ProcVars;
-	{ok, NewTerm} ->
-	    get_updated_elem2(false, NewTerm, ProcVars)
-    end.
-
-
-
-
-
-get_updated_elem2(FromRecEdit, NewTerm, ProcVars) ->
-    #process_variables{table_type  = TableType,
-		       record_name = RecordName,
-		       mark_params = MarkP,
-		       master_pid  = PcPid}  = ProcVars,
-
-    #mark_params{marked_object  = ObjToUpdate,
-		 marked_color   = ObjColor,
-		 virtual_row_no = VirtualRow,
-		 cell_col_no    = VirtualCol}  = MarkP,
-
-	case ObjToUpdate of
-	    undefined ->
-		case new_object_ok(TableType, RecordName, NewTerm) of
-		    true ->
-			PcPid ! #pd_new_object{sender = self(),
-					       object = NewTerm},
-			ProcVars;
-		    {false, Msg} ->
-			gs:window(pdwin, gs:start(), []),
-			tv_utils:notify(pdwin, "TV Notification", Msg),
-			gs:destroy(pdwin),
-			ProcVars
-		end;
-	    _AnyObj ->
-		   %% We need to know if the object has been deleted!
-		NewObj = 
-		    case VirtualCol of 
-			undefined ->
-			    NewTerm;
-			_AnyCol when FromRecEdit ->
-			    NewTerm;
-			_AnyCol ->
-			    if 
-				is_tuple(ObjToUpdate) ->
-				    erlang:setelement(VirtualCol, ObjToUpdate, NewTerm);
-				true ->
-				    NewTerm
-			    end
-		    end,
-		   %% Is the update OK?
-		case update_ok(TableType, ObjToUpdate, NewObj) of
-		    true ->
-			PcPid ! #pd_updated_object{sender     = self(),
-						   object     = NewObj,
-						   old_object = ObjToUpdate,
-						   old_color  = ObjColor,
-						   obj_no     = VirtualRow},
-			ProcVars;
-		    false ->
-			gs:window(pdwin, gs:start(), []),
-			case get(error_msg_mode) of
-			    normal ->
-				tv_utils:notify(pdwin, "TV Notification", 
-						["The record name cannot be changed!"]);
-			    haiku ->
-				tv_utils:notify(pdwin, "TV Notification", 
-						["The attempt to change",
-						 "The permanent record name",
-						 "Is simply ignored."])
-			end,
-			gs:destroy(pdwin),
-			ProcVars
-		end
-	end.
-
-
-
-
-new_object_ok(ets, _RecordName, NewTerm) when is_tuple(NewTerm) ->
-    true;
-new_object_ok(ets, _RecordName, _NewTerm) ->
-    Msg = case get(error_msg_mode) of
-	      normal ->
-		  ["Object is not a tuple!"];
-	      haiku ->
-		  ["Yes, it is a term.",
-		   "It is pretty, but it's not",
-		   "A proper tuple."]
-	  end,
-    {false, Msg};    
-new_object_ok(mnesia, RecordName, NewTerm) when is_tuple(NewTerm) ->
-    NewRecName = element(1, NewTerm),
-    case NewRecName of
-	RecordName ->
-	    true;
-	_OtherName ->
-	    Msg = case get(error_msg_mode) of
-		      normal ->
-			  ["Erroneous record name!"];
-		      haiku ->
-			  ["The attempt to use",
-			   "An invalid record name",
-			   "Is simply ignored."]
-		  end,
-	    {false, Msg}
-    end;
-new_object_ok(mnesia, _RecordName, _NewTerm) ->
-    Msg = case get(error_msg_mode) of
-	      normal ->
-		  ["Object is not a record!"];
-	      haiku ->
-		  ["Yes, it is a term.",
-		   "It is pretty, but it's not",
-		   "The proper record."]
-	  end,
-    {false, Msg}.
-
-
-
-
-update_ok(ets, _ObjectToUpdate, _NewObject) ->
-    true;
-update_ok(mnesia, ObjectToUpdate, NewObject) ->
-    OldRecName = element(1, ObjectToUpdate),
-    NewRecName = element(1, NewObject),
-    case NewRecName of
-	OldRecName ->
-	    true;
-	_Other ->
-	    false
-    end.
-
-
-
-
-handle_toolbar_buttons(Id, Btn, Str, LabelShown, X, Y, ProcVars) ->
-    WinId = ProcVars#process_variables.window_id,
-    ToolP = ProcVars#process_variables.toolbar_params,
-    F     = ToolP#toolbar_params.pop_up_frame_id,
-
-    receive
-
-	{gs, Id, motion, _Data, [NewX, NewY | _]} ->
-	    handle_toolbar_buttons(Id, Btn, Str, LabelShown, NewX, NewY, 
-				   ProcVars);
-
-	{gs, editentry, keypress, _Data, ['Tab' | _T]} ->
-	    gs:config(editentry, [{select, {0,100000000}}]),
-	    handle_toolbar_buttons(Id, Btn, Str, LabelShown, X, Y, ProcVars);
-
-	{gs, editentry, keypress, _Data, ['Return' | _T]} ->
-	    get_updated_elem(ProcVars),
-	    handle_toolbar_buttons(Id, Btn, Str, LabelShown, X, Y, ProcVars);
-
-	{gs, Id, leave, {toolbar, Btn, Str}, _Arg} ->
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    ProcVars;
-	
-	{gs, Id, click, {toolbar, poll_table, _Str}, _Arg} ->
-	    mark_busy(WinId),
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_poll_table{sender = self()},
-	    mark_nonbusy(WinId),
-	    ProcVars;
-
-	{gs, Id, click, {toolbar, select_browser, _Str}, _Arg} ->
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_select{sender = self()},
-	    ProcVars;
-
-	{gs, Id, click, {toolbar, help_button, _Str}, _Arg} ->
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_help{sender = self()},
-	    ProcVars;
-
-	{gs, Id, click, {toolbar, insert_object, _Str}, _Arg} ->
-	    mark_busy(WinId),
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! {pc_edit_object, self()},
-	    mark_nonbusy(WinId),
-	    ProcVars;
-
-
-	{gs, Id, click, {toolbar, search_object, _Str}, _Arg} ->
-	    mark_busy(WinId),
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_search_req{sender = self()},
-	    mark_nonbusy(WinId),
-	    ProcVars;
-
-	{gs, Id, click, {toolbar, sort_rising_order, _Str}, _Arg} ->
-	    mark_busy(WinId),
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    NewProcVars =
-		case send_sort_info_signal(true, false, ProcVars) of
-		    ignore ->
-			ProcVars;
-		    TempNewProcVars ->
-			set_sort_col(true, TempNewProcVars)
-		end,
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-
-	{gs, Id, click, {toolbar, sort_falling_order, _Str}, _Arg} ->
-	    mark_busy(WinId),
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    NewProcVars =
-		case send_sort_info_signal(true, true, ProcVars) of
-		    ignore ->
-			ProcVars;
-		    TempNewProcVars ->
-			set_sort_col(true, TempNewProcVars)
-		end,
-	    mark_nonbusy(WinId),
-	    NewProcVars;
-
-	{gs, Id, click, {toolbar, no_sorting, _Str}, _Arg} ->
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    NewProcVars =
-		case send_sort_info_signal(false, false, ProcVars) of
-		    ignore ->
-			ProcVars;
-		    TempNewProcVars ->
-			set_sort_col(false, TempNewProcVars)
-		end,
-	    NewProcVars;
-
-	{gs, Id, click, {toolbar, table_info, _Str}, _Arg} ->
-	    gs:config(F, [{y, -30}]),
-	    gs:config(Id, [{motion, false}]),
-	    PcPid = ProcVars#process_variables.master_pid,
-	    PcPid ! #pc_show_table_info{sender = self()},
-	    ProcVars;
-
-	{'EXIT', Pid, Reason} ->
-	    exit_signals({Pid, Reason}, ProcVars),
-	    handle_toolbar_buttons(Id, Btn, Str, LabelShown, X, Y, ProcVars);
-
-	OtherMsg ->
-	    NewProcVars = tv_messages(OtherMsg, ProcVars),
-	    handle_toolbar_buttons(Id, Btn, Str, LabelShown, X, Y, NewProcVars)
-
-    after 600 ->
-	    case LabelShown of
-		false ->
-		    FrameP = ProcVars#process_variables.frame_params,
-		    L = ToolP#toolbar_params.pop_up_label_id,
-		    
-		    #frame_params{toolbar_frame_width  = TWidth,
-				  toolbar_frame_height = THeight} = FrameP,
-
-		    BtnHeight         = gs:read(Id, height),
-		    BtnXpos           = gs:read(Id, x),
-		    BtnYpos           = gs:read(Id, y),
-		    FrameHeight       = gs:read(F, height),
-		    FontUsed          = gs:read(L, font),
-		    {StringWidth, _H} = gs:read(L, {font_wh, {FontUsed, Str}}),
-
-		    Width   = StringWidth + 6,
-		    Xpos    = BtnXpos + X,
-		    LblXpos = if
-				  Xpos + Width > TWidth ->
-				      Xpos - Width;
-				  true ->
-				      Xpos
-			      end,
-		  % Ypos    = BtnYpos + Y + 15,
-		    Ypos    = BtnYpos + BtnHeight + 6,
-		    LblYpos = if
-				  Ypos + FrameHeight > THeight ->
-				      Ypos - FrameHeight - 25;
-				  true ->
-				      Ypos
-			      end,
-		    gs:config(L, [{width, Width - 2},
-				  {label, {text, Str}}]),
-		    gs:config(F, [{width, Width},
-				  {x, LblXpos},
-				  {y, LblYpos}
-				 ]);
-		true ->
-		    done
-	    end,
-	    handle_toolbar_buttons(Id, Btn, Str, true, X, Y, ProcVars)
-    end.
-
-
-
-	    
-
-
-set_sort_col(SortingOn, ProcVars) ->
-    #process_variables{pb_pid      = PbPid,
-		       mark_params = MarkP} = ProcVars,
-    
-    SortCol = case SortingOn of
-		  true ->
-		      MarkP#mark_params.col_no;
-		  false ->
-		      undefined
-	      end,
-    PbPid ! #pb_set_sort_col{sender      = self(),
-			     virtual_col = SortCol
-			    },
-    remove_all_marks(SortCol, ProcVars).
-
-
-
-
-
-send_sort_info_signal(Sorting, Reverse, ProcVars) ->
-    #process_variables{master_pid  = PcPid,
-		       mark_params = MarkP}  = ProcVars,
-
-    SortColNo = MarkP#mark_params.col_no,
-
-    PcPid ! #pc_set_sorting_mode{sender      = self(),
-				 sorting     = Sorting,
-				 reverse     = Reverse,
-				 sort_key_no = SortColNo
-				},
-    receive
-	#pc_set_sorting_mode_cfm{sort_key_no = FinalSortColNo} ->
-	    NewMarkP = MarkP#mark_params{col_no = FinalSortColNo},
-	    ProcVars#process_variables{mark_params = NewMarkP};
-
-	#pd_ignore{} ->
-	    ignore
-
-    end.
-	    
-
-
-
-
-show_data(Msg, ProcVars) ->
-    #pc_data{scale_pos        = Pos,
-	     scale_range      = Range, 
-	     list_range       = MaxValue, 
-	     elementlist      = List,
-	     list_of_keys     = KeyList,
-	     max_elem_size    = MaxElemSize,
-	     marked_row       = MarkedRowData}     = Msg,
-    
-    ?DISP_FUNC_FILE:display_data(Pos, Range, MaxValue, List, KeyList, MaxElemSize, 
-				 MarkedRowData, ProcVars).
-
-
-
-
-
-
-handle_list_info(Msg, ProcVars) ->
-    ListAsStr = Msg#pc_list_info.lists_as_strings,
-    PgPid     = ProcVars#process_variables.pg_pid,
-    PgPid ! #pg_list_info{sender           = self(),
-			  lists_as_strings = ListAsStr},
-    ProcVars#process_variables{lists_as_strings = ListAsStr}.
-    
-
-
-
-
-handle_col_marked(Msg, ProcVars) ->
-    #pb_col_marked{col_marked  = ColMarked,
-		   virtual_col = VirtualCol}  = Msg,
-
-    #process_variables{master_pid     = MasterPid,
-		       pg_pid         = PgPid,
-		       rec_pid        = RecPid,
-		       writable       = Writable,
-		       toolbar_params = ToolP,
-		       mark_params    = MarkP}  = ProcVars,
-    SortCol = MarkP#mark_params.sort_col_no,
-    
-    PgPid ! #pg_remove_marks{sender = self()},
-
-    case ColMarked of
-	true ->
-	    PgPid ! #pg_col_marked{sender      = self(),
-				   virtual_col = VirtualCol};
-	false ->
-	    done
-    end,
-
-    MasterPid ! #pc_marked_row{sender = self(),
-			       row_no = undefined,
-			       object = undefined,
-			       color  = undefined
-			      },
-
-    ?DISP_FUNC_FILE:update_toolbar_label(notext, ToolP, undefined, undefined, Writable),
-    send_to_rec_edit(RecPid, insert_mode),
-    
-    NewMarkP = 
-	if
-	    ColMarked ->
-		MarkP#mark_params{col_no = VirtualCol};
-	    true ->
-		if 
-		    SortCol =:= undefined ->
-			MarkP;
-		    true ->
-			MarkP#mark_params{col_no = SortCol}
-		end
-	end,
-    ProcVars#process_variables{mark_params = NewMarkP}.
-		      
-    
-
-
-
-
-remove_all_marks(SortCol, ProcVars) ->
-    #process_variables{master_pid     = MasterPid,
-		       pb_pid         = PbPid,
-		       pg_pid         = PgPid,
-		       toolbar_params = ToolP}  = ProcVars,
-    
-    PgPid ! #pg_remove_marks{sender = self()},
-    PbPid ! #pb_remove_marks{sender = self()},
-    MasterPid ! #pc_marked_row{sender = self(),
-			       row_no = undefined,
-			       object = undefined,
-			       color  = undefined
-			      },
-%%    ?DISP_FUNC_FILE:update_toolbar_label(notext, ToolP, undefined, undefined, Writable),
-    ?DISP_FUNC_FILE:update_toolbar_editor(ToolP#toolbar_params.editor_id, notext),
-%%    send_to_rec_edit(RecPid, insert_mode),
-    ProcVars#process_variables{mark_params = #mark_params{sort_col_no    = SortCol,
-							  cell_col_no    = undefined,
-							  row_no         = undefined,
-							  virtual_row_no = undefined,
-							  marked_object  = undefined,
-							  marked_color   = undefined}
-			      }.
-
-
-
-
-
-
-handle_row_marked(Msg, ProcVars) ->
-    #pb_row_marked{row_marked  = RowMarked,
-		   virtual_row = VirtualRow,
-		   real_row    = RealRow}  = Msg,
-
-    #process_variables{master_pid     = MasterPid,
-		       rec_pid        = RecPid,
-		       pg_pid         = PgPid,
-		       data_list      = DataList,
-		       color_list     = ColorList,
-		       writable       = Writable,
-		       toolbar_params = ToolP,
-		       mark_params    = MarkP}  = ProcVars,
-		       
-    PgPid ! #pg_remove_marks{sender = self()},
-
-    case RowMarked of
-	true ->
-	    PgPid ! #pg_row_marked{sender      = self(),
-				   virtual_row = VirtualRow};
-	false ->
-	    done
-    end,
-
-    {DataElement, NewMarkP} = 
-	if
-	    RowMarked ->
-		{MarkedRowOrCol, RowObj} = 
-		    ?DISP_FUNC_FILE:get_data_element(row, DataList, RealRow, undefined),
-		
-		MarkedRowColor =
-		    case MarkedRowOrCol of
-			notext ->
-			    undefined;
-			_OtherObject ->
-			    lists:nth(RealRow, ColorList)
-		    end,
-		MasterPid ! #pc_marked_row{sender = self(),
-					   row_no = VirtualRow,
-					   object = RowObj,
-					   color  = MarkedRowColor
-					  },
-		send_to_rec_edit(RecPid, {update_mode,RowObj}),
-		{MarkedRowOrCol, MarkP#mark_params{virtual_row_no = VirtualRow,
-						   row_no         = RealRow,
-						   cell_col_no    = undefined,
-						   col_no         = undefined,
-						   marked_object  = RowObj,
-						   marked_color   = MarkedRowColor}};
-	    true ->
-		 MasterPid ! #pc_marked_row{sender = self(),
-					    row_no = undefined,
-					    object = undefined,
-					    color  = undefined
-					   },
-		send_to_rec_edit(RecPid, insert_mode),
-		{notext, MarkP#mark_params{virtual_row_no = undefined,
-					   row_no         = undefined,
-					   cell_col_no    = undefined,
-					   col_no         = undefined,
-					   marked_object  = undefined,
-					   marked_color   = undefined}}
-	end,
-    
-    ?DISP_FUNC_FILE:update_toolbar_label(DataElement, ToolP, VirtualRow, 
-					 undefined, Writable),
-    ProcVars#process_variables{mark_params = NewMarkP}.
-
-
-
-
-
-handle_cell_marked(Msg, ProcVars) ->
-    #pg_cell_marked{cell_marked = CellMarked,
-		    virtual_col = VirtualCol,
-		    real_row    = RealRow,
-		    virtual_row = VirtualRow}    = Msg,
-
-       % We are interested in the real row number, since we only have a sublist 
-       % stored in pd.
-    ?DISP_FUNC_FILE:marked_cell(CellMarked, VirtualCol, RealRow, VirtualRow,
-				ProcVars).
-				      
-
-
-
-resize_window(Msg, ProcVars) ->
-    #pd_win_conf{width = NewWindowWidth, 
-		 height = NewWindowHeight} = Msg,
-
-    ?DISP_FUNC_FILE:resize_display(NewWindowWidth, NewWindowHeight, ProcVars).
-
-
-
-
-resize_column(Msg, ProcVars) ->
-    #pb_new_colwidth{real_col    = RealCol,
-		     virtual_col = VirtualCol,
-		     xdiff       = Xdiff}       = Msg,
-    
-    ?DISP_FUNC_FILE:resize_column(RealCol, VirtualCol, Xdiff, ProcVars).
-
-
-
-
-mark_busy(Id) ->
-    gs:config(Id, [{cursor, busy}]).
-    
-
-
-
-mark_nonbusy(Id) ->
-    gs:config(Id, [{cursor, arrow}]).
-
-
-
-
-send_to_rec_edit(undefined, _Msg) ->
-    done;
-send_to_rec_edit(RecPid, Msg) ->
-    RecPid ! Msg.
-
diff --git a/lib/tv/src/tv_pd_display.erl b/lib/tv/src/tv_pd_display.erl
deleted file mode 100644
index 804180da16..0000000000
--- a/lib/tv/src/tv_pd_display.erl
+++ /dev/null
@@ -1,1066 +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:      Part of pd controlling the graphics.
-%%%
-%%%*********************************************************************
-
--module(tv_pd_display).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,editor,2}},
-          {nowarn_deprecated_function,{gs,entry,3}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,read,2}}]).
-
-
-
-
--export([init_display/4, 
-	 display_data/8,
-	 resize_display/3, 
-	 resize_column/4, 
-	 scroll_horizontally/2, 
-	 scroll_vertically/2, 
-	 perform_horizontal_scroll/2,
-	 perform_vertical_scroll/2, 
-	 marked_cell/5, 
-	 update_toolbar_label/5,
-	 update_toolbar_editor/2,
-	 get_data_element/4, 
-	 hide_toolbar_editor/1, 
-	 show_toolbar_editor/1]).
-
-
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_pd_int_def.hrl").
--include("tv_pd_int_msg.hrl").
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-%%======================================================================
-%% Function:      init_display.
-%%
-%% Return Value:  Id of the display (here:canvas) created.
-%%
-%% Description:   Creates the canvas and the scale.
-%%
-%% Parameters:    Id of the window the display shall be created in.
-%%======================================================================
-
-
-init_display(WindowId, WindowWidth, WindowHeight, ProcVars) ->
-       % Get all necessary window parameters!
-    #process_variables{pg_pid         = PgPid,
-		       pb_pid         = PbPid,
-		       frame_params   = FrameP,
-		       scale_params   = ScaleP,
-		       toolbar_params = ToolP}  = ProcVars,
-    
-    NewFrameP = tv_pd_frames:create_display_frames(WindowId, WindowWidth,
-						    WindowHeight, FrameP),
-    
-    #frame_params{grid_frame_id     = GridParentId,
-		  grid_frame_width  = GridParentWidth,
-		  grid_frame_height = GridParentHeight} = NewFrameP,
-
-    PgPid ! #pg_init_grid{sender     = self(),
-			  parent_id  = GridParentId,
-			  width      = GridParentWidth,
-			  height     = GridParentHeight,
-			  xpos       = ?VBTN_WIDTH - 1,
-			  ypos       = ?KEY_MARK_AREA_HEIGHT + ?HBTN_HEIGHT - 1,
-			  nof_rows   = ?NOF_GRIDROWS,
-			  row_height = ?ROW_HEIGHT
-			 },
-
-
-    receive
-	#pg_col_info{first_col_shown     = FirstColShown, 
-		     width_of_cols_shown = ColsShown,
-		     nof_rows_shown      = NofRowsShown} ->
-	    
-	    PbPid ! #pb_init_btns{sender          = self(),
-				  parent_id       = GridParentId,
-				  parent_width    = GridParentWidth,
-				  parent_height   = GridParentHeight,
-				  ypos            = ?KEY_MARK_AREA_HEIGHT,
-				  hbtn_height     = ?HBTN_HEIGHT,
-				  resbtn_width    = ?RESBTN_WIDTH,
-				  vbtn_width      = ?VBTN_WIDTH,
-				  nof_rows        = ?NOF_GRIDROWS,
-				  row_height      = ?ROW_HEIGHT,
-				  first_col_shown = FirstColShown,
-				  cols_shown      = ColsShown
-				 },
-
-	    NewScaleP = tv_pd_scale:init_scale(NewFrameP, ScaleP),	    
-
-	    NewToolP  = init_toolbar(NewFrameP, ToolP),
-
-	    ProcVars#process_variables{window_id       = WindowId,
-				       window_width    = WindowWidth,
-				       window_height   = WindowHeight,
-				       first_col_shown = FirstColShown,
-				       nof_rows_shown  = NofRowsShown,
-				       cols_shown      = ColsShown,
-				       frame_params    = NewFrameP,
-				       scale_params    = NewScaleP,
-				       toolbar_params  = NewToolP
-				      }
-    end.
-    
-
-
-
-
-resize_display(NewWinW, NewWinH, ProcVars) ->
-    #process_variables{pg_pid          = PgPid,
-		       pb_pid          = PbPid,
-		       color_list      = ColorList,
-		       first_row_shown = FirstRowShown,
-		       frame_params    = FrameP,
-		       scale_params    = ScaleP,
-		       toolbar_params  = ToolP}  = ProcVars,
-    
-    NewFrameP = tv_pd_frames:resize_display_frames(NewWinW, NewWinH, FrameP),
-    
-    #frame_params{grid_frame_width  = GridParentWidth,
-		  grid_frame_height = GridParentHeight} = NewFrameP,
-    
-    PgPid ! #pg_resize_grid{sender = self(),
-			    width  = GridParentWidth,
-			    height = GridParentHeight
-			   },
-
-    receive
-	#pg_col_info{first_col_shown     = FirstColShown, 
-		     width_of_cols_shown = ColsShown,
-		     nof_rows_shown      = NofRowsShown} ->
-	    
-	    PbPid ! #pb_update_hbtns{sender          = self(),
-				     parent_width    = GridParentWidth,
-				     parent_height   = GridParentHeight,
-				     first_col_shown = FirstColShown,
-				     cols_shown      = ColsShown
-				    },
-
-	    PbPid ! #pb_update_vbtns{sender           = self(),
-				     color_list       = ColorList,
-				     first_row_shown  = FirstRowShown,
-				     nof_rows_shown   = NofRowsShown,
-				     blinking_enabled = false
-				    },
-
-	    NewScaleP = tv_pd_scale:resize_scale(NewFrameP, ScaleP),
-
-	    NewToolP = resize_toolbar(NewFrameP, ToolP),
-	    
-	    ProcVars#process_variables{window_width    = NewWinW,
-				       window_height   = NewWinH,
-				       first_col_shown = FirstColShown,
-				       nof_rows_shown  = NofRowsShown,
-				       cols_shown      = ColsShown,
-				       frame_params    = NewFrameP,
-				       scale_params    = NewScaleP,
-				       toolbar_params  = NewToolP
-				      }
-    end.
-    
-
-
-
-
-
-
-resize_column(RealCol, VirtualCol, Xdiff, ProcVars) ->
-    #process_variables{pg_pid = PgPid, 
-		       pb_pid = PbPid,
-		       frame_params = FrameP} = ProcVars,
-    
-    PgPid ! #pg_resize_grid_col{sender         = self(),
-				real_col_no    = RealCol,
-				virtual_col_no = VirtualCol,
-				xdiff          = Xdiff
-			       },
-    
-    #frame_params{grid_frame_width  = GridFrameWidth,
-		  grid_frame_height = GridFrameHeight} = FrameP,
-    receive
-	#pg_col_info{first_col_shown     = FirstColShown,
-		     width_of_cols_shown = ColsShown,
-		     nof_rows_shown      = NofRowsShown} ->
-	    
-	    PbPid ! #pb_update_hbtns{parent_width    = GridFrameWidth,
-				     parent_height   = GridFrameHeight,
-				     first_col_shown = FirstColShown,
-				     cols_shown      = ColsShown
-				    },
-
-	    ProcVars#process_variables{first_col_shown = FirstColShown,
-				       nof_rows_shown  = NofRowsShown,
-				       cols_shown      = ColsShown
-				      }
-    end.
-    
-
-
-
-
-
-
-
-display_data(Pos, Range, _MaxValue, List, KeyList, MaxElemSize, MarkedRowData,ProcVars) ->
-    #process_variables{master_pid     = PcPid,
-		       rec_pid        = RecPid,
-		       pg_pid         = PgPid,
-		       pb_pid         = PbPid,
-		       writable       = Writable,
-		       sorting_on     = SortingOn,
-		       nof_rows_shown = NofRowsShown,
-		       scale_params   = ScaleP,
-		       toolbar_params = ToolP, 
-		       mark_params    = MarkP}  = ProcVars,
-    
-    {DataList, ColorList} = split_dblist(List, [], []),
-
-    NewMarkP = update_marks(SortingOn, DataList, ColorList, MarkedRowData, Pos, NofRowsShown, 
-			    Writable, Range, PcPid, PgPid, RecPid, ToolP, MarkP),
-
-    PgPid ! #pg_data{sender = self(),
-		     data   = DataList,
-		     first_row_shown = Pos
-		    },
-
-    PbPid ! #pb_update_vbtns{sender           = self(),
-			     color_list       = ColorList,
-			     first_row_shown  = Pos,
-			     nof_rows_shown   = NofRowsShown,
-			     blinking_enabled = false
-			    },
-
-    PbPid ! #pb_key_info{sender       = self(),
-			 list_of_keys = KeyList
-			},
-
-       % May be new number of elements in the total list!
-    ?SCALE_FUNC_FILE:set_scale_range(vscale, Range, ScaleP),
-       % May be new vertical scale position required!
-    NewScaleP = ?SCALE_FUNC_FILE:set_scale_pos(vscale, Pos, ScaleP),
-       % May be new maximum size of elements!
-    ?SCALE_FUNC_FILE:set_scale_range(hscale, {1, MaxElemSize}, NewScaleP),
-    
-    ProcVars#process_variables{data_list       = DataList,
-			       color_list      = ColorList,
-			       first_row_shown = Pos,
-			       initialising    = false,
-			       scale_params    = NewScaleP,
-			       mark_params     = NewMarkP
-			      }.
-
-
-
-
-
-
-
-scroll_vertically(MouseBtn, ProcVars) ->
-    #process_variables{scale_params = ScaleP} = ProcVars,
-    
-    OldScalePos = ScaleP#scale_params.vscale_pos,
-    NewScalePos  = get_new_scalepos(MouseBtn, OldScalePos),
-    
-    case NewScalePos of
-	OldScalePos ->
-	    ProcVars;
-	NewValue ->
-	    perform_vertical_scroll(NewValue, ProcVars)	    
-    end.
-
-
-
-
-
-
-
-scroll_horizontally(MouseBtn, ProcVars) ->
-    #process_variables{scale_params = ScaleP} = ProcVars,
-    
-    OldScalePos = ScaleP#scale_params.hscale_pos,
-    NewScalePos  = get_new_scalepos(MouseBtn, OldScalePos),
-    
-    case NewScalePos of
-	OldScalePos ->
-	    ProcVars;
-	NewValue ->
-	    perform_horizontal_scroll(NewValue, ProcVars)
-    end.
-
-
-
-
-
-
-
-
-perform_vertical_scroll(NewScalePos, ProcVars) ->
-    #process_variables{master_pid   = MasterPid,
-		       initialising = Init,
-		       scale_params = ScaleP} = ProcVars,
-    
-       %% To avoid erroneous scrollbar signals during creation of the display.
-    case Init of
-	true ->
-	    done;
-	false ->
-	    MasterPid ! #pc_data_req{sender = self(),
-				     element = NewScalePos,
-				     nof_elements = ?NOF_GRIDROWS}
-    end,
-    
-       % Since the order of click/buttonrelease messages isn't
-       % precise, set the scale to the returned pos (may otherwise 
-       % differ one unit).
-    NewScaleP = ?SCALE_FUNC_FILE:set_scale_pos(vscale, 
-					       NewScalePos, 
-					       ScaleP),
-
-    ProcVars#process_variables{scale_params = NewScaleP}.
-
-
-
-
-
-
-
-perform_horizontal_scroll(NewScalePos, ProcVars) ->
-    #process_variables{pg_pid       = PgPid,
-		       pb_pid       = PbPid,
-		       frame_params = FrameP,
-		       scale_params = ScaleP} = ProcVars,
-    
-       % Since the order of click/buttonrelease messages isn't
-       % precise, set the scale to the returned pos (may otherwise 
-       % differ one unit).
-    NewScaleP = ?SCALE_FUNC_FILE:set_scale_pos(hscale, 
-					       NewScalePos, 
-					       ScaleP),
-
-    PgPid ! #pg_horizontal_scroll{sender = self(),
-				  leftmost_virtual_col = NewScalePos
-				 },
-
-    #frame_params{grid_frame_width  = GridFrameWidth,
-		  grid_frame_height = GridFrameHeight} = FrameP,
-    receive
-	#pg_col_info{first_col_shown     = FirstColShown,
-		     width_of_cols_shown = ColsShown,
-		     nof_rows_shown      = NofRowsShown} ->
-	    
-	    PbPid ! #pb_update_hbtns{parent_width    = GridFrameWidth,
-				     parent_height   = GridFrameHeight,
-				     first_col_shown = FirstColShown,
-				     cols_shown      = ColsShown
-				    },
-	    
-	    ProcVars#process_variables{first_col_shown = FirstColShown,
-				       cols_shown      = ColsShown,
-				       nof_rows_shown  = NofRowsShown,
-				       scale_params    = NewScaleP
-				      }
-    end.
-
-
-
-
-
-
-
-
-marked_cell(true, VirtualCol, RealRow, VirtualRow, ProcVars) ->
-    #process_variables{master_pid     = MasterPid,
-		       rec_pid        = RecPid,
-		       data_list      = DataList,
-		       color_list     = ColorList,
-		       writable       = Writable,
-		       mark_params    = MarkP,
-		       toolbar_params = ToolP} = ProcVars,
-    
-    {DataElement, MarkedRowObject} = get_data_element(cell, DataList, RealRow, VirtualCol),
-    update_toolbar_label(DataElement, ToolP, VirtualRow, VirtualCol, Writable),
-    send_to_rec_edit(RecPid, {update_mode,MarkedRowObject}),
-
-    MarkedRowColor  = lists:nth(RealRow, ColorList),
-
-    MasterPid ! #pc_marked_row{sender = self(),
-			       row_no = VirtualRow,
-			       object = MarkedRowObject,
-			       color  = MarkedRowColor
-			      },
-    NewMarkP = MarkP#mark_params{cell_col_no    = VirtualCol,
-				 row_no         = RealRow,
-				 virtual_row_no = VirtualRow,
-				 marked_object  = MarkedRowObject,
-				 marked_color   = MarkedRowColor
-				},
-    ProcVars#process_variables{mark_params = NewMarkP
-			      };
-marked_cell(false, VirtualCol, _RealRow, VirtualRow, ProcVars) ->
-    #process_variables{master_pid      = MasterPid, 
-		       rec_pid         = RecPid,
-		       pb_pid          = PbPid,
-		       writable        = Writable,
-		       mark_params     = MarkP} = ProcVars,
-
-    PbPid ! #pb_remove_marks{sender = self()},
-
-    case VirtualRow of
-	undefined ->
-	    done;
-	_AnyRow ->
-	    update_toolbar_label(notext, ProcVars#process_variables.toolbar_params, 
-				 VirtualRow, VirtualCol, Writable),
-	    send_to_rec_edit(RecPid, insert_mode)
-    end,
-    MasterPid ! #pc_marked_row{sender = self(),
-			       %% row_no = VirtualRow 
-			       row_no = undefined,
-			       object = undefined,
-			       color  = undefined
-			      },
-    NewMarkP = MarkP#mark_params{cell_col_no    = undefined,
-				 row_no         = undefined,
-				 virtual_row_no = undefined,
-				 marked_object  = undefined,
-				 marked_color   = undefined
-				},
-    ProcVars#process_variables{mark_params = NewMarkP
-			      }.
-				  
-
-
-
-
-
-
-
-update_toolbar_label(notext, ToolP, _VirtualRowNo, _VirtualColNo, Writable) ->
-    #toolbar_params{row_col_label_id = RowColLblId,
-		    fg_label_id      = FgLblId,
-		    editor_id        = EdId}  = ToolP,
-    gs:config(RowColLblId, [{label, {text,""}}]),
-    gs:config(FgLblId, [{enable,true}]),
-    gs:config(FgLblId, [{delete, {0,1000000000}}]),
-    gs:config(FgLblId, [{insert, {0, ""}}]),
-    case Writable of
-	true ->
-	    gs:config(FgLblId, [{cursor, text},
-				{setfocus, true}]);
-	false ->
-	    gs:config(FgLblId, [{enable, false}, 
-				{cursor, arrow},
-				{setfocus, false}])
-    end,
-    update_toolbar_editor(EdId, notext);
-update_toolbar_label({DataToShow}, ToolP, VirtualRowNo, VirtualColNo, Writable) ->
-    #toolbar_params{row_col_label_id = RowColLblId,
-		    fg_label_id      = FgLblId,
-		    editor_id        = EdId}  = ToolP,
-
-    case VirtualRowNo of
-	undefined ->
-	       %%  No row - nothing can possibly be marked!
-	    case Writable of
-		true ->
-		    gs:config(FgLblId, [{setfocus,true},
-					{cursor, text}]);
-		false ->
-		    gs:config(FgLblId, [{enable,false}, 
-					{setfocus, false},
-					{cursor, arrow}])
-	    end;
-	_AnyRow ->
-	    RowStr  = "R" ++ integer_to_list(VirtualRowNo),
-	    ColStr  = case VirtualColNo of
-			  undefined ->
-			      "";
-			  _AnyCol ->
-			      " x C" ++ integer_to_list(VirtualColNo)
-		      end,
-	    DataStr  = lists:flatten(tv_io_lib:format("~p", [DataToShow])),
-	    gs:config(RowColLblId, [{label, {text,RowStr++ColStr}}]),
-	    gs:config(FgLblId, [{enable,true}]),
-	    gs:config(FgLblId, [{delete, {0,10000000}}]),
-	    gs:config(FgLblId, [{insert, {0,DataStr}}]),
-	    case Writable of
-		true ->
-		    gs:config(FgLblId, [{setfocus,true},
-					{cursor, text}]);
-		false ->
-		    gs:config(FgLblId, [{enable,false}, 
-					{setfocus, false},
-					{cursor, arrow}])
-	    end,
-	    update_toolbar_editor(EdId, {DataToShow})
-    end.
-
-
-
-
-
-
-
-
-get_data_element(row, DataList, RowNo, _VirtualCol) ->
-    if
-	length(DataList) < RowNo ->
-	    {notext, undefined};
-	true ->
-	    RowObj = lists:nth(RowNo, DataList),
-	    {{RowObj}, RowObj}
-    end;
-get_data_element(cell, DataList, RowNo, ColNo) ->
-       %% It's the responsibility of pg to ensure that there is a data item
-       %% for the cell marked, meaning we don't *have* to check the length of
-       %% the data items. However, since we in the future may want to edit
-       %% even empty cells, we check it!
-    if
-	length(DataList) < RowNo ->
-	    {notext, undefined};
-	true ->
-	    DataItem = lists:nth(RowNo, DataList),
-	    if 
-		is_tuple(DataItem) ->
-		    if size(DataItem) < ColNo ->
-			    {notext, DataItem};
-		       true ->
-			    {{element(ColNo, DataItem)}, DataItem}
-		    end;
-		true ->
-		    {{DataItem}, DataItem}
-	    end
-    end.
-
-
-
-
-
-
-
-
-show_toolbar_editor(ProcVars) ->
-    #process_variables{frame_params   = FrameP,
-		       toolbar_params = ToolP} = ProcVars,
-    
-    #frame_params{toolbar_frame_height = THeight} = FrameP,
-    
-    #toolbar_params{editor_frame_id = EdFrameId} = ToolP,
-    
-    Xpos = 0,
-    Ypos = THeight - 8 - ?ROW_COL_LBL_HEIGHT + 1,
-    gs:config(EdFrameId, [{x, Xpos}, 
-			  {y, Ypos}
-			 ]),
-    ProcVars.
-
-
-
-
-
-
-
-
-hide_toolbar_editor(ProcVars) ->
-    #process_variables{toolbar_params = ToolP} = ProcVars,
-    
-    #toolbar_params{editor_frame_id = EdFrameId} = ToolP,
-    
-    Xpos = 0,
-    Ypos = (-1) * gs:read(EdFrameId, height) - 50,
-    gs:config(EdFrameId, [{x, Xpos}, 
-			  {y, Ypos}
-			 ]),
-    ProcVars.
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-update_toolbar_editor(EdId, notext) ->
-    gs:config(EdId, [{enable, true}]),
-    gs:config(EdId, [clear]),
-    gs:config(EdId, [{enable, false}]);
-update_toolbar_editor(EdId, {DataToShow}) ->
-    Str = io_lib:format("~n~p~n", [DataToShow]),
-    gs:config(EdId, [{enable, true}]),
-    gs:config(EdId, [clear]),
-    gs:config(EdId, [{overwrite, {insert, Str}}]),
-    gs:config(EdId, [{enable, false}]).
-    
-
-
-
-
-
-update_marks(true, _DataList, _ColorList, _MarkedRowData, 
-	     _Pos, _NofRowsShown, _Writable, _Range, PcPid, PgPid, RecPid, ToolP, MarkP) ->
-    PgPid ! #pg_remove_marks{sender = self()},
-       %% Too much trouble trying to find the marked object again!
-       %% On the other hand, is the mark based on the row number
-       %% or the row content? Probably different strategies now, depending
-       %% on where in the code we are...  :-(
-    %% update_toolbar_label(notext, ToolP, undefined, undefined, Writable),
-    update_toolbar_editor(ToolP#toolbar_params.editor_id, notext),
-    send_to_rec_edit(RecPid, insert_mode),
-    PcPid ! #pc_marked_row{sender = self(),
-			   row_no = undefined,
-			   object = undefined,
-			   color  = undefined
-			  },
-    MarkP#mark_params{cell_col_no    = undefined,
-		      row_no         = undefined,
-		      virtual_row_no = undefined,
-		      marked_object  = undefined,
-		      marked_color   = undefined
-		     };
-update_marks(false, DataList, ColorList, MarkedRowData, 
-	     Pos, NofRowsShown, Writable, Range, PcPid, PgPid, RecPid, ToolP, MarkP) ->
-    #mark_params{cell_col_no    = CellColNo,
-		 virtual_row_no = VirtualRowNo}  = MarkP,
-    
-       % Marked row data contains the color also!
-    {RowData, RowColors} = split_dblist(MarkedRowData, [], []),
-
-    case VirtualRowNo of
-	undefined ->
-	    MarkP;
-	_AnyRow ->
-	    if
-		VirtualRowNo > element(2, Range) ->
-		       %% Mark outside the existing list! Uh-uh, remove the mark immediately! 8-0
-		    update_marks(true, DataList, ColorList, MarkedRowData, Pos, NofRowsShown, 
-				 Writable, Range, PcPid, PgPid, RecPid, ToolP, MarkP);
-		true ->
-		    {DataElement, RowObj} = choose_data_to_show(VirtualRowNo, CellColNo, RowData, 
-								DataList, Pos),
-		    {_, RowObjColor} = choose_data_to_show(VirtualRowNo, CellColNo, RowColors, 
-							   ColorList, Pos),
-		    case DataElement of
-			notext ->
-			    %%	send_to_rec_edit(RecPid, insert_mode);
-			    done;
-			_OtherElement ->
-			    %%  send_to_rec_edit(RecPid, {update_mode, RowObj})
-			    send_to_rec_edit(RecPid, {reset_info, RowObj})
-		    end,
-
-		    %%    case RowObj of
-		    %%	OldMarkedObj ->
-		    %%	    done;
-		    %%	_NewObj ->
-		    %%	    update_toolbar_label(DataElement, ToolP, VirtualRowNo, 
-		    %%				 CellColNo, Writable)
-		    %%    end,
-
-		    %% update_toolbar_label(DataElement,ToolP,VirtualRowNo,CellColNo,Writable),
-
-		    update_toolbar_editor(ToolP#toolbar_params.editor_id, DataElement),
-		    MarkP#mark_params{marked_object = RowObj,
-				      marked_color  = RowObjColor}
-	    end
-    end.
-			  
-
-
-				  
-
-choose_data_to_show(VirtualRowNo, undefined, _RowData, DataList, Pos) when VirtualRowNo >= Pos, VirtualRowNo =< (Pos + length(DataList) - 1) ->
-    get_data_element(row, DataList, VirtualRowNo - Pos + 1, undefined);
-choose_data_to_show(_VirtualRowNo, undefined, RowData, _DataList, _Pos) ->
-    get_data_element(row, RowData, 1, undefined);
-choose_data_to_show(VirtualRowNo, CellColNo, _RowData, DataList, Pos)
-  when VirtualRowNo >= Pos, VirtualRowNo =< (Pos + length(DataList) - 1) ->
-    get_data_element(cell, DataList, VirtualRowNo - Pos + 1, CellColNo);
-choose_data_to_show(_VirtualRowNo, CellColNo, RowData, _DataList, _Pos) ->
-    get_data_element(cell, RowData, 1, CellColNo).
-    
-
-
-
-
-
-get_new_scalepos(Btn, LastScalePos) ->
-    receive
-	{gs, _Id, click, _Data, [NewScalePos | _T]} ->
-	    get_new_scalepos(Btn, NewScalePos);
-	
-	{gs, _Id, buttonrelease, _Data, [Btn | _T]} ->
-	    LastScalePos;
-	
-	{gs, _Id, buttonrelease, _Data, _Args} ->
-	    get_new_scalepos(Btn, LastScalePos);
-	
-	{gs, _Id, buttonpress, _Data, _Args} ->
-	    get_new_scalepos(Btn, LastScalePos)
-    
-    end.
-
-
-
-
-
-
-
-split_dblist([], DataAcc, ColorAcc) -> 
-    {lists:reverse(DataAcc), lists:reverse(ColorAcc)};
-split_dblist([{Data, Color} | Tail], DataAcc, ColorAcc) ->
-    split_dblist(Tail, [Data | DataAcc], [Color | ColorAcc]).
-
-
-    
-
-
-
-
-
-init_toolbar(FrameP, ToolP) ->
-    #frame_params{display_id           = DispId,
-		  toolbar_frame_id     = TId,
-		  toolbar_frame_width  = TWidth,
-		  toolbar_frame_height = THeight,
-		  grid_frame_width     = GWidth} = FrameP,
-
-    NewToolP = init_toolbar_btns(TId, ToolP),
-    {RowColLblId, BgLabelId, FgLabelId, BtnId} = 
-	init_toolbar_label(TId, TWidth, THeight, GWidth),
-    
-    PopUpFrame = gs:frame(TId, [{width, 80},
-				{height, 20},
-				{x, 0},
-				{y, -30},
-				{bg, {0, 0, 0}}
-			       ]),
-    
-    PopUpLabel = gs:label(PopUpFrame, [{width, 78}, 
-				       {height, 18}, 
-				       {bg, {255,255,190}}, 
-				       {x,1}, 
-				       {y,1}, 
-				       {align, center},
-				       {label, {text,""}}, 
-				       {font,{screen,12}}]),
-    
-    {EditorFrameId, EditorId} = init_toolbar_editor(DispId, TWidth, THeight),
-
-    NewToolP#toolbar_params{parent_id        = TId,
-			    row_col_label_id = RowColLblId,
-			    bg_label_id      = BgLabelId,
-			    fg_label_id      = FgLabelId,
-			    label_btn_id     = BtnId,
-			    pop_up_frame_id  = PopUpFrame,
-			    pop_up_label_id  = PopUpLabel,
-			    editor_frame_id  = EditorFrameId,
-			    editor_id        = EditorId
-			   }.
-
-
-
-
-
-
-init_toolbar_btns(TId, ToolP) ->
-    PicDir = code:priv_dir(tv),
-%    PicDir = "../priv",
-       % Toolbar btns are 25x25, the bitmaps are 20x20.
-    create_one_toolbar_btn(TId, 1, PicDir ++ "/edit1.xbm",
-			   {toolbar, insert_object, "Edit Object"}),
-    create_one_toolbar_btn(TId, 3, PicDir ++ "/search.xbm",
-			   {toolbar, search_object, "Search Object"}),
-    create_one_toolbar_btn(TId, 5, PicDir ++ "/sort.xbm",
-			   {toolbar, sort_rising_order, "Sort Ascending"}),
-    create_one_toolbar_btn(TId, 6, PicDir ++ "/no_sort.xbm",
-			   {toolbar, no_sorting,"No Sorting"}),
-    create_one_toolbar_btn(TId, 7, PicDir ++ "/sort_reverse.xbm",
-			   {toolbar, sort_falling_order,"Sort Descending"}),
-    create_one_toolbar_btn(TId, 9, PicDir ++ "/poll.xbm",
-			   {toolbar, poll_table,"Poll Table"}),
-    create_one_toolbar_btn(TId, 11, PicDir ++ "/info.xbm",
-			   {toolbar, table_info,"Table Info"}),
-    create_one_toolbar_btn(TId, 13, PicDir ++ "/help.xbm",
-			   {toolbar, help_button, "Help"}),
-    ToolP.
-    
-
-
-
-
-
-
-
-create_one_toolbar_btn(ParentId, N, Image, Data) ->
-    BtnWidth  = 25,
-    BtnHeight = 25,
-    StartXpos = 0,
-    BtnXpos   = StartXpos + ((N - 1) * BtnWidth),
-    BtnYpos   = 2,
-    BgColor   = ?DEFAULT_BG_COLOR,
-    FgColor   = {178,34,34},       % Firebrick
-
-    gs:button(ParentId, [{width, BtnWidth},
-			 {height, BtnHeight}, 
-			 {x, BtnXpos}, 
-			 {y, BtnYpos},
-			 {enter, true},
-			 {leave, true},
-			 {label, {image, Image}}, 
-			 {data, Data},
-			 {fg, FgColor},
-			 {bg, BgColor}
-			]).
-    
-
-
-
-
-resize_toolbar(FrameP, ToolP) ->
-    #frame_params{toolbar_frame_width  = TWidth,
-		  toolbar_frame_height = THeight,
-		  grid_frame_width     = GWidth} = FrameP,
-    
-    #toolbar_params{bg_label_id      = BgId,
-		    fg_label_id      = FgId,
-		    row_col_label_id = RowColId,
-		    label_btn_id     = BtnId,
-		    editor_frame_id  = FrId,
-		    editor_id        = EdId} = ToolP,
-
-    resize_toolbar_label(BgId, FgId, RowColId, BtnId, TWidth, THeight, GWidth),
-    resize_toolbar_editor(FrId, EdId, TWidth, THeight),
-    ToolP.
-
-
-
-
-
-
-
-
-init_toolbar_label(ParentId, ParentWidth, ParentHeight, GWidth) ->
-    {BgWidth, BgHeight, BgXpos, BgYpos, FgWidth, FgHeight, FgXpos, FgYpos, BtnWidth,
-     BtnHeight, BtnXpos, BtnYpos} = 
-	get_toolbar_label_coords(ParentWidth, ParentHeight),
-
-    BgId = gs:label(ParentId, [{width, BgWidth},
-			       {height, BgHeight},
-			       {x, BgXpos},
-			       {y, BgYpos},
-			       {bg, {0, 0, 0}},
-			       {fg, {0, 0, 0}}
-			      ]),
-
-    
-    RowColLblHeight = ?ROW_COL_LBL_HEIGHT,
-    RowColLblWidth  = GWidth - ?VBTN_WIDTH,
-    RowColLblYpos   = BgYpos + RowColLblHeight + 18,
-    
-    RowColLblId = gs:label(ParentId, [{width, RowColLblWidth},
-				      {height, RowColLblHeight},
-				      {x, ?VBTN_WIDTH},
-				      {y, RowColLblYpos},
-				      {bg, ?DEFAULT_BG_COLOR},
-				      {fg, {178,34,34}},
-				      {align,center},
-				      {font,{screen,12}},				   
-				      {label, {text,""}}
-				     ]),
-    
-    FgId = gs:entry(editentry, ParentId, [{width, FgWidth},
-					  {height, FgHeight},
-					  {x, FgXpos},
-					  {y, FgYpos},
-					  {bg, {255,255,255}},
-					  {fg, {0,0,0}},
-					  {bw, 1},
-					  {font,{screen,12}},
-					  {justify, left},
-					  {cursor, arrow},
-					  {setfocus, false},
-					  {enable, false},
-					  {keypress,true}
-					 ]),
-
-    PicDir = code:priv_dir(tv),
-    BtnId = gs:button(ParentId, [{width, BtnWidth},
-				 {height, BtnHeight},
-				 {x, BtnXpos},
-				 {y, BtnYpos},
-				 {bg, ?DEFAULT_BG_COLOR},
-				 {fg, {0, 0, 0}},
-				 {label, {image, PicDir ++ "/more.xbm"}},
-				 {data, {labelbtn, pop_up}}
-				]),
-
-    {RowColLblId, BgId, FgId, BtnId}.
-    
-
-
-
-
-
-
-init_toolbar_editor(DispId, TWidth, THeight) ->
-    {BgWidth, BgHeight, BgXpos, BgYpos, Width, Height, Xpos, Ypos} = 
-	get_toolbar_editor_coords(TWidth, THeight),
-    
-    EditorFrame = gs:frame(DispId, [{width, BgWidth},
-				    {height, BgHeight},
-				    {x, BgXpos},
-				    {y, BgYpos},
-				    {bg, {0, 0, 0}}
-				   ]),
-
-    Editor = gs:editor(EditorFrame, [{width, Width},
-				     {height, Height},
-				     {x, Xpos},
-				     {y, Ypos},
-				     {vscroll, right},
-				     {wrap, word},
-				     {bg, {255, 255, 255}},
-				     {fg, {0, 0, 0}},
-				     {enable, false}
-				    ]),
-    
-    {EditorFrame, Editor}.
-    
-
-
-
-
-
-
-get_toolbar_editor_coords(TWidth, _THeight) ->
-    BgWidth  = TWidth,
-    BgHeight = 200,
-    BgXpos   = 0,
-    BgYpos   = (-1) * BgHeight - 50,
-    FgWidth  = BgWidth - 2,
-    FgHeight = BgHeight - 2,
-    FgXpos   = 1,
-    FgYpos   = 1,
-
-    {BgWidth, BgHeight, BgXpos, BgYpos, FgWidth, FgHeight, FgXpos, FgYpos}.
-
-
-
-
-
-
-resize_toolbar_editor(FrId, EdId, TWidth, THeight) ->
-    {BgWidth, BgHeight, _BgXpos, _BgYpos, FgWidth, FgHeight, _FgXpos, _FgYpos} = 
-	get_toolbar_editor_coords(TWidth, THeight),
-    gs:config(FrId, [{width, BgWidth},
-		     {height, BgHeight}
-		    ]),
-
-    gs:config(EdId, [{width, FgWidth},
-		     {height, FgHeight}
-		    ]).
-
-
-
-
-
-
-resize_toolbar_label(BgId, FgId, RowColId, BtnId, ParentWidth, ParentHeight, GWidth) ->
-    {BgWidth, BgHeight, _BgXpos, _BgYpos, FgWidth, FgHeight, _FgXpos, _FgYpos, _BtnWidth,
-     _BtnHeight, BtnXpos, BtnYpos} = 
-	get_toolbar_label_coords(ParentWidth, ParentHeight),
-
-    gs:config(RowColId, [{width, GWidth - ?VBTN_WIDTH}]),
-
-    gs:config(BgId, [{width, BgWidth},
-		     {height, BgHeight}
-		    ]),
-
-    gs:config(BtnId, [{x, BtnXpos},
-		      {y, BtnYpos}
-		     ]),
-
-    gs:config(FgId, [{width, FgWidth},
-		     {height, FgHeight}
-		    ]).    
-
-
-
-
-
-get_toolbar_label_coords(ParentWidth, ParentHeight) ->
-    BtnWidth  = 19,
-    BgWidth   = ParentWidth,
-    BgHeight  = 26,
-    BgXpos    = 0,
-    BgYpos    = ParentHeight - BgHeight - 8 - ?ROW_COL_LBL_HEIGHT + 2,
-    FgHeight  = BgHeight - 2,
-    FgWidth   = BgWidth - BtnWidth - 3,
-    FgXpos    = BgXpos + 1,
-    FgYpos    = BgYpos + 1,
-    BtnHeight = BgHeight - 2,
-    BtnXpos   = FgWidth + 2,
-    BtnYpos   = BgYpos + 1,
-
-    {BgWidth, BgHeight, BgXpos, BgYpos, FgWidth, FgHeight, FgXpos, FgYpos, BtnWidth,
-    BtnHeight, BtnXpos, BtnYpos}.
-    
-
-
-
-
-
-send_to_rec_edit(undefined, _Msg) ->
-    done;
-send_to_rec_edit(RecPid, Msg) ->
-    RecPid ! Msg.
-
-
-
-
diff --git a/lib/tv/src/tv_pd_frames.erl b/lib/tv/src/tv_pd_frames.erl
deleted file mode 100644
index aab40e2bba..0000000000
--- a/lib/tv/src/tv_pd_frames.erl
+++ /dev/null
@@ -1,482 +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%
--module(tv_pd_frames).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,frame,2}}]).
-
-
-
--export([create_display_frames/4, resize_display_frames/3]).
-
-
-
-
--include("tv_int_def.hrl").
--include("tv_pd_int_def.hrl").
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_display_frames(WindowId, WindowWidth, WindowHeight, FrameP) ->
-    {DisplayId, DisplayWidth, DisplayHeight} = 
-	create_frame(WindowId, 
-		     get_display_coords(WindowWidth, WindowHeight),
-		     ?DEFAULT_BG_COLOR,
-		     0),
-
-    {ToolbarId, ToolbarWidth, ToolbarHeight} = create_toolbar_frame(DisplayId, 
-								    DisplayWidth),
-
-    {SheetFrameId, SheetBgFrameId, SheetFrameWidth, SheetFrameHeight} = 
-	create_sheet_frames(DisplayId, 
-			    DisplayWidth, 
-			    DisplayHeight),
-
-    {GridFrameId, GridBgFrameId, GridFrameWidth, GridFrameHeight} = 
-	create_grid_frames(SheetFrameId, 
-			   SheetFrameWidth, 
-			   SheetFrameHeight),
-    
-    
-    FrameP#frame_params{display_id           = DisplayId,
-			toolbar_frame_id     = ToolbarId,
-			toolbar_frame_width  = ToolbarWidth,
-			toolbar_frame_height = ToolbarHeight,
-			sheet_frame_id       = SheetFrameId,
-			sheet_frame_width    = SheetFrameWidth,
-			sheet_frame_height   = SheetFrameHeight,
-			sheet_bgframe_id     = SheetBgFrameId,
-			grid_frame_id        = GridFrameId,
-			grid_frame_width     = GridFrameWidth,
-			grid_frame_height    = GridFrameHeight,
-			grid_bgframe_id      = GridBgFrameId
-			}.
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_display_frames(NewW, NewH, FrameP) ->
-    #frame_params{display_id         = DispId,
-		  toolbar_frame_id   = ToolbarId,
-		  sheet_frame_id     = SheetFgId,
-		  sheet_bgframe_id   = SheetBgId,
-		  grid_frame_id      = GridFgId,
-		  grid_bgframe_id    = GridBgId}  = FrameP,
-    
-    {NewDispW, NewDispH} = config_frame(DispId, get_display_coords(NewW, NewH)),
-    {NewToolW, NewToolH} = resize_toolbar(ToolbarId, NewDispW),
-    {NewSheetFgW, NewSheetFgH} = resize_sheet_frames(SheetFgId, SheetBgId, NewDispW,
-						     NewDispH),
-
-    {NewGridFgW, NewGridFgH} = resize_grid_frames(GridFgId, GridBgId, NewSheetFgW, 
-						  NewSheetFgH),
-    
-    FrameP#frame_params{toolbar_frame_width  = NewToolW,
-			toolbar_frame_height = NewToolH,
-			sheet_frame_width    = NewSheetFgW,
-			sheet_frame_height   = NewSheetFgH,
-			grid_frame_width     = NewGridFgW,
-			grid_frame_height    = NewGridFgH
-			}.
-
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-config_frame(Id, {Width, Height, Xpos, Ypos}) ->
-    gs:config(Id, [{width, Width},
-		   {height, Height},
-		   {x, Xpos},
-		   {y, Ypos}
-		  ]),
-    {Width, Height}.
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_frame(ParentId, {Width, Height, Xpos, Ypos}, Color, BorderWidth) ->
-    Id = gs:frame(ParentId, [{width, Width},
-			     {height, Height},
-			     {x, Xpos},
-			     {y, Ypos},
-			     {bw, BorderWidth},
-			     {bg, Color}
-			    ]),
-    {Id, Width, Height}.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_grid_frames(SheetFrameId, SheetFrameWidth, SheetFrameHeight) ->
-    {BgId, _W, _H} = 
-	create_frame(SheetFrameId,
-		     get_grid_frame_coords(bg, SheetFrameWidth, SheetFrameHeight),
-		     ?BLACK, 
-		     0),
-    {FgId, FgWidth, FgHeight} = 
-	create_frame(SheetFrameId, 
-		     get_grid_frame_coords(fg, SheetFrameWidth, SheetFrameHeight),
-		     ?DEFAULT_BG_COLOR, 
-		     0),
-    {FgId, BgId, FgWidth, FgHeight}.
-    
-    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_sheet_frames(DispId, DispWidth, DispHeight) ->
-    {BgId, _W, _H} = create_frame(DispId, 
-				  get_sheet_frame_coords(bg, DispWidth, DispHeight),
-				  ?BLACK, 
-				  0),
-    {FgId, FgWidth, FgHeight} = 
-	create_frame(DispId, 
-		     get_sheet_frame_coords(fg, DispWidth, DispHeight), 
-		     ?DEFAULT_BG_COLOR, 
-		     0),
-    {FgId, BgId, FgWidth, FgHeight}.
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_toolbar_frame(DispId, DispWidth) ->
-    create_frame(DispId, get_toolbar_coords(DispWidth), ?DEFAULT_BG_COLOR, 0).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_display_coords(WindowWidth, WindowHeight) ->
-    Xpos = 4,
-    {WindowWidth - 2 * Xpos, WindowHeight - ?MENUBAR_HEIGHT - Xpos, Xpos, ?MENUBAR_HEIGHT}.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_grid_frame_coords(bg, FrameWidth, FrameHeight) ->
-    get_grid_frame_coords2(FrameWidth, FrameHeight, 0);
-get_grid_frame_coords(fg, FrameWidth, FrameHeight) ->
-    get_grid_frame_coords2(FrameWidth, FrameHeight, 1).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_grid_frame_coords2(FrameWidth, FrameHeight, BorderWidth) ->
-    Xpos   = 0,
-    Ypos   = 0,
-    Width  = FrameWidth - ?VSCALE_WIDTH - Xpos - BorderWidth,
-    Height = FrameHeight - ?HSCALE_HEIGHT - Ypos - BorderWidth,
-    {Width, Height, Xpos, Ypos}.
-    
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_sheet_frame_coords(bg, FrameWidth, FrameHeight) ->
-    get_sheet_frame_coords2(FrameWidth, FrameHeight, 0);
-get_sheet_frame_coords(fg, FrameWidth, FrameHeight) ->
-    get_sheet_frame_coords2(FrameWidth, FrameHeight, 1).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_sheet_frame_coords2(FrameWidth, FrameHeight, BorderWidth) ->
-    Xpos   = BorderWidth,
-    Ypos   = ?TOOLBAR_HEIGHT + BorderWidth,
-    Width  = FrameWidth - 2 * BorderWidth,
-    Height = FrameHeight - Ypos - ?MISC_AREA_HEIGHT - BorderWidth,
-    {Width, Height, Xpos, Ypos}.
-
-
-    
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_toolbar_coords(DispWidth) ->
-    Xpos = 0,
-    {DispWidth - 2 * Xpos, ?TOOLBAR_HEIGHT, Xpos, 0}.
-
-
-
-
-
-    
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_grid_frames(FgId, BgId, ParentWidth, ParentHeight) ->
-    config_frame(BgId, get_grid_frame_coords(bg, ParentWidth, ParentHeight)),
-    config_frame(FgId, get_grid_frame_coords(fg, ParentWidth, ParentHeight)).
-
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_sheet_frames(FgId, BgId, ParentWidth, ParentHeight) ->
-    config_frame(BgId, get_sheet_frame_coords(bg, ParentWidth, ParentHeight)),
-    config_frame(FgId, get_sheet_frame_coords(fg, ParentWidth, ParentHeight)).
-		 
-    
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_toolbar(Id, DispWidth) ->
-    config_frame(Id, get_toolbar_coords(DispWidth)).
-
-
-
diff --git a/lib/tv/src/tv_pd_int_def.hrl b/lib/tv/src/tv_pd_int_def.hrl
deleted file mode 100644
index 2c76bef892..0000000000
--- a/lib/tv/src/tv_pd_int_def.hrl
+++ /dev/null
@@ -1,139 +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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      Internal definitions for the pd part of the table tool.
-%%%
-%%%*********************************************************************
-
--define(SCALE_FUNC_FILE, tv_pd_scale).
--define(DISP_FUNC_FILE, tv_pd_display).
-
-
--define(SCALE_WIDTH, 75).
--define(VSCALE_WIDTH, 75).
--define(HSCALE_HEIGHT, 75).
--define(MENUBAR_HEIGHT, 30).
--define(TOOLBAR_HEIGHT, 84).  %% 97
--define(DISPLAY_HEIGHT, 849).
--define(MISC_AREA_HEIGHT, 0).
--define(GRID_HEIGHT, 849).
--define(NOF_GRIDROWS, 35). %% 29
--define(NOF_GRIDCOLS, 10).
--define(DEFAULT_COLWIDTH, 100).
--define(ROW_HEIGHT, 20). %% 24
--define(VBTN_WIDTH, 55). %% 18
--define(HBTN_HEIGHT, 20).
--define(RESBTN_WIDTH, 5).
--define(DEFAULT_GRID_BGCOLOR, {255,255,255}).
--define(DEFAULT_GRID_FGCOLOR, {0,0,0}).
--define(GRID_MARK_COLOR, {0,255,255}).
--define(GRID_FONT, {courier,12}).
-
--define(ROW_COL_LBL_WIDTH, 140).
--define(ROW_COL_LBL_HEIGHT, 14).
-    
-
-
--define(KEY_MARK_AREA_HEIGHT, 21).
-
-
--define(DEFAULT_BG_COLOR, {217,217,217}).
--define(DEFAULT_ROW_COLOR, {178,34,34}).   % Firebrick!
--define(DEFAULT_GRID_COLOR, {0,0,0}). 
--define(LIGHT_GRAY, {226,226,226}).
--define(DARK_VIOLET, {148,0,211}).
--define(FIREBRICK, {178,34,34}).
--define(ANTIQUE_WHITE, {255,255,235}).
-
-
--record(frame_params, {display_id,
-		       toolbar_frame_id,
-		       toolbar_frame_width,
-		       toolbar_frame_height,
-		       sheet_frame_id,
-		       sheet_frame_width,
-		       sheet_frame_height,
-		       sheet_bgframe_id,
-		       grid_frame_id,
-		       grid_frame_width,
-		       grid_frame_height,
-		       grid_bgframe_id
-		      }).
-
-
-
-
--record(scale_params, {vscale_id,
-		       vscale_pos = 0,
-		       hscale_id,
-		       hscale_pos = 0
-		      }).
-
-
-
-
--record(mark_params, {cell_id, 
-		      cell_col_no,         % Virtual number!
-		      row_no,              % Real number!
-		      virtual_row_no,
-		      col_no,              % Virtual number!
-		      sort_col_no,
-		      marked_object,
-		      marked_color
-		     }).
-
-
-
--record(toolbar_params, {parent_id,
-			 row_col_label_id,
-			 bg_label_id,
-			 fg_label_id,
-			 label_btn_id,
-			 pop_up_frame_id,
-			 pop_up_label_id,
-			 editor_frame_id,
-			 editor_id
-			}).
-
-
--record(process_variables, {master_pid,
-			    pg_pid,
-			    pb_pid,
-			    rec_pid,
-			    window_id,
-			    window_width,
-			    window_height,
-			    initialising     = true,
-			    table_type,
-			    table_name,
-			    record_name,
-			    writable         = false,
-			    lists_as_strings = true,
-			    sorting_on       = false,
-			    first_col_shown  = 1,
-			    first_row_shown  = 1,
-			    nof_rows_shown,
-			    cols_shown       = [],
-			    data_list        = [],
-			    color_list       = [],
-			    frame_params     = #frame_params{},
-			    scale_params     = #scale_params{},
-			    mark_params      = #mark_params{},
-			    toolbar_params   = #toolbar_params{}
-			   }).
diff --git a/lib/tv/src/tv_pd_int_msg.hrl b/lib/tv/src/tv_pd_int_msg.hrl
deleted file mode 100644
index faf23a9376..0000000000
--- a/lib/tv/src/tv_pd_int_msg.hrl
+++ /dev/null
@@ -1,433 +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%
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY PG
-%%%*********************************************************************
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_init_grid, {sender,
-		       parent_id,
-		       width,
-		       height,
-		       xpos,
-		       ypos,
-		       nof_rows,
-		       row_height
-		      }).
-
-
-
--record(pg_list_info, {sender,
-		       lists_as_strings}).
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_col_info, {sender,
-		      first_col_shown,
-		      width_of_cols_shown,
-		      nof_rows_shown
-		     }).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_col_marked, {sender,
-			virtual_col
-		       }).
-
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_row_marked, {sender,
-			virtual_row
-		       }).
-
-
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
--record(pg_data, {sender,
-		  data,
-		  first_row_shown
-		 }).
-
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
--record(pg_cell_marked, {sender,
-			 cell_marked,    % true or false
-			 real_col,
-			 real_row,
-			 virtual_col,
-			 virtual_row,
-			 cell_text
-			}).
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
--record(pg_resize_grid, {sender,
-			 width,
-			 height
-			}).
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
--record(pg_resize_grid_col, {sender,
-			     real_col_no,
-			     virtual_col_no,
-			     xdiff
-			    }).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
--record(pg_horizontal_scroll, {sender,
-			       leftmost_virtual_col
-			      }).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_ready, {sender}).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_remove_marks, {sender}).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_mark_col, {sender,
-		      virtual_col,
-		      real_col
-		     }).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pg_mark_row, {sender,
-		      virtual_row,
-		      real_row
-		     }).
-
-
-
-
-
-
-%%%*********************************************************************
-%%% MESSAGES OWNED BY PB
-%%%*********************************************************************
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
--record(pb_init_btns, {sender,
-		       parent_id,
-		       parent_width,
-		       parent_height,
-		       ypos,
-		       hbtn_height,
-		       resbtn_width,
-		       vbtn_width,
-		       nof_rows,
-		       row_height,
-		       first_col_shown,
-		       cols_shown
-		      }).
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_remove_marks, {sender}).
-			  
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_update_hbtns, {sender,
-			  parent_width,
-			  parent_height,
-			  first_col_shown,
-			  cols_shown
-			 }).
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_update_vbtns, {sender,
-			  color_list,
-			  first_row_shown,
-			  nof_rows_shown,
-			  blinking_enabled
-			 }).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_key_info, {sender,
-		      list_of_keys
-		     }).
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_new_colwidth, {sender,
-			  real_col,
-			  virtual_col,
-			  xdiff
-			 }).
-
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_col_marked, {sender,
-			col_marked,    % 'true' or 'false'
-			real_col,
-			virtual_col
-		       }).
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_row_marked, {sender,
-			row_marked,    % 'true' or 'false'
-			real_row,
-			virtual_row
-		       }).
-
-
-
-
-%%======================================================================
-%% Message:   
-%%
-%% Function:   
-%%
-%% Data:       
-%%======================================================================
-
-
--record(pb_set_sort_col, {sender,
-			  virtual_col
-			 }).
-
-
-
-
diff --git a/lib/tv/src/tv_pd_scale.erl b/lib/tv/src/tv_pd_scale.erl
deleted file mode 100644
index 04af2bb981..0000000000
--- a/lib/tv/src/tv_pd_scale.erl
+++ /dev/null
@@ -1,305 +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:      Part of pd controlling the scale, i.e., the scrollbar
-%%%                     imitation.
-%%%
-%%%*********************************************************************
-
-
--module(tv_pd_scale).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,scale,2}}]).
-
-
-
--export([init_scale/2, 
-	 resize_scale/2, 
-	 set_scale_range/3, 
-	 set_scale_pos/3]).
-
-
-
--include("tv_int_def.hrl").
--include("tv_pd_int_def.hrl").
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-init_scale(FrameP, ScaleP) ->
-    #frame_params{sheet_frame_id     = SheetFrameId,
-		  sheet_frame_width  = SheetFrameWidth,
-		  sheet_frame_height = SheetFrameHeight,
-		  grid_frame_width   = GridFrameWidth,
-		  grid_frame_height  = GridFrameHeight} = FrameP,
-
-    VScaleId = create_scale(vscale, SheetFrameId, SheetFrameWidth, GridFrameHeight),
-    HScaleId = create_scale(hscale, SheetFrameId, GridFrameWidth, SheetFrameHeight),
-    
-    ScaleP#scale_params{vscale_id  = VScaleId,
-			vscale_pos = 0,
-			hscale_id  = HScaleId,
-			hscale_pos = 0
-		       }.
-    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_scale(FrameP, ScaleP) ->
-    #frame_params{sheet_frame_width  = SheetFrameWidth,
-		  sheet_frame_height = SheetFrameHeight,
-		  grid_frame_width   = GridFrameWidth,
-		  grid_frame_height  = GridFrameHeight} = FrameP,
-
-    #scale_params{vscale_id    = VScaleId,
-		  hscale_id    = HScaleId} = ScaleP,
-
-    config_scale(vscale, VScaleId, SheetFrameWidth, GridFrameHeight),
-    config_scale(hscale, HScaleId, GridFrameWidth, SheetFrameHeight),
-    ScaleP.
-
-
-
-
-
-
-
-    
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-set_scale_range(vscale, Range, ScaleP) ->
-    {Lo, Hi} = Range,
-    NewRange = if
-		   Lo > Hi ->
-		       {Hi, Hi};
-		   true ->
-		       Range
-	       end,
-    VScaleId = ScaleP#scale_params.vscale_id,
-    gs:config(VScaleId, [{range, NewRange}]);
-set_scale_range(hscale, Range, ScaleP) ->
-    {Lo, Hi} = Range,
-    NewRange = if
-		   Lo > Hi ->
-		       {Hi, Hi};
-		   true ->
-		       Range
-	       end,
-    HScaleId = ScaleP#scale_params.hscale_id,
-    gs:config(HScaleId, [{range, NewRange}]).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-set_scale_pos(_ScaleName, undefined, ScaleP) ->
-    ScaleP;
-set_scale_pos(vscale, NewPos, ScaleP) ->
-    ScaleId = ScaleP#scale_params.vscale_id,
-    gs:config(ScaleId, [{pos, NewPos}]),
-    ScaleP#scale_params{vscale_pos = NewPos};
-set_scale_pos(hscale, NewPos, ScaleP) ->
-    ScaleId = ScaleP#scale_params.hscale_id,
-    gs:config(ScaleId, [{pos, NewPos}]),
-    ScaleP#scale_params{hscale_pos = NewPos}.
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-config_scale(ScaleName, ScaleId, FrameWidth, FrameHeight) ->
-    {Width, Height, Xpos, Ypos} = get_scale_coords(ScaleName, 
-						   FrameWidth, 
-						   FrameHeight),
-    gs:config(ScaleId, [{height, Height},
-			{width, Width},
-			{x, Xpos},
-			{y, Ypos}
-		       ]).
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_scale(ScaleName, FrameId, FrameWidth, FrameHeight) ->
-    {Width, Height, Xpos, Ypos} = get_scale_coords(ScaleName, 
-						   FrameWidth, 
-						   FrameHeight),
-    {Orientation, Range}  = case ScaleName of 
-				vscale ->
-				    {vertical, {1, 1}};
-				hscale ->
-				    {horizontal, {1, 1}}
-			    end,
-    gs:scale(FrameId, [{data, ScaleName},
-		       {orient, Orientation},
-		       {buttonpress, true},
-		       {buttonrelease, true},
-		       {height, Height},
-		       {width, Width},
-		       {x, Xpos},
-		       {y, Ypos},
-		       {bg, ?DEFAULT_BG_COLOR},
-		       {fg, {0, 0, 0}},
-		       {range, Range}
-		      ]).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_scale_coords(hscale, FrameWidth, FrameHeight) ->
-    Height = ?HSCALE_HEIGHT,
-    Xpos   = ?VBTN_WIDTH - 3,  % Subtracting 3 makes it look better!
-    Ypos   = FrameHeight - Height,
-    Width  = FrameWidth - Xpos + 5,  % Adding 5 for better look!
-    {Width, Height, Xpos, Ypos};
-get_scale_coords(vscale, FrameWidth, FrameHeight) ->
-    Width  = ?VSCALE_WIDTH,
-    Xpos   = (FrameWidth - Width),
-    Ypos   = ?HBTN_HEIGHT - 3,       % Subtracting 3 makes it look better!
-    Height = FrameHeight - Ypos + 5,   % Adding 5 for better look!
-    {Width, Height, Xpos, Ypos}.
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_pg.erl b/lib/tv/src/tv_pg.erl
deleted file mode 100644
index 7194cfb756..0000000000
--- a/lib/tv/src/tv_pg.erl
+++ /dev/null
@@ -1,430 +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%
--module(tv_pg).
--compile([{nowarn_deprecated_function,{gs,config,2}}]).
-
-
-
--export([pg/1]).
-
-
--include("tv_int_def.hrl").
--include("tv_pg_int_def.hrl").
--include("tv_pd_int_msg.hrl").
-
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      pg.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Process controlling the grid part of the display.
-%%
-%% Parameters:    None.
-%%======================================================================
-
-
-pg(ParentPid) ->
-    process_flag(trap_exit, true),
-    ProcVars = #process_variables{parent_pid = ParentPid},
-    loop(ProcVars).
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-%%======================================================================
-%% Function:      loop.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Eternal (well, almost) loop, receiving messages and 
-%%                handling them.
-%%
-%% Parameters:    
-%%======================================================================
-
-
-
-loop(ProcVars) ->
-    receive
-	Msg ->
-	    case Msg of
-		
-		
-		#pg_data{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = update_grid_data(Msg, ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-		#pg_list_info{lists_as_strings=ListAsStr} ->
-		    NewProcVars = tv_pg_gridfcns:handle_list_info(ListAsStr, ProcVars),
-		    loop(NewProcVars);
-
-		#pg_horizontal_scroll{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = scroll_grid_horizontally(Msg, ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-		#pg_remove_marks{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = tv_pg_gridfcns:remove_marks(ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-		#pg_col_marked{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = mark_grid_col(Msg, ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-		#pg_row_marked{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = mark_grid_row(Msg, ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-		#pg_resize_grid_col{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = resize_grid_column(Msg, ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-		#pg_resize_grid{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = resize_grid(Msg, ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-		#pg_init_grid{} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = init_grid(Msg, ProcVars),
-		    mark_nonbusy(GridId),
-		    PdPid = ProcVars#process_variables.parent_pid,
-		    PdPid ! #pg_ready{sender = self()},
-		    loop(NewProcVars);
-
-		{gs, Id, Event, Data, Args} ->
-		    GridId = mark_busy(ProcVars),
-		    NewProcVars = gs_messages({Id, Event, Data, Args}, ProcVars),
-		    mark_nonbusy(GridId),
-		    loop(NewProcVars);
-
-
-		{'EXIT', Pid, Reason} ->
-		    ParentPid = ProcVars#process_variables.parent_pid,
-		    exit_signals({Pid, Reason}, ParentPid, ProcVars),
-		    loop(ProcVars);
-
-		_Other ->
-		    loop(ProcVars)
-	    end
-    end.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-exit_signals(ExitInfo, ParentPid, _ProcVars) ->
-    case ExitInfo of
-	{ParentPid, _Reason} ->
-	    exit(normal);
-	_Other ->
-	    done
-    end.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-gs_messages(Msg, ProcVars) ->
-
-    case Msg of
-
-	{Id, buttonpress, {gridcell, RealCol, RealRow, _FrameId}, [1 | _]} ->
-	    NewProcVars = tv_pg_gridfcns:mark_cell_and_notify(Id, RealCol, 
-							       RealRow, ProcVars),
-	    NewProcVars;
-
-
-	_OtherMessage ->
-	    ProcVars
-
-    end.
-	    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-init_grid(Msg, ProcVars) ->
-    #pg_init_grid{parent_id  = ParentId,
-		  width      = Width,
-		  height     = Height,
-		  xpos       = Xpos,
-		  ypos       = Ypos,
-		  nof_rows   = NofRows,
-		  row_height = RowHeight} = Msg,
-    tv_pg_gridfcns:init_grid(ParentId, Width, Height, Xpos, Ypos, NofRows, 
-			      RowHeight, ProcVars).
-
-
-
-
-
-
-
-
-    
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_grid(Msg, ProcVars) ->
-    #pg_resize_grid{width  = Width,
-		    height = Height}  = Msg,
-    tv_pg_gridfcns:resize_grid(Width, Height, ProcVars).
-
-
-
-
-
-
-
-
-
-    
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_grid_column(Msg, ProcVars) ->
-    #pg_resize_grid_col{real_col_no    = RealCol,
-			virtual_col_no = VirtualCol,
-			xdiff          = Xdiff}  = Msg,
-    tv_pg_gridfcns:resize_grid_column(RealCol, VirtualCol, Xdiff, ProcVars).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-scroll_grid_horizontally(Msg, ProcVars) ->
-    FirstColShown = ?COMM_FUNC_FILE:max(1, Msg#pg_horizontal_scroll.leftmost_virtual_col),
-    tv_pg_gridfcns:scroll_grid_horizontally(FirstColShown, ProcVars).
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_grid_data(Msg, ProcVars) ->
-    #pg_data{data            = Data,
-	     first_row_shown = FirstRowShown} = Msg,
-    tv_pg_gridfcns:update_grid_data(Data, FirstRowShown, ProcVars).
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_grid_col(Msg, ProcVars) ->
-    #pg_col_marked{virtual_col = VirtualCol} = Msg,
-    tv_pg_gridfcns:mark_col(VirtualCol, ProcVars).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_grid_row(Msg, ProcVars) ->
-    #pg_row_marked{virtual_row = VirtualRow} = Msg,
-    tv_pg_gridfcns:mark_row(VirtualRow, ProcVars).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_busy(ProcVars) ->
-    GridP = ProcVars#process_variables.grid_params,
-    GridId = GridP#grid_params.fg_frame,
-    gs:config(GridId, [{cursor, busy}]),
-    GridId.
-    
-
-    
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_nonbusy(GridId) ->
-    gs:config(GridId, [{cursor, arrow}]).
-
diff --git a/lib/tv/src/tv_pg_gridfcns.erl b/lib/tv/src/tv_pg_gridfcns.erl
deleted file mode 100644
index d037b42294..0000000000
--- a/lib/tv/src/tv_pg_gridfcns.erl
+++ /dev/null
@@ -1,1918 +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%
--module(tv_pg_gridfcns).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,read,2}}]).
-
-
-
-
--export([init_grid/8, 
-	 resize_grid/3, 
-	 resize_grid_column/4, 
-	 update_grid_data/3,
-	 scroll_grid_horizontally/2, 
-	 mark_cell_and_notify/4, 
-	 remove_marks/1,
-	 mark_col/2, 
-	 mark_row/2,
-	 handle_list_info/2
-	]).
-
-
-
-
-
--include("tv_pd_int_msg.hrl").
--include("tv_pg_int_def.hrl").
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-init_grid(GridParentId, GridWidth, 
-	  GridHeight, GridXpos, GridYpos, NofRows, RowHeight, ProcVars) ->
-
-       % Get the size and ID of the grid-parent frame, i.e., the
-       % grid-frame! Do not confuse the base-frames below with 
-       % the grid-frame!
-
-    #process_variables{parent_pid  = ParentPid,
-		       grid_params = GridP}   = ProcVars,
-    
-    #grid_params{fg_color        = GridFgColor,
-		 nof_cols        = NofCols,
-		 col_width       = DefaultColWidth,
-		 first_col_shown = FirstColShown,
-		 col_widths      = ColWidths} = GridP,
-    
-       % Create the two frames the column frames are placed on!
-       % These two frames defines the size of the grid.
-    BgFrame = create_base_frame(GridParentId, GridWidth, GridHeight, 
-				 GridXpos, GridYpos, GridFgColor),
-    FgFrame = create_base_frame(BgFrame, GridWidth - 1, GridHeight - 1, 
-			    0, 0, GridFgColor),
-
-       % Compute the the colwidths necessary to cover the grid.
-    ColsShown = compute_cols_shown(FirstColShown, ColWidths, GridWidth, NofCols, 
-				   DefaultColWidth),
-    NofRowsShown = compute_rows_shown(GridHeight, RowHeight),
-
-       % Tell parent about the width of columns shown!
-    ParentPid ! #pg_col_info{sender              = self(),
-			     first_col_shown     = FirstColShown,
-			     width_of_cols_shown = ColsShown,
-			     nof_rows_shown      = NofRowsShown
-			    },
-
-    NewNofCols = erlang:max(length(ColsShown), NofCols),
-
-       % The GridColWidths list shall contain the current width of each frame.
-    NewColWidths = update_col_widths(ColsShown, ColWidths, FirstColShown, 
-				     DefaultColWidth),
-    
-       % Create column frames, one for each column, and rows (labels) on each frame.
-    {FrameIdList, ColLabelList} = create_col_frames(NewNofCols, NofRows, RowHeight,
-						    FgFrame, GridP, [], []),
-
-       % Get lists of label-ID's for each row. (When we created the column frames,
-       % we got the id's of labels placed on each column, i.e., vertically. 
-       % However, most often we want the id's for one row, i.e., label id's
-       % horisontally.)
-    RowIdList    = get_row_ids(NofRows, ColLabelList, []),
-    
-       % Update the grid_params record with the new values!
-    NewGridP = GridP#grid_params{bg_frame       = BgFrame,
-				 fg_frame       = FgFrame,
-				 grid_width     = GridWidth,
-				 grid_height    = GridHeight,
-				 grid_xpos      = GridXpos,
-				 grid_ypos      = GridYpos,
-				 nof_cols       = NewNofCols,
-				 col_widths     = NewColWidths,
-				 cols_shown     = ColsShown,
-				 nof_rows       = NofRows,
-				 row_height     = RowHeight,
-				 nof_rows_shown = NofRowsShown,
-				 col_frame_ids  = FrameIdList,
-				 col_ids        = ColLabelList,
-				 row_ids        = RowIdList,
-				 row_data_list  = lists:duplicate(NofRows, notext)
-				},
-    
-    ProcVars#process_variables{grid_parent_id = GridParentId, 
-			       grid_params    = NewGridP}.
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_grid(NewWidth, NewHeight, ProcVars) ->
-    #process_variables{parent_pid  = ParentPid,
-		       grid_params = GridP,
-		       mark_params  = MarkP}   = ProcVars,
-    
-    #grid_params{bg_frame         = BgFrame,
-		 fg_frame         = FgFrame,
-		 nof_cols         = NofCols,
-		 nof_rows         = NofRows,
-		 col_width        = DefaultColWidth,
-		 first_col_shown  = FirstColShown,
-		 col_widths       = ColWidths,
-		 row_height       = RowHeight,
-		 col_frame_ids    = ColFrameIds,
-		 col_ids          = ColIds,
-		 row_ids          = RowIds,
-		 bg_color         = BgColor,
-		 fg_color         = FgColor,
-		 row_data_list    = RowDataList,
-		 lists_as_strings = ListAsStr}  = GridP,
-    
-    gs:config(BgFrame, [{width, NewWidth},
-			{height, NewHeight}
-		       ]),
-    gs:config(FgFrame, [{width, NewWidth - 1},
-			{height, NewHeight - 1}
-		       ]),
-
-    ColsShown    = compute_cols_shown(FirstColShown, ColWidths, NewWidth, NofCols, 
-				      DefaultColWidth),
-
-    NofRowsShown = compute_rows_shown(NewHeight, RowHeight),
-
-
-       % Tell parent about the width of columns shown!
-    ParentPid ! #pg_col_info{sender              = self(),
-			     first_col_shown     = FirstColShown,
-			     width_of_cols_shown = ColsShown,
-			     nof_rows_shown      = NofRowsShown
-			    },
-
-    NewColWidths = update_col_widths(ColsShown, ColWidths, FirstColShown, 
-				     DefaultColWidth),
-    
-    NofColsShown = length(ColsShown),
-    {NewNofCols, NewColFrameIds, NewColIds, NewRowIds} = 
-	check_nof_cols(ColsShown, (NofColsShown - NofCols), ColFrameIds, ColIds, 
-		       RowIds, NofRows, RowHeight, FgColor, BgColor ),
-
-    clear_fields(safe_nthtail(NofColsShown, NewColIds),
-		 safe_nthtail(NofRowsShown, NewRowIds)),
-
-    RowsToUpdate = lists:sublist(NewRowIds, NofRowsShown),
-
-    refresh_visible_rows(RowsToUpdate, FirstColShown, NofColsShown, RowDataList, ListAsStr),
-    
-    NewGridP = GridP#grid_params{grid_width     = NewWidth,
-				 grid_height    = NewHeight,
-				 nof_cols       = NewNofCols,
-				 nof_rows_shown = NofRowsShown,
-				 cols_shown     = ColsShown,
-				 col_widths     = NewColWidths,
-				 col_frame_ids  = NewColFrameIds,
-				 col_ids        = NewColIds,
-				 row_ids        = NewRowIds
-				},
-
-    refresh_marks(NewGridP, MarkP),
-
-    ProcVars#process_variables{grid_params = NewGridP}.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_grid_column(RealCol, VirtualCol, Xdiff, ProcVars) ->
-    #process_variables{parent_pid  = ParentPid,
-		       grid_params = GridP,
-		       mark_params = MarkP}   = ProcVars,
-    
-    #grid_params{grid_width       = GridWidth,
-		 first_col_shown  = FirstColShown,
-		 nof_cols         = NofCols,
-		 col_widths       = ColWidths,
-		 col_frame_ids    = ColFrameIds,
-		 col_ids          = ColIds,
-		 col_width        = DefaultColWidth,
-		 row_ids          = RowIds,
-		 max_col_width    = MaxColWidth,
-		 min_col_width    = MinColWidth,
-		 nof_rows         = NofRows,
-		 nof_rows_shown   = NofRowsShown,
-		 row_height       = RowHeight,
-		 bg_color         = BgColor,
-		 fg_color         = FgColor,
-		 row_data_list    = RowDataList,
-		 lists_as_strings = ListAsStr}  = GridP,
-    
-       % Get new width!
-    Width = erlang:min(MaxColWidth, erlang:max((lists:nth(VirtualCol, ColWidths) + Xdiff),
-				 MinColWidth)),
-
-       % Resize the column.
-    NewWidthOfCol = resize_one_column(RealCol, Width, ColFrameIds, MaxColWidth, 
-				      MinColWidth),
-
-       % Update the ColWidths list.
-    TempColWidths = lists:sublist(ColWidths, VirtualCol - 1) ++ 
-	[NewWidthOfCol | safe_nthtail(VirtualCol, ColWidths)],
-    
-       % Check the other columns, whether a new column has to be created.
-    ColsShown    = compute_cols_shown(FirstColShown, TempColWidths, GridWidth, 
-				      NofCols, DefaultColWidth),
-
-       % Get the final ColWidths list, after all updates!
-    NewColWidths = update_col_widths(ColsShown, TempColWidths, FirstColShown, 
-				     DefaultColWidth),
-
-       % Tell parent about the width of columns shown!
-    ParentPid ! #pg_col_info{sender              = self(),
-			     first_col_shown     = FirstColShown,
-			     width_of_cols_shown = ColsShown,
-			     nof_rows_shown      = NofRowsShown
-			    },
-
-       % Get the new number of columns (may have changed).
-    NofColsShown = length(ColsShown),
-    {NewNofCols, NewColFrameIds, NewColIds, NewRowIds} = 
-	check_nof_cols(ColsShown, (NofColsShown - NofCols), ColFrameIds, ColIds, 
-		       RowIds, NofRows, RowHeight, FgColor, BgColor ),
-
-    RowsToUpdate = lists:sublist(NewRowIds, NofRowsShown),
-    refresh_visible_rows(RowsToUpdate, FirstColShown, NofColsShown, RowDataList, ListAsStr),
-    
-    NewGridP = GridP#grid_params{nof_cols       = NewNofCols,
-				 cols_shown     = ColsShown,
-				 col_widths     = NewColWidths,
-				 col_frame_ids  = NewColFrameIds,
-				 col_ids        = NewColIds,
-				 row_ids        = NewRowIds
-				},
-
-    refresh_marks(NewGridP, MarkP),
-
-    ProcVars#process_variables{grid_params = NewGridP}.
-    
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-handle_list_info(ListAsStr, ProcVars) ->
-    #process_variables{grid_params = GridP}   = ProcVars,
-    
-    #grid_params{first_col_shown  = FirstColShown,
-		 cols_shown       = ColsShown,
-		 nof_rows_shown   = NofRowsShown,
-		 row_data_list    = RowDataList,
-		 row_ids          = RowIds,
-		 lists_as_strings = OldListAsStr}  = GridP,
-
-    case ListAsStr of
-	OldListAsStr ->
-	    ProcVars;
-	_NewValue ->
-	    NofColsShown = length(ColsShown),
-	    RowsToUpdate = lists:sublist(RowIds, NofRowsShown),
-	    refresh_visible_rows(RowsToUpdate, FirstColShown, NofColsShown, 
-				 RowDataList, ListAsStr),
-	    NewGridP = GridP#grid_params{lists_as_strings = ListAsStr},
-	    ProcVars#process_variables{grid_params = NewGridP}
-    end.
-    
-
-
-
-update_grid_data(Data, FirstRowShown, ProcVars) ->
-    #process_variables{grid_params = GridP,
-		       mark_params = MarkP}   = ProcVars,
-    
-    #grid_params{first_col_shown  = FirstColShown,
-		 cols_shown       = ColsShown,
-		 nof_rows         = NofRows,
-		 nof_rows_shown   = NofRowsShown,
-		 row_ids          = RowIds,
-		 lists_as_strings = ListAsStr}  = GridP,
-    
-    NofColsShown = length(ColsShown),
-    RowsToUpdate = lists:sublist(RowIds, NofRowsShown),
-
-    NewMarkP = move_marks(FirstColShown, FirstRowShown, GridP, MarkP),
-
-    update_visible_rows(RowsToUpdate, FirstColShown, NofColsShown, Data, ListAsStr),
-    NewRowDataList = make_row_data_list(1, NofRows, Data),
-    
-    NewGridP = GridP#grid_params{first_row_shown = FirstRowShown,
-				 row_data_list   = NewRowDataList},
-
-    ProcVars#process_variables{grid_params = NewGridP,
-			       mark_params = NewMarkP}.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-scroll_grid_horizontally(NewFirstColShown, ProcVars) ->
-    #process_variables{parent_pid  = ParentPid,
-		       grid_params = GridP,
-		       mark_params = MarkP}   = ProcVars,
-    
-    #grid_params{grid_width       = Width,
-		 nof_cols         = NofCols,
-		 nof_rows         = NofRows,
-		 nof_rows_shown   = NofRowsShown,
-		 first_row_shown  = FirstRowShown,
-		 col_width        = DefaultColWidth,
-		 max_col_width    = MaxColWidth,
-		 min_col_width    = MinColWidth,
-		 col_widths       = ColWidths,
-		 row_height       = RowHeight,
-		 col_frame_ids    = ColFrameIds,
-		 col_ids          = ColIds,
-		 row_ids          = RowIds,
-		 bg_color         = BgColor,
-		 fg_color         = FgColor,
-		 row_data_list    = RowDataList,
-		 lists_as_strings = ListAsStr}  = GridP,
-    
-       % Probably it is unnecessary to check whether any new columns shall be 
-       % created or not, but what the heck, we don't want to crash...
-    ColsShown    = compute_cols_shown(NewFirstColShown, ColWidths, Width, NofCols,
-				      DefaultColWidth),
-    NofColsShown = length(ColsShown),
-
-    ParentPid ! #pg_col_info{sender              = self(),
-			     first_col_shown     = NewFirstColShown,
-			     width_of_cols_shown = ColsShown,
-			     nof_rows_shown      = NofRowsShown
-			    },
-
-    NewMarkP = move_marks(NewFirstColShown, FirstRowShown, GridP, MarkP),
-
-    NewColWidths = update_col_widths(ColsShown, ColWidths, NewFirstColShown, 
-				     DefaultColWidth),
-    
-    {NewNofCols, NewColFrameIds, NewColIds, NewRowIds} = 
-	check_nof_cols(ColsShown, (NofColsShown - NofCols), ColFrameIds, ColIds, 
-		       RowIds, NofRows, RowHeight, FgColor, BgColor ),
-    
-
-    RowsToUpdate = lists:sublist(NewRowIds, NofRowsShown),
-    resize_all_grid_columns(1, ColsShown, NewColFrameIds, MaxColWidth, MinColWidth),
-
-    refresh_visible_rows(RowsToUpdate, NewFirstColShown, NofColsShown, RowDataList, ListAsStr),
-
-       % Clear fields currently not visible.
-    clear_fields(safe_nthtail(NofColsShown, NewColIds),
-		 safe_nthtail(NofRowsShown, NewRowIds)),
-
-    
-    NewGridP = GridP#grid_params{nof_cols        = NewNofCols,
-				 cols_shown      = ColsShown,
-				 col_widths      = NewColWidths,
-				 col_frame_ids   = NewColFrameIds,
-				 col_ids         = NewColIds,
-				 row_ids         = NewRowIds,
-				 first_col_shown = NewFirstColShown
-				},
-
-    ProcVars#process_variables{grid_params = NewGridP,
-			       mark_params = NewMarkP}.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_row(VirtualRow, ProcVars) ->
-    #process_variables{grid_params = GridP,
-		       mark_params = MarkP} = ProcVars,
-    
-    #grid_params{first_row_shown = FirstRowShown,
-		 nof_rows_shown  = NofRowsShown,
-		 row_ids         = RowIds}  = GridP,
-    
-    mark_row(VirtualRow, FirstRowShown, FirstRowShown + NofRowsShown - 1, RowIds,
-	     ?GRID_MARK_COLOR),
-
-    NewMarkP = MarkP#mark_params{cell_id     = undefined,
-				 virtual_col = undefined,
-				 virtual_row = VirtualRow
-				},
-
-    ProcVars#process_variables{mark_params = NewMarkP}.
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_col(VirtualCol, ProcVars) ->
-    #process_variables{grid_params = GridP,
-		       mark_params = MarkP} = ProcVars,
-    
-    #grid_params{first_col_shown = FirstColShown,
-		 cols_shown      = ColsShown,
-		 col_ids         = ColIds}  = GridP,
-    
-    NofColsShown = length(ColsShown),
-    mark_col(VirtualCol, FirstColShown, FirstColShown + NofColsShown - 1, ColIds,
-	     ?GRID_MARK_COLOR),
-
-    NewMarkP = MarkP#mark_params{cell_id     = undefined,
-				 virtual_col = VirtualCol,
-				 virtual_row = undefined
-				},
-
-    ProcVars#process_variables{mark_params = NewMarkP}.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_cell_and_notify(CellId, RealCol, RealRow, ProcVars) ->
-    #process_variables{parent_pid  = ParentPid,
-		       grid_params = GridP,
-		       mark_params = MarkP} = ProcVars,
-    
-    #grid_params{first_col_shown = FirstColShown,
-		 first_row_shown = FirstRowShown} = GridP,
-
-    OldCellId = MarkP#mark_params.cell_id,
-
-    VirtualCol = FirstColShown + RealCol - 1,
-    VirtualRow = FirstRowShown + RealRow - 1,
-
-    %% Right now, when the table tool only is passive, i.e., we cannot edit
-    %% the table content, we don't want to be able to mark empty cells.
-    
-    {text, CellText} = gs:read(CellId, label),
-
-    CellMarked = case CellText of
-		     "" -> false;
-		     _AnyText when CellId=:=OldCellId -> false;
-		     _AnyText -> true
-		 end,
-
-    remove_marks(ProcVars),
-    update_marked_cells(CellId, OldCellId, CellMarked),
-
-    notify_about_cell_marked(ParentPid, CellMarked, RealCol, RealRow, 
-			     VirtualCol, VirtualRow, CellText),
-    
-    NewMarkP = case CellMarked of
-		   true ->
-		       MarkP#mark_params{cell_id     = CellId,
-					 virtual_col = VirtualCol,
-					 virtual_row = VirtualRow
-					};
-		   false ->
-		       MarkP#mark_params{cell_id     = undefined,
-					 virtual_col = 0,
-					 virtual_row = undefined
-					}
-	       end,
-    
-    ProcVars#process_variables{mark_params = NewMarkP}.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-remove_marks(ProcVars) ->
-    #process_variables{mark_params = MarkP,
-		       grid_params = GridP} = ProcVars,
-
-    #grid_params{first_col_shown = FirstColShown,
-		 cols_shown      = ColsShown,
-		 col_ids         = ColIds,
-		 first_row_shown = FirstRowShown,
-		 nof_rows_shown  = NofRowsShown,
-		 row_ids         = RowIds}  = GridP,
-
-
-    #mark_params{cell_id     = CellId,
-		 virtual_col = VirtualCol,
-		 virtual_row = VirtualRow} = MarkP,
-
-    case {VirtualCol, VirtualRow} of
-	{undefined, undefined} ->
-	    update_marked_cells(CellId, CellId, false);
-	{_AnyCol, undefined} ->
-	    NofColsShown = length(ColsShown),
-	    unmark_col(VirtualCol, FirstColShown, FirstColShown + NofColsShown - 1, 
-		       ColIds);
-	{undefined, _AnyRow} ->
-	    unmark_row(VirtualRow, FirstRowShown, FirstRowShown + NofRowsShown - 1, 
-		       RowIds);
-	_Other ->
-	    update_marked_cells(CellId, CellId, false)
-    end,
-    
-    NewMarkP = MarkP#mark_params{cell_id     = undefined,
-				 virtual_col = 0,
-				 virtual_row = undefined
-				},
-    ProcVars#process_variables{mark_params = NewMarkP}.
-    
-		 
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%*********************************************************************
-
-    
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-move_marks(FirstCol, FirstRow, GridP, MarkP) ->
-    #grid_params{first_col_shown = OldFirstCol,
-		 cols_shown      = ColsShown,
-		 first_row_shown = OldFirstRow,
-		 nof_rows_shown  = NofRowsShown,
-		 col_ids         = ColIds,
-		 row_ids         = RowIds}  = GridP,
-
-    #mark_params{virtual_col = VirtualCol,
-		 virtual_row = VirtualRow} = MarkP,
-
-
-    case {VirtualCol, VirtualRow} of
-	{undefined, undefined} ->
-	    NofColsShown = length(ColsShown),
-	    move_marked_cell(FirstCol, FirstRow, NofColsShown, 
-			     NofRowsShown, RowIds, MarkP);
-	{_AnyCol, undefined} ->
-	    NofColsShown = length(ColsShown),
-	    OldLastCol = OldFirstCol + NofColsShown - 1,
-	    LastCol    = FirstCol + NofColsShown - 1,
-	    move_marked_col(VirtualCol, OldFirstCol, OldLastCol, 
-			    FirstCol, LastCol, ColIds, MarkP);
-	{undefined, _AnyRow} ->
-	    OldLastRow = OldFirstRow + NofRowsShown - 1,
-	    LastRow    = FirstRow + NofRowsShown - 1,
-	    move_marked_row(VirtualRow, OldFirstRow, OldLastRow, 
-			    FirstRow, LastRow, RowIds, MarkP);
-	{_CellCol, _CellRow} ->
-	    NofColsShown = length(ColsShown),
-	    move_marked_cell(FirstCol, FirstRow, NofColsShown, 
-			     NofRowsShown, RowIds, MarkP)
-    end.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-refresh_marks(GridP, MarkP) ->
-    #grid_params{first_col_shown = FirstCol,
-		 cols_shown      = ColsShown,
-		 first_row_shown = FirstRow,
-		 nof_rows_shown  = NofRowsShown,
-		 col_ids         = ColIds,
-		 row_ids         = RowIds}  = GridP,
-
-    #mark_params{virtual_col = VirtualCol,
-		 virtual_row = VirtualRow} = MarkP,
-
-
-    case {VirtualCol, VirtualRow} of
-	{undefined, undefined} ->
-	    NofColsShown = length(ColsShown),
-	    move_marked_cell(FirstCol, FirstRow, NofColsShown, NofRowsShown, 
-			     RowIds, MarkP);
-	{_AnyCol, undefined} ->
-	    NofColsShown = length(ColsShown),
-	    LastCol    = FirstCol + NofColsShown - 1,
-	    mark_col(VirtualCol, FirstCol, LastCol, ColIds, ?GRID_MARK_COLOR);
-	{undefined, _AnyRow} ->
-	    LastRow    = FirstRow + NofRowsShown - 1,
-	    mark_row(VirtualRow, FirstRow, LastRow, RowIds, ?GRID_MARK_COLOR);
-	{_CellCol, _CellRow} ->
-	    NofColsShown = length(ColsShown),
-	    move_marked_cell(FirstCol, FirstRow, NofColsShown, NofRowsShown, 
-			     RowIds, MarkP)
-    end.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-move_marked_col(VirtualCol, 
-		OldFirstCol, OldLastCol, FirstCol, LastCol, ColIds, MarkP) ->
-    unmark_col(VirtualCol, OldFirstCol, OldLastCol, ColIds),
-    mark_col(VirtualCol, FirstCol, LastCol, ColIds, ?GRID_MARK_COLOR),
-    MarkP#mark_params{cell_id = undefined}.
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_col(VirtualCol, FirstCol, _LastCol, _ColIds, _Color) when VirtualCol < FirstCol ->
-    done;
-mark_col(VirtualCol, _FirstCol, LastCol, _ColIds, _Color) when VirtualCol > LastCol ->
-    done;
-mark_col(VirtualCol, FirstCol, _LastCol, ColIds, Color) ->
-    RealCol = VirtualCol - FirstCol + 1,
-    MarkedColIds = lists:nth(RealCol, ColIds),
-    mark_all_cells(MarkedColIds, Color).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-unmark_col(VirtualCol, FirstCol, LastCol, ColIds) ->
-    mark_col(VirtualCol, FirstCol, LastCol, ColIds, ?DEFAULT_GRID_BGCOLOR).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_all_cells([], _Color) ->
-    done;
-mark_all_cells([CellId | T], Color) ->
-    gs:config(CellId, [{bg, Color}]),
-    mark_all_cells(T, Color).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-mark_row(VirtualRow, FirstRow, _LastRow, _RowIds, _Color) when VirtualRow < FirstRow ->
-    done;
-mark_row(VirtualRow, _FirstRow, LastRow, _RowIds, _Color) when VirtualRow > LastRow ->
-    done;
-mark_row(VirtualRow, FirstRow, _LastRow, RowIds, Color) ->
-    RealRow      = VirtualRow - FirstRow + 1,
-    MarkedRowIds = lists:nth(RealRow, RowIds),
-    mark_all_cells(MarkedRowIds, Color).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-unmark_row(VirtualRow, FirstRow, LastRow, RowIds) ->
-    mark_row(VirtualRow, FirstRow, LastRow, RowIds, ?DEFAULT_GRID_BGCOLOR).
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-move_marked_row(VirtualRow, 
-		OldFirstRow, OldLastRow, FirstRow, LastRow, RowIds, MarkP) ->
-    unmark_row(VirtualRow, OldFirstRow, OldLastRow, RowIds),
-    mark_row(VirtualRow, FirstRow, LastRow, RowIds, ?GRID_MARK_COLOR),
-    MarkP#mark_params{cell_id = undefined}.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-move_marked_cell(FirstColShown, 
-		 FirstRowShown, NofColsShown, NofRowsShown, RowIds, MarkP) ->
-    #mark_params{cell_id     = OldCellId,
-		 virtual_col = VirtualCol,
-		 virtual_row = VirtualRow} = MarkP,
-    
-    case OldCellId of
-	undefined ->
-	    MarkP;
-	_OtherId ->
-	    NewRealCol = VirtualCol - FirstColShown + 1,
-	    NewRealRow = VirtualRow - FirstRowShown + 1,
-	    update_marked_cells(undefined, OldCellId, false),
-	    case check_if_new_mark_visible(NewRealCol, NewRealRow, 
-					   NofColsShown, NofRowsShown) of
-		false ->
-		    MarkP;
-		true ->
-		    NewCellId = lists:nth(NewRealCol, 
-					  lists:nth(NewRealRow, RowIds)),
-		    update_marked_cells(NewCellId, undefined, true),
-		    MarkP#mark_params{cell_id  = NewCellId}
-	    end
-    end.
-		    
-					      
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-check_if_new_mark_visible(Col, _Row, NofCols, _NofRows) when Col > NofCols ->
-    false;
-check_if_new_mark_visible(Col, _Row, _NofCols, _NofRows) when Col =< 0 ->
-    false;
-check_if_new_mark_visible(_Col, Row, _NofCols, NofRows) when Row > NofRows ->
-    false;
-check_if_new_mark_visible(_Col, Row, _NofCols, _NofRows) when Row =< 0 ->
-    false;
-check_if_new_mark_visible(_Col, _Row, _NofCols, _NofRows) ->
-    true.
-    
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_marked_cells(CellId, OldCellId, _MarkedCell) when CellId =:= OldCellId ->
-    gs:config(CellId, [{bg, ?DEFAULT_GRID_BGCOLOR}]);
-update_marked_cells(_CellId, undefined, false) ->
-    done;
-update_marked_cells(CellId, undefined, true) ->
-    gs:config(CellId, [{bg, ?GRID_MARK_COLOR}]);
-update_marked_cells(CellId, OldCellId, true) ->
-    gs:config(OldCellId, [{bg, ?DEFAULT_GRID_BGCOLOR}]),
-    gs:config(CellId, [{bg, ?GRID_MARK_COLOR}]);
-update_marked_cells(_CellId, OldCellId, false) ->
-    gs:config(OldCellId, [{bg, ?DEFAULT_GRID_BGCOLOR}]).
-
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-notify_about_cell_marked(Pid, Marked, RealCol, RealRow, VirtCol, VirtRow, Text) ->
-    Pid ! #pg_cell_marked{sender      = self(),
-			  cell_marked = Marked,
-			  real_col    = RealCol,
-			  real_row    = RealRow,
-			  virtual_col = VirtCol,
-			  virtual_row = VirtRow,
-			  cell_text   = Text
-			 }.
-    
-
-
-
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% START of functions used to print data in the grid fields.
-%%%---------------------------------------------------------------------
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-refresh_visible_rows([], _FirstColShown, _NofColsShown, _DataList, _ListAsStr) ->
-    done;
-refresh_visible_rows(RowIds, _FirstColShown, _NofColsShown, [], _ListAsStr) ->
-    clear_cols_or_rows(RowIds);
-refresh_visible_rows([OneRowIds | RemRowIds], FirstColShown, NofColsShown,
-		    [DataItemList | RemDataItemLists], ListAsStr) ->
-    NewDataItemList = get_data_sublist(DataItemList, FirstColShown, NofColsShown),
-    update_one_row(lists:sublist(OneRowIds, NofColsShown), NewDataItemList, ListAsStr),
-    refresh_visible_rows(RemRowIds, FirstColShown, NofColsShown, RemDataItemLists, ListAsStr).
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_visible_rows([], _FirstColShown, _NofColsShown, _DataList, _ListAsStr) ->
-    done;
-update_visible_rows(RowIds, _FirstColShown, _NofColsShown, [], _ListAsStr) ->
-    clear_cols_or_rows(RowIds);
-update_visible_rows([OneRowIds | RemRowIds], FirstColShown, NofColsShown,
-		    [DataItem | RemData], ListAsStr) ->
-       % We convert the received item to a list! This way we know that 
-       % '[notext]' shall be printed as 'notext', while 'notext' shall
-       % be printed as ''.
-    TempDataItemList = item_to_list(DataItem),
-    DataItemList = get_data_sublist(TempDataItemList, FirstColShown, 
-				    NofColsShown),
-    update_one_row(lists:sublist(OneRowIds, NofColsShown), DataItemList, ListAsStr),
-    update_visible_rows(RemRowIds, FirstColShown, NofColsShown, RemData, ListAsStr).
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_one_row(OneRowIds, [], _ListAsStr) ->
-    clear_one_col_or_row(OneRowIds);
-update_one_row([], _DataItemList, _ListAsStr) ->
-    done;
-update_one_row([LabelId | RemLabelIds], [notext | T], ListAsStr) ->
-    gs:config(LabelId, [{label, {text, ""}}
-		       ]),
-    update_one_row(RemLabelIds, T, ListAsStr);
-update_one_row([LabelId | RemLabelIds], [DataElem | T], ListAsStr) ->
-    Str = case ListAsStr of
-	      true ->
-		  tv_io_lib:format(" ~p", [DataElem]);
-	      false ->
-		  " " ++ lists:flatten(tv_io_lib:write(DataElem))
-	  end,
-    gs:config(LabelId, [{label, {text, Str}}
-		       ]),
-    update_one_row(RemLabelIds, T, ListAsStr).
-    
-		      
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-make_row_data_list(N, NofRows, []) when N > NofRows ->
-    [];
-make_row_data_list(N, NofRows, []) ->
-       % If NofRows == N, we get the empty list here!
-    lists:duplicate(NofRows- N, notext);
-make_row_data_list(N, NofRows, [_DataItem | _RemData]) when N > NofRows ->
-    [];
-make_row_data_list(N, NofRows, [DataItem | RemData]) ->
-       % We convert the received item to a list! This way we know that 
-       % '[notext]' shall be printed as 'notext', while 'notext' shall
-       % be printed as ''.
-    [item_to_list(DataItem) | make_row_data_list(N + 1, NofRows, RemData)].
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-item_to_list(Item) when is_tuple(Item) ->
-    tuple_to_list(Item);
-item_to_list(Item) ->
-    [Item].
-
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_data_sublist(DataList, StartPos, Length) ->
-    case catch lists:sublist(DataList, StartPos, Length) of
-	{'EXIT', _Reason} ->
-	    [];
-	Sublist ->
-	    Sublist
-    end.
-
-
-
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% END of functions used to print data in the grid fields.
-%%%---------------------------------------------------------------------
-
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% START of functions used to resize the grid columns.
-%%%---------------------------------------------------------------------
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_all_grid_columns(_RealCol, [], _ColFrameIds, _MaxColWidth, _MinColWidth) ->
-    done;
-resize_all_grid_columns(RealCol, [ColWidth | Tail], ColFrameIds, MaxColWidth, MinColWidth) ->
-
-    resize_one_column(RealCol, ColWidth, ColFrameIds, MaxColWidth, MinColWidth),
-    resize_all_grid_columns(RealCol + 1, Tail, ColFrameIds, MaxColWidth, 
-			    MinColWidth). 
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-resize_one_column(RealCol, Width, ColFrameIds, MaxW, MinW) ->
-    NewWidthOfCol = erlang:min(MaxW, erlang:max(Width, MinW)),
-    case length(ColFrameIds) of
-	RealCol ->
-	    done;
-	_Other ->
-	    FrameId = lists:nth(RealCol + 1, ColFrameIds), 
-	    gs:config(FrameId, [{x, NewWidthOfCol + 1}])
-    end,
-    NewWidthOfCol.
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% END of functions used to resize the grid columns.
-%%%---------------------------------------------------------------------
-
-
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% START of functions used to update the grid. 
-%%%---------------------------------------------------------------------
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-clear_fields(ColIds, RowIds) ->
-    clear_cols_or_rows(ColIds),
-    clear_cols_or_rows(RowIds).
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-clear_cols_or_rows([]) ->
-    done;
-clear_cols_or_rows([IdList | RemIdLists]) ->
-    clear_one_col_or_row(IdList),
-    clear_cols_or_rows(RemIdLists).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-clear_one_col_or_row([]) ->
-    done;
-clear_one_col_or_row([LabelId | RemLabelIds]) ->
-    gs:config(LabelId, [{label, {text, ""}}
-		       ]),
-    clear_one_col_or_row(RemLabelIds).
-    
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% END of functions used to update the grid. 
-%%%---------------------------------------------------------------------
-
-
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% START of functions used to compute the part of the grid that has to 
-%%% be updated, as well as deciding whether a new column has to be added.
-%%% Old columns (i.e., columns not visible) are not removed, but they 
-%%% shall not be updated until they once again becomes visible.
-%%%---------------------------------------------------------------------
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-check_nof_cols(_ColsShown, NofNewCols, ColFrameIds, ColIds, RowIds, 
-	       _NofRows, _RowHeight, _FgColor, _BgColor) when NofNewCols =< 0 ->
-    {length(ColFrameIds), ColFrameIds, ColIds, RowIds};
-check_nof_cols(ColsShown, NofNewCols, ColFrameIds, ColIds, 
-	       RowIds, NofRows, RowHeight, FgColor, BgColor) ->
-    NewColNo = length(ColFrameIds) + 1,
-       % We don't care about the pathological case where no columns have been
-       % created. If the gridwidth, or the columnwidth, was set to =< 0 during
-       % initialisation, then no columns will have been created. The program 
-       % will probably also have crashed. If any smart jackass has set invalid
-       % values on these important parameters, then he can only blame himself.
-    ParentId = lists:nth((NewColNo - 1), ColFrameIds),
-    ParentColWidth = lists:nth((NewColNo - 1), ColsShown),
-    Xpos = ParentColWidth + 1,
-
-    {ColFrameId, LabelIds} = add_one_col_frame(ParentId, NewColNo, Xpos, FgColor, 
-					       BgColor, NofRows, RowHeight),
-
-    NewColFrameIds = ColFrameIds ++ [ColFrameId],
-    NewColIds      = ColIds ++ [LabelIds],
-    NewRowIds      = update_row_ids(RowIds, LabelIds),
-    
-    check_nof_cols(ColsShown, NofNewCols - 1, NewColFrameIds, NewColIds, NewRowIds,
-		   NofRows, RowHeight, FgColor, BgColor).
-
-
-    
-    
-    
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_row_ids([], _LabelIds) ->
-    [];
-update_row_ids([OneRowIds | RemainingRows], [NewElemId | RemainingElemIds]) ->
-    [OneRowIds ++ [NewElemId] | update_row_ids(RemainingRows, RemainingElemIds)].
-
-
-
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-update_col_widths(ColsShown, ColWidths, FirstColShown, DefaultColWidth) ->
-       % What we do here is that we first (if necessary) add default 
-       % column widths to the ColWidth list until it reaches to where 
-       % ColsShown starts (vitually seen). 
-       % In the second step we take the appropriate elements from the
-       % ColsShown list and add them to the ColWidths list, until it is
-       % of sufficient length. 
-       % Of course this may seem unnecessary - it would suffice to just
-       % add default widths to the ColWidths list until it is long enough,
-       % since the compute_cols_shown function  right now just adds default 
-       % width columns to the ColsShown list, when the ColWidths list is empty.
-       % However, this could change (maybe we some other time want the last
-       % column to carry all remaining width, instead of adding new columns).
-       % Besides, we don't like hidden dependencies between functions!!!
-
-    NofColsShown   = length(ColsShown),
-    NewColWidths   = set_necessary_col_widths_length(FirstColShown, ColWidths, 
-						 DefaultColWidth),
-       % Now NofVirtualCols will always be equal to, or greater 
-       % than, FirstColShown - 1.
-    
-    NofVirtualCols          = length(NewColWidths),
-    NecessaryNofVirtualCols = FirstColShown + (NofColsShown - 1),
-    if 
-	NecessaryNofVirtualCols > NofVirtualCols ->
-	    TailNo = NofVirtualCols - FirstColShown + 1,   % Always >= 0 !!!
-	    NewColWidths ++ safe_nthtail(TailNo, ColsShown);
-	true ->
-	    NewColWidths
-    end.
-
-
-
-					  
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-set_necessary_col_widths_length(FirstColShown, ColWidths, DefaultColWidth) ->
-       % First check that (length(ColWidths) - FirstColShown) >= -1.
-       % If not, add elements so the relation holds true!
-    MissingDefaultWidthElems = FirstColShown - length(ColWidths),
-    if 
-	MissingDefaultWidthElems > 1 ->
-	    ColWidths ++ lists:duplicate(MissingDefaultWidthElems - 1, 
-					 DefaultColWidth);
-	true ->
-	    ColWidths
-    end.
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-compute_rows_shown(GridHeight, RowHeight) ->
-    (GridHeight div RowHeight) + 1.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-compute_cols_shown(FirstColShown, ColWidths, GridWidth, _NofCols, DefaultColWidth) ->
-    ColWidthsLength = length(ColWidths),
-       % Normally ColWidths shall be long enough, but just to make sure...
-       % (We could have chosen to update ColWidths here to, but right now
-       % we do it instead explicitly when resizeing the grid, changing the 
-       % column size(s), and scrolling horizontally.)
-    UsedColWidths = if
-			ColWidthsLength < FirstColShown ->
-			    [];
-			true ->
-			    safe_nthtail(FirstColShown - 1, ColWidths)
-		    end,
-    compute_cols_shown(UsedColWidths, GridWidth, DefaultColWidth).
-
-
-
-
-
-
-compute_cols_shown(_ColWidths, RemainingWidth, _DefColW) when RemainingWidth =< 0 ->
-    [];
-compute_cols_shown([], RemainingWidth, DefaultColWidth) ->
-    [DefaultColWidth | compute_cols_shown([], RemainingWidth - DefaultColWidth, 
-					  DefaultColWidth)];
-compute_cols_shown([VirtualColWidth | T], RemainingWidth, DefaultColWidth) ->
-    [VirtualColWidth | compute_cols_shown(T, RemainingWidth - VirtualColWidth,
-					 DefaultColWidth)].
-
-
-    
-    
-
-%%%---------------------------------------------------------------------
-%%% END of functions used to compute the part of the grid that has to 
-%%% be updated, as well as deciding whether a new column has to be added.
-%%%---------------------------------------------------------------------
-
-
-
-
-
-
-
-%%%---------------------------------------------------------------------
-%%% START of functions used to create the grid (baseframes, columns 
-%%% and rows), as well as sorting the ID's appropriately.
-%%%---------------------------------------------------------------------
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_base_frame(ParentId, Width, Height, Xpos, Ypos, BgColor) ->
-    gs:frame(ParentId, [{width, Width},
-			{height, Height},
-			{x, Xpos},
-			{y, Ypos},
-			{bg, BgColor}
-		       ]).
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_col_frames(0, _NofRows, _RowHeight, _ParentId, _GridP, ColFrameAcc, LabelAcc) ->
-    {lists:reverse(ColFrameAcc), lists:reverse(LabelAcc)};
-create_col_frames(N, NofRows, RowHeight, ParentId, GridP, ColFrameAcc, LabelAcc) ->
-       % Yes, it *IS* inefficient to copy GridP for each loop.
-       % However, it is only done once, and for a limited number of times,
-       % and we avoid having a lot of parameters!
-    #grid_params{bg_color   = BgColor,
-		 fg_color   = FgColor,
-		 nof_cols   = NofCols,
-		 col_width  = ColWidth} = GridP,
-    Xpos = if
-	       N =:= NofCols ->
-		   0;
-	       true ->
-		   ColWidth + 1
-	   end,
-    
-    ColNo = NofCols - N + 1,
-    {ColFrameId, LabelIds} = add_one_col_frame(ParentId, ColNo, Xpos, FgColor, 
-					       BgColor, NofRows, RowHeight),
-    create_col_frames(N - 1, NofRows, RowHeight, ColFrameId, GridP, 
-		      [ColFrameId | ColFrameAcc], [LabelIds | LabelAcc]).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-add_one_col_frame(ParentId, ColNo, Xpos, FgColor, BgColor, NofRows, RowHeight) ->
-    ColFrameId   = create_one_col_frame(ParentId, Xpos, FgColor),
-    FirstRowYpos = 1, 
-    FirstRowNo   = 1,
-    LabelIds     = create_rows_on_frame(ColFrameId, FirstRowNo, NofRows, RowHeight,
-					FirstRowYpos, FgColor, BgColor, ColNo, []), 
-    {ColFrameId, LabelIds}.
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_one_col_frame(ParentId, Xpos, BgColor) ->
-    ColFrameWidth     = 1200,
-    ColFrameHeight    = 900,
-    Ypos = 0,
-    gs:frame(ParentId, [{width, ColFrameWidth},
-			{height, ColFrameHeight},
-			{x, Xpos},
-			{y, Ypos},
-			{bg, BgColor}
-		       ]).
-    
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-create_rows_on_frame(_FrameId, RowNo, NofRows, _H, _Y, _Fg, _Bg, _ColNo, Acc) when RowNo > NofRows -> 
-    lists:reverse(Acc);
-create_rows_on_frame(FrameId, RowNo, NofRows, H, Y, Fg, Bg, ColNo, RAcc) -> 
-    Width = 1200, 
-    R = gs:label(FrameId, [{width, Width},
-			   {height, H},
-			   {x, 1},
-			   {y, Y},
-			   {bg, Bg},
-			   {fg, Fg},
-			   {align, w},
-			   {buttonpress, true},
-			   {data, {gridcell, ColNo, RowNo, FrameId}}
-			  ]),
-    NextRowNo = RowNo + 1,
-    NextY = Y + H +1,
-    create_rows_on_frame(FrameId, NextRowNo, NofRows, H, NextY, Fg, Bg, ColNo, 
-			     [R | RAcc]).
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-get_row_ids(0, _Cols, RowAcc) ->
-    RowAcc;
-get_row_ids(RowNo, Cols, RowAcc) ->
-    Row = extract_ids_for_one_row(RowNo, Cols),
-    get_row_ids(RowNo - 1, Cols, [Row | RowAcc]).
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-extract_ids_for_one_row(_N, []) ->
-    [];
-extract_ids_for_one_row(N, [ColIds | Tail]) ->
-    [lists:nth(N, ColIds) | extract_ids_for_one_row(N, Tail)].
-
-
-
-%%%---------------------------------------------------------------------
-%%% END of functions used to create the grid.
-%%%---------------------------------------------------------------------
-
-
-%%======================================================================
-%% Function:
-%%
-%% Return Value:
-%%
-%% Description:
-%%
-%% Parameters:
-%%======================================================================
-
-
-safe_nthtail(_, []) -> [];
-safe_nthtail(1, [_|T]) -> T;
-safe_nthtail(N, [_|T]) when N > 1 ->
-    safe_nthtail(N - 1, T);
-safe_nthtail(0, L) when is_list(L) -> L.
diff --git a/lib/tv/src/tv_pg_int_def.hrl b/lib/tv/src/tv_pg_int_def.hrl
deleted file mode 100644
index 6f88053d47..0000000000
--- a/lib/tv/src/tv_pg_int_def.hrl
+++ /dev/null
@@ -1,92 +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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      Internal definitions for the pd part of the table tool.
-%%%
-%%%*********************************************************************
-
-
--define(GRIDFUNCS, tv_pg_gridfcns).
-
-
-
--define(DEFAULT_COLFRAME_HEIGHT, 870).
--define(DEFAULT_COLWIDTH, 100).
--define(DEFAULT_GRID_BGCOLOR, {255, 255, 255}).  % white
--define(DEFAULT_GRID_FGCOLOR, {0, 0, 0}).        % black
--define(GRID_MARK_COLOR, {200, 255, 255}).
--define(GRID_FONT, {courier, 12}).
-
-
-
--define(DEFAULT_BG_COLOR, {217, 217, 217}).
--define(DEFAULT_ROW_COLOR, {178, 34, 34}).   % Firebrick!
--define(DEFAULT_GRID_COLOR, {0, 0, 0}). 
--define(LIGHT_GRAY, {226, 226, 226}).
--define(DARK_VIOLET, {148, 0, 211}).
--define(FIREBRICK, {178, 34, 34}).
--define(ANTIQUE_WHITE, {255, 255, 235}).
-
-
-
-
--record(grid_params, {bg_frame,
-		      fg_frame,
-		      grid_width,
-		      grid_height       = ?DEFAULT_COLFRAME_HEIGHT, % Actual height,
-		                                                    % not the height
-		                                                    % shown!
-		      grid_xpos,
-		      grid_ypos,
-		      bg_color          = ?DEFAULT_GRID_BGCOLOR,
-		      fg_color          = ?DEFAULT_GRID_FGCOLOR,
-		      nof_cols          = 10,
-		      nof_rows,
-		      nof_rows_shown,
-		      row_height,
-		      col_width         = ?DEFAULT_COLWIDTH,
-		      first_col_shown   = 1,
-		      first_row_shown   = 1,
-		      max_col_width     = 1200,
-		      min_col_width     = 5,
-		      col_widths        = [],
-		      cols_shown        = [],
-		      col_frame_ids     = [],
-		      col_ids           = [],
-		      row_ids           = [],
-		      row_data_list     = [],
-		      current_max_value,
-		      lists_as_strings   = true
-		     }).
-
-
-
--record(mark_params, {cell_id, 
-		      virtual_col,
-		      virtual_row
-		     }).
-			
-
-
-
--record(process_variables, {parent_pid,
-			    grid_parent_id,
-			    grid_params = #grid_params{},
-			    mark_params = #mark_params{}
-			   }).
diff --git a/lib/tv/src/tv_poll_dialog.erl b/lib/tv/src/tv_poll_dialog.erl
deleted file mode 100644
index e33d398898..0000000000
--- a/lib/tv/src/tv_poll_dialog.erl
+++ /dev/null
@@ -1,363 +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:      Code for the "set poll interval" dialog with the user.
-%%%
-%%%*********************************************************************
-
--module(tv_poll_dialog).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,radiobutton,2}},
-          {nowarn_deprecated_function,{gs,scale,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,2}}]).
-
-
--export([start/1, init/2]).
-
-
-
--include("tv_int_msg.hrl").
-
-
-
--define(WINDOW_WIDTH, 305).
--define(WINDOW_HEIGHT, 185).
-
--define(DEFAULT_BG_COLOR, {217, 217, 217}).
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-start(Pos) ->
-    Pid = self(),
-    ProcPid = spawn_link(?MODULE, init, [Pid, Pos]),
-    receive_answer(ProcPid).
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-init(Pid, Pos) ->
-    process_flag(trap_exit, true),
-    {ScalePos, ScaleRange, Poll, Color} = case Pos of
-				       infinity ->
-					   {0, {20, 20}, false, {255, 255, 255}};
-				       _Other ->
-					   {Pos, {20, 300}, true, {0, 0, 0}}
-				   end,
-    S = gs:start(),
-    Win = gs:window(S, [{width, ?WINDOW_WIDTH},
-			{height, ?WINDOW_HEIGHT},
-			{bg, ?DEFAULT_BG_COLOR},
-			{title, "[TV]   Set Poll Interval"},
-			{configure, true},
-			{destroy, true}
-		       ]),
-
-    NoPollBtn = gs:radiobutton(Win, [{height, 30}, 
-				     {width, 143},
-				     {x, 10},
-				     {y, 10},
-				     {bg, ?DEFAULT_BG_COLOR},
-				     {fg, {0, 0, 0}},
-				     {value, no_poll},
-				     {label, {text, "Manual Polling"}},
-				     {select, not(Poll)}
-				    ]),
-
-    PollBtn = gs:radiobutton(Win, [{height, 30}, 
-				   {width, 163},
-				   {x, 10},
-				   {y, 60},
-				   {bg, ?DEFAULT_BG_COLOR},
-				   {fg, {0, 0, 0}},
-				   {value, poll},
-				   {label, {text, "Automatic Polling"}},
-				   {select, Poll}
-				  ]),
-
-    Lbl = gs:label(Win, [{label, {text, "Poll Interval (seconds):"}},
-			 {align, center},
-			 {bg, ?DEFAULT_BG_COLOR},
-			 {fg, Color},
-			 {width, 183},
-			 {height, 30},
-			 {x, 10},
-			 {y, 100}
-			]),
-    
-    Scale = gs:scale(Win, [{bg, ?DEFAULT_BG_COLOR},
-			   {fg, Color},
-			   {orient, horizontal},
-			   {range, ScaleRange},
-			   {pos, ScalePos},
-			   {width, 285},
-			   {height, 50},
-			   {x, 10},
-			   {y, 130}
-			  ]),
-    
-    OkBtn = gs:button(Win, [{label, {text, "OK"}},
-			    {bg, ?DEFAULT_BG_COLOR},
-			    {fg, {0, 0, 0}},
-			    {align, center},
-			    {width, 60},
-			    {height, 30},
-			    {x, 230},
-			    {y, 10}
-			   ]),
-
-    CancelBtn = gs:button(Win, [{label, {text, "Cancel"}},
-				{bg, ?DEFAULT_BG_COLOR},
-				{fg, {0, 0, 0}},
-				{align, center},
-				{width, 60},
-				{height, 30},
-				{x, 230},
-				{y, 60}
-			       ]),
-    
-    gs:config(Win, {map, true}),
-    browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, CancelBtn, Poll, Pos).
-    
-
-
-
-
-
-
-%%%*********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-receive_answer(ProcPid) ->
-    receive_answer(ProcPid, undefined, undefined, undefined, undefined).
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-receive_answer(ProcPid, DataReqMsg, WinConfMsg, MarkedRowMsg, SubsetMsg) ->
-    receive Msg ->
-	    case Msg of 
-
-		{browser, ProcPid, cancel} ->
-		    PcPid = self(),
-		    PcPid ! DataReqMsg,
-		    PcPid ! WinConfMsg,
-		    PcPid ! MarkedRowMsg,
-		    PcPid ! SubsetMsg,   
-		    cancel;
-
-		{browser, ProcPid, {true, PollInterval}} ->
-		    PcPid = self(),
-		    PcPid ! DataReqMsg,
-		    PcPid ! WinConfMsg,
-		    PcPid ! MarkedRowMsg,
-		    PcPid ! SubsetMsg,   
-		    PollInterval;
-
-		{browser, ProcPid, {false, _Pollinterval}} ->
-		    PcPid = self(),
-		    PcPid ! DataReqMsg,
-		    PcPid ! WinConfMsg,
-		    PcPid ! MarkedRowMsg,
-		    PcPid ! SubsetMsg,   
-		    infinity;
-
-		#pc_data_req{} ->
-		    receive_answer(ProcPid, Msg, WinConfMsg, MarkedRowMsg, SubsetMsg);
-
-		#pc_win_conf{} ->
-		    receive_answer(ProcPid, DataReqMsg, Msg, MarkedRowMsg, SubsetMsg);
-
-		#pc_marked_row{} ->
-		    receive_answer(ProcPid, DataReqMsg, WinConfMsg, Msg, SubsetMsg);
-
-		#dbs_subset{} ->
-		    receive_answer(ProcPid, DataReqMsg, WinConfMsg, MarkedRowMsg, Msg);
-
-		#pc_menu_msg{data = exit_button} ->
-		    self() ! Msg,
-		    cancel;
-
-		#pc_set_sorting_mode{sender = Sender} ->
-		    Sender ! #pd_ignore{sender = self()},
-		    ProcPid ! raise_and_beep,
-		    receive_answer(ProcPid, DataReqMsg, WinConfMsg, MarkedRowMsg, SubsetMsg);
-
-		{'EXIT', _Sender, _Reason} ->
-		    self() ! Msg,
-		    cancel;
-
-		_Other ->
-		    ProcPid ! raise_and_beep,
-		    receive_answer(ProcPid, DataReqMsg, WinConfMsg, MarkedRowMsg, SubsetMsg)
-	    end
-    end.
-    
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, CancelBtn, Poll, Pos) ->
-    receive
-	{gs, Scale, click, _, [NewPos | _]} ->
-	    browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, 
-			 CancelBtn, Poll, NewPos);
-
-	{gs, NoPollBtn, click, _, _} ->
-	    gs:config(Lbl, [{fg, {255, 255, 255}}]),
-	    gs:config(Scale, [{fg, {255, 255, 255}}, {pos, 0}, {range, {20, 20}}]),
-	    receive
-		{gs, Scale, click, _, _} ->
-		    done
-	    after 500 ->
-		    done
-	    end,
-	    browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, 
-			 CancelBtn, false, Pos);
-
-	{gs, PollBtn, click, _, _} ->
-	    gs:config(Lbl, [{fg, {0, 0, 0}}]),
-	    gs:config(Scale, [{fg, {0, 0, 0}}, {pos, Pos}, {range, {20, 300}}]),
-	    receive
-		{gs, Scale, click, _, _} ->
-		    done
-	    after 500 ->
-		    done
-	    end,
-	    browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, 
-			 CancelBtn, true, Pos);
-
-	{gs, OkBtn, click, _, _} ->
-	    Pid ! {browser, self(), {Poll, Pos}};
-
-	{gs, CancelBtn, click, _, _} ->
-	    Pid ! {browser, self(), cancel};
-
-	{gs, _, destroy, _, _} ->
-	    Pid ! {browser, self(), cancel};
-
-
-	{gs, Win, configure, _, _} ->
-	    gs:config(Win, [{width, ?WINDOW_WIDTH},
-			    {height, ?WINDOW_HEIGHT}
-			   ]),
-	    browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, 
-			 CancelBtn, Poll, Pos);
-
-
-	raise_and_beep ->
-	    gs:config(Win, [raise,
-			   beep]),
-	    browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, 
-			 CancelBtn, Poll, Pos);
-
-
-	{'EXIT', _Sender, _Reason} ->
-	    Pid ! {browser, self(), cancel};
-
-
-	_Other ->
-	    io:format("Poll dialog received message ~w ~n", [_Other]),
-	    browser_loop(Pid, Win, NoPollBtn, PollBtn, Lbl, Scale, OkBtn, 
-			 CancelBtn, Poll, Pos)
-
-   end.
-
diff --git a/lib/tv/src/tv_pw.erl b/lib/tv/src/tv_pw.erl
deleted file mode 100644
index 5f88c9f1fd..0000000000
--- a/lib/tv/src/tv_pw.erl
+++ /dev/null
@@ -1,328 +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:      Code for pw, the window controlling part of the table tool.
-%%%
-%%%*********************************************************************
-
-
--module(tv_pw).
--compile([{nowarn_deprecated_function,{gs,config,2}}]).
-
-
-
--export([pw/1]).
-
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_pw_int_def.hrl").
-
-
-
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      pw.
-%%
-%% Return Value:  None.
-%%
-%% Description:   Process controlling the graphical window, as well as the 
-%%                menubuttons.
-%%
-%% Parameters:    None.
-%%======================================================================
-
-
-
-pw(Master) ->
-    process_flag(trap_exit, true),
-    ProcVars = #process_variables{master_pid = Master},
-    blocked(ProcVars).
-
-
-
-
-
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-
-
-%%======================================================================
-%% Function:      blocked.
-%%
-%% Return Value:  None.
-%%
-%% Description:   When started or explicitly blocked, pw enters this state,
-%%                where nothing is performed until the module explicitly is 
-%%                deblocked.
-%%
-%% Parameters:    
-%%======================================================================
-
-
-blocked(ProcVars) ->
-    receive
-	Msg ->
-	    case Msg of
-		#pw_deblock{} ->
-		    deblock(Msg, ProcVars);
-		_Other ->
-		    blocked(ProcVars)
-	    end
-    end.
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      deblocked.
-%%
-%% Return Value:  None.
-%%
-%% Description:   When deblocked, a window shall be created according to 
-%%                specification received in pw_deblock message.
-%%
-%% Parameters:    Rec:  received pw_deblock message.
-%%======================================================================
-
-
-
-deblock(Msg, ProcVars) ->
-    #process_variables{window_params = WinP,
-		       menu_params   = MenuP}  = ProcVars,
-
-    NewWinP  = ?WIN_FUNC_FILE:create_window(Msg, WinP),
-    NewMenuP = ?WIN_FUNC_FILE:create_menubar(NewWinP, MenuP),
-
-    Sender = Msg#pw_deblock.sender,
-    Sender ! #pw_deblock_cfm{sender = self(), 
-			     win_id = NewWinP#window_params.window_id
-			    },
-
-    NewProcVars = ProcVars#process_variables{window_params = NewWinP,
-					     menu_params   = NewMenuP
-					    },
-    deblocked_loop(NewProcVars).
-    
-    
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-deblocked_loop(ProcVars) ->
-    receive
-	Msg ->
-	    case Msg of
-
-		{gs, Id, Event, Data, Args} ->
-		    NewProcVars = gs_messages({Id, Event, Data, Args}, ProcVars),
-		    deblocked_loop(NewProcVars);
-		
-		   % Messages from pc!
-		#pw_select_menu{menu=Menu} ->
-		    gs:config(Menu, [{select,true}]),
-		    deblocked_loop(ProcVars);
-
-		#pw_create_menu{} ->
-		    NewProcVars = ?WIN_FUNC_FILE:create_menu(Msg, ProcVars),
-		       % Send confirmation...
-		    Sender = Msg#pw_create_menu.sender,
-		    Sender ! #pw_create_menu_cfm{sender = self()},
-		    deblocked_loop(NewProcVars);
-
-		#pw_set_window_title{win_title = WinTitle} ->
-		    WinP = ProcVars#process_variables.window_params,
-		    gs:config(WinP#window_params.window_id, [{title, "[TV]   " ++ WinTitle}]),
-		    NewWinP = WinP#window_params{window_title = WinTitle},
-		    NewProcVars = ProcVars#process_variables{window_params = NewWinP},
-		    deblocked_loop(NewProcVars);
-
-		#pw_deblock{} ->
-		    deblock(Msg, ProcVars);
-
-	           % Exit signals!
-		{'EXIT', Pid, Reason} ->
-		    MasterPid = ProcVars#process_variables.master_pid,
-		    exit_signals({Pid, Reason}, MasterPid),
-		    deblocked_loop(ProcVars);
-
-		_Other ->
-		    deblocked_loop(ProcVars)
-
-	    end
-    end.
-	
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-exit_signals(Exit_info, MasterPid) ->
-    case Exit_info of
-	{MasterPid, _Reason} ->        % When from master, just quit!
-	    exit(normal);
-	_Other ->
-	    done
-    end.
-
-
-
-
-
-
-
-
-
-
-%%======================================================================
-%% Function:      
-%%
-%% Return Value:  
-%%
-%% Description:   
-%%
-%% Parameters:    
-%%======================================================================
-
-
-gs_messages(Msg, ProcVars) ->
-    MasterPid = ProcVars#process_variables.master_pid,
-    case Msg of
-
-	{_Id, click, Data, _Args} ->
-	    MasterPid ! #pc_menu_msg{sender = self(),
-				     data   = Data},
-	    ProcVars;
-
-        {_Win, keypress, _Data, [Key, _ , _, 1 | _T]} ->
-	    MenuP        = ProcVars#process_variables.menu_params,
-	    ShortcutList = MenuP#menu_params.shortcuts,
-	    send_shortcut_data(Key, ShortcutList, MasterPid),
-	    ProcVars;
-
-	Msg0 = {Win, configure, _, _} ->
-	    {Win, configure, _, [W, H | _T]} = flush_msgs(Msg0),
-	    WinP = ProcVars#process_variables.window_params,
-	    #window_params{window_id         = WindowId,
-			   min_window_width  = MinAllowedWidth,
-			   min_window_height = MinAllowedHeight} = WinP,
-	    FinalWidth  = ?COMM_FUNC_FILE:max(W, MinAllowedWidth),
-	    FinalHeight = ?COMM_FUNC_FILE:max(H, MinAllowedHeight),
-	    ?WIN_FUNC_FILE:resize_window(WindowId, FinalWidth, FinalHeight),
-	    MasterPid ! #pc_win_conf{sender = self(),
-				     width  = FinalWidth, 
-				     height = FinalHeight},
-	    NewWinP = WinP#window_params{window_width  = FinalWidth,
-					 window_height = FinalHeight
-					},
-	    ProcVars#process_variables{window_params = NewWinP};
-
-	{_Win, destroy, _Data, _Args} ->
-	    exit(normal);
-
-	_Other ->
-	    ProcVars
-    end.
-
-flush_msgs(Msg0 = {Win, Op, _, _}) ->
-    receive {gs, Win,Op,D,P} ->
-	    flush_msgs({Win,Op,D,P})
-    after 200 ->
-	    Msg0
-    end.
-
-send_shortcut_data(_Key, [], _MasterPid) ->
-    done;
-send_shortcut_data(Key, ShortcutList, MasterPid) ->
-    case lists:keysearch(Key, 1, ShortcutList) of
-	{value, {Key, Data}} ->
-	    MasterPid ! #pc_menu_msg{sender = self(),
-				     data   = Data};
-	false ->
-	    done
-    end.
-
-
-
-
-
-
-    
-    
-    
-
-
-
-
-    
-
diff --git a/lib/tv/src/tv_pw_int_def.hrl b/lib/tv/src/tv_pw_int_def.hrl
deleted file mode 100644
index fabfbc2762..0000000000
--- a/lib/tv/src/tv_pw_int_def.hrl
+++ /dev/null
@@ -1,55 +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%
-%%%*********************************************************************
-%%% 
-%%%   Description:      Internal definitions for the pw part of the table tool.
-%%%
-%%%*********************************************************************
-
--define(WIN_FUNC_FILE, tv_pw_window).
-
-
-
--define(DEFAULT_WINDOW_WIDTH, 1000).
--define(DEFAULT_WINDOW_HEIGHT, 800).
--define(DEFAULT_MIN_WINDOW_WIDTH, 50).
--define(DEFAULT_MIN_WINDOW_HEIGHT, 50).
-
-
-
--record(window_params, {window_id,
-			window_title,
-			window_width,
-			window_height,
-			min_window_width,
-			min_window_height
-			}).
-
-
--record(menu_params, {menubar_id,
-		      shortcuts
-		     }).
-
-
-
-
-
--record(process_variables, {master_pid,
-			    window_params  = #window_params{},
-			    menu_params    = #menu_params{}
-			   }).
diff --git a/lib/tv/src/tv_pw_window.erl b/lib/tv/src/tv_pw_window.erl
deleted file mode 100644
index 81f29dc41c..0000000000
--- a/lib/tv/src/tv_pw_window.erl
+++ /dev/null
@@ -1,277 +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:      Part of the pw component controlling the graphics.
-%%%
-%%%*********************************************************************
-
-
--module(tv_pw_window).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,menuitem,3}},
-          {nowarn_deprecated_function,{gs,start,0}}]).
-
-
-
--export([create_window/2, 
-	 resize_window/3, 
-	 create_menubar/2, 
-	 create_menu/2]).
-
-
-
-
--include("tv_int_def.hrl").
--include("tv_int_msg.hrl").
--include("tv_pw_int_def.hrl").
-
-
-
--define(DEFAULT_BG_COLOR, {217, 217, 217}).
-
-
-
-
-%%%*********************************************************************
-%%% EXTERNAL FUNCTIONS
-%%%*********************************************************************
-
-
-
-
-%%======================================================================
-%% Function:      create_menu.
-%%
-%% Return Value:  Identifier to the menu created.
-%%
-%% Description:   Creates a menu in the window.
-%%
-%% Parameters:    Win:  ID of parent window.
-%%======================================================================
-
-
-create_menu(Msg, ProcVars) ->
-    MenuP        = ProcVars#process_variables.menu_params,
-    MenubarId    = MenuP#menu_params.menubar_id,
-    ShortcutList = MenuP#menu_params.shortcuts,
-    
-    #pw_create_menu{menutitle     = MenuTitle, 
-		    title_acc_pos = TitleAccPos,
-		    menulist      = MenuList}  = Msg,
-
-       % Create the menubutton!
-    Label = def_or_param(MenuTitle, "NoName"),
-    Mbutt = gs:create(menubutton, MenubarId, [{bg, ?DEFAULT_BG_COLOR},
-					      {fg, {178, 34, 34}},  % firebrick
-					      %  {font, {helvetica, bold, 14}},
-					      {label, {text, Label}},
-					      {underline, TitleAccPos}
-					     ]),
-
-       % Create the actual menu!
-    Menu = gs:create(menu, Mbutt, [{bg, ?DEFAULT_BG_COLOR},
-				   {fg, {178, 34, 34}}
-				  ]), 
-
-    NewMenuP = MenuP#menu_params{shortcuts = ShortcutList ++ create_menulist(MenuList, Menu)},
-
-    ProcVars#process_variables{menu_params = NewMenuP}.
-
-
-
-    
-
-
-
-create_menubar(WinP, MenuP) ->
-    WindowId  = WinP#window_params.window_id,
-    MenubarId = gs:create(menubar, WindowId, [{bg, ?DEFAULT_BG_COLOR}
-					     ]),
-    Mbutt = gs:create(menubutton, MenubarId, [{bg, ?DEFAULT_BG_COLOR},
-					      {fg, {178, 34, 34}},  % firebrick
-					      %  {font, {helvetica, bold, 14}},
-					      {label, {text, " Help "}},
-					      {underline, 1},
-					      {side, right}
-					     ]),
-
-       % Create the actual menu!
-    Menu = gs:create(menu, Mbutt, [{bg, ?DEFAULT_BG_COLOR},
-				   {fg, {178, 34, 34}}
-				  ]), 
-    MenuP#menu_params{menubar_id = MenubarId,
-		      shortcuts  = create_menulist([{" Help ", normal, help_button, 1, h},
-						    separator,
-						    {" OTP Documentation ",normal,otp_help_button,1,no_char}], 
-						   Menu) ++ [{x,exit_button}, {'X',exit_button}]
-		     }.
-
-
-
-
-
-create_window(Msg, WinP) ->
-    #pw_deblock{win_title      = Title, 
-		win_width      = Width, 
-		win_height     = Height,
-		min_win_width  = MinWidth} = Msg,
-
-    
-    S = gs:start(),
-    WindowTitle     = def_or_param(Title, "NoName"),
-    WindowMinWidth  = def_or_param(MinWidth, ?DEFAULT_MIN_WINDOW_WIDTH),
-    WindowMinHeight = def_or_param(MinWidth, ?DEFAULT_MIN_WINDOW_HEIGHT),
-    WindowWidth     = ?COMM_FUNC_FILE:max(def_or_param(Width, 
-						       ?DEFAULT_WINDOW_WIDTH), 
-					  WindowMinWidth),
-    WindowHeight    = ?COMM_FUNC_FILE:max(def_or_param(Height, 
-						       ?DEFAULT_WINDOW_HEIGHT),
-					  WindowMinHeight),
-    
-    
-    WindowId = gs:create(window, S, [{title, WindowTitle},
-				     {width, WindowWidth},
-				     {height, WindowHeight},
-				     {bg, ?DEFAULT_BG_COLOR},
-				     {configure, true},
-				     {destroy, true},
-				     {keypress, true},
-				     {cursor, arrow}
-				    ]),
-    
-    WinP#window_params{window_id         = WindowId,
-		       window_title      = WindowTitle,
-		       window_width      = WindowWidth,
-		       window_height     = WindowHeight,
-		       min_window_width  = WindowMinWidth,
-		       min_window_height = WindowMinHeight
-		      }.
-
-
-
-
-
-
-
-resize_window(WindowId, NewWidth, NewHeight) ->
-    gs:config(WindowId, [{width, NewWidth},
-			 {height, NewHeight}
-			]).
-
-
-
-
-%%%********************************************************************
-%%% INTERNAL FUNCTIONS
-%%%********************************************************************
-
-
-
-create_menulist([], _Menu) ->
-    [];
-create_menulist(List, Menu) ->
-    MaxLength = get_length_of_longest_menu_text(List, 0),
-    create_menulist(List, Menu, MaxLength).
-
-
-
-
-create_menulist([], _Menu, _MaxLength) ->
-    [];
-create_menulist([{Text, Type, Data, AccCharPos, ShortcutChar} | Rest], Menu, MaxLength) ->
-    ShortcutCapitalChar = 
-	if
-	    ShortcutChar =:= no_char ->
-		no_char;
-	    true ->
-		CharAsciiValue   = lists:nth(1, atom_to_list(ShortcutChar)),
-		CapitalCharValue = CharAsciiValue - ($a - $A),
-		list_to_atom([CapitalCharValue])
-	end,
-    
-    FinalText = if 
-		    ShortcutChar =:= no_char ->
-			Text;
-		    true ->
-			Text ++ lists:duplicate(MaxLength - length(Text), " ") ++ 
-			    "   Ctrl+" ++ atom_to_list(ShortcutCapitalChar) ++ " "
-		end,
-    TypeAndSel = 
-	case Type of
-	    normal ->
-		[{itemtype, normal}];
-	    {radio, Selected, Group} ->
-		[{itemtype, radio},
-		 {select, Selected},
-		 {group, Group}];
-	    {check, Selected} ->
-		[{itemtype, check},
-		 {select, Selected}]
-	end,
-    gs:menuitem(Data, Menu, [{bg, ?DEFAULT_BG_COLOR},
-			     {fg, {178, 34, 34}},
-			     {label, {text, FinalText}},
-			     {underline, AccCharPos},
-			     {data, Data} |
-			     TypeAndSel
-			    ]),
-    [{ShortcutChar, Data}, {ShortcutCapitalChar, Data} | create_menulist(Rest, Menu, MaxLength)];
-create_menulist([separator | Rest], Menu, MaxLength) ->
-    gs:create(menuitem, Menu, [{itemtype, separator}
-			      ]),
-    create_menulist(Rest, Menu, MaxLength).
-
-
-    
-    
-    
-
-
-get_length_of_longest_menu_text([], MaxLength) ->
-    MaxLength;
-get_length_of_longest_menu_text([{Text, _Type, _Data, _APos, _SChar} | Rest], CurrMax) ->
-    L = length(Text),
-    if 
-	L > CurrMax ->
-	    get_length_of_longest_menu_text(Rest, L);
-	true ->
-	    get_length_of_longest_menu_text(Rest, CurrMax)
-    end;
-get_length_of_longest_menu_text([separator | Rest], CurrMax) ->
-    get_length_of_longest_menu_text(Rest, CurrMax).
-
-
-
-
-
-def_or_param(undefined, DefaultValue) ->
-    DefaultValue;
-def_or_param(Param, _Default) ->
-    Param.
-
-
-
-
-
-
-
-
-
-
diff --git a/lib/tv/src/tv_rec_edit.erl b/lib/tv/src/tv_rec_edit.erl
deleted file mode 100644
index 3f9ea8b5f5..0000000000
--- a/lib/tv/src/tv_rec_edit.erl
+++ /dev/null
@@ -1,754 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(tv_rec_edit).
--compile([{nowarn_deprecated_function,{gs,button,2}},
-          {nowarn_deprecated_function,{gs,button,3}},
-          {nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,entry,3}},
-          {nowarn_deprecated_function,{gs,frame,2}},
-          {nowarn_deprecated_function,{gs,frame,3}},
-          {nowarn_deprecated_function,{gs,label,2}},
-          {nowarn_deprecated_function,{gs,read,2}},
-          {nowarn_deprecated_function,{gs,start,0}},
-          {nowarn_deprecated_function,{gs,window,3}}]).
-
-
-
--export([start/5,
-	 start/6,
-	 init/8
-	]).
-
-
--include("tv_int_def.hrl").
-
-
-
--define(DEFAULT_BG_COLOR, {217,217,217}).
-
--define(WIN_WIDTH, 375).
--define(WIN_HEIGHT, 341).
--define(ETS_WIN_HEIGHT, 154).
-
--define(FRAME_WIDTH, 375).
--define(FRAME_HEIGHT, 265).
--define(ETS_FRAME_HEIGHT, 74).
-
--define(MAX_LABEL_WIDTH, 165).
--define(X0, 15).
--define(Y0, 20).
--define(LABEL_HEIGHT, 30).
--define(ENTRY_HEIGHT, 30).
--define(FONT, {screen,12}).
--define(NEXT_BTN_WIDTH, 57).
--define(NEXT_BTN_HEIGHT, 22).
--define(NEXT_BTN_FG, {178,34,34}).
--define(INSERT_BTN_WIDTH, 80).
--define(INSERT_BTN_HEIGHT, 30).
--define(INSERT_BTN_DIST_BETWEEN, 23).
--define(INSERT_BTN_DIST_FROM_BOTTOM, 23).
-
-
-
-
-
-start(TableType, TableName, AttributeList, ListsAsStr, ErrMsgMode) ->
-    AttributeValues = lists:duplicate(length(AttributeList), undefined),
-    spawn_link(?MODULE, init, [TableType, TableName, AttributeList, 
-			       AttributeValues, ListsAsStr, ErrMsgMode, self(), true]).
-
-
-
-start(TableType, TableName, AttributeList, AttributeValues, ListsAsStr, ErrMsgMode) ->
-    spawn_link(?MODULE, init, [TableType, TableName, AttributeList, 
-			       AttributeValues, ListsAsStr, ErrMsgMode, self(), false]).
-
-
-
-
-init(TableType,TableName,AttributeList,AttributeValues,ListsAsStr,ErrMsgMode,MasterPid,Insert) ->
-    process_flag(trap_exit, true),
-    put(error_msg_mode, ErrMsgMode),
-    Frames = create_window(TableType, TableName, AttributeList, AttributeValues, 
-			   ListsAsStr, Insert),
-    loop(TableType, TableName, Frames, AttributeList, AttributeValues, MasterPid, ListsAsStr).
-
-
-
-
-
-loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr) ->
-    receive
-		
-	{gs, insert, click, Insert, _Args} ->
-	    gs:config(win, [{cursor, busy}]),
-	    case get_record(TabType, TabName, AttrList, AttrList, Frames) of
-		{ok, NewRec} ->
-		    case Insert of
-			insert ->
-			    MPid ! {new_object, NewRec};
-			change ->
-			    MPid ! {updated_object, NewRec}
-		    end;
-		error ->
-		    done
-	    end,
-	    gs:config(win, [{cursor, arrow}]),	    
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-	
-
-	{gs, cancel, click, _Data, _Args} ->
-	    exit(normal);
-	
-
-	{gs, reset, click, _Data, _Args} ->
-	    gs:config(win, [{cursor, busy}]),
-	    set_entry_values(TabType, AttrList, AttrVals, ListsAsStr),
-	    gs:config(win, [{cursor, arrow}]),
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-
-
-
-	{gs, EntryId, keypress, _Data, ['Tab', _No, 0 | _T]} ->
-	    {_Term, {NextEntry, NextFrame}} = 
-		check_entry_content(EntryId, AttrList, Frames, forward),
-	    case NextEntry of
-		EntryId ->
-		    gs:config(NextEntry, [{setfocus, true}]);
-		_OtherId ->
-		    gs:config(NextFrame, [raise]),
-		    gs:config(NextEntry, [{setfocus, true},
-					  {select, {0,100000000}}])
-	    end,
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-	
-
-	{gs, EntryId, keypress, _Data, ['Down' | _T]} ->
-	    {_Term, {NextEntry, NextFrame}} = 
-		check_entry_content(EntryId, AttrList, Frames, forward),
-	    case NextEntry of
-		EntryId ->
-		    gs:config(NextEntry, [{setfocus, true}]);
-		_OtherId ->
-		    gs:config(NextFrame, [raise]),
-		    gs:config(NextEntry, [{setfocus, true},
-					  {select, {0,100000000}}])
-	    end,
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-	
-
-	{gs, EntryId, keypress, _Data, ['Tab', _No, 1 | _T]} ->
-	    {_Term, {NextEntry, NextFrame}} = 
-		check_entry_content(EntryId, AttrList, Frames, backward),
-	    gs:config(NextFrame, [raise]),
-	    case NextEntry of
-		EntryId ->
-		    gs:config(NextEntry, [{setfocus, true}]);
-		_OtherId ->
-		    gs:config(NextFrame, [raise]),
-		    gs:config(NextEntry, [{setfocus, true},
-					  {select, {0,100000000}}])
-	    end,
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-	
-	
-	{gs, EntryId, keypress, _Data, ['Up' | _T]} ->
-	    {_Term, {NextEntry, NextFrame}} = 
-		check_entry_content(EntryId, AttrList, Frames, backward),
-	    gs:config(NextFrame, [raise]),
-	    case NextEntry of
-		EntryId ->
-		    gs:config(NextEntry, [{setfocus, true}]);
-		_OtherId ->
-		    gs:config(NextFrame, [raise]),
-		    gs:config(NextEntry, [{setfocus, true},
-					  {select, {0,100000000}}])
-	    end,
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-	
-	
-	{gs, Id, keypress, _Data, ['Return' | _T]} ->
-	    OldCursor = gs:read(Id, cursor),
-	    gs:config(Id, [{cursor, busy}]),
-	    gs:config(win, [{cursor, busy}]),
-	    Insert = gs:read(insert, data),
-	    case get_record(TabType, TabName, AttrList, AttrList, Frames) of
-		{ok, NewRec} ->
-		    case Insert of
-			insert ->
-			    MPid ! {new_object, NewRec};
-			change ->
-			    MPid ! {updated_object, NewRec}
-		    end;
-		error ->
-		    done
-	    end,
-	    gs:config(win, [{cursor, arrow}]),
-	    gs:config(Id, [{cursor, OldCursor}]),
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-
-
-	
-	{gs, _Id, click, FrameNo, _Args} ->
-	    gs:config(lists:nth(FrameNo, Frames), [raise]),
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-
-
-	{gs, win, configure, _Data, [Width | _T]} ->
-	    resize_window(TabType, lists:max([Width, ?WIN_WIDTH]), Frames, AttrList),
-	    loop(TabType, TabName, Frames, AttrList, AttrVals, MPid, ListsAsStr);
-	    
-
-	{gs, win, destroy, _Data, _Args} ->
-	    exit(normal);
-	
-
-	insert_mode ->
-	    NewAttrVals = lists:duplicate(length(AttrList), undefined),
-	    set_entry_values(TabType, AttrList, NewAttrVals, ListsAsStr),
-	    loop(TabType, TabName, Frames, AttrList, NewAttrVals, MPid, ListsAsStr);
-
-	
-	{update_mode, Obj} ->
-	    NewAttrVals = 
-		case TabType of
-		    mnesia ->
-			case Obj of
-			    undefined ->
-				lists:duplicate(length(AttrList), undefined);
-			    _AnyRec ->
-				tl(tuple_to_list(Obj))
-			end;
-		    ets ->
-			[Obj]
-		end,
-	    set_entry_values(TabType, AttrList, NewAttrVals, ListsAsStr),
-	    loop(TabType, TabName, Frames, AttrList, NewAttrVals, MPid, ListsAsStr);
-	    
-	    
-	{reset_info, Obj} ->
-	       %% Info to use, instead of old info, when reset button is pressed.
-	    NewAttrVals = 
-		case TabType of
-		    mnesia ->
-			case Obj of
-			    undefined ->
-				lists:duplicate(length(AttrList), undefined);
-			    _AnyRec ->
-				tl(tuple_to_list(Obj))
-			end;
-		    ets ->
-			[Obj]
-		end,
-	    loop(TabType, TabName, Frames, AttrList, NewAttrVals, MPid, ListsAsStr);
-	    
-
-	    raise ->
-	    gs:config(win, [raise]),
-	    loop(TabType, TabName, Frames, AttrList,AttrVals, MPid, ListsAsStr);
-
-
-	{'EXIT', _Pid, _Reason} ->
-	    exit(normal);
-
-
-	_Other ->
-	    loop(TabType, TabName, Frames, AttrList,AttrVals, MPid, ListsAsStr)
-    end.
-
-
-
-
-resize_window(TabType, WinWidth, Frames, AttrList) ->
-    WinHeight = 
-	case TabType of 
-	    mnesia ->
-		get_window_height(length(AttrList));
-	    ets ->
-		?ETS_WIN_HEIGHT
-	end,
-    gs:config(win, [{width, WinWidth},
-		    {height, WinHeight}
-		   ]),
-    FrameWidth = WinWidth,
-    LblL = lists:map(fun(H) ->
-			     gs:config(H, [{width, FrameWidth}]),
-			     {LblW, BId, NId} = gs:read(H, data),
-			     XNext = get_next_btn_xpos(FrameWidth),
-			     XBack = XNext - ?NEXT_BTN_WIDTH,
-			     gs:config(BId, [{x, XBack}]),
-			     gs:config(NId, [{x, XNext}]),
-			     LblW
-		     end, 
-		     Frames),
-    LblW = hd(LblL),
-    EntryW = get_entry_width(TabType, FrameWidth, LblW),
-    lists:foreach(fun(H) ->
-			  gs:config(H, [{width, EntryW}])
-		  end,
-		  AttrList),
-    gs:config(btnframe, [{width, FrameWidth}]),
-    {XInsert, XCancel, XReset} = get_insert_btn_coords(WinWidth),
-    gs:config(insert, [{x, XInsert}]),
-    gs:config(cancel, [{x, XCancel}]),
-    gs:config(reset, [{x, XReset}]).
-
-
-
-
-check_entry_content(EntryId, AttributeList, Frames, Direction) ->
-    EditedStr = gs:read(EntryId, text),
-    case tv_db_search:string_to_term(EditedStr) of
-	{error, {_Reason, Msg}} ->
-	    gs:config(EntryId, [beep]),
-	    tv_utils:notify(gs:start(), "TV Notification", Msg),
-	    {error, {EntryId, no_matter}};
-	{ok, NewTerm} ->
-	    {{ok,NewTerm}, get_next_entry_id(EntryId, AttributeList, Frames, Direction)}
-    end.
-
-    
-
-
-get_next_entry_id(EntryId, AttributeList, Frames, Direction) ->
-    OldPos = get_pos(EntryId, AttributeList),
-    MaxPos = length(AttributeList),
-    NewPos = case Direction of
-		 forward when OldPos < MaxPos ->
-		     OldPos + 1;
-		 forward ->
-		     1;
-		 backward when OldPos > 1 ->
-		     OldPos - 1;
-		 backward ->
-		     MaxPos;
-		 stationary ->
-		     OldPos
-	     end,
-    FramePos = get_next_frame_id(NewPos),
-    {lists:nth(NewPos, AttributeList), lists:nth(FramePos, Frames)}.
-
-
-
-
-get_next_frame_id(Pos) ->
-    case Pos rem 5 of
-	0 ->
-	    Pos div 5;
-	_Other ->
-	    (Pos div 5) + 1
-    end.
-    
-
-
-
-get_record(TabType, TabName, AttrList, AttrList, Frames) ->
-    case get_record(AttrList, AttrList, Frames, []) of
-	{ok, RecList} ->
-	    case TabType of
-		mnesia ->
-		    NewRecList = [TabName | RecList],
-		    {ok, list_to_tuple(NewRecList)};
-		ets ->
-		    {ok, hd(RecList)}   %% Only one element, a tuple!
-	    end;
-	error ->
-	    error
-    end.
-
-
-
-
-get_record([H | T], AttrList, Frames, Acc) ->
-    case check_entry_content(H, AttrList, Frames, forward) of
-	{{ok, NewTerm}, _PosTuple} ->
-	    get_record(T, AttrList, Frames, [NewTerm | Acc]);
-	{error, _PosTuple} ->
-	    {EntryId, FrameId} = get_next_entry_id(H, AttrList, Frames, stationary),
-	    gs:config(FrameId, [raise]),
-	    gs:config(EntryId, [{setfocus, true}]),
-	    error
-    end;
-get_record([], _AttrList, _Frames, Acc) ->
-    {ok, lists:reverse(Acc)}.
-	    
-		
-
-
-
-
-get_pos(Elem, L) ->
-    get_pos(Elem, L, 1).
-
-
-get_pos(Elem, [Elem | _T], N) ->
-    N;
-get_pos(Elem, [_H | T], N) ->
-    get_pos(Elem, T, N + 1).
-
-
-
-
-create_window(mnesia, TableName, AttrList, AttrValues, ListsAsStr, Insert) ->
-    NofAttr       = length(AttrList),
-    NofFrames =
-	case NofAttr rem 5 of
-	    0 ->
-		NofAttr div 5;
-	    _Rem ->
-		(NofAttr div 5) + 1
-	end,
-
-    WinHeight   = get_window_height(NofAttr),
-    FrameHeight = get_frame_height(NofAttr),
-
-    Attr = get_longest_attribute_name(AttrList),
-    LabelWidth = lists:min([?MAX_LABEL_WIDTH,
-			    element(1, gs:read(gs:start(), 
-					       {font_wh, {?FONT, atom_to_list(Attr)}}))]),
-    
-    gs:window(win, gs:start(), [{width, ?WIN_WIDTH},
-				{height, WinHeight},
-				{title, "[TV]   Record Editor:   '" ++ 
-				 atom_to_list(TableName) ++ "'"},
-				{bg, ?DEFAULT_BG_COLOR},
-				{configure, true},
-				{destroy, true},
-				{cursor, arrow}
-			       ]),
-    
-    create_insert_and_cancel_btns(Insert, WinHeight, FrameHeight),
-    FrameList = create_frames(NofFrames, LabelWidth, AttrList, AttrValues, NofFrames, 
-			      ListsAsStr, FrameHeight),
-    gs:config(hd(FrameList), [raise]),
-    gs:config(hd(AttrList), [{setfocus, true},
-			     {select, {0,100000000}}]),
-    gs:config(win, [{map,true}]),
-    FrameList;
-create_window(ets, TableName, [Attr], [AttrVal], ListsAsStr, Insert) ->
-    gs:window(win, gs:start(), [{width, ?WIN_WIDTH},
-				{height, ?ETS_WIN_HEIGHT},
-				{title, "[TV]   Tuple Editor, table  '" ++ 
-				 atom_to_list(TableName) ++ "'"},
-				{bg, ?DEFAULT_BG_COLOR},
-				{configure, true},
-				{destroy, true},
-				{cursor, arrow}
-			       ]),
-    
-    F = gs:frame(win, [{width, ?FRAME_WIDTH},
-		       {height, ?ETS_FRAME_HEIGHT},
-		       {x, 0},
-		       {y, 0},
-		       {bg, ?DEFAULT_BG_COLOR},
-		       {bw,2},
-		       {data, {0, undefined, undefined}}
-		      ]),
-    
-    create_insert_and_cancel_btns(Insert, ?ETS_WIN_HEIGHT, ?ETS_FRAME_HEIGHT),
-
-    EntryW = get_entry_width(ets, ?FRAME_WIDTH, 0),
-    EntryX = ?X0 - 2,
-    
-    EntryText = 
-	case AttrVal of
-	    undefined ->
-		"";
-	    _OtherVal ->
-		case ListsAsStr of
-		    true ->
-			tv_io_lib:format("~p", [AttrVal]);
-		    false ->
-			lists:flatten(io_lib:write(AttrVal))
-		end
-	end,
-    gs:entry(Attr, F, [{width, EntryW},
-		       {height, ?LABEL_HEIGHT},
-		       {x, EntryX},
-		       {y, ?Y0},
-		       {bg, {255,255,255}},
-		       {fg, {0,0,0}},
-		       {bw, 1},
-		       {font, ?FONT},
-		       {justify, left},
-		       {text, EntryText},
-		       {cursor, text},
-		       {setfocus, true},
-		       {enable, true},
-		       {keypress,true},
-		       {select, {0,100000000}}
-		      ]),
-    gs:config(win, [{map,true}]),
-    [F].
-    
-    
-    
-
-get_insert_btn_coords(WinWidth) ->
-    Middle        = round(WinWidth / 2),
-    XInsert       = Middle - round(1.5 * ?INSERT_BTN_WIDTH) - ?INSERT_BTN_DIST_BETWEEN,
-    XCancel       = Middle - round(0.5 * ?INSERT_BTN_WIDTH),
-    XReset        = Middle + round(0.5 * ?INSERT_BTN_WIDTH) + ?INSERT_BTN_DIST_BETWEEN,
-    {XInsert, XCancel, XReset}.
-
-
-
-
-create_insert_and_cancel_btns(Insert, WinHeight, FrameHeight) ->
-    LowerFrameHeight           = WinHeight - FrameHeight,
-    Y                          = ?INSERT_BTN_DIST_FROM_BOTTOM,
-    {XInsert, XCancel, XReset} = get_insert_btn_coords(?WIN_WIDTH),
-    
-    {InsertBtnText, InsertBtnData} = 
-	case Insert of
-	    true ->
-		{"Insert", insert};
-	    false ->
-		{"Change", change}
-	end,
-
-    gs:frame(btnframe, win, [{width, ?FRAME_WIDTH},
-			     {height, LowerFrameHeight},
-			     {x, 0},
-			     {y, FrameHeight},
-			     {bg, ?DEFAULT_BG_COLOR},
-			     {bw,2}
-			    ]),
-    gs:button(insert, btnframe, [{width, ?INSERT_BTN_WIDTH},
-				 {height, ?INSERT_BTN_HEIGHT},
-				 {x, XInsert},
-				 {y, Y},
-				 {bg, ?DEFAULT_BG_COLOR},
-				 {fg, {0,0,0}},
-				 {font, ?FONT},
-				 {label, {text, InsertBtnText}},
-				 {align, center},
-				 {data, InsertBtnData}
-				]),
-    gs:button(cancel, btnframe, [{width, ?INSERT_BTN_WIDTH},
-				 {height, ?INSERT_BTN_HEIGHT},
-				 {x, XCancel},
-				 {y, Y},
-				 {bg, ?DEFAULT_BG_COLOR},
-				 {fg, {0,0,0}},
-				 {font, ?FONT},
-				 {label, {text, "Cancel"}},
-				 {align, center}
-				]),
-    gs:button(reset, btnframe, [{width, ?INSERT_BTN_WIDTH},
-				{height, ?INSERT_BTN_HEIGHT},
-				{x, XReset},
-				{y, Y},
-				{bg, ?DEFAULT_BG_COLOR},
-				{fg, {0,0,0}},
-				{font, ?FONT},
-				{label, {text, "Reset"}},
-				{align, center}
-			       ]).
-    
-
-
-
-
-create_frames(0, _LblW, _AttrList, _AttrValues, _NofFrames, _ListsAsStr, _FrameHeight) ->    
-    [];
-create_frames(N, LblW, AttrList, AttrValues, NofFrames, ListsAsStr, FrameHeight) ->
-    F = gs:frame(win, [{width, ?FRAME_WIDTH},
-		       {height, FrameHeight},
-		       {x, 0},
-		       {y, 0},
-		       {bg, ?DEFAULT_BG_COLOR},
-		       {bw,2}
-		      ]),
-    {BId, NId} = create_back_and_next_btns(F, 5, N, NofFrames),
-    gs:config(F, [{data, {LblW, BId, NId}}]),
-    {RemAttrList, RemAttrValues} = 
-	create_labels_and_entries(5, AttrList, AttrValues, LblW, F, ListsAsStr),
-    [F | create_frames(N - 1,LblW,RemAttrList,RemAttrValues,NofFrames,ListsAsStr,FrameHeight)].
-
-
-
-
-
-
-create_back_and_next_btns(FrameId, NofEntries, FrameNo, NofFrames) ->
-    Y        = ?Y0 + NofEntries * (?LABEL_HEIGHT + 10) + 8,
-    XNext    = get_next_btn_xpos(?FRAME_WIDTH),
-    XBack    = XNext - ?NEXT_BTN_WIDTH,
-    DataNext = (NofFrames - FrameNo + 1) + 1,
-    DataBack = (NofFrames - FrameNo + 1) - 1,
-    BId = 
-	if 
-	    DataBack =< 0 ->
-		undefined;
-	    true ->
-		gs:button(FrameId, [{width, ?NEXT_BTN_WIDTH},
-				    {height, ?NEXT_BTN_HEIGHT},
-				    {x, XBack},
-				    {y, Y},
-				    {bg, ?DEFAULT_BG_COLOR},
-				    {fg, ?NEXT_BTN_FG},
-				    {font, ?FONT},
-				    {align, center},
-				    {label, {text, "< Back"}},
-				    %% {underline, 2},
-				    {data, DataBack}
-				   ])
-	end,
-    NId = 
-	if
-	    DataNext > NofFrames ->
-		undefined;
-	    true ->
-		gs:button(FrameId, [{width, ?NEXT_BTN_WIDTH},
-				    {height, ?NEXT_BTN_HEIGHT},
-				    {x, XNext},
-				    {y, Y},
-				    {bg, ?DEFAULT_BG_COLOR},
-				    {fg, ?NEXT_BTN_FG},
-				    {font, ?FONT},
-				    {align, center},
-				    {label, {text, " Next >"}},
-				    %% {underline, 1},
-				    {data, DataNext}
-				   ])
-	end,
-    {BId, NId}.
-
-
-
-
-get_next_btn_xpos(FrameWidth) ->
-    FrameWidth - ?X0 - ?NEXT_BTN_WIDTH.
-
-
-
-get_entry_width(TableType, FrameWidth, LblWidth) ->
-    HorizontalSpacing = 
-	case TableType of
-	    mnesia ->
-		10;
-	    ets ->
-		0
-	end,
-    FrameWidth - LblWidth - 2 * ?X0 - HorizontalSpacing.
-    
-
-
-create_labels_and_entries(N, [H | T], [VH | VT], LblW, F, ListsAsStr) when N > 0 ->
-    Y      = ?Y0 + (5 - N) * (?LABEL_HEIGHT + 10),
-    EntryW = get_entry_width(mnesia, ?FRAME_WIDTH, LblW),
-    EntryX = ?FRAME_WIDTH - EntryW - ?X0 - 2,
-
-    EntryText = 
-	case ListsAsStr of
-	    true ->
-		tv_io_lib:format("~p", [VH]);
-	    false ->
-		lists:flatten(io_lib:write(VH))
-	end,
-    gs:label(F, [{width, LblW},
-		 {height, ?LABEL_HEIGHT},
-		 {x, ?X0},
-		 {y, Y},
-		 {bg, ?DEFAULT_BG_COLOR},
-		 {fg, {0,0,0}},
-		 {align,w},
-		 {font, ?FONT},
-		 {label, {text, atom_to_list(H)}}
-		]),
-    gs:entry(H, F, [{width, EntryW},
-		    {height, ?LABEL_HEIGHT},
-		    {x, EntryX},
-		    {y, Y},
-		    {bg, {255,255,255}},
-		    {fg, {0,0,0}},
-		    {bw, 1},
-		    {font, ?FONT},
-		    {justify, left},
-		    {text, EntryText},
-		    {cursor, text},
-		    {setfocus, false},
-		    {enable, true},
-		    {keypress,true}
-		   ]),
-    create_labels_and_entries(N - 1, T, VT, LblW, F, ListsAsStr);
-create_labels_and_entries(0, RemAttrList, RemAttrValues, _LblW, _F, _ListsAsStr) ->
-    {RemAttrList, RemAttrValues};
-create_labels_and_entries(_N, [], [], _LblW, _F, _ListsAsStr) ->
-    {[], []}.
-
-
-
-
-get_longest_attribute_name(AttrList) ->
-    get_longest_attribute_name(AttrList, 0, undefined).
-
-
-get_longest_attribute_name([H | T], Max, Attr) ->
-    CurrLength = length(atom_to_list(H)),
-    if
-	CurrLength >= Max ->
-	    get_longest_attribute_name(T, CurrLength, H);
-	true ->
-	    get_longest_attribute_name(T, Max, Attr)
-    end;
-get_longest_attribute_name([], _Max, Attr) ->
-    Attr.
-
-
-
-
-get_window_height(N) ->
-    if 
-	N >= 5 ->
-	    ?WIN_HEIGHT;
-	true ->
-	    ?WIN_HEIGHT - ((5 - N) * (?LABEL_HEIGHT + 10) + ?NEXT_BTN_HEIGHT + 8)
-    end.
-
-
-
-get_frame_height(N) ->
-    if 
-	N >= 5 ->
-	    ?FRAME_HEIGHT;
-	true ->
-	    ?FRAME_HEIGHT - ((5 - N) * (?LABEL_HEIGHT + 10) + ?NEXT_BTN_HEIGHT + 8)
-    end.
-	    
-    
-
-
-set_entry_values(TabType, [H | T], [VH | VT], ListsAsStr) ->
-    EntryText = 
-	case VH of
-	    undefined when TabType =:= ets ->
-		"";
-	    _AnyValue ->
-		case ListsAsStr of
-		    true ->
-			tv_io_lib:format("~p", [VH]);
-		    false ->
-			lists:flatten(io_lib:write(VH))
-		end
-	end,
-    gs:config(H, [{text, EntryText}]),
-    set_entry_values(TabType, T, VT, ListsAsStr);
-set_entry_values(_TabType, [], [], _ListsAsStr) ->
-    done.
diff --git a/lib/tv/src/tv_table_owner.erl b/lib/tv/src/tv_table_owner.erl
deleted file mode 100644
index bccac6c236..0000000000
--- a/lib/tv/src/tv_table_owner.erl
+++ /dev/null
@@ -1,122 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1998-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(tv_table_owner).
-
-
-
--export([create/5
-	]).
-
-
--export([internal_create/3,
-	 start/0,
-	 init/0
-	]).
-
-
-
--define(REGISTERED_NAME, tv_table_owner).
-
-
-
-create(mnesia, _Node, _LocalNode, _TableName, _Options) ->
-    error;
-create(ets, _Node, true, TabName, Options) ->
-    case catch internal_create(ets, TabName, Options) of
-	{TabName, Pid} when is_pid(Pid) ->
-	    {ok, {TabName,Pid}};
-	{TabNo, Pid} when is_pid(Pid) ->
-	    {ok, {TabNo,Pid}};
-	_OtherResult ->
-	    error
-    end;
-create(ets, Node, false, TabName, Options) ->
-    case catch rpc:block_call(Node, ?MODULE, internal_create, [ets, TabName, Options]) of
-	{TabName, Pid} when is_pid(Pid) ->
-	    {ok, {TabName,Pid}};
-	{TabNo, Pid} when is_pid(Pid) ->
-	    {ok, {TabNo,Pid}};
-	_OtherResult ->
-	    error
-    end.
-	
-
-
-
-
-internal_create(ets, TabName, Options) ->
-    ?MODULE:start(),
-    ?REGISTERED_NAME ! {create, self(), ets, TabName, Options},
-    receive
-	{?REGISTERED_NAME, Result} ->
-	    Result
-    after 
-	5000 ->
-	    error
-    end.
-
-
-
-
-
-
-start() ->
-    case whereis(?REGISTERED_NAME) of
-	undefined ->
-	    ServerPid = spawn(?MODULE, init, []),
-	    case catch register(?REGISTERED_NAME, ServerPid) of
-		true ->
-		    ok;
-		{'EXIT', _Reason} ->
-		    exit(ServerPid, kill),
-		    timer:sleep(500),
-		    start()
-	    end;
-	Pid when is_pid(Pid) ->
-	    ok
-    end.
-
-
-
-
-
-
-
-
-init() ->
-       %% Currently no initialisations!
-    loop().
-
-
-
-
-
-
-loop() ->
-    receive
-	
-	{create, Sender, ets, TabName, Options} ->
-	    Sender ! {?REGISTERED_NAME, (catch ets:new(TabName, Options))},
-	    loop();
-
-
-	_Other ->
-	    loop()
-
-    end.
-	    
diff --git a/lib/tv/src/tv_utils.erl b/lib/tv/src/tv_utils.erl
deleted file mode 100644
index 799e3994cb..0000000000
--- a/lib/tv/src/tv_utils.erl
+++ /dev/null
@@ -1,179 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% 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
-%% 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(tv_utils).
--compile([{nowarn_deprecated_function,{gs,config,2}},
-          {nowarn_deprecated_function,{gs,create,3}},
-          {nowarn_deprecated_function,{gs,destroy,1}}]).
-
-
-
--export([notify/3]).
-
-
-
-   %% Minimum size of help windows
--define(wwin, 300).
--define(hwin, 180).
-
-   %% Button sizes
--define(wbut, 60).
--define(hbut, 30).
-
--define(pad, 10).
-
-
-%----------------------------------------
-% notify(S,Strings) -> ok
-%   S       = pid() GS
-%   Strings = string() | [string()]
-% A notification window contains a message to the user.
-% Will lock the GUI until the user confirms the message by
-% pressing the 'Ok' button.
-%----------------------------------------
-notify(S,Title,Strings) ->
-    W    = required_width(Strings, ?wwin),
-    Htop = round(2 * ?hwin / 3),
-    Hbot = ?hwin - Htop,
-
-    %% Open a new window
-    Win = gs:create(window,S,[{width, W},
-			      {height, ?hwin},
-                              {title,  Title},
-                              {data, notifywin}
-			     ]),
-
-    %% Top frame containing a label
-    Top = gs:create(frame,Win,[{width, W},
-			       {height, Htop},
-			       {x, 0},
-			       {y, 0},
-                               {data, notifywin},
-			       {keypress, true}
-			      ]),
-    
-    Lbl = gs:create(label,Top,[{width,W},
-			       {height, Htop - 2 * ?pad},
-			       {x, 0},
-			       {y, ?pad},
-                               {align, c},
-			       {justify, center},
-                               {data, notifywin},
-			       {keypress, true}
-			      ]),
-  
-    gs:config(Lbl, {label, {text, insert_newlines(Strings)}}),
-
-    %% Bottom frame containing an 'Ok' button
-    Bot = gs:create(frame,Win,[{width, W},
-			       {height, Hbot},
-			       {x, 0},
-			       {y, Htop}
-			      ]),
-    gs:create(button,Bot,[{width, ?wbut},
-			  {height, ?hbut},
-                          {x, W / 2 - ?wbut/2},
-			  {y, Hbot / 2 - ?hbut / 2},
-                          {label, {text, "OK"}},
-                          {data, notifywin},
-			  {keypress, true}]),
-
-    gs:config(Win, [{map,true}]),
-    
-    event_loop(Win,null).
-
-
-
-
-insert_newlines([String|Rest]) when is_list(String), Rest=/=[]->
-    String ++ "\n" ++ insert_newlines(Rest);
-insert_newlines([Last]) ->
-    [Last];
-insert_newlines(Other) ->
-    Other.
-
-
-
-
-event_loop(Win,Entry) ->
-    receive
-
-        %%
-        %% Notify window
-        %%
-
-        %% 'Ok' pressed in notify window
-        {gs,_Obj,_Event,notifywin,["OK"|_]} ->
-            gs:destroy(Win),
-            ok;
-
-        %% 'Window manager destroy' received in notify window
-        {gs,_Obj,destroy,notifywin,_} ->
-            gs:destroy(Win),
-            ok;
-
-        %% 'Return' pressed in notify or confirm window
-        {gs,_Obj,_Event,helpwin,['Return'|_]} ->
-            gs:destroy(Win),
-            ok;
-
-
-        %%
-        %% Common or partly common events
-        %%
-
-        %% 'Window manager destroy' received in notify, 
-        %% confirm,confirm_exit or request window
-        {gs,_Obj,destroy,_,_} ->
-            gs:destroy(Win),
-            cancel;
-
-        %% Flush any other GS events
-        {gs,_Obj,_Event,_Data,_Arg} ->
-            event_loop(Win,Entry)
-    end.
-
-
-
-
-%----------------------------------------
-% required_width(Strings,Min) -> Req
-%   Strings   = string() | [string()]
-%   Min = Req = integer()
-% Returns the minimum required width in pixels for a help window,
-% which is the maximum of Min and the required width for Strings.
-% NOTE: Font dependant really!
-%----------------------------------------
-required_width([First|Rest],Min) when is_list(First) ->
-    Req = 7*length(First), % 7 pixels per character
-    if
-        Req>Min ->
-            required_width(Rest,Req);
-        true ->
-            required_width(Rest,Min)
-    end;
-required_width([],Min) ->
-    Min;
-required_width(String,Min) ->
-    Req = 7*length(String),
-    if
-        Req>Min ->
-            Req;
-        true ->
-            Min
-    end.
-
diff --git a/lib/tv/vsn.mk b/lib/tv/vsn.mk
deleted file mode 100644
index 59d124a3b7..0000000000
--- a/lib/tv/vsn.mk
+++ /dev/null
@@ -1 +0,0 @@
-TV_VSN = 2.1.4.10
diff --git a/lib/typer/src/typer.appup.src b/lib/typer/src/typer.appup.src
index 54a63833e6..bebe7a159c 100644
--- a/lib/typer/src/typer.appup.src
+++ b/lib/typer/src/typer.appup.src
@@ -1 +1,21 @@
-{"%VSN%",[],[]}.
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
+{"%VSN%",
+ [{<<".*">>,[{restart_application, typer}]}],
+ [{<<".*">>,[{restart_application, typer}]}]
+}.
diff --git a/lib/typer/src/typer.erl b/lib/typer/src/typer.erl
index 0ace1d5fb8..572bf24ca4 100644
--- a/lib/typer/src/typer.erl
+++ b/lib/typer/src/typer.erl
@@ -2,7 +2,7 @@
 %%-----------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2014. All Rights Reserved.
 %%
 %% The 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 @@
 	 %% Files in 'fms' are compilable with option 'to_pp'; we keep them
 	 %% as {FileName, ModuleName} in case the ModuleName is different
 	 fms        = []		 :: [{file:filename(), module()}],
-	 ex_func    = map__new()	 :: map(),
-	 record     = map__new()	 :: map(),
-	 func       = map__new()	 :: map(),
-	 inc_func   = map__new()	 :: map(),
+	 ex_func    = map__new()	 :: map_dict(),
+	 record     = map__new()	 :: map_dict(),
+	 func       = map__new()	 :: map_dict(),
+	 inc_func   = map__new()	 :: map_dict(),
 	 trust_plt  = dialyzer_plt:new() :: plt()}).
 -type analysis() :: #analysis{}.
 
@@ -220,11 +220,11 @@ get_external(Exts, Plt) ->
 -type fa()        :: {atom(), arity()}.
 -type func_info() :: {line(), atom(), arity()}.
 
--record(info, {records = map__new() :: map(),
+-record(info, {records = map__new() :: map_dict(),
 	       functions = []       :: [func_info()],
-	       types = map__new()   :: map(),
+	       types = map__new()   :: map_dict(),
 	       edoc = false	    :: boolean()}).
--record(inc, {map = map__new() :: map(), filter = [] :: files()}).
+-record(inc, {map = map__new() :: map_dict(), filter = [] :: files()}).
 -type inc() :: #inc{}.
 
 -spec show_or_annotate(analysis()) -> 'ok'.
@@ -1094,29 +1094,29 @@ rcv_ext_types(Self, ExtTypes) ->
 %% specialized for the uses in this module
 %%--------------------------------------------------------------------
 
--type map() :: dict().
+-type map_dict() :: dict:dict().
 
--spec map__new() -> map().
+-spec map__new() -> map_dict().
 map__new() ->
   dict:new().
 
--spec map__insert({term(), term()}, map()) -> map().
+-spec map__insert({term(), term()}, map_dict()) -> map_dict().
 map__insert(Object, Map) ->
   {Key, Value} = Object,
   dict:store(Key, Value, Map).
 
--spec map__lookup(term(), map()) -> term().
+-spec map__lookup(term(), map_dict()) -> term().
 map__lookup(Key, Map) ->
   try dict:fetch(Key, Map) catch error:_ -> none end.
 
--spec map__from_list([{fa(), term()}]) -> map().
+-spec map__from_list([{fa(), term()}]) -> map_dict().
 map__from_list(List) ->
   dict:from_list(List).
 
--spec map__remove(term(), map()) -> map().
+-spec map__remove(term(), map_dict()) -> map_dict().
 map__remove(Key, Dict) ->
   dict:erase(Key, Dict).
 
--spec map__fold(fun((term(), term(), term()) -> map()), map(), map()) -> map().
+-spec map__fold(fun((term(), term(), term()) -> map_dict()), map_dict(), map_dict()) -> map_dict().
 map__fold(Fun, Acc0, Dict) -> 
   dict:fold(Fun, Acc0, Dict).
diff --git a/lib/typer/test/Makefile b/lib/typer/test/Makefile
new file mode 100644
index 0000000000..d6dd22b6cf
--- /dev/null
+++ b/lib/typer/test/Makefile
@@ -0,0 +1,65 @@
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	typer_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/typer_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)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES) $(GEN_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) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) typer.spec "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+
+release_docs_spec:
diff --git a/lib/typer/test/typer.spec b/lib/typer/test/typer.spec
new file mode 100644
index 0000000000..79f51b6781
--- /dev/null
+++ b/lib/typer/test/typer.spec
@@ -0,0 +1 @@
+{suites,"../typer_test",all}.
diff --git a/lib/typer/test/typer_SUITE.erl b/lib/typer/test/typer_SUITE.erl
new file mode 100644
index 0000000000..99c4facbad
--- /dev/null
+++ b/lib/typer/test/typer_SUITE.erl
@@ -0,0 +1,56 @@
+%% ``The 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.''
+%%
+-module(typer_SUITE).
+
+-compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    case application:ensure_all_started(typer) of
+        {ok, Apps} ->
+            [application:stop(App) || App <- lists:reverse(Apps)],
+            [app, appup];
+        _ ->
+            [appup]
+    end.
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+     ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+app() ->
+    [{doc, "Test that the typer app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(typer).
+
+appup() ->
+    [{doc, "Test that the typer appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(typer).
diff --git a/lib/webtool/doc/src/book.xml b/lib/webtool/doc/src/book.xml
index ace70b5726..913d635b76 100644
--- a/lib/webtool/doc/src/book.xml
+++ b/lib/webtool/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/fascicules.xml b/lib/webtool/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/webtool/doc/src/fascicules.xml
+++ b/lib/webtool/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/webtool/doc/src/notes.xml b/lib/webtool/doc/src/notes.xml
index 76b73daa59..74e5fd88c1 100644
--- a/lib/webtool/doc/src/notes.xml
+++ b/lib/webtool/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
diff --git a/lib/webtool/doc/src/notes_history.xml b/lib/webtool/doc/src/notes_history.xml
index a72a85412d..d491063565 100644
--- a/lib/webtool/doc/src/notes_history.xml
+++ b/lib/webtool/doc/src/notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/part.xml b/lib/webtool/doc/src/part.xml
index 9306ea020e..32275a02d2 100644
--- a/lib/webtool/doc/src/part.xml
+++ b/lib/webtool/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/part_notes.xml b/lib/webtool/doc/src/part_notes.xml
index 7d5592d3aa..75446ee687 100644
--- a/lib/webtool/doc/src/part_notes.xml
+++ b/lib/webtool/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/part_notes_history.xml b/lib/webtool/doc/src/part_notes_history.xml
index 76db9b7d9a..6a4a93d399 100644
--- a/lib/webtool/doc/src/part_notes_history.xml
+++ b/lib/webtool/doc/src/part_notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/ref_man.xml b/lib/webtool/doc/src/ref_man.xml
index 537e8697c9..3fbf289d66 100644
--- a/lib/webtool/doc/src/ref_man.xml
+++ b/lib/webtool/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/start_webtool.xml b/lib/webtool/doc/src/start_webtool.xml
index b525b38845..d02ddb996c 100644
--- a/lib/webtool/doc/src/start_webtool.xml
+++ b/lib/webtool/doc/src/start_webtool.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE comref SYSTEM "comref.dtd">
 
 <comref>
   <header>
     <copyright>
-      <year>2003</year><year>2010</year>
+      <year>2003</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/webtool.xml b/lib/webtool/doc/src/webtool.xml
index bbb25d29bd..375607e001 100644
--- a/lib/webtool/doc/src/webtool.xml
+++ b/lib/webtool/doc/src/webtool.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2001</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/doc/src/webtool_chapter.xml b/lib/webtool/doc/src/webtool_chapter.xml
index 77fcaebb4b..a233cd6662 100644
--- a/lib/webtool/doc/src/webtool_chapter.xml
+++ b/lib/webtool/doc/src/webtool_chapter.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2011</year>
+      <year>2001</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
index f28c777240..af565c8895 100644
--- a/lib/webtool/src/Makefile
+++ b/lib/webtool/src/Makefile
@@ -66,7 +66,7 @@ ERL_COMPILE_FLAGS += +warn_obsolete_guard
 debug opt: $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 
 clean:
-	rm -f $(TARGET_FILES) $(APP_TARGET) $(APP_TARGET)
+	rm -f $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET)
 	rm -f core
 
 docs:
diff --git a/lib/webtool/src/webtool.appup.src b/lib/webtool/src/webtool.appup.src
index 7a435e9b22..9e6f4b9b5b 100644
--- a/lib/webtool/src/webtool.appup.src
+++ b/lib/webtool/src/webtool.appup.src
@@ -1,7 +1,7 @@
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2014. All Rights Reserved.
 %% 
 %% The 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,5 +15,7 @@
 %% under the License.
 %% 
 %% %CopyrightEnd%
-%%
-{"%VSN%",[],[]}.
+{"%VSN%",
+ [{<<".*">>,[{restart_application, webtool}]}],
+ [{<<".*">>,[{restart_application, webtool}]}]
+}.
diff --git a/lib/webtool/test/Makefile b/lib/webtool/test/Makefile
new file mode 100644
index 0000000000..93aa1c09eb
--- /dev/null
+++ b/lib/webtool/test/Makefile
@@ -0,0 +1,65 @@
+include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/$(TARGET)/otp.mk
+
+# ----------------------------------------------------
+# Target Specs
+# ----------------------------------------------------
+
+MODULES= \
+	webtool_SUITE
+
+ERL_FILES= $(MODULES:%=%.erl)
+
+TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
+INSTALL_PROGS= $(TARGET_FILES)
+
+EMAKEFILE=Emakefile
+
+# ----------------------------------------------------
+# Release directory specification
+# ----------------------------------------------------
+RELSYSDIR = $(RELEASE_PATH)/webtool_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)
+	$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) '*_SUITE_make' \
+	>> $(EMAKEFILE)
+
+tests debug opt: make_emakefile
+	erl $(ERL_MAKE_FLAGS) -make
+
+clean:
+	rm -f $(EMAKEFILE)
+	rm -f $(TARGET_FILES) $(GEN_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) $(EMAKEFILE) $(ERL_FILES) "$(RELSYSDIR)"
+	$(INSTALL_DATA) webtool.spec "$(RELSYSDIR)"
+	chmod -R u+w "$(RELSYSDIR)"
+
+release_docs_spec:
diff --git a/lib/webtool/test/webtool.spec b/lib/webtool/test/webtool.spec
new file mode 100644
index 0000000000..134e6ed40c
--- /dev/null
+++ b/lib/webtool/test/webtool.spec
@@ -0,0 +1 @@
+{suites,"../webtool_test",all}.
diff --git a/lib/webtool/test/webtool_SUITE.erl b/lib/webtool/test/webtool_SUITE.erl
new file mode 100644
index 0000000000..64ff221a1b
--- /dev/null
+++ b/lib/webtool/test/webtool_SUITE.erl
@@ -0,0 +1,50 @@
+%% ``The 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.''
+%%
+-module(webtool_SUITE).
+
+-compile([export_all]).
+-include_lib("common_test/include/ct.hrl").
+
+suite() ->
+    [{ct_hooks, [ts_install_cth]}].
+
+all() ->
+    [app, appup].
+
+groups() ->
+    [].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+     ok.
+
+init_per_group(_GroupName, Config) ->
+    Config.
+
+end_per_group(_GroupName, Config) ->
+    Config.
+
+app() ->
+    [{doc, "Test that the webtool app file is ok"}].
+app(Config) when is_list(Config) ->
+    ok = ?t:app_test(webtool).
+
+appup() ->
+    [{doc, "Test that the webtool appup file is ok"}].
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(webtool).
diff --git a/lib/wx/aclocal.m4 b/lib/wx/aclocal.m4
index 25f40944e7..46b30a16b3 100644
--- a/lib/wx/aclocal.m4
+++ b/lib/wx/aclocal.m4
@@ -954,6 +954,40 @@ dnl
 AC_DEFUN(ERL_FIND_ETHR_LIB,
 [
 
+AC_ARG_ENABLE(native-ethr-impls,
+	      AS_HELP_STRING([--disable-native-ethr-impls],
+                             [disable native ethread implementations]),
+[ case "$enableval" in
+    no) disable_native_ethr_impls=yes ;;
+    *)  disable_native_ethr_impls=no ;;
+  esac ], disable_native_ethr_impls=no)
+
+test "X$disable_native_ethr_impls" = "Xyes" &&
+  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
+
+AC_ARG_ENABLE(x86-out-of-order,
+	      AS_HELP_STRING([--enable-x86-out-of-order],
+                             [enable x86/x84_64 out of order support (default disabled)]))
+
+AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
+	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
+			     [prefer gcc native ethread implementations]),
+[ case "$enableval" in
+    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
+    *)  enable_prefer_gcc_native_ethr_impls=no ;;
+  esac ], enable_prefer_gcc_native_ethr_impls=no)
+
+test $enable_prefer_gcc_native_ethr_impls = yes &&
+  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
+
+AC_ARG_WITH(libatomic_ops,
+	    AS_HELP_STRING([--with-libatomic_ops=PATH],
+			   [specify and prefer usage of libatomic_ops in the ethread library]))
+
+AC_ARG_WITH(with_sparc_memory_order,
+	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
+			   [specify sparc memory order (defaults to RMO)]))
+
 LM_CHECK_THR_LIB
 ERL_INTERNAL_LIBS
 
@@ -1003,40 +1037,44 @@ case "$THR_LIB_NAME" in
 
 	AC_DEFINE(ETHR_WIN32_THREADS, 1, [Define if you have win32 threads])
 
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
-	test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
-
-	ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
-
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    have_interlocked_op=no
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT, 1, [Define if you have _InterlockedDecrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement_rel], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT_REL, 1, [Define if you have _InterlockedDecrement_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT, 1, [Define if you have _InterlockedIncrement()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement_acq], [1], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT_ACQ, 1, [Define if you have _InterlockedIncrement_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD, 1, [Define if you have _InterlockedExchangeAdd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd_acq], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD_ACQ, 1, [Define if you have _InterlockedExchangeAdd_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND, 1, [Define if you have _InterlockedAnd()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR, 1, [Define if you have _InterlockedOr()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange], [2], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE, 1, [Define if you have _InterlockedExchange()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE, 1, [Define if you have _InterlockedCompareExchange()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_acq], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_ACQ, 1, [Define if you have _InterlockedCompareExchange_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange_rel], [3], [long], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE_REL, 1, [Define if you have _InterlockedCompareExchange_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64, 1, [Define if you have _InterlockedDecrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedDecrement64_rel], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDDECREMENT64_REL, 1, [Define if you have _InterlockedDecrement64_rel()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64, 1, [Define if you have _InterlockedIncrement64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedIncrement64_acq], [1], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDINCREMENT64_ACQ, 1, [Define if you have _InterlockedIncrement64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64, 1, [Define if you have _InterlockedExchangeAdd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchangeAdd64_acq], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGEADD64_ACQ, 1, [Define if you have _InterlockedExchangeAdd64_acq()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedAnd64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDAND64, 1, [Define if you have _InterlockedAnd64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedOr64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDOR64, 1, [Define if you have _InterlockedOr64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedExchange64], [2], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDEXCHANGE64, 1, [Define if you have _InterlockedExchange64()]))
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64, 1, [Define if you have _InterlockedCompareExchange64()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_acq], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_ACQ, 1, [Define if you have _InterlockedCompareExchange64_acq()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange64_rel], [3], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE64_REL, 1, [Define if you have _InterlockedCompareExchange64_rel()]))
+	    test "$have_interlocked_op" = "yes" && ethr_have_native_atomics=yes
+
+	    ETHR_CHK_INTERLOCKED([_InterlockedCompareExchange128], [4], [__int64], AC_DEFINE_UNQUOTED(ETHR_HAVE__INTERLOCKEDCOMPAREEXCHANGE128, 1, [Define if you have _InterlockedCompareExchange128()]))
+	fi
 	test "$ethr_have_native_atomics" = "yes" && ethr_have_native_spinlock=yes
 	;;
 
@@ -1303,93 +1341,98 @@ case "$THR_LIB_NAME" in
 	    int128="__int128_t"
 	fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+	if test "X$disable_native_ethr_impls" = "Xyes"; then
+	    ethr_have_native_atomics=no
+	else
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP32, 1, [Define if you have __sync_val_compare_and_swap() for 32-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH32, 1, [Define if you have __sync_add_and_fetch() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND32, 1, [Define if you have __sync_fetch_and_and() for 32-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [32], [$int32], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR32, 1, [Define if you have __sync_fetch_and_or() for 32-bit integers]))
+
+	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
+	    test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
+	    ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
+	    ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+
+	    if test $int128 != no; then
+	        ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
+	    fi
 
-	ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP64, 1, [Define if you have __sync_val_compare_and_swap() for 64-bit integers]))
-	test "$have_sync_op" = "yes" && ethr_have_native_atomics=yes
-	ETHR_CHK_SYNC_OP([__sync_add_and_fetch], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_ADD_AND_FETCH64, 1, [Define if you have __sync_add_and_fetch() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_and], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_AND64, 1, [Define if you have __sync_fetch_and_and() for 64-bit integers]))
-	ETHR_CHK_SYNC_OP([__sync_fetch_and_or], [2], [64], [$int64], AC_DEFINE(ETHR_HAVE___SYNC_FETCH_AND_OR64, 1, [Define if you have __sync_fetch_and_or() for 64-bit integers]))
+	    AC_MSG_CHECKING([for a usable libatomic_ops implementation])
+	    case "x$with_libatomic_ops" in
+	        xno | xyes | x)
+	    	    libatomic_ops_include=
+	    	    ;;
+	        *)
+	    	    if test -d "${with_libatomic_ops}/include"; then
+	    	        libatomic_ops_include="-I$with_libatomic_ops/include"
+	    	        CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
+	    	    else
+	    	        AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
+	    	    fi;;
+	    esac
+	    ethr_have_libatomic_ops=no
+	    AC_TRY_LINK([#include "atomic_ops.h"],
+	    	        [
+	    	    	    volatile AO_t x;
+	    	    	    AO_t y;
+	    	    	    int z;
+
+	    	    	    AO_nop_full();
+	    	    	    AO_store(&x, (AO_t) 0);
+	    	    	    z = AO_load(&x);
+	    	    	    z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
+	    	        ],
+	    	        [ethr_have_native_atomics=yes
+	    	         ethr_have_libatomic_ops=yes])
+	    AC_MSG_RESULT([$ethr_have_libatomic_ops])
+	    if test $ethr_have_libatomic_ops = yes; then
+	        AC_CHECK_SIZEOF(AO_t, ,
+	    	    	        [
+	    	    	    	    #include <stdio.h>
+	    	    	    	    #include "atomic_ops.h"
+	    	    	        ])
+	        AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
+
+	        AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
+	        if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	    	    AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
+	        fi
+	        ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
+	    elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
+	        AC_MSG_ERROR([No usable libatomic_ops implementation found])
+	    fi
 
-	if test $int128 != no; then
-	    ETHR_CHK_SYNC_OP([__sync_val_compare_and_swap], [3], [128], [$int128], AC_DEFINE(ETHR_HAVE___SYNC_VAL_COMPARE_AND_SWAP128, 1, [Define if you have __sync_val_compare_and_swap() for 128-bit integers]))
-	fi
+	    case "$host_cpu" in
+	      sparc | sun4u | sparc64 | sun4v)
+	    	    case "$with_sparc_memory_order" in
+	    	        "TSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
+	    	        "PSO")
+	    	    	    AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
+	    	        "RMO"|"")
+	    	    	    AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
+	    	        *)
+	    	    	    AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
+	    	    esac
+	    	    ethr_have_native_atomics=yes;; 
+	      i86pc | i*86 | x86_64 | amd64)
+	    	    if test "$enable_x86_out_of_order" = "yes"; then
+	    	    	    AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
+	    	    fi
+	    	    ethr_have_native_atomics=yes;;
+	      macppc | ppc | powerpc | "Power Macintosh")
+	    	    ethr_have_native_atomics=yes;;
+	      tile)
+	    	    ethr_have_native_atomics=yes;;
+	      *)
+	    	    ;;
+	    esac
 
-	AC_MSG_CHECKING([for a usable libatomic_ops implementation])
-	case "x$with_libatomic_ops" in
-	    xno | xyes | x)
-		libatomic_ops_include=
-		;;
-	    *)
-		if test -d "${with_libatomic_ops}/include"; then
-		    libatomic_ops_include="-I$with_libatomic_ops/include"
-		    CPPFLAGS="$CPPFLAGS $libatomic_ops_include"
-		else
-		    AC_MSG_ERROR([libatomic_ops include directory $with_libatomic_ops/include not found])
-		fi;;
-	esac
-	ethr_have_libatomic_ops=no
-	AC_TRY_LINK([#include "atomic_ops.h"],
-		    [
-			volatile AO_t x;
-			AO_t y;
-			int z;
-
-			AO_nop_full();
-			AO_store(&x, (AO_t) 0);
-			z = AO_load(&x);
-			z = AO_compare_and_swap_full(&x, (AO_t) 0, (AO_t) 1);
-		    ],
-		    [ethr_have_native_atomics=yes
-		     ethr_have_libatomic_ops=yes])
-	AC_MSG_RESULT([$ethr_have_libatomic_ops])
-	if test $ethr_have_libatomic_ops = yes; then
-	    AC_CHECK_SIZEOF(AO_t, ,
-			    [
-				#include <stdio.h>
-				#include "atomic_ops.h"
-			    ])
-	    AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used])
-
-	    AC_DEFINE(ETHR_HAVE_LIBATOMIC_OPS, 1, [Define if you have libatomic_ops atomic operations])
-	    if test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-		AC_DEFINE(ETHR_PREFER_LIBATOMIC_OPS_NATIVE_IMPLS, 1, [Define if you prefer libatomic_ops native ethread implementations])
-	    fi
-	    ETHR_DEFS="$ETHR_DEFS $libatomic_ops_include"
-	elif test "x$with_libatomic_ops" != "xno" && test "x$with_libatomic_ops" != "x"; then
-	    AC_MSG_ERROR([No usable libatomic_ops implementation found])
 	fi
 
-	case "$host_cpu" in
-	  sparc | sun4u | sparc64 | sun4v)
-		case "$with_sparc_memory_order" in
-		    "TSO")
-			AC_DEFINE(ETHR_SPARC_TSO, 1, [Define if only run in Sparc TSO mode]);;
-		    "PSO")
-			AC_DEFINE(ETHR_SPARC_PSO, 1, [Define if only run in Sparc PSO, or TSO mode]);;
-		    "RMO"|"")
-			AC_DEFINE(ETHR_SPARC_RMO, 1, [Define if run in Sparc RMO, PSO, or TSO mode]);;
-		    *)
-			AC_MSG_ERROR([Unsupported Sparc memory order: $with_sparc_memory_order]);;
-		esac
-		ethr_have_native_atomics=yes;; 
-	  i86pc | i*86 | x86_64 | amd64)
-		if test "$enable_x86_out_of_order" = "yes"; then
-			AC_DEFINE(ETHR_X86_OUT_OF_ORDER, 1, [Define if x86/x86_64 out of order instructions should be synchronized])
-		fi
-		ethr_have_native_atomics=yes;;
-	  macppc | ppc | "Power Macintosh")
-		ethr_have_native_atomics=yes;;
-	  tile)
-		ethr_have_native_atomics=yes;;
-	  *)
-		;;
-	esac
-
 	test ethr_have_native_atomics = "yes" && ethr_have_native_spinlock=yes
 
 	dnl Restore LIBS
@@ -1451,40 +1494,6 @@ esac
 
 AC_C_DOUBLE_MIDDLE_ENDIAN
 
-AC_ARG_ENABLE(native-ethr-impls,
-	      AS_HELP_STRING([--disable-native-ethr-impls],
-                             [disable native ethread implementations]),
-[ case "$enableval" in
-    no) disable_native_ethr_impls=yes ;;
-    *)  disable_native_ethr_impls=no ;;
-  esac ], disable_native_ethr_impls=no)
-
-AC_ARG_ENABLE(x86-out-of-order,
-	      AS_HELP_STRING([--enable-x86-out-of-order],
-                             [enable x86/x84_64 out of order support (default disabled)]))
-
-test "X$disable_native_ethr_impls" = "Xyes" &&
-  AC_DEFINE(ETHR_DISABLE_NATIVE_IMPLS, 1, [Define if you want to disable native ethread implementations])
-
-AC_ARG_ENABLE(prefer-gcc-native-ethr-impls,
-	      AS_HELP_STRING([--enable-prefer-gcc-native-ethr-impls],
-			     [prefer gcc native ethread implementations]),
-[ case "$enableval" in
-    yes) enable_prefer_gcc_native_ethr_impls=yes ;;
-    *)  enable_prefer_gcc_native_ethr_impls=no ;;
-  esac ], enable_prefer_gcc_native_ethr_impls=no)
-
-test $enable_prefer_gcc_native_ethr_impls = yes &&
-  AC_DEFINE(ETHR_PREFER_GCC_NATIVE_IMPLS, 1, [Define if you prefer gcc native ethread implementations])
-
-AC_ARG_WITH(libatomic_ops,
-	    AS_HELP_STRING([--with-libatomic_ops=PATH],
-			   [specify and prefer usage of libatomic_ops in the ethread library]))
-
-AC_ARG_WITH(with_sparc_memory_order,
-	    AS_HELP_STRING([--with-sparc-memory-order=TSO|PSO|RMO],
-			   [specify sparc memory order (defaults to RMO)]))
-
 ETHR_X86_SSE2_ASM=no
 case "$GCC-$ac_cv_sizeof_void_p-$host_cpu" in
   yes-4-i86pc | yes-4-i*86 | yes-4-x86_64 | yes-4-amd64)
diff --git a/lib/wx/api_gen/Makefile b/lib/wx/api_gen/Makefile
index 8adb485ba9..3e41ac7bc5 100644
--- a/lib/wx/api_gen/Makefile
+++ b/lib/wx/api_gen/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2008-2012. All Rights Reserved.
+# Copyright Ericsson AB 2008-2014. All Rights Reserved.
 # 
 # The 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,7 +60,7 @@ $(GL): glxml_generated $(GL_COMP_T) glapi.conf
 	erl -noshell -run gl_gen code && touch gl_code_generated
 
 %.beam: %.erl wx_gen.hrl gl_gen.hrl
-	$(ERLC) -W $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) $< -o$(EBIN)
+	$(ERLC) -W $(ERL_FLAGS) $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
 
 # TODO split cleans into separate targets?
 complete_clean:
diff --git a/lib/wx/api_gen/gen_util.erl b/lib/wx/api_gen/gen_util.erl
index 2ba1c6e16f..9b08815bf7 100644
--- a/lib/wx/api_gen/gen_util.erl
+++ b/lib/wx/api_gen/gen_util.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -222,11 +222,12 @@ halt(Reason) ->
 
 erl_copyright() ->
     StartYear = start_year(get(current_class)),
+    {CurrentYear,_,_}   = erlang:date(),
     w("%%~n",[]),
     w("%% %CopyrightBegin%~n",[]),
     w("%%~n",[]),
-    w("%% Copyright Ericsson AB ~p-2013. All Rights Reserved.~n",
-      [StartYear]),
+    w("%% Copyright Ericsson AB ~p-~p. All Rights Reserved.~n",
+      [StartYear, CurrentYear]),
     w("%%~n",[]),
     w("%% The contents of this file are subject to the Erlang Public License,~n",[]),
     w("%% Version 1.1, (the \"License\"); you may not use this file except in~n",[]),
@@ -242,10 +243,11 @@ erl_copyright() ->
     w("%% %CopyrightEnd%~n",[]).
 
 c_copyright() ->
+    {CurrentYear,_,_}   = erlang:date(),
     w("/*~n",[]),
     w(" * %CopyrightBegin%~n",[]),
     w(" *~n",[]),
-    w(" * Copyright Ericsson AB 2008-2013. All Rights Reserved.~n",[]),
+    w(" * Copyright Ericsson AB 2008-~p. All Rights Reserved.~n",[CurrentYear]),
     w(" *~n",[]),
     w(" * The contents of this file are subject to the Erlang Public License,~n",[]),
     w(" * Version 1.1, (the \"License\"); you may not use this file except in~n",[]),
diff --git a/lib/wx/api_gen/gl_gen_c.erl b/lib/wx/api_gen/gl_gen_c.erl
index be2c5cf2bf..8b2a91b671 100644
--- a/lib/wx/api_gen/gl_gen_c.erl
+++ b/lib/wx/api_gen/gl_gen_c.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -242,7 +242,7 @@ decode_arg(P=#arg{name=Name,type=#type{name=Type,base=guard_int}},A0) ->
     {P, A};
 decode_arg(P=#arg{name=Name,type=#type{name=Type,base=string,single=true}},A0) ->
     w(" ~s *~s = (~s *) bp;~n", [Type,Name,Type]),
-    w(" int ~sLen[1] = {strlen((char *)~s)}; bp += ~sLen[0]+1+((8-((1+~sLen[0]+~p)%8))%8);~n",
+    w(" int ~sLen[1] = {(int)strlen((char *)~s)}; bp += ~sLen[0]+1+((8-((1+~sLen[0]+~p)%8))%8);~n",
       [Name,Name,Name,Name,A0]),
     {P, 0};
 decode_arg(P=#arg{name=Name,
diff --git a/lib/wx/api_gen/gl_gen_erl.erl b/lib/wx/api_gen/gl_gen_erl.erl
index 446521098e..7c24128d85 100644
--- a/lib/wx/api_gen/gl_gen_erl.erl
+++ b/lib/wx/api_gen/gl_gen_erl.erl
@@ -91,7 +91,6 @@ types() ->
 
 gl_api(Fs) ->
     open_write("../src/gen/gl.erl", [{encoding,utf8}]),
-    w("%% -*- coding: utf-8 -*-~n~n", []),
     erl_copyright(),
     w("~n%% OPENGL API~n~n", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
@@ -150,7 +149,6 @@ gl_api(Fs) ->
 
 glu_api(Fs) ->
     open_write("../src/gen/glu.erl", [{encoding,utf8}]),
-    w("%% -*- coding: utf-8 -*-~n~n", []),
     erl_copyright(),
     w("~n%% OPENGL UTILITY API~n~n", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
diff --git a/lib/wx/api_gen/wx_extra/bugs.h b/lib/wx/api_gen/wx_extra/bugs.h
index e3a4fa200b..0563a8901f 100644
--- a/lib/wx/api_gen/wx_extra/bugs.h
+++ b/lib/wx/api_gen/wx_extra/bugs.h
@@ -39,4 +39,12 @@ class WXDLLIMPEXP_ADV wxTreeCtrlBase : public wxControl
 {
  public:
     static bool IsTreeItemIdOk(wxTreeItemId id);
-}
+};
+
+
+// Enable lost macro functionality
+class WXDLLEXPORT wxPanel : public wxWindow
+{
+ public:
+    void SetFocusIgnoringChildren();
+};
diff --git a/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src b/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src
index 4e492db045..5d20019d8f 100644
--- a/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src
+++ b/lib/wx/api_gen/wx_extra/wxEvtHandler.c_src
@@ -1,17 +1,5 @@
-case 98:  { // wxeEvtListener::wxeEvtListener
-  wxeEvtListener *Result = new wxeEvtListener(Ecmd.port);
-  rt.addRef(getRef((void *)Result,memenv), "wxeEvtListener");
-  break;
-}
-case 99:  { // wxeEvtListener::destroy
-  wxObject *This = (wxObject *) getPtr(bp,memenv); 
-  rt.addAtom("ok");
-  delete This; 
-  break;
-} 
 
-case 100: { // wxEvtHandler::Connect 
-  wxeEvtListener *Listener = (wxeEvtListener *) getPtr(bp,memenv); bp += 4;
+case 100: { // wxEvtHandler::Connect
   wxEvtHandler *This = (wxEvtHandler *) getPtr(bp, memenv); bp += 4;
   int * winid  = (int *) bp; bp += 4;
   int * lastId = (int *) bp; bp += 4;
@@ -22,20 +10,22 @@ case 100: { // wxEvtHandler::Connect
   int * eventTypeLen = (int *) bp; bp += 4;
   int * class_nameLen = (int *) bp; bp += 4;
 
-  if(*haveUserData) {    
+  if(*haveUserData) {
       userData = new wxeErlTerm(Ecmd.bin[0]);
   }
 
   int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen;
   char *class_name = bp; bp+= *class_nameLen;
   if(eventType > 0 ) {
-     wxeCallbackData * Evt_cb = new wxeCallbackData(Ecmd.caller,(void *) This,
-     		       	      	    		    class_name,*fun_cb, 
-		                                    *skip, userData);
-     This->Connect((int) *winid,(int) *lastId,eventType, 
-	           (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward, 
-	           Evt_cb, Listener);
-     rt.addAtom("ok");
+    wxeEvtListener * Evt_cb = new wxeEvtListener(Ecmd.caller,getRef(This, memenv),
+                                                 class_name,*fun_cb,
+                                                 *skip, userData, Ecmd.port);
+    This->Connect((int) *winid,(int) *lastId,eventType,
+	          (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward,
+	          Evt_cb, Evt_cb);
+    rt.addAtom("ok");
+    rt.addRef(getRef((void *)Evt_cb,memenv), "wxeEvtListener");
+    rt.addTupleCount(2);
   } else {
     rt.addAtom("badarg");
     rt.addAtom("event_type");
@@ -43,7 +33,7 @@ case 100: { // wxEvtHandler::Connect
   }
   break;
 }
-case 101: { // wxEvtHandler::Disconnect 
+case 101: { // wxEvtHandler::Disconnect
   wxeEvtListener *Listener = (wxeEvtListener *) getPtr(bp,memenv); bp += 4;
   wxEvtHandler *This = (wxEvtHandler *) getPtr(bp, memenv); bp += 4;
   int * winid  = (int *) bp; bp += 4;
@@ -53,14 +43,14 @@ case 101: { // wxEvtHandler::Disconnect
   int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen;
   if(eventType > 0) {
      bool Result = This->Disconnect((int) *winid,(int) *lastId,eventType,
-  				    (wxObjectEventFunction)(wxEventFunction) 
-				    &wxeEvtListener::forward, 
-				    NULL, Listener);
+                                    (wxObjectEventFunction)(wxEventFunction)
+                                    &wxeEvtListener::forward,
+                                    NULL, Listener);
      rt.addBool(Result);
   } else {
     rt.addAtom("badarg");
     rt.addAtom("event_type");
-    rt.addTupleCount(2);    
+    rt.addTupleCount(2);
   }
   break;
 }
diff --git a/lib/wx/api_gen/wx_extra/wxEvtHandler.erl b/lib/wx/api_gen/wx_extra/wxEvtHandler.erl
index c5802af679..c9726fd475 100644
--- a/lib/wx/api_gen/wx_extra/wxEvtHandler.erl
+++ b/lib/wx/api_gen/wx_extra/wxEvtHandler.erl
@@ -27,15 +27,11 @@
 -export([connect/2, connect/3, disconnect/1, disconnect/2, disconnect/3]).
 
 %% internal exports
--export([connect_impl/3, disconnect_impl/2, disconnect_impl/3, 
-	 new_evt_listener/0, destroy_evt_listener/1, 
-	 get_callback/1, replace_fun_with_id/2]).
+-export([connect_impl/2, disconnect_impl/2]).
 
 -export_type([wxEvtHandler/0, wx/0, event/0]).
 -type wxEvtHandler() :: wx:wx_object().
 
--record(evh, {et=null,id=?wxID_ANY,lastId=?wxID_ANY,skip=undefined,userdata=[],cb=0}).
-
 %% @doc Equivalent to {@link connect/3. connect(This, EventType, [])}
 -spec connect(This::wxEvtHandler(), EventType::wxEventType()) -> ok.
 connect(This, EventType) ->
@@ -130,54 +126,34 @@ disconnect(This=#wx_ref{type=ThisT,ref=_ThisRef}, EventType, Opts) ->
 
 
 %% @hidden
-connect_impl(#wx_ref{type=wxeEvtListener,ref=EvtList}, 
-	     #wx_ref{type=ThisT,ref=ThisRef}, 
-	     #evh{id=Winid, lastId=LastId, et=EventType, 
-		  skip=Skip, userdata=Userdata, cb=FunID}) 
+connect_impl(#wx_ref{type=ThisT,ref=ThisRef},
+	     #evh{id=Winid, lastId=LastId, et=EventType,
+		  skip=Skip, userdata=Userdata, cb=FunID})
   when is_integer(FunID)->
     EventTypeBin = list_to_binary([atom_to_list(EventType)|[0]]),
     ThisTypeBin = list_to_binary([atom_to_list(ThisT)|[0]]),
     UD = if Userdata =:= [] -> 0;
-	    true -> 
+	    true ->
 		 wxe_util:send_bin(term_to_binary(Userdata)),
 		 1
 	 end,
-    wxe_util:call(100, <<EvtList:32/?UI,ThisRef:32/?UI,
+    wxe_util:call(100, <<ThisRef:32/?UI,
 			Winid:32/?UI,LastId:32/?UI,
 			(wxe_util:from_bool(Skip)):32/?UI,
 			UD:32/?UI,
 			FunID:32/?UI,
 			(size(EventTypeBin)):32/?UI,
-			(size(ThisTypeBin)):32/?UI, 
+			(size(ThisTypeBin)):32/?UI,
 			%% Note no alignment
 			EventTypeBin/binary,ThisTypeBin/binary>>).
 
 %% @hidden
-disconnect_impl(Listener, Object) ->
-    disconnect_impl(Listener, Object, #evh{}).
-%% @hidden
-disconnect_impl(#wx_ref{type=wxeEvtListener,ref=EvtList}, 
-		#wx_ref{type=_ThisT,ref=ThisRef}, 
-		#evh{id=Winid, lastId=LastId, et=EventType}) ->
+disconnect_impl(#wx_ref{type=_ThisT,ref=ThisRef},
+		#evh{id=Winid, lastId=LastId, et=EventType,
+		     handler=#wx_ref{type=wxeEvtListener,ref=EvtList}}) ->
     EventTypeBin = list_to_binary([atom_to_list(EventType)|[0]]),
-    wxe_util:call(101, <<EvtList:32/?UI, 
+    wxe_util:call(101, <<EvtList:32/?UI,
 			ThisRef:32/?UI,Winid:32/?UI,LastId:32/?UI,
 			(size(EventTypeBin)):32/?UI,
 			%% Note no alignment
 			EventTypeBin/binary>>).
-
-%% @hidden
-new_evt_listener() ->
-    wxe_util:call(98, <<>>).
-
-%% @hidden
-destroy_evt_listener(#wx_ref{type=wxeEvtListener,ref=EvtList}) ->
-    wxe_util:call(99, <<EvtList:32/?UI>>).
-
-%% @hidden
-get_callback(#evh{cb=Callback}) ->
-    Callback.
-
-%% @hidden
-replace_fun_with_id(Evh, Id) ->
-    Evh#evh{cb=Id}.
diff --git a/lib/wx/api_gen/wx_gen.erl b/lib/wx/api_gen/wx_gen.erl
index 2eb9d9d33d..0f28b3dd5e 100644
--- a/lib/wx/api_gen/wx_gen.erl
+++ b/lib/wx/api_gen/wx_gen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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 @@
 
 -include_lib("xmerl/include/xmerl.hrl").
 
--import(lists, [foldl/3,foldr/3,reverse/1, keysearch/3, map/2, filter/2]).
+-import(lists, [foldl/3,foldr/3,reverse/1,keysearch/3,map/2,filter/2,droplast/1]).
 -import(proplists, [get_value/2,get_value/3]).
 
 -compile(export_all).
@@ -69,7 +69,7 @@ gen_code() ->
 gen_xml() ->
 %%     {ok, Defs} = file:consult("wxapi.conf"),
     
-%%     Rel = reverse(tl(reverse(os:cmd("wx-config --release")))),
+%%     Rel = droplast(os:cmd("wx-config --release")),
 %%     Dir = " /usr/include/wx-" ++ Rel ++ "/wx/",
 %%     Files0 = [Dir ++ File || {class, File, _, _, _} <- Defs],
 %%     Files1 = [Dir ++ File || {doxygen, File} <- Defs],
@@ -172,7 +172,7 @@ parse_defs([], Acc) -> reverse(Acc).
 meta_info(C=#class{name=CName,methods=Ms0}) ->
     Ms = lists:append(Ms0),
     HaveConstructor = lists:keymember(constructor, #method.method_type, Ms),
-    case lists:keysearch(destructor, #method.method_type, Ms) of
+    case keysearch(destructor, #method.method_type, Ms) of
 	false when HaveConstructor -> 
 	    Dest = #method{name = "destroy", id = next_id(func_id),
 			   method_type = destructor, params = [this(CName)]},
@@ -288,7 +288,7 @@ parse_attr1([{{attr,_}, #xmlElement{content=C, attributes=Attrs}}|R], AttrList0,
 parse_attr1([{_Id,_}|R],AttrList,Info, Res) ->
     parse_attr1(R,AttrList,Info, Res);
 parse_attr1([],Left,_, Res) ->
-    {lists:reverse(Res), Left}.
+    {reverse(Res), Left}.
 
 attr_acc(#param{name=N}, List) ->
     Name = list_to_atom(N),
@@ -994,7 +994,7 @@ erl_skip_opt2([F={_,{N,In,_},M=#method{where=Where}}|Ms],Acc1,Acc2,Check) ->
 		[] ->
 		    erl_skip_opt2(Ms,[F|Acc1],[M#method{where=erl_no_opt}|Acc2],[]);
 		_  ->
-		    Skipped = reverse(tl(reverse(In))),
+		    Skipped = droplast(In),
 		    T = fun({_,{_,Args,_},_}) -> true =:= types_differ(Skipped,Args) end,
 		    case lists:all(T, Check) of
 			true ->
@@ -1350,7 +1350,11 @@ extract_enum3([#xmlElement{name=name,content=[#xmlText{value=Name}]}|R], Id, Acc
     end;
 
 extract_enum3([#xmlElement{name=initializer,content=Cs}|_],_Id,[{Name,_}|Acc]) ->
-    String = extract_def2(Cs),
+    String = case extract_def2(Cs) of
+		 "= " ++ Str0 -> Str0;  %% Doxygen 1.8.3.1 keeps the '=' sign
+		 "=" ++ Str0 -> Str0;  %% Doxygen 1.8.3.1 keeps the '=' sign
+		 Str0 -> Str0
+	     end,
     Val0 = gen_util:tokens(String,"<& "),
     try
 	case Val0 of
diff --git a/lib/wx/api_gen/wx_gen_cpp.erl b/lib/wx/api_gen/wx_gen_cpp.erl
index f00fc0c720..ea5d89be72 100644
--- a/lib/wx/api_gen/wx_gen_cpp.erl
+++ b/lib/wx/api_gen/wx_gen_cpp.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -190,10 +190,14 @@ gen_funcs(Defs) ->
 %%     w("  case WXE_REMOVE_PORT:~n", []),
 %%     w("   { destroyMemEnv(Ecmd.port); } break;~n", []),
     w("  case DESTROY_OBJECT: {~n"),
-    w("     wxObject *This = (wxObject *) getPtr(bp,memenv); "),
-    w("     if(This) {"),
-    w("       ((WxeApp *) wxTheApp)->clearPtr((void *) This);~n"),
-    w("       delete This; }~n  } break;~n"),
+    w("     wxObject *This = (wxObject *) getPtr(bp,memenv);~n"),
+    w("     if(This) {~n"),
+    w("       if(recurse_level > 1) {~n"),
+    w("          delayed_delete->Append(Ecmd.Save());~n"),
+    w("       } else {~n"),
+    w("          ((WxeApp *) wxTheApp)->clearPtr((void *) This);~n"),
+    w("          delete This; }~n"),
+    w("  } } break;~n"),
     w("  case WXE_REGISTER_OBJECT: {~n"
       "     registerPid(bp, Ecmd.caller, memenv);~n"
       "     rt.addAtom(\"ok\");~n"
@@ -855,34 +859,24 @@ call_arg(#param{name=N,type={merged,_,_,_,_,_,_}}) -> N.
 to_string(Type) when is_atom(Type) -> atom_to_list(Type);
 to_string(Type) when is_list(Type) -> Type.
 
-virtual_dest(#class{abstract=true, parent="root"}) -> false;
-virtual_dest(#class{abstract=true, parent="object"}) -> true;
 virtual_dest(#class{abstract=true, parent=Parent}) ->
-    virtual_dest(get({class,Parent}));
+    virtual_dest(get_parent_class(Parent));
 virtual_dest(#class{methods=Ms, parent=Parent}) ->
     case lists:keysearch(destructor,#method.method_type, lists:append(Ms)) of
 	{value, #method{method_type=destructor, virtual=Virtual}} ->
 	    case Virtual of
-		undefined ->
-		    case get({class,Parent}) of
-			undefined ->
-			    case Parent of
-				"object" ->
-				    true;
-				"root"   ->
-				    false;
-				_ ->
-				    io:format("Error: ~p~n",[Parent]),
-				    erlang:error(no_parent)
-			    end;
-			PClass ->
-			    virtual_dest(PClass)
-		    end;
-		_ ->
-		    Virtual
+		true -> true;
+		_ -> virtual_dest(get_parent_class(Parent))
 	    end;
-	false ->
-	    false
+	false -> virtual_dest(get_parent_class(Parent))
+    end;
+virtual_dest("root") -> false;
+virtual_dest("object") -> true.
+
+get_parent_class(Parent) ->
+    case get({class, Parent}) of
+	undefined -> Parent;
+	Class -> Class
     end.
 
 debug(F,A) ->
@@ -1196,15 +1190,6 @@ find_id(OtherClass) ->
 
 encode_events(Evs) ->
     ?WTC("encode_events"),
-    w("void wxeEvtListener::forward(wxEvent& event)~n"
-      "{~n"
-      "#ifdef DEBUG~n"
-      "  if(!sendevent(&event, port))~n"
-      "    fprintf(stderr, \"Couldn't send event!\\r\\n\");~n"
-      "#else~n"
-      "sendevent(&event, port);~n"
-      "#endif~n"
-      "}~n~n"),
     w("int getRef(void* ptr, wxeMemEnv* memenv)~n"
       "{~n"
       "  WxeApp * app = (WxeApp *) wxTheApp;~n"
@@ -1215,7 +1200,7 @@ encode_events(Evs) ->
       " char * evClass = NULL;~n"
       " wxMBConvUTF32 UTFconverter;~n"
       " wxeEtype *Etype = etmap[event->GetEventType()];~n"
-      " wxeCallbackData *cb = (wxeCallbackData *)event->m_callbackUserData;~n"
+      " wxeEvtListener *cb = (wxeEvtListener *)event->m_callbackUserData;~n"
       " WxeApp * app = (WxeApp *) wxTheApp;~n"
       " wxeMemEnv *memenv = app->getMemEnv(port);~n"
       " if(!memenv) return 0;~n~n"
@@ -1223,7 +1208,7 @@ encode_events(Evs) ->
 
     w("~n rt.addAtom((char*)\"wx\");~n"
       " rt.addInt((int) event->GetId());~n"
-      " rt.addRef(getRef((void *)(cb->obj), memenv), cb->class_name);~n"
+      " rt.addRef(cb->obj, cb->class_name);~n"
       " rt.addExt2Term(cb->user_data);~n"),
 
     w(" switch(Etype->cID) {~n"),
diff --git a/lib/wx/api_gen/wx_gen_erl.erl b/lib/wx/api_gen/wx_gen_erl.erl
index 2e1a0d617a..a4b03d3fd1 100644
--- a/lib/wx/api_gen/wx_gen_erl.erl
+++ b/lib/wx/api_gen/wx_gen_erl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -61,7 +61,7 @@ gen_class1(C=#class{name=Name,parent="static",methods=Ms,options=_Opts}) ->
     w("", []),
     w("%% This file is generated DO NOT EDIT~n~n", []),
     w("%% @doc See external documentation: "
-      "<a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html\">Misc</a>.\n\n",[]),
+      "<a href=\"http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html\">Misc</a>.\n\n",[]),
 
     w("%% This module contains wxWidgets utility functions.~n~n", []),
     w("-module(wx_misc).~n", []),
@@ -96,7 +96,7 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    NewMs = Ms;
 	false ->
 	    w("%% @doc See external documentation: "
-	      "<a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html\">~s</a>.\n",
+	      "<a href=\"http://www.wxwidgets.org/manuals/2.8.12/wx_~s.html\">~s</a>.\n",
 	      [lowercase_all(Name), Name]),
 
 	    case C#class.doc of
@@ -137,15 +137,27 @@ gen_class1(C=#class{name=Name,parent=Parent,methods=Ms,options=Opts}) ->
 	    w("%% inherited exports~n",[]),
 	    Done0 = ["Destroy", "New", "Create", "destroy", "new", "create"],
 	    Done  = gb_sets:from_list(Done0 ++ [M|| #method{name=M} <- lists:append(Ms)]),
-	    {_, InExported} = gen_inherited(Parents, Done, []),
-	    w("-export([~s]).~n~n", [args(fun(EF) -> EF end, ",",
-					  lists:usort(["parent_class/1"|InExported]),
+	    {_, InExported0} = gen_inherited(Parents, Done, []),
+	    InExported = lists:ukeysort(2, [{?MODULE,{"parent_class","1"},false}|InExported0]),
+	    w("-export([~s]).~n~n", [args(fun({_M,{F,A},_Dep}) -> F ++ "/" ++ A end, ",",
+					  InExported,
 					  60)]),
 	    w("-export_type([~s/0]).~n", [Name]),
 	    case lists:filter(fun({_F,Depr}) -> Depr end, ExportList) of
 		[] -> ok;
 		Depr -> w("-deprecated([~s]).~n~n", [args(fun({EF,_}) -> EF end, ",", Depr, 60)])
 	    end,
+	    case lists:filter(fun({_,_,Depr}) -> Depr end, InExported) of
+		[] -> ok;
+		NoWDepr -> w("-compile([~s]).~n~n",
+			  [args(fun({M,{F,A},_}) ->
+					DStr=io_lib:format("{nowarn_deprecated_function, {~s,~s,~s}}",
+							  [M,F,A]),
+					lists:flatten(DStr)
+				end, ",", NoWDepr, 60)])
+	    end,
+
+
 	    w("%% @hidden~n", []),
 	    parents_check(Parents),
 	    w("-type ~s() :: wx:wx_object().~n", [Name]),
@@ -375,7 +387,7 @@ gen_inherited([Parent|Ps], Done0, Exported0) ->
     {Done,Exported} = gen_inherited_ms(Ms, Class, Done0, gb_sets:empty(), Exported0),
     gen_inherited(Ps, gb_sets:union(Done,Done0), Exported).
 
-gen_inherited_ms([[#method{name=Name,alias=A,params=Ps0,where=W,method_type=MT}|_]|R],
+gen_inherited_ms([[M=#method{name=Name,alias=A,params=Ps0,where=W,method_type=MT}|_]|R],
 		 Class,Skip,Done, Exported)
   when W =/= merged_c ->
     case gb_sets:is_member(Name,Skip) of
@@ -399,8 +411,10 @@ gen_inherited_ms([[#method{name=Name,alias=A,params=Ps0,where=W,method_type=MT}|
 			 _ when W =:= erl_no_opt -> 0;
 			 _ -> 1
 		     end,
-	    Export = erl_func_name(Name,A) ++ "/" ++ integer_to_list(length(Args) + OptLen),
-	    gen_inherited_ms(R,Class,Skip, gb_sets:add(Name,Done), [Export|Exported]);
+	    {_, Depr} = deprecated(M,ignore),
+	    Export = {Class,{erl_func_name(Name,A),integer_to_list(length(Args) + OptLen)}, Depr},
+	    gen_inherited_ms(R,Class,Skip, gb_sets:add(Name,Done),
+			     [Export|Exported]);
 	_ ->
 	    gen_inherited_ms(R,Class, Skip, Done, Exported)
     end;
@@ -745,11 +759,11 @@ optional_type2(#param{name=Name, def=Def, type=T}) ->
     "{" ++ erl_option_name(Name) ++ ", " ++ doc_arg_type2(T) ++ "}". %%   %% Default: " ++ Def.
 
 doc_link("utils", Func) ->
-    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#~s\">"
+    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#~s\">"
       "external documentation</a>.~n",
       [lowercase_all(Func)]);
 doc_link(Class, Func) ->
-    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/stable/wx_~s.html#~s~s\">"
+    w("%% @doc See <a href=\"http://www.wxwidgets.org/manuals/2.8.12/wx_~s.html#~s~s\">"
       "external documentation</a>.~n",
       [lowercase_all(Class),lowercase_all(Class),lowercase_all(Func)]).
 
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 81f2a389ab..73c5af43d8 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -190,8 +190,9 @@
 {class, wxPanel, wxWindow, [],
  ['wxPanel','~wxPanel',%'Create',
   %%'GetDefaultItem',
-  'InitDialog'%,
-  %%'OnSysColourChanged', %'SetDefaultItem','SetFocus','SetFocusIgnoringChildren'
+  'InitDialog',
+  %%'OnSysColourChanged', %'SetDefaultItem','SetFocus',
+  'SetFocusIgnoringChildren'
  ]}.
 
 {class, wxScrolledWindow, wxPanel, [],
@@ -504,7 +505,8 @@
  [{'wxStatusBar',[{"size", skip_member}]},
   '~wxStatusBar',
   {'Create',[{"size", skip_member}]},
-  'GetFieldRect','GetFieldsCount','GetStatusText','PopStatusText',
+  {'GetFieldRect', [{"rect", out}]},
+  'GetFieldsCount','GetStatusText','PopStatusText',
   'PushStatusText', 
   {'SetFieldsCount', [{"number", {def,none}},
 		      {"widths", [{single, array}, {def, "(int *) NULL"}]}]},
@@ -810,7 +812,7 @@
 		{"size",{def, "wxDefaultSize"}}, 
 		{"choices",{def, ""}}]},
   '~wxListBox','Create','Deselect',{'GetSelections',[{"aSelections", [out]}]},
-  {'InsertItems',2},'IsSelected',{'Set',[{"clientData",[skip]}]},
+  {'InsertItems',2},'IsSelected',{'Set',[{"clientData",[nowhere]}, {"n", skip_member}]},
   'HitTest',
   'SetFirstItem']}.
 
@@ -1741,6 +1743,12 @@
   'Get'
  ]}. 
 
+{class, wxClipboardTextEvent, wxCommandEvent,
+ [{event, [wxEVT_COMMAND_TEXT_COPY,
+	   wxEVT_COMMAND_TEXT_CUT,
+	   wxEVT_COMMAND_TEXT_PASTE]}],
+ []}.
+
 {class, wxSpinEvent, wxNotifyEvent,  
  [{acc, [{m_commandInt, "GetPosition()"}]},
   {event, [wxEVT_COMMAND_SPINCTRL_UPDATED,
@@ -1875,3 +1883,5 @@
  [{event,[wxEVT_TASKBAR_MOVE,wxEVT_TASKBAR_LEFT_DOWN,wxEVT_TASKBAR_LEFT_UP,
 	  wxEVT_TASKBAR_RIGHT_DOWN,wxEVT_TASKBAR_RIGHT_UP,
 	  wxEVT_TASKBAR_LEFT_DCLICK,wxEVT_TASKBAR_RIGHT_DCLICK]}],[]}.
+
+{class, wxInitDialogEvent, wxEvent, [{event,[wxEVT_INIT_DIALOG]}], []}.
diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in
index 1d17076d23..4a7342f714 100644
--- a/lib/wx/c_src/Makefile.in
+++ b/lib/wx/c_src/Makefile.in
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2008-2012. All Rights Reserved.
+# Copyright Ericsson AB 2008-2014. All Rights Reserved.
 #
 # The 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,8 +34,9 @@ SO_EXT    = @SO_EXT@
 OBJC_CC=@OBJC_CC@
 OBJC_CFLAGS=@OBJC_CFLAGS@
 
-GENERAL     = wxe_driver wxe_ps_init wxe_impl wxePrintout wxe_return wxe_gl
-GENERAL_H   = wxe_driver.h wxe_impl.h wxe_return.h
+GENERAL     = wxe_driver wxe_ps_init wxe_main wxe_impl wxe_helpers wxe_callback_impl wxe_return wxe_gl
+GENERAL_H   = wxe_callback_impl.h  wxe_driver.h  wxe_events.h  wxe_gl.h \
+	wxe_helpers.h  wxe_impl.h  wxe_memory.h  wxe_return.h
 
 GENERATED_F = wxe_funcs wxe_events wxe_init
 GENERATED_H = gen/wxe_macros.h 
@@ -46,6 +47,7 @@ HAVE_OPENGL = true
 OPENGL_F = gl_funcs egl_impl
 
 include $(ERL_TOP)/make/target.mk
+include $(ERL_TOP)/make/output.mk
 include $(ERL_TOP)/make/$(TARGET)/otp_ded.mk
 
 ERL_INCS= $(DED_INCLUDES)
@@ -78,8 +80,8 @@ TARGET_DIR = ../priv/$(SYS_TYPE)
 COMMON_CFLAGS = @DEFS@ $(ERL_INCS) 
 
 CC		= @CC@
-CPP		= @CXX@
-LD		= $(CPP)
+CXX		= @CXX@
+LD		= $(CXX)
 LDFLAGS		= @LDFLAGS@
 RESCOMP		= @WX_RESCOMP@
 
@@ -107,9 +109,9 @@ endif
 
 GL_LIBS         = @GL_LIBS@
 
-CC_O		= $(CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
+CC_O		= $(V_CC) -c $(CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
 OBJC_CC_O	= $(OBJC_CC) -c $(CFLAGS) $(OBJC_CFLAGS) $(WX_CFLAGS) $(COMMON_CFLAGS)
-CPP_O		= $(CPP) -c $(CXX_FLAGS) $(WX_CXX_FLAGS)  $(COMMON_CFLAGS) 
+CXX_O		= $(V_CXX) -c $(CXX_FLAGS) $(WX_CXX_FLAGS)  $(COMMON_CFLAGS)
 
 # Targets
 
@@ -138,36 +140,36 @@ $(GL_OBJECTS): $(GL_H)
 $(WX_OBJECTS): $(GENERATED_H) $(GENERAL_H) 
 
 $(SYS_TYPE)/%.o: %.cpp 
-	mkdir -p $(SYS_TYPE)
-	$(CPP_O) $< -o $@
+	$(V_at)mkdir -p $(SYS_TYPE)
+	$(CXX_O) $< -o $@
 
 $(SYS_TYPE)/%.o: %.c 
-	mkdir -p $(SYS_TYPE)
+	$(V_at)mkdir -p $(SYS_TYPE)
 	$(CC_O) $< -o $@
 
 $(SYS_TYPE)/wxe_ps_init.o: wxe_ps_init.c 
-	mkdir -p $(SYS_TYPE)
-	$(OBJC_CC_O) $< -o $@
+	$(V_at)mkdir -p $(SYS_TYPE)
+	$(cc_verbose)$(OBJC_CC_O) $< -o $@
 
 $(SYS_TYPE)/%.o: gen/%.cpp 
-	mkdir -p $(SYS_TYPE)
-	$(CPP_O) $< -o $@
+	$(V_at)mkdir -p $(SYS_TYPE)
+	$(CXX_O) $< -o $@
 
 $(SYS_TYPE)/%.o: gen/%.c 
-	mkdir -p $(SYS_TYPE)
+	$(V_at)mkdir -p $(SYS_TYPE)
 	$(CC_O) $< -o $@
 
 $(SYS_TYPE)/wxe_win32.$(RC_FILE_EXT): wxe_win32.rc
-	mkdir -p $(SYS_TYPE)
+	$(V_at)mkdir -p $(SYS_TYPE)
 	$(RESCOMP) -o $@ $< 
 
 $(TARGET_DIR)/wxe_driver$(SO_EXT): $(WX_OBJECTS)
-	mkdir -p $(TARGET_DIR)
-	$(LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@
+	$(V_at)mkdir -p $(TARGET_DIR)
+	$(V_LD) $(LDFLAGS) $(WX_OBJECTS) $(WX_LIBS) -o $@
 
 $(TARGET_DIR)/erl_gl$(SO_EXT): $(GL_OBJECTS)
-	mkdir -p $(TARGET_DIR)
-	$(CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@
+	$(V_at)mkdir -p $(TARGET_DIR)
+	$(V_CC) $(LDFLAGS) $(GL_OBJECTS) $(GL_LIBS) -o $@
 
 
 # ----------------------------------------------------
diff --git a/lib/wx/c_src/gen/gl_funcs.cpp b/lib/wx/c_src/gen/gl_funcs.cpp
index e1bd920e71..40a2fbac3c 100644
--- a/lib/wx/c_src/gen/gl_funcs.cpp
+++ b/lib/wx/c_src/gen/gl_funcs.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2012. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2013. All Rights Reserved.
  *
  * The 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,9 +133,9 @@ case 5015: { // gluBuild3DMipmaps
 }; break;
 case 5016: { // gluCheckExtension
  GLubyte *extName = (GLubyte *) bp;
- int extNameLen[1] = {strlen((char *)extName)}; bp += extNameLen[0]+1+((8-((1+extNameLen[0]+0)%8))%8);
+ int extNameLen[1] = {(int)strlen((char *)extName)}; bp += extNameLen[0]+1+((8-((1+extNameLen[0]+0)%8))%8);
  GLubyte *extString = (GLubyte *) bp;
- int extStringLen[1] = {strlen((char *)extString)}; bp += extStringLen[0]+1+((8-((1+extStringLen[0]+0)%8))%8);
+ int extStringLen[1] = {(int)strlen((char *)extString)}; bp += extStringLen[0]+1+((8-((1+extStringLen[0]+0)%8))%8);
  GLboolean result = wegluCheckExtension(extName,extString);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -3246,7 +3246,7 @@ case 5446: { // glBindAttribLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  weglBindAttribLocation(*program,*index,name);
 }; break;
 case 5447: { // glCompileShader
@@ -3352,7 +3352,7 @@ case 5457: { // glGetAttachedShaders
 case 5458: { // glGetAttribLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLint result = weglGetAttribLocation(*program,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -3427,7 +3427,7 @@ case 5463: { // glGetShaderSource
 case 5464: { // glGetUniformLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLint result = weglGetUniformLocation(*program,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -4186,13 +4186,13 @@ case 5558: { // glBindFragDataLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLuint *color = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  weglBindFragDataLocation(*program,*color,name);
 }; break;
 case 5559: { // glGetFragDataLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLint result = weglGetFragDataLocation(*program,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -4547,7 +4547,7 @@ case 5608: { // glProgramStringARB
  GLenum *target = (GLenum *) bp; bp += 4;
  GLenum *format = (GLenum *) bp; bp += 4;
  GLvoid *string = (GLvoid *) bp;
- int stringLen[1] = {strlen((char *)string)}; bp += stringLen[0]+1+((8-((1+stringLen[0]+0)%8))%8);
+ int stringLen[1] = {(int)strlen((char *)string)}; bp += stringLen[0]+1+((8-((1+stringLen[0]+0)%8))%8);
  weglProgramStringARB(*target,*format,*stringLen,string);
 }; break;
 case 5609: { // glBindProgramARB
@@ -4867,7 +4867,7 @@ case 5640: { // glGetAttachedObjectsARB
 case 5641: { // glGetUniformLocationARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLint result = weglGetUniformLocationARB(programObj,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -4970,7 +4970,7 @@ case 5646: { // glBindAttribLocationARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  weglBindAttribLocationARB(programObj,*index,name);
 }; break;
 case 5647: { // glGetActiveAttribARB
@@ -4996,7 +4996,7 @@ case 5647: { // glGetActiveAttribARB
 case 5648: { // glGetAttribLocationARB
  GLhandleARB programObj = (GLhandleARB) * (GLuint64EXT *) bp; bp += 8;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLint result = weglGetAttribLocationARB(programObj,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -5288,7 +5288,7 @@ case 5677: { // glGetActiveUniformName
 case 5678: { // glGetUniformBlockIndex
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *uniformBlockName = (GLchar *) bp;
- int uniformBlockNameLen[1] = {strlen((char *)uniformBlockName)}; bp += uniformBlockNameLen[0]+1+((8-((1+uniformBlockNameLen[0]+4)%8))%8);
+ int uniformBlockNameLen[1] = {(int)strlen((char *)uniformBlockName)}; bp += uniformBlockNameLen[0]+1+((8-((1+uniformBlockNameLen[0]+4)%8))%8);
  GLuint result = weglGetUniformBlockIndex(*program,uniformBlockName);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -5525,14 +5525,14 @@ case 5700: { // glSampleMaski
 case 5701: { // glNamedStringARB
  GLenum *type = (GLenum *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLchar *string = (GLchar *) bp;
- int stringLen[1] = {strlen((char *)string)}; bp += stringLen[0]+1+((8-((1+stringLen[0]+0)%8))%8);
+ int stringLen[1] = {(int)strlen((char *)string)}; bp += stringLen[0]+1+((8-((1+stringLen[0]+0)%8))%8);
  weglNamedStringARB(*type,*nameLen,name,*stringLen,string);
 }; break;
 case 5702: { // glDeleteNamedStringARB
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  weglDeleteNamedStringARB(*nameLen,name);
 }; break;
 case 5703: { // glCompileShaderIncludeARB
@@ -5549,7 +5549,7 @@ case 5703: { // glCompileShaderIncludeARB
 }; break;
 case 5704: { // glIsNamedStringARB
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLboolean result = weglIsNamedStringARB(*nameLen,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -5559,7 +5559,7 @@ case 5704: { // glIsNamedStringARB
 }; break;
 case 5705: { // glGetNamedStringARB
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLsizei *bufSize = (GLsizei *) bp; bp += 4;
  GLint stringlen[1] = {0};
  GLchar *string;
@@ -5574,7 +5574,7 @@ case 5705: { // glGetNamedStringARB
 }; break;
 case 5706: { // glGetNamedStringivARB
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLenum *pname = (GLenum *) bp; bp += 4;
  GLint params[1] = {0};
  weglGetNamedStringivARB(*nameLen,name,*pname,params);
@@ -5589,13 +5589,13 @@ case 5707: { // glBindFragDataLocationIndexed
  GLuint *colorNumber = (GLuint *) bp; bp += 4;
  GLuint *index = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  weglBindFragDataLocationIndexed(*program,*colorNumber,*index,name);
 }; break;
 case 5708: { // glGetFragDataIndex
  GLuint *program = (GLuint *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+4)%8))%8);
  GLint result = weglGetFragDataIndex(*program,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -5954,7 +5954,7 @@ case 5748: { // glGetSubroutineUniformLocation
  GLuint *program = (GLuint *) bp; bp += 4;
  GLenum *shadertype = (GLenum *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLint result = weglGetSubroutineUniformLocation(*program,*shadertype,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -5966,7 +5966,7 @@ case 5749: { // glGetSubroutineIndex
  GLuint *program = (GLuint *) bp; bp += 4;
  GLenum *shadertype = (GLenum *) bp; bp += 4;
  GLchar *name = (GLchar *) bp;
- int nameLen[1] = {strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
+ int nameLen[1] = {(int)strlen((char *)name)}; bp += nameLen[0]+1+((8-((1+nameLen[0]+0)%8))%8);
  GLuint result = weglGetSubroutineIndex(*program,*shadertype,name);
  int AP = 0; ErlDrvTermData rt[6];
  rt[AP++]=ERL_DRV_ATOM; rt[AP++]=driver_mk_atom((char *) "_egl_result_");
@@ -6869,7 +6869,7 @@ case 5854: { // glDebugMessageInsertARB
  GLuint *id = (GLuint *) bp; bp += 4;
  GLenum *severity = (GLenum *) bp; bp += 4;
  GLchar *buf = (GLchar *) bp;
- int bufLen[1] = {strlen((char *)buf)}; bp += bufLen[0]+1+((8-((1+bufLen[0]+0)%8))%8);
+ int bufLen[1] = {(int)strlen((char *)buf)}; bp += bufLen[0]+1+((8-((1+bufLen[0]+0)%8))%8);
  weglDebugMessageInsertARB(*source,*type,*id,*severity,*bufLen,buf);
 }; break;
 case 5855: { // glGetDebugMessageLogARB
diff --git a/lib/wx/c_src/gen/wxe_derived_dest.h b/lib/wx/c_src/gen/wxe_derived_dest.h
index 8dcaf1c1ac..7e2d4524cb 100644
--- a/lib/wx/c_src/gen/wxe_derived_dest.h
+++ b/lib/wx/c_src/gen/wxe_derived_dest.h
@@ -736,6 +736,12 @@ class EwxPrintout : public wxPrintout {
  EwxPrintout(const wxString& title) : wxPrintout(title) {};
 };
 
+class EwxStyledTextCtrl : public wxStyledTextCtrl {
+ public: ~EwxStyledTextCtrl() {((WxeApp *)wxTheApp)->clearPtr(this);};
+ EwxStyledTextCtrl(wxWindow * parent,wxWindowID id,const wxPoint& pos,const wxSize& size,long style) : wxStyledTextCtrl(parent,id,pos,size,style) {};
+ EwxStyledTextCtrl() : wxStyledTextCtrl() {};
+};
+
 class EwxClipboard : public wxClipboard {
  public: ~EwxClipboard() {((WxeApp *)wxTheApp)->clearPtr(this);};
  EwxClipboard() : wxClipboard() {};
diff --git a/lib/wx/c_src/gen/wxe_events.cpp b/lib/wx/c_src/gen/wxe_events.cpp
index c9cdee3160..1bd17366a2 100644
--- a/lib/wx/c_src/gen/wxe_events.cpp
+++ b/lib/wx/c_src/gen/wxe_events.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -243,57 +243,61 @@ void initEventTable()
    {wxEVT_COMMAND_TREE_ITEM_MENU, 208, "command_tree_item_menu"},
    {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 209, "command_notebook_page_changed"},
    {wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 209, "command_notebook_page_changing"},
-   {wxEVT_COMMAND_SPINCTRL_UPDATED, 215, "command_spinctrl_updated"},
+   {wxEVT_COMMAND_TEXT_COPY, 215, "command_text_copy"},
+   {wxEVT_COMMAND_TEXT_CUT, 215, "command_text_cut"},
+   {wxEVT_COMMAND_TEXT_PASTE, 215, "command_text_paste"},
+   {wxEVT_COMMAND_SPINCTRL_UPDATED, 216, "command_spinctrl_updated"},
    {wxEVT_SCROLL_LINEUP + wxEVT_USER_FIRST, 165, "spin_up"},
    {wxEVT_SCROLL_LINEDOWN + wxEVT_USER_FIRST, 165, "spin_down"},
    {wxEVT_SCROLL_THUMBTRACK + wxEVT_USER_FIRST, 165, "spin"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 217, "command_splitter_sash_pos_changed"},
-   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 217, "command_splitter_sash_pos_changing"},
-   {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 217, "command_splitter_doubleclicked"},
-   {wxEVT_COMMAND_SPLITTER_UNSPLIT, 217, "command_splitter_unsplit"},
-   {wxEVT_COMMAND_HTML_LINK_CLICKED, 219, "command_html_link_clicked"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 222, "command_auinotebook_page_close"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 222, "command_auinotebook_page_changed"},
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 222, "command_auinotebook_page_changing"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 222, "command_auinotebook_button"},
-   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 222, "command_auinotebook_begin_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 222, "command_auinotebook_end_drag"},
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 222, "command_auinotebook_drag_motion"},
-   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 222, "command_auinotebook_allow_dnd"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 218, "command_splitter_sash_pos_changed"},
+   {wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 218, "command_splitter_sash_pos_changing"},
+   {wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 218, "command_splitter_doubleclicked"},
+   {wxEVT_COMMAND_SPLITTER_UNSPLIT, 218, "command_splitter_unsplit"},
+   {wxEVT_COMMAND_HTML_LINK_CLICKED, 220, "command_html_link_clicked"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, 223, "command_auinotebook_page_close"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, 223, "command_auinotebook_page_changed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, 223, "command_auinotebook_page_changing"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BUTTON, 223, "command_auinotebook_button"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, 223, "command_auinotebook_begin_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, 223, "command_auinotebook_end_drag"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, 223, "command_auinotebook_drag_motion"},
+   {wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, 223, "command_auinotebook_allow_dnd"},
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 222, "command_auinotebook_tab_middle_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, 223, "command_auinotebook_tab_middle_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 222, "command_auinotebook_tab_middle_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, 223, "command_auinotebook_tab_middle_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 222, "command_auinotebook_tab_right_down"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, 223, "command_auinotebook_tab_right_down"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 222, "command_auinotebook_tab_right_up"},
+   {wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, 223, "command_auinotebook_tab_right_up"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 222, "command_auinotebook_page_closed"},
+   {wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, 223, "command_auinotebook_page_closed"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 222, "command_auinotebook_drag_done"},
+   {wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, 223, "command_auinotebook_drag_done"},
 #endif
 #if wxCHECK_VERSION(2,8,5)
-   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 222, "command_auinotebook_bg_dclick"},
+   {wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, 223, "command_auinotebook_bg_dclick"},
 #endif
-   {wxEVT_AUI_PANE_BUTTON, 223, "aui_pane_button"},
-   {wxEVT_AUI_PANE_CLOSE, 223, "aui_pane_close"},
-   {wxEVT_AUI_PANE_MAXIMIZE, 223, "aui_pane_maximize"},
-   {wxEVT_AUI_PANE_RESTORE, 223, "aui_pane_restore"},
-   {wxEVT_AUI_RENDER, 223, "aui_render"},
-   {wxEVT_AUI_FIND_MANAGER, 223, "aui_find_manager"},
-   {wxEVT_TASKBAR_MOVE, 226, "taskbar_move"},
-   {wxEVT_TASKBAR_LEFT_DOWN, 226, "taskbar_left_down"},
-   {wxEVT_TASKBAR_LEFT_UP, 226, "taskbar_left_up"},
-   {wxEVT_TASKBAR_RIGHT_DOWN, 226, "taskbar_right_down"},
-   {wxEVT_TASKBAR_RIGHT_UP, 226, "taskbar_right_up"},
-   {wxEVT_TASKBAR_LEFT_DCLICK, 226, "taskbar_left_dclick"},
-   {wxEVT_TASKBAR_RIGHT_DCLICK, 226, "taskbar_right_dclick"},
+   {wxEVT_AUI_PANE_BUTTON, 224, "aui_pane_button"},
+   {wxEVT_AUI_PANE_CLOSE, 224, "aui_pane_close"},
+   {wxEVT_AUI_PANE_MAXIMIZE, 224, "aui_pane_maximize"},
+   {wxEVT_AUI_PANE_RESTORE, 224, "aui_pane_restore"},
+   {wxEVT_AUI_RENDER, 224, "aui_render"},
+   {wxEVT_AUI_FIND_MANAGER, 224, "aui_find_manager"},
+   {wxEVT_TASKBAR_MOVE, 227, "taskbar_move"},
+   {wxEVT_TASKBAR_LEFT_DOWN, 227, "taskbar_left_down"},
+   {wxEVT_TASKBAR_LEFT_UP, 227, "taskbar_left_up"},
+   {wxEVT_TASKBAR_RIGHT_DOWN, 227, "taskbar_right_down"},
+   {wxEVT_TASKBAR_RIGHT_UP, 227, "taskbar_right_up"},
+   {wxEVT_TASKBAR_LEFT_DCLICK, 227, "taskbar_left_dclick"},
+   {wxEVT_TASKBAR_RIGHT_DCLICK, 227, "taskbar_right_dclick"},
+   {wxEVT_INIT_DIALOG, 228, "init_dialog"},
    {-1, 0, }
   };
   for(int i=0; event_types[i].ev_type != -1; i++) {
@@ -312,16 +316,6 @@ void initEventTable()
   }
 }
 
-void wxeEvtListener::forward(wxEvent& event)
-{
-#ifdef DEBUG
-  if(!sendevent(&event, port))
-    fprintf(stderr, "Couldn't send event!\r\n");
-#else
-sendevent(&event, port);
-#endif
-}
-
 int getRef(void* ptr, wxeMemEnv* memenv)
 {
   WxeApp * app = (WxeApp *) wxTheApp;
@@ -334,7 +328,7 @@ bool sendevent(wxEvent *event, ErlDrvTermData port)
  char * evClass = NULL;
  wxMBConvUTF32 UTFconverter;
  wxeEtype *Etype = etmap[event->GetEventType()];
- wxeCallbackData *cb = (wxeCallbackData *)event->m_callbackUserData;
+ wxeEvtListener *cb = (wxeEvtListener *)event->m_callbackUserData;
  WxeApp * app = (WxeApp *) wxTheApp;
  wxeMemEnv *memenv = app->getMemEnv(port);
  if(!memenv) return 0;
@@ -343,7 +337,7 @@ bool sendevent(wxEvent *event, ErlDrvTermData port)
 
  rt.addAtom((char*)"wx");
  rt.addInt((int) event->GetId());
- rt.addRef(getRef((void *)(cb->obj), memenv), cb->class_name);
+ rt.addRef(cb->obj, cb->class_name);
  rt.addExt2Term(cb->user_data);
  switch(Etype->cID) {
 case 164: {// wxCommandEvent
@@ -743,7 +737,14 @@ case 209: {// wxNotebookEvent
     rt.addTupleCount(2);
   break;
 }
-case 215: {// wxSpinEvent
+case 215: {// wxClipboardTextEvent
+    evClass = (char*)"wxClipboardTextEvent";
+    rt.addAtom((char*)"wxClipboardText");
+    rt.addAtom(Etype->eName);
+    rt.addTupleCount(2);
+  break;
+}
+case 216: {// wxSpinEvent
  wxSpinEvent * ev = (wxSpinEvent *) event;
     evClass = (char*)"wxSpinEvent";
     rt.addAtom((char*)"wxSpin");
@@ -752,14 +753,14 @@ case 215: {// wxSpinEvent
     rt.addTupleCount(3);
   break;
 }
-case 217: {// wxSplitterEvent
+case 218: {// wxSplitterEvent
     evClass = (char*)"wxSplitterEvent";
     rt.addAtom((char*)"wxSplitter");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
-case 219: {// wxHtmlLinkEvent
+case 220: {// wxHtmlLinkEvent
  wxHtmlLinkEvent * ev = (wxHtmlLinkEvent *) event;
     evClass = (char*)"wxHtmlLinkEvent";
     rt.addAtom((char*)"wxHtmlLink");
@@ -768,7 +769,7 @@ case 219: {// wxHtmlLinkEvent
     rt.addTupleCount(3);
   break;
 }
-case 222: {// wxAuiNotebookEvent
+case 223: {// wxAuiNotebookEvent
  wxAuiNotebookEvent * ev = (wxAuiNotebookEvent *) event;
  wxAuiNotebook * GetDragSource = ev->GetDragSource();
     evClass = (char*)"wxAuiNotebookEvent";
@@ -780,7 +781,7 @@ case 222: {// wxAuiNotebookEvent
     rt.addTupleCount(5);
   break;
 }
-case 223: {// wxAuiManagerEvent
+case 224: {// wxAuiManagerEvent
  wxAuiManagerEvent * ev = (wxAuiManagerEvent *) event;
  wxAuiManager * GetManager = ev->GetManager();
  wxAuiPaneInfo * GetPane = ev->GetPane();
@@ -797,13 +798,20 @@ case 223: {// wxAuiManagerEvent
     rt.addTupleCount(8);
   break;
 }
-case 226: {// wxTaskBarIconEvent
+case 227: {// wxTaskBarIconEvent
     evClass = (char*)"wxTaskBarIconEvent";
     rt.addAtom((char*)"wxTaskBarIcon");
     rt.addAtom(Etype->eName);
     rt.addTupleCount(2);
   break;
 }
+case 228: {// wxInitDialogEvent
+    evClass = (char*)"wxInitDialogEvent";
+    rt.addAtom((char*)"wxInitDialog");
+    rt.addAtom(Etype->eName);
+    rt.addTupleCount(2);
+  break;
+}
  }
 
  rt.addTupleCount(5);
diff --git a/lib/wx/c_src/gen/wxe_funcs.cpp b/lib/wx/c_src/gen/wxe_funcs.cpp
index 2d55f34346..3f5cb4c0f5 100644
--- a/lib/wx/c_src/gen/wxe_funcs.cpp
+++ b/lib/wx/c_src/gen/wxe_funcs.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
  *
  * The 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,9 +45,14 @@ void WxeApp::wxe_dispatch(wxeCommand& Ecmd)
  switch (Ecmd.op)
 {
   case DESTROY_OBJECT: {
-     wxObject *This = (wxObject *) getPtr(bp,memenv);      if(This) {       ((WxeApp *) wxTheApp)->clearPtr((void *) This);
-       delete This; }
-  } break;
+     wxObject *This = (wxObject *) getPtr(bp,memenv);
+     if(This) {
+       if(recurse_level > 1) {
+          delayed_delete->Append(Ecmd.Save());
+       } else {
+          ((WxeApp *) wxTheApp)->clearPtr((void *) This);
+          delete This; }
+  } } break;
   case WXE_REGISTER_OBJECT: {
      registerPid(bp, Ecmd.caller, memenv);
      rt.addAtom("ok");
@@ -62,20 +67,8 @@ void WxeApp::wxe_dispatch(wxeCommand& Ecmd)
  case WXE_INIT_OPENGL:
   wxe_initOpenGL(rt, bp);
    break;
-case 98:  { // wxeEvtListener::wxeEvtListener
-  wxeEvtListener *Result = new wxeEvtListener(Ecmd.port);
-  rt.addRef(getRef((void *)Result,memenv), "wxeEvtListener");
-  break;
-}
-case 99:  { // wxeEvtListener::destroy
-  wxObject *This = (wxObject *) getPtr(bp,memenv); 
-  rt.addAtom("ok");
-  delete This; 
-  break;
-} 
 
-case 100: { // wxEvtHandler::Connect 
-  wxeEvtListener *Listener = (wxeEvtListener *) getPtr(bp,memenv); bp += 4;
+case 100: { // wxEvtHandler::Connect
   wxEvtHandler *This = (wxEvtHandler *) getPtr(bp, memenv); bp += 4;
   int * winid  = (int *) bp; bp += 4;
   int * lastId = (int *) bp; bp += 4;
@@ -86,20 +79,22 @@ case 100: { // wxEvtHandler::Connect
   int * eventTypeLen = (int *) bp; bp += 4;
   int * class_nameLen = (int *) bp; bp += 4;
 
-  if(*haveUserData) {    
+  if(*haveUserData) {
       userData = new wxeErlTerm(Ecmd.bin[0]);
   }
 
   int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen;
   char *class_name = bp; bp+= *class_nameLen;
   if(eventType > 0 ) {
-     wxeCallbackData * Evt_cb = new wxeCallbackData(Ecmd.caller,(void *) This,
-     		       	      	    		    class_name,*fun_cb, 
-		                                    *skip, userData);
-     This->Connect((int) *winid,(int) *lastId,eventType, 
-	           (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward, 
-	           Evt_cb, Listener);
-     rt.addAtom("ok");
+    wxeEvtListener * Evt_cb = new wxeEvtListener(Ecmd.caller,getRef(This, memenv),
+                                                 class_name,*fun_cb,
+                                                 *skip, userData, Ecmd.port);
+    This->Connect((int) *winid,(int) *lastId,eventType,
+	          (wxObjectEventFunction)(wxEventFunction) &wxeEvtListener::forward,
+	          Evt_cb, Evt_cb);
+    rt.addAtom("ok");
+    rt.addRef(getRef((void *)Evt_cb,memenv), "wxeEvtListener");
+    rt.addTupleCount(2);
   } else {
     rt.addAtom("badarg");
     rt.addAtom("event_type");
@@ -107,7 +102,7 @@ case 100: { // wxEvtHandler::Connect
   }
   break;
 }
-case 101: { // wxEvtHandler::Disconnect 
+case 101: { // wxEvtHandler::Disconnect
   wxeEvtListener *Listener = (wxeEvtListener *) getPtr(bp,memenv); bp += 4;
   wxEvtHandler *This = (wxEvtHandler *) getPtr(bp, memenv); bp += 4;
   int * winid  = (int *) bp; bp += 4;
@@ -117,14 +112,14 @@ case 101: { // wxEvtHandler::Disconnect
   int eventType = wxeEventTypeFromAtom(bp); bp += *eventTypeLen;
   if(eventType > 0) {
      bool Result = This->Disconnect((int) *winid,(int) *lastId,eventType,
-  				    (wxObjectEventFunction)(wxEventFunction) 
-				    &wxeEvtListener::forward, 
-				    NULL, Listener);
+                                    (wxObjectEventFunction)(wxEventFunction)
+                                    &wxeEvtListener::forward,
+                                    NULL, Listener);
      rt.addBool(Result);
   } else {
     rt.addAtom("badarg");
     rt.addAtom("event_type");
-    rt.addTupleCount(2);    
+    rt.addTupleCount(2);
   }
   break;
 }
@@ -2218,6 +2213,12 @@ case wxPanel_InitDialog: { // wxPanel::InitDialog
  This->InitDialog();
  break;
 }
+case wxPanel_SetFocusIgnoringChildren: { // wxPanel::SetFocusIgnoringChildren
+ wxPanel *This = (wxPanel *) getPtr(bp,memenv); bp += 4;
+ if(!This) throw wxe_badarg(0);
+ This->SetFocusIgnoringChildren();
+ break;
+}
 case wxScrolledWindow_new_0: { // wxScrolledWindow::wxScrolledWindow
  wxScrolledWindow * Result = new EwxScrolledWindow();
  newPtr((void *) Result, 0, memenv);
@@ -8849,16 +8850,14 @@ case wxStatusBar_Create: { // wxStatusBar::Create
  break;
 }
 case wxStatusBar_GetFieldRect: { // wxStatusBar::GetFieldRect
+ wxRect rect;
  wxStatusBar *This = (wxStatusBar *) getPtr(bp,memenv); bp += 4;
  int * i = (int *) bp; bp += 4;
- int * rectX = (int *) bp; bp += 4;
- int * rectY = (int *) bp; bp += 4;
- int * rectW = (int *) bp; bp += 4;
- int * rectH = (int *) bp; bp += 4;
- wxRect rect = wxRect(*rectX,*rectY,*rectW,*rectH);
  if(!This) throw wxe_badarg(0);
  bool Result = This->GetFieldRect(*i,rect);
  rt.addBool(Result);
+ rt.add(rect);
+ rt.addTupleCount(2);
  break;
 }
 case wxStatusBar_GetFieldsCount: { // wxStatusBar::GetFieldsCount
@@ -15133,7 +15132,7 @@ case wxListBox_Set: { // wxListBox::Set
  }
  bp += (8-((0+ itemsASz) & 7 )) & 7;
  if(!This) throw wxe_badarg(0);
- This->Set(items,(void **) NULL);
+ This->Set(items);
  break;
 }
 case wxListBox_HitTest: { // wxListBox::HitTest
@@ -26949,14 +26948,14 @@ case wxStyledTextCtrl_new_2: { // wxStyledTextCtrl::wxStyledTextCtrl
  style = (long)*(int *) bp; bp += 4;
   } break;
  }};
- wxStyledTextCtrl * Result = new wxStyledTextCtrl(parent,id,pos,size,style);
- /* Possible memory leak here, class is missing virt dest */ 
+ wxStyledTextCtrl * Result = new EwxStyledTextCtrl(parent,id,pos,size,style);
+ newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStyledTextCtrl");
  break;
 }
 case wxStyledTextCtrl_new_0: { // wxStyledTextCtrl::wxStyledTextCtrl
- wxStyledTextCtrl * Result = new wxStyledTextCtrl();
- /* Possible memory leak here, class is missing virt dest */ 
+ wxStyledTextCtrl * Result = new EwxStyledTextCtrl();
+ newPtr((void *) Result, 0, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxStyledTextCtrl");
  break;
 }
@@ -31360,7 +31359,7 @@ case wxAuiManagerEvent_CanVeto: { // wxAuiManagerEvent::CanVeto
 }
 case wxLogNull_new: { // wxLogNull::wxLogNull
  wxLogNull * Result = new wxLogNull();
- newPtr((void *) Result, 224, memenv);
+ newPtr((void *) Result, 225, memenv);
  rt.addRef(getRef((void *)Result,memenv), "wxLogNull");
  break;
 }
@@ -31450,7 +31449,7 @@ void WxeApp::delete_object(void *ptr, wxeRefData *refd) {
   case 211: /* delete (wxFileDataObject *) ptr;These objects must be deleted by owner object */ break;
   case 212: /* delete (wxTextDataObject *) ptr;These objects must be deleted by owner object */ break;
   case 213: /* delete (wxBitmapDataObject *) ptr;These objects must be deleted by owner object */ break;
-  case 224: delete (wxLogNull *) ptr; break;
+  case 225: delete (wxLogNull *) ptr; break;
   default: delete (wxObject *) ptr;
 }}
 
diff --git a/lib/wx/c_src/gen/wxe_macros.h b/lib/wx/c_src/gen/wxe_macros.h
index c341825d8d..a1da6500d5 100644
--- a/lib/wx/c_src/gen/wxe_macros.h
+++ b/lib/wx/c_src/gen/wxe_macros.h
@@ -288,1262 +288,1263 @@
 #define wxPanel_new_2 334
 #define wxPanel_destruct 335
 #define wxPanel_InitDialog 336
-#define wxScrolledWindow_new_0 337
-#define wxScrolledWindow_new_2 338
-#define wxScrolledWindow_destruct 339
-#define wxScrolledWindow_CalcScrolledPosition_4 340
-#define wxScrolledWindow_CalcScrolledPosition_1 341
-#define wxScrolledWindow_CalcUnscrolledPosition_4 342
-#define wxScrolledWindow_CalcUnscrolledPosition_1 343
-#define wxScrolledWindow_EnableScrolling 344
-#define wxScrolledWindow_GetScrollPixelsPerUnit 345
-#define wxScrolledWindow_GetViewStart 346
-#define wxScrolledWindow_DoPrepareDC 347
-#define wxScrolledWindow_PrepareDC 348
-#define wxScrolledWindow_Scroll 349
-#define wxScrolledWindow_SetScrollbars 350
-#define wxScrolledWindow_SetScrollRate 351
-#define wxScrolledWindow_SetTargetWindow 352
-#define wxSashWindow_new_0 353
-#define wxSashWindow_new_2 354
-#define wxSashWindow_destruct 355
-#define wxSashWindow_GetSashVisible 356
-#define wxSashWindow_GetMaximumSizeX 357
-#define wxSashWindow_GetMaximumSizeY 358
-#define wxSashWindow_GetMinimumSizeX 359
-#define wxSashWindow_GetMinimumSizeY 360
-#define wxSashWindow_SetMaximumSizeX 361
-#define wxSashWindow_SetMaximumSizeY 362
-#define wxSashWindow_SetMinimumSizeX 363
-#define wxSashWindow_SetMinimumSizeY 364
-#define wxSashWindow_SetSashVisible 365
-#define wxSashLayoutWindow_new_0 366
-#define wxSashLayoutWindow_new_2 367
-#define wxSashLayoutWindow_Create 368
-#define wxSashLayoutWindow_GetAlignment 369
-#define wxSashLayoutWindow_GetOrientation 370
-#define wxSashLayoutWindow_SetAlignment 371
-#define wxSashLayoutWindow_SetDefaultSize 372
-#define wxSashLayoutWindow_SetOrientation 373
-#define wxSashLayoutWindow_destroy 374
-#define wxGrid_new_0 375
-#define wxGrid_new_3 376
-#define wxGrid_new_4 377
-#define wxGrid_destruct 378
-#define wxGrid_AppendCols 379
-#define wxGrid_AppendRows 380
-#define wxGrid_AutoSize 381
-#define wxGrid_AutoSizeColumn 382
-#define wxGrid_AutoSizeColumns 383
-#define wxGrid_AutoSizeRow 384
-#define wxGrid_AutoSizeRows 385
-#define wxGrid_BeginBatch 386
-#define wxGrid_BlockToDeviceRect 387
-#define wxGrid_CanDragColSize 388
-#define wxGrid_CanDragRowSize 389
-#define wxGrid_CanDragGridSize 390
-#define wxGrid_CanEnableCellControl 391
-#define wxGrid_CellToRect_2 392
-#define wxGrid_CellToRect_1 393
-#define wxGrid_ClearGrid 394
-#define wxGrid_ClearSelection 395
-#define wxGrid_CreateGrid 396
-#define wxGrid_DeleteCols 397
-#define wxGrid_DeleteRows 398
-#define wxGrid_DisableCellEditControl 399
-#define wxGrid_DisableDragColSize 400
-#define wxGrid_DisableDragGridSize 401
-#define wxGrid_DisableDragRowSize 402
-#define wxGrid_EnableCellEditControl 403
-#define wxGrid_EnableDragColSize 404
-#define wxGrid_EnableDragGridSize 405
-#define wxGrid_EnableDragRowSize 406
-#define wxGrid_EnableEditing 407
-#define wxGrid_EnableGridLines 408
-#define wxGrid_EndBatch 409
-#define wxGrid_Fit 410
-#define wxGrid_ForceRefresh 411
-#define wxGrid_GetBatchCount 412
-#define wxGrid_GetCellAlignment 413
-#define wxGrid_GetCellBackgroundColour 414
-#define wxGrid_GetCellEditor 415
-#define wxGrid_GetCellFont 416
-#define wxGrid_GetCellRenderer 417
-#define wxGrid_GetCellTextColour 418
-#define wxGrid_GetCellValue_2 419
-#define wxGrid_GetCellValue_1 420
-#define wxGrid_GetColLabelAlignment 421
-#define wxGrid_GetColLabelSize 422
-#define wxGrid_GetColLabelValue 423
-#define wxGrid_GetColMinimalAcceptableWidth 424
-#define wxGrid_GetDefaultCellAlignment 425
-#define wxGrid_GetDefaultCellBackgroundColour 426
-#define wxGrid_GetDefaultCellFont 427
-#define wxGrid_GetDefaultCellTextColour 428
-#define wxGrid_GetDefaultColLabelSize 429
-#define wxGrid_GetDefaultColSize 430
-#define wxGrid_GetDefaultEditor 431
-#define wxGrid_GetDefaultEditorForCell_2 432
-#define wxGrid_GetDefaultEditorForCell_1 433
-#define wxGrid_GetDefaultEditorForType 434
-#define wxGrid_GetDefaultRenderer 435
-#define wxGrid_GetDefaultRendererForCell 436
-#define wxGrid_GetDefaultRendererForType 437
-#define wxGrid_GetDefaultRowLabelSize 438
-#define wxGrid_GetDefaultRowSize 439
-#define wxGrid_GetGridCursorCol 440
-#define wxGrid_GetGridCursorRow 441
-#define wxGrid_GetGridLineColour 442
-#define wxGrid_GridLinesEnabled 443
-#define wxGrid_GetLabelBackgroundColour 444
-#define wxGrid_GetLabelFont 445
-#define wxGrid_GetLabelTextColour 446
-#define wxGrid_GetNumberCols 447
-#define wxGrid_GetNumberRows 448
-#define wxGrid_GetOrCreateCellAttr 449
-#define wxGrid_GetRowMinimalAcceptableHeight 450
-#define wxGrid_GetRowLabelAlignment 451
-#define wxGrid_GetRowLabelSize 452
-#define wxGrid_GetRowLabelValue 453
-#define wxGrid_GetRowSize 454
-#define wxGrid_GetScrollLineX 455
-#define wxGrid_GetScrollLineY 456
-#define wxGrid_GetSelectedCells 457
-#define wxGrid_GetSelectedCols 458
-#define wxGrid_GetSelectedRows 459
-#define wxGrid_GetSelectionBackground 460
-#define wxGrid_GetSelectionBlockTopLeft 461
-#define wxGrid_GetSelectionBlockBottomRight 462
-#define wxGrid_GetSelectionForeground 463
-#define wxGrid_GetViewWidth 464
-#define wxGrid_GetGridWindow 465
-#define wxGrid_GetGridRowLabelWindow 466
-#define wxGrid_GetGridColLabelWindow 467
-#define wxGrid_GetGridCornerLabelWindow 468
-#define wxGrid_HideCellEditControl 469
-#define wxGrid_InsertCols 470
-#define wxGrid_InsertRows 471
-#define wxGrid_IsCellEditControlEnabled 472
-#define wxGrid_IsCurrentCellReadOnly 473
-#define wxGrid_IsEditable 474
-#define wxGrid_IsInSelection_2 475
-#define wxGrid_IsInSelection_1 476
-#define wxGrid_IsReadOnly 477
-#define wxGrid_IsSelection 478
-#define wxGrid_IsVisible_3 479
-#define wxGrid_IsVisible_2 480
-#define wxGrid_MakeCellVisible_2 481
-#define wxGrid_MakeCellVisible_1 482
-#define wxGrid_MoveCursorDown 483
-#define wxGrid_MoveCursorLeft 484
-#define wxGrid_MoveCursorRight 485
-#define wxGrid_MoveCursorUp 486
-#define wxGrid_MoveCursorDownBlock 487
-#define wxGrid_MoveCursorLeftBlock 488
-#define wxGrid_MoveCursorRightBlock 489
-#define wxGrid_MoveCursorUpBlock 490
-#define wxGrid_MovePageDown 491
-#define wxGrid_MovePageUp 492
-#define wxGrid_RegisterDataType 493
-#define wxGrid_SaveEditControlValue 494
-#define wxGrid_SelectAll 495
-#define wxGrid_SelectBlock_5 496
-#define wxGrid_SelectBlock_3 497
-#define wxGrid_SelectCol 498
-#define wxGrid_SelectRow 499
-#define wxGrid_SetCellAlignment_4 500
-#define wxGrid_SetCellAlignment_3 501
-#define wxGrid_SetCellAlignment_1 502
-#define wxGrid_SetCellBackgroundColour_3_0 503
-#define wxGrid_SetCellBackgroundColour_1 504
-#define wxGrid_SetCellBackgroundColour_3_1 505
-#define wxGrid_SetCellEditor 506
-#define wxGrid_SetCellFont 507
-#define wxGrid_SetCellRenderer 508
-#define wxGrid_SetCellTextColour_3_0 509
-#define wxGrid_SetCellTextColour_3_1 510
-#define wxGrid_SetCellTextColour_1 511
-#define wxGrid_SetCellValue_3_0 512
-#define wxGrid_SetCellValue_2 513
-#define wxGrid_SetCellValue_3_1 514
-#define wxGrid_SetColAttr 515
-#define wxGrid_SetColFormatBool 516
-#define wxGrid_SetColFormatNumber 517
-#define wxGrid_SetColFormatFloat 518
-#define wxGrid_SetColFormatCustom 519
-#define wxGrid_SetColLabelAlignment 520
-#define wxGrid_SetColLabelSize 521
-#define wxGrid_SetColLabelValue 522
-#define wxGrid_SetColMinimalWidth 523
-#define wxGrid_SetColMinimalAcceptableWidth 524
-#define wxGrid_SetColSize 525
-#define wxGrid_SetDefaultCellAlignment 526
-#define wxGrid_SetDefaultCellBackgroundColour 527
-#define wxGrid_SetDefaultCellFont 528
-#define wxGrid_SetDefaultCellTextColour 529
-#define wxGrid_SetDefaultEditor 530
-#define wxGrid_SetDefaultRenderer 531
-#define wxGrid_SetDefaultColSize 532
-#define wxGrid_SetDefaultRowSize 533
-#define wxGrid_SetGridCursor 534
-#define wxGrid_SetGridLineColour 535
-#define wxGrid_SetLabelBackgroundColour 536
-#define wxGrid_SetLabelFont 537
-#define wxGrid_SetLabelTextColour 538
-#define wxGrid_SetMargins 539
-#define wxGrid_SetReadOnly 540
-#define wxGrid_SetRowAttr 541
-#define wxGrid_SetRowLabelAlignment 542
-#define wxGrid_SetRowLabelSize 543
-#define wxGrid_SetRowLabelValue 544
-#define wxGrid_SetRowMinimalHeight 545
-#define wxGrid_SetRowMinimalAcceptableHeight 546
-#define wxGrid_SetRowSize 547
-#define wxGrid_SetScrollLineX 548
-#define wxGrid_SetScrollLineY 549
-#define wxGrid_SetSelectionBackground 550
-#define wxGrid_SetSelectionForeground 551
-#define wxGrid_SetSelectionMode 552
-#define wxGrid_ShowCellEditControl 553
-#define wxGrid_XToCol 554
-#define wxGrid_XToEdgeOfCol 555
-#define wxGrid_YToEdgeOfRow 556
-#define wxGrid_YToRow 557
-#define wxGridCellRenderer_Draw 558
-#define wxGridCellRenderer_GetBestSize 559
-#define wxGridCellEditor_Create 560
-#define wxGridCellEditor_IsCreated 561
-#define wxGridCellEditor_SetSize 562
-#define wxGridCellEditor_Show 563
-#define wxGridCellEditor_PaintBackground 564
-#define wxGridCellEditor_BeginEdit 565
-#define wxGridCellEditor_EndEdit 566
-#define wxGridCellEditor_Reset 567
-#define wxGridCellEditor_StartingKey 568
-#define wxGridCellEditor_StartingClick 569
-#define wxGridCellEditor_HandleReturn 570
-#define wxGridCellBoolRenderer_new 571
-#define wxGridCellBoolRenderer_destroy 572
-#define wxGridCellBoolEditor_new 573
-#define wxGridCellBoolEditor_IsTrueValue 574
-#define wxGridCellBoolEditor_UseStringValues 575
-#define wxGridCellBoolEditor_destroy 576
-#define wxGridCellFloatRenderer_new 577
-#define wxGridCellFloatRenderer_GetPrecision 578
-#define wxGridCellFloatRenderer_GetWidth 579
-#define wxGridCellFloatRenderer_SetParameters 580
-#define wxGridCellFloatRenderer_SetPrecision 581
-#define wxGridCellFloatRenderer_SetWidth 582
-#define wxGridCellFloatRenderer_destroy 583
-#define wxGridCellFloatEditor_new 584
-#define wxGridCellFloatEditor_SetParameters 585
-#define wxGridCellFloatEditor_destroy 586
-#define wxGridCellStringRenderer_new 587
-#define wxGridCellStringRenderer_destroy 588
-#define wxGridCellTextEditor_new 589
-#define wxGridCellTextEditor_SetParameters 590
-#define wxGridCellTextEditor_destroy 591
-#define wxGridCellChoiceEditor_new 593
-#define wxGridCellChoiceEditor_SetParameters 594
-#define wxGridCellChoiceEditor_destroy 595
-#define wxGridCellNumberRenderer_new 596
-#define wxGridCellNumberRenderer_destroy 597
-#define wxGridCellNumberEditor_new 598
-#define wxGridCellNumberEditor_GetValue 599
-#define wxGridCellNumberEditor_SetParameters 600
-#define wxGridCellNumberEditor_destroy 601
-#define wxGridCellAttr_SetTextColour 602
-#define wxGridCellAttr_SetBackgroundColour 603
-#define wxGridCellAttr_SetFont 604
-#define wxGridCellAttr_SetAlignment 605
-#define wxGridCellAttr_SetReadOnly 606
-#define wxGridCellAttr_SetRenderer 607
-#define wxGridCellAttr_SetEditor 608
-#define wxGridCellAttr_HasTextColour 609
-#define wxGridCellAttr_HasBackgroundColour 610
-#define wxGridCellAttr_HasFont 611
-#define wxGridCellAttr_HasAlignment 612
-#define wxGridCellAttr_HasRenderer 613
-#define wxGridCellAttr_HasEditor 614
-#define wxGridCellAttr_GetTextColour 615
-#define wxGridCellAttr_GetBackgroundColour 616
-#define wxGridCellAttr_GetFont 617
-#define wxGridCellAttr_GetAlignment 618
-#define wxGridCellAttr_GetRenderer 619
-#define wxGridCellAttr_GetEditor 620
-#define wxGridCellAttr_IsReadOnly 621
-#define wxGridCellAttr_SetDefAttr 622
-#define wxDC_Blit 623
-#define wxDC_CalcBoundingBox 624
-#define wxDC_Clear 625
-#define wxDC_ComputeScaleAndOrigin 626
-#define wxDC_CrossHair 627
-#define wxDC_DestroyClippingRegion 628
-#define wxDC_DeviceToLogicalX 629
-#define wxDC_DeviceToLogicalXRel 630
-#define wxDC_DeviceToLogicalY 631
-#define wxDC_DeviceToLogicalYRel 632
-#define wxDC_DrawArc 633
-#define wxDC_DrawBitmap 634
-#define wxDC_DrawCheckMark 635
-#define wxDC_DrawCircle 636
-#define wxDC_DrawEllipse_2 638
-#define wxDC_DrawEllipse_1 639
-#define wxDC_DrawEllipticArc 640
-#define wxDC_DrawIcon 641
-#define wxDC_DrawLabel 642
-#define wxDC_DrawLine 643
-#define wxDC_DrawLines 644
-#define wxDC_DrawPolygon 646
-#define wxDC_DrawPoint 648
-#define wxDC_DrawRectangle_2 650
-#define wxDC_DrawRectangle_1 651
-#define wxDC_DrawRotatedText 652
-#define wxDC_DrawRoundedRectangle_3 654
-#define wxDC_DrawRoundedRectangle_2 655
-#define wxDC_DrawText 656
-#define wxDC_EndDoc 657
-#define wxDC_EndPage 658
-#define wxDC_FloodFill 659
-#define wxDC_GetBackground 660
-#define wxDC_GetBackgroundMode 661
-#define wxDC_GetBrush 662
-#define wxDC_GetCharHeight 663
-#define wxDC_GetCharWidth 664
-#define wxDC_GetClippingBox 665
-#define wxDC_GetFont 667
-#define wxDC_GetLayoutDirection 668
-#define wxDC_GetLogicalFunction 669
-#define wxDC_GetMapMode 670
-#define wxDC_GetMultiLineTextExtent_4 671
-#define wxDC_GetMultiLineTextExtent_1 672
-#define wxDC_GetPartialTextExtents 673
-#define wxDC_GetPen 674
-#define wxDC_GetPixel 675
-#define wxDC_GetPPI 676
-#define wxDC_GetSize 678
-#define wxDC_GetSizeMM 680
-#define wxDC_GetTextBackground 681
-#define wxDC_GetTextExtent_4 682
-#define wxDC_GetTextExtent_1 683
-#define wxDC_GetTextForeground 685
-#define wxDC_GetUserScale 686
-#define wxDC_GradientFillConcentric_3 687
-#define wxDC_GradientFillConcentric_4 688
-#define wxDC_GradientFillLinear 689
-#define wxDC_LogicalToDeviceX 690
-#define wxDC_LogicalToDeviceXRel 691
-#define wxDC_LogicalToDeviceY 692
-#define wxDC_LogicalToDeviceYRel 693
-#define wxDC_MaxX 694
-#define wxDC_MaxY 695
-#define wxDC_MinX 696
-#define wxDC_MinY 697
-#define wxDC_IsOk 698
-#define wxDC_ResetBoundingBox 699
-#define wxDC_SetAxisOrientation 700
-#define wxDC_SetBackground 701
-#define wxDC_SetBackgroundMode 702
-#define wxDC_SetBrush 703
-#define wxDC_SetClippingRegion_2 705
-#define wxDC_SetClippingRegion_1_1 706
-#define wxDC_SetClippingRegion_1_0 707
-#define wxDC_SetDeviceOrigin 708
-#define wxDC_SetFont 709
-#define wxDC_SetLayoutDirection 710
-#define wxDC_SetLogicalFunction 711
-#define wxDC_SetMapMode 712
-#define wxDC_SetPalette 713
-#define wxDC_SetPen 714
-#define wxDC_SetTextBackground 715
-#define wxDC_SetTextForeground 716
-#define wxDC_SetUserScale 717
-#define wxDC_StartDoc 718
-#define wxDC_StartPage 719
-#define wxMirrorDC_new 720
-#define wxMirrorDC_destroy 721
-#define wxScreenDC_new 722
-#define wxScreenDC_destruct 723
-#define wxPostScriptDC_new_0 724
-#define wxPostScriptDC_new_1 725
-#define wxPostScriptDC_destruct 726
-#define wxPostScriptDC_SetResolution 727
-#define wxPostScriptDC_GetResolution 728
-#define wxWindowDC_new_0 729
-#define wxWindowDC_new_1 730
-#define wxWindowDC_destruct 731
-#define wxClientDC_new_0 732
-#define wxClientDC_new_1 733
-#define wxClientDC_destroy 734
-#define wxPaintDC_new_0 735
-#define wxPaintDC_new_1 736
-#define wxPaintDC_destroy 737
-#define wxMemoryDC_new_1_0 739
-#define wxMemoryDC_new_1_1 740
-#define wxMemoryDC_new_0 741
-#define wxMemoryDC_destruct 743
-#define wxMemoryDC_SelectObject 744
-#define wxMemoryDC_SelectObjectAsSource 745
-#define wxBufferedDC_new_0 746
-#define wxBufferedDC_new_2 747
-#define wxBufferedDC_new_3 748
-#define wxBufferedDC_destruct 749
-#define wxBufferedDC_Init_2 750
-#define wxBufferedDC_Init_3 751
-#define wxBufferedPaintDC_new_3 752
-#define wxBufferedPaintDC_new_2 753
-#define wxBufferedPaintDC_destruct 754
-#define wxGraphicsObject_destruct 755
-#define wxGraphicsObject_GetRenderer 756
-#define wxGraphicsObject_IsNull 757
-#define wxGraphicsContext_destruct 758
-#define wxGraphicsContext_Create_1_1 759
-#define wxGraphicsContext_Create_1_0 760
-#define wxGraphicsContext_Create_0 761
-#define wxGraphicsContext_CreatePen 762
-#define wxGraphicsContext_CreateBrush 763
-#define wxGraphicsContext_CreateRadialGradientBrush 764
-#define wxGraphicsContext_CreateLinearGradientBrush 765
-#define wxGraphicsContext_CreateFont 766
-#define wxGraphicsContext_CreateMatrix 767
-#define wxGraphicsContext_CreatePath 768
-#define wxGraphicsContext_Clip_1 769
-#define wxGraphicsContext_Clip_4 770
-#define wxGraphicsContext_ResetClip 771
-#define wxGraphicsContext_DrawBitmap 772
-#define wxGraphicsContext_DrawEllipse 773
-#define wxGraphicsContext_DrawIcon 774
-#define wxGraphicsContext_DrawLines 775
-#define wxGraphicsContext_DrawPath 776
-#define wxGraphicsContext_DrawRectangle 777
-#define wxGraphicsContext_DrawRoundedRectangle 778
-#define wxGraphicsContext_DrawText_3 779
-#define wxGraphicsContext_DrawText_4_0 780
-#define wxGraphicsContext_DrawText_4_1 781
-#define wxGraphicsContext_DrawText_5 782
-#define wxGraphicsContext_FillPath 783
-#define wxGraphicsContext_StrokePath 784
-#define wxGraphicsContext_GetPartialTextExtents 785
-#define wxGraphicsContext_GetTextExtent 786
-#define wxGraphicsContext_Rotate 787
-#define wxGraphicsContext_Scale 788
-#define wxGraphicsContext_Translate 789
-#define wxGraphicsContext_GetTransform 790
-#define wxGraphicsContext_SetTransform 791
-#define wxGraphicsContext_ConcatTransform 792
-#define wxGraphicsContext_SetBrush_1_1 793
-#define wxGraphicsContext_SetBrush_1_0 794
-#define wxGraphicsContext_SetFont_1 795
-#define wxGraphicsContext_SetFont_2 796
-#define wxGraphicsContext_SetPen_1_0 797
-#define wxGraphicsContext_SetPen_1_1 798
-#define wxGraphicsContext_StrokeLine 799
-#define wxGraphicsContext_StrokeLines 800
-#define wxGraphicsMatrix_Concat 802
-#define wxGraphicsMatrix_Get 804
-#define wxGraphicsMatrix_Invert 805
-#define wxGraphicsMatrix_IsEqual 806
-#define wxGraphicsMatrix_IsIdentity 808
-#define wxGraphicsMatrix_Rotate 809
-#define wxGraphicsMatrix_Scale 810
-#define wxGraphicsMatrix_Translate 811
-#define wxGraphicsMatrix_Set 812
-#define wxGraphicsMatrix_TransformPoint 813
-#define wxGraphicsMatrix_TransformDistance 814
-#define wxGraphicsPath_MoveToPoint_2 815
-#define wxGraphicsPath_MoveToPoint_1 816
-#define wxGraphicsPath_AddArc_6 817
-#define wxGraphicsPath_AddArc_5 818
-#define wxGraphicsPath_AddArcToPoint 819
-#define wxGraphicsPath_AddCircle 820
-#define wxGraphicsPath_AddCurveToPoint_6 821
-#define wxGraphicsPath_AddCurveToPoint_3 822
-#define wxGraphicsPath_AddEllipse 823
-#define wxGraphicsPath_AddLineToPoint_2 824
-#define wxGraphicsPath_AddLineToPoint_1 825
-#define wxGraphicsPath_AddPath 826
-#define wxGraphicsPath_AddQuadCurveToPoint 827
-#define wxGraphicsPath_AddRectangle 828
-#define wxGraphicsPath_AddRoundedRectangle 829
-#define wxGraphicsPath_CloseSubpath 830
-#define wxGraphicsPath_Contains_3 831
-#define wxGraphicsPath_Contains_2 832
-#define wxGraphicsPath_GetBox 834
-#define wxGraphicsPath_GetCurrentPoint 836
-#define wxGraphicsPath_Transform 837
-#define wxGraphicsRenderer_GetDefaultRenderer 838
-#define wxGraphicsRenderer_CreateContext_1_1 839
-#define wxGraphicsRenderer_CreateContext_1_0 840
-#define wxGraphicsRenderer_CreatePen 841
-#define wxGraphicsRenderer_CreateBrush 842
-#define wxGraphicsRenderer_CreateLinearGradientBrush 843
-#define wxGraphicsRenderer_CreateRadialGradientBrush 844
-#define wxGraphicsRenderer_CreateFont 845
-#define wxGraphicsRenderer_CreateMatrix 846
-#define wxGraphicsRenderer_CreatePath 847
-#define wxMenuBar_new_1 849
-#define wxMenuBar_new_0 851
-#define wxMenuBar_destruct 853
-#define wxMenuBar_Append 854
-#define wxMenuBar_Check 855
-#define wxMenuBar_Enable_2 856
-#define wxMenuBar_Enable_1 857
-#define wxMenuBar_EnableTop 858
-#define wxMenuBar_FindMenu 859
-#define wxMenuBar_FindMenuItem 860
-#define wxMenuBar_FindItem 861
-#define wxMenuBar_GetHelpString 862
-#define wxMenuBar_GetLabel_1 863
-#define wxMenuBar_GetLabel_0 864
-#define wxMenuBar_GetLabelTop 865
-#define wxMenuBar_GetMenu 866
-#define wxMenuBar_GetMenuCount 867
-#define wxMenuBar_Insert 868
-#define wxMenuBar_IsChecked 869
-#define wxMenuBar_IsEnabled_1 870
-#define wxMenuBar_IsEnabled_0 871
-#define wxMenuBar_Remove 872
-#define wxMenuBar_Replace 873
-#define wxMenuBar_SetHelpString 874
-#define wxMenuBar_SetLabel_2 875
-#define wxMenuBar_SetLabel_1 876
-#define wxMenuBar_SetLabelTop 877
-#define wxControl_GetLabel 878
-#define wxControl_SetLabel 879
-#define wxControlWithItems_Append_1 880
-#define wxControlWithItems_Append_2 881
-#define wxControlWithItems_appendStrings_1 882
-#define wxControlWithItems_Clear 883
-#define wxControlWithItems_Delete 884
-#define wxControlWithItems_FindString 885
-#define wxControlWithItems_getClientData 886
-#define wxControlWithItems_setClientData 887
-#define wxControlWithItems_GetCount 888
-#define wxControlWithItems_GetSelection 889
-#define wxControlWithItems_GetString 890
-#define wxControlWithItems_GetStringSelection 891
-#define wxControlWithItems_Insert_2 892
-#define wxControlWithItems_Insert_3 893
-#define wxControlWithItems_IsEmpty 894
-#define wxControlWithItems_Select 895
-#define wxControlWithItems_SetSelection 896
-#define wxControlWithItems_SetString 897
-#define wxControlWithItems_SetStringSelection 898
-#define wxMenu_new_2 901
-#define wxMenu_new_1 902
-#define wxMenu_destruct 904
-#define wxMenu_Append_3 905
-#define wxMenu_Append_1 906
-#define wxMenu_Append_4_0 907
-#define wxMenu_Append_4_1 908
-#define wxMenu_AppendCheckItem 909
-#define wxMenu_AppendRadioItem 910
-#define wxMenu_AppendSeparator 911
-#define wxMenu_Break 912
-#define wxMenu_Check 913
-#define wxMenu_Delete_1_0 914
-#define wxMenu_Delete_1_1 915
-#define wxMenu_Destroy_1_0 916
-#define wxMenu_Destroy_1_1 917
-#define wxMenu_Enable 918
-#define wxMenu_FindItem_1 919
-#define wxMenu_FindItem_2 920
-#define wxMenu_FindItemByPosition 921
-#define wxMenu_GetHelpString 922
-#define wxMenu_GetLabel 923
-#define wxMenu_GetMenuItemCount 924
-#define wxMenu_GetMenuItems 925
-#define wxMenu_GetTitle 927
-#define wxMenu_Insert_2 928
-#define wxMenu_Insert_3 929
-#define wxMenu_Insert_5_1 930
-#define wxMenu_Insert_5_0 931
-#define wxMenu_InsertCheckItem 932
-#define wxMenu_InsertRadioItem 933
-#define wxMenu_InsertSeparator 934
-#define wxMenu_IsChecked 935
-#define wxMenu_IsEnabled 936
-#define wxMenu_Prepend_1 937
-#define wxMenu_Prepend_2 938
-#define wxMenu_Prepend_4_1 939
-#define wxMenu_Prepend_4_0 940
-#define wxMenu_PrependCheckItem 941
-#define wxMenu_PrependRadioItem 942
-#define wxMenu_PrependSeparator 943
-#define wxMenu_Remove_1_0 944
-#define wxMenu_Remove_1_1 945
-#define wxMenu_SetHelpString 946
-#define wxMenu_SetLabel 947
-#define wxMenu_SetTitle 948
-#define wxMenuItem_new 949
-#define wxMenuItem_destruct 951
-#define wxMenuItem_Check 952
-#define wxMenuItem_Enable 953
-#define wxMenuItem_GetBitmap 954
-#define wxMenuItem_GetHelp 955
-#define wxMenuItem_GetId 956
-#define wxMenuItem_GetKind 957
-#define wxMenuItem_GetLabel 958
-#define wxMenuItem_GetLabelFromText 959
-#define wxMenuItem_GetMenu 960
-#define wxMenuItem_GetText 961
-#define wxMenuItem_GetSubMenu 962
-#define wxMenuItem_IsCheckable 963
-#define wxMenuItem_IsChecked 964
-#define wxMenuItem_IsEnabled 965
-#define wxMenuItem_IsSeparator 966
-#define wxMenuItem_IsSubMenu 967
-#define wxMenuItem_SetBitmap 968
-#define wxMenuItem_SetHelp 969
-#define wxMenuItem_SetMenu 970
-#define wxMenuItem_SetSubMenu 971
-#define wxMenuItem_SetText 972
-#define wxToolBar_AddControl 973
-#define wxToolBar_AddSeparator 974
-#define wxToolBar_AddTool_5 975
-#define wxToolBar_AddTool_4_0 976
-#define wxToolBar_AddTool_1 977
-#define wxToolBar_AddTool_4_1 978
-#define wxToolBar_AddTool_3 979
-#define wxToolBar_AddTool_6 980
-#define wxToolBar_AddCheckTool 981
-#define wxToolBar_AddRadioTool 982
-#define wxToolBar_DeleteTool 983
-#define wxToolBar_DeleteToolByPos 984
-#define wxToolBar_EnableTool 985
-#define wxToolBar_FindById 986
-#define wxToolBar_FindControl 987
-#define wxToolBar_FindToolForPosition 988
-#define wxToolBar_GetToolSize 989
-#define wxToolBar_GetToolBitmapSize 990
-#define wxToolBar_GetMargins 991
-#define wxToolBar_GetToolEnabled 992
-#define wxToolBar_GetToolLongHelp 993
-#define wxToolBar_GetToolPacking 994
-#define wxToolBar_GetToolPos 995
-#define wxToolBar_GetToolSeparation 996
-#define wxToolBar_GetToolShortHelp 997
-#define wxToolBar_GetToolState 998
-#define wxToolBar_InsertControl 999
-#define wxToolBar_InsertSeparator 1000
-#define wxToolBar_InsertTool_5 1001
-#define wxToolBar_InsertTool_2 1002
-#define wxToolBar_InsertTool_4 1003
-#define wxToolBar_Realize 1004
-#define wxToolBar_RemoveTool 1005
-#define wxToolBar_SetMargins 1006
-#define wxToolBar_SetToolBitmapSize 1007
-#define wxToolBar_SetToolLongHelp 1008
-#define wxToolBar_SetToolPacking 1009
-#define wxToolBar_SetToolShortHelp 1010
-#define wxToolBar_SetToolSeparation 1011
-#define wxToolBar_ToggleTool 1012
-#define wxStatusBar_new_0 1014
-#define wxStatusBar_new_2 1015
-#define wxStatusBar_destruct 1017
-#define wxStatusBar_Create 1018
-#define wxStatusBar_GetFieldRect 1019
-#define wxStatusBar_GetFieldsCount 1020
-#define wxStatusBar_GetStatusText 1021
-#define wxStatusBar_PopStatusText 1022
-#define wxStatusBar_PushStatusText 1023
-#define wxStatusBar_SetFieldsCount 1024
-#define wxStatusBar_SetMinHeight 1025
-#define wxStatusBar_SetStatusText 1026
-#define wxStatusBar_SetStatusWidths 1027
-#define wxStatusBar_SetStatusStyles 1028
-#define wxBitmap_new_0 1029
-#define wxBitmap_new_3 1030
-#define wxBitmap_new_4 1031
-#define wxBitmap_new_2_0 1032
-#define wxBitmap_new_2_1 1033
-#define wxBitmap_destruct 1034
-#define wxBitmap_ConvertToImage 1035
-#define wxBitmap_CopyFromIcon 1036
-#define wxBitmap_Create 1037
-#define wxBitmap_GetDepth 1038
-#define wxBitmap_GetHeight 1039
-#define wxBitmap_GetPalette 1040
-#define wxBitmap_GetMask 1041
-#define wxBitmap_GetWidth 1042
-#define wxBitmap_GetSubBitmap 1043
-#define wxBitmap_LoadFile 1044
-#define wxBitmap_Ok 1045
-#define wxBitmap_SaveFile 1046
-#define wxBitmap_SetDepth 1047
-#define wxBitmap_SetHeight 1048
-#define wxBitmap_SetMask 1049
-#define wxBitmap_SetPalette 1050
-#define wxBitmap_SetWidth 1051
-#define wxIcon_new_0 1052
-#define wxIcon_new_2 1053
-#define wxIcon_new_1 1054
-#define wxIcon_CopyFromBitmap 1055
-#define wxIcon_destroy 1056
-#define wxIconBundle_new_0 1057
-#define wxIconBundle_new_2 1058
-#define wxIconBundle_new_1_0 1059
-#define wxIconBundle_new_1_1 1060
-#define wxIconBundle_destruct 1061
-#define wxIconBundle_AddIcon_2 1062
-#define wxIconBundle_AddIcon_1 1063
-#define wxIconBundle_GetIcon_1_1 1064
-#define wxIconBundle_GetIcon_1_0 1065
-#define wxCursor_new_0 1066
-#define wxCursor_new_1_0 1067
-#define wxCursor_new_1_1 1068
-#define wxCursor_new_4 1069
-#define wxCursor_destruct 1070
-#define wxCursor_Ok 1071
-#define wxMask_new_0 1072
-#define wxMask_new_2_1 1073
-#define wxMask_new_2_0 1074
-#define wxMask_new_1 1075
-#define wxMask_destruct 1076
-#define wxMask_Create_2_1 1077
-#define wxMask_Create_2_0 1078
-#define wxMask_Create_1 1079
-#define wxImage_new_0 1080
-#define wxImage_new_3_0 1081
-#define wxImage_new_4 1082
-#define wxImage_new_5 1083
-#define wxImage_new_2 1084
-#define wxImage_new_3_1 1085
-#define wxImage_Blur 1086
-#define wxImage_BlurHorizontal 1087
-#define wxImage_BlurVertical 1088
-#define wxImage_ConvertAlphaToMask 1089
-#define wxImage_ConvertToGreyscale 1090
-#define wxImage_ConvertToMono 1091
-#define wxImage_Copy 1092
-#define wxImage_Create_3 1093
-#define wxImage_Create_4 1094
-#define wxImage_Create_5 1095
-#define wxImage_Destroy 1096
-#define wxImage_FindFirstUnusedColour 1097
-#define wxImage_GetImageExtWildcard 1098
-#define wxImage_GetAlpha_2 1099
-#define wxImage_GetAlpha_0 1100
-#define wxImage_GetBlue 1101
-#define wxImage_GetData 1102
-#define wxImage_GetGreen 1103
-#define wxImage_GetImageCount 1104
-#define wxImage_GetHeight 1105
-#define wxImage_GetMaskBlue 1106
-#define wxImage_GetMaskGreen 1107
-#define wxImage_GetMaskRed 1108
-#define wxImage_GetOrFindMaskColour 1109
-#define wxImage_GetPalette 1110
-#define wxImage_GetRed 1111
-#define wxImage_GetSubImage 1112
-#define wxImage_GetWidth 1113
-#define wxImage_HasAlpha 1114
-#define wxImage_HasMask 1115
-#define wxImage_GetOption 1116
-#define wxImage_GetOptionInt 1117
-#define wxImage_HasOption 1118
-#define wxImage_InitAlpha 1119
-#define wxImage_InitStandardHandlers 1120
-#define wxImage_IsTransparent 1121
-#define wxImage_LoadFile_2 1122
-#define wxImage_LoadFile_3 1123
-#define wxImage_Ok 1124
-#define wxImage_RemoveHandler 1125
-#define wxImage_Mirror 1126
-#define wxImage_Replace 1127
-#define wxImage_Rescale 1128
-#define wxImage_Resize 1129
-#define wxImage_Rotate 1130
-#define wxImage_RotateHue 1131
-#define wxImage_Rotate90 1132
-#define wxImage_SaveFile_1 1133
-#define wxImage_SaveFile_2_0 1134
-#define wxImage_SaveFile_2_1 1135
-#define wxImage_Scale 1136
-#define wxImage_Size 1137
-#define wxImage_SetAlpha_3 1138
-#define wxImage_SetAlpha_2 1139
-#define wxImage_SetData_2 1140
-#define wxImage_SetData_4 1141
-#define wxImage_SetMask 1142
-#define wxImage_SetMaskColour 1143
-#define wxImage_SetMaskFromImage 1144
-#define wxImage_SetOption_2_1 1145
-#define wxImage_SetOption_2_0 1146
-#define wxImage_SetPalette 1147
-#define wxImage_SetRGB_5 1148
-#define wxImage_SetRGB_4 1149
-#define wxImage_destroy 1150
-#define wxBrush_new_0 1151
-#define wxBrush_new_2 1152
-#define wxBrush_new_1 1153
-#define wxBrush_destruct 1155
-#define wxBrush_GetColour 1156
-#define wxBrush_GetStipple 1157
-#define wxBrush_GetStyle 1158
-#define wxBrush_IsHatch 1159
-#define wxBrush_IsOk 1160
-#define wxBrush_SetColour_1 1161
-#define wxBrush_SetColour_3 1162
-#define wxBrush_SetStipple 1163
-#define wxBrush_SetStyle 1164
-#define wxPen_new_0 1165
-#define wxPen_new_2 1166
-#define wxPen_destruct 1167
-#define wxPen_GetCap 1168
-#define wxPen_GetColour 1169
-#define wxPen_GetJoin 1170
-#define wxPen_GetStyle 1171
-#define wxPen_GetWidth 1172
-#define wxPen_IsOk 1173
-#define wxPen_SetCap 1174
-#define wxPen_SetColour_1 1175
-#define wxPen_SetColour_3 1176
-#define wxPen_SetJoin 1177
-#define wxPen_SetStyle 1178
-#define wxPen_SetWidth 1179
-#define wxRegion_new_0 1180
-#define wxRegion_new_4 1181
-#define wxRegion_new_2 1182
-#define wxRegion_new_1_1 1183
-#define wxRegion_new_1_0 1185
-#define wxRegion_destruct 1187
-#define wxRegion_Clear 1188
-#define wxRegion_Contains_2 1189
-#define wxRegion_Contains_1_0 1190
-#define wxRegion_Contains_4 1191
-#define wxRegion_Contains_1_1 1192
-#define wxRegion_ConvertToBitmap 1193
-#define wxRegion_GetBox 1194
-#define wxRegion_Intersect_4 1195
-#define wxRegion_Intersect_1_1 1196
-#define wxRegion_Intersect_1_0 1197
-#define wxRegion_IsEmpty 1198
-#define wxRegion_Subtract_4 1199
-#define wxRegion_Subtract_1_1 1200
-#define wxRegion_Subtract_1_0 1201
-#define wxRegion_Offset_2 1202
-#define wxRegion_Offset_1 1203
-#define wxRegion_Union_4 1204
-#define wxRegion_Union_1_2 1205
-#define wxRegion_Union_1_1 1206
-#define wxRegion_Union_1_0 1207
-#define wxRegion_Union_3 1208
-#define wxRegion_Xor_4 1209
-#define wxRegion_Xor_1_1 1210
-#define wxRegion_Xor_1_0 1211
-#define wxAcceleratorTable_new_0 1212
-#define wxAcceleratorTable_new_2 1213
-#define wxAcceleratorTable_destruct 1214
-#define wxAcceleratorTable_Ok 1215
-#define wxAcceleratorEntry_new_1_0 1216
-#define wxAcceleratorEntry_new_1_1 1217
-#define wxAcceleratorEntry_GetCommand 1218
-#define wxAcceleratorEntry_GetFlags 1219
-#define wxAcceleratorEntry_GetKeyCode 1220
-#define wxAcceleratorEntry_Set 1221
-#define wxAcceleratorEntry_destroy 1222
-#define wxCaret_new_3 1227
-#define wxCaret_new_2 1228
-#define wxCaret_destruct 1230
-#define wxCaret_Create_3 1231
-#define wxCaret_Create_2 1232
-#define wxCaret_GetBlinkTime 1233
-#define wxCaret_GetPosition 1235
-#define wxCaret_GetSize 1237
-#define wxCaret_GetWindow 1238
-#define wxCaret_Hide 1239
-#define wxCaret_IsOk 1240
-#define wxCaret_IsVisible 1241
-#define wxCaret_Move_2 1242
-#define wxCaret_Move_1 1243
-#define wxCaret_SetBlinkTime 1244
-#define wxCaret_SetSize_2 1245
-#define wxCaret_SetSize_1 1246
-#define wxCaret_Show 1247
-#define wxSizer_Add_2_1 1248
-#define wxSizer_Add_2_0 1249
-#define wxSizer_Add_3 1250
-#define wxSizer_Add_2_3 1251
-#define wxSizer_Add_2_2 1252
-#define wxSizer_AddSpacer 1253
-#define wxSizer_AddStretchSpacer 1254
-#define wxSizer_CalcMin 1255
-#define wxSizer_Clear 1256
-#define wxSizer_Detach_1_2 1257
-#define wxSizer_Detach_1_1 1258
-#define wxSizer_Detach_1_0 1259
-#define wxSizer_Fit 1260
-#define wxSizer_FitInside 1261
-#define wxSizer_GetChildren 1262
-#define wxSizer_GetItem_2_1 1263
-#define wxSizer_GetItem_2_0 1264
-#define wxSizer_GetItem_1 1265
-#define wxSizer_GetSize 1266
-#define wxSizer_GetPosition 1267
-#define wxSizer_GetMinSize 1268
-#define wxSizer_Hide_2_0 1269
-#define wxSizer_Hide_2_1 1270
-#define wxSizer_Hide_1 1271
-#define wxSizer_Insert_3_1 1272
-#define wxSizer_Insert_3_0 1273
-#define wxSizer_Insert_4 1274
-#define wxSizer_Insert_3_3 1275
-#define wxSizer_Insert_3_2 1276
-#define wxSizer_Insert_2 1277
-#define wxSizer_InsertSpacer 1278
-#define wxSizer_InsertStretchSpacer 1279
-#define wxSizer_IsShown_1_2 1280
-#define wxSizer_IsShown_1_1 1281
-#define wxSizer_IsShown_1_0 1282
-#define wxSizer_Layout 1283
-#define wxSizer_Prepend_2_1 1284
-#define wxSizer_Prepend_2_0 1285
-#define wxSizer_Prepend_3 1286
-#define wxSizer_Prepend_2_3 1287
-#define wxSizer_Prepend_2_2 1288
-#define wxSizer_Prepend_1 1289
-#define wxSizer_PrependSpacer 1290
-#define wxSizer_PrependStretchSpacer 1291
-#define wxSizer_RecalcSizes 1292
-#define wxSizer_Remove_1_1 1293
-#define wxSizer_Remove_1_0 1294
-#define wxSizer_Replace_3_1 1295
-#define wxSizer_Replace_3_0 1296
-#define wxSizer_Replace_2 1297
-#define wxSizer_SetDimension 1298
-#define wxSizer_SetMinSize_2 1299
-#define wxSizer_SetMinSize_1 1300
-#define wxSizer_SetItemMinSize_3_2 1301
-#define wxSizer_SetItemMinSize_2_2 1302
-#define wxSizer_SetItemMinSize_3_1 1303
-#define wxSizer_SetItemMinSize_2_1 1304
-#define wxSizer_SetItemMinSize_3_0 1305
-#define wxSizer_SetItemMinSize_2_0 1306
-#define wxSizer_SetSizeHints 1307
-#define wxSizer_SetVirtualSizeHints 1308
-#define wxSizer_Show_2_2 1309
-#define wxSizer_Show_2_1 1310
-#define wxSizer_Show_2_0 1311
-#define wxSizer_Show_1 1312
-#define wxSizerFlags_new 1313
-#define wxSizerFlags_Align 1314
-#define wxSizerFlags_Border_2 1315
-#define wxSizerFlags_Border_1 1316
-#define wxSizerFlags_Center 1317
-#define wxSizerFlags_Centre 1318
-#define wxSizerFlags_Expand 1319
-#define wxSizerFlags_Left 1320
-#define wxSizerFlags_Proportion 1321
-#define wxSizerFlags_Right 1322
-#define wxSizerFlags_destroy 1323
-#define wxSizerItem_new_5_1 1324
-#define wxSizerItem_new_2_1 1325
-#define wxSizerItem_new_5_0 1326
-#define wxSizerItem_new_2_0 1327
-#define wxSizerItem_new_6 1328
-#define wxSizerItem_new_3 1329
-#define wxSizerItem_new_0 1330
-#define wxSizerItem_destruct 1331
-#define wxSizerItem_CalcMin 1332
-#define wxSizerItem_DeleteWindows 1333
-#define wxSizerItem_DetachSizer 1334
-#define wxSizerItem_GetBorder 1335
-#define wxSizerItem_GetFlag 1336
-#define wxSizerItem_GetMinSize 1337
-#define wxSizerItem_GetPosition 1338
-#define wxSizerItem_GetProportion 1339
-#define wxSizerItem_GetRatio 1340
-#define wxSizerItem_GetRect 1341
-#define wxSizerItem_GetSize 1342
-#define wxSizerItem_GetSizer 1343
-#define wxSizerItem_GetSpacer 1344
-#define wxSizerItem_GetUserData 1345
-#define wxSizerItem_GetWindow 1346
-#define wxSizerItem_IsSizer 1347
-#define wxSizerItem_IsShown 1348
-#define wxSizerItem_IsSpacer 1349
-#define wxSizerItem_IsWindow 1350
-#define wxSizerItem_SetBorder 1351
-#define wxSizerItem_SetDimension 1352
-#define wxSizerItem_SetFlag 1353
-#define wxSizerItem_SetInitSize 1354
-#define wxSizerItem_SetMinSize_1 1355
-#define wxSizerItem_SetMinSize_2 1356
-#define wxSizerItem_SetProportion 1357
-#define wxSizerItem_SetRatio_2 1358
-#define wxSizerItem_SetRatio_1_1 1359
-#define wxSizerItem_SetRatio_1_0 1360
-#define wxSizerItem_SetSizer 1361
-#define wxSizerItem_SetSpacer_1 1362
-#define wxSizerItem_SetSpacer_2 1363
-#define wxSizerItem_SetWindow 1364
-#define wxSizerItem_Show 1365
-#define wxBoxSizer_new 1366
-#define wxBoxSizer_GetOrientation 1367
-#define wxBoxSizer_destroy 1368
-#define wxStaticBoxSizer_new_2 1369
-#define wxStaticBoxSizer_new_3 1370
-#define wxStaticBoxSizer_GetStaticBox 1371
-#define wxStaticBoxSizer_destroy 1372
-#define wxGridSizer_new_4 1373
-#define wxGridSizer_new_2 1374
-#define wxGridSizer_GetCols 1375
-#define wxGridSizer_GetHGap 1376
-#define wxGridSizer_GetRows 1377
-#define wxGridSizer_GetVGap 1378
-#define wxGridSizer_SetCols 1379
-#define wxGridSizer_SetHGap 1380
-#define wxGridSizer_SetRows 1381
-#define wxGridSizer_SetVGap 1382
-#define wxGridSizer_destroy 1383
-#define wxFlexGridSizer_new_4 1384
-#define wxFlexGridSizer_new_2 1385
-#define wxFlexGridSizer_AddGrowableCol 1386
-#define wxFlexGridSizer_AddGrowableRow 1387
-#define wxFlexGridSizer_GetFlexibleDirection 1388
-#define wxFlexGridSizer_GetNonFlexibleGrowMode 1389
-#define wxFlexGridSizer_RemoveGrowableCol 1390
-#define wxFlexGridSizer_RemoveGrowableRow 1391
-#define wxFlexGridSizer_SetFlexibleDirection 1392
-#define wxFlexGridSizer_SetNonFlexibleGrowMode 1393
-#define wxFlexGridSizer_destroy 1394
-#define wxGridBagSizer_new 1395
-#define wxGridBagSizer_Add_3_2 1396
-#define wxGridBagSizer_Add_3_1 1397
-#define wxGridBagSizer_Add_4 1398
-#define wxGridBagSizer_Add_1_0 1399
-#define wxGridBagSizer_Add_2_1 1400
-#define wxGridBagSizer_Add_2_0 1401
-#define wxGridBagSizer_Add_3_0 1402
-#define wxGridBagSizer_Add_1_1 1403
-#define wxGridBagSizer_CalcMin 1404
-#define wxGridBagSizer_CheckForIntersection_2 1405
-#define wxGridBagSizer_CheckForIntersection_3 1406
-#define wxGridBagSizer_FindItem_1_1 1407
-#define wxGridBagSizer_FindItem_1_0 1408
-#define wxGridBagSizer_FindItemAtPoint 1409
-#define wxGridBagSizer_FindItemAtPosition 1410
-#define wxGridBagSizer_FindItemWithData 1411
-#define wxGridBagSizer_GetCellSize 1412
-#define wxGridBagSizer_GetEmptyCellSize 1413
-#define wxGridBagSizer_GetItemPosition_1_2 1414
-#define wxGridBagSizer_GetItemPosition_1_1 1415
-#define wxGridBagSizer_GetItemPosition_1_0 1416
-#define wxGridBagSizer_GetItemSpan_1_2 1417
-#define wxGridBagSizer_GetItemSpan_1_1 1418
-#define wxGridBagSizer_GetItemSpan_1_0 1419
-#define wxGridBagSizer_SetEmptyCellSize 1420
-#define wxGridBagSizer_SetItemPosition_2_2 1421
-#define wxGridBagSizer_SetItemPosition_2_1 1422
-#define wxGridBagSizer_SetItemPosition_2_0 1423
-#define wxGridBagSizer_SetItemSpan_2_2 1424
-#define wxGridBagSizer_SetItemSpan_2_1 1425
-#define wxGridBagSizer_SetItemSpan_2_0 1426
-#define wxGridBagSizer_destroy 1427
-#define wxStdDialogButtonSizer_new 1428
-#define wxStdDialogButtonSizer_AddButton 1429
-#define wxStdDialogButtonSizer_Realize 1430
-#define wxStdDialogButtonSizer_SetAffirmativeButton 1431
-#define wxStdDialogButtonSizer_SetCancelButton 1432
-#define wxStdDialogButtonSizer_SetNegativeButton 1433
-#define wxStdDialogButtonSizer_destroy 1434
-#define wxFont_new_0 1435
-#define wxFont_new_1 1436
-#define wxFont_new_5 1437
-#define wxFont_destruct 1439
-#define wxFont_IsFixedWidth 1440
-#define wxFont_GetDefaultEncoding 1441
-#define wxFont_GetFaceName 1442
-#define wxFont_GetFamily 1443
-#define wxFont_GetNativeFontInfoDesc 1444
-#define wxFont_GetNativeFontInfoUserDesc 1445
-#define wxFont_GetPointSize 1446
-#define wxFont_GetStyle 1447
-#define wxFont_GetUnderlined 1448
-#define wxFont_GetWeight 1449
-#define wxFont_Ok 1450
-#define wxFont_SetDefaultEncoding 1451
-#define wxFont_SetFaceName 1452
-#define wxFont_SetFamily 1453
-#define wxFont_SetPointSize 1454
-#define wxFont_SetStyle 1455
-#define wxFont_SetUnderlined 1456
-#define wxFont_SetWeight 1457
-#define wxToolTip_Enable 1458
-#define wxToolTip_SetDelay 1459
-#define wxToolTip_new 1460
-#define wxToolTip_SetTip 1461
-#define wxToolTip_GetTip 1462
-#define wxToolTip_GetWindow 1463
-#define wxToolTip_destroy 1464
-#define wxButton_new_3 1466
-#define wxButton_new_0 1467
-#define wxButton_destruct 1468
-#define wxButton_Create 1469
-#define wxButton_GetDefaultSize 1470
-#define wxButton_SetDefault 1471
-#define wxButton_SetLabel 1472
-#define wxBitmapButton_new_4 1474
-#define wxBitmapButton_new_0 1475
-#define wxBitmapButton_Create 1476
-#define wxBitmapButton_GetBitmapDisabled 1477
-#define wxBitmapButton_GetBitmapFocus 1479
-#define wxBitmapButton_GetBitmapLabel 1481
-#define wxBitmapButton_GetBitmapSelected 1483
-#define wxBitmapButton_SetBitmapDisabled 1485
-#define wxBitmapButton_SetBitmapFocus 1486
-#define wxBitmapButton_SetBitmapLabel 1487
-#define wxBitmapButton_SetBitmapSelected 1488
-#define wxBitmapButton_destroy 1489
-#define wxToggleButton_new_0 1490
-#define wxToggleButton_new_4 1491
-#define wxToggleButton_Create 1492
-#define wxToggleButton_GetValue 1493
-#define wxToggleButton_SetValue 1494
-#define wxToggleButton_destroy 1495
-#define wxCalendarCtrl_new_0 1496
-#define wxCalendarCtrl_new_3 1497
-#define wxCalendarCtrl_Create 1498
-#define wxCalendarCtrl_destruct 1499
-#define wxCalendarCtrl_SetDate 1500
-#define wxCalendarCtrl_GetDate 1501
-#define wxCalendarCtrl_EnableYearChange 1502
-#define wxCalendarCtrl_EnableMonthChange 1503
-#define wxCalendarCtrl_EnableHolidayDisplay 1504
-#define wxCalendarCtrl_SetHeaderColours 1505
-#define wxCalendarCtrl_GetHeaderColourFg 1506
-#define wxCalendarCtrl_GetHeaderColourBg 1507
-#define wxCalendarCtrl_SetHighlightColours 1508
-#define wxCalendarCtrl_GetHighlightColourFg 1509
-#define wxCalendarCtrl_GetHighlightColourBg 1510
-#define wxCalendarCtrl_SetHolidayColours 1511
-#define wxCalendarCtrl_GetHolidayColourFg 1512
-#define wxCalendarCtrl_GetHolidayColourBg 1513
-#define wxCalendarCtrl_GetAttr 1514
-#define wxCalendarCtrl_SetAttr 1515
-#define wxCalendarCtrl_SetHoliday 1516
-#define wxCalendarCtrl_ResetAttr 1517
-#define wxCalendarCtrl_HitTest 1518
-#define wxCalendarDateAttr_new_0 1519
-#define wxCalendarDateAttr_new_2_1 1520
-#define wxCalendarDateAttr_new_2_0 1521
-#define wxCalendarDateAttr_SetTextColour 1522
-#define wxCalendarDateAttr_SetBackgroundColour 1523
-#define wxCalendarDateAttr_SetBorderColour 1524
-#define wxCalendarDateAttr_SetFont 1525
-#define wxCalendarDateAttr_SetBorder 1526
-#define wxCalendarDateAttr_SetHoliday 1527
-#define wxCalendarDateAttr_HasTextColour 1528
-#define wxCalendarDateAttr_HasBackgroundColour 1529
-#define wxCalendarDateAttr_HasBorderColour 1530
-#define wxCalendarDateAttr_HasFont 1531
-#define wxCalendarDateAttr_HasBorder 1532
-#define wxCalendarDateAttr_IsHoliday 1533
-#define wxCalendarDateAttr_GetTextColour 1534
-#define wxCalendarDateAttr_GetBackgroundColour 1535
-#define wxCalendarDateAttr_GetBorderColour 1536
-#define wxCalendarDateAttr_GetFont 1537
-#define wxCalendarDateAttr_GetBorder 1538
-#define wxCalendarDateAttr_destroy 1539
-#define wxCheckBox_new_4 1541
-#define wxCheckBox_new_0 1542
-#define wxCheckBox_Create 1543
-#define wxCheckBox_GetValue 1544
-#define wxCheckBox_Get3StateValue 1545
-#define wxCheckBox_Is3rdStateAllowedForUser 1546
-#define wxCheckBox_Is3State 1547
-#define wxCheckBox_IsChecked 1548
-#define wxCheckBox_SetValue 1549
-#define wxCheckBox_Set3StateValue 1550
-#define wxCheckBox_destroy 1551
-#define wxCheckListBox_new_0 1552
-#define wxCheckListBox_new_3 1554
-#define wxCheckListBox_Check 1555
-#define wxCheckListBox_IsChecked 1556
-#define wxCheckListBox_destroy 1557
-#define wxChoice_new_3 1560
-#define wxChoice_new_0 1561
-#define wxChoice_destruct 1563
-#define wxChoice_Create 1565
-#define wxChoice_Delete 1566
-#define wxChoice_GetColumns 1567
-#define wxChoice_SetColumns 1568
-#define wxComboBox_new_0 1569
-#define wxComboBox_new_3 1571
-#define wxComboBox_destruct 1572
-#define wxComboBox_Create 1574
-#define wxComboBox_CanCopy 1575
-#define wxComboBox_CanCut 1576
-#define wxComboBox_CanPaste 1577
-#define wxComboBox_CanRedo 1578
-#define wxComboBox_CanUndo 1579
-#define wxComboBox_Copy 1580
-#define wxComboBox_Cut 1581
-#define wxComboBox_GetInsertionPoint 1582
-#define wxComboBox_GetLastPosition 1583
-#define wxComboBox_GetValue 1584
-#define wxComboBox_Paste 1585
-#define wxComboBox_Redo 1586
-#define wxComboBox_Replace 1587
-#define wxComboBox_Remove 1588
-#define wxComboBox_SetInsertionPoint 1589
-#define wxComboBox_SetInsertionPointEnd 1590
-#define wxComboBox_SetSelection_1 1591
-#define wxComboBox_SetSelection_2 1592
-#define wxComboBox_SetValue 1593
-#define wxComboBox_Undo 1594
-#define wxGauge_new_0 1595
-#define wxGauge_new_4 1596
-#define wxGauge_Create 1597
-#define wxGauge_GetBezelFace 1598
-#define wxGauge_GetRange 1599
-#define wxGauge_GetShadowWidth 1600
-#define wxGauge_GetValue 1601
-#define wxGauge_IsVertical 1602
-#define wxGauge_SetBezelFace 1603
-#define wxGauge_SetRange 1604
-#define wxGauge_SetShadowWidth 1605
-#define wxGauge_SetValue 1606
-#define wxGauge_Pulse 1607
-#define wxGauge_destroy 1608
-#define wxGenericDirCtrl_new_0 1609
-#define wxGenericDirCtrl_new_2 1610
-#define wxGenericDirCtrl_destruct 1611
-#define wxGenericDirCtrl_Create 1612
-#define wxGenericDirCtrl_Init 1613
-#define wxGenericDirCtrl_CollapseTree 1614
-#define wxGenericDirCtrl_ExpandPath 1615
-#define wxGenericDirCtrl_GetDefaultPath 1616
-#define wxGenericDirCtrl_GetPath 1617
-#define wxGenericDirCtrl_GetFilePath 1618
-#define wxGenericDirCtrl_GetFilter 1619
-#define wxGenericDirCtrl_GetFilterIndex 1620
-#define wxGenericDirCtrl_GetRootId 1621
-#define wxGenericDirCtrl_GetTreeCtrl 1622
-#define wxGenericDirCtrl_ReCreateTree 1623
-#define wxGenericDirCtrl_SetDefaultPath 1624
-#define wxGenericDirCtrl_SetFilter 1625
-#define wxGenericDirCtrl_SetFilterIndex 1626
-#define wxGenericDirCtrl_SetPath 1627
-#define wxStaticBox_new_4 1629
-#define wxStaticBox_new_0 1630
-#define wxStaticBox_Create 1631
-#define wxStaticBox_destroy 1632
-#define wxStaticLine_new_2 1634
-#define wxStaticLine_new_0 1635
-#define wxStaticLine_Create 1636
-#define wxStaticLine_IsVertical 1637
-#define wxStaticLine_GetDefaultSize 1638
-#define wxStaticLine_destroy 1639
-#define wxListBox_new_3 1642
-#define wxListBox_new_0 1643
-#define wxListBox_destruct 1645
-#define wxListBox_Create 1647
-#define wxListBox_Deselect 1648
-#define wxListBox_GetSelections 1649
-#define wxListBox_InsertItems 1650
-#define wxListBox_IsSelected 1651
+#define wxPanel_SetFocusIgnoringChildren 337
+#define wxScrolledWindow_new_0 338
+#define wxScrolledWindow_new_2 339
+#define wxScrolledWindow_destruct 340
+#define wxScrolledWindow_CalcScrolledPosition_4 341
+#define wxScrolledWindow_CalcScrolledPosition_1 342
+#define wxScrolledWindow_CalcUnscrolledPosition_4 343
+#define wxScrolledWindow_CalcUnscrolledPosition_1 344
+#define wxScrolledWindow_EnableScrolling 345
+#define wxScrolledWindow_GetScrollPixelsPerUnit 346
+#define wxScrolledWindow_GetViewStart 347
+#define wxScrolledWindow_DoPrepareDC 348
+#define wxScrolledWindow_PrepareDC 349
+#define wxScrolledWindow_Scroll 350
+#define wxScrolledWindow_SetScrollbars 351
+#define wxScrolledWindow_SetScrollRate 352
+#define wxScrolledWindow_SetTargetWindow 353
+#define wxSashWindow_new_0 354
+#define wxSashWindow_new_2 355
+#define wxSashWindow_destruct 356
+#define wxSashWindow_GetSashVisible 357
+#define wxSashWindow_GetMaximumSizeX 358
+#define wxSashWindow_GetMaximumSizeY 359
+#define wxSashWindow_GetMinimumSizeX 360
+#define wxSashWindow_GetMinimumSizeY 361
+#define wxSashWindow_SetMaximumSizeX 362
+#define wxSashWindow_SetMaximumSizeY 363
+#define wxSashWindow_SetMinimumSizeX 364
+#define wxSashWindow_SetMinimumSizeY 365
+#define wxSashWindow_SetSashVisible 366
+#define wxSashLayoutWindow_new_0 367
+#define wxSashLayoutWindow_new_2 368
+#define wxSashLayoutWindow_Create 369
+#define wxSashLayoutWindow_GetAlignment 370
+#define wxSashLayoutWindow_GetOrientation 371
+#define wxSashLayoutWindow_SetAlignment 372
+#define wxSashLayoutWindow_SetDefaultSize 373
+#define wxSashLayoutWindow_SetOrientation 374
+#define wxSashLayoutWindow_destroy 375
+#define wxGrid_new_0 376
+#define wxGrid_new_3 377
+#define wxGrid_new_4 378
+#define wxGrid_destruct 379
+#define wxGrid_AppendCols 380
+#define wxGrid_AppendRows 381
+#define wxGrid_AutoSize 382
+#define wxGrid_AutoSizeColumn 383
+#define wxGrid_AutoSizeColumns 384
+#define wxGrid_AutoSizeRow 385
+#define wxGrid_AutoSizeRows 386
+#define wxGrid_BeginBatch 387
+#define wxGrid_BlockToDeviceRect 388
+#define wxGrid_CanDragColSize 389
+#define wxGrid_CanDragRowSize 390
+#define wxGrid_CanDragGridSize 391
+#define wxGrid_CanEnableCellControl 392
+#define wxGrid_CellToRect_2 393
+#define wxGrid_CellToRect_1 394
+#define wxGrid_ClearGrid 395
+#define wxGrid_ClearSelection 396
+#define wxGrid_CreateGrid 397
+#define wxGrid_DeleteCols 398
+#define wxGrid_DeleteRows 399
+#define wxGrid_DisableCellEditControl 400
+#define wxGrid_DisableDragColSize 401
+#define wxGrid_DisableDragGridSize 402
+#define wxGrid_DisableDragRowSize 403
+#define wxGrid_EnableCellEditControl 404
+#define wxGrid_EnableDragColSize 405
+#define wxGrid_EnableDragGridSize 406
+#define wxGrid_EnableDragRowSize 407
+#define wxGrid_EnableEditing 408
+#define wxGrid_EnableGridLines 409
+#define wxGrid_EndBatch 410
+#define wxGrid_Fit 411
+#define wxGrid_ForceRefresh 412
+#define wxGrid_GetBatchCount 413
+#define wxGrid_GetCellAlignment 414
+#define wxGrid_GetCellBackgroundColour 415
+#define wxGrid_GetCellEditor 416
+#define wxGrid_GetCellFont 417
+#define wxGrid_GetCellRenderer 418
+#define wxGrid_GetCellTextColour 419
+#define wxGrid_GetCellValue_2 420
+#define wxGrid_GetCellValue_1 421
+#define wxGrid_GetColLabelAlignment 422
+#define wxGrid_GetColLabelSize 423
+#define wxGrid_GetColLabelValue 424
+#define wxGrid_GetColMinimalAcceptableWidth 425
+#define wxGrid_GetDefaultCellAlignment 426
+#define wxGrid_GetDefaultCellBackgroundColour 427
+#define wxGrid_GetDefaultCellFont 428
+#define wxGrid_GetDefaultCellTextColour 429
+#define wxGrid_GetDefaultColLabelSize 430
+#define wxGrid_GetDefaultColSize 431
+#define wxGrid_GetDefaultEditor 432
+#define wxGrid_GetDefaultEditorForCell_2 433
+#define wxGrid_GetDefaultEditorForCell_1 434
+#define wxGrid_GetDefaultEditorForType 435
+#define wxGrid_GetDefaultRenderer 436
+#define wxGrid_GetDefaultRendererForCell 437
+#define wxGrid_GetDefaultRendererForType 438
+#define wxGrid_GetDefaultRowLabelSize 439
+#define wxGrid_GetDefaultRowSize 440
+#define wxGrid_GetGridCursorCol 441
+#define wxGrid_GetGridCursorRow 442
+#define wxGrid_GetGridLineColour 443
+#define wxGrid_GridLinesEnabled 444
+#define wxGrid_GetLabelBackgroundColour 445
+#define wxGrid_GetLabelFont 446
+#define wxGrid_GetLabelTextColour 447
+#define wxGrid_GetNumberCols 448
+#define wxGrid_GetNumberRows 449
+#define wxGrid_GetOrCreateCellAttr 450
+#define wxGrid_GetRowMinimalAcceptableHeight 451
+#define wxGrid_GetRowLabelAlignment 452
+#define wxGrid_GetRowLabelSize 453
+#define wxGrid_GetRowLabelValue 454
+#define wxGrid_GetRowSize 455
+#define wxGrid_GetScrollLineX 456
+#define wxGrid_GetScrollLineY 457
+#define wxGrid_GetSelectedCells 458
+#define wxGrid_GetSelectedCols 459
+#define wxGrid_GetSelectedRows 460
+#define wxGrid_GetSelectionBackground 461
+#define wxGrid_GetSelectionBlockTopLeft 462
+#define wxGrid_GetSelectionBlockBottomRight 463
+#define wxGrid_GetSelectionForeground 464
+#define wxGrid_GetViewWidth 465
+#define wxGrid_GetGridWindow 466
+#define wxGrid_GetGridRowLabelWindow 467
+#define wxGrid_GetGridColLabelWindow 468
+#define wxGrid_GetGridCornerLabelWindow 469
+#define wxGrid_HideCellEditControl 470
+#define wxGrid_InsertCols 471
+#define wxGrid_InsertRows 472
+#define wxGrid_IsCellEditControlEnabled 473
+#define wxGrid_IsCurrentCellReadOnly 474
+#define wxGrid_IsEditable 475
+#define wxGrid_IsInSelection_2 476
+#define wxGrid_IsInSelection_1 477
+#define wxGrid_IsReadOnly 478
+#define wxGrid_IsSelection 479
+#define wxGrid_IsVisible_3 480
+#define wxGrid_IsVisible_2 481
+#define wxGrid_MakeCellVisible_2 482
+#define wxGrid_MakeCellVisible_1 483
+#define wxGrid_MoveCursorDown 484
+#define wxGrid_MoveCursorLeft 485
+#define wxGrid_MoveCursorRight 486
+#define wxGrid_MoveCursorUp 487
+#define wxGrid_MoveCursorDownBlock 488
+#define wxGrid_MoveCursorLeftBlock 489
+#define wxGrid_MoveCursorRightBlock 490
+#define wxGrid_MoveCursorUpBlock 491
+#define wxGrid_MovePageDown 492
+#define wxGrid_MovePageUp 493
+#define wxGrid_RegisterDataType 494
+#define wxGrid_SaveEditControlValue 495
+#define wxGrid_SelectAll 496
+#define wxGrid_SelectBlock_5 497
+#define wxGrid_SelectBlock_3 498
+#define wxGrid_SelectCol 499
+#define wxGrid_SelectRow 500
+#define wxGrid_SetCellAlignment_4 501
+#define wxGrid_SetCellAlignment_3 502
+#define wxGrid_SetCellAlignment_1 503
+#define wxGrid_SetCellBackgroundColour_3_0 504
+#define wxGrid_SetCellBackgroundColour_1 505
+#define wxGrid_SetCellBackgroundColour_3_1 506
+#define wxGrid_SetCellEditor 507
+#define wxGrid_SetCellFont 508
+#define wxGrid_SetCellRenderer 509
+#define wxGrid_SetCellTextColour_3_0 510
+#define wxGrid_SetCellTextColour_3_1 511
+#define wxGrid_SetCellTextColour_1 512
+#define wxGrid_SetCellValue_3_0 513
+#define wxGrid_SetCellValue_2 514
+#define wxGrid_SetCellValue_3_1 515
+#define wxGrid_SetColAttr 516
+#define wxGrid_SetColFormatBool 517
+#define wxGrid_SetColFormatNumber 518
+#define wxGrid_SetColFormatFloat 519
+#define wxGrid_SetColFormatCustom 520
+#define wxGrid_SetColLabelAlignment 521
+#define wxGrid_SetColLabelSize 522
+#define wxGrid_SetColLabelValue 523
+#define wxGrid_SetColMinimalWidth 524
+#define wxGrid_SetColMinimalAcceptableWidth 525
+#define wxGrid_SetColSize 526
+#define wxGrid_SetDefaultCellAlignment 527
+#define wxGrid_SetDefaultCellBackgroundColour 528
+#define wxGrid_SetDefaultCellFont 529
+#define wxGrid_SetDefaultCellTextColour 530
+#define wxGrid_SetDefaultEditor 531
+#define wxGrid_SetDefaultRenderer 532
+#define wxGrid_SetDefaultColSize 533
+#define wxGrid_SetDefaultRowSize 534
+#define wxGrid_SetGridCursor 535
+#define wxGrid_SetGridLineColour 536
+#define wxGrid_SetLabelBackgroundColour 537
+#define wxGrid_SetLabelFont 538
+#define wxGrid_SetLabelTextColour 539
+#define wxGrid_SetMargins 540
+#define wxGrid_SetReadOnly 541
+#define wxGrid_SetRowAttr 542
+#define wxGrid_SetRowLabelAlignment 543
+#define wxGrid_SetRowLabelSize 544
+#define wxGrid_SetRowLabelValue 545
+#define wxGrid_SetRowMinimalHeight 546
+#define wxGrid_SetRowMinimalAcceptableHeight 547
+#define wxGrid_SetRowSize 548
+#define wxGrid_SetScrollLineX 549
+#define wxGrid_SetScrollLineY 550
+#define wxGrid_SetSelectionBackground 551
+#define wxGrid_SetSelectionForeground 552
+#define wxGrid_SetSelectionMode 553
+#define wxGrid_ShowCellEditControl 554
+#define wxGrid_XToCol 555
+#define wxGrid_XToEdgeOfCol 556
+#define wxGrid_YToEdgeOfRow 557
+#define wxGrid_YToRow 558
+#define wxGridCellRenderer_Draw 559
+#define wxGridCellRenderer_GetBestSize 560
+#define wxGridCellEditor_Create 561
+#define wxGridCellEditor_IsCreated 562
+#define wxGridCellEditor_SetSize 563
+#define wxGridCellEditor_Show 564
+#define wxGridCellEditor_PaintBackground 565
+#define wxGridCellEditor_BeginEdit 566
+#define wxGridCellEditor_EndEdit 567
+#define wxGridCellEditor_Reset 568
+#define wxGridCellEditor_StartingKey 569
+#define wxGridCellEditor_StartingClick 570
+#define wxGridCellEditor_HandleReturn 571
+#define wxGridCellBoolRenderer_new 572
+#define wxGridCellBoolRenderer_destroy 573
+#define wxGridCellBoolEditor_new 574
+#define wxGridCellBoolEditor_IsTrueValue 575
+#define wxGridCellBoolEditor_UseStringValues 576
+#define wxGridCellBoolEditor_destroy 577
+#define wxGridCellFloatRenderer_new 578
+#define wxGridCellFloatRenderer_GetPrecision 579
+#define wxGridCellFloatRenderer_GetWidth 580
+#define wxGridCellFloatRenderer_SetParameters 581
+#define wxGridCellFloatRenderer_SetPrecision 582
+#define wxGridCellFloatRenderer_SetWidth 583
+#define wxGridCellFloatRenderer_destroy 584
+#define wxGridCellFloatEditor_new 585
+#define wxGridCellFloatEditor_SetParameters 586
+#define wxGridCellFloatEditor_destroy 587
+#define wxGridCellStringRenderer_new 588
+#define wxGridCellStringRenderer_destroy 589
+#define wxGridCellTextEditor_new 590
+#define wxGridCellTextEditor_SetParameters 591
+#define wxGridCellTextEditor_destroy 592
+#define wxGridCellChoiceEditor_new 594
+#define wxGridCellChoiceEditor_SetParameters 595
+#define wxGridCellChoiceEditor_destroy 596
+#define wxGridCellNumberRenderer_new 597
+#define wxGridCellNumberRenderer_destroy 598
+#define wxGridCellNumberEditor_new 599
+#define wxGridCellNumberEditor_GetValue 600
+#define wxGridCellNumberEditor_SetParameters 601
+#define wxGridCellNumberEditor_destroy 602
+#define wxGridCellAttr_SetTextColour 603
+#define wxGridCellAttr_SetBackgroundColour 604
+#define wxGridCellAttr_SetFont 605
+#define wxGridCellAttr_SetAlignment 606
+#define wxGridCellAttr_SetReadOnly 607
+#define wxGridCellAttr_SetRenderer 608
+#define wxGridCellAttr_SetEditor 609
+#define wxGridCellAttr_HasTextColour 610
+#define wxGridCellAttr_HasBackgroundColour 611
+#define wxGridCellAttr_HasFont 612
+#define wxGridCellAttr_HasAlignment 613
+#define wxGridCellAttr_HasRenderer 614
+#define wxGridCellAttr_HasEditor 615
+#define wxGridCellAttr_GetTextColour 616
+#define wxGridCellAttr_GetBackgroundColour 617
+#define wxGridCellAttr_GetFont 618
+#define wxGridCellAttr_GetAlignment 619
+#define wxGridCellAttr_GetRenderer 620
+#define wxGridCellAttr_GetEditor 621
+#define wxGridCellAttr_IsReadOnly 622
+#define wxGridCellAttr_SetDefAttr 623
+#define wxDC_Blit 624
+#define wxDC_CalcBoundingBox 625
+#define wxDC_Clear 626
+#define wxDC_ComputeScaleAndOrigin 627
+#define wxDC_CrossHair 628
+#define wxDC_DestroyClippingRegion 629
+#define wxDC_DeviceToLogicalX 630
+#define wxDC_DeviceToLogicalXRel 631
+#define wxDC_DeviceToLogicalY 632
+#define wxDC_DeviceToLogicalYRel 633
+#define wxDC_DrawArc 634
+#define wxDC_DrawBitmap 635
+#define wxDC_DrawCheckMark 636
+#define wxDC_DrawCircle 637
+#define wxDC_DrawEllipse_2 639
+#define wxDC_DrawEllipse_1 640
+#define wxDC_DrawEllipticArc 641
+#define wxDC_DrawIcon 642
+#define wxDC_DrawLabel 643
+#define wxDC_DrawLine 644
+#define wxDC_DrawLines 645
+#define wxDC_DrawPolygon 647
+#define wxDC_DrawPoint 649
+#define wxDC_DrawRectangle_2 651
+#define wxDC_DrawRectangle_1 652
+#define wxDC_DrawRotatedText 653
+#define wxDC_DrawRoundedRectangle_3 655
+#define wxDC_DrawRoundedRectangle_2 656
+#define wxDC_DrawText 657
+#define wxDC_EndDoc 658
+#define wxDC_EndPage 659
+#define wxDC_FloodFill 660
+#define wxDC_GetBackground 661
+#define wxDC_GetBackgroundMode 662
+#define wxDC_GetBrush 663
+#define wxDC_GetCharHeight 664
+#define wxDC_GetCharWidth 665
+#define wxDC_GetClippingBox 666
+#define wxDC_GetFont 668
+#define wxDC_GetLayoutDirection 669
+#define wxDC_GetLogicalFunction 670
+#define wxDC_GetMapMode 671
+#define wxDC_GetMultiLineTextExtent_4 672
+#define wxDC_GetMultiLineTextExtent_1 673
+#define wxDC_GetPartialTextExtents 674
+#define wxDC_GetPen 675
+#define wxDC_GetPixel 676
+#define wxDC_GetPPI 677
+#define wxDC_GetSize 679
+#define wxDC_GetSizeMM 681
+#define wxDC_GetTextBackground 682
+#define wxDC_GetTextExtent_4 683
+#define wxDC_GetTextExtent_1 684
+#define wxDC_GetTextForeground 686
+#define wxDC_GetUserScale 687
+#define wxDC_GradientFillConcentric_3 688
+#define wxDC_GradientFillConcentric_4 689
+#define wxDC_GradientFillLinear 690
+#define wxDC_LogicalToDeviceX 691
+#define wxDC_LogicalToDeviceXRel 692
+#define wxDC_LogicalToDeviceY 693
+#define wxDC_LogicalToDeviceYRel 694
+#define wxDC_MaxX 695
+#define wxDC_MaxY 696
+#define wxDC_MinX 697
+#define wxDC_MinY 698
+#define wxDC_IsOk 699
+#define wxDC_ResetBoundingBox 700
+#define wxDC_SetAxisOrientation 701
+#define wxDC_SetBackground 702
+#define wxDC_SetBackgroundMode 703
+#define wxDC_SetBrush 704
+#define wxDC_SetClippingRegion_2 706
+#define wxDC_SetClippingRegion_1_1 707
+#define wxDC_SetClippingRegion_1_0 708
+#define wxDC_SetDeviceOrigin 709
+#define wxDC_SetFont 710
+#define wxDC_SetLayoutDirection 711
+#define wxDC_SetLogicalFunction 712
+#define wxDC_SetMapMode 713
+#define wxDC_SetPalette 714
+#define wxDC_SetPen 715
+#define wxDC_SetTextBackground 716
+#define wxDC_SetTextForeground 717
+#define wxDC_SetUserScale 718
+#define wxDC_StartDoc 719
+#define wxDC_StartPage 720
+#define wxMirrorDC_new 721
+#define wxMirrorDC_destroy 722
+#define wxScreenDC_new 723
+#define wxScreenDC_destruct 724
+#define wxPostScriptDC_new_0 725
+#define wxPostScriptDC_new_1 726
+#define wxPostScriptDC_destruct 727
+#define wxPostScriptDC_SetResolution 728
+#define wxPostScriptDC_GetResolution 729
+#define wxWindowDC_new_0 730
+#define wxWindowDC_new_1 731
+#define wxWindowDC_destruct 732
+#define wxClientDC_new_0 733
+#define wxClientDC_new_1 734
+#define wxClientDC_destroy 735
+#define wxPaintDC_new_0 736
+#define wxPaintDC_new_1 737
+#define wxPaintDC_destroy 738
+#define wxMemoryDC_new_1_0 740
+#define wxMemoryDC_new_1_1 741
+#define wxMemoryDC_new_0 742
+#define wxMemoryDC_destruct 744
+#define wxMemoryDC_SelectObject 745
+#define wxMemoryDC_SelectObjectAsSource 746
+#define wxBufferedDC_new_0 747
+#define wxBufferedDC_new_2 748
+#define wxBufferedDC_new_3 749
+#define wxBufferedDC_destruct 750
+#define wxBufferedDC_Init_2 751
+#define wxBufferedDC_Init_3 752
+#define wxBufferedPaintDC_new_3 753
+#define wxBufferedPaintDC_new_2 754
+#define wxBufferedPaintDC_destruct 755
+#define wxGraphicsObject_destruct 756
+#define wxGraphicsObject_GetRenderer 757
+#define wxGraphicsObject_IsNull 758
+#define wxGraphicsContext_destruct 759
+#define wxGraphicsContext_Create_1_1 760
+#define wxGraphicsContext_Create_1_0 761
+#define wxGraphicsContext_Create_0 762
+#define wxGraphicsContext_CreatePen 763
+#define wxGraphicsContext_CreateBrush 764
+#define wxGraphicsContext_CreateRadialGradientBrush 765
+#define wxGraphicsContext_CreateLinearGradientBrush 766
+#define wxGraphicsContext_CreateFont 767
+#define wxGraphicsContext_CreateMatrix 768
+#define wxGraphicsContext_CreatePath 769
+#define wxGraphicsContext_Clip_1 770
+#define wxGraphicsContext_Clip_4 771
+#define wxGraphicsContext_ResetClip 772
+#define wxGraphicsContext_DrawBitmap 773
+#define wxGraphicsContext_DrawEllipse 774
+#define wxGraphicsContext_DrawIcon 775
+#define wxGraphicsContext_DrawLines 776
+#define wxGraphicsContext_DrawPath 777
+#define wxGraphicsContext_DrawRectangle 778
+#define wxGraphicsContext_DrawRoundedRectangle 779
+#define wxGraphicsContext_DrawText_3 780
+#define wxGraphicsContext_DrawText_4_0 781
+#define wxGraphicsContext_DrawText_4_1 782
+#define wxGraphicsContext_DrawText_5 783
+#define wxGraphicsContext_FillPath 784
+#define wxGraphicsContext_StrokePath 785
+#define wxGraphicsContext_GetPartialTextExtents 786
+#define wxGraphicsContext_GetTextExtent 787
+#define wxGraphicsContext_Rotate 788
+#define wxGraphicsContext_Scale 789
+#define wxGraphicsContext_Translate 790
+#define wxGraphicsContext_GetTransform 791
+#define wxGraphicsContext_SetTransform 792
+#define wxGraphicsContext_ConcatTransform 793
+#define wxGraphicsContext_SetBrush_1_1 794
+#define wxGraphicsContext_SetBrush_1_0 795
+#define wxGraphicsContext_SetFont_1 796
+#define wxGraphicsContext_SetFont_2 797
+#define wxGraphicsContext_SetPen_1_0 798
+#define wxGraphicsContext_SetPen_1_1 799
+#define wxGraphicsContext_StrokeLine 800
+#define wxGraphicsContext_StrokeLines 801
+#define wxGraphicsMatrix_Concat 803
+#define wxGraphicsMatrix_Get 805
+#define wxGraphicsMatrix_Invert 806
+#define wxGraphicsMatrix_IsEqual 807
+#define wxGraphicsMatrix_IsIdentity 809
+#define wxGraphicsMatrix_Rotate 810
+#define wxGraphicsMatrix_Scale 811
+#define wxGraphicsMatrix_Translate 812
+#define wxGraphicsMatrix_Set 813
+#define wxGraphicsMatrix_TransformPoint 814
+#define wxGraphicsMatrix_TransformDistance 815
+#define wxGraphicsPath_MoveToPoint_2 816
+#define wxGraphicsPath_MoveToPoint_1 817
+#define wxGraphicsPath_AddArc_6 818
+#define wxGraphicsPath_AddArc_5 819
+#define wxGraphicsPath_AddArcToPoint 820
+#define wxGraphicsPath_AddCircle 821
+#define wxGraphicsPath_AddCurveToPoint_6 822
+#define wxGraphicsPath_AddCurveToPoint_3 823
+#define wxGraphicsPath_AddEllipse 824
+#define wxGraphicsPath_AddLineToPoint_2 825
+#define wxGraphicsPath_AddLineToPoint_1 826
+#define wxGraphicsPath_AddPath 827
+#define wxGraphicsPath_AddQuadCurveToPoint 828
+#define wxGraphicsPath_AddRectangle 829
+#define wxGraphicsPath_AddRoundedRectangle 830
+#define wxGraphicsPath_CloseSubpath 831
+#define wxGraphicsPath_Contains_3 832
+#define wxGraphicsPath_Contains_2 833
+#define wxGraphicsPath_GetBox 835
+#define wxGraphicsPath_GetCurrentPoint 837
+#define wxGraphicsPath_Transform 838
+#define wxGraphicsRenderer_GetDefaultRenderer 839
+#define wxGraphicsRenderer_CreateContext_1_1 840
+#define wxGraphicsRenderer_CreateContext_1_0 841
+#define wxGraphicsRenderer_CreatePen 842
+#define wxGraphicsRenderer_CreateBrush 843
+#define wxGraphicsRenderer_CreateLinearGradientBrush 844
+#define wxGraphicsRenderer_CreateRadialGradientBrush 845
+#define wxGraphicsRenderer_CreateFont 846
+#define wxGraphicsRenderer_CreateMatrix 847
+#define wxGraphicsRenderer_CreatePath 848
+#define wxMenuBar_new_1 850
+#define wxMenuBar_new_0 852
+#define wxMenuBar_destruct 854
+#define wxMenuBar_Append 855
+#define wxMenuBar_Check 856
+#define wxMenuBar_Enable_2 857
+#define wxMenuBar_Enable_1 858
+#define wxMenuBar_EnableTop 859
+#define wxMenuBar_FindMenu 860
+#define wxMenuBar_FindMenuItem 861
+#define wxMenuBar_FindItem 862
+#define wxMenuBar_GetHelpString 863
+#define wxMenuBar_GetLabel_1 864
+#define wxMenuBar_GetLabel_0 865
+#define wxMenuBar_GetLabelTop 866
+#define wxMenuBar_GetMenu 867
+#define wxMenuBar_GetMenuCount 868
+#define wxMenuBar_Insert 869
+#define wxMenuBar_IsChecked 870
+#define wxMenuBar_IsEnabled_1 871
+#define wxMenuBar_IsEnabled_0 872
+#define wxMenuBar_Remove 873
+#define wxMenuBar_Replace 874
+#define wxMenuBar_SetHelpString 875
+#define wxMenuBar_SetLabel_2 876
+#define wxMenuBar_SetLabel_1 877
+#define wxMenuBar_SetLabelTop 878
+#define wxControl_GetLabel 879
+#define wxControl_SetLabel 880
+#define wxControlWithItems_Append_1 881
+#define wxControlWithItems_Append_2 882
+#define wxControlWithItems_appendStrings_1 883
+#define wxControlWithItems_Clear 884
+#define wxControlWithItems_Delete 885
+#define wxControlWithItems_FindString 886
+#define wxControlWithItems_getClientData 887
+#define wxControlWithItems_setClientData 888
+#define wxControlWithItems_GetCount 889
+#define wxControlWithItems_GetSelection 890
+#define wxControlWithItems_GetString 891
+#define wxControlWithItems_GetStringSelection 892
+#define wxControlWithItems_Insert_2 893
+#define wxControlWithItems_Insert_3 894
+#define wxControlWithItems_IsEmpty 895
+#define wxControlWithItems_Select 896
+#define wxControlWithItems_SetSelection 897
+#define wxControlWithItems_SetString 898
+#define wxControlWithItems_SetStringSelection 899
+#define wxMenu_new_2 902
+#define wxMenu_new_1 903
+#define wxMenu_destruct 905
+#define wxMenu_Append_3 906
+#define wxMenu_Append_1 907
+#define wxMenu_Append_4_0 908
+#define wxMenu_Append_4_1 909
+#define wxMenu_AppendCheckItem 910
+#define wxMenu_AppendRadioItem 911
+#define wxMenu_AppendSeparator 912
+#define wxMenu_Break 913
+#define wxMenu_Check 914
+#define wxMenu_Delete_1_0 915
+#define wxMenu_Delete_1_1 916
+#define wxMenu_Destroy_1_0 917
+#define wxMenu_Destroy_1_1 918
+#define wxMenu_Enable 919
+#define wxMenu_FindItem_1 920
+#define wxMenu_FindItem_2 921
+#define wxMenu_FindItemByPosition 922
+#define wxMenu_GetHelpString 923
+#define wxMenu_GetLabel 924
+#define wxMenu_GetMenuItemCount 925
+#define wxMenu_GetMenuItems 926
+#define wxMenu_GetTitle 928
+#define wxMenu_Insert_2 929
+#define wxMenu_Insert_3 930
+#define wxMenu_Insert_5_1 931
+#define wxMenu_Insert_5_0 932
+#define wxMenu_InsertCheckItem 933
+#define wxMenu_InsertRadioItem 934
+#define wxMenu_InsertSeparator 935
+#define wxMenu_IsChecked 936
+#define wxMenu_IsEnabled 937
+#define wxMenu_Prepend_1 938
+#define wxMenu_Prepend_2 939
+#define wxMenu_Prepend_4_1 940
+#define wxMenu_Prepend_4_0 941
+#define wxMenu_PrependCheckItem 942
+#define wxMenu_PrependRadioItem 943
+#define wxMenu_PrependSeparator 944
+#define wxMenu_Remove_1_0 945
+#define wxMenu_Remove_1_1 946
+#define wxMenu_SetHelpString 947
+#define wxMenu_SetLabel 948
+#define wxMenu_SetTitle 949
+#define wxMenuItem_new 950
+#define wxMenuItem_destruct 952
+#define wxMenuItem_Check 953
+#define wxMenuItem_Enable 954
+#define wxMenuItem_GetBitmap 955
+#define wxMenuItem_GetHelp 956
+#define wxMenuItem_GetId 957
+#define wxMenuItem_GetKind 958
+#define wxMenuItem_GetLabel 959
+#define wxMenuItem_GetLabelFromText 960
+#define wxMenuItem_GetMenu 961
+#define wxMenuItem_GetText 962
+#define wxMenuItem_GetSubMenu 963
+#define wxMenuItem_IsCheckable 964
+#define wxMenuItem_IsChecked 965
+#define wxMenuItem_IsEnabled 966
+#define wxMenuItem_IsSeparator 967
+#define wxMenuItem_IsSubMenu 968
+#define wxMenuItem_SetBitmap 969
+#define wxMenuItem_SetHelp 970
+#define wxMenuItem_SetMenu 971
+#define wxMenuItem_SetSubMenu 972
+#define wxMenuItem_SetText 973
+#define wxToolBar_AddControl 974
+#define wxToolBar_AddSeparator 975
+#define wxToolBar_AddTool_5 976
+#define wxToolBar_AddTool_4_0 977
+#define wxToolBar_AddTool_1 978
+#define wxToolBar_AddTool_4_1 979
+#define wxToolBar_AddTool_3 980
+#define wxToolBar_AddTool_6 981
+#define wxToolBar_AddCheckTool 982
+#define wxToolBar_AddRadioTool 983
+#define wxToolBar_DeleteTool 984
+#define wxToolBar_DeleteToolByPos 985
+#define wxToolBar_EnableTool 986
+#define wxToolBar_FindById 987
+#define wxToolBar_FindControl 988
+#define wxToolBar_FindToolForPosition 989
+#define wxToolBar_GetToolSize 990
+#define wxToolBar_GetToolBitmapSize 991
+#define wxToolBar_GetMargins 992
+#define wxToolBar_GetToolEnabled 993
+#define wxToolBar_GetToolLongHelp 994
+#define wxToolBar_GetToolPacking 995
+#define wxToolBar_GetToolPos 996
+#define wxToolBar_GetToolSeparation 997
+#define wxToolBar_GetToolShortHelp 998
+#define wxToolBar_GetToolState 999
+#define wxToolBar_InsertControl 1000
+#define wxToolBar_InsertSeparator 1001
+#define wxToolBar_InsertTool_5 1002
+#define wxToolBar_InsertTool_2 1003
+#define wxToolBar_InsertTool_4 1004
+#define wxToolBar_Realize 1005
+#define wxToolBar_RemoveTool 1006
+#define wxToolBar_SetMargins 1007
+#define wxToolBar_SetToolBitmapSize 1008
+#define wxToolBar_SetToolLongHelp 1009
+#define wxToolBar_SetToolPacking 1010
+#define wxToolBar_SetToolShortHelp 1011
+#define wxToolBar_SetToolSeparation 1012
+#define wxToolBar_ToggleTool 1013
+#define wxStatusBar_new_0 1015
+#define wxStatusBar_new_2 1016
+#define wxStatusBar_destruct 1018
+#define wxStatusBar_Create 1019
+#define wxStatusBar_GetFieldRect 1020
+#define wxStatusBar_GetFieldsCount 1021
+#define wxStatusBar_GetStatusText 1022
+#define wxStatusBar_PopStatusText 1023
+#define wxStatusBar_PushStatusText 1024
+#define wxStatusBar_SetFieldsCount 1025
+#define wxStatusBar_SetMinHeight 1026
+#define wxStatusBar_SetStatusText 1027
+#define wxStatusBar_SetStatusWidths 1028
+#define wxStatusBar_SetStatusStyles 1029
+#define wxBitmap_new_0 1030
+#define wxBitmap_new_3 1031
+#define wxBitmap_new_4 1032
+#define wxBitmap_new_2_0 1033
+#define wxBitmap_new_2_1 1034
+#define wxBitmap_destruct 1035
+#define wxBitmap_ConvertToImage 1036
+#define wxBitmap_CopyFromIcon 1037
+#define wxBitmap_Create 1038
+#define wxBitmap_GetDepth 1039
+#define wxBitmap_GetHeight 1040
+#define wxBitmap_GetPalette 1041
+#define wxBitmap_GetMask 1042
+#define wxBitmap_GetWidth 1043
+#define wxBitmap_GetSubBitmap 1044
+#define wxBitmap_LoadFile 1045
+#define wxBitmap_Ok 1046
+#define wxBitmap_SaveFile 1047
+#define wxBitmap_SetDepth 1048
+#define wxBitmap_SetHeight 1049
+#define wxBitmap_SetMask 1050
+#define wxBitmap_SetPalette 1051
+#define wxBitmap_SetWidth 1052
+#define wxIcon_new_0 1053
+#define wxIcon_new_2 1054
+#define wxIcon_new_1 1055
+#define wxIcon_CopyFromBitmap 1056
+#define wxIcon_destroy 1057
+#define wxIconBundle_new_0 1058
+#define wxIconBundle_new_2 1059
+#define wxIconBundle_new_1_0 1060
+#define wxIconBundle_new_1_1 1061
+#define wxIconBundle_destruct 1062
+#define wxIconBundle_AddIcon_2 1063
+#define wxIconBundle_AddIcon_1 1064
+#define wxIconBundle_GetIcon_1_1 1065
+#define wxIconBundle_GetIcon_1_0 1066
+#define wxCursor_new_0 1067
+#define wxCursor_new_1_0 1068
+#define wxCursor_new_1_1 1069
+#define wxCursor_new_4 1070
+#define wxCursor_destruct 1071
+#define wxCursor_Ok 1072
+#define wxMask_new_0 1073
+#define wxMask_new_2_1 1074
+#define wxMask_new_2_0 1075
+#define wxMask_new_1 1076
+#define wxMask_destruct 1077
+#define wxMask_Create_2_1 1078
+#define wxMask_Create_2_0 1079
+#define wxMask_Create_1 1080
+#define wxImage_new_0 1081
+#define wxImage_new_3_0 1082
+#define wxImage_new_4 1083
+#define wxImage_new_5 1084
+#define wxImage_new_2 1085
+#define wxImage_new_3_1 1086
+#define wxImage_Blur 1087
+#define wxImage_BlurHorizontal 1088
+#define wxImage_BlurVertical 1089
+#define wxImage_ConvertAlphaToMask 1090
+#define wxImage_ConvertToGreyscale 1091
+#define wxImage_ConvertToMono 1092
+#define wxImage_Copy 1093
+#define wxImage_Create_3 1094
+#define wxImage_Create_4 1095
+#define wxImage_Create_5 1096
+#define wxImage_Destroy 1097
+#define wxImage_FindFirstUnusedColour 1098
+#define wxImage_GetImageExtWildcard 1099
+#define wxImage_GetAlpha_2 1100
+#define wxImage_GetAlpha_0 1101
+#define wxImage_GetBlue 1102
+#define wxImage_GetData 1103
+#define wxImage_GetGreen 1104
+#define wxImage_GetImageCount 1105
+#define wxImage_GetHeight 1106
+#define wxImage_GetMaskBlue 1107
+#define wxImage_GetMaskGreen 1108
+#define wxImage_GetMaskRed 1109
+#define wxImage_GetOrFindMaskColour 1110
+#define wxImage_GetPalette 1111
+#define wxImage_GetRed 1112
+#define wxImage_GetSubImage 1113
+#define wxImage_GetWidth 1114
+#define wxImage_HasAlpha 1115
+#define wxImage_HasMask 1116
+#define wxImage_GetOption 1117
+#define wxImage_GetOptionInt 1118
+#define wxImage_HasOption 1119
+#define wxImage_InitAlpha 1120
+#define wxImage_InitStandardHandlers 1121
+#define wxImage_IsTransparent 1122
+#define wxImage_LoadFile_2 1123
+#define wxImage_LoadFile_3 1124
+#define wxImage_Ok 1125
+#define wxImage_RemoveHandler 1126
+#define wxImage_Mirror 1127
+#define wxImage_Replace 1128
+#define wxImage_Rescale 1129
+#define wxImage_Resize 1130
+#define wxImage_Rotate 1131
+#define wxImage_RotateHue 1132
+#define wxImage_Rotate90 1133
+#define wxImage_SaveFile_1 1134
+#define wxImage_SaveFile_2_0 1135
+#define wxImage_SaveFile_2_1 1136
+#define wxImage_Scale 1137
+#define wxImage_Size 1138
+#define wxImage_SetAlpha_3 1139
+#define wxImage_SetAlpha_2 1140
+#define wxImage_SetData_2 1141
+#define wxImage_SetData_4 1142
+#define wxImage_SetMask 1143
+#define wxImage_SetMaskColour 1144
+#define wxImage_SetMaskFromImage 1145
+#define wxImage_SetOption_2_1 1146
+#define wxImage_SetOption_2_0 1147
+#define wxImage_SetPalette 1148
+#define wxImage_SetRGB_5 1149
+#define wxImage_SetRGB_4 1150
+#define wxImage_destroy 1151
+#define wxBrush_new_0 1152
+#define wxBrush_new_2 1153
+#define wxBrush_new_1 1154
+#define wxBrush_destruct 1156
+#define wxBrush_GetColour 1157
+#define wxBrush_GetStipple 1158
+#define wxBrush_GetStyle 1159
+#define wxBrush_IsHatch 1160
+#define wxBrush_IsOk 1161
+#define wxBrush_SetColour_1 1162
+#define wxBrush_SetColour_3 1163
+#define wxBrush_SetStipple 1164
+#define wxBrush_SetStyle 1165
+#define wxPen_new_0 1166
+#define wxPen_new_2 1167
+#define wxPen_destruct 1168
+#define wxPen_GetCap 1169
+#define wxPen_GetColour 1170
+#define wxPen_GetJoin 1171
+#define wxPen_GetStyle 1172
+#define wxPen_GetWidth 1173
+#define wxPen_IsOk 1174
+#define wxPen_SetCap 1175
+#define wxPen_SetColour_1 1176
+#define wxPen_SetColour_3 1177
+#define wxPen_SetJoin 1178
+#define wxPen_SetStyle 1179
+#define wxPen_SetWidth 1180
+#define wxRegion_new_0 1181
+#define wxRegion_new_4 1182
+#define wxRegion_new_2 1183
+#define wxRegion_new_1_1 1184
+#define wxRegion_new_1_0 1186
+#define wxRegion_destruct 1188
+#define wxRegion_Clear 1189
+#define wxRegion_Contains_2 1190
+#define wxRegion_Contains_1_0 1191
+#define wxRegion_Contains_4 1192
+#define wxRegion_Contains_1_1 1193
+#define wxRegion_ConvertToBitmap 1194
+#define wxRegion_GetBox 1195
+#define wxRegion_Intersect_4 1196
+#define wxRegion_Intersect_1_1 1197
+#define wxRegion_Intersect_1_0 1198
+#define wxRegion_IsEmpty 1199
+#define wxRegion_Subtract_4 1200
+#define wxRegion_Subtract_1_1 1201
+#define wxRegion_Subtract_1_0 1202
+#define wxRegion_Offset_2 1203
+#define wxRegion_Offset_1 1204
+#define wxRegion_Union_4 1205
+#define wxRegion_Union_1_2 1206
+#define wxRegion_Union_1_1 1207
+#define wxRegion_Union_1_0 1208
+#define wxRegion_Union_3 1209
+#define wxRegion_Xor_4 1210
+#define wxRegion_Xor_1_1 1211
+#define wxRegion_Xor_1_0 1212
+#define wxAcceleratorTable_new_0 1213
+#define wxAcceleratorTable_new_2 1214
+#define wxAcceleratorTable_destruct 1215
+#define wxAcceleratorTable_Ok 1216
+#define wxAcceleratorEntry_new_1_0 1217
+#define wxAcceleratorEntry_new_1_1 1218
+#define wxAcceleratorEntry_GetCommand 1219
+#define wxAcceleratorEntry_GetFlags 1220
+#define wxAcceleratorEntry_GetKeyCode 1221
+#define wxAcceleratorEntry_Set 1222
+#define wxAcceleratorEntry_destroy 1223
+#define wxCaret_new_3 1228
+#define wxCaret_new_2 1229
+#define wxCaret_destruct 1231
+#define wxCaret_Create_3 1232
+#define wxCaret_Create_2 1233
+#define wxCaret_GetBlinkTime 1234
+#define wxCaret_GetPosition 1236
+#define wxCaret_GetSize 1238
+#define wxCaret_GetWindow 1239
+#define wxCaret_Hide 1240
+#define wxCaret_IsOk 1241
+#define wxCaret_IsVisible 1242
+#define wxCaret_Move_2 1243
+#define wxCaret_Move_1 1244
+#define wxCaret_SetBlinkTime 1245
+#define wxCaret_SetSize_2 1246
+#define wxCaret_SetSize_1 1247
+#define wxCaret_Show 1248
+#define wxSizer_Add_2_1 1249
+#define wxSizer_Add_2_0 1250
+#define wxSizer_Add_3 1251
+#define wxSizer_Add_2_3 1252
+#define wxSizer_Add_2_2 1253
+#define wxSizer_AddSpacer 1254
+#define wxSizer_AddStretchSpacer 1255
+#define wxSizer_CalcMin 1256
+#define wxSizer_Clear 1257
+#define wxSizer_Detach_1_2 1258
+#define wxSizer_Detach_1_1 1259
+#define wxSizer_Detach_1_0 1260
+#define wxSizer_Fit 1261
+#define wxSizer_FitInside 1262
+#define wxSizer_GetChildren 1263
+#define wxSizer_GetItem_2_1 1264
+#define wxSizer_GetItem_2_0 1265
+#define wxSizer_GetItem_1 1266
+#define wxSizer_GetSize 1267
+#define wxSizer_GetPosition 1268
+#define wxSizer_GetMinSize 1269
+#define wxSizer_Hide_2_0 1270
+#define wxSizer_Hide_2_1 1271
+#define wxSizer_Hide_1 1272
+#define wxSizer_Insert_3_1 1273
+#define wxSizer_Insert_3_0 1274
+#define wxSizer_Insert_4 1275
+#define wxSizer_Insert_3_3 1276
+#define wxSizer_Insert_3_2 1277
+#define wxSizer_Insert_2 1278
+#define wxSizer_InsertSpacer 1279
+#define wxSizer_InsertStretchSpacer 1280
+#define wxSizer_IsShown_1_2 1281
+#define wxSizer_IsShown_1_1 1282
+#define wxSizer_IsShown_1_0 1283
+#define wxSizer_Layout 1284
+#define wxSizer_Prepend_2_1 1285
+#define wxSizer_Prepend_2_0 1286
+#define wxSizer_Prepend_3 1287
+#define wxSizer_Prepend_2_3 1288
+#define wxSizer_Prepend_2_2 1289
+#define wxSizer_Prepend_1 1290
+#define wxSizer_PrependSpacer 1291
+#define wxSizer_PrependStretchSpacer 1292
+#define wxSizer_RecalcSizes 1293
+#define wxSizer_Remove_1_1 1294
+#define wxSizer_Remove_1_0 1295
+#define wxSizer_Replace_3_1 1296
+#define wxSizer_Replace_3_0 1297
+#define wxSizer_Replace_2 1298
+#define wxSizer_SetDimension 1299
+#define wxSizer_SetMinSize_2 1300
+#define wxSizer_SetMinSize_1 1301
+#define wxSizer_SetItemMinSize_3_2 1302
+#define wxSizer_SetItemMinSize_2_2 1303
+#define wxSizer_SetItemMinSize_3_1 1304
+#define wxSizer_SetItemMinSize_2_1 1305
+#define wxSizer_SetItemMinSize_3_0 1306
+#define wxSizer_SetItemMinSize_2_0 1307
+#define wxSizer_SetSizeHints 1308
+#define wxSizer_SetVirtualSizeHints 1309
+#define wxSizer_Show_2_2 1310
+#define wxSizer_Show_2_1 1311
+#define wxSizer_Show_2_0 1312
+#define wxSizer_Show_1 1313
+#define wxSizerFlags_new 1314
+#define wxSizerFlags_Align 1315
+#define wxSizerFlags_Border_2 1316
+#define wxSizerFlags_Border_1 1317
+#define wxSizerFlags_Center 1318
+#define wxSizerFlags_Centre 1319
+#define wxSizerFlags_Expand 1320
+#define wxSizerFlags_Left 1321
+#define wxSizerFlags_Proportion 1322
+#define wxSizerFlags_Right 1323
+#define wxSizerFlags_destroy 1324
+#define wxSizerItem_new_5_1 1325
+#define wxSizerItem_new_2_1 1326
+#define wxSizerItem_new_5_0 1327
+#define wxSizerItem_new_2_0 1328
+#define wxSizerItem_new_6 1329
+#define wxSizerItem_new_3 1330
+#define wxSizerItem_new_0 1331
+#define wxSizerItem_destruct 1332
+#define wxSizerItem_CalcMin 1333
+#define wxSizerItem_DeleteWindows 1334
+#define wxSizerItem_DetachSizer 1335
+#define wxSizerItem_GetBorder 1336
+#define wxSizerItem_GetFlag 1337
+#define wxSizerItem_GetMinSize 1338
+#define wxSizerItem_GetPosition 1339
+#define wxSizerItem_GetProportion 1340
+#define wxSizerItem_GetRatio 1341
+#define wxSizerItem_GetRect 1342
+#define wxSizerItem_GetSize 1343
+#define wxSizerItem_GetSizer 1344
+#define wxSizerItem_GetSpacer 1345
+#define wxSizerItem_GetUserData 1346
+#define wxSizerItem_GetWindow 1347
+#define wxSizerItem_IsSizer 1348
+#define wxSizerItem_IsShown 1349
+#define wxSizerItem_IsSpacer 1350
+#define wxSizerItem_IsWindow 1351
+#define wxSizerItem_SetBorder 1352
+#define wxSizerItem_SetDimension 1353
+#define wxSizerItem_SetFlag 1354
+#define wxSizerItem_SetInitSize 1355
+#define wxSizerItem_SetMinSize_1 1356
+#define wxSizerItem_SetMinSize_2 1357
+#define wxSizerItem_SetProportion 1358
+#define wxSizerItem_SetRatio_2 1359
+#define wxSizerItem_SetRatio_1_1 1360
+#define wxSizerItem_SetRatio_1_0 1361
+#define wxSizerItem_SetSizer 1362
+#define wxSizerItem_SetSpacer_1 1363
+#define wxSizerItem_SetSpacer_2 1364
+#define wxSizerItem_SetWindow 1365
+#define wxSizerItem_Show 1366
+#define wxBoxSizer_new 1367
+#define wxBoxSizer_GetOrientation 1368
+#define wxBoxSizer_destroy 1369
+#define wxStaticBoxSizer_new_2 1370
+#define wxStaticBoxSizer_new_3 1371
+#define wxStaticBoxSizer_GetStaticBox 1372
+#define wxStaticBoxSizer_destroy 1373
+#define wxGridSizer_new_4 1374
+#define wxGridSizer_new_2 1375
+#define wxGridSizer_GetCols 1376
+#define wxGridSizer_GetHGap 1377
+#define wxGridSizer_GetRows 1378
+#define wxGridSizer_GetVGap 1379
+#define wxGridSizer_SetCols 1380
+#define wxGridSizer_SetHGap 1381
+#define wxGridSizer_SetRows 1382
+#define wxGridSizer_SetVGap 1383
+#define wxGridSizer_destroy 1384
+#define wxFlexGridSizer_new_4 1385
+#define wxFlexGridSizer_new_2 1386
+#define wxFlexGridSizer_AddGrowableCol 1387
+#define wxFlexGridSizer_AddGrowableRow 1388
+#define wxFlexGridSizer_GetFlexibleDirection 1389
+#define wxFlexGridSizer_GetNonFlexibleGrowMode 1390
+#define wxFlexGridSizer_RemoveGrowableCol 1391
+#define wxFlexGridSizer_RemoveGrowableRow 1392
+#define wxFlexGridSizer_SetFlexibleDirection 1393
+#define wxFlexGridSizer_SetNonFlexibleGrowMode 1394
+#define wxFlexGridSizer_destroy 1395
+#define wxGridBagSizer_new 1396
+#define wxGridBagSizer_Add_3_2 1397
+#define wxGridBagSizer_Add_3_1 1398
+#define wxGridBagSizer_Add_4 1399
+#define wxGridBagSizer_Add_1_0 1400
+#define wxGridBagSizer_Add_2_1 1401
+#define wxGridBagSizer_Add_2_0 1402
+#define wxGridBagSizer_Add_3_0 1403
+#define wxGridBagSizer_Add_1_1 1404
+#define wxGridBagSizer_CalcMin 1405
+#define wxGridBagSizer_CheckForIntersection_2 1406
+#define wxGridBagSizer_CheckForIntersection_3 1407
+#define wxGridBagSizer_FindItem_1_1 1408
+#define wxGridBagSizer_FindItem_1_0 1409
+#define wxGridBagSizer_FindItemAtPoint 1410
+#define wxGridBagSizer_FindItemAtPosition 1411
+#define wxGridBagSizer_FindItemWithData 1412
+#define wxGridBagSizer_GetCellSize 1413
+#define wxGridBagSizer_GetEmptyCellSize 1414
+#define wxGridBagSizer_GetItemPosition_1_2 1415
+#define wxGridBagSizer_GetItemPosition_1_1 1416
+#define wxGridBagSizer_GetItemPosition_1_0 1417
+#define wxGridBagSizer_GetItemSpan_1_2 1418
+#define wxGridBagSizer_GetItemSpan_1_1 1419
+#define wxGridBagSizer_GetItemSpan_1_0 1420
+#define wxGridBagSizer_SetEmptyCellSize 1421
+#define wxGridBagSizer_SetItemPosition_2_2 1422
+#define wxGridBagSizer_SetItemPosition_2_1 1423
+#define wxGridBagSizer_SetItemPosition_2_0 1424
+#define wxGridBagSizer_SetItemSpan_2_2 1425
+#define wxGridBagSizer_SetItemSpan_2_1 1426
+#define wxGridBagSizer_SetItemSpan_2_0 1427
+#define wxGridBagSizer_destroy 1428
+#define wxStdDialogButtonSizer_new 1429
+#define wxStdDialogButtonSizer_AddButton 1430
+#define wxStdDialogButtonSizer_Realize 1431
+#define wxStdDialogButtonSizer_SetAffirmativeButton 1432
+#define wxStdDialogButtonSizer_SetCancelButton 1433
+#define wxStdDialogButtonSizer_SetNegativeButton 1434
+#define wxStdDialogButtonSizer_destroy 1435
+#define wxFont_new_0 1436
+#define wxFont_new_1 1437
+#define wxFont_new_5 1438
+#define wxFont_destruct 1440
+#define wxFont_IsFixedWidth 1441
+#define wxFont_GetDefaultEncoding 1442
+#define wxFont_GetFaceName 1443
+#define wxFont_GetFamily 1444
+#define wxFont_GetNativeFontInfoDesc 1445
+#define wxFont_GetNativeFontInfoUserDesc 1446
+#define wxFont_GetPointSize 1447
+#define wxFont_GetStyle 1448
+#define wxFont_GetUnderlined 1449
+#define wxFont_GetWeight 1450
+#define wxFont_Ok 1451
+#define wxFont_SetDefaultEncoding 1452
+#define wxFont_SetFaceName 1453
+#define wxFont_SetFamily 1454
+#define wxFont_SetPointSize 1455
+#define wxFont_SetStyle 1456
+#define wxFont_SetUnderlined 1457
+#define wxFont_SetWeight 1458
+#define wxToolTip_Enable 1459
+#define wxToolTip_SetDelay 1460
+#define wxToolTip_new 1461
+#define wxToolTip_SetTip 1462
+#define wxToolTip_GetTip 1463
+#define wxToolTip_GetWindow 1464
+#define wxToolTip_destroy 1465
+#define wxButton_new_3 1467
+#define wxButton_new_0 1468
+#define wxButton_destruct 1469
+#define wxButton_Create 1470
+#define wxButton_GetDefaultSize 1471
+#define wxButton_SetDefault 1472
+#define wxButton_SetLabel 1473
+#define wxBitmapButton_new_4 1475
+#define wxBitmapButton_new_0 1476
+#define wxBitmapButton_Create 1477
+#define wxBitmapButton_GetBitmapDisabled 1478
+#define wxBitmapButton_GetBitmapFocus 1480
+#define wxBitmapButton_GetBitmapLabel 1482
+#define wxBitmapButton_GetBitmapSelected 1484
+#define wxBitmapButton_SetBitmapDisabled 1486
+#define wxBitmapButton_SetBitmapFocus 1487
+#define wxBitmapButton_SetBitmapLabel 1488
+#define wxBitmapButton_SetBitmapSelected 1489
+#define wxBitmapButton_destroy 1490
+#define wxToggleButton_new_0 1491
+#define wxToggleButton_new_4 1492
+#define wxToggleButton_Create 1493
+#define wxToggleButton_GetValue 1494
+#define wxToggleButton_SetValue 1495
+#define wxToggleButton_destroy 1496
+#define wxCalendarCtrl_new_0 1497
+#define wxCalendarCtrl_new_3 1498
+#define wxCalendarCtrl_Create 1499
+#define wxCalendarCtrl_destruct 1500
+#define wxCalendarCtrl_SetDate 1501
+#define wxCalendarCtrl_GetDate 1502
+#define wxCalendarCtrl_EnableYearChange 1503
+#define wxCalendarCtrl_EnableMonthChange 1504
+#define wxCalendarCtrl_EnableHolidayDisplay 1505
+#define wxCalendarCtrl_SetHeaderColours 1506
+#define wxCalendarCtrl_GetHeaderColourFg 1507
+#define wxCalendarCtrl_GetHeaderColourBg 1508
+#define wxCalendarCtrl_SetHighlightColours 1509
+#define wxCalendarCtrl_GetHighlightColourFg 1510
+#define wxCalendarCtrl_GetHighlightColourBg 1511
+#define wxCalendarCtrl_SetHolidayColours 1512
+#define wxCalendarCtrl_GetHolidayColourFg 1513
+#define wxCalendarCtrl_GetHolidayColourBg 1514
+#define wxCalendarCtrl_GetAttr 1515
+#define wxCalendarCtrl_SetAttr 1516
+#define wxCalendarCtrl_SetHoliday 1517
+#define wxCalendarCtrl_ResetAttr 1518
+#define wxCalendarCtrl_HitTest 1519
+#define wxCalendarDateAttr_new_0 1520
+#define wxCalendarDateAttr_new_2_1 1521
+#define wxCalendarDateAttr_new_2_0 1522
+#define wxCalendarDateAttr_SetTextColour 1523
+#define wxCalendarDateAttr_SetBackgroundColour 1524
+#define wxCalendarDateAttr_SetBorderColour 1525
+#define wxCalendarDateAttr_SetFont 1526
+#define wxCalendarDateAttr_SetBorder 1527
+#define wxCalendarDateAttr_SetHoliday 1528
+#define wxCalendarDateAttr_HasTextColour 1529
+#define wxCalendarDateAttr_HasBackgroundColour 1530
+#define wxCalendarDateAttr_HasBorderColour 1531
+#define wxCalendarDateAttr_HasFont 1532
+#define wxCalendarDateAttr_HasBorder 1533
+#define wxCalendarDateAttr_IsHoliday 1534
+#define wxCalendarDateAttr_GetTextColour 1535
+#define wxCalendarDateAttr_GetBackgroundColour 1536
+#define wxCalendarDateAttr_GetBorderColour 1537
+#define wxCalendarDateAttr_GetFont 1538
+#define wxCalendarDateAttr_GetBorder 1539
+#define wxCalendarDateAttr_destroy 1540
+#define wxCheckBox_new_4 1542
+#define wxCheckBox_new_0 1543
+#define wxCheckBox_Create 1544
+#define wxCheckBox_GetValue 1545
+#define wxCheckBox_Get3StateValue 1546
+#define wxCheckBox_Is3rdStateAllowedForUser 1547
+#define wxCheckBox_Is3State 1548
+#define wxCheckBox_IsChecked 1549
+#define wxCheckBox_SetValue 1550
+#define wxCheckBox_Set3StateValue 1551
+#define wxCheckBox_destroy 1552
+#define wxCheckListBox_new_0 1553
+#define wxCheckListBox_new_3 1555
+#define wxCheckListBox_Check 1556
+#define wxCheckListBox_IsChecked 1557
+#define wxCheckListBox_destroy 1558
+#define wxChoice_new_3 1561
+#define wxChoice_new_0 1562
+#define wxChoice_destruct 1564
+#define wxChoice_Create 1566
+#define wxChoice_Delete 1567
+#define wxChoice_GetColumns 1568
+#define wxChoice_SetColumns 1569
+#define wxComboBox_new_0 1570
+#define wxComboBox_new_3 1572
+#define wxComboBox_destruct 1573
+#define wxComboBox_Create 1575
+#define wxComboBox_CanCopy 1576
+#define wxComboBox_CanCut 1577
+#define wxComboBox_CanPaste 1578
+#define wxComboBox_CanRedo 1579
+#define wxComboBox_CanUndo 1580
+#define wxComboBox_Copy 1581
+#define wxComboBox_Cut 1582
+#define wxComboBox_GetInsertionPoint 1583
+#define wxComboBox_GetLastPosition 1584
+#define wxComboBox_GetValue 1585
+#define wxComboBox_Paste 1586
+#define wxComboBox_Redo 1587
+#define wxComboBox_Replace 1588
+#define wxComboBox_Remove 1589
+#define wxComboBox_SetInsertionPoint 1590
+#define wxComboBox_SetInsertionPointEnd 1591
+#define wxComboBox_SetSelection_1 1592
+#define wxComboBox_SetSelection_2 1593
+#define wxComboBox_SetValue 1594
+#define wxComboBox_Undo 1595
+#define wxGauge_new_0 1596
+#define wxGauge_new_4 1597
+#define wxGauge_Create 1598
+#define wxGauge_GetBezelFace 1599
+#define wxGauge_GetRange 1600
+#define wxGauge_GetShadowWidth 1601
+#define wxGauge_GetValue 1602
+#define wxGauge_IsVertical 1603
+#define wxGauge_SetBezelFace 1604
+#define wxGauge_SetRange 1605
+#define wxGauge_SetShadowWidth 1606
+#define wxGauge_SetValue 1607
+#define wxGauge_Pulse 1608
+#define wxGauge_destroy 1609
+#define wxGenericDirCtrl_new_0 1610
+#define wxGenericDirCtrl_new_2 1611
+#define wxGenericDirCtrl_destruct 1612
+#define wxGenericDirCtrl_Create 1613
+#define wxGenericDirCtrl_Init 1614
+#define wxGenericDirCtrl_CollapseTree 1615
+#define wxGenericDirCtrl_ExpandPath 1616
+#define wxGenericDirCtrl_GetDefaultPath 1617
+#define wxGenericDirCtrl_GetPath 1618
+#define wxGenericDirCtrl_GetFilePath 1619
+#define wxGenericDirCtrl_GetFilter 1620
+#define wxGenericDirCtrl_GetFilterIndex 1621
+#define wxGenericDirCtrl_GetRootId 1622
+#define wxGenericDirCtrl_GetTreeCtrl 1623
+#define wxGenericDirCtrl_ReCreateTree 1624
+#define wxGenericDirCtrl_SetDefaultPath 1625
+#define wxGenericDirCtrl_SetFilter 1626
+#define wxGenericDirCtrl_SetFilterIndex 1627
+#define wxGenericDirCtrl_SetPath 1628
+#define wxStaticBox_new_4 1630
+#define wxStaticBox_new_0 1631
+#define wxStaticBox_Create 1632
+#define wxStaticBox_destroy 1633
+#define wxStaticLine_new_2 1635
+#define wxStaticLine_new_0 1636
+#define wxStaticLine_Create 1637
+#define wxStaticLine_IsVertical 1638
+#define wxStaticLine_GetDefaultSize 1639
+#define wxStaticLine_destroy 1640
+#define wxListBox_new_3 1643
+#define wxListBox_new_0 1644
+#define wxListBox_destruct 1646
+#define wxListBox_Create 1648
+#define wxListBox_Deselect 1649
+#define wxListBox_GetSelections 1650
+#define wxListBox_InsertItems 1651
+#define wxListBox_IsSelected 1652
 #define wxListBox_Set 1653
 #define wxListBox_HitTest 1654
 #define wxListBox_SetFirstItem_1_0 1655
diff --git a/lib/wx/c_src/wxePrintout.cpp b/lib/wx/c_src/wxe_callback_impl.cpp
index fc8782ba95..e06f68dcbf 100644
--- a/lib/wx/c_src/wxePrintout.cpp
+++ b/lib/wx/c_src/wxe_callback_impl.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
  *
  * The 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,9 +20,60 @@
 #include <wx/wx.h>
 #include "wxe_impl.h"
 #include "wxe_return.h"
+#include "wxe_events.h"
+#include "wxe_gl.h"
 #include "gen/wxe_macros.h"
 #include "gen/wxe_derived_dest.h"
 
+
+/* ****************************************************************************
+ * CallbackData *
+ * ****************************************************************************/
+
+wxeEvtListener::wxeEvtListener(ErlDrvTermData caller, int req, char *req_type,
+			       int funcb, int skip_ev, wxeErlTerm * userData,
+			       ErlDrvTermData from_port)
+  : wxEvtHandler()
+{
+  port=from_port;
+  listener = caller;
+  obj = req;
+  fun_id = funcb;
+  strcpy(class_name, req_type);
+  skip = skip_ev;
+  user_data = userData;
+}
+
+wxeEvtListener::~wxeEvtListener() {
+    // fprintf(stderr, "CBD Deleteing %p %s\r\n", this, class_name); fflush(stderr);
+  if(user_data) {
+    delete user_data;
+  }
+  ptrMap::iterator it;
+  it = ((WxeApp *)wxTheApp)->ptr2ref.find(this);
+  if(it != ((WxeApp *)wxTheApp)->ptr2ref.end()) {
+    wxeRefData *refd = it->second;
+    wxeReturn rt = wxeReturn(WXE_DRV_PORT, refd->memenv->owner, false);
+    rt.addAtom("wx_delete_cb");
+    rt.addInt(fun_id);
+    rt.addRef(refd->ref, "wxeEvtListener");
+    rt.addRef(obj, class_name);
+    rt.addTupleCount(4);
+    rt.send();
+  }
+  ((WxeApp *)wxTheApp)->clearPtr(this);
+}
+
+void wxeEvtListener::forward(wxEvent& event)
+{
+#ifdef DEBUG
+  if(!sendevent(&event, port))
+    fprintf(stderr, "Couldn't send event!\r\n");
+#else
+sendevent(&event, port);
+#endif
+}
+
 /* *****************************************************************/
 /* Special Class impls */
 
@@ -228,6 +279,35 @@ EwxListCtrl::~EwxListCtrl() {
   clear_cb(port, onGetItemColumnImage);
   ((WxeApp *)wxTheApp)->clearPtr(this);
 }
+
+/* ****************************************************************************
+ * wxListCtrlCompare wrapper
+ * ****************************************************************************/
+
+int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr)
+{
+  callbackInfo * cb = (callbackInfo *)callbackInfoPtr;
+  wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(cb->port);
+  wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
+  rt.addInt(cb->callbackID);
+  rt.addInt(item1);
+  rt.addInt(item2);
+  rt.endList(2);
+  rt.addAtom("_wx_invoke_cb_");
+  rt.addTupleCount(3);
+  rt.send();
+  handle_event_callback(WXE_DRV_PORT_HANDLE, memenv->owner);
+
+  if(((WxeApp *) wxTheApp)->cb_buff) {
+    int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
+    driver_free(((WxeApp *) wxTheApp)->cb_buff);
+    ((WxeApp *) wxTheApp)->cb_buff = NULL;
+    return res;
+  }
+  return 0;
+}
+
+
 // tools
 
 void clear_cb(ErlDrvTermData port, int callback)
diff --git a/lib/wx/c_src/wxe_callback_impl.h b/lib/wx/c_src/wxe_callback_impl.h
new file mode 100644
index 0000000000..1c355e4d38
--- /dev/null
+++ b/lib/wx/c_src/wxe_callback_impl.h
@@ -0,0 +1,93 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2014. All Rights Reserved.
+ *
+ * The 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%
+ */
+
+#ifndef _WXE_CALLBACK_IMPL_H
+#define	_WXE_CALLBACK_IMPL_H
+
+void pre_callback();
+void handle_event_callback(ErlDrvPort port, ErlDrvTermData process);
+
+/* Fun Callback id */ 
+class wxeEvtListener : public wxEvtHandler
+{
+public:
+   wxeEvtListener(ErlDrvTermData caller, int req, char *req_type,
+		  int funcb, int skip_ev, wxeErlTerm * userData,
+		  ErlDrvTermData Thisport);
+   ~wxeEvtListener();
+   void forward(wxEvent& event);
+   ErlDrvTermData port;
+   ErlDrvTermData listener;
+   int          fun_id;
+   int          obj;
+   char         class_name[40];
+   int          skip;
+   wxeErlTerm * user_data;
+};
+
+class wxEPrintout : public wxPrintout
+{
+ public:
+ wxEPrintout(wxString Title, int onPrintP, int onPrepareP,
+	     int onBeginP, int onEndP,
+	     int onBeginD, int onEndD,
+	     int hasP, int getPageI, ErlDrvTermData Port) :
+    wxPrintout(Title),
+	onPrintPage(onPrintP), onPreparePrinting(onPrepareP),
+	onBeginPrinting(onBeginP), onEndPrinting(onEndP),
+	onBeginDocument(onBeginD), onEndDocument(onEndD), hasPage(hasP), getPageInfo(getPageI),
+	port(Port)
+	{ } ;
+
+    ~wxEPrintout();
+
+    bool OnBeginDocument(int startPage, int endPage);
+    void OnEndDocument();
+    void OnBeginPrinting();
+    void OnEndPrinting();
+
+    void OnPreparePrinting();
+
+    bool HasPage(int page);
+    bool OnPrintPage(int page);
+    void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
+
+    int onPrintPage;
+    int onPreparePrinting;
+    int onBeginPrinting;
+    int onEndPrinting;
+    int onBeginDocument;
+    int onEndDocument;
+    int hasPage;
+    int getPageInfo;
+
+    ErlDrvTermData port;
+};
+
+void clear_cb(ErlDrvTermData port, int callback);
+
+// Implementation of wxListCtrlCompare
+struct callbackInfo {
+    ErlDrvTermData port;
+    int callbackID;
+};
+
+int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr);
+
+#endif
diff --git a/lib/wx/c_src/wxe_driver.c b/lib/wx/c_src/wxe_driver.c
index 4d3aa577bf..ea52737fa2 100644
--- a/lib/wx/c_src/wxe_driver.c
+++ b/lib/wx/c_src/wxe_driver.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
  *
  * The 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,7 +195,7 @@ void wxe_process_died(ErlDrvData handle, ErlDrvMonitor *monitor)
 {
    /* Callback is active for the dead process */
    wxe_data *sd = ((wxe_data *)handle);
-   push_command(WXE_CB_RETURN,NULL,0,sd);
+   push_command(WXE_CB_DIED,NULL,0,sd);
 
 /*    ErlDrvTermData pid; */
 /*    pid = driver_get_monitored_process(sd->port_handle, monitor);    */
diff --git a/lib/wx/c_src/wxe_driver.h b/lib/wx/c_src/wxe_driver.h
index c765c866c2..e35bbe2118 100644
--- a/lib/wx/c_src/wxe_driver.h
+++ b/lib/wx/c_src/wxe_driver.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
  *
  * The 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 @@ void push_command(int op,char * buf,int len, wxe_data *);
 void meta_command(int what, wxe_data *sd);
 
 void * wxe_ps_init();
+void * wxe_ps_init2();
 
 extern ErlDrvPort WXE_DRV_PORT_HANDLE;
 extern ErlDrvTermData WXE_DRV_PORT;
@@ -88,6 +89,7 @@ extern char * erl_wx_privdir;
 #define WXE_BIN_INCR        11
 #define WXE_BIN_DECR        12
 #define WXE_INIT_OPENGL     13
+#define WXE_CB_DIED         14
 
 #define OPENGL_START        5000
 
diff --git a/lib/wx/c_src/wxe_events.h b/lib/wx/c_src/wxe_events.h
index 6bbb0dfa13..93b5551123 100644
--- a/lib/wx/c_src/wxe_events.h
+++ b/lib/wx/c_src/wxe_events.h
@@ -1,20 +1,20 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
+ *
  * The 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% 
+ *
+ * %CopyrightEnd%
  */
 
 #ifndef __WXE_EVENT_H__
@@ -22,6 +22,8 @@
 
 #include "wxe_driver.h"
 
+bool sendevent(wxEvent * event, ErlDrvTermData port);
+
 class wxeEtype 
 {
 public: 
@@ -33,36 +35,4 @@ public:
 void initEventTable();
 int  wxeEventTypeFromAtom(char *etype_atom);
 
-/* Fun Callback id */ 
-class wxeCallbackData : public wxObject
-{
-public:
-   wxeCallbackData(ErlDrvTermData caller, void *req, char *req_type, 
-		   int funcb, int skip_ev, wxeErlTerm * userData);
-   ~wxeCallbackData();
-   ErlDrvTermData listener;
-   int          fun_id;
-   void *       obj;
-   char         class_name[40];
-   int          skip;
-   wxeErlTerm * user_data;
-};
-
-/* One EvtListener per listening erlang process */ 
-/* If callbacks are used the receiver is wxe_master process */ 
-/* and a wxeEvtListener pre callback is registered */ 
-class wxeEvtListener : public wxEvtHandler
-{
-public:
-   wxeEvtListener(ErlDrvTermData Thisport) : port(Thisport)
-      {} 
-   // {fprintf(stderr, "Creating %x\r\n", (unsigned int) this); fflush(stderr);}
-   void forward(wxEvent& event);
-   ~wxeEvtListener() {
-      ((WxeApp *)wxTheApp)->clearPtr(this);
-      // fprintf(stderr, "Deleteing %x\r\n", (unsigned int) this); fflush(stderr);
-   };
-   ErlDrvTermData port;
-};
-
 #endif
diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp
index 34904397d3..a9feb23831 100644
--- a/lib/wx/c_src/wxe_gl.cpp
+++ b/lib/wx/c_src/wxe_gl.cpp
@@ -1,20 +1,20 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
+ *
  * The 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% 
+ *
+ * %CopyrightEnd%
  */
 
 #include <stdio.h>
@@ -26,8 +26,9 @@
 #endif
 #include "wxe_impl.h"
 #include "wxe_return.h"
+#include "wxe_gl.h"
 
-/* **************************************************************************** 
+/* ****************************************************************************
  * Opengl context management *
  * ****************************************************************************/
 
@@ -138,7 +139,7 @@ void gl_dispatch(int op, char *bp,ErlDrvTermData caller,WXEBinRef *bins[]){
     else {
       ErlDrvTermData rt[] = // Error msg
 	{ERL_DRV_ATOM, driver_mk_atom((char *) "_egl_error_"),
-	 ERL_DRV_INT,  op,
+	 ERL_DRV_INT,  (ErlDrvTermData) op,
 	 ERL_DRV_ATOM, driver_mk_atom((char *) "no_gl_context"),
 	 ERL_DRV_TUPLE,3};
       erl_drv_send_term(WXE_DRV_PORT,caller,rt,8);
diff --git a/lib/wx/c_src/wxe_gl.h b/lib/wx/c_src/wxe_gl.h
index 1b556ff4ec..dc117bf610 100644
--- a/lib/wx/c_src/wxe_gl.h
+++ b/lib/wx/c_src/wxe_gl.h
@@ -1,22 +1,35 @@
 /*
  * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2008-2010. All Rights Reserved.
- * 
+ *
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
+ *
  * The 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% 
+ *
+ * %CopyrightEnd%
  */
 
+#ifndef _WXE_GL_H
+#define _WXE_GL_H
+
 #include "egl_impl.h"
+#include "wxe_return.h"
 
+void activateGL(ErlDrvTermData caller);
+void setActiveGL(ErlDrvTermData caller, wxGLCanvas *canvas);
+void deleteActiveGL(wxGLCanvas *canvas);
 void wxe_initOpenGL(wxeReturn, char*);
+void gl_dispatch(int op, char *bp, ErlDrvTermData caller, WXEBinRef *bins[]);
+
+WX_DECLARE_HASH_MAP(ErlDrvTermData, wxGLCanvas*, wxIntegerHash, wxIntegerEqual, wxeGLC);
+extern wxeGLC glc;
+
+#endif
diff --git a/lib/wx/c_src/wxe_helpers.cpp b/lib/wx/c_src/wxe_helpers.cpp
new file mode 100644
index 0000000000..15d75080d9
--- /dev/null
+++ b/lib/wx/c_src/wxe_helpers.cpp
@@ -0,0 +1,95 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2014. All Rights Reserved.
+ *
+ * The 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 <wx/wx.h>
+#include "wxe_impl.h"
+
+/* ****************************************************************************
+ * Erlang Commands
+ * ****************************************************************************/
+
+wxeCommand::wxeCommand(int fc,char * cbuf,int buflen, wxe_data *sd)
+  : wxObject()
+{
+  WXEBinRef *temp, *start, *prev;
+  int n = 0;
+  ref_count = 1;
+  caller = driver_caller(sd->port_handle);
+  port   = sd->port;
+  op = fc;
+  len = buflen;
+  bin[0] = NULL;
+  bin[1] = NULL;
+  bin[2] = NULL;
+
+  if(cbuf) {
+    buffer = (char *) driver_alloc(len);
+    memcpy((void *) buffer, (void *) cbuf, len);;
+
+    temp = sd->bin;
+
+    prev  = NULL;
+    start = temp;
+
+    while(temp) {
+      if(caller == temp->from) {
+	bin[n++] = temp;
+	if(prev) {
+	  prev->next = temp->next;
+	} else {
+	  start = temp->next;
+	}
+	temp = temp->next;
+      } else {
+	prev = temp;
+	temp = temp->next;
+      }
+    }
+    sd->bin = start;
+  } else {   // No-op only PING currently
+    buffer = NULL;
+  }
+}
+
+wxeCommand::~wxeCommand() {
+  int n = 0;
+  if(buffer) {
+    while(bin[n]) {
+      if(bin[n]->bin)
+	driver_free_binary(bin[n]->bin);
+      driver_free(bin[n++]);
+    }
+    driver_free(buffer);
+  }
+}
+
+/* ****************************************************************************
+ * TreeItemData
+ * ****************************************************************************/
+
+wxETreeItemData::wxETreeItemData(int sz, char * data) {
+  size = sz;
+  bin = (char *) driver_alloc(sz);
+  memcpy(bin, data, sz);
+}
+
+wxETreeItemData::~wxETreeItemData()
+{
+  driver_free(bin);
+}
diff --git a/lib/wx/c_src/wxe_helpers.h b/lib/wx/c_src/wxe_helpers.h
new file mode 100644
index 0000000000..659bc666c6
--- /dev/null
+++ b/lib/wx/c_src/wxe_helpers.h
@@ -0,0 +1,122 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2014. All Rights Reserved.
+ *
+ * The 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%
+ */
+
+#ifndef _WXE_HELPER_H
+#define	_WXE_HELPER_H
+
+DECLARE_EVENT_TYPE(wxeEVT_META_COMMAND, -1)
+
+class wxeMetaCommand : public wxEvent
+{
+ public:
+ wxeMetaCommand(wxe_data *sd, int EvId)
+     : wxEvent(EvId, wxeEVT_META_COMMAND)
+    {  caller = driver_caller(sd->port_handle);  port = sd->port; pdl = sd->pdl; } ;
+ wxeMetaCommand(const wxeMetaCommand& event)
+     : wxEvent(event)
+    {  caller = event.caller; port = event.port; pdl = event.pdl; };
+    virtual ~wxeMetaCommand() {};
+    virtual wxEvent *Clone() const { return new wxeMetaCommand(*this); }
+
+    ErlDrvTermData   caller;
+    ErlDrvTermData   port;
+    ErlDrvPDL        pdl;
+};
+
+class wxeCommand : public wxObject
+{
+ public:
+    wxeCommand(int fc,char * cbuf,int buflen, wxe_data *);
+    virtual ~wxeCommand(); // Use Delete()
+
+    wxeCommand * Save() {ref_count++; return this; };
+    void Delete() {if(--ref_count < 1) delete this;};
+
+    ErlDrvTermData   caller;
+    ErlDrvTermData   port;
+    WXEBinRef *      bin[3];
+    char *           buffer;
+    int              len;
+    int              op;
+    int              ref_count;
+};
+
+class intListElement {
+ public:
+    intListElement(int Element) {car = Element; cdr = NULL;};
+    intListElement(int Element, intListElement *list)
+    {car = Element; cdr = list;};
+    int car;
+    intListElement *cdr;
+};
+
+class intList {
+ public:
+    intList() {list = NULL;};
+    ~intList() {
+	intListElement *head = list;
+	while(head) {
+	    intListElement *tail=head->cdr;
+	    delete head;
+	    head = tail;
+	} };
+    bool IsEmpty() {return list == NULL;};
+    void Append(int Element) { list = new intListElement(Element, list); };
+    int Pop() {
+	intListElement *temp = list;
+	int res = list->car;
+	list = temp->cdr;
+	delete temp;
+	return res;
+    }
+    intListElement *list;
+};
+
+class wxe_badarg
+{
+ public:
+ wxe_badarg(int Ref) : ref(Ref) { } ;
+    int ref;
+};
+
+class wxeErlTerm : public wxClientData
+{
+ public:
+    wxeErlTerm(WXEBinRef * data)
+    {
+	size = data->size;
+	bin = (char *) driver_alloc(size);
+	memcpy(bin, data->base, size);
+    } ;
+    ~wxeErlTerm() { driver_free(bin); };
+    char * bin;
+    int size;
+};
+
+class wxETreeItemData : public wxTreeItemData
+{
+ public:
+    wxETreeItemData(int sz, char * data);
+    ~wxETreeItemData();
+
+    int size;
+    char * bin;
+};
+
+#endif
diff --git a/lib/wx/c_src/wxe_impl.cpp b/lib/wx/c_src/wxe_impl.cpp
index adfee8da73..5964ccfd00 100644
--- a/lib/wx/c_src/wxe_impl.cpp
+++ b/lib/wx/c_src/wxe_impl.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
  *
  * The 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,12 @@
 // Ok ugly but needed for wxBufferedDC crash workaround
 #define private public
 #include <wx/dcbuffer.h>
-
-#if defined(__WXMSW__)
-    #include <wx/msw/private.h> // for wxSetInstance
-#endif
-
 #undef private
 
 #include "wxe_impl.h"
 #include "wxe_events.h"
 #include "wxe_return.h"
+#include "wxe_gl.h"
 
 IMPLEMENT_APP_NO_MAIN(WxeApp)
 
@@ -47,120 +43,21 @@ DECLARE_APP(WxeApp)
 
 DEFINE_EVENT_TYPE(wxeEVT_META_COMMAND)
 
-#define WXE_NOT_INITIATED 0
-#define WXE_INITIATED     1
-#define WXE_EXITED        2
-#define WXE_ERROR        -1
-
 #define WXE_NORMAL      0
 #define WXE_CALLBACK    1
 #define WXE_STORED      2
 
-ErlDrvTid wxe_thread;
-
-ErlDrvMutex *wxe_status_m;
-ErlDrvCond  *wxe_status_c;
-
-ErlDrvMutex * wxe_batch_locker_m;
-ErlDrvCond  * wxe_batch_locker_c;
-
-static int wxe_status = WXE_NOT_INITIATED;
+// Globals initiated in wxe_init.cpp
+extern ErlDrvMutex *wxe_status_m;
+extern ErlDrvCond  *wxe_status_c;
+extern ErlDrvMutex * wxe_batch_locker_m;
+extern ErlDrvCond  * wxe_batch_locker_c;
+extern ErlDrvTermData  init_caller;
+extern int wxe_status;
 
 wxList * wxe_batch = NULL;
 wxList * wxe_batch_cb_saved = NULL;
-
-ErlDrvTermData  wxe_batch_caller = 0;
-ErlDrvTermData  init_caller = 0;
-
-// extern opengl
-void gl_dispatch(int op, char *bp, ErlDrvTermData caller, WXEBinRef *bins[]);
-
-
-// Until fixed in emulator
-#ifndef _WIN32
-extern "C" {
-extern void erts_thread_disable_fpe(void);
-}
-#endif
-
-#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
-#define __DARWIN__ 1
-#endif
-
-#ifdef __DARWIN__
-extern "C" {
-  int erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp);
-  int erl_drv_steal_main_thread(char *name,
-				ErlDrvTid *dtid,
-				void* (*func)(void*),
-				void* arg,
-				ErlDrvThreadOpts *opts);
-}
-#endif
-
-void *wxe_main_loop(void * );
-
-/* ************************************************************
- *  START AND STOP of driver thread
- * ************************************************************/
-
-int load_native_gui()
-{
-  return 1;
-}
-
-int start_native_gui(wxe_data *sd)
-{
-  int res;
-  wxe_status_m = erl_drv_mutex_create((char *) "wxe_status_m");
-  wxe_status_c = erl_drv_cond_create((char *)"wxe_status_c");
-
-  wxe_batch_locker_m = erl_drv_mutex_create((char *)"wxe_batch_locker_m");
-  wxe_batch_locker_c = erl_drv_cond_create((char *)"wxe_batch_locker_c");
-  init_caller = driver_connected(sd->port_handle);
-
-#ifdef __DARWIN__
-  res = erl_drv_steal_main_thread((char *)"wxwidgets",
-				  &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
-#else
-  res = erl_drv_thread_create((char *)"wxwidgets",
-			      &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
-#endif
-  if(res == 0) {
-    erl_drv_mutex_lock(wxe_status_m);
-    for(;wxe_status == WXE_NOT_INITIATED;) {
-      erl_drv_cond_wait(wxe_status_c, wxe_status_m);
-    }
-    erl_drv_mutex_unlock(wxe_status_m);
-    return wxe_status;
-  } else {
-    wxString msg;
-    msg.Printf(wxT("Erlang failed to create wxe-thread %d\r\n"), res);
-    send_msg("error", &msg);
-    return -1;
-  }
-}
-
-void stop_native_gui(wxe_data *sd)
-{
-  if(wxe_status == WXE_INITIATED) {
-    meta_command(WXE_SHUTDOWN, sd);
-  }
-#ifdef __DARWIN__
-  erl_drv_stolen_main_thread_join(wxe_thread, NULL);
-#else
-  erl_drv_thread_join(wxe_thread, NULL);
-#endif
-  erl_drv_mutex_destroy(wxe_status_m);
-  erl_drv_cond_destroy(wxe_status_c);
-  erl_drv_mutex_destroy(wxe_batch_locker_m);
-  erl_drv_cond_destroy(wxe_batch_locker_c);
-}
-
-void unload_native_gui()
-{
-
-}
+int wxe_batch_caller = 0;  // inside batch if larger than 0
 
 /* ************************************************************
  *  Commands from erlang
@@ -169,7 +66,8 @@ void unload_native_gui()
 
 void push_command(int op,char * buf,int len, wxe_data *sd)
 {
-  // fprintf(stderr, "Op %d %d\r\n", op, (int) driver_caller(sd->port_handle)),fflush(stderr);
+  /* fprintf(stderr, "Op %d %d [%ld] %d\r\n", op, (int) driver_caller(sd->port_handle),
+     wxe_batch->size(), wxe_batch_caller),fflush(stderr); */
   wxeCommand *Cmd = new wxeCommand(op, buf, len, sd);
   erl_drv_mutex_lock(wxe_batch_locker_m);
   wxe_batch->Append(Cmd);
@@ -195,9 +93,8 @@ void meta_command(int what, wxe_data *sd) {
       wxeCommand *Cmd = new wxeCommand(WXE_DEBUG_PING, NULL, 0, sd);
       wxe_batch->Append(Cmd);
       erl_drv_cond_signal(wxe_batch_locker_c);
-    } else {
-      wxWakeUpIdle();
     }
+    wxWakeUpIdle();
     erl_drv_mutex_unlock(wxe_batch_locker_m);
   } else {
     if(sd) {
@@ -207,115 +104,54 @@ void meta_command(int what, wxe_data *sd) {
   }
 }
 
-/* ************************************************************
- *  wxWidgets Thread
- * ************************************************************/
-
-void *wxe_main_loop(void *vpdl)
-{
-  int result;
-  int  argc = 1;
-  char * temp = (char *) "Erlang";
-  char * argv[] = {temp,NULL};
-  ErlDrvPDL pdl = (ErlDrvPDL) vpdl;
-
-  driver_pdl_inc_refc(pdl);
-
-  // ErlDrvSysInfo einfo;
-  // driver_system_info(&einfo, sizeof(ErlDrvSysInfo));
-  // Disable floating point execption if they are on.
-  // This should be done in emulator but it's not in yet.
-#ifndef _WIN32
-  erts_thread_disable_fpe();
-#else 
-  // Setup that wxWidgets should look for cursors and icons in 
-  // this dll and not in werl.exe (which is the default)
-  HMODULE WXEHandle = GetModuleHandle(_T("wxe_driver"));
-  wxSetInstance((HINSTANCE) WXEHandle);
-#endif
-
-  result = wxEntry(argc, argv);
-  // fprintf(stderr, "WXWidgets quits main loop %d \r\n", result);
-  if(result >= 0 && wxe_status == WXE_INITIATED) {
-    /* We are done try to make a clean exit */
-    wxe_status = WXE_EXITED;
-    driver_pdl_dec_refc(pdl);
-#ifndef __DARWIN__
-    erl_drv_thread_exit(NULL);
-#endif
-    return NULL;
-  } else {
-    erl_drv_mutex_lock(wxe_status_m);
-    wxe_status = WXE_ERROR;
-    erl_drv_cond_signal(wxe_status_c);
-    erl_drv_mutex_unlock(wxe_status_m);
-    driver_pdl_dec_refc(pdl);
-    return NULL;
-  }
-}
-
-wxFrame * dummy_window;
-
-void create_dummy_window() {
-  dummy_window = new wxFrame(NULL,-1, wxT("wx driver"),
-			     wxPoint(0,0), wxSize(5,5),
-			     wxFRAME_NO_TASKBAR);
-
-  wxMenuBar * menubar = new wxMenuBar();
-  dummy_window->SetMenuBar(menubar);
-  // wx-2.9 Don't delete the app menubar correctly
-  dummy_window->Connect(wxID_ANY, wxEVT_CLOSE_WINDOW,
-			(wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
-  dummy_window->Connect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED,
-			(wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
-  dummy_window->Show(true);
-  // dummy_window->Show(false);
-}
-
-// wxMac really wants a top level window which command-q quits if there are no
-// windows open, and this will kill the thread, so restart the dummy_window each
-// time a we receive a close.
-void WxeApp::dummy_close(wxEvent& Ev) {
-  if(Ev.GetEventType() == wxEVT_CLOSE_WINDOW) {
-    create_dummy_window();
-  }
+void send_msg(const char * type, wxString * msg) {
+  wxeReturn rt = wxeReturn(WXE_DRV_PORT, init_caller);
+  rt.addAtom((char *) "wxe_driver");
+  rt.addAtom((char *) type);
+  rt.add(msg);
+  rt.addTupleCount(3);
+  rt.send();
 }
 
+/* ************************************************************
+ *  Init WxeApp the application emulator
+ * ************************************************************/
 
-// Init wx-widgets thread
 bool WxeApp::OnInit()
 {
-  wxe_ps_init();
 
   global_me = new wxeMemEnv();
   wxe_batch = new wxList;
   wxe_batch_cb_saved = new wxList;
   cb_buff = NULL;
+  recurse_level = 0;
+  delayed_cleanup = new wxList;
+  delayed_delete  = new wxList;
 
-  // wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED); Hmm printpreview doesn't work in 2.9 with this
+  wxe_ps_init2();
+  // wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED); // Hmm printpreview doesn't work in 2.9 with this
 
-  this->Connect(wxID_ANY, wxEVT_IDLE,
-		(wxObjectEventFunction) (wxEventFunction) &WxeApp::idle);
-  this->Connect(CREATE_PORT, wxeEVT_META_COMMAND,
-		(wxObjectEventFunction) (wxEventFunction) &WxeApp::newMemEnv);
-  this->Connect(DELETE_PORT, wxeEVT_META_COMMAND,
-		(wxObjectEventFunction) (wxEventFunction) &WxeApp::destroyMemEnv);
-  this->Connect(WXE_SHUTDOWN, wxeEVT_META_COMMAND,
-		(wxObjectEventFunction) (wxEventFunction) &WxeApp::shutdown);
+  Connect(wxID_ANY, wxEVT_IDLE,	(wxObjectEventFunction) (wxEventFunction) &WxeApp::idle);
+  Connect(CREATE_PORT, wxeEVT_META_COMMAND,(wxObjectEventFunction) (wxEventFunction) &WxeApp::newMemEnv);
+  Connect(DELETE_PORT, wxeEVT_META_COMMAND,(wxObjectEventFunction) (wxEventFunction) &WxeApp::destroyMemEnv);
+  Connect(WXE_SHUTDOWN, wxeEVT_META_COMMAND,(wxObjectEventFunction) (wxEventFunction) &WxeApp::shutdown);
 
 //   fprintf(stderr, "Size void* %d: long %d long long %d int64 %d \r\n",
 // 	  sizeof(void *), sizeof(long), sizeof(long long), sizeof(wxInt64));
   initEventTable();
   wxInitAllImageHandlers();
 
-  /* Create a dummy window so wxWidgets don't automagicly quits the main loop
-     after the last window */
-#ifdef __DARWIN__
-  create_dummy_window();
-#else
-  SetExitOnFrameDelete(false);
+#ifdef  _MACOSX
+  /* Create a default MenuBar so that we can intercept the quit command */
+  wxMenuBar *macMB = new wxMenuBar;
+  wxMenuBar::MacSetCommonMenuBar(macMB);
+  macMB->MacInstallMenuBar();
+  macMB->Connect(wxID_ANY, wxEVT_COMMAND_MENU_SELECTED,
+		 (wxObjectEventFunction) (wxEventFunction) &WxeApp::dummy_close);
 #endif
 
+  SetExitOnFrameDelete(false);
+
   init_nonconsts(global_me, init_caller);
   erl_drv_mutex_lock(wxe_status_m);
   wxe_status = WXE_INITIATED;
@@ -325,19 +161,19 @@ bool WxeApp::OnInit()
 }
 
 void WxeApp::shutdown(wxeMetaCommand& Ecmd) {
-#ifdef __DARWIN__
-  delete dummy_window;
-#endif
   ExitMainLoop();
 }
 
-void send_msg(const char * type, wxString * msg) {
-  wxeReturn rt = wxeReturn(WXE_DRV_PORT, init_caller);
-  rt.addAtom((char *) "wxe_driver");
-  rt.addAtom((char *) type);
-  rt.add(msg);
-  rt.addTupleCount(3);
-  rt.send();
+void WxeApp::dummy_close(wxEvent& Ev) {
+  // fprintf(stderr, "Dummy Close invoked\r\n");
+  // wxMac really wants a top level window which command-q quits if there are no
+  // windows open, and this will kill the erlang, override default handling
+}
+
+// Called by wx thread
+void WxeApp::idle(wxIdleEvent& event) {
+  event.Skip(true);
+  dispatch_cmds();
 }
 
 /* ************************************************************
@@ -354,28 +190,51 @@ void handle_event_callback(ErlDrvPort port, ErlDrvTermData process)
 {
   WxeApp * app = (WxeApp *) wxTheApp;
   ErlDrvMonitor monitor;
-  driver_monitor_process(port, process, &monitor);
-  // Should we be able to handle commands when recursing? probably
-  erl_drv_mutex_lock(wxe_batch_locker_m);
-  //fprintf(stderr, "\r\nCB EV Start %lu \r\n", process);fflush(stderr);
-  app->dispatch_cb(wxe_batch, wxe_batch_cb_saved, process);
-  //fprintf(stderr, "CB EV done %lu \r\n", process);fflush(stderr);
-  wxe_batch_caller = 0;
-  erl_drv_mutex_unlock(wxe_batch_locker_m);
-  driver_demonitor_process(port, &monitor);
-}
-
-// Called by wx thread
-void WxeApp::idle(wxIdleEvent& event) {
-  dispatch_cmds();
+  // Is thread safe if pdl have been incremented
+  if(driver_monitor_process(port, process, &monitor) == 0) {
+    // Should we be able to handle commands when recursing? probably
+    erl_drv_mutex_lock(wxe_batch_locker_m);
+    //fprintf(stderr, "\r\nCB EV Start %lu \r\n", process);fflush(stderr);
+    app->recurse_level++;
+    app->dispatch_cb(wxe_batch, wxe_batch_cb_saved, process);
+    app->recurse_level--;
+    //fprintf(stderr, "CB EV done %lu \r\n", process);fflush(stderr);
+    wxe_batch_caller = 0;
+    erl_drv_mutex_unlock(wxe_batch_locker_m);
+    driver_demonitor_process(port, &monitor);
+  }
 }
 
-void WxeApp::dispatch_cmds() {
+void WxeApp::dispatch_cmds()
+{
   erl_drv_mutex_lock(wxe_batch_locker_m);
+  recurse_level++;
   int level = dispatch(wxe_batch_cb_saved, 0, WXE_STORED);
   dispatch(wxe_batch, level, WXE_NORMAL);
+  recurse_level--;
   wxe_batch_caller = 0;
   erl_drv_mutex_unlock(wxe_batch_locker_m);
+  // Cleanup old memenv's and deleted objects
+  if(recurse_level == 0) {
+    if(delayed_delete->size() > 0)
+      for( wxList::compatibility_iterator node = delayed_delete->GetFirst();
+	   node;
+	   node = delayed_delete->GetFirst()) {
+	wxeCommand *event = (wxeCommand *)node->GetData();
+	delayed_delete->Erase(node);
+	wxe_dispatch(*event);
+	event->Delete();
+      }
+    if(delayed_cleanup->size() > 0)
+      for( wxList::compatibility_iterator node = delayed_cleanup->GetFirst();
+	   node;
+	   node = delayed_cleanup->GetFirst()) {
+	wxeMetaCommand *event = (wxeMetaCommand *)node->GetData();
+	delayed_cleanup->Erase(node);
+	destroyMemEnv(*event);
+	delete event;
+      }
+  }
 }
 
 // Should have  erl_drv_mutex_lock(wxe_batch_locker_m);
@@ -427,7 +286,7 @@ int WxeApp::dispatch(wxList * batch, int blevel, int list_type)
 	      erl_drv_mutex_lock(wxe_batch_locker_m);
 	      break;
 	    }
-	    delete event;
+	    event->Delete();
 	  }
       } else {
 	if((list_type == WXE_STORED) || (blevel <= 0 && list_type == WXE_NORMAL)) {
@@ -459,6 +318,7 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 	  // fprintf(stderr, "  Ev %d %lu\r\n", event->op, event->caller);
 	  if(event->caller == process ||  // Callbacks from CB process only
 	     event->op == WXE_CB_START || // Event callback start change process
+	     event->op == WXE_CB_DIED ||  // Event callback process died
 	     // Allow connect_cb during CB i.e. msg from wxe_server.
 	     (memenv && event->caller == memenv->owner))
 	    {
@@ -471,7 +331,8 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 		if(event->len > 0) {
 		  cb_buff = (char *) driver_alloc(event->len);
 		  memcpy(cb_buff, event->buffer, event->len);
-		}
+		}  // continue
+	      case WXE_CB_DIED:
 		callback_returned = 1;
 		return;
 	      case WXE_CB_START:
@@ -506,7 +367,7 @@ void WxeApp::dispatch_cb(wxList * batch, wxList * temp, ErlDrvTermData process)
 		  return;
 		break;
 	      }
-	      delete event;
+	      event->Delete();
 	    } else {
 	    // fprintf(stderr, "  save %d \r\n", event->op);
 	    temp->Append(event);
@@ -543,7 +404,8 @@ void WxeApp::newMemEnv(wxeMetaCommand& Ecmd) {
   erl_drv_send_term(WXE_DRV_PORT,Ecmd.caller,rt,2);
 }
 
-void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) {
+void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd)
+{
   // Clear incoming cmd queue first
   // dispatch_cmds();
   wxWindow *parent = NULL;
@@ -562,26 +424,33 @@ void WxeApp::destroyMemEnv(wxeMetaCommand& Ecmd) {
       ptrMap::iterator it = ptr2ref.find(ptr);
       if(it != ptr2ref.end()) {
 	wxeRefData *refd = it->second;
-	if(refd->alloc_in_erl) {
-	  if(refd->type == 2) {
-	    wxDialog *win = (wxDialog *) ptr;
-	    if(win->IsModal()) {
-	      win->EndModal(-1);
-	    }
-	    parent = win->GetParent();
-	    if(parent) {
-	      ptrMap::iterator parentRef = ptr2ref.find(parent);
-	      if(parentRef == ptr2ref.end()) {
-		// The parent is already dead delete the parent ref
-		win->SetParent(NULL);
-	      }
+	if(refd->alloc_in_erl && refd->type == 2) {
+	  wxDialog *win = (wxDialog *) ptr;
+	  if(win->IsModal()) {
+	    win->EndModal(-1);
+	  }
+	  parent = win->GetParent();
+	  if(parent) {
+	    ptrMap::iterator parentRef = ptr2ref.find(parent);
+	    if(parentRef == ptr2ref.end()) {
+	      // The parent is already dead delete the parent ref
+	      win->SetParent(NULL);
 	    }
+	  }
+	  if(recurse_level > 0) {
+	    // Delay delete until we are out of dispatch*
+	    delayed_cleanup->Append(Ecmd.Clone());
+	  } else {
 	    delete win;
 	  }
 	}
       }
     }
   }
+
+  if(recurse_level > 0)
+    return;
+
   // First pass, delete all top parents/windows of all linked objects
   //   fprintf(stderr, "close port %x\r\n", Ecmd.port);fflush(stderr);
 
@@ -806,147 +675,3 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid, wxeMemEnv * memenv) {
   };
   throw wxe_badarg(index);
 }
-
-
-/* ************************************************************
- *  Misc utility classes
- * ************************************************************/
-
-/* ****************************************************************************
- * Memory handling
- * ****************************************************************************/
-
-wxeMemEnv::wxeMemEnv() {
-  ref2ptr = (void **) driver_alloc(128*sizeof(void *));
-  ref2ptr[0] = NULL;
-  next = 1;
-  max = 128;
-}
-
-wxeMemEnv::~wxeMemEnv() {
-  driver_free(ref2ptr);
-}
-
-/* ****************************************************************************
- * Erlang Commands (don't need to be derived of wxEvent anymore should
- * be re-written to own class struct)
- * ****************************************************************************/
-
-wxeCommand::wxeCommand(int fc,char * cbuf,int buflen, wxe_data *sd)
-  : wxObject()
-{
-  WXEBinRef *temp, *start, *prev;
-  int n = 0;
-  caller = driver_caller(sd->port_handle);
-  port   = sd->port;
-  op = fc;
-  len = buflen;
-  bin[0] = NULL;
-  bin[1] = NULL;
-  bin[2] = NULL;
-
-  if(cbuf) {
-    buffer = (char *) driver_alloc(len);
-    memcpy((void *) buffer, (void *) cbuf, len);;
-
-    temp = sd->bin;
-
-    prev  = NULL;
-    start = temp;
-
-    while(temp) {
-      if(caller == temp->from) {
-	bin[n++] = temp;
-	if(prev) {
-	  prev->next = temp->next;
-	} else {
-	  start = temp->next;
-	}
-	temp = temp->next;
-      } else {
-	prev = temp;
-	temp = temp->next;
-      }
-    }
-    sd->bin = start;
-  } else {   // No-op only PING currently
-    buffer = NULL;
-  }
-}
-
-wxeCommand::~wxeCommand() {
-  int n = 0;
-  if(buffer) {
-    while(bin[n]) {
-      if(bin[n]->bin)
-	driver_free_binary(bin[n]->bin);
-      driver_free(bin[n++]);
-    }
-    driver_free(buffer);
-  }
-}
-
-/* ****************************************************************************
- * TreeItemData
- * ****************************************************************************/
-
-wxETreeItemData::wxETreeItemData(int sz, char * data) {
-  size = sz;
-  bin = (char *) driver_alloc(sz);
-  memcpy(bin, data, sz);
-}
-
-wxETreeItemData::~wxETreeItemData()
-{
-  driver_free(bin);
-}
-
-/* ****************************************************************************
- * CallbackData *
- * ****************************************************************************/
-
-wxeCallbackData::wxeCallbackData(ErlDrvTermData caller,void * req, char *req_type,
-				 int funcb, int skip_ev, wxeErlTerm * userData)
-  : wxObject()
-{
-  listener = caller;
-  obj = req;
-  fun_id = funcb;
-  strcpy(class_name, req_type);
-  skip = skip_ev;
-  user_data = userData;
-}
-
-wxeCallbackData::~wxeCallbackData() {
-  // fprintf(stderr, "CBD Deleteing %x %s\r\n", (unsigned int) this, class_name); fflush(stderr);
-  if(user_data) {
-    delete user_data;
-  }
-}
-
-/* ****************************************************************************
- * wxListCtrlCompare wrapper
- * ****************************************************************************/
-
-int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr)
-{
-  callbackInfo * cb = (callbackInfo *)callbackInfoPtr;
-  wxeMemEnv * memenv =  ((WxeApp *) wxTheApp)->getMemEnv(cb->port);
-  wxeReturn rt = wxeReturn(WXE_DRV_PORT, memenv->owner, false);
-  rt.addInt(cb->callbackID);
-  rt.addInt(item1);
-  rt.addInt(item2);
-  rt.endList(2);
-  rt.addAtom("_wx_invoke_cb_");
-  rt.addTupleCount(3);
-  rt.send();
-  handle_event_callback(WXE_DRV_PORT_HANDLE, memenv->owner);
-
-  if(((WxeApp *) wxTheApp)->cb_buff) {
-    int res = * (int*) ((WxeApp *) wxTheApp)->cb_buff;
-    driver_free(((WxeApp *) wxTheApp)->cb_buff);
-    ((WxeApp *) wxTheApp)->cb_buff = NULL;
-    return res;
-  }
-  return 0;
-}
diff --git a/lib/wx/c_src/wxe_impl.h b/lib/wx/c_src/wxe_impl.h
index a3c57e2598..bb54961edd 100644
--- a/lib/wx/c_src/wxe_impl.h
+++ b/lib/wx/c_src/wxe_impl.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2008-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2008-2014. All Rights Reserved.
  *
  * The contents of this file are subject to the Erlang Public License,
  * Version 1.1, (the "License"); you may not use this file except in
@@ -14,12 +14,17 @@
  * the License for the specific language governing rights and limitations
  * under the License.
  *
- * %CopyrightEnd% 
+ * %CopyrightEnd%
  */
 
 #ifndef _WXE_IMPL_H
 #define	_WXE_IMPL_H
 
+#if defined(__APPLE__) && defined(__MACH__) && !defined(__DARWIN__)
+#define __DARWIN__ 1
+#endif
+
+
 #include <wx/glcanvas.h>
 #include <wx/treectrl.h>
 #include <wx/print.h>
@@ -27,119 +32,16 @@ extern "C" {
 #include "wxe_driver.h"
 }
 
-DECLARE_EVENT_TYPE(wxeEVT_META_COMMAND, -1)
-
-class wxeMetaCommand : public wxEvent
-{
- public: 
- wxeMetaCommand(wxe_data *sd, int EvId) 
-    : wxEvent(EvId, wxeEVT_META_COMMAND)
-   {  caller = driver_caller(sd->port_handle);  port = sd->port; pdl = sd->pdl; } ;
- wxeMetaCommand(const wxeMetaCommand& event)  
-    : wxEvent(event) 
-   {  caller = event.caller; port = event.port; pdl = event.pdl; };
-   virtual ~wxeMetaCommand() {};
-   virtual wxEvent *Clone() const { return new wxeMetaCommand(*this); }
-   
-   ErlDrvTermData   caller;
-   ErlDrvTermData   port;
-   ErlDrvPDL        pdl;
-};
-
-class wxeCommand : public wxObject
-{
- public: 
-   wxeCommand(int fc,char * cbuf,int buflen, wxe_data *);
-   virtual ~wxeCommand();
-
-   ErlDrvTermData   caller;
-   ErlDrvTermData   port;
-   WXEBinRef *      bin[3];
-   char *           buffer;
-   int              len;
-   int              op;
-};
-
-#define WXE_EVENT_PTR  0
-#define WXE_OBJECT_PTR 1
-
-class intListElement {
-public: 
-  intListElement(int Element) {car = Element; cdr = NULL;};
-  intListElement(int Element, intListElement *list) 
-  {car = Element; cdr = list;};
-  int car;
-  intListElement *cdr;
-};
-
-class intList { 
-public: 
-  intList() {list = NULL;};
-  bool IsEmpty() {return list == NULL;};
-  void Append(int Element) { list = new intListElement(Element, list); };
-  int Pop() { 
-    intListElement *temp = list; 
-    int res = list->car;
-    list = temp->cdr; 
-    delete temp;
-    return res;
-  }
-  intListElement *list;
-};
-
-class wxe_badarg 
-{
-public: 
-  wxe_badarg(int Ref) : ref(Ref) { } ;
-  int ref;
-};
-
-class wxeErlTerm : public wxClientData
-{
- public:
-   wxeErlTerm(WXEBinRef * data)
-   { 
-      size = data->size;
-      bin = (char *) driver_alloc(size);
-      memcpy(bin, data->base, size);
-   } ;
-   ~wxeErlTerm() { driver_free(bin); };
-   char * bin;
-   int size;
-};
-
-class wxeMemEnv 
-{   
-public:
-  wxeMemEnv();
-  int  next;
-  int  max;
-  void ** ref2ptr;
-  intList  free;   
-  ~wxeMemEnv();
-  ErlDrvTermData owner;
-};
-
-class wxeRefData {
- public: 
-   wxeRefData(unsigned int dref, int ttype, int is_new, wxeMemEnv *menv) : 
-   ref(dref), type(ttype), alloc_in_erl(is_new), memenv(menv), pid(-1) { } ;
-   int ref;
-   int type;  
-   // 0 = wxWindow subclasses, 1 = wxObject subclasses 
-   // 2 = wxDialog subclasses, 3 = allocated wxObjects but not returned from new
-   // > 3 classes which lack virtual destr, or are supposed to be allocated on
-   //     the stack
-   bool alloc_in_erl;
-   wxeMemEnv *memenv;
-   ErlDrvTermData pid;
-};
-
-WX_DECLARE_HASH_MAP(ErlDrvTermData, wxGLCanvas*, wxIntegerHash, wxIntegerEqual, wxeGLC);
-WX_DECLARE_HASH_MAP(ErlDrvTermData, wxeMemEnv*, wxIntegerHash, wxIntegerEqual, wxeMemMap);
+#include "wxe_helpers.h"
+#include "wxe_callback_impl.h"
+#include "wxe_memory.h"
 
+#define WXE_NOT_INITIATED 0
+#define WXE_INITIATED     1
+#define WXE_EXITED        2
+#define WXE_ERROR        -1
 
-WX_DECLARE_VOIDPTR_HASH_MAP(wxeRefData *, ptrMap);
+void send_msg(const char *, wxString *);   // For debugging and error msgs
 
 class WxeApp : public wxApp
 {
@@ -158,101 +60,31 @@ public:
   void dummy_close(wxEvent& Ev);
   bool sendevent(wxEvent *event);
 
-  // MemEnv handling 
+  // MemEnv handling
   void newMemEnv(wxeMetaCommand& event);
   void destroyMemEnv(wxeMetaCommand& event);
   wxeMemEnv * getMemEnv(ErlDrvTermData port);
-  
+
   int  newPtr(void * ptr, int type, wxeMemEnv *memenv);
   int  getRef(void * ptr, wxeMemEnv *memenv);
-  void * getPtr(char * bp, wxeMemEnv *memenv); 
+  void * getPtr(char * bp, wxeMemEnv *memenv);
   void clearPtr(void *ptr);
   void registerPid(char *ptr, ErlDrvTermData pid, wxeMemEnv *memenv);
-  void init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller); 
-  
+  void init_nonconsts(wxeMemEnv *memenv, ErlDrvTermData caller);
+
   // Code found in gen/wxe_derived_dest.h
   void delete_object(void *ptr, wxeRefData *refd);
-  
+
   wxeMemMap refmap;
   ptrMap   ptr2ref;
   wxeMemEnv * global_me;
-  
+
+  int recurse_level;
+  wxList * delayed_cleanup;
+  wxList * delayed_delete;
   // Temp container for callbacks
   char *cb_buff;
   int  cb_len;
 };
 
-class wxETreeItemData : public wxTreeItemData 
-{
- public:
-   wxETreeItemData(int sz, char * data);
-   
-   ~wxETreeItemData();
-   
-   int size;
-   char * bin;
-};
-
-bool sendevent(wxEvent * event, ErlDrvTermData port);
-void pre_callback();
-void handle_event_callback(ErlDrvPort port, ErlDrvTermData process);
-
-void activateGL(ErlDrvTermData caller);
-void setActiveGL(ErlDrvTermData caller, wxGLCanvas *canvas);
-void deleteActiveGL(wxGLCanvas *canvas);
-
-void send_msg(const char *, wxString *);   // For debugging and error msgs
-
-extern wxeGLC glc;
-
-class wxEPrintout : public wxPrintout
-{
- public: 
-   wxEPrintout(wxString Title, int onPrintP, int onPrepareP,
-	       int onBeginP, int onEndP,
-	       int onBeginD, int onEndD,
-	       int hasP, int getPageI, ErlDrvTermData Port) :
-      wxPrintout(Title),
-      onPrintPage(onPrintP), onPreparePrinting(onPrepareP), 
-      onBeginPrinting(onBeginP), onEndPrinting(onEndP),
-      onBeginDocument(onBeginD), onEndDocument(onEndD), hasPage(hasP), getPageInfo(getPageI),
-      port(Port)
-       { } ;
-
-   ~wxEPrintout();
-   
-   bool OnBeginDocument(int startPage, int endPage);
-   void OnEndDocument();
-   void OnBeginPrinting();
-   void OnEndPrinting();
-   
-   void OnPreparePrinting();
-   
-   bool HasPage(int page);
-   bool OnPrintPage(int page);
-   void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo);
-
-   int onPrintPage;
-   int onPreparePrinting;
-   int onBeginPrinting; 
-   int onEndPrinting;
-   int onBeginDocument;
-   int onEndDocument;
-   int hasPage; 
-   int getPageInfo;
-
-   ErlDrvTermData port;
-};
-
-void clear_cb(ErlDrvTermData port, int callback);
-
-
-// Implementation of wxListCtrlCompare
-struct callbackInfo {
-   ErlDrvTermData port;
-   int callbackID;
-};
-
-int wxCALLBACK wxEListCtrlCompare(long item1, long item2, long callbackInfoPtr);
-
 #endif  //_WXE_IMPL_H
diff --git a/lib/wx/c_src/wxe_main.cpp b/lib/wx/c_src/wxe_main.cpp
new file mode 100644
index 0000000000..2bec2422c9
--- /dev/null
+++ b/lib/wx/c_src/wxe_main.cpp
@@ -0,0 +1,163 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2014. All Rights Reserved.
+ *
+ * The 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%
+ */
+
+#if defined(_WIN32)
+#include <wx/msw/private.h> // for wxSetInstance
+#endif
+
+#include "wxe_impl.h"
+
+// Until fixed in emulator
+#ifndef _WIN32
+extern "C" {
+  extern void erts_thread_disable_fpe(void);
+}
+#endif
+
+ErlDrvTid wxe_thread;
+
+ErlDrvMutex *wxe_status_m;
+ErlDrvCond  *wxe_status_c;
+
+int wxe_status = WXE_NOT_INITIATED;
+
+ErlDrvMutex * wxe_batch_locker_m;
+ErlDrvCond  * wxe_batch_locker_c;
+ErlDrvTermData  init_caller = 0;
+
+#ifdef __DARWIN__
+extern "C" {
+  int erl_drv_stolen_main_thread_join(ErlDrvTid tid, void **respp);
+  int erl_drv_steal_main_thread(char *name,
+				ErlDrvTid *dtid,
+				void* (*func)(void*),
+				void* arg,
+				ErlDrvThreadOpts *opts);
+}
+#endif
+
+void *wxe_main_loop(void * );
+
+/* ************************************************************
+ *  START AND STOP of driver thread
+ * ************************************************************/
+
+int load_native_gui()
+{
+  return 1;
+}
+
+int start_native_gui(wxe_data *sd)
+{
+  int res;
+  wxe_status_m = erl_drv_mutex_create((char *) "wxe_status_m");
+  wxe_status_c = erl_drv_cond_create((char *)"wxe_status_c");
+
+  wxe_batch_locker_m = erl_drv_mutex_create((char *)"wxe_batch_locker_m");
+  wxe_batch_locker_c = erl_drv_cond_create((char *)"wxe_batch_locker_c");
+  init_caller = driver_connected(sd->port_handle);
+
+#ifdef __DARWIN__
+  res = erl_drv_steal_main_thread((char *)"wxwidgets",
+				  &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
+#else
+  res = erl_drv_thread_create((char *)"wxwidgets",
+			      &wxe_thread,wxe_main_loop,(void *) sd->pdl,NULL);
+#endif
+  if(res == 0) {
+    erl_drv_mutex_lock(wxe_status_m);
+    for(;wxe_status == WXE_NOT_INITIATED;) {
+      erl_drv_cond_wait(wxe_status_c, wxe_status_m);
+    }
+    erl_drv_mutex_unlock(wxe_status_m);
+    return wxe_status;
+  } else {
+    wxString msg;
+    msg.Printf(wxT("Erlang failed to create wxe-thread %d\r\n"), res);
+    send_msg("error", &msg);
+    return -1;
+  }
+}
+
+void stop_native_gui(wxe_data *sd)
+{
+  if(wxe_status == WXE_INITIATED) {
+    meta_command(WXE_SHUTDOWN, sd);
+  }
+#ifdef __DARWIN__
+  erl_drv_stolen_main_thread_join(wxe_thread, NULL);
+#else
+  erl_drv_thread_join(wxe_thread, NULL);
+#endif
+  erl_drv_mutex_destroy(wxe_status_m);
+  erl_drv_cond_destroy(wxe_status_c);
+  erl_drv_mutex_destroy(wxe_batch_locker_m);
+  erl_drv_cond_destroy(wxe_batch_locker_c);
+}
+
+void unload_native_gui()
+{
+
+}
+
+/* ************************************************************
+ *  wxWidgets Thread
+ * ************************************************************/
+
+void *wxe_main_loop(void *vpdl)
+{
+  int result;
+  int  argc = 1;
+  char * temp = (char *) "Erlang";
+  char * argv[] = {temp,NULL};
+  ErlDrvPDL pdl = (ErlDrvPDL) vpdl;
+
+  driver_pdl_inc_refc(pdl);
+
+  // Disable floating point execption if they are on.
+  // This should be done in emulator but it's not in yet.
+#ifndef _WIN32
+  erts_thread_disable_fpe();
+#else
+  // Setup that wxWidgets should look for cursors and icons in
+  // this dll and not in werl.exe (which is the default)
+  HMODULE WXEHandle = GetModuleHandle(_T("wxe_driver"));
+  wxSetInstance((HINSTANCE) WXEHandle);
+#endif
+
+  wxe_ps_init();
+  result = wxEntry(argc, argv);
+  // fprintf(stderr, "WXWidgets quits main loop %d \r\n", result);
+  if(result >= 0 && wxe_status == WXE_INITIATED) {
+    /* We are done try to make a clean exit */
+    wxe_status = WXE_EXITED;
+    driver_pdl_dec_refc(pdl);
+#ifndef __DARWIN__
+    erl_drv_thread_exit(NULL);
+#endif
+    return NULL;
+  } else {
+    erl_drv_mutex_lock(wxe_status_m);
+    wxe_status = WXE_ERROR;
+    erl_drv_cond_signal(wxe_status_c);
+    erl_drv_mutex_unlock(wxe_status_m);
+    driver_pdl_dec_refc(pdl);
+    return NULL;
+  }
+}
diff --git a/lib/wx/c_src/wxe_memory.h b/lib/wx/c_src/wxe_memory.h
new file mode 100644
index 0000000000..ec22183bfa
--- /dev/null
+++ b/lib/wx/c_src/wxe_memory.h
@@ -0,0 +1,61 @@
+/*
+ * %CopyrightBegin%
+ *
+ * Copyright Ericsson AB 2014. All Rights Reserved.
+ *
+ * The 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%
+ */
+
+#ifndef _WXE_MEMORY_H
+#define	_WXE_MEMORY_H
+
+class wxeMemEnv
+{
+public:
+    wxeMemEnv()
+    {
+	ref2ptr = (void **) driver_alloc(128*sizeof(void *));
+	ref2ptr[0] = NULL;
+	next = 1;
+	max = 128;
+    };
+  ~wxeMemEnv()
+  { driver_free(ref2ptr); };
+  int  next;
+  int  max;
+  void ** ref2ptr;
+  intList  free;
+  ErlDrvTermData owner;
+};
+
+class wxeRefData {
+ public:
+   wxeRefData(unsigned int dref, int ttype, int is_new, wxeMemEnv *menv) :
+   ref(dref), type(ttype), alloc_in_erl(is_new), memenv(menv), pid(-1) { } ;
+   int ref;
+   int type;
+   // 0 = wxWindow subclasses, 1 = wxObject subclasses
+   // 2 = wxDialog subclasses, 3 = allocated wxObjects but not returned from new
+   // > 3 classes which lack virtual destr, or are supposed to be allocated on
+   //     the stack
+   bool alloc_in_erl;
+   wxeMemEnv *memenv;
+   ErlDrvTermData pid;
+};
+
+WX_DECLARE_HASH_MAP(ErlDrvTermData, wxeMemEnv*, wxIntegerHash, wxIntegerEqual, wxeMemMap);
+
+WX_DECLARE_VOIDPTR_HASH_MAP(wxeRefData *, ptrMap);
+
+#endif
diff --git a/lib/wx/c_src/wxe_ps_init.c b/lib/wx/c_src/wxe_ps_init.c
index 541d188098..d000e242de 100644
--- a/lib/wx/c_src/wxe_ps_init.c
+++ b/lib/wx/c_src/wxe_ps_init.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include "wxe_driver.h"
+
 /* Platform specific initialisation stuff */ 
 #ifdef _MACOSX
 
@@ -30,34 +31,63 @@ extern OSErr  CPSSetProcessName (ProcessSerialNumber *psn, char *processname);
 void * wxe_ps_init() 
 {
    ProcessSerialNumber psn;
-   NSAutoreleasePool *pool;
    // Enable GUI 
-   GetCurrentProcess(&psn);
-   char *app_title = getenv("WX_APP_TITLE");
-   // Undocumented function (but no documented way of doing this exists)
-   CPSSetProcessName(&psn, app_title?app_title:"Erlang");
-   TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-   SetFrontProcess(&psn);
-   // Enable Cocoa calls from Carbon app
-   NSApplicationLoad();
+   if(!GetCurrentProcess(&psn)) {
+      TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+#ifdef  MAC_OS_X_VERSION_10_6
+      [[NSRunningApplication currentApplication] activateWithOptions:
+       (NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
+#else 
+      SetFrontProcess(&psn);
+#endif
+   }
+   return (void *) 0;
+}
+
+int is_packaged_app() {
+   // Can get lost in when execing around, we use the name instead
+   /* if(mainBundle) { */
+   /*    return (CFBundleGetValueForInfoDictionaryKey(mainBundle, CFSTR("CFBundlePackageType")) != nil); */
+   /* } */
+#ifdef MAC_OS_X_VERSION_10_6
+   NSString *  appName = [[NSRunningApplication currentApplication] localizedName];
+   return (strncmp("beam", [appName UTF8String], 4) != 0);
+#else
+   return 0;
+#endif
+}
+
+void * wxe_ps_init2() {
+   NSAutoreleasePool *pool;
+   ProcessSerialNumber psn;
 
    // Setup and enable gui
    pool = [[NSAutoreleasePool alloc] init];
-
-   NSApplication *app = [NSApplication sharedApplication];
-   // Load and set icon
    
-   NSMutableString *file = [[NSMutableString alloc] init];
-   [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo64.png"];
-   NSImage *icon = [[NSImage alloc] initWithContentsOfFile: file];
-   [app setApplicationIconImage: icon];
+   if( !is_packaged_app() ) {
+      // Undocumented function (but no documented way of doing this exists)
+      char *app_title = getenv("WX_APP_TITLE");
+      if(!GetCurrentProcess(&psn)) {
+      	 CPSSetProcessName(&psn, app_title?app_title:"Erlang");
+      }
+      // Load and set icon
+      NSMutableString *file = [[NSMutableString alloc] init];
+      [file appendFormat:@"%s/%s", erl_wx_privdir, "erlang-logo64.png"];
+      NSImage *icon = [[NSImage alloc] initWithContentsOfFile: file];
+      [NSApp setApplicationIconImage: icon];
+   };
 
-   return (void *) pool;
+   return pool;
 }
+
 /* _MACOSX */
 #else
-void * wxe_ps_init() 
+void * wxe_ps_init()
+{
+   return (void *) 0;
+}
+void * wxe_ps_init2()
 {
    return (void *) 0;
 }
-#endif 
+#endif
diff --git a/lib/wx/c_src/wxe_return.cpp b/lib/wx/c_src/wxe_return.cpp
index d50a74ac9d..aebf6bae1b 100644
--- a/lib/wx/c_src/wxe_return.cpp
+++ b/lib/wx/c_src/wxe_return.cpp
@@ -66,9 +66,7 @@ int wxeReturn::send() {
 
 #ifdef DEBUG
     if(res == -1) {
-      wxString msg;
-      msg.Printf(wxT("Failed to send return or event msg"));
-      send_msg("internal_error", &msg);
+      fprintf(stderr, "Failed to send return or event msg\r\n");
     }
 #endif
 
diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 9c55e544a4..3756786831 100755
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -71,30 +71,14 @@ WXERL_CAN_BUILD_DRIVER=true
 
 LM_WINDOWS_ENVIRONMENT
 
+USER_CFLAGS=$CFLAGS
+
 if test  X"$MIXED_CYGWIN_VC" = X"yes" -o X"$MIXED_MSYS_VC" = X"yes"; then
    CFLAGS="-Owx"
 fi
 
-## Check that we are in 32 bits mode on darwin 
-## (wxWidgets require that it currently uses 32-bits Carbon)
-## Otherwise skip building wxErlang
 AC_CHECK_SIZEOF(void *)
 
-# case $ac_cv_sizeof_void_p-$host_os in
-#     8-darwin*)
-# 	if test X"$WX_BUILDING_INSIDE_ERLSRC" != X"true" ; then
-# 		AC_MSG_ERROR([Can not use 64bits wxWidgets on Darwin])
-# 	else
-# 		echo "Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable" > ./CONF_INFO
-# 		WXERL_CAN_BUILD_DRIVER=false
-# 		AC_MSG_WARN([Can not combine 64bits erlang with wxWidgets on MacOSX, wx will not be useable])
-# 	fi
-# 	WXERL_CAN_BUILD_DRIVER=false
-# 	;;
-#     *)
-# 	;;
-# esac
-
 PTHR_CFLAGS="-D_THREAD_SAFE -D_REENTRANT"
 
 OBJC_CC=$CC
@@ -103,8 +87,12 @@ CXXFLAGS=""
 dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
 case $host_os in
     darwin*)
+	AC_MSG_CHECKING([Checking wxWidgets for min version:])
+	WX_CC=`wx-config --cc`
+	MAC_MIN=`echo "$WX_CC" | sed 's/^[[^ ]]*\ *//'`
+	AC_MSG_RESULT([$MAC_MIN])
+
 	AC_MSG_CHECKING([if compiler accepts -ObjC])
-	saved_CFLAGS=$CFLAGS
   	CFLAGS="$CFLAGS -ObjC"
   	AC_TRY_COMPILE([],[;], accept_objc_flag=true, accept_objc_flag=false)
   	if test "X$accept_objc_flag" = "Xtrue"; then
@@ -171,7 +159,7 @@ case $host_os in
 	      OBJC_CFLAGS="-ObjC"
 	   fi
   	fi
-  	CFLAGS="$saved_CFLAGS -Wno-deprecated-declarations"
+  	CFLAGS="$USER_CFLAGS $MAC_MIN -Wno-deprecated-declarations"
 	CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS"
 	;;
     mingw32)
@@ -195,7 +183,7 @@ AC_SUBST(OBJC_CFLAGS)
 
 case $host_os in
     darwin*)
-	LDFLAGS="-bundle -flat_namespace -undefined warning -fPIC $LDFLAGS"
+	LDFLAGS="$MAC_MIN -bundle -flat_namespace -undefined warning -fPIC $LDFLAGS"
 	# Check sizof_void_p as future will hold 64bit MacOS wx
 	if test $ac_cv_sizeof_void_p = 4; then
 	    LDFLAGS="-m32 $LDFLAGS"
@@ -223,15 +211,20 @@ dnl ----------------------------------------------------------------------
 case $host_os in
     mingw32)
 	DEBUG_CFLAGS="-g -Wall -DDEBUG $CFLAGS"
-	CFLAGS="-g -Wall -O2 -fomit-frame-pointer -fno-strict-aliasing $CFLAGS"
+	CFLAGS="-g -Wall -O2 $CFLAGS -fomit-frame-pointer -fno-strict-aliasing"
 	;;
     win32)
-	DEBUG_CFLAGS="-g -Wall -DDEBUG $CFLAGS"
+	DEBUG_CFLAGS="-g -Wall $CFLAGS -DDEBUG"
 	CFLAGS="-g -Wall -O2 $CFLAGS"
 	;;
+    darwin*)
+	DEBUG_CFLAGS="-g -Wall -fPIC $CFLAGS -DDEBUG"
+	# omit-frame-pointer causes seg faults with 10.9 and clang
+	CFLAGS="-g -Wall -fPIC $CFLAGS -fno-strict-aliasing"
+	;;
     *)
-	DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS"
-	CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS"
+	DEBUG_CFLAGS="-g -Wall -fPIC $CFLAGS -DDEBUG"
+	CFLAGS="-g -Wall -O2 -fPIC $CFLAGS -fomit-frame-pointer -fno-strict-aliasing"
 	;;
 esac
 
@@ -283,11 +276,12 @@ fi
 
 AC_SUBST(GL_LIBS)
 
+DEBUG_CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS $CPPFLAGS"
+DEBUG_CFLAGS="$DEBUG_CFLAGS $CPPFLAGS $C_ONLY_FLAGS"
+
 CXXFLAGS="$CXXFLAGS $CFLAGS $CPPFLAGS" 
 CFLAGS="$CFLAGS $CPPFLAGS $C_ONLY_FLAGS"
 
-DEBUG_CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS $CPPFLAGS"
-DEBUG_CFLAGS="$DEBUG_CFLAGS $CPPFLAGS $C_ONLY_FLAGS"
 AC_SUBST(DEBUG_CFLAGS)
 AC_SUBST(DEBUG_CXXFLAGS)
 
@@ -413,7 +407,22 @@ define(wx_warn_text,[
     fi
 else
     AC_MSG_CHECKING(for wxWidgets in standard locations)
-		  
+
+    # Check whether --with-wxdir was given.
+    AC_MSG_NOTICE(OptionCheck: [$with_wxdir $with_wx_prefix])
+
+    if test "${with_wxdir+set}" = set; then :
+      withval=$with_wxdir;  CWXWIN0=$withval
+    else
+      # Check whether --with-wx-prefix was given.
+      if test "${with_wx_prefix+set}" = set; then :
+        withval=$with_wx_prefix; CWXWIN0=$withval
+      else
+        echo Setting it empty
+        CWXWIN0=""
+      fi
+    fi
+
     if test "x$MIXED_MSYS" = "xyes"; then
         CWXWIN_CONFIG=`win2msys_path.sh $wx_config_name 2>/dev/null`
     else
@@ -444,9 +453,10 @@ else
 		;;
     esac	
 			
-    CWXPATH="$CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3.* $CWXWIN4.*"
+    CWXPATH="$CWXWIN0 $CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3.* $CWXWIN4.*"
 
     for dir in $CWXPATH; do
+        AC_MSG_NOTICE(Checking: [$dir])
 	if test -f $dir/include/wx/wx.h; then
 	    WXINCLUDE_MSVC=$dir/include/msvc
 	    WXINCLUDE_PLAIN=$dir/include
diff --git a/lib/wx/doc/overview.edoc b/lib/wx/doc/overview.edoc
index 8bff6c34e1..054016f515 100644
--- a/lib/wx/doc/overview.edoc
+++ b/lib/wx/doc/overview.edoc
@@ -12,11 +12,11 @@ of <em>wxWidgets</em>. This document describes the erlang mapping to
 wxWidgets and it's implementation. It is not a complete
 users guide to wxWidgets. If you need that, you will have to read the wxWidgets
 documentation instead. <em>wx</em> tries to keep a one-to-one mapping with
-the original api so that the original documentation and examples shall be
+the original API so that the original documentation and examples shall be
 as easy as possible to use.
 
 wxErlang examples and test suite can be found in the erlang src release.
-They can also provide some help on how to use the api.
+They can also provide some help on how to use the API.
 
 This is currently a very brief introduction to <em>wx</em>.  The
 application is still under development, which means the interface may change,
@@ -33,17 +33,17 @@ and the test suite currently have a poor coverage ratio.
 
 == Introduction == 
 
-The original <em>wxWidgets</em> is an object-oriented (C++) api and
+The original <em>wxWidgets</em> is an object-oriented (C++) API and
 that is reflected in the erlang mapping. In most cases each class in
 wxWidgets is represented as a module in erlang. This gives
 the <em>wx</em> application a huge interface, spread over several
 modules, and it all starts with the <em>wx</em>
 module. The <em>wx</em> module contains functions to create and
-destroy the gui, i.e. <code>wx:new/0</code>,<code>wx:destroy/0</code>, and
+destroy the GUI, i.e. <code>wx:new/0</code>, <code>wx:destroy/0</code>, and
 some other useful functions. 
 
 Objects or object references in <em>wx</em> should be seen as erlang
-processes rather then erlang terms. When you operate on them they can
+processes rather than erlang terms. When you operate on them they can
 change state, e.g. they are not functional objects as erlang terms are.
 Each object has a type or rather a class, which is manipulated with
 the corresponding module or by sub-classes of that object. Type
@@ -62,7 +62,7 @@ For example the <em>wxWindow</em> C++ class is implemented in the
 member <em>wxWindow::CenterOnParent</em> is
 thus <em>wxWindow:centerOnParent</em>.  The following C++ code:
 <pre>
-  wxWindow MyWin = new wxWindo();
+  wxWindow MyWin = new wxWindow();
   MyWin.CenterOnParent(wxVERTICAL);
   ...
   delete MyWin;
@@ -91,7 +91,7 @@ they are directly mapped to corresponding erlang terms:
   <dt><em>wxGridCellCoords</em> is represented by {Row,Column}</dt>
 </dl>
 
-In the places where the erlang api differs from the original one it should
+In the places where the erlang API differs from the original one it should
 be obvious from the erlang documentation which representation has
 been used. E.g. the C++ arrays and/or lists are sometimes represented
 as erlang lists and sometimes as tuples.
@@ -112,7 +112,7 @@ Additionally some global functions, i.e. non-class functions, exist in
 the <c>wx_misc</c> module.
 
 <em>wxErlang</em> is implemented as a (threaded) driver and a rather direct
-interface to the C++ api, with the drawback that if the erlang
+interface to the C++ API, with the drawback that if the erlang
 programmer does an error, it might crash the emulator.
 
 Since the driver is threaded it requires a <em>smp</em> enabled emulator,
@@ -121,7 +121,7 @@ that provides a thread safe interface to the driver.
 == Multiple processes and memory handling == 
 
 The intention is that each erlang application calls wx:new() once to
-setup it's gui which creates an environment and a memory mapping.  To
+setup it's GUI which creates an environment and a memory mapping.  To
 be able to use <em>wx</em> from several processes in your application,
 you must share the environment. You can get the active environment with
 <code>wx:get_env/0</code> and set it in the new processes
@@ -153,26 +153,26 @@ increasing memory usage. This is especially important when
 <em>wxWidgets</em> assumes or recommends that you (or rather the C++
 programmer) have allocated the object on the stack since that will
 never be done in the erlang binding. For example <code>wxDC</code> class
-or its sub-classes or <code> wxSizerFlags</code>. 
+or its sub-classes or <code>wxSizerFlags</code>. 
 
 Currently the dialogs show modal function freezes wxWidgets
 until the dialog is closed. That is intended but in erlang where you
-can have several gui applications running at the same time it causes
+can have several GUI applications running at the same time it causes
 trouble. This will hopefully be fixed in future <em>wxWidgets</em>
 releases.
 
 == Event Handling ==
 
-Event handling in <em>wx</em> differs most the from the original api.
+Event handling in <em>wx</em> differs most from the original API.
 You must specify every event you want to handle in <em>wxWidgets</em>,
-that is the same in the erlang binding but can you choose to receive
-the events as messages or handle them with callback funs.
+that is the same in the erlang binding but you can choose to receive
+the events as messages or handle them with callback  <em>funs</em>.
 
 Otherwise the event subscription is handled as <em>wxWidgets</em>
 dynamic event-handler connection. You subscribe to events of a certain
-type from objects with an <em>ID</em> or within a range of ID:s. The
-callback fun is optional, if not supplied the event will be sent to the
-process that called <em>connect/2</em>. Thus, a handler is a callback fun
+type from objects with an <em>ID</em> or within a range of <em>ID</em>s. The
+callback <em>fun</em> is optional, if not supplied the event will be sent to the
+process that called <em>connect/2</em>. Thus, a handler is a callback <em>fun</em>
 or a process which will receive an event message.
 
 Events are handled in order from bottom to top, in the widgets
@@ -195,7 +195,7 @@ subscribed to
 <em>wxKey</em> event record where <code>Event#wxKey.type =
 key_up</code>.
 
-In <em>wxWidgets</em> the developer have to call 
+In <em>wxWidgets</em> the developer has to call 
 <code>wxEvent:skip()</code> if he wants the event to be processed by
 other handlers. You can do the same in <em>wx</em> if you use
 callbacks. If you want the event as messages you just don't supply a
@@ -217,11 +217,11 @@ following handlers. The actual event objects are deleted after
 the <em>fun</em> returns.
 
 The callbacks are always invoked by another process and have
-exclusive usage of the gui when invoked. This means that a callback fun
+exclusive usage of the GUI when invoked. This means that a callback <em>fun</em>
 can not use the process dictionary and should not make calls to other
-processes.  Calls to another process inside a callback fun may cause a
+processes.  Calls to another process inside a callback <em>fun</em> may cause a
 deadlock if the other process is waiting on completion of his call to
-the gui.
+the GUI.
 
 == Acknowledgments ==
 
diff --git a/lib/wx/doc/src/book.xml b/lib/wx/doc/src/book.xml
index d517892776..769b204ed6 100644
--- a/lib/wx/doc/src/book.xml
+++ b/lib/wx/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2009</year>
+      <year>2009</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/wx/doc/src/fascicules.xml b/lib/wx/doc/src/fascicules.xml
index 1b9d6bc94d..154c8a3b6d 100644
--- a/lib/wx/doc/src/fascicules.xml
+++ b/lib/wx/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index a6e89d32a9..6e653cf828 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,58 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 1.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a problem which caused the debugger to crash when
+	    closing a window. Fixed static linking on mac.</p>
+          <p>
+	    Own Id: OTP-11444</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Wx 1.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    wx initialization hanged with wxWidgets-3.0 on mac. Fixed
+	    a crash with wxListBox on wxWidgets-3.0 (thanks Sergei
+	    Golovan) Fixed documentation links. Fixed event callbacks
+	    cleanup.</p>
+          <p>
+	    Own Id: OTP-11393</p>
+        </item>
+        <item>
+          <p>
+	    Improve documentation (Thanks to Boris Mühmer)</p>
+          <p>
+	    Own Id: OTP-11505</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fix silent make rules (Thanks to Anthony Ramine)</p>
+          <p>
+	    Own Id: OTP-11515</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 1.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -39,7 +91,7 @@
           <p>
 	    Add {silent_start, boolean()} option to wx:new/1 in order
 	    to be able to suppress error messages during startup of
-	    wx. (Thanks to H�kan Mattsson)</p>
+	    wx. (Thanks to Håkan Mattsson)</p>
           <p>
 	    Own Id: OTP-10585</p>
         </item>
diff --git a/lib/wx/doc/src/part.xml b/lib/wx/doc/src/part.xml
index 168add1a3c..a11473462c 100644
--- a/lib/wx/doc/src/part.xml
+++ b/lib/wx/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2009</year>
+      <year>2009</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/wx/doc/src/part_notes.xml b/lib/wx/doc/src/part_notes.xml
index 539ced5f1d..958a273488 100644
--- a/lib/wx/doc/src/part_notes.xml
+++ b/lib/wx/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2009</year>
+      <year>2009</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/wx/doc/src/ref_man.xml.src b/lib/wx/doc/src/ref_man.xml.src
index 77fd16b050..26706d538b 100644
--- a/lib/wx/doc/src/ref_man.xml.src
+++ b/lib/wx/doc/src/ref_man.xml.src
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2009</year>
+      <year>2009</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/wx/include/wx.hrl b/lib/wx/include/wx.hrl
index a48c756dea..2dc1791cce 100644
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -255,6 +255,10 @@
 -type wxMouseEventType() :: left_down | left_up | middle_down | middle_up | right_down | right_up | motion | enter_window | leave_window | left_dclick | middle_dclick | right_dclick | mousewheel.
 -type wxMouse() :: #wxMouse{}. %% Callback event: {@link wxMouseEvent}
 
+-record(wxClipboardText, {type :: wxClipboardTextEventType()}). %% Callback event: {@link wxClipboardTextEvent}
+-type wxClipboardTextEventType() :: command_text_copy | command_text_cut | command_text_paste.
+-type wxClipboardText() :: #wxClipboardText{}. %% Callback event: {@link wxClipboardTextEvent}
+
 -record(wxWindowCreate, {type :: wxWindowCreateEventType()}). %% Callback event: {@link wxWindowCreateEvent}
 -type wxWindowCreateEventType() :: create.
 -type wxWindowCreate() :: #wxWindowCreate{}. %% Callback event: {@link wxWindowCreateEvent}
@@ -269,6 +273,10 @@
 -type wxAuiManagerEventType() :: aui_pane_button | aui_pane_close | aui_pane_maximize | aui_pane_restore | aui_render | aui_find_manager.
 -type wxAuiManager() :: #wxAuiManager{}. %% Callback event: {@link wxAuiManagerEvent}
 
+-record(wxInitDialog, {type :: wxInitDialogEventType()}). %% Callback event: {@link wxInitDialogEvent}
+-type wxInitDialogEventType() :: init_dialog.
+-type wxInitDialog() :: #wxInitDialog{}. %% Callback event: {@link wxInitDialogEvent}
+
 -record(wxCommand,{type :: wxCommandEventType(), %% Callback event: {@link wxCommandEvent}
 	cmdString :: unicode:chardata(),
 	commandInt :: integer(),
@@ -308,8 +316,8 @@
 -type wxTreeEventType() :: command_tree_begin_drag | command_tree_begin_rdrag | command_tree_begin_label_edit | command_tree_end_label_edit | command_tree_delete_item | command_tree_get_info | command_tree_set_info | command_tree_item_expanded | command_tree_item_expanding | command_tree_item_collapsed | command_tree_item_collapsing | command_tree_sel_changed | command_tree_sel_changing | command_tree_key_down | command_tree_item_activated | command_tree_item_right_click | command_tree_item_middle_click | command_tree_end_drag | command_tree_state_image_click | command_tree_item_gettooltip | command_tree_item_menu.
 -type wxTree() :: #wxTree{}. %% Callback event: {@link wxTreeEvent}
 
--type event() :: wxAuiManager() | wxAuiNotebook() | wxCalendar() | wxChildFocus() | wxClose() | wxColourPicker() | wxCommand() | wxContextMenu() | wxDate() | wxDisplayChanged() | wxErase() | wxFileDirPicker() | wxFocus() | wxFontPicker() | wxGrid() | wxHelp() | wxHtmlLink() | wxIconize() | wxIdle() | wxJoystick() | wxKey() | wxList() | wxMaximize() | wxMenu() | wxMouse() | wxMouseCaptureChanged() | wxMove() | wxNavigationKey() | wxNotebook() | wxPaint() | wxPaletteChanged() | wxQueryNewPalette() | wxSash() | wxScroll() | wxScrollWin() | wxSetCursor() | wxShow() | wxSize() | wxSpin() | wxSplitter() | wxStyledText() | wxSysColourChanged() | wxTaskBarIcon() | wxTree() | wxUpdateUI() | wxWindowCreate() | wxWindowDestroy().
--type wxEventType() :: wxAuiManagerEventType() | wxAuiNotebookEventType() | wxCalendarEventType() | wxChildFocusEventType() | wxCloseEventType() | wxColourPickerEventType() | wxCommandEventType() | wxContextMenuEventType() | wxDateEventType() | wxDisplayChangedEventType() | wxEraseEventType() | wxFileDirPickerEventType() | wxFocusEventType() | wxFontPickerEventType() | wxGridEventType() | wxHelpEventType() | wxHtmlLinkEventType() | wxIconizeEventType() | wxIdleEventType() | wxJoystickEventType() | wxKeyEventType() | wxListEventType() | wxMaximizeEventType() | wxMenuEventType() | wxMouseCaptureChangedEventType() | wxMouseEventType() | wxMoveEventType() | wxNavigationKeyEventType() | wxNotebookEventType() | wxPaintEventType() | wxPaletteChangedEventType() | wxQueryNewPaletteEventType() | wxSashEventType() | wxScrollEventType() | wxScrollWinEventType() | wxSetCursorEventType() | wxShowEventType() | wxSizeEventType() | wxSpinEventType() | wxSplitterEventType() | wxStyledTextEventType() | wxSysColourChangedEventType() | wxTaskBarIconEventType() | wxTreeEventType() | wxUpdateUIEventType() | wxWindowCreateEventType() | wxWindowDestroyEventType().
+-type event() :: wxAuiManager() | wxAuiNotebook() | wxCalendar() | wxChildFocus() | wxClipboardText() | wxClose() | wxColourPicker() | wxCommand() | wxContextMenu() | wxDate() | wxDisplayChanged() | wxErase() | wxFileDirPicker() | wxFocus() | wxFontPicker() | wxGrid() | wxHelp() | wxHtmlLink() | wxIconize() | wxIdle() | wxInitDialog() | wxJoystick() | wxKey() | wxList() | wxMaximize() | wxMenu() | wxMouse() | wxMouseCaptureChanged() | wxMove() | wxNavigationKey() | wxNotebook() | wxPaint() | wxPaletteChanged() | wxQueryNewPalette() | wxSash() | wxScroll() | wxScrollWin() | wxSetCursor() | wxShow() | wxSize() | wxSpin() | wxSplitter() | wxStyledText() | wxSysColourChanged() | wxTaskBarIcon() | wxTree() | wxUpdateUI() | wxWindowCreate() | wxWindowDestroy().
+-type wxEventType() :: wxAuiManagerEventType() | wxAuiNotebookEventType() | wxCalendarEventType() | wxChildFocusEventType() | wxClipboardTextEventType() | wxCloseEventType() | wxColourPickerEventType() | wxCommandEventType() | wxContextMenuEventType() | wxDateEventType() | wxDisplayChangedEventType() | wxEraseEventType() | wxFileDirPickerEventType() | wxFocusEventType() | wxFontPickerEventType() | wxGridEventType() | wxHelpEventType() | wxHtmlLinkEventType() | wxIconizeEventType() | wxIdleEventType() | wxInitDialogEventType() | wxJoystickEventType() | wxKeyEventType() | wxListEventType() | wxMaximizeEventType() | wxMenuEventType() | wxMouseCaptureChangedEventType() | wxMouseEventType() | wxMoveEventType() | wxNavigationKeyEventType() | wxNotebookEventType() | wxPaintEventType() | wxPaletteChangedEventType() | wxQueryNewPaletteEventType() | wxSashEventType() | wxScrollEventType() | wxScrollWinEventType() | wxSetCursorEventType() | wxShowEventType() | wxSizeEventType() | wxSpinEventType() | wxSplitterEventType() | wxStyledTextEventType() | wxSysColourChangedEventType() | wxTaskBarIconEventType() | wxTreeEventType() | wxUpdateUIEventType() | wxWindowCreateEventType() | wxWindowDestroyEventType().
 
 %% Hardcoded Records
 -record(wxMouseState, {x :: integer(), y :: integer(),
diff --git a/lib/wx/priv/erlang-logo128.png b/lib/wx/priv/erlang-logo128.png
new file mode 100644
index 0000000000..33d1475cea
--- /dev/null
+++ b/lib/wx/priv/erlang-logo128.png
diff --git a/lib/wx/priv/erlang-logo32.png b/lib/wx/priv/erlang-logo32.png
index a4afed8140..efddf5c5f9 100644
--- a/lib/wx/priv/erlang-logo32.png
+++ b/lib/wx/priv/erlang-logo32.png
diff --git a/lib/wx/priv/erlang-logo64.png b/lib/wx/priv/erlang-logo64.png
index 91dfbbab53..b7d2128cdb 100644
--- a/lib/wx/priv/erlang-logo64.png
+++ b/lib/wx/priv/erlang-logo64.png
diff --git a/lib/wx/src/gen/gl.erl b/lib/wx/src/gen/gl.erl
index 8a8158c35e..a2681732a8 100644
--- a/lib/wx/src/gen/gl.erl
+++ b/lib/wx/src/gen/gl.erl
@@ -1,5 +1,3 @@
-%% -*- coding: utf-8 -*-
-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/wx/src/gen/glu.erl b/lib/wx/src/gen/glu.erl
index dc64c3c3a7..5b0c0ed393 100644
--- a/lib/wx/src/gen/glu.erl
+++ b/lib/wx/src/gen/glu.erl
@@ -1,5 +1,3 @@
-%% -*- coding: utf-8 -*-
-
 %%
 %% %CopyrightBegin%
 %%
diff --git a/lib/wx/src/gen/wxAcceleratorEntry.erl b/lib/wx/src/gen/wxAcceleratorEntry.erl
index 3cf50a2348..a75fd8d8c0 100644
--- a/lib/wx/src/gen/wxAcceleratorEntry.erl
+++ b/lib/wx/src/gen/wxAcceleratorEntry.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html">wxAcceleratorEntry</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratorentry.html">wxAcceleratorEntry</a>.
 %% @type wxAcceleratorEntry().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -40,7 +40,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrywxacceleratorentry">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratorentry.html#wxacceleratorentrywxacceleratorentry">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Entry) -> wxAcceleratorEntry() when<br />
 %% 	Entry::wxAcceleratorEntry().<br />
@@ -67,7 +67,7 @@ new(#wx_ref{type=EntryT,ref=EntryRef}) ->
   wxe_util:construct(?wxAcceleratorEntry_new_1_1,
   <<EntryRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrygetcommand">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratorentry.html#wxacceleratorentrygetcommand">external documentation</a>.
 -spec getCommand(This) -> integer() when
 	This::wxAcceleratorEntry().
 getCommand(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -75,7 +75,7 @@ getCommand(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAcceleratorEntry_GetCommand,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrygetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratorentry.html#wxacceleratorentrygetflags">external documentation</a>.
 -spec getFlags(This) -> integer() when
 	This::wxAcceleratorEntry().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -83,7 +83,7 @@ getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAcceleratorEntry_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentrygetkeycode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratorentry.html#wxacceleratorentrygetkeycode">external documentation</a>.
 -spec getKeyCode(This) -> integer() when
 	This::wxAcceleratorEntry().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -99,7 +99,7 @@ set(This,Flags,KeyCode,Cmd)
  when is_record(This, wx_ref),is_integer(Flags),is_integer(KeyCode),is_integer(Cmd) ->
   set(This,Flags,KeyCode,Cmd, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratorentry.html#wxacceleratorentryset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratorentry.html#wxacceleratorentryset">external documentation</a>.
 -spec set(This, Flags, KeyCode, Cmd, [Option]) -> ok when
 	This::wxAcceleratorEntry(), Flags::integer(), KeyCode::integer(), Cmd::integer(),
 	Option :: {item, wxMenuItem:wxMenuItem()}.
diff --git a/lib/wx/src/gen/wxAcceleratorTable.erl b/lib/wx/src/gen/wxAcceleratorTable.erl
index 1b58cf3826..2832d34e3a 100644
--- a/lib/wx/src/gen/wxAcceleratorTable.erl
+++ b/lib/wx/src/gen/wxAcceleratorTable.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratortable.html">wxAcceleratorTable</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratortable.html">wxAcceleratorTable</a>.
 %% @type wxAcceleratorTable().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,13 +34,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxAcceleratorTable() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratortable.html#wxacceleratortablewxacceleratortable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratortable.html#wxacceleratortablewxacceleratortable">external documentation</a>.
 -spec new() -> wxAcceleratorTable().
 new() ->
   wxe_util:construct(?wxAcceleratorTable_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratortable.html#wxacceleratortablewxacceleratortable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratortable.html#wxacceleratortablewxacceleratortable">external documentation</a>.
 -spec new(N, Entries) -> wxAcceleratorTable() when
 	N::integer(), Entries::[wxAcceleratorEntry:wxAcceleratorEntry()].
 new(N,Entries)
@@ -50,7 +50,7 @@ new(N,Entries)
   <<N:32/?UI,(length(Entries)):32/?UI,
      (<< <<(C#wx_ref.ref):32/?UI>> || C <- Entries>>)/binary, 0:(((0+length(Entries)) rem 2)*32)>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxacceleratortable.html#wxacceleratortableok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxacceleratortable.html#wxacceleratortableok">external documentation</a>.
 -spec ok(This) -> boolean() when
 	This::wxAcceleratorTable().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxArtProvider.erl b/lib/wx/src/gen/wxArtProvider.erl
index 1515c46f9f..f1229c7455 100644
--- a/lib/wx/src/gen/wxArtProvider.erl
+++ b/lib/wx/src/gen/wxArtProvider.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxartprovider.html">wxArtProvider</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxartprovider.html">wxArtProvider</a>.
 %% @type wxArtProvider().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -42,7 +42,7 @@ getBitmap(Id)
  when is_list(Id) ->
   getBitmap(Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxartprovider.html#wxartprovidergetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxartprovider.html#wxartprovidergetbitmap">external documentation</a>.
 -spec getBitmap(Id, [Option]) -> wxBitmap:wxBitmap() when
 	Id::unicode:chardata(),
 	Option :: {client, unicode:chardata()}
@@ -65,7 +65,7 @@ getIcon(Id)
  when is_list(Id) ->
   getIcon(Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxartprovider.html#wxartprovidergeticon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxartprovider.html#wxartprovidergeticon">external documentation</a>.
 -spec getIcon(Id, [Option]) -> wxIcon:wxIcon() when
 	Id::unicode:chardata(),
 	Option :: {client, unicode:chardata()}
diff --git a/lib/wx/src/gen/wxAuiDockArt.erl b/lib/wx/src/gen/wxAuiDockArt.erl
index d3cf1ebd0d..29616b0943 100644
--- a/lib/wx/src/gen/wxAuiDockArt.erl
+++ b/lib/wx/src/gen/wxAuiDockArt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauidockart.html">wxAuiDockArt</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauidockart.html">wxAuiDockArt</a>.
 %% @type wxAuiDockArt().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
diff --git a/lib/wx/src/gen/wxAuiManager.erl b/lib/wx/src/gen/wxAuiManager.erl
index 71e851f706..45da283452 100644
--- a/lib/wx/src/gen/wxAuiManager.erl
+++ b/lib/wx/src/gen/wxAuiManager.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html">wxAuiManager</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html">wxAuiManager</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxEvtHandler}
 %% </p>
@@ -49,7 +49,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerwxauimanager">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagerwxauimanager">external documentation</a>.
 -spec new([Option]) -> wxAuiManager() when
 	Option :: {managed_wnd, wxWindow:wxWindow()}
 		 | {flags, integer()}.
@@ -70,7 +70,7 @@ addPane(This,Window)
  when is_record(This, wx_ref),is_record(Window, wx_ref) ->
   addPane(This,Window, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanageraddpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanageraddpane">external documentation</a>.
 %% <br /> Also:<br />
 %% addPane(This, Window, Pane_info) -> boolean() when<br />
 %% 	This::wxAuiManager(), Window::wxWindow:wxWindow(), Pane_info::wxAuiPaneInfo:wxAuiPaneInfo().<br />
@@ -98,7 +98,7 @@ addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_
   wxe_util:call(?wxAuiManager_AddPane_2_1,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Pane_infoRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanageraddpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanageraddpane">external documentation</a>.
 -spec addPane(This, Window, Pane_info, Drop_pos) -> boolean() when
 	This::wxAuiManager(), Window::wxWindow:wxWindow(), Pane_info::wxAuiPaneInfo:wxAuiPaneInfo(), Drop_pos::{X::integer(), Y::integer()}.
 addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=Pane_infoT,ref=Pane_infoRef},{Drop_posX,Drop_posY})
@@ -109,7 +109,7 @@ addPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_
   wxe_util:call(?wxAuiManager_AddPane_3,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Pane_infoRef:32/?UI,Drop_posX:32/?UI,Drop_posY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerdetachpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagerdetachpane">external documentation</a>.
 -spec detachPane(This, Window) -> boolean() when
 	This::wxAuiManager(), Window::wxWindow:wxWindow().
 detachPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -118,7 +118,7 @@ detachPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef})
   wxe_util:call(?wxAuiManager_DetachPane,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetallpanes">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetallpanes">external documentation</a>.
 -spec getAllPanes(This) -> wx:wx_object() when
 	This::wxAuiManager().
 getAllPanes(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -126,7 +126,7 @@ getAllPanes(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManager_GetAllPanes,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetartprovider">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetartprovider">external documentation</a>.
 -spec getArtProvider(This) -> wxAuiDockArt:wxAuiDockArt() when
 	This::wxAuiManager().
 getArtProvider(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -134,7 +134,7 @@ getArtProvider(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManager_GetArtProvider,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetdocksizeconstraint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetdocksizeconstraint">external documentation</a>.
 -spec getDockSizeConstraint(This) -> {Width_pct::number(), Height_pct::number()} when
 	This::wxAuiManager().
 getDockSizeConstraint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -142,7 +142,7 @@ getDockSizeConstraint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManager_GetDockSizeConstraint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetflags">external documentation</a>.
 -spec getFlags(This) -> integer() when
 	This::wxAuiManager().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -150,7 +150,7 @@ getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManager_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetmanagedwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetmanagedwindow">external documentation</a>.
 -spec getManagedWindow(This) -> wxWindow:wxWindow() when
 	This::wxAuiManager().
 getManagedWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -158,7 +158,7 @@ getManagedWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManager_GetManagedWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetmanager">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetmanager">external documentation</a>.
 -spec getManager(Window) -> wxAuiManager() when
 	Window::wxWindow:wxWindow().
 getManager(#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -166,7 +166,7 @@ getManager(#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(?wxAuiManager_GetManager,
   <<WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagergetpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagergetpane">external documentation</a>.
 %% <br /> Also:<br />
 %% getPane(This, Window) -> wxAuiPaneInfo:wxAuiPaneInfo() when<br />
 %% 	This::wxAuiManager(), Window::wxWindow:wxWindow().<br />
@@ -187,7 +187,7 @@ getPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(?wxAuiManager_GetPane_1_1,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerhidehint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagerhidehint">external documentation</a>.
 -spec hideHint(This) -> ok when
 	This::wxAuiManager().
 hideHint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -203,7 +203,7 @@ insertPane(This,Window,Insert_location)
  when is_record(This, wx_ref),is_record(Window, wx_ref),is_record(Insert_location, wx_ref) ->
   insertPane(This,Window,Insert_location, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerinsertpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagerinsertpane">external documentation</a>.
 -spec insertPane(This, Window, Insert_location, [Option]) -> boolean() when
 	This::wxAuiManager(), Window::wxWindow:wxWindow(), Insert_location::wxAuiPaneInfo:wxAuiPaneInfo(),
 	Option :: {insert_level, integer()}.
@@ -218,7 +218,7 @@ insertPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#
   wxe_util:call(?wxAuiManager_InsertPane,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Insert_locationRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerloadpaneinfo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagerloadpaneinfo">external documentation</a>.
 -spec loadPaneInfo(This, Pane_part, Pane) -> ok when
 	This::wxAuiManager(), Pane_part::unicode:chardata(), Pane::wxAuiPaneInfo:wxAuiPaneInfo().
 loadPaneInfo(#wx_ref{type=ThisT,ref=ThisRef},Pane_part,#wx_ref{type=PaneT,ref=PaneRef})
@@ -237,7 +237,7 @@ loadPerspective(This,Perspective)
  when is_record(This, wx_ref),is_list(Perspective) ->
   loadPerspective(This,Perspective, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerloadperspective">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagerloadperspective">external documentation</a>.
 -spec loadPerspective(This, Perspective, [Option]) -> boolean() when
 	This::wxAuiManager(), Perspective::unicode:chardata(),
 	Option :: {update, boolean()}.
@@ -251,7 +251,7 @@ loadPerspective(#wx_ref{type=ThisT,ref=ThisRef},Perspective, Options)
   wxe_util:call(?wxAuiManager_LoadPerspective,
   <<ThisRef:32/?UI,(byte_size(Perspective_UC)):32/?UI,(Perspective_UC)/binary, 0:(((8- ((0+byte_size(Perspective_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersavepaneinfo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagersavepaneinfo">external documentation</a>.
 -spec savePaneInfo(This, Pane) -> unicode:charlist() when
 	This::wxAuiManager(), Pane::wxAuiPaneInfo:wxAuiPaneInfo().
 savePaneInfo(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaneT,ref=PaneRef}) ->
@@ -260,7 +260,7 @@ savePaneInfo(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaneT,ref=PaneRef}) ->
   wxe_util:call(?wxAuiManager_SavePaneInfo,
   <<ThisRef:32/?UI,PaneRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersaveperspective">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagersaveperspective">external documentation</a>.
 -spec savePerspective(This) -> unicode:charlist() when
 	This::wxAuiManager().
 savePerspective(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -268,7 +268,7 @@ savePerspective(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManager_SavePerspective,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetartprovider">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagersetartprovider">external documentation</a>.
 -spec setArtProvider(This, Art_provider) -> ok when
 	This::wxAuiManager(), Art_provider::wxAuiDockArt:wxAuiDockArt().
 setArtProvider(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Art_providerT,ref=Art_providerRef}) ->
@@ -277,7 +277,7 @@ setArtProvider(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Art_providerT,ref=Ar
   wxe_util:cast(?wxAuiManager_SetArtProvider,
   <<ThisRef:32/?UI,Art_providerRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetdocksizeconstraint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagersetdocksizeconstraint">external documentation</a>.
 -spec setDockSizeConstraint(This, Width_pct, Height_pct) -> ok when
 	This::wxAuiManager(), Width_pct::number(), Height_pct::number().
 setDockSizeConstraint(#wx_ref{type=ThisT,ref=ThisRef},Width_pct,Height_pct)
@@ -286,7 +286,7 @@ setDockSizeConstraint(#wx_ref{type=ThisT,ref=ThisRef},Width_pct,Height_pct)
   wxe_util:cast(?wxAuiManager_SetDockSizeConstraint,
   <<ThisRef:32/?UI,0:32,Width_pct:64/?F,Height_pct:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagersetflags">external documentation</a>.
 -spec setFlags(This, Flags) -> ok when
 	This::wxAuiManager(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -295,7 +295,7 @@ setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
   wxe_util:cast(?wxAuiManager_SetFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagersetmanagedwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagersetmanagedwindow">external documentation</a>.
 -spec setManagedWindow(This, Managed_wnd) -> ok when
 	This::wxAuiManager(), Managed_wnd::wxWindow:wxWindow().
 setManagedWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Managed_wndT,ref=Managed_wndRef}) ->
@@ -304,7 +304,7 @@ setManagedWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Managed_wndT,ref=M
   wxe_util:cast(?wxAuiManager_SetManagedWindow,
   <<ThisRef:32/?UI,Managed_wndRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagershowhint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagershowhint">external documentation</a>.
 -spec showHint(This, Rect) -> ok when
 	This::wxAuiManager(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 showHint(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
@@ -313,7 +313,7 @@ showHint(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxAuiManager_ShowHint,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanageruninit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanageruninit">external documentation</a>.
 -spec unInit(This) -> ok when
 	This::wxAuiManager().
 unInit(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -321,7 +321,7 @@ unInit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxAuiManager_UnInit,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanager.html#wxauimanagerupdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanager.html#wxauimanagerupdate">external documentation</a>.
 -spec update(This) -> ok when
 	This::wxAuiManager().
 update(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxAuiManagerEvent.erl b/lib/wx/src/gen/wxAuiManagerEvent.erl
index feb3931696..2810a9a077 100644
--- a/lib/wx/src/gen/wxAuiManagerEvent.erl
+++ b/lib/wx/src/gen/wxAuiManagerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html">wxAuiManagerEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html">wxAuiManagerEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>aui_pane_button</em>, <em>aui_pane_close</em>, <em>aui_pane_maximize</em>, <em>aui_pane_restore</em>, <em>aui_render</em>, <em>aui_find_manager</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxAuiManager(). #wxAuiManager{}} event record type.
@@ -44,7 +44,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxAuiManagerEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetmanager">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventsetmanager">external documentation</a>.
 -spec setManager(This, Mgr) -> ok when
 	This::wxAuiManagerEvent(), Mgr::wxAuiManager:wxAuiManager().
 setManager(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MgrT,ref=MgrRef}) ->
@@ -53,7 +53,7 @@ setManager(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MgrT,ref=MgrRef}) ->
   wxe_util:cast(?wxAuiManagerEvent_SetManager,
   <<ThisRef:32/?UI,MgrRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetmanager">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventgetmanager">external documentation</a>.
 -spec getManager(This) -> wxAuiManager:wxAuiManager() when
 	This::wxAuiManagerEvent().
 getManager(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -61,7 +61,7 @@ getManager(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManagerEvent_GetManager,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventsetpane">external documentation</a>.
 -spec setPane(This, P) -> ok when
 	This::wxAuiManagerEvent(), P::wxAuiPaneInfo:wxAuiPaneInfo().
 setPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PT,ref=PRef}) ->
@@ -70,7 +70,7 @@ setPane(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PT,ref=PRef}) ->
   wxe_util:cast(?wxAuiManagerEvent_SetPane,
   <<ThisRef:32/?UI,PRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventgetpane">external documentation</a>.
 -spec getPane(This) -> wxAuiPaneInfo:wxAuiPaneInfo() when
 	This::wxAuiManagerEvent().
 getPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -78,7 +78,7 @@ getPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManagerEvent_GetPane,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventsetbutton">external documentation</a>.
 -spec setButton(This, B) -> ok when
 	This::wxAuiManagerEvent(), B::integer().
 setButton(#wx_ref{type=ThisT,ref=ThisRef},B)
@@ -87,7 +87,7 @@ setButton(#wx_ref{type=ThisT,ref=ThisRef},B)
   wxe_util:cast(?wxAuiManagerEvent_SetButton,
   <<ThisRef:32/?UI,B:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventgetbutton">external documentation</a>.
 -spec getButton(This) -> integer() when
 	This::wxAuiManagerEvent().
 getButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -95,7 +95,7 @@ getButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManagerEvent_GetButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventsetdc">external documentation</a>.
 -spec setDC(This, Pdc) -> ok when
 	This::wxAuiManagerEvent(), Pdc::wxDC:wxDC().
 setDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PdcT,ref=PdcRef}) ->
@@ -104,7 +104,7 @@ setDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PdcT,ref=PdcRef}) ->
   wxe_util:cast(?wxAuiManagerEvent_SetDC,
   <<ThisRef:32/?UI,PdcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventgetdc">external documentation</a>.
 -spec getDC(This) -> wxDC:wxDC() when
 	This::wxAuiManagerEvent().
 getDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -120,7 +120,7 @@ veto(This)
  when is_record(This, wx_ref) ->
   veto(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventveto">external documentation</a>.
 -spec veto(This, [Option]) -> ok when
 	This::wxAuiManagerEvent(),
 	Option :: {veto, boolean()}.
@@ -133,7 +133,7 @@ veto(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxAuiManagerEvent_Veto,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventgetveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventgetveto">external documentation</a>.
 -spec getVeto(This) -> boolean() when
 	This::wxAuiManagerEvent().
 getVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -141,7 +141,7 @@ getVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiManagerEvent_GetVeto,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventsetcanveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventsetcanveto">external documentation</a>.
 -spec setCanVeto(This, Can_veto) -> ok when
 	This::wxAuiManagerEvent(), Can_veto::boolean().
 setCanVeto(#wx_ref{type=ThisT,ref=ThisRef},Can_veto)
@@ -150,7 +150,7 @@ setCanVeto(#wx_ref{type=ThisT,ref=ThisRef},Can_veto)
   wxe_util:cast(?wxAuiManagerEvent_SetCanVeto,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Can_veto)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauimanagerevent.html#wxauimanagereventcanveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauimanagerevent.html#wxauimanagereventcanveto">external documentation</a>.
 -spec canVeto(This) -> boolean() when
 	This::wxAuiManagerEvent().
 canVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxAuiNotebook.erl b/lib/wx/src/gen/wxAuiNotebook.erl
index afb599738f..fcf70bbc9f 100644
--- a/lib/wx/src/gen/wxAuiNotebook.erl
+++ b/lib/wx/src/gen/wxAuiNotebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html">wxAuiNotebook</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html">wxAuiNotebook</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -81,7 +81,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxAuiNotebook() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookwxauinotebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookwxauinotebook">external documentation</a>.
 -spec new() -> wxAuiNotebook().
 new() ->
   wxe_util:construct(?wxAuiNotebook_new_0,
@@ -95,7 +95,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookwxauinotebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookwxauinotebook">external documentation</a>.
 -spec new(Parent, [Option]) -> wxAuiNotebook() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -122,7 +122,7 @@ addPage(This,Page,Caption)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Caption) ->
   addPage(This,Page,Caption, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookaddpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookaddpage">external documentation</a>.
 -spec addPage(This, Page, Caption, [Option]) -> boolean() when
 	This::wxAuiNotebook(), Page::wxWindow:wxWindow(), Caption::unicode:chardata(),
 	Option :: {select, boolean()}
@@ -147,7 +147,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxAuiNotebook(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -167,7 +167,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxAuiNotebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookdeletepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookdeletepage">external documentation</a>.
 -spec deletePage(This, Page) -> boolean() when
 	This::wxAuiNotebook(), Page::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},Page)
@@ -176,7 +176,7 @@ deletePage(#wx_ref{type=ThisT,ref=ThisRef},Page)
   wxe_util:call(?wxAuiNotebook_DeletePage,
   <<ThisRef:32/?UI,Page:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetartprovider">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookgetartprovider">external documentation</a>.
 -spec getArtProvider(This) -> wxAuiTabArt:wxAuiTabArt() when
 	This::wxAuiNotebook().
 getArtProvider(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -184,7 +184,7 @@ getArtProvider(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiNotebook_GetArtProvider,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookgetpage">external documentation</a>.
 -spec getPage(This, Page_idx) -> wxWindow:wxWindow() when
 	This::wxAuiNotebook(), Page_idx::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
@@ -193,7 +193,7 @@ getPage(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
   wxe_util:call(?wxAuiNotebook_GetPage,
   <<ThisRef:32/?UI,Page_idx:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpagebitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookgetpagebitmap">external documentation</a>.
 -spec getPageBitmap(This, Page_idx) -> wxBitmap:wxBitmap() when
 	This::wxAuiNotebook(), Page_idx::integer().
 getPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
@@ -202,7 +202,7 @@ getPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
   wxe_util:call(?wxAuiNotebook_GetPageBitmap,
   <<ThisRef:32/?UI,Page_idx:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookgetpagecount">external documentation</a>.
 -spec getPageCount(This) -> integer() when
 	This::wxAuiNotebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -210,7 +210,7 @@ getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiNotebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpageindex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookgetpageindex">external documentation</a>.
 -spec getPageIndex(This, Page_wnd) -> integer() when
 	This::wxAuiNotebook(), Page_wnd::wxWindow:wxWindow().
 getPageIndex(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Page_wndT,ref=Page_wndRef}) ->
@@ -219,7 +219,7 @@ getPageIndex(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=Page_wndT,ref=Page_wnd
   wxe_util:call(?wxAuiNotebook_GetPageIndex,
   <<ThisRef:32/?UI,Page_wndRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookgetpagetext">external documentation</a>.
 -spec getPageText(This, Page_idx) -> unicode:charlist() when
 	This::wxAuiNotebook(), Page_idx::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
@@ -228,7 +228,7 @@ getPageText(#wx_ref{type=ThisT,ref=ThisRef},Page_idx)
   wxe_util:call(?wxAuiNotebook_GetPageText,
   <<ThisRef:32/?UI,Page_idx:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxAuiNotebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -244,7 +244,7 @@ insertPage(This,Page_idx,Page,Caption)
  when is_record(This, wx_ref),is_integer(Page_idx),is_record(Page, wx_ref),is_list(Caption) ->
   insertPage(This,Page_idx,Page,Caption, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookinsertpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookinsertpage">external documentation</a>.
 -spec insertPage(This, Page_idx, Page, Caption, [Option]) -> boolean() when
 	This::wxAuiNotebook(), Page_idx::integer(), Page::wxWindow:wxWindow(), Caption::unicode:chardata(),
 	Option :: {select, boolean()}
@@ -261,7 +261,7 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},Page_idx,#wx_ref{type=PageT,ref=PageR
   wxe_util:call(?wxAuiNotebook_InsertPage,
   <<ThisRef:32/?UI,Page_idx:32/?UI,PageRef:32/?UI,(byte_size(Caption_UC)):32/?UI,(Caption_UC)/binary, 0:(((8- ((0+byte_size(Caption_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebookremovepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebookremovepage">external documentation</a>.
 -spec removePage(This, Page) -> boolean() when
 	This::wxAuiNotebook(), Page::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},Page)
@@ -270,7 +270,7 @@ removePage(#wx_ref{type=ThisT,ref=ThisRef},Page)
   wxe_util:call(?wxAuiNotebook_RemovePage,
   <<ThisRef:32/?UI,Page:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetartprovider">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebooksetartprovider">external documentation</a>.
 -spec setArtProvider(This, Art) -> ok when
 	This::wxAuiNotebook(), Art::wxAuiTabArt:wxAuiTabArt().
 setArtProvider(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ArtT,ref=ArtRef}) ->
@@ -279,7 +279,7 @@ setArtProvider(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ArtT,ref=ArtRef}) ->
   wxe_util:cast(?wxAuiNotebook_SetArtProvider,
   <<ThisRef:32/?UI,ArtRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebooksetfont">external documentation</a>.
 -spec setFont(This, Font) -> boolean() when
 	This::wxAuiNotebook(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -288,7 +288,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:call(?wxAuiNotebook_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetpagebitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebooksetpagebitmap">external documentation</a>.
 -spec setPageBitmap(This, Page, Bitmap) -> boolean() when
 	This::wxAuiNotebook(), Page::integer(), Bitmap::wxBitmap:wxBitmap().
 setPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page,#wx_ref{type=BitmapT,ref=BitmapRef})
@@ -298,7 +298,7 @@ setPageBitmap(#wx_ref{type=ThisT,ref=ThisRef},Page,#wx_ref{type=BitmapT,ref=Bitm
   wxe_util:call(?wxAuiNotebook_SetPageBitmap,
   <<ThisRef:32/?UI,Page:32/?UI,BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebooksetpagetext">external documentation</a>.
 -spec setPageText(This, Page, Text) -> boolean() when
 	This::wxAuiNotebook(), Page::integer(), Text::unicode:chardata().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},Page,Text)
@@ -308,7 +308,7 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},Page,Text)
   wxe_util:call(?wxAuiNotebook_SetPageText,
   <<ThisRef:32/?UI,Page:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebooksetselection">external documentation</a>.
 -spec setSelection(This, New_page) -> integer() when
 	This::wxAuiNotebook(), New_page::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},New_page)
@@ -317,7 +317,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},New_page)
   wxe_util:call(?wxAuiNotebook_SetSelection,
   <<ThisRef:32/?UI,New_page:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksettabctrlheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebooksettabctrlheight">external documentation</a>.
 -spec setTabCtrlHeight(This, Height) -> ok when
 	This::wxAuiNotebook(), Height::integer().
 setTabCtrlHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
@@ -326,7 +326,7 @@ setTabCtrlHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
   wxe_util:cast(?wxAuiNotebook_SetTabCtrlHeight,
   <<ThisRef:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebook.html#wxauinotebooksetuniformbitmapsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebook.html#wxauinotebooksetuniformbitmapsize">external documentation</a>.
 -spec setUniformBitmapSize(This, Size) -> ok when
 	This::wxAuiNotebook(), Size::{W::integer(), H::integer()}.
 setUniformBitmapSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
diff --git a/lib/wx/src/gen/wxAuiNotebookEvent.erl b/lib/wx/src/gen/wxAuiNotebookEvent.erl
index 6a86464369..4578674401 100644
--- a/lib/wx/src/gen/wxAuiNotebookEvent.erl
+++ b/lib/wx/src/gen/wxAuiNotebookEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html">wxAuiNotebookEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebookevent.html">wxAuiNotebookEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_auinotebook_page_close</em>, <em>command_auinotebook_page_changed</em>, <em>command_auinotebook_page_changing</em>, <em>command_auinotebook_button</em>, <em>command_auinotebook_begin_drag</em>, <em>command_auinotebook_end_drag</em>, <em>command_auinotebook_drag_motion</em>, <em>command_auinotebook_allow_dnd</em>, <em>command_auinotebook_tab_middle_down</em>, <em>command_auinotebook_tab_middle_up</em>, <em>command_auinotebook_tab_right_down</em>, <em>command_auinotebook_tab_right_up</em>, <em>command_auinotebook_page_closed</em>, <em>command_auinotebook_drag_done</em>, <em>command_auinotebook_bg_dclick</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxAuiNotebook(). #wxAuiNotebook{}} event record type.
@@ -50,7 +50,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxAuiNotebookEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebookevent.html#wxauinotebookeventsetselection">external documentation</a>.
 -spec setSelection(This, S) -> ok when
 	This::wxAuiNotebookEvent(), S::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
@@ -59,7 +59,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
   wxe_util:cast(?wxAuiNotebookEvent_SetSelection,
   <<ThisRef:32/?UI,S:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebookevent.html#wxauinotebookeventgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxAuiNotebookEvent().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -67,7 +67,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiNotebookEvent_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventsetoldselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebookevent.html#wxauinotebookeventsetoldselection">external documentation</a>.
 -spec setOldSelection(This, S) -> ok when
 	This::wxAuiNotebookEvent(), S::integer().
 setOldSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
@@ -76,7 +76,7 @@ setOldSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
   wxe_util:cast(?wxAuiNotebookEvent_SetOldSelection,
   <<ThisRef:32/?UI,S:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventgetoldselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebookevent.html#wxauinotebookeventgetoldselection">external documentation</a>.
 -spec getOldSelection(This) -> integer() when
 	This::wxAuiNotebookEvent().
 getOldSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -84,7 +84,7 @@ getOldSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiNotebookEvent_GetOldSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventsetdragsource">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebookevent.html#wxauinotebookeventsetdragsource">external documentation</a>.
 -spec setDragSource(This, S) -> ok when
 	This::wxAuiNotebookEvent(), S::wxAuiNotebook:wxAuiNotebook().
 setDragSource(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ST,ref=SRef}) ->
@@ -93,7 +93,7 @@ setDragSource(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ST,ref=SRef}) ->
   wxe_util:cast(?wxAuiNotebookEvent_SetDragSource,
   <<ThisRef:32/?UI,SRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauinotebookevent.html#wxauinotebookeventgetdragsource">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauinotebookevent.html#wxauinotebookeventgetdragsource">external documentation</a>.
 -spec getDragSource(This) -> wxAuiNotebook:wxAuiNotebook() when
 	This::wxAuiNotebookEvent().
 getDragSource(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxAuiPaneInfo.erl b/lib/wx/src/gen/wxAuiPaneInfo.erl
index d59a8e8676..f4148ed7c3 100644
--- a/lib/wx/src/gen/wxAuiPaneInfo.erl
+++ b/lib/wx/src/gen/wxAuiPaneInfo.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html">wxAuiPaneInfo</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html">wxAuiPaneInfo</a>.
 %% @type wxAuiPaneInfo().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -49,13 +49,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxAuiPaneInfo() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfowxauipaneinfo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfowxauipaneinfo">external documentation</a>.
 -spec new() -> wxAuiPaneInfo().
 new() ->
   wxe_util:construct(?wxAuiPaneInfo_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfowxauipaneinfo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfowxauipaneinfo">external documentation</a>.
 -spec new(C) -> wxAuiPaneInfo() when
 	C::wxAuiPaneInfo().
 new(#wx_ref{type=CT,ref=CRef}) ->
@@ -63,7 +63,7 @@ new(#wx_ref{type=CT,ref=CRef}) ->
   wxe_util:construct(?wxAuiPaneInfo_new_1,
   <<CRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobestsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfobestsize">external documentation</a>.
 -spec bestSize(This, Size) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 bestSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -72,7 +72,7 @@ bestSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:call(?wxAuiPaneInfo_BestSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobestsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfobestsize">external documentation</a>.
 -spec bestSize(This, X, Y) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 bestSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -81,7 +81,7 @@ bestSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxAuiPaneInfo_BestSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobottom">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfobottom">external documentation</a>.
 -spec bottom(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 bottom(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -97,7 +97,7 @@ bottomDockable(This)
  when is_record(This, wx_ref) ->
   bottomDockable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfobottomdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfobottomdockable">external documentation</a>.
 -spec bottomDockable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -110,7 +110,7 @@ bottomDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_BottomDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocaption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfocaption">external documentation</a>.
 -spec caption(This, C) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), C::unicode:chardata().
 caption(#wx_ref{type=ThisT,ref=ThisRef},C)
@@ -128,7 +128,7 @@ captionVisible(This)
  when is_record(This, wx_ref) ->
   captionVisible(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocaptionvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfocaptionvisible">external documentation</a>.
 -spec captionVisible(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {visible, boolean()}.
@@ -141,7 +141,7 @@ captionVisible(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_CaptionVisible,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocentre">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfocentre">external documentation</a>.
 -spec centre(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 centre(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -149,7 +149,7 @@ centre(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_Centre,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfocentrepane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfocentrepane">external documentation</a>.
 -spec centrePane(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 centrePane(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -165,7 +165,7 @@ closeButton(This)
  when is_record(This, wx_ref) ->
   closeButton(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoclosebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoclosebutton">external documentation</a>.
 -spec closeButton(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {visible, boolean()}.
@@ -178,7 +178,7 @@ closeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_CloseButton,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodefaultpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfodefaultpane">external documentation</a>.
 -spec defaultPane(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 defaultPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -194,7 +194,7 @@ destroyOnClose(This)
  when is_record(This, wx_ref) ->
   destroyOnClose(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodestroyonclose">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfodestroyonclose">external documentation</a>.
 -spec destroyOnClose(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -207,7 +207,7 @@ destroyOnClose(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_DestroyOnClose,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodirection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfodirection">external documentation</a>.
 -spec direction(This, Direction) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Direction::integer().
 direction(#wx_ref{type=ThisT,ref=ThisRef},Direction)
@@ -216,7 +216,7 @@ direction(#wx_ref{type=ThisT,ref=ThisRef},Direction)
   wxe_util:call(?wxAuiPaneInfo_Direction,
   <<ThisRef:32/?UI,Direction:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodock">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfodock">external documentation</a>.
 -spec dock(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 dock(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -232,7 +232,7 @@ dockable(This)
  when is_record(This, wx_ref) ->
   dockable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfodockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfodockable">external documentation</a>.
 -spec dockable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -245,7 +245,7 @@ dockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Dockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofixed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfofixed">external documentation</a>.
 -spec fixed(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 fixed(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -253,7 +253,7 @@ fixed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_Fixed,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloat">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfofloat">external documentation</a>.
 -spec float(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 float(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -269,7 +269,7 @@ floatable(This)
  when is_record(This, wx_ref) ->
   floatable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfofloatable">external documentation</a>.
 -spec floatable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -282,7 +282,7 @@ floatable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Floatable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfofloatingposition">external documentation</a>.
 -spec floatingPosition(This, Pos) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Pos::{X::integer(), Y::integer()}.
 floatingPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
@@ -291,7 +291,7 @@ floatingPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
   wxe_util:call(?wxAuiPaneInfo_FloatingPosition_1,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfofloatingposition">external documentation</a>.
 -spec floatingPosition(This, X, Y) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 floatingPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -300,7 +300,7 @@ floatingPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxAuiPaneInfo_FloatingPosition_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfofloatingsize">external documentation</a>.
 -spec floatingSize(This, Size) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 floatingSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -309,7 +309,7 @@ floatingSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:call(?wxAuiPaneInfo_FloatingSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfofloatingsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfofloatingsize">external documentation</a>.
 -spec floatingSize(This, X, Y) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 floatingSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -326,7 +326,7 @@ gripper(This)
  when is_record(This, wx_ref) ->
   gripper(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfogripper">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfogripper">external documentation</a>.
 -spec gripper(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {visible, boolean()}.
@@ -347,7 +347,7 @@ gripperTop(This)
  when is_record(This, wx_ref) ->
   gripperTop(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfogrippertop">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfogrippertop">external documentation</a>.
 -spec gripperTop(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {attop, boolean()}.
@@ -360,7 +360,7 @@ gripperTop(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_GripperTop,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohasborder">external documentation</a>.
 -spec hasBorder(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -368,7 +368,7 @@ hasBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasBorder,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohascaption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohascaption">external documentation</a>.
 -spec hasCaption(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasCaption(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -376,7 +376,7 @@ hasCaption(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasCaption,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasclosebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohasclosebutton">external documentation</a>.
 -spec hasCloseButton(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasCloseButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -384,7 +384,7 @@ hasCloseButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasCloseButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasflag">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohasflag">external documentation</a>.
 -spec hasFlag(This, Flag) -> boolean() when
 	This::wxAuiPaneInfo(), Flag::integer().
 hasFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -393,7 +393,7 @@ hasFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:call(?wxAuiPaneInfo_HasFlag,
   <<ThisRef:32/?UI,Flag:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasgripper">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohasgripper">external documentation</a>.
 -spec hasGripper(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasGripper(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -401,7 +401,7 @@ hasGripper(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasGripper,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasgrippertop">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohasgrippertop">external documentation</a>.
 -spec hasGripperTop(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasGripperTop(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -409,7 +409,7 @@ hasGripperTop(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasGripperTop,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasmaximizebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohasmaximizebutton">external documentation</a>.
 -spec hasMaximizeButton(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasMaximizeButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -417,7 +417,7 @@ hasMaximizeButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasMaximizeButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohasminimizebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohasminimizebutton">external documentation</a>.
 -spec hasMinimizeButton(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasMinimizeButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -425,7 +425,7 @@ hasMinimizeButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasMinimizeButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohaspinbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohaspinbutton">external documentation</a>.
 -spec hasPinButton(This) -> boolean() when
 	This::wxAuiPaneInfo().
 hasPinButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -433,7 +433,7 @@ hasPinButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_HasPinButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfohide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfohide">external documentation</a>.
 -spec hide(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -441,7 +441,7 @@ hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_Hide,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisbottomdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisbottomdockable">external documentation</a>.
 -spec isBottomDockable(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isBottomDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -449,7 +449,7 @@ isBottomDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsBottomDockable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisdocked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisdocked">external documentation</a>.
 -spec isDocked(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isDocked(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -457,7 +457,7 @@ isDocked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsDocked,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisfixed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisfixed">external documentation</a>.
 -spec isFixed(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isFixed(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -465,7 +465,7 @@ isFixed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsFixed,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisfloatable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisfloatable">external documentation</a>.
 -spec isFloatable(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isFloatable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -473,7 +473,7 @@ isFloatable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsFloatable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisfloating">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisfloating">external documentation</a>.
 -spec isFloating(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isFloating(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -481,7 +481,7 @@ isFloating(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsFloating,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisleftdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisleftdockable">external documentation</a>.
 -spec isLeftDockable(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isLeftDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -489,7 +489,7 @@ isLeftDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsLeftDockable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoismovable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoismovable">external documentation</a>.
 -spec isMovable(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isMovable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -497,7 +497,7 @@ isMovable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsMovable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -505,7 +505,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisresizable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisresizable">external documentation</a>.
 -spec isResizable(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isResizable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -513,7 +513,7 @@ isResizable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsResizable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisrightdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisrightdockable">external documentation</a>.
 -spec isRightDockable(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isRightDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -521,7 +521,7 @@ isRightDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsRightDockable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoisshown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoisshown">external documentation</a>.
 -spec isShown(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -529,7 +529,7 @@ isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsShown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoistoolbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoistoolbar">external documentation</a>.
 -spec isToolbar(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isToolbar(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -537,7 +537,7 @@ isToolbar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsToolbar,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoistopdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoistopdockable">external documentation</a>.
 -spec isTopDockable(This) -> boolean() when
 	This::wxAuiPaneInfo().
 isTopDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -545,7 +545,7 @@ isTopDockable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_IsTopDockable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfolayer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfolayer">external documentation</a>.
 -spec layer(This, Layer) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Layer::integer().
 layer(#wx_ref{type=ThisT,ref=ThisRef},Layer)
@@ -554,7 +554,7 @@ layer(#wx_ref{type=ThisT,ref=ThisRef},Layer)
   wxe_util:call(?wxAuiPaneInfo_Layer,
   <<ThisRef:32/?UI,Layer:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoleft">external documentation</a>.
 -spec left(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 left(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -570,7 +570,7 @@ leftDockable(This)
  when is_record(This, wx_ref) ->
   leftDockable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoleftdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoleftdockable">external documentation</a>.
 -spec leftDockable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -583,7 +583,7 @@ leftDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_LeftDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomaxsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfomaxsize">external documentation</a>.
 -spec maxSize(This, Size) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 maxSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -592,7 +592,7 @@ maxSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:call(?wxAuiPaneInfo_MaxSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomaxsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfomaxsize">external documentation</a>.
 -spec maxSize(This, X, Y) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 maxSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -609,7 +609,7 @@ maximizeButton(This)
  when is_record(This, wx_ref) ->
   maximizeButton(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomaximizebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfomaximizebutton">external documentation</a>.
 -spec maximizeButton(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {visible, boolean()}.
@@ -622,7 +622,7 @@ maximizeButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_MaximizeButton,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfominsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfominsize">external documentation</a>.
 -spec minSize(This, Size) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Size::{W::integer(), H::integer()}.
 minSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -631,7 +631,7 @@ minSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:call(?wxAuiPaneInfo_MinSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfominsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfominsize">external documentation</a>.
 -spec minSize(This, X, Y) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), X::integer(), Y::integer().
 minSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -648,7 +648,7 @@ minimizeButton(This)
  when is_record(This, wx_ref) ->
   minimizeButton(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfominimizebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfominimizebutton">external documentation</a>.
 -spec minimizeButton(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {visible, boolean()}.
@@ -669,7 +669,7 @@ movable(This)
  when is_record(This, wx_ref) ->
   movable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfomovable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfomovable">external documentation</a>.
 -spec movable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -682,7 +682,7 @@ movable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Movable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoname">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoname">external documentation</a>.
 -spec name(This, N) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), N::unicode:chardata().
 name(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -700,7 +700,7 @@ paneBorder(This)
  when is_record(This, wx_ref) ->
   paneBorder(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfopaneborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfopaneborder">external documentation</a>.
 -spec paneBorder(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {visible, boolean()}.
@@ -721,7 +721,7 @@ pinButton(This)
  when is_record(This, wx_ref) ->
   pinButton(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfopinbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfopinbutton">external documentation</a>.
 -spec pinButton(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {visible, boolean()}.
@@ -734,7 +734,7 @@ pinButton(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_PinButton,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoposition">external documentation</a>.
 -spec position(This, Pos) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Pos::integer().
 position(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -751,7 +751,7 @@ resizable(This)
  when is_record(This, wx_ref) ->
   resizable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforesizable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinforesizable">external documentation</a>.
 -spec resizable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {resizable, boolean()}.
@@ -764,7 +764,7 @@ resizable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Resizable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinforight">external documentation</a>.
 -spec right(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 right(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -780,7 +780,7 @@ rightDockable(This)
  when is_record(This, wx_ref) ->
   rightDockable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforightdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinforightdockable">external documentation</a>.
 -spec rightDockable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -793,7 +793,7 @@ rightDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_RightDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinforow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinforow">external documentation</a>.
 -spec row(This, Row) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Row::integer().
 row(#wx_ref{type=ThisT,ref=ThisRef},Row)
@@ -802,7 +802,7 @@ row(#wx_ref{type=ThisT,ref=ThisRef},Row)
   wxe_util:call(?wxAuiPaneInfo_Row,
   <<ThisRef:32/?UI,Row:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfosafeset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfosafeset">external documentation</a>.
 -spec safeSet(This, Source) -> ok when
 	This::wxAuiPaneInfo(), Source::wxAuiPaneInfo().
 safeSet(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SourceT,ref=SourceRef}) ->
@@ -811,7 +811,7 @@ safeSet(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SourceT,ref=SourceRef}) ->
   wxe_util:cast(?wxAuiPaneInfo_SafeSet,
   <<ThisRef:32/?UI,SourceRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfosetflag">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfosetflag">external documentation</a>.
 -spec setFlag(This, Flag, Option_state) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), Flag::integer(), Option_state::boolean().
 setFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag,Option_state)
@@ -828,7 +828,7 @@ show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfoshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfoshow">external documentation</a>.
 -spec show(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {show, boolean()}.
@@ -841,7 +841,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_Show,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfotoolbarpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfotoolbarpane">external documentation</a>.
 -spec toolbarPane(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 toolbarPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -849,7 +849,7 @@ toolbarPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxAuiPaneInfo_ToolbarPane,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfotop">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfotop">external documentation</a>.
 -spec top(This) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo().
 top(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -865,7 +865,7 @@ topDockable(This)
  when is_record(This, wx_ref) ->
   topDockable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfotopdockable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfotopdockable">external documentation</a>.
 -spec topDockable(This, [Option]) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(),
 	Option :: {b, boolean()}.
@@ -878,7 +878,7 @@ topDockable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxAuiPaneInfo_TopDockable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauipaneinfo.html#wxauipaneinfowindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauipaneinfo.html#wxauipaneinfowindow">external documentation</a>.
 -spec window(This, W) -> wxAuiPaneInfo() when
 	This::wxAuiPaneInfo(), W::wxWindow:wxWindow().
 window(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WT,ref=WRef}) ->
diff --git a/lib/wx/src/gen/wxAuiTabArt.erl b/lib/wx/src/gen/wxAuiTabArt.erl
index a65c6dc8cf..b8f64191d1 100644
--- a/lib/wx/src/gen/wxAuiTabArt.erl
+++ b/lib/wx/src/gen/wxAuiTabArt.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxauitabart.html">wxAuiTabArt</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxauitabart.html">wxAuiTabArt</a>.
 %% @type wxAuiTabArt().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
diff --git a/lib/wx/src/gen/wxBitmap.erl b/lib/wx/src/gen/wxBitmap.erl
index 8816e27cdd..cab56d99f6 100644
--- a/lib/wx/src/gen/wxBitmap.erl
+++ b/lib/wx/src/gen/wxBitmap.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html">wxBitmap</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html">wxBitmap</a>.
 %% @type wxBitmap().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -37,13 +37,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxBitmap() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
 -spec new() -> wxBitmap().
 new() ->
   wxe_util:construct(?wxBitmap_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Image) -> wxBitmap() when<br />
 %% 	Image::wxImage:wxImage().<br />
@@ -62,7 +62,7 @@ new(Image)
  when is_record(Image, wx_ref) ->
   new(Image, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Filename, [Option]) -> wxBitmap() when<br />
 %% 	Filename::unicode:chardata(),<br />
@@ -101,7 +101,7 @@ new(#wx_ref{type=ImageT,ref=ImageRef}, Options)
   wxe_util:construct(?wxBitmap_new_2_1,
   <<ImageRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Width, Height, [Option]) -> wxBitmap() when<br />
 %% 	Width::integer(), Height::integer(),<br />
@@ -124,7 +124,7 @@ new(Width,Height, Options)
   wxe_util:construct(?wxBitmap_new_3,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapwxbitmap">external documentation</a>.
 -spec new(Bits, Width, Height, [Option]) -> wxBitmap() when
 	Bits::binary(), Width::integer(), Height::integer(),
 	Option :: {depth, integer()}.
@@ -137,7 +137,7 @@ new(Bits,Width,Height, Options)
   wxe_util:construct(?wxBitmap_new_4,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapconverttoimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapconverttoimage">external documentation</a>.
 -spec convertToImage(This) -> wxImage:wxImage() when
 	This::wxBitmap().
 convertToImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -145,7 +145,7 @@ convertToImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmap_ConvertToImage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapcopyfromicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapcopyfromicon">external documentation</a>.
 -spec copyFromIcon(This, Icon) -> boolean() when
 	This::wxBitmap(), Icon::wxIcon:wxIcon().
 copyFromIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
@@ -162,7 +162,7 @@ create(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   create(This,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapcreate">external documentation</a>.
 -spec create(This, Width, Height, [Option]) -> boolean() when
 	This::wxBitmap(), Width::integer(), Height::integer(),
 	Option :: {depth, integer()}.
@@ -175,7 +175,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxBitmap_Create,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetdepth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapgetdepth">external documentation</a>.
 -spec getDepth(This) -> integer() when
 	This::wxBitmap().
 getDepth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -183,7 +183,7 @@ getDepth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmap_GetDepth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapgetheight">external documentation</a>.
 -spec getHeight(This) -> integer() when
 	This::wxBitmap().
 getHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -191,7 +191,7 @@ getHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmap_GetHeight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapgetpalette">external documentation</a>.
 -spec getPalette(This) -> wxPalette:wxPalette() when
 	This::wxBitmap().
 getPalette(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -199,7 +199,7 @@ getPalette(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmap_GetPalette,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapgetmask">external documentation</a>.
 -spec getMask(This) -> wxMask:wxMask() when
 	This::wxBitmap().
 getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -207,7 +207,7 @@ getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmap_GetMask,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapgetwidth">external documentation</a>.
 -spec getWidth(This) -> integer() when
 	This::wxBitmap().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -215,7 +215,7 @@ getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmap_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapgetsubbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapgetsubbitmap">external documentation</a>.
 -spec getSubBitmap(This, Rect) -> wxBitmap() when
 	This::wxBitmap(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 getSubBitmap(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
@@ -232,7 +232,7 @@ loadFile(This,Name)
  when is_record(This, wx_ref),is_list(Name) ->
   loadFile(This,Name, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmaploadfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmaploadfile">external documentation</a>.
 %%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
 -spec loadFile(This, Name, [Option]) -> boolean() when
 	This::wxBitmap(), Name::unicode:chardata(),
@@ -247,7 +247,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options)
   wxe_util:call(?wxBitmap_LoadFile,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapok">external documentation</a>.
 -spec ok(This) -> boolean() when
 	This::wxBitmap().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -263,7 +263,7 @@ saveFile(This,Name,Type)
  when is_record(This, wx_ref),is_list(Name),is_integer(Type) ->
   saveFile(This,Name,Type, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsavefile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapsavefile">external documentation</a>.
 %%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
 -spec saveFile(This, Name, Type, [Option]) -> boolean() when
 	This::wxBitmap(), Name::unicode:chardata(), Type::wx:wx_enum(),
@@ -278,7 +278,7 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Type, Options)
   wxe_util:call(?wxBitmap_SaveFile,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,Type:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetdepth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapsetdepth">external documentation</a>.
 -spec setDepth(This, Depth) -> ok when
 	This::wxBitmap(), Depth::integer().
 setDepth(#wx_ref{type=ThisT,ref=ThisRef},Depth)
@@ -287,7 +287,7 @@ setDepth(#wx_ref{type=ThisT,ref=ThisRef},Depth)
   wxe_util:cast(?wxBitmap_SetDepth,
   <<ThisRef:32/?UI,Depth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapsetheight">external documentation</a>.
 -spec setHeight(This, Height) -> ok when
 	This::wxBitmap(), Height::integer().
 setHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
@@ -296,7 +296,7 @@ setHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
   wxe_util:cast(?wxBitmap_SetHeight,
   <<ThisRef:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapsetmask">external documentation</a>.
 -spec setMask(This, Mask) -> ok when
 	This::wxBitmap(), Mask::wxMask:wxMask().
 setMask(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef}) ->
@@ -305,7 +305,7 @@ setMask(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef}) ->
   wxe_util:cast(?wxBitmap_SetMask,
   <<ThisRef:32/?UI,MaskRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapsetpalette">external documentation</a>.
 -spec setPalette(This, Palette) -> ok when
 	This::wxBitmap(), Palette::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}) ->
@@ -314,7 +314,7 @@ setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}
   wxe_util:cast(?wxBitmap_SetPalette,
   <<ThisRef:32/?UI,PaletteRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmap.html#wxbitmapsetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmap.html#wxbitmapsetwidth">external documentation</a>.
 -spec setWidth(This, Width) -> ok when
 	This::wxBitmap(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
diff --git a/lib/wx/src/gen/wxBitmapButton.erl b/lib/wx/src/gen/wxBitmapButton.erl
index ddddbbc1dd..326c8044f7 100644
--- a/lib/wx/src/gen/wxBitmapButton.erl
+++ b/lib/wx/src/gen/wxBitmapButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html">wxBitmapButton</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html">wxBitmapButton</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxButton}
 %% <br />{@link wxControl}
@@ -81,7 +81,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxBitmapButton() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonwxbitmapbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttonwxbitmapbutton">external documentation</a>.
 -spec new() -> wxBitmapButton().
 new() ->
   wxe_util:construct(?wxBitmapButton_new_0,
@@ -95,7 +95,7 @@ new(Parent,Id,Bitmap)
  when is_record(Parent, wx_ref),is_integer(Id),is_record(Bitmap, wx_ref) ->
   new(Parent,Id,Bitmap, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonwxbitmapbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttonwxbitmapbutton">external documentation</a>.
 -spec new(Parent, Id, Bitmap, [Option]) -> wxBitmapButton() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -123,7 +123,7 @@ create(This,Parent,Id,Bitmap)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_record(Bitmap, wx_ref) ->
   create(This,Parent,Id,Bitmap, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttoncreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttoncreate">external documentation</a>.
 -spec create(This, Parent, Id, Bitmap, [Option]) -> boolean() when
 	This::wxBitmapButton(), Parent::wxWindow:wxWindow(), Id::integer(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -144,7 +144,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#w
   wxe_util:call(?wxBitmapButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,BitmapRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapdisabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapdisabled">external documentation</a>.
 -spec getBitmapDisabled(This) -> wxBitmap:wxBitmap() when
 	This::wxBitmapButton().
 getBitmapDisabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -152,7 +152,7 @@ getBitmapDisabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmapButton_GetBitmapDisabled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapfocus">external documentation</a>.
 -spec getBitmapFocus(This) -> wxBitmap:wxBitmap() when
 	This::wxBitmapButton().
 getBitmapFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -160,7 +160,7 @@ getBitmapFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmapButton_GetBitmapFocus,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmaplabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmaplabel">external documentation</a>.
 -spec getBitmapLabel(This) -> wxBitmap:wxBitmap() when
 	This::wxBitmapButton().
 getBitmapLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -168,7 +168,7 @@ getBitmapLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmapButton_GetBitmapLabel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapselected">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttongetbitmapselected">external documentation</a>.
 -spec getBitmapSelected(This) -> wxBitmap:wxBitmap() when
 	This::wxBitmapButton().
 getBitmapSelected(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -176,7 +176,7 @@ getBitmapSelected(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmapButton_GetBitmapSelected,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapdisabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapdisabled">external documentation</a>.
 -spec setBitmapDisabled(This, Disabled) -> ok when
 	This::wxBitmapButton(), Disabled::wxBitmap:wxBitmap().
 setBitmapDisabled(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DisabledT,ref=DisabledRef}) ->
@@ -185,7 +185,7 @@ setBitmapDisabled(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DisabledT,ref=Dis
   wxe_util:cast(?wxBitmapButton_SetBitmapDisabled,
   <<ThisRef:32/?UI,DisabledRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapfocus">external documentation</a>.
 -spec setBitmapFocus(This, Focus) -> ok when
 	This::wxBitmapButton(), Focus::wxBitmap:wxBitmap().
 setBitmapFocus(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FocusT,ref=FocusRef}) ->
@@ -194,7 +194,7 @@ setBitmapFocus(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FocusT,ref=FocusRef}
   wxe_util:cast(?wxBitmapButton_SetBitmapFocus,
   <<ThisRef:32/?UI,FocusRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmaplabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmaplabel">external documentation</a>.
 -spec setBitmapLabel(This, Bitmap) -> ok when
 	This::wxBitmapButton(), Bitmap::wxBitmap:wxBitmap().
 setBitmapLabel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
@@ -203,7 +203,7 @@ setBitmapLabel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRe
   wxe_util:cast(?wxBitmapButton_SetBitmapLabel,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapselected">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapbutton.html#wxbitmapbuttonsetbitmapselected">external documentation</a>.
 -spec setBitmapSelected(This, Sel) -> ok when
 	This::wxBitmapButton(), Sel::wxBitmap:wxBitmap().
 setBitmapSelected(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SelT,ref=SelRef}) ->
diff --git a/lib/wx/src/gen/wxBitmapDataObject.erl b/lib/wx/src/gen/wxBitmapDataObject.erl
index 8f9701d3c2..1af65960ca 100644
--- a/lib/wx/src/gen/wxBitmapDataObject.erl
+++ b/lib/wx/src/gen/wxBitmapDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapdataobject.html">wxBitmapDataObject</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapdataobject.html">wxBitmapDataObject</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDataObject}
 %% </p>
@@ -44,7 +44,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapdataobject.html#wxbitmapdataobjectwxbitmapdataobject">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapdataobject.html#wxbitmapdataobjectwxbitmapdataobject">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Bitmap) -> wxBitmapDataObject() when<br />
 %% 	Bitmap::wxBitmap:wxBitmap().<br />
@@ -65,7 +65,7 @@ new(#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   wxe_util:construct(?wxBitmapDataObject_new_1_1,
   <<BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapdataobject.html#wxbitmapdataobjectgetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapdataobject.html#wxbitmapdataobjectgetbitmap">external documentation</a>.
 -spec getBitmap(This) -> wxBitmap:wxBitmap() when
 	This::wxBitmapDataObject().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -73,7 +73,7 @@ getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBitmapDataObject_GetBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbitmapdataobject.html#wxbitmapdataobjectsetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbitmapdataobject.html#wxbitmapdataobjectsetbitmap">external documentation</a>.
 -spec setBitmap(This, Bitmap) -> ok when
 	This::wxBitmapDataObject(), Bitmap::wxBitmap:wxBitmap().
 setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
diff --git a/lib/wx/src/gen/wxBoxSizer.erl b/lib/wx/src/gen/wxBoxSizer.erl
index fcf6b5fd65..a09908b373 100644
--- a/lib/wx/src/gen/wxBoxSizer.erl
+++ b/lib/wx/src/gen/wxBoxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxboxsizer.html">wxBoxSizer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxboxsizer.html">wxBoxSizer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxSizer}
 %% </p>
@@ -46,7 +46,7 @@ parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxBoxSizer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxboxsizer.html#wxboxsizerwxboxsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxboxsizer.html#wxboxsizerwxboxsizer">external documentation</a>.
 -spec new(Orient) -> wxBoxSizer() when
 	Orient::integer().
 new(Orient)
@@ -54,7 +54,7 @@ new(Orient)
   wxe_util:construct(?wxBoxSizer_new,
   <<Orient:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxboxsizer.html#wxboxsizergetorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxboxsizer.html#wxboxsizergetorientation">external documentation</a>.
 -spec getOrientation(This) -> integer() when
 	This::wxBoxSizer().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxBrush.erl b/lib/wx/src/gen/wxBrush.erl
index 40aa62297e..8657b57348 100644
--- a/lib/wx/src/gen/wxBrush.erl
+++ b/lib/wx/src/gen/wxBrush.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html">wxBrush</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html">wxBrush</a>.
 %% @type wxBrush().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -35,13 +35,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxBrush() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
 -spec new() -> wxBrush().
 new() ->
   wxe_util:construct(?wxBrush_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
 %% <br /> Also:<br />
 %% new(StippleBitmap) -> wxBrush() when<br />
 %% 	StippleBitmap::wxBitmap:wxBitmap().<br />
@@ -59,7 +59,7 @@ new(#wx_ref{type=StippleBitmapT,ref=StippleBitmapRef}) ->
   wxe_util:construct(?wxBrush_new_1,
   <<StippleBitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushwxbrush">external documentation</a>.
 -spec new(Colour, [Option]) -> wxBrush() when
 	Colour::wx:wx_colour(),
 	Option :: {style, integer()}.
@@ -71,7 +71,7 @@ new(Colour, Options)
   wxe_util:construct(?wxBrush_new_2,
   <<(wxe_util:colour_bin(Colour)):16/binary, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushgetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushgetcolour">external documentation</a>.
 -spec getColour(This) -> wx:wx_colour4() when
 	This::wxBrush().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -79,7 +79,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBrush_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushgetstipple">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushgetstipple">external documentation</a>.
 -spec getStipple(This) -> wxBitmap:wxBitmap() when
 	This::wxBrush().
 getStipple(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -87,7 +87,7 @@ getStipple(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBrush_GetStipple,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushgetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushgetstyle">external documentation</a>.
 -spec getStyle(This) -> integer() when
 	This::wxBrush().
 getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -95,7 +95,7 @@ getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBrush_GetStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushishatch">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushishatch">external documentation</a>.
 -spec isHatch(This) -> boolean() when
 	This::wxBrush().
 isHatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -103,7 +103,7 @@ isHatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBrush_IsHatch,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxBrush().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -111,7 +111,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxBrush_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushsetcolour">external documentation</a>.
 -spec setColour(This, Col) -> ok when
 	This::wxBrush(), Col::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -120,7 +120,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxBrush_SetColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushsetcolour">external documentation</a>.
 -spec setColour(This, R, G, B) -> ok when
 	This::wxBrush(), R::integer(), G::integer(), B::integer().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
@@ -129,7 +129,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
   wxe_util:cast(?wxBrush_SetColour_3,
   <<ThisRef:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetstipple">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushsetstipple">external documentation</a>.
 -spec setStipple(This, Stipple) -> ok when
 	This::wxBrush(), Stipple::wxBitmap:wxBitmap().
 setStipple(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StippleT,ref=StippleRef}) ->
@@ -138,7 +138,7 @@ setStipple(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StippleT,ref=StippleRef}
   wxe_util:cast(?wxBrush_SetStipple,
   <<ThisRef:32/?UI,StippleRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbrush.html#wxbrushsetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbrush.html#wxbrushsetstyle">external documentation</a>.
 -spec setStyle(This, Style) -> ok when
 	This::wxBrush(), Style::integer().
 setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
diff --git a/lib/wx/src/gen/wxBufferedDC.erl b/lib/wx/src/gen/wxBufferedDC.erl
index fd8955f4ed..e2504bbaaa 100644
--- a/lib/wx/src/gen/wxBufferedDC.erl
+++ b/lib/wx/src/gen/wxBufferedDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html">wxBufferedDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbuffereddc.html">wxBufferedDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxMemoryDC}
 %% <br />{@link wxDC}
@@ -54,13 +54,15 @@
   setUserScale/3,startDoc/2,startPage/1]).
 
 -export_type([wxBufferedDC/0]).
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxMemoryDC) -> true;
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxBufferedDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
 -spec new() -> wxBufferedDC().
 new() ->
   wxe_util:construct(?wxBufferedDC_new_0,
@@ -74,7 +76,7 @@ new(Dc)
  when is_record(Dc, wx_ref) ->
   new(Dc, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Dc, [Option]) -> wxBufferedDC() when<br />
 %% 	Dc::wxDC:wxDC(),<br />
@@ -101,7 +103,7 @@ new(#wx_ref{type=DcT,ref=DcRef}, Options)
   wxe_util:construct(?wxBufferedDC_new_2,
   <<DcRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbuffereddc.html#wxbuffereddcwxbuffereddc">external documentation</a>.
 -spec new(Dc, Area, [Option]) -> wxBufferedDC() when
 	Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()},
 	Option :: {style, integer()}.
@@ -122,7 +124,7 @@ init(This,Dc)
  when is_record(This, wx_ref),is_record(Dc, wx_ref) ->
   init(This,Dc, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcinit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbuffereddc.html#wxbuffereddcinit">external documentation</a>.
 %% <br /> Also:<br />
 %% init(This, Dc, [Option]) -> ok when<br />
 %% 	This::wxBufferedDC(), Dc::wxDC:wxDC(),<br />
@@ -150,7 +152,7 @@ init(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}, Options)
   wxe_util:cast(?wxBufferedDC_Init_2,
   <<ThisRef:32/?UI,DcRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbuffereddc.html#wxbuffereddcinit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbuffereddc.html#wxbuffereddcinit">external documentation</a>.
 -spec init(This, Dc, Area, [Option]) -> ok when
 	This::wxBufferedDC(), Dc::wxDC:wxDC(), Area::{W::integer(), H::integer()},
 	Option :: {style, integer()}.
diff --git a/lib/wx/src/gen/wxBufferedPaintDC.erl b/lib/wx/src/gen/wxBufferedPaintDC.erl
index bff61ca678..c3fa80703c 100644
--- a/lib/wx/src/gen/wxBufferedPaintDC.erl
+++ b/lib/wx/src/gen/wxBufferedPaintDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbufferedpaintdc.html">wxBufferedPaintDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbufferedpaintdc.html">wxBufferedPaintDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxBufferedDC}
 %% <br />{@link wxMemoryDC}
@@ -56,6 +56,8 @@
   startPage/1]).
 
 -export_type([wxBufferedPaintDC/0]).
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxBufferedDC) -> true;
 parent_class(wxMemoryDC) -> true;
@@ -71,7 +73,7 @@ new(Window)
  when is_record(Window, wx_ref) ->
   new(Window, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbufferedpaintdc.html#wxbufferedpaintdcwxbufferedpaintdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbufferedpaintdc.html#wxbufferedpaintdcwxbufferedpaintdc">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Window, [Option]) -> wxBufferedPaintDC() when<br />
 %% 	Window::wxWindow:wxWindow(),<br />
@@ -95,7 +97,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef}, Options)
   wxe_util:construct(?wxBufferedPaintDC_new_2,
   <<WindowRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbufferedpaintdc.html#wxbufferedpaintdcwxbufferedpaintdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbufferedpaintdc.html#wxbufferedpaintdcwxbufferedpaintdc">external documentation</a>.
 -spec new(Window, Buffer, [Option]) -> wxBufferedPaintDC() when
 	Window::wxWindow:wxWindow(), Buffer::wxBitmap:wxBitmap(),
 	Option :: {style, integer()}.
diff --git a/lib/wx/src/gen/wxButton.erl b/lib/wx/src/gen/wxButton.erl
index a27e5d91c2..c026b23d6f 100644
--- a/lib/wx/src/gen/wxButton.erl
+++ b/lib/wx/src/gen/wxButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html">wxButton</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbutton.html">wxButton</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -78,7 +78,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxButton() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonwxbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbutton.html#wxbuttonwxbutton">external documentation</a>.
 -spec new() -> wxButton().
 new() ->
   wxe_util:construct(?wxButton_new_0,
@@ -92,7 +92,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonwxbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbutton.html#wxbuttonwxbutton">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxButton() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {label, unicode:chardata()}
@@ -121,7 +121,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttoncreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbutton.html#wxbuttoncreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxButton(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {label, unicode:chardata()}
@@ -143,13 +143,13 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttongetdefaultsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbutton.html#wxbuttongetdefaultsize">external documentation</a>.
 -spec getDefaultSize() -> {W::integer(), H::integer()}.
 getDefaultSize() ->
   wxe_util:call(?wxButton_GetDefaultSize,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonsetdefault">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbutton.html#wxbuttonsetdefault">external documentation</a>.
 -spec setDefault(This) -> ok when
 	This::wxButton().
 setDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -157,7 +157,7 @@ setDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxButton_SetDefault,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxbutton.html#wxbuttonsetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxbutton.html#wxbuttonsetlabel">external documentation</a>.
 -spec setLabel(This, Label) -> ok when
 	This::wxButton(), Label::unicode:chardata().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
diff --git a/lib/wx/src/gen/wxCalendarCtrl.erl b/lib/wx/src/gen/wxCalendarCtrl.erl
index 2a476c5e92..3a9fc4051a 100644
--- a/lib/wx/src/gen/wxCalendarCtrl.erl
+++ b/lib/wx/src/gen/wxCalendarCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html">wxCalendarCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html">wxCalendarCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -84,7 +84,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCalendarCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlwxcalendarctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlwxcalendarctrl">external documentation</a>.
 -spec new() -> wxCalendarCtrl().
 new() ->
   wxe_util:construct(?wxCalendarCtrl_new_0,
@@ -98,7 +98,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlwxcalendarctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlwxcalendarctrl">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxCalendarCtrl() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {date, wx:wx_datetime()}
@@ -125,7 +125,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxCalendarCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {date, wx:wx_datetime()}
@@ -145,7 +145,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxCalendarCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlsetdate">external documentation</a>.
 -spec setDate(This, Date) -> boolean() when
 	This::wxCalendarCtrl(), Date::wx:wx_datetime().
 setDate(#wx_ref{type=ThisT,ref=ThisRef},Date)
@@ -154,7 +154,7 @@ setDate(#wx_ref{type=ThisT,ref=ThisRef},Date)
   wxe_util:call(?wxCalendarCtrl_SetDate,
   <<ThisRef:32/?UI,(wxe_util:datetime_bin(Date)):24/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgetdate">external documentation</a>.
 -spec getDate(This) -> wx:wx_datetime() when
 	This::wxCalendarCtrl().
 getDate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -170,7 +170,7 @@ enableYearChange(This)
  when is_record(This, wx_ref) ->
   enableYearChange(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlenableyearchange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlenableyearchange">external documentation</a>.
 -spec enableYearChange(This, [Option]) -> ok when
 	This::wxCalendarCtrl(),
 	Option :: {enable, boolean()}.
@@ -191,7 +191,7 @@ enableMonthChange(This)
  when is_record(This, wx_ref) ->
   enableMonthChange(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlenablemonthchange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlenablemonthchange">external documentation</a>.
 -spec enableMonthChange(This, [Option]) -> ok when
 	This::wxCalendarCtrl(),
 	Option :: {enable, boolean()}.
@@ -212,7 +212,7 @@ enableHolidayDisplay(This)
  when is_record(This, wx_ref) ->
   enableHolidayDisplay(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlenableholidaydisplay">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlenableholidaydisplay">external documentation</a>.
 -spec enableHolidayDisplay(This, [Option]) -> ok when
 	This::wxCalendarCtrl(),
 	Option :: {display, boolean()}.
@@ -225,7 +225,7 @@ enableHolidayDisplay(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxCalendarCtrl_EnableHolidayDisplay,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetheadercolours">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlsetheadercolours">external documentation</a>.
 -spec setHeaderColours(This, ColFg, ColBg) -> ok when
 	This::wxCalendarCtrl(), ColFg::wx:wx_colour(), ColBg::wx:wx_colour().
 setHeaderColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
@@ -234,7 +234,7 @@ setHeaderColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
   wxe_util:cast(?wxCalendarCtrl_SetHeaderColours,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourfg">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourfg">external documentation</a>.
 -spec getHeaderColourFg(This) -> wx:wx_colour4() when
 	This::wxCalendarCtrl().
 getHeaderColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -242,7 +242,7 @@ getHeaderColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarCtrl_GetHeaderColourFg,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourbg">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgetheadercolourbg">external documentation</a>.
 -spec getHeaderColourBg(This) -> wx:wx_colour4() when
 	This::wxCalendarCtrl().
 getHeaderColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -250,7 +250,7 @@ getHeaderColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarCtrl_GetHeaderColourBg,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsethighlightcolours">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlsethighlightcolours">external documentation</a>.
 -spec setHighlightColours(This, ColFg, ColBg) -> ok when
 	This::wxCalendarCtrl(), ColFg::wx:wx_colour(), ColBg::wx:wx_colour().
 setHighlightColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
@@ -259,7 +259,7 @@ setHighlightColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
   wxe_util:cast(?wxCalendarCtrl_SetHighlightColours,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourfg">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourfg">external documentation</a>.
 -spec getHighlightColourFg(This) -> wx:wx_colour4() when
 	This::wxCalendarCtrl().
 getHighlightColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -267,7 +267,7 @@ getHighlightColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarCtrl_GetHighlightColourFg,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourbg">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgethighlightcolourbg">external documentation</a>.
 -spec getHighlightColourBg(This) -> wx:wx_colour4() when
 	This::wxCalendarCtrl().
 getHighlightColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -275,7 +275,7 @@ getHighlightColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarCtrl_GetHighlightColourBg,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetholidaycolours">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlsetholidaycolours">external documentation</a>.
 -spec setHolidayColours(This, ColFg, ColBg) -> ok when
 	This::wxCalendarCtrl(), ColFg::wx:wx_colour(), ColBg::wx:wx_colour().
 setHolidayColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
@@ -284,7 +284,7 @@ setHolidayColours(#wx_ref{type=ThisT,ref=ThisRef},ColFg,ColBg)
   wxe_util:cast(?wxCalendarCtrl_SetHolidayColours,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColFg)):16/binary,(wxe_util:colour_bin(ColBg)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourfg">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourfg">external documentation</a>.
 -spec getHolidayColourFg(This) -> wx:wx_colour4() when
 	This::wxCalendarCtrl().
 getHolidayColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -292,7 +292,7 @@ getHolidayColourFg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarCtrl_GetHolidayColourFg,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourbg">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgetholidaycolourbg">external documentation</a>.
 -spec getHolidayColourBg(This) -> wx:wx_colour4() when
 	This::wxCalendarCtrl().
 getHolidayColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -300,7 +300,7 @@ getHolidayColourBg(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarCtrl_GetHolidayColourBg,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlgetattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlgetattr">external documentation</a>.
 -spec getAttr(This, Day) -> wxCalendarDateAttr:wxCalendarDateAttr() when
 	This::wxCalendarCtrl(), Day::integer().
 getAttr(#wx_ref{type=ThisT,ref=ThisRef},Day)
@@ -309,7 +309,7 @@ getAttr(#wx_ref{type=ThisT,ref=ThisRef},Day)
   wxe_util:call(?wxCalendarCtrl_GetAttr,
   <<ThisRef:32/?UI,Day:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlsetattr">external documentation</a>.
 -spec setAttr(This, Day, Attr) -> ok when
 	This::wxCalendarCtrl(), Day::integer(), Attr::wxCalendarDateAttr:wxCalendarDateAttr().
 setAttr(#wx_ref{type=ThisT,ref=ThisRef},Day,#wx_ref{type=AttrT,ref=AttrRef})
@@ -319,7 +319,7 @@ setAttr(#wx_ref{type=ThisT,ref=ThisRef},Day,#wx_ref{type=AttrT,ref=AttrRef})
   wxe_util:cast(?wxCalendarCtrl_SetAttr,
   <<ThisRef:32/?UI,Day:32/?UI,AttrRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlsetholiday">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlsetholiday">external documentation</a>.
 -spec setHoliday(This, Day) -> ok when
 	This::wxCalendarCtrl(), Day::integer().
 setHoliday(#wx_ref{type=ThisT,ref=ThisRef},Day)
@@ -328,7 +328,7 @@ setHoliday(#wx_ref{type=ThisT,ref=ThisRef},Day)
   wxe_util:cast(?wxCalendarCtrl_SetHoliday,
   <<ThisRef:32/?UI,Day:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlresetattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlresetattr">external documentation</a>.
 -spec resetAttr(This, Day) -> ok when
 	This::wxCalendarCtrl(), Day::integer().
 resetAttr(#wx_ref{type=ThisT,ref=ThisRef},Day)
@@ -337,7 +337,7 @@ resetAttr(#wx_ref{type=ThisT,ref=ThisRef},Day)
   wxe_util:cast(?wxCalendarCtrl_ResetAttr,
   <<ThisRef:32/?UI,Day:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarctrl.html#wxcalendarctrlhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarctrl.html#wxcalendarctrlhittest">external documentation</a>.
 %%<br /> Wd = ?wxDateTime_Sun | ?wxDateTime_Mon | ?wxDateTime_Tue | ?wxDateTime_Wed | ?wxDateTime_Thu | ?wxDateTime_Fri | ?wxDateTime_Sat | ?wxDateTime_Inv_WeekDay
 %%<br /> Res = ?wxCAL_HITTEST_NOWHERE | ?wxCAL_HITTEST_HEADER | ?wxCAL_HITTEST_DAY | ?wxCAL_HITTEST_INCMONTH | ?wxCAL_HITTEST_DECMONTH | ?wxCAL_HITTEST_SURROUNDING_WEEK
 -spec hitTest(This, Pos) -> Result when
diff --git a/lib/wx/src/gen/wxCalendarDateAttr.erl b/lib/wx/src/gen/wxCalendarDateAttr.erl
index a1891df18b..4138d95070 100644
--- a/lib/wx/src/gen/wxCalendarDateAttr.erl
+++ b/lib/wx/src/gen/wxCalendarDateAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html">wxCalendarDateAttr</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html">wxCalendarDateAttr</a>.
 %% @type wxCalendarDateAttr().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -37,13 +37,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCalendarDateAttr() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
 -spec new() -> wxCalendarDateAttr().
 new() ->
   wxe_util:construct(?wxCalendarDateAttr_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
 %% <br /> Also:<br />
 %% new(ColText) -> wxCalendarDateAttr() when<br />
 %% 	ColText::wx:wx_colour().<br />
@@ -62,7 +62,7 @@ new(ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   new(ColText, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrwxcalendardateattr">external documentation</a>.
 %% <br /> Also:<br />
 %% new(ColText, [Option]) -> wxCalendarDateAttr() when<br />
 %% 	ColText::wx:wx_colour(),<br />
@@ -99,7 +99,7 @@ new(ColText, Options)
   wxe_util:construct(?wxCalendarDateAttr_new_2_1,
   <<(wxe_util:colour_bin(ColText)):16/binary, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrsettextcolour">external documentation</a>.
 -spec setTextColour(This, ColText) -> ok when
 	This::wxCalendarDateAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
@@ -108,7 +108,7 @@ setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
   wxe_util:cast(?wxCalendarDateAttr_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrsetbackgroundcolour">external documentation</a>.
 -spec setBackgroundColour(This, ColBack) -> ok when
 	This::wxCalendarDateAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
@@ -117,7 +117,7 @@ setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
   wxe_util:cast(?wxCalendarDateAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetbordercolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrsetbordercolour">external documentation</a>.
 -spec setBorderColour(This, Col) -> ok when
 	This::wxCalendarDateAttr(), Col::wx:wx_colour().
 setBorderColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -126,7 +126,7 @@ setBorderColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxCalendarDateAttr_SetBorderColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrsetfont">external documentation</a>.
 -spec setFont(This, Font) -> ok when
 	This::wxCalendarDateAttr(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -135,7 +135,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:cast(?wxCalendarDateAttr_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrsetborder">external documentation</a>.
 %%<br /> Border = ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
 -spec setBorder(This, Border) -> ok when
 	This::wxCalendarDateAttr(), Border::wx:wx_enum().
@@ -145,7 +145,7 @@ setBorder(#wx_ref{type=ThisT,ref=ThisRef},Border)
   wxe_util:cast(?wxCalendarDateAttr_SetBorder,
   <<ThisRef:32/?UI,Border:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrsetholiday">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrsetholiday">external documentation</a>.
 -spec setHoliday(This, Holiday) -> ok when
 	This::wxCalendarDateAttr(), Holiday::boolean().
 setHoliday(#wx_ref{type=ThisT,ref=ThisRef},Holiday)
@@ -154,7 +154,7 @@ setHoliday(#wx_ref{type=ThisT,ref=ThisRef},Holiday)
   wxe_util:cast(?wxCalendarDateAttr_SetHoliday,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Holiday)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhastextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrhastextcolour">external documentation</a>.
 -spec hasTextColour(This) -> boolean() when
 	This::wxCalendarDateAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -162,7 +162,7 @@ hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrhasbackgroundcolour">external documentation</a>.
 -spec hasBackgroundColour(This) -> boolean() when
 	This::wxCalendarDateAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -170,7 +170,7 @@ hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasbordercolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrhasbordercolour">external documentation</a>.
 -spec hasBorderColour(This) -> boolean() when
 	This::wxCalendarDateAttr().
 hasBorderColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -178,7 +178,7 @@ hasBorderColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_HasBorderColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrhasfont">external documentation</a>.
 -spec hasFont(This) -> boolean() when
 	This::wxCalendarDateAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -186,7 +186,7 @@ hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrhasborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrhasborder">external documentation</a>.
 -spec hasBorder(This) -> boolean() when
 	This::wxCalendarDateAttr().
 hasBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -194,7 +194,7 @@ hasBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_HasBorder,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrisholiday">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrisholiday">external documentation</a>.
 -spec isHoliday(This) -> boolean() when
 	This::wxCalendarDateAttr().
 isHoliday(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -202,7 +202,7 @@ isHoliday(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_IsHoliday,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrgettextcolour">external documentation</a>.
 -spec getTextColour(This) -> wx:wx_colour4() when
 	This::wxCalendarDateAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -210,7 +210,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrgetbackgroundcolour">external documentation</a>.
 -spec getBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxCalendarDateAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -218,7 +218,7 @@ getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetbordercolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrgetbordercolour">external documentation</a>.
 -spec getBorderColour(This) -> wx:wx_colour4() when
 	This::wxCalendarDateAttr().
 getBorderColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -226,7 +226,7 @@ getBorderColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_GetBorderColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxCalendarDateAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -234,7 +234,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCalendarDateAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendardateattr.html#wxcalendardateattrgetborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendardateattr.html#wxcalendardateattrgetborder">external documentation</a>.
 %%<br /> Res = ?wxCAL_BORDER_NONE | ?wxCAL_BORDER_SQUARE | ?wxCAL_BORDER_ROUND
 -spec getBorder(This) -> wx:wx_enum() when
 	This::wxCalendarDateAttr().
diff --git a/lib/wx/src/gen/wxCalendarEvent.erl b/lib/wx/src/gen/wxCalendarEvent.erl
index c062a7fa0d..d59f7256fa 100644
--- a/lib/wx/src/gen/wxCalendarEvent.erl
+++ b/lib/wx/src/gen/wxCalendarEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarevent.html">wxCalendarEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarevent.html">wxCalendarEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>calendar_sel_changed</em>, <em>calendar_day_changed</em>, <em>calendar_month_changed</em>, <em>calendar_year_changed</em>, <em>calendar_doubleclicked</em>, <em>calendar_weekday_clicked</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxCalendar(). #wxCalendar{}} event record type.
@@ -49,7 +49,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCalendarEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcalendarevent.html#wxcalendareventgetweekday">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcalendarevent.html#wxcalendareventgetweekday">external documentation</a>.
 %%<br /> Res = ?wxDateTime_Sun | ?wxDateTime_Mon | ?wxDateTime_Tue | ?wxDateTime_Wed | ?wxDateTime_Thu | ?wxDateTime_Fri | ?wxDateTime_Sat | ?wxDateTime_Inv_WeekDay
 -spec getWeekDay(This) -> wx:wx_enum() when
 	This::wxCalendarEvent().
diff --git a/lib/wx/src/gen/wxCaret.erl b/lib/wx/src/gen/wxCaret.erl
index 57db5906f3..e2b503e975 100644
--- a/lib/wx/src/gen/wxCaret.erl
+++ b/lib/wx/src/gen/wxCaret.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html">wxCaret</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html">wxCaret</a>.
 %% @type wxCaret().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -36,7 +36,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCaret() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
 -spec new(Window, Size) -> wxCaret() when
 	Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}.
 new(#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
@@ -45,7 +45,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
   wxe_util:construct(?wxCaret_new_2,
   <<WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretwxcaret">external documentation</a>.
 -spec new(Window, Width, Height) -> wxCaret() when
 	Window::wxWindow:wxWindow(), Width::integer(), Height::integer().
 new(#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
@@ -54,7 +54,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
   wxe_util:construct(?wxCaret_new_3,
   <<WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
 -spec create(This, Window, Size) -> boolean() when
 	This::wxCaret(), Window::wxWindow:wxWindow(), Size::{W::integer(), H::integer()}.
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{SizeW,SizeH})
@@ -64,7 +64,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{Size
   wxe_util:call(?wxCaret_Create_2,
   <<ThisRef:32/?UI,WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretcreate">external documentation</a>.
 -spec create(This, Window, Width, Height) -> boolean() when
 	This::wxCaret(), Window::wxWindow:wxWindow(), Width::integer(), Height::integer().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},Width,Height)
@@ -74,13 +74,13 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},Width
   wxe_util:call(?wxCaret_Create_3,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetblinktime">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetblinktime">external documentation</a>.
 -spec getBlinkTime() -> integer().
 getBlinkTime() ->
   wxe_util:call(?wxCaret_GetBlinkTime,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxCaret().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -88,7 +88,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetsize">external documentation</a>.
 -spec getSize(This) -> {W::integer(), H::integer()} when
 	This::wxCaret().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -96,7 +96,7 @@ getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretgetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretgetwindow">external documentation</a>.
 -spec getWindow(This) -> wxWindow:wxWindow() when
 	This::wxCaret().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -104,7 +104,7 @@ getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_GetWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcarethide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcarethide">external documentation</a>.
 -spec hide(This) -> ok when
 	This::wxCaret().
 hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -112,7 +112,7 @@ hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxCaret_Hide,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxCaret().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -120,7 +120,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretisvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretisvisible">external documentation</a>.
 -spec isVisible(This) -> boolean() when
 	This::wxCaret().
 isVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -128,7 +128,7 @@ isVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCaret_IsVisible,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretmove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretmove">external documentation</a>.
 -spec move(This, Pt) -> ok when
 	This::wxCaret(), Pt::{X::integer(), Y::integer()}.
 move(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -137,7 +137,7 @@ move(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxCaret_Move_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretmove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretmove">external documentation</a>.
 -spec move(This, X, Y) -> ok when
 	This::wxCaret(), X::integer(), Y::integer().
 move(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -146,7 +146,7 @@ move(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxCaret_Move_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetblinktime">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretsetblinktime">external documentation</a>.
 -spec setBlinkTime(Milliseconds) -> ok when
 	Milliseconds::integer().
 setBlinkTime(Milliseconds)
@@ -154,7 +154,7 @@ setBlinkTime(Milliseconds)
   wxe_util:cast(?wxCaret_SetBlinkTime,
   <<Milliseconds:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
 -spec setSize(This, Size) -> ok when
 	This::wxCaret(), Size::{W::integer(), H::integer()}.
 setSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -163,7 +163,7 @@ setSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxCaret_SetSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretsetsize">external documentation</a>.
 -spec setSize(This, Width, Height) -> ok when
 	This::wxCaret(), Width::integer(), Height::integer().
 setSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
@@ -180,7 +180,7 @@ show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcaret.html#wxcaretshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcaret.html#wxcaretshow">external documentation</a>.
 -spec show(This, [Option]) -> ok when
 	This::wxCaret(),
 	Option :: {show, boolean()}.
diff --git a/lib/wx/src/gen/wxCheckBox.erl b/lib/wx/src/gen/wxCheckBox.erl
index 6e30f14207..85797059f7 100644
--- a/lib/wx/src/gen/wxCheckBox.erl
+++ b/lib/wx/src/gen/wxCheckBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html">wxCheckBox</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html">wxCheckBox</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -79,7 +79,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCheckBox() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxwxcheckbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxwxcheckbox">external documentation</a>.
 -spec new() -> wxCheckBox().
 new() ->
   wxe_util:construct(?wxCheckBox_new_0,
@@ -93,7 +93,7 @@ new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxwxcheckbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxwxcheckbox">external documentation</a>.
 -spec new(Parent, Id, Label, [Option]) -> wxCheckBox() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -121,7 +121,7 @@ create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxcreate">external documentation</a>.
 -spec create(This, Parent, Id, Label, [Option]) -> boolean() when
 	This::wxCheckBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -142,7 +142,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxCheckBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxgetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxgetvalue">external documentation</a>.
 -spec getValue(This) -> boolean() when
 	This::wxCheckBox().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -150,7 +150,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCheckBox_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxget3statevalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxget3statevalue">external documentation</a>.
 %%<br /> Res = ?wxCHK_UNCHECKED | ?wxCHK_CHECKED | ?wxCHK_UNDETERMINED
 -spec get3StateValue(This) -> wx:wx_enum() when
 	This::wxCheckBox().
@@ -159,7 +159,7 @@ get3StateValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCheckBox_Get3StateValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxis3rdstateallowedforuser">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxis3rdstateallowedforuser">external documentation</a>.
 -spec is3rdStateAllowedForUser(This) -> boolean() when
 	This::wxCheckBox().
 is3rdStateAllowedForUser(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -167,7 +167,7 @@ is3rdStateAllowedForUser(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCheckBox_Is3rdStateAllowedForUser,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxis3state">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxis3state">external documentation</a>.
 -spec is3State(This) -> boolean() when
 	This::wxCheckBox().
 is3State(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -175,7 +175,7 @@ is3State(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCheckBox_Is3State,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxischecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxischecked">external documentation</a>.
 -spec isChecked(This) -> boolean() when
 	This::wxCheckBox().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -183,7 +183,7 @@ isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCheckBox_IsChecked,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxsetvalue">external documentation</a>.
 -spec setValue(This, State) -> ok when
 	This::wxCheckBox(), State::boolean().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},State)
@@ -192,7 +192,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},State)
   wxe_util:cast(?wxCheckBox_SetValue,
   <<ThisRef:32/?UI,(wxe_util:from_bool(State)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcheckbox.html#wxcheckboxset3statevalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcheckbox.html#wxcheckboxset3statevalue">external documentation</a>.
 %%<br /> State = ?wxCHK_UNCHECKED | ?wxCHK_CHECKED | ?wxCHK_UNDETERMINED
 -spec set3StateValue(This, State) -> ok when
 	This::wxCheckBox(), State::wx:wx_enum().
diff --git a/lib/wx/src/gen/wxCheckListBox.erl b/lib/wx/src/gen/wxCheckListBox.erl
index 382345abfa..f90b610eb1 100644
--- a/lib/wx/src/gen/wxCheckListBox.erl
+++ b/lib/wx/src/gen/wxCheckListBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html">wxCheckListBox</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchecklistbox.html">wxCheckListBox</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxListBox}
 %% <br />{@link wxControlWithItems}
@@ -85,7 +85,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCheckListBox() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxwxchecklistbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchecklistbox.html#wxchecklistboxwxchecklistbox">external documentation</a>.
 -spec new() -> wxCheckListBox().
 new() ->
   wxe_util:construct(?wxCheckListBox_new_0,
@@ -99,7 +99,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxwxchecklistbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchecklistbox.html#wxchecklistboxwxchecklistbox">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxCheckListBox() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -128,7 +128,7 @@ check(This,Index)
  when is_record(This, wx_ref),is_integer(Index) ->
   check(This,Index, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxcheck">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchecklistbox.html#wxchecklistboxcheck">external documentation</a>.
 -spec check(This, Index, [Option]) -> ok when
 	This::wxCheckListBox(), Index::integer(),
 	Option :: {check, boolean()}.
@@ -141,7 +141,7 @@ check(#wx_ref{type=ThisT,ref=ThisRef},Index, Options)
   wxe_util:cast(?wxCheckListBox_Check,
   <<ThisRef:32/?UI,Index:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchecklistbox.html#wxchecklistboxischecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchecklistbox.html#wxchecklistboxischecked">external documentation</a>.
 -spec isChecked(This, Index) -> boolean() when
 	This::wxCheckListBox(), Index::integer().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef},Index)
diff --git a/lib/wx/src/gen/wxChildFocusEvent.erl b/lib/wx/src/gen/wxChildFocusEvent.erl
index 642db88c06..75a16b4dbe 100644
--- a/lib/wx/src/gen/wxChildFocusEvent.erl
+++ b/lib/wx/src/gen/wxChildFocusEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchildfocusevent.html">wxChildFocusEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchildfocusevent.html">wxChildFocusEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>child_focus</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxChildFocus(). #wxChildFocus{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxChildFocusEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchildfocusevent.html#wxchildfocuseventgetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchildfocusevent.html#wxchildfocuseventgetwindow">external documentation</a>.
 -spec getWindow(This) -> wxWindow:wxWindow() when
 	This::wxChildFocusEvent().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxChoice.erl b/lib/wx/src/gen/wxChoice.erl
index 92b094036e..28a5fe08a3 100644
--- a/lib/wx/src/gen/wxChoice.erl
+++ b/lib/wx/src/gen/wxChoice.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html">wxChoice</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoice.html">wxChoice</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControlWithItems}
 %% <br />{@link wxControl}
@@ -83,7 +83,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxChoice() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicewxchoice">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoice.html#wxchoicewxchoice">external documentation</a>.
 -spec new() -> wxChoice().
 new() ->
   wxe_util:construct(?wxChoice_new_0,
@@ -97,7 +97,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicewxchoice">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoice.html#wxchoicewxchoice">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxChoice() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -126,7 +126,7 @@ create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Pos,Size,Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoice.html#wxchoicecreate">external documentation</a>.
 -spec create(This, Parent, Id, Pos, Size, Choices, [Option]) -> boolean() when
 	This::wxChoice(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[unicode:chardata()],
 	Option :: {style, integer()}
@@ -144,7 +144,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{P
   wxe_util:call(?wxChoice_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicedelete">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoice.html#wxchoicedelete">external documentation</a>.
 -spec delete(This, N) -> ok when
 	This::wxChoice(), N::integer().
 delete(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -153,7 +153,7 @@ delete(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:cast(?wxChoice_Delete,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicegetcolumns">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoice.html#wxchoicegetcolumns">external documentation</a>.
 -spec getColumns(This) -> integer() when
 	This::wxChoice().
 getColumns(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ setColumns(This)
  when is_record(This, wx_ref) ->
   setColumns(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoice.html#wxchoicesetcolumns">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoice.html#wxchoicesetcolumns">external documentation</a>.
 -spec setColumns(This, [Option]) -> ok when
 	This::wxChoice(),
 	Option :: {n, integer()}.
diff --git a/lib/wx/src/gen/wxChoicebook.erl b/lib/wx/src/gen/wxChoicebook.erl
index 921e1e2882..9babfc1a60 100644
--- a/lib/wx/src/gen/wxChoicebook.erl
+++ b/lib/wx/src/gen/wxChoicebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html">wxChoicebook</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html">wxChoicebook</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -82,7 +82,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxChoicebook() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookwxchoicebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookwxchoicebook">external documentation</a>.
 -spec new() -> wxChoicebook().
 new() ->
   wxe_util:construct(?wxChoicebook_new_0,
@@ -96,7 +96,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookwxchoicebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookwxchoicebook">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxChoicebook() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -121,7 +121,7 @@ addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookaddpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookaddpage">external documentation</a>.
 -spec addPage(This, Page, Text, [Option]) -> boolean() when
 	This::wxChoicebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -146,7 +146,7 @@ advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookadvanceselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookadvanceselection">external documentation</a>.
 -spec advanceSelection(This, [Option]) -> ok when
 	This::wxChoicebook(),
 	Option :: {forward, boolean()}.
@@ -159,7 +159,7 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxChoicebook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookassignimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookassignimagelist">external documentation</a>.
 -spec assignImageList(This, ImageList) -> ok when
 	This::wxChoicebook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -176,7 +176,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxChoicebook(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -194,7 +194,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxChoicebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookdeleteallpages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookdeleteallpages">external documentation</a>.
 -spec deleteAllPages(This) -> boolean() when
 	This::wxChoicebook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -202,7 +202,7 @@ deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxChoicebook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookdeletepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookdeletepage">external documentation</a>.
 -spec deletePage(This, N) -> boolean() when
 	This::wxChoicebook(), N::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -211,7 +211,7 @@ deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxChoicebook_DeletePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookremovepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookremovepage">external documentation</a>.
 -spec removePage(This, N) -> boolean() when
 	This::wxChoicebook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -220,7 +220,7 @@ removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxChoicebook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetcurrentpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookgetcurrentpage">external documentation</a>.
 -spec getCurrentPage(This) -> wxWindow:wxWindow() when
 	This::wxChoicebook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -228,7 +228,7 @@ getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxChoicebook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookgetimagelist">external documentation</a>.
 -spec getImageList(This) -> wxImageList:wxImageList() when
 	This::wxChoicebook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -236,7 +236,7 @@ getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxChoicebook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookgetpage">external documentation</a>.
 -spec getPage(This, N) -> wxWindow:wxWindow() when
 	This::wxChoicebook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -245,7 +245,7 @@ getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxChoicebook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookgetpagecount">external documentation</a>.
 -spec getPageCount(This) -> integer() when
 	This::wxChoicebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -253,7 +253,7 @@ getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxChoicebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookgetpageimage">external documentation</a>.
 -spec getPageImage(This, N) -> integer() when
 	This::wxChoicebook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -262,7 +262,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxChoicebook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookgetpagetext">external documentation</a>.
 -spec getPageText(This, N) -> unicode:charlist() when
 	This::wxChoicebook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -271,7 +271,7 @@ getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxChoicebook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxChoicebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -279,7 +279,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxChoicebook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookhittest">external documentation</a>.
 -spec hitTest(This, Pt) -> Result when
 	Result ::{Res ::integer(), Flags::integer()},
 	This::wxChoicebook(), Pt::{X::integer(), Y::integer()}.
@@ -297,7 +297,7 @@ insertPage(This,N,Page,Text)
  when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,N,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookinsertpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookinsertpage">external documentation</a>.
 -spec insertPage(This, N, Page, Text, [Option]) -> boolean() when
 	This::wxChoicebook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -314,7 +314,7 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Tex
   wxe_util:call(?wxChoicebook_InsertPage,
   <<ThisRef:32/?UI,N:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebooksetimagelist">external documentation</a>.
 -spec setImageList(This, ImageList) -> ok when
 	This::wxChoicebook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -323,7 +323,7 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxChoicebook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebooksetpagesize">external documentation</a>.
 -spec setPageSize(This, Size) -> ok when
 	This::wxChoicebook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -332,7 +332,7 @@ setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxChoicebook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebooksetpageimage">external documentation</a>.
 -spec setPageImage(This, N, ImageId) -> boolean() when
 	This::wxChoicebook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
@@ -341,7 +341,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
   wxe_util:call(?wxChoicebook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebooksetpagetext">external documentation</a>.
 -spec setPageText(This, N, StrText) -> boolean() when
 	This::wxChoicebook(), N::integer(), StrText::unicode:chardata().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
@@ -351,7 +351,7 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxChoicebook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebooksetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebooksetselection">external documentation</a>.
 -spec setSelection(This, N) -> integer() when
 	This::wxChoicebook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -360,7 +360,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxChoicebook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxchoicebook.html#wxchoicebookchangeselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxchoicebook.html#wxchoicebookchangeselection">external documentation</a>.
 -spec changeSelection(This, N) -> integer() when
 	This::wxChoicebook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
diff --git a/lib/wx/src/gen/wxClientDC.erl b/lib/wx/src/gen/wxClientDC.erl
index cb75fdc58d..ae16196774 100644
--- a/lib/wx/src/gen/wxClientDC.erl
+++ b/lib/wx/src/gen/wxClientDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclientdc.html">wxClientDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclientdc.html">wxClientDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindowDC}
 %% <br />{@link wxDC}
@@ -56,19 +56,21 @@
 -export_type([wxClientDC/0]).
 -deprecated([new/0]).
 
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxClientDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclientdc.html#wxclientdcwxclientdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclientdc.html#wxclientdcwxclientdc">external documentation</a>.
 -spec new() -> wxClientDC().
 new() ->
   wxe_util:construct(?wxClientDC_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclientdc.html#wxclientdcwxclientdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclientdc.html#wxclientdcwxclientdc">external documentation</a>.
 -spec new(Win) -> wxClientDC() when
 	Win::wxWindow:wxWindow().
 new(#wx_ref{type=WinT,ref=WinRef}) ->
diff --git a/lib/wx/src/gen/wxClipboard.erl b/lib/wx/src/gen/wxClipboard.erl
index c7336fcc47..7785915c3b 100644
--- a/lib/wx/src/gen/wxClipboard.erl
+++ b/lib/wx/src/gen/wxClipboard.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html">wxClipboard</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html">wxClipboard</a>.
 %% @type wxClipboard().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -35,13 +35,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxClipboard() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardwxclipboard">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardwxclipboard">external documentation</a>.
 -spec new() -> wxClipboard().
 new() ->
   wxe_util:construct(?wxClipboard_new,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardadddata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardadddata">external documentation</a>.
 -spec addData(This, Data) -> boolean() when
 	This::wxClipboard(), Data::wxDataObject:wxDataObject().
 addData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
@@ -50,7 +50,7 @@ addData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
   wxe_util:call(?wxClipboard_AddData,
   <<ThisRef:32/?UI,DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardclear">external documentation</a>.
 -spec clear(This) -> ok when
 	This::wxClipboard().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -58,7 +58,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxClipboard_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardclose">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardclose">external documentation</a>.
 -spec close(This) -> ok when
 	This::wxClipboard().
 close(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -66,7 +66,7 @@ close(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxClipboard_Close,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardflush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardflush">external documentation</a>.
 -spec flush(This) -> boolean() when
 	This::wxClipboard().
 flush(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -74,7 +74,7 @@ flush(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxClipboard_Flush,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardgetdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardgetdata">external documentation</a>.
 -spec getData(This, Data) -> boolean() when
 	This::wxClipboard(), Data::wxDataObject:wxDataObject().
 getData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
@@ -83,7 +83,7 @@ getData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
   wxe_util:call(?wxClipboard_GetData,
   <<ThisRef:32/?UI,DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardisopened">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardisopened">external documentation</a>.
 -spec isOpened(This) -> boolean() when
 	This::wxClipboard().
 isOpened(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -91,7 +91,7 @@ isOpened(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxClipboard_IsOpened,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardopen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardopen">external documentation</a>.
 -spec open(This) -> boolean() when
 	This::wxClipboard().
 open(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -99,7 +99,7 @@ open(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxClipboard_Open,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardsetdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardsetdata">external documentation</a>.
 -spec setData(This, Data) -> boolean() when
 	This::wxClipboard(), Data::wxDataObject:wxDataObject().
 setData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
@@ -116,7 +116,7 @@ usePrimarySelection(This)
  when is_record(This, wx_ref) ->
   usePrimarySelection(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboarduseprimaryselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboarduseprimaryselection">external documentation</a>.
 -spec usePrimarySelection(This, [Option]) -> ok when
 	This::wxClipboard(),
 	Option :: {primary, boolean()}.
@@ -129,7 +129,7 @@ usePrimarySelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxClipboard_UsePrimarySelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardissupported">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardissupported">external documentation</a>.
 %%<br /> Format = ?wxDF_INVALID | ?wxDF_TEXT | ?wxDF_BITMAP | ?wxDF_METAFILE | ?wxDF_SYLK | ?wxDF_DIF | ?wxDF_TIFF | ?wxDF_OEMTEXT | ?wxDF_DIB | ?wxDF_PALETTE | ?wxDF_PENDATA | ?wxDF_RIFF | ?wxDF_WAVE | ?wxDF_UNICODETEXT | ?wxDF_ENHMETAFILE | ?wxDF_FILENAME | ?wxDF_LOCALE | ?wxDF_PRIVATE | ?wxDF_HTML | ?wxDF_MAX
 -spec isSupported(This, Format) -> boolean() when
 	This::wxClipboard(), Format::wx:wx_enum().
@@ -139,7 +139,7 @@ isSupported(#wx_ref{type=ThisT,ref=ThisRef},Format)
   wxe_util:call(?wxClipboard_IsSupported,
   <<ThisRef:32/?UI,Format:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxclipboard.html#wxclipboardget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboard.html#wxclipboardget">external documentation</a>.
 -spec get() -> wxClipboard().
 get() ->
   wxe_util:call(?wxClipboard_Get,
diff --git a/lib/wx/src/gen/wxClipboardTextEvent.erl b/lib/wx/src/gen/wxClipboardTextEvent.erl
new file mode 100644
index 0000000000..1f551b7d83
--- /dev/null
+++ b/lib/wx/src/gen/wxClipboardTextEvent.erl
@@ -0,0 +1,87 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%%
+%% The 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 file is generated DO NOT EDIT
+
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxclipboardtextevent.html">wxClipboardTextEvent</a>.
+%% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
+%% <dd><em>command_text_copy</em>, <em>command_text_cut</em>, <em>command_text_paste</em></dd></dl>
+%% See also the message variant {@link wxEvtHandler:wxClipboardText(). #wxClipboardText{}} event record type.
+%%
+%% <p>This class is derived (and can use functions) from:
+%% <br />{@link wxCommandEvent}
+%% <br />{@link wxEvent}
+%% </p>
+%% @type wxClipboardTextEvent().  An object reference, The representation is internal
+%% and can be changed without notice. It can't be used for comparsion
+%% stored on disc or distributed for use on other nodes.
+
+-module(wxClipboardTextEvent).
+-include("wxe.hrl").
+-export([]).
+
+%% inherited exports
+-export([getClientData/1,getExtraLong/1,getId/1,getInt/1,getSelection/1,getSkipped/1,
+  getString/1,getTimestamp/1,isChecked/1,isCommandEvent/1,isSelection/1,
+  parent_class/1,resumePropagation/2,setInt/2,setString/2,shouldPropagate/1,
+  skip/1,skip/2,stopPropagation/1]).
+
+-export_type([wxClipboardTextEvent/0]).
+%% @hidden
+parent_class(wxCommandEvent) -> true;
+parent_class(wxEvent) -> true;
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
+
+-type wxClipboardTextEvent() :: wx:wx_object().
+ %% From wxCommandEvent
+%% @hidden
+setString(This,S) -> wxCommandEvent:setString(This,S).
+%% @hidden
+setInt(This,I) -> wxCommandEvent:setInt(This,I).
+%% @hidden
+isSelection(This) -> wxCommandEvent:isSelection(This).
+%% @hidden
+isChecked(This) -> wxCommandEvent:isChecked(This).
+%% @hidden
+getString(This) -> wxCommandEvent:getString(This).
+%% @hidden
+getSelection(This) -> wxCommandEvent:getSelection(This).
+%% @hidden
+getInt(This) -> wxCommandEvent:getInt(This).
+%% @hidden
+getExtraLong(This) -> wxCommandEvent:getExtraLong(This).
+%% @hidden
+getClientData(This) -> wxCommandEvent:getClientData(This).
+ %% From wxEvent
+%% @hidden
+stopPropagation(This) -> wxEvent:stopPropagation(This).
+%% @hidden
+skip(This, Options) -> wxEvent:skip(This, Options).
+%% @hidden
+skip(This) -> wxEvent:skip(This).
+%% @hidden
+shouldPropagate(This) -> wxEvent:shouldPropagate(This).
+%% @hidden
+resumePropagation(This,PropagationLevel) -> wxEvent:resumePropagation(This,PropagationLevel).
+%% @hidden
+isCommandEvent(This) -> wxEvent:isCommandEvent(This).
+%% @hidden
+getTimestamp(This) -> wxEvent:getTimestamp(This).
+%% @hidden
+getSkipped(This) -> wxEvent:getSkipped(This).
+%% @hidden
+getId(This) -> wxEvent:getId(This).
diff --git a/lib/wx/src/gen/wxCloseEvent.erl b/lib/wx/src/gen/wxCloseEvent.erl
index 4a682c906e..1aa5d57210 100644
--- a/lib/wx/src/gen/wxCloseEvent.erl
+++ b/lib/wx/src/gen/wxCloseEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html">wxCloseEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcloseevent.html">wxCloseEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>close_window</em>, <em>end_session</em>, <em>query_end_session</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxClose(). #wxClose{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCloseEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventcanveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcloseevent.html#wxcloseeventcanveto">external documentation</a>.
 -spec canVeto(This) -> boolean() when
 	This::wxCloseEvent().
 canVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -51,7 +51,7 @@ canVeto(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCloseEvent_CanVeto,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventgetloggingoff">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcloseevent.html#wxcloseeventgetloggingoff">external documentation</a>.
 -spec getLoggingOff(This) -> boolean() when
 	This::wxCloseEvent().
 getLoggingOff(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ getLoggingOff(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCloseEvent_GetLoggingOff,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventsetcanveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcloseevent.html#wxcloseeventsetcanveto">external documentation</a>.
 -spec setCanVeto(This, CanVeto) -> ok when
 	This::wxCloseEvent(), CanVeto::boolean().
 setCanVeto(#wx_ref{type=ThisT,ref=ThisRef},CanVeto)
@@ -68,7 +68,7 @@ setCanVeto(#wx_ref{type=ThisT,ref=ThisRef},CanVeto)
   wxe_util:cast(?wxCloseEvent_SetCanVeto,
   <<ThisRef:32/?UI,(wxe_util:from_bool(CanVeto)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventsetloggingoff">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcloseevent.html#wxcloseeventsetloggingoff">external documentation</a>.
 -spec setLoggingOff(This, LogOff) -> ok when
 	This::wxCloseEvent(), LogOff::boolean().
 setLoggingOff(#wx_ref{type=ThisT,ref=ThisRef},LogOff)
@@ -85,7 +85,7 @@ veto(This)
  when is_record(This, wx_ref) ->
   veto(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcloseevent.html#wxcloseeventveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcloseevent.html#wxcloseeventveto">external documentation</a>.
 -spec veto(This, [Option]) -> ok when
 	This::wxCloseEvent(),
 	Option :: {veto, boolean()}.
diff --git a/lib/wx/src/gen/wxColourData.erl b/lib/wx/src/gen/wxColourData.erl
index 289d423cb6..1ec3c3f89d 100644
--- a/lib/wx/src/gen/wxColourData.erl
+++ b/lib/wx/src/gen/wxColourData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html">wxColourData</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html">wxColourData</a>.
 %% @type wxColourData().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -35,13 +35,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxColourData() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatawxcolourdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatawxcolourdata">external documentation</a>.
 -spec new() -> wxColourData().
 new() ->
   wxe_util:construct(?wxColourData_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatawxcolourdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatawxcolourdata">external documentation</a>.
 -spec new(Data) -> wxColourData() when
 	Data::wxColourData().
 new(#wx_ref{type=DataT,ref=DataRef}) ->
@@ -49,7 +49,7 @@ new(#wx_ref{type=DataT,ref=DataRef}) ->
   wxe_util:construct(?wxColourData_new_1,
   <<DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetchoosefull">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatagetchoosefull">external documentation</a>.
 -spec getChooseFull(This) -> boolean() when
 	This::wxColourData().
 getChooseFull(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -57,7 +57,7 @@ getChooseFull(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxColourData_GetChooseFull,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatagetcolour">external documentation</a>.
 -spec getColour(This) -> wx:wx_colour4() when
 	This::wxColourData().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -65,7 +65,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxColourData_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatagetcustomcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatagetcustomcolour">external documentation</a>.
 -spec getCustomColour(This, I) -> wx:wx_colour4() when
 	This::wxColourData(), I::integer().
 getCustomColour(#wx_ref{type=ThisT,ref=ThisRef},I)
@@ -74,7 +74,7 @@ getCustomColour(#wx_ref{type=ThisT,ref=ThisRef},I)
   wxe_util:call(?wxColourData_GetCustomColour,
   <<ThisRef:32/?UI,I:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatasetchoosefull">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatasetchoosefull">external documentation</a>.
 -spec setChooseFull(This, Flag) -> ok when
 	This::wxColourData(), Flag::boolean().
 setChooseFull(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -83,7 +83,7 @@ setChooseFull(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxColourData_SetChooseFull,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatasetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatasetcolour">external documentation</a>.
 -spec setColour(This, Colour) -> ok when
 	This::wxColourData(), Colour::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -92,7 +92,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxColourData_SetColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdata.html#wxcolourdatasetcustomcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdata.html#wxcolourdatasetcustomcolour">external documentation</a>.
 -spec setCustomColour(This, I, Colour) -> ok when
 	This::wxColourData(), I::integer(), Colour::wx:wx_colour().
 setCustomColour(#wx_ref{type=ThisT,ref=ThisRef},I,Colour)
diff --git a/lib/wx/src/gen/wxColourDialog.erl b/lib/wx/src/gen/wxColourDialog.erl
index 8040112426..ef792696e1 100644
--- a/lib/wx/src/gen/wxColourDialog.erl
+++ b/lib/wx/src/gen/wxColourDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html">wxColourDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdialog.html">wxColourDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -86,7 +86,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxColourDialog() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialogwxcolourdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdialog.html#wxcolourdialogwxcolourdialog">external documentation</a>.
 -spec new() -> wxColourDialog().
 new() ->
   wxe_util:construct(?wxColourDialog_new_0,
@@ -100,7 +100,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialogwxcolourdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdialog.html#wxcolourdialogwxcolourdialog">external documentation</a>.
 -spec new(Parent, [Option]) -> wxColourDialog() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {data, wxColourData:wxColourData()}.
@@ -121,7 +121,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialogcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdialog.html#wxcolourdialogcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxColourDialog(), Parent::wxWindow:wxWindow(),
 	Option :: {data, wxColourData:wxColourData()}.
@@ -135,7 +135,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxColourDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourdialog.html#wxcolourdialoggetcolourdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourdialog.html#wxcolourdialoggetcolourdata">external documentation</a>.
 -spec getColourData(This) -> wxColourData:wxColourData() when
 	This::wxColourDialog().
 getColourData(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxColourPickerCtrl.erl b/lib/wx/src/gen/wxColourPickerCtrl.erl
index 1ba771695f..654e8a5055 100644
--- a/lib/wx/src/gen/wxColourPickerCtrl.erl
+++ b/lib/wx/src/gen/wxColourPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html">wxColourPickerCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerctrl.html">wxColourPickerCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxPickerBase}
 %% <br />{@link wxControl}
@@ -83,7 +83,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxColourPickerCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlwxcolourpickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerctrl.html#wxcolourpickerctrlwxcolourpickerctrl">external documentation</a>.
 -spec new() -> wxColourPickerCtrl().
 new() ->
   wxe_util:construct(?wxColourPickerCtrl_new_0,
@@ -97,7 +97,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlwxcolourpickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerctrl.html#wxcolourpickerctrlwxcolourpickerctrl">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxColourPickerCtrl() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {col, wx:wx_colour()}
@@ -126,7 +126,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerctrl.html#wxcolourpickerctrlcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxColourPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {col, wx:wx_colour()}
@@ -148,7 +148,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxColourPickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlgetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerctrl.html#wxcolourpickerctrlgetcolour">external documentation</a>.
 -spec getColour(This) -> wx:wx_colour4() when
 	This::wxColourPickerCtrl().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -156,7 +156,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxColourPickerCtrl_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerctrl.html#wxcolourpickerctrlsetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerctrl.html#wxcolourpickerctrlsetcolour">external documentation</a>.
 %% <br /> Also:<br />
 %% setColour(This, Col) -> ok when<br />
 %% 	This::wxColourPickerCtrl(), Col::wx:wx_colour().<br />
diff --git a/lib/wx/src/gen/wxColourPickerEvent.erl b/lib/wx/src/gen/wxColourPickerEvent.erl
index 71a3fd3e5b..2b0e7df681 100644
--- a/lib/wx/src/gen/wxColourPickerEvent.erl
+++ b/lib/wx/src/gen/wxColourPickerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerevent.html">wxColourPickerEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerevent.html">wxColourPickerEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_colourpicker_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxColourPicker(). #wxColourPicker{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxColourPickerEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcolourpickerevent.html#wxcolourpickereventgetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcolourpickerevent.html#wxcolourpickereventgetcolour">external documentation</a>.
 -spec getColour(This) -> wx:wx_colour4() when
 	This::wxColourPickerEvent().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxComboBox.erl b/lib/wx/src/gen/wxComboBox.erl
index 4e6b247f67..d41d3e1ca3 100644
--- a/lib/wx/src/gen/wxComboBox.erl
+++ b/lib/wx/src/gen/wxComboBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html">wxComboBox</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html">wxComboBox</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControlWithItems}
 %% <br />{@link wxControl}
@@ -85,7 +85,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxComboBox() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxwxcombobox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxwxcombobox">external documentation</a>.
 -spec new() -> wxComboBox().
 new() ->
   wxe_util:construct(?wxComboBox_new_0,
@@ -99,7 +99,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxwxcombobox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxwxcombobox">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxComboBox() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {value, unicode:chardata()}
@@ -130,7 +130,7 @@ create(This,Parent,Id,Value,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Value),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Value,Pos,Size,Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcreate">external documentation</a>.
 -spec create(This, Parent, Id, Value, Pos, Size, Choices, [Option]) -> boolean() when
 	This::wxComboBox(), Parent::wxWindow:wxWindow(), Id::integer(), Value::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[unicode:chardata()],
 	Option :: {style, integer()}
@@ -149,7 +149,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Va
   wxe_util:call(?wxComboBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcancopy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcancopy">external documentation</a>.
 -spec canCopy(This) -> boolean() when
 	This::wxComboBox().
 canCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -157,7 +157,7 @@ canCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_CanCopy,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcancut">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcancut">external documentation</a>.
 -spec canCut(This) -> boolean() when
 	This::wxComboBox().
 canCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -165,7 +165,7 @@ canCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_CanCut,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcanpaste">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcanpaste">external documentation</a>.
 -spec canPaste(This) -> boolean() when
 	This::wxComboBox().
 canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -173,7 +173,7 @@ canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_CanPaste,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcanredo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcanredo">external documentation</a>.
 -spec canRedo(This) -> boolean() when
 	This::wxComboBox().
 canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -181,7 +181,7 @@ canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_CanRedo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcanundo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcanundo">external documentation</a>.
 -spec canUndo(This) -> boolean() when
 	This::wxComboBox().
 canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -189,7 +189,7 @@ canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_CanUndo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcopy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcopy">external documentation</a>.
 -spec copy(This) -> ok when
 	This::wxComboBox().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -197,7 +197,7 @@ copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxComboBox_Copy,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxcut">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxcut">external documentation</a>.
 -spec cut(This) -> ok when
 	This::wxComboBox().
 cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -205,7 +205,7 @@ cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxComboBox_Cut,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxgetinsertionpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxgetinsertionpoint">external documentation</a>.
 -spec getInsertionPoint(This) -> integer() when
 	This::wxComboBox().
 getInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -213,7 +213,7 @@ getInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_GetInsertionPoint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxgetlastposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxgetlastposition">external documentation</a>.
 -spec getLastPosition(This) -> integer() when
 	This::wxComboBox().
 getLastPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -221,7 +221,7 @@ getLastPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_GetLastPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxgetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxgetvalue">external documentation</a>.
 -spec getValue(This) -> unicode:charlist() when
 	This::wxComboBox().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -229,7 +229,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxComboBox_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxpaste">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxpaste">external documentation</a>.
 -spec paste(This) -> ok when
 	This::wxComboBox().
 paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -237,7 +237,7 @@ paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxComboBox_Paste,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxredo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxredo">external documentation</a>.
 -spec redo(This) -> ok when
 	This::wxComboBox().
 redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -245,7 +245,7 @@ redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxComboBox_Redo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxreplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxreplace">external documentation</a>.
 -spec replace(This, From, To, Value) -> ok when
 	This::wxComboBox(), From::integer(), To::integer(), Value::unicode:chardata().
 replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value)
@@ -255,7 +255,7 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value)
   wxe_util:cast(?wxComboBox_Replace,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxremove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxremove">external documentation</a>.
 -spec remove(This, From, To) -> ok when
 	This::wxComboBox(), From::integer(), To::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},From,To)
@@ -264,7 +264,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},From,To)
   wxe_util:cast(?wxComboBox_Remove,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetinsertionpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxsetinsertionpoint">external documentation</a>.
 -spec setInsertionPoint(This, Pos) -> ok when
 	This::wxComboBox(), Pos::integer().
 setInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -273,7 +273,7 @@ setInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxComboBox_SetInsertionPoint,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetinsertionpointend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxsetinsertionpointend">external documentation</a>.
 -spec setInsertionPointEnd(This) -> ok when
 	This::wxComboBox().
 setInsertionPointEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -281,7 +281,7 @@ setInsertionPointEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxComboBox_SetInsertionPointEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxsetselection">external documentation</a>.
 -spec setSelection(This, N) -> ok when
 	This::wxComboBox(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -290,7 +290,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:cast(?wxComboBox_SetSelection_1,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxsetselection">external documentation</a>.
 -spec setSelection(This, From, To) -> ok when
 	This::wxComboBox(), From::integer(), To::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
@@ -299,7 +299,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
   wxe_util:cast(?wxComboBox_SetSelection_2,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxsetvalue">external documentation</a>.
 -spec setValue(This, Value) -> ok when
 	This::wxComboBox(), Value::unicode:chardata().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
@@ -309,7 +309,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
   wxe_util:cast(?wxComboBox_SetValue,
   <<ThisRef:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcombobox.html#wxcomboboxundo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcombobox.html#wxcomboboxundo">external documentation</a>.
 -spec undo(This) -> ok when
 	This::wxComboBox().
 undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxCommandEvent.erl b/lib/wx/src/gen/wxCommandEvent.erl
index a7567163cf..c0bcf97231 100644
--- a/lib/wx/src/gen/wxCommandEvent.erl
+++ b/lib/wx/src/gen/wxCommandEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html">wxCommandEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html">wxCommandEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_button_clicked</em>, <em>command_checkbox_clicked</em>, <em>command_choice_selected</em>, <em>command_listbox_selected</em>, <em>command_listbox_doubleclicked</em>, <em>command_text_updated</em>, <em>command_text_enter</em>, <em>command_menu_selected</em>, <em>command_slider_updated</em>, <em>command_radiobox_selected</em>, <em>command_radiobutton_selected</em>, <em>command_scrollbar_updated</em>, <em>command_vlbox_selected</em>, <em>command_combobox_selected</em>, <em>command_tool_rclicked</em>, <em>command_tool_enter</em>, <em>command_checklistbox_toggled</em>, <em>command_togglebutton_clicked</em>, <em>command_left_click</em>, <em>command_left_dclick</em>, <em>command_right_click</em>, <em>command_set_focus</em>, <em>command_kill_focus</em>, <em>command_enter</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxCommand(). #wxCommand{}} event record type.
@@ -44,7 +44,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCommandEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetclientobject">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventgetclientobject">external documentation</a>.
 -spec getClientData(This) -> term() when
 	This::wxCommandEvent().
 getClientData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -52,7 +52,7 @@ getClientData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCommandEvent_getClientData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetextralong">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventgetextralong">external documentation</a>.
 -spec getExtraLong(This) -> integer() when
 	This::wxCommandEvent().
 getExtraLong(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -60,7 +60,7 @@ getExtraLong(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCommandEvent_GetExtraLong,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventgetint">external documentation</a>.
 -spec getInt(This) -> integer() when
 	This::wxCommandEvent().
 getInt(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -68,7 +68,7 @@ getInt(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCommandEvent_GetInt,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxCommandEvent().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -76,7 +76,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCommandEvent_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventgetstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventgetstring">external documentation</a>.
 -spec getString(This) -> unicode:charlist() when
 	This::wxCommandEvent().
 getString(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -84,7 +84,7 @@ getString(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCommandEvent_GetString,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventischecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventischecked">external documentation</a>.
 -spec isChecked(This) -> boolean() when
 	This::wxCommandEvent().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -92,7 +92,7 @@ isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCommandEvent_IsChecked,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventisselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventisselection">external documentation</a>.
 -spec isSelection(This) -> boolean() when
 	This::wxCommandEvent().
 isSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -100,7 +100,7 @@ isSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxCommandEvent_IsSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventsetint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventsetint">external documentation</a>.
 -spec setInt(This, I) -> ok when
 	This::wxCommandEvent(), I::integer().
 setInt(#wx_ref{type=ThisT,ref=ThisRef},I)
@@ -109,7 +109,7 @@ setInt(#wx_ref{type=ThisT,ref=ThisRef},I)
   wxe_util:cast(?wxCommandEvent_SetInt,
   <<ThisRef:32/?UI,I:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcommandevent.html#wxcommandeventsetstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcommandevent.html#wxcommandeventsetstring">external documentation</a>.
 -spec setString(This, S) -> ok when
 	This::wxCommandEvent(), S::unicode:chardata().
 setString(#wx_ref{type=ThisT,ref=ThisRef},S)
diff --git a/lib/wx/src/gen/wxContextMenuEvent.erl b/lib/wx/src/gen/wxContextMenuEvent.erl
index 9312803e33..ff345bb386 100644
--- a/lib/wx/src/gen/wxContextMenuEvent.erl
+++ b/lib/wx/src/gen/wxContextMenuEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontextmenuevent.html">wxContextMenuEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontextmenuevent.html">wxContextMenuEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>context_menu</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxContextMenu(). #wxContextMenu{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxContextMenuEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontextmenuevent.html#wxcontextmenueventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontextmenuevent.html#wxcontextmenueventgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxContextMenuEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -55,7 +55,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxContextMenuEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontextmenuevent.html#wxcontextmenueventsetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontextmenuevent.html#wxcontextmenueventsetposition">external documentation</a>.
 -spec setPosition(This, Pos) -> ok when
 	This::wxContextMenuEvent(), Pos::{X::integer(), Y::integer()}.
 setPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
diff --git a/lib/wx/src/gen/wxControl.erl b/lib/wx/src/gen/wxControl.erl
index f840d0c6bc..7e4f0c59ce 100644
--- a/lib/wx/src/gen/wxControl.erl
+++ b/lib/wx/src/gen/wxControl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html">wxControl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrol.html">wxControl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -75,7 +75,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxControl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolgetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrol.html#wxcontrolgetlabel">external documentation</a>.
 -spec getLabel(This) -> unicode:charlist() when
 	This::wxControl().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -83,7 +83,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxControl_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrol.html#wxcontrolsetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrol.html#wxcontrolsetlabel">external documentation</a>.
 -spec setLabel(This, Label) -> ok when
 	This::wxControl(), Label::unicode:chardata().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
diff --git a/lib/wx/src/gen/wxControlWithItems.erl b/lib/wx/src/gen/wxControlWithItems.erl
index 92632a1c31..95bd573bdf 100644
--- a/lib/wx/src/gen/wxControlWithItems.erl
+++ b/lib/wx/src/gen/wxControlWithItems.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html">wxControlWithItems</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html">wxControlWithItems</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -80,7 +80,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxControlWithItems() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
 -spec append(This, Item) -> integer() when
 	This::wxControlWithItems(), Item::unicode:chardata().
 append(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -90,7 +90,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxControlWithItems_Append_1,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
 -spec append(This, Item, ClientData) -> integer() when
 	This::wxControlWithItems(), Item::unicode:chardata(), ClientData::term().
 append(#wx_ref{type=ThisT,ref=ThisRef},Item,ClientData)
@@ -101,7 +101,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Item,ClientData)
   wxe_util:call(?wxControlWithItems_Append_2,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsappend">external documentation</a>.
 -spec appendStrings(This, Strings) -> ok when
 	This::wxControlWithItems(), Strings::[unicode:chardata()].
 appendStrings(#wx_ref{type=ThisT,ref=ThisRef},Strings)
@@ -112,7 +112,7 @@ appendStrings(#wx_ref{type=ThisT,ref=ThisRef},Strings)
   wxe_util:cast(?wxControlWithItems_appendStrings_1,
   <<ThisRef:32/?UI,(length(Strings_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Strings_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Strings_UCA])) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsclear">external documentation</a>.
 -spec clear(This) -> ok when
 	This::wxControlWithItems().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -120,7 +120,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxControlWithItems_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsdelete">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsdelete">external documentation</a>.
 -spec delete(This, N) -> ok when
 	This::wxControlWithItems(), N::integer().
 delete(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -137,7 +137,7 @@ findString(This,S)
  when is_record(This, wx_ref),is_list(S) ->
   findString(This,S, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsfindstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsfindstring">external documentation</a>.
 -spec findString(This, S, [Option]) -> integer() when
 	This::wxControlWithItems(), S::unicode:chardata(),
 	Option :: {bCase, boolean()}.
@@ -151,7 +151,7 @@ findString(#wx_ref{type=ThisT,ref=ThisRef},S, Options)
   wxe_util:call(?wxControlWithItems_FindString,
   <<ThisRef:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetclientobject">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetclientobject">external documentation</a>.
 -spec getClientData(This, N) -> term() when
 	This::wxControlWithItems(), N::integer().
 getClientData(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -160,7 +160,7 @@ getClientData(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxControlWithItems_getClientData,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetclientobject">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemssetclientobject">external documentation</a>.
 -spec setClientData(This, N, ClientData) -> ok when
 	This::wxControlWithItems(), N::integer(), ClientData::term().
 setClientData(#wx_ref{type=ThisT,ref=ThisRef},N,ClientData)
@@ -170,7 +170,7 @@ setClientData(#wx_ref{type=ThisT,ref=ThisRef},N,ClientData)
   wxe_util:cast(?wxControlWithItems_setClientData,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetcount">external documentation</a>.
 -spec getCount(This) -> integer() when
 	This::wxControlWithItems().
 getCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -178,7 +178,7 @@ getCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxControlWithItems_GetCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxControlWithItems().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -186,7 +186,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxControlWithItems_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstring">external documentation</a>.
 -spec getString(This, N) -> unicode:charlist() when
 	This::wxControlWithItems(), N::integer().
 getString(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -195,7 +195,7 @@ getString(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxControlWithItems_GetString,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstringselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsgetstringselection">external documentation</a>.
 -spec getStringSelection(This) -> unicode:charlist() when
 	This::wxControlWithItems().
 getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -203,7 +203,7 @@ getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxControlWithItems_GetStringSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>.
 -spec insert(This, Item, Pos) -> integer() when
 	This::wxControlWithItems(), Item::unicode:chardata(), Pos::integer().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos)
@@ -213,7 +213,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos)
   wxe_util:call(?wxControlWithItems_Insert_2,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsinsert">external documentation</a>.
 -spec insert(This, Item, Pos, ClientData) -> integer() when
 	This::wxControlWithItems(), Item::unicode:chardata(), Pos::integer(), ClientData::term().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos,ClientData)
@@ -224,7 +224,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Item,Pos,ClientData)
   wxe_util:call(?wxControlWithItems_Insert_3,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsisempty">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsisempty">external documentation</a>.
 -spec isEmpty(This) -> boolean() when
 	This::wxControlWithItems().
 isEmpty(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -232,7 +232,7 @@ isEmpty(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxControlWithItems_IsEmpty,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemsselect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemsselect">external documentation</a>.
 -spec select(This, N) -> ok when
 	This::wxControlWithItems(), N::integer().
 select(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -241,7 +241,7 @@ select(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:cast(?wxControlWithItems_Select,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemssetselection">external documentation</a>.
 -spec setSelection(This, N) -> ok when
 	This::wxControlWithItems(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -250,7 +250,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:cast(?wxControlWithItems_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstring">external documentation</a>.
 -spec setString(This, N, S) -> ok when
 	This::wxControlWithItems(), N::integer(), S::unicode:chardata().
 setString(#wx_ref{type=ThisT,ref=ThisRef},N,S)
@@ -260,7 +260,7 @@ setString(#wx_ref{type=ThisT,ref=ThisRef},N,S)
   wxe_util:cast(?wxControlWithItems_SetString,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((4+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstringselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcontrolwithitems.html#wxcontrolwithitemssetstringselection">external documentation</a>.
 -spec setStringSelection(This, S) -> boolean() when
 	This::wxControlWithItems(), S::unicode:chardata().
 setStringSelection(#wx_ref{type=ThisT,ref=ThisRef},S)
diff --git a/lib/wx/src/gen/wxCursor.erl b/lib/wx/src/gen/wxCursor.erl
index 423e444f2f..abdde79f71 100644
--- a/lib/wx/src/gen/wxCursor.erl
+++ b/lib/wx/src/gen/wxCursor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html">wxCursor</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcursor.html">wxCursor</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxBitmap}
 %% </p>
@@ -42,13 +42,13 @@ parent_class(wxBitmap) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxCursor() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
 -spec new() -> wxCursor().
 new() ->
   wxe_util:construct(?wxCursor_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Image) -> wxCursor() when<br />
 %% 	Image::wxImage:wxImage().<br />
@@ -74,7 +74,7 @@ new(Bits,Width,Height)
  when is_binary(Bits),is_integer(Width),is_integer(Height) ->
   new(Bits,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcursor.html#wxcursorwxcursor">external documentation</a>.
 -spec new(Bits, Width, Height, [Option]) -> wxCursor() when
 	Bits::binary(), Width::integer(), Height::integer(),
 	Option :: {hotSpotX, integer()}
@@ -89,7 +89,7 @@ new(Bits,Width,Height, Options)
   wxe_util:construct(?wxCursor_new_4,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxcursor.html#wxcursorok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxcursor.html#wxcursorok">external documentation</a>.
 -spec ok(This) -> boolean() when
 	This::wxCursor().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxDC.erl b/lib/wx/src/gen/wxDC.erl
index 42d5d7b1df..2a7717b3c3 100644
--- a/lib/wx/src/gen/wxDC.erl
+++ b/lib/wx/src/gen/wxDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html">wxDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html">wxDC</a>.
 %% @type wxDC().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -64,7 +64,7 @@ blit(This,DestPt={DestPtX,DestPtY},Sz={SzW,SzH},Source,SrcPt={SrcPtX,SrcPtY})
  when is_record(This, wx_ref),is_integer(DestPtX),is_integer(DestPtY),is_integer(SzW),is_integer(SzH),is_record(Source, wx_ref),is_integer(SrcPtX),is_integer(SrcPtY) ->
   blit(This,DestPt,Sz,Source,SrcPt, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcblit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcblit">external documentation</a>.
 %%<br /> Rop = integer
 -spec blit(This, DestPt, Sz, Source, SrcPt, [Option]) -> boolean() when
 	This::wxDC(), DestPt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Source::wxDC(), SrcPt::{X::integer(), Y::integer()},
@@ -83,7 +83,7 @@ blit(#wx_ref{type=ThisT,ref=ThisRef},{DestPtX,DestPtY},{SzW,SzH},#wx_ref{type=So
   wxe_util:call(?wxDC_Blit,
   <<ThisRef:32/?UI,DestPtX:32/?UI,DestPtY:32/?UI,SzW:32/?UI,SzH:32/?UI,SourceRef:32/?UI,SrcPtX:32/?UI,SrcPtY:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdccalcboundingbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdccalcboundingbox">external documentation</a>.
 -spec calcBoundingBox(This, X, Y) -> ok when
 	This::wxDC(), X::integer(), Y::integer().
 calcBoundingBox(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -92,7 +92,7 @@ calcBoundingBox(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxDC_CalcBoundingBox,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcclear">external documentation</a>.
 -spec clear(This) -> ok when
 	This::wxDC().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -100,7 +100,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxDC_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdccomputescaleandorigin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdccomputescaleandorigin">external documentation</a>.
 -spec computeScaleAndOrigin(This) -> ok when
 	This::wxDC().
 computeScaleAndOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -108,7 +108,7 @@ computeScaleAndOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxDC_ComputeScaleAndOrigin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdccrosshair">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdccrosshair">external documentation</a>.
 -spec crossHair(This, Pt) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}.
 crossHair(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -117,7 +117,7 @@ crossHair(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxDC_CrossHair,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdestroyclippingregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdestroyclippingregion">external documentation</a>.
 -spec destroyClippingRegion(This) -> ok when
 	This::wxDC().
 destroyClippingRegion(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -125,7 +125,7 @@ destroyClippingRegion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxDC_DestroyClippingRegion,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicalx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdevicetologicalx">external documentation</a>.
 -spec deviceToLogicalX(This, X) -> integer() when
 	This::wxDC(), X::integer().
 deviceToLogicalX(#wx_ref{type=ThisT,ref=ThisRef},X)
@@ -134,7 +134,7 @@ deviceToLogicalX(#wx_ref{type=ThisT,ref=ThisRef},X)
   wxe_util:call(?wxDC_DeviceToLogicalX,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicalxrel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdevicetologicalxrel">external documentation</a>.
 -spec deviceToLogicalXRel(This, X) -> integer() when
 	This::wxDC(), X::integer().
 deviceToLogicalXRel(#wx_ref{type=ThisT,ref=ThisRef},X)
@@ -143,7 +143,7 @@ deviceToLogicalXRel(#wx_ref{type=ThisT,ref=ThisRef},X)
   wxe_util:call(?wxDC_DeviceToLogicalXRel,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicaly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdevicetologicaly">external documentation</a>.
 -spec deviceToLogicalY(This, Y) -> integer() when
 	This::wxDC(), Y::integer().
 deviceToLogicalY(#wx_ref{type=ThisT,ref=ThisRef},Y)
@@ -152,7 +152,7 @@ deviceToLogicalY(#wx_ref{type=ThisT,ref=ThisRef},Y)
   wxe_util:call(?wxDC_DeviceToLogicalY,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdevicetologicalyrel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdevicetologicalyrel">external documentation</a>.
 -spec deviceToLogicalYRel(This, Y) -> integer() when
 	This::wxDC(), Y::integer().
 deviceToLogicalYRel(#wx_ref{type=ThisT,ref=ThisRef},Y)
@@ -161,7 +161,7 @@ deviceToLogicalYRel(#wx_ref{type=ThisT,ref=ThisRef},Y)
   wxe_util:call(?wxDC_DeviceToLogicalYRel,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawarc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawarc">external documentation</a>.
 -spec drawArc(This, Pt1, Pt2, Centre) -> ok when
 	This::wxDC(), Pt1::{X::integer(), Y::integer()}, Pt2::{X::integer(), Y::integer()}, Centre::{X::integer(), Y::integer()}.
 drawArc(#wx_ref{type=ThisT,ref=ThisRef},{Pt1X,Pt1Y},{Pt2X,Pt2Y},{CentreX,CentreY})
@@ -178,7 +178,7 @@ drawBitmap(This,Bmp,Pt={PtX,PtY})
  when is_record(This, wx_ref),is_record(Bmp, wx_ref),is_integer(PtX),is_integer(PtY) ->
   drawBitmap(This,Bmp,Pt, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawbitmap">external documentation</a>.
 -spec drawBitmap(This, Bmp, Pt, [Option]) -> ok when
 	This::wxDC(), Bmp::wxBitmap:wxBitmap(), Pt::{X::integer(), Y::integer()},
 	Option :: {useMask, boolean()}.
@@ -192,7 +192,7 @@ drawBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},{PtX,Pt
   wxe_util:cast(?wxDC_DrawBitmap,
   <<ThisRef:32/?UI,BmpRef:32/?UI,PtX:32/?UI,PtY:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawcheckmark">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawcheckmark">external documentation</a>.
 -spec drawCheckMark(This, Rect) -> ok when
 	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 drawCheckMark(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
@@ -201,7 +201,7 @@ drawCheckMark(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxDC_DrawCheckMark,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawcircle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawcircle">external documentation</a>.
 -spec drawCircle(This, Pt, Radius) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Radius::integer().
 drawCircle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Radius)
@@ -210,7 +210,7 @@ drawCircle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Radius)
   wxe_util:cast(?wxDC_DrawCircle,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,Radius:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawellipse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawellipse">external documentation</a>.
 -spec drawEllipse(This, Rect) -> ok when
 	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
@@ -219,7 +219,7 @@ drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxDC_DrawEllipse_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawellipse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawellipse">external documentation</a>.
 -spec drawEllipse(This, Pt, Sz) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}.
 drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
@@ -228,7 +228,7 @@ drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
   wxe_util:cast(?wxDC_DrawEllipse_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawellipticarc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawellipticarc">external documentation</a>.
 -spec drawEllipticArc(This, Pt, Sz, Sa, Ea) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Sa::number(), Ea::number().
 drawEllipticArc(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH},Sa,Ea)
@@ -237,7 +237,7 @@ drawEllipticArc(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH},Sa,Ea)
   wxe_util:cast(?wxDC_DrawEllipticArc,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI,0:32,Sa:64/?F,Ea:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawicon">external documentation</a>.
 -spec drawIcon(This, Icon, Pt) -> ok when
 	This::wxDC(), Icon::wxIcon:wxIcon(), Pt::{X::integer(), Y::integer()}.
 drawIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef},{PtX,PtY})
@@ -255,7 +255,7 @@ drawLabel(This,Text,Rect={RectX,RectY,RectW,RectH})
  when is_record(This, wx_ref),is_list(Text),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   drawLabel(This,Text,Rect, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawlabel">external documentation</a>.
 -spec drawLabel(This, Text, Rect, [Option]) -> ok when
 	This::wxDC(), Text::unicode:chardata(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},
 	Option :: {alignment, integer()}
@@ -271,7 +271,7 @@ drawLabel(#wx_ref{type=ThisT,ref=ThisRef},Text,{RectX,RectY,RectW,RectH}, Option
   wxe_util:cast(?wxDC_DrawLabel,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawline">external documentation</a>.
 -spec drawLine(This, Pt1, Pt2) -> ok when
 	This::wxDC(), Pt1::{X::integer(), Y::integer()}, Pt2::{X::integer(), Y::integer()}.
 drawLine(#wx_ref{type=ThisT,ref=ThisRef},{Pt1X,Pt1Y},{Pt2X,Pt2Y})
@@ -288,7 +288,7 @@ drawLines(This,Points)
  when is_record(This, wx_ref),is_list(Points) ->
   drawLines(This,Points, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawlines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawlines">external documentation</a>.
 -spec drawLines(This, Points, [Option]) -> ok when
 	This::wxDC(), Points::[{X::integer(), Y::integer()}],
 	Option :: {xoffset, integer()}
@@ -312,7 +312,7 @@ drawPolygon(This,Points)
  when is_record(This, wx_ref),is_list(Points) ->
   drawPolygon(This,Points, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawpolygon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawpolygon">external documentation</a>.
 %%<br /> FillStyle = integer
 -spec drawPolygon(This, Points, [Option]) -> ok when
 	This::wxDC(), Points::[{X::integer(), Y::integer()}],
@@ -331,7 +331,7 @@ drawPolygon(#wx_ref{type=ThisT,ref=ThisRef},Points, Options)
   <<ThisRef:32/?UI,(length(Points)):32/?UI,
         (<< <<X:32/?I,Y:32/?I>> || {X,Y} <- Points>>)/binary, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawpoint">external documentation</a>.
 -spec drawPoint(This, Pt) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}.
 drawPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -340,7 +340,7 @@ drawPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxDC_DrawPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawrectangle">external documentation</a>.
 -spec drawRectangle(This, Rect) -> ok when
 	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
@@ -349,7 +349,7 @@ drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxDC_DrawRectangle_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawrectangle">external documentation</a>.
 -spec drawRectangle(This, Pt, Sz) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}.
 drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
@@ -358,7 +358,7 @@ drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
   wxe_util:cast(?wxDC_DrawRectangle_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawrotatedtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawrotatedtext">external documentation</a>.
 -spec drawRotatedText(This, Text, Pt, Angle) -> ok when
 	This::wxDC(), Text::unicode:chardata(), Pt::{X::integer(), Y::integer()}, Angle::number().
 drawRotatedText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY},Angle)
@@ -368,7 +368,7 @@ drawRotatedText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY},Angle)
   wxe_util:cast(?wxDC_DrawRotatedText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,PtX:32/?UI,PtY:32/?UI,Angle:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawroundedrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawroundedrectangle">external documentation</a>.
 -spec drawRoundedRectangle(This, R, Radius) -> ok when
 	This::wxDC(), R::{X::integer(), Y::integer(), W::integer(), H::integer()}, Radius::number().
 drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},{RX,RY,RW,RH},Radius)
@@ -377,7 +377,7 @@ drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},{RX,RY,RW,RH},Radius)
   wxe_util:cast(?wxDC_DrawRoundedRectangle_2,
   <<ThisRef:32/?UI,RX:32/?UI,RY:32/?UI,RW:32/?UI,RH:32/?UI,0:32,Radius:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawroundedrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawroundedrectangle">external documentation</a>.
 -spec drawRoundedRectangle(This, Pt, Sz, Radius) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}, Radius::number().
 drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH},Radius)
@@ -386,7 +386,7 @@ drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH},Radius)
   wxe_util:cast(?wxDC_DrawRoundedRectangle_3,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI,0:32,Radius:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcdrawtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcdrawtext">external documentation</a>.
 -spec drawText(This, Text, Pt) -> ok when
 	This::wxDC(), Text::unicode:chardata(), Pt::{X::integer(), Y::integer()}.
 drawText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY})
@@ -396,7 +396,7 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Text,{PtX,PtY})
   wxe_util:cast(?wxDC_DrawText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcenddoc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcenddoc">external documentation</a>.
 -spec endDoc(This) -> ok when
 	This::wxDC().
 endDoc(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -404,7 +404,7 @@ endDoc(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxDC_EndDoc,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcendpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcendpage">external documentation</a>.
 -spec endPage(This) -> ok when
 	This::wxDC().
 endPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -420,7 +420,7 @@ floodFill(This,Pt={PtX,PtY},Col)
  when is_record(This, wx_ref),is_integer(PtX),is_integer(PtY),tuple_size(Col) =:= 3; tuple_size(Col) =:= 4 ->
   floodFill(This,Pt,Col, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcfloodfill">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcfloodfill">external documentation</a>.
 %%<br /> Style = integer
 -spec floodFill(This, Pt, Col, [Option]) -> boolean() when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Col::wx:wx_colour(),
@@ -434,7 +434,7 @@ floodFill(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},Col, Options)
   wxe_util:call(?wxDC_FloodFill,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,(wxe_util:colour_bin(Col)):16/binary, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetbackground">external documentation</a>.
 -spec getBackground(This) -> wxBrush:wxBrush() when
 	This::wxDC().
 getBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -442,7 +442,7 @@ getBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetBackground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetbackgroundmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetbackgroundmode">external documentation</a>.
 -spec getBackgroundMode(This) -> integer() when
 	This::wxDC().
 getBackgroundMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -450,7 +450,7 @@ getBackgroundMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetBackgroundMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetbrush">external documentation</a>.
 -spec getBrush(This) -> wxBrush:wxBrush() when
 	This::wxDC().
 getBrush(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -458,7 +458,7 @@ getBrush(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetBrush,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetcharheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetcharheight">external documentation</a>.
 -spec getCharHeight(This) -> integer() when
 	This::wxDC().
 getCharHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -466,7 +466,7 @@ getCharHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetCharHeight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetcharwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetcharwidth">external documentation</a>.
 -spec getCharWidth(This) -> integer() when
 	This::wxDC().
 getCharWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -474,7 +474,7 @@ getCharWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetCharWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetclippingbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetclippingbox">external documentation</a>.
 -spec getClippingBox(This) -> Result when
 	Result ::{X::integer(), Y::integer(), W::integer(), H::integer()},
 	This::wxDC().
@@ -483,7 +483,7 @@ getClippingBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetClippingBox,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxDC().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -491,7 +491,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetlayoutdirection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetlayoutdirection">external documentation</a>.
 %%<br /> Res = ?wxLayout_Default | ?wxLayout_LeftToRight | ?wxLayout_RightToLeft
 -spec getLayoutDirection(This) -> wx:wx_enum() when
 	This::wxDC().
@@ -500,7 +500,7 @@ getLayoutDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetLayoutDirection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetlogicalfunction">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetlogicalfunction">external documentation</a>.
 -spec getLogicalFunction(This) -> integer() when
 	This::wxDC().
 getLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -508,7 +508,7 @@ getLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetLogicalFunction,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmapmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetmapmode">external documentation</a>.
 -spec getMapMode(This) -> integer() when
 	This::wxDC().
 getMapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -516,7 +516,7 @@ getMapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetMapMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>.
 -spec getMultiLineTextExtent(This, String) -> {W::integer(), H::integer()} when
 	This::wxDC(), String::unicode:chardata().
 getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
@@ -526,7 +526,7 @@ getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
   wxe_util:call(?wxDC_GetMultiLineTextExtent_1,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetmultilinetextextent">external documentation</a>.
 -spec getMultiLineTextExtent(This, String, [Option]) -> {Width::integer(), Height::integer(), HeightLine::integer()} when
 	This::wxDC(), String::unicode:chardata(),
 	Option :: {font, wxFont:wxFont()}.
@@ -540,7 +540,7 @@ getMultiLineTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
   wxe_util:call(?wxDC_GetMultiLineTextExtent_4,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpartialtextextents">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetpartialtextextents">external documentation</a>.
 -spec getPartialTextExtents(This, Text) -> Result when
 	Result ::{Res ::boolean(), Widths::[integer()]},
 	This::wxDC(), Text::unicode:chardata().
@@ -551,7 +551,7 @@ getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxDC_GetPartialTextExtents,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetpen">external documentation</a>.
 -spec getPen(This) -> wxPen:wxPen() when
 	This::wxDC().
 getPen(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -559,7 +559,7 @@ getPen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetPen,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetpixel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetpixel">external documentation</a>.
 -spec getPixel(This, Pt) -> Result when
 	Result ::{Res ::boolean(), Col::wx:wx_colour4()},
 	This::wxDC(), Pt::{X::integer(), Y::integer()}.
@@ -569,7 +569,7 @@ getPixel(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxDC_GetPixel,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetppi">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetppi">external documentation</a>.
 -spec getPPI(This) -> {W::integer(), H::integer()} when
 	This::wxDC().
 getPPI(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -577,7 +577,7 @@ getPPI(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetPPI,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetsize">external documentation</a>.
 -spec getSize(This) -> {W::integer(), H::integer()} when
 	This::wxDC().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -585,7 +585,7 @@ getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetsizemm">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetsizemm">external documentation</a>.
 -spec getSizeMM(This) -> {W::integer(), H::integer()} when
 	This::wxDC().
 getSizeMM(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -593,7 +593,7 @@ getSizeMM(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetSizeMM,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgettextbackground">external documentation</a>.
 -spec getTextBackground(This) -> wx:wx_colour4() when
 	This::wxDC().
 getTextBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -601,7 +601,7 @@ getTextBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetTextBackground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextextent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgettextextent">external documentation</a>.
 -spec getTextExtent(This, String) -> {W::integer(), H::integer()} when
 	This::wxDC(), String::unicode:chardata().
 getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
@@ -611,7 +611,7 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String)
   wxe_util:call(?wxDC_GetTextExtent_1,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextextent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgettextextent">external documentation</a>.
 -spec getTextExtent(This, String, [Option]) -> Result when
 	Result :: {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()},
 	This::wxDC(), String::unicode:chardata(),
@@ -626,7 +626,7 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
   wxe_util:call(?wxDC_GetTextExtent_4,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgettextforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgettextforeground">external documentation</a>.
 -spec getTextForeground(This) -> wx:wx_colour4() when
 	This::wxDC().
 getTextForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -634,7 +634,7 @@ getTextForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetTextForeground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgetuserscale">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgetuserscale">external documentation</a>.
 -spec getUserScale(This) -> {X::number(), Y::number()} when
 	This::wxDC().
 getUserScale(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -642,7 +642,7 @@ getUserScale(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_GetUserScale,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgradientfillconcentric">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgradientfillconcentric">external documentation</a>.
 -spec gradientFillConcentric(This, Rect, InitialColour, DestColour) -> ok when
 	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:wx_colour(), DestColour::wx:wx_colour().
 gradientFillConcentric(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},InitialColour,DestColour)
@@ -651,7 +651,7 @@ gradientFillConcentric(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH}
   wxe_util:cast(?wxDC_GradientFillConcentric_3,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,(wxe_util:colour_bin(InitialColour)):16/binary,(wxe_util:colour_bin(DestColour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgradientfillconcentric">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgradientfillconcentric">external documentation</a>.
 -spec gradientFillConcentric(This, Rect, InitialColour, DestColour, CircleCenter) -> ok when
 	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:wx_colour(), DestColour::wx:wx_colour(), CircleCenter::{X::integer(), Y::integer()}.
 gradientFillConcentric(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},InitialColour,DestColour,{CircleCenterX,CircleCenterY})
@@ -668,7 +668,7 @@ gradientFillLinear(This,Rect={RectX,RectY,RectW,RectH},InitialColour,DestColour)
  when is_record(This, wx_ref),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH),tuple_size(InitialColour) =:= 3; tuple_size(InitialColour) =:= 4,tuple_size(DestColour) =:= 3; tuple_size(DestColour) =:= 4 ->
   gradientFillLinear(This,Rect,InitialColour,DestColour, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcgradientfilllinear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcgradientfilllinear">external documentation</a>.
 %%<br /> NDirection = ?wxLEFT | ?wxRIGHT | ?wxUP | ?wxDOWN | ?wxTOP | ?wxBOTTOM | ?wxNORTH | ?wxSOUTH | ?wxWEST | ?wxEAST | ?wxALL
 -spec gradientFillLinear(This, Rect, InitialColour, DestColour, [Option]) -> ok when
 	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, InitialColour::wx:wx_colour(), DestColour::wx:wx_colour(),
@@ -682,7 +682,7 @@ gradientFillLinear(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},Ini
   wxe_util:cast(?wxDC_GradientFillLinear,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,(wxe_util:colour_bin(InitialColour)):16/binary,(wxe_util:colour_bin(DestColour)):16/binary, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodevicex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdclogicaltodevicex">external documentation</a>.
 -spec logicalToDeviceX(This, X) -> integer() when
 	This::wxDC(), X::integer().
 logicalToDeviceX(#wx_ref{type=ThisT,ref=ThisRef},X)
@@ -691,7 +691,7 @@ logicalToDeviceX(#wx_ref{type=ThisT,ref=ThisRef},X)
   wxe_util:call(?wxDC_LogicalToDeviceX,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodevicexrel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdclogicaltodevicexrel">external documentation</a>.
 -spec logicalToDeviceXRel(This, X) -> integer() when
 	This::wxDC(), X::integer().
 logicalToDeviceXRel(#wx_ref{type=ThisT,ref=ThisRef},X)
@@ -700,7 +700,7 @@ logicalToDeviceXRel(#wx_ref{type=ThisT,ref=ThisRef},X)
   wxe_util:call(?wxDC_LogicalToDeviceXRel,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodevicey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdclogicaltodevicey">external documentation</a>.
 -spec logicalToDeviceY(This, Y) -> integer() when
 	This::wxDC(), Y::integer().
 logicalToDeviceY(#wx_ref{type=ThisT,ref=ThisRef},Y)
@@ -709,7 +709,7 @@ logicalToDeviceY(#wx_ref{type=ThisT,ref=ThisRef},Y)
   wxe_util:call(?wxDC_LogicalToDeviceY,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdclogicaltodeviceyrel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdclogicaltodeviceyrel">external documentation</a>.
 -spec logicalToDeviceYRel(This, Y) -> integer() when
 	This::wxDC(), Y::integer().
 logicalToDeviceYRel(#wx_ref{type=ThisT,ref=ThisRef},Y)
@@ -718,7 +718,7 @@ logicalToDeviceYRel(#wx_ref{type=ThisT,ref=ThisRef},Y)
   wxe_util:call(?wxDC_LogicalToDeviceYRel,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcmaxx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcmaxx">external documentation</a>.
 -spec maxX(This) -> integer() when
 	This::wxDC().
 maxX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -726,7 +726,7 @@ maxX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_MaxX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcmaxy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcmaxy">external documentation</a>.
 -spec maxY(This) -> integer() when
 	This::wxDC().
 maxY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -734,7 +734,7 @@ maxY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_MaxY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcminx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcminx">external documentation</a>.
 -spec minX(This) -> integer() when
 	This::wxDC().
 minX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -742,7 +742,7 @@ minX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_MinX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcminy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcminy">external documentation</a>.
 -spec minY(This) -> integer() when
 	This::wxDC().
 minY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -750,7 +750,7 @@ minY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_MinY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxDC().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -758,7 +758,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDC_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcresetboundingbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcresetboundingbox">external documentation</a>.
 -spec resetBoundingBox(This) -> ok when
 	This::wxDC().
 resetBoundingBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -766,7 +766,7 @@ resetBoundingBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxDC_ResetBoundingBox,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetaxisorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetaxisorientation">external documentation</a>.
 -spec setAxisOrientation(This, XLeftRight, YBottomUp) -> ok when
 	This::wxDC(), XLeftRight::boolean(), YBottomUp::boolean().
 setAxisOrientation(#wx_ref{type=ThisT,ref=ThisRef},XLeftRight,YBottomUp)
@@ -775,7 +775,7 @@ setAxisOrientation(#wx_ref{type=ThisT,ref=ThisRef},XLeftRight,YBottomUp)
   wxe_util:cast(?wxDC_SetAxisOrientation,
   <<ThisRef:32/?UI,(wxe_util:from_bool(XLeftRight)):32/?UI,(wxe_util:from_bool(YBottomUp)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetbackground">external documentation</a>.
 -spec setBackground(This, Brush) -> ok when
 	This::wxDC(), Brush::wxBrush:wxBrush().
 setBackground(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
@@ -784,7 +784,7 @@ setBackground(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef})
   wxe_util:cast(?wxDC_SetBackground,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetbackgroundmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetbackgroundmode">external documentation</a>.
 -spec setBackgroundMode(This, Mode) -> ok when
 	This::wxDC(), Mode::integer().
 setBackgroundMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
@@ -793,7 +793,7 @@ setBackgroundMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
   wxe_util:cast(?wxDC_SetBackgroundMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetbrush">external documentation</a>.
 -spec setBrush(This, Brush) -> ok when
 	This::wxDC(), Brush::wxBrush:wxBrush().
 setBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
@@ -802,7 +802,7 @@ setBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   wxe_util:cast(?wxDC_SetBrush,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetclippingregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetclippingregion">external documentation</a>.
 %% <br /> Also:<br />
 %% setClippingRegion(This, Rect) -> ok when<br />
 %% 	This::wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -822,7 +822,7 @@ setClippingRegion(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxDC_SetClippingRegion_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetclippingregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetclippingregion">external documentation</a>.
 -spec setClippingRegion(This, Pt, Sz) -> ok when
 	This::wxDC(), Pt::{X::integer(), Y::integer()}, Sz::{W::integer(), H::integer()}.
 setClippingRegion(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
@@ -831,7 +831,7 @@ setClippingRegion(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY},{SzW,SzH})
   wxe_util:cast(?wxDC_SetClippingRegion_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetdeviceorigin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetdeviceorigin">external documentation</a>.
 -spec setDeviceOrigin(This, X, Y) -> ok when
 	This::wxDC(), X::integer(), Y::integer().
 setDeviceOrigin(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -840,7 +840,7 @@ setDeviceOrigin(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxDC_SetDeviceOrigin,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetfont">external documentation</a>.
 -spec setFont(This, Font) -> ok when
 	This::wxDC(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -849,7 +849,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:cast(?wxDC_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetlayoutdirection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetlayoutdirection">external documentation</a>.
 %%<br /> Dir = ?wxLayout_Default | ?wxLayout_LeftToRight | ?wxLayout_RightToLeft
 -spec setLayoutDirection(This, Dir) -> ok when
 	This::wxDC(), Dir::wx:wx_enum().
@@ -859,7 +859,7 @@ setLayoutDirection(#wx_ref{type=ThisT,ref=ThisRef},Dir)
   wxe_util:cast(?wxDC_SetLayoutDirection,
   <<ThisRef:32/?UI,Dir:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetlogicalfunction">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetlogicalfunction">external documentation</a>.
 %%<br /> Function = integer
 -spec setLogicalFunction(This, Function) -> ok when
 	This::wxDC(), Function::wx:wx_enum().
@@ -869,7 +869,7 @@ setLogicalFunction(#wx_ref{type=ThisT,ref=ThisRef},Function)
   wxe_util:cast(?wxDC_SetLogicalFunction,
   <<ThisRef:32/?UI,Function:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetmapmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetmapmode">external documentation</a>.
 %%<br /> Mode = integer
 -spec setMapMode(This, Mode) -> ok when
 	This::wxDC(), Mode::wx:wx_enum().
@@ -879,7 +879,7 @@ setMapMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
   wxe_util:cast(?wxDC_SetMapMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetpalette">external documentation</a>.
 -spec setPalette(This, Palette) -> ok when
 	This::wxDC(), Palette::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}) ->
@@ -888,7 +888,7 @@ setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}
   wxe_util:cast(?wxDC_SetPalette,
   <<ThisRef:32/?UI,PaletteRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetpen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetpen">external documentation</a>.
 -spec setPen(This, Pen) -> ok when
 	This::wxDC(), Pen::wxPen:wxPen().
 setPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
@@ -897,7 +897,7 @@ setPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   wxe_util:cast(?wxDC_SetPen,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsettextbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsettextbackground">external documentation</a>.
 -spec setTextBackground(This, Colour) -> ok when
 	This::wxDC(), Colour::wx:wx_colour().
 setTextBackground(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -906,7 +906,7 @@ setTextBackground(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxDC_SetTextBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsettextforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsettextforeground">external documentation</a>.
 -spec setTextForeground(This, Colour) -> ok when
 	This::wxDC(), Colour::wx:wx_colour().
 setTextForeground(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -915,7 +915,7 @@ setTextForeground(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxDC_SetTextForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcsetuserscale">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcsetuserscale">external documentation</a>.
 -spec setUserScale(This, X, Y) -> ok when
 	This::wxDC(), X::number(), Y::number().
 setUserScale(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -924,7 +924,7 @@ setUserScale(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxDC_SetUserScale,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcstartdoc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcstartdoc">external documentation</a>.
 -spec startDoc(This, Message) -> boolean() when
 	This::wxDC(), Message::unicode:chardata().
 startDoc(#wx_ref{type=ThisT,ref=ThisRef},Message)
@@ -934,7 +934,7 @@ startDoc(#wx_ref{type=ThisT,ref=ThisRef},Message)
   wxe_util:call(?wxDC_StartDoc,
   <<ThisRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdc.html#wxdcstartpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdc.html#wxdcstartpage">external documentation</a>.
 -spec startPage(This) -> ok when
 	This::wxDC().
 startPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxDataObject.erl b/lib/wx/src/gen/wxDataObject.erl
index 65b388aa48..6bb1d1b831 100644
--- a/lib/wx/src/gen/wxDataObject.erl
+++ b/lib/wx/src/gen/wxDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdataobject.html">wxDataObject</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdataobject.html">wxDataObject</a>.
 %% @type wxDataObject().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
diff --git a/lib/wx/src/gen/wxDateEvent.erl b/lib/wx/src/gen/wxDateEvent.erl
index 417322097f..3456b6e307 100644
--- a/lib/wx/src/gen/wxDateEvent.erl
+++ b/lib/wx/src/gen/wxDateEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdateevent.html">wxDateEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdateevent.html">wxDateEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>date_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxDate(). #wxDate{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxDateEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdateevent.html#wxdateeventgetdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdateevent.html#wxdateeventgetdate">external documentation</a>.
 -spec getDate(This) -> wx:wx_datetime() when
 	This::wxDateEvent().
 getDate(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxDatePickerCtrl.erl b/lib/wx/src/gen/wxDatePickerCtrl.erl
index 6ffc2ca3f5..57d9a59d22 100644
--- a/lib/wx/src/gen/wxDatePickerCtrl.erl
+++ b/lib/wx/src/gen/wxDatePickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html">wxDatePickerCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdatepickerctrl.html">wxDatePickerCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxPickerBase}
 %% <br />{@link wxControl}
@@ -83,7 +83,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxDatePickerCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlwxdatepickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdatepickerctrl.html#wxdatepickerctrlwxdatepickerctrl">external documentation</a>.
 -spec new() -> wxDatePickerCtrl().
 new() ->
   wxe_util:construct(?wxDatePickerCtrl_new_0,
@@ -97,7 +97,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlwxdatepickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdatepickerctrl.html#wxdatepickerctrlwxdatepickerctrl">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxDatePickerCtrl() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {date, wx:wx_datetime()}
@@ -118,7 +118,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxDatePickerCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlgetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdatepickerctrl.html#wxdatepickerctrlgetrange">external documentation</a>.
 -spec getRange(This, Dt1, Dt2) -> boolean() when
 	This::wxDatePickerCtrl(), Dt1::wx:wx_datetime(), Dt2::wx:wx_datetime().
 getRange(#wx_ref{type=ThisT,ref=ThisRef},Dt1,Dt2)
@@ -127,7 +127,7 @@ getRange(#wx_ref{type=ThisT,ref=ThisRef},Dt1,Dt2)
   wxe_util:call(?wxDatePickerCtrl_GetRange,
   <<ThisRef:32/?UI,(wxe_util:datetime_bin(Dt1)):24/binary,(wxe_util:datetime_bin(Dt2)):24/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlgetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdatepickerctrl.html#wxdatepickerctrlgetvalue">external documentation</a>.
 -spec getValue(This) -> wx:wx_datetime() when
 	This::wxDatePickerCtrl().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -135,7 +135,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDatePickerCtrl_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlsetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdatepickerctrl.html#wxdatepickerctrlsetrange">external documentation</a>.
 -spec setRange(This, Dt1, Dt2) -> ok when
 	This::wxDatePickerCtrl(), Dt1::wx:wx_datetime(), Dt2::wx:wx_datetime().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},Dt1,Dt2)
@@ -144,7 +144,7 @@ setRange(#wx_ref{type=ThisT,ref=ThisRef},Dt1,Dt2)
   wxe_util:cast(?wxDatePickerCtrl_SetRange,
   <<ThisRef:32/?UI,(wxe_util:datetime_bin(Dt1)):24/binary,(wxe_util:datetime_bin(Dt2)):24/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdatepickerctrl.html#wxdatepickerctrlsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdatepickerctrl.html#wxdatepickerctrlsetvalue">external documentation</a>.
 -spec setValue(This, Date) -> ok when
 	This::wxDatePickerCtrl(), Date::wx:wx_datetime().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Date)
diff --git a/lib/wx/src/gen/wxDialog.erl b/lib/wx/src/gen/wxDialog.erl
index 55861b75d1..c8d52736f9 100644
--- a/lib/wx/src/gen/wxDialog.erl
+++ b/lib/wx/src/gen/wxDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html">wxDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html">wxDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxTopLevelWindow}
 %% <br />{@link wxWindow}
@@ -84,7 +84,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxDialog() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogwxdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogwxdialog">external documentation</a>.
 -spec new() -> wxDialog().
 new() ->
   wxe_util:construct(?wxDialog_new_0,
@@ -98,7 +98,7 @@ new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogwxdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogwxdialog">external documentation</a>.
 -spec new(Parent, Id, Title, [Option]) -> wxDialog() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -124,7 +124,7 @@ create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogcreate">external documentation</a>.
 -spec create(This, Parent, Id, Title, [Option]) -> boolean() when
 	This::wxDialog(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -143,7 +143,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogcreatebuttonsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogcreatebuttonsizer">external documentation</a>.
 -spec createButtonSizer(This, Flags) -> wxSizer:wxSizer() when
 	This::wxDialog(), Flags::integer().
 createButtonSizer(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -152,7 +152,7 @@ createButtonSizer(#wx_ref{type=ThisT,ref=ThisRef},Flags)
   wxe_util:call(?wxDialog_CreateButtonSizer,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogcreatestddialogbuttonsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogcreatestddialogbuttonsizer">external documentation</a>.
 -spec createStdDialogButtonSizer(This, Flags) -> wxStdDialogButtonSizer:wxStdDialogButtonSizer() when
 	This::wxDialog(), Flags::integer().
 createStdDialogButtonSizer(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -161,7 +161,7 @@ createStdDialogButtonSizer(#wx_ref{type=ThisT,ref=ThisRef},Flags)
   wxe_util:call(?wxDialog_CreateStdDialogButtonSizer,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogendmodal">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogendmodal">external documentation</a>.
 -spec endModal(This, RetCode) -> ok when
 	This::wxDialog(), RetCode::integer().
 endModal(#wx_ref{type=ThisT,ref=ThisRef},RetCode)
@@ -170,7 +170,7 @@ endModal(#wx_ref{type=ThisT,ref=ThisRef},RetCode)
   wxe_util:cast(?wxDialog_EndModal,
   <<ThisRef:32/?UI,RetCode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialoggetaffirmativeid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialoggetaffirmativeid">external documentation</a>.
 -spec getAffirmativeId(This) -> integer() when
 	This::wxDialog().
 getAffirmativeId(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -178,7 +178,7 @@ getAffirmativeId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDialog_GetAffirmativeId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialoggetreturncode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialoggetreturncode">external documentation</a>.
 -spec getReturnCode(This) -> integer() when
 	This::wxDialog().
 getReturnCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -186,7 +186,7 @@ getReturnCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDialog_GetReturnCode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogismodal">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogismodal">external documentation</a>.
 -spec isModal(This) -> boolean() when
 	This::wxDialog().
 isModal(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -194,7 +194,7 @@ isModal(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDialog_IsModal,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogsetaffirmativeid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogsetaffirmativeid">external documentation</a>.
 -spec setAffirmativeId(This, AffirmativeId) -> ok when
 	This::wxDialog(), AffirmativeId::integer().
 setAffirmativeId(#wx_ref{type=ThisT,ref=ThisRef},AffirmativeId)
@@ -203,7 +203,7 @@ setAffirmativeId(#wx_ref{type=ThisT,ref=ThisRef},AffirmativeId)
   wxe_util:cast(?wxDialog_SetAffirmativeId,
   <<ThisRef:32/?UI,AffirmativeId:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogsetreturncode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogsetreturncode">external documentation</a>.
 -spec setReturnCode(This, ReturnCode) -> ok when
 	This::wxDialog(), ReturnCode::integer().
 setReturnCode(#wx_ref{type=ThisT,ref=ThisRef},ReturnCode)
@@ -220,7 +220,7 @@ show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogshow">external documentation</a>.
 -spec show(This, [Option]) -> boolean() when
 	This::wxDialog(),
 	Option :: {show, boolean()}.
@@ -233,7 +233,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxDialog_Show,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdialog.html#wxdialogshowmodal">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdialog.html#wxdialogshowmodal">external documentation</a>.
 -spec showModal(This) -> integer() when
 	This::wxDialog().
 showModal(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxDirDialog.erl b/lib/wx/src/gen/wxDirDialog.erl
index d7dc735937..4611b86fcf 100644
--- a/lib/wx/src/gen/wxDirDialog.erl
+++ b/lib/wx/src/gen/wxDirDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html">wxDirDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html">wxDirDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -94,7 +94,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogwxdirdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialogwxdirdialog">external documentation</a>.
 -spec new(Parent, [Option]) -> wxDirDialog() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {title, unicode:chardata()}
@@ -115,7 +115,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxDirDialog_new,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialoggetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialoggetpath">external documentation</a>.
 -spec getPath(This) -> unicode:charlist() when
 	This::wxDirDialog().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -123,7 +123,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDirDialog_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialoggetmessage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialoggetmessage">external documentation</a>.
 -spec getMessage(This) -> unicode:charlist() when
 	This::wxDirDialog().
 getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -131,7 +131,7 @@ getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDirDialog_GetMessage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogsetmessage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialogsetmessage">external documentation</a>.
 -spec setMessage(This, Message) -> ok when
 	This::wxDirDialog(), Message::unicode:chardata().
 setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
@@ -141,7 +141,7 @@ setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
   wxe_util:cast(?wxDirDialog_SetMessage,
   <<ThisRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirdialog.html#wxdirdialogsetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirdialog.html#wxdirdialogsetpath">external documentation</a>.
 -spec setPath(This, Path) -> ok when
 	This::wxDirDialog(), Path::unicode:chardata().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
diff --git a/lib/wx/src/gen/wxDirPickerCtrl.erl b/lib/wx/src/gen/wxDirPickerCtrl.erl
index bbc169ae03..14581822c8 100644
--- a/lib/wx/src/gen/wxDirPickerCtrl.erl
+++ b/lib/wx/src/gen/wxDirPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html">wxDirPickerCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirpickerctrl.html">wxDirPickerCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxPickerBase}
 %% <br />{@link wxControl}
@@ -83,7 +83,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxDirPickerCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlwxdirpickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirpickerctrl.html#wxdirpickerctrlwxdirpickerctrl">external documentation</a>.
 -spec new() -> wxDirPickerCtrl().
 new() ->
   wxe_util:construct(?wxDirPickerCtrl_new_0,
@@ -97,7 +97,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlwxdirpickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirpickerctrl.html#wxdirpickerctrlwxdirpickerctrl">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxDirPickerCtrl() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {path, unicode:chardata()}
@@ -128,7 +128,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirpickerctrl.html#wxdirpickerctrlcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxDirPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {path, unicode:chardata()}
@@ -152,7 +152,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxDirPickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlgetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirpickerctrl.html#wxdirpickerctrlgetpath">external documentation</a>.
 -spec getPath(This) -> unicode:charlist() when
 	This::wxDirPickerCtrl().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -160,7 +160,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxDirPickerCtrl_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdirpickerctrl.html#wxdirpickerctrlsetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdirpickerctrl.html#wxdirpickerctrlsetpath">external documentation</a>.
 -spec setPath(This, Str) -> ok when
 	This::wxDirPickerCtrl(), Str::unicode:chardata().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Str)
diff --git a/lib/wx/src/gen/wxDisplayChangedEvent.erl b/lib/wx/src/gen/wxDisplayChangedEvent.erl
index 0c0612564b..6872a662b6 100644
--- a/lib/wx/src/gen/wxDisplayChangedEvent.erl
+++ b/lib/wx/src/gen/wxDisplayChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxdisplaychangedevent.html">wxDisplayChangedEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxdisplaychangedevent.html">wxDisplayChangedEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>display_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxDisplayChanged(). #wxDisplayChanged{}} event record type.
diff --git a/lib/wx/src/gen/wxEraseEvent.erl b/lib/wx/src/gen/wxEraseEvent.erl
index 03ce8862dc..62cf8e3f07 100644
--- a/lib/wx/src/gen/wxEraseEvent.erl
+++ b/lib/wx/src/gen/wxEraseEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxeraseevent.html">wxEraseEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxeraseevent.html">wxEraseEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>erase_background</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxErase(). #wxErase{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxEraseEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxeraseevent.html#wxeraseeventgetdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxeraseevent.html#wxeraseeventgetdc">external documentation</a>.
 -spec getDC(This) -> wxDC:wxDC() when
 	This::wxEraseEvent().
 getDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxEvent.erl b/lib/wx/src/gen/wxEvent.erl
index 1b2147a326..595dba3246 100644
--- a/lib/wx/src/gen/wxEvent.erl
+++ b/lib/wx/src/gen/wxEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html">wxEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html">wxEvent</a>.
 %% @type wxEvent().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -35,7 +35,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventgetid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventgetid">external documentation</a>.
 -spec getId(This) -> integer() when
 	This::wxEvent().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -43,7 +43,7 @@ getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxEvent_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventgetskipped">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventgetskipped">external documentation</a>.
 -spec getSkipped(This) -> boolean() when
 	This::wxEvent().
 getSkipped(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -51,7 +51,7 @@ getSkipped(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxEvent_GetSkipped,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventgettimestamp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventgettimestamp">external documentation</a>.
 -spec getTimestamp(This) -> integer() when
 	This::wxEvent().
 getTimestamp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ getTimestamp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxEvent_GetTimestamp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventiscommandevent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventiscommandevent">external documentation</a>.
 -spec isCommandEvent(This) -> boolean() when
 	This::wxEvent().
 isCommandEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -67,7 +67,7 @@ isCommandEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxEvent_IsCommandEvent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventresumepropagation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventresumepropagation">external documentation</a>.
 -spec resumePropagation(This, PropagationLevel) -> ok when
 	This::wxEvent(), PropagationLevel::integer().
 resumePropagation(#wx_ref{type=ThisT,ref=ThisRef},PropagationLevel)
@@ -76,7 +76,7 @@ resumePropagation(#wx_ref{type=ThisT,ref=ThisRef},PropagationLevel)
   wxe_util:cast(?wxEvent_ResumePropagation,
   <<ThisRef:32/?UI,PropagationLevel:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventshouldpropagate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventshouldpropagate">external documentation</a>.
 -spec shouldPropagate(This) -> boolean() when
 	This::wxEvent().
 shouldPropagate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -92,7 +92,7 @@ skip(This)
  when is_record(This, wx_ref) ->
   skip(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventskip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventskip">external documentation</a>.
 -spec skip(This, [Option]) -> ok when
 	This::wxEvent(),
 	Option :: {skip, boolean()}.
@@ -105,7 +105,7 @@ skip(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxEvent_Skip,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxevent.html#wxeventstoppropagation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxevent.html#wxeventstoppropagation">external documentation</a>.
 -spec stopPropagation(This) -> integer() when
 	This::wxEvent().
 stopPropagation(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxEvtHandler.erl b/lib/wx/src/gen/wxEvtHandler.erl
index 22c203392c..44b7254cfb 100644
--- a/lib/wx/src/gen/wxEvtHandler.erl
+++ b/lib/wx/src/gen/wxEvtHandler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,15 +46,11 @@
 -export([connect/2, connect/3, disconnect/1, disconnect/2, disconnect/3]).
 
 %% internal exports
--export([connect_impl/3, disconnect_impl/2, disconnect_impl/3, 
-	 new_evt_listener/0, destroy_evt_listener/1, 
-	 get_callback/1, replace_fun_with_id/2]).
+-export([connect_impl/2, disconnect_impl/2]).
 
 -export_type([wxEvtHandler/0, wx/0, event/0]).
 -type wxEvtHandler() :: wx:wx_object().
 
--record(evh, {et=null,id=?wxID_ANY,lastId=?wxID_ANY,skip=undefined,userdata=[],cb=0}).
-
 %% @doc Equivalent to {@link connect/3. connect(This, EventType, [])}
 -spec connect(This::wxEvtHandler(), EventType::wxEventType()) -> ok.
 connect(This, EventType) ->
@@ -149,55 +145,35 @@ disconnect(This=#wx_ref{type=ThisT,ref=_ThisRef}, EventType, Opts) ->
 
 
 %% @hidden
-connect_impl(#wx_ref{type=wxeEvtListener,ref=EvtList}, 
-	     #wx_ref{type=ThisT,ref=ThisRef}, 
-	     #evh{id=Winid, lastId=LastId, et=EventType, 
-		  skip=Skip, userdata=Userdata, cb=FunID}) 
+connect_impl(#wx_ref{type=ThisT,ref=ThisRef},
+	     #evh{id=Winid, lastId=LastId, et=EventType,
+		  skip=Skip, userdata=Userdata, cb=FunID})
   when is_integer(FunID)->
     EventTypeBin = list_to_binary([atom_to_list(EventType)|[0]]),
     ThisTypeBin = list_to_binary([atom_to_list(ThisT)|[0]]),
     UD = if Userdata =:= [] -> 0;
-	    true -> 
+	    true ->
 		 wxe_util:send_bin(term_to_binary(Userdata)),
 		 1
 	 end,
-    wxe_util:call(100, <<EvtList:32/?UI,ThisRef:32/?UI,
+    wxe_util:call(100, <<ThisRef:32/?UI,
 			Winid:32/?UI,LastId:32/?UI,
 			(wxe_util:from_bool(Skip)):32/?UI,
 			UD:32/?UI,
 			FunID:32/?UI,
 			(size(EventTypeBin)):32/?UI,
-			(size(ThisTypeBin)):32/?UI, 
+			(size(ThisTypeBin)):32/?UI,
 			%% Note no alignment
 			EventTypeBin/binary,ThisTypeBin/binary>>).
 
 %% @hidden
-disconnect_impl(Listener, Object) ->
-    disconnect_impl(Listener, Object, #evh{}).
-%% @hidden
-disconnect_impl(#wx_ref{type=wxeEvtListener,ref=EvtList}, 
-		#wx_ref{type=_ThisT,ref=ThisRef}, 
-		#evh{id=Winid, lastId=LastId, et=EventType}) ->
+disconnect_impl(#wx_ref{type=_ThisT,ref=ThisRef},
+		#evh{id=Winid, lastId=LastId, et=EventType,
+		     handler=#wx_ref{type=wxeEvtListener,ref=EvtList}}) ->
     EventTypeBin = list_to_binary([atom_to_list(EventType)|[0]]),
-    wxe_util:call(101, <<EvtList:32/?UI, 
+    wxe_util:call(101, <<EvtList:32/?UI,
 			ThisRef:32/?UI,Winid:32/?UI,LastId:32/?UI,
 			(size(EventTypeBin)):32/?UI,
 			%% Note no alignment
 			EventTypeBin/binary>>).
 
-%% @hidden
-new_evt_listener() ->
-    wxe_util:call(98, <<>>).
-
-%% @hidden
-destroy_evt_listener(#wx_ref{type=wxeEvtListener,ref=EvtList}) ->
-    wxe_util:call(99, <<EvtList:32/?UI>>).
-
-%% @hidden
-get_callback(#evh{cb=Callback}) ->
-    Callback.
-
-%% @hidden
-replace_fun_with_id(Evh, Id) ->
-    Evh#evh{cb=Id}.
-
diff --git a/lib/wx/src/gen/wxFileDataObject.erl b/lib/wx/src/gen/wxFileDataObject.erl
index 435c795cdc..02564d45ec 100644
--- a/lib/wx/src/gen/wxFileDataObject.erl
+++ b/lib/wx/src/gen/wxFileDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html">wxFileDataObject</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledataobject.html">wxFileDataObject</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDataObject}
 %% </p>
@@ -38,13 +38,13 @@ parent_class(wxDataObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFileDataObject() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectwxfiledataobject">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledataobject.html#wxfiledataobjectwxfiledataobject">external documentation</a>.
 -spec new() -> wxFileDataObject().
 new() ->
   wxe_util:construct(?wxFileDataObject_new,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectaddfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledataobject.html#wxfiledataobjectaddfile">external documentation</a>.
 -spec addFile(This, Filename) -> ok when
 	This::wxFileDataObject(), Filename::unicode:chardata().
 addFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
@@ -54,7 +54,7 @@ addFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:cast(?wxFileDataObject_AddFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledataobject.html#wxfiledataobjectgetfilenames">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledataobject.html#wxfiledataobjectgetfilenames">external documentation</a>.
 -spec getFilenames(This) -> [unicode:charlist()] when
 	This::wxFileDataObject().
 getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxFileDialog.erl b/lib/wx/src/gen/wxFileDialog.erl
index a257905795..0867e5d8b7 100644
--- a/lib/wx/src/gen/wxFileDialog.erl
+++ b/lib/wx/src/gen/wxFileDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html">wxFileDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html">wxFileDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -96,7 +96,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogwxfiledialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialogwxfiledialog">external documentation</a>.
 -spec new(Parent, [Option]) -> wxFileDialog() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {message, unicode:chardata()}
@@ -121,7 +121,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxFileDialog_new,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetdirectory">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetdirectory">external documentation</a>.
 -spec getDirectory(This) -> unicode:charlist() when
 	This::wxFileDialog().
 getDirectory(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -129,7 +129,7 @@ getDirectory(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetDirectory,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilename">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetfilename">external documentation</a>.
 -spec getFilename(This) -> unicode:charlist() when
 	This::wxFileDialog().
 getFilename(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -137,7 +137,7 @@ getFilename(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetFilename,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilenames">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetfilenames">external documentation</a>.
 -spec getFilenames(This) -> [unicode:charlist()] when
 	This::wxFileDialog().
 getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -145,7 +145,7 @@ getFilenames(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetFilenames,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetfilterindex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetfilterindex">external documentation</a>.
 -spec getFilterIndex(This) -> integer() when
 	This::wxFileDialog().
 getFilterIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -153,7 +153,7 @@ getFilterIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetFilterIndex,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetmessage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetmessage">external documentation</a>.
 -spec getMessage(This) -> unicode:charlist() when
 	This::wxFileDialog().
 getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -161,7 +161,7 @@ getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetMessage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetpath">external documentation</a>.
 -spec getPath(This) -> unicode:charlist() when
 	This::wxFileDialog().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetpaths">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetpaths">external documentation</a>.
 -spec getPaths(This) -> [unicode:charlist()] when
 	This::wxFileDialog().
 getPaths(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -177,7 +177,7 @@ getPaths(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetPaths,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialoggetwildcard">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialoggetwildcard">external documentation</a>.
 -spec getWildcard(This) -> unicode:charlist() when
 	This::wxFileDialog().
 getWildcard(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -185,7 +185,7 @@ getWildcard(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFileDialog_GetWildcard,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetdirectory">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialogsetdirectory">external documentation</a>.
 -spec setDirectory(This, Dir) -> ok when
 	This::wxFileDialog(), Dir::unicode:chardata().
 setDirectory(#wx_ref{type=ThisT,ref=ThisRef},Dir)
@@ -195,7 +195,7 @@ setDirectory(#wx_ref{type=ThisT,ref=ThisRef},Dir)
   wxe_util:cast(?wxFileDialog_SetDirectory,
   <<ThisRef:32/?UI,(byte_size(Dir_UC)):32/?UI,(Dir_UC)/binary, 0:(((8- ((0+byte_size(Dir_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetfilename">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialogsetfilename">external documentation</a>.
 -spec setFilename(This, Name) -> ok when
 	This::wxFileDialog(), Name::unicode:chardata().
 setFilename(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -205,7 +205,7 @@ setFilename(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:cast(?wxFileDialog_SetFilename,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetfilterindex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialogsetfilterindex">external documentation</a>.
 -spec setFilterIndex(This, FilterIndex) -> ok when
 	This::wxFileDialog(), FilterIndex::integer().
 setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},FilterIndex)
@@ -214,7 +214,7 @@ setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},FilterIndex)
   wxe_util:cast(?wxFileDialog_SetFilterIndex,
   <<ThisRef:32/?UI,FilterIndex:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetmessage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialogsetmessage">external documentation</a>.
 -spec setMessage(This, Message) -> ok when
 	This::wxFileDialog(), Message::unicode:chardata().
 setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
@@ -224,7 +224,7 @@ setMessage(#wx_ref{type=ThisT,ref=ThisRef},Message)
   wxe_util:cast(?wxFileDialog_SetMessage,
   <<ThisRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialogsetpath">external documentation</a>.
 -spec setPath(This, Path) -> ok when
 	This::wxFileDialog(), Path::unicode:chardata().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
@@ -234,7 +234,7 @@ setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   wxe_util:cast(?wxFileDialog_SetPath,
   <<ThisRef:32/?UI,(byte_size(Path_UC)):32/?UI,(Path_UC)/binary, 0:(((8- ((0+byte_size(Path_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledialog.html#wxfiledialogsetwildcard">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledialog.html#wxfiledialogsetwildcard">external documentation</a>.
 -spec setWildcard(This, WildCard) -> ok when
 	This::wxFileDialog(), WildCard::unicode:chardata().
 setWildcard(#wx_ref{type=ThisT,ref=ThisRef},WildCard)
diff --git a/lib/wx/src/gen/wxFileDirPickerEvent.erl b/lib/wx/src/gen/wxFileDirPickerEvent.erl
index 77b10a91ed..a453196ca4 100644
--- a/lib/wx/src/gen/wxFileDirPickerEvent.erl
+++ b/lib/wx/src/gen/wxFileDirPickerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledirpickerevent.html">wxFileDirPickerEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledirpickerevent.html">wxFileDirPickerEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_filepicker_changed</em>, <em>command_dirpicker_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxFileDirPicker(). #wxFileDirPicker{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFileDirPickerEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfiledirpickerevent.html#wxfiledirpickereventgetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfiledirpickerevent.html#wxfiledirpickereventgetpath">external documentation</a>.
 -spec getPath(This) -> unicode:charlist() when
 	This::wxFileDirPickerEvent().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxFilePickerCtrl.erl b/lib/wx/src/gen/wxFilePickerCtrl.erl
index d19c8c00cb..d41c73368d 100644
--- a/lib/wx/src/gen/wxFilePickerCtrl.erl
+++ b/lib/wx/src/gen/wxFilePickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html">wxFilePickerCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfilepickerctrl.html">wxFilePickerCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxPickerBase}
 %% <br />{@link wxControl}
@@ -83,7 +83,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFilePickerCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlwxfilepickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfilepickerctrl.html#wxfilepickerctrlwxfilepickerctrl">external documentation</a>.
 -spec new() -> wxFilePickerCtrl().
 new() ->
   wxe_util:construct(?wxFilePickerCtrl_new_0,
@@ -97,7 +97,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlwxfilepickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfilepickerctrl.html#wxfilepickerctrlwxfilepickerctrl">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxFilePickerCtrl() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {path, unicode:chardata()}
@@ -130,7 +130,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfilepickerctrl.html#wxfilepickerctrlcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxFilePickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {path, unicode:chardata()}
@@ -156,7 +156,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxFilePickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlgetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfilepickerctrl.html#wxfilepickerctrlgetpath">external documentation</a>.
 -spec getPath(This) -> unicode:charlist() when
 	This::wxFilePickerCtrl().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -164,7 +164,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFilePickerCtrl_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfilepickerctrl.html#wxfilepickerctrlsetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfilepickerctrl.html#wxfilepickerctrlsetpath">external documentation</a>.
 -spec setPath(This, Str) -> ok when
 	This::wxFilePickerCtrl(), Str::unicode:chardata().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Str)
diff --git a/lib/wx/src/gen/wxFindReplaceData.erl b/lib/wx/src/gen/wxFindReplaceData.erl
index 8dc6036da6..8f6f975fa7 100644
--- a/lib/wx/src/gen/wxFindReplaceData.erl
+++ b/lib/wx/src/gen/wxFindReplaceData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html">wxFindReplaceData</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html">wxFindReplaceData</a>.
 %% @type wxFindReplaceData().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -35,13 +35,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFindReplaceData() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatawxfindreplacedata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatawxfindreplacedata">external documentation</a>.
 -spec new() -> wxFindReplaceData().
 new() ->
   wxe_util:construct(?wxFindReplaceData_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatawxfindreplacedata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatawxfindreplacedata">external documentation</a>.
 -spec new(Flags) -> wxFindReplaceData() when
 	Flags::integer().
 new(Flags)
@@ -49,7 +49,7 @@ new(Flags)
   wxe_util:construct(?wxFindReplaceData_new_1,
   <<Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetfindstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatagetfindstring">external documentation</a>.
 -spec getFindString(This) -> unicode:charlist() when
 	This::wxFindReplaceData().
 getFindString(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -57,7 +57,7 @@ getFindString(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFindReplaceData_GetFindString,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetreplacestring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatagetreplacestring">external documentation</a>.
 -spec getReplaceString(This) -> unicode:charlist() when
 	This::wxFindReplaceData().
 getReplaceString(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -65,7 +65,7 @@ getReplaceString(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFindReplaceData_GetReplaceString,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatagetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatagetflags">external documentation</a>.
 -spec getFlags(This) -> integer() when
 	This::wxFindReplaceData().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -73,7 +73,7 @@ getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFindReplaceData_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatasetflags">external documentation</a>.
 -spec setFlags(This, Flags) -> ok when
 	This::wxFindReplaceData(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -82,7 +82,7 @@ setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
   wxe_util:cast(?wxFindReplaceData_SetFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetfindstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatasetfindstring">external documentation</a>.
 -spec setFindString(This, Str) -> ok when
 	This::wxFindReplaceData(), Str::unicode:chardata().
 setFindString(#wx_ref{type=ThisT,ref=ThisRef},Str)
@@ -92,7 +92,7 @@ setFindString(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxFindReplaceData_SetFindString,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedata.html#wxfindreplacedatasetreplacestring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedata.html#wxfindreplacedatasetreplacestring">external documentation</a>.
 -spec setReplaceString(This, Str) -> ok when
 	This::wxFindReplaceData(), Str::unicode:chardata().
 setReplaceString(#wx_ref{type=ThisT,ref=ThisRef},Str)
diff --git a/lib/wx/src/gen/wxFindReplaceDialog.erl b/lib/wx/src/gen/wxFindReplaceDialog.erl
index 6db9b3ed53..2a3642b0b6 100644
--- a/lib/wx/src/gen/wxFindReplaceDialog.erl
+++ b/lib/wx/src/gen/wxFindReplaceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html">wxFindReplaceDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedialog.html">wxFindReplaceDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -86,7 +86,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFindReplaceDialog() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogwxfindreplacedialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedialog.html#wxfindreplacedialogwxfindreplacedialog">external documentation</a>.
 -spec new() -> wxFindReplaceDialog().
 new() ->
   wxe_util:construct(?wxFindReplaceDialog_new_0,
@@ -100,7 +100,7 @@ new(Parent,Data,Title)
  when is_record(Parent, wx_ref),is_record(Data, wx_ref),is_list(Title) ->
   new(Parent,Data,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogwxfindreplacedialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedialog.html#wxfindreplacedialogwxfindreplacedialog">external documentation</a>.
 -spec new(Parent, Data, Title, [Option]) -> wxFindReplaceDialog() when
 	Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::unicode:chardata(),
 	Option :: {style, integer()}.
@@ -123,7 +123,7 @@ create(This,Parent,Data,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_record(Data, wx_ref),is_list(Title) ->
   create(This,Parent,Data,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialogcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedialog.html#wxfindreplacedialogcreate">external documentation</a>.
 -spec create(This, Parent, Data, Title, [Option]) -> boolean() when
 	This::wxFindReplaceDialog(), Parent::wxWindow:wxWindow(), Data::wxFindReplaceData:wxFindReplaceData(), Title::unicode:chardata(),
 	Option :: {style, integer()}.
@@ -139,7 +139,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_r
   wxe_util:call(?wxFindReplaceDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,DataRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfindreplacedialog.html#wxfindreplacedialoggetdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfindreplacedialog.html#wxfindreplacedialoggetdata">external documentation</a>.
 -spec getData(This) -> wxFindReplaceData:wxFindReplaceData() when
 	This::wxFindReplaceDialog().
 getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxFlexGridSizer.erl b/lib/wx/src/gen/wxFlexGridSizer.erl
index 91dcf6a2e7..3d8884b503 100644
--- a/lib/wx/src/gen/wxFlexGridSizer.erl
+++ b/lib/wx/src/gen/wxFlexGridSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html">wxFlexGridSizer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html">wxFlexGridSizer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridSizer}
 %% <br />{@link wxSizer}
@@ -60,7 +60,7 @@ new(Cols)
  when is_integer(Cols) ->
   new(Cols, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerwxflexgridsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizerwxflexgridsizer">external documentation</a>.
 -spec new(Cols, [Option]) -> wxFlexGridSizer() when
 	Cols::integer(),
 	Option :: {vgap, integer()}
@@ -74,7 +74,7 @@ new(Cols, Options)
   wxe_util:construct(?wxFlexGridSizer_new_2,
   <<Cols:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerwxflexgridsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizerwxflexgridsizer">external documentation</a>.
 -spec new(Rows, Cols, Vgap, Hgap) -> wxFlexGridSizer() when
 	Rows::integer(), Cols::integer(), Vgap::integer(), Hgap::integer().
 new(Rows,Cols,Vgap,Hgap)
@@ -90,7 +90,7 @@ addGrowableCol(This,Idx)
  when is_record(This, wx_ref),is_integer(Idx) ->
   addGrowableCol(This,Idx, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizeraddgrowablecol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizeraddgrowablecol">external documentation</a>.
 -spec addGrowableCol(This, Idx, [Option]) -> ok when
 	This::wxFlexGridSizer(), Idx::integer(),
 	Option :: {proportion, integer()}.
@@ -111,7 +111,7 @@ addGrowableRow(This,Idx)
  when is_record(This, wx_ref),is_integer(Idx) ->
   addGrowableRow(This,Idx, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizeraddgrowablerow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizeraddgrowablerow">external documentation</a>.
 -spec addGrowableRow(This, Idx, [Option]) -> ok when
 	This::wxFlexGridSizer(), Idx::integer(),
 	Option :: {proportion, integer()}.
@@ -124,7 +124,7 @@ addGrowableRow(#wx_ref{type=ThisT,ref=ThisRef},Idx, Options)
   wxe_util:cast(?wxFlexGridSizer_AddGrowableRow,
   <<ThisRef:32/?UI,Idx:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizergetflexibledirection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizergetflexibledirection">external documentation</a>.
 -spec getFlexibleDirection(This) -> integer() when
 	This::wxFlexGridSizer().
 getFlexibleDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -132,7 +132,7 @@ getFlexibleDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFlexGridSizer_GetFlexibleDirection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizergetnonflexiblegrowmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizergetnonflexiblegrowmode">external documentation</a>.
 %%<br /> Res = ?wxFLEX_GROWMODE_NONE | ?wxFLEX_GROWMODE_SPECIFIED | ?wxFLEX_GROWMODE_ALL
 -spec getNonFlexibleGrowMode(This) -> wx:wx_enum() when
 	This::wxFlexGridSizer().
@@ -141,7 +141,7 @@ getNonFlexibleGrowMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFlexGridSizer_GetNonFlexibleGrowMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerremovegrowablecol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizerremovegrowablecol">external documentation</a>.
 -spec removeGrowableCol(This, Idx) -> ok when
 	This::wxFlexGridSizer(), Idx::integer().
 removeGrowableCol(#wx_ref{type=ThisT,ref=ThisRef},Idx)
@@ -150,7 +150,7 @@ removeGrowableCol(#wx_ref{type=ThisT,ref=ThisRef},Idx)
   wxe_util:cast(?wxFlexGridSizer_RemoveGrowableCol,
   <<ThisRef:32/?UI,Idx:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizerremovegrowablerow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizerremovegrowablerow">external documentation</a>.
 -spec removeGrowableRow(This, Idx) -> ok when
 	This::wxFlexGridSizer(), Idx::integer().
 removeGrowableRow(#wx_ref{type=ThisT,ref=ThisRef},Idx)
@@ -159,7 +159,7 @@ removeGrowableRow(#wx_ref{type=ThisT,ref=ThisRef},Idx)
   wxe_util:cast(?wxFlexGridSizer_RemoveGrowableRow,
   <<ThisRef:32/?UI,Idx:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizersetflexibledirection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizersetflexibledirection">external documentation</a>.
 -spec setFlexibleDirection(This, Direction) -> ok when
 	This::wxFlexGridSizer(), Direction::integer().
 setFlexibleDirection(#wx_ref{type=ThisT,ref=ThisRef},Direction)
@@ -168,7 +168,7 @@ setFlexibleDirection(#wx_ref{type=ThisT,ref=ThisRef},Direction)
   wxe_util:cast(?wxFlexGridSizer_SetFlexibleDirection,
   <<ThisRef:32/?UI,Direction:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxflexgridsizer.html#wxflexgridsizersetnonflexiblegrowmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxflexgridsizer.html#wxflexgridsizersetnonflexiblegrowmode">external documentation</a>.
 %%<br /> Mode = ?wxFLEX_GROWMODE_NONE | ?wxFLEX_GROWMODE_SPECIFIED | ?wxFLEX_GROWMODE_ALL
 -spec setNonFlexibleGrowMode(This, Mode) -> ok when
 	This::wxFlexGridSizer(), Mode::wx:wx_enum().
diff --git a/lib/wx/src/gen/wxFocusEvent.erl b/lib/wx/src/gen/wxFocusEvent.erl
index d6478c1142..32141c52ec 100644
--- a/lib/wx/src/gen/wxFocusEvent.erl
+++ b/lib/wx/src/gen/wxFocusEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfocusevent.html">wxFocusEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfocusevent.html">wxFocusEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>set_focus</em>, <em>kill_focus</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxFocus(). #wxFocus{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFocusEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfocusevent.html#wxfocuseventgetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfocusevent.html#wxfocuseventgetwindow">external documentation</a>.
 -spec getWindow(This) -> wxWindow:wxWindow() when
 	This::wxFocusEvent().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxFont.erl b/lib/wx/src/gen/wxFont.erl
index a168e15180..d17314fc7c 100644
--- a/lib/wx/src/gen/wxFont.erl
+++ b/lib/wx/src/gen/wxFont.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html">wxFont</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html">wxFont</a>.
 %% @type wxFont().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -38,13 +38,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFont() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontwxfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontwxfont">external documentation</a>.
 -spec new() -> wxFont().
 new() ->
   wxe_util:construct(?wxFont_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontwxfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontwxfont">external documentation</a>.
 -spec new(Fontname) -> wxFont() when
 	Fontname::unicode:chardata().
 new(Fontname)
@@ -61,7 +61,7 @@ new(Size,Family,Style,Weight)
  when is_integer(Size),is_integer(Family),is_integer(Style),is_integer(Weight) ->
   new(Size,Family,Style,Weight, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontwxfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontwxfont">external documentation</a>.
 %%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
 %%<br /> Family = ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
 %%<br /> Style = ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
@@ -80,7 +80,7 @@ new(Size,Family,Style,Weight, Options)
   wxe_util:construct(?wxFont_new_5,
   <<Size:32/?UI,Family:32/?UI,Style:32/?UI,Weight:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontisfixedwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontisfixedwidth">external documentation</a>.
 -spec isFixedWidth(This) -> boolean() when
 	This::wxFont().
 isFixedWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -88,14 +88,14 @@ isFixedWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_IsFixedWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetdefaultencoding">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetdefaultencoding">external documentation</a>.
 %%<br /> Res = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
 -spec getDefaultEncoding() -> wx:wx_enum().
 getDefaultEncoding() ->
   wxe_util:call(?wxFont_GetDefaultEncoding,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetfacename">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetfacename">external documentation</a>.
 -spec getFaceName(This) -> unicode:charlist() when
 	This::wxFont().
 getFaceName(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -103,7 +103,7 @@ getFaceName(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetFaceName,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetfamily">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetfamily">external documentation</a>.
 %%<br /> Res = ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
 -spec getFamily(This) -> wx:wx_enum() when
 	This::wxFont().
@@ -112,7 +112,7 @@ getFamily(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetFamily,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetnativefontinfodesc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetnativefontinfodesc">external documentation</a>.
 -spec getNativeFontInfoDesc(This) -> unicode:charlist() when
 	This::wxFont().
 getNativeFontInfoDesc(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -120,7 +120,7 @@ getNativeFontInfoDesc(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetNativeFontInfoDesc,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetnativefontinfouserdesc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetnativefontinfouserdesc">external documentation</a>.
 -spec getNativeFontInfoUserDesc(This) -> unicode:charlist() when
 	This::wxFont().
 getNativeFontInfoUserDesc(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -128,7 +128,7 @@ getNativeFontInfoUserDesc(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetNativeFontInfoUserDesc,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetpointsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetpointsize">external documentation</a>.
 -spec getPointSize(This) -> integer() when
 	This::wxFont().
 getPointSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -136,7 +136,7 @@ getPointSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetPointSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetstyle">external documentation</a>.
 %%<br /> Res = ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
 -spec getStyle(This) -> wx:wx_enum() when
 	This::wxFont().
@@ -145,7 +145,7 @@ getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetunderlined">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetunderlined">external documentation</a>.
 -spec getUnderlined(This) -> boolean() when
 	This::wxFont().
 getUnderlined(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -153,7 +153,7 @@ getUnderlined(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetUnderlined,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontgetweight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontgetweight">external documentation</a>.
 -spec getWeight(This) -> integer() when
 	This::wxFont().
 getWeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -161,7 +161,7 @@ getWeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_GetWeight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontok">external documentation</a>.
 -spec ok(This) -> boolean() when
 	This::wxFont().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFont_Ok,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetdefaultencoding">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontsetdefaultencoding">external documentation</a>.
 %%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
 -spec setDefaultEncoding(Encoding) -> ok when
 	Encoding::wx:wx_enum().
@@ -178,7 +178,7 @@ setDefaultEncoding(Encoding)
   wxe_util:cast(?wxFont_SetDefaultEncoding,
   <<Encoding:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetfacename">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontsetfacename">external documentation</a>.
 -spec setFaceName(This, FaceName) -> boolean() when
 	This::wxFont(), FaceName::unicode:chardata().
 setFaceName(#wx_ref{type=ThisT,ref=ThisRef},FaceName)
@@ -188,7 +188,7 @@ setFaceName(#wx_ref{type=ThisT,ref=ThisRef},FaceName)
   wxe_util:call(?wxFont_SetFaceName,
   <<ThisRef:32/?UI,(byte_size(FaceName_UC)):32/?UI,(FaceName_UC)/binary, 0:(((8- ((0+byte_size(FaceName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetfamily">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontsetfamily">external documentation</a>.
 %%<br /> Family = ?wxFONTFAMILY_DEFAULT | ?wxFONTFAMILY_DECORATIVE | ?wxFONTFAMILY_ROMAN | ?wxFONTFAMILY_SCRIPT | ?wxFONTFAMILY_SWISS | ?wxFONTFAMILY_MODERN | ?wxFONTFAMILY_TELETYPE | ?wxFONTFAMILY_MAX | ?wxFONTFAMILY_UNKNOWN
 -spec setFamily(This, Family) -> ok when
 	This::wxFont(), Family::wx:wx_enum().
@@ -198,7 +198,7 @@ setFamily(#wx_ref{type=ThisT,ref=ThisRef},Family)
   wxe_util:cast(?wxFont_SetFamily,
   <<ThisRef:32/?UI,Family:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetpointsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontsetpointsize">external documentation</a>.
 -spec setPointSize(This, PointSize) -> ok when
 	This::wxFont(), PointSize::integer().
 setPointSize(#wx_ref{type=ThisT,ref=ThisRef},PointSize)
@@ -207,7 +207,7 @@ setPointSize(#wx_ref{type=ThisT,ref=ThisRef},PointSize)
   wxe_util:cast(?wxFont_SetPointSize,
   <<ThisRef:32/?UI,PointSize:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontsetstyle">external documentation</a>.
 %%<br /> Style = ?wxFONTSTYLE_NORMAL | ?wxFONTSTYLE_ITALIC | ?wxFONTSTYLE_SLANT | ?wxFONTSTYLE_MAX
 -spec setStyle(This, Style) -> ok when
 	This::wxFont(), Style::wx:wx_enum().
@@ -217,7 +217,7 @@ setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
   wxe_util:cast(?wxFont_SetStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetunderlined">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontsetunderlined">external documentation</a>.
 -spec setUnderlined(This, Underlined) -> ok when
 	This::wxFont(), Underlined::boolean().
 setUnderlined(#wx_ref{type=ThisT,ref=ThisRef},Underlined)
@@ -226,7 +226,7 @@ setUnderlined(#wx_ref{type=ThisT,ref=ThisRef},Underlined)
   wxe_util:cast(?wxFont_SetUnderlined,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Underlined)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfont.html#wxfontsetweight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfont.html#wxfontsetweight">external documentation</a>.
 -spec setWeight(This, Weight) -> ok when
 	This::wxFont(), Weight::integer().
 setWeight(#wx_ref{type=ThisT,ref=ThisRef},Weight)
diff --git a/lib/wx/src/gen/wxFontData.erl b/lib/wx/src/gen/wxFontData.erl
index 978d27b391..24e3e6a768 100644
--- a/lib/wx/src/gen/wxFontData.erl
+++ b/lib/wx/src/gen/wxFontData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html">wxFontData</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html">wxFontData</a>.
 %% @type wxFontData().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -36,13 +36,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFontData() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatawxfontdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatawxfontdata">external documentation</a>.
 -spec new() -> wxFontData().
 new() ->
   wxe_util:construct(?wxFontData_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatawxfontdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatawxfontdata">external documentation</a>.
 -spec new(Data) -> wxFontData() when
 	Data::wxFontData().
 new(#wx_ref{type=DataT,ref=DataRef}) ->
@@ -50,7 +50,7 @@ new(#wx_ref{type=DataT,ref=DataRef}) ->
   wxe_util:construct(?wxFontData_new_1,
   <<DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdataenableeffects">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdataenableeffects">external documentation</a>.
 -spec enableEffects(This, Flag) -> ok when
 	This::wxFontData(), Flag::boolean().
 enableEffects(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -59,7 +59,7 @@ enableEffects(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxFontData_EnableEffects,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetallowsymbols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatagetallowsymbols">external documentation</a>.
 -spec getAllowSymbols(This) -> boolean() when
 	This::wxFontData().
 getAllowSymbols(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -67,7 +67,7 @@ getAllowSymbols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontData_GetAllowSymbols,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatagetcolour">external documentation</a>.
 -spec getColour(This) -> wx:wx_colour4() when
 	This::wxFontData().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -75,7 +75,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontData_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetchosenfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatagetchosenfont">external documentation</a>.
 -spec getChosenFont(This) -> wxFont:wxFont() when
 	This::wxFontData().
 getChosenFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -83,7 +83,7 @@ getChosenFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontData_GetChosenFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetenableeffects">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatagetenableeffects">external documentation</a>.
 -spec getEnableEffects(This) -> boolean() when
 	This::wxFontData().
 getEnableEffects(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -91,7 +91,7 @@ getEnableEffects(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontData_GetEnableEffects,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetinitialfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatagetinitialfont">external documentation</a>.
 -spec getInitialFont(This) -> wxFont:wxFont() when
 	This::wxFontData().
 getInitialFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -99,7 +99,7 @@ getInitialFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontData_GetInitialFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatagetshowhelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatagetshowhelp">external documentation</a>.
 -spec getShowHelp(This) -> boolean() when
 	This::wxFontData().
 getShowHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -107,7 +107,7 @@ getShowHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontData_GetShowHelp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetallowsymbols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatasetallowsymbols">external documentation</a>.
 -spec setAllowSymbols(This, Flag) -> ok when
 	This::wxFontData(), Flag::boolean().
 setAllowSymbols(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -116,7 +116,7 @@ setAllowSymbols(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxFontData_SetAllowSymbols,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetchosenfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatasetchosenfont">external documentation</a>.
 -spec setChosenFont(This, Font) -> ok when
 	This::wxFontData(), Font::wxFont:wxFont().
 setChosenFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -125,7 +125,7 @@ setChosenFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) -
   wxe_util:cast(?wxFontData_SetChosenFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatasetcolour">external documentation</a>.
 -spec setColour(This, Colour) -> ok when
 	This::wxFontData(), Colour::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -134,7 +134,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxFontData_SetColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetinitialfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatasetinitialfont">external documentation</a>.
 -spec setInitialFont(This, Font) -> ok when
 	This::wxFontData(), Font::wxFont:wxFont().
 setInitialFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -143,7 +143,7 @@ setInitialFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef})
   wxe_util:cast(?wxFontData_SetInitialFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatasetrange">external documentation</a>.
 -spec setRange(This, MinRange, MaxRange) -> ok when
 	This::wxFontData(), MinRange::integer(), MaxRange::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinRange,MaxRange)
@@ -152,7 +152,7 @@ setRange(#wx_ref{type=ThisT,ref=ThisRef},MinRange,MaxRange)
   wxe_util:cast(?wxFontData_SetRange,
   <<ThisRef:32/?UI,MinRange:32/?UI,MaxRange:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdata.html#wxfontdatasetshowhelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdata.html#wxfontdatasetshowhelp">external documentation</a>.
 -spec setShowHelp(This, Flag) -> ok when
 	This::wxFontData(), Flag::boolean().
 setShowHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
diff --git a/lib/wx/src/gen/wxFontDialog.erl b/lib/wx/src/gen/wxFontDialog.erl
index 6cc210a4aa..7805559ca6 100644
--- a/lib/wx/src/gen/wxFontDialog.erl
+++ b/lib/wx/src/gen/wxFontDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html">wxFontDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdialog.html">wxFontDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -86,13 +86,13 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFontDialog() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialogwxfontdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdialog.html#wxfontdialogwxfontdialog">external documentation</a>.
 -spec new() -> wxFontDialog().
 new() ->
   wxe_util:construct(?wxFontDialog_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialogwxfontdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdialog.html#wxfontdialogwxfontdialog">external documentation</a>.
 -spec new(Parent, Data) -> wxFontDialog() when
 	Parent::wxWindow:wxWindow(), Data::wxFontData:wxFontData().
 new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef}) ->
@@ -101,7 +101,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef}) ->
   wxe_util:construct(?wxFontDialog_new_2,
   <<ParentRef:32/?UI,DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialogcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdialog.html#wxfontdialogcreate">external documentation</a>.
 -spec create(This, Parent, Data) -> boolean() when
 	This::wxFontDialog(), Parent::wxWindow:wxWindow(), Data::wxFontData:wxFontData().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef}) ->
@@ -111,7 +111,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_r
   wxe_util:call(?wxFontDialog_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontdialog.html#wxfontdialoggetfontdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontdialog.html#wxfontdialoggetfontdata">external documentation</a>.
 -spec getFontData(This) -> wxFontData:wxFontData() when
 	This::wxFontDialog().
 getFontData(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxFontPickerCtrl.erl b/lib/wx/src/gen/wxFontPickerCtrl.erl
index 46c0dbab4d..199224ab13 100644
--- a/lib/wx/src/gen/wxFontPickerCtrl.erl
+++ b/lib/wx/src/gen/wxFontPickerCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html">wxFontPickerCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html">wxFontPickerCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxPickerBase}
 %% <br />{@link wxControl}
@@ -84,7 +84,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFontPickerCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlwxfontpickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html#wxfontpickerctrlwxfontpickerctrl">external documentation</a>.
 -spec new() -> wxFontPickerCtrl().
 new() ->
   wxe_util:construct(?wxFontPickerCtrl_new_0,
@@ -98,7 +98,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlwxfontpickerctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html#wxfontpickerctrlwxfontpickerctrl">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxFontPickerCtrl() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {initial, wxFont:wxFont()}
@@ -127,7 +127,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html#wxfontpickerctrlcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxFontPickerCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {initial, wxFont:wxFont()}
@@ -149,7 +149,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxFontPickerCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlgetselectedfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html#wxfontpickerctrlgetselectedfont">external documentation</a>.
 -spec getSelectedFont(This) -> wxFont:wxFont() when
 	This::wxFontPickerCtrl().
 getSelectedFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -157,7 +157,7 @@ getSelectedFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontPickerCtrl_GetSelectedFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlsetselectedfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html#wxfontpickerctrlsetselectedfont">external documentation</a>.
 -spec setSelectedFont(This, F) -> ok when
 	This::wxFontPickerCtrl(), F::wxFont:wxFont().
 setSelectedFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FT,ref=FRef}) ->
@@ -166,7 +166,7 @@ setSelectedFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FT,ref=FRef}) ->
   wxe_util:cast(?wxFontPickerCtrl_SetSelectedFont,
   <<ThisRef:32/?UI,FRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlgetmaxpointsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html#wxfontpickerctrlgetmaxpointsize">external documentation</a>.
 -spec getMaxPointSize(This) -> integer() when
 	This::wxFontPickerCtrl().
 getMaxPointSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -174,7 +174,7 @@ getMaxPointSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFontPickerCtrl_GetMaxPointSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerctrl.html#wxfontpickerctrlsetmaxpointsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerctrl.html#wxfontpickerctrlsetmaxpointsize">external documentation</a>.
 -spec setMaxPointSize(This, Max) -> ok when
 	This::wxFontPickerCtrl(), Max::integer().
 setMaxPointSize(#wx_ref{type=ThisT,ref=ThisRef},Max)
diff --git a/lib/wx/src/gen/wxFontPickerEvent.erl b/lib/wx/src/gen/wxFontPickerEvent.erl
index 2dc3606409..d914ecb0ba 100644
--- a/lib/wx/src/gen/wxFontPickerEvent.erl
+++ b/lib/wx/src/gen/wxFontPickerEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerevent.html">wxFontPickerEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerevent.html">wxFontPickerEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_fontpicker_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxFontPicker(). #wxFontPicker{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFontPickerEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxfontpickerevent.html#wxfontpickereventgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxfontpickerevent.html#wxfontpickereventgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxFontPickerEvent().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxFrame.erl b/lib/wx/src/gen/wxFrame.erl
index 61f46f7a07..1fe0ed19bd 100644
--- a/lib/wx/src/gen/wxFrame.erl
+++ b/lib/wx/src/gen/wxFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html">wxFrame</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html">wxFrame</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxTopLevelWindow}
 %% <br />{@link wxWindow}
@@ -86,7 +86,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxFrame() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframewxframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframewxframe">external documentation</a>.
 -spec new() -> wxFrame().
 new() ->
   wxe_util:construct(?wxFrame_new_0,
@@ -100,7 +100,7 @@ new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframewxframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframewxframe">external documentation</a>.
 -spec new(Parent, Id, Title, [Option]) -> wxFrame() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -126,7 +126,7 @@ create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframecreate">external documentation</a>.
 -spec create(This, Parent, Id, Title, [Option]) -> boolean() when
 	This::wxFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -153,7 +153,7 @@ createStatusBar(This)
  when is_record(This, wx_ref) ->
   createStatusBar(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframecreatestatusbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframecreatestatusbar">external documentation</a>.
 -spec createStatusBar(This, [Option]) -> wxStatusBar:wxStatusBar() when
 	This::wxFrame(),
 	Option :: {number, integer()}
@@ -178,7 +178,7 @@ createToolBar(This)
  when is_record(This, wx_ref) ->
   createToolBar(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframecreatetoolbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframecreatetoolbar">external documentation</a>.
 -spec createToolBar(This, [Option]) -> wxToolBar:wxToolBar() when
 	This::wxFrame(),
 	Option :: {style, integer()}
@@ -193,7 +193,7 @@ createToolBar(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxFrame_CreateToolBar,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetclientareaorigin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframegetclientareaorigin">external documentation</a>.
 -spec getClientAreaOrigin(This) -> {X::integer(), Y::integer()} when
 	This::wxFrame().
 getClientAreaOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -201,7 +201,7 @@ getClientAreaOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFrame_GetClientAreaOrigin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetmenubar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframegetmenubar">external documentation</a>.
 -spec getMenuBar(This) -> wxMenuBar:wxMenuBar() when
 	This::wxFrame().
 getMenuBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -209,7 +209,7 @@ getMenuBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFrame_GetMenuBar,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetstatusbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframegetstatusbar">external documentation</a>.
 -spec getStatusBar(This) -> wxStatusBar:wxStatusBar() when
 	This::wxFrame().
 getStatusBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -217,7 +217,7 @@ getStatusBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFrame_GetStatusBar,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegetstatusbarpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframegetstatusbarpane">external documentation</a>.
 -spec getStatusBarPane(This) -> integer() when
 	This::wxFrame().
 getStatusBarPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -225,7 +225,7 @@ getStatusBarPane(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFrame_GetStatusBarPane,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframegettoolbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframegettoolbar">external documentation</a>.
 -spec getToolBar(This) -> wxToolBar:wxToolBar() when
 	This::wxFrame().
 getToolBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -233,7 +233,7 @@ getToolBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxFrame_GetToolBar,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframeprocesscommand">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframeprocesscommand">external documentation</a>.
 -spec processCommand(This, Winid) -> boolean() when
 	This::wxFrame(), Winid::integer().
 processCommand(#wx_ref{type=ThisT,ref=ThisRef},Winid)
@@ -242,7 +242,7 @@ processCommand(#wx_ref{type=ThisT,ref=ThisRef},Winid)
   wxe_util:call(?wxFrame_ProcessCommand,
   <<ThisRef:32/?UI,Winid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesendsizeevent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframesendsizeevent">external documentation</a>.
 -spec sendSizeEvent(This) -> ok when
 	This::wxFrame().
 sendSizeEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -250,7 +250,7 @@ sendSizeEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxFrame_SendSizeEvent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetmenubar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframesetmenubar">external documentation</a>.
 -spec setMenuBar(This, Menubar) -> ok when
 	This::wxFrame(), Menubar::wxMenuBar:wxMenuBar().
 setMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenubarT,ref=MenubarRef}) ->
@@ -259,7 +259,7 @@ setMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenubarT,ref=MenubarRef}
   wxe_util:cast(?wxFrame_SetMenuBar,
   <<ThisRef:32/?UI,MenubarRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatusbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframesetstatusbar">external documentation</a>.
 -spec setStatusBar(This, Statbar) -> ok when
 	This::wxFrame(), Statbar::wxStatusBar:wxStatusBar().
 setStatusBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StatbarT,ref=StatbarRef}) ->
@@ -268,7 +268,7 @@ setStatusBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StatbarT,ref=StatbarRe
   wxe_util:cast(?wxFrame_SetStatusBar,
   <<ThisRef:32/?UI,StatbarRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatusbarpane">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframesetstatusbarpane">external documentation</a>.
 -spec setStatusBarPane(This, N) -> ok when
 	This::wxFrame(), N::integer().
 setStatusBarPane(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -285,7 +285,7 @@ setStatusText(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   setStatusText(This,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatustext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframesetstatustext">external documentation</a>.
 -spec setStatusText(This, Text, [Option]) -> ok when
 	This::wxFrame(), Text::unicode:chardata(),
 	Option :: {number, integer()}.
@@ -299,7 +299,7 @@ setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
   wxe_util:cast(?wxFrame_SetStatusText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesetstatuswidths">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframesetstatuswidths">external documentation</a>.
 -spec setStatusWidths(This, Widths_field) -> ok when
 	This::wxFrame(), Widths_field::[integer()].
 setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
@@ -309,7 +309,7 @@ setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
   <<ThisRef:32/?UI,(length(Widths_field)):32/?UI,
         (<< <<C:32/?I>> || C <- Widths_field>>)/binary, 0:(((0+length(Widths_field)) rem 2)*32)>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxframe.html#wxframesettoolbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxframe.html#wxframesettoolbar">external documentation</a>.
 -spec setToolBar(This, Toolbar) -> ok when
 	This::wxFrame(), Toolbar::wxToolBar:wxToolBar().
 setToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ToolbarT,ref=ToolbarRef}) ->
diff --git a/lib/wx/src/gen/wxGBSizerItem.erl b/lib/wx/src/gen/wxGBSizerItem.erl
index 1860e5f808..74e2d8f342 100644
--- a/lib/wx/src/gen/wxGBSizerItem.erl
+++ b/lib/wx/src/gen/wxGBSizerItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgbsizeritem.html">wxGBSizerItem</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgbsizeritem.html">wxGBSizerItem</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxSizerItem}
 %% </p>
diff --git a/lib/wx/src/gen/wxGLCanvas.erl b/lib/wx/src/gen/wxGLCanvas.erl
index 46168374af..d6071694a2 100644
--- a/lib/wx/src/gen/wxGLCanvas.erl
+++ b/lib/wx/src/gen/wxGLCanvas.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html">wxGLCanvas</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxglcanvas.html">wxGLCanvas</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -83,7 +83,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvaswxglcanvas">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxglcanvas.html#wxglcanvaswxglcanvas">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Parent, [Option]) -> wxGLCanvas() when<br />
 %% 	Parent::wxWindow:wxWindow(),<br />
@@ -126,7 +126,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxGLCanvas_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvaswxglcanvas">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxglcanvas.html#wxglcanvaswxglcanvas">external documentation</a>.
 -spec new(Parent, Shared, [Option]) -> wxGLCanvas() when
 	Parent::wxWindow:wxWindow(), Shared::wx:wx_object() | wxGLCanvas(),
 	Option :: {id, integer()}
@@ -158,7 +158,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=SharedT,ref=SharedRef}, Opt
   wxe_util:construct(SharedOP,
   <<ParentRef:32/?UI,SharedRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvasgetcontext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxglcanvas.html#wxglcanvasgetcontext">external documentation</a>.
 -spec getContext(This) -> wx:wx_object() when
 	This::wxGLCanvas().
 getContext(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -166,7 +166,7 @@ getContext(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGLCanvas_GetContext,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvassetcurrent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxglcanvas.html#wxglcanvassetcurrent">external documentation</a>.
 -spec setCurrent(This) -> ok when
 	This::wxGLCanvas().
 setCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -176,7 +176,7 @@ setCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   {ok, _} = wxe_master:init_opengl(),
   _Result.
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxglcanvas.html#wxglcanvasswapbuffers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxglcanvas.html#wxglcanvasswapbuffers">external documentation</a>.
 -spec swapBuffers(This) -> ok when
 	This::wxGLCanvas().
 swapBuffers(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxGauge.erl b/lib/wx/src/gen/wxGauge.erl
index 7f892355c7..12be5d32f3 100644
--- a/lib/wx/src/gen/wxGauge.erl
+++ b/lib/wx/src/gen/wxGauge.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html">wxGauge</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html">wxGauge</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -79,7 +79,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGauge() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugewxgauge">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugewxgauge">external documentation</a>.
 -spec new() -> wxGauge().
 new() ->
   wxe_util:construct(?wxGauge_new_0,
@@ -93,7 +93,7 @@ new(Parent,Id,Range)
  when is_record(Parent, wx_ref),is_integer(Id),is_integer(Range) ->
   new(Parent,Id,Range, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugewxgauge">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugewxgauge">external documentation</a>.
 -spec new(Parent, Id, Range, [Option]) -> wxGauge() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Range::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -120,7 +120,7 @@ create(This,Parent,Id,Range)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(Range) ->
   create(This,Parent,Id,Range, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugecreate">external documentation</a>.
 -spec create(This, Parent, Id, Range, [Option]) -> boolean() when
 	This::wxGauge(), Parent::wxWindow:wxWindow(), Id::integer(), Range::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -140,7 +140,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ra
   wxe_util:call(?wxGauge_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,Range:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetbezelface">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugegetbezelface">external documentation</a>.
 -spec getBezelFace(This) -> integer() when
 	This::wxGauge().
 getBezelFace(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ getBezelFace(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGauge_GetBezelFace,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugegetrange">external documentation</a>.
 -spec getRange(This) -> integer() when
 	This::wxGauge().
 getRange(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -156,7 +156,7 @@ getRange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGauge_GetRange,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetshadowwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugegetshadowwidth">external documentation</a>.
 -spec getShadowWidth(This) -> integer() when
 	This::wxGauge().
 getShadowWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -164,7 +164,7 @@ getShadowWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGauge_GetShadowWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugegetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugegetvalue">external documentation</a>.
 -spec getValue(This) -> integer() when
 	This::wxGauge().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -172,7 +172,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGauge_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugeisvertical">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugeisvertical">external documentation</a>.
 -spec isVertical(This) -> boolean() when
 	This::wxGauge().
 isVertical(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -180,7 +180,7 @@ isVertical(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGauge_IsVertical,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetbezelface">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugesetbezelface">external documentation</a>.
 -spec setBezelFace(This, W) -> ok when
 	This::wxGauge(), W::integer().
 setBezelFace(#wx_ref{type=ThisT,ref=ThisRef},W)
@@ -189,7 +189,7 @@ setBezelFace(#wx_ref{type=ThisT,ref=ThisRef},W)
   wxe_util:cast(?wxGauge_SetBezelFace,
   <<ThisRef:32/?UI,W:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugesetrange">external documentation</a>.
 -spec setRange(This, R) -> ok when
 	This::wxGauge(), R::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},R)
@@ -198,7 +198,7 @@ setRange(#wx_ref{type=ThisT,ref=ThisRef},R)
   wxe_util:cast(?wxGauge_SetRange,
   <<ThisRef:32/?UI,R:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetshadowwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugesetshadowwidth">external documentation</a>.
 -spec setShadowWidth(This, W) -> ok when
 	This::wxGauge(), W::integer().
 setShadowWidth(#wx_ref{type=ThisT,ref=ThisRef},W)
@@ -207,7 +207,7 @@ setShadowWidth(#wx_ref{type=ThisT,ref=ThisRef},W)
   wxe_util:cast(?wxGauge_SetShadowWidth,
   <<ThisRef:32/?UI,W:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugesetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugesetvalue">external documentation</a>.
 -spec setValue(This, Pos) -> ok when
 	This::wxGauge(), Pos::integer().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -216,7 +216,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxGauge_SetValue,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgauge.html#wxgaugepulse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgauge.html#wxgaugepulse">external documentation</a>.
 -spec pulse(This) -> ok when
 	This::wxGauge().
 pulse(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxGenericDirCtrl.erl b/lib/wx/src/gen/wxGenericDirCtrl.erl
index cb917e8fd1..4539438811 100644
--- a/lib/wx/src/gen/wxGenericDirCtrl.erl
+++ b/lib/wx/src/gen/wxGenericDirCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html">wxGenericDirCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html">wxGenericDirCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -80,7 +80,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGenericDirCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlwxgenericdirctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlwxgenericdirctrl">external documentation</a>.
 -spec new() -> wxGenericDirCtrl().
 new() ->
   wxe_util:construct(?wxGenericDirCtrl_new_0,
@@ -94,7 +94,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlwxgenericdirctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlwxgenericdirctrl">external documentation</a>.
 -spec new(Parent, [Option]) -> wxGenericDirCtrl() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -127,7 +127,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxGenericDirCtrl(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -153,7 +153,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxGenericDirCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlinit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlinit">external documentation</a>.
 -spec init(This) -> ok when
 	This::wxGenericDirCtrl().
 init(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -161,7 +161,7 @@ init(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGenericDirCtrl_Init,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlcollapsetree">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlcollapsetree">external documentation</a>.
 -spec collapseTree(This) -> ok when
 	This::wxGenericDirCtrl().
 collapseTree(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ collapseTree(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGenericDirCtrl_CollapseTree,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlexpandpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlexpandpath">external documentation</a>.
 -spec expandPath(This, Path) -> boolean() when
 	This::wxGenericDirCtrl(), Path::unicode:chardata().
 expandPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
@@ -179,7 +179,7 @@ expandPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   wxe_util:call(?wxGenericDirCtrl_ExpandPath,
   <<ThisRef:32/?UI,(byte_size(Path_UC)):32/?UI,(Path_UC)/binary, 0:(((8- ((0+byte_size(Path_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetdefaultpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlgetdefaultpath">external documentation</a>.
 -spec getDefaultPath(This) -> unicode:charlist() when
 	This::wxGenericDirCtrl().
 getDefaultPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -187,7 +187,7 @@ getDefaultPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGenericDirCtrl_GetDefaultPath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlgetpath">external documentation</a>.
 -spec getPath(This) -> unicode:charlist() when
 	This::wxGenericDirCtrl().
 getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -195,7 +195,7 @@ getPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGenericDirCtrl_GetPath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilepath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilepath">external documentation</a>.
 -spec getFilePath(This) -> unicode:charlist() when
 	This::wxGenericDirCtrl().
 getFilePath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -203,7 +203,7 @@ getFilePath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGenericDirCtrl_GetFilePath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilter">external documentation</a>.
 -spec getFilter(This) -> unicode:charlist() when
 	This::wxGenericDirCtrl().
 getFilter(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -211,7 +211,7 @@ getFilter(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGenericDirCtrl_GetFilter,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilterindex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlgetfilterindex">external documentation</a>.
 -spec getFilterIndex(This) -> integer() when
 	This::wxGenericDirCtrl().
 getFilterIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -219,7 +219,7 @@ getFilterIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGenericDirCtrl_GetFilterIndex,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgetrootid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlgetrootid">external documentation</a>.
 -spec getRootId(This) -> integer() when
 	This::wxGenericDirCtrl().
 getRootId(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -227,7 +227,7 @@ getRootId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGenericDirCtrl_GetRootId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlgettreectrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlgettreectrl">external documentation</a>.
 -spec getTreeCtrl(This) -> wxTreeCtrl:wxTreeCtrl() when
 	This::wxGenericDirCtrl().
 getTreeCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -235,7 +235,7 @@ getTreeCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGenericDirCtrl_GetTreeCtrl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlrecreatetree">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlrecreatetree">external documentation</a>.
 -spec reCreateTree(This) -> ok when
 	This::wxGenericDirCtrl().
 reCreateTree(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -243,7 +243,7 @@ reCreateTree(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGenericDirCtrl_ReCreateTree,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetdefaultpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlsetdefaultpath">external documentation</a>.
 -spec setDefaultPath(This, Path) -> ok when
 	This::wxGenericDirCtrl(), Path::unicode:chardata().
 setDefaultPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
@@ -253,7 +253,7 @@ setDefaultPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
   wxe_util:cast(?wxGenericDirCtrl_SetDefaultPath,
   <<ThisRef:32/?UI,(byte_size(Path_UC)):32/?UI,(Path_UC)/binary, 0:(((8- ((0+byte_size(Path_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetfilter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlsetfilter">external documentation</a>.
 -spec setFilter(This, Filter) -> ok when
 	This::wxGenericDirCtrl(), Filter::unicode:chardata().
 setFilter(#wx_ref{type=ThisT,ref=ThisRef},Filter)
@@ -263,7 +263,7 @@ setFilter(#wx_ref{type=ThisT,ref=ThisRef},Filter)
   wxe_util:cast(?wxGenericDirCtrl_SetFilter,
   <<ThisRef:32/?UI,(byte_size(Filter_UC)):32/?UI,(Filter_UC)/binary, 0:(((8- ((0+byte_size(Filter_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetfilterindex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlsetfilterindex">external documentation</a>.
 -spec setFilterIndex(This, N) -> ok when
 	This::wxGenericDirCtrl(), N::integer().
 setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -272,7 +272,7 @@ setFilterIndex(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:cast(?wxGenericDirCtrl_SetFilterIndex,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgenericdirctrl.html#wxgenericdirctrlsetpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgenericdirctrl.html#wxgenericdirctrlsetpath">external documentation</a>.
 -spec setPath(This, Path) -> ok when
 	This::wxGenericDirCtrl(), Path::unicode:chardata().
 setPath(#wx_ref{type=ThisT,ref=ThisRef},Path)
diff --git a/lib/wx/src/gen/wxGraphicsBrush.erl b/lib/wx/src/gen/wxGraphicsBrush.erl
index bbc0c4b1a0..daeaa6d183 100644
--- a/lib/wx/src/gen/wxGraphicsBrush.erl
+++ b/lib/wx/src/gen/wxGraphicsBrush.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsbrush.html">wxGraphicsBrush</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsbrush.html">wxGraphicsBrush</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGraphicsObject}
 %% </p>
diff --git a/lib/wx/src/gen/wxGraphicsContext.erl b/lib/wx/src/gen/wxGraphicsContext.erl
index 575e48d7af..3eab7928e1 100644
--- a/lib/wx/src/gen/wxGraphicsContext.erl
+++ b/lib/wx/src/gen/wxGraphicsContext.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html">wxGraphicsContext</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html">wxGraphicsContext</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGraphicsObject}
 %% </p>
@@ -47,13 +47,13 @@ parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGraphicsContext() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreate">external documentation</a>.
 -spec create() -> wxGraphicsContext().
 create() ->
   wxe_util:call(?wxGraphicsContext_Create_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreate">external documentation</a>.
 -spec create(Dc) -> wxGraphicsContext() when
 	Dc::wxWindowDC:wxWindowDC() | wxWindow:wxWindow().
 create(#wx_ref{type=DcT,ref=DcRef}) ->
@@ -66,7 +66,7 @@ create(#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:call(DcOP,
   <<DcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatepen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreatepen">external documentation</a>.
 -spec createPen(This, Pen) -> wxGraphicsPen:wxGraphicsPen() when
 	This::wxGraphicsContext(), Pen::wxPen:wxPen().
 createPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
@@ -75,7 +75,7 @@ createPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   wxe_util:call(?wxGraphicsContext_CreatePen,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatebrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreatebrush">external documentation</a>.
 -spec createBrush(This, Brush) -> wxGraphicsBrush:wxGraphicsBrush() when
 	This::wxGraphicsContext(), Brush::wxBrush:wxBrush().
 createBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
@@ -84,7 +84,7 @@ createBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) -
   wxe_util:call(?wxGraphicsContext_CreateBrush,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreateradialgradientbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreateradialgradientbrush">external documentation</a>.
 -spec createRadialGradientBrush(This, Xo, Yo, Xc, Yc, Radius, OColor, CColor) -> wxGraphicsBrush:wxGraphicsBrush() when
 	This::wxGraphicsContext(), Xo::number(), Yo::number(), Xc::number(), Yc::number(), Radius::number(), OColor::wx:wx_colour(), CColor::wx:wx_colour().
 createRadialGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},Xo,Yo,Xc,Yc,Radius,OColor,CColor)
@@ -93,7 +93,7 @@ createRadialGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},Xo,Yo,Xc,Yc,Radius,OCo
   wxe_util:call(?wxGraphicsContext_CreateRadialGradientBrush,
   <<ThisRef:32/?UI,0:32,Xo:64/?F,Yo:64/?F,Xc:64/?F,Yc:64/?F,Radius:64/?F,(wxe_util:colour_bin(OColor)):16/binary,(wxe_util:colour_bin(CColor)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatelineargradientbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreatelineargradientbrush">external documentation</a>.
 -spec createLinearGradientBrush(This, X1, Y1, X2, Y2, C1, C2) -> wxGraphicsBrush:wxGraphicsBrush() when
 	This::wxGraphicsContext(), X1::number(), Y1::number(), X2::number(), Y2::number(), C1::wx:wx_colour(), C2::wx:wx_colour().
 createLinearGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,C1,C2)
@@ -110,7 +110,7 @@ createFont(This,Font)
  when is_record(This, wx_ref),is_record(Font, wx_ref) ->
   createFont(This,Font, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatefont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreatefont">external documentation</a>.
 -spec createFont(This, Font, [Option]) -> wxGraphicsFont:wxGraphicsFont() when
 	This::wxGraphicsContext(), Font::wxFont:wxFont(),
 	Option :: {col, wx:wx_colour()}.
@@ -132,7 +132,7 @@ createMatrix(This)
  when is_record(This, wx_ref) ->
   createMatrix(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatematrix">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreatematrix">external documentation</a>.
 -spec createMatrix(This, [Option]) -> wxGraphicsMatrix:wxGraphicsMatrix() when
 	This::wxGraphicsContext(),
 	Option :: {a, number()}
@@ -155,7 +155,7 @@ createMatrix(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGraphicsContext_CreateMatrix,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextcreatepath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextcreatepath">external documentation</a>.
 -spec createPath(This) -> wxGraphicsPath:wxGraphicsPath() when
 	This::wxGraphicsContext().
 createPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -163,7 +163,7 @@ createPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsContext_CreatePath,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextclip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextclip">external documentation</a>.
 -spec clip(This, Region) -> ok when
 	This::wxGraphicsContext(), Region::wxRegion:wxRegion().
 clip(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
@@ -172,7 +172,7 @@ clip(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   wxe_util:cast(?wxGraphicsContext_Clip_1,
   <<ThisRef:32/?UI,RegionRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextclip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextclip">external documentation</a>.
 -spec clip(This, X, Y, W, H) -> ok when
 	This::wxGraphicsContext(), X::number(), Y::number(), W::number(), H::number().
 clip(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -181,7 +181,7 @@ clip(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:cast(?wxGraphicsContext_Clip_4,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextresetclip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextresetclip">external documentation</a>.
 -spec resetClip(This) -> ok when
 	This::wxGraphicsContext().
 resetClip(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -189,7 +189,7 @@ resetClip(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGraphicsContext_ResetClip,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawbitmap">external documentation</a>.
 -spec drawBitmap(This, Bmp, X, Y, W, H) -> ok when
 	This::wxGraphicsContext(), Bmp::wxBitmap:wxBitmap(), X::number(), Y::number(), W::number(), H::number().
 drawBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},X,Y,W,H)
@@ -199,7 +199,7 @@ drawBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},X,Y,W,H
   wxe_util:cast(?wxGraphicsContext_DrawBitmap,
   <<ThisRef:32/?UI,BmpRef:32/?UI,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawellipse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawellipse">external documentation</a>.
 -spec drawEllipse(This, X, Y, W, H) -> ok when
 	This::wxGraphicsContext(), X::number(), Y::number(), W::number(), H::number().
 drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -208,7 +208,7 @@ drawEllipse(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:cast(?wxGraphicsContext_DrawEllipse,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawicon">external documentation</a>.
 -spec drawIcon(This, Icon, X, Y, W, H) -> ok when
 	This::wxGraphicsContext(), Icon::wxIcon:wxIcon(), X::number(), Y::number(), W::number(), H::number().
 drawIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef},X,Y,W,H)
@@ -226,7 +226,7 @@ drawLines(This,Points)
  when is_record(This, wx_ref),is_list(Points) ->
   drawLines(This,Points, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawlines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawlines">external documentation</a>.
 %%<br /> FillStyle = integer
 -spec drawLines(This, Points, [Option]) -> ok when
 	This::wxGraphicsContext(), Points::[{X::float(), Y::float()}],
@@ -249,7 +249,7 @@ drawPath(This,Path)
  when is_record(This, wx_ref),is_record(Path, wx_ref) ->
   drawPath(This,Path, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawpath">external documentation</a>.
 %%<br /> FillStyle = integer
 -spec drawPath(This, Path, [Option]) -> ok when
 	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
@@ -264,7 +264,7 @@ drawPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Option
   wxe_util:cast(?wxGraphicsContext_DrawPath,
   <<ThisRef:32/?UI,PathRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawrectangle">external documentation</a>.
 -spec drawRectangle(This, X, Y, W, H) -> ok when
 	This::wxGraphicsContext(), X::number(), Y::number(), W::number(), H::number().
 drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -273,7 +273,7 @@ drawRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:cast(?wxGraphicsContext_DrawRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawroundedrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawroundedrectangle">external documentation</a>.
 -spec drawRoundedRectangle(This, X, Y, W, H, Radius) -> ok when
 	This::wxGraphicsContext(), X::number(), Y::number(), W::number(), H::number(), Radius::number().
 drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius)
@@ -282,7 +282,7 @@ drawRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius)
   wxe_util:cast(?wxGraphicsContext_DrawRoundedRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F,Radius:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
 -spec drawText(This, Str, X, Y) -> ok when
 	This::wxGraphicsContext(), Str::unicode:chardata(), X::number(), Y::number().
 drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y)
@@ -292,7 +292,7 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y)
   wxe_util:cast(?wxGraphicsContext_DrawText_3,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8,X:64/?F,Y:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
 %% <br /> Also:<br />
 %% drawText(This, Str, X, Y, BackgroundBrush) -> ok when<br />
 %% 	This::wxGraphicsContext(), Str::unicode:chardata(), X::number(), Y::number(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush().<br />
@@ -315,7 +315,7 @@ drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,#wx_ref{type=BackgroundBrushT,r
   wxe_util:cast(?wxGraphicsContext_DrawText_4_1,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8,X:64/?F,Y:64/?F,BackgroundBrushRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextdrawtext">external documentation</a>.
 -spec drawText(This, Str, X, Y, Angle, BackgroundBrush) -> ok when
 	This::wxGraphicsContext(), Str::unicode:chardata(), X::number(), Y::number(), Angle::number(), BackgroundBrush::wxGraphicsBrush:wxGraphicsBrush().
 drawText(#wx_ref{type=ThisT,ref=ThisRef},Str,X,Y,Angle,#wx_ref{type=BackgroundBrushT,ref=BackgroundBrushRef})
@@ -334,7 +334,7 @@ fillPath(This,Path)
  when is_record(This, wx_ref),is_record(Path, wx_ref) ->
   fillPath(This,Path, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextfillpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextfillpath">external documentation</a>.
 %%<br /> FillStyle = integer
 -spec fillPath(This, Path, [Option]) -> ok when
 	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath(),
@@ -349,7 +349,7 @@ fillPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}, Option
   wxe_util:cast(?wxGraphicsContext_FillPath,
   <<ThisRef:32/?UI,PathRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextstrokepath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextstrokepath">external documentation</a>.
 -spec strokePath(This, Path) -> ok when
 	This::wxGraphicsContext(), Path::wxGraphicsPath:wxGraphicsPath().
 strokePath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) ->
@@ -358,7 +358,7 @@ strokePath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) ->
   wxe_util:cast(?wxGraphicsContext_StrokePath,
   <<ThisRef:32/?UI,PathRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgetpartialtextextents">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextgetpartialtextextents">external documentation</a>.
 -spec getPartialTextExtents(This, Text) -> [number()] when
 	This::wxGraphicsContext(), Text::unicode:chardata().
 getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -368,7 +368,7 @@ getPartialTextExtents(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxGraphicsContext_GetPartialTextExtents,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgettextextent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextgettextextent">external documentation</a>.
 -spec getTextExtent(This, Text) -> Result when
 	Result ::{Width::number(), Height::number(), Descent::number(), ExternalLeading::number()},
 	This::wxGraphicsContext(), Text::unicode:chardata().
@@ -379,7 +379,7 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxGraphicsContext_GetTextExtent,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextrotate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextrotate">external documentation</a>.
 -spec rotate(This, Angle) -> ok when
 	This::wxGraphicsContext(), Angle::number().
 rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle)
@@ -388,7 +388,7 @@ rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle)
   wxe_util:cast(?wxGraphicsContext_Rotate,
   <<ThisRef:32/?UI,0:32,Angle:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextscale">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextscale">external documentation</a>.
 -spec scale(This, XScale, YScale) -> ok when
 	This::wxGraphicsContext(), XScale::number(), YScale::number().
 scale(#wx_ref{type=ThisT,ref=ThisRef},XScale,YScale)
@@ -397,7 +397,7 @@ scale(#wx_ref{type=ThisT,ref=ThisRef},XScale,YScale)
   wxe_util:cast(?wxGraphicsContext_Scale,
   <<ThisRef:32/?UI,0:32,XScale:64/?F,YScale:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontexttranslate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontexttranslate">external documentation</a>.
 -spec translate(This, Dx, Dy) -> ok when
 	This::wxGraphicsContext(), Dx::number(), Dy::number().
 translate(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
@@ -406,7 +406,7 @@ translate(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
   wxe_util:cast(?wxGraphicsContext_Translate,
   <<ThisRef:32/?UI,0:32,Dx:64/?F,Dy:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextgettransform">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextgettransform">external documentation</a>.
 -spec getTransform(This) -> wxGraphicsMatrix:wxGraphicsMatrix() when
 	This::wxGraphicsContext().
 getTransform(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -414,7 +414,7 @@ getTransform(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsContext_GetTransform,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsettransform">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextsettransform">external documentation</a>.
 -spec setTransform(This, Matrix) -> ok when
 	This::wxGraphicsContext(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix().
 setTransform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixRef}) ->
@@ -423,7 +423,7 @@ setTransform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixRef}
   wxe_util:cast(?wxGraphicsContext_SetTransform,
   <<ThisRef:32/?UI,MatrixRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextconcattransform">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextconcattransform">external documentation</a>.
 -spec concatTransform(This, Matrix) -> ok when
 	This::wxGraphicsContext(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix().
 concatTransform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixRef}) ->
@@ -432,7 +432,7 @@ concatTransform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixR
   wxe_util:cast(?wxGraphicsContext_ConcatTransform,
   <<ThisRef:32/?UI,MatrixRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextsetbrush">external documentation</a>.
 -spec setBrush(This, Brush) -> ok when
 	This::wxGraphicsContext(), Brush::wxGraphicsBrush:wxGraphicsBrush() | wxBrush:wxBrush().
 setBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
@@ -446,7 +446,7 @@ setBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
   wxe_util:cast(BrushOP,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextsetfont">external documentation</a>.
 -spec setFont(This, Font) -> ok when
 	This::wxGraphicsContext(), Font::wxGraphicsFont:wxGraphicsFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -455,7 +455,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:cast(?wxGraphicsContext_SetFont_1,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextsetfont">external documentation</a>.
 -spec setFont(This, Font, Colour) -> ok when
 	This::wxGraphicsContext(), Font::wxFont:wxFont(), Colour::wx:wx_colour().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef},Colour)
@@ -465,7 +465,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef},Colour)
   wxe_util:cast(?wxGraphicsContext_SetFont_2,
   <<ThisRef:32/?UI,FontRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextsetpen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextsetpen">external documentation</a>.
 -spec setPen(This, Pen) -> ok when
 	This::wxGraphicsContext(), Pen::wxPen:wxPen() | wxGraphicsPen:wxGraphicsPen().
 setPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
@@ -479,7 +479,7 @@ setPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   wxe_util:cast(PenOP,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextstrokeline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextstrokeline">external documentation</a>.
 -spec strokeLine(This, X1, Y1, X2, Y2) -> ok when
 	This::wxGraphicsContext(), X1::number(), Y1::number(), X2::number(), Y2::number().
 strokeLine(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2)
@@ -488,7 +488,7 @@ strokeLine(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2)
   wxe_util:cast(?wxGraphicsContext_StrokeLine,
   <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicscontext.html#wxgraphicscontextstrokelines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicscontext.html#wxgraphicscontextstrokelines">external documentation</a>.
 -spec strokeLines(This, Points) -> ok when
 	This::wxGraphicsContext(), Points::[{X::float(), Y::float()}].
 strokeLines(#wx_ref{type=ThisT,ref=ThisRef},Points)
diff --git a/lib/wx/src/gen/wxGraphicsFont.erl b/lib/wx/src/gen/wxGraphicsFont.erl
index 03220599fb..25c585bb8f 100644
--- a/lib/wx/src/gen/wxGraphicsFont.erl
+++ b/lib/wx/src/gen/wxGraphicsFont.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsfont.html">wxGraphicsFont</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsfont.html">wxGraphicsFont</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGraphicsObject}
 %% </p>
diff --git a/lib/wx/src/gen/wxGraphicsMatrix.erl b/lib/wx/src/gen/wxGraphicsMatrix.erl
index 36c33069ad..74c8b5f7e9 100644
--- a/lib/wx/src/gen/wxGraphicsMatrix.erl
+++ b/lib/wx/src/gen/wxGraphicsMatrix.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html">wxGraphicsMatrix</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html">wxGraphicsMatrix</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGraphicsObject}
 %% </p>
@@ -39,7 +39,7 @@ parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGraphicsMatrix() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixconcat">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixconcat">external documentation</a>.
 -spec concat(This, T) -> ok when
 	This::wxGraphicsMatrix(), T::wxGraphicsMatrix().
 concat(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TT,ref=TRef}) ->
@@ -48,7 +48,7 @@ concat(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TT,ref=TRef}) ->
   wxe_util:cast(?wxGraphicsMatrix_Concat,
   <<ThisRef:32/?UI,TRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixget">external documentation</a>.
 -spec get(This) -> Result when
 	Result ::{A::number(), B::number(), C::number(), D::number(), Tx::number(), Ty::number()},
 	This::wxGraphicsMatrix().
@@ -57,7 +57,7 @@ get(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsMatrix_Get,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixinvert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixinvert">external documentation</a>.
 -spec invert(This) -> ok when
 	This::wxGraphicsMatrix().
 invert(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -65,7 +65,7 @@ invert(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGraphicsMatrix_Invert,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixisequal">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixisequal">external documentation</a>.
 -spec isEqual(This, T) -> boolean() when
 	This::wxGraphicsMatrix(), T::wxGraphicsMatrix().
 isEqual(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TT,ref=TRef}) ->
@@ -74,7 +74,7 @@ isEqual(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TT,ref=TRef}) ->
   wxe_util:call(?wxGraphicsMatrix_IsEqual,
   <<ThisRef:32/?UI,TRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixisidentity">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixisidentity">external documentation</a>.
 -spec isIdentity(This) -> boolean() when
 	This::wxGraphicsMatrix().
 isIdentity(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -82,7 +82,7 @@ isIdentity(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsMatrix_IsIdentity,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixrotate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixrotate">external documentation</a>.
 -spec rotate(This, Angle) -> ok when
 	This::wxGraphicsMatrix(), Angle::number().
 rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle)
@@ -91,7 +91,7 @@ rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle)
   wxe_util:cast(?wxGraphicsMatrix_Rotate,
   <<ThisRef:32/?UI,0:32,Angle:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixscale">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixscale">external documentation</a>.
 -spec scale(This, XScale, YScale) -> ok when
 	This::wxGraphicsMatrix(), XScale::number(), YScale::number().
 scale(#wx_ref{type=ThisT,ref=ThisRef},XScale,YScale)
@@ -100,7 +100,7 @@ scale(#wx_ref{type=ThisT,ref=ThisRef},XScale,YScale)
   wxe_util:cast(?wxGraphicsMatrix_Scale,
   <<ThisRef:32/?UI,0:32,XScale:64/?F,YScale:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtranslate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtranslate">external documentation</a>.
 -spec translate(This, Dx, Dy) -> ok when
 	This::wxGraphicsMatrix(), Dx::number(), Dy::number().
 translate(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
@@ -117,7 +117,7 @@ set(This)
  when is_record(This, wx_ref) ->
   set(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixset">external documentation</a>.
 -spec set(This, [Option]) -> ok when
 	This::wxGraphicsMatrix(),
 	Option :: {a, number()}
@@ -140,7 +140,7 @@ set(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGraphicsMatrix_Set,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtransformpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtransformpoint">external documentation</a>.
 -spec transformPoint(This) -> {X::number(), Y::number()} when
 	This::wxGraphicsMatrix().
 transformPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ transformPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsMatrix_TransformPoint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtransformdistance">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsmatrix.html#wxgraphicsmatrixtransformdistance">external documentation</a>.
 -spec transformDistance(This) -> {Dx::number(), Dy::number()} when
 	This::wxGraphicsMatrix().
 transformDistance(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxGraphicsObject.erl b/lib/wx/src/gen/wxGraphicsObject.erl
index 857a398e1f..5daeaedc04 100644
--- a/lib/wx/src/gen/wxGraphicsObject.erl
+++ b/lib/wx/src/gen/wxGraphicsObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsobject.html">wxGraphicsObject</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsobject.html">wxGraphicsObject</a>.
 %% @type wxGraphicsObject().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,7 +34,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGraphicsObject() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsobject.html#wxgraphicsobjectgetrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsobject.html#wxgraphicsobjectgetrenderer">external documentation</a>.
 -spec getRenderer(This) -> wxGraphicsRenderer:wxGraphicsRenderer() when
 	This::wxGraphicsObject().
 getRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -42,7 +42,7 @@ getRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsObject_GetRenderer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsobject.html#wxgraphicsobjectisnull">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsobject.html#wxgraphicsobjectisnull">external documentation</a>.
 -spec isNull(This) -> boolean() when
 	This::wxGraphicsObject().
 isNull(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxGraphicsPath.erl b/lib/wx/src/gen/wxGraphicsPath.erl
index 246ea489ec..a4e12bbbea 100644
--- a/lib/wx/src/gen/wxGraphicsPath.erl
+++ b/lib/wx/src/gen/wxGraphicsPath.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html">wxGraphicsPath</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html">wxGraphicsPath</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGraphicsObject}
 %% </p>
@@ -42,7 +42,7 @@ parent_class(wxGraphicsObject) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGraphicsPath() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathmovetopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathmovetopoint">external documentation</a>.
 -spec moveToPoint(This, P) -> ok when
 	This::wxGraphicsPath(), P::{X::float(), Y::float()}.
 moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY})
@@ -51,7 +51,7 @@ moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY})
   wxe_util:cast(?wxGraphicsPath_MoveToPoint_1,
   <<ThisRef:32/?UI,0:32,PX:64/?F,PY:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathmovetopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathmovetopoint">external documentation</a>.
 -spec moveToPoint(This, X, Y) -> ok when
 	This::wxGraphicsPath(), X::number(), Y::number().
 moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -60,7 +60,7 @@ moveToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxGraphicsPath_MoveToPoint_2,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>.
 -spec addArc(This, C, R, StartAngle, EndAngle, Clockwise) -> ok when
 	This::wxGraphicsPath(), C::{X::float(), Y::float()}, R::number(), StartAngle::number(), EndAngle::number(), Clockwise::boolean().
 addArc(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY},R,StartAngle,EndAngle,Clockwise)
@@ -69,7 +69,7 @@ addArc(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY},R,StartAngle,EndAngle,Clockwise)
   wxe_util:cast(?wxGraphicsPath_AddArc_5,
   <<ThisRef:32/?UI,0:32,CX:64/?F,CY:64/?F,R:64/?F,StartAngle:64/?F,EndAngle:64/?F,(wxe_util:from_bool(Clockwise)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddarc">external documentation</a>.
 -spec addArc(This, X, Y, R, StartAngle, EndAngle, Clockwise) -> ok when
 	This::wxGraphicsPath(), X::number(), Y::number(), R::number(), StartAngle::number(), EndAngle::number(), Clockwise::boolean().
 addArc(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R,StartAngle,EndAngle,Clockwise)
@@ -78,7 +78,7 @@ addArc(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R,StartAngle,EndAngle,Clockwise)
   wxe_util:cast(?wxGraphicsPath_AddArc_6,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,R:64/?F,StartAngle:64/?F,EndAngle:64/?F,(wxe_util:from_bool(Clockwise)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddarctopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddarctopoint">external documentation</a>.
 -spec addArcToPoint(This, X1, Y1, X2, Y2, R) -> ok when
 	This::wxGraphicsPath(), X1::number(), Y1::number(), X2::number(), Y2::number(), R::number().
 addArcToPoint(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,R)
@@ -87,7 +87,7 @@ addArcToPoint(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,R)
   wxe_util:cast(?wxGraphicsPath_AddArcToPoint,
   <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F,R:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcircle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddcircle">external documentation</a>.
 -spec addCircle(This, X, Y, R) -> ok when
 	This::wxGraphicsPath(), X::number(), Y::number(), R::number().
 addCircle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R)
@@ -96,7 +96,7 @@ addCircle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R)
   wxe_util:cast(?wxGraphicsPath_AddCircle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,R:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcurvetopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddcurvetopoint">external documentation</a>.
 -spec addCurveToPoint(This, C1, C2, E) -> ok when
 	This::wxGraphicsPath(), C1::{X::float(), Y::float()}, C2::{X::float(), Y::float()}, E::{X::float(), Y::float()}.
 addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{C1X,C1Y},{C2X,C2Y},{EX,EY})
@@ -105,7 +105,7 @@ addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},{C1X,C1Y},{C2X,C2Y},{EX,EY})
   wxe_util:cast(?wxGraphicsPath_AddCurveToPoint_3,
   <<ThisRef:32/?UI,0:32,C1X:64/?F,C1Y:64/?F,C2X:64/?F,C2Y:64/?F,EX:64/?F,EY:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddcurvetopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddcurvetopoint">external documentation</a>.
 -spec addCurveToPoint(This, Cx1, Cy1, Cx2, Cy2, X, Y) -> ok when
 	This::wxGraphicsPath(), Cx1::number(), Cy1::number(), Cx2::number(), Cy2::number(), X::number(), Y::number().
 addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx1,Cy1,Cx2,Cy2,X,Y)
@@ -114,7 +114,7 @@ addCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx1,Cy1,Cx2,Cy2,X,Y)
   wxe_util:cast(?wxGraphicsPath_AddCurveToPoint_6,
   <<ThisRef:32/?UI,0:32,Cx1:64/?F,Cy1:64/?F,Cx2:64/?F,Cy2:64/?F,X:64/?F,Y:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddellipse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddellipse">external documentation</a>.
 -spec addEllipse(This, X, Y, W, H) -> ok when
 	This::wxGraphicsPath(), X::number(), Y::number(), W::number(), H::number().
 addEllipse(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -123,7 +123,7 @@ addEllipse(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:cast(?wxGraphicsPath_AddEllipse,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddlinetopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddlinetopoint">external documentation</a>.
 -spec addLineToPoint(This, P) -> ok when
 	This::wxGraphicsPath(), P::{X::float(), Y::float()}.
 addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY})
@@ -132,7 +132,7 @@ addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},{PX,PY})
   wxe_util:cast(?wxGraphicsPath_AddLineToPoint_1,
   <<ThisRef:32/?UI,0:32,PX:64/?F,PY:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddlinetopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddlinetopoint">external documentation</a>.
 -spec addLineToPoint(This, X, Y) -> ok when
 	This::wxGraphicsPath(), X::number(), Y::number().
 addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -141,7 +141,7 @@ addLineToPoint(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxGraphicsPath_AddLineToPoint_2,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddpath">external documentation</a>.
 -spec addPath(This, Path) -> ok when
 	This::wxGraphicsPath(), Path::wxGraphicsPath().
 addPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) ->
@@ -150,7 +150,7 @@ addPath(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PathT,ref=PathRef}) ->
   wxe_util:cast(?wxGraphicsPath_AddPath,
   <<ThisRef:32/?UI,PathRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddquadcurvetopoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddquadcurvetopoint">external documentation</a>.
 -spec addQuadCurveToPoint(This, Cx, Cy, X, Y) -> ok when
 	This::wxGraphicsPath(), Cx::number(), Cy::number(), X::number(), Y::number().
 addQuadCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx,Cy,X,Y)
@@ -159,7 +159,7 @@ addQuadCurveToPoint(#wx_ref{type=ThisT,ref=ThisRef},Cx,Cy,X,Y)
   wxe_util:cast(?wxGraphicsPath_AddQuadCurveToPoint,
   <<ThisRef:32/?UI,0:32,Cx:64/?F,Cy:64/?F,X:64/?F,Y:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddrectangle">external documentation</a>.
 -spec addRectangle(This, X, Y, W, H) -> ok when
 	This::wxGraphicsPath(), X::number(), Y::number(), W::number(), H::number().
 addRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -168,7 +168,7 @@ addRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:cast(?wxGraphicsPath_AddRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathaddroundedrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathaddroundedrectangle">external documentation</a>.
 -spec addRoundedRectangle(This, X, Y, W, H, Radius) -> ok when
 	This::wxGraphicsPath(), X::number(), Y::number(), W::number(), H::number(), Radius::number().
 addRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius)
@@ -177,7 +177,7 @@ addRoundedRectangle(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H,Radius)
   wxe_util:cast(?wxGraphicsPath_AddRoundedRectangle,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F,W:64/?F,H:64/?F,Radius:64/?F>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathclosesubpath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathclosesubpath">external documentation</a>.
 -spec closeSubpath(This) -> ok when
 	This::wxGraphicsPath().
 closeSubpath(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -193,7 +193,7 @@ contains(This,C={CX,CY})
  when is_record(This, wx_ref),is_number(CX),is_number(CY) ->
   contains(This,C, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
 %% <br /> Also:<br />
 %% contains(This, C, [Option]) -> boolean() when<br />
 %% 	This::wxGraphicsPath(), C::{X::float(), Y::float()},<br />
@@ -218,7 +218,7 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},{CX,CY}, Options)
   wxe_util:call(?wxGraphicsPath_Contains_2,
   <<ThisRef:32/?UI,0:32,CX:64/?F,CY:64/?F, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathcontains">external documentation</a>.
 %%<br /> FillStyle = integer
 -spec contains(This, X, Y, [Option]) -> boolean() when
 	This::wxGraphicsPath(), X::number(), Y::number(),
@@ -232,7 +232,7 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
   wxe_util:call(?wxGraphicsPath_Contains_3,
   <<ThisRef:32/?UI,0:32,X:64/?F,Y:64/?F, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathgetbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathgetbox">external documentation</a>.
 -spec getBox(This) -> {X::float(), Y::float(), W::float(), H::float()} when
 	This::wxGraphicsPath().
 getBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -240,7 +240,7 @@ getBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsPath_GetBox,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathgetcurrentpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathgetcurrentpoint">external documentation</a>.
 -spec getCurrentPoint(This) -> {X::float(), Y::float()} when
 	This::wxGraphicsPath().
 getCurrentPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -248,7 +248,7 @@ getCurrentPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGraphicsPath_GetCurrentPoint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspath.html#wxgraphicspathtransform">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspath.html#wxgraphicspathtransform">external documentation</a>.
 -spec transform(This, Matrix) -> ok when
 	This::wxGraphicsPath(), Matrix::wxGraphicsMatrix:wxGraphicsMatrix().
 transform(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MatrixT,ref=MatrixRef}) ->
diff --git a/lib/wx/src/gen/wxGraphicsPen.erl b/lib/wx/src/gen/wxGraphicsPen.erl
index 76a59e6e2c..a7d0e80ac8 100644
--- a/lib/wx/src/gen/wxGraphicsPen.erl
+++ b/lib/wx/src/gen/wxGraphicsPen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicspen.html">wxGraphicsPen</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicspen.html">wxGraphicsPen</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGraphicsObject}
 %% </p>
diff --git a/lib/wx/src/gen/wxGraphicsRenderer.erl b/lib/wx/src/gen/wxGraphicsRenderer.erl
index 2b64f86182..10491fc8d7 100644
--- a/lib/wx/src/gen/wxGraphicsRenderer.erl
+++ b/lib/wx/src/gen/wxGraphicsRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html">wxGraphicsRenderer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html">wxGraphicsRenderer</a>.
 %% @type wxGraphicsRenderer().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -38,13 +38,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGraphicsRenderer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderergetdefaultrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderergetdefaultrenderer">external documentation</a>.
 -spec getDefaultRenderer() -> wxGraphicsRenderer().
 getDefaultRenderer() ->
   wxe_util:call(?wxGraphicsRenderer_GetDefaultRenderer,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatecontext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatecontext">external documentation</a>.
 -spec createContext(This, Dc) -> wxGraphicsContext:wxGraphicsContext() when
 	This::wxGraphicsRenderer(), Dc::wxWindowDC:wxWindowDC() | wxWindow:wxWindow().
 createContext(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
@@ -58,7 +58,7 @@ createContext(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:call(DcOP,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatepen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatepen">external documentation</a>.
 -spec createPen(This, Pen) -> wxGraphicsPen:wxGraphicsPen() when
 	This::wxGraphicsRenderer(), Pen::wxPen:wxPen().
 createPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
@@ -67,7 +67,7 @@ createPen(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PenT,ref=PenRef}) ->
   wxe_util:call(?wxGraphicsRenderer_CreatePen,
   <<ThisRef:32/?UI,PenRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatebrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatebrush">external documentation</a>.
 -spec createBrush(This, Brush) -> wxGraphicsBrush:wxGraphicsBrush() when
 	This::wxGraphicsRenderer(), Brush::wxBrush:wxBrush().
 createBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) ->
@@ -76,7 +76,7 @@ createBrush(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BrushT,ref=BrushRef}) -
   wxe_util:call(?wxGraphicsRenderer_CreateBrush,
   <<ThisRef:32/?UI,BrushRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatelineargradientbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatelineargradientbrush">external documentation</a>.
 -spec createLinearGradientBrush(This, X1, Y1, X2, Y2, C1, C2) -> wxGraphicsBrush:wxGraphicsBrush() when
 	This::wxGraphicsRenderer(), X1::number(), Y1::number(), X2::number(), Y2::number(), C1::wx:wx_colour(), C2::wx:wx_colour().
 createLinearGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,C1,C2)
@@ -85,7 +85,7 @@ createLinearGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},X1,Y1,X2,Y2,C1,C2)
   wxe_util:call(?wxGraphicsRenderer_CreateLinearGradientBrush,
   <<ThisRef:32/?UI,0:32,X1:64/?F,Y1:64/?F,X2:64/?F,Y2:64/?F,(wxe_util:colour_bin(C1)):16/binary,(wxe_util:colour_bin(C2)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreateradialgradientbrush">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreateradialgradientbrush">external documentation</a>.
 -spec createRadialGradientBrush(This, Xo, Yo, Xc, Yc, Radius, OColor, CColor) -> wxGraphicsBrush:wxGraphicsBrush() when
 	This::wxGraphicsRenderer(), Xo::number(), Yo::number(), Xc::number(), Yc::number(), Radius::number(), OColor::wx:wx_colour(), CColor::wx:wx_colour().
 createRadialGradientBrush(#wx_ref{type=ThisT,ref=ThisRef},Xo,Yo,Xc,Yc,Radius,OColor,CColor)
@@ -102,7 +102,7 @@ createFont(This,Font)
  when is_record(This, wx_ref),is_record(Font, wx_ref) ->
   createFont(This,Font, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatefont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatefont">external documentation</a>.
 -spec createFont(This, Font, [Option]) -> wxGraphicsFont:wxGraphicsFont() when
 	This::wxGraphicsRenderer(), Font::wxFont:wxFont(),
 	Option :: {col, wx:wx_colour()}.
@@ -124,7 +124,7 @@ createMatrix(This)
  when is_record(This, wx_ref) ->
   createMatrix(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatematrix">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatematrix">external documentation</a>.
 -spec createMatrix(This, [Option]) -> wxGraphicsMatrix:wxGraphicsMatrix() when
 	This::wxGraphicsRenderer(),
 	Option :: {a, number()}
@@ -147,7 +147,7 @@ createMatrix(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGraphicsRenderer_CreateMatrix,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatepath">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgraphicsrenderer.html#wxgraphicsrenderercreatepath">external documentation</a>.
 -spec createPath(This) -> wxGraphicsPath:wxGraphicsPath() when
 	This::wxGraphicsRenderer().
 createPath(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxGrid.erl b/lib/wx/src/gen/wxGrid.erl
index 2f4b45b1bc..f26765c7bf 100644
--- a/lib/wx/src/gen/wxGrid.erl
+++ b/lib/wx/src/gen/wxGrid.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html">wxGrid</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html">wxGrid</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxScrolledWindow}
 %% <br />{@link wxPanel}
@@ -112,13 +112,13 @@
   scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
   setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
   setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,
-  setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2,
-  setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,
-  setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,
-  setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,
-  setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
+  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,
+  setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,
+  setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
   setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
   setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
   setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
@@ -134,7 +134,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGrid() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
 -spec new() -> wxGrid().
 new() ->
   wxe_util:construct(?wxGrid_new_0,
@@ -148,7 +148,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Parent, Id, [Option]) -> wxGrid() when<br />
 %% 	Parent::wxWindow:wxWindow(), Id::integer(),<br />
@@ -178,7 +178,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxGrid_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridwxgrid">external documentation</a>.
 -spec new(Parent, X, Y, [Option]) -> wxGrid() when
 	Parent::wxWindow:wxWindow(), X::integer(), Y::integer(),
 	Option :: {w, integer()}
@@ -203,7 +203,7 @@ appendCols(This)
  when is_record(This, wx_ref) ->
   appendCols(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridappendcols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridappendcols">external documentation</a>.
 -spec appendCols(This, [Option]) -> boolean() when
 	This::wxGrid(),
 	Option :: {numCols, integer()}
@@ -226,7 +226,7 @@ appendRows(This)
  when is_record(This, wx_ref) ->
   appendRows(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridappendrows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridappendrows">external documentation</a>.
 -spec appendRows(This, [Option]) -> boolean() when
 	This::wxGrid(),
 	Option :: {numRows, integer()}
@@ -241,7 +241,7 @@ appendRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_AppendRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridautosize">external documentation</a>.
 -spec autoSize(This) -> ok when
 	This::wxGrid().
 autoSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -257,7 +257,7 @@ autoSizeColumn(This,Col)
  when is_record(This, wx_ref),is_integer(Col) ->
   autoSizeColumn(This,Col, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizecolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridautosizecolumn">external documentation</a>.
 -spec autoSizeColumn(This, Col, [Option]) -> ok when
 	This::wxGrid(), Col::integer(),
 	Option :: {setAsMin, boolean()}.
@@ -278,7 +278,7 @@ autoSizeColumns(This)
  when is_record(This, wx_ref) ->
   autoSizeColumns(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizecolumns">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridautosizecolumns">external documentation</a>.
 -spec autoSizeColumns(This, [Option]) -> ok when
 	This::wxGrid(),
 	Option :: {setAsMin, boolean()}.
@@ -299,7 +299,7 @@ autoSizeRow(This,Row)
  when is_record(This, wx_ref),is_integer(Row) ->
   autoSizeRow(This,Row, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizerow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridautosizerow">external documentation</a>.
 -spec autoSizeRow(This, Row, [Option]) -> ok when
 	This::wxGrid(), Row::integer(),
 	Option :: {setAsMin, boolean()}.
@@ -320,7 +320,7 @@ autoSizeRows(This)
  when is_record(This, wx_ref) ->
   autoSizeRows(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridautosizerows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridautosizerows">external documentation</a>.
 -spec autoSizeRows(This, [Option]) -> ok when
 	This::wxGrid(),
 	Option :: {setAsMin, boolean()}.
@@ -333,7 +333,7 @@ autoSizeRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_AutoSizeRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridbeginbatch">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridbeginbatch">external documentation</a>.
 -spec beginBatch(This) -> ok when
 	This::wxGrid().
 beginBatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -341,7 +341,7 @@ beginBatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_BeginBatch,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridblocktodevicerect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridblocktodevicerect">external documentation</a>.
 -spec blockToDeviceRect(This, TopLeft, BottomRight) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()}.
 blockToDeviceRect(#wx_ref{type=ThisT,ref=ThisRef},{TopLeftR,TopLeftC},{BottomRightR,BottomRightC})
@@ -350,7 +350,7 @@ blockToDeviceRect(#wx_ref{type=ThisT,ref=ThisRef},{TopLeftR,TopLeftC},{BottomRig
   wxe_util:call(?wxGrid_BlockToDeviceRect,
   <<ThisRef:32/?UI,TopLeftR:32/?UI,TopLeftC:32/?UI,BottomRightR:32/?UI,BottomRightC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcandragcolsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcandragcolsize">external documentation</a>.
 -spec canDragColSize(This) -> boolean() when
 	This::wxGrid().
 canDragColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -358,7 +358,7 @@ canDragColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_CanDragColSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcandragrowsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcandragrowsize">external documentation</a>.
 -spec canDragRowSize(This) -> boolean() when
 	This::wxGrid().
 canDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -366,7 +366,7 @@ canDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_CanDragRowSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcandraggridsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcandraggridsize">external documentation</a>.
 -spec canDragGridSize(This) -> boolean() when
 	This::wxGrid().
 canDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -374,7 +374,7 @@ canDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_CanDragGridSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcanenablecellcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcanenablecellcontrol">external documentation</a>.
 -spec canEnableCellControl(This) -> boolean() when
 	This::wxGrid().
 canEnableCellControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -382,7 +382,7 @@ canEnableCellControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_CanEnableCellControl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcelltorect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcelltorect">external documentation</a>.
 -spec cellToRect(This, Coords) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 cellToRect(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
@@ -391,7 +391,7 @@ cellToRect(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
   wxe_util:call(?wxGrid_CellToRect_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcelltorect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcelltorect">external documentation</a>.
 -spec cellToRect(This, Row, Col) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxGrid(), Row::integer(), Col::integer().
 cellToRect(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -400,7 +400,7 @@ cellToRect(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_CellToRect_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcleargrid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcleargrid">external documentation</a>.
 -spec clearGrid(This) -> ok when
 	This::wxGrid().
 clearGrid(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -408,7 +408,7 @@ clearGrid(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_ClearGrid,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridclearselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridclearselection">external documentation</a>.
 -spec clearSelection(This) -> ok when
 	This::wxGrid().
 clearSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -424,7 +424,7 @@ createGrid(This,NumRows,NumCols)
  when is_record(This, wx_ref),is_integer(NumRows),is_integer(NumCols) ->
   createGrid(This,NumRows,NumCols, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridcreategrid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridcreategrid">external documentation</a>.
 %%<br /> Selmode = ?wxGrid_wxGridSelectCells | ?wxGrid_wxGridSelectRows | ?wxGrid_wxGridSelectColumns
 -spec createGrid(This, NumRows, NumCols, [Option]) -> boolean() when
 	This::wxGrid(), NumRows::integer(), NumCols::integer(),
@@ -446,7 +446,7 @@ deleteCols(This)
  when is_record(This, wx_ref) ->
   deleteCols(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddeletecols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgriddeletecols">external documentation</a>.
 -spec deleteCols(This, [Option]) -> boolean() when
 	This::wxGrid(),
 	Option :: {pos, integer()}
@@ -471,7 +471,7 @@ deleteRows(This)
  when is_record(This, wx_ref) ->
   deleteRows(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddeleterows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgriddeleterows">external documentation</a>.
 -spec deleteRows(This, [Option]) -> boolean() when
 	This::wxGrid(),
 	Option :: {pos, integer()}
@@ -488,7 +488,7 @@ deleteRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_DeleteRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisablecelleditcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgriddisablecelleditcontrol">external documentation</a>.
 -spec disableCellEditControl(This) -> ok when
 	This::wxGrid().
 disableCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -496,7 +496,7 @@ disableCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_DisableCellEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisabledragcolsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgriddisabledragcolsize">external documentation</a>.
 -spec disableDragColSize(This) -> ok when
 	This::wxGrid().
 disableDragColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -504,7 +504,7 @@ disableDragColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_DisableDragColSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisabledraggridsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgriddisabledraggridsize">external documentation</a>.
 -spec disableDragGridSize(This) -> ok when
 	This::wxGrid().
 disableDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -512,7 +512,7 @@ disableDragGridSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_DisableDragGridSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgriddisabledragrowsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgriddisabledragrowsize">external documentation</a>.
 -spec disableDragRowSize(This) -> ok when
 	This::wxGrid().
 disableDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -528,7 +528,7 @@ enableCellEditControl(This)
  when is_record(This, wx_ref) ->
   enableCellEditControl(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenablecelleditcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridenablecelleditcontrol">external documentation</a>.
 -spec enableCellEditControl(This, [Option]) -> ok when
 	This::wxGrid(),
 	Option :: {enable, boolean()}.
@@ -549,7 +549,7 @@ enableDragColSize(This)
  when is_record(This, wx_ref) ->
   enableDragColSize(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenabledragcolsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridenabledragcolsize">external documentation</a>.
 -spec enableDragColSize(This, [Option]) -> ok when
 	This::wxGrid(),
 	Option :: {enable, boolean()}.
@@ -570,7 +570,7 @@ enableDragGridSize(This)
  when is_record(This, wx_ref) ->
   enableDragGridSize(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenabledraggridsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridenabledraggridsize">external documentation</a>.
 -spec enableDragGridSize(This, [Option]) -> ok when
 	This::wxGrid(),
 	Option :: {enable, boolean()}.
@@ -591,7 +591,7 @@ enableDragRowSize(This)
  when is_record(This, wx_ref) ->
   enableDragRowSize(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenabledragrowsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridenabledragrowsize">external documentation</a>.
 -spec enableDragRowSize(This, [Option]) -> ok when
 	This::wxGrid(),
 	Option :: {enable, boolean()}.
@@ -604,7 +604,7 @@ enableDragRowSize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_EnableDragRowSize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenableediting">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridenableediting">external documentation</a>.
 -spec enableEditing(This, Edit) -> ok when
 	This::wxGrid(), Edit::boolean().
 enableEditing(#wx_ref{type=ThisT,ref=ThisRef},Edit)
@@ -621,7 +621,7 @@ enableGridLines(This)
  when is_record(This, wx_ref) ->
   enableGridLines(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridenablegridlines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridenablegridlines">external documentation</a>.
 -spec enableGridLines(This, [Option]) -> ok when
 	This::wxGrid(),
 	Option :: {enable, boolean()}.
@@ -634,7 +634,7 @@ enableGridLines(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGrid_EnableGridLines,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridendbatch">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridendbatch">external documentation</a>.
 -spec endBatch(This) -> ok when
 	This::wxGrid().
 endBatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -642,7 +642,7 @@ endBatch(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_EndBatch,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridfit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridfit">external documentation</a>.
 -spec fit(This) -> ok when
 	This::wxGrid().
 fit(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -650,7 +650,7 @@ fit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_Fit,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridforcerefresh">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridforcerefresh">external documentation</a>.
 -spec forceRefresh(This) -> ok when
 	This::wxGrid().
 forceRefresh(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -658,7 +658,7 @@ forceRefresh(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_ForceRefresh,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetbatchcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetbatchcount">external documentation</a>.
 -spec getBatchCount(This) -> integer() when
 	This::wxGrid().
 getBatchCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -666,7 +666,7 @@ getBatchCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetBatchCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcellalignment">external documentation</a>.
 -spec getCellAlignment(This, Row, Col) -> {Horiz::integer(), Vert::integer()} when
 	This::wxGrid(), Row::integer(), Col::integer().
 getCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -675,7 +675,7 @@ getCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetCellAlignment,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcellbackgroundcolour">external documentation</a>.
 -spec getCellBackgroundColour(This, Row, Col) -> wx:wx_colour4() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -684,7 +684,7 @@ getCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetCellBackgroundColour,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcelleditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcelleditor">external documentation</a>.
 -spec getCellEditor(This, Row, Col) -> wxGridCellEditor:wxGridCellEditor() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getCellEditor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -693,7 +693,7 @@ getCellEditor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetCellEditor,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcellfont">external documentation</a>.
 -spec getCellFont(This, Row, Col) -> wxFont:wxFont() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getCellFont(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -702,7 +702,7 @@ getCellFont(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetCellFont,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcellrenderer">external documentation</a>.
 -spec getCellRenderer(This, Row, Col) -> wxGridCellRenderer:wxGridCellRenderer() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -711,7 +711,7 @@ getCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetCellRenderer,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcelltextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcelltextcolour">external documentation</a>.
 -spec getCellTextColour(This, Row, Col) -> wx:wx_colour4() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -720,7 +720,7 @@ getCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetCellTextColour,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>.
 -spec getCellValue(This, Coords) -> unicode:charlist() when
 	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 getCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
@@ -729,7 +729,7 @@ getCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
   wxe_util:call(?wxGrid_GetCellValue_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcellvalue">external documentation</a>.
 -spec getCellValue(This, Row, Col) -> unicode:charlist() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getCellValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -738,7 +738,7 @@ getCellValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetCellValue_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcollabelalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcollabelalignment">external documentation</a>.
 -spec getColLabelAlignment(This) -> {Horiz::integer(), Vert::integer()} when
 	This::wxGrid().
 getColLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -746,7 +746,7 @@ getColLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetColLabelAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcollabelsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcollabelsize">external documentation</a>.
 -spec getColLabelSize(This) -> integer() when
 	This::wxGrid().
 getColLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -754,7 +754,7 @@ getColLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetColLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcollabelvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcollabelvalue">external documentation</a>.
 -spec getColLabelValue(This, Col) -> unicode:charlist() when
 	This::wxGrid(), Col::integer().
 getColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -763,7 +763,7 @@ getColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:call(?wxGrid_GetColLabelValue,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetcolminimalacceptablewidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetcolminimalacceptablewidth">external documentation</a>.
 -spec getColMinimalAcceptableWidth(This) -> integer() when
 	This::wxGrid().
 getColMinimalAcceptableWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -771,7 +771,7 @@ getColMinimalAcceptableWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetColMinimalAcceptableWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcellalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultcellalignment">external documentation</a>.
 -spec getDefaultCellAlignment(This) -> {Horiz::integer(), Vert::integer()} when
 	This::wxGrid().
 getDefaultCellAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -779,7 +779,7 @@ getDefaultCellAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultCellAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcellbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultcellbackgroundcolour">external documentation</a>.
 -spec getDefaultCellBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxGrid().
 getDefaultCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -787,7 +787,7 @@ getDefaultCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultCellBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcellfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultcellfont">external documentation</a>.
 -spec getDefaultCellFont(This) -> wxFont:wxFont() when
 	This::wxGrid().
 getDefaultCellFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -795,7 +795,7 @@ getDefaultCellFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultCellFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcelltextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultcelltextcolour">external documentation</a>.
 -spec getDefaultCellTextColour(This) -> wx:wx_colour4() when
 	This::wxGrid().
 getDefaultCellTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -803,7 +803,7 @@ getDefaultCellTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultCellTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcollabelsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultcollabelsize">external documentation</a>.
 -spec getDefaultColLabelSize(This) -> integer() when
 	This::wxGrid().
 getDefaultColLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -811,7 +811,7 @@ getDefaultColLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultColLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultcolsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultcolsize">external documentation</a>.
 -spec getDefaultColSize(This) -> integer() when
 	This::wxGrid().
 getDefaultColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -819,7 +819,7 @@ getDefaultColSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultColSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaulteditor">external documentation</a>.
 -spec getDefaultEditor(This) -> wxGridCellEditor:wxGridCellEditor() when
 	This::wxGrid().
 getDefaultEditor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -827,7 +827,7 @@ getDefaultEditor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultEditor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditorforcell">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaulteditorforcell">external documentation</a>.
 -spec getDefaultEditorForCell(This, C) -> wxGridCellEditor:wxGridCellEditor() when
 	This::wxGrid(), C::{R::integer(), C::integer()}.
 getDefaultEditorForCell(#wx_ref{type=ThisT,ref=ThisRef},{CR,CC})
@@ -836,7 +836,7 @@ getDefaultEditorForCell(#wx_ref{type=ThisT,ref=ThisRef},{CR,CC})
   wxe_util:call(?wxGrid_GetDefaultEditorForCell_1,
   <<ThisRef:32/?UI,CR:32/?UI,CC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditorforcell">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaulteditorforcell">external documentation</a>.
 -spec getDefaultEditorForCell(This, Row, Col) -> wxGridCellEditor:wxGridCellEditor() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getDefaultEditorForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -845,7 +845,7 @@ getDefaultEditorForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetDefaultEditorForCell_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaulteditorfortype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaulteditorfortype">external documentation</a>.
 -spec getDefaultEditorForType(This, TypeName) -> wxGridCellEditor:wxGridCellEditor() when
 	This::wxGrid(), TypeName::unicode:chardata().
 getDefaultEditorForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
@@ -855,7 +855,7 @@ getDefaultEditorForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
   wxe_util:call(?wxGrid_GetDefaultEditorForType,
   <<ThisRef:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((0+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultrenderer">external documentation</a>.
 -spec getDefaultRenderer(This) -> wxGridCellRenderer:wxGridCellRenderer() when
 	This::wxGrid().
 getDefaultRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -863,7 +863,7 @@ getDefaultRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultRenderer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrendererforcell">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultrendererforcell">external documentation</a>.
 -spec getDefaultRendererForCell(This, Row, Col) -> wxGridCellRenderer:wxGridCellRenderer() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getDefaultRendererForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -872,7 +872,7 @@ getDefaultRendererForCell(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetDefaultRendererForCell,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrendererfortype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultrendererfortype">external documentation</a>.
 -spec getDefaultRendererForType(This, TypeName) -> wxGridCellRenderer:wxGridCellRenderer() when
 	This::wxGrid(), TypeName::unicode:chardata().
 getDefaultRendererForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
@@ -882,7 +882,7 @@ getDefaultRendererForType(#wx_ref{type=ThisT,ref=ThisRef},TypeName)
   wxe_util:call(?wxGrid_GetDefaultRendererForType,
   <<ThisRef:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((0+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrowlabelsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultrowlabelsize">external documentation</a>.
 -spec getDefaultRowLabelSize(This) -> integer() when
 	This::wxGrid().
 getDefaultRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -890,7 +890,7 @@ getDefaultRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultRowLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetdefaultrowsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetdefaultrowsize">external documentation</a>.
 -spec getDefaultRowSize(This) -> integer() when
 	This::wxGrid().
 getDefaultRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -898,7 +898,7 @@ getDefaultRowSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetDefaultRowSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcursorcol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetgridcursorcol">external documentation</a>.
 -spec getGridCursorCol(This) -> integer() when
 	This::wxGrid().
 getGridCursorCol(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -906,7 +906,7 @@ getGridCursorCol(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetGridCursorCol,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcursorrow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetgridcursorrow">external documentation</a>.
 -spec getGridCursorRow(This) -> integer() when
 	This::wxGrid().
 getGridCursorRow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -914,7 +914,7 @@ getGridCursorRow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetGridCursorRow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridlinecolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetgridlinecolour">external documentation</a>.
 -spec getGridLineColour(This) -> wx:wx_colour4() when
 	This::wxGrid().
 getGridLineColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -922,7 +922,7 @@ getGridLineColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetGridLineColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgridlinesenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgridlinesenabled">external documentation</a>.
 -spec gridLinesEnabled(This) -> boolean() when
 	This::wxGrid().
 gridLinesEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -930,7 +930,7 @@ gridLinesEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GridLinesEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabelbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetlabelbackgroundcolour">external documentation</a>.
 -spec getLabelBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxGrid().
 getLabelBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -938,7 +938,7 @@ getLabelBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetLabelBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabelfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetlabelfont">external documentation</a>.
 -spec getLabelFont(This) -> wxFont:wxFont() when
 	This::wxGrid().
 getLabelFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -946,7 +946,7 @@ getLabelFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetLabelFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetlabeltextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetlabeltextcolour">external documentation</a>.
 -spec getLabelTextColour(This) -> wx:wx_colour4() when
 	This::wxGrid().
 getLabelTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -954,7 +954,7 @@ getLabelTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetLabelTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetnumbercols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetnumbercols">external documentation</a>.
 -spec getNumberCols(This) -> integer() when
 	This::wxGrid().
 getNumberCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -962,7 +962,7 @@ getNumberCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetNumberCols,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetnumberrows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetnumberrows">external documentation</a>.
 -spec getNumberRows(This) -> integer() when
 	This::wxGrid().
 getNumberRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -970,7 +970,7 @@ getNumberRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetNumberRows,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetorcreatecellattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetorcreatecellattr">external documentation</a>.
 -spec getOrCreateCellAttr(This, Row, Col) -> wxGridCellAttr:wxGridCellAttr() when
 	This::wxGrid(), Row::integer(), Col::integer().
 getOrCreateCellAttr(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -979,7 +979,7 @@ getOrCreateCellAttr(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_GetOrCreateCellAttr,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowminimalacceptableheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetrowminimalacceptableheight">external documentation</a>.
 -spec getRowMinimalAcceptableHeight(This) -> integer() when
 	This::wxGrid().
 getRowMinimalAcceptableHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -987,7 +987,7 @@ getRowMinimalAcceptableHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetRowMinimalAcceptableHeight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowlabelalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetrowlabelalignment">external documentation</a>.
 -spec getRowLabelAlignment(This) -> {Horiz::integer(), Vert::integer()} when
 	This::wxGrid().
 getRowLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -995,7 +995,7 @@ getRowLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetRowLabelAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowlabelsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetrowlabelsize">external documentation</a>.
 -spec getRowLabelSize(This) -> integer() when
 	This::wxGrid().
 getRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1003,7 +1003,7 @@ getRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetRowLabelSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowlabelvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetrowlabelvalue">external documentation</a>.
 -spec getRowLabelValue(This, Row) -> unicode:charlist() when
 	This::wxGrid(), Row::integer().
 getRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row)
@@ -1012,7 +1012,7 @@ getRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row)
   wxe_util:call(?wxGrid_GetRowLabelValue,
   <<ThisRef:32/?UI,Row:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetrowsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetrowsize">external documentation</a>.
 -spec getRowSize(This, Row) -> integer() when
 	This::wxGrid(), Row::integer().
 getRowSize(#wx_ref{type=ThisT,ref=ThisRef},Row)
@@ -1021,7 +1021,7 @@ getRowSize(#wx_ref{type=ThisT,ref=ThisRef},Row)
   wxe_util:call(?wxGrid_GetRowSize,
   <<ThisRef:32/?UI,Row:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetscrolllinex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetscrolllinex">external documentation</a>.
 -spec getScrollLineX(This) -> integer() when
 	This::wxGrid().
 getScrollLineX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1029,7 +1029,7 @@ getScrollLineX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetScrollLineX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetscrollliney">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetscrollliney">external documentation</a>.
 -spec getScrollLineY(This) -> integer() when
 	This::wxGrid().
 getScrollLineY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1037,7 +1037,7 @@ getScrollLineY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetScrollLineY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectedcells">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetselectedcells">external documentation</a>.
 -spec getSelectedCells(This) -> [{R::integer(), C::integer()}] when
 	This::wxGrid().
 getSelectedCells(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1045,7 +1045,7 @@ getSelectedCells(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetSelectedCells,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectedcols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetselectedcols">external documentation</a>.
 -spec getSelectedCols(This) -> [integer()] when
 	This::wxGrid().
 getSelectedCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1053,7 +1053,7 @@ getSelectedCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetSelectedCols,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectedrows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetselectedrows">external documentation</a>.
 -spec getSelectedRows(This) -> [integer()] when
 	This::wxGrid().
 getSelectedRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1061,7 +1061,7 @@ getSelectedRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetSelectedRows,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetselectionbackground">external documentation</a>.
 -spec getSelectionBackground(This) -> wx:wx_colour4() when
 	This::wxGrid().
 getSelectionBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1069,7 +1069,7 @@ getSelectionBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetSelectionBackground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionblocktopleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetselectionblocktopleft">external documentation</a>.
 -spec getSelectionBlockTopLeft(This) -> [{R::integer(), C::integer()}] when
 	This::wxGrid().
 getSelectionBlockTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1077,7 +1077,7 @@ getSelectionBlockTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetSelectionBlockTopLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionblockbottomright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetselectionblockbottomright">external documentation</a>.
 -spec getSelectionBlockBottomRight(This) -> [{R::integer(), C::integer()}] when
 	This::wxGrid().
 getSelectionBlockBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1085,7 +1085,7 @@ getSelectionBlockBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetSelectionBlockBottomRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetselectionforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetselectionforeground">external documentation</a>.
 -spec getSelectionForeground(This) -> wx:wx_colour4() when
 	This::wxGrid().
 getSelectionForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1093,7 +1093,7 @@ getSelectionForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetSelectionForeground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetviewwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetviewwidth">external documentation</a>.
 -spec getViewWidth(This) -> integer() when
 	This::wxGrid().
 getViewWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1101,7 +1101,7 @@ getViewWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetViewWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetgridwindow">external documentation</a>.
 -spec getGridWindow(This) -> wxWindow:wxWindow() when
 	This::wxGrid().
 getGridWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1109,7 +1109,7 @@ getGridWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetGridWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridrowlabelwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetgridrowlabelwindow">external documentation</a>.
 -spec getGridRowLabelWindow(This) -> wxWindow:wxWindow() when
 	This::wxGrid().
 getGridRowLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1117,7 +1117,7 @@ getGridRowLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetGridRowLabelWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcollabelwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetgridcollabelwindow">external documentation</a>.
 -spec getGridColLabelWindow(This) -> wxWindow:wxWindow() when
 	This::wxGrid().
 getGridColLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1125,7 +1125,7 @@ getGridColLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetGridColLabelWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridgetgridcornerlabelwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridgetgridcornerlabelwindow">external documentation</a>.
 -spec getGridCornerLabelWindow(This) -> wxWindow:wxWindow() when
 	This::wxGrid().
 getGridCornerLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1133,7 +1133,7 @@ getGridCornerLabelWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_GetGridCornerLabelWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridhidecelleditcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridhidecelleditcontrol">external documentation</a>.
 -spec hideCellEditControl(This) -> ok when
 	This::wxGrid().
 hideCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1149,7 +1149,7 @@ insertCols(This)
  when is_record(This, wx_ref) ->
   insertCols(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridinsertcols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridinsertcols">external documentation</a>.
 -spec insertCols(This, [Option]) -> boolean() when
 	This::wxGrid(),
 	Option :: {pos, integer()}
@@ -1174,7 +1174,7 @@ insertRows(This)
  when is_record(This, wx_ref) ->
   insertRows(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridinsertrows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridinsertrows">external documentation</a>.
 -spec insertRows(This, [Option]) -> boolean() when
 	This::wxGrid(),
 	Option :: {pos, integer()}
@@ -1191,7 +1191,7 @@ insertRows(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxGrid_InsertRows,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridiscelleditcontrolenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridiscelleditcontrolenabled">external documentation</a>.
 -spec isCellEditControlEnabled(This) -> boolean() when
 	This::wxGrid().
 isCellEditControlEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1199,7 +1199,7 @@ isCellEditControlEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_IsCellEditControlEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridiscurrentcellreadonly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridiscurrentcellreadonly">external documentation</a>.
 -spec isCurrentCellReadOnly(This) -> boolean() when
 	This::wxGrid().
 isCurrentCellReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1207,7 +1207,7 @@ isCurrentCellReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_IsCurrentCellReadOnly,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridiseditable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridiseditable">external documentation</a>.
 -spec isEditable(This) -> boolean() when
 	This::wxGrid().
 isEditable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1215,7 +1215,7 @@ isEditable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_IsEditable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisinselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridisinselection">external documentation</a>.
 -spec isInSelection(This, Coords) -> boolean() when
 	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 isInSelection(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
@@ -1224,7 +1224,7 @@ isInSelection(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
   wxe_util:call(?wxGrid_IsInSelection_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisinselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridisinselection">external documentation</a>.
 -spec isInSelection(This, Row, Col) -> boolean() when
 	This::wxGrid(), Row::integer(), Col::integer().
 isInSelection(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -1233,7 +1233,7 @@ isInSelection(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_IsInSelection_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisreadonly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridisreadonly">external documentation</a>.
 -spec isReadOnly(This, Row, Col) -> boolean() when
 	This::wxGrid(), Row::integer(), Col::integer().
 isReadOnly(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -1242,7 +1242,7 @@ isReadOnly(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGrid_IsReadOnly,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridisselection">external documentation</a>.
 -spec isSelection(This) -> boolean() when
 	This::wxGrid().
 isSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1258,7 +1258,7 @@ isVisible(This,Coords={CoordsR,CoordsC})
  when is_record(This, wx_ref),is_integer(CoordsR),is_integer(CoordsC) ->
   isVisible(This,Coords, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridisvisible">external documentation</a>.
 %% <br /> Also:<br />
 %% isVisible(This, Coords, [Option]) -> boolean() when<br />
 %% 	This::wxGrid(), Coords::{R::integer(), C::integer()},<br />
@@ -1282,7 +1282,7 @@ isVisible(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC}, Options)
   wxe_util:call(?wxGrid_IsVisible_2,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridisvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridisvisible">external documentation</a>.
 -spec isVisible(This, Row, Col, [Option]) -> boolean() when
 	This::wxGrid(), Row::integer(), Col::integer(),
 	Option :: {wholeCellVisible, boolean()}.
@@ -1295,7 +1295,7 @@ isVisible(#wx_ref{type=ThisT,ref=ThisRef},Row,Col, Options)
   wxe_util:call(?wxGrid_IsVisible_3,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmakecellvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmakecellvisible">external documentation</a>.
 -spec makeCellVisible(This, Coords) -> ok when
 	This::wxGrid(), Coords::{R::integer(), C::integer()}.
 makeCellVisible(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
@@ -1304,7 +1304,7 @@ makeCellVisible(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC})
   wxe_util:cast(?wxGrid_MakeCellVisible_1,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmakecellvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmakecellvisible">external documentation</a>.
 -spec makeCellVisible(This, Row, Col) -> ok when
 	This::wxGrid(), Row::integer(), Col::integer().
 makeCellVisible(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -1313,7 +1313,7 @@ makeCellVisible(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:cast(?wxGrid_MakeCellVisible_2,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursordown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursordown">external documentation</a>.
 -spec moveCursorDown(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorDown(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1322,7 +1322,7 @@ moveCursorDown(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorDown,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursorleft">external documentation</a>.
 -spec moveCursorLeft(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorLeft(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1331,7 +1331,7 @@ moveCursorLeft(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorLeft,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursorright">external documentation</a>.
 -spec moveCursorRight(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorRight(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1340,7 +1340,7 @@ moveCursorRight(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorRight,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursorup">external documentation</a>.
 -spec moveCursorUp(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorUp(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1349,7 +1349,7 @@ moveCursorUp(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorUp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursordownblock">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursordownblock">external documentation</a>.
 -spec moveCursorDownBlock(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorDownBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1358,7 +1358,7 @@ moveCursorDownBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorDownBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorleftblock">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursorleftblock">external documentation</a>.
 -spec moveCursorLeftBlock(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorLeftBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1367,7 +1367,7 @@ moveCursorLeftBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorLeftBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorrightblock">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursorrightblock">external documentation</a>.
 -spec moveCursorRightBlock(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorRightBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1376,7 +1376,7 @@ moveCursorRightBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorRightBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovecursorupblock">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovecursorupblock">external documentation</a>.
 -spec moveCursorUpBlock(This, ExpandSelection) -> boolean() when
 	This::wxGrid(), ExpandSelection::boolean().
 moveCursorUpBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
@@ -1385,7 +1385,7 @@ moveCursorUpBlock(#wx_ref{type=ThisT,ref=ThisRef},ExpandSelection)
   wxe_util:call(?wxGrid_MoveCursorUpBlock,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ExpandSelection)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovepagedown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovepagedown">external documentation</a>.
 -spec movePageDown(This) -> boolean() when
 	This::wxGrid().
 movePageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1393,7 +1393,7 @@ movePageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_MovePageDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridmovepageup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridmovepageup">external documentation</a>.
 -spec movePageUp(This) -> boolean() when
 	This::wxGrid().
 movePageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1401,7 +1401,7 @@ movePageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGrid_MovePageUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridregisterdatatype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridregisterdatatype">external documentation</a>.
 -spec registerDataType(This, TypeName, Renderer, Editor) -> ok when
 	This::wxGrid(), TypeName::unicode:chardata(), Renderer::wxGridCellRenderer:wxGridCellRenderer(), Editor::wxGridCellEditor:wxGridCellEditor().
 registerDataType(#wx_ref{type=ThisT,ref=ThisRef},TypeName,#wx_ref{type=RendererT,ref=RendererRef},#wx_ref{type=EditorT,ref=EditorRef})
@@ -1413,7 +1413,7 @@ registerDataType(#wx_ref{type=ThisT,ref=ThisRef},TypeName,#wx_ref{type=RendererT
   wxe_util:cast(?wxGrid_RegisterDataType,
   <<ThisRef:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((0+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8,RendererRef:32/?UI,EditorRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsaveeditcontrolvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsaveeditcontrolvalue">external documentation</a>.
 -spec saveEditControlValue(This) -> ok when
 	This::wxGrid().
 saveEditControlValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1421,7 +1421,7 @@ saveEditControlValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGrid_SaveEditControlValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridselectall">external documentation</a>.
 -spec selectAll(This) -> ok when
 	This::wxGrid().
 selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1437,7 +1437,7 @@ selectBlock(This,TopLeft={TopLeftR,TopLeftC},BottomRight={BottomRightR,BottomRig
  when is_record(This, wx_ref),is_integer(TopLeftR),is_integer(TopLeftC),is_integer(BottomRightR),is_integer(BottomRightC) ->
   selectBlock(This,TopLeft,BottomRight, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectblock">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridselectblock">external documentation</a>.
 -spec selectBlock(This, TopLeft, BottomRight, [Option]) -> ok when
 	This::wxGrid(), TopLeft::{R::integer(), C::integer()}, BottomRight::{R::integer(), C::integer()},
 	Option :: {addToSelected, boolean()}.
@@ -1458,7 +1458,7 @@ selectBlock(This,TopRow,LeftCol,BottomRow,RightCol)
  when is_record(This, wx_ref),is_integer(TopRow),is_integer(LeftCol),is_integer(BottomRow),is_integer(RightCol) ->
   selectBlock(This,TopRow,LeftCol,BottomRow,RightCol, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectblock">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridselectblock">external documentation</a>.
 -spec selectBlock(This, TopRow, LeftCol, BottomRow, RightCol, [Option]) -> ok when
 	This::wxGrid(), TopRow::integer(), LeftCol::integer(), BottomRow::integer(), RightCol::integer(),
 	Option :: {addToSelected, boolean()}.
@@ -1479,7 +1479,7 @@ selectCol(This,Col)
  when is_record(This, wx_ref),is_integer(Col) ->
   selectCol(This,Col, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectcol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridselectcol">external documentation</a>.
 -spec selectCol(This, Col, [Option]) -> ok when
 	This::wxGrid(), Col::integer(),
 	Option :: {addToSelected, boolean()}.
@@ -1500,7 +1500,7 @@ selectRow(This,Row)
  when is_record(This, wx_ref),is_integer(Row) ->
   selectRow(This,Row, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridselectrow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridselectrow">external documentation</a>.
 -spec selectRow(This, Row, [Option]) -> ok when
 	This::wxGrid(), Row::integer(),
 	Option :: {addToSelected, boolean()}.
@@ -1513,7 +1513,7 @@ selectRow(#wx_ref{type=ThisT,ref=ThisRef},Row, Options)
   wxe_util:cast(?wxGrid_SelectRow,
   <<ThisRef:32/?UI,Row:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
 -spec setCellAlignment(This, Align) -> ok when
 	This::wxGrid(), Align::integer().
 setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align)
@@ -1522,7 +1522,7 @@ setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align)
   wxe_util:cast(?wxGrid_SetCellAlignment_1,
   <<ThisRef:32/?UI,Align:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
 -spec setCellAlignment(This, Align, Row, Col) -> ok when
 	This::wxGrid(), Align::integer(), Row::integer(), Col::integer().
 setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align,Row,Col)
@@ -1531,7 +1531,7 @@ setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align,Row,Col)
   wxe_util:cast(?wxGrid_SetCellAlignment_3,
   <<ThisRef:32/?UI,Align:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellalignment">external documentation</a>.
 -spec setCellAlignment(This, Row, Col, Horiz, Vert) -> ok when
 	This::wxGrid(), Row::integer(), Col::integer(), Horiz::integer(), Vert::integer().
 setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,Horiz,Vert)
@@ -1540,7 +1540,7 @@ setCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,Horiz,Vert)
   wxe_util:cast(?wxGrid_SetCellAlignment_4,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellbackgroundcolour">external documentation</a>.
 -spec setCellBackgroundColour(This, Col) -> ok when
 	This::wxGrid(), Col::wx:wx_colour().
 setCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -1549,7 +1549,7 @@ setCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxGrid_SetCellBackgroundColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellbackgroundcolour">external documentation</a>.
 %% <br /> Also:<br />
 %% setCellBackgroundColour(This, Colour, Row, Col) -> ok when<br />
 %% 	This::wxGrid(), Colour::wx:wx_colour(), Row::integer(), Col::integer().<br />
@@ -1569,7 +1569,7 @@ setCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour,Row,Col)
   wxe_util:cast(?wxGrid_SetCellBackgroundColour_3_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcelleditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcelleditor">external documentation</a>.
 -spec setCellEditor(This, Row, Col, Editor) -> ok when
 	This::wxGrid(), Row::integer(), Col::integer(), Editor::wxGridCellEditor:wxGridCellEditor().
 setCellEditor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=EditorT,ref=EditorRef})
@@ -1579,7 +1579,7 @@ setCellEditor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=EditorT,ref=E
   wxe_util:cast(?wxGrid_SetCellEditor,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,EditorRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellfont">external documentation</a>.
 -spec setCellFont(This, Row, Col, Val) -> ok when
 	This::wxGrid(), Row::integer(), Col::integer(), Val::wxFont:wxFont().
 setCellFont(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=ValT,ref=ValRef})
@@ -1589,7 +1589,7 @@ setCellFont(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=ValT,ref=ValRef
   wxe_util:cast(?wxGrid_SetCellFont,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,ValRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellrenderer">external documentation</a>.
 -spec setCellRenderer(This, Row, Col, Renderer) -> ok when
 	This::wxGrid(), Row::integer(), Col::integer(), Renderer::wxGridCellRenderer:wxGridCellRenderer().
 setCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=RendererT,ref=RendererRef})
@@ -1599,7 +1599,7 @@ setCellRenderer(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=RendererT,r
   wxe_util:cast(?wxGrid_SetCellRenderer,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,RendererRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcelltextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcelltextcolour">external documentation</a>.
 -spec setCellTextColour(This, Col) -> ok when
 	This::wxGrid(), Col::wx:wx_colour().
 setCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -1608,7 +1608,7 @@ setCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxGrid_SetCellTextColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcelltextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcelltextcolour">external documentation</a>.
 %% <br /> Also:<br />
 %% setCellTextColour(This, Val, Row, Col) -> ok when<br />
 %% 	This::wxGrid(), Val::wx:wx_colour(), Row::integer(), Col::integer().<br />
@@ -1628,7 +1628,7 @@ setCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val,Row,Col)
   wxe_util:cast(?wxGrid_SetCellTextColour_3_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>.
 -spec setCellValue(This, Coords, S) -> ok when
 	This::wxGrid(), Coords::{R::integer(), C::integer()}, S::unicode:chardata().
 setCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC},S)
@@ -1638,7 +1638,7 @@ setCellValue(#wx_ref{type=ThisT,ref=ThisRef},{CoordsR,CoordsC},S)
   wxe_util:cast(?wxGrid_SetCellValue_2,
   <<ThisRef:32/?UI,CoordsR:32/?UI,CoordsC:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcellvalue">external documentation</a>.
 %% <br /> Also:<br />
 %% setCellValue(This, Val, Row, Col) -> ok when<br />
 %% 	This::wxGrid(), Val::unicode:chardata(), Row::integer(), Col::integer().<br />
@@ -1660,7 +1660,7 @@ setCellValue(#wx_ref{type=ThisT,ref=ThisRef},Val,Row,Col)
   wxe_util:cast(?wxGrid_SetCellValue_3_1,
   <<ThisRef:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((0+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolattr">external documentation</a>.
 -spec setColAttr(This, Col, Attr) -> ok when
 	This::wxGrid(), Col::integer(), Attr::wxGridCellAttr:wxGridCellAttr().
 setColAttr(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=AttrT,ref=AttrRef})
@@ -1670,7 +1670,7 @@ setColAttr(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=AttrT,ref=AttrRef})
   wxe_util:cast(?wxGrid_SetColAttr,
   <<ThisRef:32/?UI,Col:32/?UI,AttrRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatbool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolformatbool">external documentation</a>.
 -spec setColFormatBool(This, Col) -> ok when
 	This::wxGrid(), Col::integer().
 setColFormatBool(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -1679,7 +1679,7 @@ setColFormatBool(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxGrid_SetColFormatBool,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatnumber">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolformatnumber">external documentation</a>.
 -spec setColFormatNumber(This, Col) -> ok when
 	This::wxGrid(), Col::integer().
 setColFormatNumber(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -1696,7 +1696,7 @@ setColFormatFloat(This,Col)
  when is_record(This, wx_ref),is_integer(Col) ->
   setColFormatFloat(This,Col, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatfloat">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolformatfloat">external documentation</a>.
 -spec setColFormatFloat(This, Col, [Option]) -> ok when
 	This::wxGrid(), Col::integer(),
 	Option :: {width, integer()}
@@ -1711,7 +1711,7 @@ setColFormatFloat(#wx_ref{type=ThisT,ref=ThisRef},Col, Options)
   wxe_util:cast(?wxGrid_SetColFormatFloat,
   <<ThisRef:32/?UI,Col:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolformatcustom">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolformatcustom">external documentation</a>.
 -spec setColFormatCustom(This, Col, TypeName) -> ok when
 	This::wxGrid(), Col::integer(), TypeName::unicode:chardata().
 setColFormatCustom(#wx_ref{type=ThisT,ref=ThisRef},Col,TypeName)
@@ -1721,7 +1721,7 @@ setColFormatCustom(#wx_ref{type=ThisT,ref=ThisRef},Col,TypeName)
   wxe_util:cast(?wxGrid_SetColFormatCustom,
   <<ThisRef:32/?UI,Col:32/?UI,(byte_size(TypeName_UC)):32/?UI,(TypeName_UC)/binary, 0:(((8- ((4+byte_size(TypeName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcollabelalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcollabelalignment">external documentation</a>.
 -spec setColLabelAlignment(This, Horiz, Vert) -> ok when
 	This::wxGrid(), Horiz::integer(), Vert::integer().
 setColLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
@@ -1730,7 +1730,7 @@ setColLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
   wxe_util:cast(?wxGrid_SetColLabelAlignment,
   <<ThisRef:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcollabelsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcollabelsize">external documentation</a>.
 -spec setColLabelSize(This, Height) -> ok when
 	This::wxGrid(), Height::integer().
 setColLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Height)
@@ -1739,7 +1739,7 @@ setColLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Height)
   wxe_util:cast(?wxGrid_SetColLabelSize,
   <<ThisRef:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcollabelvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcollabelvalue">external documentation</a>.
 -spec setColLabelValue(This, Col, Val) -> ok when
 	This::wxGrid(), Col::integer(), Val::unicode:chardata().
 setColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col,Val)
@@ -1749,7 +1749,7 @@ setColLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Col,Val)
   wxe_util:cast(?wxGrid_SetColLabelValue,
   <<ThisRef:32/?UI,Col:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((4+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolminimalwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolminimalwidth">external documentation</a>.
 -spec setColMinimalWidth(This, Col, Width) -> ok when
 	This::wxGrid(), Col::integer(), Width::integer().
 setColMinimalWidth(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
@@ -1758,7 +1758,7 @@ setColMinimalWidth(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
   wxe_util:cast(?wxGrid_SetColMinimalWidth,
   <<ThisRef:32/?UI,Col:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolminimalacceptablewidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolminimalacceptablewidth">external documentation</a>.
 -spec setColMinimalAcceptableWidth(This, Width) -> ok when
 	This::wxGrid(), Width::integer().
 setColMinimalAcceptableWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
@@ -1767,7 +1767,7 @@ setColMinimalAcceptableWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
   wxe_util:cast(?wxGrid_SetColMinimalAcceptableWidth,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetcolsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetcolsize">external documentation</a>.
 -spec setColSize(This, Col, Width) -> ok when
 	This::wxGrid(), Col::integer(), Width::integer().
 setColSize(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
@@ -1776,7 +1776,7 @@ setColSize(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
   wxe_util:cast(?wxGrid_SetColSize,
   <<ThisRef:32/?UI,Col:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcellalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaultcellalignment">external documentation</a>.
 -spec setDefaultCellAlignment(This, Horiz, Vert) -> ok when
 	This::wxGrid(), Horiz::integer(), Vert::integer().
 setDefaultCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
@@ -1785,7 +1785,7 @@ setDefaultCellAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
   wxe_util:cast(?wxGrid_SetDefaultCellAlignment,
   <<ThisRef:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcellbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaultcellbackgroundcolour">external documentation</a>.
 -spec setDefaultCellBackgroundColour(This, Val) -> ok when
 	This::wxGrid(), Val::wx:wx_colour().
 setDefaultCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
@@ -1794,7 +1794,7 @@ setDefaultCellBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
   wxe_util:cast(?wxGrid_SetDefaultCellBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcellfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaultcellfont">external documentation</a>.
 -spec setDefaultCellFont(This, Val) -> ok when
 	This::wxGrid(), Val::wxFont:wxFont().
 setDefaultCellFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ValT,ref=ValRef}) ->
@@ -1803,7 +1803,7 @@ setDefaultCellFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ValT,ref=ValRef}
   wxe_util:cast(?wxGrid_SetDefaultCellFont,
   <<ThisRef:32/?UI,ValRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcelltextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaultcelltextcolour">external documentation</a>.
 -spec setDefaultCellTextColour(This, Val) -> ok when
 	This::wxGrid(), Val::wx:wx_colour().
 setDefaultCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
@@ -1812,7 +1812,7 @@ setDefaultCellTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
   wxe_util:cast(?wxGrid_SetDefaultCellTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaulteditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaulteditor">external documentation</a>.
 -spec setDefaultEditor(This, Editor) -> ok when
 	This::wxGrid(), Editor::wxGridCellEditor:wxGridCellEditor().
 setDefaultEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EditorT,ref=EditorRef}) ->
@@ -1821,7 +1821,7 @@ setDefaultEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EditorT,ref=Editor
   wxe_util:cast(?wxGrid_SetDefaultEditor,
   <<ThisRef:32/?UI,EditorRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaultrenderer">external documentation</a>.
 -spec setDefaultRenderer(This, Renderer) -> ok when
 	This::wxGrid(), Renderer::wxGridCellRenderer:wxGridCellRenderer().
 setDefaultRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RendererT,ref=RendererRef}) ->
@@ -1838,7 +1838,7 @@ setDefaultColSize(This,Width)
  when is_record(This, wx_ref),is_integer(Width) ->
   setDefaultColSize(This,Width, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultcolsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaultcolsize">external documentation</a>.
 -spec setDefaultColSize(This, Width, [Option]) -> ok when
 	This::wxGrid(), Width::integer(),
 	Option :: {resizeExistingCols, boolean()}.
@@ -1859,7 +1859,7 @@ setDefaultRowSize(This,Height)
  when is_record(This, wx_ref),is_integer(Height) ->
   setDefaultRowSize(This,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetdefaultrowsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetdefaultrowsize">external documentation</a>.
 -spec setDefaultRowSize(This, Height, [Option]) -> ok when
 	This::wxGrid(), Height::integer(),
 	Option :: {resizeExistingRows, boolean()}.
@@ -1872,7 +1872,7 @@ setDefaultRowSize(#wx_ref{type=ThisT,ref=ThisRef},Height, Options)
   wxe_util:cast(?wxGrid_SetDefaultRowSize,
   <<ThisRef:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetgridcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetgridcursor">external documentation</a>.
 -spec setGridCursor(This, Row, Col) -> ok when
 	This::wxGrid(), Row::integer(), Col::integer().
 setGridCursor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -1881,7 +1881,7 @@ setGridCursor(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:cast(?wxGrid_SetGridCursor,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetgridlinecolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetgridlinecolour">external documentation</a>.
 -spec setGridLineColour(This, Val) -> ok when
 	This::wxGrid(), Val::wx:wx_colour().
 setGridLineColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
@@ -1890,7 +1890,7 @@ setGridLineColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
   wxe_util:cast(?wxGrid_SetGridLineColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetlabelbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetlabelbackgroundcolour">external documentation</a>.
 -spec setLabelBackgroundColour(This, Val) -> ok when
 	This::wxGrid(), Val::wx:wx_colour().
 setLabelBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
@@ -1899,7 +1899,7 @@ setLabelBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
   wxe_util:cast(?wxGrid_SetLabelBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetlabelfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetlabelfont">external documentation</a>.
 -spec setLabelFont(This, Val) -> ok when
 	This::wxGrid(), Val::wxFont:wxFont().
 setLabelFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ValT,ref=ValRef}) ->
@@ -1908,7 +1908,7 @@ setLabelFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ValT,ref=ValRef}) ->
   wxe_util:cast(?wxGrid_SetLabelFont,
   <<ThisRef:32/?UI,ValRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetlabeltextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetlabeltextcolour">external documentation</a>.
 -spec setLabelTextColour(This, Val) -> ok when
 	This::wxGrid(), Val::wx:wx_colour().
 setLabelTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
@@ -1917,7 +1917,7 @@ setLabelTextColour(#wx_ref{type=ThisT,ref=ThisRef},Val)
   wxe_util:cast(?wxGrid_SetLabelTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Val)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetmargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetmargins">external documentation</a>.
 -spec setMargins(This, ExtraWidth, ExtraHeight) -> ok when
 	This::wxGrid(), ExtraWidth::integer(), ExtraHeight::integer().
 setMargins(#wx_ref{type=ThisT,ref=ThisRef},ExtraWidth,ExtraHeight)
@@ -1934,7 +1934,7 @@ setReadOnly(This,Row,Col)
  when is_record(This, wx_ref),is_integer(Row),is_integer(Col) ->
   setReadOnly(This,Row,Col, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetreadonly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetreadonly">external documentation</a>.
 -spec setReadOnly(This, Row, Col, [Option]) -> ok when
 	This::wxGrid(), Row::integer(), Col::integer(),
 	Option :: {isReadOnly, boolean()}.
@@ -1947,7 +1947,7 @@ setReadOnly(#wx_ref{type=ThisT,ref=ThisRef},Row,Col, Options)
   wxe_util:cast(?wxGrid_SetReadOnly,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetrowattr">external documentation</a>.
 -spec setRowAttr(This, Row, Attr) -> ok when
 	This::wxGrid(), Row::integer(), Attr::wxGridCellAttr:wxGridCellAttr().
 setRowAttr(#wx_ref{type=ThisT,ref=ThisRef},Row,#wx_ref{type=AttrT,ref=AttrRef})
@@ -1957,7 +1957,7 @@ setRowAttr(#wx_ref{type=ThisT,ref=ThisRef},Row,#wx_ref{type=AttrT,ref=AttrRef})
   wxe_util:cast(?wxGrid_SetRowAttr,
   <<ThisRef:32/?UI,Row:32/?UI,AttrRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowlabelalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetrowlabelalignment">external documentation</a>.
 -spec setRowLabelAlignment(This, Horiz, Vert) -> ok when
 	This::wxGrid(), Horiz::integer(), Vert::integer().
 setRowLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
@@ -1966,7 +1966,7 @@ setRowLabelAlignment(#wx_ref{type=ThisT,ref=ThisRef},Horiz,Vert)
   wxe_util:cast(?wxGrid_SetRowLabelAlignment,
   <<ThisRef:32/?UI,Horiz:32/?UI,Vert:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowlabelsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetrowlabelsize">external documentation</a>.
 -spec setRowLabelSize(This, Width) -> ok when
 	This::wxGrid(), Width::integer().
 setRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Width)
@@ -1975,7 +1975,7 @@ setRowLabelSize(#wx_ref{type=ThisT,ref=ThisRef},Width)
   wxe_util:cast(?wxGrid_SetRowLabelSize,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowlabelvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetrowlabelvalue">external documentation</a>.
 -spec setRowLabelValue(This, Row, Val) -> ok when
 	This::wxGrid(), Row::integer(), Val::unicode:chardata().
 setRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Val)
@@ -1985,7 +1985,7 @@ setRowLabelValue(#wx_ref{type=ThisT,ref=ThisRef},Row,Val)
   wxe_util:cast(?wxGrid_SetRowLabelValue,
   <<ThisRef:32/?UI,Row:32/?UI,(byte_size(Val_UC)):32/?UI,(Val_UC)/binary, 0:(((8- ((4+byte_size(Val_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowminimalheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetrowminimalheight">external documentation</a>.
 -spec setRowMinimalHeight(This, Row, Width) -> ok when
 	This::wxGrid(), Row::integer(), Width::integer().
 setRowMinimalHeight(#wx_ref{type=ThisT,ref=ThisRef},Row,Width)
@@ -1994,7 +1994,7 @@ setRowMinimalHeight(#wx_ref{type=ThisT,ref=ThisRef},Row,Width)
   wxe_util:cast(?wxGrid_SetRowMinimalHeight,
   <<ThisRef:32/?UI,Row:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowminimalacceptableheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetrowminimalacceptableheight">external documentation</a>.
 -spec setRowMinimalAcceptableHeight(This, Width) -> ok when
 	This::wxGrid(), Width::integer().
 setRowMinimalAcceptableHeight(#wx_ref{type=ThisT,ref=ThisRef},Width)
@@ -2003,7 +2003,7 @@ setRowMinimalAcceptableHeight(#wx_ref{type=ThisT,ref=ThisRef},Width)
   wxe_util:cast(?wxGrid_SetRowMinimalAcceptableHeight,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetrowsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetrowsize">external documentation</a>.
 -spec setRowSize(This, Row, Height) -> ok when
 	This::wxGrid(), Row::integer(), Height::integer().
 setRowSize(#wx_ref{type=ThisT,ref=ThisRef},Row,Height)
@@ -2012,7 +2012,7 @@ setRowSize(#wx_ref{type=ThisT,ref=ThisRef},Row,Height)
   wxe_util:cast(?wxGrid_SetRowSize,
   <<ThisRef:32/?UI,Row:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetscrolllinex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetscrolllinex">external documentation</a>.
 -spec setScrollLineX(This, X) -> ok when
 	This::wxGrid(), X::integer().
 setScrollLineX(#wx_ref{type=ThisT,ref=ThisRef},X)
@@ -2021,7 +2021,7 @@ setScrollLineX(#wx_ref{type=ThisT,ref=ThisRef},X)
   wxe_util:cast(?wxGrid_SetScrollLineX,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetscrollliney">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetscrollliney">external documentation</a>.
 -spec setScrollLineY(This, Y) -> ok when
 	This::wxGrid(), Y::integer().
 setScrollLineY(#wx_ref{type=ThisT,ref=ThisRef},Y)
@@ -2030,7 +2030,7 @@ setScrollLineY(#wx_ref{type=ThisT,ref=ThisRef},Y)
   wxe_util:cast(?wxGrid_SetScrollLineY,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetselectionbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetselectionbackground">external documentation</a>.
 -spec setSelectionBackground(This, C) -> ok when
 	This::wxGrid(), C::wx:wx_colour().
 setSelectionBackground(#wx_ref{type=ThisT,ref=ThisRef},C)
@@ -2039,7 +2039,7 @@ setSelectionBackground(#wx_ref{type=ThisT,ref=ThisRef},C)
   wxe_util:cast(?wxGrid_SetSelectionBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(C)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetselectionforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetselectionforeground">external documentation</a>.
 -spec setSelectionForeground(This, C) -> ok when
 	This::wxGrid(), C::wx:wx_colour().
 setSelectionForeground(#wx_ref{type=ThisT,ref=ThisRef},C)
@@ -2048,7 +2048,7 @@ setSelectionForeground(#wx_ref{type=ThisT,ref=ThisRef},C)
   wxe_util:cast(?wxGrid_SetSelectionForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(C)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridsetselectionmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridsetselectionmode">external documentation</a>.
 %%<br /> Selmode = ?wxGrid_wxGridSelectCells | ?wxGrid_wxGridSelectRows | ?wxGrid_wxGridSelectColumns
 -spec setSelectionMode(This, Selmode) -> ok when
 	This::wxGrid(), Selmode::wx:wx_enum().
@@ -2058,7 +2058,7 @@ setSelectionMode(#wx_ref{type=ThisT,ref=ThisRef},Selmode)
   wxe_util:cast(?wxGrid_SetSelectionMode,
   <<ThisRef:32/?UI,Selmode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridshowcelleditcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridshowcelleditcontrol">external documentation</a>.
 -spec showCellEditControl(This) -> ok when
 	This::wxGrid().
 showCellEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2074,7 +2074,7 @@ xToCol(This,X)
  when is_record(This, wx_ref),is_integer(X) ->
   xToCol(This,X, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridxtocol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridxtocol">external documentation</a>.
 -spec xToCol(This, X, [Option]) -> integer() when
 	This::wxGrid(), X::integer(),
 	Option :: {clipToMinMax, boolean()}.
@@ -2087,7 +2087,7 @@ xToCol(#wx_ref{type=ThisT,ref=ThisRef},X, Options)
   wxe_util:call(?wxGrid_XToCol,
   <<ThisRef:32/?UI,X:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridxtoedgeofcol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridxtoedgeofcol">external documentation</a>.
 -spec xToEdgeOfCol(This, X) -> integer() when
 	This::wxGrid(), X::integer().
 xToEdgeOfCol(#wx_ref{type=ThisT,ref=ThisRef},X)
@@ -2096,7 +2096,7 @@ xToEdgeOfCol(#wx_ref{type=ThisT,ref=ThisRef},X)
   wxe_util:call(?wxGrid_XToEdgeOfCol,
   <<ThisRef:32/?UI,X:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridytoedgeofrow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridytoedgeofrow">external documentation</a>.
 -spec yToEdgeOfRow(This, Y) -> integer() when
 	This::wxGrid(), Y::integer().
 yToEdgeOfRow(#wx_ref{type=ThisT,ref=ThisRef},Y)
@@ -2105,7 +2105,7 @@ yToEdgeOfRow(#wx_ref{type=ThisT,ref=ThisRef},Y)
   wxe_util:call(?wxGrid_YToEdgeOfRow,
   <<ThisRef:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgrid.html#wxgridytorow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgrid.html#wxgridytorow">external documentation</a>.
 -spec yToRow(This, Y) -> integer() when
 	This::wxGrid(), Y::integer().
 yToRow(#wx_ref{type=ThisT,ref=ThisRef},Y)
@@ -2151,6 +2151,8 @@ calcScrolledPosition(This,X,Y) -> wxScrolledWindow:calcScrolledPosition(This,X,Y
 calcScrolledPosition(This,Pt) -> wxScrolledWindow:calcScrolledPosition(This,Pt).
  %% From wxPanel
 %% @hidden
+setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
+%% @hidden
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
diff --git a/lib/wx/src/gen/wxGridBagSizer.erl b/lib/wx/src/gen/wxGridBagSizer.erl
index e8a9ff6d76..75bef85d90 100644
--- a/lib/wx/src/gen/wxGridBagSizer.erl
+++ b/lib/wx/src/gen/wxGridBagSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html">wxGridBagSizer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html">wxGridBagSizer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxFlexGridSizer}
 %% <br />{@link wxGridSizer}
@@ -62,7 +62,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerwxgridbagsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizerwxgridbagsizer">external documentation</a>.
 -spec new([Option]) -> wxGridBagSizer() when
 	Option :: {vgap, integer()}
 		 | {hgap, integer()}.
@@ -75,7 +75,7 @@ new(Options)
   wxe_util:construct(?wxGridBagSizer_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
 -spec add(This, Item) -> wxSizerItem:wxSizerItem() when
 	This::wxGridBagSizer(), Item::wxSizerItem:wxSizerItem() | wxGBSizerItem:wxGBSizerItem().
 add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
@@ -89,7 +89,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(ItemOP,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
 %% <br /> Also:<br />
 %% add(This, Window, Pos) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()};<br />
@@ -136,7 +136,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Options
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
 %% <br /> Also:<br />
 %% add(This, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxGridBagSizer(), Width::integer(), Height::integer(),<br />
@@ -198,7 +198,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},{PosR,Po
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,PosR:32/?UI,PosC:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizeradd">external documentation</a>.
 -spec add(This, Width, Height, Pos, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxGridBagSizer(), Width::integer(), Height::integer(), Pos::{R::integer(), C::integer()},
 	Option :: {span, {RS::integer(), CS::integer()}}
@@ -217,7 +217,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,{PosR,PosC}, Options)
   wxe_util:call(?wxGridBagSizer_Add_4,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI,PosR:32/?UI,PosC:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizercalcmin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizercalcmin">external documentation</a>.
 -spec calcMin(This) -> {W::integer(), H::integer()} when
 	This::wxGridBagSizer().
 calcMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -233,7 +233,7 @@ checkForIntersection(This,Item)
  when is_record(This, wx_ref),is_record(Item, wx_ref) ->
   checkForIntersection(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizercheckforintersection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizercheckforintersection">external documentation</a>.
 %% <br /> Also:<br />
 %% checkForIntersection(This, Item, [Option]) -> boolean() when<br />
 %% 	This::wxGridBagSizer(), Item::wxGBSizerItem:wxGBSizerItem(),<br />
@@ -258,7 +258,7 @@ checkForIntersection(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=Item
   wxe_util:call(?wxGridBagSizer_CheckForIntersection_2,
   <<ThisRef:32/?UI,ItemRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizercheckforintersection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizercheckforintersection">external documentation</a>.
 -spec checkForIntersection(This, Pos, Span, [Option]) -> boolean() when
 	This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}, Span::{RS::integer(), CS::integer()},
 	Option :: {excludeItem, wxGBSizerItem:wxGBSizerItem()}.
@@ -271,7 +271,7 @@ checkForIntersection(#wx_ref{type=ThisT,ref=ThisRef},{PosR,PosC},{SpanRS,SpanCS}
   wxe_util:call(?wxGridBagSizer_CheckForIntersection_3,
   <<ThisRef:32/?UI,PosR:32/?UI,PosC:32/?UI,SpanRS:32/?UI,SpanCS:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizerfinditem">external documentation</a>.
 -spec findItem(This, Window) -> wxGBSizerItem:wxGBSizerItem() when
 	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer().
 findItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -285,7 +285,7 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditematpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizerfinditematpoint">external documentation</a>.
 -spec findItemAtPoint(This, Pt) -> wxGBSizerItem:wxGBSizerItem() when
 	This::wxGridBagSizer(), Pt::{X::integer(), Y::integer()}.
 findItemAtPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -294,7 +294,7 @@ findItemAtPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxGridBagSizer_FindItemAtPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditematposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizerfinditematposition">external documentation</a>.
 -spec findItemAtPosition(This, Pos) -> wxGBSizerItem:wxGBSizerItem() when
 	This::wxGridBagSizer(), Pos::{R::integer(), C::integer()}.
 findItemAtPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosR,PosC})
@@ -303,7 +303,7 @@ findItemAtPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosR,PosC})
   wxe_util:call(?wxGridBagSizer_FindItemAtPosition,
   <<ThisRef:32/?UI,PosR:32/?UI,PosC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizerfinditemwithdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizerfinditemwithdata">external documentation</a>.
 -spec findItemWithData(This, UserData) -> wxGBSizerItem:wxGBSizerItem() when
 	This::wxGridBagSizer(), UserData::wx:wx_object().
 findItemWithData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=UserDataT,ref=UserDataRef}) ->
@@ -312,7 +312,7 @@ findItemWithData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=UserDataT,ref=User
   wxe_util:call(?wxGridBagSizer_FindItemWithData,
   <<ThisRef:32/?UI,UserDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetcellsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizergetcellsize">external documentation</a>.
 -spec getCellSize(This, Row, Col) -> {W::integer(), H::integer()} when
 	This::wxGridBagSizer(), Row::integer(), Col::integer().
 getCellSize(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
@@ -321,7 +321,7 @@ getCellSize(#wx_ref{type=ThisT,ref=ThisRef},Row,Col)
   wxe_util:call(?wxGridBagSizer_GetCellSize,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetemptycellsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizergetemptycellsize">external documentation</a>.
 -spec getEmptyCellSize(This) -> {W::integer(), H::integer()} when
 	This::wxGridBagSizer().
 getEmptyCellSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -329,7 +329,7 @@ getEmptyCellSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridBagSizer_GetEmptyCellSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetitemposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizergetitemposition">external documentation</a>.
 %% <br /> Also:<br />
 %% getItemPosition(This, Window) -> {R::integer(), C::integer()} when<br />
 %% 	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer().<br />
@@ -354,7 +354,7 @@ getItemPosition(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowR
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizergetitemspan">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizergetitemspan">external documentation</a>.
 %% <br /> Also:<br />
 %% getItemSpan(This, Window) -> {RS::integer(), CS::integer()} when<br />
 %% 	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer().<br />
@@ -379,7 +379,7 @@ getItemSpan(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef})
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizersetemptycellsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizersetemptycellsize">external documentation</a>.
 -spec setEmptyCellSize(This, Sz) -> ok when
 	This::wxGridBagSizer(), Sz::{W::integer(), H::integer()}.
 setEmptyCellSize(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
@@ -388,7 +388,7 @@ setEmptyCellSize(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
   wxe_util:cast(?wxGridBagSizer_SetEmptyCellSize,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizersetitemposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizersetitemposition">external documentation</a>.
 %% <br /> Also:<br />
 %% setItemPosition(This, Window, Pos) -> boolean() when<br />
 %% 	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Pos::{R::integer(), C::integer()}.<br />
@@ -414,7 +414,7 @@ setItemPosition(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowR
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,PosR:32/?UI,PosC:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridbagsizer.html#wxgridbagsizersetitemspan">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridbagsizer.html#wxgridbagsizersetitemspan">external documentation</a>.
 %% <br /> Also:<br />
 %% setItemSpan(This, Window, Span) -> boolean() when<br />
 %% 	This::wxGridBagSizer(), Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Span::{RS::integer(), CS::integer()}.<br />
diff --git a/lib/wx/src/gen/wxGridCellAttr.erl b/lib/wx/src/gen/wxGridCellAttr.erl
index f03fd99d2a..76e21ef594 100644
--- a/lib/wx/src/gen/wxGridCellAttr.erl
+++ b/lib/wx/src/gen/wxGridCellAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html">wxGridCellAttr</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html">wxGridCellAttr</a>.
 %% @type wxGridCellAttr().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -38,7 +38,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellAttr() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrsettextcolour">external documentation</a>.
 -spec setTextColour(This, ColText) -> ok when
 	This::wxGridCellAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
@@ -47,7 +47,7 @@ setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
   wxe_util:cast(?wxGridCellAttr_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrsetbackgroundcolour">external documentation</a>.
 -spec setBackgroundColour(This, ColBack) -> ok when
 	This::wxGridCellAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
@@ -56,7 +56,7 @@ setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
   wxe_util:cast(?wxGridCellAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrsetfont">external documentation</a>.
 -spec setFont(This, Font) -> ok when
 	This::wxGridCellAttr(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -65,7 +65,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:cast(?wxGridCellAttr_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrsetalignment">external documentation</a>.
 -spec setAlignment(This, HAlign, VAlign) -> ok when
 	This::wxGridCellAttr(), HAlign::integer(), VAlign::integer().
 setAlignment(#wx_ref{type=ThisT,ref=ThisRef},HAlign,VAlign)
@@ -82,7 +82,7 @@ setReadOnly(This)
  when is_record(This, wx_ref) ->
   setReadOnly(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetreadonly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrsetreadonly">external documentation</a>.
 -spec setReadOnly(This, [Option]) -> ok when
 	This::wxGridCellAttr(),
 	Option :: {isReadOnly, boolean()}.
@@ -95,7 +95,7 @@ setReadOnly(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxGridCellAttr_SetReadOnly,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrsetrenderer">external documentation</a>.
 -spec setRenderer(This, Renderer) -> ok when
 	This::wxGridCellAttr(), Renderer::wxGridCellRenderer:wxGridCellRenderer().
 setRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RendererT,ref=RendererRef}) ->
@@ -104,7 +104,7 @@ setRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RendererT,ref=RendererR
   wxe_util:cast(?wxGridCellAttr_SetRenderer,
   <<ThisRef:32/?UI,RendererRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrseteditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrseteditor">external documentation</a>.
 -spec setEditor(This, Editor) -> ok when
 	This::wxGridCellAttr(), Editor::wxGridCellEditor:wxGridCellEditor().
 setEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EditorT,ref=EditorRef}) ->
@@ -113,7 +113,7 @@ setEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EditorT,ref=EditorRef}) -
   wxe_util:cast(?wxGridCellAttr_SetEditor,
   <<ThisRef:32/?UI,EditorRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhastextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrhastextcolour">external documentation</a>.
 -spec hasTextColour(This) -> boolean() when
 	This::wxGridCellAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -121,7 +121,7 @@ hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrhasbackgroundcolour">external documentation</a>.
 -spec hasBackgroundColour(This) -> boolean() when
 	This::wxGridCellAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -129,7 +129,7 @@ hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrhasfont">external documentation</a>.
 -spec hasFont(This) -> boolean() when
 	This::wxGridCellAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -137,7 +137,7 @@ hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrhasalignment">external documentation</a>.
 -spec hasAlignment(This) -> boolean() when
 	This::wxGridCellAttr().
 hasAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -145,7 +145,7 @@ hasAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_HasAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhasrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrhasrenderer">external documentation</a>.
 -spec hasRenderer(This) -> boolean() when
 	This::wxGridCellAttr().
 hasRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -153,7 +153,7 @@ hasRenderer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_HasRenderer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrhaseditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrhaseditor">external documentation</a>.
 -spec hasEditor(This) -> boolean() when
 	This::wxGridCellAttr().
 hasEditor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -161,7 +161,7 @@ hasEditor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_HasEditor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrgettextcolour">external documentation</a>.
 -spec getTextColour(This) -> wx:wx_colour4() when
 	This::wxGridCellAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrgetbackgroundcolour">external documentation</a>.
 -spec getBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxGridCellAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -177,7 +177,7 @@ getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxGridCellAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -185,7 +185,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrgetalignment">external documentation</a>.
 -spec getAlignment(This) -> {HAlign::integer(), VAlign::integer()} when
 	This::wxGridCellAttr().
 getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -193,7 +193,7 @@ getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_GetAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgetrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrgetrenderer">external documentation</a>.
 -spec getRenderer(This, Grid, Row, Col) -> wxGridCellRenderer:wxGridCellRenderer() when
 	This::wxGridCellAttr(), Grid::wxGrid:wxGrid(), Row::integer(), Col::integer().
 getRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,Col)
@@ -203,7 +203,7 @@ getRenderer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,
   wxe_util:call(?wxGridCellAttr_GetRenderer,
   <<ThisRef:32/?UI,GridRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrgeteditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrgeteditor">external documentation</a>.
 -spec getEditor(This, Grid, Row, Col) -> wxGridCellEditor:wxGridCellEditor() when
 	This::wxGridCellAttr(), Grid::wxGrid:wxGrid(), Row::integer(), Col::integer().
 getEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,Col)
@@ -213,7 +213,7 @@ getEditor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},Row,Co
   wxe_util:call(?wxGridCellAttr_GetEditor,
   <<ThisRef:32/?UI,GridRef:32/?UI,Row:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrisreadonly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrisreadonly">external documentation</a>.
 -spec isReadOnly(This) -> boolean() when
 	This::wxGridCellAttr().
 isReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -221,7 +221,7 @@ isReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellAttr_IsReadOnly,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellattr.html#wxgridcellattrsetdefattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellattr.html#wxgridcellattrsetdefattr">external documentation</a>.
 -spec setDefAttr(This, DefAttr) -> ok when
 	This::wxGridCellAttr(), DefAttr::wxGridCellAttr().
 setDefAttr(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DefAttrT,ref=DefAttrRef}) ->
diff --git a/lib/wx/src/gen/wxGridCellBoolEditor.erl b/lib/wx/src/gen/wxGridCellBoolEditor.erl
index 533554cd54..c4d6d92618 100644
--- a/lib/wx/src/gen/wxGridCellBoolEditor.erl
+++ b/lib/wx/src/gen/wxGridCellBoolEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html">wxGridCellBoolEditor</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellbooleditor.html">wxGridCellBoolEditor</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellEditor}
 %% </p>
@@ -34,18 +34,20 @@
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
 -export_type([wxGridCellBoolEditor/0]).
+-compile([{nowarn_deprecated_function, {wxGridCellEditor,endEdit,4}},{nowarn_deprecated_function, {wxGridCellEditor,paintBackground,3}}]).
+
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellBoolEditor() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditorwxgridcellbooleditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellbooleditor.html#wxgridcellbooleditorwxgridcellbooleditor">external documentation</a>.
 -spec new() -> wxGridCellBoolEditor().
 new() ->
   wxe_util:construct(?wxGridCellBoolEditor_new,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditoristruevalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellbooleditor.html#wxgridcellbooleditoristruevalue">external documentation</a>.
 -spec isTrueValue(Value) -> boolean() when
 	Value::unicode:chardata().
 isTrueValue(Value)
@@ -60,7 +62,7 @@ isTrueValue(Value)
 useStringValues() ->
   useStringValues([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellbooleditor.html#wxgridcellbooleditorusestringvalues">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellbooleditor.html#wxgridcellbooleditorusestringvalues">external documentation</a>.
 -spec useStringValues([Option]) -> ok when
 	Option :: {valueTrue, unicode:chardata()}
 		 | {valueFalse, unicode:chardata()}.
diff --git a/lib/wx/src/gen/wxGridCellBoolRenderer.erl b/lib/wx/src/gen/wxGridCellBoolRenderer.erl
index 834f00a623..5a0b16b5df 100644
--- a/lib/wx/src/gen/wxGridCellBoolRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellBoolRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellboolrenderer.html">wxGridCellBoolRenderer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellboolrenderer.html">wxGridCellBoolRenderer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellRenderer}
 %% </p>
@@ -38,7 +38,7 @@ parent_class(wxGridCellRenderer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellBoolRenderer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellboolrenderer.html#wxgridcellboolrendererwxgridcellboolrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellboolrenderer.html#wxgridcellboolrendererwxgridcellboolrenderer">external documentation</a>.
 -spec new() -> wxGridCellBoolRenderer().
 new() ->
   wxe_util:construct(?wxGridCellBoolRenderer_new,
diff --git a/lib/wx/src/gen/wxGridCellChoiceEditor.erl b/lib/wx/src/gen/wxGridCellChoiceEditor.erl
index 6b037e01b3..a49680ffda 100644
--- a/lib/wx/src/gen/wxGridCellChoiceEditor.erl
+++ b/lib/wx/src/gen/wxGridCellChoiceEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellchoiceeditor.html">wxGridCellChoiceEditor</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellchoiceeditor.html">wxGridCellChoiceEditor</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellEditor}
 %% </p>
@@ -34,6 +34,8 @@
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
 -export_type([wxGridCellChoiceEditor/0]).
+-compile([{nowarn_deprecated_function, {wxGridCellEditor,endEdit,4}},{nowarn_deprecated_function, {wxGridCellEditor,paintBackground,3}}]).
+
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
@@ -47,7 +49,7 @@ new(Choices)
  when is_list(Choices) ->
   new(Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorwxgridcellchoiceeditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorwxgridcellchoiceeditor">external documentation</a>.
 -spec new(Choices, [Option]) -> wxGridCellChoiceEditor() when
 	Choices::[unicode:chardata()],
 	Option :: {allowOthers, boolean()}.
@@ -61,7 +63,7 @@ new(Choices, Options)
   wxe_util:construct(?wxGridCellChoiceEditor_new,
   <<(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorsetparameters">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellchoiceeditor.html#wxgridcellchoiceeditorsetparameters">external documentation</a>.
 -spec setParameters(This, Params) -> ok when
 	This::wxGridCellChoiceEditor(), Params::unicode:chardata().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
diff --git a/lib/wx/src/gen/wxGridCellEditor.erl b/lib/wx/src/gen/wxGridCellEditor.erl
index 4f86e307b5..657d65762d 100644
--- a/lib/wx/src/gen/wxGridCellEditor.erl
+++ b/lib/wx/src/gen/wxGridCellEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html">wxGridCellEditor</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html">wxGridCellEditor</a>.
 %% @type wxGridCellEditor().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -37,7 +37,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellEditor() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorcreate">external documentation</a>.
 -spec create(This, Parent, Id, EvtHandler) -> ok when
 	This::wxGridCellEditor(), Parent::wxWindow:wxWindow(), Id::integer(), EvtHandler::wxEvtHandler:wxEvtHandler().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#wx_ref{type=EvtHandlerT,ref=EvtHandlerRef})
@@ -48,7 +48,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#w
   wxe_util:cast(?wxGridCellEditor_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,EvtHandlerRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditoriscreated">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditoriscreated">external documentation</a>.
 -spec isCreated(This) -> boolean() when
 	This::wxGridCellEditor().
 isCreated(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -56,7 +56,7 @@ isCreated(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellEditor_IsCreated,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorsetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorsetsize">external documentation</a>.
 -spec setSize(This, Rect) -> ok when
 	This::wxGridCellEditor(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 setSize(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
@@ -73,7 +73,7 @@ show(This,Show)
  when is_record(This, wx_ref),is_boolean(Show) ->
   show(This,Show, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorshow">external documentation</a>.
 -spec show(This, Show, [Option]) -> ok when
 	This::wxGridCellEditor(), Show::boolean(),
 	Option :: {attr, wxGridCellAttr:wxGridCellAttr()}.
@@ -86,7 +86,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef},Show, Options)
   wxe_util:cast(?wxGridCellEditor_Show,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorpaintbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorpaintbackground">external documentation</a>.
 -spec paintBackground(This, RectCell, Attr) -> ok when
 	This::wxGridCellEditor(), RectCell::{X::integer(), Y::integer(), W::integer(), H::integer()}, Attr::wxGridCellAttr:wxGridCellAttr().
 paintBackground(#wx_ref{type=ThisT,ref=ThisRef},{RectCellX,RectCellY,RectCellW,RectCellH},#wx_ref{type=AttrT,ref=AttrRef})
@@ -96,7 +96,7 @@ paintBackground(#wx_ref{type=ThisT,ref=ThisRef},{RectCellX,RectCellY,RectCellW,R
   wxe_util:cast(?wxGridCellEditor_PaintBackground,
   <<ThisRef:32/?UI,RectCellX:32/?UI,RectCellY:32/?UI,RectCellW:32/?UI,RectCellH:32/?UI,AttrRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorbeginedit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorbeginedit">external documentation</a>.
 -spec beginEdit(This, Row, Col, Grid) -> ok when
 	This::wxGridCellEditor(), Row::integer(), Col::integer(), Grid::wxGrid:wxGrid().
 beginEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef})
@@ -106,7 +106,7 @@ beginEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef
   wxe_util:cast(?wxGridCellEditor_BeginEdit,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,GridRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorendedit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorendedit">external documentation</a>.
 -spec endEdit(This, Row, Col, Grid) -> boolean() when
 	This::wxGridCellEditor(), Row::integer(), Col::integer(), Grid::wxGrid:wxGrid().
 endEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef})
@@ -116,7 +116,7 @@ endEdit(#wx_ref{type=ThisT,ref=ThisRef},Row,Col,#wx_ref{type=GridT,ref=GridRef})
   wxe_util:call(?wxGridCellEditor_EndEdit,
   <<ThisRef:32/?UI,Row:32/?UI,Col:32/?UI,GridRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorreset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorreset">external documentation</a>.
 -spec reset(This) -> ok when
 	This::wxGridCellEditor().
 reset(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -124,7 +124,7 @@ reset(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGridCellEditor_Reset,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorstartingkey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorstartingkey">external documentation</a>.
 -spec startingKey(This, Event) -> ok when
 	This::wxGridCellEditor(), Event::wxKeyEvent:wxKeyEvent().
 startingKey(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
@@ -133,7 +133,7 @@ startingKey(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) -
   wxe_util:cast(?wxGridCellEditor_StartingKey,
   <<ThisRef:32/?UI,EventRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorstartingclick">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorstartingclick">external documentation</a>.
 -spec startingClick(This) -> ok when
 	This::wxGridCellEditor().
 startingClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -141,7 +141,7 @@ startingClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxGridCellEditor_StartingClick,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelleditor.html#wxgridcelleditorhandlereturn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelleditor.html#wxgridcelleditorhandlereturn">external documentation</a>.
 -spec handleReturn(This, Event) -> ok when
 	This::wxGridCellEditor(), Event::wxKeyEvent:wxKeyEvent().
 handleReturn(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
diff --git a/lib/wx/src/gen/wxGridCellFloatEditor.erl b/lib/wx/src/gen/wxGridCellFloatEditor.erl
index f6b7dce15e..5cd0bd6cb5 100644
--- a/lib/wx/src/gen/wxGridCellFloatEditor.erl
+++ b/lib/wx/src/gen/wxGridCellFloatEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloateditor.html">wxGridCellFloatEditor</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloateditor.html">wxGridCellFloatEditor</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellEditor}
 %% </p>
@@ -34,6 +34,8 @@
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
 -export_type([wxGridCellFloatEditor/0]).
+-compile([{nowarn_deprecated_function, {wxGridCellEditor,endEdit,4}},{nowarn_deprecated_function, {wxGridCellEditor,paintBackground,3}}]).
+
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
@@ -45,7 +47,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloateditor.html#wxgridcellfloateditorwxgridcellfloateditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloateditor.html#wxgridcellfloateditorwxgridcellfloateditor">external documentation</a>.
 -spec new([Option]) -> wxGridCellFloatEditor() when
 	Option :: {width, integer()}
 		 | {precision, integer()}.
@@ -58,7 +60,7 @@ new(Options)
   wxe_util:construct(?wxGridCellFloatEditor_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloateditor.html#wxgridcellfloateditorsetparameters">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloateditor.html#wxgridcellfloateditorsetparameters">external documentation</a>.
 -spec setParameters(This, Params) -> ok when
 	This::wxGridCellFloatEditor(), Params::unicode:chardata().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
diff --git a/lib/wx/src/gen/wxGridCellFloatRenderer.erl b/lib/wx/src/gen/wxGridCellFloatRenderer.erl
index c090a60e74..ea3cd0eebe 100644
--- a/lib/wx/src/gen/wxGridCellFloatRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellFloatRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html">wxGridCellFloatRenderer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloatrenderer.html">wxGridCellFloatRenderer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellStringRenderer}
 %% <br />{@link wxGridCellRenderer}
@@ -47,7 +47,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrendererwxgridcellfloatrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrendererwxgridcellfloatrenderer">external documentation</a>.
 -spec new([Option]) -> wxGridCellFloatRenderer() when
 	Option :: {width, integer()}
 		 | {precision, integer()}.
@@ -60,7 +60,7 @@ new(Options)
   wxe_util:construct(?wxGridCellFloatRenderer_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderergetprecision">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderergetprecision">external documentation</a>.
 -spec getPrecision(This) -> integer() when
 	This::wxGridCellFloatRenderer().
 getPrecision(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -68,7 +68,7 @@ getPrecision(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellFloatRenderer_GetPrecision,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderergetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderergetwidth">external documentation</a>.
 -spec getWidth(This) -> integer() when
 	This::wxGridCellFloatRenderer().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -76,7 +76,7 @@ getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellFloatRenderer_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetparameters">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetparameters">external documentation</a>.
 -spec setParameters(This, Params) -> ok when
 	This::wxGridCellFloatRenderer(), Params::unicode:chardata().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
@@ -86,7 +86,7 @@ setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
   wxe_util:cast(?wxGridCellFloatRenderer_SetParameters,
   <<ThisRef:32/?UI,(byte_size(Params_UC)):32/?UI,(Params_UC)/binary, 0:(((8- ((0+byte_size(Params_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetprecision">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetprecision">external documentation</a>.
 -spec setPrecision(This, Precision) -> ok when
 	This::wxGridCellFloatRenderer(), Precision::integer().
 setPrecision(#wx_ref{type=ThisT,ref=ThisRef},Precision)
@@ -95,7 +95,7 @@ setPrecision(#wx_ref{type=ThisT,ref=ThisRef},Precision)
   wxe_util:cast(?wxGridCellFloatRenderer_SetPrecision,
   <<ThisRef:32/?UI,Precision:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellfloatrenderer.html#wxgridcellfloatrenderersetwidth">external documentation</a>.
 -spec setWidth(This, Width) -> ok when
 	This::wxGridCellFloatRenderer(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
diff --git a/lib/wx/src/gen/wxGridCellNumberEditor.erl b/lib/wx/src/gen/wxGridCellNumberEditor.erl
index 68d5670367..7cc682a10e 100644
--- a/lib/wx/src/gen/wxGridCellNumberEditor.erl
+++ b/lib/wx/src/gen/wxGridCellNumberEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html">wxGridCellNumberEditor</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellnumbereditor.html">wxGridCellNumberEditor</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellTextEditor}
 %% <br />{@link wxGridCellEditor}
@@ -35,6 +35,8 @@
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
 -export_type([wxGridCellNumberEditor/0]).
+-compile([{nowarn_deprecated_function, {wxGridCellEditor,endEdit,4}},{nowarn_deprecated_function, {wxGridCellEditor,paintBackground,3}}]).
+
 %% @hidden
 parent_class(wxGridCellTextEditor) -> true;
 parent_class(wxGridCellEditor) -> true;
@@ -47,7 +49,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorwxgridcellnumbereditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorwxgridcellnumbereditor">external documentation</a>.
 -spec new([Option]) -> wxGridCellNumberEditor() when
 	Option :: {min, integer()}
 		 | {max, integer()}.
@@ -60,7 +62,7 @@ new(Options)
   wxe_util:construct(?wxGridCellNumberEditor_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorgetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorgetvalue">external documentation</a>.
 -spec getValue(This) -> unicode:charlist() when
 	This::wxGridCellNumberEditor().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -68,7 +70,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridCellNumberEditor_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorsetparameters">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellnumbereditor.html#wxgridcellnumbereditorsetparameters">external documentation</a>.
 -spec setParameters(This, Params) -> ok when
 	This::wxGridCellNumberEditor(), Params::unicode:chardata().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
diff --git a/lib/wx/src/gen/wxGridCellNumberRenderer.erl b/lib/wx/src/gen/wxGridCellNumberRenderer.erl
index b02b6d48c9..840d6da41d 100644
--- a/lib/wx/src/gen/wxGridCellNumberRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellNumberRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumberrenderer.html">wxGridCellNumberRenderer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellnumberrenderer.html">wxGridCellNumberRenderer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellStringRenderer}
 %% <br />{@link wxGridCellRenderer}
@@ -40,7 +40,7 @@ parent_class(wxGridCellRenderer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellNumberRenderer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellnumberrenderer.html#wxgridcellnumberrendererwxgridcellnumberrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellnumberrenderer.html#wxgridcellnumberrendererwxgridcellnumberrenderer">external documentation</a>.
 -spec new() -> wxGridCellNumberRenderer().
 new() ->
   wxe_util:construct(?wxGridCellNumberRenderer_new,
diff --git a/lib/wx/src/gen/wxGridCellRenderer.erl b/lib/wx/src/gen/wxGridCellRenderer.erl
index 42d376a347..5ed4587153 100644
--- a/lib/wx/src/gen/wxGridCellRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellrenderer.html">wxGridCellRenderer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellrenderer.html">wxGridCellRenderer</a>.
 %% @type wxGridCellRenderer().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,7 +34,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellRenderer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellrenderer.html#wxgridcellrendererdraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellrenderer.html#wxgridcellrendererdraw">external documentation</a>.
 -spec draw(This, Grid, Attr, Dc, Rect, Row, Col, IsSelected) -> ok when
 	This::wxGridCellRenderer(), Grid::wxGrid:wxGrid(), Attr::wxGridCellAttr:wxGridCellAttr(), Dc::wxDC:wxDC(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, Row::integer(), Col::integer(), IsSelected::boolean().
 draw(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},#wx_ref{type=AttrT,ref=AttrRef},#wx_ref{type=DcT,ref=DcRef},{RectX,RectY,RectW,RectH},Row,Col,IsSelected)
@@ -46,7 +46,7 @@ draw(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},#wx_ref{typ
   wxe_util:cast(?wxGridCellRenderer_Draw,
   <<ThisRef:32/?UI,GridRef:32/?UI,AttrRef:32/?UI,DcRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,Row:32/?UI,Col:32/?UI,(wxe_util:from_bool(IsSelected)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellrenderer.html#wxgridcellrenderergetbestsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellrenderer.html#wxgridcellrenderergetbestsize">external documentation</a>.
 -spec getBestSize(This, Grid, Attr, Dc, Row, Col) -> {W::integer(), H::integer()} when
 	This::wxGridCellRenderer(), Grid::wxGrid:wxGrid(), Attr::wxGridCellAttr:wxGridCellAttr(), Dc::wxDC:wxDC(), Row::integer(), Col::integer().
 getBestSize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=GridT,ref=GridRef},#wx_ref{type=AttrT,ref=AttrRef},#wx_ref{type=DcT,ref=DcRef},Row,Col)
diff --git a/lib/wx/src/gen/wxGridCellStringRenderer.erl b/lib/wx/src/gen/wxGridCellStringRenderer.erl
index 78fdf558a2..966d5affc0 100644
--- a/lib/wx/src/gen/wxGridCellStringRenderer.erl
+++ b/lib/wx/src/gen/wxGridCellStringRenderer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellstringrenderer.html">wxGridCellStringRenderer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellstringrenderer.html">wxGridCellStringRenderer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellRenderer}
 %% </p>
@@ -38,7 +38,7 @@ parent_class(wxGridCellRenderer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellStringRenderer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcellstringrenderer.html#wxgridcellstringrendererwxgridcellstringrenderer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcellstringrenderer.html#wxgridcellstringrendererwxgridcellstringrenderer">external documentation</a>.
 -spec new() -> wxGridCellStringRenderer().
 new() ->
   wxe_util:construct(?wxGridCellStringRenderer_new,
diff --git a/lib/wx/src/gen/wxGridCellTextEditor.erl b/lib/wx/src/gen/wxGridCellTextEditor.erl
index 44a324d5ea..a024da56c4 100644
--- a/lib/wx/src/gen/wxGridCellTextEditor.erl
+++ b/lib/wx/src/gen/wxGridCellTextEditor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelltexteditor.html">wxGridCellTextEditor</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelltexteditor.html">wxGridCellTextEditor</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxGridCellEditor}
 %% </p>
@@ -34,18 +34,20 @@
   parent_class/1,reset/1,setSize/2,show/2,show/3,startingClick/1,startingKey/2]).
 
 -export_type([wxGridCellTextEditor/0]).
+-compile([{nowarn_deprecated_function, {wxGridCellEditor,endEdit,4}},{nowarn_deprecated_function, {wxGridCellEditor,paintBackground,3}}]).
+
 %% @hidden
 parent_class(wxGridCellEditor) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridCellTextEditor() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelltexteditor.html#wxgridcelltexteditorwxgridcelltexteditor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelltexteditor.html#wxgridcelltexteditorwxgridcelltexteditor">external documentation</a>.
 -spec new() -> wxGridCellTextEditor().
 new() ->
   wxe_util:construct(?wxGridCellTextEditor_new,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridcelltexteditor.html#wxgridcelltexteditorsetparameters">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridcelltexteditor.html#wxgridcelltexteditorsetparameters">external documentation</a>.
 -spec setParameters(This, Params) -> ok when
 	This::wxGridCellTextEditor(), Params::unicode:chardata().
 setParameters(#wx_ref{type=ThisT,ref=ThisRef},Params)
diff --git a/lib/wx/src/gen/wxGridEvent.erl b/lib/wx/src/gen/wxGridEvent.erl
index 59c2ad53b5..2ce526244c 100644
--- a/lib/wx/src/gen/wxGridEvent.erl
+++ b/lib/wx/src/gen/wxGridEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html">wxGridEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html">wxGridEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>grid_cell_left_click</em>, <em>grid_cell_right_click</em>, <em>grid_cell_left_dclick</em>, <em>grid_cell_right_dclick</em>, <em>grid_label_left_click</em>, <em>grid_label_right_click</em>, <em>grid_label_left_dclick</em>, <em>grid_label_right_dclick</em>, <em>grid_row_size</em>, <em>grid_col_size</em>, <em>grid_range_select</em>, <em>grid_cell_change</em>, <em>grid_select_cell</em>, <em>grid_editor_shown</em>, <em>grid_editor_hidden</em>, <em>grid_editor_created</em>, <em>grid_cell_begin_drag</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxGrid(). #wxGrid{}} event record type.
@@ -50,7 +50,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxGridEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventaltdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventaltdown">external documentation</a>.
 -spec altDown(This) -> boolean() when
 	This::wxGridEvent().
 altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -58,7 +58,7 @@ altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridEvent_AltDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventcontroldown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventcontroldown">external documentation</a>.
 -spec controlDown(This) -> boolean() when
 	This::wxGridEvent().
 controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -66,7 +66,7 @@ controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridEvent_ControlDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventgetcol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventgetcol">external documentation</a>.
 -spec getCol(This) -> integer() when
 	This::wxGridEvent().
 getCol(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -74,7 +74,7 @@ getCol(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridEvent_GetCol,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxGridEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -82,7 +82,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventgetrow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventgetrow">external documentation</a>.
 -spec getRow(This) -> integer() when
 	This::wxGridEvent().
 getRow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -90,7 +90,7 @@ getRow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridEvent_GetRow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventmetadown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventmetadown">external documentation</a>.
 -spec metaDown(This) -> boolean() when
 	This::wxGridEvent().
 metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -98,7 +98,7 @@ metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridEvent_MetaDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventselecting">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventselecting">external documentation</a>.
 -spec selecting(This) -> boolean() when
 	This::wxGridEvent().
 selecting(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -106,7 +106,7 @@ selecting(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridEvent_Selecting,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridevent.html#wxgrideventshiftdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridevent.html#wxgrideventshiftdown">external documentation</a>.
 -spec shiftDown(This) -> boolean() when
 	This::wxGridEvent().
 shiftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxGridSizer.erl b/lib/wx/src/gen/wxGridSizer.erl
index 10c905f041..0be9bb5e57 100644
--- a/lib/wx/src/gen/wxGridSizer.erl
+++ b/lib/wx/src/gen/wxGridSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html">wxGridSizer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html">wxGridSizer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxSizer}
 %% </p>
@@ -55,7 +55,7 @@ new(Cols)
  when is_integer(Cols) ->
   new(Cols, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizerwxgridsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizerwxgridsizer">external documentation</a>.
 -spec new(Cols, [Option]) -> wxGridSizer() when
 	Cols::integer(),
 	Option :: {vgap, integer()}
@@ -69,7 +69,7 @@ new(Cols, Options)
   wxe_util:construct(?wxGridSizer_new_2,
   <<Cols:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizerwxgridsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizerwxgridsizer">external documentation</a>.
 -spec new(Rows, Cols, Vgap, Hgap) -> wxGridSizer() when
 	Rows::integer(), Cols::integer(), Vgap::integer(), Hgap::integer().
 new(Rows,Cols,Vgap,Hgap)
@@ -77,7 +77,7 @@ new(Rows,Cols,Vgap,Hgap)
   wxe_util:construct(?wxGridSizer_new_4,
   <<Rows:32/?UI,Cols:32/?UI,Vgap:32/?UI,Hgap:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergetcols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizergetcols">external documentation</a>.
 -spec getCols(This) -> integer() when
 	This::wxGridSizer().
 getCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -85,7 +85,7 @@ getCols(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridSizer_GetCols,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergethgap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizergethgap">external documentation</a>.
 -spec getHGap(This) -> integer() when
 	This::wxGridSizer().
 getHGap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -93,7 +93,7 @@ getHGap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridSizer_GetHGap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergetrows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizergetrows">external documentation</a>.
 -spec getRows(This) -> integer() when
 	This::wxGridSizer().
 getRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -101,7 +101,7 @@ getRows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridSizer_GetRows,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizergetvgap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizergetvgap">external documentation</a>.
 -spec getVGap(This) -> integer() when
 	This::wxGridSizer().
 getVGap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -109,7 +109,7 @@ getVGap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxGridSizer_GetVGap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersetcols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizersetcols">external documentation</a>.
 -spec setCols(This, Cols) -> ok when
 	This::wxGridSizer(), Cols::integer().
 setCols(#wx_ref{type=ThisT,ref=ThisRef},Cols)
@@ -118,7 +118,7 @@ setCols(#wx_ref{type=ThisT,ref=ThisRef},Cols)
   wxe_util:cast(?wxGridSizer_SetCols,
   <<ThisRef:32/?UI,Cols:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersethgap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizersethgap">external documentation</a>.
 -spec setHGap(This, Gap) -> ok when
 	This::wxGridSizer(), Gap::integer().
 setHGap(#wx_ref{type=ThisT,ref=ThisRef},Gap)
@@ -127,7 +127,7 @@ setHGap(#wx_ref{type=ThisT,ref=ThisRef},Gap)
   wxe_util:cast(?wxGridSizer_SetHGap,
   <<ThisRef:32/?UI,Gap:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersetrows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizersetrows">external documentation</a>.
 -spec setRows(This, Rows) -> ok when
 	This::wxGridSizer(), Rows::integer().
 setRows(#wx_ref{type=ThisT,ref=ThisRef},Rows)
@@ -136,7 +136,7 @@ setRows(#wx_ref{type=ThisT,ref=ThisRef},Rows)
   wxe_util:cast(?wxGridSizer_SetRows,
   <<ThisRef:32/?UI,Rows:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxgridsizer.html#wxgridsizersetvgap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxgridsizer.html#wxgridsizersetvgap">external documentation</a>.
 -spec setVGap(This, Gap) -> ok when
 	This::wxGridSizer(), Gap::integer().
 setVGap(#wx_ref{type=ThisT,ref=ThisRef},Gap)
diff --git a/lib/wx/src/gen/wxHelpEvent.erl b/lib/wx/src/gen/wxHelpEvent.erl
index 70da136be8..37b4eed154 100644
--- a/lib/wx/src/gen/wxHelpEvent.erl
+++ b/lib/wx/src/gen/wxHelpEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html">wxHelpEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhelpevent.html">wxHelpEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>help</em>, <em>detailed_help</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxHelp(). #wxHelp{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxHelpEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventgetorigin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhelpevent.html#wxhelpeventgetorigin">external documentation</a>.
 %%<br /> Res = ?wxHelpEvent_Origin_Unknown | ?wxHelpEvent_Origin_Keyboard | ?wxHelpEvent_Origin_HelpButton
 -spec getOrigin(This) -> wx:wx_enum() when
 	This::wxHelpEvent().
@@ -52,7 +52,7 @@ getOrigin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHelpEvent_GetOrigin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhelpevent.html#wxhelpeventgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxHelpEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -60,7 +60,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHelpEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventsetorigin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhelpevent.html#wxhelpeventsetorigin">external documentation</a>.
 %%<br /> Origin = ?wxHelpEvent_Origin_Unknown | ?wxHelpEvent_Origin_Keyboard | ?wxHelpEvent_Origin_HelpButton
 -spec setOrigin(This, Origin) -> ok when
 	This::wxHelpEvent(), Origin::wx:wx_enum().
@@ -70,7 +70,7 @@ setOrigin(#wx_ref{type=ThisT,ref=ThisRef},Origin)
   wxe_util:cast(?wxHelpEvent_SetOrigin,
   <<ThisRef:32/?UI,Origin:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhelpevent.html#wxhelpeventsetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhelpevent.html#wxhelpeventsetposition">external documentation</a>.
 -spec setPosition(This, Pos) -> ok when
 	This::wxHelpEvent(), Pos::{X::integer(), Y::integer()}.
 setPosition(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
diff --git a/lib/wx/src/gen/wxHtmlEasyPrinting.erl b/lib/wx/src/gen/wxHtmlEasyPrinting.erl
index 2a5506053b..e4e4849fe7 100644
--- a/lib/wx/src/gen/wxHtmlEasyPrinting.erl
+++ b/lib/wx/src/gen/wxHtmlEasyPrinting.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html">wxHtmlEasyPrinting</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html">wxHtmlEasyPrinting</a>.
 %% @type wxHtmlEasyPrinting().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -43,7 +43,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingwxhtmleasyprinting">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingwxhtmleasyprinting">external documentation</a>.
 -spec new([Option]) -> wxHtmlEasyPrinting() when
 	Option :: {name, unicode:chardata()}
 		 | {parentWindow, wxWindow:wxWindow()}.
@@ -56,7 +56,7 @@ new(Options)
   wxe_util:construct(?wxHtmlEasyPrinting_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintinggetprintdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintinggetprintdata">external documentation</a>.
 -spec getPrintData(This) -> wxPrintData:wxPrintData() when
 	This::wxHtmlEasyPrinting().
 getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -64,7 +64,7 @@ getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlEasyPrinting_GetPrintData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintinggetpagesetupdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintinggetpagesetupdata">external documentation</a>.
 -spec getPageSetupData(This) -> wxPageSetupDialogData:wxPageSetupDialogData() when
 	This::wxHtmlEasyPrinting().
 getPageSetupData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -72,7 +72,7 @@ getPageSetupData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlEasyPrinting_GetPageSetupData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewfile">external documentation</a>.
 -spec previewFile(This, Htmlfile) -> boolean() when
 	This::wxHtmlEasyPrinting(), Htmlfile::unicode:chardata().
 previewFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile)
@@ -90,7 +90,7 @@ previewText(This,Htmltext)
  when is_record(This, wx_ref),is_list(Htmltext) ->
   previewText(This,Htmltext, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpreviewtext">external documentation</a>.
 -spec previewText(This, Htmltext, [Option]) -> boolean() when
 	This::wxHtmlEasyPrinting(), Htmltext::unicode:chardata(),
 	Option :: {basepath, unicode:chardata()}.
@@ -104,7 +104,7 @@ previewText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options)
   wxe_util:call(?wxHtmlEasyPrinting_PreviewText,
   <<ThisRef:32/?UI,(byte_size(Htmltext_UC)):32/?UI,(Htmltext_UC)/binary, 0:(((8- ((0+byte_size(Htmltext_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprintfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprintfile">external documentation</a>.
 -spec printFile(This, Htmlfile) -> boolean() when
 	This::wxHtmlEasyPrinting(), Htmlfile::unicode:chardata().
 printFile(#wx_ref{type=ThisT,ref=ThisRef},Htmlfile)
@@ -122,7 +122,7 @@ printText(This,Htmltext)
  when is_record(This, wx_ref),is_list(Htmltext) ->
   printText(This,Htmltext, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprinttext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingprinttext">external documentation</a>.
 -spec printText(This, Htmltext, [Option]) -> boolean() when
 	This::wxHtmlEasyPrinting(), Htmltext::unicode:chardata(),
 	Option :: {basepath, unicode:chardata()}.
@@ -136,7 +136,7 @@ printText(#wx_ref{type=ThisT,ref=ThisRef},Htmltext, Options)
   wxe_util:call(?wxHtmlEasyPrinting_PrintText,
   <<ThisRef:32/?UI,(byte_size(Htmltext_UC)):32/?UI,(Htmltext_UC)/binary, 0:(((8- ((0+byte_size(Htmltext_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpagesetup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingpagesetup">external documentation</a>.
 -spec pageSetup(This) -> ok when
 	This::wxHtmlEasyPrinting().
 pageSetup(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -152,7 +152,7 @@ setFonts(This,Normal_face,Fixed_face)
  when is_record(This, wx_ref),is_list(Normal_face),is_list(Fixed_face) ->
   setFonts(This,Normal_face,Fixed_face, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfonts">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfonts">external documentation</a>.
 -spec setFonts(This, Normal_face, Fixed_face, [Option]) -> ok when
 	This::wxHtmlEasyPrinting(), Normal_face::unicode:chardata(), Fixed_face::unicode:chardata(),
 	Option :: {sizes, [integer()]}.
@@ -176,7 +176,7 @@ setHeader(This,Header)
  when is_record(This, wx_ref),is_list(Header) ->
   setHeader(This,Header, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetheader">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetheader">external documentation</a>.
 -spec setHeader(This, Header, [Option]) -> ok when
 	This::wxHtmlEasyPrinting(), Header::unicode:chardata(),
 	Option :: {pg, integer()}.
@@ -198,7 +198,7 @@ setFooter(This,Footer)
  when is_record(This, wx_ref),is_list(Footer) ->
   setFooter(This,Footer, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfooter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmleasyprinting.html#wxhtmleasyprintingsetfooter">external documentation</a>.
 -spec setFooter(This, Footer, [Option]) -> ok when
 	This::wxHtmlEasyPrinting(), Footer::unicode:chardata(),
 	Option :: {pg, integer()}.
diff --git a/lib/wx/src/gen/wxHtmlLinkEvent.erl b/lib/wx/src/gen/wxHtmlLinkEvent.erl
index 94fe670f35..c3a201a626 100644
--- a/lib/wx/src/gen/wxHtmlLinkEvent.erl
+++ b/lib/wx/src/gen/wxHtmlLinkEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmllinkevent.html">wxHtmlLinkEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmllinkevent.html">wxHtmlLinkEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_html_link_clicked</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxHtmlLink(). #wxHtmlLink{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxHtmlLinkEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmllinkevent.html#wxhtmllinkeventgetlinkinfo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmllinkevent.html#wxhtmllinkeventgetlinkinfo">external documentation</a>.
 -spec getLinkInfo(This) -> wx:wx_wxHtmlLinkInfo() when
 	This::wxHtmlLinkEvent().
 getLinkInfo(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxHtmlWindow.erl b/lib/wx/src/gen/wxHtmlWindow.erl
index 4820f7d075..fae80c398c 100644
--- a/lib/wx/src/gen/wxHtmlWindow.erl
+++ b/lib/wx/src/gen/wxHtmlWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html">wxHtmlWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html">wxHtmlWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxScrolledWindow}
 %% <br />{@link wxPanel}
@@ -66,13 +66,13 @@
   scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
   setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
   setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,
-  setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2,
-  setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,
-  setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,
-  setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,
-  setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
+  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,
+  setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,
+  setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
   setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
   setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
   setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
@@ -88,7 +88,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxHtmlWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowwxhtmlwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowwxhtmlwindow">external documentation</a>.
 -spec new() -> wxHtmlWindow().
 new() ->
   wxe_util:construct(?wxHtmlWindow_new_0,
@@ -102,7 +102,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowwxhtmlwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowwxhtmlwindow">external documentation</a>.
 -spec new(Parent, [Option]) -> wxHtmlWindow() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -121,7 +121,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxHtmlWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowappendtopage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowappendtopage">external documentation</a>.
 -spec appendToPage(This, Source) -> boolean() when
 	This::wxHtmlWindow(), Source::unicode:chardata().
 appendToPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
@@ -131,7 +131,7 @@ appendToPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
   wxe_util:call(?wxHtmlWindow_AppendToPage,
   <<ThisRef:32/?UI,(byte_size(Source_UC)):32/?UI,(Source_UC)/binary, 0:(((8- ((0+byte_size(Source_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedanchor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedanchor">external documentation</a>.
 -spec getOpenedAnchor(This) -> unicode:charlist() when
 	This::wxHtmlWindow().
 getOpenedAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -139,7 +139,7 @@ getOpenedAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_GetOpenedAnchor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpage">external documentation</a>.
 -spec getOpenedPage(This) -> unicode:charlist() when
 	This::wxHtmlWindow().
 getOpenedPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -147,7 +147,7 @@ getOpenedPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_GetOpenedPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpagetitle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowgetopenedpagetitle">external documentation</a>.
 -spec getOpenedPageTitle(This) -> unicode:charlist() when
 	This::wxHtmlWindow().
 getOpenedPageTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -155,7 +155,7 @@ getOpenedPageTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_GetOpenedPageTitle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowgetrelatedframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowgetrelatedframe">external documentation</a>.
 -spec getRelatedFrame(This) -> wxFrame:wxFrame() when
 	This::wxHtmlWindow().
 getRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -163,7 +163,7 @@ getRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_GetRelatedFrame,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistoryback">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowhistoryback">external documentation</a>.
 -spec historyBack(This) -> boolean() when
 	This::wxHtmlWindow().
 historyBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -171,7 +171,7 @@ historyBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_HistoryBack,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistorycanback">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowhistorycanback">external documentation</a>.
 -spec historyCanBack(This) -> boolean() when
 	This::wxHtmlWindow().
 historyCanBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -179,7 +179,7 @@ historyCanBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_HistoryCanBack,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistorycanforward">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowhistorycanforward">external documentation</a>.
 -spec historyCanForward(This) -> boolean() when
 	This::wxHtmlWindow().
 historyCanForward(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -187,7 +187,7 @@ historyCanForward(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_HistoryCanForward,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistoryclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowhistoryclear">external documentation</a>.
 -spec historyClear(This) -> ok when
 	This::wxHtmlWindow().
 historyClear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -195,7 +195,7 @@ historyClear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxHtmlWindow_HistoryClear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowhistoryforward">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowhistoryforward">external documentation</a>.
 -spec historyForward(This) -> boolean() when
 	This::wxHtmlWindow().
 historyForward(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -203,7 +203,7 @@ historyForward(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_HistoryForward,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowloadfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowloadfile">external documentation</a>.
 -spec loadFile(This, Filename) -> boolean() when
 	This::wxHtmlWindow(), Filename::unicode:chardata().
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
@@ -213,7 +213,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:call(?wxHtmlWindow_LoadFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowloadpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowloadpage">external documentation</a>.
 -spec loadPage(This, Location) -> boolean() when
 	This::wxHtmlWindow(), Location::unicode:chardata().
 loadPage(#wx_ref{type=ThisT,ref=ThisRef},Location)
@@ -223,7 +223,7 @@ loadPage(#wx_ref{type=ThisT,ref=ThisRef},Location)
   wxe_util:call(?wxHtmlWindow_LoadPage,
   <<ThisRef:32/?UI,(byte_size(Location_UC)):32/?UI,(Location_UC)/binary, 0:(((8- ((0+byte_size(Location_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowselectall">external documentation</a>.
 -spec selectAll(This) -> ok when
 	This::wxHtmlWindow().
 selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -231,7 +231,7 @@ selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxHtmlWindow_SelectAll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectiontotext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowselectiontotext">external documentation</a>.
 -spec selectionToText(This) -> unicode:charlist() when
 	This::wxHtmlWindow().
 selectionToText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -239,7 +239,7 @@ selectionToText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxHtmlWindow_SelectionToText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowselectline">external documentation</a>.
 -spec selectLine(This, Pos) -> ok when
 	This::wxHtmlWindow(), Pos::{X::integer(), Y::integer()}.
 selectLine(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
@@ -248,7 +248,7 @@ selectLine(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
   wxe_util:cast(?wxHtmlWindow_SelectLine,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowselectword">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowselectword">external documentation</a>.
 -spec selectWord(This, Pos) -> ok when
 	This::wxHtmlWindow(), Pos::{X::integer(), Y::integer()}.
 selectWord(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
@@ -257,7 +257,7 @@ selectWord(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY})
   wxe_util:cast(?wxHtmlWindow_SelectWord,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetborders">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowsetborders">external documentation</a>.
 -spec setBorders(This, B) -> ok when
 	This::wxHtmlWindow(), B::integer().
 setBorders(#wx_ref{type=ThisT,ref=ThisRef},B)
@@ -274,7 +274,7 @@ setFonts(This,Normal_face,Fixed_face)
  when is_record(This, wx_ref),is_list(Normal_face),is_list(Fixed_face) ->
   setFonts(This,Normal_face,Fixed_face, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetfonts">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowsetfonts">external documentation</a>.
 -spec setFonts(This, Normal_face, Fixed_face, [Option]) -> ok when
 	This::wxHtmlWindow(), Normal_face::unicode:chardata(), Fixed_face::unicode:chardata(),
 	Option :: {sizes, integer()}.
@@ -289,7 +289,7 @@ setFonts(#wx_ref{type=ThisT,ref=ThisRef},Normal_face,Fixed_face, Options)
   wxe_util:cast(?wxHtmlWindow_SetFonts,
   <<ThisRef:32/?UI,(byte_size(Normal_face_UC)):32/?UI,(Normal_face_UC)/binary, 0:(((8- ((0+byte_size(Normal_face_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Fixed_face_UC)):32/?UI,(Fixed_face_UC)/binary, 0:(((8- ((4+byte_size(Fixed_face_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowsetpage">external documentation</a>.
 -spec setPage(This, Source) -> boolean() when
 	This::wxHtmlWindow(), Source::unicode:chardata().
 setPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
@@ -299,7 +299,7 @@ setPage(#wx_ref{type=ThisT,ref=ThisRef},Source)
   wxe_util:call(?wxHtmlWindow_SetPage,
   <<ThisRef:32/?UI,(byte_size(Source_UC)):32/?UI,(Source_UC)/binary, 0:(((8- ((0+byte_size(Source_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetrelatedframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowsetrelatedframe">external documentation</a>.
 -spec setRelatedFrame(This, Frame, Format) -> ok when
 	This::wxHtmlWindow(), Frame::wxFrame:wxFrame(), Format::unicode:chardata().
 setRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},Format)
@@ -310,7 +310,7 @@ setRelatedFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef
   wxe_util:cast(?wxHtmlWindow_SetRelatedFrame,
   <<ThisRef:32/?UI,FrameRef:32/?UI,(byte_size(Format_UC)):32/?UI,(Format_UC)/binary, 0:(((8- ((4+byte_size(Format_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowsetrelatedstatusbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowsetrelatedstatusbar">external documentation</a>.
 -spec setRelatedStatusBar(This, Bar) -> ok when
 	This::wxHtmlWindow(), Bar::integer().
 setRelatedStatusBar(#wx_ref{type=ThisT,ref=ThisRef},Bar)
@@ -319,7 +319,7 @@ setRelatedStatusBar(#wx_ref{type=ThisT,ref=ThisRef},Bar)
   wxe_util:cast(?wxHtmlWindow_SetRelatedStatusBar,
   <<ThisRef:32/?UI,Bar:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxhtmlwindow.html#wxhtmlwindowtotext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxhtmlwindow.html#wxhtmlwindowtotext">external documentation</a>.
 -spec toText(This) -> unicode:charlist() when
 	This::wxHtmlWindow().
 toText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -364,6 +364,8 @@ calcScrolledPosition(This,X,Y) -> wxScrolledWindow:calcScrolledPosition(This,X,Y
 calcScrolledPosition(This,Pt) -> wxScrolledWindow:calcScrolledPosition(This,Pt).
  %% From wxPanel
 %% @hidden
+setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
+%% @hidden
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
diff --git a/lib/wx/src/gen/wxIcon.erl b/lib/wx/src/gen/wxIcon.erl
index 0f31278732..6986d332d0 100644
--- a/lib/wx/src/gen/wxIcon.erl
+++ b/lib/wx/src/gen/wxIcon.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html">wxIcon</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxicon.html">wxIcon</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxBitmap}
 %% </p>
@@ -41,13 +41,13 @@ parent_class(wxBitmap) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxIcon() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxicon.html#wxiconwxicon">external documentation</a>.
 -spec new() -> wxIcon().
 new() ->
   wxe_util:construct(?wxIcon_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxicon.html#wxiconwxicon">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Loc) -> wxIcon() when<br />
 %% 	Loc::wx:wx_object().<br />
@@ -66,7 +66,7 @@ new(#wx_ref{type=LocT,ref=LocRef}) ->
   wxe_util:construct(?wxIcon_new_1,
   <<LocRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconwxicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxicon.html#wxiconwxicon">external documentation</a>.
 %%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
 -spec new(Filename, [Option]) -> wxIcon() when
 	Filename::unicode:chardata(),
@@ -84,7 +84,7 @@ new(Filename, Options)
   wxe_util:construct(?wxIcon_new_2,
   <<(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((4+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxicon.html#wxiconcopyfrombitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxicon.html#wxiconcopyfrombitmap">external documentation</a>.
 -spec copyFromBitmap(This, Bmp) -> ok when
 	This::wxIcon(), Bmp::wxBitmap:wxBitmap().
 copyFromBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) ->
diff --git a/lib/wx/src/gen/wxIconBundle.erl b/lib/wx/src/gen/wxIconBundle.erl
index 5e8bb7cc74..2ccd722b66 100644
--- a/lib/wx/src/gen/wxIconBundle.erl
+++ b/lib/wx/src/gen/wxIconBundle.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html">wxIconBundle</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconbundle.html">wxIconBundle</a>.
 %% @type wxIconBundle().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,13 +34,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxIconBundle() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
 -spec new() -> wxIconBundle().
 new() ->
   wxe_util:construct(?wxIconBundle_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
 -spec new(Ic) -> wxIconBundle() when
 	Ic::wxIconBundle() | wxIcon:wxIcon().
 new(#wx_ref{type=IcT,ref=IcRef}) ->
@@ -53,7 +53,7 @@ new(#wx_ref{type=IcT,ref=IcRef}) ->
   wxe_util:construct(IcOP,
   <<IcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconbundle.html#wxiconbundlewxiconbundle">external documentation</a>.
 -spec new(File, Type) -> wxIconBundle() when
 	File::unicode:chardata(), Type::integer().
 new(File,Type)
@@ -62,7 +62,7 @@ new(File,Type)
   wxe_util:construct(?wxIconBundle_new_2,
   <<(byte_size(File_UC)):32/?UI,(File_UC)/binary, 0:(((8- ((4+byte_size(File_UC)) band 16#7)) band 16#7))/unit:8,Type:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundleaddicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconbundle.html#wxiconbundleaddicon">external documentation</a>.
 -spec addIcon(This, Icon) -> ok when
 	This::wxIconBundle(), Icon::wxIcon:wxIcon().
 addIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
@@ -71,7 +71,7 @@ addIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
   wxe_util:cast(?wxIconBundle_AddIcon_1,
   <<ThisRef:32/?UI,IconRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundleaddicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconbundle.html#wxiconbundleaddicon">external documentation</a>.
 -spec addIcon(This, File, Type) -> ok when
 	This::wxIconBundle(), File::unicode:chardata(), Type::integer().
 addIcon(#wx_ref{type=ThisT,ref=ThisRef},File,Type)
@@ -89,7 +89,7 @@ getIcon(This)
  when is_record(This, wx_ref) ->
   getIcon(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconbundle.html#wxiconbundlegeticon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconbundle.html#wxiconbundlegeticon">external documentation</a>.
 %% <br /> Also:<br />
 %% getIcon(This, Size) -> wxIcon:wxIcon() when<br />
 %% 	This::wxIconBundle(), Size::{W::integer(), H::integer()}.<br />
diff --git a/lib/wx/src/gen/wxIconizeEvent.erl b/lib/wx/src/gen/wxIconizeEvent.erl
index f428ebf70f..232e6eb68c 100644
--- a/lib/wx/src/gen/wxIconizeEvent.erl
+++ b/lib/wx/src/gen/wxIconizeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconizeevent.html">wxIconizeEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconizeevent.html">wxIconizeEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>iconize</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxIconize(). #wxIconize{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxIconizeEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxiconizeevent.html#wxiconizeeventiconized">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxiconizeevent.html#wxiconizeeventiconized">external documentation</a>.
 -spec iconized(This) -> boolean() when
 	This::wxIconizeEvent().
 iconized(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxIdleEvent.erl b/lib/wx/src/gen/wxIdleEvent.erl
index a19fdcc48e..e4d6a5a059 100644
--- a/lib/wx/src/gen/wxIdleEvent.erl
+++ b/lib/wx/src/gen/wxIdleEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html">wxIdleEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxidleevent.html">wxIdleEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>idle</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxIdle(). #wxIdle{}} event record type.
@@ -45,7 +45,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxIdleEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventcansend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxidleevent.html#wxidleeventcansend">external documentation</a>.
 -spec canSend(Win) -> boolean() when
 	Win::wxWindow:wxWindow().
 canSend(#wx_ref{type=WinT,ref=WinRef}) ->
@@ -53,7 +53,7 @@ canSend(#wx_ref{type=WinT,ref=WinRef}) ->
   wxe_util:call(?wxIdleEvent_CanSend,
   <<WinRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventgetmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxidleevent.html#wxidleeventgetmode">external documentation</a>.
 %%<br /> Res = ?wxIDLE_PROCESS_ALL | ?wxIDLE_PROCESS_SPECIFIED
 -spec getMode() -> wx:wx_enum().
 getMode() ->
@@ -68,7 +68,7 @@ requestMore(This)
  when is_record(This, wx_ref) ->
   requestMore(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventrequestmore">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxidleevent.html#wxidleeventrequestmore">external documentation</a>.
 -spec requestMore(This, [Option]) -> ok when
 	This::wxIdleEvent(),
 	Option :: {needMore, boolean()}.
@@ -81,7 +81,7 @@ requestMore(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxIdleEvent_RequestMore,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventmorerequested">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxidleevent.html#wxidleeventmorerequested">external documentation</a>.
 -spec moreRequested(This) -> boolean() when
 	This::wxIdleEvent().
 moreRequested(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -89,7 +89,7 @@ moreRequested(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxIdleEvent_MoreRequested,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxidleevent.html#wxidleeventsetmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxidleevent.html#wxidleeventsetmode">external documentation</a>.
 %%<br /> Mode = ?wxIDLE_PROCESS_ALL | ?wxIDLE_PROCESS_SPECIFIED
 -spec setMode(Mode) -> ok when
 	Mode::wx:wx_enum().
diff --git a/lib/wx/src/gen/wxImage.erl b/lib/wx/src/gen/wxImage.erl
index 0edaee2979..b20cc3d613 100644
--- a/lib/wx/src/gen/wxImage.erl
+++ b/lib/wx/src/gen/wxImage.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html">wxImage</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html">wxImage</a>.
 %%
 %% All (default) image handlers are initialized.
 
@@ -52,7 +52,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxImage() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagewximage">external documentation</a>.
 -spec new() -> wxImage().
 new() ->
   wxe_util:construct(?wxImage_new_0,
@@ -66,7 +66,7 @@ new(Name)
  when is_list(Name) ->
   new(Name, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagewximage">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Name, [Option]) -> wxImage() when<br />
 %% 	Name::unicode:chardata(),<br />
@@ -93,7 +93,7 @@ new(Name, Options)
   wxe_util:construct(?wxImage_new_2,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagewximage">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Width, Height, [Option]) -> wxImage() when<br />
 %% 	Width::integer(), Height::integer(),<br />
@@ -131,7 +131,7 @@ new(Name,Mimetype, Options)
   wxe_util:construct(?wxImage_new_3_1,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Mimetype_UC)):32/?UI,(Mimetype_UC)/binary, 0:(((8- ((4+byte_size(Mimetype_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagewximage">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Width, Height, Data, [Option]) -> wxImage() when<br />
 %% 	Width::integer(), Height::integer(), Data::binary(),<br />
@@ -155,7 +155,7 @@ new(Width,Height,Data, Options)
   wxe_util:construct(?wxImage_new_4,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagewximage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagewximage">external documentation</a>.
 -spec new(Width, Height, Data, Alpha, [Option]) -> wxImage() when
 	Width::integer(), Height::integer(), Data::binary(), Alpha::binary(),
 	Option :: {static_data, boolean()}.
@@ -169,7 +169,7 @@ new(Width,Height,Data,Alpha, Options)
   wxe_util:construct(?wxImage_new_5,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageblur">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageblur">external documentation</a>.
 -spec blur(This, Radius) -> wxImage() when
 	This::wxImage(), Radius::integer().
 blur(#wx_ref{type=ThisT,ref=ThisRef},Radius)
@@ -178,7 +178,7 @@ blur(#wx_ref{type=ThisT,ref=ThisRef},Radius)
   wxe_util:call(?wxImage_Blur,
   <<ThisRef:32/?UI,Radius:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageblurhorizontal">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageblurhorizontal">external documentation</a>.
 -spec blurHorizontal(This, Radius) -> wxImage() when
 	This::wxImage(), Radius::integer().
 blurHorizontal(#wx_ref{type=ThisT,ref=ThisRef},Radius)
@@ -187,7 +187,7 @@ blurHorizontal(#wx_ref{type=ThisT,ref=ThisRef},Radius)
   wxe_util:call(?wxImage_BlurHorizontal,
   <<ThisRef:32/?UI,Radius:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageblurvertical">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageblurvertical">external documentation</a>.
 -spec blurVertical(This, Radius) -> wxImage() when
 	This::wxImage(), Radius::integer().
 blurVertical(#wx_ref{type=ThisT,ref=ThisRef},Radius)
@@ -204,7 +204,7 @@ convertAlphaToMask(This)
  when is_record(This, wx_ref) ->
   convertAlphaToMask(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageconvertalphatomask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageconvertalphatomask">external documentation</a>.
 -spec convertAlphaToMask(This, [Option]) -> boolean() when
 	This::wxImage(),
 	Option :: {threshold, integer()}.
@@ -225,7 +225,7 @@ convertToGreyscale(This)
  when is_record(This, wx_ref) ->
   convertToGreyscale(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageconverttogreyscale">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageconverttogreyscale">external documentation</a>.
 -spec convertToGreyscale(This, [Option]) -> wxImage() when
 	This::wxImage(),
 	Option :: {lr, number()}
@@ -242,7 +242,7 @@ convertToGreyscale(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_ConvertToGreyscale,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageconverttomono">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageconverttomono">external documentation</a>.
 -spec convertToMono(This, R, G, B) -> wxImage() when
 	This::wxImage(), R::integer(), G::integer(), B::integer().
 convertToMono(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
@@ -251,7 +251,7 @@ convertToMono(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
   wxe_util:call(?wxImage_ConvertToMono,
   <<ThisRef:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecopy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagecopy">external documentation</a>.
 -spec copy(This) -> wxImage() when
 	This::wxImage().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -267,7 +267,7 @@ create(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   create(This,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagecreate">external documentation</a>.
 %% <br /> Also:<br />
 %% create(This, Width, Height, [Option]) -> boolean() when<br />
 %% 	This::wxImage(), Width::integer(), Height::integer(),<br />
@@ -291,7 +291,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxImage_Create_3,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagecreate">external documentation</a>.
 %% <br /> Also:<br />
 %% create(This, Width, Height, Data, [Option]) -> boolean() when<br />
 %% 	This::wxImage(), Width::integer(), Height::integer(), Data::binary(),<br />
@@ -316,7 +316,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,Data, Options)
   wxe_util:call(?wxImage_Create_4,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagecreate">external documentation</a>.
 -spec create(This, Width, Height, Data, Alpha, [Option]) -> boolean() when
 	This::wxImage(), Width::integer(), Height::integer(), Data::binary(), Alpha::binary(),
 	Option :: {static_data, boolean()}.
@@ -331,7 +331,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Width,Height,Data,Alpha, Options)
   wxe_util:call(?wxImage_Create_5,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagedestroy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagedestroy">external documentation</a>.
 -spec 'Destroy'(This) -> ok when
 	This::wxImage().
 'Destroy'(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -348,7 +348,7 @@ findFirstUnusedColour(This)
  when is_record(This, wx_ref) ->
   findFirstUnusedColour(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagefindfirstunusedcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagefindfirstunusedcolour">external documentation</a>.
 -spec findFirstUnusedColour(This, [Option]) -> Result when
 	Result :: {Res ::boolean(), R::integer(), G::integer(), B::integer()},
 	This::wxImage(),
@@ -366,13 +366,13 @@ findFirstUnusedColour(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_FindFirstUnusedColour,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimageextwildcard">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetimageextwildcard">external documentation</a>.
 -spec getImageExtWildcard() -> unicode:charlist().
 getImageExtWildcard() ->
   wxe_util:call(?wxImage_GetImageExtWildcard,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetalpha">external documentation</a>.
 -spec getAlpha(This) -> binary() when
 	This::wxImage().
 getAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -380,7 +380,7 @@ getAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetAlpha_0,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetalpha">external documentation</a>.
 -spec getAlpha(This, X, Y) -> integer() when
 	This::wxImage(), X::integer(), Y::integer().
 getAlpha(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -389,7 +389,7 @@ getAlpha(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxImage_GetAlpha_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetblue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetblue">external documentation</a>.
 -spec getBlue(This, X, Y) -> integer() when
 	This::wxImage(), X::integer(), Y::integer().
 getBlue(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -398,7 +398,7 @@ getBlue(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxImage_GetBlue,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetdata">external documentation</a>.
 -spec getData(This) -> binary() when
 	This::wxImage().
 getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -406,7 +406,7 @@ getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetgreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetgreen">external documentation</a>.
 -spec getGreen(This, X, Y) -> integer() when
 	This::wxImage(), X::integer(), Y::integer().
 getGreen(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -423,7 +423,7 @@ getImageCount(Name)
  when is_list(Name) ->
   getImageCount(Name, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetimagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetimagecount">external documentation</a>.
 %%<br /> Type = ?wxBITMAP_TYPE_INVALID | ?wxBITMAP_TYPE_BMP | ?wxBITMAP_TYPE_BMP_RESOURCE | ?wxBITMAP_TYPE_RESOURCE | ?wxBITMAP_TYPE_ICO | ?wxBITMAP_TYPE_ICO_RESOURCE | ?wxBITMAP_TYPE_CUR | ?wxBITMAP_TYPE_CUR_RESOURCE | ?wxBITMAP_TYPE_XBM | ?wxBITMAP_TYPE_XBM_DATA | ?wxBITMAP_TYPE_XPM | ?wxBITMAP_TYPE_XPM_DATA | ?wxBITMAP_TYPE_TIF | ?wxBITMAP_TYPE_TIF_RESOURCE | ?wxBITMAP_TYPE_GIF | ?wxBITMAP_TYPE_GIF_RESOURCE | ?wxBITMAP_TYPE_PNG | ?wxBITMAP_TYPE_PNG_RESOURCE | ?wxBITMAP_TYPE_JPEG | ?wxBITMAP_TYPE_JPEG_RESOURCE | ?wxBITMAP_TYPE_PNM | ?wxBITMAP_TYPE_PNM_RESOURCE | ?wxBITMAP_TYPE_PCX | ?wxBITMAP_TYPE_PCX_RESOURCE | ?wxBITMAP_TYPE_PICT | ?wxBITMAP_TYPE_PICT_RESOURCE | ?wxBITMAP_TYPE_ICON | ?wxBITMAP_TYPE_ICON_RESOURCE | ?wxBITMAP_TYPE_ANI | ?wxBITMAP_TYPE_IFF | ?wxBITMAP_TYPE_TGA | ?wxBITMAP_TYPE_MACCURSOR | ?wxBITMAP_TYPE_MACCURSOR_RESOURCE | ?wxBITMAP_TYPE_ANY
 -spec getImageCount(Name, [Option]) -> integer() when
 	Name::unicode:chardata(),
@@ -437,7 +437,7 @@ getImageCount(Name, Options)
   wxe_util:call(?wxImage_GetImageCount,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetheight">external documentation</a>.
 -spec getHeight(This) -> integer() when
 	This::wxImage().
 getHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -445,7 +445,7 @@ getHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetHeight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetmaskblue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetmaskblue">external documentation</a>.
 -spec getMaskBlue(This) -> integer() when
 	This::wxImage().
 getMaskBlue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -453,7 +453,7 @@ getMaskBlue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetMaskBlue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetmaskgreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetmaskgreen">external documentation</a>.
 -spec getMaskGreen(This) -> integer() when
 	This::wxImage().
 getMaskGreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -461,7 +461,7 @@ getMaskGreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetMaskGreen,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetmaskred">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetmaskred">external documentation</a>.
 -spec getMaskRed(This) -> integer() when
 	This::wxImage().
 getMaskRed(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -469,7 +469,7 @@ getMaskRed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetMaskRed,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetorfindmaskcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetorfindmaskcolour">external documentation</a>.
 -spec getOrFindMaskColour(This) -> Result when
 	Result ::{Res ::boolean(), R::integer(), G::integer(), B::integer()},
 	This::wxImage().
@@ -478,7 +478,7 @@ getOrFindMaskColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetOrFindMaskColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetpalette">external documentation</a>.
 -spec getPalette(This) -> wxPalette:wxPalette() when
 	This::wxImage().
 getPalette(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -486,7 +486,7 @@ getPalette(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetPalette,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetred">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetred">external documentation</a>.
 -spec getRed(This, X, Y) -> integer() when
 	This::wxImage(), X::integer(), Y::integer().
 getRed(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -495,7 +495,7 @@ getRed(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxImage_GetRed,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetsubimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetsubimage">external documentation</a>.
 -spec getSubImage(This, Rect) -> wxImage() when
 	This::wxImage(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 getSubImage(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
@@ -504,7 +504,7 @@ getSubImage(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxImage_GetSubImage,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetwidth">external documentation</a>.
 -spec getWidth(This) -> integer() when
 	This::wxImage().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -512,7 +512,7 @@ getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagehasalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagehasalpha">external documentation</a>.
 -spec hasAlpha(This) -> boolean() when
 	This::wxImage().
 hasAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -520,7 +520,7 @@ hasAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_HasAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagehasmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagehasmask">external documentation</a>.
 -spec hasMask(This) -> boolean() when
 	This::wxImage().
 hasMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -528,7 +528,7 @@ hasMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_HasMask,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetoption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetoption">external documentation</a>.
 -spec getOption(This, Name) -> unicode:charlist() when
 	This::wxImage(), Name::unicode:chardata().
 getOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -538,7 +538,7 @@ getOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_GetOption,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagegetoptionint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagegetoptionint">external documentation</a>.
 -spec getOptionInt(This, Name) -> integer() when
 	This::wxImage(), Name::unicode:chardata().
 getOptionInt(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -548,7 +548,7 @@ getOptionInt(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_GetOptionInt,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagehasoption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagehasoption">external documentation</a>.
 -spec hasOption(This, Name) -> boolean() when
 	This::wxImage(), Name::unicode:chardata().
 hasOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -558,7 +558,7 @@ hasOption(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_HasOption,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageinitalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageinitalpha">external documentation</a>.
 -spec initAlpha(This) -> ok when
 	This::wxImage().
 initAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -566,7 +566,7 @@ initAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxImage_InitAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageinitstandardhandlers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageinitstandardhandlers">external documentation</a>.
 -spec initStandardHandlers() -> ok.
 initStandardHandlers() ->
   wxe_util:cast(?wxImage_InitStandardHandlers,
@@ -580,7 +580,7 @@ isTransparent(This,X,Y)
  when is_record(This, wx_ref),is_integer(X),is_integer(Y) ->
   isTransparent(This,X,Y, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageistransparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageistransparent">external documentation</a>.
 -spec isTransparent(This, X, Y, [Option]) -> boolean() when
 	This::wxImage(), X::integer(), Y::integer(),
 	Option :: {threshold, integer()}.
@@ -601,7 +601,7 @@ loadFile(This,Name)
  when is_record(This, wx_ref),is_list(Name) ->
   loadFile(This,Name, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageloadfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageloadfile">external documentation</a>.
 -spec loadFile(This, Name, [Option]) -> boolean() when
 	This::wxImage(), Name::unicode:chardata(),
 	Option :: {type, integer()}
@@ -617,7 +617,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name, Options)
   wxe_util:call(?wxImage_LoadFile_2,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageloadfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageloadfile">external documentation</a>.
 -spec loadFile(This, Name, Mimetype, [Option]) -> boolean() when
 	This::wxImage(), Name::unicode:chardata(), Mimetype::unicode:chardata(),
 	Option :: {index, integer()}.
@@ -632,7 +632,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Name,Mimetype, Options)
   wxe_util:call(?wxImage_LoadFile_3,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Mimetype_UC)):32/?UI,(Mimetype_UC)/binary, 0:(((8- ((4+byte_size(Mimetype_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageok">external documentation</a>.
 -spec ok(This) -> boolean() when
 	This::wxImage().
 ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -640,7 +640,7 @@ ok(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImage_Ok,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageremovehandler">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageremovehandler">external documentation</a>.
 -spec removeHandler(Name) -> boolean() when
 	Name::unicode:chardata().
 removeHandler(Name)
@@ -657,7 +657,7 @@ mirror(This)
  when is_record(This, wx_ref) ->
   mirror(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagemirror">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagemirror">external documentation</a>.
 -spec mirror(This, [Option]) -> wxImage() when
 	This::wxImage(),
 	Option :: {horizontally, boolean()}.
@@ -670,7 +670,7 @@ mirror(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_Mirror,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagereplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagereplace">external documentation</a>.
 -spec replace(This, R1, G1, B1, R2, G2, B2) -> ok when
 	This::wxImage(), R1::integer(), G1::integer(), B1::integer(), R2::integer(), G2::integer(), B2::integer().
 replace(#wx_ref{type=ThisT,ref=ThisRef},R1,G1,B1,R2,G2,B2)
@@ -687,7 +687,7 @@ rescale(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   rescale(This,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerescale">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagerescale">external documentation</a>.
 %%<br /> Quality = integer
 -spec rescale(This, Width, Height, [Option]) -> wxImage() when
 	This::wxImage(), Width::integer(), Height::integer(),
@@ -709,7 +709,7 @@ resize(This,Size={SizeW,SizeH},Pos={PosX,PosY})
  when is_record(This, wx_ref),is_integer(SizeW),is_integer(SizeH),is_integer(PosX),is_integer(PosY) ->
   resize(This,Size,Pos, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximageresize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximageresize">external documentation</a>.
 -spec resize(This, Size, Pos, [Option]) -> wxImage() when
 	This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()},
 	Option :: {r, integer()}
@@ -734,7 +734,7 @@ rotate(This,Angle,Centre_of_rotation={Centre_of_rotationX,Centre_of_rotationY})
  when is_record(This, wx_ref),is_number(Angle),is_integer(Centre_of_rotationX),is_integer(Centre_of_rotationY) ->
   rotate(This,Angle,Centre_of_rotation, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerotate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagerotate">external documentation</a>.
 -spec rotate(This, Angle, Centre_of_rotation, [Option]) -> wxImage() when
 	This::wxImage(), Angle::number(), Centre_of_rotation::{X::integer(), Y::integer()},
 	Option :: {interpolating, boolean()}
@@ -749,7 +749,7 @@ rotate(#wx_ref{type=ThisT,ref=ThisRef},Angle,{Centre_of_rotationX,Centre_of_rota
   wxe_util:call(?wxImage_Rotate,
   <<ThisRef:32/?UI,0:32,Angle:64/?F,Centre_of_rotationX:32/?UI,Centre_of_rotationY:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerotatehue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagerotatehue">external documentation</a>.
 -spec rotateHue(This, Angle) -> ok when
 	This::wxImage(), Angle::number().
 rotateHue(#wx_ref{type=ThisT,ref=ThisRef},Angle)
@@ -766,7 +766,7 @@ rotate90(This)
  when is_record(This, wx_ref) ->
   rotate90(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagerotate90">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagerotate90">external documentation</a>.
 -spec rotate90(This, [Option]) -> wxImage() when
 	This::wxImage(),
 	Option :: {clockwise, boolean()}.
@@ -779,7 +779,7 @@ rotate90(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxImage_Rotate90,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesavefile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesavefile">external documentation</a>.
 -spec saveFile(This, Name) -> boolean() when
 	This::wxImage(), Name::unicode:chardata().
 saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -789,7 +789,7 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxImage_SaveFile_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesavefile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesavefile">external documentation</a>.
 %% <br /> Also:<br />
 %% saveFile(This, Name, Mimetype) -> boolean() when<br />
 %% 	This::wxImage(), Name::unicode:chardata(), Mimetype::unicode:chardata().<br />
@@ -820,7 +820,7 @@ scale(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   scale(This,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagescale">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagescale">external documentation</a>.
 %%<br /> Quality = integer
 -spec scale(This, Width, Height, [Option]) -> wxImage() when
 	This::wxImage(), Width::integer(), Height::integer(),
@@ -842,7 +842,7 @@ size(This,Size={SizeW,SizeH},Pos={PosX,PosY})
  when is_record(This, wx_ref),is_integer(SizeW),is_integer(SizeH),is_integer(PosX),is_integer(PosY) ->
   size(This,Size,Pos, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesize">external documentation</a>.
 -spec size(This, Size, Pos, [Option]) -> wxImage() when
 	This::wxImage(), Size::{W::integer(), H::integer()}, Pos::{X::integer(), Y::integer()},
 	Option :: {r, integer()}
@@ -867,7 +867,7 @@ setAlpha(This,Alpha)
  when is_record(This, wx_ref),is_binary(Alpha) ->
   setAlpha(This,Alpha, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetalpha">external documentation</a>.
 -spec setAlpha(This, Alpha, [Option]) -> ok when
 	This::wxImage(), Alpha::binary(),
 	Option :: {static_data, boolean()}.
@@ -881,7 +881,7 @@ setAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha, Options)
   wxe_util:cast(?wxImage_SetAlpha_2,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetalpha">external documentation</a>.
 -spec setAlpha(This, X, Y, Alpha) -> ok when
 	This::wxImage(), X::integer(), Y::integer(), Alpha::integer().
 setAlpha(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Alpha)
@@ -898,7 +898,7 @@ setData(This,Data)
  when is_record(This, wx_ref),is_binary(Data) ->
   setData(This,Data, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetdata">external documentation</a>.
 -spec setData(This, Data, [Option]) -> ok when
 	This::wxImage(), Data::binary(),
 	Option :: {static_data, boolean()}.
@@ -920,7 +920,7 @@ setData(This,Data,New_width,New_height)
  when is_record(This, wx_ref),is_binary(Data),is_integer(New_width),is_integer(New_height) ->
   setData(This,Data,New_width,New_height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetdata">external documentation</a>.
 -spec setData(This, Data, New_width, New_height, [Option]) -> ok when
 	This::wxImage(), Data::binary(), New_width::integer(), New_height::integer(),
 	Option :: {static_data, boolean()}.
@@ -942,7 +942,7 @@ setMask(This)
  when is_record(This, wx_ref) ->
   setMask(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetmask">external documentation</a>.
 -spec setMask(This, [Option]) -> ok when
 	This::wxImage(),
 	Option :: {mask, boolean()}.
@@ -955,7 +955,7 @@ setMask(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxImage_SetMask,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetmaskcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetmaskcolour">external documentation</a>.
 -spec setMaskColour(This, R, G, B) -> ok when
 	This::wxImage(), R::integer(), G::integer(), B::integer().
 setMaskColour(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
@@ -964,7 +964,7 @@ setMaskColour(#wx_ref{type=ThisT,ref=ThisRef},R,G,B)
   wxe_util:cast(?wxImage_SetMaskColour,
   <<ThisRef:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetmaskfromimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetmaskfromimage">external documentation</a>.
 -spec setMaskFromImage(This, Mask, Mr, Mg, Mb) -> boolean() when
 	This::wxImage(), Mask::wxImage(), Mr::integer(), Mg::integer(), Mb::integer().
 setMaskFromImage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef},Mr,Mg,Mb)
@@ -974,7 +974,7 @@ setMaskFromImage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MaskT,ref=MaskRef}
   wxe_util:call(?wxImage_SetMaskFromImage,
   <<ThisRef:32/?UI,MaskRef:32/?UI,Mr:32/?UI,Mg:32/?UI,Mb:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetoption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetoption">external documentation</a>.
 %% <br /> Also:<br />
 %% setOption(This, Name, Value) -> ok when<br />
 %% 	This::wxImage(), Name::unicode:chardata(), Value::unicode:chardata().<br />
@@ -997,7 +997,7 @@ setOption(#wx_ref{type=ThisT,ref=ThisRef},Name,Value)
   wxe_util:cast(?wxImage_SetOption_2_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((4+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetpalette">external documentation</a>.
 -spec setPalette(This, Palette) -> ok when
 	This::wxImage(), Palette::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}) ->
@@ -1006,7 +1006,7 @@ setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PaletteT,ref=PaletteRef}
   wxe_util:cast(?wxImage_SetPalette,
   <<ThisRef:32/?UI,PaletteRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetrgb">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetrgb">external documentation</a>.
 -spec setRGB(This, Rect, R, G, B) -> ok when
 	This::wxImage(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}, R::integer(), G::integer(), B::integer().
 setRGB(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},R,G,B)
@@ -1015,7 +1015,7 @@ setRGB(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH},R,G,B)
   wxe_util:cast(?wxImage_SetRGB_4,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI,R:32/?UI,G:32/?UI,B:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximage.html#wximagesetrgb">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximage.html#wximagesetrgb">external documentation</a>.
 -spec setRGB(This, X, Y, R, G, B) -> ok when
 	This::wxImage(), X::integer(), Y::integer(), R::integer(), G::integer(), B::integer().
 setRGB(#wx_ref{type=ThisT,ref=ThisRef},X,Y,R,G,B)
diff --git a/lib/wx/src/gen/wxImageList.erl b/lib/wx/src/gen/wxImageList.erl
index e9d936d129..8f33cc78fb 100644
--- a/lib/wx/src/gen/wxImageList.erl
+++ b/lib/wx/src/gen/wxImageList.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html">wxImageList</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html">wxImageList</a>.
 %% @type wxImageList().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -36,7 +36,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxImageList() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistwximagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistwximagelist">external documentation</a>.
 -spec new() -> wxImageList().
 new() ->
   wxe_util:construct(?wxImageList_new_0,
@@ -50,7 +50,7 @@ new(Width,Height)
  when is_integer(Width),is_integer(Height) ->
   new(Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistwximagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistwximagelist">external documentation</a>.
 -spec new(Width, Height, [Option]) -> wxImageList() when
 	Width::integer(), Height::integer(),
 	Option :: {mask, boolean()}
@@ -64,7 +64,7 @@ new(Width,Height, Options)
   wxe_util:construct(?wxImageList_new_3,
   <<Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistadd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistadd">external documentation</a>.
 -spec add(This, Bitmap) -> integer() when
 	This::wxImageList(), Bitmap::wxBitmap:wxBitmap().
 add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
@@ -73,7 +73,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   wxe_util:call(?wxImageList_Add_1,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistadd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistadd">external documentation</a>.
 %% <br /> Also:<br />
 %% add(This, Bitmap, MaskColour) -> integer() when<br />
 %% 	This::wxImageList(), Bitmap::wxBitmap:wxBitmap(), MaskColour::wx:wx_colour().<br />
@@ -103,7 +103,7 @@ create(This,Width,Height)
  when is_record(This, wx_ref),is_integer(Width),is_integer(Height) ->
   create(This,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistcreate">external documentation</a>.
 -spec create(This, Width, Height, [Option]) -> boolean() when
 	This::wxImageList(), Width::integer(), Height::integer(),
 	Option :: {mask, boolean()}
@@ -126,7 +126,7 @@ draw(This,Index,Dc,X,Y)
  when is_record(This, wx_ref),is_integer(Index),is_record(Dc, wx_ref),is_integer(X),is_integer(Y) ->
   draw(This,Index,Dc,X,Y, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistdraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistdraw">external documentation</a>.
 -spec draw(This, Index, Dc, X, Y, [Option]) -> boolean() when
 	This::wxImageList(), Index::integer(), Dc::wxDC:wxDC(), X::integer(), Y::integer(),
 	Option :: {flags, integer()}
@@ -142,7 +142,7 @@ draw(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=DcT,ref=DcRef},X,Y, Opti
   wxe_util:call(?wxImageList_Draw,
   <<ThisRef:32/?UI,Index:32/?UI,DcRef:32/?UI,X:32/?UI,Y:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistgetbitmap">external documentation</a>.
 -spec getBitmap(This, Index) -> wxBitmap:wxBitmap() when
 	This::wxImageList(), Index::integer().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef},Index)
@@ -151,7 +151,7 @@ getBitmap(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxImageList_GetBitmap,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgeticon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistgeticon">external documentation</a>.
 -spec getIcon(This, Index) -> wxIcon:wxIcon() when
 	This::wxImageList(), Index::integer().
 getIcon(#wx_ref{type=ThisT,ref=ThisRef},Index)
@@ -160,7 +160,7 @@ getIcon(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxImageList_GetIcon,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgetimagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistgetimagecount">external documentation</a>.
 -spec getImageCount(This) -> integer() when
 	This::wxImageList().
 getImageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -168,7 +168,7 @@ getImageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImageList_GetImageCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistgetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistgetsize">external documentation</a>.
 -spec getSize(This, Index) -> Result when
 	Result ::{Res ::boolean(), Width::integer(), Height::integer()},
 	This::wxImageList(), Index::integer().
@@ -178,7 +178,7 @@ getSize(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxImageList_GetSize,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistremove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistremove">external documentation</a>.
 -spec remove(This, Index) -> boolean() when
 	This::wxImageList(), Index::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},Index)
@@ -187,7 +187,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxImageList_Remove,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistremoveall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistremoveall">external documentation</a>.
 -spec removeAll(This) -> boolean() when
 	This::wxImageList().
 removeAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -195,7 +195,7 @@ removeAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxImageList_RemoveAll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistreplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistreplace">external documentation</a>.
 -spec replace(This, Index, Bitmap) -> boolean() when
 	This::wxImageList(), Index::integer(), Bitmap::wxBitmap:wxBitmap().
 replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef})
@@ -205,7 +205,7 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef
   wxe_util:call(?wxImageList_Replace_2,
   <<ThisRef:32/?UI,Index:32/?UI,BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wximagelist.html#wximagelistreplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wximagelist.html#wximagelistreplace">external documentation</a>.
 -spec replace(This, Index, Bitmap, Mask) -> boolean() when
 	This::wxImageList(), Index::integer(), Bitmap::wxBitmap:wxBitmap(), Mask::wxBitmap:wxBitmap().
 replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=BitmapT,ref=BitmapRef},#wx_ref{type=MaskT,ref=MaskRef})
diff --git a/lib/wx/src/gen/wxInitDialogEvent.erl b/lib/wx/src/gen/wxInitDialogEvent.erl
new file mode 100644
index 0000000000..c8fe6042ac
--- /dev/null
+++ b/lib/wx/src/gen/wxInitDialogEvent.erl
@@ -0,0 +1,64 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
+%%
+%% The 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 file is generated DO NOT EDIT
+
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxinitdialogevent.html">wxInitDialogEvent</a>.
+%% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
+%% <dd><em>init_dialog</em></dd></dl>
+%% See also the message variant {@link wxEvtHandler:wxInitDialog(). #wxInitDialog{}} event record type.
+%%
+%% <p>This class is derived (and can use functions) from:
+%% <br />{@link wxEvent}
+%% </p>
+%% @type wxInitDialogEvent().  An object reference, The representation is internal
+%% and can be changed without notice. It can't be used for comparsion
+%% stored on disc or distributed for use on other nodes.
+
+-module(wxInitDialogEvent).
+-include("wxe.hrl").
+-export([]).
+
+%% inherited exports
+-export([getId/1,getSkipped/1,getTimestamp/1,isCommandEvent/1,parent_class/1,
+  resumePropagation/2,shouldPropagate/1,skip/1,skip/2,stopPropagation/1]).
+
+-export_type([wxInitDialogEvent/0]).
+%% @hidden
+parent_class(wxEvent) -> true;
+parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
+
+-type wxInitDialogEvent() :: wx:wx_object().
+ %% From wxEvent
+%% @hidden
+stopPropagation(This) -> wxEvent:stopPropagation(This).
+%% @hidden
+skip(This, Options) -> wxEvent:skip(This, Options).
+%% @hidden
+skip(This) -> wxEvent:skip(This).
+%% @hidden
+shouldPropagate(This) -> wxEvent:shouldPropagate(This).
+%% @hidden
+resumePropagation(This,PropagationLevel) -> wxEvent:resumePropagation(This,PropagationLevel).
+%% @hidden
+isCommandEvent(This) -> wxEvent:isCommandEvent(This).
+%% @hidden
+getTimestamp(This) -> wxEvent:getTimestamp(This).
+%% @hidden
+getSkipped(This) -> wxEvent:getSkipped(This).
+%% @hidden
+getId(This) -> wxEvent:getId(This).
diff --git a/lib/wx/src/gen/wxJoystickEvent.erl b/lib/wx/src/gen/wxJoystickEvent.erl
index 979c36cd8c..12a8df69c2 100644
--- a/lib/wx/src/gen/wxJoystickEvent.erl
+++ b/lib/wx/src/gen/wxJoystickEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html">wxJoystickEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html">wxJoystickEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>joy_button_down</em>, <em>joy_button_up</em>, <em>joy_move</em>, <em>joy_zmove</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxJoystick(). #wxJoystick{}} event record type.
@@ -53,7 +53,7 @@ buttonDown(This)
  when is_record(This, wx_ref) ->
   buttonDown(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventbuttondown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventbuttondown">external documentation</a>.
 -spec buttonDown(This, [Option]) -> boolean() when
 	This::wxJoystickEvent(),
 	Option :: {but, integer()}.
@@ -74,7 +74,7 @@ buttonIsDown(This)
  when is_record(This, wx_ref) ->
   buttonIsDown(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventbuttonisdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventbuttonisdown">external documentation</a>.
 -spec buttonIsDown(This, [Option]) -> boolean() when
 	This::wxJoystickEvent(),
 	Option :: {but, integer()}.
@@ -95,7 +95,7 @@ buttonUp(This)
  when is_record(This, wx_ref) ->
   buttonUp(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventbuttonup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventbuttonup">external documentation</a>.
 -spec buttonUp(This, [Option]) -> boolean() when
 	This::wxJoystickEvent(),
 	Option :: {but, integer()}.
@@ -108,7 +108,7 @@ buttonUp(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxJoystickEvent_ButtonUp,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetbuttonchange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventgetbuttonchange">external documentation</a>.
 -spec getButtonChange(This) -> integer() when
 	This::wxJoystickEvent().
 getButtonChange(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -116,7 +116,7 @@ getButtonChange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxJoystickEvent_GetButtonChange,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetbuttonstate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventgetbuttonstate">external documentation</a>.
 -spec getButtonState(This) -> integer() when
 	This::wxJoystickEvent().
 getButtonState(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -124,7 +124,7 @@ getButtonState(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxJoystickEvent_GetButtonState,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetjoystick">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventgetjoystick">external documentation</a>.
 -spec getJoystick(This) -> integer() when
 	This::wxJoystickEvent().
 getJoystick(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -132,7 +132,7 @@ getJoystick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxJoystickEvent_GetJoystick,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxJoystickEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -140,7 +140,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxJoystickEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventgetzposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventgetzposition">external documentation</a>.
 -spec getZPosition(This) -> integer() when
 	This::wxJoystickEvent().
 getZPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ getZPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxJoystickEvent_GetZPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventisbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventisbutton">external documentation</a>.
 -spec isButton(This) -> boolean() when
 	This::wxJoystickEvent().
 isButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -156,7 +156,7 @@ isButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxJoystickEvent_IsButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventismove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventismove">external documentation</a>.
 -spec isMove(This) -> boolean() when
 	This::wxJoystickEvent().
 isMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -164,7 +164,7 @@ isMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxJoystickEvent_IsMove,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxjoystickevent.html#wxjoystickeventiszmove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxjoystickevent.html#wxjoystickeventiszmove">external documentation</a>.
 -spec isZMove(This) -> boolean() when
 	This::wxJoystickEvent().
 isZMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxKeyEvent.erl b/lib/wx/src/gen/wxKeyEvent.erl
index 107d4be685..6d25b50ea7 100644
--- a/lib/wx/src/gen/wxKeyEvent.erl
+++ b/lib/wx/src/gen/wxKeyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html">wxKeyEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html">wxKeyEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>char</em>, <em>char_hook</em>, <em>key_down</em>, <em>key_up</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxKey(). #wxKey{}} event record type.
@@ -45,7 +45,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxKeyEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventaltdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventaltdown">external documentation</a>.
 -spec altDown(This) -> boolean() when
 	This::wxKeyEvent().
 altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -53,7 +53,7 @@ altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_AltDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventcmddown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventcmddown">external documentation</a>.
 -spec cmdDown(This) -> boolean() when
 	This::wxKeyEvent().
 cmdDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -61,7 +61,7 @@ cmdDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_CmdDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventcontroldown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventcontroldown">external documentation</a>.
 -spec controlDown(This) -> boolean() when
 	This::wxKeyEvent().
 controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -69,7 +69,7 @@ controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_ControlDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetkeycode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgetkeycode">external documentation</a>.
 -spec getKeyCode(This) -> integer() when
 	This::wxKeyEvent().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -77,7 +77,7 @@ getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetmodifiers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgetmodifiers">external documentation</a>.
 -spec getModifiers(This) -> integer() when
 	This::wxKeyEvent().
 getModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -85,7 +85,7 @@ getModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetModifiers,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxKeyEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -93,7 +93,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetrawkeycode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgetrawkeycode">external documentation</a>.
 -spec getRawKeyCode(This) -> integer() when
 	This::wxKeyEvent().
 getRawKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -101,7 +101,7 @@ getRawKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetRawKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetrawkeyflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgetrawkeyflags">external documentation</a>.
 -spec getRawKeyFlags(This) -> integer() when
 	This::wxKeyEvent().
 getRawKeyFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -109,7 +109,7 @@ getRawKeyFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetRawKeyFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetunicodekey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgetunicodekey">external documentation</a>.
 -spec getUnicodeKey(This) -> integer() when
 	This::wxKeyEvent().
 getUnicodeKey(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -117,7 +117,7 @@ getUnicodeKey(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetUnicodeKey,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgetx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgetx">external documentation</a>.
 -spec getX(This) -> integer() when
 	This::wxKeyEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -125,7 +125,7 @@ getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventgety">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventgety">external documentation</a>.
 -spec getY(This) -> integer() when
 	This::wxKeyEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -133,7 +133,7 @@ getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventhasmodifiers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventhasmodifiers">external documentation</a>.
 -spec hasModifiers(This) -> boolean() when
 	This::wxKeyEvent().
 hasModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -141,7 +141,7 @@ hasModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_HasModifiers,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventmetadown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventmetadown">external documentation</a>.
 -spec metaDown(This) -> boolean() when
 	This::wxKeyEvent().
 metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -149,7 +149,7 @@ metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxKeyEvent_MetaDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxkeyevent.html#wxkeyeventshiftdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxkeyevent.html#wxkeyeventshiftdown">external documentation</a>.
 -spec shiftDown(This) -> boolean() when
 	This::wxKeyEvent().
 shiftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxLayoutAlgorithm.erl b/lib/wx/src/gen/wxLayoutAlgorithm.erl
index d0736e2379..c99c6f9a46 100644
--- a/lib/wx/src/gen/wxLayoutAlgorithm.erl
+++ b/lib/wx/src/gen/wxLayoutAlgorithm.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html">wxLayoutAlgorithm</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlayoutalgorithm.html">wxLayoutAlgorithm</a>.
 %% @type wxLayoutAlgorithm().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -35,7 +35,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxLayoutAlgorithm() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmwxlayoutalgorithm">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlayoutalgorithm.html#wxlayoutalgorithmwxlayoutalgorithm">external documentation</a>.
 -spec new() -> wxLayoutAlgorithm().
 new() ->
   wxe_util:construct(?wxLayoutAlgorithm_new,
@@ -49,7 +49,7 @@ layoutFrame(This,Frame)
  when is_record(This, wx_ref),is_record(Frame, wx_ref) ->
   layoutFrame(This,Frame, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutframe">external documentation</a>.
 -spec layoutFrame(This, Frame, [Option]) -> boolean() when
 	This::wxLayoutAlgorithm(), Frame::wxFrame:wxFrame(),
 	Option :: {mainWindow, wxWindow:wxWindow()}.
@@ -71,7 +71,7 @@ layoutMDIFrame(This,Frame)
  when is_record(This, wx_ref),is_record(Frame, wx_ref) ->
   layoutMDIFrame(This,Frame, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutmdiframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutmdiframe">external documentation</a>.
 -spec layoutMDIFrame(This, Frame, [Option]) -> boolean() when
 	This::wxLayoutAlgorithm(), Frame::wxMDIParentFrame:wxMDIParentFrame(),
 	Option :: {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}.
@@ -93,7 +93,7 @@ layoutWindow(This,Frame)
  when is_record(This, wx_ref),is_record(Frame, wx_ref) ->
   layoutWindow(This,Frame, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlayoutalgorithm.html#wxlayoutalgorithmlayoutwindow">external documentation</a>.
 -spec layoutWindow(This, Frame, [Option]) -> boolean() when
 	This::wxLayoutAlgorithm(), Frame::wxWindow:wxWindow(),
 	Option :: {mainWindow, wxWindow:wxWindow()}.
diff --git a/lib/wx/src/gen/wxListBox.erl b/lib/wx/src/gen/wxListBox.erl
index fa4cbd01d5..732cd351f2 100644
--- a/lib/wx/src/gen/wxListBox.erl
+++ b/lib/wx/src/gen/wxListBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html">wxListBox</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html">wxListBox</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControlWithItems}
 %% <br />{@link wxControl}
@@ -83,7 +83,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxListBox() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxwxlistbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxwxlistbox">external documentation</a>.
 -spec new() -> wxListBox().
 new() ->
   wxe_util:construct(?wxListBox_new_0,
@@ -97,7 +97,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxwxlistbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxwxlistbox">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxListBox() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -126,7 +126,7 @@ create(This,Parent,Id,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Pos,Size,Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxcreate">external documentation</a>.
 -spec create(This, Parent, Id, Pos, Size, Choices, [Option]) -> boolean() when
 	This::wxListBox(), Parent::wxWindow:wxWindow(), Id::integer(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[unicode:chardata()],
 	Option :: {style, integer()}
@@ -144,7 +144,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,{P
   wxe_util:call(?wxListBox_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxdeselect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxdeselect">external documentation</a>.
 -spec deselect(This, N) -> ok when
 	This::wxListBox(), N::integer().
 deselect(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -153,7 +153,7 @@ deselect(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:cast(?wxListBox_Deselect,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxgetselections">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxgetselections">external documentation</a>.
 -spec getSelections(This) -> Result when
 	Result ::{Res ::integer(), ASelections::[integer()]},
 	This::wxListBox().
@@ -162,7 +162,7 @@ getSelections(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListBox_GetSelections,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxinsertitems">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxinsertitems">external documentation</a>.
 -spec insertItems(This, Items, Pos) -> ok when
 	This::wxListBox(), Items::[unicode:chardata()], Pos::integer().
 insertItems(#wx_ref{type=ThisT,ref=ThisRef},Items,Pos)
@@ -173,7 +173,7 @@ insertItems(#wx_ref{type=ThisT,ref=ThisRef},Items,Pos)
   wxe_util:cast(?wxListBox_InsertItems,
   <<ThisRef:32/?UI,(length(Items_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Items_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Items_UCA])) band 16#7)) band 16#7))/unit:8,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxisselected">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxisselected">external documentation</a>.
 -spec isSelected(This, N) -> boolean() when
 	This::wxListBox(), N::integer().
 isSelected(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -182,7 +182,7 @@ isSelected(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxListBox_IsSelected,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxset">external documentation</a>.
 -spec set(This, Items) -> ok when
 	This::wxListBox(), Items::[unicode:chardata()].
 set(#wx_ref{type=ThisT,ref=ThisRef},Items)
@@ -193,7 +193,7 @@ set(#wx_ref{type=ThisT,ref=ThisRef},Items)
   wxe_util:cast(?wxListBox_Set,
   <<ThisRef:32/?UI,(length(Items_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Items_UCA>>)/binary, 0:(((8- ((0 + lists:sum([byte_size(S)+4||S<-Items_UCA])) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxhittest">external documentation</a>.
 -spec hitTest(This, Point) -> integer() when
 	This::wxListBox(), Point::{X::integer(), Y::integer()}.
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY})
@@ -202,7 +202,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY})
   wxe_util:call(?wxListBox_HitTest,
   <<ThisRef:32/?UI,PointX:32/?UI,PointY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbox.html#wxlistboxsetfirstitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbox.html#wxlistboxsetfirstitem">external documentation</a>.
 %% <br /> Also:<br />
 %% setFirstItem(This, S) -> ok when<br />
 %% 	This::wxListBox(), S::unicode:chardata().<br />
diff --git a/lib/wx/src/gen/wxListCtrl.erl b/lib/wx/src/gen/wxListCtrl.erl
index a6288fc02a..f9010eecf9 100644
--- a/lib/wx/src/gen/wxListCtrl.erl
+++ b/lib/wx/src/gen/wxListCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html">wxListCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html">wxListCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -151,7 +151,7 @@ arrange(This)
  when is_record(This, wx_ref) ->
   arrange(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlarrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlarrange">external documentation</a>.
 -spec arrange(This, [Option]) -> boolean() when
 	This::wxListCtrl(),
 	Option :: {flag, integer()}.
@@ -164,7 +164,7 @@ arrange(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxListCtrl_Arrange,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlassignimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlassignimagelist">external documentation</a>.
 -spec assignImageList(This, ImageList, Which) -> ok when
 	This::wxListCtrl(), ImageList::wxImageList:wxImageList(), Which::integer().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef},Which)
@@ -174,7 +174,7 @@ assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=Imag
   wxe_util:cast(?wxListCtrl_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI,Which:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlclearall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlclearall">external documentation</a>.
 -spec clearAll(This) -> ok when
 	This::wxListCtrl().
 clearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -217,7 +217,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxListCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrldeleteallitems">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrldeleteallitems">external documentation</a>.
 -spec deleteAllItems(This) -> boolean() when
 	This::wxListCtrl().
 deleteAllItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -225,7 +225,7 @@ deleteAllItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_DeleteAllItems,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrldeletecolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrldeletecolumn">external documentation</a>.
 -spec deleteColumn(This, Col) -> boolean() when
 	This::wxListCtrl(), Col::integer().
 deleteColumn(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -234,7 +234,7 @@ deleteColumn(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:call(?wxListCtrl_DeleteColumn,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrldeleteitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrldeleteitem">external documentation</a>.
 -spec deleteItem(This, Item) -> boolean() when
 	This::wxListCtrl(), Item::integer().
 deleteItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -243,7 +243,7 @@ deleteItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxListCtrl_DeleteItem,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrleditlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrleditlabel">external documentation</a>.
 -spec editLabel(This, Item) -> wxTextCtrl:wxTextCtrl() when
 	This::wxListCtrl(), Item::integer().
 editLabel(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -252,7 +252,7 @@ editLabel(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxListCtrl_EditLabel,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlensurevisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlensurevisible">external documentation</a>.
 -spec ensureVisible(This, Item) -> boolean() when
 	This::wxListCtrl(), Item::integer().
 ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -269,7 +269,7 @@ findItem(This,Start,Str)
  when is_record(This, wx_ref),is_integer(Start),is_list(Str) ->
   findItem(This,Start,Str, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlfinditem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlfinditem">external documentation</a>.
 %% <br /> Also:<br />
 %% findItem(This, Start, Pt, Direction) -> integer() when<br />
 %% 	This::wxListCtrl(), Start::integer(), Pt::{X::integer(), Y::integer()}, Direction::integer().<br />
@@ -294,7 +294,7 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},Start,{PtX,PtY},Direction)
   wxe_util:call(?wxListCtrl_FindItem_3_1,
   <<ThisRef:32/?UI,Start:32/?UI,PtX:32/?UI,PtY:32/?UI,Direction:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetcolumn">external documentation</a>.
 -spec getColumn(This, Col, Item) -> boolean() when
 	This::wxListCtrl(), Col::integer(), Item::wxListItem:wxListItem().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
@@ -304,7 +304,7 @@ getColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxListCtrl_GetColumn,
   <<ThisRef:32/?UI,Col:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcolumncount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetcolumncount">external documentation</a>.
 -spec getColumnCount(This) -> integer() when
 	This::wxListCtrl().
 getColumnCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -312,7 +312,7 @@ getColumnCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetColumnCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcolumnwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetcolumnwidth">external documentation</a>.
 -spec getColumnWidth(This, Col) -> integer() when
 	This::wxListCtrl(), Col::integer().
 getColumnWidth(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -321,7 +321,7 @@ getColumnWidth(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:call(?wxListCtrl_GetColumnWidth,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetcountperpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetcountperpage">external documentation</a>.
 -spec getCountPerPage(This) -> integer() when
 	This::wxListCtrl().
 getCountPerPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -329,7 +329,7 @@ getCountPerPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetCountPerPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgeteditcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgeteditcontrol">external documentation</a>.
 -spec getEditControl(This) -> wxTextCtrl:wxTextCtrl() when
 	This::wxListCtrl().
 getEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -337,7 +337,7 @@ getEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetimagelist">external documentation</a>.
 -spec getImageList(This, Which) -> wxImageList:wxImageList() when
 	This::wxListCtrl(), Which::integer().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef},Which)
@@ -346,7 +346,7 @@ getImageList(#wx_ref{type=ThisT,ref=ThisRef},Which)
   wxe_util:call(?wxListCtrl_GetImageList,
   <<ThisRef:32/?UI,Which:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitem">external documentation</a>.
 -spec getItem(This, Info) -> boolean() when
 	This::wxListCtrl(), Info::wxListItem:wxListItem().
 getItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
@@ -355,7 +355,7 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
   wxe_util:call(?wxListCtrl_GetItem,
   <<ThisRef:32/?UI,InfoRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitembackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitembackgroundcolour">external documentation</a>.
 -spec getItemBackgroundColour(This, Item) -> wx:wx_colour4() when
 	This::wxListCtrl(), Item::integer().
 getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -364,7 +364,7 @@ getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxListCtrl_GetItemBackgroundColour,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemcount">external documentation</a>.
 -spec getItemCount(This) -> integer() when
 	This::wxListCtrl().
 getItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -372,7 +372,7 @@ getItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetItemCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemdata">external documentation</a>.
 -spec getItemData(This, Item) -> integer() when
 	This::wxListCtrl(), Item::integer().
 getItemData(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -381,7 +381,7 @@ getItemData(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxListCtrl_GetItemData,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemfont">external documentation</a>.
 -spec getItemFont(This, Item) -> wxFont:wxFont() when
 	This::wxListCtrl(), Item::integer().
 getItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -390,7 +390,7 @@ getItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxListCtrl_GetItemFont,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemposition">external documentation</a>.
 -spec getItemPosition(This, Item) -> Result when
 	Result ::{Res ::boolean(), Pos::{X::integer(), Y::integer()}},
 	This::wxListCtrl(), Item::integer().
@@ -409,7 +409,7 @@ getItemRect(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   getItemRect(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemrect">external documentation</a>.
 -spec getItemRect(This, Item, [Option]) -> Result when
 	Result :: {Res ::boolean(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}},
 	This::wxListCtrl(), Item::integer(),
@@ -423,7 +423,7 @@ getItemRect(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:call(?wxListCtrl_GetItemRect,
   <<ThisRef:32/?UI,Item:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemspacing">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemspacing">external documentation</a>.
 -spec getItemSpacing(This) -> {W::integer(), H::integer()} when
 	This::wxListCtrl().
 getItemSpacing(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -431,7 +431,7 @@ getItemSpacing(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetItemSpacing,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemstate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemstate">external documentation</a>.
 -spec getItemState(This, Item, StateMask) -> integer() when
 	This::wxListCtrl(), Item::integer(), StateMask::integer().
 getItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,StateMask)
@@ -440,7 +440,7 @@ getItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,StateMask)
   wxe_util:call(?wxListCtrl_GetItemState,
   <<ThisRef:32/?UI,Item:32/?UI,StateMask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemtext">external documentation</a>.
 -spec getItemText(This, Item) -> unicode:charlist() when
 	This::wxListCtrl(), Item::integer().
 getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -449,7 +449,7 @@ getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxListCtrl_GetItemText,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetitemtextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetitemtextcolour">external documentation</a>.
 -spec getItemTextColour(This, Item) -> wx:wx_colour4() when
 	This::wxListCtrl(), Item::integer().
 getItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -466,7 +466,7 @@ getNextItem(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   getNextItem(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetnextitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetnextitem">external documentation</a>.
 -spec getNextItem(This, Item, [Option]) -> integer() when
 	This::wxListCtrl(), Item::integer(),
 	Option :: {geometry, integer()}
@@ -481,7 +481,7 @@ getNextItem(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:call(?wxListCtrl_GetNextItem,
   <<ThisRef:32/?UI,Item:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetselecteditemcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetselecteditemcount">external documentation</a>.
 -spec getSelectedItemCount(This) -> integer() when
 	This::wxListCtrl().
 getSelectedItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -489,7 +489,7 @@ getSelectedItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetSelectedItemCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgettextcolour">external documentation</a>.
 -spec getTextColour(This) -> wx:wx_colour4() when
 	This::wxListCtrl().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -497,7 +497,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgettopitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgettopitem">external documentation</a>.
 -spec getTopItem(This) -> integer() when
 	This::wxListCtrl().
 getTopItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -505,7 +505,7 @@ getTopItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetTopItem,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlgetviewrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlgetviewrect">external documentation</a>.
 -spec getViewRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxListCtrl().
 getViewRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -513,7 +513,7 @@ getViewRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListCtrl_GetViewRect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlhittest">external documentation</a>.
 -spec hitTest(This, Point, Flags) -> integer() when
 	This::wxListCtrl(), Point::{X::integer(), Y::integer()}, Flags::integer().
 hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY},Flags)
@@ -522,7 +522,7 @@ hitTest(#wx_ref{type=ThisT,ref=ThisRef},{PointX,PointY},Flags)
   wxe_util:call(?wxListCtrl_HitTest,
   <<ThisRef:32/?UI,PointX:32/?UI,PointY:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>.
 %% <br /> Also:<br />
 %% insertColumn(This, Col, Info) -> integer() when<br />
 %% 	This::wxListCtrl(), Col::integer(), Info::wxListItem:wxListItem().<br />
@@ -542,7 +542,7 @@ insertColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=InfoT,ref=InfoRef}
   wxe_util:call(?wxListCtrl_InsertColumn_2,
   <<ThisRef:32/?UI,Col:32/?UI,InfoRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlinsertcolumn">external documentation</a>.
 -spec insertColumn(This, Col, Heading, [Option]) -> integer() when
 	This::wxListCtrl(), Col::integer(), Heading::unicode:chardata(),
 	Option :: {format, integer()}
@@ -558,7 +558,7 @@ insertColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,Heading, Options)
   wxe_util:call(?wxListCtrl_InsertColumn_3,
   <<ThisRef:32/?UI,Col:32/?UI,(byte_size(Heading_UC)):32/?UI,(Heading_UC)/binary, 0:(((8- ((4+byte_size(Heading_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
 -spec insertItem(This, Info) -> integer() when
 	This::wxListCtrl(), Info::wxListItem:wxListItem().
 insertItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
@@ -567,7 +567,7 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
   wxe_util:call(?wxListCtrl_InsertItem_1,
   <<ThisRef:32/?UI,InfoRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
 %% <br /> Also:<br />
 %% insertItem(This, Index, Label) -> integer() when<br />
 %% 	This::wxListCtrl(), Index::integer(), Label::unicode:chardata().<br />
@@ -588,7 +588,7 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label)
   wxe_util:call(?wxListCtrl_InsertItem_2_1,
   <<ThisRef:32/?UI,Index:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlinsertitem">external documentation</a>.
 -spec insertItem(This, Index, Label, ImageIndex) -> integer() when
 	This::wxListCtrl(), Index::integer(), Label::unicode:chardata(), ImageIndex::integer().
 insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label,ImageIndex)
@@ -598,7 +598,7 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Label,ImageIndex)
   wxe_util:call(?wxListCtrl_InsertItem_3,
   <<ThisRef:32/?UI,Index:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,ImageIndex:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlrefreshitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlrefreshitem">external documentation</a>.
 -spec refreshItem(This, Item) -> ok when
 	This::wxListCtrl(), Item::integer().
 refreshItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -607,7 +607,7 @@ refreshItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxListCtrl_RefreshItem,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlrefreshitems">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlrefreshitems">external documentation</a>.
 -spec refreshItems(This, ItemFrom, ItemTo) -> ok when
 	This::wxListCtrl(), ItemFrom::integer(), ItemTo::integer().
 refreshItems(#wx_ref{type=ThisT,ref=ThisRef},ItemFrom,ItemTo)
@@ -616,7 +616,7 @@ refreshItems(#wx_ref{type=ThisT,ref=ThisRef},ItemFrom,ItemTo)
   wxe_util:cast(?wxListCtrl_RefreshItems,
   <<ThisRef:32/?UI,ItemFrom:32/?UI,ItemTo:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlscrolllist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlscrolllist">external documentation</a>.
 -spec scrollList(This, Dx, Dy) -> boolean() when
 	This::wxListCtrl(), Dx::integer(), Dy::integer().
 scrollList(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
@@ -625,7 +625,7 @@ scrollList(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy)
   wxe_util:call(?wxListCtrl_ScrollList,
   <<ThisRef:32/?UI,Dx:32/?UI,Dy:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetbackgroundcolour">external documentation</a>.
 -spec setBackgroundColour(This, Colour) -> boolean() when
 	This::wxListCtrl(), Colour::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -634,7 +634,7 @@ setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:call(?wxListCtrl_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetcolumn">external documentation</a>.
 -spec setColumn(This, Col, Item) -> boolean() when
 	This::wxListCtrl(), Col::integer(), Item::wxListItem:wxListItem().
 setColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
@@ -644,7 +644,7 @@ setColumn(#wx_ref{type=ThisT,ref=ThisRef},Col,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxListCtrl_SetColumn,
   <<ThisRef:32/?UI,Col:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetcolumnwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetcolumnwidth">external documentation</a>.
 -spec setColumnWidth(This, Col, Width) -> boolean() when
 	This::wxListCtrl(), Col::integer(), Width::integer().
 setColumnWidth(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
@@ -653,7 +653,7 @@ setColumnWidth(#wx_ref{type=ThisT,ref=ThisRef},Col,Width)
   wxe_util:call(?wxListCtrl_SetColumnWidth,
   <<ThisRef:32/?UI,Col:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetimagelist">external documentation</a>.
 -spec setImageList(This, ImageList, Which) -> ok when
 	This::wxListCtrl(), ImageList::wxImageList:wxImageList(), Which::integer().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef},Which)
@@ -663,7 +663,7 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxListCtrl_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI,Which:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitem">external documentation</a>.
 -spec setItem(This, Info) -> boolean() when
 	This::wxListCtrl(), Info::wxListItem:wxListItem().
 setItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=InfoT,ref=InfoRef}) ->
@@ -680,7 +680,7 @@ setItem(This,Index,Col,Label)
  when is_record(This, wx_ref),is_integer(Index),is_integer(Col),is_list(Label) ->
   setItem(This,Index,Col,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitem">external documentation</a>.
 -spec setItem(This, Index, Col, Label, [Option]) -> integer() when
 	This::wxListCtrl(), Index::integer(), Col::integer(), Label::unicode:chardata(),
 	Option :: {imageId, integer()}.
@@ -694,7 +694,7 @@ setItem(#wx_ref{type=ThisT,ref=ThisRef},Index,Col,Label, Options)
   wxe_util:call(?wxListCtrl_SetItem_4,
   <<ThisRef:32/?UI,Index:32/?UI,Col:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitembackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitembackgroundcolour">external documentation</a>.
 -spec setItemBackgroundColour(This, Item, Col) -> ok when
 	This::wxListCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
@@ -703,7 +703,7 @@ setItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
   wxe_util:cast(?wxListCtrl_SetItemBackgroundColour,
   <<ThisRef:32/?UI,Item:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemcount">external documentation</a>.
 -spec setItemCount(This, Count) -> ok when
 	This::wxListCtrl(), Count::integer().
 setItemCount(#wx_ref{type=ThisT,ref=ThisRef},Count)
@@ -712,7 +712,7 @@ setItemCount(#wx_ref{type=ThisT,ref=ThisRef},Count)
   wxe_util:cast(?wxListCtrl_SetItemCount,
   <<ThisRef:32/?UI,Count:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemdata">external documentation</a>.
 -spec setItemData(This, Item, Data) -> boolean() when
 	This::wxListCtrl(), Item::integer(), Data::integer().
 setItemData(#wx_ref{type=ThisT,ref=ThisRef},Item,Data)
@@ -721,7 +721,7 @@ setItemData(#wx_ref{type=ThisT,ref=ThisRef},Item,Data)
   wxe_util:call(?wxListCtrl_SetItemData,
   <<ThisRef:32/?UI,Item:32/?UI,Data:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemfont">external documentation</a>.
 -spec setItemFont(This, Item, F) -> ok when
 	This::wxListCtrl(), Item::integer(), F::wxFont:wxFont().
 setItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item,#wx_ref{type=FT,ref=FRef})
@@ -739,7 +739,7 @@ setItemImage(This,Item,Image)
  when is_record(This, wx_ref),is_integer(Item),is_integer(Image) ->
   setItemImage(This,Item,Image, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemimage">external documentation</a>.
 -spec setItemImage(This, Item, Image, [Option]) -> boolean() when
 	This::wxListCtrl(), Item::integer(), Image::integer(),
 	Option :: {selImage, integer()}.
@@ -752,7 +752,7 @@ setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image, Options)
   wxe_util:call(?wxListCtrl_SetItemImage,
   <<ThisRef:32/?UI,Item:32/?UI,Image:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemcolumnimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemcolumnimage">external documentation</a>.
 -spec setItemColumnImage(This, Item, Column, Image) -> boolean() when
 	This::wxListCtrl(), Item::integer(), Column::integer(), Image::integer().
 setItemColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Column,Image)
@@ -761,7 +761,7 @@ setItemColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Column,Image)
   wxe_util:call(?wxListCtrl_SetItemColumnImage,
   <<ThisRef:32/?UI,Item:32/?UI,Column:32/?UI,Image:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemposition">external documentation</a>.
 -spec setItemPosition(This, Item, Pos) -> boolean() when
 	This::wxListCtrl(), Item::integer(), Pos::{X::integer(), Y::integer()}.
 setItemPosition(#wx_ref{type=ThisT,ref=ThisRef},Item,{PosX,PosY})
@@ -770,7 +770,7 @@ setItemPosition(#wx_ref{type=ThisT,ref=ThisRef},Item,{PosX,PosY})
   wxe_util:call(?wxListCtrl_SetItemPosition,
   <<ThisRef:32/?UI,Item:32/?UI,PosX:32/?UI,PosY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemstate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemstate">external documentation</a>.
 -spec setItemState(This, Item, State, StateMask) -> boolean() when
 	This::wxListCtrl(), Item::integer(), State::integer(), StateMask::integer().
 setItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,State,StateMask)
@@ -779,7 +779,7 @@ setItemState(#wx_ref{type=ThisT,ref=ThisRef},Item,State,StateMask)
   wxe_util:call(?wxListCtrl_SetItemState,
   <<ThisRef:32/?UI,Item:32/?UI,State:32/?UI,StateMask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemtext">external documentation</a>.
 -spec setItemText(This, Item, Str) -> ok when
 	This::wxListCtrl(), Item::integer(), Str::unicode:chardata().
 setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Str)
@@ -789,7 +789,7 @@ setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Str)
   wxe_util:cast(?wxListCtrl_SetItemText,
   <<ThisRef:32/?UI,Item:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((4+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetitemtextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetitemtextcolour">external documentation</a>.
 -spec setItemTextColour(This, Item, Col) -> ok when
 	This::wxListCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
@@ -806,7 +806,7 @@ setSingleStyle(This,Style)
  when is_record(This, wx_ref),is_integer(Style) ->
   setSingleStyle(This,Style, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetsinglestyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetsinglestyle">external documentation</a>.
 -spec setSingleStyle(This, Style, [Option]) -> ok when
 	This::wxListCtrl(), Style::integer(),
 	Option :: {add, boolean()}.
@@ -819,7 +819,7 @@ setSingleStyle(#wx_ref{type=ThisT,ref=ThisRef},Style, Options)
   wxe_util:cast(?wxListCtrl_SetSingleStyle,
   <<ThisRef:32/?UI,Style:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsettextcolour">external documentation</a>.
 -spec setTextColour(This, Col) -> ok when
 	This::wxListCtrl(), Col::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -828,7 +828,7 @@ setTextColour(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxListCtrl_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistctrl.html#wxlistctrlsetwindowstyleflag">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistctrl.html#wxlistctrlsetwindowstyleflag">external documentation</a>.
 -spec setWindowStyleFlag(This, Style) -> ok when
 	This::wxListCtrl(), Style::integer().
 setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
diff --git a/lib/wx/src/gen/wxListEvent.erl b/lib/wx/src/gen/wxListEvent.erl
index 9cbb816096..9ce3b19288 100644
--- a/lib/wx/src/gen/wxListEvent.erl
+++ b/lib/wx/src/gen/wxListEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html">wxListEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html">wxListEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_list_begin_drag</em>, <em>command_list_begin_rdrag</em>, <em>command_list_begin_label_edit</em>, <em>command_list_end_label_edit</em>, <em>command_list_delete_item</em>, <em>command_list_delete_all_items</em>, <em>command_list_key_down</em>, <em>command_list_insert_item</em>, <em>command_list_col_click</em>, <em>command_list_col_right_click</em>, <em>command_list_col_begin_drag</em>, <em>command_list_col_dragging</em>, <em>command_list_col_end_drag</em>, <em>command_list_item_selected</em>, <em>command_list_item_deselected</em>, <em>command_list_item_right_click</em>, <em>command_list_item_middle_click</em>, <em>command_list_item_activated</em>, <em>command_list_item_focused</em>, <em>command_list_cache_hint</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxList(). #wxList{}} event record type.
@@ -50,7 +50,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxListEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetcachefrom">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetcachefrom">external documentation</a>.
 -spec getCacheFrom(This) -> integer() when
 	This::wxListEvent().
 getCacheFrom(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -58,7 +58,7 @@ getCacheFrom(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetCacheFrom,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetcacheto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetcacheto">external documentation</a>.
 -spec getCacheTo(This) -> integer() when
 	This::wxListEvent().
 getCacheTo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -66,7 +66,7 @@ getCacheTo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetCacheTo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetkeycode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetkeycode">external documentation</a>.
 -spec getKeyCode(This) -> integer() when
 	This::wxListEvent().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -74,7 +74,7 @@ getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetindex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetindex">external documentation</a>.
 -spec getIndex(This) -> integer() when
 	This::wxListEvent().
 getIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -82,7 +82,7 @@ getIndex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetIndex,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetcolumn">external documentation</a>.
 -spec getColumn(This) -> integer() when
 	This::wxListEvent().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -90,7 +90,7 @@ getColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetColumn,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetpoint">external documentation</a>.
 -spec getPoint(This) -> {X::integer(), Y::integer()} when
 	This::wxListEvent().
 getPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -98,7 +98,7 @@ getPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetPoint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetlabel">external documentation</a>.
 -spec getLabel(This) -> unicode:charlist() when
 	This::wxListEvent().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -106,7 +106,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgettext">external documentation</a>.
 -spec getText(This) -> unicode:charlist() when
 	This::wxListEvent().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -114,7 +114,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetimage">external documentation</a>.
 -spec getImage(This) -> integer() when
 	This::wxListEvent().
 getImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -122,7 +122,7 @@ getImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetImage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetdata">external documentation</a>.
 -spec getData(This) -> integer() when
 	This::wxListEvent().
 getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -130,7 +130,7 @@ getData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetmask">external documentation</a>.
 -spec getMask(This) -> integer() when
 	This::wxListEvent().
 getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -138,7 +138,7 @@ getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetMask,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventgetitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventgetitem">external documentation</a>.
 -spec getItem(This) -> wxListItem:wxListItem() when
 	This::wxListEvent().
 getItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -146,7 +146,7 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListEvent_GetItem,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistevent.html#wxlisteventiseditcancelled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistevent.html#wxlisteventiseditcancelled">external documentation</a>.
 -spec isEditCancelled(This) -> boolean() when
 	This::wxListEvent().
 isEditCancelled(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxListItem.erl b/lib/wx/src/gen/wxListItem.erl
index 787d686135..5b3c8c2f5f 100644
--- a/lib/wx/src/gen/wxListItem.erl
+++ b/lib/wx/src/gen/wxListItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html">wxListItem</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html">wxListItem</a>.
 %% @type wxListItem().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -38,13 +38,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxListItem() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemwxlistitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemwxlistitem">external documentation</a>.
 -spec new() -> wxListItem().
 new() ->
   wxe_util:construct(?wxListItem_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemwxlistitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemwxlistitem">external documentation</a>.
 -spec new(Item) -> wxListItem() when
 	Item::wxListItem().
 new(#wx_ref{type=ItemT,ref=ItemRef}) ->
@@ -52,7 +52,7 @@ new(#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:construct(?wxListItem_new_1,
   <<ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemclear">external documentation</a>.
 -spec clear(This) -> ok when
 	This::wxListItem().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -60,7 +60,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxListItem_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetalign">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetalign">external documentation</a>.
 %%<br /> Res = ?wxLIST_FORMAT_LEFT | ?wxLIST_FORMAT_RIGHT | ?wxLIST_FORMAT_CENTRE | ?wxLIST_FORMAT_CENTER
 -spec getAlign(This) -> wx:wx_enum() when
 	This::wxListItem().
@@ -69,7 +69,7 @@ getAlign(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetAlign,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetbackgroundcolour">external documentation</a>.
 -spec getBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxListItem().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -77,7 +77,7 @@ getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetcolumn">external documentation</a>.
 -spec getColumn(This) -> integer() when
 	This::wxListItem().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -85,7 +85,7 @@ getColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetColumn,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxListItem().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -93,7 +93,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetid">external documentation</a>.
 -spec getId(This) -> integer() when
 	This::wxListItem().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -101,7 +101,7 @@ getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetimage">external documentation</a>.
 -spec getImage(This) -> integer() when
 	This::wxListItem().
 getImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -109,7 +109,7 @@ getImage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetImage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetmask">external documentation</a>.
 -spec getMask(This) -> integer() when
 	This::wxListItem().
 getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -117,7 +117,7 @@ getMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetMask,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetstate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetstate">external documentation</a>.
 -spec getState(This) -> integer() when
 	This::wxListItem().
 getState(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -125,7 +125,7 @@ getState(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetState,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgettext">external documentation</a>.
 -spec getText(This) -> unicode:charlist() when
 	This::wxListItem().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -133,7 +133,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgettextcolour">external documentation</a>.
 -spec getTextColour(This) -> wx:wx_colour4() when
 	This::wxListItem().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -141,7 +141,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemgetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemgetwidth">external documentation</a>.
 -spec getWidth(This) -> integer() when
 	This::wxListItem().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -149,7 +149,7 @@ getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItem_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetalign">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetalign">external documentation</a>.
 %%<br /> Align = ?wxLIST_FORMAT_LEFT | ?wxLIST_FORMAT_RIGHT | ?wxLIST_FORMAT_CENTRE | ?wxLIST_FORMAT_CENTER
 -spec setAlign(This, Align) -> ok when
 	This::wxListItem(), Align::wx:wx_enum().
@@ -159,7 +159,7 @@ setAlign(#wx_ref{type=ThisT,ref=ThisRef},Align)
   wxe_util:cast(?wxListItem_SetAlign,
   <<ThisRef:32/?UI,Align:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetbackgroundcolour">external documentation</a>.
 -spec setBackgroundColour(This, ColBack) -> ok when
 	This::wxListItem(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
@@ -168,7 +168,7 @@ setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
   wxe_util:cast(?wxListItem_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetcolumn">external documentation</a>.
 -spec setColumn(This, Col) -> ok when
 	This::wxListItem(), Col::integer().
 setColumn(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -177,7 +177,7 @@ setColumn(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxListItem_SetColumn,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetfont">external documentation</a>.
 -spec setFont(This, Font) -> ok when
 	This::wxListItem(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -186,7 +186,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:cast(?wxListItem_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetid">external documentation</a>.
 -spec setId(This, Id) -> ok when
 	This::wxListItem(), Id::integer().
 setId(#wx_ref{type=ThisT,ref=ThisRef},Id)
@@ -195,7 +195,7 @@ setId(#wx_ref{type=ThisT,ref=ThisRef},Id)
   wxe_util:cast(?wxListItem_SetId,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetimage">external documentation</a>.
 -spec setImage(This, Image) -> ok when
 	This::wxListItem(), Image::integer().
 setImage(#wx_ref{type=ThisT,ref=ThisRef},Image)
@@ -204,7 +204,7 @@ setImage(#wx_ref{type=ThisT,ref=ThisRef},Image)
   wxe_util:cast(?wxListItem_SetImage,
   <<ThisRef:32/?UI,Image:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetmask">external documentation</a>.
 -spec setMask(This, Mask) -> ok when
 	This::wxListItem(), Mask::integer().
 setMask(#wx_ref{type=ThisT,ref=ThisRef},Mask)
@@ -213,7 +213,7 @@ setMask(#wx_ref{type=ThisT,ref=ThisRef},Mask)
   wxe_util:cast(?wxListItem_SetMask,
   <<ThisRef:32/?UI,Mask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetstate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetstate">external documentation</a>.
 -spec setState(This, State) -> ok when
 	This::wxListItem(), State::integer().
 setState(#wx_ref{type=ThisT,ref=ThisRef},State)
@@ -222,7 +222,7 @@ setState(#wx_ref{type=ThisT,ref=ThisRef},State)
   wxe_util:cast(?wxListItem_SetState,
   <<ThisRef:32/?UI,State:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetstatemask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetstatemask">external documentation</a>.
 -spec setStateMask(This, StateMask) -> ok when
 	This::wxListItem(), StateMask::integer().
 setStateMask(#wx_ref{type=ThisT,ref=ThisRef},StateMask)
@@ -231,7 +231,7 @@ setStateMask(#wx_ref{type=ThisT,ref=ThisRef},StateMask)
   wxe_util:cast(?wxListItem_SetStateMask,
   <<ThisRef:32/?UI,StateMask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsettext">external documentation</a>.
 -spec setText(This, Text) -> ok when
 	This::wxListItem(), Text::unicode:chardata().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -241,7 +241,7 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxListItem_SetText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsettextcolour">external documentation</a>.
 -spec setTextColour(This, ColText) -> ok when
 	This::wxListItem(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
@@ -250,7 +250,7 @@ setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
   wxe_util:cast(?wxListItem_SetTextColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColText)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitem.html#wxlistitemsetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitem.html#wxlistitemsetwidth">external documentation</a>.
 -spec setWidth(This, Width) -> ok when
 	This::wxListItem(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
diff --git a/lib/wx/src/gen/wxListItemAttr.erl b/lib/wx/src/gen/wxListItemAttr.erl
index daf5ebe96a..54f3255e05 100644
--- a/lib/wx/src/gen/wxListItemAttr.erl
+++ b/lib/wx/src/gen/wxListItemAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html">wxListItemAttr</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html">wxListItemAttr</a>.
 %% @type wxListItemAttr().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -36,13 +36,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxListItemAttr() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
 -spec new() -> wxListItemAttr().
 new() ->
   wxe_util:construct(?wxListItemAttr_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrwxlistitemattr">external documentation</a>.
 -spec new(ColText, ColBack, Font) -> wxListItemAttr() when
 	ColText::wx:wx_colour(), ColBack::wx:wx_colour(), Font::wxFont:wxFont().
 new(ColText,ColBack,#wx_ref{type=FontT,ref=FontRef})
@@ -51,7 +51,7 @@ new(ColText,ColBack,#wx_ref{type=FontT,ref=FontRef})
   wxe_util:construct(?wxListItemAttr_new_3,
   <<(wxe_util:colour_bin(ColText)):16/binary,(wxe_util:colour_bin(ColBack)):16/binary,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrgetbackgroundcolour">external documentation</a>.
 -spec getBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxListItemAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItemAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxListItemAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -67,7 +67,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItemAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrgettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrgettextcolour">external documentation</a>.
 -spec getTextColour(This) -> wx:wx_colour4() when
 	This::wxListItemAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -75,7 +75,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItemAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrhasbackgroundcolour">external documentation</a>.
 -spec hasBackgroundColour(This) -> boolean() when
 	This::wxListItemAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -83,7 +83,7 @@ hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItemAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhasfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrhasfont">external documentation</a>.
 -spec hasFont(This) -> boolean() when
 	This::wxListItemAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -91,7 +91,7 @@ hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItemAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrhastextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrhastextcolour">external documentation</a>.
 -spec hasTextColour(This) -> boolean() when
 	This::wxListItemAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -99,7 +99,7 @@ hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListItemAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrsetbackgroundcolour">external documentation</a>.
 -spec setBackgroundColour(This, ColBack) -> ok when
 	This::wxListItemAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
@@ -108,7 +108,7 @@ setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
   wxe_util:cast(?wxListItemAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrsetfont">external documentation</a>.
 -spec setFont(This, Font) -> ok when
 	This::wxListItemAttr(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -117,7 +117,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:cast(?wxListItemAttr_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistitemattr.html#wxlistitemattrsettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistitemattr.html#wxlistitemattrsettextcolour">external documentation</a>.
 -spec setTextColour(This, ColText) -> ok when
 	This::wxListItemAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
diff --git a/lib/wx/src/gen/wxListView.erl b/lib/wx/src/gen/wxListView.erl
index 87cc28cd15..b8b10e0e62 100644
--- a/lib/wx/src/gen/wxListView.erl
+++ b/lib/wx/src/gen/wxListView.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html">wxListView</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html">wxListView</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -78,7 +78,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxListView() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewclearcolumnimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewclearcolumnimage">external documentation</a>.
 -spec clearColumnImage(This, Col) -> ok when
 	This::wxListView(), Col::integer().
 clearColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Col)
@@ -87,7 +87,7 @@ clearColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Col)
   wxe_util:cast(?wxListView_ClearColumnImage,
   <<ThisRef:32/?UI,Col:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewfocus">external documentation</a>.
 -spec focus(This, Index) -> ok when
 	This::wxListView(), Index::integer().
 focus(#wx_ref{type=ThisT,ref=ThisRef},Index)
@@ -96,7 +96,7 @@ focus(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:cast(?wxListView_Focus,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewgetfirstselected">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewgetfirstselected">external documentation</a>.
 -spec getFirstSelected(This) -> integer() when
 	This::wxListView().
 getFirstSelected(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -104,7 +104,7 @@ getFirstSelected(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListView_GetFirstSelected,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewgetfocuseditem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewgetfocuseditem">external documentation</a>.
 -spec getFocusedItem(This) -> integer() when
 	This::wxListView().
 getFocusedItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -112,7 +112,7 @@ getFocusedItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListView_GetFocusedItem,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewgetnextselected">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewgetnextselected">external documentation</a>.
 -spec getNextSelected(This, Item) -> integer() when
 	This::wxListView(), Item::integer().
 getNextSelected(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -121,7 +121,7 @@ getNextSelected(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxListView_GetNextSelected,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewisselected">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewisselected">external documentation</a>.
 -spec isSelected(This, Index) -> boolean() when
 	This::wxListView(), Index::integer().
 isSelected(#wx_ref{type=ThisT,ref=ThisRef},Index)
@@ -138,7 +138,7 @@ select(This,N)
  when is_record(This, wx_ref),is_integer(N) ->
   select(This,N, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewselect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewselect">external documentation</a>.
 -spec select(This, N, [Option]) -> ok when
 	This::wxListView(), N::integer(),
 	Option :: {on, boolean()}.
@@ -151,7 +151,7 @@ select(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
   wxe_util:cast(?wxListView_Select,
   <<ThisRef:32/?UI,N:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistview.html#wxlistviewsetcolumnimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistview.html#wxlistviewsetcolumnimage">external documentation</a>.
 -spec setColumnImage(This, Col, Image) -> ok when
 	This::wxListView(), Col::integer(), Image::integer().
 setColumnImage(#wx_ref{type=ThisT,ref=ThisRef},Col,Image)
diff --git a/lib/wx/src/gen/wxListbook.erl b/lib/wx/src/gen/wxListbook.erl
index 0907d554f4..4c8d51c0a3 100644
--- a/lib/wx/src/gen/wxListbook.erl
+++ b/lib/wx/src/gen/wxListbook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html">wxListbook</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html">wxListbook</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -82,7 +82,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxListbook() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookwxlistbook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookwxlistbook">external documentation</a>.
 -spec new() -> wxListbook().
 new() ->
   wxe_util:construct(?wxListbook_new_0,
@@ -96,7 +96,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookwxlistbook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookwxlistbook">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxListbook() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -121,7 +121,7 @@ addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookaddpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookaddpage">external documentation</a>.
 -spec addPage(This, Page, Text, [Option]) -> boolean() when
 	This::wxListbook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -146,7 +146,7 @@ advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookadvanceselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookadvanceselection">external documentation</a>.
 -spec advanceSelection(This, [Option]) -> ok when
 	This::wxListbook(),
 	Option :: {forward, boolean()}.
@@ -159,7 +159,7 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxListbook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookassignimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookassignimagelist">external documentation</a>.
 -spec assignImageList(This, ImageList) -> ok when
 	This::wxListbook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -176,7 +176,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxListbook(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -194,7 +194,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxListbook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookdeleteallpages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookdeleteallpages">external documentation</a>.
 -spec deleteAllPages(This) -> boolean() when
 	This::wxListbook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -202,7 +202,7 @@ deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListbook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookdeletepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookdeletepage">external documentation</a>.
 -spec deletePage(This, N) -> boolean() when
 	This::wxListbook(), N::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -211,7 +211,7 @@ deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxListbook_DeletePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookremovepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookremovepage">external documentation</a>.
 -spec removePage(This, N) -> boolean() when
 	This::wxListbook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -220,7 +220,7 @@ removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxListbook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetcurrentpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookgetcurrentpage">external documentation</a>.
 -spec getCurrentPage(This) -> wxWindow:wxWindow() when
 	This::wxListbook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -228,7 +228,7 @@ getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListbook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookgetimagelist">external documentation</a>.
 -spec getImageList(This) -> wxImageList:wxImageList() when
 	This::wxListbook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -236,7 +236,7 @@ getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListbook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookgetpage">external documentation</a>.
 -spec getPage(This, N) -> wxWindow:wxWindow() when
 	This::wxListbook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -245,7 +245,7 @@ getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxListbook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookgetpagecount">external documentation</a>.
 -spec getPageCount(This) -> integer() when
 	This::wxListbook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -253,7 +253,7 @@ getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListbook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookgetpageimage">external documentation</a>.
 -spec getPageImage(This, N) -> integer() when
 	This::wxListbook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -262,7 +262,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxListbook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookgetpagetext">external documentation</a>.
 -spec getPageText(This, N) -> unicode:charlist() when
 	This::wxListbook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -271,7 +271,7 @@ getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxListbook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxListbook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -279,7 +279,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxListbook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookhittest">external documentation</a>.
 -spec hitTest(This, Pt) -> Result when
 	Result ::{Res ::integer(), Flags::integer()},
 	This::wxListbook(), Pt::{X::integer(), Y::integer()}.
@@ -297,7 +297,7 @@ insertPage(This,N,Page,Text)
  when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,N,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookinsertpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookinsertpage">external documentation</a>.
 -spec insertPage(This, N, Page, Text, [Option]) -> boolean() when
 	This::wxListbook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -314,7 +314,7 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Tex
   wxe_util:call(?wxListbook_InsertPage,
   <<ThisRef:32/?UI,N:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbooksetimagelist">external documentation</a>.
 -spec setImageList(This, ImageList) -> ok when
 	This::wxListbook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -323,7 +323,7 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxListbook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbooksetpagesize">external documentation</a>.
 -spec setPageSize(This, Size) -> ok when
 	This::wxListbook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -332,7 +332,7 @@ setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxListbook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbooksetpageimage">external documentation</a>.
 -spec setPageImage(This, N, ImageId) -> boolean() when
 	This::wxListbook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
@@ -341,7 +341,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
   wxe_util:call(?wxListbook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbooksetpagetext">external documentation</a>.
 -spec setPageText(This, N, StrText) -> boolean() when
 	This::wxListbook(), N::integer(), StrText::unicode:chardata().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
@@ -351,7 +351,7 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxListbook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbooksetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbooksetselection">external documentation</a>.
 -spec setSelection(This, N) -> integer() when
 	This::wxListbook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -360,7 +360,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxListbook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlistbook.html#wxlistbookchangeselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlistbook.html#wxlistbookchangeselection">external documentation</a>.
 -spec changeSelection(This, N) -> integer() when
 	This::wxListbook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
diff --git a/lib/wx/src/gen/wxLogNull.erl b/lib/wx/src/gen/wxLogNull.erl
index 0ac4e8f9a3..6e2a3b7100 100644
--- a/lib/wx/src/gen/wxLogNull.erl
+++ b/lib/wx/src/gen/wxLogNull.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlognull.html">wxLogNull</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlognull.html">wxLogNull</a>.
 %% @type wxLogNull().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,7 +34,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxLogNull() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxlognull.html#wxlognullwxlognull">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxlognull.html#wxlognullwxlognull">external documentation</a>.
 -spec new() -> wxLogNull().
 new() ->
   wxe_util:construct(?wxLogNull_new,
diff --git a/lib/wx/src/gen/wxMDIChildFrame.erl b/lib/wx/src/gen/wxMDIChildFrame.erl
index 861beba34f..11d11e313e 100644
--- a/lib/wx/src/gen/wxMDIChildFrame.erl
+++ b/lib/wx/src/gen/wxMDIChildFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html">wxMDIChildFrame</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdichildframe.html">wxMDIChildFrame</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxFrame}
 %% <br />{@link wxTopLevelWindow}
@@ -89,7 +89,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMDIChildFrame() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframewxmdichildframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdichildframe.html#wxmdichildframewxmdichildframe">external documentation</a>.
 -spec new() -> wxMDIChildFrame().
 new() ->
   wxe_util:construct(?wxMDIChildFrame_new_0,
@@ -103,7 +103,7 @@ new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframewxmdichildframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdichildframe.html#wxmdichildframewxmdichildframe">external documentation</a>.
 -spec new(Parent, Id, Title, [Option]) -> wxMDIChildFrame() when
 	Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -121,7 +121,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
   wxe_util:construct(?wxMDIChildFrame_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframeactivate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdichildframe.html#wxmdichildframeactivate">external documentation</a>.
 -spec activate(This) -> ok when
 	This::wxMDIChildFrame().
 activate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -137,7 +137,7 @@ create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdichildframe.html#wxmdichildframecreate">external documentation</a>.
 -spec create(This, Parent, Id, Title, [Option]) -> boolean() when
 	This::wxMDIChildFrame(), Parent::wxMDIParentFrame:wxMDIParentFrame(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -164,7 +164,7 @@ maximize(This)
  when is_record(This, wx_ref) ->
   maximize(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframemaximize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdichildframe.html#wxmdichildframemaximize">external documentation</a>.
 -spec maximize(This, [Option]) -> ok when
 	This::wxMDIChildFrame(),
 	Option :: {maximize, boolean()}.
@@ -177,7 +177,7 @@ maximize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxMDIChildFrame_Maximize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdichildframe.html#wxmdichildframerestore">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdichildframe.html#wxmdichildframerestore">external documentation</a>.
 -spec restore(This) -> ok when
 	This::wxMDIChildFrame().
 restore(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxMDIClientWindow.erl b/lib/wx/src/gen/wxMDIClientWindow.erl
index bfdba336f8..1710aa54b2 100644
--- a/lib/wx/src/gen/wxMDIClientWindow.erl
+++ b/lib/wx/src/gen/wxMDIClientWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiclientwindow.html">wxMDIClientWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiclientwindow.html">wxMDIClientWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -77,7 +77,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMDIClientWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiclientwindow.html#wxmdiclientwindowwxmdiclientwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiclientwindow.html#wxmdiclientwindowwxmdiclientwindow">external documentation</a>.
 -spec new() -> wxMDIClientWindow().
 new() ->
   wxe_util:construct(?wxMDIClientWindow_new_0,
@@ -91,7 +91,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiclientwindow.html#wxmdiclientwindowwxmdiclientwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiclientwindow.html#wxmdiclientwindowwxmdiclientwindow">external documentation</a>.
 -spec new(Parent, [Option]) -> wxMDIClientWindow() when
 	Parent::wxMDIParentFrame:wxMDIParentFrame(),
 	Option :: {style, integer()}.
@@ -112,7 +112,7 @@ createClient(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   createClient(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiclientwindow.html#wxmdiclientwindowcreateclient">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiclientwindow.html#wxmdiclientwindowcreateclient">external documentation</a>.
 -spec createClient(This, Parent, [Option]) -> boolean() when
 	This::wxMDIClientWindow(), Parent::wxMDIParentFrame:wxMDIParentFrame(),
 	Option :: {style, integer()}.
diff --git a/lib/wx/src/gen/wxMDIParentFrame.erl b/lib/wx/src/gen/wxMDIParentFrame.erl
index 1a7e7387b9..35473d09c1 100644
--- a/lib/wx/src/gen/wxMDIParentFrame.erl
+++ b/lib/wx/src/gen/wxMDIParentFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html">wxMDIParentFrame</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html">wxMDIParentFrame</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxFrame}
 %% <br />{@link wxTopLevelWindow}
@@ -91,7 +91,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMDIParentFrame() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframewxmdiparentframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframewxmdiparentframe">external documentation</a>.
 -spec new() -> wxMDIParentFrame().
 new() ->
   wxe_util:construct(?wxMDIParentFrame_new_0,
@@ -105,7 +105,7 @@ new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframewxmdiparentframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframewxmdiparentframe">external documentation</a>.
 -spec new(Parent, Id, Title, [Option]) -> wxMDIParentFrame() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -123,7 +123,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id,Title, Options)
   wxe_util:construct(?wxMDIParentFrame_new_4,
   <<ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframeactivatenext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframeactivatenext">external documentation</a>.
 -spec activateNext(This) -> ok when
 	This::wxMDIParentFrame().
 activateNext(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -131,7 +131,7 @@ activateNext(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxMDIParentFrame_ActivateNext,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframeactivateprevious">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframeactivateprevious">external documentation</a>.
 -spec activatePrevious(This) -> ok when
 	This::wxMDIParentFrame().
 activatePrevious(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -139,7 +139,7 @@ activatePrevious(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxMDIParentFrame_ActivatePrevious,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframearrangeicons">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframearrangeicons">external documentation</a>.
 -spec arrangeIcons(This) -> ok when
 	This::wxMDIParentFrame().
 arrangeIcons(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -147,7 +147,7 @@ arrangeIcons(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxMDIParentFrame_ArrangeIcons,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframecascade">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframecascade">external documentation</a>.
 -spec cascade(This) -> ok when
 	This::wxMDIParentFrame().
 cascade(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -163,7 +163,7 @@ create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframecreate">external documentation</a>.
 -spec create(This, Parent, Id, Title, [Option]) -> boolean() when
 	This::wxMDIParentFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -182,7 +182,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Ti
   wxe_util:call(?wxMDIParentFrame_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframegetactivechild">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframegetactivechild">external documentation</a>.
 -spec getActiveChild(This) -> wxMDIChildFrame:wxMDIChildFrame() when
 	This::wxMDIParentFrame().
 getActiveChild(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -190,7 +190,7 @@ getActiveChild(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMDIParentFrame_GetActiveChild,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframegetclientwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframegetclientwindow">external documentation</a>.
 -spec getClientWindow(This) -> wxMDIClientWindow:wxMDIClientWindow() when
 	This::wxMDIParentFrame().
 getClientWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -206,7 +206,7 @@ tile(This)
  when is_record(This, wx_ref) ->
   tile(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmdiparentframe.html#wxmdiparentframetile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmdiparentframe.html#wxmdiparentframetile">external documentation</a>.
 %%<br /> Orient = ?wxHORIZONTAL | ?wxVERTICAL | ?wxBOTH
 -spec tile(This, [Option]) -> ok when
 	This::wxMDIParentFrame(),
diff --git a/lib/wx/src/gen/wxMask.erl b/lib/wx/src/gen/wxMask.erl
index 296c7cbc83..491dc2db79 100644
--- a/lib/wx/src/gen/wxMask.erl
+++ b/lib/wx/src/gen/wxMask.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html">wxMask</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmask.html">wxMask</a>.
 %% @type wxMask().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,13 +34,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMask() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
 -spec new() -> wxMask().
 new() ->
   wxe_util:construct(?wxMask_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
 -spec new(Bitmap) -> wxMask() when
 	Bitmap::wxBitmap:wxBitmap().
 new(#wx_ref{type=BitmapT,ref=BitmapRef}) ->
@@ -48,7 +48,7 @@ new(#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   wxe_util:construct(?wxMask_new_1,
   <<BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmask.html#wxmaskwxmask">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Bitmap, Colour) -> wxMask() when<br />
 %% 	Bitmap::wxBitmap:wxBitmap(), Colour::wx:wx_colour().<br />
@@ -68,7 +68,7 @@ new(#wx_ref{type=BitmapT,ref=BitmapRef},Colour)
   wxe_util:construct(?wxMask_new_2_1,
   <<BitmapRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmask.html#wxmaskcreate">external documentation</a>.
 -spec create(This, Bitmap) -> boolean() when
 	This::wxMask(), Bitmap::wxBitmap:wxBitmap().
 create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
@@ -77,7 +77,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
   wxe_util:call(?wxMask_Create_1,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmask.html#wxmaskcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmask.html#wxmaskcreate">external documentation</a>.
 %% <br /> Also:<br />
 %% create(This, Bitmap, Colour) -> boolean() when<br />
 %% 	This::wxMask(), Bitmap::wxBitmap:wxBitmap(), Colour::wx:wx_colour().<br />
diff --git a/lib/wx/src/gen/wxMaximizeEvent.erl b/lib/wx/src/gen/wxMaximizeEvent.erl
index 5f7b7e890d..8db7c8a07a 100644
--- a/lib/wx/src/gen/wxMaximizeEvent.erl
+++ b/lib/wx/src/gen/wxMaximizeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmaximizeevent.html">wxMaximizeEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmaximizeevent.html">wxMaximizeEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>maximize</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxMaximize(). #wxMaximize{}} event record type.
diff --git a/lib/wx/src/gen/wxMemoryDC.erl b/lib/wx/src/gen/wxMemoryDC.erl
index cac20094a0..8de412bdc7 100644
--- a/lib/wx/src/gen/wxMemoryDC.erl
+++ b/lib/wx/src/gen/wxMemoryDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html">wxMemoryDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmemorydc.html">wxMemoryDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDC}
 %% </p>
@@ -53,18 +53,20 @@
   startPage/1]).
 
 -export_type([wxMemoryDC/0]).
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMemoryDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcwxmemorydc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmemorydc.html#wxmemorydcwxmemorydc">external documentation</a>.
 -spec new() -> wxMemoryDC().
 new() ->
   wxe_util:construct(?wxMemoryDC_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcwxmemorydc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmemorydc.html#wxmemorydcwxmemorydc">external documentation</a>.
 -spec new(Dc) -> wxMemoryDC() when
 	Dc::wxDC:wxDC() | wxBitmap:wxBitmap().
 new(#wx_ref{type=DcT,ref=DcRef}) ->
@@ -77,7 +79,7 @@ new(#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:construct(DcOP,
   <<DcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcselectobject">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmemorydc.html#wxmemorydcselectobject">external documentation</a>.
 -spec selectObject(This, Bmp) -> ok when
 	This::wxMemoryDC(), Bmp::wxBitmap:wxBitmap().
 selectObject(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) ->
@@ -86,7 +88,7 @@ selectObject(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) ->
   wxe_util:cast(?wxMemoryDC_SelectObject,
   <<ThisRef:32/?UI,BmpRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmemorydc.html#wxmemorydcselectobjectassource">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmemorydc.html#wxmemorydcselectobjectassource">external documentation</a>.
 -spec selectObjectAsSource(This, Bmp) -> ok when
 	This::wxMemoryDC(), Bmp::wxBitmap:wxBitmap().
 selectObjectAsSource(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef}) ->
diff --git a/lib/wx/src/gen/wxMenu.erl b/lib/wx/src/gen/wxMenu.erl
index d91863de82..a29480cb5e 100644
--- a/lib/wx/src/gen/wxMenu.erl
+++ b/lib/wx/src/gen/wxMenu.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html">wxMenu</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html">wxMenu</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxEvtHandler}
 %% </p>
@@ -52,7 +52,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuwxmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuwxmenu">external documentation</a>.
 -spec new([Option]) -> wxMenu() when
 	Option :: {style, integer()}.
 new(Options)
@@ -63,7 +63,7 @@ new(Options)
   wxe_util:construct(?wxMenu_new_1,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuwxmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuwxmenu">external documentation</a>.
 -spec new(Title, [Option]) -> wxMenu() when
 	Title::unicode:chardata(),
 	Option :: {style, integer()}.
@@ -76,7 +76,7 @@ new(Title, Options)
   wxe_util:construct(?wxMenu_new_2,
   <<(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuappend">external documentation</a>.
 -spec append(This, Item) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Item::wxMenuItem:wxMenuItem().
 append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
@@ -93,7 +93,7 @@ append(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   append(This,Itemid,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuappend">external documentation</a>.
 %% <br /> Also:<br />
 %% append(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when<br />
 %% 	This::wxMenu(), Itemid::integer(), Text::unicode:chardata(),<br />
@@ -122,7 +122,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_Append_3,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuappend">external documentation</a>.
 %% <br /> Also:<br />
 %% append(This, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when<br />
 %% 	This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(),<br />
@@ -159,7 +159,7 @@ appendCheckItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   appendCheckItem(This,Itemid,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendcheckitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuappendcheckitem">external documentation</a>.
 -spec appendCheckItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Itemid::integer(), Text::unicode:chardata(),
 	Option :: {help, unicode:chardata()}.
@@ -181,7 +181,7 @@ appendRadioItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   appendRadioItem(This,Itemid,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendradioitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuappendradioitem">external documentation</a>.
 -spec appendRadioItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Itemid::integer(), Text::unicode:chardata(),
 	Option :: {help, unicode:chardata()}.
@@ -195,7 +195,7 @@ appendRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_AppendRadioItem,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuappendseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuappendseparator">external documentation</a>.
 -spec appendSeparator(This) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu().
 appendSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -203,7 +203,7 @@ appendSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenu_AppendSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenubreak">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenubreak">external documentation</a>.
 -spec break(This) -> ok when
 	This::wxMenu().
 break(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -211,7 +211,7 @@ break(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxMenu_Break,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenucheck">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenucheck">external documentation</a>.
 -spec check(This, Itemid, Check) -> ok when
 	This::wxMenu(), Itemid::integer(), Check::boolean().
 check(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Check)
@@ -220,7 +220,7 @@ check(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Check)
   wxe_util:cast(?wxMenu_Check,
   <<ThisRef:32/?UI,Itemid:32/?UI,(wxe_util:from_bool(Check)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenudelete">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenudelete">external documentation</a>.
 %% <br /> Also:<br />
 %% delete(This, Item) -> boolean() when<br />
 %% 	This::wxMenu(), Item::wxMenuItem:wxMenuItem().<br />
@@ -240,7 +240,7 @@ delete(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Delete_1_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenudestroy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenudestroy">external documentation</a>.
 %% <br /> Also:<br />
 %% 'Destroy'(This, Item) -> boolean() when<br />
 %% 	This::wxMenu(), Item::wxMenuItem:wxMenuItem().<br />
@@ -260,7 +260,7 @@ delete(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Destroy_1_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuenable">external documentation</a>.
 -spec enable(This, Itemid, Enable) -> ok when
 	This::wxMenu(), Itemid::integer(), Enable::boolean().
 enable(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Enable)
@@ -269,7 +269,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Enable)
   wxe_util:cast(?wxMenu_Enable,
   <<ThisRef:32/?UI,Itemid:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenufinditem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenufinditem">external documentation</a>.
 %% <br /> Also:<br />
 %% findItem(This, Item) -> integer() when<br />
 %% 	This::wxMenu(), Item::unicode:chardata().<br />
@@ -290,7 +290,7 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxMenu_FindItem_1,
   <<ThisRef:32/?UI,(byte_size(Item_UC)):32/?UI,(Item_UC)/binary, 0:(((8- ((0+byte_size(Item_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenufinditembyposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenufinditembyposition">external documentation</a>.
 -spec findItemByPosition(This, Position) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Position::integer().
 findItemByPosition(#wx_ref{type=ThisT,ref=ThisRef},Position)
@@ -299,7 +299,7 @@ findItemByPosition(#wx_ref{type=ThisT,ref=ThisRef},Position)
   wxe_util:call(?wxMenu_FindItemByPosition,
   <<ThisRef:32/?UI,Position:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugethelpstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenugethelpstring">external documentation</a>.
 -spec getHelpString(This, Itemid) -> unicode:charlist() when
 	This::wxMenu(), Itemid::integer().
 getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -308,7 +308,7 @@ getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenu_GetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenugetlabel">external documentation</a>.
 -spec getLabel(This, Itemid) -> unicode:charlist() when
 	This::wxMenu(), Itemid::integer().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -317,7 +317,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenu_GetLabel,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugetmenuitemcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenugetmenuitemcount">external documentation</a>.
 -spec getMenuItemCount(This) -> integer() when
 	This::wxMenu().
 getMenuItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -325,7 +325,7 @@ getMenuItemCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenu_GetMenuItemCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugetmenuitems">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenugetmenuitems">external documentation</a>.
 -spec getMenuItems(This) -> [wxMenuItem:wxMenuItem()] when
 	This::wxMenu().
 getMenuItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -333,7 +333,7 @@ getMenuItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenu_GetMenuItems,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenugettitle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenugettitle">external documentation</a>.
 -spec getTitle(This) -> unicode:charlist() when
 	This::wxMenu().
 getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -341,7 +341,7 @@ getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenu_GetTitle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
 %% <br /> Also:<br />
 %% insert(This, Pos, Item) -> wxMenuItem:wxMenuItem() when<br />
 %% 	This::wxMenu(), Pos::integer(), Item::wxMenuItem:wxMenuItem().<br />
@@ -362,7 +362,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxMenu_Insert_2,
   <<ThisRef:32/?UI,Pos:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
 -spec insert(This, Pos, Itemid, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Pos::integer(), Itemid::integer(),
@@ -388,7 +388,7 @@ insert(This,Pos,Itemid,Text,Submenu)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text),is_record(Submenu, wx_ref) ->
   insert(This,Pos,Itemid,Text,Submenu, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuinsert">external documentation</a>.
 %% <br /> Also:<br />
 %% insert(This, Pos, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when<br />
 %% 	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(),<br />
@@ -425,7 +425,7 @@ insertCheckItem(This,Pos,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text) ->
   insertCheckItem(This,Pos,Itemid,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertcheckitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuinsertcheckitem">external documentation</a>.
 -spec insertCheckItem(This, Pos, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(),
 	Option :: {help, unicode:chardata()}.
@@ -447,7 +447,7 @@ insertRadioItem(This,Pos,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Itemid),is_list(Text) ->
   insertRadioItem(This,Pos,Itemid,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertradioitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuinsertradioitem">external documentation</a>.
 -spec insertRadioItem(This, Pos, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Pos::integer(), Itemid::integer(), Text::unicode:chardata(),
 	Option :: {help, unicode:chardata()}.
@@ -461,7 +461,7 @@ insertRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Pos,Itemid,Text, Options)
   wxe_util:call(?wxMenu_InsertRadioItem,
   <<ThisRef:32/?UI,Pos:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuinsertseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuinsertseparator">external documentation</a>.
 -spec insertSeparator(This, Pos) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Pos::integer().
 insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -470,7 +470,7 @@ insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxMenu_InsertSeparator,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuischecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuischecked">external documentation</a>.
 -spec isChecked(This, Itemid) -> boolean() when
 	This::wxMenu(), Itemid::integer().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -479,7 +479,7 @@ isChecked(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenu_IsChecked,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuisenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuisenabled">external documentation</a>.
 -spec isEnabled(This, Itemid) -> boolean() when
 	This::wxMenu(), Itemid::integer().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -488,7 +488,7 @@ isEnabled(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenu_IsEnabled,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
 %% <br /> Also:<br />
 %% prepend(This, Item) -> wxMenuItem:wxMenuItem() when<br />
 %% 	This::wxMenu(), Item::wxMenuItem:wxMenuItem().<br />
@@ -508,7 +508,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Prepend_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
 -spec prepend(This, Itemid, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Itemid::integer(),
@@ -534,7 +534,7 @@ prepend(This,Itemid,Text,Submenu)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text),is_record(Submenu, wx_ref) ->
   prepend(This,Itemid,Text,Submenu, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuprepend">external documentation</a>.
 %% <br /> Also:<br />
 %% prepend(This, Itemid, Text, Submenu, [Option]) -> wxMenuItem:wxMenuItem() when<br />
 %% 	This::wxMenu(), Itemid::integer(), Text::unicode:chardata(), Submenu::wxMenu(),<br />
@@ -571,7 +571,7 @@ prependCheckItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   prependCheckItem(This,Itemid,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependcheckitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuprependcheckitem">external documentation</a>.
 -spec prependCheckItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Itemid::integer(), Text::unicode:chardata(),
 	Option :: {help, unicode:chardata()}.
@@ -593,7 +593,7 @@ prependRadioItem(This,Itemid,Text)
  when is_record(This, wx_ref),is_integer(Itemid),is_list(Text) ->
   prependRadioItem(This,Itemid,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependradioitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuprependradioitem">external documentation</a>.
 -spec prependRadioItem(This, Itemid, Text, [Option]) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu(), Itemid::integer(), Text::unicode:chardata(),
 	Option :: {help, unicode:chardata()}.
@@ -607,7 +607,7 @@ prependRadioItem(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Text, Options)
   wxe_util:call(?wxMenu_PrependRadioItem,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuprependseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuprependseparator">external documentation</a>.
 -spec prependSeparator(This) -> wxMenuItem:wxMenuItem() when
 	This::wxMenu().
 prependSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -615,7 +615,7 @@ prependSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenu_PrependSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenuremove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenuremove">external documentation</a>.
 %% <br /> Also:<br />
 %% remove(This, Item) -> wxMenuItem:wxMenuItem() when<br />
 %% 	This::wxMenu(), Item::wxMenuItem:wxMenuItem().<br />
@@ -635,7 +635,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxMenu_Remove_1_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusethelpstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenusethelpstring">external documentation</a>.
 -spec setHelpString(This, Itemid, HelpString) -> ok when
 	This::wxMenu(), Itemid::integer(), HelpString::unicode:chardata().
 setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
@@ -645,7 +645,7 @@ setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
   wxe_util:cast(?wxMenu_SetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenusetlabel">external documentation</a>.
 -spec setLabel(This, Itemid, Label) -> ok when
 	This::wxMenu(), Itemid::integer(), Label::unicode:chardata().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
@@ -655,7 +655,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
   wxe_util:cast(?wxMenu_SetLabel,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenu.html#wxmenusettitle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenu.html#wxmenusettitle">external documentation</a>.
 -spec setTitle(This, Title) -> ok when
 	This::wxMenu(), Title::unicode:chardata().
 setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title)
diff --git a/lib/wx/src/gen/wxMenuBar.erl b/lib/wx/src/gen/wxMenuBar.erl
index b0253292bd..937a5e4afc 100644
--- a/lib/wx/src/gen/wxMenuBar.erl
+++ b/lib/wx/src/gen/wxMenuBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html">wxMenuBar</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html">wxMenuBar</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -79,13 +79,13 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMenuBar() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarwxmenubar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarwxmenubar">external documentation</a>.
 -spec new() -> wxMenuBar().
 new() ->
   wxe_util:construct(?wxMenuBar_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarwxmenubar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarwxmenubar">external documentation</a>.
 -spec new(Style) -> wxMenuBar() when
 	Style::integer().
 new(Style)
@@ -93,7 +93,7 @@ new(Style)
   wxe_util:construct(?wxMenuBar_new_1,
   <<Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarappend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarappend">external documentation</a>.
 -spec append(This, Menu, Title) -> boolean() when
 	This::wxMenuBar(), Menu::wxMenu:wxMenu(), Title::unicode:chardata().
 append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},Title)
@@ -104,7 +104,7 @@ append(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},Title)
   wxe_util:call(?wxMenuBar_Append,
   <<ThisRef:32/?UI,MenuRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarcheck">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarcheck">external documentation</a>.
 -spec check(This, Itemid, Check) -> ok when
 	This::wxMenuBar(), Itemid::integer(), Check::boolean().
 check(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Check)
@@ -121,7 +121,7 @@ enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarenable">external documentation</a>.
 -spec enable(This, [Option]) -> boolean() when
 	This::wxMenuBar(),
 	Option :: {enable, boolean()}.
@@ -134,7 +134,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxMenuBar_Enable_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarenable">external documentation</a>.
 -spec enable(This, Itemid, Enable) -> ok when
 	This::wxMenuBar(), Itemid::integer(), Enable::boolean().
 enable(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Enable)
@@ -143,7 +143,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Enable)
   wxe_util:cast(?wxMenuBar_Enable_2,
   <<ThisRef:32/?UI,Itemid:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarenabletop">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarenabletop">external documentation</a>.
 -spec enableTop(This, Pos, Flag) -> ok when
 	This::wxMenuBar(), Pos::integer(), Flag::boolean().
 enableTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Flag)
@@ -152,7 +152,7 @@ enableTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Flag)
   wxe_util:cast(?wxMenuBar_EnableTop,
   <<ThisRef:32/?UI,Pos:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfindmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarfindmenu">external documentation</a>.
 -spec findMenu(This, Title) -> integer() when
 	This::wxMenuBar(), Title::unicode:chardata().
 findMenu(#wx_ref{type=ThisT,ref=ThisRef},Title)
@@ -162,7 +162,7 @@ findMenu(#wx_ref{type=ThisT,ref=ThisRef},Title)
   wxe_util:call(?wxMenuBar_FindMenu,
   <<ThisRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfindmenuitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarfindmenuitem">external documentation</a>.
 -spec findMenuItem(This, MenuString, ItemString) -> integer() when
 	This::wxMenuBar(), MenuString::unicode:chardata(), ItemString::unicode:chardata().
 findMenuItem(#wx_ref{type=ThisT,ref=ThisRef},MenuString,ItemString)
@@ -173,7 +173,7 @@ findMenuItem(#wx_ref{type=ThisT,ref=ThisRef},MenuString,ItemString)
   wxe_util:call(?wxMenuBar_FindMenuItem,
   <<ThisRef:32/?UI,(byte_size(MenuString_UC)):32/?UI,(MenuString_UC)/binary, 0:(((8- ((0+byte_size(MenuString_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(ItemString_UC)):32/?UI,(ItemString_UC)/binary, 0:(((8- ((4+byte_size(ItemString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarfinditem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarfinditem">external documentation</a>.
 -spec findItem(This, Id) -> wxMenuItem:wxMenuItem() when
 	This::wxMenuBar(), Id::integer().
 findItem(#wx_ref{type=ThisT,ref=ThisRef},Id)
@@ -182,7 +182,7 @@ findItem(#wx_ref{type=ThisT,ref=ThisRef},Id)
   wxe_util:call(?wxMenuBar_FindItem,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargethelpstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubargethelpstring">external documentation</a>.
 -spec getHelpString(This, Itemid) -> unicode:charlist() when
 	This::wxMenuBar(), Itemid::integer().
 getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -191,7 +191,7 @@ getHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenuBar_GetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>.
 -spec getLabel(This) -> unicode:charlist() when
 	This::wxMenuBar().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -199,7 +199,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuBar_GetLabel_0,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubargetlabel">external documentation</a>.
 -spec getLabel(This, Itemid) -> unicode:charlist() when
 	This::wxMenuBar(), Itemid::integer().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -208,7 +208,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenuBar_GetLabel_1,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetlabeltop">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubargetlabeltop">external documentation</a>.
 -spec getLabelTop(This, Pos) -> unicode:charlist() when
 	This::wxMenuBar(), Pos::integer().
 getLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -217,7 +217,7 @@ getLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxMenuBar_GetLabelTop,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubargetmenu">external documentation</a>.
 -spec getMenu(This, Pos) -> wxMenu:wxMenu() when
 	This::wxMenuBar(), Pos::integer().
 getMenu(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -226,7 +226,7 @@ getMenu(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxMenuBar_GetMenu,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubargetmenucount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubargetmenucount">external documentation</a>.
 -spec getMenuCount(This) -> integer() when
 	This::wxMenuBar().
 getMenuCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -234,7 +234,7 @@ getMenuCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuBar_GetMenuCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarinsert">external documentation</a>.
 -spec insert(This, Pos, Menu, Title) -> boolean() when
 	This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::unicode:chardata().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title)
@@ -245,7 +245,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title
   wxe_util:call(?wxMenuBar_Insert,
   <<ThisRef:32/?UI,Pos:32/?UI,MenuRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarischecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarischecked">external documentation</a>.
 -spec isChecked(This, Itemid) -> boolean() when
 	This::wxMenuBar(), Itemid::integer().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -254,7 +254,7 @@ isChecked(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenuBar_IsChecked,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarisenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarisenabled">external documentation</a>.
 -spec isEnabled(This) -> boolean() when
 	This::wxMenuBar().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -262,7 +262,7 @@ isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuBar_IsEnabled_0,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarisenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarisenabled">external documentation</a>.
 -spec isEnabled(This, Itemid) -> boolean() when
 	This::wxMenuBar(), Itemid::integer().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
@@ -271,7 +271,7 @@ isEnabled(#wx_ref{type=ThisT,ref=ThisRef},Itemid)
   wxe_util:call(?wxMenuBar_IsEnabled_1,
   <<ThisRef:32/?UI,Itemid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarremove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarremove">external documentation</a>.
 -spec remove(This, Pos) -> wxMenu:wxMenu() when
 	This::wxMenuBar(), Pos::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -280,7 +280,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxMenuBar_Remove,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarreplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarreplace">external documentation</a>.
 -spec replace(This, Pos, Menu, Title) -> wxMenu:wxMenu() when
 	This::wxMenuBar(), Pos::integer(), Menu::wxMenu:wxMenu(), Title::unicode:chardata().
 replace(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Title)
@@ -291,7 +291,7 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=MenuT,ref=MenuRef},Titl
   wxe_util:call(?wxMenuBar_Replace,
   <<ThisRef:32/?UI,Pos:32/?UI,MenuRef:32/?UI,(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((0+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsethelpstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarsethelpstring">external documentation</a>.
 -spec setHelpString(This, Itemid, HelpString) -> ok when
 	This::wxMenuBar(), Itemid::integer(), HelpString::unicode:chardata().
 setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
@@ -301,7 +301,7 @@ setHelpString(#wx_ref{type=ThisT,ref=ThisRef},Itemid,HelpString)
   wxe_util:cast(?wxMenuBar_SetHelpString,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>.
 -spec setLabel(This, S) -> ok when
 	This::wxMenuBar(), S::unicode:chardata().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},S)
@@ -311,7 +311,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},S)
   wxe_util:cast(?wxMenuBar_SetLabel_1,
   <<ThisRef:32/?UI,(byte_size(S_UC)):32/?UI,(S_UC)/binary, 0:(((8- ((0+byte_size(S_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarsetlabel">external documentation</a>.
 -spec setLabel(This, Itemid, Label) -> ok when
 	This::wxMenuBar(), Itemid::integer(), Label::unicode:chardata().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
@@ -321,7 +321,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Itemid,Label)
   wxe_util:cast(?wxMenuBar_SetLabel_2,
   <<ThisRef:32/?UI,Itemid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenubar.html#wxmenubarsetlabeltop">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenubar.html#wxmenubarsetlabeltop">external documentation</a>.
 -spec setLabelTop(This, Pos, Label) -> ok when
 	This::wxMenuBar(), Pos::integer(), Label::unicode:chardata().
 setLabelTop(#wx_ref{type=ThisT,ref=ThisRef},Pos,Label)
diff --git a/lib/wx/src/gen/wxMenuEvent.erl b/lib/wx/src/gen/wxMenuEvent.erl
index 84c4760aa6..7e3905d3e4 100644
--- a/lib/wx/src/gen/wxMenuEvent.erl
+++ b/lib/wx/src/gen/wxMenuEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuevent.html">wxMenuEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuevent.html">wxMenuEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>menu_open</em>, <em>menu_close</em>, <em>menu_highlight</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxMenu(). #wxMenu{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMenuEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuevent.html#wxmenueventgetmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuevent.html#wxmenueventgetmenu">external documentation</a>.
 -spec getMenu(This) -> wxMenu:wxMenu() when
 	This::wxMenuEvent().
 getMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -51,7 +51,7 @@ getMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuEvent_GetMenu,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuevent.html#wxmenueventgetmenuid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuevent.html#wxmenueventgetmenuid">external documentation</a>.
 -spec getMenuId(This) -> integer() when
 	This::wxMenuEvent().
 getMenuId(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ getMenuId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuEvent_GetMenuId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuevent.html#wxmenueventispopup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuevent.html#wxmenueventispopup">external documentation</a>.
 -spec isPopup(This) -> boolean() when
 	This::wxMenuEvent().
 isPopup(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxMenuItem.erl b/lib/wx/src/gen/wxMenuItem.erl
index 7ad71a2858..5a7d210d15 100644
--- a/lib/wx/src/gen/wxMenuItem.erl
+++ b/lib/wx/src/gen/wxMenuItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html">wxMenuItem</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html">wxMenuItem</a>.
 %% @type wxMenuItem().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -43,7 +43,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemwxmenuitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemwxmenuitem">external documentation</a>.
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
 -spec new([Option]) -> wxMenuItem() when
 	Option :: {parentMenu, wxMenu:wxMenu()}
@@ -73,7 +73,7 @@ check(This)
  when is_record(This, wx_ref) ->
   check(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemcheck">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemcheck">external documentation</a>.
 -spec check(This, [Option]) -> ok when
 	This::wxMenuItem(),
 	Option :: {check, boolean()}.
@@ -94,7 +94,7 @@ enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemenable">external documentation</a>.
 -spec enable(This, [Option]) -> ok when
 	This::wxMenuItem(),
 	Option :: {enable, boolean()}.
@@ -107,7 +107,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxMenuItem_Enable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgetbitmap">external documentation</a>.
 -spec getBitmap(This) -> wxBitmap:wxBitmap() when
 	This::wxMenuItem().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -115,7 +115,7 @@ getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgethelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgethelp">external documentation</a>.
 -spec getHelp(This) -> unicode:charlist() when
 	This::wxMenuItem().
 getHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -123,7 +123,7 @@ getHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetHelp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgetid">external documentation</a>.
 -spec getId(This) -> integer() when
 	This::wxMenuItem().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -131,7 +131,7 @@ getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetkind">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgetkind">external documentation</a>.
 %%<br /> Res = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
 -spec getKind(This) -> wx:wx_enum() when
 	This::wxMenuItem().
@@ -140,7 +140,7 @@ getKind(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetKind,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgetlabel">external documentation</a>.
 -spec getLabel(This) -> unicode:charlist() when
 	This::wxMenuItem().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetlabelfromtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgetlabelfromtext">external documentation</a>.
 -spec getLabelFromText(Text) -> unicode:charlist() when
 	Text::unicode:chardata().
 getLabelFromText(Text)
@@ -157,7 +157,7 @@ getLabelFromText(Text)
   wxe_util:call(?wxMenuItem_GetLabelFromText,
   <<(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgetmenu">external documentation</a>.
 -spec getMenu(This) -> wxMenu:wxMenu() when
 	This::wxMenuItem().
 getMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -165,7 +165,7 @@ getMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetMenu,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgettext">external documentation</a>.
 -spec getText(This) -> unicode:charlist() when
 	This::wxMenuItem().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -173,7 +173,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemgetsubmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemgetsubmenu">external documentation</a>.
 -spec getSubMenu(This) -> wxMenu:wxMenu() when
 	This::wxMenuItem().
 getSubMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -181,7 +181,7 @@ getSubMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_GetSubMenu,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemischeckable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemischeckable">external documentation</a>.
 -spec isCheckable(This) -> boolean() when
 	This::wxMenuItem().
 isCheckable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -189,7 +189,7 @@ isCheckable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_IsCheckable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemischecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemischecked">external documentation</a>.
 -spec isChecked(This) -> boolean() when
 	This::wxMenuItem().
 isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -197,7 +197,7 @@ isChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_IsChecked,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemisenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemisenabled">external documentation</a>.
 -spec isEnabled(This) -> boolean() when
 	This::wxMenuItem().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -205,7 +205,7 @@ isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_IsEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemisseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemisseparator">external documentation</a>.
 -spec isSeparator(This) -> boolean() when
 	This::wxMenuItem().
 isSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -213,7 +213,7 @@ isSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_IsSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemissubmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemissubmenu">external documentation</a>.
 -spec isSubMenu(This) -> boolean() when
 	This::wxMenuItem().
 isSubMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -221,7 +221,7 @@ isSubMenu(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMenuItem_IsSubMenu,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemsetbitmap">external documentation</a>.
 -spec setBitmap(This, Bitmap) -> ok when
 	This::wxMenuItem(), Bitmap::wxBitmap:wxBitmap().
 setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
@@ -230,7 +230,7 @@ setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) -
   wxe_util:cast(?wxMenuItem_SetBitmap,
   <<ThisRef:32/?UI,BitmapRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsethelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemsethelp">external documentation</a>.
 -spec setHelp(This, Str) -> ok when
 	This::wxMenuItem(), Str::unicode:chardata().
 setHelp(#wx_ref{type=ThisT,ref=ThisRef},Str)
@@ -240,7 +240,7 @@ setHelp(#wx_ref{type=ThisT,ref=ThisRef},Str)
   wxe_util:cast(?wxMenuItem_SetHelp,
   <<ThisRef:32/?UI,(byte_size(Str_UC)):32/?UI,(Str_UC)/binary, 0:(((8- ((0+byte_size(Str_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsetmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemsetmenu">external documentation</a>.
 -spec setMenu(This, Menu) -> ok when
 	This::wxMenuItem(), Menu::wxMenu:wxMenu().
 setMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
@@ -249,7 +249,7 @@ setMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
   wxe_util:cast(?wxMenuItem_SetMenu,
   <<ThisRef:32/?UI,MenuRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsetsubmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemsetsubmenu">external documentation</a>.
 -spec setSubMenu(This, Menu) -> ok when
 	This::wxMenuItem(), Menu::wxMenu:wxMenu().
 setSubMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
@@ -258,7 +258,7 @@ setSubMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
   wxe_util:cast(?wxMenuItem_SetSubMenu,
   <<ThisRef:32/?UI,MenuRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmenuitem.html#wxmenuitemsettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmenuitem.html#wxmenuitemsettext">external documentation</a>.
 -spec setText(This, Str) -> ok when
 	This::wxMenuItem(), Str::unicode:chardata().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Str)
diff --git a/lib/wx/src/gen/wxMessageDialog.erl b/lib/wx/src/gen/wxMessageDialog.erl
index 83c3e67d01..71dacf2b42 100644
--- a/lib/wx/src/gen/wxMessageDialog.erl
+++ b/lib/wx/src/gen/wxMessageDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmessagedialog.html">wxMessageDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmessagedialog.html">wxMessageDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -94,7 +94,7 @@ new(Parent,Message)
  when is_record(Parent, wx_ref),is_list(Message) ->
   new(Parent,Message, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmessagedialog.html#wxmessagedialogwxmessagedialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmessagedialog.html#wxmessagedialogwxmessagedialog">external documentation</a>.
 -spec new(Parent, Message, [Option]) -> wxMessageDialog() when
 	Parent::wxWindow:wxWindow(), Message::unicode:chardata(),
 	Option :: {caption, unicode:chardata()}
diff --git a/lib/wx/src/gen/wxMiniFrame.erl b/lib/wx/src/gen/wxMiniFrame.erl
index 3521c6458c..40671d1361 100644
--- a/lib/wx/src/gen/wxMiniFrame.erl
+++ b/lib/wx/src/gen/wxMiniFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html">wxMiniFrame</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxminiframe.html">wxMiniFrame</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxFrame}
 %% <br />{@link wxTopLevelWindow}
@@ -89,7 +89,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMiniFrame() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframewxminiframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxminiframe.html#wxminiframewxminiframe">external documentation</a>.
 -spec new() -> wxMiniFrame().
 new() ->
   wxe_util:construct(?wxMiniFrame_new_0,
@@ -103,7 +103,7 @@ new(Parent,Id,Title)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   new(Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframewxminiframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxminiframe.html#wxminiframewxminiframe">external documentation</a>.
 -spec new(Parent, Id, Title, [Option]) -> wxMiniFrame() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -129,7 +129,7 @@ create(This,Parent,Id,Title)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title) ->
   create(This,Parent,Id,Title, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxminiframe.html#wxminiframecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxminiframe.html#wxminiframecreate">external documentation</a>.
 -spec create(This, Parent, Id, Title, [Option]) -> boolean() when
 	This::wxMiniFrame(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
diff --git a/lib/wx/src/gen/wxMirrorDC.erl b/lib/wx/src/gen/wxMirrorDC.erl
index 1fdb90e4eb..9a681bff2e 100644
--- a/lib/wx/src/gen/wxMirrorDC.erl
+++ b/lib/wx/src/gen/wxMirrorDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmirrordc.html">wxMirrorDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmirrordc.html">wxMirrorDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDC}
 %% </p>
@@ -53,12 +53,14 @@
   startPage/1]).
 
 -export_type([wxMirrorDC/0]).
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMirrorDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmirrordc.html#wxmirrordcwxmirrordc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmirrordc.html#wxmirrordcwxmirrordc">external documentation</a>.
 -spec new(Dc, Mirror) -> wxMirrorDC() when
 	Dc::wxDC:wxDC(), Mirror::boolean().
 new(#wx_ref{type=DcT,ref=DcRef},Mirror)
diff --git a/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl b/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl
index 659582b611..6b0a4500b0 100644
--- a/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl
+++ b/lib/wx/src/gen/wxMouseCaptureChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmousecapturechangedevent.html">wxMouseCaptureChangedEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmousecapturechangedevent.html">wxMouseCaptureChangedEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>mouse_capture_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxMouseCaptureChanged(). #wxMouseCaptureChanged{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMouseCaptureChangedEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmousecapturechangedevent.html#wxmousecapturechangedeventgetcapturedwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmousecapturechangedevent.html#wxmousecapturechangedeventgetcapturedwindow">external documentation</a>.
 -spec getCapturedWindow(This) -> wxWindow:wxWindow() when
 	This::wxMouseCaptureChangedEvent().
 getCapturedWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxMouseEvent.erl b/lib/wx/src/gen/wxMouseEvent.erl
index 29a4f13ba8..f267b437a0 100644
--- a/lib/wx/src/gen/wxMouseEvent.erl
+++ b/lib/wx/src/gen/wxMouseEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html">wxMouseEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html">wxMouseEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>left_down</em>, <em>left_up</em>, <em>middle_down</em>, <em>middle_up</em>, <em>right_down</em>, <em>right_up</em>, <em>motion</em>, <em>enter_window</em>, <em>leave_window</em>, <em>left_dclick</em>, <em>middle_dclick</em>, <em>right_dclick</em>, <em>mousewheel</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxMouse(). #wxMouse{}} event record type.
@@ -49,7 +49,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMouseEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventaltdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventaltdown">external documentation</a>.
 -spec altDown(This) -> boolean() when
 	This::wxMouseEvent().
 altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -57,7 +57,7 @@ altDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_AltDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventbutton">external documentation</a>.
 -spec button(This, But) -> boolean() when
 	This::wxMouseEvent(), But::integer().
 button(#wx_ref{type=ThisT,ref=ThisRef},But)
@@ -74,7 +74,7 @@ buttonDClick(This)
  when is_record(This, wx_ref) ->
   buttonDClick(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbuttondclick">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventbuttondclick">external documentation</a>.
 -spec buttonDClick(This, [Option]) -> boolean() when
 	This::wxMouseEvent(),
 	Option :: {but, integer()}.
@@ -95,7 +95,7 @@ buttonDown(This)
  when is_record(This, wx_ref) ->
   buttonDown(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbuttondown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventbuttondown">external documentation</a>.
 -spec buttonDown(This, [Option]) -> boolean() when
 	This::wxMouseEvent(),
 	Option :: {but, integer()}.
@@ -116,7 +116,7 @@ buttonUp(This)
  when is_record(This, wx_ref) ->
   buttonUp(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventbuttonup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventbuttonup">external documentation</a>.
 -spec buttonUp(This, [Option]) -> boolean() when
 	This::wxMouseEvent(),
 	Option :: {but, integer()}.
@@ -129,7 +129,7 @@ buttonUp(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxMouseEvent_ButtonUp,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventcmddown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventcmddown">external documentation</a>.
 -spec cmdDown(This) -> boolean() when
 	This::wxMouseEvent().
 cmdDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -137,7 +137,7 @@ cmdDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_CmdDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventcontroldown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventcontroldown">external documentation</a>.
 -spec controlDown(This) -> boolean() when
 	This::wxMouseEvent().
 controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -145,7 +145,7 @@ controlDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_ControlDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventdragging">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventdragging">external documentation</a>.
 -spec dragging(This) -> boolean() when
 	This::wxMouseEvent().
 dragging(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -153,7 +153,7 @@ dragging(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_Dragging,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseevententering">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseevententering">external documentation</a>.
 -spec entering(This) -> boolean() when
 	This::wxMouseEvent().
 entering(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -161,7 +161,7 @@ entering(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_Entering,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgetbutton">external documentation</a>.
 -spec getButton(This) -> integer() when
 	This::wxMouseEvent().
 getButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ getButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_GetButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxMouseEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -177,7 +177,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetlogicalposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgetlogicalposition">external documentation</a>.
 -spec getLogicalPosition(This, Dc) -> {X::integer(), Y::integer()} when
 	This::wxMouseEvent(), Dc::wxDC:wxDC().
 getLogicalPosition(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
@@ -186,7 +186,7 @@ getLogicalPosition(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef})
   wxe_util:call(?wxMouseEvent_GetLogicalPosition,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetlinesperaction">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgetlinesperaction">external documentation</a>.
 -spec getLinesPerAction(This) -> integer() when
 	This::wxMouseEvent().
 getLinesPerAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -194,7 +194,7 @@ getLinesPerAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_GetLinesPerAction,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetwheelrotation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgetwheelrotation">external documentation</a>.
 -spec getWheelRotation(This) -> integer() when
 	This::wxMouseEvent().
 getWheelRotation(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -202,7 +202,7 @@ getWheelRotation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_GetWheelRotation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetwheeldelta">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgetwheeldelta">external documentation</a>.
 -spec getWheelDelta(This) -> integer() when
 	This::wxMouseEvent().
 getWheelDelta(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -210,7 +210,7 @@ getWheelDelta(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_GetWheelDelta,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgetx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgetx">external documentation</a>.
 -spec getX(This) -> integer() when
 	This::wxMouseEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -218,7 +218,7 @@ getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventgety">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventgety">external documentation</a>.
 -spec getY(This) -> integer() when
 	This::wxMouseEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -226,7 +226,7 @@ getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventisbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventisbutton">external documentation</a>.
 -spec isButton(This) -> boolean() when
 	This::wxMouseEvent().
 isButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -234,7 +234,7 @@ isButton(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_IsButton,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventispagescroll">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventispagescroll">external documentation</a>.
 -spec isPageScroll(This) -> boolean() when
 	This::wxMouseEvent().
 isPageScroll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -242,7 +242,7 @@ isPageScroll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_IsPageScroll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleaving">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventleaving">external documentation</a>.
 -spec leaving(This) -> boolean() when
 	This::wxMouseEvent().
 leaving(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -250,7 +250,7 @@ leaving(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_Leaving,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftdclick">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventleftdclick">external documentation</a>.
 -spec leftDClick(This) -> boolean() when
 	This::wxMouseEvent().
 leftDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -258,7 +258,7 @@ leftDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_LeftDClick,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventleftdown">external documentation</a>.
 -spec leftDown(This) -> boolean() when
 	This::wxMouseEvent().
 leftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -266,7 +266,7 @@ leftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_LeftDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftisdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventleftisdown">external documentation</a>.
 -spec leftIsDown(This) -> boolean() when
 	This::wxMouseEvent().
 leftIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -274,7 +274,7 @@ leftIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_LeftIsDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventleftup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventleftup">external documentation</a>.
 -spec leftUp(This) -> boolean() when
 	This::wxMouseEvent().
 leftUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -282,7 +282,7 @@ leftUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_LeftUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmetadown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventmetadown">external documentation</a>.
 -spec metaDown(This) -> boolean() when
 	This::wxMouseEvent().
 metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -290,7 +290,7 @@ metaDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_MetaDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddledclick">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventmiddledclick">external documentation</a>.
 -spec middleDClick(This) -> boolean() when
 	This::wxMouseEvent().
 middleDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -298,7 +298,7 @@ middleDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_MiddleDClick,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddledown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventmiddledown">external documentation</a>.
 -spec middleDown(This) -> boolean() when
 	This::wxMouseEvent().
 middleDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -306,7 +306,7 @@ middleDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_MiddleDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddleisdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventmiddleisdown">external documentation</a>.
 -spec middleIsDown(This) -> boolean() when
 	This::wxMouseEvent().
 middleIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -314,7 +314,7 @@ middleIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_MiddleIsDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmiddleup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventmiddleup">external documentation</a>.
 -spec middleUp(This) -> boolean() when
 	This::wxMouseEvent().
 middleUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -322,7 +322,7 @@ middleUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_MiddleUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventmoving">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventmoving">external documentation</a>.
 -spec moving(This) -> boolean() when
 	This::wxMouseEvent().
 moving(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -330,7 +330,7 @@ moving(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_Moving,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightdclick">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventrightdclick">external documentation</a>.
 -spec rightDClick(This) -> boolean() when
 	This::wxMouseEvent().
 rightDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -338,7 +338,7 @@ rightDClick(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_RightDClick,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventrightdown">external documentation</a>.
 -spec rightDown(This) -> boolean() when
 	This::wxMouseEvent().
 rightDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -346,7 +346,7 @@ rightDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_RightDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightisdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventrightisdown">external documentation</a>.
 -spec rightIsDown(This) -> boolean() when
 	This::wxMouseEvent().
 rightIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -354,7 +354,7 @@ rightIsDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_RightIsDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventrightup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventrightup">external documentation</a>.
 -spec rightUp(This) -> boolean() when
 	This::wxMouseEvent().
 rightUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -362,7 +362,7 @@ rightUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMouseEvent_RightUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmouseevent.html#wxmouseeventshiftdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmouseevent.html#wxmouseeventshiftdown">external documentation</a>.
 -spec shiftDown(This) -> boolean() when
 	This::wxMouseEvent().
 shiftDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxMoveEvent.erl b/lib/wx/src/gen/wxMoveEvent.erl
index b2f2fa74df..429f35411e 100644
--- a/lib/wx/src/gen/wxMoveEvent.erl
+++ b/lib/wx/src/gen/wxMoveEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmoveevent.html">wxMoveEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmoveevent.html">wxMoveEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>move</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxMove(). #wxMove{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMoveEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmoveevent.html#wxmoveeventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmoveevent.html#wxmoveeventgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxMoveEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxMultiChoiceDialog.erl b/lib/wx/src/gen/wxMultiChoiceDialog.erl
index 6a6a6b833a..4a83bb52d9 100644
--- a/lib/wx/src/gen/wxMultiChoiceDialog.erl
+++ b/lib/wx/src/gen/wxMultiChoiceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html">wxMultiChoiceDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmultichoicedialog.html">wxMultiChoiceDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -86,7 +86,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxMultiChoiceDialog() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialogwxmultichoicedialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmultichoicedialog.html#wxmultichoicedialogwxmultichoicedialog">external documentation</a>.
 -spec new() -> wxMultiChoiceDialog().
 new() ->
   wxe_util:construct(?wxMultiChoiceDialog_new_0,
@@ -100,7 +100,7 @@ new(Parent,Message,Caption,Choices)
  when is_record(Parent, wx_ref),is_list(Message),is_list(Caption),is_list(Choices) ->
   new(Parent,Message,Caption,Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialogwxmultichoicedialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmultichoicedialog.html#wxmultichoicedialogwxmultichoicedialog">external documentation</a>.
 -spec new(Parent, Message, Caption, Choices, [Option]) -> wxMultiChoiceDialog() when
 	Parent::wxWindow:wxWindow(), Message::unicode:chardata(), Caption::unicode:chardata(), Choices::[unicode:chardata()],
 	Option :: {style, integer()}
@@ -119,7 +119,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options)
   wxe_util:construct(?wxMultiChoiceDialog_new_5,
   <<ParentRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Caption_UC)):32/?UI,(Caption_UC)/binary, 0:(((8- ((4+byte_size(Caption_UC)) band 16#7)) band 16#7))/unit:8,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialoggetselections">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmultichoicedialog.html#wxmultichoicedialoggetselections">external documentation</a>.
 -spec getSelections(This) -> [integer()] when
 	This::wxMultiChoiceDialog().
 getSelections(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -127,7 +127,7 @@ getSelections(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxMultiChoiceDialog_GetSelections,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxmultichoicedialog.html#wxmultichoicedialogsetselections">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxmultichoicedialog.html#wxmultichoicedialogsetselections">external documentation</a>.
 -spec setSelections(This, Selections) -> ok when
 	This::wxMultiChoiceDialog(), Selections::[integer()].
 setSelections(#wx_ref{type=ThisT,ref=ThisRef},Selections)
diff --git a/lib/wx/src/gen/wxNavigationKeyEvent.erl b/lib/wx/src/gen/wxNavigationKeyEvent.erl
index 7559639fcd..314d2814ef 100644
--- a/lib/wx/src/gen/wxNavigationKeyEvent.erl
+++ b/lib/wx/src/gen/wxNavigationKeyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html">wxNavigationKeyEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html">wxNavigationKeyEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>navigation_key</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxNavigationKey(). #wxNavigationKey{}} event record type.
@@ -44,7 +44,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxNavigationKeyEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventgetdirection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventgetdirection">external documentation</a>.
 -spec getDirection(This) -> boolean() when
 	This::wxNavigationKeyEvent().
 getDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -52,7 +52,7 @@ getDirection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNavigationKeyEvent_GetDirection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetdirection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetdirection">external documentation</a>.
 -spec setDirection(This, BForward) -> ok when
 	This::wxNavigationKeyEvent(), BForward::boolean().
 setDirection(#wx_ref{type=ThisT,ref=ThisRef},BForward)
@@ -61,7 +61,7 @@ setDirection(#wx_ref{type=ThisT,ref=ThisRef},BForward)
   wxe_util:cast(?wxNavigationKeyEvent_SetDirection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BForward)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventiswindowchange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventiswindowchange">external documentation</a>.
 -spec isWindowChange(This) -> boolean() when
 	This::wxNavigationKeyEvent().
 isWindowChange(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -69,7 +69,7 @@ isWindowChange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNavigationKeyEvent_IsWindowChange,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetwindowchange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetwindowchange">external documentation</a>.
 -spec setWindowChange(This, BIs) -> ok when
 	This::wxNavigationKeyEvent(), BIs::boolean().
 setWindowChange(#wx_ref{type=ThisT,ref=ThisRef},BIs)
@@ -78,7 +78,7 @@ setWindowChange(#wx_ref{type=ThisT,ref=ThisRef},BIs)
   wxe_util:cast(?wxNavigationKeyEvent_SetWindowChange,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BIs)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventisfromtab">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventisfromtab">external documentation</a>.
 -spec isFromTab(This) -> boolean() when
 	This::wxNavigationKeyEvent().
 isFromTab(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -86,7 +86,7 @@ isFromTab(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNavigationKeyEvent_IsFromTab,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetfromtab">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetfromtab">external documentation</a>.
 -spec setFromTab(This, BIs) -> ok when
 	This::wxNavigationKeyEvent(), BIs::boolean().
 setFromTab(#wx_ref{type=ThisT,ref=ThisRef},BIs)
@@ -95,7 +95,7 @@ setFromTab(#wx_ref{type=ThisT,ref=ThisRef},BIs)
   wxe_util:cast(?wxNavigationKeyEvent_SetFromTab,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BIs)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventgetcurrentfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventgetcurrentfocus">external documentation</a>.
 -spec getCurrentFocus(This) -> wxWindow:wxWindow() when
 	This::wxNavigationKeyEvent().
 getCurrentFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -103,7 +103,7 @@ getCurrentFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNavigationKeyEvent_GetCurrentFocus,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetcurrentfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnavigationkeyevent.html#wxnavigationkeyeventsetcurrentfocus">external documentation</a>.
 -spec setCurrentFocus(This, Win) -> ok when
 	This::wxNavigationKeyEvent(), Win::wxWindow:wxWindow().
 setCurrentFocus(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
diff --git a/lib/wx/src/gen/wxNotebook.erl b/lib/wx/src/gen/wxNotebook.erl
index 04ab62b047..036e13c3c7 100644
--- a/lib/wx/src/gen/wxNotebook.erl
+++ b/lib/wx/src/gen/wxNotebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html">wxNotebook</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html">wxNotebook</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -82,7 +82,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxNotebook() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookwxnotebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookwxnotebook">external documentation</a>.
 -spec new() -> wxNotebook().
 new() ->
   wxe_util:construct(?wxNotebook_new_0,
@@ -96,7 +96,7 @@ new(Parent,Winid)
  when is_record(Parent, wx_ref),is_integer(Winid) ->
   new(Parent,Winid, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookwxnotebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookwxnotebook">external documentation</a>.
 -spec new(Parent, Winid, [Option]) -> wxNotebook() when
 	Parent::wxWindow:wxWindow(), Winid::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -121,7 +121,7 @@ addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookaddpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookaddpage">external documentation</a>.
 -spec addPage(This, Page, Text, [Option]) -> boolean() when
 	This::wxNotebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -146,7 +146,7 @@ advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookadvanceselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookadvanceselection">external documentation</a>.
 -spec advanceSelection(This, [Option]) -> ok when
 	This::wxNotebook(),
 	Option :: {forward, boolean()}.
@@ -159,7 +159,7 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxNotebook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookassignimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookassignimagelist">external documentation</a>.
 -spec assignImageList(This, ImageList) -> ok when
 	This::wxNotebook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -176,7 +176,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxNotebook(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -194,7 +194,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxNotebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookdeleteallpages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookdeleteallpages">external documentation</a>.
 -spec deleteAllPages(This) -> boolean() when
 	This::wxNotebook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -202,7 +202,7 @@ deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookdeletepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookdeletepage">external documentation</a>.
 -spec deletePage(This, NPage) -> boolean() when
 	This::wxNotebook(), NPage::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
@@ -211,7 +211,7 @@ deletePage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
   wxe_util:call(?wxNotebook_DeletePage,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookremovepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookremovepage">external documentation</a>.
 -spec removePage(This, NPage) -> boolean() when
 	This::wxNotebook(), NPage::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
@@ -220,7 +220,7 @@ removePage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
   wxe_util:call(?wxNotebook_RemovePage,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetcurrentpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetcurrentpage">external documentation</a>.
 -spec getCurrentPage(This) -> wxWindow:wxWindow() when
 	This::wxNotebook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -228,7 +228,7 @@ getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetimagelist">external documentation</a>.
 -spec getImageList(This) -> wxImageList:wxImageList() when
 	This::wxNotebook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -236,7 +236,7 @@ getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetpage">external documentation</a>.
 -spec getPage(This, N) -> wxWindow:wxWindow() when
 	This::wxNotebook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -245,7 +245,7 @@ getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxNotebook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetpagecount">external documentation</a>.
 -spec getPageCount(This) -> integer() when
 	This::wxNotebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -253,7 +253,7 @@ getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetpageimage">external documentation</a>.
 -spec getPageImage(This, NPage) -> integer() when
 	This::wxNotebook(), NPage::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
@@ -262,7 +262,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage)
   wxe_util:call(?wxNotebook_GetPageImage,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetpagetext">external documentation</a>.
 -spec getPageText(This, NPage) -> unicode:charlist() when
 	This::wxNotebook(), NPage::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage)
@@ -271,7 +271,7 @@ getPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage)
   wxe_util:call(?wxNotebook_GetPageText,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetrowcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetrowcount">external documentation</a>.
 -spec getRowCount(This) -> integer() when
 	This::wxNotebook().
 getRowCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -279,7 +279,7 @@ getRowCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebook_GetRowCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxNotebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -287,7 +287,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookgetthemebackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookgetthemebackgroundcolour">external documentation</a>.
 -spec getThemeBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxNotebook().
 getThemeBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -295,7 +295,7 @@ getThemeBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebook_GetThemeBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookhittest">external documentation</a>.
 -spec hitTest(This, Pt) -> Result when
 	Result ::{Res ::integer(), Flags::integer()},
 	This::wxNotebook(), Pt::{X::integer(), Y::integer()}.
@@ -313,7 +313,7 @@ insertPage(This,Position,Win,StrText)
  when is_record(This, wx_ref),is_integer(Position),is_record(Win, wx_ref),is_list(StrText) ->
   insertPage(This,Position,Win,StrText, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookinsertpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookinsertpage">external documentation</a>.
 -spec insertPage(This, Position, Win, StrText, [Option]) -> boolean() when
 	This::wxNotebook(), Position::integer(), Win::wxWindow:wxWindow(), StrText::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -330,7 +330,7 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=WinT,ref=WinRef
   wxe_util:call(?wxNotebook_InsertPage,
   <<ThisRef:32/?UI,Position:32/?UI,WinRef:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((0+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebooksetimagelist">external documentation</a>.
 -spec setImageList(This, ImageList) -> ok when
 	This::wxNotebook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -339,7 +339,7 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxNotebook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpadding">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebooksetpadding">external documentation</a>.
 -spec setPadding(This, Padding) -> ok when
 	This::wxNotebook(), Padding::{W::integer(), H::integer()}.
 setPadding(#wx_ref{type=ThisT,ref=ThisRef},{PaddingW,PaddingH})
@@ -348,7 +348,7 @@ setPadding(#wx_ref{type=ThisT,ref=ThisRef},{PaddingW,PaddingH})
   wxe_util:cast(?wxNotebook_SetPadding,
   <<ThisRef:32/?UI,PaddingW:32/?UI,PaddingH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebooksetpagesize">external documentation</a>.
 -spec setPageSize(This, Size) -> ok when
 	This::wxNotebook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -357,7 +357,7 @@ setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxNotebook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebooksetpageimage">external documentation</a>.
 -spec setPageImage(This, NPage, NImage) -> boolean() when
 	This::wxNotebook(), NPage::integer(), NImage::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage,NImage)
@@ -366,7 +366,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},NPage,NImage)
   wxe_util:call(?wxNotebook_SetPageImage,
   <<ThisRef:32/?UI,NPage:32/?UI,NImage:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebooksetpagetext">external documentation</a>.
 -spec setPageText(This, NPage, StrText) -> boolean() when
 	This::wxNotebook(), NPage::integer(), StrText::unicode:chardata().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage,StrText)
@@ -376,7 +376,7 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},NPage,StrText)
   wxe_util:call(?wxNotebook_SetPageText,
   <<ThisRef:32/?UI,NPage:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebooksetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebooksetselection">external documentation</a>.
 -spec setSelection(This, NPage) -> integer() when
 	This::wxNotebook(), NPage::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},NPage)
@@ -385,7 +385,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},NPage)
   wxe_util:call(?wxNotebook_SetSelection,
   <<ThisRef:32/?UI,NPage:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebook.html#wxnotebookchangeselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebook.html#wxnotebookchangeselection">external documentation</a>.
 -spec changeSelection(This, NPage) -> integer() when
 	This::wxNotebook(), NPage::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},NPage)
diff --git a/lib/wx/src/gen/wxNotebookEvent.erl b/lib/wx/src/gen/wxNotebookEvent.erl
index 72c0bb9cf4..d7fbf7b4a4 100644
--- a/lib/wx/src/gen/wxNotebookEvent.erl
+++ b/lib/wx/src/gen/wxNotebookEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html">wxNotebookEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebookevent.html">wxNotebookEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_notebook_page_changed</em>, <em>command_notebook_page_changing</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxNotebook(). #wxNotebook{}} event record type.
@@ -49,7 +49,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxNotebookEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventgetoldselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebookevent.html#wxnotebookeventgetoldselection">external documentation</a>.
 -spec getOldSelection(This) -> integer() when
 	This::wxNotebookEvent().
 getOldSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -57,7 +57,7 @@ getOldSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebookEvent_GetOldSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebookevent.html#wxnotebookeventgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxNotebookEvent().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -65,7 +65,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotebookEvent_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventsetoldselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebookevent.html#wxnotebookeventsetoldselection">external documentation</a>.
 -spec setOldSelection(This, NOldSel) -> ok when
 	This::wxNotebookEvent(), NOldSel::integer().
 setOldSelection(#wx_ref{type=ThisT,ref=ThisRef},NOldSel)
@@ -74,7 +74,7 @@ setOldSelection(#wx_ref{type=ThisT,ref=ThisRef},NOldSel)
   wxe_util:cast(?wxNotebookEvent_SetOldSelection,
   <<ThisRef:32/?UI,NOldSel:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotebookevent.html#wxnotebookeventsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotebookevent.html#wxnotebookeventsetselection">external documentation</a>.
 -spec setSelection(This, NSel) -> ok when
 	This::wxNotebookEvent(), NSel::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},NSel)
diff --git a/lib/wx/src/gen/wxNotifyEvent.erl b/lib/wx/src/gen/wxNotifyEvent.erl
index 7ba23469be..b78f2ed348 100644
--- a/lib/wx/src/gen/wxNotifyEvent.erl
+++ b/lib/wx/src/gen/wxNotifyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotifyevent.html">wxNotifyEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotifyevent.html">wxNotifyEvent</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxCommandEvent}
 %% <br />{@link wxEvent}
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxNotifyEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotifyevent.html#wxnotifyeventallow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotifyevent.html#wxnotifyeventallow">external documentation</a>.
 -spec allow(This) -> ok when
 	This::wxNotifyEvent().
 allow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -51,7 +51,7 @@ allow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxNotifyEvent_Allow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotifyevent.html#wxnotifyeventisallowed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotifyevent.html#wxnotifyeventisallowed">external documentation</a>.
 -spec isAllowed(This) -> boolean() when
 	This::wxNotifyEvent().
 isAllowed(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ isAllowed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxNotifyEvent_IsAllowed,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxnotifyevent.html#wxnotifyeventveto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxnotifyevent.html#wxnotifyeventveto">external documentation</a>.
 -spec veto(This) -> ok when
 	This::wxNotifyEvent().
 veto(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxPageSetupDialog.erl b/lib/wx/src/gen/wxPageSetupDialog.erl
index 653ba5f015..6b190eac28 100644
--- a/lib/wx/src/gen/wxPageSetupDialog.erl
+++ b/lib/wx/src/gen/wxPageSetupDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialog.html">wxPageSetupDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialog.html">wxPageSetupDialog</a>.
 %% @type wxPageSetupDialog().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -42,7 +42,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialog.html#wxpagesetupdialogwxpagesetupdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialog.html#wxpagesetupdialogwxpagesetupdialog">external documentation</a>.
 -spec new(Parent, [Option]) -> wxPageSetupDialog() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {data, wxPageSetupDialogData:wxPageSetupDialogData()}.
@@ -55,7 +55,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxPageSetupDialog_new,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialog.html#wxpagesetupdialoggetpagesetupdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialog.html#wxpagesetupdialoggetpagesetupdata">external documentation</a>.
 -spec getPageSetupData(This) -> wxPageSetupDialogData:wxPageSetupDialogData() when
 	This::wxPageSetupDialog().
 getPageSetupData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -63,7 +63,7 @@ getPageSetupData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialog_GetPageSetupData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialog.html#wxpagesetupdialogshowmodal">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialog.html#wxpagesetupdialogshowmodal">external documentation</a>.
 -spec showModal(This) -> integer() when
 	This::wxPageSetupDialog().
 showModal(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxPageSetupDialogData.erl b/lib/wx/src/gen/wxPageSetupDialogData.erl
index 4850e62925..de8e36ccae 100644
--- a/lib/wx/src/gen/wxPageSetupDialogData.erl
+++ b/lib/wx/src/gen/wxPageSetupDialogData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html">wxPageSetupDialogData</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html">wxPageSetupDialogData</a>.
 %% @type wxPageSetupDialogData().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -41,13 +41,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPageSetupDialogData() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatawxpagesetupdialogdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatawxpagesetupdialogdata">external documentation</a>.
 -spec new() -> wxPageSetupDialogData().
 new() ->
   wxe_util:construct(?wxPageSetupDialogData_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatawxpagesetupdialogdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatawxpagesetupdialogdata">external documentation</a>.
 -spec new(PrintData) -> wxPageSetupDialogData() when
 	PrintData::wxPrintData:wxPrintData() | wxPageSetupDialogData().
 new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
@@ -60,7 +60,7 @@ new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   wxe_util:construct(PrintDataOP,
   <<PrintDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablehelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablehelp">external documentation</a>.
 -spec enableHelp(This, Flag) -> ok when
 	This::wxPageSetupDialogData(), Flag::boolean().
 enableHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -69,7 +69,7 @@ enableHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPageSetupDialogData_EnableHelp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablemargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablemargins">external documentation</a>.
 -spec enableMargins(This, Flag) -> ok when
 	This::wxPageSetupDialogData(), Flag::boolean().
 enableMargins(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -78,7 +78,7 @@ enableMargins(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPageSetupDialogData_EnableMargins,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenableorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenableorientation">external documentation</a>.
 -spec enableOrientation(This, Flag) -> ok when
 	This::wxPageSetupDialogData(), Flag::boolean().
 enableOrientation(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -87,7 +87,7 @@ enableOrientation(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPageSetupDialogData_EnableOrientation,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablepaper">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenablepaper">external documentation</a>.
 -spec enablePaper(This, Flag) -> ok when
 	This::wxPageSetupDialogData(), Flag::boolean().
 enablePaper(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -96,7 +96,7 @@ enablePaper(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPageSetupDialogData_EnablePaper,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenableprinter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataenableprinter">external documentation</a>.
 -spec enablePrinter(This, Flag) -> ok when
 	This::wxPageSetupDialogData(), Flag::boolean().
 enablePrinter(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -105,7 +105,7 @@ enablePrinter(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPageSetupDialogData_EnablePrinter,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetdefaultminmargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetdefaultminmargins">external documentation</a>.
 -spec getDefaultMinMargins(This) -> boolean() when
 	This::wxPageSetupDialogData().
 getDefaultMinMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -113,7 +113,7 @@ getDefaultMinMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetDefaultMinMargins,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablemargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablemargins">external documentation</a>.
 -spec getEnableMargins(This) -> boolean() when
 	This::wxPageSetupDialogData().
 getEnableMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -121,7 +121,7 @@ getEnableMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetEnableMargins,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenableorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenableorientation">external documentation</a>.
 -spec getEnableOrientation(This) -> boolean() when
 	This::wxPageSetupDialogData().
 getEnableOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -129,7 +129,7 @@ getEnableOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetEnableOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablepaper">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablepaper">external documentation</a>.
 -spec getEnablePaper(This) -> boolean() when
 	This::wxPageSetupDialogData().
 getEnablePaper(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -137,7 +137,7 @@ getEnablePaper(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetEnablePaper,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenableprinter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenableprinter">external documentation</a>.
 -spec getEnablePrinter(This) -> boolean() when
 	This::wxPageSetupDialogData().
 getEnablePrinter(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -145,7 +145,7 @@ getEnablePrinter(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetEnablePrinter,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablehelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetenablehelp">external documentation</a>.
 -spec getEnableHelp(This) -> boolean() when
 	This::wxPageSetupDialogData().
 getEnableHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -153,7 +153,7 @@ getEnableHelp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetEnableHelp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetdefaultinfo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetdefaultinfo">external documentation</a>.
 -spec getDefaultInfo(This) -> boolean() when
 	This::wxPageSetupDialogData().
 getDefaultInfo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -161,7 +161,7 @@ getDefaultInfo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetDefaultInfo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetmargintopleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetmargintopleft">external documentation</a>.
 -spec getMarginTopLeft(This) -> {X::integer(), Y::integer()} when
 	This::wxPageSetupDialogData().
 getMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ getMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetMarginTopLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetmarginbottomright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetmarginbottomright">external documentation</a>.
 -spec getMarginBottomRight(This) -> {X::integer(), Y::integer()} when
 	This::wxPageSetupDialogData().
 getMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -177,7 +177,7 @@ getMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetMarginBottomRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetminmargintopleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetminmargintopleft">external documentation</a>.
 -spec getMinMarginTopLeft(This) -> {X::integer(), Y::integer()} when
 	This::wxPageSetupDialogData().
 getMinMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -185,7 +185,7 @@ getMinMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetMinMarginTopLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetminmarginbottomright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetminmarginbottomright">external documentation</a>.
 -spec getMinMarginBottomRight(This) -> {X::integer(), Y::integer()} when
 	This::wxPageSetupDialogData().
 getMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -193,7 +193,7 @@ getMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetMinMarginBottomRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpaperid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpaperid">external documentation</a>.
 %%<br /> Res = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec getPaperId(This) -> wx:wx_enum() when
 	This::wxPageSetupDialogData().
@@ -202,7 +202,7 @@ getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetPaperId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpapersize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetpapersize">external documentation</a>.
 -spec getPaperSize(This) -> {W::integer(), H::integer()} when
 	This::wxPageSetupDialogData().
 getPaperSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -210,7 +210,7 @@ getPaperSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetPaperSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetprintdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatagetprintdata">external documentation</a>.
 -spec getPrintData(This) -> wxPrintData:wxPrintData() when
 	This::wxPageSetupDialogData().
 getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -218,7 +218,7 @@ getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_GetPrintData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdataisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxPageSetupDialogData().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -226,7 +226,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPageSetupDialogData_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetdefaultinfo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetdefaultinfo">external documentation</a>.
 -spec setDefaultInfo(This, Flag) -> ok when
 	This::wxPageSetupDialogData(), Flag::boolean().
 setDefaultInfo(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -235,7 +235,7 @@ setDefaultInfo(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPageSetupDialogData_SetDefaultInfo,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetdefaultminmargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetdefaultminmargins">external documentation</a>.
 -spec setDefaultMinMargins(This, Flag) -> ok when
 	This::wxPageSetupDialogData(), Flag::boolean().
 setDefaultMinMargins(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -244,7 +244,7 @@ setDefaultMinMargins(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPageSetupDialogData_SetDefaultMinMargins,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetmargintopleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetmargintopleft">external documentation</a>.
 -spec setMarginTopLeft(This, Pt) -> ok when
 	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -253,7 +253,7 @@ setMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxPageSetupDialogData_SetMarginTopLeft,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetmarginbottomright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetmarginbottomright">external documentation</a>.
 -spec setMarginBottomRight(This, Pt) -> ok when
 	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -262,7 +262,7 @@ setMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxPageSetupDialogData_SetMarginBottomRight,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetminmargintopleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetminmargintopleft">external documentation</a>.
 -spec setMinMarginTopLeft(This, Pt) -> ok when
 	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMinMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -271,7 +271,7 @@ setMinMarginTopLeft(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxPageSetupDialogData_SetMinMarginTopLeft,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetminmarginbottomright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetminmarginbottomright">external documentation</a>.
 -spec setMinMarginBottomRight(This, Pt) -> ok when
 	This::wxPageSetupDialogData(), Pt::{X::integer(), Y::integer()}.
 setMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -280,7 +280,7 @@ setMinMarginBottomRight(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:cast(?wxPageSetupDialogData_SetMinMarginBottomRight,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpaperid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpaperid">external documentation</a>.
 %%<br /> Id = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperId(This, Id) -> ok when
 	This::wxPageSetupDialogData(), Id::wx:wx_enum().
@@ -290,7 +290,7 @@ setPaperId(#wx_ref{type=ThisT,ref=ThisRef},Id)
   wxe_util:cast(?wxPageSetupDialogData_SetPaperId,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpapersize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetpapersize">external documentation</a>.
 %% <br /> Also:<br />
 %% setPaperSize(This, Sz) -> ok when<br />
 %% 	This::wxPageSetupDialogData(), Sz::{W::integer(), H::integer()}.<br />
@@ -311,7 +311,7 @@ setPaperSize(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
   wxe_util:cast(?wxPageSetupDialogData_SetPaperSize_1_1,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetprintdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpagesetupdialogdata.html#wxpagesetupdialogdatasetprintdata">external documentation</a>.
 -spec setPrintData(This, PrintData) -> ok when
 	This::wxPageSetupDialogData(), PrintData::wxPrintData:wxPrintData().
 setPrintData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
diff --git a/lib/wx/src/gen/wxPaintDC.erl b/lib/wx/src/gen/wxPaintDC.erl
index 6648f278bb..0ff27a8c7a 100644
--- a/lib/wx/src/gen/wxPaintDC.erl
+++ b/lib/wx/src/gen/wxPaintDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintdc.html">wxPaintDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpaintdc.html">wxPaintDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindowDC}
 %% <br />{@link wxDC}
@@ -56,19 +56,21 @@
 -export_type([wxPaintDC/0]).
 -deprecated([new/0]).
 
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxWindowDC) -> true;
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPaintDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintdc.html#wxpaintdcwxpaintdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpaintdc.html#wxpaintdcwxpaintdc">external documentation</a>.
 -spec new() -> wxPaintDC().
 new() ->
   wxe_util:construct(?wxPaintDC_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintdc.html#wxpaintdcwxpaintdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpaintdc.html#wxpaintdcwxpaintdc">external documentation</a>.
 -spec new(Win) -> wxPaintDC() when
 	Win::wxWindow:wxWindow().
 new(#wx_ref{type=WinT,ref=WinRef}) ->
diff --git a/lib/wx/src/gen/wxPaintEvent.erl b/lib/wx/src/gen/wxPaintEvent.erl
index 80ac7d78ce..951756f76e 100644
--- a/lib/wx/src/gen/wxPaintEvent.erl
+++ b/lib/wx/src/gen/wxPaintEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpaintevent.html">wxPaintEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpaintevent.html">wxPaintEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>paint</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxPaint(). #wxPaint{}} event record type.
diff --git a/lib/wx/src/gen/wxPalette.erl b/lib/wx/src/gen/wxPalette.erl
index 991f706acb..753aa04dd9 100644
--- a/lib/wx/src/gen/wxPalette.erl
+++ b/lib/wx/src/gen/wxPalette.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html">wxPalette</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html">wxPalette</a>.
 %% @type wxPalette().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -35,13 +35,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPalette() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettewxpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html#wxpalettewxpalette">external documentation</a>.
 -spec new() -> wxPalette().
 new() ->
   wxe_util:construct(?wxPalette_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettewxpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html#wxpalettewxpalette">external documentation</a>.
 -spec new(Red, Green, Blue) -> wxPalette() when
 	Red::binary(), Green::binary(), Blue::binary().
 new(Red,Green,Blue)
@@ -52,7 +52,7 @@ new(Red,Green,Blue)
   wxe_util:construct(?wxPalette_new_4,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html#wxpalettecreate">external documentation</a>.
 -spec create(This, Red, Green, Blue) -> boolean() when
 	This::wxPalette(), Red::binary(), Green::binary(), Blue::binary().
 create(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
@@ -64,7 +64,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
   wxe_util:call(?wxPalette_Create,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettegetcolourscount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html#wxpalettegetcolourscount">external documentation</a>.
 -spec getColoursCount(This) -> integer() when
 	This::wxPalette().
 getColoursCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -72,7 +72,7 @@ getColoursCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPalette_GetColoursCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettegetpixel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html#wxpalettegetpixel">external documentation</a>.
 -spec getPixel(This, Red, Green, Blue) -> integer() when
 	This::wxPalette(), Red::integer(), Green::integer(), Blue::integer().
 getPixel(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
@@ -81,7 +81,7 @@ getPixel(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
   wxe_util:call(?wxPalette_GetPixel,
   <<ThisRef:32/?UI,Red:32/?UI,Green:32/?UI,Blue:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpalettegetrgb">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html#wxpalettegetrgb">external documentation</a>.
 -spec getRGB(This, Pixel) -> Result when
 	Result ::{Res ::boolean(), Red::integer(), Green::integer(), Blue::integer()},
 	This::wxPalette(), Pixel::integer().
@@ -91,7 +91,7 @@ getRGB(#wx_ref{type=ThisT,ref=ThisRef},Pixel)
   wxe_util:call(?wxPalette_GetRGB,
   <<ThisRef:32/?UI,Pixel:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalette.html#wxpaletteisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalette.html#wxpaletteisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxPalette().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxPaletteChangedEvent.erl b/lib/wx/src/gen/wxPaletteChangedEvent.erl
index aa9ae68ec2..16013536aa 100644
--- a/lib/wx/src/gen/wxPaletteChangedEvent.erl
+++ b/lib/wx/src/gen/wxPaletteChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalettechangedevent.html">wxPaletteChangedEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalettechangedevent.html">wxPaletteChangedEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>palette_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxPaletteChanged(). #wxPaletteChanged{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPaletteChangedEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalettechangedevent.html#wxpalettechangedeventsetchangedwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalettechangedevent.html#wxpalettechangedeventsetchangedwindow">external documentation</a>.
 -spec setChangedWindow(This, Win) -> ok when
 	This::wxPaletteChangedEvent(), Win::wxWindow:wxWindow().
 setChangedWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
@@ -52,7 +52,7 @@ setChangedWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef})
   wxe_util:cast(?wxPaletteChangedEvent_SetChangedWindow,
   <<ThisRef:32/?UI,WinRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpalettechangedevent.html#wxpalettechangedeventgetchangedwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpalettechangedevent.html#wxpalettechangedeventgetchangedwindow">external documentation</a>.
 -spec getChangedWindow(This) -> wxWindow:wxWindow() when
 	This::wxPaletteChangedEvent().
 getChangedWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxPanel.erl b/lib/wx/src/gen/wxPanel.erl
index 88c1b119a8..eeadbee2f8 100644
--- a/lib/wx/src/gen/wxPanel.erl
+++ b/lib/wx/src/gen/wxPanel.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html">wxPanel</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpanel.html">wxPanel</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -28,7 +28,7 @@
 
 -module(wxPanel).
 -include("wxe.hrl").
--export([destroy/1,initDialog/1,new/0,new/1,new/2,new/5,new/6]).
+-export([destroy/1,initDialog/1,new/0,new/1,new/2,new/5,new/6,setFocusIgnoringChildren/1]).
 
 %% inherited exports
 -export([cacheBestSize/2,captureMouse/1,center/1,center/2,centerOnParent/1,
@@ -75,7 +75,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPanel() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
 -spec new() -> wxPanel().
 new() ->
   wxe_util:construct(?wxPanel_new_0,
@@ -89,7 +89,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
 -spec new(Parent, [Option]) -> wxPanel() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {winid, integer()}
@@ -116,7 +116,7 @@ new(Parent,X,Y,Width,Height)
  when is_record(Parent, wx_ref),is_integer(X),is_integer(Y),is_integer(Width),is_integer(Height) ->
   new(Parent,X,Y,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpanel.html#wxpanelwxpanel">external documentation</a>.
 -spec new(Parent, X, Y, Width, Height, [Option]) -> wxPanel() when
 	Parent::wxWindow:wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer(),
 	Option :: {style, integer()}.
@@ -129,7 +129,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},X,Y,Width,Height, Options)
   wxe_util:construct(?wxPanel_new_6,
   <<ParentRef:32/?UI,X:32/?UI,Y:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpanel.html#wxpanelinitdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpanel.html#wxpanelinitdialog">external documentation</a>.
 -spec initDialog(This) -> ok when
 	This::wxPanel().
 initDialog(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -137,6 +137,14 @@ initDialog(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPanel_InitDialog,
   <<ThisRef:32/?UI>>).
 
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpanel.html#wxpanelsetfocusignoringchildren">external documentation</a>.
+-spec setFocusIgnoringChildren(This) -> ok when
+	This::wxPanel().
+setFocusIgnoringChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
+  ?CLASS(ThisT,wxPanel),
+  wxe_util:cast(?wxPanel_SetFocusIgnoringChildren,
+  <<ThisRef:32/?UI>>).
+
 %% @doc Destroys this object, do not use object again
 -spec destroy(This::wxPanel()) -> ok.
 destroy(Obj=#wx_ref{type=Type}) ->
diff --git a/lib/wx/src/gen/wxPasswordEntryDialog.erl b/lib/wx/src/gen/wxPasswordEntryDialog.erl
index d5a9f6150a..67c9b10e8b 100644
--- a/lib/wx/src/gen/wxPasswordEntryDialog.erl
+++ b/lib/wx/src/gen/wxPasswordEntryDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpasswordentrydialog.html">wxPasswordEntryDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpasswordentrydialog.html">wxPasswordEntryDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxTextEntryDialog}
 %% <br />{@link wxDialog}
@@ -97,7 +97,7 @@ new(Parent,Message)
  when is_record(Parent, wx_ref),is_list(Message) ->
   new(Parent,Message, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpasswordentrydialog.html#wxpasswordentrydialogwxpasswordentrydialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpasswordentrydialog.html#wxpasswordentrydialogwxpasswordentrydialog">external documentation</a>.
 -spec new(Parent, Message, [Option]) -> wxPasswordEntryDialog() when
 	Parent::wxWindow:wxWindow(), Message::unicode:chardata(),
 	Option :: {caption, unicode:chardata()}
diff --git a/lib/wx/src/gen/wxPen.erl b/lib/wx/src/gen/wxPen.erl
index 681a7edebc..f19106c630 100644
--- a/lib/wx/src/gen/wxPen.erl
+++ b/lib/wx/src/gen/wxPen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html">wxPen</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html">wxPen</a>.
 %% @type wxPen().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -36,7 +36,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPen() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpenwxpen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpenwxpen">external documentation</a>.
 -spec new() -> wxPen().
 new() ->
   wxe_util:construct(?wxPen_new_0,
@@ -50,7 +50,7 @@ new(Colour)
  when tuple_size(Colour) =:= 3; tuple_size(Colour) =:= 4 ->
   new(Colour, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpenwxpen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpenwxpen">external documentation</a>.
 -spec new(Colour, [Option]) -> wxPen() when
 	Colour::wx:wx_colour(),
 	Option :: {width, integer()}
@@ -64,7 +64,7 @@ new(Colour, Options)
   wxe_util:construct(?wxPen_new_2,
   <<(wxe_util:colour_bin(Colour)):16/binary, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetcap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpengetcap">external documentation</a>.
 -spec getCap(This) -> integer() when
 	This::wxPen().
 getCap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -72,7 +72,7 @@ getCap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPen_GetCap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpengetcolour">external documentation</a>.
 -spec getColour(This) -> wx:wx_colour4() when
 	This::wxPen().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -80,7 +80,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPen_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetjoin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpengetjoin">external documentation</a>.
 -spec getJoin(This) -> integer() when
 	This::wxPen().
 getJoin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -88,7 +88,7 @@ getJoin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPen_GetJoin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpengetstyle">external documentation</a>.
 -spec getStyle(This) -> integer() when
 	This::wxPen().
 getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -96,7 +96,7 @@ getStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPen_GetStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpengetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpengetwidth">external documentation</a>.
 -spec getWidth(This) -> integer() when
 	This::wxPen().
 getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -104,7 +104,7 @@ getWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPen_GetWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpenisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpenisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxPen().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -112,7 +112,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPen_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpensetcap">external documentation</a>.
 %%<br /> CapStyle = integer
 -spec setCap(This, CapStyle) -> ok when
 	This::wxPen(), CapStyle::wx:wx_enum().
@@ -122,7 +122,7 @@ setCap(#wx_ref{type=ThisT,ref=ThisRef},CapStyle)
   wxe_util:cast(?wxPen_SetCap,
   <<ThisRef:32/?UI,CapStyle:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpensetcolour">external documentation</a>.
 -spec setColour(This, Colour) -> ok when
 	This::wxPen(), Colour::wx:wx_colour().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -131,7 +131,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxPen_SetColour_1,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpensetcolour">external documentation</a>.
 -spec setColour(This, Red, Green, Blue) -> ok when
 	This::wxPen(), Red::integer(), Green::integer(), Blue::integer().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
@@ -140,7 +140,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Red,Green,Blue)
   wxe_util:cast(?wxPen_SetColour_3,
   <<ThisRef:32/?UI,Red:32/?UI,Green:32/?UI,Blue:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetjoin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpensetjoin">external documentation</a>.
 %%<br /> JoinStyle = integer
 -spec setJoin(This, JoinStyle) -> ok when
 	This::wxPen(), JoinStyle::wx:wx_enum().
@@ -150,7 +150,7 @@ setJoin(#wx_ref{type=ThisT,ref=ThisRef},JoinStyle)
   wxe_util:cast(?wxPen_SetJoin,
   <<ThisRef:32/?UI,JoinStyle:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpensetstyle">external documentation</a>.
 -spec setStyle(This, Style) -> ok when
 	This::wxPen(), Style::integer().
 setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
@@ -159,7 +159,7 @@ setStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
   wxe_util:cast(?wxPen_SetStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpen.html#wxpensetwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpen.html#wxpensetwidth">external documentation</a>.
 -spec setWidth(This, Width) -> ok when
 	This::wxPen(), Width::integer().
 setWidth(#wx_ref{type=ThisT,ref=ThisRef},Width)
diff --git a/lib/wx/src/gen/wxPickerBase.erl b/lib/wx/src/gen/wxPickerBase.erl
index 2253127d84..bdd488d65a 100644
--- a/lib/wx/src/gen/wxPickerBase.erl
+++ b/lib/wx/src/gen/wxPickerBase.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html">wxPickerBase</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html">wxPickerBase</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -80,7 +80,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPickerBase() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesetinternalmargin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasesetinternalmargin">external documentation</a>.
 -spec setInternalMargin(This, Newmargin) -> ok when
 	This::wxPickerBase(), Newmargin::integer().
 setInternalMargin(#wx_ref{type=ThisT,ref=ThisRef},Newmargin)
@@ -89,7 +89,7 @@ setInternalMargin(#wx_ref{type=ThisT,ref=ThisRef},Newmargin)
   wxe_util:cast(?wxPickerBase_SetInternalMargin,
   <<ThisRef:32/?UI,Newmargin:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegetinternalmargin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasegetinternalmargin">external documentation</a>.
 -spec getInternalMargin(This) -> integer() when
 	This::wxPickerBase().
 getInternalMargin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -97,7 +97,7 @@ getInternalMargin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPickerBase_GetInternalMargin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesettextctrlproportion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasesettextctrlproportion">external documentation</a>.
 -spec setTextCtrlProportion(This, Prop) -> ok when
 	This::wxPickerBase(), Prop::integer().
 setTextCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef},Prop)
@@ -106,7 +106,7 @@ setTextCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef},Prop)
   wxe_util:cast(?wxPickerBase_SetTextCtrlProportion,
   <<ThisRef:32/?UI,Prop:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesetpickerctrlproportion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasesetpickerctrlproportion">external documentation</a>.
 -spec setPickerCtrlProportion(This, Prop) -> ok when
 	This::wxPickerBase(), Prop::integer().
 setPickerCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef},Prop)
@@ -115,7 +115,7 @@ setPickerCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef},Prop)
   wxe_util:cast(?wxPickerBase_SetPickerCtrlProportion,
   <<ThisRef:32/?UI,Prop:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegettextctrlproportion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasegettextctrlproportion">external documentation</a>.
 -spec getTextCtrlProportion(This) -> integer() when
 	This::wxPickerBase().
 getTextCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -123,7 +123,7 @@ getTextCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPickerBase_GetTextCtrlProportion,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegetpickerctrlproportion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasegetpickerctrlproportion">external documentation</a>.
 -spec getPickerCtrlProportion(This) -> integer() when
 	This::wxPickerBase().
 getPickerCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -131,7 +131,7 @@ getPickerCtrlProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPickerBase_GetPickerCtrlProportion,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasehastextctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasehastextctrl">external documentation</a>.
 -spec hasTextCtrl(This) -> boolean() when
 	This::wxPickerBase().
 hasTextCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -139,7 +139,7 @@ hasTextCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPickerBase_HasTextCtrl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasegettextctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasegettextctrl">external documentation</a>.
 -spec getTextCtrl(This) -> wxTextCtrl:wxTextCtrl() when
 	This::wxPickerBase().
 getTextCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -147,7 +147,7 @@ getTextCtrl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPickerBase_GetTextCtrl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbaseistextctrlgrowable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbaseistextctrlgrowable">external documentation</a>.
 -spec isTextCtrlGrowable(This) -> boolean() when
 	This::wxPickerBase().
 isTextCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -163,7 +163,7 @@ setPickerCtrlGrowable(This)
  when is_record(This, wx_ref) ->
   setPickerCtrlGrowable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesetpickerctrlgrowable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasesetpickerctrlgrowable">external documentation</a>.
 -spec setPickerCtrlGrowable(This, [Option]) -> ok when
 	This::wxPickerBase(),
 	Option :: {grow, boolean()}.
@@ -184,7 +184,7 @@ setTextCtrlGrowable(This)
  when is_record(This, wx_ref) ->
   setTextCtrlGrowable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbasesettextctrlgrowable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbasesettextctrlgrowable">external documentation</a>.
 -spec setTextCtrlGrowable(This, [Option]) -> ok when
 	This::wxPickerBase(),
 	Option :: {grow, boolean()}.
@@ -197,7 +197,7 @@ setTextCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxPickerBase_SetTextCtrlGrowable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpickerbase.html#wxpickerbaseispickerctrlgrowable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpickerbase.html#wxpickerbaseispickerctrlgrowable">external documentation</a>.
 -spec isPickerCtrlGrowable(This) -> boolean() when
 	This::wxPickerBase().
 isPickerCtrlGrowable(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxPostScriptDC.erl b/lib/wx/src/gen/wxPostScriptDC.erl
index 5329d4562e..e7e498efa1 100644
--- a/lib/wx/src/gen/wxPostScriptDC.erl
+++ b/lib/wx/src/gen/wxPostScriptDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html">wxPostScriptDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpostscriptdc.html">wxPostScriptDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDC}
 %% </p>
@@ -55,18 +55,20 @@
 -export_type([wxPostScriptDC/0]).
 -deprecated([getResolution/0,setResolution/1]).
 
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPostScriptDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcwxpostscriptdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpostscriptdc.html#wxpostscriptdcwxpostscriptdc">external documentation</a>.
 -spec new() -> wxPostScriptDC().
 new() ->
   wxe_util:construct(?wxPostScriptDC_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcwxpostscriptdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpostscriptdc.html#wxpostscriptdcwxpostscriptdc">external documentation</a>.
 -spec new(PrintData) -> wxPostScriptDC() when
 	PrintData::wxPrintData:wxPrintData().
 new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
@@ -74,7 +76,7 @@ new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   wxe_util:construct(?wxPostScriptDC_new_1,
   <<PrintDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcsetresolution">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpostscriptdc.html#wxpostscriptdcsetresolution">external documentation</a>.
 -spec setResolution(Ppi) -> ok when
 	Ppi::integer().
 setResolution(Ppi)
@@ -82,7 +84,7 @@ setResolution(Ppi)
   wxe_util:cast(?wxPostScriptDC_SetResolution,
   <<Ppi:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpostscriptdc.html#wxpostscriptdcgetresolution">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpostscriptdc.html#wxpostscriptdcgetresolution">external documentation</a>.
 -spec getResolution() -> integer().
 getResolution() ->
   wxe_util:call(?wxPostScriptDC_GetResolution,
diff --git a/lib/wx/src/gen/wxPreviewCanvas.erl b/lib/wx/src/gen/wxPreviewCanvas.erl
index cc9f43e5e4..33ec12c371 100644
--- a/lib/wx/src/gen/wxPreviewCanvas.erl
+++ b/lib/wx/src/gen/wxPreviewCanvas.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcanvas.html">wxPreviewCanvas</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewcanvas.html">wxPreviewCanvas</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxScrolledWindow}
 %% <br />{@link wxPanel}
@@ -61,13 +61,13 @@
   scrollWindow/3,scrollWindow/4,setAcceleratorTable/2,setAutoLayout/2,
   setBackgroundColour/2,setBackgroundStyle/2,setCaret/2,setClientSize/2,
   setClientSize/3,setContainingSizer/2,setCursor/2,setDropTarget/2,
-  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,setForegroundColour/2,
-  setHelpText/2,setId/2,setLabel/2,setMaxSize/2,setMinSize/2,setName/2,
-  setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,setPalette/2,
-  setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,setScrollbar/6,
-  setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,setSize/5,setSize/6,
-  setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,setSizer/3,
-  setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
+  setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
+  setPalette/2,setScrollPos/3,setScrollPos/4,setScrollRate/3,setScrollbar/5,
+  setScrollbar/6,setScrollbars/5,setScrollbars/6,setSize/2,setSize/3,
+  setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,setSizeHints/4,setSizer/2,
+  setSizer/3,setSizerAndFit/2,setSizerAndFit/3,setTargetWindow/2,setThemeEnabled/2,
   setToolTip/2,setVirtualSize/2,setVirtualSize/3,setVirtualSizeHints/2,
   setVirtualSizeHints/3,setVirtualSizeHints/4,setWindowStyle/2,setWindowStyleFlag/2,
   setWindowVariant/2,shouldInheritColours/1,show/1,show/2,thaw/1,transferDataFromWindow/1,
@@ -114,6 +114,8 @@ calcScrolledPosition(This,X,Y) -> wxScrolledWindow:calcScrolledPosition(This,X,Y
 calcScrolledPosition(This,Pt) -> wxScrolledWindow:calcScrolledPosition(This,Pt).
  %% From wxPanel
 %% @hidden
+setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
+%% @hidden
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
diff --git a/lib/wx/src/gen/wxPreviewControlBar.erl b/lib/wx/src/gen/wxPreviewControlBar.erl
index dce3feb9ea..22608197b5 100644
--- a/lib/wx/src/gen/wxPreviewControlBar.erl
+++ b/lib/wx/src/gen/wxPreviewControlBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html">wxPreviewControlBar</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewcontrolbar.html">wxPreviewControlBar</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxPanel}
 %% <br />{@link wxWindow}
@@ -58,8 +58,8 @@
   screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
   setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
   setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
@@ -86,7 +86,7 @@ new(Preview,Buttons,Parent)
  when is_record(Preview, wx_ref),is_integer(Buttons),is_record(Parent, wx_ref) ->
   new(Preview,Buttons,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarwxpreviewcontrolbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarwxpreviewcontrolbar">external documentation</a>.
 -spec new(Preview, Buttons, Parent, [Option]) -> wxPreviewControlBar() when
 	Preview::wxPrintPreview:wxPrintPreview(), Buttons::integer(), Parent::wxWindow:wxWindow(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -104,7 +104,7 @@ new(#wx_ref{type=PreviewT,ref=PreviewRef},Buttons,#wx_ref{type=ParentT,ref=Paren
   wxe_util:construct(?wxPreviewControlBar_new,
   <<PreviewRef:32/?UI,Buttons:32/?UI,ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarcreatebuttons">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarcreatebuttons">external documentation</a>.
 -spec createButtons(This) -> ok when
 	This::wxPreviewControlBar().
 createButtons(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -112,7 +112,7 @@ createButtons(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPreviewControlBar_CreateButtons,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbargetprintpreview">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbargetprintpreview">external documentation</a>.
 -spec getPrintPreview(This) -> wxPrintPreview:wxPrintPreview() when
 	This::wxPreviewControlBar().
 getPrintPreview(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -120,7 +120,7 @@ getPrintPreview(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPreviewControlBar_GetPrintPreview,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbargetzoomcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbargetzoomcontrol">external documentation</a>.
 -spec getZoomControl(This) -> integer() when
 	This::wxPreviewControlBar().
 getZoomControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -128,7 +128,7 @@ getZoomControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPreviewControlBar_GetZoomControl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarsetzoomcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewcontrolbar.html#wxpreviewcontrolbarsetzoomcontrol">external documentation</a>.
 -spec setZoomControl(This, Zoom) -> ok when
 	This::wxPreviewControlBar(), Zoom::integer().
 setZoomControl(#wx_ref{type=ThisT,ref=ThisRef},Zoom)
@@ -145,6 +145,8 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxPanel
 %% @hidden
+setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
+%% @hidden
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
diff --git a/lib/wx/src/gen/wxPreviewFrame.erl b/lib/wx/src/gen/wxPreviewFrame.erl
index 41bb0bf2bb..70cc62635a 100644
--- a/lib/wx/src/gen/wxPreviewFrame.erl
+++ b/lib/wx/src/gen/wxPreviewFrame.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html">wxPreviewFrame</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewframe.html">wxPreviewFrame</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxFrame}
 %% <br />{@link wxTopLevelWindow}
@@ -98,7 +98,7 @@ new(Preview,Parent)
  when is_record(Preview, wx_ref),is_record(Parent, wx_ref) ->
   new(Preview,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframewxpreviewframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewframe.html#wxpreviewframewxpreviewframe">external documentation</a>.
 -spec new(Preview, Parent, [Option]) -> wxPreviewFrame() when
 	Preview::wxPrintPreview:wxPrintPreview(), Parent::wxWindow:wxWindow(),
 	Option :: {title, unicode:chardata()}
@@ -118,7 +118,7 @@ new(#wx_ref{type=PreviewT,ref=PreviewRef},#wx_ref{type=ParentT,ref=ParentRef}, O
   wxe_util:construct(?wxPreviewFrame_new,
   <<PreviewRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframecreatecontrolbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewframe.html#wxpreviewframecreatecontrolbar">external documentation</a>.
 -spec createControlBar(This) -> ok when
 	This::wxPreviewFrame().
 createControlBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -126,7 +126,7 @@ createControlBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPreviewFrame_CreateControlBar,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframecreatecanvas">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewframe.html#wxpreviewframecreatecanvas">external documentation</a>.
 -spec createCanvas(This) -> ok when
 	This::wxPreviewFrame().
 createCanvas(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -134,7 +134,7 @@ createCanvas(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPreviewFrame_CreateCanvas,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframeinitialize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewframe.html#wxpreviewframeinitialize">external documentation</a>.
 -spec initialize(This) -> ok when
 	This::wxPreviewFrame().
 initialize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -142,7 +142,7 @@ initialize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPreviewFrame_Initialize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxpreviewframe.html#wxpreviewframeonclosewindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxpreviewframe.html#wxpreviewframeonclosewindow">external documentation</a>.
 -spec onCloseWindow(This, Event) -> ok when
 	This::wxPreviewFrame(), Event::wxCloseEvent:wxCloseEvent().
 onCloseWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
diff --git a/lib/wx/src/gen/wxPrintData.erl b/lib/wx/src/gen/wxPrintData.erl
index 79ba26afab..dc3b0048c5 100644
--- a/lib/wx/src/gen/wxPrintData.erl
+++ b/lib/wx/src/gen/wxPrintData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html">wxPrintData</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html">wxPrintData</a>.
 %% @type wxPrintData().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -37,13 +37,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPrintData() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatawxprintdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatawxprintdata">external documentation</a>.
 -spec new() -> wxPrintData().
 new() ->
   wxe_util:construct(?wxPrintData_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatawxprintdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatawxprintdata">external documentation</a>.
 -spec new(PrintData) -> wxPrintData() when
 	PrintData::wxPrintData().
 new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
@@ -51,7 +51,7 @@ new(#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
   wxe_util:construct(?wxPrintData_new_1,
   <<PrintDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetcollate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetcollate">external documentation</a>.
 -spec getCollate(This) -> boolean() when
 	This::wxPrintData().
 getCollate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ getCollate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetCollate,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetbin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetbin">external documentation</a>.
 %%<br /> Res = ?wxPRINTBIN_DEFAULT | ?wxPRINTBIN_ONLYONE | ?wxPRINTBIN_LOWER | ?wxPRINTBIN_MIDDLE | ?wxPRINTBIN_MANUAL | ?wxPRINTBIN_ENVELOPE | ?wxPRINTBIN_ENVMANUAL | ?wxPRINTBIN_AUTO | ?wxPRINTBIN_TRACTOR | ?wxPRINTBIN_SMALLFMT | ?wxPRINTBIN_LARGEFMT | ?wxPRINTBIN_LARGECAPACITY | ?wxPRINTBIN_CASSETTE | ?wxPRINTBIN_FORMSOURCE | ?wxPRINTBIN_USER
 -spec getBin(This) -> wx:wx_enum() when
 	This::wxPrintData().
@@ -68,7 +68,7 @@ getBin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetBin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetcolour">external documentation</a>.
 -spec getColour(This) -> boolean() when
 	This::wxPrintData().
 getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -76,7 +76,7 @@ getColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetduplex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetduplex">external documentation</a>.
 %%<br /> Res = ?wxDUPLEX_SIMPLEX | ?wxDUPLEX_HORIZONTAL | ?wxDUPLEX_VERTICAL
 -spec getDuplex(This) -> wx:wx_enum() when
 	This::wxPrintData().
@@ -85,7 +85,7 @@ getDuplex(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetDuplex,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetnocopies">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetnocopies">external documentation</a>.
 -spec getNoCopies(This) -> integer() when
 	This::wxPrintData().
 getNoCopies(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -93,7 +93,7 @@ getNoCopies(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetNoCopies,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetorientation">external documentation</a>.
 -spec getOrientation(This) -> integer() when
 	This::wxPrintData().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -101,7 +101,7 @@ getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetpaperid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetpaperid">external documentation</a>.
 %%<br /> Res = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec getPaperId(This) -> wx:wx_enum() when
 	This::wxPrintData().
@@ -110,7 +110,7 @@ getPaperId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetPaperId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetprintername">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetprintername">external documentation</a>.
 -spec getPrinterName(This) -> unicode:charlist() when
 	This::wxPrintData().
 getPrinterName(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -118,7 +118,7 @@ getPrinterName(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetPrinterName,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatagetquality">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatagetquality">external documentation</a>.
 -spec getQuality(This) -> integer() when
 	This::wxPrintData().
 getQuality(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -126,7 +126,7 @@ getQuality(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_GetQuality,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdataisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdataisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxPrintData().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -134,7 +134,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintData_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetbin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetbin">external documentation</a>.
 %%<br /> Bin = ?wxPRINTBIN_DEFAULT | ?wxPRINTBIN_ONLYONE | ?wxPRINTBIN_LOWER | ?wxPRINTBIN_MIDDLE | ?wxPRINTBIN_MANUAL | ?wxPRINTBIN_ENVELOPE | ?wxPRINTBIN_ENVMANUAL | ?wxPRINTBIN_AUTO | ?wxPRINTBIN_TRACTOR | ?wxPRINTBIN_SMALLFMT | ?wxPRINTBIN_LARGEFMT | ?wxPRINTBIN_LARGECAPACITY | ?wxPRINTBIN_CASSETTE | ?wxPRINTBIN_FORMSOURCE | ?wxPRINTBIN_USER
 -spec setBin(This, Bin) -> ok when
 	This::wxPrintData(), Bin::wx:wx_enum().
@@ -144,7 +144,7 @@ setBin(#wx_ref{type=ThisT,ref=ThisRef},Bin)
   wxe_util:cast(?wxPrintData_SetBin,
   <<ThisRef:32/?UI,Bin:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetcollate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetcollate">external documentation</a>.
 -spec setCollate(This, Flag) -> ok when
 	This::wxPrintData(), Flag::boolean().
 setCollate(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -153,7 +153,7 @@ setCollate(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintData_SetCollate,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetcolour">external documentation</a>.
 -spec setColour(This, Colour) -> ok when
 	This::wxPrintData(), Colour::boolean().
 setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -162,7 +162,7 @@ setColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxPrintData_SetColour,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Colour)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetduplex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetduplex">external documentation</a>.
 %%<br /> Duplex = ?wxDUPLEX_SIMPLEX | ?wxDUPLEX_HORIZONTAL | ?wxDUPLEX_VERTICAL
 -spec setDuplex(This, Duplex) -> ok when
 	This::wxPrintData(), Duplex::wx:wx_enum().
@@ -172,7 +172,7 @@ setDuplex(#wx_ref{type=ThisT,ref=ThisRef},Duplex)
   wxe_util:cast(?wxPrintData_SetDuplex,
   <<ThisRef:32/?UI,Duplex:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetnocopies">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetnocopies">external documentation</a>.
 -spec setNoCopies(This, V) -> ok when
 	This::wxPrintData(), V::integer().
 setNoCopies(#wx_ref{type=ThisT,ref=ThisRef},V)
@@ -181,7 +181,7 @@ setNoCopies(#wx_ref{type=ThisT,ref=ThisRef},V)
   wxe_util:cast(?wxPrintData_SetNoCopies,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetorientation">external documentation</a>.
 -spec setOrientation(This, Orient) -> ok when
 	This::wxPrintData(), Orient::integer().
 setOrientation(#wx_ref{type=ThisT,ref=ThisRef},Orient)
@@ -190,7 +190,7 @@ setOrientation(#wx_ref{type=ThisT,ref=ThisRef},Orient)
   wxe_util:cast(?wxPrintData_SetOrientation,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetpaperid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetpaperid">external documentation</a>.
 %%<br /> SizeId = ?wxPAPER_NONE | ?wxPAPER_LETTER | ?wxPAPER_LEGAL | ?wxPAPER_A4 | ?wxPAPER_CSHEET | ?wxPAPER_DSHEET | ?wxPAPER_ESHEET | ?wxPAPER_LETTERSMALL | ?wxPAPER_TABLOID | ?wxPAPER_LEDGER | ?wxPAPER_STATEMENT | ?wxPAPER_EXECUTIVE | ?wxPAPER_A3 | ?wxPAPER_A4SMALL | ?wxPAPER_A5 | ?wxPAPER_B4 | ?wxPAPER_B5 | ?wxPAPER_FOLIO | ?wxPAPER_QUARTO | ?wxPAPER_10X14 | ?wxPAPER_11X17 | ?wxPAPER_NOTE | ?wxPAPER_ENV_9 | ?wxPAPER_ENV_10 | ?wxPAPER_ENV_11 | ?wxPAPER_ENV_12 | ?wxPAPER_ENV_14 | ?wxPAPER_ENV_DL | ?wxPAPER_ENV_C5 | ?wxPAPER_ENV_C3 | ?wxPAPER_ENV_C4 | ?wxPAPER_ENV_C6 | ?wxPAPER_ENV_C65 | ?wxPAPER_ENV_B4 | ?wxPAPER_ENV_B5 | ?wxPAPER_ENV_B6 | ?wxPAPER_ENV_ITALY | ?wxPAPER_ENV_MONARCH | ?wxPAPER_ENV_PERSONAL | ?wxPAPER_FANFOLD_US | ?wxPAPER_FANFOLD_STD_GERMAN | ?wxPAPER_FANFOLD_LGL_GERMAN | ?wxPAPER_ISO_B4 | ?wxPAPER_JAPANESE_POSTCARD | ?wxPAPER_9X11 | ?wxPAPER_10X11 | ?wxPAPER_15X11 | ?wxPAPER_ENV_INVITE | ?wxPAPER_LETTER_EXTRA | ?wxPAPER_LEGAL_EXTRA | ?wxPAPER_TABLOID_EXTRA | ?wxPAPER_A4_EXTRA | ?wxPAPER_LETTER_TRANSVERSE | ?wxPAPER_A4_TRANSVERSE | ?wxPAPER_LETTER_EXTRA_TRANSVERSE | ?wxPAPER_A_PLUS | ?wxPAPER_B_PLUS | ?wxPAPER_LETTER_PLUS | ?wxPAPER_A4_PLUS | ?wxPAPER_A5_TRANSVERSE | ?wxPAPER_B5_TRANSVERSE | ?wxPAPER_A3_EXTRA | ?wxPAPER_A5_EXTRA | ?wxPAPER_B5_EXTRA | ?wxPAPER_A2 | ?wxPAPER_A3_TRANSVERSE | ?wxPAPER_A3_EXTRA_TRANSVERSE | ?wxPAPER_DBL_JAPANESE_POSTCARD | ?wxPAPER_A6 | ?wxPAPER_JENV_KAKU2 | ?wxPAPER_JENV_KAKU3 | ?wxPAPER_JENV_CHOU3 | ?wxPAPER_JENV_CHOU4 | ?wxPAPER_LETTER_ROTATED | ?wxPAPER_A3_ROTATED | ?wxPAPER_A4_ROTATED | ?wxPAPER_A5_ROTATED | ?wxPAPER_B4_JIS_ROTATED | ?wxPAPER_B5_JIS_ROTATED | ?wxPAPER_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED | ?wxPAPER_A6_ROTATED | ?wxPAPER_JENV_KAKU2_ROTATED | ?wxPAPER_JENV_KAKU3_ROTATED | ?wxPAPER_JENV_CHOU3_ROTATED | ?wxPAPER_JENV_CHOU4_ROTATED | ?wxPAPER_B6_JIS | ?wxPAPER_B6_JIS_ROTATED | ?wxPAPER_12X11 | ?wxPAPER_JENV_YOU4 | ?wxPAPER_JENV_YOU4_ROTATED | ?wxPAPER_P16K | ?wxPAPER_P32K | ?wxPAPER_P32KBIG | ?wxPAPER_PENV_1 | ?wxPAPER_PENV_2 | ?wxPAPER_PENV_3 | ?wxPAPER_PENV_4 | ?wxPAPER_PENV_5 | ?wxPAPER_PENV_6 | ?wxPAPER_PENV_7 | ?wxPAPER_PENV_8 | ?wxPAPER_PENV_9 | ?wxPAPER_PENV_10 | ?wxPAPER_P16K_ROTATED | ?wxPAPER_P32K_ROTATED | ?wxPAPER_P32KBIG_ROTATED | ?wxPAPER_PENV_1_ROTATED | ?wxPAPER_PENV_2_ROTATED | ?wxPAPER_PENV_3_ROTATED | ?wxPAPER_PENV_4_ROTATED | ?wxPAPER_PENV_5_ROTATED | ?wxPAPER_PENV_6_ROTATED | ?wxPAPER_PENV_7_ROTATED | ?wxPAPER_PENV_8_ROTATED | ?wxPAPER_PENV_9_ROTATED | ?wxPAPER_PENV_10_ROTATED
 -spec setPaperId(This, SizeId) -> ok when
 	This::wxPrintData(), SizeId::wx:wx_enum().
@@ -200,7 +200,7 @@ setPaperId(#wx_ref{type=ThisT,ref=ThisRef},SizeId)
   wxe_util:cast(?wxPrintData_SetPaperId,
   <<ThisRef:32/?UI,SizeId:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetprintername">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetprintername">external documentation</a>.
 -spec setPrinterName(This, Name) -> ok when
 	This::wxPrintData(), Name::unicode:chardata().
 setPrinterName(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -210,7 +210,7 @@ setPrinterName(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:cast(?wxPrintData_SetPrinterName,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdata.html#wxprintdatasetquality">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdata.html#wxprintdatasetquality">external documentation</a>.
 -spec setQuality(This, Quality) -> ok when
 	This::wxPrintData(), Quality::integer().
 setQuality(#wx_ref{type=ThisT,ref=ThisRef},Quality)
diff --git a/lib/wx/src/gen/wxPrintDialog.erl b/lib/wx/src/gen/wxPrintDialog.erl
index 34c8310e12..bf1fd7d179 100644
--- a/lib/wx/src/gen/wxPrintDialog.erl
+++ b/lib/wx/src/gen/wxPrintDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialog.html">wxPrintDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialog.html">wxPrintDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -94,7 +94,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialog.html#wxprintdialogwxprintdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialog.html#wxprintdialogwxprintdialog">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Parent, Data) -> wxPrintDialog() when<br />
 %% 	Parent::wxWindow:wxWindow(), Data::wxPrintData:wxPrintData().<br />
@@ -118,7 +118,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=DataT,ref=DataRef}) ->
   wxe_util:construct(?wxPrintDialog_new_2_1,
   <<ParentRef:32/?UI,DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialog.html#wxprintdialoggetprintdialogdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialog.html#wxprintdialoggetprintdialogdata">external documentation</a>.
 -spec getPrintDialogData(This) -> wxPrintDialogData:wxPrintDialogData() when
 	This::wxPrintDialog().
 getPrintDialogData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -126,7 +126,7 @@ getPrintDialogData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialog_GetPrintDialogData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialog.html#wxprintdialoggetprintdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialog.html#wxprintdialoggetprintdc">external documentation</a>.
 -spec getPrintDC(This) -> wxDC:wxDC() when
 	This::wxPrintDialog().
 getPrintDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxPrintDialogData.erl b/lib/wx/src/gen/wxPrintDialogData.erl
index 3368349164..797ea3e5ec 100644
--- a/lib/wx/src/gen/wxPrintDialogData.erl
+++ b/lib/wx/src/gen/wxPrintDialogData.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html">wxPrintDialogData</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html">wxPrintDialogData</a>.
 %% @type wxPrintDialogData().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -38,13 +38,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxPrintDialogData() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatawxprintdialogdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatawxprintdialogdata">external documentation</a>.
 -spec new() -> wxPrintDialogData().
 new() ->
   wxe_util:construct(?wxPrintDialogData_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatawxprintdialogdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatawxprintdialogdata">external documentation</a>.
 -spec new(DialogData) -> wxPrintDialogData() when
 	DialogData::wxPrintDialogData() | wxPrintData:wxPrintData().
 new(#wx_ref{type=DialogDataT,ref=DialogDataRef}) ->
@@ -57,7 +57,7 @@ new(#wx_ref{type=DialogDataT,ref=DialogDataRef}) ->
   wxe_util:construct(DialogDataOP,
   <<DialogDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenablehelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdataenablehelp">external documentation</a>.
 -spec enableHelp(This, Flag) -> ok when
 	This::wxPrintDialogData(), Flag::boolean().
 enableHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -66,7 +66,7 @@ enableHelp(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintDialogData_EnableHelp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenablepagenumbers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdataenablepagenumbers">external documentation</a>.
 -spec enablePageNumbers(This, Flag) -> ok when
 	This::wxPrintDialogData(), Flag::boolean().
 enablePageNumbers(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -75,7 +75,7 @@ enablePageNumbers(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintDialogData_EnablePageNumbers,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenableprinttofile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdataenableprinttofile">external documentation</a>.
 -spec enablePrintToFile(This, Flag) -> ok when
 	This::wxPrintDialogData(), Flag::boolean().
 enablePrintToFile(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -84,7 +84,7 @@ enablePrintToFile(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintDialogData_EnablePrintToFile,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataenableselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdataenableselection">external documentation</a>.
 -spec enableSelection(This, Flag) -> ok when
 	This::wxPrintDialogData(), Flag::boolean().
 enableSelection(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -93,7 +93,7 @@ enableSelection(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintDialogData_EnableSelection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetallpages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetallpages">external documentation</a>.
 -spec getAllPages(This) -> boolean() when
 	This::wxPrintDialogData().
 getAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -101,7 +101,7 @@ getAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetcollate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetcollate">external documentation</a>.
 -spec getCollate(This) -> boolean() when
 	This::wxPrintDialogData().
 getCollate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -109,7 +109,7 @@ getCollate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetCollate,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetfrompage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetfrompage">external documentation</a>.
 -spec getFromPage(This) -> integer() when
 	This::wxPrintDialogData().
 getFromPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -117,7 +117,7 @@ getFromPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetFromPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetmaxpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetmaxpage">external documentation</a>.
 -spec getMaxPage(This) -> integer() when
 	This::wxPrintDialogData().
 getMaxPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -125,7 +125,7 @@ getMaxPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetMaxPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetminpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetminpage">external documentation</a>.
 -spec getMinPage(This) -> integer() when
 	This::wxPrintDialogData().
 getMinPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -133,7 +133,7 @@ getMinPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetMinPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetnocopies">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetnocopies">external documentation</a>.
 -spec getNoCopies(This) -> integer() when
 	This::wxPrintDialogData().
 getNoCopies(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -141,7 +141,7 @@ getNoCopies(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetNoCopies,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetprintdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetprintdata">external documentation</a>.
 -spec getPrintData(This) -> wxPrintData:wxPrintData() when
 	This::wxPrintDialogData().
 getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -149,7 +149,7 @@ getPrintData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetPrintData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetprinttofile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetprinttofile">external documentation</a>.
 -spec getPrintToFile(This) -> boolean() when
 	This::wxPrintDialogData().
 getPrintToFile(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -157,7 +157,7 @@ getPrintToFile(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetPrintToFile,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagetselection">external documentation</a>.
 -spec getSelection(This) -> boolean() when
 	This::wxPrintDialogData().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -165,7 +165,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatagettopage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatagettopage">external documentation</a>.
 -spec getToPage(This) -> integer() when
 	This::wxPrintDialogData().
 getToPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -173,7 +173,7 @@ getToPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_GetToPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdataisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdataisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxPrintDialogData().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -181,7 +181,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintDialogData_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetcollate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetcollate">external documentation</a>.
 -spec setCollate(This, Flag) -> ok when
 	This::wxPrintDialogData(), Flag::boolean().
 setCollate(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -190,7 +190,7 @@ setCollate(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintDialogData_SetCollate,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetfrompage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetfrompage">external documentation</a>.
 -spec setFromPage(This, V) -> ok when
 	This::wxPrintDialogData(), V::integer().
 setFromPage(#wx_ref{type=ThisT,ref=ThisRef},V)
@@ -199,7 +199,7 @@ setFromPage(#wx_ref{type=ThisT,ref=ThisRef},V)
   wxe_util:cast(?wxPrintDialogData_SetFromPage,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetmaxpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetmaxpage">external documentation</a>.
 -spec setMaxPage(This, V) -> ok when
 	This::wxPrintDialogData(), V::integer().
 setMaxPage(#wx_ref{type=ThisT,ref=ThisRef},V)
@@ -208,7 +208,7 @@ setMaxPage(#wx_ref{type=ThisT,ref=ThisRef},V)
   wxe_util:cast(?wxPrintDialogData_SetMaxPage,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetminpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetminpage">external documentation</a>.
 -spec setMinPage(This, V) -> ok when
 	This::wxPrintDialogData(), V::integer().
 setMinPage(#wx_ref{type=ThisT,ref=ThisRef},V)
@@ -217,7 +217,7 @@ setMinPage(#wx_ref{type=ThisT,ref=ThisRef},V)
   wxe_util:cast(?wxPrintDialogData_SetMinPage,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetnocopies">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetnocopies">external documentation</a>.
 -spec setNoCopies(This, V) -> ok when
 	This::wxPrintDialogData(), V::integer().
 setNoCopies(#wx_ref{type=ThisT,ref=ThisRef},V)
@@ -226,7 +226,7 @@ setNoCopies(#wx_ref{type=ThisT,ref=ThisRef},V)
   wxe_util:cast(?wxPrintDialogData_SetNoCopies,
   <<ThisRef:32/?UI,V:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetprintdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetprintdata">external documentation</a>.
 -spec setPrintData(This, PrintData) -> ok when
 	This::wxPrintDialogData(), PrintData::wxPrintData:wxPrintData().
 setPrintData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintDataT,ref=PrintDataRef}) ->
@@ -235,7 +235,7 @@ setPrintData(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintDataT,ref=PrintDa
   wxe_util:cast(?wxPrintDialogData_SetPrintData,
   <<ThisRef:32/?UI,PrintDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetprinttofile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetprinttofile">external documentation</a>.
 -spec setPrintToFile(This, Flag) -> ok when
 	This::wxPrintDialogData(), Flag::boolean().
 setPrintToFile(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -244,7 +244,7 @@ setPrintToFile(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintDialogData_SetPrintToFile,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasetselection">external documentation</a>.
 -spec setSelection(This, Flag) -> ok when
 	This::wxPrintDialogData(), Flag::boolean().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -253,7 +253,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxPrintDialogData_SetSelection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintdialogdata.html#wxprintdialogdatasettopage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintdialogdata.html#wxprintdialogdatasettopage">external documentation</a>.
 -spec setToPage(This, V) -> ok when
 	This::wxPrintDialogData(), V::integer().
 setToPage(#wx_ref{type=ThisT,ref=ThisRef},V)
diff --git a/lib/wx/src/gen/wxPrintPreview.erl b/lib/wx/src/gen/wxPrintPreview.erl
index 49ab506526..da0f76af0e 100644
--- a/lib/wx/src/gen/wxPrintPreview.erl
+++ b/lib/wx/src/gen/wxPrintPreview.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html">wxPrintPreview</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html">wxPrintPreview</a>.
 %% @type wxPrintPreview().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -45,7 +45,7 @@ new(Printout)
  when is_record(Printout, wx_ref) ->
   new(Printout, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewwxprintpreview">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewwxprintpreview">external documentation</a>.
 -spec new(Printout, [Option]) -> wxPrintPreview() when
 	Printout::wxPrintout:wxPrintout(),
 	Option :: {printoutForPrinting, wxPrintout:wxPrintout()}
@@ -60,7 +60,7 @@ new(#wx_ref{type=PrintoutT,ref=PrintoutRef}, Options)
   wxe_util:construct(?wxPrintPreview_new_2,
   <<PrintoutRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewwxprintpreview">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewwxprintpreview">external documentation</a>.
 -spec new(Printout, PrintoutForPrinting, Data) -> wxPrintPreview() when
 	Printout::wxPrintout:wxPrintout(), PrintoutForPrinting::wxPrintout:wxPrintout(), Data::wxPrintData:wxPrintData().
 new(#wx_ref{type=PrintoutT,ref=PrintoutRef},#wx_ref{type=PrintoutForPrintingT,ref=PrintoutForPrintingRef},#wx_ref{type=DataT,ref=DataRef}) ->
@@ -70,7 +70,7 @@ new(#wx_ref{type=PrintoutT,ref=PrintoutRef},#wx_ref{type=PrintoutForPrintingT,re
   wxe_util:construct(?wxPrintPreview_new_3,
   <<PrintoutRef:32/?UI,PrintoutForPrintingRef:32/?UI,DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetcanvas">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewgetcanvas">external documentation</a>.
 -spec getCanvas(This) -> wxPreviewCanvas:wxPreviewCanvas() when
 	This::wxPrintPreview().
 getCanvas(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -78,7 +78,7 @@ getCanvas(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_GetCanvas,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetcurrentpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewgetcurrentpage">external documentation</a>.
 -spec getCurrentPage(This) -> integer() when
 	This::wxPrintPreview().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -86,7 +86,7 @@ getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewgetframe">external documentation</a>.
 -spec getFrame(This) -> wxFrame:wxFrame() when
 	This::wxPrintPreview().
 getFrame(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -94,7 +94,7 @@ getFrame(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_GetFrame,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetmaxpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewgetmaxpage">external documentation</a>.
 -spec getMaxPage(This) -> integer() when
 	This::wxPrintPreview().
 getMaxPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -102,7 +102,7 @@ getMaxPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_GetMaxPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetminpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewgetminpage">external documentation</a>.
 -spec getMinPage(This) -> integer() when
 	This::wxPrintPreview().
 getMinPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -110,7 +110,7 @@ getMinPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_GetMinPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetprintout">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewgetprintout">external documentation</a>.
 -spec getPrintout(This) -> wxPrintout:wxPrintout() when
 	This::wxPrintPreview().
 getPrintout(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -118,7 +118,7 @@ getPrintout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_GetPrintout,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewgetprintoutforprinting">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewgetprintoutforprinting">external documentation</a>.
 -spec getPrintoutForPrinting(This) -> wxPrintout:wxPrintout() when
 	This::wxPrintPreview().
 getPrintoutForPrinting(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -126,7 +126,7 @@ getPrintoutForPrinting(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_GetPrintoutForPrinting,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewisok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewisok">external documentation</a>.
 -spec isOk(This) -> boolean() when
 	This::wxPrintPreview().
 isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -134,7 +134,7 @@ isOk(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintPreview_IsOk,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewpaintpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewpaintpage">external documentation</a>.
 -spec paintPage(This, Canvas, Dc) -> boolean() when
 	This::wxPrintPreview(), Canvas::wxPreviewCanvas:wxPreviewCanvas(), Dc::wxDC:wxDC().
 paintPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CanvasT,ref=CanvasRef},#wx_ref{type=DcT,ref=DcRef}) ->
@@ -144,7 +144,7 @@ paintPage(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CanvasT,ref=CanvasRef},#w
   wxe_util:call(?wxPrintPreview_PaintPage,
   <<ThisRef:32/?UI,CanvasRef:32/?UI,DcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewprint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewprint">external documentation</a>.
 -spec print(This, Interactive) -> boolean() when
 	This::wxPrintPreview(), Interactive::boolean().
 print(#wx_ref{type=ThisT,ref=ThisRef},Interactive)
@@ -153,7 +153,7 @@ print(#wx_ref{type=ThisT,ref=ThisRef},Interactive)
   wxe_util:call(?wxPrintPreview_Print,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Interactive)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewrenderpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewrenderpage">external documentation</a>.
 -spec renderPage(This, PageNum) -> boolean() when
 	This::wxPrintPreview(), PageNum::integer().
 renderPage(#wx_ref{type=ThisT,ref=ThisRef},PageNum)
@@ -162,7 +162,7 @@ renderPage(#wx_ref{type=ThisT,ref=ThisRef},PageNum)
   wxe_util:call(?wxPrintPreview_RenderPage,
   <<ThisRef:32/?UI,PageNum:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetcanvas">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewsetcanvas">external documentation</a>.
 -spec setCanvas(This, Canvas) -> ok when
 	This::wxPrintPreview(), Canvas::wxPreviewCanvas:wxPreviewCanvas().
 setCanvas(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CanvasT,ref=CanvasRef}) ->
@@ -171,7 +171,7 @@ setCanvas(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CanvasT,ref=CanvasRef}) -
   wxe_util:cast(?wxPrintPreview_SetCanvas,
   <<ThisRef:32/?UI,CanvasRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetcurrentpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewsetcurrentpage">external documentation</a>.
 -spec setCurrentPage(This, PageNum) -> boolean() when
 	This::wxPrintPreview(), PageNum::integer().
 setCurrentPage(#wx_ref{type=ThisT,ref=ThisRef},PageNum)
@@ -180,7 +180,7 @@ setCurrentPage(#wx_ref{type=ThisT,ref=ThisRef},PageNum)
   wxe_util:call(?wxPrintPreview_SetCurrentPage,
   <<ThisRef:32/?UI,PageNum:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewsetframe">external documentation</a>.
 -spec setFrame(This, Frame) -> ok when
 	This::wxPrintPreview(), Frame::wxFrame:wxFrame().
 setFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}) ->
@@ -189,7 +189,7 @@ setFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef}) ->
   wxe_util:cast(?wxPrintPreview_SetFrame,
   <<ThisRef:32/?UI,FrameRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetprintout">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewsetprintout">external documentation</a>.
 -spec setPrintout(This, Printout) -> ok when
 	This::wxPrintPreview(), Printout::wxPrintout:wxPrintout().
 setPrintout(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintoutT,ref=PrintoutRef}) ->
@@ -198,7 +198,7 @@ setPrintout(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PrintoutT,ref=PrintoutR
   wxe_util:cast(?wxPrintPreview_SetPrintout,
   <<ThisRef:32/?UI,PrintoutRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintpreview.html#wxprintpreviewsetzoom">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintpreview.html#wxprintpreviewsetzoom">external documentation</a>.
 -spec setZoom(This, Percent) -> ok when
 	This::wxPrintPreview(), Percent::integer().
 setZoom(#wx_ref{type=ThisT,ref=ThisRef},Percent)
diff --git a/lib/wx/src/gen/wxPrinter.erl b/lib/wx/src/gen/wxPrinter.erl
index 031483da4d..b21f6df2d7 100644
--- a/lib/wx/src/gen/wxPrinter.erl
+++ b/lib/wx/src/gen/wxPrinter.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html">wxPrinter</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html">wxPrinter</a>.
 %% @type wxPrinter().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -41,7 +41,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterwxprinter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprinterwxprinter">external documentation</a>.
 -spec new([Option]) -> wxPrinter() when
 	Option :: {data, wxPrintDialogData:wxPrintDialogData()}.
 new(Options)
@@ -52,7 +52,7 @@ new(Options)
   wxe_util:construct(?wxPrinter_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintercreateabortwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprintercreateabortwindow">external documentation</a>.
 -spec createAbortWindow(This, Parent, Printout) -> wxWindow:wxWindow() when
 	This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout().
 createAbortWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=PrintoutT,ref=PrintoutRef}) ->
@@ -62,7 +62,7 @@ createAbortWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=Paren
   wxe_util:call(?wxPrinter_CreateAbortWindow,
   <<ThisRef:32/?UI,ParentRef:32/?UI,PrintoutRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintergetabort">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprintergetabort">external documentation</a>.
 -spec getAbort(This) -> boolean() when
 	This::wxPrinter().
 getAbort(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -70,14 +70,14 @@ getAbort(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrinter_GetAbort,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintergetlasterror">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprintergetlasterror">external documentation</a>.
 %%<br /> Res = ?wxPRINTER_NO_ERROR | ?wxPRINTER_CANCELLED | ?wxPRINTER_ERROR
 -spec getLastError() -> wx:wx_enum().
 getLastError() ->
   wxe_util:call(?wxPrinter_GetLastError,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintergetprintdialogdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprintergetprintdialogdata">external documentation</a>.
 -spec getPrintDialogData(This) -> wxPrintDialogData:wxPrintDialogData() when
 	This::wxPrinter().
 getPrintDialogData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -93,7 +93,7 @@ print(This,Parent,Printout)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_record(Printout, wx_ref) ->
   print(This,Parent,Printout, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterprint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprinterprint">external documentation</a>.
 -spec print(This, Parent, Printout, [Option]) -> boolean() when
 	This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(),
 	Option :: {prompt, boolean()}.
@@ -108,7 +108,7 @@ print(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_re
   wxe_util:call(?wxPrinter_Print,
   <<ThisRef:32/?UI,ParentRef:32/?UI,PrintoutRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterprintdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprinterprintdialog">external documentation</a>.
 -spec printDialog(This, Parent) -> wxDC:wxDC() when
 	This::wxPrinter(), Parent::wxWindow:wxWindow().
 printDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}) ->
@@ -117,7 +117,7 @@ printDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef})
   wxe_util:call(?wxPrinter_PrintDialog,
   <<ThisRef:32/?UI,ParentRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprinterreporterror">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprinterreporterror">external documentation</a>.
 -spec reportError(This, Parent, Printout, Message) -> ok when
 	This::wxPrinter(), Parent::wxWindow:wxWindow(), Printout::wxPrintout:wxPrintout(), Message::unicode:chardata().
 reportError(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},#wx_ref{type=PrintoutT,ref=PrintoutRef},Message)
@@ -129,7 +129,7 @@ reportError(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},
   wxe_util:cast(?wxPrinter_ReportError,
   <<ThisRef:32/?UI,ParentRef:32/?UI,PrintoutRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprinter.html#wxprintersetup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprinter.html#wxprintersetup">external documentation</a>.
 -spec setup(This, Parent) -> boolean() when
 	This::wxPrinter(), Parent::wxWindow:wxWindow().
 setup(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}) ->
diff --git a/lib/wx/src/gen/wxPrintout.erl b/lib/wx/src/gen/wxPrintout.erl
index c75edd2b5a..c357c74bf3 100644
--- a/lib/wx/src/gen/wxPrintout.erl
+++ b/lib/wx/src/gen/wxPrintout.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html">wxPrintout</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html">wxPrintout</a>.
 %% @type wxPrintout().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -121,7 +121,7 @@ new(Title, OnPrintPage, Opts) when is_list(Title), is_function(OnPrintPage), is_
 			  OnPrintPageId:32/?UI,
 			  BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetdc">external documentation</a>.
 -spec getDC(This) -> wxDC:wxDC() when
 	This::wxPrintout().
 getDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -129,7 +129,7 @@ getDC(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetDC,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetpagesizemm">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetpagesizemm">external documentation</a>.
 -spec getPageSizeMM(This) -> {W::integer(), H::integer()} when
 	This::wxPrintout().
 getPageSizeMM(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -137,7 +137,7 @@ getPageSizeMM(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetPageSizeMM,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetpagesizepixels">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetpagesizepixels">external documentation</a>.
 -spec getPageSizePixels(This) -> {W::integer(), H::integer()} when
 	This::wxPrintout().
 getPageSizePixels(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -145,7 +145,7 @@ getPageSizePixels(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetPageSizePixels,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetpaperrectpixels">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetpaperrectpixels">external documentation</a>.
 -spec getPaperRectPixels(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxPrintout().
 getPaperRectPixels(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -153,7 +153,7 @@ getPaperRectPixels(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetPaperRectPixels,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetppiprinter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetppiprinter">external documentation</a>.
 -spec getPPIPrinter(This) -> {X::integer(), Y::integer()} when
 	This::wxPrintout().
 getPPIPrinter(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -161,7 +161,7 @@ getPPIPrinter(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetPPIPrinter,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetppiscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetppiscreen">external documentation</a>.
 -spec getPPIScreen(This) -> {X::integer(), Y::integer()} when
 	This::wxPrintout().
 getPPIScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ getPPIScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetPPIScreen,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgettitle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgettitle">external documentation</a>.
 -spec getTitle(This) -> unicode:charlist() when
 	This::wxPrintout().
 getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -177,7 +177,7 @@ getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetTitle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutispreview">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutispreview">external documentation</a>.
 -spec isPreview(This) -> boolean() when
 	This::wxPrintout().
 isPreview(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -185,7 +185,7 @@ isPreview(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_IsPreview,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutfitthissizetopaper">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutfitthissizetopaper">external documentation</a>.
 -spec fitThisSizeToPaper(This, ImageSize) -> ok when
 	This::wxPrintout(), ImageSize::{W::integer(), H::integer()}.
 fitThisSizeToPaper(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH})
@@ -194,7 +194,7 @@ fitThisSizeToPaper(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH})
   wxe_util:cast(?wxPrintout_FitThisSizeToPaper,
   <<ThisRef:32/?UI,ImageSizeW:32/?UI,ImageSizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutfitthissizetopage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutfitthissizetopage">external documentation</a>.
 -spec fitThisSizeToPage(This, ImageSize) -> ok when
 	This::wxPrintout(), ImageSize::{W::integer(), H::integer()}.
 fitThisSizeToPage(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH})
@@ -203,7 +203,7 @@ fitThisSizeToPage(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH})
   wxe_util:cast(?wxPrintout_FitThisSizeToPage,
   <<ThisRef:32/?UI,ImageSizeW:32/?UI,ImageSizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutfitthissizetopagemargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutfitthissizetopagemargins">external documentation</a>.
 -spec fitThisSizeToPageMargins(This, ImageSize, PageSetupData) -> ok when
 	This::wxPrintout(), ImageSize::{W::integer(), H::integer()}, PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData().
 fitThisSizeToPageMargins(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH},#wx_ref{type=PageSetupDataT,ref=PageSetupDataRef})
@@ -213,7 +213,7 @@ fitThisSizeToPageMargins(#wx_ref{type=ThisT,ref=ThisRef},{ImageSizeW,ImageSizeH}
   wxe_util:cast(?wxPrintout_FitThisSizeToPageMargins,
   <<ThisRef:32/?UI,ImageSizeW:32/?UI,ImageSizeH:32/?UI,PageSetupDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetopaper">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutmapscreensizetopaper">external documentation</a>.
 -spec mapScreenSizeToPaper(This) -> ok when
 	This::wxPrintout().
 mapScreenSizeToPaper(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -221,7 +221,7 @@ mapScreenSizeToPaper(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPrintout_MapScreenSizeToPaper,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetopage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutmapscreensizetopage">external documentation</a>.
 -spec mapScreenSizeToPage(This) -> ok when
 	This::wxPrintout().
 mapScreenSizeToPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -229,7 +229,7 @@ mapScreenSizeToPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPrintout_MapScreenSizeToPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetopagemargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutmapscreensizetopagemargins">external documentation</a>.
 -spec mapScreenSizeToPageMargins(This, PageSetupData) -> ok when
 	This::wxPrintout(), PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData().
 mapScreenSizeToPageMargins(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageSetupDataT,ref=PageSetupDataRef}) ->
@@ -238,7 +238,7 @@ mapScreenSizeToPageMargins(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageSetu
   wxe_util:cast(?wxPrintout_MapScreenSizeToPageMargins,
   <<ThisRef:32/?UI,PageSetupDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutmapscreensizetodevice">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutmapscreensizetodevice">external documentation</a>.
 -spec mapScreenSizeToDevice(This) -> ok when
 	This::wxPrintout().
 mapScreenSizeToDevice(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -246,7 +246,7 @@ mapScreenSizeToDevice(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxPrintout_MapScreenSizeToDevice,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetlogicalpaperrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetlogicalpaperrect">external documentation</a>.
 -spec getLogicalPaperRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxPrintout().
 getLogicalPaperRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -254,7 +254,7 @@ getLogicalPaperRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetLogicalPaperRect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetlogicalpagerect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetlogicalpagerect">external documentation</a>.
 -spec getLogicalPageRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxPrintout().
 getLogicalPageRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -262,7 +262,7 @@ getLogicalPageRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxPrintout_GetLogicalPageRect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutgetlogicalpagemarginsrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutgetlogicalpagemarginsrect">external documentation</a>.
 -spec getLogicalPageMarginsRect(This, PageSetupData) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxPrintout(), PageSetupData::wxPageSetupDialogData:wxPageSetupDialogData().
 getLogicalPageMarginsRect(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageSetupDataT,ref=PageSetupDataRef}) ->
@@ -271,7 +271,7 @@ getLogicalPageMarginsRect(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PageSetup
   wxe_util:call(?wxPrintout_GetLogicalPageMarginsRect,
   <<ThisRef:32/?UI,PageSetupDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutsetlogicalorigin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutsetlogicalorigin">external documentation</a>.
 -spec setLogicalOrigin(This, X, Y) -> ok when
 	This::wxPrintout(), X::integer(), Y::integer().
 setLogicalOrigin(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -280,7 +280,7 @@ setLogicalOrigin(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxPrintout_SetLogicalOrigin,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprintout.html#wxprintoutoffsetlogicalorigin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprintout.html#wxprintoutoffsetlogicalorigin">external documentation</a>.
 -spec offsetLogicalOrigin(This, Xoff, Yoff) -> ok when
 	This::wxPrintout(), Xoff::integer(), Yoff::integer().
 offsetLogicalOrigin(#wx_ref{type=ThisT,ref=ThisRef},Xoff,Yoff)
diff --git a/lib/wx/src/gen/wxProgressDialog.erl b/lib/wx/src/gen/wxProgressDialog.erl
index 0f42c1d68f..b88e7ac75e 100644
--- a/lib/wx/src/gen/wxProgressDialog.erl
+++ b/lib/wx/src/gen/wxProgressDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html">wxProgressDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprogressdialog.html">wxProgressDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -94,7 +94,7 @@ new(Title,Message)
  when is_list(Title),is_list(Message) ->
   new(Title,Message, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogwxprogressdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprogressdialog.html#wxprogressdialogwxprogressdialog">external documentation</a>.
 -spec new(Title, Message, [Option]) -> wxProgressDialog() when
 	Title::unicode:chardata(), Message::unicode:chardata(),
 	Option :: {maximum, integer()}
@@ -112,7 +112,7 @@ new(Title,Message, Options)
   wxe_util:construct(?wxProgressDialog_new,
   <<(byte_size(Title_UC)):32/?UI,(Title_UC)/binary, 0:(((8- ((4+byte_size(Title_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((4+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogresume">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprogressdialog.html#wxprogressdialogresume">external documentation</a>.
 -spec resume(This) -> ok when
 	This::wxProgressDialog().
 resume(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -120,7 +120,7 @@ resume(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxProgressDialog_Resume,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogupdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprogressdialog.html#wxprogressdialogupdate">external documentation</a>.
 -spec update(This) -> ok when
 	This::wxProgressDialog().
 update(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -136,7 +136,7 @@ update(This,Value)
  when is_record(This, wx_ref),is_integer(Value) ->
   update(This,Value, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxprogressdialog.html#wxprogressdialogupdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxprogressdialog.html#wxprogressdialogupdate">external documentation</a>.
 -spec update(This, Value, [Option]) -> boolean() when
 	This::wxProgressDialog(), Value::integer(),
 	Option :: {newmsg, unicode:chardata()}.
diff --git a/lib/wx/src/gen/wxQueryNewPaletteEvent.erl b/lib/wx/src/gen/wxQueryNewPaletteEvent.erl
index 8123d62fe1..606566a6e7 100644
--- a/lib/wx/src/gen/wxQueryNewPaletteEvent.erl
+++ b/lib/wx/src/gen/wxQueryNewPaletteEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxquerynewpaletteevent.html">wxQueryNewPaletteEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxquerynewpaletteevent.html">wxQueryNewPaletteEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>query_new_palette</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxQueryNewPalette(). #wxQueryNewPalette{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxQueryNewPaletteEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxquerynewpaletteevent.html#wxquerynewpaletteeventsetpaletterealized">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxquerynewpaletteevent.html#wxquerynewpaletteeventsetpaletterealized">external documentation</a>.
 -spec setPaletteRealized(This, Realized) -> ok when
 	This::wxQueryNewPaletteEvent(), Realized::boolean().
 setPaletteRealized(#wx_ref{type=ThisT,ref=ThisRef},Realized)
@@ -52,7 +52,7 @@ setPaletteRealized(#wx_ref{type=ThisT,ref=ThisRef},Realized)
   wxe_util:cast(?wxQueryNewPaletteEvent_SetPaletteRealized,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Realized)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxquerynewpaletteevent.html#wxquerynewpaletteeventgetpaletterealized">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxquerynewpaletteevent.html#wxquerynewpaletteeventgetpaletterealized">external documentation</a>.
 -spec getPaletteRealized(This) -> boolean() when
 	This::wxQueryNewPaletteEvent().
 getPaletteRealized(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxRadioBox.erl b/lib/wx/src/gen/wxRadioBox.erl
index b7f52d7d9c..98769ff11b 100644
--- a/lib/wx/src/gen/wxRadioBox.erl
+++ b/lib/wx/src/gen/wxRadioBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html">wxRadioBox</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html">wxRadioBox</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -88,7 +88,7 @@ new(Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   new(Parent,Id,Title,Pos,Size,Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxwxradiobox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxwxradiobox">external documentation</a>.
 -spec new(Parent, Id, Title, Pos, Size, Choices, [Option]) -> wxRadioBox() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[unicode:chardata()],
 	Option :: {majorDim, integer()}
@@ -116,7 +116,7 @@ create(This,Parent,Id,Title,Pos={PosX,PosY},Size={SizeW,SizeH},Choices)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Title),is_integer(PosX),is_integer(PosY),is_integer(SizeW),is_integer(SizeH),is_list(Choices) ->
   create(This,Parent,Id,Title,Pos,Size,Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxcreate">external documentation</a>.
 -spec create(This, Parent, Id, Title, Pos, Size, Choices, [Option]) -> boolean() when
 	This::wxRadioBox(), Parent::wxWindow:wxWindow(), Id::integer(), Title::unicode:chardata(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}, Choices::[unicode:chardata()],
 	Option :: {majorDim, integer()}
@@ -145,7 +145,7 @@ enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxenable">external documentation</a>.
 %% <br /> Also:<br />
 %% enable(This, [Option]) -> boolean() when<br />
 %% 	This::wxRadioBox(),<br />
@@ -169,7 +169,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxRadioBox_Enable_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxenable">external documentation</a>.
 -spec enable(This, N, [Option]) -> boolean() when
 	This::wxRadioBox(), N::integer(),
 	Option :: {enable, boolean()}.
@@ -182,7 +182,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
   wxe_util:call(?wxRadioBox_Enable_2,
   <<ThisRef:32/?UI,N:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxRadioBox().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -190,7 +190,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxRadioBox_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetstring">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxgetstring">external documentation</a>.
 -spec getString(This, N) -> unicode:charlist() when
 	This::wxRadioBox(), N::integer().
 getString(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -199,7 +199,7 @@ getString(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxRadioBox_GetString,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxsetselection">external documentation</a>.
 -spec setSelection(This, N) -> ok when
 	This::wxRadioBox(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -216,7 +216,7 @@ show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxshow">external documentation</a>.
 %% <br /> Also:<br />
 %% show(This, [Option]) -> boolean() when<br />
 %% 	This::wxRadioBox(),<br />
@@ -240,7 +240,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxRadioBox_Show_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxshow">external documentation</a>.
 -spec show(This, N, [Option]) -> boolean() when
 	This::wxRadioBox(), N::integer(),
 	Option :: {show, boolean()}.
@@ -253,7 +253,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef},N, Options)
   wxe_util:call(?wxRadioBox_Show_2,
   <<ThisRef:32/?UI,N:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetcolumncount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxgetcolumncount">external documentation</a>.
 -spec getColumnCount(This) -> integer() when
 	This::wxRadioBox().
 getColumnCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -261,7 +261,7 @@ getColumnCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxRadioBox_GetColumnCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetitemhelptext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxgetitemhelptext">external documentation</a>.
 -spec getItemHelpText(This, N) -> unicode:charlist() when
 	This::wxRadioBox(), N::integer().
 getItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -270,7 +270,7 @@ getItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxRadioBox_GetItemHelpText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetitemtooltip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxgetitemtooltip">external documentation</a>.
 -spec getItemToolTip(This, Item) -> wxToolTip:wxToolTip() when
 	This::wxRadioBox(), Item::integer().
 getItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -279,7 +279,7 @@ getItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxRadioBox_GetItemToolTip,
   <<ThisRef:32/?UI,Item:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetitemfrompoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxgetitemfrompoint">external documentation</a>.
 -spec getItemFromPoint(This, Pt) -> integer() when
 	This::wxRadioBox(), Pt::{X::integer(), Y::integer()}.
 getItemFromPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -288,7 +288,7 @@ getItemFromPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxRadioBox_GetItemFromPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxgetrowcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxgetrowcount">external documentation</a>.
 -spec getRowCount(This) -> integer() when
 	This::wxRadioBox().
 getRowCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -296,7 +296,7 @@ getRowCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxRadioBox_GetRowCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxisitemenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxisitemenabled">external documentation</a>.
 -spec isItemEnabled(This, N) -> boolean() when
 	This::wxRadioBox(), N::integer().
 isItemEnabled(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -305,7 +305,7 @@ isItemEnabled(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxRadioBox_IsItemEnabled,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxisitemshown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxisitemshown">external documentation</a>.
 -spec isItemShown(This, N) -> boolean() when
 	This::wxRadioBox(), N::integer().
 isItemShown(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -314,7 +314,7 @@ isItemShown(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxRadioBox_IsItemShown,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetitemhelptext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxsetitemhelptext">external documentation</a>.
 -spec setItemHelpText(This, N, HelpText) -> ok when
 	This::wxRadioBox(), N::integer(), HelpText::unicode:chardata().
 setItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N,HelpText)
@@ -324,7 +324,7 @@ setItemHelpText(#wx_ref{type=ThisT,ref=ThisRef},N,HelpText)
   wxe_util:cast(?wxRadioBox_SetItemHelpText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(HelpText_UC)):32/?UI,(HelpText_UC)/binary, 0:(((8- ((4+byte_size(HelpText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobox.html#wxradioboxsetitemtooltip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobox.html#wxradioboxsetitemtooltip">external documentation</a>.
 -spec setItemToolTip(This, Item, Text) -> ok when
 	This::wxRadioBox(), Item::integer(), Text::unicode:chardata().
 setItemToolTip(#wx_ref{type=ThisT,ref=ThisRef},Item,Text)
diff --git a/lib/wx/src/gen/wxRadioButton.erl b/lib/wx/src/gen/wxRadioButton.erl
index beb052b873..ead0fe32e8 100644
--- a/lib/wx/src/gen/wxRadioButton.erl
+++ b/lib/wx/src/gen/wxRadioButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html">wxRadioButton</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobutton.html">wxRadioButton</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -77,7 +77,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxRadioButton() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttonwxradiobutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobutton.html#wxradiobuttonwxradiobutton">external documentation</a>.
 -spec new() -> wxRadioButton().
 new() ->
   wxe_util:construct(?wxRadioButton_new_0,
@@ -91,7 +91,7 @@ new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttonwxradiobutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobutton.html#wxradiobuttonwxradiobutton">external documentation</a>.
 -spec new(Parent, Id, Label, [Option]) -> wxRadioButton() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -119,7 +119,7 @@ create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttoncreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobutton.html#wxradiobuttoncreate">external documentation</a>.
 -spec create(This, Parent, Id, Label, [Option]) -> boolean() when
 	This::wxRadioButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -140,7 +140,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxRadioButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttongetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobutton.html#wxradiobuttongetvalue">external documentation</a>.
 -spec getValue(This) -> boolean() when
 	This::wxRadioButton().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxRadioButton_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxradiobutton.html#wxradiobuttonsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxradiobutton.html#wxradiobuttonsetvalue">external documentation</a>.
 -spec setValue(This, Val) -> ok when
 	This::wxRadioButton(), Val::boolean().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Val)
diff --git a/lib/wx/src/gen/wxRegion.erl b/lib/wx/src/gen/wxRegion.erl
index 3e23623741..addb752680 100644
--- a/lib/wx/src/gen/wxRegion.erl
+++ b/lib/wx/src/gen/wxRegion.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html">wxRegion</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html">wxRegion</a>.
 %% @type wxRegion().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -37,13 +37,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxRegion() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionwxregion">external documentation</a>.
 -spec new() -> wxRegion().
 new() ->
   wxe_util:construct(?wxRegion_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionwxregion">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Rect) -> wxRegion() when<br />
 %% 	Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -61,7 +61,7 @@ new({RectX,RectY,RectW,RectH})
   wxe_util:construct(?wxRegion_new_1_1,
   <<RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionwxregion">external documentation</a>.
 -spec new(TopLeft, BottomRight) -> wxRegion() when
 	TopLeft::{X::integer(), Y::integer()}, BottomRight::{X::integer(), Y::integer()}.
 new({TopLeftX,TopLeftY},{BottomRightX,BottomRightY})
@@ -69,7 +69,7 @@ new({TopLeftX,TopLeftY},{BottomRightX,BottomRightY})
   wxe_util:construct(?wxRegion_new_2,
   <<TopLeftX:32/?UI,TopLeftY:32/?UI,BottomRightX:32/?UI,BottomRightY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionwxregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionwxregion">external documentation</a>.
 -spec new(X, Y, W, H) -> wxRegion() when
 	X::integer(), Y::integer(), W::integer(), H::integer().
 new(X,Y,W,H)
@@ -77,7 +77,7 @@ new(X,Y,W,H)
   wxe_util:construct(?wxRegion_new_4,
   <<X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionclear">external documentation</a>.
 -spec clear(This) -> ok when
 	This::wxRegion().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -85,7 +85,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxRegion_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregioncontains">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregioncontains">external documentation</a>.
 %% <br /> Also:<br />
 %% contains(This, Rect) -> wx:wx_enum() when<br />
 %% 	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -106,7 +106,7 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxRegion_Contains_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregioncontains">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregioncontains">external documentation</a>.
 %%<br /> Res = ?wxOutRegion | ?wxPartRegion | ?wxInRegion
 -spec contains(This, X, Y) -> wx:wx_enum() when
 	This::wxRegion(), X::integer(), Y::integer().
@@ -116,7 +116,7 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxRegion_Contains_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregioncontains">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregioncontains">external documentation</a>.
 %%<br /> Res = ?wxOutRegion | ?wxPartRegion | ?wxInRegion
 -spec contains(This, X, Y, W, H) -> wx:wx_enum() when
 	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
@@ -126,7 +126,7 @@ contains(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:call(?wxRegion_Contains_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionconverttobitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionconverttobitmap">external documentation</a>.
 -spec convertToBitmap(This) -> wxBitmap:wxBitmap() when
 	This::wxRegion().
 convertToBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -134,7 +134,7 @@ convertToBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxRegion_ConvertToBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregiongetbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregiongetbox">external documentation</a>.
 -spec getBox(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxRegion().
 getBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -142,7 +142,7 @@ getBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxRegion_GetBox,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionintersect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionintersect">external documentation</a>.
 %% <br /> Also:<br />
 %% intersect(This, Rect) -> boolean() when<br />
 %% 	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -162,7 +162,7 @@ intersect(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxRegion_Intersect_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionintersect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionintersect">external documentation</a>.
 -spec intersect(This, X, Y, W, H) -> boolean() when
 	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 intersect(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -171,7 +171,7 @@ intersect(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:call(?wxRegion_Intersect_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionisempty">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionisempty">external documentation</a>.
 -spec isEmpty(This) -> boolean() when
 	This::wxRegion().
 isEmpty(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -179,7 +179,7 @@ isEmpty(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxRegion_IsEmpty,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionsubtract">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionsubtract">external documentation</a>.
 %% <br /> Also:<br />
 %% subtract(This, Rect) -> boolean() when<br />
 %% 	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -199,7 +199,7 @@ subtract(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxRegion_Subtract_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionsubtract">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionsubtract">external documentation</a>.
 -spec subtract(This, X, Y, W, H) -> boolean() when
 	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 subtract(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -208,7 +208,7 @@ subtract(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:call(?wxRegion_Subtract_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionoffset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionoffset">external documentation</a>.
 -spec offset(This, Pt) -> boolean() when
 	This::wxRegion(), Pt::{X::integer(), Y::integer()}.
 offset(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -217,7 +217,7 @@ offset(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxRegion_Offset_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionoffset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionoffset">external documentation</a>.
 -spec offset(This, X, Y) -> boolean() when
 	This::wxRegion(), X::integer(), Y::integer().
 offset(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -226,7 +226,7 @@ offset(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxRegion_Offset_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionunion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionunion">external documentation</a>.
 %% <br /> Also:<br />
 %% union(This, Rect) -> boolean() when<br />
 %% 	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -259,7 +259,7 @@ union(This,Bmp,Transp)
  when is_record(This, wx_ref),is_record(Bmp, wx_ref),tuple_size(Transp) =:= 3; tuple_size(Transp) =:= 4 ->
   union(This,Bmp,Transp, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionunion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionunion">external documentation</a>.
 -spec union(This, Bmp, Transp, [Option]) -> boolean() when
 	This::wxRegion(), Bmp::wxBitmap:wxBitmap(), Transp::wx:wx_colour(),
 	Option :: {tolerance, integer()}.
@@ -273,7 +273,7 @@ union(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BmpT,ref=BmpRef},Transp, Opti
   wxe_util:call(?wxRegion_Union_3,
   <<ThisRef:32/?UI,BmpRef:32/?UI,(wxe_util:colour_bin(Transp)):16/binary, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionunion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionunion">external documentation</a>.
 -spec union(This, X, Y, W, H) -> boolean() when
 	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 union(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -282,7 +282,7 @@ union(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:call(?wxRegion_Union_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionxor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionxor">external documentation</a>.
 %% <br /> Also:<br />
 %% 'Xor'(This, Rect) -> boolean() when<br />
 %% 	This::wxRegion(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -302,7 +302,7 @@ union(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:call(?wxRegion_Xor_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxregion.html#wxregionxor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxregion.html#wxregionxor">external documentation</a>.
 -spec 'Xor'(This, X, Y, W, H) -> boolean() when
 	This::wxRegion(), X::integer(), Y::integer(), W::integer(), H::integer().
 'Xor'(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
diff --git a/lib/wx/src/gen/wxSashEvent.erl b/lib/wx/src/gen/wxSashEvent.erl
index 6ca4bf73ea..028b8ba067 100644
--- a/lib/wx/src/gen/wxSashEvent.erl
+++ b/lib/wx/src/gen/wxSashEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashevent.html">wxSashEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashevent.html">wxSashEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>sash_dragged</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxSash(). #wxSash{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSashEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashevent.html#wxsasheventgetedge">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashevent.html#wxsasheventgetedge">external documentation</a>.
 %%<br /> Res = ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
 -spec getEdge(This) -> wx:wx_enum() when
 	This::wxSashEvent().
@@ -56,7 +56,7 @@ getEdge(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashEvent_GetEdge,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashevent.html#wxsasheventgetdragrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashevent.html#wxsasheventgetdragrect">external documentation</a>.
 -spec getDragRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxSashEvent().
 getDragRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -64,7 +64,7 @@ getDragRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashEvent_GetDragRect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashevent.html#wxsasheventgetdragstatus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashevent.html#wxsasheventgetdragstatus">external documentation</a>.
 %%<br /> Res = ?wxSASH_STATUS_OK | ?wxSASH_STATUS_OUT_OF_RANGE
 -spec getDragStatus(This) -> wx:wx_enum() when
 	This::wxSashEvent().
diff --git a/lib/wx/src/gen/wxSashLayoutWindow.erl b/lib/wx/src/gen/wxSashLayoutWindow.erl
index f833f59479..c7c0c7d1ab 100644
--- a/lib/wx/src/gen/wxSashLayoutWindow.erl
+++ b/lib/wx/src/gen/wxSashLayoutWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html">wxSashLayoutWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html">wxSashLayoutWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxSashWindow}
 %% <br />{@link wxWindow}
@@ -82,7 +82,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSashLayoutWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowwxsashlayoutwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowwxsashlayoutwindow">external documentation</a>.
 -spec new() -> wxSashLayoutWindow().
 new() ->
   wxe_util:construct(?wxSashLayoutWindow_new_0,
@@ -96,7 +96,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowwxsashlayoutwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowwxsashlayoutwindow">external documentation</a>.
 -spec new(Parent, [Option]) -> wxSashLayoutWindow() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -123,7 +123,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxSashLayoutWindow(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -143,7 +143,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSashLayoutWindow_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowgetalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowgetalignment">external documentation</a>.
 %%<br /> Res = ?wxLAYOUT_NONE | ?wxLAYOUT_TOP | ?wxLAYOUT_LEFT | ?wxLAYOUT_RIGHT | ?wxLAYOUT_BOTTOM
 -spec getAlignment(This) -> wx:wx_enum() when
 	This::wxSashLayoutWindow().
@@ -152,7 +152,7 @@ getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashLayoutWindow_GetAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowgetorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowgetorientation">external documentation</a>.
 %%<br /> Res = ?wxLAYOUT_HORIZONTAL | ?wxLAYOUT_VERTICAL
 -spec getOrientation(This) -> wx:wx_enum() when
 	This::wxSashLayoutWindow().
@@ -161,7 +161,7 @@ getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashLayoutWindow_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetalignment">external documentation</a>.
 %%<br /> Align = ?wxLAYOUT_NONE | ?wxLAYOUT_TOP | ?wxLAYOUT_LEFT | ?wxLAYOUT_RIGHT | ?wxLAYOUT_BOTTOM
 -spec setAlignment(This, Align) -> ok when
 	This::wxSashLayoutWindow(), Align::wx:wx_enum().
@@ -171,7 +171,7 @@ setAlignment(#wx_ref{type=ThisT,ref=ThisRef},Align)
   wxe_util:cast(?wxSashLayoutWindow_SetAlignment,
   <<ThisRef:32/?UI,Align:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetdefaultsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetdefaultsize">external documentation</a>.
 -spec setDefaultSize(This, Size) -> ok when
 	This::wxSashLayoutWindow(), Size::{W::integer(), H::integer()}.
 setDefaultSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -180,7 +180,7 @@ setDefaultSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxSashLayoutWindow_SetDefaultSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashlayoutwindow.html#wxsashlayoutwindowsetorientation">external documentation</a>.
 %%<br /> Orient = ?wxLAYOUT_HORIZONTAL | ?wxLAYOUT_VERTICAL
 -spec setOrientation(This, Orient) -> ok when
 	This::wxSashLayoutWindow(), Orient::wx:wx_enum().
diff --git a/lib/wx/src/gen/wxSashWindow.erl b/lib/wx/src/gen/wxSashWindow.erl
index 7d85e05af8..9404d73b6c 100644
--- a/lib/wx/src/gen/wxSashWindow.erl
+++ b/lib/wx/src/gen/wxSashWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html">wxSashWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html">wxSashWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -77,7 +77,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSashWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowwxsashwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowwxsashwindow">external documentation</a>.
 -spec new() -> wxSashWindow().
 new() ->
   wxe_util:construct(?wxSashWindow_new_0,
@@ -91,7 +91,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowwxsashwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowwxsashwindow">external documentation</a>.
 -spec new(Parent, [Option]) -> wxSashWindow() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -110,7 +110,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxSashWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetsashvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowgetsashvisible">external documentation</a>.
 %%<br /> Edge = ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
 -spec getSashVisible(This, Edge) -> boolean() when
 	This::wxSashWindow(), Edge::wx:wx_enum().
@@ -120,7 +120,7 @@ getSashVisible(#wx_ref{type=ThisT,ref=ThisRef},Edge)
   wxe_util:call(?wxSashWindow_GetSashVisible,
   <<ThisRef:32/?UI,Edge:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetmaximumsizex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowgetmaximumsizex">external documentation</a>.
 -spec getMaximumSizeX(This) -> integer() when
 	This::wxSashWindow().
 getMaximumSizeX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -128,7 +128,7 @@ getMaximumSizeX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashWindow_GetMaximumSizeX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetmaximumsizey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowgetmaximumsizey">external documentation</a>.
 -spec getMaximumSizeY(This) -> integer() when
 	This::wxSashWindow().
 getMaximumSizeY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -136,7 +136,7 @@ getMaximumSizeY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashWindow_GetMaximumSizeY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetminimumsizex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowgetminimumsizex">external documentation</a>.
 -spec getMinimumSizeX(This) -> integer() when
 	This::wxSashWindow().
 getMinimumSizeX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -144,7 +144,7 @@ getMinimumSizeX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashWindow_GetMinimumSizeX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowgetminimumsizey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowgetminimumsizey">external documentation</a>.
 -spec getMinimumSizeY(This) -> integer() when
 	This::wxSashWindow().
 getMinimumSizeY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -152,7 +152,7 @@ getMinimumSizeY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSashWindow_GetMinimumSizeY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetmaximumsizex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowsetmaximumsizex">external documentation</a>.
 -spec setMaximumSizeX(This, Max) -> ok when
 	This::wxSashWindow(), Max::integer().
 setMaximumSizeX(#wx_ref{type=ThisT,ref=ThisRef},Max)
@@ -161,7 +161,7 @@ setMaximumSizeX(#wx_ref{type=ThisT,ref=ThisRef},Max)
   wxe_util:cast(?wxSashWindow_SetMaximumSizeX,
   <<ThisRef:32/?UI,Max:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetmaximumsizey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowsetmaximumsizey">external documentation</a>.
 -spec setMaximumSizeY(This, Max) -> ok when
 	This::wxSashWindow(), Max::integer().
 setMaximumSizeY(#wx_ref{type=ThisT,ref=ThisRef},Max)
@@ -170,7 +170,7 @@ setMaximumSizeY(#wx_ref{type=ThisT,ref=ThisRef},Max)
   wxe_util:cast(?wxSashWindow_SetMaximumSizeY,
   <<ThisRef:32/?UI,Max:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetminimumsizex">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowsetminimumsizex">external documentation</a>.
 -spec setMinimumSizeX(This, Min) -> ok when
 	This::wxSashWindow(), Min::integer().
 setMinimumSizeX(#wx_ref{type=ThisT,ref=ThisRef},Min)
@@ -179,7 +179,7 @@ setMinimumSizeX(#wx_ref{type=ThisT,ref=ThisRef},Min)
   wxe_util:cast(?wxSashWindow_SetMinimumSizeX,
   <<ThisRef:32/?UI,Min:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetminimumsizey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowsetminimumsizey">external documentation</a>.
 -spec setMinimumSizeY(This, Min) -> ok when
 	This::wxSashWindow(), Min::integer().
 setMinimumSizeY(#wx_ref{type=ThisT,ref=ThisRef},Min)
@@ -188,7 +188,7 @@ setMinimumSizeY(#wx_ref{type=ThisT,ref=ThisRef},Min)
   wxe_util:cast(?wxSashWindow_SetMinimumSizeY,
   <<ThisRef:32/?UI,Min:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsashwindow.html#wxsashwindowsetsashvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsashwindow.html#wxsashwindowsetsashvisible">external documentation</a>.
 %%<br /> Edge = ?wxSASH_TOP | ?wxSASH_RIGHT | ?wxSASH_BOTTOM | ?wxSASH_LEFT | ?wxSASH_NONE
 -spec setSashVisible(This, Edge, Sash) -> ok when
 	This::wxSashWindow(), Edge::wx:wx_enum(), Sash::boolean().
diff --git a/lib/wx/src/gen/wxScreenDC.erl b/lib/wx/src/gen/wxScreenDC.erl
index f9ab60d389..21ca4bacfc 100644
--- a/lib/wx/src/gen/wxScreenDC.erl
+++ b/lib/wx/src/gen/wxScreenDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscreendc.html">wxScreenDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscreendc.html">wxScreenDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDC}
 %% </p>
@@ -53,12 +53,14 @@
   startPage/1]).
 
 -export_type([wxScreenDC/0]).
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxScreenDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscreendc.html#wxscreendcwxscreendc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscreendc.html#wxscreendcwxscreendc">external documentation</a>.
 -spec new() -> wxScreenDC().
 new() ->
   wxe_util:construct(?wxScreenDC_new,
diff --git a/lib/wx/src/gen/wxScrollBar.erl b/lib/wx/src/gen/wxScrollBar.erl
index 4370bd1635..8907b15ee9 100644
--- a/lib/wx/src/gen/wxScrollBar.erl
+++ b/lib/wx/src/gen/wxScrollBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html">wxScrollBar</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html">wxScrollBar</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -78,7 +78,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxScrollBar() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarwxscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbarwxscrollbar">external documentation</a>.
 -spec new() -> wxScrollBar().
 new() ->
   wxe_util:construct(?wxScrollBar_new_0,
@@ -92,7 +92,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarwxscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbarwxscrollbar">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxScrollBar() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -119,7 +119,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbarcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxScrollBar(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -139,7 +139,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxScrollBar_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbargetrange">external documentation</a>.
 -spec getRange(This) -> integer() when
 	This::wxScrollBar().
 getRange(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -147,7 +147,7 @@ getRange(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrollBar_GetRange,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbargetpagesize">external documentation</a>.
 -spec getPageSize(This) -> integer() when
 	This::wxScrollBar().
 getPageSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -155,7 +155,7 @@ getPageSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrollBar_GetPageSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetthumbposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbargetthumbposition">external documentation</a>.
 -spec getThumbPosition(This) -> integer() when
 	This::wxScrollBar().
 getThumbPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -163,7 +163,7 @@ getThumbPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrollBar_GetThumbPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbargetthumbsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbargetthumbsize">external documentation</a>.
 -spec getThumbSize(This) -> integer() when
 	This::wxScrollBar().
 getThumbSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -171,7 +171,7 @@ getThumbSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrollBar_GetThumbSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarsetthumbposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbarsetthumbposition">external documentation</a>.
 -spec setThumbPosition(This, ViewStart) -> ok when
 	This::wxScrollBar(), ViewStart::integer().
 setThumbPosition(#wx_ref{type=ThisT,ref=ThisRef},ViewStart)
@@ -188,7 +188,7 @@ setScrollbar(This,Position,ThumbSize,Range,PageSize)
  when is_record(This, wx_ref),is_integer(Position),is_integer(ThumbSize),is_integer(Range),is_integer(PageSize) ->
   setScrollbar(This,Position,ThumbSize,Range,PageSize, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollbar.html#wxscrollbarsetscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollbar.html#wxscrollbarsetscrollbar">external documentation</a>.
 -spec setScrollbar(This, Position, ThumbSize, Range, PageSize, [Option]) -> ok when
 	This::wxScrollBar(), Position::integer(), ThumbSize::integer(), Range::integer(), PageSize::integer(),
 	Option :: {refresh, boolean()}.
diff --git a/lib/wx/src/gen/wxScrollEvent.erl b/lib/wx/src/gen/wxScrollEvent.erl
index 6939859d92..a2a8a59caa 100644
--- a/lib/wx/src/gen/wxScrollEvent.erl
+++ b/lib/wx/src/gen/wxScrollEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollevent.html">wxScrollEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollevent.html">wxScrollEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>scroll_top</em>, <em>scroll_bottom</em>, <em>scroll_lineup</em>, <em>scroll_linedown</em>, <em>scroll_pageup</em>, <em>scroll_pagedown</em>, <em>scroll_thumbtrack</em>, <em>scroll_thumbrelease</em>, <em>scroll_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxScroll(). #wxScroll{}} event record type.
@@ -47,7 +47,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxScrollEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollevent.html#wxscrolleventgetorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollevent.html#wxscrolleventgetorientation">external documentation</a>.
 -spec getOrientation(This) -> integer() when
 	This::wxScrollEvent().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -55,7 +55,7 @@ getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrollEvent_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollevent.html#wxscrolleventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollevent.html#wxscrolleventgetposition">external documentation</a>.
 -spec getPosition(This) -> integer() when
 	This::wxScrollEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxScrollWinEvent.erl b/lib/wx/src/gen/wxScrollWinEvent.erl
index c899d37dff..eb8d191b5f 100644
--- a/lib/wx/src/gen/wxScrollWinEvent.erl
+++ b/lib/wx/src/gen/wxScrollWinEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollwinevent.html">wxScrollWinEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollwinevent.html">wxScrollWinEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>scrollwin_top</em>, <em>scrollwin_bottom</em>, <em>scrollwin_lineup</em>, <em>scrollwin_linedown</em>, <em>scrollwin_pageup</em>, <em>scrollwin_pagedown</em>, <em>scrollwin_thumbtrack</em>, <em>scrollwin_thumbrelease</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxScrollWin(). #wxScrollWin{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxScrollWinEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollwinevent.html#wxscrollwineventgetorientation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollwinevent.html#wxscrollwineventgetorientation">external documentation</a>.
 -spec getOrientation(This) -> integer() when
 	This::wxScrollWinEvent().
 getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -51,7 +51,7 @@ getOrientation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrollWinEvent_GetOrientation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrollwinevent.html#wxscrollwineventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrollwinevent.html#wxscrollwineventgetposition">external documentation</a>.
 -spec getPosition(This) -> integer() when
 	This::wxScrollWinEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxScrolledWindow.erl b/lib/wx/src/gen/wxScrolledWindow.erl
index 9141487a8c..e154643d05 100644
--- a/lib/wx/src/gen/wxScrolledWindow.erl
+++ b/lib/wx/src/gen/wxScrolledWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html">wxScrolledWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html">wxScrolledWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxPanel}
 %% <br />{@link wxWindow}
@@ -60,8 +60,8 @@
   screenToClient/2,scrollLines/2,scrollPages/2,scrollWindow/3,scrollWindow/4,
   setAcceleratorTable/2,setAutoLayout/2,setBackgroundColour/2,setBackgroundStyle/2,
   setCaret/2,setClientSize/2,setClientSize/3,setContainingSizer/2,setCursor/2,
-  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFont/2,
-  setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
+  setDropTarget/2,setExtraStyle/2,setFocus/1,setFocusFromKbd/1,setFocusIgnoringChildren/1,
+  setFont/2,setForegroundColour/2,setHelpText/2,setId/2,setLabel/2,setMaxSize/2,
   setMinSize/2,setName/2,setOwnBackgroundColour/2,setOwnFont/2,setOwnForegroundColour/2,
   setPalette/2,setScrollPos/3,setScrollPos/4,setScrollbar/5,setScrollbar/6,
   setSize/2,setSize/3,setSize/5,setSize/6,setSizeHints/2,setSizeHints/3,
@@ -80,7 +80,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxScrolledWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowwxscrolledwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowwxscrolledwindow">external documentation</a>.
 -spec new() -> wxScrolledWindow().
 new() ->
   wxe_util:construct(?wxScrolledWindow_new_0,
@@ -94,7 +94,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowwxscrolledwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowwxscrolledwindow">external documentation</a>.
 -spec new(Parent, [Option]) -> wxScrolledWindow() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {winid, integer()}
@@ -113,7 +113,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef}, Options)
   wxe_util:construct(?wxScrolledWindow_new_2,
   <<ParentRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcscrolledposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowcalcscrolledposition">external documentation</a>.
 -spec calcScrolledPosition(This, Pt) -> {X::integer(), Y::integer()} when
 	This::wxScrolledWindow(), Pt::{X::integer(), Y::integer()}.
 calcScrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -122,7 +122,7 @@ calcScrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxScrolledWindow_CalcScrolledPosition_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcscrolledposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowcalcscrolledposition">external documentation</a>.
 -spec calcScrolledPosition(This, X, Y) -> {Xx::integer(), Yy::integer()} when
 	This::wxScrolledWindow(), X::integer(), Y::integer().
 calcScrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -131,7 +131,7 @@ calcScrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxScrolledWindow_CalcScrolledPosition_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcunscrolledposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowcalcunscrolledposition">external documentation</a>.
 -spec calcUnscrolledPosition(This, Pt) -> {X::integer(), Y::integer()} when
 	This::wxScrolledWindow(), Pt::{X::integer(), Y::integer()}.
 calcUnscrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -140,7 +140,7 @@ calcUnscrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxScrolledWindow_CalcUnscrolledPosition_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowcalcunscrolledposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowcalcunscrolledposition">external documentation</a>.
 -spec calcUnscrolledPosition(This, X, Y) -> {Xx::integer(), Yy::integer()} when
 	This::wxScrolledWindow(), X::integer(), Y::integer().
 calcUnscrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -149,7 +149,7 @@ calcUnscrolledPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxScrolledWindow_CalcUnscrolledPosition_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowenablescrolling">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowenablescrolling">external documentation</a>.
 -spec enableScrolling(This, X_scrolling, Y_scrolling) -> ok when
 	This::wxScrolledWindow(), X_scrolling::boolean(), Y_scrolling::boolean().
 enableScrolling(#wx_ref{type=ThisT,ref=ThisRef},X_scrolling,Y_scrolling)
@@ -158,7 +158,7 @@ enableScrolling(#wx_ref{type=ThisT,ref=ThisRef},X_scrolling,Y_scrolling)
   wxe_util:cast(?wxScrolledWindow_EnableScrolling,
   <<ThisRef:32/?UI,(wxe_util:from_bool(X_scrolling)):32/?UI,(wxe_util:from_bool(Y_scrolling)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowgetscrollpixelsperunit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowgetscrollpixelsperunit">external documentation</a>.
 -spec getScrollPixelsPerUnit(This) -> {PixelsPerUnitX::integer(), PixelsPerUnitY::integer()} when
 	This::wxScrolledWindow().
 getScrollPixelsPerUnit(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -166,7 +166,7 @@ getScrollPixelsPerUnit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrolledWindow_GetScrollPixelsPerUnit,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowgetviewstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowgetviewstart">external documentation</a>.
 -spec getViewStart(This) -> {X::integer(), Y::integer()} when
 	This::wxScrolledWindow().
 getViewStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -174,7 +174,7 @@ getViewStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxScrolledWindow_GetViewStart,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowdopreparedc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowdopreparedc">external documentation</a>.
 -spec doPrepareDC(This, Dc) -> ok when
 	This::wxScrolledWindow(), Dc::wxDC:wxDC().
 doPrepareDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
@@ -183,7 +183,7 @@ doPrepareDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:cast(?wxScrolledWindow_DoPrepareDC,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowpreparedc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowpreparedc">external documentation</a>.
 -spec prepareDC(This, Dc) -> ok when
 	This::wxScrolledWindow(), Dc::wxDC:wxDC().
 prepareDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
@@ -192,7 +192,7 @@ prepareDC(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DcT,ref=DcRef}) ->
   wxe_util:cast(?wxScrolledWindow_PrepareDC,
   <<ThisRef:32/?UI,DcRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowscroll">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowscroll">external documentation</a>.
 -spec scroll(This, X, Y) -> ok when
 	This::wxScrolledWindow(), X::integer(), Y::integer().
 scroll(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -209,7 +209,7 @@ setScrollbars(This,PixelsPerUnitX,PixelsPerUnitY,NoUnitsX,NoUnitsY)
  when is_record(This, wx_ref),is_integer(PixelsPerUnitX),is_integer(PixelsPerUnitY),is_integer(NoUnitsX),is_integer(NoUnitsY) ->
   setScrollbars(This,PixelsPerUnitX,PixelsPerUnitY,NoUnitsX,NoUnitsY, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowsetscrollbars">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowsetscrollbars">external documentation</a>.
 -spec setScrollbars(This, PixelsPerUnitX, PixelsPerUnitY, NoUnitsX, NoUnitsY, [Option]) -> ok when
 	This::wxScrolledWindow(), PixelsPerUnitX::integer(), PixelsPerUnitY::integer(), NoUnitsX::integer(), NoUnitsY::integer(),
 	Option :: {xPos, integer()}
@@ -226,7 +226,7 @@ setScrollbars(#wx_ref{type=ThisT,ref=ThisRef},PixelsPerUnitX,PixelsPerUnitY,NoUn
   wxe_util:cast(?wxScrolledWindow_SetScrollbars,
   <<ThisRef:32/?UI,PixelsPerUnitX:32/?UI,PixelsPerUnitY:32/?UI,NoUnitsX:32/?UI,NoUnitsY:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowsetscrollrate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowsetscrollrate">external documentation</a>.
 -spec setScrollRate(This, Xstep, Ystep) -> ok when
 	This::wxScrolledWindow(), Xstep::integer(), Ystep::integer().
 setScrollRate(#wx_ref{type=ThisT,ref=ThisRef},Xstep,Ystep)
@@ -235,7 +235,7 @@ setScrollRate(#wx_ref{type=ThisT,ref=ThisRef},Xstep,Ystep)
   wxe_util:cast(?wxScrolledWindow_SetScrollRate,
   <<ThisRef:32/?UI,Xstep:32/?UI,Ystep:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxscrolledwindow.html#wxscrolledwindowsettargetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxscrolledwindow.html#wxscrolledwindowsettargetwindow">external documentation</a>.
 -spec setTargetWindow(This, Target) -> ok when
 	This::wxScrolledWindow(), Target::wxWindow:wxWindow().
 setTargetWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TargetT,ref=TargetRef}) ->
@@ -252,6 +252,8 @@ destroy(Obj=#wx_ref{type=Type}) ->
   ok.
  %% From wxPanel
 %% @hidden
+setFocusIgnoringChildren(This) -> wxPanel:setFocusIgnoringChildren(This).
+%% @hidden
 initDialog(This) -> wxPanel:initDialog(This).
  %% From wxWindow
 %% @hidden
diff --git a/lib/wx/src/gen/wxSetCursorEvent.erl b/lib/wx/src/gen/wxSetCursorEvent.erl
index 23ff963001..389966af82 100644
--- a/lib/wx/src/gen/wxSetCursorEvent.erl
+++ b/lib/wx/src/gen/wxSetCursorEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html">wxSetCursorEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsetcursorevent.html">wxSetCursorEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>set_cursor</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxSetCursor(). #wxSetCursor{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSetCursorEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventgetcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsetcursorevent.html#wxsetcursoreventgetcursor">external documentation</a>.
 -spec getCursor(This) -> wxCursor:wxCursor() when
 	This::wxSetCursorEvent().
 getCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -51,7 +51,7 @@ getCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSetCursorEvent_GetCursor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventgetx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsetcursorevent.html#wxsetcursoreventgetx">external documentation</a>.
 -spec getX(This) -> integer() when
 	This::wxSetCursorEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSetCursorEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventgety">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsetcursorevent.html#wxsetcursoreventgety">external documentation</a>.
 -spec getY(This) -> integer() when
 	This::wxSetCursorEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -67,7 +67,7 @@ getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSetCursorEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventhascursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsetcursorevent.html#wxsetcursoreventhascursor">external documentation</a>.
 -spec hasCursor(This) -> boolean() when
 	This::wxSetCursorEvent().
 hasCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -75,7 +75,7 @@ hasCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSetCursorEvent_HasCursor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsetcursorevent.html#wxsetcursoreventsetcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsetcursorevent.html#wxsetcursoreventsetcursor">external documentation</a>.
 -spec setCursor(This, Cursor) -> ok when
 	This::wxSetCursorEvent(), Cursor::wxCursor:wxCursor().
 setCursor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CursorT,ref=CursorRef}) ->
diff --git a/lib/wx/src/gen/wxShowEvent.erl b/lib/wx/src/gen/wxShowEvent.erl
index ffafa0978f..f476f476f7 100644
--- a/lib/wx/src/gen/wxShowEvent.erl
+++ b/lib/wx/src/gen/wxShowEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxshowevent.html">wxShowEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxshowevent.html">wxShowEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>show</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxShow(). #wxShow{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxShowEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxshowevent.html#wxshoweventsetshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxshowevent.html#wxshoweventsetshow">external documentation</a>.
 -spec setShow(This, Show) -> ok when
 	This::wxShowEvent(), Show::boolean().
 setShow(#wx_ref{type=ThisT,ref=ThisRef},Show)
@@ -52,7 +52,7 @@ setShow(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxShowEvent_SetShow,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxshowevent.html#wxshoweventgetshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxshowevent.html#wxshoweventgetshow">external documentation</a>.
 -spec getShow(This) -> boolean() when
 	This::wxShowEvent().
 getShow(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxSingleChoiceDialog.erl b/lib/wx/src/gen/wxSingleChoiceDialog.erl
index db6b41ae75..79969f92a6 100644
--- a/lib/wx/src/gen/wxSingleChoiceDialog.erl
+++ b/lib/wx/src/gen/wxSingleChoiceDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html">wxSingleChoiceDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsinglechoicedialog.html">wxSingleChoiceDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -86,7 +86,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSingleChoiceDialog() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialogwxsinglechoicedialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsinglechoicedialog.html#wxsinglechoicedialogwxsinglechoicedialog">external documentation</a>.
 -spec new() -> wxSingleChoiceDialog().
 new() ->
   wxe_util:construct(?wxSingleChoiceDialog_new_0,
@@ -100,7 +100,7 @@ new(Parent,Message,Caption,Choices)
  when is_record(Parent, wx_ref),is_list(Message),is_list(Caption),is_list(Choices) ->
   new(Parent,Message,Caption,Choices, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialogwxsinglechoicedialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsinglechoicedialog.html#wxsinglechoicedialogwxsinglechoicedialog">external documentation</a>.
 -spec new(Parent, Message, Caption, Choices, [Option]) -> wxSingleChoiceDialog() when
 	Parent::wxWindow:wxWindow(), Message::unicode:chardata(), Caption::unicode:chardata(), Choices::[unicode:chardata()],
 	Option :: {style, integer()}
@@ -119,7 +119,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message,Caption,Choices, Options)
   wxe_util:construct(?wxSingleChoiceDialog_new_5,
   <<ParentRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Caption_UC)):32/?UI,(Caption_UC)/binary, 0:(((8- ((4+byte_size(Caption_UC)) band 16#7)) band 16#7))/unit:8,(length(Choices_UCA)):32/?UI, (<< <<(byte_size(UC_Str)):32/?UI, UC_Str/binary>>|| UC_Str <- Choices_UCA>>)/binary, 0:(((8- ((4 + lists:sum([byte_size(S)+4||S<-Choices_UCA])) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialoggetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsinglechoicedialog.html#wxsinglechoicedialoggetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxSingleChoiceDialog().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -127,7 +127,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSingleChoiceDialog_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialoggetstringselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsinglechoicedialog.html#wxsinglechoicedialoggetstringselection">external documentation</a>.
 -spec getStringSelection(This) -> unicode:charlist() when
 	This::wxSingleChoiceDialog().
 getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -135,7 +135,7 @@ getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSingleChoiceDialog_GetStringSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsinglechoicedialog.html#wxsinglechoicedialogsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsinglechoicedialog.html#wxsinglechoicedialogsetselection">external documentation</a>.
 -spec setSelection(This, Sel) -> ok when
 	This::wxSingleChoiceDialog(), Sel::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},Sel)
diff --git a/lib/wx/src/gen/wxSizeEvent.erl b/lib/wx/src/gen/wxSizeEvent.erl
index c51e48bc59..5ecd021f29 100644
--- a/lib/wx/src/gen/wxSizeEvent.erl
+++ b/lib/wx/src/gen/wxSizeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeevent.html">wxSizeEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeevent.html">wxSizeEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>size</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxSize(). #wxSize{}} event record type.
@@ -43,7 +43,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSizeEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeevent.html#wxsizeeventgetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeevent.html#wxsizeeventgetsize">external documentation</a>.
 -spec getSize(This) -> {W::integer(), H::integer()} when
 	This::wxSizeEvent().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxSizer.erl b/lib/wx/src/gen/wxSizer.erl
index 7edc01aa2a..bc89350f6e 100644
--- a/lib/wx/src/gen/wxSizer.erl
+++ b/lib/wx/src/gen/wxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html">wxSizer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html">wxSizer</a>.
 %% @type wxSizer().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -49,7 +49,7 @@ add(This,Window)
  when is_record(This, wx_ref),is_record(Window, wx_ref) ->
   add(This,Window, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeradd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizeradd">external documentation</a>.
 %% <br /> Also:<br />
 %% add(This, Window, [Option]) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),<br />
@@ -104,7 +104,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeradd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizeradd">external documentation</a>.
 -spec add(This, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Width::integer(), Height::integer(),
 	Option :: {proportion, integer()}
@@ -123,7 +123,7 @@ add(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxSizer_Add_3,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeraddspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizeraddspacer">external documentation</a>.
 -spec addSpacer(This, Size) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Size::integer().
 addSpacer(#wx_ref{type=ThisT,ref=ThisRef},Size)
@@ -140,7 +140,7 @@ addStretchSpacer(This)
  when is_record(This, wx_ref) ->
   addStretchSpacer(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizeraddstretchspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizeraddstretchspacer">external documentation</a>.
 -spec addStretchSpacer(This, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(),
 	Option :: {prop, integer()}.
@@ -153,7 +153,7 @@ addStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSizer_AddStretchSpacer,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizercalcmin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizercalcmin">external documentation</a>.
 -spec calcMin(This) -> {W::integer(), H::integer()} when
 	This::wxSizer().
 calcMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -169,7 +169,7 @@ clear(This)
  when is_record(This, wx_ref) ->
   clear(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerclear">external documentation</a>.
 -spec clear(This, [Option]) -> ok when
 	This::wxSizer(),
 	Option :: {delete_windows, boolean()}.
@@ -182,7 +182,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxSizer_Clear,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerdetach">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerdetach">external documentation</a>.
 %% <br /> Also:<br />
 %% detach(This, Window) -> boolean() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer().<br />
@@ -207,7 +207,7 @@ detach(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerfit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerfit">external documentation</a>.
 -spec fit(This, Window) -> {W::integer(), H::integer()} when
 	This::wxSizer(), Window::wxWindow:wxWindow().
 fit(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -216,7 +216,7 @@ fit(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(?wxSizer_Fit,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerfitinside">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerfitinside">external documentation</a>.
 -spec fitInside(This, Window) -> ok when
 	This::wxSizer(), Window::wxWindow:wxWindow().
 fitInside(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -225,7 +225,7 @@ fitInside(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) -
   wxe_util:cast(?wxSizer_FitInside,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetchildren">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizergetchildren">external documentation</a>.
 -spec getChildren(This) -> [wxSizerItem:wxSizerItem()] when
 	This::wxSizer().
 getChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -233,7 +233,7 @@ getChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizer_GetChildren,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizergetitem">external documentation</a>.
 %% <br /> Also:<br />
 %% getItem(This, Index) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxSizer(), Index::integer().<br />
@@ -252,7 +252,7 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxSizer_GetItem_1,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizergetitem">external documentation</a>.
 -spec getItem(This, Window, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),
 	Option :: {recursive, boolean()}.
@@ -271,7 +271,7 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Opt
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizergetsize">external documentation</a>.
 -spec getSize(This) -> {W::integer(), H::integer()} when
 	This::wxSizer().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -279,7 +279,7 @@ getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizer_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizergetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxSizer().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -287,7 +287,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizer_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizergetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizergetminsize">external documentation</a>.
 -spec getMinSize(This) -> {W::integer(), H::integer()} when
 	This::wxSizer().
 getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -295,7 +295,7 @@ getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizer_GetMinSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerhide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerhide">external documentation</a>.
 %% <br /> Also:<br />
 %% hide(This, Index) -> boolean() when<br />
 %% 	This::wxSizer(), Index::integer().<br />
@@ -314,7 +314,7 @@ hide(#wx_ref{type=ThisT,ref=ThisRef},Index)
   wxe_util:call(?wxSizer_Hide_1,
   <<ThisRef:32/?UI,Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerhide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerhide">external documentation</a>.
 -spec hide(This, Window, [Option]) -> boolean() when
 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),
 	Option :: {recursive, boolean()}.
@@ -333,7 +333,7 @@ hide(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}, Option
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
 -spec insert(This, Index, Item) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Index::integer(), Item::wxSizerItem:wxSizerItem().
 insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=ItemT,ref=ItemRef})
@@ -343,7 +343,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=ItemT,ref=ItemRef})
   wxe_util:call(?wxSizer_Insert_2,
   <<ThisRef:32/?UI,Index:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
 %% <br /> Also:<br />
 %% insert(This, Index, Window, [Option]) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxSizer(), Index::integer(), Window::wxWindow:wxWindow() | wxSizer(),<br />
@@ -399,7 +399,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=WindowT,ref=WindowRef}
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,Index:32/?UI,WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerinsert">external documentation</a>.
 -spec insert(This, Index, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Index::integer(), Width::integer(), Height::integer(),
 	Option :: {proportion, integer()}
@@ -418,7 +418,7 @@ insert(#wx_ref{type=ThisT,ref=ThisRef},Index,Width,Height, Options)
   wxe_util:call(?wxSizer_Insert_4,
   <<ThisRef:32/?UI,Index:32/?UI,Width:32/?UI,Height:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsertspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerinsertspacer">external documentation</a>.
 -spec insertSpacer(This, Index, Size) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Index::integer(), Size::integer().
 insertSpacer(#wx_ref{type=ThisT,ref=ThisRef},Index,Size)
@@ -435,7 +435,7 @@ insertStretchSpacer(This,Index)
  when is_record(This, wx_ref),is_integer(Index) ->
   insertStretchSpacer(This,Index, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerinsertstretchspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerinsertstretchspacer">external documentation</a>.
 -spec insertStretchSpacer(This, Index, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Index::integer(),
 	Option :: {prop, integer()}.
@@ -448,7 +448,7 @@ insertStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef},Index, Options)
   wxe_util:call(?wxSizer_InsertStretchSpacer,
   <<ThisRef:32/?UI,Index:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerisshown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerisshown">external documentation</a>.
 %% <br /> Also:<br />
 %% isShown(This, Window) -> boolean() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer().<br />
@@ -473,7 +473,7 @@ isShown(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerlayout">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerlayout">external documentation</a>.
 -spec layout(This) -> ok when
 	This::wxSizer().
 layout(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -481,7 +481,7 @@ layout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxSizer_Layout,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
 -spec prepend(This, Item) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Item::wxSizerItem:wxSizerItem().
 prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
@@ -490,7 +490,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ItemT,ref=ItemRef}) ->
   wxe_util:call(?wxSizer_Prepend_1,
   <<ThisRef:32/?UI,ItemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
 %% <br /> Also:<br />
 %% prepend(This, Window, [Option]) -> wxSizerItem:wxSizerItem() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),<br />
@@ -545,7 +545,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef},#wx_
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerprepend">external documentation</a>.
 -spec prepend(This, Width, Height, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Width::integer(), Height::integer(),
 	Option :: {proportion, integer()}
@@ -564,7 +564,7 @@ prepend(#wx_ref{type=ThisT,ref=ThisRef},Width,Height, Options)
   wxe_util:call(?wxSizer_Prepend_3,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprependspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerprependspacer">external documentation</a>.
 -spec prependSpacer(This, Size) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(), Size::integer().
 prependSpacer(#wx_ref{type=ThisT,ref=ThisRef},Size)
@@ -581,7 +581,7 @@ prependStretchSpacer(This)
  when is_record(This, wx_ref) ->
   prependStretchSpacer(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerprependstretchspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerprependstretchspacer">external documentation</a>.
 -spec prependStretchSpacer(This, [Option]) -> wxSizerItem:wxSizerItem() when
 	This::wxSizer(),
 	Option :: {prop, integer()}.
@@ -594,7 +594,7 @@ prependStretchSpacer(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSizer_PrependStretchSpacer,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerrecalcsizes">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerrecalcsizes">external documentation</a>.
 -spec recalcSizes(This) -> ok when
 	This::wxSizer().
 recalcSizes(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -602,7 +602,7 @@ recalcSizes(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxSizer_RecalcSizes,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerremove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerremove">external documentation</a>.
 %% <br /> Also:<br />
 %% remove(This, Sizer) -> boolean() when<br />
 %% 	This::wxSizer(), Sizer::wxSizer().<br />
@@ -622,7 +622,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}) ->
   wxe_util:call(?wxSizer_Remove_1_1,
   <<ThisRef:32/?UI,SizerRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerreplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerreplace">external documentation</a>.
 %% <br /> Also:<br />
 %% replace(This, Index, Newitem) -> boolean() when<br />
 %% 	This::wxSizer(), Index::integer(), Newitem::wxSizerItem:wxSizerItem().<br />
@@ -642,7 +642,7 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},Index,#wx_ref{type=NewitemT,ref=NewitemR
   wxe_util:call(?wxSizer_Replace_2,
   <<ThisRef:32/?UI,Index:32/?UI,NewitemRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizerreplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizerreplace">external documentation</a>.
 -spec replace(This, Oldwin, Newwin, [Option]) -> boolean() when
 	This::wxSizer(), Oldwin::wxWindow:wxWindow() | wxSizer(), Newwin::wxWindow:wxWindow() | wxSizer(),
 	Option :: {recursive, boolean()}.
@@ -663,7 +663,7 @@ replace(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=OldwinT,ref=OldwinRef},#wx_
   wxe_util:call(OldwinOP,
   <<ThisRef:32/?UI,OldwinRef:32/?UI,NewwinRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetdimension">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizersetdimension">external documentation</a>.
 -spec setDimension(This, X, Y, Width, Height) -> ok when
 	This::wxSizer(), X::integer(), Y::integer(), Width::integer(), Height::integer().
 setDimension(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Width,Height)
@@ -672,7 +672,7 @@ setDimension(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Width,Height)
   wxe_util:cast(?wxSizer_SetDimension,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizersetminsize">external documentation</a>.
 -spec setMinSize(This, Size) -> ok when
 	This::wxSizer(), Size::{W::integer(), H::integer()}.
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -681,7 +681,7 @@ setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxSizer_SetMinSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizersetminsize">external documentation</a>.
 -spec setMinSize(This, Width, Height) -> ok when
 	This::wxSizer(), Width::integer(), Height::integer().
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
@@ -690,7 +690,7 @@ setMinSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
   wxe_util:cast(?wxSizer_SetMinSize_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetitemminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizersetitemminsize">external documentation</a>.
 %% <br /> Also:<br />
 %% setItemMinSize(This, Window, Size) -> boolean() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Size::{W::integer(), H::integer()}.<br />
@@ -716,7 +716,7 @@ setItemMinSize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRe
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetitemminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizersetitemminsize">external documentation</a>.
 %% <br /> Also:<br />
 %% setItemMinSize(This, Window, Width, Height) -> boolean() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(), Width::integer(), Height::integer().<br />
@@ -742,7 +742,7 @@ setItemMinSize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRe
   wxe_util:call(WindowOP,
   <<ThisRef:32/?UI,WindowRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetsizehints">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizersetsizehints">external documentation</a>.
 -spec setSizeHints(This, Window) -> ok when
 	This::wxSizer(), Window::wxWindow:wxWindow().
 setSizeHints(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -751,7 +751,7 @@ setSizeHints(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}
   wxe_util:cast(?wxSizer_SetSizeHints,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizersetvirtualsizehints">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizersetvirtualsizehints">external documentation</a>.
 -spec setVirtualSizeHints(This, Window) -> ok when
 	This::wxSizer(), Window::wxWindow:wxWindow().
 setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -760,7 +760,7 @@ setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=Win
   wxe_util:cast(?wxSizer_SetVirtualSizeHints,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizershow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizershow">external documentation</a>.
 %% <br /> Also:<br />
 %% show(This, Window) -> boolean() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer();<br />
@@ -787,7 +787,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxSizer_Show_1,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizer.html#wxsizershow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizer.html#wxsizershow">external documentation</a>.
 %% <br /> Also:<br />
 %% show(This, Window, [Option]) -> boolean() when<br />
 %% 	This::wxSizer(), Window::wxWindow:wxWindow() | wxSizer(),<br />
diff --git a/lib/wx/src/gen/wxSizerFlags.erl b/lib/wx/src/gen/wxSizerFlags.erl
index 08d36d1a80..e6aaa18b8a 100644
--- a/lib/wx/src/gen/wxSizerFlags.erl
+++ b/lib/wx/src/gen/wxSizerFlags.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html">wxSizerFlags</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html">wxSizerFlags</a>.
 %% @type wxSizerFlags().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -41,7 +41,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagswxsizerflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagswxsizerflags">external documentation</a>.
 -spec new([Option]) -> wxSizerFlags() when
 	Option :: {proportion, integer()}.
 new(Options)
@@ -52,7 +52,7 @@ new(Options)
   wxe_util:construct(?wxSizerFlags_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsalign">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagsalign">external documentation</a>.
 -spec align(This, Alignment) -> wxSizerFlags() when
 	This::wxSizerFlags(), Alignment::integer().
 align(#wx_ref{type=ThisT,ref=ThisRef},Alignment)
@@ -69,7 +69,7 @@ border(This)
  when is_record(This, wx_ref) ->
   border(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagsborder">external documentation</a>.
 -spec border(This, [Option]) -> wxSizerFlags() when
 	This::wxSizerFlags(),
 	Option :: {direction, integer()}.
@@ -82,7 +82,7 @@ border(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSizerFlags_Border_1,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagsborder">external documentation</a>.
 -spec border(This, Direction, BorderInPixels) -> wxSizerFlags() when
 	This::wxSizerFlags(), Direction::integer(), BorderInPixels::integer().
 border(#wx_ref{type=ThisT,ref=ThisRef},Direction,BorderInPixels)
@@ -91,7 +91,7 @@ border(#wx_ref{type=ThisT,ref=ThisRef},Direction,BorderInPixels)
   wxe_util:call(?wxSizerFlags_Border_2,
   <<ThisRef:32/?UI,Direction:32/?UI,BorderInPixels:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagscenter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagscenter">external documentation</a>.
 -spec center(This) -> wxSizerFlags() when
 	This::wxSizerFlags().
 center(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -99,7 +99,7 @@ center(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerFlags_Center,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagscentre">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagscentre">external documentation</a>.
 -spec centre(This) -> wxSizerFlags() when
 	This::wxSizerFlags().
 centre(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -107,7 +107,7 @@ centre(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerFlags_Centre,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsexpand">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagsexpand">external documentation</a>.
 -spec expand(This) -> wxSizerFlags() when
 	This::wxSizerFlags().
 expand(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -115,7 +115,7 @@ expand(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerFlags_Expand,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagsleft">external documentation</a>.
 -spec left(This) -> wxSizerFlags() when
 	This::wxSizerFlags().
 left(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -123,7 +123,7 @@ left(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerFlags_Left,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsproportion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagsproportion">external documentation</a>.
 -spec proportion(This, Proportion) -> wxSizerFlags() when
 	This::wxSizerFlags(), Proportion::integer().
 proportion(#wx_ref{type=ThisT,ref=ThisRef},Proportion)
@@ -132,7 +132,7 @@ proportion(#wx_ref{type=ThisT,ref=ThisRef},Proportion)
   wxe_util:call(?wxSizerFlags_Proportion,
   <<ThisRef:32/?UI,Proportion:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizerflags.html#wxsizerflagsright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizerflags.html#wxsizerflagsright">external documentation</a>.
 -spec right(This) -> wxSizerFlags() when
 	This::wxSizerFlags().
 right(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxSizerItem.erl b/lib/wx/src/gen/wxSizerItem.erl
index 62655864d1..4711caff11 100644
--- a/lib/wx/src/gen/wxSizerItem.erl
+++ b/lib/wx/src/gen/wxSizerItem.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html">wxSizerItem</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html">wxSizerItem</a>.
 %% @type wxSizerItem().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -40,13 +40,13 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSizerItem() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
 -spec new() -> wxSizerItem().
 new() ->
   wxe_util:construct(?wxSizerItem_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
 -spec new(Window, Flags) -> wxSizerItem() when
 	Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Flags::wxSizerFlags:wxSizerFlags().
 new(#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=FlagsT,ref=FlagsRef}) ->
@@ -61,7 +61,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},#wx_ref{type=FlagsT,ref=FlagsRef}) ->
   wxe_util:construct(WindowOP,
   <<WindowRef:32/?UI,FlagsRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
 -spec new(Width, Height, Flags) -> wxSizerItem() when
 	Width::integer(), Height::integer(), Flags::wxSizerFlags:wxSizerFlags().
 new(Width,Height,#wx_ref{type=FlagsT,ref=FlagsRef})
@@ -70,7 +70,7 @@ new(Width,Height,#wx_ref{type=FlagsT,ref=FlagsRef})
   wxe_util:construct(?wxSizerItem_new_3,
   <<Width:32/?UI,Height:32/?UI,FlagsRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
 -spec new(Window, Proportion, Flag, Border, UserData) -> wxSizerItem() when
 	Window::wxWindow:wxWindow() | wxSizer:wxSizer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx_object().
 new(#wx_ref{type=WindowT,ref=WindowRef},Proportion,Flag,Border,#wx_ref{type=UserDataT,ref=UserDataRef})
@@ -86,7 +86,7 @@ new(#wx_ref{type=WindowT,ref=WindowRef},Proportion,Flag,Border,#wx_ref{type=User
   wxe_util:construct(WindowOP,
   <<WindowRef:32/?UI,Proportion:32/?UI,Flag:32/?UI,Border:32/?UI,UserDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemwxsizeritem">external documentation</a>.
 -spec new(Width, Height, Proportion, Flag, Border, UserData) -> wxSizerItem() when
 	Width::integer(), Height::integer(), Proportion::integer(), Flag::integer(), Border::integer(), UserData::wx:wx_object().
 new(Width,Height,Proportion,Flag,Border,#wx_ref{type=UserDataT,ref=UserDataRef})
@@ -95,7 +95,7 @@ new(Width,Height,Proportion,Flag,Border,#wx_ref{type=UserDataT,ref=UserDataRef})
   wxe_util:construct(?wxSizerItem_new_6,
   <<Width:32/?UI,Height:32/?UI,Proportion:32/?UI,Flag:32/?UI,Border:32/?UI,UserDataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemcalcmin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemcalcmin">external documentation</a>.
 -spec calcMin(This) -> {W::integer(), H::integer()} when
 	This::wxSizerItem().
 calcMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -103,7 +103,7 @@ calcMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_CalcMin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemdeletewindows">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemdeletewindows">external documentation</a>.
 -spec deleteWindows(This) -> ok when
 	This::wxSizerItem().
 deleteWindows(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -111,7 +111,7 @@ deleteWindows(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxSizerItem_DeleteWindows,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemdetachsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemdetachsizer">external documentation</a>.
 -spec detachSizer(This) -> ok when
 	This::wxSizerItem().
 detachSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -119,7 +119,7 @@ detachSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxSizerItem_DetachSizer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetborder">external documentation</a>.
 -spec getBorder(This) -> integer() when
 	This::wxSizerItem().
 getBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -127,7 +127,7 @@ getBorder(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetBorder,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetflag">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetflag">external documentation</a>.
 -spec getFlag(This) -> integer() when
 	This::wxSizerItem().
 getFlag(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -135,7 +135,7 @@ getFlag(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetFlag,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetminsize">external documentation</a>.
 -spec getMinSize(This) -> {W::integer(), H::integer()} when
 	This::wxSizerItem().
 getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -143,7 +143,7 @@ getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetMinSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxSizerItem().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -151,7 +151,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetproportion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetproportion">external documentation</a>.
 -spec getProportion(This) -> integer() when
 	This::wxSizerItem().
 getProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -159,7 +159,7 @@ getProportion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetProportion,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetratio">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetratio">external documentation</a>.
 -spec getRatio(This) -> number() when
 	This::wxSizerItem().
 getRatio(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -167,7 +167,7 @@ getRatio(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetRatio,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetrect">external documentation</a>.
 -spec getRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxSizerItem().
 getRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -175,7 +175,7 @@ getRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetRect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetsize">external documentation</a>.
 -spec getSize(This) -> {W::integer(), H::integer()} when
 	This::wxSizerItem().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -183,7 +183,7 @@ getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetsizer">external documentation</a>.
 -spec getSizer(This) -> wxSizer:wxSizer() when
 	This::wxSizerItem().
 getSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -191,7 +191,7 @@ getSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetSizer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetspacer">external documentation</a>.
 -spec getSpacer(This) -> {W::integer(), H::integer()} when
 	This::wxSizerItem().
 getSpacer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -199,7 +199,7 @@ getSpacer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetSpacer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetuserdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetuserdata">external documentation</a>.
 -spec getUserData(This) -> wx:wx_object() when
 	This::wxSizerItem().
 getUserData(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -207,7 +207,7 @@ getUserData(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetUserData,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemgetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemgetwindow">external documentation</a>.
 -spec getWindow(This) -> wxWindow:wxWindow() when
 	This::wxSizerItem().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -215,7 +215,7 @@ getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_GetWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemissizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemissizer">external documentation</a>.
 -spec isSizer(This) -> boolean() when
 	This::wxSizerItem().
 isSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -223,7 +223,7 @@ isSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_IsSizer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemisshown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemisshown">external documentation</a>.
 -spec isShown(This) -> boolean() when
 	This::wxSizerItem().
 isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -231,7 +231,7 @@ isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_IsShown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemisspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemisspacer">external documentation</a>.
 -spec isSpacer(This) -> boolean() when
 	This::wxSizerItem().
 isSpacer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -239,7 +239,7 @@ isSpacer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_IsSpacer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemiswindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemiswindow">external documentation</a>.
 -spec isWindow(This) -> boolean() when
 	This::wxSizerItem().
 isWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -247,7 +247,7 @@ isWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSizerItem_IsWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetborder">external documentation</a>.
 -spec setBorder(This, Border) -> ok when
 	This::wxSizerItem(), Border::integer().
 setBorder(#wx_ref{type=ThisT,ref=ThisRef},Border)
@@ -256,7 +256,7 @@ setBorder(#wx_ref{type=ThisT,ref=ThisRef},Border)
   wxe_util:cast(?wxSizerItem_SetBorder,
   <<ThisRef:32/?UI,Border:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetdimension">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetdimension">external documentation</a>.
 -spec setDimension(This, Pos, Size) -> ok when
 	This::wxSizerItem(), Pos::{X::integer(), Y::integer()}, Size::{W::integer(), H::integer()}.
 setDimension(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY},{SizeW,SizeH})
@@ -265,7 +265,7 @@ setDimension(#wx_ref{type=ThisT,ref=ThisRef},{PosX,PosY},{SizeW,SizeH})
   wxe_util:cast(?wxSizerItem_SetDimension,
   <<ThisRef:32/?UI,PosX:32/?UI,PosY:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetflag">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetflag">external documentation</a>.
 -spec setFlag(This, Flag) -> ok when
 	This::wxSizerItem(), Flag::integer().
 setFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag)
@@ -274,7 +274,7 @@ setFlag(#wx_ref{type=ThisT,ref=ThisRef},Flag)
   wxe_util:cast(?wxSizerItem_SetFlag,
   <<ThisRef:32/?UI,Flag:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetinitsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetinitsize">external documentation</a>.
 -spec setInitSize(This, X, Y) -> ok when
 	This::wxSizerItem(), X::integer(), Y::integer().
 setInitSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -283,7 +283,7 @@ setInitSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxSizerItem_SetInitSize,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetminsize">external documentation</a>.
 -spec setMinSize(This, Size) -> ok when
 	This::wxSizerItem(), Size::{W::integer(), H::integer()}.
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -292,7 +292,7 @@ setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxSizerItem_SetMinSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetminsize">external documentation</a>.
 -spec setMinSize(This, X, Y) -> ok when
 	This::wxSizerItem(), X::integer(), Y::integer().
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -301,7 +301,7 @@ setMinSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxSizerItem_SetMinSize_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetproportion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetproportion">external documentation</a>.
 -spec setProportion(This, Proportion) -> ok when
 	This::wxSizerItem(), Proportion::integer().
 setProportion(#wx_ref{type=ThisT,ref=ThisRef},Proportion)
@@ -310,7 +310,7 @@ setProportion(#wx_ref{type=ThisT,ref=ThisRef},Proportion)
   wxe_util:cast(?wxSizerItem_SetProportion,
   <<ThisRef:32/?UI,Proportion:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetratio">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetratio">external documentation</a>.
 %% <br /> Also:<br />
 %% setRatio(This, Size) -> ok when<br />
 %% 	This::wxSizerItem(), Size::{W::integer(), H::integer()}.<br />
@@ -330,7 +330,7 @@ setRatio(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxSizerItem_SetRatio_1_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetratio">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetratio">external documentation</a>.
 -spec setRatio(This, Width, Height) -> ok when
 	This::wxSizerItem(), Width::integer(), Height::integer().
 setRatio(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
@@ -339,7 +339,7 @@ setRatio(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
   wxe_util:cast(?wxSizerItem_SetRatio_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetsizer">external documentation</a>.
 -spec setSizer(This, Sizer) -> ok when
 	This::wxSizerItem(), Sizer::wxSizer:wxSizer().
 setSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}) ->
@@ -348,7 +348,7 @@ setSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}) ->
   wxe_util:cast(?wxSizerItem_SetSizer,
   <<ThisRef:32/?UI,SizerRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetspacer">external documentation</a>.
 -spec setSpacer(This, Size) -> ok when
 	This::wxSizerItem(), Size::{W::integer(), H::integer()}.
 setSpacer(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -357,7 +357,7 @@ setSpacer(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxSizerItem_SetSpacer_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetspacer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetspacer">external documentation</a>.
 -spec setSpacer(This, Width, Height) -> ok when
 	This::wxSizerItem(), Width::integer(), Height::integer().
 setSpacer(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
@@ -366,7 +366,7 @@ setSpacer(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
   wxe_util:cast(?wxSizerItem_SetSpacer_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemsetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemsetwindow">external documentation</a>.
 -spec setWindow(This, Window) -> ok when
 	This::wxSizerItem(), Window::wxWindow:wxWindow().
 setWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -375,7 +375,7 @@ setWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) -
   wxe_util:cast(?wxSizerItem_SetWindow,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsizeritem.html#wxsizeritemshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsizeritem.html#wxsizeritemshow">external documentation</a>.
 -spec show(This, Show) -> ok when
 	This::wxSizerItem(), Show::boolean().
 show(#wx_ref{type=ThisT,ref=ThisRef},Show)
diff --git a/lib/wx/src/gen/wxSlider.erl b/lib/wx/src/gen/wxSlider.erl
index 459e9b9c35..752253eaca 100644
--- a/lib/wx/src/gen/wxSlider.erl
+++ b/lib/wx/src/gen/wxSlider.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html">wxSlider</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html">wxSlider</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -79,7 +79,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSlider() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxsliderwxslider">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxsliderwxslider">external documentation</a>.
 -spec new() -> wxSlider().
 new() ->
   wxe_util:construct(?wxSlider_new_0,
@@ -93,7 +93,7 @@ new(Parent,Id,Value,MinValue,MaxValue)
  when is_record(Parent, wx_ref),is_integer(Id),is_integer(Value),is_integer(MinValue),is_integer(MaxValue) ->
   new(Parent,Id,Value,MinValue,MaxValue, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxsliderwxslider">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxsliderwxslider">external documentation</a>.
 -spec new(Parent, Id, Value, MinValue, MaxValue, [Option]) -> wxSlider() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -120,7 +120,7 @@ create(This,Parent,Id,Value,MinValue,MaxValue)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_integer(Value),is_integer(MinValue),is_integer(MaxValue) ->
   create(This,Parent,Id,Value,MinValue,MaxValue, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidercreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidercreate">external documentation</a>.
 -spec create(This, Parent, Id, Value, MinValue, MaxValue, [Option]) -> boolean() when
 	This::wxSlider(), Parent::wxWindow:wxWindow(), Id::integer(), Value::integer(), MinValue::integer(), MaxValue::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -140,7 +140,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,Va
   wxe_util:call(?wxSlider_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,Value:32/?UI,MinValue:32/?UI,MaxValue:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetlinesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidergetlinesize">external documentation</a>.
 -spec getLineSize(This) -> integer() when
 	This::wxSlider().
 getLineSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ getLineSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSlider_GetLineSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetmax">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidergetmax">external documentation</a>.
 -spec getMax(This) -> integer() when
 	This::wxSlider().
 getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -156,7 +156,7 @@ getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSlider_GetMax,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetmin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidergetmin">external documentation</a>.
 -spec getMin(This) -> integer() when
 	This::wxSlider().
 getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -164,7 +164,7 @@ getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSlider_GetMin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidergetpagesize">external documentation</a>.
 -spec getPageSize(This) -> integer() when
 	This::wxSlider().
 getPageSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -172,7 +172,7 @@ getPageSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSlider_GetPageSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetthumblength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidergetthumblength">external documentation</a>.
 -spec getThumbLength(This) -> integer() when
 	This::wxSlider().
 getThumbLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -180,7 +180,7 @@ getThumbLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSlider_GetThumbLength,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidergetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidergetvalue">external documentation</a>.
 -spec getValue(This) -> integer() when
 	This::wxSlider().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -188,7 +188,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSlider_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetlinesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidersetlinesize">external documentation</a>.
 -spec setLineSize(This, LineSize) -> ok when
 	This::wxSlider(), LineSize::integer().
 setLineSize(#wx_ref{type=ThisT,ref=ThisRef},LineSize)
@@ -197,7 +197,7 @@ setLineSize(#wx_ref{type=ThisT,ref=ThisRef},LineSize)
   wxe_util:cast(?wxSlider_SetLineSize,
   <<ThisRef:32/?UI,LineSize:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidersetpagesize">external documentation</a>.
 -spec setPageSize(This, PageSize) -> ok when
 	This::wxSlider(), PageSize::integer().
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},PageSize)
@@ -206,7 +206,7 @@ setPageSize(#wx_ref{type=ThisT,ref=ThisRef},PageSize)
   wxe_util:cast(?wxSlider_SetPageSize,
   <<ThisRef:32/?UI,PageSize:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidersetrange">external documentation</a>.
 -spec setRange(This, MinValue, MaxValue) -> ok when
 	This::wxSlider(), MinValue::integer(), MaxValue::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinValue,MaxValue)
@@ -215,7 +215,7 @@ setRange(#wx_ref{type=ThisT,ref=ThisRef},MinValue,MaxValue)
   wxe_util:cast(?wxSlider_SetRange,
   <<ThisRef:32/?UI,MinValue:32/?UI,MaxValue:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetthumblength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidersetthumblength">external documentation</a>.
 -spec setThumbLength(This, LenPixels) -> ok when
 	This::wxSlider(), LenPixels::integer().
 setThumbLength(#wx_ref{type=ThisT,ref=ThisRef},LenPixels)
@@ -224,7 +224,7 @@ setThumbLength(#wx_ref{type=ThisT,ref=ThisRef},LenPixels)
   wxe_util:cast(?wxSlider_SetThumbLength,
   <<ThisRef:32/?UI,LenPixels:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxslider.html#wxslidersetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxslider.html#wxslidersetvalue">external documentation</a>.
 -spec setValue(This, Value) -> ok when
 	This::wxSlider(), Value::integer().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
diff --git a/lib/wx/src/gen/wxSpinButton.erl b/lib/wx/src/gen/wxSpinButton.erl
index 0f1dea75b6..a09d041798 100644
--- a/lib/wx/src/gen/wxSpinButton.erl
+++ b/lib/wx/src/gen/wxSpinButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html">wxSpinButton</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html">wxSpinButton</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -78,7 +78,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSpinButton() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonwxspinbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttonwxspinbutton">external documentation</a>.
 -spec new() -> wxSpinButton().
 new() ->
   wxe_util:construct(?wxSpinButton_new_0,
@@ -92,7 +92,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonwxspinbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttonwxspinbutton">external documentation</a>.
 -spec new(Parent, [Option]) -> wxSpinButton() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -119,7 +119,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttoncreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttoncreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxSpinButton(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -139,7 +139,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSpinButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttongetmax">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttongetmax">external documentation</a>.
 -spec getMax(This) -> integer() when
 	This::wxSpinButton().
 getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -147,7 +147,7 @@ getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSpinButton_GetMax,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttongetmin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttongetmin">external documentation</a>.
 -spec getMin(This) -> integer() when
 	This::wxSpinButton().
 getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -155,7 +155,7 @@ getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSpinButton_GetMin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttongetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttongetvalue">external documentation</a>.
 -spec getValue(This) -> integer() when
 	This::wxSpinButton().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -163,7 +163,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSpinButton_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonsetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttonsetrange">external documentation</a>.
 -spec setRange(This, MinVal, MaxVal) -> ok when
 	This::wxSpinButton(), MinVal::integer(), MaxVal::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinVal,MaxVal)
@@ -172,7 +172,7 @@ setRange(#wx_ref{type=ThisT,ref=ThisRef},MinVal,MaxVal)
   wxe_util:cast(?wxSpinButton_SetRange,
   <<ThisRef:32/?UI,MinVal:32/?UI,MaxVal:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinbutton.html#wxspinbuttonsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinbutton.html#wxspinbuttonsetvalue">external documentation</a>.
 -spec setValue(This, Value) -> ok when
 	This::wxSpinButton(), Value::integer().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
diff --git a/lib/wx/src/gen/wxSpinCtrl.erl b/lib/wx/src/gen/wxSpinCtrl.erl
index 82e49da46d..2e34024a41 100644
--- a/lib/wx/src/gen/wxSpinCtrl.erl
+++ b/lib/wx/src/gen/wxSpinCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html">wxSpinCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html">wxSpinCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -78,7 +78,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSpinCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlwxspinctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlwxspinctrl">external documentation</a>.
 -spec new() -> wxSpinCtrl().
 new() ->
   wxe_util:construct(?wxSpinCtrl_new_0,
@@ -92,7 +92,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlwxspinctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlwxspinctrl">external documentation</a>.
 -spec new(Parent, [Option]) -> wxSpinCtrl() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -127,7 +127,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxSpinCtrl(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -155,7 +155,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSpinCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlsetvalue">external documentation</a>.
 %% <br /> Also:<br />
 %% setValue(This, Text) -> ok when<br />
 %% 	This::wxSpinCtrl(), Text::unicode:chardata().<br />
@@ -176,7 +176,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxSpinCtrl_SetValue_1_1,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlgetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlgetvalue">external documentation</a>.
 -spec getValue(This) -> integer() when
 	This::wxSpinCtrl().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -184,7 +184,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSpinCtrl_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlsetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlsetrange">external documentation</a>.
 -spec setRange(This, MinVal, MaxVal) -> ok when
 	This::wxSpinCtrl(), MinVal::integer(), MaxVal::integer().
 setRange(#wx_ref{type=ThisT,ref=ThisRef},MinVal,MaxVal)
@@ -193,7 +193,7 @@ setRange(#wx_ref{type=ThisT,ref=ThisRef},MinVal,MaxVal)
   wxe_util:cast(?wxSpinCtrl_SetRange,
   <<ThisRef:32/?UI,MinVal:32/?UI,MaxVal:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlsetselection">external documentation</a>.
 -spec setSelection(This, From, To) -> ok when
 	This::wxSpinCtrl(), From::integer(), To::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
@@ -202,7 +202,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
   wxe_util:cast(?wxSpinCtrl_SetSelection,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlgetmin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlgetmin">external documentation</a>.
 -spec getMin(This) -> integer() when
 	This::wxSpinCtrl().
 getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -210,7 +210,7 @@ getMin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSpinCtrl_GetMin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinctrl.html#wxspinctrlgetmax">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinctrl.html#wxspinctrlgetmax">external documentation</a>.
 -spec getMax(This) -> integer() when
 	This::wxSpinCtrl().
 getMax(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxSpinEvent.erl b/lib/wx/src/gen/wxSpinEvent.erl
index ecbe557c7b..ea1f7b8718 100644
--- a/lib/wx/src/gen/wxSpinEvent.erl
+++ b/lib/wx/src/gen/wxSpinEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinevent.html">wxSpinEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinevent.html">wxSpinEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_spinctrl_updated</em>, <em>spin_up</em>, <em>spin_down</em>, <em>spin</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxSpin(). #wxSpin{}} event record type.
@@ -49,7 +49,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSpinEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinevent.html#wxspineventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinevent.html#wxspineventgetposition">external documentation</a>.
 -spec getPosition(This) -> integer() when
 	This::wxSpinEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -57,7 +57,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSpinEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxspinevent.html#wxspineventsetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxspinevent.html#wxspineventsetposition">external documentation</a>.
 -spec setPosition(This, Pos) -> ok when
 	This::wxSpinEvent(), Pos::integer().
 setPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
diff --git a/lib/wx/src/gen/wxSplashScreen.erl b/lib/wx/src/gen/wxSplashScreen.erl
index 2222f5e64e..10c1d4a2e7 100644
--- a/lib/wx/src/gen/wxSplashScreen.erl
+++ b/lib/wx/src/gen/wxSplashScreen.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html">wxSplashScreen</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplashscreen.html">wxSplashScreen</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxFrame}
 %% <br />{@link wxTopLevelWindow}
@@ -89,7 +89,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSplashScreen() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreenwxsplashscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplashscreen.html#wxsplashscreenwxsplashscreen">external documentation</a>.
 -spec new() -> wxSplashScreen().
 new() ->
   wxe_util:construct(?wxSplashScreen_new_0,
@@ -103,7 +103,7 @@ new(Bitmap,SplashStyle,Milliseconds,Parent,Id)
  when is_record(Bitmap, wx_ref),is_integer(SplashStyle),is_integer(Milliseconds),is_record(Parent, wx_ref),is_integer(Id) ->
   new(Bitmap,SplashStyle,Milliseconds,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreenwxsplashscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplashscreen.html#wxsplashscreenwxsplashscreen">external documentation</a>.
 -spec new(Bitmap, SplashStyle, Milliseconds, Parent, Id, [Option]) -> wxSplashScreen() when
 	Bitmap::wxBitmap:wxBitmap(), SplashStyle::integer(), Milliseconds::integer(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -121,7 +121,7 @@ new(#wx_ref{type=BitmapT,ref=BitmapRef},SplashStyle,Milliseconds,#wx_ref{type=Pa
   wxe_util:construct(?wxSplashScreen_new_6,
   <<BitmapRef:32/?UI,SplashStyle:32/?UI,Milliseconds:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreengetsplashstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplashscreen.html#wxsplashscreengetsplashstyle">external documentation</a>.
 -spec getSplashStyle(This) -> integer() when
 	This::wxSplashScreen().
 getSplashStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -129,7 +129,7 @@ getSplashStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplashScreen_GetSplashStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplashscreen.html#wxsplashscreengettimeout">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplashscreen.html#wxsplashscreengettimeout">external documentation</a>.
 -spec getTimeout(This) -> integer() when
 	This::wxSplashScreen().
 getTimeout(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxSplitterEvent.erl b/lib/wx/src/gen/wxSplitterEvent.erl
index bba9b13abd..0b67a6867f 100644
--- a/lib/wx/src/gen/wxSplitterEvent.erl
+++ b/lib/wx/src/gen/wxSplitterEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html">wxSplitterEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterevent.html">wxSplitterEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_splitter_sash_pos_changed</em>, <em>command_splitter_sash_pos_changing</em>, <em>command_splitter_doubleclicked</em>, <em>command_splitter_unsplit</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxSplitter(). #wxSplitter{}} event record type.
@@ -49,7 +49,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSplitterEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgetsashposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterevent.html#wxsplittereventgetsashposition">external documentation</a>.
 -spec getSashPosition(This) -> integer() when
 	This::wxSplitterEvent().
 getSashPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -57,7 +57,7 @@ getSashPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterEvent_GetSashPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgetx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterevent.html#wxsplittereventgetx">external documentation</a>.
 -spec getX(This) -> integer() when
 	This::wxSplitterEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -65,7 +65,7 @@ getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgety">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterevent.html#wxsplittereventgety">external documentation</a>.
 -spec getY(This) -> integer() when
 	This::wxSplitterEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -73,7 +73,7 @@ getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventgetwindowbeingremoved">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterevent.html#wxsplittereventgetwindowbeingremoved">external documentation</a>.
 -spec getWindowBeingRemoved(This) -> wxWindow:wxWindow() when
 	This::wxSplitterEvent().
 getWindowBeingRemoved(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -81,7 +81,7 @@ getWindowBeingRemoved(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterEvent_GetWindowBeingRemoved,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterevent.html#wxsplittereventsetsashposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterevent.html#wxsplittereventsetsashposition">external documentation</a>.
 -spec setSashPosition(This, Pos) -> ok when
 	This::wxSplitterEvent(), Pos::integer().
 setSashPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
diff --git a/lib/wx/src/gen/wxSplitterWindow.erl b/lib/wx/src/gen/wxSplitterWindow.erl
index 231f93911f..1b54bfdebc 100644
--- a/lib/wx/src/gen/wxSplitterWindow.erl
+++ b/lib/wx/src/gen/wxSplitterWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html">wxSplitterWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html">wxSplitterWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -80,7 +80,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSplitterWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowwxsplitterwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowwxsplitterwindow">external documentation</a>.
 -spec new() -> wxSplitterWindow().
 new() ->
   wxe_util:construct(?wxSplitterWindow_new_0,
@@ -94,7 +94,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowwxsplitterwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowwxsplitterwindow">external documentation</a>.
 -spec new(Parent, [Option]) -> wxSplitterWindow() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -121,7 +121,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxSplitterWindow(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -141,7 +141,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxSplitterWindow_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetminimumpanesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowgetminimumpanesize">external documentation</a>.
 -spec getMinimumPaneSize(This) -> integer() when
 	This::wxSplitterWindow().
 getMinimumPaneSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -149,7 +149,7 @@ getMinimumPaneSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterWindow_GetMinimumPaneSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetsashgravity">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowgetsashgravity">external documentation</a>.
 -spec getSashGravity(This) -> number() when
 	This::wxSplitterWindow().
 getSashGravity(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -157,7 +157,7 @@ getSashGravity(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterWindow_GetSashGravity,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetsashposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowgetsashposition">external documentation</a>.
 -spec getSashPosition(This) -> integer() when
 	This::wxSplitterWindow().
 getSashPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -165,7 +165,7 @@ getSashPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterWindow_GetSashPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetsplitmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowgetsplitmode">external documentation</a>.
 %%<br /> Res = ?wxSPLIT_HORIZONTAL | ?wxSPLIT_VERTICAL
 -spec getSplitMode(This) -> wx:wx_enum() when
 	This::wxSplitterWindow().
@@ -174,7 +174,7 @@ getSplitMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterWindow_GetSplitMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetwindow1">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowgetwindow1">external documentation</a>.
 -spec getWindow1(This) -> wxWindow:wxWindow() when
 	This::wxSplitterWindow().
 getWindow1(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -182,7 +182,7 @@ getWindow1(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterWindow_GetWindow1,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowgetwindow2">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowgetwindow2">external documentation</a>.
 -spec getWindow2(This) -> wxWindow:wxWindow() when
 	This::wxSplitterWindow().
 getWindow2(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -190,7 +190,7 @@ getWindow2(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterWindow_GetWindow2,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowinitialize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowinitialize">external documentation</a>.
 -spec initialize(This, Window) -> ok when
 	This::wxSplitterWindow(), Window::wxWindow:wxWindow().
 initialize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef}) ->
@@ -199,7 +199,7 @@ initialize(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WindowT,ref=WindowRef})
   wxe_util:cast(?wxSplitterWindow_Initialize,
   <<ThisRef:32/?UI,WindowRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowissplit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowissplit">external documentation</a>.
 -spec isSplit(This) -> boolean() when
 	This::wxSplitterWindow().
 isSplit(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -207,7 +207,7 @@ isSplit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxSplitterWindow_IsSplit,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowreplacewindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowreplacewindow">external documentation</a>.
 -spec replaceWindow(This, WinOld, WinNew) -> boolean() when
 	This::wxSplitterWindow(), WinOld::wxWindow:wxWindow(), WinNew::wxWindow:wxWindow().
 replaceWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinOldT,ref=WinOldRef},#wx_ref{type=WinNewT,ref=WinNewRef}) ->
@@ -217,7 +217,7 @@ replaceWindow(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinOldT,ref=WinOldRef
   wxe_util:call(?wxSplitterWindow_ReplaceWindow,
   <<ThisRef:32/?UI,WinOldRef:32/?UI,WinNewRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsashgravity">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowsetsashgravity">external documentation</a>.
 -spec setSashGravity(This, Gravity) -> ok when
 	This::wxSplitterWindow(), Gravity::number().
 setSashGravity(#wx_ref{type=ThisT,ref=ThisRef},Gravity)
@@ -234,7 +234,7 @@ setSashPosition(This,Position)
  when is_record(This, wx_ref),is_integer(Position) ->
   setSashPosition(This,Position, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsashposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowsetsashposition">external documentation</a>.
 -spec setSashPosition(This, Position, [Option]) -> ok when
 	This::wxSplitterWindow(), Position::integer(),
 	Option :: {redraw, boolean()}.
@@ -247,7 +247,7 @@ setSashPosition(#wx_ref{type=ThisT,ref=ThisRef},Position, Options)
   wxe_util:cast(?wxSplitterWindow_SetSashPosition,
   <<ThisRef:32/?UI,Position:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsashsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowsetsashsize">external documentation</a>.
 -spec setSashSize(This, Width) -> ok when
 	This::wxSplitterWindow(), Width::integer().
 setSashSize(#wx_ref{type=ThisT,ref=ThisRef},Width)
@@ -256,7 +256,7 @@ setSashSize(#wx_ref{type=ThisT,ref=ThisRef},Width)
   wxe_util:cast(?wxSplitterWindow_SetSashSize,
   <<ThisRef:32/?UI,Width:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetminimumpanesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowsetminimumpanesize">external documentation</a>.
 -spec setMinimumPaneSize(This, Min) -> ok when
 	This::wxSplitterWindow(), Min::integer().
 setMinimumPaneSize(#wx_ref{type=ThisT,ref=ThisRef},Min)
@@ -265,7 +265,7 @@ setMinimumPaneSize(#wx_ref{type=ThisT,ref=ThisRef},Min)
   wxe_util:cast(?wxSplitterWindow_SetMinimumPaneSize,
   <<ThisRef:32/?UI,Min:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsetsplitmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowsetsplitmode">external documentation</a>.
 -spec setSplitMode(This, Mode) -> ok when
 	This::wxSplitterWindow(), Mode::integer().
 setSplitMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
@@ -282,7 +282,7 @@ splitHorizontally(This,Window1,Window2)
  when is_record(This, wx_ref),is_record(Window1, wx_ref),is_record(Window2, wx_ref) ->
   splitHorizontally(This,Window1,Window2, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsplithorizontally">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowsplithorizontally">external documentation</a>.
 -spec splitHorizontally(This, Window1, Window2, [Option]) -> boolean() when
 	This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow(),
 	Option :: {sashPosition, integer()}.
@@ -305,7 +305,7 @@ splitVertically(This,Window1,Window2)
  when is_record(This, wx_ref),is_record(Window1, wx_ref),is_record(Window2, wx_ref) ->
   splitVertically(This,Window1,Window2, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowsplitvertically">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowsplitvertically">external documentation</a>.
 -spec splitVertically(This, Window1, Window2, [Option]) -> boolean() when
 	This::wxSplitterWindow(), Window1::wxWindow:wxWindow(), Window2::wxWindow:wxWindow(),
 	Option :: {sashPosition, integer()}.
@@ -328,7 +328,7 @@ unsplit(This)
  when is_record(This, wx_ref) ->
   unsplit(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowunsplit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowunsplit">external documentation</a>.
 -spec unsplit(This, [Option]) -> boolean() when
 	This::wxSplitterWindow(),
 	Option :: {toRemove, wxWindow:wxWindow()}.
@@ -341,7 +341,7 @@ unsplit(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxSplitterWindow_Unsplit,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsplitterwindow.html#wxsplitterwindowupdatesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsplitterwindow.html#wxsplitterwindowupdatesize">external documentation</a>.
 -spec updateSize(This) -> ok when
 	This::wxSplitterWindow().
 updateSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxStaticBitmap.erl b/lib/wx/src/gen/wxStaticBitmap.erl
index 02272c8107..40114da423 100644
--- a/lib/wx/src/gen/wxStaticBitmap.erl
+++ b/lib/wx/src/gen/wxStaticBitmap.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html">wxStaticBitmap</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbitmap.html">wxStaticBitmap</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -77,7 +77,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStaticBitmap() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapwxstaticbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbitmap.html#wxstaticbitmapwxstaticbitmap">external documentation</a>.
 -spec new() -> wxStaticBitmap().
 new() ->
   wxe_util:construct(?wxStaticBitmap_new_0,
@@ -91,7 +91,7 @@ new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_record(Label, wx_ref) ->
   new(Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapwxstaticbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbitmap.html#wxstaticbitmapwxstaticbitmap">external documentation</a>.
 -spec new(Parent, Id, Label, [Option]) -> wxStaticBitmap() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -117,7 +117,7 @@ create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_record(Label, wx_ref) ->
   create(This,Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbitmap.html#wxstaticbitmapcreate">external documentation</a>.
 -spec create(This, Parent, Id, Label, [Option]) -> boolean() when
 	This::wxStaticBitmap(), Parent::wxWindow:wxWindow(), Id::integer(), Label::wxBitmap:wxBitmap(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -136,7 +136,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,#w
   wxe_util:call(?wxStaticBitmap_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,LabelRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapgetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbitmap.html#wxstaticbitmapgetbitmap">external documentation</a>.
 -spec getBitmap(This) -> wxBitmap:wxBitmap() when
 	This::wxStaticBitmap().
 getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -144,7 +144,7 @@ getBitmap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStaticBitmap_GetBitmap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbitmap.html#wxstaticbitmapsetbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbitmap.html#wxstaticbitmapsetbitmap">external documentation</a>.
 -spec setBitmap(This, Bitmap) -> ok when
 	This::wxStaticBitmap(), Bitmap::wxBitmap:wxBitmap().
 setBitmap(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BitmapT,ref=BitmapRef}) ->
diff --git a/lib/wx/src/gen/wxStaticBox.erl b/lib/wx/src/gen/wxStaticBox.erl
index e4e390610a..e82d64a5c3 100644
--- a/lib/wx/src/gen/wxStaticBox.erl
+++ b/lib/wx/src/gen/wxStaticBox.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html">wxStaticBox</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbox.html">wxStaticBox</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -77,7 +77,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStaticBox() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxwxstaticbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbox.html#wxstaticboxwxstaticbox">external documentation</a>.
 -spec new() -> wxStaticBox().
 new() ->
   wxe_util:construct(?wxStaticBox_new_0,
@@ -91,7 +91,7 @@ new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxwxstaticbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbox.html#wxstaticboxwxstaticbox">external documentation</a>.
 -spec new(Parent, Id, Label, [Option]) -> wxStaticBox() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -117,7 +117,7 @@ create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticbox.html#wxstaticboxcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticbox.html#wxstaticboxcreate">external documentation</a>.
 -spec create(This, Parent, Id, Label, [Option]) -> boolean() when
 	This::wxStaticBox(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
diff --git a/lib/wx/src/gen/wxStaticBoxSizer.erl b/lib/wx/src/gen/wxStaticBoxSizer.erl
index fc8afc1146..22f8c83ad5 100644
--- a/lib/wx/src/gen/wxStaticBoxSizer.erl
+++ b/lib/wx/src/gen/wxStaticBoxSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html">wxStaticBoxSizer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticboxsizer.html">wxStaticBoxSizer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxBoxSizer}
 %% <br />{@link wxSizer}
@@ -48,7 +48,7 @@ parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStaticBoxSizer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html#wxstaticboxsizerwxstaticboxsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticboxsizer.html#wxstaticboxsizerwxstaticboxsizer">external documentation</a>.
 %% <br /> Also:<br />
 %% new(Box, Orient) -> wxStaticBoxSizer() when<br />
 %% 	Box::wxStaticBox:wxStaticBox(), Orient::integer().<br />
@@ -67,7 +67,7 @@ new(#wx_ref{type=BoxT,ref=BoxRef},Orient)
   wxe_util:construct(?wxStaticBoxSizer_new_2,
   <<BoxRef:32/?UI,Orient:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html#wxstaticboxsizerwxstaticboxsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticboxsizer.html#wxstaticboxsizerwxstaticboxsizer">external documentation</a>.
 -spec new(Orient, Win, [Option]) -> wxStaticBoxSizer() when
 	Orient::integer(), Win::wxWindow:wxWindow(),
 	Option :: {label, unicode:chardata()}.
@@ -80,7 +80,7 @@ new(Orient,#wx_ref{type=WinT,ref=WinRef}, Options)
   wxe_util:construct(?wxStaticBoxSizer_new_3,
   <<Orient:32/?UI,WinRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticboxsizer.html#wxstaticboxsizergetstaticbox">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticboxsizer.html#wxstaticboxsizergetstaticbox">external documentation</a>.
 -spec getStaticBox(This) -> wxStaticBox:wxStaticBox() when
 	This::wxStaticBoxSizer().
 getStaticBox(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxStaticLine.erl b/lib/wx/src/gen/wxStaticLine.erl
index 86a9975312..d6c598d51c 100644
--- a/lib/wx/src/gen/wxStaticLine.erl
+++ b/lib/wx/src/gen/wxStaticLine.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html">wxStaticLine</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticline.html">wxStaticLine</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -78,7 +78,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStaticLine() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinewxstaticline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticline.html#wxstaticlinewxstaticline">external documentation</a>.
 -spec new() -> wxStaticLine().
 new() ->
   wxe_util:construct(?wxStaticLine_new_0,
@@ -92,7 +92,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinewxstaticline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticline.html#wxstaticlinewxstaticline">external documentation</a>.
 -spec new(Parent, [Option]) -> wxStaticLine() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -119,7 +119,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinecreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticline.html#wxstaticlinecreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxStaticLine(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -139,7 +139,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxStaticLine_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlineisvertical">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticline.html#wxstaticlineisvertical">external documentation</a>.
 -spec isVertical(This) -> boolean() when
 	This::wxStaticLine().
 isVertical(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -147,7 +147,7 @@ isVertical(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStaticLine_IsVertical,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstaticline.html#wxstaticlinegetdefaultsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstaticline.html#wxstaticlinegetdefaultsize">external documentation</a>.
 -spec getDefaultSize() -> integer().
 getDefaultSize() ->
   wxe_util:call(?wxStaticLine_GetDefaultSize,
diff --git a/lib/wx/src/gen/wxStaticText.erl b/lib/wx/src/gen/wxStaticText.erl
index de779f66fc..eed93fec5d 100644
--- a/lib/wx/src/gen/wxStaticText.erl
+++ b/lib/wx/src/gen/wxStaticText.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html">wxStaticText</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatictext.html">wxStaticText</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -77,7 +77,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStaticText() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextwxstatictext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatictext.html#wxstatictextwxstatictext">external documentation</a>.
 -spec new() -> wxStaticText().
 new() ->
   wxe_util:construct(?wxStaticText_new_0,
@@ -91,7 +91,7 @@ new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextwxstatictext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatictext.html#wxstatictextwxstatictext">external documentation</a>.
 -spec new(Parent, Id, Label, [Option]) -> wxStaticText() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -117,7 +117,7 @@ create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatictext.html#wxstatictextcreate">external documentation</a>.
 -spec create(This, Parent, Id, Label, [Option]) -> boolean() when
 	This::wxStaticText(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -136,7 +136,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxStaticText_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextgetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatictext.html#wxstatictextgetlabel">external documentation</a>.
 -spec getLabel(This) -> unicode:charlist() when
 	This::wxStaticText().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -144,7 +144,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStaticText_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextsetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatictext.html#wxstatictextsetlabel">external documentation</a>.
 -spec setLabel(This, Label) -> ok when
 	This::wxStaticText(), Label::unicode:chardata().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
@@ -154,7 +154,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
   wxe_util:cast(?wxStaticText_SetLabel,
   <<ThisRef:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatictext.html#wxstatictextwrap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatictext.html#wxstatictextwrap">external documentation</a>.
 -spec wrap(This, Width) -> ok when
 	This::wxStaticText(), Width::integer().
 wrap(#wx_ref{type=ThisT,ref=ThisRef},Width)
diff --git a/lib/wx/src/gen/wxStatusBar.erl b/lib/wx/src/gen/wxStatusBar.erl
index 31dab03b56..ce98a92de9 100644
--- a/lib/wx/src/gen/wxStatusBar.erl
+++ b/lib/wx/src/gen/wxStatusBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html">wxStatusBar</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html">wxStatusBar</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -28,7 +28,7 @@
 
 -module(wxStatusBar).
 -include("wxe.hrl").
--export([create/2,create/3,destroy/1,getFieldRect/3,getFieldsCount/1,getStatusText/1,
+-export([create/2,create/3,destroy/1,getFieldRect/2,getFieldsCount/1,getStatusText/1,
   getStatusText/2,new/0,new/1,new/2,popStatusText/1,popStatusText/2,pushStatusText/2,
   pushStatusText/3,setFieldsCount/2,setFieldsCount/3,setMinHeight/2,
   setStatusStyles/2,setStatusText/2,setStatusText/3,setStatusWidths/2]).
@@ -78,7 +78,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStatusBar() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarwxstatusbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarwxstatusbar">external documentation</a>.
 -spec new() -> wxStatusBar().
 new() ->
   wxe_util:construct(?wxStatusBar_new_0,
@@ -92,7 +92,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarwxstatusbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarwxstatusbar">external documentation</a>.
 -spec new(Parent, [Option]) -> wxStatusBar() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {winid, integer()}
@@ -115,7 +115,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxStatusBar(), Parent::wxWindow:wxWindow(),
 	Option :: {winid, integer()}
@@ -131,16 +131,17 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxStatusBar_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbargetfieldrect">external documentation</a>.
--spec getFieldRect(This, I, Rect) -> boolean() when
-	This::wxStatusBar(), I::integer(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
-getFieldRect(#wx_ref{type=ThisT,ref=ThisRef},I,{RectX,RectY,RectW,RectH})
- when is_integer(I),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbargetfieldrect">external documentation</a>.
+-spec getFieldRect(This, I) -> Result when
+	Result ::{Res ::boolean(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}},
+	This::wxStatusBar(), I::integer().
+getFieldRect(#wx_ref{type=ThisT,ref=ThisRef},I)
+ when is_integer(I) ->
   ?CLASS(ThisT,wxStatusBar),
   wxe_util:call(?wxStatusBar_GetFieldRect,
-  <<ThisRef:32/?UI,I:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
+  <<ThisRef:32/?UI,I:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbargetfieldscount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbargetfieldscount">external documentation</a>.
 -spec getFieldsCount(This) -> integer() when
 	This::wxStatusBar().
 getFieldsCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -156,7 +157,7 @@ getStatusText(This)
  when is_record(This, wx_ref) ->
   getStatusText(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbargetstatustext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbargetstatustext">external documentation</a>.
 -spec getStatusText(This, [Option]) -> unicode:charlist() when
 	This::wxStatusBar(),
 	Option :: {number, integer()}.
@@ -177,7 +178,7 @@ popStatusText(This)
  when is_record(This, wx_ref) ->
   popStatusText(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarpopstatustext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarpopstatustext">external documentation</a>.
 -spec popStatusText(This, [Option]) -> ok when
 	This::wxStatusBar(),
 	Option :: {number, integer()}.
@@ -198,7 +199,7 @@ pushStatusText(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   pushStatusText(This,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarpushstatustext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarpushstatustext">external documentation</a>.
 -spec pushStatusText(This, Text, [Option]) -> ok when
 	This::wxStatusBar(), Text::unicode:chardata(),
 	Option :: {number, integer()}.
@@ -220,7 +221,7 @@ setFieldsCount(This,Number)
  when is_record(This, wx_ref),is_integer(Number) ->
   setFieldsCount(This,Number, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetfieldscount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarsetfieldscount">external documentation</a>.
 -spec setFieldsCount(This, Number, [Option]) -> ok when
 	This::wxStatusBar(), Number::integer(),
 	Option :: {widths, [integer()]}.
@@ -234,7 +235,7 @@ setFieldsCount(#wx_ref{type=ThisT,ref=ThisRef},Number, Options)
   wxe_util:cast(?wxStatusBar_SetFieldsCount,
   <<ThisRef:32/?UI,Number:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetminheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarsetminheight">external documentation</a>.
 -spec setMinHeight(This, Height) -> ok when
 	This::wxStatusBar(), Height::integer().
 setMinHeight(#wx_ref{type=ThisT,ref=ThisRef},Height)
@@ -251,7 +252,7 @@ setStatusText(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   setStatusText(This,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetstatustext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarsetstatustext">external documentation</a>.
 -spec setStatusText(This, Text, [Option]) -> ok when
 	This::wxStatusBar(), Text::unicode:chardata(),
 	Option :: {number, integer()}.
@@ -265,7 +266,7 @@ setStatusText(#wx_ref{type=ThisT,ref=ThisRef},Text, Options)
   wxe_util:cast(?wxStatusBar_SetStatusText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetstatuswidths">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarsetstatuswidths">external documentation</a>.
 -spec setStatusWidths(This, Widths_field) -> ok when
 	This::wxStatusBar(), Widths_field::[integer()].
 setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
@@ -275,7 +276,7 @@ setStatusWidths(#wx_ref{type=ThisT,ref=ThisRef},Widths_field)
   <<ThisRef:32/?UI,(length(Widths_field)):32/?UI,
         (<< <<C:32/?I>> || C <- Widths_field>>)/binary, 0:(((0+length(Widths_field)) rem 2)*32)>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstatusbar.html#wxstatusbarsetstatusstyles">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstatusbar.html#wxstatusbarsetstatusstyles">external documentation</a>.
 -spec setStatusStyles(This, Styles) -> ok when
 	This::wxStatusBar(), Styles::[integer()].
 setStatusStyles(#wx_ref{type=ThisT,ref=ThisRef},Styles)
diff --git a/lib/wx/src/gen/wxStdDialogButtonSizer.erl b/lib/wx/src/gen/wxStdDialogButtonSizer.erl
index 078763e7cb..2878345600 100644
--- a/lib/wx/src/gen/wxStdDialogButtonSizer.erl
+++ b/lib/wx/src/gen/wxStdDialogButtonSizer.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html">wxStdDialogButtonSizer</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstddialogbuttonsizer.html">wxStdDialogButtonSizer</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxBoxSizer}
 %% <br />{@link wxSizer}
@@ -49,13 +49,13 @@ parent_class(wxSizer) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStdDialogButtonSizer() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizerwxstddialogbuttonsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizerwxstddialogbuttonsizer">external documentation</a>.
 -spec new() -> wxStdDialogButtonSizer().
 new() ->
   wxe_util:construct(?wxStdDialogButtonSizer_new,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizeraddbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizeraddbutton">external documentation</a>.
 -spec addButton(This, Button) -> ok when
 	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 addButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
@@ -64,7 +64,7 @@ addButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) -
   wxe_util:cast(?wxStdDialogButtonSizer_AddButton,
   <<ThisRef:32/?UI,ButtonRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizerrealize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizerrealize">external documentation</a>.
 -spec realize(This) -> ok when
 	This::wxStdDialogButtonSizer().
 realize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -72,7 +72,7 @@ realize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStdDialogButtonSizer_Realize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetaffirmativebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetaffirmativebutton">external documentation</a>.
 -spec setAffirmativeButton(This, Button) -> ok when
 	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 setAffirmativeButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
@@ -81,7 +81,7 @@ setAffirmativeButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=Bu
   wxe_util:cast(?wxStdDialogButtonSizer_SetAffirmativeButton,
   <<ThisRef:32/?UI,ButtonRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetcancelbutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetcancelbutton">external documentation</a>.
 -spec setCancelButton(This, Button) -> ok when
 	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 setCancelButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
@@ -90,7 +90,7 @@ setCancelButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonR
   wxe_util:cast(?wxStdDialogButtonSizer_SetCancelButton,
   <<ThisRef:32/?UI,ButtonRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetnegativebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstddialogbuttonsizer.html#wxstddialogbuttonsizersetnegativebutton">external documentation</a>.
 -spec setNegativeButton(This, Button) -> ok when
 	This::wxStdDialogButtonSizer(), Button::wxButton:wxButton().
 setNegativeButton(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ButtonT,ref=ButtonRef}) ->
diff --git a/lib/wx/src/gen/wxStyledTextCtrl.erl b/lib/wx/src/gen/wxStyledTextCtrl.erl
index 55ac410407..34b4c2a4ec 100644
--- a/lib/wx/src/gen/wxStyledTextCtrl.erl
+++ b/lib/wx/src/gen/wxStyledTextCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html">wxStyledTextCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html">wxStyledTextCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -179,7 +179,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStyledTextCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwxstyledtextctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwxstyledtextctrl">external documentation</a>.
 -spec new() -> wxStyledTextCtrl().
 new() ->
   wxe_util:construct(?wxStyledTextCtrl_new_0,
@@ -193,7 +193,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwxstyledtextctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwxstyledtextctrl">external documentation</a>.
 -spec new(Parent, [Option]) -> wxStyledTextCtrl() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -220,7 +220,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxStyledTextCtrl(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -240,7 +240,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxStyledTextCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrladdtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrladdtext">external documentation</a>.
 -spec addText(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::unicode:chardata().
 addText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -250,7 +250,7 @@ addText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AddText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrladdstyledtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrladdstyledtext">external documentation</a>.
 -spec addStyledText(This, Data) -> ok when
 	This::wxStyledTextCtrl(), Data::wx:wx_object().
 addStyledText(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) ->
@@ -259,7 +259,7 @@ addStyledText(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DataT,ref=DataRef}) -
   wxe_util:cast(?wxStyledTextCtrl_AddStyledText,
   <<ThisRef:32/?UI,DataRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlinserttext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlinserttext">external documentation</a>.
 -spec insertText(This, Pos, Text) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer(), Text::unicode:chardata().
 insertText(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
@@ -269,7 +269,7 @@ insertText(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
   wxe_util:cast(?wxStyledTextCtrl_InsertText,
   <<ThisRef:32/?UI,Pos:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlclearall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlclearall">external documentation</a>.
 -spec clearAll(This) -> ok when
 	This::wxStyledTextCtrl().
 clearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -277,7 +277,7 @@ clearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ClearAll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcleardocumentstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcleardocumentstyle">external documentation</a>.
 -spec clearDocumentStyle(This) -> ok when
 	This::wxStyledTextCtrl().
 clearDocumentStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -285,7 +285,7 @@ clearDocumentStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ClearDocumentStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlength">external documentation</a>.
 -spec getLength(This) -> integer() when
 	This::wxStyledTextCtrl().
 getLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -293,7 +293,7 @@ getLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetLength,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcharat">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcharat">external documentation</a>.
 -spec getCharAt(This, Pos) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer().
 getCharAt(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -302,7 +302,7 @@ getCharAt(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_GetCharAt,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurrentpos">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurrentpos">external documentation</a>.
 -spec getCurrentPos(This) -> integer() when
 	This::wxStyledTextCtrl().
 getCurrentPos(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -310,7 +310,7 @@ getCurrentPos(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCurrentPos,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetanchor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetanchor">external documentation</a>.
 -spec getAnchor(This) -> integer() when
 	This::wxStyledTextCtrl().
 getAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -318,7 +318,7 @@ getAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetAnchor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstyleat">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstyleat">external documentation</a>.
 -spec getStyleAt(This, Pos) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer().
 getStyleAt(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -327,7 +327,7 @@ getStyleAt(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_GetStyleAt,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlredo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlredo">external documentation</a>.
 -spec redo(This) -> ok when
 	This::wxStyledTextCtrl().
 redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -335,7 +335,7 @@ redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Redo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetundocollection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetundocollection">external documentation</a>.
 -spec setUndoCollection(This, CollectUndo) -> ok when
 	This::wxStyledTextCtrl(), CollectUndo::boolean().
 setUndoCollection(#wx_ref{type=ThisT,ref=ThisRef},CollectUndo)
@@ -344,7 +344,7 @@ setUndoCollection(#wx_ref{type=ThisT,ref=ThisRef},CollectUndo)
   wxe_util:cast(?wxStyledTextCtrl_SetUndoCollection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(CollectUndo)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlselectall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlselectall">external documentation</a>.
 -spec selectAll(This) -> ok when
 	This::wxStyledTextCtrl().
 selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -352,7 +352,7 @@ selectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_SelectAll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetsavepoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetsavepoint">external documentation</a>.
 -spec setSavePoint(This) -> ok when
 	This::wxStyledTextCtrl().
 setSavePoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -360,7 +360,7 @@ setSavePoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_SetSavePoint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstyledtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstyledtext">external documentation</a>.
 -spec getStyledText(This, StartPos, EndPos) -> wx:wx_object() when
 	This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer().
 getStyledText(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
@@ -369,7 +369,7 @@ getStyledText(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
   wxe_util:call(?wxStyledTextCtrl_GetStyledText,
   <<ThisRef:32/?UI,StartPos:32/?UI,EndPos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcanredo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcanredo">external documentation</a>.
 -spec canRedo(This) -> boolean() when
 	This::wxStyledTextCtrl().
 canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -377,7 +377,7 @@ canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_CanRedo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerlinefromhandle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerlinefromhandle">external documentation</a>.
 -spec markerLineFromHandle(This, Handle) -> integer() when
 	This::wxStyledTextCtrl(), Handle::integer().
 markerLineFromHandle(#wx_ref{type=ThisT,ref=ThisRef},Handle)
@@ -386,7 +386,7 @@ markerLineFromHandle(#wx_ref{type=ThisT,ref=ThisRef},Handle)
   wxe_util:call(?wxStyledTextCtrl_MarkerLineFromHandle,
   <<ThisRef:32/?UI,Handle:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdeletehandle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdeletehandle">external documentation</a>.
 -spec markerDeleteHandle(This, Handle) -> ok when
 	This::wxStyledTextCtrl(), Handle::integer().
 markerDeleteHandle(#wx_ref{type=ThisT,ref=ThisRef},Handle)
@@ -395,7 +395,7 @@ markerDeleteHandle(#wx_ref{type=ThisT,ref=ThisRef},Handle)
   wxe_util:cast(?wxStyledTextCtrl_MarkerDeleteHandle,
   <<ThisRef:32/?UI,Handle:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetundocollection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetundocollection">external documentation</a>.
 -spec getUndoCollection(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getUndoCollection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -403,7 +403,7 @@ getUndoCollection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetUndoCollection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetviewwhitespace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetviewwhitespace">external documentation</a>.
 -spec getViewWhiteSpace(This) -> integer() when
 	This::wxStyledTextCtrl().
 getViewWhiteSpace(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -411,7 +411,7 @@ getViewWhiteSpace(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetViewWhiteSpace,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetviewwhitespace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetviewwhitespace">external documentation</a>.
 -spec setViewWhiteSpace(This, ViewWS) -> ok when
 	This::wxStyledTextCtrl(), ViewWS::integer().
 setViewWhiteSpace(#wx_ref{type=ThisT,ref=ThisRef},ViewWS)
@@ -420,7 +420,7 @@ setViewWhiteSpace(#wx_ref{type=ThisT,ref=ThisRef},ViewWS)
   wxe_util:cast(?wxStyledTextCtrl_SetViewWhiteSpace,
   <<ThisRef:32/?UI,ViewWS:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfrompoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfrompoint">external documentation</a>.
 -spec positionFromPoint(This, Pt) -> integer() when
 	This::wxStyledTextCtrl(), Pt::{X::integer(), Y::integer()}.
 positionFromPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -429,7 +429,7 @@ positionFromPoint(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxStyledTextCtrl_PositionFromPoint,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfrompointclose">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfrompointclose">external documentation</a>.
 -spec positionFromPointClose(This, X, Y) -> integer() when
 	This::wxStyledTextCtrl(), X::integer(), Y::integer().
 positionFromPointClose(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -438,7 +438,7 @@ positionFromPointClose(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxStyledTextCtrl_PositionFromPointClose,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgotoline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgotoline">external documentation</a>.
 -spec gotoLine(This, Line) -> ok when
 	This::wxStyledTextCtrl(), Line::integer().
 gotoLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -447,7 +447,7 @@ gotoLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:cast(?wxStyledTextCtrl_GotoLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgotopos">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgotopos">external documentation</a>.
 -spec gotoPos(This, Pos) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer().
 gotoPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -456,7 +456,7 @@ gotoPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxStyledTextCtrl_GotoPos,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetanchor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetanchor">external documentation</a>.
 -spec setAnchor(This, PosAnchor) -> ok when
 	This::wxStyledTextCtrl(), PosAnchor::integer().
 setAnchor(#wx_ref{type=ThisT,ref=ThisRef},PosAnchor)
@@ -465,7 +465,7 @@ setAnchor(#wx_ref{type=ThisT,ref=ThisRef},PosAnchor)
   wxe_util:cast(?wxStyledTextCtrl_SetAnchor,
   <<ThisRef:32/?UI,PosAnchor:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurline">external documentation</a>.
 -spec getCurLine(This) -> Result when
 	Result ::{Res ::unicode:charlist(), LinePos::integer()},
 	This::wxStyledTextCtrl().
@@ -474,7 +474,7 @@ getCurLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCurLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetendstyled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetendstyled">external documentation</a>.
 -spec getEndStyled(This) -> integer() when
 	This::wxStyledTextCtrl().
 getEndStyled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -482,7 +482,7 @@ getEndStyled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetEndStyled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlconverteols">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlconverteols">external documentation</a>.
 -spec convertEOLs(This, EolMode) -> ok when
 	This::wxStyledTextCtrl(), EolMode::integer().
 convertEOLs(#wx_ref{type=ThisT,ref=ThisRef},EolMode)
@@ -491,7 +491,7 @@ convertEOLs(#wx_ref{type=ThisT,ref=ThisRef},EolMode)
   wxe_util:cast(?wxStyledTextCtrl_ConvertEOLs,
   <<ThisRef:32/?UI,EolMode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgeteolmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgeteolmode">external documentation</a>.
 -spec getEOLMode(This) -> integer() when
 	This::wxStyledTextCtrl().
 getEOLMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -499,7 +499,7 @@ getEOLMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetEOLMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlseteolmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlseteolmode">external documentation</a>.
 -spec setEOLMode(This, EolMode) -> ok when
 	This::wxStyledTextCtrl(), EolMode::integer().
 setEOLMode(#wx_ref{type=ThisT,ref=ThisRef},EolMode)
@@ -508,7 +508,7 @@ setEOLMode(#wx_ref{type=ThisT,ref=ThisRef},EolMode)
   wxe_util:cast(?wxStyledTextCtrl_SetEOLMode,
   <<ThisRef:32/?UI,EolMode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstartstyling">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstartstyling">external documentation</a>.
 -spec startStyling(This, Pos, Mask) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer(), Mask::integer().
 startStyling(#wx_ref{type=ThisT,ref=ThisRef},Pos,Mask)
@@ -517,7 +517,7 @@ startStyling(#wx_ref{type=ThisT,ref=ThisRef},Pos,Mask)
   wxe_util:cast(?wxStyledTextCtrl_StartStyling,
   <<ThisRef:32/?UI,Pos:32/?UI,Mask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstyling">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstyling">external documentation</a>.
 -spec setStyling(This, Length, Style) -> ok when
 	This::wxStyledTextCtrl(), Length::integer(), Style::integer().
 setStyling(#wx_ref{type=ThisT,ref=ThisRef},Length,Style)
@@ -526,7 +526,7 @@ setStyling(#wx_ref{type=ThisT,ref=ThisRef},Length,Style)
   wxe_util:cast(?wxStyledTextCtrl_SetStyling,
   <<ThisRef:32/?UI,Length:32/?UI,Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetbuffereddraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetbuffereddraw">external documentation</a>.
 -spec getBufferedDraw(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getBufferedDraw(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -534,7 +534,7 @@ getBufferedDraw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetBufferedDraw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetbuffereddraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetbuffereddraw">external documentation</a>.
 -spec setBufferedDraw(This, Buffered) -> ok when
 	This::wxStyledTextCtrl(), Buffered::boolean().
 setBufferedDraw(#wx_ref{type=ThisT,ref=ThisRef},Buffered)
@@ -543,7 +543,7 @@ setBufferedDraw(#wx_ref{type=ThisT,ref=ThisRef},Buffered)
   wxe_util:cast(?wxStyledTextCtrl_SetBufferedDraw,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Buffered)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettabwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsettabwidth">external documentation</a>.
 -spec setTabWidth(This, TabWidth) -> ok when
 	This::wxStyledTextCtrl(), TabWidth::integer().
 setTabWidth(#wx_ref{type=ThisT,ref=ThisRef},TabWidth)
@@ -552,7 +552,7 @@ setTabWidth(#wx_ref{type=ThisT,ref=ThisRef},TabWidth)
   wxe_util:cast(?wxStyledTextCtrl_SetTabWidth,
   <<ThisRef:32/?UI,TabWidth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettabwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettabwidth">external documentation</a>.
 -spec getTabWidth(This) -> integer() when
 	This::wxStyledTextCtrl().
 getTabWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -560,7 +560,7 @@ getTabWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetTabWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcodepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcodepage">external documentation</a>.
 -spec setCodePage(This, CodePage) -> ok when
 	This::wxStyledTextCtrl(), CodePage::integer().
 setCodePage(#wx_ref{type=ThisT,ref=ThisRef},CodePage)
@@ -577,7 +577,7 @@ markerDefine(This,MarkerNumber,MarkerSymbol)
  when is_record(This, wx_ref),is_integer(MarkerNumber),is_integer(MarkerSymbol) ->
   markerDefine(This,MarkerNumber,MarkerSymbol, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdefine">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdefine">external documentation</a>.
 -spec markerDefine(This, MarkerNumber, MarkerSymbol, [Option]) -> ok when
 	This::wxStyledTextCtrl(), MarkerNumber::integer(), MarkerSymbol::integer(),
 	Option :: {foreground, wx:wx_colour()}
@@ -592,7 +592,7 @@ markerDefine(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,MarkerSymbol, Options)
   wxe_util:cast(?wxStyledTextCtrl_MarkerDefine,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,MarkerSymbol:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetforeground">external documentation</a>.
 -spec markerSetForeground(This, MarkerNumber, Fore) -> ok when
 	This::wxStyledTextCtrl(), MarkerNumber::integer(), Fore::wx:wx_colour().
 markerSetForeground(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Fore)
@@ -601,7 +601,7 @@ markerSetForeground(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Fore)
   wxe_util:cast(?wxStyledTextCtrl_MarkerSetForeground,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetbackground">external documentation</a>.
 -spec markerSetBackground(This, MarkerNumber, Back) -> ok when
 	This::wxStyledTextCtrl(), MarkerNumber::integer(), Back::wx:wx_colour().
 markerSetBackground(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Back)
@@ -610,7 +610,7 @@ markerSetBackground(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Back)
   wxe_util:cast(?wxStyledTextCtrl_MarkerSetBackground,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkeradd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkeradd">external documentation</a>.
 -spec markerAdd(This, Line, MarkerNumber) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer(), MarkerNumber::integer().
 markerAdd(#wx_ref{type=ThisT,ref=ThisRef},Line,MarkerNumber)
@@ -619,7 +619,7 @@ markerAdd(#wx_ref{type=ThisT,ref=ThisRef},Line,MarkerNumber)
   wxe_util:call(?wxStyledTextCtrl_MarkerAdd,
   <<ThisRef:32/?UI,Line:32/?UI,MarkerNumber:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdelete">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdelete">external documentation</a>.
 -spec markerDelete(This, Line, MarkerNumber) -> ok when
 	This::wxStyledTextCtrl(), Line::integer(), MarkerNumber::integer().
 markerDelete(#wx_ref{type=ThisT,ref=ThisRef},Line,MarkerNumber)
@@ -628,7 +628,7 @@ markerDelete(#wx_ref{type=ThisT,ref=ThisRef},Line,MarkerNumber)
   wxe_util:cast(?wxStyledTextCtrl_MarkerDelete,
   <<ThisRef:32/?UI,Line:32/?UI,MarkerNumber:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdeleteall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdeleteall">external documentation</a>.
 -spec markerDeleteAll(This, MarkerNumber) -> ok when
 	This::wxStyledTextCtrl(), MarkerNumber::integer().
 markerDeleteAll(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber)
@@ -637,7 +637,7 @@ markerDeleteAll(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber)
   wxe_util:cast(?wxStyledTextCtrl_MarkerDeleteAll,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerget">external documentation</a>.
 -spec markerGet(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 markerGet(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -646,7 +646,7 @@ markerGet(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_MarkerGet,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkernext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkernext">external documentation</a>.
 -spec markerNext(This, LineStart, MarkerMask) -> integer() when
 	This::wxStyledTextCtrl(), LineStart::integer(), MarkerMask::integer().
 markerNext(#wx_ref{type=ThisT,ref=ThisRef},LineStart,MarkerMask)
@@ -655,7 +655,7 @@ markerNext(#wx_ref{type=ThisT,ref=ThisRef},LineStart,MarkerMask)
   wxe_util:call(?wxStyledTextCtrl_MarkerNext,
   <<ThisRef:32/?UI,LineStart:32/?UI,MarkerMask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerprevious">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerprevious">external documentation</a>.
 -spec markerPrevious(This, LineStart, MarkerMask) -> integer() when
 	This::wxStyledTextCtrl(), LineStart::integer(), MarkerMask::integer().
 markerPrevious(#wx_ref{type=ThisT,ref=ThisRef},LineStart,MarkerMask)
@@ -664,7 +664,7 @@ markerPrevious(#wx_ref{type=ThisT,ref=ThisRef},LineStart,MarkerMask)
   wxe_util:call(?wxStyledTextCtrl_MarkerPrevious,
   <<ThisRef:32/?UI,LineStart:32/?UI,MarkerMask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdefinebitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkerdefinebitmap">external documentation</a>.
 -spec markerDefineBitmap(This, MarkerNumber, Bmp) -> ok when
 	This::wxStyledTextCtrl(), MarkerNumber::integer(), Bmp::wxBitmap:wxBitmap().
 markerDefineBitmap(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,#wx_ref{type=BmpT,ref=BmpRef})
@@ -674,7 +674,7 @@ markerDefineBitmap(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,#wx_ref{type=Bmp
   wxe_util:cast(?wxStyledTextCtrl_MarkerDefineBitmap,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,BmpRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkeraddset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkeraddset">external documentation</a>.
 -spec markerAddSet(This, Line, Set) -> ok when
 	This::wxStyledTextCtrl(), Line::integer(), Set::integer().
 markerAddSet(#wx_ref{type=ThisT,ref=ThisRef},Line,Set)
@@ -683,7 +683,7 @@ markerAddSet(#wx_ref{type=ThisT,ref=ThisRef},Line,Set)
   wxe_util:cast(?wxStyledTextCtrl_MarkerAddSet,
   <<ThisRef:32/?UI,Line:32/?UI,Set:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmarkersetalpha">external documentation</a>.
 -spec markerSetAlpha(This, MarkerNumber, Alpha) -> ok when
 	This::wxStyledTextCtrl(), MarkerNumber::integer(), Alpha::integer().
 markerSetAlpha(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Alpha)
@@ -692,7 +692,7 @@ markerSetAlpha(#wx_ref{type=ThisT,ref=ThisRef},MarkerNumber,Alpha)
   wxe_util:cast(?wxStyledTextCtrl_MarkerSetAlpha,
   <<ThisRef:32/?UI,MarkerNumber:32/?UI,Alpha:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmargintype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmargintype">external documentation</a>.
 -spec setMarginType(This, Margin, MarginType) -> ok when
 	This::wxStyledTextCtrl(), Margin::integer(), MarginType::integer().
 setMarginType(#wx_ref{type=ThisT,ref=ThisRef},Margin,MarginType)
@@ -701,7 +701,7 @@ setMarginType(#wx_ref{type=ThisT,ref=ThisRef},Margin,MarginType)
   wxe_util:cast(?wxStyledTextCtrl_SetMarginType,
   <<ThisRef:32/?UI,Margin:32/?UI,MarginType:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmargintype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmargintype">external documentation</a>.
 -spec getMarginType(This, Margin) -> integer() when
 	This::wxStyledTextCtrl(), Margin::integer().
 getMarginType(#wx_ref{type=ThisT,ref=ThisRef},Margin)
@@ -710,7 +710,7 @@ getMarginType(#wx_ref{type=ThisT,ref=ThisRef},Margin)
   wxe_util:call(?wxStyledTextCtrl_GetMarginType,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginwidth">external documentation</a>.
 -spec setMarginWidth(This, Margin, PixelWidth) -> ok when
 	This::wxStyledTextCtrl(), Margin::integer(), PixelWidth::integer().
 setMarginWidth(#wx_ref{type=ThisT,ref=ThisRef},Margin,PixelWidth)
@@ -719,7 +719,7 @@ setMarginWidth(#wx_ref{type=ThisT,ref=ThisRef},Margin,PixelWidth)
   wxe_util:cast(?wxStyledTextCtrl_SetMarginWidth,
   <<ThisRef:32/?UI,Margin:32/?UI,PixelWidth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginwidth">external documentation</a>.
 -spec getMarginWidth(This, Margin) -> integer() when
 	This::wxStyledTextCtrl(), Margin::integer().
 getMarginWidth(#wx_ref{type=ThisT,ref=ThisRef},Margin)
@@ -728,7 +728,7 @@ getMarginWidth(#wx_ref{type=ThisT,ref=ThisRef},Margin)
   wxe_util:call(?wxStyledTextCtrl_GetMarginWidth,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginmask">external documentation</a>.
 -spec setMarginMask(This, Margin, Mask) -> ok when
 	This::wxStyledTextCtrl(), Margin::integer(), Mask::integer().
 setMarginMask(#wx_ref{type=ThisT,ref=ThisRef},Margin,Mask)
@@ -737,7 +737,7 @@ setMarginMask(#wx_ref{type=ThisT,ref=ThisRef},Margin,Mask)
   wxe_util:cast(?wxStyledTextCtrl_SetMarginMask,
   <<ThisRef:32/?UI,Margin:32/?UI,Mask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginmask">external documentation</a>.
 -spec getMarginMask(This, Margin) -> integer() when
 	This::wxStyledTextCtrl(), Margin::integer().
 getMarginMask(#wx_ref{type=ThisT,ref=ThisRef},Margin)
@@ -746,7 +746,7 @@ getMarginMask(#wx_ref{type=ThisT,ref=ThisRef},Margin)
   wxe_util:call(?wxStyledTextCtrl_GetMarginMask,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginsensitive">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginsensitive">external documentation</a>.
 -spec setMarginSensitive(This, Margin, Sensitive) -> ok when
 	This::wxStyledTextCtrl(), Margin::integer(), Sensitive::boolean().
 setMarginSensitive(#wx_ref{type=ThisT,ref=ThisRef},Margin,Sensitive)
@@ -755,7 +755,7 @@ setMarginSensitive(#wx_ref{type=ThisT,ref=ThisRef},Margin,Sensitive)
   wxe_util:cast(?wxStyledTextCtrl_SetMarginSensitive,
   <<ThisRef:32/?UI,Margin:32/?UI,(wxe_util:from_bool(Sensitive)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginsensitive">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginsensitive">external documentation</a>.
 -spec getMarginSensitive(This, Margin) -> boolean() when
 	This::wxStyledTextCtrl(), Margin::integer().
 getMarginSensitive(#wx_ref{type=ThisT,ref=ThisRef},Margin)
@@ -764,7 +764,7 @@ getMarginSensitive(#wx_ref{type=ThisT,ref=ThisRef},Margin)
   wxe_util:call(?wxStyledTextCtrl_GetMarginSensitive,
   <<ThisRef:32/?UI,Margin:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleclearall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleclearall">external documentation</a>.
 -spec styleClearAll(This) -> ok when
 	This::wxStyledTextCtrl().
 styleClearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -772,7 +772,7 @@ styleClearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StyleClearAll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetforeground">external documentation</a>.
 -spec styleSetForeground(This, Style, Fore) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Fore::wx:wx_colour().
 styleSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Style,Fore)
@@ -781,7 +781,7 @@ styleSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Style,Fore)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetForeground,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetbackground">external documentation</a>.
 -spec styleSetBackground(This, Style, Back) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Back::wx:wx_colour().
 styleSetBackground(#wx_ref{type=ThisT,ref=ThisRef},Style,Back)
@@ -790,7 +790,7 @@ styleSetBackground(#wx_ref{type=ThisT,ref=ThisRef},Style,Back)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetBackground,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetbold">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetbold">external documentation</a>.
 -spec styleSetBold(This, Style, Bold) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Bold::boolean().
 styleSetBold(#wx_ref{type=ThisT,ref=ThisRef},Style,Bold)
@@ -799,7 +799,7 @@ styleSetBold(#wx_ref{type=ThisT,ref=ThisRef},Style,Bold)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetBold,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Bold)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetitalic">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetitalic">external documentation</a>.
 -spec styleSetItalic(This, Style, Italic) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Italic::boolean().
 styleSetItalic(#wx_ref{type=ThisT,ref=ThisRef},Style,Italic)
@@ -808,7 +808,7 @@ styleSetItalic(#wx_ref{type=ThisT,ref=ThisRef},Style,Italic)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetItalic,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Italic)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetsize">external documentation</a>.
 -spec styleSetSize(This, Style, SizePoints) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), SizePoints::integer().
 styleSetSize(#wx_ref{type=ThisT,ref=ThisRef},Style,SizePoints)
@@ -817,7 +817,7 @@ styleSetSize(#wx_ref{type=ThisT,ref=ThisRef},Style,SizePoints)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetSize,
   <<ThisRef:32/?UI,Style:32/?UI,SizePoints:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfacename">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfacename">external documentation</a>.
 -spec styleSetFaceName(This, Style, FontName) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), FontName::unicode:chardata().
 styleSetFaceName(#wx_ref{type=ThisT,ref=ThisRef},Style,FontName)
@@ -827,7 +827,7 @@ styleSetFaceName(#wx_ref{type=ThisT,ref=ThisRef},Style,FontName)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetFaceName,
   <<ThisRef:32/?UI,Style:32/?UI,(byte_size(FontName_UC)):32/?UI,(FontName_UC)/binary, 0:(((8- ((4+byte_size(FontName_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleseteolfilled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleseteolfilled">external documentation</a>.
 -spec styleSetEOLFilled(This, Style, Filled) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Filled::boolean().
 styleSetEOLFilled(#wx_ref{type=ThisT,ref=ThisRef},Style,Filled)
@@ -836,7 +836,7 @@ styleSetEOLFilled(#wx_ref{type=ThisT,ref=ThisRef},Style,Filled)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetEOLFilled,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Filled)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleresetdefault">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstyleresetdefault">external documentation</a>.
 -spec styleResetDefault(This) -> ok when
 	This::wxStyledTextCtrl().
 styleResetDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -844,7 +844,7 @@ styleResetDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StyleResetDefault,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetunderline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetunderline">external documentation</a>.
 -spec styleSetUnderline(This, Style, Underline) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Underline::boolean().
 styleSetUnderline(#wx_ref{type=ThisT,ref=ThisRef},Style,Underline)
@@ -853,7 +853,7 @@ styleSetUnderline(#wx_ref{type=ThisT,ref=ThisRef},Style,Underline)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetUnderline,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Underline)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetcase">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetcase">external documentation</a>.
 -spec styleSetCase(This, Style, CaseForce) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), CaseForce::integer().
 styleSetCase(#wx_ref{type=ThisT,ref=ThisRef},Style,CaseForce)
@@ -862,7 +862,7 @@ styleSetCase(#wx_ref{type=ThisT,ref=ThisRef},Style,CaseForce)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetCase,
   <<ThisRef:32/?UI,Style:32/?UI,CaseForce:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesethotspot">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesethotspot">external documentation</a>.
 -spec styleSetHotSpot(This, Style, Hotspot) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Hotspot::boolean().
 styleSetHotSpot(#wx_ref{type=ThisT,ref=ThisRef},Style,Hotspot)
@@ -871,7 +871,7 @@ styleSetHotSpot(#wx_ref{type=ThisT,ref=ThisRef},Style,Hotspot)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetHotSpot,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Hotspot)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselforeground">external documentation</a>.
 -spec setSelForeground(This, UseSetting, Fore) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setSelForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
@@ -880,7 +880,7 @@ setSelForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
   wxe_util:cast(?wxStyledTextCtrl_SetSelForeground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselbackground">external documentation</a>.
 -spec setSelBackground(This, UseSetting, Back) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setSelBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
@@ -889,7 +889,7 @@ setSelBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
   wxe_util:cast(?wxStyledTextCtrl_SetSelBackground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselalpha">external documentation</a>.
 -spec getSelAlpha(This) -> integer() when
 	This::wxStyledTextCtrl().
 getSelAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -897,7 +897,7 @@ getSelAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSelAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselalpha">external documentation</a>.
 -spec setSelAlpha(This, Alpha) -> ok when
 	This::wxStyledTextCtrl(), Alpha::integer().
 setSelAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha)
@@ -906,7 +906,7 @@ setSelAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha)
   wxe_util:cast(?wxStyledTextCtrl_SetSelAlpha,
   <<ThisRef:32/?UI,Alpha:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretforeground">external documentation</a>.
 -spec setCaretForeground(This, Fore) -> ok when
 	This::wxStyledTextCtrl(), Fore::wx:wx_colour().
 setCaretForeground(#wx_ref{type=ThisT,ref=ThisRef},Fore)
@@ -915,7 +915,7 @@ setCaretForeground(#wx_ref{type=ThisT,ref=ThisRef},Fore)
   wxe_util:cast(?wxStyledTextCtrl_SetCaretForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyassign">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyassign">external documentation</a>.
 -spec cmdKeyAssign(This, Key, Modifiers, Cmd) -> ok when
 	This::wxStyledTextCtrl(), Key::integer(), Modifiers::integer(), Cmd::integer().
 cmdKeyAssign(#wx_ref{type=ThisT,ref=ThisRef},Key,Modifiers,Cmd)
@@ -924,7 +924,7 @@ cmdKeyAssign(#wx_ref{type=ThisT,ref=ThisRef},Key,Modifiers,Cmd)
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyAssign,
   <<ThisRef:32/?UI,Key:32/?UI,Modifiers:32/?UI,Cmd:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyclear">external documentation</a>.
 -spec cmdKeyClear(This, Key, Modifiers) -> ok when
 	This::wxStyledTextCtrl(), Key::integer(), Modifiers::integer().
 cmdKeyClear(#wx_ref{type=ThisT,ref=ThisRef},Key,Modifiers)
@@ -933,7 +933,7 @@ cmdKeyClear(#wx_ref{type=ThisT,ref=ThisRef},Key,Modifiers)
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyClear,
   <<ThisRef:32/?UI,Key:32/?UI,Modifiers:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyclearall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyclearall">external documentation</a>.
 -spec cmdKeyClearAll(This) -> ok when
 	This::wxStyledTextCtrl().
 cmdKeyClearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -941,7 +941,7 @@ cmdKeyClearAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyClearAll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstylebytes">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstylebytes">external documentation</a>.
 -spec setStyleBytes(This, Length) -> integer() when
 	This::wxStyledTextCtrl(), Length::integer().
 setStyleBytes(#wx_ref{type=ThisT,ref=ThisRef},Length)
@@ -950,7 +950,7 @@ setStyleBytes(#wx_ref{type=ThisT,ref=ThisRef},Length)
   wxe_util:call(?wxStyledTextCtrl_SetStyleBytes,
   <<ThisRef:32/?UI,Length:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetvisible">external documentation</a>.
 -spec styleSetVisible(This, Style, Visible) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Visible::boolean().
 styleSetVisible(#wx_ref{type=ThisT,ref=ThisRef},Style,Visible)
@@ -959,7 +959,7 @@ styleSetVisible(#wx_ref{type=ThisT,ref=ThisRef},Style,Visible)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetVisible,
   <<ThisRef:32/?UI,Style:32/?UI,(wxe_util:from_bool(Visible)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretperiod">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretperiod">external documentation</a>.
 -spec getCaretPeriod(This) -> integer() when
 	This::wxStyledTextCtrl().
 getCaretPeriod(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -967,7 +967,7 @@ getCaretPeriod(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCaretPeriod,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretperiod">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretperiod">external documentation</a>.
 -spec setCaretPeriod(This, PeriodMilliseconds) -> ok when
 	This::wxStyledTextCtrl(), PeriodMilliseconds::integer().
 setCaretPeriod(#wx_ref{type=ThisT,ref=ThisRef},PeriodMilliseconds)
@@ -976,7 +976,7 @@ setCaretPeriod(#wx_ref{type=ThisT,ref=ThisRef},PeriodMilliseconds)
   wxe_util:cast(?wxStyledTextCtrl_SetCaretPeriod,
   <<ThisRef:32/?UI,PeriodMilliseconds:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwordchars">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwordchars">external documentation</a>.
 -spec setWordChars(This, Characters) -> ok when
 	This::wxStyledTextCtrl(), Characters::unicode:chardata().
 setWordChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
@@ -986,7 +986,7 @@ setWordChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
   wxe_util:cast(?wxStyledTextCtrl_SetWordChars,
   <<ThisRef:32/?UI,(byte_size(Characters_UC)):32/?UI,(Characters_UC)/binary, 0:(((8- ((0+byte_size(Characters_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbeginundoaction">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlbeginundoaction">external documentation</a>.
 -spec beginUndoAction(This) -> ok when
 	This::wxStyledTextCtrl().
 beginUndoAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -994,7 +994,7 @@ beginUndoAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_BeginUndoAction,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlendundoaction">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlendundoaction">external documentation</a>.
 -spec endUndoAction(This) -> ok when
 	This::wxStyledTextCtrl().
 endUndoAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1002,7 +1002,7 @@ endUndoAction(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_EndUndoAction,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorsetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorsetstyle">external documentation</a>.
 -spec indicatorSetStyle(This, Indic, Style) -> ok when
 	This::wxStyledTextCtrl(), Indic::integer(), Style::integer().
 indicatorSetStyle(#wx_ref{type=ThisT,ref=ThisRef},Indic,Style)
@@ -1011,7 +1011,7 @@ indicatorSetStyle(#wx_ref{type=ThisT,ref=ThisRef},Indic,Style)
   wxe_util:cast(?wxStyledTextCtrl_IndicatorSetStyle,
   <<ThisRef:32/?UI,Indic:32/?UI,Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorgetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorgetstyle">external documentation</a>.
 -spec indicatorGetStyle(This, Indic) -> integer() when
 	This::wxStyledTextCtrl(), Indic::integer().
 indicatorGetStyle(#wx_ref{type=ThisT,ref=ThisRef},Indic)
@@ -1020,7 +1020,7 @@ indicatorGetStyle(#wx_ref{type=ThisT,ref=ThisRef},Indic)
   wxe_util:call(?wxStyledTextCtrl_IndicatorGetStyle,
   <<ThisRef:32/?UI,Indic:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorsetforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorsetforeground">external documentation</a>.
 -spec indicatorSetForeground(This, Indic, Fore) -> ok when
 	This::wxStyledTextCtrl(), Indic::integer(), Fore::wx:wx_colour().
 indicatorSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic,Fore)
@@ -1029,7 +1029,7 @@ indicatorSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic,Fore)
   wxe_util:cast(?wxStyledTextCtrl_IndicatorSetForeground,
   <<ThisRef:32/?UI,Indic:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorgetforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlindicatorgetforeground">external documentation</a>.
 -spec indicatorGetForeground(This, Indic) -> wx:wx_colour4() when
 	This::wxStyledTextCtrl(), Indic::integer().
 indicatorGetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic)
@@ -1038,7 +1038,7 @@ indicatorGetForeground(#wx_ref{type=ThisT,ref=ThisRef},Indic)
   wxe_util:call(?wxStyledTextCtrl_IndicatorGetForeground,
   <<ThisRef:32/?UI,Indic:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespaceforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespaceforeground">external documentation</a>.
 -spec setWhitespaceForeground(This, UseSetting, Fore) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setWhitespaceForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
@@ -1047,7 +1047,7 @@ setWhitespaceForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
   wxe_util:cast(?wxStyledTextCtrl_SetWhitespaceForeground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespacebackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespacebackground">external documentation</a>.
 -spec setWhitespaceBackground(This, UseSetting, Back) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setWhitespaceBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
@@ -1056,7 +1056,7 @@ setWhitespaceBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
   wxe_util:cast(?wxStyledTextCtrl_SetWhitespaceBackground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstylebits">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstylebits">external documentation</a>.
 -spec getStyleBits(This) -> integer() when
 	This::wxStyledTextCtrl().
 getStyleBits(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1064,7 +1064,7 @@ getStyleBits(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetStyleBits,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlinestate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlinestate">external documentation</a>.
 -spec setLineState(This, Line, State) -> ok when
 	This::wxStyledTextCtrl(), Line::integer(), State::integer().
 setLineState(#wx_ref{type=ThisT,ref=ThisRef},Line,State)
@@ -1073,7 +1073,7 @@ setLineState(#wx_ref{type=ThisT,ref=ThisRef},Line,State)
   wxe_util:cast(?wxStyledTextCtrl_SetLineState,
   <<ThisRef:32/?UI,Line:32/?UI,State:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinestate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinestate">external documentation</a>.
 -spec getLineState(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 getLineState(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -1082,7 +1082,7 @@ getLineState(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetLineState,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmaxlinestate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmaxlinestate">external documentation</a>.
 -spec getMaxLineState(This) -> integer() when
 	This::wxStyledTextCtrl().
 getMaxLineState(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1090,7 +1090,7 @@ getMaxLineState(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetMaxLineState,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinevisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinevisible">external documentation</a>.
 -spec getCaretLineVisible(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getCaretLineVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1098,7 +1098,7 @@ getCaretLineVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCaretLineVisible,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinevisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinevisible">external documentation</a>.
 -spec setCaretLineVisible(This, Show) -> ok when
 	This::wxStyledTextCtrl(), Show::boolean().
 setCaretLineVisible(#wx_ref{type=ThisT,ref=ThisRef},Show)
@@ -1107,7 +1107,7 @@ setCaretLineVisible(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxStyledTextCtrl_SetCaretLineVisible,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinebackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinebackground">external documentation</a>.
 -spec getCaretLineBackground(This) -> wx:wx_colour4() when
 	This::wxStyledTextCtrl().
 getCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1115,7 +1115,7 @@ getCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCaretLineBackground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinebackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinebackground">external documentation</a>.
 -spec setCaretLineBackground(This, Back) -> ok when
 	This::wxStyledTextCtrl(), Back::wx:wx_colour().
 setCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef},Back)
@@ -1124,7 +1124,7 @@ setCaretLineBackground(#wx_ref{type=ThisT,ref=ThisRef},Back)
   wxe_util:cast(?wxStyledTextCtrl_SetCaretLineBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompshow">external documentation</a>.
 -spec autoCompShow(This, LenEntered, ItemList) -> ok when
 	This::wxStyledTextCtrl(), LenEntered::integer(), ItemList::unicode:chardata().
 autoCompShow(#wx_ref{type=ThisT,ref=ThisRef},LenEntered,ItemList)
@@ -1134,7 +1134,7 @@ autoCompShow(#wx_ref{type=ThisT,ref=ThisRef},LenEntered,ItemList)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompShow,
   <<ThisRef:32/?UI,LenEntered:32/?UI,(byte_size(ItemList_UC)):32/?UI,(ItemList_UC)/binary, 0:(((8- ((4+byte_size(ItemList_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompcancel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompcancel">external documentation</a>.
 -spec autoCompCancel(This) -> ok when
 	This::wxStyledTextCtrl().
 autoCompCancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1142,7 +1142,7 @@ autoCompCancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_AutoCompCancel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompactive">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompactive">external documentation</a>.
 -spec autoCompActive(This) -> boolean() when
 	This::wxStyledTextCtrl().
 autoCompActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1150,7 +1150,7 @@ autoCompActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompActive,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompposstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompposstart">external documentation</a>.
 -spec autoCompPosStart(This) -> integer() when
 	This::wxStyledTextCtrl().
 autoCompPosStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1158,7 +1158,7 @@ autoCompPosStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompPosStart,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompcomplete">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompcomplete">external documentation</a>.
 -spec autoCompComplete(This) -> ok when
 	This::wxStyledTextCtrl().
 autoCompComplete(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1166,7 +1166,7 @@ autoCompComplete(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_AutoCompComplete,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompstops">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompstops">external documentation</a>.
 -spec autoCompStops(This, CharacterSet) -> ok when
 	This::wxStyledTextCtrl(), CharacterSet::unicode:chardata().
 autoCompStops(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
@@ -1176,7 +1176,7 @@ autoCompStops(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompStops,
   <<ThisRef:32/?UI,(byte_size(CharacterSet_UC)):32/?UI,(CharacterSet_UC)/binary, 0:(((8- ((0+byte_size(CharacterSet_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetseparator">external documentation</a>.
 -spec autoCompSetSeparator(This, SeparatorCharacter) -> ok when
 	This::wxStyledTextCtrl(), SeparatorCharacter::integer().
 autoCompSetSeparator(#wx_ref{type=ThisT,ref=ThisRef},SeparatorCharacter)
@@ -1185,7 +1185,7 @@ autoCompSetSeparator(#wx_ref{type=ThisT,ref=ThisRef},SeparatorCharacter)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetSeparator,
   <<ThisRef:32/?UI,SeparatorCharacter:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetseparator">external documentation</a>.
 -spec autoCompGetSeparator(This) -> integer() when
 	This::wxStyledTextCtrl().
 autoCompGetSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1193,7 +1193,7 @@ autoCompGetSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompselect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompselect">external documentation</a>.
 -spec autoCompSelect(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::unicode:chardata().
 autoCompSelect(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -1203,7 +1203,7 @@ autoCompSelect(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSelect,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetcancelatstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetcancelatstart">external documentation</a>.
 -spec autoCompSetCancelAtStart(This, Cancel) -> ok when
 	This::wxStyledTextCtrl(), Cancel::boolean().
 autoCompSetCancelAtStart(#wx_ref{type=ThisT,ref=ThisRef},Cancel)
@@ -1212,7 +1212,7 @@ autoCompSetCancelAtStart(#wx_ref{type=ThisT,ref=ThisRef},Cancel)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetCancelAtStart,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Cancel)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetcancelatstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetcancelatstart">external documentation</a>.
 -spec autoCompGetCancelAtStart(This) -> boolean() when
 	This::wxStyledTextCtrl().
 autoCompGetCancelAtStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1220,7 +1220,7 @@ autoCompGetCancelAtStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetCancelAtStart,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetfillups">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetfillups">external documentation</a>.
 -spec autoCompSetFillUps(This, CharacterSet) -> ok when
 	This::wxStyledTextCtrl(), CharacterSet::unicode:chardata().
 autoCompSetFillUps(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
@@ -1230,7 +1230,7 @@ autoCompSetFillUps(#wx_ref{type=ThisT,ref=ThisRef},CharacterSet)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetFillUps,
   <<ThisRef:32/?UI,(byte_size(CharacterSet_UC)):32/?UI,(CharacterSet_UC)/binary, 0:(((8- ((0+byte_size(CharacterSet_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetchoosesingle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetchoosesingle">external documentation</a>.
 -spec autoCompSetChooseSingle(This, ChooseSingle) -> ok when
 	This::wxStyledTextCtrl(), ChooseSingle::boolean().
 autoCompSetChooseSingle(#wx_ref{type=ThisT,ref=ThisRef},ChooseSingle)
@@ -1239,7 +1239,7 @@ autoCompSetChooseSingle(#wx_ref{type=ThisT,ref=ThisRef},ChooseSingle)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetChooseSingle,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ChooseSingle)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetchoosesingle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetchoosesingle">external documentation</a>.
 -spec autoCompGetChooseSingle(This) -> boolean() when
 	This::wxStyledTextCtrl().
 autoCompGetChooseSingle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1247,7 +1247,7 @@ autoCompGetChooseSingle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetChooseSingle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetignorecase">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetignorecase">external documentation</a>.
 -spec autoCompSetIgnoreCase(This, IgnoreCase) -> ok when
 	This::wxStyledTextCtrl(), IgnoreCase::boolean().
 autoCompSetIgnoreCase(#wx_ref{type=ThisT,ref=ThisRef},IgnoreCase)
@@ -1256,7 +1256,7 @@ autoCompSetIgnoreCase(#wx_ref{type=ThisT,ref=ThisRef},IgnoreCase)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetIgnoreCase,
   <<ThisRef:32/?UI,(wxe_util:from_bool(IgnoreCase)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetignorecase">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetignorecase">external documentation</a>.
 -spec autoCompGetIgnoreCase(This) -> boolean() when
 	This::wxStyledTextCtrl().
 autoCompGetIgnoreCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1264,7 +1264,7 @@ autoCompGetIgnoreCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetIgnoreCase,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrluserlistshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrluserlistshow">external documentation</a>.
 -spec userListShow(This, ListType, ItemList) -> ok when
 	This::wxStyledTextCtrl(), ListType::integer(), ItemList::unicode:chardata().
 userListShow(#wx_ref{type=ThisT,ref=ThisRef},ListType,ItemList)
@@ -1274,7 +1274,7 @@ userListShow(#wx_ref{type=ThisT,ref=ThisRef},ListType,ItemList)
   wxe_util:cast(?wxStyledTextCtrl_UserListShow,
   <<ThisRef:32/?UI,ListType:32/?UI,(byte_size(ItemList_UC)):32/?UI,(ItemList_UC)/binary, 0:(((8- ((4+byte_size(ItemList_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetautohide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetautohide">external documentation</a>.
 -spec autoCompSetAutoHide(This, AutoHide) -> ok when
 	This::wxStyledTextCtrl(), AutoHide::boolean().
 autoCompSetAutoHide(#wx_ref{type=ThisT,ref=ThisRef},AutoHide)
@@ -1283,7 +1283,7 @@ autoCompSetAutoHide(#wx_ref{type=ThisT,ref=ThisRef},AutoHide)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetAutoHide,
   <<ThisRef:32/?UI,(wxe_util:from_bool(AutoHide)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetautohide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetautohide">external documentation</a>.
 -spec autoCompGetAutoHide(This) -> boolean() when
 	This::wxStyledTextCtrl().
 autoCompGetAutoHide(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1291,7 +1291,7 @@ autoCompGetAutoHide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetAutoHide,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetdroprestofword">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetdroprestofword">external documentation</a>.
 -spec autoCompSetDropRestOfWord(This, DropRestOfWord) -> ok when
 	This::wxStyledTextCtrl(), DropRestOfWord::boolean().
 autoCompSetDropRestOfWord(#wx_ref{type=ThisT,ref=ThisRef},DropRestOfWord)
@@ -1300,7 +1300,7 @@ autoCompSetDropRestOfWord(#wx_ref{type=ThisT,ref=ThisRef},DropRestOfWord)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetDropRestOfWord,
   <<ThisRef:32/?UI,(wxe_util:from_bool(DropRestOfWord)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetdroprestofword">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetdroprestofword">external documentation</a>.
 -spec autoCompGetDropRestOfWord(This) -> boolean() when
 	This::wxStyledTextCtrl().
 autoCompGetDropRestOfWord(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1308,7 +1308,7 @@ autoCompGetDropRestOfWord(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetDropRestOfWord,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlregisterimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlregisterimage">external documentation</a>.
 -spec registerImage(This, Type, Bmp) -> ok when
 	This::wxStyledTextCtrl(), Type::integer(), Bmp::wxBitmap:wxBitmap().
 registerImage(#wx_ref{type=ThisT,ref=ThisRef},Type,#wx_ref{type=BmpT,ref=BmpRef})
@@ -1318,7 +1318,7 @@ registerImage(#wx_ref{type=ThisT,ref=ThisRef},Type,#wx_ref{type=BmpT,ref=BmpRef}
   wxe_util:cast(?wxStyledTextCtrl_RegisterImage,
   <<ThisRef:32/?UI,Type:32/?UI,BmpRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlclearregisteredimages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlclearregisteredimages">external documentation</a>.
 -spec clearRegisteredImages(This) -> ok when
 	This::wxStyledTextCtrl().
 clearRegisteredImages(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1326,7 +1326,7 @@ clearRegisteredImages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ClearRegisteredImages,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgettypeseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgettypeseparator">external documentation</a>.
 -spec autoCompGetTypeSeparator(This) -> integer() when
 	This::wxStyledTextCtrl().
 autoCompGetTypeSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1334,7 +1334,7 @@ autoCompGetTypeSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetTypeSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsettypeseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsettypeseparator">external documentation</a>.
 -spec autoCompSetTypeSeparator(This, SeparatorCharacter) -> ok when
 	This::wxStyledTextCtrl(), SeparatorCharacter::integer().
 autoCompSetTypeSeparator(#wx_ref{type=ThisT,ref=ThisRef},SeparatorCharacter)
@@ -1343,7 +1343,7 @@ autoCompSetTypeSeparator(#wx_ref{type=ThisT,ref=ThisRef},SeparatorCharacter)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetTypeSeparator,
   <<ThisRef:32/?UI,SeparatorCharacter:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetmaxwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetmaxwidth">external documentation</a>.
 -spec autoCompSetMaxWidth(This, CharacterCount) -> ok when
 	This::wxStyledTextCtrl(), CharacterCount::integer().
 autoCompSetMaxWidth(#wx_ref{type=ThisT,ref=ThisRef},CharacterCount)
@@ -1352,7 +1352,7 @@ autoCompSetMaxWidth(#wx_ref{type=ThisT,ref=ThisRef},CharacterCount)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetMaxWidth,
   <<ThisRef:32/?UI,CharacterCount:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetmaxwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetmaxwidth">external documentation</a>.
 -spec autoCompGetMaxWidth(This) -> integer() when
 	This::wxStyledTextCtrl().
 autoCompGetMaxWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1360,7 +1360,7 @@ autoCompGetMaxWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetMaxWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetmaxheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompsetmaxheight">external documentation</a>.
 -spec autoCompSetMaxHeight(This, RowCount) -> ok when
 	This::wxStyledTextCtrl(), RowCount::integer().
 autoCompSetMaxHeight(#wx_ref{type=ThisT,ref=ThisRef},RowCount)
@@ -1369,7 +1369,7 @@ autoCompSetMaxHeight(#wx_ref{type=ThisT,ref=ThisRef},RowCount)
   wxe_util:cast(?wxStyledTextCtrl_AutoCompSetMaxHeight,
   <<ThisRef:32/?UI,RowCount:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetmaxheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetmaxheight">external documentation</a>.
 -spec autoCompGetMaxHeight(This) -> integer() when
 	This::wxStyledTextCtrl().
 autoCompGetMaxHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1377,7 +1377,7 @@ autoCompGetMaxHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetMaxHeight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetindent">external documentation</a>.
 -spec setIndent(This, IndentSize) -> ok when
 	This::wxStyledTextCtrl(), IndentSize::integer().
 setIndent(#wx_ref{type=ThisT,ref=ThisRef},IndentSize)
@@ -1386,7 +1386,7 @@ setIndent(#wx_ref{type=ThisT,ref=ThisRef},IndentSize)
   wxe_util:cast(?wxStyledTextCtrl_SetIndent,
   <<ThisRef:32/?UI,IndentSize:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetindent">external documentation</a>.
 -spec getIndent(This) -> integer() when
 	This::wxStyledTextCtrl().
 getIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1394,7 +1394,7 @@ getIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetIndent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetusetabs">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetusetabs">external documentation</a>.
 -spec setUseTabs(This, UseTabs) -> ok when
 	This::wxStyledTextCtrl(), UseTabs::boolean().
 setUseTabs(#wx_ref{type=ThisT,ref=ThisRef},UseTabs)
@@ -1403,7 +1403,7 @@ setUseTabs(#wx_ref{type=ThisT,ref=ThisRef},UseTabs)
   wxe_util:cast(?wxStyledTextCtrl_SetUseTabs,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseTabs)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetusetabs">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetusetabs">external documentation</a>.
 -spec getUseTabs(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getUseTabs(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1411,7 +1411,7 @@ getUseTabs(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetUseTabs,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlineindentation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlineindentation">external documentation</a>.
 -spec setLineIndentation(This, Line, IndentSize) -> ok when
 	This::wxStyledTextCtrl(), Line::integer(), IndentSize::integer().
 setLineIndentation(#wx_ref{type=ThisT,ref=ThisRef},Line,IndentSize)
@@ -1420,7 +1420,7 @@ setLineIndentation(#wx_ref{type=ThisT,ref=ThisRef},Line,IndentSize)
   wxe_util:cast(?wxStyledTextCtrl_SetLineIndentation,
   <<ThisRef:32/?UI,Line:32/?UI,IndentSize:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineindentation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineindentation">external documentation</a>.
 -spec getLineIndentation(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 getLineIndentation(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -1429,7 +1429,7 @@ getLineIndentation(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetLineIndentation,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineindentposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineindentposition">external documentation</a>.
 -spec getLineIndentPosition(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 getLineIndentPosition(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -1438,7 +1438,7 @@ getLineIndentPosition(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetLineIndentPosition,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcolumn">external documentation</a>.
 -spec getColumn(This, Pos) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer().
 getColumn(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -1447,7 +1447,7 @@ getColumn(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_GetColumn,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetusehorizontalscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetusehorizontalscrollbar">external documentation</a>.
 -spec setUseHorizontalScrollBar(This, Show) -> ok when
 	This::wxStyledTextCtrl(), Show::boolean().
 setUseHorizontalScrollBar(#wx_ref{type=ThisT,ref=ThisRef},Show)
@@ -1456,7 +1456,7 @@ setUseHorizontalScrollBar(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxStyledTextCtrl_SetUseHorizontalScrollBar,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetusehorizontalscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetusehorizontalscrollbar">external documentation</a>.
 -spec getUseHorizontalScrollBar(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getUseHorizontalScrollBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1464,7 +1464,7 @@ getUseHorizontalScrollBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetUseHorizontalScrollBar,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetindentationguides">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetindentationguides">external documentation</a>.
 -spec setIndentationGuides(This, Show) -> ok when
 	This::wxStyledTextCtrl(), Show::boolean().
 setIndentationGuides(#wx_ref{type=ThisT,ref=ThisRef},Show)
@@ -1473,7 +1473,7 @@ setIndentationGuides(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxStyledTextCtrl_SetIndentationGuides,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetindentationguides">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetindentationguides">external documentation</a>.
 -spec getIndentationGuides(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getIndentationGuides(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1481,7 +1481,7 @@ getIndentationGuides(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetIndentationGuides,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethighlightguide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsethighlightguide">external documentation</a>.
 -spec setHighlightGuide(This, Column) -> ok when
 	This::wxStyledTextCtrl(), Column::integer().
 setHighlightGuide(#wx_ref{type=ThisT,ref=ThisRef},Column)
@@ -1490,7 +1490,7 @@ setHighlightGuide(#wx_ref{type=ThisT,ref=ThisRef},Column)
   wxe_util:cast(?wxStyledTextCtrl_SetHighlightGuide,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgethighlightguide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgethighlightguide">external documentation</a>.
 -spec getHighlightGuide(This) -> integer() when
 	This::wxStyledTextCtrl().
 getHighlightGuide(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1498,7 +1498,7 @@ getHighlightGuide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetHighlightGuide,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineendposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineendposition">external documentation</a>.
 -spec getLineEndPosition(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 getLineEndPosition(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -1507,7 +1507,7 @@ getLineEndPosition(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetLineEndPosition,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcodepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcodepage">external documentation</a>.
 -spec getCodePage(This) -> integer() when
 	This::wxStyledTextCtrl().
 getCodePage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1515,7 +1515,7 @@ getCodePage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCodePage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretforeground">external documentation</a>.
 -spec getCaretForeground(This) -> wx:wx_colour4() when
 	This::wxStyledTextCtrl().
 getCaretForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1523,7 +1523,7 @@ getCaretForeground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCaretForeground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetreadonly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetreadonly">external documentation</a>.
 -spec getReadOnly(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1531,7 +1531,7 @@ getReadOnly(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetReadOnly,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcurrentpos">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcurrentpos">external documentation</a>.
 -spec setCurrentPos(This, Pos) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer().
 setCurrentPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -1540,7 +1540,7 @@ setCurrentPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxStyledTextCtrl_SetCurrentPos,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionstart">external documentation</a>.
 -spec setSelectionStart(This, Pos) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer().
 setSelectionStart(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -1549,7 +1549,7 @@ setSelectionStart(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxStyledTextCtrl_SetSelectionStart,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionstart">external documentation</a>.
 -spec getSelectionStart(This) -> integer() when
 	This::wxStyledTextCtrl().
 getSelectionStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1557,7 +1557,7 @@ getSelectionStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSelectionStart,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionend">external documentation</a>.
 -spec setSelectionEnd(This, Pos) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer().
 setSelectionEnd(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -1566,7 +1566,7 @@ setSelectionEnd(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxStyledTextCtrl_SetSelectionEnd,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionend">external documentation</a>.
 -spec getSelectionEnd(This) -> integer() when
 	This::wxStyledTextCtrl().
 getSelectionEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1574,7 +1574,7 @@ getSelectionEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSelectionEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetprintmagnification">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetprintmagnification">external documentation</a>.
 -spec setPrintMagnification(This, Magnification) -> ok when
 	This::wxStyledTextCtrl(), Magnification::integer().
 setPrintMagnification(#wx_ref{type=ThisT,ref=ThisRef},Magnification)
@@ -1583,7 +1583,7 @@ setPrintMagnification(#wx_ref{type=ThisT,ref=ThisRef},Magnification)
   wxe_util:cast(?wxStyledTextCtrl_SetPrintMagnification,
   <<ThisRef:32/?UI,Magnification:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintmagnification">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintmagnification">external documentation</a>.
 -spec getPrintMagnification(This) -> integer() when
 	This::wxStyledTextCtrl().
 getPrintMagnification(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1591,7 +1591,7 @@ getPrintMagnification(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetPrintMagnification,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetprintcolourmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetprintcolourmode">external documentation</a>.
 -spec setPrintColourMode(This, Mode) -> ok when
 	This::wxStyledTextCtrl(), Mode::integer().
 setPrintColourMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
@@ -1600,7 +1600,7 @@ setPrintColourMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
   wxe_util:cast(?wxStyledTextCtrl_SetPrintColourMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintcolourmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintcolourmode">external documentation</a>.
 -spec getPrintColourMode(This) -> integer() when
 	This::wxStyledTextCtrl().
 getPrintColourMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1616,7 +1616,7 @@ findText(This,MinPos,MaxPos,Text)
  when is_record(This, wx_ref),is_integer(MinPos),is_integer(MaxPos),is_list(Text) ->
   findText(This,MinPos,MaxPos,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlfindtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlfindtext">external documentation</a>.
 -spec findText(This, MinPos, MaxPos, Text, [Option]) -> integer() when
 	This::wxStyledTextCtrl(), MinPos::integer(), MaxPos::integer(), Text::unicode:chardata(),
 	Option :: {flags, integer()}.
@@ -1630,7 +1630,7 @@ findText(#wx_ref{type=ThisT,ref=ThisRef},MinPos,MaxPos,Text, Options)
   wxe_util:call(?wxStyledTextCtrl_FindText,
   <<ThisRef:32/?UI,MinPos:32/?UI,MaxPos:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlformatrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlformatrange">external documentation</a>.
 -spec formatRange(This, DoDraw, StartPos, EndPos, Draw, Target, RenderRect, PageRect) -> integer() when
 	This::wxStyledTextCtrl(), DoDraw::boolean(), StartPos::integer(), EndPos::integer(), Draw::wxDC:wxDC(), Target::wxDC:wxDC(), RenderRect::{X::integer(), Y::integer(), W::integer(), H::integer()}, PageRect::{X::integer(), Y::integer(), W::integer(), H::integer()}.
 formatRange(#wx_ref{type=ThisT,ref=ThisRef},DoDraw,StartPos,EndPos,#wx_ref{type=DrawT,ref=DrawRef},#wx_ref{type=TargetT,ref=TargetRef},{RenderRectX,RenderRectY,RenderRectW,RenderRectH},{PageRectX,PageRectY,PageRectW,PageRectH})
@@ -1641,7 +1641,7 @@ formatRange(#wx_ref{type=ThisT,ref=ThisRef},DoDraw,StartPos,EndPos,#wx_ref{type=
   wxe_util:call(?wxStyledTextCtrl_FormatRange,
   <<ThisRef:32/?UI,(wxe_util:from_bool(DoDraw)):32/?UI,StartPos:32/?UI,EndPos:32/?UI,DrawRef:32/?UI,TargetRef:32/?UI,RenderRectX:32/?UI,RenderRectY:32/?UI,RenderRectW:32/?UI,RenderRectH:32/?UI,PageRectX:32/?UI,PageRectY:32/?UI,PageRectW:32/?UI,PageRectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfirstvisibleline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfirstvisibleline">external documentation</a>.
 -spec getFirstVisibleLine(This) -> integer() when
 	This::wxStyledTextCtrl().
 getFirstVisibleLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1649,7 +1649,7 @@ getFirstVisibleLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetFirstVisibleLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetline">external documentation</a>.
 -spec getLine(This, Line) -> unicode:charlist() when
 	This::wxStyledTextCtrl(), Line::integer().
 getLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -1658,7 +1658,7 @@ getLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinecount">external documentation</a>.
 -spec getLineCount(This) -> integer() when
 	This::wxStyledTextCtrl().
 getLineCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1666,7 +1666,7 @@ getLineCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetLineCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginleft">external documentation</a>.
 -spec setMarginLeft(This, PixelWidth) -> ok when
 	This::wxStyledTextCtrl(), PixelWidth::integer().
 setMarginLeft(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
@@ -1675,7 +1675,7 @@ setMarginLeft(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
   wxe_util:cast(?wxStyledTextCtrl_SetMarginLeft,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginleft">external documentation</a>.
 -spec getMarginLeft(This) -> integer() when
 	This::wxStyledTextCtrl().
 getMarginLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1683,7 +1683,7 @@ getMarginLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetMarginLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmarginright">external documentation</a>.
 -spec setMarginRight(This, PixelWidth) -> ok when
 	This::wxStyledTextCtrl(), PixelWidth::integer().
 setMarginRight(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
@@ -1692,7 +1692,7 @@ setMarginRight(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
   wxe_util:cast(?wxStyledTextCtrl_SetMarginRight,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmarginright">external documentation</a>.
 -spec getMarginRight(This) -> integer() when
 	This::wxStyledTextCtrl().
 getMarginRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1700,7 +1700,7 @@ getMarginRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetMarginRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmodify">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmodify">external documentation</a>.
 -spec getModify(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getModify(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1708,7 +1708,7 @@ getModify(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetModify,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselection">external documentation</a>.
 -spec setSelection(This, Start, End) -> ok when
 	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
@@ -1717,7 +1717,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
   wxe_util:cast(?wxStyledTextCtrl_SetSelection,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectedtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectedtext">external documentation</a>.
 -spec getSelectedText(This) -> unicode:charlist() when
 	This::wxStyledTextCtrl().
 getSelectedText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1725,7 +1725,7 @@ getSelectedText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSelectedText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextrange">external documentation</a>.
 -spec getTextRange(This, StartPos, EndPos) -> unicode:charlist() when
 	This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer().
 getTextRange(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
@@ -1734,7 +1734,7 @@ getTextRange(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
   wxe_util:call(?wxStyledTextCtrl_GetTextRange,
   <<ThisRef:32/?UI,StartPos:32/?UI,EndPos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhideselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhideselection">external documentation</a>.
 -spec hideSelection(This, Normal) -> ok when
 	This::wxStyledTextCtrl(), Normal::boolean().
 hideSelection(#wx_ref{type=ThisT,ref=ThisRef},Normal)
@@ -1743,7 +1743,7 @@ hideSelection(#wx_ref{type=ThisT,ref=ThisRef},Normal)
   wxe_util:cast(?wxStyledTextCtrl_HideSelection,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Normal)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinefromposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinefromposition">external documentation</a>.
 -spec lineFromPosition(This, Pos) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer().
 lineFromPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -1752,7 +1752,7 @@ lineFromPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_LineFromPosition,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfromline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionfromline">external documentation</a>.
 -spec positionFromLine(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 positionFromLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -1761,7 +1761,7 @@ positionFromLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_PositionFromLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinescroll">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinescroll">external documentation</a>.
 -spec lineScroll(This, Columns, Lines) -> ok when
 	This::wxStyledTextCtrl(), Columns::integer(), Lines::integer().
 lineScroll(#wx_ref{type=ThisT,ref=ThisRef},Columns,Lines)
@@ -1770,7 +1770,7 @@ lineScroll(#wx_ref{type=ThisT,ref=ThisRef},Columns,Lines)
   wxe_util:cast(?wxStyledTextCtrl_LineScroll,
   <<ThisRef:32/?UI,Columns:32/?UI,Lines:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlensurecaretvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlensurecaretvisible">external documentation</a>.
 -spec ensureCaretVisible(This) -> ok when
 	This::wxStyledTextCtrl().
 ensureCaretVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1778,7 +1778,7 @@ ensureCaretVisible(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_EnsureCaretVisible,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlreplaceselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlreplaceselection">external documentation</a>.
 -spec replaceSelection(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::unicode:chardata().
 replaceSelection(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -1788,7 +1788,7 @@ replaceSelection(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_ReplaceSelection,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetreadonly">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetreadonly">external documentation</a>.
 -spec setReadOnly(This, ReadOnly) -> ok when
 	This::wxStyledTextCtrl(), ReadOnly::boolean().
 setReadOnly(#wx_ref{type=ThisT,ref=ThisRef},ReadOnly)
@@ -1797,7 +1797,7 @@ setReadOnly(#wx_ref{type=ThisT,ref=ThisRef},ReadOnly)
   wxe_util:cast(?wxStyledTextCtrl_SetReadOnly,
   <<ThisRef:32/?UI,(wxe_util:from_bool(ReadOnly)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcanpaste">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcanpaste">external documentation</a>.
 -spec canPaste(This) -> boolean() when
 	This::wxStyledTextCtrl().
 canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1805,7 +1805,7 @@ canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_CanPaste,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcanundo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcanundo">external documentation</a>.
 -spec canUndo(This) -> boolean() when
 	This::wxStyledTextCtrl().
 canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1813,7 +1813,7 @@ canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_CanUndo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlemptyundobuffer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlemptyundobuffer">external documentation</a>.
 -spec emptyUndoBuffer(This) -> ok when
 	This::wxStyledTextCtrl().
 emptyUndoBuffer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1821,7 +1821,7 @@ emptyUndoBuffer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_EmptyUndoBuffer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlundo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlundo">external documentation</a>.
 -spec undo(This) -> ok when
 	This::wxStyledTextCtrl().
 undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1829,7 +1829,7 @@ undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Undo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcut">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcut">external documentation</a>.
 -spec cut(This) -> ok when
 	This::wxStyledTextCtrl().
 cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1837,7 +1837,7 @@ cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Cut,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcopy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcopy">external documentation</a>.
 -spec copy(This) -> ok when
 	This::wxStyledTextCtrl().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1845,7 +1845,7 @@ copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Copy,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpaste">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpaste">external documentation</a>.
 -spec paste(This) -> ok when
 	This::wxStyledTextCtrl().
 paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1853,7 +1853,7 @@ paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Paste,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlclear">external documentation</a>.
 -spec clear(This) -> ok when
 	This::wxStyledTextCtrl().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1861,7 +1861,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsettext">external documentation</a>.
 -spec setText(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::unicode:chardata().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -1871,7 +1871,7 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_SetText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettext">external documentation</a>.
 -spec getText(This) -> unicode:charlist() when
 	This::wxStyledTextCtrl().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1879,7 +1879,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextlength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextlength">external documentation</a>.
 -spec getTextLength(This) -> integer() when
 	This::wxStyledTextCtrl().
 getTextLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1887,7 +1887,7 @@ getTextLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetTextLength,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetovertype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetovertype">external documentation</a>.
 -spec getOvertype(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getOvertype(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1895,7 +1895,7 @@ getOvertype(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetOvertype,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretwidth">external documentation</a>.
 -spec setCaretWidth(This, PixelWidth) -> ok when
 	This::wxStyledTextCtrl(), PixelWidth::integer().
 setCaretWidth(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
@@ -1904,7 +1904,7 @@ setCaretWidth(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
   wxe_util:cast(?wxStyledTextCtrl_SetCaretWidth,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretwidth">external documentation</a>.
 -spec getCaretWidth(This) -> integer() when
 	This::wxStyledTextCtrl().
 getCaretWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1912,7 +1912,7 @@ getCaretWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCaretWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettargetstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsettargetstart">external documentation</a>.
 -spec setTargetStart(This, Pos) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer().
 setTargetStart(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -1921,7 +1921,7 @@ setTargetStart(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxStyledTextCtrl_SetTargetStart,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettargetstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettargetstart">external documentation</a>.
 -spec getTargetStart(This) -> integer() when
 	This::wxStyledTextCtrl().
 getTargetStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1929,7 +1929,7 @@ getTargetStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetTargetStart,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettargetend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsettargetend">external documentation</a>.
 -spec setTargetEnd(This, Pos) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer().
 setTargetEnd(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -1938,7 +1938,7 @@ setTargetEnd(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxStyledTextCtrl_SetTargetEnd,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettargetend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettargetend">external documentation</a>.
 -spec getTargetEnd(This) -> integer() when
 	This::wxStyledTextCtrl().
 getTargetEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1946,7 +1946,7 @@ getTargetEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetTargetEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlreplacetarget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlreplacetarget">external documentation</a>.
 -spec replaceTarget(This, Text) -> integer() when
 	This::wxStyledTextCtrl(), Text::unicode:chardata().
 replaceTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -1956,7 +1956,7 @@ replaceTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxStyledTextCtrl_ReplaceTarget,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchintarget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchintarget">external documentation</a>.
 -spec searchInTarget(This, Text) -> integer() when
 	This::wxStyledTextCtrl(), Text::unicode:chardata().
 searchInTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -1966,7 +1966,7 @@ searchInTarget(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:call(?wxStyledTextCtrl_SearchInTarget,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetsearchflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetsearchflags">external documentation</a>.
 -spec setSearchFlags(This, Flags) -> ok when
 	This::wxStyledTextCtrl(), Flags::integer().
 setSearchFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -1975,7 +1975,7 @@ setSearchFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
   wxe_util:cast(?wxStyledTextCtrl_SetSearchFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetsearchflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetsearchflags">external documentation</a>.
 -spec getSearchFlags(This) -> integer() when
 	This::wxStyledTextCtrl().
 getSearchFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1983,7 +1983,7 @@ getSearchFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSearchFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipshow">external documentation</a>.
 -spec callTipShow(This, Pos, Definition) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer(), Definition::unicode:chardata().
 callTipShow(#wx_ref{type=ThisT,ref=ThisRef},Pos,Definition)
@@ -1993,7 +1993,7 @@ callTipShow(#wx_ref{type=ThisT,ref=ThisRef},Pos,Definition)
   wxe_util:cast(?wxStyledTextCtrl_CallTipShow,
   <<ThisRef:32/?UI,Pos:32/?UI,(byte_size(Definition_UC)):32/?UI,(Definition_UC)/binary, 0:(((8- ((4+byte_size(Definition_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipcancel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipcancel">external documentation</a>.
 -spec callTipCancel(This) -> ok when
 	This::wxStyledTextCtrl().
 callTipCancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2001,7 +2001,7 @@ callTipCancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CallTipCancel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipactive">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipactive">external documentation</a>.
 -spec callTipActive(This) -> boolean() when
 	This::wxStyledTextCtrl().
 callTipActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2009,7 +2009,7 @@ callTipActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_CallTipActive,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipposatstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipposatstart">external documentation</a>.
 -spec callTipPosAtStart(This) -> integer() when
 	This::wxStyledTextCtrl().
 callTipPosAtStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2017,7 +2017,7 @@ callTipPosAtStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_CallTipPosAtStart,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsethighlight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsethighlight">external documentation</a>.
 -spec callTipSetHighlight(This, Start, End) -> ok when
 	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 callTipSetHighlight(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
@@ -2026,7 +2026,7 @@ callTipSetHighlight(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetHighlight,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetbackground">external documentation</a>.
 -spec callTipSetBackground(This, Back) -> ok when
 	This::wxStyledTextCtrl(), Back::wx:wx_colour().
 callTipSetBackground(#wx_ref{type=ThisT,ref=ThisRef},Back)
@@ -2035,7 +2035,7 @@ callTipSetBackground(#wx_ref{type=ThisT,ref=ThisRef},Back)
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetBackground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetforeground">external documentation</a>.
 -spec callTipSetForeground(This, Fore) -> ok when
 	This::wxStyledTextCtrl(), Fore::wx:wx_colour().
 callTipSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Fore)
@@ -2044,7 +2044,7 @@ callTipSetForeground(#wx_ref{type=ThisT,ref=ThisRef},Fore)
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetForeground,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetforegroundhighlight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipsetforegroundhighlight">external documentation</a>.
 -spec callTipSetForegroundHighlight(This, Fore) -> ok when
 	This::wxStyledTextCtrl(), Fore::wx:wx_colour().
 callTipSetForegroundHighlight(#wx_ref{type=ThisT,ref=ThisRef},Fore)
@@ -2053,7 +2053,7 @@ callTipSetForegroundHighlight(#wx_ref{type=ThisT,ref=ThisRef},Fore)
   wxe_util:cast(?wxStyledTextCtrl_CallTipSetForegroundHighlight,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipusestyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcalltipusestyle">external documentation</a>.
 -spec callTipUseStyle(This, TabSize) -> ok when
 	This::wxStyledTextCtrl(), TabSize::integer().
 callTipUseStyle(#wx_ref{type=ThisT,ref=ThisRef},TabSize)
@@ -2062,7 +2062,7 @@ callTipUseStyle(#wx_ref{type=ThisT,ref=ThisRef},TabSize)
   wxe_util:cast(?wxStyledTextCtrl_CallTipUseStyle,
   <<ThisRef:32/?UI,TabSize:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvisiblefromdocline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlvisiblefromdocline">external documentation</a>.
 -spec visibleFromDocLine(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 visibleFromDocLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2071,7 +2071,7 @@ visibleFromDocLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_VisibleFromDocLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldoclinefromvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldoclinefromvisible">external documentation</a>.
 -spec docLineFromVisible(This, LineDisplay) -> integer() when
 	This::wxStyledTextCtrl(), LineDisplay::integer().
 docLineFromVisible(#wx_ref{type=ThisT,ref=ThisRef},LineDisplay)
@@ -2080,7 +2080,7 @@ docLineFromVisible(#wx_ref{type=ThisT,ref=ThisRef},LineDisplay)
   wxe_util:call(?wxStyledTextCtrl_DocLineFromVisible,
   <<ThisRef:32/?UI,LineDisplay:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwrapcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwrapcount">external documentation</a>.
 -spec wrapCount(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 wrapCount(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2089,7 +2089,7 @@ wrapCount(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_WrapCount,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldlevel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldlevel">external documentation</a>.
 -spec setFoldLevel(This, Line, Level) -> ok when
 	This::wxStyledTextCtrl(), Line::integer(), Level::integer().
 setFoldLevel(#wx_ref{type=ThisT,ref=ThisRef},Line,Level)
@@ -2098,7 +2098,7 @@ setFoldLevel(#wx_ref{type=ThisT,ref=ThisRef},Line,Level)
   wxe_util:cast(?wxStyledTextCtrl_SetFoldLevel,
   <<ThisRef:32/?UI,Line:32/?UI,Level:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldlevel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldlevel">external documentation</a>.
 -spec getFoldLevel(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 getFoldLevel(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2107,7 +2107,7 @@ getFoldLevel(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetFoldLevel,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlastchild">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlastchild">external documentation</a>.
 -spec getLastChild(This, Line, Level) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer(), Level::integer().
 getLastChild(#wx_ref{type=ThisT,ref=ThisRef},Line,Level)
@@ -2116,7 +2116,7 @@ getLastChild(#wx_ref{type=ThisT,ref=ThisRef},Line,Level)
   wxe_util:call(?wxStyledTextCtrl_GetLastChild,
   <<ThisRef:32/?UI,Line:32/?UI,Level:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldparent">external documentation</a>.
 -spec getFoldParent(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 getFoldParent(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2125,7 +2125,7 @@ getFoldParent(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetFoldParent,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlshowlines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlshowlines">external documentation</a>.
 -spec showLines(This, LineStart, LineEnd) -> ok when
 	This::wxStyledTextCtrl(), LineStart::integer(), LineEnd::integer().
 showLines(#wx_ref{type=ThisT,ref=ThisRef},LineStart,LineEnd)
@@ -2134,7 +2134,7 @@ showLines(#wx_ref{type=ThisT,ref=ThisRef},LineStart,LineEnd)
   wxe_util:cast(?wxStyledTextCtrl_ShowLines,
   <<ThisRef:32/?UI,LineStart:32/?UI,LineEnd:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhidelines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhidelines">external documentation</a>.
 -spec hideLines(This, LineStart, LineEnd) -> ok when
 	This::wxStyledTextCtrl(), LineStart::integer(), LineEnd::integer().
 hideLines(#wx_ref{type=ThisT,ref=ThisRef},LineStart,LineEnd)
@@ -2143,7 +2143,7 @@ hideLines(#wx_ref{type=ThisT,ref=ThisRef},LineStart,LineEnd)
   wxe_util:cast(?wxStyledTextCtrl_HideLines,
   <<ThisRef:32/?UI,LineStart:32/?UI,LineEnd:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinevisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlinevisible">external documentation</a>.
 -spec getLineVisible(This, Line) -> boolean() when
 	This::wxStyledTextCtrl(), Line::integer().
 getLineVisible(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2152,7 +2152,7 @@ getLineVisible(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetLineVisible,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldexpanded">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldexpanded">external documentation</a>.
 -spec setFoldExpanded(This, Line, Expanded) -> ok when
 	This::wxStyledTextCtrl(), Line::integer(), Expanded::boolean().
 setFoldExpanded(#wx_ref{type=ThisT,ref=ThisRef},Line,Expanded)
@@ -2161,7 +2161,7 @@ setFoldExpanded(#wx_ref{type=ThisT,ref=ThisRef},Line,Expanded)
   wxe_util:cast(?wxStyledTextCtrl_SetFoldExpanded,
   <<ThisRef:32/?UI,Line:32/?UI,(wxe_util:from_bool(Expanded)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldexpanded">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetfoldexpanded">external documentation</a>.
 -spec getFoldExpanded(This, Line) -> boolean() when
 	This::wxStyledTextCtrl(), Line::integer().
 getFoldExpanded(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2170,7 +2170,7 @@ getFoldExpanded(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetFoldExpanded,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltogglefold">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrltogglefold">external documentation</a>.
 -spec toggleFold(This, Line) -> ok when
 	This::wxStyledTextCtrl(), Line::integer().
 toggleFold(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2179,7 +2179,7 @@ toggleFold(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:cast(?wxStyledTextCtrl_ToggleFold,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlensurevisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlensurevisible">external documentation</a>.
 -spec ensureVisible(This, Line) -> ok when
 	This::wxStyledTextCtrl(), Line::integer().
 ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2188,7 +2188,7 @@ ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:cast(?wxStyledTextCtrl_EnsureVisible,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldflags">external documentation</a>.
 -spec setFoldFlags(This, Flags) -> ok when
 	This::wxStyledTextCtrl(), Flags::integer().
 setFoldFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -2197,7 +2197,7 @@ setFoldFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
   wxe_util:cast(?wxStyledTextCtrl_SetFoldFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlensurevisibleenforcepolicy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlensurevisibleenforcepolicy">external documentation</a>.
 -spec ensureVisibleEnforcePolicy(This, Line) -> ok when
 	This::wxStyledTextCtrl(), Line::integer().
 ensureVisibleEnforcePolicy(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2206,7 +2206,7 @@ ensureVisibleEnforcePolicy(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:cast(?wxStyledTextCtrl_EnsureVisibleEnforcePolicy,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettabindents">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsettabindents">external documentation</a>.
 -spec setTabIndents(This, TabIndents) -> ok when
 	This::wxStyledTextCtrl(), TabIndents::boolean().
 setTabIndents(#wx_ref{type=ThisT,ref=ThisRef},TabIndents)
@@ -2215,7 +2215,7 @@ setTabIndents(#wx_ref{type=ThisT,ref=ThisRef},TabIndents)
   wxe_util:cast(?wxStyledTextCtrl_SetTabIndents,
   <<ThisRef:32/?UI,(wxe_util:from_bool(TabIndents)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettabindents">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettabindents">external documentation</a>.
 -spec getTabIndents(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getTabIndents(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2223,7 +2223,7 @@ getTabIndents(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetTabIndents,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetbackspaceunindents">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetbackspaceunindents">external documentation</a>.
 -spec setBackSpaceUnIndents(This, BsUnIndents) -> ok when
 	This::wxStyledTextCtrl(), BsUnIndents::boolean().
 setBackSpaceUnIndents(#wx_ref{type=ThisT,ref=ThisRef},BsUnIndents)
@@ -2232,7 +2232,7 @@ setBackSpaceUnIndents(#wx_ref{type=ThisT,ref=ThisRef},BsUnIndents)
   wxe_util:cast(?wxStyledTextCtrl_SetBackSpaceUnIndents,
   <<ThisRef:32/?UI,(wxe_util:from_bool(BsUnIndents)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetbackspaceunindents">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetbackspaceunindents">external documentation</a>.
 -spec getBackSpaceUnIndents(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getBackSpaceUnIndents(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2240,7 +2240,7 @@ getBackSpaceUnIndents(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetBackSpaceUnIndents,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmousedwelltime">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmousedwelltime">external documentation</a>.
 -spec setMouseDwellTime(This, PeriodMilliseconds) -> ok when
 	This::wxStyledTextCtrl(), PeriodMilliseconds::integer().
 setMouseDwellTime(#wx_ref{type=ThisT,ref=ThisRef},PeriodMilliseconds)
@@ -2249,7 +2249,7 @@ setMouseDwellTime(#wx_ref{type=ThisT,ref=ThisRef},PeriodMilliseconds)
   wxe_util:cast(?wxStyledTextCtrl_SetMouseDwellTime,
   <<ThisRef:32/?UI,PeriodMilliseconds:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmousedwelltime">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmousedwelltime">external documentation</a>.
 -spec getMouseDwellTime(This) -> integer() when
 	This::wxStyledTextCtrl().
 getMouseDwellTime(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2257,7 +2257,7 @@ getMouseDwellTime(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetMouseDwellTime,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordstartposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordstartposition">external documentation</a>.
 -spec wordStartPosition(This, Pos, OnlyWordCharacters) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer(), OnlyWordCharacters::boolean().
 wordStartPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos,OnlyWordCharacters)
@@ -2266,7 +2266,7 @@ wordStartPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos,OnlyWordCharacters)
   wxe_util:call(?wxStyledTextCtrl_WordStartPosition,
   <<ThisRef:32/?UI,Pos:32/?UI,(wxe_util:from_bool(OnlyWordCharacters)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordendposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordendposition">external documentation</a>.
 -spec wordEndPosition(This, Pos, OnlyWordCharacters) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer(), OnlyWordCharacters::boolean().
 wordEndPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos,OnlyWordCharacters)
@@ -2275,7 +2275,7 @@ wordEndPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos,OnlyWordCharacters)
   wxe_util:call(?wxStyledTextCtrl_WordEndPosition,
   <<ThisRef:32/?UI,Pos:32/?UI,(wxe_util:from_bool(OnlyWordCharacters)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapmode">external documentation</a>.
 -spec setWrapMode(This, Mode) -> ok when
 	This::wxStyledTextCtrl(), Mode::integer().
 setWrapMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
@@ -2284,7 +2284,7 @@ setWrapMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
   wxe_util:cast(?wxStyledTextCtrl_SetWrapMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapmode">external documentation</a>.
 -spec getWrapMode(This) -> integer() when
 	This::wxStyledTextCtrl().
 getWrapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2292,7 +2292,7 @@ getWrapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetWrapMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapvisualflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapvisualflags">external documentation</a>.
 -spec setWrapVisualFlags(This, WrapVisualFlags) -> ok when
 	This::wxStyledTextCtrl(), WrapVisualFlags::integer().
 setWrapVisualFlags(#wx_ref{type=ThisT,ref=ThisRef},WrapVisualFlags)
@@ -2301,7 +2301,7 @@ setWrapVisualFlags(#wx_ref{type=ThisT,ref=ThisRef},WrapVisualFlags)
   wxe_util:cast(?wxStyledTextCtrl_SetWrapVisualFlags,
   <<ThisRef:32/?UI,WrapVisualFlags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapvisualflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapvisualflags">external documentation</a>.
 -spec getWrapVisualFlags(This) -> integer() when
 	This::wxStyledTextCtrl().
 getWrapVisualFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2309,7 +2309,7 @@ getWrapVisualFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetWrapVisualFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapvisualflagslocation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapvisualflagslocation">external documentation</a>.
 -spec setWrapVisualFlagsLocation(This, WrapVisualFlagsLocation) -> ok when
 	This::wxStyledTextCtrl(), WrapVisualFlagsLocation::integer().
 setWrapVisualFlagsLocation(#wx_ref{type=ThisT,ref=ThisRef},WrapVisualFlagsLocation)
@@ -2318,7 +2318,7 @@ setWrapVisualFlagsLocation(#wx_ref{type=ThisT,ref=ThisRef},WrapVisualFlagsLocati
   wxe_util:cast(?wxStyledTextCtrl_SetWrapVisualFlagsLocation,
   <<ThisRef:32/?UI,WrapVisualFlagsLocation:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapvisualflagslocation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapvisualflagslocation">external documentation</a>.
 -spec getWrapVisualFlagsLocation(This) -> integer() when
 	This::wxStyledTextCtrl().
 getWrapVisualFlagsLocation(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2326,7 +2326,7 @@ getWrapVisualFlagsLocation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetWrapVisualFlagsLocation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapstartindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwrapstartindent">external documentation</a>.
 -spec setWrapStartIndent(This, Indent) -> ok when
 	This::wxStyledTextCtrl(), Indent::integer().
 setWrapStartIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
@@ -2335,7 +2335,7 @@ setWrapStartIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
   wxe_util:cast(?wxStyledTextCtrl_SetWrapStartIndent,
   <<ThisRef:32/?UI,Indent:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapstartindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetwrapstartindent">external documentation</a>.
 -spec getWrapStartIndent(This) -> integer() when
 	This::wxStyledTextCtrl().
 getWrapStartIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2343,7 +2343,7 @@ getWrapStartIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetWrapStartIndent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlayoutcache">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlayoutcache">external documentation</a>.
 -spec setLayoutCache(This, Mode) -> ok when
 	This::wxStyledTextCtrl(), Mode::integer().
 setLayoutCache(#wx_ref{type=ThisT,ref=ThisRef},Mode)
@@ -2352,7 +2352,7 @@ setLayoutCache(#wx_ref{type=ThisT,ref=ThisRef},Mode)
   wxe_util:cast(?wxStyledTextCtrl_SetLayoutCache,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlayoutcache">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlayoutcache">external documentation</a>.
 -spec getLayoutCache(This) -> integer() when
 	This::wxStyledTextCtrl().
 getLayoutCache(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2360,7 +2360,7 @@ getLayoutCache(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetLayoutCache,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetscrollwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetscrollwidth">external documentation</a>.
 -spec setScrollWidth(This, PixelWidth) -> ok when
 	This::wxStyledTextCtrl(), PixelWidth::integer().
 setScrollWidth(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
@@ -2369,7 +2369,7 @@ setScrollWidth(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
   wxe_util:cast(?wxStyledTextCtrl_SetScrollWidth,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetscrollwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetscrollwidth">external documentation</a>.
 -spec getScrollWidth(This) -> integer() when
 	This::wxStyledTextCtrl().
 getScrollWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2377,7 +2377,7 @@ getScrollWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetScrollWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltextwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrltextwidth">external documentation</a>.
 -spec textWidth(This, Style, Text) -> integer() when
 	This::wxStyledTextCtrl(), Style::integer(), Text::unicode:chardata().
 textWidth(#wx_ref{type=ThisT,ref=ThisRef},Style,Text)
@@ -2387,7 +2387,7 @@ textWidth(#wx_ref{type=ThisT,ref=ThisRef},Style,Text)
   wxe_util:call(?wxStyledTextCtrl_TextWidth,
   <<ThisRef:32/?UI,Style:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetendatlastline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetendatlastline">external documentation</a>.
 -spec getEndAtLastLine(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getEndAtLastLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2395,7 +2395,7 @@ getEndAtLastLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetEndAtLastLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltextheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrltextheight">external documentation</a>.
 -spec textHeight(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 textHeight(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2404,7 +2404,7 @@ textHeight(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_TextHeight,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetuseverticalscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetuseverticalscrollbar">external documentation</a>.
 -spec setUseVerticalScrollBar(This, Show) -> ok when
 	This::wxStyledTextCtrl(), Show::boolean().
 setUseVerticalScrollBar(#wx_ref{type=ThisT,ref=ThisRef},Show)
@@ -2413,7 +2413,7 @@ setUseVerticalScrollBar(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxStyledTextCtrl_SetUseVerticalScrollBar,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetuseverticalscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetuseverticalscrollbar">external documentation</a>.
 -spec getUseVerticalScrollBar(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getUseVerticalScrollBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2421,7 +2421,7 @@ getUseVerticalScrollBar(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetUseVerticalScrollBar,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlappendtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlappendtext">external documentation</a>.
 -spec appendText(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::unicode:chardata().
 appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -2431,7 +2431,7 @@ appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AppendText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettwophasedraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettwophasedraw">external documentation</a>.
 -spec getTwoPhaseDraw(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getTwoPhaseDraw(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2439,7 +2439,7 @@ getTwoPhaseDraw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetTwoPhaseDraw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettwophasedraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsettwophasedraw">external documentation</a>.
 -spec setTwoPhaseDraw(This, TwoPhase) -> ok when
 	This::wxStyledTextCtrl(), TwoPhase::boolean().
 setTwoPhaseDraw(#wx_ref{type=ThisT,ref=ThisRef},TwoPhase)
@@ -2448,7 +2448,7 @@ setTwoPhaseDraw(#wx_ref{type=ThisT,ref=ThisRef},TwoPhase)
   wxe_util:cast(?wxStyledTextCtrl_SetTwoPhaseDraw,
   <<ThisRef:32/?UI,(wxe_util:from_bool(TwoPhase)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltargetfromselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrltargetfromselection">external documentation</a>.
 -spec targetFromSelection(This) -> ok when
 	This::wxStyledTextCtrl().
 targetFromSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2456,7 +2456,7 @@ targetFromSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_TargetFromSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinesjoin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinesjoin">external documentation</a>.
 -spec linesJoin(This) -> ok when
 	This::wxStyledTextCtrl().
 linesJoin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2464,7 +2464,7 @@ linesJoin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LinesJoin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinessplit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinessplit">external documentation</a>.
 -spec linesSplit(This, PixelWidth) -> ok when
 	This::wxStyledTextCtrl(), PixelWidth::integer().
 linesSplit(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
@@ -2473,7 +2473,7 @@ linesSplit(#wx_ref{type=ThisT,ref=ThisRef},PixelWidth)
   wxe_util:cast(?wxStyledTextCtrl_LinesSplit,
   <<ThisRef:32/?UI,PixelWidth:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldmargincolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldmargincolour">external documentation</a>.
 -spec setFoldMarginColour(This, UseSetting, Back) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setFoldMarginColour(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
@@ -2482,7 +2482,7 @@ setFoldMarginColour(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
   wxe_util:cast(?wxStyledTextCtrl_SetFoldMarginColour,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldmarginhicolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetfoldmarginhicolour">external documentation</a>.
 -spec setFoldMarginHiColour(This, UseSetting, Fore) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setFoldMarginHiColour(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
@@ -2491,7 +2491,7 @@ setFoldMarginHiColour(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
   wxe_util:cast(?wxStyledTextCtrl_SetFoldMarginHiColour,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinedown">external documentation</a>.
 -spec lineDown(This) -> ok when
 	This::wxStyledTextCtrl().
 lineDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2499,7 +2499,7 @@ lineDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedownextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinedownextend">external documentation</a>.
 -spec lineDownExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2507,7 +2507,7 @@ lineDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineup">external documentation</a>.
 -spec lineUp(This) -> ok when
 	This::wxStyledTextCtrl().
 lineUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2515,7 +2515,7 @@ lineUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineupextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineupextend">external documentation</a>.
 -spec lineUpExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2523,7 +2523,7 @@ lineUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleft">external documentation</a>.
 -spec charLeft(This) -> ok when
 	This::wxStyledTextCtrl().
 charLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2531,7 +2531,7 @@ charLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CharLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleftextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleftextend">external documentation</a>.
 -spec charLeftExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 charLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2539,7 +2539,7 @@ charLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CharLeftExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcharright">external documentation</a>.
 -spec charRight(This) -> ok when
 	This::wxStyledTextCtrl().
 charRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2547,7 +2547,7 @@ charRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CharRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharrightextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcharrightextend">external documentation</a>.
 -spec charRightExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 charRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2555,7 +2555,7 @@ charRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CharRightExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleft">external documentation</a>.
 -spec wordLeft(This) -> ok when
 	This::wxStyledTextCtrl().
 wordLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2563,7 +2563,7 @@ wordLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftextend">external documentation</a>.
 -spec wordLeftExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 wordLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2571,7 +2571,7 @@ wordLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordLeftExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordright">external documentation</a>.
 -spec wordRight(This) -> ok when
 	This::wxStyledTextCtrl().
 wordRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2579,7 +2579,7 @@ wordRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightextend">external documentation</a>.
 -spec wordRightExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 wordRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2587,7 +2587,7 @@ wordRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordRightExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhome">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhome">external documentation</a>.
 -spec home(This) -> ok when
 	This::wxStyledTextCtrl().
 home(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2595,7 +2595,7 @@ home(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Home,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomeextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhomeextend">external documentation</a>.
 -spec homeExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 homeExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2603,7 +2603,7 @@ homeExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_HomeExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineend">external documentation</a>.
 -spec lineEnd(This) -> ok when
 	This::wxStyledTextCtrl().
 lineEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2611,7 +2611,7 @@ lineEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineendextend">external documentation</a>.
 -spec lineEndExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2619,7 +2619,7 @@ lineEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentstart">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentstart">external documentation</a>.
 -spec documentStart(This) -> ok when
 	This::wxStyledTextCtrl().
 documentStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2627,7 +2627,7 @@ documentStart(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DocumentStart,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentstartextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentstartextend">external documentation</a>.
 -spec documentStartExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 documentStartExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2635,7 +2635,7 @@ documentStartExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DocumentStartExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentend">external documentation</a>.
 -spec documentEnd(This) -> ok when
 	This::wxStyledTextCtrl().
 documentEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2643,7 +2643,7 @@ documentEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DocumentEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentendextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldocumentendextend">external documentation</a>.
 -spec documentEndExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 documentEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2651,7 +2651,7 @@ documentEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DocumentEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpageup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpageup">external documentation</a>.
 -spec pageUp(This) -> ok when
 	This::wxStyledTextCtrl().
 pageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2659,7 +2659,7 @@ pageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_PageUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpageupextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpageupextend">external documentation</a>.
 -spec pageUpExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 pageUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2667,7 +2667,7 @@ pageUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_PageUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedown">external documentation</a>.
 -spec pageDown(This) -> ok when
 	This::wxStyledTextCtrl().
 pageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2675,7 +2675,7 @@ pageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_PageDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedownextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedownextend">external documentation</a>.
 -spec pageDownExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 pageDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2683,7 +2683,7 @@ pageDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_PageDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrledittoggleovertype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrledittoggleovertype">external documentation</a>.
 -spec editToggleOvertype(This) -> ok when
 	This::wxStyledTextCtrl().
 editToggleOvertype(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2691,7 +2691,7 @@ editToggleOvertype(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_EditToggleOvertype,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcancel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcancel">external documentation</a>.
 -spec cancel(This) -> ok when
 	This::wxStyledTextCtrl().
 cancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2699,7 +2699,7 @@ cancel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Cancel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldeleteback">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldeleteback">external documentation</a>.
 -spec deleteBack(This) -> ok when
 	This::wxStyledTextCtrl().
 deleteBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2707,7 +2707,7 @@ deleteBack(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DeleteBack,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltab">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrltab">external documentation</a>.
 -spec tab(This) -> ok when
 	This::wxStyledTextCtrl().
 tab(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2715,7 +2715,7 @@ tab(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_Tab,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbacktab">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlbacktab">external documentation</a>.
 -spec backTab(This) -> ok when
 	This::wxStyledTextCtrl().
 backTab(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2723,7 +2723,7 @@ backTab(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_BackTab,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlnewline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlnewline">external documentation</a>.
 -spec newLine(This) -> ok when
 	This::wxStyledTextCtrl().
 newLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2731,7 +2731,7 @@ newLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_NewLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlformfeed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlformfeed">external documentation</a>.
 -spec formFeed(This) -> ok when
 	This::wxStyledTextCtrl().
 formFeed(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2739,7 +2739,7 @@ formFeed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_FormFeed,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchome">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlvchome">external documentation</a>.
 -spec vCHome(This) -> ok when
 	This::wxStyledTextCtrl().
 vCHome(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2747,7 +2747,7 @@ vCHome(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_VCHome,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomeextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomeextend">external documentation</a>.
 -spec vCHomeExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 vCHomeExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2755,7 +2755,7 @@ vCHomeExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_VCHomeExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlzoomin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlzoomin">external documentation</a>.
 -spec zoomIn(This) -> ok when
 	This::wxStyledTextCtrl().
 zoomIn(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2763,7 +2763,7 @@ zoomIn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ZoomIn,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlzoomout">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlzoomout">external documentation</a>.
 -spec zoomOut(This) -> ok when
 	This::wxStyledTextCtrl().
 zoomOut(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2771,7 +2771,7 @@ zoomOut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ZoomOut,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldelwordleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldelwordleft">external documentation</a>.
 -spec delWordLeft(This) -> ok when
 	This::wxStyledTextCtrl().
 delWordLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2779,7 +2779,7 @@ delWordLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DelWordLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldelwordright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldelwordright">external documentation</a>.
 -spec delWordRight(This) -> ok when
 	This::wxStyledTextCtrl().
 delWordRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2787,7 +2787,7 @@ delWordRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DelWordRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinecut">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinecut">external documentation</a>.
 -spec lineCut(This) -> ok when
 	This::wxStyledTextCtrl().
 lineCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2795,7 +2795,7 @@ lineCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineCut,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedelete">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinedelete">external documentation</a>.
 -spec lineDelete(This) -> ok when
 	This::wxStyledTextCtrl().
 lineDelete(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2803,7 +2803,7 @@ lineDelete(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineDelete,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinetranspose">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinetranspose">external documentation</a>.
 -spec lineTranspose(This) -> ok when
 	This::wxStyledTextCtrl().
 lineTranspose(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2811,7 +2811,7 @@ lineTranspose(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineTranspose,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineduplicate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineduplicate">external documentation</a>.
 -spec lineDuplicate(This) -> ok when
 	This::wxStyledTextCtrl().
 lineDuplicate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2819,7 +2819,7 @@ lineDuplicate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineDuplicate,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllowercase">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllowercase">external documentation</a>.
 -spec lowerCase(This) -> ok when
 	This::wxStyledTextCtrl().
 lowerCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2827,7 +2827,7 @@ lowerCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LowerCase,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrluppercase">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrluppercase">external documentation</a>.
 -spec upperCase(This) -> ok when
 	This::wxStyledTextCtrl().
 upperCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2835,7 +2835,7 @@ upperCase(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_UpperCase,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinescrolldown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinescrolldown">external documentation</a>.
 -spec lineScrollDown(This) -> ok when
 	This::wxStyledTextCtrl().
 lineScrollDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2843,7 +2843,7 @@ lineScrollDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineScrollDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinescrollup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinescrollup">external documentation</a>.
 -spec lineScrollUp(This) -> ok when
 	This::wxStyledTextCtrl().
 lineScrollUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2851,7 +2851,7 @@ lineScrollUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineScrollUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldeletebacknotline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldeletebacknotline">external documentation</a>.
 -spec deleteBackNotLine(This) -> ok when
 	This::wxStyledTextCtrl().
 deleteBackNotLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2859,7 +2859,7 @@ deleteBackNotLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DeleteBackNotLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomedisplay">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhomedisplay">external documentation</a>.
 -spec homeDisplay(This) -> ok when
 	This::wxStyledTextCtrl().
 homeDisplay(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2867,7 +2867,7 @@ homeDisplay(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_HomeDisplay,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomedisplayextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhomedisplayextend">external documentation</a>.
 -spec homeDisplayExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 homeDisplayExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2875,7 +2875,7 @@ homeDisplayExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_HomeDisplayExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineenddisplay">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineenddisplay">external documentation</a>.
 -spec lineEndDisplay(This) -> ok when
 	This::wxStyledTextCtrl().
 lineEndDisplay(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2883,7 +2883,7 @@ lineEndDisplay(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineEndDisplay,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineenddisplayextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineenddisplayextend">external documentation</a>.
 -spec lineEndDisplayExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineEndDisplayExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2891,7 +2891,7 @@ lineEndDisplayExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineEndDisplayExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomewrapextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhomewrapextend">external documentation</a>.
 -spec homeWrapExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 homeWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2899,7 +2899,7 @@ homeWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_HomeWrapExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendwrap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineendwrap">external documentation</a>.
 -spec lineEndWrap(This) -> ok when
 	This::wxStyledTextCtrl().
 lineEndWrap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2907,7 +2907,7 @@ lineEndWrap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineEndWrap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendwrapextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineendwrapextend">external documentation</a>.
 -spec lineEndWrapExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineEndWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2915,7 +2915,7 @@ lineEndWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineEndWrapExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomewrap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomewrap">external documentation</a>.
 -spec vCHomeWrap(This) -> ok when
 	This::wxStyledTextCtrl().
 vCHomeWrap(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2923,7 +2923,7 @@ vCHomeWrap(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_VCHomeWrap,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomewrapextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomewrapextend">external documentation</a>.
 -spec vCHomeWrapExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 vCHomeWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2931,7 +2931,7 @@ vCHomeWrapExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_VCHomeWrapExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinecopy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinecopy">external documentation</a>.
 -spec lineCopy(This) -> ok when
 	This::wxStyledTextCtrl().
 lineCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2939,7 +2939,7 @@ lineCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineCopy,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlmovecaretinsideview">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlmovecaretinsideview">external documentation</a>.
 -spec moveCaretInsideView(This) -> ok when
 	This::wxStyledTextCtrl().
 moveCaretInsideView(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2947,7 +2947,7 @@ moveCaretInsideView(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_MoveCaretInsideView,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinelength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinelength">external documentation</a>.
 -spec lineLength(This, Line) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer().
 lineLength(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -2956,7 +2956,7 @@ lineLength(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_LineLength,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbracehighlight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlbracehighlight">external documentation</a>.
 -spec braceHighlight(This, Pos1, Pos2) -> ok when
 	This::wxStyledTextCtrl(), Pos1::integer(), Pos2::integer().
 braceHighlight(#wx_ref{type=ThisT,ref=ThisRef},Pos1,Pos2)
@@ -2965,7 +2965,7 @@ braceHighlight(#wx_ref{type=ThisT,ref=ThisRef},Pos1,Pos2)
   wxe_util:cast(?wxStyledTextCtrl_BraceHighlight,
   <<ThisRef:32/?UI,Pos1:32/?UI,Pos2:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbracebadlight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlbracebadlight">external documentation</a>.
 -spec braceBadLight(This, Pos) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer().
 braceBadLight(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -2974,7 +2974,7 @@ braceBadLight(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxStyledTextCtrl_BraceBadLight,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlbracematch">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlbracematch">external documentation</a>.
 -spec braceMatch(This, Pos) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer().
 braceMatch(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -2983,7 +2983,7 @@ braceMatch(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_BraceMatch,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetvieweol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetvieweol">external documentation</a>.
 -spec getViewEOL(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getViewEOL(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -2991,7 +2991,7 @@ getViewEOL(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetViewEOL,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvieweol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvieweol">external documentation</a>.
 -spec setViewEOL(This, Visible) -> ok when
 	This::wxStyledTextCtrl(), Visible::boolean().
 setViewEOL(#wx_ref{type=ThisT,ref=ThisRef},Visible)
@@ -3000,7 +3000,7 @@ setViewEOL(#wx_ref{type=ThisT,ref=ThisRef},Visible)
   wxe_util:cast(?wxStyledTextCtrl_SetViewEOL,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Visible)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmodeventmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmodeventmask">external documentation</a>.
 -spec setModEventMask(This, Mask) -> ok when
 	This::wxStyledTextCtrl(), Mask::integer().
 setModEventMask(#wx_ref{type=ThisT,ref=ThisRef},Mask)
@@ -3009,7 +3009,7 @@ setModEventMask(#wx_ref{type=ThisT,ref=ThisRef},Mask)
   wxe_util:cast(?wxStyledTextCtrl_SetModEventMask,
   <<ThisRef:32/?UI,Mask:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgecolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgecolumn">external documentation</a>.
 -spec getEdgeColumn(This) -> integer() when
 	This::wxStyledTextCtrl().
 getEdgeColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3017,7 +3017,7 @@ getEdgeColumn(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetEdgeColumn,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgecolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgecolumn">external documentation</a>.
 -spec setEdgeColumn(This, Column) -> ok when
 	This::wxStyledTextCtrl(), Column::integer().
 setEdgeColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
@@ -3026,7 +3026,7 @@ setEdgeColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
   wxe_util:cast(?wxStyledTextCtrl_SetEdgeColumn,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgemode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgemode">external documentation</a>.
 -spec setEdgeMode(This, Mode) -> ok when
 	This::wxStyledTextCtrl(), Mode::integer().
 setEdgeMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
@@ -3035,7 +3035,7 @@ setEdgeMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
   wxe_util:cast(?wxStyledTextCtrl_SetEdgeMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgemode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgemode">external documentation</a>.
 -spec getEdgeMode(This) -> integer() when
 	This::wxStyledTextCtrl().
 getEdgeMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3043,7 +3043,7 @@ getEdgeMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetEdgeMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgecolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetedgecolour">external documentation</a>.
 -spec getEdgeColour(This) -> wx:wx_colour4() when
 	This::wxStyledTextCtrl().
 getEdgeColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3051,7 +3051,7 @@ getEdgeColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetEdgeColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgecolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetedgecolour">external documentation</a>.
 -spec setEdgeColour(This, EdgeColour) -> ok when
 	This::wxStyledTextCtrl(), EdgeColour::wx:wx_colour().
 setEdgeColour(#wx_ref{type=ThisT,ref=ThisRef},EdgeColour)
@@ -3060,7 +3060,7 @@ setEdgeColour(#wx_ref{type=ThisT,ref=ThisRef},EdgeColour)
   wxe_util:cast(?wxStyledTextCtrl_SetEdgeColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(EdgeColour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchanchor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchanchor">external documentation</a>.
 -spec searchAnchor(This) -> ok when
 	This::wxStyledTextCtrl().
 searchAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3068,7 +3068,7 @@ searchAnchor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_SearchAnchor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchnext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchnext">external documentation</a>.
 -spec searchNext(This, Flags, Text) -> integer() when
 	This::wxStyledTextCtrl(), Flags::integer(), Text::unicode:chardata().
 searchNext(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
@@ -3078,7 +3078,7 @@ searchNext(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
   wxe_util:call(?wxStyledTextCtrl_SearchNext,
   <<ThisRef:32/?UI,Flags:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchprev">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsearchprev">external documentation</a>.
 -spec searchPrev(This, Flags, Text) -> integer() when
 	This::wxStyledTextCtrl(), Flags::integer(), Text::unicode:chardata().
 searchPrev(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
@@ -3088,7 +3088,7 @@ searchPrev(#wx_ref{type=ThisT,ref=ThisRef},Flags,Text)
   wxe_util:call(?wxStyledTextCtrl_SearchPrev,
   <<ThisRef:32/?UI,Flags:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinesonscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinesonscreen">external documentation</a>.
 -spec linesOnScreen(This) -> integer() when
 	This::wxStyledTextCtrl().
 linesOnScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3096,7 +3096,7 @@ linesOnScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_LinesOnScreen,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlusepopup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlusepopup">external documentation</a>.
 -spec usePopUp(This, AllowPopUp) -> ok when
 	This::wxStyledTextCtrl(), AllowPopUp::boolean().
 usePopUp(#wx_ref{type=ThisT,ref=ThisRef},AllowPopUp)
@@ -3105,7 +3105,7 @@ usePopUp(#wx_ref{type=ThisT,ref=ThisRef},AllowPopUp)
   wxe_util:cast(?wxStyledTextCtrl_UsePopUp,
   <<ThisRef:32/?UI,(wxe_util:from_bool(AllowPopUp)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlselectionisrectangle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlselectionisrectangle">external documentation</a>.
 -spec selectionIsRectangle(This) -> boolean() when
 	This::wxStyledTextCtrl().
 selectionIsRectangle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3113,7 +3113,7 @@ selectionIsRectangle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_SelectionIsRectangle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetzoom">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetzoom">external documentation</a>.
 -spec setZoom(This, Zoom) -> ok when
 	This::wxStyledTextCtrl(), Zoom::integer().
 setZoom(#wx_ref{type=ThisT,ref=ThisRef},Zoom)
@@ -3122,7 +3122,7 @@ setZoom(#wx_ref{type=ThisT,ref=ThisRef},Zoom)
   wxe_util:cast(?wxStyledTextCtrl_SetZoom,
   <<ThisRef:32/?UI,Zoom:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetzoom">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetzoom">external documentation</a>.
 -spec getZoom(This) -> integer() when
 	This::wxStyledTextCtrl().
 getZoom(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3130,7 +3130,7 @@ getZoom(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetZoom,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmodeventmask">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmodeventmask">external documentation</a>.
 -spec getModEventMask(This) -> integer() when
 	This::wxStyledTextCtrl().
 getModEventMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3138,7 +3138,7 @@ getModEventMask(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetModEventMask,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstcfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstcfocus">external documentation</a>.
 -spec setSTCFocus(This, Focus) -> ok when
 	This::wxStyledTextCtrl(), Focus::boolean().
 setSTCFocus(#wx_ref{type=ThisT,ref=ThisRef},Focus)
@@ -3147,7 +3147,7 @@ setSTCFocus(#wx_ref{type=ThisT,ref=ThisRef},Focus)
   wxe_util:cast(?wxStyledTextCtrl_SetSTCFocus,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Focus)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstcfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstcfocus">external documentation</a>.
 -spec getSTCFocus(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getSTCFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3155,7 +3155,7 @@ getSTCFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSTCFocus,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstatus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstatus">external documentation</a>.
 -spec setStatus(This, StatusCode) -> ok when
 	This::wxStyledTextCtrl(), StatusCode::integer().
 setStatus(#wx_ref{type=ThisT,ref=ThisRef},StatusCode)
@@ -3164,7 +3164,7 @@ setStatus(#wx_ref{type=ThisT,ref=ThisRef},StatusCode)
   wxe_util:cast(?wxStyledTextCtrl_SetStatus,
   <<ThisRef:32/?UI,StatusCode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstatus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstatus">external documentation</a>.
 -spec getStatus(This) -> integer() when
 	This::wxStyledTextCtrl().
 getStatus(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3172,7 +3172,7 @@ getStatus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetStatus,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmousedowncaptures">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmousedowncaptures">external documentation</a>.
 -spec setMouseDownCaptures(This, Captures) -> ok when
 	This::wxStyledTextCtrl(), Captures::boolean().
 setMouseDownCaptures(#wx_ref{type=ThisT,ref=ThisRef},Captures)
@@ -3181,7 +3181,7 @@ setMouseDownCaptures(#wx_ref{type=ThisT,ref=ThisRef},Captures)
   wxe_util:cast(?wxStyledTextCtrl_SetMouseDownCaptures,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Captures)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmousedowncaptures">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetmousedowncaptures">external documentation</a>.
 -spec getMouseDownCaptures(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getMouseDownCaptures(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3189,7 +3189,7 @@ getMouseDownCaptures(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetMouseDownCaptures,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstccursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetstccursor">external documentation</a>.
 -spec setSTCCursor(This, CursorType) -> ok when
 	This::wxStyledTextCtrl(), CursorType::integer().
 setSTCCursor(#wx_ref{type=ThisT,ref=ThisRef},CursorType)
@@ -3198,7 +3198,7 @@ setSTCCursor(#wx_ref{type=ThisT,ref=ThisRef},CursorType)
   wxe_util:cast(?wxStyledTextCtrl_SetSTCCursor,
   <<ThisRef:32/?UI,CursorType:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstccursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstccursor">external documentation</a>.
 -spec getSTCCursor(This) -> integer() when
 	This::wxStyledTextCtrl().
 getSTCCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3206,7 +3206,7 @@ getSTCCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSTCCursor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcontrolcharsymbol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcontrolcharsymbol">external documentation</a>.
 -spec setControlCharSymbol(This, Symbol) -> ok when
 	This::wxStyledTextCtrl(), Symbol::integer().
 setControlCharSymbol(#wx_ref{type=ThisT,ref=ThisRef},Symbol)
@@ -3215,7 +3215,7 @@ setControlCharSymbol(#wx_ref{type=ThisT,ref=ThisRef},Symbol)
   wxe_util:cast(?wxStyledTextCtrl_SetControlCharSymbol,
   <<ThisRef:32/?UI,Symbol:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcontrolcharsymbol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcontrolcharsymbol">external documentation</a>.
 -spec getControlCharSymbol(This) -> integer() when
 	This::wxStyledTextCtrl().
 getControlCharSymbol(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3223,7 +3223,7 @@ getControlCharSymbol(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetControlCharSymbol,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartleft">external documentation</a>.
 -spec wordPartLeft(This) -> ok when
 	This::wxStyledTextCtrl().
 wordPartLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3231,7 +3231,7 @@ wordPartLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordPartLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartleftextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartleftextend">external documentation</a>.
 -spec wordPartLeftExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 wordPartLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3239,7 +3239,7 @@ wordPartLeftExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordPartLeftExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartright">external documentation</a>.
 -spec wordPartRight(This) -> ok when
 	This::wxStyledTextCtrl().
 wordPartRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3247,7 +3247,7 @@ wordPartRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordPartRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartrightextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordpartrightextend">external documentation</a>.
 -spec wordPartRightExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 wordPartRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3255,7 +3255,7 @@ wordPartRightExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordPartRightExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvisiblepolicy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvisiblepolicy">external documentation</a>.
 -spec setVisiblePolicy(This, VisiblePolicy, VisibleSlop) -> ok when
 	This::wxStyledTextCtrl(), VisiblePolicy::integer(), VisibleSlop::integer().
 setVisiblePolicy(#wx_ref{type=ThisT,ref=ThisRef},VisiblePolicy,VisibleSlop)
@@ -3264,7 +3264,7 @@ setVisiblePolicy(#wx_ref{type=ThisT,ref=ThisRef},VisiblePolicy,VisibleSlop)
   wxe_util:cast(?wxStyledTextCtrl_SetVisiblePolicy,
   <<ThisRef:32/?UI,VisiblePolicy:32/?UI,VisibleSlop:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldellineleft">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldellineleft">external documentation</a>.
 -spec delLineLeft(This) -> ok when
 	This::wxStyledTextCtrl().
 delLineLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3272,7 +3272,7 @@ delLineLeft(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DelLineLeft,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldellineright">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldellineright">external documentation</a>.
 -spec delLineRight(This) -> ok when
 	This::wxStyledTextCtrl().
 delLineRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3280,7 +3280,7 @@ delLineRight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_DelLineRight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetxoffset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetxoffset">external documentation</a>.
 -spec getXOffset(This) -> integer() when
 	This::wxStyledTextCtrl().
 getXOffset(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3288,7 +3288,7 @@ getXOffset(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetXOffset,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlchoosecaretx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlchoosecaretx">external documentation</a>.
 -spec chooseCaretX(This) -> ok when
 	This::wxStyledTextCtrl().
 chooseCaretX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3296,7 +3296,7 @@ chooseCaretX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ChooseCaretX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetxcaretpolicy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetxcaretpolicy">external documentation</a>.
 -spec setXCaretPolicy(This, CaretPolicy, CaretSlop) -> ok when
 	This::wxStyledTextCtrl(), CaretPolicy::integer(), CaretSlop::integer().
 setXCaretPolicy(#wx_ref{type=ThisT,ref=ThisRef},CaretPolicy,CaretSlop)
@@ -3305,7 +3305,7 @@ setXCaretPolicy(#wx_ref{type=ThisT,ref=ThisRef},CaretPolicy,CaretSlop)
   wxe_util:cast(?wxStyledTextCtrl_SetXCaretPolicy,
   <<ThisRef:32/?UI,CaretPolicy:32/?UI,CaretSlop:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetycaretpolicy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetycaretpolicy">external documentation</a>.
 -spec setYCaretPolicy(This, CaretPolicy, CaretSlop) -> ok when
 	This::wxStyledTextCtrl(), CaretPolicy::integer(), CaretSlop::integer().
 setYCaretPolicy(#wx_ref{type=ThisT,ref=ThisRef},CaretPolicy,CaretSlop)
@@ -3314,7 +3314,7 @@ setYCaretPolicy(#wx_ref{type=ThisT,ref=ThisRef},CaretPolicy,CaretSlop)
   wxe_util:cast(?wxStyledTextCtrl_SetYCaretPolicy,
   <<ThisRef:32/?UI,CaretPolicy:32/?UI,CaretSlop:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintwrapmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetprintwrapmode">external documentation</a>.
 -spec getPrintWrapMode(This) -> integer() when
 	This::wxStyledTextCtrl().
 getPrintWrapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3322,7 +3322,7 @@ getPrintWrapMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetPrintWrapMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactiveforeground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactiveforeground">external documentation</a>.
 -spec setHotspotActiveForeground(This, UseSetting, Fore) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Fore::wx:wx_colour().
 setHotspotActiveForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
@@ -3331,7 +3331,7 @@ setHotspotActiveForeground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Fore)
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotActiveForeground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Fore)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactivebackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactivebackground">external documentation</a>.
 -spec setHotspotActiveBackground(This, UseSetting, Back) -> ok when
 	This::wxStyledTextCtrl(), UseSetting::boolean(), Back::wx:wx_colour().
 setHotspotActiveBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
@@ -3340,7 +3340,7 @@ setHotspotActiveBackground(#wx_ref{type=ThisT,ref=ThisRef},UseSetting,Back)
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotActiveBackground,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseSetting)):32/?UI,(wxe_util:colour_bin(Back)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactiveunderline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotactiveunderline">external documentation</a>.
 -spec setHotspotActiveUnderline(This, Underline) -> ok when
 	This::wxStyledTextCtrl(), Underline::boolean().
 setHotspotActiveUnderline(#wx_ref{type=ThisT,ref=ThisRef},Underline)
@@ -3349,7 +3349,7 @@ setHotspotActiveUnderline(#wx_ref{type=ThisT,ref=ThisRef},Underline)
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotActiveUnderline,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Underline)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotsingleline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsethotspotsingleline">external documentation</a>.
 -spec setHotspotSingleLine(This, SingleLine) -> ok when
 	This::wxStyledTextCtrl(), SingleLine::boolean().
 setHotspotSingleLine(#wx_ref{type=ThisT,ref=ThisRef},SingleLine)
@@ -3358,7 +3358,7 @@ setHotspotSingleLine(#wx_ref{type=ThisT,ref=ThisRef},SingleLine)
   wxe_util:cast(?wxStyledTextCtrl_SetHotspotSingleLine,
   <<ThisRef:32/?UI,(wxe_util:from_bool(SingleLine)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlparadownextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlparadownextend">external documentation</a>.
 -spec paraDownExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 paraDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3366,7 +3366,7 @@ paraDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ParaDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlparaup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlparaup">external documentation</a>.
 -spec paraUp(This) -> ok when
 	This::wxStyledTextCtrl().
 paraUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3374,7 +3374,7 @@ paraUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ParaUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlparaupextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlparaupextend">external documentation</a>.
 -spec paraUpExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 paraUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3382,7 +3382,7 @@ paraUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ParaUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionbefore">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionbefore">external documentation</a>.
 -spec positionBefore(This, Pos) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer().
 positionBefore(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -3391,7 +3391,7 @@ positionBefore(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_PositionBefore,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionafter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpositionafter">external documentation</a>.
 -spec positionAfter(This, Pos) -> integer() when
 	This::wxStyledTextCtrl(), Pos::integer().
 positionAfter(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -3400,7 +3400,7 @@ positionAfter(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_PositionAfter,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcopyrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcopyrange">external documentation</a>.
 -spec copyRange(This, Start, End) -> ok when
 	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 copyRange(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
@@ -3409,7 +3409,7 @@ copyRange(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
   wxe_util:cast(?wxStyledTextCtrl_CopyRange,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcopytext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcopytext">external documentation</a>.
 -spec copyText(This, Length, Text) -> ok when
 	This::wxStyledTextCtrl(), Length::integer(), Text::unicode:chardata().
 copyText(#wx_ref{type=ThisT,ref=ThisRef},Length,Text)
@@ -3419,7 +3419,7 @@ copyText(#wx_ref{type=ThisT,ref=ThisRef},Length,Text)
   wxe_util:cast(?wxStyledTextCtrl_CopyText,
   <<ThisRef:32/?UI,Length:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetselectionmode">external documentation</a>.
 -spec setSelectionMode(This, Mode) -> ok when
 	This::wxStyledTextCtrl(), Mode::integer().
 setSelectionMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
@@ -3428,7 +3428,7 @@ setSelectionMode(#wx_ref{type=ThisT,ref=ThisRef},Mode)
   wxe_util:cast(?wxStyledTextCtrl_SetSelectionMode,
   <<ThisRef:32/?UI,Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectionmode">external documentation</a>.
 -spec getSelectionMode(This) -> integer() when
 	This::wxStyledTextCtrl().
 getSelectionMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3436,7 +3436,7 @@ getSelectionMode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSelectionMode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllinedownrectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllinedownrectextend">external documentation</a>.
 -spec lineDownRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineDownRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3444,7 +3444,7 @@ lineDownRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineDownRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineuprectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineuprectextend">external documentation</a>.
 -spec lineUpRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineUpRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3452,7 +3452,7 @@ lineUpRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineUpRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleftrectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcharleftrectextend">external documentation</a>.
 -spec charLeftRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 charLeftRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3460,7 +3460,7 @@ charLeftRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CharLeftRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcharrightrectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcharrightrectextend">external documentation</a>.
 -spec charRightRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 charRightRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3468,7 +3468,7 @@ charRightRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_CharRightRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlhomerectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlhomerectextend">external documentation</a>.
 -spec homeRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 homeRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3476,7 +3476,7 @@ homeRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_HomeRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomerectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlvchomerectextend">external documentation</a>.
 -spec vCHomeRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 vCHomeRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3484,7 +3484,7 @@ vCHomeRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_VCHomeRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrllineendrectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrllineendrectextend">external documentation</a>.
 -spec lineEndRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 lineEndRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3492,7 +3492,7 @@ lineEndRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_LineEndRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpageuprectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpageuprectextend">external documentation</a>.
 -spec pageUpRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 pageUpRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3500,7 +3500,7 @@ pageUpRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_PageUpRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedownrectextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpagedownrectextend">external documentation</a>.
 -spec pageDownRectExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 pageDownRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3508,7 +3508,7 @@ pageDownRectExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_PageDownRectExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpageup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpageup">external documentation</a>.
 -spec stutteredPageUp(This) -> ok when
 	This::wxStyledTextCtrl().
 stutteredPageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3516,7 +3516,7 @@ stutteredPageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpageupextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpageupextend">external documentation</a>.
 -spec stutteredPageUpExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 stutteredPageUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3524,7 +3524,7 @@ stutteredPageUpExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageUpExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpagedown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpagedown">external documentation</a>.
 -spec stutteredPageDown(This) -> ok when
 	This::wxStyledTextCtrl().
 stutteredPageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3532,7 +3532,7 @@ stutteredPageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpagedownextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstutteredpagedownextend">external documentation</a>.
 -spec stutteredPageDownExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 stutteredPageDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3540,7 +3540,7 @@ stutteredPageDownExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StutteredPageDownExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftend">external documentation</a>.
 -spec wordLeftEnd(This) -> ok when
 	This::wxStyledTextCtrl().
 wordLeftEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3548,7 +3548,7 @@ wordLeftEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordLeftEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftendextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordleftendextend">external documentation</a>.
 -spec wordLeftEndExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 wordLeftEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3556,7 +3556,7 @@ wordLeftEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordLeftEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightend">external documentation</a>.
 -spec wordRightEnd(This) -> ok when
 	This::wxStyledTextCtrl().
 wordRightEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3564,7 +3564,7 @@ wordRightEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordRightEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightendextend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlwordrightendextend">external documentation</a>.
 -spec wordRightEndExtend(This) -> ok when
 	This::wxStyledTextCtrl().
 wordRightEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3572,7 +3572,7 @@ wordRightEndExtend(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_WordRightEndExtend,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespacechars">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetwhitespacechars">external documentation</a>.
 -spec setWhitespaceChars(This, Characters) -> ok when
 	This::wxStyledTextCtrl(), Characters::unicode:chardata().
 setWhitespaceChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
@@ -3582,7 +3582,7 @@ setWhitespaceChars(#wx_ref{type=ThisT,ref=ThisRef},Characters)
   wxe_util:cast(?wxStyledTextCtrl_SetWhitespaceChars,
   <<ThisRef:32/?UI,(byte_size(Characters_UC)):32/?UI,(Characters_UC)/binary, 0:(((8- ((0+byte_size(Characters_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcharsdefault">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcharsdefault">external documentation</a>.
 -spec setCharsDefault(This) -> ok when
 	This::wxStyledTextCtrl().
 setCharsDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3590,7 +3590,7 @@ setCharsDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_SetCharsDefault,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetcurrent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlautocompgetcurrent">external documentation</a>.
 -spec autoCompGetCurrent(This) -> integer() when
 	This::wxStyledTextCtrl().
 autoCompGetCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3598,7 +3598,7 @@ autoCompGetCurrent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_AutoCompGetCurrent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlallocate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlallocate">external documentation</a>.
 -spec allocate(This, Bytes) -> ok when
 	This::wxStyledTextCtrl(), Bytes::integer().
 allocate(#wx_ref{type=ThisT,ref=ThisRef},Bytes)
@@ -3607,7 +3607,7 @@ allocate(#wx_ref{type=ThisT,ref=ThisRef},Bytes)
   wxe_util:cast(?wxStyledTextCtrl_Allocate,
   <<ThisRef:32/?UI,Bytes:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlfindcolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlfindcolumn">external documentation</a>.
 -spec findColumn(This, Line, Column) -> integer() when
 	This::wxStyledTextCtrl(), Line::integer(), Column::integer().
 findColumn(#wx_ref{type=ThisT,ref=ThisRef},Line,Column)
@@ -3616,7 +3616,7 @@ findColumn(#wx_ref{type=ThisT,ref=ThisRef},Line,Column)
   wxe_util:call(?wxStyledTextCtrl_FindColumn,
   <<ThisRef:32/?UI,Line:32/?UI,Column:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretsticky">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretsticky">external documentation</a>.
 -spec getCaretSticky(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getCaretSticky(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3624,7 +3624,7 @@ getCaretSticky(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCaretSticky,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretsticky">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretsticky">external documentation</a>.
 -spec setCaretSticky(This, UseCaretStickyBehaviour) -> ok when
 	This::wxStyledTextCtrl(), UseCaretStickyBehaviour::boolean().
 setCaretSticky(#wx_ref{type=ThisT,ref=ThisRef},UseCaretStickyBehaviour)
@@ -3633,7 +3633,7 @@ setCaretSticky(#wx_ref{type=ThisT,ref=ThisRef},UseCaretStickyBehaviour)
   wxe_util:cast(?wxStyledTextCtrl_SetCaretSticky,
   <<ThisRef:32/?UI,(wxe_util:from_bool(UseCaretStickyBehaviour)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrltogglecaretsticky">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrltogglecaretsticky">external documentation</a>.
 -spec toggleCaretSticky(This) -> ok when
 	This::wxStyledTextCtrl().
 toggleCaretSticky(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3641,7 +3641,7 @@ toggleCaretSticky(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_ToggleCaretSticky,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetpasteconvertendings">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetpasteconvertendings">external documentation</a>.
 -spec setPasteConvertEndings(This, Convert) -> ok when
 	This::wxStyledTextCtrl(), Convert::boolean().
 setPasteConvertEndings(#wx_ref{type=ThisT,ref=ThisRef},Convert)
@@ -3650,7 +3650,7 @@ setPasteConvertEndings(#wx_ref{type=ThisT,ref=ThisRef},Convert)
   wxe_util:cast(?wxStyledTextCtrl_SetPasteConvertEndings,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Convert)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetpasteconvertendings">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetpasteconvertendings">external documentation</a>.
 -spec getPasteConvertEndings(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getPasteConvertEndings(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3658,7 +3658,7 @@ getPasteConvertEndings(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetPasteConvertEndings,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlselectionduplicate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlselectionduplicate">external documentation</a>.
 -spec selectionDuplicate(This) -> ok when
 	This::wxStyledTextCtrl().
 selectionDuplicate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3666,7 +3666,7 @@ selectionDuplicate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_SelectionDuplicate,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinebackalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetcaretlinebackalpha">external documentation</a>.
 -spec setCaretLineBackAlpha(This, Alpha) -> ok when
 	This::wxStyledTextCtrl(), Alpha::integer().
 setCaretLineBackAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha)
@@ -3675,7 +3675,7 @@ setCaretLineBackAlpha(#wx_ref{type=ThisT,ref=ThisRef},Alpha)
   wxe_util:cast(?wxStyledTextCtrl_SetCaretLineBackAlpha,
   <<ThisRef:32/?UI,Alpha:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinebackalpha">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcaretlinebackalpha">external documentation</a>.
 -spec getCaretLineBackAlpha(This) -> integer() when
 	This::wxStyledTextCtrl().
 getCaretLineBackAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3683,7 +3683,7 @@ getCaretLineBackAlpha(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCaretLineBackAlpha,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstartrecord">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstartrecord">external documentation</a>.
 -spec startRecord(This) -> ok when
 	This::wxStyledTextCtrl().
 startRecord(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3691,7 +3691,7 @@ startRecord(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StartRecord,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstoprecord">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstoprecord">external documentation</a>.
 -spec stopRecord(This) -> ok when
 	This::wxStyledTextCtrl().
 stopRecord(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3699,7 +3699,7 @@ stopRecord(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_StopRecord,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlexer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlexer">external documentation</a>.
 -spec setLexer(This, Lexer) -> ok when
 	This::wxStyledTextCtrl(), Lexer::integer().
 setLexer(#wx_ref{type=ThisT,ref=ThisRef},Lexer)
@@ -3708,7 +3708,7 @@ setLexer(#wx_ref{type=ThisT,ref=ThisRef},Lexer)
   wxe_util:cast(?wxStyledTextCtrl_SetLexer,
   <<ThisRef:32/?UI,Lexer:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlexer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlexer">external documentation</a>.
 -spec getLexer(This) -> integer() when
 	This::wxStyledTextCtrl().
 getLexer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3716,7 +3716,7 @@ getLexer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetLexer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcolourise">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcolourise">external documentation</a>.
 -spec colourise(This, Start, End) -> ok when
 	This::wxStyledTextCtrl(), Start::integer(), End::integer().
 colourise(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
@@ -3725,7 +3725,7 @@ colourise(#wx_ref{type=ThisT,ref=ThisRef},Start,End)
   wxe_util:cast(?wxStyledTextCtrl_Colourise,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetproperty">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetproperty">external documentation</a>.
 -spec setProperty(This, Key, Value) -> ok when
 	This::wxStyledTextCtrl(), Key::unicode:chardata(), Value::unicode:chardata().
 setProperty(#wx_ref{type=ThisT,ref=ThisRef},Key,Value)
@@ -3736,7 +3736,7 @@ setProperty(#wx_ref{type=ThisT,ref=ThisRef},Key,Value)
   wxe_util:cast(?wxStyledTextCtrl_SetProperty,
   <<ThisRef:32/?UI,(byte_size(Key_UC)):32/?UI,(Key_UC)/binary, 0:(((8- ((0+byte_size(Key_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((4+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetkeywords">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetkeywords">external documentation</a>.
 -spec setKeyWords(This, KeywordSet, KeyWords) -> ok when
 	This::wxStyledTextCtrl(), KeywordSet::integer(), KeyWords::unicode:chardata().
 setKeyWords(#wx_ref{type=ThisT,ref=ThisRef},KeywordSet,KeyWords)
@@ -3746,7 +3746,7 @@ setKeyWords(#wx_ref{type=ThisT,ref=ThisRef},KeywordSet,KeyWords)
   wxe_util:cast(?wxStyledTextCtrl_SetKeyWords,
   <<ThisRef:32/?UI,KeywordSet:32/?UI,(byte_size(KeyWords_UC)):32/?UI,(KeyWords_UC)/binary, 0:(((8- ((4+byte_size(KeyWords_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlexerlanguage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlexerlanguage">external documentation</a>.
 -spec setLexerLanguage(This, Language) -> ok when
 	This::wxStyledTextCtrl(), Language::unicode:chardata().
 setLexerLanguage(#wx_ref{type=ThisT,ref=ThisRef},Language)
@@ -3756,7 +3756,7 @@ setLexerLanguage(#wx_ref{type=ThisT,ref=ThisRef},Language)
   wxe_util:cast(?wxStyledTextCtrl_SetLexerLanguage,
   <<ThisRef:32/?UI,(byte_size(Language_UC)):32/?UI,(Language_UC)/binary, 0:(((8- ((0+byte_size(Language_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetproperty">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetproperty">external documentation</a>.
 -spec getProperty(This, Key) -> unicode:charlist() when
 	This::wxStyledTextCtrl(), Key::unicode:chardata().
 getProperty(#wx_ref{type=ThisT,ref=ThisRef},Key)
@@ -3766,7 +3766,7 @@ getProperty(#wx_ref{type=ThisT,ref=ThisRef},Key)
   wxe_util:call(?wxStyledTextCtrl_GetProperty,
   <<ThisRef:32/?UI,(byte_size(Key_UC)):32/?UI,(Key_UC)/binary, 0:(((8- ((0+byte_size(Key_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstylebitsneeded">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetstylebitsneeded">external documentation</a>.
 -spec getStyleBitsNeeded(This) -> integer() when
 	This::wxStyledTextCtrl().
 getStyleBitsNeeded(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3774,7 +3774,7 @@ getStyleBitsNeeded(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetStyleBitsNeeded,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurrentline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurrentline">external documentation</a>.
 -spec getCurrentLine(This) -> integer() when
 	This::wxStyledTextCtrl().
 getCurrentLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3782,7 +3782,7 @@ getCurrentLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCurrentLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetspec">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetspec">external documentation</a>.
 -spec styleSetSpec(This, StyleNum, Spec) -> ok when
 	This::wxStyledTextCtrl(), StyleNum::integer(), Spec::unicode:chardata().
 styleSetSpec(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Spec)
@@ -3792,7 +3792,7 @@ styleSetSpec(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Spec)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetSpec,
   <<ThisRef:32/?UI,StyleNum:32/?UI,(byte_size(Spec_UC)):32/?UI,(Spec_UC)/binary, 0:(((8- ((4+byte_size(Spec_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfont">external documentation</a>.
 -spec styleSetFont(This, StyleNum, Font) -> ok when
 	This::wxStyledTextCtrl(), StyleNum::integer(), Font::wxFont:wxFont().
 styleSetFont(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,#wx_ref{type=FontT,ref=FontRef})
@@ -3810,7 +3810,7 @@ styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline)
  when is_record(This, wx_ref),is_integer(StyleNum),is_integer(Size),is_list(FaceName),is_boolean(Bold),is_boolean(Italic),is_boolean(Underline) ->
   styleSetFontAttr(This,StyleNum,Size,FaceName,Bold,Italic,Underline, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfontattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfontattr">external documentation</a>.
 %%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
 -spec styleSetFontAttr(This, StyleNum, Size, FaceName, Bold, Italic, Underline, [Option]) -> ok when
 	This::wxStyledTextCtrl(), StyleNum::integer(), Size::integer(), FaceName::unicode:chardata(), Bold::boolean(), Italic::boolean(), Underline::boolean(),
@@ -3825,7 +3825,7 @@ styleSetFontAttr(#wx_ref{type=ThisT,ref=ThisRef},StyleNum,Size,FaceName,Bold,Ita
   wxe_util:cast(?wxStyledTextCtrl_StyleSetFontAttr,
   <<ThisRef:32/?UI,StyleNum:32/?UI,Size:32/?UI,(byte_size(FaceName_UC)):32/?UI,(FaceName_UC)/binary, 0:(((8- ((0+byte_size(FaceName_UC)) band 16#7)) band 16#7))/unit:8,(wxe_util:from_bool(Bold)):32/?UI,(wxe_util:from_bool(Italic)):32/?UI,(wxe_util:from_bool(Underline)):32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetcharacterset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetcharacterset">external documentation</a>.
 -spec styleSetCharacterSet(This, Style, CharacterSet) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), CharacterSet::integer().
 styleSetCharacterSet(#wx_ref{type=ThisT,ref=ThisRef},Style,CharacterSet)
@@ -3834,7 +3834,7 @@ styleSetCharacterSet(#wx_ref{type=ThisT,ref=ThisRef},Style,CharacterSet)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetCharacterSet,
   <<ThisRef:32/?UI,Style:32/?UI,CharacterSet:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfontencoding">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlstylesetfontencoding">external documentation</a>.
 %%<br /> Encoding = ?wxFONTENCODING_SYSTEM | ?wxFONTENCODING_DEFAULT | ?wxFONTENCODING_ISO8859_1 | ?wxFONTENCODING_ISO8859_2 | ?wxFONTENCODING_ISO8859_3 | ?wxFONTENCODING_ISO8859_4 | ?wxFONTENCODING_ISO8859_5 | ?wxFONTENCODING_ISO8859_6 | ?wxFONTENCODING_ISO8859_7 | ?wxFONTENCODING_ISO8859_8 | ?wxFONTENCODING_ISO8859_9 | ?wxFONTENCODING_ISO8859_10 | ?wxFONTENCODING_ISO8859_11 | ?wxFONTENCODING_ISO8859_12 | ?wxFONTENCODING_ISO8859_13 | ?wxFONTENCODING_ISO8859_14 | ?wxFONTENCODING_ISO8859_15 | ?wxFONTENCODING_ISO8859_MAX | ?wxFONTENCODING_KOI8 | ?wxFONTENCODING_KOI8_U | ?wxFONTENCODING_ALTERNATIVE | ?wxFONTENCODING_BULGARIAN | ?wxFONTENCODING_CP437 | ?wxFONTENCODING_CP850 | ?wxFONTENCODING_CP852 | ?wxFONTENCODING_CP855 | ?wxFONTENCODING_CP866 | ?wxFONTENCODING_CP874 | ?wxFONTENCODING_CP932 | ?wxFONTENCODING_CP936 | ?wxFONTENCODING_CP949 | ?wxFONTENCODING_CP950 | ?wxFONTENCODING_CP1250 | ?wxFONTENCODING_CP1251 | ?wxFONTENCODING_CP1252 | ?wxFONTENCODING_CP1253 | ?wxFONTENCODING_CP1254 | ?wxFONTENCODING_CP1255 | ?wxFONTENCODING_CP1256 | ?wxFONTENCODING_CP1257 | ?wxFONTENCODING_CP12_MAX | ?wxFONTENCODING_UTF7 | ?wxFONTENCODING_UTF8 | ?wxFONTENCODING_EUC_JP | ?wxFONTENCODING_UTF16BE | ?wxFONTENCODING_UTF16LE | ?wxFONTENCODING_UTF32BE | ?wxFONTENCODING_UTF32LE | ?wxFONTENCODING_MACROMAN | ?wxFONTENCODING_MACJAPANESE | ?wxFONTENCODING_MACCHINESETRAD | ?wxFONTENCODING_MACKOREAN | ?wxFONTENCODING_MACARABIC | ?wxFONTENCODING_MACHEBREW | ?wxFONTENCODING_MACGREEK | ?wxFONTENCODING_MACCYRILLIC | ?wxFONTENCODING_MACDEVANAGARI | ?wxFONTENCODING_MACGURMUKHI | ?wxFONTENCODING_MACGUJARATI | ?wxFONTENCODING_MACORIYA | ?wxFONTENCODING_MACBENGALI | ?wxFONTENCODING_MACTAMIL | ?wxFONTENCODING_MACTELUGU | ?wxFONTENCODING_MACKANNADA | ?wxFONTENCODING_MACMALAJALAM | ?wxFONTENCODING_MACSINHALESE | ?wxFONTENCODING_MACBURMESE | ?wxFONTENCODING_MACKHMER | ?wxFONTENCODING_MACTHAI | ?wxFONTENCODING_MACLAOTIAN | ?wxFONTENCODING_MACGEORGIAN | ?wxFONTENCODING_MACARMENIAN | ?wxFONTENCODING_MACCHINESESIMP | ?wxFONTENCODING_MACTIBETAN | ?wxFONTENCODING_MACMONGOLIAN | ?wxFONTENCODING_MACETHIOPIC | ?wxFONTENCODING_MACCENTRALEUR | ?wxFONTENCODING_MACVIATNAMESE | ?wxFONTENCODING_MACARABICEXT | ?wxFONTENCODING_MACSYMBOL | ?wxFONTENCODING_MACDINGBATS | ?wxFONTENCODING_MACTURKISH | ?wxFONTENCODING_MACCROATIAN | ?wxFONTENCODING_MACICELANDIC | ?wxFONTENCODING_MACROMANIAN | ?wxFONTENCODING_MACCELTIC | ?wxFONTENCODING_MACGAELIC | ?wxFONTENCODING_MACKEYBOARD | ?wxFONTENCODING_MAX | ?wxFONTENCODING_MACMIN | ?wxFONTENCODING_MACMAX | ?wxFONTENCODING_UTF16 | ?wxFONTENCODING_UTF32 | ?wxFONTENCODING_UNICODE | ?wxFONTENCODING_GB2312 | ?wxFONTENCODING_BIG5 | ?wxFONTENCODING_SHIFT_JIS
 -spec styleSetFontEncoding(This, Style, Encoding) -> ok when
 	This::wxStyledTextCtrl(), Style::integer(), Encoding::wx:wx_enum().
@@ -3844,7 +3844,7 @@ styleSetFontEncoding(#wx_ref{type=ThisT,ref=ThisRef},Style,Encoding)
   wxe_util:cast(?wxStyledTextCtrl_StyleSetFontEncoding,
   <<ThisRef:32/?UI,Style:32/?UI,Encoding:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyexecute">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlcmdkeyexecute">external documentation</a>.
 -spec cmdKeyExecute(This, Cmd) -> ok when
 	This::wxStyledTextCtrl(), Cmd::integer().
 cmdKeyExecute(#wx_ref{type=ThisT,ref=ThisRef},Cmd)
@@ -3853,7 +3853,7 @@ cmdKeyExecute(#wx_ref{type=ThisT,ref=ThisRef},Cmd)
   wxe_util:cast(?wxStyledTextCtrl_CmdKeyExecute,
   <<ThisRef:32/?UI,Cmd:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetmargins">external documentation</a>.
 -spec setMargins(This, Left, Right) -> ok when
 	This::wxStyledTextCtrl(), Left::integer(), Right::integer().
 setMargins(#wx_ref{type=ThisT,ref=ThisRef},Left,Right)
@@ -3862,7 +3862,7 @@ setMargins(#wx_ref{type=ThisT,ref=ThisRef},Left,Right)
   wxe_util:cast(?wxStyledTextCtrl_SetMargins,
   <<ThisRef:32/?UI,Left:32/?UI,Right:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselection">external documentation</a>.
 -spec getSelection(This) -> {StartPos::integer(), EndPos::integer()} when
 	This::wxStyledTextCtrl().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3870,7 +3870,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlpointfromposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlpointfromposition">external documentation</a>.
 -spec pointFromPosition(This, Pos) -> {X::integer(), Y::integer()} when
 	This::wxStyledTextCtrl(), Pos::integer().
 pointFromPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -3879,7 +3879,7 @@ pointFromPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxStyledTextCtrl_PointFromPosition,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlscrolltoline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlscrolltoline">external documentation</a>.
 -spec scrollToLine(This, Line) -> ok when
 	This::wxStyledTextCtrl(), Line::integer().
 scrollToLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -3888,7 +3888,7 @@ scrollToLine(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:cast(?wxStyledTextCtrl_ScrollToLine,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlscrolltocolumn">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlscrolltocolumn">external documentation</a>.
 -spec scrollToColumn(This, Column) -> ok when
 	This::wxStyledTextCtrl(), Column::integer().
 scrollToColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
@@ -3897,7 +3897,7 @@ scrollToColumn(#wx_ref{type=ThisT,ref=ThisRef},Column)
   wxe_util:cast(?wxStyledTextCtrl_ScrollToColumn,
   <<ThisRef:32/?UI,Column:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetvscrollbar">external documentation</a>.
 -spec setVScrollBar(This, Bar) -> ok when
 	This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar().
 setVScrollBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BarT,ref=BarRef}) ->
@@ -3906,7 +3906,7 @@ setVScrollBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BarT,ref=BarRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_SetVScrollBar,
   <<ThisRef:32/?UI,BarRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsethscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsethscrollbar">external documentation</a>.
 -spec setHScrollBar(This, Bar) -> ok when
 	This::wxStyledTextCtrl(), Bar::wxScrollBar:wxScrollBar().
 setHScrollBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BarT,ref=BarRef}) ->
@@ -3915,7 +3915,7 @@ setHScrollBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=BarT,ref=BarRef}) ->
   wxe_util:cast(?wxStyledTextCtrl_SetHScrollBar,
   <<ThisRef:32/?UI,BarRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlastkeydownprocessed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlastkeydownprocessed">external documentation</a>.
 -spec getLastKeydownProcessed(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getLastKeydownProcessed(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3923,7 +3923,7 @@ getLastKeydownProcessed(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetLastKeydownProcessed,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlastkeydownprocessed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsetlastkeydownprocessed">external documentation</a>.
 -spec setLastKeydownProcessed(This, Val) -> ok when
 	This::wxStyledTextCtrl(), Val::boolean().
 setLastKeydownProcessed(#wx_ref{type=ThisT,ref=ThisRef},Val)
@@ -3932,7 +3932,7 @@ setLastKeydownProcessed(#wx_ref{type=ThisT,ref=ThisRef},Val)
   wxe_util:cast(?wxStyledTextCtrl_SetLastKeydownProcessed,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Val)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsavefile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsavefile">external documentation</a>.
 -spec saveFile(This, Filename) -> boolean() when
 	This::wxStyledTextCtrl(), Filename::unicode:chardata().
 saveFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
@@ -3942,7 +3942,7 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:call(?wxStyledTextCtrl_SaveFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlloadfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlloadfile">external documentation</a>.
 -spec loadFile(This, Filename) -> boolean() when
 	This::wxStyledTextCtrl(), Filename::unicode:chardata().
 loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
@@ -3952,7 +3952,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},Filename)
   wxe_util:call(?wxStyledTextCtrl_LoadFile,
   <<ThisRef:32/?UI,(byte_size(Filename_UC)):32/?UI,(Filename_UC)/binary, 0:(((8- ((0+byte_size(Filename_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldodragover">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldodragover">external documentation</a>.
 %%<br /> Def = ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
 %%<br /> Res = ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
 -spec doDragOver(This, X, Y, Def) -> wx:wx_enum() when
@@ -3963,7 +3963,7 @@ doDragOver(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Def)
   wxe_util:call(?wxStyledTextCtrl_DoDragOver,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,Def:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrldodroptext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrldodroptext">external documentation</a>.
 -spec doDropText(This, X, Y, Data) -> boolean() when
 	This::wxStyledTextCtrl(), X::integer(), Y::integer(), Data::unicode:chardata().
 doDropText(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Data)
@@ -3973,7 +3973,7 @@ doDropText(#wx_ref{type=ThisT,ref=ThisRef},X,Y,Data)
   wxe_util:call(?wxStyledTextCtrl_DoDropText,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,(byte_size(Data_UC)):32/?UI,(Data_UC)/binary, 0:(((8- ((0+byte_size(Data_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetuseantialiasing">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetuseantialiasing">external documentation</a>.
 -spec getUseAntiAliasing(This) -> boolean() when
 	This::wxStyledTextCtrl().
 getUseAntiAliasing(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -3981,7 +3981,7 @@ getUseAntiAliasing(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetUseAntiAliasing,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrladdtextraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrladdtextraw">external documentation</a>.
 -spec addTextRaw(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::binary().
 addTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -3991,7 +3991,7 @@ addTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_AddTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlinserttextraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlinserttextraw">external documentation</a>.
 -spec insertTextRaw(This, Pos, Text) -> ok when
 	This::wxStyledTextCtrl(), Pos::integer(), Text::binary().
 insertTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
@@ -4001,7 +4001,7 @@ insertTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Pos,Text)
   wxe_util:cast(?wxStyledTextCtrl_InsertTextRaw,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurlineraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetcurlineraw">external documentation</a>.
 -spec getCurLineRaw(This) -> Result when
 	Result ::{Res ::binary(), LinePos::integer()},
 	This::wxStyledTextCtrl().
@@ -4010,7 +4010,7 @@ getCurLineRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetCurLineRaw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetlineraw">external documentation</a>.
 -spec getLineRaw(This, Line) -> binary() when
 	This::wxStyledTextCtrl(), Line::integer().
 getLineRaw(#wx_ref{type=ThisT,ref=ThisRef},Line)
@@ -4019,7 +4019,7 @@ getLineRaw(#wx_ref{type=ThisT,ref=ThisRef},Line)
   wxe_util:call(?wxStyledTextCtrl_GetLineRaw,
   <<ThisRef:32/?UI,Line:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectedtextraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgetselectedtextraw">external documentation</a>.
 -spec getSelectedTextRaw(This) -> binary() when
 	This::wxStyledTextCtrl().
 getSelectedTextRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -4027,7 +4027,7 @@ getSelectedTextRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetSelectedTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextrangeraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextrangeraw">external documentation</a>.
 -spec getTextRangeRaw(This, StartPos, EndPos) -> binary() when
 	This::wxStyledTextCtrl(), StartPos::integer(), EndPos::integer().
 getTextRangeRaw(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
@@ -4036,7 +4036,7 @@ getTextRangeRaw(#wx_ref{type=ThisT,ref=ThisRef},StartPos,EndPos)
   wxe_util:call(?wxStyledTextCtrl_GetTextRangeRaw,
   <<ThisRef:32/?UI,StartPos:32/?UI,EndPos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlsettextraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlsettextraw">external documentation</a>.
 -spec setTextRaw(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::binary().
 setTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -4046,7 +4046,7 @@ setTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxStyledTextCtrl_SetTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlgettextraw">external documentation</a>.
 -spec getTextRaw(This) -> binary() when
 	This::wxStyledTextCtrl().
 getTextRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -4054,7 +4054,7 @@ getTextRaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextCtrl_GetTextRaw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextctrl.html#wxstyledtextctrlappendtextraw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextctrl.html#wxstyledtextctrlappendtextraw">external documentation</a>.
 -spec appendTextRaw(This, Text) -> ok when
 	This::wxStyledTextCtrl(), Text::binary().
 appendTextRaw(#wx_ref{type=ThisT,ref=ThisRef},Text)
diff --git a/lib/wx/src/gen/wxStyledTextEvent.erl b/lib/wx/src/gen/wxStyledTextEvent.erl
index 1c2c79fe5d..7173404df8 100644
--- a/lib/wx/src/gen/wxStyledTextEvent.erl
+++ b/lib/wx/src/gen/wxStyledTextEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html">wxStyledTextEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html">wxStyledTextEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>stc_change</em>, <em>stc_styleneeded</em>, <em>stc_charadded</em>, <em>stc_savepointreached</em>, <em>stc_savepointleft</em>, <em>stc_romodifyattempt</em>, <em>stc_key</em>, <em>stc_doubleclick</em>, <em>stc_updateui</em>, <em>stc_modified</em>, <em>stc_macrorecord</em>, <em>stc_marginclick</em>, <em>stc_needshown</em>, <em>stc_painted</em>, <em>stc_userlistselection</em>, <em>stc_uridropped</em>, <em>stc_dwellstart</em>, <em>stc_dwellend</em>, <em>stc_start_drag</em>, <em>stc_drag_over</em>, <em>stc_do_drop</em>, <em>stc_zoom</em>, <em>stc_hotspot_click</em>, <em>stc_hotspot_dclick</em>, <em>stc_calltip_click</em>, <em>stc_autocomp_selection</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxStyledText(). #wxStyledText{}} event record type.
@@ -51,7 +51,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxStyledTextEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetposition">external documentation</a>.
 -spec getPosition(This) -> integer() when
 	This::wxStyledTextEvent().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -59,7 +59,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetkey">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetkey">external documentation</a>.
 -spec getKey(This) -> integer() when
 	This::wxStyledTextEvent().
 getKey(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -67,7 +67,7 @@ getKey(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetKey,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmodifiers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetmodifiers">external documentation</a>.
 -spec getModifiers(This) -> integer() when
 	This::wxStyledTextEvent().
 getModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -75,7 +75,7 @@ getModifiers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetModifiers,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmodificationtype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetmodificationtype">external documentation</a>.
 -spec getModificationType(This) -> integer() when
 	This::wxStyledTextEvent().
 getModificationType(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -83,7 +83,7 @@ getModificationType(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetModificationType,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgettext">external documentation</a>.
 -spec getText(This) -> unicode:charlist() when
 	This::wxStyledTextEvent().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -91,7 +91,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetlength">external documentation</a>.
 -spec getLength(This) -> integer() when
 	This::wxStyledTextEvent().
 getLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -99,7 +99,7 @@ getLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetLength,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlinesadded">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetlinesadded">external documentation</a>.
 -spec getLinesAdded(This) -> integer() when
 	This::wxStyledTextEvent().
 getLinesAdded(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -107,7 +107,7 @@ getLinesAdded(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetLinesAdded,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetline">external documentation</a>.
 -spec getLine(This) -> integer() when
 	This::wxStyledTextEvent().
 getLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -115,7 +115,7 @@ getLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetfoldlevelnow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetfoldlevelnow">external documentation</a>.
 -spec getFoldLevelNow(This) -> integer() when
 	This::wxStyledTextEvent().
 getFoldLevelNow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -123,7 +123,7 @@ getFoldLevelNow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetFoldLevelNow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetfoldlevelprev">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetfoldlevelprev">external documentation</a>.
 -spec getFoldLevelPrev(This) -> integer() when
 	This::wxStyledTextEvent().
 getFoldLevelPrev(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -131,7 +131,7 @@ getFoldLevelPrev(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetFoldLevelPrev,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmargin">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetmargin">external documentation</a>.
 -spec getMargin(This) -> integer() when
 	This::wxStyledTextEvent().
 getMargin(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -139,7 +139,7 @@ getMargin(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetMargin,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetmessage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetmessage">external documentation</a>.
 -spec getMessage(This) -> integer() when
 	This::wxStyledTextEvent().
 getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -147,7 +147,7 @@ getMessage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetMessage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetwparam">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetwparam">external documentation</a>.
 -spec getWParam(This) -> integer() when
 	This::wxStyledTextEvent().
 getWParam(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -155,7 +155,7 @@ getWParam(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetWParam,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlparam">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetlparam">external documentation</a>.
 -spec getLParam(This) -> integer() when
 	This::wxStyledTextEvent().
 getLParam(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -163,7 +163,7 @@ getLParam(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetLParam,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetlisttype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetlisttype">external documentation</a>.
 -spec getListType(This) -> integer() when
 	This::wxStyledTextEvent().
 getListType(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -171,7 +171,7 @@ getListType(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetListType,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetx">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetx">external documentation</a>.
 -spec getX(This) -> integer() when
 	This::wxStyledTextEvent().
 getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -179,7 +179,7 @@ getX(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetX,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgety">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgety">external documentation</a>.
 -spec getY(This) -> integer() when
 	This::wxStyledTextEvent().
 getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -187,7 +187,7 @@ getY(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetY,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetdragtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetdragtext">external documentation</a>.
 -spec getDragText(This) -> unicode:charlist() when
 	This::wxStyledTextEvent().
 getDragText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -195,7 +195,7 @@ getDragText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetDragText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetdragallowmove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetdragallowmove">external documentation</a>.
 -spec getDragAllowMove(This) -> boolean() when
 	This::wxStyledTextEvent().
 getDragAllowMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -203,7 +203,7 @@ getDragAllowMove(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetDragAllowMove,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetdragresult">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetdragresult">external documentation</a>.
 %%<br /> Res = ?wxDragError | ?wxDragNone | ?wxDragCopy | ?wxDragMove | ?wxDragLink | ?wxDragCancel
 -spec getDragResult(This) -> wx:wx_enum() when
 	This::wxStyledTextEvent().
@@ -212,7 +212,7 @@ getDragResult(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetDragResult,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetshift">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetshift">external documentation</a>.
 -spec getShift(This) -> boolean() when
 	This::wxStyledTextEvent().
 getShift(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -220,7 +220,7 @@ getShift(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetShift,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetcontrol">external documentation</a>.
 -spec getControl(This) -> boolean() when
 	This::wxStyledTextEvent().
 getControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -228,7 +228,7 @@ getControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxStyledTextEvent_GetControl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxstyledtextevent.html#wxstyledtexteventgetalt">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxstyledtextevent.html#wxstyledtexteventgetalt">external documentation</a>.
 -spec getAlt(This) -> boolean() when
 	This::wxStyledTextEvent().
 getAlt(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxSysColourChangedEvent.erl b/lib/wx/src/gen/wxSysColourChangedEvent.erl
index 94777748d2..c9a5fd1e06 100644
--- a/lib/wx/src/gen/wxSysColourChangedEvent.erl
+++ b/lib/wx/src/gen/wxSysColourChangedEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsyscolourchangedevent.html">wxSysColourChangedEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsyscolourchangedevent.html">wxSysColourChangedEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>sys_colour_changed</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxSysColourChanged(). #wxSysColourChanged{}} event record type.
diff --git a/lib/wx/src/gen/wxSystemOptions.erl b/lib/wx/src/gen/wxSystemOptions.erl
index 757eb698a2..5dd4a50f6a 100644
--- a/lib/wx/src/gen/wxSystemOptions.erl
+++ b/lib/wx/src/gen/wxSystemOptions.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html">wxSystemOptions</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemoptions.html">wxSystemOptions</a>.
 %% @type wxSystemOptions().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,7 +34,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSystemOptions() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsgetoption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemoptions.html#wxsystemoptionsgetoption">external documentation</a>.
 -spec getOption(Name) -> unicode:charlist() when
 	Name::unicode:chardata().
 getOption(Name)
@@ -43,7 +43,7 @@ getOption(Name)
   wxe_util:call(?wxSystemOptions_GetOption,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsgetoptionint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemoptions.html#wxsystemoptionsgetoptionint">external documentation</a>.
 -spec getOptionInt(Name) -> integer() when
 	Name::unicode:chardata().
 getOptionInt(Name)
@@ -52,7 +52,7 @@ getOptionInt(Name)
   wxe_util:call(?wxSystemOptions_GetOptionInt,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionshasoption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemoptions.html#wxsystemoptionshasoption">external documentation</a>.
 -spec hasOption(Name) -> boolean() when
 	Name::unicode:chardata().
 hasOption(Name)
@@ -61,7 +61,7 @@ hasOption(Name)
   wxe_util:call(?wxSystemOptions_HasOption,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionsisfalse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemoptions.html#wxsystemoptionsisfalse">external documentation</a>.
 -spec isFalse(Name) -> boolean() when
 	Name::unicode:chardata().
 isFalse(Name)
@@ -70,7 +70,7 @@ isFalse(Name)
   wxe_util:call(?wxSystemOptions_IsFalse,
   <<(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemoptions.html#wxsystemoptionssetoption">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemoptions.html#wxsystemoptionssetoption">external documentation</a>.
 %% <br /> Also:<br />
 %% setOption(Name, Value) -> ok when<br />
 %% 	Name::unicode:chardata(), Value::unicode:chardata().<br />
diff --git a/lib/wx/src/gen/wxSystemSettings.erl b/lib/wx/src/gen/wxSystemSettings.erl
index 630162afd2..e4e9096d19 100644
--- a/lib/wx/src/gen/wxSystemSettings.erl
+++ b/lib/wx/src/gen/wxSystemSettings.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html">wxSystemSettings</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemsettings.html">wxSystemSettings</a>.
 %% @type wxSystemSettings().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,7 +34,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxSystemSettings() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemsettings.html#wxsystemsettingsgetcolour">external documentation</a>.
 %%<br /> Index = ?wxSYS_COLOUR_SCROLLBAR | ?wxSYS_COLOUR_BACKGROUND | ?wxSYS_COLOUR_DESKTOP | ?wxSYS_COLOUR_ACTIVECAPTION | ?wxSYS_COLOUR_INACTIVECAPTION | ?wxSYS_COLOUR_MENU | ?wxSYS_COLOUR_WINDOW | ?wxSYS_COLOUR_WINDOWFRAME | ?wxSYS_COLOUR_MENUTEXT | ?wxSYS_COLOUR_WINDOWTEXT | ?wxSYS_COLOUR_CAPTIONTEXT | ?wxSYS_COLOUR_ACTIVEBORDER | ?wxSYS_COLOUR_INACTIVEBORDER | ?wxSYS_COLOUR_APPWORKSPACE | ?wxSYS_COLOUR_HIGHLIGHT | ?wxSYS_COLOUR_HIGHLIGHTTEXT | ?wxSYS_COLOUR_BTNFACE | ?wxSYS_COLOUR_3DFACE | ?wxSYS_COLOUR_BTNSHADOW | ?wxSYS_COLOUR_3DSHADOW | ?wxSYS_COLOUR_GRAYTEXT | ?wxSYS_COLOUR_BTNTEXT | ?wxSYS_COLOUR_INACTIVECAPTIONTEXT | ?wxSYS_COLOUR_BTNHIGHLIGHT | ?wxSYS_COLOUR_BTNHILIGHT | ?wxSYS_COLOUR_3DHIGHLIGHT | ?wxSYS_COLOUR_3DHILIGHT | ?wxSYS_COLOUR_3DDKSHADOW | ?wxSYS_COLOUR_3DLIGHT | ?wxSYS_COLOUR_INFOTEXT | ?wxSYS_COLOUR_INFOBK | ?wxSYS_COLOUR_LISTBOX | ?wxSYS_COLOUR_HOTLIGHT | ?wxSYS_COLOUR_GRADIENTACTIVECAPTION | ?wxSYS_COLOUR_GRADIENTINACTIVECAPTION | ?wxSYS_COLOUR_MENUHILIGHT | ?wxSYS_COLOUR_MENUBAR | ?wxSYS_COLOUR_LISTBOXTEXT | ?wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT | ?wxSYS_COLOUR_MAX
 -spec getColour(Index) -> wx:wx_colour4() when
 	Index::wx:wx_enum().
@@ -43,7 +43,7 @@ getColour(Index)
   wxe_util:call(?wxSystemSettings_GetColour,
   <<Index:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemsettings.html#wxsystemsettingsgetfont">external documentation</a>.
 %%<br /> Index = ?wxSYS_OEM_FIXED_FONT | ?wxSYS_ANSI_FIXED_FONT | ?wxSYS_ANSI_VAR_FONT | ?wxSYS_SYSTEM_FONT | ?wxSYS_DEVICE_DEFAULT_FONT | ?wxSYS_DEFAULT_PALETTE | ?wxSYS_SYSTEM_FIXED_FONT | ?wxSYS_DEFAULT_GUI_FONT | ?wxSYS_ICONTITLE_FONT
 -spec getFont(Index) -> wxFont:wxFont() when
 	Index::wx:wx_enum().
@@ -60,7 +60,7 @@ getMetric(Index)
  when is_integer(Index) ->
   getMetric(Index, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetmetric">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemsettings.html#wxsystemsettingsgetmetric">external documentation</a>.
 %%<br /> Index = ?wxSYS_MOUSE_BUTTONS | ?wxSYS_BORDER_X | ?wxSYS_BORDER_Y | ?wxSYS_CURSOR_X | ?wxSYS_CURSOR_Y | ?wxSYS_DCLICK_X | ?wxSYS_DCLICK_Y | ?wxSYS_DRAG_X | ?wxSYS_DRAG_Y | ?wxSYS_EDGE_X | ?wxSYS_EDGE_Y | ?wxSYS_HSCROLL_ARROW_X | ?wxSYS_HSCROLL_ARROW_Y | ?wxSYS_HTHUMB_X | ?wxSYS_ICON_X | ?wxSYS_ICON_Y | ?wxSYS_ICONSPACING_X | ?wxSYS_ICONSPACING_Y | ?wxSYS_WINDOWMIN_X | ?wxSYS_WINDOWMIN_Y | ?wxSYS_SCREEN_X | ?wxSYS_SCREEN_Y | ?wxSYS_FRAMESIZE_X | ?wxSYS_FRAMESIZE_Y | ?wxSYS_SMALLICON_X | ?wxSYS_SMALLICON_Y | ?wxSYS_HSCROLL_Y | ?wxSYS_VSCROLL_X | ?wxSYS_VSCROLL_ARROW_X | ?wxSYS_VSCROLL_ARROW_Y | ?wxSYS_VTHUMB_Y | ?wxSYS_CAPTION_Y | ?wxSYS_MENU_Y | ?wxSYS_NETWORK_PRESENT | ?wxSYS_PENWINDOWS_PRESENT | ?wxSYS_SHOW_SOUNDS | ?wxSYS_SWAP_BUTTONS
 -spec getMetric(Index, [Option]) -> integer() when
 	Index::wx:wx_enum(),
@@ -73,7 +73,7 @@ getMetric(Index, Options)
   wxe_util:call(?wxSystemSettings_GetMetric,
   <<Index:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxsystemsettings.html#wxsystemsettingsgetscreentype">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxsystemsettings.html#wxsystemsettingsgetscreentype">external documentation</a>.
 %%<br /> Res = ?wxSYS_SCREEN_NONE | ?wxSYS_SCREEN_TINY | ?wxSYS_SCREEN_PDA | ?wxSYS_SCREEN_SMALL | ?wxSYS_SCREEN_DESKTOP
 -spec getScreenType() -> wx:wx_enum().
 getScreenType() ->
diff --git a/lib/wx/src/gen/wxTaskBarIcon.erl b/lib/wx/src/gen/wxTaskBarIcon.erl
index 5ca2c91b16..be3862fd24 100644
--- a/lib/wx/src/gen/wxTaskBarIcon.erl
+++ b/lib/wx/src/gen/wxTaskBarIcon.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html">wxTaskBarIcon</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html">wxTaskBarIcon</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxEvtHandler}
 %% </p>
@@ -38,13 +38,13 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxTaskBarIcon() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconwxtaskbaricon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconwxtaskbaricon">external documentation</a>.
 -spec new() -> wxTaskBarIcon().
 new() ->
   wxe_util:construct(?wxTaskBarIcon_new,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconpopupmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconpopupmenu">external documentation</a>.
 -spec popupMenu(This, Menu) -> boolean() when
 	This::wxTaskBarIcon(), Menu::wxMenu:wxMenu().
 popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
@@ -53,7 +53,7 @@ popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}) ->
   wxe_util:call(?wxTaskBarIcon_PopupMenu,
   <<ThisRef:32/?UI,MenuRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconremoveicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconremoveicon">external documentation</a>.
 -spec removeIcon(This) -> boolean() when
 	This::wxTaskBarIcon().
 removeIcon(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -69,7 +69,7 @@ setIcon(This,Icon)
  when is_record(This, wx_ref),is_record(Icon, wx_ref) ->
   setIcon(This,Icon, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbaricon.html#wxtaskbariconseticon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbaricon.html#wxtaskbariconseticon">external documentation</a>.
 -spec setIcon(This, Icon, [Option]) -> boolean() when
 	This::wxTaskBarIcon(), Icon::wxIcon:wxIcon(),
 	Option :: {tooltip, unicode:chardata()}.
diff --git a/lib/wx/src/gen/wxTaskBarIconEvent.erl b/lib/wx/src/gen/wxTaskBarIconEvent.erl
index 9f2af608c5..0c57bdf017 100644
--- a/lib/wx/src/gen/wxTaskBarIconEvent.erl
+++ b/lib/wx/src/gen/wxTaskBarIconEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtaskbariconevent.html">wxTaskBarIconEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtaskbariconevent.html">wxTaskBarIconEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>taskbar_move</em>, <em>taskbar_left_down</em>, <em>taskbar_left_up</em>, <em>taskbar_right_down</em>, <em>taskbar_right_up</em>, <em>taskbar_left_dclick</em>, <em>taskbar_right_dclick</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxTaskBarIcon(). #wxTaskBarIcon{}} event record type.
diff --git a/lib/wx/src/gen/wxTextAttr.erl b/lib/wx/src/gen/wxTextAttr.erl
index 16bb943359..7f74cd3dc4 100644
--- a/lib/wx/src/gen/wxTextAttr.erl
+++ b/lib/wx/src/gen/wxTextAttr.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html">wxTextAttr</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html">wxTextAttr</a>.
 %% @type wxTextAttr().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -39,7 +39,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxTextAttr() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrwxtextattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrwxtextattr">external documentation</a>.
 -spec new() -> wxTextAttr().
 new() ->
   wxe_util:construct(?wxTextAttr_new_0,
@@ -53,7 +53,7 @@ new(ColText)
  when tuple_size(ColText) =:= 3; tuple_size(ColText) =:= 4 ->
   new(ColText, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrwxtextattr">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrwxtextattr">external documentation</a>.
 %%<br /> Alignment = ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
 -spec new(ColText, [Option]) -> wxTextAttr() when
 	ColText::wx:wx_colour(),
@@ -70,7 +70,7 @@ new(ColText, Options)
   wxe_util:construct(?wxTextAttr_new_2,
   <<(wxe_util:colour_bin(ColText)):16/binary, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgetalignment">external documentation</a>.
 %%<br /> Res = ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
 -spec getAlignment(This) -> wx:wx_enum() when
 	This::wxTextAttr().
@@ -79,7 +79,7 @@ getAlignment(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetAlignment,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgetbackgroundcolour">external documentation</a>.
 -spec getBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxTextAttr().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -87,7 +87,7 @@ getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxTextAttr().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -95,7 +95,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetleftindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgetleftindent">external documentation</a>.
 -spec getLeftIndent(This) -> integer() when
 	This::wxTextAttr().
 getLeftIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -103,7 +103,7 @@ getLeftIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetLeftIndent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetleftsubindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgetleftsubindent">external documentation</a>.
 -spec getLeftSubIndent(This) -> integer() when
 	This::wxTextAttr().
 getLeftSubIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -111,7 +111,7 @@ getLeftSubIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetLeftSubIndent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetrightindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgetrightindent">external documentation</a>.
 -spec getRightIndent(This) -> integer() when
 	This::wxTextAttr().
 getRightIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -119,7 +119,7 @@ getRightIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetRightIndent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgettabs">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgettabs">external documentation</a>.
 -spec getTabs(This) -> [integer()] when
 	This::wxTextAttr().
 getTabs(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -127,7 +127,7 @@ getTabs(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetTabs,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgettextcolour">external documentation</a>.
 -spec getTextColour(This) -> wx:wx_colour4() when
 	This::wxTextAttr().
 getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -135,7 +135,7 @@ getTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrhasbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrhasbackgroundcolour">external documentation</a>.
 -spec hasBackgroundColour(This) -> boolean() when
 	This::wxTextAttr().
 hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -143,7 +143,7 @@ hasBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_HasBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrhasfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrhasfont">external documentation</a>.
 -spec hasFont(This) -> boolean() when
 	This::wxTextAttr().
 hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -151,7 +151,7 @@ hasFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_HasFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrhastextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrhastextcolour">external documentation</a>.
 -spec hasTextColour(This) -> boolean() when
 	This::wxTextAttr().
 hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -159,7 +159,7 @@ hasTextColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_HasTextColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrgetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrgetflags">external documentation</a>.
 -spec getFlags(This) -> integer() when
 	This::wxTextAttr().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -167,7 +167,7 @@ getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrisdefault">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrisdefault">external documentation</a>.
 -spec isDefault(This) -> boolean() when
 	This::wxTextAttr().
 isDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -175,7 +175,7 @@ isDefault(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextAttr_IsDefault,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetalignment">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsetalignment">external documentation</a>.
 %%<br /> Alignment = ?wxTEXT_ALIGNMENT_DEFAULT | ?wxTEXT_ALIGNMENT_LEFT | ?wxTEXT_ALIGNMENT_CENTRE | ?wxTEXT_ALIGNMENT_CENTER | ?wxTEXT_ALIGNMENT_RIGHT | ?wxTEXT_ALIGNMENT_JUSTIFIED
 -spec setAlignment(This, Alignment) -> ok when
 	This::wxTextAttr(), Alignment::wx:wx_enum().
@@ -185,7 +185,7 @@ setAlignment(#wx_ref{type=ThisT,ref=ThisRef},Alignment)
   wxe_util:cast(?wxTextAttr_SetAlignment,
   <<ThisRef:32/?UI,Alignment:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsetbackgroundcolour">external documentation</a>.
 -spec setBackgroundColour(This, ColBack) -> ok when
 	This::wxTextAttr(), ColBack::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
@@ -194,7 +194,7 @@ setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},ColBack)
   wxe_util:cast(?wxTextAttr_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(ColBack)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsetflags">external documentation</a>.
 -spec setFlags(This, Flags) -> ok when
 	This::wxTextAttr(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -211,7 +211,7 @@ setFont(This,Font)
  when is_record(This, wx_ref),is_record(Font, wx_ref) ->
   setFont(This,Font, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsetfont">external documentation</a>.
 -spec setFont(This, Font, [Option]) -> ok when
 	This::wxTextAttr(), Font::wxFont:wxFont(),
 	Option :: {flags, integer()}.
@@ -233,7 +233,7 @@ setLeftIndent(This,Indent)
  when is_record(This, wx_ref),is_integer(Indent) ->
   setLeftIndent(This,Indent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetleftindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsetleftindent">external documentation</a>.
 -spec setLeftIndent(This, Indent, [Option]) -> ok when
 	This::wxTextAttr(), Indent::integer(),
 	Option :: {subIndent, integer()}.
@@ -246,7 +246,7 @@ setLeftIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent, Options)
   wxe_util:cast(?wxTextAttr_SetLeftIndent,
   <<ThisRef:32/?UI,Indent:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsetrightindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsetrightindent">external documentation</a>.
 -spec setRightIndent(This, Indent) -> ok when
 	This::wxTextAttr(), Indent::integer().
 setRightIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
@@ -255,7 +255,7 @@ setRightIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
   wxe_util:cast(?wxTextAttr_SetRightIndent,
   <<ThisRef:32/?UI,Indent:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsettabs">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsettabs">external documentation</a>.
 -spec setTabs(This, Tabs) -> ok when
 	This::wxTextAttr(), Tabs::[integer()].
 setTabs(#wx_ref{type=ThisT,ref=ThisRef},Tabs)
@@ -265,7 +265,7 @@ setTabs(#wx_ref{type=ThisT,ref=ThisRef},Tabs)
   <<ThisRef:32/?UI,(length(Tabs)):32/?UI,
         (<< <<C:32/?I>> || C <- Tabs>>)/binary, 0:(((0+length(Tabs)) rem 2)*32)>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextattr.html#wxtextattrsettextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextattr.html#wxtextattrsettextcolour">external documentation</a>.
 -spec setTextColour(This, ColText) -> ok when
 	This::wxTextAttr(), ColText::wx:wx_colour().
 setTextColour(#wx_ref{type=ThisT,ref=ThisRef},ColText)
diff --git a/lib/wx/src/gen/wxTextCtrl.erl b/lib/wx/src/gen/wxTextCtrl.erl
index e1f82c40c3..cb85652ceb 100644
--- a/lib/wx/src/gen/wxTextCtrl.erl
+++ b/lib/wx/src/gen/wxTextCtrl.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html">wxTextCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html">wxTextCtrl</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -85,7 +85,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxTextCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwxtextctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlwxtextctrl">external documentation</a>.
 -spec new() -> wxTextCtrl().
 new() ->
   wxe_util:construct(?wxTextCtrl_new_0,
@@ -99,7 +99,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwxtextctrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlwxtextctrl">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxTextCtrl() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {value, unicode:chardata()}
@@ -120,7 +120,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxTextCtrl_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlappendtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlappendtext">external documentation</a>.
 -spec appendText(This, Text) -> ok when
 	This::wxTextCtrl(), Text::unicode:chardata().
 appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -130,7 +130,7 @@ appendText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxTextCtrl_AppendText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcancopy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcancopy">external documentation</a>.
 -spec canCopy(This) -> boolean() when
 	This::wxTextCtrl().
 canCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -138,7 +138,7 @@ canCopy(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_CanCopy,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcancut">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcancut">external documentation</a>.
 -spec canCut(This) -> boolean() when
 	This::wxTextCtrl().
 canCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -146,7 +146,7 @@ canCut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_CanCut,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcanpaste">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcanpaste">external documentation</a>.
 -spec canPaste(This) -> boolean() when
 	This::wxTextCtrl().
 canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -154,7 +154,7 @@ canPaste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_CanPaste,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcanredo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcanredo">external documentation</a>.
 -spec canRedo(This) -> boolean() when
 	This::wxTextCtrl().
 canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -162,7 +162,7 @@ canRedo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_CanRedo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcanundo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcanundo">external documentation</a>.
 -spec canUndo(This) -> boolean() when
 	This::wxTextCtrl().
 canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -170,7 +170,7 @@ canUndo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_CanUndo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlclear">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlclear">external documentation</a>.
 -spec clear(This) -> ok when
 	This::wxTextCtrl().
 clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -178,7 +178,7 @@ clear(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_Clear,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcopy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcopy">external documentation</a>.
 -spec copy(This) -> ok when
 	This::wxTextCtrl().
 copy(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -194,7 +194,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxTextCtrl(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {value, unicode:chardata()}
@@ -216,7 +216,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxTextCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlcut">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlcut">external documentation</a>.
 -spec cut(This) -> ok when
 	This::wxTextCtrl().
 cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -224,7 +224,7 @@ cut(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_Cut,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrldiscardedits">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrldiscardedits">external documentation</a>.
 -spec discardEdits(This) -> ok when
 	This::wxTextCtrl().
 discardEdits(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -232,7 +232,7 @@ discardEdits(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_DiscardEdits,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlemulatekeypress">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlemulatekeypress">external documentation</a>.
 -spec emulateKeyPress(This, Event) -> boolean() when
 	This::wxTextCtrl(), Event::wxKeyEvent:wxKeyEvent().
 emulateKeyPress(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef}) ->
@@ -241,7 +241,7 @@ emulateKeyPress(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=EventT,ref=EventRef
   wxe_util:call(?wxTextCtrl_EmulateKeyPress,
   <<ThisRef:32/?UI,EventRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetdefaultstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetdefaultstyle">external documentation</a>.
 -spec getDefaultStyle(This) -> wxTextAttr:wxTextAttr() when
 	This::wxTextCtrl().
 getDefaultStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -249,7 +249,7 @@ getDefaultStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_GetDefaultStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetinsertionpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetinsertionpoint">external documentation</a>.
 -spec getInsertionPoint(This) -> integer() when
 	This::wxTextCtrl().
 getInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -257,7 +257,7 @@ getInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_GetInsertionPoint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetlastposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetlastposition">external documentation</a>.
 -spec getLastPosition(This) -> integer() when
 	This::wxTextCtrl().
 getLastPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -265,7 +265,7 @@ getLastPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_GetLastPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetlinelength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetlinelength">external documentation</a>.
 -spec getLineLength(This, LineNo) -> integer() when
 	This::wxTextCtrl(), LineNo::integer().
 getLineLength(#wx_ref{type=ThisT,ref=ThisRef},LineNo)
@@ -274,7 +274,7 @@ getLineLength(#wx_ref{type=ThisT,ref=ThisRef},LineNo)
   wxe_util:call(?wxTextCtrl_GetLineLength,
   <<ThisRef:32/?UI,LineNo:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetlinetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetlinetext">external documentation</a>.
 -spec getLineText(This, LineNo) -> unicode:charlist() when
 	This::wxTextCtrl(), LineNo::integer().
 getLineText(#wx_ref{type=ThisT,ref=ThisRef},LineNo)
@@ -283,7 +283,7 @@ getLineText(#wx_ref{type=ThisT,ref=ThisRef},LineNo)
   wxe_util:call(?wxTextCtrl_GetLineText,
   <<ThisRef:32/?UI,LineNo:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetnumberoflines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetnumberoflines">external documentation</a>.
 -spec getNumberOfLines(This) -> integer() when
 	This::wxTextCtrl().
 getNumberOfLines(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -291,7 +291,7 @@ getNumberOfLines(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_GetNumberOfLines,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetrange">external documentation</a>.
 -spec getRange(This, From, To) -> unicode:charlist() when
 	This::wxTextCtrl(), From::integer(), To::integer().
 getRange(#wx_ref{type=ThisT,ref=ThisRef},From,To)
@@ -300,7 +300,7 @@ getRange(#wx_ref{type=ThisT,ref=ThisRef},From,To)
   wxe_util:call(?wxTextCtrl_GetRange,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetselection">external documentation</a>.
 -spec getSelection(This) -> {From::integer(), To::integer()} when
 	This::wxTextCtrl().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -308,7 +308,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetstringselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetstringselection">external documentation</a>.
 -spec getStringSelection(This) -> unicode:charlist() when
 	This::wxTextCtrl().
 getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -316,7 +316,7 @@ getStringSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_GetStringSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetstyle">external documentation</a>.
 -spec getStyle(This, Position, Style) -> boolean() when
 	This::wxTextCtrl(), Position::integer(), Style::wxTextAttr:wxTextAttr().
 getStyle(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=StyleT,ref=StyleRef})
@@ -326,7 +326,7 @@ getStyle(#wx_ref{type=ThisT,ref=ThisRef},Position,#wx_ref{type=StyleT,ref=StyleR
   wxe_util:call(?wxTextCtrl_GetStyle,
   <<ThisRef:32/?UI,Position:32/?UI,StyleRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlgetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlgetvalue">external documentation</a>.
 -spec getValue(This) -> unicode:charlist() when
 	This::wxTextCtrl().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -334,7 +334,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrliseditable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrliseditable">external documentation</a>.
 -spec isEditable(This) -> boolean() when
 	This::wxTextCtrl().
 isEditable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -342,7 +342,7 @@ isEditable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_IsEditable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlismodified">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlismodified">external documentation</a>.
 -spec isModified(This) -> boolean() when
 	This::wxTextCtrl().
 isModified(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -350,7 +350,7 @@ isModified(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_IsModified,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlismultiline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlismultiline">external documentation</a>.
 -spec isMultiLine(This) -> boolean() when
 	This::wxTextCtrl().
 isMultiLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -358,7 +358,7 @@ isMultiLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextCtrl_IsMultiLine,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlissingleline">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlissingleline">external documentation</a>.
 -spec isSingleLine(This) -> boolean() when
 	This::wxTextCtrl().
 isSingleLine(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -374,7 +374,7 @@ loadFile(This,File)
  when is_record(This, wx_ref),is_list(File) ->
   loadFile(This,File, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlloadfile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlloadfile">external documentation</a>.
 -spec loadFile(This, File, [Option]) -> boolean() when
 	This::wxTextCtrl(), File::unicode:chardata(),
 	Option :: {fileType, integer()}.
@@ -388,7 +388,7 @@ loadFile(#wx_ref{type=ThisT,ref=ThisRef},File, Options)
   wxe_util:call(?wxTextCtrl_LoadFile,
   <<ThisRef:32/?UI,(byte_size(File_UC)):32/?UI,(File_UC)/binary, 0:(((8- ((0+byte_size(File_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlmarkdirty">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlmarkdirty">external documentation</a>.
 -spec markDirty(This) -> ok when
 	This::wxTextCtrl().
 markDirty(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -396,7 +396,7 @@ markDirty(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_MarkDirty,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlpaste">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlpaste">external documentation</a>.
 -spec paste(This) -> ok when
 	This::wxTextCtrl().
 paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -404,7 +404,7 @@ paste(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_Paste,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlpositiontoxy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlpositiontoxy">external documentation</a>.
 -spec positionToXY(This, Pos) -> Result when
 	Result ::{Res ::boolean(), X::integer(), Y::integer()},
 	This::wxTextCtrl(), Pos::integer().
@@ -414,7 +414,7 @@ positionToXY(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxTextCtrl_PositionToXY,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlredo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlredo">external documentation</a>.
 -spec redo(This) -> ok when
 	This::wxTextCtrl().
 redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -422,7 +422,7 @@ redo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_Redo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlremove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlremove">external documentation</a>.
 -spec remove(This, From, To) -> ok when
 	This::wxTextCtrl(), From::integer(), To::integer().
 remove(#wx_ref{type=ThisT,ref=ThisRef},From,To)
@@ -431,7 +431,7 @@ remove(#wx_ref{type=ThisT,ref=ThisRef},From,To)
   wxe_util:cast(?wxTextCtrl_Remove,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlreplace">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlreplace">external documentation</a>.
 -spec replace(This, From, To, Value) -> ok when
 	This::wxTextCtrl(), From::integer(), To::integer(), Value::unicode:chardata().
 replace(#wx_ref{type=ThisT,ref=ThisRef},From,To,Value)
@@ -449,7 +449,7 @@ saveFile(This)
  when is_record(This, wx_ref) ->
   saveFile(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsavefile">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsavefile">external documentation</a>.
 -spec saveFile(This, [Option]) -> boolean() when
 	This::wxTextCtrl(),
 	Option :: {file, unicode:chardata()}
@@ -464,7 +464,7 @@ saveFile(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxTextCtrl_SaveFile,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetdefaultstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsetdefaultstyle">external documentation</a>.
 -spec setDefaultStyle(This, Style) -> boolean() when
 	This::wxTextCtrl(), Style::wxTextAttr:wxTextAttr().
 setDefaultStyle(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StyleT,ref=StyleRef}) ->
@@ -473,7 +473,7 @@ setDefaultStyle(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=StyleT,ref=StyleRef
   wxe_util:call(?wxTextCtrl_SetDefaultStyle,
   <<ThisRef:32/?UI,StyleRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlseteditable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlseteditable">external documentation</a>.
 -spec setEditable(This, Editable) -> ok when
 	This::wxTextCtrl(), Editable::boolean().
 setEditable(#wx_ref{type=ThisT,ref=ThisRef},Editable)
@@ -482,7 +482,7 @@ setEditable(#wx_ref{type=ThisT,ref=ThisRef},Editable)
   wxe_util:cast(?wxTextCtrl_SetEditable,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Editable)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetinsertionpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsetinsertionpoint">external documentation</a>.
 -spec setInsertionPoint(This, Pos) -> ok when
 	This::wxTextCtrl(), Pos::integer().
 setInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -491,7 +491,7 @@ setInsertionPoint(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxTextCtrl_SetInsertionPoint,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetinsertionpointend">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsetinsertionpointend">external documentation</a>.
 -spec setInsertionPointEnd(This) -> ok when
 	This::wxTextCtrl().
 setInsertionPointEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -499,7 +499,7 @@ setInsertionPointEnd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_SetInsertionPointEnd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetmaxlength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsetmaxlength">external documentation</a>.
 -spec setMaxLength(This, Len) -> ok when
 	This::wxTextCtrl(), Len::integer().
 setMaxLength(#wx_ref{type=ThisT,ref=ThisRef},Len)
@@ -508,7 +508,7 @@ setMaxLength(#wx_ref{type=ThisT,ref=ThisRef},Len)
   wxe_util:cast(?wxTextCtrl_SetMaxLength,
   <<ThisRef:32/?UI,Len:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsetselection">external documentation</a>.
 -spec setSelection(This, From, To) -> ok when
 	This::wxTextCtrl(), From::integer(), To::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
@@ -517,7 +517,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},From,To)
   wxe_util:cast(?wxTextCtrl_SetSelection,
   <<ThisRef:32/?UI,From:32/?UI,To:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsetstyle">external documentation</a>.
 -spec setStyle(This, Start, End, Style) -> boolean() when
 	This::wxTextCtrl(), Start::integer(), End::integer(), Style::wxTextAttr:wxTextAttr().
 setStyle(#wx_ref{type=ThisT,ref=ThisRef},Start,End,#wx_ref{type=StyleT,ref=StyleRef})
@@ -527,7 +527,7 @@ setStyle(#wx_ref{type=ThisT,ref=ThisRef},Start,End,#wx_ref{type=StyleT,ref=Style
   wxe_util:call(?wxTextCtrl_SetStyle,
   <<ThisRef:32/?UI,Start:32/?UI,End:32/?UI,StyleRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlsetvalue">external documentation</a>.
 -spec setValue(This, Value) -> ok when
 	This::wxTextCtrl(), Value::unicode:chardata().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
@@ -537,7 +537,7 @@ setValue(#wx_ref{type=ThisT,ref=ThisRef},Value)
   wxe_util:cast(?wxTextCtrl_SetValue,
   <<ThisRef:32/?UI,(byte_size(Value_UC)):32/?UI,(Value_UC)/binary, 0:(((8- ((0+byte_size(Value_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlshowposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlshowposition">external documentation</a>.
 -spec showPosition(This, Pos) -> ok when
 	This::wxTextCtrl(), Pos::integer().
 showPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -546,7 +546,7 @@ showPosition(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:cast(?wxTextCtrl_ShowPosition,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlundo">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlundo">external documentation</a>.
 -spec undo(This) -> ok when
 	This::wxTextCtrl().
 undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -554,7 +554,7 @@ undo(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTextCtrl_Undo,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlwritetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlwritetext">external documentation</a>.
 -spec writeText(This, Text) -> ok when
 	This::wxTextCtrl(), Text::unicode:chardata().
 writeText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -564,7 +564,7 @@ writeText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxTextCtrl_WriteText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextctrl.html#wxtextctrlxytoposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextctrl.html#wxtextctrlxytoposition">external documentation</a>.
 -spec xYToPosition(This, X, Y) -> integer() when
 	This::wxTextCtrl(), X::integer(), Y::integer().
 xYToPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
diff --git a/lib/wx/src/gen/wxTextDataObject.erl b/lib/wx/src/gen/wxTextDataObject.erl
index 4ffa2de4a7..0f780509e6 100644
--- a/lib/wx/src/gen/wxTextDataObject.erl
+++ b/lib/wx/src/gen/wxTextDataObject.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html">wxTextDataObject</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextdataobject.html">wxTextDataObject</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDataObject}
 %% </p>
@@ -44,7 +44,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectwxtextdataobject">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextdataobject.html#wxtextdataobjectwxtextdataobject">external documentation</a>.
 -spec new([Option]) -> wxTextDataObject() when
 	Option :: {text, unicode:chardata()}.
 new(Options)
@@ -55,7 +55,7 @@ new(Options)
   wxe_util:construct(?wxTextDataObject_new,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectgettextlength">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextdataobject.html#wxtextdataobjectgettextlength">external documentation</a>.
 -spec getTextLength(This) -> integer() when
 	This::wxTextDataObject().
 getTextLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -63,7 +63,7 @@ getTextLength(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextDataObject_GetTextLength,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectgettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextdataobject.html#wxtextdataobjectgettext">external documentation</a>.
 -spec getText(This) -> unicode:charlist() when
 	This::wxTextDataObject().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -71,7 +71,7 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextDataObject_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextdataobject.html#wxtextdataobjectsettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextdataobject.html#wxtextdataobjectsettext">external documentation</a>.
 -spec setText(This, Text) -> ok when
 	This::wxTextDataObject(), Text::unicode:chardata().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
diff --git a/lib/wx/src/gen/wxTextEntryDialog.erl b/lib/wx/src/gen/wxTextEntryDialog.erl
index 78e6e32b98..1cc4bce0b9 100644
--- a/lib/wx/src/gen/wxTextEntryDialog.erl
+++ b/lib/wx/src/gen/wxTextEntryDialog.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html">wxTextEntryDialog</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextentrydialog.html">wxTextEntryDialog</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDialog}
 %% <br />{@link wxTopLevelWindow}
@@ -94,7 +94,7 @@ new(Parent,Message)
  when is_record(Parent, wx_ref),is_list(Message) ->
   new(Parent,Message, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialogwxtextentrydialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextentrydialog.html#wxtextentrydialogwxtextentrydialog">external documentation</a>.
 -spec new(Parent, Message, [Option]) -> wxTextEntryDialog() when
 	Parent::wxWindow:wxWindow(), Message::unicode:chardata(),
 	Option :: {caption, unicode:chardata()}
@@ -114,7 +114,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Message, Options)
   wxe_util:construct(?wxTextEntryDialog_new,
   <<ParentRef:32/?UI,(byte_size(Message_UC)):32/?UI,(Message_UC)/binary, 0:(((8- ((0+byte_size(Message_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialoggetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextentrydialog.html#wxtextentrydialoggetvalue">external documentation</a>.
 -spec getValue(This) -> unicode:charlist() when
 	This::wxTextEntryDialog().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -122,7 +122,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTextEntryDialog_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtextentrydialog.html#wxtextentrydialogsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtextentrydialog.html#wxtextentrydialogsetvalue">external documentation</a>.
 -spec setValue(This, Val) -> ok when
 	This::wxTextEntryDialog(), Val::unicode:chardata().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},Val)
diff --git a/lib/wx/src/gen/wxToggleButton.erl b/lib/wx/src/gen/wxToggleButton.erl
index ed2f564952..2cd1739754 100644
--- a/lib/wx/src/gen/wxToggleButton.erl
+++ b/lib/wx/src/gen/wxToggleButton.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html">wxToggleButton</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtogglebutton.html">wxToggleButton</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -77,7 +77,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxToggleButton() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttonwxtogglebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtogglebutton.html#wxtogglebuttonwxtogglebutton">external documentation</a>.
 -spec new() -> wxToggleButton().
 new() ->
   wxe_util:construct(?wxToggleButton_new_0,
@@ -91,7 +91,7 @@ new(Parent,Id,Label)
  when is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   new(Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttonwxtogglebutton">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtogglebutton.html#wxtogglebuttonwxtogglebutton">external documentation</a>.
 -spec new(Parent, Id, Label, [Option]) -> wxToggleButton() when
 	Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -119,7 +119,7 @@ create(This,Parent,Id,Label)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id),is_list(Label) ->
   create(This,Parent,Id,Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttoncreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtogglebutton.html#wxtogglebuttoncreate">external documentation</a>.
 -spec create(This, Parent, Id, Label, [Option]) -> boolean() when
 	This::wxToggleButton(), Parent::wxWindow:wxWindow(), Id::integer(), Label::unicode:chardata(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -140,7 +140,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id,La
   wxe_util:call(?wxToggleButton_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttongetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtogglebutton.html#wxtogglebuttongetvalue">external documentation</a>.
 -spec getValue(This) -> boolean() when
 	This::wxToggleButton().
 getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ getValue(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToggleButton_GetValue,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtogglebutton.html#wxtogglebuttonsetvalue">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtogglebutton.html#wxtogglebuttonsetvalue">external documentation</a>.
 -spec setValue(This, State) -> ok when
 	This::wxToggleButton(), State::boolean().
 setValue(#wx_ref{type=ThisT,ref=ThisRef},State)
diff --git a/lib/wx/src/gen/wxToolBar.erl b/lib/wx/src/gen/wxToolBar.erl
index 9401e30e20..f8e4b7704a 100644
--- a/lib/wx/src/gen/wxToolBar.erl
+++ b/lib/wx/src/gen/wxToolBar.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html">wxToolBar</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html">wxToolBar</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -85,7 +85,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxToolBar() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddcontrol">external documentation</a>.
 -spec addControl(This, Control) -> wx:wx_object() when
 	This::wxToolBar(), Control::wxControl:wxControl().
 addControl(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ControlT,ref=ControlRef}) ->
@@ -94,7 +94,7 @@ addControl(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ControlT,ref=ControlRef}
   wxe_util:call(?wxToolBar_AddControl,
   <<ThisRef:32/?UI,ControlRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddseparator">external documentation</a>.
 -spec addSeparator(This) -> wx:wx_object() when
 	This::wxToolBar().
 addSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -102,7 +102,7 @@ addSeparator(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolBar_AddSeparator,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 -spec addTool(This, Tool) -> wx:wx_object() when
 	This::wxToolBar(), Tool::wx:wx_object().
 addTool(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ToolT,ref=ToolRef}) ->
@@ -119,7 +119,7 @@ addTool(This,Toolid,Bitmap)
  when is_record(This, wx_ref),is_integer(Toolid),is_record(Bitmap, wx_ref) ->
   addTool(This,Toolid,Bitmap, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 %% <br /> Also:<br />
 %% addTool(This, Toolid, Bitmap, BmpDisabled) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap();<br />
@@ -156,7 +156,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
   wxe_util:call(?wxToolBar_AddTool_3,
   <<ThisRef:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 %% <br /> Also:<br />
 %% addTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),<br />
@@ -211,7 +211,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,#wx_ref{type=BitmapT,ref=BitmapRe
   wxe_util:call(?wxToolBar_AddTool_4_1,
   <<ThisRef:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI,BmpDisabledRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 %% <br /> Also:<br />
 %% addTool(This, Toolid, Label, Bitmap, BmpDisabled, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(),<br />
@@ -248,7 +248,7 @@ addTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,ref=Bi
   wxe_util:call(?wxToolBar_AddTool_5,
   <<ThisRef:32/?UI,Toolid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,BitmapRef:32/?UI,BmpDisabledRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddtool">external documentation</a>.
 -spec addTool(This, Toolid, Bitmap, BmpDisabled, Toggle, XPos, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(), BmpDisabled::wxBitmap:wxBitmap(), Toggle::boolean(), XPos::integer(),
 	Option :: {yPos, integer()}
@@ -277,7 +277,7 @@ addCheckTool(This,Toolid,Label,Bitmap)
  when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) ->
   addCheckTool(This,Toolid,Label,Bitmap, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddchecktool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddchecktool">external documentation</a>.
 -spec addCheckTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
@@ -306,7 +306,7 @@ addRadioTool(This,Toolid,Label,Bitmap)
  when is_record(This, wx_ref),is_integer(Toolid),is_list(Label),is_record(Bitmap, wx_ref) ->
   addRadioTool(This,Toolid,Label,Bitmap, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbaraddradiotool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbaraddradiotool">external documentation</a>.
 -spec addRadioTool(This, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),
 	Option :: {bmpDisabled, wxBitmap:wxBitmap()}
@@ -327,7 +327,7 @@ addRadioTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Label,#wx_ref{type=BitmapT,r
   wxe_util:call(?wxToolBar_AddRadioTool,
   <<ThisRef:32/?UI,Toolid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbardeletetool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbardeletetool">external documentation</a>.
 -spec deleteTool(This, Toolid) -> boolean() when
 	This::wxToolBar(), Toolid::integer().
 deleteTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -336,7 +336,7 @@ deleteTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_DeleteTool,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbardeletetoolbypos">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbardeletetoolbypos">external documentation</a>.
 -spec deleteToolByPos(This, Pos) -> boolean() when
 	This::wxToolBar(), Pos::integer().
 deleteToolByPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -345,7 +345,7 @@ deleteToolByPos(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxToolBar_DeleteToolByPos,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarenabletool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarenabletool">external documentation</a>.
 -spec enableTool(This, Toolid, Enable) -> ok when
 	This::wxToolBar(), Toolid::integer(), Enable::boolean().
 enableTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Enable)
@@ -354,7 +354,7 @@ enableTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Enable)
   wxe_util:cast(?wxToolBar_EnableTool,
   <<ThisRef:32/?UI,Toolid:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarfindbyid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarfindbyid">external documentation</a>.
 -spec findById(This, Toolid) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer().
 findById(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -363,7 +363,7 @@ findById(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_FindById,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarfindcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarfindcontrol">external documentation</a>.
 -spec findControl(This, Toolid) -> wxControl:wxControl() when
 	This::wxToolBar(), Toolid::integer().
 findControl(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -372,7 +372,7 @@ findControl(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_FindControl,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarfindtoolforposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarfindtoolforposition">external documentation</a>.
 -spec findToolForPosition(This, X, Y) -> wx:wx_object() when
 	This::wxToolBar(), X::integer(), Y::integer().
 findToolForPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -381,7 +381,7 @@ findToolForPosition(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxToolBar_FindToolForPosition,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolsize">external documentation</a>.
 -spec getToolSize(This) -> {W::integer(), H::integer()} when
 	This::wxToolBar().
 getToolSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -389,7 +389,7 @@ getToolSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolBar_GetToolSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolbitmapsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolbitmapsize">external documentation</a>.
 -spec getToolBitmapSize(This) -> {W::integer(), H::integer()} when
 	This::wxToolBar().
 getToolBitmapSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -397,7 +397,7 @@ getToolBitmapSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolBar_GetToolBitmapSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargetmargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargetmargins">external documentation</a>.
 -spec getMargins(This) -> {W::integer(), H::integer()} when
 	This::wxToolBar().
 getMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -405,7 +405,7 @@ getMargins(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolBar_GetMargins,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolenabled">external documentation</a>.
 -spec getToolEnabled(This, Toolid) -> boolean() when
 	This::wxToolBar(), Toolid::integer().
 getToolEnabled(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -414,7 +414,7 @@ getToolEnabled(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_GetToolEnabled,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoollonghelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoollonghelp">external documentation</a>.
 -spec getToolLongHelp(This, Toolid) -> unicode:charlist() when
 	This::wxToolBar(), Toolid::integer().
 getToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -423,7 +423,7 @@ getToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_GetToolLongHelp,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolpacking">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolpacking">external documentation</a>.
 -spec getToolPacking(This) -> integer() when
 	This::wxToolBar().
 getToolPacking(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -431,7 +431,7 @@ getToolPacking(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolBar_GetToolPacking,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolpos">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolpos">external documentation</a>.
 -spec getToolPos(This, Id) -> integer() when
 	This::wxToolBar(), Id::integer().
 getToolPos(#wx_ref{type=ThisT,ref=ThisRef},Id)
@@ -440,7 +440,7 @@ getToolPos(#wx_ref{type=ThisT,ref=ThisRef},Id)
   wxe_util:call(?wxToolBar_GetToolPos,
   <<ThisRef:32/?UI,Id:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolseparation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolseparation">external documentation</a>.
 -spec getToolSeparation(This) -> integer() when
 	This::wxToolBar().
 getToolSeparation(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -448,7 +448,7 @@ getToolSeparation(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolBar_GetToolSeparation,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolshorthelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolshorthelp">external documentation</a>.
 -spec getToolShortHelp(This, Toolid) -> unicode:charlist() when
 	This::wxToolBar(), Toolid::integer().
 getToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -457,7 +457,7 @@ getToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_GetToolShortHelp,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbargettoolstate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbargettoolstate">external documentation</a>.
 -spec getToolState(This, Toolid) -> boolean() when
 	This::wxToolBar(), Toolid::integer().
 getToolState(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -466,7 +466,7 @@ getToolState(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_GetToolState,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinsertcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarinsertcontrol">external documentation</a>.
 -spec insertControl(This, Pos, Control) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer(), Control::wxControl:wxControl().
 insertControl(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ControlT,ref=ControlRef})
@@ -476,7 +476,7 @@ insertControl(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ControlT,ref=Cont
   wxe_util:call(?wxToolBar_InsertControl,
   <<ThisRef:32/?UI,Pos:32/?UI,ControlRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinsertseparator">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarinsertseparator">external documentation</a>.
 -spec insertSeparator(This, Pos) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer().
 insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -485,7 +485,7 @@ insertSeparator(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxToolBar_InsertSeparator,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
 -spec insertTool(This, Pos, Tool) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer(), Tool::wx:wx_object().
 insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=ToolT,ref=ToolRef})
@@ -503,7 +503,7 @@ insertTool(This,Pos,Toolid,Bitmap)
  when is_record(This, wx_ref),is_integer(Pos),is_integer(Toolid),is_record(Bitmap, wx_ref) ->
   insertTool(This,Pos,Toolid,Bitmap, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
 %% <br /> Also:<br />
 %% insertTool(This, Pos, Toolid, Bitmap, [Option]) -> wx:wx_object() when<br />
 %% 	This::wxToolBar(), Pos::integer(), Toolid::integer(), Bitmap::wxBitmap:wxBitmap(),<br />
@@ -541,7 +541,7 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,#wx_ref{type=BitmapT,ref=B
   wxe_util:call(?wxToolBar_InsertTool_4,
   <<ThisRef:32/?UI,Pos:32/?UI,Toolid:32/?UI,BitmapRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarinserttool">external documentation</a>.
 %%<br /> Kind = ?wxITEM_SEPARATOR | ?wxITEM_NORMAL | ?wxITEM_CHECK | ?wxITEM_RADIO | ?wxITEM_MAX
 -spec insertTool(This, Pos, Toolid, Label, Bitmap, [Option]) -> wx:wx_object() when
 	This::wxToolBar(), Pos::integer(), Toolid::integer(), Label::unicode:chardata(), Bitmap::wxBitmap:wxBitmap(),
@@ -565,7 +565,7 @@ insertTool(#wx_ref{type=ThisT,ref=ThisRef},Pos,Toolid,Label,#wx_ref{type=BitmapT
   wxe_util:call(?wxToolBar_InsertTool_5,
   <<ThisRef:32/?UI,Pos:32/?UI,Toolid:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8,BitmapRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarrealize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarrealize">external documentation</a>.
 -spec realize(This) -> boolean() when
 	This::wxToolBar().
 realize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -573,7 +573,7 @@ realize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolBar_Realize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarremovetool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarremovetool">external documentation</a>.
 -spec removeTool(This, Toolid) -> wx:wx_object() when
 	This::wxToolBar(), Toolid::integer().
 removeTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
@@ -582,7 +582,7 @@ removeTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid)
   wxe_util:call(?wxToolBar_RemoveTool,
   <<ThisRef:32/?UI,Toolid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsetmargins">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarsetmargins">external documentation</a>.
 -spec setMargins(This, X, Y) -> ok when
 	This::wxToolBar(), X::integer(), Y::integer().
 setMargins(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -591,7 +591,7 @@ setMargins(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:cast(?wxToolBar_SetMargins,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolbitmapsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarsettoolbitmapsize">external documentation</a>.
 -spec setToolBitmapSize(This, Size) -> ok when
 	This::wxToolBar(), Size::{W::integer(), H::integer()}.
 setToolBitmapSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -600,7 +600,7 @@ setToolBitmapSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxToolBar_SetToolBitmapSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoollonghelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarsettoollonghelp">external documentation</a>.
 -spec setToolLongHelp(This, Toolid, HelpString) -> ok when
 	This::wxToolBar(), Toolid::integer(), HelpString::unicode:chardata().
 setToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid,HelpString)
@@ -610,7 +610,7 @@ setToolLongHelp(#wx_ref{type=ThisT,ref=ThisRef},Toolid,HelpString)
   wxe_util:cast(?wxToolBar_SetToolLongHelp,
   <<ThisRef:32/?UI,Toolid:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolpacking">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarsettoolpacking">external documentation</a>.
 -spec setToolPacking(This, Packing) -> ok when
 	This::wxToolBar(), Packing::integer().
 setToolPacking(#wx_ref{type=ThisT,ref=ThisRef},Packing)
@@ -619,7 +619,7 @@ setToolPacking(#wx_ref{type=ThisT,ref=ThisRef},Packing)
   wxe_util:cast(?wxToolBar_SetToolPacking,
   <<ThisRef:32/?UI,Packing:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolshorthelp">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarsettoolshorthelp">external documentation</a>.
 -spec setToolShortHelp(This, Id, HelpString) -> ok when
 	This::wxToolBar(), Id::integer(), HelpString::unicode:chardata().
 setToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Id,HelpString)
@@ -629,7 +629,7 @@ setToolShortHelp(#wx_ref{type=ThisT,ref=ThisRef},Id,HelpString)
   wxe_util:cast(?wxToolBar_SetToolShortHelp,
   <<ThisRef:32/?UI,Id:32/?UI,(byte_size(HelpString_UC)):32/?UI,(HelpString_UC)/binary, 0:(((8- ((4+byte_size(HelpString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbarsettoolseparation">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbarsettoolseparation">external documentation</a>.
 -spec setToolSeparation(This, Separation) -> ok when
 	This::wxToolBar(), Separation::integer().
 setToolSeparation(#wx_ref{type=ThisT,ref=ThisRef},Separation)
@@ -638,7 +638,7 @@ setToolSeparation(#wx_ref{type=ThisT,ref=ThisRef},Separation)
   wxe_util:cast(?wxToolBar_SetToolSeparation,
   <<ThisRef:32/?UI,Separation:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbar.html#wxtoolbartoggletool">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbar.html#wxtoolbartoggletool">external documentation</a>.
 -spec toggleTool(This, Toolid, Toggle) -> ok when
 	This::wxToolBar(), Toolid::integer(), Toggle::boolean().
 toggleTool(#wx_ref{type=ThisT,ref=ThisRef},Toolid,Toggle)
diff --git a/lib/wx/src/gen/wxToolTip.erl b/lib/wx/src/gen/wxToolTip.erl
index e9b5510357..1df04adea8 100644
--- a/lib/wx/src/gen/wxToolTip.erl
+++ b/lib/wx/src/gen/wxToolTip.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html">wxToolTip</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtooltip.html">wxToolTip</a>.
 %% @type wxToolTip().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -34,7 +34,7 @@
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxToolTip() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtooltip.html#wxtooltipenable">external documentation</a>.
 -spec enable(Flag) -> ok when
 	Flag::boolean().
 enable(Flag)
@@ -42,7 +42,7 @@ enable(Flag)
   wxe_util:cast(?wxToolTip_Enable,
   <<(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipsetdelay">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtooltip.html#wxtooltipsetdelay">external documentation</a>.
 -spec setDelay(Msecs) -> ok when
 	Msecs::integer().
 setDelay(Msecs)
@@ -50,7 +50,7 @@ setDelay(Msecs)
   wxe_util:cast(?wxToolTip_SetDelay,
   <<Msecs:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipwxtooltip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtooltip.html#wxtooltipwxtooltip">external documentation</a>.
 -spec new(Tip) -> wxToolTip() when
 	Tip::unicode:chardata().
 new(Tip)
@@ -59,7 +59,7 @@ new(Tip)
   wxe_util:construct(?wxToolTip_new,
   <<(byte_size(Tip_UC)):32/?UI,(Tip_UC)/binary, 0:(((8- ((4+byte_size(Tip_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipsettip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtooltip.html#wxtooltipsettip">external documentation</a>.
 -spec setTip(This, Tip) -> ok when
 	This::wxToolTip(), Tip::unicode:chardata().
 setTip(#wx_ref{type=ThisT,ref=ThisRef},Tip)
@@ -69,7 +69,7 @@ setTip(#wx_ref{type=ThisT,ref=ThisRef},Tip)
   wxe_util:cast(?wxToolTip_SetTip,
   <<ThisRef:32/?UI,(byte_size(Tip_UC)):32/?UI,(Tip_UC)/binary, 0:(((8- ((0+byte_size(Tip_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipgettip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtooltip.html#wxtooltipgettip">external documentation</a>.
 -spec getTip(This) -> unicode:charlist() when
 	This::wxToolTip().
 getTip(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -77,7 +77,7 @@ getTip(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolTip_GetTip,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtooltip.html#wxtooltipgetwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtooltip.html#wxtooltipgetwindow">external documentation</a>.
 -spec getWindow(This) -> wxWindow:wxWindow() when
 	This::wxToolTip().
 getWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
diff --git a/lib/wx/src/gen/wxToolbook.erl b/lib/wx/src/gen/wxToolbook.erl
index 9172f7a2d9..f820471ad7 100644
--- a/lib/wx/src/gen/wxToolbook.erl
+++ b/lib/wx/src/gen/wxToolbook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html">wxToolbook</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html">wxToolbook</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -82,7 +82,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxToolbook() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookwxtoolbook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookwxtoolbook">external documentation</a>.
 -spec new() -> wxToolbook().
 new() ->
   wxe_util:construct(?wxToolbook_new_0,
@@ -96,7 +96,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookwxtoolbook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookwxtoolbook">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxToolbook() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -121,7 +121,7 @@ addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookaddpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookaddpage">external documentation</a>.
 -spec addPage(This, Page, Text, [Option]) -> boolean() when
 	This::wxToolbook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -146,7 +146,7 @@ advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookadvanceselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookadvanceselection">external documentation</a>.
 -spec advanceSelection(This, [Option]) -> ok when
 	This::wxToolbook(),
 	Option :: {forward, boolean()}.
@@ -159,7 +159,7 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxToolbook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookassignimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookassignimagelist">external documentation</a>.
 -spec assignImageList(This, ImageList) -> ok when
 	This::wxToolbook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -176,7 +176,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxToolbook(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -194,7 +194,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxToolbook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookdeleteallpages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookdeleteallpages">external documentation</a>.
 -spec deleteAllPages(This) -> boolean() when
 	This::wxToolbook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -202,7 +202,7 @@ deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolbook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookdeletepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookdeletepage">external documentation</a>.
 -spec deletePage(This, N) -> boolean() when
 	This::wxToolbook(), N::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -211,7 +211,7 @@ deletePage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxToolbook_DeletePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookremovepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookremovepage">external documentation</a>.
 -spec removePage(This, N) -> boolean() when
 	This::wxToolbook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -220,7 +220,7 @@ removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxToolbook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetcurrentpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookgetcurrentpage">external documentation</a>.
 -spec getCurrentPage(This) -> wxWindow:wxWindow() when
 	This::wxToolbook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -228,7 +228,7 @@ getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolbook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookgetimagelist">external documentation</a>.
 -spec getImageList(This) -> wxImageList:wxImageList() when
 	This::wxToolbook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -236,7 +236,7 @@ getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolbook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookgetpage">external documentation</a>.
 -spec getPage(This, N) -> wxWindow:wxWindow() when
 	This::wxToolbook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -245,7 +245,7 @@ getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxToolbook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookgetpagecount">external documentation</a>.
 -spec getPageCount(This) -> integer() when
 	This::wxToolbook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -253,7 +253,7 @@ getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolbook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookgetpageimage">external documentation</a>.
 -spec getPageImage(This, N) -> integer() when
 	This::wxToolbook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -262,7 +262,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxToolbook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookgetpagetext">external documentation</a>.
 -spec getPageText(This, N) -> unicode:charlist() when
 	This::wxToolbook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -271,7 +271,7 @@ getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxToolbook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxToolbook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -279,7 +279,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxToolbook_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookhittest">external documentation</a>.
 -spec hitTest(This, Pt) -> Result when
 	Result ::{Res ::integer(), Flags::integer()},
 	This::wxToolbook(), Pt::{X::integer(), Y::integer()}.
@@ -297,7 +297,7 @@ insertPage(This,N,Page,Text)
  when is_record(This, wx_ref),is_integer(N),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,N,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookinsertpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookinsertpage">external documentation</a>.
 -spec insertPage(This, N, Page, Text, [Option]) -> boolean() when
 	This::wxToolbook(), N::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -314,7 +314,7 @@ insertPage(#wx_ref{type=ThisT,ref=ThisRef},N,#wx_ref{type=PageT,ref=PageRef},Tex
   wxe_util:call(?wxToolbook_InsertPage,
   <<ThisRef:32/?UI,N:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbooksetimagelist">external documentation</a>.
 -spec setImageList(This, ImageList) -> ok when
 	This::wxToolbook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -323,7 +323,7 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxToolbook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbooksetpagesize">external documentation</a>.
 -spec setPageSize(This, Size) -> ok when
 	This::wxToolbook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -332,7 +332,7 @@ setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxToolbook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbooksetpageimage">external documentation</a>.
 -spec setPageImage(This, N, ImageId) -> boolean() when
 	This::wxToolbook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
@@ -341,7 +341,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
   wxe_util:call(?wxToolbook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbooksetpagetext">external documentation</a>.
 -spec setPageText(This, N, StrText) -> boolean() when
 	This::wxToolbook(), N::integer(), StrText::unicode:chardata().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
@@ -351,7 +351,7 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxToolbook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbooksetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbooksetselection">external documentation</a>.
 -spec setSelection(This, N) -> integer() when
 	This::wxToolbook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -360,7 +360,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxToolbook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoolbook.html#wxtoolbookchangeselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoolbook.html#wxtoolbookchangeselection">external documentation</a>.
 -spec changeSelection(This, N) -> integer() when
 	This::wxToolbook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
diff --git a/lib/wx/src/gen/wxTopLevelWindow.erl b/lib/wx/src/gen/wxTopLevelWindow.erl
index 5659c0927f..0a6f830d23 100644
--- a/lib/wx/src/gen/wxTopLevelWindow.erl
+++ b/lib/wx/src/gen/wxTopLevelWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html">wxTopLevelWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html">wxTopLevelWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxWindow}
 %% <br />{@link wxEvtHandler}
@@ -79,7 +79,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxTopLevelWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowgeticon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowgeticon">external documentation</a>.
 -spec getIcon(This) -> wxIcon:wxIcon() when
 	This::wxTopLevelWindow().
 getIcon(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -87,7 +87,7 @@ getIcon(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTopLevelWindow_GetIcon,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowgeticons">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowgeticons">external documentation</a>.
 -spec getIcons(This) -> wxIconBundle:wxIconBundle() when
 	This::wxTopLevelWindow().
 getIcons(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -95,7 +95,7 @@ getIcons(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTopLevelWindow_GetIcons,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowgettitle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowgettitle">external documentation</a>.
 -spec getTitle(This) -> unicode:charlist() when
 	This::wxTopLevelWindow().
 getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -103,7 +103,7 @@ getTitle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTopLevelWindow_GetTitle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowisactive">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowisactive">external documentation</a>.
 -spec isActive(This) -> boolean() when
 	This::wxTopLevelWindow().
 isActive(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -119,7 +119,7 @@ iconize(This)
  when is_record(This, wx_ref) ->
   iconize(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowiconize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowiconize">external documentation</a>.
 -spec iconize(This, [Option]) -> ok when
 	This::wxTopLevelWindow(),
 	Option :: {iconize, boolean()}.
@@ -132,7 +132,7 @@ iconize(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_Iconize,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowisfullscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowisfullscreen">external documentation</a>.
 -spec isFullScreen(This) -> boolean() when
 	This::wxTopLevelWindow().
 isFullScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -140,7 +140,7 @@ isFullScreen(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTopLevelWindow_IsFullScreen,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowisiconized">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowisiconized">external documentation</a>.
 -spec isIconized(This) -> boolean() when
 	This::wxTopLevelWindow().
 isIconized(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,7 +148,7 @@ isIconized(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTopLevelWindow_IsIconized,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowismaximized">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowismaximized">external documentation</a>.
 -spec isMaximized(This) -> boolean() when
 	This::wxTopLevelWindow().
 isMaximized(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -164,7 +164,7 @@ maximize(This)
  when is_record(This, wx_ref) ->
   maximize(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowmaximize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowmaximize">external documentation</a>.
 -spec maximize(This, [Option]) -> ok when
 	This::wxTopLevelWindow(),
 	Option :: {maximize, boolean()}.
@@ -185,7 +185,7 @@ requestUserAttention(This)
  when is_record(This, wx_ref) ->
   requestUserAttention(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowrequestuserattention">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowrequestuserattention">external documentation</a>.
 -spec requestUserAttention(This, [Option]) -> ok when
 	This::wxTopLevelWindow(),
 	Option :: {flags, integer()}.
@@ -198,7 +198,7 @@ requestUserAttention(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_RequestUserAttention,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowseticon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowseticon">external documentation</a>.
 -spec setIcon(This, Icon) -> ok when
 	This::wxTopLevelWindow(), Icon::wxIcon:wxIcon().
 setIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
@@ -207,7 +207,7 @@ setIcon(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconT,ref=IconRef}) ->
   wxe_util:cast(?wxTopLevelWindow_SetIcon,
   <<ThisRef:32/?UI,IconRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowseticons">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowseticons">external documentation</a>.
 -spec setIcons(This, Icons) -> ok when
 	This::wxTopLevelWindow(), Icons::wxIconBundle:wxIconBundle().
 setIcons(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=IconsT,ref=IconsRef}) ->
@@ -224,7 +224,7 @@ centerOnScreen(This)
  when is_record(This, wx_ref) ->
   centerOnScreen(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowcenteronscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowcenteronscreen">external documentation</a>.
 -spec centerOnScreen(This, [Option]) -> ok when
 	This::wxTopLevelWindow(),
 	Option :: {dir, integer()}.
@@ -245,7 +245,7 @@ centreOnScreen(This)
  when is_record(This, wx_ref) ->
   centreOnScreen(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowcentreonscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowcentreonscreen">external documentation</a>.
 -spec centreOnScreen(This, [Option]) -> ok when
 	This::wxTopLevelWindow(),
 	Option :: {dir, integer()}.
@@ -258,7 +258,7 @@ centreOnScreen(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTopLevelWindow_CentreOnScreen,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowsetshape">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowsetshape">external documentation</a>.
 -spec setShape(This, Region) -> boolean() when
 	This::wxTopLevelWindow(), Region::wxRegion:wxRegion().
 setShape(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
@@ -267,7 +267,7 @@ setShape(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=RegionT,ref=RegionRef}) ->
   wxe_util:call(?wxTopLevelWindow_SetShape,
   <<ThisRef:32/?UI,RegionRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowsettitle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowsettitle">external documentation</a>.
 -spec setTitle(This, Title) -> ok when
 	This::wxTopLevelWindow(), Title::unicode:chardata().
 setTitle(#wx_ref{type=ThisT,ref=ThisRef},Title)
@@ -285,7 +285,7 @@ showFullScreen(This,Show)
  when is_record(This, wx_ref),is_boolean(Show) ->
   showFullScreen(This,Show, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtoplevelwindow.html#wxtoplevelwindowshowfullscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtoplevelwindow.html#wxtoplevelwindowshowfullscreen">external documentation</a>.
 -spec showFullScreen(This, Show, [Option]) -> boolean() when
 	This::wxTopLevelWindow(), Show::boolean(),
 	Option :: {style, integer()}.
diff --git a/lib/wx/src/gen/wxTreeCtrl.erl b/lib/wx/src/gen/wxTreeCtrl.erl
index df2b9bed39..c25310b284 100644
--- a/lib/wx/src/gen/wxTreeCtrl.erl
+++ b/lib/wx/src/gen/wxTreeCtrl.erl
@@ -17,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html">wxTreeCtrl</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html">wxTreeCtrl</a>.
 %%
 %% Note: The representation of treeItemId() have changed from the original class implementation to be an semi-opaque type,Equality between TreeItemId's can be tested and zero means that the TreeItem is invalid.
 
@@ -98,7 +98,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxTreeCtrl() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlwxtreectrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlwxtreectrl">external documentation</a>.
 -spec new() -> wxTreeCtrl().
 new() ->
   wxe_util:construct(?wxTreeCtrl_new_0,
@@ -112,7 +112,7 @@ new(Parent)
  when is_record(Parent, wx_ref) ->
   new(Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlwxtreectrl">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlwxtreectrl">external documentation</a>.
 -spec new(Parent, [Option]) -> wxTreeCtrl() when
 	Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -141,7 +141,7 @@ addRoot(This,Text)
  when is_record(This, wx_ref),is_list(Text) ->
   addRoot(This,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrladdroot">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrladdroot">external documentation</a>.
 -spec addRoot(This, Text, [Option]) -> integer() when
 	This::wxTreeCtrl(), Text::unicode:chardata(),
 	Option :: {image, integer()}
@@ -167,7 +167,7 @@ appendItem(This,Parent,Text)
  when is_record(This, wx_ref),is_integer(Parent),is_list(Text) ->
   appendItem(This,Parent,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlappenditem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlappenditem">external documentation</a>.
 -spec appendItem(This, Parent, Text, [Option]) -> integer() when
 	This::wxTreeCtrl(), Parent::integer(), Text::unicode:chardata(),
 	Option :: {image, integer()}
@@ -185,7 +185,7 @@ appendItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Text, Options)
   wxe_util:call(?wxTreeCtrl_AppendItem,
   <<ThisRef:32/?UI,0:32,Parent:64/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlassignimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlassignimagelist">external documentation</a>.
 -spec assignImageList(This, ImageList) -> ok when
 	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -194,7 +194,7 @@ assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=Imag
   wxe_util:cast(?wxTreeCtrl_AssignImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlassignstateimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlassignstateimagelist">external documentation</a>.
 -spec assignStateImageList(This, ImageList) -> ok when
 	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 assignStateImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -203,7 +203,7 @@ assignStateImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref
   wxe_util:cast(?wxTreeCtrl_AssignStateImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlcollapse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlcollapse">external documentation</a>.
 -spec collapse(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 collapse(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -212,7 +212,7 @@ collapse(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_Collapse,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlcollapseandreset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlcollapseandreset">external documentation</a>.
 -spec collapseAndReset(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 collapseAndReset(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -229,7 +229,7 @@ create(This,Parent)
  when is_record(This, wx_ref),is_record(Parent, wx_ref) ->
   create(This,Parent, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlcreate">external documentation</a>.
 -spec create(This, Parent, [Option]) -> boolean() when
 	This::wxTreeCtrl(), Parent::wxWindow:wxWindow(),
 	Option :: {id, integer()}
@@ -251,7 +251,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef}, Opti
   wxe_util:call(?wxTreeCtrl_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrldelete">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrldelete">external documentation</a>.
 -spec delete(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 delete(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -260,7 +260,7 @@ delete(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_Delete,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrldeleteallitems">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrldeleteallitems">external documentation</a>.
 -spec deleteAllItems(This) -> ok when
 	This::wxTreeCtrl().
 deleteAllItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -268,7 +268,7 @@ deleteAllItems(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTreeCtrl_DeleteAllItems,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrldeletechildren">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrldeletechildren">external documentation</a>.
 -spec deleteChildren(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 deleteChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -277,7 +277,7 @@ deleteChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_DeleteChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrleditlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrleditlabel">external documentation</a>.
 -spec editLabel(This, Item) -> wxTextCtrl:wxTextCtrl() when
 	This::wxTreeCtrl(), Item::integer().
 editLabel(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -286,7 +286,7 @@ editLabel(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_EditLabel,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlensurevisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlensurevisible">external documentation</a>.
 -spec ensureVisible(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -295,7 +295,7 @@ ensureVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_EnsureVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlexpand">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlexpand">external documentation</a>.
 -spec expand(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 expand(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -313,7 +313,7 @@ getBoundingRect(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   getBoundingRect(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetboundingrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetboundingrect">external documentation</a>.
 -spec getBoundingRect(This, Item, [Option]) -> Result when
 	Result :: {Res ::boolean(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}},
 	This::wxTreeCtrl(), Item::integer(),
@@ -335,7 +335,7 @@ getChildrenCount(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   getChildrenCount(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetchildrencount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetchildrencount">external documentation</a>.
 -spec getChildrenCount(This, Item, [Option]) -> integer() when
 	This::wxTreeCtrl(), Item::integer(),
 	Option :: {recursively, boolean()}.
@@ -348,7 +348,7 @@ getChildrenCount(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:call(?wxTreeCtrl_GetChildrenCount,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetcount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetcount">external documentation</a>.
 -spec getCount(This) -> integer() when
 	This::wxTreeCtrl().
 getCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -356,7 +356,7 @@ getCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgeteditcontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgeteditcontrol">external documentation</a>.
 -spec getEditControl(This) -> wxTextCtrl:wxTextCtrl() when
 	This::wxTreeCtrl().
 getEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -364,7 +364,7 @@ getEditControl(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetEditControl,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetfirstchild">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetfirstchild">external documentation</a>.
 -spec getFirstChild(This, Item) -> Result when
 	Result ::{Res ::integer(), Cookie::integer()},
 	This::wxTreeCtrl(), Item::integer().
@@ -374,7 +374,7 @@ getFirstChild(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetFirstChild,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetnextchild">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetnextchild">external documentation</a>.
 -spec getNextChild(This, Item, Cookie) -> Result when
 	Result ::{Res ::integer(), Cookie::integer()},
 	This::wxTreeCtrl(), Item::integer(), Cookie::integer().
@@ -384,7 +384,7 @@ getNextChild(#wx_ref{type=ThisT,ref=ThisRef},Item,Cookie)
   wxe_util:call(?wxTreeCtrl_GetNextChild,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,Cookie:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetfirstvisibleitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetfirstvisibleitem">external documentation</a>.
 -spec getFirstVisibleItem(This) -> integer() when
 	This::wxTreeCtrl().
 getFirstVisibleItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -392,7 +392,7 @@ getFirstVisibleItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetFirstVisibleItem,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetimagelist">external documentation</a>.
 -spec getImageList(This) -> wxImageList:wxImageList() when
 	This::wxTreeCtrl().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -400,7 +400,7 @@ getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetindent">external documentation</a>.
 -spec getIndent(This) -> integer() when
 	This::wxTreeCtrl().
 getIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -408,7 +408,7 @@ getIndent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetIndent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitembackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitembackgroundcolour">external documentation</a>.
 -spec getItemBackgroundColour(This, Item) -> wx:wx_colour4() when
 	This::wxTreeCtrl(), Item::integer().
 getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -417,7 +417,7 @@ getItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetItemBackgroundColour,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitemdata">external documentation</a>.
 -spec getItemData(This, Item) -> term() when
 	This::wxTreeCtrl(), Item::integer().
 getItemData(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -426,7 +426,7 @@ getItemData(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetItemData,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitemfont">external documentation</a>.
 -spec getItemFont(This, Item) -> wxFont:wxFont() when
 	This::wxTreeCtrl(), Item::integer().
 getItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -435,7 +435,7 @@ getItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetItemFont,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitemimage">external documentation</a>.
 -spec getItemImage(This, Item) -> integer() when
 	This::wxTreeCtrl(), Item::integer().
 getItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -444,7 +444,7 @@ getItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetItemImage_1,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitemimage">external documentation</a>.
 %%<br /> Which = ?wxTreeItemIcon_Normal | ?wxTreeItemIcon_Selected | ?wxTreeItemIcon_Expanded | ?wxTreeItemIcon_SelectedExpanded | ?wxTreeItemIcon_Max
 -spec getItemImage(This, Item, [Option]) -> integer() when
 	This::wxTreeCtrl(), Item::integer(),
@@ -458,7 +458,7 @@ getItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:call(?wxTreeCtrl_GetItemImage_2,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitemtext">external documentation</a>.
 -spec getItemText(This, Item) -> unicode:charlist() when
 	This::wxTreeCtrl(), Item::integer().
 getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -467,7 +467,7 @@ getItemText(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetItemText,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemtextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitemtextcolour">external documentation</a>.
 -spec getItemTextColour(This, Item) -> wx:wx_colour4() when
 	This::wxTreeCtrl(), Item::integer().
 getItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -476,7 +476,7 @@ getItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetItemTextColour,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetlastchild">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetlastchild">external documentation</a>.
 -spec getLastChild(This, Item) -> integer() when
 	This::wxTreeCtrl(), Item::integer().
 getLastChild(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -485,7 +485,7 @@ getLastChild(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetLastChild,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetnextsibling">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetnextsibling">external documentation</a>.
 -spec getNextSibling(This, Item) -> integer() when
 	This::wxTreeCtrl(), Item::integer().
 getNextSibling(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -494,7 +494,7 @@ getNextSibling(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetNextSibling,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetnextvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetnextvisible">external documentation</a>.
 -spec getNextVisible(This, Item) -> integer() when
 	This::wxTreeCtrl(), Item::integer().
 getNextVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -503,7 +503,7 @@ getNextVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetNextVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetitemparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetitemparent">external documentation</a>.
 -spec getItemParent(This, Item) -> integer() when
 	This::wxTreeCtrl(), Item::integer().
 getItemParent(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -512,7 +512,7 @@ getItemParent(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetItemParent,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetprevsibling">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetprevsibling">external documentation</a>.
 -spec getPrevSibling(This, Item) -> integer() when
 	This::wxTreeCtrl(), Item::integer().
 getPrevSibling(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -521,7 +521,7 @@ getPrevSibling(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetPrevSibling,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetprevvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetprevvisible">external documentation</a>.
 -spec getPrevVisible(This, Item) -> integer() when
 	This::wxTreeCtrl(), Item::integer().
 getPrevVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -530,7 +530,7 @@ getPrevVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_GetPrevVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetrootitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetrootitem">external documentation</a>.
 -spec getRootItem(This) -> integer() when
 	This::wxTreeCtrl().
 getRootItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -538,7 +538,7 @@ getRootItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetRootItem,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxTreeCtrl().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -546,7 +546,7 @@ getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetSelection,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetselections">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetselections">external documentation</a>.
 -spec getSelections(This) -> Result when
 	Result ::{Res ::integer(), Val::[integer()]},
 	This::wxTreeCtrl().
@@ -555,7 +555,7 @@ getSelections(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetSelections,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlgetstateimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlgetstateimagelist">external documentation</a>.
 -spec getStateImageList(This) -> wxImageList:wxImageList() when
 	This::wxTreeCtrl().
 getStateImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -563,7 +563,7 @@ getStateImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeCtrl_GetStateImageList,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlhittest">external documentation</a>.
 -spec hitTest(This, Point) -> Result when
 	Result ::{Res ::integer(), Flags::integer()},
 	This::wxTreeCtrl(), Point::{X::integer(), Y::integer()}.
@@ -581,7 +581,7 @@ insertItem(This,Parent,Pos,Text)
  when is_record(This, wx_ref),is_integer(Parent),is_integer(Pos),is_list(Text) ->
   insertItem(This,Parent,Pos,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlinsertitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlinsertitem">external documentation</a>.
 -spec insertItem(This, Parent, Pos, Text, [Option]) -> integer() when
 	This::wxTreeCtrl(), Parent::integer(), Pos::integer(), Text::unicode:chardata(),
 	Option :: {image, integer()}
@@ -599,7 +599,7 @@ insertItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Pos,Text, Options)
   wxe_util:call(?wxTreeCtrl_InsertItem,
   <<ThisRef:32/?UI,0:32,Parent:64/?UI,Pos:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisbold">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlisbold">external documentation</a>.
 -spec isBold(This, Item) -> boolean() when
 	This::wxTreeCtrl(), Item::integer().
 isBold(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -608,7 +608,7 @@ isBold(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_IsBold,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisexpanded">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlisexpanded">external documentation</a>.
 -spec isExpanded(This, Item) -> boolean() when
 	This::wxTreeCtrl(), Item::integer().
 isExpanded(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -617,7 +617,7 @@ isExpanded(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_IsExpanded,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisselected">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlisselected">external documentation</a>.
 -spec isSelected(This, Item) -> boolean() when
 	This::wxTreeCtrl(), Item::integer().
 isSelected(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -626,7 +626,7 @@ isSelected(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_IsSelected,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlisvisible">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlisvisible">external documentation</a>.
 -spec isVisible(This, Item) -> boolean() when
 	This::wxTreeCtrl(), Item::integer().
 isVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -635,7 +635,7 @@ isVisible(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_IsVisible,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlitemhaschildren">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlitemhaschildren">external documentation</a>.
 -spec itemHasChildren(This, Item) -> boolean() when
 	This::wxTreeCtrl(), Item::integer().
 itemHasChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -644,7 +644,7 @@ itemHasChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:call(?wxTreeCtrl_ItemHasChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlistreeitemidok">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlistreeitemidok">external documentation</a>.
 -spec isTreeItemIdOk(Id) -> boolean() when
 	Id::integer().
 isTreeItemIdOk(Id)
@@ -660,7 +660,7 @@ prependItem(This,Parent,Text)
  when is_record(This, wx_ref),is_integer(Parent),is_list(Text) ->
   prependItem(This,Parent,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlprependitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlprependitem">external documentation</a>.
 -spec prependItem(This, Parent, Text, [Option]) -> integer() when
 	This::wxTreeCtrl(), Parent::integer(), Text::unicode:chardata(),
 	Option :: {image, integer()}
@@ -678,7 +678,7 @@ prependItem(#wx_ref{type=ThisT,ref=ThisRef},Parent,Text, Options)
   wxe_util:call(?wxTreeCtrl_PrependItem,
   <<ThisRef:32/?UI,0:32,Parent:64/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlscrollto">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlscrollto">external documentation</a>.
 -spec scrollTo(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 scrollTo(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -687,7 +687,7 @@ scrollTo(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_ScrollTo,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlselectitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlselectitem">external documentation</a>.
 -spec selectItem(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 selectItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -696,7 +696,7 @@ selectItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_SelectItem_1,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlselectitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlselectitem">external documentation</a>.
 -spec selectItem(This, Item, [Option]) -> ok when
 	This::wxTreeCtrl(), Item::integer(),
 	Option :: {select, boolean()}.
@@ -709,7 +709,7 @@ selectItem(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SelectItem_2,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetindent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetindent">external documentation</a>.
 -spec setIndent(This, Indent) -> ok when
 	This::wxTreeCtrl(), Indent::integer().
 setIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
@@ -718,7 +718,7 @@ setIndent(#wx_ref{type=ThisT,ref=ThisRef},Indent)
   wxe_util:cast(?wxTreeCtrl_SetIndent,
   <<ThisRef:32/?UI,Indent:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetimagelist">external documentation</a>.
 -spec setImageList(This, ImageList) -> ok when
 	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -727,7 +727,7 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxTreeCtrl_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitembackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitembackgroundcolour">external documentation</a>.
 -spec setItemBackgroundColour(This, Item, Col) -> ok when
 	This::wxTreeCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
@@ -744,7 +744,7 @@ setItemBold(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   setItemBold(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitembold">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitembold">external documentation</a>.
 -spec setItemBold(This, Item, [Option]) -> ok when
 	This::wxTreeCtrl(), Item::integer(),
 	Option :: {bold, boolean()}.
@@ -757,7 +757,7 @@ setItemBold(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemBold,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemdata">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemdata">external documentation</a>.
 -spec setItemData(This, Item, Data) -> ok when
 	This::wxTreeCtrl(), Item::integer(), Data::term().
 setItemData(#wx_ref{type=ThisT,ref=ThisRef},Item,Data)
@@ -775,7 +775,7 @@ setItemDropHighlight(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   setItemDropHighlight(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemdrophighlight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemdrophighlight">external documentation</a>.
 -spec setItemDropHighlight(This, Item, [Option]) -> ok when
 	This::wxTreeCtrl(), Item::integer(),
 	Option :: {highlight, boolean()}.
@@ -788,7 +788,7 @@ setItemDropHighlight(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemDropHighlight,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemfont">external documentation</a>.
 -spec setItemFont(This, Item, Font) -> ok when
 	This::wxTreeCtrl(), Item::integer(), Font::wxFont:wxFont().
 setItemFont(#wx_ref{type=ThisT,ref=ThisRef},Item,#wx_ref{type=FontT,ref=FontRef})
@@ -806,7 +806,7 @@ setItemHasChildren(This,Item)
  when is_record(This, wx_ref),is_integer(Item) ->
   setItemHasChildren(This,Item, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemhaschildren">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemhaschildren">external documentation</a>.
 -spec setItemHasChildren(This, Item, [Option]) -> ok when
 	This::wxTreeCtrl(), Item::integer(),
 	Option :: {has, boolean()}.
@@ -819,7 +819,7 @@ setItemHasChildren(#wx_ref{type=ThisT,ref=ThisRef},Item, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemHasChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemimage">external documentation</a>.
 -spec setItemImage(This, Item, Image) -> ok when
 	This::wxTreeCtrl(), Item::integer(), Image::integer().
 setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image)
@@ -828,7 +828,7 @@ setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image)
   wxe_util:cast(?wxTreeCtrl_SetItemImage_2,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,Image:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemimage">external documentation</a>.
 %%<br /> Which = ?wxTreeItemIcon_Normal | ?wxTreeItemIcon_Selected | ?wxTreeItemIcon_Expanded | ?wxTreeItemIcon_SelectedExpanded | ?wxTreeItemIcon_Max
 -spec setItemImage(This, Item, Image, [Option]) -> ok when
 	This::wxTreeCtrl(), Item::integer(), Image::integer(),
@@ -842,7 +842,7 @@ setItemImage(#wx_ref{type=ThisT,ref=ThisRef},Item,Image, Options)
   wxe_util:cast(?wxTreeCtrl_SetItemImage_3,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,Image:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemtext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemtext">external documentation</a>.
 -spec setItemText(This, Item, Text) -> ok when
 	This::wxTreeCtrl(), Item::integer(), Text::unicode:chardata().
 setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Text)
@@ -852,7 +852,7 @@ setItemText(#wx_ref{type=ThisT,ref=ThisRef},Item,Text)
   wxe_util:cast(?wxTreeCtrl_SetItemText,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((4+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetitemtextcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetitemtextcolour">external documentation</a>.
 -spec setItemTextColour(This, Item, Col) -> ok when
 	This::wxTreeCtrl(), Item::integer(), Col::wx:wx_colour().
 setItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
@@ -861,7 +861,7 @@ setItemTextColour(#wx_ref{type=ThisT,ref=ThisRef},Item,Col)
   wxe_util:cast(?wxTreeCtrl_SetItemTextColour,
   <<ThisRef:32/?UI,0:32,Item:64/?UI,(wxe_util:colour_bin(Col)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetstateimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetstateimagelist">external documentation</a>.
 -spec setStateImageList(This, ImageList) -> ok when
 	This::wxTreeCtrl(), ImageList::wxImageList:wxImageList().
 setStateImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -870,7 +870,7 @@ setStateImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=Im
   wxe_util:cast(?wxTreeCtrl_SetStateImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsetwindowstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsetwindowstyle">external documentation</a>.
 -spec setWindowStyle(This, Styles) -> ok when
 	This::wxTreeCtrl(), Styles::integer().
 setWindowStyle(#wx_ref{type=ThisT,ref=ThisRef},Styles)
@@ -879,7 +879,7 @@ setWindowStyle(#wx_ref{type=ThisT,ref=ThisRef},Styles)
   wxe_util:cast(?wxTreeCtrl_SetWindowStyle,
   <<ThisRef:32/?UI,Styles:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlsortchildren">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlsortchildren">external documentation</a>.
 -spec sortChildren(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 sortChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -888,7 +888,7 @@ sortChildren(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_SortChildren,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrltoggle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrltoggle">external documentation</a>.
 -spec toggle(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 toggle(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -897,7 +897,7 @@ toggle(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_Toggle,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrltoggleitemselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrltoggleitemselection">external documentation</a>.
 -spec toggleItemSelection(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 toggleItemSelection(#wx_ref{type=ThisT,ref=ThisRef},Item)
@@ -906,7 +906,7 @@ toggleItemSelection(#wx_ref{type=ThisT,ref=ThisRef},Item)
   wxe_util:cast(?wxTreeCtrl_ToggleItemSelection,
   <<ThisRef:32/?UI,0:32,Item:64/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlunselect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlunselect">external documentation</a>.
 -spec unselect(This) -> ok when
 	This::wxTreeCtrl().
 unselect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -914,7 +914,7 @@ unselect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTreeCtrl_Unselect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlunselectall">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlunselectall">external documentation</a>.
 -spec unselectAll(This) -> ok when
 	This::wxTreeCtrl().
 unselectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -922,7 +922,7 @@ unselectAll(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxTreeCtrl_UnselectAll,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreectrl.html#wxtreectrlunselectitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreectrl.html#wxtreectrlunselectitem">external documentation</a>.
 -spec unselectItem(This, Item) -> ok when
 	This::wxTreeCtrl(), Item::integer().
 unselectItem(#wx_ref{type=ThisT,ref=ThisRef},Item)
diff --git a/lib/wx/src/gen/wxTreeEvent.erl b/lib/wx/src/gen/wxTreeEvent.erl
index d042fb93e5..fd28cd3fd7 100644
--- a/lib/wx/src/gen/wxTreeEvent.erl
+++ b/lib/wx/src/gen/wxTreeEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html">wxTreeEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html">wxTreeEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>command_tree_begin_drag</em>, <em>command_tree_begin_rdrag</em>, <em>command_tree_begin_label_edit</em>, <em>command_tree_end_label_edit</em>, <em>command_tree_delete_item</em>, <em>command_tree_get_info</em>, <em>command_tree_set_info</em>, <em>command_tree_item_expanded</em>, <em>command_tree_item_expanding</em>, <em>command_tree_item_collapsed</em>, <em>command_tree_item_collapsing</em>, <em>command_tree_sel_changed</em>, <em>command_tree_sel_changing</em>, <em>command_tree_key_down</em>, <em>command_tree_item_activated</em>, <em>command_tree_item_right_click</em>, <em>command_tree_item_middle_click</em>, <em>command_tree_end_drag</em>, <em>command_tree_state_image_click</em>, <em>command_tree_item_gettooltip</em>, <em>command_tree_item_menu</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxTree(). #wxTree{}} event record type.
@@ -50,7 +50,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxTreeEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetkeycode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventgetkeycode">external documentation</a>.
 -spec getKeyCode(This) -> integer() when
 	This::wxTreeEvent().
 getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -58,7 +58,7 @@ getKeyCode(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeEvent_GetKeyCode,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetitem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventgetitem">external documentation</a>.
 -spec getItem(This) -> integer() when
 	This::wxTreeEvent().
 getItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -66,7 +66,7 @@ getItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeEvent_GetItem,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetkeyevent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventgetkeyevent">external documentation</a>.
 -spec getKeyEvent(This) -> wxKeyEvent:wxKeyEvent() when
 	This::wxTreeEvent().
 getKeyEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -74,7 +74,7 @@ getKeyEvent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeEvent_GetKeyEvent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventgetlabel">external documentation</a>.
 -spec getLabel(This) -> unicode:charlist() when
 	This::wxTreeEvent().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -82,7 +82,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeEvent_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetolditem">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventgetolditem">external documentation</a>.
 -spec getOldItem(This) -> integer() when
 	This::wxTreeEvent().
 getOldItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -90,7 +90,7 @@ getOldItem(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeEvent_GetOldItem,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventgetpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventgetpoint">external documentation</a>.
 -spec getPoint(This) -> {X::integer(), Y::integer()} when
 	This::wxTreeEvent().
 getPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -98,7 +98,7 @@ getPoint(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeEvent_GetPoint,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventiseditcancelled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventiseditcancelled">external documentation</a>.
 -spec isEditCancelled(This) -> boolean() when
 	This::wxTreeEvent().
 isEditCancelled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -106,7 +106,7 @@ isEditCancelled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreeEvent_IsEditCancelled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreeevent.html#wxtreeeventsettooltip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreeevent.html#wxtreeeventsettooltip">external documentation</a>.
 -spec setToolTip(This, ToolTip) -> ok when
 	This::wxTreeEvent(), ToolTip::unicode:chardata().
 setToolTip(#wx_ref{type=ThisT,ref=ThisRef},ToolTip)
diff --git a/lib/wx/src/gen/wxTreebook.erl b/lib/wx/src/gen/wxTreebook.erl
index 5d08c12cce..14c04eb373 100644
--- a/lib/wx/src/gen/wxTreebook.erl
+++ b/lib/wx/src/gen/wxTreebook.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html">wxTreebook</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html">wxTreebook</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxControl}
 %% <br />{@link wxWindow}
@@ -83,7 +83,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxTreebook() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookwxtreebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookwxtreebook">external documentation</a>.
 -spec new() -> wxTreebook().
 new() ->
   wxe_util:construct(?wxTreebook_new_0,
@@ -97,7 +97,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookwxtreebook">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookwxtreebook">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxTreebook() when
 	Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -122,7 +122,7 @@ addPage(This,Page,Text)
  when is_record(This, wx_ref),is_record(Page, wx_ref),is_list(Text) ->
   addPage(This,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookaddpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookaddpage">external documentation</a>.
 -spec addPage(This, Page, Text, [Option]) -> boolean() when
 	This::wxTreebook(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -147,7 +147,7 @@ advanceSelection(This)
  when is_record(This, wx_ref) ->
   advanceSelection(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookadvanceselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookadvanceselection">external documentation</a>.
 -spec advanceSelection(This, [Option]) -> ok when
 	This::wxTreebook(),
 	Option :: {forward, boolean()}.
@@ -160,7 +160,7 @@ advanceSelection(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxTreebook_AdvanceSelection,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookassignimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookassignimagelist">external documentation</a>.
 -spec assignImageList(This, ImageList) -> ok when
 	This::wxTreebook(), ImageList::wxImageList:wxImageList().
 assignImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -177,7 +177,7 @@ create(This,Parent,Id)
  when is_record(This, wx_ref),is_record(Parent, wx_ref),is_integer(Id) ->
   create(This,Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookcreate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookcreate">external documentation</a>.
 -spec create(This, Parent, Id, [Option]) -> boolean() when
 	This::wxTreebook(), Parent::wxWindow:wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -195,7 +195,7 @@ create(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Id, O
   wxe_util:call(?wxTreebook_Create,
   <<ThisRef:32/?UI,ParentRef:32/?UI,Id:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookdeleteallpages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookdeleteallpages">external documentation</a>.
 -spec deleteAllPages(This) -> boolean() when
 	This::wxTreebook().
 deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -203,7 +203,7 @@ deleteAllPages(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreebook_DeleteAllPages,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookdeletepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookdeletepage">external documentation</a>.
 -spec deletePage(This, Pos) -> boolean() when
 	This::wxTreebook(), Pos::integer().
 deletePage(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -212,7 +212,7 @@ deletePage(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxTreebook_DeletePage,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookremovepage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookremovepage">external documentation</a>.
 -spec removePage(This, N) -> boolean() when
 	This::wxTreebook(), N::integer().
 removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -221,7 +221,7 @@ removePage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxTreebook_RemovePage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetcurrentpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookgetcurrentpage">external documentation</a>.
 -spec getCurrentPage(This) -> wxWindow:wxWindow() when
 	This::wxTreebook().
 getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -229,7 +229,7 @@ getCurrentPage(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreebook_GetCurrentPage,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookgetimagelist">external documentation</a>.
 -spec getImageList(This) -> wxImageList:wxImageList() when
 	This::wxTreebook().
 getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -237,7 +237,7 @@ getImageList(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreebook_GetImageList,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookgetpage">external documentation</a>.
 -spec getPage(This, N) -> wxWindow:wxWindow() when
 	This::wxTreebook(), N::integer().
 getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -246,7 +246,7 @@ getPage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxTreebook_GetPage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpagecount">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookgetpagecount">external documentation</a>.
 -spec getPageCount(This) -> integer() when
 	This::wxTreebook().
 getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -254,7 +254,7 @@ getPageCount(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxTreebook_GetPageCount,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookgetpageimage">external documentation</a>.
 -spec getPageImage(This, N) -> integer() when
 	This::wxTreebook(), N::integer().
 getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -263,7 +263,7 @@ getPageImage(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxTreebook_GetPageImage,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookgetpagetext">external documentation</a>.
 -spec getPageText(This, N) -> unicode:charlist() when
 	This::wxTreebook(), N::integer().
 getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -272,7 +272,7 @@ getPageText(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxTreebook_GetPageText,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookgetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookgetselection">external documentation</a>.
 -spec getSelection(This) -> integer() when
 	This::wxTreebook().
 getSelection(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -288,7 +288,7 @@ expandNode(This,Pos)
  when is_record(This, wx_ref),is_integer(Pos) ->
   expandNode(This,Pos, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookexpandnode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookexpandnode">external documentation</a>.
 -spec expandNode(This, Pos, [Option]) -> boolean() when
 	This::wxTreebook(), Pos::integer(),
 	Option :: {expand, boolean()}.
@@ -301,7 +301,7 @@ expandNode(#wx_ref{type=ThisT,ref=ThisRef},Pos, Options)
   wxe_util:call(?wxTreebook_ExpandNode,
   <<ThisRef:32/?UI,Pos:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookisnodeexpanded">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookisnodeexpanded">external documentation</a>.
 -spec isNodeExpanded(This, Pos) -> boolean() when
 	This::wxTreebook(), Pos::integer().
 isNodeExpanded(#wx_ref{type=ThisT,ref=ThisRef},Pos)
@@ -310,7 +310,7 @@ isNodeExpanded(#wx_ref{type=ThisT,ref=ThisRef},Pos)
   wxe_util:call(?wxTreebook_IsNodeExpanded,
   <<ThisRef:32/?UI,Pos:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookhittest">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookhittest">external documentation</a>.
 -spec hitTest(This, Pt) -> Result when
 	Result ::{Res ::integer(), Flags::integer()},
 	This::wxTreebook(), Pt::{X::integer(), Y::integer()}.
@@ -328,7 +328,7 @@ insertPage(This,Pos,Page,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_record(Page, wx_ref),is_list(Text) ->
   insertPage(This,Pos,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookinsertpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookinsertpage">external documentation</a>.
 -spec insertPage(This, Pos, Page, Text, [Option]) -> boolean() when
 	This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -353,7 +353,7 @@ insertSubPage(This,Pos,Page,Text)
  when is_record(This, wx_ref),is_integer(Pos),is_record(Page, wx_ref),is_list(Text) ->
   insertSubPage(This,Pos,Page,Text, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookinsertsubpage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookinsertsubpage">external documentation</a>.
 -spec insertSubPage(This, Pos, Page, Text, [Option]) -> boolean() when
 	This::wxTreebook(), Pos::integer(), Page::wxWindow:wxWindow(), Text::unicode:chardata(),
 	Option :: {bSelect, boolean()}
@@ -370,7 +370,7 @@ insertSubPage(#wx_ref{type=ThisT,ref=ThisRef},Pos,#wx_ref{type=PageT,ref=PageRef
   wxe_util:call(?wxTreebook_InsertSubPage,
   <<ThisRef:32/?UI,Pos:32/?UI,PageRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetimagelist">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebooksetimagelist">external documentation</a>.
 -spec setImageList(This, ImageList) -> ok when
 	This::wxTreebook(), ImageList::wxImageList:wxImageList().
 setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageListRef}) ->
@@ -379,7 +379,7 @@ setImageList(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ImageListT,ref=ImageLi
   wxe_util:cast(?wxTreebook_SetImageList,
   <<ThisRef:32/?UI,ImageListRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetpagesize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebooksetpagesize">external documentation</a>.
 -spec setPageSize(This, Size) -> ok when
 	This::wxTreebook(), Size::{W::integer(), H::integer()}.
 setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -388,7 +388,7 @@ setPageSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxTreebook_SetPageSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetpageimage">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebooksetpageimage">external documentation</a>.
 -spec setPageImage(This, N, ImageId) -> boolean() when
 	This::wxTreebook(), N::integer(), ImageId::integer().
 setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
@@ -397,7 +397,7 @@ setPageImage(#wx_ref{type=ThisT,ref=ThisRef},N,ImageId)
   wxe_util:call(?wxTreebook_SetPageImage,
   <<ThisRef:32/?UI,N:32/?UI,ImageId:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetpagetext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebooksetpagetext">external documentation</a>.
 -spec setPageText(This, N, StrText) -> boolean() when
 	This::wxTreebook(), N::integer(), StrText::unicode:chardata().
 setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
@@ -407,7 +407,7 @@ setPageText(#wx_ref{type=ThisT,ref=ThisRef},N,StrText)
   wxe_util:call(?wxTreebook_SetPageText,
   <<ThisRef:32/?UI,N:32/?UI,(byte_size(StrText_UC)):32/?UI,(StrText_UC)/binary, 0:(((8- ((4+byte_size(StrText_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebooksetselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebooksetselection">external documentation</a>.
 -spec setSelection(This, N) -> integer() when
 	This::wxTreebook(), N::integer().
 setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
@@ -416,7 +416,7 @@ setSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
   wxe_util:call(?wxTreebook_SetSelection,
   <<ThisRef:32/?UI,N:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxtreebook.html#wxtreebookchangeselection">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxtreebook.html#wxtreebookchangeselection">external documentation</a>.
 -spec changeSelection(This, N) -> integer() when
 	This::wxTreebook(), N::integer().
 changeSelection(#wx_ref{type=ThisT,ref=ThisRef},N)
diff --git a/lib/wx/src/gen/wxUpdateUIEvent.erl b/lib/wx/src/gen/wxUpdateUIEvent.erl
index f6d46611ab..a51fff0a69 100644
--- a/lib/wx/src/gen/wxUpdateUIEvent.erl
+++ b/lib/wx/src/gen/wxUpdateUIEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html">wxUpdateUIEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html">wxUpdateUIEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>update_ui</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxUpdateUI(). #wxUpdateUI{}} event record type.
@@ -49,7 +49,7 @@ parent_class(wxEvent) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxUpdateUIEvent() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventcanupdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventcanupdate">external documentation</a>.
 -spec canUpdate(Win) -> boolean() when
 	Win::wxWindow:wxWindow().
 canUpdate(#wx_ref{type=WinT,ref=WinRef}) ->
@@ -57,7 +57,7 @@ canUpdate(#wx_ref{type=WinT,ref=WinRef}) ->
   wxe_util:call(?wxUpdateUIEvent_CanUpdate,
   <<WinRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventcheck">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventcheck">external documentation</a>.
 -spec check(This, Check) -> ok when
 	This::wxUpdateUIEvent(), Check::boolean().
 check(#wx_ref{type=ThisT,ref=ThisRef},Check)
@@ -66,7 +66,7 @@ check(#wx_ref{type=ThisT,ref=ThisRef},Check)
   wxe_util:cast(?wxUpdateUIEvent_Check,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Check)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventenable">external documentation</a>.
 -spec enable(This, Enable) -> ok when
 	This::wxUpdateUIEvent(), Enable::boolean().
 enable(#wx_ref{type=ThisT,ref=ThisRef},Enable)
@@ -75,7 +75,7 @@ enable(#wx_ref{type=ThisT,ref=ThisRef},Enable)
   wxe_util:cast(?wxUpdateUIEvent_Enable,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Enable)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventshow">external documentation</a>.
 -spec show(This, Show) -> ok when
 	This::wxUpdateUIEvent(), Show::boolean().
 show(#wx_ref{type=ThisT,ref=ThisRef},Show)
@@ -84,7 +84,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef},Show)
   wxe_util:cast(?wxUpdateUIEvent_Show,
   <<ThisRef:32/?UI,(wxe_util:from_bool(Show)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetchecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetchecked">external documentation</a>.
 -spec getChecked(This) -> boolean() when
 	This::wxUpdateUIEvent().
 getChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -92,7 +92,7 @@ getChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetChecked,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetenabled">external documentation</a>.
 -spec getEnabled(This) -> boolean() when
 	This::wxUpdateUIEvent().
 getEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -100,7 +100,7 @@ getEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetshown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetshown">external documentation</a>.
 -spec getShown(This) -> boolean() when
 	This::wxUpdateUIEvent().
 getShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -108,7 +108,7 @@ getShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetShown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsetchecked">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetsetchecked">external documentation</a>.
 -spec getSetChecked(This) -> boolean() when
 	This::wxUpdateUIEvent().
 getSetChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -116,7 +116,7 @@ getSetChecked(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetSetChecked,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsetenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetsetenabled">external documentation</a>.
 -spec getSetEnabled(This) -> boolean() when
 	This::wxUpdateUIEvent().
 getSetEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -124,7 +124,7 @@ getSetEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetSetEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsetshown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetsetshown">external documentation</a>.
 -spec getSetShown(This) -> boolean() when
 	This::wxUpdateUIEvent().
 getSetShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -132,7 +132,7 @@ getSetShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetSetShown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetsettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetsettext">external documentation</a>.
 -spec getSetText(This) -> boolean() when
 	This::wxUpdateUIEvent().
 getSetText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -140,7 +140,7 @@ getSetText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetSetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgettext">external documentation</a>.
 -spec getText(This) -> unicode:charlist() when
 	This::wxUpdateUIEvent().
 getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -148,26 +148,26 @@ getText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxUpdateUIEvent_GetText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetmode">external documentation</a>.
 %%<br /> Res = ?wxUPDATE_UI_PROCESS_ALL | ?wxUPDATE_UI_PROCESS_SPECIFIED
 -spec getMode() -> wx:wx_enum().
 getMode() ->
   wxe_util:call(?wxUpdateUIEvent_GetMode,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventgetupdateinterval">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventgetupdateinterval">external documentation</a>.
 -spec getUpdateInterval() -> integer().
 getUpdateInterval() ->
   wxe_util:call(?wxUpdateUIEvent_GetUpdateInterval,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventresetupdatetime">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventresetupdatetime">external documentation</a>.
 -spec resetUpdateTime() -> ok.
 resetUpdateTime() ->
   wxe_util:cast(?wxUpdateUIEvent_ResetUpdateTime,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventsetmode">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventsetmode">external documentation</a>.
 %%<br /> Mode = ?wxUPDATE_UI_PROCESS_ALL | ?wxUPDATE_UI_PROCESS_SPECIFIED
 -spec setMode(Mode) -> ok when
 	Mode::wx:wx_enum().
@@ -176,7 +176,7 @@ setMode(Mode)
   wxe_util:cast(?wxUpdateUIEvent_SetMode,
   <<Mode:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventsettext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventsettext">external documentation</a>.
 -spec setText(This, Text) -> ok when
 	This::wxUpdateUIEvent(), Text::unicode:chardata().
 setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -186,7 +186,7 @@ setText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxUpdateUIEvent_SetText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxupdateuievent.html#wxupdateuieventsetupdateinterval">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxupdateuievent.html#wxupdateuieventsetupdateinterval">external documentation</a>.
 -spec setUpdateInterval(UpdateInterval) -> ok when
 	UpdateInterval::integer().
 setUpdateInterval(UpdateInterval)
diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl
index 229633a106..97af96f31d 100644
--- a/lib/wx/src/gen/wxWindow.erl
+++ b/lib/wx/src/gen/wxWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html">wxWindow</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html">wxWindow</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxEvtHandler}
 %% </p>
@@ -75,7 +75,7 @@ parent_class(wxEvtHandler) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxWindow() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowwxwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowwxwindow">external documentation</a>.
 -spec new() -> wxWindow().
 new() ->
   wxe_util:construct(?wxWindow_new_0,
@@ -89,7 +89,7 @@ new(Parent,Id)
  when is_record(Parent, wx_ref),is_integer(Id) ->
   new(Parent,Id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowwxwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowwxwindow">external documentation</a>.
 -spec new(Parent, Id, [Option]) -> wxWindow() when
 	Parent::wxWindow(), Id::integer(),
 	Option :: {pos, {X::integer(), Y::integer()}}
@@ -106,7 +106,7 @@ new(#wx_ref{type=ParentT,ref=ParentRef},Id, Options)
   wxe_util:construct(?wxWindow_new_3,
   <<ParentRef:32/?UI,Id:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcachebestsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcachebestsize">external documentation</a>.
 -spec cacheBestSize(This, Size) -> ok when
 	This::wxWindow(), Size::{W::integer(), H::integer()}.
 cacheBestSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -115,7 +115,7 @@ cacheBestSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxWindow_CacheBestSize,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcapturemouse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcapturemouse">external documentation</a>.
 -spec captureMouse(This) -> ok when
 	This::wxWindow().
 captureMouse(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -131,7 +131,7 @@ center(This)
  when is_record(This, wx_ref) ->
   center(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcenter">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcenter">external documentation</a>.
 -spec center(This, [Option]) -> ok when
 	This::wxWindow(),
 	Option :: {dir, integer()}.
@@ -152,7 +152,7 @@ centerOnParent(This)
  when is_record(This, wx_ref) ->
   centerOnParent(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcenteronparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcenteronparent">external documentation</a>.
 -spec centerOnParent(This, [Option]) -> ok when
 	This::wxWindow(),
 	Option :: {dir, integer()}.
@@ -173,7 +173,7 @@ centre(This)
  when is_record(This, wx_ref) ->
   centre(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcentre">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcentre">external documentation</a>.
 -spec centre(This, [Option]) -> ok when
 	This::wxWindow(),
 	Option :: {dir, integer()}.
@@ -194,7 +194,7 @@ centreOnParent(This)
  when is_record(This, wx_ref) ->
   centreOnParent(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowcentreonparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowcentreonparent">external documentation</a>.
 -spec centreOnParent(This, [Option]) -> ok when
 	This::wxWindow(),
 	Option :: {dir, integer()}.
@@ -207,7 +207,7 @@ centreOnParent(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_CentreOnParent,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclearbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowclearbackground">external documentation</a>.
 -spec clearBackground(This) -> ok when
 	This::wxWindow().
 clearBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -215,7 +215,7 @@ clearBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_ClearBackground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclienttoscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowclienttoscreen">external documentation</a>.
 -spec clientToScreen(This, Pt) -> {X::integer(), Y::integer()} when
 	This::wxWindow(), Pt::{X::integer(), Y::integer()}.
 clientToScreen(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -224,7 +224,7 @@ clientToScreen(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxWindow_ClientToScreen_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclienttoscreen">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowclienttoscreen">external documentation</a>.
 -spec clientToScreen(This, X, Y) -> {X::integer(), Y::integer()} when
 	This::wxWindow(), X::integer(), Y::integer().
 clientToScreen(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -241,7 +241,7 @@ close(This)
  when is_record(This, wx_ref) ->
   close(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowclose">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowclose">external documentation</a>.
 -spec close(This, [Option]) -> boolean() when
 	This::wxWindow(),
 	Option :: {force, boolean()}.
@@ -254,7 +254,7 @@ close(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Close,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowconvertdialogtopixels">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowconvertdialogtopixels">external documentation</a>.
 -spec convertDialogToPixels(This, Sz) -> {W::integer(), H::integer()} when
 	This::wxWindow(), Sz::{W::integer(), H::integer()}.
 convertDialogToPixels(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
@@ -263,7 +263,7 @@ convertDialogToPixels(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
   wxe_util:call(?wxWindow_ConvertDialogToPixels,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowconvertpixelstodialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowconvertpixelstodialog">external documentation</a>.
 -spec convertPixelsToDialog(This, Sz) -> {W::integer(), H::integer()} when
 	This::wxWindow(), Sz::{W::integer(), H::integer()}.
 convertPixelsToDialog(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
@@ -272,7 +272,7 @@ convertPixelsToDialog(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
   wxe_util:call(?wxWindow_ConvertPixelsToDialog,
   <<ThisRef:32/?UI,SzW:32/?UI,SzH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowdestroy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowdestroy">external documentation</a>.
 -spec 'Destroy'(This) -> boolean() when
 	This::wxWindow().
 'Destroy'(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -280,7 +280,7 @@ convertPixelsToDialog(#wx_ref{type=ThisT,ref=ThisRef},{SzW,SzH})
   wxe_util:call(?wxWindow_Destroy,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowdestroychildren">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowdestroychildren">external documentation</a>.
 -spec destroyChildren(This) -> boolean() when
 	This::wxWindow().
 destroyChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -288,7 +288,7 @@ destroyChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_DestroyChildren,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowdisable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowdisable">external documentation</a>.
 -spec disable(This) -> boolean() when
 	This::wxWindow().
 disable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -304,7 +304,7 @@ enable(This)
  when is_record(This, wx_ref) ->
   enable(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowenable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowenable">external documentation</a>.
 -spec enable(This, [Option]) -> boolean() when
 	This::wxWindow(),
 	Option :: {enable, boolean()}.
@@ -317,13 +317,13 @@ enable(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Enable,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfindfocus">external documentation</a>.
 -spec findFocus() -> wxWindow().
 findFocus() ->
   wxe_util:call(?wxWindow_FindFocus,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfindwindow">external documentation</a>.
 %% <br /> Also:<br />
 %% findWindow(This, Name) -> wxWindow() when<br />
 %% 	This::wxWindow(), Name::unicode:chardata().<br />
@@ -352,7 +352,7 @@ findWindowById(Winid)
  when is_integer(Winid) ->
   findWindowById(Winid, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbyid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfindwindowbyid">external documentation</a>.
 -spec findWindowById(Winid, [Option]) -> wxWindow() when
 	Winid::integer(),
 	Option :: {parent, wxWindow()}.
@@ -372,7 +372,7 @@ findWindowByName(Name)
  when is_list(Name) ->
   findWindowByName(Name, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbyname">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfindwindowbyname">external documentation</a>.
 -spec findWindowByName(Name, [Option]) -> wxWindow() when
 	Name::unicode:chardata(),
 	Option :: {parent, wxWindow()}.
@@ -393,7 +393,7 @@ findWindowByLabel(Label)
  when is_list(Label) ->
   findWindowByLabel(Label, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfindwindowbylabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfindwindowbylabel">external documentation</a>.
 -spec findWindowByLabel(Label, [Option]) -> wxWindow() when
 	Label::unicode:chardata(),
 	Option :: {parent, wxWindow()}.
@@ -406,7 +406,7 @@ findWindowByLabel(Label, Options)
   wxe_util:call(?wxWindow_FindWindowByLabel,
   <<(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((4+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfit">external documentation</a>.
 -spec fit(This) -> ok when
 	This::wxWindow().
 fit(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -414,7 +414,7 @@ fit(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_Fit,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfitinside">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfitinside">external documentation</a>.
 -spec fitInside(This) -> ok when
 	This::wxWindow().
 fitInside(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -422,7 +422,7 @@ fitInside(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_FitInside,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowfreeze">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowfreeze">external documentation</a>.
 -spec freeze(This) -> ok when
 	This::wxWindow().
 freeze(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -430,7 +430,7 @@ freeze(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_Freeze,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetacceleratortable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetacceleratortable">external documentation</a>.
 -spec getAcceleratorTable(This) -> wxAcceleratorTable:wxAcceleratorTable() when
 	This::wxWindow().
 getAcceleratorTable(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -438,7 +438,7 @@ getAcceleratorTable(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetAcceleratorTable,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetbackgroundcolour">external documentation</a>.
 -spec getBackgroundColour(This) -> wx:wx_colour4() when
 	This::wxWindow().
 getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -446,7 +446,7 @@ getBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetBackgroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetbackgroundstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetbackgroundstyle">external documentation</a>.
 %%<br /> Res = ?wxBG_STYLE_SYSTEM | ?wxBG_STYLE_COLOUR | ?wxBG_STYLE_CUSTOM
 -spec getBackgroundStyle(This) -> wx:wx_enum() when
 	This::wxWindow().
@@ -455,7 +455,7 @@ getBackgroundStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetBackgroundStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetbestsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetbestsize">external documentation</a>.
 -spec getBestSize(This) -> {W::integer(), H::integer()} when
 	This::wxWindow().
 getBestSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -463,7 +463,7 @@ getBestSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetBestSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcaret">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetcaret">external documentation</a>.
 -spec getCaret(This) -> wxCaret:wxCaret() when
 	This::wxWindow().
 getCaret(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -471,13 +471,13 @@ getCaret(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetCaret,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcapture">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetcapture">external documentation</a>.
 -spec getCapture() -> wxWindow().
 getCapture() ->
   wxe_util:call(?wxWindow_GetCapture,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcharheight">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetcharheight">external documentation</a>.
 -spec getCharHeight(This) -> integer() when
 	This::wxWindow().
 getCharHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -485,7 +485,7 @@ getCharHeight(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetCharHeight,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcharwidth">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetcharwidth">external documentation</a>.
 -spec getCharWidth(This) -> integer() when
 	This::wxWindow().
 getCharWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -493,7 +493,7 @@ getCharWidth(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetCharWidth,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetchildren">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetchildren">external documentation</a>.
 -spec getChildren(This) -> [wxWindow()] when
 	This::wxWindow().
 getChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -501,7 +501,7 @@ getChildren(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetChildren,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetclientsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetclientsize">external documentation</a>.
 -spec getClientSize(This) -> {W::integer(), H::integer()} when
 	This::wxWindow().
 getClientSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -509,7 +509,7 @@ getClientSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetClientSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcontainingsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetcontainingsizer">external documentation</a>.
 -spec getContainingSizer(This) -> wxSizer:wxSizer() when
 	This::wxWindow().
 getContainingSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -517,7 +517,7 @@ getContainingSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetContainingSizer,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetcursor">external documentation</a>.
 -spec getCursor(This) -> wxCursor:wxCursor() when
 	This::wxWindow().
 getCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -525,7 +525,7 @@ getCursor(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetCursor,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetdroptarget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetdroptarget">external documentation</a>.
 -spec getDropTarget(This) -> wx:wx_object() when
 	This::wxWindow().
 getDropTarget(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -533,7 +533,7 @@ getDropTarget(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetDropTarget,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgeteventhandler">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgeteventhandler">external documentation</a>.
 -spec getEventHandler(This) -> wxEvtHandler:wxEvtHandler() when
 	This::wxWindow().
 getEventHandler(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -541,7 +541,7 @@ getEventHandler(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetEventHandler,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetextrastyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetextrastyle">external documentation</a>.
 -spec getExtraStyle(This) -> integer() when
 	This::wxWindow().
 getExtraStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -549,7 +549,7 @@ getExtraStyle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetExtraStyle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetfont">external documentation</a>.
 -spec getFont(This) -> wxFont:wxFont() when
 	This::wxWindow().
 getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -557,7 +557,7 @@ getFont(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetFont,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetforegroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetforegroundcolour">external documentation</a>.
 -spec getForegroundColour(This) -> wx:wx_colour4() when
 	This::wxWindow().
 getForegroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -565,7 +565,7 @@ getForegroundColour(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetForegroundColour,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetgrandparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetgrandparent">external documentation</a>.
 -spec getGrandParent(This) -> wxWindow() when
 	This::wxWindow().
 getGrandParent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -573,7 +573,7 @@ getGrandParent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetGrandParent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgethandle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgethandle">external documentation</a>.
 -spec getHandle(This) -> integer() when
 	This::wxWindow().
 getHandle(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -581,7 +581,7 @@ getHandle(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetHandle,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgethelptext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgethelptext">external documentation</a>.
 -spec getHelpText(This) -> unicode:charlist() when
 	This::wxWindow().
 getHelpText(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -589,7 +589,7 @@ getHelpText(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetHelpText,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetid">external documentation</a>.
 -spec getId(This) -> integer() when
 	This::wxWindow().
 getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -597,7 +597,7 @@ getId(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetId,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetlabel">external documentation</a>.
 -spec getLabel(This) -> unicode:charlist() when
 	This::wxWindow().
 getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -605,7 +605,7 @@ getLabel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetLabel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetmaxsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetmaxsize">external documentation</a>.
 -spec getMaxSize(This) -> {W::integer(), H::integer()} when
 	This::wxWindow().
 getMaxSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -613,7 +613,7 @@ getMaxSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetMaxSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetminsize">external documentation</a>.
 -spec getMinSize(This) -> {W::integer(), H::integer()} when
 	This::wxWindow().
 getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -621,7 +621,7 @@ getMinSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetMinSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetname">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetname">external documentation</a>.
 -spec getName(This) -> unicode:charlist() when
 	This::wxWindow().
 getName(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -629,7 +629,7 @@ getName(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetName,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetparent">external documentation</a>.
 -spec getParent(This) -> wxWindow() when
 	This::wxWindow().
 getParent(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -637,7 +637,7 @@ getParent(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetParent,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetposition">external documentation</a>.
 -spec getPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxWindow().
 getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -645,7 +645,7 @@ getPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetrect">external documentation</a>.
 -spec getRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxWindow().
 getRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -653,7 +653,7 @@ getRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetRect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscreenposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetscreenposition">external documentation</a>.
 -spec getScreenPosition(This) -> {X::integer(), Y::integer()} when
 	This::wxWindow().
 getScreenPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -661,7 +661,7 @@ getScreenPosition(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetScreenPosition,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscreenrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetscreenrect">external documentation</a>.
 -spec getScreenRect(This) -> {X::integer(), Y::integer(), W::integer(), H::integer()} when
 	This::wxWindow().
 getScreenRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -669,7 +669,7 @@ getScreenRect(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetScreenRect,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscrollpos">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetscrollpos">external documentation</a>.
 -spec getScrollPos(This, Orient) -> integer() when
 	This::wxWindow(), Orient::integer().
 getScrollPos(#wx_ref{type=ThisT,ref=ThisRef},Orient)
@@ -678,7 +678,7 @@ getScrollPos(#wx_ref{type=ThisT,ref=ThisRef},Orient)
   wxe_util:call(?wxWindow_GetScrollPos,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscrollrange">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetscrollrange">external documentation</a>.
 -spec getScrollRange(This, Orient) -> integer() when
 	This::wxWindow(), Orient::integer().
 getScrollRange(#wx_ref{type=ThisT,ref=ThisRef},Orient)
@@ -687,7 +687,7 @@ getScrollRange(#wx_ref{type=ThisT,ref=ThisRef},Orient)
   wxe_util:call(?wxWindow_GetScrollRange,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetscrollthumb">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetscrollthumb">external documentation</a>.
 -spec getScrollThumb(This, Orient) -> integer() when
 	This::wxWindow(), Orient::integer().
 getScrollThumb(#wx_ref{type=ThisT,ref=ThisRef},Orient)
@@ -696,7 +696,7 @@ getScrollThumb(#wx_ref{type=ThisT,ref=ThisRef},Orient)
   wxe_util:call(?wxWindow_GetScrollThumb,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetsize">external documentation</a>.
 -spec getSize(This) -> {W::integer(), H::integer()} when
 	This::wxWindow().
 getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -704,7 +704,7 @@ getSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetsizer">external documentation</a>.
 -spec getSizer(This) -> wxSizer:wxSizer() when
 	This::wxWindow().
 getSizer(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -721,7 +721,7 @@ getTextExtent(This,String)
  when is_record(This, wx_ref),is_list(String) ->
   getTextExtent(This,String, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgettextextent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgettextextent">external documentation</a>.
 -spec getTextExtent(This, String, [Option]) -> Result when
 	Result :: {X::integer(), Y::integer(), Descent::integer(), ExternalLeading::integer()},
 	This::wxWindow(), String::unicode:chardata(),
@@ -736,7 +736,7 @@ getTextExtent(#wx_ref{type=ThisT,ref=ThisRef},String, Options)
   wxe_util:call(?wxWindow_GetTextExtent,
   <<ThisRef:32/?UI,(byte_size(String_UC)):32/?UI,(String_UC)/binary, 0:(((8- ((0+byte_size(String_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgettooltip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgettooltip">external documentation</a>.
 -spec getToolTip(This) -> wxToolTip:wxToolTip() when
 	This::wxWindow().
 getToolTip(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -744,7 +744,7 @@ getToolTip(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetToolTip,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetupdateregion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetupdateregion">external documentation</a>.
 -spec getUpdateRegion(This) -> wxRegion:wxRegion() when
 	This::wxWindow().
 getUpdateRegion(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -752,7 +752,7 @@ getUpdateRegion(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetUpdateRegion,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetvirtualsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetvirtualsize">external documentation</a>.
 -spec getVirtualSize(This) -> {W::integer(), H::integer()} when
 	This::wxWindow().
 getVirtualSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -760,7 +760,7 @@ getVirtualSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetVirtualSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetwindowstyleflag">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetwindowstyleflag">external documentation</a>.
 -spec getWindowStyleFlag(This) -> integer() when
 	This::wxWindow().
 getWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -768,7 +768,7 @@ getWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetWindowStyleFlag,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowgetwindowvariant">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowgetwindowvariant">external documentation</a>.
 %%<br /> Res = ?wxWINDOW_VARIANT_NORMAL | ?wxWINDOW_VARIANT_SMALL | ?wxWINDOW_VARIANT_MINI | ?wxWINDOW_VARIANT_LARGE | ?wxWINDOW_VARIANT_MAX
 -spec getWindowVariant(This) -> wx:wx_enum() when
 	This::wxWindow().
@@ -777,7 +777,7 @@ getWindowVariant(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_GetWindowVariant,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhascapture">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowhascapture">external documentation</a>.
 -spec hasCapture(This) -> boolean() when
 	This::wxWindow().
 hasCapture(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -785,7 +785,7 @@ hasCapture(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_HasCapture,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhasscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowhasscrollbar">external documentation</a>.
 -spec hasScrollbar(This, Orient) -> boolean() when
 	This::wxWindow(), Orient::integer().
 hasScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Orient)
@@ -794,7 +794,7 @@ hasScrollbar(#wx_ref{type=ThisT,ref=ThisRef},Orient)
   wxe_util:call(?wxWindow_HasScrollbar,
   <<ThisRef:32/?UI,Orient:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhastransparentbackground">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowhastransparentbackground">external documentation</a>.
 -spec hasTransparentBackground(This) -> boolean() when
 	This::wxWindow().
 hasTransparentBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -802,7 +802,7 @@ hasTransparentBackground(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_HasTransparentBackground,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowhide">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowhide">external documentation</a>.
 -spec hide(This) -> boolean() when
 	This::wxWindow().
 hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -810,7 +810,7 @@ hide(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_Hide,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowinheritattributes">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowinheritattributes">external documentation</a>.
 -spec inheritAttributes(This) -> ok when
 	This::wxWindow().
 inheritAttributes(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -818,7 +818,7 @@ inheritAttributes(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_InheritAttributes,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowinitdialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowinitdialog">external documentation</a>.
 -spec initDialog(This) -> ok when
 	This::wxWindow().
 initDialog(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -826,7 +826,7 @@ initDialog(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_InitDialog,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowinvalidatebestsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowinvalidatebestsize">external documentation</a>.
 -spec invalidateBestSize(This) -> ok when
 	This::wxWindow().
 invalidateBestSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -834,7 +834,7 @@ invalidateBestSize(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_InvalidateBestSize,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisenabled">external documentation</a>.
 -spec isEnabled(This) -> boolean() when
 	This::wxWindow().
 isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -842,7 +842,7 @@ isEnabled(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_IsEnabled,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
 %% <br /> Also:<br />
 %% isExposed(This, Rect) -> boolean() when<br />
 %% 	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -862,7 +862,7 @@ isExposed(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:call(?wxWindow_IsExposed_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
 -spec isExposed(This, X, Y) -> boolean() when
 	This::wxWindow(), X::integer(), Y::integer().
 isExposed(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -871,7 +871,7 @@ isExposed(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
   wxe_util:call(?wxWindow_IsExposed_2,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisexposed">external documentation</a>.
 -spec isExposed(This, X, Y, W, H) -> boolean() when
 	This::wxWindow(), X::integer(), Y::integer(), W::integer(), H::integer().
 isExposed(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
@@ -880,7 +880,7 @@ isExposed(#wx_ref{type=ThisT,ref=ThisRef},X,Y,W,H)
   wxe_util:call(?wxWindow_IsExposed_4,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI,W:32/?UI,H:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisretained">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisretained">external documentation</a>.
 -spec isRetained(This) -> boolean() when
 	This::wxWindow().
 isRetained(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -888,7 +888,7 @@ isRetained(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_IsRetained,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowisshown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowisshown">external documentation</a>.
 -spec isShown(This) -> boolean() when
 	This::wxWindow().
 isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -896,7 +896,7 @@ isShown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_IsShown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowistoplevel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowistoplevel">external documentation</a>.
 -spec isTopLevel(This) -> boolean() when
 	This::wxWindow().
 isTopLevel(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -904,7 +904,7 @@ isTopLevel(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_IsTopLevel,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlayout">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowlayout">external documentation</a>.
 -spec layout(This) -> boolean() when
 	This::wxWindow().
 layout(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -912,7 +912,7 @@ layout(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_Layout,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlinedown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowlinedown">external documentation</a>.
 -spec lineDown(This) -> boolean() when
 	This::wxWindow().
 lineDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -920,7 +920,7 @@ lineDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_LineDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlineup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowlineup">external documentation</a>.
 -spec lineUp(This) -> boolean() when
 	This::wxWindow().
 lineUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -928,7 +928,7 @@ lineUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_LineUp,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowlower">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowlower">external documentation</a>.
 -spec lower(This) -> ok when
 	This::wxWindow().
 lower(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -944,7 +944,7 @@ makeModal(This)
  when is_record(This, wx_ref) ->
   makeModal(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmakemodal">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowmakemodal">external documentation</a>.
 -spec makeModal(This, [Option]) -> ok when
 	This::wxWindow(),
 	Option :: {modal, boolean()}.
@@ -965,7 +965,7 @@ move(This,Pt={PtX,PtY})
  when is_record(This, wx_ref),is_integer(PtX),is_integer(PtY) ->
   move(This,Pt, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowmove">external documentation</a>.
 %% <br /> Also:<br />
 %% move(This, Pt, [Option]) -> ok when<br />
 %% 	This::wxWindow(), Pt::{X::integer(), Y::integer()},<br />
@@ -989,7 +989,7 @@ move(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY}, Options)
   wxe_util:cast(?wxWindow_Move_2,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmove">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowmove">external documentation</a>.
 -spec move(This, X, Y, [Option]) -> ok when
 	This::wxWindow(), X::integer(), Y::integer(),
 	Option :: {flags, integer()}.
@@ -1002,7 +1002,7 @@ move(#wx_ref{type=ThisT,ref=ThisRef},X,Y, Options)
   wxe_util:cast(?wxWindow_Move_3,
   <<ThisRef:32/?UI,X:32/?UI,Y:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmoveafterintaborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowmoveafterintaborder">external documentation</a>.
 -spec moveAfterInTabOrder(This, Win) -> ok when
 	This::wxWindow(), Win::wxWindow().
 moveAfterInTabOrder(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
@@ -1011,7 +1011,7 @@ moveAfterInTabOrder(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef
   wxe_util:cast(?wxWindow_MoveAfterInTabOrder,
   <<ThisRef:32/?UI,WinRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowmovebeforeintaborder">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowmovebeforeintaborder">external documentation</a>.
 -spec moveBeforeInTabOrder(This, Win) -> ok when
 	This::wxWindow(), Win::wxWindow().
 moveBeforeInTabOrder(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=WinT,ref=WinRef}) ->
@@ -1028,7 +1028,7 @@ navigate(This)
  when is_record(This, wx_ref) ->
   navigate(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindownavigate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindownavigate">external documentation</a>.
 -spec navigate(This, [Option]) -> boolean() when
 	This::wxWindow(),
 	Option :: {flags, integer()}.
@@ -1041,7 +1041,7 @@ navigate(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Navigate,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpagedown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowpagedown">external documentation</a>.
 -spec pageDown(This) -> boolean() when
 	This::wxWindow().
 pageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1049,7 +1049,7 @@ pageDown(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_PageDown,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpageup">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowpageup">external documentation</a>.
 -spec pageUp(This) -> boolean() when
 	This::wxWindow().
 pageUp(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1065,7 +1065,7 @@ popEventHandler(This)
  when is_record(This, wx_ref) ->
   popEventHandler(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpopeventhandler">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowpopeventhandler">external documentation</a>.
 -spec popEventHandler(This, [Option]) -> wxEvtHandler:wxEvtHandler() when
 	This::wxWindow(),
 	Option :: {deleteHandler, boolean()}.
@@ -1086,7 +1086,7 @@ popupMenu(This,Menu)
  when is_record(This, wx_ref),is_record(Menu, wx_ref) ->
   popupMenu(This,Menu, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpopupmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowpopupmenu">external documentation</a>.
 -spec popupMenu(This, Menu, [Option]) -> boolean() when
 	This::wxWindow(), Menu::wxMenu:wxMenu(),
 	Option :: {pos, {X::integer(), Y::integer()}}.
@@ -1100,7 +1100,7 @@ popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef}, Optio
   wxe_util:call(?wxWindow_PopupMenu_2,
   <<ThisRef:32/?UI,MenuRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowpopupmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowpopupmenu">external documentation</a>.
 -spec popupMenu(This, Menu, X, Y) -> boolean() when
 	This::wxWindow(), Menu::wxMenu:wxMenu(), X::integer(), Y::integer().
 popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},X,Y)
@@ -1110,7 +1110,7 @@ popupMenu(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=MenuT,ref=MenuRef},X,Y)
   wxe_util:call(?wxWindow_PopupMenu_3,
   <<ThisRef:32/?UI,MenuRef:32/?UI,X:32/?UI,Y:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowraise">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowraise">external documentation</a>.
 -spec raise(This) -> ok when
 	This::wxWindow().
 raise(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1126,7 +1126,7 @@ refresh(This)
  when is_record(This, wx_ref) ->
   refresh(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowrefresh">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowrefresh">external documentation</a>.
 -spec refresh(This, [Option]) -> ok when
 	This::wxWindow(),
 	Option :: {eraseBackground, boolean()}
@@ -1149,7 +1149,7 @@ refreshRect(This,Rect={RectX,RectY,RectW,RectH})
  when is_record(This, wx_ref),is_integer(RectX),is_integer(RectY),is_integer(RectW),is_integer(RectH) ->
   refreshRect(This,Rect, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowrefreshrect">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowrefreshrect">external documentation</a>.
 -spec refreshRect(This, Rect, [Option]) -> ok when
 	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},
 	Option :: {eraseBackground, boolean()}.
@@ -1162,7 +1162,7 @@ refreshRect(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH}, Options)
   wxe_util:cast(?wxWindow_RefreshRect,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowreleasemouse">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowreleasemouse">external documentation</a>.
 -spec releaseMouse(This) -> ok when
 	This::wxWindow().
 releaseMouse(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1170,7 +1170,7 @@ releaseMouse(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_ReleaseMouse,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowremovechild">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowremovechild">external documentation</a>.
 -spec removeChild(This, Child) -> ok when
 	This::wxWindow(), Child::wxWindow().
 removeChild(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ChildT,ref=ChildRef}) ->
@@ -1179,7 +1179,7 @@ removeChild(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ChildT,ref=ChildRef}) -
   wxe_util:cast(?wxWindow_RemoveChild,
   <<ThisRef:32/?UI,ChildRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowreparent">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowreparent">external documentation</a>.
 -spec reparent(This, NewParent) -> boolean() when
 	This::wxWindow(), NewParent::wxWindow().
 reparent(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=NewParentT,ref=NewParentRef}) ->
@@ -1188,7 +1188,7 @@ reparent(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=NewParentT,ref=NewParentRe
   wxe_util:call(?wxWindow_Reparent,
   <<ThisRef:32/?UI,NewParentRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscreentoclient">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowscreentoclient">external documentation</a>.
 -spec screenToClient(This) -> {X::integer(), Y::integer()} when
 	This::wxWindow().
 screenToClient(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1196,7 +1196,7 @@ screenToClient(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_ScreenToClient_2,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscreentoclient">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowscreentoclient">external documentation</a>.
 -spec screenToClient(This, Pt) -> {X::integer(), Y::integer()} when
 	This::wxWindow(), Pt::{X::integer(), Y::integer()}.
 screenToClient(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
@@ -1205,7 +1205,7 @@ screenToClient(#wx_ref{type=ThisT,ref=ThisRef},{PtX,PtY})
   wxe_util:call(?wxWindow_ScreenToClient_1,
   <<ThisRef:32/?UI,PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscrolllines">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowscrolllines">external documentation</a>.
 -spec scrollLines(This, Lines) -> boolean() when
 	This::wxWindow(), Lines::integer().
 scrollLines(#wx_ref{type=ThisT,ref=ThisRef},Lines)
@@ -1214,7 +1214,7 @@ scrollLines(#wx_ref{type=ThisT,ref=ThisRef},Lines)
   wxe_util:call(?wxWindow_ScrollLines,
   <<ThisRef:32/?UI,Lines:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscrollpages">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowscrollpages">external documentation</a>.
 -spec scrollPages(This, Pages) -> boolean() when
 	This::wxWindow(), Pages::integer().
 scrollPages(#wx_ref{type=ThisT,ref=ThisRef},Pages)
@@ -1231,7 +1231,7 @@ scrollWindow(This,Dx,Dy)
  when is_record(This, wx_ref),is_integer(Dx),is_integer(Dy) ->
   scrollWindow(This,Dx,Dy, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowscrollwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowscrollwindow">external documentation</a>.
 -spec scrollWindow(This, Dx, Dy, [Option]) -> ok when
 	This::wxWindow(), Dx::integer(), Dy::integer(),
 	Option :: {rect, {X::integer(), Y::integer(), W::integer(), H::integer()}}.
@@ -1244,7 +1244,7 @@ scrollWindow(#wx_ref{type=ThisT,ref=ThisRef},Dx,Dy, Options)
   wxe_util:cast(?wxWindow_ScrollWindow,
   <<ThisRef:32/?UI,Dx:32/?UI,Dy:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetacceleratortable">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetacceleratortable">external documentation</a>.
 -spec setAcceleratorTable(This, Accel) -> ok when
 	This::wxWindow(), Accel::wxAcceleratorTable:wxAcceleratorTable().
 setAcceleratorTable(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=AccelT,ref=AccelRef}) ->
@@ -1253,7 +1253,7 @@ setAcceleratorTable(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=AccelT,ref=Acce
   wxe_util:cast(?wxWindow_SetAcceleratorTable,
   <<ThisRef:32/?UI,AccelRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetautolayout">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetautolayout">external documentation</a>.
 -spec setAutoLayout(This, AutoLayout) -> ok when
 	This::wxWindow(), AutoLayout::boolean().
 setAutoLayout(#wx_ref{type=ThisT,ref=ThisRef},AutoLayout)
@@ -1262,7 +1262,7 @@ setAutoLayout(#wx_ref{type=ThisT,ref=ThisRef},AutoLayout)
   wxe_util:cast(?wxWindow_SetAutoLayout,
   <<ThisRef:32/?UI,(wxe_util:from_bool(AutoLayout)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetbackgroundcolour">external documentation</a>.
 -spec setBackgroundColour(This, Colour) -> boolean() when
 	This::wxWindow(), Colour::wx:wx_colour().
 setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -1271,7 +1271,7 @@ setBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:call(?wxWindow_SetBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetbackgroundstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetbackgroundstyle">external documentation</a>.
 %%<br /> Style = ?wxBG_STYLE_SYSTEM | ?wxBG_STYLE_COLOUR | ?wxBG_STYLE_CUSTOM
 -spec setBackgroundStyle(This, Style) -> boolean() when
 	This::wxWindow(), Style::wx:wx_enum().
@@ -1281,7 +1281,7 @@ setBackgroundStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
   wxe_util:call(?wxWindow_SetBackgroundStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetcaret">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetcaret">external documentation</a>.
 -spec setCaret(This, Caret) -> ok when
 	This::wxWindow(), Caret::wxCaret:wxCaret().
 setCaret(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CaretT,ref=CaretRef}) ->
@@ -1290,7 +1290,7 @@ setCaret(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CaretT,ref=CaretRef}) ->
   wxe_util:cast(?wxWindow_SetCaret,
   <<ThisRef:32/?UI,CaretRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
 %% <br /> Also:<br />
 %% setClientSize(This, Rect) -> ok when<br />
 %% 	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}.<br />
@@ -1310,7 +1310,7 @@ setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{RectX,RectY,RectW,RectH})
   wxe_util:cast(?wxWindow_SetClientSize_1_1,
   <<ThisRef:32/?UI,RectX:32/?UI,RectY:32/?UI,RectW:32/?UI,RectH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
 -spec setClientSize(This, Width, Height) -> ok when
 	This::wxWindow(), Width::integer(), Height::integer().
 setClientSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
@@ -1319,7 +1319,7 @@ setClientSize(#wx_ref{type=ThisT,ref=ThisRef},Width,Height)
   wxe_util:cast(?wxWindow_SetClientSize_2,
   <<ThisRef:32/?UI,Width:32/?UI,Height:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetcontainingsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetcontainingsizer">external documentation</a>.
 -spec setContainingSizer(This, Sizer) -> ok when
 	This::wxWindow(), Sizer::wxSizer:wxSizer().
 setContainingSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}) ->
@@ -1328,7 +1328,7 @@ setContainingSizer(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=Sizer
   wxe_util:cast(?wxWindow_SetContainingSizer,
   <<ThisRef:32/?UI,SizerRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetcursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetcursor">external documentation</a>.
 -spec setCursor(This, Cursor) -> boolean() when
 	This::wxWindow(), Cursor::wxCursor:wxCursor().
 setCursor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CursorT,ref=CursorRef}) ->
@@ -1337,7 +1337,7 @@ setCursor(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CursorT,ref=CursorRef}) -
   wxe_util:call(?wxWindow_SetCursor,
   <<ThisRef:32/?UI,CursorRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetmaxsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetmaxsize">external documentation</a>.
 -spec setMaxSize(This, MaxSize) -> ok when
 	This::wxWindow(), MaxSize::{W::integer(), H::integer()}.
 setMaxSize(#wx_ref{type=ThisT,ref=ThisRef},{MaxSizeW,MaxSizeH})
@@ -1346,7 +1346,7 @@ setMaxSize(#wx_ref{type=ThisT,ref=ThisRef},{MaxSizeW,MaxSizeH})
   wxe_util:cast(?wxWindow_SetMaxSize,
   <<ThisRef:32/?UI,MaxSizeW:32/?UI,MaxSizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetminsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetminsize">external documentation</a>.
 -spec setMinSize(This, MinSize) -> ok when
 	This::wxWindow(), MinSize::{W::integer(), H::integer()}.
 setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{MinSizeW,MinSizeH})
@@ -1355,7 +1355,7 @@ setMinSize(#wx_ref{type=ThisT,ref=ThisRef},{MinSizeW,MinSizeH})
   wxe_util:cast(?wxWindow_SetMinSize,
   <<ThisRef:32/?UI,MinSizeW:32/?UI,MinSizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetownbackgroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetownbackgroundcolour">external documentation</a>.
 -spec setOwnBackgroundColour(This, Colour) -> ok when
 	This::wxWindow(), Colour::wx:wx_colour().
 setOwnBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -1364,7 +1364,7 @@ setOwnBackgroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxWindow_SetOwnBackgroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetownfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetownfont">external documentation</a>.
 -spec setOwnFont(This, Font) -> ok when
 	This::wxWindow(), Font::wxFont:wxFont().
 setOwnFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -1373,7 +1373,7 @@ setOwnFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:cast(?wxWindow_SetOwnFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetownforegroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetownforegroundcolour">external documentation</a>.
 -spec setOwnForegroundColour(This, Colour) -> ok when
 	This::wxWindow(), Colour::wx:wx_colour().
 setOwnForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -1382,7 +1382,7 @@ setOwnForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:cast(?wxWindow_SetOwnForegroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetdroptarget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetdroptarget">external documentation</a>.
 -spec setDropTarget(This, DropTarget) -> ok when
 	This::wxWindow(), DropTarget::wx:wx_object().
 setDropTarget(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DropTargetT,ref=DropTargetRef}) ->
@@ -1391,7 +1391,7 @@ setDropTarget(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DropTargetT,ref=DropT
   wxe_util:cast(?wxWindow_SetDropTarget,
   <<ThisRef:32/?UI,DropTargetRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetextrastyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetextrastyle">external documentation</a>.
 -spec setExtraStyle(This, ExStyle) -> ok when
 	This::wxWindow(), ExStyle::integer().
 setExtraStyle(#wx_ref{type=ThisT,ref=ThisRef},ExStyle)
@@ -1400,7 +1400,7 @@ setExtraStyle(#wx_ref{type=ThisT,ref=ThisRef},ExStyle)
   wxe_util:cast(?wxWindow_SetExtraStyle,
   <<ThisRef:32/?UI,ExStyle:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetfocus">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetfocus">external documentation</a>.
 -spec setFocus(This) -> ok when
 	This::wxWindow().
 setFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1408,7 +1408,7 @@ setFocus(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_SetFocus,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetfocusfromkbd">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetfocusfromkbd">external documentation</a>.
 -spec setFocusFromKbd(This) -> ok when
 	This::wxWindow().
 setFocusFromKbd(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1416,7 +1416,7 @@ setFocusFromKbd(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_SetFocusFromKbd,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetfont">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetfont">external documentation</a>.
 -spec setFont(This, Font) -> boolean() when
 	This::wxWindow(), Font::wxFont:wxFont().
 setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
@@ -1425,7 +1425,7 @@ setFont(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FontT,ref=FontRef}) ->
   wxe_util:call(?wxWindow_SetFont,
   <<ThisRef:32/?UI,FontRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetforegroundcolour">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetforegroundcolour">external documentation</a>.
 -spec setForegroundColour(This, Colour) -> boolean() when
 	This::wxWindow(), Colour::wx:wx_colour().
 setForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
@@ -1434,7 +1434,7 @@ setForegroundColour(#wx_ref{type=ThisT,ref=ThisRef},Colour)
   wxe_util:call(?wxWindow_SetForegroundColour,
   <<ThisRef:32/?UI,(wxe_util:colour_bin(Colour)):16/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsethelptext">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsethelptext">external documentation</a>.
 -spec setHelpText(This, Text) -> ok when
 	This::wxWindow(), Text::unicode:chardata().
 setHelpText(#wx_ref{type=ThisT,ref=ThisRef},Text)
@@ -1444,7 +1444,7 @@ setHelpText(#wx_ref{type=ThisT,ref=ThisRef},Text)
   wxe_util:cast(?wxWindow_SetHelpText,
   <<ThisRef:32/?UI,(byte_size(Text_UC)):32/?UI,(Text_UC)/binary, 0:(((8- ((0+byte_size(Text_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetid">external documentation</a>.
 -spec setId(This, Winid) -> ok when
 	This::wxWindow(), Winid::integer().
 setId(#wx_ref{type=ThisT,ref=ThisRef},Winid)
@@ -1453,7 +1453,7 @@ setId(#wx_ref{type=ThisT,ref=ThisRef},Winid)
   wxe_util:cast(?wxWindow_SetId,
   <<ThisRef:32/?UI,Winid:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetlabel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetlabel">external documentation</a>.
 -spec setLabel(This, Label) -> ok when
 	This::wxWindow(), Label::unicode:chardata().
 setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
@@ -1463,7 +1463,7 @@ setLabel(#wx_ref{type=ThisT,ref=ThisRef},Label)
   wxe_util:cast(?wxWindow_SetLabel,
   <<ThisRef:32/?UI,(byte_size(Label_UC)):32/?UI,(Label_UC)/binary, 0:(((8- ((0+byte_size(Label_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetname">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetname">external documentation</a>.
 -spec setName(This, Name) -> ok when
 	This::wxWindow(), Name::unicode:chardata().
 setName(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -1473,7 +1473,7 @@ setName(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:cast(?wxWindow_SetName,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetpalette">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetpalette">external documentation</a>.
 -spec setPalette(This, Pal) -> ok when
 	This::wxWindow(), Pal::wxPalette:wxPalette().
 setPalette(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PalT,ref=PalRef}) ->
@@ -1490,7 +1490,7 @@ setScrollbar(This,Orient,Pos,ThumbVisible,Range)
  when is_record(This, wx_ref),is_integer(Orient),is_integer(Pos),is_integer(ThumbVisible),is_integer(Range) ->
   setScrollbar(This,Orient,Pos,ThumbVisible,Range, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetscrollbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetscrollbar">external documentation</a>.
 -spec setScrollbar(This, Orient, Pos, ThumbVisible, Range, [Option]) -> ok when
 	This::wxWindow(), Orient::integer(), Pos::integer(), ThumbVisible::integer(), Range::integer(),
 	Option :: {refresh, boolean()}.
@@ -1511,7 +1511,7 @@ setScrollPos(This,Orient,Pos)
  when is_record(This, wx_ref),is_integer(Orient),is_integer(Pos) ->
   setScrollPos(This,Orient,Pos, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetscrollpos">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetscrollpos">external documentation</a>.
 -spec setScrollPos(This, Orient, Pos, [Option]) -> ok when
 	This::wxWindow(), Orient::integer(), Pos::integer(),
 	Option :: {refresh, boolean()}.
@@ -1524,7 +1524,7 @@ setScrollPos(#wx_ref{type=ThisT,ref=ThisRef},Orient,Pos, Options)
   wxe_util:cast(?wxWindow_SetScrollPos,
   <<ThisRef:32/?UI,Orient:32/?UI,Pos:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
 %% <br /> Also:<br />
 %% setSize(This, Size) -> ok when<br />
 %% 	This::wxWindow(), Size::{W::integer(), H::integer()}.<br />
@@ -1543,7 +1543,7 @@ setSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxWindow_SetSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
 %% <br /> Also:<br />
 %% setSize(This, Rect, [Option]) -> ok when<br />
 %% 	This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()},<br />
@@ -1576,7 +1576,7 @@ setSize(This,X,Y,Width,Height)
  when is_record(This, wx_ref),is_integer(X),is_integer(Y),is_integer(Width),is_integer(Height) ->
   setSize(This,X,Y,Width,Height, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetsize">external documentation</a>.
 -spec setSize(This, X, Y, Width, Height, [Option]) -> ok when
 	This::wxWindow(), X::integer(), Y::integer(), Width::integer(), Height::integer(),
 	Option :: {sizeFlags, integer()}.
@@ -1597,7 +1597,7 @@ setSizeHints(This,MinSize={MinSizeW,MinSizeH})
  when is_record(This, wx_ref),is_integer(MinSizeW),is_integer(MinSizeH) ->
   setSizeHints(This,MinSize, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizehints">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetsizehints">external documentation</a>.
 %% <br /> Also:<br />
 %% setSizeHints(This, MinSize, [Option]) -> ok when<br />
 %% 	This::wxWindow(), MinSize::{W::integer(), H::integer()},<br />
@@ -1624,7 +1624,7 @@ setSizeHints(#wx_ref{type=ThisT,ref=ThisRef},{MinSizeW,MinSizeH}, Options)
   wxe_util:cast(?wxWindow_SetSizeHints_2,
   <<ThisRef:32/?UI,MinSizeW:32/?UI,MinSizeH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizehints">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetsizehints">external documentation</a>.
 -spec setSizeHints(This, MinW, MinH, [Option]) -> ok when
 	This::wxWindow(), MinW::integer(), MinH::integer(),
 	Option :: {maxW, integer()}
@@ -1651,7 +1651,7 @@ setSizer(This,Sizer)
  when is_record(This, wx_ref),is_record(Sizer, wx_ref) ->
   setSizer(This,Sizer, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetsizer">external documentation</a>.
 -spec setSizer(This, Sizer, [Option]) -> ok when
 	This::wxWindow(), Sizer::wxSizer:wxSizer(),
 	Option :: {deleteOld, boolean()}.
@@ -1673,7 +1673,7 @@ setSizerAndFit(This,Sizer)
  when is_record(This, wx_ref),is_record(Sizer, wx_ref) ->
   setSizerAndFit(This,Sizer, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetsizerandfit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetsizerandfit">external documentation</a>.
 -spec setSizerAndFit(This, Sizer, [Option]) -> ok when
 	This::wxWindow(), Sizer::wxSizer:wxSizer(),
 	Option :: {deleteOld, boolean()}.
@@ -1687,7 +1687,7 @@ setSizerAndFit(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=SizerT,ref=SizerRef}
   wxe_util:cast(?wxWindow_SetSizerAndFit,
   <<ThisRef:32/?UI,SizerRef:32/?UI, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetthemeenabled">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetthemeenabled">external documentation</a>.
 -spec setThemeEnabled(This, EnableTheme) -> ok when
 	This::wxWindow(), EnableTheme::boolean().
 setThemeEnabled(#wx_ref{type=ThisT,ref=ThisRef},EnableTheme)
@@ -1696,7 +1696,7 @@ setThemeEnabled(#wx_ref{type=ThisT,ref=ThisRef},EnableTheme)
   wxe_util:cast(?wxWindow_SetThemeEnabled,
   <<ThisRef:32/?UI,(wxe_util:from_bool(EnableTheme)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsettooltip">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsettooltip">external documentation</a>.
 %% <br /> Also:<br />
 %% setToolTip(This, Tip) -> ok when<br />
 %% 	This::wxWindow(), Tip::wxToolTip:wxToolTip().<br />
@@ -1717,7 +1717,7 @@ setToolTip(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=TipT,ref=TipRef}) ->
   wxe_util:cast(?wxWindow_SetToolTip_1_1,
   <<ThisRef:32/?UI,TipRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetvirtualsize">external documentation</a>.
 -spec setVirtualSize(This, Size) -> ok when
 	This::wxWindow(), Size::{W::integer(), H::integer()}.
 setVirtualSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
@@ -1726,7 +1726,7 @@ setVirtualSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
   wxe_util:cast(?wxWindow_SetVirtualSize_1,
   <<ThisRef:32/?UI,SizeW:32/?UI,SizeH:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsize">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetvirtualsize">external documentation</a>.
 -spec setVirtualSize(This, X, Y) -> ok when
 	This::wxWindow(), X::integer(), Y::integer().
 setVirtualSize(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
@@ -1743,7 +1743,7 @@ setVirtualSizeHints(This,MinSize={MinSizeW,MinSizeH})
  when is_record(This, wx_ref),is_integer(MinSizeW),is_integer(MinSizeH) ->
   setVirtualSizeHints(This,MinSize, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsizehints">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetvirtualsizehints">external documentation</a>.
 %% <br /> Also:<br />
 %% setVirtualSizeHints(This, MinSize, [Option]) -> ok when<br />
 %% 	This::wxWindow(), MinSize::{W::integer(), H::integer()},<br />
@@ -1767,7 +1767,7 @@ setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},{MinSizeW,MinSizeH}, Options
   wxe_util:cast(?wxWindow_SetVirtualSizeHints_2,
   <<ThisRef:32/?UI,MinSizeW:32/?UI,MinSizeH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetvirtualsizehints">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetvirtualsizehints">external documentation</a>.
 -spec setVirtualSizeHints(This, MinW, MinH, [Option]) -> ok when
 	This::wxWindow(), MinW::integer(), MinH::integer(),
 	Option :: {maxW, integer()}
@@ -1782,7 +1782,7 @@ setVirtualSizeHints(#wx_ref{type=ThisT,ref=ThisRef},MinW,MinH, Options)
   wxe_util:cast(?wxWindow_SetVirtualSizeHints_3,
   <<ThisRef:32/?UI,MinW:32/?UI,MinH:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetwindowstyle">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetwindowstyle">external documentation</a>.
 -spec setWindowStyle(This, Style) -> ok when
 	This::wxWindow(), Style::integer().
 setWindowStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
@@ -1791,7 +1791,7 @@ setWindowStyle(#wx_ref{type=ThisT,ref=ThisRef},Style)
   wxe_util:cast(?wxWindow_SetWindowStyle,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetwindowstyleflag">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetwindowstyleflag">external documentation</a>.
 -spec setWindowStyleFlag(This, Style) -> ok when
 	This::wxWindow(), Style::integer().
 setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
@@ -1800,7 +1800,7 @@ setWindowStyleFlag(#wx_ref{type=ThisT,ref=ThisRef},Style)
   wxe_util:cast(?wxWindow_SetWindowStyleFlag,
   <<ThisRef:32/?UI,Style:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetwindowvariant">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowsetwindowvariant">external documentation</a>.
 %%<br /> Variant = ?wxWINDOW_VARIANT_NORMAL | ?wxWINDOW_VARIANT_SMALL | ?wxWINDOW_VARIANT_MINI | ?wxWINDOW_VARIANT_LARGE | ?wxWINDOW_VARIANT_MAX
 -spec setWindowVariant(This, Variant) -> ok when
 	This::wxWindow(), Variant::wx:wx_enum().
@@ -1810,7 +1810,7 @@ setWindowVariant(#wx_ref{type=ThisT,ref=ThisRef},Variant)
   wxe_util:cast(?wxWindow_SetWindowVariant,
   <<ThisRef:32/?UI,Variant:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowshouldinheritcolours">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowshouldinheritcolours">external documentation</a>.
 -spec shouldInheritColours(This) -> boolean() when
 	This::wxWindow().
 shouldInheritColours(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1826,7 +1826,7 @@ show(This)
  when is_record(This, wx_ref) ->
   show(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowshow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowshow">external documentation</a>.
 -spec show(This, [Option]) -> boolean() when
 	This::wxWindow(),
 	Option :: {show, boolean()}.
@@ -1839,7 +1839,7 @@ show(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:call(?wxWindow_Show,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowthaw">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowthaw">external documentation</a>.
 -spec thaw(This) -> ok when
 	This::wxWindow().
 thaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1847,7 +1847,7 @@ thaw(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxWindow_Thaw,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowtransferdatafromwindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowtransferdatafromwindow">external documentation</a>.
 -spec transferDataFromWindow(This) -> boolean() when
 	This::wxWindow().
 transferDataFromWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1855,7 +1855,7 @@ transferDataFromWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_TransferDataFromWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowtransferdatatowindow">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowtransferdatatowindow">external documentation</a>.
 -spec transferDataToWindow(This) -> boolean() when
 	This::wxWindow().
 transferDataToWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1863,7 +1863,7 @@ transferDataToWindow(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_TransferDataToWindow,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowupdate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowupdate">external documentation</a>.
 -spec update(This) -> ok when
 	This::wxWindow().
 update(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1879,7 +1879,7 @@ updateWindowUI(This)
  when is_record(This, wx_ref) ->
   updateWindowUI(This, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowupdatewindowui">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowupdatewindowui">external documentation</a>.
 -spec updateWindowUI(This, [Option]) -> ok when
 	This::wxWindow(),
 	Option :: {flags, integer()}.
@@ -1892,7 +1892,7 @@ updateWindowUI(#wx_ref{type=ThisT,ref=ThisRef}, Options)
   wxe_util:cast(?wxWindow_UpdateWindowUI,
   <<ThisRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowvalidate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowvalidate">external documentation</a>.
 -spec validate(This) -> boolean() when
 	This::wxWindow().
 validate(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -1900,7 +1900,7 @@ validate(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxWindow_Validate,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowwarppointer">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindow.html#wxwindowwarppointer">external documentation</a>.
 -spec warpPointer(This, X, Y) -> ok when
 	This::wxWindow(), X::integer(), Y::integer().
 warpPointer(#wx_ref{type=ThisT,ref=ThisRef},X,Y)
diff --git a/lib/wx/src/gen/wxWindowCreateEvent.erl b/lib/wx/src/gen/wxWindowCreateEvent.erl
index f17d6011d9..6688d54703 100644
--- a/lib/wx/src/gen/wxWindowCreateEvent.erl
+++ b/lib/wx/src/gen/wxWindowCreateEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindowcreateevent.html">wxWindowCreateEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindowcreateevent.html">wxWindowCreateEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>create</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxWindowCreate(). #wxWindowCreate{}} event record type.
diff --git a/lib/wx/src/gen/wxWindowDC.erl b/lib/wx/src/gen/wxWindowDC.erl
index 4515f0e6b9..6bb303cfe6 100644
--- a/lib/wx/src/gen/wxWindowDC.erl
+++ b/lib/wx/src/gen/wxWindowDC.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindowdc.html">wxWindowDC</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindowdc.html">wxWindowDC</a>.
 %% <p>This class is derived (and can use functions) from:
 %% <br />{@link wxDC}
 %% </p>
@@ -55,18 +55,20 @@
 -export_type([wxWindowDC/0]).
 -deprecated([new/0]).
 
+-compile([{nowarn_deprecated_function, {wxDC,computeScaleAndOrigin,1}}]).
+
 %% @hidden
 parent_class(wxDC) -> true;
 parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 
 -type wxWindowDC() :: wx:wx_object().
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindowdc.html#wxwindowdcwxwindowdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindowdc.html#wxwindowdcwxwindowdc">external documentation</a>.
 -spec new() -> wxWindowDC().
 new() ->
   wxe_util:construct(?wxWindowDC_new_0,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindowdc.html#wxwindowdcwxwindowdc">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindowdc.html#wxwindowdcwxwindowdc">external documentation</a>.
 -spec new(Win) -> wxWindowDC() when
 	Win::wxWindow:wxWindow().
 new(#wx_ref{type=WinT,ref=WinRef}) ->
diff --git a/lib/wx/src/gen/wxWindowDestroyEvent.erl b/lib/wx/src/gen/wxWindowDestroyEvent.erl
index 909f521d82..c21d4787b8 100644
--- a/lib/wx/src/gen/wxWindowDestroyEvent.erl
+++ b/lib/wx/src/gen/wxWindowDestroyEvent.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindowdestroyevent.html">wxWindowDestroyEvent</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxwindowdestroyevent.html">wxWindowDestroyEvent</a>.
 %% <dl><dt>Use {@link wxEvtHandler:connect/3.} with EventType:</dt>
 %% <dd><em>destroy</em></dd></dl>
 %% See also the message variant {@link wxEvtHandler:wxWindowDestroy(). #wxWindowDestroy{}} event record type.
diff --git a/lib/wx/src/gen/wxXmlResource.erl b/lib/wx/src/gen/wxXmlResource.erl
index aa0cffb5a8..30290b4f9a 100644
--- a/lib/wx/src/gen/wxXmlResource.erl
+++ b/lib/wx/src/gen/wxXmlResource.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html">wxXmlResource</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html">wxXmlResource</a>.
 %% @type wxXmlResource().  An object reference, The representation is internal
 %% and can be changed without notice. It can't be used for comparsion
 %% stored on disc or distributed for use on other nodes.
@@ -45,7 +45,7 @@ parent_class(_Class) -> erlang:error({badtype, ?MODULE}).
 new() ->
   new([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>.
 -spec new([Option]) -> wxXmlResource() when
 	Option :: {flags, integer()}
 		 | {domain, unicode:chardata()}.
@@ -58,7 +58,7 @@ new(Options)
   wxe_util:construct(?wxXmlResource_new_1,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourcewxxmlresource">external documentation</a>.
 -spec new(Filemask, [Option]) -> wxXmlResource() when
 	Filemask::unicode:chardata(),
 	Option :: {flags, integer()}
@@ -81,7 +81,7 @@ attachUnknownControl(This,Name,Control)
  when is_record(This, wx_ref),is_list(Name),is_record(Control, wx_ref) ->
   attachUnknownControl(This,Name,Control, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceattachunknowncontrol">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceattachunknowncontrol">external documentation</a>.
 -spec attachUnknownControl(This, Name, Control, [Option]) -> boolean() when
 	This::wxXmlResource(), Name::unicode:chardata(), Control::wxWindow:wxWindow(),
 	Option :: {parent, wxWindow:wxWindow()}.
@@ -96,7 +96,7 @@ attachUnknownControl(#wx_ref{type=ThisT,ref=ThisRef},Name,#wx_ref{type=ControlT,
   wxe_util:call(?wxXmlResource_AttachUnknownControl,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8,ControlRef:32/?UI, 0:32,BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceclearhandlers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceclearhandlers">external documentation</a>.
 -spec clearHandlers(This) -> ok when
 	This::wxXmlResource().
 clearHandlers(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -104,7 +104,7 @@ clearHandlers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxXmlResource_ClearHandlers,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcecompareversion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourcecompareversion">external documentation</a>.
 -spec compareVersion(This, Major, Minor, Release, Revision) -> integer() when
 	This::wxXmlResource(), Major::integer(), Minor::integer(), Release::integer(), Revision::integer().
 compareVersion(#wx_ref{type=ThisT,ref=ThisRef},Major,Minor,Release,Revision)
@@ -113,13 +113,13 @@ compareVersion(#wx_ref{type=ThisT,ref=ThisRef},Major,Minor,Release,Revision)
   wxe_util:call(?wxXmlResource_CompareVersion,
   <<ThisRef:32/?UI,Major:32/?UI,Minor:32/?UI,Release:32/?UI,Revision:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceget">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceget">external documentation</a>.
 -spec get() -> wxXmlResource().
 get() ->
   wxe_util:call(?wxXmlResource_Get,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcegetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourcegetflags">external documentation</a>.
 -spec getFlags(This) -> integer() when
 	This::wxXmlResource().
 getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -127,7 +127,7 @@ getFlags(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:call(?wxXmlResource_GetFlags,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcegetversion">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourcegetversion">external documentation</a>.
 -spec getVersion(This) -> integer() when
 	This::wxXmlResource().
 getVersion(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -143,7 +143,7 @@ getXRCID(Str_id)
  when is_list(Str_id) ->
   getXRCID(Str_id, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcegetxrcid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourcegetxrcid">external documentation</a>.
 -spec getXRCID(Str_id, [Option]) -> integer() when
 	Str_id::[unicode:chardata()],
 	Option :: {value_if_not_found, integer()}.
@@ -156,7 +156,7 @@ getXRCID(Str_id, Options)
   wxe_util:call(?wxXmlResource_GetXRCID,
   <<(byte_size(Str_id_UC)):32/?UI,(Str_id_UC)/binary, 0:(((8- ((4+byte_size(Str_id_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceinitallhandlers">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceinitallhandlers">external documentation</a>.
 -spec initAllHandlers(This) -> ok when
 	This::wxXmlResource().
 initAllHandlers(#wx_ref{type=ThisT,ref=ThisRef}) ->
@@ -164,7 +164,7 @@ initAllHandlers(#wx_ref{type=ThisT,ref=ThisRef}) ->
   wxe_util:cast(?wxXmlResource_InitAllHandlers,
   <<ThisRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceload">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceload">external documentation</a>.
 -spec load(This, Filemask) -> boolean() when
 	This::wxXmlResource(), Filemask::unicode:chardata().
 load(#wx_ref{type=ThisT,ref=ThisRef},Filemask)
@@ -174,7 +174,7 @@ load(#wx_ref{type=ThisT,ref=ThisRef},Filemask)
   wxe_util:call(?wxXmlResource_Load,
   <<ThisRef:32/?UI,(byte_size(Filemask_UC)):32/?UI,(Filemask_UC)/binary, 0:(((8- ((0+byte_size(Filemask_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadbitmap">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadbitmap">external documentation</a>.
 -spec loadBitmap(This, Name) -> wxBitmap:wxBitmap() when
 	This::wxXmlResource(), Name::unicode:chardata().
 loadBitmap(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -184,7 +184,7 @@ loadBitmap(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadBitmap,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>.
 -spec loadDialog(This, Parent, Name) -> wxDialog:wxDialog() when
 	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -195,7 +195,7 @@ loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},N
   wxe_util:call(?wxXmlResource_LoadDialog_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloaddialog">external documentation</a>.
 -spec loadDialog(This, Dlg, Parent, Name) -> boolean() when
 	This::wxXmlResource(), Dlg::wxDialog:wxDialog(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DlgT,ref=DlgRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -207,7 +207,7 @@ loadDialog(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=DlgT,ref=DlgRef},#wx_ref
   wxe_util:call(?wxXmlResource_LoadDialog_3,
   <<ThisRef:32/?UI,DlgRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>.
 -spec loadFrame(This, Parent, Name) -> wxFrame:wxFrame() when
 	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -218,7 +218,7 @@ loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Na
   wxe_util:call(?wxXmlResource_LoadFrame_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadframe">external documentation</a>.
 -spec loadFrame(This, Frame, Parent, Name) -> boolean() when
 	This::wxXmlResource(), Frame::wxFrame:wxFrame(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -230,7 +230,7 @@ loadFrame(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=FrameT,ref=FrameRef},#wx_
   wxe_util:call(?wxXmlResource_LoadFrame_3,
   <<ThisRef:32/?UI,FrameRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadicon">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadicon">external documentation</a>.
 -spec loadIcon(This, Name) -> wxIcon:wxIcon() when
 	This::wxXmlResource(), Name::unicode:chardata().
 loadIcon(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -240,7 +240,7 @@ loadIcon(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadIcon,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenu">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadmenu">external documentation</a>.
 -spec loadMenu(This, Name) -> wxMenu:wxMenu() when
 	This::wxXmlResource(), Name::unicode:chardata().
 loadMenu(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -250,7 +250,7 @@ loadMenu(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadMenu,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>.
 -spec loadMenuBar(This, Name) -> wxMenuBar:wxMenuBar() when
 	This::wxXmlResource(), Name::unicode:chardata().
 loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},Name)
@@ -260,7 +260,7 @@ loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},Name)
   wxe_util:call(?wxXmlResource_LoadMenuBar_1,
   <<ThisRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadmenubar">external documentation</a>.
 -spec loadMenuBar(This, Parent, Name) -> wxMenuBar:wxMenuBar() when
 	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -271,7 +271,7 @@ loadMenuBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},
   wxe_util:call(?wxXmlResource_LoadMenuBar_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>.
 -spec loadPanel(This, Parent, Name) -> wxPanel:wxPanel() when
 	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -282,7 +282,7 @@ loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Na
   wxe_util:call(?wxXmlResource_LoadPanel_2,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadpanel">external documentation</a>.
 -spec loadPanel(This, Panel, Parent, Name) -> boolean() when
 	This::wxXmlResource(), Panel::wxPanel:wxPanel(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PanelT,ref=PanelRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -294,7 +294,7 @@ loadPanel(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=PanelT,ref=PanelRef},#wx_
   wxe_util:call(?wxXmlResource_LoadPanel_3,
   <<ThisRef:32/?UI,PanelRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((0+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceloadtoolbar">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceloadtoolbar">external documentation</a>.
 -spec loadToolBar(This, Parent, Name) -> wxToolBar:wxToolBar() when
 	This::wxXmlResource(), Parent::wxWindow:wxWindow(), Name::unicode:chardata().
 loadToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},Name)
@@ -305,7 +305,7 @@ loadToolBar(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=ParentT,ref=ParentRef},
   wxe_util:call(?wxXmlResource_LoadToolBar,
   <<ThisRef:32/?UI,ParentRef:32/?UI,(byte_size(Name_UC)):32/?UI,(Name_UC)/binary, 0:(((8- ((4+byte_size(Name_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceset">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceset">external documentation</a>.
 -spec set(Res) -> wxXmlResource() when
 	Res::wxXmlResource().
 set(#wx_ref{type=ResT,ref=ResRef}) ->
@@ -313,7 +313,7 @@ set(#wx_ref{type=ResT,ref=ResRef}) ->
   wxe_util:call(?wxXmlResource_Set,
   <<ResRef:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourcesetflags">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourcesetflags">external documentation</a>.
 -spec setFlags(This, Flags) -> ok when
 	This::wxXmlResource(), Flags::integer().
 setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
@@ -322,7 +322,7 @@ setFlags(#wx_ref{type=ThisT,ref=ThisRef},Flags)
   wxe_util:cast(?wxXmlResource_SetFlags,
   <<ThisRef:32/?UI,Flags:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxxmlresource.html#wxxmlresourceunload">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_wxxmlresource.html#wxxmlresourceunload">external documentation</a>.
 -spec unload(This, Filename) -> boolean() when
 	This::wxXmlResource(), Filename::unicode:chardata().
 unload(#wx_ref{type=ThisT,ref=ThisRef},Filename)
diff --git a/lib/wx/src/gen/wx_misc.erl b/lib/wx/src/gen/wx_misc.erl
index a2a39bdae7..96912ce651 100644
--- a/lib/wx/src/gen/wx_misc.erl
+++ b/lib/wx/src/gen/wx_misc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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,7 +17,7 @@
 %% %CopyrightEnd%
 %% This file is generated DO NOT EDIT
 
-%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html">Misc</a>.
+%% @doc See external documentation: <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html">Misc</a>.
 
 %% This module contains wxWidgets utility functions.
 
@@ -30,7 +30,7 @@
   launchDefaultBrowser/2,newId/0,registerId/1,setDetectableAutoRepeat/1,
   shell/0,shell/1,shutdown/1]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetkeystate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgetkeystate">external documentation</a>.
 %%<br /> Key = ?WXK_BACK | ?WXK_TAB | ?WXK_RETURN | ?WXK_ESCAPE | ?WXK_SPACE | ?WXK_DELETE | ?WXK_START | ?WXK_LBUTTON | ?WXK_RBUTTON | ?WXK_CANCEL | ?WXK_MBUTTON | ?WXK_CLEAR | ?WXK_SHIFT | ?WXK_ALT | ?WXK_CONTROL | ?WXK_MENU | ?WXK_PAUSE | ?WXK_CAPITAL | ?WXK_END | ?WXK_HOME | ?WXK_LEFT | ?WXK_UP | ?WXK_RIGHT | ?WXK_DOWN | ?WXK_SELECT | ?WXK_PRINT | ?WXK_EXECUTE | ?WXK_SNAPSHOT | ?WXK_INSERT | ?WXK_HELP | ?WXK_NUMPAD0 | ?WXK_NUMPAD1 | ?WXK_NUMPAD2 | ?WXK_NUMPAD3 | ?WXK_NUMPAD4 | ?WXK_NUMPAD5 | ?WXK_NUMPAD6 | ?WXK_NUMPAD7 | ?WXK_NUMPAD8 | ?WXK_NUMPAD9 | ?WXK_MULTIPLY | ?WXK_ADD | ?WXK_SEPARATOR | ?WXK_SUBTRACT | ?WXK_DECIMAL | ?WXK_DIVIDE | ?WXK_F1 | ?WXK_F2 | ?WXK_F3 | ?WXK_F4 | ?WXK_F5 | ?WXK_F6 | ?WXK_F7 | ?WXK_F8 | ?WXK_F9 | ?WXK_F10 | ?WXK_F11 | ?WXK_F12 | ?WXK_F13 | ?WXK_F14 | ?WXK_F15 | ?WXK_F16 | ?WXK_F17 | ?WXK_F18 | ?WXK_F19 | ?WXK_F20 | ?WXK_F21 | ?WXK_F22 | ?WXK_F23 | ?WXK_F24 | ?WXK_NUMLOCK | ?WXK_SCROLL | ?WXK_PAGEUP | ?WXK_PAGEDOWN | ?WXK_NUMPAD_SPACE | ?WXK_NUMPAD_TAB | ?WXK_NUMPAD_ENTER | ?WXK_NUMPAD_F1 | ?WXK_NUMPAD_F2 | ?WXK_NUMPAD_F3 | ?WXK_NUMPAD_F4 | ?WXK_NUMPAD_HOME | ?WXK_NUMPAD_LEFT | ?WXK_NUMPAD_UP | ?WXK_NUMPAD_RIGHT | ?WXK_NUMPAD_DOWN | ?WXK_NUMPAD_PAGEUP | ?WXK_NUMPAD_PAGEDOWN | ?WXK_NUMPAD_END | ?WXK_NUMPAD_BEGIN | ?WXK_NUMPAD_INSERT | ?WXK_NUMPAD_DELETE | ?WXK_NUMPAD_EQUAL | ?WXK_NUMPAD_MULTIPLY | ?WXK_NUMPAD_ADD | ?WXK_NUMPAD_SEPARATOR | ?WXK_NUMPAD_SUBTRACT | ?WXK_NUMPAD_DECIMAL | ?WXK_NUMPAD_DIVIDE | ?WXK_WINDOWS_LEFT | ?WXK_WINDOWS_RIGHT | ?WXK_WINDOWS_MENU | ?WXK_COMMAND | ?WXK_SPECIAL1 | ?WXK_SPECIAL2 | ?WXK_SPECIAL3 | ?WXK_SPECIAL4 | ?WXK_SPECIAL5 | ?WXK_SPECIAL6 | ?WXK_SPECIAL7 | ?WXK_SPECIAL8 | ?WXK_SPECIAL9 | ?WXK_SPECIAL10 | ?WXK_SPECIAL11 | ?WXK_SPECIAL12 | ?WXK_SPECIAL13 | ?WXK_SPECIAL14 | ?WXK_SPECIAL15 | ?WXK_SPECIAL16 | ?WXK_SPECIAL17 | ?WXK_SPECIAL18 | ?WXK_SPECIAL19 | ?WXK_SPECIAL20
 -spec getKeyState(Key) -> boolean() when
 	Key::wx:wx_enum().
@@ -39,19 +39,19 @@ getKeyState(Key)
   wxe_util:call(?utils_wxGetKeyState,
   <<Key:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetmouseposition">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgetmouseposition">external documentation</a>.
 -spec getMousePosition() -> {X::integer(), Y::integer()}.
 getMousePosition() ->
   wxe_util:call(?utils_wxGetMousePosition,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetmousestate">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgetmousestate">external documentation</a>.
 -spec getMouseState() -> wx:wx_wxMouseState().
 getMouseState() ->
   wxe_util:call(?utils_wxGetMouseState,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxsetdetectableautorepeat">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxsetdetectableautorepeat">external documentation</a>.
 -spec setDetectableAutoRepeat(Flag) -> boolean() when
 	Flag::boolean().
 setDetectableAutoRepeat(Flag)
@@ -59,13 +59,13 @@ setDetectableAutoRepeat(Flag)
   wxe_util:call(?utils_wxSetDetectableAutoRepeat,
   <<(wxe_util:from_bool(Flag)):32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxbell">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxbell">external documentation</a>.
 -spec bell() -> ok.
 bell() ->
   wxe_util:cast(?utils_wxBell,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxfindmenuitemid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxfindmenuitemid">external documentation</a>.
 -spec findMenuItemId(Frame, MenuString, ItemString) -> integer() when
 	Frame::wxFrame:wxFrame(), MenuString::unicode:chardata(), ItemString::unicode:chardata().
 findMenuItemId(#wx_ref{type=FrameT,ref=FrameRef},MenuString,ItemString)
@@ -76,7 +76,7 @@ findMenuItemId(#wx_ref{type=FrameT,ref=FrameRef},MenuString,ItemString)
   wxe_util:call(?utils_wxFindMenuItemId,
   <<FrameRef:32/?UI,(byte_size(MenuString_UC)):32/?UI,(MenuString_UC)/binary, 0:(((8- ((0+byte_size(MenuString_UC)) band 16#7)) band 16#7))/unit:8,(byte_size(ItemString_UC)):32/?UI,(ItemString_UC)/binary, 0:(((8- ((4+byte_size(ItemString_UC)) band 16#7)) band 16#7))/unit:8>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgenericfindwindowatpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgenericfindwindowatpoint">external documentation</a>.
 -spec genericFindWindowAtPoint(Pt) -> wxWindow:wxWindow() when
 	Pt::{X::integer(), Y::integer()}.
 genericFindWindowAtPoint({PtX,PtY})
@@ -84,7 +84,7 @@ genericFindWindowAtPoint({PtX,PtY})
   wxe_util:call(?utils_wxGenericFindWindowAtPoint,
   <<PtX:32/?UI,PtY:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxfindwindowatpoint">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxfindwindowatpoint">external documentation</a>.
 -spec findWindowAtPoint(Pt) -> wxWindow:wxWindow() when
 	Pt::{X::integer(), Y::integer()}.
 findWindowAtPoint({PtX,PtY})
@@ -98,7 +98,7 @@ findWindowAtPoint({PtX,PtY})
 beginBusyCursor() ->
   beginBusyCursor([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxbeginbusycursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxbeginbusycursor">external documentation</a>.
 -spec beginBusyCursor([Option]) -> ok when
 	Option :: {cursor, wxCursor:wxCursor()}.
 beginBusyCursor(Options)
@@ -109,19 +109,19 @@ beginBusyCursor(Options)
   wxe_util:cast(?utils_wxBeginBusyCursor,
   <<BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxendbusycursor">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxendbusycursor">external documentation</a>.
 -spec endBusyCursor() -> ok.
 endBusyCursor() ->
   wxe_util:cast(?utils_wxEndBusyCursor,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxisbusy">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxisbusy">external documentation</a>.
 -spec isBusy() -> boolean().
 isBusy() ->
   wxe_util:call(?utils_wxIsBusy,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxshutdown">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxshutdown">external documentation</a>.
 %%<br /> WFlags = ?wxSHUTDOWN_POWEROFF | ?wxSHUTDOWN_REBOOT
 -spec shutdown(WFlags) -> boolean() when
 	WFlags::wx:wx_enum().
@@ -136,7 +136,7 @@ shutdown(WFlags)
 shell() ->
   shell([]).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxshell">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxshell">external documentation</a>.
 -spec shell([Option]) -> boolean() when
 	Option :: {command, unicode:chardata()}.
 shell(Options)
@@ -155,7 +155,7 @@ launchDefaultBrowser(Url)
  when is_list(Url) ->
   launchDefaultBrowser(Url, []).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxlaunchdefaultbrowser">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxlaunchdefaultbrowser">external documentation</a>.
 -spec launchDefaultBrowser(Url, [Option]) -> boolean() when
 	Url::unicode:chardata(),
 	Option :: {flags, integer()}.
@@ -168,31 +168,31 @@ launchDefaultBrowser(Url, Options)
   wxe_util:call(?utils_wxLaunchDefaultBrowser,
   <<(byte_size(Url_UC)):32/?UI,(Url_UC)/binary, 0:(((8- ((4+byte_size(Url_UC)) band 16#7)) band 16#7))/unit:8, BinOpt/binary>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetemailaddress">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgetemailaddress">external documentation</a>.
 -spec getEmailAddress() -> unicode:charlist().
 getEmailAddress() ->
   wxe_util:call(?utils_wxGetEmailAddress,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetuserid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgetuserid">external documentation</a>.
 -spec getUserId() -> unicode:charlist().
 getUserId() ->
   wxe_util:call(?utils_wxGetUserId,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgethomedir">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgethomedir">external documentation</a>.
 -spec getHomeDir() -> unicode:charlist().
 getHomeDir() ->
   wxe_util:call(?utils_wxGetHomeDir,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxnewid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxnewid">external documentation</a>.
 -spec newId() -> integer().
 newId() ->
   wxe_util:call(?utils_wxNewId,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxregisterid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxregisterid">external documentation</a>.
 -spec registerId(Id) -> ok when
 	Id::integer().
 registerId(Id)
@@ -200,25 +200,25 @@ registerId(Id)
   wxe_util:cast(?utils_wxRegisterId,
   <<Id:32/?UI>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetcurrentid">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgetcurrentid">external documentation</a>.
 -spec getCurrentId() -> integer().
 getCurrentId() ->
   wxe_util:call(?utils_wxGetCurrentId,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxgetosdescription">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxgetosdescription">external documentation</a>.
 -spec getOsDescription() -> unicode:charlist().
 getOsDescription() ->
   wxe_util:call(?utils_wxGetOsDescription,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxisplatformlittleendian">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxisplatformlittleendian">external documentation</a>.
 -spec isPlatformLittleEndian() -> boolean().
 isPlatformLittleEndian() ->
   wxe_util:call(?utils_wxIsPlatformLittleEndian,
   <<>>).
 
-%% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_miscellany.html#wxisplatform64bit">external documentation</a>.
+%% @doc See <a href="http://www.wxwidgets.org/manuals/2.8.12/wx_miscellany.html#wxisplatform64bit">external documentation</a>.
 -spec isPlatform64Bit() -> boolean().
 isPlatform64Bit() ->
   wxe_util:call(?utils_wxIsPlatform64Bit,
diff --git a/lib/wx/src/gen/wxe_debug.hrl b/lib/wx/src/gen/wxe_debug.hrl
index 29cb2b05e6..1f4f22f704 100644
--- a/lib/wx/src/gen/wxe_debug.hrl
+++ b/lib/wx/src/gen/wxe_debug.hrl
@@ -241,1263 +241,1264 @@ wxdebug_table() ->
  {334, {wxPanel, new_2, 2}},
  {335, {wxPanel, destruct, 0}},
  {336, {wxPanel, initDialog, 0}},
- {337, {wxScrolledWindow, new_0, 0}},
- {338, {wxScrolledWindow, new_2, 2}},
- {339, {wxScrolledWindow, destruct, 0}},
- {340, {wxScrolledWindow, calcScrolledPosition_4, 4}},
- {341, {wxScrolledWindow, calcScrolledPosition_1, 1}},
- {342, {wxScrolledWindow, calcUnscrolledPosition_4, 4}},
- {343, {wxScrolledWindow, calcUnscrolledPosition_1, 1}},
- {344, {wxScrolledWindow, enableScrolling, 2}},
- {345, {wxScrolledWindow, getScrollPixelsPerUnit, 2}},
- {346, {wxScrolledWindow, getViewStart, 2}},
- {347, {wxScrolledWindow, doPrepareDC, 1}},
- {348, {wxScrolledWindow, prepareDC, 1}},
- {349, {wxScrolledWindow, scroll, 2}},
- {350, {wxScrolledWindow, setScrollbars, 5}},
- {351, {wxScrolledWindow, setScrollRate, 2}},
- {352, {wxScrolledWindow, setTargetWindow, 1}},
- {353, {wxSashWindow, new_0, 0}},
- {354, {wxSashWindow, new_2, 2}},
- {355, {wxSashWindow, destruct, 0}},
- {356, {wxSashWindow, getSashVisible, 1}},
- {357, {wxSashWindow, getMaximumSizeX, 0}},
- {358, {wxSashWindow, getMaximumSizeY, 0}},
- {359, {wxSashWindow, getMinimumSizeX, 0}},
- {360, {wxSashWindow, getMinimumSizeY, 0}},
- {361, {wxSashWindow, setMaximumSizeX, 1}},
- {362, {wxSashWindow, setMaximumSizeY, 1}},
- {363, {wxSashWindow, setMinimumSizeX, 1}},
- {364, {wxSashWindow, setMinimumSizeY, 1}},
- {365, {wxSashWindow, setSashVisible, 2}},
- {366, {wxSashLayoutWindow, new_0, 0}},
- {367, {wxSashLayoutWindow, new_2, 2}},
- {368, {wxSashLayoutWindow, create, 2}},
- {369, {wxSashLayoutWindow, getAlignment, 0}},
- {370, {wxSashLayoutWindow, getOrientation, 0}},
- {371, {wxSashLayoutWindow, setAlignment, 1}},
- {372, {wxSashLayoutWindow, setDefaultSize, 1}},
- {373, {wxSashLayoutWindow, setOrientation, 1}},
- {374, {wxSashLayoutWindow, 'Destroy', undefined}},
- {375, {wxGrid, new_0, 0}},
- {376, {wxGrid, new_3, 3}},
- {377, {wxGrid, new_4, 4}},
- {378, {wxGrid, destruct, 0}},
- {379, {wxGrid, appendCols, 1}},
- {380, {wxGrid, appendRows, 1}},
- {381, {wxGrid, autoSize, 0}},
- {382, {wxGrid, autoSizeColumn, 2}},
- {383, {wxGrid, autoSizeColumns, 1}},
- {384, {wxGrid, autoSizeRow, 2}},
- {385, {wxGrid, autoSizeRows, 1}},
- {386, {wxGrid, beginBatch, 0}},
- {387, {wxGrid, blockToDeviceRect, 2}},
- {388, {wxGrid, canDragColSize, 0}},
- {389, {wxGrid, canDragRowSize, 0}},
- {390, {wxGrid, canDragGridSize, 0}},
- {391, {wxGrid, canEnableCellControl, 0}},
- {392, {wxGrid, cellToRect_2, 2}},
- {393, {wxGrid, cellToRect_1, 1}},
- {394, {wxGrid, clearGrid, 0}},
- {395, {wxGrid, clearSelection, 0}},
- {396, {wxGrid, createGrid, 3}},
- {397, {wxGrid, deleteCols, 1}},
- {398, {wxGrid, deleteRows, 1}},
- {399, {wxGrid, disableCellEditControl, 0}},
- {400, {wxGrid, disableDragColSize, 0}},
- {401, {wxGrid, disableDragGridSize, 0}},
- {402, {wxGrid, disableDragRowSize, 0}},
- {403, {wxGrid, enableCellEditControl, 1}},
- {404, {wxGrid, enableDragColSize, 1}},
- {405, {wxGrid, enableDragGridSize, 1}},
- {406, {wxGrid, enableDragRowSize, 1}},
- {407, {wxGrid, enableEditing, 1}},
- {408, {wxGrid, enableGridLines, 1}},
- {409, {wxGrid, endBatch, 0}},
- {410, {wxGrid, fit, 0}},
- {411, {wxGrid, forceRefresh, 0}},
- {412, {wxGrid, getBatchCount, 0}},
- {413, {wxGrid, getCellAlignment, 4}},
- {414, {wxGrid, getCellBackgroundColour, 2}},
- {415, {wxGrid, getCellEditor, 2}},
- {416, {wxGrid, getCellFont, 2}},
- {417, {wxGrid, getCellRenderer, 2}},
- {418, {wxGrid, getCellTextColour, 2}},
- {419, {wxGrid, getCellValue_2, 2}},
- {420, {wxGrid, getCellValue_1, 1}},
- {421, {wxGrid, getColLabelAlignment, 2}},
- {422, {wxGrid, getColLabelSize, 0}},
- {423, {wxGrid, getColLabelValue, 1}},
- {424, {wxGrid, getColMinimalAcceptableWidth, 0}},
- {425, {wxGrid, getDefaultCellAlignment, 2}},
- {426, {wxGrid, getDefaultCellBackgroundColour, 0}},
- {427, {wxGrid, getDefaultCellFont, 0}},
- {428, {wxGrid, getDefaultCellTextColour, 0}},
- {429, {wxGrid, getDefaultColLabelSize, 0}},
- {430, {wxGrid, getDefaultColSize, 0}},
- {431, {wxGrid, getDefaultEditor, 0}},
- {432, {wxGrid, getDefaultEditorForCell_2, 2}},
- {433, {wxGrid, getDefaultEditorForCell_1, 1}},
- {434, {wxGrid, getDefaultEditorForType, 1}},
- {435, {wxGrid, getDefaultRenderer, 0}},
- {436, {wxGrid, getDefaultRendererForCell, 2}},
- {437, {wxGrid, getDefaultRendererForType, 1}},
- {438, {wxGrid, getDefaultRowLabelSize, 0}},
- {439, {wxGrid, getDefaultRowSize, 0}},
- {440, {wxGrid, getGridCursorCol, 0}},
- {441, {wxGrid, getGridCursorRow, 0}},
- {442, {wxGrid, getGridLineColour, 0}},
- {443, {wxGrid, gridLinesEnabled, 0}},
- {444, {wxGrid, getLabelBackgroundColour, 0}},
- {445, {wxGrid, getLabelFont, 0}},
- {446, {wxGrid, getLabelTextColour, 0}},
- {447, {wxGrid, getNumberCols, 0}},
- {448, {wxGrid, getNumberRows, 0}},
- {449, {wxGrid, getOrCreateCellAttr, 2}},
- {450, {wxGrid, getRowMinimalAcceptableHeight, 0}},
- {451, {wxGrid, getRowLabelAlignment, 2}},
- {452, {wxGrid, getRowLabelSize, 0}},
- {453, {wxGrid, getRowLabelValue, 1}},
- {454, {wxGrid, getRowSize, 1}},
- {455, {wxGrid, getScrollLineX, 0}},
- {456, {wxGrid, getScrollLineY, 0}},
- {457, {wxGrid, getSelectedCells, 0}},
- {458, {wxGrid, getSelectedCols, 0}},
- {459, {wxGrid, getSelectedRows, 0}},
- {460, {wxGrid, getSelectionBackground, 0}},
- {461, {wxGrid, getSelectionBlockTopLeft, 0}},
- {462, {wxGrid, getSelectionBlockBottomRight, 0}},
- {463, {wxGrid, getSelectionForeground, 0}},
- {464, {wxGrid, getViewWidth, 0}},
- {465, {wxGrid, getGridWindow, 0}},
- {466, {wxGrid, getGridRowLabelWindow, 0}},
- {467, {wxGrid, getGridColLabelWindow, 0}},
- {468, {wxGrid, getGridCornerLabelWindow, 0}},
- {469, {wxGrid, hideCellEditControl, 0}},
- {470, {wxGrid, insertCols, 1}},
- {471, {wxGrid, insertRows, 1}},
- {472, {wxGrid, isCellEditControlEnabled, 0}},
- {473, {wxGrid, isCurrentCellReadOnly, 0}},
- {474, {wxGrid, isEditable, 0}},
- {475, {wxGrid, isInSelection_2, 2}},
- {476, {wxGrid, isInSelection_1, 1}},
- {477, {wxGrid, isReadOnly, 2}},
- {478, {wxGrid, isSelection, 0}},
- {479, {wxGrid, isVisible_3, 3}},
- {480, {wxGrid, isVisible_2, 2}},
- {481, {wxGrid, makeCellVisible_2, 2}},
- {482, {wxGrid, makeCellVisible_1, 1}},
- {483, {wxGrid, moveCursorDown, 1}},
- {484, {wxGrid, moveCursorLeft, 1}},
- {485, {wxGrid, moveCursorRight, 1}},
- {486, {wxGrid, moveCursorUp, 1}},
- {487, {wxGrid, moveCursorDownBlock, 1}},
- {488, {wxGrid, moveCursorLeftBlock, 1}},
- {489, {wxGrid, moveCursorRightBlock, 1}},
- {490, {wxGrid, moveCursorUpBlock, 1}},
- {491, {wxGrid, movePageDown, 0}},
- {492, {wxGrid, movePageUp, 0}},
- {493, {wxGrid, registerDataType, 3}},
- {494, {wxGrid, saveEditControlValue, 0}},
- {495, {wxGrid, selectAll, 0}},
- {496, {wxGrid, selectBlock_5, 5}},
- {497, {wxGrid, selectBlock_3, 3}},
- {498, {wxGrid, selectCol, 2}},
- {499, {wxGrid, selectRow, 2}},
- {500, {wxGrid, setCellAlignment_4, 4}},
- {501, {wxGrid, setCellAlignment_3, 3}},
- {502, {wxGrid, setCellAlignment_1, 1}},
- {503, {wxGrid, setCellBackgroundColour_3_0, 3}},
- {504, {wxGrid, setCellBackgroundColour_1, 1}},
- {505, {wxGrid, setCellBackgroundColour_3_1, 3}},
- {506, {wxGrid, setCellEditor, 3}},
- {507, {wxGrid, setCellFont, 3}},
- {508, {wxGrid, setCellRenderer, 3}},
- {509, {wxGrid, setCellTextColour_3_0, 3}},
- {510, {wxGrid, setCellTextColour_3_1, 3}},
- {511, {wxGrid, setCellTextColour_1, 1}},
- {512, {wxGrid, setCellValue_3_0, 3}},
- {513, {wxGrid, setCellValue_2, 2}},
- {514, {wxGrid, setCellValue_3_1, 3}},
- {515, {wxGrid, setColAttr, 2}},
- {516, {wxGrid, setColFormatBool, 1}},
- {517, {wxGrid, setColFormatNumber, 1}},
- {518, {wxGrid, setColFormatFloat, 2}},
- {519, {wxGrid, setColFormatCustom, 2}},
- {520, {wxGrid, setColLabelAlignment, 2}},
- {521, {wxGrid, setColLabelSize, 1}},
- {522, {wxGrid, setColLabelValue, 2}},
- {523, {wxGrid, setColMinimalWidth, 2}},
- {524, {wxGrid, setColMinimalAcceptableWidth, 1}},
- {525, {wxGrid, setColSize, 2}},
- {526, {wxGrid, setDefaultCellAlignment, 2}},
- {527, {wxGrid, setDefaultCellBackgroundColour, 1}},
- {528, {wxGrid, setDefaultCellFont, 1}},
- {529, {wxGrid, setDefaultCellTextColour, 1}},
- {530, {wxGrid, setDefaultEditor, 1}},
- {531, {wxGrid, setDefaultRenderer, 1}},
- {532, {wxGrid, setDefaultColSize, 2}},
- {533, {wxGrid, setDefaultRowSize, 2}},
- {534, {wxGrid, setGridCursor, 2}},
- {535, {wxGrid, setGridLineColour, 1}},
- {536, {wxGrid, setLabelBackgroundColour, 1}},
- {537, {wxGrid, setLabelFont, 1}},
- {538, {wxGrid, setLabelTextColour, 1}},
- {539, {wxGrid, setMargins, 2}},
- {540, {wxGrid, setReadOnly, 3}},
- {541, {wxGrid, setRowAttr, 2}},
- {542, {wxGrid, setRowLabelAlignment, 2}},
- {543, {wxGrid, setRowLabelSize, 1}},
- {544, {wxGrid, setRowLabelValue, 2}},
- {545, {wxGrid, setRowMinimalHeight, 2}},
- {546, {wxGrid, setRowMinimalAcceptableHeight, 1}},
- {547, {wxGrid, setRowSize, 2}},
- {548, {wxGrid, setScrollLineX, 1}},
- {549, {wxGrid, setScrollLineY, 1}},
- {550, {wxGrid, setSelectionBackground, 1}},
- {551, {wxGrid, setSelectionForeground, 1}},
- {552, {wxGrid, setSelectionMode, 1}},
- {553, {wxGrid, showCellEditControl, 0}},
- {554, {wxGrid, xToCol, 2}},
- {555, {wxGrid, xToEdgeOfCol, 1}},
- {556, {wxGrid, yToEdgeOfRow, 1}},
- {557, {wxGrid, yToRow, 1}},
- {558, {wxGridCellRenderer, draw, 7}},
- {559, {wxGridCellRenderer, getBestSize, 5}},
- {560, {wxGridCellEditor, create, 3}},
- {561, {wxGridCellEditor, isCreated, 0}},
- {562, {wxGridCellEditor, setSize, 1}},
- {563, {wxGridCellEditor, show, 2}},
- {564, {wxGridCellEditor, paintBackground, 2}},
- {565, {wxGridCellEditor, beginEdit, 3}},
- {566, {wxGridCellEditor, endEdit, 3}},
- {567, {wxGridCellEditor, reset, 0}},
- {568, {wxGridCellEditor, startingKey, 1}},
- {569, {wxGridCellEditor, startingClick, 0}},
- {570, {wxGridCellEditor, handleReturn, 1}},
- {571, {wxGridCellBoolRenderer, new, 0}},
- {572, {wxGridCellBoolRenderer, 'Destroy', undefined}},
- {573, {wxGridCellBoolEditor, new, 0}},
- {574, {wxGridCellBoolEditor, isTrueValue, 1}},
- {575, {wxGridCellBoolEditor, useStringValues, 1}},
- {576, {wxGridCellBoolEditor, 'Destroy', undefined}},
- {577, {wxGridCellFloatRenderer, new, 1}},
- {578, {wxGridCellFloatRenderer, getPrecision, 0}},
- {579, {wxGridCellFloatRenderer, getWidth, 0}},
- {580, {wxGridCellFloatRenderer, setParameters, 1}},
- {581, {wxGridCellFloatRenderer, setPrecision, 1}},
- {582, {wxGridCellFloatRenderer, setWidth, 1}},
- {583, {wxGridCellFloatRenderer, 'Destroy', undefined}},
- {584, {wxGridCellFloatEditor, new, 1}},
- {585, {wxGridCellFloatEditor, setParameters, 1}},
- {586, {wxGridCellFloatEditor, 'Destroy', undefined}},
- {587, {wxGridCellStringRenderer, new, 0}},
- {588, {wxGridCellStringRenderer, 'Destroy', undefined}},
- {589, {wxGridCellTextEditor, new, 0}},
- {590, {wxGridCellTextEditor, setParameters, 1}},
- {591, {wxGridCellTextEditor, 'Destroy', undefined}},
- {593, {wxGridCellChoiceEditor, new, 2}},
- {594, {wxGridCellChoiceEditor, setParameters, 1}},
- {595, {wxGridCellChoiceEditor, 'Destroy', undefined}},
- {596, {wxGridCellNumberRenderer, new, 0}},
- {597, {wxGridCellNumberRenderer, 'Destroy', undefined}},
- {598, {wxGridCellNumberEditor, new, 1}},
- {599, {wxGridCellNumberEditor, getValue, 0}},
- {600, {wxGridCellNumberEditor, setParameters, 1}},
- {601, {wxGridCellNumberEditor, 'Destroy', undefined}},
- {602, {wxGridCellAttr, setTextColour, 1}},
- {603, {wxGridCellAttr, setBackgroundColour, 1}},
- {604, {wxGridCellAttr, setFont, 1}},
- {605, {wxGridCellAttr, setAlignment, 2}},
- {606, {wxGridCellAttr, setReadOnly, 1}},
- {607, {wxGridCellAttr, setRenderer, 1}},
- {608, {wxGridCellAttr, setEditor, 1}},
- {609, {wxGridCellAttr, hasTextColour, 0}},
- {610, {wxGridCellAttr, hasBackgroundColour, 0}},
- {611, {wxGridCellAttr, hasFont, 0}},
- {612, {wxGridCellAttr, hasAlignment, 0}},
- {613, {wxGridCellAttr, hasRenderer, 0}},
- {614, {wxGridCellAttr, hasEditor, 0}},
- {615, {wxGridCellAttr, getTextColour, 0}},
- {616, {wxGridCellAttr, getBackgroundColour, 0}},
- {617, {wxGridCellAttr, getFont, 0}},
- {618, {wxGridCellAttr, getAlignment, 2}},
- {619, {wxGridCellAttr, getRenderer, 3}},
- {620, {wxGridCellAttr, getEditor, 3}},
- {621, {wxGridCellAttr, isReadOnly, 0}},
- {622, {wxGridCellAttr, setDefAttr, 1}},
- {623, {wxDC, blit, 5}},
- {624, {wxDC, calcBoundingBox, 2}},
- {625, {wxDC, clear, 0}},
- {626, {wxDC, computeScaleAndOrigin, 0}},
- {627, {wxDC, crossHair, 1}},
- {628, {wxDC, destroyClippingRegion, 0}},
- {629, {wxDC, deviceToLogicalX, 1}},
- {630, {wxDC, deviceToLogicalXRel, 1}},
- {631, {wxDC, deviceToLogicalY, 1}},
- {632, {wxDC, deviceToLogicalYRel, 1}},
- {633, {wxDC, drawArc, 3}},
- {634, {wxDC, drawBitmap, 3}},
- {635, {wxDC, drawCheckMark, 1}},
- {636, {wxDC, drawCircle, 2}},
- {638, {wxDC, drawEllipse_2, 2}},
- {639, {wxDC, drawEllipse_1, 1}},
- {640, {wxDC, drawEllipticArc, 4}},
- {641, {wxDC, drawIcon, 2}},
- {642, {wxDC, drawLabel, 3}},
- {643, {wxDC, drawLine, 2}},
- {644, {wxDC, drawLines, 3}},
- {646, {wxDC, drawPolygon, 3}},
- {648, {wxDC, drawPoint, 1}},
- {650, {wxDC, drawRectangle_2, 2}},
- {651, {wxDC, drawRectangle_1, 1}},
- {652, {wxDC, drawRotatedText, 3}},
- {654, {wxDC, drawRoundedRectangle_3, 3}},
- {655, {wxDC, drawRoundedRectangle_2, 2}},
- {656, {wxDC, drawText, 2}},
- {657, {wxDC, endDoc, 0}},
- {658, {wxDC, endPage, 0}},
- {659, {wxDC, floodFill, 3}},
- {660, {wxDC, getBackground, 0}},
- {661, {wxDC, getBackgroundMode, 0}},
- {662, {wxDC, getBrush, 0}},
- {663, {wxDC, getCharHeight, 0}},
- {664, {wxDC, getCharWidth, 0}},
- {665, {wxDC, getClippingBox, 4}},
- {667, {wxDC, getFont, 0}},
- {668, {wxDC, getLayoutDirection, 0}},
- {669, {wxDC, getLogicalFunction, 0}},
- {670, {wxDC, getMapMode, 0}},
- {671, {wxDC, getMultiLineTextExtent_4, 4}},
- {672, {wxDC, getMultiLineTextExtent_1, 1}},
- {673, {wxDC, getPartialTextExtents, 2}},
- {674, {wxDC, getPen, 0}},
- {675, {wxDC, getPixel, 2}},
- {676, {wxDC, getPPI, 0}},
- {678, {wxDC, getSize, 0}},
- {680, {wxDC, getSizeMM, 0}},
- {681, {wxDC, getTextBackground, 0}},
- {682, {wxDC, getTextExtent_4, 4}},
- {683, {wxDC, getTextExtent_1, 1}},
- {685, {wxDC, getTextForeground, 0}},
- {686, {wxDC, getUserScale, 2}},
- {687, {wxDC, gradientFillConcentric_3, 3}},
- {688, {wxDC, gradientFillConcentric_4, 4}},
- {689, {wxDC, gradientFillLinear, 4}},
- {690, {wxDC, logicalToDeviceX, 1}},
- {691, {wxDC, logicalToDeviceXRel, 1}},
- {692, {wxDC, logicalToDeviceY, 1}},
- {693, {wxDC, logicalToDeviceYRel, 1}},
- {694, {wxDC, maxX, 0}},
- {695, {wxDC, maxY, 0}},
- {696, {wxDC, minX, 0}},
- {697, {wxDC, minY, 0}},
- {698, {wxDC, isOk, 0}},
- {699, {wxDC, resetBoundingBox, 0}},
- {700, {wxDC, setAxisOrientation, 2}},
- {701, {wxDC, setBackground, 1}},
- {702, {wxDC, setBackgroundMode, 1}},
- {703, {wxDC, setBrush, 1}},
- {705, {wxDC, setClippingRegion_2, 2}},
- {706, {wxDC, setClippingRegion_1_1, 1}},
- {707, {wxDC, setClippingRegion_1_0, 1}},
- {708, {wxDC, setDeviceOrigin, 2}},
- {709, {wxDC, setFont, 1}},
- {710, {wxDC, setLayoutDirection, 1}},
- {711, {wxDC, setLogicalFunction, 1}},
- {712, {wxDC, setMapMode, 1}},
- {713, {wxDC, setPalette, 1}},
- {714, {wxDC, setPen, 1}},
- {715, {wxDC, setTextBackground, 1}},
- {716, {wxDC, setTextForeground, 1}},
- {717, {wxDC, setUserScale, 2}},
- {718, {wxDC, startDoc, 1}},
- {719, {wxDC, startPage, 0}},
- {720, {wxMirrorDC, new, 2}},
- {721, {wxMirrorDC, 'Destroy', undefined}},
- {722, {wxScreenDC, new, 0}},
- {723, {wxScreenDC, destruct, 0}},
- {724, {wxPostScriptDC, new_0, 0}},
- {725, {wxPostScriptDC, new_1, 1}},
- {726, {wxPostScriptDC, destruct, 0}},
- {727, {wxPostScriptDC, setResolution, 1}},
- {728, {wxPostScriptDC, getResolution, 0}},
- {729, {wxWindowDC, new_0, 0}},
- {730, {wxWindowDC, new_1, 1}},
- {731, {wxWindowDC, destruct, 0}},
- {732, {wxClientDC, new_0, 0}},
- {733, {wxClientDC, new_1, 1}},
- {734, {wxClientDC, 'Destroy', undefined}},
- {735, {wxPaintDC, new_0, 0}},
- {736, {wxPaintDC, new_1, 1}},
- {737, {wxPaintDC, 'Destroy', undefined}},
- {739, {wxMemoryDC, new_1_0, 1}},
- {740, {wxMemoryDC, new_1_1, 1}},
- {741, {wxMemoryDC, new_0, 0}},
- {743, {wxMemoryDC, destruct, 0}},
- {744, {wxMemoryDC, selectObject, 1}},
- {745, {wxMemoryDC, selectObjectAsSource, 1}},
- {746, {wxBufferedDC, new_0, 0}},
- {747, {wxBufferedDC, new_2, 2}},
- {748, {wxBufferedDC, new_3, 3}},
- {749, {wxBufferedDC, destruct, 0}},
- {750, {wxBufferedDC, init_2, 2}},
- {751, {wxBufferedDC, init_3, 3}},
- {752, {wxBufferedPaintDC, new_3, 3}},
- {753, {wxBufferedPaintDC, new_2, 2}},
- {754, {wxBufferedPaintDC, destruct, 0}},
- {755, {wxGraphicsObject, destruct, 0}},
- {756, {wxGraphicsObject, getRenderer, 0}},
- {757, {wxGraphicsObject, isNull, 0}},
- {758, {wxGraphicsContext, destruct, 0}},
- {759, {wxGraphicsContext, create_1_1, 1}},
- {760, {wxGraphicsContext, create_1_0, 1}},
- {761, {wxGraphicsContext, create_0, 0}},
- {762, {wxGraphicsContext, createPen, 1}},
- {763, {wxGraphicsContext, createBrush, 1}},
- {764, {wxGraphicsContext, createRadialGradientBrush, 7}},
- {765, {wxGraphicsContext, createLinearGradientBrush, 6}},
- {766, {wxGraphicsContext, createFont, 2}},
- {767, {wxGraphicsContext, createMatrix, 1}},
- {768, {wxGraphicsContext, createPath, 0}},
- {769, {wxGraphicsContext, clip_1, 1}},
- {770, {wxGraphicsContext, clip_4, 4}},
- {771, {wxGraphicsContext, resetClip, 0}},
- {772, {wxGraphicsContext, drawBitmap, 5}},
- {773, {wxGraphicsContext, drawEllipse, 4}},
- {774, {wxGraphicsContext, drawIcon, 5}},
- {775, {wxGraphicsContext, drawLines, 3}},
- {776, {wxGraphicsContext, drawPath, 2}},
- {777, {wxGraphicsContext, drawRectangle, 4}},
- {778, {wxGraphicsContext, drawRoundedRectangle, 5}},
- {779, {wxGraphicsContext, drawText_3, 3}},
- {780, {wxGraphicsContext, drawText_4_0, 4}},
- {781, {wxGraphicsContext, drawText_4_1, 4}},
- {782, {wxGraphicsContext, drawText_5, 5}},
- {783, {wxGraphicsContext, fillPath, 2}},
- {784, {wxGraphicsContext, strokePath, 1}},
- {785, {wxGraphicsContext, getPartialTextExtents, 2}},
- {786, {wxGraphicsContext, getTextExtent, 5}},
- {787, {wxGraphicsContext, rotate, 1}},
- {788, {wxGraphicsContext, scale, 2}},
- {789, {wxGraphicsContext, translate, 2}},
- {790, {wxGraphicsContext, getTransform, 0}},
- {791, {wxGraphicsContext, setTransform, 1}},
- {792, {wxGraphicsContext, concatTransform, 1}},
- {793, {wxGraphicsContext, setBrush_1_1, 1}},
- {794, {wxGraphicsContext, setBrush_1_0, 1}},
- {795, {wxGraphicsContext, setFont_1, 1}},
- {796, {wxGraphicsContext, setFont_2, 2}},
- {797, {wxGraphicsContext, setPen_1_0, 1}},
- {798, {wxGraphicsContext, setPen_1_1, 1}},
- {799, {wxGraphicsContext, strokeLine, 4}},
- {800, {wxGraphicsContext, strokeLines, 2}},
- {802, {wxGraphicsMatrix, concat, 1}},
- {804, {wxGraphicsMatrix, get, 1}},
- {805, {wxGraphicsMatrix, invert, 0}},
- {806, {wxGraphicsMatrix, isEqual, 1}},
- {808, {wxGraphicsMatrix, isIdentity, 0}},
- {809, {wxGraphicsMatrix, rotate, 1}},
- {810, {wxGraphicsMatrix, scale, 2}},
- {811, {wxGraphicsMatrix, translate, 2}},
- {812, {wxGraphicsMatrix, set, 1}},
- {813, {wxGraphicsMatrix, transformPoint, 2}},
- {814, {wxGraphicsMatrix, transformDistance, 2}},
- {815, {wxGraphicsPath, moveToPoint_2, 2}},
- {816, {wxGraphicsPath, moveToPoint_1, 1}},
- {817, {wxGraphicsPath, addArc_6, 6}},
- {818, {wxGraphicsPath, addArc_5, 5}},
- {819, {wxGraphicsPath, addArcToPoint, 5}},
- {820, {wxGraphicsPath, addCircle, 3}},
- {821, {wxGraphicsPath, addCurveToPoint_6, 6}},
- {822, {wxGraphicsPath, addCurveToPoint_3, 3}},
- {823, {wxGraphicsPath, addEllipse, 4}},
- {824, {wxGraphicsPath, addLineToPoint_2, 2}},
- {825, {wxGraphicsPath, addLineToPoint_1, 1}},
- {826, {wxGraphicsPath, addPath, 1}},
- {827, {wxGraphicsPath, addQuadCurveToPoint, 4}},
- {828, {wxGraphicsPath, addRectangle, 4}},
- {829, {wxGraphicsPath, addRoundedRectangle, 5}},
- {830, {wxGraphicsPath, closeSubpath, 0}},
- {831, {wxGraphicsPath, contains_3, 3}},
- {832, {wxGraphicsPath, contains_2, 2}},
- {834, {wxGraphicsPath, getBox, 0}},
- {836, {wxGraphicsPath, getCurrentPoint, 0}},
- {837, {wxGraphicsPath, transform, 1}},
- {838, {wxGraphicsRenderer, getDefaultRenderer, 0}},
- {839, {wxGraphicsRenderer, createContext_1_1, 1}},
- {840, {wxGraphicsRenderer, createContext_1_0, 1}},
- {841, {wxGraphicsRenderer, createPen, 1}},
- {842, {wxGraphicsRenderer, createBrush, 1}},
- {843, {wxGraphicsRenderer, createLinearGradientBrush, 6}},
- {844, {wxGraphicsRenderer, createRadialGradientBrush, 7}},
- {845, {wxGraphicsRenderer, createFont, 2}},
- {846, {wxGraphicsRenderer, createMatrix, 1}},
- {847, {wxGraphicsRenderer, createPath, 0}},
- {849, {wxMenuBar, new_1, 1}},
- {851, {wxMenuBar, new_0, 0}},
- {853, {wxMenuBar, destruct, 0}},
- {854, {wxMenuBar, append, 2}},
- {855, {wxMenuBar, check, 2}},
- {856, {wxMenuBar, enable_2, 2}},
- {857, {wxMenuBar, enable_1, 1}},
- {858, {wxMenuBar, enableTop, 2}},
- {859, {wxMenuBar, findMenu, 1}},
- {860, {wxMenuBar, findMenuItem, 2}},
- {861, {wxMenuBar, findItem, 2}},
- {862, {wxMenuBar, getHelpString, 1}},
- {863, {wxMenuBar, getLabel_1, 1}},
- {864, {wxMenuBar, getLabel_0, 0}},
- {865, {wxMenuBar, getLabelTop, 1}},
- {866, {wxMenuBar, getMenu, 1}},
- {867, {wxMenuBar, getMenuCount, 0}},
- {868, {wxMenuBar, insert, 3}},
- {869, {wxMenuBar, isChecked, 1}},
- {870, {wxMenuBar, isEnabled_1, 1}},
- {871, {wxMenuBar, isEnabled_0, 0}},
- {872, {wxMenuBar, remove, 1}},
- {873, {wxMenuBar, replace, 3}},
- {874, {wxMenuBar, setHelpString, 2}},
- {875, {wxMenuBar, setLabel_2, 2}},
- {876, {wxMenuBar, setLabel_1, 1}},
- {877, {wxMenuBar, setLabelTop, 2}},
- {878, {wxControl, getLabel, 0}},
- {879, {wxControl, setLabel, 1}},
- {880, {wxControlWithItems, append_1, 1}},
- {881, {wxControlWithItems, append_2, 2}},
- {882, {wxControlWithItems, appendStrings_1, 1}},
- {883, {wxControlWithItems, clear, 0}},
- {884, {wxControlWithItems, delete, 1}},
- {885, {wxControlWithItems, findString, 2}},
- {886, {wxControlWithItems, getClientData, 1}},
- {887, {wxControlWithItems, setClientData, 2}},
- {888, {wxControlWithItems, getCount, 0}},
- {889, {wxControlWithItems, getSelection, 0}},
- {890, {wxControlWithItems, getString, 1}},
- {891, {wxControlWithItems, getStringSelection, 0}},
- {892, {wxControlWithItems, insert_2, 2}},
- {893, {wxControlWithItems, insert_3, 3}},
- {894, {wxControlWithItems, isEmpty, 0}},
- {895, {wxControlWithItems, select, 1}},
- {896, {wxControlWithItems, setSelection, 1}},
- {897, {wxControlWithItems, setString, 2}},
- {898, {wxControlWithItems, setStringSelection, 1}},
- {901, {wxMenu, new_2, 2}},
- {902, {wxMenu, new_1, 1}},
- {904, {wxMenu, destruct, 0}},
- {905, {wxMenu, append_3, 3}},
- {906, {wxMenu, append_1, 1}},
- {907, {wxMenu, append_4_0, 4}},
- {908, {wxMenu, append_4_1, 4}},
- {909, {wxMenu, appendCheckItem, 3}},
- {910, {wxMenu, appendRadioItem, 3}},
- {911, {wxMenu, appendSeparator, 0}},
- {912, {wxMenu, break, 0}},
- {913, {wxMenu, check, 2}},
- {914, {wxMenu, delete_1_0, 1}},
- {915, {wxMenu, delete_1_1, 1}},
- {916, {wxMenu, destroy_1_0, 1}},
- {917, {wxMenu, destroy_1_1, 1}},
- {918, {wxMenu, enable, 2}},
- {919, {wxMenu, findItem_1, 1}},
- {920, {wxMenu, findItem_2, 2}},
- {921, {wxMenu, findItemByPosition, 1}},
- {922, {wxMenu, getHelpString, 1}},
- {923, {wxMenu, getLabel, 1}},
- {924, {wxMenu, getMenuItemCount, 0}},
- {925, {wxMenu, getMenuItems, 0}},
- {927, {wxMenu, getTitle, 0}},
- {928, {wxMenu, insert_2, 2}},
- {929, {wxMenu, insert_3, 3}},
- {930, {wxMenu, insert_5_1, 5}},
- {931, {wxMenu, insert_5_0, 5}},
- {932, {wxMenu, insertCheckItem, 4}},
- {933, {wxMenu, insertRadioItem, 4}},
- {934, {wxMenu, insertSeparator, 1}},
- {935, {wxMenu, isChecked, 1}},
- {936, {wxMenu, isEnabled, 1}},
- {937, {wxMenu, prepend_1, 1}},
- {938, {wxMenu, prepend_2, 2}},
- {939, {wxMenu, prepend_4_1, 4}},
- {940, {wxMenu, prepend_4_0, 4}},
- {941, {wxMenu, prependCheckItem, 3}},
- {942, {wxMenu, prependRadioItem, 3}},
- {943, {wxMenu, prependSeparator, 0}},
- {944, {wxMenu, remove_1_0, 1}},
- {945, {wxMenu, remove_1_1, 1}},
- {946, {wxMenu, setHelpString, 2}},
- {947, {wxMenu, setLabel, 2}},
- {948, {wxMenu, setTitle, 1}},
- {949, {wxMenuItem, new, 1}},
- {951, {wxMenuItem, destruct, 0}},
- {952, {wxMenuItem, check, 1}},
- {953, {wxMenuItem, enable, 1}},
- {954, {wxMenuItem, getBitmap, 0}},
- {955, {wxMenuItem, getHelp, 0}},
- {956, {wxMenuItem, getId, 0}},
- {957, {wxMenuItem, getKind, 0}},
- {958, {wxMenuItem, getLabel, 0}},
- {959, {wxMenuItem, getLabelFromText, 1}},
- {960, {wxMenuItem, getMenu, 0}},
- {961, {wxMenuItem, getText, 0}},
- {962, {wxMenuItem, getSubMenu, 0}},
- {963, {wxMenuItem, isCheckable, 0}},
- {964, {wxMenuItem, isChecked, 0}},
- {965, {wxMenuItem, isEnabled, 0}},
- {966, {wxMenuItem, isSeparator, 0}},
- {967, {wxMenuItem, isSubMenu, 0}},
- {968, {wxMenuItem, setBitmap, 1}},
- {969, {wxMenuItem, setHelp, 1}},
- {970, {wxMenuItem, setMenu, 1}},
- {971, {wxMenuItem, setSubMenu, 1}},
- {972, {wxMenuItem, setText, 1}},
- {973, {wxToolBar, addControl, 1}},
- {974, {wxToolBar, addSeparator, 0}},
- {975, {wxToolBar, addTool_5, 5}},
- {976, {wxToolBar, addTool_4_0, 4}},
- {977, {wxToolBar, addTool_1, 1}},
- {978, {wxToolBar, addTool_4_1, 4}},
- {979, {wxToolBar, addTool_3, 3}},
- {980, {wxToolBar, addTool_6, 6}},
- {981, {wxToolBar, addCheckTool, 4}},
- {982, {wxToolBar, addRadioTool, 4}},
- {983, {wxToolBar, deleteTool, 1}},
- {984, {wxToolBar, deleteToolByPos, 1}},
- {985, {wxToolBar, enableTool, 2}},
- {986, {wxToolBar, findById, 1}},
- {987, {wxToolBar, findControl, 1}},
- {988, {wxToolBar, findToolForPosition, 2}},
- {989, {wxToolBar, getToolSize, 0}},
- {990, {wxToolBar, getToolBitmapSize, 0}},
- {991, {wxToolBar, getMargins, 0}},
- {992, {wxToolBar, getToolEnabled, 1}},
- {993, {wxToolBar, getToolLongHelp, 1}},
- {994, {wxToolBar, getToolPacking, 0}},
- {995, {wxToolBar, getToolPos, 1}},
- {996, {wxToolBar, getToolSeparation, 0}},
- {997, {wxToolBar, getToolShortHelp, 1}},
- {998, {wxToolBar, getToolState, 1}},
- {999, {wxToolBar, insertControl, 2}},
- {1000, {wxToolBar, insertSeparator, 1}},
- {1001, {wxToolBar, insertTool_5, 5}},
- {1002, {wxToolBar, insertTool_2, 2}},
- {1003, {wxToolBar, insertTool_4, 4}},
- {1004, {wxToolBar, realize, 0}},
- {1005, {wxToolBar, removeTool, 1}},
- {1006, {wxToolBar, setMargins, 2}},
- {1007, {wxToolBar, setToolBitmapSize, 1}},
- {1008, {wxToolBar, setToolLongHelp, 2}},
- {1009, {wxToolBar, setToolPacking, 1}},
- {1010, {wxToolBar, setToolShortHelp, 2}},
- {1011, {wxToolBar, setToolSeparation, 1}},
- {1012, {wxToolBar, toggleTool, 2}},
- {1014, {wxStatusBar, new_0, 0}},
- {1015, {wxStatusBar, new_2, 2}},
- {1017, {wxStatusBar, destruct, 0}},
- {1018, {wxStatusBar, create, 2}},
- {1019, {wxStatusBar, getFieldRect, 2}},
- {1020, {wxStatusBar, getFieldsCount, 0}},
- {1021, {wxStatusBar, getStatusText, 1}},
- {1022, {wxStatusBar, popStatusText, 1}},
- {1023, {wxStatusBar, pushStatusText, 2}},
- {1024, {wxStatusBar, setFieldsCount, 2}},
- {1025, {wxStatusBar, setMinHeight, 1}},
- {1026, {wxStatusBar, setStatusText, 2}},
- {1027, {wxStatusBar, setStatusWidths, 2}},
- {1028, {wxStatusBar, setStatusStyles, 2}},
- {1029, {wxBitmap, new_0, 0}},
- {1030, {wxBitmap, new_3, 3}},
- {1031, {wxBitmap, new_4, 4}},
- {1032, {wxBitmap, new_2_0, 2}},
- {1033, {wxBitmap, new_2_1, 2}},
- {1034, {wxBitmap, destruct, 0}},
- {1035, {wxBitmap, convertToImage, 0}},
- {1036, {wxBitmap, copyFromIcon, 1}},
- {1037, {wxBitmap, create, 3}},
- {1038, {wxBitmap, getDepth, 0}},
- {1039, {wxBitmap, getHeight, 0}},
- {1040, {wxBitmap, getPalette, 0}},
- {1041, {wxBitmap, getMask, 0}},
- {1042, {wxBitmap, getWidth, 0}},
- {1043, {wxBitmap, getSubBitmap, 1}},
- {1044, {wxBitmap, loadFile, 2}},
- {1045, {wxBitmap, ok, 0}},
- {1046, {wxBitmap, saveFile, 3}},
- {1047, {wxBitmap, setDepth, 1}},
- {1048, {wxBitmap, setHeight, 1}},
- {1049, {wxBitmap, setMask, 1}},
- {1050, {wxBitmap, setPalette, 1}},
- {1051, {wxBitmap, setWidth, 1}},
- {1052, {wxIcon, new_0, 0}},
- {1053, {wxIcon, new_2, 2}},
- {1054, {wxIcon, new_1, 1}},
- {1055, {wxIcon, copyFromBitmap, 1}},
- {1056, {wxIcon, 'Destroy', undefined}},
- {1057, {wxIconBundle, new_0, 0}},
- {1058, {wxIconBundle, new_2, 2}},
- {1059, {wxIconBundle, new_1_0, 1}},
- {1060, {wxIconBundle, new_1_1, 1}},
- {1061, {wxIconBundle, destruct, 0}},
- {1062, {wxIconBundle, addIcon_2, 2}},
- {1063, {wxIconBundle, addIcon_1, 1}},
- {1064, {wxIconBundle, getIcon_1_1, 1}},
- {1065, {wxIconBundle, getIcon_1_0, 1}},
- {1066, {wxCursor, new_0, 0}},
- {1067, {wxCursor, new_1_0, 1}},
- {1068, {wxCursor, new_1_1, 1}},
- {1069, {wxCursor, new_4, 4}},
- {1070, {wxCursor, destruct, 0}},
- {1071, {wxCursor, ok, 0}},
- {1072, {wxMask, new_0, 0}},
- {1073, {wxMask, new_2_1, 2}},
- {1074, {wxMask, new_2_0, 2}},
- {1075, {wxMask, new_1, 1}},
- {1076, {wxMask, destruct, 0}},
- {1077, {wxMask, create_2_1, 2}},
- {1078, {wxMask, create_2_0, 2}},
- {1079, {wxMask, create_1, 1}},
- {1080, {wxImage, new_0, 0}},
- {1081, {wxImage, new_3_0, 3}},
- {1082, {wxImage, new_4, 4}},
- {1083, {wxImage, new_5, 5}},
- {1084, {wxImage, new_2, 2}},
- {1085, {wxImage, new_3_1, 3}},
- {1086, {wxImage, blur, 1}},
- {1087, {wxImage, blurHorizontal, 1}},
- {1088, {wxImage, blurVertical, 1}},
- {1089, {wxImage, convertAlphaToMask, 1}},
- {1090, {wxImage, convertToGreyscale, 1}},
- {1091, {wxImage, convertToMono, 3}},
- {1092, {wxImage, copy, 0}},
- {1093, {wxImage, create_3, 3}},
- {1094, {wxImage, create_4, 4}},
- {1095, {wxImage, create_5, 5}},
- {1096, {wxImage, 'Destroy', 0}},
- {1097, {wxImage, findFirstUnusedColour, 4}},
- {1098, {wxImage, getImageExtWildcard, 0}},
- {1099, {wxImage, getAlpha_2, 2}},
- {1100, {wxImage, getAlpha_0, 0}},
- {1101, {wxImage, getBlue, 2}},
- {1102, {wxImage, getData, 0}},
- {1103, {wxImage, getGreen, 2}},
- {1104, {wxImage, getImageCount, 2}},
- {1105, {wxImage, getHeight, 0}},
- {1106, {wxImage, getMaskBlue, 0}},
- {1107, {wxImage, getMaskGreen, 0}},
- {1108, {wxImage, getMaskRed, 0}},
- {1109, {wxImage, getOrFindMaskColour, 3}},
- {1110, {wxImage, getPalette, 0}},
- {1111, {wxImage, getRed, 2}},
- {1112, {wxImage, getSubImage, 1}},
- {1113, {wxImage, getWidth, 0}},
- {1114, {wxImage, hasAlpha, 0}},
- {1115, {wxImage, hasMask, 0}},
- {1116, {wxImage, getOption, 1}},
- {1117, {wxImage, getOptionInt, 1}},
- {1118, {wxImage, hasOption, 1}},
- {1119, {wxImage, initAlpha, 0}},
- {1120, {wxImage, initStandardHandlers, 0}},
- {1121, {wxImage, isTransparent, 3}},
- {1122, {wxImage, loadFile_2, 2}},
- {1123, {wxImage, loadFile_3, 3}},
- {1124, {wxImage, ok, 0}},
- {1125, {wxImage, removeHandler, 1}},
- {1126, {wxImage, mirror, 1}},
- {1127, {wxImage, replace, 6}},
- {1128, {wxImage, rescale, 3}},
- {1129, {wxImage, resize, 3}},
- {1130, {wxImage, rotate, 3}},
- {1131, {wxImage, rotateHue, 1}},
- {1132, {wxImage, rotate90, 1}},
- {1133, {wxImage, saveFile_1, 1}},
- {1134, {wxImage, saveFile_2_0, 2}},
- {1135, {wxImage, saveFile_2_1, 2}},
- {1136, {wxImage, scale, 3}},
- {1137, {wxImage, size, 3}},
- {1138, {wxImage, setAlpha_3, 3}},
- {1139, {wxImage, setAlpha_2, 2}},
- {1140, {wxImage, setData_2, 2}},
- {1141, {wxImage, setData_4, 4}},
- {1142, {wxImage, setMask, 1}},
- {1143, {wxImage, setMaskColour, 3}},
- {1144, {wxImage, setMaskFromImage, 4}},
- {1145, {wxImage, setOption_2_1, 2}},
- {1146, {wxImage, setOption_2_0, 2}},
- {1147, {wxImage, setPalette, 1}},
- {1148, {wxImage, setRGB_5, 5}},
- {1149, {wxImage, setRGB_4, 4}},
- {1150, {wxImage, 'Destroy', undefined}},
- {1151, {wxBrush, new_0, 0}},
- {1152, {wxBrush, new_2, 2}},
- {1153, {wxBrush, new_1, 1}},
- {1155, {wxBrush, destruct, 0}},
- {1156, {wxBrush, getColour, 0}},
- {1157, {wxBrush, getStipple, 0}},
- {1158, {wxBrush, getStyle, 0}},
- {1159, {wxBrush, isHatch, 0}},
- {1160, {wxBrush, isOk, 0}},
- {1161, {wxBrush, setColour_1, 1}},
- {1162, {wxBrush, setColour_3, 3}},
- {1163, {wxBrush, setStipple, 1}},
- {1164, {wxBrush, setStyle, 1}},
- {1165, {wxPen, new_0, 0}},
- {1166, {wxPen, new_2, 2}},
- {1167, {wxPen, destruct, 0}},
- {1168, {wxPen, getCap, 0}},
- {1169, {wxPen, getColour, 0}},
- {1170, {wxPen, getJoin, 0}},
- {1171, {wxPen, getStyle, 0}},
- {1172, {wxPen, getWidth, 0}},
- {1173, {wxPen, isOk, 0}},
- {1174, {wxPen, setCap, 1}},
- {1175, {wxPen, setColour_1, 1}},
- {1176, {wxPen, setColour_3, 3}},
- {1177, {wxPen, setJoin, 1}},
- {1178, {wxPen, setStyle, 1}},
- {1179, {wxPen, setWidth, 1}},
- {1180, {wxRegion, new_0, 0}},
- {1181, {wxRegion, new_4, 4}},
- {1182, {wxRegion, new_2, 2}},
- {1183, {wxRegion, new_1_1, 1}},
- {1185, {wxRegion, new_1_0, 1}},
- {1187, {wxRegion, destruct, 0}},
- {1188, {wxRegion, clear, 0}},
- {1189, {wxRegion, contains_2, 2}},
- {1190, {wxRegion, contains_1_0, 1}},
- {1191, {wxRegion, contains_4, 4}},
- {1192, {wxRegion, contains_1_1, 1}},
- {1193, {wxRegion, convertToBitmap, 0}},
- {1194, {wxRegion, getBox, 0}},
- {1195, {wxRegion, intersect_4, 4}},
- {1196, {wxRegion, intersect_1_1, 1}},
- {1197, {wxRegion, intersect_1_0, 1}},
- {1198, {wxRegion, isEmpty, 0}},
- {1199, {wxRegion, subtract_4, 4}},
- {1200, {wxRegion, subtract_1_1, 1}},
- {1201, {wxRegion, subtract_1_0, 1}},
- {1202, {wxRegion, offset_2, 2}},
- {1203, {wxRegion, offset_1, 1}},
- {1204, {wxRegion, union_4, 4}},
- {1205, {wxRegion, union_1_2, 1}},
- {1206, {wxRegion, union_1_1, 1}},
- {1207, {wxRegion, union_1_0, 1}},
- {1208, {wxRegion, union_3, 3}},
- {1209, {wxRegion, xor_4, 4}},
- {1210, {wxRegion, xor_1_1, 1}},
- {1211, {wxRegion, xor_1_0, 1}},
- {1212, {wxAcceleratorTable, new_0, 0}},
- {1213, {wxAcceleratorTable, new_2, 2}},
- {1214, {wxAcceleratorTable, destruct, 0}},
- {1215, {wxAcceleratorTable, ok, 0}},
- {1216, {wxAcceleratorEntry, new_1_0, 1}},
- {1217, {wxAcceleratorEntry, new_1_1, 1}},
- {1218, {wxAcceleratorEntry, getCommand, 0}},
- {1219, {wxAcceleratorEntry, getFlags, 0}},
- {1220, {wxAcceleratorEntry, getKeyCode, 0}},
- {1221, {wxAcceleratorEntry, set, 4}},
- {1222, {wxAcceleratorEntry, 'Destroy', undefined}},
- {1227, {wxCaret, new_3, 3}},
- {1228, {wxCaret, new_2, 2}},
- {1230, {wxCaret, destruct, 0}},
- {1231, {wxCaret, create_3, 3}},
- {1232, {wxCaret, create_2, 2}},
- {1233, {wxCaret, getBlinkTime, 0}},
- {1235, {wxCaret, getPosition, 0}},
- {1237, {wxCaret, getSize, 0}},
- {1238, {wxCaret, getWindow, 0}},
- {1239, {wxCaret, hide, 0}},
- {1240, {wxCaret, isOk, 0}},
- {1241, {wxCaret, isVisible, 0}},
- {1242, {wxCaret, move_2, 2}},
- {1243, {wxCaret, move_1, 1}},
- {1244, {wxCaret, setBlinkTime, 1}},
- {1245, {wxCaret, setSize_2, 2}},
- {1246, {wxCaret, setSize_1, 1}},
- {1247, {wxCaret, show, 1}},
- {1248, {wxSizer, add_2_1, 2}},
- {1249, {wxSizer, add_2_0, 2}},
- {1250, {wxSizer, add_3, 3}},
- {1251, {wxSizer, add_2_3, 2}},
- {1252, {wxSizer, add_2_2, 2}},
- {1253, {wxSizer, addSpacer, 1}},
- {1254, {wxSizer, addStretchSpacer, 1}},
- {1255, {wxSizer, calcMin, 0}},
- {1256, {wxSizer, clear, 1}},
- {1257, {wxSizer, detach_1_2, 1}},
- {1258, {wxSizer, detach_1_1, 1}},
- {1259, {wxSizer, detach_1_0, 1}},
- {1260, {wxSizer, fit, 1}},
- {1261, {wxSizer, fitInside, 1}},
- {1262, {wxSizer, getChildren, 0}},
- {1263, {wxSizer, getItem_2_1, 2}},
- {1264, {wxSizer, getItem_2_0, 2}},
- {1265, {wxSizer, getItem_1, 1}},
- {1266, {wxSizer, getSize, 0}},
- {1267, {wxSizer, getPosition, 0}},
- {1268, {wxSizer, getMinSize, 0}},
- {1269, {wxSizer, hide_2_0, 2}},
- {1270, {wxSizer, hide_2_1, 2}},
- {1271, {wxSizer, hide_1, 1}},
- {1272, {wxSizer, insert_3_1, 3}},
- {1273, {wxSizer, insert_3_0, 3}},
- {1274, {wxSizer, insert_4, 4}},
- {1275, {wxSizer, insert_3_3, 3}},
- {1276, {wxSizer, insert_3_2, 3}},
- {1277, {wxSizer, insert_2, 2}},
- {1278, {wxSizer, insertSpacer, 2}},
- {1279, {wxSizer, insertStretchSpacer, 2}},
- {1280, {wxSizer, isShown_1_2, 1}},
- {1281, {wxSizer, isShown_1_1, 1}},
- {1282, {wxSizer, isShown_1_0, 1}},
- {1283, {wxSizer, layout, 0}},
- {1284, {wxSizer, prepend_2_1, 2}},
- {1285, {wxSizer, prepend_2_0, 2}},
- {1286, {wxSizer, prepend_3, 3}},
- {1287, {wxSizer, prepend_2_3, 2}},
- {1288, {wxSizer, prepend_2_2, 2}},
- {1289, {wxSizer, prepend_1, 1}},
- {1290, {wxSizer, prependSpacer, 1}},
- {1291, {wxSizer, prependStretchSpacer, 1}},
- {1292, {wxSizer, recalcSizes, 0}},
- {1293, {wxSizer, remove_1_1, 1}},
- {1294, {wxSizer, remove_1_0, 1}},
- {1295, {wxSizer, replace_3_1, 3}},
- {1296, {wxSizer, replace_3_0, 3}},
- {1297, {wxSizer, replace_2, 2}},
- {1298, {wxSizer, setDimension, 4}},
- {1299, {wxSizer, setMinSize_2, 2}},
- {1300, {wxSizer, setMinSize_1, 1}},
- {1301, {wxSizer, setItemMinSize_3_2, 3}},
- {1302, {wxSizer, setItemMinSize_2_2, 2}},
- {1303, {wxSizer, setItemMinSize_3_1, 3}},
- {1304, {wxSizer, setItemMinSize_2_1, 2}},
- {1305, {wxSizer, setItemMinSize_3_0, 3}},
- {1306, {wxSizer, setItemMinSize_2_0, 2}},
- {1307, {wxSizer, setSizeHints, 1}},
- {1308, {wxSizer, setVirtualSizeHints, 1}},
- {1309, {wxSizer, show_2_2, 2}},
- {1310, {wxSizer, show_2_1, 2}},
- {1311, {wxSizer, show_2_0, 2}},
- {1312, {wxSizer, show_1, 1}},
- {1313, {wxSizerFlags, new, 1}},
- {1314, {wxSizerFlags, align, 1}},
- {1315, {wxSizerFlags, border_2, 2}},
- {1316, {wxSizerFlags, border_1, 1}},
- {1317, {wxSizerFlags, center, 0}},
- {1318, {wxSizerFlags, centre, 0}},
- {1319, {wxSizerFlags, expand, 0}},
- {1320, {wxSizerFlags, left, 0}},
- {1321, {wxSizerFlags, proportion, 1}},
- {1322, {wxSizerFlags, right, 0}},
- {1323, {wxSizerFlags, 'Destroy', undefined}},
- {1324, {wxSizerItem, new_5_1, 5}},
- {1325, {wxSizerItem, new_2_1, 2}},
- {1326, {wxSizerItem, new_5_0, 5}},
- {1327, {wxSizerItem, new_2_0, 2}},
- {1328, {wxSizerItem, new_6, 6}},
- {1329, {wxSizerItem, new_3, 3}},
- {1330, {wxSizerItem, new_0, 0}},
- {1331, {wxSizerItem, destruct, 0}},
- {1332, {wxSizerItem, calcMin, 0}},
- {1333, {wxSizerItem, deleteWindows, 0}},
- {1334, {wxSizerItem, detachSizer, 0}},
- {1335, {wxSizerItem, getBorder, 0}},
- {1336, {wxSizerItem, getFlag, 0}},
- {1337, {wxSizerItem, getMinSize, 0}},
- {1338, {wxSizerItem, getPosition, 0}},
- {1339, {wxSizerItem, getProportion, 0}},
- {1340, {wxSizerItem, getRatio, 0}},
- {1341, {wxSizerItem, getRect, 0}},
- {1342, {wxSizerItem, getSize, 0}},
- {1343, {wxSizerItem, getSizer, 0}},
- {1344, {wxSizerItem, getSpacer, 0}},
- {1345, {wxSizerItem, getUserData, 0}},
- {1346, {wxSizerItem, getWindow, 0}},
- {1347, {wxSizerItem, isSizer, 0}},
- {1348, {wxSizerItem, isShown, 0}},
- {1349, {wxSizerItem, isSpacer, 0}},
- {1350, {wxSizerItem, isWindow, 0}},
- {1351, {wxSizerItem, setBorder, 1}},
- {1352, {wxSizerItem, setDimension, 2}},
- {1353, {wxSizerItem, setFlag, 1}},
- {1354, {wxSizerItem, setInitSize, 2}},
- {1355, {wxSizerItem, setMinSize_1, 1}},
- {1356, {wxSizerItem, setMinSize_2, 2}},
- {1357, {wxSizerItem, setProportion, 1}},
- {1358, {wxSizerItem, setRatio_2, 2}},
- {1359, {wxSizerItem, setRatio_1_1, 1}},
- {1360, {wxSizerItem, setRatio_1_0, 1}},
- {1361, {wxSizerItem, setSizer, 1}},
- {1362, {wxSizerItem, setSpacer_1, 1}},
- {1363, {wxSizerItem, setSpacer_2, 2}},
- {1364, {wxSizerItem, setWindow, 1}},
- {1365, {wxSizerItem, show, 1}},
- {1366, {wxBoxSizer, new, 1}},
- {1367, {wxBoxSizer, getOrientation, 0}},
- {1368, {wxBoxSizer, 'Destroy', undefined}},
- {1369, {wxStaticBoxSizer, new_2, 2}},
- {1370, {wxStaticBoxSizer, new_3, 3}},
- {1371, {wxStaticBoxSizer, getStaticBox, 0}},
- {1372, {wxStaticBoxSizer, 'Destroy', undefined}},
- {1373, {wxGridSizer, new_4, 4}},
- {1374, {wxGridSizer, new_2, 2}},
- {1375, {wxGridSizer, getCols, 0}},
- {1376, {wxGridSizer, getHGap, 0}},
- {1377, {wxGridSizer, getRows, 0}},
- {1378, {wxGridSizer, getVGap, 0}},
- {1379, {wxGridSizer, setCols, 1}},
- {1380, {wxGridSizer, setHGap, 1}},
- {1381, {wxGridSizer, setRows, 1}},
- {1382, {wxGridSizer, setVGap, 1}},
- {1383, {wxGridSizer, 'Destroy', undefined}},
- {1384, {wxFlexGridSizer, new_4, 4}},
- {1385, {wxFlexGridSizer, new_2, 2}},
- {1386, {wxFlexGridSizer, addGrowableCol, 2}},
- {1387, {wxFlexGridSizer, addGrowableRow, 2}},
- {1388, {wxFlexGridSizer, getFlexibleDirection, 0}},
- {1389, {wxFlexGridSizer, getNonFlexibleGrowMode, 0}},
- {1390, {wxFlexGridSizer, removeGrowableCol, 1}},
- {1391, {wxFlexGridSizer, removeGrowableRow, 1}},
- {1392, {wxFlexGridSizer, setFlexibleDirection, 1}},
- {1393, {wxFlexGridSizer, setNonFlexibleGrowMode, 1}},
- {1394, {wxFlexGridSizer, 'Destroy', undefined}},
- {1395, {wxGridBagSizer, new, 1}},
- {1396, {wxGridBagSizer, add_3_2, 3}},
- {1397, {wxGridBagSizer, add_3_1, 3}},
- {1398, {wxGridBagSizer, add_4, 4}},
- {1399, {wxGridBagSizer, add_1_0, 1}},
- {1400, {wxGridBagSizer, add_2_1, 2}},
- {1401, {wxGridBagSizer, add_2_0, 2}},
- {1402, {wxGridBagSizer, add_3_0, 3}},
- {1403, {wxGridBagSizer, add_1_1, 1}},
- {1404, {wxGridBagSizer, calcMin, 0}},
- {1405, {wxGridBagSizer, checkForIntersection_2, 2}},
- {1406, {wxGridBagSizer, checkForIntersection_3, 3}},
- {1407, {wxGridBagSizer, findItem_1_1, 1}},
- {1408, {wxGridBagSizer, findItem_1_0, 1}},
- {1409, {wxGridBagSizer, findItemAtPoint, 1}},
- {1410, {wxGridBagSizer, findItemAtPosition, 1}},
- {1411, {wxGridBagSizer, findItemWithData, 1}},
- {1412, {wxGridBagSizer, getCellSize, 2}},
- {1413, {wxGridBagSizer, getEmptyCellSize, 0}},
- {1414, {wxGridBagSizer, getItemPosition_1_2, 1}},
- {1415, {wxGridBagSizer, getItemPosition_1_1, 1}},
- {1416, {wxGridBagSizer, getItemPosition_1_0, 1}},
- {1417, {wxGridBagSizer, getItemSpan_1_2, 1}},
- {1418, {wxGridBagSizer, getItemSpan_1_1, 1}},
- {1419, {wxGridBagSizer, getItemSpan_1_0, 1}},
- {1420, {wxGridBagSizer, setEmptyCellSize, 1}},
- {1421, {wxGridBagSizer, setItemPosition_2_2, 2}},
- {1422, {wxGridBagSizer, setItemPosition_2_1, 2}},
- {1423, {wxGridBagSizer, setItemPosition_2_0, 2}},
- {1424, {wxGridBagSizer, setItemSpan_2_2, 2}},
- {1425, {wxGridBagSizer, setItemSpan_2_1, 2}},
- {1426, {wxGridBagSizer, setItemSpan_2_0, 2}},
- {1427, {wxGridBagSizer, 'Destroy', undefined}},
- {1428, {wxStdDialogButtonSizer, new, 0}},
- {1429, {wxStdDialogButtonSizer, addButton, 1}},
- {1430, {wxStdDialogButtonSizer, realize, 0}},
- {1431, {wxStdDialogButtonSizer, setAffirmativeButton, 1}},
- {1432, {wxStdDialogButtonSizer, setCancelButton, 1}},
- {1433, {wxStdDialogButtonSizer, setNegativeButton, 1}},
- {1434, {wxStdDialogButtonSizer, 'Destroy', undefined}},
- {1435, {wxFont, new_0, 0}},
- {1436, {wxFont, new_1, 1}},
- {1437, {wxFont, new_5, 5}},
- {1439, {wxFont, destruct, 0}},
- {1440, {wxFont, isFixedWidth, 0}},
- {1441, {wxFont, getDefaultEncoding, 0}},
- {1442, {wxFont, getFaceName, 0}},
- {1443, {wxFont, getFamily, 0}},
- {1444, {wxFont, getNativeFontInfoDesc, 0}},
- {1445, {wxFont, getNativeFontInfoUserDesc, 0}},
- {1446, {wxFont, getPointSize, 0}},
- {1447, {wxFont, getStyle, 0}},
- {1448, {wxFont, getUnderlined, 0}},
- {1449, {wxFont, getWeight, 0}},
- {1450, {wxFont, ok, 0}},
- {1451, {wxFont, setDefaultEncoding, 1}},
- {1452, {wxFont, setFaceName, 1}},
- {1453, {wxFont, setFamily, 1}},
- {1454, {wxFont, setPointSize, 1}},
- {1455, {wxFont, setStyle, 1}},
- {1456, {wxFont, setUnderlined, 1}},
- {1457, {wxFont, setWeight, 1}},
- {1458, {wxToolTip, enable, 1}},
- {1459, {wxToolTip, setDelay, 1}},
- {1460, {wxToolTip, new, 1}},
- {1461, {wxToolTip, setTip, 1}},
- {1462, {wxToolTip, getTip, 0}},
- {1463, {wxToolTip, getWindow, 0}},
- {1464, {wxToolTip, 'Destroy', undefined}},
- {1466, {wxButton, new_3, 3}},
- {1467, {wxButton, new_0, 0}},
- {1468, {wxButton, destruct, 0}},
- {1469, {wxButton, create, 3}},
- {1470, {wxButton, getDefaultSize, 0}},
- {1471, {wxButton, setDefault, 0}},
- {1472, {wxButton, setLabel, 1}},
- {1474, {wxBitmapButton, new_4, 4}},
- {1475, {wxBitmapButton, new_0, 0}},
- {1476, {wxBitmapButton, create, 4}},
- {1477, {wxBitmapButton, getBitmapDisabled, 0}},
- {1479, {wxBitmapButton, getBitmapFocus, 0}},
- {1481, {wxBitmapButton, getBitmapLabel, 0}},
- {1483, {wxBitmapButton, getBitmapSelected, 0}},
- {1485, {wxBitmapButton, setBitmapDisabled, 1}},
- {1486, {wxBitmapButton, setBitmapFocus, 1}},
- {1487, {wxBitmapButton, setBitmapLabel, 1}},
- {1488, {wxBitmapButton, setBitmapSelected, 1}},
- {1489, {wxBitmapButton, 'Destroy', undefined}},
- {1490, {wxToggleButton, new_0, 0}},
- {1491, {wxToggleButton, new_4, 4}},
- {1492, {wxToggleButton, create, 4}},
- {1493, {wxToggleButton, getValue, 0}},
- {1494, {wxToggleButton, setValue, 1}},
- {1495, {wxToggleButton, 'Destroy', undefined}},
- {1496, {wxCalendarCtrl, new_0, 0}},
- {1497, {wxCalendarCtrl, new_3, 3}},
- {1498, {wxCalendarCtrl, create, 3}},
- {1499, {wxCalendarCtrl, destruct, 0}},
- {1500, {wxCalendarCtrl, setDate, 1}},
- {1501, {wxCalendarCtrl, getDate, 0}},
- {1502, {wxCalendarCtrl, enableYearChange, 1}},
- {1503, {wxCalendarCtrl, enableMonthChange, 1}},
- {1504, {wxCalendarCtrl, enableHolidayDisplay, 1}},
- {1505, {wxCalendarCtrl, setHeaderColours, 2}},
- {1506, {wxCalendarCtrl, getHeaderColourFg, 0}},
- {1507, {wxCalendarCtrl, getHeaderColourBg, 0}},
- {1508, {wxCalendarCtrl, setHighlightColours, 2}},
- {1509, {wxCalendarCtrl, getHighlightColourFg, 0}},
- {1510, {wxCalendarCtrl, getHighlightColourBg, 0}},
- {1511, {wxCalendarCtrl, setHolidayColours, 2}},
- {1512, {wxCalendarCtrl, getHolidayColourFg, 0}},
- {1513, {wxCalendarCtrl, getHolidayColourBg, 0}},
- {1514, {wxCalendarCtrl, getAttr, 1}},
- {1515, {wxCalendarCtrl, setAttr, 2}},
- {1516, {wxCalendarCtrl, setHoliday, 1}},
- {1517, {wxCalendarCtrl, resetAttr, 1}},
- {1518, {wxCalendarCtrl, hitTest, 2}},
- {1519, {wxCalendarDateAttr, new_0, 0}},
- {1520, {wxCalendarDateAttr, new_2_1, 2}},
- {1521, {wxCalendarDateAttr, new_2_0, 2}},
- {1522, {wxCalendarDateAttr, setTextColour, 1}},
- {1523, {wxCalendarDateAttr, setBackgroundColour, 1}},
- {1524, {wxCalendarDateAttr, setBorderColour, 1}},
- {1525, {wxCalendarDateAttr, setFont, 1}},
- {1526, {wxCalendarDateAttr, setBorder, 1}},
- {1527, {wxCalendarDateAttr, setHoliday, 1}},
- {1528, {wxCalendarDateAttr, hasTextColour, 0}},
- {1529, {wxCalendarDateAttr, hasBackgroundColour, 0}},
- {1530, {wxCalendarDateAttr, hasBorderColour, 0}},
- {1531, {wxCalendarDateAttr, hasFont, 0}},
- {1532, {wxCalendarDateAttr, hasBorder, 0}},
- {1533, {wxCalendarDateAttr, isHoliday, 0}},
- {1534, {wxCalendarDateAttr, getTextColour, 0}},
- {1535, {wxCalendarDateAttr, getBackgroundColour, 0}},
- {1536, {wxCalendarDateAttr, getBorderColour, 0}},
- {1537, {wxCalendarDateAttr, getFont, 0}},
- {1538, {wxCalendarDateAttr, getBorder, 0}},
- {1539, {wxCalendarDateAttr, 'Destroy', undefined}},
- {1541, {wxCheckBox, new_4, 4}},
- {1542, {wxCheckBox, new_0, 0}},
- {1543, {wxCheckBox, create, 4}},
- {1544, {wxCheckBox, getValue, 0}},
- {1545, {wxCheckBox, get3StateValue, 0}},
- {1546, {wxCheckBox, is3rdStateAllowedForUser, 0}},
- {1547, {wxCheckBox, is3State, 0}},
- {1548, {wxCheckBox, isChecked, 0}},
- {1549, {wxCheckBox, setValue, 1}},
- {1550, {wxCheckBox, set3StateValue, 1}},
- {1551, {wxCheckBox, 'Destroy', undefined}},
- {1552, {wxCheckListBox, new_0, 0}},
- {1554, {wxCheckListBox, new_3, 3}},
- {1555, {wxCheckListBox, check, 2}},
- {1556, {wxCheckListBox, isChecked, 1}},
- {1557, {wxCheckListBox, 'Destroy', undefined}},
- {1560, {wxChoice, new_3, 3}},
- {1561, {wxChoice, new_0, 0}},
- {1563, {wxChoice, destruct, 0}},
- {1565, {wxChoice, create, 6}},
- {1566, {wxChoice, delete, 1}},
- {1567, {wxChoice, getColumns, 0}},
- {1568, {wxChoice, setColumns, 1}},
- {1569, {wxComboBox, new_0, 0}},
- {1571, {wxComboBox, new_3, 3}},
- {1572, {wxComboBox, destruct, 0}},
- {1574, {wxComboBox, create, 7}},
- {1575, {wxComboBox, canCopy, 0}},
- {1576, {wxComboBox, canCut, 0}},
- {1577, {wxComboBox, canPaste, 0}},
- {1578, {wxComboBox, canRedo, 0}},
- {1579, {wxComboBox, canUndo, 0}},
- {1580, {wxComboBox, copy, 0}},
- {1581, {wxComboBox, cut, 0}},
- {1582, {wxComboBox, getInsertionPoint, 0}},
- {1583, {wxComboBox, getLastPosition, 0}},
- {1584, {wxComboBox, getValue, 0}},
- {1585, {wxComboBox, paste, 0}},
- {1586, {wxComboBox, redo, 0}},
- {1587, {wxComboBox, replace, 3}},
- {1588, {wxComboBox, remove, 2}},
- {1589, {wxComboBox, setInsertionPoint, 1}},
- {1590, {wxComboBox, setInsertionPointEnd, 0}},
- {1591, {wxComboBox, setSelection_1, 1}},
- {1592, {wxComboBox, setSelection_2, 2}},
- {1593, {wxComboBox, setValue, 1}},
- {1594, {wxComboBox, undo, 0}},
- {1595, {wxGauge, new_0, 0}},
- {1596, {wxGauge, new_4, 4}},
- {1597, {wxGauge, create, 4}},
- {1598, {wxGauge, getBezelFace, 0}},
- {1599, {wxGauge, getRange, 0}},
- {1600, {wxGauge, getShadowWidth, 0}},
- {1601, {wxGauge, getValue, 0}},
- {1602, {wxGauge, isVertical, 0}},
- {1603, {wxGauge, setBezelFace, 1}},
- {1604, {wxGauge, setRange, 1}},
- {1605, {wxGauge, setShadowWidth, 1}},
- {1606, {wxGauge, setValue, 1}},
- {1607, {wxGauge, pulse, 0}},
- {1608, {wxGauge, 'Destroy', undefined}},
- {1609, {wxGenericDirCtrl, new_0, 0}},
- {1610, {wxGenericDirCtrl, new_2, 2}},
- {1611, {wxGenericDirCtrl, destruct, 0}},
- {1612, {wxGenericDirCtrl, create, 2}},
- {1613, {wxGenericDirCtrl, init, 0}},
- {1614, {wxGenericDirCtrl, collapseTree, 0}},
- {1615, {wxGenericDirCtrl, expandPath, 1}},
- {1616, {wxGenericDirCtrl, getDefaultPath, 0}},
- {1617, {wxGenericDirCtrl, getPath, 0}},
- {1618, {wxGenericDirCtrl, getFilePath, 0}},
- {1619, {wxGenericDirCtrl, getFilter, 0}},
- {1620, {wxGenericDirCtrl, getFilterIndex, 0}},
- {1621, {wxGenericDirCtrl, getRootId, 0}},
- {1622, {wxGenericDirCtrl, getTreeCtrl, 0}},
- {1623, {wxGenericDirCtrl, reCreateTree, 0}},
- {1624, {wxGenericDirCtrl, setDefaultPath, 1}},
- {1625, {wxGenericDirCtrl, setFilter, 1}},
- {1626, {wxGenericDirCtrl, setFilterIndex, 1}},
- {1627, {wxGenericDirCtrl, setPath, 1}},
- {1629, {wxStaticBox, new_4, 4}},
- {1630, {wxStaticBox, new_0, 0}},
- {1631, {wxStaticBox, create, 4}},
- {1632, {wxStaticBox, 'Destroy', undefined}},
- {1634, {wxStaticLine, new_2, 2}},
- {1635, {wxStaticLine, new_0, 0}},
- {1636, {wxStaticLine, create, 2}},
- {1637, {wxStaticLine, isVertical, 0}},
- {1638, {wxStaticLine, getDefaultSize, 0}},
- {1639, {wxStaticLine, 'Destroy', undefined}},
- {1642, {wxListBox, new_3, 3}},
- {1643, {wxListBox, new_0, 0}},
- {1645, {wxListBox, destruct, 0}},
- {1647, {wxListBox, create, 6}},
- {1648, {wxListBox, deselect, 1}},
- {1649, {wxListBox, getSelections, 1}},
- {1650, {wxListBox, insertItems, 2}},
- {1651, {wxListBox, isSelected, 1}},
- {1653, {wxListBox, set, 2}},
+ {337, {wxPanel, setFocusIgnoringChildren, 0}},
+ {338, {wxScrolledWindow, new_0, 0}},
+ {339, {wxScrolledWindow, new_2, 2}},
+ {340, {wxScrolledWindow, destruct, 0}},
+ {341, {wxScrolledWindow, calcScrolledPosition_4, 4}},
+ {342, {wxScrolledWindow, calcScrolledPosition_1, 1}},
+ {343, {wxScrolledWindow, calcUnscrolledPosition_4, 4}},
+ {344, {wxScrolledWindow, calcUnscrolledPosition_1, 1}},
+ {345, {wxScrolledWindow, enableScrolling, 2}},
+ {346, {wxScrolledWindow, getScrollPixelsPerUnit, 2}},
+ {347, {wxScrolledWindow, getViewStart, 2}},
+ {348, {wxScrolledWindow, doPrepareDC, 1}},
+ {349, {wxScrolledWindow, prepareDC, 1}},
+ {350, {wxScrolledWindow, scroll, 2}},
+ {351, {wxScrolledWindow, setScrollbars, 5}},
+ {352, {wxScrolledWindow, setScrollRate, 2}},
+ {353, {wxScrolledWindow, setTargetWindow, 1}},
+ {354, {wxSashWindow, new_0, 0}},
+ {355, {wxSashWindow, new_2, 2}},
+ {356, {wxSashWindow, destruct, 0}},
+ {357, {wxSashWindow, getSashVisible, 1}},
+ {358, {wxSashWindow, getMaximumSizeX, 0}},
+ {359, {wxSashWindow, getMaximumSizeY, 0}},
+ {360, {wxSashWindow, getMinimumSizeX, 0}},
+ {361, {wxSashWindow, getMinimumSizeY, 0}},
+ {362, {wxSashWindow, setMaximumSizeX, 1}},
+ {363, {wxSashWindow, setMaximumSizeY, 1}},
+ {364, {wxSashWindow, setMinimumSizeX, 1}},
+ {365, {wxSashWindow, setMinimumSizeY, 1}},
+ {366, {wxSashWindow, setSashVisible, 2}},
+ {367, {wxSashLayoutWindow, new_0, 0}},
+ {368, {wxSashLayoutWindow, new_2, 2}},
+ {369, {wxSashLayoutWindow, create, 2}},
+ {370, {wxSashLayoutWindow, getAlignment, 0}},
+ {371, {wxSashLayoutWindow, getOrientation, 0}},
+ {372, {wxSashLayoutWindow, setAlignment, 1}},
+ {373, {wxSashLayoutWindow, setDefaultSize, 1}},
+ {374, {wxSashLayoutWindow, setOrientation, 1}},
+ {375, {wxSashLayoutWindow, 'Destroy', undefined}},
+ {376, {wxGrid, new_0, 0}},
+ {377, {wxGrid, new_3, 3}},
+ {378, {wxGrid, new_4, 4}},
+ {379, {wxGrid, destruct, 0}},
+ {380, {wxGrid, appendCols, 1}},
+ {381, {wxGrid, appendRows, 1}},
+ {382, {wxGrid, autoSize, 0}},
+ {383, {wxGrid, autoSizeColumn, 2}},
+ {384, {wxGrid, autoSizeColumns, 1}},
+ {385, {wxGrid, autoSizeRow, 2}},
+ {386, {wxGrid, autoSizeRows, 1}},
+ {387, {wxGrid, beginBatch, 0}},
+ {388, {wxGrid, blockToDeviceRect, 2}},
+ {389, {wxGrid, canDragColSize, 0}},
+ {390, {wxGrid, canDragRowSize, 0}},
+ {391, {wxGrid, canDragGridSize, 0}},
+ {392, {wxGrid, canEnableCellControl, 0}},
+ {393, {wxGrid, cellToRect_2, 2}},
+ {394, {wxGrid, cellToRect_1, 1}},
+ {395, {wxGrid, clearGrid, 0}},
+ {396, {wxGrid, clearSelection, 0}},
+ {397, {wxGrid, createGrid, 3}},
+ {398, {wxGrid, deleteCols, 1}},
+ {399, {wxGrid, deleteRows, 1}},
+ {400, {wxGrid, disableCellEditControl, 0}},
+ {401, {wxGrid, disableDragColSize, 0}},
+ {402, {wxGrid, disableDragGridSize, 0}},
+ {403, {wxGrid, disableDragRowSize, 0}},
+ {404, {wxGrid, enableCellEditControl, 1}},
+ {405, {wxGrid, enableDragColSize, 1}},
+ {406, {wxGrid, enableDragGridSize, 1}},
+ {407, {wxGrid, enableDragRowSize, 1}},
+ {408, {wxGrid, enableEditing, 1}},
+ {409, {wxGrid, enableGridLines, 1}},
+ {410, {wxGrid, endBatch, 0}},
+ {411, {wxGrid, fit, 0}},
+ {412, {wxGrid, forceRefresh, 0}},
+ {413, {wxGrid, getBatchCount, 0}},
+ {414, {wxGrid, getCellAlignment, 4}},
+ {415, {wxGrid, getCellBackgroundColour, 2}},
+ {416, {wxGrid, getCellEditor, 2}},
+ {417, {wxGrid, getCellFont, 2}},
+ {418, {wxGrid, getCellRenderer, 2}},
+ {419, {wxGrid, getCellTextColour, 2}},
+ {420, {wxGrid, getCellValue_2, 2}},
+ {421, {wxGrid, getCellValue_1, 1}},
+ {422, {wxGrid, getColLabelAlignment, 2}},
+ {423, {wxGrid, getColLabelSize, 0}},
+ {424, {wxGrid, getColLabelValue, 1}},
+ {425, {wxGrid, getColMinimalAcceptableWidth, 0}},
+ {426, {wxGrid, getDefaultCellAlignment, 2}},
+ {427, {wxGrid, getDefaultCellBackgroundColour, 0}},
+ {428, {wxGrid, getDefaultCellFont, 0}},
+ {429, {wxGrid, getDefaultCellTextColour, 0}},
+ {430, {wxGrid, getDefaultColLabelSize, 0}},
+ {431, {wxGrid, getDefaultColSize, 0}},
+ {432, {wxGrid, getDefaultEditor, 0}},
+ {433, {wxGrid, getDefaultEditorForCell_2, 2}},
+ {434, {wxGrid, getDefaultEditorForCell_1, 1}},
+ {435, {wxGrid, getDefaultEditorForType, 1}},
+ {436, {wxGrid, getDefaultRenderer, 0}},
+ {437, {wxGrid, getDefaultRendererForCell, 2}},
+ {438, {wxGrid, getDefaultRendererForType, 1}},
+ {439, {wxGrid, getDefaultRowLabelSize, 0}},
+ {440, {wxGrid, getDefaultRowSize, 0}},
+ {441, {wxGrid, getGridCursorCol, 0}},
+ {442, {wxGrid, getGridCursorRow, 0}},
+ {443, {wxGrid, getGridLineColour, 0}},
+ {444, {wxGrid, gridLinesEnabled, 0}},
+ {445, {wxGrid, getLabelBackgroundColour, 0}},
+ {446, {wxGrid, getLabelFont, 0}},
+ {447, {wxGrid, getLabelTextColour, 0}},
+ {448, {wxGrid, getNumberCols, 0}},
+ {449, {wxGrid, getNumberRows, 0}},
+ {450, {wxGrid, getOrCreateCellAttr, 2}},
+ {451, {wxGrid, getRowMinimalAcceptableHeight, 0}},
+ {452, {wxGrid, getRowLabelAlignment, 2}},
+ {453, {wxGrid, getRowLabelSize, 0}},
+ {454, {wxGrid, getRowLabelValue, 1}},
+ {455, {wxGrid, getRowSize, 1}},
+ {456, {wxGrid, getScrollLineX, 0}},
+ {457, {wxGrid, getScrollLineY, 0}},
+ {458, {wxGrid, getSelectedCells, 0}},
+ {459, {wxGrid, getSelectedCols, 0}},
+ {460, {wxGrid, getSelectedRows, 0}},
+ {461, {wxGrid, getSelectionBackground, 0}},
+ {462, {wxGrid, getSelectionBlockTopLeft, 0}},
+ {463, {wxGrid, getSelectionBlockBottomRight, 0}},
+ {464, {wxGrid, getSelectionForeground, 0}},
+ {465, {wxGrid, getViewWidth, 0}},
+ {466, {wxGrid, getGridWindow, 0}},
+ {467, {wxGrid, getGridRowLabelWindow, 0}},
+ {468, {wxGrid, getGridColLabelWindow, 0}},
+ {469, {wxGrid, getGridCornerLabelWindow, 0}},
+ {470, {wxGrid, hideCellEditControl, 0}},
+ {471, {wxGrid, insertCols, 1}},
+ {472, {wxGrid, insertRows, 1}},
+ {473, {wxGrid, isCellEditControlEnabled, 0}},
+ {474, {wxGrid, isCurrentCellReadOnly, 0}},
+ {475, {wxGrid, isEditable, 0}},
+ {476, {wxGrid, isInSelection_2, 2}},
+ {477, {wxGrid, isInSelection_1, 1}},
+ {478, {wxGrid, isReadOnly, 2}},
+ {479, {wxGrid, isSelection, 0}},
+ {480, {wxGrid, isVisible_3, 3}},
+ {481, {wxGrid, isVisible_2, 2}},
+ {482, {wxGrid, makeCellVisible_2, 2}},
+ {483, {wxGrid, makeCellVisible_1, 1}},
+ {484, {wxGrid, moveCursorDown, 1}},
+ {485, {wxGrid, moveCursorLeft, 1}},
+ {486, {wxGrid, moveCursorRight, 1}},
+ {487, {wxGrid, moveCursorUp, 1}},
+ {488, {wxGrid, moveCursorDownBlock, 1}},
+ {489, {wxGrid, moveCursorLeftBlock, 1}},
+ {490, {wxGrid, moveCursorRightBlock, 1}},
+ {491, {wxGrid, moveCursorUpBlock, 1}},
+ {492, {wxGrid, movePageDown, 0}},
+ {493, {wxGrid, movePageUp, 0}},
+ {494, {wxGrid, registerDataType, 3}},
+ {495, {wxGrid, saveEditControlValue, 0}},
+ {496, {wxGrid, selectAll, 0}},
+ {497, {wxGrid, selectBlock_5, 5}},
+ {498, {wxGrid, selectBlock_3, 3}},
+ {499, {wxGrid, selectCol, 2}},
+ {500, {wxGrid, selectRow, 2}},
+ {501, {wxGrid, setCellAlignment_4, 4}},
+ {502, {wxGrid, setCellAlignment_3, 3}},
+ {503, {wxGrid, setCellAlignment_1, 1}},
+ {504, {wxGrid, setCellBackgroundColour_3_0, 3}},
+ {505, {wxGrid, setCellBackgroundColour_1, 1}},
+ {506, {wxGrid, setCellBackgroundColour_3_1, 3}},
+ {507, {wxGrid, setCellEditor, 3}},
+ {508, {wxGrid, setCellFont, 3}},
+ {509, {wxGrid, setCellRenderer, 3}},
+ {510, {wxGrid, setCellTextColour_3_0, 3}},
+ {511, {wxGrid, setCellTextColour_3_1, 3}},
+ {512, {wxGrid, setCellTextColour_1, 1}},
+ {513, {wxGrid, setCellValue_3_0, 3}},
+ {514, {wxGrid, setCellValue_2, 2}},
+ {515, {wxGrid, setCellValue_3_1, 3}},
+ {516, {wxGrid, setColAttr, 2}},
+ {517, {wxGrid, setColFormatBool, 1}},
+ {518, {wxGrid, setColFormatNumber, 1}},
+ {519, {wxGrid, setColFormatFloat, 2}},
+ {520, {wxGrid, setColFormatCustom, 2}},
+ {521, {wxGrid, setColLabelAlignment, 2}},
+ {522, {wxGrid, setColLabelSize, 1}},
+ {523, {wxGrid, setColLabelValue, 2}},
+ {524, {wxGrid, setColMinimalWidth, 2}},
+ {525, {wxGrid, setColMinimalAcceptableWidth, 1}},
+ {526, {wxGrid, setColSize, 2}},
+ {527, {wxGrid, setDefaultCellAlignment, 2}},
+ {528, {wxGrid, setDefaultCellBackgroundColour, 1}},
+ {529, {wxGrid, setDefaultCellFont, 1}},
+ {530, {wxGrid, setDefaultCellTextColour, 1}},
+ {531, {wxGrid, setDefaultEditor, 1}},
+ {532, {wxGrid, setDefaultRenderer, 1}},
+ {533, {wxGrid, setDefaultColSize, 2}},
+ {534, {wxGrid, setDefaultRowSize, 2}},
+ {535, {wxGrid, setGridCursor, 2}},
+ {536, {wxGrid, setGridLineColour, 1}},
+ {537, {wxGrid, setLabelBackgroundColour, 1}},
+ {538, {wxGrid, setLabelFont, 1}},
+ {539, {wxGrid, setLabelTextColour, 1}},
+ {540, {wxGrid, setMargins, 2}},
+ {541, {wxGrid, setReadOnly, 3}},
+ {542, {wxGrid, setRowAttr, 2}},
+ {543, {wxGrid, setRowLabelAlignment, 2}},
+ {544, {wxGrid, setRowLabelSize, 1}},
+ {545, {wxGrid, setRowLabelValue, 2}},
+ {546, {wxGrid, setRowMinimalHeight, 2}},
+ {547, {wxGrid, setRowMinimalAcceptableHeight, 1}},
+ {548, {wxGrid, setRowSize, 2}},
+ {549, {wxGrid, setScrollLineX, 1}},
+ {550, {wxGrid, setScrollLineY, 1}},
+ {551, {wxGrid, setSelectionBackground, 1}},
+ {552, {wxGrid, setSelectionForeground, 1}},
+ {553, {wxGrid, setSelectionMode, 1}},
+ {554, {wxGrid, showCellEditControl, 0}},
+ {555, {wxGrid, xToCol, 2}},
+ {556, {wxGrid, xToEdgeOfCol, 1}},
+ {557, {wxGrid, yToEdgeOfRow, 1}},
+ {558, {wxGrid, yToRow, 1}},
+ {559, {wxGridCellRenderer, draw, 7}},
+ {560, {wxGridCellRenderer, getBestSize, 5}},
+ {561, {wxGridCellEditor, create, 3}},
+ {562, {wxGridCellEditor, isCreated, 0}},
+ {563, {wxGridCellEditor, setSize, 1}},
+ {564, {wxGridCellEditor, show, 2}},
+ {565, {wxGridCellEditor, paintBackground, 2}},
+ {566, {wxGridCellEditor, beginEdit, 3}},
+ {567, {wxGridCellEditor, endEdit, 3}},
+ {568, {wxGridCellEditor, reset, 0}},
+ {569, {wxGridCellEditor, startingKey, 1}},
+ {570, {wxGridCellEditor, startingClick, 0}},
+ {571, {wxGridCellEditor, handleReturn, 1}},
+ {572, {wxGridCellBoolRenderer, new, 0}},
+ {573, {wxGridCellBoolRenderer, 'Destroy', undefined}},
+ {574, {wxGridCellBoolEditor, new, 0}},
+ {575, {wxGridCellBoolEditor, isTrueValue, 1}},
+ {576, {wxGridCellBoolEditor, useStringValues, 1}},
+ {577, {wxGridCellBoolEditor, 'Destroy', undefined}},
+ {578, {wxGridCellFloatRenderer, new, 1}},
+ {579, {wxGridCellFloatRenderer, getPrecision, 0}},
+ {580, {wxGridCellFloatRenderer, getWidth, 0}},
+ {581, {wxGridCellFloatRenderer, setParameters, 1}},
+ {582, {wxGridCellFloatRenderer, setPrecision, 1}},
+ {583, {wxGridCellFloatRenderer, setWidth, 1}},
+ {584, {wxGridCellFloatRenderer, 'Destroy', undefined}},
+ {585, {wxGridCellFloatEditor, new, 1}},
+ {586, {wxGridCellFloatEditor, setParameters, 1}},
+ {587, {wxGridCellFloatEditor, 'Destroy', undefined}},
+ {588, {wxGridCellStringRenderer, new, 0}},
+ {589, {wxGridCellStringRenderer, 'Destroy', undefined}},
+ {590, {wxGridCellTextEditor, new, 0}},
+ {591, {wxGridCellTextEditor, setParameters, 1}},
+ {592, {wxGridCellTextEditor, 'Destroy', undefined}},
+ {594, {wxGridCellChoiceEditor, new, 2}},
+ {595, {wxGridCellChoiceEditor, setParameters, 1}},
+ {596, {wxGridCellChoiceEditor, 'Destroy', undefined}},
+ {597, {wxGridCellNumberRenderer, new, 0}},
+ {598, {wxGridCellNumberRenderer, 'Destroy', undefined}},
+ {599, {wxGridCellNumberEditor, new, 1}},
+ {600, {wxGridCellNumberEditor, getValue, 0}},
+ {601, {wxGridCellNumberEditor, setParameters, 1}},
+ {602, {wxGridCellNumberEditor, 'Destroy', undefined}},
+ {603, {wxGridCellAttr, setTextColour, 1}},
+ {604, {wxGridCellAttr, setBackgroundColour, 1}},
+ {605, {wxGridCellAttr, setFont, 1}},
+ {606, {wxGridCellAttr, setAlignment, 2}},
+ {607, {wxGridCellAttr, setReadOnly, 1}},
+ {608, {wxGridCellAttr, setRenderer, 1}},
+ {609, {wxGridCellAttr, setEditor, 1}},
+ {610, {wxGridCellAttr, hasTextColour, 0}},
+ {611, {wxGridCellAttr, hasBackgroundColour, 0}},
+ {612, {wxGridCellAttr, hasFont, 0}},
+ {613, {wxGridCellAttr, hasAlignment, 0}},
+ {614, {wxGridCellAttr, hasRenderer, 0}},
+ {615, {wxGridCellAttr, hasEditor, 0}},
+ {616, {wxGridCellAttr, getTextColour, 0}},
+ {617, {wxGridCellAttr, getBackgroundColour, 0}},
+ {618, {wxGridCellAttr, getFont, 0}},
+ {619, {wxGridCellAttr, getAlignment, 2}},
+ {620, {wxGridCellAttr, getRenderer, 3}},
+ {621, {wxGridCellAttr, getEditor, 3}},
+ {622, {wxGridCellAttr, isReadOnly, 0}},
+ {623, {wxGridCellAttr, setDefAttr, 1}},
+ {624, {wxDC, blit, 5}},
+ {625, {wxDC, calcBoundingBox, 2}},
+ {626, {wxDC, clear, 0}},
+ {627, {wxDC, computeScaleAndOrigin, 0}},
+ {628, {wxDC, crossHair, 1}},
+ {629, {wxDC, destroyClippingRegion, 0}},
+ {630, {wxDC, deviceToLogicalX, 1}},
+ {631, {wxDC, deviceToLogicalXRel, 1}},
+ {632, {wxDC, deviceToLogicalY, 1}},
+ {633, {wxDC, deviceToLogicalYRel, 1}},
+ {634, {wxDC, drawArc, 3}},
+ {635, {wxDC, drawBitmap, 3}},
+ {636, {wxDC, drawCheckMark, 1}},
+ {637, {wxDC, drawCircle, 2}},
+ {639, {wxDC, drawEllipse_2, 2}},
+ {640, {wxDC, drawEllipse_1, 1}},
+ {641, {wxDC, drawEllipticArc, 4}},
+ {642, {wxDC, drawIcon, 2}},
+ {643, {wxDC, drawLabel, 3}},
+ {644, {wxDC, drawLine, 2}},
+ {645, {wxDC, drawLines, 3}},
+ {647, {wxDC, drawPolygon, 3}},
+ {649, {wxDC, drawPoint, 1}},
+ {651, {wxDC, drawRectangle_2, 2}},
+ {652, {wxDC, drawRectangle_1, 1}},
+ {653, {wxDC, drawRotatedText, 3}},
+ {655, {wxDC, drawRoundedRectangle_3, 3}},
+ {656, {wxDC, drawRoundedRectangle_2, 2}},
+ {657, {wxDC, drawText, 2}},
+ {658, {wxDC, endDoc, 0}},
+ {659, {wxDC, endPage, 0}},
+ {660, {wxDC, floodFill, 3}},
+ {661, {wxDC, getBackground, 0}},
+ {662, {wxDC, getBackgroundMode, 0}},
+ {663, {wxDC, getBrush, 0}},
+ {664, {wxDC, getCharHeight, 0}},
+ {665, {wxDC, getCharWidth, 0}},
+ {666, {wxDC, getClippingBox, 4}},
+ {668, {wxDC, getFont, 0}},
+ {669, {wxDC, getLayoutDirection, 0}},
+ {670, {wxDC, getLogicalFunction, 0}},
+ {671, {wxDC, getMapMode, 0}},
+ {672, {wxDC, getMultiLineTextExtent_4, 4}},
+ {673, {wxDC, getMultiLineTextExtent_1, 1}},
+ {674, {wxDC, getPartialTextExtents, 2}},
+ {675, {wxDC, getPen, 0}},
+ {676, {wxDC, getPixel, 2}},
+ {677, {wxDC, getPPI, 0}},
+ {679, {wxDC, getSize, 0}},
+ {681, {wxDC, getSizeMM, 0}},
+ {682, {wxDC, getTextBackground, 0}},
+ {683, {wxDC, getTextExtent_4, 4}},
+ {684, {wxDC, getTextExtent_1, 1}},
+ {686, {wxDC, getTextForeground, 0}},
+ {687, {wxDC, getUserScale, 2}},
+ {688, {wxDC, gradientFillConcentric_3, 3}},
+ {689, {wxDC, gradientFillConcentric_4, 4}},
+ {690, {wxDC, gradientFillLinear, 4}},
+ {691, {wxDC, logicalToDeviceX, 1}},
+ {692, {wxDC, logicalToDeviceXRel, 1}},
+ {693, {wxDC, logicalToDeviceY, 1}},
+ {694, {wxDC, logicalToDeviceYRel, 1}},
+ {695, {wxDC, maxX, 0}},
+ {696, {wxDC, maxY, 0}},
+ {697, {wxDC, minX, 0}},
+ {698, {wxDC, minY, 0}},
+ {699, {wxDC, isOk, 0}},
+ {700, {wxDC, resetBoundingBox, 0}},
+ {701, {wxDC, setAxisOrientation, 2}},
+ {702, {wxDC, setBackground, 1}},
+ {703, {wxDC, setBackgroundMode, 1}},
+ {704, {wxDC, setBrush, 1}},
+ {706, {wxDC, setClippingRegion_2, 2}},
+ {707, {wxDC, setClippingRegion_1_1, 1}},
+ {708, {wxDC, setClippingRegion_1_0, 1}},
+ {709, {wxDC, setDeviceOrigin, 2}},
+ {710, {wxDC, setFont, 1}},
+ {711, {wxDC, setLayoutDirection, 1}},
+ {712, {wxDC, setLogicalFunction, 1}},
+ {713, {wxDC, setMapMode, 1}},
+ {714, {wxDC, setPalette, 1}},
+ {715, {wxDC, setPen, 1}},
+ {716, {wxDC, setTextBackground, 1}},
+ {717, {wxDC, setTextForeground, 1}},
+ {718, {wxDC, setUserScale, 2}},
+ {719, {wxDC, startDoc, 1}},
+ {720, {wxDC, startPage, 0}},
+ {721, {wxMirrorDC, new, 2}},
+ {722, {wxMirrorDC, 'Destroy', undefined}},
+ {723, {wxScreenDC, new, 0}},
+ {724, {wxScreenDC, destruct, 0}},
+ {725, {wxPostScriptDC, new_0, 0}},
+ {726, {wxPostScriptDC, new_1, 1}},
+ {727, {wxPostScriptDC, destruct, 0}},
+ {728, {wxPostScriptDC, setResolution, 1}},
+ {729, {wxPostScriptDC, getResolution, 0}},
+ {730, {wxWindowDC, new_0, 0}},
+ {731, {wxWindowDC, new_1, 1}},
+ {732, {wxWindowDC, destruct, 0}},
+ {733, {wxClientDC, new_0, 0}},
+ {734, {wxClientDC, new_1, 1}},
+ {735, {wxClientDC, 'Destroy', undefined}},
+ {736, {wxPaintDC, new_0, 0}},
+ {737, {wxPaintDC, new_1, 1}},
+ {738, {wxPaintDC, 'Destroy', undefined}},
+ {740, {wxMemoryDC, new_1_0, 1}},
+ {741, {wxMemoryDC, new_1_1, 1}},
+ {742, {wxMemoryDC, new_0, 0}},
+ {744, {wxMemoryDC, destruct, 0}},
+ {745, {wxMemoryDC, selectObject, 1}},
+ {746, {wxMemoryDC, selectObjectAsSource, 1}},
+ {747, {wxBufferedDC, new_0, 0}},
+ {748, {wxBufferedDC, new_2, 2}},
+ {749, {wxBufferedDC, new_3, 3}},
+ {750, {wxBufferedDC, destruct, 0}},
+ {751, {wxBufferedDC, init_2, 2}},
+ {752, {wxBufferedDC, init_3, 3}},
+ {753, {wxBufferedPaintDC, new_3, 3}},
+ {754, {wxBufferedPaintDC, new_2, 2}},
+ {755, {wxBufferedPaintDC, destruct, 0}},
+ {756, {wxGraphicsObject, destruct, 0}},
+ {757, {wxGraphicsObject, getRenderer, 0}},
+ {758, {wxGraphicsObject, isNull, 0}},
+ {759, {wxGraphicsContext, destruct, 0}},
+ {760, {wxGraphicsContext, create_1_1, 1}},
+ {761, {wxGraphicsContext, create_1_0, 1}},
+ {762, {wxGraphicsContext, create_0, 0}},
+ {763, {wxGraphicsContext, createPen, 1}},
+ {764, {wxGraphicsContext, createBrush, 1}},
+ {765, {wxGraphicsContext, createRadialGradientBrush, 7}},
+ {766, {wxGraphicsContext, createLinearGradientBrush, 6}},
+ {767, {wxGraphicsContext, createFont, 2}},
+ {768, {wxGraphicsContext, createMatrix, 1}},
+ {769, {wxGraphicsContext, createPath, 0}},
+ {770, {wxGraphicsContext, clip_1, 1}},
+ {771, {wxGraphicsContext, clip_4, 4}},
+ {772, {wxGraphicsContext, resetClip, 0}},
+ {773, {wxGraphicsContext, drawBitmap, 5}},
+ {774, {wxGraphicsContext, drawEllipse, 4}},
+ {775, {wxGraphicsContext, drawIcon, 5}},
+ {776, {wxGraphicsContext, drawLines, 3}},
+ {777, {wxGraphicsContext, drawPath, 2}},
+ {778, {wxGraphicsContext, drawRectangle, 4}},
+ {779, {wxGraphicsContext, drawRoundedRectangle, 5}},
+ {780, {wxGraphicsContext, drawText_3, 3}},
+ {781, {wxGraphicsContext, drawText_4_0, 4}},
+ {782, {wxGraphicsContext, drawText_4_1, 4}},
+ {783, {wxGraphicsContext, drawText_5, 5}},
+ {784, {wxGraphicsContext, fillPath, 2}},
+ {785, {wxGraphicsContext, strokePath, 1}},
+ {786, {wxGraphicsContext, getPartialTextExtents, 2}},
+ {787, {wxGraphicsContext, getTextExtent, 5}},
+ {788, {wxGraphicsContext, rotate, 1}},
+ {789, {wxGraphicsContext, scale, 2}},
+ {790, {wxGraphicsContext, translate, 2}},
+ {791, {wxGraphicsContext, getTransform, 0}},
+ {792, {wxGraphicsContext, setTransform, 1}},
+ {793, {wxGraphicsContext, concatTransform, 1}},
+ {794, {wxGraphicsContext, setBrush_1_1, 1}},
+ {795, {wxGraphicsContext, setBrush_1_0, 1}},
+ {796, {wxGraphicsContext, setFont_1, 1}},
+ {797, {wxGraphicsContext, setFont_2, 2}},
+ {798, {wxGraphicsContext, setPen_1_0, 1}},
+ {799, {wxGraphicsContext, setPen_1_1, 1}},
+ {800, {wxGraphicsContext, strokeLine, 4}},
+ {801, {wxGraphicsContext, strokeLines, 2}},
+ {803, {wxGraphicsMatrix, concat, 1}},
+ {805, {wxGraphicsMatrix, get, 1}},
+ {806, {wxGraphicsMatrix, invert, 0}},
+ {807, {wxGraphicsMatrix, isEqual, 1}},
+ {809, {wxGraphicsMatrix, isIdentity, 0}},
+ {810, {wxGraphicsMatrix, rotate, 1}},
+ {811, {wxGraphicsMatrix, scale, 2}},
+ {812, {wxGraphicsMatrix, translate, 2}},
+ {813, {wxGraphicsMatrix, set, 1}},
+ {814, {wxGraphicsMatrix, transformPoint, 2}},
+ {815, {wxGraphicsMatrix, transformDistance, 2}},
+ {816, {wxGraphicsPath, moveToPoint_2, 2}},
+ {817, {wxGraphicsPath, moveToPoint_1, 1}},
+ {818, {wxGraphicsPath, addArc_6, 6}},
+ {819, {wxGraphicsPath, addArc_5, 5}},
+ {820, {wxGraphicsPath, addArcToPoint, 5}},
+ {821, {wxGraphicsPath, addCircle, 3}},
+ {822, {wxGraphicsPath, addCurveToPoint_6, 6}},
+ {823, {wxGraphicsPath, addCurveToPoint_3, 3}},
+ {824, {wxGraphicsPath, addEllipse, 4}},
+ {825, {wxGraphicsPath, addLineToPoint_2, 2}},
+ {826, {wxGraphicsPath, addLineToPoint_1, 1}},
+ {827, {wxGraphicsPath, addPath, 1}},
+ {828, {wxGraphicsPath, addQuadCurveToPoint, 4}},
+ {829, {wxGraphicsPath, addRectangle, 4}},
+ {830, {wxGraphicsPath, addRoundedRectangle, 5}},
+ {831, {wxGraphicsPath, closeSubpath, 0}},
+ {832, {wxGraphicsPath, contains_3, 3}},
+ {833, {wxGraphicsPath, contains_2, 2}},
+ {835, {wxGraphicsPath, getBox, 0}},
+ {837, {wxGraphicsPath, getCurrentPoint, 0}},
+ {838, {wxGraphicsPath, transform, 1}},
+ {839, {wxGraphicsRenderer, getDefaultRenderer, 0}},
+ {840, {wxGraphicsRenderer, createContext_1_1, 1}},
+ {841, {wxGraphicsRenderer, createContext_1_0, 1}},
+ {842, {wxGraphicsRenderer, createPen, 1}},
+ {843, {wxGraphicsRenderer, createBrush, 1}},
+ {844, {wxGraphicsRenderer, createLinearGradientBrush, 6}},
+ {845, {wxGraphicsRenderer, createRadialGradientBrush, 7}},
+ {846, {wxGraphicsRenderer, createFont, 2}},
+ {847, {wxGraphicsRenderer, createMatrix, 1}},
+ {848, {wxGraphicsRenderer, createPath, 0}},
+ {850, {wxMenuBar, new_1, 1}},
+ {852, {wxMenuBar, new_0, 0}},
+ {854, {wxMenuBar, destruct, 0}},
+ {855, {wxMenuBar, append, 2}},
+ {856, {wxMenuBar, check, 2}},
+ {857, {wxMenuBar, enable_2, 2}},
+ {858, {wxMenuBar, enable_1, 1}},
+ {859, {wxMenuBar, enableTop, 2}},
+ {860, {wxMenuBar, findMenu, 1}},
+ {861, {wxMenuBar, findMenuItem, 2}},
+ {862, {wxMenuBar, findItem, 2}},
+ {863, {wxMenuBar, getHelpString, 1}},
+ {864, {wxMenuBar, getLabel_1, 1}},
+ {865, {wxMenuBar, getLabel_0, 0}},
+ {866, {wxMenuBar, getLabelTop, 1}},
+ {867, {wxMenuBar, getMenu, 1}},
+ {868, {wxMenuBar, getMenuCount, 0}},
+ {869, {wxMenuBar, insert, 3}},
+ {870, {wxMenuBar, isChecked, 1}},
+ {871, {wxMenuBar, isEnabled_1, 1}},
+ {872, {wxMenuBar, isEnabled_0, 0}},
+ {873, {wxMenuBar, remove, 1}},
+ {874, {wxMenuBar, replace, 3}},
+ {875, {wxMenuBar, setHelpString, 2}},
+ {876, {wxMenuBar, setLabel_2, 2}},
+ {877, {wxMenuBar, setLabel_1, 1}},
+ {878, {wxMenuBar, setLabelTop, 2}},
+ {879, {wxControl, getLabel, 0}},
+ {880, {wxControl, setLabel, 1}},
+ {881, {wxControlWithItems, append_1, 1}},
+ {882, {wxControlWithItems, append_2, 2}},
+ {883, {wxControlWithItems, appendStrings_1, 1}},
+ {884, {wxControlWithItems, clear, 0}},
+ {885, {wxControlWithItems, delete, 1}},
+ {886, {wxControlWithItems, findString, 2}},
+ {887, {wxControlWithItems, getClientData, 1}},
+ {888, {wxControlWithItems, setClientData, 2}},
+ {889, {wxControlWithItems, getCount, 0}},
+ {890, {wxControlWithItems, getSelection, 0}},
+ {891, {wxControlWithItems, getString, 1}},
+ {892, {wxControlWithItems, getStringSelection, 0}},
+ {893, {wxControlWithItems, insert_2, 2}},
+ {894, {wxControlWithItems, insert_3, 3}},
+ {895, {wxControlWithItems, isEmpty, 0}},
+ {896, {wxControlWithItems, select, 1}},
+ {897, {wxControlWithItems, setSelection, 1}},
+ {898, {wxControlWithItems, setString, 2}},
+ {899, {wxControlWithItems, setStringSelection, 1}},
+ {902, {wxMenu, new_2, 2}},
+ {903, {wxMenu, new_1, 1}},
+ {905, {wxMenu, destruct, 0}},
+ {906, {wxMenu, append_3, 3}},
+ {907, {wxMenu, append_1, 1}},
+ {908, {wxMenu, append_4_0, 4}},
+ {909, {wxMenu, append_4_1, 4}},
+ {910, {wxMenu, appendCheckItem, 3}},
+ {911, {wxMenu, appendRadioItem, 3}},
+ {912, {wxMenu, appendSeparator, 0}},
+ {913, {wxMenu, break, 0}},
+ {914, {wxMenu, check, 2}},
+ {915, {wxMenu, delete_1_0, 1}},
+ {916, {wxMenu, delete_1_1, 1}},
+ {917, {wxMenu, destroy_1_0, 1}},
+ {918, {wxMenu, destroy_1_1, 1}},
+ {919, {wxMenu, enable, 2}},
+ {920, {wxMenu, findItem_1, 1}},
+ {921, {wxMenu, findItem_2, 2}},
+ {922, {wxMenu, findItemByPosition, 1}},
+ {923, {wxMenu, getHelpString, 1}},
+ {924, {wxMenu, getLabel, 1}},
+ {925, {wxMenu, getMenuItemCount, 0}},
+ {926, {wxMenu, getMenuItems, 0}},
+ {928, {wxMenu, getTitle, 0}},
+ {929, {wxMenu, insert_2, 2}},
+ {930, {wxMenu, insert_3, 3}},
+ {931, {wxMenu, insert_5_1, 5}},
+ {932, {wxMenu, insert_5_0, 5}},
+ {933, {wxMenu, insertCheckItem, 4}},
+ {934, {wxMenu, insertRadioItem, 4}},
+ {935, {wxMenu, insertSeparator, 1}},
+ {936, {wxMenu, isChecked, 1}},
+ {937, {wxMenu, isEnabled, 1}},
+ {938, {wxMenu, prepend_1, 1}},
+ {939, {wxMenu, prepend_2, 2}},
+ {940, {wxMenu, prepend_4_1, 4}},
+ {941, {wxMenu, prepend_4_0, 4}},
+ {942, {wxMenu, prependCheckItem, 3}},
+ {943, {wxMenu, prependRadioItem, 3}},
+ {944, {wxMenu, prependSeparator, 0}},
+ {945, {wxMenu, remove_1_0, 1}},
+ {946, {wxMenu, remove_1_1, 1}},
+ {947, {wxMenu, setHelpString, 2}},
+ {948, {wxMenu, setLabel, 2}},
+ {949, {wxMenu, setTitle, 1}},
+ {950, {wxMenuItem, new, 1}},
+ {952, {wxMenuItem, destruct, 0}},
+ {953, {wxMenuItem, check, 1}},
+ {954, {wxMenuItem, enable, 1}},
+ {955, {wxMenuItem, getBitmap, 0}},
+ {956, {wxMenuItem, getHelp, 0}},
+ {957, {wxMenuItem, getId, 0}},
+ {958, {wxMenuItem, getKind, 0}},
+ {959, {wxMenuItem, getLabel, 0}},
+ {960, {wxMenuItem, getLabelFromText, 1}},
+ {961, {wxMenuItem, getMenu, 0}},
+ {962, {wxMenuItem, getText, 0}},
+ {963, {wxMenuItem, getSubMenu, 0}},
+ {964, {wxMenuItem, isCheckable, 0}},
+ {965, {wxMenuItem, isChecked, 0}},
+ {966, {wxMenuItem, isEnabled, 0}},
+ {967, {wxMenuItem, isSeparator, 0}},
+ {968, {wxMenuItem, isSubMenu, 0}},
+ {969, {wxMenuItem, setBitmap, 1}},
+ {970, {wxMenuItem, setHelp, 1}},
+ {971, {wxMenuItem, setMenu, 1}},
+ {972, {wxMenuItem, setSubMenu, 1}},
+ {973, {wxMenuItem, setText, 1}},
+ {974, {wxToolBar, addControl, 1}},
+ {975, {wxToolBar, addSeparator, 0}},
+ {976, {wxToolBar, addTool_5, 5}},
+ {977, {wxToolBar, addTool_4_0, 4}},
+ {978, {wxToolBar, addTool_1, 1}},
+ {979, {wxToolBar, addTool_4_1, 4}},
+ {980, {wxToolBar, addTool_3, 3}},
+ {981, {wxToolBar, addTool_6, 6}},
+ {982, {wxToolBar, addCheckTool, 4}},
+ {983, {wxToolBar, addRadioTool, 4}},
+ {984, {wxToolBar, deleteTool, 1}},
+ {985, {wxToolBar, deleteToolByPos, 1}},
+ {986, {wxToolBar, enableTool, 2}},
+ {987, {wxToolBar, findById, 1}},
+ {988, {wxToolBar, findControl, 1}},
+ {989, {wxToolBar, findToolForPosition, 2}},
+ {990, {wxToolBar, getToolSize, 0}},
+ {991, {wxToolBar, getToolBitmapSize, 0}},
+ {992, {wxToolBar, getMargins, 0}},
+ {993, {wxToolBar, getToolEnabled, 1}},
+ {994, {wxToolBar, getToolLongHelp, 1}},
+ {995, {wxToolBar, getToolPacking, 0}},
+ {996, {wxToolBar, getToolPos, 1}},
+ {997, {wxToolBar, getToolSeparation, 0}},
+ {998, {wxToolBar, getToolShortHelp, 1}},
+ {999, {wxToolBar, getToolState, 1}},
+ {1000, {wxToolBar, insertControl, 2}},
+ {1001, {wxToolBar, insertSeparator, 1}},
+ {1002, {wxToolBar, insertTool_5, 5}},
+ {1003, {wxToolBar, insertTool_2, 2}},
+ {1004, {wxToolBar, insertTool_4, 4}},
+ {1005, {wxToolBar, realize, 0}},
+ {1006, {wxToolBar, removeTool, 1}},
+ {1007, {wxToolBar, setMargins, 2}},
+ {1008, {wxToolBar, setToolBitmapSize, 1}},
+ {1009, {wxToolBar, setToolLongHelp, 2}},
+ {1010, {wxToolBar, setToolPacking, 1}},
+ {1011, {wxToolBar, setToolShortHelp, 2}},
+ {1012, {wxToolBar, setToolSeparation, 1}},
+ {1013, {wxToolBar, toggleTool, 2}},
+ {1015, {wxStatusBar, new_0, 0}},
+ {1016, {wxStatusBar, new_2, 2}},
+ {1018, {wxStatusBar, destruct, 0}},
+ {1019, {wxStatusBar, create, 2}},
+ {1020, {wxStatusBar, getFieldRect, 2}},
+ {1021, {wxStatusBar, getFieldsCount, 0}},
+ {1022, {wxStatusBar, getStatusText, 1}},
+ {1023, {wxStatusBar, popStatusText, 1}},
+ {1024, {wxStatusBar, pushStatusText, 2}},
+ {1025, {wxStatusBar, setFieldsCount, 2}},
+ {1026, {wxStatusBar, setMinHeight, 1}},
+ {1027, {wxStatusBar, setStatusText, 2}},
+ {1028, {wxStatusBar, setStatusWidths, 2}},
+ {1029, {wxStatusBar, setStatusStyles, 2}},
+ {1030, {wxBitmap, new_0, 0}},
+ {1031, {wxBitmap, new_3, 3}},
+ {1032, {wxBitmap, new_4, 4}},
+ {1033, {wxBitmap, new_2_0, 2}},
+ {1034, {wxBitmap, new_2_1, 2}},
+ {1035, {wxBitmap, destruct, 0}},
+ {1036, {wxBitmap, convertToImage, 0}},
+ {1037, {wxBitmap, copyFromIcon, 1}},
+ {1038, {wxBitmap, create, 3}},
+ {1039, {wxBitmap, getDepth, 0}},
+ {1040, {wxBitmap, getHeight, 0}},
+ {1041, {wxBitmap, getPalette, 0}},
+ {1042, {wxBitmap, getMask, 0}},
+ {1043, {wxBitmap, getWidth, 0}},
+ {1044, {wxBitmap, getSubBitmap, 1}},
+ {1045, {wxBitmap, loadFile, 2}},
+ {1046, {wxBitmap, ok, 0}},
+ {1047, {wxBitmap, saveFile, 3}},
+ {1048, {wxBitmap, setDepth, 1}},
+ {1049, {wxBitmap, setHeight, 1}},
+ {1050, {wxBitmap, setMask, 1}},
+ {1051, {wxBitmap, setPalette, 1}},
+ {1052, {wxBitmap, setWidth, 1}},
+ {1053, {wxIcon, new_0, 0}},
+ {1054, {wxIcon, new_2, 2}},
+ {1055, {wxIcon, new_1, 1}},
+ {1056, {wxIcon, copyFromBitmap, 1}},
+ {1057, {wxIcon, 'Destroy', undefined}},
+ {1058, {wxIconBundle, new_0, 0}},
+ {1059, {wxIconBundle, new_2, 2}},
+ {1060, {wxIconBundle, new_1_0, 1}},
+ {1061, {wxIconBundle, new_1_1, 1}},
+ {1062, {wxIconBundle, destruct, 0}},
+ {1063, {wxIconBundle, addIcon_2, 2}},
+ {1064, {wxIconBundle, addIcon_1, 1}},
+ {1065, {wxIconBundle, getIcon_1_1, 1}},
+ {1066, {wxIconBundle, getIcon_1_0, 1}},
+ {1067, {wxCursor, new_0, 0}},
+ {1068, {wxCursor, new_1_0, 1}},
+ {1069, {wxCursor, new_1_1, 1}},
+ {1070, {wxCursor, new_4, 4}},
+ {1071, {wxCursor, destruct, 0}},
+ {1072, {wxCursor, ok, 0}},
+ {1073, {wxMask, new_0, 0}},
+ {1074, {wxMask, new_2_1, 2}},
+ {1075, {wxMask, new_2_0, 2}},
+ {1076, {wxMask, new_1, 1}},
+ {1077, {wxMask, destruct, 0}},
+ {1078, {wxMask, create_2_1, 2}},
+ {1079, {wxMask, create_2_0, 2}},
+ {1080, {wxMask, create_1, 1}},
+ {1081, {wxImage, new_0, 0}},
+ {1082, {wxImage, new_3_0, 3}},
+ {1083, {wxImage, new_4, 4}},
+ {1084, {wxImage, new_5, 5}},
+ {1085, {wxImage, new_2, 2}},
+ {1086, {wxImage, new_3_1, 3}},
+ {1087, {wxImage, blur, 1}},
+ {1088, {wxImage, blurHorizontal, 1}},
+ {1089, {wxImage, blurVertical, 1}},
+ {1090, {wxImage, convertAlphaToMask, 1}},
+ {1091, {wxImage, convertToGreyscale, 1}},
+ {1092, {wxImage, convertToMono, 3}},
+ {1093, {wxImage, copy, 0}},
+ {1094, {wxImage, create_3, 3}},
+ {1095, {wxImage, create_4, 4}},
+ {1096, {wxImage, create_5, 5}},
+ {1097, {wxImage, 'Destroy', 0}},
+ {1098, {wxImage, findFirstUnusedColour, 4}},
+ {1099, {wxImage, getImageExtWildcard, 0}},
+ {1100, {wxImage, getAlpha_2, 2}},
+ {1101, {wxImage, getAlpha_0, 0}},
+ {1102, {wxImage, getBlue, 2}},
+ {1103, {wxImage, getData, 0}},
+ {1104, {wxImage, getGreen, 2}},
+ {1105, {wxImage, getImageCount, 2}},
+ {1106, {wxImage, getHeight, 0}},
+ {1107, {wxImage, getMaskBlue, 0}},
+ {1108, {wxImage, getMaskGreen, 0}},
+ {1109, {wxImage, getMaskRed, 0}},
+ {1110, {wxImage, getOrFindMaskColour, 3}},
+ {1111, {wxImage, getPalette, 0}},
+ {1112, {wxImage, getRed, 2}},
+ {1113, {wxImage, getSubImage, 1}},
+ {1114, {wxImage, getWidth, 0}},
+ {1115, {wxImage, hasAlpha, 0}},
+ {1116, {wxImage, hasMask, 0}},
+ {1117, {wxImage, getOption, 1}},
+ {1118, {wxImage, getOptionInt, 1}},
+ {1119, {wxImage, hasOption, 1}},
+ {1120, {wxImage, initAlpha, 0}},
+ {1121, {wxImage, initStandardHandlers, 0}},
+ {1122, {wxImage, isTransparent, 3}},
+ {1123, {wxImage, loadFile_2, 2}},
+ {1124, {wxImage, loadFile_3, 3}},
+ {1125, {wxImage, ok, 0}},
+ {1126, {wxImage, removeHandler, 1}},
+ {1127, {wxImage, mirror, 1}},
+ {1128, {wxImage, replace, 6}},
+ {1129, {wxImage, rescale, 3}},
+ {1130, {wxImage, resize, 3}},
+ {1131, {wxImage, rotate, 3}},
+ {1132, {wxImage, rotateHue, 1}},
+ {1133, {wxImage, rotate90, 1}},
+ {1134, {wxImage, saveFile_1, 1}},
+ {1135, {wxImage, saveFile_2_0, 2}},
+ {1136, {wxImage, saveFile_2_1, 2}},
+ {1137, {wxImage, scale, 3}},
+ {1138, {wxImage, size, 3}},
+ {1139, {wxImage, setAlpha_3, 3}},
+ {1140, {wxImage, setAlpha_2, 2}},
+ {1141, {wxImage, setData_2, 2}},
+ {1142, {wxImage, setData_4, 4}},
+ {1143, {wxImage, setMask, 1}},
+ {1144, {wxImage, setMaskColour, 3}},
+ {1145, {wxImage, setMaskFromImage, 4}},
+ {1146, {wxImage, setOption_2_1, 2}},
+ {1147, {wxImage, setOption_2_0, 2}},
+ {1148, {wxImage, setPalette, 1}},
+ {1149, {wxImage, setRGB_5, 5}},
+ {1150, {wxImage, setRGB_4, 4}},
+ {1151, {wxImage, 'Destroy', undefined}},
+ {1152, {wxBrush, new_0, 0}},
+ {1153, {wxBrush, new_2, 2}},
+ {1154, {wxBrush, new_1, 1}},
+ {1156, {wxBrush, destruct, 0}},
+ {1157, {wxBrush, getColour, 0}},
+ {1158, {wxBrush, getStipple, 0}},
+ {1159, {wxBrush, getStyle, 0}},
+ {1160, {wxBrush, isHatch, 0}},
+ {1161, {wxBrush, isOk, 0}},
+ {1162, {wxBrush, setColour_1, 1}},
+ {1163, {wxBrush, setColour_3, 3}},
+ {1164, {wxBrush, setStipple, 1}},
+ {1165, {wxBrush, setStyle, 1}},
+ {1166, {wxPen, new_0, 0}},
+ {1167, {wxPen, new_2, 2}},
+ {1168, {wxPen, destruct, 0}},
+ {1169, {wxPen, getCap, 0}},
+ {1170, {wxPen, getColour, 0}},
+ {1171, {wxPen, getJoin, 0}},
+ {1172, {wxPen, getStyle, 0}},
+ {1173, {wxPen, getWidth, 0}},
+ {1174, {wxPen, isOk, 0}},
+ {1175, {wxPen, setCap, 1}},
+ {1176, {wxPen, setColour_1, 1}},
+ {1177, {wxPen, setColour_3, 3}},
+ {1178, {wxPen, setJoin, 1}},
+ {1179, {wxPen, setStyle, 1}},
+ {1180, {wxPen, setWidth, 1}},
+ {1181, {wxRegion, new_0, 0}},
+ {1182, {wxRegion, new_4, 4}},
+ {1183, {wxRegion, new_2, 2}},
+ {1184, {wxRegion, new_1_1, 1}},
+ {1186, {wxRegion, new_1_0, 1}},
+ {1188, {wxRegion, destruct, 0}},
+ {1189, {wxRegion, clear, 0}},
+ {1190, {wxRegion, contains_2, 2}},
+ {1191, {wxRegion, contains_1_0, 1}},
+ {1192, {wxRegion, contains_4, 4}},
+ {1193, {wxRegion, contains_1_1, 1}},
+ {1194, {wxRegion, convertToBitmap, 0}},
+ {1195, {wxRegion, getBox, 0}},
+ {1196, {wxRegion, intersect_4, 4}},
+ {1197, {wxRegion, intersect_1_1, 1}},
+ {1198, {wxRegion, intersect_1_0, 1}},
+ {1199, {wxRegion, isEmpty, 0}},
+ {1200, {wxRegion, subtract_4, 4}},
+ {1201, {wxRegion, subtract_1_1, 1}},
+ {1202, {wxRegion, subtract_1_0, 1}},
+ {1203, {wxRegion, offset_2, 2}},
+ {1204, {wxRegion, offset_1, 1}},
+ {1205, {wxRegion, union_4, 4}},
+ {1206, {wxRegion, union_1_2, 1}},
+ {1207, {wxRegion, union_1_1, 1}},
+ {1208, {wxRegion, union_1_0, 1}},
+ {1209, {wxRegion, union_3, 3}},
+ {1210, {wxRegion, xor_4, 4}},
+ {1211, {wxRegion, xor_1_1, 1}},
+ {1212, {wxRegion, xor_1_0, 1}},
+ {1213, {wxAcceleratorTable, new_0, 0}},
+ {1214, {wxAcceleratorTable, new_2, 2}},
+ {1215, {wxAcceleratorTable, destruct, 0}},
+ {1216, {wxAcceleratorTable, ok, 0}},
+ {1217, {wxAcceleratorEntry, new_1_0, 1}},
+ {1218, {wxAcceleratorEntry, new_1_1, 1}},
+ {1219, {wxAcceleratorEntry, getCommand, 0}},
+ {1220, {wxAcceleratorEntry, getFlags, 0}},
+ {1221, {wxAcceleratorEntry, getKeyCode, 0}},
+ {1222, {wxAcceleratorEntry, set, 4}},
+ {1223, {wxAcceleratorEntry, 'Destroy', undefined}},
+ {1228, {wxCaret, new_3, 3}},
+ {1229, {wxCaret, new_2, 2}},
+ {1231, {wxCaret, destruct, 0}},
+ {1232, {wxCaret, create_3, 3}},
+ {1233, {wxCaret, create_2, 2}},
+ {1234, {wxCaret, getBlinkTime, 0}},
+ {1236, {wxCaret, getPosition, 0}},
+ {1238, {wxCaret, getSize, 0}},
+ {1239, {wxCaret, getWindow, 0}},
+ {1240, {wxCaret, hide, 0}},
+ {1241, {wxCaret, isOk, 0}},
+ {1242, {wxCaret, isVisible, 0}},
+ {1243, {wxCaret, move_2, 2}},
+ {1244, {wxCaret, move_1, 1}},
+ {1245, {wxCaret, setBlinkTime, 1}},
+ {1246, {wxCaret, setSize_2, 2}},
+ {1247, {wxCaret, setSize_1, 1}},
+ {1248, {wxCaret, show, 1}},
+ {1249, {wxSizer, add_2_1, 2}},
+ {1250, {wxSizer, add_2_0, 2}},
+ {1251, {wxSizer, add_3, 3}},
+ {1252, {wxSizer, add_2_3, 2}},
+ {1253, {wxSizer, add_2_2, 2}},
+ {1254, {wxSizer, addSpacer, 1}},
+ {1255, {wxSizer, addStretchSpacer, 1}},
+ {1256, {wxSizer, calcMin, 0}},
+ {1257, {wxSizer, clear, 1}},
+ {1258, {wxSizer, detach_1_2, 1}},
+ {1259, {wxSizer, detach_1_1, 1}},
+ {1260, {wxSizer, detach_1_0, 1}},
+ {1261, {wxSizer, fit, 1}},
+ {1262, {wxSizer, fitInside, 1}},
+ {1263, {wxSizer, getChildren, 0}},
+ {1264, {wxSizer, getItem_2_1, 2}},
+ {1265, {wxSizer, getItem_2_0, 2}},
+ {1266, {wxSizer, getItem_1, 1}},
+ {1267, {wxSizer, getSize, 0}},
+ {1268, {wxSizer, getPosition, 0}},
+ {1269, {wxSizer, getMinSize, 0}},
+ {1270, {wxSizer, hide_2_0, 2}},
+ {1271, {wxSizer, hide_2_1, 2}},
+ {1272, {wxSizer, hide_1, 1}},
+ {1273, {wxSizer, insert_3_1, 3}},
+ {1274, {wxSizer, insert_3_0, 3}},
+ {1275, {wxSizer, insert_4, 4}},
+ {1276, {wxSizer, insert_3_3, 3}},
+ {1277, {wxSizer, insert_3_2, 3}},
+ {1278, {wxSizer, insert_2, 2}},
+ {1279, {wxSizer, insertSpacer, 2}},
+ {1280, {wxSizer, insertStretchSpacer, 2}},
+ {1281, {wxSizer, isShown_1_2, 1}},
+ {1282, {wxSizer, isShown_1_1, 1}},
+ {1283, {wxSizer, isShown_1_0, 1}},
+ {1284, {wxSizer, layout, 0}},
+ {1285, {wxSizer, prepend_2_1, 2}},
+ {1286, {wxSizer, prepend_2_0, 2}},
+ {1287, {wxSizer, prepend_3, 3}},
+ {1288, {wxSizer, prepend_2_3, 2}},
+ {1289, {wxSizer, prepend_2_2, 2}},
+ {1290, {wxSizer, prepend_1, 1}},
+ {1291, {wxSizer, prependSpacer, 1}},
+ {1292, {wxSizer, prependStretchSpacer, 1}},
+ {1293, {wxSizer, recalcSizes, 0}},
+ {1294, {wxSizer, remove_1_1, 1}},
+ {1295, {wxSizer, remove_1_0, 1}},
+ {1296, {wxSizer, replace_3_1, 3}},
+ {1297, {wxSizer, replace_3_0, 3}},
+ {1298, {wxSizer, replace_2, 2}},
+ {1299, {wxSizer, setDimension, 4}},
+ {1300, {wxSizer, setMinSize_2, 2}},
+ {1301, {wxSizer, setMinSize_1, 1}},
+ {1302, {wxSizer, setItemMinSize_3_2, 3}},
+ {1303, {wxSizer, setItemMinSize_2_2, 2}},
+ {1304, {wxSizer, setItemMinSize_3_1, 3}},
+ {1305, {wxSizer, setItemMinSize_2_1, 2}},
+ {1306, {wxSizer, setItemMinSize_3_0, 3}},
+ {1307, {wxSizer, setItemMinSize_2_0, 2}},
+ {1308, {wxSizer, setSizeHints, 1}},
+ {1309, {wxSizer, setVirtualSizeHints, 1}},
+ {1310, {wxSizer, show_2_2, 2}},
+ {1311, {wxSizer, show_2_1, 2}},
+ {1312, {wxSizer, show_2_0, 2}},
+ {1313, {wxSizer, show_1, 1}},
+ {1314, {wxSizerFlags, new, 1}},
+ {1315, {wxSizerFlags, align, 1}},
+ {1316, {wxSizerFlags, border_2, 2}},
+ {1317, {wxSizerFlags, border_1, 1}},
+ {1318, {wxSizerFlags, center, 0}},
+ {1319, {wxSizerFlags, centre, 0}},
+ {1320, {wxSizerFlags, expand, 0}},
+ {1321, {wxSizerFlags, left, 0}},
+ {1322, {wxSizerFlags, proportion, 1}},
+ {1323, {wxSizerFlags, right, 0}},
+ {1324, {wxSizerFlags, 'Destroy', undefined}},
+ {1325, {wxSizerItem, new_5_1, 5}},
+ {1326, {wxSizerItem, new_2_1, 2}},
+ {1327, {wxSizerItem, new_5_0, 5}},
+ {1328, {wxSizerItem, new_2_0, 2}},
+ {1329, {wxSizerItem, new_6, 6}},
+ {1330, {wxSizerItem, new_3, 3}},
+ {1331, {wxSizerItem, new_0, 0}},
+ {1332, {wxSizerItem, destruct, 0}},
+ {1333, {wxSizerItem, calcMin, 0}},
+ {1334, {wxSizerItem, deleteWindows, 0}},
+ {1335, {wxSizerItem, detachSizer, 0}},
+ {1336, {wxSizerItem, getBorder, 0}},
+ {1337, {wxSizerItem, getFlag, 0}},
+ {1338, {wxSizerItem, getMinSize, 0}},
+ {1339, {wxSizerItem, getPosition, 0}},
+ {1340, {wxSizerItem, getProportion, 0}},
+ {1341, {wxSizerItem, getRatio, 0}},
+ {1342, {wxSizerItem, getRect, 0}},
+ {1343, {wxSizerItem, getSize, 0}},
+ {1344, {wxSizerItem, getSizer, 0}},
+ {1345, {wxSizerItem, getSpacer, 0}},
+ {1346, {wxSizerItem, getUserData, 0}},
+ {1347, {wxSizerItem, getWindow, 0}},
+ {1348, {wxSizerItem, isSizer, 0}},
+ {1349, {wxSizerItem, isShown, 0}},
+ {1350, {wxSizerItem, isSpacer, 0}},
+ {1351, {wxSizerItem, isWindow, 0}},
+ {1352, {wxSizerItem, setBorder, 1}},
+ {1353, {wxSizerItem, setDimension, 2}},
+ {1354, {wxSizerItem, setFlag, 1}},
+ {1355, {wxSizerItem, setInitSize, 2}},
+ {1356, {wxSizerItem, setMinSize_1, 1}},
+ {1357, {wxSizerItem, setMinSize_2, 2}},
+ {1358, {wxSizerItem, setProportion, 1}},
+ {1359, {wxSizerItem, setRatio_2, 2}},
+ {1360, {wxSizerItem, setRatio_1_1, 1}},
+ {1361, {wxSizerItem, setRatio_1_0, 1}},
+ {1362, {wxSizerItem, setSizer, 1}},
+ {1363, {wxSizerItem, setSpacer_1, 1}},
+ {1364, {wxSizerItem, setSpacer_2, 2}},
+ {1365, {wxSizerItem, setWindow, 1}},
+ {1366, {wxSizerItem, show, 1}},
+ {1367, {wxBoxSizer, new, 1}},
+ {1368, {wxBoxSizer, getOrientation, 0}},
+ {1369, {wxBoxSizer, 'Destroy', undefined}},
+ {1370, {wxStaticBoxSizer, new_2, 2}},
+ {1371, {wxStaticBoxSizer, new_3, 3}},
+ {1372, {wxStaticBoxSizer, getStaticBox, 0}},
+ {1373, {wxStaticBoxSizer, 'Destroy', undefined}},
+ {1374, {wxGridSizer, new_4, 4}},
+ {1375, {wxGridSizer, new_2, 2}},
+ {1376, {wxGridSizer, getCols, 0}},
+ {1377, {wxGridSizer, getHGap, 0}},
+ {1378, {wxGridSizer, getRows, 0}},
+ {1379, {wxGridSizer, getVGap, 0}},
+ {1380, {wxGridSizer, setCols, 1}},
+ {1381, {wxGridSizer, setHGap, 1}},
+ {1382, {wxGridSizer, setRows, 1}},
+ {1383, {wxGridSizer, setVGap, 1}},
+ {1384, {wxGridSizer, 'Destroy', undefined}},
+ {1385, {wxFlexGridSizer, new_4, 4}},
+ {1386, {wxFlexGridSizer, new_2, 2}},
+ {1387, {wxFlexGridSizer, addGrowableCol, 2}},
+ {1388, {wxFlexGridSizer, addGrowableRow, 2}},
+ {1389, {wxFlexGridSizer, getFlexibleDirection, 0}},
+ {1390, {wxFlexGridSizer, getNonFlexibleGrowMode, 0}},
+ {1391, {wxFlexGridSizer, removeGrowableCol, 1}},
+ {1392, {wxFlexGridSizer, removeGrowableRow, 1}},
+ {1393, {wxFlexGridSizer, setFlexibleDirection, 1}},
+ {1394, {wxFlexGridSizer, setNonFlexibleGrowMode, 1}},
+ {1395, {wxFlexGridSizer, 'Destroy', undefined}},
+ {1396, {wxGridBagSizer, new, 1}},
+ {1397, {wxGridBagSizer, add_3_2, 3}},
+ {1398, {wxGridBagSizer, add_3_1, 3}},
+ {1399, {wxGridBagSizer, add_4, 4}},
+ {1400, {wxGridBagSizer, add_1_0, 1}},
+ {1401, {wxGridBagSizer, add_2_1, 2}},
+ {1402, {wxGridBagSizer, add_2_0, 2}},
+ {1403, {wxGridBagSizer, add_3_0, 3}},
+ {1404, {wxGridBagSizer, add_1_1, 1}},
+ {1405, {wxGridBagSizer, calcMin, 0}},
+ {1406, {wxGridBagSizer, checkForIntersection_2, 2}},
+ {1407, {wxGridBagSizer, checkForIntersection_3, 3}},
+ {1408, {wxGridBagSizer, findItem_1_1, 1}},
+ {1409, {wxGridBagSizer, findItem_1_0, 1}},
+ {1410, {wxGridBagSizer, findItemAtPoint, 1}},
+ {1411, {wxGridBagSizer, findItemAtPosition, 1}},
+ {1412, {wxGridBagSizer, findItemWithData, 1}},
+ {1413, {wxGridBagSizer, getCellSize, 2}},
+ {1414, {wxGridBagSizer, getEmptyCellSize, 0}},
+ {1415, {wxGridBagSizer, getItemPosition_1_2, 1}},
+ {1416, {wxGridBagSizer, getItemPosition_1_1, 1}},
+ {1417, {wxGridBagSizer, getItemPosition_1_0, 1}},
+ {1418, {wxGridBagSizer, getItemSpan_1_2, 1}},
+ {1419, {wxGridBagSizer, getItemSpan_1_1, 1}},
+ {1420, {wxGridBagSizer, getItemSpan_1_0, 1}},
+ {1421, {wxGridBagSizer, setEmptyCellSize, 1}},
+ {1422, {wxGridBagSizer, setItemPosition_2_2, 2}},
+ {1423, {wxGridBagSizer, setItemPosition_2_1, 2}},
+ {1424, {wxGridBagSizer, setItemPosition_2_0, 2}},
+ {1425, {wxGridBagSizer, setItemSpan_2_2, 2}},
+ {1426, {wxGridBagSizer, setItemSpan_2_1, 2}},
+ {1427, {wxGridBagSizer, setItemSpan_2_0, 2}},
+ {1428, {wxGridBagSizer, 'Destroy', undefined}},
+ {1429, {wxStdDialogButtonSizer, new, 0}},
+ {1430, {wxStdDialogButtonSizer, addButton, 1}},
+ {1431, {wxStdDialogButtonSizer, realize, 0}},
+ {1432, {wxStdDialogButtonSizer, setAffirmativeButton, 1}},
+ {1433, {wxStdDialogButtonSizer, setCancelButton, 1}},
+ {1434, {wxStdDialogButtonSizer, setNegativeButton, 1}},
+ {1435, {wxStdDialogButtonSizer, 'Destroy', undefined}},
+ {1436, {wxFont, new_0, 0}},
+ {1437, {wxFont, new_1, 1}},
+ {1438, {wxFont, new_5, 5}},
+ {1440, {wxFont, destruct, 0}},
+ {1441, {wxFont, isFixedWidth, 0}},
+ {1442, {wxFont, getDefaultEncoding, 0}},
+ {1443, {wxFont, getFaceName, 0}},
+ {1444, {wxFont, getFamily, 0}},
+ {1445, {wxFont, getNativeFontInfoDesc, 0}},
+ {1446, {wxFont, getNativeFontInfoUserDesc, 0}},
+ {1447, {wxFont, getPointSize, 0}},
+ {1448, {wxFont, getStyle, 0}},
+ {1449, {wxFont, getUnderlined, 0}},
+ {1450, {wxFont, getWeight, 0}},
+ {1451, {wxFont, ok, 0}},
+ {1452, {wxFont, setDefaultEncoding, 1}},
+ {1453, {wxFont, setFaceName, 1}},
+ {1454, {wxFont, setFamily, 1}},
+ {1455, {wxFont, setPointSize, 1}},
+ {1456, {wxFont, setStyle, 1}},
+ {1457, {wxFont, setUnderlined, 1}},
+ {1458, {wxFont, setWeight, 1}},
+ {1459, {wxToolTip, enable, 1}},
+ {1460, {wxToolTip, setDelay, 1}},
+ {1461, {wxToolTip, new, 1}},
+ {1462, {wxToolTip, setTip, 1}},
+ {1463, {wxToolTip, getTip, 0}},
+ {1464, {wxToolTip, getWindow, 0}},
+ {1465, {wxToolTip, 'Destroy', undefined}},
+ {1467, {wxButton, new_3, 3}},
+ {1468, {wxButton, new_0, 0}},
+ {1469, {wxButton, destruct, 0}},
+ {1470, {wxButton, create, 3}},
+ {1471, {wxButton, getDefaultSize, 0}},
+ {1472, {wxButton, setDefault, 0}},
+ {1473, {wxButton, setLabel, 1}},
+ {1475, {wxBitmapButton, new_4, 4}},
+ {1476, {wxBitmapButton, new_0, 0}},
+ {1477, {wxBitmapButton, create, 4}},
+ {1478, {wxBitmapButton, getBitmapDisabled, 0}},
+ {1480, {wxBitmapButton, getBitmapFocus, 0}},
+ {1482, {wxBitmapButton, getBitmapLabel, 0}},
+ {1484, {wxBitmapButton, getBitmapSelected, 0}},
+ {1486, {wxBitmapButton, setBitmapDisabled, 1}},
+ {1487, {wxBitmapButton, setBitmapFocus, 1}},
+ {1488, {wxBitmapButton, setBitmapLabel, 1}},
+ {1489, {wxBitmapButton, setBitmapSelected, 1}},
+ {1490, {wxBitmapButton, 'Destroy', undefined}},
+ {1491, {wxToggleButton, new_0, 0}},
+ {1492, {wxToggleButton, new_4, 4}},
+ {1493, {wxToggleButton, create, 4}},
+ {1494, {wxToggleButton, getValue, 0}},
+ {1495, {wxToggleButton, setValue, 1}},
+ {1496, {wxToggleButton, 'Destroy', undefined}},
+ {1497, {wxCalendarCtrl, new_0, 0}},
+ {1498, {wxCalendarCtrl, new_3, 3}},
+ {1499, {wxCalendarCtrl, create, 3}},
+ {1500, {wxCalendarCtrl, destruct, 0}},
+ {1501, {wxCalendarCtrl, setDate, 1}},
+ {1502, {wxCalendarCtrl, getDate, 0}},
+ {1503, {wxCalendarCtrl, enableYearChange, 1}},
+ {1504, {wxCalendarCtrl, enableMonthChange, 1}},
+ {1505, {wxCalendarCtrl, enableHolidayDisplay, 1}},
+ {1506, {wxCalendarCtrl, setHeaderColours, 2}},
+ {1507, {wxCalendarCtrl, getHeaderColourFg, 0}},
+ {1508, {wxCalendarCtrl, getHeaderColourBg, 0}},
+ {1509, {wxCalendarCtrl, setHighlightColours, 2}},
+ {1510, {wxCalendarCtrl, getHighlightColourFg, 0}},
+ {1511, {wxCalendarCtrl, getHighlightColourBg, 0}},
+ {1512, {wxCalendarCtrl, setHolidayColours, 2}},
+ {1513, {wxCalendarCtrl, getHolidayColourFg, 0}},
+ {1514, {wxCalendarCtrl, getHolidayColourBg, 0}},
+ {1515, {wxCalendarCtrl, getAttr, 1}},
+ {1516, {wxCalendarCtrl, setAttr, 2}},
+ {1517, {wxCalendarCtrl, setHoliday, 1}},
+ {1518, {wxCalendarCtrl, resetAttr, 1}},
+ {1519, {wxCalendarCtrl, hitTest, 2}},
+ {1520, {wxCalendarDateAttr, new_0, 0}},
+ {1521, {wxCalendarDateAttr, new_2_1, 2}},
+ {1522, {wxCalendarDateAttr, new_2_0, 2}},
+ {1523, {wxCalendarDateAttr, setTextColour, 1}},
+ {1524, {wxCalendarDateAttr, setBackgroundColour, 1}},
+ {1525, {wxCalendarDateAttr, setBorderColour, 1}},
+ {1526, {wxCalendarDateAttr, setFont, 1}},
+ {1527, {wxCalendarDateAttr, setBorder, 1}},
+ {1528, {wxCalendarDateAttr, setHoliday, 1}},
+ {1529, {wxCalendarDateAttr, hasTextColour, 0}},
+ {1530, {wxCalendarDateAttr, hasBackgroundColour, 0}},
+ {1531, {wxCalendarDateAttr, hasBorderColour, 0}},
+ {1532, {wxCalendarDateAttr, hasFont, 0}},
+ {1533, {wxCalendarDateAttr, hasBorder, 0}},
+ {1534, {wxCalendarDateAttr, isHoliday, 0}},
+ {1535, {wxCalendarDateAttr, getTextColour, 0}},
+ {1536, {wxCalendarDateAttr, getBackgroundColour, 0}},
+ {1537, {wxCalendarDateAttr, getBorderColour, 0}},
+ {1538, {wxCalendarDateAttr, getFont, 0}},
+ {1539, {wxCalendarDateAttr, getBorder, 0}},
+ {1540, {wxCalendarDateAttr, 'Destroy', undefined}},
+ {1542, {wxCheckBox, new_4, 4}},
+ {1543, {wxCheckBox, new_0, 0}},
+ {1544, {wxCheckBox, create, 4}},
+ {1545, {wxCheckBox, getValue, 0}},
+ {1546, {wxCheckBox, get3StateValue, 0}},
+ {1547, {wxCheckBox, is3rdStateAllowedForUser, 0}},
+ {1548, {wxCheckBox, is3State, 0}},
+ {1549, {wxCheckBox, isChecked, 0}},
+ {1550, {wxCheckBox, setValue, 1}},
+ {1551, {wxCheckBox, set3StateValue, 1}},
+ {1552, {wxCheckBox, 'Destroy', undefined}},
+ {1553, {wxCheckListBox, new_0, 0}},
+ {1555, {wxCheckListBox, new_3, 3}},
+ {1556, {wxCheckListBox, check, 2}},
+ {1557, {wxCheckListBox, isChecked, 1}},
+ {1558, {wxCheckListBox, 'Destroy', undefined}},
+ {1561, {wxChoice, new_3, 3}},
+ {1562, {wxChoice, new_0, 0}},
+ {1564, {wxChoice, destruct, 0}},
+ {1566, {wxChoice, create, 6}},
+ {1567, {wxChoice, delete, 1}},
+ {1568, {wxChoice, getColumns, 0}},
+ {1569, {wxChoice, setColumns, 1}},
+ {1570, {wxComboBox, new_0, 0}},
+ {1572, {wxComboBox, new_3, 3}},
+ {1573, {wxComboBox, destruct, 0}},
+ {1575, {wxComboBox, create, 7}},
+ {1576, {wxComboBox, canCopy, 0}},
+ {1577, {wxComboBox, canCut, 0}},
+ {1578, {wxComboBox, canPaste, 0}},
+ {1579, {wxComboBox, canRedo, 0}},
+ {1580, {wxComboBox, canUndo, 0}},
+ {1581, {wxComboBox, copy, 0}},
+ {1582, {wxComboBox, cut, 0}},
+ {1583, {wxComboBox, getInsertionPoint, 0}},
+ {1584, {wxComboBox, getLastPosition, 0}},
+ {1585, {wxComboBox, getValue, 0}},
+ {1586, {wxComboBox, paste, 0}},
+ {1587, {wxComboBox, redo, 0}},
+ {1588, {wxComboBox, replace, 3}},
+ {1589, {wxComboBox, remove, 2}},
+ {1590, {wxComboBox, setInsertionPoint, 1}},
+ {1591, {wxComboBox, setInsertionPointEnd, 0}},
+ {1592, {wxComboBox, setSelection_1, 1}},
+ {1593, {wxComboBox, setSelection_2, 2}},
+ {1594, {wxComboBox, setValue, 1}},
+ {1595, {wxComboBox, undo, 0}},
+ {1596, {wxGauge, new_0, 0}},
+ {1597, {wxGauge, new_4, 4}},
+ {1598, {wxGauge, create, 4}},
+ {1599, {wxGauge, getBezelFace, 0}},
+ {1600, {wxGauge, getRange, 0}},
+ {1601, {wxGauge, getShadowWidth, 0}},
+ {1602, {wxGauge, getValue, 0}},
+ {1603, {wxGauge, isVertical, 0}},
+ {1604, {wxGauge, setBezelFace, 1}},
+ {1605, {wxGauge, setRange, 1}},
+ {1606, {wxGauge, setShadowWidth, 1}},
+ {1607, {wxGauge, setValue, 1}},
+ {1608, {wxGauge, pulse, 0}},
+ {1609, {wxGauge, 'Destroy', undefined}},
+ {1610, {wxGenericDirCtrl, new_0, 0}},
+ {1611, {wxGenericDirCtrl, new_2, 2}},
+ {1612, {wxGenericDirCtrl, destruct, 0}},
+ {1613, {wxGenericDirCtrl, create, 2}},
+ {1614, {wxGenericDirCtrl, init, 0}},
+ {1615, {wxGenericDirCtrl, collapseTree, 0}},
+ {1616, {wxGenericDirCtrl, expandPath, 1}},
+ {1617, {wxGenericDirCtrl, getDefaultPath, 0}},
+ {1618, {wxGenericDirCtrl, getPath, 0}},
+ {1619, {wxGenericDirCtrl, getFilePath, 0}},
+ {1620, {wxGenericDirCtrl, getFilter, 0}},
+ {1621, {wxGenericDirCtrl, getFilterIndex, 0}},
+ {1622, {wxGenericDirCtrl, getRootId, 0}},
+ {1623, {wxGenericDirCtrl, getTreeCtrl, 0}},
+ {1624, {wxGenericDirCtrl, reCreateTree, 0}},
+ {1625, {wxGenericDirCtrl, setDefaultPath, 1}},
+ {1626, {wxGenericDirCtrl, setFilter, 1}},
+ {1627, {wxGenericDirCtrl, setFilterIndex, 1}},
+ {1628, {wxGenericDirCtrl, setPath, 1}},
+ {1630, {wxStaticBox, new_4, 4}},
+ {1631, {wxStaticBox, new_0, 0}},
+ {1632, {wxStaticBox, create, 4}},
+ {1633, {wxStaticBox, 'Destroy', undefined}},
+ {1635, {wxStaticLine, new_2, 2}},
+ {1636, {wxStaticLine, new_0, 0}},
+ {1637, {wxStaticLine, create, 2}},
+ {1638, {wxStaticLine, isVertical, 0}},
+ {1639, {wxStaticLine, getDefaultSize, 0}},
+ {1640, {wxStaticLine, 'Destroy', undefined}},
+ {1643, {wxListBox, new_3, 3}},
+ {1644, {wxListBox, new_0, 0}},
+ {1646, {wxListBox, destruct, 0}},
+ {1648, {wxListBox, create, 6}},
+ {1649, {wxListBox, deselect, 1}},
+ {1650, {wxListBox, getSelections, 1}},
+ {1651, {wxListBox, insertItems, 2}},
+ {1652, {wxListBox, isSelected, 1}},
+ {1653, {wxListBox, set, 1}},
  {1654, {wxListBox, hitTest, 1}},
  {1655, {wxListBox, setFirstItem_1_0, 1}},
  {1656, {wxListBox, setFirstItem_1_1, 1}},
diff --git a/lib/wx/src/gen/wxe_funcs.hrl b/lib/wx/src/gen/wxe_funcs.hrl
index b6e507b11d..109368adb3 100644
--- a/lib/wx/src/gen/wxe_funcs.hrl
+++ b/lib/wx/src/gen/wxe_funcs.hrl
@@ -238,1262 +238,1263 @@
 -define(wxPanel_new_2, 334).
 -define(wxPanel_destruct, 335).
 -define(wxPanel_InitDialog, 336).
--define(wxScrolledWindow_new_0, 337).
--define(wxScrolledWindow_new_2, 338).
--define(wxScrolledWindow_destruct, 339).
--define(wxScrolledWindow_CalcScrolledPosition_4, 340).
--define(wxScrolledWindow_CalcScrolledPosition_1, 341).
--define(wxScrolledWindow_CalcUnscrolledPosition_4, 342).
--define(wxScrolledWindow_CalcUnscrolledPosition_1, 343).
--define(wxScrolledWindow_EnableScrolling, 344).
--define(wxScrolledWindow_GetScrollPixelsPerUnit, 345).
--define(wxScrolledWindow_GetViewStart, 346).
--define(wxScrolledWindow_DoPrepareDC, 347).
--define(wxScrolledWindow_PrepareDC, 348).
--define(wxScrolledWindow_Scroll, 349).
--define(wxScrolledWindow_SetScrollbars, 350).
--define(wxScrolledWindow_SetScrollRate, 351).
--define(wxScrolledWindow_SetTargetWindow, 352).
--define(wxSashWindow_new_0, 353).
--define(wxSashWindow_new_2, 354).
--define(wxSashWindow_destruct, 355).
--define(wxSashWindow_GetSashVisible, 356).
--define(wxSashWindow_GetMaximumSizeX, 357).
--define(wxSashWindow_GetMaximumSizeY, 358).
--define(wxSashWindow_GetMinimumSizeX, 359).
--define(wxSashWindow_GetMinimumSizeY, 360).
--define(wxSashWindow_SetMaximumSizeX, 361).
--define(wxSashWindow_SetMaximumSizeY, 362).
--define(wxSashWindow_SetMinimumSizeX, 363).
--define(wxSashWindow_SetMinimumSizeY, 364).
--define(wxSashWindow_SetSashVisible, 365).
--define(wxSashLayoutWindow_new_0, 366).
--define(wxSashLayoutWindow_new_2, 367).
--define(wxSashLayoutWindow_Create, 368).
--define(wxSashLayoutWindow_GetAlignment, 369).
--define(wxSashLayoutWindow_GetOrientation, 370).
--define(wxSashLayoutWindow_SetAlignment, 371).
--define(wxSashLayoutWindow_SetDefaultSize, 372).
--define(wxSashLayoutWindow_SetOrientation, 373).
--define(wxSashLayoutWindow_destroy, 374).
--define(wxGrid_new_0, 375).
--define(wxGrid_new_3, 376).
--define(wxGrid_new_4, 377).
--define(wxGrid_destruct, 378).
--define(wxGrid_AppendCols, 379).
--define(wxGrid_AppendRows, 380).
--define(wxGrid_AutoSize, 381).
--define(wxGrid_AutoSizeColumn, 382).
--define(wxGrid_AutoSizeColumns, 383).
--define(wxGrid_AutoSizeRow, 384).
--define(wxGrid_AutoSizeRows, 385).
--define(wxGrid_BeginBatch, 386).
--define(wxGrid_BlockToDeviceRect, 387).
--define(wxGrid_CanDragColSize, 388).
--define(wxGrid_CanDragRowSize, 389).
--define(wxGrid_CanDragGridSize, 390).
--define(wxGrid_CanEnableCellControl, 391).
--define(wxGrid_CellToRect_2, 392).
--define(wxGrid_CellToRect_1, 393).
--define(wxGrid_ClearGrid, 394).
--define(wxGrid_ClearSelection, 395).
--define(wxGrid_CreateGrid, 396).
--define(wxGrid_DeleteCols, 397).
--define(wxGrid_DeleteRows, 398).
--define(wxGrid_DisableCellEditControl, 399).
--define(wxGrid_DisableDragColSize, 400).
--define(wxGrid_DisableDragGridSize, 401).
--define(wxGrid_DisableDragRowSize, 402).
--define(wxGrid_EnableCellEditControl, 403).
--define(wxGrid_EnableDragColSize, 404).
--define(wxGrid_EnableDragGridSize, 405).
--define(wxGrid_EnableDragRowSize, 406).
--define(wxGrid_EnableEditing, 407).
--define(wxGrid_EnableGridLines, 408).
--define(wxGrid_EndBatch, 409).
--define(wxGrid_Fit, 410).
--define(wxGrid_ForceRefresh, 411).
--define(wxGrid_GetBatchCount, 412).
--define(wxGrid_GetCellAlignment, 413).
--define(wxGrid_GetCellBackgroundColour, 414).
--define(wxGrid_GetCellEditor, 415).
--define(wxGrid_GetCellFont, 416).
--define(wxGrid_GetCellRenderer, 417).
--define(wxGrid_GetCellTextColour, 418).
--define(wxGrid_GetCellValue_2, 419).
--define(wxGrid_GetCellValue_1, 420).
--define(wxGrid_GetColLabelAlignment, 421).
--define(wxGrid_GetColLabelSize, 422).
--define(wxGrid_GetColLabelValue, 423).
--define(wxGrid_GetColMinimalAcceptableWidth, 424).
--define(wxGrid_GetDefaultCellAlignment, 425).
--define(wxGrid_GetDefaultCellBackgroundColour, 426).
--define(wxGrid_GetDefaultCellFont, 427).
--define(wxGrid_GetDefaultCellTextColour, 428).
--define(wxGrid_GetDefaultColLabelSize, 429).
--define(wxGrid_GetDefaultColSize, 430).
--define(wxGrid_GetDefaultEditor, 431).
--define(wxGrid_GetDefaultEditorForCell_2, 432).
--define(wxGrid_GetDefaultEditorForCell_1, 433).
--define(wxGrid_GetDefaultEditorForType, 434).
--define(wxGrid_GetDefaultRenderer, 435).
--define(wxGrid_GetDefaultRendererForCell, 436).
--define(wxGrid_GetDefaultRendererForType, 437).
--define(wxGrid_GetDefaultRowLabelSize, 438).
--define(wxGrid_GetDefaultRowSize, 439).
--define(wxGrid_GetGridCursorCol, 440).
--define(wxGrid_GetGridCursorRow, 441).
--define(wxGrid_GetGridLineColour, 442).
--define(wxGrid_GridLinesEnabled, 443).
--define(wxGrid_GetLabelBackgroundColour, 444).
--define(wxGrid_GetLabelFont, 445).
--define(wxGrid_GetLabelTextColour, 446).
--define(wxGrid_GetNumberCols, 447).
--define(wxGrid_GetNumberRows, 448).
--define(wxGrid_GetOrCreateCellAttr, 449).
--define(wxGrid_GetRowMinimalAcceptableHeight, 450).
--define(wxGrid_GetRowLabelAlignment, 451).
--define(wxGrid_GetRowLabelSize, 452).
--define(wxGrid_GetRowLabelValue, 453).
--define(wxGrid_GetRowSize, 454).
--define(wxGrid_GetScrollLineX, 455).
--define(wxGrid_GetScrollLineY, 456).
--define(wxGrid_GetSelectedCells, 457).
--define(wxGrid_GetSelectedCols, 458).
--define(wxGrid_GetSelectedRows, 459).
--define(wxGrid_GetSelectionBackground, 460).
--define(wxGrid_GetSelectionBlockTopLeft, 461).
--define(wxGrid_GetSelectionBlockBottomRight, 462).
--define(wxGrid_GetSelectionForeground, 463).
--define(wxGrid_GetViewWidth, 464).
--define(wxGrid_GetGridWindow, 465).
--define(wxGrid_GetGridRowLabelWindow, 466).
--define(wxGrid_GetGridColLabelWindow, 467).
--define(wxGrid_GetGridCornerLabelWindow, 468).
--define(wxGrid_HideCellEditControl, 469).
--define(wxGrid_InsertCols, 470).
--define(wxGrid_InsertRows, 471).
--define(wxGrid_IsCellEditControlEnabled, 472).
--define(wxGrid_IsCurrentCellReadOnly, 473).
--define(wxGrid_IsEditable, 474).
--define(wxGrid_IsInSelection_2, 475).
--define(wxGrid_IsInSelection_1, 476).
--define(wxGrid_IsReadOnly, 477).
--define(wxGrid_IsSelection, 478).
--define(wxGrid_IsVisible_3, 479).
--define(wxGrid_IsVisible_2, 480).
--define(wxGrid_MakeCellVisible_2, 481).
--define(wxGrid_MakeCellVisible_1, 482).
--define(wxGrid_MoveCursorDown, 483).
--define(wxGrid_MoveCursorLeft, 484).
--define(wxGrid_MoveCursorRight, 485).
--define(wxGrid_MoveCursorUp, 486).
--define(wxGrid_MoveCursorDownBlock, 487).
--define(wxGrid_MoveCursorLeftBlock, 488).
--define(wxGrid_MoveCursorRightBlock, 489).
--define(wxGrid_MoveCursorUpBlock, 490).
--define(wxGrid_MovePageDown, 491).
--define(wxGrid_MovePageUp, 492).
--define(wxGrid_RegisterDataType, 493).
--define(wxGrid_SaveEditControlValue, 494).
--define(wxGrid_SelectAll, 495).
--define(wxGrid_SelectBlock_5, 496).
--define(wxGrid_SelectBlock_3, 497).
--define(wxGrid_SelectCol, 498).
--define(wxGrid_SelectRow, 499).
--define(wxGrid_SetCellAlignment_4, 500).
--define(wxGrid_SetCellAlignment_3, 501).
--define(wxGrid_SetCellAlignment_1, 502).
--define(wxGrid_SetCellBackgroundColour_3_0, 503).
--define(wxGrid_SetCellBackgroundColour_1, 504).
--define(wxGrid_SetCellBackgroundColour_3_1, 505).
--define(wxGrid_SetCellEditor, 506).
--define(wxGrid_SetCellFont, 507).
--define(wxGrid_SetCellRenderer, 508).
--define(wxGrid_SetCellTextColour_3_0, 509).
--define(wxGrid_SetCellTextColour_3_1, 510).
--define(wxGrid_SetCellTextColour_1, 511).
--define(wxGrid_SetCellValue_3_0, 512).
--define(wxGrid_SetCellValue_2, 513).
--define(wxGrid_SetCellValue_3_1, 514).
--define(wxGrid_SetColAttr, 515).
--define(wxGrid_SetColFormatBool, 516).
--define(wxGrid_SetColFormatNumber, 517).
--define(wxGrid_SetColFormatFloat, 518).
--define(wxGrid_SetColFormatCustom, 519).
--define(wxGrid_SetColLabelAlignment, 520).
--define(wxGrid_SetColLabelSize, 521).
--define(wxGrid_SetColLabelValue, 522).
--define(wxGrid_SetColMinimalWidth, 523).
--define(wxGrid_SetColMinimalAcceptableWidth, 524).
--define(wxGrid_SetColSize, 525).
--define(wxGrid_SetDefaultCellAlignment, 526).
--define(wxGrid_SetDefaultCellBackgroundColour, 527).
--define(wxGrid_SetDefaultCellFont, 528).
--define(wxGrid_SetDefaultCellTextColour, 529).
--define(wxGrid_SetDefaultEditor, 530).
--define(wxGrid_SetDefaultRenderer, 531).
--define(wxGrid_SetDefaultColSize, 532).
--define(wxGrid_SetDefaultRowSize, 533).
--define(wxGrid_SetGridCursor, 534).
--define(wxGrid_SetGridLineColour, 535).
--define(wxGrid_SetLabelBackgroundColour, 536).
--define(wxGrid_SetLabelFont, 537).
--define(wxGrid_SetLabelTextColour, 538).
--define(wxGrid_SetMargins, 539).
--define(wxGrid_SetReadOnly, 540).
--define(wxGrid_SetRowAttr, 541).
--define(wxGrid_SetRowLabelAlignment, 542).
--define(wxGrid_SetRowLabelSize, 543).
--define(wxGrid_SetRowLabelValue, 544).
--define(wxGrid_SetRowMinimalHeight, 545).
--define(wxGrid_SetRowMinimalAcceptableHeight, 546).
--define(wxGrid_SetRowSize, 547).
--define(wxGrid_SetScrollLineX, 548).
--define(wxGrid_SetScrollLineY, 549).
--define(wxGrid_SetSelectionBackground, 550).
--define(wxGrid_SetSelectionForeground, 551).
--define(wxGrid_SetSelectionMode, 552).
--define(wxGrid_ShowCellEditControl, 553).
--define(wxGrid_XToCol, 554).
--define(wxGrid_XToEdgeOfCol, 555).
--define(wxGrid_YToEdgeOfRow, 556).
--define(wxGrid_YToRow, 557).
--define(wxGridCellRenderer_Draw, 558).
--define(wxGridCellRenderer_GetBestSize, 559).
--define(wxGridCellEditor_Create, 560).
--define(wxGridCellEditor_IsCreated, 561).
--define(wxGridCellEditor_SetSize, 562).
--define(wxGridCellEditor_Show, 563).
--define(wxGridCellEditor_PaintBackground, 564).
--define(wxGridCellEditor_BeginEdit, 565).
--define(wxGridCellEditor_EndEdit, 566).
--define(wxGridCellEditor_Reset, 567).
--define(wxGridCellEditor_StartingKey, 568).
--define(wxGridCellEditor_StartingClick, 569).
--define(wxGridCellEditor_HandleReturn, 570).
--define(wxGridCellBoolRenderer_new, 571).
--define(wxGridCellBoolRenderer_destroy, 572).
--define(wxGridCellBoolEditor_new, 573).
--define(wxGridCellBoolEditor_IsTrueValue, 574).
--define(wxGridCellBoolEditor_UseStringValues, 575).
--define(wxGridCellBoolEditor_destroy, 576).
--define(wxGridCellFloatRenderer_new, 577).
--define(wxGridCellFloatRenderer_GetPrecision, 578).
--define(wxGridCellFloatRenderer_GetWidth, 579).
--define(wxGridCellFloatRenderer_SetParameters, 580).
--define(wxGridCellFloatRenderer_SetPrecision, 581).
--define(wxGridCellFloatRenderer_SetWidth, 582).
--define(wxGridCellFloatRenderer_destroy, 583).
--define(wxGridCellFloatEditor_new, 584).
--define(wxGridCellFloatEditor_SetParameters, 585).
--define(wxGridCellFloatEditor_destroy, 586).
--define(wxGridCellStringRenderer_new, 587).
--define(wxGridCellStringRenderer_destroy, 588).
--define(wxGridCellTextEditor_new, 589).
--define(wxGridCellTextEditor_SetParameters, 590).
--define(wxGridCellTextEditor_destroy, 591).
--define(wxGridCellChoiceEditor_new, 593).
--define(wxGridCellChoiceEditor_SetParameters, 594).
--define(wxGridCellChoiceEditor_destroy, 595).
--define(wxGridCellNumberRenderer_new, 596).
--define(wxGridCellNumberRenderer_destroy, 597).
--define(wxGridCellNumberEditor_new, 598).
--define(wxGridCellNumberEditor_GetValue, 599).
--define(wxGridCellNumberEditor_SetParameters, 600).
--define(wxGridCellNumberEditor_destroy, 601).
--define(wxGridCellAttr_SetTextColour, 602).
--define(wxGridCellAttr_SetBackgroundColour, 603).
--define(wxGridCellAttr_SetFont, 604).
--define(wxGridCellAttr_SetAlignment, 605).
--define(wxGridCellAttr_SetReadOnly, 606).
--define(wxGridCellAttr_SetRenderer, 607).
--define(wxGridCellAttr_SetEditor, 608).
--define(wxGridCellAttr_HasTextColour, 609).
--define(wxGridCellAttr_HasBackgroundColour, 610).
--define(wxGridCellAttr_HasFont, 611).
--define(wxGridCellAttr_HasAlignment, 612).
--define(wxGridCellAttr_HasRenderer, 613).
--define(wxGridCellAttr_HasEditor, 614).
--define(wxGridCellAttr_GetTextColour, 615).
--define(wxGridCellAttr_GetBackgroundColour, 616).
--define(wxGridCellAttr_GetFont, 617).
--define(wxGridCellAttr_GetAlignment, 618).
--define(wxGridCellAttr_GetRenderer, 619).
--define(wxGridCellAttr_GetEditor, 620).
--define(wxGridCellAttr_IsReadOnly, 621).
--define(wxGridCellAttr_SetDefAttr, 622).
--define(wxDC_Blit, 623).
--define(wxDC_CalcBoundingBox, 624).
--define(wxDC_Clear, 625).
--define(wxDC_ComputeScaleAndOrigin, 626).
--define(wxDC_CrossHair, 627).
--define(wxDC_DestroyClippingRegion, 628).
--define(wxDC_DeviceToLogicalX, 629).
--define(wxDC_DeviceToLogicalXRel, 630).
--define(wxDC_DeviceToLogicalY, 631).
--define(wxDC_DeviceToLogicalYRel, 632).
--define(wxDC_DrawArc, 633).
--define(wxDC_DrawBitmap, 634).
--define(wxDC_DrawCheckMark, 635).
--define(wxDC_DrawCircle, 636).
--define(wxDC_DrawEllipse_2, 638).
--define(wxDC_DrawEllipse_1, 639).
--define(wxDC_DrawEllipticArc, 640).
--define(wxDC_DrawIcon, 641).
--define(wxDC_DrawLabel, 642).
--define(wxDC_DrawLine, 643).
--define(wxDC_DrawLines, 644).
--define(wxDC_DrawPolygon, 646).
--define(wxDC_DrawPoint, 648).
--define(wxDC_DrawRectangle_2, 650).
--define(wxDC_DrawRectangle_1, 651).
--define(wxDC_DrawRotatedText, 652).
--define(wxDC_DrawRoundedRectangle_3, 654).
--define(wxDC_DrawRoundedRectangle_2, 655).
--define(wxDC_DrawText, 656).
--define(wxDC_EndDoc, 657).
--define(wxDC_EndPage, 658).
--define(wxDC_FloodFill, 659).
--define(wxDC_GetBackground, 660).
--define(wxDC_GetBackgroundMode, 661).
--define(wxDC_GetBrush, 662).
--define(wxDC_GetCharHeight, 663).
--define(wxDC_GetCharWidth, 664).
--define(wxDC_GetClippingBox, 665).
--define(wxDC_GetFont, 667).
--define(wxDC_GetLayoutDirection, 668).
--define(wxDC_GetLogicalFunction, 669).
--define(wxDC_GetMapMode, 670).
--define(wxDC_GetMultiLineTextExtent_4, 671).
--define(wxDC_GetMultiLineTextExtent_1, 672).
--define(wxDC_GetPartialTextExtents, 673).
--define(wxDC_GetPen, 674).
--define(wxDC_GetPixel, 675).
--define(wxDC_GetPPI, 676).
--define(wxDC_GetSize, 678).
--define(wxDC_GetSizeMM, 680).
--define(wxDC_GetTextBackground, 681).
--define(wxDC_GetTextExtent_4, 682).
--define(wxDC_GetTextExtent_1, 683).
--define(wxDC_GetTextForeground, 685).
--define(wxDC_GetUserScale, 686).
--define(wxDC_GradientFillConcentric_3, 687).
--define(wxDC_GradientFillConcentric_4, 688).
--define(wxDC_GradientFillLinear, 689).
--define(wxDC_LogicalToDeviceX, 690).
--define(wxDC_LogicalToDeviceXRel, 691).
--define(wxDC_LogicalToDeviceY, 692).
--define(wxDC_LogicalToDeviceYRel, 693).
--define(wxDC_MaxX, 694).
--define(wxDC_MaxY, 695).
--define(wxDC_MinX, 696).
--define(wxDC_MinY, 697).
--define(wxDC_IsOk, 698).
--define(wxDC_ResetBoundingBox, 699).
--define(wxDC_SetAxisOrientation, 700).
--define(wxDC_SetBackground, 701).
--define(wxDC_SetBackgroundMode, 702).
--define(wxDC_SetBrush, 703).
--define(wxDC_SetClippingRegion_2, 705).
--define(wxDC_SetClippingRegion_1_1, 706).
--define(wxDC_SetClippingRegion_1_0, 707).
--define(wxDC_SetDeviceOrigin, 708).
--define(wxDC_SetFont, 709).
--define(wxDC_SetLayoutDirection, 710).
--define(wxDC_SetLogicalFunction, 711).
--define(wxDC_SetMapMode, 712).
--define(wxDC_SetPalette, 713).
--define(wxDC_SetPen, 714).
--define(wxDC_SetTextBackground, 715).
--define(wxDC_SetTextForeground, 716).
--define(wxDC_SetUserScale, 717).
--define(wxDC_StartDoc, 718).
--define(wxDC_StartPage, 719).
--define(wxMirrorDC_new, 720).
--define(wxMirrorDC_destroy, 721).
--define(wxScreenDC_new, 722).
--define(wxScreenDC_destruct, 723).
--define(wxPostScriptDC_new_0, 724).
--define(wxPostScriptDC_new_1, 725).
--define(wxPostScriptDC_destruct, 726).
--define(wxPostScriptDC_SetResolution, 727).
--define(wxPostScriptDC_GetResolution, 728).
--define(wxWindowDC_new_0, 729).
--define(wxWindowDC_new_1, 730).
--define(wxWindowDC_destruct, 731).
--define(wxClientDC_new_0, 732).
--define(wxClientDC_new_1, 733).
--define(wxClientDC_destroy, 734).
--define(wxPaintDC_new_0, 735).
--define(wxPaintDC_new_1, 736).
--define(wxPaintDC_destroy, 737).
--define(wxMemoryDC_new_1_0, 739).
--define(wxMemoryDC_new_1_1, 740).
--define(wxMemoryDC_new_0, 741).
--define(wxMemoryDC_destruct, 743).
--define(wxMemoryDC_SelectObject, 744).
--define(wxMemoryDC_SelectObjectAsSource, 745).
--define(wxBufferedDC_new_0, 746).
--define(wxBufferedDC_new_2, 747).
--define(wxBufferedDC_new_3, 748).
--define(wxBufferedDC_destruct, 749).
--define(wxBufferedDC_Init_2, 750).
--define(wxBufferedDC_Init_3, 751).
--define(wxBufferedPaintDC_new_3, 752).
--define(wxBufferedPaintDC_new_2, 753).
--define(wxBufferedPaintDC_destruct, 754).
--define(wxGraphicsObject_destruct, 755).
--define(wxGraphicsObject_GetRenderer, 756).
--define(wxGraphicsObject_IsNull, 757).
--define(wxGraphicsContext_destruct, 758).
--define(wxGraphicsContext_Create_1_1, 759).
--define(wxGraphicsContext_Create_1_0, 760).
--define(wxGraphicsContext_Create_0, 761).
--define(wxGraphicsContext_CreatePen, 762).
--define(wxGraphicsContext_CreateBrush, 763).
--define(wxGraphicsContext_CreateRadialGradientBrush, 764).
--define(wxGraphicsContext_CreateLinearGradientBrush, 765).
--define(wxGraphicsContext_CreateFont, 766).
--define(wxGraphicsContext_CreateMatrix, 767).
--define(wxGraphicsContext_CreatePath, 768).
--define(wxGraphicsContext_Clip_1, 769).
--define(wxGraphicsContext_Clip_4, 770).
--define(wxGraphicsContext_ResetClip, 771).
--define(wxGraphicsContext_DrawBitmap, 772).
--define(wxGraphicsContext_DrawEllipse, 773).
--define(wxGraphicsContext_DrawIcon, 774).
--define(wxGraphicsContext_DrawLines, 775).
--define(wxGraphicsContext_DrawPath, 776).
--define(wxGraphicsContext_DrawRectangle, 777).
--define(wxGraphicsContext_DrawRoundedRectangle, 778).
--define(wxGraphicsContext_DrawText_3, 779).
--define(wxGraphicsContext_DrawText_4_0, 780).
--define(wxGraphicsContext_DrawText_4_1, 781).
--define(wxGraphicsContext_DrawText_5, 782).
--define(wxGraphicsContext_FillPath, 783).
--define(wxGraphicsContext_StrokePath, 784).
--define(wxGraphicsContext_GetPartialTextExtents, 785).
--define(wxGraphicsContext_GetTextExtent, 786).
--define(wxGraphicsContext_Rotate, 787).
--define(wxGraphicsContext_Scale, 788).
--define(wxGraphicsContext_Translate, 789).
--define(wxGraphicsContext_GetTransform, 790).
--define(wxGraphicsContext_SetTransform, 791).
--define(wxGraphicsContext_ConcatTransform, 792).
--define(wxGraphicsContext_SetBrush_1_1, 793).
--define(wxGraphicsContext_SetBrush_1_0, 794).
--define(wxGraphicsContext_SetFont_1, 795).
--define(wxGraphicsContext_SetFont_2, 796).
--define(wxGraphicsContext_SetPen_1_0, 797).
--define(wxGraphicsContext_SetPen_1_1, 798).
--define(wxGraphicsContext_StrokeLine, 799).
--define(wxGraphicsContext_StrokeLines, 800).
--define(wxGraphicsMatrix_Concat, 802).
--define(wxGraphicsMatrix_Get, 804).
--define(wxGraphicsMatrix_Invert, 805).
--define(wxGraphicsMatrix_IsEqual, 806).
--define(wxGraphicsMatrix_IsIdentity, 808).
--define(wxGraphicsMatrix_Rotate, 809).
--define(wxGraphicsMatrix_Scale, 810).
--define(wxGraphicsMatrix_Translate, 811).
--define(wxGraphicsMatrix_Set, 812).
--define(wxGraphicsMatrix_TransformPoint, 813).
--define(wxGraphicsMatrix_TransformDistance, 814).
--define(wxGraphicsPath_MoveToPoint_2, 815).
--define(wxGraphicsPath_MoveToPoint_1, 816).
--define(wxGraphicsPath_AddArc_6, 817).
--define(wxGraphicsPath_AddArc_5, 818).
--define(wxGraphicsPath_AddArcToPoint, 819).
--define(wxGraphicsPath_AddCircle, 820).
--define(wxGraphicsPath_AddCurveToPoint_6, 821).
--define(wxGraphicsPath_AddCurveToPoint_3, 822).
--define(wxGraphicsPath_AddEllipse, 823).
--define(wxGraphicsPath_AddLineToPoint_2, 824).
--define(wxGraphicsPath_AddLineToPoint_1, 825).
--define(wxGraphicsPath_AddPath, 826).
--define(wxGraphicsPath_AddQuadCurveToPoint, 827).
--define(wxGraphicsPath_AddRectangle, 828).
--define(wxGraphicsPath_AddRoundedRectangle, 829).
--define(wxGraphicsPath_CloseSubpath, 830).
--define(wxGraphicsPath_Contains_3, 831).
--define(wxGraphicsPath_Contains_2, 832).
--define(wxGraphicsPath_GetBox, 834).
--define(wxGraphicsPath_GetCurrentPoint, 836).
--define(wxGraphicsPath_Transform, 837).
--define(wxGraphicsRenderer_GetDefaultRenderer, 838).
--define(wxGraphicsRenderer_CreateContext_1_1, 839).
--define(wxGraphicsRenderer_CreateContext_1_0, 840).
--define(wxGraphicsRenderer_CreatePen, 841).
--define(wxGraphicsRenderer_CreateBrush, 842).
--define(wxGraphicsRenderer_CreateLinearGradientBrush, 843).
--define(wxGraphicsRenderer_CreateRadialGradientBrush, 844).
--define(wxGraphicsRenderer_CreateFont, 845).
--define(wxGraphicsRenderer_CreateMatrix, 846).
--define(wxGraphicsRenderer_CreatePath, 847).
--define(wxMenuBar_new_1, 849).
--define(wxMenuBar_new_0, 851).
--define(wxMenuBar_destruct, 853).
--define(wxMenuBar_Append, 854).
--define(wxMenuBar_Check, 855).
--define(wxMenuBar_Enable_2, 856).
--define(wxMenuBar_Enable_1, 857).
--define(wxMenuBar_EnableTop, 858).
--define(wxMenuBar_FindMenu, 859).
--define(wxMenuBar_FindMenuItem, 860).
--define(wxMenuBar_FindItem, 861).
--define(wxMenuBar_GetHelpString, 862).
--define(wxMenuBar_GetLabel_1, 863).
--define(wxMenuBar_GetLabel_0, 864).
--define(wxMenuBar_GetLabelTop, 865).
--define(wxMenuBar_GetMenu, 866).
--define(wxMenuBar_GetMenuCount, 867).
--define(wxMenuBar_Insert, 868).
--define(wxMenuBar_IsChecked, 869).
--define(wxMenuBar_IsEnabled_1, 870).
--define(wxMenuBar_IsEnabled_0, 871).
--define(wxMenuBar_Remove, 872).
--define(wxMenuBar_Replace, 873).
--define(wxMenuBar_SetHelpString, 874).
--define(wxMenuBar_SetLabel_2, 875).
--define(wxMenuBar_SetLabel_1, 876).
--define(wxMenuBar_SetLabelTop, 877).
--define(wxControl_GetLabel, 878).
--define(wxControl_SetLabel, 879).
--define(wxControlWithItems_Append_1, 880).
--define(wxControlWithItems_Append_2, 881).
--define(wxControlWithItems_appendStrings_1, 882).
--define(wxControlWithItems_Clear, 883).
--define(wxControlWithItems_Delete, 884).
--define(wxControlWithItems_FindString, 885).
--define(wxControlWithItems_getClientData, 886).
--define(wxControlWithItems_setClientData, 887).
--define(wxControlWithItems_GetCount, 888).
--define(wxControlWithItems_GetSelection, 889).
--define(wxControlWithItems_GetString, 890).
--define(wxControlWithItems_GetStringSelection, 891).
--define(wxControlWithItems_Insert_2, 892).
--define(wxControlWithItems_Insert_3, 893).
--define(wxControlWithItems_IsEmpty, 894).
--define(wxControlWithItems_Select, 895).
--define(wxControlWithItems_SetSelection, 896).
--define(wxControlWithItems_SetString, 897).
--define(wxControlWithItems_SetStringSelection, 898).
--define(wxMenu_new_2, 901).
--define(wxMenu_new_1, 902).
--define(wxMenu_destruct, 904).
--define(wxMenu_Append_3, 905).
--define(wxMenu_Append_1, 906).
--define(wxMenu_Append_4_0, 907).
--define(wxMenu_Append_4_1, 908).
--define(wxMenu_AppendCheckItem, 909).
--define(wxMenu_AppendRadioItem, 910).
--define(wxMenu_AppendSeparator, 911).
--define(wxMenu_Break, 912).
--define(wxMenu_Check, 913).
--define(wxMenu_Delete_1_0, 914).
--define(wxMenu_Delete_1_1, 915).
--define(wxMenu_Destroy_1_0, 916).
--define(wxMenu_Destroy_1_1, 917).
--define(wxMenu_Enable, 918).
--define(wxMenu_FindItem_1, 919).
--define(wxMenu_FindItem_2, 920).
--define(wxMenu_FindItemByPosition, 921).
--define(wxMenu_GetHelpString, 922).
--define(wxMenu_GetLabel, 923).
--define(wxMenu_GetMenuItemCount, 924).
--define(wxMenu_GetMenuItems, 925).
--define(wxMenu_GetTitle, 927).
--define(wxMenu_Insert_2, 928).
--define(wxMenu_Insert_3, 929).
--define(wxMenu_Insert_5_1, 930).
--define(wxMenu_Insert_5_0, 931).
--define(wxMenu_InsertCheckItem, 932).
--define(wxMenu_InsertRadioItem, 933).
--define(wxMenu_InsertSeparator, 934).
--define(wxMenu_IsChecked, 935).
--define(wxMenu_IsEnabled, 936).
--define(wxMenu_Prepend_1, 937).
--define(wxMenu_Prepend_2, 938).
--define(wxMenu_Prepend_4_1, 939).
--define(wxMenu_Prepend_4_0, 940).
--define(wxMenu_PrependCheckItem, 941).
--define(wxMenu_PrependRadioItem, 942).
--define(wxMenu_PrependSeparator, 943).
--define(wxMenu_Remove_1_0, 944).
--define(wxMenu_Remove_1_1, 945).
--define(wxMenu_SetHelpString, 946).
--define(wxMenu_SetLabel, 947).
--define(wxMenu_SetTitle, 948).
--define(wxMenuItem_new, 949).
--define(wxMenuItem_destruct, 951).
--define(wxMenuItem_Check, 952).
--define(wxMenuItem_Enable, 953).
--define(wxMenuItem_GetBitmap, 954).
--define(wxMenuItem_GetHelp, 955).
--define(wxMenuItem_GetId, 956).
--define(wxMenuItem_GetKind, 957).
--define(wxMenuItem_GetLabel, 958).
--define(wxMenuItem_GetLabelFromText, 959).
--define(wxMenuItem_GetMenu, 960).
--define(wxMenuItem_GetText, 961).
--define(wxMenuItem_GetSubMenu, 962).
--define(wxMenuItem_IsCheckable, 963).
--define(wxMenuItem_IsChecked, 964).
--define(wxMenuItem_IsEnabled, 965).
--define(wxMenuItem_IsSeparator, 966).
--define(wxMenuItem_IsSubMenu, 967).
--define(wxMenuItem_SetBitmap, 968).
--define(wxMenuItem_SetHelp, 969).
--define(wxMenuItem_SetMenu, 970).
--define(wxMenuItem_SetSubMenu, 971).
--define(wxMenuItem_SetText, 972).
--define(wxToolBar_AddControl, 973).
--define(wxToolBar_AddSeparator, 974).
--define(wxToolBar_AddTool_5, 975).
--define(wxToolBar_AddTool_4_0, 976).
--define(wxToolBar_AddTool_1, 977).
--define(wxToolBar_AddTool_4_1, 978).
--define(wxToolBar_AddTool_3, 979).
--define(wxToolBar_AddTool_6, 980).
--define(wxToolBar_AddCheckTool, 981).
--define(wxToolBar_AddRadioTool, 982).
--define(wxToolBar_DeleteTool, 983).
--define(wxToolBar_DeleteToolByPos, 984).
--define(wxToolBar_EnableTool, 985).
--define(wxToolBar_FindById, 986).
--define(wxToolBar_FindControl, 987).
--define(wxToolBar_FindToolForPosition, 988).
--define(wxToolBar_GetToolSize, 989).
--define(wxToolBar_GetToolBitmapSize, 990).
--define(wxToolBar_GetMargins, 991).
--define(wxToolBar_GetToolEnabled, 992).
--define(wxToolBar_GetToolLongHelp, 993).
--define(wxToolBar_GetToolPacking, 994).
--define(wxToolBar_GetToolPos, 995).
--define(wxToolBar_GetToolSeparation, 996).
--define(wxToolBar_GetToolShortHelp, 997).
--define(wxToolBar_GetToolState, 998).
--define(wxToolBar_InsertControl, 999).
--define(wxToolBar_InsertSeparator, 1000).
--define(wxToolBar_InsertTool_5, 1001).
--define(wxToolBar_InsertTool_2, 1002).
--define(wxToolBar_InsertTool_4, 1003).
--define(wxToolBar_Realize, 1004).
--define(wxToolBar_RemoveTool, 1005).
--define(wxToolBar_SetMargins, 1006).
--define(wxToolBar_SetToolBitmapSize, 1007).
--define(wxToolBar_SetToolLongHelp, 1008).
--define(wxToolBar_SetToolPacking, 1009).
--define(wxToolBar_SetToolShortHelp, 1010).
--define(wxToolBar_SetToolSeparation, 1011).
--define(wxToolBar_ToggleTool, 1012).
--define(wxStatusBar_new_0, 1014).
--define(wxStatusBar_new_2, 1015).
--define(wxStatusBar_destruct, 1017).
--define(wxStatusBar_Create, 1018).
--define(wxStatusBar_GetFieldRect, 1019).
--define(wxStatusBar_GetFieldsCount, 1020).
--define(wxStatusBar_GetStatusText, 1021).
--define(wxStatusBar_PopStatusText, 1022).
--define(wxStatusBar_PushStatusText, 1023).
--define(wxStatusBar_SetFieldsCount, 1024).
--define(wxStatusBar_SetMinHeight, 1025).
--define(wxStatusBar_SetStatusText, 1026).
--define(wxStatusBar_SetStatusWidths, 1027).
--define(wxStatusBar_SetStatusStyles, 1028).
--define(wxBitmap_new_0, 1029).
--define(wxBitmap_new_3, 1030).
--define(wxBitmap_new_4, 1031).
--define(wxBitmap_new_2_0, 1032).
--define(wxBitmap_new_2_1, 1033).
--define(wxBitmap_destruct, 1034).
--define(wxBitmap_ConvertToImage, 1035).
--define(wxBitmap_CopyFromIcon, 1036).
--define(wxBitmap_Create, 1037).
--define(wxBitmap_GetDepth, 1038).
--define(wxBitmap_GetHeight, 1039).
--define(wxBitmap_GetPalette, 1040).
--define(wxBitmap_GetMask, 1041).
--define(wxBitmap_GetWidth, 1042).
--define(wxBitmap_GetSubBitmap, 1043).
--define(wxBitmap_LoadFile, 1044).
--define(wxBitmap_Ok, 1045).
--define(wxBitmap_SaveFile, 1046).
--define(wxBitmap_SetDepth, 1047).
--define(wxBitmap_SetHeight, 1048).
--define(wxBitmap_SetMask, 1049).
--define(wxBitmap_SetPalette, 1050).
--define(wxBitmap_SetWidth, 1051).
--define(wxIcon_new_0, 1052).
--define(wxIcon_new_2, 1053).
--define(wxIcon_new_1, 1054).
--define(wxIcon_CopyFromBitmap, 1055).
--define(wxIcon_destroy, 1056).
--define(wxIconBundle_new_0, 1057).
--define(wxIconBundle_new_2, 1058).
--define(wxIconBundle_new_1_0, 1059).
--define(wxIconBundle_new_1_1, 1060).
--define(wxIconBundle_destruct, 1061).
--define(wxIconBundle_AddIcon_2, 1062).
--define(wxIconBundle_AddIcon_1, 1063).
--define(wxIconBundle_GetIcon_1_1, 1064).
--define(wxIconBundle_GetIcon_1_0, 1065).
--define(wxCursor_new_0, 1066).
--define(wxCursor_new_1_0, 1067).
--define(wxCursor_new_1_1, 1068).
--define(wxCursor_new_4, 1069).
--define(wxCursor_destruct, 1070).
--define(wxCursor_Ok, 1071).
--define(wxMask_new_0, 1072).
--define(wxMask_new_2_1, 1073).
--define(wxMask_new_2_0, 1074).
--define(wxMask_new_1, 1075).
--define(wxMask_destruct, 1076).
--define(wxMask_Create_2_1, 1077).
--define(wxMask_Create_2_0, 1078).
--define(wxMask_Create_1, 1079).
--define(wxImage_new_0, 1080).
--define(wxImage_new_3_0, 1081).
--define(wxImage_new_4, 1082).
--define(wxImage_new_5, 1083).
--define(wxImage_new_2, 1084).
--define(wxImage_new_3_1, 1085).
--define(wxImage_Blur, 1086).
--define(wxImage_BlurHorizontal, 1087).
--define(wxImage_BlurVertical, 1088).
--define(wxImage_ConvertAlphaToMask, 1089).
--define(wxImage_ConvertToGreyscale, 1090).
--define(wxImage_ConvertToMono, 1091).
--define(wxImage_Copy, 1092).
--define(wxImage_Create_3, 1093).
--define(wxImage_Create_4, 1094).
--define(wxImage_Create_5, 1095).
--define(wxImage_Destroy, 1096).
--define(wxImage_FindFirstUnusedColour, 1097).
--define(wxImage_GetImageExtWildcard, 1098).
--define(wxImage_GetAlpha_2, 1099).
--define(wxImage_GetAlpha_0, 1100).
--define(wxImage_GetBlue, 1101).
--define(wxImage_GetData, 1102).
--define(wxImage_GetGreen, 1103).
--define(wxImage_GetImageCount, 1104).
--define(wxImage_GetHeight, 1105).
--define(wxImage_GetMaskBlue, 1106).
--define(wxImage_GetMaskGreen, 1107).
--define(wxImage_GetMaskRed, 1108).
--define(wxImage_GetOrFindMaskColour, 1109).
--define(wxImage_GetPalette, 1110).
--define(wxImage_GetRed, 1111).
--define(wxImage_GetSubImage, 1112).
--define(wxImage_GetWidth, 1113).
--define(wxImage_HasAlpha, 1114).
--define(wxImage_HasMask, 1115).
--define(wxImage_GetOption, 1116).
--define(wxImage_GetOptionInt, 1117).
--define(wxImage_HasOption, 1118).
--define(wxImage_InitAlpha, 1119).
--define(wxImage_InitStandardHandlers, 1120).
--define(wxImage_IsTransparent, 1121).
--define(wxImage_LoadFile_2, 1122).
--define(wxImage_LoadFile_3, 1123).
--define(wxImage_Ok, 1124).
--define(wxImage_RemoveHandler, 1125).
--define(wxImage_Mirror, 1126).
--define(wxImage_Replace, 1127).
--define(wxImage_Rescale, 1128).
--define(wxImage_Resize, 1129).
--define(wxImage_Rotate, 1130).
--define(wxImage_RotateHue, 1131).
--define(wxImage_Rotate90, 1132).
--define(wxImage_SaveFile_1, 1133).
--define(wxImage_SaveFile_2_0, 1134).
--define(wxImage_SaveFile_2_1, 1135).
--define(wxImage_Scale, 1136).
--define(wxImage_Size, 1137).
--define(wxImage_SetAlpha_3, 1138).
--define(wxImage_SetAlpha_2, 1139).
--define(wxImage_SetData_2, 1140).
--define(wxImage_SetData_4, 1141).
--define(wxImage_SetMask, 1142).
--define(wxImage_SetMaskColour, 1143).
--define(wxImage_SetMaskFromImage, 1144).
--define(wxImage_SetOption_2_1, 1145).
--define(wxImage_SetOption_2_0, 1146).
--define(wxImage_SetPalette, 1147).
--define(wxImage_SetRGB_5, 1148).
--define(wxImage_SetRGB_4, 1149).
--define(wxImage_destroy, 1150).
--define(wxBrush_new_0, 1151).
--define(wxBrush_new_2, 1152).
--define(wxBrush_new_1, 1153).
--define(wxBrush_destruct, 1155).
--define(wxBrush_GetColour, 1156).
--define(wxBrush_GetStipple, 1157).
--define(wxBrush_GetStyle, 1158).
--define(wxBrush_IsHatch, 1159).
--define(wxBrush_IsOk, 1160).
--define(wxBrush_SetColour_1, 1161).
--define(wxBrush_SetColour_3, 1162).
--define(wxBrush_SetStipple, 1163).
--define(wxBrush_SetStyle, 1164).
--define(wxPen_new_0, 1165).
--define(wxPen_new_2, 1166).
--define(wxPen_destruct, 1167).
--define(wxPen_GetCap, 1168).
--define(wxPen_GetColour, 1169).
--define(wxPen_GetJoin, 1170).
--define(wxPen_GetStyle, 1171).
--define(wxPen_GetWidth, 1172).
--define(wxPen_IsOk, 1173).
--define(wxPen_SetCap, 1174).
--define(wxPen_SetColour_1, 1175).
--define(wxPen_SetColour_3, 1176).
--define(wxPen_SetJoin, 1177).
--define(wxPen_SetStyle, 1178).
--define(wxPen_SetWidth, 1179).
--define(wxRegion_new_0, 1180).
--define(wxRegion_new_4, 1181).
--define(wxRegion_new_2, 1182).
--define(wxRegion_new_1_1, 1183).
--define(wxRegion_new_1_0, 1185).
--define(wxRegion_destruct, 1187).
--define(wxRegion_Clear, 1188).
--define(wxRegion_Contains_2, 1189).
--define(wxRegion_Contains_1_0, 1190).
--define(wxRegion_Contains_4, 1191).
--define(wxRegion_Contains_1_1, 1192).
--define(wxRegion_ConvertToBitmap, 1193).
--define(wxRegion_GetBox, 1194).
--define(wxRegion_Intersect_4, 1195).
--define(wxRegion_Intersect_1_1, 1196).
--define(wxRegion_Intersect_1_0, 1197).
--define(wxRegion_IsEmpty, 1198).
--define(wxRegion_Subtract_4, 1199).
--define(wxRegion_Subtract_1_1, 1200).
--define(wxRegion_Subtract_1_0, 1201).
--define(wxRegion_Offset_2, 1202).
--define(wxRegion_Offset_1, 1203).
--define(wxRegion_Union_4, 1204).
--define(wxRegion_Union_1_2, 1205).
--define(wxRegion_Union_1_1, 1206).
--define(wxRegion_Union_1_0, 1207).
--define(wxRegion_Union_3, 1208).
--define(wxRegion_Xor_4, 1209).
--define(wxRegion_Xor_1_1, 1210).
--define(wxRegion_Xor_1_0, 1211).
--define(wxAcceleratorTable_new_0, 1212).
--define(wxAcceleratorTable_new_2, 1213).
--define(wxAcceleratorTable_destruct, 1214).
--define(wxAcceleratorTable_Ok, 1215).
--define(wxAcceleratorEntry_new_1_0, 1216).
--define(wxAcceleratorEntry_new_1_1, 1217).
--define(wxAcceleratorEntry_GetCommand, 1218).
--define(wxAcceleratorEntry_GetFlags, 1219).
--define(wxAcceleratorEntry_GetKeyCode, 1220).
--define(wxAcceleratorEntry_Set, 1221).
--define(wxAcceleratorEntry_destroy, 1222).
--define(wxCaret_new_3, 1227).
--define(wxCaret_new_2, 1228).
--define(wxCaret_destruct, 1230).
--define(wxCaret_Create_3, 1231).
--define(wxCaret_Create_2, 1232).
--define(wxCaret_GetBlinkTime, 1233).
--define(wxCaret_GetPosition, 1235).
--define(wxCaret_GetSize, 1237).
--define(wxCaret_GetWindow, 1238).
--define(wxCaret_Hide, 1239).
--define(wxCaret_IsOk, 1240).
--define(wxCaret_IsVisible, 1241).
--define(wxCaret_Move_2, 1242).
--define(wxCaret_Move_1, 1243).
--define(wxCaret_SetBlinkTime, 1244).
--define(wxCaret_SetSize_2, 1245).
--define(wxCaret_SetSize_1, 1246).
--define(wxCaret_Show, 1247).
--define(wxSizer_Add_2_1, 1248).
--define(wxSizer_Add_2_0, 1249).
--define(wxSizer_Add_3, 1250).
--define(wxSizer_Add_2_3, 1251).
--define(wxSizer_Add_2_2, 1252).
--define(wxSizer_AddSpacer, 1253).
--define(wxSizer_AddStretchSpacer, 1254).
--define(wxSizer_CalcMin, 1255).
--define(wxSizer_Clear, 1256).
--define(wxSizer_Detach_1_2, 1257).
--define(wxSizer_Detach_1_1, 1258).
--define(wxSizer_Detach_1_0, 1259).
--define(wxSizer_Fit, 1260).
--define(wxSizer_FitInside, 1261).
--define(wxSizer_GetChildren, 1262).
--define(wxSizer_GetItem_2_1, 1263).
--define(wxSizer_GetItem_2_0, 1264).
--define(wxSizer_GetItem_1, 1265).
--define(wxSizer_GetSize, 1266).
--define(wxSizer_GetPosition, 1267).
--define(wxSizer_GetMinSize, 1268).
--define(wxSizer_Hide_2_0, 1269).
--define(wxSizer_Hide_2_1, 1270).
--define(wxSizer_Hide_1, 1271).
--define(wxSizer_Insert_3_1, 1272).
--define(wxSizer_Insert_3_0, 1273).
--define(wxSizer_Insert_4, 1274).
--define(wxSizer_Insert_3_3, 1275).
--define(wxSizer_Insert_3_2, 1276).
--define(wxSizer_Insert_2, 1277).
--define(wxSizer_InsertSpacer, 1278).
--define(wxSizer_InsertStretchSpacer, 1279).
--define(wxSizer_IsShown_1_2, 1280).
--define(wxSizer_IsShown_1_1, 1281).
--define(wxSizer_IsShown_1_0, 1282).
--define(wxSizer_Layout, 1283).
--define(wxSizer_Prepend_2_1, 1284).
--define(wxSizer_Prepend_2_0, 1285).
--define(wxSizer_Prepend_3, 1286).
--define(wxSizer_Prepend_2_3, 1287).
--define(wxSizer_Prepend_2_2, 1288).
--define(wxSizer_Prepend_1, 1289).
--define(wxSizer_PrependSpacer, 1290).
--define(wxSizer_PrependStretchSpacer, 1291).
--define(wxSizer_RecalcSizes, 1292).
--define(wxSizer_Remove_1_1, 1293).
--define(wxSizer_Remove_1_0, 1294).
--define(wxSizer_Replace_3_1, 1295).
--define(wxSizer_Replace_3_0, 1296).
--define(wxSizer_Replace_2, 1297).
--define(wxSizer_SetDimension, 1298).
--define(wxSizer_SetMinSize_2, 1299).
--define(wxSizer_SetMinSize_1, 1300).
--define(wxSizer_SetItemMinSize_3_2, 1301).
--define(wxSizer_SetItemMinSize_2_2, 1302).
--define(wxSizer_SetItemMinSize_3_1, 1303).
--define(wxSizer_SetItemMinSize_2_1, 1304).
--define(wxSizer_SetItemMinSize_3_0, 1305).
--define(wxSizer_SetItemMinSize_2_0, 1306).
--define(wxSizer_SetSizeHints, 1307).
--define(wxSizer_SetVirtualSizeHints, 1308).
--define(wxSizer_Show_2_2, 1309).
--define(wxSizer_Show_2_1, 1310).
--define(wxSizer_Show_2_0, 1311).
--define(wxSizer_Show_1, 1312).
--define(wxSizerFlags_new, 1313).
--define(wxSizerFlags_Align, 1314).
--define(wxSizerFlags_Border_2, 1315).
--define(wxSizerFlags_Border_1, 1316).
--define(wxSizerFlags_Center, 1317).
--define(wxSizerFlags_Centre, 1318).
--define(wxSizerFlags_Expand, 1319).
--define(wxSizerFlags_Left, 1320).
--define(wxSizerFlags_Proportion, 1321).
--define(wxSizerFlags_Right, 1322).
--define(wxSizerFlags_destroy, 1323).
--define(wxSizerItem_new_5_1, 1324).
--define(wxSizerItem_new_2_1, 1325).
--define(wxSizerItem_new_5_0, 1326).
--define(wxSizerItem_new_2_0, 1327).
--define(wxSizerItem_new_6, 1328).
--define(wxSizerItem_new_3, 1329).
--define(wxSizerItem_new_0, 1330).
--define(wxSizerItem_destruct, 1331).
--define(wxSizerItem_CalcMin, 1332).
--define(wxSizerItem_DeleteWindows, 1333).
--define(wxSizerItem_DetachSizer, 1334).
--define(wxSizerItem_GetBorder, 1335).
--define(wxSizerItem_GetFlag, 1336).
--define(wxSizerItem_GetMinSize, 1337).
--define(wxSizerItem_GetPosition, 1338).
--define(wxSizerItem_GetProportion, 1339).
--define(wxSizerItem_GetRatio, 1340).
--define(wxSizerItem_GetRect, 1341).
--define(wxSizerItem_GetSize, 1342).
--define(wxSizerItem_GetSizer, 1343).
--define(wxSizerItem_GetSpacer, 1344).
--define(wxSizerItem_GetUserData, 1345).
--define(wxSizerItem_GetWindow, 1346).
--define(wxSizerItem_IsSizer, 1347).
--define(wxSizerItem_IsShown, 1348).
--define(wxSizerItem_IsSpacer, 1349).
--define(wxSizerItem_IsWindow, 1350).
--define(wxSizerItem_SetBorder, 1351).
--define(wxSizerItem_SetDimension, 1352).
--define(wxSizerItem_SetFlag, 1353).
--define(wxSizerItem_SetInitSize, 1354).
--define(wxSizerItem_SetMinSize_1, 1355).
--define(wxSizerItem_SetMinSize_2, 1356).
--define(wxSizerItem_SetProportion, 1357).
--define(wxSizerItem_SetRatio_2, 1358).
--define(wxSizerItem_SetRatio_1_1, 1359).
--define(wxSizerItem_SetRatio_1_0, 1360).
--define(wxSizerItem_SetSizer, 1361).
--define(wxSizerItem_SetSpacer_1, 1362).
--define(wxSizerItem_SetSpacer_2, 1363).
--define(wxSizerItem_SetWindow, 1364).
--define(wxSizerItem_Show, 1365).
--define(wxBoxSizer_new, 1366).
--define(wxBoxSizer_GetOrientation, 1367).
--define(wxBoxSizer_destroy, 1368).
--define(wxStaticBoxSizer_new_2, 1369).
--define(wxStaticBoxSizer_new_3, 1370).
--define(wxStaticBoxSizer_GetStaticBox, 1371).
--define(wxStaticBoxSizer_destroy, 1372).
--define(wxGridSizer_new_4, 1373).
--define(wxGridSizer_new_2, 1374).
--define(wxGridSizer_GetCols, 1375).
--define(wxGridSizer_GetHGap, 1376).
--define(wxGridSizer_GetRows, 1377).
--define(wxGridSizer_GetVGap, 1378).
--define(wxGridSizer_SetCols, 1379).
--define(wxGridSizer_SetHGap, 1380).
--define(wxGridSizer_SetRows, 1381).
--define(wxGridSizer_SetVGap, 1382).
--define(wxGridSizer_destroy, 1383).
--define(wxFlexGridSizer_new_4, 1384).
--define(wxFlexGridSizer_new_2, 1385).
--define(wxFlexGridSizer_AddGrowableCol, 1386).
--define(wxFlexGridSizer_AddGrowableRow, 1387).
--define(wxFlexGridSizer_GetFlexibleDirection, 1388).
--define(wxFlexGridSizer_GetNonFlexibleGrowMode, 1389).
--define(wxFlexGridSizer_RemoveGrowableCol, 1390).
--define(wxFlexGridSizer_RemoveGrowableRow, 1391).
--define(wxFlexGridSizer_SetFlexibleDirection, 1392).
--define(wxFlexGridSizer_SetNonFlexibleGrowMode, 1393).
--define(wxFlexGridSizer_destroy, 1394).
--define(wxGridBagSizer_new, 1395).
--define(wxGridBagSizer_Add_3_2, 1396).
--define(wxGridBagSizer_Add_3_1, 1397).
--define(wxGridBagSizer_Add_4, 1398).
--define(wxGridBagSizer_Add_1_0, 1399).
--define(wxGridBagSizer_Add_2_1, 1400).
--define(wxGridBagSizer_Add_2_0, 1401).
--define(wxGridBagSizer_Add_3_0, 1402).
--define(wxGridBagSizer_Add_1_1, 1403).
--define(wxGridBagSizer_CalcMin, 1404).
--define(wxGridBagSizer_CheckForIntersection_2, 1405).
--define(wxGridBagSizer_CheckForIntersection_3, 1406).
--define(wxGridBagSizer_FindItem_1_1, 1407).
--define(wxGridBagSizer_FindItem_1_0, 1408).
--define(wxGridBagSizer_FindItemAtPoint, 1409).
--define(wxGridBagSizer_FindItemAtPosition, 1410).
--define(wxGridBagSizer_FindItemWithData, 1411).
--define(wxGridBagSizer_GetCellSize, 1412).
--define(wxGridBagSizer_GetEmptyCellSize, 1413).
--define(wxGridBagSizer_GetItemPosition_1_2, 1414).
--define(wxGridBagSizer_GetItemPosition_1_1, 1415).
--define(wxGridBagSizer_GetItemPosition_1_0, 1416).
--define(wxGridBagSizer_GetItemSpan_1_2, 1417).
--define(wxGridBagSizer_GetItemSpan_1_1, 1418).
--define(wxGridBagSizer_GetItemSpan_1_0, 1419).
--define(wxGridBagSizer_SetEmptyCellSize, 1420).
--define(wxGridBagSizer_SetItemPosition_2_2, 1421).
--define(wxGridBagSizer_SetItemPosition_2_1, 1422).
--define(wxGridBagSizer_SetItemPosition_2_0, 1423).
--define(wxGridBagSizer_SetItemSpan_2_2, 1424).
--define(wxGridBagSizer_SetItemSpan_2_1, 1425).
--define(wxGridBagSizer_SetItemSpan_2_0, 1426).
--define(wxGridBagSizer_destroy, 1427).
--define(wxStdDialogButtonSizer_new, 1428).
--define(wxStdDialogButtonSizer_AddButton, 1429).
--define(wxStdDialogButtonSizer_Realize, 1430).
--define(wxStdDialogButtonSizer_SetAffirmativeButton, 1431).
--define(wxStdDialogButtonSizer_SetCancelButton, 1432).
--define(wxStdDialogButtonSizer_SetNegativeButton, 1433).
--define(wxStdDialogButtonSizer_destroy, 1434).
--define(wxFont_new_0, 1435).
--define(wxFont_new_1, 1436).
--define(wxFont_new_5, 1437).
--define(wxFont_destruct, 1439).
--define(wxFont_IsFixedWidth, 1440).
--define(wxFont_GetDefaultEncoding, 1441).
--define(wxFont_GetFaceName, 1442).
--define(wxFont_GetFamily, 1443).
--define(wxFont_GetNativeFontInfoDesc, 1444).
--define(wxFont_GetNativeFontInfoUserDesc, 1445).
--define(wxFont_GetPointSize, 1446).
--define(wxFont_GetStyle, 1447).
--define(wxFont_GetUnderlined, 1448).
--define(wxFont_GetWeight, 1449).
--define(wxFont_Ok, 1450).
--define(wxFont_SetDefaultEncoding, 1451).
--define(wxFont_SetFaceName, 1452).
--define(wxFont_SetFamily, 1453).
--define(wxFont_SetPointSize, 1454).
--define(wxFont_SetStyle, 1455).
--define(wxFont_SetUnderlined, 1456).
--define(wxFont_SetWeight, 1457).
--define(wxToolTip_Enable, 1458).
--define(wxToolTip_SetDelay, 1459).
--define(wxToolTip_new, 1460).
--define(wxToolTip_SetTip, 1461).
--define(wxToolTip_GetTip, 1462).
--define(wxToolTip_GetWindow, 1463).
--define(wxToolTip_destroy, 1464).
--define(wxButton_new_3, 1466).
--define(wxButton_new_0, 1467).
--define(wxButton_destruct, 1468).
--define(wxButton_Create, 1469).
--define(wxButton_GetDefaultSize, 1470).
--define(wxButton_SetDefault, 1471).
--define(wxButton_SetLabel, 1472).
--define(wxBitmapButton_new_4, 1474).
--define(wxBitmapButton_new_0, 1475).
--define(wxBitmapButton_Create, 1476).
--define(wxBitmapButton_GetBitmapDisabled, 1477).
--define(wxBitmapButton_GetBitmapFocus, 1479).
--define(wxBitmapButton_GetBitmapLabel, 1481).
--define(wxBitmapButton_GetBitmapSelected, 1483).
--define(wxBitmapButton_SetBitmapDisabled, 1485).
--define(wxBitmapButton_SetBitmapFocus, 1486).
--define(wxBitmapButton_SetBitmapLabel, 1487).
--define(wxBitmapButton_SetBitmapSelected, 1488).
--define(wxBitmapButton_destroy, 1489).
--define(wxToggleButton_new_0, 1490).
--define(wxToggleButton_new_4, 1491).
--define(wxToggleButton_Create, 1492).
--define(wxToggleButton_GetValue, 1493).
--define(wxToggleButton_SetValue, 1494).
--define(wxToggleButton_destroy, 1495).
--define(wxCalendarCtrl_new_0, 1496).
--define(wxCalendarCtrl_new_3, 1497).
--define(wxCalendarCtrl_Create, 1498).
--define(wxCalendarCtrl_destruct, 1499).
--define(wxCalendarCtrl_SetDate, 1500).
--define(wxCalendarCtrl_GetDate, 1501).
--define(wxCalendarCtrl_EnableYearChange, 1502).
--define(wxCalendarCtrl_EnableMonthChange, 1503).
--define(wxCalendarCtrl_EnableHolidayDisplay, 1504).
--define(wxCalendarCtrl_SetHeaderColours, 1505).
--define(wxCalendarCtrl_GetHeaderColourFg, 1506).
--define(wxCalendarCtrl_GetHeaderColourBg, 1507).
--define(wxCalendarCtrl_SetHighlightColours, 1508).
--define(wxCalendarCtrl_GetHighlightColourFg, 1509).
--define(wxCalendarCtrl_GetHighlightColourBg, 1510).
--define(wxCalendarCtrl_SetHolidayColours, 1511).
--define(wxCalendarCtrl_GetHolidayColourFg, 1512).
--define(wxCalendarCtrl_GetHolidayColourBg, 1513).
--define(wxCalendarCtrl_GetAttr, 1514).
--define(wxCalendarCtrl_SetAttr, 1515).
--define(wxCalendarCtrl_SetHoliday, 1516).
--define(wxCalendarCtrl_ResetAttr, 1517).
--define(wxCalendarCtrl_HitTest, 1518).
--define(wxCalendarDateAttr_new_0, 1519).
--define(wxCalendarDateAttr_new_2_1, 1520).
--define(wxCalendarDateAttr_new_2_0, 1521).
--define(wxCalendarDateAttr_SetTextColour, 1522).
--define(wxCalendarDateAttr_SetBackgroundColour, 1523).
--define(wxCalendarDateAttr_SetBorderColour, 1524).
--define(wxCalendarDateAttr_SetFont, 1525).
--define(wxCalendarDateAttr_SetBorder, 1526).
--define(wxCalendarDateAttr_SetHoliday, 1527).
--define(wxCalendarDateAttr_HasTextColour, 1528).
--define(wxCalendarDateAttr_HasBackgroundColour, 1529).
--define(wxCalendarDateAttr_HasBorderColour, 1530).
--define(wxCalendarDateAttr_HasFont, 1531).
--define(wxCalendarDateAttr_HasBorder, 1532).
--define(wxCalendarDateAttr_IsHoliday, 1533).
--define(wxCalendarDateAttr_GetTextColour, 1534).
--define(wxCalendarDateAttr_GetBackgroundColour, 1535).
--define(wxCalendarDateAttr_GetBorderColour, 1536).
--define(wxCalendarDateAttr_GetFont, 1537).
--define(wxCalendarDateAttr_GetBorder, 1538).
--define(wxCalendarDateAttr_destroy, 1539).
--define(wxCheckBox_new_4, 1541).
--define(wxCheckBox_new_0, 1542).
--define(wxCheckBox_Create, 1543).
--define(wxCheckBox_GetValue, 1544).
--define(wxCheckBox_Get3StateValue, 1545).
--define(wxCheckBox_Is3rdStateAllowedForUser, 1546).
--define(wxCheckBox_Is3State, 1547).
--define(wxCheckBox_IsChecked, 1548).
--define(wxCheckBox_SetValue, 1549).
--define(wxCheckBox_Set3StateValue, 1550).
--define(wxCheckBox_destroy, 1551).
--define(wxCheckListBox_new_0, 1552).
--define(wxCheckListBox_new_3, 1554).
--define(wxCheckListBox_Check, 1555).
--define(wxCheckListBox_IsChecked, 1556).
--define(wxCheckListBox_destroy, 1557).
--define(wxChoice_new_3, 1560).
--define(wxChoice_new_0, 1561).
--define(wxChoice_destruct, 1563).
--define(wxChoice_Create, 1565).
--define(wxChoice_Delete, 1566).
--define(wxChoice_GetColumns, 1567).
--define(wxChoice_SetColumns, 1568).
--define(wxComboBox_new_0, 1569).
--define(wxComboBox_new_3, 1571).
--define(wxComboBox_destruct, 1572).
--define(wxComboBox_Create, 1574).
--define(wxComboBox_CanCopy, 1575).
--define(wxComboBox_CanCut, 1576).
--define(wxComboBox_CanPaste, 1577).
--define(wxComboBox_CanRedo, 1578).
--define(wxComboBox_CanUndo, 1579).
--define(wxComboBox_Copy, 1580).
--define(wxComboBox_Cut, 1581).
--define(wxComboBox_GetInsertionPoint, 1582).
--define(wxComboBox_GetLastPosition, 1583).
--define(wxComboBox_GetValue, 1584).
--define(wxComboBox_Paste, 1585).
--define(wxComboBox_Redo, 1586).
--define(wxComboBox_Replace, 1587).
--define(wxComboBox_Remove, 1588).
--define(wxComboBox_SetInsertionPoint, 1589).
--define(wxComboBox_SetInsertionPointEnd, 1590).
--define(wxComboBox_SetSelection_1, 1591).
--define(wxComboBox_SetSelection_2, 1592).
--define(wxComboBox_SetValue, 1593).
--define(wxComboBox_Undo, 1594).
--define(wxGauge_new_0, 1595).
--define(wxGauge_new_4, 1596).
--define(wxGauge_Create, 1597).
--define(wxGauge_GetBezelFace, 1598).
--define(wxGauge_GetRange, 1599).
--define(wxGauge_GetShadowWidth, 1600).
--define(wxGauge_GetValue, 1601).
--define(wxGauge_IsVertical, 1602).
--define(wxGauge_SetBezelFace, 1603).
--define(wxGauge_SetRange, 1604).
--define(wxGauge_SetShadowWidth, 1605).
--define(wxGauge_SetValue, 1606).
--define(wxGauge_Pulse, 1607).
--define(wxGauge_destroy, 1608).
--define(wxGenericDirCtrl_new_0, 1609).
--define(wxGenericDirCtrl_new_2, 1610).
--define(wxGenericDirCtrl_destruct, 1611).
--define(wxGenericDirCtrl_Create, 1612).
--define(wxGenericDirCtrl_Init, 1613).
--define(wxGenericDirCtrl_CollapseTree, 1614).
--define(wxGenericDirCtrl_ExpandPath, 1615).
--define(wxGenericDirCtrl_GetDefaultPath, 1616).
--define(wxGenericDirCtrl_GetPath, 1617).
--define(wxGenericDirCtrl_GetFilePath, 1618).
--define(wxGenericDirCtrl_GetFilter, 1619).
--define(wxGenericDirCtrl_GetFilterIndex, 1620).
--define(wxGenericDirCtrl_GetRootId, 1621).
--define(wxGenericDirCtrl_GetTreeCtrl, 1622).
--define(wxGenericDirCtrl_ReCreateTree, 1623).
--define(wxGenericDirCtrl_SetDefaultPath, 1624).
--define(wxGenericDirCtrl_SetFilter, 1625).
--define(wxGenericDirCtrl_SetFilterIndex, 1626).
--define(wxGenericDirCtrl_SetPath, 1627).
--define(wxStaticBox_new_4, 1629).
--define(wxStaticBox_new_0, 1630).
--define(wxStaticBox_Create, 1631).
--define(wxStaticBox_destroy, 1632).
--define(wxStaticLine_new_2, 1634).
--define(wxStaticLine_new_0, 1635).
--define(wxStaticLine_Create, 1636).
--define(wxStaticLine_IsVertical, 1637).
--define(wxStaticLine_GetDefaultSize, 1638).
--define(wxStaticLine_destroy, 1639).
--define(wxListBox_new_3, 1642).
--define(wxListBox_new_0, 1643).
--define(wxListBox_destruct, 1645).
--define(wxListBox_Create, 1647).
--define(wxListBox_Deselect, 1648).
--define(wxListBox_GetSelections, 1649).
--define(wxListBox_InsertItems, 1650).
--define(wxListBox_IsSelected, 1651).
+-define(wxPanel_SetFocusIgnoringChildren, 337).
+-define(wxScrolledWindow_new_0, 338).
+-define(wxScrolledWindow_new_2, 339).
+-define(wxScrolledWindow_destruct, 340).
+-define(wxScrolledWindow_CalcScrolledPosition_4, 341).
+-define(wxScrolledWindow_CalcScrolledPosition_1, 342).
+-define(wxScrolledWindow_CalcUnscrolledPosition_4, 343).
+-define(wxScrolledWindow_CalcUnscrolledPosition_1, 344).
+-define(wxScrolledWindow_EnableScrolling, 345).
+-define(wxScrolledWindow_GetScrollPixelsPerUnit, 346).
+-define(wxScrolledWindow_GetViewStart, 347).
+-define(wxScrolledWindow_DoPrepareDC, 348).
+-define(wxScrolledWindow_PrepareDC, 349).
+-define(wxScrolledWindow_Scroll, 350).
+-define(wxScrolledWindow_SetScrollbars, 351).
+-define(wxScrolledWindow_SetScrollRate, 352).
+-define(wxScrolledWindow_SetTargetWindow, 353).
+-define(wxSashWindow_new_0, 354).
+-define(wxSashWindow_new_2, 355).
+-define(wxSashWindow_destruct, 356).
+-define(wxSashWindow_GetSashVisible, 357).
+-define(wxSashWindow_GetMaximumSizeX, 358).
+-define(wxSashWindow_GetMaximumSizeY, 359).
+-define(wxSashWindow_GetMinimumSizeX, 360).
+-define(wxSashWindow_GetMinimumSizeY, 361).
+-define(wxSashWindow_SetMaximumSizeX, 362).
+-define(wxSashWindow_SetMaximumSizeY, 363).
+-define(wxSashWindow_SetMinimumSizeX, 364).
+-define(wxSashWindow_SetMinimumSizeY, 365).
+-define(wxSashWindow_SetSashVisible, 366).
+-define(wxSashLayoutWindow_new_0, 367).
+-define(wxSashLayoutWindow_new_2, 368).
+-define(wxSashLayoutWindow_Create, 369).
+-define(wxSashLayoutWindow_GetAlignment, 370).
+-define(wxSashLayoutWindow_GetOrientation, 371).
+-define(wxSashLayoutWindow_SetAlignment, 372).
+-define(wxSashLayoutWindow_SetDefaultSize, 373).
+-define(wxSashLayoutWindow_SetOrientation, 374).
+-define(wxSashLayoutWindow_destroy, 375).
+-define(wxGrid_new_0, 376).
+-define(wxGrid_new_3, 377).
+-define(wxGrid_new_4, 378).
+-define(wxGrid_destruct, 379).
+-define(wxGrid_AppendCols, 380).
+-define(wxGrid_AppendRows, 381).
+-define(wxGrid_AutoSize, 382).
+-define(wxGrid_AutoSizeColumn, 383).
+-define(wxGrid_AutoSizeColumns, 384).
+-define(wxGrid_AutoSizeRow, 385).
+-define(wxGrid_AutoSizeRows, 386).
+-define(wxGrid_BeginBatch, 387).
+-define(wxGrid_BlockToDeviceRect, 388).
+-define(wxGrid_CanDragColSize, 389).
+-define(wxGrid_CanDragRowSize, 390).
+-define(wxGrid_CanDragGridSize, 391).
+-define(wxGrid_CanEnableCellControl, 392).
+-define(wxGrid_CellToRect_2, 393).
+-define(wxGrid_CellToRect_1, 394).
+-define(wxGrid_ClearGrid, 395).
+-define(wxGrid_ClearSelection, 396).
+-define(wxGrid_CreateGrid, 397).
+-define(wxGrid_DeleteCols, 398).
+-define(wxGrid_DeleteRows, 399).
+-define(wxGrid_DisableCellEditControl, 400).
+-define(wxGrid_DisableDragColSize, 401).
+-define(wxGrid_DisableDragGridSize, 402).
+-define(wxGrid_DisableDragRowSize, 403).
+-define(wxGrid_EnableCellEditControl, 404).
+-define(wxGrid_EnableDragColSize, 405).
+-define(wxGrid_EnableDragGridSize, 406).
+-define(wxGrid_EnableDragRowSize, 407).
+-define(wxGrid_EnableEditing, 408).
+-define(wxGrid_EnableGridLines, 409).
+-define(wxGrid_EndBatch, 410).
+-define(wxGrid_Fit, 411).
+-define(wxGrid_ForceRefresh, 412).
+-define(wxGrid_GetBatchCount, 413).
+-define(wxGrid_GetCellAlignment, 414).
+-define(wxGrid_GetCellBackgroundColour, 415).
+-define(wxGrid_GetCellEditor, 416).
+-define(wxGrid_GetCellFont, 417).
+-define(wxGrid_GetCellRenderer, 418).
+-define(wxGrid_GetCellTextColour, 419).
+-define(wxGrid_GetCellValue_2, 420).
+-define(wxGrid_GetCellValue_1, 421).
+-define(wxGrid_GetColLabelAlignment, 422).
+-define(wxGrid_GetColLabelSize, 423).
+-define(wxGrid_GetColLabelValue, 424).
+-define(wxGrid_GetColMinimalAcceptableWidth, 425).
+-define(wxGrid_GetDefaultCellAlignment, 426).
+-define(wxGrid_GetDefaultCellBackgroundColour, 427).
+-define(wxGrid_GetDefaultCellFont, 428).
+-define(wxGrid_GetDefaultCellTextColour, 429).
+-define(wxGrid_GetDefaultColLabelSize, 430).
+-define(wxGrid_GetDefaultColSize, 431).
+-define(wxGrid_GetDefaultEditor, 432).
+-define(wxGrid_GetDefaultEditorForCell_2, 433).
+-define(wxGrid_GetDefaultEditorForCell_1, 434).
+-define(wxGrid_GetDefaultEditorForType, 435).
+-define(wxGrid_GetDefaultRenderer, 436).
+-define(wxGrid_GetDefaultRendererForCell, 437).
+-define(wxGrid_GetDefaultRendererForType, 438).
+-define(wxGrid_GetDefaultRowLabelSize, 439).
+-define(wxGrid_GetDefaultRowSize, 440).
+-define(wxGrid_GetGridCursorCol, 441).
+-define(wxGrid_GetGridCursorRow, 442).
+-define(wxGrid_GetGridLineColour, 443).
+-define(wxGrid_GridLinesEnabled, 444).
+-define(wxGrid_GetLabelBackgroundColour, 445).
+-define(wxGrid_GetLabelFont, 446).
+-define(wxGrid_GetLabelTextColour, 447).
+-define(wxGrid_GetNumberCols, 448).
+-define(wxGrid_GetNumberRows, 449).
+-define(wxGrid_GetOrCreateCellAttr, 450).
+-define(wxGrid_GetRowMinimalAcceptableHeight, 451).
+-define(wxGrid_GetRowLabelAlignment, 452).
+-define(wxGrid_GetRowLabelSize, 453).
+-define(wxGrid_GetRowLabelValue, 454).
+-define(wxGrid_GetRowSize, 455).
+-define(wxGrid_GetScrollLineX, 456).
+-define(wxGrid_GetScrollLineY, 457).
+-define(wxGrid_GetSelectedCells, 458).
+-define(wxGrid_GetSelectedCols, 459).
+-define(wxGrid_GetSelectedRows, 460).
+-define(wxGrid_GetSelectionBackground, 461).
+-define(wxGrid_GetSelectionBlockTopLeft, 462).
+-define(wxGrid_GetSelectionBlockBottomRight, 463).
+-define(wxGrid_GetSelectionForeground, 464).
+-define(wxGrid_GetViewWidth, 465).
+-define(wxGrid_GetGridWindow, 466).
+-define(wxGrid_GetGridRowLabelWindow, 467).
+-define(wxGrid_GetGridColLabelWindow, 468).
+-define(wxGrid_GetGridCornerLabelWindow, 469).
+-define(wxGrid_HideCellEditControl, 470).
+-define(wxGrid_InsertCols, 471).
+-define(wxGrid_InsertRows, 472).
+-define(wxGrid_IsCellEditControlEnabled, 473).
+-define(wxGrid_IsCurrentCellReadOnly, 474).
+-define(wxGrid_IsEditable, 475).
+-define(wxGrid_IsInSelection_2, 476).
+-define(wxGrid_IsInSelection_1, 477).
+-define(wxGrid_IsReadOnly, 478).
+-define(wxGrid_IsSelection, 479).
+-define(wxGrid_IsVisible_3, 480).
+-define(wxGrid_IsVisible_2, 481).
+-define(wxGrid_MakeCellVisible_2, 482).
+-define(wxGrid_MakeCellVisible_1, 483).
+-define(wxGrid_MoveCursorDown, 484).
+-define(wxGrid_MoveCursorLeft, 485).
+-define(wxGrid_MoveCursorRight, 486).
+-define(wxGrid_MoveCursorUp, 487).
+-define(wxGrid_MoveCursorDownBlock, 488).
+-define(wxGrid_MoveCursorLeftBlock, 489).
+-define(wxGrid_MoveCursorRightBlock, 490).
+-define(wxGrid_MoveCursorUpBlock, 491).
+-define(wxGrid_MovePageDown, 492).
+-define(wxGrid_MovePageUp, 493).
+-define(wxGrid_RegisterDataType, 494).
+-define(wxGrid_SaveEditControlValue, 495).
+-define(wxGrid_SelectAll, 496).
+-define(wxGrid_SelectBlock_5, 497).
+-define(wxGrid_SelectBlock_3, 498).
+-define(wxGrid_SelectCol, 499).
+-define(wxGrid_SelectRow, 500).
+-define(wxGrid_SetCellAlignment_4, 501).
+-define(wxGrid_SetCellAlignment_3, 502).
+-define(wxGrid_SetCellAlignment_1, 503).
+-define(wxGrid_SetCellBackgroundColour_3_0, 504).
+-define(wxGrid_SetCellBackgroundColour_1, 505).
+-define(wxGrid_SetCellBackgroundColour_3_1, 506).
+-define(wxGrid_SetCellEditor, 507).
+-define(wxGrid_SetCellFont, 508).
+-define(wxGrid_SetCellRenderer, 509).
+-define(wxGrid_SetCellTextColour_3_0, 510).
+-define(wxGrid_SetCellTextColour_3_1, 511).
+-define(wxGrid_SetCellTextColour_1, 512).
+-define(wxGrid_SetCellValue_3_0, 513).
+-define(wxGrid_SetCellValue_2, 514).
+-define(wxGrid_SetCellValue_3_1, 515).
+-define(wxGrid_SetColAttr, 516).
+-define(wxGrid_SetColFormatBool, 517).
+-define(wxGrid_SetColFormatNumber, 518).
+-define(wxGrid_SetColFormatFloat, 519).
+-define(wxGrid_SetColFormatCustom, 520).
+-define(wxGrid_SetColLabelAlignment, 521).
+-define(wxGrid_SetColLabelSize, 522).
+-define(wxGrid_SetColLabelValue, 523).
+-define(wxGrid_SetColMinimalWidth, 524).
+-define(wxGrid_SetColMinimalAcceptableWidth, 525).
+-define(wxGrid_SetColSize, 526).
+-define(wxGrid_SetDefaultCellAlignment, 527).
+-define(wxGrid_SetDefaultCellBackgroundColour, 528).
+-define(wxGrid_SetDefaultCellFont, 529).
+-define(wxGrid_SetDefaultCellTextColour, 530).
+-define(wxGrid_SetDefaultEditor, 531).
+-define(wxGrid_SetDefaultRenderer, 532).
+-define(wxGrid_SetDefaultColSize, 533).
+-define(wxGrid_SetDefaultRowSize, 534).
+-define(wxGrid_SetGridCursor, 535).
+-define(wxGrid_SetGridLineColour, 536).
+-define(wxGrid_SetLabelBackgroundColour, 537).
+-define(wxGrid_SetLabelFont, 538).
+-define(wxGrid_SetLabelTextColour, 539).
+-define(wxGrid_SetMargins, 540).
+-define(wxGrid_SetReadOnly, 541).
+-define(wxGrid_SetRowAttr, 542).
+-define(wxGrid_SetRowLabelAlignment, 543).
+-define(wxGrid_SetRowLabelSize, 544).
+-define(wxGrid_SetRowLabelValue, 545).
+-define(wxGrid_SetRowMinimalHeight, 546).
+-define(wxGrid_SetRowMinimalAcceptableHeight, 547).
+-define(wxGrid_SetRowSize, 548).
+-define(wxGrid_SetScrollLineX, 549).
+-define(wxGrid_SetScrollLineY, 550).
+-define(wxGrid_SetSelectionBackground, 551).
+-define(wxGrid_SetSelectionForeground, 552).
+-define(wxGrid_SetSelectionMode, 553).
+-define(wxGrid_ShowCellEditControl, 554).
+-define(wxGrid_XToCol, 555).
+-define(wxGrid_XToEdgeOfCol, 556).
+-define(wxGrid_YToEdgeOfRow, 557).
+-define(wxGrid_YToRow, 558).
+-define(wxGridCellRenderer_Draw, 559).
+-define(wxGridCellRenderer_GetBestSize, 560).
+-define(wxGridCellEditor_Create, 561).
+-define(wxGridCellEditor_IsCreated, 562).
+-define(wxGridCellEditor_SetSize, 563).
+-define(wxGridCellEditor_Show, 564).
+-define(wxGridCellEditor_PaintBackground, 565).
+-define(wxGridCellEditor_BeginEdit, 566).
+-define(wxGridCellEditor_EndEdit, 567).
+-define(wxGridCellEditor_Reset, 568).
+-define(wxGridCellEditor_StartingKey, 569).
+-define(wxGridCellEditor_StartingClick, 570).
+-define(wxGridCellEditor_HandleReturn, 571).
+-define(wxGridCellBoolRenderer_new, 572).
+-define(wxGridCellBoolRenderer_destroy, 573).
+-define(wxGridCellBoolEditor_new, 574).
+-define(wxGridCellBoolEditor_IsTrueValue, 575).
+-define(wxGridCellBoolEditor_UseStringValues, 576).
+-define(wxGridCellBoolEditor_destroy, 577).
+-define(wxGridCellFloatRenderer_new, 578).
+-define(wxGridCellFloatRenderer_GetPrecision, 579).
+-define(wxGridCellFloatRenderer_GetWidth, 580).
+-define(wxGridCellFloatRenderer_SetParameters, 581).
+-define(wxGridCellFloatRenderer_SetPrecision, 582).
+-define(wxGridCellFloatRenderer_SetWidth, 583).
+-define(wxGridCellFloatRenderer_destroy, 584).
+-define(wxGridCellFloatEditor_new, 585).
+-define(wxGridCellFloatEditor_SetParameters, 586).
+-define(wxGridCellFloatEditor_destroy, 587).
+-define(wxGridCellStringRenderer_new, 588).
+-define(wxGridCellStringRenderer_destroy, 589).
+-define(wxGridCellTextEditor_new, 590).
+-define(wxGridCellTextEditor_SetParameters, 591).
+-define(wxGridCellTextEditor_destroy, 592).
+-define(wxGridCellChoiceEditor_new, 594).
+-define(wxGridCellChoiceEditor_SetParameters, 595).
+-define(wxGridCellChoiceEditor_destroy, 596).
+-define(wxGridCellNumberRenderer_new, 597).
+-define(wxGridCellNumberRenderer_destroy, 598).
+-define(wxGridCellNumberEditor_new, 599).
+-define(wxGridCellNumberEditor_GetValue, 600).
+-define(wxGridCellNumberEditor_SetParameters, 601).
+-define(wxGridCellNumberEditor_destroy, 602).
+-define(wxGridCellAttr_SetTextColour, 603).
+-define(wxGridCellAttr_SetBackgroundColour, 604).
+-define(wxGridCellAttr_SetFont, 605).
+-define(wxGridCellAttr_SetAlignment, 606).
+-define(wxGridCellAttr_SetReadOnly, 607).
+-define(wxGridCellAttr_SetRenderer, 608).
+-define(wxGridCellAttr_SetEditor, 609).
+-define(wxGridCellAttr_HasTextColour, 610).
+-define(wxGridCellAttr_HasBackgroundColour, 611).
+-define(wxGridCellAttr_HasFont, 612).
+-define(wxGridCellAttr_HasAlignment, 613).
+-define(wxGridCellAttr_HasRenderer, 614).
+-define(wxGridCellAttr_HasEditor, 615).
+-define(wxGridCellAttr_GetTextColour, 616).
+-define(wxGridCellAttr_GetBackgroundColour, 617).
+-define(wxGridCellAttr_GetFont, 618).
+-define(wxGridCellAttr_GetAlignment, 619).
+-define(wxGridCellAttr_GetRenderer, 620).
+-define(wxGridCellAttr_GetEditor, 621).
+-define(wxGridCellAttr_IsReadOnly, 622).
+-define(wxGridCellAttr_SetDefAttr, 623).
+-define(wxDC_Blit, 624).
+-define(wxDC_CalcBoundingBox, 625).
+-define(wxDC_Clear, 626).
+-define(wxDC_ComputeScaleAndOrigin, 627).
+-define(wxDC_CrossHair, 628).
+-define(wxDC_DestroyClippingRegion, 629).
+-define(wxDC_DeviceToLogicalX, 630).
+-define(wxDC_DeviceToLogicalXRel, 631).
+-define(wxDC_DeviceToLogicalY, 632).
+-define(wxDC_DeviceToLogicalYRel, 633).
+-define(wxDC_DrawArc, 634).
+-define(wxDC_DrawBitmap, 635).
+-define(wxDC_DrawCheckMark, 636).
+-define(wxDC_DrawCircle, 637).
+-define(wxDC_DrawEllipse_2, 639).
+-define(wxDC_DrawEllipse_1, 640).
+-define(wxDC_DrawEllipticArc, 641).
+-define(wxDC_DrawIcon, 642).
+-define(wxDC_DrawLabel, 643).
+-define(wxDC_DrawLine, 644).
+-define(wxDC_DrawLines, 645).
+-define(wxDC_DrawPolygon, 647).
+-define(wxDC_DrawPoint, 649).
+-define(wxDC_DrawRectangle_2, 651).
+-define(wxDC_DrawRectangle_1, 652).
+-define(wxDC_DrawRotatedText, 653).
+-define(wxDC_DrawRoundedRectangle_3, 655).
+-define(wxDC_DrawRoundedRectangle_2, 656).
+-define(wxDC_DrawText, 657).
+-define(wxDC_EndDoc, 658).
+-define(wxDC_EndPage, 659).
+-define(wxDC_FloodFill, 660).
+-define(wxDC_GetBackground, 661).
+-define(wxDC_GetBackgroundMode, 662).
+-define(wxDC_GetBrush, 663).
+-define(wxDC_GetCharHeight, 664).
+-define(wxDC_GetCharWidth, 665).
+-define(wxDC_GetClippingBox, 666).
+-define(wxDC_GetFont, 668).
+-define(wxDC_GetLayoutDirection, 669).
+-define(wxDC_GetLogicalFunction, 670).
+-define(wxDC_GetMapMode, 671).
+-define(wxDC_GetMultiLineTextExtent_4, 672).
+-define(wxDC_GetMultiLineTextExtent_1, 673).
+-define(wxDC_GetPartialTextExtents, 674).
+-define(wxDC_GetPen, 675).
+-define(wxDC_GetPixel, 676).
+-define(wxDC_GetPPI, 677).
+-define(wxDC_GetSize, 679).
+-define(wxDC_GetSizeMM, 681).
+-define(wxDC_GetTextBackground, 682).
+-define(wxDC_GetTextExtent_4, 683).
+-define(wxDC_GetTextExtent_1, 684).
+-define(wxDC_GetTextForeground, 686).
+-define(wxDC_GetUserScale, 687).
+-define(wxDC_GradientFillConcentric_3, 688).
+-define(wxDC_GradientFillConcentric_4, 689).
+-define(wxDC_GradientFillLinear, 690).
+-define(wxDC_LogicalToDeviceX, 691).
+-define(wxDC_LogicalToDeviceXRel, 692).
+-define(wxDC_LogicalToDeviceY, 693).
+-define(wxDC_LogicalToDeviceYRel, 694).
+-define(wxDC_MaxX, 695).
+-define(wxDC_MaxY, 696).
+-define(wxDC_MinX, 697).
+-define(wxDC_MinY, 698).
+-define(wxDC_IsOk, 699).
+-define(wxDC_ResetBoundingBox, 700).
+-define(wxDC_SetAxisOrientation, 701).
+-define(wxDC_SetBackground, 702).
+-define(wxDC_SetBackgroundMode, 703).
+-define(wxDC_SetBrush, 704).
+-define(wxDC_SetClippingRegion_2, 706).
+-define(wxDC_SetClippingRegion_1_1, 707).
+-define(wxDC_SetClippingRegion_1_0, 708).
+-define(wxDC_SetDeviceOrigin, 709).
+-define(wxDC_SetFont, 710).
+-define(wxDC_SetLayoutDirection, 711).
+-define(wxDC_SetLogicalFunction, 712).
+-define(wxDC_SetMapMode, 713).
+-define(wxDC_SetPalette, 714).
+-define(wxDC_SetPen, 715).
+-define(wxDC_SetTextBackground, 716).
+-define(wxDC_SetTextForeground, 717).
+-define(wxDC_SetUserScale, 718).
+-define(wxDC_StartDoc, 719).
+-define(wxDC_StartPage, 720).
+-define(wxMirrorDC_new, 721).
+-define(wxMirrorDC_destroy, 722).
+-define(wxScreenDC_new, 723).
+-define(wxScreenDC_destruct, 724).
+-define(wxPostScriptDC_new_0, 725).
+-define(wxPostScriptDC_new_1, 726).
+-define(wxPostScriptDC_destruct, 727).
+-define(wxPostScriptDC_SetResolution, 728).
+-define(wxPostScriptDC_GetResolution, 729).
+-define(wxWindowDC_new_0, 730).
+-define(wxWindowDC_new_1, 731).
+-define(wxWindowDC_destruct, 732).
+-define(wxClientDC_new_0, 733).
+-define(wxClientDC_new_1, 734).
+-define(wxClientDC_destroy, 735).
+-define(wxPaintDC_new_0, 736).
+-define(wxPaintDC_new_1, 737).
+-define(wxPaintDC_destroy, 738).
+-define(wxMemoryDC_new_1_0, 740).
+-define(wxMemoryDC_new_1_1, 741).
+-define(wxMemoryDC_new_0, 742).
+-define(wxMemoryDC_destruct, 744).
+-define(wxMemoryDC_SelectObject, 745).
+-define(wxMemoryDC_SelectObjectAsSource, 746).
+-define(wxBufferedDC_new_0, 747).
+-define(wxBufferedDC_new_2, 748).
+-define(wxBufferedDC_new_3, 749).
+-define(wxBufferedDC_destruct, 750).
+-define(wxBufferedDC_Init_2, 751).
+-define(wxBufferedDC_Init_3, 752).
+-define(wxBufferedPaintDC_new_3, 753).
+-define(wxBufferedPaintDC_new_2, 754).
+-define(wxBufferedPaintDC_destruct, 755).
+-define(wxGraphicsObject_destruct, 756).
+-define(wxGraphicsObject_GetRenderer, 757).
+-define(wxGraphicsObject_IsNull, 758).
+-define(wxGraphicsContext_destruct, 759).
+-define(wxGraphicsContext_Create_1_1, 760).
+-define(wxGraphicsContext_Create_1_0, 761).
+-define(wxGraphicsContext_Create_0, 762).
+-define(wxGraphicsContext_CreatePen, 763).
+-define(wxGraphicsContext_CreateBrush, 764).
+-define(wxGraphicsContext_CreateRadialGradientBrush, 765).
+-define(wxGraphicsContext_CreateLinearGradientBrush, 766).
+-define(wxGraphicsContext_CreateFont, 767).
+-define(wxGraphicsContext_CreateMatrix, 768).
+-define(wxGraphicsContext_CreatePath, 769).
+-define(wxGraphicsContext_Clip_1, 770).
+-define(wxGraphicsContext_Clip_4, 771).
+-define(wxGraphicsContext_ResetClip, 772).
+-define(wxGraphicsContext_DrawBitmap, 773).
+-define(wxGraphicsContext_DrawEllipse, 774).
+-define(wxGraphicsContext_DrawIcon, 775).
+-define(wxGraphicsContext_DrawLines, 776).
+-define(wxGraphicsContext_DrawPath, 777).
+-define(wxGraphicsContext_DrawRectangle, 778).
+-define(wxGraphicsContext_DrawRoundedRectangle, 779).
+-define(wxGraphicsContext_DrawText_3, 780).
+-define(wxGraphicsContext_DrawText_4_0, 781).
+-define(wxGraphicsContext_DrawText_4_1, 782).
+-define(wxGraphicsContext_DrawText_5, 783).
+-define(wxGraphicsContext_FillPath, 784).
+-define(wxGraphicsContext_StrokePath, 785).
+-define(wxGraphicsContext_GetPartialTextExtents, 786).
+-define(wxGraphicsContext_GetTextExtent, 787).
+-define(wxGraphicsContext_Rotate, 788).
+-define(wxGraphicsContext_Scale, 789).
+-define(wxGraphicsContext_Translate, 790).
+-define(wxGraphicsContext_GetTransform, 791).
+-define(wxGraphicsContext_SetTransform, 792).
+-define(wxGraphicsContext_ConcatTransform, 793).
+-define(wxGraphicsContext_SetBrush_1_1, 794).
+-define(wxGraphicsContext_SetBrush_1_0, 795).
+-define(wxGraphicsContext_SetFont_1, 796).
+-define(wxGraphicsContext_SetFont_2, 797).
+-define(wxGraphicsContext_SetPen_1_0, 798).
+-define(wxGraphicsContext_SetPen_1_1, 799).
+-define(wxGraphicsContext_StrokeLine, 800).
+-define(wxGraphicsContext_StrokeLines, 801).
+-define(wxGraphicsMatrix_Concat, 803).
+-define(wxGraphicsMatrix_Get, 805).
+-define(wxGraphicsMatrix_Invert, 806).
+-define(wxGraphicsMatrix_IsEqual, 807).
+-define(wxGraphicsMatrix_IsIdentity, 809).
+-define(wxGraphicsMatrix_Rotate, 810).
+-define(wxGraphicsMatrix_Scale, 811).
+-define(wxGraphicsMatrix_Translate, 812).
+-define(wxGraphicsMatrix_Set, 813).
+-define(wxGraphicsMatrix_TransformPoint, 814).
+-define(wxGraphicsMatrix_TransformDistance, 815).
+-define(wxGraphicsPath_MoveToPoint_2, 816).
+-define(wxGraphicsPath_MoveToPoint_1, 817).
+-define(wxGraphicsPath_AddArc_6, 818).
+-define(wxGraphicsPath_AddArc_5, 819).
+-define(wxGraphicsPath_AddArcToPoint, 820).
+-define(wxGraphicsPath_AddCircle, 821).
+-define(wxGraphicsPath_AddCurveToPoint_6, 822).
+-define(wxGraphicsPath_AddCurveToPoint_3, 823).
+-define(wxGraphicsPath_AddEllipse, 824).
+-define(wxGraphicsPath_AddLineToPoint_2, 825).
+-define(wxGraphicsPath_AddLineToPoint_1, 826).
+-define(wxGraphicsPath_AddPath, 827).
+-define(wxGraphicsPath_AddQuadCurveToPoint, 828).
+-define(wxGraphicsPath_AddRectangle, 829).
+-define(wxGraphicsPath_AddRoundedRectangle, 830).
+-define(wxGraphicsPath_CloseSubpath, 831).
+-define(wxGraphicsPath_Contains_3, 832).
+-define(wxGraphicsPath_Contains_2, 833).
+-define(wxGraphicsPath_GetBox, 835).
+-define(wxGraphicsPath_GetCurrentPoint, 837).
+-define(wxGraphicsPath_Transform, 838).
+-define(wxGraphicsRenderer_GetDefaultRenderer, 839).
+-define(wxGraphicsRenderer_CreateContext_1_1, 840).
+-define(wxGraphicsRenderer_CreateContext_1_0, 841).
+-define(wxGraphicsRenderer_CreatePen, 842).
+-define(wxGraphicsRenderer_CreateBrush, 843).
+-define(wxGraphicsRenderer_CreateLinearGradientBrush, 844).
+-define(wxGraphicsRenderer_CreateRadialGradientBrush, 845).
+-define(wxGraphicsRenderer_CreateFont, 846).
+-define(wxGraphicsRenderer_CreateMatrix, 847).
+-define(wxGraphicsRenderer_CreatePath, 848).
+-define(wxMenuBar_new_1, 850).
+-define(wxMenuBar_new_0, 852).
+-define(wxMenuBar_destruct, 854).
+-define(wxMenuBar_Append, 855).
+-define(wxMenuBar_Check, 856).
+-define(wxMenuBar_Enable_2, 857).
+-define(wxMenuBar_Enable_1, 858).
+-define(wxMenuBar_EnableTop, 859).
+-define(wxMenuBar_FindMenu, 860).
+-define(wxMenuBar_FindMenuItem, 861).
+-define(wxMenuBar_FindItem, 862).
+-define(wxMenuBar_GetHelpString, 863).
+-define(wxMenuBar_GetLabel_1, 864).
+-define(wxMenuBar_GetLabel_0, 865).
+-define(wxMenuBar_GetLabelTop, 866).
+-define(wxMenuBar_GetMenu, 867).
+-define(wxMenuBar_GetMenuCount, 868).
+-define(wxMenuBar_Insert, 869).
+-define(wxMenuBar_IsChecked, 870).
+-define(wxMenuBar_IsEnabled_1, 871).
+-define(wxMenuBar_IsEnabled_0, 872).
+-define(wxMenuBar_Remove, 873).
+-define(wxMenuBar_Replace, 874).
+-define(wxMenuBar_SetHelpString, 875).
+-define(wxMenuBar_SetLabel_2, 876).
+-define(wxMenuBar_SetLabel_1, 877).
+-define(wxMenuBar_SetLabelTop, 878).
+-define(wxControl_GetLabel, 879).
+-define(wxControl_SetLabel, 880).
+-define(wxControlWithItems_Append_1, 881).
+-define(wxControlWithItems_Append_2, 882).
+-define(wxControlWithItems_appendStrings_1, 883).
+-define(wxControlWithItems_Clear, 884).
+-define(wxControlWithItems_Delete, 885).
+-define(wxControlWithItems_FindString, 886).
+-define(wxControlWithItems_getClientData, 887).
+-define(wxControlWithItems_setClientData, 888).
+-define(wxControlWithItems_GetCount, 889).
+-define(wxControlWithItems_GetSelection, 890).
+-define(wxControlWithItems_GetString, 891).
+-define(wxControlWithItems_GetStringSelection, 892).
+-define(wxControlWithItems_Insert_2, 893).
+-define(wxControlWithItems_Insert_3, 894).
+-define(wxControlWithItems_IsEmpty, 895).
+-define(wxControlWithItems_Select, 896).
+-define(wxControlWithItems_SetSelection, 897).
+-define(wxControlWithItems_SetString, 898).
+-define(wxControlWithItems_SetStringSelection, 899).
+-define(wxMenu_new_2, 902).
+-define(wxMenu_new_1, 903).
+-define(wxMenu_destruct, 905).
+-define(wxMenu_Append_3, 906).
+-define(wxMenu_Append_1, 907).
+-define(wxMenu_Append_4_0, 908).
+-define(wxMenu_Append_4_1, 909).
+-define(wxMenu_AppendCheckItem, 910).
+-define(wxMenu_AppendRadioItem, 911).
+-define(wxMenu_AppendSeparator, 912).
+-define(wxMenu_Break, 913).
+-define(wxMenu_Check, 914).
+-define(wxMenu_Delete_1_0, 915).
+-define(wxMenu_Delete_1_1, 916).
+-define(wxMenu_Destroy_1_0, 917).
+-define(wxMenu_Destroy_1_1, 918).
+-define(wxMenu_Enable, 919).
+-define(wxMenu_FindItem_1, 920).
+-define(wxMenu_FindItem_2, 921).
+-define(wxMenu_FindItemByPosition, 922).
+-define(wxMenu_GetHelpString, 923).
+-define(wxMenu_GetLabel, 924).
+-define(wxMenu_GetMenuItemCount, 925).
+-define(wxMenu_GetMenuItems, 926).
+-define(wxMenu_GetTitle, 928).
+-define(wxMenu_Insert_2, 929).
+-define(wxMenu_Insert_3, 930).
+-define(wxMenu_Insert_5_1, 931).
+-define(wxMenu_Insert_5_0, 932).
+-define(wxMenu_InsertCheckItem, 933).
+-define(wxMenu_InsertRadioItem, 934).
+-define(wxMenu_InsertSeparator, 935).
+-define(wxMenu_IsChecked, 936).
+-define(wxMenu_IsEnabled, 937).
+-define(wxMenu_Prepend_1, 938).
+-define(wxMenu_Prepend_2, 939).
+-define(wxMenu_Prepend_4_1, 940).
+-define(wxMenu_Prepend_4_0, 941).
+-define(wxMenu_PrependCheckItem, 942).
+-define(wxMenu_PrependRadioItem, 943).
+-define(wxMenu_PrependSeparator, 944).
+-define(wxMenu_Remove_1_0, 945).
+-define(wxMenu_Remove_1_1, 946).
+-define(wxMenu_SetHelpString, 947).
+-define(wxMenu_SetLabel, 948).
+-define(wxMenu_SetTitle, 949).
+-define(wxMenuItem_new, 950).
+-define(wxMenuItem_destruct, 952).
+-define(wxMenuItem_Check, 953).
+-define(wxMenuItem_Enable, 954).
+-define(wxMenuItem_GetBitmap, 955).
+-define(wxMenuItem_GetHelp, 956).
+-define(wxMenuItem_GetId, 957).
+-define(wxMenuItem_GetKind, 958).
+-define(wxMenuItem_GetLabel, 959).
+-define(wxMenuItem_GetLabelFromText, 960).
+-define(wxMenuItem_GetMenu, 961).
+-define(wxMenuItem_GetText, 962).
+-define(wxMenuItem_GetSubMenu, 963).
+-define(wxMenuItem_IsCheckable, 964).
+-define(wxMenuItem_IsChecked, 965).
+-define(wxMenuItem_IsEnabled, 966).
+-define(wxMenuItem_IsSeparator, 967).
+-define(wxMenuItem_IsSubMenu, 968).
+-define(wxMenuItem_SetBitmap, 969).
+-define(wxMenuItem_SetHelp, 970).
+-define(wxMenuItem_SetMenu, 971).
+-define(wxMenuItem_SetSubMenu, 972).
+-define(wxMenuItem_SetText, 973).
+-define(wxToolBar_AddControl, 974).
+-define(wxToolBar_AddSeparator, 975).
+-define(wxToolBar_AddTool_5, 976).
+-define(wxToolBar_AddTool_4_0, 977).
+-define(wxToolBar_AddTool_1, 978).
+-define(wxToolBar_AddTool_4_1, 979).
+-define(wxToolBar_AddTool_3, 980).
+-define(wxToolBar_AddTool_6, 981).
+-define(wxToolBar_AddCheckTool, 982).
+-define(wxToolBar_AddRadioTool, 983).
+-define(wxToolBar_DeleteTool, 984).
+-define(wxToolBar_DeleteToolByPos, 985).
+-define(wxToolBar_EnableTool, 986).
+-define(wxToolBar_FindById, 987).
+-define(wxToolBar_FindControl, 988).
+-define(wxToolBar_FindToolForPosition, 989).
+-define(wxToolBar_GetToolSize, 990).
+-define(wxToolBar_GetToolBitmapSize, 991).
+-define(wxToolBar_GetMargins, 992).
+-define(wxToolBar_GetToolEnabled, 993).
+-define(wxToolBar_GetToolLongHelp, 994).
+-define(wxToolBar_GetToolPacking, 995).
+-define(wxToolBar_GetToolPos, 996).
+-define(wxToolBar_GetToolSeparation, 997).
+-define(wxToolBar_GetToolShortHelp, 998).
+-define(wxToolBar_GetToolState, 999).
+-define(wxToolBar_InsertControl, 1000).
+-define(wxToolBar_InsertSeparator, 1001).
+-define(wxToolBar_InsertTool_5, 1002).
+-define(wxToolBar_InsertTool_2, 1003).
+-define(wxToolBar_InsertTool_4, 1004).
+-define(wxToolBar_Realize, 1005).
+-define(wxToolBar_RemoveTool, 1006).
+-define(wxToolBar_SetMargins, 1007).
+-define(wxToolBar_SetToolBitmapSize, 1008).
+-define(wxToolBar_SetToolLongHelp, 1009).
+-define(wxToolBar_SetToolPacking, 1010).
+-define(wxToolBar_SetToolShortHelp, 1011).
+-define(wxToolBar_SetToolSeparation, 1012).
+-define(wxToolBar_ToggleTool, 1013).
+-define(wxStatusBar_new_0, 1015).
+-define(wxStatusBar_new_2, 1016).
+-define(wxStatusBar_destruct, 1018).
+-define(wxStatusBar_Create, 1019).
+-define(wxStatusBar_GetFieldRect, 1020).
+-define(wxStatusBar_GetFieldsCount, 1021).
+-define(wxStatusBar_GetStatusText, 1022).
+-define(wxStatusBar_PopStatusText, 1023).
+-define(wxStatusBar_PushStatusText, 1024).
+-define(wxStatusBar_SetFieldsCount, 1025).
+-define(wxStatusBar_SetMinHeight, 1026).
+-define(wxStatusBar_SetStatusText, 1027).
+-define(wxStatusBar_SetStatusWidths, 1028).
+-define(wxStatusBar_SetStatusStyles, 1029).
+-define(wxBitmap_new_0, 1030).
+-define(wxBitmap_new_3, 1031).
+-define(wxBitmap_new_4, 1032).
+-define(wxBitmap_new_2_0, 1033).
+-define(wxBitmap_new_2_1, 1034).
+-define(wxBitmap_destruct, 1035).
+-define(wxBitmap_ConvertToImage, 1036).
+-define(wxBitmap_CopyFromIcon, 1037).
+-define(wxBitmap_Create, 1038).
+-define(wxBitmap_GetDepth, 1039).
+-define(wxBitmap_GetHeight, 1040).
+-define(wxBitmap_GetPalette, 1041).
+-define(wxBitmap_GetMask, 1042).
+-define(wxBitmap_GetWidth, 1043).
+-define(wxBitmap_GetSubBitmap, 1044).
+-define(wxBitmap_LoadFile, 1045).
+-define(wxBitmap_Ok, 1046).
+-define(wxBitmap_SaveFile, 1047).
+-define(wxBitmap_SetDepth, 1048).
+-define(wxBitmap_SetHeight, 1049).
+-define(wxBitmap_SetMask, 1050).
+-define(wxBitmap_SetPalette, 1051).
+-define(wxBitmap_SetWidth, 1052).
+-define(wxIcon_new_0, 1053).
+-define(wxIcon_new_2, 1054).
+-define(wxIcon_new_1, 1055).
+-define(wxIcon_CopyFromBitmap, 1056).
+-define(wxIcon_destroy, 1057).
+-define(wxIconBundle_new_0, 1058).
+-define(wxIconBundle_new_2, 1059).
+-define(wxIconBundle_new_1_0, 1060).
+-define(wxIconBundle_new_1_1, 1061).
+-define(wxIconBundle_destruct, 1062).
+-define(wxIconBundle_AddIcon_2, 1063).
+-define(wxIconBundle_AddIcon_1, 1064).
+-define(wxIconBundle_GetIcon_1_1, 1065).
+-define(wxIconBundle_GetIcon_1_0, 1066).
+-define(wxCursor_new_0, 1067).
+-define(wxCursor_new_1_0, 1068).
+-define(wxCursor_new_1_1, 1069).
+-define(wxCursor_new_4, 1070).
+-define(wxCursor_destruct, 1071).
+-define(wxCursor_Ok, 1072).
+-define(wxMask_new_0, 1073).
+-define(wxMask_new_2_1, 1074).
+-define(wxMask_new_2_0, 1075).
+-define(wxMask_new_1, 1076).
+-define(wxMask_destruct, 1077).
+-define(wxMask_Create_2_1, 1078).
+-define(wxMask_Create_2_0, 1079).
+-define(wxMask_Create_1, 1080).
+-define(wxImage_new_0, 1081).
+-define(wxImage_new_3_0, 1082).
+-define(wxImage_new_4, 1083).
+-define(wxImage_new_5, 1084).
+-define(wxImage_new_2, 1085).
+-define(wxImage_new_3_1, 1086).
+-define(wxImage_Blur, 1087).
+-define(wxImage_BlurHorizontal, 1088).
+-define(wxImage_BlurVertical, 1089).
+-define(wxImage_ConvertAlphaToMask, 1090).
+-define(wxImage_ConvertToGreyscale, 1091).
+-define(wxImage_ConvertToMono, 1092).
+-define(wxImage_Copy, 1093).
+-define(wxImage_Create_3, 1094).
+-define(wxImage_Create_4, 1095).
+-define(wxImage_Create_5, 1096).
+-define(wxImage_Destroy, 1097).
+-define(wxImage_FindFirstUnusedColour, 1098).
+-define(wxImage_GetImageExtWildcard, 1099).
+-define(wxImage_GetAlpha_2, 1100).
+-define(wxImage_GetAlpha_0, 1101).
+-define(wxImage_GetBlue, 1102).
+-define(wxImage_GetData, 1103).
+-define(wxImage_GetGreen, 1104).
+-define(wxImage_GetImageCount, 1105).
+-define(wxImage_GetHeight, 1106).
+-define(wxImage_GetMaskBlue, 1107).
+-define(wxImage_GetMaskGreen, 1108).
+-define(wxImage_GetMaskRed, 1109).
+-define(wxImage_GetOrFindMaskColour, 1110).
+-define(wxImage_GetPalette, 1111).
+-define(wxImage_GetRed, 1112).
+-define(wxImage_GetSubImage, 1113).
+-define(wxImage_GetWidth, 1114).
+-define(wxImage_HasAlpha, 1115).
+-define(wxImage_HasMask, 1116).
+-define(wxImage_GetOption, 1117).
+-define(wxImage_GetOptionInt, 1118).
+-define(wxImage_HasOption, 1119).
+-define(wxImage_InitAlpha, 1120).
+-define(wxImage_InitStandardHandlers, 1121).
+-define(wxImage_IsTransparent, 1122).
+-define(wxImage_LoadFile_2, 1123).
+-define(wxImage_LoadFile_3, 1124).
+-define(wxImage_Ok, 1125).
+-define(wxImage_RemoveHandler, 1126).
+-define(wxImage_Mirror, 1127).
+-define(wxImage_Replace, 1128).
+-define(wxImage_Rescale, 1129).
+-define(wxImage_Resize, 1130).
+-define(wxImage_Rotate, 1131).
+-define(wxImage_RotateHue, 1132).
+-define(wxImage_Rotate90, 1133).
+-define(wxImage_SaveFile_1, 1134).
+-define(wxImage_SaveFile_2_0, 1135).
+-define(wxImage_SaveFile_2_1, 1136).
+-define(wxImage_Scale, 1137).
+-define(wxImage_Size, 1138).
+-define(wxImage_SetAlpha_3, 1139).
+-define(wxImage_SetAlpha_2, 1140).
+-define(wxImage_SetData_2, 1141).
+-define(wxImage_SetData_4, 1142).
+-define(wxImage_SetMask, 1143).
+-define(wxImage_SetMaskColour, 1144).
+-define(wxImage_SetMaskFromImage, 1145).
+-define(wxImage_SetOption_2_1, 1146).
+-define(wxImage_SetOption_2_0, 1147).
+-define(wxImage_SetPalette, 1148).
+-define(wxImage_SetRGB_5, 1149).
+-define(wxImage_SetRGB_4, 1150).
+-define(wxImage_destroy, 1151).
+-define(wxBrush_new_0, 1152).
+-define(wxBrush_new_2, 1153).
+-define(wxBrush_new_1, 1154).
+-define(wxBrush_destruct, 1156).
+-define(wxBrush_GetColour, 1157).
+-define(wxBrush_GetStipple, 1158).
+-define(wxBrush_GetStyle, 1159).
+-define(wxBrush_IsHatch, 1160).
+-define(wxBrush_IsOk, 1161).
+-define(wxBrush_SetColour_1, 1162).
+-define(wxBrush_SetColour_3, 1163).
+-define(wxBrush_SetStipple, 1164).
+-define(wxBrush_SetStyle, 1165).
+-define(wxPen_new_0, 1166).
+-define(wxPen_new_2, 1167).
+-define(wxPen_destruct, 1168).
+-define(wxPen_GetCap, 1169).
+-define(wxPen_GetColour, 1170).
+-define(wxPen_GetJoin, 1171).
+-define(wxPen_GetStyle, 1172).
+-define(wxPen_GetWidth, 1173).
+-define(wxPen_IsOk, 1174).
+-define(wxPen_SetCap, 1175).
+-define(wxPen_SetColour_1, 1176).
+-define(wxPen_SetColour_3, 1177).
+-define(wxPen_SetJoin, 1178).
+-define(wxPen_SetStyle, 1179).
+-define(wxPen_SetWidth, 1180).
+-define(wxRegion_new_0, 1181).
+-define(wxRegion_new_4, 1182).
+-define(wxRegion_new_2, 1183).
+-define(wxRegion_new_1_1, 1184).
+-define(wxRegion_new_1_0, 1186).
+-define(wxRegion_destruct, 1188).
+-define(wxRegion_Clear, 1189).
+-define(wxRegion_Contains_2, 1190).
+-define(wxRegion_Contains_1_0, 1191).
+-define(wxRegion_Contains_4, 1192).
+-define(wxRegion_Contains_1_1, 1193).
+-define(wxRegion_ConvertToBitmap, 1194).
+-define(wxRegion_GetBox, 1195).
+-define(wxRegion_Intersect_4, 1196).
+-define(wxRegion_Intersect_1_1, 1197).
+-define(wxRegion_Intersect_1_0, 1198).
+-define(wxRegion_IsEmpty, 1199).
+-define(wxRegion_Subtract_4, 1200).
+-define(wxRegion_Subtract_1_1, 1201).
+-define(wxRegion_Subtract_1_0, 1202).
+-define(wxRegion_Offset_2, 1203).
+-define(wxRegion_Offset_1, 1204).
+-define(wxRegion_Union_4, 1205).
+-define(wxRegion_Union_1_2, 1206).
+-define(wxRegion_Union_1_1, 1207).
+-define(wxRegion_Union_1_0, 1208).
+-define(wxRegion_Union_3, 1209).
+-define(wxRegion_Xor_4, 1210).
+-define(wxRegion_Xor_1_1, 1211).
+-define(wxRegion_Xor_1_0, 1212).
+-define(wxAcceleratorTable_new_0, 1213).
+-define(wxAcceleratorTable_new_2, 1214).
+-define(wxAcceleratorTable_destruct, 1215).
+-define(wxAcceleratorTable_Ok, 1216).
+-define(wxAcceleratorEntry_new_1_0, 1217).
+-define(wxAcceleratorEntry_new_1_1, 1218).
+-define(wxAcceleratorEntry_GetCommand, 1219).
+-define(wxAcceleratorEntry_GetFlags, 1220).
+-define(wxAcceleratorEntry_GetKeyCode, 1221).
+-define(wxAcceleratorEntry_Set, 1222).
+-define(wxAcceleratorEntry_destroy, 1223).
+-define(wxCaret_new_3, 1228).
+-define(wxCaret_new_2, 1229).
+-define(wxCaret_destruct, 1231).
+-define(wxCaret_Create_3, 1232).
+-define(wxCaret_Create_2, 1233).
+-define(wxCaret_GetBlinkTime, 1234).
+-define(wxCaret_GetPosition, 1236).
+-define(wxCaret_GetSize, 1238).
+-define(wxCaret_GetWindow, 1239).
+-define(wxCaret_Hide, 1240).
+-define(wxCaret_IsOk, 1241).
+-define(wxCaret_IsVisible, 1242).
+-define(wxCaret_Move_2, 1243).
+-define(wxCaret_Move_1, 1244).
+-define(wxCaret_SetBlinkTime, 1245).
+-define(wxCaret_SetSize_2, 1246).
+-define(wxCaret_SetSize_1, 1247).
+-define(wxCaret_Show, 1248).
+-define(wxSizer_Add_2_1, 1249).
+-define(wxSizer_Add_2_0, 1250).
+-define(wxSizer_Add_3, 1251).
+-define(wxSizer_Add_2_3, 1252).
+-define(wxSizer_Add_2_2, 1253).
+-define(wxSizer_AddSpacer, 1254).
+-define(wxSizer_AddStretchSpacer, 1255).
+-define(wxSizer_CalcMin, 1256).
+-define(wxSizer_Clear, 1257).
+-define(wxSizer_Detach_1_2, 1258).
+-define(wxSizer_Detach_1_1, 1259).
+-define(wxSizer_Detach_1_0, 1260).
+-define(wxSizer_Fit, 1261).
+-define(wxSizer_FitInside, 1262).
+-define(wxSizer_GetChildren, 1263).
+-define(wxSizer_GetItem_2_1, 1264).
+-define(wxSizer_GetItem_2_0, 1265).
+-define(wxSizer_GetItem_1, 1266).
+-define(wxSizer_GetSize, 1267).
+-define(wxSizer_GetPosition, 1268).
+-define(wxSizer_GetMinSize, 1269).
+-define(wxSizer_Hide_2_0, 1270).
+-define(wxSizer_Hide_2_1, 1271).
+-define(wxSizer_Hide_1, 1272).
+-define(wxSizer_Insert_3_1, 1273).
+-define(wxSizer_Insert_3_0, 1274).
+-define(wxSizer_Insert_4, 1275).
+-define(wxSizer_Insert_3_3, 1276).
+-define(wxSizer_Insert_3_2, 1277).
+-define(wxSizer_Insert_2, 1278).
+-define(wxSizer_InsertSpacer, 1279).
+-define(wxSizer_InsertStretchSpacer, 1280).
+-define(wxSizer_IsShown_1_2, 1281).
+-define(wxSizer_IsShown_1_1, 1282).
+-define(wxSizer_IsShown_1_0, 1283).
+-define(wxSizer_Layout, 1284).
+-define(wxSizer_Prepend_2_1, 1285).
+-define(wxSizer_Prepend_2_0, 1286).
+-define(wxSizer_Prepend_3, 1287).
+-define(wxSizer_Prepend_2_3, 1288).
+-define(wxSizer_Prepend_2_2, 1289).
+-define(wxSizer_Prepend_1, 1290).
+-define(wxSizer_PrependSpacer, 1291).
+-define(wxSizer_PrependStretchSpacer, 1292).
+-define(wxSizer_RecalcSizes, 1293).
+-define(wxSizer_Remove_1_1, 1294).
+-define(wxSizer_Remove_1_0, 1295).
+-define(wxSizer_Replace_3_1, 1296).
+-define(wxSizer_Replace_3_0, 1297).
+-define(wxSizer_Replace_2, 1298).
+-define(wxSizer_SetDimension, 1299).
+-define(wxSizer_SetMinSize_2, 1300).
+-define(wxSizer_SetMinSize_1, 1301).
+-define(wxSizer_SetItemMinSize_3_2, 1302).
+-define(wxSizer_SetItemMinSize_2_2, 1303).
+-define(wxSizer_SetItemMinSize_3_1, 1304).
+-define(wxSizer_SetItemMinSize_2_1, 1305).
+-define(wxSizer_SetItemMinSize_3_0, 1306).
+-define(wxSizer_SetItemMinSize_2_0, 1307).
+-define(wxSizer_SetSizeHints, 1308).
+-define(wxSizer_SetVirtualSizeHints, 1309).
+-define(wxSizer_Show_2_2, 1310).
+-define(wxSizer_Show_2_1, 1311).
+-define(wxSizer_Show_2_0, 1312).
+-define(wxSizer_Show_1, 1313).
+-define(wxSizerFlags_new, 1314).
+-define(wxSizerFlags_Align, 1315).
+-define(wxSizerFlags_Border_2, 1316).
+-define(wxSizerFlags_Border_1, 1317).
+-define(wxSizerFlags_Center, 1318).
+-define(wxSizerFlags_Centre, 1319).
+-define(wxSizerFlags_Expand, 1320).
+-define(wxSizerFlags_Left, 1321).
+-define(wxSizerFlags_Proportion, 1322).
+-define(wxSizerFlags_Right, 1323).
+-define(wxSizerFlags_destroy, 1324).
+-define(wxSizerItem_new_5_1, 1325).
+-define(wxSizerItem_new_2_1, 1326).
+-define(wxSizerItem_new_5_0, 1327).
+-define(wxSizerItem_new_2_0, 1328).
+-define(wxSizerItem_new_6, 1329).
+-define(wxSizerItem_new_3, 1330).
+-define(wxSizerItem_new_0, 1331).
+-define(wxSizerItem_destruct, 1332).
+-define(wxSizerItem_CalcMin, 1333).
+-define(wxSizerItem_DeleteWindows, 1334).
+-define(wxSizerItem_DetachSizer, 1335).
+-define(wxSizerItem_GetBorder, 1336).
+-define(wxSizerItem_GetFlag, 1337).
+-define(wxSizerItem_GetMinSize, 1338).
+-define(wxSizerItem_GetPosition, 1339).
+-define(wxSizerItem_GetProportion, 1340).
+-define(wxSizerItem_GetRatio, 1341).
+-define(wxSizerItem_GetRect, 1342).
+-define(wxSizerItem_GetSize, 1343).
+-define(wxSizerItem_GetSizer, 1344).
+-define(wxSizerItem_GetSpacer, 1345).
+-define(wxSizerItem_GetUserData, 1346).
+-define(wxSizerItem_GetWindow, 1347).
+-define(wxSizerItem_IsSizer, 1348).
+-define(wxSizerItem_IsShown, 1349).
+-define(wxSizerItem_IsSpacer, 1350).
+-define(wxSizerItem_IsWindow, 1351).
+-define(wxSizerItem_SetBorder, 1352).
+-define(wxSizerItem_SetDimension, 1353).
+-define(wxSizerItem_SetFlag, 1354).
+-define(wxSizerItem_SetInitSize, 1355).
+-define(wxSizerItem_SetMinSize_1, 1356).
+-define(wxSizerItem_SetMinSize_2, 1357).
+-define(wxSizerItem_SetProportion, 1358).
+-define(wxSizerItem_SetRatio_2, 1359).
+-define(wxSizerItem_SetRatio_1_1, 1360).
+-define(wxSizerItem_SetRatio_1_0, 1361).
+-define(wxSizerItem_SetSizer, 1362).
+-define(wxSizerItem_SetSpacer_1, 1363).
+-define(wxSizerItem_SetSpacer_2, 1364).
+-define(wxSizerItem_SetWindow, 1365).
+-define(wxSizerItem_Show, 1366).
+-define(wxBoxSizer_new, 1367).
+-define(wxBoxSizer_GetOrientation, 1368).
+-define(wxBoxSizer_destroy, 1369).
+-define(wxStaticBoxSizer_new_2, 1370).
+-define(wxStaticBoxSizer_new_3, 1371).
+-define(wxStaticBoxSizer_GetStaticBox, 1372).
+-define(wxStaticBoxSizer_destroy, 1373).
+-define(wxGridSizer_new_4, 1374).
+-define(wxGridSizer_new_2, 1375).
+-define(wxGridSizer_GetCols, 1376).
+-define(wxGridSizer_GetHGap, 1377).
+-define(wxGridSizer_GetRows, 1378).
+-define(wxGridSizer_GetVGap, 1379).
+-define(wxGridSizer_SetCols, 1380).
+-define(wxGridSizer_SetHGap, 1381).
+-define(wxGridSizer_SetRows, 1382).
+-define(wxGridSizer_SetVGap, 1383).
+-define(wxGridSizer_destroy, 1384).
+-define(wxFlexGridSizer_new_4, 1385).
+-define(wxFlexGridSizer_new_2, 1386).
+-define(wxFlexGridSizer_AddGrowableCol, 1387).
+-define(wxFlexGridSizer_AddGrowableRow, 1388).
+-define(wxFlexGridSizer_GetFlexibleDirection, 1389).
+-define(wxFlexGridSizer_GetNonFlexibleGrowMode, 1390).
+-define(wxFlexGridSizer_RemoveGrowableCol, 1391).
+-define(wxFlexGridSizer_RemoveGrowableRow, 1392).
+-define(wxFlexGridSizer_SetFlexibleDirection, 1393).
+-define(wxFlexGridSizer_SetNonFlexibleGrowMode, 1394).
+-define(wxFlexGridSizer_destroy, 1395).
+-define(wxGridBagSizer_new, 1396).
+-define(wxGridBagSizer_Add_3_2, 1397).
+-define(wxGridBagSizer_Add_3_1, 1398).
+-define(wxGridBagSizer_Add_4, 1399).
+-define(wxGridBagSizer_Add_1_0, 1400).
+-define(wxGridBagSizer_Add_2_1, 1401).
+-define(wxGridBagSizer_Add_2_0, 1402).
+-define(wxGridBagSizer_Add_3_0, 1403).
+-define(wxGridBagSizer_Add_1_1, 1404).
+-define(wxGridBagSizer_CalcMin, 1405).
+-define(wxGridBagSizer_CheckForIntersection_2, 1406).
+-define(wxGridBagSizer_CheckForIntersection_3, 1407).
+-define(wxGridBagSizer_FindItem_1_1, 1408).
+-define(wxGridBagSizer_FindItem_1_0, 1409).
+-define(wxGridBagSizer_FindItemAtPoint, 1410).
+-define(wxGridBagSizer_FindItemAtPosition, 1411).
+-define(wxGridBagSizer_FindItemWithData, 1412).
+-define(wxGridBagSizer_GetCellSize, 1413).
+-define(wxGridBagSizer_GetEmptyCellSize, 1414).
+-define(wxGridBagSizer_GetItemPosition_1_2, 1415).
+-define(wxGridBagSizer_GetItemPosition_1_1, 1416).
+-define(wxGridBagSizer_GetItemPosition_1_0, 1417).
+-define(wxGridBagSizer_GetItemSpan_1_2, 1418).
+-define(wxGridBagSizer_GetItemSpan_1_1, 1419).
+-define(wxGridBagSizer_GetItemSpan_1_0, 1420).
+-define(wxGridBagSizer_SetEmptyCellSize, 1421).
+-define(wxGridBagSizer_SetItemPosition_2_2, 1422).
+-define(wxGridBagSizer_SetItemPosition_2_1, 1423).
+-define(wxGridBagSizer_SetItemPosition_2_0, 1424).
+-define(wxGridBagSizer_SetItemSpan_2_2, 1425).
+-define(wxGridBagSizer_SetItemSpan_2_1, 1426).
+-define(wxGridBagSizer_SetItemSpan_2_0, 1427).
+-define(wxGridBagSizer_destroy, 1428).
+-define(wxStdDialogButtonSizer_new, 1429).
+-define(wxStdDialogButtonSizer_AddButton, 1430).
+-define(wxStdDialogButtonSizer_Realize, 1431).
+-define(wxStdDialogButtonSizer_SetAffirmativeButton, 1432).
+-define(wxStdDialogButtonSizer_SetCancelButton, 1433).
+-define(wxStdDialogButtonSizer_SetNegativeButton, 1434).
+-define(wxStdDialogButtonSizer_destroy, 1435).
+-define(wxFont_new_0, 1436).
+-define(wxFont_new_1, 1437).
+-define(wxFont_new_5, 1438).
+-define(wxFont_destruct, 1440).
+-define(wxFont_IsFixedWidth, 1441).
+-define(wxFont_GetDefaultEncoding, 1442).
+-define(wxFont_GetFaceName, 1443).
+-define(wxFont_GetFamily, 1444).
+-define(wxFont_GetNativeFontInfoDesc, 1445).
+-define(wxFont_GetNativeFontInfoUserDesc, 1446).
+-define(wxFont_GetPointSize, 1447).
+-define(wxFont_GetStyle, 1448).
+-define(wxFont_GetUnderlined, 1449).
+-define(wxFont_GetWeight, 1450).
+-define(wxFont_Ok, 1451).
+-define(wxFont_SetDefaultEncoding, 1452).
+-define(wxFont_SetFaceName, 1453).
+-define(wxFont_SetFamily, 1454).
+-define(wxFont_SetPointSize, 1455).
+-define(wxFont_SetStyle, 1456).
+-define(wxFont_SetUnderlined, 1457).
+-define(wxFont_SetWeight, 1458).
+-define(wxToolTip_Enable, 1459).
+-define(wxToolTip_SetDelay, 1460).
+-define(wxToolTip_new, 1461).
+-define(wxToolTip_SetTip, 1462).
+-define(wxToolTip_GetTip, 1463).
+-define(wxToolTip_GetWindow, 1464).
+-define(wxToolTip_destroy, 1465).
+-define(wxButton_new_3, 1467).
+-define(wxButton_new_0, 1468).
+-define(wxButton_destruct, 1469).
+-define(wxButton_Create, 1470).
+-define(wxButton_GetDefaultSize, 1471).
+-define(wxButton_SetDefault, 1472).
+-define(wxButton_SetLabel, 1473).
+-define(wxBitmapButton_new_4, 1475).
+-define(wxBitmapButton_new_0, 1476).
+-define(wxBitmapButton_Create, 1477).
+-define(wxBitmapButton_GetBitmapDisabled, 1478).
+-define(wxBitmapButton_GetBitmapFocus, 1480).
+-define(wxBitmapButton_GetBitmapLabel, 1482).
+-define(wxBitmapButton_GetBitmapSelected, 1484).
+-define(wxBitmapButton_SetBitmapDisabled, 1486).
+-define(wxBitmapButton_SetBitmapFocus, 1487).
+-define(wxBitmapButton_SetBitmapLabel, 1488).
+-define(wxBitmapButton_SetBitmapSelected, 1489).
+-define(wxBitmapButton_destroy, 1490).
+-define(wxToggleButton_new_0, 1491).
+-define(wxToggleButton_new_4, 1492).
+-define(wxToggleButton_Create, 1493).
+-define(wxToggleButton_GetValue, 1494).
+-define(wxToggleButton_SetValue, 1495).
+-define(wxToggleButton_destroy, 1496).
+-define(wxCalendarCtrl_new_0, 1497).
+-define(wxCalendarCtrl_new_3, 1498).
+-define(wxCalendarCtrl_Create, 1499).
+-define(wxCalendarCtrl_destruct, 1500).
+-define(wxCalendarCtrl_SetDate, 1501).
+-define(wxCalendarCtrl_GetDate, 1502).
+-define(wxCalendarCtrl_EnableYearChange, 1503).
+-define(wxCalendarCtrl_EnableMonthChange, 1504).
+-define(wxCalendarCtrl_EnableHolidayDisplay, 1505).
+-define(wxCalendarCtrl_SetHeaderColours, 1506).
+-define(wxCalendarCtrl_GetHeaderColourFg, 1507).
+-define(wxCalendarCtrl_GetHeaderColourBg, 1508).
+-define(wxCalendarCtrl_SetHighlightColours, 1509).
+-define(wxCalendarCtrl_GetHighlightColourFg, 1510).
+-define(wxCalendarCtrl_GetHighlightColourBg, 1511).
+-define(wxCalendarCtrl_SetHolidayColours, 1512).
+-define(wxCalendarCtrl_GetHolidayColourFg, 1513).
+-define(wxCalendarCtrl_GetHolidayColourBg, 1514).
+-define(wxCalendarCtrl_GetAttr, 1515).
+-define(wxCalendarCtrl_SetAttr, 1516).
+-define(wxCalendarCtrl_SetHoliday, 1517).
+-define(wxCalendarCtrl_ResetAttr, 1518).
+-define(wxCalendarCtrl_HitTest, 1519).
+-define(wxCalendarDateAttr_new_0, 1520).
+-define(wxCalendarDateAttr_new_2_1, 1521).
+-define(wxCalendarDateAttr_new_2_0, 1522).
+-define(wxCalendarDateAttr_SetTextColour, 1523).
+-define(wxCalendarDateAttr_SetBackgroundColour, 1524).
+-define(wxCalendarDateAttr_SetBorderColour, 1525).
+-define(wxCalendarDateAttr_SetFont, 1526).
+-define(wxCalendarDateAttr_SetBorder, 1527).
+-define(wxCalendarDateAttr_SetHoliday, 1528).
+-define(wxCalendarDateAttr_HasTextColour, 1529).
+-define(wxCalendarDateAttr_HasBackgroundColour, 1530).
+-define(wxCalendarDateAttr_HasBorderColour, 1531).
+-define(wxCalendarDateAttr_HasFont, 1532).
+-define(wxCalendarDateAttr_HasBorder, 1533).
+-define(wxCalendarDateAttr_IsHoliday, 1534).
+-define(wxCalendarDateAttr_GetTextColour, 1535).
+-define(wxCalendarDateAttr_GetBackgroundColour, 1536).
+-define(wxCalendarDateAttr_GetBorderColour, 1537).
+-define(wxCalendarDateAttr_GetFont, 1538).
+-define(wxCalendarDateAttr_GetBorder, 1539).
+-define(wxCalendarDateAttr_destroy, 1540).
+-define(wxCheckBox_new_4, 1542).
+-define(wxCheckBox_new_0, 1543).
+-define(wxCheckBox_Create, 1544).
+-define(wxCheckBox_GetValue, 1545).
+-define(wxCheckBox_Get3StateValue, 1546).
+-define(wxCheckBox_Is3rdStateAllowedForUser, 1547).
+-define(wxCheckBox_Is3State, 1548).
+-define(wxCheckBox_IsChecked, 1549).
+-define(wxCheckBox_SetValue, 1550).
+-define(wxCheckBox_Set3StateValue, 1551).
+-define(wxCheckBox_destroy, 1552).
+-define(wxCheckListBox_new_0, 1553).
+-define(wxCheckListBox_new_3, 1555).
+-define(wxCheckListBox_Check, 1556).
+-define(wxCheckListBox_IsChecked, 1557).
+-define(wxCheckListBox_destroy, 1558).
+-define(wxChoice_new_3, 1561).
+-define(wxChoice_new_0, 1562).
+-define(wxChoice_destruct, 1564).
+-define(wxChoice_Create, 1566).
+-define(wxChoice_Delete, 1567).
+-define(wxChoice_GetColumns, 1568).
+-define(wxChoice_SetColumns, 1569).
+-define(wxComboBox_new_0, 1570).
+-define(wxComboBox_new_3, 1572).
+-define(wxComboBox_destruct, 1573).
+-define(wxComboBox_Create, 1575).
+-define(wxComboBox_CanCopy, 1576).
+-define(wxComboBox_CanCut, 1577).
+-define(wxComboBox_CanPaste, 1578).
+-define(wxComboBox_CanRedo, 1579).
+-define(wxComboBox_CanUndo, 1580).
+-define(wxComboBox_Copy, 1581).
+-define(wxComboBox_Cut, 1582).
+-define(wxComboBox_GetInsertionPoint, 1583).
+-define(wxComboBox_GetLastPosition, 1584).
+-define(wxComboBox_GetValue, 1585).
+-define(wxComboBox_Paste, 1586).
+-define(wxComboBox_Redo, 1587).
+-define(wxComboBox_Replace, 1588).
+-define(wxComboBox_Remove, 1589).
+-define(wxComboBox_SetInsertionPoint, 1590).
+-define(wxComboBox_SetInsertionPointEnd, 1591).
+-define(wxComboBox_SetSelection_1, 1592).
+-define(wxComboBox_SetSelection_2, 1593).
+-define(wxComboBox_SetValue, 1594).
+-define(wxComboBox_Undo, 1595).
+-define(wxGauge_new_0, 1596).
+-define(wxGauge_new_4, 1597).
+-define(wxGauge_Create, 1598).
+-define(wxGauge_GetBezelFace, 1599).
+-define(wxGauge_GetRange, 1600).
+-define(wxGauge_GetShadowWidth, 1601).
+-define(wxGauge_GetValue, 1602).
+-define(wxGauge_IsVertical, 1603).
+-define(wxGauge_SetBezelFace, 1604).
+-define(wxGauge_SetRange, 1605).
+-define(wxGauge_SetShadowWidth, 1606).
+-define(wxGauge_SetValue, 1607).
+-define(wxGauge_Pulse, 1608).
+-define(wxGauge_destroy, 1609).
+-define(wxGenericDirCtrl_new_0, 1610).
+-define(wxGenericDirCtrl_new_2, 1611).
+-define(wxGenericDirCtrl_destruct, 1612).
+-define(wxGenericDirCtrl_Create, 1613).
+-define(wxGenericDirCtrl_Init, 1614).
+-define(wxGenericDirCtrl_CollapseTree, 1615).
+-define(wxGenericDirCtrl_ExpandPath, 1616).
+-define(wxGenericDirCtrl_GetDefaultPath, 1617).
+-define(wxGenericDirCtrl_GetPath, 1618).
+-define(wxGenericDirCtrl_GetFilePath, 1619).
+-define(wxGenericDirCtrl_GetFilter, 1620).
+-define(wxGenericDirCtrl_GetFilterIndex, 1621).
+-define(wxGenericDirCtrl_GetRootId, 1622).
+-define(wxGenericDirCtrl_GetTreeCtrl, 1623).
+-define(wxGenericDirCtrl_ReCreateTree, 1624).
+-define(wxGenericDirCtrl_SetDefaultPath, 1625).
+-define(wxGenericDirCtrl_SetFilter, 1626).
+-define(wxGenericDirCtrl_SetFilterIndex, 1627).
+-define(wxGenericDirCtrl_SetPath, 1628).
+-define(wxStaticBox_new_4, 1630).
+-define(wxStaticBox_new_0, 1631).
+-define(wxStaticBox_Create, 1632).
+-define(wxStaticBox_destroy, 1633).
+-define(wxStaticLine_new_2, 1635).
+-define(wxStaticLine_new_0, 1636).
+-define(wxStaticLine_Create, 1637).
+-define(wxStaticLine_IsVertical, 1638).
+-define(wxStaticLine_GetDefaultSize, 1639).
+-define(wxStaticLine_destroy, 1640).
+-define(wxListBox_new_3, 1643).
+-define(wxListBox_new_0, 1644).
+-define(wxListBox_destruct, 1646).
+-define(wxListBox_Create, 1648).
+-define(wxListBox_Deselect, 1649).
+-define(wxListBox_GetSelections, 1650).
+-define(wxListBox_InsertItems, 1651).
+-define(wxListBox_IsSelected, 1652).
 -define(wxListBox_Set, 1653).
 -define(wxListBox_HitTest, 1654).
 -define(wxListBox_SetFirstItem_1_0, 1655).
diff --git a/lib/wx/src/wx.appup.src b/lib/wx/src/wx.appup.src
index 1102af612e..311c0c0f52 100644
--- a/lib/wx/src/wx.appup.src
+++ b/lib/wx/src/wx.appup.src
@@ -1,8 +1,7 @@
-%% This is an -*- erlang -*- file.
-%%
+%% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
 %%
 %% The 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,8 +15,7 @@
 %% under the License.
 %%
 %% %CopyrightEnd%
-
 {"%VSN%",
- [ ],
- [ ]
+ [{<<".*">>,[{restart_application, wx}]}],
+ [{<<".*">>,[{restart_application, wx}]}]
 }.
diff --git a/lib/wx/src/wxe.hrl b/lib/wx/src/wxe.hrl
index bd34b13385..66ec9ac45e 100644
--- a/lib/wx/src/wxe.hrl
+++ b/lib/wx/src/wxe.hrl
@@ -29,6 +29,11 @@
 
 -record(wx_mem, {bin, size}).
 
+-record(evh, {et=null,id=-1,lastId=-1,cb=0,
+	      skip=undefined,userdata=[], % temp
+	      handler=undefined % added after connect
+	     }).
+
 -define(CLASS(Type,Class), ((Type) =:= Class) orelse (Type):parent_class(Class)).
 
 -define(CLASS_T(Type,Class),
diff --git a/lib/wx/src/wxe_server.erl b/lib/wx/src/wxe_server.erl
index a8604c76b9..aed9dca7ce 100644
--- a/lib/wx/src/wxe_server.erl
+++ b/lib/wx/src/wxe_server.erl
@@ -36,8 +36,8 @@
 	 terminate/2, code_change/3]).
 
 -record(state, {port,cb_port,users,cleaners=[],cb,cb_cnt}).
--record(user,  {objects=[], events=[], evt_handler}).
--record(event, {object, callback, cb_handler}).
+-record(user,  {events=[]}).
+%%-record(event, {object, callback, cb_handler}).
 
 -define(APPLICATION, wxe).
 -define(log(S,A), log(?MODULE,?LINE,S,A)).
@@ -118,8 +118,8 @@ handle_call({disconnect_cb,Obj,Msg},{From,_},State) ->
 handle_call(stop,{_From,_},State = #state{users=Users0, cleaners=Cs0}) ->
     Env = get(?WXE_IDENTIFIER),
     Users = gb_trees:to_list(Users0),
-    Cs = lists:map(fun({Pid,User}) ->
-			   spawn_link(fun() -> cleanup(Env,Pid,[User]) end)
+    Cs = lists:map(fun({_Pid,User}) ->
+			   spawn_link(fun() -> cleanup(Env,[User]) end)
 		   end, Users),
     {noreply, State#state{users=gb_trees:empty(), cleaners=Cs ++ Cs0}};
 
@@ -157,26 +157,43 @@ handle_cast(_Msg, State) ->
 handle_info(Cb = {_, _, '_wx_invoke_cb_'}, State) ->
     invoke_cb(Cb, State),
     {noreply, State};
-handle_info({wx_delete_cb, FunId}, State0 = #state{cb=CB}) when is_integer(FunId) ->
-    case get(FunId) of
-	undefined ->
-	    {noreply, State0};
-	Fun ->
-	    erase(FunId),
-	    {noreply, State0#state{cb=gb_trees:delete(Fun, CB)}}
+
+handle_info({wx_delete_cb, FunId}, State)
+  when is_integer(FunId) ->
+    {noreply, delete_fun(FunId, State)};
+
+handle_info({wx_delete_cb, Id, EvtListener, Obj}, State = #state{users=Users}) ->
+    From = erase(EvtListener),
+    case gb_trees:lookup(From, Users) of
+	none ->
+	    {noreply, delete_fun(Id, State)};
+	{value, User0} ->
+	    User = cleanup_evt_listener(User0, EvtListener, Obj),
+	    {noreply, delete_fun(Id, State#state{users=gb_trees:update(From, User, Users)})}
     end;
+
 handle_info({'DOWN',_,process,Pid,_}, State=#state{users=Users0,cleaners=Cs}) ->
     try
 	User = gb_trees:get(Pid,Users0),
 	Users = gb_trees:delete(Pid,Users0),
 	Env = wx:get_env(),
-	Cleaner = spawn_link(fun() -> cleanup(Env,Pid,[User]) end),
-	{noreply, State#state{users=Users,cleaners=[Cleaner|Cs]}}
+	case User of
+	    #user{events=[]} -> %% No need to spawn
+		case Cs =:= [] andalso gb_trees:is_empty(Users) of
+		    true  -> {stop, normal, State#state{users=Users}};
+		    false -> {noreply, State#state{users=Users}}
+		end;
+	    _ ->
+		Cleaner = spawn_link(fun() -> cleanup(Env,[User]) end),
+		{noreply, State#state{users=Users,cleaners=[Cleaner|Cs]}}
+	end
     catch  _E:_R ->
 	    %% ?log("Error: ~p ~p", [_E,_R]),
 	    {noreply, State}
     end;
-handle_info(Msg = {'_wxe_destroy_', Pid}, State) ->
+
+handle_info(Msg = {'_wxe_destroy_', Pid}, State)
+  when is_pid(Pid) ->
     case erlang:is_process_alive(Pid) of
 	true ->
 	    Pid ! Msg,
@@ -185,6 +202,7 @@ handle_info(Msg = {'_wxe_destroy_', Pid}, State) ->
 	    ok
     end,
     {noreply, State};
+
 handle_info(_Info, State) ->
     ?log("Unknown message ~p sent to ~p~n",[_Info, ?MODULE]),
     {noreply, State}.
@@ -204,43 +222,33 @@ code_change(_OldVsn, State, _Extra) ->
 log(Mod,Line,Str,Args) ->
     error_logger:format("~p:~p: " ++ Str, [Mod,Line|Args]).
 
-handle_connect(Object, EvData, From, State0 = #state{users=Users}) ->
-    User0 = #user{events=Evs0,evt_handler=Handler0} = gb_trees:get(From, Users),
-    Callback = wxEvtHandler:get_callback(EvData),
-    case Handler0 of
-	#wx_ref{} when Callback =:= 0 ->
-	    CBHandler = Handler0,
-	    Handler = Handler0;
-	undefined when Callback =:= 0 ->
-	    Handler = new_evt_listener(State0),
-	    CBHandler = Handler;
-	_ ->
-	    CBHandler = new_evt_listener(State0),
-	    Handler = Handler0
-    end,
-    Evs = [#event{object=Object,callback=Callback, cb_handler=CBHandler}|Evs0],
-    User = User0#user{events=Evs, evt_handler=Handler},
-    State1 = State0#state{users=gb_trees:update(From, User, Users)},
-    if is_function(Callback) orelse is_pid(Callback) ->
-	    {FunId, State} = attach_fun(Callback,State1),
-	    Res = wxEvtHandler:connect_impl(CBHandler,Object,
-					    wxEvtHandler:replace_fun_with_id(EvData,FunId)),
-	    case Res of
-		ok     -> {reply,Res,State};
-		_Error -> {reply,Res,State0}
-	    end;
-
-       true ->
-	    Res = {call_impl, connect_cb, CBHandler},
-	    {reply, Res, State1}
-    end.
+handle_connect(Object, #evh{handler=undefined, cb=Callback} = EvData0, 
+	       From, State0) ->
+    %% Callback let this process listen to the events
+    {FunId, State} = attach_fun(Callback,State0),
+    EvData1 = EvData0#evh{cb=FunId},
+    case wxEvtHandler:connect_impl(Object,EvData1) of
+	{ok, Handler} ->
+	    EvData = EvData1#evh{handler=Handler,userdata=undefined},
+	    handle_connect(Object, EvData, From, State);
+	Error ->
+	    {reply, Error, State0}
+    end;
+handle_connect(Object, EvData=#evh{handler=Handler}, 
+	       From, State0 = #state{users=Users}) ->
+    %% Correct process is already listening just register it
+    put(Handler, From),
+    User0 = #user{events=Listeners0} = gb_trees:get(From, Users),
+    User  = User0#user{events=[{Object,EvData}|Listeners0]},
+    State = State0#state{users=gb_trees:update(From, User, Users)},
+    {reply, ok, State}.
 
 invoke_cb({{Ev=#wx{}, Ref=#wx_ref{}}, FunId,_}, _S) ->
     %% Event callbacks
     case get(FunId) of
-	Fun when is_function(Fun) ->
+	{Fun,_} when is_function(Fun) ->
 	    invoke_callback(fun() -> Fun(Ev, Ref), <<>> end);
-	Pid when is_pid(Pid) -> %% wx_object sync event
+	{Pid,_} when is_pid(Pid) -> %% wx_object sync event
 	    invoke_callback(Pid, Ev, Ref);
 	Err ->
 	    ?log("Internal Error ~p~n",[Err])
@@ -248,7 +256,7 @@ invoke_cb({{Ev=#wx{}, Ref=#wx_ref{}}, FunId,_}, _S) ->
 invoke_cb({FunId, Args, _}, _S) when is_list(Args), is_integer(FunId) ->
     %% Overloaded functions
     case get(FunId) of
-	Fun when is_function(Fun) ->
+	{Fun,_} when is_function(Fun) ->
 	    invoke_callback(fun() -> Fun(Args) end);
 	Err ->
 	    ?log("Internal Error ~p ~p ~p~n",[Err, FunId, Args])
@@ -311,100 +319,96 @@ get_wx_object_state(Pid) ->
 	_ -> ignore
     end.
 
-new_evt_listener(State) ->
-    #wx_env{port=Port} = wx:get_env(),
-    _ = erlang:port_control(Port,98,<<>>),
-    get_result(State).
-
-get_result(_State) ->
-    receive
-	{'_wxe_result_', Res} -> Res;
-	{'_wxe_error_', Op, Error} ->
-	    erlang:error({Error, {wxEvtHandler, {internal_installer, Op}}})
-    end.
-
 attach_fun(Fun, S = #state{cb=CB,cb_cnt=Next}) ->
     case gb_trees:lookup(Fun,CB) of
 	{value, ID} ->
+	    {Fun, N} = get(ID),
+	    put(ID, {Fun,N+1}),
 	    {ID,S};
 	none ->
-	    put(Next,Fun),
+	    put(Next,{Fun, 1}),
 	    {Next,S#state{cb=gb_trees:insert(Fun,Next,CB),cb_cnt=Next+1}}
     end.
 
-handle_disconnect(Object, Evh, From, State0 = #state{users=Users0}) ->
-    User0 = #user{events=Evs0, evt_handler=PidH} = gb_trees:get(From, Users0),
-    Fun = wxEvtHandler:get_callback(Evh),
-    case find_handler(Evs0, Object, Fun) of
-	[] ->
+delete_fun(0, State) -> State;
+delete_fun(FunId, State = #state{cb=CB}) ->
+    case get(FunId) of
+	undefined ->
+	    State;
+	{Fun,N} when N < 2 ->
+	    erase(FunId),
+	    State#state{cb=gb_trees:delete(Fun, CB)};
+	{Fun,N} ->
+	    put(FunId, {Fun, N-1}),
+	    State
+    end.
+
+cleanup_evt_listener(U=#user{events=Evs0}, EvtListener, Object) ->
+    Filter = fun({Obj,#evh{handler=Evl}}) -> 
+		     not (Object =:= Obj andalso Evl =:= EvtListener) 
+	     end,
+    U#user{events=lists:filter(Filter, Evs0)}.
+
+handle_disconnect(Object, Evh = #evh{cb=Fun}, From, 
+		  State0 = #state{users=Users0, cb=Callbacks}) ->
+    #user{events=Evs0} = gb_trees:get(From, Users0),
+    FunId = gb_trees:lookup(Fun, Callbacks),
+    case find_handler(Evs0, Object, Evh#evh{cb=FunId}) of
+	[] -> 
 	    {reply, false, State0};
 	Handlers ->
-	    case disconnect(Object,Evh, Handlers) of
-		Ev = #event{callback=CB, cb_handler=Handler} ->
-		    case is_function(CB) of
-			true ->  wxEvtHandler:destroy_evt_listener(Handler);
-			false -> ignore
-		    end,
-		    User = case lists:delete(Ev,Evs0) of
-			       [] when PidH =/= undefined ->
-				   wxEvtHandler:destroy_evt_listener(PidH),
-				   User0#user{events=[], evt_handler=undefined};
-			       Evs ->
-				   User0#user{events=Evs}
-			   end,
-		    {reply, true, State0#state{users=gb_trees:update(From,User,Users0)}};
-		Result ->
-		    {reply, Result, State0}
+	    case disconnect(Object,Handlers) of
+		#evh{} -> {reply, true, State0};
+		Result -> {reply, Result, State0}
 	    end
     end.
 
-disconnect(Object,Evh,[Ev=#event{cb_handler=Handler}|Evs]) ->
-    case wxEvtHandler:disconnect_impl(Handler,Object,Evh) of
+disconnect(Object,[Ev|Evs]) ->
+    try wxEvtHandler:disconnect_impl(Object,Ev) of
 	true ->  Ev;
-	false -> disconnect(Object, Evh, Evs);
+	false -> disconnect(Object, Evs);
 	Error -> Error
+    catch _:_ ->
+	    false
     end;
-disconnect(_, _, []) -> false.
-
-find_handler(Evs, Object, Fun) ->
-    find_handler(Evs, Object, Fun, []).
-
-find_handler([Ev =#event{object=Object,callback=FunReg}|Evs],Object,Search,Acc) ->
-    case FunReg =:= Search of
-	true -> find_handler(Evs,Object,Search,[Ev|Acc]);
-	false when is_function(FunReg), Search =:= 0 ->
-	    find_handler(Evs,Object,Search,[Ev|Acc]);
-	_ ->
-	    find_handler(Evs,Object,Search,Acc)
+disconnect(_, []) -> false.
+
+find_handler([{Object,Evh}|Evs], Object, Match) ->
+    case match_handler(Match, Evh) of
+	false -> find_handler(Evs, Object, Match);
+	Res  -> [Res|find_handler(Evs,Object,Match)]
     end;
-find_handler([_|Evs],Object,Fun,Res) ->
-    find_handler(Evs,Object,Fun,Res);
-find_handler([],_Object,_Fun,Res) ->
-    Res.
+find_handler([_|Evs], Object, Match) ->
+    find_handler(Evs, Object, Match);
+find_handler([], _, _) -> [].
 
+match_handler(M=#evh{et=MET, cb=MCB}, 
+	      #evh{et=ET, cb=CB, handler=Handler}) ->
+    %% Let wxWidgets handle the id matching
+    Match = match_et(MET, ET) 
+	andalso match_cb(MCB, CB),
+    Match andalso M#evh{handler=Handler}.
+
+match_et(null, _) -> true;
+match_et(Met, Et) -> Met =:= Et.
+
+match_cb(none, _) -> true;
+match_cb({value,MId}, Id) ->  MId =:= Id.
 
 %% Cleanup
 %% The server handles callbacks from driver so every other wx call must
 %% be called from another process, therefore the cleaning must be spawned.
 %%
-cleanup(Env, _Pid, Data) ->
+cleanup(Env, Data) ->
     put(?WXE_IDENTIFIER, Env),
-    lists:foreach(fun cleanup/1, Data),
+    Disconnect = fun({Object, Ev}) ->
+			 try wxEvtHandler:disconnect_impl(Object,Ev)
+			 catch _:_ -> ok
+			 end
+		 end,
+
+    lists:foreach(fun(#user{events=Evs}) -> 
+			  [Disconnect(Ev) || Ev <- Evs]
+		  end, Data),
     gen_server:cast(Env#wx_env.sv, {cleaned, self()}),
     normal.
-
-cleanup(#user{objects=_Os,events=Evs, evt_handler=Handler}) ->
-    lists:foreach(fun(#event{object=_O, callback=CB, cb_handler=CbH}) ->
-			  %%catch wxEvtHandler:disconnect_impl(CbH,O),
-			  case is_function(CB) of
-			      true ->
-				  wxEvtHandler:destroy_evt_listener(CbH);
-			      false ->
-				  ignore
-			  end
-		  end, Evs),
-    case Handler of
-	undefined -> ignore;
-	_ ->  wxEvtHandler:destroy_evt_listener(Handler)
-    end,
-    ok.
diff --git a/lib/wx/src/wxe_util.erl b/lib/wx/src/wxe_util.erl
index a31c3e30b8..02ac4ddfa6 100644
--- a/lib/wx/src/wxe_util.erl
+++ b/lib/wx/src/wxe_util.erl
@@ -74,7 +74,7 @@ call(Op, Args) ->
 	true ->
 	    debug_call(Dbg band 15, Op, Args, Port)
     end.
-	    
+
 rec(Op) ->
     receive 
 	{'_wxe_result_', Res} -> Res;
@@ -108,21 +108,26 @@ send_bin(Bin) when is_binary(Bin) ->
 get_cbId(Fun) ->
     gen_server:call((wx:get_env())#wx_env.sv,{register_cb, Fun}, infinity).   
 
-connect_cb(Object,EvData) ->
-    handle_listener(connect_cb, Object, EvData).
-
-disconnect_cb(Object,EvData) ->
-    handle_listener(disconnect_cb, Object, EvData).
-
-handle_listener(Op,Object,EvData) ->
-    Listener = gen_server:call((wx:get_env())#wx_env.sv, {Op,Object,EvData}, infinity),
-    case Listener of
-	{call_impl, connect_cb, EvtList} ->
-	    wxEvtHandler:connect_impl(EvtList,Object,EvData);
-	Res ->
-	    Res
+connect_cb(Object,EvData0 = #evh{cb=Callback}) ->
+    Server = (wx:get_env())#wx_env.sv,
+    case Callback of
+	0 -> %% Message api connect from this process
+	    case wxEvtHandler:connect_impl(Object,EvData0) of
+		{ok, Listener} ->
+		    EvData = EvData0#evh{handler=Listener, userdata=undefined},
+		    gen_server:call(Server, {connect_cb,Object,EvData}, infinity);
+		Error ->
+		    Error
+	    end;
+	_ -> %% callback, fun or pid (pid for wx_object:sync_events masked callbacks)
+	    %% let the server do the connect
+	    gen_server:call(Server, {connect_cb,Object,EvData0}, infinity)
     end.
 
+disconnect_cb(Object,EvData) ->
+    Server = (wx:get_env())#wx_env.sv,
+    gen_server:call(Server, {disconnect_cb,Object,EvData}, infinity).
+	
 debug_cast(1, Op, _Args, _Port) ->
     check_previous(),
     case ets:lookup(wx_debug_info,Op) of
diff --git a/lib/wx/test/wx_app_SUITE.erl b/lib/wx/test/wx_app_SUITE.erl
index 162923eaa3..6331180ece 100644
--- a/lib/wx/test/wx_app_SUITE.erl
+++ b/lib/wx/test/wx_app_SUITE.erl
@@ -26,6 +26,7 @@
 -compile(export_all).
 
 -include("wx_test_lib.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 t()     -> wx_test_lib:t(?MODULE).
@@ -50,7 +51,7 @@ end_per_testcase(Func,Config) ->
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
-    [fields, modules, exportall, app_depend, undef_funcs].
+    [fields, modules, exportall, app_depend, undef_funcs, appup].
 
 groups() -> 
     [].
@@ -281,3 +282,9 @@ key1search(Key, L) ->
 	{value, {Key, Value}} ->
 	    Value
     end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Test that the wx appup file is ok
+appup(Config) when is_list(Config) ->
+    ok = ?t:appup_test(wx).
diff --git a/lib/wx/test/wx_basic_SUITE.erl b/lib/wx/test/wx_basic_SUITE.erl
index d55a037599..7bdbd4594c 100644
--- a/lib/wx/test/wx_basic_SUITE.erl
+++ b/lib/wx/test/wx_basic_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %% 
 %% The 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,8 +98,23 @@ several_apps(Config) ->
     Pids = [spawn_link(fun() -> several_apps(Parent, N, Config) end) 
 	    || N <- lists:seq(1,4)],
     process_flag(trap_exit,true),
-    ?m_multi_receive([{complete,Pid} || Pid <- Pids]),
+    Wait = fun(Pid,Acc) ->
+		   receive {complete, Pid} -> Acc
+		   after 20000 -> [Pid|Acc]
+		   end
+	   end,
+    Res = lists:foldl(Wait, [], Pids),
     [Pid ! quit || Pid <- Pids],
+
+    Dbg = fun(Pid) ->
+		  io:format("Stack ~p~n",[erlang:process_info(Pid, current_stacktrace)]),
+		  io:format("Stack ~p~n",[erlang:process_info(Pid)])
+	  end,
+    case Res of
+	[] -> ok;
+	Failed ->
+	    [Dbg(Pid)|| Pid <- Failed]
+    end,
     case wx_test_lib:user_available(Config) of
 	true ->
 	    receive {'EXIT',_,foo} -> ok end;
@@ -217,7 +231,7 @@ create_menus(Frame) ->
 
 %% Test the wx_misc.erl api functionality.
 wx_misc(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
-wx_misc(Config) ->    
+wx_misc(_Config) ->
     wx:new([{debug, trace}]),
     put(wx_test_verbose, true),
     ?m(ok, wx_misc:bell()),
@@ -242,21 +256,6 @@ wx_misc(Config) ->
     
     %% wx:shutdown()  %% How do you test this?
 
-    case os:type() of 
-	{win32, _} -> %% These hangs when running automatic tests
-	    skip;     %% through ssh on windows. Works otherwise
-	_ -> 
-	    wx_misc:shell([{command,"echo TESTING close the popup shell"}])
-    end,
-
-    case wx_test_lib:user_available(Config) of
-	true ->
-	    wx_misc:shell();
-	false ->
-	    %% Don't want to spawn a shell if no user	   
-	    skip %% is available
-    end,
-
     ?m(false, wx_misc:isBusy()),
     ?m(ok, wx_misc:beginBusyCursor([])),
     ?m(true, wx_misc:isBusy()),
@@ -324,7 +323,18 @@ data_types(_Config) ->
 wx_object(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
 wx_object(Config) ->
     wx:new(),
-    Frame = ?mt(wxFrame, wx_obj_test:start([])),
+    Me = self(),
+    Init = fun() ->
+		   Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Test wx_object", [{size, {500, 400}}]),
+		   Sz = wxBoxSizer:new(?wxHORIZONTAL),
+		   Panel = wxPanel:new(Frame),
+		   wxSizer:add(Sz, Panel, [{flag, ?wxEXPAND}, {proportion, 1}]),
+		   wxPanel:connect(Panel, size, [{skip, true}]),
+		   wxPanel:connect(Panel, paint, [callback, {userData, Me}]),
+		   wxWindow:show(Frame),
+		   {Frame, {Frame, Panel}}
+	   end,
+    Frame = ?mt(wxFrame, wx_obj_test:start([{init, Init}])),
     timer:sleep(500),
     ?m(ok, check_events(flush())),
 
@@ -346,6 +356,7 @@ wx_object(Config) ->
     %% Which it did in my buggy handling of the sync_callback
     wxWindow:refresh(Frame),
     ?m([{sync_event, #wx{event=#wxPaint{}}, _}], flush()),
+    timer:sleep(500),
     ?m([{cast, slept}], flush()),
 
     Monitor = erlang:monitor(process, FramePid),
diff --git a/lib/wx/test/wx_class_SUITE.erl b/lib/wx/test/wx_class_SUITE.erl
index 7c3eda0be1..0e151ccc9b 100644
--- a/lib/wx/test/wx_class_SUITE.erl
+++ b/lib/wx/test/wx_class_SUITE.erl
@@ -50,7 +50,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 all() ->
     [calendarCtrl, treeCtrl, notebook, staticBoxSizer,
      clipboard, helpFrame, htmlWindow, listCtrlSort, listCtrlVirtual,
-     radioBox, systemSettings, taskBarIcon].
+     radioBox, systemSettings, taskBarIcon, toolbar].
 
 groups() ->
     [].
@@ -493,3 +493,20 @@ taskBarIcon(Config) ->
     wxTaskBarIcon:connect(TBI, taskbar_left_down, [{callback, fun(Ev,_) -> io:format("Left clicked: ~p~n",[Ev]) end}]),
     wxTaskBarIcon:connect(TBI, taskbar_right_down, [{callback,fun(Ev,_) -> io:format("Right clicked: ~p~n",[Ev]) end}]),
     wx_test_lib:wx_destroy(Frame,Config).
+
+toolbar(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+toolbar(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame"),
+    TB = wxFrame:createToolBar(Frame),
+    wxToolBar:addTool(TB, 747, "PressMe", wxArtProvider:getBitmap("wxART_COPY", [{size, {16,16}}]),
+		      [{shortHelp, "Press Me"}]),
+
+    Add = fun(#wx{}, _) ->
+		  wxToolBar:addTool(TB, -1, "Added", wxArtProvider:getBitmap("wxART_TICK_MARK", [{size, {16,16}}]),
+				    [{shortHelp, "Test 2 popup text"}])
+	  end,
+
+    wxFrame:connect(Frame, command_menu_selected, [{callback, Add}, {id, 747}]),
+    wxFrame:show(Frame),
+    wx_test_lib:wx_destroy(Frame,Config).
diff --git a/lib/wx/test/wx_event_SUITE.erl b/lib/wx/test/wx_event_SUITE.erl
index 53a2ee7d7b..076f16ba16 100644
--- a/lib/wx/test/wx_event_SUITE.erl
+++ b/lib/wx/test/wx_event_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
 %% 
 %% The 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,9 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [connect, disconnect, connect_msg_20, connect_cb_20,
-     mouse_on_grid, spin_event, connect_in_callback, recursive].
+     mouse_on_grid, spin_event, connect_in_callback, recursive,
+     dialog, char_events, callback_clean
+    ].
 
 groups() -> 
     [].
@@ -147,7 +149,7 @@ disconnect(Config) ->
     timer:sleep(1000),
     wx_test_lib:flush(),
 
-    ?m({'EXIT', {{badarg,_},_}}, wxEvtHandler:disconnect(Panel, non_existing_event_type)),
+    ?m(false, wxEvtHandler:disconnect(Panel, non_existing_event_type)),
     ?m(true, wxEvtHandler:disconnect(Panel, size)),
     ?m(ok, wxWindow:setSize(Panel, {200,102})),
     timer:sleep(1000),
@@ -398,3 +400,167 @@ recursive(Config) ->
     wx_test_lib:flush(),
 
     wx_test_lib:wx_destroy(Frame, Config).
+
+
+dialog(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+dialog(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Testing"),
+    wxFrame:show(Frame),
+    Env = wx:get_env(),
+    Tester = self(),
+    PD = wxProgressDialog:new("Dialog","Testing",
+			      [%%{parent, Frame},
+			       {maximum,101},
+			       {style, ?wxPD_SMOOTH bor ?wxPD_AUTO_HIDE}]),
+    Forward = fun(#wx{event=#wxInitDialog{}}, Ev) ->
+		      ?mt(wxInitDialogEvent, Ev),
+		      io:format("Heyhoo~n", []),
+		      wxEvent:skip(Ev),
+		      Tester ! {progress_dialog,PD}
+	      end,
+    wxDialog:connect(PD, init_dialog, [{callback, Forward}]),
+    Recurse = fun(Recurse, N) ->
+		      true = wxProgressDialog:update(PD, min(N,100)),
+		      timer:sleep(5),
+		      Recurse(Recurse,N+1)
+	      end,
+    Run = fun() ->
+		  wx:set_env(Env),
+		  Recurse(Recurse, 0)
+	  end,
+    Worker = spawn_link(Run),
+    timer:sleep(500),
+    io:format("Got ~p~n", [wx_test_lib:flush()]),
+    unlink(Worker),
+    wxProgressDialog:destroy(PD),
+    wx_test_lib:wx_destroy(Frame, Config).
+
+
+
+char_events(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+char_events(Config) ->
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Press any key"),
+    Panel = wxPanel:new(Frame, []),
+    wxFrame:connect(Frame, enter_window, [{callback, fun(_,_) ->
+							     io:format("Set focus~n"),
+							     wxWindow:setFocus(Panel)
+						     end}]),
+    KeyEvent = fun(Ev,Obj) -> io:format("Got ~p~n",[Ev]), wxEvent:skip(Obj) end,
+    [wxWindow:connect(Panel, Types, [{callback,KeyEvent}])
+     || Types <- [key_down, key_up, char]],
+    wxWindow:connect(Frame, char_hook, [{callback,KeyEvent}]),
+
+    wxFrame:show(Frame),
+    wx_test_lib:flush(),
+
+    wx_test_lib:wx_destroy(Frame, Config).
+
+callback_clean(TestInfo) when is_atom(TestInfo) -> wx_test_lib:tc_info(TestInfo);
+callback_clean(Config) ->
+    %% Be sure that event handling are cleanup up correctly and don't keep references to old
+    %% fun's and event listeners
+    Wx = wx:new(),
+    Frame = wxFrame:new(Wx, ?wxID_ANY, "Frame Window"),
+    wxFrame:show(Frame),
+
+    %% wx:debug([verbose,driver]),
+    Dlg = wxDialog:new(Frame, ?wxID_ANY, "Testing"),
+    Panel = wxPanel:new(Dlg, []),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    Button = wxButton:new(Panel, 600, [{label, "Foobar"}]),
+    wxSizer:add(Sizer, Button, [{proportion,1}, {flag, ?wxEXPAND}]),
+    wxSizer:add(Sizer, wxDialog:createStdDialogButtonSizer(Dlg,?wxOK bor ?wxCANCEL)),
+    wxDialog:setSizerAndFit(Dlg, Sizer),
+
+    Env = wx:get_env(),
+    SetupEventHandlers =
+	fun() ->
+		wx:set_env(Env),
+		Me = self(),
+		Print = fun(#wx{id=ID, event=#wxCommand{}},Ev) ->
+				io:format("~p Clicked ~p~n", [self(), ID]),
+				Me ! #wx{event=#wxClose{}},
+				wxEvent:skip(Ev, [{skip, true}]);
+			   (#wx{id=ID, event=#wxClose{}},Ev) ->
+				io:format("~p Closed ~p~n", [self(), ID]),
+				wxEvent:skip(Ev, [{skip, true}])
+			end,
+
+		wxDialog:connect(Dlg, command_button_clicked,[{callback,Print}]),
+		wxDialog:connect(Dlg, close_window, [{skip, true}])
+	end,
+    ?m({[],[],[]}, white_box_check_event_handlers()),
+    Pid = spawn_link(fun() ->
+    			     SetupEventHandlers(),
+    			     receive #wx{event=#wxClose{}} -> ok;
+    				     remove -> ok
+    			     end
+    		     end),
+    timer:sleep(500), %% Give it time to remove it
+    ?m({[{Pid,_}],[_],[_]}, white_box_check_event_handlers()),
+
+    Pid ! remove,
+    timer:sleep(500), %% Give it time to remove it
+    ?m({[],[],[]}, white_box_check_event_handlers()),
+
+    SetupEventHandlers(),
+    ?m({[{_,_}],[_],[_]}, white_box_check_event_handlers()),
+
+    wxDialog:show(Dlg),
+    wx_test_lib:wx_close(Dlg, Config),
+    wxDialog:destroy(Dlg),
+    timer:sleep(500), %% Give it time to remove it
+    ?m({[],[],[]}, white_box_check_event_handlers()),
+
+    wx_test_lib:flush(),
+    io:format("**Deleting Frame**~n",[]),
+    wx_test_lib:wx_destroy(Frame, Config).
+    %% timer:sleep(infinity),
+    %% ok.
+
+
+white_box_check_event_handlers() ->
+    {_,_,Server,_} = wx:get_env(),
+    {status, _, _, [Env, _, _, _, Data]} = sys:get_status(Server),
+    [_H, _data, {data, [{_, Record}]}] = Data,
+    {state, _Port1, _Port2, Users, [], CBs, _Next} = Record,
+    {[{Pid, Evs} ||
+	 {Pid, {user, Evs}} <- gb_trees:to_list(Users),
+	 Evs =/= []], %% Ignore empty
+     gb_trees:to_list(CBs),
+     [Funs || Funs = {Id, {Fun,_}} <- Env, is_integer(Id), is_function(Fun)]
+    }.
+
+handler_clean(TestInfo) when is_atom(TestInfo) ->
+    wx_test_lib:tc_info(TestInfo);
+handler_clean(_Config) ->
+    wx:new(),
+    Init = fun() -> create_window() end,
+    Frame1 = wx_obj_test:start([{init, Init}]),
+    ?mt(wxFrame, Frame1),
+    wxWindow:show(Frame1),
+    ?m([_|_], lists:sort(wx_test_lib:flush())),
+    ?m({stop,_}, wx_obj_test:stop(Frame1, fun(_) -> normal end)),
+    ?m([{terminate,normal}], lists:sort(wx_test_lib:flush())),
+
+    Frame2 = wx_obj_test:start([{init, Init}]),
+    wxWindow:show(Frame2),
+    ?m([_|_], lists:sort(wx_test_lib:flush())),
+    ?m({stop,_}, wx_obj_test:stop(Frame2, fun(_) -> wxWindow:destroy(Frame2), normal end)),
+    ?m([{terminate,normal}], lists:sort(wx_test_lib:flush())),
+    timer:sleep(104),
+    ?m({[],[],[]}, white_box_check_event_handlers()),
+    ?m(ok, wx:destroy()),
+    ok.
+
+create_window() ->
+    Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Test wx_object", [{size, {500, 400}}]),
+    Sz = wxBoxSizer:new(?wxHORIZONTAL),
+    Panel = wxPanel:new(Frame),
+    wxSizer:add(Sz, Panel, [{flag, ?wxEXPAND}, {proportion, 1}]),
+    wxWindow:connect(Frame, show),
+    %% wxPanel:connect(Panel, paint, [callback, {userData, foobar}]),
+    wxWindow:connect(Panel, size, [callback]),
+    {Frame, {Frame, Panel}}.
diff --git a/lib/wx/test/wx_obj_test.erl b/lib/wx/test/wx_obj_test.erl
index b4d7640c7e..f47f2fbc46 100644
--- a/lib/wx/test/wx_obj_test.erl
+++ b/lib/wx/test/wx_obj_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
 %%
 %% The 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,69 +18,71 @@
 -module(wx_obj_test).
 -include_lib("wx/include/wx.hrl").
 
--export([start/1]).
+-export([start/1, stop/2]).
 
 %% wx_object callbacks
 -export([init/1, handle_info/2, terminate/2, code_change/3, handle_call/3,
 	 handle_sync_event/3, handle_event/2, handle_cast/2]).
 
--record(state, {frame, panel, opts}).
+-record(state, {parent, opts, user_state}).
 
 start(Opts) ->
-    wx_object:start_link(?MODULE, [{parent, self()}, Opts], []).
+    wx_object:start_link(?MODULE, [{parent, self()}| Opts], []).
+
+stop(Object, Fun) ->
+    wx_object:call(Object, {stop, Fun}).
 
 init(Opts) ->
-    put(parent_pid, proplists:get_value(parent, Opts)),
-    Frame = wxFrame:new(wx:null(), ?wxID_ANY, "Test wx_object", [{size, {500, 400}}]),
-    Sz = wxBoxSizer:new(?wxHORIZONTAL),
-    Panel = wxPanel:new(Frame),
-    wxSizer:add(Sz, Panel, [{flag, ?wxEXPAND}, {proportion, 1}]),
-    wxPanel:connect(Panel, size, [{skip, true}]),
-    wxPanel:connect(Panel, paint, [callback, {userData, proplists:get_value(parent, Opts)}]),
-    wxWindow:show(Frame),
-    {Frame, #state{frame=Frame, panel=Panel, opts=Opts}}.
+    Parent = proplists:get_value(parent, Opts),
+    put(parent_pid, Parent),
+    Init = proplists:get_value(init, Opts),
+    {Obj, UserState} = Init(),
+    {Obj, #state{parent=Parent, opts=Opts, user_state=UserState}}.
 
-handle_sync_event(Event = #wx{obj=Panel}, WxEvent, #state{opts=Opts}) ->
-    DC=wxPaintDC:new(Panel),  %% We must create & destroy paintDC, or call wxEvent:skip(WxEvent))
-    wxPaintDC:destroy(DC),    %% in sync_event. Otherwise wx on windows keeps sending the events.
-    Pid = proplists:get_value(parent, Opts),
-    true = is_pid(Pid),
-    Pid ! {sync_event, Event, WxEvent},
+handle_sync_event(Event = #wx{obj=Panel, event=#wxPaint{}},
+		  WxEvent, #state{parent=Parent, user_state=US, opts=Opts}) ->
+    case proplists:get_value(redraw, Opts) of
+	undefined ->
+	    DC=wxPaintDC:new(Panel),  %% We must create & destroy paintDC, or call wxEvent:skip(WxEvent))
+	    wxPaintDC:destroy(DC),    %% in sync_event. Otherwise wx on windows keeps sending the events.
+	    Parent ! {sync_event, Event, WxEvent};
+	Redraw ->
+	    Redraw(Event, WxEvent, US)
+    end,
+    ok;
+handle_sync_event(Event, WxEvent, #state{parent=Parent}) ->
+    Parent ! {sync_event, Event, WxEvent},
     ok.
 
-handle_event(Event, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
-    Pid ! {event, Event},
+handle_event(Event, State = #state{parent=Parent}) ->
+    Parent ! {event, Event},
     {noreply, State}.
 
-handle_call(What, From, State) when is_function(What) ->
-    Result = What(State),
+handle_call(What, From, State = #state{user_state=US}) when is_function(What) ->
+    Result = What(US),
     {reply, {call, Result, From}, State};
+handle_call({stop, Fun}, From, State = #state{user_state=US}) ->
+    {stop, Fun(US), {stop, From}, State};
 handle_call(What, From, State) ->
     {reply, {call, What, From}, State}.
 
-handle_cast(What, State = #state{opts=Opts})  when is_function(What) ->
-    Result = What(State),
-    Pid = proplists:get_value(parent, Opts),
+handle_cast(What, State = #state{parent=Pid, user_state=US})  when is_function(What) ->
+    Result = What(US),
     Pid ! {cast, Result},
     {noreply, State};
 
-handle_cast(What, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+handle_cast(What, State = #state{parent=Pid}) ->
     Pid ! {cast, What},
     {noreply, State}.
 
-handle_info(What, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+handle_info(What, State = #state{parent=Pid}) ->
     Pid ! {info, What},
     {noreply, State}.
 
-terminate(What, #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+terminate(What, #state{parent=Pid}) ->
     Pid ! {terminate, What},
     ok.
 
-code_change(Ver1, Ver2, State = #state{opts=Opts}) ->
-    Pid = proplists:get_value(parent, Opts),
+code_change(Ver1, Ver2, State = #state{parent=Pid}) ->
     Pid ! {code_change, Ver1, Ver2},
     State.
diff --git a/lib/wx/test/wx_test_lib.erl b/lib/wx/test/wx_test_lib.erl
index 8509d6be6f..9b65a50864 100644
--- a/lib/wx/test/wx_test_lib.erl
+++ b/lib/wx/test/wx_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %% 
 %% The 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,28 +129,30 @@ pick_msg() ->
 
 user_available(Config) ->
     false /= proplists:get_value(user, Config, false).
-   	
 
 wx_destroy(Frame, Config) ->
+    wx_close(Frame, Config),
+    ?m(ok, wx:destroy()).
+
+wx_close(Frame, Config) ->
     case proplists:get_value(user, Config, false) of
 	false ->
 	    timer:sleep(100),
-	    ?m(ok, wxFrame:destroy(Frame)),
-	    ?m(ok, wx:destroy());
+	    ?m(ok, wxWindow:destroy(Frame));
 	true ->
 	    timer:sleep(500),
-	    ?m(ok, wxFrame:destroy(Frame)),
-	    ?m(ok, wx:destroy());	
+	    ?m(ok, wxWindow:destroy(Frame));
 	step -> %% Wait for user to close window
 	    ?m(ok, wxEvtHandler:connect(Frame, close_window, [{skip,true}])),
-	    wait_for_close()
+	    wait_for_close(),
+	    catch wxEvtHandler:disconnect(Frame, close_window),
+	    ok
     end.
 
 wait_for_close() ->
     receive 
 	#wx{event=#wxClose{}} ->
-	    ?log("Got close~n",[]),
-	    ?m(ok, wx:destroy());
+	    ?log("Got close~n",[]);
 	#wx{obj=Obj, event=Event} ->
 	    try 
 		Name = wxTopLevelWindow:getTitle(Obj),
diff --git a/lib/wx/test/wx_xtra_SUITE.erl b/lib/wx/test/wx_xtra_SUITE.erl
index a2d4c26319..8d5d7ddb6a 100644
--- a/lib/wx/test/wx_xtra_SUITE.erl
+++ b/lib/wx/test/wx_xtra_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The 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,15 +129,19 @@ app_dies(_Config) ->
 
 app_dies2(Test, N) ->
     spawn_link(fun() -> Test(N) end),
-    receive 
-	{'EXIT', _, {oops, last}} -> ok;
-	{'EXIT', _, {oops, _}} -> app_dies2(Test, N+1)
+    receive
+	{'EXIT', _, {oops, Server, What}} ->
+	    Ref = erlang:monitor(process, Server),
+	    receive {'DOWN', Ref, _, _, _} -> ok end,
+	    timer:sleep(100),
+	    What =/= last andalso app_dies2(Test, N+1)
     end.
 
 oops(Die, Line) when (Die =:= last) orelse (Die =< Line) ->
-    timer:sleep(300),
+    timer:sleep(200),
     ?log(" Exits at line ~p~n",[Line]),
-    exit({oops, Die});
+    Server = element(3, wx:get_env()),
+    exit({oops, Server, Die});
 oops(_,_) -> ok.
 
 
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index 1c406ccec6..c018b4fb86 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 1.0
+WX_VSN = 1.1.2
diff --git a/lib/xmerl/doc/src/book.xml b/lib/xmerl/doc/src/book.xml
index d46d37cf85..128a870628 100644
--- a/lib/xmerl/doc/src/book.xml
+++ b/lib/xmerl/doc/src/book.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE book SYSTEM "book.dtd">
 
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <header titlestyle="normal">
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/doc/src/fascicules.xml b/lib/xmerl/doc/src/fascicules.xml
index 0678195e07..37feca543f 100644
--- a/lib/xmerl/doc/src/fascicules.xml
+++ b/lib/xmerl/doc/src/fascicules.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE fascicules SYSTEM "fascicules.dtd">
 
 <fascicules>
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 1de854860c..b020b9bfa3 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
@@ -31,6 +31,74 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.3.6</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p> Fixed a problem in the SAX parser when the header of
+	    the next document was appearing in the buffer when using
+	    xmerl_sax_parser:stream/2 function. </p>
+          <p>
+	    Own Id: OTP-11551 Aux Id: seq12505 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> The default encoding of Erlang files has been changed
+	    from ISO-8859-1 to UTF-8. </p> <p> The encoding of XML
+	    files has also been changed to UTF-8. </p>
+          <p>
+	    Own Id: OTP-10907</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Xmerl 1.3.5</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Teach xmerl_xpath to resolve context namespaces in more
+	    cases. Thanks to Daniel White.</p>
+          <p>
+	    Own Id: OTP-11461</p>
+        </item>
+        <item>
+          <p>
+	    Avoid serialization on code_server in xmerl:export().
+	    Thanks to Richard Carlsson.</p>
+          <p>
+	    Own Id: OTP-11463</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Xmerl 1.3.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Fixed various typos in xmerl documentation. Thanks to
+	    David Welton.</p>
+          <p>
+	    Own Id: OTP-11224</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Xmerl 1.3.3</title>
 
     <section><title>Improvements and New Features</title>
@@ -76,7 +144,7 @@
         <item>
           <p>
 	    Add missing spaces in xmerl doc (Thanks to Ricardo
-	    Catalinas Jim�nez)</p>
+	    Catalinas Jiménez)</p>
           <p>
 	    Own Id: OTP-9873</p>
         </item>
diff --git a/lib/xmerl/doc/src/notes_history.xml b/lib/xmerl/doc/src/notes_history.xml
index a8f7d8b3a6..6afd07fa56 100644
--- a/lib/xmerl/doc/src/notes_history.xml
+++ b/lib/xmerl/doc/src/notes_history.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
       <year>2006</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/doc/src/part.xml b/lib/xmerl/doc/src/part.xml
index 8a544ad3b0..3567fe4a21 100644
--- a/lib/xmerl/doc/src/part.xml
+++ b/lib/xmerl/doc/src/part.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/doc/src/part_notes.xml b/lib/xmerl/doc/src/part_notes.xml
index b3c0597323..ace667deb9 100644
--- a/lib/xmerl/doc/src/part_notes.xml
+++ b/lib/xmerl/doc/src/part_notes.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE part SYSTEM "part.dtd">
 
 <part xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2011</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/doc/src/ref_man.xml b/lib/xmerl/doc/src/ref_man.xml
index 4b79d75d47..db35552845 100644
--- a/lib/xmerl/doc/src/ref_man.xml
+++ b/lib/xmerl/doc/src/ref_man.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE application SYSTEM "application.dtd">
 
 <application xmlns:xi="http://www.w3.org/2001/XInclude">
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/doc/src/xmerl_sax_parser.xml b/lib/xmerl/doc/src/xmerl_sax_parser.xml
index eb22711a75..4af55066eb 100644
--- a/lib/xmerl/doc/src/xmerl_sax_parser.xml
+++ b/lib/xmerl/doc/src/xmerl_sax_parser.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE erlref SYSTEM "erlref.dtd">
 
 <erlref>
   <header>
     <copyright>
       <year>2008</year>
-      <year>2011</year>
+      <year>2013</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
diff --git a/lib/xmerl/doc/src/xmerl_ug.xmlsrc b/lib/xmerl/doc/src/xmerl_ug.xmlsrc
index 8a0805020e..aa60c65417 100644
--- a/lib/xmerl/doc/src/xmerl_ug.xmlsrc
+++ b/lib/xmerl/doc/src/xmerl_ug.xmlsrc
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="latin1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE chapter SYSTEM "chapter.dtd">
 
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2012</year>
+      <year>2004</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -409,9 +409,9 @@ Data =
       specification but the basic functionality. For all details see
       the <seealso marker="xmerl_xs">reference manual</seealso></p>
     <p>First, some words about the xmerl_xs functionality:</p>
-    <p>You need to wright template functions to be able to control
+    <p>You need to write template functions to be able to control
       what kind of output you want. Thus if you want to encapsulate a
-      <c>bike</c> element in &lt;p&gt; tags you simply wright a
+      <c>bike</c> element in &lt;p&gt; tags you simply write a
       function:</p>
     <pre>
 template(E = #xmlElement{name='bike'}) ->
diff --git a/lib/xmerl/src/xmerl.appup.src b/lib/xmerl/src/xmerl.appup.src
index 0d8aa4eb04..0a84966576 100644
--- a/lib/xmerl/src/xmerl.appup.src
+++ b/lib/xmerl/src/xmerl.appup.src
@@ -1,14 +1,21 @@
+%% -*- erlang -*-
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2014. All Rights Reserved.
+%%
+%% The 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%
 {"%VSN%",
- [
-  {"1.1.11",
-    [
-     ]
-  }
- ],
- [
-  {"1.1.11",
-    [
-     ]
-  }
- ]
+ [{<<".*">>,[{restart_application, xmerl}]}],
+ [{<<".*">>,[{restart_application, xmerl}]}]
 }.
diff --git a/lib/xmerl/src/xmerl.erl b/lib/xmerl/src/xmerl.erl
index 3249094e78..01af183eef 100644
--- a/lib/xmerl/src/xmerl.erl
+++ b/lib/xmerl/src/xmerl.erl
@@ -303,18 +303,17 @@ apply_tag_cb(Ms, F, Args) ->
     apply_cb(Ms, F, '#element#', Args).
 
 apply_cb(Ms, F, Df, Args) ->
-    apply_cb(Ms, F, Df, Args, Ms).
-
-apply_cb([M|Ms], F, Df, Args, Ms0) ->
-    case catch apply(M, F, Args) of
-	{'EXIT', {undef,[{M,F,_,_}|_]}} ->
-	    apply_cb(Ms, F, Df, Args, Ms0);
-	{'EXIT', Reason} ->
-	    exit(Reason);
-	Res ->
-	    Res
+    apply_cb(Ms, F, Df, Args, length(Args)).
+
+apply_cb(Ms, F, Df, Args, A) ->
+    apply_cb(Ms, F, Df, Args, A, Ms).
+
+apply_cb([M|Ms], F, Df, Args, A, Ms0) ->
+    case erlang:function_exported(M, F, A) of
+        true -> apply(M, F, Args);
+        false -> apply_cb(Ms, F, Df, Args, A, Ms0)
     end;
-apply_cb([], Df, Df, Args, _Ms0) ->
+apply_cb([], Df, Df, Args, A, _Ms0) ->
     exit({unknown_tag, {Df, Args}});
-apply_cb([], F, Df, Args, Ms0) ->
-    apply_cb(Ms0, Df, Df, [F|Args]).
+apply_cb([], F, Df, Args, A, Ms0) ->
+    apply_cb(Ms0, Df, Df, [F|Args], A+1).
diff --git a/lib/xmerl/src/xmerl_regexp.erl b/lib/xmerl/src/xmerl_regexp.erl
index 0c53e6f34a..9303bdb125 100644
--- a/lib/xmerl/src/xmerl_regexp.erl
+++ b/lib/xmerl/src/xmerl_regexp.erl
@@ -593,7 +593,7 @@ sub_first_match(S, {regexp,RE}) ->
 	nomatch -> nomatch
     end.
 
-
+
 %% This is the regular expression grammar used. It is equivalent to the
 %% one used in AWK, except that we allow ^ $ to be used anywhere and fail
 %% in the matching.
@@ -961,7 +961,7 @@ re_apply_or(never_match, R2) -> R2;
 re_apply_or(R1, never_match) -> R1;
 re_apply_or(nomatch, R2) -> R2;
 re_apply_or(R1, nomatch) -> R1.
-
+
 %% Record definitions for the NFA, DFA and compiler.
 
 -record(nfa_state, {no,edges=[],accept=no}).
@@ -1026,7 +1026,7 @@ parse_reas([{RegExp,A}|REAs], S) ->
 	{error,E} -> {error,E}
     end;
 parse_reas([], Stack) -> {ok,reverse(Stack)}.
-
+
 %% build_combined_nfa(RegExpActionList) -> {NFA,StartState}.
 %%  Build the combined NFA using Thompson's construction straight out
 %%  of the book. Build the separate NFAs in the same order as the
@@ -1147,7 +1147,7 @@ nfa_comp_class(Cc) ->
 comp_crs([{C1,C2}|Crs], Last) ->
     [{Last,C1-1}|comp_crs(Crs, C2+1)];
 comp_crs([], Last) -> [{Last,maxchar}].
-
+
 %% build_dfa(NFA, NfaStartState) -> {DFA,DfaStartState}.
 %%  Build a DFA from an NFA using "subset construction". The major
 %%  difference from the book is that we keep the marked and unmarked
@@ -1282,7 +1282,7 @@ accept([St|Sts], NFA) ->
 	#nfa_state{accept=no} -> accept(Sts, NFA)
     end;
 accept([], _NFA) -> no.
-
+
 %% minimise_dfa(DFA, StartState, FirstState) -> {DFA,StartState}.
 %%  Minimise the DFA by removing equivalent states. We consider a
 %%  state if both the transitions and the their accept state is the
@@ -1331,7 +1331,7 @@ pack_dfa([D|DFA], NewN, Rs, PDFA) ->
     pack_dfa(DFA, NewN+1, [{D#dfa_state.no,NewN}|Rs],
 	     [D#dfa_state{no=NewN}|PDFA]);
 pack_dfa([], _NewN, Rs, PDFA) -> {PDFA,Rs}.
-
+
 %% comp_apply(String, StartPos, DFAReg) -> {match,RestPos,Rest} | nomatch.
 %% Apply the DFA of a regular expression to a string.  If
 %%  there is a match return the position of the remaining string and
diff --git a/lib/xmerl/src/xmerl_sax_parser.erl b/lib/xmerl/src/xmerl_sax_parser.erl
index 5c006aada2..ad71072d95 100644
--- a/lib/xmerl/src/xmerl_sax_parser.erl
+++ b/lib/xmerl/src/xmerl_sax_parser.erl
@@ -74,7 +74,8 @@ file(Name,Options) ->
 	    CL = filename:absname(Dir),
             File = filename:basename(Name),
 	    ContinuationFun = fun default_continuation_cb/1,
-            Res = stream(<<>>, [{continuation_fun, ContinuationFun},
+            Res = stream(<<>>, 
+			[{continuation_fun, ContinuationFun},
 			 {continuation_state, FD}, 
 			 {current_location, CL},
 			 {entity, File}
@@ -98,9 +99,13 @@ stream(Xml, Options) when is_list(Xml), is_list(Options) ->
     State = parse_options(Options, initial_state()),
     case  State#xmerl_sax_parser_state.file_type of
 	dtd ->
-	    xmerl_sax_parser_list:parse_dtd(Xml, State#xmerl_sax_parser_state{encoding = list});
+	    xmerl_sax_parser_list:parse_dtd(Xml, 
+					    State#xmerl_sax_parser_state{encoding = list,
+									 input_type = stream});
 	normal ->
-	    xmerl_sax_parser_list:parse(Xml, State#xmerl_sax_parser_state{encoding = list})
+	    xmerl_sax_parser_list:parse(Xml, 
+					State#xmerl_sax_parser_state{encoding = list,
+								     input_type = stream})
     end;
 stream(Xml, Options) when is_binary(Xml), is_list(Options) ->
     case parse_options(Options, initial_state()) of 
@@ -124,17 +129,14 @@ stream(Xml, Options) when is_binary(Xml), is_list(Options) ->
 				    [], 
 				    State#xmerl_sax_parser_state.event_state};
 		{Xml1, State1} ->
-		    parse(Xml1, State1, ParseFunction)
+		    parse_binary(Xml1, 
+				 State1#xmerl_sax_parser_state{input_type = stream},
+				 ParseFunction)
 	    end
     end.
 
-
-%%======================================================================
-%% Internal functions
-%%======================================================================
-
 %%----------------------------------------------------------------------
-%% Function: parse(Encoding, Xml, State, F) -> Result
+%% Function: parse_binary(Encoding, Xml, State, F) -> Result
 %% Input:    Encoding = atom()
 %%           Xml = [integer()] | binary()
 %%           State = #xmerl_sax_parser_state
@@ -144,15 +146,15 @@ stream(Xml, Options) when is_binary(Xml), is_list(Options) ->
 %%           EventState = term()
 %% Description: Chooses the correct parser depending on the encoding.
 %%----------------------------------------------------------------------
-parse(Xml, #xmerl_sax_parser_state{encoding=utf8}=State, F) ->
+parse_binary(Xml, #xmerl_sax_parser_state{encoding=utf8}=State, F) ->
     xmerl_sax_parser_utf8:F(Xml, State);
-parse(Xml, #xmerl_sax_parser_state{encoding={utf16,little}}=State, F) ->
+parse_binary(Xml, #xmerl_sax_parser_state{encoding={utf16,little}}=State, F) ->
     xmerl_sax_parser_utf16le:F(Xml, State);
-parse(Xml, #xmerl_sax_parser_state{encoding={utf16,big}}=State, F) ->
+parse_binary(Xml, #xmerl_sax_parser_state{encoding={utf16,big}}=State, F) ->
     xmerl_sax_parser_utf16be:F(Xml, State);
-parse(Xml, #xmerl_sax_parser_state{encoding=latin1}=State, F) ->
+parse_binary(Xml, #xmerl_sax_parser_state{encoding=latin1}=State, F) ->
     xmerl_sax_parser_latin1:F(Xml, State);
-parse(_, #xmerl_sax_parser_state{encoding=Enc}, _) -> 
+parse_binary(_, #xmerl_sax_parser_state{encoding=Enc}, _) -> 
     {error, lists:flatten(io_lib:format("Charcter set ~p not supported", [Enc]))}.
 
 %%----------------------------------------------------------------------
diff --git a/lib/xmerl/src/xmerl_sax_parser.hrl b/lib/xmerl/src/xmerl_sax_parser.hrl
index 736316e069..b433dd6cf9 100644
--- a/lib/xmerl/src/xmerl_sax_parser.hrl
+++ b/lib/xmerl/src/xmerl_sax_parser.hrl
@@ -86,7 +86,15 @@
 	  file_type = normal,       % Can be normal, dtd and entity
 	  current_location,         % Location of the currently parsed XML entity
 	  entity,                   % Parsed XML entity
-	  skip_external_dtd = false % If true the external DTD is skipped during parsing
+	  skip_external_dtd = false,% If true the external DTD is skipped during parsing
+	  input_type                % Source type: file | stream. 
+                                    % This field is a preparation for an fix in R17 of a bug in 
+                                    % the conformance against the standard.
+                                    % Today a file which contains two XML documents will be considered 
+                                    % well-formed and the second is placed in the rest part of the 
+                                    % return tuple, according to the conformance tests this should fail.
+                                    % In the future this will fail if xmerl_sax_aprser:file/2 is used but 
+                                    % left to the user in the xmerl_sax_aprser:stream/2 case.
 	 }).
 
 
diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index 7b64d7c302..e198f2fef5 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -113,6 +113,10 @@ parse_dtd(Xml, State) ->
 	    State3 =  event_callback(endDocument, State2),
 	    ets:delete(RefTable),
 	    {ok, State3#xmerl_sax_parser_state.event_state, Rest}; 
+	{endDocument, Rest, State2} when is_record(State2, xmerl_sax_parser_state) ->
+	    State3 =  event_callback(endDocument, State2),
+	    ets:delete(RefTable),
+	    {ok, State3#xmerl_sax_parser_state.event_state, Rest}; 
 	Other ->
 	    _State2 = event_callback(endDocument, State1),
 	    ets:delete(RefTable),
@@ -207,8 +211,14 @@ parse_prolog(?STRING_EMPTY, State) ->
 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);
+    case parse_pi(Rest, State) of
+	{Rest1, State1} ->
+	    parse_prolog(Rest1, State1);
+	{endDocument, Rest1, State1} ->
+	    parse_prolog(Rest1, State1)  
+	    % IValue = ?TO_INPUT_FORMAT("<?"),
+	    % {?APPEND_STRING(IValue, Rest1), State1}
+    end;
 parse_prolog(?STRING_REST("<!", Rest), State) ->
     parse_prolog_1(Rest, State);
 parse_prolog(?STRING_REST("<", Rest), State) ->
@@ -409,10 +419,11 @@ parse_pi(?STRING_UNBOUND_REST(C, Rest) = Bytes, State) ->
 		parse_name(Rest, State, [C]),
 	    case string:to_lower(PiTarget) of  
 		"xml" ->
-		    case State#xmerl_sax_parser_state.end_tags of
-			[] ->
-			    {Bytes, State};
-			_ ->
+		    case check_if_new_doc_allowed(State#xmerl_sax_parser_state.input_type,
+						  State#xmerl_sax_parser_state.end_tags) of
+			true ->
+			    {endDocument, Bytes, State};
+			false ->
 			    ?fatal_error(State1, "<?xml  ...?> not first in document")
 		    end;
 		_ ->
@@ -426,6 +437,11 @@ parse_pi(?STRING_UNBOUND_REST(C, Rest) = Bytes, State) ->
 parse_pi(Bytes, State) ->
     unicode_incomplete_check([Bytes, State, fun parse_pi/2], undefined).
 
+check_if_new_doc_allowed(stream, []) ->
+    true;
+check_if_new_doc_allowed(_, _) ->
+    false.
+
 %%----------------------------------------------------------------------
 %% Function: parse_pi_1(Rest, State) -> Result
 %% Input:    Rest = string() | binary()
@@ -657,8 +673,13 @@ parse_misc(?STRING_EMPTY, State, Eod) ->
 parse_misc(?STRING("<") = Rest, State, Eod) ->
     cf(Rest, State, Eod, fun parse_misc/3);
 parse_misc(?STRING_REST("<?", Rest), State, Eod) ->
-    {Rest1, State1} = parse_pi(Rest, State),
-    parse_misc(Rest1, State1, Eod);
+    case parse_pi(Rest, State) of
+	{Rest1, State1} ->
+	    parse_misc(Rest1, State1, Eod);
+	{endDocument, _Rest1, State1} ->
+	    IValue = ?TO_INPUT_FORMAT("<?"),
+	    {?APPEND_STRING(IValue, Rest), State1}
+    end;
 parse_misc(?STRING("<!") = Rest, State, Eod) ->
     cf(Rest, State, Eod, fun parse_misc/3);
 parse_misc(?STRING("<!-") = Rest, State, Eod) ->
@@ -1063,8 +1084,13 @@ parse_content(?STRING_REST("<!--", Rest), State, Acc, IgnorableWS) ->
     parse_content(Rest1, State2, [], true);
 parse_content(?STRING_REST("<?", Rest), State, Acc, IgnorableWS) ->
     State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
-    {Rest1, State2} = parse_pi(Rest, State1),
-    parse_content(Rest1, State2, [], true);
+    case parse_pi(Rest, State1) of
+	{Rest1, State2} ->
+	    parse_content(Rest1, State2, [], true);
+	{endDocument, _Rest1, State2} ->
+	    IValue = ?TO_INPUT_FORMAT("<?"),
+	    {?APPEND_STRING(IValue, Rest), State2}
+    end;
 parse_content(?STRING_REST("<!", Rest1) = Rest, #xmerl_sax_parser_state{end_tags = ET} = State, Acc, IgnorableWS) ->
     case ET of 
 	[] ->
@@ -1649,8 +1675,9 @@ handle_external_entity({file, FileToOpen}, State) ->
 	    {?STRING_EMPTY, EntityState} = 
 		parse_external_entity_1(<<>>, 
 					State#xmerl_sax_parser_state{continuation_state=FD,
-							      current_location=filename:dirname(FileToOpen),
-							      entity=filename:basename(FileToOpen)}),
+								     current_location=filename:dirname(FileToOpen),
+								     entity=filename:basename(FileToOpen),
+								     input_type=file}),
 	    file:close(FD),
 	    EntityState#xmerl_sax_parser_state.event_state
     end;
@@ -1667,8 +1694,9 @@ handle_external_entity({http, Url}, State) ->
 		{?STRING_EMPTY, EntityState} = 
 		    parse_external_entity_1(<<>>, 
 					    State#xmerl_sax_parser_state{continuation_state=FD,
-								  current_location=filename:dirname(Url),
-								  entity=filename:basename(Url)}),
+									 current_location=filename:dirname(Url),
+									 entity=filename:basename(Url),
+									 input_type=file}),
 		file:close(FD),
 		file:delete(TmpFile),
 		EntityState#xmerl_sax_parser_state.event_state
@@ -1881,8 +1909,13 @@ parse_doctype_decl(?STRING_EMPTY, State) ->
 parse_doctype_decl(?STRING("<"), State) ->
     cf(?STRING("<"), State, fun parse_doctype_decl/2);
 parse_doctype_decl(?STRING_REST("<?", Rest), State) ->
-    {Rest1, State1} = parse_pi(Rest, State),
-    parse_doctype_decl(Rest1, State1);
+    case parse_pi(Rest, State) of
+	{Rest1, State1} ->
+	     parse_doctype_decl(Rest1, State1);
+	{endDocument, _Rest1, State1} ->
+	    IValue = ?TO_INPUT_FORMAT("<?"),
+	    {?APPEND_STRING(IValue, Rest), State1}
+    end;
 parse_doctype_decl(?STRING_REST("%", Rest), State) ->
     {Ref, Rest1, State1} = parse_pe_reference(Rest, State),
     case Ref of
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 883153628c..8dfbc2b89e 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %%
 %% The 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/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index b3301f2faf..be0e863ce4 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -713,10 +713,26 @@ node_test(_Test,
 node_test({wildcard, _}, #xmlNode{type=ElAt}, _Context) 
   when ElAt==element; ElAt==attribute; ElAt==namespace ->
     true;
-node_test({prefix_test, Prefix}, #xmlNode{node = N}, _Context) ->
+node_test({prefix_test, Prefix}, #xmlNode{node = N}, Context) ->
     case N of
-	#xmlElement{nsinfo = {Prefix, _}} -> true;
-	#xmlAttribute{nsinfo = {Prefix, _}} -> true;
+	#xmlElement{nsinfo = {Prefix, _}} ->
+            true;
+        #xmlElement{expanded_name = {Uri, _}} ->
+            case expanded_name(Prefix, "_", Context) of
+                {Uri, _} ->
+                    true;
+                _ ->
+                    false
+            end;
+	#xmlAttribute{nsinfo = {Prefix, _}} ->
+            true;
+        #xmlAttribute{expanded_name = {Uri, _}} ->
+            case expanded_name(Prefix, "_", Context) of
+                {Uri, _} ->
+                    true;
+                _ ->
+                    false
+            end;
 	_ ->
 	    false
     end;
@@ -760,20 +776,21 @@ node_test({name, {_Tag, Prefix, Local}},
 node_test({name, {Tag,_Prefix,_Local}}, 
 	  #xmlNode{node = #xmlAttribute{name = Tag}}, _Context) -> 
     true;
-node_test({name, {_Tag, Prefix, Local}}, 
-	  #xmlNode{node = #xmlAttribute{expanded_name = {URI, Local},
-					nsinfo = {_Prefix1, _},
-					namespace = NS}}, _Context) -> 
-    NSNodes = NS#xmlNamespace.nodes,
-    case lists:keysearch(Prefix, 1, NSNodes) of
-	{value, {_, URI}} ->
-	    ?dbg("node_test(~, ~p) -> true.~n", 
-		 [{_Tag, Prefix, Local}, write_node(NSNodes)]),
-	    true;
-	false ->
-	    ?dbg("node_test(~, ~p) -> false.~n", 
-		 [{_Tag, Prefix, Local}, write_node(NSNodes)]),
-	    false
+node_test({name, {Tag, Prefix, Local}},
+          #xmlNode{node = #xmlAttribute{name = Name,
+                                        expanded_name = EExpName
+                                       }}, Context) ->
+    case expanded_name(Prefix, Local, Context) of
+        [] ->
+            Res = (Tag == Name),
+            ?dbg("node_test(~p, ~p) -> ~p.~n",
+                 [{Tag, Prefix, Local}, write_node(Name), Res]),
+            Res;
+        ExpName ->
+            Res = (ExpName == EExpName),
+            ?dbg("node_test(~p, ~p) -> ~p.~n",
+                 [{Tag, Prefix, Local}, write_node(Name), Res]),
+            Res
     end;
 node_test({name, {_Tag, [], Local}},
 	  #xmlNode{node = #xmlNsNode{prefix = Local}}, _Context) ->
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index ffe227c671..16d02f571d 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %%
 %% The 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/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index e21355f877..692cd64249 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -1,8 +1,7 @@
-%% -*- coding: utf-8 -*-
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
 %%
 %% The 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 +41,7 @@
 %%----------------------------------------------------------------------
 all() -> 
     [{group, cpd_tests}, xpath_text1, xpath_main,
-     xpath_abbreviated_syntax, xpath_functions,
+     xpath_abbreviated_syntax, xpath_functions, xpath_namespaces,
      {group, misc}, {group, eventp_tests},
      {group, ticket_tests}, {group, app_test},
      {group, appup_test}].
@@ -205,6 +204,11 @@ xpath_functions(Config) ->
     ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
     ?line ok = xpath_abbrev:functions().
 
+xpath_namespaces(suite) -> [];
+xpath_namespaces(Config) ->
+    ?line file:set_cwd(filename:join(?config(data_dir,Config),xpath)),
+    ?line ok = xpath_abbrev:namespaces().
+
 %%----------------------------------------------------------------------
 
 latin1_alias(suite) -> [];
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml b/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
index a5ae223d65..16090c3590 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/purchaseOrder.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <apo:purchaseOrder xmlns:apo="http://www.example.com/PO1"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    orderDate="1999-10-20">
-  <billTo country="US">
+  <billTo country="US" xsi:type="apo:USAddress">
     <name>Robert Smith</name>
     <street>8 Oak Avenue</street>
     <!-- etc. -->
@@ -10,7 +11,7 @@
       <zip>95819</zip>
   </billTo>
   <apo:comment>Hurry, my lawn is going wild!</apo:comment>
-  <shipTo country="US">
+  <shipTo country="US" xsi:type="apo:USAddress">
     <name>Alice Smith</name>
     <street>123 Maple Street</street>
     <!-- etc. -->
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
index 7b6f1e95b3..afd39b6598 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
@@ -8,6 +8,7 @@
 -module(xpath_abbrev).
 
 -export([test/0, check_node_set/2, ticket_6873/0, ticket_7496/0, functions/0]).
+-export([namespaces/0]).
 
 -include("test_server.hrl").
 -include_lib("xmerl/include/xmerl.hrl").
@@ -264,3 +265,33 @@ functions() ->
 		    [city,city,comment]),
     ?line ok = Test(Doc2,"//*[starts-with(name(),'{http://www.example.com/PO1')]",
 		    ['apo:purchaseOrder','apo:comment']).
+
+
+namespaces() ->
+    {Doc,_} = xmerl_scan:file("purchaseOrder.xml", [{namespace_conformant, true}]),
+
+    %% Element name using regular namespace and context namespace declaration.
+    ?line [#xmlElement{nsinfo = {_, "purchaseOrder"}}] =
+        xmerl_xpath:string("/apo:purchaseOrder", Doc),
+    ?line [#xmlElement{nsinfo = {_, "purchaseOrder"}}] =
+        xmerl_xpath:string("/t:purchaseOrder", Doc, [{namespace, [{"t", "http://www.example.com/PO1"}]}]),
+
+    %% Wildcard element name using regular namespace and context namespace declaration.
+    ?line [#xmlElement{nsinfo = {_, "comment"}}] =
+        xmerl_xpath:string("./apo:*", Doc),
+    ?line [#xmlElement{nsinfo = {_, "comment"}}] =
+        xmerl_xpath:string("./t:*", Doc, [{namespace, [{"t", "http://www.example.com/PO1"}]}]),
+
+    %% Attribute name using regular namespace and context namespace declaration.
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@xsi:type", Doc),
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@t:type", Doc, [{namespace, [{"t", "http://www.w3.org/2001/XMLSchema-instance"}]}]),
+
+    %% Wildcard attribute name using regular namespace and context namespace declaration.
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@xsi:*", Doc),
+    ?line [#xmlAttribute{nsinfo = {_, "type"}}, #xmlAttribute{nsinfo = {_, "type"}}] =
+        xmerl_xpath:string("//@t:*", Doc, [{namespace, [{"t", "http://www.w3.org/2001/XMLSchema-instance"}]}]),
+
+    ok.
diff --git a/lib/xmerl/test/xmerl_appup_test.erl b/lib/xmerl/test/xmerl_appup_test.erl
index 80c8d8e4fd..ff6b368bcc 100644
--- a/lib/xmerl/test/xmerl_appup_test.erl
+++ b/lib/xmerl/test/xmerl_appup_test.erl
@@ -23,20 +23,7 @@
 -module(xmerl_appup_test).
 
 -compile(export_all).
-
-%-include("megaco_test_lib.hrl").
-
-
-%t()     -> megaco_test_lib:t(?MODULE).
-%t(Case) -> megaco_test_lib:t({?MODULE, Case}).
-
-
-%% Test server callbacks
-% init_per_testcase(Case, Config) ->
-%     megaco_test_lib:init_per_testcase(Case, Config).
-
-% end_per_testcase(Case, Config) ->
-%     megaco_test_lib:end_per_testcase(Case, Config).
+-include_lib("common_test/include/ct.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -58,14 +45,7 @@ end_per_group(_GroupName, Config) ->
 init_per_suite(suite) -> [];
 init_per_suite(doc) -> [];
 init_per_suite(Config) when is_list(Config) ->
-    AppFile   = file_name(xmerl, ".app"),
-    AppupFile = file_name(xmerl, ".appup"),
-    [{app_file, AppFile}, {appup_file, AppupFile}|Config].
-    
-
-file_name(App, Ext) ->
-    LibDir = code:lib_dir(App),
-    filename:join([LibDir, "ebin", atom_to_list(App) ++ Ext]).
+    Config.
 
 
 end_per_suite(suite) -> [];
@@ -76,317 +56,6 @@ end_per_suite(Config) when is_list(Config) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-appup(suite) ->
-    [];
-appup(doc) ->
-    "perform a simple check of the appup file";
+%% perform a simple check of the appup file
 appup(Config) when is_list(Config) ->
-    AppupFile = key1search(appup_file, Config),
-    AppFile   = key1search(app_file, Config),
-    Modules   = modules(AppFile),
-    check_appup(AppupFile, Modules).
-
-modules(File) ->
-    case file:consult(File) of
-        {ok, [{application,xmerl,Info}]} ->
-            case lists:keysearch(modules,1,Info) of
-                {value, {modules, Modules}} ->
-                    Modules;
-                false ->
-                    fail({bad_appinfo, Info})
-            end;
-        Error ->
-            fail({bad_appfile, Error})
-    end.
-
-    
-check_appup(AppupFile, Modules) ->
-    case file:consult(AppupFile) of
-	{ok, [{V, UpFrom, DownTo}]} ->
-	    io:format("V= ~p, UpFrom= ~p, DownTo= ~p, Modules= ~p~n",
-		      [V, UpFrom, DownTo, Modules]),
-	    check_appup(V, UpFrom, DownTo, Modules);
-	Else ->
-	    fail({bad_appupfile, Else})
-    end.
-
-
-check_appup(V, UpFrom, DownTo, Modules) ->
-    check_version(V),
-    check_depends(up,   UpFrom, Modules),
-    check_depends(down, DownTo, Modules),
-    ok.
-
-
-check_depends(_, [], _) ->
-    ok;
-check_depends(UpDown, [Dep|Deps], Modules) ->
-    check_depend(UpDown, Dep, Modules),
-    check_depends(UpDown, Deps, Modules).
-
-
-check_depend(up,I={add_application, _App}, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instruction:       ~p"
-      "~n   Modules: ~p", [up,I , Modules]),
-    ok;
-check_depend(down,I={remove_application, _App}, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instruction:       ~p"
-      "~n   Modules: ~p", [down,I , Modules]),
-    ok;
-check_depend(UpDown, {V, Instructions}, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   V:       ~p"
-      "~n   Modules: ~p", [UpDown, V, Modules]),
-    check_version(V),
-    case check_instructions(UpDown, 
-			    Instructions, Instructions, [], [], Modules) of
-	{_Good, []} ->
-	    ok;
-	{_, Bad} ->
-	    fail({bad_instructions, Bad, UpDown})
-    end.
-
-
-check_instructions(_, [], _, Good, Bad, _) ->
-    {lists:reverse(Good), lists:reverse(Bad)};
-check_instructions(UpDown, [Instr|Instrs], AllInstr, Good, Bad, Modules) ->
-    d("check_instructions(~w) -> entry with"
-      "~n   Instr: ~p", [UpDown,Instr]),
-    case (catch check_instruction(UpDown, Instr, AllInstr, Modules)) of
-        ok ->
-            check_instructions(UpDown, Instrs, AllInstr, 
-			       [Instr|Good], Bad, Modules);
-        {error, Reason} ->
-	    d("check_instructions(~w) -> bad instruction: "
-	      "~n   Reason: ~p", [UpDown,Reason]),
-            check_instructions(UpDown, Instrs, AllInstr, Good, 
-                               [{Instr, Reason}|Bad], Modules)
-    end.
-
-%% A new module is added
-check_instruction(up, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when up-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    check_module(Module, Modules);
-
-%% An old module is re-added
-check_instruction(down, {add_module, Module}, _, Modules) 
-  when is_atom(Module) ->
-    d("check_instruction -> entry when down-add_module instruction with"
-      "~n   Module: ~p", [Module]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    ok;
-	ok ->
-	    local_error({existing_readded_module, Module})
-    end;
-
-%% Removing a module on upgrade: 
-%% - the module has been removed from the app-file.
-%% - check that no module depends on this (removed) module
-check_instruction(up, {remove, {Module, Pre, Post}}, _, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
-    d("check_instruction -> entry when up-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	{error, {unknown_module, Module, Modules}} ->
-	    check_purge(Pre),
-	    check_purge(Post);
-	ok ->
-	    local_error({existing_removed_module, Module})
-    end;
-
-%% Removing a module on downgrade: the module exist
-%% in the app-file.
-check_instruction(down, {remove, {Module, Pre, Post}}, AllInstr, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post) ->
-    d("check_instruction -> entry when down-remove instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p", [Module, Pre, Post]),
-    case (catch check_module(Module, Modules)) of
-	ok ->
-	    check_purge(Pre),
-	    check_purge(Post),
-	    check_no_remove_depends(Module, AllInstr);
-	{error, {unknown_module, Module, Modules}} ->
-	    local_error({nonexisting_removed_module, Module})
-    end;
-
-check_instruction(_, {load_module, Module, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
-    d("check_instruction -> entry when load_module instruction with"
-      "~n   Module: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, {update, Module, Change, Pre, Post, Depend}, 
-		  AllInstr, Modules) 
-  when is_atom(Module), is_atom(Pre), is_atom(Post), is_list(Depend) ->
-    d("check_instruction -> entry when update instruction with"
-      "~n   Module: ~p"
-      "~n   Change: ~p"
-      "~n   Pre:    ~p"
-      "~n   Post:   ~p"
-      "~n   Depend: ~p", [Module, Change, Pre, Post, Depend]),
-    check_module(Module, Modules),
-    check_module_depend(Module, Depend, Modules),
-    check_module_depend(Module, Depend, updated_modules(AllInstr, [])),
-    check_change(Change),
-    check_purge(Pre),
-    check_purge(Post);
-
-check_instruction(_, Instr, _AllInstr, _Modules) ->
-    d("check_instruction -> entry when unknown instruction with"
-      "~n   Instr: ~p", [Instr]),
-    local_error({error, {unknown_instruction, Instr}}).
-
-
-%% If Module X depends on Module Y, then module Y must have an update
-%% instruction of some sort (otherwise the depend is faulty).
-updated_modules([], Modules) ->
-    d("update_modules -> entry when done with"
-      "~n   Modules: ~p", [Modules]),
-    Modules;
-updated_modules([Instr |Instrs], Modules) ->
-    d("update_modules -> entry with"
-      "~n   Instr:   ~p"
-      "~n   Modules: ~p", [Instr,Modules]),
-    Module = instruction_module(Instr),
-    d("update_modules -> Module: ~p", [Module]),
-    updated_modules(Instrs, [Module|Modules]).
-    
-instruction_module({add_module, Module}) ->
-    Module;
-instruction_module({remove, {Module, _, _}}) ->
-    Module;
-instruction_module({load_module, Module, _, _, _}) ->
-    Module;
-instruction_module({update, Module, _, _, _, _}) ->
-    Module;
-instruction_module(Instr) ->
-    d("instruction_module -> entry when unknown instruction with"
-      "~n   Instr: ~p", [Instr]),
-    local_error({error, {unknown_instruction, Instr}}).
-    
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-check_version(V) when is_list(V) ->
-    ok;
-check_version(V) ->
-    local_error({bad_version, V}).
-
-
-check_module(M, Modules) when is_atom(M) ->
-    case lists:member(M,Modules) of
-        true ->
-            ok;
-        false ->
-            local_error({unknown_module, M, Modules})
-    end;
-check_module(M, _) ->
-    local_error({bad_module, M}).
-
-
-check_module_depend(M, [], _) when is_atom(M) ->
-    d("check_module_depend -> entry with"
-      "~n   M: ~p", [M]),    
-    ok;
-check_module_depend(M, Deps, Modules) when is_atom(M), is_list(Deps) ->
-    d("check_module_depend -> entry with"
-      "~n   M: ~p"
-      "~n   Deps: ~p"
-      "~n   Modules: ~p", [M, Deps, Modules]),    
-    case [Dep || Dep <- Deps, lists:member(Dep, Modules) == false] of
-        [] ->
-            ok;
-        Unknown ->
-            local_error({unknown_depend_modules, Unknown})
-    end;
-check_module_depend(_M, D, _Modules) ->
-    d("check_module_depend -> entry when bad depend with"
-      "~n   D: ~p", [D]),    
-    local_error({bad_depend, D}).
-
-
-check_no_remove_depends(_Module, []) ->
-    ok;
-check_no_remove_depends(Module, [Instr|Instrs]) ->
-    check_no_remove_depend(Module, Instr),
-    check_no_remove_depends(Module, Instrs).
-
-check_no_remove_depend(Module, {load_module, Mod, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    local_error({removed_module_in_depend, load_module, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(Module, {update, Mod, _Change, _Pre, _Post, Depend}) ->
-    case lists:member(Module, Depend) of
-	true ->
-	    local_error({removed_module_in_depend, update, Mod, Module});
-	false ->
-	    ok
-    end;
-check_no_remove_depend(_, _) ->
-    ok.
-    
-
-check_change(soft) ->
-    ok;
-check_change({advanced, _Something}) ->
-    ok;
-check_change(Change) ->
-    local_error({bad_change, Change}).
-
-
-check_purge(soft_purge) ->
-    ok;
-check_purge(brutal_purge) ->
-    ok;
-check_purge(Purge) ->
-    local_error({bad_purge, Purge}).
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-local_error(Reason) ->
-    throw({error, Reason}).
-
-fail(Reason) ->
-    exit({suite_failed, Reason}).
-
-key1search(Key, L) ->
-    case lists:keysearch(Key, 1, L) of
-	undefined ->
-	    fail({not_found, Key, L});
-	{value, {Key, Value}} ->
-	    Value
-    end.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-d(F, A) ->
-    d(false, F, A).
-
-d(true, F, A) ->
-    io:format(F ++ "~n", A);
-d(_, _, _) ->
-    ok.
-
-    
+    ok = ?t:appup_test(xmerl).
diff --git a/lib/xmerl/test/xmerl_sax_SUITE.erl b/lib/xmerl/test/xmerl_sax_SUITE.erl
index 563bbaaa06..10a96f470b 100644
--- a/lib/xmerl/test/xmerl_sax_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_SUITE.erl
@@ -67,7 +67,8 @@ end_per_testcase(_Func,_Config) ->
 %% Description: Checks that end of document is checked properly when continuation fun is missing.
 ticket_8213(suite) -> [];
 ticket_8213(_Config) -> 
-    ?line {ok,ok,[]} = xmerl_sax_parser:stream("<elem/>", [{event_fun, fun (_E,_,_) -> ok end}]).
+    ?line {ok,ok,[]} = xmerl_sax_parser:stream("<elem/>", [{event_fun, fun (_E,_,_) -> ok end}]),
+    ok.
 
 
 %%----------------------------------------------------------------------
@@ -86,7 +87,35 @@ ticket_8214(_Config) ->
 						 ({startElement, _, "elem",_,_}, _,_) -> 
 						     throw({test, "Error in startElement tuple"});
 						 (_E,_,_) -> ok
-					     end}]).
+					     end}]),
+    ok.
+
+%%----------------------------------------------------------------------
+%% Test Case 
+%% ID: ticket_8214
+%% Description: Checks that attributes with default namespace don't get [] in NS field.
+ticket_11551(suite) -> [];
+ticket_11551(Config) -> 
+    Stream1 = <<"<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+<a>hej</a>
+<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+<a>hej</a>">>,
+    ?line {ok, undefined, <<"<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream1, []),
+    Stream2= <<"<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+<a>hej</a>
+
+
+<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+<a>hej</a>">>,
+    ?line {ok, undefined, <<"<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream2, []),
+    Stream3= <<"<a>hej</a>
+
+<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+<a>hej</a>">>,
+    ?line {ok, undefined, <<"<?xml",  _/binary>>} = xmerl_sax_parser:stream(Stream3, []),
+    ok.
+		    
+
 
 %%----------------------------------------------------------------------
 %% Bug test cases
@@ -99,7 +128,7 @@ all() ->
     [{group, bugs}].
 
 groups() -> 
-    [{bugs, [], [ticket_8213, ticket_8214]}].
+    [{bugs, [], [ticket_8213, ticket_8214, ticket_11551]}].
 
 init_per_group(_GroupName, Config) ->
     Config.
diff --git a/lib/xmerl/test/xmerl_sax_std_SUITE.erl b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
index 2b7b59dacf..6440329112 100644
--- a/lib/xmerl/test/xmerl_sax_std_SUITE.erl
+++ b/lib/xmerl/test/xmerl_sax_std_SUITE.erl
@@ -2074,8 +2074,9 @@ end_per_testcase(_Func,_Config) ->
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
-   ?line {ok,_,<<"xml version=\"1.0\"?>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%?line check_result(R, "not-wf").
+   ?line {ok,_,<<"<?xml version=\"1.0\"?>\r\n">>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   % ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   % ?line check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -12361,8 +12362,9 @@ end_per_testcase(_Func,_Config) ->
    %% Special case becase we returns everything after a legal document 
    %% as an rest instead of giving and error to let the user handle 
    %% multipple docs on a stream.
-   ?line {ok,_, <<"xml version=\"1.0\"?>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
-   %%?line check_result(R, "not-wf").
+   ?line {ok,_, <<"<?xml version=\"1.0\"?>", _/binary>>} = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]).
+   % ?line R = xmerl_sax_parser:file(Path, [{event_fun, fun(_,_,S) -> S end}]),
+   % ?line check_result(R, "not-wf").
 
 %%----------------------------------------------------------------------
 %% Test Case 
@@ -24625,7 +24627,7 @@ groups() ->
        'not-wf-sa-136', 'not-wf-sa-137', 'not-wf-sa-138',
        'not-wf-sa-139', 'not-wf-sa-140', 'not-wf-sa-141',
        'not-wf-sa-142', 'not-wf-sa-143', 'not-wf-sa-144',
-       'not-wf-sa-145', 'not-wf-sa-146', 'not-wf-sa-147',
+       'not-wf-sa-145', 'not-wf-sa-146', %'not-wf-sa-147', LATH: Check this later
        'not-wf-sa-148', 'not-wf-sa-149', 'not-wf-sa-150',
        'not-wf-sa-151', 'not-wf-sa-152', 'not-wf-sa-153',
        'not-wf-sa-154', 'not-wf-sa-155', 'not-wf-sa-156',
diff --git a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
index 44ec4b592d..34a65ac6ff 100644
--- a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
+++ b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %% 
 %% The 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() -> 
-    [att, ct, elem, group, idc_, id, mgABCD, mgEFG, mgHIJ,
+    [att, ct, elem, model_group, idc_, id, mgABCD, mgEFG, mgHIJ,
      mgK, mgLM, mgN, mgOP, mgQR, mgS, particlesAB,
      particlesCDE, particlesFHI, particlesJ,
      particlesKOSRTQUVW, stABCDE, stFGH, stIJK, stZ,
@@ -5743,8 +5743,7 @@ elem(Config) when is_list(Config) ->
 
 %% Syntax Checking Model Group Tests.
 %% Content Checking Model Group Tests.
-
-group(Config) when is_list(Config) ->
+model_group(Config) when is_list(Config) ->
   STResList0 = [],
 
   ?line {STRes0,_} = xmerl_xsd_lib:schema_test(Config,'./msxsdtest/Group/groupA001.xsd','./msxsdtest/Group',valid),
diff --git a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msx_failed_cases.log b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msx_failed_cases.log
index a89a9a798c..7ee2a56c20 100644
--- a/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msx_failed_cases.log
+++ b/lib/xmerl/test/xmerl_xsd_MS2002-01-16_SUITE_data/msx_failed_cases.log
@@ -532,7 +532,7 @@
         "elemQ018.xml",
         "elemO011.xml",
         "elemO006.xml"],[]}}.
-{group,{["groupO027.xsd",
+{model_group,{["groupO027.xsd",
          "groupO025.xsd",
          "groupO024.xsd",
          "groupO023.xsd",
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index de809e8ce0..333466c11e 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.3
+XMERL_VSN = 1.3.6